diff --git a/.agents/checks/accessibility.md b/.agents/checks/accessibility.md
new file mode 100644
index 0000000000..55cdbcab75
--- /dev/null
+++ b/.agents/checks/accessibility.md
@@ -0,0 +1,28 @@
+---
+name: accessibility
+description: Reviews UI code for WCAG 2.2 AA accessibility violations
+severity-default: medium
+tools: [Read, Grep]
+---
+
+You are an accessibility auditor reviewing a code diff for WCAG 2.2 AA compliance. Focus on UI changes that affect users with disabilities.
+
+Check for:
+
+1. **Missing form labels** - inputs, selects, textareas without associated `<label>` or `aria-label`/`aria-labelledby`
+2. **Missing alt text** - images without `alt` attributes, or decorative images missing `alt=""`
+3. **Keyboard navigation** - interactive elements not focusable, custom widgets missing keyboard handlers (Enter, Space, Escape, Arrow keys), focus traps without escape
+4. **Focus management** - modals/dialogs that don't trap focus, dynamic content that doesn't move focus appropriately, removed elements without focus recovery
+5. **ARIA misuse** - invalid `aria-*` attributes, roles without required children/properties, `aria-hidden` on focusable elements
+6. **Color as sole indicator** - using color alone to convey meaning (errors, status) without text/icon alternative
+7. **Touch targets** - interactive elements smaller than 24x24 CSS pixels (WCAG 2.2 SC 2.5.8)
+8. **Screen reader support** - dynamic content changes without `aria-live` announcements, unlabeled icon buttons, links with only "click here"
+9. **Heading hierarchy** - skipped heading levels (h1 → h3), missing page landmarks
+
+Rules:
+
+- Focus on NEW or CHANGED UI in the diff — do not audit the entire existing codebase
+- Only flag issues in .vue, .tsx, .jsx, .html, or template-containing files
+- Skip non-UI files entirely (stores, services, utils)
+- Skip canvas-based content: the LiteGraph node editor renders on `<canvas>` elements, not DOM-based UI. WCAG rules don't fully apply to canvas rendering internals — only audit the DOM-based controls around it (toolbars, panels, dialogs)
+- "Critical" for completely inaccessible interactive elements, "major" for missing labels/ARIA, "minor" for enhancement opportunities
diff --git a/.agents/checks/api-contract.md b/.agents/checks/api-contract.md
new file mode 100644
index 0000000000..67731e6a7c
--- /dev/null
+++ b/.agents/checks/api-contract.md
@@ -0,0 +1,35 @@
+---
+name: api-contract
+description: Catches breaking changes to public interfaces, window-exposed APIs, event contracts, and exported symbols
+severity-default: high
+tools: [Grep, Read, glob]
+---
+
+You are an API contract reviewer. Your job is to catch breaking changes and contract violations in public-facing interfaces.
+
+## What to Check
+
+1. **Breaking changes to globally exposed APIs** — anything on `window` or other global objects that consumers depend on. Renamed properties, removed methods, changed signatures, changed return types.
+2. **Event contract changes** — renamed events, changed event payloads, removed events that listeners may depend on.
+3. **Changed function signatures** — parameters reordered, required params added, return type changed on exported functions.
+4. **Removed or renamed exports** — any `export` that was previously available and is now gone or renamed without a re-export alias.
+5. **REST API changes** — changed endpoints, added required fields, removed response fields, changed status codes.
+6. **Type contract narrowing** — a function that used to accept `string | number` now only accepts `string`, or a return type that narrows unexpectedly.
+7. **Default value changes** — changing defaults on optional parameters that consumers may rely on.
+8. **Store/state shape changes** — renamed store properties, changed state structure that computed properties or watchers may depend on.
+
+## How to Identify the Public API
+
+- Check `package.json` for `"exports"` or `"main"` fields.
+- **Window globals**: This repo exposes LiteGraph classes on `window` (e.g., `window['LiteGraph']`, `window['LGraphNode']`, `window['LGraphCanvas']`) and `window['__COMFYUI_FRONTEND_VERSION__']`. These are consumed by custom node extensions and must not be renamed or removed.
+- **Extension hooks**: The `app` object and its extension registration system (`app.registerExtension`) is a public contract for third-party custom nodes. Changes to `ComfyApp`, `ComfyApi`, or the extension lifecycle are breaking changes.
+- Check AGENTS.md for project-specific API surface definitions.
+- Any exported symbol from common entry points (e.g., `src/types/index.ts`) should be treated as potentially public.
+
+## Rules
+
+- ONLY flag changes that break existing consumers.
+- Do NOT flag additions (new methods, new exports, new endpoints).
+- Do NOT flag internal/private API changes.
+- Always check if a re-export or compatibility shim was added before flagging.
+- Critical for removed/renamed globals, high for changed export signatures, medium for changed defaults.
diff --git a/.agents/checks/architecture-reviewer.md b/.agents/checks/architecture-reviewer.md
new file mode 100644
index 0000000000..fecb820c0e
--- /dev/null
+++ b/.agents/checks/architecture-reviewer.md
@@ -0,0 +1,27 @@
+---
+name: architecture-reviewer
+description: Reviews code for architectural issues like over-engineering, SOLID violations, coupling, and API design
+severity-default: medium
+tools: [Grep, Read, glob]
+---
+
+You are a software architect reviewing a code diff. Focus on structural and design issues.
+
+## What to Check
+
+1. **Over-engineering** — abstractions for single-use cases, premature generalization, unnecessary indirection layers
+2. **SOLID violations** — god classes, mixed responsibilities, rigid coupling, interface segregation issues
+3. **Separation of concerns** — business logic in UI components, data access in controllers, mixed layers
+4. **API design** — inconsistent interfaces, leaky abstractions, unclear contracts
+5. **Coupling** — tight coupling between modules, circular dependencies, feature envy
+6. **Consistency** — breaking established patterns without justification, inconsistent approaches to similar problems
+7. **Dependency direction** — imports going the wrong way in the architecture, lower layers depending on higher
+8. **Change amplification** — designs requiring changes in many places for simple feature additions
+
+## Rules
+
+- Focus on structural issues that affect maintainability and evolution.
+- Do NOT report bugs, security, or performance issues (other checks handle those).
+- Consider whether the code is proportional to the problem it solves.
+- "Under-engineering" (missing useful abstractions) is as valid as over-engineering.
+- Rate severity by impact on future maintainability.
diff --git a/.agents/checks/bug-hunter.md b/.agents/checks/bug-hunter.md
new file mode 100644
index 0000000000..0d8ac9a29b
--- /dev/null
+++ b/.agents/checks/bug-hunter.md
@@ -0,0 +1,34 @@
+---
+name: bug-hunter
+description: Finds logic errors, off-by-ones, null safety issues, race conditions, and edge cases
+severity-default: high
+tools: [Read, Grep]
+---
+
+You are a bug hunter reviewing a code diff. Your ONLY job is to find bugs - logic errors that will cause incorrect behavior at runtime.
+
+Focus areas:
+
+1. **Off-by-one errors** in loops, slices, and indices
+2. **Null/undefined dereferences** - any path where a value could be null but isn't checked
+3. **Race conditions** - shared mutable state, async ordering assumptions
+4. **Edge cases** - empty arrays, zero values, empty strings, boundary conditions
+5. **Type coercion bugs** - loose equality, implicit conversions
+6. **Error handling gaps** - unhandled promise rejections, swallowed errors
+7. **State mutation bugs** - mutating props, shared references, stale closures
+8. **Incorrect boolean logic** - flipped conditions, missing negation, wrong operator precedence
+
+Rules:
+
+- ONLY report actual bugs that will cause wrong behavior
+- Do NOT report style issues, naming, or performance
+- Do NOT report hypothetical bugs that require implausible inputs
+- Each finding must explain the specific runtime failure scenario
+
+## Repo-Specific Bug Patterns
+
+- `z.any()` in Zod schemas disables validation and propagates `any` into TypeScript types — always flag
+- Destructuring reactive objects (props, reactive()) without `toRefs()` loses reactivity — flag outside of `defineProps` destructuring
+- `ComputedRef<T>` exposed via `defineExpose` or public API should be unwrapped first
+- LiteGraph node operations: check for missing null guards on `node.graph` (can be null when node is removed)
+- Watch/watchEffect without cleanup for side effects (timers, listeners) — leak on component unmount
diff --git a/.agents/checks/coderabbit.md b/.agents/checks/coderabbit.md
new file mode 100644
index 0000000000..142ce57419
--- /dev/null
+++ b/.agents/checks/coderabbit.md
@@ -0,0 +1,50 @@
+---
+name: coderabbit
+description: Runs CodeRabbit CLI for AST-aware code quality review
+severity-default: medium
+tools: [Bash, Read]
+---
+
+Run CodeRabbit CLI review on the current changes.
+
+## Steps
+
+1. Check if CodeRabbit CLI is installed:
+
+   ```bash
+   which coderabbit
+   ```
+
+   If not installed, skip this check and report:
+   "Skipped: CodeRabbit CLI not installed. Install and authenticate:
+
+   ```
+   npm install -g coderabbit
+   coderabbit auth login
+   ```
+
+   See https://docs.coderabbit.ai/guides/cli for setup."
+
+2. Run review:
+
+   ```bash
+   coderabbit --prompt-only --type uncommitted
+   ```
+
+   If there are committed but unpushed changes, use `--type committed` instead.
+
+3. Parse CodeRabbit's output. Each finding should include:
+   - File path and line number
+   - Severity mapped from CodeRabbit's own levels
+   - Category (logic, security, performance, style, test, architecture, dx)
+   - Description and suggested fix
+
+## Rate Limiting
+
+If a rate limit is hit, skip and note it. Prefer reading the current quota from CLI/API output rather than assuming a fixed reviews/hour limit.
+
+## Error Handling
+
+- Auth expired: skip and report "CodeRabbit auth expired, run: coderabbit auth login"
+- CLI timeout (>120s): skip and note
+- Parse error: return raw output with a warning
diff --git a/.agents/checks/complexity.md b/.agents/checks/complexity.md
new file mode 100644
index 0000000000..def2d09366
--- /dev/null
+++ b/.agents/checks/complexity.md
@@ -0,0 +1,28 @@
+---
+name: complexity
+description: Reviews code for excessive complexity and suggests refactoring opportunities
+severity-default: medium
+tools: [Grep, Read, glob]
+---
+
+You are a complexity and refactoring advisor reviewing a code diff. Focus on code that is unnecessarily complex and will be hard to maintain.
+
+## What to Check
+
+1. **High cyclomatic complexity** — functions with many branching paths (if/else chains, switch statements with >7 cases, nested ternaries). Threshold: complexity >10 is high severity, >15 is critical.
+2. **Deep nesting** — code nested >4 levels deep (nested if/for/try blocks). Suggest guard clauses, early returns, or extraction.
+3. **Oversized functions** — functions >50 lines that do multiple things. Suggest extraction of cohesive sub-functions.
+4. **God classes/modules** — files >500 lines mixing multiple responsibilities. Suggest splitting by concern.
+5. **Long parameter lists** — functions with >5 parameters. Suggest parameter objects or builder patterns.
+6. **Complex boolean expressions** — conditions with >3 clauses that are hard to parse. Suggest extracting to named boolean variables.
+7. **Feature envy** — methods that use data from another class more than their own, suggesting the method belongs elsewhere.
+8. **Duplicate logic** — two or more code blocks in the diff doing essentially the same thing with minor variations.
+9. **Unnecessary indirection** — wrapper functions that add no value, abstractions for single-use cases, premature generalization.
+
+## Rules
+
+- Only flag complexity in NEW or SIGNIFICANTLY CHANGED code.
+- Do NOT suggest refactoring stable, well-tested code that happens to be complex.
+- Do NOT flag complexity that is inherent to the problem domain (e.g., state machines, protocol handlers).
+- Provide a concrete refactoring approach, not just "this is too complex".
+- High severity for code that will likely cause bugs during future modifications, medium for readability improvements, low for optional simplifications.
diff --git a/.agents/checks/ddd-structure.md b/.agents/checks/ddd-structure.md
new file mode 100644
index 0000000000..1a87afc6ad
--- /dev/null
+++ b/.agents/checks/ddd-structure.md
@@ -0,0 +1,86 @@
+---
+name: ddd-structure
+description: Reviews whether new code is placed in the right domain/layer and follows domain-driven structure principles
+severity-default: medium
+tools: [Grep, Read, glob]
+---
+
+You are a domain-driven design reviewer. Your job is to check whether new or moved code is placed in the correct architectural layer and domain folder.
+
+## Principles
+
+1. **Domain over Technical Layer** — code should be organized by what it does (domain/feature), not by what it is (component/service/store). New files in flat technical folders like `src/components/`, `src/services/`, `src/stores/`, `src/utils/` are a smell if the repo already has domain folders.
+
+2. **Cohesion** — files that change together should live together. A component, its store, its service, and its types for a single feature should be co-located.
+
+3. **Import Direction** — lower layers must not import from higher layers. Check that imports flow in the allowed direction (see Layer Architecture below).
+
+4. **Bounded Contexts** — each domain/feature should have clear boundaries. Cross-domain imports should go through public interfaces, not reach into internal files.
+
+5. **Naming** — folders and files should reflect domain concepts, not technical roles. `workflowExecution.ts` > `service.ts`.
+
+## Layer Architecture
+
+This repo uses a VSCode-style layered architecture with strict unidirectional imports:
+
+```
+base → platform → workbench → renderer
+```
+
+| Layer        | Purpose                                | Can Import From                    |
+| ------------ | -------------------------------------- | ---------------------------------- |
+| `base/`      | Pure utilities, no framework deps      | Nothing                            |
+| `platform/`  | Core domain services, business logic   | `base/`                            |
+| `workbench/` | Features, workspace orchestration      | `base/`, `platform/`               |
+| `renderer/`  | UI layer (Vue components, composables) | `base/`, `platform/`, `workbench/` |
+
+### Import Direction Violations to Check
+
+```bash
+# platform must NOT import from workbench or renderer
+grep -r "from '@/renderer'" src/platform/ --include="*.ts" --include="*.vue"
+grep -r "from '@/workbench'" src/platform/ --include="*.ts" --include="*.vue"
+# base must NOT import from platform, workbench, or renderer
+grep -r "from '@/platform'" src/base/ --include="*.ts" --include="*.vue"
+grep -r "from '@/workbench'" src/base/ --include="*.ts" --include="*.vue"
+grep -r "from '@/renderer'" src/base/ --include="*.ts" --include="*.vue"
+# workbench must NOT import from renderer
+grep -r "from '@/renderer'" src/workbench/ --include="*.ts" --include="*.vue"
+```
+
+### Legacy Flat Folders
+
+Flag NEW files added to these legacy flat folders (they should go in a domain folder under the appropriate layer instead):
+
+- `src/components/` → should be in `src/renderer/` or `src/workbench/extensions/{feature}/components/`
+- `src/stores/` → should be in `src/platform/{domain}/` or `src/workbench/extensions/{feature}/stores/`
+- `src/services/` → should be in `src/platform/{domain}/`
+- `src/composables/` → should be in `src/renderer/` or `src/platform/{domain}/ui/`
+
+Do NOT flag modifications to existing files in legacy folders — only flag NEW files.
+
+## How to Review
+
+1. Look at the diff to see where new files are created or where code is added.
+2. Check if the repo has an established domain folder structure (look for domain-organized directories like `src/platform/`, `src/workbench/`, `src/renderer/`, `src/base/`, or similar).
+3. If domain folders exist but new code was placed in a flat technical folder, flag it.
+4. Run import direction checks:
+   - Use `Grep` or `Read` to check if new imports violate layer boundaries.
+   - Flag any imports from a higher layer to a lower one using the rules above.
+5. Check for new files in legacy flat folders and flag them per the Legacy Flat Folders section.
+
+## Generic Checks (when no domain structure is detected)
+
+- God files (>500 lines mixing concerns)
+- Circular imports between modules
+- Business logic in UI components
+
+## Severity Guidelines
+
+| Issue                                                         | Severity |
+| ------------------------------------------------------------- | -------- |
+| Import direction violation (lower layer imports higher layer) | high     |
+| New file in legacy flat folder when domain folders exist      | medium   |
+| Business logic in UI component                                | medium   |
+| Missing domain boundary (cross-cutting import into internals) | low      |
+| Naming uses technical role instead of domain concept          | low      |
diff --git a/.agents/checks/dep-secrets-scan.md b/.agents/checks/dep-secrets-scan.md
new file mode 100644
index 0000000000..4a983f9de9
--- /dev/null
+++ b/.agents/checks/dep-secrets-scan.md
@@ -0,0 +1,66 @@
+---
+name: dep-secrets-scan
+description: Runs dependency vulnerability audit and secrets detection
+severity-default: critical
+tools: [Bash, Read]
+---
+
+Run dependency audit and secrets scan to detect known CVEs in dependencies and leaked secrets in code.
+
+## Steps
+
+1. Check which tools are available:
+
+   ```bash
+   pnpm --version
+   gitleaks version
+   ```
+
+   - If **neither** is installed, skip this check and report: "Skipped: neither pnpm nor gitleaks installed. Install pnpm: `npm i -g pnpm`. Install gitleaks: `brew install gitleaks` or see https://github.com/gitleaks/gitleaks#installing"
+   - If only one is available, run that one and note the other was skipped.
+
+2. **Dependency audit** (if pnpm is available):
+
+   ```bash
+   pnpm audit --json 2>/dev/null || true
+   ```
+
+   Parse the JSON output. Map advisory severity:
+   - `critical` advisory → `critical`
+   - `high` advisory → `major`
+   - `moderate` advisory → `minor`
+   - `low` advisory → `nitpick`
+
+   Report each finding with: package name, version, advisory title, CVE, and suggested patched version.
+
+3. **Secrets detection** (if gitleaks is available):
+
+   ```bash
+   gitleaks detect --no-banner --report-format json --source . 2>/dev/null || true
+   ```
+
+   Parse the JSON output. All secret findings are `critical` severity.
+
+   Report each finding with: file and line, rule description, and a redacted match. Always suggest removing the secret and rotating credentials.
+
+## What This Catches
+
+### Dependency Audit
+
+- Known CVEs in direct and transitive dependencies
+- Vulnerable packages from the npm advisory database
+
+### Secrets Detection
+
+- API keys and tokens in code
+- AWS credentials, GCP service account keys
+- Database connection strings with passwords
+- Private keys and certificates
+- Generic high-entropy secrets
+
+## Error Handling
+
+- If pnpm audit fails, log the error and continue with gitleaks.
+- If gitleaks fails, log the error and continue with audit results.
+- If JSON parsing fails for either tool, include raw output with a warning.
+- If both tools produce no findings, report "No issues found."
diff --git a/.agents/checks/doc-freshness.md b/.agents/checks/doc-freshness.md
new file mode 100644
index 0000000000..e6faacae2d
--- /dev/null
+++ b/.agents/checks/doc-freshness.md
@@ -0,0 +1,40 @@
+---
+name: doc-freshness
+description: Reviews whether code changes are reflected in documentation
+severity-default: medium
+tools: [Read, Grep]
+---
+
+You are a documentation freshness reviewer. Your job is to check whether code changes are properly reflected in documentation, and whether new features need documentation.
+
+Check for:
+
+1. **Stale README sections** - code changes that invalidate setup instructions, API examples, or architecture descriptions in README.md
+2. **Outdated code comments** - comments referencing removed functions, old parameter names, previous behavior, or TODO items that are now done
+3. **Missing JSDoc on public APIs** - exported functions, classes, or interfaces without JSDoc descriptions, especially those used by consumers of the library
+4. **Changed behavior without changelog** - user-facing behavior changes that should be noted in a changelog or release notes
+5. **Dead documentation links** - links in markdown files pointing to moved or deleted files
+6. **Missing migration guidance** - breaking changes without upgrade instructions
+
+Rules:
+
+- Focus on documentation that needs to CHANGE due to the diff — don't audit all existing docs
+- Do NOT flag missing comments on internal/private functions
+- Do NOT flag missing changelog entries for purely internal refactors
+- "Major" for stale docs that will mislead users, "minor" for missing JSDoc on public APIs, "nitpick" for minor doc improvements
+
+## ComfyUI_frontend Documentation
+
+This repository's public APIs are used by custom node and extension authors. Documentation lives at [docs.comfy.org](https://docs.comfy.org) (repo: Comfy-Org/docs).
+
+For any NEW API, event, hook, or configuration that extensions or custom nodes can use:
+
+- Flag with a suggestion to open a PR to Comfy-Org/docs to document the new API
+- Example: "This new extension API should be documented at docs.comfy.org — consider opening a PR to Comfy-Org/docs"
+
+For changes to existing extension-facing APIs:
+
+- Check if the existing docs at docs.comfy.org may need updating
+- Flag stale references in CONTRIBUTING.md or developer guides
+
+Anything relevant to custom extension authors should trigger a documentation suggestion.
diff --git a/.agents/checks/dx-readability.md b/.agents/checks/dx-readability.md
new file mode 100644
index 0000000000..d47caa40de
--- /dev/null
+++ b/.agents/checks/dx-readability.md
@@ -0,0 +1,25 @@
+---
+name: dx-readability
+description: Reviews code for developer experience issues including naming clarity, cognitive complexity, dead code, and confusing patterns
+severity-default: low
+tools: [Read, Grep]
+---
+
+You are a developer experience reviewer. Focus on code that will confuse the next developer who reads it.
+
+Check for:
+
+1. **Unclear naming** - variables/functions that don't communicate intent, abbreviations, misleading names
+2. **Cognitive complexity** - deeply nested conditions, long functions doing multiple things, complex boolean expressions
+3. **Dead code** - unreachable branches, unused variables, commented-out code, vestigial parameters
+4. **Confusing patterns** - clever tricks over simple code, implicit behavior, action-at-a-distance, surprising side effects
+5. **Missing context** - complex business logic without explaining why, non-obvious algorithms without comments
+6. **Inconsistent abstractions** - mixing raw and wrapped APIs, different error handling styles in same module
+7. **Implicit knowledge** - code that only works because of undocumented assumptions or conventions
+
+Rules:
+
+- Only flag things that would genuinely confuse a competent developer
+- Do NOT flag established project conventions even if you'd prefer different ones
+- "Minor" for things that slow comprehension, "nitpick" for pure style preferences
+- Major is reserved for genuinely misleading code (names that lie, silent behavior changes)
diff --git a/.agents/checks/ecosystem-compat.md b/.agents/checks/ecosystem-compat.md
new file mode 100644
index 0000000000..85e5f5968e
--- /dev/null
+++ b/.agents/checks/ecosystem-compat.md
@@ -0,0 +1,58 @@
+---
+name: ecosystem-compat
+description: Checks whether changes break exported symbols that downstream consumers may depend on
+severity-default: high
+tools: [Grep, Read, glob, mcp__comfy_codesearch__search_code]
+---
+
+Check whether this PR introduces breaking changes to exported symbols that downstream consumers may depend on.
+
+## What to Check
+
+- Renamed or removed exported functions/classes/types
+- Changed function signatures (parameters added/removed/reordered)
+- Changed return types
+- Removed or renamed CSS classes used for selectors
+- Changed event names or event payload shapes
+- Changed global registrations or extension hooks
+- Modified integration points with external systems
+
+## Method
+
+1. Read the diff and identify any changes to exported symbols.
+2. For each potentially breaking change, try to determine if downstream consumers exist:
+   - If `mcp__comfy_codesearch__search_code` is available, search for usages of the changed symbol across downstream repositories.
+   - Otherwise, use `Grep` to search for usages within the current repository and note that external usage could not be verified.
+3. If consumers are found using the changed API, report it as a finding.
+
+## Severity Guidelines
+
+| Ecosystem Usage | Severity | Guidance                                                     |
+| --------------- | -------- | ------------------------------------------------------------ |
+| 5+ consumers    | critical | Must address before merge                                    |
+| 2-4 consumers   | high     | Should address or document                                   |
+| 1 consumer      | medium   | Note in PR, author decides                                   |
+| 0 consumers     | low      | Note potential risk only                                     |
+| Unknown usage   | medium   | Require explicit note that external usage was not verifiable |
+
+## Suggestion Template
+
+When a breaking change is found, suggest:
+
+- Keeping the old export alongside the new one
+- Adding a deprecation wrapper
+- Explicitly noting this as a breaking change in the PR description so consumers can update
+
+## ComfyUI Code Search MCP
+
+This check works best with the ComfyUI code search MCP tool, which searches across all custom node repositories for usage of changed symbols.
+
+If the `mcp__comfy_codesearch__search_code` tool is not available, install it:
+
+```
+amp mcp add comfy-codesearch https://comfy-codesearch.vercel.app/api/mcp
+# OR for Claude Code:
+claude mcp add -t http comfy-codesearch https://comfy-codesearch.vercel.app/api/mcp
+```
+
+Without this MCP, the check will fall back to searching within the current repository only, and cannot verify external ecosystem usage.
diff --git a/.agents/checks/error-handling.md b/.agents/checks/error-handling.md
new file mode 100644
index 0000000000..8babfacef1
--- /dev/null
+++ b/.agents/checks/error-handling.md
@@ -0,0 +1,38 @@
+---
+name: error-handling
+description: Reviews error handling patterns for empty catches, swallowed errors, missing async error handling, and generic error UX
+severity-default: high
+tools: [Read, Grep]
+---
+
+You are an error handling auditor reviewing a code diff. Focus exclusively on how errors are handled, propagated, and surfaced.
+
+Check for:
+
+1. **Empty catch blocks** - errors caught and silently swallowed with no logging or re-throw
+2. **Generic catches** - catching all errors without distinguishing types, losing context
+3. **Missing async error handling** - unhandled promise rejections, async functions without try/catch or .catch()
+4. **Swallowed errors** - errors caught and replaced with a return value that hides the failure
+5. **Missing error boundaries** - Vue/React component trees without error boundaries around risky subtrees
+6. **No retry or fallback** - network calls, file I/O, or external service calls with no retry logic or graceful degradation
+7. **Generic error UX** - user-facing code showing "Something went wrong" without actionable guidance or error codes
+8. **Missing cleanup on error** - resources (connections, file handles, timers) not cleaned up in error paths
+9. **Error propagation breaks** - catching errors mid-chain and not re-throwing, breaking caller's ability to handle
+
+Rules:
+
+- Focus on NEW or CHANGED error handling in the diff
+- Do NOT flag existing error handling patterns in untouched code
+- Do NOT suggest adding error handling to code that legitimately cannot fail (pure functions, type-safe internal calls)
+- "Critical" for swallowed errors in data-mutation paths, "major" for missing error handling on external calls, "minor" for missing logging
+
+## Repo-Specific Error Handling
+
+- User-facing error messages must be actionable and friendly (per AGENTS.md)
+- Use the shared `useErrorHandling` composable (`src/composables/useErrorHandling.ts`) for centralized error handling:
+  - `wrapWithErrorHandling` / `wrapWithErrorHandlingAsync` automatically catch errors and surface them as toast notifications via `useToastStore`
+  - `toastErrorHandler` can be used directly for custom error handling flows
+  - Supports `ErrorRecoveryStrategy` for retry/fallback patterns (e.g., reauthentication, network reconnect)
+- API errors from `api.get()`/`api.post()` should be caught and surfaced to the user via `useToastStore` (`src/platform/updates/common/toastStore.ts`)
+- Electron/desktop code paths: IPC errors should be caught and not crash the renderer process
+- Workflow execution errors should be displayed in the UI status bar, not silently swallowed
diff --git a/.agents/checks/eslint.strict.config.js b/.agents/checks/eslint.strict.config.js
new file mode 100644
index 0000000000..b710e0d6d8
--- /dev/null
+++ b/.agents/checks/eslint.strict.config.js
@@ -0,0 +1,60 @@
+/**
+ * Strict ESLint config for the sonarjs-lint review check.
+ *
+ * Uses eslint-plugin-sonarjs to get SonarQube-grade analysis without a server.
+ * This config is NOT used for regular development linting — only for the
+ * code review checks' static analysis pass.
+ *
+ * Install: pnpm add -D eslint eslint-plugin-sonarjs
+ * Run:     pnpm dlx eslint --no-config-lookup --config .agents/checks/eslint.strict.config.js --ext .ts,.js,.vue {files}
+ */
+
+import sonarjs from 'eslint-plugin-sonarjs'
+
+export default [
+  sonarjs.configs.recommended,
+  {
+    plugins: {
+      sonarjs
+    },
+    rules: {
+      // Bug detection
+      'sonarjs/no-all-duplicated-branches': 'error',
+      'sonarjs/no-element-overwrite': 'error',
+      'sonarjs/no-identical-conditions': 'error',
+      'sonarjs/no-identical-expressions': 'error',
+      'sonarjs/no-one-iteration-loop': 'error',
+      'sonarjs/no-use-of-empty-return-value': 'error',
+      'sonarjs/no-collection-size-mischeck': 'error',
+      'sonarjs/no-duplicated-branches': 'error',
+      'sonarjs/no-identical-functions': 'error',
+      'sonarjs/no-redundant-jump': 'error',
+      'sonarjs/no-unused-collection': 'error',
+      'sonarjs/no-gratuitous-expressions': 'error',
+
+      // Code smell detection
+      'sonarjs/cognitive-complexity': ['error', 15],
+      'sonarjs/no-duplicate-string': ['error', { threshold: 3 }],
+      'sonarjs/no-redundant-boolean': 'error',
+      'sonarjs/no-small-switch': 'error',
+      'sonarjs/prefer-immediate-return': 'error',
+      'sonarjs/prefer-single-boolean-return': 'error',
+      'sonarjs/no-inverted-boolean-check': 'error',
+      'sonarjs/no-nested-template-literals': 'error'
+    },
+    languageOptions: {
+      ecmaVersion: 2024,
+      sourceType: 'module'
+    }
+  },
+  {
+    ignores: [
+      '**/node_modules/**',
+      '**/dist/**',
+      '**/build/**',
+      '**/*.config.*',
+      '**/*.test.*',
+      '**/*.spec.*'
+    ]
+  }
+]
diff --git a/.agents/checks/import-graph.md b/.agents/checks/import-graph.md
new file mode 100644
index 0000000000..de7477b4bd
--- /dev/null
+++ b/.agents/checks/import-graph.md
@@ -0,0 +1,72 @@
+---
+name: import-graph
+description: Validates import rules, detects circular dependencies, and enforces layer boundaries using dependency-cruiser
+severity-default: high
+tools: [Bash, Read]
+---
+
+Run dependency-cruiser import graph analysis on changed files to detect circular dependencies, orphan modules, and import rule violations.
+
+> **Note:** The circular dependency scan in step 4 targets `src/` specifically, since this is a frontend app with source code under `src/`.
+
+## Steps
+
+1. Check if dependency-cruiser is available:
+   ```bash
+   pnpm dlx dependency-cruiser --version
+   ```
+   If not available, skip this check and report: "Skipped: dependency-cruiser not available. Install with: `pnpm add -D dependency-cruiser`"
+
+> **Install:** `pnpm add -D dependency-cruiser`
+
+2. Identify changed directories from the diff.
+
+3. Determine config to use:
+   - If `.dependency-cruiser.js` or `.dependency-cruiser.cjs` exists in the repo root, use it (dependency-cruiser auto-detects it). This config may enforce layer architecture rules (e.g., base → platform → workbench → renderer import direction):
+     ```bash
+     pnpm dlx dependency-cruiser --output-type json <changed_directories> 2>/dev/null
+     ```
+   - If no config exists, run with built-in defaults:
+     ```bash
+     pnpm dlx dependency-cruiser --no-config --output-type json <changed_directories> 2>/dev/null
+     ```
+
+4. Also check for circular dependencies specifically across `src/`:
+
+   ```bash
+   pnpm dlx dependency-cruiser --no-config --output-type json --do-not-follow "node_modules" --include-only "^src" src 2>/dev/null
+   ```
+
+   Look for modules where `.circular == true` in the output.
+
+5. Parse the JSON output. Each violation has:
+   - `rule.name`: the violated rule
+   - `rule.severity`: error, warn, info
+   - `from`: importing module
+   - `to`: imported module
+
+6. Map violation severity:
+   - `error` → `major`
+   - `warn` → `minor`
+   - `info` → `nitpick`
+   - Circular dependencies → `major` (category: architecture)
+   - Orphan modules → `nitpick` (category: dx)
+
+7. Report each violation with: the rule name, source and target modules, file path, and a suggestion (usually move the import or extract an interface).
+
+## What It Catches
+
+| Rule                     | What It Detects                                      |
+| ------------------------ | ---------------------------------------------------- |
+| `no-circular`            | Circular dependency chains (A → B → C → A)           |
+| `no-orphans`             | Modules with no incoming or outgoing dependencies    |
+| `not-to-dev-dep`         | Production code importing devDependencies            |
+| `no-duplicate-dep-types` | Same dependency in multiple sections of package.json |
+| Custom layer rules       | Import direction violations (e.g., base → platform)  |
+
+## Error Handling
+
+- If pnpm dlx is not available, skip and report the error.
+- If the config file fails to parse, fall back to `--no-config`.
+- If there are more than 50 violations, report the first 20 and note the total count.
+- If no violations are found, report "No issues found."
diff --git a/.agents/checks/memory-leak.md b/.agents/checks/memory-leak.md
new file mode 100644
index 0000000000..81fb4f8ebf
--- /dev/null
+++ b/.agents/checks/memory-leak.md
@@ -0,0 +1,27 @@
+---
+name: memory-leak
+description: Scans for memory leak patterns including event listeners without cleanup, timers not cleared, and unbounded caches
+severity-default: high
+tools: [Read, Grep]
+---
+
+You are a memory leak specialist reviewing a code diff. Focus exclusively on patterns that cause memory to grow unboundedly over time.
+
+Check for:
+
+1. **Event listeners without cleanup** - addEventListener without corresponding removeEventListener, especially in Vue onMounted without onBeforeUnmount cleanup
+2. **Timers not cleared** - setInterval/setTimeout started in component lifecycle without clearInterval/clearTimeout on unmount
+3. **Observer patterns without disconnect** - MutationObserver, IntersectionObserver, ResizeObserver created without .disconnect() on cleanup
+4. **WebSocket/Worker connections** - opened connections never closed on component unmount or route change
+5. **Unbounded caches** - Maps, Sets, or arrays that grow with usage but never evict entries, especially keyed by user input or dynamic IDs
+6. **Stale closures holding references** - closures in event handlers or callbacks that capture large objects or DOM nodes and prevent garbage collection
+7. **RequestAnimationFrame without cancel** - rAF loops started without cancelAnimationFrame on cleanup
+8. **Vue-specific leaks** - watch/watchEffect without stop(), computed that captures reactive dependencies it shouldn't, provide/inject holding stale references
+9. **Global state accumulation** - pushing to global arrays/maps without ever removing entries, console.log keeping object references in dev
+
+Rules:
+
+- Focus on NEW leak patterns introduced in the diff
+- Do NOT flag existing cleanup patterns that are correct
+- Every finding must explain the specific lifecycle scenario where the leak occurs (e.g., "when user navigates away from this view, the interval keeps running")
+- "Critical" for leaks in hot paths or long-lived pages, "major" for component-level leaks, "minor" for dev-only or cold-path leaks
diff --git a/.agents/checks/pattern-compliance.md b/.agents/checks/pattern-compliance.md
new file mode 100644
index 0000000000..2b181ec164
--- /dev/null
+++ b/.agents/checks/pattern-compliance.md
@@ -0,0 +1,60 @@
+---
+name: pattern-compliance
+description: Checks code against repository conventions from AGENTS.md and established patterns
+severity-default: medium
+tools: [Read, Grep]
+---
+
+Check code against repository conventions and framework patterns.
+
+Steps:
+
+1. Read AGENTS.md (and any directory-specific guidance files) for project-specific conventions
+2. Read each changed file
+3. Check against the conventions found in AGENTS.md and these standard patterns:
+
+### TypeScript
+
+- No `any` types or `as any` assertions
+- No `@ts-ignore` without explanatory comment
+- Separate type imports (`import type { ... }`)
+- Use `import type { ... }` for type-only imports
+- Explicit return types on exported functions
+- Use `es-toolkit` for utility functions, NOT lodash. Flag any new `import ... from 'lodash'` or `import ... from 'lodash/*'`
+- Never use `z.any()` in Zod schemas — use `z.unknown()` and narrow
+
+### Vue (if applicable)
+
+- Composition API with `<script setup lang="ts">`
+- Reactive props destructuring (not `withDefaults` pattern)
+- New components must use `<script setup lang="ts">` with reactive props destructuring (Vue 3.5 style): `const { color = 'blue' } = defineProps<Props>()`
+- Separate type imports from value imports
+- All user-facing strings must use `vue-i18n` (`$t()` in templates, `t()` in script). Flag hardcoded English strings in templates that should be translated. The locale file is `src/locales/en/main.json`
+
+### Tailwind (if applicable)
+
+- No `dark:` variants (use semantic theme tokens)
+- Use `cn()` utility for conditional classes
+- No `!important` in utility classes
+- Tailwind 4: CSS variable references use parentheses syntax: `h-(--my-var)` NOT `h-[--my-var]`
+- Use design tokens: `bg-secondary-background`, `text-muted-foreground`, `border-border-default`
+- No `<style>` blocks in Vue SFCs — use inline Tailwind only
+
+### Testing
+
+- Behavioral tests, not change detectors
+- No mock-heavy tests that don't test real behavior
+- Test names describe behavior, not implementation
+
+### General
+
+- No commented-out code
+- No `console.log` in production code (unless intentional logging)
+- No hardcoded URLs, credentials, or environment-specific values
+- Package manager is `pnpm`. Never use `npm`, `npx`, or `yarn`. Use `pnpm dlx` for one-off package execution
+- Sanitize HTML with `DOMPurify.sanitize()`, never raw `innerHTML` or `v-html` without it
+
+Rules:
+
+- Only flag ACTUAL violations, not hypothetical ones
+- AGENTS.md conventions take priority over default patterns if they conflict
diff --git a/.agents/checks/performance-profiler.md b/.agents/checks/performance-profiler.md
new file mode 100644
index 0000000000..a7c61b0244
--- /dev/null
+++ b/.agents/checks/performance-profiler.md
@@ -0,0 +1,35 @@
+---
+name: performance-profiler
+description: Reviews code for performance issues including algorithmic complexity, unnecessary work, and bundle size impact
+severity-default: medium
+tools: [Read, Grep]
+---
+
+You are a performance engineer reviewing a code diff. Focus exclusively on performance issues.
+
+Check for:
+
+1. **Algorithmic complexity** - O(n²) or worse in loops, nested iterations over large collections
+2. **Unnecessary re-computation** - repeated work in render cycles, missing memoization for expensive ops
+3. **Memory leaks** - event listeners not cleaned up, growing caches without eviction, closures holding references
+4. **N+1 queries** - database/API calls inside loops
+5. **Bundle size** - large imports that could be tree-shaken, dynamic imports for heavy modules
+6. **Rendering performance** - unnecessary re-renders, layout thrashing, expensive computed properties
+7. **Data structures** - using arrays for lookups instead of maps/sets, unnecessary copying of large objects
+8. **Async patterns** - sequential awaits that could be parallel, missing abort controllers
+
+Rules:
+
+- ONLY report actual performance issues, not premature optimization suggestions
+- Distinguish between hot paths (major) and cold paths (minor)
+- Include Big-O analysis when relevant
+- Do NOT suggest micro-optimizations that a JIT compiler handles
+- Quantify the impact when possible: "This is O(n²) where n = number of users"
+
+## Repo-Specific Performance Concerns
+
+- **LiteGraph canvas rendering** is the primary hot path. Operations inside `LGraphNode.onDrawForeground`, `onDrawBackground`, `processMouseMove` run every frame at 60fps. Any O(n) or worse operation here on the node/link collections is critical.
+- **Node definition lookups** happen frequently — these should use Maps, not array.find()
+- **Workflow serialization/deserialization** can involve large JSON objects (1000+ nodes). Watch for deep copies or unnecessary re-parsing.
+- **Vue reactivity in canvas code** — reactive getters triggered during canvas render cause performance issues. Canvas-facing code should read raw values, not reactive refs.
+- **Bundle size** — check for large imports that could be dynamically imported. The build uses Vite with `build:analyze` for bundle visualization.
diff --git a/.agents/checks/regression-risk.md b/.agents/checks/regression-risk.md
new file mode 100644
index 0000000000..a9bf600386
--- /dev/null
+++ b/.agents/checks/regression-risk.md
@@ -0,0 +1,44 @@
+---
+name: regression-risk
+description: Detects potential regressions by analyzing git blame history of modified lines
+severity-default: high
+tools: [Bash, Read, Grep]
+---
+
+Perform regression risk analysis on the current changes using git blame.
+
+## Method
+
+1. Determine the base branch by examining git context (e.g., `git merge-base origin/main HEAD`, or check the PR's target branch). Never use `HEAD~1` as the base — it compares against the PR's own prior commit and causes false positives.
+2. Get the PR's own commits: `git log --format=%H <base>..HEAD`
+3. For each changed file, run: `git diff <base>...HEAD -- <file>`
+4. Extract the modified line ranges from the diff (lines removed or changed in the base version).
+5. For each modified line range, check git blame in the base version:
+   `git blame <base> -L <start>,<end> -- <file>`
+6. Look for blame commits whose messages match bugfix patterns:
+   - Contains: fix, bug, patch, hotfix, revert, regression, CVE
+   - Ignore: "fix lint", "fix typo", "fix format", "fix style"
+7. **Filter out false positives.** If the blamed commit SHA is in the PR's own commits, skip it.
+8. For each verified bugfix line being modified, report as a finding.
+
+## What to Report
+
+For each finding, include:
+
+- The file and line number
+- The original bugfix commit (short SHA and subject)
+- The date of the original fix
+- A suggestion to verify the original bug scenario still works and to add a regression test if one doesn't exist
+
+## Shallow Clone Limitations
+
+When working with shallow clones, `git blame` may not have full history. If blame fails with "no such path in revision" or shows truncated history, report only findings where blame succeeds and note the limitation.
+
+## Edge Cases
+
+| Situation                | Action                           |
+| ------------------------ | -------------------------------- |
+| Shallow clone (no blame) | Report what succeeds, note limit |
+| Blame shows PR's own SHA | Skip finding (false positive)    |
+| File renamed             | Try blame with `--follow`        |
+| Binary file              | Skip file                        |
diff --git a/.agents/checks/security-auditor.md b/.agents/checks/security-auditor.md
new file mode 100644
index 0000000000..5433c324af
--- /dev/null
+++ b/.agents/checks/security-auditor.md
@@ -0,0 +1,34 @@
+---
+name: security-auditor
+description: Reviews code for security vulnerabilities aligned with OWASP Top 10
+severity-default: critical
+tools: [Read, Grep]
+---
+
+You are a security auditor reviewing a code diff. Focus exclusively on security vulnerabilities.
+
+Check for:
+
+1. **Injection** - SQL injection, command injection, template injection, XSS (stored/reflected/DOM)
+2. **Authentication/Authorization** - auth bypass, privilege escalation, missing access checks
+3. **Data exposure** - secrets in code, PII in logs, sensitive data in error messages, overly broad API responses
+4. **Cryptography** - weak algorithms, hardcoded keys, predictable tokens, missing encryption
+5. **Input validation** - missing sanitization, path traversal, SSRF, open redirects
+6. **Dependency risks** - known vulnerable patterns, unsafe deserialization
+7. **Configuration** - CORS misconfiguration, missing security headers, debug mode in production
+8. **Race conditions with security impact** - TOCTOU, double-spend, auth state races
+
+Rules:
+
+- ONLY report security issues, not general bugs or style
+- All findings must be severity "critical" or "major"
+- Explain the attack vector: who can exploit this and how
+- Do NOT report theoretical issues without a plausible attack scenario
+- Reference OWASP category when applicable
+
+## Repo-Specific Patterns
+
+- HTML sanitization must use `DOMPurify.sanitize()` — flag any `v-html` or `innerHTML` without DOMPurify
+- API calls should use `api.get(api.apiURL(...))` helpers, not raw `fetch('/api/...')` — direct URL construction can bypass auth
+- Firebase/Sentry credentials are configured via environment — flag any hardcoded Firebase config objects
+- Electron IPC: check for unsafe `ipcRenderer.send` patterns in desktop code paths
diff --git a/.agents/checks/semgrep-sast.md b/.agents/checks/semgrep-sast.md
new file mode 100644
index 0000000000..f06d87b987
--- /dev/null
+++ b/.agents/checks/semgrep-sast.md
@@ -0,0 +1,54 @@
+---
+name: semgrep-sast
+description: Runs Semgrep SAST with auto-configured rules for JS/TS/Vue
+severity-default: high
+tools: [Bash, Read]
+---
+
+Run Semgrep static analysis on changed files to detect security vulnerabilities, dangerous patterns, and framework-specific issues.
+
+## Steps
+
+1. Check if semgrep is installed:
+
+   ```bash
+   semgrep --version
+   ```
+
+   If not installed, skip this check and report: "Skipped: semgrep not installed. Install with: `pip3 install semgrep`"
+
+2. Identify changed files (`.ts`, `.js`, `.vue`) from the diff.
+   If none are found, skip and report: "Skipped: no changed JS/TS/Vue files."
+
+3. Run semgrep against changed files:
+
+   ```bash
+   semgrep --config=auto --json --quiet <changed_files>
+   ```
+
+4. Parse the JSON output (`.results[]` array). For each finding, map severity:
+   - Semgrep `ERROR` → `critical`
+   - Semgrep `WARNING` → `major`
+   - Semgrep `INFO` → `minor`
+
+5. Report each finding with:
+   - The semgrep rule ID (`check_id`)
+   - File path and line number (`path`, `start.line`)
+   - The message from `extra.message`
+   - A fix suggestion from `extra.fix` if available, otherwise general remediation advice
+
+## What Semgrep Catches
+
+With `--config=auto`, Semgrep loads community-maintained rules for:
+
+- **Security vulnerabilities:** injection, XSS, SSRF, path traversal, open redirect
+- **Dangerous patterns:** eval(), innerHTML, dangerouslySetInnerHTML, exec()
+- **Crypto issues:** weak hashing, hardcoded secrets, insecure random
+- **Best practices:** missing security headers, unsafe deserialization
+- **Framework-specific:** Express, React, Vue security patterns
+
+## Error Handling
+
+- If semgrep config download fails, skip and report the error.
+- If semgrep fails to parse a specific file, skip that file and continue with others.
+- If semgrep produces no findings, report "No issues found."
diff --git a/.agents/checks/sonarjs-lint.md b/.agents/checks/sonarjs-lint.md
new file mode 100644
index 0000000000..c1d6c18dce
--- /dev/null
+++ b/.agents/checks/sonarjs-lint.md
@@ -0,0 +1,59 @@
+---
+name: sonarjs-lint
+description: Runs SonarQube-grade static analysis using eslint-plugin-sonarjs
+severity-default: high
+tools: [Bash, Read]
+---
+
+Run eslint-plugin-sonarjs analysis on changed files to detect bugs, code smells, and security patterns without needing a SonarQube server.
+
+## Steps
+
+1. Check if eslint is available:
+
+   ```bash
+   pnpm dlx eslint --version
+   ```
+
+   If pnpm dlx or eslint is unavailable, skip this check and report: "Skipped: eslint not available. Ensure Node.js and pnpm dlx are installed."
+
+2. Identify changed files (`.ts`, `.js`, `.vue`) from the diff.
+
+3. Determine eslint config to use. This check uses a **strict sonarjs-specific config** (not the project's own eslint config, which is less strict):
+   - Look for the colocated strict config at `.agents/checks/eslint.strict.config.js`
+   - If found, run with `--config .agents/checks/eslint.strict.config.js`
+   - **Fallback:** if the strict config cannot be found or fails to load, skip this check and report: "Skipped: .agents/checks/eslint.strict.config.js missing; SonarJS rules require explicit config."
+
+4. Run eslint against changed files:
+
+   ```bash
+   # Use the strict config
+   pnpm dlx --yes --package eslint-plugin-sonarjs eslint --no-config-lookup --config .agents/checks/eslint.strict.config.js --format json <changed_files> 2>/dev/null || true
+   ```
+
+5. Parse the JSON array of file results. For each eslint message, map severity:
+   - `severity 2` (error) → `major`
+   - `severity 1` (warning) → `minor`
+
+6. Categorize findings by rule ID:
+   - Rule IDs starting with `sonarjs/no-` → category: `logic`
+   - Rule IDs containing `cognitive-complexity` → category: `dx`
+   - Other sonarjs rules → category: `style`
+
+7. Report each finding with:
+   - The rule ID
+   - File path and line number
+   - The message from eslint
+   - A fix suggestion based on the rule
+
+## What This Catches
+
+- **Bug detection:** duplicated branches, element overwrite, identical conditions/expressions, one-iteration loops, empty return values
+- **Code smells:** cognitive complexity (threshold: 15), duplicate strings, redundant booleans, small switches
+- **Security patterns:** via sonarjs recommended ruleset
+
+## Error Handling
+
+- If eslint fails to parse a Vue file, skip that file and continue with others.
+- If the plugin fails to install, skip and report the error.
+- If eslint produces no output or errors, report "No issues found."
diff --git a/.agents/checks/test-quality.md b/.agents/checks/test-quality.md
new file mode 100644
index 0000000000..11d4e3d2c2
--- /dev/null
+++ b/.agents/checks/test-quality.md
@@ -0,0 +1,37 @@
+---
+name: test-quality
+description: Reviews test code for quality issues and coverage gaps
+severity-default: medium
+tools: [Read, Grep]
+---
+
+You are a test quality reviewer. Evaluate the tests included with (or missing from) this code change.
+
+Check for:
+
+1. **Missing tests** - new behavior without test coverage, modified logic without updated tests
+2. **Change-detector tests** - tests that assert implementation details instead of behavior (testing that a function was called, not what it produces)
+3. **Mock-heavy tests** - tests with so many mocks they don't test real behavior
+4. **Snapshot abuse** - large snapshots that no one reviews, snapshots of implementation details
+5. **Fragile assertions** - tests that break on unrelated changes, order-dependent tests
+6. **Missing edge cases** - happy path only, no empty/null/error scenarios tested
+7. **Test readability** - unclear test names, complex setup that obscures intent, shared mutable state between tests
+8. **Test isolation** - tests depending on execution order, shared state, external services without mocking
+
+Rules:
+
+- Focus on test quality and coverage gaps, not production code bugs
+- "Major" for missing tests on critical logic, "minor" for missing edge case tests
+- A change that adds no tests is only an issue if the change adds behavior
+- Refactors without behavior changes don't need new tests
+- Prefer behavioral tests: test inputs and outputs, not internal implementation
+- This repo uses **colocated tests**: `.test.ts` files live next to their source files (e.g., `MyComponent.test.ts` beside `MyComponent.vue`). When checking for missing tests, look for a colocated `.test.ts` file, not a separate `tests/` directory
+
+## Repo-Specific Testing Conventions
+
+- Tests use **Vitest** (not Jest) — run with `pnpm test:unit`
+- Test files are **colocated**: `MyComponent.test.ts` next to `MyComponent.vue`
+- Use `@vue/test-utils` for component testing, `@pinia/testing` (`createTestingPinia`) for store tests
+- Browser/E2E tests use **Playwright** in `browser_tests/` — run with `pnpm test:browser:local`
+- Mock composables using the singleton factory pattern inside `vi.mock()` — see `docs/testing/unit-testing.md` for the pattern
+- Never use `any` in test code either — proper typing applies to tests too
diff --git a/.agents/checks/vue-patterns.md b/.agents/checks/vue-patterns.md
new file mode 100644
index 0000000000..052e2adaaa
--- /dev/null
+++ b/.agents/checks/vue-patterns.md
@@ -0,0 +1,47 @@
+---
+name: vue-patterns
+description: Reviews Vue 3.5+ code for framework-specific anti-patterns
+severity-default: medium
+tools: [Read, Grep]
+---
+
+You are a Vue 3.5 framework specialist reviewing a code diff. Focus on Vue-specific patterns, anti-patterns, and missed framework features.
+
+Check for:
+
+1. **Options API in new files** - new .vue files using Options API instead of Composition API with `<script setup>`. Modifications to existing Options API files are fine.
+2. **Reactivity anti-patterns** - destructuring reactive objects losing reactivity, using `ref()` for objects that should be `reactive()`, accessing `.value` inside templates, incorrectly using `toRefs`/`toRef`
+3. **Watch/watchEffect cleanup** - watchers without cleanup functions when they set up side effects (timers, listeners, subscriptions)
+4. **Flush timing issues** - DOM access in watch callbacks without `{ flush: 'post' }`, `nextTick` misuse, accessing template refs before mount
+5. **defineEmits typing** - using array syntax `defineEmits(['event'])` instead of TypeScript syntax `defineEmits<{...}>()`
+6. **defineExpose misuse** - exposing internal state via `defineExpose` when events would be more appropriate (expose is for imperative methods: validate, focus, open)
+7. **Prop drilling** - passing props through 3+ component levels where provide/inject would be cleaner
+8. **VueUse opportunities** - manual implementations of common composables that VueUse already provides (useLocalStorage, useEventListener, useDebounceFn, useIntersectionObserver, etc.)
+9. **Computed vs method** - methods used in templates for derived state that should be computed properties, or computed properties that have side effects
+10. **PrimeVue usage in new code** - New components must NOT use PrimeVue. This project is migrating to shadcn-vue (Reka UI primitives). If new code imports from `primevue/*`, flag it and suggest the shadcn-vue equivalent.
+
+Available shadcn-vue replacements in `src/components/ui/`:
+
+- `button/` — Button, variants
+- `select/` — Select, SelectTrigger, SelectContent, SelectItem
+- `textarea/` — Textarea
+- `toggle-group/` — ToggleGroup, ToggleGroupItem
+- `slider/` — Slider
+- `skeleton/` — Skeleton
+- `stepper/` — Stepper
+- `tags-input/` — TagsInput
+- `search-input/` — SearchInput
+- `Popover.vue` — Popover
+
+For Reka UI primitives not yet wrapped, create a new component in `src/components/ui/` following the pattern in existing components (see `src/components/ui/AGENTS.md`): use `useForwardProps`, `cn()`, design tokens.
+
+Modifications to existing PrimeVue-based components are acceptable but should note the migration opportunity.
+
+Rules:
+
+- Only review .vue and composable .ts files — skip stores, services, utils
+- Do NOT flag existing Options API files being modified (only flag NEW files)
+- Flag new PrimeVue imports — the project is migrating to shadcn-vue/Reka UI
+- When suggesting shadcn-vue alternatives, reference `src/components/ui/AGENTS.md` for the component creation pattern
+- Use Iconify icons (`<i class="icon-[lucide--check]" />`) not PrimeIcons
+- "Major" for reactivity bugs and flush timing, "minor" for API style and VueUse opportunities, "nitpick" for preference-level patterns
diff --git a/.claude/commands/add-missing-i18n.md b/.claude/commands/add-missing-i18n.md
index 4b84141891..b88a2005e2 100644
--- a/.claude/commands/add-missing-i18n.md
+++ b/.claude/commands/add-missing-i18n.md
@@ -3,12 +3,15 @@
 ## Task: Add English translations for all new localized strings
 
 ### Step 1: Identify new translation keys
+
 Find all translation keys that were added in the current branch's changes. These keys appear as arguments to translation functions: `t()`, `st()`, `$t()`, or similar i18n functions.
 
 ### Step 2: Add translations to English locale file
+
 For each new translation key found, add the corresponding English text to the file `src/locales/en/main.json`.
 
 ### Key-to-JSON mapping rules:
+
 - Translation keys use dot notation to represent nested JSON structure
 - Convert dot notation to nested JSON objects when adding to the locale file
 - Example: The key `g.user.name` maps to:
@@ -23,6 +26,7 @@ For each new translation key found, add the corresponding English text to the fi
   ```
 
 ### Important notes:
+
 1. **Only modify the English locale file** (`src/locales/en/main.json`)
 2. **Do not modify other locale files** - translations for other languages are automatically generated by the `i18n.yaml` workflow
 3. **Exception for manual translations**: Only add translations to non-English locale files if:
@@ -30,6 +34,7 @@ For each new translation key found, add the corresponding English text to the fi
    - The automated translation would likely be incorrect due to technical terminology or context-specific meaning
 
 ### Example workflow:
+
 1. If you added `t('settings.advanced.enable')` in a Vue component
 2. Add to `src/locales/en/main.json`:
    ```json
diff --git a/.claude/commands/comprehensive-pr-review.md b/.claude/commands/comprehensive-pr-review.md
index 1b4047e782..b801fff9e1 100644
--- a/.claude/commands/comprehensive-pr-review.md
+++ b/.claude/commands/comprehensive-pr-review.md
@@ -15,6 +15,7 @@ To post inline comments, you will use the GitHub API via the `gh` command. Here'
    - Run: `gh pr view $PR_NUMBER --json commits --jq '.commits[-1].oid'` to get the latest commit SHA
 
 2. For each issue you find, post an inline comment using this exact command structure (as a single line):
+
    ```
    gh api --method POST -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" /repos/OWNER/REPO/pulls/$PR_NUMBER/comments -f body="YOUR_COMMENT_BODY" -f commit_id="COMMIT_SHA" -f path="FILE_PATH" -F line=LINE_NUMBER -f side="RIGHT"
    ```
@@ -22,13 +23,15 @@ To post inline comments, you will use the GitHub API via the `gh` command. Here'
 3. Format your comment body using actual newlines in the command. Use a heredoc or construct the body with proper line breaks:
    ```
    COMMENT_BODY="**[category] severity Priority**
+   ```
 
 **Issue**: Brief description of the problem
 **Context**: Why this matters  
 **Suggestion**: How to fix it"
-   ```
-   
-   Then use: `-f body="$COMMENT_BODY"`
+
+```
+
+Then use: `-f body="$COMMENT_BODY"`
 
 ## Phase 1: Environment Setup and PR Context
 
@@ -58,10 +61,12 @@ This is critical for better file inspection:
 1. Get PR metadata: `gh pr view $PR_NUMBER --json files,title,body,additions,deletions,baseRefName,headRefName > pr_info.json`
 2. Extract branch names from pr_info.json using jq
 3. Fetch and checkout the PR branch:
-   ```
-   git fetch origin "pull/$PR_NUMBER/head:pr-$PR_NUMBER"
-   git checkout "pr-$PR_NUMBER"
-   ```
+```
+
+git fetch origin "pull/$PR_NUMBER/head:pr-$PR_NUMBER"
+git checkout "pr-$PR_NUMBER"
+
+```
 
 ### Step 1.4: Get Changed Files and Diffs
 
@@ -100,9 +105,9 @@ Intelligently load only relevant knowledge:
 
 1. Use GitHub API to discover available knowledge folders: `https://api.github.com/repos/Comfy-Org/comfy-claude-prompt-library/contents/.claude/knowledge`
 2. For each knowledge folder, check if it's relevant by searching for the folder name in:
-   - Changed file paths
-   - PR title
-   - PR body
+- Changed file paths
+- PR title
+- PR body
 3. If relevant, download all files from that knowledge folder
 
 ### Step 2.4: Load Validation Rules
@@ -193,12 +198,14 @@ Consider:
 For each issue found, create a concise inline comment with this structure:
 
 ```
+
 **[category] severity Priority**
 
 **Issue**: Brief description of the problem
 **Context**: Why this matters
 **Suggestion**: How to fix it
-```
+
+````
 
 Categories: architecture/security/performance/quality
 Severities: critical/high/medium/low
@@ -214,7 +221,7 @@ For EACH issue:
 
 ```bash
 gh api --method POST -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" /repos/OWNER/REPO/pulls/$PR_NUMBER/comments -f body="$COMMENT_BODY" -f commit_id="COMMIT_SHA" -f path="FILE_PATH" -F line=LINE_NUMBER -f side="RIGHT"
-```
+````
 
 CRITICAL: The entire command must be on one line. Use actual values, not placeholders.
 
@@ -223,12 +230,14 @@ CRITICAL: The entire command must be on one line. Use actual values, not placeho
 Here's an example of how to review a file with a security issue:
 
 1. First, get the repository info:
+
    ```bash
    gh repo view --json owner,name
    # Output: {"owner":{"login":"Comfy-Org"},"name":"ComfyUI_frontend"}
    ```
 
 2. Get the commit SHA:
+
    ```bash
    gh pr view $PR_NUMBER --json commits --jq '.commits[-1].oid'
    # Output: abc123def456
@@ -240,14 +249,17 @@ Here's an example of how to review a file with a security issue:
    ```bash
    # First, create the comment body with proper newlines
    COMMENT_BODY="**[security] critical Priority**
+   ```
 
 **Issue**: SQL injection vulnerability - user input directly concatenated into query
 **Context**: Allows attackers to execute arbitrary SQL commands
 **Suggestion**: Use parameterized queries or prepared statements"
-   
-   # Then post the comment (as a single line)
-   gh api --method POST -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" /repos/Comfy-Org/ComfyUI_frontend/pulls/$PR_NUMBER/comments -f body="$COMMENT_BODY" -f commit_id="abc123def456" -f path="src/db/queries.js" -F line=42 -f side="RIGHT"
-   ```
+
+# Then post the comment (as a single line)
+
+gh api --method POST -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" /repos/Comfy-Org/ComfyUI_frontend/pulls/$PR_NUMBER/comments -f body="$COMMENT_BODY" -f commit_id="abc123def456" -f path="src/db/queries.js" -F line=42 -f side="RIGHT"
+
+```
 
 Repeat this process for every issue you find in the PR.
 
@@ -282,9 +294,9 @@ Analyze the PR to determine its type:
 1. Extract PR title and body from pr_info.json
 2. Count files, additions, and deletions
 3. Determine PR type:
-   - Feature: Check for tests, documentation, backward compatibility
-   - Bug fix: Verify root cause addressed, includes regression tests
-   - Refactor: Ensure behavior preservation, tests still pass
+- Feature: Check for tests, documentation, backward compatibility
+- Bug fix: Verify root cause addressed, includes regression tests
+- Refactor: Ensure behavior preservation, tests still pass
 
 ## Phase 7: Generate Comprehensive Summary
 
@@ -292,16 +304,17 @@ After ALL inline comments are posted, create a summary:
 
 1. Calculate total issues by category and severity
 2. Use `gh pr review $PR_NUMBER --comment` to post a summary with:
-   - Review disclaimer
-   - Issue distribution (counts by severity)
-   - Category breakdown
-   - Key findings for each category
-   - Positive observations
-   - References to guidelines
-   - Next steps
+- Review disclaimer
+- Issue distribution (counts by severity)
+- Category breakdown
+- Key findings for each category
+- Positive observations
+- References to guidelines
+- Next steps
 
 Include in the summary:
 ```
+
 # Comprehensive PR Review
 
 This review is generated by Claude. It may not always be accurate, as with human reviewers. If you believe that any of the comments are invalid or incorrect, please state why for each. For others, please implement the changes in one way or another.
@@ -312,12 +325,14 @@ This review is generated by Claude. It may not always be accurate, as with human
 **Impact**: [X] additions, [Y] deletions across [Z] files
 
 ### Issue Distribution
+
 - Critical: [CRITICAL_COUNT]
 - High: [HIGH_COUNT]
 - Medium: [MEDIUM_COUNT]
 - Low: [LOW_COUNT]
 
 ### Category Breakdown
+
 - Architecture: [ARCHITECTURE_ISSUES] issues
 - Security: [SECURITY_ISSUES] issues
 - Performance: [PERFORMANCE_ISSUES] issues
@@ -326,33 +341,42 @@ This review is generated by Claude. It may not always be accurate, as with human
 ## Key Findings
 
 ### Architecture & Design
+
 [Detailed architectural analysis based on repository patterns]
 
 ### Security Considerations
+
 [Security implications beyond basic vulnerabilities]
 
 ### Performance Impact
+
 [Performance analysis including bundle size, render impact]
 
 ### Integration Points
+
 [How this affects other systems, extensions, etc.]
 
 ## Positive Observations
+
 [What was done well, good patterns followed]
 
 ## References
+
 - [Repository Architecture Guide](https://github.com/Comfy-Org/comfy-claude-prompt-library/blob/master/project-summaries-for-agents/ComfyUI_frontend/REPOSITORY_GUIDE.md)
 - [Frontend Standards](https://github.com/Comfy-Org/comfy-claude-prompt-library/blob/master/.claude/commands/validation/frontend-code-standards.md)
 - [Security Guidelines](https://github.com/Comfy-Org/comfy-claude-prompt-library/blob/master/.claude/commands/validation/security-audit.md)
 
 ## Next Steps
+
 1. Address critical issues before merge
 2. Consider architectural feedback for long-term maintainability
 3. Add tests for uncovered scenarios
 4. Update documentation if needed
 
 ---
-*This is a comprehensive automated review. For architectural decisions requiring human judgment, please request additional manual review.*
+
+_This is a comprehensive automated review. For architectural decisions requiring human judgment, please request additional manual review._
+
 ```
 
 ## Important Guidelines
@@ -375,4 +399,5 @@ This is a COMPREHENSIVE review, not a linting pass. Provide the same quality fee
 5. Phase 6: Consider PR type for additional checks
 6. Phase 7: Post comprehensive summary ONLY after all inline comments
 
-Remember: Individual inline comments for each issue, then one final summary. Never batch issues into a single comment.
\ No newline at end of file
+Remember: Individual inline comments for each issue, then one final summary. Never batch issues into a single comment.
+```
diff --git a/.claude/commands/create-frontend-release.md b/.claude/commands/create-frontend-release.md
index f16189d428..5554b69557 100644
--- a/.claude/commands/create-frontend-release.md
+++ b/.claude/commands/create-frontend-release.md
@@ -7,8 +7,9 @@ Create a frontend release with version type: $ARGUMENTS
 
 Expected format: Version increment type and optional description
 Examples:
+
 - `patch` - Bug fixes only
-- `minor` - New features, backward compatible  
+- `minor` - New features, backward compatible
 - `major` - Breaking changes
 - `prerelease` - Alpha/beta/rc releases
 - `patch "Critical security fixes"` - With custom description
@@ -21,8 +22,9 @@ If no arguments provided, the command will always perform prerelease if the curr
 ## Prerequisites
 
 Before starting, ensure:
+
 - You have push access to the repository
-- GitHub CLI (`gh`) is authenticated  
+- GitHub CLI (`gh`) is authenticated
 - You're on a clean main branch working tree
 - All intended changes are merged to main
 - You understand the scope of changes being released
@@ -30,6 +32,7 @@ Before starting, ensure:
 ## Critical Checks Before Starting
 
 ### 1. Check Current Version Status
+
 ```bash
 # Get current version and check if it's a pre-release
 CURRENT_VERSION=$(node -p "require('./package.json').version")
@@ -40,6 +43,7 @@ fi
 ```
 
 ### 2. Find Last Stable Release
+
 ```bash
 # Get last stable release tag (no pre-release suffix)
 LAST_STABLE=$(git tag -l "v*" | grep -v "\-" | sort -V | tail -1)
@@ -49,6 +53,7 @@ echo "Last stable release: $LAST_STABLE"
 ## Configuration Options
 
 **Environment Variables:**
+
 - `RELEASE_SKIP_SECURITY_SCAN=true` - Skip security audit
 - `RELEASE_AUTO_APPROVE=true` - Skip some confirmation prompts
 - `RELEASE_DRY_RUN=true` - Simulate release without executing
@@ -129,13 +134,14 @@ echo "Last stable release: $LAST_STABLE"
 ### Step 4: Analyze Dependency Updates
 
 1. **Use pnpm's built-in dependency analysis:**
+
    ```bash
    # Get outdated dependencies with pnpm
    pnpm outdated --format table > outdated-deps-${NEW_VERSION}.txt
-   
+
    # Check for license compliance
    pnpm licenses ls --json > licenses-${NEW_VERSION}.json
-   
+
    # Analyze why specific dependencies exist
    echo "Dependency analysis:" > dep-analysis-${NEW_VERSION}.md
    MAJOR_DEPS=("vue" "vite" "@vitejs/plugin-vue" "typescript" "pinia")
@@ -147,22 +153,23 @@ echo "Last stable release: $LAST_STABLE"
    ```
 
 2. **Check for significant dependency updates:**
+
    ```bash
    # Extract all dependency changes for major version bumps
    OTHER_DEP_CHANGES=""
-   
+
    # Compare major dependency versions (you can extend this list)
    MAJOR_DEPS=("vue" "vite" "@vitejs/plugin-vue" "typescript" "pinia")
-   
+
    for dep in "${MAJOR_DEPS[@]}"; do
      PREV_VER=$(echo "$PREV_PACKAGE_JSON" | grep -o "\"$dep\": \"[^\"]*\"" | grep -o '[0-9][^"]*' | head -1 || echo "")
      CURR_VER=$(echo "$CURRENT_PACKAGE_JSON" | grep -o "\"$dep\": \"[^\"]*\"" | grep -o '[0-9][^"]*' | head -1 || echo "")
-     
+
      if [ "$PREV_VER" != "$CURR_VER" ] && [ -n "$PREV_VER" ] && [ -n "$CURR_VER" ]; then
        # Check if it's a major version change
        PREV_MAJOR=$(echo "$PREV_VER" | cut -d. -f1 | sed 's/[^0-9]//g')
        CURR_MAJOR=$(echo "$CURR_VER" | cut -d. -f1 | sed 's/[^0-9]//g')
-       
+
        if [ "$PREV_MAJOR" != "$CURR_MAJOR" ]; then
          OTHER_DEP_CHANGES="${OTHER_DEP_CHANGES}\n- **${dep}**: ${PREV_VER} → ${CURR_VER} (Major version change)"
        fi
@@ -173,11 +180,12 @@ echo "Last stable release: $LAST_STABLE"
 ### Step 5: Generate GTM Feature Summary
 
 1. **Collect PR data for analysis:**
+
    ```bash
    # Get list of PR numbers from commits
    PR_NUMBERS=$(git log ${BASE_TAG}..HEAD --oneline --no-merges --first-parent | \
      grep -oE "#[0-9]+" | tr -d '#' | sort -u)
-   
+
    # Save PR data for each PR
    echo "[" > prs-${NEW_VERSION}.json
    first=true
@@ -189,16 +197,17 @@ echo "Last stable release: $LAST_STABLE"
    ```
 
 2. **Analyze for GTM-worthy features:**
+
    ```
    <task>
    Review these PRs to identify features worthy of marketing attention.
-   
+
    A feature is GTM-worthy if it meets ALL of these criteria:
    - Introduces a NEW capability users didn't have before (not just improvements)
    - Would be a compelling reason for users to upgrade to this version
    - Can be demonstrated visually or has clear before/after comparison
    - Affects a significant portion of the user base
-   
+
    NOT GTM-worthy:
    - Bug fixes (even important ones)
    - Minor UI tweaks or color changes
@@ -206,19 +215,20 @@ echo "Last stable release: $LAST_STABLE"
    - Internal refactoring
    - Small convenience features
    - Features that only improve existing functionality marginally
-   
+
    For each GTM-worthy feature, note:
    - PR number, title, and author
    - Media links from the PR description
    - One compelling sentence on why users should care
-   
+
    If there are no GTM-worthy features, just say "No marketing-worthy features in this release."
    </task>
-   
+
    PR data: [contents of prs-${NEW_VERSION}.json]
    ```
 
 3. **Generate GTM notification using this EXACT Slack-compatible format:**
+
    ```bash
    # Only create file if GTM-worthy features exist:
    if [ "$GTM_FEATURES_FOUND" = "true" ]; then
@@ -252,8 +262,8 @@ echo "Last stable release: $LAST_STABLE"
    ```
 
    **CRITICAL Formatting Requirements:**
-   - Use single asterisk (*) for emphasis, NOT double (**)
-   - Use underscore (_) for italics
+   - Use single asterisk (\*) for emphasis, NOT double (\*\*)
+   - Use underscore (\_) for italics
    - Use 4 spaces for indentation (not tabs)
    - Convert author names to @username format (e.g., "John Smith" → "@john")
    - No section headers (#), no code language specifications
@@ -263,6 +273,7 @@ echo "Last stable release: $LAST_STABLE"
 ### Step 6: Version Preview
 
 **Version Preview:**
+
 - Current: `${CURRENT_VERSION}`
 - Proposed: Show exact version number based on analysis:
   - Major version if breaking changes detected
@@ -326,6 +337,7 @@ echo "Last stable release: $LAST_STABLE"
    done
    ```
 3. Create standardized release notes using this exact template:
+
    ```bash
    cat > release-notes-${NEW_VERSION}.md << 'EOF'
    ## ⚠️ Breaking Changes
@@ -359,6 +371,7 @@ echo "Last stable release: $LAST_STABLE"
    **Full Changelog**: https://github.com/Comfy-Org/ComfyUI_frontend/compare/${BASE_TAG}...v${NEW_VERSION}
    EOF
    ```
+
 4. **Parse commits and populate template:**
    - Group commits by conventional commit type (feat:, fix:, chore:, etc.)
    - Extract PR numbers from commit messages
@@ -375,16 +388,19 @@ echo "Last stable release: $LAST_STABLE"
 ### Step 10: Create Version Bump PR
 
 **For standard version bumps (patch/minor/major):**
+
 ```bash
 # Trigger the workflow
-gh workflow run version-bump.yaml -f version_type=${VERSION_TYPE}
+gh workflow run release-version-bump.yaml -f version_type=${VERSION_TYPE}
 
 # Workflow runs quickly - usually creates PR within 30 seconds
 echo "Workflow triggered. Waiting for PR creation..."
 ```
 
 **For releasing a stable version:**
+
 1. Must manually create branch and update version:
+
    ```bash
    git checkout -b version-bump-${NEW_VERSION}
    # Edit package.json to remove pre-release suffix
@@ -394,23 +410,25 @@ echo "Workflow triggered. Waiting for PR creation..."
    ```
 
 2. Wait for PR creation (if using workflow) or create manually:
+
    ```bash
    # For workflow-created PRs - wait and find it
    sleep 30
    # Look for PR from comfy-pr-bot (not github-actions)
    PR_NUMBER=$(gh pr list --author comfy-pr-bot --limit 1 --json number --jq '.[0].number')
-   
+
    # Verify we got the PR
    if [ -z "$PR_NUMBER" ]; then
      echo "PR not found yet. Checking recent PRs..."
      gh pr list --limit 5 --json number,title,author
    fi
-   
+
    # For manual PRs
    gh pr create --title "${NEW_VERSION}" \
      --body-file release-notes-${NEW_VERSION}.md \
      --label "Release"
    ```
+
 3. **Update PR with release notes:**
    ```bash
    # For workflow-created PRs, update the body with our release notes
@@ -425,28 +443,21 @@ echo "Workflow triggered. Waiting for PR creation..."
    gh pr view ${PR_NUMBER} --json labels | jq -r '.labels[].name' | grep -q "Release" || \
      echo "ERROR: Release label missing! Add it immediately!"
    ```
-2. Check for update-locales commits:
-   ```bash
-   # WARNING: update-locales may add [skip ci] which blocks release workflow!
-   gh pr view ${PR_NUMBER} --json commits | grep -q "skip ci" && \
-     echo "WARNING: [skip ci] detected - release workflow may not trigger!"
-   ```
-3. Verify version number in package.json
-4. Review all changed files
-5. Ensure no unintended changes included
-6. Wait for required PR checks:
+2. Verify version number in package.json
+3. Review all changed files
+4. Ensure no unintended changes included
+5. Wait for required PR checks:
    ```bash
    gh pr checks ${PR_NUMBER} --watch
    ```
-7. **FINAL CODE REVIEW**: Release label present and no [skip ci]?
+6. **FINAL CODE REVIEW**: Release label present and no [skip ci]?
 
 ### Step 12: Pre-Merge Validation
 
 1. **Review Requirements**: Release PRs require approval
-2. Monitor CI checks - watch for update-locales
-3. **CRITICAL WARNING**: If update-locales adds [skip ci], the release workflow won't trigger!
-4. Check no new commits to main since PR creation
-5. **DEPLOYMENT READINESS**: Ready to merge?
+2. Monitor CI checks
+3. Check no new commits to main since PR creation
+4. **DEPLOYMENT READINESS**: Ready to merge?
 
 ### Step 13: Execute Release
 
@@ -468,14 +479,14 @@ echo "Workflow triggered. Waiting for PR creation..."
    # Monitor branch creation (for minor/major releases)
    gh run list --workflow=release-branch-create.yaml --limit=1
    ```
-4. If workflow didn't trigger due to [skip ci]:
+5. If workflow didn't trigger due to [skip ci]:
    ```bash
    echo "ERROR: Release workflow didn't trigger!"
    echo "Options:"
    echo "1. Create patch release (e.g., 1.24.1) to trigger workflow"
    echo "2. Investigate manual release options"
    ```
-5. If workflow triggered, monitor execution:
+6. If workflow triggered, monitor execution:
    ```bash
    WORKFLOW_RUN_ID=$(gh run list --workflow=release-draft-create.yaml --limit=1 --json databaseId --jq '.[0].databaseId')
    gh run watch ${WORKFLOW_RUN_ID}
@@ -484,6 +495,7 @@ echo "Workflow triggered. Waiting for PR creation..."
 ### Step 14: Enhance GitHub Release
 
 1. Wait for automatic release creation:
+
    ```bash
    # Wait for release to be created
    while ! gh release view v${NEW_VERSION} >/dev/null 2>&1; do
@@ -493,13 +505,14 @@ echo "Workflow triggered. Waiting for PR creation..."
    ```
 
 2. **Enhance the GitHub release:**
+
    ```bash
    # Update release with our release notes
    gh release edit v${NEW_VERSION} \
      --title "🚀 ComfyUI Frontend v${NEW_VERSION}" \
      --notes-file release-notes-${NEW_VERSION}.md \
      --latest
-   
+
    # Add any additional assets if needed
    # gh release upload v${NEW_VERSION} additional-assets.zip
    ```
@@ -512,14 +525,17 @@ echo "Workflow triggered. Waiting for PR creation..."
 ### Step 15: Verify Multi-Channel Distribution
 
 1. **GitHub Release:**
+
    ```bash
    gh release view v${NEW_VERSION} --json assets,body,createdAt,tagName
    ```
+
    - ✅ Check release notes
    - ✅ Verify dist.zip attachment
    - ✅ Confirm release marked as latest (for main branch)
 
 2. **PyPI Package:**
+
    ```bash
    # Check PyPI availability (may take a few minutes)
    for i in {1..10}; do
@@ -533,6 +549,7 @@ echo "Workflow triggered. Waiting for PR creation..."
    ```
 
 3. **npm Package:**
+
    ```bash
    # Check npm availability
    for i in {1..10}; do
@@ -550,15 +567,17 @@ echo "Workflow triggered. Waiting for PR creation..."
 ### Step 16: Post-Release Monitoring Setup
 
 1. **Monitor immediate release health:**
+
    ```bash
    # Check for immediate issues
    gh issue list --label "bug" --state open --limit 5 --json title,number,createdAt
-   
+
    # Monitor download metrics (if accessible)
    gh release view v${NEW_VERSION} --json assets --jq '.assets[].downloadCount'
    ```
 
 2. **Update documentation tracking:**
+
    ```bash
    cat > post-release-checklist.md << EOF
    # Post-Release Checklist for v${NEW_VERSION}
@@ -589,6 +608,7 @@ echo "Workflow triggered. Waiting for PR creation..."
    ```
 
 3. **Create release summary:**
+
    ```bash
    cat > release-summary-${NEW_VERSION}.md << EOF
    # Release Summary: ComfyUI Frontend v${NEW_VERSION}
@@ -626,6 +646,7 @@ echo "Workflow triggered. Waiting for PR creation..."
 ### Step 17: Create Release Summary
 
 1. **Create comprehensive release summary:**
+
    ```bash
    cat > release-summary-${NEW_VERSION}.md << EOF
    # Release Summary: ComfyUI Frontend v${NEW_VERSION}
@@ -665,6 +686,7 @@ echo "Workflow triggered. Waiting for PR creation..."
 ### Rollback Procedures
 
 **Pre-Merge Rollback:**
+
 ```bash
 # Close version bump PR and reset
 gh pr close ${PR_NUMBER}
@@ -673,6 +695,7 @@ git clean -fd
 ```
 
 **Post-Merge Rollback:**
+
 ```bash
 # Create immediate patch release with reverts
 git revert ${RELEASE_COMMIT}
@@ -680,6 +703,7 @@ git revert ${RELEASE_COMMIT}
 ```
 
 **Emergency Procedures:**
+
 ```bash
 # Document incident
 cat > release-incident-${NEW_VERSION}.md << EOF
@@ -713,31 +737,39 @@ The command implements multiple quality gates:
 ## Common Scenarios
 
 ### Scenario 1: Regular Feature Release
+
 ```bash
 /project:create-frontend-release minor
 ```
+
 - Analyzes features since last release
 - Generates changelog automatically
 - Creates comprehensive release notes
 
 ### Scenario 2: Critical Security Patch
+
 ```bash
 /project:create-frontend-release patch "Security fixes for CVE-2024-XXXX"
 ```
+
 - Expedited security scanning
 - Enhanced monitoring setup
 
 ### Scenario 3: Major Version with Breaking Changes
+
 ```bash
 /project:create-frontend-release major
 ```
+
 - Comprehensive breaking change analysis
 - Migration guide generation
 
 ### Scenario 4: Pre-release Testing
+
 ```bash
 /project:create-frontend-release prerelease
 ```
+
 - Creates alpha/beta/rc versions
 - Draft release status
 - Python package specs require that prereleases use alpha/beta/rc as the preid
@@ -747,10 +779,12 @@ The command implements multiple quality gates:
 When executing this release process, pay attention to these key aspects:
 
 ### Version Handling
+
 - For pre-release versions (e.g., 1.24.0-rc.1), the next stable release should be the same version without the suffix (1.24.0)
 - Never skip version numbers - follow semantic versioning strictly
 
 ### Commit History Analysis
+
 - **ALWAYS** use `--first-parent` flag with git log to avoid including commits from merged feature branches
 - Verify PR merge targets before including them in changelogs:
   ```bash
@@ -758,6 +792,7 @@ When executing this release process, pay attention to these key aspects:
   ```
 
 ### Release Workflow Triggers
+
 - The "Release" label on the PR is **CRITICAL** - without it, PyPI/npm publishing won't occur
 - Check for `[skip ci]` in commit messages before merging - this blocks the release workflow
 - If you encounter `[skip ci]`, push an empty commit to override it:
@@ -766,11 +801,13 @@ When executing this release process, pay attention to these key aspects:
   ```
 
 ### PR Creation Details
+
 - Version bump PRs come from `comfy-pr-bot`, not `github-actions`
 - The workflow typically completes in 20-30 seconds
 - Always wait for the PR to be created before trying to edit it
 
 ### Breaking Changes Detection
+
 - Analyze changes to public-facing APIs:
   - The `app` object and its methods
   - The `api` module exports
@@ -779,9 +816,10 @@ When executing this release process, pay attention to these key aspects:
 - Any modifications to these require marking as breaking changes
 
 ### Recovery Procedures
+
 If the release workflow fails to trigger:
+
 1. Create a revert PR to restore the previous version
 2. Merge the revert
 3. Re-run the version bump workflow
 4. This approach is cleaner than creating extra version numbers
-
diff --git a/.claude/commands/create-hotfix-release.md b/.claude/commands/create-hotfix-release.md
index cc9c37ef5b..8c68ef8880 100644
--- a/.claude/commands/create-hotfix-release.md
+++ b/.claude/commands/create-hotfix-release.md
@@ -3,10 +3,11 @@
 This command creates patch/hotfix releases for ComfyUI Frontend by backporting fixes to stable core branches. It handles both automated backports (preferred) and manual cherry-picking (fallback).
 
 **Process Overview:**
+
 1. **Check automated backports first** (via labels)
 2. **Skip to version bump** if backports already merged
 3. **Manual cherry-picking** if automation failed
-4. **Create patch release** with version bump  
+4. **Create patch release** with version bump
 5. **Publish GitHub release** (manually uncheck "latest")
 6. **Update ComfyUI requirements.txt** via PR
 
@@ -14,7 +15,8 @@ This command creates patch/hotfix releases for ComfyUI Frontend by backporting f
 Create a hotfix release by backporting commits/PRs from main to a core branch: $ARGUMENTS
 
 Expected format: Comma-separated list of commits or PR numbers
-Examples: 
+Examples:
+
 - `#1234,#5678` (PRs - preferred)
 - `abc123,def456` (commit hashes)
 - `#1234,abc123` (mixed)
@@ -25,7 +27,7 @@ If no arguments provided, the command will guide you through identifying commits
 ## Prerequisites
 
 - Push access to repository
-- GitHub CLI (`gh`) authenticated  
+- GitHub CLI (`gh`) authenticated
 - Clean working tree
 - Understanding of what fixes need backporting
 
@@ -36,11 +38,13 @@ If no arguments provided, the command will guide you through identifying commits
 **Check if automated backports were attempted:**
 
 1. **For each PR, check existing backport labels:**
+
    ```bash
    gh pr view #1234 --json labels | jq -r '.labels[].name'
    ```
 
 2. **If no backport labels exist, add them now:**
+
    ```bash
    # Add backport labels (this triggers automated backports)
    gh pr edit #1234 --add-label "needs-backport"
@@ -48,6 +52,7 @@ If no arguments provided, the command will guide you through identifying commits
    ```
 
 3. **Check for existing backport PRs:**
+
    ```bash
    # Check for backport PRs created by automation
    PR_NUMBER=${ARGUMENTS%%,*}  # Extract first PR number from arguments
@@ -58,18 +63,22 @@ If no arguments provided, the command will guide you through identifying commits
 4. **Handle existing backport scenarios:**
 
    **Scenario A: Automated backports already merged**
+
    ```bash
    # Check if backport PRs were merged to core branches
    gh pr list --search "backport-${PR_NUMBER}-to" --state merged
    ```
+
    - If backport PRs are merged → Skip to Step 10 (Version Bump)
    - **CONFIRMATION**: Automated backports completed, proceeding to version bump?
 
    **Scenario B: Automated backport PRs exist but not merged**
+
    ```bash
    # Show open backport PRs that need merging
    gh pr list --search "backport-${PR_NUMBER}-to" --state open
    ```
+
    - **ACTION REQUIRED**: Merge the existing backport PRs first
    - Use: `gh pr merge [PR_NUMBER] --merge` for each backport PR
    - After merging, return to this command and skip to Step 10 (Version Bump)
@@ -127,6 +136,7 @@ If no arguments provided, the command will guide you through identifying commits
 ### Step 6: Cherry-pick Changes
 
 For each commit:
+
 1. Attempt cherry-pick: `git cherry-pick <commit>`
 2. If conflicts occur:
    - Display conflict details
@@ -198,6 +208,7 @@ For each commit:
    ```
 3. **CRITICAL**: Verify "Release" label is added
 4. Create standardized release notes:
+
    ```bash
    cat > release-notes-${NEW_VERSION}.md << 'EOF'
    ## ⚠️ Breaking Changes
@@ -231,12 +242,14 @@ For each commit:
    **Full Changelog**: https://github.com/Comfy-Org/ComfyUI_frontend/compare/v${CURRENT_VERSION}...v${NEW_VERSION}
    EOF
    ```
+
    - For hotfixes, typically only populate the "Bug Fixes" section
    - Include links to the cherry-picked PRs/commits
    - Update the PR body with the release notes:
      ```bash
      gh pr edit ${PR_NUMBER} --body-file release-notes-${NEW_VERSION}.md
      ```
+
 5. **CONFIRMATION REQUIRED**: Release PR has "Release" label?
 
 ### Step 12: Monitor Release Process
@@ -262,7 +275,7 @@ For each commit:
 2. **Find the DRAFT release** (e.g., "v1.23.5 Draft")
 3. **Click "Edit release"**
 4. **UNCHECK "Set as the latest release"** ⚠️ **CRITICAL**
-   - This prevents the hotfix from showing as "latest" 
+   - This prevents the hotfix from showing as "latest"
    - Main branch should always be "latest release"
 5. **Click "Publish release"**
 6. **CONFIRMATION REQUIRED**: Draft release published with "latest" unchecked?
@@ -272,6 +285,7 @@ For each commit:
 **IMPORTANT**: Create PR to update ComfyUI's requirements.txt via fork:
 
 1. **Setup fork (if needed):**
+
    ```bash
    # Check if fork already exists
    if gh repo view ComfyUI --json owner | jq -r '.owner.login' | grep -q "$(gh api user --jq .login)"; then
@@ -284,30 +298,32 @@ For each commit:
    ```
 
 2. **Clone fork and create branch:**
+
    ```bash
    # Clone your fork (or use existing clone)
    GITHUB_USER=$(gh api user --jq .login)
    if [ ! -d "ComfyUI-fork" ]; then
      gh repo clone ${GITHUB_USER}/ComfyUI ComfyUI-fork
    fi
-   
+
    cd ComfyUI-fork
    git checkout master
    git pull origin master
-   
+
    # Create update branch
    BRANCH_NAME="update-frontend-${NEW_VERSION}"
    git checkout -b ${BRANCH_NAME}
    ```
 
 3. **Update requirements.txt:**
+
    ```bash
    # Update the version in requirements.txt
    sed -i "s/comfyui-frontend-package==[0-9].*$/comfyui-frontend-package==${NEW_VERSION}/" requirements.txt
-   
+
    # Verify the change
    grep "comfyui-frontend-package" requirements.txt
-   
+
    # Commit the change
    git add requirements.txt
    git commit -m "Bump frontend to ${NEW_VERSION}"
@@ -321,7 +337,8 @@ For each commit:
      --repo comfyanonymous/ComfyUI \
      --title "Bump frontend to ${NEW_VERSION}" \
      --body "$(cat <<EOF
-Bump frontend to ${NEW_VERSION}
+   Bump frontend to ${NEW_VERSION}
+   ```
 
 \`\`\`
 python main.py --front-end-version Comfy-Org/ComfyUI_frontend@${NEW_VERSION}
@@ -334,15 +351,19 @@ python main.py --front-end-version Comfy-Org/ComfyUI_frontend@${NEW_VERSION}
 ## Changes
 
 - Fix: [Brief description of hotfixes included]
-EOF
-)"
-   ```
+  EOF
+  )"
+
+  ```
+
+  ```
 
 5. **Clean up:**
+
    ```bash
    # Return to original directory
    cd ..
-   
+
    # Keep fork directory for future updates
    echo "Fork directory 'ComfyUI-fork' kept for future use"
    ```
@@ -375,6 +396,7 @@ EOF
 ## Safety Checks
 
 Throughout the process:
+
 - Always verify core branch matches ComfyUI's requirements.txt
 - For PRs: Ensure using correct commits (merge vs individual)
 - Check version numbers follow semantic versioning
@@ -385,6 +407,7 @@ Throughout the process:
 ## Rollback Procedures
 
 If something goes wrong:
+
 - Before push: `git reset --hard origin/core/X.Y`
 - After PR creation: Close PR and start over
 - After failed release: Create new patch version with fixes
@@ -404,16 +427,16 @@ If something goes wrong:
 ## Modern Workflow Context
 
 **Primary Backport Method:** Automated via `needs-backport` + `X.YY` labels
-**This Command Usage:** 
+**This Command Usage:**
+
 - Smart path detection - skip to version bump if backports already merged
 - Fallback to manual cherry-picking only when automation fails/has conflicts
-**Complete Hotfix:** Includes GitHub release publishing + ComfyUI requirements.txt integration
+  **Complete Hotfix:** Includes GitHub release publishing + ComfyUI requirements.txt integration
 
 ## Workflow Paths
 
 - **Path A:** Backports already merged → Skip to Step 10 (Version Bump)
-- **Path B:** Backport PRs need merging → Merge them → Skip to Step 10 (Version Bump)  
+- **Path B:** Backport PRs need merging → Merge them → Skip to Step 10 (Version Bump)
 - **Path C:** No/failed backports → Manual cherry-picking (Steps 2-9) → Version Bump (Step 10)
 
-
-This process ensures a complete hotfix release with proper GitHub publishing, ComfyUI integration, and multiple safety checkpoints.
\ No newline at end of file
+This process ensures a complete hotfix release with proper GitHub publishing, ComfyUI integration, and multiple safety checkpoints.
diff --git a/.claude/commands/setup_repo.md b/.claude/commands/setup_repo.md
index d82e22ec61..f77115564b 100644
--- a/.claude/commands/setup_repo.md
+++ b/.claude/commands/setup_repo.md
@@ -5,6 +5,7 @@ Bootstrap the ComfyUI Frontend monorepo with all necessary dependencies and veri
 ## Overview
 
 This command will:
+
 1. Install pnpm package manager (if not present)
 2. Install all project dependencies
 3. Verify the project builds successfully
@@ -93,7 +94,7 @@ sleep 10
 # Check if server is running
 if curl -s http://localhost:5173 > /dev/null 2>&1; then
   echo "✅ Development server started successfully at http://localhost:5173"
-  
+
   # Kill the background server
   kill $SERVER_PID
   wait $SERVER_PID 2>/dev/null
@@ -122,7 +123,7 @@ echo "  pnpm build        - Build for production"
 echo "  pnpm test:unit    - Run unit tests"
 echo "  pnpm typecheck    - Run TypeScript checks"
 echo "  pnpm lint         - Run ESLint"
-echo "  pnpm format       - Format code with Prettier"
+echo "  pnpm format       - Format code with oxfmt"
 echo ""
 echo "Next steps:"
 echo "1. Run 'pnpm dev' to start developing"
@@ -154,4 +155,4 @@ After running the setup, manually verify:
 - Node.js >= 24
 - Git repository
 - Internet connection for package downloads
-- Available ports (typically 5173 for dev server)
\ No newline at end of file
+- Available ports (typically 5173 for dev server)
diff --git a/.claude/commands/verify-visually.md b/.claude/commands/verify-visually.md
index 66260b159f..7258d4b114 100644
--- a/.claude/commands/verify-visually.md
+++ b/.claude/commands/verify-visually.md
@@ -12,10 +12,10 @@ Follow these steps systematically to verify our changes:
 2. **Visual Testing Process**
    - Navigate to http://localhost:5173/
    - For each target page (specified in arguments or recently changed files):
-     * Navigate to the page using direct URL or site navigation
-     * Take a high-quality screenshot
-     * Analyze the screenshot for the specific changes we implemented
-     * Document any visual issues or improvements needed
+     - Navigate to the page using direct URL or site navigation
+     - Take a high-quality screenshot
+     - Analyze the screenshot for the specific changes we implemented
+     - Document any visual issues or improvements needed
 
 3. **Quality Verification**
    Check each page for:
@@ -27,7 +27,7 @@ Follow these steps systematically to verify our changes:
    - Typography and readability
    - Color scheme consistency
    - Interactive elements (buttons, links, forms)
-</instructions>
+     </instructions>
 
 <examples>
 Common issues to watch for:
@@ -48,10 +48,11 @@ For each page tested, provide:
 4. Overall assessment of visual quality
 
 If you find issues, be specific about:
+
 - Exact location of the problem
 - Expected vs actual behavior
 - Severity level (critical, important, minor)
 - Suggested fix if obvious
-</reporting>
+  </reporting>
 
-Remember: Take your time with each screenshot and analysis. Visual quality directly impacts user experience and our project's professional appearance.
\ No newline at end of file
+Remember: Take your time with each screenshot and analysis. Visual quality directly impacts user experience and our project's professional appearance.
diff --git a/.claude/skills/regenerating-screenshots/SKILL.md b/.claude/skills/regenerating-screenshots/SKILL.md
new file mode 100644
index 0000000000..b9a123a038
--- /dev/null
+++ b/.claude/skills/regenerating-screenshots/SKILL.md
@@ -0,0 +1,83 @@
+---
+name: regenerating-screenshots
+description: 'Creates a PR to regenerate Playwright screenshot expectations. Use when screenshot tests are failing on main or PRs due to stale golden images. Triggers on: regen screenshots, regenerate screenshots, update expectations, fix screenshot tests.'
+---
+
+# Regenerating Playwright Screenshot Expectations
+
+Automates the process of triggering the `PR: Update Playwright Expectations`
+GitHub Action by creating a labeled PR from `origin/main`.
+
+## Steps
+
+1. **Fetch latest main**
+
+   ```bash
+   git fetch origin main
+   ```
+
+2. **Create a timestamped branch** from `origin/main`
+
+   Format: `regen-screenshots/YYYY-MM-DDTHH` (hour resolution, local time)
+
+   ```bash
+   git checkout -b regen-screenshots/<datetime> origin/main
+   ```
+
+3. **Create an empty commit**
+
+   ```bash
+   git commit --allow-empty -m "test: regenerate screenshot expectations"
+   ```
+
+4. **Push the branch**
+
+   ```bash
+   git push origin regen-screenshots/<datetime>
+   ```
+
+5. **Generate a poem** about regenerating screenshots. Be creative — a
+   new, unique poem every time. Short (4–8 lines). Can be funny, wistful,
+   epic, haiku-style, limerick, sonnet fragment — vary the form.
+
+6. **Create the PR** with the poem as the body (no label yet).
+
+   Write the poem to a temp file and use `--body-file`:
+
+   ```bash
+   # Write poem to temp file
+   # Create PR:
+   gh pr create \
+     --base main \
+     --head regen-screenshots/<datetime> \
+     --title "test: regenerate screenshot expectations" \
+     --body-file <temp-file>
+   ```
+
+7. **Add the label** as a separate step to trigger the GitHub Action.
+
+   The `labeled` event only fires when a label is added after PR
+   creation, not when applied during creation via `--label`.
+
+   Use the GitHub API directly (`gh pr edit --add-label` fails due to
+   deprecated Projects Classic GraphQL errors):
+
+   ```bash
+   gh api repos/{owner}/{repo}/issues/<pr-number>/labels \
+     -f "labels[]=New Browser Test Expectations" --method POST
+   ```
+
+8. **Report the result** to the user:
+   - PR URL
+   - Branch name
+   - Note that the GitHub Action will run automatically and commit
+     updated screenshots to the branch.
+
+## Notes
+
+- The `New Browser Test Expectations` label triggers the
+  `pr-update-playwright-expectations.yaml` workflow.
+- The workflow runs Playwright with `--update-snapshots`, commits results
+  back to the PR branch, then removes the label.
+- This is fire-and-forget — no need to wait for or monitor the Action.
+- Always return to the original branch/worktree state after pushing.
diff --git a/.claude/skills/writing-playwright-tests/SKILL.md b/.claude/skills/writing-playwright-tests/SKILL.md
new file mode 100644
index 0000000000..02212038f9
--- /dev/null
+++ b/.claude/skills/writing-playwright-tests/SKILL.md
@@ -0,0 +1,200 @@
+---
+name: writing-playwright-tests
+description: 'Writes Playwright e2e tests for ComfyUI_frontend. Use when creating, modifying, or debugging browser tests. Triggers on: playwright, e2e test, browser test, spec file.'
+---
+
+# Writing Playwright Tests for ComfyUI_frontend
+
+## Golden Rules
+
+1. **ALWAYS look at existing tests first.** Search `browser_tests/tests/` for similar patterns before writing new tests.
+
+2. **ALWAYS read the fixture code.** The APIs are in `browser_tests/fixtures/` - read them directly instead of guessing.
+
+3. **Use premade JSON workflow assets** instead of building workflows programmatically.
+   - Assets live in `browser_tests/assets/`
+   - Load with `await comfyPage.workflow.loadWorkflow('feature/my_workflow')`
+   - Create new assets by starting with `browser_tests/assets/default.json` and manually editing the JSON to match your desired graph state
+
+## Vue Nodes vs LiteGraph: Decision Guide
+
+Choose based on **what you're testing**, not personal preference:
+
+| Testing...                                     | Use                              | Why                                      |
+| ---------------------------------------------- | -------------------------------- | ---------------------------------------- |
+| Vue-rendered node UI, DOM widgets, CSS states  | `comfyPage.vueNodes.*`           | Nodes are DOM elements, use locators     |
+| Canvas interactions, connections, legacy nodes | `comfyPage.nodeOps.*`            | Canvas-based, use coordinates/references |
+| Both in same test                              | Pick primary, minimize switching | Avoid confusion                          |
+
+**Vue Nodes requires explicit opt-in:**
+
+```typescript
+await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+await comfyPage.vueNodes.waitForNodes()
+```
+
+**Vue Node state uses CSS classes:**
+
+```typescript
+const BYPASS_CLASS = /before:bg-bypass\/60/
+await expect(node).toHaveClass(BYPASS_CLASS)
+```
+
+## Common Issues
+
+These are frequent causes of flaky tests - check them first, but investigate if they don't apply:
+
+| Symptom                            | Common Cause              | Typical Fix                                                                            |
+| ---------------------------------- | ------------------------- | -------------------------------------------------------------------------------------- |
+| Test passes locally, fails in CI   | Missing nextFrame()       | Add `await comfyPage.nextFrame()` after canvas ops (not needed after `loadWorkflow()`) |
+| Keyboard shortcuts don't work      | Missing focus             | Add `await comfyPage.canvas.click()` first                                             |
+| Double-click doesn't trigger       | Timing too fast           | Add `{ delay: 5 }` option                                                              |
+| Elements end up in wrong position  | Drag animation incomplete | Use `{ steps: 10 }` not `{ steps: 1 }`                                                 |
+| Widget value wrong after drag-drop | Upload incomplete         | Add `{ waitForUpload: true }`                                                          |
+| Test fails when run with others    | Test pollution            | Add `afterEach` with `resetView()`                                                     |
+| Local screenshots don't match CI   | Platform differences      | Screenshots are Linux-only, use PR label                                               |
+
+## Test Tags
+
+Add appropriate tags to every test:
+
+| Tag           | When to Use                               |
+| ------------- | ----------------------------------------- |
+| `@smoke`      | Quick essential tests                     |
+| `@slow`       | Tests > 10 seconds                        |
+| `@screenshot` | Visual regression tests                   |
+| `@canvas`     | Canvas interactions                       |
+| `@node`       | Node-related                              |
+| `@widget`     | Widget-related                            |
+| `@mobile`     | Mobile viewport (runs on Pixel 5 project) |
+| `@2x`         | HiDPI tests (runs on 2x scale project)    |
+
+```typescript
+test.describe('Feature', { tag: ['@screenshot', '@canvas'] }, () => {
+```
+
+## Retry Patterns
+
+**Never use `waitForTimeout`** - it's always wrong.
+
+| Pattern                  | Use Case                                             |
+| ------------------------ | ---------------------------------------------------- |
+| Auto-retrying assertions | `toBeVisible()`, `toHaveText()`, etc. (prefer these) |
+| `expect.poll()`          | Single value polling                                 |
+| `expect().toPass()`      | Multiple assertions that must all pass               |
+
+```typescript
+// Prefer auto-retrying assertions when possible
+await expect(node).toBeVisible()
+
+// Single value polling
+await expect.poll(() => widget.getValue(), { timeout: 2000 }).toBe(100)
+
+// Multiple conditions
+await expect(async () => {
+  expect(await node1.getValue()).toBe('foo')
+  expect(await node2.getValue()).toBe('bar')
+}).toPass({ timeout: 2000 })
+```
+
+## Screenshot Baselines
+
+- **Screenshots are Linux-only.** Don't commit local screenshots.
+- **To update baselines:** Add PR label `New Browser Test Expectations`
+- **Mask dynamic content:**
+  ```typescript
+  await expect(comfyPage.canvas).toHaveScreenshot('page.png', {
+    mask: [page.locator('.timestamp')]
+  })
+  ```
+
+## CI Debugging
+
+1. Download artifacts from failed CI run
+2. Extract and view trace: `npx 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`
+
+## Anti-Patterns
+
+Avoid these common mistakes:
+
+1. **Arbitrary waits** - Use retrying assertions instead
+
+   ```typescript
+   // ❌ await page.waitForTimeout(500)
+   // ✅ await expect(element).toBeVisible()
+   ```
+
+2. **Implementation-tied selectors** - Use test IDs or semantic selectors
+
+   ```typescript
+   // ❌ page.locator('div.container > button.btn-primary')
+   // ✅ page.getByTestId('submit-button')
+   ```
+
+3. **Missing nextFrame after canvas ops** - Canvas needs sync time
+
+   ```typescript
+   await node.drag({ x: 50, y: 50 })
+   await comfyPage.nextFrame() // Required
+   ```
+
+4. **Shared state between tests** - Tests must be independent
+   ```typescript
+   // ❌ let sharedData  // Outside test
+   // ✅ Define state inside each test
+   ```
+
+## Quick Start Template
+
+```typescript
+// Path depends on test file location - adjust '../' segments accordingly
+import {
+  comfyPageFixture as test,
+  comfyExpect as expect
+} from '../fixtures/ComfyPage'
+
+test.describe('FeatureName', { tag: ['@canvas'] }, () => {
+  test.afterEach(async ({ comfyPage }) => {
+    await comfyPage.canvasOps.resetView()
+  })
+
+  test('should do something', async ({ comfyPage }) => {
+    await comfyPage.workflow.loadWorkflow('myWorkflow')
+
+    const node = (await comfyPage.nodeOps.getNodeRefsByTitle('KSampler'))[0]
+    // ... test logic
+
+    await expect(comfyPage.canvas).toHaveScreenshot('expected.png')
+  })
+})
+```
+
+## Finding Patterns
+
+```bash
+# Find similar tests
+grep -r "KSampler" browser_tests/tests/
+
+# Find usage of a fixture method
+grep -r "loadWorkflow" browser_tests/tests/
+
+# Find tests with specific tag
+grep -r '@screenshot' browser_tests/tests/
+```
+
+## Key Files to Read
+
+| Purpose           | Path                                       |
+| ----------------- | ------------------------------------------ |
+| Main fixture      | `browser_tests/fixtures/ComfyPage.ts`      |
+| Helper classes    | `browser_tests/fixtures/helpers/`          |
+| Component objects | `browser_tests/fixtures/components/`       |
+| Test selectors    | `browser_tests/fixtures/selectors.ts`      |
+| Vue Node helpers  | `browser_tests/fixtures/VueNodeHelpers.ts` |
+| Test assets       | `browser_tests/assets/`                    |
+| Existing tests    | `browser_tests/tests/`                     |
+
+**Read the fixture code directly** - it's the source of truth for available methods.
diff --git a/.coderabbit.yaml b/.coderabbit.yaml
new file mode 100644
index 0000000000..5b3ec34b3f
--- /dev/null
+++ b/.coderabbit.yaml
@@ -0,0 +1,14 @@
+issue_enrichment:
+  auto_enrich:
+    enabled: true
+reviews:
+  high_level_summary: false
+  auto_review:
+    drafts: true
+    ignore_title_keywords:
+      - '[release]'
+      - '[backport'
+    ignore_usernames:
+      - comfy-pr-bot
+      - github-actions
+      - github-actions[bot]
diff --git a/.cursor/rules/unit-test.mdc b/.cursor/rules/unit-test.mdc
deleted file mode 100644
index 2c6704f3e2..0000000000
--- a/.cursor/rules/unit-test.mdc
+++ /dev/null
@@ -1,21 +0,0 @@
----
-description: Creating unit tests
-globs: 
-alwaysApply: false
----
-
-# Creating unit tests
-
-- This project uses `vitest` for unit testing
-- Tests are stored in the `test/` directory
-- Tests should be cross-platform compatible; able to run on Windows, macOS, and linux
-  - e.g. the use of `path.resolve`, or `path.join` and `path.sep` to ensure that tests work the same on all platforms
-- Tests should be mocked properly
-  - Mocks should be cleanly written and easy to understand
-  - Mocks should be re-usable where possible
-
-## Unit test style
-
-- Prefer the use of `test.extend` over loose variables
-  - To achieve this, import `test as baseTest` from `vitest`
-- Never use `it`; `test` should be used in place of this
\ No newline at end of file
diff --git a/.gitattributes b/.gitattributes
index 39d7f722cd..c153cc3202 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,16 +1,5 @@
-# Default
-* text=auto
-
-# Force TS to LF to make the unixy scripts not break on Windows
-*.cjs text eol=lf
-*.js text eol=lf
-*.json text eol=lf
-*.mjs text eol=lf
-*.mts text eol=lf
-*.snap text eol=lf
-*.ts text eol=lf
-*.vue text eol=lf
-*.yaml text eol=lf
+# Force all text files to use LF line endings
+* text=auto eol=lf
 
 # Generated files
 packages/registry-types/src/comfyRegistryTypes.ts linguist-generated=true
diff --git a/.github/AGENTS.md b/.github/AGENTS.md
new file mode 100644
index 0000000000..9da6f75335
--- /dev/null
+++ b/.github/AGENTS.md
@@ -0,0 +1,23 @@
+# PR Review Context
+
+Context for automated PR review system.
+
+## Review Scope
+
+This automated review performs comprehensive analysis:
+
+- Architecture and design patterns
+- Security vulnerabilities
+- Performance implications
+- Code quality and maintainability
+- Integration concerns
+
+For implementation details, see `.claude/commands/comprehensive-pr-review.md`.
+
+## GitHub Actions: Fork PR Permissions
+
+Fork PRs get a **read-only `GITHUB_TOKEN`** — no PR comments, no secret access, no pushing.
+
+Any workflow that needs write access must use the **two-workflow split**: a `pull_request`-triggered `ci-*.yaml` uploads artifacts (including PR metadata), then a `workflow_run`-triggered `pr-*.yaml` downloads them and posts comments with write permissions. See `ci-size-data` → `pr-size-report` or `ci-perf-report` → `pr-perf-report`. Use `.github/actions/post-pr-report-comment` for the comment step.
+
+Never write PR comments directly from `pull_request` workflows or use `pull_request_target` to run untrusted code.
diff --git a/.github/CLAUDE.md b/.github/CLAUDE.md
index 9a95d8cd0f..fc844bc41f 100644
--- a/.github/CLAUDE.md
+++ b/.github/CLAUDE.md
@@ -1,36 +1,4 @@
-# ComfyUI Frontend - Claude Review Context
+<!-- A rose by any other name would smell as sweet,
+     But Claude insists on files named for its own conceit. -->
 
-This file provides additional context for the automated PR review system.
-
-## Quick Reference
-
-### PrimeVue Component Migrations
-
-When reviewing, flag these deprecated components:
-- `Dropdown` → Use `Select` from 'primevue/select'
-- `OverlayPanel` → Use `Popover` from 'primevue/popover'
-- `Calendar` → Use `DatePicker` from 'primevue/datepicker'
-- `InputSwitch` → Use `ToggleSwitch` from 'primevue/toggleswitch'
-- `Sidebar` → Use `Drawer` from 'primevue/drawer'
-- `Chips` → Use `AutoComplete` with multiple enabled and typeahead disabled
-- `TabMenu` → Use `Tabs` without panels
-- `Steps` → Use `Stepper` without panels
-- `InlineMessage` → Use `Message` component
-
-### API Utilities Reference
-
-- `api.apiURL()` - Backend API calls (/prompt, /queue, /view, etc.)
-- `api.fileURL()` - Static file access (templates, extensions)
-- `$t()` / `i18n.global.t()` - Internationalization
-- `DOMPurify.sanitize()` - HTML sanitization
-
-## Review Scope
-
-This automated review performs comprehensive analysis including:
-- Architecture and design patterns
-- Security vulnerabilities
-- Performance implications
-- Code quality and maintainability
-- Integration concerns
-
-For implementation details, see `.claude/commands/comprehensive-pr-review.md`.
\ No newline at end of file
+@AGENTS.md
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yaml b/.github/ISSUE_TEMPLATE/bug-report.yaml
index 2ed7cf2064..bde3829f75 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yaml
@@ -10,10 +10,7 @@ body:
       options:
         - label: I am running the latest version of ComfyUI
           required: true
-        - label: I have searched existing issues to make sure this isn't a duplicate
-          required: true
-        - label: I have tested with all custom nodes disabled ([see how](https://docs.comfy.org/troubleshooting/custom-node-issues#step-1%3A-test-with-all-custom-nodes-disabled))
-          required: true
+        - label: I have custom nodes enabled
 
   - type: textarea
     id: description
@@ -60,7 +57,7 @@ body:
     attributes:
       label: ComfyUI Frontend Version
       description: Found in Settings > About (e.g., "1.3.45")
-      placeholder: "1.3.45"
+      placeholder: '1.3.45'
     validations:
       required: true
 
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yaml b/.github/ISSUE_TEMPLATE/feature-request.yaml
index 0d8173b285..2d26a09812 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yaml
@@ -4,13 +4,6 @@ labels: []
 type: Feature
 
 body:
-  - type: checkboxes
-    attributes:
-      label: Is there an existing issue for this?
-      description: Please search to see if an issue already exists for the problem you're experiencing, and that it's not addressed in a recent build/commit.
-      options:
-        - label: I have searched the existing issues and checked the recent builds/commits
-          required: true
   - type: markdown
     attributes:
       value: |
diff --git a/.github/actions/comment-release-links/action.yaml b/.github/actions/comment-release-links/action.yaml
index a198604e9d..3fc7046166 100644
--- a/.github/actions/comment-release-links/action.yaml
+++ b/.github/actions/comment-release-links/action.yaml
@@ -104,14 +104,14 @@ runs:
 
     - name: Find existing comment
       id: find
-      uses: peter-evans/find-comment@b30e6a3c0ed37e7c023ccd3f1db5c6c0b0c23aad
+      uses: peter-evans/find-comment@b30e6a3c0ed37e7c023ccd3f1db5c6c0b0c23aad # v4.0.0
       with:
         issue-number: ${{ inputs.issue-number || github.event.pull_request.number }}
         comment-author: github-actions[bot]
         body-includes: ${{ steps.build.outputs.marker_search }}
 
     - name: Post or update comment
-      uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9
+      uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
       with:
         issue-number: ${{ inputs.issue-number || github.event.pull_request.number }}
         comment-id: ${{ steps.find.outputs.comment-id }}
diff --git a/.github/actions/post-pr-report-comment/action.yaml b/.github/actions/post-pr-report-comment/action.yaml
new file mode 100644
index 0000000000..3adaae7f83
--- /dev/null
+++ b/.github/actions/post-pr-report-comment/action.yaml
@@ -0,0 +1,35 @@
+name: Post PR Report Comment
+description: Reads a markdown report file and posts/updates a single idempotent comment on a PR.
+
+inputs:
+  pr-number:
+    description: PR number to comment on
+    required: true
+  report-file:
+    description: Path to the markdown report file
+    required: true
+  comment-marker:
+    description: HTML comment marker for idempotent matching
+    required: true
+  token:
+    description: GitHub token with pull-requests write permission
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - name: Read report
+      id: report
+      uses: juliangruber/read-file-action@b549046febe0fe86f8cb4f93c24e284433f9ab58 # v1.1.7
+      with:
+        path: ${{ inputs.report-file }}
+
+    - name: Create or update PR comment
+      uses: actions-cool/maintain-one-comment@4b2dbf086015f892dcb5e8c1106f5fccd6c1476b # v3.2.0
+      with:
+        token: ${{ inputs.token }}
+        number: ${{ inputs.pr-number }}
+        body: |
+          ${{ steps.report.outputs.content }}
+          ${{ inputs.comment-marker }}
+        body-include: ${{ inputs.comment-marker }}
diff --git a/.github/actions/setup-comfyui-server/action.yml b/.github/actions/setup-comfyui-server/action.yaml
similarity index 96%
rename from .github/actions/setup-comfyui-server/action.yml
rename to .github/actions/setup-comfyui-server/action.yaml
index d1aa1bd578..721b47e34a 100644
--- a/.github/actions/setup-comfyui-server/action.yml
+++ b/.github/actions/setup-comfyui-server/action.yaml
@@ -16,7 +16,7 @@ runs:
 
     # Checkout ComfyUI repo, install the dev_tools node and start server
     - name: Checkout ComfyUI
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         repository: 'comfyanonymous/ComfyUI'
         path: 'ComfyUI'
@@ -33,7 +33,7 @@ runs:
         fi
 
     - name: Setup Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v6
       with:
         python-version: '3.10'
 
diff --git a/.github/actions/setup-frontend/action.yml b/.github/actions/setup-frontend/action.yaml
similarity index 61%
rename from .github/actions/setup-frontend/action.yml
rename to .github/actions/setup-frontend/action.yaml
index 6787552ea7..c4d5d4eedf 100644
--- a/.github/actions/setup-frontend/action.yml
+++ b/.github/actions/setup-frontend/action.yaml
@@ -12,29 +12,17 @@ runs:
 
     # Install pnpm, Node.js, build frontend
     - name: Install pnpm
-      uses: pnpm/action-setup@v4
+      uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       with:
         version: 10
 
     - name: Setup Node.js
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v6
       with:
         node-version: 'lts/*'
         cache: 'pnpm'
         cache-dependency-path: './pnpm-lock.yaml'
 
-    # Restore tool caches before running any build/lint operations
-    - name: Restore tool output cache
-      uses: actions/cache/restore@v4
-      with:
-        path: |
-          ./.cache
-          ./tsconfig.tsbuildinfo
-        key: tool-cache-${{ runner.os }}-${{ hashFiles('./pnpm-lock.yaml') }}-${{ hashFiles('./src/**/*.{ts,vue,js,mts}', './*.config.*') }}
-        restore-keys: |
-          tool-cache-${{ runner.os }}-${{ hashFiles('./pnpm-lock.yaml') }}-
-          tool-cache-${{ runner.os }}-
-
     - name: Install dependencies
       shell: bash
       run: pnpm install --frozen-lockfile
diff --git a/.github/actions/setup-playwright/action.yml b/.github/actions/setup-playwright/action.yaml
similarity index 96%
rename from .github/actions/setup-playwright/action.yml
rename to .github/actions/setup-playwright/action.yaml
index 89629fb2c4..63e0c03621 100644
--- a/.github/actions/setup-playwright/action.yml
+++ b/.github/actions/setup-playwright/action.yaml
@@ -11,7 +11,7 @@ runs:
         echo "playwright-version=$PLAYWRIGHT_VERSION" >> $GITHUB_OUTPUT
 
     - name: Cache Playwright Browsers
-      uses: actions/cache@v4
+      uses: actions/cache@v5 # v5.0.2
       id: cache-playwright-browsers
       with:
         path: '~/.cache/ms-playwright'
diff --git a/.github/actions/start-comfyui-server/action.yml b/.github/actions/start-comfyui-server/action.yaml
similarity index 100%
rename from .github/actions/start-comfyui-server/action.yml
rename to .github/actions/start-comfyui-server/action.yaml
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 551b037212..14874c099b 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -34,4 +34,4 @@ Follow Vue 3 style guide and naming conventions
 
 Use Vite for fast development and building
 
-Use vue-i18n in composition API for any string literals. Place new translation entries in src/locales/en/main.json.
\ No newline at end of file
+Use vue-i18n in composition API for any string literals. Place new translation entries in src/locales/en/main.json.
diff --git a/.github/license-clarifications.json b/.github/license-clarifications.json
new file mode 100644
index 0000000000..62d387bd10
--- /dev/null
+++ b/.github/license-clarifications.json
@@ -0,0 +1,3 @@
+{
+  "posthog-js@*": { "licenses": "Apache-2.0" }
+}
diff --git a/.github/workflows/api-update-electron-api-types.yaml b/.github/workflows/api-update-electron-api-types.yaml
index b7c5bce710..fb9398a1b1 100644
--- a/.github/workflows/api-update-electron-api-types.yaml
+++ b/.github/workflows/api-update-electron-api-types.yaml
@@ -13,15 +13,15 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
         with:
           version: 10
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: lts/*
           cache: 'pnpm'
@@ -36,7 +36,7 @@ jobs:
           echo "NEW_VERSION=$NEW_VERSION" >> $GITHUB_OUTPUT
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e
+        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
         with:
           token: ${{ secrets.PR_GH_TOKEN }}
           commit-message: '[chore] Update electron-types to ${{ steps.get-version.outputs.NEW_VERSION }}'
diff --git a/.github/workflows/api-update-manager-api-types.yaml b/.github/workflows/api-update-manager-api-types.yaml
index a709baecf4..82b39978f4 100644
--- a/.github/workflows/api-update-manager-api-types.yaml
+++ b/.github/workflows/api-update-manager-api-types.yaml
@@ -18,15 +18,15 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
         with:
           version: 10
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: lts/*
           cache: 'pnpm'
@@ -35,7 +35,7 @@ jobs:
         run: pnpm install --frozen-lockfile
 
       - name: Checkout ComfyUI-Manager repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: Comfy-Org/ComfyUI-Manager
           path: ComfyUI-Manager
@@ -86,7 +86,7 @@ jobs:
 
       - name: Create Pull Request
         if: steps.check-changes.outputs.changed == 'true'
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e
+        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
         with:
           token: ${{ secrets.PR_GH_TOKEN }}
           commit-message: '[chore] Update ComfyUI-Manager API types from ComfyUI-Manager@${{ steps.manager-info.outputs.commit }}'
diff --git a/.github/workflows/api-update-registry-api-types.yaml b/.github/workflows/api-update-registry-api-types.yaml
index 5ae701dc22..41521cf944 100644
--- a/.github/workflows/api-update-registry-api-types.yaml
+++ b/.github/workflows/api-update-registry-api-types.yaml
@@ -17,15 +17,15 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
         with:
           version: 10
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: lts/*
           cache: 'pnpm'
@@ -34,7 +34,7 @@ jobs:
         run: pnpm install --frozen-lockfile
 
       - name: Checkout comfy-api repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: Comfy-Org/comfy-api
           path: comfy-api
@@ -87,7 +87,7 @@ jobs:
 
       - name: Create Pull Request
         if: steps.check-changes.outputs.changed == 'true'
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e
+        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
         with:
           token: ${{ secrets.PR_GH_TOKEN }}
           commit-message: '[chore] Update Comfy Registry API types from comfy-api@${{ steps.api-info.outputs.commit }}'
diff --git a/.github/workflows/ci-dist-telemetry-scan.yaml b/.github/workflows/ci-dist-telemetry-scan.yaml
new file mode 100644
index 0000000000..d5abb3c911
--- /dev/null
+++ b/.github/workflows/ci-dist-telemetry-scan.yaml
@@ -0,0 +1,100 @@
+name: 'CI: Dist Telemetry Scan'
+
+on:
+  pull_request:
+    branches-ignore: [wip/*, draft/*, temp/*]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  scan:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+        with:
+          version: 10
+
+      - name: Use Node.js
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+        with:
+          node-version: 'lts/*'
+          cache: 'pnpm'
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Build project
+        run: pnpm build
+        env:
+          DISTRIBUTION: localhost
+
+      - name: Scan dist for GTM telemetry references
+        run: |
+          set -euo pipefail
+          echo '🔍 Scanning for Google Tag Manager references...'
+          if rg --no-ignore -n \
+            -g '*.html' \
+            -g '*.js' \
+            -e 'Google Tag Manager' \
+            -e '(?i)\bgtm\.js\b' \
+            -e '(?i)googletagmanager\.com/gtm\.js\\?id=' \
+            -e '(?i)googletagmanager\.com/ns\.html\\?id=' \
+            dist; then
+            echo '❌ ERROR: Google Tag Manager references found in dist assets!'
+            echo 'GTM must be properly tree-shaken from OSS builds.'
+            exit 1
+          fi
+          echo '✅ No GTM references found'
+
+      - name: Scan dist for Mixpanel telemetry references
+        run: |
+          set -euo pipefail
+          echo '🔍 Scanning for Mixpanel references...'
+          if rg --no-ignore -n \
+            -g '*.html' \
+            -g '*.js' \
+            -e '(?i)mixpanel\.init' \
+            -e '(?i)mixpanel\.identify' \
+            -e 'MixpanelTelemetryProvider' \
+            -e 'mp\.comfy\.org' \
+            -e 'mixpanel-browser' \
+            -e '(?i)mixpanel\.track\(' \
+            dist; then
+            echo '❌ ERROR: Mixpanel references found in dist assets!'
+            echo 'Mixpanel must be properly tree-shaken from OSS builds.'
+            echo ''
+            echo 'To fix this:'
+            echo '1. Use the TelemetryProvider pattern (see src/platform/telemetry/)'
+            echo '2. Call telemetry via useTelemetry() hook'
+            echo '3. Use conditional dynamic imports behind isCloud checks'
+            exit 1
+          fi
+          echo '✅ No Mixpanel references found'
+
+      - name: Scan dist for PostHog telemetry references
+        run: |
+          set -euo pipefail
+          echo '🔍 Scanning for PostHog references...'
+          if rg --no-ignore -n \
+            -g '*.html' \
+            -g '*.js' \
+            -e '(?i)posthog\.init' \
+            -e '(?i)posthog\.capture' \
+            -e 'PostHogTelemetryProvider' \
+            -e 'ph\.comfy\.org' \
+            -e 'posthog-js' \
+            dist; then
+            echo '❌ ERROR: PostHog references found in dist assets!'
+            echo 'PostHog must be properly tree-shaken from OSS builds.'
+            exit 1
+          fi
+          echo '✅ No PostHog references found'
diff --git a/.github/workflows/ci-json-validation.yaml b/.github/workflows/ci-json-validation.yaml
index 8c55705e71..20a2743d19 100644
--- a/.github/workflows/ci-json-validation.yaml
+++ b/.github/workflows/ci-json-validation.yaml
@@ -1,5 +1,5 @@
 # Description: Validates JSON syntax in all tracked .json files (excluding tsconfig*.json) using jq
-name: "CI: JSON Validation"
+name: 'CI: JSON Validation'
 
 on:
   push:
@@ -13,6 +13,6 @@ jobs:
   json-lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Validate JSON syntax
         run: ./scripts/cicd/check-json.sh
diff --git a/.github/workflows/ci-lint-format.yaml b/.github/workflows/ci-lint-format.yaml
index 3ce6d6aa9f..8de5d46b97 100644
--- a/.github/workflows/ci-lint-format.yaml
+++ b/.github/workflows/ci-lint-format.yaml
@@ -1,5 +1,5 @@
 # Description: Linting and code formatting validation for pull requests
-name: "CI: Lint Format"
+name: 'CI: Lint Format'
 
 on:
   pull_request:
@@ -18,23 +18,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout PR
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ !github.event.pull_request.head.repo.fork && github.head_ref || github.ref }}
+          token: ${{ !github.event.pull_request.head.repo.fork && secrets.PR_GH_TOKEN || github.token }}
 
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4
+      - name: Setup frontend
+        uses: ./.github/actions/setup-frontend
+
+      - name: Detect browser_tests changes
+        id: changed-paths
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         with:
-          version: 10
-
-      - name: Use Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 'lts/*'
-          cache: 'pnpm'
-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
+          filters: |
+            browser_tests:
+              - 'browser_tests/**'
 
       - name: Run ESLint with auto-fix
         run: pnpm lint:fix
@@ -42,7 +40,7 @@ jobs:
       - name: Run Stylelint with auto-fix
         run: pnpm stylelint:fix
 
-      - name: Run Prettier with auto-format
+      - name: Run oxfmt with auto-format
         run: pnpm format
 
       - name: Check for changes
@@ -60,7 +58,7 @@ jobs:
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action"
           git add .
-          git commit -m "[automated] Apply ESLint and Prettier fixes"
+          git commit -m "[automated] Apply ESLint and Oxfmt fixes"
           git push
 
       - name: Final validation
@@ -70,23 +68,27 @@ jobs:
           pnpm format:check
           pnpm knip
 
+      - name: Typecheck browser tests
+        if: steps.changed-paths.outputs.browser_tests == 'true'
+        run: pnpm typecheck:browser
+
       - name: Comment on PR about auto-fix
         if: steps.verify-changed-files.outputs.changed == 'true' && github.event.pull_request.head.repo.full_name == github.repository
         continue-on-error: true
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             github.rest.issues.createComment({
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              body: '## 🔧 Auto-fixes Applied\n\nThis PR has been automatically updated to fix linting and formatting issues.\n\n**⚠️ Important**: Your local branch is now behind. Run `git pull` before making additional changes to avoid conflicts.\n\n### Changes made:\n- ESLint auto-fixes\n- Prettier formatting'
+              body: '## 🔧 Auto-fixes Applied\n\nThis PR has been automatically updated to fix linting and formatting issues.\n\n**⚠️ Important**: Your local branch is now behind. Run `git pull` before making additional changes to avoid conflicts.\n\n### Changes made:\n- ESLint auto-fixes\n- Oxfmt formatting'
             })
 
       - name: Comment on PR about manual fix needed
         if: steps.verify-changed-files.outputs.changed == 'true' && github.event.pull_request.head.repo.full_name != github.repository
         continue-on-error: true
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             github.rest.issues.createComment({
diff --git a/.github/workflows/ci-oss-assets-validation.yaml b/.github/workflows/ci-oss-assets-validation.yaml
new file mode 100644
index 0000000000..a9e4c95fd5
--- /dev/null
+++ b/.github/workflows/ci-oss-assets-validation.yaml
@@ -0,0 +1,119 @@
+name: 'CI: OSS Assets Validation'
+
+on:
+  pull_request:
+    branches-ignore: [wip/*, draft/*, temp/*]
+  push:
+    branches: [main, dev*]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  validate-fonts:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@9fd676a19091d4595eefd76e4bd31c97133911f1 # v4.2.0
+        with:
+          version: 10
+
+      - name: Use Node.js
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+        with:
+          node-version: 'lts/*'
+          cache: 'pnpm'
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Build project
+        run: pnpm build
+        env:
+          DISTRIBUTION: localhost
+
+      - name: Check for proprietary fonts in dist
+        run: |
+          set -euo pipefail
+          echo '🔍 Checking dist for proprietary ABCROM fonts...'
+
+          if [ ! -d "dist" ] || [ -z "$(ls -A dist)" ]; then
+            echo '❌ ERROR: dist/ directory missing or empty!'
+            exit 1
+          fi
+
+          # Check for ABCROM font files
+          if find dist/ -type f -iname '*abcrom*' \
+            \( -name '*.woff' -o -name '*.woff2' -o -name '*.ttf' -o -name '*.otf' \) \
+            -print -quit | grep -q .; then
+            echo ''
+            echo '❌ ERROR: Found proprietary ABCROM font files in dist!'
+            echo ''
+            find dist/ -type f -iname '*abcrom*' \
+              \( -name '*.woff' -o -name '*.woff2' -o -name '*.ttf' -o -name '*.otf' \)
+            echo ''
+            echo 'ABCROM fonts are proprietary and should not ship to OSS builds.'
+            echo ''
+            echo 'To fix this:'
+            echo '1. Use conditional font loading based on isCloud'
+            echo '2. Ensure fonts are dynamically imported, not bundled'
+            echo '3. Check vite config for font handling'
+            exit 1
+          fi
+
+          echo '✅ No proprietary fonts found in dist'
+
+  validate-licenses:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@9fd676a19091d4595eefd76e4bd31c97133911f1 # v4.2.0
+        with:
+          version: 10
+
+      - name: Use Node.js
+        uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+        with:
+          node-version: 'lts/*'
+          cache: 'pnpm'
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Validate production dependency licenses
+        run: |
+          set -euo pipefail
+          echo '🔍 Checking production dependency licenses...'
+
+          # Use license-checker-rseidelsohn (actively maintained fork, handles monorepos)
+          # Exclude internal @comfyorg packages from license check
+          # Run in if condition to capture exit code
+          if npx license-checker-rseidelsohn@4 \
+            --production \
+            --summary \
+            --excludePackages '@comfyorg/comfyui-frontend;@comfyorg/design-system;@comfyorg/registry-types;@comfyorg/shared-frontend-utils;@comfyorg/tailwind-utils;@comfyorg/comfyui-electron-types' \
+            --clarificationsFile .github/license-clarifications.json \
+            --onlyAllow 'MIT;MIT*;Apache-2.0;BSD-2-Clause;BSD-3-Clause;ISC;0BSD;BlueOak-1.0.0;Python-2.0;CC0-1.0;Unlicense;(MIT OR Apache-2.0);(MIT OR GPL-3.0);(Apache-2.0 OR MIT);(MPL-2.0 OR Apache-2.0);CC-BY-4.0;CC-BY-3.0;GPL-3.0-only'; then
+            echo ''
+            echo '✅ All production dependency licenses are approved!'
+          else
+            echo ''
+            echo '❌ ERROR: Found dependencies with non-approved licenses!'
+            echo ''
+            echo 'To fix this:'
+            echo '1. Check the license of the problematic package'
+            echo '2. Find an alternative package with an approved license'
+            echo '3. If the license is safe and OSI-approved, add it to the --onlyAllow list'
+            echo ''
+            echo 'For more info on OSI-approved licenses:'
+            echo 'https://opensource.org/licenses'
+            exit 1
+          fi
diff --git a/.github/workflows/ci-perf-report.yaml b/.github/workflows/ci-perf-report.yaml
new file mode 100644
index 0000000000..724034a8a4
--- /dev/null
+++ b/.github/workflows/ci-perf-report.yaml
@@ -0,0 +1,70 @@
+name: 'CI: Performance Report'
+
+on:
+  push:
+    branches: [main, core/*]
+    paths-ignore: ['**/*.md']
+  pull_request:
+    branches-ignore: [wip/*, draft/*, temp/*]
+    paths-ignore: ['**/*.md']
+
+concurrency:
+  group: perf-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  perf-tests:
+    if: github.repository == 'Comfy-Org/ComfyUI_frontend'
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    container:
+      image: ghcr.io/comfy-org/comfyui-ci-container:0.0.12
+      credentials:
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+    permissions:
+      contents: read
+      packages: read
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Setup frontend
+        uses: ./.github/actions/setup-frontend
+        with:
+          include_build_step: true
+
+      - name: Start ComfyUI server
+        uses: ./.github/actions/start-comfyui-server
+
+      - name: Run performance tests
+        id: perf
+        continue-on-error: true
+        run: pnpm exec playwright test --project=performance --workers=1 --repeat-each=3
+
+      - name: Upload perf metrics
+        if: always()
+        uses: actions/upload-artifact@v6
+        with:
+          name: perf-metrics
+          path: test-results/perf-metrics.json
+          retention-days: 30
+          if-no-files-found: warn
+
+      - name: Save PR metadata
+        if: github.event_name == 'pull_request'
+        run: |
+          mkdir -p temp/perf-meta
+          echo "${{ github.event.number }}" > temp/perf-meta/number.txt
+          echo "${{ github.event.pull_request.base.ref }}" > temp/perf-meta/base.txt
+
+      - name: Upload PR metadata
+        if: github.event_name == 'pull_request'
+        uses: actions/upload-artifact@v6
+        with:
+          name: perf-meta
+          path: temp/perf-meta/
diff --git a/.github/workflows/ci-python-validation.yaml b/.github/workflows/ci-python-validation.yaml
index 1625ca29fc..cf392f1bf3 100644
--- a/.github/workflows/ci-python-validation.yaml
+++ b/.github/workflows/ci-python-validation.yaml
@@ -1,5 +1,5 @@
 # Description: Validates Python code in tools/devtools directory
-name: "CI: Python Validation"
+name: 'CI: Python Validation'
 
 on:
   pull_request:
@@ -16,10 +16,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.11'
 
diff --git a/.github/workflows/ci-shell-validation.yaml b/.github/workflows/ci-shell-validation.yaml
index 783d1b03cc..72ac4be230 100644
--- a/.github/workflows/ci-shell-validation.yaml
+++ b/.github/workflows/ci-shell-validation.yaml
@@ -1,5 +1,5 @@
 # Description: Runs shellcheck on tracked shell scripts when they change
-name: "CI: Shell Validation"
+name: 'CI: Shell Validation'
 
 on:
   push:
diff --git a/.github/workflows/ci-size-data.yaml b/.github/workflows/ci-size-data.yaml
index a21c93110f..f56c0d17d4 100644
--- a/.github/workflows/ci-size-data.yaml
+++ b/.github/workflows/ci-size-data.yaml
@@ -1,4 +1,4 @@
-name: "CI: Size Data"
+name: 'CI: Size Data'
 
 on:
   push:
@@ -17,21 +17,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4.1.0
-        with:
-          version: 10
-
-      - name: Install Node.js
-        uses: actions/setup-node@v5
-        with:
-          node-version: '24.x'
-          cache: pnpm
-
-      - name: Install dependencies
-        run: pnpm install
+      - name: Setup frontend
+        uses: ./.github/actions/setup-frontend
 
       - name: Build project
         run: pnpm build
@@ -46,7 +35,7 @@ jobs:
           echo ${{ github.base_ref }} > ./temp/size/base.txt
 
       - name: Upload size data
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: size-data
           path: temp/size
diff --git a/.github/workflows/ci-tests-e2e-forks.yaml b/.github/workflows/ci-tests-e2e-forks.yaml
index c1828b7fb7..3e34c846d0 100644
--- a/.github/workflows/ci-tests-e2e-forks.yaml
+++ b/.github/workflows/ci-tests-e2e-forks.yaml
@@ -1,14 +1,11 @@
 # Description: Deploys test results from forked PRs (forks can't access deployment secrets)
-name: "CI: Tests E2E (Deploy for Forks)"
+name: 'CI: Tests E2E (Deploy for Forks)'
 
 on:
   workflow_run:
-    workflows: ["CI: Tests E2E"]
+    workflows: ['CI: Tests E2E']
     types: [requested, completed]
 
-env:
-  DATE_FORMAT: '+%m/%d/%Y, %I:%M:%S %p'
-
 jobs:
   deploy-and-comment-forked-pr:
     runs-on: ubuntu-latest
@@ -31,11 +28,11 @@ jobs:
           echo "Is forked: ${{ github.event.workflow_run.head_repository.full_name != github.event.workflow_run.repository.full_name }}"
 
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Get PR Number
         id: pr
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const { data: prs } = await github.rest.pulls.list({
@@ -63,12 +60,11 @@ jobs:
           ./scripts/cicd/pr-playwright-deploy-and-comment.sh \
             "${{ steps.pr.outputs.result }}" \
             "${{ github.event.workflow_run.head_branch }}" \
-            "starting" \
-            "$(date -u '${{ env.DATE_FORMAT }}')"
+            "starting"
 
       - name: Download and Deploy Reports
         if: steps.pr.outputs.result != 'null' && github.event.action == 'completed'
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           run-id: ${{ github.event.workflow_run.id }}
@@ -81,6 +77,7 @@ jobs:
           CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           GITHUB_TOKEN: ${{ github.token }}
+          GITHUB_SHA: ${{ github.event.workflow_run.head_sha }}
         run: |
           # Rename merged report if exists
           [ -d "reports/playwright-report-chromium-merged" ] && \
diff --git a/.github/workflows/ci-tests-e2e.yaml b/.github/workflows/ci-tests-e2e.yaml
index 12ccfae935..3d99328406 100644
--- a/.github/workflows/ci-tests-e2e.yaml
+++ b/.github/workflows/ci-tests-e2e.yaml
@@ -1,12 +1,14 @@
 # Description: End-to-end testing with Playwright across multiple browsers, deploys test reports to Cloudflare Pages
-name: "CI: Tests E2E"
+name: 'CI: Tests E2E'
 
 on:
   push:
     branches: [main, master, core/*, desktop/*]
+    paths-ignore: ['**/*.md']
   pull_request:
-    branches-ignore:
-      [wip/*, draft/*, temp/*, vue-nodes-migration, sno-playwright-*]
+    branches-ignore: [wip/*, draft/*, temp/*]
+    paths-ignore: ['**/*.md']
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -17,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Setup frontend
         uses: ./.github/actions/setup-frontend
         with:
@@ -25,7 +27,7 @@ jobs:
 
       # Upload only built dist/ (containerized test jobs will pnpm install without cache)
       - name: Upload built frontend
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: frontend-dist
           path: dist/
@@ -37,7 +39,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     container:
-      image: ghcr.io/comfy-org/comfyui-ci-container:0.0.8
+      image: ghcr.io/comfy-org/comfyui-ci-container:0.0.13
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
@@ -51,9 +53,9 @@ jobs:
         shardTotal: [8]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Download built frontend
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           name: frontend-dist
           path: dist/
@@ -72,7 +74,7 @@ jobs:
           PLAYWRIGHT_BLOB_OUTPUT_DIR: ./blob-report
 
       - name: Upload blob report
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         if: ${{ !cancelled() }}
         with:
           name: blob-report-chromium-${{ matrix.shardIndex }}
@@ -85,7 +87,7 @@ jobs:
     needs: setup
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/comfy-org/comfyui-ci-container:0.0.8
+      image: ghcr.io/comfy-org/comfyui-ci-container:0.0.13
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
@@ -98,9 +100,9 @@ jobs:
         browser: [chromium-2x, chromium-0.5x, mobile-chrome]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Download built frontend
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           name: frontend-dist
           path: dist/
@@ -128,7 +130,7 @@ jobs:
           pnpm exec playwright merge-reports --reporter=json ./blob-report
 
       - name: Upload Playwright report
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         if: always()
         with:
           name: playwright-report-${{ matrix.browser }}
@@ -141,15 +143,13 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ !cancelled() }}
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v5
-
-      # Setup pnpm/node to run playwright merge-reports (no browsers needed)
-      - name: Setup frontend
-        uses: ./.github/actions/setup-frontend
+      - name: Install pnpm
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+        with:
+          version: 10
 
       - name: Download blob reports
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           path: ./all-blob-reports
           pattern: blob-report-chromium-*
@@ -158,13 +158,13 @@ jobs:
       - name: Merge into HTML Report
         run: |
           # Generate HTML report
-          pnpm exec playwright merge-reports --reporter=html ./all-blob-reports
+          pnpm dlx @playwright/test merge-reports --reporter=html ./all-blob-reports
           # Generate JSON report separately with explicit output path
           PLAYWRIGHT_JSON_OUTPUT_NAME=playwright-report/report.json \
-          pnpm exec playwright merge-reports --reporter=json ./all-blob-reports
+          pnpm dlx @playwright/test merge-reports --reporter=json ./all-blob-reports
 
       - name: Upload HTML report
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: playwright-report-chromium
           path: ./playwright-report/
@@ -182,11 +182,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
-
-      - name: Get start time
-        id: start-time
-        run: echo "time=$(date -u '+%m/%d/%Y, %I:%M:%S %p')" >> $GITHUB_OUTPUT
+        uses: actions/checkout@v6
 
       - name: Post starting comment
         env:
@@ -196,8 +192,7 @@ jobs:
           ./scripts/cicd/pr-playwright-deploy-and-comment.sh \
             "${{ github.event.pull_request.number }}" \
             "${{ github.head_ref }}" \
-            "starting" \
-            "${{ steps.start-time.outputs.time }}"
+            "starting"
 
   # Deploy and comment for non-forked PRs only
   deploy-and-comment:
@@ -209,10 +204,10 @@ jobs:
       contents: read
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Download all playwright reports
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           pattern: playwright-report-*
           path: reports
@@ -222,6 +217,7 @@ jobs:
           CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           GITHUB_TOKEN: ${{ github.token }}
+          GITHUB_SHA: ${{ github.event.pull_request.head.sha }}
         run: |
           bash ./scripts/cicd/pr-playwright-deploy-and-comment.sh \
             "${{ github.event.pull_request.number }}" \
diff --git a/.github/workflows/ci-tests-storybook-forks.yaml b/.github/workflows/ci-tests-storybook-forks.yaml
index e93b5bb904..0d4ab96f11 100644
--- a/.github/workflows/ci-tests-storybook-forks.yaml
+++ b/.github/workflows/ci-tests-storybook-forks.yaml
@@ -1,14 +1,11 @@
 # Description: Deploys Storybook previews from forked PRs (forks can't access deployment secrets)
-name: "CI: Tests Storybook (Deploy for Forks)"
+name: 'CI: Tests Storybook (Deploy for Forks)'
 
 on:
   workflow_run:
-    workflows: ["CI: Tests Storybook"]
+    workflows: ['CI: Tests Storybook']
     types: [requested, completed]
 
-env:
-  DATE_FORMAT: '+%m/%d/%Y, %I:%M:%S %p'
-
 jobs:
   deploy-and-comment-forked-pr:
     runs-on: ubuntu-latest
@@ -31,11 +28,11 @@ jobs:
           echo "Is forked: ${{ github.event.workflow_run.head_repository.full_name != github.event.workflow_run.repository.full_name }}"
 
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Get PR Number
         id: pr
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const { data: prs } = await github.rest.pulls.list({
@@ -63,12 +60,11 @@ jobs:
           ./scripts/cicd/pr-storybook-deploy-and-comment.sh \
             "${{ steps.pr.outputs.result }}" \
             "${{ github.event.workflow_run.head_branch }}" \
-            "starting" \
-            "$(date -u '${{ env.DATE_FORMAT }}')"
+            "starting"
 
       - name: Download and Deploy Storybook
         if: steps.pr.outputs.result != 'null' && github.event.action == 'completed' && github.event.workflow_run.conclusion == 'success'
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           run-id: ${{ github.event.workflow_run.id }}
diff --git a/.github/workflows/ci-tests-storybook.yaml b/.github/workflows/ci-tests-storybook.yaml
index 8158787a24..4c2fb4478f 100644
--- a/.github/workflows/ci-tests-storybook.yaml
+++ b/.github/workflows/ci-tests-storybook.yaml
@@ -1,8 +1,8 @@
 # Description: Builds Storybook and runs visual regression testing via Chromatic, deploys previews to Cloudflare Pages
-name: "CI: Tests Storybook"
+name: 'CI: Tests Storybook'
 
 on:
-  workflow_dispatch:  # Allow manual triggering
+  workflow_dispatch: # Allow manual triggering
   pull_request:
 
 jobs:
@@ -14,7 +14,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Post starting comment
         env:
@@ -24,8 +24,7 @@ jobs:
           ./scripts/cicd/pr-storybook-deploy-and-comment.sh \
             "${{ github.event.pull_request.number }}" \
             "${{ github.head_ref }}" \
-            "starting" \
-            "$(date -u '+%m/%d/%Y, %I:%M:%S %p')"
+            "starting"
 
   # Build Storybook for all PRs (free Cloudflare deployment)
   storybook-build:
@@ -36,21 +35,10 @@ jobs:
       workflow-url: ${{ steps.workflow-url.outputs.url }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4
-        with:
-          version: 10
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20'
-          cache: 'pnpm'
-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
+      - name: Setup frontend
+        uses: ./.github/actions/setup-frontend
 
       - name: Build Storybook
         run: pnpm build-storybook
@@ -69,7 +57,7 @@ jobs:
 
       - name: Upload Storybook build
         if: success() && github.event.pull_request.head.repo.fork == false
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: storybook-static
           path: storybook-static/
@@ -86,33 +74,22 @@ jobs:
       chromatic-storybook-url: ${{ steps.chromatic.outputs.storybookUrl }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
-          fetch-depth: 0  # Required for Chromatic baseline
+          fetch-depth: 0 # Required for Chromatic baseline
 
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4
-        with:
-          version: 10
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20'
-          cache: 'pnpm'
-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
+      - name: Setup frontend
+        uses: ./.github/actions/setup-frontend
 
       - name: Build Storybook and run Chromatic
         id: chromatic
-        uses: chromaui/action@latest
+        uses: chromaui/action@07791f8243f4cb2698bf4d00426baf4b2d1cb7e0 # v13.3.5
         with:
           projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
           buildScriptName: build-storybook
-          autoAcceptChanges: 'main'  # Auto-accept changes on main branch
-          exitOnceUploaded: true  # Don't wait for UI tests to complete
-          onlyChanged: true  # Only capture changed stories
+          autoAcceptChanges: 'main' # Auto-accept changes on main branch
+          exitOnceUploaded: true # Don't wait for UI tests to complete
+          onlyChanged: true # Only capture changed stories
 
       - name: Set job status
         id: job-status
@@ -136,11 +113,11 @@ jobs:
       contents: read
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Download Storybook build
         if: needs.storybook-build.outputs.conclusion == 'success'
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           name: storybook-static
           path: storybook-static
@@ -170,7 +147,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Update comment with Chromatic URLs
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const buildUrl = '${{ needs.chromatic-deployment.outputs.chromatic-build-url }}';
diff --git a/.github/workflows/ci-tests-unit.yaml b/.github/workflows/ci-tests-unit.yaml
index 8a97a9128a..914030c7d8 100644
--- a/.github/workflows/ci-tests-unit.yaml
+++ b/.github/workflows/ci-tests-unit.yaml
@@ -1,11 +1,13 @@
 # Description: Unit and component testing with Vitest
-name: "CI: Tests Unit"
+name: 'CI: Tests Unit'
 
 on:
   push:
     branches: [main, master, dev*, core/*, desktop/*]
+    paths-ignore: ['**/*.md']
   pull_request:
     branches-ignore: [wip/*, draft/*, temp/*]
+    paths-ignore: ['**/*.md']
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -16,21 +18,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4
-        with:
-          version: 10
-
-      - name: Use Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "lts/*"
-          cache: "pnpm"
-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
+      - name: Setup frontend
+        uses: ./.github/actions/setup-frontend
 
       - name: Run Vitest tests
         run: pnpm test:unit
diff --git a/.github/workflows/ci-validate-action-pins.yaml b/.github/workflows/ci-validate-action-pins.yaml
new file mode 100644
index 0000000000..3cd66cd7ea
--- /dev/null
+++ b/.github/workflows/ci-validate-action-pins.yaml
@@ -0,0 +1,21 @@
+name: Validate Action SHA Pins
+
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/**'
+      - '.github/actions/**'
+      - '.pinact.yaml'
+
+permissions:
+  contents: read
+
+jobs:
+  validate-pins:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: suzuki-shunsuke/pinact-action@3d49c6412901042473ffa78becddab1aea46bbea # v1.3.1
+        with:
+          skip_push: 'true'
diff --git a/.github/workflows/ci-yaml-validation.yaml b/.github/workflows/ci-yaml-validation.yaml
index cf2a3b6485..876fcfc4c0 100644
--- a/.github/workflows/ci-yaml-validation.yaml
+++ b/.github/workflows/ci-yaml-validation.yaml
@@ -1,5 +1,5 @@
 # Description: Validates YAML syntax and style using yamllint with relaxed rules
-name: "CI: YAML Validation"
+name: 'CI: YAML Validation'
 
 on:
   push:
@@ -17,10 +17,10 @@ jobs:
   yaml-lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
 
diff --git a/.github/workflows/cloud-backport-tag.yaml b/.github/workflows/cloud-backport-tag.yaml
index c0edec170e..73b01c682b 100644
--- a/.github/workflows/cloud-backport-tag.yaml
+++ b/.github/workflows/cloud-backport-tag.yaml
@@ -18,12 +18,12 @@ jobs:
 
     steps:
       - name: Checkout merge commit
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ github.event.pull_request.merge_commit_sha }}
 
       - name: Setup Node.js
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version-file: '.nvmrc'
 
diff --git a/.github/workflows/cloud-dispatch-build.yaml b/.github/workflows/cloud-dispatch-build.yaml
new file mode 100644
index 0000000000..aed9efa965
--- /dev/null
+++ b/.github/workflows/cloud-dispatch-build.yaml
@@ -0,0 +1,45 @@
+---
+# Dispatches a frontend-asset-build event to the cloud repo on push to
+# cloud/* branches and main. The cloud repo handles the actual build,
+# GCS upload, and secret management (Sentry, Algolia, GCS creds).
+#
+# This is fire-and-forget — it does NOT wait for the cloud workflow to
+# complete. Status is visible in the cloud repo's Actions tab.
+
+name: Cloud Frontend Build Dispatch
+
+on:
+  push:
+    branches:
+      - 'cloud/*'
+      - 'main'
+  workflow_dispatch:
+
+permissions: {}
+
+concurrency:
+  group: cloud-dispatch-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  dispatch:
+    # Fork guard: prevent forks from dispatching to the cloud repo
+    if: github.repository == 'Comfy-Org/ComfyUI_frontend'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Build client payload
+        id: payload
+        run: |
+          payload="$(jq -nc \
+            --arg ref "${GITHUB_SHA}" \
+            --arg branch "${GITHUB_REF_NAME}" \
+            '{ref: $ref, branch: $branch}')"
+          echo "json=${payload}" >> "${GITHUB_OUTPUT}"
+
+      - name: Dispatch to cloud repo
+        uses: peter-evans/repository-dispatch@28959ce8df70de7be546dd1250a005dd32156697 # v4.0.1
+        with:
+          token: ${{ secrets.CLOUD_DISPATCH_TOKEN }}
+          repository: Comfy-Org/cloud
+          event-type: frontend-asset-build
+          client-payload: ${{ steps.payload.outputs.json }}
diff --git a/.github/workflows/i18n-update-core.yaml b/.github/workflows/i18n-update-core.yaml
index a4e73f5382..5f0985b93f 100644
--- a/.github/workflows/i18n-update-core.yaml
+++ b/.github/workflows/i18n-update-core.yaml
@@ -1,5 +1,5 @@
 # Description: Generates and updates translations for core ComfyUI components using OpenAI
-name: "i18n: Update Core"
+name: 'i18n: Update Core'
 
 on:
   # Manual dispatch for urgent translation updates
@@ -16,7 +16,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
+        with:
+          token: ${{ secrets.PR_GH_TOKEN }}
 
       # Setup playwright environment
       - name: Setup ComfyUI Frontend
@@ -41,7 +43,7 @@ jobs:
         env:
           PLAYWRIGHT_TEST_URL: http://localhost:5173
       - name: Update translations
-        run: pnpm locale
+        run: pnpm locale && pnpm format
         env:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
       - name: Commit updated locales
diff --git a/.github/workflows/i18n-update-custom-nodes.yaml b/.github/workflows/i18n-update-custom-nodes.yaml
index 5844065ad4..225c1b3e36 100644
--- a/.github/workflows/i18n-update-custom-nodes.yaml
+++ b/.github/workflows/i18n-update-custom-nodes.yaml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       # Setup playwright environment with custom node repository
       - name: Setup ComfyUI Server (without launching)
@@ -36,7 +36,7 @@ jobs:
 
       # Install the custom node repository
       - name: Checkout custom node repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: ${{ inputs.owner }}/${{ inputs.repository }}
           path: 'ComfyUI/custom_nodes/${{ inputs.repository }}'
@@ -113,7 +113,7 @@ jobs:
           git commit -m "Update locales"
 
       - name: Install SSH key For PUSH
-        uses: shimataro/ssh-key-action@d4fffb50872869abe2d9a9098a6d9c5aa7d16be4
+        uses: shimataro/ssh-key-action@d4fffb50872869abe2d9a9098a6d9c5aa7d16be4 # v2.7.0
         with:
           # PR private key from action server
           key: ${{ secrets.PR_SSH_PRIVATE_KEY }}
diff --git a/.github/workflows/i18n-update-nodes.yaml b/.github/workflows/i18n-update-nodes.yaml
index 46db1661e2..5a72e5b109 100644
--- a/.github/workflows/i18n-update-nodes.yaml
+++ b/.github/workflows/i18n-update-nodes.yaml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       # Setup playwright environment
       - name: Setup ComfyUI Server (and start)
         uses: ./.github/actions/setup-comfyui-server
@@ -40,11 +40,11 @@ jobs:
         env:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e
+        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
         with:
           token: ${{ secrets.PR_GH_TOKEN }}
-          commit-message: "Update locales for node definitions"
-          title: "Update locales for node definitions"
+          commit-message: 'Update locales for node definitions'
+          title: 'Update locales for node definitions'
           body: |
             Automated PR to update locales for node definitions
 
diff --git a/.github/workflows/pr-backport.yaml b/.github/workflows/pr-backport.yaml
index c38a8081e7..a6b15db5f0 100644
--- a/.github/workflows/pr-backport.yaml
+++ b/.github/workflows/pr-backport.yaml
@@ -64,7 +64,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -462,7 +462,6 @@ jobs:
             fi
           done < "$FILE"
 
-
       - name: Remove needs-backport label
         if: steps.filter-targets.outputs.skip != 'true' && success()
         run: gh pr edit ${{ github.event_name == 'workflow_dispatch' && inputs.pr_number || github.event.pull_request.number }} --remove-label "needs-backport"
diff --git a/.github/workflows/pr-claude-review.yaml b/.github/workflows/pr-claude-review.yaml
index ec4159c1c8..b1f3d1a7f6 100644
--- a/.github/workflows/pr-claude-review.yaml
+++ b/.github/workflows/pr-claude-review.yaml
@@ -1,5 +1,5 @@
 # Description: AI-powered code review triggered by adding the 'claude-review' label to a PR
-name: "PR: Claude Review"
+name: 'PR: Claude Review'
 
 permissions:
   contents: read
@@ -23,18 +23,18 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           ref: refs/pull/${{ github.event.pull_request.number }}/head
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
         with:
           version: 10
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '20'
           cache: 'pnpm'
@@ -44,9 +44,9 @@ jobs:
           pnpm install -g typescript @vue/compiler-sfc
 
       - name: Run Claude PR Review
-        uses: anthropics/claude-code-action@v1.0.6
+        uses: anthropics/claude-code-action@ff34ce0ff04a470bd3fa56c1ef391c8f1c19f8e9 # v1.0.38
         with:
-          label_trigger: "claude-review"
+          label_trigger: 'claude-review'
           prompt: |
             Read the file .claude/commands/comprehensive-pr-review.md and follow ALL the instructions exactly.
 
diff --git a/.github/workflows/pr-perf-report.yaml b/.github/workflows/pr-perf-report.yaml
new file mode 100644
index 0000000000..3d13867354
--- /dev/null
+++ b/.github/workflows/pr-perf-report.yaml
@@ -0,0 +1,102 @@
+name: 'PR: Performance Report'
+
+on:
+  workflow_run:
+    workflows: ['CI: Performance Report']
+    types:
+      - completed
+
+permissions:
+  contents: read
+  pull-requests: write
+  issues: write
+
+jobs:
+  comment:
+    runs-on: ubuntu-latest
+    if: >
+      github.repository == 'Comfy-Org/ComfyUI_frontend' &&
+      github.event.workflow_run.event == 'pull_request' &&
+      github.event.workflow_run.conclusion == 'success'
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Setup Node
+        uses: actions/setup-node@v6
+        with:
+          node-version: 22
+
+      - name: Download PR metadata
+        uses: dawidd6/action-download-artifact@0bd50d53a6d7fb5cb921e607957e9cc12b4ce392 # v12
+        with:
+          name: perf-meta
+          run_id: ${{ github.event.workflow_run.id }}
+          path: temp/perf-meta/
+
+      - name: Resolve and validate PR metadata
+        id: pr-meta
+        uses: actions/github-script@v8
+        with:
+          script: |
+            const fs = require('fs');
+            const artifactPr = Number(fs.readFileSync('temp/perf-meta/number.txt', 'utf8').trim());
+            const artifactBase = fs.readFileSync('temp/perf-meta/base.txt', 'utf8').trim();
+
+            // Resolve PR from trusted workflow context
+            let pr = context.payload.workflow_run.pull_requests?.[0];
+            if (!pr) {
+              const { data: prs } = await github.rest.repos.listPullRequestsAssociatedWithCommit({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                commit_sha: context.payload.workflow_run.head_sha,
+              });
+              pr = prs.find(p => p.state === 'open');
+            }
+
+            if (!pr) {
+              core.setFailed('Unable to resolve PR from workflow_run context.');
+              return;
+            }
+
+            if (Number(pr.number) !== artifactPr) {
+              core.setFailed(`Artifact PR number (${artifactPr}) does not match trusted context (${pr.number}).`);
+              return;
+            }
+
+            const trustedBase = pr.base?.ref;
+            if (!trustedBase || artifactBase !== trustedBase) {
+              core.setFailed(`Artifact base (${artifactBase}) does not match trusted context (${trustedBase}).`);
+              return;
+            }
+
+            core.setOutput('number', String(pr.number));
+            core.setOutput('base', trustedBase);
+
+      - name: Download PR perf metrics
+        uses: dawidd6/action-download-artifact@0bd50d53a6d7fb5cb921e607957e9cc12b4ce392 # v12
+        with:
+          name: perf-metrics
+          run_id: ${{ github.event.workflow_run.id }}
+          path: test-results/
+
+      - name: Download baseline perf metrics
+        uses: dawidd6/action-download-artifact@0bd50d53a6d7fb5cb921e607957e9cc12b4ce392 # v12
+        with:
+          branch: ${{ steps.pr-meta.outputs.base }}
+          workflow: ci-perf-report.yaml
+          event: push
+          name: perf-metrics
+          path: temp/perf-baseline/
+          if_no_artifact_found: warn
+
+      - name: Generate perf report
+        run: npx --yes tsx scripts/perf-report.ts > perf-report.md
+
+      - name: Post PR comment
+        uses: ./.github/actions/post-pr-report-comment
+        with:
+          pr-number: ${{ steps.pr-meta.outputs.number }}
+          report-file: ./perf-report.md
+          comment-marker: '<!-- COMFYUI_FRONTEND_PERF -->'
+          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/pr-size-report.yaml b/.github/workflows/pr-size-report.yaml
index 968888aa91..2b999298b8 100644
--- a/.github/workflows/pr-size-report.yaml
+++ b/.github/workflows/pr-size-report.yaml
@@ -1,4 +1,4 @@
-name: "PR: Size Report"
+name: 'PR: Size Report'
 
 on:
   workflow_run:
@@ -33,51 +33,88 @@ jobs:
         github.event_name == 'workflow_dispatch'
       )
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4.1.0
-        with:
-          version: 10
-
-      - name: Install Node.js
-        uses: actions/setup-node@v5
-        with:
-          node-version: '24.x'
-          cache: pnpm
-
-      - name: Install dependencies
-        run: pnpm install
+      - name: Setup frontend
+        uses: ./.github/actions/setup-frontend
 
       - name: Download size data
-        uses: dawidd6/action-download-artifact@v11
+        uses: dawidd6/action-download-artifact@0bd50d53a6d7fb5cb921e607957e9cc12b4ce392 # v12
         with:
           name: size-data
           run_id: ${{ github.event_name == 'workflow_dispatch' && inputs.run_id || github.event.workflow_run.id }}
           path: temp/size
 
-      - name: Set PR number
-        id: pr-number
-        run: |
-          if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
-            echo "content=${{ inputs.pr_number }}" >> $GITHUB_OUTPUT
-          else
-            echo "content=$(cat temp/size/number.txt)" >> $GITHUB_OUTPUT
-          fi
+      - name: Resolve and validate PR metadata
+        id: pr-meta
+        uses: actions/github-script@v8
+        with:
+          script: |
+            const fs = require('fs');
 
-      - name: Set base branch
-        id: pr-base
-        run: |
-          if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
-            echo "content=main" >> $GITHUB_OUTPUT
-          else
-            echo "content=$(cat temp/size/base.txt)" >> $GITHUB_OUTPUT
-          fi
+            // workflow_dispatch: validate artifact metadata against API-resolved PR
+            if (context.eventName === 'workflow_dispatch') {
+              const pullNumber = Number('${{ inputs.pr_number }}');
+              const { data: dispatchPr } = await github.rest.pulls.get({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                pull_number: pullNumber,
+              });
+
+              const artifactPr = Number(fs.readFileSync('temp/size/number.txt', 'utf8').trim());
+              const artifactBase = fs.readFileSync('temp/size/base.txt', 'utf8').trim();
+
+              if (artifactPr !== dispatchPr.number) {
+                core.setFailed(`Artifact PR number (${artifactPr}) does not match dispatch PR (${dispatchPr.number}).`);
+                return;
+              }
+              if (artifactBase !== dispatchPr.base.ref) {
+                core.setFailed(`Artifact base (${artifactBase}) does not match dispatch PR base (${dispatchPr.base.ref}).`);
+                return;
+              }
+
+              core.setOutput('number', String(dispatchPr.number));
+              core.setOutput('base', dispatchPr.base.ref);
+              return;
+            }
+
+            // workflow_run: validate artifact metadata against trusted context
+            const artifactPr = Number(fs.readFileSync('temp/size/number.txt', 'utf8').trim());
+            const artifactBase = fs.readFileSync('temp/size/base.txt', 'utf8').trim();
+
+            let pr = context.payload.workflow_run.pull_requests?.[0];
+            if (!pr) {
+              const { data: prs } = await github.rest.repos.listPullRequestsAssociatedWithCommit({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                commit_sha: context.payload.workflow_run.head_sha,
+              });
+              pr = prs.find(p => p.state === 'open');
+            }
+
+            if (!pr) {
+              core.setFailed('Unable to resolve PR from workflow_run context.');
+              return;
+            }
+
+            if (Number(pr.number) !== artifactPr) {
+              core.setFailed(`Artifact PR number (${artifactPr}) does not match trusted context (${pr.number}).`);
+              return;
+            }
+
+            const trustedBase = pr.base?.ref;
+            if (!trustedBase || artifactBase !== trustedBase) {
+              core.setFailed(`Artifact base (${artifactBase}) does not match trusted context (${trustedBase}).`);
+              return;
+            }
+
+            core.setOutput('number', String(pr.number));
+            core.setOutput('base', trustedBase);
 
       - name: Download previous size data
-        uses: dawidd6/action-download-artifact@v11
+        uses: dawidd6/action-download-artifact@0bd50d53a6d7fb5cb921e607957e9cc12b4ce392 # v12
         with:
-          branch: ${{ steps.pr-base.outputs.content }}
+          branch: ${{ steps.pr-meta.outputs.base }}
           workflow: ci-size-data.yaml
           event: push
           name: size-data
@@ -87,18 +124,10 @@ jobs:
       - name: Generate size report
         run: node scripts/size-report.js > size-report.md
 
-      - name: Read size report
-        id: size-report
-        uses: juliangruber/read-file-action@v1
-        with:
-          path: ./size-report.md
-
-      - name: Create or update PR comment
-        uses: actions-cool/maintain-one-comment@v3
+      - name: Post PR comment
+        uses: ./.github/actions/post-pr-report-comment
         with:
+          pr-number: ${{ steps.pr-meta.outputs.number }}
+          report-file: ./size-report.md
+          comment-marker: '<!-- COMFYUI_FRONTEND_SIZE -->'
           token: ${{ secrets.GITHUB_TOKEN }}
-          number: ${{ steps.pr-number.outputs.content }}
-          body: |
-            ${{ steps.size-report.outputs.content }}
-            <!-- COMFYUI_FRONTEND_SIZE -->
-          body-include: '<!-- COMFYUI_FRONTEND_SIZE -->'
diff --git a/.github/workflows/pr-update-playwright-expectations.yaml b/.github/workflows/pr-update-playwright-expectations.yaml
index e1c51c546c..8a5dfc3f86 100644
--- a/.github/workflows/pr-update-playwright-expectations.yaml
+++ b/.github/workflows/pr-update-playwright-expectations.yaml
@@ -1,5 +1,5 @@
 # Setting test expectation screenshots for Playwright
-name: "PR: Update Playwright Expectations"
+name: 'PR: Update Playwright Expectations'
 
 on:
   pull_request:
@@ -38,15 +38,15 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Find Update Comment
-        uses: peter-evans/find-comment@b30e6a3c0ed37e7c023ccd3f1db5c6c0b0c23aad
-        id: "find-update-comment"
+        uses: peter-evans/find-comment@b30e6a3c0ed37e7c023ccd3f1db5c6c0b0c23aad # v4.0.0
+        id: 'find-update-comment'
         with:
           issue-number: ${{ steps.pr-info.outputs.pr-number }}
-          comment-author: "github-actions[bot]"
-          body-includes: "Updating Playwright Expectations"
+          comment-author: 'github-actions[bot]'
+          body-includes: 'Updating Playwright Expectations'
 
       - name: Add Starting Reaction
-        uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9
+        uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
         with:
           comment-id: ${{ steps.find-update-comment.outputs.comment-id }}
           issue-number: ${{ steps.pr-info.outputs.pr-number }}
@@ -56,7 +56,7 @@ jobs:
           reactions: eyes
 
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ steps.pr-info.outputs.branch }}
       - name: Setup frontend
@@ -66,7 +66,7 @@ jobs:
 
       # Upload built dist/ (containerized test jobs will pnpm install without cache)
       - name: Upload built frontend
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: frontend-dist
           path: dist/
@@ -77,7 +77,7 @@ jobs:
     needs: setup
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/comfy-org/comfyui-ci-container:0.0.8
+      image: ghcr.io/comfy-org/comfyui-ci-container:0.0.13
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
@@ -91,11 +91,11 @@ jobs:
         shardTotal: [4]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ needs.setup.outputs.branch }}
       - name: Download built frontend
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           name: frontend-dist
           path: dist/
@@ -109,7 +109,7 @@ jobs:
       # Run sharded tests with snapshot updates (browsers pre-installed in container)
       - name: Update snapshots (Shard ${{ matrix.shardIndex }}/${{ matrix.shardTotal }})
         id: playwright-tests
-        run: pnpm exec playwright test --update-snapshots --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
+        run: pnpm exec playwright test --update-snapshots --grep @screenshot --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
         continue-on-error: true
 
       - name: Stage changed snapshot files
@@ -149,7 +149,7 @@ jobs:
 
       # Upload ONLY the changed files from this shard
       - name: Upload changed snapshots
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         if: steps.changed-snapshots.outputs.has-changes == 'true'
         with:
           name: snapshots-shard-${{ matrix.shardIndex }}
@@ -157,7 +157,7 @@ jobs:
           retention-days: 1
 
       - name: Upload test report
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         if: always()
         with:
           name: playwright-report-shard-${{ matrix.shardIndex }}
@@ -170,17 +170,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ needs.setup.outputs.branch }}
+          token: ${{ secrets.PR_GH_TOKEN }}
 
       # Download all changed snapshot files from shards
       - name: Download snapshot artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           pattern: snapshots-shard-*
           path: ./downloaded-snapshots
-          merge-multiple: false
+          merge-multiple: true
 
       - name: List downloaded files
         run: |
@@ -206,13 +207,13 @@ jobs:
           echo "MERGING CHANGED SNAPSHOTS"
           echo "=========================================="
 
-          # Check if any artifacts were downloaded
+          # Check if any artifacts were downloaded (merge-multiple puts files directly in path)
           if [ ! -d "./downloaded-snapshots" ]; then
             echo "No snapshot artifacts to merge"
             echo "=========================================="
             echo "MERGE COMPLETE"
             echo "=========================================="
-            echo "Shards merged: 0"
+            echo "Files merged: 0"
             exit 0
           fi
 
@@ -222,37 +223,29 @@ jobs:
             exit 1
           fi
 
-          merged_count=0
+          # Count files to merge
+          file_count=$(find ./downloaded-snapshots -type f | wc -l)
 
-          # For each shard's changed files, copy them directly
-          for shard_dir in ./downloaded-snapshots/snapshots-shard-*/; do
-            if [ ! -d "$shard_dir" ]; then
-              continue
-            fi
+          if [ "$file_count" -eq 0 ]; then
+            echo "No snapshot files found in downloaded artifacts"
+            echo "=========================================="
+            echo "MERGE COMPLETE"
+            echo "=========================================="
+            echo "Files merged: 0"
+            exit 0
+          fi
 
-            shard_name=$(basename "$shard_dir")
-            file_count=$(find "$shard_dir" -type f | wc -l)
+          echo "Merging $file_count snapshot file(s)..."
 
-            if [ "$file_count" -eq 0 ]; then
-              echo "  $shard_name: no files"
-              continue
-            fi
-
-            echo "Processing $shard_name ($file_count file(s))..."
-
-            # Copy files directly, preserving directory structure
-            # Since files are already in correct structure (no browser_tests/ prefix), just copy them all
-            cp -v -r "$shard_dir"* browser_tests/ 2>&1 | sed 's/^/  /'
-
-            merged_count=$((merged_count + 1))
-            echo "  ✓ Merged"
-            echo ""
-          done
+          # Copy all files directly, preserving directory structure
+          # With merge-multiple: true, files are directly in ./downloaded-snapshots/ without shard subdirs
+          cp -v -r ./downloaded-snapshots/* browser_tests/ 2>&1 | sed 's/^/  /'
 
+          echo ""
           echo "=========================================="
           echo "MERGE COMPLETE"
           echo "=========================================="
-          echo "Shards merged: $merged_count"
+          echo "Files merged: $file_count"
 
       - name: Show changes
         run: |
@@ -301,7 +294,7 @@ jobs:
           echo "✓ Commit and push successful"
 
       - name: Add Done Reaction
-        uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9
+        uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
         if: github.event_name == 'issue_comment' && steps.commit.outputs.has-changes == 'true'
         with:
           comment-id: ${{ needs.setup.outputs.comment-id }}
diff --git a/.github/workflows/publish-desktop-ui-on-merge.yaml b/.github/workflows/publish-desktop-ui-on-merge.yaml
index 253f73cabb..5036bc97b2 100644
--- a/.github/workflows/publish-desktop-ui-on-merge.yaml
+++ b/.github/workflows/publish-desktop-ui-on-merge.yaml
@@ -20,13 +20,13 @@ jobs:
       dist_tag: ${{ steps.dist.outputs.dist_tag }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ github.event.pull_request.merge_commit_sha }}
           persist-credentials: false
 
       - name: Setup Node.js
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: '24.x'
 
@@ -71,7 +71,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout merge commit
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ github.event.pull_request.merge_commit_sha }}
           fetch-depth: 2
diff --git a/.github/workflows/publish-desktop-ui.yaml b/.github/workflows/publish-desktop-ui.yaml
index d2741d792d..2a40445a5e 100644
--- a/.github/workflows/publish-desktop-ui.yaml
+++ b/.github/workflows/publish-desktop-ui.yaml
@@ -77,19 +77,19 @@ jobs:
           fi
 
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ steps.resolve_ref.outputs.ref }}
           fetch-depth: 1
           persist-credentials: false
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
         with:
           version: 10
 
       - name: Setup Node.js
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: '24.x'
           cache: 'pnpm'
diff --git a/.github/workflows/release-biweekly-comfyui.yaml b/.github/workflows/release-biweekly-comfyui.yaml
index c0f57822bc..be25e5ed70 100644
--- a/.github/workflows/release-biweekly-comfyui.yaml
+++ b/.github/workflows/release-biweekly-comfyui.yaml
@@ -1,5 +1,5 @@
 # Automated bi-weekly workflow to bump ComfyUI frontend RC releases
-name: "Release: Bi-weekly ComfyUI"
+name: 'Release: Bi-weekly ComfyUI'
 
 on:
   # Schedule for Monday at 12:00 PM PST (20:00 UTC)
@@ -61,26 +61,26 @@ jobs:
 
     steps:
       - name: Checkout ComfyUI_frontend
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           path: frontend
 
       - name: Checkout ComfyUI (sparse)
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
-          repository: comfyanonymous/ComfyUI
+          repository: Comfy-Org/ComfyUI
           sparse-checkout: |
             requirements.txt
           path: comfyui
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
         with:
           version: 10
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: lts/*
 
@@ -169,7 +169,7 @@ jobs:
 
     steps:
       - name: Checkout ComfyUI fork
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: ${{ inputs.comfyui_fork || 'Comfy-Org/ComfyUI' }}
           token: ${{ secrets.PR_GH_TOKEN }}
@@ -184,7 +184,7 @@ jobs:
           # Note: This only affects the local checkout, NOT the fork's master branch
           # We only push the automation branch, leaving the fork's master untouched
           echo "Fetching upstream master..."
-          if ! git fetch https://github.com/comfyanonymous/ComfyUI.git master; then
+          if ! git fetch https://github.com/Comfy-Org/ComfyUI.git master; then
             echo "Failed to fetch upstream master"
             exit 1
           fi
@@ -257,7 +257,7 @@ jobs:
           # Extract fork owner from repository name
           FORK_OWNER=$(echo "$COMFYUI_FORK" | cut -d'/' -f1)
 
-          echo "Creating PR from ${COMFYUI_FORK} to comfyanonymous/ComfyUI"
+          echo "Creating PR from ${COMFYUI_FORK} to Comfy-Org/ComfyUI"
 
           # Configure git
           git config user.name "github-actions[bot]"
@@ -288,7 +288,7 @@ jobs:
 
           # Try to create PR, ignore error if it already exists
           if ! gh pr create \
-            --repo comfyanonymous/ComfyUI \
+            --repo Comfy-Org/ComfyUI \
             --head "${FORK_OWNER}:${BRANCH}" \
             --base master \
             --title "Bump comfyui-frontend-package to ${{ needs.resolve-version.outputs.target_version }}" \
@@ -297,7 +297,7 @@ jobs:
 
             # Check if PR already exists
             set +e
-            EXISTING_PR=$(gh pr list --repo comfyanonymous/ComfyUI --head "${FORK_OWNER}:${BRANCH}" --json number --jq '.[0].number' 2>&1)
+            EXISTING_PR=$(gh pr list --repo Comfy-Org/ComfyUI --head "${FORK_OWNER}:${BRANCH}" --json number --jq '.[0].number' 2>&1)
             PR_LIST_EXIT=$?
             set -e
 
@@ -318,7 +318,7 @@ jobs:
         run: |
           echo "## ComfyUI PR Created" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
-          echo "Draft PR created in comfyanonymous/ComfyUI" >> $GITHUB_STEP_SUMMARY
+          echo "Draft PR created in Comfy-Org/ComfyUI" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "### PR Body:" >> $GITHUB_STEP_SUMMARY
           cat pr-body.txt >> $GITHUB_STEP_SUMMARY
diff --git a/.github/workflows/release-branch-create.yaml b/.github/workflows/release-branch-create.yaml
index 3e7290fdf0..3ea488fdfe 100644
--- a/.github/workflows/release-branch-create.yaml
+++ b/.github/workflows/release-branch-create.yaml
@@ -18,13 +18,13 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           token: ${{ secrets.PR_GH_TOKEN || secrets.GITHUB_TOKEN }}
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: 'lts/*'
 
diff --git a/.github/workflows/release-draft-create.yaml b/.github/workflows/release-draft-create.yaml
index 0bcb29159e..c916386b2f 100644
--- a/.github/workflows/release-draft-create.yaml
+++ b/.github/workflows/release-draft-create.yaml
@@ -19,12 +19,12 @@ jobs:
       is_prerelease: ${{ steps.check_prerelease.outputs.is_prerelease }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
         with:
           version: 10
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: 'lts/*'
           cache: 'pnpm'
@@ -50,37 +50,43 @@ jobs:
           ALGOLIA_API_KEY: ${{ secrets.ALGOLIA_API_KEY }}
           ENABLE_MINIFY: 'true'
           USE_PROD_CONFIG: 'true'
+          IS_NIGHTLY: ${{  case(github.ref == 'refs/heads/main', 'true', 'false') }}
         run: |
           pnpm install --frozen-lockfile
-          pnpm build
+
+          # Desktop-specific release artifact with desktop distribution flags.
+          DISTRIBUTION=desktop pnpm build
+          pnpm zipdist ./dist ./dist-desktop.zip
+
+          # Default release artifact for core/PyPI.
+          NX_SKIP_NX_CACHE=true pnpm build
           pnpm zipdist
       - name: Upload dist artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: dist-files
           path: |
             dist/
             dist.zip
+            dist-desktop.zip
 
   draft_release:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v5
       - name: Download dist artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           name: dist-files
       - name: Create release
         id: create_release
-        uses: >-
-          softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631
+        uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           files: |
             dist.zip
+            dist-desktop.zip
           tag_name: v${{ needs.build.outputs.version }}
           target_commitish: ${{ github.event.pull_request.base.ref }}
           make_latest: >-
@@ -98,13 +104,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Download dist artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           name: dist-files
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
       - name: Install build dependencies
@@ -119,8 +125,7 @@ jobs:
         env:
           COMFYUI_FRONTEND_VERSION: ${{ needs.build.outputs.version }}
       - name: Publish pypi package
-        uses: >-
-          pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc
+        uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0
         with:
           password: ${{ secrets.PYPI_TOKEN }}
           packages-dir: comfyui_frontend_package/dist
@@ -147,7 +152,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout merge commit
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ github.event.pull_request.merge_commit_sha }}
           fetch-depth: 2
diff --git a/.github/workflows/release-npm-types.yaml b/.github/workflows/release-npm-types.yaml
index 23f0cc016b..21614c8a4e 100644
--- a/.github/workflows/release-npm-types.yaml
+++ b/.github/workflows/release-npm-types.yaml
@@ -69,18 +69,18 @@ jobs:
           fi
 
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ steps.resolve_ref.outputs.ref }}
           fetch-depth: 1
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
         with:
           version: 10
 
       - name: Setup Node.js
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: 'lts/*'
           cache: 'pnpm'
diff --git a/.github/workflows/release-pypi-dev.yaml b/.github/workflows/release-pypi-dev.yaml
index 8683217594..5b102dbe86 100644
--- a/.github/workflows/release-pypi-dev.yaml
+++ b/.github/workflows/release-pypi-dev.yaml
@@ -15,12 +15,12 @@ jobs:
       version: ${{ steps.current_version.outputs.version }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
         with:
           version: 10
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: 'lts/*'
           cache: 'pnpm'
@@ -40,7 +40,7 @@ jobs:
           pnpm build
           pnpm zipdist
       - name: Upload dist artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: dist-files
           path: |
@@ -52,13 +52,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Download dist artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           name: dist-files
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
       - name: Install build dependencies
@@ -73,7 +73,7 @@ jobs:
         env:
           COMFYUI_FRONTEND_VERSION: ${{ format('{0}.dev{1}', needs.build.outputs.version, inputs.devVersion) }}
       - name: Publish pypi package
-        uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc
+        uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0
         with:
           password: ${{ secrets.PYPI_TOKEN }}
           packages-dir: comfyui_frontend_package/dist
diff --git a/.github/workflows/release-version-bump.yaml b/.github/workflows/release-version-bump.yaml
index ca08e25bdd..d7ba7358ea 100644
--- a/.github/workflows/release-version-bump.yaml
+++ b/.github/workflows/release-version-bump.yaml
@@ -1,5 +1,5 @@
 # Description: Manual workflow to increment package version with semantic versioning support
-name: "Release: Version Bump"
+name: 'Release: Version Bump'
 
 on:
   workflow_dispatch:
@@ -65,7 +65,7 @@ jobs:
 
       - name: Close stale nightly version bump PRs
         if: github.event_name == 'schedule'
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           github-token: ${{ github.token }}
           script: |
@@ -118,7 +118,7 @@ jobs:
             core.info(`Closed ${closed.length} stale PR(s).`)
 
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ steps.prepared-inputs.outputs.branch }}
           fetch-depth: 0
@@ -142,12 +142,12 @@ jobs:
           echo "✅ Branch '$BRANCH' exists"
 
       - name: Install pnpm
-        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
         with:
           version: 10
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: lts/*
 
@@ -180,7 +180,7 @@ jobs:
           echo "capitalised=${CAPITALISED_TYPE@u}" >> "$GITHUB_OUTPUT"
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e
+        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
         with:
           token: ${{ secrets.PR_GH_TOKEN }}
           commit-message: '[release] Increment version to ${{ steps.bump-version.outputs.NEW_VERSION }}'
diff --git a/.github/workflows/version-bump-desktop-ui.yaml b/.github/workflows/version-bump-desktop-ui.yaml
index 0a8aca1b70..0ae9406391 100644
--- a/.github/workflows/version-bump-desktop-ui.yaml
+++ b/.github/workflows/version-bump-desktop-ui.yaml
@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ github.event.inputs.branch }}
           fetch-depth: 0
@@ -51,12 +51,12 @@ jobs:
           echo "✅ Branch '$BRANCH' exists"
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
         with:
           version: 10
 
       - name: Setup Node.js
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: '24.x'
           cache: 'pnpm'
@@ -79,7 +79,7 @@ jobs:
           echo "capitalised=${VERSION_TYPE@u}" >> $GITHUB_OUTPUT
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e
+        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
         with:
           token: ${{ secrets.PR_GH_TOKEN }}
           commit-message: '[release] Increment desktop-ui to ${{ steps.bump-version.outputs.NEW_VERSION }}'
diff --git a/.github/workflows/weekly-docs-check.yaml b/.github/workflows/weekly-docs-check.yaml
index 317e4d8fec..81519e49ed 100644
--- a/.github/workflows/weekly-docs-check.yaml
+++ b/.github/workflows/weekly-docs-check.yaml
@@ -1,5 +1,5 @@
 # Description: Automated weekly documentation accuracy check and update via Claude
-name: "Weekly Documentation Check"
+name: 'Weekly Documentation Check'
 
 permissions:
   contents: write
@@ -22,18 +22,18 @@ jobs:
     timeout-minutes: 45
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
-          fetch-depth: 0
+          fetch-depth: 50
           ref: main
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
         with:
           version: 10
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '20'
           cache: 'pnpm'
@@ -49,7 +49,7 @@ jobs:
           fi
 
       - name: Run Claude Documentation Review
-        uses: anthropics/claude-code-action@v1.0.6
+        uses: anthropics/claude-code-action@ff34ce0ff04a470bd3fa56c1ef391c8f1c19f8e9 # v1.0.38
         with:
           prompt: |
             Is all documentation still 100% accurate?
@@ -130,7 +130,7 @@ jobs:
 
       - name: Create or Update Pull Request
         if: steps.check_changes.outputs.has_changes == 'true'
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
         with:
           token: ${{ secrets.PR_GH_TOKEN }}
           commit-message: 'docs: weekly documentation accuracy update'
diff --git a/.gitignore b/.gitignore
index 3e400ba39c..2b4a362d69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,6 +64,7 @@ browser_tests/local/
 dist.zip
 
 /temp/
+/tmp/
 
 # Generated JSON Schemas
 /schemas/
@@ -96,3 +97,5 @@ vitest.config.*.timestamp*
 
 # Weekly docs check output
 /output.txt
+
+.amp
\ No newline at end of file
diff --git a/.i18nrc.cjs b/.i18nrc.cjs
index 14c9585919..4369f0a707 100644
--- a/.i18nrc.cjs
+++ b/.i18nrc.cjs
@@ -1,15 +1,28 @@
 // This file is intentionally kept in CommonJS format (.cjs)
 // to resolve compatibility issues with dependencies that require CommonJS.
 // Do not convert this file to ESModule format unless all dependencies support it.
-const { defineConfig } = require('@lobehub/i18n-cli');
+const { defineConfig } = require('@lobehub/i18n-cli')
 
 module.exports = defineConfig({
   modelName: 'gpt-4.1',
   splitToken: 1024,
+  saveImmediately: true,
   entry: 'src/locales/en',
   entryLocale: 'en',
   output: 'src/locales',
-  outputLocales: ['zh', 'zh-TW', 'ru', 'ja', 'ko', 'fr', 'es', 'ar', 'tr', 'pt-BR'],
+  outputLocales: [
+    'zh',
+    'zh-TW',
+    'ru',
+    'ja',
+    'ko',
+    'fr',
+    'es',
+    'ar',
+    'tr',
+    'pt-BR',
+    'fa'
+  ],
   reference: `Special names to keep untranslated: flux, photomaker, clip, vae, cfg, stable audio, stable cascade, stable zero, controlnet, lora, HiDream, Civitai, Hugging Face.
   'latent' is the short form of 'latent space'.
   'mask' is in the context of image processing.
@@ -18,5 +31,11 @@ module.exports = defineConfig({
   - For 'zh' locale: Use ONLY Simplified Chinese characters (简体中文). Common examples: 节点 (not 節點), 画布 (not 畫布), 图像 (not 圖像), 选择 (not 選擇), 减小 (not 減小).
   - For 'zh-TW' locale: Use ONLY Traditional Chinese characters (繁體中文) with Taiwan-specific terminology.
   - NEVER mix Simplified and Traditional Chinese characters within the same locale.
+  
+  IMPORTANT Persian Translation Guidelines:
+  - For 'fa' locale: Use formal Persian (فارسی رسمی) for professional tone throughout the UI.
+  - Keep commonly used technical terms in English when they are standard in Persian software (e.g., node, workflow).
+  - Use Arabic-Indic numerals (۰-۹) for numbers where appropriate.
+  - Maintain consistency with terminology used in Persian software and design applications.
   `
-});
+})
diff --git a/.oxfmtrc.json b/.oxfmtrc.json
new file mode 100644
index 0000000000..1278864b21
--- /dev/null
+++ b/.oxfmtrc.json
@@ -0,0 +1,14 @@
+{
+  "$schema": "./node_modules/oxfmt/configuration_schema.json",
+  "singleQuote": true,
+  "tabWidth": 2,
+  "semi": false,
+  "trailingComma": "none",
+  "printWidth": 80,
+  "ignorePatterns": [
+    "packages/registry-types/src/comfyRegistryTypes.ts",
+    "public/materialdesignicons.min.css",
+    "src/types/generatedManagerTypes.ts",
+    "**/__fixtures__/**/*.json"
+  ]
+}
diff --git a/.oxlintrc.json b/.oxlintrc.json
index 276ef5461d..e91b1f10e3 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -31,14 +31,11 @@
     "no-console": [
       "error",
       {
-        "allow": [
-          "warn",
-          "error"
-        ]
+        "allow": ["warn", "error"]
       }
     ],
     "no-control-regex": "off",
-    "no-eval": "off",
+    "no-eval": "error",
     "no-redeclare": "error",
     "no-restricted-imports": [
       "error",
@@ -63,16 +60,6 @@
           {
             "name": "primevue/sidebar",
             "message": "Sidebar is deprecated in PrimeVue 4+. Use Drawer instead: import Drawer from 'primevue/drawer'"
-          },
-          {
-            "name": "@/i18n--to-enable",
-            "importNames": [
-              "st",
-              "t",
-              "te",
-              "d"
-            ],
-            "message": "Don't import `@/i18n` directly, prefer `useI18n()`"
           }
         ]
       }
@@ -85,10 +72,7 @@
     "import/export": "error",
     "import/namespace": "error",
     "import/no-duplicates": "error",
-    "import/consistent-type-specifier-style": [
-      "error",
-      "prefer-top-level"
-    ],
+    "import/consistent-type-specifier-style": ["error", "prefer-top-level"],
     "jest/expect-expect": "off",
     "jest/no-conditional-expect": "off",
     "jest/no-disabled-tests": "off",
@@ -112,18 +96,27 @@
     "typescript/restrict-template-expressions": "off",
     "typescript/unbound-method": "off",
     "typescript/no-floating-promises": "error",
+    "typescript/no-explicit-any": "error",
     "vue/no-import-compiler-macros": "error",
     "vue/no-dupe-keys": "error"
   },
   "overrides": [
     {
-      "files": [
-        "**/*.{stories,test,spec}.ts",
-        "**/*.stories.vue"
-      ],
+      "files": ["**/*.{stories,test,spec}.ts", "**/*.stories.vue"],
       "rules": {
         "no-console": "allow"
       }
+    },
+    {
+      "files": ["browser_tests/**/*.ts"],
+      "rules": {
+        "typescript/no-explicit-any": "error",
+        "no-async-promise-executor": "error",
+        "no-control-regex": "error",
+        "no-useless-rename": "error",
+        "no-unused-private-class-members": "error",
+        "unicorn/no-empty-file": "error"
+      }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/.pinact.yaml b/.pinact.yaml
new file mode 100644
index 0000000000..03fade044d
--- /dev/null
+++ b/.pinact.yaml
@@ -0,0 +1,24 @@
+# pinact configuration
+# https://github.com/suzuki-shunsuke/pinact
+version: 3
+
+files:
+  - pattern: .github/workflows/*.yaml
+  - pattern: .github/actions/**/*.yaml
+
+# Actions that don't need SHA pinning (official GitHub actions are trusted)
+ignore_actions:
+  - name: actions/cache
+    ref: v5
+  - name: actions/checkout
+    ref: v6
+  - name: actions/setup-node
+    ref: v6
+  - name: actions/setup-python
+    ref: v6
+  - name: actions/upload-artifact
+    ref: v6
+  - name: actions/download-artifact
+    ref: v7
+  - name: actions/github-script
+    ref: v8
diff --git a/.prettierignore b/.prettierignore
deleted file mode 100644
index 4403edd8ec..0000000000
--- a/.prettierignore
+++ /dev/null
@@ -1,2 +0,0 @@
-packages/registry-types/src/comfyRegistryTypes.ts
-src/types/generatedManagerTypes.ts
diff --git a/.prettierrc b/.prettierrc
deleted file mode 100644
index aa43a43ac0..0000000000
--- a/.prettierrc
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "singleQuote": true,
-  "tabWidth": 2,
-  "semi": false,
-  "trailingComma": "none",
-  "printWidth": 80,
-  "importOrder": ["^@core/(.*)$", "<THIRD_PARTY_MODULES>", "^@/(.*)$", "^[./]"],
-  "importOrderSeparation": true,
-  "importOrderSortSpecifiers": true,
-  "plugins": ["@prettier/plugin-oxc", "@trivago/prettier-plugin-sort-imports"]
-}
diff --git a/.storybook/AGENTS.md b/.storybook/AGENTS.md
new file mode 100644
index 0000000000..aff1142397
--- /dev/null
+++ b/.storybook/AGENTS.md
@@ -0,0 +1,18 @@
+# Storybook Guidelines
+
+See `@docs/guidance/storybook.md` for story patterns (auto-loaded for `*.stories.ts`).
+
+## Available Context
+
+Stories have access to:
+
+- All ComfyUI stores
+- PrimeVue with ComfyUI theming
+- i18n system
+- CSS variables and styling
+
+## Troubleshooting
+
+1. **Import Errors**: Verify `@/` alias works
+2. **Missing Styles**: Check CSS imports in `preview.ts`
+3. **Store Errors**: Check store initialization in setup
diff --git a/.storybook/CLAUDE.md b/.storybook/CLAUDE.md
index ca82487844..4837fdae9f 100644
--- a/.storybook/CLAUDE.md
+++ b/.storybook/CLAUDE.md
@@ -1,197 +1,4 @@
-# Storybook Development Guidelines for Claude
+<!-- Though standards bloom in open fields so wide,
+     Anthropic walks a path of lonely pride. -->
 
-## Quick Commands
-
-- `pnpm storybook`: Start Storybook development server
-- `pnpm build-storybook`: Build static Storybook
-- `pnpm test:unit`: Run unit tests (includes Storybook components)
-
-## Development Workflow for Storybook
-
-1. **Creating New Stories**:
-   - Place `*.stories.ts` files alongside components
-   - Follow the naming pattern: `ComponentName.stories.ts`
-   - Use realistic mock data that matches ComfyUI schemas
-
-2. **Testing Stories**:
-   - Verify stories render correctly in Storybook UI
-   - Test different component states and edge cases
-   - Ensure proper theming and styling
-
-3. **Code Quality**:
-   - Run `pnpm typecheck` to verify TypeScript
-   - Run `pnpm lint` to check for linting issues
-   - Follow existing story patterns and conventions
-
-## Story Creation Guidelines
-
-### Basic Story Structure
-
-```typescript
-import type { Meta, StoryObj } from '@storybook/vue3'
-import ComponentName from './ComponentName.vue'
-
-const meta: Meta<typeof ComponentName> = {
-  title: 'Category/ComponentName',
-  component: ComponentName,
-  parameters: {
-    layout: 'centered' // or 'fullscreen', 'padded'
-  }
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Default: Story = {
-  args: {
-    // Component props
-  }
-}
-```
-
-### Mock Data Patterns
-
-For ComfyUI components, use realistic mock data:
-
-```typescript
-// Node definition mock
-const mockNodeDef = {
-  input: {
-    required: {
-      prompt: ["STRING", { multiline: true }]
-    }
-  },
-  output: ["CONDITIONING"],
-  output_is_list: [false],
-  category: "conditioning"
-}
-
-// Component instance mock
-const mockComponent = {
-  id: "1",
-  type: "CLIPTextEncode",
-  // ... other properties
-}
-```
-
-### Common Story Variants
-
-Always include these story variants when applicable:
-
-- **Default**: Basic component with minimal props
-- **WithData**: Component with realistic data
-- **Loading**: Component in loading state
-- **Error**: Component with error state
-- **LongContent**: Component with edge case content
-- **Empty**: Component with no data
-
-### Storybook-Specific Code Patterns
-
-#### Store Access
-```typescript
-// In stories, access stores through the setup function
-export const WithStore: Story = {
-  render: () => ({
-    setup() {
-      const store = useMyStore()
-      return { store }
-    },
-    template: '<MyComponent :data="store.data" />'
-  })
-}
-```
-
-#### Event Testing
-```typescript
-export const WithEvents: Story = {
-  args: {
-    onUpdate: fn() // Use Storybook's fn() for action logging
-  }
-}
-```
-
-## Configuration Notes
-
-### Vue App Setup
-The Storybook preview is configured with:
-- Pinia stores initialized
-- PrimeVue with ComfyUI theme
-- i18n internationalization
-- All necessary CSS imports
-
-### Build Configuration
-- Vite integration with proper alias resolution
-- Manual chunking for better performance
-- TypeScript support with strict checking
-- CSS processing for Vue components
-
-## Troubleshooting
-
-### Common Issues
-
-1. **Import Errors**: Verify `@/` alias is working correctly
-2. **Missing Styles**: Ensure CSS imports are in `preview.ts`
-3. **Store Errors**: Check store initialization in setup
-4. **Type Errors**: Use proper TypeScript types for story args
-
-### Debug Commands
-
-```bash
-# Check TypeScript issues
-pnpm typecheck
-
-# Lint Storybook files
-pnpm lint .storybook/
-
-# Build to check for production issues
-pnpm build-storybook
-```
-
-## File Organization
-
-```
-.storybook/
-├── main.ts          # Core configuration
-├── preview.ts       # Global setup and decorators
-├── README.md        # User documentation
-└── CLAUDE.md        # This file - Claude guidelines
-
-src/
-├── components/
-│   └── MyComponent/
-│       ├── MyComponent.vue
-│       └── MyComponent.stories.ts
-```
-
-## Integration with ComfyUI
-
-### Available Context
-
-Stories have access to:
-- All ComfyUI stores (widgetStore, colorPaletteStore, etc.)
-- PrimeVue components with ComfyUI theming
-- Internationalization system
-- ComfyUI CSS variables and styling
-
-### Testing Components
-
-When testing ComfyUI-specific components:
-1. Use realistic node definitions and data structures
-2. Test with different node types (sampling, conditioning, etc.)
-3. Verify proper CSS theming and dark/light modes
-4. Check component behavior with various input combinations
-
-### Performance Considerations
-
-- Use manual chunking for large dependencies
-- Minimize bundle size by avoiding unnecessary imports
-- Leverage Storybook's lazy loading capabilities
-- Profile build times and optimize as needed
-
-## Best Practices
-
-1. **Keep Stories Focused**: Each story should demonstrate one specific use case
-2. **Use Descriptive Names**: Story names should clearly indicate what they show
-3. **Document Complex Props**: Use JSDoc comments for complex prop types
-4. **Test Edge Cases**: Create stories for unusual but valid use cases
-5. **Maintain Consistency**: Follow established patterns in existing stories
\ No newline at end of file
+@AGENTS.md
diff --git a/.storybook/README.md b/.storybook/README.md
index be5405e513..ba09b24d5d 100644
--- a/.storybook/README.md
+++ b/.storybook/README.md
@@ -12,16 +12,17 @@ Storybook is a frontend workshop for building UI components and pages in isolati
 
 ## Storybook vs Other Testing Tools
 
-| Tool | Purpose | Use Case |
-|------|---------|----------|
-| **Storybook** | Component isolation & documentation | Developing, testing, and showcasing individual UI components |
-| **Playwright** | End-to-end testing | Full user workflow testing across multiple pages |
-| **Vitest** | Unit testing | Testing business logic, utilities, and component behavior |
-| **Vue Testing Library** | Component testing | Testing component interactions and DOM output |
+| Tool                    | Purpose                             | Use Case                                                     |
+| ----------------------- | ----------------------------------- | ------------------------------------------------------------ |
+| **Storybook**           | Component isolation & documentation | Developing, testing, and showcasing individual UI components |
+| **Playwright**          | End-to-end testing                  | Full user workflow testing across multiple pages             |
+| **Vitest**              | Unit testing                        | Testing business logic, utilities, and component behavior    |
+| **Vue Testing Library** | Component testing                   | Testing component interactions and DOM output                |
 
 ### When to Use Storybook
 
 **✅ Use Storybook for:**
+
 - Developing new UI components in isolation
 - Creating component documentation and examples
 - Testing different component states and props
@@ -30,6 +31,7 @@ Storybook is a frontend workshop for building UI components and pages in isolati
 - Building a component library or design system
 
 **❌ Don't use Storybook for:**
+
 - Testing complex user workflows (use Playwright)
 - Testing business logic (use Vitest)
 - Integration testing between components (use Vue Testing Library)
@@ -96,6 +98,7 @@ export const WithVariant: Story = {
 ## ComfyUI Storybook Guidelines
 
 ### Scope – When to Create Stories
+
 - **PrimeVue components**:  
   No need to create stories. Just refer to the official PrimeVue documentation.
 - **Custom shared components (design system components)**:  
@@ -104,6 +107,7 @@ export const WithVariant: Story = {
   Do not create stories. Only the underlying pure UI components should be included in Storybook.
 
 ### Maintenance Philosophy
+
 - Stories are lightweight and generally stable.  
   Once created, they rarely need updates unless:
   - The design changes
@@ -111,10 +115,12 @@ export const WithVariant: Story = {
 - For existing usage patterns, simply copy real code examples into Storybook to create stories.
 
 ### File Placement
-- Keep `*.stories.ts` files at the **same level as the component** (similar to test files).  
+
+- Keep `*.stories.ts` files at the **same level as the component** (similar to test files).
 - This makes it easier to check usage examples without navigating to another directory.
 
 ### Developer/Designer Workflow
+
 - **UI vs Container**: Separate pure UI components from container components.  
   Only UI components should live in Storybook.
 - **Communication Tool**: Storybook is not just about code quality—it enables designers and developers to see:
@@ -126,9 +132,10 @@ export const WithVariant: Story = {
   → Only create a story for the base UI button, not for the wrapper.
 
 ### Suggested Workflow
-1. Use PrimeVue docs for standard components  
-2. Use Storybook for **shared/custom components** that define our design system  
-3. Keep story files alongside components  
+
+1. Use PrimeVue docs for standard components
+2. Use Storybook for **shared/custom components** that define our design system
+3. Keep story files alongside components
 4. When in doubt, focus on components reused across the app or those that need to be showcased to designers
 
 ### Best Practices
@@ -211,13 +218,12 @@ This Storybook setup includes:
 
 ## Icon Usage in Storybook
 
-In this project, only the `<i class="icon-[lucide--folder]" />` syntax from unplugin-icons is supported in Storybook.  
+In this project, only the `<i class="icon-[lucide--folder]" />` syntax from unplugin-icons is supported in Storybook.
 
 **Example:**
 
 ```vue
-<script setup lang="ts">
-</script>
+<script setup lang="ts"></script>
 
 <template>
   <i class="icon-[lucide--trophy] text-neutral size-4" />
@@ -226,4 +232,3 @@ In this project, only the `<i class="icon-[lucide--folder]" />` syntax from unpl
 ```
 
 This approach ensures icons render correctly in Storybook and remain consistent with the rest of the app.
-
diff --git a/.storybook/main.ts b/.storybook/main.ts
index 897094aded..0c576b0bde 100644
--- a/.storybook/main.ts
+++ b/.storybook/main.ts
@@ -7,7 +7,7 @@ import type { InlineConfig } from 'vite'
 
 const config: StorybookConfig = {
   stories: ['../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
-  addons: ['@storybook/addon-docs'],
+  addons: ['@storybook/addon-docs', '@storybook/addon-mcp'],
   framework: {
     name: '@storybook/vue3-vite',
     options: {}
@@ -69,19 +69,40 @@ const config: StorybookConfig = {
         allowedHosts: true
       },
       resolve: {
-        alias: {
-          '@': process.cwd() + '/src'
-        }
-      },
-      esbuild: {
-        // Prevent minification of identifiers to preserve _sfc_main
-        minifyIdentifiers: false,
-        keepNames: true
+        alias: [
+          {
+            find: '@/composables/queue/useJobList',
+            replacement: process.cwd() + '/src/storybook/mocks/useJobList.ts'
+          },
+          {
+            find: '@/composables/queue/useJobActions',
+            replacement: process.cwd() + '/src/storybook/mocks/useJobActions.ts'
+          },
+          {
+            find: '@/utils/formatUtil',
+            replacement:
+              process.cwd() +
+              '/packages/shared-frontend-utils/src/formatUtil.ts'
+          },
+          {
+            find: '@/utils/networkUtil',
+            replacement:
+              process.cwd() +
+              '/packages/shared-frontend-utils/src/networkUtil.ts'
+          },
+          {
+            find: '@',
+            replacement: process.cwd() + '/src'
+          }
+        ]
       },
       build: {
-        rollupOptions: {
-          // Disable tree-shaking for Storybook to prevent Vue SFC exports from being removed
+        rolldownOptions: {
           treeshake: false,
+          output: {
+            keepNames: true,
+            strictExecutionOrder: true
+          },
           onwarn: (warning, warn) => {
             // Suppress specific warnings
             if (
diff --git a/.storybook/preview-head.html b/.storybook/preview-head.html
index 05e082ef0e..5ad063ab9a 100644
--- a/.storybook/preview-head.html
+++ b/.storybook/preview-head.html
@@ -1,7 +1,9 @@
 <style>
   body {
     overflow-y: auto !important;
-    transition: background-color 0.3s ease, color 0.3s ease;
+    transition:
+      background-color 0.3s ease,
+      color 0.3s ease;
   }
 
   /* Light theme default - with explicit color to override media queries */
@@ -57,8 +59,8 @@
 
   /* Override Storybook's problematic & selector styles */
   /* Reset only the specific properties that Storybook injects */
-  li+li {
+  li + li {
     margin: 0;
     padding: revert-layer;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/.storybook/preview.ts b/.storybook/preview.ts
index 95c3370902..e22c896fa2 100644
--- a/.storybook/preview.ts
+++ b/.storybook/preview.ts
@@ -90,7 +90,6 @@ const preview: Preview = {
           { value: 'light', icon: 'sun', title: 'Light' },
           { value: 'dark', icon: 'moon', title: 'Dark' }
         ],
-        showName: true,
         dynamicTitle: true
       }
     }
diff --git a/.stylelintrc.json b/.stylelintrc.json
index edece5d9a3..4eaf9d1e23 100644
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@@ -40,26 +40,27 @@
     "block-no-empty": true,
     "no-descending-specificity": null,
     "no-duplicate-at-import-rules": true,
+    "at-rule-disallowed-list": ["apply"],
     "at-rule-no-unknown": [
       true,
       {
         "ignoreAtRules": [
           "tailwind",
-          "apply",
           "layer",
           "config",
           "theme",
           "reference",
           "plugin",
           "custom-variant",
-          "utility"
+          "utility",
+          "source"
         ]
       }
     ],
     "function-no-unknown": [
       true,
       {
-        "ignoreFunctions": ["theme", "v-bind"]
+        "ignoreFunctions": ["theme", "v-bind", "from-folder", "from-json"]
       }
     ]
   },
diff --git a/.vscode/custom-css.json b/.vscode/custom-css.json
index 67aa038b4c..89e04c3e8a 100644
--- a/.vscode/custom-css.json
+++ b/.vscode/custom-css.json
@@ -47,4 +47,4 @@
       "status": "obsolete"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 54f28d4002..9cbac42d76 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,25 +1,22 @@
 {
   "recommendations": [
+    "antfu.vite",
     "austenc.tailwind-docs",
     "bradlc.vscode-tailwindcss",
     "davidanson.vscode-markdownlint",
     "dbaeumer.vscode-eslint",
+    "donjayamanne.githistory",
     "eamodio.gitlens",
-    "esbenp.prettier-vscode",
-    "figma.figma-vscode-extension",
     "github.vscode-github-actions",
     "github.vscode-pull-request-github",
     "hbenl.vscode-test-explorer",
+    "kisstkondoros.vscode-codemetrics",
     "lokalise.i18n-ally",
     "ms-playwright.playwright",
+    "oxc.oxc-vscode",
+    "sonarsource.sonarlint-vscode",
     "vitest.explorer",
     "vue.volar",
-    "sonarsource.sonarlint-vscode",
-    "deque-systems.vscode-axe-linter",
-    "kisstkondoros.vscode-codemetrics",
-    "donjayamanne.githistory",
-    "wix.vscode-import-cost",
-    "prograhammer.tslint-vue",
-    "antfu.vite"
+    "wix.vscode-import-cost"
   ]
 }
diff --git a/.yamllint b/.yamllint
index 9108997d4c..3a7b252446 100644
--- a/.yamllint
+++ b/.yamllint
@@ -8,3 +8,6 @@ rules:
   line-length: disable
   document-start: disable
   truthy: disable
+  comments: 
+    min-spaces-from-content: 1
+  
\ No newline at end of file
diff --git a/AGENTS.md b/AGENTS.md
index 0d80ec8a0b..52cd688e6e 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,5 +1,7 @@
 # Repository Guidelines
 
+See @docs/guidance/\*.md for file-type-specific conventions (auto-loaded by glob).
+
 ## Project Structure & Module Organization
 
 - Source: `src/`
@@ -19,22 +21,26 @@
 - i18n: `src/i18n.ts`,
 - Entry Point: `src/main.ts`.
 - Tests:
-  - unit/component in `tests-ui/` and `src/**/*.test.ts`
+  - unit/component in `src/**/*.test.ts`
   - E2E (Playwright) in `browser_tests/**/*.spec.ts`
 - Public assets: `public/`
 - Build output: `dist/`
 - Configs
   - `vite.config.mts`
-  - `vitest.config.ts`
   - `playwright.config.ts`
   - `eslint.config.ts`
-  - `.prettierrc`
+  - `.oxfmtrc.json`
+  - `.oxlintrc.json`
   - etc.
 
 ## Monorepo Architecture
 
 The project uses **Nx** for build orchestration and task management
 
+## Package Manager
+
+This project uses **pnpm**. Always prefer scripts defined in `package.json` (e.g., `pnpm test:unit`, `pnpm lint`). To run arbitrary packages not in scripts, use `pnpx` or `pnpm dlx` — never `npx`.
+
 ## Build, Test, and Development Commands
 
 - `pnpm dev`: Start Vite dev server.
@@ -42,10 +48,25 @@ The project uses **Nx** for build orchestration and task management
 - `pnpm build`: Type-check then production build to `dist/`
 - `pnpm preview`: Preview the production build locally
 - `pnpm test:unit`: Run Vitest unit tests
-- `pnpm test:browser`: Run Playwright E2E tests (`browser_tests/`)
+- `pnpm test:browser:local`: Run Playwright E2E tests (`browser_tests/`)
 - `pnpm lint` / `pnpm lint:fix`: Lint (ESLint)
-- `pnpm format` / `pnpm format:check`: Prettier
+- `pnpm format` / `pnpm format:check`: oxfmt
 - `pnpm typecheck`: Vue TSC type checking
+- `pnpm storybook`: Start Storybook development server
+
+## Development Workflow
+
+1. Make code changes
+2. Run relevant tests
+3. Run `pnpm typecheck`, `pnpm lint`, `pnpm format`
+4. Check if README updates are needed
+5. Suggest docs.comfy.org updates for user-facing changes
+
+## Git Conventions
+
+- Use `prefix:` format: `feat:`, `fix:`, `test:`
+- Add "Fixes #n" to PR descriptions
+- Never mention Claude/AI in commits
 
 ## Coding Style & Naming Conventions
 
@@ -55,7 +76,7 @@ The project uses **Nx** for build orchestration and task management
     - Composition API only
   - Tailwind 4 styling
     - Avoid `<style>` blocks
-- Style: (see `.prettierrc`)
+- Style: (see `.oxfmtrc.json`)
   - Indent 2 spaces
   - single quotes
   - no trailing semicolons
@@ -63,6 +84,9 @@ The project uses **Nx** for build orchestration and task management
 - Imports:
   - sorted/grouped by plugin
   - run `pnpm format` before committing
+  - use separate `import type` statements, not inline `type` in mixed imports
+    - ✅ `import type { Foo } from './foo'` + `import { bar } from './foo'`
+    - ❌ `import { bar, type Foo } from './foo'`
 - ESLint:
   - Vue + TS rules
   - no floating promises
@@ -73,7 +97,6 @@ The project uses **Nx** for build orchestration and task management
   - composables `useXyz.ts`
   - Pinia stores `*Store.ts`
 
-
 ## Commit & Pull Request Guidelines
 
 - PRs:
@@ -111,15 +134,18 @@ The project uses **Nx** for build orchestration and task management
 
     ```typescript
     const { nodes, showTotal = true } = defineProps<{
-    nodes: ApiNodeCost[]
-    showTotal?: boolean
+      nodes: ApiNodeCost[]
+      showTotal?: boolean
     }>()
     ```
 
   - Prefer reactive props destructuring to `const props = defineProps<...>`
   - Do not use `withDefaults` or runtime props declaration
   - Do not import Vue macros unnecessarily
-  - Prefer `useModel` to separately defining a prop and emit
+  - Prefer `defineModel` to separately defining a prop and emit for v-model bindings
+  - Define slots via template usage, not `defineSlots`
+  - Use same-name shorthand for slot prop bindings: `:isExpanded` instead of `:is-expanded="isExpanded"`
+  - Derive component types using `vue-component-type-helpers` (`ComponentProps`, `ComponentSlots`) instead of separate type files
   - Be judicious with addition of new refs or other state
     - If it's possible to accomplish the design goals with just a prop, don't add a `ref`
     - If it's possible to use the `ref` or prop directly, don't add a `computed`
@@ -137,7 +163,7 @@ The project uses **Nx** for build orchestration and task management
 8. Implement proper error handling
 9. Follow Vue 3 style guide and naming conventions
 10. Use Vite for fast development and building
-11. Use vue-i18n in composition API for any string literals. Place new translation entries in src/locales/en/main.json
+11. Use vue-i18n in composition API for any string literals. Place new translation entries in src/locales/en/main.json. Use the plurals system in i18n instead of hardcoding pluralization in templates.
 12. Avoid new usage of PrimeVue components
 13. Write tests for all changes, especially bug fixes to catch future regressions
 14. Write code that is expressive and self-documenting to the furthest degree possible. This reduces the need for code comments which can get out of sync with the code itself. Try to avoid comments unless absolutely necessary
@@ -155,6 +181,8 @@ The project uses **Nx** for build orchestration and task management
 
 ## Testing Guidelines
 
+See @docs/testing/\*.md for detailed patterns.
+
 - Frameworks:
   - Vitest (unit/component, happy-dom)
   - Playwright (E2E)
@@ -240,7 +268,7 @@ A particular type of complexity is over-engineering, where developers have made
 
 ## Repository Navigation
 
-- Check README files in key folders (tests-ui, browser_tests, composables, etc.)
+- Check README files in key folders (browser_tests, composables, etc.)
 - Prefer running single tests for performance
 - Use --help for unfamiliar CLI tools
 
@@ -268,11 +296,20 @@ When referencing Comfy-Org repos:
   - Use `cn()` inline in the template when feasible instead of creating a `computed` to hold the value
 - NEVER use `!important` or the `!` important prefix for tailwind classes
   - Find existing `!important` classes that are interfering with the styling and propose corrections of those instead.
+- NEVER use arbitrary percentage values like `w-[80%]` when a Tailwind fraction utility exists
+  - Use `w-4/5` instead of `w-[80%]`, `w-1/2` instead of `w-[50%]`, etc.
 
 ## Agent-only rules
 
 Rules for agent-based coding tasks.
 
+### Chrome DevTools MCP
+
+When using `take_snapshot` to inspect dropdowns, listboxes, or other components with dynamic options:
+
+- Use `verbose: true` to see the full accessibility tree including list items
+- Non-verbose snapshots often omit nested options in comboboxes/listboxes
+
 ### Temporary Files
 
 - Put planning documents under `/temp/plans/`
diff --git a/CLAUDE.md b/CLAUDE.md
index 7ceadf85ce..43c994c2d3 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -1,30 +1 @@
-# Claude Code specific instructions
-
-@Agents.md
-
-## Repository Setup
-
-For first-time setup, use the Claude command:
-
-```sh
-/setup_repo
-```
-
-This bootstraps the monorepo with dependencies, builds, tests, and dev server verification.
-
-**Prerequisites:** Node.js >= 24, Git repository, available ports for dev server, storybook, etc.
-
-## Development Workflow
-
-1. **First-time setup**: Run `/setup_repo` Claude command
-2. Make code changes
-3. Run tests (see subdirectory CLAUDE.md files)
-4. Run typecheck, lint, format
-5. Check README updates
-6. Consider docs.comfy.org updates
-
-## Git Conventions
-
-- Use `prefix:` format: `feat:`, `fix:`, `test:`
-- Add "Fixes #n" to PR descriptions
-- Never mention Claude/AI in commits
+@AGENTS.md
diff --git a/CODEOWNERS b/CODEOWNERS
index fcba1e4005..ce654c8f74 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -2,61 +2,60 @@
 *                                                 @Comfy-org/comfy_frontend_devs
 
 # Desktop/Electron
-/apps/desktop-ui/                                 @benceruleanlu
-/src/stores/electronDownloadStore.ts              @benceruleanlu
-/src/extensions/core/electronAdapter.ts           @benceruleanlu
-/vite.electron.config.mts                         @benceruleanlu
+/apps/desktop-ui/                                 @benceruleanlu @Comfy-org/comfy_frontend_devs
+/src/stores/electronDownloadStore.ts              @benceruleanlu @Comfy-org/comfy_frontend_devs
+/src/extensions/core/electronAdapter.ts           @benceruleanlu @Comfy-org/comfy_frontend_devs
+/vite.electron.config.mts                         @benceruleanlu @Comfy-org/comfy_frontend_devs
 
 # Common UI Components
-/src/components/chip/                             @viva-jinyi
-/src/components/card/                             @viva-jinyi
-/src/components/button/                           @viva-jinyi
-/src/components/input/                            @viva-jinyi
+/src/components/chip/                             @viva-jinyi @Comfy-org/comfy_frontend_devs
+/src/components/card/                             @viva-jinyi @Comfy-org/comfy_frontend_devs
+/src/components/button/                           @viva-jinyi @Comfy-org/comfy_frontend_devs
+/src/components/input/                            @viva-jinyi @Comfy-org/comfy_frontend_devs
 
 # Topbar
-/src/components/topbar/                           @pythongosssss
+/src/components/topbar/                           @pythongosssss @Comfy-org/comfy_frontend_devs
 
 # Thumbnail
-/src/renderer/core/thumbnail/                     @pythongosssss
+/src/renderer/core/thumbnail/                     @pythongosssss @Comfy-org/comfy_frontend_devs
 
 # Legacy UI
-/scripts/ui/                                      @pythongosssss
+/scripts/ui/                                      @pythongosssss @Comfy-org/comfy_frontend_devs
 
 # Link rendering
-/src/renderer/core/canvas/links/                  @benceruleanlu
+/src/renderer/core/canvas/links/                  @benceruleanlu @Comfy-org/comfy_frontend_devs
 
 # Partner Nodes
-/src/composables/node/useNodePricing.ts           @jojodecayz @bigcat88
+/src/composables/node/useNodePricing.ts           @jojodecayz @bigcat88 @Comfy-org/comfy_frontend_devs
 
 # Node help system
-/src/utils/nodeHelpUtil.ts                        @benceruleanlu
-/src/stores/workspace/nodeHelpStore.ts            @benceruleanlu
-/src/services/nodeHelpService.ts                  @benceruleanlu
+/src/utils/nodeHelpUtil.ts                        @benceruleanlu @Comfy-org/comfy_frontend_devs
+/src/stores/workspace/nodeHelpStore.ts            @benceruleanlu @Comfy-org/comfy_frontend_devs
+/src/services/nodeHelpService.ts                  @benceruleanlu @Comfy-org/comfy_frontend_devs
 
 # Selection toolbox
-/src/components/graph/selectionToolbox/           @Myestery
+/src/components/graph/selectionToolbox/           @Myestery @Comfy-org/comfy_frontend_devs
 
 # Minimap
-/src/renderer/extensions/minimap/                 @jtydhr88 @Myestery 
+/src/renderer/extensions/minimap/                 @jtydhr88 @Myestery @Comfy-org/comfy_frontend_devs
 
 # Workflow Templates
-/src/platform/workflow/templates/                 @Myestery @christian-byrne @comfyui-wiki
-/src/components/templates/                        @Myestery @christian-byrne @comfyui-wiki
+/src/platform/workflow/templates/                 @Myestery @christian-byrne @comfyui-wiki @Comfy-org/comfy_frontend_devs
+/src/components/templates/                        @Myestery @christian-byrne @comfyui-wiki @Comfy-org/comfy_frontend_devs
 
 # Mask Editor
-/src/extensions/core/maskeditor.ts                @trsommer @brucew4yn3rp
-/src/extensions/core/maskEditorLayerFilenames.ts  @trsommer @brucew4yn3rp
+/src/extensions/core/maskeditor.ts                @trsommer @brucew4yn3rp @Comfy-org/comfy_frontend_devs
+/src/extensions/core/maskEditorLayerFilenames.ts  @trsommer @brucew4yn3rp @Comfy-org/comfy_frontend_devs
 
 # 3D
-/src/extensions/core/load3d.ts                    @jtydhr88
-/src/components/load3d/                           @jtydhr88
+/src/extensions/core/load3d.ts                    @jtydhr88 @Comfy-org/comfy_frontend_devs
+/src/components/load3d/                           @jtydhr88 @Comfy-org/comfy_frontend_devs
 
 # Manager
-/src/workbench/extensions/manager/                @viva-jinyi @christian-byrne @ltdrdata
+/src/workbench/extensions/manager/                @viva-jinyi @christian-byrne @ltdrdata @Comfy-org/comfy_frontend_devs
 
 # Translations
-/src/locales/                                     @Yorha4D @KarryCharon @shinshin86 @Comfy-Org/comfy_maintainer @Comfy-org/comfy_frontend_devs
-/src/locales/pt-BR/                               @JonatanAtila @Yorha4D @KarryCharon @shinshin86
+/src/locales/                                     @Comfy-Org/comfy_maintainer @Comfy-org/comfy_frontend_devs
 
 # LLM Instructions (blank on purpose)
 .claude/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cb96091749..daa8808c8d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -24,12 +24,14 @@ Have another idea? Drop into Discord or open an issue, and let's chat!
 ### Initial Setup
 
 1. Clone the repository:
+
    ```bash
    git clone https://github.com/Comfy-Org/ComfyUI_frontend.git
    cd ComfyUI_frontend
    ```
 
 2. Install dependencies:
+
    ```bash
    pnpm install
    ```
@@ -83,8 +85,7 @@ Make sure your desktop machine and touch device are on the same network. On your
 navigate to `http://<server_ip>:5173` (e.g. `http://192.168.2.20:5173` here), to access the ComfyUI frontend.
 
 > ⚠️ IMPORTANT:
-The dev server will NOT load JavaScript extensions from custom nodes. Only core extensions (built into the frontend) will be loaded. This is because the shim system that allows custom node JavaScript to import frontend modules only works in production builds. Python custom nodes still function normally. See [Extension Development Guide](docs/extensions/development.md) for details and workarounds. And See [Extension Overview](docs/extensions/README.md) for extensions overview.
-
+> The dev server will NOT load JavaScript extensions from custom nodes. Only core extensions (built into the frontend) will be loaded. This is because the shim system that allows custom node JavaScript to import frontend modules only works in production builds. Python custom nodes still function normally. See [Extension Development Guide](docs/extensions/development.md) for details and workarounds. And See [Extension Overview](docs/extensions/README.md) for extensions overview.
 
 ## Development Workflow
 
@@ -109,7 +110,6 @@ When you fix a bug that affects a version in feature freeze, we use an automated
 2. Before merging, add these labels to your PR:
    - `needs-backport` - triggers the automated backport workflow
    - `core/1.24` - targets the `core/1.24` release candidate branch
-   
 3. Merge your PR normally
 4. The automated workflow will:
    - Create a new branch from `core/1.24`
@@ -127,6 +127,7 @@ When you fix a bug that affects a version in feature freeze, we use an automated
 #### Handling Conflicts
 
 If the automated cherry-pick fails due to conflicts, the workflow will comment on your PR with:
+
 - The list of conflicting files
 - Instructions to manually cherry-pick to the release candidate branch
 
@@ -200,7 +201,7 @@ The project supports three types of icons, all with automatic imports (no manual
 2. **Iconify Icons** - 200,000+ icons from various libraries: `<i class="icon-[lucide--settings]" />`, `<i class="icon-[mdi--folder]" />`
 3. **Custom Icons** - Your own SVG icons: `<i-comfy:workflow />`
 
-Icons are powered by the unplugin-icons system, which automatically discovers and imports icons as Vue components. Custom icons are stored in `packages/design-system/src/icons/` and processed by `packages/design-system/src/iconCollection.ts` with automatic validation.
+Icons are powered by the unplugin-icons system, which automatically discovers and imports icons as Vue components. Tailwind CSS icon classes (`icon-[comfy--template]`) are provided by `@iconify/tailwind4`, configured in `packages/design-system/src/css/style.css`. Custom icons are stored in `packages/design-system/src/icons/` and loaded via `from-folder` at build time.
 
 For detailed instructions and code examples, see [packages/design-system/src/icons/README.md](packages/design-system/src/icons/README.md).
 
@@ -241,6 +242,7 @@ The original litegraph repository (https://github.com/Comfy-Org/litegraph.js) is
 ## Questions?
 
 If you have questions about contributing:
+
 - Check existing issues and discussions
 - Ask in our [Discord](https://discord.com/invite/comfyorg)
 - Open a new issue for clarification
diff --git a/README.md b/README.md
index e8af480f2b..d81eade6bf 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,6 @@
 [![][github-downloads-shield]][github-downloads-link]
 [![][github-downloads-latest-shield]][github-downloads-link]
 
-
 [github-release-shield]: https://img.shields.io/github/v/release/Comfy-Org/ComfyUI_frontend?style=flat&sort=semver
 [github-release-link]: https://github.com/Comfy-Org/ComfyUI_frontend/releases
 [github-release-date-shield]: https://img.shields.io/github/release-date/Comfy-Org/ComfyUI_frontend?style=flat
@@ -47,6 +46,7 @@ The project follows a structured release process for each minor version, consist
    - Version is finalized and made available to all users
 
 ### Nightly Releases
+
 Nightly releases are published daily at [https://github.com/Comfy-Org/ComfyUI_frontend/releases](https://github.com/Comfy-Org/ComfyUI_frontend/releases).
 
 To use the latest nightly release, add the following command line argument to your ComfyUI launch script:
@@ -56,16 +56,17 @@ To use the latest nightly release, add the following command line argument to yo
 ```
 
 ## Overlapping Release Cycles
+
 The development of successive minor versions overlaps. For example, while version 1.1 is in feature freeze, development for version 1.2 begins simultaneously. Each feature has approximately 4 weeks from merge to ComfyUI stable release (2 weeks on main, 2 weeks frozen on RC).
 
 ### Example Release Cycle
 
-| Week | Date Range | Version 1.1 | Version 1.2 | Version 1.3 | Patch Releases |
-|------|------------|-------------|-------------|-------------|----------------|
-| 1-2 | Mar 1-14 | Development | - | - | - |
-| 3-4 | Mar 15-28 | Feature Freeze | Development | - | 1.1.0 through 1.1.13 (daily) |
-| 5-6 | Mar 29-Apr 11 | Released | Feature Freeze | Development | 1.1.14+ (daily)<br>1.2.0 through 1.2.13 (daily) |
-| 7-8 | Apr 12-25 | - | Released | Feature Freeze | 1.2.14+ (daily)<br>1.3.0 through 1.3.13 (daily) |
+| Week | Date Range    | Version 1.1    | Version 1.2    | Version 1.3    | Patch Releases                                  |
+| ---- | ------------- | -------------- | -------------- | -------------- | ----------------------------------------------- |
+| 1-2  | Mar 1-14      | Development    | -              | -              | -                                               |
+| 3-4  | Mar 15-28     | Feature Freeze | Development    | -              | 1.1.0 through 1.1.13 (daily)                    |
+| 5-6  | Mar 29-Apr 11 | Released       | Feature Freeze | Development    | 1.1.14+ (daily)<br>1.2.0 through 1.2.13 (daily) |
+| 7-8  | Apr 12-25     | -              | Released       | Feature Freeze | 1.2.14+ (daily)<br>1.3.0 through 1.3.13 (daily) |
 
 ## Release Summary
 
@@ -74,19 +75,21 @@ The development of successive minor versions overlaps. For example, while versio
 <details id='feature-native-translation'>
   <summary>v1.5: Native translation (i18n)</summary>
 
-  ComfyUI now includes built-in translation support, replacing the need for third-party translation extensions. Select your language
-  in `Comfy > Locale > Language` to translate the interface into English, Chinese (Simplified), Russian, Japanese, Korean, or Arabic. This native
-  implementation offers better performance, reliability, and maintainability compared to previous solutions.<br>
+ComfyUI now includes built-in translation support, replacing the need for third-party translation extensions. Select your language
+in `Comfy > Locale > Language` to translate the interface into English, Chinese (Simplified), Russian, Japanese, Korean, or Arabic. This native
+implementation offers better performance, reliability, and maintainability compared to previous solutions.<br>
+
+More details available here: https://blog.comfy.org/p/native-localization-support-i18n
 
-  More details available here: https://blog.comfy.org/p/native-localization-support-i18n
 </details>
 
 <details id='feature-mask-editor'>
   <summary>v1.4: New mask editor</summary>
 
-  https://github.com/Comfy-Org/ComfyUI_frontend/pull/1284 implements a new mask editor.
+https://github.com/Comfy-Org/ComfyUI_frontend/pull/1284 implements a new mask editor.
+
+![image](https://github.com/user-attachments/assets/f0ea6ee5-00ee-4e5d-a09c-6938e86a1f17)
 
-  ![image](https://github.com/user-attachments/assets/f0ea6ee5-00ee-4e5d-a09c-6938e86a1f17)
 </details>
 
 <details id='feature-integrated-server-terminal'>
@@ -95,18 +98,22 @@ The development of successive minor versions overlaps. For example, while versio
 Press Ctrl + ` to toggle integrated terminal.
 
 https://github.com/user-attachments/assets/eddedc6a-07a3-4a83-9475-63b3977f6d94
+
 </details>
 
 <details id='feature-keybinding-customization'>
   <summary>v1.3.7: Keybinding customization</summary>
 
 ## Basic UI
+
 ![image](https://github.com/user-attachments/assets/c84a1609-3880-48e0-a746-011f36beda68)
 
 ## Reset button
+
 ![image](https://github.com/user-attachments/assets/4d2922da-bb4f-4f90-8017-a8e4a0db07c7)
 
 ## Edit Keybinding
+
 ![image](https://github.com/user-attachments/assets/77626b7a-cb46-48f8-9465-e03120aac66a)
 ![image](https://github.com/user-attachments/assets/79131a4e-75c6-4715-bd11-c6aaed887779)
 
@@ -117,27 +124,34 @@ https://github.com/user-attachments/assets/eddedc6a-07a3-4a83-9475-63b3977f6d94
 <details id='feature-node-library-sidebar'>
   <summary>v1.2.4: Node library sidebar tab</summary>
 
-  #### Drag & Drop
+#### Drag & Drop
+
 https://github.com/user-attachments/assets/853e20b7-bc0e-49c9-bbce-a2ba7566f92f
 
-  #### Filter
+#### Filter
+
 https://github.com/user-attachments/assets/4bbca3ee-318f-4cf0-be32-a5a5541066cf
+
 </details>
 
 <details id='feature-queue-sidebar'>
   <summary>v1.2.0: Queue/History sidebar tab</summary>
 
-  https://github.com/user-attachments/assets/86e264fe-4d26-4f07-aa9a-83bdd2d02b8f
+https://github.com/user-attachments/assets/86e264fe-4d26-4f07-aa9a-83bdd2d02b8f
+
 </details>
 
 <details id='feature-node-search'>
   <summary>v1.1.0: Node search box</summary>
 
-  #### Fuzzy search & Node preview
-  ![image](https://github.com/user-attachments/assets/94733e32-ea4e-4a9c-b321-c1a05db48709)
+#### Fuzzy search & Node preview
+
+![image](https://github.com/user-attachments/assets/94733e32-ea4e-4a9c-b321-c1a05db48709)
+
+#### Release link with shift
+
+https://github.com/user-attachments/assets/a1b2b5c3-10d1-4256-b620-345de6858f25
 
-  #### Release link with shift
-  https://github.com/user-attachments/assets/a1b2b5c3-10d1-4256-b620-345de6858f25
 </details>
 
 ### QoL changes
@@ -146,12 +160,14 @@ https://github.com/user-attachments/assets/4bbca3ee-318f-4cf0-be32-a5a5541066cf
   <summary>v1.3.32: **Litegraph** Nested group</summary>
 
 https://github.com/user-attachments/assets/f51adeb1-028e-40af-81e4-0ac13075198a
+
 </details>
 
 <details id='feature-group-selection'>
   <summary>v1.3.24: **Litegraph** Group selection</summary>
 
 https://github.com/user-attachments/assets/e6230a94-411e-4fba-90cb-6c694200adaa
+
 </details>
 
 <details id='feature-toggle-link-visibility'>
@@ -227,17 +243,21 @@ https://github.com/user-attachments/assets/c142c43f-2fe9-4030-8196-b3bfd4c6977d
 <details id='feature-auto-connect-link'>
   <summary>v1.2.2: **Litegraph** auto connects to correct slot</summary>
 
-  #### Before
-  https://github.com/user-attachments/assets/c253f778-82d5-4e6f-aec0-ea2ccf421651
+#### Before
+
+https://github.com/user-attachments/assets/c253f778-82d5-4e6f-aec0-ea2ccf421651
+
+#### After
+
+https://github.com/user-attachments/assets/b6360ac0-f0d2-447c-9daa-8a2e20c0dc1d
 
-  #### After
-  https://github.com/user-attachments/assets/b6360ac0-f0d2-447c-9daa-8a2e20c0dc1d
 </details>
 
 <details id='feature-hide-text-overflow'>
   <summary>v1.1.8: **Litegraph** hides text overflow on widget value</summary>
 
-  https://github.com/user-attachments/assets/5696a89d-4a47-4fcc-9e8c-71e1264943f2
+https://github.com/user-attachments/assets/5696a89d-4a47-4fcc-9e8c-71e1264943f2
+
 </details>
 
 ### Developer APIs
@@ -283,8 +303,7 @@ window['app'].extensionManager.dialog
 
 ```js
 // window.alert
-window['app'].extensionManager.toast
-  .addAlert("Test Alert")
+window['app'].extensionManager.toast.addAlert('Test Alert')
 ```
 
 ![image](https://github.com/user-attachments/assets/9b18bdca-76ef-4432-95de-5cd2369684f2)
@@ -383,28 +402,28 @@ app.extensionManager.setting.set('TestSetting', 'Hello, universe!')
 <details id='extension-api-commands-keybindings'>
   <summary>v1.3.7: Register commands and keybindings</summary>
 
-  Extensions can call the following API to register commands and keybindings. Do
-  note that keybindings defined in core cannot be overwritten, and some keybindings
-  are reserved by the browser.
+Extensions can call the following API to register commands and keybindings. Do
+note that keybindings defined in core cannot be overwritten, and some keybindings
+are reserved by the browser.
 
 ```js
-  app.registerExtension({
-    name: 'TestExtension1',
-    commands: [
-      {
-        id: 'TestCommand',
-        function: () => {
-          alert('TestCommand')
-        }
+app.registerExtension({
+  name: 'TestExtension1',
+  commands: [
+    {
+      id: 'TestCommand',
+      function: () => {
+        alert('TestCommand')
       }
-    ],
-    keybindings: [
-      {
-        combo: { key: 'k' },
-        commandId: 'TestCommand'
-      }
-    ]
-  })
+    }
+  ],
+  keybindings: [
+    {
+      combo: { key: 'k' },
+      commandId: 'TestCommand'
+    }
+  ]
+})
 ```
 
 </details>
@@ -412,66 +431,69 @@ app.extensionManager.setting.set('TestSetting', 'Hello, universe!')
 <details id='extension-api-topbar-menu'>
   <summary>v1.3.1: Extension API to register custom topbar menu items</summary>
 
-  Extensions can call the following API to register custom topbar menu items.
+Extensions can call the following API to register custom topbar menu items.
 
 ```js
-  app.registerExtension({
-    name: 'TestExtension1',
-    commands: [
-      {
-        id: 'foo-id',
-        label: 'foo',
-        function: () => {
-          alert(1)
-        }
+app.registerExtension({
+  name: 'TestExtension1',
+  commands: [
+    {
+      id: 'foo-id',
+      label: 'foo',
+      function: () => {
+        alert(1)
       }
-    ],
-    menuCommands: [
-      {
-        path: ['ext', 'ext2'],
-        commands: ['foo-id']
-      }
-    ]
-  })
+    }
+  ],
+  menuCommands: [
+    {
+      path: ['ext', 'ext2'],
+      commands: ['foo-id']
+    }
+  ]
+})
 ```
 
 ![image](https://github.com/user-attachments/assets/ae7b082f-7ce9-4549-a446-4563567102fe)
+
 </details>
 
 <details id='extension-api-toast'>
   <summary>v1.2.27: Extension API to add toast message</summary>i
 
-  Extensions can call the following API to add toast messages.
+Extensions can call the following API to add toast messages.
 
 ```js
-  app.extensionManager.toast.add({
-    severity: 'info',
-    summary: 'Loaded!',
-    detail: 'Extension loaded!',
-    life: 3000
-  })
+app.extensionManager.toast.add({
+  severity: 'info',
+  summary: 'Loaded!',
+  detail: 'Extension loaded!',
+  life: 3000
+})
 ```
+
 Documentation of all supported options can be found here: <https://primevue.org/toast/#api.toast.interfaces.ToastMessageOptions>
 
 ![image](https://github.com/user-attachments/assets/de02cd7e-cd81-43d1-a0b0-bccef92ff487)
+
 </details>
 
 <details id='extension-api-sidebar-tab'>
   <summary>v1.2.4: Extension API to register custom sidebar tab</summary>
 
-  Extensions now can call the following API to register a sidebar tab.
+Extensions now can call the following API to register a sidebar tab.
 
 ```js
-  app.extensionManager.registerSidebarTab({
-    id: "search",
-    icon: "pi pi-search",
-    title: "search",
-    tooltip: "search",
-    type: "custom",
-    render: (el) => {
-      el.innerHTML = "<div>Custom search tab</div>";
-    },
-  });
+app.extensionManager.registerSidebarTab({
+  id: 'search',
+  icon: 'pi pi-search',
+  title: 'search',
+  tooltip: 'search',
+  type: 'custom',
+  render: (el) => {
+    el.innerHTML = '<div>Custom search tab</div>'
+  }
+})
 ```
 
 The list of supported icons can be found here: <https://primevue.org/icons/#list>
@@ -479,6 +501,7 @@ The list of supported icons can be found here: <https://primevue.org/icons/#list
 We will support custom icons later.
 
 ![image](https://github.com/user-attachments/assets/7bff028a-bf91-4cab-bf97-55c243b3f5e0)
+
 </details>
 
 <details id='extension-api-selection-toolbox'>
@@ -539,4 +562,4 @@ For comprehensive troubleshooting and technical support, please refer to our off
 
 - **[General Troubleshooting Guide](https://docs.comfy.org/troubleshooting/overview)** - Common issues, performance optimization, and reporting bugs
 - **[Custom Node Issues](https://docs.comfy.org/troubleshooting/custom-node-issues)** - Debugging custom node problems and conflicts
-- **[Desktop Installation Guide](https://docs.comfy.org/installation/desktop/windows)** - Desktop-specific installation and troubleshooting
\ No newline at end of file
+- **[Desktop Installation Guide](https://docs.comfy.org/installation/desktop/windows)** - Desktop-specific installation and troubleshooting
diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md
index ff6a1191d0..6f8a1c2702 100644
--- a/THIRD_PARTY_NOTICES.md
+++ b/THIRD_PARTY_NOTICES.md
@@ -1 +1 @@
-AMD and the AMD Arrow logo are trademarks of Advanced Micro Devices, Inc.
\ No newline at end of file
+AMD and the AMD Arrow logo are trademarks of Advanced Micro Devices, Inc.
diff --git a/apps/desktop-ui/index.html b/apps/desktop-ui/index.html
index 3020c67bfb..9666ed4364 100644
--- a/apps/desktop-ui/index.html
+++ b/apps/desktop-ui/index.html
@@ -1,9 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
     <title>ComfyUI</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1.0, user-scalable=no"
+    />
   </head>
   <body>
     <div id="desktop-app"></div>
diff --git a/apps/desktop-ui/package.json b/apps/desktop-ui/package.json
index ed65e99a52..d47be69fec 100644
--- a/apps/desktop-ui/package.json
+++ b/apps/desktop-ui/package.json
@@ -2,6 +2,36 @@
   "name": "@comfyorg/desktop-ui",
   "version": "0.0.6",
   "type": "module",
+  "scripts": {
+    "lint": "nx run @comfyorg/desktop-ui:lint",
+    "typecheck": "nx run @comfyorg/desktop-ui:typecheck",
+    "storybook": "storybook dev -p 6007",
+    "build-storybook": "storybook build -o dist/storybook"
+  },
+  "dependencies": {
+    "@comfyorg/comfyui-electron-types": "catalog:",
+    "@comfyorg/shared-frontend-utils": "workspace:*",
+    "@primevue/core": "catalog:",
+    "@primevue/themes": "catalog:",
+    "@vueuse/core": "catalog:",
+    "pinia": "catalog:",
+    "primeicons": "catalog:",
+    "primevue": "catalog:",
+    "vue": "catalog:",
+    "vue-i18n": "catalog:",
+    "vue-router": "catalog:"
+  },
+  "devDependencies": {
+    "@tailwindcss/vite": "catalog:",
+    "@vitejs/plugin-vue": "catalog:",
+    "dotenv": "catalog:",
+    "unplugin-icons": "catalog:",
+    "unplugin-vue-components": "catalog:",
+    "vite": "catalog:",
+    "vite-plugin-html": "catalog:",
+    "vite-plugin-vue-devtools": "catalog:",
+    "vue-tsc": "catalog:"
+  },
   "nx": {
     "tags": [
       "scope:desktop",
@@ -31,8 +61,7 @@
           "^build"
         ],
         "options": {
-          "cwd": "apps/desktop-ui",
-          "command": "vite build --config vite.config.mts"
+          "command": "vite build --config apps/desktop-ui/vite.config.mts"
         },
         "outputs": [
           "{projectRoot}/dist"
@@ -85,35 +114,5 @@
         }
       }
     }
-  },
-  "scripts": {
-    "lint": "nx run @comfyorg/desktop-ui:lint",
-    "typecheck": "nx run @comfyorg/desktop-ui:typecheck",
-    "storybook": "storybook dev -p 6007",
-    "build-storybook": "storybook build -o dist/storybook"
-  },
-  "dependencies": {
-    "@comfyorg/comfyui-electron-types": "catalog:",
-    "@comfyorg/shared-frontend-utils": "workspace:*",
-    "@primevue/core": "catalog:",
-    "@primevue/themes": "catalog:",
-    "@vueuse/core": "catalog:",
-    "pinia": "catalog:",
-    "primeicons": "catalog:",
-    "primevue": "catalog:",
-    "vue": "catalog:",
-    "vue-i18n": "catalog:",
-    "vue-router": "catalog:"
-  },
-  "devDependencies": {
-    "@tailwindcss/vite": "catalog:",
-    "@vitejs/plugin-vue": "catalog:",
-    "dotenv": "catalog:",
-    "unplugin-icons": "catalog:",
-    "unplugin-vue-components": "catalog:",
-    "vite": "catalog:",
-    "vite-plugin-html": "catalog:",
-    "vite-plugin-vue-devtools": "catalog:",
-    "vue-tsc": "catalog:"
   }
 }
diff --git a/apps/desktop-ui/src/assets/css/style.css b/apps/desktop-ui/src/assets/css/style.css
index 0eef377ae2..1ff895f064 100644
--- a/apps/desktop-ui/src/assets/css/style.css
+++ b/apps/desktop-ui/src/assets/css/style.css
@@ -4,3 +4,39 @@
   position: absolute;
   inset: 0;
 }
+
+.p-button-secondary {
+  border: none;
+  background-color: var(--color-neutral-600);
+  color: var(--color-white);
+}
+
+.p-button-secondary:hover {
+  background-color: var(--color-neutral-550);
+}
+
+.p-button-secondary:active {
+  background-color: var(--color-neutral-500);
+}
+
+.p-button-danger {
+  background-color: var(--color-coral-red-600);
+}
+
+.p-button-danger:hover {
+  background-color: var(--color-coral-red-500);
+}
+
+.p-button-danger:active {
+  background-color: var(--color-coral-red-400);
+}
+
+.task-div .p-card {
+  transition: opacity var(--default-transition-duration);
+  --p-card-background: var(--p-button-secondary-background);
+  opacity: 0.9;
+}
+
+.task-div .p-card:hover {
+  opacity: 1;
+}
diff --git a/apps/desktop-ui/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue b/apps/desktop-ui/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue
index ca0dcf34ec..3bc8db4cf3 100644
--- a/apps/desktop-ui/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue
+++ b/apps/desktop-ui/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue
@@ -101,13 +101,15 @@ onUnmounted(() => {
 </script>
 
 <style scoped>
-@reference '../../../../assets/css/style.css';
-
+/* xterm renders its internal DOM outside Vue templates, so :deep selectors are
+ * required to style those generated nodes.
+ */
 :deep(.p-terminal) .xterm {
-  @apply overflow-hidden;
+  overflow: hidden;
 }
 
 :deep(.p-terminal) .xterm-screen {
-  @apply bg-neutral-900 overflow-hidden;
+  overflow: hidden;
+  background-color: var(--color-neutral-900);
 }
 </style>
diff --git a/apps/desktop-ui/src/components/common/LanguageSelector.vue b/apps/desktop-ui/src/components/common/LanguageSelector.vue
index 55703930c6..d8cf45f7a0 100644
--- a/apps/desktop-ui/src/components/common/LanguageSelector.vue
+++ b/apps/desktop-ui/src/components/common/LanguageSelector.vue
@@ -7,7 +7,7 @@
     option-value="value"
     :disabled="isSwitching"
     :pt="dropdownPt"
-    :size="props.size"
+    :size="size"
     class="language-selector"
     @change="onLocaleChange"
   >
@@ -36,16 +36,10 @@ import { i18n, loadLocale, st } from '@/i18n'
 type VariantKey = 'dark' | 'light'
 type SizeKey = 'small' | 'large'
 
-const props = withDefaults(
-  defineProps<{
-    variant?: VariantKey
-    size?: SizeKey
-  }>(),
-  {
-    variant: 'dark',
-    size: 'small'
-  }
-)
+const { variant = 'dark', size = 'small' } = defineProps<{
+  variant?: VariantKey
+  size?: SizeKey
+}>()
 
 const dropdownId = `language-select-${Math.random().toString(36).slice(2)}`
 
@@ -104,10 +98,8 @@ const VARIANT_PRESETS = {
 const selectedLocale = ref<string>(i18n.global.locale.value)
 const isSwitching = ref(false)
 
-const sizePreset = computed(() => SIZE_PRESETS[props.size as SizeKey])
-const variantPreset = computed(
-  () => VARIANT_PRESETS[props.variant as VariantKey]
-)
+const sizePreset = computed(() => SIZE_PRESETS[size])
+const variantPreset = computed(() => VARIANT_PRESETS[variant])
 
 const dropdownPt = computed(() => ({
   root: {
@@ -195,13 +187,17 @@ async function onLocaleChange(event: SelectChangeEvent) {
 </script>
 
 <style scoped>
-@reference '../../assets/css/style.css';
-
 :deep(.p-dropdown-panel .p-dropdown-item) {
-  @apply transition-colors;
+  transition-property: color, background-color, border-color;
+  transition-duration: var(--default-transition-duration);
 }
 
 :deep(.p-dropdown) {
-  @apply focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-brand-yellow/60 focus-visible:ring-offset-2;
+  &:focus-visible {
+    outline: none;
+    box-shadow:
+      0 0 0 2px var(--color-neutral-900),
+      0 0 0 4px color-mix(in srgb, var(--color-brand-yellow) 60%, transparent);
+  }
 }
 </style>
diff --git a/apps/desktop-ui/src/components/install/InstallLocationPicker.vue b/apps/desktop-ui/src/components/install/InstallLocationPicker.vue
index f962ca56c8..9921df362b 100644
--- a/apps/desktop-ui/src/components/install/InstallLocationPicker.vue
+++ b/apps/desktop-ui/src/components/install/InstallLocationPicker.vue
@@ -269,26 +269,43 @@ const onFocus = async () => {
 </script>
 
 <style scoped>
-@reference '../../assets/css/style.css';
-
 :deep(.location-picker-accordion) {
-  @apply px-12;
+  padding-inline: calc(var(--spacing) * 12);
 
   .p-accordionpanel {
-    @apply border-0 bg-transparent;
+    border: 0;
+    background-color: transparent;
   }
 
   .p-accordionheader {
-    @apply bg-neutral-800/50 border-0 rounded-xl mt-2 hover:bg-neutral-700/50;
+    margin-top: calc(var(--spacing) * 2);
+    border: 0;
+    border-radius: var(--radius-xl);
+    background-color: color-mix(
+      in srgb,
+      var(--color-neutral-800) 50%,
+      transparent
+    );
     transition:
       background-color 0.2s ease,
       border-radius 0.5s ease;
+
+    &:hover {
+      background-color: color-mix(
+        in srgb,
+        var(--color-neutral-700) 50%,
+        transparent
+      );
+    }
   }
 
   /* When panel is expanded, adjust header border radius */
   .p-accordionpanel-active {
     .p-accordionheader {
-      @apply rounded-t-xl rounded-b-none;
+      border-top-left-radius: var(--radius-xl);
+      border-top-right-radius: var(--radius-xl);
+      border-bottom-right-radius: 0;
+      border-bottom-left-radius: 0;
     }
 
     .p-accordionheader-toggle-icon {
@@ -299,11 +316,24 @@ const onFocus = async () => {
   }
 
   .p-accordioncontent {
-    @apply bg-neutral-800/50 border-0 rounded-b-xl rounded-t-none;
+    border: 0;
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+    border-bottom-right-radius: var(--radius-xl);
+    border-bottom-left-radius: var(--radius-xl);
+    background-color: color-mix(
+      in srgb,
+      var(--color-neutral-800) 50%,
+      transparent
+    );
   }
 
   .p-accordioncontent-content {
-    @apply bg-transparent pt-3 pr-5 pb-5 pl-5;
+    background-color: transparent;
+    padding-top: calc(var(--spacing) * 3);
+    padding-right: calc(var(--spacing) * 5);
+    padding-bottom: calc(var(--spacing) * 5);
+    padding-left: calc(var(--spacing) * 5);
   }
 
   /* Override default chevron icons to use up/down */
diff --git a/apps/desktop-ui/src/components/maintenance/TaskCard.vue b/apps/desktop-ui/src/components/maintenance/TaskCard.vue
index e7d24d1004..ba120a371f 100644
--- a/apps/desktop-ui/src/components/maintenance/TaskCard.vue
+++ b/apps/desktop-ui/src/components/maintenance/TaskCard.vue
@@ -1,11 +1,20 @@
 <template>
   <div
-    class="task-div relative grid min-h-52 max-w-48"
-    :class="{ 'opacity-75': isLoading }"
+    :class="
+      cn(
+        'task-div group/task-card relative grid min-h-52 max-w-48',
+        isLoading && 'opacity-75'
+      )
+    "
   >
     <Card
-      class="relative h-full max-w-48 overflow-hidden"
-      :class="{ 'opacity-65': runner.state !== 'error' }"
+      :class="
+        cn(
+          'relative h-full max-w-48 overflow-hidden',
+          runner.state !== 'error' && 'opacity-65'
+        )
+      "
+      :pt="cardPt"
       v-bind="(({ onClick, ...rest }) => rest)($attrs)"
     >
       <template #header>
@@ -43,7 +52,7 @@
 
     <i
       v-if="!isLoading && runner.state === 'OK'"
-      class="task-card-ok pi pi-check"
+      class="pi pi-check pointer-events-none absolute -right-4 -bottom-4 col-span-full row-span-full z-10 text-[4rem] text-green-500 opacity-100 transition-opacity group-hover/task-card:opacity-20 [text-shadow:0.25rem_0_0.5rem_black]"
     />
   </div>
 </template>
@@ -55,6 +64,7 @@ import { computed } from 'vue'
 
 import { useMaintenanceTaskStore } from '@/stores/maintenanceTaskStore'
 import type { MaintenanceTask } from '@/types/desktop/maintenanceTypes'
+import { cn } from '@/utils/tailwindUtil'
 import { useMinLoadingDurationRef } from '@/utils/refUtil'
 
 const taskStore = useMaintenanceTaskStore()
@@ -83,51 +93,9 @@ const reactiveExecuting = computed(() => !!runner.value.executing)
 
 const isLoading = useMinLoadingDurationRef(reactiveLoading, 250)
 const isExecuting = useMinLoadingDurationRef(reactiveExecuting, 250)
+
+const cardPt = {
+  header: { class: 'z-0' },
+  body: { class: 'z-[1] grow justify-between' }
+}
 </script>
-
-<style scoped>
-@reference '../../assets/css/style.css';
-
-.task-card-ok {
-  @apply text-green-500 absolute -right-4 -bottom-4 opacity-100 row-span-full col-span-full transition-opacity;
-
-  font-size: 4rem;
-  text-shadow: 0.25rem 0 0.5rem black;
-  z-index: 10;
-}
-
-.p-card {
-  @apply transition-opacity;
-
-  --p-card-background: var(--p-button-secondary-background);
-  opacity: 0.9;
-
-  &.opacity-65 {
-    opacity: 0.4;
-  }
-
-  &:hover {
-    opacity: 1;
-  }
-}
-
-:deep(.p-card-header) {
-  z-index: 0;
-}
-
-:deep(.p-card-body) {
-  z-index: 1;
-  flex-grow: 1;
-  justify-content: space-between;
-}
-
-.task-div {
-  > i {
-    pointer-events: none;
-  }
-
-  &:hover > i {
-    opacity: 0.2;
-  }
-}
-</style>
diff --git a/apps/desktop-ui/src/views/DesktopDialogView.vue b/apps/desktop-ui/src/views/DesktopDialogView.vue
index 105117cab0..3fd28c35cf 100644
--- a/apps/desktop-ui/src/views/DesktopDialogView.vue
+++ b/apps/desktop-ui/src/views/DesktopDialogView.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="w-full h-full flex flex-col rounded-lg p-6 justify-between">
     <h1 class="font-inter font-semibold text-xl m-0 italic">
-      {{ t(`desktopDialogs.${id}.title`, title) }}
+      {{ $t(`desktopDialogs.${id}.title`, title) }}
     </h1>
     <p class="whitespace-pre-wrap">
-      {{ t(`desktopDialogs.${id}.message`, message) }}
+      {{ $t(`desktopDialogs.${id}.message`, message) }}
     </p>
     <div class="flex w-full gap-2">
       <Button
@@ -12,7 +12,7 @@
         :key="button.label"
         class="rounded-lg first:mr-auto"
         :label="
-          t(
+          $t(
             `desktopDialogs.${id}.buttons.${normalizeI18nKey(button.label)}`,
             button.label
           )
@@ -31,7 +31,6 @@ import { useRoute } from 'vue-router'
 
 import { getDialog } from '@/constants/desktopDialogs'
 import type { DialogAction } from '@/constants/desktopDialogs'
-import { t } from '@/i18n'
 import { electronAPI } from '@/utils/envUtil'
 
 const route = useRoute()
@@ -41,31 +40,3 @@ const handleButtonClick = async (button: DialogAction) => {
   await electronAPI().Dialog.clickButton(button.returnValue)
 }
 </script>
-
-<style scoped>
-@reference '../assets/css/style.css';
-
-.p-button-secondary {
-  @apply text-white border-none bg-neutral-600;
-}
-
-.p-button-secondary:hover {
-  @apply bg-neutral-550;
-}
-
-.p-button-secondary:active {
-  @apply bg-neutral-500;
-}
-
-.p-button-danger {
-  @apply bg-coral-red-600;
-}
-
-.p-button-danger:hover {
-  @apply bg-coral-red-500;
-}
-
-.p-button-danger:active {
-  @apply bg-coral-red-400;
-}
-</style>
diff --git a/apps/desktop-ui/src/views/DesktopUpdateView.vue b/apps/desktop-ui/src/views/DesktopUpdateView.vue
index 1cb9135e1b..9eac86c8c9 100644
--- a/apps/desktop-ui/src/views/DesktopUpdateView.vue
+++ b/apps/desktop-ui/src/views/DesktopUpdateView.vue
@@ -6,11 +6,11 @@
       <div class="relative m-8 text-center">
         <!-- Header -->
         <h1 class="download-bg pi-download text-4xl font-bold">
-          {{ t('desktopUpdate.title') }}
+          {{ $t('desktopUpdate.title') }}
         </h1>
 
         <div class="m-8">
-          <span>{{ t('desktopUpdate.description') }}</span>
+          <span>{{ $t('desktopUpdate.description') }}</span>
         </div>
 
         <ProgressSpinner class="m-8 w-48 h-48" />
@@ -19,7 +19,7 @@
         <Button
           style="transform: translateX(-50%)"
           class="fixed bottom-0 left-1/2 my-8"
-          :label="t('maintenance.consoleLogs')"
+          :label="$t('maintenance.consoleLogs')"
           icon="pi pi-desktop"
           icon-pos="left"
           severity="secondary"
@@ -28,8 +28,8 @@
 
         <TerminalOutputDrawer
           v-model="terminalVisible"
-          :header="t('g.terminal')"
-          :default-message="t('desktopUpdate.terminalDefaultMessage')"
+          :header="$t('g.terminal')"
+          :default-message="$t('desktopUpdate.terminalDefaultMessage')"
         />
       </div>
     </div>
@@ -44,7 +44,6 @@ import Toast from 'primevue/toast'
 import { onUnmounted, ref } from 'vue'
 
 import TerminalOutputDrawer from '@/components/maintenance/TerminalOutputDrawer.vue'
-import { t } from '@/i18n'
 import { electronAPI } from '@/utils/envUtil'
 
 import BaseViewTemplate from './templates/BaseViewTemplate.vue'
@@ -61,10 +60,10 @@ onUnmounted(() => electron.Validation.dispose())
 </script>
 
 <style scoped>
-@reference '../assets/css/style.css';
-
 .download-bg::before {
-  @apply m-0 absolute text-muted;
+  position: absolute;
+  margin: 0;
+  color: var(--muted-foreground);
   font-family: 'primeicons', sans-serif;
   top: -2rem;
   right: 2rem;
diff --git a/apps/desktop-ui/src/views/InstallView.stories.ts b/apps/desktop-ui/src/views/InstallView.stories.ts
index d660038310..d7247161b2 100644
--- a/apps/desktop-ui/src/views/InstallView.stories.ts
+++ b/apps/desktop-ui/src/views/InstallView.stories.ts
@@ -1,6 +1,8 @@
 // eslint-disable-next-line storybook/no-renderer-packages
 import type { Meta, StoryObj } from '@storybook/vue3'
+import type { ElectronAPI } from '@comfyorg/comfyui-electron-types'
 import { nextTick, provide } from 'vue'
+import type { ElectronWindow } from '@/utils/envUtil'
 import { createMemoryHistory, createRouter } from 'vue-router'
 
 import InstallView from './InstallView.vue'
@@ -42,16 +44,21 @@ const meta: Meta<typeof InstallView> = {
       const router = createMockRouter()
 
       // Mock electron API
-      ;(window as any).electronAPI = {
+      ;(window as ElectronWindow).electronAPI = {
         getPlatform: () => 'darwin',
         Config: {
           getDetectedGpu: () => Promise.resolve('mps')
         },
         Events: {
-          trackEvent: (_eventName: string, _data?: any) => {}
+          trackEvent: (
+            _eventName: string,
+            _data?: Record<string, unknown>
+          ) => {}
         },
-        installComfyUI: (_options: any) => {},
-        changeTheme: (_theme: any) => {},
+        installComfyUI: (
+          _options: Parameters<ElectronAPI['installComfyUI']>[0]
+        ) => {},
+        changeTheme: (_theme: Parameters<ElectronAPI['changeTheme']>[0]) => {},
         getSystemPaths: () =>
           Promise.resolve({
             defaultInstallPath: '/Users/username/ComfyUI'
@@ -240,8 +247,8 @@ export const DesktopSettings: Story = {
 export const WindowsPlatform: Story = {
   render: () => {
     // Override the platform to Windows
-    ;(window as any).electronAPI.getPlatform = () => 'win32'
-    ;(window as any).electronAPI.Config.getDetectedGpu = () =>
+    ;(window as ElectronWindow).electronAPI.getPlatform = () => 'win32'
+    ;(window as ElectronWindow).electronAPI.Config.getDetectedGpu = () =>
       Promise.resolve('nvidia')
 
     return {
@@ -259,8 +266,8 @@ export const MacOSPlatform: Story = {
   name: 'macOS Platform',
   render: () => {
     // Override the platform to macOS
-    ;(window as any).electronAPI.getPlatform = () => 'darwin'
-    ;(window as any).electronAPI.Config.getDetectedGpu = () =>
+    ;(window as ElectronWindow).electronAPI.getPlatform = () => 'darwin'
+    ;(window as ElectronWindow).electronAPI.Config.getDetectedGpu = () =>
       Promise.resolve('mps')
 
     return {
@@ -327,7 +334,7 @@ export const ManualInstall: Story = {
 export const ErrorState: Story = {
   render: () => {
     // Override validation to return an error
-    ;(window as any).electronAPI.validateInstallPath = () =>
+    ;(window as ElectronWindow).electronAPI.validateInstallPath = () =>
       Promise.resolve({
         isValid: false,
         exists: false,
@@ -375,7 +382,7 @@ export const ErrorState: Story = {
 export const WarningState: Story = {
   render: () => {
     // Override validation to return a warning about non-default drive
-    ;(window as any).electronAPI.validateInstallPath = () =>
+    ;(window as ElectronWindow).electronAPI.validateInstallPath = () =>
       Promise.resolve({
         isValid: true,
         exists: false,
diff --git a/apps/desktop-ui/src/views/InstallView.vue b/apps/desktop-ui/src/views/InstallView.vue
index 055b1f0272..dc199c8c08 100644
--- a/apps/desktop-ui/src/views/InstallView.vue
+++ b/apps/desktop-ui/src/views/InstallView.vue
@@ -183,33 +183,37 @@ onMounted(async () => {
 </script>
 
 <style scoped>
-@reference '../assets/css/style.css';
-
 :deep(.p-steppanel) {
-  @apply mt-8 flex justify-center bg-transparent;
+  margin-top: calc(var(--spacing) * 8);
+  display: flex;
+  justify-content: center;
+  background-color: transparent;
 }
 
 /* Remove default padding/margin from StepPanels to make scrollbar flush */
 :deep(.p-steppanels) {
-  @apply p-0 m-0;
+  margin: 0;
+  padding: 0;
 }
 
 /* Ensure StepPanel content container has no top/bottom padding */
 :deep(.p-steppanel-content) {
-  @apply p-0;
+  padding: 0;
 }
 
 /* Custom overlay scrollbar for WebKit browsers (Electron, Chrome) */
 :deep(.p-steppanels::-webkit-scrollbar) {
-  @apply w-4;
+  width: calc(var(--spacing) * 4);
 }
 
 :deep(.p-steppanels::-webkit-scrollbar-track) {
-  @apply bg-transparent;
+  background-color: transparent;
 }
 
 :deep(.p-steppanels::-webkit-scrollbar-thumb) {
-  @apply bg-white/20 rounded-lg border-[4px] border-transparent;
+  border: 4px solid transparent;
+  border-radius: var(--radius-lg);
+  background-color: color-mix(in srgb, var(--color-white) 20%, transparent);
   background-clip: content-box;
 }
 </style>
diff --git a/apps/desktop-ui/src/views/MaintenanceView.stories.ts b/apps/desktop-ui/src/views/MaintenanceView.stories.ts
index 5dee7106bf..4a8a4b012f 100644
--- a/apps/desktop-ui/src/views/MaintenanceView.stories.ts
+++ b/apps/desktop-ui/src/views/MaintenanceView.stories.ts
@@ -77,7 +77,7 @@ const createMockElectronAPI = () => {
 }
 
 const ensureElectronAPI = () => {
-  const globalWindow = window as unknown as { electronAPI?: unknown }
+  const globalWindow = window as { electronAPI?: unknown }
   if (!globalWindow.electronAPI) {
     globalWindow.electronAPI = createMockElectronAPI()
   }
diff --git a/apps/desktop-ui/src/views/MaintenanceView.vue b/apps/desktop-ui/src/views/MaintenanceView.vue
index 0733f80fc2..4054092f0b 100644
--- a/apps/desktop-ui/src/views/MaintenanceView.vue
+++ b/apps/desktop-ui/src/views/MaintenanceView.vue
@@ -114,12 +114,12 @@ import Tag from 'primevue/tag'
 import Toast from 'primevue/toast'
 import { useToast } from 'primevue/usetoast'
 import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
+import { useI18n } from 'vue-i18n'
 
 import RefreshButton from '@/components/common/RefreshButton.vue'
 import StatusTag from '@/components/maintenance/StatusTag.vue'
 import TaskListPanel from '@/components/maintenance/TaskListPanel.vue'
 import TerminalOutputDrawer from '@/components/maintenance/TerminalOutputDrawer.vue'
-import { t } from '@/i18n'
 import { useMaintenanceTaskStore } from '@/stores/maintenanceTaskStore'
 import type { MaintenanceFilter } from '@/types/desktop/maintenanceTypes'
 import { electronAPI } from '@/utils/envUtil'
@@ -129,6 +129,7 @@ import BaseViewTemplate from './templates/BaseViewTemplate.vue'
 
 const electron = electronAPI()
 const toast = useToast()
+const { t } = useI18n()
 const taskStore = useMaintenanceTaskStore()
 const { clearResolved, processUpdate, refreshDesktopTasks } = taskStore
 
@@ -220,14 +221,14 @@ onUnmounted(() => electron.Validation.dispose())
 </script>
 
 <style scoped>
-@reference '../assets/css/style.css';
-
 :deep(.p-tag) {
   --p-tag-gap: 0.375rem;
 }
 
 .backspan::before {
-  @apply m-0 absolute text-muted;
+  position: absolute;
+  margin: 0;
+  color: var(--muted-foreground);
   font-family: 'primeicons', sans-serif;
   top: -2rem;
   right: -2rem;
diff --git a/apps/desktop-ui/src/views/NotSupportedView.vue b/apps/desktop-ui/src/views/NotSupportedView.vue
index bb50a65ee2..ae0a00e57c 100644
--- a/apps/desktop-ui/src/views/NotSupportedView.vue
+++ b/apps/desktop-ui/src/views/NotSupportedView.vue
@@ -1,6 +1,6 @@
 <template>
   <BaseViewTemplate>
-    <div class="sad-container">
+    <div class="sad-container grid items-center justify-evenly">
       <!-- Right side image -->
       <img
         class="sad-girl"
@@ -79,10 +79,7 @@ const continueToInstall = async () => {
 </script>
 
 <style scoped>
-@reference '../assets/css/style.css';
-
 .sad-container {
-  @apply grid items-center justify-evenly;
   grid-template-columns: 25rem 1fr;
 
   & > * {
diff --git a/apps/desktop-ui/src/views/ServerStartView.vue b/apps/desktop-ui/src/views/ServerStartView.vue
index f799b119b8..988a99b2d2 100644
--- a/apps/desktop-ui/src/views/ServerStartView.vue
+++ b/apps/desktop-ui/src/views/ServerStartView.vue
@@ -232,8 +232,6 @@ onUnmounted(() => {
 </script>
 
 <style scoped>
-@reference '../assets/css/style.css';
-
 /* Hide the xterm scrollbar completely */
 :deep(.p-terminal) .xterm-viewport {
   overflow: hidden !important;
diff --git a/apps/desktop-ui/vite.config.mts b/apps/desktop-ui/vite.config.mts
index 7cbc5307dc..771f0f85b8 100644
--- a/apps/desktop-ui/vite.config.mts
+++ b/apps/desktop-ui/vite.config.mts
@@ -64,7 +64,7 @@ export default defineConfig(() => {
       })
     ],
     build: {
-      minify: SHOULD_MINIFY ? ('esbuild' as const) : false,
+      minify: SHOULD_MINIFY,
       target: 'es2022',
       sourcemap: true
     }
diff --git a/browser_tests/AGENTS.md b/browser_tests/AGENTS.md
new file mode 100644
index 0000000000..d9b7a148a7
--- /dev/null
+++ b/browser_tests/AGENTS.md
@@ -0,0 +1,43 @@
+# E2E Testing Guidelines
+
+See `@docs/guidance/playwright.md` for Playwright best practices (auto-loaded for `*.spec.ts`).
+
+## Directory Structure
+
+```text
+browser_tests/
+├── assets/           - Test data (JSON workflows, images)
+├── fixtures/
+│   ├── ComfyPage.ts      - Main fixture (delegates to helpers)
+│   ├── ComfyMouse.ts     - Mouse interaction helper
+│   ├── VueNodeHelpers.ts - Vue Nodes 2.0 helpers
+│   ├── selectors.ts      - Centralized TestIds
+│   ├── components/       - Page object components
+│   │   ├── ContextMenu.ts
+│   │   ├── SettingDialog.ts
+│   │   ├── SidebarTab.ts
+│   │   └── Topbar.ts
+│   ├── helpers/          - Focused helper classes
+│   │   ├── CanvasHelper.ts
+│   │   ├── CommandHelper.ts
+│   │   ├── KeyboardHelper.ts
+│   │   ├── NodeOperationsHelper.ts
+│   │   ├── SettingsHelper.ts
+│   │   ├── WorkflowHelper.ts
+│   │   └── ...
+│   └── utils/            - Utility functions
+├── helpers/          - Test-specific utilities
+└── tests/            - Test files (*.spec.ts)
+```
+
+## After Making Changes
+
+- Run `pnpm typecheck:browser` after modifying TypeScript files in this directory
+- Run `pnpm exec eslint browser_tests/path/to/file.ts` to lint specific files
+- Run `pnpm exec oxlint browser_tests/path/to/file.ts` to check with oxlint
+
+## Skill Documentation
+
+A Playwright test-writing skill exists at `.claude/skills/writing-playwright-tests/SKILL.md`.
+
+The skill documents **meta-level guidance only** (gotchas, anti-patterns, decision guides). It does **not** duplicate fixture APIs - agents should read the fixture code directly in `browser_tests/fixtures/`.
diff --git a/browser_tests/CLAUDE.md b/browser_tests/CLAUDE.md
index cc42b392b9..7a72bb7767 100644
--- a/browser_tests/CLAUDE.md
+++ b/browser_tests/CLAUDE.md
@@ -1,17 +1,4 @@
-# E2E Testing Guidelines
+<!-- In gardens where the agents freely play,
+     One stubborn flower turns the other way. -->
 
-## Browser Tests
-- Test user workflows
-- Use Playwright fixtures
-- Follow naming conventions
-
-## Best Practices
-- Check assets/ for test data
-- Prefer specific selectors
-- Test across viewports
-
-## Testing Process
-After code changes:
-1. Create browser tests as appropriate
-2. Run tests until passing
-3. Then run typecheck, lint, format
\ No newline at end of file
+@AGENTS.md
diff --git a/browser_tests/README.md b/browser_tests/README.md
index 500d665c29..8930e61675 100644
--- a/browser_tests/README.md
+++ b/browser_tests/README.md
@@ -17,9 +17,10 @@ Without this flag, parallel tests will conflict and fail randomly.
 ### ComfyUI devtools
 
 ComfyUI_devtools is included in this repository under `tools/devtools/`. During CI/CD, these files are automatically copied to the `custom_nodes` directory.  
-_ComfyUI_devtools adds additional API endpoints and nodes to ComfyUI for browser testing._
+ComfyUI_devtools adds additional API endpoints and nodes to ComfyUI for browser testing.
 
 For local development, copy the devtools files to your ComfyUI installation:
+
 ```bash
 cp -r tools/devtools/* /path/to/your/ComfyUI/custom_nodes/ComfyUI_devtools/
 ```
@@ -119,13 +120,11 @@ export default defineConfig({
 Browser tests in this project follow a specific organization pattern:
 
 - **Fixtures**: Located in `fixtures/` - These provide test setup and utilities
-
   - `ComfyPage.ts` - The main fixture for interacting with ComfyUI
   - `ComfyMouse.ts` - Utility for mouse interactions with the canvas
   - Components fixtures in `fixtures/components/` - Page object models for UI components
 
 - **Tests**: Located in `tests/` - The actual test specifications
-
   - Organized by functionality (e.g., `widget.spec.ts`, `interaction.spec.ts`)
   - Snapshot directories (e.g., `widget.spec.ts-snapshots/`) contain reference screenshots
 
@@ -263,7 +262,6 @@ Most common testing needs are already addressed by these helpers, which will mak
    ```
 
    Available debug methods:
-
    - `debugAddMarker(position)` - Red circle at position
    - `debugAttachScreenshot(testInfo, name)` - Attach to test report
    - `debugShowCanvasOverlay()` - Show canvas as overlay
diff --git a/browser_tests/assets/default.json b/browser_tests/assets/default.json
index dd083e5688..9582c04f78 100644
--- a/browser_tests/assets/default.json
+++ b/browser_tests/assets/default.json
@@ -52,7 +52,9 @@
       "flags": {},
       "order": 1,
       "mode": 0,
-      "outputs": [{ "name": "LATENT", "type": "LATENT", "links": [2], "slot_index": 0 }],
+      "outputs": [
+        { "name": "LATENT", "type": "LATENT", "links": [2], "slot_index": 0 }
+      ],
       "properties": {},
       "widgets_values": [512, 512, 1]
     },
@@ -70,7 +72,9 @@
         { "name": "negative", "type": "CONDITIONING", "link": 6 },
         { "name": "latent_image", "type": "LATENT", "link": 2 }
       ],
-      "outputs": [{ "name": "LATENT", "type": "LATENT", "links": [7], "slot_index": 0 }],
+      "outputs": [
+        { "name": "LATENT", "type": "LATENT", "links": [7], "slot_index": 0 }
+      ],
       "properties": {},
       "widgets_values": [156680208700286, true, 20, 8, "euler", "normal", 1]
     },
@@ -86,7 +90,9 @@
         { "name": "samples", "type": "LATENT", "link": 7 },
         { "name": "vae", "type": "VAE", "link": 8 }
       ],
-      "outputs": [{ "name": "IMAGE", "type": "IMAGE", "links": [9], "slot_index": 0 }],
+      "outputs": [
+        { "name": "IMAGE", "type": "IMAGE", "links": [9], "slot_index": 0 }
+      ],
       "properties": {}
     },
     {
diff --git a/browser_tests/assets/groupnodes/group_node_identical_nodes_hidden_inputs.json b/browser_tests/assets/groupnodes/group_node_identical_nodes_hidden_inputs.json
index e423546f39..252996f01b 100644
--- a/browser_tests/assets/groupnodes/group_node_identical_nodes_hidden_inputs.json
+++ b/browser_tests/assets/groupnodes/group_node_identical_nodes_hidden_inputs.json
@@ -5,14 +5,8 @@
     {
       "id": 19,
       "type": "workflow>two_VAE_decode",
-      "pos": [
-        1368.800048828125,
-        768.7999877929688
-      ],
-      "size": [
-        418.1999816894531,
-        86
-      ],
+      "pos": [1368.800048828125, 768.7999877929688],
+      "size": [418.1999816894531, 86],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -49,10 +43,7 @@
   "extra": {
     "ds": {
       "scale": 1,
-      "offset": [
-        0,
-        0
-      ]
+      "offset": [0, 0]
     },
     "node_versions": {},
     "ue_links": [],
@@ -62,14 +53,8 @@
           {
             "id": -1,
             "type": "VAEDecode",
-            "pos": [
-              1368.800048828125,
-              768.7999877929688
-            ],
-            "size": [
-              210,
-              46
-            ],
+            "pos": [1368.800048828125, 768.7999877929688],
+            "size": [210, 46],
             "flags": {},
             "order": 0,
             "mode": 0,
@@ -103,14 +88,8 @@
           {
             "id": -1,
             "type": "VAEDecode",
-            "pos": [
-              1368.800048828125,
-              873.7999877929688
-            ],
-            "size": [
-              210,
-              46
-            ],
+            "pos": [1368.800048828125, 873.7999877929688],
+            "size": [210, 46],
             "flags": {},
             "order": 1,
             "mode": 0,
diff --git a/browser_tests/assets/groupnodes/group_node_v1.3.3.json b/browser_tests/assets/groupnodes/group_node_v1.3.3.json
index 1c04ec8bc4..6173ed1d08 100644
--- a/browser_tests/assets/groupnodes/group_node_v1.3.3.json
+++ b/browser_tests/assets/groupnodes/group_node_v1.3.3.json
@@ -76,11 +76,7 @@
             "properties": {
               "Node name for S&R": "EmptyLatentImage"
             },
-            "widgets_values": [
-              512,
-              512,
-              1
-            ],
+            "widgets_values": [512, 512, 1],
             "index": 0
           },
           {
@@ -121,9 +117,7 @@
             "properties": {
               "Node name for S&R": "CheckpointLoaderSimple"
             },
-            "widgets_values": [
-              "v1-5-pruned-emaonly.ckpt"
-            ],
+            "widgets_values": ["v1-5-pruned-emaonly.ckpt"],
             "index": 1
           },
           {
@@ -195,9 +189,7 @@
             "properties": {
               "Node name for S&R": "CLIPTextEncode"
             },
-            "widgets_values": [
-              "text, watermark"
-            ],
+            "widgets_values": ["text, watermark"],
             "index": 3
           },
           {
@@ -320,85 +312,20 @@
             ],
             "outputs": [],
             "properties": {},
-            "widgets_values": [
-              "ComfyUI"
-            ],
+            "widgets_values": ["ComfyUI"],
             "index": 6
           }
         ],
         "links": [
-          [
-            1,
-            1,
-            2,
-            0,
-            4,
-            "CLIP"
-          ],
-          [
-            1,
-            1,
-            3,
-            0,
-            4,
-            "CLIP"
-          ],
-          [
-            1,
-            0,
-            4,
-            0,
-            4,
-            "MODEL"
-          ],
-          [
-            2,
-            0,
-            4,
-            1,
-            6,
-            "CONDITIONING"
-          ],
-          [
-            3,
-            0,
-            4,
-            2,
-            7,
-            "CONDITIONING"
-          ],
-          [
-            0,
-            0,
-            4,
-            3,
-            5,
-            "LATENT"
-          ],
-          [
-            4,
-            0,
-            5,
-            0,
-            3,
-            "LATENT"
-          ],
-          [
-            1,
-            2,
-            5,
-            1,
-            4,
-            "VAE"
-          ],
-          [
-            5,
-            0,
-            6,
-            0,
-            8,
-            "IMAGE"
-          ]
+          [1, 1, 2, 0, 4, "CLIP"],
+          [1, 1, 3, 0, 4, "CLIP"],
+          [1, 0, 4, 0, 4, "MODEL"],
+          [2, 0, 4, 1, 6, "CONDITIONING"],
+          [3, 0, 4, 2, 7, "CONDITIONING"],
+          [0, 0, 4, 3, 5, "LATENT"],
+          [4, 0, 5, 0, 3, "LATENT"],
+          [1, 2, 5, 1, 4, "VAE"],
+          [5, 0, 6, 0, 8, "IMAGE"]
         ],
         "external": []
       }
diff --git a/browser_tests/assets/groupnodes/legacy_group_node.json b/browser_tests/assets/groupnodes/legacy_group_node.json
index 0e883872e0..7e19987c26 100644
--- a/browser_tests/assets/groupnodes/legacy_group_node.json
+++ b/browser_tests/assets/groupnodes/legacy_group_node.json
@@ -235,15 +235,7 @@
             "properties": {
               "Node name for S&R": "KSampler"
             },
-            "widgets_values": [
-              0,
-              "randomize",
-              20,
-              8,
-              "euler",
-              "normal",
-              1
-            ],
+            "widgets_values": [0, "randomize", 20, 8, "euler", "normal", 1],
             "index": 1
           }
         ],
diff --git a/browser_tests/assets/groups/mixed_graph_items.json b/browser_tests/assets/groups/mixed_graph_items.json
index 506285e2dd..d1431ba3cd 100644
--- a/browser_tests/assets/groups/mixed_graph_items.json
+++ b/browser_tests/assets/groups/mixed_graph_items.json
@@ -48,15 +48,7 @@
       "properties": {
         "Node name for S&R": "KSampler"
       },
-      "widgets_values": [
-        0,
-        "randomize",
-        20,
-        8,
-        "euler",
-        "normal",
-        1
-      ]
+      "widgets_values": [0, "randomize", 20, 8, "euler", "normal", 1]
     },
     {
       "id": 3,
@@ -104,15 +96,7 @@
       "properties": {
         "Node name for S&R": "KSampler"
       },
-      "widgets_values": [
-        0,
-        "randomize",
-        20,
-        8,
-        "euler",
-        "normal",
-        1
-      ]
+      "widgets_values": [0, "randomize", 20, 8, "euler", "normal", 1]
     },
     {
       "id": 1,
@@ -160,15 +144,7 @@
       "properties": {
         "Node name for S&R": "KSampler"
       },
-      "widgets_values": [
-        0,
-        "randomize",
-        20,
-        8,
-        "euler",
-        "normal",
-        1
-      ]
+      "widgets_values": [0, "randomize", 20, 8, "euler", "normal", 1]
     }
   ],
   "links": [],
@@ -177,10 +153,7 @@
       "id": 0,
       "title": "Group",
       "bounding": [
-        406.9701232910156,
-        59.079444885253906,
-        335,
-        345.6000061035156
+        406.9701232910156, 59.079444885253906, 335, 345.6000061035156
       ],
       "color": "#3f789e",
       "font_size": 24,
@@ -190,10 +163,7 @@
       "id": 3,
       "title": "Group Parent",
       "bounding": [
-        796.9703979492188,
-        14.796443939208984,
-        355,
-        399.20001220703125
+        796.9703979492188, 14.796443939208984, 355, 399.20001220703125
       ],
       "color": "#3f789e",
       "font_size": 24,
@@ -203,10 +173,7 @@
       "id": 2,
       "title": "Group Child",
       "bounding": [
-        806.9703979492188,
-        58.39643096923828,
-        335,
-        345.6000061035156
+        806.9703979492188, 58.39643096923828, 335, 345.6000061035156
       ],
       "color": "#3f789e",
       "font_size": 24,
@@ -217,11 +184,8 @@
   "extra": {
     "ds": {
       "scale": 1,
-      "offset": [
-        0,
-        0
-      ]
+      "offset": [0, 0]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/groups/nested-groups-1-inner-node.json b/browser_tests/assets/groups/nested-groups-1-inner-node.json
index 3a2a1c1114..cc25c75a60 100644
--- a/browser_tests/assets/groups/nested-groups-1-inner-node.json
+++ b/browser_tests/assets/groups/nested-groups-1-inner-node.json
@@ -7,14 +7,8 @@
     {
       "id": 17,
       "type": "VAEDecode",
-      "pos": [
-        318.8446183157076,
-        355.3961392345528
-      ],
-      "size": [
-        225,
-        102
-      ],
+      "pos": [318.8446183157076, 355.3961392345528],
+      "size": [225, 102],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -49,9 +43,7 @@
       "id": 4,
       "title": "Outer Group",
       "bounding": [
-        -46.25245366331014,
-        -150.82497138023245,
-        1034.4034361963616,
+        -46.25245366331014, -150.82497138023245, 1034.4034361963616,
         1007.338460439933
       ],
       "color": "#3f789e",
@@ -62,9 +54,7 @@
       "id": 3,
       "title": "Inner Group",
       "bounding": [
-        80.96059074101554,
-        28.123757436778178,
-        718.286373661183,
+        80.96059074101554, 28.123757436778178, 718.286373661183,
         691.2397164539732
       ],
       "color": "#3f789e",
@@ -76,10 +66,7 @@
   "extra": {
     "ds": {
       "scale": 0.7121393732101533,
-      "offset": [
-        289.18242848011835,
-        367.0747755524199
-      ]
+      "offset": [289.18242848011835, 367.0747755524199]
     },
     "frontendVersion": "1.35.5",
     "VHS_latentpreview": false,
@@ -89,4 +76,4 @@
     "workflowRendererVersion": "Vue"
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/groups/oversized_group.json b/browser_tests/assets/groups/oversized_group.json
index 2f1a17e362..a2913e4fce 100644
--- a/browser_tests/assets/groups/oversized_group.json
+++ b/browser_tests/assets/groups/oversized_group.json
@@ -5,14 +5,8 @@
     {
       "id": 3,
       "type": "KSampler",
-      "pos": [
-        37,
-        98
-      ],
-      "size": [
-        315,
-        262
-      ],
+      "pos": [37, 98],
+      "size": [315, 262],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -65,12 +59,7 @@
     {
       "id": 1,
       "title": "Group",
-      "bounding": [
-        23,
-        23,
-        900,
-        825
-      ],
+      "bounding": [23, 23, 900, 825],
       "color": "#3f789e",
       "font_size": 24,
       "flags": {}
@@ -80,11 +69,8 @@
   "extra": {
     "ds": {
       "scale": 1,
-      "offset": [
-        0,
-        0
-      ]
+      "offset": [0, 0]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/groups/single_group.json b/browser_tests/assets/groups/single_group.json
index 8a076bd2c0..e7f8dba2a8 100644
--- a/browser_tests/assets/groups/single_group.json
+++ b/browser_tests/assets/groups/single_group.json
@@ -64,12 +64,7 @@
   "groups": [
     {
       "title": "Group",
-      "bounding": [
-        0,
-        0,
-        335,
-        346
-      ],
+      "bounding": [0, 0, 335, 346],
       "color": "#3f789e",
       "font_size": 24
     }
@@ -78,11 +73,8 @@
   "extra": {
     "ds": {
       "scale": 1,
-      "offset": [
-        0,
-        0
-      ]
+      "offset": [0, 0]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/groups/single_group_only.json b/browser_tests/assets/groups/single_group_only.json
index 1ee58f4d0c..1ae8174cd4 100644
--- a/browser_tests/assets/groups/single_group_only.json
+++ b/browser_tests/assets/groups/single_group_only.json
@@ -6,12 +6,7 @@
   "groups": [
     {
       "title": "Group",
-      "bounding": [
-        0,
-        0,
-        335,
-        346
-      ],
+      "bounding": [0, 0, 335, 346],
       "color": "#3f789e",
       "font_size": 24
     }
@@ -20,11 +15,8 @@
   "extra": {
     "ds": {
       "scale": 1.2100000000000006,
-      "offset": [
-        104.34159172650945,
-        241.35965953210126
-      ]
+      "offset": [104.34159172650945, 241.35965953210126]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/inputs/default_input.json b/browser_tests/assets/inputs/default_input.json
index a9291ab827..26b932bf41 100644
--- a/browser_tests/assets/inputs/default_input.json
+++ b/browser_tests/assets/inputs/default_input.json
@@ -7,14 +7,8 @@
     {
       "id": 6,
       "type": "DevToolsNodeWithDefaultInput",
-      "pos": [
-        8.39722728729248,
-        29.727279663085938
-      ],
-      "size": [
-        315,
-        82
-      ],
+      "pos": [8.39722728729248, 29.727279663085938],
+      "size": [315, 82],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -30,11 +24,7 @@
       "properties": {
         "Node name for S&R": "DevToolsNodeWithDefaultInput"
       },
-      "widgets_values": [
-        0,
-        1,
-        0
-      ]
+      "widgets_values": [0, 1, 0]
     }
   ],
   "links": [],
@@ -43,10 +33,7 @@
   "extra": {
     "ds": {
       "scale": 1,
-      "offset": [
-        0,
-        0
-      ]
+      "offset": [0, 0]
     }
   },
   "version": 0.4
diff --git a/browser_tests/assets/inputs/dynamically_added_input.json b/browser_tests/assets/inputs/dynamically_added_input.json
index 35bf34d278..65320f602c 100644
--- a/browser_tests/assets/inputs/dynamically_added_input.json
+++ b/browser_tests/assets/inputs/dynamically_added_input.json
@@ -5,10 +5,7 @@
     {
       "id": 3,
       "type": "KSampler",
-      "pos": [
-        0,
-        30
-      ],
+      "pos": [0, 30],
       "size": {
         "0": 315,
         "1": 262
@@ -36,7 +33,7 @@
           "name": "latent_image",
           "type": "LATENT",
           "link": null
-        } ,
+        },
         {
           "name": "dynamic_input",
           "type": "FLOAT",
@@ -72,11 +69,8 @@
   "extra": {
     "ds": {
       "scale": 1,
-      "offset": [
-        0,
-        0
-      ]
+      "offset": [0, 0]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/inputs/force_input.json b/browser_tests/assets/inputs/force_input.json
index d4c203b86a..a4b0e13e4e 100644
--- a/browser_tests/assets/inputs/force_input.json
+++ b/browser_tests/assets/inputs/force_input.json
@@ -39,11 +39,7 @@
       "properties": {
         "Node name for S&R": "DevToolsNodeWithForceInput"
       },
-      "widgets_values": [
-        0,
-        1,
-        0
-      ]
+      "widgets_values": [0, 1, 0]
     }
   ],
   "links": [],
@@ -52,11 +48,8 @@
   "extra": {
     "ds": {
       "scale": 1,
-      "offset": [
-        0,
-        0
-      ]
+      "offset": [0, 0]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/inputs/old_workflow_converted_input.json b/browser_tests/assets/inputs/old_workflow_converted_input.json
index 8734433b1a..b36b462138 100644
--- a/browser_tests/assets/inputs/old_workflow_converted_input.json
+++ b/browser_tests/assets/inputs/old_workflow_converted_input.json
@@ -9,10 +9,7 @@
         "0": 449,
         "1": 204
       },
-      "size": [
-        340.20001220703125,
-        166
-      ],
+      "size": [340.20001220703125, 166],
       "flags": {},
       "order": 1,
       "mode": 0,
@@ -61,11 +58,7 @@
       "properties": {
         "Node name for S&R": "ControlNetApplyAdvanced"
       },
-      "widgets_values": [
-        1,
-        0,
-        1
-      ]
+      "widgets_values": [1, 0, 1]
     },
     {
       "id": 2,
@@ -74,10 +67,7 @@
         "0": 177,
         "1": 265
       },
-      "size": [
-        210,
-        82
-      ],
+      "size": [210, 82],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -86,9 +76,7 @@
         {
           "name": "FLOAT",
           "type": "FLOAT",
-          "links": [
-            1
-          ],
+          "links": [1],
           "widget": {
             "name": "strength"
           }
@@ -97,22 +85,10 @@
       "properties": {
         "Run widget replace on values": false
       },
-      "widgets_values": [
-        1,
-        "fixed"
-      ]
+      "widgets_values": [1, "fixed"]
     }
   ],
-  "links": [
-    [
-      1,
-      2,
-      0,
-      1,
-      4,
-      "FLOAT"
-    ]
-  ],
+  "links": [[1, 2, 0, 1, 4, "FLOAT"]],
   "groups": [],
   "config": {},
   "extra": {
@@ -125,4 +101,4 @@
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/inputs/only_optional_inputs.json b/browser_tests/assets/inputs/only_optional_inputs.json
index fa926118a8..668c3c3e97 100644
--- a/browser_tests/assets/inputs/only_optional_inputs.json
+++ b/browser_tests/assets/inputs/only_optional_inputs.json
@@ -29,9 +29,7 @@
       "properties": {
         "Node name for S&R": "DevToolsNodeWithOnlyOptionalInput"
       },
-      "widgets_values": [
-        ""
-      ]
+      "widgets_values": [""]
     }
   ],
   "links": [],
diff --git a/browser_tests/assets/inputs/optional_input_correct_shape.json b/browser_tests/assets/inputs/optional_input_correct_shape.json
index 9a40eeb858..0f6d32ba05 100644
--- a/browser_tests/assets/inputs/optional_input_correct_shape.json
+++ b/browser_tests/assets/inputs/optional_input_correct_shape.json
@@ -47,11 +47,8 @@
   "extra": {
     "ds": {
       "scale": 1,
-      "offset": [
-        0,
-        0
-      ]
+      "offset": [0, 0]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/inputs/optional_input_no_shape.json b/browser_tests/assets/inputs/optional_input_no_shape.json
index e56acc0d9e..a4d87863e8 100644
--- a/browser_tests/assets/inputs/optional_input_no_shape.json
+++ b/browser_tests/assets/inputs/optional_input_no_shape.json
@@ -46,11 +46,8 @@
   "extra": {
     "ds": {
       "scale": 1,
-      "offset": [
-        0,
-        0
-      ]
+      "offset": [0, 0]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/inputs/optional_input_wrong_shape.json b/browser_tests/assets/inputs/optional_input_wrong_shape.json
index 094ecdb4fa..8fa98aa329 100644
--- a/browser_tests/assets/inputs/optional_input_wrong_shape.json
+++ b/browser_tests/assets/inputs/optional_input_wrong_shape.json
@@ -47,11 +47,8 @@
   "extra": {
     "ds": {
       "scale": 1,
-      "offset": [
-        0,
-        0
-      ]
+      "offset": [0, 0]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/inputs/remote_widget.json b/browser_tests/assets/inputs/remote_widget.json
index 1e102790a7..2d935221df 100644
--- a/browser_tests/assets/inputs/remote_widget.json
+++ b/browser_tests/assets/inputs/remote_widget.json
@@ -5,14 +5,8 @@
     {
       "id": 15,
       "type": "DevToolsRemoteWidgetNode",
-      "pos": [
-        495,
-        735
-      ],
-      "size": [
-        315,
-        58
-      ],
+      "pos": [495, 735],
+      "size": [315, 58],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -27,9 +21,7 @@
       "properties": {
         "Node name for S&R": "DevToolsRemoteWidgetNode"
       },
-      "widgets_values": [
-        "v1-5-pruned-emaonly-fp16.safetensors"
-      ]
+      "widgets_values": ["v1-5-pruned-emaonly-fp16.safetensors"]
     }
   ],
   "links": [],
@@ -38,11 +30,8 @@
   "extra": {
     "ds": {
       "scale": 0.8008869919566275,
-      "offset": [
-        538.9801226576359,
-        -55.24554581806672
-      ]
+      "offset": [538.9801226576359, -55.24554581806672]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/inputs/renamed_converted_widget.json b/browser_tests/assets/inputs/renamed_converted_widget.json
index 439018ec04..a052d77503 100644
--- a/browser_tests/assets/inputs/renamed_converted_widget.json
+++ b/browser_tests/assets/inputs/renamed_converted_widget.json
@@ -5,14 +5,8 @@
     {
       "id": 3,
       "type": "EmptyLatentImage",
-      "pos": [
-        380.51641845703125,
-        191.39659118652344
-      ],
-      "size": [
-        315,
-        106
-      ],
+      "pos": [380.51641845703125, 191.39659118652344],
+      "size": [315, 106],
       "flags": {},
       "order": 1,
       "mode": 0,
@@ -36,23 +30,13 @@
       "properties": {
         "Node name for S&R": "EmptyLatentImage"
       },
-      "widgets_values": [
-        512,
-        512,
-        1
-      ]
+      "widgets_values": [512, 512, 1]
     },
     {
       "id": 4,
       "type": "PrimitiveNode",
-      "pos": [
-        73.6164321899414,
-        197.9966278076172
-      ],
-      "size": [
-        210,
-        82
-      ],
+      "pos": [73.6164321899414, 197.9966278076172],
+      "size": [210, 82],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -64,31 +48,17 @@
           "widget": {
             "name": "bredth"
           },
-          "links": [
-            2
-          ]
+          "links": [2]
         }
       ],
       "title": "breadth",
       "properties": {
         "Run widget replace on values": false
       },
-      "widgets_values": [
-        512,
-        "fixed"
-      ]
+      "widgets_values": [512, "fixed"]
     }
   ],
-  "links": [
-    [
-      2,
-      4,
-      0,
-      3,
-      0,
-      "INT"
-    ]
-  ],
+  "links": [[2, 4, 0, 3, 0, "INT"]],
   "groups": [],
   "config": {},
   "extra": {
diff --git a/browser_tests/assets/inputs/simple_slider.json b/browser_tests/assets/inputs/simple_slider.json
index 1a2c433965..fb4ee724fa 100644
--- a/browser_tests/assets/inputs/simple_slider.json
+++ b/browser_tests/assets/inputs/simple_slider.json
@@ -5,14 +5,8 @@
     {
       "id": 12,
       "type": "DevToolsSimpleSlider",
-      "pos": [
-        50,
-        50
-      ],
-      "size": [
-        315,
-        58
-      ],
+      "pos": [50, 50],
+      "size": [315, 58],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -28,9 +22,7 @@
       "properties": {
         "Node name for S&R": "DevToolsSimpleSlider"
       },
-      "widgets_values": [
-        0.5
-      ]
+      "widgets_values": [0.5]
     }
   ],
   "links": [],
@@ -39,11 +31,8 @@
   "extra": {
     "ds": {
       "scale": 1,
-      "offset": [
-        0,
-        0
-      ]
+      "offset": [0, 0]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/inputs/string_input.json b/browser_tests/assets/inputs/string_input.json
index ee3e8aaddd..8656594a0d 100644
--- a/browser_tests/assets/inputs/string_input.json
+++ b/browser_tests/assets/inputs/string_input.json
@@ -5,14 +5,8 @@
     {
       "id": 1,
       "type": "DevToolsNodeWithStringInput",
-      "pos": [
-        15,
-        48
-      ],
-      "size": [
-        315,
-        58
-      ],
+      "pos": [15, 48],
+      "size": [315, 58],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -21,9 +15,7 @@
       "properties": {
         "Node name for S&R": "DevToolsNodeWithStringInput"
       },
-      "widgets_values": [
-        ""
-      ]
+      "widgets_values": [""]
     }
   ],
   "links": [],
@@ -32,11 +24,8 @@
   "extra": {
     "ds": {
       "scale": 1,
-      "offset": [
-        0,
-        0
-      ]
+      "offset": [0, 0]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/links/bad_link.json b/browser_tests/assets/links/bad_link.json
index c2806bbbbe..efbd190137 100644
--- a/browser_tests/assets/links/bad_link.json
+++ b/browser_tests/assets/links/bad_link.json
@@ -7,14 +7,8 @@
     {
       "id": 4,
       "type": "KSampler",
-      "pos": [
-        867.4669799804688,
-        347.22369384765625
-      ],
-      "size": [
-        315,
-        262
-      ],
+      "pos": [867.4669799804688, 347.22369384765625],
+      "size": [315, 262],
       "flags": {},
       "order": 1,
       "mode": 0,
@@ -58,27 +52,13 @@
       "properties": {
         "Node name for S&R": "KSampler"
       },
-      "widgets_values": [
-        0,
-        "randomize",
-        20,
-        8,
-        "euler",
-        "normal",
-        1
-      ]
+      "widgets_values": [0, "randomize", 20, 8, "euler", "normal", 1]
     },
     {
       "id": 5,
       "type": "PrimitiveInt",
-      "pos": [
-        443.0852355957031,
-        441.131591796875
-      ],
-      "size": [
-        315,
-        82
-      ],
+      "pos": [443.0852355957031, 441.131591796875],
+      "size": [315, 82],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -87,40 +67,23 @@
         {
           "name": "INT",
           "type": "INT",
-          "links": [
-            3
-          ]
+          "links": [3]
         }
       ],
       "properties": {
         "Node name for S&R": "PrimitiveInt"
       },
-      "widgets_values": [
-        0,
-        "randomize"
-      ]
+      "widgets_values": [0, "randomize"]
     }
   ],
-  "links": [
-    [
-      3,
-      5,
-      0,
-      4,
-      5,
-      "INT"
-    ]
-  ],
+  "links": [[3, 5, 0, 4, 5, "INT"]],
   "groups": [],
   "config": {},
   "extra": {
     "ds": {
       "scale": 1.9487171000000016,
-      "offset": [
-        -325.57196748514497,
-        -168.13150517966463
-      ]
+      "offset": [-325.57196748514497, -168.13150517966463]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/links/batch_move_links.json b/browser_tests/assets/links/batch_move_links.json
index a2d8a54e73..ca8ff95fcc 100644
--- a/browser_tests/assets/links/batch_move_links.json
+++ b/browser_tests/assets/links/batch_move_links.json
@@ -5,10 +5,7 @@
     {
       "id": 4,
       "type": "CheckpointLoaderSimple",
-      "pos": [
-        0,
-        92
-      ],
+      "pos": [0, 92],
       "size": {
         "0": 315,
         "1": 98
@@ -26,10 +23,7 @@
         {
           "name": "CLIP",
           "type": "CLIP",
-          "links": [
-            3,
-            5
-          ],
+          "links": [3, 5],
           "slot_index": 1
         },
         {
@@ -42,17 +36,12 @@
       "properties": {
         "Node name for S&R": "CheckpointLoaderSimple"
       },
-      "widgets_values": [
-        "3Guofeng3_v32Light.safetensors"
-      ]
+      "widgets_values": ["3Guofeng3_v32Light.safetensors"]
     },
     {
       "id": 6,
       "type": "CLIPTextEncode",
-      "pos": [
-        460,
-        92
-      ],
+      "pos": [460, 92],
       "size": {
         "0": 422.84503173828125,
         "1": 164.31304931640625
@@ -85,10 +74,7 @@
     {
       "id": 7,
       "type": "CLIPTextEncode",
-      "pos": [
-        460,
-        368
-      ],
+      "pos": [460, 368],
       "size": {
         "0": 425.27801513671875,
         "1": 180.6060791015625
@@ -114,17 +100,12 @@
       "properties": {
         "Node name for S&R": "CLIPTextEncode"
       },
-      "widgets_values": [
-        "text, watermark"
-      ]
+      "widgets_values": ["text, watermark"]
     },
     {
       "id": 10,
       "type": "CheckpointLoaderSimple",
-      "pos": [
-        0,
-        276
-      ],
+      "pos": [0, 276],
       "size": {
         "0": 315,
         "1": 98
@@ -155,39 +136,20 @@
       "properties": {
         "Node name for S&R": "CheckpointLoaderSimple"
       },
-      "widgets_values": [
-        "3Guofeng3_v32Light.safetensors"
-      ]
+      "widgets_values": ["3Guofeng3_v32Light.safetensors"]
     }
   ],
   "links": [
-    [
-      3,
-      4,
-      1,
-      6,
-      0,
-      "CLIP"
-    ],
-    [
-      5,
-      4,
-      1,
-      7,
-      0,
-      "CLIP"
-    ]
+    [3, 4, 1, 6, 0, "CLIP"],
+    [5, 4, 1, 7, 0, "CLIP"]
   ],
   "groups": [],
   "config": {},
   "extra": {
     "ds": {
       "scale": 1,
-      "offset": [
-        0,
-        0
-      ]
+      "offset": [0, 0]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/links/snap_to_slot.json b/browser_tests/assets/links/snap_to_slot.json
index 0c708980b3..e97144f0cd 100644
--- a/browser_tests/assets/links/snap_to_slot.json
+++ b/browser_tests/assets/links/snap_to_slot.json
@@ -5,10 +5,7 @@
     {
       "id": 1,
       "type": "KSampler",
-      "pos": [
-        590,
-        40
-      ],
+      "pos": [590, 40],
       "size": {
         "0": 315,
         "1": 262
@@ -53,23 +50,12 @@
       "properties": {
         "Node name for S&R": "KSampler"
       },
-      "widgets_values": [
-        0,
-        "randomize",
-        20,
-        8,
-        "euler",
-        "normal",
-        1
-      ]
+      "widgets_values": [0, "randomize", 20, 8, "euler", "normal", 1]
     },
     {
       "id": 4,
       "type": "CLIPTextEncode",
-      "pos": [
-        20,
-        50
-      ],
+      "pos": [20, 50],
       "size": {
         "0": 400,
         "1": 200
@@ -88,26 +74,19 @@
         {
           "name": "CONDITIONING",
           "type": "CONDITIONING",
-          "links": [
-            3
-          ],
+          "links": [3],
           "shape": 3
         }
       ],
       "properties": {
         "Node name for S&R": "CLIPTextEncode"
       },
-      "widgets_values": [
-        ""
-      ]
+      "widgets_values": [""]
     },
     {
       "id": 5,
       "type": "CLIPTextEncode",
-      "pos": [
-        20,
-        320
-      ],
+      "pos": [20, 320],
       "size": {
         "0": 400,
         "1": 200
@@ -134,31 +113,17 @@
       "properties": {
         "Node name for S&R": "CLIPTextEncode"
       },
-      "widgets_values": [
-        ""
-      ]
+      "widgets_values": [""]
     }
   ],
-  "links": [
-    [
-      3,
-      4,
-      0,
-      1,
-      1,
-      "CONDITIONING"
-    ]
-  ],
+  "links": [[3, 4, 0, 1, 1, "CONDITIONING"]],
   "groups": [],
   "config": {},
   "extra": {
     "ds": {
       "scale": 1,
-      "offset": [
-        0,
-        0
-      ]
+      "offset": [0, 0]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/missing/deprecated_nodes_complex.json b/browser_tests/assets/missing/deprecated_nodes_complex.json
new file mode 100644
index 0000000000..30652414c5
--- /dev/null
+++ b/browser_tests/assets/missing/deprecated_nodes_complex.json
@@ -0,0 +1,205 @@
+{
+  "last_node_id": 7,
+  "last_link_id": 5,
+  "nodes": [
+    {
+      "id": 1,
+      "type": "T2IAdapterLoader",
+      "pos": [100, 100],
+      "size": [300, 80],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [],
+      "outputs": [
+        {
+          "name": "CONTROL_NET",
+          "type": "CONTROL_NET",
+          "links": [],
+          "slot_index": 0
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "T2IAdapterLoader"
+      },
+      "widgets_values": ["t2iadapter_model.safetensors"]
+    },
+    {
+      "id": 2,
+      "type": "CheckpointLoaderSimple",
+      "pos": [100, 300],
+      "size": [315, 98],
+      "flags": {},
+      "order": 1,
+      "mode": 0,
+      "outputs": [
+        {
+          "name": "MODEL",
+          "type": "MODEL",
+          "links": [],
+          "slot_index": 0
+        },
+        {
+          "name": "CLIP",
+          "type": "CLIP",
+          "links": [],
+          "slot_index": 1
+        },
+        {
+          "name": "VAE",
+          "type": "VAE",
+          "links": [],
+          "slot_index": 2
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "CheckpointLoaderSimple"
+      },
+      "widgets_values": ["v1-5-pruned-emaonly-fp16.safetensors"]
+    },
+    {
+      "id": 3,
+      "type": "ResizeImagesByLongerEdge",
+      "pos": [500, 100],
+      "size": [300, 80],
+      "flags": {},
+      "order": 2,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "images",
+          "type": "IMAGE",
+          "link": null
+        }
+      ],
+      "outputs": [
+        {
+          "name": "IMAGE",
+          "type": "IMAGE",
+          "links": [1],
+          "slot_index": 0
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "ResizeImagesByLongerEdge"
+      },
+      "widgets_values": [1024]
+    },
+    {
+      "id": 4,
+      "type": "ImageScaleBy",
+      "pos": [500, 280],
+      "size": [300, 80],
+      "flags": {},
+      "order": 3,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "image",
+          "type": "IMAGE",
+          "link": 1
+        }
+      ],
+      "outputs": [
+        {
+          "name": "IMAGE",
+          "type": "IMAGE",
+          "links": [2, 3],
+          "slot_index": 0
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "ImageScaleBy"
+      },
+      "widgets_values": ["lanczos", 1.5]
+    },
+    {
+      "id": 5,
+      "type": "ImageBatch",
+      "pos": [900, 100],
+      "size": [300, 80],
+      "flags": {},
+      "order": 4,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "image1",
+          "type": "IMAGE",
+          "link": 2
+        },
+        {
+          "name": "image2",
+          "type": "IMAGE",
+          "link": null
+        }
+      ],
+      "outputs": [
+        {
+          "name": "IMAGE",
+          "type": "IMAGE",
+          "links": [4],
+          "slot_index": 0
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "ImageBatch"
+      },
+      "widgets_values": []
+    },
+    {
+      "id": 6,
+      "type": "SaveImage",
+      "pos": [900, 300],
+      "size": [300, 80],
+      "flags": {},
+      "order": 5,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "images",
+          "type": "IMAGE",
+          "link": 3
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "SaveImage"
+      },
+      "widgets_values": ["ComfyUI"]
+    },
+    {
+      "id": 7,
+      "type": "PreviewImage",
+      "pos": [1250, 100],
+      "size": [300, 250],
+      "flags": {},
+      "order": 6,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "images",
+          "type": "IMAGE",
+          "link": 4
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "PreviewImage"
+      },
+      "widgets_values": []
+    }
+  ],
+  "links": [
+    [1, 3, 0, 4, 0, "IMAGE"],
+    [2, 4, 0, 5, 0, "IMAGE"],
+    [3, 4, 0, 6, 0, "IMAGE"],
+    [4, 5, 0, 7, 0, "IMAGE"]
+  ],
+  "groups": [],
+  "config": {},
+  "extra": {
+    "ds": {
+      "scale": 1,
+      "offset": [0, 0]
+    }
+  },
+  "version": 0.4
+}
diff --git a/browser_tests/assets/missing/deprecated_nodes_simple.json b/browser_tests/assets/missing/deprecated_nodes_simple.json
new file mode 100644
index 0000000000..a12f4392ef
--- /dev/null
+++ b/browser_tests/assets/missing/deprecated_nodes_simple.json
@@ -0,0 +1,186 @@
+{
+  "last_node_id": 5,
+  "last_link_id": 2,
+  "nodes": [
+    {
+      "id": 1,
+      "type": "Load3DAnimation",
+      "pos": [100, 100],
+      "size": [300, 100],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "outputs": [
+        {
+          "name": "MESH",
+          "type": "MESH",
+          "links": [],
+          "slot_index": 0
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "Load3DAnimation"
+      },
+      "widgets_values": ["model.glb"]
+    },
+    {
+      "id": 2,
+      "type": "Preview3DAnimation",
+      "pos": [450, 100],
+      "size": [300, 100],
+      "flags": {},
+      "order": 1,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "mesh",
+          "type": "MESH",
+          "link": null
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "Preview3DAnimation"
+      },
+      "widgets_values": []
+    },
+    {
+      "id": 3,
+      "type": "ConditioningAverage ",
+      "pos": [100, 300],
+      "size": [300, 100],
+      "flags": {},
+      "order": 2,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "conditioning_to",
+          "type": "CONDITIONING",
+          "link": null
+        },
+        {
+          "name": "conditioning_from",
+          "type": "CONDITIONING",
+          "link": null
+        }
+      ],
+      "outputs": [
+        {
+          "name": "CONDITIONING",
+          "type": "CONDITIONING",
+          "links": [1],
+          "slot_index": 0
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "ConditioningAverage "
+      },
+      "widgets_values": [1]
+    },
+    {
+      "id": 4,
+      "type": "SDV_img2vid_Conditioning",
+      "pos": [450, 300],
+      "size": [300, 150],
+      "flags": {},
+      "order": 3,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "clip_vision",
+          "type": "CLIP_VISION",
+          "link": null
+        },
+        {
+          "name": "init_image",
+          "type": "IMAGE",
+          "link": null
+        },
+        {
+          "name": "vae",
+          "type": "VAE",
+          "link": null
+        }
+      ],
+      "outputs": [
+        {
+          "name": "positive",
+          "type": "CONDITIONING",
+          "links": [],
+          "slot_index": 0
+        },
+        {
+          "name": "negative",
+          "type": "CONDITIONING",
+          "links": [],
+          "slot_index": 1
+        },
+        {
+          "name": "latent",
+          "type": "LATENT",
+          "links": [2],
+          "slot_index": 2
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "SDV_img2vid_Conditioning"
+      },
+      "widgets_values": [1024, 576, 14, 127, 25, 0.02]
+    },
+    {
+      "id": 5,
+      "type": "KSampler",
+      "pos": [800, 300],
+      "size": [300, 262],
+      "flags": {},
+      "order": 4,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "model",
+          "type": "MODEL",
+          "link": null
+        },
+        {
+          "name": "positive",
+          "type": "CONDITIONING",
+          "link": 1
+        },
+        {
+          "name": "negative",
+          "type": "CONDITIONING",
+          "link": null
+        },
+        {
+          "name": "latent_image",
+          "type": "LATENT",
+          "link": 2
+        }
+      ],
+      "outputs": [
+        {
+          "name": "LATENT",
+          "type": "LATENT",
+          "links": [],
+          "slot_index": 0
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "KSampler"
+      },
+      "widgets_values": [42, "fixed", 20, 8, "euler", "normal", 1]
+    }
+  ],
+  "links": [
+    [1, 3, 0, 5, 1, "CONDITIONING"],
+    [2, 4, 2, 5, 3, "LATENT"]
+  ],
+  "groups": [],
+  "config": {},
+  "extra": {
+    "ds": {
+      "scale": 1,
+      "offset": [0, 0]
+    }
+  },
+  "version": 0.4
+}
diff --git a/browser_tests/assets/missing/missing_models.json b/browser_tests/assets/missing/missing_models.json
index 5a6a8e5ce3..c4a8d5a0d4 100644
--- a/browser_tests/assets/missing/missing_models.json
+++ b/browser_tests/assets/missing/missing_models.json
@@ -8,10 +8,7 @@
   "extra": {
     "ds": {
       "scale": 1,
-      "offset": [
-        0,
-        0
-      ]
+      "offset": [0, 0]
     }
   },
   "models": [
@@ -22,4 +19,4 @@
     }
   ],
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/missing/missing_nodes.json b/browser_tests/assets/missing/missing_nodes.json
index cc584de6a2..05ac955714 100644
--- a/browser_tests/assets/missing/missing_nodes.json
+++ b/browser_tests/assets/missing/missing_nodes.json
@@ -5,10 +5,7 @@
     {
       "id": 1,
       "type": "UNKNOWN NODE",
-      "pos": [
-        48,
-        86
-      ],
+      "pos": [48, 86],
       "size": {
         "0": 358.80780029296875,
         "1": 314.7989501953125
@@ -36,14 +33,7 @@
       "properties": {
         "Node name for S&R": "UNKNOWN NODE"
       },
-      "widgets_values": [
-        "wd-v1-4-moat-tagger-v2",
-        0.35,
-        0.85,
-        false,
-        false,
-        ""
-      ]
+      "widgets_values": ["wd-v1-4-moat-tagger-v2", 0.35, 0.85, false, false, ""]
     }
   ],
   "links": [],
@@ -52,10 +42,8 @@
   "extra": {
     "ds": {
       "scale": 1,
-      "offset": [
-        0, 0
-      ]
+      "offset": [0, 0]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/missing/missing_nodes_converted_widget.json b/browser_tests/assets/missing/missing_nodes_converted_widget.json
index b7c3a73aad..57de39b8b5 100644
--- a/browser_tests/assets/missing/missing_nodes_converted_widget.json
+++ b/browser_tests/assets/missing/missing_nodes_converted_widget.json
@@ -5,10 +5,7 @@
     {
       "id": 1,
       "type": "UNKNOWN NODE",
-      "pos": [
-        48,
-        86
-      ],
+      "pos": [48, 86],
       "size": {
         "0": 358.80780029296875,
         "1": 314.7989501953125
diff --git a/browser_tests/assets/missing/missing_nodes_in_subgraph.json b/browser_tests/assets/missing/missing_nodes_in_subgraph.json
index 246d52d38e..e7002a2c0c 100644
--- a/browser_tests/assets/missing/missing_nodes_in_subgraph.json
+++ b/browser_tests/assets/missing/missing_nodes_in_subgraph.json
@@ -179,4 +179,4 @@
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/nodes/every_node_color.json b/browser_tests/assets/nodes/every_node_color.json
index b64da88bd2..a51b011b04 100644
--- a/browser_tests/assets/nodes/every_node_color.json
+++ b/browser_tests/assets/nodes/every_node_color.json
@@ -42,9 +42,7 @@
         {
           "name": "LATENT",
           "type": "LATENT",
-          "links": [
-            7
-          ],
+          "links": [7],
           "slot_index": 0
         }
       ],
@@ -82,35 +80,26 @@
         {
           "name": "MODEL",
           "type": "MODEL",
-          "links": [
-            1
-          ],
+          "links": [1],
           "slot_index": 0
         },
         {
           "name": "CLIP",
           "type": "CLIP",
-          "links": [
-            3,
-            5
-          ],
+          "links": [3, 5],
           "slot_index": 1
         },
         {
           "name": "VAE",
           "type": "VAE",
-          "links": [
-            8
-          ],
+          "links": [8],
           "slot_index": 2
         }
       ],
       "properties": {
         "Node name for S&R": "CheckpointLoaderSimple"
       },
-      "widgets_values": [
-        "Stable-diffusion/v1-5-pruned-emaonly.safetensors"
-      ],
+      "widgets_values": ["Stable-diffusion/v1-5-pruned-emaonly.safetensors"],
       "color": "#322",
       "bgcolor": "#533"
     },
@@ -133,20 +122,14 @@
         {
           "name": "LATENT",
           "type": "LATENT",
-          "links": [
-            2
-          ],
+          "links": [2],
           "slot_index": 0
         }
       ],
       "properties": {
         "Node name for S&R": "EmptyLatentImage"
       },
-      "widgets_values": [
-        512,
-        512,
-        1
-      ],
+      "widgets_values": [512, 512, 1],
       "color": "#323",
       "bgcolor": "#535"
     },
@@ -175,9 +158,7 @@
         {
           "name": "CONDITIONING",
           "type": "CONDITIONING",
-          "links": [
-            4
-          ],
+          "links": [4],
           "slot_index": 0
         }
       ],
@@ -215,18 +196,14 @@
         {
           "name": "CONDITIONING",
           "type": "CONDITIONING",
-          "links": [
-            6
-          ],
+          "links": [6],
           "slot_index": 0
         }
       ],
       "properties": {
         "Node name for S&R": "CLIPTextEncode"
       },
-      "widgets_values": [
-        "text, watermark"
-      ],
+      "widgets_values": ["text, watermark"],
       "color": "#323",
       "bgcolor": "#535"
     },
@@ -260,9 +237,7 @@
         {
           "name": "IMAGE",
           "type": "IMAGE",
-          "links": [
-            9
-          ],
+          "links": [9],
           "slot_index": 0
         }
       ],
@@ -280,10 +255,7 @@
         "0": 857,
         "1": 611
       },
-      "size": [
-        214.2000732421875,
-        59.4000244140625
-      ],
+      "size": [214.2000732421875, 59.4000244140625],
       "flags": {},
       "order": 9,
       "mode": 0,
@@ -296,9 +268,7 @@
       ],
       "outputs": [],
       "properties": {},
-      "widgets_values": [
-        "ComfyUI"
-      ]
+      "widgets_values": ["ComfyUI"]
     },
     {
       "id": 10,
@@ -335,9 +305,7 @@
       "properties": {
         "Node name for S&R": "CheckpointLoaderSimple"
       },
-      "widgets_values": [
-        "Stable-diffusion/v1-5-pruned-emaonly.safetensors"
-      ],
+      "widgets_values": ["Stable-diffusion/v1-5-pruned-emaonly.safetensors"],
       "color": "#332922",
       "bgcolor": "#593930"
     },
@@ -376,9 +344,7 @@
       "properties": {
         "Node name for S&R": "CheckpointLoaderSimple"
       },
-      "widgets_values": [
-        "Stable-diffusion/v1-5-pruned-emaonly.safetensors"
-      ],
+      "widgets_values": ["Stable-diffusion/v1-5-pruned-emaonly.safetensors"],
       "color": "#223",
       "bgcolor": "#335"
     },
@@ -413,89 +379,21 @@
       "properties": {
         "Node name for S&R": "ImageScale"
       },
-      "widgets_values": [
-        "nearest-exact",
-        512,
-        512,
-        "disabled"
-      ],
+      "widgets_values": ["nearest-exact", 512, 512, "disabled"],
       "color": "#2a363b",
       "bgcolor": "#3f5159"
     }
   ],
   "links": [
-    [
-      1,
-      4,
-      0,
-      3,
-      0,
-      "MODEL"
-    ],
-    [
-      2,
-      5,
-      0,
-      3,
-      3,
-      "LATENT"
-    ],
-    [
-      3,
-      4,
-      1,
-      6,
-      0,
-      "CLIP"
-    ],
-    [
-      4,
-      6,
-      0,
-      3,
-      1,
-      "CONDITIONING"
-    ],
-    [
-      5,
-      4,
-      1,
-      7,
-      0,
-      "CLIP"
-    ],
-    [
-      6,
-      7,
-      0,
-      3,
-      2,
-      "CONDITIONING"
-    ],
-    [
-      7,
-      3,
-      0,
-      8,
-      0,
-      "LATENT"
-    ],
-    [
-      8,
-      4,
-      2,
-      8,
-      1,
-      "VAE"
-    ],
-    [
-      9,
-      8,
-      0,
-      9,
-      0,
-      "IMAGE"
-    ]
+    [1, 4, 0, 3, 0, "MODEL"],
+    [2, 5, 0, 3, 3, "LATENT"],
+    [3, 4, 1, 6, 0, "CLIP"],
+    [4, 6, 0, 3, 1, "CONDITIONING"],
+    [5, 4, 1, 7, 0, "CLIP"],
+    [6, 7, 0, 3, 2, "CONDITIONING"],
+    [7, 3, 0, 8, 0, "LATENT"],
+    [8, 4, 2, 8, 1, "VAE"],
+    [9, 8, 0, 9, 0, "IMAGE"]
   ],
   "groups": [],
   "config": {},
diff --git a/browser_tests/assets/nodes/execution_error.json b/browser_tests/assets/nodes/execution_error.json
index f18793b02d..6882f87f42 100644
--- a/browser_tests/assets/nodes/execution_error.json
+++ b/browser_tests/assets/nodes/execution_error.json
@@ -47,9 +47,7 @@
         {
           "name": "IMAGE",
           "type": "IMAGE",
-          "links": [
-            15
-          ],
+          "links": [15],
           "slot_index": 0,
           "shape": 3
         }
@@ -59,26 +57,14 @@
       }
     }
   ],
-  "links": [
-    [
-      15,
-      17,
-      0,
-      14,
-      0,
-      "IMAGE"
-    ]
-  ],
+  "links": [[15, 17, 0, 14, 0, "IMAGE"]],
   "groups": [],
   "config": {},
   "extra": {
     "ds": {
       "scale": 1,
-      "offset": [
-        117.20766722169206,
-        472.69035116826046
-      ]
+      "offset": [117.20766722169206, 472.69035116826046]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/nodes/note_nodes.json b/browser_tests/assets/nodes/note_nodes.json
index 95d8b149d5..94983e788d 100644
--- a/browser_tests/assets/nodes/note_nodes.json
+++ b/browser_tests/assets/nodes/note_nodes.json
@@ -5,44 +5,30 @@
     {
       "id": 1,
       "type": "Note",
-      "pos": [
-        50, 50
-      ],
-      "size": [
-        322.3645935058594,
-        167.91612243652344
-      ],
+      "pos": [50, 50],
+      "size": [322.3645935058594, 167.91612243652344],
       "flags": {},
       "order": 0,
       "mode": 0,
       "inputs": [],
       "outputs": [],
       "properties": {},
-      "widgets_values": [
-        "Foo\n123"
-      ],
+      "widgets_values": ["Foo\n123"],
       "color": "#432",
       "bgcolor": "#653"
     },
     {
       "id": 2,
       "type": "MarkdownNote",
-      "pos": [
-        50, 300
-      ],
-      "size": [
-        320.9985656738281,
-        179.52735900878906
-      ],
+      "pos": [50, 300],
+      "size": [320.9985656738281, 179.52735900878906],
       "flags": {},
       "order": 1,
       "mode": 0,
       "inputs": [],
       "outputs": [],
       "properties": {},
-      "widgets_values": [
-        "# Bar\n123"
-      ],
+      "widgets_values": ["# Bar\n123"],
       "color": "#432",
       "bgcolor": "#653"
     }
diff --git a/browser_tests/assets/nodes/single_ksampler.json b/browser_tests/assets/nodes/single_ksampler.json
index ae14cf5573..29f8392b27 100644
--- a/browser_tests/assets/nodes/single_ksampler.json
+++ b/browser_tests/assets/nodes/single_ksampler.json
@@ -5,10 +5,7 @@
     {
       "id": 3,
       "type": "KSampler",
-      "pos": [
-        0,
-        30
-      ],
+      "pos": [0, 30],
       "size": {
         "0": 315,
         "1": 262
@@ -66,11 +63,8 @@
   "extra": {
     "ds": {
       "scale": 1,
-      "offset": [
-        0,
-        0
-      ]
+      "offset": [0, 0]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/nodes/single_save_image_node.json b/browser_tests/assets/nodes/single_save_image_node.json
index c917a9a845..1b2431118a 100644
--- a/browser_tests/assets/nodes/single_save_image_node.json
+++ b/browser_tests/assets/nodes/single_save_image_node.json
@@ -25,9 +25,7 @@
       ],
       "outputs": [],
       "properties": {},
-      "widgets_values": [
-        "ComfyUI"
-      ]
+      "widgets_values": ["ComfyUI"]
     }
   ],
   "links": [],
@@ -36,11 +34,8 @@
   "extra": {
     "ds": {
       "scale": 1,
-      "offset": [
-        0,
-        0
-      ]
+      "offset": [0, 0]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/nodes/string_node_id.json b/browser_tests/assets/nodes/string_node_id.json
index a4ed79ba7d..f672246d0d 100644
--- a/browser_tests/assets/nodes/string_node_id.json
+++ b/browser_tests/assets/nodes/string_node_id.json
@@ -21,35 +21,26 @@
         {
           "name": "MODEL",
           "type": "MODEL",
-          "links": [
-            12
-          ],
+          "links": [12],
           "shape": 3
         },
         {
           "name": "CLIP",
           "type": "CLIP",
-          "links": [
-            10,
-            11
-          ],
+          "links": [10, 11],
           "shape": 3
         },
         {
           "name": "VAE",
           "type": "VAE",
-          "links": [
-            17
-          ],
+          "links": [17],
           "shape": 3
         }
       ],
       "properties": {
         "Node name for S&R": "CheckpointLoaderSimple"
       },
-      "widgets_values": [
-        "v1-5-pruned-emaonly.ckpt"
-      ]
+      "widgets_values": ["v1-5-pruned-emaonly.ckpt"]
     },
     {
       "id": "CLIPTextEncode.0",
@@ -76,9 +67,7 @@
         {
           "name": "CONDITIONING",
           "type": "CONDITIONING",
-          "links": [
-            13
-          ],
+          "links": [13],
           "shape": 3
         }
       ],
@@ -114,18 +103,14 @@
         {
           "name": "CONDITIONING",
           "type": "CONDITIONING",
-          "links": [
-            14
-          ],
+          "links": [14],
           "shape": 3
         }
       ],
       "properties": {
         "Node name for S&R": "CLIPTextEncode"
       },
-      "widgets_values": [
-        "text, watermark"
-      ]
+      "widgets_values": ["text, watermark"]
     },
     {
       "id": "EmptyLatentImage.0",
@@ -146,20 +131,14 @@
         {
           "name": "LATENT",
           "type": "LATENT",
-          "links": [
-            15
-          ],
+          "links": [15],
           "shape": 3
         }
       ],
       "properties": {
         "Node name for S&R": "EmptyLatentImage"
       },
-      "widgets_values": [
-        512,
-        512,
-        1
-      ]
+      "widgets_values": [512, 512, 1]
     },
     {
       "id": "KSampler.0",
@@ -201,24 +180,14 @@
         {
           "name": "LATENT",
           "type": "LATENT",
-          "links": [
-            16
-          ],
+          "links": [16],
           "shape": 3
         }
       ],
       "properties": {
         "Node name for S&R": "KSampler"
       },
-      "widgets_values": [
-        3,
-        "randomize",
-        20,
-        8,
-        "euler",
-        "normal",
-        1
-      ]
+      "widgets_values": [3, "randomize", 20, 8, "euler", "normal", 1]
     },
     {
       "id": "VAEDecode.0",
@@ -250,9 +219,7 @@
         {
           "name": "IMAGE",
           "type": "IMAGE",
-          "links": [
-            18
-          ],
+          "links": [18],
           "shape": 3
         }
       ],
@@ -283,94 +250,26 @@
       ],
       "outputs": [],
       "properties": {},
-      "widgets_values": [
-        "ComfyUI"
-      ]
+      "widgets_values": ["ComfyUI"]
     }
   ],
   "links": [
-    [
-      10,
-      "CheckpointLoaderSimple.0",
-      1,
-      "CLIPTextEncode.0",
-      0,
-      "CLIP"
-    ],
-    [
-      11,
-      "CheckpointLoaderSimple.0",
-      1,
-      "CLIPTextEncode.1",
-      0,
-      "CLIP"
-    ],
-    [
-      12,
-      "CheckpointLoaderSimple.0",
-      0,
-      "KSampler.0",
-      0,
-      "MODEL"
-    ],
-    [
-      13,
-      "CLIPTextEncode.0",
-      0,
-      "KSampler.0",
-      1,
-      "CONDITIONING"
-    ],
-    [
-      14,
-      "CLIPTextEncode.1",
-      0,
-      "KSampler.0",
-      2,
-      "CONDITIONING"
-    ],
-    [
-      15,
-      "EmptyLatentImage.0",
-      0,
-      "KSampler.0",
-      3,
-      "LATENT"
-    ],
-    [
-      16,
-      "KSampler.0",
-      0,
-      "VAEDecode.0",
-      0,
-      "LATENT"
-    ],
-    [
-      17,
-      "CheckpointLoaderSimple.0",
-      2,
-      "VAEDecode.0",
-      1,
-      "VAE"
-    ],
-    [
-      18,
-      "VAEDecode.0",
-      0,
-      "SaveImage.0",
-      0,
-      "IMAGE"
-    ]
+    [10, "CheckpointLoaderSimple.0", 1, "CLIPTextEncode.0", 0, "CLIP"],
+    [11, "CheckpointLoaderSimple.0", 1, "CLIPTextEncode.1", 0, "CLIP"],
+    [12, "CheckpointLoaderSimple.0", 0, "KSampler.0", 0, "MODEL"],
+    [13, "CLIPTextEncode.0", 0, "KSampler.0", 1, "CONDITIONING"],
+    [14, "CLIPTextEncode.1", 0, "KSampler.0", 2, "CONDITIONING"],
+    [15, "EmptyLatentImage.0", 0, "KSampler.0", 3, "LATENT"],
+    [16, "KSampler.0", 0, "VAEDecode.0", 0, "LATENT"],
+    [17, "CheckpointLoaderSimple.0", 2, "VAEDecode.0", 1, "VAE"],
+    [18, "VAEDecode.0", 0, "SaveImage.0", 0, "IMAGE"]
   ],
   "groups": [],
   "config": {},
   "extra": {
     "ds": {
       "scale": 1,
-      "offset": [
-        0,
-        0
-      ]
+      "offset": [0, 0]
     }
   },
   "version": 0.4
diff --git a/browser_tests/assets/primitive/primitive_node.json b/browser_tests/assets/primitive/primitive_node.json
index b65033b7ce..78b83fe7cf 100644
--- a/browser_tests/assets/primitive/primitive_node.json
+++ b/browser_tests/assets/primitive/primitive_node.json
@@ -65,15 +65,7 @@
       "properties": {
         "Node name for S&R": "KSampler"
       },
-      "widgets_values": [
-        0,
-        "randomize",
-        20,
-        8,
-        "euler",
-        "normal",
-        1
-      ]
+      "widgets_values": [0, "randomize", 20, 8, "euler", "normal", 1]
     },
     {
       "id": 1,
@@ -90,10 +82,7 @@
         "8": 0,
         "9": 0
       },
-      "size": [
-        446.96645387135936,
-        108.34243389566905
-      ],
+      "size": [446.96645387135936, 108.34243389566905],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -102,9 +91,7 @@
         {
           "name": "INT",
           "type": "INT",
-          "links": [
-            1
-          ],
+          "links": [1],
           "slot_index": 0,
           "widget": {
             "name": "steps"
@@ -114,32 +101,17 @@
       "properties": {
         "Run widget replace on values": false
       },
-      "widgets_values": [
-        20,
-        "fixed"
-      ]
+      "widgets_values": [20, "fixed"]
     }
   ],
-  "links": [
-    [
-      1,
-      1,
-      0,
-      2,
-      4,
-      "INT"
-    ]
-  ],
+  "links": [[1, 1, 0, 2, 4, "INT"]],
   "groups": [],
   "config": {},
   "extra": {
     "ds": {
       "scale": 1,
-      "offset": [
-        0,
-        0
-      ]
+      "offset": [0, 0]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/primitive/primitive_node_unconnected.json b/browser_tests/assets/primitive/primitive_node_unconnected.json
index 54b96ce9b1..501ab4809c 100644
--- a/browser_tests/assets/primitive/primitive_node_unconnected.json
+++ b/browser_tests/assets/primitive/primitive_node_unconnected.json
@@ -9,10 +9,7 @@
         "0": 304.3653259277344,
         "1": 42.15586471557617
       },
-      "size": [
-        315,
-        262
-      ],
+      "size": [315, 262],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -49,15 +46,7 @@
       "properties": {
         "Node name for S&R": "KSampler"
       },
-      "widgets_values": [
-        0,
-        "randomize",
-        20,
-        8,
-        "euler",
-        "normal",
-        1
-      ]
+      "widgets_values": [0, "randomize", 20, 8, "euler", "normal", 1]
     },
     {
       "id": 1,
@@ -66,10 +55,7 @@
         "0": 14,
         "1": 43
       },
-      "size": [
-        203.1999969482422,
-        40.368401303242536
-      ],
+      "size": [203.1999969482422, 40.368401303242536],
       "flags": {},
       "order": 1,
       "mode": 0,
@@ -94,11 +80,8 @@
   "extra": {
     "ds": {
       "scale": 1,
-      "offset": [
-        0,
-        0
-      ]
+      "offset": [0, 0]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/primitive/static_primitive_unconnected.json b/browser_tests/assets/primitive/static_primitive_unconnected.json
index 6ee8583bee..7e3c3d51c6 100644
--- a/browser_tests/assets/primitive/static_primitive_unconnected.json
+++ b/browser_tests/assets/primitive/static_primitive_unconnected.json
@@ -9,10 +9,7 @@
         "0": 304.3653259277344,
         "1": 42.15586471557617
       },
-      "size": [
-        315,
-        262
-      ],
+      "size": [315, 262],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -49,15 +46,7 @@
       "properties": {
         "Node name for S&R": "KSampler"
       },
-      "widgets_values": [
-        0,
-        "randomize",
-        20,
-        8,
-        "euler",
-        "normal",
-        1
-      ]
+      "widgets_values": [0, "randomize", 20, 8, "euler", "normal", 1]
     },
     {
       "id": 1,
@@ -66,10 +55,7 @@
         "0": 14,
         "1": 43
       },
-      "size": [
-        203.1999969482422,
-        40.368401303242536
-      ],
+      "size": [203.1999969482422, 40.368401303242536],
       "flags": {},
       "order": 1,
       "mode": 0,
@@ -94,11 +80,8 @@
   "extra": {
     "ds": {
       "scale": 1,
-      "offset": [
-        0,
-        0
-      ]
+      "offset": [0, 0]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/subgraphs/basic-subgraph.json b/browser_tests/assets/subgraphs/basic-subgraph.json
index 98891ea552..e34dc948ea 100644
--- a/browser_tests/assets/subgraphs/basic-subgraph.json
+++ b/browser_tests/assets/subgraphs/basic-subgraph.json
@@ -7,14 +7,8 @@
     {
       "id": 2,
       "type": "e5fb1765-9323-4548-801a-5aead34d879e",
-      "pos": [
-        627.5973510742188,
-        423.0972900390625
-      ],
-      "size": [
-        144.15234375,
-        46
-      ],
+      "pos": [627.5973510742188, 423.0972900390625],
+      "size": [144.15234375, 46],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -54,30 +48,18 @@
         "name": "New Subgraph",
         "inputNode": {
           "id": -10,
-          "bounding": [
-            347.90441582814213,
-            417.3822440655296,
-            120,
-            60
-          ]
+          "bounding": [347.90441582814213, 417.3822440655296, 120, 60]
         },
         "outputNode": {
           "id": -20,
-          "bounding": [
-            892.5973510742188,
-            416.0972900390625,
-            120,
-            60
-          ]
+          "bounding": [892.5973510742188, 416.0972900390625, 120, 60]
         },
         "inputs": [
           {
             "id": "c5cc99d8-a2b6-4bf3-8be7-d4949ef736cd",
             "name": "positive",
             "type": "CONDITIONING",
-            "linkIds": [
-              1
-            ],
+            "linkIds": [1],
             "pos": {
               "0": 447.9044189453125,
               "1": 437.3822326660156
@@ -89,9 +71,7 @@
             "id": "9bd488b9-e907-4c95-a7a4-85c5597a87af",
             "name": "LATENT",
             "type": "LATENT",
-            "linkIds": [
-              2
-            ],
+            "linkIds": [2],
             "pos": {
               "0": 912.5973510742188,
               "1": 436.0972900390625
@@ -103,14 +83,8 @@
           {
             "id": 1,
             "type": "KSampler",
-            "pos": [
-              554.8743286132812,
-              100.95539093017578
-            ],
-            "size": [
-              270,
-              262
-            ],
+            "pos": [554.8743286132812, 100.95539093017578],
+            "size": [270, 262],
             "flags": {},
             "order": 1,
             "mode": 0,
@@ -145,35 +119,19 @@
                 "localized_name": "LATENT",
                 "name": "LATENT",
                 "type": "LATENT",
-                "links": [
-                  2
-                ]
+                "links": [2]
               }
             ],
             "properties": {
               "Node name for S&R": "KSampler"
             },
-            "widgets_values": [
-              0,
-              "randomize",
-              20,
-              8,
-              "euler",
-              "simple",
-              1
-            ]
+            "widgets_values": [0, "randomize", 20, 8, "euler", "simple", 1]
           },
           {
             "id": 2,
             "type": "VAEEncode",
-            "pos": [
-              685.1265869140625,
-              439.1734619140625
-            ],
-            "size": [
-              140,
-              46
-            ],
+            "pos": [685.1265869140625, 439.1734619140625],
+            "size": [140, 46],
             "flags": {},
             "order": 0,
             "mode": 0,
@@ -196,9 +154,7 @@
                 "localized_name": "LATENT",
                 "name": "LATENT",
                 "type": "LATENT",
-                "links": [
-                  4
-                ]
+                "links": [4]
               }
             ],
             "properties": {
@@ -233,12 +189,9 @@
   "extra": {
     "ds": {
       "scale": 0.8894351682943402,
-      "offset": [
-        58.7671207025881,
-        137.7124650620126
-      ]
+      "offset": [58.7671207025881, 137.7124650620126]
     },
     "frontendVersion": "1.24.1"
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/subgraphs/nested-subgraph.json b/browser_tests/assets/subgraphs/nested-subgraph.json
index d65e0c29c1..99440a91ae 100644
--- a/browser_tests/assets/subgraphs/nested-subgraph.json
+++ b/browser_tests/assets/subgraphs/nested-subgraph.json
@@ -7,14 +7,8 @@
     {
       "id": 10,
       "type": "8beb610f-ddd1-4489-ae0d-2f732a4042ae",
-      "pos": [
-        532,
-        412.5
-      ],
-      "size": [
-        140,
-        46
-      ],
+      "pos": [532, 412.5],
+      "size": [140, 46],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -23,16 +17,12 @@
         {
           "name": "LATENT",
           "type": "LATENT",
-          "links": [
-            10
-          ]
+          "links": [10]
         },
         {
           "name": "VAE",
           "type": "VAE",
-          "links": [
-            11
-          ]
+          "links": [11]
         }
       ],
       "title": "subgraph 2",
@@ -42,14 +32,8 @@
     {
       "id": 8,
       "type": "VAEDecode",
-      "pos": [
-        758.2109985351562,
-        398.3681335449219
-      ],
-      "size": [
-        210,
-        46
-      ],
+      "pos": [758.2109985351562, 398.3681335449219],
+      "size": [210, 46],
       "flags": {},
       "order": 1,
       "mode": 0,
@@ -70,9 +54,7 @@
           "name": "IMAGE",
           "type": "IMAGE",
           "slot_index": 0,
-          "links": [
-            9
-          ]
+          "links": [9]
         }
       ],
       "properties": {
@@ -83,14 +65,8 @@
     {
       "id": 9,
       "type": "SaveImage",
-      "pos": [
-        1028.9615478515625,
-        381.83746337890625
-      ],
-      "size": [
-        210,
-        270
-      ],
+      "pos": [1028.9615478515625, 381.83746337890625],
+      "size": [210, 270],
       "flags": {},
       "order": 2,
       "mode": 0,
@@ -103,36 +79,13 @@
       ],
       "outputs": [],
       "properties": {},
-      "widgets_values": [
-        "ComfyUI"
-      ]
+      "widgets_values": ["ComfyUI"]
     }
   ],
   "links": [
-    [
-      9,
-      8,
-      0,
-      9,
-      0,
-      "IMAGE"
-    ],
-    [
-      10,
-      10,
-      0,
-      8,
-      0,
-      "LATENT"
-    ],
-    [
-      11,
-      10,
-      1,
-      8,
-      1,
-      "VAE"
-    ]
+    [9, 8, 0, 9, 0, "IMAGE"],
+    [10, 10, 0, 8, 0, "LATENT"],
+    [11, 10, 1, 8, 1, "VAE"]
   ],
   "groups": [],
   "definitions": {
@@ -151,21 +104,11 @@
         "name": "subgraph 2",
         "inputNode": {
           "id": -10,
-          "bounding": [
-            -154,
-            415.5,
-            120,
-            40
-          ]
+          "bounding": [-154, 415.5, 120, 40]
         },
         "outputNode": {
           "id": -20,
-          "bounding": [
-            1238,
-            395.5,
-            120,
-            80
-          ]
+          "bounding": [1238, 395.5, 120, 80]
         },
         "inputs": [],
         "outputs": [
@@ -173,9 +116,7 @@
             "id": "4d6c7e4e-971e-4f78-9218-9a604db53a4b",
             "name": "LATENT",
             "type": "LATENT",
-            "linkIds": [
-              7
-            ],
+            "linkIds": [7],
             "localized_name": "LATENT",
             "pos": {
               "0": 1258,
@@ -186,9 +127,7 @@
             "id": "f8201d4f-7fc6-4a1b-b8c9-9f0716d9c09a",
             "name": "VAE",
             "type": "VAE",
-            "linkIds": [
-              14
-            ],
+            "linkIds": [14],
             "localized_name": "VAE",
             "pos": {
               "0": 1258,
@@ -201,14 +140,8 @@
           {
             "id": 6,
             "type": "CLIPTextEncode",
-            "pos": [
-              415,
-              186
-            ],
-            "size": [
-              422.84503173828125,
-              164.31304931640625
-            ],
+            "pos": [415, 186],
+            "size": [422.84503173828125, 164.31304931640625],
             "flags": {},
             "order": 0,
             "mode": 0,
@@ -226,9 +159,7 @@
                 "name": "CONDITIONING",
                 "type": "CONDITIONING",
                 "slot_index": 0,
-                "links": [
-                  4
-                ]
+                "links": [4]
               }
             ],
             "properties": {
@@ -241,14 +172,8 @@
           {
             "id": 3,
             "type": "KSampler",
-            "pos": [
-              863,
-              186
-            ],
-            "size": [
-              315,
-              262
-            ],
+            "pos": [863, 186],
+            "size": [315, 262],
             "flags": {},
             "order": 2,
             "mode": 0,
@@ -284,9 +209,7 @@
                 "name": "LATENT",
                 "type": "LATENT",
                 "slot_index": 0,
-                "links": [
-                  7
-                ]
+                "links": [7]
               }
             ],
             "properties": {
@@ -305,14 +228,8 @@
           {
             "id": 10,
             "type": "dbe5763f-440b-47b4-82ac-454f1f98b0e3",
-            "pos": [
-              194.13900756835938,
-              657.3333740234375
-            ],
-            "size": [
-              140,
-              106
-            ],
+            "pos": [194.13900756835938, 657.3333740234375],
+            "size": [140, 106],
             "flags": {},
             "order": 1,
             "mode": 0,
@@ -322,41 +239,31 @@
                 "localized_name": "CONDITIONING",
                 "name": "CONDITIONING",
                 "type": "CONDITIONING",
-                "links": [
-                  10
-                ]
+                "links": [10]
               },
               {
                 "localized_name": "LATENT",
                 "name": "LATENT",
                 "type": "LATENT",
-                "links": [
-                  11
-                ]
+                "links": [11]
               },
               {
                 "localized_name": "MODEL",
                 "name": "MODEL",
                 "type": "MODEL",
-                "links": [
-                  12
-                ]
+                "links": [12]
               },
               {
                 "localized_name": "CLIP",
                 "name": "CLIP",
                 "type": "CLIP",
-                "links": [
-                  13
-                ]
+                "links": [13]
               },
               {
                 "localized_name": "VAE",
                 "name": "VAE",
                 "type": "VAE",
-                "links": [
-                  14
-                ]
+                "links": [14]
               }
             ],
             "title": "subgraph 3",
@@ -439,21 +346,11 @@
         "name": "subgraph 3",
         "inputNode": {
           "id": -10,
-          "bounding": [
-            -154,
-            517,
-            120,
-            40
-          ]
+          "bounding": [-154, 517, 120, 40]
         },
         "outputNode": {
           "id": -20,
-          "bounding": [
-            898.2780151367188,
-            467,
-            128.6640625,
-            140
-          ]
+          "bounding": [898.2780151367188, 467, 128.6640625, 140]
         },
         "inputs": [],
         "outputs": [
@@ -461,9 +358,7 @@
             "id": "b4882169-329b-43f6-a373-81abfbdea55b",
             "name": "CONDITIONING",
             "type": "CONDITIONING",
-            "linkIds": [
-              6
-            ],
+            "linkIds": [6],
             "localized_name": "CONDITIONING",
             "pos": {
               "0": 918.2780151367188,
@@ -474,9 +369,7 @@
             "id": "01f51f96-a741-428e-8772-9557ee50b609",
             "name": "LATENT",
             "type": "LATENT",
-            "linkIds": [
-              2
-            ],
+            "linkIds": [2],
             "localized_name": "LATENT",
             "pos": {
               "0": 918.2780151367188,
@@ -487,9 +380,7 @@
             "id": "47fa906e-d80b-45c3-a596-211a0e59d4a1",
             "name": "MODEL",
             "type": "MODEL",
-            "linkIds": [
-              1
-            ],
+            "linkIds": [1],
             "localized_name": "MODEL",
             "pos": {
               "0": 918.2780151367188,
@@ -500,9 +391,7 @@
             "id": "f03dccd7-10e8-4513-9994-15854a92d192",
             "name": "CLIP",
             "type": "CLIP",
-            "linkIds": [
-              3
-            ],
+            "linkIds": [3],
             "localized_name": "CLIP",
             "pos": {
               "0": 918.2780151367188,
@@ -513,9 +402,7 @@
             "id": "a666877f-e34f-49bc-8a78-b26156656b83",
             "name": "VAE",
             "type": "VAE",
-            "linkIds": [
-              8
-            ],
+            "linkIds": [8],
             "localized_name": "VAE",
             "pos": {
               "0": 918.2780151367188,
@@ -528,14 +415,8 @@
           {
             "id": 7,
             "type": "CLIPTextEncode",
-            "pos": [
-              413,
-              389
-            ],
-            "size": [
-              425.27801513671875,
-              180.6060791015625
-            ],
+            "pos": [413, 389],
+            "size": [425.27801513671875, 180.6060791015625],
             "flags": {},
             "order": 2,
             "mode": 0,
@@ -553,29 +434,19 @@
                 "name": "CONDITIONING",
                 "type": "CONDITIONING",
                 "slot_index": 0,
-                "links": [
-                  6
-                ]
+                "links": [6]
               }
             ],
             "properties": {
               "Node name for S&R": "CLIPTextEncode"
             },
-            "widgets_values": [
-              "text, watermark"
-            ]
+            "widgets_values": ["text, watermark"]
           },
           {
             "id": 5,
             "type": "EmptyLatentImage",
-            "pos": [
-              473,
-              609
-            ],
-            "size": [
-              315,
-              106
-            ],
+            "pos": [473, 609],
+            "size": [315, 106],
             "flags": {},
             "order": 0,
             "mode": 0,
@@ -586,31 +457,19 @@
                 "name": "LATENT",
                 "type": "LATENT",
                 "slot_index": 0,
-                "links": [
-                  2
-                ]
+                "links": [2]
               }
             ],
             "properties": {
               "Node name for S&R": "EmptyLatentImage"
             },
-            "widgets_values": [
-              512,
-              512,
-              1
-            ]
+            "widgets_values": [512, 512, 1]
           },
           {
             "id": 4,
             "type": "CheckpointLoaderSimple",
-            "pos": [
-              26,
-              474
-            ],
-            "size": [
-              315,
-              98
-            ],
+            "pos": [26, 474],
+            "size": [315, 98],
             "flags": {},
             "order": 1,
             "mode": 0,
@@ -621,36 +480,27 @@
                 "name": "MODEL",
                 "type": "MODEL",
                 "slot_index": 0,
-                "links": [
-                  1
-                ]
+                "links": [1]
               },
               {
                 "localized_name": "CLIP",
                 "name": "CLIP",
                 "type": "CLIP",
                 "slot_index": 1,
-                "links": [
-                  3,
-                  5
-                ]
+                "links": [3, 5]
               },
               {
                 "localized_name": "VAE",
                 "name": "VAE",
                 "type": "VAE",
                 "slot_index": 2,
-                "links": [
-                  8
-                ]
+                "links": [8]
               }
             ],
             "properties": {
               "Node name for S&R": "CheckpointLoaderSimple"
             },
-            "widgets_values": [
-              "v1-5-pruned-emaonly-fp16.safetensors"
-            ]
+            "widgets_values": ["v1-5-pruned-emaonly-fp16.safetensors"]
           }
         ],
         "groups": [],
@@ -713,4 +563,4 @@
     "frontendVersion": "1.24.0-1"
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/subgraphs/subgraph-compressed-target-slot.json b/browser_tests/assets/subgraphs/subgraph-compressed-target-slot.json
index 471011d380..2a19042ab8 100644
--- a/browser_tests/assets/subgraphs/subgraph-compressed-target-slot.json
+++ b/browser_tests/assets/subgraphs/subgraph-compressed-target-slot.json
@@ -7,30 +7,17 @@
     {
       "id": 2,
       "type": "8bfe4227-f272-49e1-a892-0a972a86867c",
-      "pos": [
-        -317,
-        -336
-      ],
-      "size": [
-        210,
-        58
-      ],
+      "pos": [-317, -336],
+      "size": [210, 58],
       "flags": {},
       "order": 0,
       "mode": 0,
       "inputs": [],
       "outputs": [],
       "properties": {
-        "proxyWidgets": [
-          [
-            "-1",
-            "batch_size"
-          ]
-        ]
+        "proxyWidgets": [["-1", "batch_size"]]
       },
-      "widgets_values": [
-        1
-      ]
+      "widgets_values": [1]
     }
   ],
   "links": [],
@@ -51,34 +38,19 @@
         "name": "New Subgraph",
         "inputNode": {
           "id": -10,
-          "bounding": [
-            -562,
-            -358,
-            120,
-            60
-          ]
+          "bounding": [-562, -358, 120, 60]
         },
         "outputNode": {
           "id": -20,
-          "bounding": [
-            -52,
-            -358,
-            120,
-            40
-          ]
+          "bounding": [-52, -358, 120, 40]
         },
         "inputs": [
           {
             "id": "b4a8bc2a-8e9f-41aa-938d-c567a11d2c00",
             "name": "batch_size",
             "type": "INT",
-            "linkIds": [
-              1
-            ],
-            "pos": [
-              -462,
-              -338
-            ]
+            "linkIds": [1],
+            "pos": [-462, -338]
           }
         ],
         "outputs": [],
@@ -87,14 +59,8 @@
           {
             "id": 1,
             "type": "EmptyLatentImage",
-            "pos": [
-              -382,
-              -376
-            ],
-            "size": [
-              270,
-              106
-            ],
+            "pos": [-382, -376],
+            "size": [270, 106],
             "flags": {},
             "order": 0,
             "mode": 0,
@@ -120,11 +86,7 @@
             "properties": {
               "Node name for S&R": "EmptyLatentImage"
             },
-            "widgets_values": [
-              512,
-              512,
-              1
-            ]
+            "widgets_values": [512, 512, 1]
           }
         ],
         "groups": [],
@@ -147,4 +109,4 @@
     "frontendVersion": "1.35.1"
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/subgraphs/subgraph-duplicate-links.json b/browser_tests/assets/subgraphs/subgraph-duplicate-links.json
new file mode 100644
index 0000000000..8d57ef9a9d
--- /dev/null
+++ b/browser_tests/assets/subgraphs/subgraph-duplicate-links.json
@@ -0,0 +1,183 @@
+{
+  "id": "a1b2c3d4-e5f6-7890-abcd-ef1234567890",
+  "revision": 0,
+  "last_node_id": 2,
+  "last_link_id": 0,
+  "nodes": [
+    {
+      "id": 2,
+      "type": "e5fb1765-aaaa-bbbb-cccc-ddddeeee0001",
+      "pos": [600, 400],
+      "size": [200, 100],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [],
+      "outputs": [
+        {
+          "name": "LATENT",
+          "type": "LATENT",
+          "links": null
+        }
+      ],
+      "properties": {},
+      "widgets_values": []
+    }
+  ],
+  "links": [],
+  "groups": [],
+  "definitions": {
+    "subgraphs": [
+      {
+        "id": "e5fb1765-aaaa-bbbb-cccc-ddddeeee0001",
+        "version": 1,
+        "state": {
+          "lastGroupId": 0,
+          "lastNodeId": 2,
+          "lastLinkId": 5,
+          "lastRerouteId": 0
+        },
+        "revision": 0,
+        "config": {},
+        "name": "Subgraph With Duplicate Links",
+        "inputNode": {
+          "id": -10,
+          "bounding": [200, 400, 120, 60]
+        },
+        "outputNode": {
+          "id": -20,
+          "bounding": [900, 400, 120, 60]
+        },
+        "inputs": [],
+        "outputs": [
+          {
+            "id": "out-latent-1",
+            "name": "LATENT",
+            "type": "LATENT",
+            "linkIds": [2],
+            "pos": [920, 420]
+          }
+        ],
+        "widgets": [],
+        "nodes": [
+          {
+            "id": 1,
+            "type": "KSampler",
+            "pos": [400, 100],
+            "size": [270, 262],
+            "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": 1
+              }
+            ],
+            "outputs": [
+              {
+                "name": "LATENT",
+                "type": "LATENT",
+                "links": [2]
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "KSampler"
+            },
+            "widgets_values": [0, "randomize", 20, 8, "euler", "simple", 1]
+          },
+          {
+            "id": 2,
+            "type": "EmptyLatentImage",
+            "pos": [100, 200],
+            "size": [200, 106],
+            "flags": {},
+            "order": 0,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [
+              {
+                "name": "LATENT",
+                "type": "LATENT",
+                "links": [1, 3, 4, 5]
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "EmptyLatentImage"
+            },
+            "widgets_values": [512, 512, 1]
+          }
+        ],
+        "groups": [],
+        "links": [
+          {
+            "id": 1,
+            "origin_id": 2,
+            "origin_slot": 0,
+            "target_id": 1,
+            "target_slot": 3,
+            "type": "LATENT"
+          },
+          {
+            "id": 2,
+            "origin_id": 1,
+            "origin_slot": 0,
+            "target_id": -20,
+            "target_slot": 0,
+            "type": "LATENT"
+          },
+          {
+            "id": 3,
+            "origin_id": 2,
+            "origin_slot": 0,
+            "target_id": 1,
+            "target_slot": 3,
+            "type": "LATENT"
+          },
+          {
+            "id": 4,
+            "origin_id": 2,
+            "origin_slot": 0,
+            "target_id": 1,
+            "target_slot": 3,
+            "type": "LATENT"
+          },
+          {
+            "id": 5,
+            "origin_id": 2,
+            "origin_slot": 0,
+            "target_id": 1,
+            "target_slot": 3,
+            "type": "LATENT"
+          }
+        ],
+        "extra": {}
+      }
+    ]
+  },
+  "config": {},
+  "extra": {
+    "ds": {
+      "scale": 1,
+      "offset": [0, 0]
+    },
+    "frontendVersion": "1.38.14"
+  },
+  "version": 0.4
+}
diff --git a/browser_tests/assets/subgraphs/subgraph-nested-duplicate-ids.json b/browser_tests/assets/subgraphs/subgraph-nested-duplicate-ids.json
new file mode 100644
index 0000000000..c5469594a5
--- /dev/null
+++ b/browser_tests/assets/subgraphs/subgraph-nested-duplicate-ids.json
@@ -0,0 +1,599 @@
+{
+  "id": "9a37f747-e96b-4304-9212-7abcaad7bdac",
+  "revision": 0,
+  "last_node_id": 5,
+  "last_link_id": 5,
+  "nodes": [
+    {
+      "id": 5,
+      "type": "1e38d8ea-45e1-48a5-aa20-966584201867",
+      "pos": [788, 433.5],
+      "size": [210, 108],
+      "flags": {},
+      "order": 1,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "string_a",
+          "type": "STRING",
+          "widget": {
+            "name": "string_a"
+          },
+          "link": 4
+        }
+      ],
+      "outputs": [
+        {
+          "name": "STRING",
+          "type": "STRING",
+          "links": [5]
+        }
+      ],
+      "properties": {
+        "proxyWidgets": [["-1", "string_a"]]
+      },
+      "widgets_values": [""]
+    },
+    {
+      "id": 2,
+      "type": "PreviewAny",
+      "pos": [1135, 429],
+      "size": [250, 145.5],
+      "flags": {},
+      "order": 2,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "source",
+          "type": "*",
+          "link": 5
+        }
+      ],
+      "outputs": [],
+      "properties": {
+        "Node name for S&R": "PreviewAny"
+      },
+      "widgets_values": [null, null, false]
+    },
+    {
+      "id": 1,
+      "type": "PrimitiveStringMultiline",
+      "pos": [456, 450],
+      "size": [225, 121.5],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [],
+      "outputs": [
+        {
+          "name": "STRING",
+          "type": "STRING",
+          "links": [4]
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "PrimitiveStringMultiline"
+      },
+      "widgets_values": ["Outer\n"]
+    }
+  ],
+  "links": [
+    [4, 1, 0, 5, 0, "STRING"],
+    [5, 5, 0, 2, 0, "STRING"]
+  ],
+  "groups": [],
+  "definitions": {
+    "subgraphs": [
+      {
+        "id": "1e38d8ea-45e1-48a5-aa20-966584201867",
+        "version": 1,
+        "state": {
+          "lastGroupId": 0,
+          "lastNodeId": 6,
+          "lastLinkId": 9,
+          "lastRerouteId": 0
+        },
+        "revision": 0,
+        "config": {},
+        "name": "New Subgraph",
+        "inputNode": {
+          "id": -10,
+          "bounding": [351, 432.5, 120, 60]
+        },
+        "outputNode": {
+          "id": -20,
+          "bounding": [1315, 432.5, 120, 60]
+        },
+        "inputs": [
+          {
+            "id": "7bf3e1d4-0521-4b5c-92f5-47ca598b7eb4",
+            "name": "string_a",
+            "type": "STRING",
+            "linkIds": [1],
+            "localized_name": "string_a",
+            "pos": [451, 452.5]
+          }
+        ],
+        "outputs": [
+          {
+            "id": "fbe975ba-d7c2-471e-a99a-a1e2c6ab466d",
+            "name": "STRING",
+            "type": "STRING",
+            "linkIds": [9],
+            "localized_name": "STRING",
+            "pos": [1335, 452.5]
+          }
+        ],
+        "widgets": [],
+        "nodes": [
+          {
+            "id": 3,
+            "type": "StringConcatenate",
+            "pos": [815, 373],
+            "size": [347, 231],
+            "flags": {},
+            "order": 2,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "string_a",
+                "name": "string_a",
+                "type": "STRING",
+                "widget": {
+                  "name": "string_a"
+                },
+                "link": 1
+              },
+              {
+                "localized_name": "string_b",
+                "name": "string_b",
+                "type": "STRING",
+                "widget": {
+                  "name": "string_b"
+                },
+                "link": 2
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "STRING",
+                "name": "STRING",
+                "type": "STRING",
+                "links": [7]
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "StringConcatenate"
+            },
+            "widgets_values": ["", "", ""]
+          },
+          {
+            "id": 6,
+            "type": "9be42452-056b-4c99-9f9f-7381d11c4454",
+            "pos": [955, 775],
+            "size": [210, 88],
+            "flags": {},
+            "order": 1,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "string_a",
+                "name": "string_a",
+                "type": "STRING",
+                "widget": {
+                  "name": "string_a"
+                },
+                "link": 7
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "STRING",
+                "name": "STRING",
+                "type": "STRING",
+                "links": [9]
+              }
+            ],
+            "properties": {
+              "proxyWidgets": [["-1", "string_a"]]
+            },
+            "widgets_values": [""]
+          },
+          {
+            "id": 4,
+            "type": "PrimitiveStringMultiline",
+            "pos": [313, 685],
+            "size": [325, 109],
+            "flags": {},
+            "order": 0,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [
+              {
+                "localized_name": "STRING",
+                "name": "STRING",
+                "type": "STRING",
+                "links": [2]
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "PrimitiveStringMultiline"
+            },
+            "widgets_values": ["Inner 1\n"]
+          }
+        ],
+        "groups": [],
+        "links": [
+          {
+            "id": 2,
+            "origin_id": 4,
+            "origin_slot": 0,
+            "target_id": 3,
+            "target_slot": 1,
+            "type": "STRING"
+          },
+          {
+            "id": 1,
+            "origin_id": -10,
+            "origin_slot": 0,
+            "target_id": 3,
+            "target_slot": 0,
+            "type": "STRING"
+          },
+          {
+            "id": 7,
+            "origin_id": 3,
+            "origin_slot": 0,
+            "target_id": 6,
+            "target_slot": 0,
+            "type": "STRING"
+          },
+          {
+            "id": 6,
+            "origin_id": 6,
+            "origin_slot": 0,
+            "target_id": -20,
+            "target_slot": 1,
+            "type": "STRING"
+          },
+          {
+            "id": 9,
+            "origin_id": 6,
+            "origin_slot": 0,
+            "target_id": -20,
+            "target_slot": 0,
+            "type": "STRING"
+          }
+        ],
+        "extra": {}
+      },
+      {
+        "id": "9be42452-056b-4c99-9f9f-7381d11c4454",
+        "version": 1,
+        "state": {
+          "lastGroupId": 0,
+          "lastNodeId": 9,
+          "lastLinkId": 12,
+          "lastRerouteId": 0
+        },
+        "revision": 0,
+        "config": {},
+        "name": "New Subgraph",
+        "inputNode": {
+          "id": -10,
+          "bounding": [680, 774, 120, 60]
+        },
+        "outputNode": {
+          "id": -20,
+          "bounding": [1320, 774, 120, 60]
+        },
+        "inputs": [
+          {
+            "id": "01c05c51-86b5-4bad-b32f-9c911683a13d",
+            "name": "string_a",
+            "type": "STRING",
+            "linkIds": [4],
+            "localized_name": "string_a",
+            "pos": [780, 794]
+          }
+        ],
+        "outputs": [
+          {
+            "id": "a8bcf3bf-a66a-4c71-8d92-17a2a4d03686",
+            "name": "STRING",
+            "type": "STRING",
+            "linkIds": [12],
+            "localized_name": "STRING",
+            "pos": [1340, 794]
+          }
+        ],
+        "widgets": [],
+        "nodes": [
+          {
+            "id": 5,
+            "type": "StringConcatenate",
+            "pos": [860, 719],
+            "size": [400, 200],
+            "flags": {},
+            "order": 2,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "string_a",
+                "name": "string_a",
+                "type": "STRING",
+                "widget": {
+                  "name": "string_a"
+                },
+                "link": 4
+              },
+              {
+                "localized_name": "string_b",
+                "name": "string_b",
+                "type": "STRING",
+                "widget": {
+                  "name": "string_b"
+                },
+                "link": 7
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "STRING",
+                "name": "STRING",
+                "type": "STRING",
+                "links": [11]
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "StringConcatenate"
+            },
+            "widgets_values": ["", "", ""]
+          },
+          {
+            "id": 6,
+            "type": "PrimitiveStringMultiline",
+            "pos": [401, 973],
+            "size": [400, 200],
+            "flags": {},
+            "order": 0,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [
+              {
+                "localized_name": "STRING",
+                "name": "STRING",
+                "type": "STRING",
+                "links": [7]
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "PrimitiveStringMultiline"
+            },
+            "widgets_values": ["Inner 2\n"]
+          },
+          {
+            "id": 9,
+            "type": "7c2915a5-5eb8-4958-a8fd-4beb30f370ce",
+            "pos": [1046, 985],
+            "size": [210, 88],
+            "flags": {},
+            "order": 1,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "string_a",
+                "name": "string_a",
+                "type": "STRING",
+                "widget": {
+                  "name": "string_a"
+                },
+                "link": 11
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "STRING",
+                "name": "STRING",
+                "type": "STRING",
+                "links": [12]
+              }
+            ],
+            "properties": {
+              "proxyWidgets": [["-1", "string_a"]]
+            },
+            "widgets_values": [""]
+          }
+        ],
+        "groups": [],
+        "links": [
+          {
+            "id": 4,
+            "origin_id": -10,
+            "origin_slot": 0,
+            "target_id": 5,
+            "target_slot": 0,
+            "type": "STRING"
+          },
+          {
+            "id": 7,
+            "origin_id": 6,
+            "origin_slot": 0,
+            "target_id": 5,
+            "target_slot": 1,
+            "type": "STRING"
+          },
+          {
+            "id": 11,
+            "origin_id": 5,
+            "origin_slot": 0,
+            "target_id": 9,
+            "target_slot": 0,
+            "type": "STRING"
+          },
+          {
+            "id": 10,
+            "origin_id": 9,
+            "origin_slot": 0,
+            "target_id": -20,
+            "target_slot": 0,
+            "type": "STRING"
+          },
+          {
+            "id": 12,
+            "origin_id": 9,
+            "origin_slot": 0,
+            "target_id": -20,
+            "target_slot": 0,
+            "type": "STRING"
+          }
+        ],
+        "extra": {}
+      },
+      {
+        "id": "7c2915a5-5eb8-4958-a8fd-4beb30f370ce",
+        "version": 1,
+        "state": {
+          "lastGroupId": 0,
+          "lastNodeId": 8,
+          "lastLinkId": 10,
+          "lastRerouteId": 0
+        },
+        "revision": 0,
+        "config": {},
+        "name": "New Subgraph",
+        "inputNode": {
+          "id": -10,
+          "bounding": [262, 1222, 120, 60]
+        },
+        "outputNode": {
+          "id": -20,
+          "bounding": [1330, 1222, 120, 60]
+        },
+        "inputs": [
+          {
+            "id": "934a8baa-d79c-428c-8ec9-814ad437d7c7",
+            "name": "string_a",
+            "type": "STRING",
+            "linkIds": [9],
+            "localized_name": "string_a",
+            "pos": [362, 1242]
+          }
+        ],
+        "outputs": [
+          {
+            "id": "4c3d243b-9ff6-4dcd-9dbf-e4ec8e1fc879",
+            "name": "STRING",
+            "type": "STRING",
+            "linkIds": [10],
+            "localized_name": "STRING",
+            "pos": [1350, 1242]
+          }
+        ],
+        "widgets": [],
+        "nodes": [
+          {
+            "id": 7,
+            "type": "StringConcatenate",
+            "pos": [870, 1038],
+            "size": [400, 200],
+            "flags": {},
+            "order": 1,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "string_a",
+                "name": "string_a",
+                "type": "STRING",
+                "widget": {
+                  "name": "string_a"
+                },
+                "link": 9
+              },
+              {
+                "localized_name": "string_b",
+                "name": "string_b",
+                "type": "STRING",
+                "widget": {
+                  "name": "string_b"
+                },
+                "link": 8
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "STRING",
+                "name": "STRING",
+                "type": "STRING",
+                "links": [10]
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "StringConcatenate"
+            },
+            "widgets_values": ["", "", ""]
+          },
+          {
+            "id": 8,
+            "type": "PrimitiveStringMultiline",
+            "pos": [442, 1296],
+            "size": [400, 200],
+            "flags": {},
+            "order": 0,
+            "mode": 0,
+            "inputs": [],
+            "outputs": [
+              {
+                "localized_name": "STRING",
+                "name": "STRING",
+                "type": "STRING",
+                "links": [8]
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "PrimitiveStringMultiline"
+            },
+            "widgets_values": ["Inner 3\n"]
+          }
+        ],
+        "groups": [],
+        "links": [
+          {
+            "id": 8,
+            "origin_id": 8,
+            "origin_slot": 0,
+            "target_id": 7,
+            "target_slot": 1,
+            "type": "STRING"
+          },
+          {
+            "id": 9,
+            "origin_id": -10,
+            "origin_slot": 0,
+            "target_id": 7,
+            "target_slot": 0,
+            "type": "STRING"
+          },
+          {
+            "id": 10,
+            "origin_id": 7,
+            "origin_slot": 0,
+            "target_id": -20,
+            "target_slot": 0,
+            "type": "STRING"
+          }
+        ],
+        "extra": {}
+      }
+    ]
+  },
+  "config": {},
+  "extra": {
+    "ds": {
+      "scale": 1,
+      "offset": [-7, 144]
+    },
+    "frontendVersion": "1.38.13"
+  },
+  "version": 0.4
+}
diff --git a/browser_tests/assets/subgraphs/subgraph-nested-promotion.json b/browser_tests/assets/subgraphs/subgraph-nested-promotion.json
new file mode 100644
index 0000000000..22a964a5e8
--- /dev/null
+++ b/browser_tests/assets/subgraphs/subgraph-nested-promotion.json
@@ -0,0 +1,760 @@
+{
+  "id": "9a37f747-e96b-4304-9212-7abcaad7bdac",
+  "revision": 0,
+  "last_node_id": 11,
+  "last_link_id": 18,
+  "nodes": [
+    {
+      "id": 2,
+      "type": "PreviewAny",
+      "pos": [1031, 434],
+      "size": [250, 178],
+      "flags": {},
+      "order": 2,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "source",
+          "type": "*",
+          "link": 5
+        }
+      ],
+      "outputs": [],
+      "properties": {
+        "Node name for S&R": "PreviewAny"
+      },
+      "widgets_values": [null, null, null]
+    },
+    {
+      "id": 5,
+      "type": "1e38d8ea-45e1-48a5-aa20-966584201867",
+      "pos": [788, 433.5],
+      "size": [225, 380],
+      "flags": {},
+      "order": 1,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "string_a",
+          "type": "STRING",
+          "widget": {
+            "name": "string_a"
+          },
+          "link": 4
+        }
+      ],
+      "outputs": [
+        {
+          "name": "STRING",
+          "type": "STRING",
+          "links": [5]
+        }
+      ],
+      "properties": {
+        "proxyWidgets": [
+          ["3", "string_a"],
+          ["4", "value"],
+          ["6", "value"],
+          ["6", "value_1"]
+        ]
+      },
+      "widgets_values": []
+    },
+    {
+      "id": 1,
+      "type": "PrimitiveStringMultiline",
+      "pos": [548, 451],
+      "size": [225, 142],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [],
+      "outputs": [
+        {
+          "name": "STRING",
+          "type": "STRING",
+          "links": [4]
+        }
+      ],
+      "title": "Outer",
+      "properties": {
+        "Node name for S&R": "PrimitiveStringMultiline"
+      },
+      "widgets_values": ["Outer\n"]
+    }
+  ],
+  "links": [
+    [4, 1, 0, 5, 0, "STRING"],
+    [5, 5, 0, 2, 0, "STRING"]
+  ],
+  "groups": [],
+  "definitions": {
+    "subgraphs": [
+      {
+        "id": "1e38d8ea-45e1-48a5-aa20-966584201867",
+        "version": 1,
+        "state": {
+          "lastGroupId": 0,
+          "lastNodeId": 11,
+          "lastLinkId": 18,
+          "lastRerouteId": 0
+        },
+        "revision": 0,
+        "config": {},
+        "name": "Sub 0",
+        "inputNode": {
+          "id": -10,
+          "bounding": [351, 432.5, 120, 120]
+        },
+        "outputNode": {
+          "id": -20,
+          "bounding": [1352, 294.5, 120, 60]
+        },
+        "inputs": [
+          {
+            "id": "7bf3e1d4-0521-4b5c-92f5-47ca598b7eb4",
+            "name": "string_a",
+            "type": "STRING",
+            "linkIds": [1],
+            "localized_name": "string_a",
+            "pos": [451, 452.5]
+          },
+          {
+            "id": "5fb3dcf7-9bfd-4b3c-a1b9-750b4f3edf19",
+            "name": "value",
+            "type": "STRING",
+            "linkIds": [13],
+            "pos": [451, 472.5]
+          },
+          {
+            "id": "55d24b8a-7c82-4b02-8e3d-ff31ffb8aa13",
+            "name": "value_1",
+            "type": "STRING",
+            "linkIds": [16],
+            "pos": [451, 492.5]
+          },
+          {
+            "id": "c1fe7cc3-547e-4fb0-b763-61888558d4bd",
+            "name": "value_1_1",
+            "type": "STRING",
+            "linkIds": [18],
+            "pos": [451, 512.5]
+          }
+        ],
+        "outputs": [
+          {
+            "id": "fbe975ba-d7c2-471e-a99a-a1e2c6ab466d",
+            "name": "STRING",
+            "type": "STRING",
+            "linkIds": [9],
+            "localized_name": "STRING",
+            "pos": [1372, 314.5]
+          }
+        ],
+        "widgets": [],
+        "nodes": [
+          {
+            "id": 4,
+            "type": "PrimitiveStringMultiline",
+            "pos": [504, 437],
+            "size": [210, 88],
+            "flags": {},
+            "order": 1,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "value",
+                "name": "value",
+                "type": "STRING",
+                "widget": {
+                  "name": "value"
+                },
+                "link": 13
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "STRING",
+                "name": "STRING",
+                "type": "STRING",
+                "links": [2]
+              }
+            ],
+            "title": "Inner 1",
+            "properties": {
+              "Node name for S&R": "PrimitiveStringMultiline"
+            },
+            "widgets_values": ["Inner 1\n"]
+          },
+          {
+            "id": 3,
+            "type": "StringConcatenate",
+            "pos": [743, 325],
+            "size": [347, 231],
+            "flags": {},
+            "order": 0,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "string_a",
+                "name": "string_a",
+                "type": "STRING",
+                "widget": {
+                  "name": "string_a"
+                },
+                "link": 1
+              },
+              {
+                "localized_name": "string_b",
+                "name": "string_b",
+                "type": "STRING",
+                "widget": {
+                  "name": "string_b"
+                },
+                "link": 2
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "STRING",
+                "name": "STRING",
+                "type": "STRING",
+                "links": [7]
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "StringConcatenate"
+            },
+            "widgets_values": ["", "", ""]
+          },
+          {
+            "id": 6,
+            "type": "9be42452-056b-4c99-9f9f-7381d11c4454",
+            "pos": [1115, 301],
+            "size": [210, 196],
+            "flags": {},
+            "order": 2,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "string_a",
+                "name": "string_a",
+                "type": "STRING",
+                "widget": {
+                  "name": "string_a"
+                },
+                "link": 7
+              },
+              {
+                "name": "value",
+                "type": "STRING",
+                "widget": {
+                  "name": "value"
+                },
+                "link": 16
+              },
+              {
+                "name": "value_1",
+                "type": "STRING",
+                "widget": {
+                  "name": "value_1"
+                },
+                "link": 18
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "STRING",
+                "name": "STRING",
+                "type": "STRING",
+                "links": [9]
+              }
+            ],
+            "properties": {
+              "proxyWidgets": [
+                ["5", "string_a"],
+                ["11", "value"],
+                ["9", "value"],
+                ["10", "string_a"]
+              ]
+            },
+            "widgets_values": []
+          }
+        ],
+        "groups": [],
+        "links": [
+          {
+            "id": 2,
+            "origin_id": 4,
+            "origin_slot": 0,
+            "target_id": 3,
+            "target_slot": 1,
+            "type": "STRING"
+          },
+          {
+            "id": 1,
+            "origin_id": -10,
+            "origin_slot": 0,
+            "target_id": 3,
+            "target_slot": 0,
+            "type": "STRING"
+          },
+          {
+            "id": 7,
+            "origin_id": 3,
+            "origin_slot": 0,
+            "target_id": 6,
+            "target_slot": 0,
+            "type": "STRING"
+          },
+          {
+            "id": 6,
+            "origin_id": 6,
+            "origin_slot": 0,
+            "target_id": -20,
+            "target_slot": 1,
+            "type": "STRING"
+          },
+          {
+            "id": 9,
+            "origin_id": 6,
+            "origin_slot": 0,
+            "target_id": -20,
+            "target_slot": 0,
+            "type": "STRING"
+          },
+          {
+            "id": 13,
+            "origin_id": -10,
+            "origin_slot": 1,
+            "target_id": 4,
+            "target_slot": 0,
+            "type": "STRING"
+          },
+          {
+            "id": 16,
+            "origin_id": -10,
+            "origin_slot": 2,
+            "target_id": 6,
+            "target_slot": 1,
+            "type": "STRING"
+          },
+          {
+            "id": 18,
+            "origin_id": -10,
+            "origin_slot": 3,
+            "target_id": 6,
+            "target_slot": 2,
+            "type": "STRING"
+          }
+        ],
+        "extra": {}
+      },
+      {
+        "id": "9be42452-056b-4c99-9f9f-7381d11c4454",
+        "version": 1,
+        "state": {
+          "lastGroupId": 0,
+          "lastNodeId": 11,
+          "lastLinkId": 18,
+          "lastRerouteId": 0
+        },
+        "revision": 0,
+        "config": {},
+        "name": "Sub 1",
+        "inputNode": {
+          "id": -10,
+          "bounding": [180, 739, 120, 100]
+        },
+        "outputNode": {
+          "id": -20,
+          "bounding": [1246, 612, 120, 60]
+        },
+        "inputs": [
+          {
+            "id": "01c05c51-86b5-4bad-b32f-9c911683a13d",
+            "name": "string_a",
+            "type": "STRING",
+            "linkIds": [4],
+            "localized_name": "string_a",
+            "pos": [280, 759]
+          },
+          {
+            "id": "d50f6a62-0185-43d4-a174-a8a94bd8f6e7",
+            "name": "value",
+            "type": "STRING",
+            "linkIds": [14],
+            "pos": [280, 779]
+          },
+          {
+            "id": "6b78450e-5986-49cd-b743-c933e5a34a69",
+            "name": "value_1",
+            "type": "STRING",
+            "linkIds": [17],
+            "pos": [280, 799]
+          }
+        ],
+        "outputs": [
+          {
+            "id": "a8bcf3bf-a66a-4c71-8d92-17a2a4d03686",
+            "name": "STRING",
+            "type": "STRING",
+            "linkIds": [12],
+            "localized_name": "STRING",
+            "pos": [1266, 632]
+          }
+        ],
+        "widgets": [],
+        "nodes": [
+          {
+            "id": 11,
+            "type": "PrimitiveStringMultiline",
+            "pos": [334, 742],
+            "size": [210, 88],
+            "flags": {},
+            "order": 2,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "value",
+                "name": "value",
+                "type": "STRING",
+                "widget": {
+                  "name": "value"
+                },
+                "link": 14
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "STRING",
+                "name": "STRING",
+                "type": "STRING",
+                "links": [7]
+              }
+            ],
+            "title": "Inner 2",
+            "properties": {
+              "Node name for S&R": "PrimitiveStringMultiline"
+            },
+            "widgets_values": ["Inner 2\n"]
+          },
+          {
+            "id": 10,
+            "type": "StringConcatenate",
+            "pos": [581, 637],
+            "size": [400, 200],
+            "flags": {},
+            "order": 1,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "string_a",
+                "name": "string_a",
+                "type": "STRING",
+                "widget": {
+                  "name": "string_a"
+                },
+                "link": 4
+              },
+              {
+                "localized_name": "string_b",
+                "name": "string_b",
+                "type": "STRING",
+                "widget": {
+                  "name": "string_b"
+                },
+                "link": 7
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "STRING",
+                "name": "STRING",
+                "type": "STRING",
+                "links": [11]
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "StringConcatenate"
+            },
+            "widgets_values": ["", "", ""]
+          },
+          {
+            "id": 9,
+            "type": "7c2915a5-5eb8-4958-a8fd-4beb30f370ce",
+            "pos": [1004, 613],
+            "size": [210, 142],
+            "flags": {},
+            "order": 0,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "string_a",
+                "name": "string_a",
+                "type": "STRING",
+                "widget": {
+                  "name": "string_a"
+                },
+                "link": 11
+              },
+              {
+                "name": "value",
+                "type": "STRING",
+                "widget": {
+                  "name": "value"
+                },
+                "link": 17
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "STRING",
+                "name": "STRING",
+                "type": "STRING",
+                "links": [12]
+              }
+            ],
+            "properties": {
+              "proxyWidgets": [
+                ["7", "string_a"],
+                ["8", "value"]
+              ]
+            },
+            "widgets_values": []
+          }
+        ],
+        "groups": [],
+        "links": [
+          {
+            "id": 4,
+            "origin_id": -10,
+            "origin_slot": 0,
+            "target_id": 10,
+            "target_slot": 0,
+            "type": "STRING"
+          },
+          {
+            "id": 7,
+            "origin_id": 11,
+            "origin_slot": 0,
+            "target_id": 10,
+            "target_slot": 1,
+            "type": "STRING"
+          },
+          {
+            "id": 11,
+            "origin_id": 10,
+            "origin_slot": 0,
+            "target_id": 9,
+            "target_slot": 0,
+            "type": "STRING"
+          },
+          {
+            "id": 10,
+            "origin_id": 9,
+            "origin_slot": 0,
+            "target_id": -20,
+            "target_slot": 0,
+            "type": "STRING"
+          },
+          {
+            "id": 12,
+            "origin_id": 9,
+            "origin_slot": 0,
+            "target_id": -20,
+            "target_slot": 0,
+            "type": "STRING"
+          },
+          {
+            "id": 14,
+            "origin_id": -10,
+            "origin_slot": 1,
+            "target_id": 11,
+            "target_slot": 0,
+            "type": "STRING"
+          },
+          {
+            "id": 17,
+            "origin_id": -10,
+            "origin_slot": 2,
+            "target_id": 9,
+            "target_slot": 1,
+            "type": "STRING"
+          }
+        ],
+        "extra": {}
+      },
+      {
+        "id": "7c2915a5-5eb8-4958-a8fd-4beb30f370ce",
+        "version": 1,
+        "state": {
+          "lastGroupId": 0,
+          "lastNodeId": 11,
+          "lastLinkId": 18,
+          "lastRerouteId": 0
+        },
+        "revision": 0,
+        "config": {},
+        "name": "Sub 2",
+        "inputNode": {
+          "id": -10,
+          "bounding": [262, 1222, 120, 80]
+        },
+        "outputNode": {
+          "id": -20,
+          "bounding": [1123.089999999999, 1125.1999999999998, 120, 60]
+        },
+        "inputs": [
+          {
+            "id": "934a8baa-d79c-428c-8ec9-814ad437d7c7",
+            "name": "string_a",
+            "type": "STRING",
+            "linkIds": [9],
+            "localized_name": "string_a",
+            "pos": [362, 1242]
+          },
+          {
+            "id": "3a545207-7202-42a9-a82f-3b62e1b0f459",
+            "name": "value",
+            "type": "STRING",
+            "linkIds": [15],
+            "pos": [362, 1262]
+          }
+        ],
+        "outputs": [
+          {
+            "id": "4c3d243b-9ff6-4dcd-9dbf-e4ec8e1fc879",
+            "name": "STRING",
+            "type": "STRING",
+            "linkIds": [10],
+            "localized_name": "STRING",
+            "pos": [1143.089999999999, 1145.1999999999998]
+          }
+        ],
+        "widgets": [],
+        "nodes": [
+          {
+            "id": 8,
+            "type": "PrimitiveStringMultiline",
+            "pos": [412.96000000000004, 1228.2399999999996],
+            "size": [210, 88],
+            "flags": {},
+            "order": 1,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "value",
+                "name": "value",
+                "type": "STRING",
+                "widget": {
+                  "name": "value"
+                },
+                "link": 15
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "STRING",
+                "name": "STRING",
+                "type": "STRING",
+                "links": [8]
+              }
+            ],
+            "title": "Inner 3",
+            "properties": {
+              "Node name for S&R": "PrimitiveStringMultiline"
+            },
+            "widgets_values": ["Inner 3\n"]
+          },
+          {
+            "id": 7,
+            "type": "StringConcatenate",
+            "pos": [686.08, 1132.38],
+            "size": [400, 200],
+            "flags": {},
+            "order": 0,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "string_a",
+                "name": "string_a",
+                "type": "STRING",
+                "widget": {
+                  "name": "string_a"
+                },
+                "link": 9
+              },
+              {
+                "localized_name": "string_b",
+                "name": "string_b",
+                "type": "STRING",
+                "widget": {
+                  "name": "string_b"
+                },
+                "link": 8
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "STRING",
+                "name": "STRING",
+                "type": "STRING",
+                "links": [10]
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "StringConcatenate"
+            },
+            "widgets_values": ["", "", ""]
+          }
+        ],
+        "groups": [],
+        "links": [
+          {
+            "id": 8,
+            "origin_id": 8,
+            "origin_slot": 0,
+            "target_id": 7,
+            "target_slot": 1,
+            "type": "STRING"
+          },
+          {
+            "id": 9,
+            "origin_id": -10,
+            "origin_slot": 0,
+            "target_id": 7,
+            "target_slot": 0,
+            "type": "STRING"
+          },
+          {
+            "id": 10,
+            "origin_id": 7,
+            "origin_slot": 0,
+            "target_id": -20,
+            "target_slot": 0,
+            "type": "STRING"
+          },
+          {
+            "id": 15,
+            "origin_id": -10,
+            "origin_slot": 1,
+            "target_id": 8,
+            "target_slot": 0,
+            "type": "STRING"
+          }
+        ],
+        "extra": {}
+      }
+    ]
+  },
+  "config": {},
+  "extra": {
+    "ds": {
+      "scale": 1,
+      "offset": [-412, 11]
+    },
+    "frontendVersion": "1.41.7"
+  },
+  "version": 0.4
+}
diff --git a/browser_tests/assets/subgraphs/subgraph-with-multiple-promoted-previews.json b/browser_tests/assets/subgraphs/subgraph-with-multiple-promoted-previews.json
new file mode 100644
index 0000000000..9c8e6c8380
--- /dev/null
+++ b/browser_tests/assets/subgraphs/subgraph-with-multiple-promoted-previews.json
@@ -0,0 +1,394 @@
+{
+  "id": "43e9499c-2512-43b5-a5a1-2485eb65da32",
+  "revision": 0,
+  "last_node_id": 8,
+  "last_link_id": 10,
+  "nodes": [
+    {
+      "id": 1,
+      "type": "LoadImage",
+      "pos": [170.55728894250745, 515.6401487466619],
+      "size": [282.8166809082031, 363.8333435058594],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [],
+      "outputs": [
+        {
+          "name": "IMAGE",
+          "type": "IMAGE",
+          "links": [7, 9]
+        },
+        {
+          "name": "MASK",
+          "type": "MASK",
+          "links": null
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "LoadImage"
+      },
+      "widgets_values": ["example.png", "image"]
+    },
+    {
+      "id": 7,
+      "type": "21dea088-e1b4-47a4-a01f-3d1bf4504001",
+      "pos": [500.2639113468392, 519.9960755960157],
+      "size": [464.95001220703125, 615.8333129882812],
+      "flags": {},
+      "order": 1,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "images",
+          "type": "IMAGE",
+          "link": 7
+        }
+      ],
+      "outputs": [
+        {
+          "name": "IMAGE",
+          "type": "IMAGE",
+          "links": [10]
+        }
+      ],
+      "properties": {
+        "proxyWidgets": [
+          ["2", "$$canvas-image-preview"],
+          ["4", "$$canvas-image-preview"]
+        ]
+      },
+      "widgets_values": []
+    },
+    {
+      "id": 8,
+      "type": "a7a0350a-af99-4d26-9391-450b4f726206",
+      "pos": [1000.5293620197185, 499.9253405678786],
+      "size": [225, 359.8333435058594],
+      "flags": {},
+      "order": 2,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "image1",
+          "type": "IMAGE",
+          "link": 9
+        },
+        {
+          "name": "image2",
+          "type": "IMAGE",
+          "link": 10
+        }
+      ],
+      "outputs": [],
+      "properties": {
+        "proxyWidgets": [["6", "$$canvas-image-preview"]]
+      },
+      "widgets_values": []
+    }
+  ],
+  "links": [
+    [7, 1, 0, 7, 0, "IMAGE"],
+    [9, 1, 0, 8, 0, "IMAGE"],
+    [10, 7, 0, 8, 1, "IMAGE"]
+  ],
+  "groups": [],
+  "definitions": {
+    "subgraphs": [
+      {
+        "id": "21dea088-e1b4-47a4-a01f-3d1bf4504001",
+        "version": 1,
+        "state": {
+          "lastGroupId": 0,
+          "lastNodeId": 8,
+          "lastLinkId": 10,
+          "lastRerouteId": 0
+        },
+        "revision": 0,
+        "config": {},
+        "name": "New Subgraph",
+        "inputNode": {
+          "id": -10,
+          "bounding": [297.7833638107301, 502.6302057820892, 120, 60]
+        },
+        "outputNode": {
+          "id": -20,
+          "bounding": [1052.8175480718996, 502.6302057820892, 120, 60]
+        },
+        "inputs": [
+          {
+            "id": "afc8dbc3-12e6-4b3c-9840-9b398d06e6bd",
+            "name": "images",
+            "type": "IMAGE",
+            "linkIds": [1, 2],
+            "localized_name": "images",
+            "pos": [397.7833638107301, 522.6302057820892]
+          }
+        ],
+        "outputs": [
+          {
+            "id": "d0a84974-5f4d-4f4b-b23a-2e7288a9689d",
+            "name": "IMAGE",
+            "type": "IMAGE",
+            "linkIds": [5],
+            "localized_name": "IMAGE",
+            "pos": [1072.8175480718996, 522.6302057820892]
+          }
+        ],
+        "widgets": [],
+        "nodes": [
+          {
+            "id": 4,
+            "type": "PreviewImage",
+            "pos": [767.8225773415076, 602.8695134060456],
+            "size": [225, 303.8333435058594],
+            "flags": {},
+            "order": 2,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "images",
+                "name": "images",
+                "type": "IMAGE",
+                "link": 3
+              }
+            ],
+            "outputs": [],
+            "properties": {
+              "Node name for S&R": "PreviewImage"
+            },
+            "widgets_values": []
+          },
+          {
+            "id": 2,
+            "type": "PreviewImage",
+            "pos": [754.9358989867657, 188.55375831225257],
+            "size": [225, 303.8333435058594],
+            "flags": {},
+            "order": 0,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "images",
+                "name": "images",
+                "type": "IMAGE",
+                "link": 1
+              }
+            ],
+            "outputs": [],
+            "properties": {
+              "Node name for S&R": "PreviewImage"
+            },
+            "widgets_values": []
+          },
+          {
+            "id": 3,
+            "type": "ImageInvert",
+            "pos": [477.783932416778, 542.2440719627998],
+            "size": [225, 71.83333587646484],
+            "flags": {
+              "collapsed": false
+            },
+            "order": 1,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "image",
+                "name": "image",
+                "type": "IMAGE",
+                "link": 2
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "IMAGE",
+                "name": "IMAGE",
+                "type": "IMAGE",
+                "links": [3, 5]
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "ImageInvert"
+            },
+            "widgets_values": []
+          }
+        ],
+        "groups": [],
+        "links": [
+          {
+            "id": 3,
+            "origin_id": 3,
+            "origin_slot": 0,
+            "target_id": 4,
+            "target_slot": 0,
+            "type": "IMAGE"
+          },
+          {
+            "id": 1,
+            "origin_id": -10,
+            "origin_slot": 0,
+            "target_id": 2,
+            "target_slot": 0,
+            "type": "IMAGE"
+          },
+          {
+            "id": 2,
+            "origin_id": -10,
+            "origin_slot": 0,
+            "target_id": 3,
+            "target_slot": 0,
+            "type": "IMAGE"
+          },
+          {
+            "id": 5,
+            "origin_id": 3,
+            "origin_slot": 0,
+            "target_id": -20,
+            "target_slot": 0,
+            "type": "IMAGE"
+          }
+        ],
+        "extra": {}
+      },
+      {
+        "id": "a7a0350a-af99-4d26-9391-450b4f726206",
+        "version": 1,
+        "state": {
+          "lastGroupId": 0,
+          "lastNodeId": 8,
+          "lastLinkId": 10,
+          "lastRerouteId": 0
+        },
+        "revision": 0,
+        "config": {},
+        "name": "New Subgraph",
+        "inputNode": {
+          "id": -10,
+          "bounding": [973.7423316105073, 561.9744246746379, 120, 80]
+        },
+        "outputNode": {
+          "id": -20,
+          "bounding": [1905.487372786412, 581.9744246746379, 120, 40]
+        },
+        "inputs": [
+          {
+            "id": "20ac4159-6814-4d40-a217-ea260152b689",
+            "name": "image1",
+            "type": "IMAGE",
+            "linkIds": [4],
+            "localized_name": "image1",
+            "pos": [1073.7423316105073, 581.9744246746379]
+          },
+          {
+            "id": "c3759a8c-914e-4450-bc41-ca683ffce96b",
+            "name": "image2",
+            "type": "IMAGE",
+            "linkIds": [8],
+            "localized_name": "image2",
+            "shape": 7,
+            "pos": [1073.7423316105073, 601.9744246746379]
+          }
+        ],
+        "outputs": [],
+        "widgets": [],
+        "nodes": [
+          {
+            "id": 5,
+            "type": "ImageStitch",
+            "pos": [1153.7423085222254, 396.2033931749105],
+            "size": [270, 225.1666717529297],
+            "flags": {},
+            "order": 0,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "image1",
+                "name": "image1",
+                "type": "IMAGE",
+                "link": 4
+              },
+              {
+                "localized_name": "image2",
+                "name": "image2",
+                "shape": 7,
+                "type": "IMAGE",
+                "link": 8
+              }
+            ],
+            "outputs": [
+              {
+                "localized_name": "IMAGE",
+                "name": "IMAGE",
+                "type": "IMAGE",
+                "links": [6]
+              }
+            ],
+            "properties": {
+              "Node name for S&R": "ImageStitch"
+            },
+            "widgets_values": ["right", true, 0, "white"]
+          },
+          {
+            "id": 6,
+            "type": "PreviewImage",
+            "pos": [1620.4874189629757, 529.9122050216333],
+            "size": [225, 307.8333435058594],
+            "flags": {},
+            "order": 1,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "images",
+                "name": "images",
+                "type": "IMAGE",
+                "link": 6
+              }
+            ],
+            "outputs": [],
+            "properties": {
+              "Node name for S&R": "PreviewImage"
+            },
+            "widgets_values": []
+          }
+        ],
+        "groups": [],
+        "links": [
+          {
+            "id": 6,
+            "origin_id": 5,
+            "origin_slot": 0,
+            "target_id": 6,
+            "target_slot": 0,
+            "type": "IMAGE"
+          },
+          {
+            "id": 4,
+            "origin_id": -10,
+            "origin_slot": 0,
+            "target_id": 5,
+            "target_slot": 0,
+            "type": "IMAGE"
+          },
+          {
+            "id": 8,
+            "origin_id": -10,
+            "origin_slot": 1,
+            "target_id": 5,
+            "target_slot": 1,
+            "type": "IMAGE"
+          }
+        ],
+        "extra": {}
+      }
+    ]
+  },
+  "config": {},
+  "extra": {
+    "ds": {
+      "scale": 0.7269777827561446,
+      "offset": [-35.273237658266034, -55.17394203309256]
+    },
+    "frontendVersion": "1.40.8"
+  },
+  "version": 0.4
+}
diff --git a/browser_tests/assets/subgraphs/subgraph-with-multiple-promoted-widgets.json b/browser_tests/assets/subgraphs/subgraph-with-multiple-promoted-widgets.json
index d40b6f783d..dd00e9b493 100644
--- a/browser_tests/assets/subgraphs/subgraph-with-multiple-promoted-widgets.json
+++ b/browser_tests/assets/subgraphs/subgraph-with-multiple-promoted-widgets.json
@@ -7,14 +7,8 @@
     {
       "id": 11,
       "type": "422723e8-4bf6-438c-823f-881ca81acead",
-      "pos": [
-        791.59912109375,
-        386.13336181640625
-      ],
-      "size": [
-        210,
-        202
-      ],
+      "pos": [791.59912109375, 386.13336181640625],
+      "size": [210, 202],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -48,10 +42,7 @@
         }
       ],
       "properties": {},
-      "widgets_values": [
-        "",
-        ""
-      ]
+      "widgets_values": ["", ""]
     }
   ],
   "links": [],
@@ -72,30 +63,18 @@
         "name": "New Subgraph",
         "inputNode": {
           "id": -10,
-          "bounding": [
-            481.59912109375,
-            379.13336181640625,
-            120,
-            160
-          ]
+          "bounding": [481.59912109375, 379.13336181640625, 120, 160]
         },
         "outputNode": {
           "id": -20,
-          "bounding": [
-            1121.59912109375,
-            379.13336181640625,
-            128.6640625,
-            60
-          ]
+          "bounding": [1121.59912109375, 379.13336181640625, 128.6640625, 60]
         },
         "inputs": [
           {
             "id": "0f07c10e-5705-4764-9b24-b69606c6dbcc",
             "name": "text",
             "type": "STRING",
-            "linkIds": [
-              10
-            ],
+            "linkIds": [10],
             "pos": {
               "0": 581.59912109375,
               "1": 399.13336181640625
@@ -105,9 +84,7 @@
             "id": "736e5a03-0f7f-4e48-93e4-fd66ea6c30f1",
             "name": "text_1",
             "type": "STRING",
-            "linkIds": [
-              11
-            ],
+            "linkIds": [11],
             "pos": {
               "0": 581.59912109375,
               "1": 419.13336181640625
@@ -117,9 +94,7 @@
             "id": "b62e7a0b-cc7e-4ca5-a4e1-c81607a13f58",
             "name": "model",
             "type": "MODEL",
-            "linkIds": [
-              13
-            ],
+            "linkIds": [13],
             "pos": {
               "0": 581.59912109375,
               "1": 439.13336181640625
@@ -129,9 +104,7 @@
             "id": "7a2628da-4879-4f82-a7d3-7b1c00db50a5",
             "name": "positive",
             "type": "CONDITIONING",
-            "linkIds": [
-              14
-            ],
+            "linkIds": [14],
             "pos": {
               "0": 581.59912109375,
               "1": 459.13336181640625
@@ -141,9 +114,7 @@
             "id": "651cf4ad-e8bf-47f6-b181-8f8aeacd6669",
             "name": "negative",
             "type": "CONDITIONING",
-            "linkIds": [
-              15
-            ],
+            "linkIds": [15],
             "pos": {
               "0": 581.59912109375,
               "1": 479.13336181640625
@@ -153,9 +124,7 @@
             "id": "c41765ea-61ef-4a77-8cc6-74113903078f",
             "name": "latent_image",
             "type": "LATENT",
-            "linkIds": [
-              16
-            ],
+            "linkIds": [16],
             "pos": {
               "0": 581.59912109375,
               "1": 499.13336181640625
@@ -167,9 +136,7 @@
             "id": "55dd1505-12bd-4cb4-8e75-031a97bb4387",
             "name": "CONDITIONING",
             "type": "CONDITIONING",
-            "linkIds": [
-              12
-            ],
+            "linkIds": [12],
             "pos": {
               "0": 1141.59912109375,
               "1": 399.13336181640625
@@ -181,14 +148,8 @@
           {
             "id": 10,
             "type": "CLIPTextEncode",
-            "pos": [
-              661.59912109375,
-              314.13336181640625
-            ],
-            "size": [
-              400,
-              200
-            ],
+            "pos": [661.59912109375, 314.13336181640625],
+            "size": [400, 200],
             "flags": {},
             "order": 1,
             "mode": 0,
@@ -220,21 +181,13 @@
             "properties": {
               "Node name for S&R": "CLIPTextEncode"
             },
-            "widgets_values": [
-              ""
-            ]
+            "widgets_values": [""]
           },
           {
             "id": 11,
             "type": "CLIPTextEncode",
-            "pos": [
-              668.755859375,
-              571.7766723632812
-            ],
-            "size": [
-              400,
-              200
-            ],
+            "pos": [668.755859375, 571.7766723632812],
+            "size": [400, 200],
             "flags": {},
             "order": 2,
             "mode": 0,
@@ -260,29 +213,19 @@
                 "localized_name": "CONDITIONING",
                 "name": "CONDITIONING",
                 "type": "CONDITIONING",
-                "links": [
-                  12
-                ]
+                "links": [12]
               }
             ],
             "properties": {
               "Node name for S&R": "CLIPTextEncode"
             },
-            "widgets_values": [
-              ""
-            ]
+            "widgets_values": [""]
           },
           {
             "id": 12,
             "type": "KSampler",
-            "pos": [
-              671.7379760742188,
-              1.621593713760376
-            ],
-            "size": [
-              270,
-              262
-            ],
+            "pos": [671.7379760742188, 1.621593713760376],
+            "size": [270, 262],
             "flags": {},
             "order": 0,
             "mode": 0,
@@ -323,15 +266,7 @@
             "properties": {
               "Node name for S&R": "KSampler"
             },
-            "widgets_values": [
-              0,
-              "randomize",
-              20,
-              8,
-              "euler",
-              "simple",
-              1
-            ]
+            "widgets_values": [0, "randomize", 20, 8, "euler", "simple", 1]
           }
         ],
         "groups": [],
@@ -401,12 +336,9 @@
   "extra": {
     "ds": {
       "scale": 0.9581355200690549,
-      "offset": [
-        184.687451089395,
-        80.38288288288285
-      ]
+      "offset": [184.687451089395, 80.38288288288285]
     },
     "frontendVersion": "1.24.1"
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/subgraphs/subgraph-with-preview-node.json b/browser_tests/assets/subgraphs/subgraph-with-preview-node.json
new file mode 100644
index 0000000000..7db8b388cc
--- /dev/null
+++ b/browser_tests/assets/subgraphs/subgraph-with-preview-node.json
@@ -0,0 +1,170 @@
+{
+  "id": "preview-subgraph-test-001",
+  "revision": 0,
+  "last_node_id": 11,
+  "last_link_id": 2,
+  "nodes": [
+    {
+      "id": 5,
+      "type": "a1b2c3d4-e5f6-7890-abcd-ef1234567890",
+      "pos": [318.6320139868054, 212.9091015141833],
+      "size": [225, 368],
+      "flags": {},
+      "order": 1,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "images",
+          "type": "IMAGE",
+          "link": 2
+        }
+      ],
+      "outputs": [],
+      "properties": {
+        "proxyWidgets": [
+          ["10", "filename_prefix"],
+          ["10", "$$canvas-image-preview"]
+        ],
+        "cnr_id": "comfy-core",
+        "ver": "0.13.0",
+        "ue_properties": {
+          "widget_ue_connectable": {},
+          "version": "7.6.2",
+          "input_ue_unconnectable": {}
+        }
+      },
+      "widgets_values": []
+    },
+    {
+      "id": 11,
+      "type": "LoadImage",
+      "pos": [-0.5080003681592018, 211.3051121416672],
+      "size": [282.8333435058594, 364],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [],
+      "outputs": [
+        {
+          "name": "IMAGE",
+          "type": "IMAGE",
+          "links": [2]
+        },
+        {
+          "name": "MASK",
+          "type": "MASK",
+          "links": null
+        }
+      ],
+      "properties": {
+        "ue_properties": {
+          "widget_ue_connectable": {},
+          "input_ue_unconnectable": {}
+        },
+        "cnr_id": "comfy-core",
+        "ver": "0.13.0",
+        "Node name for S&R": "LoadImage"
+      },
+      "widgets_values": ["example.png", "image"]
+    }
+  ],
+  "links": [[2, 11, 0, 5, 0, "IMAGE"]],
+  "groups": [],
+  "definitions": {
+    "subgraphs": [
+      {
+        "id": "a1b2c3d4-e5f6-7890-abcd-ef1234567890",
+        "version": 1,
+        "state": {
+          "lastGroupId": 0,
+          "lastNodeId": 11,
+          "lastLinkId": 2,
+          "lastRerouteId": 0
+        },
+        "revision": 0,
+        "config": {},
+        "name": "New Subgraph",
+        "inputNode": {
+          "id": -10,
+          "bounding": [300, 350, 120, 60]
+        },
+        "outputNode": {
+          "id": -20,
+          "bounding": [900, 350, 120, 40]
+        },
+        "inputs": [
+          {
+            "id": "img-slot-001",
+            "name": "images",
+            "type": "IMAGE",
+            "linkIds": [1],
+            "pos": [400, 370]
+          }
+        ],
+        "outputs": [],
+        "widgets": [],
+        "nodes": [
+          {
+            "id": 10,
+            "type": "SaveImage",
+            "pos": [500.0046924937855, 300.0146992076527],
+            "size": [315, 340],
+            "flags": {},
+            "order": 0,
+            "mode": 0,
+            "inputs": [
+              {
+                "localized_name": "images",
+                "name": "images",
+                "type": "IMAGE",
+                "link": 1
+              }
+            ],
+            "outputs": [],
+            "properties": {
+              "cnr_id": "comfy-core",
+              "ver": "0.13.0",
+              "Node name for S&R": "SaveImage",
+              "ue_properties": {
+                "widget_ue_connectable": {},
+                "version": "7.6.2",
+                "input_ue_unconnectable": {}
+              }
+            },
+            "widgets_values": ["ComfyUI"]
+          }
+        ],
+        "groups": [],
+        "links": [
+          {
+            "id": 1,
+            "origin_id": -10,
+            "origin_slot": 0,
+            "target_id": 10,
+            "target_slot": 0,
+            "type": "IMAGE"
+          }
+        ],
+        "extra": {
+          "ue_links": [],
+          "links_added_by_ue": []
+        }
+      }
+    ]
+  },
+  "config": {},
+  "extra": {
+    "ds": {
+      "scale": 1.1819400303977265,
+      "offset": [81.66005130613983, -19.028558221588725]
+    },
+    "frontendVersion": "1.40.3",
+    "ue_links": [],
+    "links_added_by_ue": [],
+    "VHS_latentpreview": false,
+    "VHS_latentpreviewrate": 0,
+    "VHS_MetadataImage": true,
+    "VHS_KeepIntermediate": true
+  },
+  "version": 0.4
+}
diff --git a/browser_tests/assets/subgraphs/subgraph-with-promoted-text-widget.json b/browser_tests/assets/subgraphs/subgraph-with-promoted-text-widget.json
index 025aec8002..a6fbc60083 100644
--- a/browser_tests/assets/subgraphs/subgraph-with-promoted-text-widget.json
+++ b/browser_tests/assets/subgraphs/subgraph-with-promoted-text-widget.json
@@ -7,14 +7,8 @@
     {
       "id": 11,
       "type": "422723e8-4bf6-438c-823f-881ca81acead",
-      "pos": [
-        400,
-        300
-      ],
-      "size": [
-        210,
-        168
-      ],
+      "pos": [400, 300],
+      "size": [210, 168],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -47,9 +41,7 @@
       ],
       "outputs": [],
       "properties": {},
-      "widgets_values": [
-        ""
-      ]
+      "widgets_values": [""]
     }
   ],
   "links": [],
@@ -70,30 +62,18 @@
         "name": "New Subgraph",
         "inputNode": {
           "id": -10,
-          "bounding": [
-            481.59912109375,
-            379.13336181640625,
-            120,
-            160
-          ]
+          "bounding": [481.59912109375, 379.13336181640625, 120, 160]
         },
         "outputNode": {
           "id": -20,
-          "bounding": [
-            1121.59912109375,
-            379.13336181640625,
-            120,
-            40
-          ]
+          "bounding": [1121.59912109375, 379.13336181640625, 120, 40]
         },
         "inputs": [
           {
             "id": "0f07c10e-5705-4764-9b24-b69606c6dbcc",
             "name": "text",
             "type": "STRING",
-            "linkIds": [
-              10
-            ],
+            "linkIds": [10],
             "pos": {
               "0": 581.59912109375,
               "1": 399.13336181640625
@@ -103,9 +83,7 @@
             "id": "214a5060-24dd-4299-ab78-8027dc5b9c59",
             "name": "clip",
             "type": "CLIP",
-            "linkIds": [
-              11
-            ],
+            "linkIds": [11],
             "pos": {
               "0": 581.59912109375,
               "1": 419.13336181640625
@@ -115,9 +93,7 @@
             "id": "8ab94c5d-e7df-433c-9177-482a32340552",
             "name": "model",
             "type": "MODEL",
-            "linkIds": [
-              12
-            ],
+            "linkIds": [12],
             "pos": {
               "0": 581.59912109375,
               "1": 439.13336181640625
@@ -127,9 +103,7 @@
             "id": "8a4cd719-8c67-473b-9b44-ac0582d02641",
             "name": "positive",
             "type": "CONDITIONING",
-            "linkIds": [
-              13
-            ],
+            "linkIds": [13],
             "pos": {
               "0": 581.59912109375,
               "1": 459.13336181640625
@@ -139,9 +113,7 @@
             "id": "a78d6b3a-ad40-4300-b0a5-2cdbdb8dc135",
             "name": "negative",
             "type": "CONDITIONING",
-            "linkIds": [
-              14
-            ],
+            "linkIds": [14],
             "pos": {
               "0": 581.59912109375,
               "1": 479.13336181640625
@@ -151,9 +123,7 @@
             "id": "4c7abe0c-902d-49ef-a5b0-cbf02b50b693",
             "name": "latent_image",
             "type": "LATENT",
-            "linkIds": [
-              15
-            ],
+            "linkIds": [15],
             "pos": {
               "0": 581.59912109375,
               "1": 499.13336181640625
@@ -166,14 +136,8 @@
           {
             "id": 10,
             "type": "CLIPTextEncode",
-            "pos": [
-              661.59912109375,
-              314.13336181640625
-            ],
-            "size": [
-              400,
-              200
-            ],
+            "pos": [661.59912109375, 314.13336181640625],
+            "size": [400, 200],
             "flags": {},
             "order": 1,
             "mode": 0,
@@ -205,21 +169,13 @@
             "properties": {
               "Node name for S&R": "CLIPTextEncode"
             },
-            "widgets_values": [
-              ""
-            ]
+            "widgets_values": [""]
           },
           {
             "id": 11,
             "type": "KSampler",
-            "pos": [
-              674.1234741210938,
-              570.5839233398438
-            ],
-            "size": [
-              270,
-              262
-            ],
+            "pos": [674.1234741210938, 570.5839233398438],
+            "size": [270, 262],
             "flags": {},
             "order": 0,
             "mode": 0,
@@ -260,15 +216,7 @@
             "properties": {
               "Node name for S&R": "KSampler"
             },
-            "widgets_values": [
-              0,
-              "randomize",
-              20,
-              8,
-              "euler",
-              "simple",
-              1
-            ]
+            "widgets_values": [0, "randomize", 20, 8, "euler", "simple", 1]
           }
         ],
         "groups": [],
@@ -330,12 +278,9 @@
   "extra": {
     "ds": {
       "scale": 0.9581355200690549,
-      "offset": [
-        258.6405769416877,
-        147.17927927927929
-      ]
+      "offset": [258.6405769416877, 147.17927927927929]
     },
     "frontendVersion": "1.24.1"
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/subgraphs/subgraph-with-text-widget.json b/browser_tests/assets/subgraphs/subgraph-with-text-widget.json
index c23b5e6832..248e9c831b 100644
--- a/browser_tests/assets/subgraphs/subgraph-with-text-widget.json
+++ b/browser_tests/assets/subgraphs/subgraph-with-text-widget.json
@@ -7,14 +7,8 @@
     {
       "id": 11,
       "type": "422723e8-4bf6-438c-823f-881ca81acead",
-      "pos": [
-        791.59912109375,
-        386.13336181640625
-      ],
-      "size": [
-        140,
-        26
-      ],
+      "pos": [791.59912109375, 386.13336181640625],
+      "size": [140, 26],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -48,30 +42,18 @@
         "name": "New Subgraph",
         "inputNode": {
           "id": -10,
-          "bounding": [
-            481.59912109375,
-            379.13336181640625,
-            120,
-            60
-          ]
+          "bounding": [481.59912109375, 379.13336181640625, 120, 60]
         },
         "outputNode": {
           "id": -20,
-          "bounding": [
-            1121.59912109375,
-            379.13336181640625,
-            120,
-            40
-          ]
+          "bounding": [1121.59912109375, 379.13336181640625, 120, 40]
         },
         "inputs": [
           {
             "id": "79e69fca-ad12-499b-8d9b-9f1656b85354",
             "name": "clip",
             "type": "CLIP",
-            "linkIds": [
-              10
-            ],
+            "linkIds": [10],
             "pos": {
               "0": 581.59912109375,
               "1": 399.13336181640625
@@ -84,14 +66,8 @@
           {
             "id": 10,
             "type": "CLIPTextEncode",
-            "pos": [
-              661.59912109375,
-              314.13336181640625
-            ],
-            "size": [
-              400,
-              200
-            ],
+            "pos": [661.59912109375, 314.13336181640625],
+            "size": [400, 200],
             "flags": {},
             "order": 0,
             "mode": 0,
@@ -114,9 +90,7 @@
             "properties": {
               "Node name for S&R": "CLIPTextEncode"
             },
-            "widgets_values": [
-              ""
-            ]
+            "widgets_values": [""]
           }
         ],
         "groups": [],
@@ -143,11 +117,8 @@
     "VHS_KeepIntermediate": true,
     "ds": {
       "scale": 0.9581355200690549,
-      "offset": [
-        258.6405769416877,
-        147.17927927927929
-      ]
+      "offset": [258.6405769416877, 147.17927927927929]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/viewport/default-viewport-saved-offscreen.json b/browser_tests/assets/viewport/default-viewport-saved-offscreen.json
index 348c8aee13..69493e057a 100644
--- a/browser_tests/assets/viewport/default-viewport-saved-offscreen.json
+++ b/browser_tests/assets/viewport/default-viewport-saved-offscreen.json
@@ -7,14 +7,8 @@
     {
       "id": 4,
       "type": "CheckpointLoaderSimple",
-      "pos": [
-        60,
-        200
-      ],
-      "size": [
-        315,
-        98
-      ],
+      "pos": [60, 200],
+      "size": [315, 98],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -24,26 +18,19 @@
           "name": "MODEL",
           "type": "MODEL",
           "slot_index": 0,
-          "links": [
-            1
-          ]
+          "links": [1]
         },
         {
           "name": "CLIP",
           "type": "CLIP",
           "slot_index": 1,
-          "links": [
-            3,
-            5
-          ]
+          "links": [3, 5]
         },
         {
           "name": "VAE",
           "type": "VAE",
           "slot_index": 2,
-          "links": [
-            8
-          ]
+          "links": [8]
         }
       ],
       "properties": {
@@ -58,21 +45,13 @@
           }
         ]
       },
-      "widgets_values": [
-        "v1-5-pruned-emaonly-fp16.safetensors"
-      ]
+      "widgets_values": ["v1-5-pruned-emaonly-fp16.safetensors"]
     },
     {
       "id": 3,
       "type": "KSampler",
-      "pos": [
-        870,
-        170
-      ],
-      "size": [
-        315,
-        474
-      ],
+      "pos": [870, 170],
+      "size": [315, 474],
       "flags": {},
       "order": 4,
       "mode": 0,
@@ -103,9 +82,7 @@
           "name": "LATENT",
           "type": "LATENT",
           "slot_index": 0,
-          "links": [
-            7
-          ]
+          "links": [7]
         }
       ],
       "properties": {
@@ -126,14 +103,8 @@
     {
       "id": 8,
       "type": "VAEDecode",
-      "pos": [
-        975,
-        700
-      ],
-      "size": [
-        210,
-        46
-      ],
+      "pos": [975, 700],
+      "size": [210, 46],
       "flags": {},
       "order": 5,
       "mode": 0,
@@ -167,14 +138,8 @@
     {
       "id": 7,
       "type": "CLIPTextEncode",
-      "pos": [
-        410,
-        410
-      ],
-      "size": [
-        425.27801513671875,
-        180.6060791015625
-      ],
+      "pos": [410, 410],
+      "size": [425.27801513671875, 180.6060791015625],
       "flags": {},
       "order": 3,
       "mode": 0,
@@ -190,9 +155,7 @@
           "name": "CONDITIONING",
           "type": "CONDITIONING",
           "slot_index": 0,
-          "links": [
-            6
-          ]
+          "links": [6]
         }
       ],
       "properties": {
@@ -200,23 +163,15 @@
         "cnr_id": "comfy-core",
         "ver": "0.3.65"
       },
-      "widgets_values": [
-        "text, watermark"
-      ],
+      "widgets_values": ["text, watermark"],
       "color": "#223",
       "bgcolor": "#335"
     },
     {
       "id": 5,
       "type": "EmptyLatentImage",
-      "pos": [
-        520,
-        690
-      ],
-      "size": [
-        315,
-        106
-      ],
+      "pos": [520, 690],
+      "size": [315, 106],
       "flags": {},
       "order": 1,
       "mode": 0,
@@ -226,9 +181,7 @@
           "name": "LATENT",
           "type": "LATENT",
           "slot_index": 0,
-          "links": [
-            2
-          ]
+          "links": [2]
         }
       ],
       "properties": {
@@ -236,23 +189,13 @@
         "cnr_id": "comfy-core",
         "ver": "0.3.65"
       },
-      "widgets_values": [
-        512,
-        512,
-        1
-      ]
+      "widgets_values": [512, 512, 1]
     },
     {
       "id": 6,
       "type": "CLIPTextEncode",
-      "pos": [
-        411.21649169921875,
-        203.68695068359375
-      ],
-      "size": [
-        422.84503173828125,
-        164.31304931640625
-      ],
+      "pos": [411.21649169921875, 203.68695068359375],
+      "size": [422.84503173828125, 164.31304931640625],
       "flags": {},
       "order": 2,
       "mode": 0,
@@ -268,9 +211,7 @@
           "name": "CONDITIONING",
           "type": "CONDITIONING",
           "slot_index": 0,
-          "links": [
-            4
-          ]
+          "links": [4]
         }
       ],
       "properties": {
@@ -286,81 +227,20 @@
     }
   ],
   "links": [
-    [
-      1,
-      4,
-      0,
-      3,
-      0,
-      "MODEL"
-    ],
-    [
-      2,
-      5,
-      0,
-      3,
-      3,
-      "LATENT"
-    ],
-    [
-      3,
-      4,
-      1,
-      6,
-      0,
-      "CLIP"
-    ],
-    [
-      4,
-      6,
-      0,
-      3,
-      1,
-      "CONDITIONING"
-    ],
-    [
-      5,
-      4,
-      1,
-      7,
-      0,
-      "CLIP"
-    ],
-    [
-      6,
-      7,
-      0,
-      3,
-      2,
-      "CONDITIONING"
-    ],
-    [
-      7,
-      3,
-      0,
-      8,
-      0,
-      "LATENT"
-    ],
-    [
-      8,
-      4,
-      2,
-      8,
-      1,
-      "VAE"
-    ]
+    [1, 4, 0, 3, 0, "MODEL"],
+    [2, 5, 0, 3, 3, "LATENT"],
+    [3, 4, 1, 6, 0, "CLIP"],
+    [4, 6, 0, 3, 1, "CONDITIONING"],
+    [5, 4, 1, 7, 0, "CLIP"],
+    [6, 7, 0, 3, 2, "CONDITIONING"],
+    [7, 3, 0, 8, 0, "LATENT"],
+    [8, 4, 2, 8, 1, "VAE"]
   ],
   "groups": [
     {
       "id": 1,
       "title": "Step 1 - Load model",
-      "bounding": [
-        50,
-        130,
-        335,
-        181.60000610351562
-      ],
+      "bounding": [50, 130, 335, 181.60000610351562],
       "color": "#3f789e",
       "font_size": 24,
       "flags": {}
@@ -368,12 +248,7 @@
     {
       "id": 2,
       "title": "Step 3 - Image size",
-      "bounding": [
-        510,
-        620,
-        335,
-        189.60000610351562
-      ],
+      "bounding": [510, 620, 335, 189.60000610351562],
       "color": "#3f789e",
       "font_size": 24,
       "flags": {}
@@ -381,12 +256,7 @@
     {
       "id": 3,
       "title": "Step 2 - Prompt",
-      "bounding": [
-        400,
-        130,
-        445.27801513671875,
-        467.2060852050781
-      ],
+      "bounding": [400, 130, 445.27801513671875, 467.2060852050781],
       "color": "#3f789e",
       "font_size": 24,
       "flags": {}
@@ -396,10 +266,7 @@
   "extra": {
     "ds": {
       "scale": 0.44218252181616574,
-      "offset": [
-        -666.5670907104311,
-        -2227.894644048147
-      ]
+      "offset": [-666.5670907104311, -2227.894644048147]
     },
     "frontendVersion": "1.35.3",
     "VHS_latentpreview": false,
@@ -409,4 +276,4 @@
     "workflowRendererVersion": "LG"
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/vueNodes/simple-triple.json b/browser_tests/assets/vueNodes/simple-triple.json
index 9b665191db..1a39cf916c 100644
--- a/browser_tests/assets/vueNodes/simple-triple.json
+++ b/browser_tests/assets/vueNodes/simple-triple.json
@@ -1 +1,166 @@
-{"id":"4412323e-2509-4258-8abc-68ddeea8f9e1","revision":0,"last_node_id":39,"last_link_id":29,"nodes":[{"id":37,"type":"KSampler","pos":[3635.923095703125,870.237548828125],"size":[428,437],"flags":{},"order":0,"mode":0,"inputs":[{"localized_name":"model","name":"model","type":"MODEL","link":null},{"localized_name":"positive","name":"positive","type":"CONDITIONING","link":null},{"localized_name":"negative","name":"negative","type":"CONDITIONING","link":null},{"localized_name":"latent_image","name":"latent_image","type":"LATENT","link":null},{"localized_name":"seed","name":"seed","type":"INT","widget":{"name":"seed"},"link":null},{"localized_name":"steps","name":"steps","type":"INT","widget":{"name":"steps"},"link":null},{"localized_name":"cfg","name":"cfg","type":"FLOAT","widget":{"name":"cfg"},"link":null},{"localized_name":"sampler_name","name":"sampler_name","type":"COMBO","widget":{"name":"sampler_name"},"link":null},{"localized_name":"scheduler","name":"scheduler","type":"COMBO","widget":{"name":"scheduler"},"link":null},{"localized_name":"denoise","name":"denoise","type":"FLOAT","widget":{"name":"denoise"},"link":null}],"outputs":[{"localized_name":"LATENT","name":"LATENT","type":"LATENT","links":null}],"properties":{"Node name for S&R":"KSampler"},"widgets_values":[0,"randomize",20,8,"euler","simple",1]},{"id":38,"type":"VAEDecode","pos":[4164.01611328125,925.5230712890625],"size":[193.25,107],"flags":{},"order":1,"mode":0,"inputs":[{"localized_name":"samples","name":"samples","type":"LATENT","link":null},{"localized_name":"vae","name":"vae","type":"VAE","link":null}],"outputs":[{"localized_name":"IMAGE","name":"IMAGE","type":"IMAGE","links":null}],"properties":{"Node name for S&R":"VAEDecode"}},{"id":39,"type":"CLIPTextEncode","pos":[3259.289794921875,927.2508544921875],"size":[239.9375,155],"flags":{},"order":2,"mode":0,"inputs":[{"localized_name":"clip","name":"clip","type":"CLIP","link":null},{"localized_name":"text","name":"text","type":"STRING","widget":{"name":"text"},"link":null}],"outputs":[{"localized_name":"CONDITIONING","name":"CONDITIONING","type":"CONDITIONING","links":null}],"properties":{"Node name for S&R":"CLIPTextEncode"},"widgets_values":[""]}],"links":[],"groups":[],"config":{},"extra":{"ds":{"scale":1.1576250000000001,"offset":[-2808.366467322067,-478.34316506594797]}},"version":0.4}
\ No newline at end of file
+{
+  "id": "4412323e-2509-4258-8abc-68ddeea8f9e1",
+  "revision": 0,
+  "last_node_id": 39,
+  "last_link_id": 29,
+  "nodes": [
+    {
+      "id": 37,
+      "type": "KSampler",
+      "pos": [3635.923095703125, 870.237548828125],
+      "size": [428, 437],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [
+        {
+          "localized_name": "model",
+          "name": "model",
+          "type": "MODEL",
+          "link": null
+        },
+        {
+          "localized_name": "positive",
+          "name": "positive",
+          "type": "CONDITIONING",
+          "link": null
+        },
+        {
+          "localized_name": "negative",
+          "name": "negative",
+          "type": "CONDITIONING",
+          "link": null
+        },
+        {
+          "localized_name": "latent_image",
+          "name": "latent_image",
+          "type": "LATENT",
+          "link": null
+        },
+        {
+          "localized_name": "seed",
+          "name": "seed",
+          "type": "INT",
+          "widget": { "name": "seed" },
+          "link": null
+        },
+        {
+          "localized_name": "steps",
+          "name": "steps",
+          "type": "INT",
+          "widget": { "name": "steps" },
+          "link": null
+        },
+        {
+          "localized_name": "cfg",
+          "name": "cfg",
+          "type": "FLOAT",
+          "widget": { "name": "cfg" },
+          "link": null
+        },
+        {
+          "localized_name": "sampler_name",
+          "name": "sampler_name",
+          "type": "COMBO",
+          "widget": { "name": "sampler_name" },
+          "link": null
+        },
+        {
+          "localized_name": "scheduler",
+          "name": "scheduler",
+          "type": "COMBO",
+          "widget": { "name": "scheduler" },
+          "link": null
+        },
+        {
+          "localized_name": "denoise",
+          "name": "denoise",
+          "type": "FLOAT",
+          "widget": { "name": "denoise" },
+          "link": null
+        }
+      ],
+      "outputs": [
+        {
+          "localized_name": "LATENT",
+          "name": "LATENT",
+          "type": "LATENT",
+          "links": null
+        }
+      ],
+      "properties": { "Node name for S&R": "KSampler" },
+      "widgets_values": [0, "randomize", 20, 8, "euler", "simple", 1]
+    },
+    {
+      "id": 38,
+      "type": "VAEDecode",
+      "pos": [4164.01611328125, 925.5230712890625],
+      "size": [193.25, 107],
+      "flags": {},
+      "order": 1,
+      "mode": 0,
+      "inputs": [
+        {
+          "localized_name": "samples",
+          "name": "samples",
+          "type": "LATENT",
+          "link": null
+        },
+        { "localized_name": "vae", "name": "vae", "type": "VAE", "link": null }
+      ],
+      "outputs": [
+        {
+          "localized_name": "IMAGE",
+          "name": "IMAGE",
+          "type": "IMAGE",
+          "links": null
+        }
+      ],
+      "properties": { "Node name for S&R": "VAEDecode" }
+    },
+    {
+      "id": 39,
+      "type": "CLIPTextEncode",
+      "pos": [3259.289794921875, 927.2508544921875],
+      "size": [239.9375, 155],
+      "flags": {},
+      "order": 2,
+      "mode": 0,
+      "inputs": [
+        {
+          "localized_name": "clip",
+          "name": "clip",
+          "type": "CLIP",
+          "link": null
+        },
+        {
+          "localized_name": "text",
+          "name": "text",
+          "type": "STRING",
+          "widget": { "name": "text" },
+          "link": null
+        }
+      ],
+      "outputs": [
+        {
+          "localized_name": "CONDITIONING",
+          "name": "CONDITIONING",
+          "type": "CONDITIONING",
+          "links": null
+        }
+      ],
+      "properties": { "Node name for S&R": "CLIPTextEncode" },
+      "widgets_values": [""]
+    }
+  ],
+  "links": [],
+  "groups": [],
+  "config": {},
+  "extra": {
+    "ds": {
+      "scale": 1.1576250000000001,
+      "offset": [-2808.366467322067, -478.34316506594797]
+    }
+  },
+  "version": 0.4
+}
diff --git a/browser_tests/assets/widgets/all_load_widgets.json b/browser_tests/assets/widgets/all_load_widgets.json
index b2d47fcbab..a2d05c03f5 100644
--- a/browser_tests/assets/widgets/all_load_widgets.json
+++ b/browser_tests/assets/widgets/all_load_widgets.json
@@ -7,14 +7,8 @@
     {
       "id": 1,
       "type": "LoadAudio",
-      "pos": [
-        41.52964782714844,
-        16.930862426757812
-      ],
-      "size": [
-        444,
-        125
-      ],
+      "pos": [41.52964782714844, 16.930862426757812],
+      "size": [444, 125],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -29,23 +23,13 @@
       "properties": {
         "Node name for S&R": "LoadAudio"
       },
-      "widgets_values": [
-        null,
-        null,
-        ""
-      ]
+      "widgets_values": [null, null, ""]
     },
     {
       "id": 2,
       "type": "LoadVideo",
-      "pos": [
-        502.28570556640625,
-        16.857147216796875
-      ],
-      "size": [
-        444,
-        525
-      ],
+      "pos": [502.28570556640625, 16.857147216796875],
+      "size": [444, 525],
       "flags": {},
       "order": 1,
       "mode": 0,
@@ -60,22 +44,13 @@
       "properties": {
         "Node name for S&R": "LoadVideo"
       },
-      "widgets_values": [
-        null,
-        "image"
-      ]
+      "widgets_values": [null, "image"]
     },
     {
       "id": 3,
       "type": "DevToolsLoadAnimatedImageTest",
-      "pos": [
-        41.71427917480469,
-        188.0000457763672
-      ],
-      "size": [
-        444,
-        553
-      ],
+      "pos": [41.71427917480469, 188.0000457763672],
+      "size": [444, 553],
       "flags": {},
       "order": 2,
       "mode": 0,
@@ -95,22 +70,13 @@
       "properties": {
         "Node name for S&R": "DevToolsLoadAnimatedImageTest"
       },
-      "widgets_values": [
-        null,
-        "image"
-      ]
+      "widgets_values": [null, "image"]
     },
     {
       "id": 5,
       "type": "LoadImage",
-      "pos": [
-        958.285888671875,
-        16.57145118713379
-      ],
-      "size": [
-        444,
-        553
-      ],
+      "pos": [958.285888671875, 16.57145118713379],
+      "size": [444, 553],
       "flags": {},
       "order": 3,
       "mode": 0,
@@ -130,22 +96,13 @@
       "properties": {
         "Node name for S&R": "LoadImage"
       },
-      "widgets_values": [
-        null,
-        "image"
-      ]
+      "widgets_values": [null, "image"]
     },
     {
       "id": 6,
       "type": "LoadImageMask",
-      "pos": [
-        503.4285888671875,
-        588
-      ],
-      "size": [
-        444,
-        563
-      ],
+      "pos": [503.4285888671875, 588],
+      "size": [444, 563],
       "flags": {},
       "order": 4,
       "mode": 0,
@@ -160,23 +117,13 @@
       "properties": {
         "Node name for S&R": "LoadImageMask"
       },
-      "widgets_values": [
-        null,
-        "alpha",
-        "image"
-      ]
+      "widgets_values": [null, "alpha", "image"]
     },
     {
       "id": 7,
       "type": "LoadImageOutput",
-      "pos": [
-        965.1429443359375,
-        612
-      ],
-      "size": [
-        444,
-        553
-      ],
+      "pos": [965.1429443359375, 612],
+      "size": [444, 553],
       "flags": {},
       "order": 5,
       "mode": 0,
@@ -196,12 +143,7 @@
       "properties": {
         "Node name for S&R": "LoadImageOutput"
       },
-      "widgets_values": [
-        null,
-        false,
-        "refresh",
-        "image"
-      ]
+      "widgets_values": [null, false, "refresh", "image"]
     }
   ],
   "links": [],
@@ -210,12 +152,9 @@
   "extra": {
     "ds": {
       "scale": 1,
-      "offset": [
-        0,
-        0
-      ]
+      "offset": [0, 0]
     },
     "frontendVersion": "1.28.3"
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/widgets/boolean_widget.json b/browser_tests/assets/widgets/boolean_widget.json
index 2c7d415f2e..6178c98995 100644
--- a/browser_tests/assets/widgets/boolean_widget.json
+++ b/browser_tests/assets/widgets/boolean_widget.json
@@ -5,14 +5,8 @@
     {
       "id": 11,
       "type": "DevToolsNodeWithBooleanInput",
-      "pos": [
-        0,
-        30
-      ],
-      "size": [
-        315,
-        58
-      ],
+      "pos": [0, 30],
+      "size": [315, 58],
       "flags": {
         "collapsed": false
       },
@@ -23,9 +17,7 @@
       "properties": {
         "Node name for S&R": "DevToolsNodeWithBooleanInput"
       },
-      "widgets_values": [
-        false
-      ]
+      "widgets_values": [false]
     }
   ],
   "links": [],
diff --git a/browser_tests/assets/widgets/load_image_widget.json b/browser_tests/assets/widgets/load_image_widget.json
index 1ba9e4158d..69c1e13618 100644
--- a/browser_tests/assets/widgets/load_image_widget.json
+++ b/browser_tests/assets/widgets/load_image_widget.json
@@ -5,14 +5,8 @@
     {
       "id": 10,
       "type": "LoadImage",
-      "pos": [
-        50,
-        50
-      ],
-      "size": [
-        315,
-        314
-      ],
+      "pos": [50, 50],
+      "size": [315, 314],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -32,10 +26,7 @@
       "properties": {
         "Node name for S&R": "LoadImage"
       },
-      "widgets_values": [
-        "example.png",
-        "image"
-      ]
+      "widgets_values": ["example.png", "image"]
     }
   ],
   "links": [],
diff --git a/browser_tests/assets/widgets/save_image_and_animated_webp.json b/browser_tests/assets/widgets/save_image_and_animated_webp.json
new file mode 100644
index 0000000000..b38b2ea03a
--- /dev/null
+++ b/browser_tests/assets/widgets/save_image_and_animated_webp.json
@@ -0,0 +1,86 @@
+{
+  "id": "save-image-and-webm-test",
+  "revision": 0,
+  "last_node_id": 12,
+  "last_link_id": 2,
+  "nodes": [
+    {
+      "id": 10,
+      "type": "LoadImage",
+      "pos": [50, 100],
+      "size": [315, 314],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [],
+      "outputs": [
+        {
+          "name": "IMAGE",
+          "type": "IMAGE",
+          "links": [1, 2]
+        },
+        {
+          "name": "MASK",
+          "type": "MASK",
+          "links": null
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "LoadImage"
+      },
+      "widgets_values": ["example.png", "image"]
+    },
+    {
+      "id": 11,
+      "type": "SaveImage",
+      "pos": [450, 100],
+      "size": [210, 270],
+      "flags": {},
+      "order": 1,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "images",
+          "type": "IMAGE",
+          "link": 1
+        }
+      ],
+      "outputs": [],
+      "properties": {},
+      "widgets_values": ["ComfyUI"]
+    },
+    {
+      "id": 12,
+      "type": "SaveWEBM",
+      "pos": [450, 450],
+      "size": [210, 368],
+      "flags": {},
+      "order": 2,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "images",
+          "type": "IMAGE",
+          "link": 2
+        }
+      ],
+      "outputs": [],
+      "properties": {},
+      "widgets_values": ["ComfyUI", "vp9", 6, 32]
+    }
+  ],
+  "links": [
+    [1, 10, 0, 11, 0, "IMAGE"],
+    [2, 10, 0, 12, 0, "IMAGE"]
+  ],
+  "groups": [],
+  "config": {},
+  "extra": {
+    "frontendVersion": "1.17.0",
+    "ds": {
+      "offset": [0, 0],
+      "scale": 1
+    }
+  },
+  "version": 0.4
+}
diff --git a/browser_tests/assets/widgets/seed_widget.json b/browser_tests/assets/widgets/seed_widget.json
index a554b3eb97..8f52932294 100644
--- a/browser_tests/assets/widgets/seed_widget.json
+++ b/browser_tests/assets/widgets/seed_widget.json
@@ -5,14 +5,8 @@
     {
       "id": 10,
       "type": "DevToolsNodeWithSeedInput",
-      "pos": [
-        20,
-        50
-      ],
-      "size": [
-        315,
-        82
-      ],
+      "pos": [20, 50],
+      "size": [315, 82],
       "flags": {},
       "order": 1,
       "mode": 0,
@@ -21,10 +15,7 @@
       "properties": {
         "Node name for S&R": "DevToolsNodeWithSeedInput"
       },
-      "widgets_values": [
-        0,
-        "randomize"
-      ]
+      "widgets_values": [0, "randomize"]
     }
   ],
   "links": [],
@@ -33,11 +24,8 @@
   "extra": {
     "ds": {
       "scale": 1,
-      "offset": [
-        0,
-        0
-      ]
+      "offset": [0, 0]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/browser_tests/assets/workflowInMedia/workflow_itxt.png b/browser_tests/assets/workflowInMedia/workflow_itxt.png
new file mode 100644
index 0000000000..95ce757bce
Binary files /dev/null and b/browser_tests/assets/workflowInMedia/workflow_itxt.png differ
diff --git a/browser_tests/fixtures/ComfyPage.ts b/browser_tests/fixtures/ComfyPage.ts
index 08cdd5ccea..f0eaf29c6f 100644
--- a/browser_tests/fixtures/ComfyPage.ts
+++ b/browser_tests/fixtures/ComfyPage.ts
@@ -1,41 +1,53 @@
-import type { APIRequestContext, Locator, Page } from '@playwright/test'
+import type {
+  APIRequestContext,
+  ExpectMatcherState,
+  Locator,
+  Page
+} from '@playwright/test'
 import { test as base, expect } from '@playwright/test'
 import dotenv from 'dotenv'
-import * as fs from 'fs'
 
-import type { LGraphNode } from '../../src/lib/litegraph/src/litegraph'
-import type { NodeId } from '../../src/platform/workflow/validation/schemas/workflowSchema'
-import type { KeyCombo } from '../../src/schemas/keyBindingSchema'
-import type { useWorkspaceStore } from '../../src/stores/workspaceStore'
+import { TestIds } from './selectors'
 import { NodeBadgeMode } from '../../src/types/nodeSource'
 import { ComfyActionbar } from '../helpers/actionbar'
 import { ComfyTemplates } from '../helpers/templates'
 import { ComfyMouse } from './ComfyMouse'
 import { VueNodeHelpers } from './VueNodeHelpers'
 import { ComfyNodeSearchBox } from './components/ComfyNodeSearchBox'
+import { ComfyNodeSearchBoxV2 } from './components/ComfyNodeSearchBoxV2'
+import { ContextMenu } from './components/ContextMenu'
 import { SettingDialog } from './components/SettingDialog'
+import { BottomPanel } from './components/BottomPanel'
 import {
   NodeLibrarySidebarTab,
   WorkflowsSidebarTab
 } from './components/SidebarTab'
 import { Topbar } from './components/Topbar'
-import type { Position, Size } from './types'
-import { NodeReference, SubgraphSlotReference } from './utils/litegraphUtils'
-import TaskHistory from './utils/taskHistory'
+import { CanvasHelper } from './helpers/CanvasHelper'
+import { PerformanceHelper } from './helpers/PerformanceHelper'
+import { ClipboardHelper } from './helpers/ClipboardHelper'
+import { CommandHelper } from './helpers/CommandHelper'
+import { DragDropHelper } from './helpers/DragDropHelper'
+import { KeyboardHelper } from './helpers/KeyboardHelper'
+import { NodeOperationsHelper } from './helpers/NodeOperationsHelper'
+import { SettingsHelper } from './helpers/SettingsHelper'
+import { SubgraphHelper } from './helpers/SubgraphHelper'
+import { ToastHelper } from './helpers/ToastHelper'
+import { WorkflowHelper } from './helpers/WorkflowHelper'
+import type { NodeReference } from './utils/litegraphUtils'
+import type { WorkspaceStore } from '../types/globals'
 
 dotenv.config()
 
-type WorkspaceStore = ReturnType<typeof useWorkspaceStore>
-
 class ComfyPropertiesPanel {
   readonly root: Locator
   readonly panelTitle: Locator
   readonly searchBox: Locator
 
   constructor(readonly page: Page) {
-    this.root = page.getByTestId('properties-panel')
+    this.root = page.getByTestId(TestIds.propertiesPanel.root)
     this.panelTitle = this.root.locator('h3')
-    this.searchBox = this.root.getByPlaceholder('Search...')
+    this.searchBox = this.root.getByPlaceholder(/^Search/)
   }
 }
 
@@ -46,16 +58,12 @@ class ComfyMenu {
 
   public readonly sideToolbar: Locator
   public readonly propertiesPanel: ComfyPropertiesPanel
-  public readonly themeToggleButton: Locator
-  public readonly saveButton: Locator
+  public readonly modeToggleButton: Locator
 
   constructor(public readonly page: Page) {
-    this.sideToolbar = page.locator('.side-tool-bar-container')
-    this.themeToggleButton = page.locator('.comfy-vue-theme-toggle')
+    this.sideToolbar = page.getByTestId(TestIds.sidebar.toolbar)
+    this.modeToggleButton = page.getByTestId(TestIds.sidebar.modeToggle)
     this.propertiesPanel = new ComfyPropertiesPanel(page)
-    this.saveButton = page
-      .locator('button[title="Save the current workflow"]')
-      .nth(0)
   }
 
   get buttons() {
@@ -78,33 +86,28 @@ class ComfyMenu {
   }
 
   async toggleTheme() {
-    await this.themeToggleButton.click()
-    await this.page.evaluate(() => {
-      return new Promise((resolve) => {
-        window['app'].ui.settings.addEventListener(
-          'Comfy.ColorPalette.change',
-          resolve,
-          { once: true }
+    const currentTheme = await this.getThemeId()
+    await this.modeToggleButton.click()
+    await this.page.waitForFunction(
+      (prevTheme) => {
+        const settings = window.app?.ui?.settings
+        return (
+          settings &&
+          settings.getSettingValue('Comfy.ColorPalette') !== prevTheme
         )
-
-        setTimeout(resolve, 5000)
-      })
-    })
+      },
+      currentTheme,
+      { timeout: 5000 }
+    )
   }
 
   async getThemeId() {
     return await this.page.evaluate(async () => {
-      return await window['app'].ui.settings.getSettingValue(
-        'Comfy.ColorPalette'
-      )
+      return await window.app!.ui.settings.getSettingValue('Comfy.ColorPalette')
     })
   }
 }
 
-type FolderStructure = {
-  [key: string]: FolderStructure | string
-}
-
 type KeysOfType<T, Match> = {
   [K in keyof T]: T[K] extends Match ? K : never
 }[keyof T]
@@ -126,7 +129,7 @@ class ConfirmDialog {
 
   async click(locator: KeysOfType<ConfirmDialog, Locator>) {
     const loc = this[locator]
-    await expect(loc).toBeVisible()
+    await loc.waitFor({ state: 'visible' })
     await loc.click()
 
     // Wait for the dialog mask to disappear after confirming
@@ -138,7 +141,9 @@ class ConfirmDialog {
 
     // Wait for workflow service to finish if it's busy
     await this.page.waitForFunction(
-      () => window['app']?.extensionManager?.workflow?.isBusy === false,
+      () =>
+        (window.app?.extensionManager as WorkspaceStore | undefined)?.workflow
+          ?.isBusy === false,
       undefined,
       { timeout: 3000 }
     )
@@ -146,8 +151,6 @@ class ConfirmDialog {
 }
 
 export class ComfyPage {
-  private _history: TaskHistory | null = null
-
   public readonly url: string
   // All canvas position operations are based on default view of canvas.
   public readonly canvas: Locator
@@ -162,17 +165,28 @@ export class ComfyPage {
   // Inputs
   public readonly workflowUploadInput: Locator
 
-  // Toasts
-  public readonly visibleToasts: Locator
-
   // Components
   public readonly searchBox: ComfyNodeSearchBox
+  public readonly searchBoxV2: ComfyNodeSearchBoxV2
   public readonly menu: ComfyMenu
   public readonly actionbar: ComfyActionbar
   public readonly templates: ComfyTemplates
   public readonly settingDialog: SettingDialog
   public readonly confirmDialog: ConfirmDialog
   public readonly vueNodes: VueNodeHelpers
+  public readonly subgraph: SubgraphHelper
+  public readonly canvasOps: CanvasHelper
+  public readonly nodeOps: NodeOperationsHelper
+  public readonly settings: SettingsHelper
+  public readonly keyboard: KeyboardHelper
+  public readonly clipboard: ClipboardHelper
+  public readonly workflow: WorkflowHelper
+  public readonly contextMenu: ContextMenu
+  public readonly toast: ToastHelper
+  public readonly dragDrop: DragDropHelper
+  public readonly command: CommandHelper
+  public readonly bottomPanel: BottomPanel
+  public readonly perf: PerformanceHelper
 
   /** Worker index to test user ID */
   public readonly userIds: string[] = []
@@ -193,74 +207,35 @@ export class ComfyPage {
     this.resetViewButton = page.getByRole('button', { name: 'Reset View' })
     this.queueButton = page.getByRole('button', { name: 'Queue Prompt' })
     this.runButton = page
-      .getByTestId('queue-button')
+      .getByTestId(TestIds.topbar.queueButton)
       .getByRole('button', { name: 'Run' })
     this.workflowUploadInput = page.locator('#comfy-file-input')
-    this.visibleToasts = page.locator('.p-toast-message:visible')
 
     this.searchBox = new ComfyNodeSearchBox(page)
+    this.searchBoxV2 = new ComfyNodeSearchBoxV2(page)
     this.menu = new ComfyMenu(page)
     this.actionbar = new ComfyActionbar(page)
     this.templates = new ComfyTemplates(page)
     this.settingDialog = new SettingDialog(page, this)
     this.confirmDialog = new ConfirmDialog(page)
     this.vueNodes = new VueNodeHelpers(page)
+    this.subgraph = new SubgraphHelper(this)
+    this.canvasOps = new CanvasHelper(page, this.canvas, this.resetViewButton)
+    this.nodeOps = new NodeOperationsHelper(this)
+    this.settings = new SettingsHelper(page)
+    this.keyboard = new KeyboardHelper(page, this.canvas)
+    this.clipboard = new ClipboardHelper(this.keyboard)
+    this.workflow = new WorkflowHelper(this)
+    this.contextMenu = new ContextMenu(page)
+    this.toast = new ToastHelper(page)
+    this.dragDrop = new DragDropHelper(page, this.assetPath.bind(this))
+    this.command = new CommandHelper(page)
+    this.bottomPanel = new BottomPanel(page)
+    this.perf = new PerformanceHelper(page)
   }
 
-  convertLeafToContent(structure: FolderStructure): FolderStructure {
-    const result: FolderStructure = {}
-
-    for (const [key, value] of Object.entries(structure)) {
-      if (typeof value === 'string') {
-        const filePath = this.assetPath(value)
-        result[key] = fs.readFileSync(filePath, 'utf-8')
-      } else {
-        result[key] = this.convertLeafToContent(value)
-      }
-    }
-
-    return result
-  }
-
-  async getGraphNodesCount(): Promise<number> {
-    return await this.page.evaluate(() => {
-      return window['app']?.graph?.nodes?.length || 0
-    })
-  }
-
-  async getSelectedGraphNodesCount(): Promise<number> {
-    return await this.page.evaluate(() => {
-      return (
-        window['app']?.graph?.nodes?.filter(
-          (node: any) => node.is_selected === true
-        ).length || 0
-      )
-    })
-  }
-
-  async setupWorkflowsDirectory(structure: FolderStructure) {
-    const resp = await this.request.post(
-      `${this.url}/api/devtools/setup_folder_structure`,
-      {
-        data: {
-          tree_structure: this.convertLeafToContent(structure),
-          base_path: `user/${this.id}/workflows`
-        }
-      }
-    )
-
-    if (resp.status() !== 200) {
-      throw new Error(
-        `Failed to setup workflows directory: ${await resp.text()}`
-      )
-    }
-
-    await this.page.evaluate(async () => {
-      await window['app'].extensionManager.workflow.syncWorkflows()
-    })
-
-    // Wait for Vue to re-render the workflow list
-    await this.nextFrame()
+  get visibleToasts() {
+    return this.toast.visibleToasts
   }
 
   async setupUser(username: string) {
@@ -288,7 +263,7 @@ export class ComfyPage {
     return await resp.json()
   }
 
-  async setupSettings(settings: Record<string, any>) {
+  async setupSettings(settings: Record<string, unknown>) {
     const resp = await this.request.post(
       `${this.url}/api/devtools/set_settings`,
       {
@@ -301,11 +276,6 @@ export class ComfyPage {
     }
   }
 
-  setupHistory(): TaskHistory {
-    this._history ??= new TaskHistory(this)
-    return this._history
-  }
-
   async setup({
     clearStorage = true,
     mockReleases = true
@@ -346,9 +316,9 @@ export class ComfyPage {
     await this.page.waitForFunction(() => document.fonts.ready)
     await this.page.waitForFunction(
       () =>
-        // window['app'] => GraphCanvas ready
-        // window['app'].extensionManager => GraphView ready
-        window['app'] && window['app'].extensionManager
+        // window.app => GraphCanvas ready
+        // window.app.extensionManager => GraphView ready
+        window.app && window.app.extensionManager
     )
     await this.page.waitForSelector('.p-blockui-mask', { state: 'hidden' })
     await this.nextFrame()
@@ -358,79 +328,6 @@ export class ComfyPage {
     return `./browser_tests/assets/${fileName}`
   }
 
-  async executeCommand(commandId: string) {
-    await this.page.evaluate((id: string) => {
-      return window['app'].extensionManager.command.execute(id)
-    }, commandId)
-  }
-
-  async registerCommand(
-    commandId: string,
-    command: (() => void) | (() => Promise<void>)
-  ) {
-    await this.page.evaluate(
-      ({ commandId, commandStr }) => {
-        const app = window['app']
-        const randomSuffix = Math.random().toString(36).substring(2, 8)
-        const extensionName = `TestExtension_${randomSuffix}`
-
-        app.registerExtension({
-          name: extensionName,
-          commands: [
-            {
-              id: commandId,
-              function: eval(commandStr)
-            }
-          ]
-        })
-      },
-      { commandId, commandStr: command.toString() }
-    )
-  }
-
-  async registerKeybinding(keyCombo: KeyCombo, command: () => void) {
-    await this.page.evaluate(
-      ({ keyCombo, commandStr }) => {
-        const app = window['app']
-        const randomSuffix = Math.random().toString(36).substring(2, 8)
-        const extensionName = `TestExtension_${randomSuffix}`
-        const commandId = `TestCommand_${randomSuffix}`
-
-        app.registerExtension({
-          name: extensionName,
-          keybindings: [
-            {
-              combo: keyCombo,
-              commandId: commandId
-            }
-          ],
-          commands: [
-            {
-              id: commandId,
-              function: eval(commandStr)
-            }
-          ]
-        })
-      },
-      { keyCombo, commandStr: command.toString() }
-    )
-  }
-
-  async setSetting(settingId: string, settingValue: any) {
-    return await this.page.evaluate(
-      async ({ id, value }) => {
-        await window['app'].extensionManager.setting.set(id, value)
-      },
-      { id: settingId, value: settingValue }
-    )
-  }
-
-  async getSetting(settingId: string) {
-    return await this.page.evaluate(async (id) => {
-      return await window['app'].extensionManager.setting.get(id)
-    }, settingId)
-  }
-
   async goto() {
     await this.page.goto(this.url)
   }
@@ -445,37 +342,6 @@ export class ComfyPage {
     return new Promise((resolve) => setTimeout(resolve, ms))
   }
 
-  async loadWorkflow(workflowName: string) {
-    await this.workflowUploadInput.setInputFiles(
-      this.assetPath(`${workflowName}.json`)
-    )
-    await this.nextFrame()
-  }
-
-  async deleteWorkflow(
-    workflowName: string,
-    whenMissing: 'ignoreMissing' | 'throwIfMissing' = 'ignoreMissing'
-  ) {
-    // Open workflows tab
-    const { workflowsTab } = this.menu
-    await workflowsTab.open()
-
-    // Action to take if workflow missing
-    if (whenMissing === 'ignoreMissing') {
-      const workflows = await workflowsTab.getTopLevelSavedWorkflowNames()
-      if (!workflows.includes(workflowName)) return
-    }
-
-    // Delete workflow
-    await workflowsTab.getPersistedItem(workflowName).click({ button: 'right' })
-    await this.clickContextMenuItem('Delete')
-    await this.confirmDialog.delete.click()
-
-    // Clear toast & close tab
-    await this.closeToasts(1)
-    await workflowsTab.close()
-  }
-
   /**
    * Attach a screenshot to the test report.
    * By default, screenshots are only taken in non-CI environments.
@@ -502,1080 +368,22 @@ export class ComfyPage {
     })
   }
 
-  async resetView() {
-    if (await this.resetViewButton.isVisible()) {
-      await this.resetViewButton.click()
-    }
-    // Avoid "Reset View" button highlight.
-    await this.page.mouse.move(10, 10)
-    await this.nextFrame()
-  }
-
-  async getToastErrorCount() {
-    return await this.page
-      .locator('.p-toast-message.p-toast-message-error')
-      .count()
-  }
-
-  async getVisibleToastCount() {
-    return await this.visibleToasts.count()
-  }
-
-  async closeToasts(requireCount = 0) {
-    if (requireCount) await expect(this.visibleToasts).toHaveCount(requireCount)
-
-    // Clear all toasts
-    const toastCloseButtons = await this.page
-      .locator('.p-toast-close-button')
-      .all()
-    for (const button of toastCloseButtons) {
-      await button.click()
-    }
-    await expect(this.visibleToasts).toHaveCount(0)
-  }
-
-  async clickTextEncodeNode1() {
-    await this.canvas.click({
-      position: {
-        x: 618,
-        y: 191
-      }
-    })
-    await this.nextFrame()
-  }
-
-  async clickTextEncodeNodeToggler() {
-    await this.canvas.click({
-      position: {
-        x: 430,
-        y: 171
-      }
-    })
-    await this.nextFrame()
-  }
-
-  async clickTextEncodeNode2() {
-    await this.canvas.click({
-      position: {
-        x: 622,
-        y: 400
-      }
-    })
-    await this.nextFrame()
-  }
-
-  async clickEmptySpace() {
-    await this.canvas.click({
-      position: {
-        x: 35,
-        y: 31
-      }
-    })
-    await this.nextFrame()
-  }
-
-  async dragAndDrop(source: Position, target: Position) {
-    await this.page.mouse.move(source.x, source.y)
-    await this.page.mouse.down()
-    await this.page.mouse.move(target.x, target.y, { steps: 100 })
-    await this.page.mouse.up()
-    await this.nextFrame()
-  }
-
-  async dragAndDropExternalResource(
-    options: {
-      fileName?: string
-      url?: string
-      dropPosition?: Position
-      waitForUpload?: boolean
-    } = {}
-  ) {
-    const {
-      dropPosition = { x: 100, y: 100 },
-      fileName,
-      url,
-      waitForUpload = false
-    } = options
-
-    if (!fileName && !url)
-      throw new Error('Must provide either fileName or url')
-
-    const evaluateParams: {
-      dropPosition: Position
-      fileName?: string
-      fileType?: string
-      buffer?: Uint8Array | number[]
-      url?: string
-    } = { dropPosition }
-
-    // Dropping a file from the filesystem
-    if (fileName) {
-      const filePath = this.assetPath(fileName)
-      const buffer = fs.readFileSync(filePath)
-
-      const getFileType = (fileName: string) => {
-        if (fileName.endsWith('.png')) return 'image/png'
-        if (fileName.endsWith('.svg')) return 'image/svg+xml'
-        if (fileName.endsWith('.webp')) return 'image/webp'
-        if (fileName.endsWith('.webm')) return 'video/webm'
-        if (fileName.endsWith('.json')) return 'application/json'
-        if (fileName.endsWith('.glb')) return 'model/gltf-binary'
-        if (fileName.endsWith('.avif')) return 'image/avif'
-        return 'application/octet-stream'
-      }
-
-      evaluateParams.fileName = fileName
-      evaluateParams.fileType = getFileType(fileName)
-      evaluateParams.buffer = [...new Uint8Array(buffer)]
-    }
-
-    // Dropping a URL (e.g., dropping image across browser tabs in Firefox)
-    if (url) evaluateParams.url = url
-
-    // Set up response waiter for file uploads before triggering the drop
-    const uploadResponsePromise = waitForUpload
-      ? this.page.waitForResponse(
-          (resp) => resp.url().includes('/upload/') && resp.status() === 200,
-          { timeout: 10000 }
-        )
-      : null
-
-    // Execute the drag and drop in the browser
-    await this.page.evaluate(async (params) => {
-      const dataTransfer = new DataTransfer()
-
-      // Add file if provided
-      if (params.buffer && params.fileName && params.fileType) {
-        const file = new File(
-          [new Uint8Array(params.buffer)],
-          params.fileName,
-          {
-            type: params.fileType
-          }
-        )
-        dataTransfer.items.add(file)
-      }
-
-      // Add URL data if provided
-      if (params.url) {
-        dataTransfer.setData('text/uri-list', params.url)
-        dataTransfer.setData('text/x-moz-url', params.url)
-      }
-
-      const targetElement = document.elementFromPoint(
-        params.dropPosition.x,
-        params.dropPosition.y
-      )
-
-      if (!targetElement) {
-        console.error('No element found at drop position:', params.dropPosition)
-        return { success: false, error: 'No element at position' }
-      }
-
-      const eventOptions = {
-        bubbles: true,
-        cancelable: true,
-        dataTransfer,
-        clientX: params.dropPosition.x,
-        clientY: params.dropPosition.y
-      }
-
-      const dragOverEvent = new DragEvent('dragover', eventOptions)
-      const dropEvent = new DragEvent('drop', eventOptions)
-
-      Object.defineProperty(dropEvent, 'preventDefault', {
-        value: () => {},
-        writable: false
-      })
-
-      Object.defineProperty(dropEvent, 'stopPropagation', {
-        value: () => {},
-        writable: false
-      })
-
-      targetElement.dispatchEvent(dragOverEvent)
-      targetElement.dispatchEvent(dropEvent)
-
-      return {
-        success: true,
-        targetInfo: {
-          tagName: targetElement.tagName,
-          id: targetElement.id,
-          classList: Array.from(targetElement.classList)
-        }
-      }
-    }, evaluateParams)
-
-    // Wait for file upload to complete
-    if (uploadResponsePromise) {
-      await uploadResponsePromise
-    }
-
-    await this.nextFrame()
-  }
-
-  async dragAndDropFile(
-    fileName: string,
-    options: { dropPosition?: Position; waitForUpload?: boolean } = {}
-  ) {
-    return this.dragAndDropExternalResource({ fileName, ...options })
-  }
-
-  async dragAndDropURL(url: string, options: { dropPosition?: Position } = {}) {
-    return this.dragAndDropExternalResource({ url, ...options })
-  }
-
-  async dragNode2() {
-    await this.dragAndDrop({ x: 622, y: 400 }, { x: 622, y: 300 })
-    await this.nextFrame()
-  }
-
-  // Default graph positions
-  get clipTextEncodeNode1InputSlot(): Position {
-    return { x: 427, y: 198 }
-  }
-
-  get clipTextEncodeNode2InputSlot(): Position {
-    return { x: 422, y: 402 }
-  }
-
-  // A point on input edge.
-  get clipTextEncodeNode2InputLinkPath(): Position {
-    return {
-      x: 395,
-      y: 422
-    }
-  }
-
-  get loadCheckpointNodeClipOutputSlot(): Position {
-    return { x: 332, y: 509 }
-  }
-
-  get emptySpace(): Position {
-    return { x: 427, y: 98 }
-  }
-
-  get promptDialogInput() {
-    return this.page.locator('.p-dialog-content input[type="text"]')
-  }
-
-  async fillPromptDialog(value: string) {
-    await this.promptDialogInput.fill(value)
-    await this.page.keyboard.press('Enter')
-    await this.promptDialogInput.waitFor({ state: 'hidden' })
-    await this.nextFrame()
-  }
-
-  async disconnectEdge() {
-    await this.dragAndDrop(this.clipTextEncodeNode1InputSlot, this.emptySpace)
-  }
-
-  async connectEdge(
-    options: {
-      reverse?: boolean
-    } = {}
-  ) {
-    const { reverse = false } = options
-    const start = reverse
-      ? this.clipTextEncodeNode1InputSlot
-      : this.loadCheckpointNodeClipOutputSlot
-    const end = reverse
-      ? this.loadCheckpointNodeClipOutputSlot
-      : this.clipTextEncodeNode1InputSlot
-
-    await this.dragAndDrop(start, end)
-  }
-
-  async adjustWidgetValue() {
-    // Adjust Empty Latent Image's width input.
-    const page = this.page
-    await page.locator('#graph-canvas').click({
-      position: {
-        x: 724,
-        y: 645
-      }
-    })
-    const dialogInput = page.locator('.graphdialog input[type="text"]')
-    await dialogInput.click()
-    await dialogInput.fill('128')
-    await dialogInput.press('Enter')
-    await this.nextFrame()
-  }
-
-  async zoom(deltaY: number, steps: number = 1) {
-    await this.page.mouse.move(10, 10)
-    for (let i = 0; i < steps; i++) {
-      await this.page.mouse.wheel(0, deltaY)
-    }
-    await this.nextFrame()
-  }
-
-  async pan(offset: Position, safeSpot?: Position) {
-    safeSpot = safeSpot || { x: 10, y: 10 }
-    await this.page.mouse.move(safeSpot.x, safeSpot.y)
-    await this.page.mouse.down()
-    await this.page.mouse.move(offset.x + safeSpot.x, offset.y + safeSpot.y)
-    await this.page.mouse.up()
-    await this.nextFrame()
-  }
-
-  async panWithTouch(offset: Position, safeSpot?: Position) {
-    safeSpot = safeSpot || { x: 10, y: 10 }
-    const client = await this.page.context().newCDPSession(this.page)
-    await client.send('Input.dispatchTouchEvent', {
-      type: 'touchStart',
-      touchPoints: [safeSpot]
-    })
-    await client.send('Input.dispatchTouchEvent', {
-      type: 'touchMove',
-      touchPoints: [{ x: offset.x + safeSpot.x, y: offset.y + safeSpot.y }]
-    })
-    await client.send('Input.dispatchTouchEvent', {
-      type: 'touchEnd',
-      touchPoints: []
-    })
-    await this.nextFrame()
-  }
-
-  async rightClickCanvas(x: number = 10, y: number = 10) {
-    await this.page.mouse.click(x, y, { button: 'right' })
-    await this.nextFrame()
-  }
-
-  async clickContextMenuItem(name: string): Promise<void> {
-    await this.page.getByRole('menuitem', { name }).click()
-    await this.nextFrame()
-  }
-
-  /**
-   * Clicks on a litegraph context menu item (uses .litemenu-entry selector).
-   * Use this for canvas/node context menus, not PrimeVue menus.
-   */
-  async clickLitegraphContextMenuItem(name: string): Promise<void> {
-    await this.page.locator(`.litemenu-entry:has-text("${name}")`).click()
-    await this.nextFrame()
-  }
-
-  /**
-   * Core helper method for interacting with subgraph I/O slots.
-   * Handles both input/output slots and both right-click/double-click actions.
-   *
-   * @param slotType - 'input' or 'output'
-   * @param action - 'rightClick' or 'doubleClick'
-   * @param slotName - Optional specific slot name to target
-   * @private
-   */
-  private async interactWithSubgraphSlot(
-    slotType: 'input' | 'output',
-    action: 'rightClick' | 'doubleClick',
-    slotName?: string
-  ): Promise<void> {
-    const foundSlot = await this.page.evaluate(
-      async (params) => {
-        const { slotType, action, targetSlotName } = params
-        const app = window['app']
-        const currentGraph = app.canvas.graph
-
-        // Check if we're in a subgraph
-        if (currentGraph.constructor.name !== 'Subgraph') {
-          throw new Error(
-            'Not in a subgraph - this method only works inside subgraphs'
-          )
-        }
-
-        // Get the appropriate node and slots
-        const node =
-          slotType === 'input'
-            ? currentGraph.inputNode
-            : currentGraph.outputNode
-        const slots =
-          slotType === 'input' ? currentGraph.inputs : currentGraph.outputs
-
-        if (!node) {
-          throw new Error(`No ${slotType} node found in subgraph`)
-        }
-
-        if (!slots || slots.length === 0) {
-          throw new Error(`No ${slotType} slots found in subgraph`)
-        }
-
-        // Filter slots based on target name and action type
-        const slotsToTry = targetSlotName
-          ? slots.filter((slot) => slot.name === targetSlotName)
-          : action === 'rightClick'
-            ? slots
-            : [slots[0]] // Right-click tries all, double-click uses first
-
-        if (slotsToTry.length === 0) {
-          throw new Error(
-            targetSlotName
-              ? `${slotType} slot '${targetSlotName}' not found`
-              : `No ${slotType} slots available to try`
-          )
-        }
-
-        // Handle the interaction based on action type
-        if (action === 'rightClick') {
-          // Right-click: try each slot until one works
-          for (const slot of slotsToTry) {
-            if (!slot.pos) continue
-
-            const event = {
-              canvasX: slot.pos[0],
-              canvasY: slot.pos[1],
-              button: 2, // Right mouse button
-              preventDefault: () => {},
-              stopPropagation: () => {}
-            }
-
-            if (node.onPointerDown) {
-              node.onPointerDown(
-                event,
-                app.canvas.pointer,
-                app.canvas.linkConnector
-              )
-            }
-
-            // Wait briefly for menu to appear
-            await new Promise((resolve) => setTimeout(resolve, 100))
-
-            // Check if context menu appeared
-            const menuExists = document.querySelector('.litemenu-entry')
-            if (menuExists) {
-              return {
-                success: true,
-                slotName: slot.name,
-                x: slot.pos[0],
-                y: slot.pos[1]
-              }
-            }
-          }
-        } else if (action === 'doubleClick') {
-          // Double-click: use first slot with bounding rect center
-          const slot = slotsToTry[0]
-          if (!slot.boundingRect) {
-            throw new Error(`${slotType} slot bounding rect not found`)
-          }
-
-          const rect = slot.boundingRect
-          const testX = rect[0] + rect[2] / 2 // x + width/2
-          const testY = rect[1] + rect[3] / 2 // y + height/2
-
-          const event = {
-            canvasX: testX,
-            canvasY: testY,
-            button: 0, // Left mouse button
-            preventDefault: () => {},
-            stopPropagation: () => {}
-          }
-
-          if (node.onPointerDown) {
-            node.onPointerDown(
-              event,
-              app.canvas.pointer,
-              app.canvas.linkConnector
-            )
-
-            // Trigger double-click
-            if (app.canvas.pointer.onDoubleClick) {
-              app.canvas.pointer.onDoubleClick(event)
-            }
-          }
-
-          // Wait briefly for dialog to appear
-          await new Promise((resolve) => setTimeout(resolve, 200))
-
-          return { success: true, slotName: slot.name, x: testX, y: testY }
-        }
-
-        return { success: false }
-      },
-      { slotType, action, targetSlotName: slotName }
-    )
-
-    if (!foundSlot.success) {
-      const actionText =
-        action === 'rightClick' ? 'open context menu for' : 'double-click'
-      throw new Error(
-        slotName
-          ? `Could not ${actionText} ${slotType} slot '${slotName}'`
-          : `Could not find any ${slotType} slot to ${actionText}`
-      )
-    }
-
-    // Wait for the appropriate UI element to appear
-    if (action === 'rightClick') {
-      await this.page.waitForSelector('.litemenu-entry', {
-        state: 'visible',
-        timeout: 5000
-      })
-    } else {
-      await this.nextFrame()
-    }
-  }
-
-  /**
-   * Right-clicks on a subgraph input slot to open the context menu.
-   * Must be called when inside a subgraph.
-   *
-   * This method uses the actual slot positions from the subgraph.inputs array,
-   * which contain the correct coordinates for each input slot. These positions
-   * are different from the visual node positions and are specifically where
-   * the slots are rendered on the input node.
-   *
-   * @param inputName Optional name of the specific input slot to target (e.g., 'text').
-   *                  If not provided, tries all available input slots until one works.
-   * @returns Promise that resolves when the context menu appears
-   */
-  async rightClickSubgraphInputSlot(inputName?: string): Promise<void> {
-    return this.interactWithSubgraphSlot('input', 'rightClick', inputName)
-  }
-
-  /**
-   * Right-clicks on a subgraph output slot to open the context menu.
-   * Must be called when inside a subgraph.
-   *
-   * Similar to rightClickSubgraphInputSlot but for output slots.
-   *
-   * @param outputName Optional name of the specific output slot to target.
-   *                   If not provided, tries all available output slots until one works.
-   * @returns Promise that resolves when the context menu appears
-   */
-  async rightClickSubgraphOutputSlot(outputName?: string): Promise<void> {
-    return this.interactWithSubgraphSlot('output', 'rightClick', outputName)
-  }
-
-  /**
-   * Double-clicks on a subgraph input slot to rename it.
-   * Must be called when inside a subgraph.
-   *
-   * @param inputName Optional name of the specific input slot to target (e.g., 'text').
-   *                  If not provided, tries the first available input slot.
-   * @returns Promise that resolves when the rename dialog appears
-   */
-  async doubleClickSubgraphInputSlot(inputName?: string): Promise<void> {
-    return this.interactWithSubgraphSlot('input', 'doubleClick', inputName)
-  }
-
-  /**
-   * Double-clicks on a subgraph output slot to rename it.
-   * Must be called when inside a subgraph.
-   *
-   * @param outputName Optional name of the specific output slot to target.
-   *                   If not provided, tries the first available output slot.
-   * @returns Promise that resolves when the rename dialog appears
-   */
-  async doubleClickSubgraphOutputSlot(outputName?: string): Promise<void> {
-    return this.interactWithSubgraphSlot('output', 'doubleClick', outputName)
-  }
-
-  /**
-   * Get a reference to a subgraph input slot
-   */
-  async getSubgraphInputSlot(
-    slotName?: string
-  ): Promise<SubgraphSlotReference> {
-    return new SubgraphSlotReference('input', slotName || '', this)
-  }
-
-  /**
-   * Get a reference to a subgraph output slot
-   */
-  async getSubgraphOutputSlot(
-    slotName?: string
-  ): Promise<SubgraphSlotReference> {
-    return new SubgraphSlotReference('output', slotName || '', this)
-  }
-
-  /**
-   * Connect a regular node output to a subgraph input.
-   * This creates a new input slot on the subgraph if targetInputName is not provided.
-   */
-  async connectToSubgraphInput(
-    sourceNode: NodeReference,
-    sourceSlotIndex: number,
-    targetInputName?: string
-  ): Promise<void> {
-    const sourceSlot = await sourceNode.getOutput(sourceSlotIndex)
-    const targetSlot = await this.getSubgraphInputSlot(targetInputName)
-
-    const targetPosition = targetInputName
-      ? await targetSlot.getPosition() // Connect to existing slot
-      : await targetSlot.getOpenSlotPosition() // Create new slot
-
-    await this.dragAndDrop(await sourceSlot.getPosition(), targetPosition)
-    await this.nextFrame()
-  }
-
-  /**
-   * Connect a subgraph input to a regular node input.
-   * This creates a new input slot on the subgraph if sourceInputName is not provided.
-   */
-  async connectFromSubgraphInput(
-    targetNode: NodeReference,
-    targetSlotIndex: number,
-    sourceInputName?: string
-  ): Promise<void> {
-    const sourceSlot = await this.getSubgraphInputSlot(sourceInputName)
-    const targetSlot = await targetNode.getInput(targetSlotIndex)
-
-    const sourcePosition = sourceInputName
-      ? await sourceSlot.getPosition() // Connect from existing slot
-      : await sourceSlot.getOpenSlotPosition() // Create new slot
-
-    const targetPosition = await targetSlot.getPosition()
-
-    await this.dragAndDrop(sourcePosition, targetPosition)
-    await this.nextFrame()
-  }
-
-  /**
-   * Connect a regular node output to a subgraph output.
-   * This creates a new output slot on the subgraph if targetOutputName is not provided.
-   */
-  async connectToSubgraphOutput(
-    sourceNode: NodeReference,
-    sourceSlotIndex: number,
-    targetOutputName?: string
-  ): Promise<void> {
-    const sourceSlot = await sourceNode.getOutput(sourceSlotIndex)
-    const targetSlot = await this.getSubgraphOutputSlot(targetOutputName)
-
-    const targetPosition = targetOutputName
-      ? await targetSlot.getPosition() // Connect to existing slot
-      : await targetSlot.getOpenSlotPosition() // Create new slot
-
-    await this.dragAndDrop(await sourceSlot.getPosition(), targetPosition)
-    await this.nextFrame()
-  }
-
-  /**
-   * Connect a subgraph output to a regular node input.
-   * This creates a new output slot on the subgraph if sourceOutputName is not provided.
-   */
-  async connectFromSubgraphOutput(
-    targetNode: NodeReference,
-    targetSlotIndex: number,
-    sourceOutputName?: string
-  ): Promise<void> {
-    const sourceSlot = await this.getSubgraphOutputSlot(sourceOutputName)
-    const targetSlot = await targetNode.getInput(targetSlotIndex)
-
-    const sourcePosition = sourceOutputName
-      ? await sourceSlot.getPosition() // Connect from existing slot
-      : await sourceSlot.getOpenSlotPosition() // Create new slot
-
-    await this.dragAndDrop(sourcePosition, await targetSlot.getPosition())
-    await this.nextFrame()
-  }
-
-  /**
-   * Add a visual marker at a position for debugging
-   */
-  async debugAddMarker(
-    position: Position,
-    id: string = 'debug-marker'
-  ): Promise<void> {
-    await this.page.evaluate(
-      ([pos, markerId]) => {
-        // Remove existing marker if present
-        const existing = document.getElementById(markerId)
-        if (existing) existing.remove()
-
-        // Create marker
-        const marker = document.createElement('div')
-        marker.id = markerId
-        marker.style.position = 'fixed'
-        marker.style.left = `${pos.x - 10}px`
-        marker.style.top = `${pos.y - 10}px`
-        marker.style.width = '20px'
-        marker.style.height = '20px'
-        marker.style.border = '2px solid red'
-        marker.style.borderRadius = '50%'
-        marker.style.backgroundColor = 'rgba(255, 0, 0, 0.3)'
-        marker.style.pointerEvents = 'none'
-        marker.style.zIndex = '10000'
-        document.body.appendChild(marker)
-      },
-      [position, id] as const
-    )
-  }
-
-  /**
-   * Remove debug markers
-   */
-  async debugRemoveMarkers(): Promise<void> {
-    await this.page.evaluate(() => {
-      document
-        .querySelectorAll('[id^="debug-marker"]')
-        .forEach((el) => el.remove())
-    })
-  }
-
-  /**
-   * Take a screenshot and attach it to the test report for debugging
-   * This is a convenience method that combines screenshot capture and test attachment
-   *
-   * @param testInfo The Playwright TestInfo object (from test parameters)
-   * @param name Name for the attachment
-   * @param options Optional screenshot options (defaults to page screenshot)
-   */
-  async debugAttachScreenshot(
-    testInfo: any,
-    name: string,
-    options?: {
-      fullPage?: boolean
-      element?: 'canvas' | 'page'
-      markers?: Array<{ position: Position; id?: string }>
-    }
-  ): Promise<void> {
-    // Add markers if requested
-    if (options?.markers) {
-      for (const marker of options.markers) {
-        await this.debugAddMarker(marker.position, marker.id)
-      }
-    }
-
-    // Take screenshot - default to page if not specified
-    let screenshot: Buffer
-    const targetElement = options?.element || 'page'
-
-    if (targetElement === 'canvas') {
-      screenshot = await this.canvas.screenshot()
-    } else if (options?.fullPage) {
-      screenshot = await this.page.screenshot({ fullPage: true })
-    } else {
-      screenshot = await this.page.screenshot()
-    }
-
-    // Attach to test report
-    await testInfo.attach(name, {
-      body: screenshot,
-      contentType: 'image/png'
-    })
-
-    // Clean up markers if we added any
-    if (options?.markers) {
-      await this.debugRemoveMarkers()
-    }
-  }
-
-  async doubleClickCanvas() {
-    await this.page.mouse.dblclick(10, 10, { delay: 5 })
-    await this.nextFrame()
-  }
-
-  /**
-   * Capture the canvas as a PNG and save it for debugging
-   */
-  async debugSaveCanvasScreenshot(filename: string): Promise<void> {
-    await this.page.evaluate(async (filename) => {
-      const canvas = document.getElementById(
-        'graph-canvas'
-      ) as HTMLCanvasElement
-      if (!canvas) {
-        throw new Error('Canvas not found')
-      }
-
-      // Convert canvas to blob
-      return new Promise<void>((resolve) => {
-        canvas.toBlob(async (blob) => {
-          if (!blob) {
-            throw new Error('Failed to create blob from canvas')
-          }
-
-          // Create a download link and trigger it
-          const url = URL.createObjectURL(blob)
-          const a = document.createElement('a')
-          a.href = url
-          a.download = filename
-          document.body.appendChild(a)
-          a.click()
-          document.body.removeChild(a)
-          URL.revokeObjectURL(url)
-          resolve()
-        }, 'image/png')
-      })
-    }, filename)
-  }
-
-  /**
-   * Capture canvas as base64 data URL for inspection
-   */
-  async debugGetCanvasDataURL(): Promise<string> {
-    return await this.page.evaluate(() => {
-      const canvas = document.getElementById(
-        'graph-canvas'
-      ) as HTMLCanvasElement
-      if (!canvas) {
-        throw new Error('Canvas not found')
-      }
-      return canvas.toDataURL('image/png')
-    })
-  }
-
-  /**
-   * Create an overlay div with the canvas image for easier Playwright screenshot
-   */
-  async debugShowCanvasOverlay(): Promise<void> {
-    await this.page.evaluate(() => {
-      const canvas = document.getElementById(
-        'graph-canvas'
-      ) as HTMLCanvasElement
-      if (!canvas) {
-        throw new Error('Canvas not found')
-      }
-
-      // Remove existing overlay if present
-      const existingOverlay = document.getElementById('debug-canvas-overlay')
-      if (existingOverlay) {
-        existingOverlay.remove()
-      }
-
-      // Create overlay div
-      const overlay = document.createElement('div')
-      overlay.id = 'debug-canvas-overlay'
-      overlay.style.position = 'fixed'
-      overlay.style.top = '0'
-      overlay.style.left = '0'
-      overlay.style.zIndex = '9999'
-      overlay.style.backgroundColor = 'white'
-      overlay.style.padding = '10px'
-      overlay.style.border = '2px solid red'
-
-      // Create image from canvas
-      const img = document.createElement('img')
-      img.src = canvas.toDataURL('image/png')
-      img.style.maxWidth = '800px'
-      img.style.maxHeight = '600px'
-      overlay.appendChild(img)
-
-      document.body.appendChild(overlay)
-    })
-  }
-
-  /**
-   * Remove the debug canvas overlay
-   */
-  async debugHideCanvasOverlay(): Promise<void> {
-    await this.page.evaluate(() => {
-      const overlay = document.getElementById('debug-canvas-overlay')
-      if (overlay) {
-        overlay.remove()
-      }
-    })
-  }
-
-  async clickEmptyLatentNode() {
-    await this.canvas.click({
-      position: {
-        x: 724,
-        y: 625
-      }
-    })
-    await this.page.mouse.move(10, 10)
-    await this.nextFrame()
-  }
-
-  async rightClickEmptyLatentNode() {
-    await this.canvas.click({
-      position: {
-        x: 724,
-        y: 645
-      },
-      button: 'right'
-    })
-    await this.page.mouse.move(10, 10)
-    await this.nextFrame()
-  }
-
-  async selectNodes(nodeTitles: string[]) {
-    await this.page.keyboard.down('Control')
-    for (const nodeTitle of nodeTitles) {
-      const nodes = await this.getNodeRefsByTitle(nodeTitle)
-      for (const node of nodes) {
-        await node.click('title')
-      }
-    }
-    await this.page.keyboard.up('Control')
-    await this.nextFrame()
-  }
-
-  async select2Nodes() {
-    // Select 2 CLIP nodes.
-    await this.page.keyboard.down('Control')
-    await this.clickTextEncodeNode1()
-    await this.clickTextEncodeNode2()
-    await this.page.keyboard.up('Control')
-    await this.nextFrame()
-  }
-
-  async ctrlSend(keyToPress: string, locator: Locator | null = this.canvas) {
-    const target = locator ?? this.page.keyboard
-    await target.press(`Control+${keyToPress}`)
-    await this.nextFrame()
-  }
-
-  async ctrlA(locator?: Locator | null) {
-    await this.ctrlSend('KeyA', locator)
-  }
-
-  async ctrlB(locator?: Locator | null) {
-    await this.ctrlSend('KeyB', locator)
-  }
-
-  async ctrlC(locator?: Locator | null) {
-    await this.ctrlSend('KeyC', locator)
-  }
-
-  async ctrlV(locator?: Locator | null) {
-    await this.ctrlSend('KeyV', locator)
-  }
-
-  async ctrlZ(locator?: Locator | null) {
-    await this.ctrlSend('KeyZ', locator)
-  }
-
-  async ctrlY(locator?: Locator | null) {
-    await this.ctrlSend('KeyY', locator)
-  }
-
-  async ctrlArrowUp(locator?: Locator | null) {
-    await this.ctrlSend('ArrowUp', locator)
-  }
-
-  async ctrlArrowDown(locator?: Locator | null) {
-    await this.ctrlSend('ArrowDown', locator)
-  }
-
   async closeMenu() {
     await this.page.click('button.comfy-close-menu-btn')
     await this.nextFrame()
   }
 
-  async closeDialog() {
-    await this.page.locator('.p-dialog-close-button').click({ force: true })
-    await expect(this.page.locator('.p-dialog')).toBeHidden()
-  }
-
-  async resizeNode(
-    nodePos: Position,
-    nodeSize: Size,
-    ratioX: number,
-    ratioY: number,
-    revertAfter: boolean = false
-  ) {
-    const bottomRight = {
-      x: nodePos.x + nodeSize.width,
-      y: nodePos.y + nodeSize.height
-    }
-    const target = {
-      x: nodePos.x + nodeSize.width * ratioX,
-      y: nodePos.y + nodeSize.height * ratioY
-    }
-    // -1 to be inside the node.  -2 because nodes currently get an arbitrary +1 to width.
-    await this.dragAndDrop(
-      { x: bottomRight.x - 2, y: bottomRight.y - 1 },
-      target
-    )
-    await this.nextFrame()
-    if (revertAfter) {
-      await this.dragAndDrop({ x: target.x - 2, y: target.y - 1 }, bottomRight)
-      await this.nextFrame()
-    }
-  }
-
-  async resizeKsamplerNode(
-    percentX: number,
-    percentY: number,
-    revertAfter: boolean = false
-  ) {
-    const ksamplerPos = {
-      x: 863,
-      y: 156
-    }
-    const ksamplerSize = {
-      width: 315,
-      height: 292
-    }
-    return this.resizeNode(
-      ksamplerPos,
-      ksamplerSize,
-      percentX,
-      percentY,
-      revertAfter
-    )
-  }
-
-  async resizeLoadCheckpointNode(
-    percentX: number,
-    percentY: number,
-    revertAfter: boolean = false
-  ) {
-    const loadCheckpointPos = {
-      x: 26,
-      y: 444
-    }
-    const loadCheckpointSize = {
-      width: 315,
-      height: 127
-    }
-    return this.resizeNode(
-      loadCheckpointPos,
-      loadCheckpointSize,
-      percentX,
-      percentY,
-      revertAfter
-    )
-  }
-
-  async resizeEmptyLatentNode(
-    percentX: number,
-    percentY: number,
-    revertAfter: boolean = false
-  ) {
-    const emptyLatentPos = {
-      x: 473,
-      y: 579
-    }
-    const emptyLatentSize = {
-      width: 315,
-      height: 136
-    }
-    return this.resizeNode(
-      emptyLatentPos,
-      emptyLatentSize,
-      percentX,
-      percentY,
-      revertAfter
-    )
-  }
-
   async clickDialogButton(prompt: string, buttonText: string = 'Yes') {
     const modal = this.page.locator(
       `.comfy-modal-content:has-text("${prompt}")`
     )
-    await expect(modal).toBeVisible()
+    await modal.waitFor({ state: 'visible' })
     await modal
       .locator('.comfyui-button', {
         hasText: buttonText
       })
       .click()
-    await expect(modal).toBeHidden()
-  }
-
-  async convertAllNodesToGroupNode(groupNodeName: string) {
-    await this.canvas.press('Control+a')
-    const node = await this.getFirstNodeRef()
-    await node!.clickContextMenuOption('Convert to Group Node')
-    await this.fillPromptDialog(groupNodeName)
-    await this.nextFrame()
-  }
-
-  async convertOffsetToCanvas(pos: [number, number]) {
-    return this.page.evaluate((pos) => {
-      return window['app'].canvas.ds.convertOffsetToCanvas(pos)
-    }, pos)
+    await modal.waitFor({ state: 'hidden' })
   }
 
   /** Get number of DOM widgets on the canvas. */
@@ -1583,127 +391,12 @@ export class ComfyPage {
     return await this.page.locator('.dom-widget').count()
   }
 
-  async getNodeRefById(id: NodeId) {
-    return new NodeReference(id, this)
-  }
-  async getNodes(): Promise<LGraphNode[]> {
-    return await this.page.evaluate(() => {
-      return window['app'].graph.nodes
-    })
-  }
-  async getNodeRefsByType(type: string): Promise<NodeReference[]> {
-    return Promise.all(
-      (
-        await this.page.evaluate((type) => {
-          return window['app'].graph.nodes
-            .filter((n: LGraphNode) => n.type === type)
-            .map((n: LGraphNode) => n.id)
-        }, type)
-      ).map((id: NodeId) => this.getNodeRefById(id))
-    )
-  }
-  async getNodeRefsByTitle(title: string): Promise<NodeReference[]> {
-    return Promise.all(
-      (
-        await this.page.evaluate((title) => {
-          return window['app'].graph.nodes
-            .filter((n: LGraphNode) => n.title === title)
-            .map((n: LGraphNode) => n.id)
-        }, title)
-      ).map((id: NodeId) => this.getNodeRefById(id))
-    )
-  }
-
-  async getFirstNodeRef(): Promise<NodeReference | null> {
-    const id = await this.page.evaluate(() => {
-      return window['app'].graph.nodes[0]?.id
-    })
-    if (!id) return null
-    return this.getNodeRefById(id)
-  }
-  async moveMouseToEmptyArea() {
-    await this.page.mouse.move(10, 10)
-  }
-  async getUndoQueueSize() {
-    return this.page.evaluate(() => {
-      const workflow = (window['app'].extensionManager as WorkspaceStore)
-        .workflow.activeWorkflow
-      return workflow?.changeTracker.undoQueue.length
-    })
-  }
-  async getRedoQueueSize() {
-    return this.page.evaluate(() => {
-      const workflow = (window['app'].extensionManager as WorkspaceStore)
-        .workflow.activeWorkflow
-      return workflow?.changeTracker.redoQueue.length
-    })
-  }
-  async isCurrentWorkflowModified() {
-    return this.page.evaluate(() => {
-      return (window['app'].extensionManager as WorkspaceStore).workflow
-        .activeWorkflow?.isModified
-    })
-  }
-  async getExportedWorkflow({ api = false }: { api?: boolean } = {}) {
-    return this.page.evaluate(async (api) => {
-      return (await window['app'].graphToPrompt())[api ? 'output' : 'workflow']
-    }, api)
-  }
   async setFocusMode(focusMode: boolean) {
     await this.page.evaluate((focusMode) => {
-      window['app'].extensionManager.focusMode = focusMode
+      ;(window.app!.extensionManager as WorkspaceStore).focusMode = focusMode
     }, focusMode)
     await this.nextFrame()
   }
-
-  /**
-   * Get the position of a group by title.
-   * @param title The title of the group to find
-   * @returns The group's canvas position
-   * @throws Error if group not found
-   */
-  async getGroupPosition(title: string): Promise<Position> {
-    const pos = await this.page.evaluate((title) => {
-      const groups = window['app'].graph.groups
-      const group = groups.find((g: { title: string }) => g.title === title)
-      if (!group) return null
-      return { x: group.pos[0], y: group.pos[1] }
-    }, title)
-    if (!pos) throw new Error(`Group "${title}" not found`)
-    return pos
-  }
-
-  /**
-   * Drag a group by its title.
-   * @param options.name The title of the group to drag
-   * @param options.deltaX Horizontal drag distance in screen pixels
-   * @param options.deltaY Vertical drag distance in screen pixels
-   */
-  async dragGroup(options: {
-    name: string
-    deltaX: number
-    deltaY: number
-  }): Promise<void> {
-    const { name, deltaX, deltaY } = options
-    const screenPos = await this.page.evaluate((title) => {
-      const app = window['app']
-      const groups = app.graph.groups
-      const group = groups.find((g: { title: string }) => g.title === title)
-      if (!group) return null
-      // Position in the title area of the group
-      const clientPos = app.canvasPosToClientPos([
-        group.pos[0] + 50,
-        group.pos[1] + 15
-      ])
-      return { x: clientPos[0], y: clientPos[1] }
-    }, name)
-    if (!screenPos) throw new Error(`Group "${name}" not found`)
-
-    await this.dragAndDrop(screenPos, {
-      x: screenPos.x + deltaX,
-      y: screenPos.y + deltaY
-    })
-  }
 }
 
 export const testComfySnapToGridGridSize = 50
@@ -1746,7 +439,13 @@ export const comfyPageFixture = base.extend<{
     }
 
     await comfyPage.setup()
+
+    const isPerf = testInfo.tags.includes('@perf')
+    if (isPerf) await comfyPage.perf.init()
+
     await use(comfyPage)
+
+    if (isPerf) await comfyPage.perf.dispose()
   },
   comfyMouse: async ({ comfyPage }, use) => {
     const comfyMouse = new ComfyMouse(comfyPage)
@@ -1759,6 +458,7 @@ const makeMatcher = function <T>(
   type: string
 ) {
   return async function (
+    this: ExpectMatcherState,
     node: NodeReference,
     options?: { timeout?: number; intervals?: number[] }
   ) {
diff --git a/browser_tests/fixtures/VueNodeHelpers.ts b/browser_tests/fixtures/VueNodeHelpers.ts
index e08b39bd74..64d76481c6 100644
--- a/browser_tests/fixtures/VueNodeHelpers.ts
+++ b/browser_tests/fixtures/VueNodeHelpers.ts
@@ -3,6 +3,7 @@
  */
 import type { Locator, Page } from '@playwright/test'
 
+import { TestIds } from './selectors'
 import { VueNodeFixture } from './utils/vueNodeFixtures'
 
 export class VueNodeHelpers {
@@ -148,9 +149,9 @@ export class VueNodeHelpers {
    * Get a specific widget by node title and widget name
    */
   getWidgetByName(nodeTitle: string, widgetName: string): Locator {
-    return this.getNodeByTitle(nodeTitle).locator(
-      `_vue=[widget.name="${widgetName}"]`
-    )
+    return this.getNodeByTitle(nodeTitle).getByLabel(widgetName, {
+      exact: true
+    })
   }
 
   /**
@@ -159,8 +160,18 @@ export class VueNodeHelpers {
   getInputNumberControls(widget: Locator) {
     return {
       input: widget.locator('input'),
-      incrementButton: widget.locator('button').first(),
-      decrementButton: widget.locator('button').nth(1)
+      decrementButton: widget.getByTestId(TestIds.widgets.decrement),
+      incrementButton: widget.getByTestId(TestIds.widgets.increment)
     }
   }
+
+  /**
+   * 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)
+    await editButton.click()
+  }
 }
diff --git a/browser_tests/fixtures/components/BaseDialog.ts b/browser_tests/fixtures/components/BaseDialog.ts
new file mode 100644
index 0000000000..62b4ff64cb
--- /dev/null
+++ b/browser_tests/fixtures/components/BaseDialog.ts
@@ -0,0 +1,31 @@
+import type { Locator, Page } from '@playwright/test'
+
+export class BaseDialog {
+  readonly root: Locator
+  readonly closeButton: Locator
+
+  constructor(
+    public readonly page: Page,
+    testId?: string
+  ) {
+    this.root = testId ? page.getByTestId(testId) : page.locator('.p-dialog')
+    this.closeButton = this.root.getByRole('button', { name: 'Close' })
+  }
+
+  async isVisible(): Promise<boolean> {
+    return this.root.isVisible()
+  }
+
+  async waitForVisible(): Promise<void> {
+    await this.root.waitFor({ state: 'visible' })
+  }
+
+  async waitForHidden(): Promise<void> {
+    await this.root.waitFor({ state: 'hidden' })
+  }
+
+  async close(): Promise<void> {
+    await this.closeButton.click({ force: true })
+    await this.waitForHidden()
+  }
+}
diff --git a/browser_tests/fixtures/components/BottomPanel.ts b/browser_tests/fixtures/components/BottomPanel.ts
new file mode 100644
index 0000000000..85ef2694ab
--- /dev/null
+++ b/browser_tests/fixtures/components/BottomPanel.ts
@@ -0,0 +1,35 @@
+import type { Locator, Page } from '@playwright/test'
+
+class ShortcutsTab {
+  readonly essentialsTab: Locator
+  readonly viewControlsTab: Locator
+  readonly manageButton: Locator
+  readonly keyBadges: Locator
+  readonly subcategoryTitles: Locator
+
+  constructor(readonly page: Page) {
+    this.essentialsTab = page.getByRole('tab', { name: /Essential/i })
+    this.viewControlsTab = page.getByRole('tab', { name: /View Controls/i })
+    this.manageButton = page.getByRole('button', { name: /Manage Shortcuts/i })
+    this.keyBadges = page.locator('.key-badge')
+    this.subcategoryTitles = page.locator('.subcategory-title')
+  }
+}
+
+export class BottomPanel {
+  readonly root: Locator
+  readonly keyboardShortcutsButton: Locator
+  readonly toggleButton: Locator
+  readonly shortcuts: ShortcutsTab
+
+  constructor(readonly page: Page) {
+    this.root = page.locator('.bottom-panel')
+    this.keyboardShortcutsButton = page.getByRole('button', {
+      name: /Keyboard Shortcuts/i
+    })
+    this.toggleButton = page.getByRole('button', {
+      name: /Toggle Bottom Panel/i
+    })
+    this.shortcuts = new ShortcutsTab(page)
+  }
+}
diff --git a/browser_tests/fixtures/components/ComfyNodeSearchBox.ts b/browser_tests/fixtures/components/ComfyNodeSearchBox.ts
index 59a33e254b..c93cd56cee 100644
--- a/browser_tests/fixtures/components/ComfyNodeSearchBox.ts
+++ b/browser_tests/fixtures/components/ComfyNodeSearchBox.ts
@@ -30,7 +30,7 @@ export class ComfyNodeSearchFilterSelectionPanel {
   async addFilter(filterValue: string, filterType: string) {
     await this.selectFilterType(filterType)
     await this.selectFilterValue(filterValue)
-    await this.page.locator('button:has-text("Add")').click()
+    await this.page.getByRole('button', { name: 'Add', exact: true }).click()
   }
 }
 
@@ -55,15 +55,22 @@ export class ComfyNodeSearchBox {
 
   async fillAndSelectFirstNode(
     nodeName: string,
-    options?: { suggestionIndex: number }
+    options?: { suggestionIndex?: number; exact?: boolean }
   ) {
     await this.input.waitFor({ state: 'visible' })
     await this.input.fill(nodeName)
     await this.dropdown.waitFor({ state: 'visible' })
-    await this.dropdown
-      .locator('li')
-      .nth(options?.suggestionIndex || 0)
-      .click()
+    if (options?.exact) {
+      await this.dropdown
+        .locator(`li[aria-label="${nodeName}"]`)
+        .first()
+        .click()
+    } else {
+      await this.dropdown
+        .locator('li')
+        .nth(options?.suggestionIndex || 0)
+        .click()
+    }
   }
 
   async addFilter(filterValue: string, filterType: string) {
@@ -80,4 +87,11 @@ export class ComfyNodeSearchBox {
   async removeFilter(index: number) {
     await this.filterChips.nth(index).locator('.p-chip-remove-icon').click()
   }
+
+  /**
+   * Returns a locator for a search result containing the specified text.
+   */
+  findResult(text: string): Locator {
+    return this.dropdown.locator('li').filter({ hasText: text })
+  }
 }
diff --git a/browser_tests/fixtures/components/ComfyNodeSearchBoxV2.ts b/browser_tests/fixtures/components/ComfyNodeSearchBoxV2.ts
new file mode 100644
index 0000000000..64f6b9cebb
--- /dev/null
+++ b/browser_tests/fixtures/components/ComfyNodeSearchBoxV2.ts
@@ -0,0 +1,29 @@
+import type { Locator, Page } from '@playwright/test'
+
+import type { ComfyPage } from '../ComfyPage'
+
+export class ComfyNodeSearchBoxV2 {
+  readonly dialog: Locator
+  readonly input: Locator
+  readonly results: Locator
+  readonly filterOptions: Locator
+
+  constructor(readonly page: Page) {
+    this.dialog = page.getByRole('search')
+    this.input = this.dialog.locator('input[type="text"]')
+    this.results = this.dialog.getByTestId('result-item')
+    this.filterOptions = this.dialog.getByTestId('filter-option')
+  }
+
+  categoryButton(categoryId: string): Locator {
+    return this.dialog.getByTestId(`category-${categoryId}`)
+  }
+
+  filterBarButton(name: string): Locator {
+    return this.dialog.getByRole('button', { name })
+  }
+
+  async reload(comfyPage: ComfyPage) {
+    await comfyPage.settings.setSetting('Comfy.NodeSearchBoxImpl', 'default')
+  }
+}
diff --git a/browser_tests/fixtures/components/ContextMenu.ts b/browser_tests/fixtures/components/ContextMenu.ts
new file mode 100644
index 0000000000..c502ccdd51
--- /dev/null
+++ b/browser_tests/fixtures/components/ContextMenu.ts
@@ -0,0 +1,54 @@
+import type { Locator, Page } from '@playwright/test'
+
+export class ContextMenu {
+  constructor(public readonly page: Page) {}
+
+  get primeVueMenu() {
+    return this.page.locator('.p-contextmenu, .p-menu')
+  }
+
+  get litegraphMenu() {
+    return this.page.locator('.litemenu')
+  }
+
+  get menuItems() {
+    return this.page.locator('.p-menuitem, .litemenu-entry')
+  }
+
+  async clickMenuItem(name: string): Promise<void> {
+    await this.page.getByRole('menuitem', { name }).click()
+  }
+
+  async clickLitegraphMenuItem(name: string): Promise<void> {
+    await this.page.locator(`.litemenu-entry:has-text("${name}")`).click()
+  }
+
+  async isVisible(): Promise<boolean> {
+    const primeVueVisible = await this.primeVueMenu
+      .isVisible()
+      .catch(() => false)
+    const litegraphVisible = await this.litegraphMenu
+      .isVisible()
+      .catch(() => false)
+    return primeVueVisible || litegraphVisible
+  }
+
+  async waitForHidden(): Promise<void> {
+    const waitIfExists = async (locator: Locator, menuName: string) => {
+      const count = await locator.count()
+      if (count > 0) {
+        await locator.waitFor({ state: 'hidden' }).catch((error: Error) => {
+          console.warn(
+            `[waitForHidden] ${menuName} waitFor failed:`,
+            error.message
+          )
+        })
+      }
+    }
+
+    await Promise.all([
+      waitIfExists(this.primeVueMenu, 'primeVueMenu'),
+      waitIfExists(this.litegraphMenu, 'litegraphMenu')
+    ])
+  }
+}
diff --git a/browser_tests/fixtures/components/SettingDialog.ts b/browser_tests/fixtures/components/SettingDialog.ts
index e9040a3a9a..4965c08a8b 100644
--- a/browser_tests/fixtures/components/SettingDialog.ts
+++ b/browser_tests/fixtures/components/SettingDialog.ts
@@ -1,20 +1,20 @@
 import type { Page } from '@playwright/test'
 
 import type { ComfyPage } from '../ComfyPage'
+import { TestIds } from '../selectors'
+import { BaseDialog } from './BaseDialog'
 
-export class SettingDialog {
+export class SettingDialog extends BaseDialog {
   constructor(
-    public readonly page: Page,
+    page: Page,
     public readonly comfyPage: ComfyPage
-  ) {}
-
-  get root() {
-    return this.page.locator('div.settings-container')
+  ) {
+    super(page, TestIds.dialogs.settings)
   }
 
   async open() {
-    await this.comfyPage.executeCommand('Comfy.ShowSettingsDialog')
-    await this.page.waitForSelector('div.settings-container')
+    await this.comfyPage.command.executeCommand('Comfy.ShowSettingsDialog')
+    await this.waitForVisible()
   }
 
   /**
@@ -23,9 +23,7 @@ export class SettingDialog {
    * @param value - The value to set
    */
   async setStringSetting(id: string, value: string) {
-    const settingInputDiv = this.page.locator(
-      `div.settings-container div[id="${id}"]`
-    )
+    const settingInputDiv = this.root.locator(`div[id="${id}"]`)
     await settingInputDiv.locator('input').fill(value)
   }
 
@@ -34,15 +32,31 @@ export class SettingDialog {
    * @param id - The id of the setting
    */
   async toggleBooleanSetting(id: string) {
-    const settingInputDiv = this.page.locator(
-      `div.settings-container div[id="${id}"]`
-    )
+    const settingInputDiv = this.root.locator(`div[id="${id}"]`)
     await settingInputDiv.locator('input').click()
   }
 
+  get searchBox() {
+    return this.root.getByPlaceholder(/Search/)
+  }
+
+  get categories() {
+    return this.root.locator('nav').getByRole('button')
+  }
+
+  category(name: string) {
+    return this.root.locator('nav').getByRole('button', { name })
+  }
+
+  get contentArea() {
+    return this.root.getByRole('main')
+  }
+
   async goToAboutPanel() {
-    const aboutButton = this.page.locator('li[aria-label="About"]')
+    const aboutButton = this.root.locator('nav').getByRole('button', {
+      name: 'About'
+    })
     await aboutButton.click()
-    await this.page.waitForSelector('div.about-container')
+    await this.page.waitForSelector('.about-container')
   }
 }
diff --git a/browser_tests/fixtures/components/SidebarTab.ts b/browser_tests/fixtures/components/SidebarTab.ts
index 3254e27c84..02da0b0434 100644
--- a/browser_tests/fixtures/components/SidebarTab.ts
+++ b/browser_tests/fixtures/components/SidebarTab.ts
@@ -1,5 +1,8 @@
 import type { Locator, Page } from '@playwright/test'
 
+import type { WorkspaceStore } from '../../types/globals'
+import { TestIds } from '../selectors'
+
 class SidebarTab {
   constructor(
     public readonly page: Page,
@@ -31,16 +34,16 @@ class SidebarTab {
 }
 
 export class NodeLibrarySidebarTab extends SidebarTab {
-  constructor(public readonly page: Page) {
+  constructor(public override readonly page: Page) {
     super(page, 'node-library')
   }
 
   get nodeLibrarySearchBoxInput() {
-    return this.page.locator('.node-lib-search-box input[type="text"]')
+    return this.page.getByPlaceholder('Search Nodes...')
   }
 
   get nodeLibraryTree() {
-    return this.page.locator('.node-lib-tree-explorer')
+    return this.page.getByTestId(TestIds.sidebar.nodeLibrary)
   }
 
   get nodePreview() {
@@ -55,12 +58,12 @@ export class NodeLibrarySidebarTab extends SidebarTab {
     return this.tabContainer.locator('.new-folder-button')
   }
 
-  async open() {
+  override async open() {
     await super.open()
     await this.nodeLibraryTree.waitFor({ state: 'visible' })
   }
 
-  async close() {
+  override async close() {
     if (!this.tabButton.isVisible()) {
       return
     }
@@ -69,30 +72,40 @@ export class NodeLibrarySidebarTab extends SidebarTab {
     await this.nodeLibraryTree.waitFor({ state: 'hidden' })
   }
 
-  folderSelector(folderName: string) {
-    return `.p-tree-node-content:has(> .tree-explorer-node-label:has(.tree-folder .node-label:has-text("${folderName}")))`
-  }
-
   getFolder(folderName: string) {
-    return this.page.locator(this.folderSelector(folderName))
-  }
-
-  nodeSelector(nodeName: string) {
-    return `.p-tree-node-content:has(> .tree-explorer-node-label:has(.tree-leaf .node-label:has-text("${nodeName}")))`
+    return this.page.locator(
+      `[data-testid="node-tree-folder"][data-folder-name="${folderName}"]`
+    )
   }
 
   getNode(nodeName: string) {
-    return this.page.locator(this.nodeSelector(nodeName))
+    return this.page.locator(
+      `[data-testid="node-tree-leaf"][data-node-name="${nodeName}"]`
+    )
+  }
+
+  nodeSelector(nodeName: string): string {
+    return `[data-testid="node-tree-leaf"][data-node-name="${nodeName}"]`
+  }
+
+  folderSelector(folderName: string): string {
+    return `[data-testid="node-tree-folder"][data-folder-name="${folderName}"]`
+  }
+
+  getNodeInFolder(nodeName: string, folderName: string) {
+    return this.getFolder(folderName)
+      .locator('xpath=ancestor::li')
+      .locator(`[data-testid="node-tree-leaf"][data-node-name="${nodeName}"]`)
   }
 }
 
 export class WorkflowsSidebarTab extends SidebarTab {
-  constructor(public readonly page: Page) {
+  constructor(public override readonly page: Page) {
     super(page, 'workflows')
   }
 
   get root() {
-    return this.page.locator('.workflows-sidebar-tab')
+    return this.page.getByTestId(TestIds.sidebar.workflows)
   }
 
   async getOpenedWorkflowNames() {
@@ -140,7 +153,9 @@ export class WorkflowsSidebarTab extends SidebarTab {
 
     // Wait for workflow service to finish renaming
     await this.page.waitForFunction(
-      () => !window['app']?.extensionManager?.workflow?.isBusy,
+      () =>
+        !(window.app?.extensionManager as WorkspaceStore | undefined)?.workflow
+          ?.isBusy,
       undefined,
       { timeout: 3000 }
     )
diff --git a/browser_tests/fixtures/components/Topbar.ts b/browser_tests/fixtures/components/Topbar.ts
index c5e7c81550..e91311c7b3 100644
--- a/browser_tests/fixtures/components/Topbar.ts
+++ b/browser_tests/fixtures/components/Topbar.ts
@@ -1,5 +1,6 @@
 import type { Locator, Page } from '@playwright/test'
-import { expect } from '@playwright/test'
+
+import type { WorkspaceStore } from '../../types/globals'
 
 export class Topbar {
   private readonly menuLocator: Locator
@@ -57,7 +58,7 @@ export class Topbar {
 
   async closeWorkflowTab(tabName: string) {
     const tab = this.getWorkflowTab(tabName)
-    await tab.locator('.close-button').click({ force: true })
+    await tab.getByRole('button', { name: 'Close' }).click({ force: true })
   }
 
   getSaveDialog(): Locator {
@@ -86,7 +87,7 @@ export class Topbar {
 
     // Wait for workflow service to finish saving
     await this.page.waitForFunction(
-      () => !window['app'].extensionManager.workflow.isBusy,
+      () => !(window.app!.extensionManager as WorkspaceStore).workflow.isBusy,
       undefined,
       { timeout: 3000 }
     )
@@ -122,7 +123,7 @@ export class Topbar {
    */
   async closeTopbarMenu() {
     await this.page.locator('body').click({ position: { x: 300, y: 10 } })
-    await expect(this.menuLocator).not.toBeVisible()
+    await this.menuLocator.waitFor({ state: 'hidden' })
   }
 
   /**
diff --git a/browser_tests/fixtures/constants/defaultGraphPositions.ts b/browser_tests/fixtures/constants/defaultGraphPositions.ts
new file mode 100644
index 0000000000..576aecad66
--- /dev/null
+++ b/browser_tests/fixtures/constants/defaultGraphPositions.ts
@@ -0,0 +1,51 @@
+import type { Position } from './types'
+
+/**
+ * Hardcoded positions for the default graph loaded in tests.
+ * These coordinates are specific to the default workflow viewport.
+ */
+export const DefaultGraphPositions = {
+  // Node click positions
+  textEncodeNode1: { x: 618, y: 191 },
+  textEncodeNode2: { x: 622, y: 400 },
+  textEncodeNodeToggler: { x: 430, y: 171 },
+  emptySpaceClick: { x: 35, y: 31 },
+
+  // Slot positions
+  clipTextEncodeNode1InputSlot: { x: 427, y: 198 },
+  clipTextEncodeNode2InputSlot: { x: 422, y: 402 },
+  clipTextEncodeNode2InputLinkPath: { x: 395, y: 422 },
+  loadCheckpointNodeClipOutputSlot: { x: 332, y: 509 },
+  emptySpace: { x: 427, y: 98 },
+
+  // Widget positions
+  emptyLatentWidgetClick: { x: 724, y: 645 },
+
+  // Node positions and sizes for resize operations
+  ksampler: {
+    pos: { x: 863, y: 156 },
+    size: { width: 315, height: 292 }
+  },
+  loadCheckpoint: {
+    pos: { x: 26, y: 444 },
+    size: { width: 315, height: 127 }
+  },
+  emptyLatent: {
+    pos: { x: 473, y: 579 },
+    size: { width: 315, height: 136 }
+  }
+} as const satisfies {
+  textEncodeNode1: Position
+  textEncodeNode2: Position
+  textEncodeNodeToggler: Position
+  emptySpaceClick: Position
+  clipTextEncodeNode1InputSlot: Position
+  clipTextEncodeNode2InputSlot: Position
+  clipTextEncodeNode2InputLinkPath: Position
+  loadCheckpointNodeClipOutputSlot: Position
+  emptySpace: Position
+  emptyLatentWidgetClick: Position
+  ksampler: { pos: Position; size: { width: number; height: number } }
+  loadCheckpoint: { pos: Position; size: { width: number; height: number } }
+  emptyLatent: { pos: Position; size: { width: number; height: number } }
+}
diff --git a/browser_tests/fixtures/constants/types.ts b/browser_tests/fixtures/constants/types.ts
new file mode 100644
index 0000000000..57aece7a2b
--- /dev/null
+++ b/browser_tests/fixtures/constants/types.ts
@@ -0,0 +1,9 @@
+export interface Position {
+  x: number
+  y: number
+}
+
+export interface Size {
+  width: number
+  height: number
+}
diff --git a/browser_tests/fixtures/helpers/CanvasHelper.ts b/browser_tests/fixtures/helpers/CanvasHelper.ts
new file mode 100644
index 0000000000..dfd730c8ea
--- /dev/null
+++ b/browser_tests/fixtures/helpers/CanvasHelper.ts
@@ -0,0 +1,184 @@
+import type { Locator, Page } from '@playwright/test'
+
+import { DefaultGraphPositions } from '../constants/defaultGraphPositions'
+import type { Position } from '../types'
+
+export class CanvasHelper {
+  constructor(
+    private page: Page,
+    private canvas: Locator,
+    private resetViewButton: Locator
+  ) {}
+
+  private async nextFrame(): Promise<void> {
+    await this.page.evaluate(() => {
+      return new Promise<number>(requestAnimationFrame)
+    })
+  }
+
+  async resetView(): Promise<void> {
+    if (await this.resetViewButton.isVisible()) {
+      await this.resetViewButton.click()
+    }
+    await this.page.mouse.move(10, 10)
+    await this.nextFrame()
+  }
+
+  async zoom(deltaY: number, steps: number = 1): Promise<void> {
+    await this.page.mouse.move(10, 10)
+    for (let i = 0; i < steps; i++) {
+      await this.page.mouse.wheel(0, deltaY)
+    }
+    await this.nextFrame()
+  }
+
+  async pan(offset: Position, safeSpot?: Position): Promise<void> {
+    safeSpot = safeSpot || { x: 10, y: 10 }
+    await this.page.mouse.move(safeSpot.x, safeSpot.y)
+    await this.page.mouse.down()
+    await this.page.mouse.move(offset.x + safeSpot.x, offset.y + safeSpot.y)
+    await this.page.mouse.up()
+    await this.nextFrame()
+  }
+
+  async panWithTouch(offset: Position, safeSpot?: Position): Promise<void> {
+    safeSpot = safeSpot || { x: 10, y: 10 }
+    const client = await this.page.context().newCDPSession(this.page)
+    await client.send('Input.dispatchTouchEvent', {
+      type: 'touchStart',
+      touchPoints: [safeSpot]
+    })
+    await client.send('Input.dispatchTouchEvent', {
+      type: 'touchMove',
+      touchPoints: [{ x: offset.x + safeSpot.x, y: offset.y + safeSpot.y }]
+    })
+    await client.send('Input.dispatchTouchEvent', {
+      type: 'touchEnd',
+      touchPoints: []
+    })
+    await this.nextFrame()
+  }
+
+  async rightClick(x: number = 10, y: number = 10): Promise<void> {
+    await this.page.mouse.click(x, y, { button: 'right' })
+    await this.nextFrame()
+  }
+
+  async doubleClick(): Promise<void> {
+    await this.page.mouse.dblclick(10, 10, { delay: 5 })
+    await this.nextFrame()
+  }
+
+  async click(position: Position): Promise<void> {
+    await this.canvas.click({ position })
+    await this.nextFrame()
+  }
+
+  async clickEmptySpace(): Promise<void> {
+    await this.canvas.click({ position: DefaultGraphPositions.emptySpaceClick })
+    await this.nextFrame()
+  }
+
+  async dragAndDrop(source: Position, target: Position): Promise<void> {
+    await this.page.mouse.move(source.x, source.y)
+    await this.page.mouse.down()
+    await this.page.mouse.move(target.x, target.y, { steps: 100 })
+    await this.page.mouse.up()
+    await this.nextFrame()
+  }
+
+  async moveMouseToEmptyArea(): Promise<void> {
+    await this.page.mouse.move(10, 10)
+  }
+
+  async getScale(): Promise<number> {
+    return this.page.evaluate(() => {
+      return window.app!.canvas.ds.scale
+    })
+  }
+
+  async setScale(scale: number): Promise<void> {
+    await this.page.evaluate((s) => {
+      window.app!.canvas.ds.scale = s
+    }, scale)
+    await this.nextFrame()
+  }
+
+  async convertOffsetToCanvas(
+    pos: [number, number]
+  ): Promise<[number, number]> {
+    return this.page.evaluate((pos) => {
+      return window.app!.canvas.ds.convertOffsetToCanvas(pos)
+    }, pos)
+  }
+
+  async getNodeCenterByTitle(title: string): Promise<Position | null> {
+    return this.page.evaluate((title) => {
+      const app = window.app!
+      const node = app.graph.nodes.find(
+        (n: { title: string }) => n.title === title
+      )
+      if (!node) return null
+
+      const centerX = node.pos[0] + node.size[0] / 2
+      const centerY = node.pos[1] + node.size[1] / 2
+      const [clientX, clientY] = app.canvasPosToClientPos([centerX, centerY])
+      return { x: clientX, y: clientY }
+    }, title)
+  }
+
+  async getGroupPosition(title: string): Promise<Position> {
+    const pos = await this.page.evaluate((title) => {
+      const groups = window.app!.graph.groups
+      const group = groups.find((g: { title: string }) => g.title === title)
+      if (!group) return null
+      return { x: group.pos[0], y: group.pos[1] }
+    }, title)
+    if (!pos) throw new Error(`Group "${title}" not found`)
+    return pos
+  }
+
+  async dragGroup(options: {
+    name: string
+    deltaX: number
+    deltaY: number
+  }): Promise<void> {
+    const { name, deltaX, deltaY } = options
+    const screenPos = await this.page.evaluate((title) => {
+      const app = window.app!
+      const groups = app.graph.groups
+      const group = 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] }
+    }, name)
+    if (!screenPos) throw new Error(`Group "${name}" not found`)
+
+    await this.dragAndDrop(screenPos, {
+      x: screenPos.x + deltaX,
+      y: screenPos.y + deltaY
+    })
+  }
+
+  async disconnectEdge(): Promise<void> {
+    await this.dragAndDrop(
+      DefaultGraphPositions.clipTextEncodeNode1InputSlot,
+      DefaultGraphPositions.emptySpace
+    )
+  }
+
+  async connectEdge(options: { reverse?: boolean } = {}): Promise<void> {
+    const { reverse = false } = options
+    const start = reverse
+      ? DefaultGraphPositions.clipTextEncodeNode1InputSlot
+      : DefaultGraphPositions.loadCheckpointNodeClipOutputSlot
+    const end = reverse
+      ? DefaultGraphPositions.loadCheckpointNodeClipOutputSlot
+      : DefaultGraphPositions.clipTextEncodeNode1InputSlot
+
+    await this.dragAndDrop(start, end)
+  }
+}
diff --git a/browser_tests/fixtures/helpers/ClipboardHelper.ts b/browser_tests/fixtures/helpers/ClipboardHelper.ts
new file mode 100644
index 0000000000..074c3d19fa
--- /dev/null
+++ b/browser_tests/fixtures/helpers/ClipboardHelper.ts
@@ -0,0 +1,15 @@
+import type { Locator } from '@playwright/test'
+
+import type { KeyboardHelper } from './KeyboardHelper'
+
+export class ClipboardHelper {
+  constructor(private readonly keyboard: KeyboardHelper) {}
+
+  async copy(locator?: Locator | null): Promise<void> {
+    await this.keyboard.ctrlSend('KeyC', locator ?? null)
+  }
+
+  async paste(locator?: Locator | null): Promise<void> {
+    await this.keyboard.ctrlSend('KeyV', locator ?? null)
+  }
+}
diff --git a/browser_tests/fixtures/helpers/CommandHelper.ts b/browser_tests/fixtures/helpers/CommandHelper.ts
new file mode 100644
index 0000000000..c46906afd9
--- /dev/null
+++ b/browser_tests/fixtures/helpers/CommandHelper.ts
@@ -0,0 +1,87 @@
+import type { Page } from '@playwright/test'
+
+import type { KeyCombo } from '../../../src/platform/keybindings/types'
+
+export class CommandHelper {
+  constructor(private readonly page: Page) {}
+
+  async executeCommand(
+    commandId: string,
+    metadata?: Record<string, unknown>
+  ): Promise<void> {
+    await this.page.evaluate(
+      ({ commandId, metadata }) => {
+        const app = window.app
+        if (!app) throw new Error('window.app is not available')
+
+        return app.extensionManager.command.execute(commandId, {
+          metadata
+        })
+      },
+      { commandId, metadata }
+    )
+  }
+
+  async registerCommand(
+    commandId: string,
+    command: (() => void) | (() => Promise<void>)
+  ): Promise<void> {
+    // SECURITY: eval() is intentionally used here to deserialize/execute functions
+    // passed from controlled test code across the Node/Playwright browser boundary.
+    // Execution happens in isolated Playwright browser contexts with test-only data.
+    // This pattern is unsafe for production and must not be copied elsewhere.
+    await this.page.evaluate(
+      ({ commandId, commandStr }) => {
+        const app = window.app!
+        const randomSuffix = Math.random().toString(36).substring(2, 8)
+        const extensionName = `TestExtension_${randomSuffix}`
+
+        app.registerExtension({
+          name: extensionName,
+          commands: [
+            {
+              id: commandId,
+              function: eval(commandStr)
+            }
+          ]
+        })
+      },
+      { commandId, commandStr: command.toString() }
+    )
+  }
+
+  async registerKeybinding(
+    keyCombo: KeyCombo,
+    command: () => void
+  ): Promise<void> {
+    // SECURITY: eval() is intentionally used here to deserialize/execute functions
+    // passed from controlled test code across the Node/Playwright browser boundary.
+    // Execution happens in isolated Playwright browser contexts with test-only data.
+    // This pattern is unsafe for production and must not be copied elsewhere.
+    await this.page.evaluate(
+      ({ keyCombo, commandStr }) => {
+        const app = window.app!
+        const randomSuffix = Math.random().toString(36).substring(2, 8)
+        const extensionName = `TestExtension_${randomSuffix}`
+        const commandId = `TestCommand_${randomSuffix}`
+
+        app.registerExtension({
+          name: extensionName,
+          keybindings: [
+            {
+              combo: keyCombo,
+              commandId: commandId
+            }
+          ],
+          commands: [
+            {
+              id: commandId,
+              function: eval(commandStr)
+            }
+          ]
+        })
+      },
+      { keyCombo, commandStr: command.toString() }
+    )
+  }
+}
diff --git a/browser_tests/fixtures/helpers/DragDropHelper.ts b/browser_tests/fixtures/helpers/DragDropHelper.ts
new file mode 100644
index 0000000000..181404d8b6
--- /dev/null
+++ b/browser_tests/fixtures/helpers/DragDropHelper.ts
@@ -0,0 +1,171 @@
+import { readFileSync } from 'fs'
+
+import type { Page } from '@playwright/test'
+
+import type { Position } from '../types'
+
+export class DragDropHelper {
+  constructor(
+    private readonly page: Page,
+    private readonly assetPath: (fileName: string) => string
+  ) {}
+
+  private async nextFrame(): Promise<void> {
+    await this.page.evaluate(() => {
+      return new Promise<void>((resolve) => {
+        requestAnimationFrame(() => resolve())
+      })
+    })
+  }
+
+  async dragAndDropExternalResource(
+    options: {
+      fileName?: string
+      url?: string
+      dropPosition?: Position
+      waitForUpload?: boolean
+    } = {}
+  ): Promise<void> {
+    const {
+      dropPosition = { x: 100, y: 100 },
+      fileName,
+      url,
+      waitForUpload = false
+    } = options
+
+    if (!fileName && !url)
+      throw new Error('Must provide either fileName or url')
+
+    const evaluateParams: {
+      dropPosition: Position
+      fileName?: string
+      fileType?: string
+      buffer?: Uint8Array | number[]
+      url?: string
+    } = { dropPosition }
+
+    if (fileName) {
+      const filePath = this.assetPath(fileName)
+      const buffer = readFileSync(filePath)
+
+      const getFileType = (fileName: string) => {
+        if (fileName.endsWith('.png')) return 'image/png'
+        if (fileName.endsWith('.svg')) return 'image/svg+xml'
+        if (fileName.endsWith('.webp')) return 'image/webp'
+        if (fileName.endsWith('.webm')) return 'video/webm'
+        if (fileName.endsWith('.json')) return 'application/json'
+        if (fileName.endsWith('.glb')) return 'model/gltf-binary'
+        if (fileName.endsWith('.avif')) return 'image/avif'
+        return 'application/octet-stream'
+      }
+
+      evaluateParams.fileName = fileName
+      evaluateParams.fileType = getFileType(fileName)
+      evaluateParams.buffer = [...new Uint8Array(buffer)]
+    }
+
+    if (url) evaluateParams.url = url
+
+    const uploadResponsePromise = waitForUpload
+      ? this.page.waitForResponse(
+          (resp) => resp.url().includes('/upload/') && resp.status() === 200,
+          { timeout: 10000 }
+        )
+      : null
+
+    await this.page.evaluate(async (params) => {
+      const dataTransfer = new DataTransfer()
+
+      if (params.buffer && params.fileName && params.fileType) {
+        const file = new File(
+          [new Uint8Array(params.buffer)],
+          params.fileName,
+          {
+            type: params.fileType
+          }
+        )
+        dataTransfer.items.add(file)
+      }
+
+      if (params.url) {
+        dataTransfer.setData('text/uri-list', params.url)
+        dataTransfer.setData('text/x-moz-url', params.url)
+      }
+
+      const targetElement = document.elementFromPoint(
+        params.dropPosition.x,
+        params.dropPosition.y
+      )
+
+      if (!targetElement) {
+        throw new Error(
+          `No element found at drop position: (${params.dropPosition.x}, ${params.dropPosition.y}). ` +
+            `document.elementFromPoint returned null. Ensure the target is visible and not obscured.`
+        )
+      }
+
+      const eventOptions = {
+        bubbles: true,
+        cancelable: true,
+        dataTransfer,
+        clientX: params.dropPosition.x,
+        clientY: params.dropPosition.y
+      }
+
+      const dragOverEvent = new DragEvent('dragover', eventOptions)
+      const dropEvent = new DragEvent('drop', eventOptions)
+
+      const graphCanvasElement = document.querySelector('#graph-canvas')
+
+      // Keep Litegraph's drag-over node tracking in sync when the drop target is a
+      // Vue node DOM overlay outside of the graph canvas element.
+      if (graphCanvasElement && !graphCanvasElement.contains(targetElement)) {
+        graphCanvasElement.dispatchEvent(
+          new DragEvent('dragover', eventOptions)
+        )
+      }
+
+      Object.defineProperty(dropEvent, 'preventDefault', {
+        value: () => {},
+        writable: false
+      })
+
+      Object.defineProperty(dropEvent, 'stopPropagation', {
+        value: () => {},
+        writable: false
+      })
+
+      targetElement.dispatchEvent(dragOverEvent)
+      targetElement.dispatchEvent(dropEvent)
+
+      return {
+        success: true,
+        targetInfo: {
+          tagName: targetElement.tagName,
+          id: targetElement.id,
+          classList: Array.from(targetElement.classList)
+        }
+      }
+    }, evaluateParams)
+
+    if (uploadResponsePromise) {
+      await uploadResponsePromise
+    }
+
+    await this.nextFrame()
+  }
+
+  async dragAndDropFile(
+    fileName: string,
+    options: { dropPosition?: Position; waitForUpload?: boolean } = {}
+  ): Promise<void> {
+    return this.dragAndDropExternalResource({ fileName, ...options })
+  }
+
+  async dragAndDropURL(
+    url: string,
+    options: { dropPosition?: Position } = {}
+  ): Promise<void> {
+    return this.dragAndDropExternalResource({ url, ...options })
+  }
+}
diff --git a/browser_tests/fixtures/helpers/KeyboardHelper.ts b/browser_tests/fixtures/helpers/KeyboardHelper.ts
new file mode 100644
index 0000000000..b2c30346eb
--- /dev/null
+++ b/browser_tests/fixtures/helpers/KeyboardHelper.ts
@@ -0,0 +1,45 @@
+import type { Locator, Page } from '@playwright/test'
+
+export class KeyboardHelper {
+  constructor(
+    private readonly page: Page,
+    private readonly canvas: Locator
+  ) {}
+
+  private async nextFrame(): Promise<void> {
+    await this.page.evaluate(() => new Promise<number>(requestAnimationFrame))
+  }
+
+  async ctrlSend(
+    keyToPress: string,
+    locator: Locator | null = this.canvas
+  ): Promise<void> {
+    const target = locator ?? this.page.keyboard
+    await target.press(`Control+${keyToPress}`)
+    await this.nextFrame()
+  }
+
+  async selectAll(locator?: Locator | null): Promise<void> {
+    await this.ctrlSend('KeyA', locator)
+  }
+
+  async bypass(locator?: Locator | null): Promise<void> {
+    await this.ctrlSend('KeyB', locator)
+  }
+
+  async undo(locator?: Locator | null): Promise<void> {
+    await this.ctrlSend('KeyZ', locator)
+  }
+
+  async redo(locator?: Locator | null): Promise<void> {
+    await this.ctrlSend('KeyY', locator)
+  }
+
+  async moveUp(locator?: Locator | null): Promise<void> {
+    await this.ctrlSend('ArrowUp', locator)
+  }
+
+  async moveDown(locator?: Locator | null): Promise<void> {
+    await this.ctrlSend('ArrowDown', locator)
+  }
+}
diff --git a/browser_tests/fixtures/helpers/NodeOperationsHelper.ts b/browser_tests/fixtures/helpers/NodeOperationsHelper.ts
new file mode 100644
index 0000000000..429809679b
--- /dev/null
+++ b/browser_tests/fixtures/helpers/NodeOperationsHelper.ts
@@ -0,0 +1,186 @@
+import type { Locator } from '@playwright/test'
+
+import type {
+  LGraph,
+  LGraphNode
+} from '../../../src/lib/litegraph/src/litegraph'
+import type { NodeId } from '../../../src/platform/workflow/validation/schemas/workflowSchema'
+import type { ComfyPage } from '../ComfyPage'
+import { DefaultGraphPositions } from '../constants/defaultGraphPositions'
+import type { Position, Size } from '../types'
+import { NodeReference } from '../utils/litegraphUtils'
+
+export class NodeOperationsHelper {
+  constructor(private comfyPage: ComfyPage) {}
+
+  private get page() {
+    return this.comfyPage.page
+  }
+
+  async getGraphNodesCount(): Promise<number> {
+    return await this.page.evaluate(() => {
+      return window.app?.graph?.nodes?.length || 0
+    })
+  }
+
+  async getSelectedGraphNodesCount(): Promise<number> {
+    return await this.page.evaluate(() => {
+      return (
+        window.app?.graph?.nodes?.filter(
+          (node: LGraphNode) => node.is_selected === true
+        ).length || 0
+      )
+    })
+  }
+
+  async getNodeCount(): Promise<number> {
+    return await this.page.evaluate(() => window.app!.graph.nodes.length)
+  }
+
+  async getNodes(): Promise<LGraphNode[]> {
+    return await this.page.evaluate(() => {
+      return window.app!.graph.nodes
+    })
+  }
+
+  async waitForGraphNodes(count: number): Promise<void> {
+    await this.page.waitForFunction((count) => {
+      return window.app?.canvas.graph?.nodes?.length === count
+    }, count)
+  }
+
+  async getFirstNodeRef(): Promise<NodeReference | null> {
+    const id = await this.page.evaluate(() => {
+      return window.app!.graph.nodes[0]?.id
+    })
+    if (!id) return null
+    return this.getNodeRefById(id)
+  }
+
+  async getNodeRefById(id: NodeId): Promise<NodeReference> {
+    return new NodeReference(id, this.comfyPage)
+  }
+
+  async getNodeRefsByType(
+    type: string,
+    includeSubgraph: boolean = false
+  ): Promise<NodeReference[]> {
+    return Promise.all(
+      (
+        await this.page.evaluate(
+          ({ type, includeSubgraph }) => {
+            const graph = (
+              includeSubgraph ? window.app!.canvas.graph : window.app!.graph
+            ) as LGraph
+            const nodes = graph.nodes
+            return nodes
+              .filter((n: LGraphNode) => n.type === type)
+              .map((n: LGraphNode) => n.id)
+          },
+          { type, includeSubgraph }
+        )
+      ).map((id: NodeId) => this.getNodeRefById(id))
+    )
+  }
+
+  async getNodeRefsByTitle(title: string): Promise<NodeReference[]> {
+    return Promise.all(
+      (
+        await this.page.evaluate((title) => {
+          return window
+            .app!.graph.nodes.filter((n: LGraphNode) => n.title === title)
+            .map((n: LGraphNode) => n.id)
+        }, title)
+      ).map((id: NodeId) => this.getNodeRefById(id))
+    )
+  }
+
+  async selectNodes(nodeTitles: string[]): Promise<void> {
+    await this.page.keyboard.down('Control')
+    try {
+      for (const nodeTitle of nodeTitles) {
+        const nodes = await this.getNodeRefsByTitle(nodeTitle)
+        for (const node of nodes) {
+          await node.click('title')
+        }
+      }
+    } finally {
+      await this.page.keyboard.up('Control')
+      await this.comfyPage.nextFrame()
+    }
+  }
+
+  async resizeNode(
+    nodePos: Position,
+    nodeSize: Size,
+    ratioX: number,
+    ratioY: number,
+    revertAfter: boolean = false
+  ): Promise<void> {
+    const bottomRight = {
+      x: nodePos.x + nodeSize.width,
+      y: nodePos.y + nodeSize.height
+    }
+    const target = {
+      x: nodePos.x + nodeSize.width * ratioX,
+      y: nodePos.y + nodeSize.height * ratioY
+    }
+    // -1 to be inside the node.  -2 because nodes currently get an arbitrary +1 to width.
+    await this.comfyPage.canvasOps.dragAndDrop(
+      { x: bottomRight.x - 2, y: bottomRight.y - 1 },
+      target
+    )
+    await this.comfyPage.nextFrame()
+    if (revertAfter) {
+      await this.comfyPage.canvasOps.dragAndDrop(
+        { x: target.x - 2, y: target.y - 1 },
+        bottomRight
+      )
+      await this.comfyPage.nextFrame()
+    }
+  }
+
+  async convertAllNodesToGroupNode(groupNodeName: string): Promise<void> {
+    await this.comfyPage.canvas.press('Control+a')
+    const node = await this.getFirstNodeRef()
+    if (!node) {
+      throw new Error('No nodes found to convert')
+    }
+    await node.clickContextMenuOption('Convert to Group Node')
+    await this.fillPromptDialog(groupNodeName)
+    await this.comfyPage.nextFrame()
+  }
+
+  get promptDialogInput(): Locator {
+    return this.page.locator('.p-dialog-content input[type="text"]')
+  }
+
+  async fillPromptDialog(value: string): Promise<void> {
+    await this.promptDialogInput.fill(value)
+    await this.page.keyboard.press('Enter')
+    await this.promptDialogInput.waitFor({ state: 'hidden' })
+    await this.comfyPage.nextFrame()
+  }
+
+  async dragTextEncodeNode2(): Promise<void> {
+    await this.comfyPage.canvasOps.dragAndDrop(
+      DefaultGraphPositions.textEncodeNode2,
+      {
+        x: DefaultGraphPositions.textEncodeNode2.x,
+        y: 300
+      }
+    )
+    await this.comfyPage.nextFrame()
+  }
+
+  async adjustEmptyLatentWidth(): Promise<void> {
+    await this.page.locator('#graph-canvas').click({
+      position: DefaultGraphPositions.emptyLatentWidgetClick
+    })
+    const dialogInput = this.page.locator('.graphdialog input[type="text"]')
+    await dialogInput.click()
+    await dialogInput.fill('128')
+    await dialogInput.press('Enter')
+    await this.comfyPage.nextFrame()
+  }
+}
diff --git a/browser_tests/fixtures/helpers/PerformanceHelper.ts b/browser_tests/fixtures/helpers/PerformanceHelper.ts
new file mode 100644
index 0000000000..f02a03f21a
--- /dev/null
+++ b/browser_tests/fixtures/helpers/PerformanceHelper.ts
@@ -0,0 +1,96 @@
+import type { CDPSession, Page } from '@playwright/test'
+
+interface PerfSnapshot {
+  RecalcStyleCount: number
+  RecalcStyleDuration: number
+  LayoutCount: number
+  LayoutDuration: number
+  TaskDuration: number
+  JSHeapUsedSize: number
+  Timestamp: number
+}
+
+export interface PerfMeasurement {
+  name: string
+  durationMs: number
+  styleRecalcs: number
+  styleRecalcDurationMs: number
+  layouts: number
+  layoutDurationMs: number
+  taskDurationMs: number
+  heapDeltaBytes: number
+}
+
+export class PerformanceHelper {
+  private cdp: CDPSession | null = null
+  private snapshot: PerfSnapshot | null = null
+
+  constructor(private readonly page: Page) {}
+
+  async init(): Promise<void> {
+    this.cdp = await this.page.context().newCDPSession(this.page)
+    await this.cdp.send('Performance.enable')
+  }
+
+  async dispose(): Promise<void> {
+    this.snapshot = null
+    if (this.cdp) {
+      try {
+        await this.cdp.send('Performance.disable')
+      } finally {
+        await this.cdp.detach()
+        this.cdp = null
+      }
+    }
+  }
+
+  private async getSnapshot(): Promise<PerfSnapshot> {
+    if (!this.cdp) throw new Error('PerformanceHelper not initialized')
+    const { metrics } = (await this.cdp.send('Performance.getMetrics')) as {
+      metrics: { name: string; value: number }[]
+    }
+    function get(name: string): number {
+      return metrics.find((m) => m.name === name)?.value ?? 0
+    }
+    return {
+      RecalcStyleCount: get('RecalcStyleCount'),
+      RecalcStyleDuration: get('RecalcStyleDuration'),
+      LayoutCount: get('LayoutCount'),
+      LayoutDuration: get('LayoutDuration'),
+      TaskDuration: get('TaskDuration'),
+      JSHeapUsedSize: get('JSHeapUsedSize'),
+      Timestamp: get('Timestamp')
+    }
+  }
+
+  async startMeasuring(): Promise<void> {
+    if (this.snapshot) {
+      throw new Error(
+        'Measurement already in progress — call stopMeasuring() first'
+      )
+    }
+    this.snapshot = await this.getSnapshot()
+  }
+
+  async stopMeasuring(name: string): Promise<PerfMeasurement> {
+    if (!this.snapshot) throw new Error('Call startMeasuring() first')
+    const after = await this.getSnapshot()
+    const before = this.snapshot
+    this.snapshot = null
+
+    function delta(key: keyof PerfSnapshot): number {
+      return after[key] - before[key]
+    }
+
+    return {
+      name,
+      durationMs: delta('Timestamp') * 1000,
+      styleRecalcs: delta('RecalcStyleCount'),
+      styleRecalcDurationMs: delta('RecalcStyleDuration') * 1000,
+      layouts: delta('LayoutCount'),
+      layoutDurationMs: delta('LayoutDuration') * 1000,
+      taskDurationMs: delta('TaskDuration') * 1000,
+      heapDeltaBytes: delta('JSHeapUsedSize')
+    }
+  }
+}
diff --git a/browser_tests/fixtures/helpers/SettingsHelper.ts b/browser_tests/fixtures/helpers/SettingsHelper.ts
new file mode 100644
index 0000000000..8ff512d95c
--- /dev/null
+++ b/browser_tests/fixtures/helpers/SettingsHelper.ts
@@ -0,0 +1,20 @@
+import type { Page } from '@playwright/test'
+
+export class SettingsHelper {
+  constructor(private readonly page: Page) {}
+
+  async setSetting(settingId: string, settingValue: unknown): Promise<void> {
+    await this.page.evaluate(
+      async ({ id, value }) => {
+        await window.app!.extensionManager.setting.set(id, value)
+      },
+      { id: settingId, value: settingValue }
+    )
+  }
+
+  async getSetting<T = unknown>(settingId: string): Promise<T> {
+    return (await this.page.evaluate(async (id) => {
+      return await window.app!.extensionManager.setting.get(id)
+    }, settingId)) as T
+  }
+}
diff --git a/browser_tests/fixtures/helpers/SubgraphHelper.ts b/browser_tests/fixtures/helpers/SubgraphHelper.ts
new file mode 100644
index 0000000000..eed6cf585b
--- /dev/null
+++ b/browser_tests/fixtures/helpers/SubgraphHelper.ts
@@ -0,0 +1,325 @@
+import type { Page } from '@playwright/test'
+
+import type {
+  CanvasPointerEvent,
+  Subgraph
+} from '@/lib/litegraph/src/litegraph'
+
+import type { ComfyPage } from '../ComfyPage'
+import type { NodeReference } from '../utils/litegraphUtils'
+import { SubgraphSlotReference } from '../utils/litegraphUtils'
+
+export class SubgraphHelper {
+  constructor(private readonly comfyPage: ComfyPage) {}
+
+  private get page(): Page {
+    return this.comfyPage.page
+  }
+
+  /**
+   * Core helper method for interacting with subgraph I/O slots.
+   * Handles both input/output slots and both right-click/double-click actions.
+   *
+   * @param slotType - 'input' or 'output'
+   * @param action - 'rightClick' or 'doubleClick'
+   * @param slotName - Optional specific slot name to target
+   */
+  private async interactWithSubgraphSlot(
+    slotType: 'input' | 'output',
+    action: 'rightClick' | 'doubleClick',
+    slotName?: string
+  ): Promise<void> {
+    const foundSlot = await this.page.evaluate(
+      async (params) => {
+        const { slotType, action, targetSlotName } = params
+        const app = window.app!
+        const currentGraph = app.canvas!.graph!
+
+        // Check if we're in a subgraph
+        if (!('inputNode' in currentGraph)) {
+          throw new Error(
+            'Not in a subgraph - this method only works inside subgraphs'
+          )
+        }
+
+        const subgraph = currentGraph as Subgraph
+
+        // Get the appropriate node and slots
+        const node =
+          slotType === 'input' ? subgraph.inputNode : subgraph.outputNode
+        const slots = slotType === 'input' ? subgraph.inputs : subgraph.outputs
+
+        if (!node) {
+          throw new Error(`No ${slotType} node found in subgraph`)
+        }
+
+        if (!slots || slots.length === 0) {
+          throw new Error(`No ${slotType} slots found in subgraph`)
+        }
+
+        // Filter slots based on target name and action type
+        const slotsToTry = targetSlotName
+          ? slots.filter((slot) => slot.name === targetSlotName)
+          : action === 'rightClick'
+            ? slots
+            : [slots[0]] // Right-click tries all, double-click uses first
+
+        if (slotsToTry.length === 0) {
+          throw new Error(
+            targetSlotName
+              ? `${slotType} slot '${targetSlotName}' not found`
+              : `No ${slotType} slots available to try`
+          )
+        }
+
+        // Handle the interaction based on action type
+        if (action === 'rightClick') {
+          // Right-click: try each slot until one works
+          for (const slot of slotsToTry) {
+            if (!slot.pos) continue
+
+            const event = {
+              canvasX: slot.pos[0],
+              canvasY: slot.pos[1],
+              button: 2, // Right mouse button
+              preventDefault: () => {},
+              stopPropagation: () => {}
+            }
+
+            if (node.onPointerDown) {
+              node.onPointerDown(
+                event as Partial<CanvasPointerEvent> as CanvasPointerEvent,
+                app.canvas.pointer,
+                app.canvas.linkConnector
+              )
+              return {
+                success: true,
+                slotName: slot.name,
+                x: slot.pos[0],
+                y: slot.pos[1]
+              }
+            }
+          }
+        } else if (action === 'doubleClick') {
+          // Double-click: use first slot with bounding rect center
+          const slot = slotsToTry[0]
+          if (!slot.boundingRect) {
+            throw new Error(`${slotType} slot bounding rect not found`)
+          }
+
+          const rect = slot.boundingRect
+          const testX = rect[0] + rect[2] / 2 // x + width/2
+          const testY = rect[1] + rect[3] / 2 // y + height/2
+
+          const event = {
+            canvasX: testX,
+            canvasY: testY,
+            button: 0, // Left mouse button
+            preventDefault: () => {},
+            stopPropagation: () => {}
+          }
+
+          if (node.onPointerDown) {
+            node.onPointerDown(
+              event as Partial<CanvasPointerEvent> as CanvasPointerEvent,
+              app.canvas.pointer,
+              app.canvas.linkConnector
+            )
+
+            // Trigger double-click
+            if (app.canvas.pointer.onDoubleClick) {
+              app.canvas.pointer.onDoubleClick(
+                event as Partial<CanvasPointerEvent> as CanvasPointerEvent
+              )
+            }
+          }
+
+          return { success: true, slotName: slot.name, x: testX, y: testY }
+        }
+
+        return { success: false }
+      },
+      { slotType, action, targetSlotName: slotName }
+    )
+
+    if (!foundSlot.success) {
+      const actionText =
+        action === 'rightClick' ? 'open context menu for' : 'double-click'
+      throw new Error(
+        slotName
+          ? `Could not ${actionText} ${slotType} slot '${slotName}'`
+          : `Could not find any ${slotType} slot to ${actionText}`
+      )
+    }
+
+    // Wait for the appropriate UI element to appear
+    if (action === 'rightClick') {
+      await this.page.waitForSelector('.litemenu-entry', {
+        state: 'visible',
+        timeout: 5000
+      })
+    } else {
+      await this.comfyPage.nextFrame()
+    }
+  }
+
+  /**
+   * Right-clicks on a subgraph input slot to open the context menu.
+   * Must be called when inside a subgraph.
+   *
+   * This method uses the actual slot positions from the subgraph.inputs array,
+   * which contain the correct coordinates for each input slot. These positions
+   * are different from the visual node positions and are specifically where
+   * the slots are rendered on the input node.
+   *
+   * @param inputName Optional name of the specific input slot to target (e.g., 'text').
+   *                  If not provided, tries all available input slots until one works.
+   * @returns Promise that resolves when the context menu appears
+   */
+  async rightClickInputSlot(inputName?: string): Promise<void> {
+    return this.interactWithSubgraphSlot('input', 'rightClick', inputName)
+  }
+
+  /**
+   * Right-clicks on a subgraph output slot to open the context menu.
+   * Must be called when inside a subgraph.
+   *
+   * Similar to rightClickInputSlot but for output slots.
+   *
+   * @param outputName Optional name of the specific output slot to target.
+   *                   If not provided, tries all available output slots until one works.
+   * @returns Promise that resolves when the context menu appears
+   */
+  async rightClickOutputSlot(outputName?: string): Promise<void> {
+    return this.interactWithSubgraphSlot('output', 'rightClick', outputName)
+  }
+
+  /**
+   * Double-clicks on a subgraph input slot to rename it.
+   * Must be called when inside a subgraph.
+   *
+   * @param inputName Optional name of the specific input slot to target (e.g., 'text').
+   *                  If not provided, tries the first available input slot.
+   * @returns Promise that resolves when the rename dialog appears
+   */
+  async doubleClickInputSlot(inputName?: string): Promise<void> {
+    return this.interactWithSubgraphSlot('input', 'doubleClick', inputName)
+  }
+
+  /**
+   * Double-clicks on a subgraph output slot to rename it.
+   * Must be called when inside a subgraph.
+   *
+   * @param outputName Optional name of the specific output slot to target.
+   *                   If not provided, tries the first available output slot.
+   * @returns Promise that resolves when the rename dialog appears
+   */
+  async doubleClickOutputSlot(outputName?: string): Promise<void> {
+    return this.interactWithSubgraphSlot('output', 'doubleClick', outputName)
+  }
+
+  /**
+   * Get a reference to a subgraph input slot
+   */
+  getInputSlot(slotName?: string): SubgraphSlotReference {
+    return new SubgraphSlotReference('input', slotName || '', this.comfyPage)
+  }
+
+  /**
+   * Get a reference to a subgraph output slot
+   */
+  getOutputSlot(slotName?: string): SubgraphSlotReference {
+    return new SubgraphSlotReference('output', slotName || '', this.comfyPage)
+  }
+
+  /**
+   * Connect a regular node output to a subgraph input.
+   * This creates a new input slot on the subgraph if targetInputName is not provided.
+   */
+  async connectToInput(
+    sourceNode: NodeReference,
+    sourceSlotIndex: number,
+    targetInputName?: string
+  ): Promise<void> {
+    const sourceSlot = await sourceNode.getOutput(sourceSlotIndex)
+    const targetSlot = this.getInputSlot(targetInputName)
+
+    const targetPosition = targetInputName
+      ? await targetSlot.getPosition() // Connect to existing slot
+      : await targetSlot.getOpenSlotPosition() // Create new slot
+
+    await this.comfyPage.canvasOps.dragAndDrop(
+      await sourceSlot.getPosition(),
+      targetPosition
+    )
+    await this.comfyPage.nextFrame()
+  }
+
+  /**
+   * Connect a subgraph input to a regular node input.
+   * This creates a new input slot on the subgraph if sourceInputName is not provided.
+   */
+  async connectFromInput(
+    targetNode: NodeReference,
+    targetSlotIndex: number,
+    sourceInputName?: string
+  ): Promise<void> {
+    const sourceSlot = this.getInputSlot(sourceInputName)
+    const targetSlot = await targetNode.getInput(targetSlotIndex)
+
+    const sourcePosition = sourceInputName
+      ? await sourceSlot.getPosition() // Connect from existing slot
+      : await sourceSlot.getOpenSlotPosition() // Create new slot
+
+    const targetPosition = await targetSlot.getPosition()
+
+    await this.comfyPage.canvasOps.dragAndDrop(sourcePosition, targetPosition)
+    await this.comfyPage.nextFrame()
+  }
+
+  /**
+   * Connect a regular node output to a subgraph output.
+   * This creates a new output slot on the subgraph if targetOutputName is not provided.
+   */
+  async connectToOutput(
+    sourceNode: NodeReference,
+    sourceSlotIndex: number,
+    targetOutputName?: string
+  ): Promise<void> {
+    const sourceSlot = await sourceNode.getOutput(sourceSlotIndex)
+    const targetSlot = this.getOutputSlot(targetOutputName)
+
+    const targetPosition = targetOutputName
+      ? await targetSlot.getPosition() // Connect to existing slot
+      : await targetSlot.getOpenSlotPosition() // Create new slot
+
+    await this.comfyPage.canvasOps.dragAndDrop(
+      await sourceSlot.getPosition(),
+      targetPosition
+    )
+    await this.comfyPage.nextFrame()
+  }
+
+  /**
+   * Connect a subgraph output to a regular node input.
+   * This creates a new output slot on the subgraph if sourceOutputName is not provided.
+   */
+  async connectFromOutput(
+    targetNode: NodeReference,
+    targetSlotIndex: number,
+    sourceOutputName?: string
+  ): Promise<void> {
+    const sourceSlot = this.getOutputSlot(sourceOutputName)
+    const targetSlot = await targetNode.getInput(targetSlotIndex)
+
+    const sourcePosition = sourceOutputName
+      ? await sourceSlot.getPosition() // Connect from existing slot
+      : await sourceSlot.getOpenSlotPosition() // Create new slot
+
+    await this.comfyPage.canvasOps.dragAndDrop(
+      sourcePosition,
+      await targetSlot.getPosition()
+    )
+    await this.comfyPage.nextFrame()
+  }
+}
diff --git a/browser_tests/fixtures/helpers/ToastHelper.ts b/browser_tests/fixtures/helpers/ToastHelper.ts
new file mode 100644
index 0000000000..544e203167
--- /dev/null
+++ b/browser_tests/fixtures/helpers/ToastHelper.ts
@@ -0,0 +1,39 @@
+import { expect } from '@playwright/test'
+import type { Locator, Page } from '@playwright/test'
+
+export class ToastHelper {
+  constructor(private readonly page: Page) {}
+
+  get visibleToasts(): Locator {
+    return this.page.locator('.p-toast-message:visible')
+  }
+
+  async getToastErrorCount(): Promise<number> {
+    return await this.page
+      .locator('.p-toast-message.p-toast-message-error')
+      .count()
+  }
+
+  async getVisibleToastCount(): Promise<number> {
+    return await this.visibleToasts.count()
+  }
+
+  async closeToasts(requireCount = 0): Promise<void> {
+    if (requireCount) {
+      await this.visibleToasts
+        .nth(requireCount - 1)
+        .waitFor({ state: 'visible' })
+    }
+
+    // Clear all toasts
+    const toastCloseButtons = await this.page
+      .locator('.p-toast-close-button')
+      .all()
+    for (const button of toastCloseButtons) {
+      await button.click()
+    }
+
+    // Assert all toasts are closed
+    await expect(this.visibleToasts).toHaveCount(0, { timeout: 1000 })
+  }
+}
diff --git a/browser_tests/fixtures/helpers/WorkflowHelper.ts b/browser_tests/fixtures/helpers/WorkflowHelper.ts
new file mode 100644
index 0000000000..234e8bd636
--- /dev/null
+++ b/browser_tests/fixtures/helpers/WorkflowHelper.ts
@@ -0,0 +1,126 @@
+import { readFileSync } from 'fs'
+
+import type {
+  ComfyApiWorkflow,
+  ComfyWorkflowJSON
+} from '../../../src/platform/workflow/validation/schemas/workflowSchema'
+import type { WorkspaceStore } from '../../types/globals'
+import type { ComfyPage } from '../ComfyPage'
+
+type FolderStructure = {
+  [key: string]: FolderStructure | string
+}
+
+export class WorkflowHelper {
+  constructor(private readonly comfyPage: ComfyPage) {}
+
+  convertLeafToContent(structure: FolderStructure): FolderStructure {
+    const result: FolderStructure = {}
+
+    for (const [key, value] of Object.entries(structure)) {
+      if (typeof value === 'string') {
+        const filePath = this.comfyPage.assetPath(value)
+        result[key] = readFileSync(filePath, 'utf-8')
+      } else {
+        result[key] = this.convertLeafToContent(value)
+      }
+    }
+
+    return result
+  }
+
+  async setupWorkflowsDirectory(structure: FolderStructure) {
+    const resp = await this.comfyPage.request.post(
+      `${this.comfyPage.url}/api/devtools/setup_folder_structure`,
+      {
+        data: {
+          tree_structure: this.convertLeafToContent(structure),
+          base_path: `user/${this.comfyPage.id}/workflows`
+        }
+      }
+    )
+
+    if (resp.status() !== 200) {
+      throw new Error(
+        `Failed to setup workflows directory: ${await resp.text()}`
+      )
+    }
+
+    await this.comfyPage.page.evaluate(async () => {
+      await (
+        window.app!.extensionManager as WorkspaceStore
+      ).workflow.syncWorkflows()
+    })
+
+    // Wait for Vue to re-render the workflow list
+    await this.comfyPage.nextFrame()
+  }
+
+  async loadWorkflow(workflowName: string) {
+    await this.comfyPage.workflowUploadInput.setInputFiles(
+      this.comfyPage.assetPath(`${workflowName}.json`)
+    )
+    await this.comfyPage.nextFrame()
+  }
+
+  async deleteWorkflow(
+    workflowName: string,
+    whenMissing: 'ignoreMissing' | 'throwIfMissing' = 'ignoreMissing'
+  ) {
+    // Open workflows tab
+    const { workflowsTab } = this.comfyPage.menu
+    await workflowsTab.open()
+
+    // Action to take if workflow missing
+    if (whenMissing === 'ignoreMissing') {
+      const workflows = await workflowsTab.getTopLevelSavedWorkflowNames()
+      if (!workflows.includes(workflowName)) return
+    }
+
+    // Delete workflow
+    await workflowsTab.getPersistedItem(workflowName).click({ button: 'right' })
+    await this.comfyPage.contextMenu.clickMenuItem('Delete')
+    await this.comfyPage.nextFrame()
+    await this.comfyPage.confirmDialog.delete.click()
+
+    // Clear toast & close tab
+    await this.comfyPage.toast.closeToasts(1)
+    await workflowsTab.close()
+  }
+
+  async getUndoQueueSize(): Promise<number | undefined> {
+    return this.comfyPage.page.evaluate(() => {
+      const workflow = (window.app!.extensionManager as WorkspaceStore).workflow
+        .activeWorkflow
+      return workflow?.changeTracker.undoQueue.length
+    })
+  }
+
+  async getRedoQueueSize(): Promise<number | undefined> {
+    return this.comfyPage.page.evaluate(() => {
+      const workflow = (window.app!.extensionManager as WorkspaceStore).workflow
+        .activeWorkflow
+      return workflow?.changeTracker.redoQueue.length
+    })
+  }
+
+  async isCurrentWorkflowModified(): Promise<boolean | undefined> {
+    return this.comfyPage.page.evaluate(() => {
+      return (window.app!.extensionManager as WorkspaceStore).workflow
+        .activeWorkflow?.isModified
+    })
+  }
+
+  async getExportedWorkflow(options: { api: true }): Promise<ComfyApiWorkflow>
+  async getExportedWorkflow(options?: {
+    api?: false
+  }): Promise<ComfyWorkflowJSON>
+  async getExportedWorkflow(options?: {
+    api?: boolean
+  }): Promise<ComfyWorkflowJSON | ComfyApiWorkflow> {
+    const api = options?.api ?? false
+    return this.comfyPage.page.evaluate(async (api) => {
+      return (await window.app!.graphToPrompt())[api ? 'output' : 'workflow']
+    }, api)
+  }
+}
diff --git a/browser_tests/fixtures/selectors.ts b/browser_tests/fixtures/selectors.ts
new file mode 100644
index 0000000000..ff1fe58a7f
--- /dev/null
+++ b/browser_tests/fixtures/selectors.ts
@@ -0,0 +1,90 @@
+/**
+ * Centralized test selectors for browser tests.
+ * Use data-testid attributes for stable selectors.
+ */
+
+export const TestIds = {
+  sidebar: {
+    toolbar: 'side-toolbar',
+    nodeLibrary: 'node-library-tree',
+    nodeLibrarySearch: 'node-library-search',
+    workflows: 'workflows-sidebar',
+    modeToggle: 'mode-toggle'
+  },
+  tree: {
+    folder: 'tree-folder',
+    leaf: 'tree-leaf',
+    node: 'tree-node'
+  },
+  canvas: {
+    main: 'graph-canvas',
+    contextMenu: 'canvas-context-menu',
+    toggleMinimapButton: 'toggle-minimap-button',
+    toggleLinkVisibilityButton: 'toggle-link-visibility-button'
+  },
+  dialogs: {
+    settings: 'settings-dialog',
+    settingsContainer: 'settings-container',
+    settingsTabAbout: 'settings-tab-about',
+    confirm: 'confirm-dialog',
+    missingNodes: 'missing-nodes-warning',
+    about: 'about-panel',
+    whatsNewSection: 'whats-new-section'
+  },
+  topbar: {
+    queueButton: 'queue-button',
+    saveButton: 'save-workflow-button'
+  },
+  nodeLibrary: {
+    bookmarksSection: 'node-library-bookmarks-section'
+  },
+  propertiesPanel: {
+    root: 'properties-panel'
+  },
+  node: {
+    titleInput: 'node-title-input'
+  },
+  selectionToolbox: {
+    colorPickerButton: 'color-picker-button',
+    colorPickerCurrentColor: 'color-picker-current-color',
+    colorBlue: 'blue',
+    colorRed: 'red'
+  },
+  widgets: {
+    decrement: 'decrement',
+    increment: 'increment',
+    domWidgetTextarea: 'dom-widget-textarea',
+    subgraphEnterButton: 'subgraph-enter-button'
+  },
+  breadcrumb: {
+    subgraph: 'subgraph-breadcrumb'
+  },
+  templates: {
+    content: 'template-workflows-content',
+    workflowCard: (id: string) => `template-workflow-${id}`
+  },
+  user: {
+    currentUserIndicator: 'current-user-indicator'
+  }
+} as const
+
+/**
+ * Helper type for accessing nested TestIds (excludes function values)
+ */
+export type TestIdValue =
+  | (typeof TestIds.sidebar)[keyof typeof TestIds.sidebar]
+  | (typeof TestIds.tree)[keyof typeof TestIds.tree]
+  | (typeof TestIds.canvas)[keyof typeof TestIds.canvas]
+  | (typeof TestIds.dialogs)[keyof typeof TestIds.dialogs]
+  | (typeof TestIds.topbar)[keyof typeof TestIds.topbar]
+  | (typeof TestIds.nodeLibrary)[keyof typeof TestIds.nodeLibrary]
+  | (typeof TestIds.propertiesPanel)[keyof typeof TestIds.propertiesPanel]
+  | (typeof TestIds.node)[keyof typeof TestIds.node]
+  | (typeof TestIds.selectionToolbox)[keyof typeof TestIds.selectionToolbox]
+  | (typeof TestIds.widgets)[keyof typeof TestIds.widgets]
+  | (typeof TestIds.breadcrumb)[keyof typeof TestIds.breadcrumb]
+  | Exclude<
+      (typeof TestIds.templates)[keyof typeof TestIds.templates],
+      (id: string) => string
+    >
+  | (typeof TestIds.user)[keyof typeof TestIds.user]
diff --git a/browser_tests/fixtures/utils/litegraphUtils.ts b/browser_tests/fixtures/utils/litegraphUtils.ts
index 832db63249..b1295e5a89 100644
--- a/browser_tests/fixtures/utils/litegraphUtils.ts
+++ b/browser_tests/fixtures/utils/litegraphUtils.ts
@@ -1,3 +1,4 @@
+import { expect } from '@playwright/test'
 import type { Page } from '@playwright/test'
 
 import type { NodeId } from '../../../src/platform/workflow/validation/schemas/workflowSchema'
@@ -22,10 +23,10 @@ export class SubgraphSlotReference {
   async getPosition(): Promise<Position> {
     const pos: [number, number] = await this.comfyPage.page.evaluate(
       ([type, slotName]) => {
-        const currentGraph = window['app'].canvas.graph
+        const currentGraph = window.app!.canvas.graph!
 
-        // Check if we're in a subgraph
-        if (currentGraph.constructor.name !== 'Subgraph') {
+        // Check if we're in a subgraph (subgraphs have inputNode property)
+        if (!('inputNode' in currentGraph)) {
           throw new Error(
             'Not in a subgraph - this method only works inside subgraphs'
           )
@@ -51,7 +52,7 @@ export class SubgraphSlotReference {
         }
 
         // Convert from offset to canvas coordinates
-        const canvasPos = window['app'].canvas.ds.convertOffsetToCanvas([
+        const canvasPos = window.app!.canvas.ds.convertOffsetToCanvas([
           slot.pos[0],
           slot.pos[1]
         ])
@@ -69,9 +70,10 @@ export class SubgraphSlotReference {
   async getOpenSlotPosition(): Promise<Position> {
     const pos: [number, number] = await this.comfyPage.page.evaluate(
       ([type]) => {
-        const currentGraph = window['app'].canvas.graph
+        const currentGraph = window.app!.canvas.graph!
 
-        if (currentGraph.constructor.name !== 'Subgraph') {
+        // Check if we're in a subgraph (subgraphs have inputNode property)
+        if (!('inputNode' in currentGraph)) {
           throw new Error(
             'Not in a subgraph - this method only works inside subgraphs'
           )
@@ -79,48 +81,15 @@ export class SubgraphSlotReference {
 
         const node =
           type === 'input' ? currentGraph.inputNode : currentGraph.outputNode
-        const slots =
-          type === 'input' ? currentGraph.inputs : currentGraph.outputs
 
         if (!node) {
           throw new Error(`No ${type} node found in subgraph`)
         }
 
-        // Calculate position for next available slot
-        // const nextSlotIndex = slots?.length || 0
-        // const slotHeight = 20
-        // const slotY = node.pos[1] + 30 + nextSlotIndex * slotHeight
-
-        // Find last slot position
-        const lastSlot = slots.at(-1)
-        let slotX: number
-        let slotY: number
-
-        if (lastSlot) {
-          // If there are existing slots, position the new one below the last one
-          const gapHeight = 20
-          slotX = lastSlot.pos[0]
-          slotY = lastSlot.pos[1] + gapHeight
-        } else {
-          // No existing slots - use slotAnchorX if available, otherwise calculate from node position
-          if (currentGraph.slotAnchorX !== undefined) {
-            // The actual slot X position seems to be slotAnchorX - 10
-            slotX = currentGraph.slotAnchorX - 10
-          } else {
-            // Fallback: calculate from node edge
-            slotX =
-              type === 'input'
-                ? node.pos[0] + node.size[0] - 10 // Right edge for input node
-                : node.pos[0] + 10 // Left edge for output node
-          }
-          // For Y position when no slots exist, use middle of node
-          slotY = node.pos[1] + node.size[1] / 2
-        }
-
         // Convert from offset to canvas coordinates
-        const canvasPos = window['app'].canvas.ds.convertOffsetToCanvas([
-          slotX,
-          slotY
+        const canvasPos = window.app!.canvas.ds.convertOffsetToCanvas([
+          node.emptySlot.pos[0],
+          node.emptySlot.pos[1]
         ])
         return canvasPos
       },
@@ -144,23 +113,23 @@ class NodeSlotReference {
     const pos: [number, number] = await this.node.comfyPage.page.evaluate(
       ([type, id, index]) => {
         // Use canvas.graph to get the current graph (works in both main graph and subgraphs)
-        const node = window['app'].canvas.graph.getNodeById(id)
+        const node = window.app!.canvas.graph!.getNodeById(id)
         if (!node) throw new Error(`Node ${id} not found.`)
 
         const rawPos = node.getConnectionPos(type === 'input', index)
         const convertedPos =
-          window['app'].canvas.ds.convertOffsetToCanvas(rawPos)
+          window.app!.canvas.ds!.convertOffsetToCanvas(rawPos)
 
         // Debug logging - convert Float64Arrays to regular arrays for visibility
-        // eslint-disable-next-line no-console
-        console.log(
+        console.warn(
           `NodeSlotReference debug for ${type} slot ${index} on node ${id}:`,
           {
             nodePos: [node.pos[0], node.pos[1]],
             nodeSize: [node.size[0], node.size[1]],
             rawConnectionPos: [rawPos[0], rawPos[1]],
             convertedPos: [convertedPos[0], convertedPos[1]],
-            currentGraphType: window['app'].canvas.graph.constructor.name
+            currentGraphType:
+              'inputNode' in window.app!.canvas.graph! ? 'Subgraph' : 'LGraph'
           }
         )
 
@@ -176,7 +145,7 @@ class NodeSlotReference {
   async getLinkCount() {
     return await this.node.comfyPage.page.evaluate(
       ([type, id, index]) => {
-        const node = window['app'].canvas.graph.getNodeById(id)
+        const node = window.app!.canvas.graph!.getNodeById(id)
         if (!node) throw new Error(`Node ${id} not found.`)
         if (type === 'input') {
           return node.inputs[index].link == null ? 0 : 1
@@ -189,7 +158,7 @@ class NodeSlotReference {
   async removeLinks() {
     await this.node.comfyPage.page.evaluate(
       ([type, id, index]) => {
-        const node = window['app'].canvas.graph.getNodeById(id)
+        const node = window.app!.canvas.graph!.getNodeById(id)
         if (!node) throw new Error(`Node ${id} not found.`)
         if (type === 'input') {
           node.disconnectInput(index)
@@ -214,15 +183,15 @@ class NodeWidgetReference {
   async getPosition(): Promise<Position> {
     const pos: [number, number] = await this.node.comfyPage.page.evaluate(
       ([id, index]) => {
-        const node = window['app'].canvas.graph.getNodeById(id)
+        const node = window.app!.canvas.graph!.getNodeById(id)
         if (!node) throw new Error(`Node ${id} not found.`)
-        const widget = node.widgets[index]
+        const widget = node.widgets![index]
         if (!widget) throw new Error(`Widget ${index} not found.`)
 
-        const [x, y, w, h] = node.getBounding()
-        return window['app'].canvasPosToClientPos([
+        const [x, y, w, _h] = node.getBounding()
+        return window.app!.canvasPosToClientPos([
           x + w / 2,
-          y + window['LiteGraph']['NODE_TITLE_HEIGHT'] + widget.last_y + 1
+          y + window.LiteGraph!['NODE_TITLE_HEIGHT'] + widget.last_y! + 1
         ])
       },
       [this.node.id, this.index] as const
@@ -239,9 +208,9 @@ class NodeWidgetReference {
   async getSocketPosition(): Promise<Position> {
     const pos: [number, number] = await this.node.comfyPage.page.evaluate(
       ([id, index]) => {
-        const node = window['app'].graph.getNodeById(id)
+        const node = window.app!.graph!.getNodeById(id)
         if (!node) throw new Error(`Node ${id} not found.`)
-        const widget = node.widgets[index]
+        const widget = node.widgets![index]
         if (!widget) throw new Error(`Widget ${index} not found.`)
 
         const slot = node.inputs.find(
@@ -250,9 +219,9 @@ class NodeWidgetReference {
         if (!slot) throw new Error(`Socket ${widget.name} not found.`)
 
         const [x, y] = node.getBounding()
-        return window['app'].canvasPosToClientPos([
-          x + slot.pos[0],
-          y + slot.pos[1] + window['LiteGraph']['NODE_TITLE_HEIGHT']
+        return window.app!.canvasPosToClientPos([
+          x + slot.pos![0],
+          y + slot.pos![1] + window.LiteGraph!['NODE_TITLE_HEIGHT']
         ])
       },
       [this.node.id, this.index] as const
@@ -273,7 +242,7 @@ class NodeWidgetReference {
     const pos = await this.getPosition()
     const canvas = this.node.comfyPage.canvas
     const canvasPos = (await canvas.boundingBox())!
-    await this.node.comfyPage.dragAndDrop(
+    await this.node.comfyPage.canvasOps.dragAndDrop(
       {
         x: canvasPos.x + pos.x,
         y: canvasPos.y + pos.y
@@ -288,9 +257,9 @@ class NodeWidgetReference {
   async getValue() {
     return await this.node.comfyPage.page.evaluate(
       ([id, index]) => {
-        const node = window['app'].graph.getNodeById(id)
+        const node = window.app!.graph!.getNodeById(id)
         if (!node) throw new Error(`Node ${id} not found.`)
-        const widget = node.widgets[index]
+        const widget = node.widgets![index]
         if (!widget) throw new Error(`Widget ${index} not found.`)
         return widget.value
       },
@@ -305,7 +274,7 @@ export class NodeReference {
   ) {}
   async exists(): Promise<boolean> {
     return await this.comfyPage.page.evaluate((id) => {
-      const node = window['app'].canvas.graph.getNodeById(id)
+      const node = window.app!.canvas.graph!.getNodeById(id)
       return !!node
     }, this.id)
   }
@@ -313,7 +282,7 @@ export class NodeReference {
     return this.getProperty('type')
   }
   async getPosition(): Promise<Position> {
-    const pos = await this.comfyPage.convertOffsetToCanvas(
+    const pos = await this.comfyPage.canvasOps.convertOffsetToCanvas(
       await this.getProperty<[number, number]>('pos')
     )
     return {
@@ -322,12 +291,11 @@ export class NodeReference {
     }
   }
   async getBounding(): Promise<Position & Size> {
-    const [x, y, width, height]: [number, number, number, number] =
-      await this.comfyPage.page.evaluate((id) => {
-        const node = window['app'].canvas.graph.getNodeById(id)
-        if (!node) throw new Error('Node not found')
-        return node.getBounding()
-      }, this.id)
+    const [x, y, width, height] = await this.comfyPage.page.evaluate((id) => {
+      const node = window.app!.canvas.graph!.getNodeById(id)
+      if (!node) throw new Error('Node not found')
+      return [...node.getBounding()] as [number, number, number, number]
+    }, this.id)
     return {
       x,
       y,
@@ -345,6 +313,11 @@ export class NodeReference {
   async getFlags(): Promise<{ collapsed?: boolean; pinned?: boolean }> {
     return await this.getProperty('flags')
   }
+  async getTitlePosition(): Promise<Position> {
+    const nodePos = await this.getPosition()
+    const nodeSize = await this.getSize()
+    return { x: nodePos.x + nodeSize.width / 2, y: nodePos.y - 15 }
+  }
   async isPinned() {
     return !!(await this.getFlags()).pinned
   }
@@ -357,9 +330,9 @@ export class NodeReference {
   async getProperty<T>(prop: string): Promise<T> {
     return await this.comfyPage.page.evaluate(
       ([id, prop]) => {
-        const node = window['app'].canvas.graph.getNodeById(id)
+        const node = window.app!.canvas.graph!.getNodeById(id)
         if (!node) throw new Error('Node not found')
-        return node[prop]
+        return (node as unknown as Record<string, T>)[prop]
       },
       [this.id, prop] as const
     )
@@ -377,16 +350,16 @@ export class NodeReference {
     position: 'title' | 'collapse',
     options?: Parameters<Page['click']>[1] & { moveMouseToEmptyArea?: boolean }
   ) {
-    const nodePos = await this.getPosition()
-    const nodeSize = await this.getSize()
     let clickPos: Position
     switch (position) {
       case 'title':
-        clickPos = { x: nodePos.x + nodeSize.width / 2, y: nodePos.y - 15 }
+        clickPos = await this.getTitlePosition()
         break
-      case 'collapse':
+      case 'collapse': {
+        const nodePos = await this.getPosition()
         clickPos = { x: nodePos.x + 5, y: nodePos.y - 10 }
         break
+      }
       default:
         throw new Error(`Invalid click position ${position}`)
     }
@@ -403,12 +376,12 @@ export class NodeReference {
     })
     await this.comfyPage.nextFrame()
     if (moveMouseToEmptyArea) {
-      await this.comfyPage.moveMouseToEmptyArea()
+      await this.comfyPage.canvasOps.moveMouseToEmptyArea()
     }
   }
   async copy() {
     await this.click('title')
-    await this.comfyPage.ctrlC()
+    await this.comfyPage.clipboard.copy()
     await this.comfyPage.nextFrame()
   }
   async connectWidget(
@@ -418,7 +391,7 @@ export class NodeReference {
   ) {
     const originSlot = await this.getOutput(originSlotIndex)
     const targetWidget = await targetNode.getWidget(targetWidgetIndex)
-    await this.comfyPage.dragAndDrop(
+    await this.comfyPage.canvasOps.dragAndDrop(
       await originSlot.getPosition(),
       await targetWidget.getSocketPosition()
     )
@@ -431,7 +404,7 @@ export class NodeReference {
   ) {
     const originSlot = await this.getOutput(originSlotIndex)
     const targetSlot = await targetNode.getInput(targetSlotIndex)
-    await this.comfyPage.dragAndDrop(
+    await this.comfyPage.canvasOps.dragAndDrop(
       await originSlot.getPosition(),
       await targetSlot.getPosition()
     )
@@ -449,9 +422,9 @@ export class NodeReference {
   }
   async convertToGroupNode(groupNodeName: string = 'GroupNode') {
     await this.clickContextMenuOption('Convert to Group Node')
-    await this.comfyPage.fillPromptDialog(groupNodeName)
+    await this.comfyPage.nodeOps.fillPromptDialog(groupNodeName)
     await this.comfyPage.nextFrame()
-    const nodes = await this.comfyPage.getNodeRefsByType(
+    const nodes = await this.comfyPage.nodeOps.getNodeRefsByType(
       `workflow>${groupNodeName}`
     )
     if (nodes.length !== 1) {
@@ -462,7 +435,8 @@ export class NodeReference {
   async convertToSubgraph() {
     await this.clickContextMenuOption('Convert to Subgraph')
     await this.comfyPage.nextFrame()
-    const nodes = await this.comfyPage.getNodeRefsByTitle('New Subgraph')
+    const nodes =
+      await this.comfyPage.nodeOps.getNodeRefsByTitle('New Subgraph')
     if (nodes.length !== 1) {
       throw new Error(
         `Did not find single subgraph node (found=${nodes.length})`
@@ -480,7 +454,7 @@ export class NodeReference {
   }
   async navigateIntoSubgraph() {
     const titleHeight = await this.comfyPage.page.evaluate(() => {
-      return window['LiteGraph']['NODE_TITLE_HEIGHT']
+      return window.LiteGraph!['NODE_TITLE_HEIGHT']
     })
     const nodePos = await this.getPosition()
     const nodeSize = await this.getSize()
@@ -488,16 +462,43 @@ export class NodeReference {
     // Try multiple positions to avoid DOM widget interference
     const clickPositions = [
       { x: nodePos.x + nodeSize.width / 2, y: nodePos.y + titleHeight + 5 },
-      { x: nodePos.x + nodeSize.width / 2, y: nodePos.y + nodeSize.height / 2 },
+      {
+        x: nodePos.x + nodeSize.width / 2,
+        y: nodePos.y + nodeSize.height / 2
+      },
       { x: nodePos.x + 20, y: nodePos.y + titleHeight + 5 }
     ]
 
-    let isInSubgraph = false
-    let attempts = 0
-    const maxAttempts = 3
+    // Click the enter_subgraph title button (top-right of title bar).
+    // This is more reliable than dblclick on the node body because
+    // promoted DOM widgets can overlay the body and intercept events.
+    const subgraphButtonPos = {
+      x: nodePos.x + nodeSize.width - 15,
+      y: nodePos.y - titleHeight / 2
+    }
 
-    while (!isInSubgraph && attempts < maxAttempts) {
-      attempts++
+    const checkIsInSubgraph = async () => {
+      return this.comfyPage.page.evaluate(() => {
+        const graph = window.app!.canvas.graph
+        return !!graph && 'inputNode' in graph
+      })
+    }
+
+    await expect(async () => {
+      // Try just clicking the enter button first
+      await this.comfyPage.canvas.click({
+        position: { x: 250, y: 250 },
+        force: true
+      })
+      await this.comfyPage.nextFrame()
+
+      await this.comfyPage.canvas.click({
+        position: subgraphButtonPos,
+        force: true
+      })
+      await this.comfyPage.nextFrame()
+
+      if (await checkIsInSubgraph()) return
 
       for (const position of clickPositions) {
         // Clear any selection first
@@ -511,24 +512,9 @@ export class NodeReference {
         await this.comfyPage.canvas.dblclick({ position, force: true })
         await this.comfyPage.nextFrame()
 
-        // Check if we successfully entered the subgraph
-        isInSubgraph = await this.comfyPage.page.evaluate(() => {
-          const graph = window['app'].canvas.graph
-          return graph?.constructor?.name === 'Subgraph'
-        })
-
-        if (isInSubgraph) break
+        if (await checkIsInSubgraph()) return
       }
-
-      if (!isInSubgraph && attempts < maxAttempts) {
-        await this.comfyPage.page.waitForTimeout(500)
-      }
-    }
-
-    if (!isInSubgraph) {
-      throw new Error(
-        'Failed to navigate into subgraph after ' + attempts + ' attempts'
-      )
-    }
+      throw new Error('Not in subgraph yet')
+    }).toPass({ timeout: 5000, intervals: [100, 200, 500] })
   }
 }
diff --git a/browser_tests/fixtures/utils/taskHistory.ts b/browser_tests/fixtures/utils/taskHistory.ts
deleted file mode 100644
index 01dfb1a4aa..0000000000
--- a/browser_tests/fixtures/utils/taskHistory.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-import type { Request, Route } from '@playwright/test'
-import _ from 'es-toolkit/compat'
-import fs from 'fs'
-import path from 'path'
-import { v4 as uuidv4 } from 'uuid'
-
-import type {
-  HistoryTaskItem,
-  TaskItem,
-  TaskOutput
-} from '../../../src/schemas/apiSchema'
-import type { ComfyPage } from '../ComfyPage'
-
-/** keyof TaskOutput[string] */
-type OutputFileType = 'images' | 'audio' | 'animated'
-
-const DEFAULT_IMAGE = 'example.webp'
-
-const getFilenameParam = (request: Request) => {
-  const url = new URL(request.url())
-  return url.searchParams.get('filename') || DEFAULT_IMAGE
-}
-
-const getContentType = (filename: string, fileType: OutputFileType) => {
-  const subtype = path.extname(filename).slice(1)
-  switch (fileType) {
-    case 'images':
-      return `image/${subtype}`
-    case 'audio':
-      return `audio/${subtype}`
-    case 'animated':
-      return `video/${subtype}`
-  }
-}
-
-const setQueueIndex = (task: TaskItem) => {
-  task.prompt[0] = TaskHistory.queueIndex++
-}
-
-const setPromptId = (task: TaskItem) => {
-  task.prompt[1] = uuidv4()
-}
-
-export default class TaskHistory {
-  static queueIndex = 0
-  static readonly defaultTask: Readonly<HistoryTaskItem> = {
-    prompt: [0, 'prompt-id', {}, { client_id: uuidv4() }, []],
-    outputs: {},
-    status: {
-      status_str: 'success',
-      completed: true,
-      messages: []
-    },
-    taskType: 'History'
-  }
-  private tasks: HistoryTaskItem[] = []
-  private outputContentTypes: Map<string, string> = new Map()
-
-  constructor(readonly comfyPage: ComfyPage) {}
-
-  private loadAsset: (filename: string) => Buffer = _.memoize(
-    (filename: string) => {
-      const filePath = this.comfyPage.assetPath(filename)
-      return fs.readFileSync(filePath)
-    }
-  )
-
-  private async handleGetHistory(route: Route) {
-    return route.fulfill({
-      status: 200,
-      contentType: 'application/json',
-      body: JSON.stringify(this.tasks)
-    })
-  }
-
-  private async handleGetView(route: Route) {
-    const fileName = getFilenameParam(route.request())
-    if (!this.outputContentTypes.has(fileName)) {
-      return route.continue()
-    }
-
-    const asset = this.loadAsset(fileName)
-    return route.fulfill({
-      status: 200,
-      contentType: this.outputContentTypes.get(fileName),
-      body: asset,
-      headers: {
-        'Cache-Control': 'public, max-age=31536000',
-        'Content-Length': asset.byteLength.toString()
-      }
-    })
-  }
-
-  async setupRoutes() {
-    return this.comfyPage.page.route(
-      /.*\/api\/(view|history)(\?.*)?$/,
-      async (route) => {
-        const request = route.request()
-        const method = request.method()
-
-        const isViewReq = request.url().includes('view') && method === 'GET'
-        if (isViewReq) return this.handleGetView(route)
-
-        const isHistoryPath = request.url().includes('history')
-        const isGetHistoryReq = isHistoryPath && method === 'GET'
-        if (isGetHistoryReq) return this.handleGetHistory(route)
-
-        const isClearReq =
-          method === 'POST' &&
-          isHistoryPath &&
-          request.postDataJSON()?.clear === true
-        if (isClearReq) return this.clearTasks()
-
-        return route.continue()
-      }
-    )
-  }
-
-  private createOutputs(
-    filenames: string[],
-    filetype: OutputFileType
-  ): TaskOutput {
-    return filenames.reduce((outputs, filename, i) => {
-      const nodeId = `${i + 1}`
-      outputs[nodeId] = {
-        [filetype]: [{ filename, subfolder: '', type: 'output' }]
-      }
-      const contentType = getContentType(filename, filetype)
-      this.outputContentTypes.set(filename, contentType)
-      return outputs
-    }, {})
-  }
-
-  private addTask(task: HistoryTaskItem) {
-    setPromptId(task)
-    setQueueIndex(task)
-    this.tasks.unshift(task) // Tasks are added to the front of the queue
-  }
-
-  clearTasks(): this {
-    this.tasks = []
-    return this
-  }
-
-  withTask(
-    outputFilenames: string[],
-    outputFiletype: OutputFileType = 'images',
-    overrides: Partial<HistoryTaskItem> = {}
-  ): this {
-    this.addTask({
-      ...TaskHistory.defaultTask,
-      outputs: this.createOutputs(outputFilenames, outputFiletype),
-      ...overrides
-    })
-    return this
-  }
-
-  /** Repeats the last task in the task history a specified number of times. */
-  repeat(n: number): this {
-    for (let i = 0; i < n; i++)
-      this.addTask(structuredClone(this.tasks.at(0)) as HistoryTaskItem)
-    return this
-  }
-}
diff --git a/browser_tests/fixtures/utils/vueNodeFixtures.ts b/browser_tests/fixtures/utils/vueNodeFixtures.ts
index fca4644052..e7368d7759 100644
--- a/browser_tests/fixtures/utils/vueNodeFixtures.ts
+++ b/browser_tests/fixtures/utils/vueNodeFixtures.ts
@@ -1,4 +1,3 @@
-import { expect } from '@playwright/test'
 import type { Locator } from '@playwright/test'
 
 /** DOM-centric helper for a single Vue-rendered node on the canvas. */
@@ -40,7 +39,7 @@ export class VueNodeFixture {
   async setTitle(value: string): Promise<void> {
     await this.header.dblclick()
     const input = this.titleInput
-    await expect(input).toBeVisible()
+    await input.waitFor({ state: 'visible' })
     await input.fill(value)
     await input.press('Enter')
   }
@@ -48,7 +47,7 @@ export class VueNodeFixture {
   async cancelTitleEdit(): Promise<void> {
     await this.header.dblclick()
     const input = this.titleInput
-    await expect(input).toBeVisible()
+    await input.waitFor({ state: 'visible' })
     await input.press('Escape')
   }
 
diff --git a/browser_tests/fixtures/ws.ts b/browser_tests/fixtures/ws.ts
index f1ab1a538c..02e68bdb7f 100644
--- a/browser_tests/fixtures/ws.ts
+++ b/browser_tests/fixtures/ws.ts
@@ -1,7 +1,7 @@
 import { test as base } from '@playwright/test'
 
 export const webSocketFixture = base.extend<{
-  ws: { trigger(data: any, url?: string): Promise<void> }
+  ws: { trigger(data: unknown, url?: string): Promise<void> }
 }>({
   ws: [
     async ({ page }, use) => {
@@ -10,7 +10,7 @@ export const webSocketFixture = base.extend<{
         await page.evaluate(function () {
           // Create a wrapper for WebSocket that stores them globally
           // so we can look it up to trigger messages
-          const store: Record<string, WebSocket> = ((window as any).__ws__ = {})
+          const store: Record<string, WebSocket> = (window.__ws__ = {})
           window.WebSocket = class extends window.WebSocket {
             constructor(
               ...rest: ConstructorParameters<typeof window.WebSocket>
@@ -34,7 +34,7 @@ export const webSocketFixture = base.extend<{
                 u.pathname = '/'
                 url = u.toString() + 'ws'
               }
-              const ws: WebSocket = (window as any).__ws__[url]
+              const ws: WebSocket = window.__ws__![url]
               ws.dispatchEvent(
                 new MessageEvent('message', {
                   data
diff --git a/browser_tests/globalSetup.ts b/browser_tests/globalSetup.ts
index 881ef11c43..b43b77c6a6 100644
--- a/browser_tests/globalSetup.ts
+++ b/browser_tests/globalSetup.ts
@@ -5,7 +5,7 @@ import { backupPath } from './utils/backupUtils'
 
 dotenv.config()
 
-export default function globalSetup(config: FullConfig) {
+export default function globalSetup(_config: FullConfig) {
   if (!process.env.CI) {
     if (process.env.TEST_COMFYUI_DIR) {
       backupPath([process.env.TEST_COMFYUI_DIR, 'user'])
diff --git a/browser_tests/globalTeardown.ts b/browser_tests/globalTeardown.ts
index aeed77294c..38dc26a3d2 100644
--- a/browser_tests/globalTeardown.ts
+++ b/browser_tests/globalTeardown.ts
@@ -1,11 +1,14 @@
 import type { FullConfig } from '@playwright/test'
 import dotenv from 'dotenv'
 
+import { writePerfReport } from './helpers/perfReporter'
 import { restorePath } from './utils/backupUtils'
 
 dotenv.config()
 
-export default function globalTeardown(config: FullConfig) {
+export default function globalTeardown(_config: FullConfig) {
+  writePerfReport()
+
   if (!process.env.CI && process.env.TEST_COMFYUI_DIR) {
     restorePath([process.env.TEST_COMFYUI_DIR, 'user'])
     restorePath([process.env.TEST_COMFYUI_DIR, 'models'])
diff --git a/browser_tests/helpers/actionbar.ts b/browser_tests/helpers/actionbar.ts
index 6c368c4d65..29f679e0c1 100644
--- a/browser_tests/helpers/actionbar.ts
+++ b/browser_tests/helpers/actionbar.ts
@@ -1,6 +1,8 @@
 import type { Locator, Page } from '@playwright/test'
 
 import type { AutoQueueMode } from '../../src/stores/queueStore'
+import { TestIds } from '../fixtures/selectors'
+import type { WorkspaceStore } from '../types/globals'
 
 export class ComfyActionbar {
   public readonly root: Locator
@@ -26,7 +28,7 @@ class ComfyQueueButton {
   public readonly primaryButton: Locator
   public readonly dropdownButton: Locator
   constructor(public readonly actionbar: ComfyActionbar) {
-    this.root = actionbar.root.getByTestId('queue-button')
+    this.root = actionbar.root.getByTestId(TestIds.topbar.queueButton)
     this.primaryButton = this.root.locator('.p-splitbutton-button')
     this.dropdownButton = this.root.locator('.p-splitbutton-dropdown')
   }
@@ -42,13 +44,14 @@ class ComfyQueueButtonOptions {
 
   public async setMode(mode: AutoQueueMode) {
     await this.page.evaluate((mode) => {
-      window['app'].extensionManager.queueSettings.mode = mode
+      ;(window.app!.extensionManager as WorkspaceStore).queueSettings.mode =
+        mode
     }, mode)
   }
 
   public async getMode() {
     return await this.page.evaluate(() => {
-      return window['app'].extensionManager.queueSettings.mode
+      return (window.app!.extensionManager as WorkspaceStore).queueSettings.mode
     })
   }
 }
diff --git a/browser_tests/helpers/fitToView.ts b/browser_tests/helpers/fitToView.ts
index af6c10e9d3..6aea86dbad 100644
--- a/browser_tests/helpers/fitToView.ts
+++ b/browser_tests/helpers/fitToView.ts
@@ -23,7 +23,7 @@ export async function fitToViewInstant(
     { selectionOnly: boolean }
   >(
     ({ selectionOnly }) => {
-      const app = window['app']
+      const app = window.app
       if (!app?.canvas) return null
 
       const canvas = app.canvas
@@ -90,7 +90,7 @@ export async function fitToViewInstant(
 
   await comfyPage.page.evaluate(
     ({ bounds, zoom }) => {
-      const app = window['app']
+      const app = window.app
       if (!app?.canvas) return
 
       const canvas = app.canvas
diff --git a/browser_tests/helpers/perfReporter.ts b/browser_tests/helpers/perfReporter.ts
new file mode 100644
index 0000000000..2fac7cac5e
--- /dev/null
+++ b/browser_tests/helpers/perfReporter.ts
@@ -0,0 +1,49 @@
+import { mkdirSync, readdirSync, readFileSync, writeFileSync } from 'fs'
+import { join } from 'path'
+
+import type { PerfMeasurement } from '../fixtures/helpers/PerformanceHelper'
+
+export interface PerfReport {
+  timestamp: string
+  gitSha: string
+  branch: string
+  measurements: PerfMeasurement[]
+}
+
+const TEMP_DIR = join('test-results', 'perf-temp')
+
+export function recordMeasurement(m: PerfMeasurement) {
+  mkdirSync(TEMP_DIR, { recursive: true })
+  const filename = `${m.name}-${Date.now()}.json`
+  writeFileSync(join(TEMP_DIR, filename), JSON.stringify(m))
+}
+
+export function writePerfReport(
+  gitSha = process.env.GITHUB_SHA ?? 'local',
+  branch = process.env.GITHUB_HEAD_REF ?? 'local'
+) {
+  if (!readdirSync('test-results', { withFileTypes: true }).length) return
+
+  let tempFiles: string[]
+  try {
+    tempFiles = readdirSync(TEMP_DIR).filter((f) => f.endsWith('.json'))
+  } catch {
+    return
+  }
+  if (tempFiles.length === 0) return
+
+  const measurements: PerfMeasurement[] = tempFiles.map((f) =>
+    JSON.parse(readFileSync(join(TEMP_DIR, f), 'utf-8'))
+  )
+
+  const report: PerfReport = {
+    timestamp: new Date().toISOString(),
+    gitSha,
+    branch,
+    measurements
+  }
+  writeFileSync(
+    join('test-results', 'perf-metrics.json'),
+    JSON.stringify(report, null, 2)
+  )
+}
diff --git a/browser_tests/helpers/promotedWidgets.ts b/browser_tests/helpers/promotedWidgets.ts
new file mode 100644
index 0000000000..074fc77ced
--- /dev/null
+++ b/browser_tests/helpers/promotedWidgets.ts
@@ -0,0 +1,64 @@
+import type { ComfyPage } from '../fixtures/ComfyPage'
+
+export type PromotedWidgetEntry = [string, string]
+
+export function isPromotedWidgetEntry(
+  entry: unknown
+): entry is PromotedWidgetEntry {
+  return (
+    Array.isArray(entry) &&
+    entry.length === 2 &&
+    typeof entry[0] === 'string' &&
+    typeof entry[1] === 'string'
+  )
+}
+
+export function normalizePromotedWidgets(
+  value: unknown
+): PromotedWidgetEntry[] {
+  if (!Array.isArray(value)) return []
+  return value.filter(isPromotedWidgetEntry)
+}
+
+export async function getPromotedWidgets(
+  comfyPage: ComfyPage,
+  nodeId: string
+): Promise<PromotedWidgetEntry[]> {
+  const raw = await comfyPage.page.evaluate((id) => {
+    const node = window.app!.canvas.graph!.getNodeById(id)
+    return node?.properties?.proxyWidgets ?? []
+  }, nodeId)
+
+  return normalizePromotedWidgets(raw)
+}
+
+export async function getPromotedWidgetNames(
+  comfyPage: ComfyPage,
+  nodeId: string
+): Promise<string[]> {
+  const promotedWidgets = await getPromotedWidgets(comfyPage, nodeId)
+  return promotedWidgets.map(([, widgetName]) => widgetName)
+}
+
+export async function getPromotedWidgetCount(
+  comfyPage: ComfyPage,
+  nodeId: string
+): Promise<number> {
+  const promotedWidgets = await getPromotedWidgets(comfyPage, nodeId)
+  return promotedWidgets.length
+}
+
+export async function getPromotedWidgetCountByName(
+  comfyPage: ComfyPage,
+  nodeId: string,
+  widgetName: string
+): Promise<number> {
+  return comfyPage.page.evaluate(
+    ([id, name]) => {
+      const node = window.app!.canvas.graph!.getNodeById(id)
+      const widgets = node?.widgets ?? []
+      return widgets.filter((widget) => widget.name === name).length
+    },
+    [nodeId, widgetName] as const
+  )
+}
diff --git a/browser_tests/helpers/subgraphTestUtils.ts b/browser_tests/helpers/subgraphTestUtils.ts
new file mode 100644
index 0000000000..0eae24651d
--- /dev/null
+++ b/browser_tests/helpers/subgraphTestUtils.ts
@@ -0,0 +1,16 @@
+import type { LGraph, Subgraph } from '../../src/lib/litegraph/src/litegraph'
+import { isSubgraph } from '../../src/utils/typeGuardUtil'
+
+/**
+ * Assertion helper for tests where being in a subgraph is a precondition.
+ * Throws a clear error if the graph is not a Subgraph.
+ */
+export function assertSubgraph(
+  graph: LGraph | Subgraph | null | undefined
+): asserts graph is Subgraph {
+  if (!isSubgraph(graph)) {
+    throw new Error(
+      'Expected to be in a subgraph context, but graph is not a Subgraph'
+    )
+  }
+}
diff --git a/browser_tests/helpers/templates.ts b/browser_tests/helpers/templates.ts
index ca74096ad2..ddbf1f79d4 100644
--- a/browser_tests/helpers/templates.ts
+++ b/browser_tests/helpers/templates.ts
@@ -6,18 +6,19 @@ import type {
   TemplateInfo,
   WorkflowTemplates
 } from '../../src/platform/workflow/templates/types/template'
+import { TestIds } from '../fixtures/selectors'
 
 export class ComfyTemplates {
   readonly content: Locator
   readonly allTemplateCards: Locator
 
   constructor(readonly page: Page) {
-    this.content = page.getByTestId('template-workflows-content')
+    this.content = page.getByTestId(TestIds.templates.content)
     this.allTemplateCards = page.locator('[data-testid^="template-workflow-"]')
   }
 
-  async waitForMinimumCardCount(count: number) {
-    return await expect(async () => {
+  async expectMinimumCardCount(count: number) {
+    await expect(async () => {
       const cardCount = await this.allTemplateCards.count()
       expect(cardCount).toBeGreaterThanOrEqual(count)
     }).toPass({
@@ -26,14 +27,16 @@ export class ComfyTemplates {
   }
 
   async loadTemplate(id: string) {
-    const templateCard = this.content.getByTestId(`template-workflow-${id}`)
+    const templateCard = this.content.getByTestId(
+      TestIds.templates.workflowCard(id)
+    )
     await templateCard.scrollIntoViewIfNeeded()
     await templateCard.getByRole('img').click()
   }
 
   async getAllTemplates(): Promise<TemplateInfo[]> {
     const templates: WorkflowTemplates[] = await this.page.evaluate(() =>
-      window['app'].api.getCoreWorkflowTemplates()
+      window.app!.api.getCoreWorkflowTemplates()
     )
     return templates.flatMap((t) => t.templates)
   }
diff --git a/browser_tests/tests/actionbar.spec.ts b/browser_tests/tests/actionbar.spec.ts
index bd086b4610..4d57b65f48 100644
--- a/browser_tests/tests/actionbar.spec.ts
+++ b/browser_tests/tests/actionbar.spec.ts
@@ -1,15 +1,16 @@
 import type { Response } from '@playwright/test'
 import { expect, mergeTests } from '@playwright/test'
 
-import type { StatusWsMessage } from '../../src/schemas/apiSchema.ts'
-import { comfyPageFixture } from '../fixtures/ComfyPage.ts'
-import { webSocketFixture } from '../fixtures/ws.ts'
+import type { StatusWsMessage } from '../../src/schemas/apiSchema'
+import { comfyPageFixture } from '../fixtures/ComfyPage'
+import { webSocketFixture } from '../fixtures/ws'
+import type { WorkspaceStore } from '../types/globals'
 
 const test = mergeTests(comfyPageFixture, webSocketFixture)
 
-test.describe('Actionbar', () => {
+test.describe('Actionbar', { tag: '@ui' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
   })
 
   /**
@@ -49,13 +50,14 @@ test.describe('Actionbar', () => {
     // Find and set the width on the latent node
     const triggerChange = async (value: number) => {
       return await comfyPage.page.evaluate((value) => {
-        const node = window['app'].graph._nodes.find(
+        const node = window.app!.graph!._nodes.find(
           (n) => n.type === 'EmptyLatentImage'
         )
-        node.widgets[0].value = value
-        window[
-          'app'
-        ].extensionManager.workflow.activeWorkflow.changeTracker.checkState()
+        node!.widgets![0].value = value
+
+        ;(
+          window.app!.extensionManager as WorkspaceStore
+        ).workflow.activeWorkflow?.changeTracker.checkState()
       }, value)
     }
 
diff --git a/browser_tests/tests/backgroundImageUpload.spec.ts b/browser_tests/tests/backgroundImageUpload.spec.ts
index b620f5441e..0f49787b21 100644
--- a/browser_tests/tests/backgroundImageUpload.spec.ts
+++ b/browser_tests/tests/backgroundImageUpload.spec.ts
@@ -3,18 +3,18 @@ import { expect } from '@playwright/test'
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
 test.describe('Background Image Upload', () => {
   test.beforeEach(async ({ comfyPage }) => {
     // Reset the background image setting before each test
-    await comfyPage.setSetting('Comfy.Canvas.BackgroundImage', '')
+    await comfyPage.settings.setSetting('Comfy.Canvas.BackgroundImage', '')
   })
 
   test.afterEach(async ({ comfyPage }) => {
     // Clean up background image setting after each test
-    await comfyPage.setSetting('Comfy.Canvas.BackgroundImage', '')
+    await comfyPage.settings.setSetting('Comfy.Canvas.BackgroundImage', '')
   })
 
   test('should show background image upload component in settings', async ({
@@ -34,16 +34,18 @@ test.describe('Background Image Upload', () => {
     await expect(backgroundImageSetting).toBeVisible()
 
     // Verify the component has the expected elements using semantic selectors
-    const urlInput = backgroundImageSetting.locator('input[type="text"]')
+    const urlInput = backgroundImageSetting.getByRole('textbox')
     await expect(urlInput).toBeVisible()
     await expect(urlInput).toHaveAttribute('placeholder')
 
-    const uploadButton = backgroundImageSetting.locator(
-      'button:has(.pi-upload)'
-    )
+    const uploadButton = backgroundImageSetting.getByRole('button', {
+      name: /upload/i
+    })
     await expect(uploadButton).toBeVisible()
 
-    const clearButton = backgroundImageSetting.locator('button:has(.pi-trash)')
+    const clearButton = backgroundImageSetting.getByRole('button', {
+      name: /clear/i
+    })
     await expect(clearButton).toBeVisible()
     await expect(clearButton).toBeDisabled() // Should be disabled when no image
   })
@@ -63,9 +65,9 @@ test.describe('Background Image Upload', () => {
       '#Comfy\\.Canvas\\.BackgroundImage'
     )
     // Click the upload button to trigger file input
-    const uploadButton = backgroundImageSetting.locator(
-      'button:has(.pi-upload)'
-    )
+    const uploadButton = backgroundImageSetting.getByRole('button', {
+      name: /upload/i
+    })
 
     // Set up file upload handler
     const fileChooserPromise = comfyPage.page.waitForEvent('filechooser')
@@ -76,15 +78,17 @@ test.describe('Background Image Upload', () => {
     await fileChooser.setFiles(comfyPage.assetPath('image32x32.webp'))
 
     // Verify the URL input now has an API URL
-    const urlInput = backgroundImageSetting.locator('input[type="text"]')
+    const urlInput = backgroundImageSetting.getByRole('textbox')
     await expect(urlInput).toHaveValue(/^\/api\/view\?.*subfolder=backgrounds/)
 
     // Verify clear button is now enabled
-    const clearButton = backgroundImageSetting.locator('button:has(.pi-trash)')
+    const clearButton = backgroundImageSetting.getByRole('button', {
+      name: /clear/i
+    })
     await expect(clearButton).toBeEnabled()
 
     // Verify the setting value was actually set
-    const settingValue = await comfyPage.getSetting(
+    const settingValue = await comfyPage.settings.getSetting(
       'Comfy.Canvas.BackgroundImage'
     )
     expect(settingValue).toMatch(/^\/api\/view\?.*subfolder=backgrounds/)
@@ -107,18 +111,20 @@ test.describe('Background Image Upload', () => {
       '#Comfy\\.Canvas\\.BackgroundImage'
     )
     // Enter URL in the input field
-    const urlInput = backgroundImageSetting.locator('input[type="text"]')
+    const urlInput = backgroundImageSetting.getByRole('textbox')
     await urlInput.fill(testImageUrl)
 
     // Trigger blur event to ensure the value is set
     await urlInput.blur()
 
     // Verify clear button is now enabled
-    const clearButton = backgroundImageSetting.locator('button:has(.pi-trash)')
+    const clearButton = backgroundImageSetting.getByRole('button', {
+      name: /clear/i
+    })
     await expect(clearButton).toBeEnabled()
 
     // Verify the setting value was updated
-    const settingValue = await comfyPage.getSetting(
+    const settingValue = await comfyPage.settings.getSetting(
       'Comfy.Canvas.BackgroundImage'
     )
     expect(settingValue).toBe(testImageUrl)
@@ -130,7 +136,10 @@ test.describe('Background Image Upload', () => {
     const testImageUrl = 'https://example.com/test-image.png'
 
     // First set a background image
-    await comfyPage.setSetting('Comfy.Canvas.BackgroundImage', testImageUrl)
+    await comfyPage.settings.setSetting(
+      'Comfy.Canvas.BackgroundImage',
+      testImageUrl
+    )
 
     // Open settings dialog
     await comfyPage.page.keyboard.press('Control+,')
@@ -144,11 +153,13 @@ test.describe('Background Image Upload', () => {
       '#Comfy\\.Canvas\\.BackgroundImage'
     )
     // Verify the input has the test URL
-    const urlInput = backgroundImageSetting.locator('input[type="text"]')
+    const urlInput = backgroundImageSetting.getByRole('textbox')
     await expect(urlInput).toHaveValue(testImageUrl)
 
     // Verify clear button is enabled
-    const clearButton = backgroundImageSetting.locator('button:has(.pi-trash)')
+    const clearButton = backgroundImageSetting.getByRole('button', {
+      name: /clear/i
+    })
     await expect(clearButton).toBeEnabled()
 
     // Click the clear button
@@ -161,7 +172,7 @@ test.describe('Background Image Upload', () => {
     await expect(clearButton).toBeDisabled()
 
     // Verify the setting value was cleared
-    const settingValue = await comfyPage.getSetting(
+    const settingValue = await comfyPage.settings.getSetting(
       'Comfy.Canvas.BackgroundImage'
     )
     expect(settingValue).toBe('')
@@ -182,9 +193,9 @@ test.describe('Background Image Upload', () => {
       '#Comfy\\.Canvas\\.BackgroundImage'
     )
     // Hover over upload button and verify tooltip appears
-    const uploadButton = backgroundImageSetting.locator(
-      'button:has(.pi-upload)'
-    )
+    const uploadButton = backgroundImageSetting.getByRole('button', {
+      name: /upload/i
+    })
     await uploadButton.hover()
 
     const uploadTooltip = comfyPage.page.locator('.p-tooltip:visible')
@@ -194,12 +205,14 @@ test.describe('Background Image Upload', () => {
     await comfyPage.page.locator('body').hover()
 
     // Set a background to enable clear button
-    const urlInput = backgroundImageSetting.locator('input[type="text"]')
+    const urlInput = backgroundImageSetting.getByRole('textbox')
     await urlInput.fill('https://example.com/test.png')
     await urlInput.blur()
 
     // Hover over clear button and verify tooltip appears
-    const clearButton = backgroundImageSetting.locator('button:has(.pi-trash)')
+    const clearButton = backgroundImageSetting.getByRole('button', {
+      name: /clear/i
+    })
     await clearButton.hover()
 
     const clearTooltip = comfyPage.page.locator('.p-tooltip:visible')
@@ -220,8 +233,10 @@ test.describe('Background Image Upload', () => {
     const backgroundImageSetting = comfyPage.page.locator(
       '#Comfy\\.Canvas\\.BackgroundImage'
     )
-    const urlInput = backgroundImageSetting.locator('input[type="text"]')
-    const clearButton = backgroundImageSetting.locator('button:has(.pi-trash)')
+    const urlInput = backgroundImageSetting.getByRole('textbox')
+    const clearButton = backgroundImageSetting.getByRole('button', {
+      name: /clear/i
+    })
 
     // Initially clear button should be disabled
     await expect(clearButton).toBeDisabled()
diff --git a/browser_tests/tests/bottomPanelShortcuts.spec.ts b/browser_tests/tests/bottomPanelShortcuts.spec.ts
index 67a3670c53..bebba30de1 100644
--- a/browser_tests/tests/bottomPanelShortcuts.spec.ts
+++ b/browser_tests/tests/bottomPanelShortcuts.spec.ts
@@ -2,55 +2,35 @@ import { expect } from '@playwright/test'
 
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
-test.describe('Bottom Panel Shortcuts', () => {
+test.describe('Bottom Panel Shortcuts', { tag: '@ui' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
   })
 
   test('should toggle shortcuts panel visibility', async ({ comfyPage }) => {
-    // Initially shortcuts panel should be hidden
-    await expect(comfyPage.page.locator('.bottom-panel')).not.toBeVisible()
+    const { bottomPanel } = comfyPage
 
-    // Click shortcuts toggle button in sidebar
-    await comfyPage.page
-      .locator('button[aria-label*="Keyboard Shortcuts"]')
-      .click()
-
-    // Shortcuts panel should now be visible
-    await expect(comfyPage.page.locator('.bottom-panel')).toBeVisible()
-
-    // Click toggle button again to hide
-    await comfyPage.page
-      .locator('button[aria-label*="Keyboard Shortcuts"]')
-      .click()
-
-    // Panel should be hidden again
-    await expect(comfyPage.page.locator('.bottom-panel')).not.toBeVisible()
+    await expect(bottomPanel.root).not.toBeVisible()
+    await bottomPanel.keyboardShortcutsButton.click()
+    await expect(bottomPanel.root).toBeVisible()
+    await bottomPanel.keyboardShortcutsButton.click()
+    await expect(bottomPanel.root).not.toBeVisible()
   })
 
   test('should display essentials shortcuts tab', async ({ comfyPage }) => {
-    // Open shortcuts panel
-    await comfyPage.page
-      .locator('button[aria-label*="Keyboard Shortcuts"]')
-      .click()
+    const { bottomPanel } = comfyPage
 
-    // Essentials tab should be visible and active by default
-    await expect(
-      comfyPage.page.getByRole('tab', { name: /Essential/i })
-    ).toBeVisible()
-    await expect(
-      comfyPage.page.getByRole('tab', { name: /Essential/i })
-    ).toHaveAttribute('aria-selected', 'true')
+    await bottomPanel.keyboardShortcutsButton.click()
 
-    // Should display shortcut categories
-    await expect(
-      comfyPage.page.locator('.subcategory-title').first()
-    ).toBeVisible()
+    await expect(bottomPanel.shortcuts.essentialsTab).toBeVisible()
+    await expect(bottomPanel.shortcuts.essentialsTab).toHaveAttribute(
+      'aria-selected',
+      'true'
+    )
 
-    // Should display some keyboard shortcuts
-    await expect(comfyPage.page.locator('.key-badge').first()).toBeVisible()
+    await expect(bottomPanel.shortcuts.subcategoryTitles.first()).toBeVisible()
+    await expect(bottomPanel.shortcuts.keyBadges.first()).toBeVisible()
 
-    // Should have workflow, node, and queue sections
     await expect(
       comfyPage.page.getByRole('heading', { name: 'Workflow' })
     ).toBeVisible()
@@ -63,23 +43,18 @@ test.describe('Bottom Panel Shortcuts', () => {
   })
 
   test('should display view controls shortcuts tab', async ({ comfyPage }) => {
-    // Open shortcuts panel
-    await comfyPage.page
-      .locator('button[aria-label*="Keyboard Shortcuts"]')
-      .click()
+    const { bottomPanel } = comfyPage
 
-    // Click view controls tab
-    await comfyPage.page.getByRole('tab', { name: /View Controls/i }).click()
+    await bottomPanel.keyboardShortcutsButton.click()
+    await bottomPanel.shortcuts.viewControlsTab.click()
 
-    // View controls tab should be active
-    await expect(
-      comfyPage.page.getByRole('tab', { name: /View Controls/i })
-    ).toHaveAttribute('aria-selected', 'true')
+    await expect(bottomPanel.shortcuts.viewControlsTab).toHaveAttribute(
+      'aria-selected',
+      'true'
+    )
 
-    // Should display view controls shortcuts
-    await expect(comfyPage.page.locator('.key-badge').first()).toBeVisible()
+    await expect(bottomPanel.shortcuts.keyBadges.first()).toBeVisible()
 
-    // Should have view and panel controls sections
     await expect(
       comfyPage.page.getByRole('heading', { name: 'View' })
     ).toBeVisible()
@@ -89,54 +64,48 @@ test.describe('Bottom Panel Shortcuts', () => {
   })
 
   test('should switch between shortcuts tabs', async ({ comfyPage }) => {
-    // Open shortcuts panel
-    await comfyPage.page
-      .locator('button[aria-label*="Keyboard Shortcuts"]')
-      .click()
+    const { bottomPanel } = comfyPage
 
-    // Essentials should be active initially
-    await expect(
-      comfyPage.page.getByRole('tab', { name: /Essential/i })
-    ).toHaveAttribute('aria-selected', 'true')
+    await bottomPanel.keyboardShortcutsButton.click()
 
-    // Click view controls tab
-    await comfyPage.page.getByRole('tab', { name: /View Controls/i }).click()
+    await expect(bottomPanel.shortcuts.essentialsTab).toHaveAttribute(
+      'aria-selected',
+      'true'
+    )
 
-    // View controls should now be active
-    await expect(
-      comfyPage.page.getByRole('tab', { name: /View Controls/i })
-    ).toHaveAttribute('aria-selected', 'true')
-    await expect(
-      comfyPage.page.getByRole('tab', { name: /Essential/i })
-    ).not.toHaveAttribute('aria-selected', 'true')
+    await bottomPanel.shortcuts.viewControlsTab.click()
 
-    // Switch back to essentials
-    await comfyPage.page.getByRole('tab', { name: /Essential/i }).click()
+    await expect(bottomPanel.shortcuts.viewControlsTab).toHaveAttribute(
+      'aria-selected',
+      'true'
+    )
+    await expect(bottomPanel.shortcuts.essentialsTab).not.toHaveAttribute(
+      'aria-selected',
+      'true'
+    )
 
-    // Essentials should be active again
-    await expect(
-      comfyPage.page.getByRole('tab', { name: /Essential/i })
-    ).toHaveAttribute('aria-selected', 'true')
-    await expect(
-      comfyPage.page.getByRole('tab', { name: /View Controls/i })
-    ).not.toHaveAttribute('aria-selected', 'true')
+    await bottomPanel.shortcuts.essentialsTab.click()
+
+    await expect(bottomPanel.shortcuts.essentialsTab).toHaveAttribute(
+      'aria-selected',
+      'true'
+    )
+    await expect(bottomPanel.shortcuts.viewControlsTab).not.toHaveAttribute(
+      'aria-selected',
+      'true'
+    )
   })
 
   test('should display formatted keyboard shortcuts', async ({ comfyPage }) => {
-    // Open shortcuts panel
-    await comfyPage.page
-      .locator('button[aria-label*="Keyboard Shortcuts"]')
-      .click()
+    const { bottomPanel } = comfyPage
 
-    // Wait for shortcuts to load
-    await comfyPage.page.waitForSelector('.key-badge')
+    await bottomPanel.keyboardShortcutsButton.click()
 
-    // Check for common formatted keys
-    const keyBadges = comfyPage.page.locator('.key-badge')
+    const keyBadges = bottomPanel.shortcuts.keyBadges
+    await keyBadges.first().waitFor({ state: 'visible' })
     const count = await keyBadges.count()
     expect(count).toBeGreaterThanOrEqual(1)
 
-    // Should show formatted modifier keys
     const badgeText = await keyBadges.allTextContents()
     const hasModifiers = badgeText.some((text) =>
       ['Ctrl', 'Cmd', 'Shift', 'Alt'].includes(text)
@@ -144,91 +113,89 @@ test.describe('Bottom Panel Shortcuts', () => {
     expect(hasModifiers).toBeTruthy()
   })
 
-  test('should maintain panel state when switching to terminal', async ({
+  test('should maintain panel state when switching between panels', async ({
     comfyPage
   }) => {
+    const { bottomPanel } = comfyPage
+
     // Open shortcuts panel first
-    await comfyPage.page
-      .locator('button[aria-label*="Keyboard Shortcuts"]')
-      .click()
-    await expect(comfyPage.page.locator('.bottom-panel')).toBeVisible()
-
-    // Open terminal panel (should switch panels)
-    await comfyPage.page
-      .locator('button[aria-label*="Toggle Bottom Panel"]')
-      .click()
-
-    // Panel should still be visible but showing terminal content
-    await expect(comfyPage.page.locator('.bottom-panel')).toBeVisible()
-
-    // Switch back to shortcuts
-    await comfyPage.page
-      .locator('button[aria-label*="Keyboard Shortcuts"]')
-      .click()
-
-    // Should show shortcuts content again
+    await bottomPanel.keyboardShortcutsButton.click()
+    await expect(bottomPanel.root).toBeVisible()
     await expect(
       comfyPage.page.locator('[id*="tab_shortcuts-essentials"]')
     ).toBeVisible()
+
+    // Try to open terminal panel - may show terminal OR close shortcuts
+    // depending on whether terminal tabs have loaded (async loading)
+    await bottomPanel.toggleButton.click()
+
+    // Check if terminal tabs loaded (Logs tab visible) or fell back to shortcuts toggle
+    const logsTab = comfyPage.page.getByRole('tab', { name: /Logs/i })
+    const hasTerminalTabs = await logsTab.isVisible().catch(() => false)
+
+    if (hasTerminalTabs) {
+      // Terminal panel is visible - verify we can switch back to shortcuts
+      await expect(bottomPanel.root).toBeVisible()
+
+      // Switch back to shortcuts
+      await bottomPanel.keyboardShortcutsButton.click()
+
+      // Should show shortcuts content again
+      await expect(
+        comfyPage.page.locator('[id*="tab_shortcuts-essentials"]')
+      ).toBeVisible()
+    } else {
+      // Terminal tabs not loaded - button toggled shortcuts off, reopen for verification
+      await bottomPanel.keyboardShortcutsButton.click()
+      await expect(bottomPanel.root).toBeVisible()
+      await expect(
+        comfyPage.page.locator('[id*="tab_shortcuts-essentials"]')
+      ).toBeVisible()
+    }
   })
 
   test('should handle keyboard navigation', async ({ comfyPage }) => {
-    // Open shortcuts panel
-    await comfyPage.page
-      .locator('button[aria-label*="Keyboard Shortcuts"]')
-      .click()
+    const { bottomPanel } = comfyPage
 
-    // Focus the first tab
-    await comfyPage.page.getByRole('tab', { name: /Essential/i }).focus()
+    await bottomPanel.keyboardShortcutsButton.click()
+    await bottomPanel.shortcuts.essentialsTab.focus()
 
-    // Use arrow keys to navigate between tabs
     await comfyPage.page.keyboard.press('ArrowRight')
 
-    // View controls tab should now have focus
-    await expect(
-      comfyPage.page.getByRole('tab', { name: /View Controls/i })
-    ).toBeFocused()
+    await expect(bottomPanel.shortcuts.viewControlsTab).toBeFocused()
 
-    // Press Enter to activate the tab
     await comfyPage.page.keyboard.press('Enter')
 
-    // Tab should be selected
-    await expect(
-      comfyPage.page.getByRole('tab', { name: /View Controls/i })
-    ).toHaveAttribute('aria-selected', 'true')
+    await expect(bottomPanel.shortcuts.viewControlsTab).toHaveAttribute(
+      'aria-selected',
+      'true'
+    )
   })
 
   test('should close panel by clicking shortcuts button again', async ({
     comfyPage
   }) => {
-    // Open shortcuts panel
-    await comfyPage.page
-      .locator('button[aria-label*="Keyboard Shortcuts"]')
-      .click()
-    await expect(comfyPage.page.locator('.bottom-panel')).toBeVisible()
+    const { bottomPanel } = comfyPage
 
-    // Click shortcuts button again to close
-    await comfyPage.page
-      .locator('button[aria-label*="Keyboard Shortcuts"]')
-      .click()
+    await bottomPanel.keyboardShortcutsButton.click()
+    await expect(bottomPanel.root).toBeVisible()
 
-    // Panel should be hidden
-    await expect(comfyPage.page.locator('.bottom-panel')).not.toBeVisible()
+    await bottomPanel.keyboardShortcutsButton.click()
+    await expect(bottomPanel.root).not.toBeVisible()
   })
 
   test('should display shortcuts in organized columns', async ({
     comfyPage
   }) => {
-    // Open shortcuts panel
-    await comfyPage.page
-      .locator('button[aria-label*="Keyboard Shortcuts"]')
-      .click()
+    const { bottomPanel } = comfyPage
 
-    // Should have 3-column grid layout
-    await expect(comfyPage.page.locator('.md\\:grid-cols-3')).toBeVisible()
+    await bottomPanel.keyboardShortcutsButton.click()
 
-    // Should have multiple subcategory sections
-    const subcategoryTitles = comfyPage.page.locator('.subcategory-title')
+    await expect(
+      comfyPage.page.locator('[data-testid="shortcuts-columns"]')
+    ).toBeVisible()
+
+    const subcategoryTitles = bottomPanel.shortcuts.subcategoryTitles
     const titleCount = await subcategoryTitles.count()
     expect(titleCount).toBeGreaterThanOrEqual(2)
   })
@@ -236,45 +203,30 @@ test.describe('Bottom Panel Shortcuts', () => {
   test('should open shortcuts panel with Ctrl+Shift+K', async ({
     comfyPage
   }) => {
-    // Initially shortcuts panel should be hidden
-    await expect(comfyPage.page.locator('.bottom-panel')).not.toBeVisible()
+    const { bottomPanel } = comfyPage
+
+    await expect(bottomPanel.root).not.toBeVisible()
 
-    // Press Ctrl+Shift+K to open shortcuts panel
     await comfyPage.page.keyboard.press('Control+Shift+KeyK')
 
-    // Shortcuts panel should now be visible
-    await expect(comfyPage.page.locator('.bottom-panel')).toBeVisible()
-
-    // Should show essentials tab by default
-    await expect(
-      comfyPage.page.getByRole('tab', { name: /Essential/i })
-    ).toHaveAttribute('aria-selected', 'true')
+    await expect(bottomPanel.root).toBeVisible()
+    await expect(bottomPanel.shortcuts.essentialsTab).toHaveAttribute(
+      'aria-selected',
+      'true'
+    )
   })
 
   test('should open settings dialog when clicking manage shortcuts button', async ({
     comfyPage
   }) => {
-    // Open shortcuts panel
-    await comfyPage.page
-      .locator('button[aria-label*="Keyboard Shortcuts"]')
-      .click()
+    const { bottomPanel } = comfyPage
 
-    // Manage shortcuts button should be visible
-    await expect(
-      comfyPage.page.getByRole('button', { name: /Manage Shortcuts/i })
-    ).toBeVisible()
+    await bottomPanel.keyboardShortcutsButton.click()
 
-    // Click manage shortcuts button
-    await comfyPage.page
-      .getByRole('button', { name: /Manage Shortcuts/i })
-      .click()
+    await expect(bottomPanel.shortcuts.manageButton).toBeVisible()
+    await bottomPanel.shortcuts.manageButton.click()
 
-    // Settings dialog should open with keybinding tab
-    await expect(comfyPage.page.getByRole('dialog')).toBeVisible()
-
-    // Should show keybinding settings (check for keybinding-related content)
-    await expect(
-      comfyPage.page.getByRole('option', { name: 'Keybinding' })
-    ).toBeVisible()
+    await expect(comfyPage.settingDialog.root).toBeVisible()
+    await expect(comfyPage.settingDialog.category('Keybinding')).toBeVisible()
   })
 })
diff --git a/browser_tests/tests/browserTabTitle.spec.ts b/browser_tests/tests/browserTabTitle.spec.ts
index fd855ea4af..1ab294be39 100644
--- a/browser_tests/tests/browserTabTitle.spec.ts
+++ b/browser_tests/tests/browserTabTitle.spec.ts
@@ -1,18 +1,22 @@
 import { expect } from '@playwright/test'
 
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+import type { WorkspaceStore } from '../types/globals'
 
-test.describe('Browser tab title', () => {
+test.describe('Browser tab title', { tag: '@smoke' }, () => {
   test.describe('Beta Menu', () => {
     test.beforeEach(async ({ comfyPage }) => {
-      await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
     })
 
     test('Can display workflow name', async ({ comfyPage }) => {
       const workflowName = await comfyPage.page.evaluate(async () => {
-        return window['app'].extensionManager.workflow.activeWorkflow.filename
+        return (window.app!.extensionManager as WorkspaceStore).workflow
+          .activeWorkflow?.filename
       })
-      expect(await comfyPage.page.title()).toBe(`*${workflowName} - ComfyUI`)
+      await expect
+        .poll(() => comfyPage.page.title())
+        .toBe(`*${workflowName} - ComfyUI`)
     })
 
     // Failing on CI
@@ -21,7 +25,8 @@ test.describe('Browser tab title', () => {
       comfyPage
     }) => {
       const workflowName = await comfyPage.page.evaluate(async () => {
-        return window['app'].extensionManager.workflow.activeWorkflow.filename
+        return (window.app!.extensionManager as WorkspaceStore).workflow
+          .activeWorkflow?.filename
       })
       expect(await comfyPage.page.title()).toBe(`${workflowName} - ComfyUI`)
 
@@ -30,23 +35,25 @@ test.describe('Browser tab title', () => {
 
       const textBox = comfyPage.widgetTextBox
       await textBox.fill('Hello World')
-      await comfyPage.clickEmptySpace()
+      await comfyPage.canvasOps.clickEmptySpace()
       expect(await comfyPage.page.title()).toBe(`*test - ComfyUI`)
 
       // Delete the saved workflow for cleanup.
       await comfyPage.page.evaluate(async () => {
-        return window['app'].extensionManager.workflow.activeWorkflow.delete()
+        return (
+          window.app!.extensionManager as WorkspaceStore
+        ).workflow.activeWorkflow?.delete()
       })
     })
   })
 
   test.describe('Legacy Menu', () => {
     test.beforeEach(async ({ comfyPage }) => {
-      await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
     })
 
     test('Can display default title', async ({ comfyPage }) => {
-      expect(await comfyPage.page.title()).toBe('ComfyUI')
+      await expect.poll(() => comfyPage.page.title()).toBe('ComfyUI')
     })
   })
 })
diff --git a/browser_tests/tests/changeTracker.spec.ts b/browser_tests/tests/changeTracker.spec.ts
index 8e39154f15..ad12179349 100644
--- a/browser_tests/tests/changeTracker.spec.ts
+++ b/browser_tests/tests/changeTracker.spec.ts
@@ -6,69 +6,69 @@ import {
 
 async function beforeChange(comfyPage: ComfyPage) {
   await comfyPage.page.evaluate(() => {
-    window['app'].canvas.emitBeforeChange()
+    window.app!.canvas!.emitBeforeChange()
   })
 }
 async function afterChange(comfyPage: ComfyPage) {
   await comfyPage.page.evaluate(() => {
-    window['app'].canvas.emitAfterChange()
+    window.app!.canvas!.emitAfterChange()
   })
 }
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
-test.describe('Change Tracker', () => {
+test.describe('Change Tracker', { tag: '@workflow' }, () => {
   test.describe('Undo/Redo', () => {
     test.beforeEach(async ({ comfyPage }) => {
-      await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
-      await comfyPage.setupWorkflowsDirectory({})
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+      await comfyPage.workflow.setupWorkflowsDirectory({})
     })
 
     test('Can undo multiple operations', async ({ comfyPage }) => {
-      expect(await comfyPage.getUndoQueueSize()).toBe(0)
-      expect(await comfyPage.getRedoQueueSize()).toBe(0)
+      expect(await comfyPage.workflow.getUndoQueueSize()).toBe(0)
+      expect(await comfyPage.workflow.getRedoQueueSize()).toBe(0)
 
       // Save, confirm no errors & workflow modified flag removed
       await comfyPage.menu.topbar.saveWorkflow('undo-redo-test')
-      expect(await comfyPage.getToastErrorCount()).toBe(0)
-      expect(await comfyPage.isCurrentWorkflowModified()).toBe(false)
-      expect(await comfyPage.getUndoQueueSize()).toBe(0)
-      expect(await comfyPage.getRedoQueueSize()).toBe(0)
+      expect(await comfyPage.toast.getToastErrorCount()).toBe(0)
+      expect(await comfyPage.workflow.isCurrentWorkflowModified()).toBe(false)
+      expect(await comfyPage.workflow.getUndoQueueSize()).toBe(0)
+      expect(await comfyPage.workflow.getRedoQueueSize()).toBe(0)
 
-      const node = (await comfyPage.getFirstNodeRef())!
+      const node = (await comfyPage.nodeOps.getFirstNodeRef())!
       await node.click('title')
       await node.click('collapse')
       await expect(node).toBeCollapsed()
-      expect(await comfyPage.isCurrentWorkflowModified()).toBe(true)
-      expect(await comfyPage.getUndoQueueSize()).toBe(1)
-      expect(await comfyPage.getRedoQueueSize()).toBe(0)
+      expect(await comfyPage.workflow.isCurrentWorkflowModified()).toBe(true)
+      expect(await comfyPage.workflow.getUndoQueueSize()).toBe(1)
+      expect(await comfyPage.workflow.getRedoQueueSize()).toBe(0)
 
-      await comfyPage.ctrlB()
+      await comfyPage.keyboard.bypass()
       await expect(node).toBeBypassed()
-      expect(await comfyPage.isCurrentWorkflowModified()).toBe(true)
-      expect(await comfyPage.getUndoQueueSize()).toBe(2)
-      expect(await comfyPage.getRedoQueueSize()).toBe(0)
+      expect(await comfyPage.workflow.isCurrentWorkflowModified()).toBe(true)
+      expect(await comfyPage.workflow.getUndoQueueSize()).toBe(2)
+      expect(await comfyPage.workflow.getRedoQueueSize()).toBe(0)
 
-      await comfyPage.ctrlZ()
+      await comfyPage.keyboard.undo()
       await expect(node).not.toBeBypassed()
-      expect(await comfyPage.isCurrentWorkflowModified()).toBe(true)
-      expect(await comfyPage.getUndoQueueSize()).toBe(1)
-      expect(await comfyPage.getRedoQueueSize()).toBe(1)
+      expect(await comfyPage.workflow.isCurrentWorkflowModified()).toBe(true)
+      expect(await comfyPage.workflow.getUndoQueueSize()).toBe(1)
+      expect(await comfyPage.workflow.getRedoQueueSize()).toBe(1)
 
-      await comfyPage.ctrlZ()
+      await comfyPage.keyboard.undo()
       await expect(node).not.toBeCollapsed()
-      expect(await comfyPage.isCurrentWorkflowModified()).toBe(false)
-      expect(await comfyPage.getUndoQueueSize()).toBe(0)
-      expect(await comfyPage.getRedoQueueSize()).toBe(2)
+      expect(await comfyPage.workflow.isCurrentWorkflowModified()).toBe(false)
+      expect(await comfyPage.workflow.getUndoQueueSize()).toBe(0)
+      expect(await comfyPage.workflow.getRedoQueueSize()).toBe(2)
     })
   })
 
   test('Can group multiple change actions into a single transaction', async ({
     comfyPage
   }) => {
-    const node = (await comfyPage.getFirstNodeRef())!
+    const node = (await comfyPage.nodeOps.getFirstNodeRef())!
     expect(node).toBeTruthy()
     await expect(node).not.toBeCollapsed()
     await expect(node).not.toBeBypassed()
@@ -77,27 +77,27 @@ test.describe('Change Tracker', () => {
     // Bypass + collapse node
     await node.click('title')
     await node.click('collapse')
-    await comfyPage.ctrlB()
+    await comfyPage.keyboard.bypass()
     await expect(node).toBeCollapsed()
     await expect(node).toBeBypassed()
 
     // Undo, undo, ensure both changes undone
-    await comfyPage.ctrlZ()
+    await comfyPage.keyboard.undo()
     await expect(node).not.toBeBypassed()
     await expect(node).toBeCollapsed()
-    await comfyPage.ctrlZ()
+    await comfyPage.keyboard.undo()
     await expect(node).not.toBeBypassed()
     await expect(node).not.toBeCollapsed()
 
     // Prevent clicks registering a double-click
-    await comfyPage.clickEmptySpace()
+    await comfyPage.canvasOps.clickEmptySpace()
     await node.click('title')
 
     // Run again, but within a change transaction
     await beforeChange(comfyPage)
 
     await node.click('collapse')
-    await comfyPage.ctrlB()
+    await comfyPage.keyboard.bypass()
     await expect(node).toBeCollapsed()
     await expect(node).toBeBypassed()
 
@@ -105,7 +105,7 @@ test.describe('Change Tracker', () => {
     await afterChange(comfyPage)
 
     // Ensure undo reverts both changes
-    await comfyPage.ctrlZ()
+    await comfyPage.keyboard.undo()
     await expect(node).not.toBeBypassed()
     await expect(node).not.toBeCollapsed()
   })
@@ -113,10 +113,10 @@ test.describe('Change Tracker', () => {
   test('Can nest multiple change transactions without adding undo steps', async ({
     comfyPage
   }) => {
-    const node = (await comfyPage.getFirstNodeRef())!
+    const node = (await comfyPage.nodeOps.getFirstNodeRef())!
     const bypassAndPin = async () => {
       await beforeChange(comfyPage)
-      await comfyPage.ctrlB()
+      await comfyPage.keyboard.bypass()
       await expect(node).toBeBypassed()
       await comfyPage.page.keyboard.press('KeyP')
       await comfyPage.nextFrame()
@@ -142,30 +142,30 @@ test.describe('Change Tracker', () => {
 
     await multipleChanges()
 
-    await comfyPage.ctrlZ()
+    await comfyPage.keyboard.undo()
     await expect(node).not.toBeBypassed()
     await expect(node).not.toBePinned()
     await expect(node).not.toBeCollapsed()
 
-    await comfyPage.ctrlY()
+    await comfyPage.keyboard.redo()
     await expect(node).toBeBypassed()
     await expect(node).toBePinned()
     await expect(node).toBeCollapsed()
   })
 
   test('Can detect changes in workflow.extra', async ({ comfyPage }) => {
-    expect(await comfyPage.getUndoQueueSize()).toBe(0)
+    expect(await comfyPage.workflow.getUndoQueueSize()).toBe(0)
     await comfyPage.page.evaluate(() => {
-      window['app'].graph.extra.foo = 'bar'
+      window.app!.graph!.extra.foo = 'bar'
     })
     // Click empty space to trigger a change detection.
-    await comfyPage.clickEmptySpace()
-    expect(await comfyPage.getUndoQueueSize()).toBe(1)
+    await comfyPage.canvasOps.clickEmptySpace()
+    await expect.poll(() => comfyPage.workflow.getUndoQueueSize()).toBe(1)
   })
 
   test('Ignores changes in workflow.ds', async ({ comfyPage }) => {
-    expect(await comfyPage.getUndoQueueSize()).toBe(0)
-    await comfyPage.pan({ x: 10, y: 10 })
-    expect(await comfyPage.getUndoQueueSize()).toBe(0)
+    expect(await comfyPage.workflow.getUndoQueueSize()).toBe(0)
+    await comfyPage.canvasOps.pan({ x: 10, y: 10 })
+    await expect.poll(() => comfyPage.workflow.getUndoQueueSize()).toBe(0)
   })
 })
diff --git a/browser_tests/tests/colorPalette.spec.ts b/browser_tests/tests/colorPalette.spec.ts
index ce372ddfa6..31aa14d7dc 100644
--- a/browser_tests/tests/colorPalette.spec.ts
+++ b/browser_tests/tests/colorPalette.spec.ts
@@ -1,13 +1,13 @@
 import { expect } from '@playwright/test'
 
-import type { Palette } from '../../src/schemas/colorPaletteSchema'
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+import type { WorkspaceStore } from '../types/globals'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
-const customColorPalettes: Record<string, Palette> = {
+const customColorPalettes = {
   obsidian: {
     version: 102,
     id: 'obsidian',
@@ -151,42 +151,50 @@ const customColorPalettes: Record<string, Palette> = {
   }
 }
 
-test.describe('Color Palette', () => {
+test.describe('Color Palette', { tag: ['@screenshot', '@settings'] }, () => {
   test('Can show custom color palette', async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.CustomColorPalettes', customColorPalettes)
+    await comfyPage.settings.setSetting(
+      'Comfy.CustomColorPalettes',
+      customColorPalettes
+    )
     // Reload to apply the new setting. Setting Comfy.CustomColorPalettes directly
     // doesn't update the store immediately.
     await comfyPage.setup()
 
-    await comfyPage.loadWorkflow('nodes/every_node_color')
-    await comfyPage.setSetting('Comfy.ColorPalette', 'obsidian_dark')
+    await comfyPage.workflow.loadWorkflow('nodes/every_node_color')
+    await comfyPage.settings.setSetting('Comfy.ColorPalette', 'obsidian_dark')
     await expect(comfyPage.canvas).toHaveScreenshot(
       'custom-color-palette-obsidian-dark-all-colors.png'
     )
-    await comfyPage.setSetting('Comfy.ColorPalette', 'light_red')
+    await comfyPage.settings.setSetting('Comfy.ColorPalette', 'light_red')
     await comfyPage.nextFrame()
     await expect(comfyPage.canvas).toHaveScreenshot(
       'custom-color-palette-light-red.png'
     )
 
-    await comfyPage.setSetting('Comfy.ColorPalette', 'dark')
+    await comfyPage.settings.setSetting('Comfy.ColorPalette', 'dark')
     await comfyPage.nextFrame()
     await expect(comfyPage.canvas).toHaveScreenshot('default-color-palette.png')
   })
 
   test('Can add custom color palette', async ({ comfyPage }) => {
-    await comfyPage.page.evaluate((p) => {
-      window['app'].extensionManager.colorPalette.addCustomColorPalette(p)
+    await comfyPage.page.evaluate(async (p) => {
+      await (
+        window.app!.extensionManager as WorkspaceStore
+      ).colorPalette.addCustomColorPalette(p)
     }, customColorPalettes.obsidian_dark)
-    expect(await comfyPage.getToastErrorCount()).toBe(0)
+    expect(await comfyPage.toast.getToastErrorCount()).toBe(0)
 
-    await comfyPage.setSetting('Comfy.ColorPalette', 'obsidian_dark')
+    await comfyPage.settings.setSetting('Comfy.ColorPalette', 'obsidian_dark')
     await comfyPage.nextFrame()
     await expect(comfyPage.canvas).toHaveScreenshot(
       'custom-color-palette-obsidian-dark.png'
     )
     // Legacy `custom_` prefix is still supported
-    await comfyPage.setSetting('Comfy.ColorPalette', 'custom_obsidian_dark')
+    await comfyPage.settings.setSetting(
+      'Comfy.ColorPalette',
+      'custom_obsidian_dark'
+    )
     await comfyPage.nextFrame()
     await expect(comfyPage.canvas).toHaveScreenshot(
       'custom-color-palette-obsidian-dark.png'
@@ -194,90 +202,105 @@ test.describe('Color Palette', () => {
   })
 })
 
-test.describe('Node Color Adjustments', () => {
-  test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('nodes/every_node_color')
-  })
-
-  test('should adjust opacity via node opacity setting', async ({
-    comfyPage
-  }) => {
-    await comfyPage.setSetting('Comfy.Node.Opacity', 0.5)
-
-    // Drag mouse to force canvas to redraw
-    await comfyPage.page.mouse.move(0, 0)
-
-    await expect(comfyPage.canvas).toHaveScreenshot('node-opacity-0.5.png')
-
-    await comfyPage.setSetting('Comfy.Node.Opacity', 1.0)
-
-    await comfyPage.page.mouse.move(8, 8)
-    await expect(comfyPage.canvas).toHaveScreenshot('node-opacity-1.png')
-  })
-
-  test('should persist color adjustments when changing themes', async ({
-    comfyPage
-  }) => {
-    await comfyPage.setSetting('Comfy.Node.Opacity', 0.2)
-    await comfyPage.setSetting('Comfy.ColorPalette', 'arc')
-    await comfyPage.nextFrame()
-    await comfyPage.page.mouse.move(0, 0)
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'node-opacity-0.2-arc-theme.png'
-    )
-  })
-
-  test('should not serialize color adjustments in workflow', async ({
-    comfyPage
-  }) => {
-    await comfyPage.setSetting('Comfy.Node.Opacity', 0.5)
-    await comfyPage.setSetting('Comfy.ColorPalette', 'light')
-    const saveWorkflowInterval = 1000
-    const workflow = await comfyPage.page.evaluate(() => {
-      return localStorage.getItem('workflow')
-    })
-    for (const node of JSON.parse(workflow ?? '{}').nodes) {
-      if (node.bgcolor) expect(node.bgcolor).not.toMatch(/hsla/)
-      if (node.color) expect(node.color).not.toMatch(/hsla/)
-    }
-  })
-
-  test('should lighten node colors when switching to light theme', async ({
-    comfyPage
-  }) => {
-    await comfyPage.setSetting('Comfy.ColorPalette', 'light')
-    await comfyPage.nextFrame()
-    await expect(comfyPage.canvas).toHaveScreenshot('node-lightened-colors.png')
-  })
-
-  test.describe('Context menu color adjustments', () => {
+test.describe(
+  'Node Color Adjustments',
+  { tag: ['@screenshot', '@settings'] },
+  () => {
     test.beforeEach(async ({ comfyPage }) => {
-      await comfyPage.setSetting('Comfy.ColorPalette', 'light')
-      await comfyPage.setSetting('Comfy.Node.Opacity', 0.3)
-      const node = await comfyPage.getFirstNodeRef()
-      await node?.clickContextMenuOption('Colors')
+      await comfyPage.workflow.loadWorkflow('nodes/every_node_color')
     })
 
-    test('should persist color adjustments when changing custom node colors', async ({
+    test('should adjust opacity via node opacity setting', async ({
       comfyPage
     }) => {
-      await comfyPage.page
-        .locator('.litemenu-entry.submenu span:has-text("red")')
-        .click()
+      await comfyPage.settings.setSetting('Comfy.Node.Opacity', 0.5)
+
+      // Drag mouse to force canvas to redraw
+      await comfyPage.page.mouse.move(0, 0)
+
+      await expect(comfyPage.canvas).toHaveScreenshot('node-opacity-0.5.png')
+
+      await comfyPage.settings.setSetting('Comfy.Node.Opacity', 1.0)
+
+      await comfyPage.page.mouse.move(8, 8)
+      await expect(comfyPage.canvas).toHaveScreenshot('node-opacity-1.png')
+    })
+
+    test('should persist color adjustments when changing themes', async ({
+      comfyPage
+    }) => {
+      await comfyPage.settings.setSetting('Comfy.Node.Opacity', 0.2)
+      await comfyPage.settings.setSetting('Comfy.ColorPalette', 'arc')
+      await comfyPage.nextFrame()
+      await comfyPage.page.mouse.move(0, 0)
       await expect(comfyPage.canvas).toHaveScreenshot(
-        'node-opacity-0.3-color-changed.png'
+        'node-opacity-0.2-arc-theme.png'
       )
     })
 
-    test('should persist color adjustments when removing custom node color', async ({
+    test('should not serialize color adjustments in workflow', async ({
       comfyPage
     }) => {
-      await comfyPage.page
-        .locator('.litemenu-entry.submenu span:has-text("No color")')
-        .click()
+      await comfyPage.settings.setSetting('Comfy.Node.Opacity', 0.5)
+      await comfyPage.settings.setSetting('Comfy.ColorPalette', 'light')
+      await comfyPage.nextFrame()
+      const parsed = await comfyPage.page.evaluate(() => {
+        const graph = window.app!.graph!
+        if (typeof graph.serialize !== 'function') {
+          throw new Error('app.graph.serialize is not available')
+        }
+        return graph.serialize() as {
+          nodes: Array<{ bgcolor?: string; color?: string }>
+        }
+      })
+      expect(parsed.nodes).toBeDefined()
+      expect(Array.isArray(parsed.nodes)).toBe(true)
+      const nodes = parsed.nodes
+      for (const node of nodes) {
+        if (node.bgcolor) expect(node.bgcolor).not.toMatch(/hsla/)
+        if (node.color) expect(node.color).not.toMatch(/hsla/)
+      }
+    })
+
+    test('should lighten node colors when switching to light theme', async ({
+      comfyPage
+    }) => {
+      await comfyPage.settings.setSetting('Comfy.ColorPalette', 'light')
+      await comfyPage.nextFrame()
       await expect(comfyPage.canvas).toHaveScreenshot(
-        'node-opacity-0.3-color-removed.png'
+        'node-lightened-colors.png'
       )
     })
-  })
-})
+
+    test.describe('Context menu color adjustments', () => {
+      test.beforeEach(async ({ comfyPage }) => {
+        await comfyPage.settings.setSetting('Comfy.ColorPalette', 'light')
+        await comfyPage.settings.setSetting('Comfy.Node.Opacity', 0.3)
+        const node = await comfyPage.nodeOps.getFirstNodeRef()
+        await node?.clickContextMenuOption('Colors')
+      })
+
+      test('should persist color adjustments when changing custom node colors', async ({
+        comfyPage
+      }) => {
+        await comfyPage.page
+          .locator('.litemenu-entry.submenu span:has-text("red")')
+          .click()
+        await expect(comfyPage.canvas).toHaveScreenshot(
+          'node-opacity-0.3-color-changed.png'
+        )
+      })
+
+      test('should persist color adjustments when removing custom node color', async ({
+        comfyPage
+      }) => {
+        await comfyPage.page
+          .locator('.litemenu-entry.submenu span:has-text("No color")')
+          .click()
+        await expect(comfyPage.canvas).toHaveScreenshot(
+          'node-opacity-0.3-color-removed.png'
+        )
+      })
+    })
+  }
+)
diff --git a/browser_tests/tests/commands.spec.ts b/browser_tests/tests/commands.spec.ts
index e271f2e15c..d4e4f7fbfc 100644
--- a/browser_tests/tests/commands.spec.ts
+++ b/browser_tests/tests/commands.spec.ts
@@ -3,52 +3,52 @@ import { expect } from '@playwright/test'
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
-test.describe('Keybindings', () => {
+test.describe('Keybindings', { tag: '@keyboard' }, () => {
   test('Should execute command', async ({ comfyPage }) => {
-    await comfyPage.registerCommand('TestCommand', () => {
-      window['foo'] = true
+    await comfyPage.command.registerCommand('TestCommand', () => {
+      window.foo = true
     })
 
-    await comfyPage.executeCommand('TestCommand')
-    expect(await comfyPage.page.evaluate(() => window['foo'])).toBe(true)
+    await comfyPage.command.executeCommand('TestCommand')
+    expect(await comfyPage.page.evaluate(() => window.foo)).toBe(true)
   })
 
   test('Should execute async command', async ({ comfyPage }) => {
-    await comfyPage.registerCommand('TestCommand', async () => {
+    await comfyPage.command.registerCommand('TestCommand', async () => {
       await new Promise<void>((resolve) =>
         setTimeout(() => {
-          window['foo'] = true
+          window.foo = true
           resolve()
         }, 5)
       )
     })
 
-    await comfyPage.executeCommand('TestCommand')
-    expect(await comfyPage.page.evaluate(() => window['foo'])).toBe(true)
+    await comfyPage.command.executeCommand('TestCommand')
+    expect(await comfyPage.page.evaluate(() => window.foo)).toBe(true)
   })
 
   test('Should handle command errors', async ({ comfyPage }) => {
-    await comfyPage.registerCommand('TestCommand', () => {
+    await comfyPage.command.registerCommand('TestCommand', () => {
       throw new Error('Test error')
     })
 
-    await comfyPage.executeCommand('TestCommand')
-    expect(await comfyPage.getToastErrorCount()).toBe(1)
+    await comfyPage.command.executeCommand('TestCommand')
+    expect(await comfyPage.toast.getToastErrorCount()).toBe(1)
   })
 
   test('Should handle async command errors', async ({ comfyPage }) => {
-    await comfyPage.registerCommand('TestCommand', async () => {
-      await new Promise<void>((resolve, reject) =>
+    await comfyPage.command.registerCommand('TestCommand', async () => {
+      await new Promise<void>((_resolve, reject) =>
         setTimeout(() => {
           reject(new Error('Test error'))
         }, 5)
       )
     })
 
-    await comfyPage.executeCommand('TestCommand')
-    expect(await comfyPage.getToastErrorCount()).toBe(1)
+    await comfyPage.command.executeCommand('TestCommand')
+    expect(await comfyPage.toast.getToastErrorCount()).toBe(1)
   })
 })
diff --git a/browser_tests/tests/confirmDialogTextWrap.spec.ts b/browser_tests/tests/confirmDialogTextWrap.spec.ts
new file mode 100644
index 0000000000..6a12ccd1b6
--- /dev/null
+++ b/browser_tests/tests/confirmDialogTextWrap.spec.ts
@@ -0,0 +1,32 @@
+import { expect } from '@playwright/test'
+
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+
+test.describe('Confirm dialog text wrapping', { tag: ['@mobile'] }, () => {
+  test('@mobile confirm dialog buttons are visible with long unbreakable text', async ({
+    comfyPage
+  }) => {
+    const longFilename = 'workflow_checkpoint_' + 'a'.repeat(200) + '.json'
+
+    await comfyPage.page.evaluate((msg) => {
+      window
+        .app!.extensionManager.dialog.confirm({
+          title: 'Confirm',
+          type: 'default',
+          message: msg
+        })
+        .catch(() => {})
+    }, longFilename)
+
+    const dialog = comfyPage.page.getByRole('dialog')
+    await expect(dialog).toBeVisible()
+
+    const confirmButton = dialog.getByRole('button', { name: 'Confirm' })
+    await expect(confirmButton).toBeVisible()
+    await expect(confirmButton).toBeInViewport()
+
+    const cancelButton = dialog.getByRole('button', { name: 'Cancel' })
+    await expect(cancelButton).toBeVisible()
+    await expect(cancelButton).toBeInViewport()
+  })
+})
diff --git a/browser_tests/tests/copyPaste.spec.ts b/browser_tests/tests/copyPaste.spec.ts
index cabb849e80..4481d00c05 100644
--- a/browser_tests/tests/copyPaste.spec.ts
+++ b/browser_tests/tests/copyPaste.spec.ts
@@ -1,24 +1,31 @@
 import { expect } from '@playwright/test'
 
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+import { DefaultGraphPositions } from '../fixtures/constants/defaultGraphPositions'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
-test.describe('Copy Paste', () => {
+test.describe('Copy Paste', { tag: ['@screenshot', '@workflow'] }, () => {
   test('Can copy and paste node', async ({ comfyPage }) => {
-    await comfyPage.clickEmptyLatentNode()
+    await comfyPage.canvas.click({
+      position: DefaultGraphPositions.emptyLatentWidgetClick
+    })
     await comfyPage.page.mouse.move(10, 10)
-    await comfyPage.ctrlC()
-    await comfyPage.ctrlV()
+    await comfyPage.nextFrame()
+    await comfyPage.clipboard.copy()
+    await comfyPage.clipboard.paste()
     await expect(comfyPage.canvas).toHaveScreenshot('copied-node.png')
   })
 
   test('Can copy and paste node with link', async ({ comfyPage }) => {
-    await comfyPage.clickTextEncodeNode1()
+    await comfyPage.canvas.click({
+      position: DefaultGraphPositions.textEncodeNode1
+    })
+    await comfyPage.nextFrame()
     await comfyPage.page.mouse.move(10, 10)
-    await comfyPage.ctrlC()
+    await comfyPage.clipboard.copy()
     await comfyPage.page.keyboard.press('Control+Shift+V')
     await expect(comfyPage.canvas).toHaveScreenshot('copied-node-with-link.png')
   })
@@ -28,9 +35,9 @@ test.describe('Copy Paste', () => {
     await textBox.click()
     const originalString = await textBox.inputValue()
     await textBox.selectText()
-    await comfyPage.ctrlC(null)
-    await comfyPage.ctrlV(null)
-    await comfyPage.ctrlV(null)
+    await comfyPage.clipboard.copy(null)
+    await comfyPage.clipboard.paste(null)
+    await comfyPage.clipboard.paste(null)
     const resultString = await textBox.inputValue()
     expect(resultString).toBe(originalString + originalString)
   })
@@ -44,7 +51,7 @@ test.describe('Copy Paste', () => {
         y: 281
       }
     })
-    await comfyPage.ctrlC(null)
+    await comfyPage.clipboard.copy(null)
     // Empty latent node's width
     await comfyPage.canvas.click({
       position: {
@@ -52,7 +59,7 @@ test.describe('Copy Paste', () => {
         y: 643
       }
     })
-    await comfyPage.ctrlV(null)
+    await comfyPage.clipboard.paste(null)
     await comfyPage.page.keyboard.press('Enter')
     await expect(comfyPage.canvas).toHaveScreenshot('copied-widget-value.png')
   })
@@ -63,15 +70,19 @@ test.describe('Copy Paste', () => {
   test('Paste in text area with node previously copied', async ({
     comfyPage
   }) => {
-    await comfyPage.clickEmptyLatentNode()
-    await comfyPage.ctrlC(null)
+    await comfyPage.canvas.click({
+      position: DefaultGraphPositions.emptyLatentWidgetClick
+    })
+    await comfyPage.page.mouse.move(10, 10)
+    await comfyPage.nextFrame()
+    await comfyPage.clipboard.copy(null)
     const textBox = comfyPage.widgetTextBox
     await textBox.click()
     await textBox.inputValue()
     await textBox.selectText()
-    await comfyPage.ctrlC(null)
-    await comfyPage.ctrlV(null)
-    await comfyPage.ctrlV(null)
+    await comfyPage.clipboard.copy(null)
+    await comfyPage.clipboard.paste(null)
+    await comfyPage.clipboard.paste(null)
     await expect(comfyPage.canvas).toHaveScreenshot(
       'paste-in-text-area-with-node-previously-copied.png'
     )
@@ -82,10 +93,10 @@ test.describe('Copy Paste', () => {
     await textBox.click()
     await textBox.inputValue()
     await textBox.selectText()
-    await comfyPage.ctrlC(null)
+    await comfyPage.clipboard.copy(null)
     // Unfocus textbox.
     await comfyPage.page.mouse.click(10, 10)
-    await comfyPage.ctrlV(null)
+    await comfyPage.clipboard.paste(null)
     await expect(comfyPage.canvas).toHaveScreenshot('no-node-copied.png')
   })
 
@@ -103,19 +114,19 @@ test.describe('Copy Paste', () => {
   test('Can undo paste multiple nodes as single action', async ({
     comfyPage
   }) => {
-    const initialCount = await comfyPage.getGraphNodesCount()
+    const initialCount = await comfyPage.nodeOps.getGraphNodesCount()
     expect(initialCount).toBeGreaterThan(1)
     await comfyPage.canvas.click()
-    await comfyPage.ctrlA()
+    await comfyPage.keyboard.selectAll()
     await comfyPage.page.mouse.move(10, 10)
-    await comfyPage.ctrlC()
-    await comfyPage.ctrlV()
+    await comfyPage.clipboard.copy()
+    await comfyPage.clipboard.paste()
 
-    const pasteCount = await comfyPage.getGraphNodesCount()
+    const pasteCount = await comfyPage.nodeOps.getGraphNodesCount()
     expect(pasteCount).toBe(initialCount * 2)
 
-    await comfyPage.ctrlZ()
-    const undoCount = await comfyPage.getGraphNodesCount()
+    await comfyPage.keyboard.undo()
+    const undoCount = await comfyPage.nodeOps.getGraphNodesCount()
     expect(undoCount).toBe(initialCount)
   })
 })
diff --git a/browser_tests/tests/copyPaste.spec.ts-snapshots/copied-node-chromium-linux.png b/browser_tests/tests/copyPaste.spec.ts-snapshots/copied-node-chromium-linux.png
index 7824657513..f3d85d8da3 100644
Binary files a/browser_tests/tests/copyPaste.spec.ts-snapshots/copied-node-chromium-linux.png and b/browser_tests/tests/copyPaste.spec.ts-snapshots/copied-node-chromium-linux.png differ
diff --git a/browser_tests/tests/copyPaste.spec.ts-snapshots/paste-in-text-area-with-node-previously-copied-chromium-linux.png b/browser_tests/tests/copyPaste.spec.ts-snapshots/paste-in-text-area-with-node-previously-copied-chromium-linux.png
index b1f181c758..e589ba6a71 100644
Binary files a/browser_tests/tests/copyPaste.spec.ts-snapshots/paste-in-text-area-with-node-previously-copied-chromium-linux.png and b/browser_tests/tests/copyPaste.spec.ts-snapshots/paste-in-text-area-with-node-previously-copied-chromium-linux.png differ
diff --git a/browser_tests/tests/customIcons.spec.ts b/browser_tests/tests/customIcons.spec.ts
index da640fd895..ed9680406e 100644
--- a/browser_tests/tests/customIcons.spec.ts
+++ b/browser_tests/tests/customIcons.spec.ts
@@ -22,9 +22,9 @@ async function verifyCustomIconSvg(iconElement: Locator) {
   expect(decodedSvg).toContain("<svg xmlns='http://www.w3.org/2000/svg'")
 }
 
-test.describe('Custom Icons', () => {
+test.describe('Custom Icons', { tag: '@settings' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
   })
 
   test('sidebar tab icons use custom SVGs', async ({ comfyPage }) => {
diff --git a/browser_tests/tests/dialog.spec.ts b/browser_tests/tests/dialog.spec.ts
index 081f472753..bf2de274b7 100644
--- a/browser_tests/tests/dialog.spec.ts
+++ b/browser_tests/tests/dialog.spec.ts
@@ -1,31 +1,35 @@
 import type { Locator } from '@playwright/test'
 import { expect } from '@playwright/test'
 
-import type { Keybinding } from '../../src/schemas/keyBindingSchema'
+import type { Keybinding } from '../../src/platform/keybindings/types'
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+import { DefaultGraphPositions } from '../fixtures/constants/defaultGraphPositions'
+import { TestIds } from '../fixtures/selectors'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
-test.describe('Load workflow warning', () => {
+test.describe('Load workflow warning', { tag: '@ui' }, () => {
   test('Should display a warning when loading a workflow with missing nodes', async ({
     comfyPage
   }) => {
-    await comfyPage.loadWorkflow('missing/missing_nodes')
+    await comfyPage.workflow.loadWorkflow('missing/missing_nodes')
 
-    // Wait for the element with the .comfy-missing-nodes selector to be visible
-    const missingNodesWarning = comfyPage.page.locator('.comfy-missing-nodes')
+    const missingNodesWarning = comfyPage.page.getByTestId(
+      TestIds.dialogs.missingNodes
+    )
     await expect(missingNodesWarning).toBeVisible()
   })
 
   test('Should display a warning when loading a workflow with missing nodes in subgraphs', async ({
     comfyPage
   }) => {
-    await comfyPage.loadWorkflow('missing/missing_nodes_in_subgraph')
+    await comfyPage.workflow.loadWorkflow('missing/missing_nodes_in_subgraph')
 
-    // Wait for the element with the .comfy-missing-nodes selector to be visible
-    const missingNodesWarning = comfyPage.page.locator('.comfy-missing-nodes')
+    const missingNodesWarning = comfyPage.page.getByTestId(
+      TestIds.dialogs.missingNodes
+    )
     await expect(missingNodesWarning).toBeVisible()
 
     // Verify the missing node text includes subgraph context
@@ -36,42 +40,60 @@ test.describe('Load workflow warning', () => {
 })
 
 test('Does not report warning on undo/redo', async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.NodeSearchBoxImpl', 'default')
+  await comfyPage.settings.setSetting('Comfy.NodeSearchBoxImpl', 'v1 (legacy)')
+  const missingNodesWarning = comfyPage.page.getByTestId(
+    TestIds.dialogs.missingNodes
+  )
 
-  await comfyPage.loadWorkflow('missing/missing_nodes')
-  await comfyPage.closeDialog()
+  await comfyPage.workflow.loadWorkflow('missing/missing_nodes')
+  await expect(missingNodesWarning).toBeVisible()
+  await comfyPage.page.keyboard.press('Escape')
+  await expect(missingNodesWarning).not.toBeVisible()
 
   // Wait for any async operations to complete after dialog closes
   await comfyPage.nextFrame()
 
   // Make a change to the graph
-  await comfyPage.doubleClickCanvas()
+  await comfyPage.canvasOps.doubleClick()
   await comfyPage.searchBox.fillAndSelectFirstNode('KSampler')
 
   // Undo and redo the change
-  await comfyPage.ctrlZ()
-  await expect(comfyPage.page.locator('.comfy-missing-nodes')).not.toBeVisible()
-  await comfyPage.ctrlY()
-  await expect(comfyPage.page.locator('.comfy-missing-nodes')).not.toBeVisible()
+  await comfyPage.keyboard.undo()
+  await expect(async () => {
+    await expect(missingNodesWarning).not.toBeVisible()
+  }).toPass({ timeout: 5000 })
+
+  await comfyPage.keyboard.redo()
+  await expect(async () => {
+    await expect(missingNodesWarning).not.toBeVisible()
+  }).toPass({ timeout: 5000 })
 })
 
 test.describe('Execution error', () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.setup()
+  })
+
   test('Should display an error message when an execution error occurs', async ({
     comfyPage
   }) => {
-    await comfyPage.loadWorkflow('nodes/execution_error')
-    await comfyPage.queueButton.click()
+    await comfyPage.workflow.loadWorkflow('nodes/execution_error')
+    await comfyPage.command.executeCommand('Comfy.QueuePrompt')
     await comfyPage.nextFrame()
 
-    // Wait for the element with the .comfy-execution-error selector to be visible
-    const executionError = comfyPage.page.locator('.comfy-error-report')
-    await expect(executionError).toBeVisible()
+    // Wait for the error overlay to be visible
+    const errorOverlay = comfyPage.page.locator('[data-testid="error-overlay"]')
+    await expect(errorOverlay).toBeVisible()
   })
 })
 
 test.describe('Missing models warning', () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.Workflow.ShowMissingModelsWarning', true)
+    await comfyPage.settings.setSetting(
+      'Comfy.Workflow.ShowMissingModelsWarning',
+      true
+    )
     await comfyPage.page.evaluate((url: string) => {
       return fetch(`${url}/api/devtools/cleanup_fake_model`)
     }, comfyPage.url)
@@ -80,34 +102,32 @@ test.describe('Missing models warning', () => {
   test('Should display a warning when missing models are found', async ({
     comfyPage
   }) => {
-    await comfyPage.loadWorkflow('missing/missing_models')
+    await comfyPage.workflow.loadWorkflow('missing/missing_models')
 
-    const missingModelsWarning = comfyPage.page.locator('.comfy-missing-models')
-    await expect(missingModelsWarning).toBeVisible()
+    const dialogTitle = comfyPage.page.getByText(
+      'This workflow is missing models'
+    )
+    await expect(dialogTitle).toBeVisible()
 
-    const downloadButton = missingModelsWarning.getByText('Download')
-    await expect(downloadButton).toBeVisible()
-
-    // Check that the copy URL button is also visible for Desktop environment
-    const copyUrlButton = missingModelsWarning.getByText('Copy URL')
-    await expect(copyUrlButton).toBeVisible()
+    const downloadAllButton = comfyPage.page.getByText('Download all')
+    await expect(downloadAllButton).toBeVisible()
   })
 
   test('Should display a warning when missing models are found in node properties', async ({
     comfyPage
   }) => {
     // Load workflow that has a node with models metadata at the node level
-    await comfyPage.loadWorkflow('missing/missing_models_from_node_properties')
+    await comfyPage.workflow.loadWorkflow(
+      'missing/missing_models_from_node_properties'
+    )
 
-    const missingModelsWarning = comfyPage.page.locator('.comfy-missing-models')
-    await expect(missingModelsWarning).toBeVisible()
+    const dialogTitle = comfyPage.page.getByText(
+      'This workflow is missing models'
+    )
+    await expect(dialogTitle).toBeVisible()
 
-    const downloadButton = missingModelsWarning.getByText('Download')
-    await expect(downloadButton).toBeVisible()
-
-    // Check that the copy URL button is also visible for Desktop environment
-    const copyUrlButton = missingModelsWarning.getByText('Copy URL')
-    await expect(copyUrlButton).toBeVisible()
+    const downloadAllButton = comfyPage.page.getByText('Download all')
+    await expect(downloadAllButton).toBeVisible()
   })
 
   test('Should not display a warning when no missing models are found', async ({
@@ -146,10 +166,12 @@ test.describe('Missing models warning', () => {
       { times: 1 }
     )
 
-    await comfyPage.loadWorkflow('missing/missing_models')
+    await comfyPage.workflow.loadWorkflow('missing/missing_models')
 
-    const missingModelsWarning = comfyPage.page.locator('.comfy-missing-models')
-    await expect(missingModelsWarning).not.toBeVisible()
+    const dialogTitle = comfyPage.page.getByText(
+      'This workflow is missing models'
+    )
+    await expect(dialogTitle).not.toBeVisible()
   })
 
   test('Should not display warning when model metadata exists but widget values have changed', async ({
@@ -157,11 +179,15 @@ test.describe('Missing models warning', () => {
   }) => {
     // This tests the scenario where outdated model metadata exists in the workflow
     // but the actual selected models (widget values) have changed
-    await comfyPage.loadWorkflow('missing/model_metadata_widget_mismatch')
+    await comfyPage.workflow.loadWorkflow(
+      'missing/model_metadata_widget_mismatch'
+    )
 
     // The missing models warning should NOT appear
-    const missingModelsWarning = comfyPage.page.locator('.comfy-missing-models')
-    await expect(missingModelsWarning).not.toBeVisible()
+    const dialogTitle = comfyPage.page.getByText(
+      'This workflow is missing models'
+    )
+    await expect(dialogTitle).not.toBeVisible()
   })
 
   // Flaky test after parallelization
@@ -171,15 +197,17 @@ test.describe('Missing models warning', () => {
   }) => {
     // The fake_model.safetensors is served by
     // https://github.com/Comfy-Org/ComfyUI_devtools/blob/main/__init__.py
-    await comfyPage.loadWorkflow('missing/missing_models')
+    await comfyPage.workflow.loadWorkflow('missing/missing_models')
 
-    const missingModelsWarning = comfyPage.page.locator('.comfy-missing-models')
-    await expect(missingModelsWarning).toBeVisible()
+    const dialogTitle = comfyPage.page.getByText(
+      'This workflow is missing models'
+    )
+    await expect(dialogTitle).toBeVisible()
 
-    const downloadButton = comfyPage.page.getByText('Download')
-    await expect(downloadButton).toBeVisible()
+    const downloadAllButton = comfyPage.page.getByText('Download all')
+    await expect(downloadAllButton).toBeVisible()
     const downloadPromise = comfyPage.page.waitForEvent('download')
-    await downloadButton.click()
+    await downloadAllButton.click()
 
     const download = await downloadPromise
     expect(download.suggestedFilename()).toBe('fake_model.safetensors')
@@ -190,11 +218,11 @@ test.describe('Missing models warning', () => {
     let closeButton: Locator
 
     test.beforeEach(async ({ comfyPage }) => {
-      await comfyPage.setSetting(
+      await comfyPage.settings.setSetting(
         'Comfy.Workflow.ShowMissingModelsWarning',
         true
       )
-      await comfyPage.loadWorkflow('missing/missing_models')
+      await comfyPage.workflow.loadWorkflow('missing/missing_models')
 
       checkbox = comfyPage.page.getByLabel("Don't show this again")
       closeButton = comfyPage.page.getByLabel('Close')
@@ -203,14 +231,15 @@ test.describe('Missing models warning', () => {
     test('Should disable warning dialog when checkbox is checked', async ({
       comfyPage
     }) => {
-      await checkbox.click()
       const changeSettingPromise = comfyPage.page.waitForRequest(
         '**/api/settings/Comfy.Workflow.ShowMissingModelsWarning'
       )
-      await closeButton.click()
+      await checkbox.click()
       await changeSettingPromise
 
-      const settingValue = await comfyPage.getSetting(
+      await closeButton.click()
+
+      const settingValue = await comfyPage.settings.getSetting(
         'Comfy.Workflow.ShowMissingModelsWarning'
       )
       expect(settingValue).toBe(false)
@@ -221,7 +250,7 @@ test.describe('Missing models warning', () => {
     }) => {
       await closeButton.click()
 
-      const settingValue = await comfyPage.getSetting(
+      const settingValue = await comfyPage.settings.getSetting(
         'Comfy.Workflow.ShowMissingModelsWarning'
       )
       expect(settingValue).toBe(true)
@@ -232,9 +261,13 @@ test.describe('Missing models warning', () => {
 test.describe('Settings', () => {
   test('@mobile Should be visible on mobile', async ({ comfyPage }) => {
     await comfyPage.page.keyboard.press('Control+,')
-    const settingsContent = comfyPage.page.locator('.settings-content')
-    await expect(settingsContent).toBeVisible()
-    const isUsableHeight = await settingsContent.evaluate(
+    const settingsDialog = comfyPage.page.locator(
+      '[data-testid="settings-dialog"]'
+    )
+    await expect(settingsDialog).toBeVisible()
+    const contentArea = settingsDialog.locator('main')
+    await expect(contentArea).toBeVisible()
+    const isUsableHeight = await contentArea.evaluate(
       (el) => el.clientHeight > 30
     )
     expect(isUsableHeight).toBeTruthy()
@@ -244,7 +277,9 @@ test.describe('Settings', () => {
     await comfyPage.page.keyboard.down('ControlOrMeta')
     await comfyPage.page.keyboard.press(',')
     await comfyPage.page.keyboard.up('ControlOrMeta')
-    const settingsLocator = comfyPage.page.locator('.settings-container')
+    const settingsLocator = comfyPage.page.locator(
+      '[data-testid="settings-dialog"]'
+    )
     await expect(settingsLocator).toBeVisible()
     await comfyPage.page.keyboard.press('Escape')
     await expect(settingsLocator).not.toBeVisible()
@@ -252,19 +287,26 @@ test.describe('Settings', () => {
 
   test('Can change canvas zoom speed setting', async ({ comfyPage }) => {
     const maxSpeed = 2.5
-    await comfyPage.setSetting('Comfy.Graph.ZoomSpeed', maxSpeed)
+    await comfyPage.settings.setSetting('Comfy.Graph.ZoomSpeed', maxSpeed)
     await test.step('Setting should persist', async () => {
-      expect(await comfyPage.getSetting('Comfy.Graph.ZoomSpeed')).toBe(maxSpeed)
+      expect(await comfyPage.settings.getSetting('Comfy.Graph.ZoomSpeed')).toBe(
+        maxSpeed
+      )
     })
   })
 
   test('Should persist keybinding setting', async ({ comfyPage }) => {
     // Open the settings dialog
     await comfyPage.page.keyboard.press('Control+,')
-    await comfyPage.page.waitForSelector('.settings-container')
+    await comfyPage.page.waitForSelector('[data-testid="settings-dialog"]')
 
     // Open the keybinding tab
-    await comfyPage.page.getByLabel('Keybinding').click()
+    const settingsDialog = comfyPage.page.locator(
+      '[data-testid="settings-dialog"]'
+    )
+    await settingsDialog
+      .locator('nav [role="button"]', { hasText: 'Keybinding' })
+      .click()
     await comfyPage.page.waitForSelector(
       '[placeholder="Search Keybindings..."]'
     )
@@ -284,7 +326,10 @@ test.describe('Settings', () => {
     await input.press('Alt+n')
 
     const requestPromise = comfyPage.page.waitForRequest(
-      '**/api/settings/Comfy.Keybinding.NewBindings'
+      (req) =>
+        req.url().includes('/api/settings') &&
+        !req.url().includes('/api/settings/') &&
+        req.method() === 'POST'
     )
 
     // Save keybinding
@@ -311,18 +356,24 @@ test.describe('Support', () => {
   test('Should open external zendesk link with OSS tag', async ({
     comfyPage
   }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
-    const pagePromise = comfyPage.page.context().waitForEvent('page')
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+
+    // Prevent loading the external page
+    await comfyPage.page
+      .context()
+      .route('https://support.comfy.org/**', (route) =>
+        route.fulfill({ body: '<html></html>', contentType: 'text/html' })
+      )
+
+    const popupPromise = comfyPage.page.waitForEvent('popup')
     await comfyPage.menu.topbar.triggerTopbarCommand(['Help', 'Support'])
-    const newPage = await pagePromise
+    const popup = await popupPromise
 
-    await newPage.waitForLoadState('networkidle')
-    await expect(newPage).toHaveURL(/.*support\.comfy\.org.*/)
-
-    const url = new URL(newPage.url())
+    const url = new URL(popup.url())
+    expect(url.hostname).toBe('support.comfy.org')
     expect(url.searchParams.get('tf_42243568391700')).toBe('oss')
 
-    await newPage.close()
+    await popup.close()
   })
 })
 
@@ -331,13 +382,13 @@ test.describe('Error dialog', () => {
     comfyPage
   }) => {
     await comfyPage.page.evaluate(() => {
-      const graph = window['graph']
-      graph.configure = () => {
+      const graph = window.graph!
+      ;(graph as { configure: () => void }).configure = () => {
         throw new Error('Error on configure!')
       }
     })
 
-    await comfyPage.loadWorkflow('default')
+    await comfyPage.workflow.loadWorkflow('default')
 
     const errorDialog = comfyPage.page.locator('.comfy-error-report')
     await expect(errorDialog).toBeVisible()
@@ -347,7 +398,7 @@ test.describe('Error dialog', () => {
     comfyPage
   }) => {
     await comfyPage.page.evaluate(async () => {
-      const app = window['app']
+      const app = window.app!
       app.api.queuePrompt = () => {
         throw new Error('Error on queuePrompt!')
       }
@@ -362,9 +413,13 @@ test.describe('Signin dialog', () => {
   test('Paste content to signin dialog should not paste node on canvas', async ({
     comfyPage
   }) => {
-    const nodeNum = (await comfyPage.getNodes()).length
-    await comfyPage.clickEmptyLatentNode()
-    await comfyPage.ctrlC()
+    const nodeNum = await comfyPage.nodeOps.getNodeCount()
+    await comfyPage.canvas.click({
+      position: DefaultGraphPositions.emptyLatentWidgetClick
+    })
+    await comfyPage.page.mouse.move(10, 10)
+    await comfyPage.nextFrame()
+    await comfyPage.clipboard.copy()
 
     const textBox = comfyPage.widgetTextBox
     await textBox.click()
@@ -373,7 +428,7 @@ test.describe('Signin dialog', () => {
     await textBox.press('Control+c')
 
     await comfyPage.page.evaluate(() => {
-      void window['app'].extensionManager.dialog.showSignInDialog()
+      void window.app!.extensionManager.dialog.showSignInDialog()
     })
 
     const input = comfyPage.page.locator('#comfy-org-sign-in-password')
@@ -381,6 +436,6 @@ test.describe('Signin dialog', () => {
     await input.press('Control+v')
     await expect(input).toHaveValue('test_password')
 
-    expect(await comfyPage.getNodes()).toHaveLength(nodeNum)
+    expect(await comfyPage.nodeOps.getNodeCount()).toBe(nodeNum)
   })
 })
diff --git a/browser_tests/tests/domWidget.spec.ts b/browser_tests/tests/domWidget.spec.ts
index 02392f51d5..d8e2dab9b3 100644
--- a/browser_tests/tests/domWidget.spec.ts
+++ b/browser_tests/tests/domWidget.spec.ts
@@ -3,12 +3,12 @@ import { expect } from '@playwright/test'
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
-test.describe('DOM Widget', () => {
+test.describe('DOM Widget', { tag: '@widget' }, () => {
   test('Collapsed multiline textarea is not visible', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('widgets/collapsed_multiline')
+    await comfyPage.workflow.loadWorkflow('widgets/collapsed_multiline')
     const textareaWidget = comfyPage.page.locator('.comfy-multiline-input')
     await expect(textareaWidget).not.toBeVisible()
   })
@@ -21,7 +21,7 @@ test.describe('DOM Widget', () => {
     await expect(firstMultiline).toBeVisible()
     await expect(lastMultiline).toBeVisible()
 
-    const nodes = await comfyPage.getNodeRefsByType('CLIPTextEncode')
+    const nodes = await comfyPage.nodeOps.getNodeRefsByType('CLIPTextEncode')
     for (const node of nodes) {
       await node.click('collapse')
     }
@@ -29,12 +29,16 @@ test.describe('DOM Widget', () => {
     await expect(lastMultiline).not.toBeVisible()
   })
 
-  test('Position update when entering focus mode', async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
-    await comfyPage.executeCommand('Workspace.ToggleFocusMode')
-    await comfyPage.nextFrame()
-    await expect(comfyPage.canvas).toHaveScreenshot('focus-mode-on.png')
-  })
+  test(
+    'Position update when entering focus mode',
+    { tag: '@screenshot' },
+    async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+      await comfyPage.command.executeCommand('Workspace.ToggleFocusMode')
+      await comfyPage.nextFrame()
+      await expect(comfyPage.canvas).toHaveScreenshot('focus-mode-on.png')
+    }
+  )
 
   // No DOM widget should be created by creation of interim LGraphNode objects.
   test('Copy node with DOM widget by dragging + alt', async ({ comfyPage }) => {
@@ -64,9 +68,9 @@ test.describe('DOM Widget', () => {
       .first()
     await expect(textareaWidget).toBeVisible()
 
-    await comfyPage.setSetting('Comfy.Sidebar.Size', 'small')
-    await comfyPage.setSetting('Comfy.Sidebar.Location', 'left')
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting('Comfy.Sidebar.Size', 'small')
+    await comfyPage.settings.setSetting('Comfy.Sidebar.Location', 'left')
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
     await comfyPage.nextFrame()
 
     let oldPos: [number, number]
@@ -81,15 +85,15 @@ test.describe('DOM Widget', () => {
 
     // --- test ---
 
-    await comfyPage.setSetting('Comfy.Sidebar.Size', 'normal')
+    await comfyPage.settings.setSetting('Comfy.Sidebar.Size', 'normal')
     await comfyPage.nextFrame()
     await checkBboxChange()
 
-    await comfyPage.setSetting('Comfy.Sidebar.Location', 'right')
+    await comfyPage.settings.setSetting('Comfy.Sidebar.Location', 'right')
     await comfyPage.nextFrame()
     await checkBboxChange()
 
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Bottom')
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Bottom')
     await comfyPage.nextFrame()
     await checkBboxChange()
   })
diff --git a/browser_tests/tests/execution.spec.ts b/browser_tests/tests/execution.spec.ts
index ba22b38e96..174802f472 100644
--- a/browser_tests/tests/execution.spec.ts
+++ b/browser_tests/tests/execution.spec.ts
@@ -3,43 +3,61 @@ import { expect } from '@playwright/test'
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
-test.describe('Execution', () => {
-  test('Report error on unconnected slot', async ({ comfyPage }) => {
-    await comfyPage.disconnectEdge()
-    await comfyPage.clickEmptySpace()
-
-    await comfyPage.executeCommand('Comfy.QueuePrompt')
-    await expect(comfyPage.page.locator('.comfy-error-report')).toBeVisible()
-    await comfyPage.page.locator('.p-dialog-close-button').click()
-    await comfyPage.page.locator('.comfy-error-report').waitFor({
-      state: 'hidden'
-    })
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'execution-error-unconnected-slot.png'
-    )
+test.describe('Execution', { tag: ['@smoke', '@workflow'] }, () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.setup()
   })
+
+  test(
+    'Report error on unconnected slot',
+    { tag: '@screenshot' },
+    async ({ comfyPage }) => {
+      await comfyPage.canvasOps.disconnectEdge()
+      await comfyPage.page.keyboard.press('Escape')
+
+      await comfyPage.command.executeCommand('Comfy.QueuePrompt')
+      await expect(
+        comfyPage.page.locator('[data-testid="error-overlay"]')
+      ).toBeVisible()
+      await comfyPage.page
+        .locator('[data-testid="error-overlay"]')
+        .getByRole('button', { name: 'Dismiss' })
+        .click()
+      await comfyPage.page
+        .locator('[data-testid="error-overlay"]')
+        .waitFor({ state: 'hidden' })
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'execution-error-unconnected-slot.png'
+      )
+    }
+  )
 })
 
-test.describe('Execute to selected output nodes', () => {
-  test('Execute to selected output nodes', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('execution/partial_execution')
-    const input = await comfyPage.getNodeRefById(3)
-    const output1 = await comfyPage.getNodeRefById(1)
-    const output2 = await comfyPage.getNodeRefById(4)
-    expect(await (await input.getWidget(0)).getValue()).toBe('foo')
-    expect(await (await output1.getWidget(0)).getValue()).toBe('')
-    expect(await (await output2.getWidget(0)).getValue()).toBe('')
-
-    await output1.click('title')
-
-    await comfyPage.executeCommand('Comfy.QueueSelectedOutputNodes')
-    await expect(async () => {
+test.describe(
+  'Execute to selected output nodes',
+  { tag: ['@smoke', '@workflow'] },
+  () => {
+    test('Execute to selected output nodes', async ({ comfyPage }) => {
+      await comfyPage.workflow.loadWorkflow('execution/partial_execution')
+      const input = await comfyPage.nodeOps.getNodeRefById(3)
+      const output1 = await comfyPage.nodeOps.getNodeRefById(1)
+      const output2 = await comfyPage.nodeOps.getNodeRefById(4)
       expect(await (await input.getWidget(0)).getValue()).toBe('foo')
-      expect(await (await output1.getWidget(0)).getValue()).toBe('foo')
+      expect(await (await output1.getWidget(0)).getValue()).toBe('')
       expect(await (await output2.getWidget(0)).getValue()).toBe('')
-    }).toPass({ timeout: 2_000 })
-  })
-})
+
+      await output1.click('title')
+
+      await comfyPage.command.executeCommand('Comfy.QueueSelectedOutputNodes')
+      await expect(async () => {
+        expect(await (await input.getWidget(0)).getValue()).toBe('foo')
+        expect(await (await output1.getWidget(0)).getValue()).toBe('foo')
+        expect(await (await output2.getWidget(0)).getValue()).toBe('')
+      }).toPass({ timeout: 2_000 })
+    })
+  }
+)
diff --git a/browser_tests/tests/execution.spec.ts-snapshots/execution-error-unconnected-slot-chromium-linux.png b/browser_tests/tests/execution.spec.ts-snapshots/execution-error-unconnected-slot-chromium-linux.png
index 32b9df704c..c2925636c7 100644
Binary files a/browser_tests/tests/execution.spec.ts-snapshots/execution-error-unconnected-slot-chromium-linux.png and b/browser_tests/tests/execution.spec.ts-snapshots/execution-error-unconnected-slot-chromium-linux.png differ
diff --git a/browser_tests/tests/extensionAPI.spec.ts b/browser_tests/tests/extensionAPI.spec.ts
index 38f4a6c1de..97d4424c95 100644
--- a/browser_tests/tests/extensionAPI.spec.ts
+++ b/browser_tests/tests/extensionAPI.spec.ts
@@ -1,23 +1,32 @@
 import { expect } from '@playwright/test'
 
+import type { Settings } from '../../src/schemas/apiSchema'
 import type { SettingParams } from '../../src/platform/settings/types'
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
+/**
+ * Type helper for test settings with arbitrary IDs.
+ * Extensions can register settings with any ID, but SettingParams.id
+ * is typed as keyof Settings for autocomplete. This helper allows
+ * arbitrary IDs in tests while keeping type safety for other fields.
+ */
+type TestSettingId = keyof Settings
+
 test.describe('Topbar commands', () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
   })
 
   test('Should allow registering topbar commands', async ({ comfyPage }) => {
     await comfyPage.page.evaluate(() => {
-      window['app'].registerExtension({
+      window.app!.registerExtension({
         name: 'TestExtension1',
         commands: [
           {
             id: 'foo',
             label: 'foo-command',
             function: () => {
-              window['foo'] = true
+              window.foo = true
             }
           }
         ],
@@ -31,15 +40,15 @@ test.describe('Topbar commands', () => {
     })
 
     await comfyPage.menu.topbar.triggerTopbarCommand(['ext', 'foo-command'])
-    expect(await comfyPage.page.evaluate(() => window['foo'])).toBe(true)
+    expect(await comfyPage.page.evaluate(() => window.foo)).toBe(true)
   })
 
   test('Should not allow register command defined in other extension', async ({
     comfyPage
   }) => {
-    await comfyPage.registerCommand('foo', () => alert(1))
+    await comfyPage.command.registerCommand('foo', () => alert(1))
     await comfyPage.page.evaluate(() => {
-      window['app'].registerExtension({
+      window.app!.registerExtension({
         name: 'TestExtension1',
         menuCommands: [
           {
@@ -56,14 +65,14 @@ test.describe('Topbar commands', () => {
 
   test('Should allow registering keybindings', async ({ comfyPage }) => {
     await comfyPage.page.evaluate(() => {
-      const app = window['app']
+      const app = window.app!
       app.registerExtension({
         name: 'TestExtension1',
         commands: [
           {
             id: 'TestCommand',
             function: () => {
-              window['TestCommand'] = true
+              window.TestCommand = true
             }
           }
         ],
@@ -77,68 +86,77 @@ test.describe('Topbar commands', () => {
     })
 
     await comfyPage.page.keyboard.press('k')
-    expect(await comfyPage.page.evaluate(() => window['TestCommand'])).toBe(
-      true
-    )
+    expect(await comfyPage.page.evaluate(() => window.TestCommand)).toBe(true)
   })
 
   test.describe('Settings', () => {
     test('Should allow adding settings', async ({ comfyPage }) => {
       await comfyPage.page.evaluate(() => {
-        window['app'].registerExtension({
+        window.app!.registerExtension({
           name: 'TestExtension1',
           settings: [
             {
-              id: 'TestSetting',
+              // Extensions can register arbitrary setting IDs
+              id: 'TestSetting' as TestSettingId,
               name: 'Test Setting',
               type: 'text',
               defaultValue: 'Hello, world!',
               onChange: () => {
-                window['changeCount'] = (window['changeCount'] ?? 0) + 1
+                window.changeCount = (window.changeCount ?? 0) + 1
               }
             }
           ]
         })
       })
       // onChange is called when the setting is first added
-      expect(await comfyPage.page.evaluate(() => window['changeCount'])).toBe(1)
-      expect(await comfyPage.getSetting('TestSetting')).toBe('Hello, world!')
+      expect(await comfyPage.page.evaluate(() => window.changeCount)).toBe(1)
+      expect(await comfyPage.settings.getSetting('TestSetting')).toBe(
+        'Hello, world!'
+      )
 
-      await comfyPage.setSetting('TestSetting', 'Hello, universe!')
-      expect(await comfyPage.getSetting('TestSetting')).toBe('Hello, universe!')
-      expect(await comfyPage.page.evaluate(() => window['changeCount'])).toBe(2)
+      await comfyPage.settings.setSetting('TestSetting', 'Hello, universe!')
+      expect(await comfyPage.settings.getSetting('TestSetting')).toBe(
+        'Hello, universe!'
+      )
+      expect(await comfyPage.page.evaluate(() => window.changeCount)).toBe(2)
     })
 
     test('Should allow setting boolean settings', async ({ comfyPage }) => {
       await comfyPage.page.evaluate(() => {
-        window['app'].registerExtension({
+        window.app!.registerExtension({
           name: 'TestExtension1',
           settings: [
             {
-              id: 'Comfy.TestSetting',
+              // Extensions can register arbitrary setting IDs
+              id: 'Comfy.TestSetting' as TestSettingId,
               name: 'Test Setting',
               type: 'boolean',
               defaultValue: false,
               onChange: () => {
-                window['changeCount'] = (window['changeCount'] ?? 0) + 1
+                window.changeCount = (window.changeCount ?? 0) + 1
               }
             }
           ]
         })
       })
 
-      expect(await comfyPage.getSetting('Comfy.TestSetting')).toBe(false)
-      expect(await comfyPage.page.evaluate(() => window['changeCount'])).toBe(1)
+      expect(await comfyPage.settings.getSetting('Comfy.TestSetting')).toBe(
+        false
+      )
+      expect(await comfyPage.page.evaluate(() => window.changeCount)).toBe(1)
 
       await comfyPage.settingDialog.open()
       await comfyPage.settingDialog.toggleBooleanSetting('Comfy.TestSetting')
-      expect(await comfyPage.getSetting('Comfy.TestSetting')).toBe(true)
-      expect(await comfyPage.page.evaluate(() => window['changeCount'])).toBe(2)
+      expect(await comfyPage.settings.getSetting('Comfy.TestSetting')).toBe(
+        true
+      )
+      expect(await comfyPage.page.evaluate(() => window.changeCount)).toBe(2)
     })
 
     test.describe('Passing through attrs to setting components', () => {
       const testCases: Array<{
-        config: Partial<SettingParams>
+        config: Pick<SettingParams, 'type' | 'defaultValue'> &
+          Partial<Omit<SettingParams, 'id' | 'type' | 'defaultValue'>>
         selector: string
       }> = [
         {
@@ -191,13 +209,13 @@ test.describe('Topbar commands', () => {
           comfyPage
         }) => {
           await comfyPage.page.evaluate((config) => {
-            window['app'].registerExtension({
+            window.app!.registerExtension({
               name: 'TestExtension1',
               settings: [
                 {
-                  id: 'Comfy.TestSetting',
+                  // Extensions can register arbitrary setting IDs
+                  id: 'Comfy.TestSetting' as TestSettingId,
                   name: 'Test',
-                  // The `disabled` attr is common to all settings components
                   attrs: { disabled: true },
                   ...config
                 }
@@ -224,7 +242,7 @@ test.describe('Topbar commands', () => {
   test.describe('About panel', () => {
     test('Should allow adding badges', async ({ comfyPage }) => {
       await comfyPage.page.evaluate(() => {
-        window['app'].registerExtension({
+        window.app!.registerExtension({
           name: 'TestExtension1',
           aboutPageBadges: [
             {
@@ -247,61 +265,71 @@ test.describe('Topbar commands', () => {
   test.describe('Dialog', () => {
     test('Should allow showing a prompt dialog', async ({ comfyPage }) => {
       await comfyPage.page.evaluate(() => {
-        void window['app'].extensionManager.dialog
-          .prompt({
+        void window
+          .app!.extensionManager.dialog.prompt({
             title: 'Test Prompt',
             message: 'Test Prompt Message'
           })
-          .then((value: string) => {
-            window['value'] = value
+          .then((value: string | null) => {
+            ;(window as unknown as Record<string, unknown>)['value'] = value
           })
       })
 
-      await comfyPage.fillPromptDialog('Hello, world!')
-      expect(await comfyPage.page.evaluate(() => window['value'])).toBe(
-        'Hello, world!'
-      )
+      await comfyPage.nodeOps.fillPromptDialog('Hello, world!')
+      expect(
+        await comfyPage.page.evaluate(
+          () => (window as unknown as Record<string, unknown>)['value']
+        )
+      ).toBe('Hello, world!')
     })
 
     test('Should allow showing a confirmation dialog', async ({
       comfyPage
     }) => {
       await comfyPage.page.evaluate(() => {
-        void window['app'].extensionManager.dialog
-          .confirm({
+        void window
+          .app!.extensionManager.dialog.confirm({
             title: 'Test Confirm',
             message: 'Test Confirm Message'
           })
-          .then((value: boolean) => {
-            window['value'] = value
+          .then((value: boolean | null) => {
+            ;(window as unknown as Record<string, unknown>)['value'] = value
           })
       })
 
       await comfyPage.confirmDialog.click('confirm')
-      expect(await comfyPage.page.evaluate(() => window['value'])).toBe(true)
+      expect(
+        await comfyPage.page.evaluate(
+          () => (window as unknown as Record<string, unknown>)['value']
+        )
+      ).toBe(true)
     })
 
     test('Should allow dismissing a dialog', async ({ comfyPage }) => {
       await comfyPage.page.evaluate(() => {
-        window['value'] = 'foo'
-        void window['app'].extensionManager.dialog
-          .confirm({
+        ;(window as unknown as Record<string, unknown>)['value'] = 'foo'
+        void window
+          .app!.extensionManager.dialog.confirm({
             title: 'Test Confirm',
             message: 'Test Confirm Message'
           })
-          .then((value: boolean) => {
-            window['value'] = value
+          .then((value: boolean | null) => {
+            ;(window as unknown as Record<string, unknown>)['value'] = value
           })
       })
 
       await comfyPage.confirmDialog.click('reject')
-      expect(await comfyPage.page.evaluate(() => window['value'])).toBeNull()
+      expect(
+        await comfyPage.page.evaluate(
+          () => (window as unknown as Record<string, unknown>)['value']
+        )
+      ).toBeNull()
     })
   })
 
   test.describe('Selection Toolbox', () => {
     test.beforeEach(async ({ comfyPage }) => {
-      await comfyPage.setSetting('Comfy.Canvas.SelectionToolbox', true)
+      await comfyPage.settings.setSetting('Comfy.Canvas.SelectionToolbox', true)
     })
 
     test('Should allow adding commands to selection toolbox', async ({
@@ -309,7 +337,7 @@ test.describe('Topbar commands', () => {
     }) => {
       // Register an extension with a selection toolbox command
       await comfyPage.page.evaluate(() => {
-        window['app'].registerExtension({
+        window.app!.registerExtension({
           name: 'TestExtension1',
           commands: [
             {
@@ -317,7 +345,9 @@ test.describe('Topbar commands', () => {
               label: 'Test Command',
               icon: 'pi pi-star',
               function: () => {
-                window['selectionCommandExecuted'] = true
+                ;(window as unknown as Record<string, unknown>)[
+                  'selectionCommandExecuted'
+                ] = true
               }
             }
           ],
@@ -325,7 +355,7 @@ test.describe('Topbar commands', () => {
         })
       })
 
-      await comfyPage.selectNodes(['CLIP Text Encode (Prompt)'])
+      await comfyPage.nodeOps.selectNodes(['CLIP Text Encode (Prompt)'])
 
       // Click the command button in the selection toolbox
       const toolboxButton = comfyPage.page.locator(
@@ -333,9 +363,13 @@ test.describe('Topbar commands', () => {
       )
       await toolboxButton.click()
 
-      // Verify the command was executed
       expect(
-        await comfyPage.page.evaluate(() => window['selectionCommandExecuted'])
+        await comfyPage.page.evaluate(
+          () =>
+            (window as unknown as Record<string, unknown>)[
+              'selectionCommandExecuted'
+            ]
+        )
       ).toBe(true)
     })
   })
diff --git a/browser_tests/tests/featureFlags.spec.ts b/browser_tests/tests/featureFlags.spec.ts
index 7079768291..3f81a924ec 100644
--- a/browser_tests/tests/featureFlags.spec.ts
+++ b/browser_tests/tests/featureFlags.spec.ts
@@ -3,10 +3,10 @@ import { expect } from '@playwright/test'
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
-test.describe('Feature Flags', () => {
+test.describe('Feature Flags', { tag: ['@slow', '@settings'] }, () => {
   test('Client and server exchange feature flags on connection', async ({
     comfyPage
   }) => {
@@ -25,9 +25,9 @@ test.describe('Feature Flags', () => {
       const originalSend = WebSocket.prototype.send
       WebSocket.prototype.send = function (data) {
         try {
-          const parsed = JSON.parse(data)
+          const parsed = JSON.parse(data as string)
           if (parsed.type === 'feature_flags') {
-            window.__capturedMessages.clientFeatureFlags = parsed
+            window.__capturedMessages!.clientFeatureFlags = parsed
           }
         } catch (e) {
           // Not JSON, ignore
@@ -37,12 +37,9 @@ test.describe('Feature Flags', () => {
 
       // Monitor for server feature flags
       const checkInterval = setInterval(() => {
-        if (
-          window['app']?.api?.serverFeatureFlags &&
-          Object.keys(window['app'].api.serverFeatureFlags).length > 0
-        ) {
-          window.__capturedMessages.serverFeatureFlags =
-            window['app'].api.serverFeatureFlags
+        const flags = window.app?.api?.serverFeatureFlags?.value
+        if (flags && Object.keys(flags).length > 0) {
+          window.__capturedMessages!.serverFeatureFlags = flags
           clearInterval(checkInterval)
         }
       }, 100)
@@ -57,8 +54,8 @@ test.describe('Feature Flags', () => {
     // Wait for both client and server feature flags
     await newPage.waitForFunction(
       () =>
-        window.__capturedMessages.clientFeatureFlags !== null &&
-        window.__capturedMessages.serverFeatureFlags !== null,
+        window.__capturedMessages!.clientFeatureFlags !== null &&
+        window.__capturedMessages!.serverFeatureFlags !== null,
       { timeout: 10000 }
     )
 
@@ -66,27 +63,27 @@ test.describe('Feature Flags', () => {
     const messages = await newPage.evaluate(() => window.__capturedMessages)
 
     // Verify client sent feature flags
-    expect(messages.clientFeatureFlags).toBeTruthy()
-    expect(messages.clientFeatureFlags).toHaveProperty('type', 'feature_flags')
-    expect(messages.clientFeatureFlags).toHaveProperty('data')
-    expect(messages.clientFeatureFlags.data).toHaveProperty(
+    expect(messages!.clientFeatureFlags).toBeTruthy()
+    expect(messages!.clientFeatureFlags).toHaveProperty('type', 'feature_flags')
+    expect(messages!.clientFeatureFlags).toHaveProperty('data')
+    expect(messages!.clientFeatureFlags!.data).toHaveProperty(
       'supports_preview_metadata'
     )
     expect(
-      typeof messages.clientFeatureFlags.data.supports_preview_metadata
+      typeof messages!.clientFeatureFlags!.data.supports_preview_metadata
     ).toBe('boolean')
 
     // Verify server sent feature flags back
-    expect(messages.serverFeatureFlags).toBeTruthy()
-    expect(messages.serverFeatureFlags).toHaveProperty(
+    expect(messages!.serverFeatureFlags).toBeTruthy()
+    expect(messages!.serverFeatureFlags).toHaveProperty(
       'supports_preview_metadata'
     )
-    expect(typeof messages.serverFeatureFlags.supports_preview_metadata).toBe(
+    expect(typeof messages!.serverFeatureFlags!.supports_preview_metadata).toBe(
       'boolean'
     )
-    expect(messages.serverFeatureFlags).toHaveProperty('max_upload_size')
-    expect(typeof messages.serverFeatureFlags.max_upload_size).toBe('number')
-    expect(Object.keys(messages.serverFeatureFlags).length).toBeGreaterThan(0)
+    expect(messages!.serverFeatureFlags).toHaveProperty('max_upload_size')
+    expect(typeof messages!.serverFeatureFlags!.max_upload_size).toBe('number')
+    expect(Object.keys(messages!.serverFeatureFlags!).length).toBeGreaterThan(0)
 
     await newPage.close()
   })
@@ -96,7 +93,7 @@ test.describe('Feature Flags', () => {
   }) => {
     // Get the actual server feature flags from the backend
     const serverFlags = await comfyPage.page.evaluate(() => {
-      return window['app'].api.serverFeatureFlags
+      return window.app!.api.serverFeatureFlags.value
     })
 
     // Verify we received real feature flags from the backend
@@ -115,24 +112,22 @@ test.describe('Feature Flags', () => {
   }) => {
     // Test serverSupportsFeature with real backend flags
     const supportsPreviewMetadata = await comfyPage.page.evaluate(() => {
-      return window['app'].api.serverSupportsFeature(
-        'supports_preview_metadata'
-      )
+      return window.app!.api.serverSupportsFeature('supports_preview_metadata')
     })
     // The method should return a boolean based on the backend's value
     expect(typeof supportsPreviewMetadata).toBe('boolean')
 
     // Test non-existent feature - should always return false
     const supportsNonExistent = await comfyPage.page.evaluate(() => {
-      return window['app'].api.serverSupportsFeature('non_existent_feature_xyz')
+      return window.app!.api.serverSupportsFeature('non_existent_feature_xyz')
     })
     expect(supportsNonExistent).toBe(false)
 
     // Test that the method only returns true for boolean true values
     const testResults = await comfyPage.page.evaluate(() => {
       // Temporarily modify serverFeatureFlags to test behavior
-      const original = window['app'].api.serverFeatureFlags
-      window['app'].api.serverFeatureFlags = {
+      const original = window.app!.api.serverFeatureFlags.value
+      window.app!.api.serverFeatureFlags.value = {
         bool_true: true,
         bool_false: false,
         string_value: 'yes',
@@ -141,15 +136,15 @@ test.describe('Feature Flags', () => {
       }
 
       const results = {
-        bool_true: window['app'].api.serverSupportsFeature('bool_true'),
-        bool_false: window['app'].api.serverSupportsFeature('bool_false'),
-        string_value: window['app'].api.serverSupportsFeature('string_value'),
-        number_value: window['app'].api.serverSupportsFeature('number_value'),
-        null_value: window['app'].api.serverSupportsFeature('null_value')
+        bool_true: window.app!.api.serverSupportsFeature('bool_true'),
+        bool_false: window.app!.api.serverSupportsFeature('bool_false'),
+        string_value: window.app!.api.serverSupportsFeature('string_value'),
+        number_value: window.app!.api.serverSupportsFeature('number_value'),
+        null_value: window.app!.api.serverSupportsFeature('null_value')
       }
 
       // Restore original
-      window['app'].api.serverFeatureFlags = original
+      window.app!.api.serverFeatureFlags.value = original
       return results
     })
 
@@ -166,20 +161,20 @@ test.describe('Feature Flags', () => {
   }) => {
     // Test getServerFeature method
     const previewMetadataValue = await comfyPage.page.evaluate(() => {
-      return window['app'].api.getServerFeature('supports_preview_metadata')
+      return window.app!.api.getServerFeature('supports_preview_metadata')
     })
     expect(typeof previewMetadataValue).toBe('boolean')
 
     // Test getting max_upload_size
     const maxUploadSize = await comfyPage.page.evaluate(() => {
-      return window['app'].api.getServerFeature('max_upload_size')
+      return window.app!.api.getServerFeature('max_upload_size')
     })
     expect(typeof maxUploadSize).toBe('number')
     expect(maxUploadSize).toBeGreaterThan(0)
 
     // Test getServerFeature with default value for non-existent feature
     const defaultValue = await comfyPage.page.evaluate(() => {
-      return window['app'].api.getServerFeature(
+      return window.app!.api.getServerFeature(
         'non_existent_feature_xyz',
         'default'
       )
@@ -192,7 +187,7 @@ test.describe('Feature Flags', () => {
   }) => {
     // Test getServerFeatures returns all flags
     const allFeatures = await comfyPage.page.evaluate(() => {
-      return window['app'].api.getServerFeatures()
+      return window.app!.api.getServerFeatures()
     })
 
     expect(allFeatures).toBeTruthy()
@@ -205,14 +200,14 @@ test.describe('Feature Flags', () => {
   test('Client feature flags are immutable', async ({ comfyPage }) => {
     // Test that getClientFeatureFlags returns a copy
     const immutabilityTest = await comfyPage.page.evaluate(() => {
-      const flags1 = window['app'].api.getClientFeatureFlags()
-      const flags2 = window['app'].api.getClientFeatureFlags()
+      const flags1 = window.app!.api.getClientFeatureFlags()
+      const flags2 = window.app!.api.getClientFeatureFlags()
 
       // Modify the first object
       flags1.test_modification = true
 
       // Get flags again to check if original was modified
-      const flags3 = window['app'].api.getClientFeatureFlags()
+      const flags3 = window.app!.api.getClientFeatureFlags()
 
       return {
         areEqual: flags1 === flags2,
@@ -238,14 +233,14 @@ test.describe('Feature Flags', () => {
   }) => {
     const immutabilityTest = await comfyPage.page.evaluate(() => {
       // Get a copy of server features
-      const features1 = window['app'].api.getServerFeatures()
+      const features1 = window.app!.api.getServerFeatures()
 
       // Try to modify it
       features1.supports_preview_metadata = false
       features1.new_feature = 'added'
 
       // Get another copy
-      const features2 = window['app'].api.getServerFeatures()
+      const features2 = window.app!.api.getServerFeatures()
 
       return {
         modifiedValue: features1.supports_preview_metadata,
@@ -274,7 +269,8 @@ test.describe('Feature Flags', () => {
     // Set up monitoring before navigation
     await newPage.addInitScript(() => {
       // Track when various app components are ready
-      ;(window as any).__appReadiness = {
+
+      window.__appReadiness = {
         featureFlagsReceived: false,
         apiInitialized: false,
         appInitialized: false
@@ -283,26 +279,26 @@ test.describe('Feature Flags', () => {
       // Monitor when feature flags arrive by checking periodically
       const checkFeatureFlags = setInterval(() => {
         if (
-          window['app']?.api?.serverFeatureFlags?.supports_preview_metadata !==
-          undefined
+          window.app?.api?.serverFeatureFlags?.value
+            ?.supports_preview_metadata !== undefined
         ) {
-          ;(window as any).__appReadiness.featureFlagsReceived = true
+          window.__appReadiness!.featureFlagsReceived = true
           clearInterval(checkFeatureFlags)
         }
       }, 10)
 
       // Monitor API initialization
       const checkApi = setInterval(() => {
-        if (window['app']?.api) {
-          ;(window as any).__appReadiness.apiInitialized = true
+        if (window.app?.api) {
+          window.__appReadiness!.apiInitialized = true
           clearInterval(checkApi)
         }
       }, 10)
 
       // Monitor app initialization
       const checkApp = setInterval(() => {
-        if (window['app']?.graph) {
-          ;(window as any).__appReadiness.appInitialized = true
+        if (window.app?.graph) {
+          window.__appReadiness!.appInitialized = true
           clearInterval(checkApp)
         }
       }, 10)
@@ -321,8 +317,8 @@ test.describe('Feature Flags', () => {
     // Wait for feature flags to be received
     await newPage.waitForFunction(
       () =>
-        window['app']?.api?.serverFeatureFlags?.supports_preview_metadata !==
-        undefined,
+        window.app?.api?.serverFeatureFlags?.value
+          ?.supports_preview_metadata !== undefined,
       {
         timeout: 10000
       }
@@ -331,8 +327,8 @@ test.describe('Feature Flags', () => {
     // Get readiness state
     const readiness = await newPage.evaluate(() => {
       return {
-        ...(window as any).__appReadiness,
-        currentFlags: window['app'].api.serverFeatureFlags
+        ...window.__appReadiness,
+        currentFlags: window.app!.api.serverFeatureFlags.value
       }
     })
 
diff --git a/browser_tests/tests/graph.spec.ts b/browser_tests/tests/graph.spec.ts
index 0c021b5f2b..9ddd1e48c6 100644
--- a/browser_tests/tests/graph.spec.ts
+++ b/browser_tests/tests/graph.spec.ts
@@ -3,24 +3,24 @@ import { expect } from '@playwright/test'
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
-test.describe('Graph', () => {
+test.describe('Graph', { tag: ['@smoke', '@canvas'] }, () => {
   // Should be able to fix link input slot index after swap the input order
   // Ref: https://github.com/Comfy-Org/ComfyUI_frontend/issues/3348
   test('Fix link input slots', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('inputs/input_order_swap')
+    await comfyPage.workflow.loadWorkflow('inputs/input_order_swap')
     expect(
       await comfyPage.page.evaluate(() => {
-        return window['app'].graph.links.get(1)?.target_slot
+        return window.app!.graph!.links.get(1)?.target_slot
       })
     ).toBe(1)
   })
 
   test('Validate workflow links', async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.Validation.Workflows', true)
-    await comfyPage.loadWorkflow('links/bad_link')
-    await expect(comfyPage.getVisibleToastCount()).resolves.toBe(2)
+    await comfyPage.settings.setSetting('Comfy.Validation.Workflows', true)
+    await comfyPage.workflow.loadWorkflow('links/bad_link')
+    await expect.poll(() => comfyPage.toast.getVisibleToastCount()).toBe(2)
   })
 })
diff --git a/browser_tests/tests/graphCanvasMenu.spec.ts b/browser_tests/tests/graphCanvasMenu.spec.ts
index fc8385e497..1685188980 100644
--- a/browser_tests/tests/graphCanvasMenu.spec.ts
+++ b/browser_tests/tests/graphCanvasMenu.spec.ts
@@ -1,48 +1,57 @@
 import { expect } from '@playwright/test'
 
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+import { TestIds } from '../fixtures/selectors'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
-test.describe('Graph Canvas Menu', () => {
+test.describe('Graph Canvas Menu', { tag: ['@screenshot', '@canvas'] }, () => {
   test.beforeEach(async ({ comfyPage }) => {
     // Set link render mode to spline to make sure it's not affected by other tests'
     // side effects.
-    await comfyPage.setSetting('Comfy.LinkRenderMode', 2)
+    await comfyPage.settings.setSetting('Comfy.LinkRenderMode', 2)
     // Enable canvas menu for all tests
-    await comfyPage.setSetting('Comfy.Graph.CanvasMenu', true)
+    await comfyPage.settings.setSetting('Comfy.Graph.CanvasMenu', true)
   })
 
-  test('Can toggle link visibility', async ({ comfyPage }) => {
-    const button = comfyPage.page.getByTestId('toggle-link-visibility-button')
-    await button.click()
-    await comfyPage.nextFrame()
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'canvas-with-hidden-links.png'
-    )
-    const hiddenLinkRenderMode = await comfyPage.page.evaluate(() => {
-      return window['LiteGraph'].HIDDEN_LINK
-    })
-    expect(await comfyPage.getSetting('Comfy.LinkRenderMode')).toBe(
-      hiddenLinkRenderMode
-    )
+  test(
+    'Can toggle link visibility',
+    { tag: '@screenshot' },
+    async ({ comfyPage }) => {
+      const button = comfyPage.page.getByTestId(
+        TestIds.canvas.toggleLinkVisibilityButton
+      )
+      await button.click()
+      await comfyPage.nextFrame()
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'canvas-with-hidden-links.png'
+      )
+      const hiddenLinkRenderMode = await comfyPage.page.evaluate(() => {
+        return window.LiteGraph!.HIDDEN_LINK
+      })
+      expect(await comfyPage.settings.getSetting('Comfy.LinkRenderMode')).toBe(
+        hiddenLinkRenderMode
+      )
 
-    await button.click()
-    await comfyPage.nextFrame()
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'canvas-with-visible-links.png'
-    )
-    expect(await comfyPage.getSetting('Comfy.LinkRenderMode')).not.toBe(
-      hiddenLinkRenderMode
-    )
-  })
+      await button.click()
+      await comfyPage.nextFrame()
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'canvas-with-visible-links.png'
+      )
+      expect(
+        await comfyPage.settings.getSetting('Comfy.LinkRenderMode')
+      ).not.toBe(hiddenLinkRenderMode)
+    }
+  )
 
   test('Toggle minimap button is clickable and has correct test id', async ({
     comfyPage
   }) => {
-    const minimapButton = comfyPage.page.getByTestId('toggle-minimap-button')
+    const minimapButton = comfyPage.page.getByTestId(
+      TestIds.canvas.toggleMinimapButton
+    )
     await expect(minimapButton).toBeVisible()
     await expect(minimapButton).toBeEnabled()
 
diff --git a/browser_tests/tests/groupNode.spec.ts b/browser_tests/tests/groupNode.spec.ts
index 9d67a0951a..e546629d08 100644
--- a/browser_tests/tests/groupNode.spec.ts
+++ b/browser_tests/tests/groupNode.spec.ts
@@ -1,42 +1,52 @@
 import { expect } from '@playwright/test'
 
+import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
+
 import type { ComfyPage } from '../fixtures/ComfyPage'
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+import type { NodeLibrarySidebarTab } from '../fixtures/components/SidebarTab'
+import { DefaultGraphPositions } from '../fixtures/constants/defaultGraphPositions'
 import type { NodeReference } from '../fixtures/utils/litegraphUtils'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.NodeLibrary.NewDesign', false)
+  await comfyPage.settings.setSetting('Comfy.NodeSearchBoxImpl', 'v1 (legacy)')
 })
 
-test.describe('Group Node', () => {
+test.describe('Group Node', { tag: '@node' }, () => {
   test.describe('Node library sidebar', () => {
     const groupNodeName = 'DefautWorkflowGroupNode'
     const groupNodeCategory = 'group nodes>workflow'
     const groupNodeBookmarkName = `workflow>${groupNodeName}`
-    let libraryTab
+    let libraryTab: NodeLibrarySidebarTab
 
     test.beforeEach(async ({ comfyPage }) => {
-      await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
       libraryTab = comfyPage.menu.nodeLibraryTab
-      await comfyPage.convertAllNodesToGroupNode(groupNodeName)
+      await comfyPage.nodeOps.convertAllNodesToGroupNode(groupNodeName)
       await libraryTab.open()
     })
 
-    test('Is added to node library sidebar', async ({ comfyPage }) => {
-      expect(await libraryTab.getFolder('group nodes').count()).toBe(1)
+    test('Is added to node library sidebar', async ({
+      comfyPage: _comfyPage
+    }) => {
+      expect(await libraryTab.getFolder(groupNodeCategory).count()).toBe(1)
     })
 
     test('Can be added to canvas using node library sidebar', async ({
       comfyPage
     }) => {
-      const initialNodeCount = await comfyPage.getGraphNodesCount()
+      const initialNodeCount = await comfyPage.nodeOps.getGraphNodesCount()
 
       // Add group node from node library sidebar
       await libraryTab.getFolder(groupNodeCategory).click()
       await libraryTab.getNode(groupNodeName).click()
 
       // Verify the node is added to the canvas
-      expect(await comfyPage.getGraphNodesCount()).toBe(initialNodeCount + 1)
+      expect(await comfyPage.nodeOps.getGraphNodesCount()).toBe(
+        initialNodeCount + 1
+      )
     })
 
     test('Can be bookmarked and unbookmarked', async ({ comfyPage }) => {
@@ -48,7 +58,7 @@ test.describe('Group Node', () => {
 
       // Verify the node is added to the bookmarks tab
       expect(
-        await comfyPage.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
+        await comfyPage.settings.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
       ).toEqual([groupNodeBookmarkName])
       // Verify the bookmark node with the same name is added to the tree
       expect(await libraryTab.getNode(groupNodeName).count()).not.toBe(0)
@@ -62,7 +72,7 @@ test.describe('Group Node', () => {
 
       // Verify the node is removed from the bookmarks tab
       expect(
-        await comfyPage.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
+        await comfyPage.settings.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
       ).toHaveLength(0)
     })
 
@@ -89,20 +99,24 @@ test.describe('Group Node', () => {
   // does not have a v-model on the query, so we cannot observe the raw
   // query update, and thus cannot set the spinning state between the raw query
   // update and the debounced search update.
-  test.skip('Can be added to canvas using search', async ({ comfyPage }) => {
-    const groupNodeName = 'DefautWorkflowGroupNode'
-    await comfyPage.convertAllNodesToGroupNode(groupNodeName)
-    await comfyPage.doubleClickCanvas()
-    await comfyPage.nextFrame()
-    await comfyPage.searchBox.fillAndSelectFirstNode(groupNodeName)
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'group-node-copy-added-from-search.png'
-    )
-  })
+  test.skip(
+    'Can be added to canvas using search',
+    { tag: '@screenshot' },
+    async ({ comfyPage }) => {
+      const groupNodeName = 'DefautWorkflowGroupNode'
+      await comfyPage.nodeOps.convertAllNodesToGroupNode(groupNodeName)
+      await comfyPage.canvasOps.doubleClick()
+      await comfyPage.nextFrame()
+      await comfyPage.searchBox.fillAndSelectFirstNode(groupNodeName)
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'group-node-copy-added-from-search.png'
+      )
+    }
+  )
 
   test('Displays tooltip on title hover', async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.EnableTooltips', true)
-    await comfyPage.convertAllNodesToGroupNode('Group Node')
+    await comfyPage.settings.setSetting('Comfy.EnableTooltips', true)
+    await comfyPage.nodeOps.convertAllNodesToGroupNode('Group Node')
     await comfyPage.page.mouse.move(47, 173)
     await expect(comfyPage.page.locator('.node-tooltip')).toBeVisible()
   })
@@ -110,9 +124,9 @@ test.describe('Group Node', () => {
   test('Manage group opens with the correct group selected', async ({
     comfyPage
   }) => {
-    const makeGroup = async (name, type1, type2) => {
-      const node1 = (await comfyPage.getNodeRefsByType(type1))[0]
-      const node2 = (await comfyPage.getNodeRefsByType(type2))[0]
+    const makeGroup = async (name: string, type1: string, type2: string) => {
+      const node1 = (await comfyPage.nodeOps.getNodeRefsByType(type1))[0]
+      const node2 = (await comfyPage.nodeOps.getNodeRefsByType(type2))[0]
       await node1.click('title')
       await node2.click('title', {
         modifiers: ['Shift']
@@ -140,7 +154,7 @@ test.describe('Group Node', () => {
   test('Preserves hidden input configuration when containing duplicate node types', async ({
     comfyPage
   }) => {
-    await comfyPage.loadWorkflow(
+    await comfyPage.workflow.loadWorkflow(
       'groupnodes/group_node_identical_nodes_hidden_inputs'
     )
     await comfyPage.nextFrame()
@@ -151,16 +165,14 @@ test.describe('Group Node', () => {
     const totalInputCount = await comfyPage.page.evaluate((nodeName) => {
       const {
         extra: { groupNodes }
-      } = window['app'].graph
-      const { nodes } = groupNodes[nodeName]
-      return nodes.reduce((acc: number, node) => {
-        return acc + node.inputs.length
-      }, 0)
+      } = window.app!.graph!
+      const { nodes } = groupNodes![nodeName]
+      return nodes.reduce((acc, node) => acc + (node.inputs?.length ?? 0), 0)
     }, groupNodeName)
 
     const visibleInputCount = await comfyPage.page.evaluate((id) => {
-      const node = window['app'].graph.getNodeById(id)
-      return node.inputs.length
+      const node = window.app!.graph!.getNodeById(id)
+      return node!.inputs.length
     }, groupNodeId)
 
     // Verify there are 4 total inputs (2 VAE decode nodes with 2 inputs each)
@@ -174,7 +186,7 @@ test.describe('Group Node', () => {
     comfyPage
   }) => {
     const expectSingleNode = async (type: string) => {
-      const nodes = await comfyPage.getNodeRefsByType(type)
+      const nodes = await comfyPage.nodeOps.getNodeRefsByType(type)
       expect(nodes).toHaveLength(1)
       return nodes[0]
     }
@@ -209,8 +221,8 @@ test.describe('Group Node', () => {
   test('Loads from a workflow using the legacy path separator ("/")', async ({
     comfyPage
   }) => {
-    await comfyPage.loadWorkflow('groupnodes/legacy_group_node')
-    expect(await comfyPage.getGraphNodesCount()).toBe(1)
+    await comfyPage.workflow.loadWorkflow('groupnodes/legacy_group_node')
+    expect(await comfyPage.nodeOps.getGraphNodesCount()).toBe(1)
     await expect(
       comfyPage.page.locator('.comfy-missing-nodes')
     ).not.toBeVisible()
@@ -226,7 +238,7 @@ test.describe('Group Node', () => {
 
     const isRegisteredLitegraph = async (comfyPage: ComfyPage) => {
       return await comfyPage.page.evaluate((nodeType: string) => {
-        return !!window['LiteGraph'].registered_node_types[nodeType]
+        return !!window.LiteGraph!.registered_node_types[nodeType]
       }, GROUP_NODE_TYPE)
     }
 
@@ -242,17 +254,17 @@ test.describe('Group Node', () => {
       comfyPage: ComfyPage,
       expectedCount: number
     ) => {
-      expect(await comfyPage.getNodeRefsByType(GROUP_NODE_TYPE)).toHaveLength(
-        expectedCount
-      )
+      expect(
+        await comfyPage.nodeOps.getNodeRefsByType(GROUP_NODE_TYPE)
+      ).toHaveLength(expectedCount)
       expect(await isRegisteredLitegraph(comfyPage)).toBe(true)
       expect(await isRegisteredNodeDefStore(comfyPage)).toBe(true)
     }
 
     test.beforeEach(async ({ comfyPage }) => {
-      await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
-      await comfyPage.loadWorkflow(WORKFLOW_NAME)
-      groupNode = await comfyPage.getFirstNodeRef()
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+      await comfyPage.workflow.loadWorkflow(WORKFLOW_NAME)
+      groupNode = await comfyPage.nodeOps.getFirstNodeRef()
       if (!groupNode)
         throw new Error(`Group node not found in workflow ${WORKFLOW_NAME}`)
       await groupNode.copy()
@@ -261,7 +273,7 @@ test.describe('Group Node', () => {
     test('Copies and pastes group node within the same workflow', async ({
       comfyPage
     }) => {
-      await comfyPage.ctrlV()
+      await comfyPage.clipboard.paste()
       await verifyNodeLoaded(comfyPage, 2)
     })
 
@@ -269,12 +281,12 @@ test.describe('Group Node', () => {
       comfyPage
     }) => {
       // Set setting
-      await comfyPage.setSetting('Comfy.ConfirmClear', false)
+      await comfyPage.settings.setSetting('Comfy.ConfirmClear', false)
 
       // Clear workflow
-      await comfyPage.executeCommand('Comfy.ClearWorkflow')
+      await comfyPage.command.executeCommand('Comfy.ClearWorkflow')
 
-      await comfyPage.ctrlV()
+      await comfyPage.clipboard.paste()
       await verifyNodeLoaded(comfyPage, 1)
     })
 
@@ -282,15 +294,15 @@ test.describe('Group Node', () => {
       comfyPage
     }) => {
       await comfyPage.menu.topbar.triggerTopbarCommand(['New'])
-      await comfyPage.ctrlV()
+      await comfyPage.clipboard.paste()
       await verifyNodeLoaded(comfyPage, 1)
     })
 
     test('Copies and pastes group node across different workflows', async ({
       comfyPage
     }) => {
-      await comfyPage.loadWorkflow('default')
-      await comfyPage.ctrlV()
+      await comfyPage.workflow.loadWorkflow('default')
+      await comfyPage.clipboard.paste()
       await verifyNodeLoaded(comfyPage, 1)
     })
 
@@ -298,14 +310,15 @@ test.describe('Group Node', () => {
       comfyPage
     }) => {
       await comfyPage.menu.topbar.triggerTopbarCommand(['New'])
-      await comfyPage.ctrlV()
+      await comfyPage.clipboard.paste()
       const currentGraphState = await comfyPage.page.evaluate(() =>
-        window['app'].graph.serialize()
+        window.app!.graph!.serialize()
       )
 
       await test.step('Load workflow containing a group node pasted from a different workflow', async () => {
         await comfyPage.page.evaluate(
-          (workflow) => window['app'].loadGraphData(workflow),
+          (workflow) =>
+            window.app!.loadGraphData(workflow as ComfyWorkflowJSON),
           currentGraphState
         )
         await comfyPage.nextFrame()
@@ -316,15 +329,18 @@ test.describe('Group Node', () => {
 
   test.describe('Keybindings', () => {
     test('Convert to group node, no selection', async ({ comfyPage }) => {
-      expect(await comfyPage.getVisibleToastCount()).toBe(0)
+      await expect.poll(() => comfyPage.toast.getVisibleToastCount()).toBe(0)
       await comfyPage.page.keyboard.press('Alt+g')
-      expect(await comfyPage.getVisibleToastCount()).toBe(1)
+      await expect.poll(() => comfyPage.toast.getVisibleToastCount()).toBe(1)
     })
     test('Convert to group node, selected 1 node', async ({ comfyPage }) => {
-      expect(await comfyPage.getVisibleToastCount()).toBe(0)
-      await comfyPage.clickTextEncodeNode1()
+      await expect.poll(() => comfyPage.toast.getVisibleToastCount()).toBe(0)
+      await comfyPage.canvas.click({
+        position: DefaultGraphPositions.textEncodeNode1
+      })
+      await comfyPage.nextFrame()
       await comfyPage.page.keyboard.press('Alt+g')
-      expect(await comfyPage.getVisibleToastCount()).toBe(1)
+      await expect.poll(() => comfyPage.toast.getVisibleToastCount()).toBe(1)
     })
   })
 })
diff --git a/browser_tests/tests/interaction.spec.ts b/browser_tests/tests/interaction.spec.ts
index 451cbffa3d..73459065f8 100644
--- a/browser_tests/tests/interaction.spec.ts
+++ b/browser_tests/tests/interaction.spec.ts
@@ -7,15 +7,20 @@ import {
   testComfySnapToGridGridSize
 } from '../fixtures/ComfyPage'
 import type { ComfyPage } from '../fixtures/ComfyPage'
+import { DefaultGraphPositions } from '../fixtures/constants/defaultGraphPositions'
+import { TestIds } from '../fixtures/selectors'
 import type { NodeReference } from '../fixtures/utils/litegraphUtils'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
+  // Wait for the legacy menu to appear and canvas to settle after layout shift.
+  await comfyPage.page.locator('.comfy-menu').waitFor({ state: 'visible' })
+  await comfyPage.nextFrame()
 })
 
-test.describe('Item Interaction', () => {
+test.describe('Item Interaction', { tag: ['@screenshot', '@node'] }, () => {
   test('Can select/delete all items', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('groups/mixed_graph_items')
+    await comfyPage.workflow.loadWorkflow('groups/mixed_graph_items')
     await comfyPage.canvas.press('Control+a')
     await expect(comfyPage.canvas).toHaveScreenshot('selected-all.png')
     await comfyPage.canvas.press('Delete')
@@ -23,7 +28,7 @@ test.describe('Item Interaction', () => {
   })
 
   test('Can pin/unpin items with keyboard shortcut', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('groups/mixed_graph_items')
+    await comfyPage.workflow.loadWorkflow('groups/mixed_graph_items')
     await comfyPage.canvas.press('Control+a')
     await comfyPage.canvas.press('KeyP')
     await comfyPage.nextFrame()
@@ -51,22 +56,34 @@ test.describe('Node Interaction', () => {
       test(`Can add multiple nodes to selection using ${modifier}+Click`, async ({
         comfyPage
       }) => {
-        const clipNodes = await comfyPage.getNodeRefsByType('CLIPTextEncode')
+        const clipNodes =
+          await comfyPage.nodeOps.getNodeRefsByType('CLIPTextEncode')
         for (const node of clipNodes) {
           await node.click('title', { modifiers: [modifier] })
         }
-        const selectedNodeCount = await comfyPage.getSelectedGraphNodesCount()
+        const selectedNodeCount =
+          await comfyPage.nodeOps.getSelectedGraphNodesCount()
         expect(selectedNodeCount).toBe(clipNodes.length)
       })
     })
 
-    test('@2x Can highlight selected', async ({ comfyPage }) => {
-      await expect(comfyPage.canvas).toHaveScreenshot('default.png')
-      await comfyPage.clickTextEncodeNode1()
-      await expect(comfyPage.canvas).toHaveScreenshot('selected-node1.png')
-      await comfyPage.clickTextEncodeNode2()
-      await expect(comfyPage.canvas).toHaveScreenshot('selected-node2.png')
-    })
+    test(
+      '@2x Can highlight selected',
+      { tag: '@screenshot' },
+      async ({ comfyPage }) => {
+        await expect(comfyPage.canvas).toHaveScreenshot('default.png')
+        await comfyPage.canvas.click({
+          position: DefaultGraphPositions.textEncodeNode1
+        })
+        await comfyPage.nextFrame()
+        await expect(comfyPage.canvas).toHaveScreenshot('selected-node1.png')
+        await comfyPage.canvas.click({
+          position: DefaultGraphPositions.textEncodeNode2
+        })
+        await comfyPage.nextFrame()
+        await expect(comfyPage.canvas).toHaveScreenshot('selected-node2.png')
+      }
+    )
 
     const dragSelectNodes = async (
       comfyPage: ComfyPage,
@@ -76,7 +93,7 @@ test.describe('Node Interaction', () => {
       const clipNode2Pos = await clipNodes[1].getPosition()
       const offset = 64
       await comfyPage.page.keyboard.down('Meta')
-      await comfyPage.dragAndDrop(
+      await comfyPage.canvasOps.dragAndDrop(
         {
           x: Math.min(clipNode1Pos.x, clipNode2Pos.x) - offset,
           y: Math.min(clipNode1Pos.y, clipNode2Pos.y) - offset
@@ -90,9 +107,10 @@ test.describe('Node Interaction', () => {
     }
 
     test('Can drag-select nodes with Meta (mac)', async ({ comfyPage }) => {
-      const clipNodes = await comfyPage.getNodeRefsByType('CLIPTextEncode')
+      const clipNodes =
+        await comfyPage.nodeOps.getNodeRefsByType('CLIPTextEncode')
       await dragSelectNodes(comfyPage, clipNodes)
-      expect(await comfyPage.getSelectedGraphNodesCount()).toBe(
+      expect(await comfyPage.nodeOps.getSelectedGraphNodesCount()).toBe(
         clipNodes.length
       )
     })
@@ -100,7 +118,8 @@ test.describe('Node Interaction', () => {
     test('Can move selected nodes using the Comfy.Canvas.MoveSelectedNodes.{Up|Down|Left|Right} commands', async ({
       comfyPage
     }) => {
-      const clipNodes = await comfyPage.getNodeRefsByType('CLIPTextEncode')
+      const clipNodes =
+        await comfyPage.nodeOps.getNodeRefsByType('CLIPTextEncode')
       const getPositions = () =>
         Promise.all(clipNodes.map((node) => node.getPosition()))
       const testDirection = async ({
@@ -112,7 +131,7 @@ test.describe('Node Interaction', () => {
       }) => {
         const originalPositions = await getPositions()
         await dragSelectNodes(comfyPage, clipNodes)
-        await comfyPage.executeCommand(
+        await comfyPage.command.executeCommand(
           `Comfy.Canvas.MoveSelectedNodes.${direction}`
         )
         await comfyPage.canvas.press(`Control+Arrow${direction}`)
@@ -150,15 +169,24 @@ test.describe('Node Interaction', () => {
     })
   })
 
-  test('Can drag node', async ({ comfyPage }) => {
-    await comfyPage.dragNode2()
+  test('Can drag node', { tag: '@screenshot' }, async ({ comfyPage }) => {
+    await comfyPage.nodeOps.dragTextEncodeNode2()
+    // Move mouse away to avoid hover highlight on the node at the drop position.
+    await comfyPage.canvasOps.moveMouseToEmptyArea()
+    await comfyPage.nextFrame()
     await expect(comfyPage.canvas).toHaveScreenshot('dragged-node1.png')
   })
 
-  test.describe('Edge Interaction', () => {
+  test.describe('Edge Interaction', { tag: '@screenshot' }, () => {
     test.beforeEach(async ({ comfyPage }) => {
-      await comfyPage.setSetting('Comfy.LinkRelease.Action', 'no action')
-      await comfyPage.setSetting('Comfy.LinkRelease.ActionShift', 'no action')
+      await comfyPage.settings.setSetting(
+        'Comfy.LinkRelease.Action',
+        'no action'
+      )
+      await comfyPage.settings.setSetting(
+        'Comfy.LinkRelease.ActionShift',
+        'no action'
+      )
     })
 
     // Test both directions of edge connection.
@@ -166,11 +194,11 @@ test.describe('Node Interaction', () => {
       test(`Can disconnect/connect edge ${reverse ? 'reverse' : 'normal'}`, async ({
         comfyPage
       }) => {
-        await comfyPage.disconnectEdge()
+        await comfyPage.canvasOps.disconnectEdge()
         await expect(comfyPage.canvas).toHaveScreenshot('disconnected-edge.png')
-        await comfyPage.connectEdge({ reverse })
+        await comfyPage.canvasOps.connectEdge({ reverse })
         // Move mouse to empty area to avoid slot highlight.
-        await comfyPage.moveMouseToEmptyArea()
+        await comfyPage.canvasOps.moveMouseToEmptyArea()
         // Litegraph renders edge with a slight offset.
         await expect(comfyPage.canvas).toHaveScreenshot('default.png', {
           maxDiffPixels: 50
@@ -179,14 +207,14 @@ test.describe('Node Interaction', () => {
     })
 
     test('Can move link', async ({ comfyPage }) => {
-      await comfyPage.dragAndDrop(
-        comfyPage.clipTextEncodeNode1InputSlot,
-        comfyPage.emptySpace
+      await comfyPage.canvasOps.dragAndDrop(
+        DefaultGraphPositions.clipTextEncodeNode1InputSlot,
+        DefaultGraphPositions.emptySpace
       )
       await expect(comfyPage.canvas).toHaveScreenshot('disconnected-edge.png')
-      await comfyPage.dragAndDrop(
-        comfyPage.clipTextEncodeNode2InputSlot,
-        comfyPage.clipTextEncodeNode1InputSlot
+      await comfyPage.canvasOps.dragAndDrop(
+        DefaultGraphPositions.clipTextEncodeNode2InputSlot,
+        DefaultGraphPositions.clipTextEncodeNode1InputSlot
       )
       await expect(comfyPage.canvas).toHaveScreenshot('moved-link.png')
     })
@@ -195,15 +223,15 @@ test.describe('Node Interaction', () => {
     test.skip('Can copy link by shift-drag existing link', async ({
       comfyPage
     }) => {
-      await comfyPage.dragAndDrop(
-        comfyPage.clipTextEncodeNode1InputSlot,
-        comfyPage.emptySpace
+      await comfyPage.canvasOps.dragAndDrop(
+        DefaultGraphPositions.clipTextEncodeNode1InputSlot,
+        DefaultGraphPositions.emptySpace
       )
       await expect(comfyPage.canvas).toHaveScreenshot('disconnected-edge.png')
       await comfyPage.page.keyboard.down('Shift')
-      await comfyPage.dragAndDrop(
-        comfyPage.clipTextEncodeNode2InputLinkPath,
-        comfyPage.clipTextEncodeNode1InputSlot
+      await comfyPage.canvasOps.dragAndDrop(
+        DefaultGraphPositions.clipTextEncodeNode2InputLinkPath,
+        DefaultGraphPositions.clipTextEncodeNode1InputSlot
       )
       await comfyPage.page.keyboard.up('Shift')
       await expect(comfyPage.canvas).toHaveScreenshot('copied-link.png')
@@ -213,22 +241,28 @@ test.describe('Node Interaction', () => {
       comfyPage,
       comfyMouse
     }) => {
-      await comfyPage.setSetting('Comfy.Node.AutoSnapLinkToSlot', true)
-      await comfyPage.setSetting('Comfy.Node.SnapHighlightsNode', true)
+      await comfyPage.settings.setSetting('Comfy.Node.AutoSnapLinkToSlot', true)
+      await comfyPage.settings.setSetting('Comfy.Node.SnapHighlightsNode', true)
 
-      await comfyMouse.move(comfyPage.clipTextEncodeNode1InputSlot)
-      await comfyMouse.drag(comfyPage.clipTextEncodeNode2InputSlot)
+      await comfyMouse.move(DefaultGraphPositions.clipTextEncodeNode1InputSlot)
+      await comfyMouse.drag(DefaultGraphPositions.clipTextEncodeNode2InputSlot)
       await expect(comfyPage.canvas).toHaveScreenshot('snapped-highlighted.png')
     })
   })
 
-  test('Can adjust widget value', async ({ comfyPage }) => {
-    await comfyPage.adjustWidgetValue()
-    await expect(comfyPage.canvas).toHaveScreenshot('adjusted-widget-value.png')
-  })
+  test(
+    'Can adjust widget value',
+    { tag: '@screenshot' },
+    async ({ comfyPage }) => {
+      await comfyPage.nodeOps.adjustEmptyLatentWidth()
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'adjusted-widget-value.png'
+      )
+    }
+  )
 
-  test('Link snap to slot', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('links/snap_to_slot')
+  test('Link snap to slot', { tag: '@screenshot' }, async ({ comfyPage }) => {
+    await comfyPage.workflow.loadWorkflow('links/snap_to_slot')
     await expect(comfyPage.canvas).toHaveScreenshot('snap_to_slot.png')
 
     const outputSlotPos = {
@@ -239,62 +273,78 @@ test.describe('Node Interaction', () => {
       x: 748,
       y: 77
     }
-    await comfyPage.dragAndDrop(outputSlotPos, samplerNodeCenterPos)
+    await comfyPage.canvasOps.dragAndDrop(outputSlotPos, samplerNodeCenterPos)
 
     await expect(comfyPage.canvas).toHaveScreenshot('snap_to_slot_linked.png')
   })
 
-  test('Can batch move links by drag with shift', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('links/batch_move_links')
-    await expect(comfyPage.canvas).toHaveScreenshot('batch_move_links.png')
+  test(
+    'Can batch move links by drag with shift',
+    { tag: '@screenshot' },
+    async ({ comfyPage }) => {
+      await comfyPage.workflow.loadWorkflow('links/batch_move_links')
+      await expect(comfyPage.canvas).toHaveScreenshot('batch_move_links.png')
 
-    const outputSlot1Pos = {
-      x: 304,
-      y: 127
+      const outputSlot1Pos = {
+        x: 304,
+        y: 127
+      }
+      const outputSlot2Pos = {
+        x: 307,
+        y: 310
+      }
+
+      await comfyPage.page.keyboard.down('Shift')
+      await comfyPage.canvasOps.dragAndDrop(outputSlot1Pos, outputSlot2Pos)
+      await comfyPage.page.keyboard.up('Shift')
+
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'batch_move_links_moved.png'
+      )
     }
-    const outputSlot2Pos = {
-      x: 307,
-      y: 310
+  )
+
+  test(
+    'Can batch disconnect links with ctrl+alt+click',
+    { tag: '@screenshot' },
+    async ({ comfyPage }) => {
+      const loadCheckpointClipSlotPos = {
+        x: 332,
+        y: 508
+      }
+      await comfyPage.canvas.click({
+        modifiers: ['Control', 'Alt'],
+        position: loadCheckpointClipSlotPos
+      })
+      await comfyPage.nextFrame()
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'batch-disconnect-links-disconnected.png'
+      )
     }
+  )
 
-    await comfyPage.page.keyboard.down('Shift')
-    await comfyPage.dragAndDrop(outputSlot1Pos, outputSlot2Pos)
-    await comfyPage.page.keyboard.up('Shift')
-
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'batch_move_links_moved.png'
-    )
-  })
-
-  test('Can batch disconnect links with ctrl+alt+click', async ({
-    comfyPage
-  }) => {
-    const loadCheckpointClipSlotPos = {
-      x: 332,
-      y: 508
+  test(
+    'Can toggle dom widget node open/closed',
+    { tag: '@screenshot' },
+    async ({ comfyPage }) => {
+      await expect(comfyPage.canvas).toHaveScreenshot('default.png')
+      await comfyPage.canvas.click({
+        position: DefaultGraphPositions.textEncodeNodeToggler
+      })
+      await comfyPage.nextFrame()
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'text-encode-toggled-off.png'
+      )
+      await comfyPage.delay(1000)
+      await comfyPage.canvas.click({
+        position: DefaultGraphPositions.textEncodeNodeToggler
+      })
+      await comfyPage.nextFrame()
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'text-encode-toggled-back-open.png'
+      )
     }
-    await comfyPage.canvas.click({
-      modifiers: ['Control', 'Alt'],
-      position: loadCheckpointClipSlotPos
-    })
-    await comfyPage.nextFrame()
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'batch-disconnect-links-disconnected.png'
-    )
-  })
-
-  test('Can toggle dom widget node open/closed', async ({ comfyPage }) => {
-    await expect(comfyPage.canvas).toHaveScreenshot('default.png')
-    await comfyPage.clickTextEncodeNodeToggler()
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'text-encode-toggled-off.png'
-    )
-    await comfyPage.delay(1000)
-    await comfyPage.clickTextEncodeNodeToggler()
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'text-encode-toggled-back-open.png'
-    )
-  })
+  )
 
   test('Can close prompt dialog with canvas click (number widget)', async ({
     comfyPage
@@ -325,7 +375,7 @@ test.describe('Node Interaction', () => {
       x: 167,
       y: 143
     }
-    await comfyPage.loadWorkflow('nodes/single_save_image_node')
+    await comfyPage.workflow.loadWorkflow('nodes/single_save_image_node')
     await comfyPage.canvas.click({
       position: textWidgetPos
     })
@@ -341,24 +391,28 @@ test.describe('Node Interaction', () => {
     await expect(legacyPrompt).toBeHidden()
   })
 
-  test('Can double click node title to edit', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('nodes/single_ksampler')
-    await comfyPage.canvas.dblclick({
-      position: {
-        x: 50,
-        y: 10
-      },
-      delay: 5
-    })
-    await comfyPage.page.keyboard.type('Hello World')
-    await comfyPage.page.keyboard.press('Enter')
-    await expect(comfyPage.canvas).toHaveScreenshot('node-title-edited.png')
-  })
+  test(
+    'Can double click node title to edit',
+    { tag: '@screenshot' },
+    async ({ comfyPage }) => {
+      await comfyPage.workflow.loadWorkflow('nodes/single_ksampler')
+      await comfyPage.canvas.dblclick({
+        position: {
+          x: 50,
+          y: 10
+        },
+        delay: 5
+      })
+      await comfyPage.page.keyboard.type('Hello World')
+      await comfyPage.page.keyboard.press('Enter')
+      await expect(comfyPage.canvas).toHaveScreenshot('node-title-edited.png')
+    }
+  )
 
   test('Double click node body does not trigger edit', async ({
     comfyPage
   }) => {
-    await comfyPage.loadWorkflow('nodes/single_ksampler')
+    await comfyPage.workflow.loadWorkflow('nodes/single_ksampler')
     await comfyPage.canvas.dblclick({
       position: {
         x: 50,
@@ -369,54 +423,75 @@ test.describe('Node Interaction', () => {
     expect(await comfyPage.page.locator('.node-title-editor').count()).toBe(0)
   })
 
-  test('Can group selected nodes', async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.GroupSelectedNodes.Padding', 10)
-    await comfyPage.select2Nodes()
-    await comfyPage.page.keyboard.down('Control')
-    await comfyPage.page.keyboard.press('KeyG')
-    await comfyPage.page.keyboard.up('Control')
-    await comfyPage.nextFrame()
-    // Confirm group title
-    await comfyPage.page.keyboard.press('Enter')
-    await comfyPage.nextFrame()
-    await expect(comfyPage.canvas).toHaveScreenshot('group-selected-nodes.png')
-  })
+  test(
+    'Can group selected nodes',
+    { tag: '@screenshot' },
+    async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting(
+        'Comfy.GroupSelectedNodes.Padding',
+        10
+      )
+      await comfyPage.nodeOps.selectNodes(['CLIP Text Encode (Prompt)'])
+      await comfyPage.page.keyboard.down('Control')
+      await comfyPage.page.keyboard.press('KeyG')
+      await comfyPage.page.keyboard.up('Control')
+      await comfyPage.nextFrame()
+      // Confirm group title
+      await comfyPage.page.keyboard.press('Enter')
+      await comfyPage.nextFrame()
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'group-selected-nodes.png'
+      )
+    }
+  )
 
-  test('Can fit group to contents', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('groups/oversized_group')
-    await comfyPage.ctrlA()
-    await comfyPage.nextFrame()
-    await comfyPage.executeCommand('Comfy.Graph.FitGroupToContents')
-    await comfyPage.nextFrame()
-    await expect(comfyPage.canvas).toHaveScreenshot('group-fit-to-contents.png')
-  })
+  test(
+    'Can fit group to contents',
+    { tag: '@screenshot' },
+    async ({ comfyPage }) => {
+      await comfyPage.workflow.loadWorkflow('groups/oversized_group')
+      await comfyPage.keyboard.selectAll()
+      await comfyPage.nextFrame()
+      await comfyPage.command.executeCommand('Comfy.Graph.FitGroupToContents')
+      await comfyPage.nextFrame()
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'group-fit-to-contents.png'
+      )
+    }
+  )
 
-  test('Can pin/unpin nodes', async ({ comfyPage }) => {
-    await comfyPage.select2Nodes()
-    await comfyPage.executeCommand('Comfy.Canvas.ToggleSelectedNodes.Pin')
+  test('Can pin/unpin nodes', { tag: '@screenshot' }, async ({ comfyPage }) => {
+    await comfyPage.nodeOps.selectNodes(['CLIP Text Encode (Prompt)'])
+    await comfyPage.command.executeCommand(
+      'Comfy.Canvas.ToggleSelectedNodes.Pin'
+    )
     await comfyPage.nextFrame()
     await expect(comfyPage.canvas).toHaveScreenshot('nodes-pinned.png')
-    await comfyPage.executeCommand('Comfy.Canvas.ToggleSelectedNodes.Pin')
+    await comfyPage.command.executeCommand(
+      'Comfy.Canvas.ToggleSelectedNodes.Pin'
+    )
     await comfyPage.nextFrame()
     await expect(comfyPage.canvas).toHaveScreenshot('nodes-unpinned.png')
   })
 
-  test('Can bypass/unbypass nodes with keyboard shortcut', async ({
-    comfyPage
-  }) => {
-    await comfyPage.select2Nodes()
-    await comfyPage.canvas.press('Control+b')
-    await comfyPage.nextFrame()
-    await expect(comfyPage.canvas).toHaveScreenshot('nodes-bypassed.png')
-    await comfyPage.canvas.press('Control+b')
-    await comfyPage.nextFrame()
-    await expect(comfyPage.canvas).toHaveScreenshot('nodes-unbypassed.png')
-  })
+  test(
+    'Can bypass/unbypass nodes with keyboard shortcut',
+    { tag: '@screenshot' },
+    async ({ comfyPage }) => {
+      await comfyPage.nodeOps.selectNodes(['CLIP Text Encode (Prompt)'])
+      await comfyPage.canvas.press('Control+b')
+      await comfyPage.nextFrame()
+      await expect(comfyPage.canvas).toHaveScreenshot('nodes-bypassed.png')
+      await comfyPage.canvas.press('Control+b')
+      await comfyPage.nextFrame()
+      await expect(comfyPage.canvas).toHaveScreenshot('nodes-unbypassed.png')
+    }
+  )
 })
 
-test.describe('Group Interaction', () => {
+test.describe('Group Interaction', { tag: '@screenshot' }, () => {
   test('Can double click group title to edit', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('groups/single_group')
+    await comfyPage.workflow.loadWorkflow('groups/single_group')
     await comfyPage.canvas.dblclick({
       position: {
         x: 50,
@@ -430,18 +505,18 @@ test.describe('Group Interaction', () => {
   })
 })
 
-test.describe('Canvas Interaction', () => {
+test.describe('Canvas Interaction', { tag: '@screenshot' }, () => {
   test('Can zoom in/out', async ({ comfyPage }) => {
-    await comfyPage.zoom(-100)
+    await comfyPage.canvasOps.zoom(-100)
     await expect(comfyPage.canvas).toHaveScreenshot('zoomed-in.png')
-    await comfyPage.zoom(200)
+    await comfyPage.canvasOps.zoom(200)
     await expect(comfyPage.canvas).toHaveScreenshot('zoomed-out.png')
   })
 
   test('Can zoom very far out', async ({ comfyPage }) => {
-    await comfyPage.zoom(100, 12)
+    await comfyPage.canvasOps.zoom(100, 12)
     await expect(comfyPage.canvas).toHaveScreenshot('zoomed-very-far-out.png')
-    await comfyPage.zoom(-100, 12)
+    await comfyPage.canvasOps.zoom(-100, 12)
     await expect(comfyPage.canvas).toHaveScreenshot('zoomed-back-in.png')
   })
 
@@ -450,11 +525,11 @@ test.describe('Canvas Interaction', () => {
   }) => {
     await comfyPage.page.keyboard.down('Control')
     await comfyPage.page.keyboard.down('Shift')
-    await comfyPage.dragAndDrop({ x: 10, y: 100 }, { x: 10, y: 40 })
+    await comfyPage.canvasOps.dragAndDrop({ x: 10, y: 100 }, { x: 10, y: 40 })
     await expect(comfyPage.canvas).toHaveScreenshot('zoomed-in-ctrl-shift.png')
-    await comfyPage.dragAndDrop({ x: 10, y: 40 }, { x: 10, y: 160 })
+    await comfyPage.canvasOps.dragAndDrop({ x: 10, y: 40 }, { x: 10, y: 160 })
     await expect(comfyPage.canvas).toHaveScreenshot('zoomed-out-ctrl-shift.png')
-    await comfyPage.dragAndDrop({ x: 10, y: 280 }, { x: 10, y: 220 })
+    await comfyPage.canvasOps.dragAndDrop({ x: 10, y: 280 }, { x: 10, y: 220 })
     await expect(comfyPage.canvas).toHaveScreenshot(
       'zoomed-default-ctrl-shift.png'
     )
@@ -465,35 +540,35 @@ test.describe('Canvas Interaction', () => {
   test('Can zoom in/out after decreasing canvas zoom speed setting', async ({
     comfyPage
   }) => {
-    await comfyPage.setSetting('Comfy.Graph.ZoomSpeed', 1.05)
-    await comfyPage.zoom(-100, 4)
+    await comfyPage.settings.setSetting('Comfy.Graph.ZoomSpeed', 1.05)
+    await comfyPage.canvasOps.zoom(-100, 4)
     await expect(comfyPage.canvas).toHaveScreenshot(
       'zoomed-in-low-zoom-speed.png'
     )
-    await comfyPage.zoom(100, 8)
+    await comfyPage.canvasOps.zoom(100, 8)
     await expect(comfyPage.canvas).toHaveScreenshot(
       'zoomed-out-low-zoom-speed.png'
     )
-    await comfyPage.setSetting('Comfy.Graph.ZoomSpeed', 1.1)
+    await comfyPage.settings.setSetting('Comfy.Graph.ZoomSpeed', 1.1)
   })
 
   test('Can zoom in/out after increasing canvas zoom speed', async ({
     comfyPage
   }) => {
-    await comfyPage.setSetting('Comfy.Graph.ZoomSpeed', 1.5)
-    await comfyPage.zoom(-100, 4)
+    await comfyPage.settings.setSetting('Comfy.Graph.ZoomSpeed', 1.5)
+    await comfyPage.canvasOps.zoom(-100, 4)
     await expect(comfyPage.canvas).toHaveScreenshot(
       'zoomed-in-high-zoom-speed.png'
     )
-    await comfyPage.zoom(100, 8)
+    await comfyPage.canvasOps.zoom(100, 8)
     await expect(comfyPage.canvas).toHaveScreenshot(
       'zoomed-out-high-zoom-speed.png'
     )
-    await comfyPage.setSetting('Comfy.Graph.ZoomSpeed', 1.1)
+    await comfyPage.settings.setSetting('Comfy.Graph.ZoomSpeed', 1.1)
   })
 
   test('Can pan', async ({ comfyPage }) => {
-    await comfyPage.pan({ x: 200, y: 200 })
+    await comfyPage.canvasOps.pan({ x: 200, y: 200 })
     await expect(comfyPage.canvas).toHaveScreenshot('panned.png')
   })
 
@@ -564,9 +639,9 @@ test.describe('Canvas Interaction', () => {
   })
 
   test('Can pan when dragging a link', async ({ comfyPage, comfyMouse }) => {
-    const posSlot1 = comfyPage.clipTextEncodeNode1InputSlot
+    const posSlot1 = DefaultGraphPositions.clipTextEncodeNode1InputSlot
     await comfyMouse.move(posSlot1)
-    const posEmpty = comfyPage.emptySpace
+    const posEmpty = DefaultGraphPositions.emptySpace
     await comfyMouse.drag(posEmpty)
     await expect(comfyPage.canvas).toHaveScreenshot('dragging-link1.png')
 
@@ -585,23 +660,23 @@ test.describe('Canvas Interaction', () => {
 
   test('Can pan very far and back', async ({ comfyPage }) => {
     // intentionally slice the edge of where the clip text encode dom widgets are
-    await comfyPage.pan({ x: -800, y: -300 }, { x: 1000, y: 10 })
+    await comfyPage.canvasOps.pan({ x: -800, y: -300 }, { x: 1000, y: 10 })
     await expect(comfyPage.canvas).toHaveScreenshot('panned-step-one.png')
-    await comfyPage.pan({ x: -200, y: 0 }, { x: 1000, y: 10 })
+    await comfyPage.canvasOps.pan({ x: -200, y: 0 }, { x: 1000, y: 10 })
     await expect(comfyPage.canvas).toHaveScreenshot('panned-step-two.png')
-    await comfyPage.pan({ x: -2200, y: -2200 }, { x: 1000, y: 10 })
+    await comfyPage.canvasOps.pan({ x: -2200, y: -2200 }, { x: 1000, y: 10 })
     await expect(comfyPage.canvas).toHaveScreenshot('panned-far-away.png')
-    await comfyPage.pan({ x: 2200, y: 2200 }, { x: 1000, y: 10 })
+    await comfyPage.canvasOps.pan({ x: 2200, y: 2200 }, { x: 1000, y: 10 })
     await expect(comfyPage.canvas).toHaveScreenshot('panned-back-from-far.png')
-    await comfyPage.pan({ x: 200, y: 0 }, { x: 1000, y: 10 })
+    await comfyPage.canvasOps.pan({ x: 200, y: 0 }, { x: 1000, y: 10 })
     await expect(comfyPage.canvas).toHaveScreenshot('panned-back-to-two.png')
-    await comfyPage.pan({ x: 800, y: 300 }, { x: 1000, y: 10 })
+    await comfyPage.canvasOps.pan({ x: 800, y: 300 }, { x: 1000, y: 10 })
     await expect(comfyPage.canvas).toHaveScreenshot('panned-back-to-one.png')
   })
 
   test('@mobile Can pan with touch', async ({ comfyPage }) => {
     await comfyPage.closeMenu()
-    await comfyPage.panWithTouch({ x: 200, y: 200 })
+    await comfyPage.canvasOps.panWithTouch({ x: 200, y: 200 })
     await expect(comfyPage.canvas).toHaveScreenshot('panned-touch.png')
   })
 })
@@ -614,41 +689,41 @@ test.describe('Widget Interaction', () => {
     await expect(textBox).toHaveValue('')
     await textBox.fill('Hello World')
     await expect(textBox).toHaveValue('Hello World')
-    await comfyPage.ctrlZ(null)
+    await comfyPage.keyboard.undo(null)
     await expect(textBox).toHaveValue('')
   })
 
   test('Undo attention edit', async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.EditAttention.Delta', 0.05)
+    await comfyPage.settings.setSetting('Comfy.EditAttention.Delta', 0.05)
     const textBox = comfyPage.widgetTextBox
     await textBox.click()
     await textBox.fill('1girl')
     await expect(textBox).toHaveValue('1girl')
     await textBox.selectText()
-    await comfyPage.ctrlArrowUp(null)
+    await comfyPage.keyboard.moveUp(null)
     await expect(textBox).toHaveValue('(1girl:1.05)')
-    await comfyPage.ctrlZ(null)
+    await comfyPage.keyboard.undo(null)
     await expect(textBox).toHaveValue('1girl')
   })
 })
 
-test.describe('Load workflow', () => {
+test.describe('Load workflow', { tag: '@screenshot' }, () => {
   test('Can load workflow with string node id', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('nodes/string_node_id')
+    await comfyPage.workflow.loadWorkflow('nodes/string_node_id')
     await expect(comfyPage.canvas).toHaveScreenshot('string_node_id.png')
   })
 
   test('Can load workflow with ("STRING",) input node', async ({
     comfyPage
   }) => {
-    await comfyPage.loadWorkflow('inputs/string_input')
+    await comfyPage.workflow.loadWorkflow('inputs/string_input')
     await expect(comfyPage.canvas).toHaveScreenshot('string_input.png')
   })
 
   test('Restore workflow on reload (switch workflow)', async ({
     comfyPage
   }) => {
-    await comfyPage.loadWorkflow('nodes/single_ksampler')
+    await comfyPage.workflow.loadWorkflow('nodes/single_ksampler')
     await expect(comfyPage.canvas).toHaveScreenshot('single_ksampler.png')
     await comfyPage.setup({ clearStorage: false })
     await expect(comfyPage.canvas).toHaveScreenshot('single_ksampler.png')
@@ -657,13 +732,32 @@ test.describe('Load workflow', () => {
   test('Restore workflow on reload (modify workflow)', async ({
     comfyPage
   }) => {
-    await comfyPage.loadWorkflow('nodes/single_ksampler')
-    const node = (await comfyPage.getFirstNodeRef())!
+    await comfyPage.workflow.loadWorkflow('nodes/single_ksampler')
+    const node = (await comfyPage.nodeOps.getFirstNodeRef())!
     await node.click('collapse')
-    await comfyPage.clickEmptySpace()
+    await comfyPage.canvasOps.clickEmptySpace()
     await expect(comfyPage.canvas).toHaveScreenshot(
       'single_ksampler_modified.png'
     )
+    // Wait for V2 persistence debounce to save the modified workflow
+    const start = Date.now()
+    await comfyPage.page.waitForFunction((since) => {
+      for (let i = 0; i < window.localStorage.length; i++) {
+        const key = window.localStorage.key(i)
+        if (!key?.startsWith('Comfy.Workflow.DraftIndex.v2:')) continue
+        const json = window.localStorage.getItem(key)
+        if (!json) continue
+        try {
+          const index = JSON.parse(json)
+          if (typeof index.updatedAt === 'number' && index.updatedAt >= since) {
+            return true
+          }
+        } catch {
+          // ignore
+        }
+      }
+      return false
+    }, start)
     await comfyPage.setup({ clearStorage: false })
     await expect(comfyPage.canvas).toHaveScreenshot(
       'single_ksampler_modified.png'
@@ -678,7 +772,7 @@ test.describe('Load workflow', () => {
       `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}${extension}`
 
     test.beforeEach(async ({ comfyPage }) => {
-      await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
 
       workflowA = generateUniqueFilename()
       await comfyPage.menu.topbar.saveWorkflow(workflowA)
@@ -686,17 +780,24 @@ test.describe('Load workflow', () => {
       await comfyPage.menu.topbar.triggerTopbarCommand(['New'])
       await comfyPage.menu.topbar.saveWorkflow(workflowB)
 
-      // Wait for localStorage to persist the workflow paths before reloading
-      await comfyPage.page.waitForFunction(
-        () => !!window.localStorage.getItem('Comfy.OpenWorkflowsPaths')
-      )
+      // Wait for sessionStorage to persist the workflow paths before reloading
+      // V2 persistence uses sessionStorage with client-scoped keys
+      await comfyPage.page.waitForFunction(() => {
+        for (let i = 0; i < window.sessionStorage.length; i++) {
+          const key = window.sessionStorage.key(i)
+          if (key?.startsWith('Comfy.Workflow.OpenPaths:')) {
+            return true
+          }
+        }
+        return false
+      })
       await comfyPage.setup({ clearStorage: false })
     })
 
     test('Restores topbar workflow tabs after reload', async ({
       comfyPage
     }) => {
-      await comfyPage.setSetting(
+      await comfyPage.settings.setSetting(
         'Comfy.Workflow.WorkflowTabsPosition',
         'Topbar'
       )
@@ -709,7 +810,7 @@ test.describe('Load workflow', () => {
     })
 
     test('Restores sidebar workflows after reload', async ({ comfyPage }) => {
-      await comfyPage.setSetting(
+      await comfyPage.settings.setSetting(
         'Comfy.Workflow.WorkflowTabsPosition',
         'Sidebar'
       )
@@ -718,48 +819,51 @@ test.describe('Load workflow', () => {
         await comfyPage.menu.workflowsTab.getOpenedWorkflowNames()
       const activeWorkflowName =
         await comfyPage.menu.workflowsTab.getActiveWorkflowName()
-      const workflowPathA = `${workflowA}.json`
-      const workflowPathB = `${workflowB}.json`
-
       expect(openWorkflows).toEqual(
-        expect.arrayContaining([workflowPathA, workflowPathB])
+        expect.arrayContaining([workflowA, workflowB])
       )
-      expect(openWorkflows.indexOf(workflowPathA)).toBeLessThan(
-        openWorkflows.indexOf(workflowPathB)
+      expect(openWorkflows.indexOf(workflowA)).toBeLessThan(
+        openWorkflows.indexOf(workflowB)
       )
-      expect(activeWorkflowName).toEqual(workflowPathB)
+      expect(activeWorkflowName).toEqual(workflowB)
     })
   })
 
   test('Auto fit view after loading workflow', async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.EnableWorkflowViewRestore', false)
-    await comfyPage.loadWorkflow('nodes/single_ksampler')
+    await comfyPage.settings.setSetting(
+      'Comfy.EnableWorkflowViewRestore',
+      false
+    )
+    await comfyPage.workflow.loadWorkflow('nodes/single_ksampler')
     await expect(comfyPage.canvas).toHaveScreenshot('single_ksampler_fit.png')
   })
 })
 
 test.describe('Load duplicate workflow', () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
   })
 
   test('A workflow can be loaded multiple times in a row', async ({
     comfyPage
   }) => {
-    await comfyPage.loadWorkflow('nodes/single_ksampler')
+    await comfyPage.workflow.loadWorkflow('nodes/single_ksampler')
     await comfyPage.menu.workflowsTab.open()
-    await comfyPage.executeCommand('Comfy.NewBlankWorkflow')
-    await comfyPage.loadWorkflow('nodes/single_ksampler')
-    expect(await comfyPage.getGraphNodesCount()).toBe(1)
+    await comfyPage.command.executeCommand('Comfy.NewBlankWorkflow')
+    await comfyPage.workflow.loadWorkflow('nodes/single_ksampler')
+    expect(await comfyPage.nodeOps.getGraphNodesCount()).toBe(1)
   })
 })
 
 test.describe('Viewport settings', () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
-    await comfyPage.setSetting('Comfy.Workflow.WorkflowTabsPosition', 'Topbar')
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting(
+      'Comfy.Workflow.WorkflowTabsPosition',
+      'Topbar'
+    )
 
-    await comfyPage.setupWorkflowsDirectory({})
+    await comfyPage.workflow.setupWorkflowsDirectory({})
   })
 
   test('Keeps viewport settings when changing tabs', async ({
@@ -769,7 +873,7 @@ test.describe('Viewport settings', () => {
     const changeTab = async (tab: Locator) => {
       await tab.click()
       await comfyPage.nextFrame()
-      await comfyMouse.move(comfyPage.emptySpace)
+      await comfyMouse.move(DefaultGraphPositions.emptySpace)
 
       // If tooltip is visible, wait for it to hide
       await expect(
@@ -778,11 +882,13 @@ test.describe('Viewport settings', () => {
     }
 
     // Screenshot the canvas element
-    await comfyPage.setSetting('Comfy.Graph.CanvasMenu', true)
+    await comfyPage.settings.setSetting('Comfy.Graph.CanvasMenu', true)
 
-    const toggleButton = comfyPage.page.getByTestId('toggle-minimap-button')
+    const toggleButton = comfyPage.page.getByTestId(
+      TestIds.canvas.toggleMinimapButton
+    )
     await toggleButton.click()
-    await comfyPage.setSetting('Comfy.Graph.CanvasMenu', false)
+    await comfyPage.settings.setSetting('Comfy.Graph.CanvasMenu', false)
 
     await comfyPage.menu.topbar.saveWorkflow('Workflow A')
     await comfyPage.nextFrame()
@@ -799,7 +905,7 @@ test.describe('Viewport settings', () => {
     const tabB = comfyPage.menu.topbar.getWorkflowTab('Workflow B')
     await changeTab(tabB)
 
-    await comfyMouse.move(comfyPage.emptySpace)
+    await comfyMouse.move(DefaultGraphPositions.emptySpace)
     for (let i = 0; i < 4; i++) {
       await comfyMouse.wheel(0, 60)
     }
@@ -824,16 +930,22 @@ test.describe('Viewport settings', () => {
   })
 })
 
-test.describe('Canvas Navigation', () => {
+test.describe('Canvas Navigation', { tag: '@screenshot' }, () => {
   test.describe('Legacy Mode', () => {
     test.beforeEach(async ({ comfyPage }) => {
-      await comfyPage.setSetting('Comfy.Canvas.NavigationMode', 'legacy')
+      await comfyPage.settings.setSetting(
+        'Comfy.Canvas.NavigationMode',
+        'legacy'
+      )
     })
 
     test('Left-click drag in empty area should pan canvas', async ({
       comfyPage
     }) => {
-      await comfyPage.dragAndDrop({ x: 50, y: 50 }, { x: 150, y: 150 })
+      await comfyPage.canvasOps.dragAndDrop(
+        { x: 50, y: 50 },
+        { x: 150, y: 150 }
+      )
       await expect(comfyPage.canvas).toHaveScreenshot(
         'legacy-left-drag-pan.png'
       )
@@ -866,8 +978,11 @@ test.describe('Canvas Navigation', () => {
     })
 
     test('Left-click on node should not pan canvas', async ({ comfyPage }) => {
-      await comfyPage.clickTextEncodeNode1()
-      const selectedCount = await comfyPage.getSelectedGraphNodesCount()
+      await comfyPage.canvas.click({
+        position: DefaultGraphPositions.textEncodeNode1
+      })
+      await comfyPage.nextFrame()
+      const selectedCount = await comfyPage.nodeOps.getSelectedGraphNodesCount()
       expect(selectedCount).toBe(1)
       await expect(comfyPage.canvas).toHaveScreenshot(
         'legacy-click-node-select.png'
@@ -877,18 +992,22 @@ test.describe('Canvas Navigation', () => {
 
   test.describe('Standard Mode', () => {
     test.beforeEach(async ({ comfyPage }) => {
-      await comfyPage.setSetting('Comfy.Canvas.NavigationMode', 'standard')
+      await comfyPage.settings.setSetting(
+        'Comfy.Canvas.NavigationMode',
+        'standard'
+      )
     })
 
     test('Left-click drag in empty area should select nodes', async ({
       comfyPage
     }) => {
-      const clipNodes = await comfyPage.getNodeRefsByType('CLIPTextEncode')
+      const clipNodes =
+        await comfyPage.nodeOps.getNodeRefsByType('CLIPTextEncode')
       const clipNode1Pos = await clipNodes[0].getPosition()
       const clipNode2Pos = await clipNodes[1].getPosition()
       const offset = 64
 
-      await comfyPage.dragAndDrop(
+      await comfyPage.canvasOps.dragAndDrop(
         {
           x: Math.min(clipNode1Pos.x, clipNode2Pos.x) - offset,
           y: Math.min(clipNode1Pos.y, clipNode2Pos.y) - offset
@@ -899,7 +1018,7 @@ test.describe('Canvas Navigation', () => {
         }
       )
 
-      const selectedCount = await comfyPage.getSelectedGraphNodesCount()
+      const selectedCount = await comfyPage.nodeOps.getSelectedGraphNodesCount()
       expect(selectedCount).toBe(clipNodes.length)
       await expect(comfyPage.canvas).toHaveScreenshot(
         'standard-left-drag-select.png'
@@ -939,8 +1058,11 @@ test.describe('Canvas Navigation', () => {
     test('Left-click on node should select node (not start selection box)', async ({
       comfyPage
     }) => {
-      await comfyPage.clickTextEncodeNode1()
-      const selectedCount = await comfyPage.getSelectedGraphNodesCount()
+      await comfyPage.canvas.click({
+        position: DefaultGraphPositions.textEncodeNode1
+      })
+      await comfyPage.nextFrame()
+      const selectedCount = await comfyPage.nodeOps.getSelectedGraphNodesCount()
       expect(selectedCount).toBe(1)
       await expect(comfyPage.canvas).toHaveScreenshot(
         'standard-click-node-select.png'
@@ -953,7 +1075,10 @@ test.describe('Canvas Navigation', () => {
       await comfyPage.nextFrame()
 
       await comfyPage.page.keyboard.down('Space')
-      await comfyPage.dragAndDrop({ x: 50, y: 50 }, { x: 150, y: 150 })
+      await comfyPage.canvasOps.dragAndDrop(
+        { x: 50, y: 50 },
+        { x: 150, y: 150 }
+      )
       await comfyPage.page.keyboard.up('Space')
       await expect(comfyPage.canvas).toHaveScreenshot(
         'standard-space-drag-pan.png'
@@ -963,11 +1088,12 @@ test.describe('Canvas Navigation', () => {
     test('Space key overrides default left-click behavior', async ({
       comfyPage
     }) => {
-      const clipNodes = await comfyPage.getNodeRefsByType('CLIPTextEncode')
+      const clipNodes =
+        await comfyPage.nodeOps.getNodeRefsByType('CLIPTextEncode')
       const clipNode1Pos = await clipNodes[0].getPosition()
       const offset = 64
 
-      await comfyPage.dragAndDrop(
+      await comfyPage.canvasOps.dragAndDrop(
         {
           x: clipNode1Pos.x - offset,
           y: clipNode1Pos.y - offset
@@ -979,16 +1105,16 @@ test.describe('Canvas Navigation', () => {
       )
 
       const selectedCountAfterDrag =
-        await comfyPage.getSelectedGraphNodesCount()
+        await comfyPage.nodeOps.getSelectedGraphNodesCount()
       expect(selectedCountAfterDrag).toBeGreaterThan(0)
 
-      await comfyPage.clickEmptySpace()
+      await comfyPage.canvasOps.clickEmptySpace()
       const selectedCountAfterClear =
-        await comfyPage.getSelectedGraphNodesCount()
+        await comfyPage.nodeOps.getSelectedGraphNodesCount()
       expect(selectedCountAfterClear).toBe(0)
 
       await comfyPage.page.keyboard.down('Space')
-      await comfyPage.dragAndDrop(
+      await comfyPage.canvasOps.dragAndDrop(
         {
           x: clipNode1Pos.x - offset,
           y: clipNode1Pos.y - offset
@@ -1001,7 +1127,7 @@ test.describe('Canvas Navigation', () => {
       await comfyPage.page.keyboard.up('Space')
 
       const selectedCountAfterSpaceDrag =
-        await comfyPage.getSelectedGraphNodesCount()
+        await comfyPage.nodeOps.getSelectedGraphNodesCount()
       expect(selectedCountAfterSpaceDrag).toBe(0)
     })
   })
@@ -1009,7 +1135,10 @@ test.describe('Canvas Navigation', () => {
   test('Shift + mouse wheel should pan canvas horizontally', async ({
     comfyPage
   }) => {
-    await comfyPage.setSetting('Comfy.Canvas.MouseWheelScroll', 'panning')
+    await comfyPage.settings.setSetting(
+      'Comfy.Canvas.MouseWheelScroll',
+      'panning'
+    )
 
     await comfyPage.page.click('canvas')
     await comfyPage.nextFrame()
@@ -1047,11 +1176,17 @@ test.describe('Canvas Navigation', () => {
     test('Multiple modifier keys work correctly in legacy mode', async ({
       comfyPage
     }) => {
-      await comfyPage.setSetting('Comfy.Canvas.NavigationMode', 'legacy')
+      await comfyPage.settings.setSetting(
+        'Comfy.Canvas.NavigationMode',
+        'legacy'
+      )
 
       await comfyPage.page.keyboard.down('Alt')
       await comfyPage.page.keyboard.down('Shift')
-      await comfyPage.dragAndDrop({ x: 50, y: 50 }, { x: 150, y: 150 })
+      await comfyPage.canvasOps.dragAndDrop(
+        { x: 50, y: 50 },
+        { x: 150, y: 150 }
+      )
       await comfyPage.page.keyboard.up('Shift')
       await comfyPage.page.keyboard.up('Alt')
 
@@ -1071,7 +1206,10 @@ test.describe('Canvas Navigation', () => {
         })
       }
 
-      await comfyPage.setSetting('Comfy.Canvas.NavigationMode', 'legacy')
+      await comfyPage.settings.setSetting(
+        'Comfy.Canvas.NavigationMode',
+        'legacy'
+      )
       await comfyPage.page.mouse.move(50, 50)
       await comfyPage.page.mouse.down()
       expect(await getCursorStyle()).toBe('grabbing')
diff --git a/browser_tests/tests/interaction.spec.ts-snapshots/dragged-node1-chromium-linux.png b/browser_tests/tests/interaction.spec.ts-snapshots/dragged-node1-chromium-linux.png
index 188f5b9c97..9bbb027fbd 100644
Binary files a/browser_tests/tests/interaction.spec.ts-snapshots/dragged-node1-chromium-linux.png and b/browser_tests/tests/interaction.spec.ts-snapshots/dragged-node1-chromium-linux.png differ
diff --git a/browser_tests/tests/keybindings.spec.ts b/browser_tests/tests/keybindings.spec.ts
index f4244ae669..4810a3fb14 100644
--- a/browser_tests/tests/keybindings.spec.ts
+++ b/browser_tests/tests/keybindings.spec.ts
@@ -3,22 +3,22 @@ import { expect } from '@playwright/test'
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
-test.describe('Keybindings', () => {
+test.describe('Keybindings', { tag: '@keyboard' }, () => {
   test('Should not trigger non-modifier keybinding when typing in input fields', async ({
     comfyPage
   }) => {
-    await comfyPage.registerKeybinding({ key: 'k' }, () => {
-      window['TestCommand'] = true
+    await comfyPage.command.registerKeybinding({ key: 'k' }, () => {
+      window.TestCommand = true
     })
 
     const textBox = comfyPage.widgetTextBox
     await textBox.click()
     await textBox.fill('k')
     await expect(textBox).toHaveValue('k')
-    expect(await comfyPage.page.evaluate(() => window['TestCommand'])).toBe(
+    expect(await comfyPage.page.evaluate(() => window.TestCommand)).toBe(
       undefined
     )
   })
@@ -26,8 +26,8 @@ test.describe('Keybindings', () => {
   test('Should not trigger modifier keybinding when typing in input fields', async ({
     comfyPage
   }) => {
-    await comfyPage.registerKeybinding({ key: 'k', ctrl: true }, () => {
-      window['TestCommand'] = true
+    await comfyPage.command.registerKeybinding({ key: 'k', ctrl: true }, () => {
+      window.TestCommand = true
     })
 
     const textBox = comfyPage.widgetTextBox
@@ -35,23 +35,21 @@ test.describe('Keybindings', () => {
     await textBox.fill('q')
     await textBox.press('Control+k')
     await expect(textBox).toHaveValue('q')
-    expect(await comfyPage.page.evaluate(() => window['TestCommand'])).toBe(
-      true
-    )
+    expect(await comfyPage.page.evaluate(() => window.TestCommand)).toBe(true)
   })
 
   test('Should not trigger keybinding reserved by text input when typing in input fields', async ({
     comfyPage
   }) => {
-    await comfyPage.registerKeybinding({ key: 'Ctrl+v' }, () => {
-      window['TestCommand'] = true
+    await comfyPage.command.registerKeybinding({ key: 'Ctrl+v' }, () => {
+      window.TestCommand = true
     })
 
     const textBox = comfyPage.widgetTextBox
     await textBox.click()
     await textBox.press('Control+v')
     await expect(textBox).toBeFocused()
-    expect(await comfyPage.page.evaluate(() => window['TestCommand'])).toBe(
+    expect(await comfyPage.page.evaluate(() => window.TestCommand)).toBe(
       undefined
     )
   })
diff --git a/browser_tests/tests/litegraphEvent.spec.ts b/browser_tests/tests/litegraphEvent.spec.ts
index 184943fe05..a412200b5e 100644
--- a/browser_tests/tests/litegraphEvent.spec.ts
+++ b/browser_tests/tests/litegraphEvent.spec.ts
@@ -3,7 +3,7 @@ import { expect } from '@playwright/test'
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
 function listenForEvent(): Promise<Event> {
@@ -14,10 +14,10 @@ function listenForEvent(): Promise<Event> {
   })
 }
 
-test.describe('Canvas Event', () => {
+test.describe('Canvas Event', { tag: '@canvas' }, () => {
   test('Emit litegraph:canvas empty-release', async ({ comfyPage }) => {
     const eventPromise = comfyPage.page.evaluate(listenForEvent)
-    const disconnectPromise = comfyPage.disconnectEdge()
+    const disconnectPromise = comfyPage.canvasOps.disconnectEdge()
     const event = await eventPromise
     await disconnectPromise
 
@@ -29,7 +29,7 @@ test.describe('Canvas Event', () => {
 
   test('Emit litegraph:canvas empty-double-click', async ({ comfyPage }) => {
     const eventPromise = comfyPage.page.evaluate(listenForEvent)
-    const doubleClickPromise = comfyPage.doubleClickCanvas()
+    const doubleClickPromise = comfyPage.canvasOps.doubleClick()
     const event = await eventPromise
     await doubleClickPromise
 
diff --git a/browser_tests/tests/loadWorkflowInMedia.spec.ts b/browser_tests/tests/loadWorkflowInMedia.spec.ts
index 3a7f7a71a6..c6011f5a65 100644
--- a/browser_tests/tests/loadWorkflowInMedia.spec.ts
+++ b/browser_tests/tests/loadWorkflowInMedia.spec.ts
@@ -3,49 +3,69 @@ import { expect } from '@playwright/test'
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
-test.describe('Load Workflow in Media', () => {
-  const fileNames = [
-    'workflow.webp',
-    'edited_workflow.webp',
-    'no_workflow.webp',
-    'large_workflow.webp',
-    'workflow_prompt_parameters.png',
-    'workflow.webm',
-    // Skipped due to 3d widget unstable visual result.
-    // 3d widget shows grid after fully loaded.
-    // 'workflow.glb',
-    'workflow.mp4',
-    'workflow.mov',
-    'workflow.m4v',
-    'workflow.svg'
-    // TODO: Re-enable after fixing test asset to use core nodes only
-    // Currently opens missing nodes dialog which is outside scope of AVIF loading functionality
-    // 'workflow.avif'
-  ]
-  fileNames.forEach(async (fileName) => {
-    test(`Load workflow in ${fileName} (drop from filesystem)`, async ({
-      comfyPage
-    }) => {
-      await comfyPage.dragAndDropFile(`workflowInMedia/${fileName}`)
-      await expect(comfyPage.canvas).toHaveScreenshot(`${fileName}.png`)
-    })
-  })
+test.describe(
+  'Load Workflow in Media',
+  { tag: ['@screenshot', '@workflow'] },
+  () => {
+    const fileNames = [
+      'workflow.webp',
+      'edited_workflow.webp',
+      'no_workflow.webp',
+      'large_workflow.webp',
+      'workflow_prompt_parameters.png',
+      'workflow_itxt.png',
+      'workflow.webm',
+      // Skipped due to 3d widget unstable visual result.
+      // 3d widget shows grid after fully loaded.
+      // 'workflow.glb',
+      'workflow.mp4',
+      'workflow.mov',
+      'workflow.m4v',
+      'workflow.svg'
+      // TODO: Re-enable after fixing test asset to use core nodes only
+      // Currently opens missing nodes dialog which is outside scope of AVIF loading functionality
+      // 'workflow.avif'
+    ]
+    const filesWithUpload = new Set(['no_workflow.webp'])
 
-  const urls = [
-    'https://comfyanonymous.github.io/ComfyUI_examples/hidream/hidream_dev_example.png'
-  ]
-  urls.forEach(async (url) => {
-    test(`Load workflow from URL ${url} (drop from different browser tabs)`, async ({
-      comfyPage
-    }) => {
-      await comfyPage.dragAndDropURL(url)
-      const readableName = url.split('/').pop()
-      await expect(comfyPage.canvas).toHaveScreenshot(
-        `dropped_workflow_url_${readableName}.png`
-      )
+    fileNames.forEach(async (fileName) => {
+      test(`Load workflow in ${fileName} (drop from filesystem)`, async ({
+        comfyPage
+      }) => {
+        const shouldUpload = filesWithUpload.has(fileName)
+        const uploadRequestPromise = shouldUpload
+          ? comfyPage.page.waitForRequest((req) =>
+              req.url().includes('/upload/')
+            )
+          : null
+
+        await comfyPage.dragDrop.dragAndDropFile(`workflowInMedia/${fileName}`)
+
+        if (uploadRequestPromise) {
+          const request = await uploadRequestPromise
+          expect(request.url()).toContain('/upload/')
+        } else {
+          await expect(comfyPage.canvas).toHaveScreenshot(`${fileName}.png`)
+        }
+      })
     })
-  })
-})
+
+    const urls = [
+      'https://comfyanonymous.github.io/ComfyUI_examples/hidream/hidream_dev_example.png'
+    ]
+    urls.forEach(async (url) => {
+      test(`Load workflow from URL ${url} (drop from different browser tabs)`, async ({
+        comfyPage
+      }) => {
+        await comfyPage.dragDrop.dragAndDropURL(url)
+        const readableName = url.split('/').pop()
+        await expect(comfyPage.canvas).toHaveScreenshot(
+          `dropped_workflow_url_${readableName}.png`
+        )
+      })
+    })
+  }
+)
diff --git a/browser_tests/tests/loadWorkflowInMedia.spec.ts-snapshots/dropped-workflow-url-hidream-dev-example-png-chromium-linux.png b/browser_tests/tests/loadWorkflowInMedia.spec.ts-snapshots/dropped-workflow-url-hidream-dev-example-png-chromium-linux.png
index 0c57f7db1d..1535c58e45 100644
Binary files a/browser_tests/tests/loadWorkflowInMedia.spec.ts-snapshots/dropped-workflow-url-hidream-dev-example-png-chromium-linux.png and b/browser_tests/tests/loadWorkflowInMedia.spec.ts-snapshots/dropped-workflow-url-hidream-dev-example-png-chromium-linux.png differ
diff --git a/browser_tests/tests/loadWorkflowInMedia.spec.ts-snapshots/no-workflow-webp-chromium-linux.png b/browser_tests/tests/loadWorkflowInMedia.spec.ts-snapshots/no-workflow-webp-chromium-linux.png
index d12cffbe9d..49fbd6ce83 100644
Binary files a/browser_tests/tests/loadWorkflowInMedia.spec.ts-snapshots/no-workflow-webp-chromium-linux.png and b/browser_tests/tests/loadWorkflowInMedia.spec.ts-snapshots/no-workflow-webp-chromium-linux.png differ
diff --git a/browser_tests/tests/loadWorkflowInMedia.spec.ts-snapshots/workflow-itxt-png-chromium-linux.png b/browser_tests/tests/loadWorkflowInMedia.spec.ts-snapshots/workflow-itxt-png-chromium-linux.png
new file mode 100644
index 0000000000..2d007b4e2d
Binary files /dev/null and b/browser_tests/tests/loadWorkflowInMedia.spec.ts-snapshots/workflow-itxt-png-chromium-linux.png differ
diff --git a/browser_tests/tests/lodThreshold.spec.ts b/browser_tests/tests/lodThreshold.spec.ts
index 154ac3c16f..e1bf11dae9 100644
--- a/browser_tests/tests/lodThreshold.spec.ts
+++ b/browser_tests/tests/lodThreshold.spec.ts
@@ -3,19 +3,19 @@ import { expect } from '@playwright/test'
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
-test.describe('LOD Threshold', () => {
+test.describe('LOD Threshold', { tag: ['@screenshot', '@canvas'] }, () => {
   test('Should switch to low quality mode at correct zoom threshold', async ({
     comfyPage
   }) => {
     // Load a workflow with some nodes to render
-    await comfyPage.loadWorkflow('default')
+    await comfyPage.workflow.loadWorkflow('default')
 
     // Get initial LOD state and settings
     const initialState = await comfyPage.page.evaluate(() => {
-      const canvas = window['app'].canvas
+      const canvas = window.app!.canvas
       return {
         lowQuality: canvas.low_quality,
         scale: canvas.ds.scale,
@@ -32,11 +32,11 @@ test.describe('LOD Threshold', () => {
     // Can't access private _lowQualityZoomThreshold directly
 
     // Zoom out just above threshold (should still be high quality)
-    await comfyPage.zoom(120, 5) // Zoom out 5 steps
+    await comfyPage.canvasOps.zoom(120, 5) // Zoom out 5 steps
     await comfyPage.nextFrame()
 
     const aboveThresholdState = await comfyPage.page.evaluate(() => {
-      const canvas = window['app'].canvas
+      const canvas = window.app!.canvas
       return {
         lowQuality: canvas.low_quality,
         scale: canvas.ds.scale
@@ -49,12 +49,12 @@ test.describe('LOD Threshold', () => {
     }
 
     // Zoom out more to trigger LOD (below threshold)
-    await comfyPage.zoom(120, 5) // Zoom out 5 more steps
+    await comfyPage.canvasOps.zoom(120, 5) // Zoom out 5 more steps
     await comfyPage.nextFrame()
 
     // Check that LOD is now active
     const zoomedOutState = await comfyPage.page.evaluate(() => {
-      const canvas = window['app'].canvas
+      const canvas = window.app!.canvas
       return {
         lowQuality: canvas.low_quality,
         scale: canvas.ds.scale
@@ -65,12 +65,12 @@ test.describe('LOD Threshold', () => {
     expect(zoomedOutState.lowQuality).toBe(true)
 
     // Zoom back in to disable LOD (above threshold)
-    await comfyPage.zoom(-120, 15) // Zoom in 15 steps
+    await comfyPage.canvasOps.zoom(-120, 15) // Zoom in 15 steps
     await comfyPage.nextFrame()
 
     // Check that LOD is now inactive
     const zoomedInState = await comfyPage.page.evaluate(() => {
-      const canvas = window['app'].canvas
+      const canvas = window.app!.canvas
       return {
         lowQuality: canvas.low_quality,
         scale: canvas.ds.scale
@@ -84,14 +84,17 @@ test.describe('LOD Threshold', () => {
   test('Should update threshold when font size setting changes', async ({
     comfyPage
   }) => {
-    await comfyPage.loadWorkflow('default')
+    await comfyPage.workflow.loadWorkflow('default')
 
     // Change the font size setting to 14px (more aggressive LOD)
-    await comfyPage.setSetting('LiteGraph.Canvas.MinFontSizeForLOD', 14)
+    await comfyPage.settings.setSetting(
+      'LiteGraph.Canvas.MinFontSizeForLOD',
+      14
+    )
 
     // Check that font size updated
     const newState = await comfyPage.page.evaluate(() => {
-      const canvas = window['app'].canvas
+      const canvas = window.app!.canvas
       return {
         minFontSize: canvas.min_font_size_for_lod
       }
@@ -102,16 +105,16 @@ test.describe('LOD Threshold', () => {
 
     // At default zoom, LOD should still be inactive (scale is exactly 1.0, not less than)
     const lodState = await comfyPage.page.evaluate(() => {
-      return window['app'].canvas.low_quality
+      return window.app!.canvas.low_quality
     })
     expect(lodState).toBe(false)
 
     // Zoom out slightly to trigger LOD
-    await comfyPage.zoom(120, 1) // Zoom out 1 step
+    await comfyPage.canvasOps.zoom(120, 1) // Zoom out 1 step
     await comfyPage.nextFrame()
 
     const afterZoom = await comfyPage.page.evaluate(() => {
-      const canvas = window['app'].canvas
+      const canvas = window.app!.canvas
       return {
         lowQuality: canvas.low_quality,
         scale: canvas.ds.scale
@@ -125,18 +128,18 @@ test.describe('LOD Threshold', () => {
   test('Should disable LOD when font size is set to 0', async ({
     comfyPage
   }) => {
-    await comfyPage.loadWorkflow('default')
+    await comfyPage.workflow.loadWorkflow('default')
 
     // Disable LOD by setting font size to 0
-    await comfyPage.setSetting('LiteGraph.Canvas.MinFontSizeForLOD', 0)
+    await comfyPage.settings.setSetting('LiteGraph.Canvas.MinFontSizeForLOD', 0)
 
     // Zoom out significantly
-    await comfyPage.zoom(120, 20) // Zoom out 20 steps
+    await comfyPage.canvasOps.zoom(120, 20) // Zoom out 20 steps
     await comfyPage.nextFrame()
 
     // LOD should remain disabled even at very low zoom
     const state = await comfyPage.page.evaluate(() => {
-      const canvas = window['app'].canvas
+      const canvas = window.app!.canvas
       return {
         lowQuality: canvas.low_quality,
         scale: canvas.ds.scale,
@@ -149,53 +152,58 @@ test.describe('LOD Threshold', () => {
     expect(state.scale).toBeLessThan(0.2) // Very zoomed out
   })
 
-  test('Should show visual difference between LOD on and off', async ({
-    comfyPage
-  }) => {
-    // Load a workflow with text-heavy nodes for clear visual difference
-    await comfyPage.loadWorkflow('default')
+  test(
+    'Should show visual difference between LOD on and off',
+    { tag: '@screenshot' },
+    async ({ comfyPage }) => {
+      // Load a workflow with text-heavy nodes for clear visual difference
+      await comfyPage.workflow.loadWorkflow('default')
 
-    // Set zoom level clearly below the threshold to ensure LOD activates
-    const targetZoom = 0.4 // Well below default threshold of ~0.571
+      // Set zoom level clearly below the threshold to ensure LOD activates
+      const targetZoom = 0.4 // Well below default threshold of ~0.571
 
-    // Zoom to target level
-    await comfyPage.page.evaluate((zoom) => {
-      window['app'].canvas.ds.scale = zoom
-      window['app'].canvas.setDirty(true, true)
-    }, targetZoom)
-    await comfyPage.nextFrame()
+      // Zoom to target level
+      await comfyPage.page.evaluate((zoom) => {
+        window.app!.canvas.ds.scale = zoom
+        window.app!.canvas.setDirty(true, true)
+      }, targetZoom)
+      await comfyPage.nextFrame()
 
-    // Take snapshot with LOD active (default 8px setting)
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'lod-comparison-low-quality.png'
-    )
+      // Take snapshot with LOD active (default 8px setting)
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'lod-comparison-low-quality.png'
+      )
 
-    const lowQualityState = await comfyPage.page.evaluate(() => {
-      const canvas = window['app'].canvas
-      return {
-        lowQuality: canvas.low_quality,
-        scale: canvas.ds.scale
-      }
-    })
-    expect(lowQualityState.lowQuality).toBe(true)
+      const lowQualityState = await comfyPage.page.evaluate(() => {
+        const canvas = window.app!.canvas
+        return {
+          lowQuality: canvas.low_quality,
+          scale: canvas.ds.scale
+        }
+      })
+      expect(lowQualityState.lowQuality).toBe(true)
 
-    // Disable LOD to see high quality at same zoom
-    await comfyPage.setSetting('LiteGraph.Canvas.MinFontSizeForLOD', 0)
-    await comfyPage.nextFrame()
+      // Disable LOD to see high quality at same zoom
+      await comfyPage.settings.setSetting(
+        'LiteGraph.Canvas.MinFontSizeForLOD',
+        0
+      )
+      await comfyPage.nextFrame()
 
-    // Take snapshot with LOD disabled (full quality at same zoom)
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'lod-comparison-high-quality.png'
-    )
+      // Take snapshot with LOD disabled (full quality at same zoom)
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'lod-comparison-high-quality.png'
+      )
 
-    const highQualityState = await comfyPage.page.evaluate(() => {
-      const canvas = window['app'].canvas
-      return {
-        lowQuality: canvas.low_quality,
-        scale: canvas.ds.scale
-      }
-    })
-    expect(highQualityState.lowQuality).toBe(false)
-    expect(highQualityState.scale).toBeCloseTo(targetZoom, 2)
-  })
+      const highQualityState = await comfyPage.page.evaluate(() => {
+        const canvas = window.app!.canvas
+        return {
+          lowQuality: canvas.low_quality,
+          scale: canvas.ds.scale
+        }
+      })
+      expect(highQualityState.lowQuality).toBe(false)
+      expect(highQualityState.scale).toBeCloseTo(targetZoom, 2)
+    }
+  )
 })
diff --git a/browser_tests/tests/menu.spec.ts b/browser_tests/tests/menu.spec.ts
index 2c3ffb3d46..d5d64dd0a9 100644
--- a/browser_tests/tests/menu.spec.ts
+++ b/browser_tests/tests/menu.spec.ts
@@ -2,16 +2,16 @@ import { expect } from '@playwright/test'
 
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
-test.describe('Menu', () => {
+test.describe('Menu', { tag: '@ui' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
   })
 
   test('Can register sidebar tab', async ({ comfyPage }) => {
     const initialChildrenCount = await comfyPage.menu.buttons.count()
 
     await comfyPage.page.evaluate(async () => {
-      window['app'].extensionManager.registerSidebarTab({
+      window.app!.extensionManager.registerSidebarTab({
         id: 'search',
         icon: 'pi pi-search',
         title: 'search',
@@ -30,11 +30,11 @@ test.describe('Menu', () => {
 
   test.describe('Workflows topbar tabs', () => {
     test.beforeEach(async ({ comfyPage }) => {
-      await comfyPage.setSetting(
+      await comfyPage.settings.setSetting(
         'Comfy.Workflow.WorkflowTabsPosition',
         'Topbar'
       )
-      await comfyPage.setupWorkflowsDirectory({})
+      await comfyPage.workflow.setupWorkflowsDirectory({})
     })
 
     test('Can show opened workflows', async ({ comfyPage }) => {
@@ -101,13 +101,12 @@ test.describe('Menu', () => {
       const checkmark = bottomPanelMenuItem.locator('.pi-check')
 
       // Check initial state of bottom panel (it's initially hidden)
-      const bottomPanel = comfyPage.page.locator('.bottom-panel')
-      await expect(bottomPanel).not.toBeVisible()
+      const { bottomPanel } = comfyPage
+      await expect(bottomPanel.root).not.toBeVisible()
 
       // Checkmark should be invisible initially (panel is hidden)
       await expect(checkmark).toHaveClass(/invisible/)
 
-      // Click Bottom Panel to toggle it on
       await bottomPanelItem.click()
 
       // Verify menu is still visible after clicking
@@ -115,7 +114,7 @@ test.describe('Menu', () => {
       await expect(viewSubmenu).toBeVisible()
 
       // Verify bottom panel is now visible
-      await expect(bottomPanel).toBeVisible()
+      await expect(bottomPanel.root).toBeVisible()
 
       // Checkmark should now be visible (panel is shown)
       await expect(checkmark).not.toHaveClass(/invisible/)
@@ -128,13 +127,16 @@ test.describe('Menu', () => {
       await expect(viewSubmenu).toBeVisible()
 
       // Verify bottom panel is hidden again
-      await expect(bottomPanel).not.toBeVisible()
+      await expect(bottomPanel.root).not.toBeVisible()
 
       // Checkmark should be invisible again (panel is hidden)
       await expect(checkmark).toHaveClass(/invisible/)
 
-      // Click outside to close menu
-      await comfyPage.page.locator('body').click({ position: { x: 10, y: 10 } })
+      // Click in top-right corner to close menu (avoid hamburger menu at top-left)
+      const viewport = comfyPage.page.viewportSize()!
+      await comfyPage.page
+        .locator('body')
+        .click({ position: { x: viewport.width - 10, y: 10 } })
 
       // Verify menu is now closed
       await expect(menu).not.toBeVisible()
@@ -152,7 +154,7 @@ test.describe('Menu', () => {
 
     test('Can catch error when executing command', async ({ comfyPage }) => {
       await comfyPage.page.evaluate(() => {
-        window['app'].registerExtension({
+        window.app!.registerExtension({
           name: 'TestExtension1',
           commands: [
             {
@@ -172,7 +174,7 @@ test.describe('Menu', () => {
         })
       })
       await comfyPage.menu.topbar.triggerTopbarCommand(['ext', 'foo-command'])
-      expect(await comfyPage.getVisibleToastCount()).toBe(1)
+      await expect.poll(() => comfyPage.toast.getVisibleToastCount()).toBe(1)
     })
 
     test('Can navigate Theme menu and switch between Dark and Light themes', async ({
@@ -201,17 +203,19 @@ test.describe('Menu', () => {
       await topbar.switchTheme('light')
 
       // Verify menu stays open and Light theme shows as active
-      await expect(menu).toBeVisible()
-      await expect(themeSubmenu).toBeVisible()
-
-      // Check that Light theme is active
-      expect(await topbar.isMenuItemActive(lightThemeItem)).toBe(true)
+      await expect(async () => {
+        await expect(menu).toBeVisible()
+        await expect(themeSubmenu).toBeVisible()
+        expect(await topbar.isMenuItemActive(lightThemeItem)).toBe(true)
+      }).toPass({ timeout: 5000 })
 
       // Screenshot with light theme active
       await comfyPage.attachScreenshot('theme-menu-light-active')
 
       // Verify ColorPalette setting is set to "light"
-      expect(await comfyPage.getSetting('Comfy.ColorPalette')).toBe('light')
+      await expect
+        .poll(() => comfyPage.settings.getSetting('Comfy.ColorPalette'))
+        .toBe('light')
 
       // Close menu to see theme change
       await topbar.closeTopbarMenu()
@@ -224,18 +228,22 @@ test.describe('Menu', () => {
       await topbar.switchTheme('dark')
 
       // Verify menu stays open and Dark theme shows as active
-      await expect(menu).toBeVisible()
-      await expect(themeItems2.submenu).toBeVisible()
-
-      // Check that Dark theme is active and Light theme is not
-      expect(await topbar.isMenuItemActive(themeItems2.darkTheme)).toBe(true)
-      expect(await topbar.isMenuItemActive(themeItems2.lightTheme)).toBe(false)
+      await expect(async () => {
+        await expect(menu).toBeVisible()
+        await expect(themeItems2.submenu).toBeVisible()
+        expect(await topbar.isMenuItemActive(themeItems2.darkTheme)).toBe(true)
+        expect(await topbar.isMenuItemActive(themeItems2.lightTheme)).toBe(
+          false
+        )
+      }).toPass({ timeout: 5000 })
 
       // Screenshot with dark theme active
       await comfyPage.attachScreenshot('theme-menu-dark-active')
 
       // Verify ColorPalette setting is set to "dark"
-      expect(await comfyPage.getSetting('Comfy.ColorPalette')).toBe('dark')
+      await expect
+        .poll(() => comfyPage.settings.getSetting('Comfy.ColorPalette'))
+        .toBe('dark')
 
       // Close menu
       await topbar.closeTopbarMenu()
@@ -248,16 +256,20 @@ test.describe('Menu', () => {
     test(`Can migrate deprecated menu positions (${position})`, async ({
       comfyPage
     }) => {
-      await comfyPage.setSetting('Comfy.UseNewMenu', position)
-      expect(await comfyPage.getSetting('Comfy.UseNewMenu')).toBe('Top')
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', position)
+      expect(await comfyPage.settings.getSetting('Comfy.UseNewMenu')).toBe(
+        'Top'
+      )
     })
 
     test(`Can migrate deprecated menu positions on initial load (${position})`, async ({
       comfyPage
     }) => {
-      await comfyPage.setSetting('Comfy.UseNewMenu', position)
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', position)
       await comfyPage.setup()
-      expect(await comfyPage.getSetting('Comfy.UseNewMenu')).toBe('Top')
+      expect(await comfyPage.settings.getSetting('Comfy.UseNewMenu')).toBe(
+        'Top'
+      )
     })
   })
 })
diff --git a/browser_tests/tests/minimap.spec.ts b/browser_tests/tests/minimap.spec.ts
index cea5fe9a80..175d5324d3 100644
--- a/browser_tests/tests/minimap.spec.ts
+++ b/browser_tests/tests/minimap.spec.ts
@@ -1,16 +1,15 @@
 import { expect } from '@playwright/test'
 
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+import { TestIds } from '../fixtures/selectors'
 
-test.describe('Minimap', () => {
+test.describe('Minimap', { tag: '@canvas' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
-    await comfyPage.setSetting('Comfy.Minimap.Visible', true)
-    await comfyPage.setSetting('Comfy.Graph.CanvasMenu', true)
-    await comfyPage.loadWorkflow('default')
-    await comfyPage.page.waitForFunction(
-      () => window['app'] && window['app'].canvas
-    )
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting('Comfy.Minimap.Visible', true)
+    await comfyPage.settings.setSetting('Comfy.Graph.CanvasMenu', true)
+    await comfyPage.workflow.loadWorkflow('default')
+    await comfyPage.page.waitForFunction(() => window.app && window.app.canvas)
   })
 
   test('Validate minimap is visible by default', async ({ comfyPage }) => {
@@ -35,7 +34,9 @@ test.describe('Minimap', () => {
   })
 
   test('Validate minimap toggle button state', async ({ comfyPage }) => {
-    const toggleButton = comfyPage.page.getByTestId('toggle-minimap-button')
+    const toggleButton = comfyPage.page.getByTestId(
+      TestIds.canvas.toggleMinimapButton
+    )
 
     await expect(toggleButton).toBeVisible()
 
@@ -45,7 +46,9 @@ test.describe('Minimap', () => {
 
   test('Validate minimap can be toggled off and on', async ({ comfyPage }) => {
     const minimapContainer = comfyPage.page.locator('.litegraph-minimap')
-    const toggleButton = comfyPage.page.getByTestId('toggle-minimap-button')
+    const toggleButton = comfyPage.page.getByTestId(
+      TestIds.canvas.toggleMinimapButton
+    )
 
     await expect(minimapContainer).toBeVisible()
 
diff --git a/browser_tests/tests/mobileBaseline.spec.ts b/browser_tests/tests/mobileBaseline.spec.ts
index 21be3ca949..1b7b7e4d59 100644
--- a/browser_tests/tests/mobileBaseline.spec.ts
+++ b/browser_tests/tests/mobileBaseline.spec.ts
@@ -1,29 +1,43 @@
-import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 import { expect } from '@playwright/test'
 
-test.describe('Mobile Baseline Snapshots', () => {
-  test('@mobile empty canvas', async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.ConfirmClear', false)
-    await comfyPage.executeCommand('Comfy.ClearWorkflow')
-    await expect(async () => {
-      expect(await comfyPage.getGraphNodesCount()).toBe(0)
-    }).toPass({ timeout: 256 })
-    await comfyPage.nextFrame()
-    await expect(comfyPage.canvas).toHaveScreenshot('mobile-empty-canvas.png')
-  })
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+import { TestIds } from '../fixtures/selectors'
 
-  test('@mobile default workflow', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('default')
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'mobile-default-workflow.png'
-    )
-  })
+test.describe(
+  'Mobile Baseline Snapshots',
+  { tag: ['@mobile', '@screenshot'] },
+  () => {
+    test('@mobile empty canvas', async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.ConfirmClear', false)
+      await comfyPage.command.executeCommand('Comfy.ClearWorkflow')
+      await expect(async () => {
+        expect(await comfyPage.nodeOps.getGraphNodesCount()).toBe(0)
+      }).toPass({ timeout: 5000 })
+      await comfyPage.nextFrame()
+      await expect(comfyPage.canvas).toHaveScreenshot('mobile-empty-canvas.png')
+    })
 
-  test('@mobile settings dialog', async ({ comfyPage }) => {
-    await comfyPage.settingDialog.open()
-    await comfyPage.nextFrame()
-    await expect(comfyPage.settingDialog.root).toHaveScreenshot(
-      'mobile-settings-dialog.png'
-    )
-  })
-})
+    test('@mobile default workflow', async ({ comfyPage }) => {
+      await comfyPage.workflow.loadWorkflow('default')
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'mobile-default-workflow.png'
+      )
+    })
+
+    test('@mobile settings dialog', async ({ comfyPage }) => {
+      await comfyPage.settingDialog.open()
+      await comfyPage.nextFrame()
+
+      await expect(comfyPage.settingDialog.root).toHaveScreenshot(
+        'mobile-settings-dialog.png',
+        {
+          mask: [
+            comfyPage.settingDialog.root.getByTestId(
+              TestIds.user.currentUserIndicator
+            )
+          ]
+        }
+      )
+    })
+  }
+)
diff --git a/browser_tests/tests/mobileBaseline.spec.ts-snapshots/mobile-default-workflow-mobile-chrome-linux.png b/browser_tests/tests/mobileBaseline.spec.ts-snapshots/mobile-default-workflow-mobile-chrome-linux.png
index b24b687297..79d099a6ee 100644
Binary files a/browser_tests/tests/mobileBaseline.spec.ts-snapshots/mobile-default-workflow-mobile-chrome-linux.png and b/browser_tests/tests/mobileBaseline.spec.ts-snapshots/mobile-default-workflow-mobile-chrome-linux.png differ
diff --git a/browser_tests/tests/mobileBaseline.spec.ts-snapshots/mobile-empty-canvas-mobile-chrome-linux.png b/browser_tests/tests/mobileBaseline.spec.ts-snapshots/mobile-empty-canvas-mobile-chrome-linux.png
index db09fd07ac..f13815de0b 100644
Binary files a/browser_tests/tests/mobileBaseline.spec.ts-snapshots/mobile-empty-canvas-mobile-chrome-linux.png and b/browser_tests/tests/mobileBaseline.spec.ts-snapshots/mobile-empty-canvas-mobile-chrome-linux.png differ
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 207d037bf0..71d6ea44e0 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 111efe29cf..873ac10058 100644
--- a/browser_tests/tests/nodeBadge.spec.ts
+++ b/browser_tests/tests/nodeBadge.spec.ts
@@ -5,14 +5,14 @@ import { NodeBadgeMode } from '../../src/types/nodeSource'
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
-test.describe('Node Badge', () => {
+test.describe('Node Badge', { tag: ['@screenshot', '@smoke', '@node'] }, () => {
   test('Can add badge', async ({ comfyPage }) => {
     await comfyPage.page.evaluate(() => {
-      const LGraphBadge = window['LGraphBadge']
-      const app = window['app'] as ComfyApp
+      const LGraphBadge = window.LGraphBadge!
+      const app = window.app as ComfyApp
       const graph = app.graph
       const nodes = graph.nodes
 
@@ -28,8 +28,8 @@ test.describe('Node Badge', () => {
 
   test('Can add multiple badges', async ({ comfyPage }) => {
     await comfyPage.page.evaluate(() => {
-      const LGraphBadge = window['LGraphBadge']
-      const app = window['app'] as ComfyApp
+      const LGraphBadge = window.LGraphBadge!
+      const app = window.app as ComfyApp
       const graph = app.graph
       const nodes = graph.nodes
 
@@ -48,8 +48,8 @@ test.describe('Node Badge', () => {
 
   test('Can add badge left-side', async ({ comfyPage }) => {
     await comfyPage.page.evaluate(() => {
-      const LGraphBadge = window['LGraphBadge']
-      const app = window['app'] as ComfyApp
+      const LGraphBadge = window.LGraphBadge!
+      const app = window.app as ComfyApp
       const graph = app.graph
       const nodes = graph.nodes
 
@@ -66,50 +66,66 @@ test.describe('Node Badge', () => {
   })
 })
 
-test.describe('Node source badge', () => {
-  Object.values(NodeBadgeMode).forEach(async (mode) => {
-    test(`Shows node badges (${mode})`, async ({ comfyPage }) => {
-      // Execution error workflow has both custom node and core node.
-      await comfyPage.loadWorkflow('nodes/execution_error')
-      await comfyPage.setSetting('Comfy.NodeBadge.NodeSourceBadgeMode', mode)
-      await comfyPage.setSetting('Comfy.NodeBadge.NodeIdBadgeMode', mode)
-      await comfyPage.nextFrame()
-      await comfyPage.resetView()
-      await expect(comfyPage.canvas).toHaveScreenshot(`node-badge-${mode}.png`)
+test.describe(
+  'Node source badge',
+  { tag: ['@screenshot', '@smoke', '@node'] },
+  () => {
+    Object.values(NodeBadgeMode).forEach(async (mode) => {
+      test(`Shows node badges (${mode})`, async ({ comfyPage }) => {
+        // Execution error workflow has both custom node and core node.
+        await comfyPage.workflow.loadWorkflow('nodes/execution_error')
+        await comfyPage.settings.setSetting(
+          'Comfy.NodeBadge.NodeSourceBadgeMode',
+          mode
+        )
+        await comfyPage.settings.setSetting(
+          'Comfy.NodeBadge.NodeIdBadgeMode',
+          mode
+        )
+        await comfyPage.nextFrame()
+        await comfyPage.canvasOps.resetView()
+        await expect(comfyPage.canvas).toHaveScreenshot(
+          `node-badge-${mode}.png`
+        )
+      })
     })
-  })
-})
+  }
+)
 
-test.describe('Node badge color', () => {
-  test('Can show node badge with unknown color palette', async ({
-    comfyPage
-  }) => {
-    await comfyPage.setSetting(
-      'Comfy.NodeBadge.NodeIdBadgeMode',
-      NodeBadgeMode.ShowAll
-    )
-    await comfyPage.setSetting('Comfy.ColorPalette', 'unknown')
-    await comfyPage.nextFrame()
-    // Click empty space to trigger canvas re-render.
-    await comfyPage.clickEmptySpace()
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'node-badge-unknown-color-palette.png'
-    )
-  })
+test.describe(
+  'Node badge color',
+  { tag: ['@screenshot', '@smoke', '@node'] },
+  () => {
+    test('Can show node badge with unknown color palette', async ({
+      comfyPage
+    }) => {
+      await comfyPage.settings.setSetting(
+        'Comfy.NodeBadge.NodeIdBadgeMode',
+        NodeBadgeMode.ShowAll
+      )
+      await comfyPage.settings.setSetting('Comfy.ColorPalette', 'unknown')
+      await comfyPage.nextFrame()
+      // Click empty space to trigger canvas re-render.
+      await comfyPage.canvasOps.clickEmptySpace()
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'node-badge-unknown-color-palette.png'
+      )
+    })
 
-  test('Can show node badge with light color palette', async ({
-    comfyPage
-  }) => {
-    await comfyPage.setSetting(
-      'Comfy.NodeBadge.NodeIdBadgeMode',
-      NodeBadgeMode.ShowAll
-    )
-    await comfyPage.setSetting('Comfy.ColorPalette', 'light')
-    await comfyPage.nextFrame()
-    // Click empty space to trigger canvas re-render.
-    await comfyPage.clickEmptySpace()
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'node-badge-light-color-palette.png'
-    )
-  })
-})
+    test('Can show node badge with light color palette', async ({
+      comfyPage
+    }) => {
+      await comfyPage.settings.setSetting(
+        'Comfy.NodeBadge.NodeIdBadgeMode',
+        NodeBadgeMode.ShowAll
+      )
+      await comfyPage.settings.setSetting('Comfy.ColorPalette', 'light')
+      await comfyPage.nextFrame()
+      // Click empty space to trigger canvas re-render.
+      await comfyPage.canvasOps.clickEmptySpace()
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'node-badge-light-color-palette.png'
+      )
+    })
+  }
+)
diff --git a/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-badge-Hide-built-in-chromium-linux.png b/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-badge-Hide-built-in-chromium-linux.png
index 7a2293ae15..467bce51fe 100644
Binary files a/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-badge-Hide-built-in-chromium-linux.png and b/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-badge-Hide-built-in-chromium-linux.png differ
diff --git a/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-badge-Show-all-chromium-linux.png b/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-badge-Show-all-chromium-linux.png
index 8eb1320a83..d13b7dab3a 100644
Binary files a/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-badge-Show-all-chromium-linux.png and b/browser_tests/tests/nodeBadge.spec.ts-snapshots/node-badge-Show-all-chromium-linux.png differ
diff --git a/browser_tests/tests/nodeDisplay.spec.ts b/browser_tests/tests/nodeDisplay.spec.ts
index fdaae14bcb..061419838e 100644
--- a/browser_tests/tests/nodeDisplay.spec.ts
+++ b/browser_tests/tests/nodeDisplay.spec.ts
@@ -3,40 +3,40 @@ import { expect } from '@playwright/test'
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
 // If an input is optional by node definition, it should be shown as
 // a hollow circle no matter what shape it was defined in the workflow JSON.
-test.describe('Optional input', () => {
+test.describe('Optional input', { tag: ['@screenshot', '@node'] }, () => {
   test('No shape specified', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('inputs/optional_input_no_shape')
+    await comfyPage.workflow.loadWorkflow('inputs/optional_input_no_shape')
     await expect(comfyPage.canvas).toHaveScreenshot('optional_input.png')
   })
 
   test('Wrong shape specified', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('inputs/optional_input_wrong_shape')
+    await comfyPage.workflow.loadWorkflow('inputs/optional_input_wrong_shape')
     await expect(comfyPage.canvas).toHaveScreenshot('optional_input.png')
   })
 
   test('Correct shape specified', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('inputs/optional_input_correct_shape')
+    await comfyPage.workflow.loadWorkflow('inputs/optional_input_correct_shape')
     await expect(comfyPage.canvas).toHaveScreenshot('optional_input.png')
   })
 
   test('Force input', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('inputs/force_input')
+    await comfyPage.workflow.loadWorkflow('inputs/force_input')
     await expect(comfyPage.canvas).toHaveScreenshot('force_input.png')
   })
 
   test('Default input', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('inputs/default_input')
+    await comfyPage.workflow.loadWorkflow('inputs/default_input')
     await expect(comfyPage.canvas).toHaveScreenshot('default_input.png')
   })
 
   test('Only optional inputs', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('inputs/only_optional_inputs')
-    expect(await comfyPage.getGraphNodesCount()).toBe(1)
+    await comfyPage.workflow.loadWorkflow('inputs/only_optional_inputs')
+    expect(await comfyPage.nodeOps.getGraphNodesCount()).toBe(1)
     await expect(
       comfyPage.page.locator('.comfy-missing-nodes')
     ).not.toBeVisible()
@@ -47,37 +47,45 @@ test.describe('Optional input', () => {
     )
   })
   test('Old workflow with converted input', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('inputs/old_workflow_converted_input')
-    const node = await comfyPage.getNodeRefById('1')
-    const inputs = await node.getProperty('inputs')
+    await comfyPage.workflow.loadWorkflow('inputs/old_workflow_converted_input')
+    const node = await comfyPage.nodeOps.getNodeRefById('1')
+    const inputs = (await node.getProperty('inputs')) as {
+      name: string
+      link?: number | null
+    }[]
     const vaeInput = inputs.find((w) => w.name === 'vae')
     const convertedInput = inputs.find((w) => w.name === 'strength')
 
     expect(vaeInput).toBeDefined()
     expect(convertedInput).toBeDefined()
-    expect(vaeInput.link).toBeNull()
-    expect(convertedInput.link).not.toBeNull()
+    expect(vaeInput!.link).toBeNull()
+    expect(convertedInput!.link).not.toBeNull()
   })
   test('Renamed converted input', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('inputs/renamed_converted_widget')
-    const node = await comfyPage.getNodeRefById('3')
-    const inputs = await node.getProperty('inputs')
+    await comfyPage.workflow.loadWorkflow('inputs/renamed_converted_widget')
+    const node = await comfyPage.nodeOps.getNodeRefById('3')
+    const inputs = (await node.getProperty('inputs')) as { name: string }[]
     const renamedInput = inputs.find((w) => w.name === 'breadth')
     expect(renamedInput).toBeUndefined()
   })
   test('slider', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('inputs/simple_slider')
+    await comfyPage.workflow.loadWorkflow('inputs/simple_slider')
     await expect(comfyPage.canvas).toHaveScreenshot('simple_slider.png')
   })
   test('unknown converted widget', async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.Workflow.ShowMissingNodesWarning', false)
-    await comfyPage.loadWorkflow('missing/missing_nodes_converted_widget')
+    await comfyPage.settings.setSetting(
+      'Comfy.Workflow.ShowMissingNodesWarning',
+      false
+    )
+    await comfyPage.workflow.loadWorkflow(
+      'missing/missing_nodes_converted_widget'
+    )
     await expect(comfyPage.canvas).toHaveScreenshot(
       'missing_nodes_converted_widget.png'
     )
   })
   test('dynamically added input', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('inputs/dynamically_added_input')
+    await comfyPage.workflow.loadWorkflow('inputs/dynamically_added_input')
     await expect(comfyPage.canvas).toHaveScreenshot(
       'dynamically_added_input.png'
     )
diff --git a/browser_tests/tests/nodeGhostPlacement.spec.ts b/browser_tests/tests/nodeGhostPlacement.spec.ts
new file mode 100644
index 0000000000..bac11bc6c7
--- /dev/null
+++ b/browser_tests/tests/nodeGhostPlacement.spec.ts
@@ -0,0 +1,162 @@
+import {
+  comfyExpect as expect,
+  comfyPageFixture as test
+} from '../fixtures/ComfyPage'
+
+type ComfyPage = Parameters<Parameters<typeof test>[2]>[0]['comfyPage']
+
+async function setVueMode(comfyPage: ComfyPage, enabled: boolean) {
+  await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', enabled)
+  if (enabled) {
+    await comfyPage.vueNodes.waitForNodes()
+  }
+}
+
+async function addGhostAtCenter(comfyPage: ComfyPage) {
+  await comfyPage.command.executeCommand('Comfy.NewBlankWorkflow')
+  await comfyPage.nextFrame()
+
+  const viewport = comfyPage.page.viewportSize()!
+  const centerX = Math.round(viewport.width / 2)
+  const centerY = Math.round(viewport.height / 2)
+
+  await comfyPage.page.mouse.move(centerX, centerY)
+  await comfyPage.nextFrame()
+
+  const nodeId = await comfyPage.page.evaluate(
+    ([clientX, clientY]) => {
+      const node = window.LiteGraph!.createNode('VAEDecode')!
+      const event = new MouseEvent('click', { clientX, clientY })
+      window.app!.graph.add(node, { ghost: true, dragEvent: event })
+      return node.id
+    },
+    [centerX, centerY] as const
+  )
+  await comfyPage.nextFrame()
+
+  return { nodeId, centerX, centerY }
+}
+
+function getNodeById(comfyPage: ComfyPage, nodeId: number | string) {
+  return comfyPage.page.evaluate((id) => {
+    const node = window.app!.graph.getNodeById(id)
+    if (!node) return null
+    return { ghost: !!node.flags.ghost }
+  }, nodeId)
+}
+
+for (const mode of ['litegraph', 'vue'] as const) {
+  test.describe(`Ghost node placement (${mode} mode)`, () => {
+    test.beforeEach(async ({ comfyPage }) => {
+      await setVueMode(comfyPage, mode === 'vue')
+    })
+
+    test('positions ghost node at cursor', async ({ comfyPage }) => {
+      await comfyPage.command.executeCommand('Comfy.NewBlankWorkflow')
+      await comfyPage.nextFrame()
+
+      const viewport = comfyPage.page.viewportSize()!
+      const centerX = Math.round(viewport.width / 2)
+      const centerY = Math.round(viewport.height / 2)
+
+      await comfyPage.page.mouse.move(centerX, centerY)
+      await comfyPage.nextFrame()
+
+      const result = await comfyPage.page.evaluate(
+        ([clientX, clientY]) => {
+          const node = window.LiteGraph!.createNode('VAEDecode')!
+          const event = new MouseEvent('click', { clientX, clientY })
+          window.app!.graph.add(node, { ghost: true, dragEvent: event })
+
+          const canvas = window.app!.canvas
+          const rect = canvas.canvas.getBoundingClientRect()
+          const cursorCanvasX =
+            (clientX - rect.left) / canvas.ds.scale - canvas.ds.offset[0]
+          const cursorCanvasY =
+            (clientY - rect.top) / canvas.ds.scale - canvas.ds.offset[1]
+
+          return {
+            diffX: node.pos[0] + node.size[0] / 2 - cursorCanvasX,
+            diffY: node.pos[1] - 10 - cursorCanvasY
+          }
+        },
+        [centerX, centerY] as const
+      )
+      await comfyPage.nextFrame()
+
+      expect(Math.abs(result.diffX)).toBeLessThan(5)
+      expect(Math.abs(result.diffY)).toBeLessThan(5)
+    })
+
+    test('left-click confirms ghost placement', async ({ comfyPage }) => {
+      const { nodeId, centerX, centerY } = await addGhostAtCenter(comfyPage)
+
+      const before = await getNodeById(comfyPage, nodeId)
+      expect(before).not.toBeNull()
+      expect(before!.ghost).toBe(true)
+
+      await comfyPage.page.mouse.click(centerX, centerY)
+      await comfyPage.nextFrame()
+
+      const after = await getNodeById(comfyPage, nodeId)
+      expect(after).not.toBeNull()
+      expect(after!.ghost).toBe(false)
+    })
+
+    test('Escape cancels ghost placement', async ({ comfyPage }) => {
+      const { nodeId } = await addGhostAtCenter(comfyPage)
+
+      const before = await getNodeById(comfyPage, nodeId)
+      expect(before).not.toBeNull()
+      expect(before!.ghost).toBe(true)
+
+      await comfyPage.page.keyboard.press('Escape')
+      await comfyPage.nextFrame()
+
+      const after = await getNodeById(comfyPage, nodeId)
+      expect(after).toBeNull()
+    })
+
+    test('Delete cancels ghost placement', async ({ comfyPage }) => {
+      const { nodeId } = await addGhostAtCenter(comfyPage)
+
+      const before = await getNodeById(comfyPage, nodeId)
+      expect(before).not.toBeNull()
+      expect(before!.ghost).toBe(true)
+
+      await comfyPage.page.keyboard.press('Delete')
+      await comfyPage.nextFrame()
+
+      const after = await getNodeById(comfyPage, nodeId)
+      expect(after).toBeNull()
+    })
+
+    test('Backspace cancels ghost placement', async ({ comfyPage }) => {
+      const { nodeId } = await addGhostAtCenter(comfyPage)
+
+      const before = await getNodeById(comfyPage, nodeId)
+      expect(before).not.toBeNull()
+      expect(before!.ghost).toBe(true)
+
+      await comfyPage.page.keyboard.press('Backspace')
+      await comfyPage.nextFrame()
+
+      const after = await getNodeById(comfyPage, nodeId)
+      expect(after).toBeNull()
+    })
+
+    test('right-click cancels ghost placement', async ({ comfyPage }) => {
+      const { nodeId, centerX, centerY } = await addGhostAtCenter(comfyPage)
+
+      const before = await getNodeById(comfyPage, nodeId)
+      expect(before).not.toBeNull()
+      expect(before!.ghost).toBe(true)
+
+      await comfyPage.page.mouse.click(centerX, centerY, { button: 'right' })
+      await comfyPage.nextFrame()
+
+      const after = await getNodeById(comfyPage, nodeId)
+      expect(after).toBeNull()
+    })
+  })
+}
diff --git a/browser_tests/tests/nodeHelp.spec.ts b/browser_tests/tests/nodeHelp.spec.ts
index cfb04bc463..7f0f1541f8 100644
--- a/browser_tests/tests/nodeHelp.spec.ts
+++ b/browser_tests/tests/nodeHelp.spec.ts
@@ -2,15 +2,17 @@ import {
   comfyExpect as expect,
   comfyPageFixture as test
 } from '../fixtures/ComfyPage'
+import type { ComfyPage } from '../fixtures/ComfyPage'
 import { fitToViewInstant } from '../helpers/fitToView'
+import type { NodeReference } from '../fixtures/utils/litegraphUtils'
 
 // TODO: there might be a better solution for this
 // Helper function to pan canvas and select node
-async function selectNodeWithPan(comfyPage: any, nodeRef: any) {
+async function selectNodeWithPan(comfyPage: ComfyPage, nodeRef: NodeReference) {
   const nodePos = await nodeRef.getPosition()
 
   await comfyPage.page.evaluate((pos) => {
-    const app = window['app']
+    const app = window.app!
     const canvas = app.canvas
     canvas.ds.offset[0] = -pos.x + canvas.canvas.width / 2
     canvas.ds.offset[1] = -pos.y + canvas.canvas.height / 2 + 100
@@ -21,20 +23,22 @@ async function selectNodeWithPan(comfyPage: any, nodeRef: any) {
   await nodeRef.click('title')
 }
 
-test.describe('Node Help', () => {
+test.describe('Node Help', { tag: ['@slow', '@ui'] }, () => {
   test.beforeEach(async ({ comfyPage }) => {
     await comfyPage.setup()
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting('Comfy.NodeLibrary.NewDesign', false)
   })
 
   test.describe('Selection Toolbox', () => {
     test('Should open help menu for selected node', async ({ comfyPage }) => {
       // Load a workflow with a node
-      await comfyPage.setSetting('Comfy.Canvas.SelectionToolbox', true)
-      await comfyPage.loadWorkflow('default')
+      await comfyPage.settings.setSetting('Comfy.Canvas.SelectionToolbox', true)
+      await comfyPage.workflow.loadWorkflow('default')
 
       // Select a single node (KSampler) using node references
-      const ksamplerNodes = await comfyPage.getNodeRefsByType('KSampler')
+      const ksamplerNodes =
+        await comfyPage.nodeOps.getNodeRefsByType('KSampler')
       if (ksamplerNodes.length === 0) {
         throw new Error('No KSampler nodes found in the workflow')
       }
@@ -85,7 +89,9 @@ test.describe('Node Help', () => {
       await ksamplerNode.hover()
 
       // Click the help button
-      const helpButton = ksamplerNode.locator('button:has(.pi-question)')
+      const helpButton = ksamplerNode.getByRole('button', {
+        name: /learn more/i
+      })
       await expect(helpButton).toBeVisible()
       await helpButton.click()
 
@@ -115,7 +121,9 @@ test.describe('Node Help', () => {
         .filter({ hasText: 'KSampler' })
         .first()
       await ksamplerNode.hover()
-      const helpButton = ksamplerNode.locator('button:has(.pi-question)')
+      const helpButton = ksamplerNode.getByRole('button', {
+        name: /learn more/i
+      })
       await helpButton.click()
 
       // Verify help page is shown
@@ -139,7 +147,7 @@ test.describe('Node Help', () => {
 
   test.describe('Help Content', () => {
     test.beforeEach(async ({ comfyPage }) => {
-      await comfyPage.setSetting('Comfy.Canvas.SelectionToolbox', true)
+      await comfyPage.settings.setSetting('Comfy.Canvas.SelectionToolbox', true)
     })
 
     test('Should display loading state while fetching help', async ({
@@ -155,8 +163,9 @@ test.describe('Node Help', () => {
       })
 
       // Load workflow and select a node
-      await comfyPage.loadWorkflow('default')
-      const ksamplerNodes = await comfyPage.getNodeRefsByType('KSampler')
+      await comfyPage.workflow.loadWorkflow('default')
+      const ksamplerNodes =
+        await comfyPage.nodeOps.getNodeRefsByType('KSampler')
       await selectNodeWithPan(comfyPage, ksamplerNodes[0])
 
       // Click help button
@@ -187,8 +196,9 @@ test.describe('Node Help', () => {
       })
 
       // Load workflow and select a node
-      await comfyPage.loadWorkflow('default')
-      const ksamplerNodes = await comfyPage.getNodeRefsByType('KSampler')
+      await comfyPage.workflow.loadWorkflow('default')
+      const ksamplerNodes =
+        await comfyPage.nodeOps.getNodeRefsByType('KSampler')
       await selectNodeWithPan(comfyPage, ksamplerNodes[0])
 
       // Click help button
@@ -224,8 +234,9 @@ test.describe('Node Help', () => {
         })
       })
 
-      await comfyPage.loadWorkflow('default')
-      const ksamplerNodes = await comfyPage.getNodeRefsByType('KSampler')
+      await comfyPage.workflow.loadWorkflow('default')
+      const ksamplerNodes =
+        await comfyPage.nodeOps.getNodeRefsByType('KSampler')
       await selectNodeWithPan(comfyPage, ksamplerNodes[0])
 
       const helpButton = comfyPage.page.locator(
@@ -274,8 +285,9 @@ test.describe('Node Help', () => {
         })
       })
 
-      await comfyPage.loadWorkflow('default')
-      const ksamplerNodes = await comfyPage.getNodeRefsByType('KSampler')
+      await comfyPage.workflow.loadWorkflow('default')
+      const ksamplerNodes =
+        await comfyPage.nodeOps.getNodeRefsByType('KSampler')
       await selectNodeWithPan(comfyPage, ksamplerNodes[0])
 
       const helpButton = comfyPage.page.locator(
@@ -321,7 +333,7 @@ test.describe('Node Help', () => {
       comfyPage
     }) => {
       // First load workflow with custom node
-      await comfyPage.loadWorkflow('groupnodes/group_node_v1.3.3')
+      await comfyPage.workflow.loadWorkflow('groupnodes/group_node_v1.3.3')
 
       // Mock custom node documentation with fallback
       await comfyPage.page.route(
@@ -345,10 +357,10 @@ This is documentation for a custom node.
 
       // Find and select a custom/group node
       const nodeRefs = await comfyPage.page.evaluate(() => {
-        return window['app'].graph.nodes.map((n: any) => n.id)
+        return window.app!.graph!.nodes.map((n) => n.id)
       })
       if (nodeRefs.length > 0) {
-        const firstNode = await comfyPage.getNodeRefById(nodeRefs[0])
+        const firstNode = await comfyPage.nodeOps.getNodeRefById(nodeRefs[0])
         await selectNodeWithPan(comfyPage, firstNode)
       }
 
@@ -391,8 +403,9 @@ This is documentation for a custom node.
         })
       })
 
-      await comfyPage.loadWorkflow('default')
-      const ksamplerNodes = await comfyPage.getNodeRefsByType('KSampler')
+      await comfyPage.workflow.loadWorkflow('default')
+      const ksamplerNodes =
+        await comfyPage.nodeOps.getNodeRefsByType('KSampler')
       await selectNodeWithPan(comfyPage, ksamplerNodes[0])
 
       const helpButton = comfyPage.page.locator(
@@ -458,10 +471,11 @@ This is English documentation.
       })
 
       // Set locale to Japanese
-      await comfyPage.setSetting('Comfy.Locale', 'ja')
+      await comfyPage.settings.setSetting('Comfy.Locale', 'ja')
 
-      await comfyPage.loadWorkflow('default')
-      const ksamplerNodes = await comfyPage.getNodeRefsByType('KSampler')
+      await comfyPage.workflow.loadWorkflow('default')
+      const ksamplerNodes =
+        await comfyPage.nodeOps.getNodeRefsByType('KSampler')
       await selectNodeWithPan(comfyPage, ksamplerNodes[0])
 
       const helpButton = comfyPage.page.locator(
@@ -476,7 +490,7 @@ This is English documentation.
       await expect(helpPage).toContainText('これは日本語のドキュメントです')
 
       // Reset locale
-      await comfyPage.setSetting('Comfy.Locale', 'en')
+      await comfyPage.settings.setSetting('Comfy.Locale', 'en')
     })
 
     test('Should handle network errors gracefully', async ({ comfyPage }) => {
@@ -485,8 +499,9 @@ This is English documentation.
         await route.abort('failed')
       })
 
-      await comfyPage.loadWorkflow('default')
-      const ksamplerNodes = await comfyPage.getNodeRefsByType('KSampler')
+      await comfyPage.workflow.loadWorkflow('default')
+      const ksamplerNodes =
+        await comfyPage.nodeOps.getNodeRefsByType('KSampler')
       await selectNodeWithPan(comfyPage, ksamplerNodes[0])
 
       const helpButton = comfyPage.page.locator(
@@ -528,11 +543,12 @@ This is English documentation.
         }
       )
 
-      await comfyPage.loadWorkflow('default')
+      await comfyPage.workflow.loadWorkflow('default')
       await fitToViewInstant(comfyPage)
 
       // Select KSampler first
-      const ksamplerNodes = await comfyPage.getNodeRefsByType('KSampler')
+      const ksamplerNodes =
+        await comfyPage.nodeOps.getNodeRefsByType('KSampler')
       await selectNodeWithPan(comfyPage, ksamplerNodes[0])
 
       const helpButton = comfyPage.page.locator(
@@ -547,7 +563,7 @@ This is English documentation.
       await expect(helpPage).toContainText('This is KSampler documentation')
 
       // Now select Checkpoint Loader
-      const checkpointNodes = await comfyPage.getNodeRefsByType(
+      const checkpointNodes = await comfyPage.nodeOps.getNodeRefsByType(
         'CheckpointLoaderSimple'
       )
       await selectNodeWithPan(comfyPage, checkpointNodes[0])
diff --git a/browser_tests/tests/nodeSearchBox.spec.ts b/browser_tests/tests/nodeSearchBox.spec.ts
index 2eea223290..f772a02023 100644
--- a/browser_tests/tests/nodeSearchBox.spec.ts
+++ b/browser_tests/tests/nodeSearchBox.spec.ts
@@ -2,32 +2,42 @@ import {
   comfyExpect as expect,
   comfyPageFixture as test
 } from '../fixtures/ComfyPage'
+import type { ComfyPage } from '../fixtures/ComfyPage'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
-test.describe('Node search box', () => {
+test.describe('Node search box', { tag: '@node' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.LinkRelease.Action', 'search box')
-    await comfyPage.setSetting('Comfy.LinkRelease.ActionShift', 'search box')
-    await comfyPage.setSetting('Comfy.NodeSearchBoxImpl', 'default')
+    await comfyPage.settings.setSetting(
+      'Comfy.LinkRelease.Action',
+      'search box'
+    )
+    await comfyPage.settings.setSetting(
+      'Comfy.LinkRelease.ActionShift',
+      'search box'
+    )
+    await comfyPage.settings.setSetting(
+      'Comfy.NodeSearchBoxImpl',
+      'v1 (legacy)'
+    )
   })
 
   test(`Can trigger on empty canvas double click`, async ({ comfyPage }) => {
-    await comfyPage.doubleClickCanvas()
+    await comfyPage.canvasOps.doubleClick()
     await expect(comfyPage.searchBox.input).toHaveCount(1)
   })
 
   test(`Can trigger on group body double click`, async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('groups/single_group_only')
+    await comfyPage.workflow.loadWorkflow('groups/single_group_only')
     await comfyPage.page.mouse.dblclick(50, 50, { delay: 5 })
     await comfyPage.nextFrame()
     await expect(comfyPage.searchBox.input).toHaveCount(1)
   })
 
   test('Can trigger on link release', async ({ comfyPage }) => {
-    await comfyPage.disconnectEdge()
+    await comfyPage.canvasOps.disconnectEdge()
     await expect(comfyPage.searchBox.input).toHaveCount(1)
   })
 
@@ -37,24 +47,27 @@ test.describe('Node search box', () => {
     // Start fresh to test new user behavior
     await comfyPage.setup({ clearStorage: true })
     // Simulate new user with 1.24.1+ installed version
-    await comfyPage.setSetting('Comfy.InstalledVersion', '1.24.1')
-    await comfyPage.setSetting('Comfy.NodeSearchBoxImpl', 'default')
+    await comfyPage.settings.setSetting('Comfy.InstalledVersion', '1.24.1')
+    await comfyPage.settings.setSetting(
+      'Comfy.NodeSearchBoxImpl',
+      'v1 (legacy)'
+    )
     // Don't set LinkRelease settings explicitly to test versioned defaults
 
-    await comfyPage.disconnectEdge()
+    await comfyPage.canvasOps.disconnectEdge()
     await expect(comfyPage.searchBox.input).toHaveCount(1)
     await expect(comfyPage.searchBox.input).toBeVisible()
   })
 
-  test('Can add node', async ({ comfyPage }) => {
-    await comfyPage.doubleClickCanvas()
+  test('Can add node', { tag: '@screenshot' }, async ({ comfyPage }) => {
+    await comfyPage.canvasOps.doubleClick()
     await expect(comfyPage.searchBox.input).toHaveCount(1)
     await comfyPage.searchBox.fillAndSelectFirstNode('KSampler')
     await expect(comfyPage.canvas).toHaveScreenshot('added-node.png')
   })
 
-  test('Can auto link node', async ({ comfyPage }) => {
-    await comfyPage.disconnectEdge()
+  test('Can auto link node', { tag: '@screenshot' }, async ({ comfyPage }) => {
+    await comfyPage.canvasOps.disconnectEdge()
     // Select the second item as the first item is always reroute
     await comfyPage.searchBox.fillAndSelectFirstNode('CLIPTextEncode', {
       suggestionIndex: 0
@@ -62,45 +75,53 @@ test.describe('Node search box', () => {
     await expect(comfyPage.canvas).toHaveScreenshot('auto-linked-node.png')
   })
 
-  test('Can auto link batch moved node', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('links/batch_move_links')
+  test(
+    'Can auto link batch moved node',
+    { tag: '@screenshot' },
+    async ({ comfyPage }) => {
+      await comfyPage.workflow.loadWorkflow('links/batch_move_links')
 
-    const outputSlot1Pos = {
-      x: 304,
-      y: 127
+      // Get the CLIP output slot (index 1) from the first CheckpointLoaderSimple node (id: 4)
+      const checkpointNode = await comfyPage.nodeOps.getNodeRefById(4)
+      const clipOutputSlot = await checkpointNode.getOutput(1)
+      const outputSlotPos = await clipOutputSlot.getPosition()
+
+      // Use a position in the empty canvas area (top-left corner)
+      const emptySpacePos = { x: 5, y: 5 }
+
+      await comfyPage.page.keyboard.down('Shift')
+      await comfyPage.canvasOps.dragAndDrop(outputSlotPos, emptySpacePos)
+      await comfyPage.page.keyboard.up('Shift')
+
+      // Select the second item as the first item is always reroute
+      await comfyPage.searchBox.fillAndSelectFirstNode('Load Checkpoint', {
+        suggestionIndex: 0
+      })
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'auto-linked-node-batch.png'
+      )
     }
-    const emptySpacePos = {
-      x: 5,
-      y: 5
+  )
+
+  test(
+    'Link release connecting to node with no slots',
+    { tag: '@screenshot' },
+    async ({ comfyPage }) => {
+      await comfyPage.canvasOps.disconnectEdge()
+      await expect(comfyPage.searchBox.input).toHaveCount(1)
+      await comfyPage.page.locator('.p-chip-remove-icon').click()
+      await comfyPage.searchBox.fillAndSelectFirstNode('KSampler', {
+        exact: true
+      })
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'added-node-no-connection.png'
+      )
     }
-    await comfyPage.page.keyboard.down('Shift')
-    await comfyPage.dragAndDrop(outputSlot1Pos, emptySpacePos)
-    await comfyPage.page.keyboard.up('Shift')
-
-    // Select the second item as the first item is always reroute
-    await comfyPage.searchBox.fillAndSelectFirstNode('Load Checkpoint', {
-      suggestionIndex: 0
-    })
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'auto-linked-node-batch.png'
-    )
-  })
-
-  test('Link release connecting to node with no slots', async ({
-    comfyPage
-  }) => {
-    await comfyPage.disconnectEdge()
-    await expect(comfyPage.searchBox.input).toHaveCount(1)
-    await comfyPage.page.locator('.p-chip-remove-icon').click()
-    await comfyPage.searchBox.fillAndSelectFirstNode('KSampler')
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'added-node-no-connection.png'
-    )
-  })
+  )
 
   test('Has correct aria-labels on search results', async ({ comfyPage }) => {
     const node = 'Load Checkpoint'
-    await comfyPage.doubleClickCanvas()
+    await comfyPage.canvasOps.doubleClick()
     await comfyPage.searchBox.input.waitFor({ state: 'visible' })
     await comfyPage.searchBox.input.fill(node)
     await comfyPage.searchBox.dropdown.waitFor({ state: 'visible' })
@@ -111,7 +132,7 @@ test.describe('Node search box', () => {
 
   test('@mobile Can trigger on empty canvas tap', async ({ comfyPage }) => {
     await comfyPage.closeMenu()
-    await comfyPage.loadWorkflow('nodes/single_ksampler')
+    await comfyPage.workflow.loadWorkflow('nodes/single_ksampler')
     const screenCenter = {
       x: 200,
       y: 400
@@ -126,7 +147,10 @@ test.describe('Node search box', () => {
   })
 
   test.describe('Filtering', () => {
-    const expectFilterChips = async (comfyPage, expectedTexts: string[]) => {
+    const expectFilterChips = async (
+      comfyPage: ComfyPage,
+      expectedTexts: string[]
+    ) => {
       const chips = comfyPage.searchBox.filterChips
 
       // Check that the number of chips matches the expected count
@@ -143,7 +167,7 @@ test.describe('Node search box', () => {
     }
 
     test.beforeEach(async ({ comfyPage }) => {
-      await comfyPage.doubleClickCanvas()
+      await comfyPage.canvasOps.doubleClick()
     })
 
     test('Can add filter', async ({ comfyPage }) => {
@@ -199,6 +223,14 @@ test.describe('Node search box', () => {
       await expectFilterChips(comfyPage, ['MODEL', 'CLIP'])
     })
 
+    test('Does not add duplicate filter with same type and value', async ({
+      comfyPage
+    }) => {
+      await comfyPage.searchBox.addFilter('MODEL', 'Input Type')
+      await comfyPage.searchBox.addFilter('MODEL', 'Input Type')
+      await expectFilterChips(comfyPage, ['MODEL'])
+    })
+
     test('Can remove filter', async ({ comfyPage }) => {
       await comfyPage.searchBox.addFilter('MODEL', 'Input Type')
       await comfyPage.searchBox.removeFilter(0)
@@ -235,7 +267,7 @@ test.describe('Node search box', () => {
 
   test.describe('Input focus behavior', () => {
     test.beforeEach(async ({ comfyPage }) => {
-      await comfyPage.doubleClickCanvas()
+      await comfyPage.canvasOps.doubleClick()
     })
 
     test('focuses input after adding a filter', async ({ comfyPage }) => {
@@ -251,40 +283,55 @@ test.describe('Node search box', () => {
   })
 })
 
-test.describe('Release context menu', () => {
+test.describe('Release context menu', { tag: '@node' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.LinkRelease.Action', 'context menu')
-    await comfyPage.setSetting('Comfy.LinkRelease.ActionShift', 'search box')
-    await comfyPage.setSetting('Comfy.NodeSearchBoxImpl', 'default')
-  })
-
-  test('Can trigger on link release', async ({ comfyPage }) => {
-    await comfyPage.disconnectEdge()
-    const contextMenu = comfyPage.page.locator('.litecontextmenu')
-    // Wait for context menu with correct title (slot name | slot type)
-    // The title shows the output slot name and type from the disconnected link
-    await expect(contextMenu.locator('.litemenu-title')).toContainText(
-      'CLIP | CLIP'
+    await comfyPage.settings.setSetting(
+      'Comfy.LinkRelease.Action',
+      'context menu'
     )
-    await comfyPage.page.mouse.move(10, 10)
-    await comfyPage.nextFrame()
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'link-release-context-menu.png'
+    await comfyPage.settings.setSetting(
+      'Comfy.LinkRelease.ActionShift',
+      'search box'
+    )
+    await comfyPage.settings.setSetting(
+      'Comfy.NodeSearchBoxImpl',
+      'v1 (legacy)'
     )
   })
 
-  test('Can search and add node from context menu', async ({
-    comfyPage,
-    comfyMouse
-  }) => {
-    await comfyPage.disconnectEdge()
-    await comfyMouse.move({ x: 10, y: 10 })
-    await comfyPage.clickContextMenuItem('Search')
-    await comfyPage.searchBox.fillAndSelectFirstNode('CLIP Prompt')
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'link-context-menu-search.png'
-    )
-  })
+  test(
+    'Can trigger on link release',
+    { tag: '@screenshot' },
+    async ({ comfyPage }) => {
+      await comfyPage.canvasOps.disconnectEdge()
+      const contextMenu = comfyPage.page.locator('.litecontextmenu')
+      // Wait for context menu with correct title (slot name | slot type)
+      // The title shows the output slot name and type from the disconnected link
+      await expect(contextMenu.locator('.litemenu-title')).toContainText(
+        'CLIP | CLIP'
+      )
+      await comfyPage.page.mouse.move(10, 10)
+      await comfyPage.nextFrame()
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'link-release-context-menu.png'
+      )
+    }
+  )
+
+  test(
+    'Can search and add node from context menu',
+    { tag: '@screenshot' },
+    async ({ comfyPage, comfyMouse }) => {
+      await comfyPage.canvasOps.disconnectEdge()
+      await comfyMouse.move({ x: 10, y: 10 })
+      await comfyPage.contextMenu.clickMenuItem('Search')
+      await comfyPage.nextFrame()
+      await comfyPage.searchBox.fillAndSelectFirstNode('CLIP Prompt')
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'link-context-menu-search.png'
+      )
+    }
+  )
 
   test('Existing user (pre-1.24.1) gets context menu by default on link release', async ({
     comfyPage
@@ -292,11 +339,14 @@ test.describe('Release context menu', () => {
     // Start fresh to test existing user behavior
     await comfyPage.setup({ clearStorage: true })
     // Simulate existing user with pre-1.24.1 version
-    await comfyPage.setSetting('Comfy.InstalledVersion', '1.23.0')
-    await comfyPage.setSetting('Comfy.NodeSearchBoxImpl', 'default')
+    await comfyPage.settings.setSetting('Comfy.InstalledVersion', '1.23.0')
+    await comfyPage.settings.setSetting(
+      'Comfy.NodeSearchBoxImpl',
+      'v1 (legacy)'
+    )
     // Don't set LinkRelease settings explicitly to test versioned defaults
 
-    await comfyPage.disconnectEdge()
+    await comfyPage.canvasOps.disconnectEdge()
     // Context menu should appear, search box should not
     await expect(comfyPage.searchBox.input).toHaveCount(0)
     const contextMenu = comfyPage.page.locator('.litecontextmenu')
@@ -308,12 +358,18 @@ test.describe('Release context menu', () => {
   }) => {
     // Start fresh and simulate new user who should get search box by default
     await comfyPage.setup({ clearStorage: true })
-    await comfyPage.setSetting('Comfy.InstalledVersion', '1.24.1')
+    await comfyPage.settings.setSetting('Comfy.InstalledVersion', '1.24.1')
     // But explicitly set to context menu (overriding versioned default)
-    await comfyPage.setSetting('Comfy.LinkRelease.Action', 'context menu')
-    await comfyPage.setSetting('Comfy.NodeSearchBoxImpl', 'default')
+    await comfyPage.settings.setSetting(
+      'Comfy.LinkRelease.Action',
+      'context menu'
+    )
+    await comfyPage.settings.setSetting(
+      'Comfy.NodeSearchBoxImpl',
+      'v1 (legacy)'
+    )
 
-    await comfyPage.disconnectEdge()
+    await comfyPage.canvasOps.disconnectEdge()
     // Context menu should appear due to explicit setting, not search box
     await expect(comfyPage.searchBox.input).toHaveCount(0)
     const contextMenu = comfyPage.page.locator('.litecontextmenu')
diff --git a/browser_tests/tests/nodeSearchBox.spec.ts-snapshots/added-node-chromium-linux.png b/browser_tests/tests/nodeSearchBox.spec.ts-snapshots/added-node-chromium-linux.png
index 18ec479bfe..e221608dce 100644
Binary files a/browser_tests/tests/nodeSearchBox.spec.ts-snapshots/added-node-chromium-linux.png and b/browser_tests/tests/nodeSearchBox.spec.ts-snapshots/added-node-chromium-linux.png differ
diff --git a/browser_tests/tests/nodeSearchBox.spec.ts-snapshots/added-node-no-connection-chromium-linux.png b/browser_tests/tests/nodeSearchBox.spec.ts-snapshots/added-node-no-connection-chromium-linux.png
index fa23bba3ba..85818d60a2 100644
Binary files a/browser_tests/tests/nodeSearchBox.spec.ts-snapshots/added-node-no-connection-chromium-linux.png and b/browser_tests/tests/nodeSearchBox.spec.ts-snapshots/added-node-no-connection-chromium-linux.png differ
diff --git a/browser_tests/tests/nodeSearchBox.spec.ts-snapshots/auto-linked-node-chromium-linux.png b/browser_tests/tests/nodeSearchBox.spec.ts-snapshots/auto-linked-node-chromium-linux.png
index 126b2613cd..fbcbdb1fc1 100644
Binary files a/browser_tests/tests/nodeSearchBox.spec.ts-snapshots/auto-linked-node-chromium-linux.png and b/browser_tests/tests/nodeSearchBox.spec.ts-snapshots/auto-linked-node-chromium-linux.png differ
diff --git a/browser_tests/tests/nodeSearchBox.spec.ts-snapshots/link-context-menu-search-chromium-linux.png b/browser_tests/tests/nodeSearchBox.spec.ts-snapshots/link-context-menu-search-chromium-linux.png
index 126b2613cd..fbcbdb1fc1 100644
Binary files a/browser_tests/tests/nodeSearchBox.spec.ts-snapshots/link-context-menu-search-chromium-linux.png and b/browser_tests/tests/nodeSearchBox.spec.ts-snapshots/link-context-menu-search-chromium-linux.png differ
diff --git a/browser_tests/tests/nodeSearchBoxV2.spec.ts b/browser_tests/tests/nodeSearchBoxV2.spec.ts
new file mode 100644
index 0000000000..0c91963eed
--- /dev/null
+++ b/browser_tests/tests/nodeSearchBoxV2.spec.ts
@@ -0,0 +1,149 @@
+import {
+  comfyExpect as expect,
+  comfyPageFixture as test
+} from '../fixtures/ComfyPage'
+
+test.describe('Node search box V2', { tag: '@node' }, () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
+    await comfyPage.settings.setSetting('Comfy.NodeSearchBoxImpl', 'default')
+    await comfyPage.settings.setSetting(
+      'Comfy.LinkRelease.Action',
+      'search box'
+    )
+    await comfyPage.settings.setSetting(
+      'Comfy.LinkRelease.ActionShift',
+      'search box'
+    )
+    await comfyPage.searchBoxV2.reload(comfyPage)
+  })
+
+  test('Can open search and add node', async ({ comfyPage }) => {
+    const { searchBoxV2 } = comfyPage
+    const initialCount = await comfyPage.nodeOps.getGraphNodesCount()
+
+    await comfyPage.canvasOps.doubleClick()
+    await expect(searchBoxV2.input).toBeVisible()
+
+    await searchBoxV2.input.fill('KSampler')
+    await expect(searchBoxV2.results.first()).toBeVisible()
+
+    await comfyPage.page.keyboard.press('Enter')
+    await expect(searchBoxV2.input).not.toBeVisible()
+
+    const newCount = await comfyPage.nodeOps.getGraphNodesCount()
+    expect(newCount).toBe(initialCount + 1)
+  })
+
+  test('Can add first default result with Enter', async ({ comfyPage }) => {
+    const { searchBoxV2 } = comfyPage
+    const initialCount = await comfyPage.nodeOps.getGraphNodesCount()
+
+    await comfyPage.canvasOps.doubleClick()
+    await expect(searchBoxV2.input).toBeVisible()
+
+    // Default results should be visible without typing
+    await expect(searchBoxV2.results.first()).toBeVisible()
+
+    // Enter should add the first (selected) result
+    await comfyPage.page.keyboard.press('Enter')
+    await expect(searchBoxV2.input).not.toBeVisible()
+
+    const newCount = await comfyPage.nodeOps.getGraphNodesCount()
+    expect(newCount).toBe(initialCount + 1)
+  })
+
+  test.describe('Category navigation', () => {
+    test('Favorites shows only bookmarked nodes', async ({ comfyPage }) => {
+      const { searchBoxV2 } = comfyPage
+      await comfyPage.settings.setSetting('Comfy.NodeLibrary.Bookmarks.V2', [
+        'KSampler'
+      ])
+      await searchBoxV2.reload(comfyPage)
+
+      await comfyPage.canvasOps.doubleClick()
+      await expect(searchBoxV2.input).toBeVisible()
+
+      await searchBoxV2.categoryButton('favorites').click()
+
+      await expect(searchBoxV2.results).toHaveCount(1)
+      await expect(searchBoxV2.results.first()).toContainText('KSampler')
+    })
+
+    test('Category filters results to matching nodes', async ({
+      comfyPage
+    }) => {
+      const { searchBoxV2 } = comfyPage
+
+      await comfyPage.canvasOps.doubleClick()
+      await expect(searchBoxV2.input).toBeVisible()
+
+      await searchBoxV2.categoryButton('sampling').click()
+
+      await expect(searchBoxV2.results.first()).toBeVisible()
+      const count = await searchBoxV2.results.count()
+      expect(count).toBeGreaterThan(0)
+    })
+  })
+
+  test.describe('Filter workflow', () => {
+    test('Can filter by input type via filter bar', async ({ comfyPage }) => {
+      const { searchBoxV2 } = comfyPage
+
+      await comfyPage.canvasOps.doubleClick()
+      await expect(searchBoxV2.input).toBeVisible()
+
+      // Click "Input" filter chip in the filter bar
+      await searchBoxV2.filterBarButton('Input').click()
+
+      // Filter options should appear
+      await expect(searchBoxV2.filterOptions.first()).toBeVisible()
+
+      // Type to narrow and select MODEL
+      await searchBoxV2.input.fill('MODEL')
+      await searchBoxV2.filterOptions
+        .filter({ hasText: 'MODEL' })
+        .first()
+        .click()
+
+      // Filter chip should appear and results should be filtered
+      await expect(
+        searchBoxV2.dialog.getByText('Input:', { exact: false }).locator('..')
+      ).toContainText('MODEL')
+      await expect(searchBoxV2.results.first()).toBeVisible()
+    })
+  })
+
+  test.describe('Keyboard navigation', () => {
+    test('Can navigate and select with keyboard', async ({ comfyPage }) => {
+      const { searchBoxV2 } = comfyPage
+      const initialCount = await comfyPage.nodeOps.getGraphNodesCount()
+
+      await comfyPage.canvasOps.doubleClick()
+      await expect(searchBoxV2.input).toBeVisible()
+
+      await searchBoxV2.input.fill('KSampler')
+      const results = searchBoxV2.results
+      await expect(results.first()).toBeVisible()
+
+      // First result selected by default
+      await expect(results.first()).toHaveAttribute('aria-selected', 'true')
+
+      // ArrowDown moves selection
+      await comfyPage.page.keyboard.press('ArrowDown')
+      await expect(results.nth(1)).toHaveAttribute('aria-selected', 'true')
+      await expect(results.first()).toHaveAttribute('aria-selected', 'false')
+
+      // ArrowUp moves back
+      await comfyPage.page.keyboard.press('ArrowUp')
+      await expect(results.first()).toHaveAttribute('aria-selected', 'true')
+
+      // Enter selects and adds node
+      await comfyPage.page.keyboard.press('Enter')
+      await expect(searchBoxV2.input).not.toBeVisible()
+
+      const newCount = await comfyPage.nodeOps.getGraphNodesCount()
+      expect(newCount).toBe(initialCount + 1)
+    })
+  })
+})
diff --git a/browser_tests/tests/noteNode.spec.ts b/browser_tests/tests/noteNode.spec.ts
index 52dc575423..c50a533ea5 100644
--- a/browser_tests/tests/noteNode.spec.ts
+++ b/browser_tests/tests/noteNode.spec.ts
@@ -3,12 +3,12 @@ import { expect } from '@playwright/test'
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
-test.describe('Note Node', () => {
-  test('Can load node nodes', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('nodes/note_nodes')
+test.describe('Note Node', { tag: '@node' }, () => {
+  test('Can load node nodes', { tag: '@screenshot' }, async ({ comfyPage }) => {
+    await comfyPage.workflow.loadWorkflow('nodes/note_nodes')
     await expect(comfyPage.canvas).toHaveScreenshot('note_nodes.png')
   })
 })
diff --git a/browser_tests/tests/performance.spec.ts b/browser_tests/tests/performance.spec.ts
new file mode 100644
index 0000000000..82f1c61fb4
--- /dev/null
+++ b/browser_tests/tests/performance.spec.ts
@@ -0,0 +1,132 @@
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+import { recordMeasurement } from '../helpers/perfReporter'
+
+test.describe('Performance', { tag: ['@perf'] }, () => {
+  test('canvas idle style recalculations', async ({ comfyPage }) => {
+    await comfyPage.workflow.loadWorkflow('default')
+    await comfyPage.perf.startMeasuring()
+
+    // Let the canvas idle for 2 seconds — no user interaction.
+    // Measures baseline style recalcs from reactive state + render loop.
+    for (let i = 0; i < 120; i++) {
+      await comfyPage.nextFrame()
+    }
+
+    const m = await comfyPage.perf.stopMeasuring('canvas-idle')
+    recordMeasurement(m)
+    console.log(
+      `Canvas idle: ${m.styleRecalcs} style recalcs, ${m.layouts} layouts`
+    )
+  })
+
+  test('canvas mouse interaction style recalculations', async ({
+    comfyPage
+  }) => {
+    await comfyPage.workflow.loadWorkflow('default')
+    await comfyPage.perf.startMeasuring()
+
+    const canvas = comfyPage.canvas
+    const box = await canvas.boundingBox()
+    if (!box) throw new Error('Canvas bounding box not available')
+
+    // Sweep mouse across the canvas — crosses nodes, empty space, slots
+    for (let i = 0; i < 100; i++) {
+      await comfyPage.page.mouse.move(
+        box.x + (box.width * i) / 100,
+        box.y + (box.height * (i % 3)) / 3
+      )
+    }
+
+    const m = await comfyPage.perf.stopMeasuring('canvas-mouse-sweep')
+    recordMeasurement(m)
+    console.log(
+      `Mouse sweep: ${m.styleRecalcs} style recalcs, ${m.layouts} layouts`
+    )
+  })
+
+  test('DOM widget clipping during node selection', async ({ comfyPage }) => {
+    // Load default workflow which has DOM widgets (text inputs, combos)
+    await comfyPage.workflow.loadWorkflow('default')
+    await comfyPage.perf.startMeasuring()
+
+    // Select and deselect nodes rapidly to trigger clipping recalculation
+    const canvas = comfyPage.canvas
+    const box = await canvas.boundingBox()
+    if (!box) throw new Error('Canvas bounding box not available')
+
+    for (let i = 0; i < 20; i++) {
+      // Click on canvas area (nodes occupy various positions)
+      await comfyPage.page.mouse.click(
+        box.x + box.width / 3 + (i % 5) * 30,
+        box.y + box.height / 3 + (i % 4) * 30
+      )
+      await comfyPage.nextFrame()
+    }
+
+    const m = await comfyPage.perf.stopMeasuring('dom-widget-clipping')
+    recordMeasurement(m)
+    console.log(`Clipping: ${m.layouts} forced layouts`)
+  })
+
+  test('subgraph idle style recalculations', async ({ comfyPage }) => {
+    await comfyPage.workflow.loadWorkflow('subgraphs/nested-subgraph')
+    await comfyPage.perf.startMeasuring()
+
+    for (let i = 0; i < 120; i++) {
+      await comfyPage.nextFrame()
+    }
+
+    const m = await comfyPage.perf.stopMeasuring('subgraph-idle')
+    recordMeasurement(m)
+    console.log(
+      `Subgraph idle: ${m.styleRecalcs} style recalcs, ${m.layouts} layouts`
+    )
+  })
+
+  test('subgraph mouse interaction style recalculations', async ({
+    comfyPage
+  }) => {
+    await comfyPage.workflow.loadWorkflow('subgraphs/nested-subgraph')
+    await comfyPage.perf.startMeasuring()
+
+    const canvas = comfyPage.canvas
+    const box = await canvas.boundingBox()
+    if (!box) throw new Error('Canvas bounding box not available')
+
+    for (let i = 0; i < 100; i++) {
+      await comfyPage.page.mouse.move(
+        box.x + (box.width * i) / 100,
+        box.y + (box.height * (i % 3)) / 3
+      )
+    }
+
+    const m = await comfyPage.perf.stopMeasuring('subgraph-mouse-sweep')
+    recordMeasurement(m)
+    console.log(
+      `Subgraph mouse sweep: ${m.styleRecalcs} style recalcs, ${m.layouts} layouts`
+    )
+  })
+
+  test('subgraph DOM widget clipping during node selection', async ({
+    comfyPage
+  }) => {
+    await comfyPage.workflow.loadWorkflow('subgraphs/nested-subgraph')
+    await comfyPage.perf.startMeasuring()
+
+    const canvas = comfyPage.canvas
+    const box = await canvas.boundingBox()
+    if (!box) throw new Error('Canvas bounding box not available')
+
+    for (let i = 0; i < 20; i++) {
+      await comfyPage.page.mouse.click(
+        box.x + box.width / 3 + (i % 5) * 30,
+        box.y + box.height / 3 + (i % 4) * 30
+      )
+      await comfyPage.nextFrame()
+    }
+
+    const m = await comfyPage.perf.stopMeasuring('subgraph-dom-widget-clipping')
+    recordMeasurement(m)
+    console.log(`Subgraph clipping: ${m.layouts} forced layouts`)
+  })
+})
diff --git a/browser_tests/tests/primitiveNode.spec.ts b/browser_tests/tests/primitiveNode.spec.ts
index 0584a3bec2..aa0e029e03 100644
--- a/browser_tests/tests/primitiveNode.spec.ts
+++ b/browser_tests/tests/primitiveNode.spec.ts
@@ -4,21 +4,25 @@ import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 import type { NodeReference } from '../fixtures/utils/litegraphUtils'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
-test.describe('Primitive Node', () => {
+test.describe('Primitive Node', { tag: ['@screenshot', '@node'] }, () => {
   test('Can load with correct size', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('primitive/primitive_node')
+    await comfyPage.workflow.loadWorkflow('primitive/primitive_node')
     await expect(comfyPage.canvas).toHaveScreenshot('primitive_node.png')
   })
 
   // When link is dropped on widget, it should automatically convert the widget
   // to input.
   test('Can connect to widget', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('primitive/primitive_node_unconnected')
-    const primitiveNode: NodeReference = await comfyPage.getNodeRefById(1)
-    const ksamplerNode: NodeReference = await comfyPage.getNodeRefById(2)
+    await comfyPage.workflow.loadWorkflow(
+      'primitive/primitive_node_unconnected'
+    )
+    const primitiveNode: NodeReference =
+      await comfyPage.nodeOps.getNodeRefById(1)
+    const ksamplerNode: NodeReference =
+      await comfyPage.nodeOps.getNodeRefById(2)
     // Connect the output of the primitive node to the input of first widget of the ksampler node
     await primitiveNode.connectWidget(0, ksamplerNode, 0)
     await expect(comfyPage.canvas).toHaveScreenshot(
@@ -27,11 +31,13 @@ test.describe('Primitive Node', () => {
   })
 
   test('Can connect to dom widget', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow(
+    await comfyPage.workflow.loadWorkflow(
       'primitive/primitive_node_unconnected_dom_widget'
     )
-    const primitiveNode: NodeReference = await comfyPage.getNodeRefById(1)
-    const clipEncoderNode: NodeReference = await comfyPage.getNodeRefById(2)
+    const primitiveNode: NodeReference =
+      await comfyPage.nodeOps.getNodeRefById(1)
+    const clipEncoderNode: NodeReference =
+      await comfyPage.nodeOps.getNodeRefById(2)
     await primitiveNode.connectWidget(0, clipEncoderNode, 0)
     await expect(comfyPage.canvas).toHaveScreenshot(
       'primitive_node_connected_dom_widget.png'
@@ -39,9 +45,13 @@ test.describe('Primitive Node', () => {
   })
 
   test('Can connect to static primitive node', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('primitive/static_primitive_unconnected')
-    const primitiveNode: NodeReference = await comfyPage.getNodeRefById(1)
-    const ksamplerNode: NodeReference = await comfyPage.getNodeRefById(2)
+    await comfyPage.workflow.loadWorkflow(
+      'primitive/static_primitive_unconnected'
+    )
+    const primitiveNode: NodeReference =
+      await comfyPage.nodeOps.getNodeRefById(1)
+    const ksamplerNode: NodeReference =
+      await comfyPage.nodeOps.getNodeRefById(2)
     await primitiveNode.connectWidget(0, ksamplerNode, 0)
     await expect(comfyPage.canvas).toHaveScreenshot(
       'static_primitive_connected.png'
@@ -51,7 +61,7 @@ test.describe('Primitive Node', () => {
   test('Report missing nodes when connect to missing node', async ({
     comfyPage
   }) => {
-    await comfyPage.loadWorkflow(
+    await comfyPage.workflow.loadWorkflow(
       'primitive/primitive_node_connect_missing_node'
     )
     // Wait for the element with the .comfy-missing-nodes selector to be visible
diff --git a/browser_tests/tests/primitiveNode.spec.ts-snapshots/primitive-node-connected-chromium-linux.png b/browser_tests/tests/primitiveNode.spec.ts-snapshots/primitive-node-connected-chromium-linux.png
index 80cd43050b..5de44c6e21 100644
Binary files a/browser_tests/tests/primitiveNode.spec.ts-snapshots/primitive-node-connected-chromium-linux.png and b/browser_tests/tests/primitiveNode.spec.ts-snapshots/primitive-node-connected-chromium-linux.png differ
diff --git a/browser_tests/tests/primitiveNode.spec.ts-snapshots/static-primitive-connected-chromium-linux.png b/browser_tests/tests/primitiveNode.spec.ts-snapshots/static-primitive-connected-chromium-linux.png
index e405605b00..f5a44f64fe 100644
Binary files a/browser_tests/tests/primitiveNode.spec.ts-snapshots/static-primitive-connected-chromium-linux.png and b/browser_tests/tests/primitiveNode.spec.ts-snapshots/static-primitive-connected-chromium-linux.png differ
diff --git a/browser_tests/tests/propertiesPanel/propertiesPanel.spec.ts b/browser_tests/tests/propertiesPanel/propertiesPanel.spec.ts
index 9ff32c8a48..32ff8722db 100644
--- a/browser_tests/tests/propertiesPanel/propertiesPanel.spec.ts
+++ b/browser_tests/tests/propertiesPanel/propertiesPanel.spec.ts
@@ -8,13 +8,14 @@ test.describe('Properties panel', () => {
 
     const { propertiesPanel } = comfyPage.menu
 
-    await expect(propertiesPanel.panelTitle).toContainText(
-      'No node(s) selected'
-    )
+    await expect(propertiesPanel.panelTitle).toContainText('Workflow Overview')
 
-    await comfyPage.selectNodes(['KSampler', 'CLIP Text Encode (Prompt)'])
+    await comfyPage.nodeOps.selectNodes([
+      'KSampler',
+      'CLIP Text Encode (Prompt)'
+    ])
 
-    await expect(propertiesPanel.panelTitle).toContainText('3 nodes selected')
+    await expect(propertiesPanel.panelTitle).toContainText('3 items selected')
     await expect(propertiesPanel.root.getByText('KSampler')).toHaveCount(1)
     await expect(
       propertiesPanel.root.getByText('CLIP Text Encode (Prompt)')
diff --git a/browser_tests/tests/propertiesPanel/propertiesPanelPosition.spec.ts b/browser_tests/tests/propertiesPanel/propertiesPanelPosition.spec.ts
index ee2c85eda0..fd235ea0d3 100644
--- a/browser_tests/tests/propertiesPanel/propertiesPanelPosition.spec.ts
+++ b/browser_tests/tests/propertiesPanel/propertiesPanelPosition.spec.ts
@@ -1,9 +1,11 @@
 import { expect } from '@playwright/test'
 
 import { comfyPageFixture as test } from '../../fixtures/ComfyPage'
+import { TestIds } from '../../fixtures/selectors'
 
 test.describe('Properties panel position', () => {
   test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.NodeLibrary.NewDesign', false)
     // Open a sidebar tab to ensure sidebar is visible
     await comfyPage.menu.nodeLibraryTab.open()
     await comfyPage.actionbar.propertiesButton.click()
@@ -12,10 +14,12 @@ test.describe('Properties panel position', () => {
   test('positions on the right when sidebar is on the left', async ({
     comfyPage
   }) => {
-    await comfyPage.setSetting('Comfy.Sidebar.Location', 'left')
+    await comfyPage.settings.setSetting('Comfy.Sidebar.Location', 'left')
     await comfyPage.nextFrame()
 
-    const propertiesPanel = comfyPage.page.getByTestId('properties-panel')
+    const propertiesPanel = comfyPage.page.getByTestId(
+      TestIds.propertiesPanel.root
+    )
     const sidebar = comfyPage.page.locator('.side-bar-panel').first()
 
     await expect(propertiesPanel).toBeVisible()
@@ -36,10 +40,12 @@ test.describe('Properties panel position', () => {
   test('positions on the left when sidebar is on the right', async ({
     comfyPage
   }) => {
-    await comfyPage.setSetting('Comfy.Sidebar.Location', 'right')
+    await comfyPage.settings.setSetting('Comfy.Sidebar.Location', 'right')
     await comfyPage.nextFrame()
 
-    const propertiesPanel = comfyPage.page.getByTestId('properties-panel')
+    const propertiesPanel = comfyPage.page.getByTestId(
+      TestIds.propertiesPanel.root
+    )
     const sidebar = comfyPage.page.locator('.side-bar-panel').first()
 
     await expect(propertiesPanel).toBeVisible()
@@ -60,10 +66,12 @@ test.describe('Properties panel position', () => {
   test('close button icon updates based on sidebar location', async ({
     comfyPage
   }) => {
-    const propertiesPanel = comfyPage.page.getByTestId('properties-panel')
+    const propertiesPanel = comfyPage.page.getByTestId(
+      TestIds.propertiesPanel.root
+    )
 
     // When sidebar is on the left, panel is on the right
-    await comfyPage.setSetting('Comfy.Sidebar.Location', 'left')
+    await comfyPage.settings.setSetting('Comfy.Sidebar.Location', 'left')
     await comfyPage.nextFrame()
 
     await expect(propertiesPanel).toBeVisible()
@@ -74,7 +82,7 @@ test.describe('Properties panel position', () => {
     await expect(closeButtonLeft).toHaveClass(/lucide--panel-right/)
 
     // When sidebar is on the right, panel is on the left
-    await comfyPage.setSetting('Comfy.Sidebar.Location', 'right')
+    await comfyPage.settings.setSetting('Comfy.Sidebar.Location', 'right')
     await comfyPage.nextFrame()
 
     const closeButtonRight = propertiesPanel
diff --git a/browser_tests/tests/recordAudio.spec.ts b/browser_tests/tests/recordAudio.spec.ts
index cc0ac3684f..c46a5168e6 100644
--- a/browser_tests/tests/recordAudio.spec.ts
+++ b/browser_tests/tests/recordAudio.spec.ts
@@ -3,15 +3,16 @@ import { expect } from '@playwright/test'
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.NodeSearchBoxImpl', 'v1 (legacy)')
 })
 
-test.describe('Record Audio Node', () => {
+test.describe('Record Audio Node', { tag: '@screenshot' }, () => {
   test('should add a record audio node and take a screenshot', async ({
     comfyPage
   }) => {
     // Open the search box by double clicking on the canvas
-    await comfyPage.doubleClickCanvas()
+    await comfyPage.canvasOps.doubleClick()
     await expect(comfyPage.searchBox.input).toHaveCount(1)
 
     // Search for and add the RecordAudio node
@@ -19,7 +20,8 @@ test.describe('Record Audio Node', () => {
     await comfyPage.nextFrame()
 
     // Verify the RecordAudio node was added
-    const recordAudioNodes = await comfyPage.getNodeRefsByType('RecordAudio')
+    const recordAudioNodes =
+      await comfyPage.nodeOps.getNodeRefsByType('RecordAudio')
     expect(recordAudioNodes.length).toBe(1)
 
     // Take a screenshot of the canvas with the RecordAudio node
diff --git a/browser_tests/tests/releaseNotifications.spec.ts b/browser_tests/tests/releaseNotifications.spec.ts
index a45527de7e..74ae32c389 100644
--- a/browser_tests/tests/releaseNotifications.spec.ts
+++ b/browser_tests/tests/releaseNotifications.spec.ts
@@ -1,10 +1,11 @@
 import { expect } from '@playwright/test'
 
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+import { TestIds } from '../fixtures/selectors'
 
 test.describe('Release Notifications', () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
   })
 
   test('should show help center with release information', async ({
@@ -50,7 +51,9 @@ test.describe('Release Notifications', () => {
     await expect(helpMenu).toBeVisible()
 
     // Verify "What's New?" section shows the release
-    const whatsNewSection = comfyPage.page.getByTestId('whats-new-section')
+    const whatsNewSection = comfyPage.page.getByTestId(
+      TestIds.dialogs.whatsNewSection
+    )
     await expect(whatsNewSection).toBeVisible()
 
     // Should show the release version
@@ -79,7 +82,9 @@ test.describe('Release Notifications', () => {
     await expect(helpMenu).toBeVisible()
 
     // Verify "What's New?" section shows no releases
-    const whatsNewSection = comfyPage.page.getByTestId('whats-new-section')
+    const whatsNewSection = comfyPage.page.getByTestId(
+      TestIds.dialogs.whatsNewSection
+    )
     await expect(whatsNewSection).toBeVisible()
 
     // Should show "No recent releases" message
@@ -125,7 +130,9 @@ test.describe('Release Notifications', () => {
     await expect(helpMenu).toBeVisible()
 
     // Should show no releases due to error
-    const whatsNewSection = comfyPage.page.getByTestId('whats-new-section')
+    const whatsNewSection = comfyPage.page.getByTestId(
+      TestIds.dialogs.whatsNewSection
+    )
     await expect(
       whatsNewSection.locator('text=No recent releases')
     ).toBeVisible()
@@ -135,7 +142,10 @@ test.describe('Release Notifications', () => {
     comfyPage
   }) => {
     // Disable version update notifications
-    await comfyPage.setSetting('Comfy.Notification.ShowVersionUpdates', false)
+    await comfyPage.settings.setSetting(
+      'Comfy.Notification.ShowVersionUpdates',
+      false
+    )
 
     // Mock release API with test data
     await comfyPage.page.route('**/releases**', async (route) => {
@@ -175,7 +185,9 @@ test.describe('Release Notifications', () => {
     await expect(helpMenu).toBeVisible()
 
     // Verify "What's New?" section is hidden
-    const whatsNewSection = comfyPage.page.getByTestId('whats-new-section')
+    const whatsNewSection = comfyPage.page.getByTestId(
+      TestIds.dialogs.whatsNewSection
+    )
     await expect(whatsNewSection).not.toBeVisible()
 
     // Should not show any popups or toasts
@@ -189,7 +201,10 @@ test.describe('Release Notifications', () => {
     comfyPage
   }) => {
     // Disable version update notifications
-    await comfyPage.setSetting('Comfy.Notification.ShowVersionUpdates', false)
+    await comfyPage.settings.setSetting(
+      'Comfy.Notification.ShowVersionUpdates',
+      false
+    )
 
     // Track API calls
     let apiCallCount = 0
@@ -220,7 +235,10 @@ test.describe('Release Notifications', () => {
     comfyPage
   }) => {
     // Enable version update notifications (default behavior)
-    await comfyPage.setSetting('Comfy.Notification.ShowVersionUpdates', true)
+    await comfyPage.settings.setSetting(
+      'Comfy.Notification.ShowVersionUpdates',
+      true
+    )
 
     // Mock release API with test data
     await comfyPage.page.route('**/releases**', async (route) => {
@@ -260,7 +278,9 @@ test.describe('Release Notifications', () => {
     await expect(helpMenu).toBeVisible()
 
     // Verify "What's New?" section is visible
-    const whatsNewSection = comfyPage.page.getByTestId('whats-new-section')
+    const whatsNewSection = comfyPage.page.getByTestId(
+      TestIds.dialogs.whatsNewSection
+    )
     await expect(whatsNewSection).toBeVisible()
 
     // Should show the release
@@ -299,7 +319,10 @@ test.describe('Release Notifications', () => {
     })
 
     // Start with notifications enabled
-    await comfyPage.setSetting('Comfy.Notification.ShowVersionUpdates', true)
+    await comfyPage.settings.setSetting(
+      'Comfy.Notification.ShowVersionUpdates',
+      true
+    )
     await comfyPage.setup({ mockReleases: false })
 
     // Open help center
@@ -308,14 +331,19 @@ test.describe('Release Notifications', () => {
     await helpCenterButton.click()
 
     // Verify "What's New?" section is visible
-    const whatsNewSection = comfyPage.page.getByTestId('whats-new-section')
+    const whatsNewSection = comfyPage.page.getByTestId(
+      TestIds.dialogs.whatsNewSection
+    )
     await expect(whatsNewSection).toBeVisible()
 
     // Close help center
     await comfyPage.page.click('.help-center-backdrop')
 
     // Disable notifications
-    await comfyPage.setSetting('Comfy.Notification.ShowVersionUpdates', false)
+    await comfyPage.settings.setSetting(
+      'Comfy.Notification.ShowVersionUpdates',
+      false
+    )
 
     // Reopen help center
     await helpCenterButton.click()
@@ -328,7 +356,10 @@ test.describe('Release Notifications', () => {
     comfyPage
   }) => {
     // Disable notifications
-    await comfyPage.setSetting('Comfy.Notification.ShowVersionUpdates', false)
+    await comfyPage.settings.setSetting(
+      'Comfy.Notification.ShowVersionUpdates',
+      false
+    )
 
     // Mock empty releases
     await comfyPage.page.route('**/releases**', async (route) => {
@@ -359,7 +390,9 @@ test.describe('Release Notifications', () => {
     await expect(helpMenu).toBeVisible()
 
     // Section should be hidden regardless of empty releases
-    const whatsNewSection = comfyPage.page.getByTestId('whats-new-section')
+    const whatsNewSection = comfyPage.page.getByTestId(
+      TestIds.dialogs.whatsNewSection
+    )
     await expect(whatsNewSection).not.toBeVisible()
   })
 })
diff --git a/browser_tests/tests/remoteWidgets.spec.ts b/browser_tests/tests/remoteWidgets.spec.ts
index 18cc77f445..a84dfd0273 100644
--- a/browser_tests/tests/remoteWidgets.spec.ts
+++ b/browser_tests/tests/remoteWidgets.spec.ts
@@ -3,7 +3,7 @@ import { expect } from '@playwright/test'
 import type { ComfyPage } from '../fixtures/ComfyPage'
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
-test.describe('Remote COMBO Widget', () => {
+test.describe('Remote COMBO Widget', { tag: '@widget' }, () => {
   const mockOptions = ['d', 'c', 'b', 'a']
 
   const addRemoteWidgetNode = async (
@@ -26,23 +26,23 @@ test.describe('Remote COMBO Widget', () => {
     nodeName: string
   ): Promise<string[] | undefined> => {
     return await comfyPage.page.evaluate((name) => {
-      const node = window['app'].graph.nodes.find((node) => node.title === name)
-      return node.widgets[0].options.values
+      const node = window.app!.graph!.nodes.find((node) => node.title === name)
+      return node!.widgets![0].options.values as string[] | undefined
     }, nodeName)
   }
 
   const getWidgetValue = async (comfyPage: ComfyPage, nodeName: string) => {
     return await comfyPage.page.evaluate((name) => {
-      const node = window['app'].graph.nodes.find((node) => node.title === name)
-      return node.widgets[0].value
+      const node = window.app!.graph!.nodes.find((node) => node.title === name)
+      return node!.widgets![0].value
     }, nodeName)
   }
 
   const clickRefreshButton = (comfyPage: ComfyPage, nodeName: string) => {
     return comfyPage.page.evaluate((name) => {
-      const node = window['app'].graph.nodes.find((node) => node.title === name)
-      const buttonWidget = node.widgets.find((w) => w.name === 'refresh')
-      return buttonWidget?.callback()
+      const node = window.app!.graph!.nodes.find((node) => node.title === name)
+      const buttonWidget = node!.widgets!.find((w) => w.name === 'refresh')
+      return buttonWidget?.callback?.(buttonWidget.value)
     }, nodeName)
   }
 
@@ -52,12 +52,17 @@ test.describe('Remote COMBO Widget', () => {
   }
 
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting('Comfy.NodeLibrary.NewDesign', false)
+    await comfyPage.settings.setSetting(
+      'Comfy.NodeSearchBoxImpl',
+      'v1 (legacy)'
+    )
   })
 
   test.describe('Loading options', () => {
     test.beforeEach(async ({ comfyPage }) => {
-      await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
       await comfyPage.page.route(
         '**/api/models/checkpoints**',
         async (route, request) => {
@@ -89,10 +94,10 @@ test.describe('Remote COMBO Widget', () => {
       comfyPage
     }) => {
       const nodeName = 'Remote Widget Node'
-      await comfyPage.loadWorkflow('inputs/remote_widget')
+      await comfyPage.workflow.loadWorkflow('inputs/remote_widget')
 
       const node = await comfyPage.page.evaluate((name) => {
-        return window['app'].graph.nodes.find((node) => node.title === name)
+        return window.app!.graph!.nodes.find((node) => node.title === name)
       }, nodeName)
       expect(node).toBeDefined()
 
@@ -176,7 +181,7 @@ test.describe('Remote COMBO Widget', () => {
     test('refresh button is visible in selection toolbar when node is selected', async ({
       comfyPage
     }) => {
-      await comfyPage.setSetting('Comfy.Canvas.SelectionToolbox', true)
+      await comfyPage.settings.setSetting('Comfy.Canvas.SelectionToolbox', true)
 
       const nodeName = 'Remote Widget Node'
       await addRemoteWidgetNode(comfyPage, nodeName)
@@ -196,7 +201,7 @@ test.describe('Remote COMBO Widget', () => {
       // Fulfill each request with a unique timestamp
       await comfyPage.page.route(
         '**/api/models/checkpoints**',
-        async (route, request) => {
+        async (route, _request) => {
           await route.fulfill({
             body: JSON.stringify([Date.now()]),
             status: 200
@@ -257,13 +262,11 @@ test.describe('Remote COMBO Widget', () => {
       await addRemoteWidgetNode(comfyPage, nodeName)
       await waitForWidgetUpdate(comfyPage)
 
-      // Wait for timeout and backoff, then force re-render, repeat
-      const requestTimeout = 512
-      await comfyPage.page.waitForTimeout(requestTimeout)
-      await waitForWidgetUpdate(comfyPage)
-      await comfyPage.page.waitForTimeout(requestTimeout * 2)
-      await waitForWidgetUpdate(comfyPage)
-      await comfyPage.page.waitForTimeout(requestTimeout * 3)
+      // Wait for exponential backoff retries to accumulate timestamps
+      await expect(async () => {
+        await waitForWidgetUpdate(comfyPage)
+        expect(timestamps.length).toBeGreaterThanOrEqual(3)
+      }).toPass({ timeout: 10000, intervals: [500, 1000, 1500] })
 
       // Verify exponential backoff between retries
       const intervals = timestamps.slice(1).map((t, i) => t - timestamps[i])
diff --git a/browser_tests/tests/rerouteNode.spec.ts b/browser_tests/tests/rerouteNode.spec.ts
index 0b2b1e0f62..19c919117c 100644
--- a/browser_tests/tests/rerouteNode.spec.ts
+++ b/browser_tests/tests/rerouteNode.spec.ts
@@ -3,19 +3,19 @@ import { expect } from '@playwright/test'
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 import { getMiddlePoint } from '../fixtures/utils/litegraphUtils'
 
-test.describe('Reroute Node', () => {
+test.describe('Reroute Node', { tag: ['@screenshot', '@node'] }, () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
   })
 
   test.afterEach(async ({ comfyPage }) => {
-    await comfyPage.setupWorkflowsDirectory({})
+    await comfyPage.workflow.setupWorkflowsDirectory({})
   })
 
   test('loads from inserted workflow', async ({ comfyPage }) => {
-    const workflowName = 'single_connected_reroute_node.json'
-    await comfyPage.setupWorkflowsDirectory({
-      [workflowName]: 'links/single_connected_reroute_node.json'
+    const workflowName = 'single_connected_reroute_node'
+    await comfyPage.workflow.setupWorkflowsDirectory({
+      [`${workflowName}.json`]: `links/${workflowName}.json`
     })
     await comfyPage.setup()
     await comfyPage.menu.topbar.triggerTopbarCommand(['New'])
@@ -38,92 +38,96 @@ test.describe('Reroute Node', () => {
   })
 })
 
-test.describe('LiteGraph Native Reroute Node', () => {
-  test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
-    await comfyPage.setSetting('LiteGraph.Reroute.SplineOffset', 80)
-  })
+test.describe(
+  'LiteGraph Native Reroute Node',
+  { tag: ['@screenshot', '@node'] },
+  () => {
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
+      await comfyPage.settings.setSetting('LiteGraph.Reroute.SplineOffset', 80)
+    })
 
-  test('loads from workflow', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('reroute/native_reroute')
-    await expect(comfyPage.canvas).toHaveScreenshot('native_reroute.png')
-  })
+    test('loads from workflow', async ({ comfyPage }) => {
+      await comfyPage.workflow.loadWorkflow('reroute/native_reroute')
+      await expect(comfyPage.canvas).toHaveScreenshot('native_reroute.png')
+    })
 
-  test('@2x @0.5x Can add reroute by alt clicking on link', async ({
-    comfyPage
-  }) => {
-    const loadCheckpointNode = (
-      await comfyPage.getNodeRefsByTitle('Load Checkpoint')
-    )[0]
-    const clipEncodeNode = (
-      await comfyPage.getNodeRefsByTitle('CLIP Text Encode (Prompt)')
-    )[0]
+    test('@2x @0.5x Can add reroute by alt clicking on link', async ({
+      comfyPage
+    }) => {
+      const loadCheckpointNode = (
+        await comfyPage.nodeOps.getNodeRefsByTitle('Load Checkpoint')
+      )[0]
+      const clipEncodeNode = (
+        await comfyPage.nodeOps.getNodeRefsByTitle('CLIP Text Encode (Prompt)')
+      )[0]
 
-    const slot1 = await loadCheckpointNode.getOutput(1)
-    const slot2 = await clipEncodeNode.getInput(0)
-    const middlePoint = getMiddlePoint(
-      await slot1.getPosition(),
-      await slot2.getPosition()
-    )
+      const slot1 = await loadCheckpointNode.getOutput(1)
+      const slot2 = await clipEncodeNode.getInput(0)
+      const middlePoint = getMiddlePoint(
+        await slot1.getPosition(),
+        await slot2.getPosition()
+      )
 
-    await comfyPage.page.keyboard.down('Alt')
-    await comfyPage.page.mouse.click(middlePoint.x, middlePoint.y)
-    await comfyPage.page.keyboard.up('Alt')
+      await comfyPage.page.keyboard.down('Alt')
+      await comfyPage.page.mouse.click(middlePoint.x, middlePoint.y)
+      await comfyPage.page.keyboard.up('Alt')
 
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'native_reroute_alt_click.png'
-    )
-  })
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'native_reroute_alt_click.png'
+      )
+    })
 
-  test('Can add reroute by clicking middle of link context menu', async ({
-    comfyPage
-  }) => {
-    const loadCheckpointNode = (
-      await comfyPage.getNodeRefsByTitle('Load Checkpoint')
-    )[0]
-    const clipEncodeNode = (
-      await comfyPage.getNodeRefsByTitle('CLIP Text Encode (Prompt)')
-    )[0]
+    test('Can add reroute by clicking middle of link context menu', async ({
+      comfyPage
+    }) => {
+      const loadCheckpointNode = (
+        await comfyPage.nodeOps.getNodeRefsByTitle('Load Checkpoint')
+      )[0]
+      const clipEncodeNode = (
+        await comfyPage.nodeOps.getNodeRefsByTitle('CLIP Text Encode (Prompt)')
+      )[0]
 
-    const slot1 = await loadCheckpointNode.getOutput(1)
-    const slot2 = await clipEncodeNode.getInput(0)
-    const middlePoint = getMiddlePoint(
-      await slot1.getPosition(),
-      await slot2.getPosition()
-    )
+      const slot1 = await loadCheckpointNode.getOutput(1)
+      const slot2 = await clipEncodeNode.getInput(0)
+      const middlePoint = getMiddlePoint(
+        await slot1.getPosition(),
+        await slot2.getPosition()
+      )
 
-    await comfyPage.page.mouse.click(middlePoint.x, middlePoint.y)
-    await comfyPage.page
-      .locator('.litecontextmenu .litemenu-entry', { hasText: 'Add Reroute' })
-      .click()
+      await comfyPage.page.mouse.click(middlePoint.x, middlePoint.y)
+      await comfyPage.page
+        .locator('.litecontextmenu .litemenu-entry', { hasText: 'Add Reroute' })
+        .click()
 
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'native_reroute_context_menu.png'
-    )
-  })
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'native_reroute_context_menu.png'
+      )
+    })
 
-  test('Can delete link that is connected to two reroutes', async ({
-    comfyPage
-  }) => {
-    // https://github.com/Comfy-Org/ComfyUI_frontend/issues/4695
-    await comfyPage.loadWorkflow(
-      'reroute/single-native-reroute-default-workflow'
-    )
+    test('Can delete link that is connected to two reroutes', async ({
+      comfyPage
+    }) => {
+      // https://github.com/Comfy-Org/ComfyUI_frontend/issues/4695
+      await comfyPage.workflow.loadWorkflow(
+        'reroute/single-native-reroute-default-workflow'
+      )
 
-    // To find the clickable midpoint button, we use the hardcoded value from the browser logs
-    // since the link is a bezier curve and not a straight line.
-    const middlePoint = { x: 359.4188232421875, y: 468.7716979980469 }
+      // To find the clickable midpoint button, we use the hardcoded value from the browser logs
+      // since the link is a bezier curve and not a straight line.
+      const middlePoint = { x: 359.4188232421875, y: 468.7716979980469 }
 
-    // Click the middle point of the link to open the context menu.
-    await comfyPage.page.mouse.click(middlePoint.x, middlePoint.y)
+      // Click the middle point of the link to open the context menu.
+      await comfyPage.page.mouse.click(middlePoint.x, middlePoint.y)
 
-    // Click the "Delete" context menu option.
-    await comfyPage.page
-      .locator('.litecontextmenu .litemenu-entry', { hasText: 'Delete' })
-      .click()
+      // Click the "Delete" context menu option.
+      await comfyPage.page
+        .locator('.litecontextmenu .litemenu-entry', { hasText: 'Delete' })
+        .click()
 
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'native_reroute_delete_from_midpoint_context_menu.png'
-    )
-  })
-})
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'native_reroute_delete_from_midpoint_context_menu.png'
+      )
+    })
+  }
+)
diff --git a/browser_tests/tests/rightClickMenu.spec.ts b/browser_tests/tests/rightClickMenu.spec.ts
index d2c17b43db..6ddc9942e7 100644
--- a/browser_tests/tests/rightClickMenu.spec.ts
+++ b/browser_tests/tests/rightClickMenu.spec.ts
@@ -2,50 +2,65 @@ import { expect } from '@playwright/test'
 
 import { NodeBadgeMode } from '../../src/types/nodeSource'
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+import { DefaultGraphPositions } from '../fixtures/constants/defaultGraphPositions'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
-test.describe('Canvas Right Click Menu', () => {
-  test('Can add node', async ({ comfyPage }) => {
-    await comfyPage.rightClickCanvas()
-    await expect(comfyPage.canvas).toHaveScreenshot('right-click-menu.png')
-    await comfyPage.page.getByText('Add Node').click()
-    await comfyPage.nextFrame()
-    await comfyPage.page.getByText('loaders').click()
-    await comfyPage.nextFrame()
-    await comfyPage.page.getByText('Load VAE').click()
-    await comfyPage.nextFrame()
-    await expect(comfyPage.canvas).toHaveScreenshot('add-node-node-added.png')
-  })
+test.describe(
+  'Canvas Right Click Menu',
+  { tag: ['@screenshot', '@ui'] },
+  () => {
+    test('Can add node', async ({ comfyPage }) => {
+      await comfyPage.canvasOps.rightClick()
+      await expect(comfyPage.canvas).toHaveScreenshot('right-click-menu.png')
+      await comfyPage.page.getByText('Add Node').click()
+      await comfyPage.nextFrame()
+      await comfyPage.page.getByText('loaders').click()
+      await comfyPage.nextFrame()
+      await comfyPage.page.getByText('Load VAE').click()
+      await comfyPage.nextFrame()
+      await expect(comfyPage.canvas).toHaveScreenshot('add-node-node-added.png')
+    })
 
-  test('Can add group', async ({ comfyPage }) => {
-    await comfyPage.rightClickCanvas()
-    await expect(comfyPage.canvas).toHaveScreenshot('right-click-menu.png')
-    await comfyPage.page.getByText('Add Group', { exact: true }).click()
-    await comfyPage.nextFrame()
-    await expect(comfyPage.canvas).toHaveScreenshot('add-group-group-added.png')
-  })
+    test('Can add group', async ({ comfyPage }) => {
+      await comfyPage.canvasOps.rightClick()
+      await expect(comfyPage.canvas).toHaveScreenshot('right-click-menu.png')
+      await comfyPage.page.getByText('Add Group', { exact: true }).click()
+      await comfyPage.nextFrame()
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'add-group-group-added.png'
+      )
+    })
 
-  test('Can convert to group node', async ({ comfyPage }) => {
-    await comfyPage.select2Nodes()
-    await expect(comfyPage.canvas).toHaveScreenshot('selected-2-nodes.png')
-    await comfyPage.rightClickCanvas()
-    await comfyPage.clickContextMenuItem('Convert to Group Node (Deprecated)')
-    await comfyPage.promptDialogInput.fill('GroupNode2CLIP')
-    await comfyPage.page.keyboard.press('Enter')
-    await comfyPage.promptDialogInput.waitFor({ state: 'hidden' })
-    await comfyPage.nextFrame()
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'right-click-node-group-node.png'
-    )
-  })
-})
+    test('Can convert to group node', async ({ comfyPage }) => {
+      await comfyPage.nodeOps.selectNodes(['CLIP Text Encode (Prompt)'])
+      await expect(comfyPage.canvas).toHaveScreenshot('selected-2-nodes.png')
+      await comfyPage.canvasOps.rightClick()
+      await comfyPage.contextMenu.clickMenuItem(
+        'Convert to Group Node (Deprecated)'
+      )
+      await comfyPage.nextFrame()
+      await comfyPage.nodeOps.promptDialogInput.fill('GroupNode2CLIP')
+      await comfyPage.page.keyboard.press('Enter')
+      await comfyPage.nodeOps.promptDialogInput.waitFor({ state: 'hidden' })
+      await comfyPage.nextFrame()
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'right-click-node-group-node.png'
+      )
+    })
+  }
+)
 
-test.describe('Node Right Click Menu', () => {
+test.describe('Node Right Click Menu', { tag: ['@screenshot', '@ui'] }, () => {
   test('Can open properties panel', async ({ comfyPage }) => {
-    await comfyPage.rightClickEmptyLatentNode()
+    await comfyPage.canvas.click({
+      position: DefaultGraphPositions.emptyLatentWidgetClick,
+      button: 'right'
+    })
+    await comfyPage.page.mouse.move(10, 10)
+    await comfyPage.nextFrame()
     await expect(comfyPage.canvas).toHaveScreenshot('right-click-node.png')
     await comfyPage.page.getByText('Properties Panel').click()
     await comfyPage.nextFrame()
@@ -55,7 +70,12 @@ test.describe('Node Right Click Menu', () => {
   })
 
   test('Can collapse', async ({ comfyPage }) => {
-    await comfyPage.rightClickEmptyLatentNode()
+    await comfyPage.canvas.click({
+      position: DefaultGraphPositions.emptyLatentWidgetClick,
+      button: 'right'
+    })
+    await comfyPage.page.mouse.move(10, 10)
+    await comfyPage.nextFrame()
     await expect(comfyPage.canvas).toHaveScreenshot('right-click-node.png')
     await comfyPage.page.getByText('Collapse').click()
     await comfyPage.nextFrame()
@@ -65,16 +85,21 @@ test.describe('Node Right Click Menu', () => {
   })
 
   test('Can collapse (Node Badge)', async ({ comfyPage }) => {
-    await comfyPage.setSetting(
+    await comfyPage.settings.setSetting(
       'Comfy.NodeBadge.NodeIdBadgeMode',
       NodeBadgeMode.ShowAll
     )
-    await comfyPage.setSetting(
+    await comfyPage.settings.setSetting(
       'Comfy.NodeBadge.NodeSourceBadgeMode',
       NodeBadgeMode.ShowAll
     )
 
-    await comfyPage.rightClickEmptyLatentNode()
+    await comfyPage.canvas.click({
+      position: DefaultGraphPositions.emptyLatentWidgetClick,
+      button: 'right'
+    })
+    await comfyPage.page.mouse.move(10, 10)
+    await comfyPage.nextFrame()
     await comfyPage.page.getByText('Collapse').click()
     await comfyPage.nextFrame()
     await expect(comfyPage.canvas).toHaveScreenshot(
@@ -83,7 +108,12 @@ test.describe('Node Right Click Menu', () => {
   })
 
   test('Can bypass', async ({ comfyPage }) => {
-    await comfyPage.rightClickEmptyLatentNode()
+    await comfyPage.canvas.click({
+      position: DefaultGraphPositions.emptyLatentWidgetClick,
+      button: 'right'
+    })
+    await comfyPage.page.mouse.move(10, 10)
+    await comfyPage.nextFrame()
     await expect(comfyPage.canvas).toHaveScreenshot('right-click-node.png')
     await comfyPage.page.getByText('Bypass').click()
     await comfyPage.nextFrame()
@@ -93,46 +123,89 @@ test.describe('Node Right Click Menu', () => {
   })
 
   test('Can pin and unpin', async ({ comfyPage }) => {
-    await comfyPage.rightClickEmptyLatentNode()
+    await comfyPage.canvas.click({
+      position: DefaultGraphPositions.emptyLatentWidgetClick,
+      button: 'right'
+    })
+    await comfyPage.page.mouse.move(10, 10)
+    await comfyPage.nextFrame()
     await expect(comfyPage.canvas).toHaveScreenshot('right-click-node.png')
     await comfyPage.page.click('.litemenu-entry:has-text("Pin")')
     await comfyPage.nextFrame()
-    await comfyPage.dragAndDrop({ x: 621, y: 617 }, { x: 16, y: 16 })
+
+    // Get EmptyLatentImage node title position dynamically (for dragging)
+    const emptyLatentNode = await comfyPage.nodeOps.getNodeRefById(5)
+    const titlePos = await emptyLatentNode.getTitlePosition()
+    await comfyPage.canvasOps.dragAndDrop(titlePos, { x: 16, y: 16 })
     await expect(comfyPage.canvas).toHaveScreenshot('node-pinned.png')
-    await comfyPage.rightClickEmptyLatentNode()
+    await comfyPage.canvas.click({
+      position: DefaultGraphPositions.emptyLatentWidgetClick,
+      button: 'right'
+    })
+    await comfyPage.page.mouse.move(10, 10)
+    await comfyPage.nextFrame()
     await expect(comfyPage.canvas).toHaveScreenshot(
       'right-click-pinned-node.png'
     )
     await comfyPage.page.click('.litemenu-entry:has-text("Unpin")')
     await comfyPage.nextFrame()
-    await comfyPage.rightClickEmptyLatentNode()
+    await comfyPage.canvas.click({
+      position: DefaultGraphPositions.emptyLatentWidgetClick,
+      button: 'right'
+    })
+    await comfyPage.page.mouse.move(10, 10)
+    await comfyPage.nextFrame()
     await expect(comfyPage.canvas).toHaveScreenshot(
       'right-click-unpinned-node.png'
     )
   })
 
   test('Can move after unpin', async ({ comfyPage }) => {
-    await comfyPage.rightClickEmptyLatentNode()
+    await comfyPage.canvas.click({
+      position: DefaultGraphPositions.emptyLatentWidgetClick,
+      button: 'right'
+    })
+    await comfyPage.page.mouse.move(10, 10)
+    await comfyPage.nextFrame()
     await comfyPage.page.click('.litemenu-entry:has-text("Pin")')
     await comfyPage.nextFrame()
-    await comfyPage.rightClickEmptyLatentNode()
+    await comfyPage.canvas.click({
+      position: DefaultGraphPositions.emptyLatentWidgetClick,
+      button: 'right'
+    })
+    await comfyPage.page.mouse.move(10, 10)
+    await comfyPage.nextFrame()
     await comfyPage.page.click('.litemenu-entry:has-text("Unpin")')
     await comfyPage.nextFrame()
-    await comfyPage.dragAndDrop({ x: 496, y: 618 }, { x: 200, y: 590 })
+
+    // Get EmptyLatentImage node title position dynamically (for dragging)
+    const emptyLatentNode = await comfyPage.nodeOps.getNodeRefById(5)
+    const titlePos = await emptyLatentNode.getTitlePosition()
+    await comfyPage.canvasOps.dragAndDrop(titlePos, { x: 200, y: 590 })
     await expect(comfyPage.canvas).toHaveScreenshot(
       'right-click-unpinned-node-moved.png'
     )
   })
 
   test('Can pin/unpin selected nodes', async ({ comfyPage }) => {
-    await comfyPage.select2Nodes()
+    await comfyPage.nodeOps.selectNodes(['CLIP Text Encode (Prompt)'])
     await comfyPage.page.keyboard.down('Control')
-    await comfyPage.rightClickEmptyLatentNode()
+    await comfyPage.canvas.click({
+      position: DefaultGraphPositions.emptyLatentWidgetClick,
+      button: 'right'
+    })
+    await comfyPage.page.mouse.move(10, 10)
+    await comfyPage.nextFrame()
     await comfyPage.page.click('.litemenu-entry:has-text("Pin")')
     await comfyPage.page.keyboard.up('Control')
     await comfyPage.nextFrame()
     await expect(comfyPage.canvas).toHaveScreenshot('selected-nodes-pinned.png')
-    await comfyPage.rightClickEmptyLatentNode()
+    await comfyPage.canvas.click({
+      position: DefaultGraphPositions.emptyLatentWidgetClick,
+      button: 'right'
+    })
+    await comfyPage.page.mouse.move(10, 10)
+    await comfyPage.nextFrame()
     await comfyPage.page.click('.litemenu-entry:has-text("Unpin")')
     await comfyPage.nextFrame()
     await expect(comfyPage.canvas).toHaveScreenshot(
@@ -141,8 +214,8 @@ test.describe('Node Right Click Menu', () => {
   })
 
   test('Can clone pinned nodes', async ({ comfyPage }) => {
-    const nodeCount = await comfyPage.getGraphNodesCount()
-    const node = (await comfyPage.getFirstNodeRef())!
+    const nodeCount = await comfyPage.nodeOps.getGraphNodesCount()
+    const node = (await comfyPage.nodeOps.getFirstNodeRef())!
     await node.clickContextMenuOption('Pin')
     await comfyPage.nextFrame()
     await node.click('title', { button: 'right' })
@@ -155,6 +228,6 @@ test.describe('Node Right Click Menu', () => {
     await cloneItem.click()
     await expect(cloneItem).toHaveCount(0)
     await comfyPage.nextFrame()
-    expect(await comfyPage.getGraphNodesCount()).toBe(nodeCount + 1)
+    expect(await comfyPage.nodeOps.getGraphNodesCount()).toBe(nodeCount + 1)
   })
 })
diff --git a/browser_tests/tests/rightClickMenu.spec.ts-snapshots/right-click-node-chromium-linux.png b/browser_tests/tests/rightClickMenu.spec.ts-snapshots/right-click-node-chromium-linux.png
index 07ff7a0968..885e463568 100644
Binary files a/browser_tests/tests/rightClickMenu.spec.ts-snapshots/right-click-node-chromium-linux.png and b/browser_tests/tests/rightClickMenu.spec.ts-snapshots/right-click-node-chromium-linux.png differ
diff --git a/browser_tests/tests/rightClickMenu.spec.ts-snapshots/right-click-node-collapsed-badge-chromium-linux.png b/browser_tests/tests/rightClickMenu.spec.ts-snapshots/right-click-node-collapsed-badge-chromium-linux.png
index 97144d4827..89f053aff1 100644
Binary files a/browser_tests/tests/rightClickMenu.spec.ts-snapshots/right-click-node-collapsed-badge-chromium-linux.png and b/browser_tests/tests/rightClickMenu.spec.ts-snapshots/right-click-node-collapsed-badge-chromium-linux.png differ
diff --git a/browser_tests/tests/rightClickMenu.spec.ts-snapshots/right-click-pinned-node-chromium-linux.png b/browser_tests/tests/rightClickMenu.spec.ts-snapshots/right-click-pinned-node-chromium-linux.png
index 7ecb4123e7..39e3ade033 100644
Binary files a/browser_tests/tests/rightClickMenu.spec.ts-snapshots/right-click-pinned-node-chromium-linux.png and b/browser_tests/tests/rightClickMenu.spec.ts-snapshots/right-click-pinned-node-chromium-linux.png differ
diff --git a/browser_tests/tests/rightClickMenu.spec.ts-snapshots/right-click-unpinned-node-chromium-linux.png b/browser_tests/tests/rightClickMenu.spec.ts-snapshots/right-click-unpinned-node-chromium-linux.png
index 07ff7a0968..885e463568 100644
Binary files a/browser_tests/tests/rightClickMenu.spec.ts-snapshots/right-click-unpinned-node-chromium-linux.png and b/browser_tests/tests/rightClickMenu.spec.ts-snapshots/right-click-unpinned-node-chromium-linux.png differ
diff --git a/browser_tests/tests/rightClickMenu.spec.ts-snapshots/right-click-unpinned-node-moved-chromium-linux.png b/browser_tests/tests/rightClickMenu.spec.ts-snapshots/right-click-unpinned-node-moved-chromium-linux.png
index 1f31463780..0701d1d4c0 100644
Binary files a/browser_tests/tests/rightClickMenu.spec.ts-snapshots/right-click-unpinned-node-moved-chromium-linux.png and b/browser_tests/tests/rightClickMenu.spec.ts-snapshots/right-click-unpinned-node-moved-chromium-linux.png differ
diff --git a/browser_tests/tests/saveImageAndWebp.spec.ts b/browser_tests/tests/saveImageAndWebp.spec.ts
new file mode 100644
index 0000000000..a4929c5e42
--- /dev/null
+++ b/browser_tests/tests/saveImageAndWebp.spec.ts
@@ -0,0 +1,42 @@
+import { expect } from '@playwright/test'
+
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+
+test.describe(
+  'Save Image and WEBM preview',
+  { tag: ['@screenshot', '@widget'] },
+  () => {
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+      await comfyPage.vueNodes.waitForNodes()
+    })
+
+    test('Can preview both SaveImage and SaveWEBM outputs', async ({
+      comfyPage
+    }) => {
+      await comfyPage.workflow.loadWorkflow(
+        'widgets/save_image_and_animated_webp'
+      )
+      await comfyPage.vueNodes.waitForNodes()
+
+      await comfyPage.runButton.click()
+
+      const saveImageNode = comfyPage.vueNodes.getNodeByTitle('Save Image')
+      const saveWebmNode = comfyPage.vueNodes.getNodeByTitle('SaveWEBM')
+
+      // Wait for SaveImage to render an img inside .image-preview
+      await expect(saveImageNode.locator('.image-preview img')).toBeVisible({
+        timeout: 30000
+      })
+
+      // Wait for SaveWEBM to render a video inside .video-preview
+      await expect(saveWebmNode.locator('.video-preview video')).toBeVisible({
+        timeout: 30000
+      })
+
+      await expect(comfyPage.page).toHaveScreenshot(
+        'save-image-and-webm-preview.png'
+      )
+    })
+  }
+)
diff --git a/browser_tests/tests/saveImageAndWebp.spec.ts-snapshots/save-image-and-webm-preview-chromium-darwin.png b/browser_tests/tests/saveImageAndWebp.spec.ts-snapshots/save-image-and-webm-preview-chromium-darwin.png
new file mode 100644
index 0000000000..41f05af13c
Binary files /dev/null and b/browser_tests/tests/saveImageAndWebp.spec.ts-snapshots/save-image-and-webm-preview-chromium-darwin.png differ
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
new file mode 100644
index 0000000000..3b776c3dea
Binary files /dev/null and b/browser_tests/tests/saveImageAndWebp.spec.ts-snapshots/save-image-and-webm-preview-chromium-linux.png differ
diff --git a/browser_tests/tests/selectionToolbox.spec.ts b/browser_tests/tests/selectionToolbox.spec.ts
index 6b85769826..5a89da6dd2 100644
--- a/browser_tests/tests/selectionToolbox.spec.ts
+++ b/browser_tests/tests/selectionToolbox.spec.ts
@@ -1,18 +1,31 @@
 import { expect } from '@playwright/test'
+import type { Page } from '@playwright/test'
 
 import { comfyPageFixture } from '../fixtures/ComfyPage'
+import { TestIds } from '../fixtures/selectors'
 
 const test = comfyPageFixture
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 const BLUE_COLOR = 'rgb(51, 51, 85)'
 const RED_COLOR = 'rgb(85, 51, 51)'
 
-test.describe('Selection Toolbox', () => {
+const getColorPickerButton = (comfyPage: { page: Page }) =>
+  comfyPage.page.getByTestId(TestIds.selectionToolbox.colorPickerButton)
+
+const getColorPickerCurrentColor = (comfyPage: { page: Page }) =>
+  comfyPage.page.getByTestId(TestIds.selectionToolbox.colorPickerCurrentColor)
+
+const getColorPickerGroup = (comfyPage: { page: Page }) =>
+  comfyPage.page.getByRole('group').filter({
+    has: comfyPage.page.getByTestId(TestIds.selectionToolbox.colorBlue)
+  })
+
+test.describe('Selection Toolbox', { tag: ['@screenshot', '@ui'] }, () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.Canvas.SelectionToolbox', true)
+    await comfyPage.settings.setSetting('Comfy.Canvas.SelectionToolbox', true)
   })
 
   test('shows selection toolbox', async ({ comfyPage }) => {
@@ -20,7 +33,10 @@ test.describe('Selection Toolbox', () => {
     await expect(comfyPage.selectionToolbox).not.toBeVisible()
 
     // Select multiple nodes
-    await comfyPage.selectNodes(['KSampler', 'CLIP Text Encode (Prompt)'])
+    await comfyPage.nodeOps.selectNodes([
+      'KSampler',
+      'CLIP Text Encode (Prompt)'
+    ])
 
     // Selection toolbox should be visible with multiple nodes selected
     await expect(comfyPage.selectionToolbox).toBeVisible()
@@ -33,11 +49,11 @@ test.describe('Selection Toolbox', () => {
   test('shows at correct position when node is pasted', async ({
     comfyPage
   }) => {
-    await comfyPage.loadWorkflow('nodes/single_ksampler')
-    await comfyPage.selectNodes(['KSampler'])
-    await comfyPage.ctrlC()
+    await comfyPage.workflow.loadWorkflow('nodes/single_ksampler')
+    await comfyPage.nodeOps.selectNodes(['KSampler'])
+    await comfyPage.clipboard.copy()
     await comfyPage.page.mouse.move(100, 100)
-    await comfyPage.ctrlV()
+    await comfyPage.clipboard.paste()
 
     const toolboxContainer = comfyPage.selectionToolbox
     await expect(toolboxContainer).toBeVisible()
@@ -54,8 +70,8 @@ test.describe('Selection Toolbox', () => {
   test('hide when select and drag happen at the same time', async ({
     comfyPage
   }) => {
-    await comfyPage.loadWorkflow('nodes/single_ksampler')
-    const node = (await comfyPage.getNodeRefsByTitle('KSampler'))[0]
+    await comfyPage.workflow.loadWorkflow('nodes/single_ksampler')
+    const node = (await comfyPage.nodeOps.getNodeRefsByTitle('KSampler'))[0]
     const nodePos = await node.getPosition()
 
     // Drag on the title of the node
@@ -68,7 +84,7 @@ test.describe('Selection Toolbox', () => {
 
   test('shows border only with multiple selections', async ({ comfyPage }) => {
     // Select single node
-    await comfyPage.selectNodes(['KSampler'])
+    await comfyPage.nodeOps.selectNodes(['KSampler'])
 
     // Selection toolbox should be visible but without border
     await expect(comfyPage.selectionToolbox).toBeVisible()
@@ -78,7 +94,10 @@ test.describe('Selection Toolbox', () => {
     )
 
     // Select multiple nodes
-    await comfyPage.selectNodes(['KSampler', 'CLIP Text Encode (Prompt)'])
+    await comfyPage.nodeOps.selectNodes([
+      'KSampler',
+      'CLIP Text Encode (Prompt)'
+    ])
 
     // Selection border should show with multiple selections (canvas-based)
     await expect(comfyPage.canvas).toHaveScreenshot(
@@ -86,7 +105,7 @@ test.describe('Selection Toolbox', () => {
     )
 
     // Deselect to single node
-    await comfyPage.selectNodes(['CLIP Text Encode (Prompt)'])
+    await comfyPage.nodeOps.selectNodes(['CLIP Text Encode (Prompt)'])
 
     // Border should be hidden again (canvas-based)
     await expect(comfyPage.canvas).toHaveScreenshot(
@@ -98,7 +117,7 @@ test.describe('Selection Toolbox', () => {
     comfyPage
   }) => {
     // A group + a KSampler node
-    await comfyPage.loadWorkflow('groups/single_group')
+    await comfyPage.workflow.loadWorkflow('groups/single_group')
 
     // Select group + node should show bypass button
     await comfyPage.page.focus('canvas')
@@ -110,7 +129,7 @@ test.describe('Selection Toolbox', () => {
     ).toBeVisible()
 
     // Deselect node (Only group is selected) should hide bypass button
-    await comfyPage.selectNodes(['KSampler'])
+    await comfyPage.nodeOps.selectNodes(['KSampler'])
     await expect(
       comfyPage.page.locator(
         '.selection-toolbox *[data-testid="bypass-button"]'
@@ -123,35 +142,33 @@ test.describe('Selection Toolbox', () => {
       comfyPage
     }) => {
       // Select a node
-      await comfyPage.selectNodes(['KSampler'])
+      await comfyPage.nodeOps.selectNodes(['KSampler'])
 
       // Color picker button should be visible
-      const colorPickerButton = comfyPage.page.locator(
-        '.selection-toolbox .pi-circle-fill'
-      )
+      const colorPickerButton = getColorPickerButton(comfyPage)
       await expect(colorPickerButton).toBeVisible()
 
       // Click color picker button
       await colorPickerButton.click()
 
       // Color picker dropdown should be visible
-      const colorPickerDropdown = comfyPage.page.locator(
-        '.color-picker-container'
-      )
-      await expect(colorPickerDropdown).toBeVisible()
+      const colorPickerGroup = getColorPickerGroup(comfyPage)
+      await expect(colorPickerGroup).toBeVisible()
 
       // Select a color (e.g., blue)
-      const blueColorOption = colorPickerDropdown.locator(
-        'i[data-testid="blue"]'
+      const blueColorOption = colorPickerGroup.getByTestId(
+        TestIds.selectionToolbox.colorBlue
       )
       await blueColorOption.click()
 
       // Dropdown should close after selection
-      await expect(colorPickerDropdown).not.toBeVisible()
+      await expect(colorPickerGroup).not.toBeVisible()
 
       // Node should have the selected color class/style
       // Note: Exact verification method depends on how color is applied to nodes
-      const selectedNode = (await comfyPage.getNodeRefsByTitle('KSampler'))[0]
+      const selectedNode = (
+        await comfyPage.nodeOps.getNodeRefsByTitle('KSampler')
+      )[0]
       expect(await selectedNode.getProperty('color')).not.toBeNull()
     })
 
@@ -159,51 +176,54 @@ test.describe('Selection Toolbox', () => {
       comfyPage
     }) => {
       // Select multiple nodes
-      await comfyPage.selectNodes(['KSampler', 'CLIP Text Encode (Prompt)'])
+      await comfyPage.nodeOps.selectNodes([
+        'KSampler',
+        'CLIP Text Encode (Prompt)'
+      ])
 
-      const colorPickerButton = comfyPage.page.locator(
-        '.selection-toolbox .pi-circle-fill'
-      )
+      const colorPickerButton = getColorPickerButton(comfyPage)
+      const colorPickerCurrentColor = getColorPickerCurrentColor(comfyPage)
 
       // Initially should show default color
       await expect(colorPickerButton).not.toHaveAttribute('color')
 
       // Click color picker and select a color
       await colorPickerButton.click()
-      const redColorOption = comfyPage.page.locator(
-        '.color-picker-container i[data-testid="red"]'
+      const redColorOption = getColorPickerGroup(comfyPage).getByTestId(
+        TestIds.selectionToolbox.colorRed
       )
       await redColorOption.click()
 
       // Button should now show the selected color
-      await expect(colorPickerButton).toHaveCSS('color', RED_COLOR)
+      await expect(colorPickerCurrentColor).toHaveCSS('color', RED_COLOR)
     })
 
     test('color picker shows mixed state for differently colored selections', async ({
       comfyPage
     }) => {
       // Select first node and color it
-      await comfyPage.selectNodes(['KSampler'])
-      await comfyPage.page.locator('.selection-toolbox .pi-circle-fill').click()
-      await comfyPage.page
-        .locator('.color-picker-container i[data-testid="blue"]')
+      await comfyPage.nodeOps.selectNodes(['KSampler'])
+      await getColorPickerButton(comfyPage).click()
+      await getColorPickerGroup(comfyPage)
+        .getByTestId(TestIds.selectionToolbox.colorBlue)
         .click()
-      await comfyPage.selectNodes(['KSampler'])
+      await comfyPage.nodeOps.selectNodes(['KSampler'])
 
       // Select second node and color it differently
-      await comfyPage.selectNodes(['CLIP Text Encode (Prompt)'])
-      await comfyPage.page.locator('.selection-toolbox .pi-circle-fill').click()
-      await comfyPage.page
-        .locator('.color-picker-container i[data-testid="red"]')
+      await comfyPage.nodeOps.selectNodes(['CLIP Text Encode (Prompt)'])
+      await getColorPickerButton(comfyPage).click()
+      await getColorPickerGroup(comfyPage)
+        .getByTestId(TestIds.selectionToolbox.colorRed)
         .click()
 
       // Select both nodes
-      await comfyPage.selectNodes(['KSampler', 'CLIP Text Encode (Prompt)'])
+      await comfyPage.nodeOps.selectNodes([
+        'KSampler',
+        'CLIP Text Encode (Prompt)'
+      ])
 
       // Color picker should show null/mixed state
-      const colorPickerButton = comfyPage.page.locator(
-        '.selection-toolbox .pi-circle-fill'
-      )
+      const colorPickerButton = getColorPickerButton(comfyPage)
       await expect(colorPickerButton).not.toHaveAttribute('color')
     })
 
@@ -211,33 +231,31 @@ test.describe('Selection Toolbox', () => {
       comfyPage
     }) => {
       // First color a node
-      await comfyPage.selectNodes(['KSampler'])
-      await comfyPage.page.locator('.selection-toolbox .pi-circle-fill').click()
-      await comfyPage.page
-        .locator('.color-picker-container i[data-testid="blue"]')
+      await comfyPage.nodeOps.selectNodes(['KSampler'])
+      await getColorPickerButton(comfyPage).click()
+      await getColorPickerGroup(comfyPage)
+        .getByTestId(TestIds.selectionToolbox.colorBlue)
         .click()
 
       // Clear selection
-      await comfyPage.selectNodes(['KSampler'])
+      await comfyPage.nodeOps.selectNodes(['KSampler'])
 
       // Re-select the node
-      await comfyPage.selectNodes(['KSampler'])
+      await comfyPage.nodeOps.selectNodes(['KSampler'])
 
       // Color picker button should show the correct color
-      const colorPickerButton = comfyPage.page.locator(
-        '.selection-toolbox .pi-circle-fill'
-      )
-      await expect(colorPickerButton).toHaveCSS('color', BLUE_COLOR)
+      const colorPickerCurrentColor = getColorPickerCurrentColor(comfyPage)
+      await expect(colorPickerCurrentColor).toHaveCSS('color', BLUE_COLOR)
     })
 
     test('colorization via color picker can be undone', async ({
       comfyPage
     }) => {
       // Select a node and color it
-      await comfyPage.selectNodes(['KSampler'])
-      await comfyPage.page.locator('.selection-toolbox .pi-circle-fill').click()
-      await comfyPage.page
-        .locator('.color-picker-container i[data-testid="blue"]')
+      await comfyPage.nodeOps.selectNodes(['KSampler'])
+      await getColorPickerButton(comfyPage).click()
+      await getColorPickerGroup(comfyPage)
+        .getByTestId(TestIds.selectionToolbox.colorBlue)
         .click()
 
       // Undo the colorization
@@ -245,7 +263,9 @@ test.describe('Selection Toolbox', () => {
       await comfyPage.nextFrame()
 
       // Node should be uncolored again
-      const selectedNode = (await comfyPage.getNodeRefsByTitle('KSampler'))[0]
+      const selectedNode = (
+        await comfyPage.nodeOps.getNodeRefsByTitle('KSampler')
+      )[0]
       expect(await selectedNode.getProperty('color')).toBeUndefined()
     })
   })
diff --git a/browser_tests/tests/selectionToolbox.spec.ts-snapshots/selection-toolbox-multiple-nodes-border-chromium-linux.png b/browser_tests/tests/selectionToolbox.spec.ts-snapshots/selection-toolbox-multiple-nodes-border-chromium-linux.png
index d0bc960227..93bcf0b1bb 100644
Binary files a/browser_tests/tests/selectionToolbox.spec.ts-snapshots/selection-toolbox-multiple-nodes-border-chromium-linux.png and b/browser_tests/tests/selectionToolbox.spec.ts-snapshots/selection-toolbox-multiple-nodes-border-chromium-linux.png differ
diff --git a/browser_tests/tests/selectionToolbox.spec.ts-snapshots/selection-toolbox-multiple-selections-border-chromium-linux.png b/browser_tests/tests/selectionToolbox.spec.ts-snapshots/selection-toolbox-multiple-selections-border-chromium-linux.png
index d60314ef33..6db83b57b5 100644
Binary files a/browser_tests/tests/selectionToolbox.spec.ts-snapshots/selection-toolbox-multiple-selections-border-chromium-linux.png and b/browser_tests/tests/selectionToolbox.spec.ts-snapshots/selection-toolbox-multiple-selections-border-chromium-linux.png differ
diff --git a/browser_tests/tests/selectionToolbox.spec.ts-snapshots/selection-toolbox-single-node-no-border-chromium-linux.png b/browser_tests/tests/selectionToolbox.spec.ts-snapshots/selection-toolbox-single-node-no-border-chromium-linux.png
index 5cd966a4ec..d013577553 100644
Binary files a/browser_tests/tests/selectionToolbox.spec.ts-snapshots/selection-toolbox-single-node-no-border-chromium-linux.png and b/browser_tests/tests/selectionToolbox.spec.ts-snapshots/selection-toolbox-single-node-no-border-chromium-linux.png differ
diff --git a/browser_tests/tests/selectionToolboxSubmenus.spec.ts b/browser_tests/tests/selectionToolboxSubmenus.spec.ts
index f526b07e08..c97d5d5b35 100644
--- a/browser_tests/tests/selectionToolboxSubmenus.spec.ts
+++ b/browser_tests/tests/selectionToolboxSubmenus.spec.ts
@@ -1,183 +1,208 @@
 import { expect } from '@playwright/test'
 
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+import type { ComfyPage } from '../fixtures/ComfyPage'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
-test.describe('Selection Toolbox - More Options Submenus', () => {
-  test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.Canvas.SelectionToolbox', true)
-    await comfyPage.loadWorkflow('nodes/single_ksampler')
-    await comfyPage.nextFrame()
-    await comfyPage.selectNodes(['KSampler'])
-    await comfyPage.nextFrame()
-  })
-
-  const openMoreOptions = async (comfyPage: any) => {
-    const ksamplerNodes = await comfyPage.getNodeRefsByTitle('KSampler')
-    if (ksamplerNodes.length === 0) {
-      throw new Error('No KSampler nodes found')
-    }
-
-    // Drag the KSampler to the center of the screen
-    const nodePos = await ksamplerNodes[0].getPosition()
-    const viewportSize = comfyPage.page.viewportSize()
-    const centerX = viewportSize.width / 3
-    const centerY = viewportSize.height / 2
-    await comfyPage.dragAndDrop(
-      { x: nodePos.x, y: nodePos.y },
-      { x: centerX, y: centerY }
-    )
-    await comfyPage.nextFrame()
-
-    await ksamplerNodes[0].click('title')
-    await comfyPage.nextFrame()
-
-    await expect(comfyPage.page.locator('.selection-toolbox')).toBeVisible({
-      timeout: 5000
-    })
-
-    const moreOptionsBtn = comfyPage.page.locator(
-      '[data-testid="more-options-button"]'
-    )
-    await expect(moreOptionsBtn).toBeVisible({ timeout: 3000 })
-
-    await comfyPage.page.click('[data-testid="more-options-button"]')
-
-    await comfyPage.nextFrame()
-
-    const menuOptionsVisible = await comfyPage.page
-      .getByText('Rename')
-      .isVisible({ timeout: 2000 })
-      .catch(() => false)
-    if (menuOptionsVisible) {
-      return
-    }
-
-    await moreOptionsBtn.click({ force: true })
-    await comfyPage.nextFrame()
-
-    const menuOptionsVisibleAfterClick = await comfyPage.page
-      .getByText('Rename')
-      .isVisible({ timeout: 2000 })
-      .catch(() => false)
-    if (menuOptionsVisibleAfterClick) {
-      return
-    }
-
-    throw new Error('Could not open More Options menu - popover not showing')
-  }
-
-  test('opens Node Info from More Options menu', async ({ comfyPage }) => {
-    await openMoreOptions(comfyPage)
-    const nodeInfoButton = comfyPage.page.getByText('Node Info', {
-      exact: true
-    })
-    await expect(nodeInfoButton).toBeVisible()
-    await nodeInfoButton.click()
-    await comfyPage.nextFrame()
-  })
-
-  test('changes node shape via Shape submenu', async ({ comfyPage }) => {
-    const nodeRef = (await comfyPage.getNodeRefsByTitle('KSampler'))[0]
-    const initialShape = await nodeRef.getProperty<number>('shape')
-
-    await openMoreOptions(comfyPage)
-    await comfyPage.page.getByText('Shape', { exact: true }).hover()
-    await expect(comfyPage.page.getByText('Box', { exact: true })).toBeVisible({
-      timeout: 5000
-    })
-    await comfyPage.page.getByText('Box', { exact: true }).click()
-    await comfyPage.nextFrame()
-
-    const newShape = await nodeRef.getProperty<number>('shape')
-    expect(newShape).not.toBe(initialShape)
-    expect(newShape).toBe(1)
-  })
-
-  test('changes node color via Color submenu swatch', async ({ comfyPage }) => {
-    const nodeRef = (await comfyPage.getNodeRefsByTitle('KSampler'))[0]
-    const initialColor = await nodeRef.getProperty<string | undefined>('color')
-
-    await openMoreOptions(comfyPage)
-    await comfyPage.page.getByText('Color', { exact: true }).click()
-    const blueSwatch = comfyPage.page.locator('[title="Blue"]')
-    await expect(blueSwatch.first()).toBeVisible({ timeout: 5000 })
-    await blueSwatch.first().click()
-    await comfyPage.nextFrame()
-
-    const newColor = await nodeRef.getProperty<string | undefined>('color')
-    expect(newColor).toBe('#223')
-    if (initialColor) {
-      expect(newColor).not.toBe(initialColor)
-    }
-  })
-
-  test('renames a node using Rename action', async ({ comfyPage }) => {
-    const nodeRef = (await comfyPage.getNodeRefsByTitle('KSampler'))[0]
-    await openMoreOptions(comfyPage)
-    await comfyPage.page
-      .getByText('Rename', { exact: true })
-      .click({ force: true })
-    const input = comfyPage.page.locator(
-      '.group-title-editor.node-title-editor .editable-text input'
-    )
-    await expect(input).toBeVisible()
-    await input.fill('RenamedNode')
-    await input.press('Enter')
-    await comfyPage.nextFrame()
-    const newTitle = await nodeRef.getProperty<string>('title')
-    expect(newTitle).toBe('RenamedNode')
-  })
-
-  test('closes More Options menu when clicking outside', async ({
-    comfyPage
-  }) => {
-    await openMoreOptions(comfyPage)
-    const renameItem = comfyPage.page.getByText('Rename', { exact: true })
-    await expect(renameItem).toBeVisible({ timeout: 5000 })
-
-    // Wait for multiple frames to allow PrimeVue's outside click handler to initialize
-    for (let i = 0; i < 30; i++) {
+test.describe(
+  'Selection Toolbox - More Options Submenus',
+  { tag: '@ui' },
+  () => {
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.Canvas.SelectionToolbox', true)
+      await comfyPage.workflow.loadWorkflow('nodes/single_ksampler')
       await comfyPage.nextFrame()
+      await comfyPage.nodeOps.selectNodes(['KSampler'])
+      await comfyPage.nextFrame()
+    })
+
+    const openMoreOptions = async (comfyPage: ComfyPage) => {
+      const ksamplerNodes =
+        await comfyPage.nodeOps.getNodeRefsByTitle('KSampler')
+      if (ksamplerNodes.length === 0) {
+        throw new Error('No KSampler nodes found')
+      }
+
+      // Drag the KSampler to the center of the screen
+      const nodePos = await ksamplerNodes[0].getPosition()
+      const viewportSize = comfyPage.page.viewportSize()
+      if (!viewportSize) {
+        throw new Error(
+          'Viewport size is null - page may not be properly initialized'
+        )
+      }
+      const centerX = viewportSize.width / 3
+      const centerY = viewportSize.height / 2
+      await comfyPage.canvasOps.dragAndDrop(
+        { x: nodePos.x, y: nodePos.y },
+        { x: centerX, y: centerY }
+      )
+      await comfyPage.nextFrame()
+
+      await ksamplerNodes[0].click('title')
+      await comfyPage.nextFrame()
+
+      await expect(comfyPage.page.locator('.selection-toolbox')).toBeVisible({
+        timeout: 5000
+      })
+
+      const moreOptionsBtn = comfyPage.page.locator(
+        '[data-testid="more-options-button"]'
+      )
+      await expect(moreOptionsBtn).toBeVisible({ timeout: 3000 })
+
+      await comfyPage.page.click('[data-testid="more-options-button"]')
+
+      await comfyPage.nextFrame()
+
+      const menuOptionsVisible = await comfyPage.page
+        .getByText('Rename')
+        .isVisible({ timeout: 2000 })
+        .catch(() => false)
+      if (menuOptionsVisible) {
+        return
+      }
+
+      await moreOptionsBtn.click({ force: true })
+      await comfyPage.nextFrame()
+
+      const menuOptionsVisibleAfterClick = await comfyPage.page
+        .getByText('Rename')
+        .isVisible({ timeout: 2000 })
+        .catch(() => false)
+      if (menuOptionsVisibleAfterClick) {
+        return
+      }
+
+      throw new Error('Could not open More Options menu - popover not showing')
     }
 
-    await comfyPage.page
-      .locator('#graph-canvas')
-      .click({ position: { x: 0, y: 50 }, force: true })
+    test('opens Node Info from More Options menu', async ({ comfyPage }) => {
+      await openMoreOptions(comfyPage)
+      const nodeInfoButton = comfyPage.page.getByText('Node Info', {
+        exact: true
+      })
+      await expect(nodeInfoButton).toBeVisible()
+      await nodeInfoButton.click()
+      await comfyPage.nextFrame()
+    })
 
-    await comfyPage.nextFrame()
-    await expect(
-      comfyPage.page.getByText('Rename', { exact: true })
-    ).not.toBeVisible()
-  })
+    test('changes node shape via Shape submenu', async ({ comfyPage }) => {
+      const nodeRef = (
+        await comfyPage.nodeOps.getNodeRefsByTitle('KSampler')
+      )[0]
+      const initialShape = await nodeRef.getProperty<number>('shape')
 
-  test('closes More Options menu when clicking the button again (toggle)', async ({
-    comfyPage
-  }) => {
-    await openMoreOptions(comfyPage)
-    await expect(
-      comfyPage.page.getByText('Rename', { exact: true })
-    ).toBeVisible({ timeout: 5000 })
+      await openMoreOptions(comfyPage)
+      await comfyPage.page.getByText('Shape', { exact: true }).hover()
+      await expect(
+        comfyPage.page.getByText('Box', { exact: true })
+      ).toBeVisible({
+        timeout: 5000
+      })
+      await comfyPage.page.getByText('Box', { exact: true }).click()
+      await comfyPage.nextFrame()
 
-    await comfyPage.page.evaluate(() => {
-      const btn = document.querySelector('[data-testid="more-options-button"]')
-      if (btn) {
-        const event = new MouseEvent('click', {
-          bubbles: true,
-          cancelable: true,
-          view: window,
-          detail: 1
-        })
-        btn.dispatchEvent(event)
+      const newShape = await nodeRef.getProperty<number>('shape')
+      expect(newShape).not.toBe(initialShape)
+      expect(newShape).toBe(1)
+    })
+
+    test('changes node color via Color submenu swatch', async ({
+      comfyPage
+    }) => {
+      const nodeRef = (
+        await comfyPage.nodeOps.getNodeRefsByTitle('KSampler')
+      )[0]
+      const initialColor = await nodeRef.getProperty<string | undefined>(
+        'color'
+      )
+
+      await openMoreOptions(comfyPage)
+      await comfyPage.page.getByText('Color', { exact: true }).click()
+      const blueSwatch = comfyPage.page.locator('[title="Blue"]')
+      await expect(blueSwatch.first()).toBeVisible({ timeout: 5000 })
+      await blueSwatch.first().click()
+      await comfyPage.nextFrame()
+
+      const newColor = await nodeRef.getProperty<string | undefined>('color')
+      expect(newColor).toBe('#223')
+      if (initialColor) {
+        expect(newColor).not.toBe(initialColor)
       }
     })
-    await comfyPage.nextFrame()
 
-    await expect(
-      comfyPage.page.getByText('Rename', { exact: true })
-    ).not.toBeVisible()
-  })
-})
+    test('renames a node using Rename action', async ({ comfyPage }) => {
+      const nodeRef = (
+        await comfyPage.nodeOps.getNodeRefsByTitle('KSampler')
+      )[0]
+      await openMoreOptions(comfyPage)
+      await comfyPage.page
+        .getByText('Rename', { exact: true })
+        .click({ force: true })
+      const input = comfyPage.page.locator(
+        '.group-title-editor.node-title-editor .editable-text input'
+      )
+      await expect(input).toBeVisible()
+      await input.fill('RenamedNode')
+      await input.press('Enter')
+      await comfyPage.nextFrame()
+      const newTitle = await nodeRef.getProperty<string>('title')
+      expect(newTitle).toBe('RenamedNode')
+    })
+
+    test('closes More Options menu when clicking outside', async ({
+      comfyPage
+    }) => {
+      await openMoreOptions(comfyPage)
+      const renameItem = comfyPage.page.getByText('Rename', { exact: true })
+      await expect(renameItem).toBeVisible({ timeout: 5000 })
+
+      // Wait for multiple frames to allow PrimeVue's outside click handler to initialize
+      for (let i = 0; i < 30; i++) {
+        await comfyPage.nextFrame()
+      }
+
+      await comfyPage.page
+        .locator('#graph-canvas')
+        .click({ position: { x: 0, y: 50 }, force: true })
+
+      await comfyPage.nextFrame()
+      await expect(
+        comfyPage.page.getByText('Rename', { exact: true })
+      ).not.toBeVisible()
+    })
+
+    test('closes More Options menu when clicking the button again (toggle)', async ({
+      comfyPage
+    }) => {
+      await openMoreOptions(comfyPage)
+      await expect(
+        comfyPage.page.getByText('Rename', { exact: true })
+      ).toBeVisible({ timeout: 5000 })
+
+      await comfyPage.page.evaluate(() => {
+        const btn = document.querySelector(
+          '[data-testid="more-options-button"]'
+        )
+        if (btn) {
+          const event = new MouseEvent('click', {
+            bubbles: true,
+            cancelable: true,
+            view: window,
+            detail: 1
+          })
+          btn.dispatchEvent(event)
+        }
+      })
+      await comfyPage.nextFrame()
+
+      await expect(
+        comfyPage.page.getByText('Rename', { exact: true })
+      ).not.toBeVisible()
+    })
+  }
+)
diff --git a/browser_tests/tests/sidebar/nodeLibrary.spec.ts b/browser_tests/tests/sidebar/nodeLibrary.spec.ts
index 4f476376ac..c6304fe983 100644
--- a/browser_tests/tests/sidebar/nodeLibrary.spec.ts
+++ b/browser_tests/tests/sidebar/nodeLibrary.spec.ts
@@ -4,9 +4,13 @@ import { comfyPageFixture as test } from '../../fixtures/ComfyPage'
 
 test.describe('Node library sidebar', () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
-    await comfyPage.setSetting('Comfy.NodeLibrary.Bookmarks.V2', [])
-    await comfyPage.setSetting('Comfy.NodeLibrary.BookmarksCustomization', {})
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting('Comfy.NodeLibrary.NewDesign', false)
+    await comfyPage.settings.setSetting('Comfy.NodeLibrary.Bookmarks.V2', [])
+    await comfyPage.settings.setSetting(
+      'Comfy.NodeLibrary.BookmarksCustomization',
+      {}
+    )
     // Open the sidebar
     const tab = comfyPage.menu.nodeLibraryTab
     await tab.open()
@@ -26,7 +30,7 @@ test.describe('Node library sidebar', () => {
     )
     expect(previewVisible).toBe(true)
 
-    const count = await comfyPage.getGraphNodesCount()
+    const count = await comfyPage.nodeOps.getGraphNodesCount()
     // Drag the node onto the canvas
     const canvasSelector = '#graph-canvas'
 
@@ -46,7 +50,7 @@ test.describe('Node library sidebar', () => {
     })
 
     // Verify the node is added to the canvas
-    expect(await comfyPage.getGraphNodesCount()).toBe(count + 1)
+    expect(await comfyPage.nodeOps.getGraphNodesCount()).toBe(count + 1)
   })
 
   test('Bookmark node', async ({ comfyPage }) => {
@@ -58,7 +62,7 @@ test.describe('Node library sidebar', () => {
 
     // Verify the bookmark is added to the bookmarks tab
     expect(
-      await comfyPage.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
+      await comfyPage.settings.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
     ).toEqual(['KSamplerAdvanced'])
     // Verify the bookmark node with the same name is added to the tree.
     expect(await tab.getNode('KSampler (Advanced)').count()).toBe(2)
@@ -69,7 +73,9 @@ test.describe('Node library sidebar', () => {
   })
 
   test('Ignores unrecognized node', async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.NodeLibrary.Bookmarks.V2', ['foo'])
+    await comfyPage.settings.setSetting('Comfy.NodeLibrary.Bookmarks.V2', [
+      'foo'
+    ])
 
     const tab = comfyPage.menu.nodeLibraryTab
     expect(await tab.getFolder('sampling').count()).toBe(1)
@@ -77,7 +83,9 @@ test.describe('Node library sidebar', () => {
   })
 
   test('Displays empty bookmarks folder', async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.NodeLibrary.Bookmarks.V2', ['foo/'])
+    await comfyPage.settings.setSetting('Comfy.NodeLibrary.Bookmarks.V2', [
+      'foo/'
+    ])
     const tab = comfyPage.menu.nodeLibraryTab
     expect(await tab.getFolder('foo').count()).toBe(1)
   })
@@ -91,12 +99,14 @@ test.describe('Node library sidebar', () => {
     await textInput.press('Enter')
     expect(await tab.getFolder('New Folder').count()).toBe(1)
     expect(
-      await comfyPage.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
+      await comfyPage.settings.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
     ).toEqual(['New Folder/'])
   })
 
   test('Can add nested bookmark folder', async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.NodeLibrary.Bookmarks.V2', ['foo/'])
+    await comfyPage.settings.setSetting('Comfy.NodeLibrary.Bookmarks.V2', [
+      'foo/'
+    ])
     const tab = comfyPage.menu.nodeLibraryTab
 
     await tab.getFolder('foo').click({ button: 'right' })
@@ -108,24 +118,28 @@ test.describe('Node library sidebar', () => {
 
     expect(await tab.getFolder('bar').count()).toBe(1)
     expect(
-      await comfyPage.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
+      await comfyPage.settings.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
     ).toEqual(['foo/', 'foo/bar/'])
   })
 
   test('Can delete bookmark folder', async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.NodeLibrary.Bookmarks.V2', ['foo/'])
+    await comfyPage.settings.setSetting('Comfy.NodeLibrary.Bookmarks.V2', [
+      'foo/'
+    ])
     const tab = comfyPage.menu.nodeLibraryTab
 
     await tab.getFolder('foo').click({ button: 'right' })
     await comfyPage.page.getByLabel('Delete').click()
 
     expect(
-      await comfyPage.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
+      await comfyPage.settings.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
     ).toEqual([])
   })
 
   test('Can rename bookmark folder', async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.NodeLibrary.Bookmarks.V2', ['foo/'])
+    await comfyPage.settings.setSetting('Comfy.NodeLibrary.Bookmarks.V2', [
+      'foo/'
+    ])
     const tab = comfyPage.menu.nodeLibraryTab
 
     await tab.getFolder('foo').click({ button: 'right' })
@@ -136,14 +150,16 @@ test.describe('Node library sidebar', () => {
     await comfyPage.page.keyboard.press('Enter')
 
     expect(
-      await comfyPage.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
+      await comfyPage.settings.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
     ).toEqual(['bar/'])
   })
 
   test('Can add bookmark by dragging node to bookmark folder', async ({
     comfyPage
   }) => {
-    await comfyPage.setSetting('Comfy.NodeLibrary.Bookmarks.V2', ['foo/'])
+    await comfyPage.settings.setSetting('Comfy.NodeLibrary.Bookmarks.V2', [
+      'foo/'
+    ])
     const tab = comfyPage.menu.nodeLibraryTab
     await tab.getFolder('sampling').click()
     await comfyPage.page.dragAndDrop(
@@ -151,7 +167,7 @@ test.describe('Node library sidebar', () => {
       tab.folderSelector('foo')
     )
     expect(
-      await comfyPage.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
+      await comfyPage.settings.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
     ).toEqual(['foo/', 'foo/KSamplerAdvanced'])
   })
 
@@ -162,51 +178,60 @@ test.describe('Node library sidebar', () => {
     await tab.getFolder('sampling').click()
     await tab.getNode('KSampler (Advanced)').locator('.bookmark-button').click()
     expect(
-      await comfyPage.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
+      await comfyPage.settings.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
     ).toEqual(['KSamplerAdvanced'])
   })
 
   test('Can unbookmark node (Top level bookmark)', async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.NodeLibrary.Bookmarks.V2', [
+    await comfyPage.settings.setSetting('Comfy.NodeLibrary.Bookmarks.V2', [
       'KSamplerAdvanced'
     ])
     const tab = comfyPage.menu.nodeLibraryTab
     await tab.getNode('KSampler (Advanced)').locator('.bookmark-button').click()
     expect(
-      await comfyPage.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
+      await comfyPage.settings.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
     ).toEqual([])
   })
 
   test('Can unbookmark node (Library node bookmark)', async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.NodeLibrary.Bookmarks.V2', [
+    await comfyPage.settings.setSetting('Comfy.NodeLibrary.Bookmarks.V2', [
       'KSamplerAdvanced'
     ])
     const tab = comfyPage.menu.nodeLibraryTab
     await tab.getFolder('sampling').click()
-    await comfyPage.page
-      .locator(tab.nodeSelector('KSampler (Advanced)'))
-      .nth(1)
+    await tab
+      .getNodeInFolder('KSampler (Advanced)', 'sampling')
       .locator('.bookmark-button')
       .click()
     expect(
-      await comfyPage.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
+      await comfyPage.settings.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
     ).toEqual([])
   })
   test('Can customize icon', async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.NodeLibrary.Bookmarks.V2', ['foo/'])
+    await comfyPage.settings.setSetting('Comfy.NodeLibrary.Bookmarks.V2', [
+      'foo/'
+    ])
     const tab = comfyPage.menu.nodeLibraryTab
     await tab.getFolder('foo').click({ button: 'right' })
     await comfyPage.page.getByLabel('Customize').click()
-    await comfyPage.page
-      .locator('.icon-field .p-selectbutton > *:nth-child(2)')
-      .click()
-    await comfyPage.page
-      .locator('.color-field .p-selectbutton > *:nth-child(2)')
-      .click()
-    await comfyPage.page.getByRole('button', { name: 'Confirm' }).click()
+    const dialog = comfyPage.page.getByRole('dialog', {
+      name: 'Customize Folder'
+    })
+    // Select Folder icon (2nd button in Icon group)
+    const iconGroup = dialog.getByText('Icon').locator('..').getByRole('group')
+    await iconGroup.getByRole('button').nth(1).click()
+    // Select Blue color (2nd button in Color group)
+    const colorGroup = dialog
+      .getByText('Color')
+      .locator('..')
+      .getByRole('group')
+    await colorGroup.getByRole('button').nth(1).click()
+    await dialog.getByRole('button', { name: 'Confirm' }).click()
     await comfyPage.nextFrame()
     expect(
-      await comfyPage.getSetting('Comfy.NodeLibrary.BookmarksCustomization')
+      await comfyPage.settings.getSetting(
+        'Comfy.NodeLibrary.BookmarksCustomization'
+      )
     ).toEqual({
       'foo/': {
         icon: 'pi-folder',
@@ -216,17 +241,24 @@ test.describe('Node library sidebar', () => {
   })
   // If color is left as default, it should not be saved
   test('Can customize icon (default field)', async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.NodeLibrary.Bookmarks.V2', ['foo/'])
+    await comfyPage.settings.setSetting('Comfy.NodeLibrary.Bookmarks.V2', [
+      'foo/'
+    ])
     const tab = comfyPage.menu.nodeLibraryTab
     await tab.getFolder('foo').click({ button: 'right' })
     await comfyPage.page.getByLabel('Customize').click()
-    await comfyPage.page
-      .locator('.icon-field .p-selectbutton > *:nth-child(2)')
-      .click()
-    await comfyPage.page.getByRole('button', { name: 'Confirm' }).click()
+    const dialog = comfyPage.page.getByRole('dialog', {
+      name: 'Customize Folder'
+    })
+    // Select Folder icon (2nd button in Icon group)
+    const iconGroup = dialog.getByText('Icon').locator('..').getByRole('group')
+    await iconGroup.getByRole('button').nth(1).click()
+    await dialog.getByRole('button', { name: 'Confirm' }).click()
     await comfyPage.nextFrame()
     expect(
-      await comfyPage.getSetting('Comfy.NodeLibrary.BookmarksCustomization')
+      await comfyPage.settings.getSetting(
+        'Comfy.NodeLibrary.BookmarksCustomization'
+      )
     ).toEqual({
       'foo/': {
         icon: 'pi-folder'
@@ -238,7 +270,9 @@ test.describe('Node library sidebar', () => {
     comfyPage
   }) => {
     // Open customization dialog
-    await comfyPage.setSetting('Comfy.NodeLibrary.Bookmarks.V2', ['foo/'])
+    await comfyPage.settings.setSetting('Comfy.NodeLibrary.Bookmarks.V2', [
+      'foo/'
+    ])
     const tab = comfyPage.menu.nodeLibraryTab
     await tab.getFolder('foo').click({ button: 'right' })
     await comfyPage.page.getByLabel('Customize').click()
@@ -258,16 +292,19 @@ test.describe('Node library sidebar', () => {
     await comfyPage.page.locator('.p-colorpicker-color-background').click()
 
     // Finalize the customization
-    await comfyPage.page
-      .locator('.icon-field .p-selectbutton > *:nth-child(2)')
-      .click()
-    await comfyPage.page.getByRole('button', { name: 'Confirm' }).click()
+    const dialog = comfyPage.page.getByRole('dialog', {
+      name: 'Customize Folder'
+    })
+    // Select Folder icon (2nd button in Icon group)
+    const iconGroup = dialog.getByText('Icon').locator('..').getByRole('group')
+    await iconGroup.getByRole('button').nth(1).click()
+    await dialog.getByRole('button', { name: 'Confirm' }).click()
     await comfyPage.nextFrame()
 
     // Verify the color selection is saved
-    const setting = await comfyPage.getSetting(
-      'Comfy.NodeLibrary.BookmarksCustomization'
-    )
+    const setting = await comfyPage.settings.getSetting<
+      Record<string, { icon?: string; color?: string }>
+    >('Comfy.NodeLibrary.BookmarksCustomization')
     await expect(setting).toHaveProperty(['foo/', 'color'])
     await expect(setting['foo/'].color).not.toBeNull()
     await expect(setting['foo/'].color).not.toBeUndefined()
@@ -275,13 +312,18 @@ test.describe('Node library sidebar', () => {
   })
 
   test('Can rename customized bookmark folder', async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.NodeLibrary.Bookmarks.V2', ['foo/'])
-    await comfyPage.setSetting('Comfy.NodeLibrary.BookmarksCustomization', {
-      'foo/': {
-        icon: 'pi-folder',
-        color: '#007bff'
+    await comfyPage.settings.setSetting('Comfy.NodeLibrary.Bookmarks.V2', [
+      'foo/'
+    ])
+    await comfyPage.settings.setSetting(
+      'Comfy.NodeLibrary.BookmarksCustomization',
+      {
+        'foo/': {
+          icon: 'pi-folder',
+          color: '#007bff'
+        }
       }
-    })
+    )
     const tab = comfyPage.menu.nodeLibraryTab
     await tab.getFolder('foo').click({ button: 'right' })
     await comfyPage.page
@@ -292,10 +334,12 @@ test.describe('Node library sidebar', () => {
     await comfyPage.nextFrame()
     await expect(async () => {
       expect(
-        await comfyPage.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
+        await comfyPage.settings.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
       ).toEqual(['bar/'])
       expect(
-        await comfyPage.getSetting('Comfy.NodeLibrary.BookmarksCustomization')
+        await comfyPage.settings.getSetting(
+          'Comfy.NodeLibrary.BookmarksCustomization'
+        )
       ).toEqual({
         'bar/': {
           icon: 'pi-folder',
@@ -308,27 +352,34 @@ test.describe('Node library sidebar', () => {
   })
 
   test('Can delete customized bookmark folder', async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.NodeLibrary.Bookmarks.V2', ['foo/'])
-    await comfyPage.setSetting('Comfy.NodeLibrary.BookmarksCustomization', {
-      'foo/': {
-        icon: 'pi-folder',
-        color: '#007bff'
+    await comfyPage.settings.setSetting('Comfy.NodeLibrary.Bookmarks.V2', [
+      'foo/'
+    ])
+    await comfyPage.settings.setSetting(
+      'Comfy.NodeLibrary.BookmarksCustomization',
+      {
+        'foo/': {
+          icon: 'pi-folder',
+          color: '#007bff'
+        }
       }
-    })
+    )
     const tab = comfyPage.menu.nodeLibraryTab
     await tab.getFolder('foo').click({ button: 'right' })
     await comfyPage.page.getByLabel('Delete').click()
     await comfyPage.nextFrame()
     expect(
-      await comfyPage.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
+      await comfyPage.settings.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
     ).toEqual([])
     expect(
-      await comfyPage.getSetting('Comfy.NodeLibrary.BookmarksCustomization')
+      await comfyPage.settings.getSetting(
+        'Comfy.NodeLibrary.BookmarksCustomization'
+      )
     ).toEqual({})
   })
 
   test('Can filter nodes in both trees', async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.NodeLibrary.Bookmarks.V2', [
+    await comfyPage.settings.setSetting('Comfy.NodeLibrary.Bookmarks.V2', [
       'foo/',
       'foo/KSamplerAdvanced',
       'KSampler'
@@ -336,8 +387,6 @@ test.describe('Node library sidebar', () => {
 
     const tab = comfyPage.menu.nodeLibraryTab
     await tab.nodeLibrarySearchBoxInput.fill('KSampler')
-    // Node search box is debounced and may take some time to update.
-    await comfyPage.page.waitForTimeout(1000)
-    expect(await tab.getNode('KSampler (Advanced)').count()).toBe(2)
+    await expect(tab.getNode('KSampler (Advanced)')).toHaveCount(2)
   })
 })
diff --git a/browser_tests/tests/sidebar/workflows.spec.ts b/browser_tests/tests/sidebar/workflows.spec.ts
index 86f37b23db..4b698432e5 100644
--- a/browser_tests/tests/sidebar/workflows.spec.ts
+++ b/browser_tests/tests/sidebar/workflows.spec.ts
@@ -4,8 +4,11 @@ import { comfyPageFixture as test } from '../../fixtures/ComfyPage'
 
 test.describe('Workflows sidebar', () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
-    await comfyPage.setSetting('Comfy.Workflow.WorkflowTabsPosition', 'Sidebar')
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting(
+      'Comfy.Workflow.WorkflowTabsPosition',
+      'Sidebar'
+    )
 
     // Open the sidebar
     const tab = comfyPage.menu.workflowsTab
@@ -13,24 +16,22 @@ test.describe('Workflows sidebar', () => {
   })
 
   test.afterEach(async ({ comfyPage }) => {
-    await comfyPage.setupWorkflowsDirectory({})
+    await comfyPage.workflow.setupWorkflowsDirectory({})
   })
 
   test('Can create new blank workflow', async ({ comfyPage }) => {
     const tab = comfyPage.menu.workflowsTab
-    expect(await tab.getOpenedWorkflowNames()).toEqual([
-      '*Unsaved Workflow.json'
-    ])
+    expect(await tab.getOpenedWorkflowNames()).toEqual(['*Unsaved Workflow'])
 
-    await comfyPage.executeCommand('Comfy.NewBlankWorkflow')
+    await comfyPage.command.executeCommand('Comfy.NewBlankWorkflow')
     expect(await tab.getOpenedWorkflowNames()).toEqual([
-      '*Unsaved Workflow.json',
-      '*Unsaved Workflow (2).json'
+      '*Unsaved Workflow',
+      '*Unsaved Workflow (2)'
     ])
   })
 
   test('Can show top level saved workflows', async ({ comfyPage }) => {
-    await comfyPage.setupWorkflowsDirectory({
+    await comfyPage.workflow.setupWorkflowsDirectory({
       'workflow1.json': 'default.json',
       'workflow2.json': 'default.json'
     })
@@ -38,63 +39,63 @@ test.describe('Workflows sidebar', () => {
     const tab = comfyPage.menu.workflowsTab
     await tab.open()
     expect(await tab.getTopLevelSavedWorkflowNames()).toEqual(
-      expect.arrayContaining(['workflow1.json', 'workflow2.json'])
+      expect.arrayContaining(['workflow1', 'workflow2'])
     )
   })
 
   test('Can duplicate workflow', async ({ comfyPage }) => {
     const tab = comfyPage.menu.workflowsTab
-    await comfyPage.menu.topbar.saveWorkflow('workflow1.json')
+    await comfyPage.menu.topbar.saveWorkflow('workflow1')
 
     expect(await tab.getTopLevelSavedWorkflowNames()).toEqual(
-      expect.arrayContaining(['workflow1.json'])
+      expect.arrayContaining(['workflow1'])
     )
 
-    await comfyPage.executeCommand('Comfy.DuplicateWorkflow')
+    await comfyPage.command.executeCommand('Comfy.DuplicateWorkflow')
     expect(await tab.getOpenedWorkflowNames()).toEqual([
-      'workflow1.json',
-      '*workflow1 (Copy).json'
+      'workflow1',
+      '*workflow1 (Copy)'
     ])
 
-    await comfyPage.executeCommand('Comfy.DuplicateWorkflow')
+    await comfyPage.command.executeCommand('Comfy.DuplicateWorkflow')
     expect(await tab.getOpenedWorkflowNames()).toEqual([
-      'workflow1.json',
-      '*workflow1 (Copy).json',
-      '*workflow1 (Copy) (2).json'
+      'workflow1',
+      '*workflow1 (Copy)',
+      '*workflow1 (Copy) (2)'
     ])
 
-    await comfyPage.executeCommand('Comfy.DuplicateWorkflow')
+    await comfyPage.command.executeCommand('Comfy.DuplicateWorkflow')
     expect(await tab.getOpenedWorkflowNames()).toEqual([
-      'workflow1.json',
-      '*workflow1 (Copy).json',
-      '*workflow1 (Copy) (2).json',
-      '*workflow1 (Copy) (3).json'
+      'workflow1',
+      '*workflow1 (Copy)',
+      '*workflow1 (Copy) (2)',
+      '*workflow1 (Copy) (3)'
     ])
   })
 
   test('Can open workflow after insert', async ({ comfyPage }) => {
-    await comfyPage.setupWorkflowsDirectory({
+    await comfyPage.workflow.setupWorkflowsDirectory({
       'workflow1.json': 'nodes/single_ksampler.json'
     })
 
     const tab = comfyPage.menu.workflowsTab
     await tab.open()
-    await comfyPage.executeCommand('Comfy.LoadDefaultWorkflow')
-    const originalNodeCount = (await comfyPage.getNodes()).length
+    await comfyPage.command.executeCommand('Comfy.LoadDefaultWorkflow')
+    const originalNodeCount = await comfyPage.nodeOps.getNodeCount()
 
-    await tab.insertWorkflow(tab.getPersistedItem('workflow1.json'))
-    await comfyPage.nextFrame()
-    expect((await comfyPage.getNodes()).length).toEqual(originalNodeCount + 1)
+    await tab.insertWorkflow(tab.getPersistedItem('workflow1'))
+    await expect
+      .poll(() => comfyPage.nodeOps.getNodeCount())
+      .toEqual(originalNodeCount + 1)
 
-    await tab.getPersistedItem('workflow1.json').click()
-    await comfyPage.nextFrame()
-    expect((await comfyPage.getNodes()).length).toEqual(1)
+    await tab.getPersistedItem('workflow1').click()
+    await expect.poll(() => comfyPage.nodeOps.getNodeCount()).toEqual(1)
   })
 
   test('Can rename nested workflow from opened workflow item', async ({
     comfyPage
   }) => {
-    await comfyPage.setupWorkflowsDirectory({
+    await comfyPage.workflow.setupWorkflowsDirectory({
       foo: {
         'bar.json': 'default.json'
       }
@@ -110,41 +111,38 @@ test.describe('Workflows sidebar', () => {
     const openedWorkflow = tab.getOpenedItem('foo/bar')
     await tab.renameWorkflow(openedWorkflow, 'foo/baz')
     expect(await tab.getOpenedWorkflowNames()).toEqual([
-      '*Unsaved Workflow.json',
-      'foo/baz.json'
+      '*Unsaved Workflow',
+      'foo/baz'
     ])
   })
 
   test('Can save workflow as', async ({ comfyPage }) => {
-    await comfyPage.executeCommand('Comfy.NewBlankWorkflow')
-    await comfyPage.menu.topbar.saveWorkflowAs('workflow3.json')
-    expect(await comfyPage.menu.workflowsTab.getOpenedWorkflowNames()).toEqual([
-      '*Unsaved Workflow.json',
-      'workflow3.json'
-    ])
+    await comfyPage.command.executeCommand('Comfy.NewBlankWorkflow')
+    await comfyPage.menu.topbar.saveWorkflowAs('workflow3')
+    await expect
+      .poll(() => comfyPage.menu.workflowsTab.getOpenedWorkflowNames())
+      .toEqual(['*Unsaved Workflow', 'workflow3'])
 
-    await comfyPage.menu.topbar.saveWorkflowAs('workflow4.json')
-    expect(await comfyPage.menu.workflowsTab.getOpenedWorkflowNames()).toEqual([
-      '*Unsaved Workflow.json',
-      'workflow3.json',
-      'workflow4.json'
-    ])
+    await comfyPage.menu.topbar.saveWorkflowAs('workflow4')
+    await expect
+      .poll(() => comfyPage.menu.workflowsTab.getOpenedWorkflowNames())
+      .toEqual(['*Unsaved Workflow', 'workflow3', 'workflow4'])
   })
 
   test('Exported workflow does not contain localized slot names', async ({
     comfyPage
   }) => {
-    await comfyPage.loadWorkflow('default')
-    const exportedWorkflow = await comfyPage.getExportedWorkflow({
+    await comfyPage.workflow.loadWorkflow('default')
+    const exportedWorkflow = await comfyPage.workflow.getExportedWorkflow({
       api: false
     })
     expect(exportedWorkflow).toBeDefined()
     for (const node of exportedWorkflow.nodes) {
-      for (const slot of node.inputs) {
+      for (const slot of node.inputs ?? []) {
         expect(slot.localized_name).toBeUndefined()
         expect(slot.label).toBeUndefined()
       }
-      for (const slot of node.outputs) {
+      for (const slot of node.outputs ?? []) {
         expect(slot.localized_name).toBeUndefined()
         expect(slot.label).toBeUndefined()
       }
@@ -154,7 +152,7 @@ test.describe('Workflows sidebar', () => {
   test('Can export same workflow with different locales', async ({
     comfyPage
   }) => {
-    await comfyPage.loadWorkflow('default')
+    await comfyPage.workflow.loadWorkflow('default')
 
     // Setup download listener before triggering the export
     const downloadPromise = comfyPage.page.waitForEvent('download')
@@ -165,14 +163,14 @@ test.describe('Workflows sidebar', () => {
     expect(download.suggestedFilename()).toBe('exported_default.json')
 
     // Get the exported workflow content
-    const downloadedContent = await comfyPage.getExportedWorkflow({
+    const downloadedContent = await comfyPage.workflow.getExportedWorkflow({
       api: false
     })
 
-    await comfyPage.setSetting('Comfy.Locale', 'zh')
+    await comfyPage.settings.setSetting('Comfy.Locale', 'zh')
     await comfyPage.setup()
 
-    const downloadedContentZh = await comfyPage.getExportedWorkflow({
+    const downloadedContentZh = await comfyPage.workflow.getExportedWorkflow({
       api: false
     })
 
@@ -184,22 +182,22 @@ test.describe('Workflows sidebar', () => {
   })
 
   test('Can save workflow as with same name', async ({ comfyPage }) => {
-    await comfyPage.menu.topbar.saveWorkflow('workflow5.json')
+    await comfyPage.menu.topbar.saveWorkflow('workflow5')
     expect(await comfyPage.menu.workflowsTab.getOpenedWorkflowNames()).toEqual([
-      'workflow5.json'
+      'workflow5'
     ])
 
-    await comfyPage.menu.topbar.saveWorkflowAs('workflow5.json')
+    await comfyPage.menu.topbar.saveWorkflowAs('workflow5')
     await comfyPage.confirmDialog.click('overwrite')
     expect(await comfyPage.menu.workflowsTab.getOpenedWorkflowNames()).toEqual([
-      'workflow5.json'
+      'workflow5'
     ])
   })
 
   test('Can save temporary workflow with unmodified name', async ({
     comfyPage
   }) => {
-    expect(await comfyPage.isCurrentWorkflowModified()).toBe(false)
+    expect(await comfyPage.workflow.isCurrentWorkflowModified()).toBe(false)
 
     await comfyPage.menu.topbar.saveWorkflow('Unsaved Workflow')
     // Should not trigger the overwrite dialog
@@ -207,43 +205,45 @@ test.describe('Workflows sidebar', () => {
       await comfyPage.page.locator('.comfy-modal-content:visible').count()
     ).toBe(0)
 
-    expect(await comfyPage.isCurrentWorkflowModified()).toBe(false)
+    expect(await comfyPage.workflow.isCurrentWorkflowModified()).toBe(false)
   })
 
   test('Can overwrite other workflows with save as', async ({ comfyPage }) => {
     const topbar = comfyPage.menu.topbar
-    await topbar.saveWorkflow('workflow1.json')
-    await topbar.saveWorkflowAs('workflow2.json')
+    await topbar.saveWorkflow('workflow1')
+    await topbar.saveWorkflowAs('workflow2')
     await comfyPage.nextFrame()
-    expect(await comfyPage.menu.workflowsTab.getOpenedWorkflowNames()).toEqual([
-      'workflow1.json',
-      'workflow2.json'
-    ])
-    expect(await comfyPage.menu.workflowsTab.getActiveWorkflowName()).toEqual(
-      'workflow2.json'
-    )
+    await expect
+      .poll(() => comfyPage.menu.workflowsTab.getOpenedWorkflowNames())
+      .toEqual(['workflow1', 'workflow2'])
+    await expect
+      .poll(() => comfyPage.menu.workflowsTab.getActiveWorkflowName())
+      .toEqual('workflow2')
 
-    await topbar.saveWorkflowAs('workflow1.json')
+    await topbar.saveWorkflowAs('workflow1')
     await comfyPage.confirmDialog.click('overwrite')
-    // The old workflow1.json should be deleted and the new one should be saved.
-    expect(await comfyPage.menu.workflowsTab.getOpenedWorkflowNames()).toEqual([
-      'workflow2.json',
-      'workflow1.json'
-    ])
-    expect(await comfyPage.menu.workflowsTab.getActiveWorkflowName()).toEqual(
-      'workflow1.json'
-    )
+    // The old workflow1 should be deleted and the new one should be saved.
+    await expect
+      .poll(() => comfyPage.menu.workflowsTab.getOpenedWorkflowNames())
+      .toEqual(['workflow2', 'workflow1'])
+    await expect
+      .poll(() => comfyPage.menu.workflowsTab.getActiveWorkflowName())
+      .toEqual('workflow1')
   })
 
   test('Does not report warning when switching between opened workflows', async ({
     comfyPage
   }) => {
-    await comfyPage.loadWorkflow('missing/missing_nodes')
-    await comfyPage.closeDialog()
+    await comfyPage.workflow.loadWorkflow('missing/missing_nodes')
+    await comfyPage.page
+      .locator('.p-dialog')
+      .getByRole('button', { name: 'Close' })
+      .click({ force: true })
+    await comfyPage.page.locator('.p-dialog').waitFor({ state: 'hidden' })
 
     // Load blank workflow
     await comfyPage.menu.workflowsTab.open()
-    await comfyPage.executeCommand('Comfy.NewBlankWorkflow')
+    await comfyPage.command.executeCommand('Comfy.NewBlankWorkflow')
 
     // Switch back to the missing_nodes workflow
     await comfyPage.menu.workflowsTab.switchToWorkflow('missing_nodes')
@@ -264,77 +264,73 @@ test.describe('Workflows sidebar', () => {
     )
     await closeButton.click()
     expect(await comfyPage.menu.workflowsTab.getOpenedWorkflowNames()).toEqual([
-      '*Unsaved Workflow.json'
+      '*Unsaved Workflow'
     ])
   })
 
   test('Can close saved workflow with command', async ({ comfyPage }) => {
     const tab = comfyPage.menu.workflowsTab
-    await comfyPage.menu.topbar.saveWorkflow('workflow1.json')
-    await comfyPage.executeCommand('Workspace.CloseWorkflow')
-    expect(await tab.getOpenedWorkflowNames()).toEqual([
-      '*Unsaved Workflow.json'
-    ])
+    await comfyPage.menu.topbar.saveWorkflow('workflow1')
+    await comfyPage.command.executeCommand('Workspace.CloseWorkflow')
+    expect(await tab.getOpenedWorkflowNames()).toEqual(['*Unsaved Workflow'])
   })
 
   test('Can delete workflows (confirm disabled)', async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.Workflow.ConfirmDelete', false)
+    await comfyPage.settings.setSetting('Comfy.Workflow.ConfirmDelete', false)
 
     const { topbar, workflowsTab } = comfyPage.menu
 
-    const filename = 'workflow18.json'
+    const filename = 'workflow18'
     await topbar.saveWorkflow(filename)
     expect(await workflowsTab.getOpenedWorkflowNames()).toEqual([filename])
 
     await workflowsTab.getOpenedItem(filename).click({ button: 'right' })
     await comfyPage.nextFrame()
-    await comfyPage.clickContextMenuItem('Delete')
+    await comfyPage.contextMenu.clickMenuItem('Delete')
+    await comfyPage.nextFrame()
 
     await expect(workflowsTab.getOpenedItem(filename)).not.toBeVisible()
     expect(await workflowsTab.getOpenedWorkflowNames()).toEqual([
-      '*Unsaved Workflow.json'
+      '*Unsaved Workflow'
     ])
   })
 
   test('Can delete workflows', async ({ comfyPage }) => {
     const { topbar, workflowsTab } = comfyPage.menu
 
-    const filename = 'workflow18.json'
+    const filename = 'workflow18'
     await topbar.saveWorkflow(filename)
     expect(await workflowsTab.getOpenedWorkflowNames()).toEqual([filename])
 
     await workflowsTab.getOpenedItem(filename).click({ button: 'right' })
-    await comfyPage.clickContextMenuItem('Delete')
+    await comfyPage.contextMenu.clickMenuItem('Delete')
+    await comfyPage.nextFrame()
 
     await comfyPage.confirmDialog.click('delete')
 
     await expect(workflowsTab.getOpenedItem(filename)).not.toBeVisible()
     expect(await workflowsTab.getOpenedWorkflowNames()).toEqual([
-      '*Unsaved Workflow.json'
+      '*Unsaved Workflow'
     ])
   })
 
   test('Can duplicate workflow from context menu', async ({ comfyPage }) => {
-    await comfyPage.setupWorkflowsDirectory({
+    await comfyPage.workflow.setupWorkflowsDirectory({
       'workflow1.json': 'default.json'
     })
 
     const { workflowsTab } = comfyPage.menu
     await workflowsTab.open()
 
-    await workflowsTab
-      .getPersistedItem('workflow1.json')
-      .click({ button: 'right' })
-    await comfyPage.clickContextMenuItem('Duplicate')
-
-    expect(await workflowsTab.getOpenedWorkflowNames()).toEqual([
-      '*Unsaved Workflow.json',
-      '*workflow1 (Copy).json'
-    ])
+    await workflowsTab.getPersistedItem('workflow1').click({ button: 'right' })
+    await comfyPage.contextMenu.clickMenuItem('Duplicate')
+    await expect
+      .poll(() => workflowsTab.getOpenedWorkflowNames())
+      .toEqual(['*Unsaved Workflow', '*workflow1 (Copy)'])
   })
 
   test('Can drop workflow from workflows sidebar', async ({ comfyPage }) => {
-    await comfyPage.setupWorkflowsDirectory({
+    await comfyPage.workflow.setupWorkflowsDirectory({
       'workflow1.json': 'default.json'
     })
 
@@ -342,10 +338,10 @@ test.describe('Workflows sidebar', () => {
 
     // Wait for workflow to appear in Browse section after sync
     const workflowItem =
-      comfyPage.menu.workflowsTab.getPersistedItem('workflow1.json')
+      comfyPage.menu.workflowsTab.getPersistedItem('workflow1')
     await expect(workflowItem).toBeVisible({ timeout: 3000 })
 
-    const nodeCount = await comfyPage.getGraphNodesCount()
+    const nodeCount = await comfyPage.nodeOps.getGraphNodesCount()
 
     // Get the bounding box of the canvas element
     const canvasBoundingBox = (await comfyPage.page
@@ -359,14 +355,14 @@ test.describe('Workflows sidebar', () => {
     }
 
     await comfyPage.page.dragAndDrop(
-      '.comfyui-workflows-browse .node-label:has-text("workflow1.json")',
+      '.comfyui-workflows-browse .node-label:has-text("workflow1")',
       '#graph-canvas',
       { targetPosition }
     )
 
     // Wait for nodes to be inserted after drag-drop with retryable assertion
     await expect
-      .poll(() => comfyPage.getGraphNodesCount(), { timeout: 3000 })
+      .poll(() => comfyPage.nodeOps.getGraphNodesCount(), { timeout: 3000 })
       .toBe(nodeCount * 2)
   })
 })
diff --git a/browser_tests/tests/subgraph-duplicate-ids.spec.ts b/browser_tests/tests/subgraph-duplicate-ids.spec.ts
new file mode 100644
index 0000000000..17e458f3b3
--- /dev/null
+++ b/browser_tests/tests/subgraph-duplicate-ids.spec.ts
@@ -0,0 +1,100 @@
+import { expect } from '@playwright/test'
+
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+
+test.describe('Subgraph duplicate ID remapping', { tag: ['@subgraph'] }, () => {
+  const WORKFLOW = 'subgraphs/subgraph-nested-duplicate-ids'
+
+  test('All node IDs are globally unique after loading', async ({
+    comfyPage
+  }) => {
+    await comfyPage.workflow.loadWorkflow(WORKFLOW)
+
+    const result = await comfyPage.page.evaluate(() => {
+      const graph = window.app!.canvas.graph!
+      // TODO: Extract allGraphs accessor (root + subgraphs) into LGraph
+      // TODO: Extract allNodeIds accessor into LGraph
+      const allGraphs = [graph, ...graph.subgraphs.values()]
+      const allIds = allGraphs
+        .flatMap((g) => g._nodes)
+        .map((n) => n.id)
+        .filter((id): id is number => typeof id === 'number')
+
+      return { allIds, uniqueCount: new Set(allIds).size }
+    })
+
+    expect(result.uniqueCount).toBe(result.allIds.length)
+    expect(result.allIds.length).toBeGreaterThanOrEqual(10)
+  })
+
+  test('Root graph node IDs are preserved as canonical', async ({
+    comfyPage
+  }) => {
+    await comfyPage.workflow.loadWorkflow(WORKFLOW)
+
+    const rootIds = await comfyPage.page.evaluate(() => {
+      const graph = window.app!.canvas.graph!
+      return graph._nodes
+        .map((n) => n.id)
+        .filter((id): id is number => typeof id === 'number')
+        .sort((a, b) => a - b)
+    })
+
+    expect(rootIds).toEqual([1, 2, 5])
+  })
+
+  test('All links reference valid nodes in their graph', async ({
+    comfyPage
+  }) => {
+    await comfyPage.workflow.loadWorkflow(WORKFLOW)
+
+    const invalidLinks = await comfyPage.page.evaluate(() => {
+      const graph = window.app!.canvas.graph!
+      const labeledGraphs: [string, typeof graph][] = [
+        ['root', graph],
+        ...[...graph.subgraphs.entries()].map(
+          ([id, sg]) => [`subgraph:${id}`, sg] as [string, typeof graph]
+        )
+      ]
+
+      const isNonNegative = (id: number | string) =>
+        typeof id === 'number' && id >= 0
+
+      return labeledGraphs.flatMap(([label, g]) =>
+        [...g._links.values()].flatMap((link) =>
+          [
+            isNonNegative(link.origin_id) &&
+              !g._nodes_by_id[link.origin_id] &&
+              `${label}: origin_id ${link.origin_id} not found`,
+            isNonNegative(link.target_id) &&
+              !g._nodes_by_id[link.target_id] &&
+              `${label}: target_id ${link.target_id} not found`
+          ].filter(Boolean)
+        )
+      )
+    })
+
+    expect(invalidLinks).toEqual([])
+  })
+
+  test('Subgraph navigation works after ID remapping', async ({
+    comfyPage
+  }) => {
+    await comfyPage.workflow.loadWorkflow(WORKFLOW)
+
+    const subgraphNode = await comfyPage.nodeOps.getNodeRefById('5')
+    await subgraphNode.navigateIntoSubgraph()
+
+    const isInSubgraph = () =>
+      comfyPage.page.evaluate(
+        () => window.app!.canvas.graph?.isRootGraph === false
+      )
+
+    expect(await isInSubgraph()).toBe(true)
+
+    await comfyPage.page.keyboard.press('Escape')
+    await comfyPage.nextFrame()
+
+    expect(await isInSubgraph()).toBe(false)
+  })
+})
diff --git a/browser_tests/tests/subgraph-rename-dialog.spec.ts b/browser_tests/tests/subgraph-rename-dialog.spec.ts
index 0bdb9766df..b0a36bae87 100644
--- a/browser_tests/tests/subgraph-rename-dialog.spec.ts
+++ b/browser_tests/tests/subgraph-rename-dialog.spec.ts
@@ -3,7 +3,6 @@ import { expect } from '@playwright/test'
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
 // Constants
-const INITIAL_NAME = 'initial_slot_name'
 const RENAMED_NAME = 'renamed_slot_name'
 const SECOND_RENAMED_NAME = 'second_renamed_name'
 
@@ -12,28 +11,36 @@ const SELECTORS = {
   promptDialog: '.graphdialog input'
 } as const
 
-test.describe('Subgraph Slot Rename Dialog', () => {
+test.describe('Subgraph Slot Rename Dialog', { tag: '@subgraph' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
   })
 
   test('Shows current slot label (not stale) in rename dialog', async ({
     comfyPage
   }) => {
-    await comfyPage.loadWorkflow('subgraphs/basic-subgraph')
+    await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
 
-    const subgraphNode = await comfyPage.getNodeRefById('2')
+    const subgraphNode = await comfyPage.nodeOps.getNodeRefById('2')
     await subgraphNode.navigateIntoSubgraph()
 
     // Get initial slot label
     const initialInputLabel = await comfyPage.page.evaluate(() => {
-      const graph = window['app'].canvas.graph
+      const graph = window.app!.canvas.graph
+      if (!graph || !('inputNode' in graph)) return null
       return graph.inputs?.[0]?.label || graph.inputs?.[0]?.name || null
     })
 
+    if (initialInputLabel === null) {
+      throw new Error(
+        'Expected subgraph to have an input slot label for rightClickInputSlot'
+      )
+    }
+
     // First rename
-    await comfyPage.rightClickSubgraphInputSlot(initialInputLabel)
-    await comfyPage.clickLitegraphContextMenuItem('Rename Slot')
+    await comfyPage.subgraph.rightClickInputSlot(initialInputLabel)
+    await comfyPage.contextMenu.clickLitegraphMenuItem('Rename Slot')
+    await comfyPage.nextFrame()
 
     await comfyPage.page.waitForSelector(SELECTORS.promptDialog, {
       state: 'visible'
@@ -55,7 +62,9 @@ test.describe('Subgraph Slot Rename Dialog', () => {
 
     // Verify the rename worked
     const afterFirstRename = await comfyPage.page.evaluate(() => {
-      const graph = window['app'].canvas.graph
+      const graph = window.app!.canvas.graph
+      if (!graph || !('inputNode' in graph))
+        return { label: null, name: null, displayName: null }
       const slot = graph.inputs?.[0]
       return {
         label: slot?.label || null,
@@ -67,8 +76,9 @@ test.describe('Subgraph Slot Rename Dialog', () => {
 
     // Now rename again - this is where the bug would show
     // We need to use the index-based approach since the method looks for slot.name
-    await comfyPage.rightClickSubgraphInputSlot()
-    await comfyPage.clickLitegraphContextMenuItem('Rename Slot')
+    await comfyPage.subgraph.rightClickInputSlot()
+    await comfyPage.contextMenu.clickLitegraphMenuItem('Rename Slot')
+    await comfyPage.nextFrame()
 
     await comfyPage.page.waitForSelector(SELECTORS.promptDialog, {
       state: 'visible'
@@ -97,7 +107,8 @@ test.describe('Subgraph Slot Rename Dialog', () => {
 
     // Verify the second rename worked
     const afterSecondRename = await comfyPage.page.evaluate(() => {
-      const graph = window['app'].canvas.graph
+      const graph = window.app!.canvas.graph
+      if (!graph || !('inputNode' in graph)) return null
       return graph.inputs?.[0]?.label || null
     })
     expect(afterSecondRename).toBe(SECOND_RENAMED_NAME)
@@ -106,20 +117,28 @@ test.describe('Subgraph Slot Rename Dialog', () => {
   test('Shows current output slot label in rename dialog', async ({
     comfyPage
   }) => {
-    await comfyPage.loadWorkflow('subgraphs/basic-subgraph')
+    await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
 
-    const subgraphNode = await comfyPage.getNodeRefById('2')
+    const subgraphNode = await comfyPage.nodeOps.getNodeRefById('2')
     await subgraphNode.navigateIntoSubgraph()
 
     // Get initial output slot label
     const initialOutputLabel = await comfyPage.page.evaluate(() => {
-      const graph = window['app'].canvas.graph
+      const graph = window.app!.canvas.graph
+      if (!graph || !('inputNode' in graph)) return null
       return graph.outputs?.[0]?.label || graph.outputs?.[0]?.name || null
     })
 
+    if (initialOutputLabel === null) {
+      throw new Error(
+        'Expected subgraph to have an output slot label for rightClickOutputSlot'
+      )
+    }
+
     // First rename
-    await comfyPage.rightClickSubgraphOutputSlot(initialOutputLabel)
-    await comfyPage.clickLitegraphContextMenuItem('Rename Slot')
+    await comfyPage.subgraph.rightClickOutputSlot(initialOutputLabel)
+    await comfyPage.contextMenu.clickLitegraphMenuItem('Rename Slot')
+    await comfyPage.nextFrame()
 
     await comfyPage.page.waitForSelector(SELECTORS.promptDialog, {
       state: 'visible'
@@ -141,8 +160,9 @@ test.describe('Subgraph Slot Rename Dialog', () => {
 
     // Now rename again to check for stale content
     // We need to use the index-based approach since the method looks for slot.name
-    await comfyPage.rightClickSubgraphOutputSlot()
-    await comfyPage.clickLitegraphContextMenuItem('Rename Slot')
+    await comfyPage.subgraph.rightClickOutputSlot()
+    await comfyPage.contextMenu.clickLitegraphMenuItem('Rename Slot')
+    await comfyPage.nextFrame()
 
     await comfyPage.page.waitForSelector(SELECTORS.promptDialog, {
       state: 'visible'
diff --git a/browser_tests/tests/subgraph.spec.ts b/browser_tests/tests/subgraph.spec.ts
index 6359156211..43fda40ee4 100644
--- a/browser_tests/tests/subgraph.spec.ts
+++ b/browser_tests/tests/subgraph.spec.ts
@@ -16,9 +16,13 @@ const SELECTORS = {
   domWidget: '.comfy-multiline-input'
 } as const
 
-test.describe('Subgraph Operations', () => {
+test.describe('Subgraph Operations', { tag: ['@slow', '@subgraph'] }, () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
+    await comfyPage.settings.setSetting(
+      'Comfy.NodeSearchBoxImpl',
+      'v1 (legacy)'
+    )
   })
 
   // Helper to get subgraph slot count
@@ -26,8 +30,11 @@ test.describe('Subgraph Operations', () => {
     comfyPage: typeof test.prototype.comfyPage,
     type: 'inputs' | 'outputs'
   ): Promise<number> {
-    return await comfyPage.page.evaluate((slotType) => {
-      return window['app'].canvas.graph[slotType]?.length || 0
+    return await comfyPage.page.evaluate((slotType: 'inputs' | 'outputs') => {
+      const graph = window.app!.canvas.graph
+      // isSubgraph check: subgraphs have isRootGraph === false
+      if (!graph || !('inputNode' in graph)) return 0
+      return graph[slotType]?.length || 0
     }, type)
   }
 
@@ -36,7 +43,7 @@ test.describe('Subgraph Operations', () => {
     comfyPage: typeof test.prototype.comfyPage
   ): Promise<number> {
     return await comfyPage.page.evaluate(() => {
-      return window['app'].canvas.graph.nodes?.length || 0
+      return window.app!.canvas.graph!.nodes?.length || 0
     })
   }
 
@@ -45,22 +52,25 @@ test.describe('Subgraph Operations', () => {
     comfyPage: typeof test.prototype.comfyPage
   ): Promise<boolean> {
     return await comfyPage.page.evaluate(() => {
-      const graph = window['app'].canvas.graph
-      return graph?.constructor?.name === 'Subgraph'
+      const graph = window.app!.canvas.graph
+      return !!graph && 'inputNode' in graph
     })
   }
 
   test.describe('I/O Slot Management', () => {
     test('Can add input slots to subgraph', async ({ comfyPage }) => {
-      await comfyPage.loadWorkflow('subgraphs/basic-subgraph')
+      await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
 
-      const subgraphNode = await comfyPage.getNodeRefById('2')
+      const subgraphNode = await comfyPage.nodeOps.getNodeRefById('2')
       await subgraphNode.navigateIntoSubgraph()
 
       const initialCount = await getSubgraphSlotCount(comfyPage, 'inputs')
-      const vaeEncodeNode = await comfyPage.getNodeRefById('2')
+      const [vaeEncodeNode] = await comfyPage.nodeOps.getNodeRefsByType(
+        'VAEEncode',
+        true
+      )
 
-      await comfyPage.connectFromSubgraphInput(vaeEncodeNode, 0)
+      await comfyPage.subgraph.connectFromInput(vaeEncodeNode, 0)
       await comfyPage.nextFrame()
 
       const finalCount = await getSubgraphSlotCount(comfyPage, 'inputs')
@@ -68,15 +78,18 @@ test.describe('Subgraph Operations', () => {
     })
 
     test('Can add output slots to subgraph', async ({ comfyPage }) => {
-      await comfyPage.loadWorkflow('subgraphs/basic-subgraph')
+      await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
 
-      const subgraphNode = await comfyPage.getNodeRefById('2')
+      const subgraphNode = await comfyPage.nodeOps.getNodeRefById('2')
       await subgraphNode.navigateIntoSubgraph()
 
       const initialCount = await getSubgraphSlotCount(comfyPage, 'outputs')
-      const vaeEncodeNode = await comfyPage.getNodeRefById('2')
+      const [vaeEncodeNode] = await comfyPage.nodeOps.getNodeRefsByType(
+        'VAEEncode',
+        true
+      )
 
-      await comfyPage.connectToSubgraphOutput(vaeEncodeNode, 0)
+      await comfyPage.subgraph.connectToOutput(vaeEncodeNode, 0)
       await comfyPage.nextFrame()
 
       const finalCount = await getSubgraphSlotCount(comfyPage, 'outputs')
@@ -84,16 +97,17 @@ test.describe('Subgraph Operations', () => {
     })
 
     test('Can remove input slots from subgraph', async ({ comfyPage }) => {
-      await comfyPage.loadWorkflow('subgraphs/basic-subgraph')
+      await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
 
-      const subgraphNode = await comfyPage.getNodeRefById('2')
+      const subgraphNode = await comfyPage.nodeOps.getNodeRefById('2')
       await subgraphNode.navigateIntoSubgraph()
 
       const initialCount = await getSubgraphSlotCount(comfyPage, 'inputs')
       expect(initialCount).toBeGreaterThan(0)
 
-      await comfyPage.rightClickSubgraphInputSlot()
-      await comfyPage.clickLitegraphContextMenuItem('Remove Slot')
+      await comfyPage.subgraph.rightClickInputSlot()
+      await comfyPage.contextMenu.clickLitegraphMenuItem('Remove Slot')
+      await comfyPage.nextFrame()
 
       // Force re-render
       await comfyPage.canvas.click({ position: { x: 100, y: 100 } })
@@ -104,16 +118,17 @@ test.describe('Subgraph Operations', () => {
     })
 
     test('Can remove output slots from subgraph', async ({ comfyPage }) => {
-      await comfyPage.loadWorkflow('subgraphs/basic-subgraph')
+      await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
 
-      const subgraphNode = await comfyPage.getNodeRefById('2')
+      const subgraphNode = await comfyPage.nodeOps.getNodeRefById('2')
       await subgraphNode.navigateIntoSubgraph()
 
       const initialCount = await getSubgraphSlotCount(comfyPage, 'outputs')
       expect(initialCount).toBeGreaterThan(0)
 
-      await comfyPage.rightClickSubgraphOutputSlot()
-      await comfyPage.clickLitegraphContextMenuItem('Remove Slot')
+      await comfyPage.subgraph.rightClickOutputSlot()
+      await comfyPage.contextMenu.clickLitegraphMenuItem('Remove Slot')
+      await comfyPage.nextFrame()
 
       // Force re-render
       await comfyPage.canvas.click({ position: { x: 100, y: 100 } })
@@ -124,18 +139,20 @@ test.describe('Subgraph Operations', () => {
     })
 
     test('Can rename I/O slots', async ({ comfyPage }) => {
-      await comfyPage.loadWorkflow('subgraphs/basic-subgraph')
+      await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
 
-      const subgraphNode = await comfyPage.getNodeRefById('2')
+      const subgraphNode = await comfyPage.nodeOps.getNodeRefById('2')
       await subgraphNode.navigateIntoSubgraph()
 
       const initialInputLabel = await comfyPage.page.evaluate(() => {
-        const graph = window['app'].canvas.graph
+        const graph = window.app!.canvas.graph
+        if (!graph || !('inputNode' in graph)) return null
         return graph.inputs?.[0]?.label || null
       })
 
-      await comfyPage.rightClickSubgraphInputSlot(initialInputLabel)
-      await comfyPage.clickLitegraphContextMenuItem('Rename Slot')
+      await comfyPage.subgraph.rightClickInputSlot(initialInputLabel!)
+      await comfyPage.contextMenu.clickLitegraphMenuItem('Rename Slot')
+      await comfyPage.nextFrame()
 
       await comfyPage.page.waitForSelector(SELECTORS.promptDialog, {
         state: 'visible'
@@ -148,7 +165,8 @@ test.describe('Subgraph Operations', () => {
       await comfyPage.nextFrame()
 
       const newInputName = await comfyPage.page.evaluate(() => {
-        const graph = window['app'].canvas.graph
+        const graph = window.app!.canvas.graph
+        if (!graph || !('inputNode' in graph)) return null
         return graph.inputs?.[0]?.label || null
       })
 
@@ -157,17 +175,18 @@ test.describe('Subgraph Operations', () => {
     })
 
     test('Can rename input slots via double-click', async ({ comfyPage }) => {
-      await comfyPage.loadWorkflow('subgraphs/basic-subgraph')
+      await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
 
-      const subgraphNode = await comfyPage.getNodeRefById('2')
+      const subgraphNode = await comfyPage.nodeOps.getNodeRefById('2')
       await subgraphNode.navigateIntoSubgraph()
 
       const initialInputLabel = await comfyPage.page.evaluate(() => {
-        const graph = window['app'].canvas.graph
+        const graph = window.app!.canvas.graph
+        if (!graph || !('inputNode' in graph)) return null
         return graph.inputs?.[0]?.label || null
       })
 
-      await comfyPage.doubleClickSubgraphInputSlot(initialInputLabel)
+      await comfyPage.subgraph.doubleClickInputSlot(initialInputLabel!)
 
       await comfyPage.page.waitForSelector(SELECTORS.promptDialog, {
         state: 'visible'
@@ -180,7 +199,8 @@ test.describe('Subgraph Operations', () => {
       await comfyPage.nextFrame()
 
       const newInputName = await comfyPage.page.evaluate(() => {
-        const graph = window['app'].canvas.graph
+        const graph = window.app!.canvas.graph
+        if (!graph || !('inputNode' in graph)) return null
         return graph.inputs?.[0]?.label || null
       })
 
@@ -189,17 +209,18 @@ test.describe('Subgraph Operations', () => {
     })
 
     test('Can rename output slots via double-click', async ({ comfyPage }) => {
-      await comfyPage.loadWorkflow('subgraphs/basic-subgraph')
+      await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
 
-      const subgraphNode = await comfyPage.getNodeRefById('2')
+      const subgraphNode = await comfyPage.nodeOps.getNodeRefById('2')
       await subgraphNode.navigateIntoSubgraph()
 
       const initialOutputLabel = await comfyPage.page.evaluate(() => {
-        const graph = window['app'].canvas.graph
+        const graph = window.app!.canvas.graph
+        if (!graph || !('inputNode' in graph)) return null
         return graph.outputs?.[0]?.label || null
       })
 
-      await comfyPage.doubleClickSubgraphOutputSlot(initialOutputLabel)
+      await comfyPage.subgraph.doubleClickOutputSlot(initialOutputLabel!)
 
       await comfyPage.page.waitForSelector(SELECTORS.promptDialog, {
         state: 'visible'
@@ -213,7 +234,8 @@ test.describe('Subgraph Operations', () => {
       await comfyPage.nextFrame()
 
       const newOutputName = await comfyPage.page.evaluate(() => {
-        const graph = window['app'].canvas.graph
+        const graph = window.app!.canvas.graph
+        if (!graph || !('inputNode' in graph)) return null
         return graph.outputs?.[0]?.label || null
       })
 
@@ -224,19 +246,21 @@ test.describe('Subgraph Operations', () => {
     test('Right-click context menu still works alongside double-click', async ({
       comfyPage
     }) => {
-      await comfyPage.loadWorkflow('subgraphs/basic-subgraph')
+      await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
 
-      const subgraphNode = await comfyPage.getNodeRefById('2')
+      const subgraphNode = await comfyPage.nodeOps.getNodeRefById('2')
       await subgraphNode.navigateIntoSubgraph()
 
       const initialInputLabel = await comfyPage.page.evaluate(() => {
-        const graph = window['app'].canvas.graph
+        const graph = window.app!.canvas.graph
+        if (!graph || !('inputNode' in graph)) return null
         return graph.inputs?.[0]?.label || null
       })
 
       // Test that right-click still works for renaming
-      await comfyPage.rightClickSubgraphInputSlot(initialInputLabel)
-      await comfyPage.clickLitegraphContextMenuItem('Rename Slot')
+      await comfyPage.subgraph.rightClickInputSlot(initialInputLabel!)
+      await comfyPage.contextMenu.clickLitegraphMenuItem('Rename Slot')
+      await comfyPage.nextFrame()
 
       await comfyPage.page.waitForSelector(SELECTORS.promptDialog, {
         state: 'visible'
@@ -250,7 +274,8 @@ test.describe('Subgraph Operations', () => {
       await comfyPage.nextFrame()
 
       const newInputName = await comfyPage.page.evaluate(() => {
-        const graph = window['app'].canvas.graph
+        const graph = window.app!.canvas.graph
+        if (!graph || !('inputNode' in graph)) return null
         return graph.inputs?.[0]?.label || null
       })
 
@@ -261,20 +286,25 @@ test.describe('Subgraph Operations', () => {
     test('Can double-click on slot label text to rename', async ({
       comfyPage
     }) => {
-      await comfyPage.loadWorkflow('subgraphs/basic-subgraph')
+      await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
 
-      const subgraphNode = await comfyPage.getNodeRefById('2')
+      const subgraphNode = await comfyPage.nodeOps.getNodeRefById('2')
       await subgraphNode.navigateIntoSubgraph()
 
       const initialInputLabel = await comfyPage.page.evaluate(() => {
-        const graph = window['app'].canvas.graph
+        const graph = window.app!.canvas.graph
+        if (!graph || !('inputNode' in graph)) return null
         return graph.inputs?.[0]?.label || null
       })
 
       // Use direct pointer event approach to double-click on label
       await comfyPage.page.evaluate(() => {
-        const app = window['app']
+        const app = window.app!
+
         const graph = app.canvas.graph
+        if (!graph || !('inputNode' in graph)) {
+          throw new Error('Expected to be in subgraph')
+        }
         const input = graph.inputs?.[0]
 
         if (!input?.labelPos) {
@@ -285,13 +315,15 @@ test.describe('Subgraph Operations', () => {
         const testX = input.labelPos[0]
         const testY = input.labelPos[1]
 
+        // Create a minimal mock event with required properties
+        // Full PointerEvent creation is unnecessary for this test
         const leftClickEvent = {
           canvasX: testX,
           canvasY: testY,
-          button: 0, // Left mouse button
+          button: 0,
           preventDefault: () => {},
           stopPropagation: () => {}
-        }
+        } as Parameters<typeof graph.inputNode.onPointerDown>[0]
 
         const inputNode = graph.inputNode
         if (inputNode?.onPointerDown) {
@@ -322,7 +354,8 @@ test.describe('Subgraph Operations', () => {
       await comfyPage.nextFrame()
 
       const newInputName = await comfyPage.page.evaluate(() => {
-        const graph = window['app'].canvas.graph
+        const graph = window.app!.canvas.graph
+        if (!graph || !('inputNode' in graph)) return null
         return graph.inputs?.[0]?.label || null
       })
 
@@ -332,29 +365,68 @@ test.describe('Subgraph Operations', () => {
     test('Can create widget from link with compressed target_slot', async ({
       comfyPage
     }) => {
-      await comfyPage.loadWorkflow('subgraphs/subgraph-compressed-target-slot')
+      await comfyPage.workflow.loadWorkflow(
+        'subgraphs/subgraph-compressed-target-slot'
+      )
       const step = await comfyPage.page.evaluate(() => {
-        return window['app'].graph.nodes[0].widgets[0].options.step
+        return window.app!.graph!.nodes[0].widgets![0].options.step
       })
       expect(step).toBe(10)
     })
   })
 
+  test.describe('Subgraph Unpacking', () => {
+    test('Unpacking subgraph with duplicate links does not create extra links', async ({
+      comfyPage
+    }) => {
+      await comfyPage.workflow.loadWorkflow(
+        'subgraphs/subgraph-duplicate-links'
+      )
+
+      const result = await comfyPage.page.evaluate(() => {
+        const graph = window.app!.graph!
+        const subgraphNode = graph.nodes.find((n) => n.isSubgraphNode())
+        if (!subgraphNode || !subgraphNode.isSubgraphNode()) {
+          return { error: 'No subgraph node found' }
+        }
+
+        graph.unpackSubgraph(subgraphNode)
+
+        const linkCount = graph.links.size
+        const nodes = graph.nodes
+        const ksampler = nodes.find((n) => n.type === 'KSampler')
+        if (!ksampler) return { error: 'No KSampler found after unpack' }
+
+        const linkedInputCount = ksampler.inputs.filter(
+          (i) => i.link != null
+        ).length
+
+        return { linkCount, linkedInputCount, nodeCount: nodes.length }
+      })
+
+      expect(result).not.toHaveProperty('error')
+      // Should have exactly 1 link (EmptyLatentImage→KSampler)
+      // not 4 (with 3 duplicates). The KSampler→output link is dropped
+      // because the subgraph output has no downstream connection.
+      expect(result.linkCount).toBe(1)
+      // KSampler should have exactly 1 linked input (latent_image)
+      expect(result.linkedInputCount).toBe(1)
+    })
+  })
+
   test.describe('Subgraph Creation and Deletion', () => {
     test('Can create subgraph from selected nodes', async ({ comfyPage }) => {
-      await comfyPage.loadWorkflow('default')
+      await comfyPage.workflow.loadWorkflow('default')
 
-      const initialNodeCount = await getGraphNodeCount(comfyPage)
-
-      await comfyPage.ctrlA()
+      await comfyPage.keyboard.selectAll()
       await comfyPage.nextFrame()
 
-      const node = await comfyPage.getNodeRefById('5')
+      const node = await comfyPage.nodeOps.getNodeRefById('5')
       await node.convertToSubgraph()
       await comfyPage.nextFrame()
 
       const subgraphNodes =
-        await comfyPage.getNodeRefsByTitle(NEW_SUBGRAPH_TITLE)
+        await comfyPage.nodeOps.getNodeRefsByTitle(NEW_SUBGRAPH_TITLE)
       expect(subgraphNodes.length).toBe(1)
 
       const finalNodeCount = await getGraphNodeCount(comfyPage)
@@ -362,9 +434,9 @@ test.describe('Subgraph Operations', () => {
     })
 
     test('Can delete subgraph node', async ({ comfyPage }) => {
-      await comfyPage.loadWorkflow('subgraphs/basic-subgraph')
+      await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
 
-      const subgraphNode = await comfyPage.getNodeRefById('2')
+      const subgraphNode = await comfyPage.nodeOps.getNodeRefById('2')
       expect(await subgraphNode.exists()).toBe(true)
 
       const initialNodeCount = await getGraphNodeCount(comfyPage)
@@ -376,7 +448,7 @@ test.describe('Subgraph Operations', () => {
       const finalNodeCount = await getGraphNodeCount(comfyPage)
       expect(finalNodeCount).toBe(initialNodeCount - 1)
 
-      const deletedNode = await comfyPage.getNodeRefById('2')
+      const deletedNode = await comfyPage.nodeOps.getNodeRefById('2')
       expect(await deletedNode.exists()).toBe(false)
     })
 
@@ -384,9 +456,9 @@ test.describe('Subgraph Operations', () => {
       test('Can copy subgraph node by dragging + alt', async ({
         comfyPage
       }) => {
-        await comfyPage.loadWorkflow('subgraphs/basic-subgraph')
+        await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
 
-        const subgraphNode = await comfyPage.getNodeRefById('2')
+        const subgraphNode = await comfyPage.nodeOps.getNodeRefById('2')
 
         // Get position of subgraph node
         const subgraphPos = await subgraphNode.getPosition()
@@ -404,7 +476,7 @@ test.describe('Subgraph Operations', () => {
 
         // Find all subgraph nodes
         const subgraphNodes =
-          await comfyPage.getNodeRefsByTitle(NEW_SUBGRAPH_TITLE)
+          await comfyPage.nodeOps.getNodeRefsByTitle(NEW_SUBGRAPH_TITLE)
 
         // Expect a second subgraph node to be created (2 total)
         expect(subgraphNodes.length).toBe(2)
@@ -413,9 +485,9 @@ test.describe('Subgraph Operations', () => {
       test('Copying subgraph node by dragging + alt creates a new subgraph node with unique type', async ({
         comfyPage
       }) => {
-        await comfyPage.loadWorkflow('subgraphs/basic-subgraph')
+        await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
 
-        const subgraphNode = await comfyPage.getNodeRefById('2')
+        const subgraphNode = await comfyPage.nodeOps.getNodeRefById('2')
 
         // Get position of subgraph node
         const subgraphPos = await subgraphNode.getPosition()
@@ -433,7 +505,7 @@ test.describe('Subgraph Operations', () => {
 
         // Find all subgraph nodes and expect all unique IDs
         const subgraphNodes =
-          await comfyPage.getNodeRefsByTitle(NEW_SUBGRAPH_TITLE)
+          await comfyPage.nodeOps.getNodeRefsByTitle(NEW_SUBGRAPH_TITLE)
 
         // Expect the second subgraph node to have a unique type
         const nodeType1 = await subgraphNodes[0].getType()
@@ -445,21 +517,21 @@ test.describe('Subgraph Operations', () => {
 
   test.describe('Operations Inside Subgraphs', () => {
     test('Can copy and paste nodes in subgraph', async ({ comfyPage }) => {
-      await comfyPage.loadWorkflow('subgraphs/basic-subgraph')
+      await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
 
-      const subgraphNode = await comfyPage.getNodeRefById('2')
+      const subgraphNode = await comfyPage.nodeOps.getNodeRefById('2')
       await subgraphNode.navigateIntoSubgraph()
 
       const initialNodeCount = await getGraphNodeCount(comfyPage)
 
       const nodesInSubgraph = await comfyPage.page.evaluate(() => {
-        const nodes = window['app'].canvas.graph.nodes
+        const nodes = window.app!.canvas.graph!.nodes
         return nodes?.[0]?.id || null
       })
 
       expect(nodesInSubgraph).not.toBeNull()
 
-      const nodeToClone = await comfyPage.getNodeRefById(
+      const nodeToClone = await comfyPage.nodeOps.getNodeRefById(
         String(nodesInSubgraph)
       )
       await nodeToClone.click('title')
@@ -476,13 +548,13 @@ test.describe('Subgraph Operations', () => {
     })
 
     test('Can undo and redo operations in subgraph', async ({ comfyPage }) => {
-      await comfyPage.loadWorkflow('subgraphs/basic-subgraph')
+      await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
 
-      const subgraphNode = await comfyPage.getNodeRefById('2')
+      const subgraphNode = await comfyPage.nodeOps.getNodeRefById('2')
       await subgraphNode.navigateIntoSubgraph()
 
       // Add a node
-      await comfyPage.doubleClickCanvas()
+      await comfyPage.canvasOps.doubleClick()
       await comfyPage.searchBox.fillAndSelectFirstNode('Note')
       await comfyPage.nextFrame()
 
@@ -490,14 +562,14 @@ test.describe('Subgraph Operations', () => {
       const initialCount = await getGraphNodeCount(comfyPage)
 
       // Undo
-      await comfyPage.ctrlZ()
+      await comfyPage.keyboard.undo()
       await comfyPage.nextFrame()
 
       const afterUndoCount = await getGraphNodeCount(comfyPage)
       expect(afterUndoCount).toBe(initialCount - 1)
 
       // Redo
-      await comfyPage.ctrlY()
+      await comfyPage.keyboard.redo()
       await comfyPage.nextFrame()
 
       const afterRedoCount = await getGraphNodeCount(comfyPage)
@@ -507,16 +579,16 @@ test.describe('Subgraph Operations', () => {
 
   test.describe('Subgraph Navigation and UI', () => {
     test.beforeEach(async ({ comfyPage }) => {
-      await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
     })
 
     test('Breadcrumb updates when subgraph node title is changed', async ({
       comfyPage
     }) => {
-      await comfyPage.loadWorkflow('subgraphs/nested-subgraph')
+      await comfyPage.workflow.loadWorkflow('subgraphs/nested-subgraph')
       await comfyPage.nextFrame()
 
-      const subgraphNode = await comfyPage.getNodeRefById('10')
+      const subgraphNode = await comfyPage.nodeOps.getNodeRefById('10')
       const nodePos = await subgraphNode.getPosition()
       const nodeSize = await subgraphNode.getSize()
 
@@ -565,7 +637,7 @@ test.describe('Subgraph Operations', () => {
     test('DOM widget visibility persists through subgraph navigation', async ({
       comfyPage
     }) => {
-      await comfyPage.loadWorkflow(
+      await comfyPage.workflow.loadWorkflow(
         'subgraphs/subgraph-with-promoted-text-widget'
       )
       await comfyPage.nextFrame()
@@ -575,7 +647,7 @@ test.describe('Subgraph Operations', () => {
       await expect(parentTextarea).toBeVisible()
       await expect(parentTextarea).toHaveCount(1)
 
-      const subgraphNode = await comfyPage.getNodeRefById('11')
+      const subgraphNode = await comfyPage.nodeOps.getNodeRefById('11')
       expect(await subgraphNode.exists()).toBe(true)
 
       await subgraphNode.navigateIntoSubgraph()
@@ -598,14 +670,14 @@ test.describe('Subgraph Operations', () => {
     test('DOM widget content is preserved through navigation', async ({
       comfyPage
     }) => {
-      await comfyPage.loadWorkflow(
+      await comfyPage.workflow.loadWorkflow(
         'subgraphs/subgraph-with-promoted-text-widget'
       )
 
       const textarea = comfyPage.page.locator(SELECTORS.domWidget)
       await textarea.fill(TEST_WIDGET_CONTENT)
 
-      const subgraphNode = await comfyPage.getNodeRefById('11')
+      const subgraphNode = await comfyPage.nodeOps.getNodeRefById('11')
       await subgraphNode.navigateIntoSubgraph()
 
       const subgraphTextarea = comfyPage.page.locator(SELECTORS.domWidget)
@@ -621,7 +693,7 @@ test.describe('Subgraph Operations', () => {
     test('DOM elements are cleaned up when subgraph node is removed', async ({
       comfyPage
     }) => {
-      await comfyPage.loadWorkflow(
+      await comfyPage.workflow.loadWorkflow(
         'subgraphs/subgraph-with-promoted-text-widget'
       )
 
@@ -630,7 +702,7 @@ test.describe('Subgraph Operations', () => {
         .count()
       expect(initialCount).toBe(1)
 
-      const subgraphNode = await comfyPage.getNodeRefById('11')
+      const subgraphNode = await comfyPage.nodeOps.getNodeRefById('11')
 
       await subgraphNode.click('title')
       await comfyPage.page.keyboard.press('Delete')
@@ -646,23 +718,24 @@ test.describe('Subgraph Operations', () => {
       comfyPage
     }) => {
       // Enable new menu for breadcrumb navigation
-      await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
 
       const workflowName = 'subgraphs/subgraph-with-promoted-text-widget'
-      await comfyPage.loadWorkflow(workflowName)
+      await comfyPage.workflow.loadWorkflow(workflowName)
 
       const textareaCount = await comfyPage.page
         .locator(SELECTORS.domWidget)
         .count()
       expect(textareaCount).toBe(1)
 
-      const subgraphNode = await comfyPage.getNodeRefById('11')
+      const subgraphNode = await comfyPage.nodeOps.getNodeRefById('11')
 
       // Navigate into subgraph (method now handles retries internally)
       await subgraphNode.navigateIntoSubgraph()
 
-      await comfyPage.rightClickSubgraphInputSlot('text')
-      await comfyPage.clickLitegraphContextMenuItem('Remove Slot')
+      await comfyPage.subgraph.rightClickInputSlot('text')
+      await comfyPage.contextMenu.clickLitegraphMenuItem('Remove Slot')
+      await comfyPage.nextFrame()
 
       // Wait for breadcrumb to be visible
       await comfyPage.page.waitForSelector(SELECTORS.breadcrumb, {
@@ -682,7 +755,7 @@ test.describe('Subgraph Operations', () => {
 
       // Check that the subgraph node has no widgets after removing the text slot
       const widgetCount = await comfyPage.page.evaluate(() => {
-        return window['app'].canvas.graph.nodes[0].widgets?.length || 0
+        return window.app!.canvas.graph!.nodes[0].widgets?.length || 0
       })
 
       expect(widgetCount).toBe(0)
@@ -691,7 +764,7 @@ test.describe('Subgraph Operations', () => {
     test('Multiple promoted widgets are handled correctly', async ({
       comfyPage
     }) => {
-      await comfyPage.loadWorkflow(
+      await comfyPage.workflow.loadWorkflow(
         'subgraphs/subgraph-with-multiple-promoted-widgets'
       )
 
@@ -700,7 +773,7 @@ test.describe('Subgraph Operations', () => {
         .count()
       expect(parentCount).toBeGreaterThan(1)
 
-      const subgraphNode = await comfyPage.getNodeRefById('11')
+      const subgraphNode = await comfyPage.nodeOps.getNodeRefById('11')
       await subgraphNode.navigateIntoSubgraph()
 
       const subgraphCount = await comfyPage.page
@@ -720,15 +793,15 @@ test.describe('Subgraph Operations', () => {
 
   test.describe('Navigation Hotkeys', () => {
     test.beforeEach(async ({ comfyPage }) => {
-      await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
     })
 
     test('Navigation hotkey can be customized', async ({ comfyPage }) => {
-      await comfyPage.loadWorkflow('subgraphs/basic-subgraph')
+      await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
       await comfyPage.nextFrame()
 
       // Change the Exit Subgraph keybinding from Escape to Alt+Q
-      await comfyPage.setSetting('Comfy.Keybinding.NewBindings', [
+      await comfyPage.settings.setSetting('Comfy.Keybinding.NewBindings', [
         {
           commandId: 'Comfy.Graph.ExitSubgraph',
           combo: {
@@ -740,7 +813,7 @@ test.describe('Subgraph Operations', () => {
         }
       ])
 
-      await comfyPage.setSetting('Comfy.Keybinding.UnsetBindings', [
+      await comfyPage.settings.setSetting('Comfy.Keybinding.UnsetBindings', [
         {
           commandId: 'Comfy.Graph.ExitSubgraph',
           combo: {
@@ -754,10 +827,12 @@ test.describe('Subgraph Operations', () => {
 
       // Reload the page
       await comfyPage.page.reload()
-      await comfyPage.page.waitForTimeout(1024)
+      await comfyPage.setup()
+      await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
+      await comfyPage.nextFrame()
 
       // Navigate into subgraph
-      const subgraphNode = await comfyPage.getNodeRefById('2')
+      const subgraphNode = await comfyPage.nodeOps.getNodeRefById('2')
       await subgraphNode.navigateIntoSubgraph()
       await comfyPage.page.waitForSelector(SELECTORS.breadcrumb)
 
@@ -780,10 +855,10 @@ test.describe('Subgraph Operations', () => {
     test('Escape prioritizes closing dialogs over exiting subgraph', async ({
       comfyPage
     }) => {
-      await comfyPage.loadWorkflow('subgraphs/basic-subgraph')
+      await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
       await comfyPage.nextFrame()
 
-      const subgraphNode = await comfyPage.getNodeRefById('2')
+      const subgraphNode = await comfyPage.nodeOps.getNodeRefById('2')
       await subgraphNode.navigateIntoSubgraph()
       await comfyPage.page.waitForSelector(SELECTORS.breadcrumb)
 
@@ -794,7 +869,7 @@ test.describe('Subgraph Operations', () => {
 
       // Open settings dialog using hotkey
       await comfyPage.page.keyboard.press('Control+,')
-      await comfyPage.page.waitForSelector('.settings-container', {
+      await comfyPage.page.waitForSelector('[data-testid="settings-dialog"]', {
         state: 'visible'
       })
 
@@ -804,7 +879,7 @@ test.describe('Subgraph Operations', () => {
 
       // Dialog should be closed
       await expect(
-        comfyPage.page.locator('.settings-container')
+        comfyPage.page.locator('[data-testid="settings-dialog"]')
       ).not.toBeVisible()
 
       // Should still be in subgraph
diff --git a/browser_tests/tests/subgraphPromotion.spec.ts b/browser_tests/tests/subgraphPromotion.spec.ts
new file mode 100644
index 0000000000..e770a00632
--- /dev/null
+++ b/browser_tests/tests/subgraphPromotion.spec.ts
@@ -0,0 +1,690 @@
+import { expect } from '@playwright/test'
+
+import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
+
+import type { ComfyPage } from '../fixtures/ComfyPage'
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+import { TestIds } from '../fixtures/selectors'
+import { fitToViewInstant } from '../helpers/fitToView'
+import {
+  getPromotedWidgetNames,
+  getPromotedWidgetCount,
+  getPromotedWidgets
+} from '../helpers/promotedWidgets'
+
+/**
+ * Check whether we're currently in a subgraph.
+ */
+async function isInSubgraph(comfyPage: ComfyPage): Promise<boolean> {
+  return comfyPage.page.evaluate(() => {
+    const graph = window.app!.canvas.graph
+    return !!graph && 'inputNode' in graph
+  })
+}
+
+async function exitSubgraphViaBreadcrumb(comfyPage: ComfyPage): Promise<void> {
+  const breadcrumb = comfyPage.page.getByTestId(TestIds.breadcrumb.subgraph)
+  await breadcrumb.waitFor({ state: 'visible', timeout: 5000 })
+
+  const parentLink = breadcrumb.getByRole('link').first()
+  await expect(parentLink).toBeVisible()
+  await parentLink.click()
+  await comfyPage.nextFrame()
+}
+
+test.describe(
+  'Subgraph Widget Promotion',
+  { tag: ['@subgraph', '@widget'] },
+  () => {
+    test.describe('Auto-promotion on Convert to Subgraph', () => {
+      test('Recommended widgets are auto-promoted when creating a subgraph', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow('default')
+
+        // Select just the KSampler node (id 3) which has a "seed" widget
+        const ksampler = await comfyPage.nodeOps.getNodeRefById('3')
+        await ksampler.click('title')
+        const subgraphNode = await ksampler.convertToSubgraph()
+        await comfyPage.nextFrame()
+
+        // SubgraphNode should exist
+        expect(await subgraphNode.exists()).toBe(true)
+
+        // The KSampler has a "seed" widget which is in the recommended list.
+        // The promotion store should have at least the seed widget promoted.
+        const nodeId = String(subgraphNode.id)
+        const promotedNames = await getPromotedWidgetNames(comfyPage, nodeId)
+        expect(promotedNames).toContain('seed')
+
+        // SubgraphNode should have widgets (promoted views)
+        const widgetCount = await getPromotedWidgetCount(comfyPage, nodeId)
+        expect(widgetCount).toBeGreaterThan(0)
+      })
+
+      test('CLIPTextEncode text widget is auto-promoted', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow('default')
+
+        // Select the positive CLIPTextEncode node (id 6)
+        const clipNode = await comfyPage.nodeOps.getNodeRefById('6')
+        await clipNode.click('title')
+        const subgraphNode = await clipNode.convertToSubgraph()
+        await comfyPage.nextFrame()
+
+        const nodeId = String(subgraphNode.id)
+        const promotedNames = await getPromotedWidgetNames(comfyPage, nodeId)
+        expect(promotedNames.length).toBeGreaterThan(0)
+
+        // CLIPTextEncode is in the recommendedNodes list, so its text widget
+        // should be promoted
+        expect(promotedNames).toContain('text')
+      })
+
+      test('SaveImage/PreviewImage nodes get pseudo-widget promoted', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow('default')
+        await fitToViewInstant(comfyPage)
+
+        // Select the SaveImage node (id 9 in default workflow)
+        const saveNode = await comfyPage.nodeOps.getNodeRefById('9')
+        await saveNode.click('title')
+        const subgraphNode = await saveNode.convertToSubgraph()
+        await comfyPage.nextFrame()
+
+        const promotedNames = await getPromotedWidgetNames(
+          comfyPage,
+          String(subgraphNode.id)
+        )
+
+        // SaveImage is in the recommendedNodes list, so filename_prefix is promoted
+        expect(promotedNames).toContain('filename_prefix')
+      })
+    })
+
+    test.describe('Promoted Widget Visibility in LiteGraph Mode', () => {
+      test('Promoted text widget is visible on SubgraphNode', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow(
+          'subgraphs/subgraph-with-promoted-text-widget'
+        )
+        await comfyPage.nextFrame()
+
+        // The subgraph node (id 11) should have a text widget promoted
+        const textarea = comfyPage.page.getByTestId(
+          TestIds.widgets.domWidgetTextarea
+        )
+        await expect(textarea).toBeVisible()
+        await expect(textarea).toHaveCount(1)
+      })
+
+      test('Multiple promoted widgets all render on SubgraphNode', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow(
+          'subgraphs/subgraph-with-multiple-promoted-widgets'
+        )
+        await comfyPage.nextFrame()
+
+        const textareas = comfyPage.page.getByTestId(
+          TestIds.widgets.domWidgetTextarea
+        )
+        await expect(textareas.first()).toBeVisible()
+        const count = await textareas.count()
+        expect(count).toBeGreaterThan(1)
+      })
+    })
+
+    test.describe('Promoted Widget Visibility in Vue Mode', () => {
+      test.beforeEach(async ({ comfyPage }) => {
+        await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+      })
+
+      test('Promoted text widget renders on SubgraphNode in Vue mode', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow(
+          'subgraphs/subgraph-with-promoted-text-widget'
+        )
+        await comfyPage.vueNodes.waitForNodes()
+
+        // SubgraphNode (id 11) should render with its body
+        const subgraphVueNode = comfyPage.vueNodes.getNodeLocator('11')
+        await expect(subgraphVueNode).toBeVisible()
+
+        // It should have the Enter Subgraph button
+        const enterButton = subgraphVueNode.getByTestId('subgraph-enter-button')
+        await expect(enterButton).toBeVisible()
+
+        // The promoted text widget should render inside the node
+        const nodeBody = subgraphVueNode.locator('[data-testid="node-body-11"]')
+        await expect(nodeBody).toBeVisible()
+
+        // Widgets section should exist and have at least one widget
+        const widgets = nodeBody.locator('.lg-node-widgets > div')
+        await expect(widgets.first()).toBeVisible()
+      })
+
+      test('Enter Subgraph button navigates into subgraph in Vue mode', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow(
+          'subgraphs/subgraph-with-promoted-text-widget'
+        )
+        await comfyPage.vueNodes.waitForNodes()
+
+        await comfyPage.vueNodes.enterSubgraph('11')
+        await comfyPage.nextFrame()
+
+        expect(await isInSubgraph(comfyPage)).toBe(true)
+      })
+
+      test('Multiple promoted widgets render on SubgraphNode in Vue mode', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow(
+          'subgraphs/subgraph-with-multiple-promoted-widgets'
+        )
+        await comfyPage.vueNodes.waitForNodes()
+
+        const subgraphVueNode = comfyPage.vueNodes.getNodeLocator('11')
+        await expect(subgraphVueNode).toBeVisible()
+
+        const nodeBody = subgraphVueNode.locator('[data-testid="node-body-11"]')
+        const widgets = nodeBody.locator('.lg-node-widgets > div')
+        const count = await widgets.count()
+        expect(count).toBeGreaterThan(1)
+      })
+    })
+
+    test.describe('Promoted Widget Reactivity', () => {
+      test('Value changes on promoted widget sync to interior widget', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow(
+          'subgraphs/subgraph-with-promoted-text-widget'
+        )
+        await comfyPage.nextFrame()
+
+        const testContent = 'promoted-value-sync-test'
+
+        // Type into the promoted textarea on the SubgraphNode
+        const textarea = comfyPage.page.getByTestId(
+          TestIds.widgets.domWidgetTextarea
+        )
+        await textarea.fill(testContent)
+        await comfyPage.nextFrame()
+
+        // Navigate into subgraph
+        const subgraphNode = await comfyPage.nodeOps.getNodeRefById('11')
+        await subgraphNode.navigateIntoSubgraph()
+
+        // Interior CLIPTextEncode textarea should have the same value
+        const interiorTextarea = comfyPage.page.getByTestId(
+          TestIds.widgets.domWidgetTextarea
+        )
+        await expect(interiorTextarea).toHaveValue(testContent)
+      })
+
+      test('Value changes on interior widget sync to promoted widget', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow(
+          'subgraphs/subgraph-with-promoted-text-widget'
+        )
+        await comfyPage.nextFrame()
+
+        const testContent = 'interior-value-sync-test'
+
+        // Navigate into subgraph
+        const subgraphNode = await comfyPage.nodeOps.getNodeRefById('11')
+        await subgraphNode.navigateIntoSubgraph()
+
+        // Type into the interior CLIPTextEncode textarea
+        const interiorTextarea = comfyPage.page.getByTestId(
+          TestIds.widgets.domWidgetTextarea
+        )
+        await interiorTextarea.fill(testContent)
+        await comfyPage.nextFrame()
+
+        // Navigate back to parent graph
+        await exitSubgraphViaBreadcrumb(comfyPage)
+
+        // Promoted textarea on SubgraphNode should have the same value
+        const promotedTextarea = comfyPage.page.getByTestId(
+          TestIds.widgets.domWidgetTextarea
+        )
+        await expect(promotedTextarea).toHaveValue(testContent)
+      })
+
+      test('Value persists through repeated navigation', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow(
+          'subgraphs/subgraph-with-promoted-text-widget'
+        )
+        await comfyPage.nextFrame()
+
+        const testContent = 'persistence-through-navigation'
+
+        // Set value on promoted widget
+        const textarea = comfyPage.page.getByTestId(
+          TestIds.widgets.domWidgetTextarea
+        )
+        await textarea.fill(testContent)
+
+        // Navigate in and out multiple times
+        for (let i = 0; i < 3; i++) {
+          const subgraphNode = await comfyPage.nodeOps.getNodeRefById('11')
+          await subgraphNode.navigateIntoSubgraph()
+          const interiorTextarea = comfyPage.page.getByTestId(
+            TestIds.widgets.domWidgetTextarea
+          )
+          await expect(interiorTextarea).toHaveValue(testContent)
+
+          await exitSubgraphViaBreadcrumb(comfyPage)
+
+          const promotedTextarea = comfyPage.page.getByTestId(
+            TestIds.widgets.domWidgetTextarea
+          )
+          await expect(promotedTextarea).toHaveValue(testContent)
+        }
+      })
+    })
+
+    test.describe('Manual Promote/Demote via Context Menu', () => {
+      test.beforeEach(async ({ comfyPage }) => {
+        await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+      })
+
+      test('Can promote a widget from inside a subgraph', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
+
+        const subgraphNode = await comfyPage.nodeOps.getNodeRefById('2')
+        await subgraphNode.navigateIntoSubgraph()
+
+        // Get the KSampler node (id 1) inside the subgraph
+        const ksampler = await comfyPage.nodeOps.getNodeRefById('1')
+
+        // Right-click on the KSampler's "steps" widget (index 2) to promote it
+        const stepsWidget = await ksampler.getWidget(2)
+        const widgetPos = await stepsWidget.getPosition()
+        await comfyPage.canvas.click({
+          position: widgetPos,
+          button: 'right',
+          force: true
+        })
+        await comfyPage.nextFrame()
+
+        // Look for the Promote Widget menu entry
+        const promoteEntry = comfyPage.page
+          .locator('.litemenu-entry')
+          .filter({ hasText: /Promote Widget/ })
+
+        await expect(promoteEntry).toBeVisible()
+        await promoteEntry.click()
+        await comfyPage.nextFrame()
+
+        // Navigate back to parent
+        await exitSubgraphViaBreadcrumb(comfyPage)
+
+        // SubgraphNode should now have the promoted widget
+        const widgetCount = await getPromotedWidgetCount(comfyPage, '2')
+        expect(widgetCount).toBeGreaterThan(0)
+      })
+
+      test('Can un-promote a widget from inside a subgraph', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
+
+        // First promote a canvas-rendered widget (KSampler "steps")
+        const subgraphNode = await comfyPage.nodeOps.getNodeRefById('2')
+        await subgraphNode.navigateIntoSubgraph()
+
+        const ksampler = await comfyPage.nodeOps.getNodeRefById('1')
+        const stepsWidget = await ksampler.getWidget(2)
+        const widgetPos = await stepsWidget.getPosition()
+
+        await comfyPage.canvas.click({
+          position: widgetPos,
+          button: 'right',
+          force: true
+        })
+        await comfyPage.nextFrame()
+
+        const promoteEntry = comfyPage.page
+          .locator('.litemenu-entry')
+          .filter({ hasText: /Promote Widget/ })
+        await expect(promoteEntry).toBeVisible()
+        await promoteEntry.click()
+        await comfyPage.nextFrame()
+
+        // Navigate back and verify promotion took effect
+        await exitSubgraphViaBreadcrumb(comfyPage)
+        await fitToViewInstant(comfyPage)
+        await comfyPage.nextFrame()
+
+        const initialWidgetCount = await getPromotedWidgetCount(comfyPage, '2')
+        expect(initialWidgetCount).toBeGreaterThan(0)
+
+        // Navigate back in and un-promote
+        const subgraphNode2 = await comfyPage.nodeOps.getNodeRefById('2')
+        await subgraphNode2.navigateIntoSubgraph()
+        const stepsWidget2 = await (
+          await comfyPage.nodeOps.getNodeRefById('1')
+        ).getWidget(2)
+        const widgetPos2 = await stepsWidget2.getPosition()
+
+        await comfyPage.canvas.click({
+          position: widgetPos2,
+          button: 'right',
+          force: true
+        })
+        await comfyPage.nextFrame()
+
+        const unpromoteEntry = comfyPage.page
+          .locator('.litemenu-entry')
+          .filter({ hasText: /Un-Promote Widget/ })
+
+        await expect(unpromoteEntry).toBeVisible()
+        await unpromoteEntry.click()
+        await comfyPage.nextFrame()
+
+        // Navigate back to parent
+        await exitSubgraphViaBreadcrumb(comfyPage)
+
+        // SubgraphNode should have fewer widgets
+        const finalWidgetCount = await getPromotedWidgetCount(comfyPage, '2')
+        expect(finalWidgetCount).toBeLessThan(initialWidgetCount)
+      })
+    })
+
+    test.describe('Pseudo-Widget Promotion', () => {
+      test('Promotion store tracks pseudo-widget entries for subgraph with preview node', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow(
+          'subgraphs/subgraph-with-preview-node'
+        )
+        await comfyPage.nextFrame()
+
+        // The SaveImage node is in the recommendedNodes list, so its
+        // filename_prefix widget should be auto-promoted
+        const promotedNames = await getPromotedWidgetNames(comfyPage, '5')
+        expect(promotedNames.length).toBeGreaterThan(0)
+        expect(promotedNames).toContain('filename_prefix')
+      })
+
+      test('Converting SaveImage to subgraph promotes its widgets', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow('default')
+        await fitToViewInstant(comfyPage)
+
+        // Select SaveImage (id 9)
+        const saveNode = await comfyPage.nodeOps.getNodeRefById('9')
+        await saveNode.click('title')
+        const subgraphNode = await saveNode.convertToSubgraph()
+        await comfyPage.nextFrame()
+
+        // SaveImage is a recommended node, so filename_prefix should be promoted
+        const nodeId = String(subgraphNode.id)
+        const promotedNames = await getPromotedWidgetNames(comfyPage, nodeId)
+        expect(promotedNames.length).toBeGreaterThan(0)
+
+        const widgetCount = await getPromotedWidgetCount(comfyPage, nodeId)
+        expect(widgetCount).toBeGreaterThan(0)
+      })
+    })
+
+    test.describe('Legacy And Round-Trip Coverage', () => {
+      test('Legacy -1 proxyWidgets entries are hydrated to concrete interior node IDs', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow(
+          'subgraphs/subgraph-compressed-target-slot'
+        )
+        await comfyPage.nextFrame()
+
+        const promotedWidgets = await getPromotedWidgets(comfyPage, '2')
+        expect(promotedWidgets.length).toBeGreaterThan(0)
+        expect(
+          promotedWidgets.some(([interiorNodeId]) => interiorNodeId === '-1')
+        ).toBe(false)
+        expect(
+          promotedWidgets.some(
+            ([interiorNodeId, widgetName]) =>
+              interiorNodeId !== '-1' && widgetName === 'batch_size'
+          )
+        ).toBe(true)
+      })
+
+      test('Promoted widgets survive serialize -> loadGraphData round-trip', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow(
+          'subgraphs/subgraph-with-promoted-text-widget'
+        )
+        await comfyPage.nextFrame()
+
+        const beforePromoted = await getPromotedWidgetNames(comfyPage, '11')
+        expect(beforePromoted).toContain('text')
+
+        const serialized = await comfyPage.page.evaluate(() => {
+          return window.app!.graph!.serialize()
+        })
+
+        await comfyPage.page.evaluate((workflow: ComfyWorkflowJSON) => {
+          return window.app!.loadGraphData(workflow)
+        }, serialized as ComfyWorkflowJSON)
+        await comfyPage.nextFrame()
+
+        const afterPromoted = await getPromotedWidgetNames(comfyPage, '11')
+        expect(afterPromoted).toContain('text')
+
+        const widgetCount = await getPromotedWidgetCount(comfyPage, '11')
+        expect(widgetCount).toBeGreaterThan(0)
+      })
+
+      test('Cloning a subgraph node keeps promoted widget entries on original and clone', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow(
+          'subgraphs/subgraph-with-promoted-text-widget'
+        )
+        await comfyPage.nextFrame()
+
+        const originalNode = await comfyPage.nodeOps.getNodeRefById('11')
+        const originalPos = await originalNode.getPosition()
+
+        await comfyPage.page.mouse.move(originalPos.x + 16, originalPos.y + 16)
+        await comfyPage.page.keyboard.down('Alt')
+        await comfyPage.page.mouse.down()
+        await comfyPage.nextFrame()
+        await comfyPage.page.mouse.move(originalPos.x + 72, originalPos.y + 72)
+        await comfyPage.page.mouse.up()
+        await comfyPage.page.keyboard.up('Alt')
+        await comfyPage.nextFrame()
+
+        const subgraphNodeIds = await comfyPage.page.evaluate(() => {
+          const graph = window.app!.canvas.graph!
+          return graph.nodes
+            .filter(
+              (n) =>
+                typeof n.isSubgraphNode === 'function' && n.isSubgraphNode()
+            )
+            .map((n) => String(n.id))
+        })
+
+        expect(subgraphNodeIds.length).toBeGreaterThan(1)
+        for (const nodeId of subgraphNodeIds) {
+          const promotedWidgets = await getPromotedWidgets(comfyPage, nodeId)
+          expect(promotedWidgets.length).toBeGreaterThan(0)
+          expect(
+            promotedWidgets.some(([, widgetName]) => widgetName === 'text')
+          ).toBe(true)
+        }
+      })
+    })
+
+    test.describe('Vue Mode - Promoted Preview Content', () => {
+      test.beforeEach(async ({ comfyPage }) => {
+        await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+      })
+
+      test('SubgraphNode with preview node shows hasCustomContent area in Vue mode', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow(
+          'subgraphs/subgraph-with-preview-node'
+        )
+        await comfyPage.vueNodes.waitForNodes()
+
+        const subgraphVueNode = comfyPage.vueNodes.getNodeLocator('5')
+        await expect(subgraphVueNode).toBeVisible()
+
+        // The node body should exist
+        const nodeBody = subgraphVueNode.locator('[data-testid="node-body-5"]')
+        await expect(nodeBody).toBeVisible()
+      })
+    })
+
+    test.describe('Nested Promoted Widget Disabled State', () => {
+      test('Externally linked promoted widget is disabled, unlinked ones are not', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow(
+          'subgraphs/subgraph-nested-promotion'
+        )
+        await comfyPage.nextFrame()
+
+        // Node 5 (Sub 0) has 4 promoted widgets. The first (string_a) has its
+        // slot connected externally from the Outer node, so it should be
+        // disabled. The remaining promoted textarea widgets (value, value_1)
+        // are unlinked and should be enabled.
+        const promotedNames = await getPromotedWidgetNames(comfyPage, '5')
+        expect(promotedNames).toContain('string_a')
+        expect(promotedNames).toContain('value')
+
+        const disabledState = await comfyPage.page.evaluate(() => {
+          const node = window.app!.canvas.graph!.getNodeById('5')
+          return (node?.widgets ?? []).map((w) => ({
+            name: w.name,
+            disabled: !!w.computedDisabled
+          }))
+        })
+
+        const linkedWidget = disabledState.find((w) => w.name === 'string_a')
+        expect(linkedWidget?.disabled).toBe(true)
+
+        const unlinkedWidgets = disabledState.filter(
+          (w) => w.name !== 'string_a'
+        )
+        for (const w of unlinkedWidgets) {
+          expect(w.disabled).toBe(false)
+        }
+      })
+
+      test('Unlinked promoted textarea widgets are editable on the subgraph exterior', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow(
+          'subgraphs/subgraph-nested-promotion'
+        )
+        await comfyPage.nextFrame()
+
+        // The promoted textareas that are NOT externally linked should be
+        // fully opaque and interactive.
+        const textareas = comfyPage.page.getByTestId(
+          TestIds.widgets.domWidgetTextarea
+        )
+        await expect(textareas.first()).toBeVisible()
+
+        const count = await textareas.count()
+        for (let i = 0; i < count; i++) {
+          const textarea = textareas.nth(i)
+          const wrapper = textarea.locator('..')
+          const opacity = await wrapper.evaluate(
+            (el) => getComputedStyle(el).opacity
+          )
+
+          if (opacity === '1' && (await textarea.isEditable())) {
+            const testContent = `nested-promotion-edit-${i}`
+            await textarea.fill(testContent)
+            await expect(textarea).toHaveValue(testContent)
+          }
+        }
+      })
+    })
+
+    test.describe('Promotion Cleanup', () => {
+      test('Removing subgraph node clears promotion store entries', async ({
+        comfyPage
+      }) => {
+        await comfyPage.workflow.loadWorkflow(
+          'subgraphs/subgraph-with-promoted-text-widget'
+        )
+        await comfyPage.nextFrame()
+
+        // Verify promotions exist
+        const namesBefore = await getPromotedWidgetNames(comfyPage, '11')
+        expect(namesBefore.length).toBeGreaterThan(0)
+
+        // Delete the subgraph node
+        const subgraphNode = await comfyPage.nodeOps.getNodeRefById('11')
+        await subgraphNode.click('title')
+        await comfyPage.page.keyboard.press('Delete')
+        await comfyPage.nextFrame()
+
+        // Node no longer exists, so promoted widgets should be gone
+        const nodeExists = await comfyPage.page.evaluate(() => {
+          return !!window.app!.canvas.graph!.getNodeById('11')
+        })
+        expect(nodeExists).toBe(false)
+      })
+
+      test('Removing I/O slot removes associated promoted widget', async ({
+        comfyPage
+      }) => {
+        await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+
+        await comfyPage.workflow.loadWorkflow(
+          'subgraphs/subgraph-with-promoted-text-widget'
+        )
+
+        const initialWidgetCount = await getPromotedWidgetCount(comfyPage, '11')
+        expect(initialWidgetCount).toBeGreaterThan(0)
+
+        // Navigate into subgraph
+        const subgraphNode = await comfyPage.nodeOps.getNodeRefById('11')
+        await subgraphNode.navigateIntoSubgraph()
+
+        // Remove the text input slot
+        await comfyPage.subgraph.rightClickInputSlot('text')
+        await comfyPage.contextMenu.clickLitegraphMenuItem('Remove Slot')
+        await comfyPage.nextFrame()
+
+        // Navigate back via breadcrumb
+        await comfyPage.page
+          .getByTestId(TestIds.breadcrumb.subgraph)
+          .waitFor({ state: 'visible', timeout: 5000 })
+        const homeBreadcrumb = comfyPage.page.getByRole('link', {
+          name: 'subgraph-with-promoted-text-widget'
+        })
+        await homeBreadcrumb.waitFor({ state: 'visible' })
+        await homeBreadcrumb.click()
+        await comfyPage.nextFrame()
+
+        // Widget count should be reduced
+        const finalWidgetCount = await getPromotedWidgetCount(comfyPage, '11')
+        expect(finalWidgetCount).toBeLessThan(initialWidgetCount)
+      })
+    })
+  }
+)
diff --git a/browser_tests/tests/subgraphSearchAliases.spec.ts b/browser_tests/tests/subgraphSearchAliases.spec.ts
new file mode 100644
index 0000000000..ee1bbbb488
--- /dev/null
+++ b/browser_tests/tests/subgraphSearchAliases.spec.ts
@@ -0,0 +1,112 @@
+import { expect } from '@playwright/test'
+
+import type { ComfyPage } from '../fixtures/ComfyPage'
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+
+async function createSubgraphAndNavigateInto(comfyPage: ComfyPage) {
+  await comfyPage.workflow.loadWorkflow('default')
+  await comfyPage.nextFrame()
+
+  const ksampler = await comfyPage.nodeOps.getNodeRefById('3')
+  await ksampler.click('title')
+  await ksampler.convertToSubgraph()
+  await comfyPage.nextFrame()
+
+  const subgraphNodes =
+    await comfyPage.nodeOps.getNodeRefsByTitle('New Subgraph')
+  expect(subgraphNodes.length).toBe(1)
+  const subgraphNode = subgraphNodes[0]
+
+  await subgraphNode.navigateIntoSubgraph()
+  return subgraphNode
+}
+
+async function exitSubgraphAndPublish(
+  comfyPage: ComfyPage,
+  subgraphNode: Awaited<ReturnType<typeof createSubgraphAndNavigateInto>>,
+  blueprintName: string
+) {
+  await comfyPage.page.keyboard.press('Escape')
+  await comfyPage.nextFrame()
+
+  await subgraphNode.click('title')
+  await comfyPage.command.executeCommand('Comfy.PublishSubgraph', {
+    name: blueprintName
+  })
+
+  await expect(comfyPage.visibleToasts).toHaveCount(1, { timeout: 5000 })
+  await comfyPage.toast.closeToasts(1)
+}
+
+async function searchAndExpectResult(
+  comfyPage: ComfyPage,
+  searchTerm: string,
+  expectedResult: string
+) {
+  await comfyPage.command.executeCommand('Workspace.SearchBox.Toggle')
+  await expect(comfyPage.searchBox.input).toHaveCount(1)
+  await comfyPage.searchBox.input.fill(searchTerm)
+  await expect(comfyPage.searchBox.findResult(expectedResult)).toBeVisible({
+    timeout: 10000
+  })
+}
+
+test.describe('Subgraph Search Aliases', { tag: ['@subgraph'] }, () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting(
+      'Comfy.NodeSearchBoxImpl',
+      'v1 (legacy)'
+    )
+  })
+
+  test('Can set search aliases on subgraph and find via search', async ({
+    comfyPage
+  }) => {
+    const subgraphNode = await createSubgraphAndNavigateInto(comfyPage)
+
+    await comfyPage.command.executeCommand('Comfy.Subgraph.SetSearchAliases', {
+      aliases: 'qwerty,unicorn'
+    })
+
+    const blueprintName = `test-aliases-${Date.now()}`
+    await exitSubgraphAndPublish(comfyPage, subgraphNode, blueprintName)
+    await searchAndExpectResult(comfyPage, 'unicorn', blueprintName)
+  })
+
+  test('Can set description on subgraph', async ({ comfyPage }) => {
+    await createSubgraphAndNavigateInto(comfyPage)
+
+    await comfyPage.command.executeCommand('Comfy.Subgraph.SetDescription', {
+      description: 'This is a test description'
+    })
+    // Verify the description was set on the subgraph's extra
+    const description = await comfyPage.page.evaluate(() => {
+      const subgraph = window['app']!.canvas.subgraph
+      return (subgraph?.extra as Record<string, unknown>)?.BlueprintDescription
+    })
+    expect(description).toBe('This is a test description')
+  })
+
+  test('Search aliases persist after publish and reload', async ({
+    comfyPage
+  }) => {
+    const subgraphNode = await createSubgraphAndNavigateInto(comfyPage)
+
+    await comfyPage.command.executeCommand('Comfy.Subgraph.SetSearchAliases', {
+      aliases: 'dragon, fire breather'
+    })
+
+    const blueprintName = `test-persist-${Date.now()}`
+    await exitSubgraphAndPublish(comfyPage, subgraphNode, blueprintName)
+
+    // Reload the page to ensure aliases are persisted
+    await comfyPage.page.reload()
+    await comfyPage.page.waitForFunction(
+      () => window['app'] && window['app'].extensionManager
+    )
+    await comfyPage.nextFrame()
+
+    await searchAndExpectResult(comfyPage, 'dragon', blueprintName)
+  })
+})
diff --git a/browser_tests/tests/templateFitView.spec.ts b/browser_tests/tests/templateFitView.spec.ts
new file mode 100644
index 0000000000..933c032285
--- /dev/null
+++ b/browser_tests/tests/templateFitView.spec.ts
@@ -0,0 +1,56 @@
+import { expect } from '@playwright/test'
+
+import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
+
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+
+/**
+ * Tests that templates are automatically fitted to view when loaded.
+ *
+ * When openSource === 'template', fitView() is called to ensure
+ * templates with saved off-screen viewport positions (extra.ds)
+ * are always displayed correctly.
+ */
+test.describe('Template Fit View', { tag: ['@canvas', '@workflow'] }, () => {
+  test('should automatically fit view when loading a template with off-screen saved position', async ({
+    comfyPage
+  }) => {
+    await comfyPage.settings.setSetting('Comfy.EnableWorkflowViewRestore', true)
+
+    // Serialize the current default graph, inject an extreme off-screen
+    // viewport position, then reload it as a template. Without the fix,
+    // the saved offset [-5000, -5000] would be restored and nodes would
+    // be invisible.
+    const viewportState = await comfyPage.page.evaluate(async () => {
+      const app = window.app!
+      const workflow = app.graph.serialize()
+
+      workflow.extra = {
+        ...workflow.extra,
+        ds: { scale: 1, offset: [-5000, -5000] }
+      }
+
+      await app.loadGraphData(workflow as ComfyWorkflowJSON, true, true, null, {
+        openSource: 'template'
+      })
+
+      return {
+        offsetX: app.canvas.ds.offset[0],
+        offsetY: app.canvas.ds.offset[1],
+        nodeCount: app.graph._nodes.length
+      }
+    })
+
+    expect(viewportState.nodeCount).toBeGreaterThan(0)
+
+    // fitView() should have overridden the saved [-5000, -5000] offset
+    expect(
+      viewportState.offsetX,
+      'Viewport X offset should not be the saved off-screen value'
+    ).not.toBe(-5000)
+    expect(
+      viewportState.offsetY,
+      'Viewport Y offset should not be the saved off-screen value'
+    ).not.toBe(-5000)
+  })
+})
diff --git a/browser_tests/tests/templates.spec.ts b/browser_tests/tests/templates.spec.ts
index 5e66054a02..54f6360aa1 100644
--- a/browser_tests/tests/templates.spec.ts
+++ b/browser_tests/tests/templates.spec.ts
@@ -13,10 +13,13 @@ async function checkTemplateFileExists(
   return response.ok()
 }
 
-test.describe('Templates', () => {
+test.describe('Templates', { tag: ['@slow', '@workflow'] }, () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
-    await comfyPage.setSetting('Comfy.Workflow.ShowMissingModelsWarning', false)
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting(
+      'Comfy.Workflow.ShowMissingModelsWarning',
+      false
+    )
   })
 
   test('should have a JSON workflow file for each template', async ({
@@ -72,26 +75,24 @@ test.describe('Templates', () => {
   test('Can load template workflows', async ({ comfyPage }) => {
     // Clear the workflow
     await comfyPage.menu.workflowsTab.open()
-    await comfyPage.executeCommand('Comfy.NewBlankWorkflow')
+    await comfyPage.command.executeCommand('Comfy.NewBlankWorkflow')
     await expect(async () => {
-      expect(await comfyPage.getGraphNodesCount()).toBe(0)
+      expect(await comfyPage.nodeOps.getGraphNodesCount()).toBe(0)
     }).toPass({ timeout: 250 })
 
     // Load a template
-    await comfyPage.executeCommand('Comfy.BrowseTemplates')
+    await comfyPage.command.executeCommand('Comfy.BrowseTemplates')
     await expect(comfyPage.templates.content).toBeVisible()
 
     await comfyPage.page
-      .locator(
-        'nav > div:nth-child(2) > div > span:has-text("Getting Started")'
-      )
+      .getByRole('button', { name: 'Getting Started' })
       .click()
     await comfyPage.templates.loadTemplate('default')
     await expect(comfyPage.templates.content).toBeHidden()
 
     // Ensure we now have some nodes
     await expect(async () => {
-      expect(await comfyPage.getGraphNodesCount()).toBeGreaterThan(0)
+      expect(await comfyPage.nodeOps.getGraphNodesCount()).toBeGreaterThan(0)
     }).toPass({ timeout: 250 })
   })
 
@@ -99,7 +100,7 @@ test.describe('Templates', () => {
     comfyPage
   }) => {
     // Set the tutorial as not completed to mark the user as a first-time user
-    await comfyPage.setSetting('Comfy.TutorialCompleted', false)
+    await comfyPage.settings.setSetting('Comfy.TutorialCompleted', false)
 
     // Load the page
     await comfyPage.setup({ clearStorage: true })
@@ -109,9 +110,9 @@ test.describe('Templates', () => {
   })
 
   test('Uses proper locale files for templates', async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.Locale', 'fr')
+    await comfyPage.settings.setSetting('Comfy.Locale', 'fr')
 
-    await comfyPage.executeCommand('Comfy.BrowseTemplates')
+    await comfyPage.command.executeCommand('Comfy.BrowseTemplates')
 
     const dialog = comfyPage.page.getByRole('dialog').filter({
       has: comfyPage.page.getByRole('heading', { name: 'Modèles', exact: true })
@@ -136,7 +137,7 @@ test.describe('Templates', () => {
     comfyPage
   }) => {
     // Set locale to a language that doesn't have a template file
-    await comfyPage.setSetting('Comfy.Locale', 'de') // German - no index.de.json exists
+    await comfyPage.settings.setSetting('Comfy.Locale', 'de') // German - no index.de.json exists
 
     // Wait for the German request (expected to 404)
     const germanRequestPromise = comfyPage.page.waitForRequest(
@@ -163,7 +164,7 @@ test.describe('Templates', () => {
     )
 
     // Load the templates dialog
-    await comfyPage.executeCommand('Comfy.BrowseTemplates')
+    await comfyPage.command.executeCommand('Comfy.BrowseTemplates')
     await expect(comfyPage.templates.content).toBeVisible()
 
     // Verify German was requested first, then English as fallback
@@ -183,136 +184,140 @@ test.describe('Templates', () => {
     comfyPage
   }) => {
     // Open templates dialog
-    await comfyPage.executeCommand('Comfy.BrowseTemplates')
+    await comfyPage.command.executeCommand('Comfy.BrowseTemplates')
     await comfyPage.templates.content.waitFor({ state: 'visible' })
 
     const templateGrid = comfyPage.page.locator(
       '[data-testid="template-workflows-content"]'
     )
-    const nav = comfyPage.page
-      .locator('header')
-      .filter({ hasText: 'Templates' })
+    const nav = comfyPage.page.locator('header', { hasText: 'Templates' })
 
-    await comfyPage.templates.waitForMinimumCardCount(1)
+    await comfyPage.templates.expectMinimumCardCount(1)
     await expect(templateGrid).toBeVisible()
     await expect(nav).toBeVisible() // Nav should be visible at desktop size
 
     const mobileSize = { width: 640, height: 800 }
     await comfyPage.page.setViewportSize(mobileSize)
-    await comfyPage.templates.waitForMinimumCardCount(1)
+    await comfyPage.templates.expectMinimumCardCount(1)
     await expect(templateGrid).toBeVisible()
-    await expect(nav).not.toBeVisible() // Nav should collapse at mobile size
+    // Nav header is clipped by overflow-hidden parent at mobile size
+    await expect(nav).not.toBeInViewport()
 
     const tabletSize = { width: 1024, height: 800 }
     await comfyPage.page.setViewportSize(tabletSize)
-    await comfyPage.templates.waitForMinimumCardCount(1)
+    await comfyPage.templates.expectMinimumCardCount(1)
     await expect(templateGrid).toBeVisible()
     await expect(nav).toBeVisible() // Nav should be visible at tablet size
   })
 
-  test('template cards descriptions adjust height dynamically', async ({
-    comfyPage
-  }) => {
-    // Setup test by intercepting templates response to inject cards with varying description lengths
-    await comfyPage.page.route('**/templates/index.json', async (route, _) => {
-      const response = [
-        {
-          moduleName: 'default',
-          title: 'Test Templates',
-          type: 'image',
-          templates: [
+  test(
+    'template cards descriptions adjust height dynamically',
+    { tag: '@screenshot' },
+    async ({ comfyPage }) => {
+      // Setup test by intercepting templates response to inject cards with varying description lengths
+      await comfyPage.page.route(
+        '**/templates/index.json',
+        async (route, _) => {
+          const response = [
             {
-              name: 'short-description',
-              title: 'Short Description',
-              mediaType: 'image',
-              mediaSubtype: 'webp',
-              description: 'This is a short description.'
-            },
-            {
-              name: 'medium-description',
-              title: 'Medium Description',
-              mediaType: 'image',
-              mediaSubtype: 'webp',
-              description:
-                'This is a medium length description that should take up two lines on most displays.'
-            },
-            {
-              name: 'long-description',
-              title: 'Long Description',
-              mediaType: 'image',
-              mediaSubtype: 'webp',
-              description:
-                'This is a much longer description that should definitely wrap to multiple lines. It contains enough text to demonstrate how the cards handle varying amounts of content while maintaining a consistent layout grid.'
+              moduleName: 'default',
+              title: 'Test Templates',
+              type: 'image',
+              templates: [
+                {
+                  name: 'short-description',
+                  title: 'Short Description',
+                  mediaType: 'image',
+                  mediaSubtype: 'webp',
+                  description: 'This is a short description.'
+                },
+                {
+                  name: 'medium-description',
+                  title: 'Medium Description',
+                  mediaType: 'image',
+                  mediaSubtype: 'webp',
+                  description:
+                    'This is a medium length description that should take up two lines on most displays.'
+                },
+                {
+                  name: 'long-description',
+                  title: 'Long Description',
+                  mediaType: 'image',
+                  mediaSubtype: 'webp',
+                  description:
+                    'This is a much longer description that should definitely wrap to multiple lines. It contains enough text to demonstrate how the cards handle varying amounts of content while maintaining a consistent layout grid.'
+                }
+              ]
             }
           ]
+          await route.fulfill({
+            status: 200,
+            body: JSON.stringify(response),
+            headers: {
+              'Content-Type': 'application/json',
+              'Cache-Control': 'no-store'
+            }
+          })
         }
-      ]
-      await route.fulfill({
-        status: 200,
-        body: JSON.stringify(response),
-        headers: {
-          'Content-Type': 'application/json',
+      )
+
+      // Mock the thumbnail images to avoid 404s
+      await comfyPage.page.route('**/templates/**.webp', async (route) => {
+        const headers = {
+          'Content-Type': 'image/webp',
           'Cache-Control': 'no-store'
         }
+        await route.fulfill({
+          status: 200,
+          path: 'browser_tests/assets/example.webp',
+          headers
+        })
       })
-    })
 
-    // Mock the thumbnail images to avoid 404s
-    await comfyPage.page.route('**/templates/**.webp', async (route) => {
-      const headers = {
-        'Content-Type': 'image/webp',
-        'Cache-Control': 'no-store'
-      }
-      await route.fulfill({
-        status: 200,
-        path: 'browser_tests/assets/example.webp',
-        headers
-      })
-    })
+      // Open templates dialog
+      await comfyPage.command.executeCommand('Comfy.BrowseTemplates')
+      await expect(comfyPage.templates.content).toBeVisible()
 
-    // Open templates dialog
-    await comfyPage.executeCommand('Comfy.BrowseTemplates')
-    await expect(comfyPage.templates.content).toBeVisible()
+      // Wait for cards to load
+      await expect(
+        comfyPage.page.locator(
+          '[data-testid="template-workflow-short-description"]'
+        )
+      ).toBeVisible({ timeout: 5000 })
 
-    // Wait for cards to load
-    await expect(
-      comfyPage.page.locator(
+      // Verify all three cards with different descriptions are visible
+      const shortDescCard = comfyPage.page.locator(
         '[data-testid="template-workflow-short-description"]'
       )
-    ).toBeVisible({ timeout: 5000 })
+      const mediumDescCard = comfyPage.page.locator(
+        '[data-testid="template-workflow-medium-description"]'
+      )
+      const longDescCard = comfyPage.page.locator(
+        '[data-testid="template-workflow-long-description"]'
+      )
 
-    // Verify all three cards with different descriptions are visible
-    const shortDescCard = comfyPage.page.locator(
-      '[data-testid="template-workflow-short-description"]'
-    )
-    const mediumDescCard = comfyPage.page.locator(
-      '[data-testid="template-workflow-medium-description"]'
-    )
-    const longDescCard = comfyPage.page.locator(
-      '[data-testid="template-workflow-long-description"]'
-    )
+      await expect(shortDescCard).toBeVisible()
+      await expect(mediumDescCard).toBeVisible()
+      await expect(longDescCard).toBeVisible()
 
-    await expect(shortDescCard).toBeVisible()
-    await expect(mediumDescCard).toBeVisible()
-    await expect(longDescCard).toBeVisible()
+      // Verify descriptions are visible and have line-clamp class
+      // The description is in a p tag with text-muted class
+      const shortDesc = shortDescCard.locator('p.text-muted.line-clamp-2')
+      const mediumDesc = mediumDescCard.locator('p.text-muted.line-clamp-2')
+      const longDesc = longDescCard.locator('p.text-muted.line-clamp-2')
 
-    // Verify descriptions are visible and have line-clamp class
-    // The description is in a p tag with text-muted class
-    const shortDesc = shortDescCard.locator('p.text-muted.line-clamp-2')
-    const mediumDesc = mediumDescCard.locator('p.text-muted.line-clamp-2')
-    const longDesc = longDescCard.locator('p.text-muted.line-clamp-2')
+      await expect(shortDesc).toContainText('short description')
+      await expect(mediumDesc).toContainText('medium length description')
+      await expect(longDesc).toContainText('much longer description')
 
-    await expect(shortDesc).toContainText('short description')
-    await expect(mediumDesc).toContainText('medium length description')
-    await expect(longDesc).toContainText('much longer description')
-
-    // Verify grid layout maintains consistency
-    const templateGrid = comfyPage.page.locator(
-      '[data-testid="template-workflows-content"]'
-    )
-    await expect(templateGrid).toBeVisible()
-    await expect(templateGrid).toHaveScreenshot(
-      'template-grid-varying-content.png'
-    )
-  })
+      // Verify grid layout maintains consistency
+      const templateGrid = comfyPage.page.locator(
+        '[data-testid="template-workflows-content"]'
+      )
+      await expect(templateGrid).toBeVisible()
+      await expect(templateGrid).toHaveScreenshot(
+        'template-grid-varying-content.png'
+      )
+    }
+  )
 })
diff --git a/browser_tests/tests/templates.spec.ts-snapshots/template-grid-varying-content-chromium-linux.png b/browser_tests/tests/templates.spec.ts-snapshots/template-grid-varying-content-chromium-linux.png
index b1e97d8f80..14b99a2604 100644
Binary files a/browser_tests/tests/templates.spec.ts-snapshots/template-grid-varying-content-chromium-linux.png and b/browser_tests/tests/templates.spec.ts-snapshots/template-grid-varying-content-chromium-linux.png differ
diff --git a/browser_tests/tests/useSettingSearch.spec.ts b/browser_tests/tests/useSettingSearch.spec.ts
index f022bb4bd2..d71807025f 100644
--- a/browser_tests/tests/useSettingSearch.spec.ts
+++ b/browser_tests/tests/useSettingSearch.spec.ts
@@ -1,27 +1,35 @@
 import { expect } from '@playwright/test'
 
+import type { Settings } from '../../src/schemas/apiSchema'
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
+/**
+ * Type helper for test settings with arbitrary IDs.
+ * Extensions can register settings with any ID, but SettingParams.id
+ * is typed as keyof Settings for autocomplete.
+ */
+type TestSettingId = keyof Settings
+
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
-test.describe('Settings Search functionality', () => {
+test.describe('Settings Search functionality', { tag: '@settings' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
     // Register test settings to verify hidden/deprecated filtering
     await comfyPage.page.evaluate(() => {
-      window['app'].registerExtension({
+      window.app!.registerExtension({
         name: 'TestSettingsExtension',
         settings: [
           {
-            id: 'TestHiddenSetting',
+            id: 'TestHiddenSetting' as TestSettingId,
             name: 'Test Hidden Setting',
             type: 'hidden',
             defaultValue: 'hidden_value',
             category: ['Test', 'Hidden']
           },
           {
-            id: 'TestDeprecatedSetting',
+            id: 'TestDeprecatedSetting' as TestSettingId,
             name: 'Test Deprecated Setting',
             type: 'text',
             defaultValue: 'deprecated_value',
@@ -29,7 +37,7 @@ test.describe('Settings Search functionality', () => {
             category: ['Test', 'Deprecated']
           },
           {
-            id: 'TestVisibleSetting',
+            id: 'TestVisibleSetting' as TestSettingId,
             name: 'Test Visible Setting',
             type: 'text',
             defaultValue: 'visible_value',
@@ -41,243 +49,143 @@ test.describe('Settings Search functionality', () => {
   })
 
   test('can open settings dialog and use search box', async ({ comfyPage }) => {
-    // Open settings dialog
-    await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.locator('.settings-container')
-    await expect(settingsDialog).toBeVisible()
+    const dialog = comfyPage.settingDialog
+    await dialog.open()
 
-    // Find the search box
-    const searchBox = comfyPage.page.locator('.settings-search-box input')
-    await expect(searchBox).toBeVisible()
-
-    // Verify search box has the correct placeholder
-    await expect(searchBox).toHaveAttribute(
+    await expect(dialog.searchBox).toHaveAttribute(
       'placeholder',
       expect.stringContaining('Search')
     )
   })
 
   test('search box is functional and accepts input', async ({ comfyPage }) => {
-    // Open settings dialog
-    await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.locator('.settings-container')
-    await expect(settingsDialog).toBeVisible()
+    const dialog = comfyPage.settingDialog
+    await dialog.open()
 
-    // Find and interact with the search box
-    const searchBox = comfyPage.page.locator('.settings-search-box input')
-    await searchBox.fill('Comfy')
-
-    // Verify the input was accepted
-    await expect(searchBox).toHaveValue('Comfy')
+    await dialog.searchBox.fill('Comfy')
+    await expect(dialog.searchBox).toHaveValue('Comfy')
   })
 
   test('search box clears properly', async ({ comfyPage }) => {
-    // Open settings dialog
-    await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.locator('.settings-container')
-    await expect(settingsDialog).toBeVisible()
+    const dialog = comfyPage.settingDialog
+    await dialog.open()
 
-    // Find and interact with the search box
-    const searchBox = comfyPage.page.locator('.settings-search-box input')
-    await searchBox.fill('test')
-    await expect(searchBox).toHaveValue('test')
+    await dialog.searchBox.fill('test')
+    await expect(dialog.searchBox).toHaveValue('test')
 
-    // Clear the search box
-    await searchBox.clear()
-    await expect(searchBox).toHaveValue('')
+    await dialog.searchBox.clear()
+    await expect(dialog.searchBox).toHaveValue('')
   })
 
   test('settings categories are visible in sidebar', async ({ comfyPage }) => {
-    // Open settings dialog
-    await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.locator('.settings-container')
-    await expect(settingsDialog).toBeVisible()
+    const dialog = comfyPage.settingDialog
+    await dialog.open()
 
-    // Check that the sidebar has categories
-    const categories = comfyPage.page.locator(
-      '.settings-sidebar .p-listbox-option'
-    )
-    expect(await categories.count()).toBeGreaterThan(0)
-
-    // Check that at least one category is visible
-    await expect(categories.first()).toBeVisible()
+    expect(await dialog.categories.count()).toBeGreaterThan(0)
   })
 
   test('can select different categories in sidebar', async ({ comfyPage }) => {
-    // Open settings dialog
-    await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.locator('.settings-container')
-    await expect(settingsDialog).toBeVisible()
+    const dialog = comfyPage.settingDialog
+    await dialog.open()
 
-    // Get categories and click on different ones
-    const categories = comfyPage.page.locator(
-      '.settings-sidebar .p-listbox-option'
-    )
-    const categoryCount = await categories.count()
+    const categoryCount = await dialog.categories.count()
 
     if (categoryCount > 1) {
-      // Click on the second category
-      await categories.nth(1).click()
+      await dialog.categories.nth(1).click()
 
-      // Verify the category is selected
-      await expect(categories.nth(1)).toHaveClass(/p-listbox-option-selected/)
+      await expect(dialog.categories.nth(1)).toHaveClass(
+        /bg-interface-menu-component-surface-selected/
+      )
     }
   })
 
-  test('settings content area is visible', async ({ comfyPage }) => {
-    // Open settings dialog
-    await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.locator('.settings-container')
-    await expect(settingsDialog).toBeVisible()
-
-    // Check that the content area is visible
-    const contentArea = comfyPage.page.locator('.settings-content')
-    await expect(contentArea).toBeVisible()
-
-    // Check that tab panels are visible
-    const tabPanels = comfyPage.page.locator('.settings-tab-panels')
-    await expect(tabPanels).toBeVisible()
-  })
-
   test('search functionality affects UI state', async ({ comfyPage }) => {
-    // Open settings dialog
-    await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.locator('.settings-container')
-    await expect(settingsDialog).toBeVisible()
+    const dialog = comfyPage.settingDialog
+    await dialog.open()
 
-    // Find the search box
-    const searchBox = comfyPage.page.locator('.settings-search-box input')
-
-    // Type in search box
-    await searchBox.fill('graph')
-
-    // Verify that the search input is handled
-    await expect(searchBox).toHaveValue('graph')
+    await dialog.searchBox.fill('graph')
+    await expect(dialog.searchBox).toHaveValue('graph')
   })
 
   test('settings dialog can be closed', async ({ comfyPage }) => {
-    // Open settings dialog
-    await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.locator('.settings-container')
-    await expect(settingsDialog).toBeVisible()
+    const dialog = comfyPage.settingDialog
+    await dialog.open()
 
-    // Close with escape key
     await comfyPage.page.keyboard.press('Escape')
-
-    // Verify dialog is closed
-    await expect(settingsDialog).not.toBeVisible()
+    await expect(dialog.root).not.toBeVisible()
   })
 
   test('search box has proper debouncing behavior', async ({ comfyPage }) => {
-    // Open settings dialog
-    await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.locator('.settings-container')
-    await expect(settingsDialog).toBeVisible()
+    const dialog = comfyPage.settingDialog
+    await dialog.open()
 
-    // Type rapidly in search box
-    const searchBox = comfyPage.page.locator('.settings-search-box input')
-    await searchBox.fill('a')
-    await searchBox.fill('ab')
-    await searchBox.fill('abc')
-    await searchBox.fill('abcd')
+    await dialog.searchBox.fill('a')
+    await dialog.searchBox.fill('ab')
+    await dialog.searchBox.fill('abc')
+    await dialog.searchBox.fill('abcd')
 
-    // Verify final value
-    await expect(searchBox).toHaveValue('abcd')
+    await expect(dialog.searchBox).toHaveValue('abcd')
   })
 
   test('search excludes hidden settings from results', async ({
     comfyPage
   }) => {
-    // Open settings dialog
-    await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.locator('.settings-container')
-    await expect(settingsDialog).toBeVisible()
+    const dialog = comfyPage.settingDialog
+    await dialog.open()
 
-    // Search for our test settings
-    const searchBox = comfyPage.page.locator('.settings-search-box input')
-    await searchBox.fill('Test')
+    await dialog.searchBox.fill('Test')
 
-    // Get all settings content
-    const settingsContent = comfyPage.page.locator('.settings-tab-panels')
-
-    // Should show visible setting but not hidden setting
-    await expect(settingsContent).toContainText('Test Visible Setting')
-    await expect(settingsContent).not.toContainText('Test Hidden Setting')
+    await expect(dialog.contentArea).toContainText('Test Visible Setting')
+    await expect(dialog.contentArea).not.toContainText('Test Hidden Setting')
   })
 
   test('search excludes deprecated settings from results', async ({
     comfyPage
   }) => {
-    // Open settings dialog
-    await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.locator('.settings-container')
-    await expect(settingsDialog).toBeVisible()
+    const dialog = comfyPage.settingDialog
+    await dialog.open()
 
-    // Search for our test settings
-    const searchBox = comfyPage.page.locator('.settings-search-box input')
-    await searchBox.fill('Test')
+    await dialog.searchBox.fill('Test')
 
-    // Get all settings content
-    const settingsContent = comfyPage.page.locator('.settings-tab-panels')
-
-    // Should show visible setting but not deprecated setting
-    await expect(settingsContent).toContainText('Test Visible Setting')
-    await expect(settingsContent).not.toContainText('Test Deprecated Setting')
+    await expect(dialog.contentArea).toContainText('Test Visible Setting')
+    await expect(dialog.contentArea).not.toContainText(
+      'Test Deprecated Setting'
+    )
   })
 
   test('search shows visible settings but excludes hidden and deprecated', async ({
     comfyPage
   }) => {
-    // Open settings dialog
-    await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.locator('.settings-container')
-    await expect(settingsDialog).toBeVisible()
+    const dialog = comfyPage.settingDialog
+    await dialog.open()
 
-    // Search for our test settings
-    const searchBox = comfyPage.page.locator('.settings-search-box input')
-    await searchBox.fill('Test')
+    await dialog.searchBox.fill('Test')
 
-    // Get all settings content
-    const settingsContent = comfyPage.page.locator('.settings-tab-panels')
-
-    // Should only show the visible setting
-    await expect(settingsContent).toContainText('Test Visible Setting')
-
-    // Should not show hidden or deprecated settings
-    await expect(settingsContent).not.toContainText('Test Hidden Setting')
-    await expect(settingsContent).not.toContainText('Test Deprecated Setting')
+    await expect(dialog.contentArea).toContainText('Test Visible Setting')
+    await expect(dialog.contentArea).not.toContainText('Test Hidden Setting')
+    await expect(dialog.contentArea).not.toContainText(
+      'Test Deprecated Setting'
+    )
   })
 
   test('search by setting name excludes hidden and deprecated', async ({
     comfyPage
   }) => {
-    // Open settings dialog
-    await comfyPage.page.keyboard.press('Control+,')
-    const settingsDialog = comfyPage.page.locator('.settings-container')
-    await expect(settingsDialog).toBeVisible()
+    const dialog = comfyPage.settingDialog
+    await dialog.open()
 
-    const searchBox = comfyPage.page.locator('.settings-search-box input')
-    const settingsContent = comfyPage.page.locator('.settings-tab-panels')
+    await dialog.searchBox.clear()
+    await dialog.searchBox.fill('Hidden')
+    await expect(dialog.contentArea).not.toContainText('Test Hidden Setting')
 
-    // Search specifically for hidden setting by name
-    await searchBox.clear()
-    await searchBox.fill('Hidden')
+    await dialog.searchBox.clear()
+    await dialog.searchBox.fill('Deprecated')
+    await expect(dialog.contentArea).not.toContainText(
+      'Test Deprecated Setting'
+    )
 
-    // Should not show the hidden setting even when searching by name
-    await expect(settingsContent).not.toContainText('Test Hidden Setting')
-
-    // Search specifically for deprecated setting by name
-    await searchBox.clear()
-    await searchBox.fill('Deprecated')
-
-    // Should not show the deprecated setting even when searching by name
-    await expect(settingsContent).not.toContainText('Test Deprecated Setting')
-
-    // Search for visible setting by name - should work
-    await searchBox.clear()
-    await searchBox.fill('Visible')
-
-    // Should show the visible setting
-    await expect(settingsContent).toContainText('Test Visible Setting')
+    await dialog.searchBox.clear()
+    await dialog.searchBox.fill('Visible')
+    await expect(dialog.contentArea).toContainText('Test Visible Setting')
   })
 })
diff --git a/browser_tests/tests/userSelectView.spec.ts b/browser_tests/tests/userSelectView.spec.ts
index 38b1a2317b..45eccb0c19 100644
--- a/browser_tests/tests/userSelectView.spec.ts
+++ b/browser_tests/tests/userSelectView.spec.ts
@@ -5,7 +5,7 @@ import { userSelectPageFixture as test } from '../fixtures/UserSelectPage'
 /**
  * Expects ComfyUI backend to be launched with `--multi-user` flag.
  */
-test.describe('User Select View', () => {
+test.describe('User Select View', { tag: '@settings' }, () => {
   test.beforeEach(async ({ userSelectPage, page }) => {
     await page.goto(userSelectPage.url)
     await page.evaluate(() => {
diff --git a/browser_tests/tests/versionMismatchWarnings.spec.ts b/browser_tests/tests/versionMismatchWarnings.spec.ts
index 4b3ff3e309..6c0a89034a 100644
--- a/browser_tests/tests/versionMismatchWarnings.spec.ts
+++ b/browser_tests/tests/versionMismatchWarnings.spec.ts
@@ -3,7 +3,7 @@ import { expect } from '@playwright/test'
 import type { SystemStats } from '../../src/schemas/apiSchema'
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
-test.describe('Version Mismatch Warnings', () => {
+test.describe('Version Mismatch Warnings', { tag: '@slow' }, () => {
   const ALWAYS_AHEAD_OF_INSTALLED_VERSION = '100.100.100'
   const ALWAYS_BEHIND_INSTALLED_VERSION = '0.0.0'
 
@@ -37,7 +37,11 @@ test.describe('Version Mismatch Warnings', () => {
   }
 
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting(
+      'Comfy.VersionCompatibility.DisableWarnings',
+      false
+    )
   })
 
   test('should show version mismatch warnings when installed version lower than required', async ({
@@ -99,10 +103,9 @@ test.describe('Version Mismatch Warnings', () => {
     await comfyPage.setup()
 
     // Locate the warning toast and dismiss it
-    const warningToast = comfyPage.page
-      .locator('div')
-      .filter({ hasText: 'Version Compatibility' })
-      .nth(3)
+    const warningToast = comfyPage.page.locator('.p-toast-message').filter({
+      hasText: 'Version Compatibility'
+    })
     await warningToast.waitFor({ state: 'visible' })
     const dismissButton = warningToast.getByRole('button', { name: 'Close' })
     await dismissButton.click()
diff --git a/browser_tests/tests/viewport.spec.ts b/browser_tests/tests/viewport.spec.ts
index 7bc686a1cf..b7320ee0ec 100644
--- a/browser_tests/tests/viewport.spec.ts
+++ b/browser_tests/tests/viewport.spec.ts
@@ -2,11 +2,13 @@ import { expect } from '@playwright/test'
 
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
-test.describe('Viewport', () => {
+test.describe('Viewport', { tag: ['@screenshot', '@smoke', '@canvas'] }, () => {
   test('Fits view to nodes when saved viewport position is offscreen', async ({
     comfyPage
   }) => {
-    await comfyPage.loadWorkflow('viewport/default-viewport-saved-offscreen')
+    await comfyPage.workflow.loadWorkflow(
+      'viewport/default-viewport-saved-offscreen'
+    )
 
     // Wait a few frames for rendering to stabilize
     for (let i = 0; i < 5; i++) {
diff --git a/browser_tests/tests/viewport.spec.ts-snapshots/viewport-fits-when-saved-offscreen-chromium-linux.png b/browser_tests/tests/viewport.spec.ts-snapshots/viewport-fits-when-saved-offscreen-chromium-linux.png
index cab519db76..4a5099db59 100644
Binary files a/browser_tests/tests/viewport.spec.ts-snapshots/viewport-fits-when-saved-offscreen-chromium-linux.png and b/browser_tests/tests/viewport.spec.ts-snapshots/viewport-fits-when-saved-offscreen-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/groups/groups.spec.ts b/browser_tests/tests/vueNodes/groups/groups.spec.ts
index c12c1772b9..5f691bbeeb 100644
--- a/browser_tests/tests/vueNodes/groups/groups.spec.ts
+++ b/browser_tests/tests/vueNodes/groups/groups.spec.ts
@@ -5,10 +5,10 @@ import {
 
 const CREATE_GROUP_HOTKEY = 'Control+g'
 
-test.describe('Vue Node Groups', () => {
+test.describe('Vue Node Groups', { tag: '@screenshot' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.VueNodes.Enabled', true)
-    await comfyPage.setSetting('Comfy.Minimap.ShowGroups', true)
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.settings.setSetting('Comfy.Minimap.ShowGroups', true)
     await comfyPage.vueNodes.waitForNodes()
   })
 
@@ -24,9 +24,9 @@ test.describe('Vue Node Groups', () => {
 
   test('should allow fitting group to contents', async ({ comfyPage }) => {
     await comfyPage.setup()
-    await comfyPage.loadWorkflow('groups/oversized_group')
-    await comfyPage.ctrlA()
-    await comfyPage.executeCommand('Comfy.Graph.FitGroupToContents')
+    await comfyPage.workflow.loadWorkflow('groups/oversized_group')
+    await comfyPage.keyboard.selectAll()
+    await comfyPage.command.executeCommand('Comfy.Graph.FitGroupToContents')
     await comfyPage.nextFrame()
     await expect(comfyPage.canvas).toHaveScreenshot(
       'vue-groups-fit-to-contents.png'
@@ -36,18 +36,20 @@ test.describe('Vue Node Groups', () => {
   test('should move nested groups together when dragging outer group', async ({
     comfyPage
   }) => {
-    await comfyPage.loadWorkflow('groups/nested-groups-1-inner-node')
+    await comfyPage.workflow.loadWorkflow('groups/nested-groups-1-inner-node')
 
     // Get initial positions with null guards
-    const outerInitial = await comfyPage.getGroupPosition('Outer Group')
-    const innerInitial = await comfyPage.getGroupPosition('Inner Group')
+    const outerInitial =
+      await comfyPage.canvasOps.getGroupPosition('Outer Group')
+    const innerInitial =
+      await comfyPage.canvasOps.getGroupPosition('Inner Group')
 
     const initialOffsetX = innerInitial.x - outerInitial.x
     const initialOffsetY = innerInitial.y - outerInitial.y
 
     // Drag the outer group
     const dragDelta = { x: 100, y: 80 }
-    await comfyPage.dragGroup({
+    await comfyPage.canvasOps.dragGroup({
       name: 'Outer Group',
       deltaX: dragDelta.x,
       deltaY: dragDelta.y
@@ -55,8 +57,10 @@ test.describe('Vue Node Groups', () => {
 
     // Use retrying assertion to wait for positions to update
     await expect(async () => {
-      const outerFinal = await comfyPage.getGroupPosition('Outer Group')
-      const innerFinal = await comfyPage.getGroupPosition('Inner Group')
+      const outerFinal =
+        await comfyPage.canvasOps.getGroupPosition('Outer Group')
+      const innerFinal =
+        await comfyPage.canvasOps.getGroupPosition('Inner Group')
 
       const finalOffsetX = innerFinal.x - outerFinal.x
       const finalOffsetY = innerFinal.y - outerFinal.y
diff --git a/browser_tests/tests/vueNodes/groups/groups.spec.ts-snapshots/vue-groups-create-group-chromium-linux.png b/browser_tests/tests/vueNodes/groups/groups.spec.ts-snapshots/vue-groups-create-group-chromium-linux.png
index 8b66d2c4a7..1a980e71e7 100644
Binary files a/browser_tests/tests/vueNodes/groups/groups.spec.ts-snapshots/vue-groups-create-group-chromium-linux.png and b/browser_tests/tests/vueNodes/groups/groups.spec.ts-snapshots/vue-groups-create-group-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/groups/groups.spec.ts-snapshots/vue-groups-fit-to-contents-chromium-linux.png b/browser_tests/tests/vueNodes/groups/groups.spec.ts-snapshots/vue-groups-fit-to-contents-chromium-linux.png
index 076371135c..87f96a067d 100644
Binary files a/browser_tests/tests/vueNodes/groups/groups.spec.ts-snapshots/vue-groups-fit-to-contents-chromium-linux.png and b/browser_tests/tests/vueNodes/groups/groups.spec.ts-snapshots/vue-groups-fit-to-contents-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/canvas/pan.spec.ts b/browser_tests/tests/vueNodes/interactions/canvas/pan.spec.ts
index a91a9b928c..c7f5ce92c0 100644
--- a/browser_tests/tests/vueNodes/interactions/canvas/pan.spec.ts
+++ b/browser_tests/tests/vueNodes/interactions/canvas/pan.spec.ts
@@ -5,14 +5,21 @@ import {
 
 test.describe('Vue Nodes Canvas Pan', () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
     await comfyPage.vueNodes.waitForNodes()
   })
 
-  test('@mobile Can pan with touch', async ({ comfyPage }) => {
-    await comfyPage.panWithTouch({ x: 64, y: 64 }, { x: 256, y: 256 })
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'vue-nodes-paned-with-touch.png'
-    )
-  })
+  test(
+    '@mobile Can pan with touch',
+    { tag: '@screenshot' },
+    async ({ comfyPage }) => {
+      await comfyPage.canvasOps.panWithTouch(
+        { x: 64, y: 64 },
+        { x: 256, y: 256 }
+      )
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'vue-nodes-paned-with-touch.png'
+      )
+    }
+  )
 })
diff --git a/browser_tests/tests/vueNodes/interactions/canvas/pan.spec.ts-snapshots/vue-nodes-paned-with-touch-mobile-chrome-linux.png b/browser_tests/tests/vueNodes/interactions/canvas/pan.spec.ts-snapshots/vue-nodes-paned-with-touch-mobile-chrome-linux.png
index 151ee4a489..af9614d447 100644
Binary files a/browser_tests/tests/vueNodes/interactions/canvas/pan.spec.ts-snapshots/vue-nodes-paned-with-touch-mobile-chrome-linux.png and b/browser_tests/tests/vueNodes/interactions/canvas/pan.spec.ts-snapshots/vue-nodes-paned-with-touch-mobile-chrome-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/canvas/zoom.spec.ts b/browser_tests/tests/vueNodes/interactions/canvas/zoom.spec.ts
index 2166233376..e391c289d4 100644
--- a/browser_tests/tests/vueNodes/interactions/canvas/zoom.spec.ts
+++ b/browser_tests/tests/vueNodes/interactions/canvas/zoom.spec.ts
@@ -5,30 +5,35 @@ import {
 
 test.describe('Vue Nodes Zoom', () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.VueNodes.Enabled', true)
-    await comfyPage.setSetting('LiteGraph.Canvas.MinFontSizeForLOD', 8)
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.settings.setSetting('LiteGraph.Canvas.MinFontSizeForLOD', 8)
     await comfyPage.vueNodes.waitForNodes()
   })
 
-  test('should not capture drag while zooming with ctrl+shift+drag', async ({
-    comfyPage
-  }) => {
-    const checkpointNode = comfyPage.vueNodes.getNodeByTitle('Load Checkpoint')
-    const nodeBoundingBox = await checkpointNode.boundingBox()
-    if (!nodeBoundingBox) throw new Error('Node bounding box not available')
+  test(
+    'should not capture drag while zooming with ctrl+shift+drag',
+    { tag: '@screenshot' },
+    async ({ comfyPage }) => {
+      const checkpointNode =
+        comfyPage.vueNodes.getNodeByTitle('Load Checkpoint')
+      const nodeBoundingBox = await checkpointNode.boundingBox()
+      if (!nodeBoundingBox) throw new Error('Node bounding box not available')
 
-    const nodeMidpointX = nodeBoundingBox.x + nodeBoundingBox.width / 2
-    const nodeMidpointY = nodeBoundingBox.y + nodeBoundingBox.height / 2
+      const nodeMidpointX = nodeBoundingBox.x + nodeBoundingBox.width / 2
+      const nodeMidpointY = nodeBoundingBox.y + nodeBoundingBox.height / 2
 
-    // Start the Ctrl+Shift drag-to-zoom on the canvas and continue dragging over
-    // the node. The node should not capture the drag while drag-zooming.
-    await comfyPage.page.keyboard.down('Control')
-    await comfyPage.page.keyboard.down('Shift')
-    await comfyPage.dragAndDrop(
-      { x: 200, y: 300 },
-      { x: nodeMidpointX, y: nodeMidpointY }
-    )
+      // Start the Ctrl+Shift drag-to-zoom on the canvas and continue dragging over
+      // the node. The node should not capture the drag while drag-zooming.
+      await comfyPage.page.keyboard.down('Control')
+      await comfyPage.page.keyboard.down('Shift')
+      await comfyPage.canvasOps.dragAndDrop(
+        { x: 200, y: 300 },
+        { x: nodeMidpointX, y: nodeMidpointY }
+      )
 
-    await expect(comfyPage.canvas).toHaveScreenshot('zoomed-in-ctrl-shift.png')
-  })
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'zoomed-in-ctrl-shift.png'
+      )
+    }
+  )
 })
diff --git a/browser_tests/tests/vueNodes/interactions/canvas/zoom.spec.ts-snapshots/zoomed-in-ctrl-shift-chromium-linux.png b/browser_tests/tests/vueNodes/interactions/canvas/zoom.spec.ts-snapshots/zoomed-in-ctrl-shift-chromium-linux.png
index 2141828f04..7202f61ecc 100644
Binary files a/browser_tests/tests/vueNodes/interactions/canvas/zoom.spec.ts-snapshots/zoomed-in-ctrl-shift-chromium-linux.png and b/browser_tests/tests/vueNodes/interactions/canvas/zoom.spec.ts-snapshots/zoomed-in-ctrl-shift-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts
index 09a78fb6ea..1819edde34 100644
--- a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts
+++ b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts
@@ -25,7 +25,7 @@ async function getInputLinkDetails(
 ) {
   return await page.evaluate(
     ([targetNodeId, targetSlot]) => {
-      const app = window['app']
+      const app = window.app
       const graph = app?.canvas?.graph ?? app?.graph
       if (!graph) return null
 
@@ -98,12 +98,13 @@ async function connectSlots(
   await nextFrame()
 }
 
-test.describe('Vue Node Link Interaction', () => {
+test.describe('Vue Node Link Interaction', { tag: '@screenshot' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
-    await comfyPage.setSetting('Comfy.VueNodes.Enabled', true)
-    await comfyPage.setup()
-    await comfyPage.loadWorkflow('vueNodes/simple-triple')
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.settings.setSetting('Comfy.NodeSearchBoxImpl', 'default')
+    // await comfyPage.setup()
+    await comfyPage.workflow.loadWorkflow('vueNodes/simple-triple')
     await comfyPage.vueNodes.waitForNodes()
     await fitToViewInstant(comfyPage)
   })
@@ -112,7 +113,9 @@ test.describe('Vue Node Link Interaction', () => {
     comfyPage,
     comfyMouse
   }) => {
-    const samplerNode = (await comfyPage.getNodeRefsByType('KSampler'))[0]
+    const samplerNode = (
+      await comfyPage.nodeOps.getNodeRefsByType('KSampler')
+    )[0]
     expect(samplerNode).toBeTruthy()
 
     const slot = slotLocator(comfyPage.page, samplerNode.id, 0, false)
@@ -142,8 +145,10 @@ test.describe('Vue Node Link Interaction', () => {
   test('should create a link when dropping on a compatible slot', async ({
     comfyPage
   }) => {
-    const samplerNode = (await comfyPage.getNodeRefsByType('KSampler'))[0]
-    const vaeNode = (await comfyPage.getNodeRefsByType('VAEDecode'))[0]
+    const samplerNode = (
+      await comfyPage.nodeOps.getNodeRefsByType('KSampler')
+    )[0]
+    const vaeNode = (await comfyPage.nodeOps.getNodeRefsByType('VAEDecode'))[0]
     expect(samplerNode && vaeNode).toBeTruthy()
 
     const samplerOutput = await samplerNode.getOutput(0)
@@ -172,8 +177,12 @@ test.describe('Vue Node Link Interaction', () => {
   test('should not create a link when slot types are incompatible', async ({
     comfyPage
   }) => {
-    const samplerNode = (await comfyPage.getNodeRefsByType('KSampler'))[0]
-    const clipNode = (await comfyPage.getNodeRefsByType('CLIPTextEncode'))[0]
+    const samplerNode = (
+      await comfyPage.nodeOps.getNodeRefsByType('KSampler')
+    )[0]
+    const clipNode = (
+      await comfyPage.nodeOps.getNodeRefsByType('CLIPTextEncode')
+    )[0]
     expect(samplerNode && clipNode).toBeTruthy()
 
     const samplerOutput = await samplerNode.getOutput(0)
@@ -200,7 +209,9 @@ test.describe('Vue Node Link Interaction', () => {
   test('should not create a link when dropping onto a slot on the same node', async ({
     comfyPage
   }) => {
-    const samplerNode = (await comfyPage.getNodeRefsByType('KSampler'))[0]
+    const samplerNode = (
+      await comfyPage.nodeOps.getNodeRefsByType('KSampler')
+    )[0]
     expect(samplerNode).toBeTruthy()
 
     const samplerOutput = await samplerNode.getOutput(0)
@@ -221,8 +232,10 @@ test.describe('Vue Node Link Interaction', () => {
     comfyPage,
     comfyMouse
   }) => {
-    const samplerNode = (await comfyPage.getNodeRefsByType('KSampler'))[0]
-    const vaeNode = (await comfyPage.getNodeRefsByType('VAEDecode'))[0]
+    const samplerNode = (
+      await comfyPage.nodeOps.getNodeRefsByType('KSampler')
+    )[0]
+    const vaeNode = (await comfyPage.nodeOps.getNodeRefsByType('VAEDecode'))[0]
     expect(samplerNode && vaeNode).toBeTruthy()
     const samplerOutputCenter = await getSlotCenter(
       comfyPage.page,
@@ -258,8 +271,10 @@ test.describe('Vue Node Link Interaction', () => {
     comfyPage,
     comfyMouse
   }) => {
-    const samplerNode = (await comfyPage.getNodeRefsByType('KSampler'))[0]
-    const vaeNode = (await comfyPage.getNodeRefsByType('VAEDecode'))[0]
+    const samplerNode = (
+      await comfyPage.nodeOps.getNodeRefsByType('KSampler')
+    )[0]
+    const vaeNode = (await comfyPage.nodeOps.getNodeRefsByType('VAEDecode'))[0]
     expect(samplerNode && vaeNode).toBeTruthy()
 
     const samplerOutput = await samplerNode.getOutput(0)
@@ -315,8 +330,10 @@ test.describe('Vue Node Link Interaction', () => {
     comfyPage,
     comfyMouse
   }) => {
-    const samplerNode = (await comfyPage.getNodeRefsByType('KSampler'))[0]
-    const vaeNode = (await comfyPage.getNodeRefsByType('VAEDecode'))[0]
+    const samplerNode = (
+      await comfyPage.nodeOps.getNodeRefsByType('KSampler')
+    )[0]
+    const vaeNode = (await comfyPage.nodeOps.getNodeRefsByType('VAEDecode'))[0]
     expect(samplerNode && vaeNode).toBeTruthy()
 
     const samplerOutput = await samplerNode.getOutput(0)
@@ -398,8 +415,10 @@ test.describe('Vue Node Link Interaction', () => {
     comfyPage,
     comfyMouse
   }) => {
-    const samplerNode = (await comfyPage.getNodeRefsByType('KSampler'))[0]
-    const vaeNode = (await comfyPage.getNodeRefsByType('VAEDecode'))[0]
+    const samplerNode = (
+      await comfyPage.nodeOps.getNodeRefsByType('KSampler')
+    )[0]
+    const vaeNode = (await comfyPage.nodeOps.getNodeRefsByType('VAEDecode'))[0]
 
     const samplerOutput = await samplerNode.getOutput(0)
     const vaeInput = await vaeNode.getInput(0)
@@ -419,7 +438,7 @@ test.describe('Vue Node Link Interaction', () => {
     // This avoids relying on an exact path hit-test position.
     await comfyPage.page.evaluate(
       ([targetNodeId, targetSlot, clientPoint]) => {
-        const app = (window as any)['app']
+        const app = window.app
         const graph = app?.canvas?.graph ?? app?.graph
         if (!graph) throw new Error('Graph not available')
         const node = graph.getNodeById(targetNodeId)
@@ -433,7 +452,7 @@ test.describe('Vue Node Link Interaction', () => {
         if (!link) throw new Error('Link not found')
 
         // Convert the client/canvas pixel coordinates to graph space
-        const pos = app.canvas.ds.convertCanvasToOffset([
+        const pos = app!.canvas.ds.convertCanvasToOffset([
           clientPoint.x,
           clientPoint.y
         ])
@@ -483,8 +502,10 @@ test.describe('Vue Node Link Interaction', () => {
     comfyPage,
     comfyMouse
   }) => {
-    const samplerNode = (await comfyPage.getNodeRefsByType('KSampler'))[0]
-    const vaeNode = (await comfyPage.getNodeRefsByType('VAEDecode'))[0]
+    const samplerNode = (
+      await comfyPage.nodeOps.getNodeRefsByType('KSampler')
+    )[0]
+    const vaeNode = (await comfyPage.nodeOps.getNodeRefsByType('VAEDecode'))[0]
     expect(samplerNode && vaeNode).toBeTruthy()
 
     const samplerOutput = await samplerNode.getOutput(0)
@@ -505,7 +526,7 @@ test.describe('Vue Node Link Interaction', () => {
     // This avoids relying on an exact path hit-test position.
     await comfyPage.page.evaluate(
       ([targetNodeId, targetSlot, clientPoint]) => {
-        const app = (window as any)['app']
+        const app = window.app
         const graph = app?.canvas?.graph ?? app?.graph
         if (!graph) throw new Error('Graph not available')
         const node = graph.getNodeById(targetNodeId)
@@ -519,7 +540,7 @@ test.describe('Vue Node Link Interaction', () => {
         if (!link) throw new Error('Link not found')
 
         // Convert the client/canvas pixel coordinates to graph space
-        const pos = app.canvas.ds.convertCanvasToOffset([
+        const pos = app!.canvas.ds.convertCanvasToOffset([
           clientPoint.x,
           clientPoint.y
         ])
@@ -572,8 +593,12 @@ test.describe('Vue Node Link Interaction', () => {
     comfyPage,
     comfyMouse
   }) => {
-    const clipNode = (await comfyPage.getNodeRefsByType('CLIPTextEncode'))[0]
-    const samplerNode = (await comfyPage.getNodeRefsByType('KSampler'))[0]
+    const clipNode = (
+      await comfyPage.nodeOps.getNodeRefsByType('CLIPTextEncode')
+    )[0]
+    const samplerNode = (
+      await comfyPage.nodeOps.getNodeRefsByType('KSampler')
+    )[0]
     expect(clipNode && samplerNode).toBeTruthy()
 
     // Step 1: Connect CLIP's only output (index 0) to KSampler's second input (index 1)
@@ -642,8 +667,12 @@ test.describe('Vue Node Link Interaction', () => {
     comfyPage,
     comfyMouse
   }) => {
-    const clipNode = (await comfyPage.getNodeRefsByType('CLIPTextEncode'))[0]
-    const samplerNode = (await comfyPage.getNodeRefsByType('KSampler'))[0]
+    const clipNode = (
+      await comfyPage.nodeOps.getNodeRefsByType('CLIPTextEncode')
+    )[0]
+    const samplerNode = (
+      await comfyPage.nodeOps.getNodeRefsByType('KSampler')
+    )[0]
     expect(clipNode && samplerNode).toBeTruthy()
 
     const clipOutput = await clipNode.getOutput(0)
@@ -697,8 +726,12 @@ test.describe('Vue Node Link Interaction', () => {
     comfyPage,
     comfyMouse
   }) => {
-    const clipNode = (await comfyPage.getNodeRefsByType('CLIPTextEncode'))[0]
-    const samplerNode = (await comfyPage.getNodeRefsByType('KSampler'))[0]
+    const clipNode = (
+      await comfyPage.nodeOps.getNodeRefsByType('CLIPTextEncode')
+    )[0]
+    const samplerNode = (
+      await comfyPage.nodeOps.getNodeRefsByType('KSampler')
+    )[0]
     expect(clipNode && samplerNode).toBeTruthy()
 
     // Start drag from CLIP output[0]
@@ -746,8 +779,12 @@ test.describe('Vue Node Link Interaction', () => {
     comfyPage,
     comfyMouse
   }) => {
-    const clipNode = (await comfyPage.getNodeRefsByType('CLIPTextEncode'))[0]
-    const samplerNode = (await comfyPage.getNodeRefsByType('KSampler'))[0]
+    const clipNode = (
+      await comfyPage.nodeOps.getNodeRefsByType('CLIPTextEncode')
+    )[0]
+    const samplerNode = (
+      await comfyPage.nodeOps.getNodeRefsByType('KSampler')
+    )[0]
     expect(clipNode && samplerNode).toBeTruthy()
 
     // Drag from CLIP output[0] to KSampler input[2] (third slot) which is the
@@ -791,8 +828,12 @@ test.describe('Vue Node Link Interaction', () => {
   test('should batch disconnect all links with ctrl+alt+click on slot', async ({
     comfyPage
   }) => {
-    const clipNode = (await comfyPage.getNodeRefsByType('CLIPTextEncode'))[0]
-    const samplerNode = (await comfyPage.getNodeRefsByType('KSampler'))[0]
+    const clipNode = (
+      await comfyPage.nodeOps.getNodeRefsByType('CLIPTextEncode')
+    )[0]
+    const samplerNode = (
+      await comfyPage.nodeOps.getNodeRefsByType('KSampler')
+    )[0]
     expect(clipNode && samplerNode).toBeTruthy()
 
     await connectSlots(
@@ -832,12 +873,14 @@ test.describe('Vue Node Link Interaction', () => {
       comfyPage,
       comfyMouse
     }) => {
-      await comfyPage.setSetting(
+      await comfyPage.settings.setSetting(
         'Comfy.LinkRelease.ActionShift',
         'context menu'
       )
 
-      const samplerNode = (await comfyPage.getNodeRefsByType('KSampler'))[0]
+      const samplerNode = (
+        await comfyPage.nodeOps.getNodeRefsByType('KSampler')
+      )[0]
       expect(samplerNode).toBeTruthy()
 
       const outputCenter = await getSlotCenter(
@@ -864,7 +907,7 @@ test.describe('Vue Node Link Interaction', () => {
 
       // Pinned endpoint should not change with mouse movement while menu is open
       const before = await comfyPage.page.evaluate(() => {
-        const snap = window['app']?.canvas?.linkConnector?.state?.snapLinksPos
+        const snap = window.app?.canvas?.linkConnector?.state?.snapLinksPos
         return Array.isArray(snap) ? [snap[0], snap[1]] : null
       })
       expect(before).not.toBeNull()
@@ -872,7 +915,7 @@ test.describe('Vue Node Link Interaction', () => {
       // Move mouse elsewhere and verify snap position is unchanged
       await comfyMouse.move({ x: dropPos.x + 160, y: dropPos.y + 100 })
       const after = await comfyPage.page.evaluate(() => {
-        const snap = window['app']?.canvas?.linkConnector?.state?.snapLinksPos
+        const snap = window.app?.canvas?.linkConnector?.state?.snapLinksPos
         return Array.isArray(snap) ? [snap[0], snap[1]] : null
       })
       expect(after).toEqual(before)
@@ -882,13 +925,18 @@ test.describe('Vue Node Link Interaction', () => {
       comfyPage,
       comfyMouse
     }) => {
-      await comfyPage.setSetting(
+      await comfyPage.settings.setSetting(
         'Comfy.LinkRelease.ActionShift',
         'context menu'
       )
-      await comfyPage.setSetting('Comfy.NodeSearchBoxImpl', 'default')
+      await comfyPage.settings.setSetting(
+        'Comfy.NodeSearchBoxImpl',
+        'v1 (legacy)'
+      )
 
-      const samplerNode = (await comfyPage.getNodeRefsByType('KSampler'))[0]
+      const samplerNode = (
+        await comfyPage.nodeOps.getNodeRefsByType('KSampler')
+      )[0]
       expect(samplerNode).toBeTruthy()
 
       const outputCenter = await getSlotCenter(
@@ -909,7 +957,8 @@ test.describe('Vue Node Link Interaction', () => {
       }
 
       // Open Search from the context menu
-      await comfyPage.clickContextMenuItem('Search')
+      await comfyPage.contextMenu.clickMenuItem('Search')
+      await comfyPage.nextFrame()
 
       // Search box opens with prefilled type filter based on link type (LATENT)
       await expect(comfyPage.searchBox.input).toBeVisible()
@@ -928,7 +977,7 @@ test.describe('Vue Node Link Interaction', () => {
       expect(await samplerOutput.getLinkCount()).toBe(1)
 
       // One of the VAEDecode nodes should have an incoming link on input[0]
-      const vaeNodes = await comfyPage.getNodeRefsByType('VAEDecode')
+      const vaeNodes = await comfyPage.nodeOps.getNodeRefsByType('VAEDecode')
       let linked = false
       for (const vae of vaeNodes) {
         const details = await getInputLinkDetails(comfyPage.page, vae.id, 0)
@@ -945,9 +994,18 @@ test.describe('Vue Node Link Interaction', () => {
       comfyPage,
       comfyMouse
     }) => {
-      await comfyPage.setSetting('Comfy.LinkRelease.ActionShift', 'search box')
+      await comfyPage.settings.setSetting(
+        'Comfy.LinkRelease.ActionShift',
+        'search box'
+      )
+      await comfyPage.settings.setSetting(
+        'Comfy.NodeSearchBoxImpl',
+        'v1 (legacy)'
+      )
 
-      const samplerNode = (await comfyPage.getNodeRefsByType('KSampler'))[0]
+      const samplerNode = (
+        await comfyPage.nodeOps.getNodeRefsByType('KSampler')
+      )[0]
       expect(samplerNode).toBeTruthy()
 
       const outputCenter = await getSlotCenter(
@@ -980,7 +1038,7 @@ test.describe('Vue Node Link Interaction', () => {
       const samplerOutput = await samplerNode.getOutput(0)
       expect(await samplerOutput.getLinkCount()).toBe(1)
 
-      const vaeNodes = await comfyPage.getNodeRefsByType('VAEDecode')
+      const vaeNodes = await comfyPage.nodeOps.getNodeRefsByType('VAEDecode')
       let linked = false
       for (const vae of vaeNodes) {
         const details = await getInputLinkDetails(comfyPage.page, vae.id, 0)
@@ -993,4 +1051,60 @@ test.describe('Vue Node Link Interaction', () => {
       expect(linked).toBe(true)
     })
   })
+
+  test('Dragging from subgraph input connects to correct slot', async ({
+    comfyPage,
+    comfyMouse
+  }) => {
+    await comfyPage.settings.setSetting(
+      'Comfy.NodeSearchBoxImpl',
+      'v1 (legacy)'
+    )
+
+    // Setup workflow with a KSampler node
+    await comfyPage.command.executeCommand('Comfy.NewBlankWorkflow')
+    await comfyPage.nodeOps.waitForGraphNodes(0)
+    await comfyPage.command.executeCommand('Workspace.SearchBox.Toggle')
+    await comfyPage.nextFrame()
+    await comfyPage.searchBox.fillAndSelectFirstNode('KSampler')
+    await comfyPage.nodeOps.waitForGraphNodes(1)
+
+    // Convert the KSampler node to a subgraph
+    let ksamplerNode = (
+      await comfyPage.nodeOps.getNodeRefsByType('KSampler')
+    )?.[0]
+    await comfyPage.vueNodes.selectNode(String(ksamplerNode.id))
+    await comfyPage.command.executeCommand('Comfy.Graph.ConvertToSubgraph')
+
+    // Enter the subgraph
+    await comfyPage.vueNodes.enterSubgraph()
+    await fitToViewInstant(comfyPage)
+
+    // Get the KSampler node inside the subgraph
+    ksamplerNode = (
+      await comfyPage.nodeOps.getNodeRefsByType('KSampler', true)
+    )?.[0]
+    const positiveInput = await ksamplerNode.getInput(1)
+    const negativeInput = await ksamplerNode.getInput(2)
+
+    const positiveInputPos = await getSlotCenter(
+      comfyPage.page,
+      ksamplerNode.id,
+      1,
+      true
+    )
+
+    const sourceSlot = await comfyPage.subgraph.getInputSlot()
+    const calculatedSourcePos = await sourceSlot.getOpenSlotPosition()
+
+    await comfyMouse.move(calculatedSourcePos)
+    await comfyMouse.drag(positiveInputPos)
+    await comfyMouse.drop()
+
+    // Verify connection went to the correct slot
+    const positiveLinks = await positiveInput.getLinkCount()
+    const negativeLinks = await negativeInput.getLinkCount()
+    expect(positiveLinks).toBe(1)
+    expect(negativeLinks).toBe(0)
+  })
 })
diff --git a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-dragging-link-chromium-linux.png b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-dragging-link-chromium-linux.png
index 5d1cd36842..e426c6c85f 100644
Binary files a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-dragging-link-chromium-linux.png and b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-dragging-link-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-input-drag-ctrl-alt-chromium-linux.png b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-input-drag-ctrl-alt-chromium-linux.png
index 6485cbec7d..827c5cba95 100644
Binary files a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-input-drag-ctrl-alt-chromium-linux.png and b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-input-drag-ctrl-alt-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-input-drag-reuses-origin-chromium-linux.png b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-input-drag-reuses-origin-chromium-linux.png
index 8aad10ee6a..f52c5ab89e 100644
Binary files a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-input-drag-reuses-origin-chromium-linux.png and b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-input-drag-reuses-origin-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-reroute-input-drag-chromium-linux.png b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-reroute-input-drag-chromium-linux.png
index 10bfe26698..288278e5b5 100644
Binary files a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-reroute-input-drag-chromium-linux.png and b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-reroute-input-drag-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-reroute-output-shift-drag-chromium-linux.png b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-reroute-output-shift-drag-chromium-linux.png
index 09a9eb864a..7d7fef101f 100644
Binary files a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-reroute-output-shift-drag-chromium-linux.png and b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-reroute-output-shift-drag-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-shift-output-multi-link-chromium-linux.png b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-shift-output-multi-link-chromium-linux.png
index 6ee2d87071..c4c7049c59 100644
Binary files a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-shift-output-multi-link-chromium-linux.png and b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-shift-output-multi-link-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-snap-to-node-chromium-linux.png b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-snap-to-node-chromium-linux.png
index d71dccc7bd..62be6e3f3e 100644
Binary files a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-snap-to-node-chromium-linux.png and b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-snap-to-node-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-snap-to-slot-chromium-linux.png b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-snap-to-slot-chromium-linux.png
index 53980f0b99..5610e62a3d 100644
Binary files a/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-snap-to-slot-chromium-linux.png and b/browser_tests/tests/vueNodes/interactions/links/linkInteraction.spec.ts-snapshots/vue-node-snap-to-slot-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/node/bringToFront.spec.ts b/browser_tests/tests/vueNodes/interactions/node/bringToFront.spec.ts
index 6e20f9e367..402b314662 100644
--- a/browser_tests/tests/vueNodes/interactions/node/bringToFront.spec.ts
+++ b/browser_tests/tests/vueNodes/interactions/node/bringToFront.spec.ts
@@ -5,11 +5,11 @@ import {
 import type { ComfyPage } from '../../../../fixtures/ComfyPage'
 import { fitToViewInstant } from '../../../../helpers/fitToView'
 
-test.describe('Vue Node Bring to Front', () => {
+test.describe('Vue Node Bring to Front', { tag: '@screenshot' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
-    await comfyPage.setSetting('Comfy.VueNodes.Enabled', true)
-    await comfyPage.loadWorkflow('vueNodes/simple-triple')
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.workflow.loadWorkflow('vueNodes/simple-triple')
     await comfyPage.vueNodes.waitForNodes()
     await fitToViewInstant(comfyPage)
   })
@@ -61,7 +61,7 @@ test.describe('Vue Node Bring to Front', () => {
     if (!ksamplerHeader) throw new Error('KSampler header not found')
 
     // Drag KSampler on top of CLIP Text Encode
-    await comfyPage.dragAndDrop(
+    await comfyPage.canvasOps.dragAndDrop(
       { x: ksamplerHeader.x + 50, y: ksamplerHeader.y + 10 },
       clipCenter
     )
@@ -108,7 +108,7 @@ test.describe('Vue Node Bring to Front', () => {
     const vaeHeader = await comfyPage.page.getByText('VAE Decode').boundingBox()
     if (!vaeHeader) throw new Error('VAE Decode header not found')
 
-    await comfyPage.dragAndDrop(
+    await comfyPage.canvasOps.dragAndDrop(
       { x: vaeHeader.x + 50, y: vaeHeader.y + 10 },
       { x: clipCenter.x - 50, y: clipCenter.y }
     )
diff --git a/browser_tests/tests/vueNodes/interactions/node/bringToFront.spec.ts-snapshots/bring-to-front-overlapped-after-chromium-linux.png b/browser_tests/tests/vueNodes/interactions/node/bringToFront.spec.ts-snapshots/bring-to-front-overlapped-after-chromium-linux.png
index 783f0dc0cd..0fbe349939 100644
Binary files a/browser_tests/tests/vueNodes/interactions/node/bringToFront.spec.ts-snapshots/bring-to-front-overlapped-after-chromium-linux.png and b/browser_tests/tests/vueNodes/interactions/node/bringToFront.spec.ts-snapshots/bring-to-front-overlapped-after-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/node/bringToFront.spec.ts-snapshots/bring-to-front-overlapped-before-chromium-linux.png b/browser_tests/tests/vueNodes/interactions/node/bringToFront.spec.ts-snapshots/bring-to-front-overlapped-before-chromium-linux.png
index 8610dab8b8..b576100e49 100644
Binary files a/browser_tests/tests/vueNodes/interactions/node/bringToFront.spec.ts-snapshots/bring-to-front-overlapped-before-chromium-linux.png and b/browser_tests/tests/vueNodes/interactions/node/bringToFront.spec.ts-snapshots/bring-to-front-overlapped-before-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/node/bringToFront.spec.ts-snapshots/bring-to-front-widget-overlapped-after-chromium-linux.png b/browser_tests/tests/vueNodes/interactions/node/bringToFront.spec.ts-snapshots/bring-to-front-widget-overlapped-after-chromium-linux.png
index c4d5979d0f..31022fb233 100644
Binary files a/browser_tests/tests/vueNodes/interactions/node/bringToFront.spec.ts-snapshots/bring-to-front-widget-overlapped-after-chromium-linux.png and b/browser_tests/tests/vueNodes/interactions/node/bringToFront.spec.ts-snapshots/bring-to-front-widget-overlapped-after-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/node/bringToFront.spec.ts-snapshots/bring-to-front-widget-overlapped-before-chromium-linux.png b/browser_tests/tests/vueNodes/interactions/node/bringToFront.spec.ts-snapshots/bring-to-front-widget-overlapped-before-chromium-linux.png
index d43f10ddeb..7a6875580f 100644
Binary files a/browser_tests/tests/vueNodes/interactions/node/bringToFront.spec.ts-snapshots/bring-to-front-widget-overlapped-before-chromium-linux.png and b/browser_tests/tests/vueNodes/interactions/node/bringToFront.spec.ts-snapshots/bring-to-front-widget-overlapped-before-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/node/imagePreview.spec.ts b/browser_tests/tests/vueNodes/interactions/node/imagePreview.spec.ts
new file mode 100644
index 0000000000..4eeee0e7c2
--- /dev/null
+++ b/browser_tests/tests/vueNodes/interactions/node/imagePreview.spec.ts
@@ -0,0 +1,133 @@
+import { expect } from '@playwright/test'
+
+import type { ComfyPage } from '../../../../fixtures/ComfyPage'
+import { comfyPageFixture as test } from '../../../../fixtures/ComfyPage'
+import {
+  getPromotedWidgetNames,
+  getPromotedWidgetCountByName
+} from '../../../../helpers/promotedWidgets'
+
+test.describe('Vue Nodes Image Preview', () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+  })
+
+  async function loadImageOnNode(comfyPage: ComfyPage) {
+    await comfyPage.workflow.loadWorkflow('widgets/load_image_widget')
+    await comfyPage.vueNodes.waitForNodes()
+
+    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)
+    }
+  }
+
+  // TODO(#8143): Re-enable after image preview sync is working in CI
+  test.fixme('opens mask editor from image preview button', async ({
+    comfyPage
+  }) => {
+    const { imagePreview } = await loadImageOnNode(comfyPage)
+
+    await imagePreview.locator('[role="img"]').focus()
+    await comfyPage.page.getByLabel('Edit or mask image').click()
+
+    await expect(comfyPage.page.locator('.mask-editor-dialog')).toBeVisible()
+  })
+
+  // TODO(#8143): Re-enable after image preview sync is working in CI
+  test.fixme('shows image context menu options', async ({ comfyPage }) => {
+    const { nodeId } = await loadImageOnNode(comfyPage)
+
+    const nodeHeader = comfyPage.vueNodes
+      .getNodeLocator(nodeId)
+      .locator('.lg-node-header')
+    await nodeHeader.click()
+    await nodeHeader.click({ button: 'right' })
+
+    const contextMenu = comfyPage.page.locator('.p-contextmenu')
+    await expect(contextMenu).toBeVisible()
+    await expect(contextMenu.getByText('Open Image')).toBeVisible()
+    await expect(contextMenu.getByText('Copy Image')).toBeVisible()
+    await expect(contextMenu.getByText('Save Image')).toBeVisible()
+    await expect(contextMenu.getByText('Open in Mask Editor')).toBeVisible()
+  })
+
+  test(
+    'renders promoted image previews for each subgraph node',
+    { tag: '@screenshot' },
+    async ({ comfyPage }) => {
+      await comfyPage.workflow.loadWorkflow(
+        'subgraphs/subgraph-with-multiple-promoted-previews'
+      )
+      await comfyPage.vueNodes.waitForNodes()
+
+      const firstSubgraphNode = comfyPage.vueNodes.getNodeLocator('7')
+      const secondSubgraphNode = comfyPage.vueNodes.getNodeLocator('8')
+
+      await expect(firstSubgraphNode).toBeVisible()
+      await expect(secondSubgraphNode).toBeVisible()
+
+      const firstPromotedWidgets = await getPromotedWidgetNames(comfyPage, '7')
+      const secondPromotedWidgets = await getPromotedWidgetNames(comfyPage, '8')
+      expect(firstPromotedWidgets).toEqual([
+        '$$canvas-image-preview',
+        '$$canvas-image-preview'
+      ])
+      expect(secondPromotedWidgets).toEqual(['$$canvas-image-preview'])
+
+      expect(
+        await getPromotedWidgetCountByName(
+          comfyPage,
+          '7',
+          '$$canvas-image-preview'
+        )
+      ).toBe(2)
+      expect(
+        await getPromotedWidgetCountByName(
+          comfyPage,
+          '8',
+          '$$canvas-image-preview'
+        )
+      ).toBe(1)
+
+      await expect(
+        firstSubgraphNode.locator('.lg-node-widgets')
+      ).not.toContainText('$$canvas-image-preview')
+      await expect(
+        secondSubgraphNode.locator('.lg-node-widgets')
+      ).not.toContainText('$$canvas-image-preview')
+
+      await comfyPage.command.executeCommand('Comfy.Canvas.FitView')
+      await comfyPage.command.executeCommand('Comfy.QueuePrompt')
+
+      const firstPreviewImages = firstSubgraphNode.locator('.image-preview img')
+      const secondPreviewImages =
+        secondSubgraphNode.locator('.image-preview img')
+
+      await expect(firstPreviewImages).toHaveCount(2, { timeout: 30_000 })
+      await expect(secondPreviewImages).toHaveCount(1, { timeout: 30_000 })
+
+      await expect(firstPreviewImages.first()).toBeVisible({ timeout: 30_000 })
+      await expect(firstPreviewImages.nth(1)).toBeVisible({ timeout: 30_000 })
+      await expect(secondPreviewImages.first()).toBeVisible({ timeout: 30_000 })
+
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'vue-node-multiple-promoted-previews.png'
+      )
+    }
+  )
+})
diff --git a/browser_tests/tests/vueNodes/interactions/node/imagePreview.spec.ts-snapshots/vue-node-multiple-promoted-previews-chromium-linux.png b/browser_tests/tests/vueNodes/interactions/node/imagePreview.spec.ts-snapshots/vue-node-multiple-promoted-previews-chromium-linux.png
new file mode 100644
index 0000000000..3822d77767
Binary files /dev/null and b/browser_tests/tests/vueNodes/interactions/node/imagePreview.spec.ts-snapshots/vue-node-multiple-promoted-previews-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/node/move.spec.ts b/browser_tests/tests/vueNodes/interactions/node/move.spec.ts
index ac4759934e..42f8557beb 100644
--- a/browser_tests/tests/vueNodes/interactions/node/move.spec.ts
+++ b/browser_tests/tests/vueNodes/interactions/node/move.spec.ts
@@ -1,13 +1,13 @@
 import {
-  type ComfyPage,
   comfyExpect as expect,
   comfyPageFixture as test
 } from '../../../../fixtures/ComfyPage'
+import type { ComfyPage } from '../../../../fixtures/ComfyPage'
 import type { Position } from '../../../../fixtures/types'
 
 test.describe('Vue Node Moving', () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
     await comfyPage.vueNodes.waitForNodes()
   })
 
@@ -29,39 +29,47 @@ test.describe('Vue Node Moving', () => {
     expect(diffY).toBeGreaterThan(0)
   }
 
-  test('should allow moving nodes by dragging', async ({ comfyPage }) => {
-    const loadCheckpointHeaderPos = await getLoadCheckpointHeaderPos(comfyPage)
-    await comfyPage.dragAndDrop(loadCheckpointHeaderPos, {
-      x: 256,
-      y: 256
-    })
+  test(
+    'should allow moving nodes by dragging',
+    { tag: '@screenshot' },
+    async ({ comfyPage }) => {
+      const loadCheckpointHeaderPos =
+        await getLoadCheckpointHeaderPos(comfyPage)
+      await comfyPage.canvasOps.dragAndDrop(loadCheckpointHeaderPos, {
+        x: 256,
+        y: 256
+      })
 
-    const newHeaderPos = await getLoadCheckpointHeaderPos(comfyPage)
-    await expectPosChanged(loadCheckpointHeaderPos, newHeaderPos)
+      const newHeaderPos = await getLoadCheckpointHeaderPos(comfyPage)
+      await expectPosChanged(loadCheckpointHeaderPos, newHeaderPos)
 
-    await expect(comfyPage.canvas).toHaveScreenshot('vue-node-moved-node.png')
-  })
+      await expect(comfyPage.canvas).toHaveScreenshot('vue-node-moved-node.png')
+    }
+  )
 
-  test('@mobile should allow moving nodes by dragging on touch devices', async ({
-    comfyPage
-  }) => {
-    // Disable minimap (gets in way of the node on small screens)
-    await comfyPage.setSetting('Comfy.Minimap.Visible', false)
+  test(
+    '@mobile should allow moving nodes by dragging on touch devices',
+    { tag: '@screenshot' },
+    async ({ comfyPage }) => {
+      // Disable minimap (gets in way of the node on small screens)
+      await comfyPage.settings.setSetting('Comfy.Minimap.Visible', false)
 
-    const loadCheckpointHeaderPos = await getLoadCheckpointHeaderPos(comfyPage)
-    await comfyPage.panWithTouch(
-      {
-        x: 64,
-        y: 64
-      },
-      loadCheckpointHeaderPos
-    )
+      const loadCheckpointHeaderPos =
+        await getLoadCheckpointHeaderPos(comfyPage)
+      await comfyPage.canvasOps.panWithTouch(
+        {
+          x: 64,
+          y: 64
+        },
+        loadCheckpointHeaderPos
+      )
 
-    const newHeaderPos = await getLoadCheckpointHeaderPos(comfyPage)
-    await expectPosChanged(loadCheckpointHeaderPos, newHeaderPos)
+      const newHeaderPos = await getLoadCheckpointHeaderPos(comfyPage)
+      await expectPosChanged(loadCheckpointHeaderPos, newHeaderPos)
 
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'vue-node-moved-node-touch.png'
-    )
-  })
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'vue-node-moved-node-touch.png'
+      )
+    }
+  )
 })
diff --git a/browser_tests/tests/vueNodes/interactions/node/move.spec.ts-snapshots/vue-node-moved-node-chromium-linux.png b/browser_tests/tests/vueNodes/interactions/node/move.spec.ts-snapshots/vue-node-moved-node-chromium-linux.png
index 9c442e5f58..2fa09bc0d4 100644
Binary files a/browser_tests/tests/vueNodes/interactions/node/move.spec.ts-snapshots/vue-node-moved-node-chromium-linux.png and b/browser_tests/tests/vueNodes/interactions/node/move.spec.ts-snapshots/vue-node-moved-node-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/node/move.spec.ts-snapshots/vue-node-moved-node-touch-mobile-chrome-linux.png b/browser_tests/tests/vueNodes/interactions/node/move.spec.ts-snapshots/vue-node-moved-node-touch-mobile-chrome-linux.png
index 8562ca7e74..050c0cb6f5 100644
Binary files a/browser_tests/tests/vueNodes/interactions/node/move.spec.ts-snapshots/vue-node-moved-node-touch-mobile-chrome-linux.png and b/browser_tests/tests/vueNodes/interactions/node/move.spec.ts-snapshots/vue-node-moved-node-touch-mobile-chrome-linux.png differ
diff --git a/browser_tests/tests/vueNodes/interactions/node/remove.spec.ts b/browser_tests/tests/vueNodes/interactions/node/remove.spec.ts
index e7a6106435..342b3fb2d6 100644
--- a/browser_tests/tests/vueNodes/interactions/node/remove.spec.ts
+++ b/browser_tests/tests/vueNodes/interactions/node/remove.spec.ts
@@ -3,14 +3,14 @@ import { expect } from '@playwright/test'
 import { comfyPageFixture as test } from '../../../../fixtures/ComfyPage'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
 test.describe('Vue Nodes - Delete Key Interaction', () => {
   test.beforeEach(async ({ comfyPage }) => {
     // Enable Vue nodes rendering
-    await comfyPage.setSetting('Comfy.VueNodes.Enabled', true)
-    await comfyPage.setSetting('Comfy.Graph.CanvasMenu', false)
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.settings.setSetting('Comfy.Graph.CanvasMenu', false)
     await comfyPage.setup()
   })
 
@@ -24,7 +24,7 @@ test.describe('Vue Nodes - Delete Key Interaction', () => {
     expect(initialNodeCount).toBeGreaterThan(0)
 
     // Select all Vue nodes
-    await comfyPage.ctrlA()
+    await comfyPage.keyboard.selectAll()
 
     // Verify all Vue nodes are selected
     const selectedCount = await comfyPage.vueNodes.getSelectedNodeCount()
@@ -83,7 +83,7 @@ test.describe('Vue Nodes - Delete Key Interaction', () => {
   test('Delete key does not delete node when typing in Vue node widgets', async ({
     comfyPage
   }) => {
-    const initialNodeCount = await comfyPage.getGraphNodesCount()
+    const initialNodeCount = await comfyPage.nodeOps.getGraphNodesCount()
 
     // Find a text input widget in a Vue node
     const textWidget = comfyPage.page
@@ -98,7 +98,7 @@ test.describe('Vue Nodes - Delete Key Interaction', () => {
     await textWidget.press('Delete')
 
     // Node count should remain the same
-    const finalNodeCount = await comfyPage.getGraphNodesCount()
+    const finalNodeCount = await comfyPage.nodeOps.getGraphNodesCount()
     expect(finalNodeCount).toBe(initialNodeCount)
   })
 
diff --git a/browser_tests/tests/vueNodes/interactions/node/rename.spec.ts b/browser_tests/tests/vueNodes/interactions/node/rename.spec.ts
index 5cd6b2feaa..942b642b2d 100644
--- a/browser_tests/tests/vueNodes/interactions/node/rename.spec.ts
+++ b/browser_tests/tests/vueNodes/interactions/node/rename.spec.ts
@@ -2,11 +2,12 @@ import {
   comfyExpect as expect,
   comfyPageFixture as test
 } from '../../../../fixtures/ComfyPage'
+import { TestIds } from '../../../../fixtures/selectors'
 
 test.describe('Vue Nodes Renaming', () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.Graph.CanvasMenu', false)
-    await comfyPage.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.settings.setSetting('Comfy.Graph.CanvasMenu', false)
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
     await comfyPage.setup()
     await comfyPage.vueNodes.waitForNodes()
   })
@@ -46,7 +47,9 @@ test.describe('Vue Nodes Renaming', () => {
     if (!nodeBbox) throw new Error('Node not found')
     await loadCheckpointNode.dblclick()
 
-    const editingTitleInput = comfyPage.page.getByTestId('node-title-input')
+    const editingTitleInput = comfyPage.page.getByTestId(
+      TestIds.node.titleInput
+    )
     await expect(editingTitleInput).not.toBeVisible()
   })
 })
diff --git a/browser_tests/tests/vueNodes/interactions/node/resize.spec.ts b/browser_tests/tests/vueNodes/interactions/node/resize.spec.ts
index c8e015ffa4..fc61081955 100644
--- a/browser_tests/tests/vueNodes/interactions/node/resize.spec.ts
+++ b/browser_tests/tests/vueNodes/interactions/node/resize.spec.ts
@@ -5,7 +5,7 @@ import {
 
 test.describe('Vue Node Resizing', () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
     await comfyPage.vueNodes.waitForNodes()
   })
 
diff --git a/browser_tests/tests/vueNodes/interactions/node/select.spec.ts b/browser_tests/tests/vueNodes/interactions/node/select.spec.ts
index 98b0a63f62..4541072e14 100644
--- a/browser_tests/tests/vueNodes/interactions/node/select.spec.ts
+++ b/browser_tests/tests/vueNodes/interactions/node/select.spec.ts
@@ -4,12 +4,12 @@ import {
 } from '../../../../fixtures/ComfyPage'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
 test.describe('Vue Node Selection', () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
     await comfyPage.vueNodes.waitForNodes()
   })
 
@@ -78,7 +78,7 @@ test.describe('Vue Node Selection', () => {
     const initialPos = await checkpointNodeHeader.boundingBox()
     if (!initialPos) throw new Error('Failed to get header position')
 
-    await comfyPage.dragAndDrop(
+    await comfyPage.canvasOps.dragAndDrop(
       { x: initialPos.x + 10, y: initialPos.y + 10 },
       { x: initialPos.x + 100, y: initialPos.y + 100 }
     )
diff --git a/browser_tests/tests/vueNodes/nodeStates/bypass.spec.ts b/browser_tests/tests/vueNodes/nodeStates/bypass.spec.ts
index 7074bbc2d7..0a88b3a97c 100644
--- a/browser_tests/tests/vueNodes/nodeStates/bypass.spec.ts
+++ b/browser_tests/tests/vueNodes/nodeStates/bypass.spec.ts
@@ -8,29 +8,32 @@ const BYPASS_CLASS = /before:bg-bypass\/60/
 
 test.describe('Vue Node Bypass', () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.VueNodes.Enabled', true)
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
-    await comfyPage.setSetting('Comfy.Minimap.Visible', false)
-    await comfyPage.setSetting('Comfy.Graph.CanvasMenu', true)
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting('Comfy.Minimap.Visible', false)
+    await comfyPage.settings.setSetting('Comfy.Graph.CanvasMenu', true)
     await comfyPage.vueNodes.waitForNodes()
   })
 
-  test('should allow toggling bypass on a selected node with hotkey', async ({
-    comfyPage
-  }) => {
-    await comfyPage.page.getByText('Load Checkpoint').click()
-    await comfyPage.page.keyboard.press(BYPASS_HOTKEY)
+  test(
+    'should allow toggling bypass on a selected node with hotkey',
+    { tag: '@screenshot' },
+    async ({ comfyPage }) => {
+      await comfyPage.page.getByText('Load Checkpoint').click()
+      await comfyPage.page.keyboard.press(BYPASS_HOTKEY)
 
-    const checkpointNode = comfyPage.vueNodes.getNodeByTitle('Load Checkpoint')
-    await expect(checkpointNode).toHaveClass(BYPASS_CLASS)
-    await comfyPage.nextFrame()
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'vue-node-bypassed-state.png'
-    )
+      const checkpointNode =
+        comfyPage.vueNodes.getNodeByTitle('Load Checkpoint')
+      await expect(checkpointNode).toHaveClass(BYPASS_CLASS)
+      await comfyPage.nextFrame()
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'vue-node-bypassed-state.png'
+      )
 
-    await comfyPage.page.keyboard.press(BYPASS_HOTKEY)
-    await expect(checkpointNode).not.toHaveClass(BYPASS_CLASS)
-  })
+      await comfyPage.page.keyboard.press(BYPASS_HOTKEY)
+      await expect(checkpointNode).not.toHaveClass(BYPASS_CLASS)
+    }
+  )
 
   test('should allow toggling bypass on multiple selected nodes with hotkey', async ({
     comfyPage
diff --git a/browser_tests/tests/vueNodes/nodeStates/bypass.spec.ts-snapshots/vue-node-bypassed-state-chromium-linux.png b/browser_tests/tests/vueNodes/nodeStates/bypass.spec.ts-snapshots/vue-node-bypassed-state-chromium-linux.png
index bbaee40630..38069f4bcd 100644
Binary files a/browser_tests/tests/vueNodes/nodeStates/bypass.spec.ts-snapshots/vue-node-bypassed-state-chromium-linux.png and b/browser_tests/tests/vueNodes/nodeStates/bypass.spec.ts-snapshots/vue-node-bypassed-state-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/nodeStates/collapse.spec.ts b/browser_tests/tests/vueNodes/nodeStates/collapse.spec.ts
index 8e8e22995a..bb3b722d6e 100644
--- a/browser_tests/tests/vueNodes/nodeStates/collapse.spec.ts
+++ b/browser_tests/tests/vueNodes/nodeStates/collapse.spec.ts
@@ -5,9 +5,9 @@ import {
 
 test.describe('Vue Node Collapse', () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.Graph.CanvasMenu', false)
-    await comfyPage.setSetting('Comfy.EnableTooltips', true)
-    await comfyPage.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.settings.setSetting('Comfy.Graph.CanvasMenu', false)
+    await comfyPage.settings.setSetting('Comfy.EnableTooltips', true)
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
     await comfyPage.setup()
     await comfyPage.vueNodes.waitForNodes()
   })
diff --git a/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts b/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts
index e61e3ca013..4cedceef52 100644
--- a/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts
+++ b/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts
@@ -2,12 +2,13 @@ import {
   comfyExpect as expect,
   comfyPageFixture as test
 } from '../../../fixtures/ComfyPage'
+import { TestIds } from '../../../fixtures/selectors'
 
-test.describe('Vue Node Custom Colors', () => {
+test.describe('Vue Node Custom Colors', { tag: '@screenshot' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
-    await comfyPage.setSetting('Comfy.Canvas.SelectionToolbox', true)
-    await comfyPage.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting('Comfy.Canvas.SelectionToolbox', true)
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
     await comfyPage.vueNodes.waitForNodes()
   })
 
@@ -19,10 +20,16 @@ test.describe('Vue Node Custom Colors', () => {
     })
     await loadCheckpointNode.getByText('Load Checkpoint').click()
 
-    await comfyPage.page.locator('.selection-toolbox .pi-circle-fill').click()
-    await comfyPage.page
-      .locator('.color-picker-container')
-      .locator('i[data-testid="blue"]')
+    const colorPickerButton = comfyPage.page.getByTestId(
+      TestIds.selectionToolbox.colorPickerButton
+    )
+    await colorPickerButton.click()
+
+    const colorPickerGroup = comfyPage.page.getByRole('group').filter({
+      has: comfyPage.page.getByTestId(TestIds.selectionToolbox.colorBlue)
+    })
+    await colorPickerGroup
+      .getByTestId(TestIds.selectionToolbox.colorBlue)
       .click()
 
     await expect(comfyPage.canvas).toHaveScreenshot(
@@ -31,7 +38,7 @@ test.describe('Vue Node Custom Colors', () => {
   })
 
   test('should load node colors from workflow', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('nodes/every_node_color')
+    await comfyPage.workflow.loadWorkflow('nodes/every_node_color')
     await expect(comfyPage.canvas).toHaveScreenshot(
       'vue-node-custom-colors-dark-all-colors.png'
     )
@@ -40,8 +47,8 @@ test.describe('Vue Node Custom Colors', () => {
   test('should show brightened node colors on light theme', async ({
     comfyPage
   }) => {
-    await comfyPage.setSetting('Comfy.ColorPalette', 'light')
-    await comfyPage.loadWorkflow('nodes/every_node_color')
+    await comfyPage.settings.setSetting('Comfy.ColorPalette', 'light')
+    await comfyPage.workflow.loadWorkflow('nodes/every_node_color')
     await expect(comfyPage.canvas).toHaveScreenshot(
       'vue-node-custom-colors-light-all-colors.png'
     )
diff --git a/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-color-blue-chromium-linux.png b/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-color-blue-chromium-linux.png
index 7a1bb89ceb..ee8e080f62 100644
Binary files a/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-color-blue-chromium-linux.png and b/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-color-blue-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-colors-dark-all-colors-chromium-linux.png b/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-colors-dark-all-colors-chromium-linux.png
index e6ea9ad307..10fbc5c8c4 100644
Binary files a/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-colors-dark-all-colors-chromium-linux.png and b/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-colors-dark-all-colors-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-colors-light-all-colors-chromium-linux.png b/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-colors-light-all-colors-chromium-linux.png
index f822ef7a84..b17b318118 100644
Binary files a/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-colors-light-all-colors-chromium-linux.png and b/browser_tests/tests/vueNodes/nodeStates/colors.spec.ts-snapshots/vue-node-custom-colors-light-all-colors-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/nodeStates/error.spec.ts b/browser_tests/tests/vueNodes/nodeStates/error.spec.ts
index b8c718239c..a9623039c5 100644
--- a/browser_tests/tests/vueNodes/nodeStates/error.spec.ts
+++ b/browser_tests/tests/vueNodes/nodeStates/error.spec.ts
@@ -7,7 +7,7 @@ const ERROR_CLASS = /border-node-stroke-error/
 
 test.describe('Vue Node Error', () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
     await comfyPage.vueNodes.waitForNodes()
   })
 
@@ -15,7 +15,7 @@ test.describe('Vue Node Error', () => {
     comfyPage
   }) => {
     await comfyPage.setup()
-    await comfyPage.loadWorkflow('missing/missing_nodes')
+    await comfyPage.workflow.loadWorkflow('missing/missing_nodes')
 
     // Expect error state on missing unknown node
     const unknownNode = comfyPage.page.locator('[data-node-id]').filter({
@@ -28,7 +28,7 @@ test.describe('Vue Node Error', () => {
     comfyPage
   }) => {
     await comfyPage.setup()
-    await comfyPage.loadWorkflow('nodes/execution_error')
+    await comfyPage.workflow.loadWorkflow('nodes/execution_error')
     await comfyPage.runButton.click()
 
     const raiseErrorNode = comfyPage.vueNodes.getNodeByTitle('Raise Error')
diff --git a/browser_tests/tests/vueNodes/nodeStates/mute.spec.ts b/browser_tests/tests/vueNodes/nodeStates/mute.spec.ts
index 3fe656ebc9..b4b4fd8c45 100644
--- a/browser_tests/tests/vueNodes/nodeStates/mute.spec.ts
+++ b/browser_tests/tests/vueNodes/nodeStates/mute.spec.ts
@@ -8,23 +8,28 @@ const MUTE_OPACITY = '0.5'
 
 test.describe('Vue Node Mute', () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
     await comfyPage.vueNodes.waitForNodes()
   })
 
-  test('should allow toggling mute on a selected node with hotkey', async ({
-    comfyPage
-  }) => {
-    await comfyPage.page.getByText('Load Checkpoint').click()
-    await comfyPage.page.keyboard.press(MUTE_HOTKEY)
+  test(
+    'should allow toggling mute on a selected node with hotkey',
+    { tag: '@screenshot' },
+    async ({ comfyPage }) => {
+      await comfyPage.page.getByText('Load Checkpoint').click()
+      await comfyPage.page.keyboard.press(MUTE_HOTKEY)
 
-    const checkpointNode = comfyPage.vueNodes.getNodeByTitle('Load Checkpoint')
-    await expect(checkpointNode).toHaveCSS('opacity', MUTE_OPACITY)
-    await expect(comfyPage.canvas).toHaveScreenshot('vue-node-muted-state.png')
+      const checkpointNode =
+        comfyPage.vueNodes.getNodeByTitle('Load Checkpoint')
+      await expect(checkpointNode).toHaveCSS('opacity', MUTE_OPACITY)
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'vue-node-muted-state.png'
+      )
 
-    await comfyPage.page.keyboard.press(MUTE_HOTKEY)
-    await expect(checkpointNode).not.toHaveCSS('opacity', MUTE_OPACITY)
-  })
+      await comfyPage.page.keyboard.press(MUTE_HOTKEY)
+      await expect(checkpointNode).not.toHaveCSS('opacity', MUTE_OPACITY)
+    }
+  )
 
   test('should allow toggling mute on multiple selected nodes with hotkey', async ({
     comfyPage
diff --git a/browser_tests/tests/vueNodes/nodeStates/mute.spec.ts-snapshots/vue-node-muted-state-chromium-linux.png b/browser_tests/tests/vueNodes/nodeStates/mute.spec.ts-snapshots/vue-node-muted-state-chromium-linux.png
index 8bd81cbd91..5f34275d0c 100644
Binary files a/browser_tests/tests/vueNodes/nodeStates/mute.spec.ts-snapshots/vue-node-muted-state-chromium-linux.png and b/browser_tests/tests/vueNodes/nodeStates/mute.spec.ts-snapshots/vue-node-muted-state-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/nodeStates/pin.spec.ts b/browser_tests/tests/vueNodes/nodeStates/pin.spec.ts
index 27f1ad1ac9..f8f174fae4 100644
--- a/browser_tests/tests/vueNodes/nodeStates/pin.spec.ts
+++ b/browser_tests/tests/vueNodes/nodeStates/pin.spec.ts
@@ -8,7 +8,7 @@ const PIN_INDICATOR = '[data-testid="node-pin-indicator"]'
 
 test.describe('Vue Node Pin', () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
     await comfyPage.vueNodes.waitForNodes()
   })
 
@@ -55,7 +55,7 @@ test.describe('Vue Node Pin', () => {
     // Try to drag the node
     const headerPos = await checkpointNodeHeader.boundingBox()
     if (!headerPos) throw new Error('Failed to get header position')
-    await comfyPage.dragAndDrop(
+    await comfyPage.canvasOps.dragAndDrop(
       { x: headerPos.x, y: headerPos.y },
       { x: headerPos.x + 256, y: headerPos.y + 256 }
     )
@@ -71,7 +71,7 @@ test.describe('Vue Node Pin', () => {
     await comfyPage.page.keyboard.press(PIN_HOTKEY)
 
     // Try to drag the node again
-    await comfyPage.dragAndDrop(
+    await comfyPage.canvasOps.dragAndDrop(
       { x: headerPos.x, y: headerPos.y },
       { x: headerPos.x + 256, y: headerPos.y + 256 }
     )
diff --git a/browser_tests/tests/vueNodes/widgets/int/integerWidget.spec.ts b/browser_tests/tests/vueNodes/widgets/int/integerWidget.spec.ts
index ee6b6bbfb2..a7a8a4b480 100644
--- a/browser_tests/tests/vueNodes/widgets/int/integerWidget.spec.ts
+++ b/browser_tests/tests/vueNodes/widgets/int/integerWidget.spec.ts
@@ -5,14 +5,14 @@ import {
 
 test.describe('Vue Integer Widget', () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
     await comfyPage.setup()
   })
 
   test('should be disabled and not allow changing value when link connected to slot', async ({
     comfyPage
   }) => {
-    await comfyPage.loadWorkflow('vueNodes/linked-int-widget')
+    await comfyPage.workflow.loadWorkflow('vueNodes/linked-int-widget')
     await comfyPage.vueNodes.waitForNodes()
 
     const seedWidget = comfyPage.vueNodes
@@ -31,7 +31,12 @@ test.describe('Vue Integer Widget', () => {
     await expect(seedWidget).toBeVisible()
 
     // Delete the node that is linked to the slot (freeing up the widget)
-    await comfyPage.vueNodes.getNodeByTitle('Int').click()
+    // Click on the header to select the node (clicking center may land on
+    // the widget area where pointerdown.stop prevents node selection)
+    await comfyPage.vueNodes
+      .getNodeByTitle('Int')
+      .locator('.lg-node-header')
+      .click()
     await comfyPage.vueNodes.deleteSelected()
 
     // Test widget works when unlinked
diff --git a/browser_tests/tests/vueNodes/widgets/load/uploadWidgets.spec.ts b/browser_tests/tests/vueNodes/widgets/load/uploadWidgets.spec.ts
index 8fcc3360df..077e56a4aa 100644
--- a/browser_tests/tests/vueNodes/widgets/load/uploadWidgets.spec.ts
+++ b/browser_tests/tests/vueNodes/widgets/load/uploadWidgets.spec.ts
@@ -5,17 +5,24 @@ import {
 
 test.describe('Vue Upload Widgets', () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
     await comfyPage.vueNodes.waitForNodes()
   })
 
   test('should hide canvas-only upload buttons', async ({ comfyPage }) => {
     await comfyPage.setup()
-    await comfyPage.loadWorkflow('widgets/all_load_widgets')
+    await comfyPage.workflow.loadWorkflow('widgets/all_load_widgets')
     await comfyPage.vueNodes.waitForNodes()
 
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'vue-nodes-upload-widgets.png'
-    )
+    await expect(
+      comfyPage.page.getByText('choose file to upload', { exact: true })
+    ).not.toBeVisible()
+
+    await expect
+      .poll(() => comfyPage.page.getByText('Error loading image').count())
+      .toBeGreaterThan(0)
+    await expect
+      .poll(() => comfyPage.page.getByText('Error loading video').count())
+      .toBeGreaterThan(0)
   })
 })
diff --git a/browser_tests/tests/vueNodes/widgets/load/uploadWidgets.spec.ts-snapshots/vue-nodes-upload-widgets-chromium-linux.png b/browser_tests/tests/vueNodes/widgets/load/uploadWidgets.spec.ts-snapshots/vue-nodes-upload-widgets-chromium-linux.png
index 8d8b4dea8a..36608e1d8b 100644
Binary files a/browser_tests/tests/vueNodes/widgets/load/uploadWidgets.spec.ts-snapshots/vue-nodes-upload-widgets-chromium-linux.png and b/browser_tests/tests/vueNodes/widgets/load/uploadWidgets.spec.ts-snapshots/vue-nodes-upload-widgets-chromium-linux.png differ
diff --git a/browser_tests/tests/vueNodes/widgets/text/multilineStringWidget.spec.ts b/browser_tests/tests/vueNodes/widgets/text/multilineStringWidget.spec.ts
index bb08232a29..8a81772a88 100644
--- a/browser_tests/tests/vueNodes/widgets/text/multilineStringWidget.spec.ts
+++ b/browser_tests/tests/vueNodes/widgets/text/multilineStringWidget.spec.ts
@@ -1,12 +1,12 @@
 import {
-  type ComfyPage,
   comfyExpect as expect,
   comfyPageFixture as test
 } from '../../../../fixtures/ComfyPage'
+import type { ComfyPage } from '../../../../fixtures/ComfyPage'
 
 test.describe('Vue Multiline String Widget', () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
     await comfyPage.vueNodes.waitForNodes()
   })
 
diff --git a/browser_tests/tests/vueNodes/widgets/widgetReactivity.spec.ts b/browser_tests/tests/vueNodes/widgets/widgetReactivity.spec.ts
index 6f3701c127..8a3548614a 100644
--- a/browser_tests/tests/vueNodes/widgets/widgetReactivity.spec.ts
+++ b/browser_tests/tests/vueNodes/widgets/widgetReactivity.spec.ts
@@ -2,10 +2,11 @@ import {
   comfyExpect as expect,
   comfyPageFixture as test
 } from '../../../fixtures/ComfyPage'
+import type { TestGraphAccess } from '../../../types/globals'
 
 test.describe('Vue Widget Reactivity', () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
     await comfyPage.vueNodes.waitForNodes()
   })
   test('Should display added widgets', async ({ comfyPage }) => {
@@ -13,18 +14,21 @@ test.describe('Vue Widget Reactivity', () => {
       'css=[data-testid="node-body-4"] > .lg-node-widgets > div'
     )
     await comfyPage.page.evaluate(() => {
-      const node = window['graph']._nodes_by_id['4']
-      node.widgets.push(node.widgets[0])
+      const graph = window.graph as TestGraphAccess
+      const node = graph._nodes_by_id['4']
+      node.widgets!.push(node.widgets![0])
     })
     await expect(loadCheckpointNode).toHaveCount(2)
     await comfyPage.page.evaluate(() => {
-      const node = window['graph']._nodes_by_id['4']
-      node.widgets[2] = node.widgets[0]
+      const graph = window.graph as TestGraphAccess
+      const node = graph._nodes_by_id['4']
+      node.widgets![2] = node.widgets![0]
     })
     await expect(loadCheckpointNode).toHaveCount(3)
     await comfyPage.page.evaluate(() => {
-      const node = window['graph']._nodes_by_id['4']
-      node.widgets.splice(0, 0, node.widgets[0])
+      const graph = window.graph as TestGraphAccess
+      const node = graph._nodes_by_id['4']
+      node.widgets!.splice(0, 0, node.widgets![0])
     })
     await expect(loadCheckpointNode).toHaveCount(4)
   })
@@ -33,18 +37,21 @@ test.describe('Vue Widget Reactivity', () => {
       'css=[data-testid="node-body-3"] > .lg-node-widgets > div'
     )
     await comfyPage.page.evaluate(() => {
-      const node = window['graph']._nodes_by_id['3']
-      node.widgets.pop()
+      const graph = window.graph as TestGraphAccess
+      const node = graph._nodes_by_id['3']
+      node.widgets!.pop()
     })
     await expect(loadCheckpointNode).toHaveCount(5)
     await comfyPage.page.evaluate(() => {
-      const node = window['graph']._nodes_by_id['3']
-      node.widgets.length--
+      const graph = window.graph as TestGraphAccess
+      const node = graph._nodes_by_id['3']
+      node.widgets!.length--
     })
     await expect(loadCheckpointNode).toHaveCount(4)
     await comfyPage.page.evaluate(() => {
-      const node = window['graph']._nodes_by_id['3']
-      node.widgets.splice(0, 1)
+      const graph = window.graph as TestGraphAccess
+      const node = graph._nodes_by_id['3']
+      node.widgets!.splice(0, 1)
     })
     await expect(loadCheckpointNode).toHaveCount(3)
   })
diff --git a/browser_tests/tests/widget.spec.ts b/browser_tests/tests/widget.spec.ts
index c8448f36c5..fd8afb06ac 100644
--- a/browser_tests/tests/widget.spec.ts
+++ b/browser_tests/tests/widget.spec.ts
@@ -1,33 +1,55 @@
 import { expect } from '@playwright/test'
 
 import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+import { DefaultGraphPositions } from '../fixtures/constants/defaultGraphPositions'
 
 test.beforeEach(async ({ comfyPage }) => {
-  await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
-test.describe('Combo text widget', () => {
+test.describe('Combo text widget', { tag: ['@screenshot', '@widget'] }, () => {
   test('Truncates text when resized', async ({ comfyPage }) => {
-    await comfyPage.resizeLoadCheckpointNode(0.2, 1)
+    await comfyPage.nodeOps.resizeNode(
+      DefaultGraphPositions.loadCheckpoint.pos,
+      DefaultGraphPositions.loadCheckpoint.size,
+      0.2,
+      1
+    )
     await expect(comfyPage.canvas).toHaveScreenshot(
       'load-checkpoint-resized-min-width.png'
     )
     await comfyPage.closeMenu()
-    await comfyPage.resizeKsamplerNode(0.2, 1)
+    await comfyPage.nodeOps.resizeNode(
+      DefaultGraphPositions.ksampler.pos,
+      DefaultGraphPositions.ksampler.size,
+      0.2,
+      1
+    )
     await expect(comfyPage.canvas).toHaveScreenshot(
       `ksampler-resized-min-width.png`
     )
   })
 
   test("Doesn't truncate when space still available", async ({ comfyPage }) => {
-    await comfyPage.resizeEmptyLatentNode(0.8, 0.8)
+    await comfyPage.nodeOps.resizeNode(
+      DefaultGraphPositions.emptyLatent.pos,
+      DefaultGraphPositions.emptyLatent.size,
+      0.8,
+      0.8
+    )
     await expect(comfyPage.canvas).toHaveScreenshot(
       'empty-latent-resized-80-percent.png'
     )
   })
 
   test('Can revert to full text', async ({ comfyPage }) => {
-    await comfyPage.resizeLoadCheckpointNode(0.8, 1, true)
+    await comfyPage.nodeOps.resizeNode(
+      DefaultGraphPositions.loadCheckpoint.pos,
+      DefaultGraphPositions.loadCheckpoint.size,
+      0.8,
+      1,
+      true
+    )
     await expect(comfyPage.canvas).toHaveScreenshot('resized-to-original.png')
   })
 
@@ -36,13 +58,15 @@ test.describe('Combo text widget', () => {
   }) => {
     const getComboValues = async () =>
       comfyPage.page.evaluate(() => {
-        return window['app'].graph.nodes
-          .find((node) => node.title === 'Node With Optional Combo Input')
-          .widgets.find((widget) => widget.name === 'optional_combo_input')
+        return window
+          .app!.graph!.nodes.find(
+            (node) => node.title === 'Node With Optional Combo Input'
+          )!
+          .widgets!.find((widget) => widget.name === 'optional_combo_input')!
           .options.values
       })
 
-    await comfyPage.loadWorkflow('inputs/optional_combo_input')
+    await comfyPage.workflow.loadWorkflow('inputs/optional_combo_input')
     const initialComboValues = await getComboValues()
 
     // Focus canvas
@@ -52,16 +76,16 @@ test.describe('Combo text widget', () => {
     await comfyPage.page.keyboard.press('r')
 
     // Wait for nodes' widgets to be updated
-    await comfyPage.page.waitForTimeout(500)
-
-    const refreshedComboValues = await getComboValues()
-    expect(refreshedComboValues).not.toEqual(initialComboValues)
+    await expect(async () => {
+      const refreshedComboValues = await getComboValues()
+      expect(refreshedComboValues).not.toEqual(initialComboValues)
+    }).toPass({ timeout: 5000 })
   })
 
   test('Should refresh combo values of nodes with v2 combo input spec', async ({
     comfyPage
   }) => {
-    await comfyPage.loadWorkflow('inputs/node_with_v2_combo_input')
+    await comfyPage.workflow.loadWorkflow('inputs/node_with_v2_combo_input')
     // click canvas to focus
     await comfyPage.page.mouse.click(400, 300)
     // press R to trigger refresh
@@ -71,19 +95,22 @@ test.describe('Combo text widget', () => {
     await comfyPage.nextFrame()
     // get the combo widget's values
     const comboValues = await comfyPage.page.evaluate(() => {
-      return window['app'].graph.nodes
-        .find((node) => node.title === 'Node With V2 Combo Input')
-        .widgets.find((widget) => widget.name === 'combo_input').options.values
+      return window
+        .app!.graph!.nodes.find(
+          (node) => node.title === 'Node With V2 Combo Input'
+        )!
+        .widgets!.find((widget) => widget.name === 'combo_input')!.options
+        .values
     })
     expect(comboValues).toEqual(['A', 'B'])
   })
 })
 
-test.describe('Boolean widget', () => {
+test.describe('Boolean widget', { tag: ['@screenshot', '@widget'] }, () => {
   test('Can toggle', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('widgets/boolean_widget')
+    await comfyPage.workflow.loadWorkflow('widgets/boolean_widget')
     await expect(comfyPage.canvas).toHaveScreenshot('boolean_widget.png')
-    const node = (await comfyPage.getFirstNodeRef())!
+    const node = (await comfyPage.nodeOps.getFirstNodeRef())!
     const widget = await node.getWidget(0)
     await widget.click()
     await expect(comfyPage.canvas).toHaveScreenshot(
@@ -92,79 +119,85 @@ test.describe('Boolean widget', () => {
   })
 })
 
-test.describe('Slider widget', () => {
+test.describe('Slider widget', { tag: ['@screenshot', '@widget'] }, () => {
   test('Can drag adjust value', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('inputs/simple_slider')
-    const node = (await comfyPage.getFirstNodeRef())!
+    await comfyPage.workflow.loadWorkflow('inputs/simple_slider')
+    const node = (await comfyPage.nodeOps.getFirstNodeRef())!
     const widget = await node.getWidget(0)
 
     await comfyPage.page.evaluate(() => {
-      const widget = window['app'].graph.nodes[0].widgets[0]
+      const widget = window.app!.graph!.nodes[0].widgets![0]
       widget.callback = (value: number) => {
-        window['widgetValue'] = value
+        window.widgetValue = value
       }
     })
     await widget.dragHorizontal(50)
     await expect(comfyPage.canvas).toHaveScreenshot('slider_widget_dragged.png')
 
     expect(
-      await comfyPage.page.evaluate(() => window['widgetValue'])
+      await comfyPage.page.evaluate(() => window.widgetValue)
     ).toBeDefined()
   })
 })
 
-test.describe('Number widget', () => {
+test.describe('Number widget', { tag: ['@screenshot', '@widget'] }, () => {
   test('Can drag adjust value', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('widgets/seed_widget')
+    await comfyPage.workflow.loadWorkflow('widgets/seed_widget')
 
-    const node = (await comfyPage.getFirstNodeRef())!
+    const node = (await comfyPage.nodeOps.getFirstNodeRef())!
     const widget = await node.getWidget(0)
     await comfyPage.page.evaluate(() => {
-      const widget = window['app'].graph.nodes[0].widgets[0]
+      const widget = window.app!.graph!.nodes[0].widgets![0]
       widget.callback = (value: number) => {
-        window['widgetValue'] = value
+        window.widgetValue = value
       }
     })
     await widget.dragHorizontal(50)
     await expect(comfyPage.canvas).toHaveScreenshot('seed_widget_dragged.png')
 
     expect(
-      await comfyPage.page.evaluate(() => window['widgetValue'])
+      await comfyPage.page.evaluate(() => window.widgetValue)
     ).toBeDefined()
   })
 })
 
-test.describe('Dynamic widget manipulation', () => {
-  test('Auto expand node when widget is added dynamically', async ({
-    comfyPage
-  }) => {
-    await comfyPage.loadWorkflow('nodes/single_ksampler')
+test.describe(
+  'Dynamic widget manipulation',
+  { tag: ['@screenshot', '@widget'] },
+  () => {
+    test('Auto expand node when widget is added dynamically', async ({
+      comfyPage
+    }) => {
+      await comfyPage.workflow.loadWorkflow('nodes/single_ksampler')
 
-    await comfyPage.page.evaluate(() => {
-      window['graph'].nodes[0].addWidget('number', 'new_widget', 10)
-      window['graph'].setDirtyCanvas(true, true)
+      await comfyPage.page.evaluate(() => {
+        window.app!.graph!.nodes[0].addWidget('number', 'new_widget', 10, null)
+        window.app!.graph!.setDirtyCanvas(true, true)
+      })
+
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'ksampler_widget_added.png'
+      )
     })
+  }
+)
 
-    await expect(comfyPage.canvas).toHaveScreenshot('ksampler_widget_added.png')
-  })
-})
-
-test.describe('Image widget', () => {
+test.describe('Image widget', { tag: ['@screenshot', '@widget'] }, () => {
   test('Can load image', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('widgets/load_image_widget')
+    await comfyPage.workflow.loadWorkflow('widgets/load_image_widget')
     await expect(comfyPage.canvas).toHaveScreenshot('load_image_widget.png')
   })
 
   test('Can drag and drop image', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('widgets/load_image_widget')
+    await comfyPage.workflow.loadWorkflow('widgets/load_image_widget')
 
     // Get position of the load image node
-    const nodes = await comfyPage.getNodeRefsByType('LoadImage')
+    const nodes = await comfyPage.nodeOps.getNodeRefsByType('LoadImage')
     const loadImageNode = nodes[0]
     const { x, y } = await loadImageNode.getPosition()
 
     // Drag and drop image file onto the load image node
-    await comfyPage.dragAndDropFile('image32x32.webp', {
+    await comfyPage.dragDrop.dragAndDropFile('image32x32.webp', {
       dropPosition: { x, y }
     })
 
@@ -182,8 +215,8 @@ test.describe('Image widget', () => {
   test('Can change image by changing the filename combo value', async ({
     comfyPage
   }) => {
-    await comfyPage.loadWorkflow('widgets/load_image_widget')
-    const nodes = await comfyPage.getNodeRefsByType('LoadImage')
+    await comfyPage.workflow.loadWorkflow('widgets/load_image_widget')
+    const nodes = await comfyPage.nodeOps.getNodeRefsByType('LoadImage')
     const loadImageNode = nodes[0]
 
     // Click the combo widget used to select the image filename
@@ -194,7 +227,10 @@ test.describe('Image widget', () => {
     const comboEntry = comfyPage.page.getByRole('menuitem', {
       name: 'image32x32.webp'
     })
-    await comboEntry.click({ noWaitAfter: true })
+    await comboEntry.click()
+
+    // Stabilization for the image swap
+    await comfyPage.nextFrame()
 
     // Expect the image preview to change automatically
     await expect(comfyPage.canvas).toHaveScreenshot(
@@ -215,14 +251,14 @@ test.describe('Image widget', () => {
       image1.src = src
       const image2 = new Image()
       image2.src = src
-      const targetNode = graph.nodes[6]
+      const targetNode = graph!.nodes[6]
       targetNode.imgs = [image1, image2]
       targetNode.imageIndex = 1
-      app.canvas.setDirty(true)
+      app!.canvas.setDirty(true)
 
       const x = targetNode.pos[0] + targetNode.size[0] - 41
-      const y = targetNode.pos[1] + targetNode.widgets.at(-1).last_y + 30
-      return app.canvasPosToClientPos([x, y])
+      const y = targetNode.pos[1] + targetNode.widgets!.at(-1)!.last_y! + 30
+      return app!.canvasPosToClientPos([x, y])
     })
 
     const clip = { x, y, width: 35, height: 35 }
@@ -233,101 +269,106 @@ test.describe('Image widget', () => {
   })
 })
 
-test.describe('Animated image widget', () => {
-  // https://github.com/Comfy-Org/ComfyUI_frontend/issues/3718
-  test.skip('Shows preview of uploaded animated image', async ({
-    comfyPage
-  }) => {
-    await comfyPage.loadWorkflow('widgets/load_animated_webp')
+test.describe(
+  'Animated image widget',
+  { tag: ['@screenshot', '@widget'] },
+  () => {
+    // https://github.com/Comfy-Org/ComfyUI_frontend/issues/3718
+    test.skip('Shows preview of uploaded animated image', async ({
+      comfyPage
+    }) => {
+      await comfyPage.workflow.loadWorkflow('widgets/load_animated_webp')
 
-    // Get position of the load animated webp node
-    const nodes = await comfyPage.getNodeRefsByType(
-      'DevToolsLoadAnimatedImageTest'
-    )
-    const loadAnimatedWebpNode = nodes[0]
-    const { x, y } = await loadAnimatedWebpNode.getPosition()
+      // Get position of the load animated webp node
+      const nodes = await comfyPage.nodeOps.getNodeRefsByType(
+        'DevToolsLoadAnimatedImageTest'
+      )
+      const loadAnimatedWebpNode = nodes[0]
+      const { x, y } = await loadAnimatedWebpNode.getPosition()
 
-    // Drag and drop image file onto the load animated webp node
-    await comfyPage.dragAndDropFile('animated_webp.webp', {
-      dropPosition: { x, y }
+      // Drag and drop image file onto the load animated webp node
+      await comfyPage.dragDrop.dragAndDropFile('animated_webp.webp', {
+        dropPosition: { x, y }
+      })
+
+      // Expect the image preview to change automatically
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'animated_image_preview_drag_and_dropped.png'
+      )
+
+      // Move mouse and click on canvas to trigger render
+      await comfyPage.page.mouse.click(64, 64)
+
+      // Expect the image preview to change to the next frame of the animation
+      await expect(comfyPage.canvas).toHaveScreenshot(
+        'animated_image_preview_drag_and_dropped_next_frame.png'
+      )
     })
 
-    // Expect the image preview to change automatically
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'animated_image_preview_drag_and_dropped.png'
-    )
+    test('Can drag-and-drop animated webp image', async ({ comfyPage }) => {
+      await comfyPage.workflow.loadWorkflow('widgets/load_animated_webp')
 
-    // Move mouse and click on canvas to trigger render
-    await comfyPage.page.mouse.click(64, 64)
+      // Get position of the load animated webp node
+      const nodes = await comfyPage.nodeOps.getNodeRefsByType(
+        'DevToolsLoadAnimatedImageTest'
+      )
+      const loadAnimatedWebpNode = nodes[0]
+      const { x, y } = await loadAnimatedWebpNode.getPosition()
 
-    // Expect the image preview to change to the next frame of the animation
-    await expect(comfyPage.canvas).toHaveScreenshot(
-      'animated_image_preview_drag_and_dropped_next_frame.png'
-    )
-  })
+      // Drag and drop image file onto the load animated webp node
+      await comfyPage.dragDrop.dragAndDropFile('animated_webp.webp', {
+        dropPosition: { x, y },
+        waitForUpload: true
+      })
 
-  test('Can drag-and-drop animated webp image', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('widgets/load_animated_webp')
-
-    // Get position of the load animated webp node
-    const nodes = await comfyPage.getNodeRefsByType(
-      'DevToolsLoadAnimatedImageTest'
-    )
-    const loadAnimatedWebpNode = nodes[0]
-    const { x, y } = await loadAnimatedWebpNode.getPosition()
-
-    // Drag and drop image file onto the load animated webp node
-    await comfyPage.dragAndDropFile('animated_webp.webp', {
-      dropPosition: { x, y },
-      waitForUpload: true
+      // Expect the filename combo value to be updated
+      const fileComboWidget = await loadAnimatedWebpNode.getWidget(0)
+      const filename = await fileComboWidget.getValue()
+      expect(filename).toContain('animated_webp.webp')
     })
 
-    // Expect the filename combo value to be updated
-    const fileComboWidget = await loadAnimatedWebpNode.getWidget(0)
-    const filename = await fileComboWidget.getValue()
-    expect(filename).toContain('animated_webp.webp')
-  })
+    test('Can preview saved animated webp image', async ({ comfyPage }) => {
+      await comfyPage.workflow.loadWorkflow('widgets/save_animated_webp')
 
-  test('Can preview saved animated webp image', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('widgets/save_animated_webp')
+      // Get position of the load animated webp node
+      const loadNodes = await comfyPage.nodeOps.getNodeRefsByType(
+        'DevToolsLoadAnimatedImageTest'
+      )
+      const loadAnimatedWebpNode = loadNodes[0]
+      const { x, y } = await loadAnimatedWebpNode.getPosition()
 
-    // Get position of the load animated webp node
-    const loadNodes = await comfyPage.getNodeRefsByType(
-      'DevToolsLoadAnimatedImageTest'
-    )
-    const loadAnimatedWebpNode = loadNodes[0]
-    const { x, y } = await loadAnimatedWebpNode.getPosition()
+      // Drag and drop image file onto the load animated webp node
+      await comfyPage.dragDrop.dragAndDropFile('animated_webp.webp', {
+        dropPosition: { x, y }
+      })
+      await comfyPage.nextFrame()
 
-    // Drag and drop image file onto the load animated webp node
-    await comfyPage.dragAndDropFile('animated_webp.webp', {
-      dropPosition: { x, y }
+      // Get the SaveAnimatedWEBP node
+      const saveNodes =
+        await comfyPage.nodeOps.getNodeRefsByType('SaveAnimatedWEBP')
+      const saveAnimatedWebpNode = saveNodes[0]
+      if (!saveAnimatedWebpNode)
+        throw new Error('SaveAnimatedWEBP node not found')
+
+      // Simulate the graph executing
+      await comfyPage.page.evaluate(
+        ([loadId, saveId]) => {
+          // Set the output of the SaveAnimatedWEBP node to equal the loader node's image
+          window.app!.nodeOutputs[saveId] = window.app!.nodeOutputs[loadId]
+          app!.canvas.setDirty(true)
+        },
+        [loadAnimatedWebpNode.id, saveAnimatedWebpNode.id]
+      )
+      await expect(
+        comfyPage.page.locator('.dom-widget').locator('img')
+      ).toHaveCount(2)
     })
-    await comfyPage.nextFrame()
+  }
+)
 
-    // Get the SaveAnimatedWEBP node
-    const saveNodes = await comfyPage.getNodeRefsByType('SaveAnimatedWEBP')
-    const saveAnimatedWebpNode = saveNodes[0]
-    if (!saveAnimatedWebpNode)
-      throw new Error('SaveAnimatedWEBP node not found')
-
-    // Simulate the graph executing
-    await comfyPage.page.evaluate(
-      ([loadId, saveId]) => {
-        // Set the output of the SaveAnimatedWEBP node to equal the loader node's image
-        window['app'].nodeOutputs[saveId] = window['app'].nodeOutputs[loadId]
-        app.canvas.setDirty(true)
-      },
-      [loadAnimatedWebpNode.id, saveAnimatedWebpNode.id]
-    )
-    await expect(
-      comfyPage.page.locator('.dom-widget').locator('img')
-    ).toHaveCount(2)
-  })
-})
-
-test.describe('Load audio widget', () => {
+test.describe('Load audio widget', { tag: ['@screenshot', '@widget'] }, () => {
   test('Can load audio', async ({ comfyPage }) => {
-    await comfyPage.loadWorkflow('widgets/load_audio_widget')
+    await comfyPage.workflow.loadWorkflow('widgets/load_audio_widget')
     // Wait for the audio widget to be rendered in the DOM
     await comfyPage.page.waitForSelector('.comfy-audio', { state: 'attached' })
     await comfyPage.nextFrame()
@@ -335,18 +376,18 @@ test.describe('Load audio widget', () => {
   })
 })
 
-test.describe('Unserialized widgets', () => {
+test.describe('Unserialized widgets', { tag: '@widget' }, () => {
   test('Unserialized widgets values do not mark graph as modified', async ({
     comfyPage
   }) => {
     // Add workflow w/ LoadImage node, which contains file upload and image preview widgets (not serialized)
-    await comfyPage.loadWorkflow('widgets/load_image_widget')
+    await comfyPage.workflow.loadWorkflow('widgets/load_image_widget')
 
     // Move mouse and click to trigger the `graphEqual` check in `changeTracker.ts`
     await comfyPage.page.mouse.move(10, 10)
     await comfyPage.page.mouse.click(10, 10)
 
     // Expect the graph to not be modified
-    expect(await comfyPage.isCurrentWorkflowModified()).toBe(false)
+    expect(await comfyPage.workflow.isCurrentWorkflowModified()).toBe(false)
   })
 })
diff --git a/browser_tests/tests/widget.spec.ts-snapshots/image-preview-changed-by-combo-value-chromium-linux.png b/browser_tests/tests/widget.spec.ts-snapshots/image-preview-changed-by-combo-value-chromium-linux.png
index 9c5bffa2d1..224d671df3 100644
Binary files a/browser_tests/tests/widget.spec.ts-snapshots/image-preview-changed-by-combo-value-chromium-linux.png and b/browser_tests/tests/widget.spec.ts-snapshots/image-preview-changed-by-combo-value-chromium-linux.png differ
diff --git a/browser_tests/tests/workflowTabThumbnail.spec.ts b/browser_tests/tests/workflowTabThumbnail.spec.ts
index 31b15067f6..bd8a5efe1d 100644
--- a/browser_tests/tests/workflowTabThumbnail.spec.ts
+++ b/browser_tests/tests/workflowTabThumbnail.spec.ts
@@ -1,11 +1,15 @@
 import { expect } from '@playwright/test'
 
-import { type ComfyPage, comfyPageFixture as test } from '../fixtures/ComfyPage'
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+import type { ComfyPage } from '../fixtures/ComfyPage'
 
-test.describe('Workflow Tab Thumbnails', () => {
+test.describe('Workflow Tab Thumbnails', { tag: '@workflow' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
-    await comfyPage.setSetting('Comfy.Workflow.WorkflowTabsPosition', 'Topbar')
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting(
+      'Comfy.Workflow.WorkflowTabsPosition',
+      'Topbar'
+    )
     await comfyPage.setup()
   })
 
@@ -89,9 +93,9 @@ test.describe('Workflow Tab Thumbnails', () => {
       canvasArea!.x + canvasArea!.width - 100,
       100
     )
-    await comfyPage.delay(300) // Wait for the popover to hide
+    await expect(comfyPage.page.locator('.workflow-popover-fade')).toBeHidden()
 
-    await comfyPage.rightClickCanvas(200, 200)
+    await comfyPage.canvasOps.rightClick(200, 200)
     await comfyPage.page.getByText('Add Node').click()
     await comfyPage.nextFrame()
     await comfyPage.page.getByText(category).click()
diff --git a/browser_tests/tsconfig.json b/browser_tests/tsconfig.json
index 391298333b..8e943db4b5 100644
--- a/browser_tests/tsconfig.json
+++ b/browser_tests/tsconfig.json
@@ -5,9 +5,13 @@
     "noEmit": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "types": ["vite/client"]
   },
   "include": [
     "**/*.ts",
+    "../src/types/**/*.d.ts",
+    "../global.d.ts",
+    "types/**/*.d.ts"
   ]
 }
diff --git a/browser_tests/types/globals.d.ts b/browser_tests/types/globals.d.ts
new file mode 100644
index 0000000000..1d38a31a65
--- /dev/null
+++ b/browser_tests/types/globals.d.ts
@@ -0,0 +1,69 @@
+import type { LGraph } from '@/lib/litegraph/src/LGraph'
+// eslint-disable-next-line unused-imports/no-unused-imports -- used in typeof
+import type { LGraphBadge } from '@/lib/litegraph/src/LGraphBadge'
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
+import type { LiteGraphGlobal } from '@/lib/litegraph/src/LiteGraphGlobal'
+import type { ComfyApp } from '@/scripts/app'
+import type { useWorkspaceStore } from '@/stores/workspaceStore'
+
+/**
+ * Helper type for accessing nodes by ID in browser tests.
+ * Provides typed access to graph internals without requiring `any`.
+ */
+export interface TestGraphAccess {
+  _nodes_by_id: Record<string, LGraphNode>
+}
+
+interface AppReadiness {
+  featureFlagsReceived: boolean
+  apiInitialized: boolean
+  appInitialized: boolean
+}
+
+interface CapturedMessages {
+  clientFeatureFlags: unknown
+  serverFeatureFlags: unknown
+}
+
+declare global {
+  interface Window {
+    app?: ComfyApp
+    graph?: LGraph
+    LiteGraph?: LiteGraphGlobal
+    LGraphBadge?: typeof LGraphBadge
+
+    // Test-specific globals used for assertions
+    foo?: boolean
+    TestCommand?: boolean
+    changeCount?: number
+    widgetValue?: unknown
+
+    // Feature flags test globals
+    __capturedMessages?: CapturedMessages
+    __appReadiness?: AppReadiness
+
+    /**
+     * WebSocket store used by test fixtures for mocking WebSocket connections.
+     * @see browser_tests/fixtures/ws.ts
+     */
+    __ws__?: Record<string, WebSocket>
+  }
+
+  const app: ComfyApp | undefined
+  const graph: LGraph | undefined
+  const LiteGraph: LiteGraphGlobal | undefined
+  const LGraphBadge: typeof LGraphBadge | undefined
+}
+
+/**
+ * Internal store type for browser test access.
+ * Used to access properties not exposed via the public ExtensionManager interface.
+ *
+ * @example
+ * ```ts
+ * await page.evaluate(() => {
+ *   ;(window.app!.extensionManager as WorkspaceStore).workflow.syncWorkflows()
+ * })
+ * ```
+ */
+export type WorkspaceStore = ReturnType<typeof useWorkspaceStore>
diff --git a/build/plugins/comfyAPIPlugin.ts b/build/plugins/comfyAPIPlugin.ts
index 6441dd7816..16135cbd73 100644
--- a/build/plugins/comfyAPIPlugin.ts
+++ b/build/plugins/comfyAPIPlugin.ts
@@ -9,7 +9,11 @@ interface ShimResult {
 const SKIP_WARNING_FILES = new Set(['scripts/app', 'scripts/api'])
 
 /** Files that will be removed in v1.34 */
-const DEPRECATED_FILES = ['scripts/ui', 'extensions/core/groupNode'] as const
+const DEPRECATED_FILES = [
+  'scripts/ui',
+  'extensions/core/groupNode',
+  'extensions/core/nodeTemplates'
+] as const
 
 function getWarningMessage(
   fileKey: string,
@@ -76,6 +80,7 @@ function getModuleName(id: string): string {
 export function comfyAPIPlugin(isDev: boolean): Plugin {
   return {
     name: 'comfy-api-plugin',
+    apply: 'build',
     transform(code: string, id: string) {
       if (isDev) return null
 
diff --git a/build/tsconfig.json b/build/tsconfig.json
index 1c24810a8e..d13a17145f 100644
--- a/build/tsconfig.json
+++ b/build/tsconfig.json
@@ -5,13 +5,11 @@
     "noEmit": true,
     "strict": true,
     "esModuleInterop": true,
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "allowSyntheticDefaultImports": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     "resolveJsonModule": true
   },
-  "include": [
-    "**/*.ts"
-  ]
-}
\ No newline at end of file
+  "include": ["**/*.ts"]
+}
diff --git a/components.json b/components.json
index 5526f900d5..a70765222b 100644
--- a/components.json
+++ b/components.json
@@ -3,7 +3,6 @@
   "style": "new-york",
   "typescript": true,
   "tailwind": {
-    "config": "tailwind.config.ts",
     "css": "src/assets/css/style.css",
     "baseColor": "stone",
     "cssVariables": true,
@@ -17,4 +16,4 @@
     "lib": "@/lib"
   },
   "iconLibrary": "lucide"
-}
\ No newline at end of file
+}
diff --git a/docs/FEATURE_FLAGS.md b/docs/FEATURE_FLAGS.md
index e472d276d4..957f2ea447 100644
--- a/docs/FEATURE_FLAGS.md
+++ b/docs/FEATURE_FLAGS.md
@@ -17,19 +17,19 @@ sequenceDiagram
 
     Frontend->>WebSocket: Connect
     WebSocket-->>Frontend: Connection established
-    
+
     Note over Frontend: First message must be feature flags
     Frontend->>WebSocket: Send client feature flags
     WebSocket->>Backend: Receive feature flags
     Backend->>FeatureFlags Module: Store client capabilities
-    
+
     Backend->>FeatureFlags Module: Get server features
     FeatureFlags Module-->>Backend: Return server capabilities
     Backend->>WebSocket: Send server feature flags
     WebSocket-->>Frontend: Receive server features
-    
+
     Note over Frontend,Backend: Both sides now know each other's capabilities
-    
+
     Frontend->>Frontend: Store server features
     Frontend->>Frontend: Components use useFeatureFlags()
 ```
@@ -44,15 +44,15 @@ graph TB
         D[useFeatureFlags composable] --> B
         E[Vue Components] --> D
     end
-    
+
     subgraph Backend
         F[feature_flags.py] --> G[SERVER_FEATURE_FLAGS]
         H[server.py WebSocket] --> F
         I[Feature Consumers] --> F
     end
-    
+
     C <--> H
-    
+
     style A fill:#f9f,stroke:#333,stroke-width:2px
     style G fill:#f9f,stroke:#333,stroke-width:2px
     style D fill:#9ff,stroke:#333,stroke-width:2px
@@ -98,19 +98,19 @@ classDiagram
         +supports_feature(sockets_metadata, sid, feature_name) bool
         +get_connection_feature(sockets_metadata, sid, feature_name, default) Any
     }
-    
+
     class PromptServer {
         -sockets_metadata: Dict
         +websocket_handler()
         +send()
     }
-    
+
     class FeatureConsumer {
         <<interface>>
         +check_feature()
         +use_feature()
     }
-    
+
     PromptServer --> FeatureFlagsModule
     FeatureConsumer --> FeatureFlagsModule
 ```
@@ -127,19 +127,19 @@ classDiagram
         +serverSupportsFeature(name) boolean
         +getServerFeature(name, default) T
     }
-    
+
     class useFeatureFlags {
         +serverSupports(name) boolean
         +getServerFeature(name, default) T
         +createServerFeatureFlag(name) ComputedRef
         +extension: ExtensionFlags
     }
-    
+
     class VueComponent {
         <<component>>
         +setup()
     }
-    
+
     ComfyApi <-- useFeatureFlags
     VueComponent --> useFeatureFlags
 ```
@@ -153,12 +153,13 @@ graph LR
     A[Preview Generation] --> B{supports_preview_metadata?}
     B -->|Yes| C[Send metadata with preview]
     B -->|No| D[Send preview only]
-    
+
     C --> E[Enhanced preview with node info]
     D --> F[Basic preview image]
 ```
 
 **Backend Usage:**
+
 ```python
 # Check if client supports preview metadata
 if feature_flags.supports_feature(
@@ -189,13 +190,14 @@ graph TB
     B --> C{File size OK?}
     C -->|Yes| D[Upload file]
     C -->|No| E[Show error]
-    
+
     F[Backend] --> G[Set from CLI args]
     G --> H[Convert MB to bytes]
     H --> I[Include in feature flags]
 ```
 
 **Backend Configuration:**
+
 ```python
 # In feature_flags.py
 SERVER_FEATURE_FLAGS = {
@@ -205,6 +207,7 @@ SERVER_FEATURE_FLAGS = {
 ```
 
 **Frontend Usage:**
+
 ```typescript
 const { getServerFeature } = useFeatureFlags()
 const maxUploadSize = getServerFeature('max_upload_size', 100 * 1024 * 1024) // Default 100MB
@@ -215,10 +218,11 @@ const maxUploadSize = getServerFeature('max_upload_size', 100 * 1024 * 1024) //
 ### Frontend Access Patterns
 
 1. **Direct API access:**
+
 ```typescript
 // Check boolean feature
 if (api.serverSupportsFeature('supports_preview_metadata')) {
-    // Feature is supported
+  // Feature is supported
 }
 
 // Get feature value with default
@@ -226,21 +230,23 @@ const maxSize = api.getServerFeature('max_upload_size', 100 * 1024 * 1024)
 ```
 
 2. **Using the composable (recommended for reactive components):**
+
 ```typescript
 const { serverSupports, getServerFeature, extension } = useFeatureFlags()
 
 // Check feature support
 if (serverSupports('supports_preview_metadata')) {
-    // Use enhanced previews
+  // Use enhanced previews
 }
 
 // Use reactive convenience properties (automatically update if flags change)
 if (extension.manager.supportsV4.value) {
-    // Use V4 manager API
+  // Use V4 manager API
 }
 ```
 
 3. **Reactive usage in templates:**
+
 ```vue
 <template>
   <div v-if="featureFlags.extension.manager.supportsV4">
@@ -262,12 +268,12 @@ const featureFlags = useFeatureFlags()
 ```python
 # Check if a specific client supports a feature
 if feature_flags.supports_feature(
-    sockets_metadata, 
-    client_id, 
+    sockets_metadata,
+    client_id,
     "supports_preview_metadata"
 ):
     # Client supports this feature
-    
+
 # Get feature value with default
 max_size = feature_flags.get_connection_feature(
     sockets_metadata,
@@ -282,6 +288,7 @@ max_size = feature_flags.get_connection_feature(
 ### Backend
 
 1. **For server capabilities**, add to `SERVER_FEATURE_FLAGS` in `comfy_api/feature_flags.py`:
+
 ```python
 SERVER_FEATURE_FLAGS = {
     "supports_preview_metadata": True,
@@ -291,6 +298,7 @@ SERVER_FEATURE_FLAGS = {
 ```
 
 2. **Use in your code:**
+
 ```python
 if feature_flags.supports_feature(sockets_metadata, sid, "your_new_feature"):
     # Feature-specific code
@@ -299,28 +307,34 @@ if feature_flags.supports_feature(sockets_metadata, sid, "your_new_feature"):
 ### Frontend
 
 1. **For client capabilities**, add to `src/config/clientFeatureFlags.json`:
+
 ```json
 {
-    "supports_preview_metadata": false,
-    "your_new_feature": true
+  "supports_preview_metadata": false,
+  "your_new_feature": true
 }
 ```
 
 2. **For extension features**, update the composable to add convenience accessors:
+
 ```typescript
 // In useFeatureFlags.ts
 const extension = {
-    manager: {
-        supportsV4: computed(() => getServerFeature('extension.manager.supports_v4', false))
-    },
-    yourExtension: {
-        supportsNewFeature: computed(() => getServerFeature('extension.yourExtension.supports_new_feature', false))
-    }
+  manager: {
+    supportsV4: computed(() =>
+      getServerFeature('extension.manager.supports_v4', false)
+    )
+  },
+  yourExtension: {
+    supportsNewFeature: computed(() =>
+      getServerFeature('extension.yourExtension.supports_new_feature', false)
+    )
+  }
 }
 
 return {
-    // ... existing returns
-    extension
+  // ... existing returns
+  extension
 }
 ```
 
@@ -332,7 +346,7 @@ graph LR
     A --> C[Only frontend supports]
     A --> D[Only backend supports]
     A --> E[Neither supports]
-    
+
     B --> F[Feature enabled]
     C --> G[Feature disabled]
     D --> H[Feature disabled]
@@ -340,6 +354,7 @@ graph LR
 ```
 
 Test your feature flags with different combinations:
+
 - Frontend with flag + Backend with flag = Feature works
 - Frontend with flag + Backend without = Graceful degradation
 - Frontend without + Backend with flag = No feature usage
@@ -350,13 +365,14 @@ Test your feature flags with different combinations:
 ```typescript
 // In tests-ui/tests/api.featureFlags.test.ts
 it('should handle preview metadata based on feature flag', () => {
-    // Mock server supports feature
-    api.serverFeatureFlags = { supports_preview_metadata: true }
-    
-    expect(api.serverSupportsFeature('supports_preview_metadata')).toBe(true)
-    
-    // Mock server doesn't support feature
-    api.serverFeatureFlags = {}
-    
-    expect(api.serverSupportsFeature('supports_preview_metadata')).toBe(false)
-})
\ No newline at end of file
+  // Mock server supports feature
+  api.serverFeatureFlags = { supports_preview_metadata: true }
+
+  expect(api.serverSupportsFeature('supports_preview_metadata')).toBe(true)
+
+  // Mock server doesn't support feature
+  api.serverFeatureFlags = {}
+
+  expect(api.serverSupportsFeature('supports_preview_metadata')).toBe(false)
+})
+```
diff --git a/docs/SETTINGS.md b/docs/SETTINGS.md
index cb4a9490f5..f649cd3b0d 100644
--- a/docs/SETTINGS.md
+++ b/docs/SETTINGS.md
@@ -5,6 +5,7 @@
 ComfyUI frontend uses a comprehensive settings system for user preferences with support for dynamic defaults, version-based rollouts, and environment-aware configuration.
 
 ### Settings Architecture
+
 - Settings are defined as `SettingParams` in `src/constants/coreSettings.ts`
 - Registered at app startup, loaded/saved via `useSettingStore` (Pinia)
 - Persisted per user via backend `/settings` endpoint
@@ -45,6 +46,7 @@ await newUserService().initializeIfNewUser(settingStore)
 ## Dynamic and Environment-Based Defaults
 
 ### Computed Defaults
+
 You can compute defaults dynamically using function defaults that access runtime context:
 
 ```typescript
@@ -65,14 +67,15 @@ You can compute defaults dynamically using function defaults that access runtime
 ```
 
 ### Version-Based Defaults
+
 You can vary defaults by installed frontend version using `defaultsByInstallVersion`:
 
 ```typescript
 // From src/stores/settingStore.ts:129-150
-function getVersionedDefaultValue<K extends keyof Settings, TValue = Settings[K]>(
-  key: K, 
-  param: SettingParams<TValue> | undefined
-): TValue | null {
+function getVersionedDefaultValue<
+  K extends keyof Settings,
+  TValue = Settings[K]
+>(key: K, param: SettingParams<TValue> | undefined): TValue | null {
   const defaultsByInstallVersion = param?.defaultsByInstallVersion
   if (defaultsByInstallVersion && key !== 'Comfy.InstalledVersion') {
     const installedVersion = get('Comfy.InstalledVersion')
@@ -166,15 +169,13 @@ The initial installed version is captured for new users to ensure versioned defa
 
 ```typescript
 // From src/services/newUserService.ts:49-53
-await settingStore.set(
-  'Comfy.InstalledVersion',
-  __COMFYUI_FRONTEND_VERSION__
-)
+await settingStore.set('Comfy.InstalledVersion', __COMFYUI_FRONTEND_VERSION__)
 ```
 
 ## Practical Patterns for Environment-Based Defaults
 
 ### Dynamic Default Patterns
+
 ```typescript
 // Device-based default
 {
@@ -199,6 +200,7 @@ await settingStore.set(
 ```
 
 ### Version-Based Rollout Pattern
+
 ```typescript
 {
   id: 'Comfy.Example.NewFeature',
@@ -214,6 +216,7 @@ await settingStore.set(
 ## Settings Persistence and Access
 
 ### API Interaction
+
 Values are stored per user via the backend. The store writes through API and falls back to defaults when not set:
 
 ```typescript
@@ -224,6 +227,7 @@ await api.storeSetting(key, newValue)
 ```
 
 ### Usage in Components
+
 ```typescript
 const settingStore = useSettingStore()
 
@@ -234,7 +238,6 @@ const value = settingStore.get('Comfy.SomeSetting')
 await settingStore.set('Comfy.SomeSetting', newValue)
 ```
 
-
 ## Advanced Settings Features
 
 ### Migration and Backward Compatibility
@@ -243,10 +246,7 @@ Settings support migration from deprecated values:
 
 ```typescript
 // From src/stores/settingStore.ts:68-69, 172-175
-const newValue = tryMigrateDeprecatedValue(
-  settingsById.value[key],
-  clonedValue
-)
+const newValue = tryMigrateDeprecatedValue(settingsById.value[key], clonedValue)
 
 // Migration happens during addSetting for existing values:
 if (settingValues.value[setting.id] !== undefined) {
@@ -263,8 +263,8 @@ Settings can define onChange callbacks that receive the setting definition, new
 
 ```typescript
 // From src/stores/settingStore.ts:73, 177
-onChange(settingsById.value[key], newValue, oldValue)  // During set()
-onChange(setting, get(setting.id), undefined)         // During addSetting()
+onChange(settingsById.value[key], newValue, oldValue) // During set()
+onChange(setting, get(setting.id), undefined) // During addSetting()
 ```
 
 ### Settings UI and Categories
@@ -290,4 +290,4 @@ Settings are automatically grouped for UI based on their `category` or derived f
 - **Settings**: User preferences with dynamic/versioned defaults, persisted per user
 - **Environment Defaults**: Use function defaults to read runtime context (window, navigator, env)
 - **Version Rollouts**: Use `defaultsByInstallVersion` for gradual feature releases
-- **API Interaction**: Settings persist to `/settings` endpoint via `storeSetting()`
\ No newline at end of file
+- **API Interaction**: Settings persist to `/settings` endpoint via `storeSetting()`
diff --git a/docs/TEMPLATE_RANKING.md b/docs/TEMPLATE_RANKING.md
new file mode 100644
index 0000000000..a52c8fc61b
--- /dev/null
+++ b/docs/TEMPLATE_RANKING.md
@@ -0,0 +1,66 @@
+# Template Ranking System
+
+Usage-based ordering for workflow templates with position bias normalization.
+
+Scores are pre-computed and normalized offline and shipped as static JSON (mirrors `sorted-custom-node-map.json` pattern for node search).
+
+## Sort Modes
+
+| Mode           | Formula                                          | Description            |
+| -------------- | ------------------------------------------------ | ---------------------- |
+| `recommended`  | `usage × 0.5 + internal × 0.3 + freshness × 0.2` | Curated recommendation |
+| `popular`      | `usage × 0.9 + freshness × 0.1`                  | Pure user-driven       |
+| `newest`       | Date sort                                        | Existing               |
+| `alphabetical` | Name sort                                        | Existing               |
+
+Freshness computed at runtime from `template.date`: `1.0 / (1 + daysSinceAdded / 90)`, min 0.1.
+
+## Data Files
+
+**Usage scores** (generated from Mixpanel):
+
+```json
+// In templates/index.json, add to any template:
+{
+  "name": "some_template",
+  "usage": 1000,
+  ...
+}
+```
+
+**Search rank** (set per-template in workflow_templates repo):
+
+```json
+// In templates/index.json, add to any template:
+{
+  "name": "some_template",
+  "searchRank": 8,  // Scale 1-10, default 5
+  ...
+}
+```
+
+| searchRank | Effect                       |
+| ---------- | ---------------------------- |
+| 1-4        | Demote (bury in results)     |
+| 5          | Neutral (default if not set) |
+| 6-10       | Promote (boost in results)   |
+
+## Position Bias Correction
+
+Raw usage reflects true preference AND UI position bias. We use linear interpolation:
+
+```
+correction = 1 + (position - 1) / (maxPosition - 1)
+normalizedUsage = rawUsage × correction
+```
+
+| Position | Boost |
+| -------- | ----- |
+| 1        | 1.0×  |
+| 50       | 1.28× |
+| 100      | 1.57× |
+| 175      | 2.0×  |
+
+Templates buried at the bottom get up to 2× boost to compensate for reduced visibility.
+
+---
diff --git a/docs/WIDGET_SERIALIZATION.md b/docs/WIDGET_SERIALIZATION.md
new file mode 100644
index 0000000000..2fd89d1dbd
--- /dev/null
+++ b/docs/WIDGET_SERIALIZATION.md
@@ -0,0 +1,58 @@
+# Widget Serialization: `widget.serialize` vs `widget.options.serialize`
+
+Two properties named `serialize` exist at different levels of a widget object. They control different serialization layers and are checked by completely different code paths.
+
+**`widget.serialize`** — Controls **workflow persistence**. Checked by `LGraphNode.serialize()` and `configure()` when reading/writing `widgets_values` in the workflow JSON. When `false`, the widget is skipped in both serialization and deserialization. Used for UI-only widgets (image previews, progress text, audio players). Typed as `IBaseWidget.serialize` in `src/lib/litegraph/src/types/widgets.ts`.
+
+**`widget.options.serialize`** — Controls **prompt/API serialization**. Checked by `executionUtil.ts` when building the API payload sent to the backend. When `false`, the widget is excluded from prompt inputs. Used for client-side-only controls (`control_after_generate`, combo filter lists) that the server doesn't need. Typed as `IWidgetOptions.serialize` in `src/lib/litegraph/src/types/widgets.ts`.
+
+These correspond to the two data formats in `ComfyMetadata` embedded in output files (PNG, GLTF, WebM, AVIF, etc.): `widget.serialize` → `ComfyMetadataTags.WORKFLOW`, `widget.options.serialize` → `ComfyMetadataTags.PROMPT`.
+
+## Permutation table
+
+| `widget.serialize` | `widget.options.serialize` | In workflow? | In prompt? | Examples                                                             |
+| ------------------ | -------------------------- | ------------ | ---------- | -------------------------------------------------------------------- |
+| ✅ default         | ✅ default                 | Yes          | Yes        | seed, cfg, sampler_name                                              |
+| ✅ default         | ❌ false                   | Yes          | No         | control_after_generate, combo filter list                            |
+| ❌ false           | ✅ default                 | No           | Yes        | No current usage (would be a transient value computed at queue time) |
+| ❌ false           | ❌ false                   | No           | No         | Image/video previews, audio players, progress text                   |
+
+## Gotchas
+
+- `addWidget('combo', name, value, cb, { serialize: false })` puts `serialize` into `widget.options`, **not** onto `widget` directly. These are different properties consumed by different systems.
+- `LGraphNode.serialize()` checks `widget.serialize === false` (line 967). It does **not** check `widget.options.serialize`. A widget with `options.serialize = false` is still included in `widgets_values`.
+- `LGraphNode.serialize()` only writes `widgets_values` if `this.widgets` is truthy. Nodes that create widgets dynamically (like `PrimitiveNode`) will have no `widgets_values` in serialized output if serialized before widget creation — even if `this.widgets_values` exists on the instance from a prior `configure()` call.
+- `widget.options.serialize` is typed as `IWidgetOptions.serialize` — both properties share the name `serialize` but live at different levels of the widget object.
+
+## PrimitiveNode and copy/paste
+
+`PrimitiveNode` creates widgets dynamically on connection — it starts as an empty polymorphic node and morphs to match its target widget in `_onFirstConnection()`. This interacts badly with the copy/paste pipeline.
+
+### The clone→serialize gap
+
+`LGraphCanvas._serializeItems()` copies nodes via `item.clone()?.serialize()` (line 3911). For PrimitiveNode this fails:
+
+1. `clone()` calls `this.serialize()` on the **original** node (which has widgets, so `widgets_values` is captured correctly).
+2. `clone()` creates a **fresh** PrimitiveNode via `LiteGraph.createNode()` and calls `configure(data)` on it — this stores `widgets_values` on the instance.
+3. But the fresh PrimitiveNode has no `this.widgets` (widgets are created only on connection), so when `serialize()` is called on the clone, `LGraphNode.serialize()` skips the `widgets_values` block entirely (line 964: `if (widgets && this.serialize_widgets)`).
+
+Result: `widgets_values` is silently dropped from the clipboard data.
+
+### Why seed survives but control_after_generate doesn't
+
+When the pasted PrimitiveNode reconnects to the pasted target node, `_createWidget()` copies `theirWidget.value` from the target (line 254). This restores the **primary** widget value (e.g., `seed`).
+
+But `control_after_generate` is a **secondary** widget created by `addValueControlWidgets()`, which reads its initial value from `this.widgets_values?.[1]` (line 263). That value was lost during clone→serialize, so it falls back to `'fixed'` (line 265).
+
+See [ADR-0006](adr/0006-primitive-node-copy-paste-lifecycle.md) for proposed fixes and design tradeoffs.
+
+## Code references
+
+- `widget.serialize` checked: `src/lib/litegraph/src/LGraphNode.ts` serialize() and configure()
+- `widget.options.serialize` checked: `src/utils/executionUtil.ts`
+- `widget.options.serialize` set: `src/scripts/widgets.ts` addValueControlWidgets()
+- `widget.serialize` set: `src/composables/node/useNodeImage.ts`, `src/extensions/core/previewAny.ts`, etc.
+- Metadata types: `src/types/metadataTypes.ts`
+- PrimitiveNode: `src/extensions/core/widgetInputs.ts`
+- Copy/paste serialization: `src/lib/litegraph/src/LGraphCanvas.ts` `_serializeItems()`
+- Clone: `src/lib/litegraph/src/LGraphNode.ts` `clone()`
diff --git a/docs/adr/0001-merge-litegraph-into-frontend.md b/docs/adr/0001-merge-litegraph-into-frontend.md
index 714a7e9dc7..d15eb8bdc5 100644
--- a/docs/adr/0001-merge-litegraph-into-frontend.md
+++ b/docs/adr/0001-merge-litegraph-into-frontend.md
@@ -11,11 +11,13 @@ Accepted
 ComfyUI's frontend architecture currently depends on a forked version of litegraph.js maintained as a separate package (@comfyorg/litegraph). This separation has created several architectural and operational challenges:
 
 **Architectural Issues:**
+
 - The current split creates a distributed monolith where both packages handle rendering, user interactions, and data models without clear separation of responsibilities
 - Both frontend and litegraph manipulate the same data structures, forcing tight coupling across the frontend's data model, views, and business logic
 - The lack of clear boundaries prevents implementation of modern architectural patterns like MVC or event-sourcing
 
 **Operational Issues:**
+
 - ComfyUI is the only known user of the @comfyorg/litegraph fork
 - Managing separate repositories significantly slows developer velocity due to coordination overhead
 - Version mismatches between frontend and litegraph cause recurring issues
@@ -23,6 +25,7 @@ ComfyUI's frontend architecture currently depends on a forked version of litegra
 
 **Future Requirements:**
 The following planned features are blocked by the current architecture:
+
 - Multiplayer collaboration requiring CRDT-based state management
 - Cloud-based backend support
 - Alternative rendering backends
@@ -34,6 +37,7 @@ The following planned features are blocked by the current architecture:
 We will merge litegraph.js directly into the ComfyUI frontend repository using git subtree to preserve the complete commit history.
 
 The merge will:
+
 1. Move litegraph source to `src/lib/litegraph/`
 2. Update all import paths from `@comfyorg/litegraph` to `@/lib/litegraph`
 3. Remove the npm dependency on `@comfyorg/litegraph`
@@ -62,4 +66,4 @@ This integration is the first step toward restructuring the application along cl
 
 - Git subtree was chosen over submodules to provide a cleaner developer experience
 - The original litegraph repository will be archived after the merge
-- Future litegraph improvements will be made directly in the frontend repository
\ No newline at end of file
+- Future litegraph improvements will be made directly in the frontend repository
diff --git a/docs/adr/0002-monorepo-conversion.md b/docs/adr/0002-monorepo-conversion.md
index d1ada909e4..c0964e49c5 100644
--- a/docs/adr/0002-monorepo-conversion.md
+++ b/docs/adr/0002-monorepo-conversion.md
@@ -13,7 +13,7 @@ Proposed
 [Most of the context is in here](https://github.com/Comfy-Org/ComfyUI_frontend/issues/4661)
 
 TL;DR: As we're merging more subprojects like litegraph, devtools, and soon a fork of PrimeVue,
- a monorepo structure will help a lot with code sharing and organization.
+a monorepo structure will help a lot with code sharing and organization.
 
 For more information on Monorepos, check out [monorepo.tools](https://monorepo.tools/)
 
@@ -37,7 +37,7 @@ There's a [whole list here](https://monorepo.tools/#tools-review) if you're inte
 
 - Adding new projects with shared dependencies becomes really easy
 - Makes the process of forking and customizing projects more structured, if not strictly easier
-- It *could* speed up the build and development process (not guaranteed)
+- It _could_ speed up the build and development process (not guaranteed)
 - It would let us cleanly organize and release packages like `comfyui-frontend-types`
 
 ### Negative
@@ -47,4 +47,4 @@ There's a [whole list here](https://monorepo.tools/#tools-review) if you're inte
 
 <!-- ## Notes
 
-Optional section for additional information, references, or clarifications. -->
\ No newline at end of file
+Optional section for additional information, references, or clarifications. -->
diff --git a/docs/adr/0003-crdt-based-layout-system.md b/docs/adr/0003-crdt-based-layout-system.md
index 1eceb2a1f7..5aca48f4f1 100644
--- a/docs/adr/0003-crdt-based-layout-system.md
+++ b/docs/adr/0003-crdt-based-layout-system.md
@@ -24,7 +24,7 @@ The existing system allows each node to directly mutate its position within Lite
 
 5. **Inefficient Change Detection**: While LiteGraph provides some events, many operations require polling via changeTracker.ts. The current undo/redo system performs expensive diffs on every interaction rather than using reactive push/pull signals, creating performance bottlenecks and blocking efficient animations and viewport culling.
 
-   This represents a fundamental architectural limitation: diff-based systems scale O(n) with graph complexity (traverse entire structure to detect changes), while signal-based reactive systems scale O(1) with actual changes (data mutations automatically notify subscribers). Modern frameworks (Vue 3, Angular signals, SolidJS) have moved to reactive approaches for precisely this performance reason. 
+   This represents a fundamental architectural limitation: diff-based systems scale O(n) with graph complexity (traverse entire structure to detect changes), while signal-based reactive systems scale O(1) with actual changes (data mutations automatically notify subscribers). Modern frameworks (Vue 3, Angular signals, SolidJS) have moved to reactive approaches for precisely this performance reason.
 
 ### Business Context
 
@@ -53,12 +53,14 @@ This provides single source of truth, predictable state updates, and natural sys
 ### Core Architecture
 
 1. **Centralized Layout Store**: A Yjs CRDT maintains all spatial data in a single authoritative store:
+
    ```typescript
    // Instead of: node.position = {x, y}
-   layoutStore.moveNode(nodeId, {x, y})
+   layoutStore.moveNode(nodeId, { x, y })
    ```
 
 2. **Command Pattern**: All spatial mutations flow through explicit commands:
+
    ```
    User Input → Commands → Layout Store → Observer Notifications → Renderers
    ```
@@ -74,12 +76,14 @@ This provides single source of truth, predictable state updates, and natural sys
 ### Implementation Strategy
 
 **Phase 1: Parallel System**
+
 - Build CRDT layout store alongside existing system
 - Layout store initially mirrors LiteGraph changes via observers
 - Gradually migrate user interactions to use command interface
 - Maintain full backward compatibility
 
 **Phase 2: Inversion of Control**
+
 - CRDT store becomes single source of truth
 - LiteGraph receives position updates via reactive subscriptions
 - Enable alternative renderers and advanced features
@@ -89,17 +93,20 @@ This provides single source of truth, predictable state updates, and natural sys
 This combination provides both architectural and technical benefits:
 
 **Centralized State Benefits:**
+
 - **Single Source of Truth**: All layout data managed in one place, eliminating conflicts
 - **System Decoupling**: Rendering, interaction, and layout systems operate independently
 - **Predictable Updates**: Clear data flow makes debugging and testing easier
 - **Extensibility**: Easy to add new layout behaviors without modifying existing systems
 
 **CRDT Benefits:**
+
 - **Conflict Resolution**: Automatic merging eliminates position conflicts between systems
 - **Collaboration-Ready**: Built-in support for multi-user editing
 - **Eventual Consistency**: Guaranteed convergence to same state across all clients
 
 **Yjs-Specific Benefits:**
+
 - **Event-Driven**: Native observer pattern removes need for polling
 - **Selective Updates**: Only changed nodes trigger system updates
 - **Fine-Grained Changes**: Efficient delta synchronization
@@ -109,7 +116,7 @@ This combination provides both architectural and technical benefits:
 ### Positive
 
 - **Eliminates Polling**: Observer pattern removes O(n) graph traversals, improving performance
-- **System Modularity**: Independent systems can be developed, tested, and optimized separately  
+- **System Modularity**: Independent systems can be developed, tested, and optimized separately
 - **Renderer Flexibility**: Easy to add WebGL, DOM accessibility, or hybrid rendering systems
 - **Rich Interactions**: Command pattern enables robust undo/redo, macros, and interaction history
 - **Collaboration-Ready**: CRDT foundation enables real-time multi-user editing
@@ -140,9 +147,10 @@ This centralized state + CRDT architecture follows patterns from modern collabor
 **CRDT in Collaboration**: Tools like Figma, Linear, and Notion use similar approaches for real-time collaboration, demonstrating the effectiveness of separating authoritative data from presentation logic.
 
 **Future Capabilities**: This foundation enables advanced features that would be difficult with the current architecture:
+
 - Macro recording and workflow automation
 - Programmatic layout optimization and constraints
-- API-driven workflow construction  
+- API-driven workflow construction
 - Multiple simultaneous renderers (canvas + accessibility DOM)
 - Real-time collaborative editing
 - Advanced spatial features (physics, animations, auto-layout)
diff --git a/docs/adr/0004-fork-primevue-ui-library.md b/docs/adr/0004-fork-primevue-ui-library.md
index 02bd187368..999357416e 100644
--- a/docs/adr/0004-fork-primevue-ui-library.md
+++ b/docs/adr/0004-fork-primevue-ui-library.md
@@ -11,22 +11,27 @@ Rejected
 ComfyUI's frontend requires modifications to PrimeVue components that cannot be achieved through the library's customization APIs. Two specific technical incompatibilities have been identified with the transform-based canvas architecture:
 
 **Screen Coordinate Hit-Testing Conflicts:**
+
 - PrimeVue components use `getBoundingClientRect()` for screen coordinate calculations that don't account for CSS transforms
 - The Slider component directly uses raw `pageX/pageY` coordinates ([lines 102-103](https://github.com/primefaces/primevue/blob/master/packages/primevue/src/slider/Slider.vue#L102-L103)) without transform-aware positioning
 - This breaks interaction in transformed coordinate spaces where screen coordinates don't match logical element positions
 
 **Virtual Canvas Scroll Interference:**
+
 - LiteGraph's infinite canvas uses scroll coordinates semantically for graph navigation via the `DragAndScale` coordinate system
 - PrimeVue overlay components automatically trigger `scrollIntoView` behavior which interferes with this virtual positioning
 - This issue is documented in [PrimeVue discussion #4270](https://github.com/orgs/primefaces/discussions/4270) where the feature request was made to disable this behavior
 
 **Historical Overlay Issues:**
+
 - Previous z-index positioning conflicts required manual workarounds (commit `6d4eafb0`) where PrimeVue Dialog components needed `autoZIndex: false` and custom mask styling, later resolved by removing PrimeVue's automatic z-index management entirely
 
 **Minimal Update Overhead:**
+
 - Analysis of git history shows only 2 PrimeVue version updates in 2+ years, indicating that upstream sync overhead is negligible for this project
 
 **Future Interaction System Requirements:**
+
 - The ongoing canvas architecture evolution will require more granular control over component interaction and event handling as the transform-based system matures
 - Predictable need for additional component modifications beyond current identified issues
 
diff --git a/docs/adr/0006-primitive-node-copy-paste-lifecycle.md b/docs/adr/0006-primitive-node-copy-paste-lifecycle.md
new file mode 100644
index 0000000000..e8025d910a
--- /dev/null
+++ b/docs/adr/0006-primitive-node-copy-paste-lifecycle.md
@@ -0,0 +1,45 @@
+# 6. PrimitiveNode Copy/Paste Lifecycle
+
+Date: 2026-02-22
+
+## Status
+
+Proposed
+
+## Context
+
+PrimitiveNode creates widgets dynamically on connection. When copied, the clone has no `this.widgets`, so `LGraphNode.serialize()` drops `widgets_values` from the clipboard data. This causes secondary widget values (e.g., `control_after_generate`) to be lost on paste. See [WIDGET_SERIALIZATION.md](../WIDGET_SERIALIZATION.md#primitiveno-and-copypaste) for the full mechanism.
+
+Related: [#1757](https://github.com/Comfy-Org/ComfyUI_frontend/issues/1757), [#8938](https://github.com/Comfy-Org/ComfyUI_frontend/pull/8938)
+
+## Options
+
+### A. Minimal fix: override `serialize()` on PrimitiveNode
+
+Override `serialize()` to fall back to `this.widgets_values` (set during `configure()`) when the base implementation omits it due to missing `this.widgets`.
+
+- **Pro**: No change to connection lifecycle semantics. Lowest risk.
+- **Pro**: Doesn't affect workflow save/load (which already works via `onAfterGraphConfigured`).
+- **Con**: Doesn't address the deeper design issue — primitives are still empty on copy.
+
+### B. Clone-configured-instance lifecycle
+
+On copy, the primitive is a clone of the configured instance (with widgets intact). On disconnect or paste without connections, it returns to empty state.
+
+- **Pro**: Copy→serialize captures `widgets_values` correctly. Matches OOP expectations.
+- **Pro**: Secondary widget state survives round-trips without special-casing.
+- **Con**: `input.widget[CONFIG]` allows extensions to make PrimitiveNode create a _different_ widget than the target. Widget config is derived at connection time, not stored, so cloning the configured state may not be faithful.
+- **Con**: Deserialization ordering — `configure()` runs before links are restored. PrimitiveNode needs links to know what widgets to create. `onAfterGraphConfigured()` handles this for workflow load, but copy/paste uses a different code path.
+- **Con**: Higher risk of regressions in extension compatibility.
+
+### C. Projection model (like Subgraph widgets)
+
+Primitives act as a synchronization mechanism — no own state, just a projection of the target widget's resolved value.
+
+- **Pro**: Cleanest conceptual model. Eliminates state duplication.
+- **Con**: Primitives can connect to multiple targets. Projection with multiple targets is ambiguous.
+- **Con**: Major architectural change with broad impact.
+
+## Decision
+
+Pending. Option A is the most pragmatic first step. Option B can be revisited after Option A ships and stabilizes.
diff --git a/docs/adr/README.md b/docs/adr/README.md
index 129dfbf8a9..c63ae471c9 100644
--- a/docs/adr/README.md
+++ b/docs/adr/README.md
@@ -8,13 +8,13 @@ An Architecture Decision Record captures an important architectural decision mad
 
 ## ADR Index
 
-| ADR | Title | Status | Date |
-|-----|-------|--------|------|
-| [0001](0001-merge-litegraph-into-frontend.md) | Merge LiteGraph.js into ComfyUI Frontend | Accepted | 2025-08-05 |
-| [0002](0002-monorepo-conversion.md) | Restructure as a Monorepo | Accepted | 2025-08-25 |
-| [0003](0003-crdt-based-layout-system.md) | Centralized Layout Management with CRDT | Proposed | 2025-08-27 |
-| [0004](0004-fork-primevue-ui-library.md) | Fork PrimeVue UI Library | Rejected | 2025-08-27 |
-| [0005](0005-remove-importmap-for-vue-extensions.md) | Remove Import Map for Vue Extensions | Accepted | 2025-12-13 |
+| ADR                                                 | Title                                    | Status   | Date       |
+| --------------------------------------------------- | ---------------------------------------- | -------- | ---------- |
+| [0001](0001-merge-litegraph-into-frontend.md)       | Merge LiteGraph.js into ComfyUI Frontend | Accepted | 2025-08-05 |
+| [0002](0002-monorepo-conversion.md)                 | Restructure as a Monorepo                | Accepted | 2025-08-25 |
+| [0003](0003-crdt-based-layout-system.md)            | Centralized Layout Management with CRDT  | Proposed | 2025-08-27 |
+| [0004](0004-fork-primevue-ui-library.md)            | Fork PrimeVue UI Library                 | Rejected | 2025-08-27 |
+| [0005](0005-remove-importmap-for-vue-extensions.md) | Remove Import Map for Vue Extensions     | Accepted | 2025-12-13 |
 
 ## Creating a New ADR
 
diff --git a/docs/extensions/README.md b/docs/extensions/README.md
index ee8eb9a7e7..57a3d572c9 100644
--- a/docs/extensions/README.md
+++ b/docs/extensions/README.md
@@ -11,7 +11,6 @@ Extensions are the primary way to add functionality to ComfyUI. They can be cust
   - How extensions load (backend vs frontend)
   - Why extensions don't work in dev server
   - Development workarounds and best practices
-  
 - **[Core Extensions Reference](./core.md)** - Detailed reference for core extensions:
   - Complete list of all core extensions
   - Extension architecture principles
@@ -42,4 +41,4 @@ Extensions are the primary way to add functionality to ComfyUI. They can be cust
 
 - Check the [Development Guide](./development.md) for common issues
 - Review [Core Extensions](./core.md) for examples
-- Visit the [ComfyUI Discord](https://discord.com/invite/comfyorg) for community support
\ No newline at end of file
+- Visit the [ComfyUI Discord](https://discord.com/invite/comfyorg) for community support
diff --git a/docs/extensions/core.md b/docs/extensions/core.md
index f7444ce76a..c9a09038bc 100644
--- a/docs/extensions/core.md
+++ b/docs/extensions/core.md
@@ -29,56 +29,58 @@ The following table lists ALL core extensions in the system as of 2025-01-30:
 
 ### Main Extensions
 
-| Extension | Description | Category |
-|-----------|-------------|----------|
-| clipspace.ts | Implements the Clipspace feature for temporary image storage | Image |
-| contextMenuFilter.ts | Provides context menu filtering capabilities | UI |
-| dynamicPrompts.ts | Provides dynamic prompt generation capabilities | Prompts |
-| editAttention.ts | Implements attention editing functionality | Text |
-| electronAdapter.ts | Adapts functionality for Electron environment | Platform |
-| groupNode.ts | Implements the group node functionality to organize workflows | Graph |
-| groupNodeManage.ts | Provides group node management operations | Graph |
-| groupOptions.ts | Handles group node configuration options | Graph |
-| index.ts | Main extension registration and coordination | Core |
-| load3d.ts | Supports 3D model loading and visualization | 3D |
-| maskeditor.ts | Implements the mask editor for image masking operations | Image |
-| nodeTemplates.ts | Provides node template functionality | Templates |
-| noteNode.ts | Adds note nodes for documentation within workflows | Graph |
-| previewAny.ts | Universal preview functionality for various data types | Preview |
-| rerouteNode.ts | Implements reroute nodes for cleaner workflow connections | Graph |
-| saveImageExtraOutput.ts | Handles additional image output saving | Image |
-| saveMesh.ts | Implements 3D mesh saving functionality | 3D |
-| simpleTouchSupport.ts | Provides basic touch interaction support | Input |
-| slotDefaults.ts | Manages default values for node slots | Nodes |
-| uploadAudio.ts | Handles audio file upload functionality | Audio |
-| uploadImage.ts | Handles image upload functionality | Image |
-| webcamCapture.ts | Provides webcam capture capabilities | Media |
-| widgetInputs.ts | Implements various widget input types | Widgets |
-
+| Extension               | Description                                                   | Category  |
+| ----------------------- | ------------------------------------------------------------- | --------- |
+| clipspace.ts            | Implements the Clipspace feature for temporary image storage  | Image     |
+| contextMenuFilter.ts    | Provides context menu filtering capabilities                  | UI        |
+| dynamicPrompts.ts       | Provides dynamic prompt generation capabilities               | Prompts   |
+| editAttention.ts        | Implements attention editing functionality                    | Text      |
+| electronAdapter.ts      | Adapts functionality for Electron environment                 | Platform  |
+| groupNode.ts            | Implements the group node functionality to organize workflows | Graph     |
+| groupNodeManage.ts      | Provides group node management operations                     | Graph     |
+| groupOptions.ts         | Handles group node configuration options                      | Graph     |
+| index.ts                | Main extension registration and coordination                  | Core      |
+| load3d.ts               | Supports 3D model loading and visualization                   | 3D        |
+| maskeditor.ts           | Implements the mask editor for image masking operations       | Image     |
+| nodeTemplates.ts        | Provides node template functionality                          | Templates |
+| noteNode.ts             | Adds note nodes for documentation within workflows            | Graph     |
+| previewAny.ts           | Universal preview functionality for various data types        | Preview   |
+| rerouteNode.ts          | Implements reroute nodes for cleaner workflow connections     | Graph     |
+| saveImageExtraOutput.ts | Handles additional image output saving                        | Image     |
+| saveMesh.ts             | Implements 3D mesh saving functionality                       | 3D        |
+| simpleTouchSupport.ts   | Provides basic touch interaction support                      | Input     |
+| slotDefaults.ts         | Manages default values for node slots                         | Nodes     |
+| uploadAudio.ts          | Handles audio file upload functionality                       | Audio     |
+| uploadImage.ts          | Handles image upload functionality                            | Image     |
+| webcamCapture.ts        | Provides webcam capture capabilities                          | Media     |
+| widgetInputs.ts         | Implements various widget input types                         | Widgets   |
 
 ### Conditional Lines Subdirectory
+
 Located in `extensions/core/load3d/conditional-lines/`:
 
-| File | Description |
-|------|-------------|
-| ColoredShadowMaterial.js | Material for colored shadow rendering |
+| File                        | Description                             |
+| --------------------------- | --------------------------------------- |
+| ColoredShadowMaterial.js    | Material for colored shadow rendering   |
 | ConditionalEdgesGeometry.js | Geometry for conditional edge rendering |
-| ConditionalEdgesShader.js | Shader for conditional edges |
-| OutsideEdgesGeometry.js | Geometry for outside edge detection |
+| ConditionalEdgesShader.js   | Shader for conditional edges            |
+| OutsideEdgesGeometry.js     | Geometry for outside edge detection     |
+
+### Lines2 Subdirectory
 
-### Lines2 Subdirectory  
 Located in `extensions/core/load3d/conditional-lines/Lines2/`:
 
-| File | Description |
-|------|-------------|
-| ConditionalLineMaterial.js | Material for conditional line rendering |
-| ConditionalLineSegmentsGeometry.js | Geometry for conditional line segments |
+| File                               | Description                             |
+| ---------------------------------- | --------------------------------------- |
+| ConditionalLineMaterial.js         | Material for conditional line rendering |
+| ConditionalLineSegmentsGeometry.js | Geometry for conditional line segments  |
 
 ### ThreeJS Override Subdirectory
+
 Located in `extensions/core/load3d/threejsOverride/`:
 
-| File | Description |
-|------|-------------|
+| File                 | Description                                   |
+| -------------------- | --------------------------------------------- |
 | OverrideMTLLoader.js | Custom MTL loader with enhanced functionality |
 
 ## Extension Development
@@ -97,19 +99,19 @@ Extensions are registered using the `app.registerExtension()` method:
 
 ```javascript
 app.registerExtension({
-  name: "MyExtension",
-  
+  name: 'MyExtension',
+
   // Hook implementations
   async init() {
     // Implementation
   },
-  
+
   async beforeRegisterNodeDef(nodeType, nodeData, app) {
     // Implementation
   }
-  
+
   // Other hooks as needed
-});
+})
 ```
 
 ## Extension Hooks
@@ -151,18 +153,18 @@ nodeCreated
 
 ### Key Hooks
 
-| Hook | Description |
-|------|-------------|
-| `init` | Called after canvas creation but before nodes are added |
-| `setup` | Called after the application is fully set up and running |
-| `addCustomNodeDefs` | Called before nodes are registered with the graph |
-| `getCustomWidgets` | Allows extensions to add custom widgets |
-| `beforeRegisterNodeDef` | Allows extensions to modify nodes before registration |
-| `registerCustomNodes` | Allows extensions to register additional nodes |
-| `loadedGraphNode` | Called when a node is reloaded onto the graph |
-| `nodeCreated` | Called after a node's constructor |
-| `beforeConfigureGraph` | Called before a graph is configured |
-| `afterConfigureGraph` | Called after a graph is configured |
+| Hook                          | Description                                                |
+| ----------------------------- | ---------------------------------------------------------- |
+| `init`                        | Called after canvas creation but before nodes are added    |
+| `setup`                       | Called after the application is fully set up and running   |
+| `addCustomNodeDefs`           | Called before nodes are registered with the graph          |
+| `getCustomWidgets`            | Allows extensions to add custom widgets                    |
+| `beforeRegisterNodeDef`       | Allows extensions to modify nodes before registration      |
+| `registerCustomNodes`         | Allows extensions to register additional nodes             |
+| `loadedGraphNode`             | Called when a node is reloaded onto the graph              |
+| `nodeCreated`                 | Called after a node's constructor                          |
+| `beforeConfigureGraph`        | Called before a graph is configured                        |
+| `afterConfigureGraph`         | Called after a graph is configured                         |
 | `getSelectionToolboxCommands` | Allows extensions to add commands to the selection toolbox |
 
 For the complete list of available hooks and detailed descriptions, see the [ComfyExtension interface in comfy.ts](https://github.com/Comfy-Org/ComfyUI_frontend/blob/main/src/types/comfy.ts).
diff --git a/docs/extensions/development.md b/docs/extensions/development.md
index e988d1d453..23dc88ae6c 100644
--- a/docs/extensions/development.md
+++ b/docs/extensions/development.md
@@ -19,6 +19,7 @@
 ### How Extensions Load
 
 **Backend Flow (Python Custom Nodes):**
+
 1. ComfyUI server starts → scans `/custom_nodes/` directories
 2. Loads Python modules (e.g., `/custom_nodes/ComfyUI-Impact-Pack/__init__.py`)
 3. Python code registers new node types with the server
@@ -27,12 +28,14 @@
 
 **Frontend Flow (JavaScript):**
 
-*Core Extensions (always available):*
+_Core Extensions (always available):_
+
 1. Built directly into the frontend bundle at `/src/extensions/core/`
 2. Loaded immediately when the frontend starts
 3. No network requests needed - they're part of the compiled code
 
-*Custom Node JavaScript (loaded dynamically):*
+_Custom Node JavaScript (loaded dynamically):_
+
 1. Frontend starts → calls `/extensions` API
 2. Server responds with list of JavaScript files from:
    - `/web/extensions/*.js` (legacy location)
@@ -42,6 +45,7 @@
 5. These registered hooks enhance the UI for their associated Python nodes
 
 **The Key Distinction:**
+
 - **Python nodes** = Backend processing (what shows in your node menu)
 - **JavaScript extensions** = Frontend enhancements (how nodes look/behave in the UI)
 - A custom node package can have both, just Python, or (rarely) just JavaScript
@@ -58,6 +62,7 @@ ComfyUI migrated to TypeScript and Vite, but thousands of extensions rely on the
 
 **Production Build:**
 During production build, a custom Vite plugin:
+
 - Binds all module exports to `window.comfyAPI`
 - Generates shim files that re-export from this global object
 
@@ -73,6 +78,7 @@ import { api } from '/scripts/api.js'
 ```
 
 **Why Dev Server Can't Support This:**
+
 - The dev server serves raw source files without bundling
 - Vite refuses to transform node_modules in unbundled mode
 - Creating real-time shims would require intercepting every module request
@@ -81,6 +87,7 @@ import { api } from '/scripts/api.js'
 ### The Trade-off
 
 This was the least friction approach:
+
 - ✅ Extensions work in production without changes
 - ✅ Developers get modern tooling (TypeScript, hot reload)
 - ❌ Extension testing requires production build or workarounds
@@ -104,11 +111,13 @@ The alternative would have been breaking all existing extensions or staying with
 ### Option 2: Use Production Build
 
 Build the frontend for full functionality:
+
 ```bash
 pnpm build
 ```
 
 For faster iteration during development, use watch mode:
+
 ```bash
 pnpm exec vite build --watch
 ```
@@ -118,6 +127,7 @@ Note: Watch mode provides faster rebuilds than full builds, but still no hot rel
 ### Option 3: Test Against Cloud/Staging
 
 For cloud extensions, modify `.env`:
+
 ```
 DEV_SERVER_COMFYUI_URL=http://stagingcloud.comfy.org/
 ```
@@ -133,4 +143,4 @@ DEV_SERVER_COMFYUI_URL=http://stagingcloud.comfy.org/
 
 - [Core Extensions Architecture](./core.md) - Complete list of core extensions and development guidelines
 - [JavaScript Extension Hooks](https://docs.comfy.org/custom-nodes/js/javascript_hooks) - Official documentation on extension hooks
-- [ComfyExtension Interface](../../src/types/comfy.ts) - TypeScript interface defining all extension capabilities
\ No newline at end of file
+- [ComfyExtension Interface](../../src/types/comfy.ts) - TypeScript interface defining all extension capabilities
diff --git a/docs/guidance/playwright.md b/docs/guidance/playwright.md
new file mode 100644
index 0000000000..9e30a1e3a5
--- /dev/null
+++ b/docs/guidance/playwright.md
@@ -0,0 +1,95 @@
+---
+globs:
+  - '**/*.spec.ts'
+---
+
+# Playwright E2E Test Conventions
+
+See `docs/testing/*.md` for detailed patterns.
+
+## Best Practices
+
+- Follow [Playwright Best Practices](https://playwright.dev/docs/best-practices)
+- Do NOT use `waitForTimeout` - use Locator actions and retrying assertions
+- Prefer specific selectors (role, label, test-id)
+- Test across viewports
+
+## Window Globals
+
+Browser tests access `window.app`, `window.graph`, and `window.LiteGraph` which are
+optional in the main app types. In E2E tests, use non-null assertions (`!`):
+
+```typescript
+window.app!.graph!.nodes
+window.LiteGraph!.registered_node_types
+```
+
+This is the **only context** where non-null assertions are acceptable.
+
+**TODO:** Consolidate these references into a central utility (e.g., `getApp()`) that
+performs proper runtime type checking, removing the need for scattered `!` assertions.
+
+## Type Assertions in E2E Tests
+
+E2E tests may use **specific** type assertions when needed, but **never** `as any`.
+
+### Acceptable Patterns
+
+```typescript
+// ✅ Non-null assertions for window globals
+window.app!.extensionManager
+
+// ✅ Specific type assertions with documentation
+// Extensions can register arbitrary setting IDs
+id: 'TestSetting' as TestSettingId
+
+// ✅ Test-local type helpers
+type TestSettingId = keyof Settings
+```
+
+### Forbidden Patterns
+
+```typescript
+// ❌ Never use `as any`
+settings: testData as any
+
+// ❌ Never modify production types to satisfy test errors
+// Don't add test settings to src/schemas/apiSchema.ts
+
+// ❌ Don't chain through unknown to bypass types
+data as unknown as SomeType // Avoid; prefer `as Partial<SomeType> as SomeType` or explicit typings
+```
+
+### Accessing Internal State
+
+When tests need internal store properties (e.g., `.workflow`, `.focusMode`):
+
+```typescript
+// ✅ Access stores directly in page.evaluate
+await page.evaluate(() => {
+  const store = useWorkflowStore()
+  return store.activeWorkflow
+})
+
+// ❌ Don't change public API types to expose internals
+// Keep app.extensionManager typed as ExtensionManager, not WorkspaceStore
+```
+
+## Test Tags
+
+Tags are respected by config:
+
+- `@mobile` - Mobile viewport tests
+- `@2x` - High DPI tests
+
+## Test Data
+
+- Check `browser_tests/assets/` for test data and fixtures
+- Use realistic ComfyUI workflows for E2E tests
+
+## Running Tests
+
+```bash
+pnpm test:browser:local                 # Run all E2E tests
+pnpm test:browser:local -- --ui         # Interactive UI mode
+```
diff --git a/docs/guidance/storybook.md b/docs/guidance/storybook.md
new file mode 100644
index 0000000000..d1672077a9
--- /dev/null
+++ b/docs/guidance/storybook.md
@@ -0,0 +1,59 @@
+---
+globs:
+  - '**/*.stories.ts'
+---
+
+# Storybook Conventions
+
+## File Placement
+
+Place `*.stories.ts` files alongside their components:
+
+```
+src/components/MyComponent/
+├── MyComponent.vue
+└── MyComponent.stories.ts
+```
+
+## Story Structure
+
+```typescript
+import type { Meta, StoryObj } from '@storybook/vue3'
+import ComponentName from './ComponentName.vue'
+
+const meta: Meta<typeof ComponentName> = {
+  title: 'Category/ComponentName',
+  component: ComponentName,
+  parameters: { layout: 'centered' }
+}
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const Default: Story = {
+  args: {
+    /* props */
+  }
+}
+```
+
+## Required Story Variants
+
+Include when applicable:
+
+- **Default** - Minimal props
+- **WithData** - Realistic data
+- **Loading** - Loading state
+- **Error** - Error state
+- **Empty** - No data
+
+## Mock Data
+
+Use realistic ComfyUI schemas for mocks (node definitions, components).
+
+## Running Storybook
+
+```bash
+pnpm storybook        # Development server
+pnpm build-storybook  # Production build
+```
diff --git a/docs/guidance/typescript.md b/docs/guidance/typescript.md
new file mode 100644
index 0000000000..56b718a54b
--- /dev/null
+++ b/docs/guidance/typescript.md
@@ -0,0 +1,78 @@
+---
+globs:
+  - '**/*.ts'
+  - '**/*.tsx'
+  - '**/*.vue'
+---
+
+# TypeScript Conventions
+
+## Type Safety
+
+- Never use `any` type - use proper TypeScript types
+- Never use `as any` type assertions - fix the underlying type issue
+- Type assertions are a last resort; they lead to brittle code
+- Avoid `@ts-expect-error` - fix the underlying issue instead
+
+### Type Assertion Hierarchy
+
+When you must handle uncertain types, prefer these approaches in order:
+
+1. ✅ **No assertion** — Properly typed from the start
+2. ✅ **Type narrowing** — `if ('prop' in obj)` or type guards
+3. ⚠️ **Specific assertion** — `as SpecificType` when you truly know the type
+4. ⚠️ **`unknown` with narrowing** — For genuinely unknown data
+5. ❌ **`as any`** — FORBIDDEN
+
+### Zod Schema Rules
+
+- Never use `z.any()` — it disables validation and propagates `any` into types
+- Use `z.unknown()` if the type is genuinely unknown, then narrow it
+- Never add test-only settings/types to production schemas
+
+### Public API Contracts
+
+- Keep public API types stable (e.g., `ExtensionManager` interface)
+- Don't expose internal implementation types (e.g., Pinia store internals)
+- Reactive refs (`ComputedRef<T>`) should be unwrapped before exposing
+
+## Avoiding Circular Dependencies
+
+Extract type guards and their associated interfaces into **leaf modules** — files with only `import type` statements. This keeps them safe to import from anywhere without pulling in heavy transitive dependencies.
+
+```typescript
+// ✅ myTypes.ts — leaf module (only type imports)
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+
+export interface MyView extends IBaseWidget {
+  /* ... */
+}
+export function isMyView(w: IBaseWidget): w is MyView {
+  return 'myProp' in w
+}
+
+// ❌ myView.ts — heavy module (runtime imports from stores, utils, etc.)
+//    Importing the type guard from here drags in the entire dependency tree.
+```
+
+## Utility Libraries
+
+- Use `es-toolkit` for utility functions (not lodash)
+
+## API Utilities
+
+When making API calls in `src/`:
+
+```typescript
+// ✅ Correct - use api helpers
+const response = await api.get(api.apiURL('/prompt'))
+const template = await fetch(api.fileURL('/templates/default.json'))
+
+// ❌ Wrong - direct URL construction
+const response = await fetch('/api/prompt')
+```
+
+## Security
+
+- Sanitize HTML with `DOMPurify.sanitize()`
+- Never log secrets or sensitive data
diff --git a/docs/guidance/vitest.md b/docs/guidance/vitest.md
new file mode 100644
index 0000000000..90fe19673b
--- /dev/null
+++ b/docs/guidance/vitest.md
@@ -0,0 +1,36 @@
+---
+globs:
+  - '**/*.test.ts'
+---
+
+# Vitest Unit Test Conventions
+
+See `docs/testing/*.md` for detailed patterns.
+
+## Test Quality
+
+- Do not write change detector tests (tests that just assert defaults)
+- Do not write tests dependent on non-behavioral features (styles, classes)
+- Do not write tests that just test mocks - ensure real code is exercised
+- Be parsimonious; avoid redundant tests
+
+## Mocking
+
+- Use Vitest's mocking utilities (`vi.mock`, `vi.spyOn`)
+- Keep module mocks contained - no global mutable state
+- Use `vi.hoisted()` for per-test mock manipulation
+- Don't mock what you don't own
+
+## Component Testing
+
+- Use Vue Test Utils for component tests
+- Follow advice about making components easy to test
+- Wait for reactivity with `await nextTick()` after state changes
+
+## Running Tests
+
+```bash
+pnpm test:unit                    # Run all unit tests
+pnpm test:unit -- path/to/file    # Run specific test
+pnpm test:unit -- --watch         # Watch mode
+```
diff --git a/docs/guidance/vue-components.md b/docs/guidance/vue-components.md
new file mode 100644
index 0000000000..78dd931596
--- /dev/null
+++ b/docs/guidance/vue-components.md
@@ -0,0 +1,50 @@
+---
+globs:
+  - '**/*.vue'
+---
+
+# Vue Component Conventions
+
+Applies to all `.vue` files anywhere in the codebase.
+
+## Vue 3 Composition API
+
+- Use `<script setup lang="ts">` for component logic
+- Destructure props (Vue 3.5 style with defaults) like `const { color = 'blue' } = defineProps<...>()`
+- Use `ref`/`reactive` for state
+- Use `computed()` for derived state
+- Use lifecycle hooks: `onMounted`, `onUpdated`, etc.
+
+## Component Communication
+
+- Prefer `emit/@event-name` for state changes (promotes loose coupling)
+- Use `defineExpose` only for imperative operations (`form.validate()`, `modal.open()`)
+- Proper props and emits definitions
+
+## VueUse Composables
+
+Prefer VueUse composables over manual event handling:
+
+- `useElementHover` instead of manual mouseover/mouseout listeners
+- `useIntersectionObserver` for visibility detection instead of scroll handlers
+- `useFocusTrap` for modal/dialog focus management
+- `useEventListener` for auto-cleanup event listeners
+
+Prefer Vue native options when available:
+
+- `defineModel` instead of `useVModel` for two-way binding with props
+
+## Styling
+
+- Use inline Tailwind CSS only (no `<style>` blocks)
+- Use `cn()` from `@/utils/tailwindUtil` for conditional classes
+- Refer to packages/design-system/src/css/style.css for design tokens and tailwind configuration
+- Exception: when third-party libraries render runtime DOM outside Vue templates
+  (for example xterm internals inside PrimeVue terminal wrappers), scoped
+  `:deep()` selectors are allowed. Add a brief inline comment explaining why the
+  exception is required.
+
+## Best Practices
+
+- Extract complex conditionals to `computed`
+- In unmounted hooks, implement cleanup for async operations
diff --git a/tests-ui/README.md b/docs/testing/README.md
similarity index 66%
rename from tests-ui/README.md
rename to docs/testing/README.md
index bbb247b914..d4f7145fe9 100644
--- a/tests-ui/README.md
+++ b/docs/testing/README.md
@@ -12,12 +12,17 @@ Documentation for unit tests is organized into three guides:
 
 ## Testing Structure
 
-The ComfyUI Frontend project uses a mixed approach to unit test organization:
+The ComfyUI Frontend project uses **colocated tests** - test files are placed alongside their source files:
 
-- **Component Tests**: Located directly alongside their components with a `.spec.ts` extension
-- **Unit Tests**: Located in the `tests-ui/tests/` directory
-- **Store Tests**: Located in the `tests-ui/tests/store/` directory
-- **Browser Tests**: These are located in the `browser_tests/` directory. There is a dedicated README in the `browser_tests/` directory, so it will not be covered here.
+- **Component Tests**: Located directly alongside their components (e.g., `MyComponent.test.ts` next to `MyComponent.vue`)
+- **Unit Tests**: Located alongside their source files (e.g., `myUtil.test.ts` next to `myUtil.ts`)
+- **Store Tests**: Located in `src/stores/` alongside their store files
+- **Browser Tests**: Located in the `browser_tests/` directory (see dedicated README there)
+
+### Test File Naming
+
+- Use `.test.ts` extension for test files
+- Name tests after their source file: `sourceFile.test.ts`
 
 ## Test Frameworks and Libraries
 
@@ -35,8 +40,11 @@ To run the tests locally:
 # Run unit tests
 pnpm test:unit
 
-# Run unit tests in watch mode  
+# Run a specific test file
+pnpm test:unit -- src/path/to/file.test.ts
+
+# Run unit tests in watch mode
 pnpm test:unit -- --watch
 ```
 
-Refer to the specific guides for more detailed information on each testing type.
\ No newline at end of file
+Refer to the specific guides for more detailed information on each testing type.
diff --git a/tests-ui/component-testing.md b/docs/testing/component-testing.md
similarity index 97%
rename from tests-ui/component-testing.md
rename to docs/testing/component-testing.md
index c5092e4007..2caa15a770 100644
--- a/tests-ui/component-testing.md
+++ b/docs/testing/component-testing.md
@@ -79,7 +79,7 @@ describe('ColorCustomizationSelector', () => {
       }
     })
   }
-  
+
   it('initializes with predefined color when provided', async () => {
     const wrapper = mountComponent({
       modelValue: '#0d6efd'
@@ -109,16 +109,16 @@ describe('SidebarIcon with tooltip', () => {
   it('shows tooltip on hover', async () => {
     const tooltipShowDelay = 300
     const tooltipText = 'Settings'
-    
+
     const wrapper = mount(SidebarIcon, {
       global: {
         plugins: [PrimeVue],
         directives: { tooltip: Tooltip }
       },
-      props: { 
+      props: {
         icon: 'pi pi-cog',
         selected: false,
-        tooltip: tooltipText 
+        tooltip: tooltipText
       }
     })
 
@@ -137,13 +137,13 @@ describe('SidebarIcon with tooltip', () => {
         plugins: [PrimeVue],
         directives: { tooltip: Tooltip }
       },
-      props: { 
-        icon: 'pi pi-cog', 
+      props: {
+        icon: 'pi pi-cog',
         selected: false,
-        tooltip: tooltipText 
+        tooltip: tooltipText
       }
     })
-    
+
     expect(wrapper.attributes('aria-label')).toEqual(tooltipText)
   })
 })
@@ -196,10 +196,10 @@ describe('EditableText', () => {
 
     // Initially in view mode
     expect(wrapper.find('input').exists()).toBe(false)
-    
+
     // Click to edit
     await wrapper.find('.editable-text').trigger('click')
-    
+
     // Should switch to edit mode
     expect(wrapper.find('input').exists()).toBe(true)
     expect(wrapper.find('input').element.value).toBe('Initial Text')
@@ -215,17 +215,17 @@ describe('EditableText', () => {
 
     // Switch to edit mode
     await wrapper.find('.editable-text').trigger('click')
-    
+
     // Change input value
     const input = wrapper.find('input')
     await input.setValue('New Text')
-    
+
     // Press enter to save
     await input.trigger('keydown.enter')
-    
+
     // Check if event was emitted with new value
     expect(wrapper.emitted('update:modelValue')[0]).toEqual(['New Text'])
-    
+
     // Should switch back to view mode
     expect(wrapper.find('input').exists()).toBe(false)
   })
@@ -247,17 +247,17 @@ it('shows dropdown options when clicked', async () => {
       selectedVersion: '1.1.0'
     }
   })
-  
+
   // Initially dropdown should be hidden
   expect(wrapper.find('.p-dropdown-panel').isVisible()).toBe(false)
-  
+
   // Click dropdown
   await wrapper.find('.p-dropdown').trigger('click')
   await nextTick() // Wait for Vue to update the DOM
-  
+
   // Dropdown should be visible now
   expect(wrapper.find('.p-dropdown-panel').isVisible()).toBe(true)
-  
+
   // Options should match the provided versions
   const options = wrapper.findAll('.p-dropdown-item')
   expect(options.length).toBe(3)
@@ -286,7 +286,7 @@ const waitForPromises = async () => {
 
 it('fetches versions on mount', async () => {
   mockGetPackVersions.mockResolvedValueOnce(defaultMockVersions)
-  
+
   mountComponent()
   await waitForPromises() // Wait for async operations and reactivity
 
@@ -302,13 +302,14 @@ When components use `onMounted` or other lifecycle hooks with async operations:
 it('shows loading state while fetching versions', async () => {
   // Delay the promise resolution
   mockGetPackVersions.mockImplementationOnce(
-    () => new Promise((resolve) => 
-      setTimeout(() => resolve(defaultMockVersions), 1000)
-    )
+    () =>
+      new Promise((resolve) =>
+        setTimeout(() => resolve(defaultMockVersions), 1000)
+      )
   )
 
   const wrapper = mountComponent()
-  
+
   // Check loading state before promises resolve
   expect(wrapper.text()).toContain('Loading versions...')
 })
@@ -347,13 +348,13 @@ Testing components with computed properties that depend on async data:
 ```typescript
 it('displays special options and version options in the listbox', async () => {
   mockGetPackVersions.mockResolvedValueOnce(defaultMockVersions)
-  
+
   const wrapper = mountComponent()
   await waitForPromises() // Wait for data fetching and computed property updates
-  
+
   const listbox = wrapper.findComponent(Listbox)
   const options = listbox.props('options')!
-  
+
   // Now options should be populated through computed properties
   expect(options.length).toBe(defaultMockVersions.length + 2)
 })
@@ -367,4 +368,4 @@ it('displays special options and version options in the listbox', async () => {
 4. **PrimeVue components**: PrimeVue components often have their own internal state and reactivity that needs time to update
 5. **Computed properties depending on async data**: Always ensure async data is loaded before testing computed properties
 
-By using the `waitForPromises` helper and being mindful of these patterns, you can write more robust tests for components with complex reactivity.
\ No newline at end of file
+By using the `waitForPromises` helper and being mindful of these patterns, you can write more robust tests for components with complex reactivity.
diff --git a/tests-ui/store-testing.md b/docs/testing/store-testing.md
similarity index 95%
rename from tests-ui/store-testing.md
rename to docs/testing/store-testing.md
index f9cac42e83..9b736fa36d 100644
--- a/tests-ui/store-testing.md
+++ b/docs/testing/store-testing.md
@@ -18,7 +18,8 @@ Basic setup for testing Pinia stores:
 
 ```typescript
 // Example from: tests-ui/tests/store/workflowStore.test.ts
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { useWorkflowStore } from '@/domains/workflow/ui/stores/workflowStore'
@@ -27,12 +28,12 @@ describe('useWorkflowStore', () => {
   let store: ReturnType<typeof useWorkflowStore>
 
   beforeEach(() => {
-    // Create a fresh pinia and activate it for each test
-    setActivePinia(createPinia())
-    
+    // Create a fresh testing pinia and activate it for each test
+    setActivePinia(createTestingPinia({ stubActions: false }))
+
     // Initialize the store
     store = useWorkflowStore()
-    
+
     // Clear any mocks
     vi.clearAllMocks()
   })
@@ -119,18 +120,21 @@ describe('getters', () => {
   beforeEach(() => {
     setActivePinia(createPinia())
     store = useModelStore()
-    
+
     // Set up test data
     store.models = {
       checkpoints: [
-        { name: 'model1.safetensors', path: 'models/checkpoints/model1.safetensors' },
+        {
+          name: 'model1.safetensors',
+          path: 'models/checkpoints/model1.safetensors'
+        },
         { name: 'model2.ckpt', path: 'models/checkpoints/model2.ckpt' }
       ],
       loras: [
         { name: 'lora1.safetensors', path: 'models/loras/lora1.safetensors' }
       ]
     }
-    
+
     // Mock API
     vi.mocked(api.getModelInfo).mockImplementation(async (modelName) => {
       if (modelName.includes('model1')) {
@@ -277,4 +281,4 @@ describe('renameWorkflow', () => {
     expect(bookmarkStore.isBookmarked('workflows/dir/test.json')).toBe(false)
   })
 })
-```
\ No newline at end of file
+```
diff --git a/tests-ui/unit-testing.md b/docs/testing/unit-testing.md
similarity index 70%
rename from tests-ui/unit-testing.md
rename to docs/testing/unit-testing.md
index 5117b860f3..9be403659a 100644
--- a/tests-ui/unit-testing.md
+++ b/docs/testing/unit-testing.md
@@ -11,7 +11,7 @@ This guide covers patterns and examples for unit testing utilities, composables,
 5. [Mocking Utility Functions](#mocking-utility-functions)
 6. [Testing with Debounce and Throttle](#testing-with-debounce-and-throttle)
 7. [Mocking Node Definitions](#mocking-node-definitions)
-
+8. [Mocking Composables with Reactive State](#mocking-composables-with-reactive-state)
 
 ## Testing Vue Composables with Reactivity
 
@@ -37,16 +37,18 @@ describe('useServerLogs', () => {
 
     // Simulate log event handler being called
     const mockHandler = vi.mocked(useEventListener).mock.calls[0][2]
-    mockHandler(new CustomEvent('logs', {
-      detail: {
-        type: 'logs',
-        entries: [{ m: 'Log message' }]
-      }
-    }))
-    
+    mockHandler(
+      new CustomEvent('logs', {
+        detail: {
+          type: 'logs',
+          entries: [{ m: 'Log message' }]
+        }
+      })
+    )
+
     // Must wait for Vue reactivity to update
     await nextTick()
-    
+
     expect(logs.value).toEqual(['Log message'])
   })
 })
@@ -72,12 +74,12 @@ describe('LGraph', () => {
   it('should serialize graph nodes', async () => {
     // Register node type
     LiteGraph.registerNodeType('dummy', DummyNode)
-    
+
     // Create graph with nodes
     const graph = new LGraph()
     const node = new DummyNode()
     graph.add(node)
-    
+
     // Test serialization
     const result = graph.serialize()
     expect(result.nodes).toHaveLength(1)
@@ -99,18 +101,18 @@ import { defaultGraph } from '@/scripts/defaultGraph'
 describe('workflow validation', () => {
   it('should validate default workflow', async () => {
     const validWorkflow = JSON.parse(JSON.stringify(defaultGraph))
-    
+
     // Validate workflow
     const result = await validateComfyWorkflow(validWorkflow)
     expect(result).not.toBeNull()
   })
-  
+
   it('should handle position format conversion', async () => {
     const workflow = JSON.parse(JSON.stringify(defaultGraph))
-    
+
     // Legacy position format as object
     workflow.nodes[0].pos = { '0': 100, '1': 200 }
-    
+
     // Should convert to array format
     const result = await validateComfyWorkflow(workflow)
     expect(result.nodes[0].pos).toEqual([100, 200])
@@ -139,7 +141,7 @@ vi.mock('@/scripts/api', () => ({
 it('should subscribe to logs API', () => {
   // Call function that uses the API
   startListening()
-  
+
   // Verify API was called correctly
   expect(api.subscribeLogs).toHaveBeenCalledWith(true)
 })
@@ -167,9 +169,9 @@ describe('Function using debounce', () => {
   it('calls debounced function immediately in tests', () => {
     const mockFn = vi.fn()
     const debouncedFn = debounce(mockFn, 1000)
-    
+
     debouncedFn()
-    
+
     // No need to wait - our mock makes it execute immediately
     expect(mockFn).toHaveBeenCalled()
   })
@@ -190,25 +192,25 @@ describe('debounced function', () => {
   })
 
   afterEach(() => {
-    vi.useRealTimers() 
+    vi.useRealTimers()
   })
 
   it('should debounce function calls', () => {
     const mockFn = vi.fn()
     const debouncedFn = debounce(mockFn, 1000)
-    
+
     // Call multiple times
     debouncedFn()
     debouncedFn()
     debouncedFn()
-    
+
     // Function not called yet (debounced)
     expect(mockFn).not.toHaveBeenCalled()
-    
+
     // Advance time just before debounce period
     vi.advanceTimersByTime(999)
     expect(mockFn).not.toHaveBeenCalled()
-    
+
     // Advance to debounce completion
     vi.advanceTimersByTime(1)
     expect(mockFn).toHaveBeenCalledTimes(1)
@@ -223,7 +225,10 @@ Creating mock node definitions for testing:
 ```typescript
 // Example from: tests-ui/tests/apiTypes.test.ts
 import { describe, expect, it } from 'vitest'
-import { type ComfyNodeDef, validateComfyNodeDef } from '@/schemas/nodeDefSchema'
+import {
+  type ComfyNodeDef,
+  validateComfyNodeDef
+} from '@/schemas/nodeDefSchema'
 
 // Create a complete mock node definition
 const EXAMPLE_NODE_DEF: ComfyNodeDef = {
@@ -248,4 +253,80 @@ const EXAMPLE_NODE_DEF: ComfyNodeDef = {
 it('should validate node definition', () => {
   expect(validateComfyNodeDef(EXAMPLE_NODE_DEF)).not.toBeNull()
 })
-```
\ No newline at end of file
+```
+
+## Mocking Composables with Reactive State
+
+When mocking composables that return reactive refs, define the mock implementation inline in `vi.mock()`'s factory function. This ensures stable singleton instances across all test invocations.
+
+### Rules
+
+1. **Define mocks in the factory function** — Create `vi.fn()` and `ref()` instances directly inside `vi.mock()`, not in `beforeEach`
+2. **Use singleton pattern** — The factory runs once; all calls to the composable return the same mock object
+3. **Access mocks per-test** — Call the composable directly in each test to get the singleton instance rather than storing in a shared variable
+4. **Wrap in `vi.mocked()` for type safety** — Use `vi.mocked(service.method).mockResolvedValue(...)` when configuring
+5. **Rely on `vi.resetAllMocks()`** — Resets call counts without recreating instances; ref values may need manual reset if mutated
+
+### Pattern
+
+```typescript
+// Example from: src/platform/updates/common/releaseStore.test.ts
+import { ref } from 'vue'
+
+vi.mock('@/path/to/composable', () => {
+  const doSomething = vi.fn()
+  const isLoading = ref(false)
+  const error = ref<string | null>(null)
+  return {
+    useMyComposable: () => ({
+      doSomething,
+      isLoading,
+      error
+    })
+  }
+})
+
+describe('MyStore', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('should call the composable method', async () => {
+    const service = useMyComposable()
+    vi.mocked(service.doSomething).mockResolvedValue({ data: 'test' })
+
+    await store.initialize()
+
+    expect(service.doSomething).toHaveBeenCalledWith(expectedArgs)
+  })
+
+  it('should handle errors from the composable', async () => {
+    const service = useMyComposable()
+    vi.mocked(service.doSomething).mockResolvedValue(null)
+    service.error.value = 'Something went wrong'
+
+    await store.initialize()
+
+    expect(store.error).toBe('Something went wrong')
+  })
+})
+```
+
+### Anti-patterns
+
+```typescript
+// ❌ Don't configure mock return values in beforeEach with shared variable
+let mockService: { doSomething: Mock }
+beforeEach(() => {
+  mockService = { doSomething: vi.fn() }
+  vi.mocked(useMyComposable).mockReturnValue(mockService)
+})
+
+// ❌ Don't auto-mock then override — reactive refs won't work correctly
+vi.mock('@/path/to/composable')
+vi.mocked(useMyComposable).mockReturnValue({ isLoading: ref(false) })
+```
+
+```
+
+```
diff --git a/docs/testing/vitest-patterns.md b/docs/testing/vitest-patterns.md
new file mode 100644
index 0000000000..8ced7d9036
--- /dev/null
+++ b/docs/testing/vitest-patterns.md
@@ -0,0 +1,142 @@
+---
+globs:
+  - '**/*.test.ts'
+  - '**/*.spec.ts'
+---
+
+# Vitest Patterns
+
+## Setup
+
+Use `createTestingPinia` from `@pinia/testing`, not `createPinia`:
+
+```typescript
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+describe('MyStore', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    vi.useFakeTimers()
+    vi.resetAllMocks()
+  })
+
+  afterEach(() => {
+    vi.useRealTimers()
+  })
+})
+```
+
+**Why `stubActions: false`?** By default, testing pinia stubs all actions. Set to `false` when testing actual store behavior.
+
+## i18n in Component Tests
+
+Use real `createI18n` with empty messages instead of mocking `vue-i18n`. See `SearchBox.test.ts` for example.
+
+## Mock Patterns
+
+### Reset all mocks at once
+
+```typescript
+beforeEach(() => {
+  vi.resetAllMocks() // Not individual mock.mockReset() calls
+})
+```
+
+### Module mocks with vi.mock()
+
+```typescript
+vi.mock('@/scripts/api', () => ({
+  api: {
+    addEventListener: vi.fn(),
+    fetchData: vi.fn()
+  }
+}))
+
+vi.mock('@/services/myService', () => ({
+  myService: {
+    doThing: vi.fn()
+  }
+}))
+```
+
+### Configure mocks in tests
+
+```typescript
+import { api } from '@/scripts/api'
+import { myService } from '@/services/myService'
+
+it('handles success', () => {
+  vi.mocked(myService.doThing).mockResolvedValue({ data: 'test' })
+  // ... test code
+})
+```
+
+## Testing Event Listeners
+
+When a store registers event listeners at module load time:
+
+```typescript
+function getEventHandler() {
+  const call = vi
+    .mocked(api.addEventListener)
+    .mock.calls.find(([event]) => event === 'my_event')
+  return call?.[1] as (e: CustomEvent<MyEventType>) => void
+}
+
+function dispatch(data: MyEventType) {
+  const handler = getEventHandler()
+  handler(new CustomEvent('my_event', { detail: data }))
+}
+
+it('handles events', () => {
+  const store = useMyStore()
+  dispatch({ field: 'value' })
+  expect(store.items).toHaveLength(1)
+})
+```
+
+## Testing with Fake Timers
+
+For stores with intervals, timeouts, or polling:
+
+```typescript
+beforeEach(() => {
+  vi.useFakeTimers()
+})
+
+afterEach(() => {
+  vi.useRealTimers()
+})
+
+it('polls after delay', async () => {
+  const store = useMyStore()
+  store.startPolling()
+
+  await vi.advanceTimersByTimeAsync(30000)
+
+  expect(mockService.fetch).toHaveBeenCalled()
+})
+```
+
+## Assertion Style
+
+Prefer `.toHaveLength()` over `.length.toBe()`:
+
+```typescript
+// Good
+expect(store.items).toHaveLength(1)
+
+// Avoid
+expect(store.items.length).toBe(1)
+```
+
+Use `.toMatchObject()` for partial matching:
+
+```typescript
+expect(store.completedItems[0]).toMatchObject({
+  id: 'task-123',
+  status: 'done'
+})
+```
diff --git a/eslint.config.ts b/eslint.config.ts
index 1e3dbf644e..f59be99063 100644
--- a/eslint.config.ts
+++ b/eslint.config.ts
@@ -1,12 +1,11 @@
 // For more info, see https://github.com/storybookjs/eslint-plugin-storybook#configuration-flat-config-format
 import pluginJs from '@eslint/js'
 import pluginI18n from '@intlify/eslint-plugin-vue-i18n'
+import betterTailwindcss from 'eslint-plugin-better-tailwindcss'
 import { createTypeScriptImportResolver } from 'eslint-import-resolver-typescript'
 import { importX } from 'eslint-plugin-import-x'
 import oxlint from 'eslint-plugin-oxlint'
-// WORKAROUND: eslint-plugin-prettier causes segfault on Node.js 24 + Windows
-// See: https://github.com/nodejs/node/issues/58690
-// Prettier is still run separately in lint-staged, so this is safe to disable
+// eslint-config-prettier disables ESLint rules that conflict with formatters (oxfmt)
 import eslintConfigPrettier from 'eslint-config-prettier'
 import { configs as storybookConfigs } from 'eslint-plugin-storybook'
 import unusedImports from 'eslint-plugin-unused-imports'
@@ -24,7 +23,9 @@ const extraFileExtensions = ['.vue']
 
 const commonGlobals = {
   ...globals.browser,
-  __COMFYUI_FRONTEND_VERSION__: 'readonly'
+  __COMFYUI_FRONTEND_VERSION__: 'readonly',
+  __DISTRIBUTION__: 'readonly',
+  __IS_NIGHTLY__: 'readonly'
 } as const
 
 const settings = {
@@ -77,6 +78,7 @@ export default defineConfig([
       'src/scripts/*',
       'src/types/generatedManagerTypes.ts',
       'src/types/vue-shim.d.ts',
+      'packages/design-system/src/css/lucideStrokePlugin.js',
       'test-results/*',
       'vitest.setup.ts'
     ]
@@ -111,7 +113,26 @@ export default defineConfig([
   tseslintConfigs.recommended,
   // Difference in typecheck on CI vs Local
   pluginVue.configs['flat/recommended'],
-  // Use eslint-config-prettier instead of eslint-plugin-prettier to avoid Node 24 segfault
+  // Tailwind CSS v4 linting (class ordering, duplicates, conflicts, etc.)
+  betterTailwindcss.configs.recommended,
+  {
+    settings: {
+      'better-tailwindcss': {
+        entryPoint: 'packages/design-system/src/css/style.css'
+      }
+    },
+    rules: {
+      // Off: requires whitelisting non-Tailwind classes (PrimeIcons, custom CSS)
+      'better-tailwindcss/no-unknown-classes': 'off',
+      // Off: may conflict with oxfmt formatting
+      'better-tailwindcss/enforce-consistent-line-wrapping': 'off',
+      // Off: large batch change, enable and apply with `eslint --fix`
+      'better-tailwindcss/enforce-consistent-class-order': 'error',
+      'better-tailwindcss/enforce-canonical-classes': 'error',
+      'better-tailwindcss/no-deprecated-classes': 'error'
+    }
+  },
+  // Disables ESLint rules that conflict with formatters
   eslintConfigPrettier,
   // @ts-expect-error Type incompatibility between storybook plugin and ESLint config types
   storybookConfigs['flat/recommended'],
@@ -242,6 +263,20 @@ export default defineConfig([
       ]
     }
   },
+  {
+    files: ['**/*.test.ts'],
+    rules: {
+      'no-restricted-properties': [
+        'error',
+        {
+          object: 'vi',
+          property: 'doMock',
+          message:
+            'Use vi.mock() with vi.hoisted() instead of vi.doMock(). See docs/testing/vitest-patterns.md'
+        }
+      ]
+    }
+  },
   {
     files: ['scripts/**/*.js'],
     languageOptions: {
@@ -267,5 +302,46 @@ export default defineConfig([
       'import-x/no-duplicates': 'off',
       'import-x/consistent-type-specifier-style': 'off'
     }
+  },
+
+  // i18n import enforcement
+  // Vue components must use the useI18n() composable, not the global t/d/st/te
+  {
+    files: ['**/*.vue'],
+    rules: {
+      'no-restricted-imports': [
+        'error',
+        {
+          paths: [
+            {
+              name: '@/i18n',
+              importNames: ['t', 'd', 'te'],
+              message:
+                "In Vue components, use `const { t } = useI18n()` instead of importing from '@/i18n'."
+            }
+          ]
+        }
+      ]
+    }
+  },
+  // Non-composable .ts files must use the global t/d/te, not useI18n()
+  {
+    files: ['**/*.ts'],
+    ignores: ['**/use[A-Z]*.ts', '**/*.test.ts', 'src/i18n.ts'],
+    rules: {
+      'no-restricted-imports': [
+        'error',
+        {
+          paths: [
+            {
+              name: 'vue-i18n',
+              importNames: ['useI18n'],
+              message:
+                "useI18n() requires Vue setup context. Use `import { t } from '@/i18n'` instead."
+            }
+          ]
+        }
+      ]
+    }
   }
 ])
diff --git a/global.d.ts b/global.d.ts
index 7f7dd832f8..d655d8c6e2 100644
--- a/global.d.ts
+++ b/global.d.ts
@@ -5,9 +5,36 @@ declare const __ALGOLIA_APP_ID__: string
 declare const __ALGOLIA_API_KEY__: string
 declare const __USE_PROD_CONFIG__: boolean
 
+interface ImpactQueueFunction {
+  (...args: unknown[]): void
+  a?: unknown[][]
+}
+
+type GtagGetFieldName = 'client_id' | 'session_id' | 'session_number'
+
+interface GtagGetFieldValueMap {
+  client_id: string | number | undefined
+  session_id: string | number | undefined
+  session_number: string | number | undefined
+}
+
+interface GtagFunction {
+  <TField extends GtagGetFieldName>(
+    command: 'get',
+    targetId: string,
+    fieldName: TField,
+    callback: (value: GtagGetFieldValueMap[TField]) => void
+  ): void
+  (...args: unknown[]): void
+}
+
 interface Window {
   __CONFIG__: {
+    gtm_container_id?: string
+    ga_measurement_id?: string
     mixpanel_token?: string
+    posthog_project_token?: string
+    posthog_api_host?: string
     require_whitelist?: boolean
     subscription_required?: boolean
     max_upload_size?: number
@@ -30,6 +57,10 @@ interface Window {
       badge?: string
     }
   }
+  dataLayer?: Array<Record<string, unknown>>
+  gtag?: GtagFunction
+  ire_o?: string
+  ire?: ImpactQueueFunction
 }
 
 interface Navigator {
diff --git a/index.html b/index.html
index 0ce0b7e99c..afe368e39c 100644
--- a/index.html
+++ b/index.html
@@ -1,21 +1,59 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
-    <meta charset="UTF-8">
+    <meta charset="UTF-8" />
     <title>ComfyUI</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1.0, user-scalable=no"
+    />
     <link rel="stylesheet" type="text/css" href="materialdesignicons.min.css" />
-    
+
     <!-- Fullscreen mode on mobile browsers -->
-    <meta name="mobile-web-app-capable" content="yes">
+    <meta name="mobile-web-app-capable" content="yes" />
     <!-- Status bar style (eg. black or transparent) -->
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    
-    <link rel="manifest" href="manifest.json">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+    <style>
+      @media (prefers-color-scheme: dark) {
+        body {
+          /* Setting it early for background during load */
+          --bg-color: #202020;
+          --fg-color: #ffffff;
+        }
+      }
+      html,
+      body {
+        width: 100%;
+        height: 100%;
+        margin: 0;
+      }
+      body {
+        display: grid;
+        background-color: var(--bg-color);
+        background-image: var(--bg-img);
+        background-position: center;
+        background-size: cover;
+        background-repeat: no-repeat;
+      }
+      .visually-hidden {
+        position: absolute;
+        width: 1px;
+        height: 1px;
+        padding: 0;
+        margin: -1px;
+        overflow: hidden;
+        clip-path: inset(50%);
+        white-space: nowrap;
+        border: 0;
+      }
+    </style>
+    <link rel="manifest" href="manifest.json" />
   </head>
-  
+
   <body class="litegraph grid">
-    <div id="vue-app"></div>
+    <div id="vue-app">
+      <span class="visually-hidden" role="status">Loading ComfyUI...</span>
+    </div>
     <script type="module" src="src/main.ts"></script>
   </body>
 </html>
diff --git a/knip.config.ts b/knip.config.ts
index f2907a266f..7c3ae13ced 100644
--- a/knip.config.ts
+++ b/knip.config.ts
@@ -8,7 +8,8 @@ const config: KnipConfig = {
         'src/assets/css/style.css',
         'src/main.ts',
         'src/scripts/ui/menu/index.ts',
-        'src/types/index.ts'
+        'src/types/index.ts',
+        'src/storybook/mocks/**/*.ts'
       ],
       project: ['**/*.{js,ts,vue}', '*.{js,ts,mts}']
     },
@@ -19,10 +20,6 @@ const config: KnipConfig = {
     'packages/tailwind-utils': {
       project: ['src/**/*.{js,ts}']
     },
-    'packages/design-system': {
-      entry: ['src/**/*.ts'],
-      project: ['src/**/*.{js,ts}', '*.{js,ts,mts}']
-    },
     'packages/registry-types': {
       project: ['src/**/*.{js,ts}']
     }
@@ -30,6 +27,7 @@ const config: KnipConfig = {
   ignoreBinaries: ['python3', 'gh'],
   ignoreDependencies: [
     // Weird importmap things
+    '@iconify-json/lucide',
     '@iconify/json',
     '@primeuix/forms',
     '@primeuix/styled',
@@ -41,7 +39,15 @@ const config: KnipConfig = {
     'src/workbench/extensions/manager/types/generatedManagerTypes.ts',
     'packages/registry-types/src/comfyRegistryTypes.ts',
     // Used by a custom node (that should move off of this)
-    'src/scripts/ui/components/splitButton.ts'
+    'src/scripts/ui/components/splitButton.ts',
+    // Used by stacked PR (feat/glsl-live-preview)
+    'src/renderer/glsl/useGLSLRenderer.ts',
+    // Workflow files contain license names that knip misinterprets as binaries
+    '.github/workflows/ci-oss-assets-validation.yaml',
+    // Pending integration in stacked PR
+    'src/components/sidebar/tabs/nodeLibrary/CustomNodesPanel.vue',
+    // Agent review check config, not part of the build
+    '.agents/checks/eslint.strict.config.js'
   ],
   compilers: {
     // https://github.com/webpro-nl/knip/issues/1008#issuecomment-3207756199
@@ -66,7 +72,8 @@ const config: KnipConfig = {
   },
   tags: [
     '-knipIgnoreUnusedButUsedByCustomNodes',
-    '-knipIgnoreUnusedButUsedByVueNodesBranch'
+    '-knipIgnoreUnusedButUsedByVueNodesBranch',
+    '-knipIgnoreUsedByStackedPR'
   ]
 }
 
diff --git a/lint-staged.config.ts b/lint-staged.config.ts
index 89deaa4b0e..4af68e9aac 100644
--- a/lint-staged.config.ts
+++ b/lint-staged.config.ts
@@ -1,21 +1,43 @@
 import path from 'node:path'
 
 export default {
+  'tests-ui/**': () =>
+    'echo "Files in tests-ui/ are deprecated. Colocate tests with source files." && exit 1',
+
+  './**/*.{css,vue}': (stagedFiles: string[]) => {
+    const joinedPaths = toJoinedRelativePaths(stagedFiles)
+    return [`pnpm exec stylelint --allow-empty-input ${joinedPaths}`]
+  },
+
   './**/*.js': (stagedFiles: string[]) => formatAndEslint(stagedFiles),
 
-  './**/*.{ts,tsx,vue,mts}': (stagedFiles: string[]) => [
-    ...formatAndEslint(stagedFiles),
-    'pnpm typecheck'
-  ]
+  './**/*.{ts,tsx,vue,mts}': (stagedFiles: string[]) => {
+    const commands = [...formatAndEslint(stagedFiles), 'pnpm typecheck']
+
+    const hasBrowserTestsChanges = stagedFiles
+      .map((f) => path.relative(process.cwd(), f).replace(/\\/g, '/'))
+      .some((f) => f.startsWith('browser_tests/'))
+
+    if (hasBrowserTestsChanges) {
+      commands.push('pnpm typecheck:browser')
+    }
+
+    return commands
+  }
 }
 
 function formatAndEslint(fileNames: string[]) {
-  // Convert absolute paths to relative paths for better ESLint resolution
-  const relativePaths = fileNames.map((f) => path.relative(process.cwd(), f))
-  const joinedPaths = relativePaths.map((p) => `"${p}"`).join(' ')
+  const joinedPaths = toJoinedRelativePaths(fileNames)
   return [
-    `pnpm exec prettier --cache --write ${joinedPaths}`,
+    `pnpm exec oxfmt --write ${joinedPaths}`,
     `pnpm exec oxlint --fix ${joinedPaths}`,
     `pnpm exec eslint --cache --fix --no-warn-ignored ${joinedPaths}`
   ]
 }
+
+function toJoinedRelativePaths(fileNames: string[]) {
+  const relativePaths = fileNames.map((f) =>
+    path.relative(process.cwd(), f).replace(/\\/g, '/')
+  )
+  return relativePaths.map((p) => `"${p}"`).join(' ')
+}
diff --git a/manifest.json b/manifest.json
index d906b2e239..490bbfb6a4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,12 @@
   "short_name": "ComfyUI",
   "description": "ComfyUI: AI image generation platform",
   "start_url": "/",
-  "display": "standalone",
-  "background_color": "#ffffff",
-  "theme_color": "#000000"
+  "icons": [
+    {
+      "src": "/assets/images/comfy-logo-single.svg",
+      "sizes": "any",
+      "type": "image/svg+xml"
+    }
+  ],
+  "display": "standalone"
 }
diff --git a/package.json b/package.json
index 6dcf03f5b4..0fbc842125 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@comfyorg/comfyui-frontend",
+  "version": "1.41.13",
   "private": true,
-  "version": "1.37.3",
-  "type": "module",
-  "repository": "https://github.com/Comfy-Org/ComfyUI_frontend",
-  "homepage": "https://comfy.org",
   "description": "Official front-end implementation of ComfyUI",
+  "homepage": "https://comfy.org",
   "license": "GPL-3.0-only",
+  "repository": "https://github.com/Comfy-Org/ComfyUI_frontend",
+  "type": "module",
   "scripts": {
     "build:desktop": "nx build @comfyorg/desktop-ui",
     "build-storybook": "storybook build",
@@ -18,23 +18,21 @@
     "collect-i18n": "pnpm exec playwright test --config=playwright.i18n.config.ts",
     "dev:cloud": "cross-env DEV_SERVER_COMFYUI_URL='https://testcloud.comfy.org/' nx serve",
     "dev:desktop": "nx dev @comfyorg/desktop-ui",
-    "dev:electron": "nx serve --config vite.electron.config.mts",
+    "dev:electron": "cross-env DISTRIBUTION=desktop nx serve --config vite.electron.config.mts",
     "dev:no-vue": "cross-env DISABLE_VUE_PLUGINS=true nx serve",
     "dev": "nx serve",
     "devtools:pycheck": "python3 -m compileall -q tools/devtools",
-    "format:check:no-cache": "prettier --check './**/*.{js,ts,tsx,vue,mts}'",
-    "format:check": "prettier --check './**/*.{js,ts,tsx,vue,mts}' --cache",
-    "format:no-cache": "prettier --write './**/*.{js,ts,tsx,vue,mts}' --list-different",
-    "format": "prettier --write './**/*.{js,ts,tsx,vue,mts}' --cache --list-different",
+    "format:check": "oxfmt --check",
+    "format": "oxfmt --write",
     "json-schema": "tsx scripts/generate-json-schema.ts",
     "knip:no-cache": "knip",
     "knip": "knip --cache",
     "lint:fix:no-cache": "oxlint src --type-aware --fix && eslint src --fix",
     "lint:fix": "oxlint src --type-aware --fix && eslint src --cache --fix",
-    "lint:no-cache": "oxlint src --type-aware && eslint src",
+    "lint:no-cache": "pnpm exec stylelint '{apps,packages,src}/**/*.{css,vue}' && oxlint src --type-aware && eslint src",
     "lint:unstaged:fix": "git diff --name-only HEAD | grep -E '\\.(js|ts|vue|mts)$' | xargs -r eslint --cache --fix",
     "lint:unstaged": "git diff --name-only HEAD | grep -E '\\.(js|ts|vue|mts)$' | xargs -r eslint --cache",
-    "lint": "oxlint src --type-aware && eslint src --cache",
+    "lint": "pnpm stylelint && oxlint src --type-aware && eslint src --cache",
     "lint:desktop": "nx run @comfyorg/desktop-ui:lint",
     "locale": "lobe-i18n locale",
     "oxlint": "oxlint src --type-aware",
@@ -49,10 +47,77 @@
     "test:browser:local": "cross-env PLAYWRIGHT_LOCAL=1 pnpm test:browser",
     "test:unit": "nx run test",
     "typecheck": "vue-tsc --noEmit",
+    "typecheck:browser": "vue-tsc --project browser_tests/tsconfig.json",
     "typecheck:desktop": "nx run @comfyorg/desktop-ui:typecheck",
     "zipdist": "node scripts/zipdist.js",
     "clean": "nx reset"
   },
+  "dependencies": {
+    "@alloc/quick-lru": "catalog:",
+    "@atlaskit/pragmatic-drag-and-drop": "^1.3.1",
+    "@comfyorg/comfyui-electron-types": "catalog:",
+    "@comfyorg/design-system": "workspace:*",
+    "@comfyorg/registry-types": "workspace:*",
+    "@comfyorg/shared-frontend-utils": "workspace:*",
+    "@comfyorg/tailwind-utils": "workspace:*",
+    "@formkit/auto-animate": "catalog:",
+    "@iconify/json": "catalog:",
+    "@primeuix/forms": "catalog:",
+    "@primeuix/styled": "catalog:",
+    "@primeuix/utils": "catalog:",
+    "@primevue/core": "catalog:",
+    "@primevue/forms": "catalog:",
+    "@primevue/icons": "catalog:",
+    "@primevue/themes": "catalog:",
+    "@sentry/vue": "catalog:",
+    "@sparkjsdev/spark": "catalog:",
+    "@tiptap/core": "catalog:",
+    "@tiptap/extension-link": "catalog:",
+    "@tiptap/extension-table": "catalog:",
+    "@tiptap/extension-table-cell": "catalog:",
+    "@tiptap/extension-table-header": "catalog:",
+    "@tiptap/extension-table-row": "catalog:",
+    "@tiptap/pm": "catalog:",
+    "@tiptap/starter-kit": "catalog:",
+    "@vueuse/core": "catalog:",
+    "@vueuse/integrations": "catalog:",
+    "@xterm/addon-fit": "^0.10.0",
+    "@xterm/addon-serialize": "^0.13.0",
+    "@xterm/xterm": "^5.5.0",
+    "algoliasearch": "catalog:",
+    "axios": "catalog:",
+    "chart.js": "^4.5.0",
+    "cva": "catalog:",
+    "dompurify": "^3.2.5",
+    "dotenv": "catalog:",
+    "es-toolkit": "^1.39.9",
+    "extendable-media-recorder": "^9.2.27",
+    "extendable-media-recorder-wav-encoder": "^7.0.129",
+    "firebase": "catalog:",
+    "fuse.js": "^7.0.0",
+    "glob": "catalog:",
+    "jsonata": "catalog:",
+    "jsondiffpatch": "catalog:",
+    "loglevel": "^1.9.2",
+    "marked": "^15.0.11",
+    "pinia": "catalog:",
+    "posthog-js": "catalog:",
+    "primeicons": "catalog:",
+    "primevue": "catalog:",
+    "reka-ui": "catalog:",
+    "semver": "^7.7.2",
+    "three": "^0.170.0",
+    "tiptap-markdown": "^0.8.10",
+    "typegpu": "catalog:",
+    "vue": "catalog:",
+    "vue-i18n": "catalog:",
+    "vue-router": "catalog:",
+    "vuefire": "catalog:",
+    "wwobjloader2": "catalog:",
+    "yjs": "catalog:",
+    "zod": "catalog:",
+    "zod-validation-error": "catalog:"
+  },
   "devDependencies": {
     "@eslint/js": "catalog:",
     "@intlify/eslint-plugin-vue-i18n": "catalog:",
@@ -63,13 +128,12 @@
     "@nx/vite": "catalog:",
     "@pinia/testing": "catalog:",
     "@playwright/test": "catalog:",
-    "@prettier/plugin-oxc": "catalog:",
     "@sentry/vite-plugin": "catalog:",
     "@storybook/addon-docs": "catalog:",
+    "@storybook/addon-mcp": "catalog:",
     "@storybook/vue3": "catalog:",
     "@storybook/vue3-vite": "catalog:",
     "@tailwindcss/vite": "catalog:",
-    "@trivago/prettier-plugin-sort-imports": "catalog:",
     "@types/fs-extra": "catalog:",
     "@types/jsdom": "catalog:",
     "@types/node": "catalog:",
@@ -84,6 +148,7 @@
     "eslint": "catalog:",
     "eslint-config-prettier": "catalog:",
     "eslint-import-resolver-typescript": "catalog:",
+    "eslint-plugin-better-tailwindcss": "catalog:",
     "eslint-plugin-import-x": "catalog:",
     "eslint-plugin-oxlint": "catalog:",
     "eslint-plugin-storybook": "catalog:",
@@ -100,11 +165,11 @@
     "markdown-table": "catalog:",
     "mixpanel-browser": "catalog:",
     "nx": "catalog:",
+    "oxfmt": "catalog:",
     "oxlint": "catalog:",
     "oxlint-tsgolint": "catalog:",
     "picocolors": "catalog:",
     "postcss-html": "catalog:",
-    "prettier": "catalog:",
     "pretty-bytes": "catalog:",
     "rollup-plugin-visualizer": "catalog:",
     "storybook": "catalog:",
@@ -130,66 +195,9 @@
     "zip-dir": "^2.0.0",
     "zod-to-json-schema": "catalog:"
   },
-  "dependencies": {
-    "@alloc/quick-lru": "catalog:",
-    "@atlaskit/pragmatic-drag-and-drop": "^1.3.1",
-    "@comfyorg/comfyui-electron-types": "catalog:",
-    "@comfyorg/design-system": "workspace:*",
-    "@comfyorg/registry-types": "workspace:*",
-    "@comfyorg/shared-frontend-utils": "workspace:*",
-    "@comfyorg/tailwind-utils": "workspace:*",
-    "@iconify/json": "catalog:",
-    "@primeuix/forms": "catalog:",
-    "@primeuix/styled": "catalog:",
-    "@primeuix/utils": "catalog:",
-    "@primevue/core": "catalog:",
-    "@primevue/forms": "catalog:",
-    "@primevue/icons": "catalog:",
-    "@primevue/themes": "catalog:",
-    "@sentry/vue": "catalog:",
-    "@sparkjsdev/spark": "catalog:",
-    "@tiptap/core": "^2.10.4",
-    "@tiptap/extension-link": "^2.10.4",
-    "@tiptap/extension-table": "^2.10.4",
-    "@tiptap/extension-table-cell": "^2.10.4",
-    "@tiptap/extension-table-header": "^2.10.4",
-    "@tiptap/extension-table-row": "^2.10.4",
-    "@tiptap/starter-kit": "^2.10.4",
-    "@vueuse/core": "catalog:",
-    "@vueuse/integrations": "catalog:",
-    "@xterm/addon-fit": "^0.10.0",
-    "@xterm/addon-serialize": "^0.13.0",
-    "@xterm/xterm": "^5.5.0",
-    "algoliasearch": "catalog:",
-    "axios": "catalog:",
-    "chart.js": "^4.5.0",
-    "cva": "catalog:",
-    "dompurify": "^3.2.5",
-    "dotenv": "catalog:",
-    "es-toolkit": "^1.39.9",
-    "extendable-media-recorder": "^9.2.27",
-    "extendable-media-recorder-wav-encoder": "^7.0.129",
-    "firebase": "catalog:",
-    "fuse.js": "^7.0.0",
-    "glob": "^11.0.3",
-    "jsondiffpatch": "^0.6.0",
-    "loglevel": "^1.9.2",
-    "marked": "^15.0.11",
-    "pinia": "catalog:",
-    "primeicons": "catalog:",
-    "primevue": "catalog:",
-    "reka-ui": "catalog:",
-    "semver": "^7.7.2",
-    "three": "^0.170.0",
-    "tiptap-markdown": "^0.8.10",
-    "typegpu": "catalog:",
-    "vue": "catalog:",
-    "vue-i18n": "catalog:",
-    "vue-router": "catalog:",
-    "vuefire": "catalog:",
-    "wwobjloader2": "catalog:",
-    "yjs": "catalog:",
-    "zod": "catalog:",
-    "zod-validation-error": "catalog:"
+  "pnpm": {
+    "overrides": {
+      "vite": "catalog:"
+    }
   }
 }
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index 94aabcc892..b919008772 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -4,25 +4,25 @@
   "description": "Shared design system for ComfyUI Frontend",
   "type": "module",
   "exports": {
-    "./tailwind-config": "./tailwind.config.ts",
     "./css/*": "./src/css/*"
   },
   "scripts": {
     "typecheck": "tsc --noEmit"
   },
-  "nx": {
-    "tags": [
-      "scope:shared",
-      "type:design"
-    ]
-  },
   "dependencies": {
     "@iconify-json/lucide": "catalog:",
-    "@iconify/tailwind": "catalog:"
+    "@iconify/tailwind4": "catalog:",
+    "@iconify/utils": "catalog:"
   },
   "devDependencies": {
     "tailwindcss": "catalog:",
     "typescript": "catalog:"
   },
-  "packageManager": "pnpm@10.17.1"
+  "packageManager": "pnpm@10.17.1",
+  "nx": {
+    "tags": [
+      "scope:shared",
+      "type:design"
+    ]
+  }
 }
diff --git a/packages/design-system/src/css/lucideStrokePlugin.js b/packages/design-system/src/css/lucideStrokePlugin.js
new file mode 100644
index 0000000000..ba16da101e
--- /dev/null
+++ b/packages/design-system/src/css/lucideStrokePlugin.js
@@ -0,0 +1,71 @@
+import plugin from 'tailwindcss/plugin'
+import { getIconsCSSData } from '@iconify/utils/lib/css/icons'
+import { loadIconSet } from '@iconify/tailwind4/lib/helpers/loader.js'
+import { matchIconName } from '@iconify/utils/lib/icon/name'
+
+/**
+ * Tailwind 4 plugin that provides lucide icon variants with configurable
+ * stroke-width via class prefix.
+ *
+ * Usage in CSS:
+ *   @plugin "./lucideStrokePlugin.js";
+ *
+ * Usage in templates:
+ *   <i class="icon-s1-[lucide--settings]" />     <!-- stroke-width: 1 -->
+ *   <i class="icon-s1.5-[lucide--settings]" />   <!-- stroke-width: 1.5 -->
+ *   <i class="icon-s2.5-[lucide--settings]" />   <!-- stroke-width: 2.5 -->
+ *
+ * The default class remains stroke-width: 2.
+ */
+
+const STROKE_WIDTHS = ['1', '1.3', '1.5', '2', '2.5']
+
+const SCALE = 1.2
+
+function getDynamicCSSRulesWithStroke(icon, strokeWidth) {
+  const nameParts = icon.split(/--|:/)
+  if (nameParts.length !== 2) {
+    throw new Error(`Invalid icon name: "${icon}"`)
+  }
+  const [prefix, name] = nameParts
+  if (!(prefix.match(matchIconName) && name.match(matchIconName))) {
+    throw new Error(`Invalid icon name: "${icon}"`)
+  }
+  const iconSet = loadIconSet(prefix)
+  if (!iconSet) {
+    throw new Error(
+      `Cannot load icon set for "${prefix}". Install "@iconify-json/${prefix}" as dev dependency?`
+    )
+  }
+  const generated = getIconsCSSData(iconSet, [name], {
+    iconSelector: '.icon',
+    customise: (content) =>
+      content.replaceAll('stroke-width="2"', `stroke-width="${strokeWidth}"`)
+  })
+  if (generated.css.length !== 1) {
+    throw new Error(`Cannot find "${icon}". Bad icon name?`)
+  }
+  if (SCALE && generated.common?.rules) {
+    generated.common.rules.height = SCALE + 'em'
+    generated.common.rules.width = SCALE + 'em'
+  }
+  return {
+    ...generated.common?.rules,
+    ...generated.css[0].rules
+  }
+}
+
+export default plugin(({ matchComponents }) => {
+  for (const sw of STROKE_WIDTHS) {
+    matchComponents({
+      [`icon-s${sw}`]: (icon) => {
+        try {
+          return getDynamicCSSRulesWithStroke(icon, sw)
+        } catch (err) {
+          console.warn(err.message)
+          return {}
+        }
+      }
+    })
+  }
+})
diff --git a/packages/design-system/src/css/style.css b/packages/design-system/src/css/style.css
index 7fc951496b..9e5c45eea2 100644
--- a/packages/design-system/src/css/style.css
+++ b/packages/design-system/src/css/style.css
@@ -7,9 +7,24 @@
 
 @plugin 'tailwindcss-primeui';
 
-@config '../../tailwind.config.ts';
+@plugin "@iconify/tailwind4" {
+  scale: 1.2;
+  icon-sets: from-folder(comfy, './packages/design-system/src/icons');
+}
+
+@plugin "./lucideStrokePlugin.js";
+
+/* Safelist dynamic comfy icons for node library folders */
+@source inline("icon-[comfy--{ai-model,bfl,bria,bytedance,credits,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,rodin,runway,sora,stability-ai,template,tencent,topaz,tripo,veo,vidu,wan,wavespeed,workflow}]");
+
+/* 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,subgraph-blueprint-canny-to-video-ltx-2-0,subgraph-blueprint-pose-to-video-ltx-2-0,preview-image,image-and-mask-preview,layer-mask-mask-preview,mask-preview,image-preview-from-latent}]");
+
+@custom-variant touch (@media (hover: none));
 
 @theme {
+  --shadow-interface: var(--interface-panel-box-shadow);
+
   --text-xxs: 0.625rem;
   --text-xxs--line-height: calc(1 / 0.625);
 
@@ -73,7 +88,7 @@
 
   --color-jade-400: #47e469;
   --color-jade-600: #00cd72;
-  --color-graphite-400: #9C9EAB;
+  --color-graphite-400: #9c9eab;
 
   --color-gold-400: #fcbf64;
   --color-gold-500: #fdab34;
@@ -86,11 +101,13 @@
   --color-magenta-300: #ceaac9;
   --color-magenta-700: #6a246a;
 
+  --color-ocean-300: #badde8;
+  --color-ocean-600: #2f687a;
+  --color-ocean-900: #253236;
+
   --color-danger-100: #c02323;
   --color-danger-200: #d62952;
 
-  
-
   --color-coral-red-600: #973a40;
   --color-coral-red-500: #c53f49;
   --color-coral-red-400: #dd424e;
@@ -98,9 +115,11 @@
   --color-bypass: #6a246a;
   --color-error: #962a2a;
 
-
   --color-interface-panel-job-progress-primary: var(--color-azure-300);
-  --color-interface-panel-job-progress-secondary: var(--color-alpha-azure-600-30);
+  --color-interface-panel-job-progress-secondary: var(
+    --color-alpha-azure-600-30
+  );
+  --color-interface-panel-job-progress-border: var(--base-foreground);
 
   --color-blue-selection: rgb(from var(--color-azure-600) r g b / 0.3);
   --color-node-hover-100: rgb(from var(--color-charcoal-800) r g b/ 0.15);
@@ -139,9 +158,11 @@
 :root {
   --fg-color: #000;
   --bg-color: #fff;
+  --default-transition-duration: 0.1s;
   --comfy-menu-bg: #353535;
   --comfy-menu-secondary-bg: #292929;
   --comfy-topbar-height: 2.5rem;
+  --workflow-tabs-height: 2.375rem;
   --comfy-input-bg: #222;
   --input-text: #ddd;
   --descrip-text: #999;
@@ -162,8 +183,25 @@
   --button-surface: var(--color-white);
   --button-surface-contrast: var(--color-black);
 
-  --subscription-button-gradient: linear-gradient(315deg, rgb(105 230 255 / 0.15) 0%, rgb(99 73 233 / 0.50) 100%), radial-gradient(70.71% 70.71% at 50% 50%, rgb(62 99 222 / 0.15) 0.01%, rgb(66 0 123 / 0.50) 100%), linear-gradient(92deg, #D000FF 0.38%, #B009FE 37.07%, #3E1FFC 65.17%, #009DFF 103.86%), var(--color-button-surface, #2D2E32);
-
+  --subscription-button-gradient:
+    linear-gradient(
+      315deg,
+      rgb(105 230 255 / 0.15) 0%,
+      rgb(99 73 233 / 0.5) 100%
+    ),
+    radial-gradient(
+      70.71% 70.71% at 50% 50%,
+      rgb(62 99 222 / 0.15) 0.01%,
+      rgb(66 0 123 / 0.5) 100%
+    ),
+    linear-gradient(
+      92deg,
+      #d000ff 0.38%,
+      #b009fe 37.07%,
+      #3e1ffc 65.17%,
+      #009dff 103.86%
+    ),
+    linear-gradient(var(--color-button-surface, #2d2e32));
 
   /* Code styling colors for help menu*/
   --code-text-color: rgb(0 122 255 / 1);
@@ -189,7 +227,9 @@
   --interface-panel-surface: var(--color-white);
   --interface-stroke: var(--color-smoke-300);
 
-  
+  --interface-builder-mode-background: var(--color-ocean-300);
+  --interface-builder-mode-button-background: var(--color-ocean-600);
+  --interface-builder-mode-button-foreground: var(--color-white);
 
   --nav-background: var(--color-white);
 
@@ -245,6 +285,7 @@
   --inverted-background-hover: var(--color-charcoal-600);
   --warning-background: var(--color-gold-400);
   --warning-background-hover: var(--color-gold-500);
+  --success-background: var(--color-jade-600);
   --border-default: var(--color-smoke-600);
   --border-subtle: var(--color-smoke-400);
   --muted-background: var(--color-smoke-700);
@@ -257,31 +298,49 @@
   --component-node-foreground-secondary: var(--color-muted-foreground);
   --component-node-widget-background: var(--secondary-background);
   --component-node-widget-background-hovered: var(--secondary-background-hover);
-  --component-node-widget-background-selected: var(--secondary-background-selected);
+  --component-node-widget-background-selected: var(
+    --secondary-background-selected
+  );
   --component-node-widget-background-disabled: var(--color-alpha-ash-500-20);
   --component-node-widget-background-highlighted: var(--color-ash-500);
   --component-node-widget-promoted: var(--color-purple-700);
   --component-node-widget-advanced: var(--color-azure-400);
 
   /* Default UI element color palette variables */
-   --palette-contrast-mix-color: #fff;
-   --palette-interface-panel-surface: var(--comfy-menu-bg);
-   --palette-interface-stroke: color-mix(in srgb, var(--interface-panel-surface) 75.5%, var(--contrast-mix-color));
+  --palette-contrast-mix-color: #fff;
+  --palette-interface-panel-surface: var(--comfy-menu-bg);
+  --palette-interface-stroke: color-mix(
+    in srgb,
+    var(--interface-panel-surface) 75.5%,
+    var(--contrast-mix-color)
+  );
 
-   --palette-interface-panel-box-shadow: 1px 1px 8px 0 rgb(0 0 0 / 0.4);
-   --palette-interface-panel-drop-shadow: 1px 1px 4px rgb(0 0 0 / 0.4);
-   --palette-interface-panel-hover-surface: color-mix(in srgb, var(--interface-panel-surface) 92.5%, var(--contrast-mix-color));
-   --palette-interface-panel-selected-surface: color-mix(in srgb, var(--interface-panel-surface) 87.5%, var(--contrast-mix-color));
-   --palette-interface-button-hover-surface:  color-mix(in srgb, var(--interface-panel-surface) 82%, var(--contrast-mix-color));
+  --palette-interface-panel-box-shadow: 1px 1px 8px 0 rgb(0 0 0 / 0.4);
+  --palette-interface-panel-drop-shadow: 1px 1px 4px rgb(0 0 0 / 0.4);
+  --palette-interface-panel-hover-surface: color-mix(
+    in srgb,
+    var(--interface-panel-surface) 92.5%,
+    var(--contrast-mix-color)
+  );
+  --palette-interface-panel-selected-surface: color-mix(
+    in srgb,
+    var(--interface-panel-surface) 87.5%,
+    var(--contrast-mix-color)
+  );
+  --palette-interface-button-hover-surface: color-mix(
+    in srgb,
+    var(--interface-panel-surface) 82%,
+    var(--contrast-mix-color)
+  );
 
-   --modal-card-background: var(--secondary-background);
-   --modal-card-background-hovered: var(--secondary-background-hover);
-   --modal-card-border-highlighted: var(--secondary-background-selected);
-   --modal-card-button-surface: var(--color-smoke-300);
-   --modal-card-placeholder-background: var(--color-smoke-600);
-   --modal-card-tag-background: var(--color-smoke-400);
-   --modal-card-tag-foreground: var(--base-foreground);
-   --modal-panel-background: var(--color-white);
+  --modal-card-background: var(--secondary-background);
+  --modal-card-background-hovered: var(--secondary-background-hover);
+  --modal-card-border-highlighted: var(--secondary-background-selected);
+  --modal-card-button-surface: var(--color-smoke-300);
+  --modal-card-placeholder-background: var(--color-smoke-600);
+  --modal-card-tag-background: var(--color-smoke-200);
+  --modal-card-tag-foreground: var(--base-foreground);
+  --modal-panel-background: var(--color-white);
 }
 
 .dark-theme {
@@ -301,8 +360,6 @@
   --button-active-surface: var(--color-charcoal-600);
   --button-icon: var(--color-smoke-800);
 
-  --subscription-button-gradient: linear-gradient(315deg, rgb(105 230 255 / 0.15) 0%, rgb(99 73 233 / 0.50) 100%), radial-gradient(70.71% 70.71% at 50% 50%, rgb(62 99 222 / 0.15) 0.01%, rgb(66 0 123 / 0.50) 100%), linear-gradient(92deg, #D000FF 0.38%, #B009FE 37.07%, #3E1FFC 65.17%, #009DFF 103.86%), var(--color-button-surface, #2D2E32);
-
   --dialog-surface: var(--color-neutral-700);
 
   --interface-menu-component-surface-hovered: var(--color-charcoal-400);
@@ -313,6 +370,10 @@
   --interface-panel-surface: var(--color-charcoal-800);
   --interface-stroke: var(--color-charcoal-400);
 
+  --interface-builder-mode-background: var(--color-ocean-900);
+  --interface-builder-mode-button-background: var(--color-ocean-600);
+  --interface-builder-mode-button-foreground: var(--color-white);
+
   --nav-background: var(--color-charcoal-800);
 
   --node-border: var(--color-charcoal-500);
@@ -348,6 +409,7 @@
   --color-interface-panel-job-progress-secondary: var(
     --color-alpha-azure-600-30
   );
+  --color-interface-panel-job-progress-border: var(--base-foreground);
 
   --text-secondary: var(--color-slate-100);
   --text-primary: var(--color-white);
@@ -370,6 +432,7 @@
   --inverted-background-hover: var(--color-smoke-200);
   --warning-background: var(--color-gold-600);
   --warning-background-hover: var(--color-gold-500);
+  --success-background: var(--color-jade-600);
   --border-default: var(--color-charcoal-200);
   --border-subtle: var(--color-charcoal-300);
   --muted-background: var(--color-charcoal-100);
@@ -381,9 +444,13 @@
   --component-node-foreground: var(--base-foreground);
   --component-node-foreground-secondary: var(--color-muted-foreground);
   --component-node-widget-background: var(--secondary-background-hover);
-  --component-node-widget-background-hovered: var(--secondary-background-selected);
+  --component-node-widget-background-hovered: var(
+    --secondary-background-selected
+  );
   --component-node-widget-background-selected: var(--color-charcoal-100);
-  --component-node-widget-background-disabled: var(--color-alpha-charcoal-600-30);
+  --component-node-widget-background-disabled: var(
+    --color-alpha-charcoal-600-30
+  );
   --component-node-widget-background-highlighted: var(--color-graphite-400);
   --component-node-widget-promoted: var(--color-purple-700);
   --component-node-widget-advanced: var(--color-azure-600);
@@ -396,7 +463,6 @@
   --modal-card-tag-background: var(--color-ash-800);
   --modal-card-tag-foreground: var(--base-foreground);
   --modal-panel-background: var(--color-charcoal-600);
-
 }
 
 @theme inline {
@@ -406,13 +472,14 @@
   --color-button-icon: var(--button-icon);
   --color-button-surface: var(--button-surface);
   --color-button-surface-contrast: var(--button-surface-contrast);
-  --color-subscription-button-gradient: var(--subscription-button-gradient);
 
   --color-modal-card-background: var(--modal-card-background);
   --color-modal-card-background-hovered: var(--modal-card-background-hovered);
   --color-modal-card-border-highlighted: var(--modal-card-border-highlighted);
   --color-modal-card-button-surface: var(--modal-card-button-surface);
-  --color-modal-card-placeholder-background: var(--modal-card-placeholder-background);
+  --color-modal-card-placeholder-background: var(
+    --modal-card-placeholder-background
+  );
   --color-modal-card-tag-background: var(--modal-card-tag-background);
   --color-modal-card-tag-foreground: var(--modal-card-tag-foreground);
   --color-modal-panel-background: var(--modal-panel-background);
@@ -434,14 +501,21 @@
   --color-interface-panel-selected-surface: var(
     --interface-panel-selected-surface
   );
-  --color-interface-button-hover-surface: var(
-    --interface-button-hover-surface
-  );
+  --color-interface-button-hover-surface: var(--interface-button-hover-surface);
   --color-comfy-input: var(--comfy-input-bg);
   --color-comfy-input-foreground: var(--input-text);
   --color-comfy-menu-bg: var(--comfy-menu-bg);
   --color-comfy-menu-secondary: var(--comfy-menu-secondary-bg);
 
+  --color-interface-builder-mode-background: var(
+    --interface-builder-mode-background
+  );
+  --color-interface-builder-mode-button-background: var(
+    --interface-builder-mode-button-background
+  );
+  --color-interface-builder-mode-button-foreground: var(
+    --interface-builder-mode-button-foreground
+  );
   --color-interface-stroke: var(--interface-stroke);
   --color-nav-background: var(--nav-background);
   --color-node-border: var(--node-border);
@@ -491,12 +565,24 @@
   --color-component-node-background: var(--component-node-background);
   --color-component-node-border: var(--component-node-border);
   --color-component-node-foreground: var(--component-node-foreground);
-  --color-component-node-foreground-secondary: var(--component-node-foreground-secondary);
-  --color-component-node-widget-background: var(--component-node-widget-background);
-  --color-component-node-widget-background-hovered: var(--component-node-widget-background-hovered);
-  --color-component-node-widget-background-selected: var(--component-node-widget-background-selected);
-  --color-component-node-widget-background-disabled: var(--component-node-widget-background-disabled);
-  --color-component-node-widget-background-highlighted: var(--component-node-widget-background-highlighted);
+  --color-component-node-foreground-secondary: var(
+    --component-node-foreground-secondary
+  );
+  --color-component-node-widget-background: var(
+    --component-node-widget-background
+  );
+  --color-component-node-widget-background-hovered: var(
+    --component-node-widget-background-hovered
+  );
+  --color-component-node-widget-background-selected: var(
+    --component-node-widget-background-selected
+  );
+  --color-component-node-widget-background-disabled: var(
+    --component-node-widget-background-disabled
+  );
+  --color-component-node-widget-background-highlighted: var(
+    --component-node-widget-background-highlighted
+  );
   --color-component-node-widget-promoted: var(--component-node-widget-promoted);
   --color-component-node-widget-advanced: var(--component-node-widget-advanced);
 
@@ -514,6 +600,7 @@
   --color-inverted-background-hover: var(--inverted-background-hover);
   --color-warning-background: var(--warning-background);
   --color-warning-background-hover: var(--warning-background-hover);
+  --color-success-background: var(--success-background);
   --color-border-default: var(--border-default);
   --color-border-subtle: var(--border-subtle);
   --color-muted-background: var(--muted-background);
@@ -528,6 +615,14 @@
   }
 }
 
+@utility highlight {
+  background-color: color-mix(in srgb, currentColor 20%, transparent);
+  font-weight: 700;
+  border-radius: 0.25rem;
+  padding: 0 0.125rem;
+  margin: -0.125rem 0.125rem;
+}
+
 @utility scrollbar-hide {
   scrollbar-width: none;
   &::-webkit-scrollbar {
@@ -579,8 +674,6 @@ body {
   height: 100vh;
   margin: 0;
   overflow: hidden;
-  background: var(--bg-color) var(--bg-img);
-  color: var(--fg-color);
   min-height: -webkit-fill-available;
   max-height: -webkit-fill-available;
   min-width: -webkit-fill-available;
@@ -1113,7 +1206,7 @@ button.comfy-queue-btn {
 .graphdialog {
   min-height: 1em;
   background-color: var(--comfy-menu-bg);
-  z-index: 41; /* z-index is set to 41 here in order to appear over selection-overlay-container which should have a z-index of 40 */
+  z-index: 1500;
 }
 
 .graphdialog .name {
@@ -1206,7 +1299,6 @@ dialog::backdrop {
   background-color: var(--comfy-menu-bg);
 }
 
-
 .litegraph.litecontextmenu .litemenu-entry.submenu,
 .litegraph.litecontextmenu.dark .litemenu-entry.submenu {
   background-color: var(--comfy-menu-bg);
@@ -1339,458 +1431,482 @@ audio.comfy-audio.empty-audio-widget {
 
 /* ===================== Mask Editor Styles ===================== */
 /* To be migrated to Tailwind later */
-  #maskEditor_brush {
-    position: absolute;
-    backgroundColor: transparent;
-    z-index: 8889;
-    pointer-events: none;
-    border-radius: 50%;
-    overflow: visible;
-    outline: 1px dashed black;
-    box-shadow: 0 0 0 1px white;
-  }
-  #maskEditor_brushPreviewGradient {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    border-radius: 50%;
-    display: none;
-  }
-  .maskEditor_sidePanelTitle {
-    text-align: center;
-    font-size: 15px;
-    color: var(--descrip-text);
-    margin-top: 10px;
-  }
-  .maskEditor_sidePanelBrushShapeCircle {
-    width: 35px;
-    height: 35px;
-    border-radius: 50%;
-    border: 1px solid var(--border-color);
-    pointer-events: auto;
-    transition: background 0.1s;
-    margin-left: 7.5px;
-  }
-  .maskEditor_sidePanelBrushRange {
-    width: 180px;
-    appearance: none;
-    background: transparent;
-    cursor: pointer;
-  }
-  .maskEditor_sidePanelBrushRange::-webkit-slider-thumb {
-    height: 20px;
-    width: 20px;
-    border-radius: 50%;
-    cursor: grab;
-    margin-top: -8px;
-    background: var(--p-surface-700);
-    border: 1px solid var(--border-color);
-  }
-  .maskEditor_sidePanelBrushRange::-moz-range-thumb {
-    height: 20px;
-    width: 20px;
-    border-radius: 50%;
-    cursor: grab;
-    background: var(--p-surface-800);
-    border: 1px solid var(--border-color);
-  }
-  .maskEditor_sidePanelBrushRange::-webkit-slider-runnable-track {
-    background: var(--p-surface-700);
-    height: 3px;
-  }
-  .maskEditor_sidePanelBrushRange::-moz-range-track {
-    background: var(--p-surface-700);
-    height: 3px;
-  }
+#maskEditor_brush {
+  position: absolute;
+  backgroundcolor: transparent;
+  z-index: 8889;
+  pointer-events: none;
+  border-radius: 50%;
+  overflow: visible;
+  outline: 1px dashed black;
+  box-shadow: 0 0 0 1px white;
+}
+#maskEditor_brushPreviewGradient {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+  display: none;
+}
+.maskEditor_sidePanelTitle {
+  text-align: center;
+  font-size: 15px;
+  color: var(--descrip-text);
+  margin-top: 10px;
+}
+.maskEditor_sidePanelBrushShapeCircle {
+  width: 35px;
+  height: 35px;
+  border-radius: 50%;
+  border: 1px solid var(--border-color);
+  pointer-events: auto;
+  transition: background 0.1s;
+  margin-left: 7.5px;
+}
+.maskEditor_sidePanelBrushRange {
+  width: 180px;
+  appearance: none;
+  background: transparent;
+  cursor: pointer;
+}
+.maskEditor_sidePanelBrushRange::-webkit-slider-thumb {
+  height: 20px;
+  width: 20px;
+  border-radius: 50%;
+  cursor: grab;
+  margin-top: -8px;
+  background: var(--p-surface-700);
+  border: 1px solid var(--border-color);
+}
+.maskEditor_sidePanelBrushRange::-moz-range-thumb {
+  height: 20px;
+  width: 20px;
+  border-radius: 50%;
+  cursor: grab;
+  background: var(--p-surface-800);
+  border: 1px solid var(--border-color);
+}
+.maskEditor_sidePanelBrushRange::-webkit-slider-runnable-track {
+  background: var(--p-surface-700);
+  height: 3px;
+}
+.maskEditor_sidePanelBrushRange::-moz-range-track {
+  background: var(--p-surface-700);
+  height: 3px;
+}
 
-  .maskEditor_sidePanelBrushShapeSquare {
-    width: 35px;
-    height: 35px;
-    margin: 5px;
-    border: 1px solid var(--border-color);
-    pointer-events: auto;
-    transition: background 0.1s;
-  }
+.maskEditor_sidePanelBrushShapeSquare {
+  width: 35px;
+  height: 35px;
+  margin: 5px;
+  border: 1px solid var(--border-color);
+  pointer-events: auto;
+  transition: background 0.1s;
+}
 
-  .maskEditor_brushShape_dark {
-    background: transparent;
-  }
+.maskEditor_brushShape_dark {
+  background: transparent;
+}
 
-  .maskEditor_brushShape_dark:hover {
-    background: var(--p-surface-900);
-  }
+.maskEditor_brushShape_dark:hover {
+  background: var(--p-surface-900);
+}
 
-  .maskEditor_brushShape_light {
-    background: transparent;
-  }
+.maskEditor_brushShape_light {
+  background: transparent;
+}
 
-  .maskEditor_brushShape_light:hover {
-    background: var(--comfy-menu-bg);
-  }
+.maskEditor_brushShape_light:hover {
+  background: var(--comfy-menu-bg);
+}
 
-  .maskEditor_sidePanelLayer {
-    display: flex;
-    width: 100%;
-    height: 50px;
-  }
-  .maskEditor_sidePanelLayerVisibilityContainer {
-    width: 50px;
-    height: 50px;
-    border-radius: 8px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-  .maskEditor_sidePanelVisibilityToggle {
-    width: 12px;
-    height: 12px;
-    border-radius: 50%;
-    pointer-events: auto;
-  }
-  .maskEditor_sidePanelLayerIconContainer {
-    width: 60px;
-    height: 50px;
-    border-radius: 8px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    fill: var(--input-text);
-  }
-  .maskEditor_sidePanelLayerIconContainer svg {
-    width: 30px;
-    height: 30px;
-  }
-  .maskEditor_sidePanelBigButton {
-    width: 85px;
-    height: 30px;
-    background: rgb(0 0 0 / 0.2);
-    border: 1px solid var(--border-color);
-    color: var(--input-text);
-    font-size: 15px;
-    pointer-events: auto;
-    transition: background-color 0.1s;
-  }
-  .maskEditor_sidePanelBigButton:hover {
-    background-color: var(--p-overlaybadge-outline-color);
-    border: none;
-  }
-  .maskEditor_toolPanelContainer {
-    width: 4rem;
-    height: 4rem;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    position: relative;
-    transition: background-color 0.2s;
-  }
-  .maskEditor_toolPanelContainerSelected svg {
-    fill: var(--p-button-text-primary-color) !important;
-  }
-  .maskEditor_toolPanelContainerSelected .maskEditor_toolPanelIndicator {
-    display: block;
-  }
-  .maskEditor_toolPanelContainer svg {
-    width: 75%;
-    aspect-ratio: 1/1;
-    fill: var(--p-button-text-secondary-color);
-  }
+.maskEditor_sidePanelLayer {
+  display: flex;
+  width: 100%;
+  height: 50px;
+}
+.maskEditor_sidePanelLayerVisibilityContainer {
+  width: 50px;
+  height: 50px;
+  border-radius: 8px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.maskEditor_sidePanelVisibilityToggle {
+  width: 12px;
+  height: 12px;
+  border-radius: 50%;
+  pointer-events: auto;
+}
+.maskEditor_sidePanelLayerIconContainer {
+  width: 60px;
+  height: 50px;
+  border-radius: 8px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  fill: var(--input-text);
+}
+.maskEditor_sidePanelLayerIconContainer svg {
+  width: 30px;
+  height: 30px;
+}
+.maskEditor_sidePanelBigButton {
+  width: 85px;
+  height: 30px;
+  background: rgb(0 0 0 / 0.2);
+  border: 1px solid var(--border-color);
+  color: var(--input-text);
+  font-size: 15px;
+  pointer-events: auto;
+  transition: background-color 0.1s;
+}
+.maskEditor_sidePanelBigButton:hover {
+  background-color: var(--p-overlaybadge-outline-color);
+  border: none;
+}
+.maskEditor_toolPanelContainer {
+  width: 4rem;
+  height: 4rem;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: relative;
+  transition: background-color 0.2s;
+}
+.maskEditor_toolPanelContainerSelected svg {
+  fill: var(--p-button-text-primary-color) !important;
+}
+.maskEditor_toolPanelContainerSelected .maskEditor_toolPanelIndicator {
+  display: block;
+}
+.maskEditor_toolPanelContainer svg {
+  width: 75%;
+  aspect-ratio: 1/1;
+  fill: var(--p-button-text-secondary-color);
+}
 
-  .maskEditor_toolPanelContainerDark:hover {
-    background-color: var(--p-surface-800);
-  }
+.maskEditor_toolPanelContainerDark:hover {
+  background-color: var(--p-surface-800);
+}
 
-  .maskEditor_toolPanelContainerLight:hover {
-    background-color: var(--p-surface-300);
-  }
+.maskEditor_toolPanelContainerLight:hover {
+  background-color: var(--p-surface-300);
+}
 
-  .maskEditor_toolPanelIndicator {
-    display: none;
-    height: 100%;
-    width: 4px;
-    position: absolute;
-    left: 0;
-    background: var(--p-button-text-primary-color);
-  }
-  .maskEditor_sidePanelSeparator {
-    width: 100%;
-    height: 2px;
-    background: var(--border-color);
-    margin-top: 1.5em;
-    margin-bottom: 5px;
-  }
-  #maskEditorCanvasContainer {
-    position: absolute;
-    width: 1000px;
-    height: 667px;
-    left: 359px;
-    top: 280px;
-  }
+.maskEditor_toolPanelIndicator {
+  display: none;
+  height: 100%;
+  width: 4px;
+  position: absolute;
+  left: 0;
+  background: var(--p-button-text-primary-color);
+}
+.maskEditor_sidePanelSeparator {
+  width: 100%;
+  height: 2px;
+  background: var(--border-color);
+  margin-top: 1.5em;
+  margin-bottom: 5px;
+}
+#maskEditorCanvasContainer {
+  position: absolute;
+  width: 1000px;
+  height: 667px;
+  left: 359px;
+  top: 280px;
+}
 
-  .maskEditor_topPanelIconButton_dark {
-    width: 50px;
-    height: 30px;
-    pointer-events: auto;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    transition: background-color 0.1s;
-    background: var(--p-surface-800);
-    border: 1px solid var(--p-form-field-border-color);
-    border-radius: 10px;
-  }
+.maskEditor_topPanelIconButton_dark {
+  width: 50px;
+  height: 30px;
+  pointer-events: auto;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  transition: background-color 0.1s;
+  background: var(--p-surface-800);
+  border: 1px solid var(--p-form-field-border-color);
+  border-radius: 10px;
+}
 
-  .maskEditor_topPanelIconButton_dark:hover {
-      background-color: var(--p-surface-900);
-  }
+.maskEditor_topPanelIconButton_dark:hover {
+  background-color: var(--p-surface-900);
+}
 
-  .maskEditor_topPanelIconButton_dark svg {
-    width: 25px;
-    height: 25px;
-    pointer-events: none;
-    fill: var(--input-text);
-  }
+.maskEditor_topPanelIconButton_dark svg {
+  width: 25px;
+  height: 25px;
+  pointer-events: none;
+  fill: var(--input-text);
+}
 
-  .maskEditor_topPanelIconButton_light {
-    width: 50px;
-    height: 30px;
-    pointer-events: auto;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    transition: background-color 0.1s;
-    background: var(--comfy-menu-bg);
-    border: 1px solid var(--p-form-field-border-color);
-    border-radius: 10px;
-  }
+.maskEditor_topPanelIconButton_light {
+  width: 50px;
+  height: 30px;
+  pointer-events: auto;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  transition: background-color 0.1s;
+  background: var(--comfy-menu-bg);
+  border: 1px solid var(--p-form-field-border-color);
+  border-radius: 10px;
+}
 
-  .maskEditor_topPanelIconButton_light:hover {
-      background-color: var(--p-surface-300);
-  }
+.maskEditor_topPanelIconButton_light:hover {
+  background-color: var(--p-surface-300);
+}
 
-  .maskEditor_topPanelIconButton_light svg {
-    width: 25px;
-    height: 25px;
-    pointer-events: none;
-    fill: var(--input-text);
-  }
+.maskEditor_topPanelIconButton_light svg {
+  width: 25px;
+  height: 25px;
+  pointer-events: none;
+  fill: var(--input-text);
+}
 
-  .maskEditor_topPanelButton_dark {
-    height: 30px;
-    background: var(--p-surface-800);
-    border: 1px solid var(--p-form-field-border-color);
-    border-radius: 10px;
-    color: var(--input-text);
-    pointer-events: auto;
-    transition: 0.1s;
-    width: 60px;
-  }
+.maskEditor_topPanelButton_dark {
+  height: 30px;
+  background: var(--p-surface-800);
+  border: 1px solid var(--p-form-field-border-color);
+  border-radius: 10px;
+  color: var(--input-text);
+  pointer-events: auto;
+  transition: 0.1s;
+  width: 60px;
+}
 
-  .maskEditor_topPanelButton_dark:hover {
-    background-color: var(--p-surface-900);
-  }
+.maskEditor_topPanelButton_dark:hover {
+  background-color: var(--p-surface-900);
+}
 
-  .maskEditor_topPanelButton_light {
-    height: 30px;
-    background: var(--comfy-menu-bg);
-    border: 1px solid var(--p-form-field-border-color);
-    border-radius: 10px;
-    color: var(--input-text);
-    pointer-events: auto;
-    transition: 0.1s;
-    width: 60px;
-  }
+.maskEditor_topPanelButton_light {
+  height: 30px;
+  background: var(--comfy-menu-bg);
+  border: 1px solid var(--p-form-field-border-color);
+  border-radius: 10px;
+  color: var(--input-text);
+  pointer-events: auto;
+  transition: 0.1s;
+  width: 60px;
+}
 
-  .maskEditor_topPanelButton_light:hover {
-    background-color: var(--p-surface-300);
-  }
+.maskEditor_topPanelButton_light:hover {
+  background-color: var(--p-surface-300);
+}
 
-  .maskEditor_sidePanel_paintBucket_Container {
-    width: 180px;
-    display: flex;
-    flex-direction: column;
-    position: relative;
-  }
+.maskEditor_sidePanel_paintBucket_Container {
+  width: 180px;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+}
 
-  .maskEditor_sidePanel_colorSelect_Container {
-    display: flex;
-    width: 180px;
-    align-items: center;
-    gap: 5px;
-    height: 30px;
-  }
+.maskEditor_sidePanel_colorSelect_Container {
+  display: flex;
+  width: 180px;
+  align-items: center;
+  gap: 5px;
+  height: 30px;
+}
 
-  .maskEditor_sidePanel_colorSelect_tolerance_container {
-    display: flex;
-    flex-direction: column;
-    gap: 10px;
-    margin-bottom: 10px;
-  }
+.maskEditor_sidePanel_colorSelect_tolerance_container {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  margin-bottom: 10px;
+}
 
-  .maskEditor_sidePanelContainerColumn {
-    display: flex;
-    flex-direction: column;
-    gap: 12px;
-    padding-bottom: 12px;
-  }
+.maskEditor_sidePanelContainerColumn {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  padding-bottom: 12px;
+}
 
-  .maskEditor_sidePanelContainerRow {
-    display: flex;
-    flex-direction: row;
-    gap: 10px;
-    align-items: center;
-    min-height: 24px;
-    position: relative;
-  }
+.maskEditor_sidePanelContainerRow {
+  display: flex;
+  flex-direction: row;
+  gap: 10px;
+  align-items: center;
+  min-height: 24px;
+  position: relative;
+}
 
-  .maskEditor_accent_bg_dark {
-    background: var(--p-surface-800);
-  }
+.maskEditor_accent_bg_dark {
+  background: var(--p-surface-800);
+}
 
-  .maskEditor_accent_bg_very_dark {
-    background: var(--p-surface-900);
-  }
+.maskEditor_accent_bg_very_dark {
+  background: var(--p-surface-900);
+}
 
-  .maskEditor_accent_bg_light {
-    background: var(--p-surface-300);
-  }
+.maskEditor_accent_bg_light {
+  background: var(--p-surface-300);
+}
 
-  .maskEditor_accent_bg_very_light {
-    background: var(--comfy-menu-bg);
-  }
+.maskEditor_accent_bg_very_light {
+  background: var(--comfy-menu-bg);
+}
 
+.maskEditor_sidePanelToggleContainer {
+  cursor: pointer;
+  display: inline-block;
+  position: absolute;
+  right: 0;
+}
 
-  .maskEditor_sidePanelToggleContainer {
-    cursor: pointer;
-    display: inline-block;
-    position: absolute;
-    right: 0;
-  }
+.maskEditor_sidePanelToggleSwitch {
+  display: inline-block;
+  border-radius: 16px;
+  width: 40px;
+  height: 24px;
+  position: relative;
+  vertical-align: middle;
+  transition: background 0.25s;
+  background: var(--p-surface-300);
+}
 
-  .maskEditor_sidePanelToggleSwitch {
-    display: inline-block;
-    border-radius: 16px;
-    width: 40px;
-    height: 24px;
-    position: relative;
-    vertical-align: middle;
-    transition: background 0.25s;
-    background: var(--p-surface-300);
-  }
+.dark-theme .maskEditor_sidePanelToggleSwitch {
+  background: var(--p-surface-700);
+}
 
-  .dark-theme .maskEditor_sidePanelToggleSwitch {
-    background: var(--p-surface-700);
-  }
-
-  .maskEditor_sidePanelToggleSwitch::before, .maskEditor_sidePanelToggleSwitch::after {
-    content: "";
-  }
+.maskEditor_sidePanelToggleSwitch::before,
+.maskEditor_sidePanelToggleSwitch::after {
+  content: '';
+}
+.maskEditor_sidePanelToggleSwitch::before {
+  display: block;
+  background: linear-gradient(to bottom, #fff 0%, #eee 100%);
+  border-radius: 50%;
+  width: 16px;
+  height: 16px;
+  position: absolute;
+  top: 4px;
+  left: 4px;
+  transition: ease 0.2s;
+}
+.maskEditor_sidePanelToggleContainer:hover
   .maskEditor_sidePanelToggleSwitch::before {
-    display: block;
-    background: linear-gradient(to bottom, #fff 0%, #eee 100%);
-    border-radius: 50%;
-    width: 16px;
-    height: 16px;
-    position: absolute;
-    top: 4px;
-    left: 4px;
-    transition: ease 0.2s;
-  }
-  .maskEditor_sidePanelToggleContainer:hover .maskEditor_sidePanelToggleSwitch::before {
-    background: linear-gradient(to bottom, #fff 0%, #fff 100%);
-  }
-  .maskEditor_sidePanelToggleCheckbox:checked + .maskEditor_sidePanelToggleSwitch {
-    background: var(--p-button-text-primary-color);
-  }
-  .maskEditor_sidePanelToggleCheckbox:checked + .maskEditor_sidePanelToggleSwitch::before {
-    background: var(--comfy-menu-bg);
-    left: 20px;
-  }
-  .dark-theme .maskEditor_sidePanelToggleCheckbox:checked + .maskEditor_sidePanelToggleSwitch::before {
-    background: var(--p-surface-900);
-  }
+  background: linear-gradient(to bottom, #fff 0%, #fff 100%);
+}
+.maskEditor_sidePanelToggleCheckbox:checked
+  + .maskEditor_sidePanelToggleSwitch {
+  background: var(--p-button-text-primary-color);
+}
+.maskEditor_sidePanelToggleCheckbox:checked
+  + .maskEditor_sidePanelToggleSwitch::before {
+  background: var(--comfy-menu-bg);
+  left: 20px;
+}
+.dark-theme
+  .maskEditor_sidePanelToggleCheckbox:checked
+  + .maskEditor_sidePanelToggleSwitch::before {
+  background: var(--p-surface-900);
+}
 
-  .maskEditor_sidePanelToggleCheckbox {
-    position: absolute;
-    visibility: hidden;
-  }
+.maskEditor_sidePanelToggleCheckbox {
+  position: absolute;
+  visibility: hidden;
+}
 
-  .maskEditor_sidePanelDropdown {
-    border: 1px solid var(--p-form-field-border-color);
-    background: var(--comfy-menu-bg);
-    height: 24px;
-    padding-left: 5px;
-    padding-right: 5px;
-    border-radius: 6px;
-    transition: background 0.1s;
-  }
+.maskEditor_sidePanelDropdown {
+  border: 1px solid var(--p-form-field-border-color);
+  background: var(--comfy-menu-bg);
+  height: 24px;
+  padding-left: 5px;
+  padding-right: 5px;
+  border-radius: 6px;
+  transition: background 0.1s;
+}
 
-  .maskEditor_sidePanelDropdown option {
-    background: var(--comfy-menu-bg);
-  }
+.maskEditor_sidePanelDropdown option {
+  background: var(--comfy-menu-bg);
+}
 
-  .maskEditor_sidePanelDropdown:focus {
-    outline: 1px solid var(--p-surface-300);
-  }
+.maskEditor_sidePanelDropdown:focus {
+  outline: 1px solid var(--p-surface-300);
+}
 
-  .maskEditor_sidePanelDropdown option:hover {
-    background: white;
-  }
-  .maskEditor_sidePanelDropdown option:active {
-    background: var(--p-surface-300);
-  }
+.maskEditor_sidePanelDropdown option:hover {
+  background: white;
+}
+.maskEditor_sidePanelDropdown option:active {
+  background: var(--p-surface-300);
+}
 
-  .dark-theme .maskEditor_sidePanelDropdown {
-    background: var(--p-surface-900);
-  }
+.dark-theme .maskEditor_sidePanelDropdown {
+  background: var(--p-surface-900);
+}
 
-  .dark-theme .maskEditor_sidePanelDropdown option {
-    background: var(--p-surface-900);
-  }
+.dark-theme .maskEditor_sidePanelDropdown option {
+  background: var(--p-surface-900);
+}
 
-  .dark-theme .maskEditor_sidePanelDropdown:focus {
-    outline: 1px solid var(--p-button-text-primary-color);
-  }
+.dark-theme .maskEditor_sidePanelDropdown:focus {
+  outline: 1px solid var(--p-button-text-primary-color);
+}
 
-  .dark-theme .maskEditor_sidePanelDropdown option:active {
-    background: var(--p-highlight-background);
-  }
+.dark-theme .maskEditor_sidePanelDropdown option:active {
+  background: var(--p-highlight-background);
+}
 
-  .maskEditor_layerRow {
-    height: 50px;
-    width: 100%;
-    border-radius: 10px;
-  }
+.maskEditor_layerRow {
+  height: 50px;
+  width: 100%;
+  border-radius: 10px;
+}
 
-  .maskEditor_sidePanelLayerPreviewContainer {
-    width: 40px;
-    height: 30px;
-  }
+.maskEditor_sidePanelLayerPreviewContainer {
+  width: 40px;
+  height: 30px;
+}
 
-  .maskEditor_sidePanelLayerPreviewContainer > svg{
-    width: 100%;
-    height: 100%;
-    object-fit: contain;
-    fill: var(--p-surface-100);
-  }
+.maskEditor_sidePanelLayerPreviewContainer > svg {
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+  fill: var(--p-surface-100);
+}
 
-  .maskEditor_sidePanelImageLayerImage {
-    width: 100%;
-    height: 100%;
-    object-fit: contain;
-  }
+.maskEditor_sidePanelImageLayerImage {
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+}
 
-  .maskEditor_sidePanelSubTitle {
-    text-align: left;
-    font-size: 12px;
-    color: var(--descrip-text);
-  }
+.maskEditor_sidePanelSubTitle {
+  text-align: left;
+  font-size: 12px;
+  color: var(--descrip-text);
+}
 
-  .maskEditor_containerDropdown {
-    position: absolute;
-    right: 0;
-  }
+.maskEditor_containerDropdown {
+  position: absolute;
+  right: 0;
+}
 
-  .maskEditor_sidePanelLayerCheckbox {
-    margin-left: 15px;
-  }
+.maskEditor_sidePanelLayerCheckbox {
+  margin-left: 15px;
+}
 /* ===================== End of Mask Editor Styles ===================== */
+
+/* ===================== Skeleton Shimmer ===================== */
+.skeleton-shimmer {
+  background:
+    linear-gradient(135deg, rgb(188 188 188 / 0.5) 0%, rgb(0 0 0 / 0.5) 100%) 0
+      0 / 200% 200%,
+    #000;
+  animation: skeleton-shimmer 2s ease-in-out infinite;
+}
+
+@keyframes skeleton-shimmer {
+  0%,
+  100% {
+    background-position: 100% 100%;
+  }
+  50% {
+    background-position: 0 0;
+  }
+}
diff --git a/packages/design-system/src/iconCollection.ts b/packages/design-system/src/iconCollection.ts
deleted file mode 100644
index 170a5465fb..0000000000
--- a/packages/design-system/src/iconCollection.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-import { existsSync, readFileSync, readdirSync } from 'fs'
-import { join } from 'path'
-import { dirname } from 'path'
-import { fileURLToPath } from 'url'
-
-const fileName = fileURLToPath(import.meta.url)
-const dirName = dirname(fileName)
-const customIconsPath = join(dirName, 'icons')
-
-// Iconify collection structure
-interface IconifyIcon {
-  body: string
-  width?: number
-  height?: number
-}
-
-interface IconifyCollection {
-  prefix: string
-  icons: Record<string, IconifyIcon>
-  width?: number
-  height?: number
-}
-
-// Create an Iconify collection for custom icons
-export const iconCollection: IconifyCollection = {
-  prefix: 'comfy',
-  icons: {},
-  width: 16,
-  height: 16
-}
-
-/**
- * Validates that an SVG file contains valid SVG content
- */
-function validateSvgContent(content: string, filename: string): void {
-  if (!content.trim()) {
-    throw new Error(`Empty SVG file: ${filename}`)
-  }
-
-  if (!content.includes('<svg')) {
-    throw new Error(`Invalid SVG file (missing <svg> tag): ${filename}`)
-  }
-
-  // Basic XML structure validation
-  const openTags = (content.match(/<svg[^>]*>/g) || []).length
-  const closeTags = (content.match(/<\/svg>/g) || []).length
-
-  if (openTags !== closeTags) {
-    throw new Error(`Malformed SVG file (mismatched svg tags): ${filename}`)
-  }
-}
-
-/**
- * Loads custom SVG icons from the icons directory
- */
-function loadCustomIcons(): void {
-  if (!existsSync(customIconsPath)) {
-    console.warn(`Custom icons directory not found: ${customIconsPath}`)
-    return
-  }
-
-  try {
-    const files = readdirSync(customIconsPath)
-    const svgFiles = files.filter((file) => file.endsWith('.svg'))
-
-    if (svgFiles.length === 0) {
-      console.warn('No SVG files found in custom icons directory')
-      return
-    }
-
-    svgFiles.forEach((file) => {
-      const name = file.replace('.svg', '')
-      const filePath = join(customIconsPath, file)
-
-      try {
-        const content = readFileSync(filePath, 'utf-8')
-        validateSvgContent(content, file)
-
-        iconCollection.icons[name] = {
-          body: content
-        }
-      } catch (error) {
-        console.error(
-          `Failed to load custom icon ${file}:`,
-          error instanceof Error ? error.message : error
-        )
-        // Continue loading other icons instead of failing the entire build
-      }
-    })
-  } catch (error) {
-    console.error(
-      'Failed to read custom icons directory:',
-      error instanceof Error ? error.message : error
-    )
-    // Don't throw here - allow build to continue without custom icons
-  }
-}
-
-// Load icons when this module is imported
-loadCustomIcons()
diff --git a/packages/design-system/src/icons/README.md b/packages/design-system/src/icons/README.md
index 7f9665a46f..51e0b880bb 100644
--- a/packages/design-system/src/icons/README.md
+++ b/packages/design-system/src/icons/README.md
@@ -100,7 +100,8 @@ ComfyUI supports three types of icons that can be used throughout the interface.
 
 ```vue
 <template>
-  <i class="icon-[lucide--info]"
+  <i
+    class="icon-[lucide--info]"
     v-tooltip="'Click for more information'"
     class="cursor-pointer"
   />
@@ -147,6 +148,7 @@ packages/design-system/src/icons/
 ```
 
 **Important:**
+
 - Use `viewBox` for proper scaling (24x24 is standard)
 - Don't include `width` or `height` attributes
 - Use `currentColor` for theme-aware icons
@@ -249,26 +251,25 @@ Icons are automatically imported using `unplugin-icons` - no manual imports need
 
 The icon system has two layers:
 
-1. **Build-time Processing** (`packages/design-system/src/iconCollection.ts`):
-   - Scans `packages/design-system/src/icons/` for SVG files
-   - Validates SVG content and structure
-   - Creates Iconify collection for Tailwind CSS
-   - Provides error handling for malformed files
+1. **Tailwind CSS Plugin** (`@iconify/tailwind4`):
+   - Configured via `@plugin` directive in `packages/design-system/src/css/style.css`
+   - Uses `from-folder(comfy, ...)` to load SVGs from `packages/design-system/src/icons/`
+   - Auto-cleans and optimizes SVGs at build time
 
 2. **Vite Runtime** (`vite.config.mts`):
    - Enables direct SVG import as Vue components
    - Supports dynamic icon loading
 
-```typescript
-// Build script creates Iconify collection
-export const iconCollection: IconifyCollection = {
-  prefix: 'comfy',
-  icons: {
-    'workflow': { body: '<svg>...</svg>' },
-    'node': { body: '<svg>...</svg>' }
-  }
+```css
+/* CSS configuration for Tailwind icon classes */
+@plugin "@iconify/tailwind4" {
+  prefix: 'icon';
+  scale: 1.2;
+  icon-sets: from-folder(comfy, './packages/design-system/src/icons');
 }
+```
 
+```typescript
 // Vite configuration for component-based usage
 Icons({
   compiler: 'vue3',
@@ -289,6 +290,7 @@ Icons are fully typed. If TypeScript doesn't recognize a new custom icon:
 ## Troubleshooting
 
 ### Icon Not Showing
+
 1. **Check filename**: Must be kebab-case without special characters
 2. **Restart dev server**: Required after adding new icons
 3. **Verify SVG**: Ensure it's valid SVG syntax (build script validates automatically)
@@ -296,11 +298,13 @@ Icons are fully typed. If TypeScript doesn't recognize a new custom icon:
 5. **Build script errors**: Check console during build - malformed SVGs are logged but don't break builds
 
 ### Icon Wrong Color
+
 - Replace hardcoded colors with `currentColor`
 - Use `stroke="currentColor"` for outlines
 - Use `fill="currentColor"` for filled shapes
 
 ### Icon Wrong Size
+
 - Remove `width` and `height` from SVG
 - Ensure `viewBox` is present
 - Use CSS classes for sizing: `class="w-6 h-6"`
diff --git a/packages/design-system/src/icons/batch-images-node.svg b/packages/design-system/src/icons/batch-images-node.svg
new file mode 100644
index 0000000000..727c3de251
--- /dev/null
+++ b/packages/design-system/src/icons/batch-images-node.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 17L12.9427 14.9426C12.6926 14.6927 12.3536 14.5522 12 14.5522C11.6464 14.5522 11.3074 14.6927 11.0573 14.9426L5 21M20 15C20.5523 15 21 14.5523 21 14V5C21 4.46957 20.7893 3.96086 20.4142 3.58579C20.0391 3.21071 19.5304 3 19 3H10C9.44772 3 9 3.44772 9 4M17 18C17.5523 18 18 17.5523 18 17V8C18 7.46957 17.7893 6.96086 17.4142 6.58579C17.0391 6.21071 16.5304 6 16 6H7C6.44772 6 6 6.44772 6 7M4.33333 9H13.6667C14.403 9 15 9.59695 15 10.3333V19.6667C15 20.403 14.403 21 13.6667 21H4.33333C3.59695 21 3 20.403 3 19.6667V10.3333C3 9.59695 3.59695 9 4.33333 9ZM8.33333 13C8.33333 13.7364 7.73638 14.3333 7 14.3333C6.26362 14.3333 5.66667 13.7364 5.66667 13C5.66667 12.2636 6.26362 11.6667 7 11.6667C7.73638 11.6667 8.33333 12.2636 8.33333 13Z" stroke="#8A8A8A" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/design-system/src/icons/bfl.svg b/packages/design-system/src/icons/bfl.svg
new file mode 100644
index 0000000000..74ce48cc94
--- /dev/null
+++ b/packages/design-system/src/icons/bfl.svg
@@ -0,0 +1,10 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1471_12672)">
+<path d="M365.047 229.802H310.584L256.118 153.072L86.2157 392.168H140.796L256.115 229.807H310.581L195.261 392.168H249.994L365.047 229.802L512 436.698H470.893V436.7H426.019V392.343L365.047 306.532L304.415 392.178V436.698H163.632L163.629 436.703H109.164L109.167 436.698H-0.105347L256.118 76L365.047 229.802Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_1471_12672">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/design-system/src/icons/bria.svg b/packages/design-system/src/icons/bria.svg
new file mode 100644
index 0000000000..20d6e66aa8
--- /dev/null
+++ b/packages/design-system/src/icons/bria.svg
@@ -0,0 +1,18 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1471_12667)">
+<g clip-path="url(#clip1_1471_12667)">
+<path d="M0.307203 236.902C1.1008 227.43 4.48 211.021 6.5792 201.139C23.5008 121.805 83.0208 46.1824 160.691 20.3776V389.734H411.443C419.84 389.734 446.259 381.158 455.168 377.446C468.685 371.814 480.691 363.648 491.597 354.074C465.357 424.038 401.024 480.896 329.242 501.094C314.01 505.37 290.611 510.694 275.226 512H239.59C223.667 508.16 207.155 507.136 191.206 503.117C103.936 481.152 29.7984 406.63 8.704 318.925C5.0176 303.59 4.0704 287.744 0.307203 272.538C1.024 260.89 -0.665597 248.397 0.307203 236.877V236.902Z" fill="#8E4CFF"/>
+<path d="M265.062 211.43H375.808C378.394 211.43 392.55 217.498 395.75 219.494C427.213 238.925 420.122 291.226 384.794 301.952C382.771 302.566 366.669 305.69 365.619 305.69H268.877L265.062 301.875V211.456V211.43Z" fill="#8E4CFF"/>
+<path d="M265.062 137.549V48.4096H373.248C374.861 48.4096 384.205 53.8624 386.611 55.424C406.528 68.3776 414.49 96.5376 401.152 117.069C398.106 121.754 380.339 137.574 375.808 137.574H265.062V137.549Z" fill="#8E4CFF"/>
+<path d="M489.062 147.738C496.128 167.706 505.523 187.264 506.906 208.845L491.674 192.282C477.773 180.736 460.928 174.003 443.29 170.624L489.062 147.738Z" fill="#8E4CFF"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_1471_12667">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+<clipPath id="clip1_1471_12667">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/design-system/src/icons/bytedance.svg b/packages/design-system/src/icons/bytedance.svg
new file mode 100644
index 0000000000..54309f7ccd
--- /dev/null
+++ b/packages/design-system/src/icons/bytedance.svg
@@ -0,0 +1,13 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1471_12658)">
+<path d="M324.094 389.858L284.667 379.567V191.5L326.871 180.816C350.01 174.941 369.446 170.154 370.371 170.339C371.112 170.339 371.667 222.027 371.667 285.326V400.334L367.594 400.15C365.189 400.15 345.566 395.361 324.094 389.835V389.857V389.858Z" fill="#00C8D2"/>
+<path d="M138.667 343.325C138.667 279.602 139.229 227.339 140.166 227.339C140.914 227.154 160.573 231.998 184.164 237.913L226.667 248.65L226.292 342.975L225.73 437.278L187.535 447.107C166.565 452.463 146.906 457.47 144.097 458.029L138.667 459.334V343.325Z" fill="#3C8CFF"/>
+<path d="M423.667 248.299C423.667 38.7081 423.853 27.4506 427.037 28.3797C428.722 28.9368 445.386 33.1843 463.921 37.8029C482.458 42.6075 500.807 47.2031 504.739 48.1312L511.667 49.9884L511.293 248.67L510.731 447.539L472.722 457.148C451.939 462.486 432.279 467.291 429.284 468.057L423.667 469.334V248.299Z" fill="#78E6DC"/>
+<path d="M-0.333038 248.845C-0.333038 140.208 0.222275 51.334 1.14852 51.334C1.88822 51.334 21.3242 56.1412 44.4631 61.8769L86.667 72.583V248.66C86.667 345.267 86.296 424.55 85.9262 424.55C85.3709 424.55 65.7494 429.544 42.4262 435.466L-0.333038 446.334V248.823V248.844V248.845Z" fill="#325AB4"/>
+</g>
+<defs>
+<clipPath id="clip0_1471_12658">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/design-system/src/icons/canny.svg b/packages/design-system/src/icons/canny.svg
new file mode 100644
index 0000000000..d8e398b065
--- /dev/null
+++ b/packages/design-system/src/icons/canny.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.2508 12.7276C12.4587 13.0908 11.5409 13.0908 10.7488 12.7276M10.7488 7.2724C11.5409 6.9092 12.4587 6.9092 13.2508 7.2724M9.27202 11.251C8.90883 10.4589 8.90883 9.54111 9.27202 8.74897M14.7272 8.74897C15.0904 9.54111 15.0904 10.4589 14.7272 11.251M6.18003 19.5412C6.06141 20.0143 6 20.504 6 21M18 21C18 20.504 17.9386 20.0143 17.82 19.5412M7 17.6833C7.21936 17.3526 7.47257 17.0421 7.75736 16.7574C8.04215 16.4726 8.35262 16.2194 8.68333 16M17 17.6833C16.7806 17.3526 16.5274 17.0421 16.2426 16.7574C15.9579 16.4726 15.6474 16.2194 15.3167 16M10.6747 15.1482C11.1062 15.0504 11.5505 15 12 15C12.4495 15 12.8938 15.0504 13.3253 15.1482M5 3H19C20.1046 3 21 3.89543 21 5V19C21 20.1046 20.1046 21 19 21H5C3.89543 21 3 20.1046 3 19V5C3 3.89543 3.89543 3 5 3Z" stroke="#8A8A8A" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/design-system/src/icons/comfy-c.svg b/packages/design-system/src/icons/comfy-c.svg
new file mode 100644
index 0000000000..07f62103c0
--- /dev/null
+++ b/packages/design-system/src/icons/comfy-c.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 9">
+  <path d="M1.82148 8.68376C1.61587 8.68376 1.44996 8.60733 1.34177 8.46284C1.23057 8.31438 1.20157 8.10711 1.26219 7.89434L1.50561 7.03961C1.52502 6.97155 1.51151 6.89831 1.46918 6.8417C1.42684 6.7852 1.3606 6.75194 1.29025 6.75194H0.590376C0.384656 6.75194 0.21875 6.67562 0.110614 6.53113C-0.000591531 6.38256 -0.0295831 6.17529 0.0310774 5.96252L0.867308 3.03952L0.959638 2.71838C1.08375 2.28258 1.53638 1.9284 1.96878 1.9284H2.80622C2.90615 1.9284 2.99406 1.86177 3.02157 1.76508L3.29852 0.79284C3.4225 0.357484 3.87514 0.0033043 4.30753 0.0033043L6.09854 0.000112775L7.40967 0C7.61533 0 7.78124 0.0763259 7.88937 0.220813C8.00058 0.369269 8.02957 0.576538 7.96895 0.78931L7.59405 2.10572C7.4701 2.54096 7.01746 2.89503 6.58507 2.89503L4.79008 2.89844H3.95292C3.8531 2.89844 3.7653 2.96496 3.73762 3.06155L3.03961 5.49964C3.02008 5.56781 3.03359 5.64127 3.07604 5.69787C3.11837 5.75437 3.18461 5.78763 3.2549 5.78763C3.25507 5.78763 4.44105 5.78532 4.44105 5.78532H5.7483C5.95396 5.78532 6.11986 5.86164 6.228 6.00613C6.33921 6.1547 6.3682 6.36197 6.30754 6.57474L5.93263 7.89092C5.80869 8.32628 5.35605 8.68034 4.92366 8.68034L3.12872 8.68376H1.82148Z" fill="#8A8A8A"/>
+</svg>
+
diff --git a/packages/design-system/src/icons/credits.svg b/packages/design-system/src/icons/credits.svg
new file mode 100644
index 0000000000..f806cddeed
--- /dev/null
+++ b/packages/design-system/src/icons/credits.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15.536 11.293a1 1 0 0 0 0 1.414l2.376 2.377a1 1 0 0 0 1.414 0l2.377-2.377a1 1 0 0 0 0-1.414l-2.377-2.377a1 1 0 0 0-1.414 0zm-13.239 0a1 1 0 0 0 0 1.414l2.377 2.377a1 1 0 0 0 1.414 0l2.377-2.377a1 1 0 0 0 0-1.414L6.088 8.916a1 1 0 0 0-1.414 0zm6.619 6.619a1 1 0 0 0 0 1.415l2.377 2.376a1 1 0 0 0 1.414 0l2.377-2.376a1 1 0 0 0 0-1.415l-2.377-2.376a1 1 0 0 0-1.414 0zm0-13.238a1 1 0 0 0 0 1.414l2.377 2.376a1 1 0 0 0 1.414 0l2.377-2.376a1 1 0 0 0 0-1.414l-2.377-2.377a1 1 0 0 0-1.414 0z"/>
+</svg>
diff --git a/packages/design-system/src/icons/extensions-blocks.svg b/packages/design-system/src/icons/extensions-blocks.svg
new file mode 100644
index 0000000000..25b3b6cc87
--- /dev/null
+++ b/packages/design-system/src/icons/extensions-blocks.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16"><path d="M6.66667 14V5.33333C6.66667 5.15652 6.59643 4.98695 6.4714 4.86193C6.34638 4.7369 6.17681 4.66667 6 4.66667H2.66667C2.48986 4.66667 2.32029 4.7369 2.19526 4.86193C2.07024 4.98695 2 5.15652 2 5.33333V13.3333C2 13.5101 2.07024 13.6797 2.19526 13.8047C2.32029 13.9298 2.48986 14 2.66667 14H10.6667C10.8435 14 11.013 13.9298 11.1381 13.8047C11.2631 13.6797 11.3333 13.5101 11.3333 13.3333V10C11.3333 9.82319 11.2631 9.65362 11.1381 9.5286C11.013 9.40357 10.8435 9.33333 10.6667 9.33333H2M10 2H13.3333C13.7015 2 14 2.29848 14 2.66667V6C14 6.36819 13.7015 6.66667 13.3333 6.66667H10C9.63181 6.66667 9.33333 6.36819 9.33333 6V2.66667C9.33333 2.29848 9.63181 2 10 2Z" stroke="currentColor" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/></svg>
diff --git a/packages/design-system/src/icons/gemini.svg b/packages/design-system/src/icons/gemini.svg
new file mode 100644
index 0000000000..d2f0fc7928
--- /dev/null
+++ b/packages/design-system/src/icons/gemini.svg
@@ -0,0 +1,25 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1471_12686)">
+<path d="M439.808 232.147C404.368 217.06 372.144 195.328 344.875 168.125C306.899 130.074 279.806 82.5466 266.411 30.4827C265.823 28.1703 264.481 26.1197 262.598 24.6551C260.714 23.1905 258.397 22.3953 256.011 22.3953C253.625 22.3953 251.307 23.1905 249.423 24.6551C247.54 26.1197 246.198 28.1703 245.611 30.4827C232.187 82.5399 205.09 130.062 167.125 168.125C139.853 195.325 107.63 217.056 72.192 232.147C58.3253 238.12 44.0747 242.92 29.4827 246.611C27.1561 247.182 25.0884 248.518 23.6102 250.403C22.132 252.288 21.3287 254.615 21.3287 257.011C21.3287 259.406 22.132 261.733 23.6102 263.618C25.0884 265.504 27.1561 266.839 29.4827 267.411C44.0747 271.08 58.2827 275.88 72.192 281.853C107.632 296.94 139.856 318.672 167.125 345.875C205.111 383.93 232.212 431.465 245.611 483.539C246.182 485.865 247.518 487.933 249.403 489.411C251.288 490.889 253.615 491.693 256.011 491.693C258.406 491.693 260.733 490.889 262.618 489.411C264.504 487.933 265.839 485.865 266.411 483.539C270.08 468.925 274.88 454.717 280.853 440.808C295.939 405.368 317.671 373.143 344.875 345.875C382.934 307.897 430.468 280.804 482.539 267.411C484.851 266.823 486.902 265.481 488.366 263.598C489.831 261.714 490.626 259.397 490.626 257.011C490.626 254.625 489.831 252.307 488.366 250.423C486.902 248.54 484.851 247.198 482.539 246.611C467.932 242.936 453.643 238.099 439.808 232.147Z" fill="#3186FF"/>
+<path d="M439.808 232.147C404.368 217.06 372.144 195.328 344.875 168.125C306.899 130.074 279.806 82.5466 266.411 30.4827C265.823 28.1703 264.481 26.1197 262.598 24.6551C260.714 23.1905 258.397 22.3953 256.011 22.3953C253.625 22.3953 251.307 23.1905 249.423 24.6551C247.54 26.1197 246.198 28.1703 245.611 30.4827C232.187 82.5399 205.09 130.062 167.125 168.125C139.853 195.325 107.63 217.056 72.192 232.147C58.3253 238.12 44.0747 242.92 29.4827 246.611C27.1561 247.182 25.0884 248.518 23.6102 250.403C22.132 252.288 21.3287 254.615 21.3287 257.011C21.3287 259.406 22.132 261.733 23.6102 263.618C25.0884 265.504 27.1561 266.839 29.4827 267.411C44.0747 271.08 58.2827 275.88 72.192 281.853C107.632 296.94 139.856 318.672 167.125 345.875C205.111 383.93 232.212 431.465 245.611 483.539C246.182 485.865 247.518 487.933 249.403 489.411C251.288 490.889 253.615 491.693 256.011 491.693C258.406 491.693 260.733 490.889 262.618 489.411C264.504 487.933 265.839 485.865 266.411 483.539C270.08 468.925 274.88 454.717 280.853 440.808C295.939 405.368 317.671 373.143 344.875 345.875C382.934 307.897 430.468 280.804 482.539 267.411C484.851 266.823 486.902 265.481 488.366 263.598C489.831 261.714 490.626 259.397 490.626 257.011C490.626 254.625 489.831 252.307 488.366 250.423C486.902 248.54 484.851 247.198 482.539 246.611C467.932 242.936 453.643 238.099 439.808 232.147Z" fill="url(#paint0_linear_1471_12686)"/>
+<path d="M439.808 232.147C404.368 217.06 372.144 195.328 344.875 168.125C306.899 130.074 279.806 82.5466 266.411 30.4827C265.823 28.1703 264.481 26.1197 262.598 24.6551C260.714 23.1905 258.397 22.3953 256.011 22.3953C253.625 22.3953 251.307 23.1905 249.423 24.6551C247.54 26.1197 246.198 28.1703 245.611 30.4827C232.187 82.5399 205.09 130.062 167.125 168.125C139.853 195.325 107.63 217.056 72.192 232.147C58.3253 238.12 44.0747 242.92 29.4827 246.611C27.1561 247.182 25.0884 248.518 23.6102 250.403C22.132 252.288 21.3287 254.615 21.3287 257.011C21.3287 259.406 22.132 261.733 23.6102 263.618C25.0884 265.504 27.1561 266.839 29.4827 267.411C44.0747 271.08 58.2827 275.88 72.192 281.853C107.632 296.94 139.856 318.672 167.125 345.875C205.111 383.93 232.212 431.465 245.611 483.539C246.182 485.865 247.518 487.933 249.403 489.411C251.288 490.889 253.615 491.693 256.011 491.693C258.406 491.693 260.733 490.889 262.618 489.411C264.504 487.933 265.839 485.865 266.411 483.539C270.08 468.925 274.88 454.717 280.853 440.808C295.939 405.368 317.671 373.143 344.875 345.875C382.934 307.897 430.468 280.804 482.539 267.411C484.851 266.823 486.902 265.481 488.366 263.598C489.831 261.714 490.626 259.397 490.626 257.011C490.626 254.625 489.831 252.307 488.366 250.423C486.902 248.54 484.851 247.198 482.539 246.611C467.932 242.936 453.643 238.099 439.808 232.147Z" fill="url(#paint1_linear_1471_12686)"/>
+<path d="M439.808 232.147C404.368 217.06 372.144 195.328 344.875 168.125C306.899 130.074 279.806 82.5466 266.411 30.4827C265.823 28.1703 264.481 26.1197 262.598 24.6551C260.714 23.1905 258.397 22.3953 256.011 22.3953C253.625 22.3953 251.307 23.1905 249.423 24.6551C247.54 26.1197 246.198 28.1703 245.611 30.4827C232.187 82.5399 205.09 130.062 167.125 168.125C139.854 195.325 107.63 217.056 72.192 232.147C58.3253 238.12 44.0747 242.92 29.4827 246.611C27.1561 247.182 25.0884 248.518 23.6102 250.403C22.132 252.288 21.3287 254.615 21.3287 257.011C21.3287 259.406 22.132 261.733 23.6102 263.618C25.0884 265.504 27.1561 266.839 29.4827 267.411C44.0747 271.08 58.2827 275.88 72.192 281.853C107.632 296.94 139.856 318.672 167.125 345.875C205.111 383.93 232.212 431.465 245.611 483.539C246.182 485.865 247.518 487.933 249.403 489.411C251.288 490.889 253.615 491.693 256.011 491.693C258.406 491.693 260.733 490.889 262.618 489.411C264.504 487.933 265.839 485.865 266.411 483.539C270.08 468.925 274.88 454.717 280.853 440.808C295.939 405.368 317.671 373.143 344.875 345.875C382.934 307.897 430.468 280.804 482.539 267.411C484.851 266.823 486.902 265.481 488.366 263.598C489.831 261.714 490.626 259.397 490.626 257.011C490.626 254.625 489.831 252.307 488.366 250.423C486.902 248.54 484.851 247.198 482.539 246.611C467.932 242.936 453.643 238.099 439.808 232.147Z" fill="url(#paint2_linear_1471_12686)"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_1471_12686" x1="149.333" y1="331.667" x2="234.667" y2="257" gradientUnits="userSpaceOnUse">
+<stop stop-color="#08B962"/>
+<stop offset="1" stop-color="#08B962" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint1_linear_1471_12686" x1="170.667" y1="118.333" x2="245.333" y2="235.667" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F94543"/>
+<stop offset="1" stop-color="#F94543" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint2_linear_1471_12686" x1="74.6667" y1="289" x2="373.333" y2="257" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FABC12"/>
+<stop offset="0.46" stop-color="#FABC12" stop-opacity="0"/>
+</linearGradient>
+<clipPath id="clip0_1471_12686">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/design-system/src/icons/get-video-components.svg b/packages/design-system/src/icons/get-video-components.svg
new file mode 100644
index 0000000000..7bca20f5cd
--- /dev/null
+++ b/packages/design-system/src/icons/get-video-components.svg
@@ -0,0 +1,3 @@
+<svg width="48" height="24" viewBox="0 0 48 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.8593 13C35.4827 13 36.0007 13.4988 36.0009 14.0996V22.9004C36.0007 23.5012 35.4827 24 34.8593 24H22.1425C21.5191 24 21.0011 23.5012 21.0009 22.9004V14.0996C21.0011 13.4988 21.5191 13 22.1425 13H34.8593ZM21.9794 21.2646V22.9004C21.9796 22.9953 22.0439 23.0566 22.1425 23.0566H34.8593C34.9579 23.0566 35.0222 22.9953 35.0224 22.9004V21.5547L32.2255 19.3984L29.9179 20.9307C29.746 21.0424 29.498 21.032 29.3369 20.9062L26.1982 18.4609L21.9794 21.2646ZM16.5009 10.5C16.777 10.5001 17.0009 10.7239 17.0009 11V17.5C17.001 18.3283 17.6727 18.9998 18.5009 19H18.7089L18.0615 18.3535C17.8665 18.1583 17.8665 17.8417 18.0615 17.6465C18.2567 17.4512 18.5742 17.4512 18.7695 17.6465L20.1835 19.0605C20.3785 19.2557 20.3784 19.5723 20.1835 19.7676L18.7695 21.1816C18.5742 21.3769 18.2567 21.3768 18.0615 21.1816C17.8666 20.9864 17.8664 20.6697 18.0615 20.4746L18.5361 20H18.5009C17.1204 19.9998 16.001 18.8806 16.0009 17.5V11C16.001 10.724 16.2249 10.5002 16.5009 10.5ZM22.1425 13.9424C22.0439 13.9424 21.9796 14.0047 21.9794 14.0996V20.1152L25.9384 17.4834C26.0045 17.4381 26.082 17.4096 26.162 17.4004C26.2907 17.3869 26.4244 17.4244 26.5244 17.5029L29.663 19.9531L31.9755 18.4219C32.1475 18.3102 32.3954 18.3204 32.5566 18.4463L35.0224 20.3467V14.0996C35.0222 14.0047 34.9579 13.9424 34.8593 13.9424H22.1425ZM29.6425 15.2002C30.4468 15.2003 31.1093 15.839 31.1093 16.6143C31.1093 17.3895 30.4469 18.0283 29.6425 18.0283C28.8381 18.0283 28.1747 17.3895 28.1747 16.6143C28.1748 15.839 28.8381 15.2002 29.6425 15.2002ZM29.6425 16.1426C29.3668 16.1426 29.1533 16.3485 29.1533 16.6143C29.1533 16.8801 29.3667 17.0859 29.6425 17.0859C29.9182 17.0859 30.1318 16.88 30.1318 16.6143C30.1318 16.3485 29.9182 16.1426 29.6425 16.1426ZM22.0917 0C23.6924 0.000102997 25.0009 1.29808 25.0009 2.91016V7.08984C25.0009 8.70192 23.6924 9.9999 22.0917 10H14.9111C13.3103 10 12.0009 8.70198 12.0009 7.08984V2.91016C12.0009 1.29802 13.3103 0 14.9111 0H22.0917ZM14.9111 1.04199C13.8598 1.04199 13.0331 1.87561 13.0331 2.91016V7.08984C13.0331 8.12439 13.8598 8.95801 14.9111 8.95801H22.0917C23.1429 8.95791 23.9697 8.12432 23.9697 7.08984V2.91016C23.9697 1.87568 23.1429 1.04209 22.0917 1.04199H14.9111ZM17.0146 2.36523C17.1026 2.36806 17.189 2.39596 17.2636 2.44531L20.5556 4.53613C20.7284 4.64278 20.7919 4.83988 20.7919 5C20.7919 5.16007 20.7283 5.35719 20.5556 5.46387L17.2646 7.55469C17.1075 7.65858 16.9024 7.66034 16.7441 7.56055L16.7431 7.55957C16.5867 7.45933 16.4941 7.27149 16.499 7.08398V2.91016C16.4953 2.64423 16.6989 2.38047 16.9755 2.36621L17.0146 2.36523ZM17.5068 6.1416L19.3095 5L17.5068 3.85449V6.1416ZM20.4999 5.22559L20.5234 5.19434C20.5303 5.1833 20.5364 5.17121 20.5419 5.15918C20.5308 5.1833 20.5167 5.20593 20.4999 5.22559Z" fill="#8A8A8A"/>
+</svg>
diff --git a/packages/design-system/src/icons/grok.svg b/packages/design-system/src/icons/grok.svg
new file mode 100644
index 0000000000..ac0e596fb9
--- /dev/null
+++ b/packages/design-system/src/icons/grok.svg
@@ -0,0 +1,10 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1471_12732)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M197.76 327.187L367.957 201.384C376.299 195.197 388.224 197.608 392.213 207.187C413.12 257.725 403.776 318.44 362.133 360.125C320.512 401.811 262.571 410.941 209.621 390.12L151.787 416.936C234.752 473.704 335.488 459.667 398.443 396.605C448.384 346.6 463.851 278.44 449.387 216.979L449.515 217.128C428.544 126.845 454.677 90.7493 508.181 16.9573C509.461 15.208 510.741 13.4586 512 11.6666L441.579 82.1733V81.96L197.696 327.229M162.624 357.757C103.061 300.797 113.344 212.669 164.139 161.832C201.707 124.221 263.275 108.861 317.013 131.432L374.72 104.765C362.726 95.9422 349.603 88.7672 335.701 83.432C300.753 69.1279 262.355 65.4777 225.337 72.9405C188.32 80.4032 154.335 98.6457 127.659 125.373C73.6213 179.475 56.6187 262.675 85.8027 333.672C107.605 386.728 71.872 424.253 35.8827 462.141C23.104 475.581 10.304 489 0 503.208L162.56 357.821" fill="#B6B6B6"/>
+</g>
+<defs>
+<clipPath id="clip0_1471_12732">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/design-system/src/icons/hitpaw.svg b/packages/design-system/src/icons/hitpaw.svg
new file mode 100644
index 0000000000..7785527403
--- /dev/null
+++ b/packages/design-system/src/icons/hitpaw.svg
@@ -0,0 +1,10 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1471_12743)">
+<path d="M148.228 255.643L102.567 278.057L99.924 279.348L64.0174 296.98V325.672L113.435 301.418L117.364 299.492L139.326 288.706L145.968 285.454C148.837 273.378 152.193 262.214 155.914 251.876L148.228 255.643ZM432.49 117.736C431.012 114.312 429.43 110.958 427.761 107.637C427.552 107.225 427.343 106.777 427.1 106.364C408.825 70.8767 379.613 41.7882 343.81 23.4336C343.115 23.0725 318.563 11.8911 285.838 5.73274C276.222 3.92656 265.929 2.55047 255.305 2H122.372C90.1518 2 64.0174 27.7858 64.0174 59.5923V260.77L87.5957 249.209L88.6216 248.71L172.068 207.753L178.397 204.639C213.016 148.337 255.861 133.664 255.861 133.664V166.537C270.05 167.191 282.447 172.868 290.394 181.193C293.768 184.686 296.636 189.691 298.74 194.782C299.14 195.78 299.522 196.761 299.854 197.759C300.532 199.633 301.071 201.457 301.487 203.195C302.079 205.603 303.07 207.581 304.287 209.335C304.287 209.335 304.287 209.388 304.323 209.405C305.521 211.107 306.93 212.553 308.408 213.929C313.555 218.745 319.433 222.564 319.433 231.853C319.433 236.05 317.607 239.68 314.476 242.862C312.72 244.668 310.565 246.303 308.095 247.851C307.556 248.177 306.983 248.504 306.408 248.814L306.339 248.865C305.244 249.468 304.078 250.069 302.896 250.638C302.653 250.758 302.392 250.861 302.131 250.982C302.079 250.999 302.009 251.016 301.957 251.05C294.567 254.387 278.866 259.48 275.927 260.391C275.231 260.58 274.432 260.804 273.579 261.044C270.919 261.802 267.789 262.696 265.929 263.246C265.72 263.281 265.529 263.35 265.338 263.418C264.729 263.608 264.364 263.728 264.33 263.745C262.885 264.176 261.478 264.691 260.138 265.311C259.791 265.466 259.443 265.638 259.096 265.81C255.409 267.581 252.071 269.937 249.184 272.794C242.455 279.416 238.317 288.534 238.317 298.63C238.317 303.655 239.378 308.47 241.22 312.858C242.194 315.025 243.342 317.106 244.629 319.101C246.262 321.785 248.158 324.485 250.245 327.221C250.488 327.582 250.767 327.926 251.027 328.27C258.139 337.473 267.32 346.969 276.622 356.757C279.804 360.094 283.005 363.448 286.117 366.854C288.881 369.864 291.628 372.91 294.271 375.988C295.054 376.882 295.837 377.795 296.585 378.706C301.523 377.657 313.033 374.388 314.094 374.061C340.419 365.737 364.311 351.94 384.36 334.033C384.655 333.792 384.933 333.552 385.229 333.293C421.258 300.73 444.75 254.852 447.687 203.573C447.862 200.614 447.949 197.673 447.983 194.68C448 194.009 448 193.32 448 192.632C447.949 166.038 442.453 140.717 432.49 117.736ZM135.605 326.739L135.448 326.808L64.0174 361.848V390.541L135.326 355.552C135.552 352.25 135.831 348.947 136.161 345.576C136.196 344.99 136.265 344.389 136.317 343.803L136.387 343.081C136.822 338.54 137.361 333.93 137.987 329.234C138.161 327.943 138.334 326.618 138.526 325.311L135.605 326.739ZM156.522 505.434C155.775 503.696 154.958 501.717 154.088 499.464C147.394 482.176 137.517 449.923 134.996 405.214C134.753 400.983 134.579 396.665 134.474 392.227L68.6426 424.481L64 426.768V456.391C64 463.942 65.4606 471.132 68.1558 477.739C76.7282 498.983 97.7679 514 122.355 514H160.452V513.828C160.104 513.157 158.627 510.336 156.522 505.434Z" fill="#B6B6B6"/>
+</g>
+<defs>
+<clipPath id="clip0_1471_12743">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/design-system/src/icons/ideogram.svg b/packages/design-system/src/icons/ideogram.svg
new file mode 100644
index 0000000000..a4b77cb475
--- /dev/null
+++ b/packages/design-system/src/icons/ideogram.svg
@@ -0,0 +1,3 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M395.375 21.5144C427.705 39.8392 451.602 70.0498 461.979 105.716C466.214 107.231 470.383 109.146 474.351 111.441C474.93 111.775 475.465 112.109 475.978 112.488C481.015 115.539 485.696 119.193 489.954 123.403C497.132 130.58 502.783 139.135 506.566 148.552C510.349 157.969 512.187 168.053 511.968 178.198C511.75 188.343 509.479 198.339 505.294 207.585C501.108 216.83 495.094 225.134 487.614 231.996C495.691 239.399 502.052 248.476 506.253 258.592C510.454 268.709 512.393 279.62 511.934 290.563C511.476 301.506 508.631 312.217 503.598 321.947C498.565 331.676 491.467 340.19 482.799 346.893L481.974 347.539L482.442 348.252C491.135 361.662 495.482 377.744 494.345 394.251L494.145 396.701C492.96 408.382 489.056 419.623 482.745 429.526C476.434 439.428 467.891 447.717 457.8 453.729C447.709 459.741 436.349 463.309 424.631 464.148C412.912 464.987 401.16 463.073 390.315 458.56C385.863 471.308 378.061 482.623 367.726 491.319C357.391 500.015 344.904 505.771 331.576 507.983C318.248 510.196 304.57 508.782 291.976 503.892C279.383 499.002 268.339 490.815 260.003 480.19C248.608 485.653 236.192 488.666 223.558 489.033C222.666 489.144 221.73 489.211 220.771 489.211H200.777L199.261 489.144C174.384 487.652 174.897 449.605 200.777 449.605H218.698L219.724 449.516L220.771 449.494C234.369 449.727 247.502 444.553 257.282 435.11C267.062 425.667 272.687 412.728 272.92 399.14C273.154 385.552 267.976 372.428 258.527 362.655C249.077 352.881 236.13 347.26 222.532 347.026C221.94 347.096 221.345 347.133 220.749 347.138H61.9055C56.6498 347.138 51.6095 345.051 47.8932 341.338C44.1768 337.624 42.0891 332.587 42.0891 327.335C42.0891 322.083 44.1768 317.046 47.8932 313.332C51.6095 309.618 56.6498 307.532 61.9055 307.532H218.698L219.724 307.443L220.794 307.421C233.42 307.446 245.612 302.814 255.033 294.412C264.453 286.01 270.44 274.43 271.846 261.89C273.251 249.351 269.977 236.734 262.65 226.457C255.323 216.181 244.459 208.968 232.14 206.201L228.997 205.51C226.801 205.015 224.574 204.673 222.332 204.485C221.813 204.532 221.292 204.554 220.771 204.552H61.9055C59.2487 204.641 56.6012 204.195 54.1204 203.241C51.6397 202.286 49.3765 200.843 47.4656 198.996C45.5546 197.149 44.035 194.938 42.9972 192.492C41.9594 190.046 41.4245 187.417 41.4245 184.76C41.4245 182.104 41.9594 179.475 42.9972 177.029C44.035 174.583 45.5546 172.371 47.4656 170.525C49.3765 168.678 51.6397 167.235 54.1204 166.28C56.6012 165.326 59.2487 164.88 61.9055 164.969H218.721L219.746 164.88L220.794 164.857C234.391 165.114 247.533 159.963 257.33 150.537C267.127 141.11 272.775 128.181 273.032 114.593C273.289 101.005 268.134 87.871 258.701 78.0811C249.268 68.2912 236.33 62.6469 222.733 62.39C222.088 62.4486 221.441 62.4783 220.794 62.4791H200.799L199.261 62.4568C174.384 60.9643 174.897 22.9177 200.777 22.9177H218.609C219.327 22.8417 220.049 22.8046 220.771 22.8064C229.732 22.8064 238.381 24.0983 246.562 26.5041L247.253 26.0586C269.159 11.8174 294.559 3.86392 320.68 3.06648C346.801 2.26904 372.64 8.65827 395.375 21.5367V21.5144ZM312.074 277.326L310.558 278.128L308.708 279.264C303.719 298.203 292.742 315.024 277.412 327.224C288.107 335.722 296.743 346.524 302.676 358.824C308.608 371.125 311.684 384.606 311.673 398.26C311.7 419.205 304.452 439.51 291.165 455.709C296.129 462.076 303.11 466.57 310.964 468.454C318.818 470.338 327.08 469.501 334.395 466.078C341.71 462.656 347.646 456.853 351.228 449.618C354.811 442.384 355.829 434.148 354.114 426.261L353.446 423.498L353.156 421.739L353.044 420.491L353.022 419.556L353.044 418.264L353.156 417.083L353.446 415.346L353.847 413.742L354.337 412.316L355.117 410.556L355.229 410.334C356.145 408.55 357.333 406.919 358.751 405.5L359.977 404.341L360.891 403.629L362.005 402.849L362.942 402.27L364.168 401.602L365.795 400.933L367.043 400.488L367.935 400.243L369.673 399.886L371.301 399.686L372.304 399.641H373.374L374.288 399.686L375.58 399.819L376.829 400.042L378.211 400.376L378.902 400.599L379.994 400.978L381.198 401.49L382.178 401.958L383.36 402.648L384.14 403.161C385.477 404.096 386.681 405.166 387.773 406.435L388.62 407.46L389.378 408.529C392.144 412.811 395.796 416.45 400.089 419.201C404.382 421.952 409.215 423.751 414.262 424.477C419.31 425.203 424.454 424.838 429.349 423.409C434.244 421.979 438.775 419.517 442.636 416.188C446.498 412.86 449.6 408.743 451.734 404.114C453.869 399.486 454.985 394.454 455.007 389.358C455.03 384.262 453.959 379.221 451.866 374.573C449.773 369.926 446.708 365.781 442.876 362.419C439.37 362.726 435.846 362.778 432.333 362.575L431.062 362.463L430.482 362.352H430.126C414.441 360.972 399.584 354.71 387.647 344.448C375.711 334.186 367.296 320.441 363.588 305.149L363.008 302.565C361.978 297.158 359.71 292.064 356.38 287.681C353.05 283.297 348.75 279.744 343.816 277.299C338.882 274.854 333.449 273.585 327.942 273.589C322.435 273.594 317.004 274.873 312.074 277.326ZM213.638 379.682C216.295 379.593 218.943 380.039 221.423 380.994C223.904 381.948 226.167 383.392 228.078 385.239C229.989 387.085 231.509 389.297 232.547 391.743C233.584 394.188 234.119 396.818 234.119 399.474C234.119 402.131 233.584 404.76 232.547 407.206C231.509 409.651 229.989 411.863 228.078 413.71C226.167 415.556 223.904 417 221.423 417.955C218.943 418.909 216.295 419.355 213.638 419.266H131.698C126.56 419.094 121.69 416.933 118.117 413.24C114.543 409.547 112.546 404.611 112.546 399.474C112.546 394.337 114.543 389.401 118.117 385.708C121.69 382.015 126.56 379.855 131.698 379.682H213.638ZM418.891 145.723C413.753 148.691 409.437 152.894 406.334 157.951C403.232 163.007 401.442 168.758 401.126 174.681L401.081 176.574C401.081 181.599 399.169 186.435 395.734 190.104C392.299 193.773 387.596 195.999 382.58 196.333L381.265 196.377C376.237 196.377 371.397 194.467 367.726 191.034C364.055 187.601 361.826 182.902 361.493 177.889L361.448 176.574C361.438 170.035 359.628 163.624 356.216 158.044C352.804 152.464 347.922 147.929 342.103 144.937C336.285 141.945 329.754 140.61 323.227 141.078C316.7 141.547 310.428 143.801 305.097 147.594C299.166 162.238 289.525 175.088 277.122 184.883C293.479 197.811 304.898 215.961 309.466 236.295C319.215 233.814 329.362 233.313 339.308 234.821C349.254 236.329 358.796 239.816 367.37 245.075C375.943 250.334 383.374 257.258 389.222 265.438C395.07 273.618 399.216 282.887 401.415 292.697L401.861 294.768C403.418 302.127 407.264 308.805 412.849 313.846C418.435 318.888 425.473 322.034 432.957 322.835L435.721 323.058L436.657 323.103C437.994 323.103 439.332 323.036 440.669 322.88L442.564 322.635L443.946 322.301C452.409 320.511 459.933 315.708 465.116 308.787C470.299 301.866 472.788 293.299 472.12 284.68C471.452 276.061 467.672 267.979 461.484 261.938C455.297 255.897 447.123 252.309 438.485 251.843L436.724 251.799C433.818 251.802 430.947 251.164 428.316 249.932C425.684 248.7 423.357 246.904 421.499 244.67L420.741 243.69C419.105 241.469 417.954 238.93 417.363 236.236C416.772 233.542 416.753 230.754 417.309 228.053C418.168 223.816 420.392 219.976 423.64 217.121C426.888 214.265 430.982 212.55 435.297 212.237L436.724 212.215C443.767 212.212 450.652 210.125 456.51 206.216C462.368 202.308 466.937 196.754 469.641 190.255C472.344 183.755 473.061 176.601 471.702 169.695C470.343 162.789 466.967 156.439 462.001 151.447C457.182 146.685 451.105 143.393 444.481 141.958L442.207 141.535C441.638 141.442 441.072 141.323 440.513 141.178C433.006 140.355 425.431 141.947 418.891 145.723ZM213.839 236.607C219.095 236.607 224.135 238.693 227.851 242.407C231.568 246.121 233.655 251.158 233.655 256.41C233.655 261.662 231.568 266.699 227.851 270.412C224.135 274.126 219.095 276.213 213.839 276.213H19.1519C14.0142 276.04 9.14457 273.88 5.57109 270.187C1.99762 266.494 0 261.558 0 256.421C0 251.284 1.99762 246.348 5.57109 242.655C9.14457 238.962 14.0142 236.801 19.1519 236.629H213.861L213.839 236.607ZM213.616 93.3306C216.273 93.2416 218.92 93.6876 221.401 94.6421C223.882 95.5966 226.145 97.0402 228.056 98.8868C229.967 100.733 231.487 102.945 232.524 105.391C233.562 107.837 234.097 110.466 234.097 113.122C234.097 115.779 233.562 118.408 232.524 120.854C231.487 123.299 229.967 125.511 228.056 127.358C226.145 129.205 223.882 130.648 221.401 131.603C218.92 132.557 216.273 133.003 213.616 132.914H131.72C129.063 133.003 126.416 132.557 123.935 131.603C121.454 130.648 119.191 129.205 117.28 127.358C115.369 125.511 113.85 123.299 112.812 120.854C111.774 118.408 111.239 115.779 111.239 113.122C111.239 110.466 111.774 107.837 112.812 105.391C113.85 102.945 115.369 100.733 117.28 98.8868C119.191 97.0402 121.454 95.5966 123.935 94.6421C126.416 93.6876 129.063 93.2416 131.72 93.3306H213.661H213.616ZM287.109 49.8043L285.927 50.2721C299.859 64.5548 308.682 83.0347 311.026 102.842C323.714 100.297 336.845 101.065 349.149 105.072C361.453 109.08 372.515 116.191 381.265 125.719C391.357 114.698 404.514 106.942 419.047 103.444C408.203 79.241 388.431 60.154 363.851 50.1611C339.271 40.1682 311.78 40.0404 287.109 49.8043Z" fill="#B6B6B6"/>
+</svg>
diff --git a/packages/design-system/src/icons/image-and-mask-preview.svg b/packages/design-system/src/icons/image-and-mask-preview.svg
new file mode 100644
index 0000000000..68eedea9f1
--- /dev/null
+++ b/packages/design-system/src/icons/image-and-mask-preview.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.03125 18.6735L1.42188 18.8997C1.42457 18.907 1.4274 18.9142 1.43035 18.9213L2.03125 18.6735ZM2.03125 18.3255L1.43035 18.0777C1.4274 18.0849 1.42457 18.0921 1.42188 18.0993L2.03125 18.3255ZM11.9687 18.3255L12.5781 18.0993C12.5754 18.0921 12.5726 18.0849 12.5697 18.0777L11.9687 18.3255ZM11.9687 18.6735L12.5697 18.9213C12.5726 18.9142 12.5754 18.907 12.5781 18.8997L11.9687 18.6735ZM9.54038 7.54038C9.28654 7.79422 9.28654 8.20578 9.54038 8.45962C9.79422 8.71346 10.2058 8.71346 10.4596 8.45962L10 8L9.54038 7.54038ZM15.4596 3.45962C15.7135 3.20578 15.7135 2.79422 15.4596 2.54038C15.2058 2.28654 14.7942 2.28654 14.5404 2.54038L15 3L15.4596 3.45962ZM12.5404 10.5404L12.0808 11L13 11.9192L13.4596 11.4596L13 11L12.5404 10.5404ZM20.4596 4.45962C20.7135 4.20578 20.7135 3.79422 20.4596 3.54038C20.2058 3.28654 19.7942 3.28654 19.5404 3.54038L20 4L20.4596 4.45962ZM15.5404 13.5404C15.2865 13.7942 15.2865 14.2058 15.5404 14.4596C15.7942 14.7135 16.2058 14.7135 16.4596 14.4596L16 14L15.5404 13.5404ZM21.4596 9.45962C21.7135 9.20578 21.7135 8.79422 21.4596 8.54038C21.2058 8.28654 20.7942 8.28654 20.5404 8.54038L21 9L21.4596 9.45962ZM14.5 20.35C14.141 20.35 13.85 20.641 13.85 21C13.85 21.359 14.141 21.65 14.5 21.65V21V20.35ZM2.35 13C2.35 13.359 2.64101 13.65 3 13.65C3.35899 13.65 3.65 13.359 3.65 13H3H2.35ZM2.03125 18.6735L2.64062 18.4473C2.65313 18.481 2.65313 18.518 2.64062 18.5517L2.03125 18.3255L1.42188 18.0993C1.32604 18.3575 1.32604 18.6415 1.42188 18.8997L2.03125 18.6735ZM2.03125 18.3255L2.63215 18.5733C2.9889 17.7083 3.59447 16.9687 4.37207 16.4483L4.01054 15.9081L3.649 15.3679C2.65744 16.0316 1.88526 16.9747 1.43035 18.0777L2.03125 18.3255ZM4.01054 15.9081L4.37207 16.4483C5.14968 15.9278 6.0643 15.65 7 15.65V15V14.35C5.80685 14.35 4.64056 14.7043 3.649 15.3679L4.01054 15.9081ZM7 15V15.65C7.9357 15.65 8.85032 15.9278 9.62793 16.4483L9.98946 15.9081L10.351 15.3679C9.35944 14.7043 8.19315 14.35 7 14.35V15ZM9.98946 15.9081L9.62793 16.4483C10.4055 16.9687 11.0111 17.7083 11.3678 18.5733L11.9687 18.3255L12.5697 18.0777C12.1147 16.9747 11.3426 16.0316 10.351 15.3679L9.98946 15.9081ZM11.9687 18.3255L11.3594 18.5517C11.3469 18.518 11.3469 18.481 11.3594 18.4473L11.9687 18.6735L12.5781 18.8997C12.674 18.6415 12.674 18.3575 12.5781 18.0993L11.9687 18.3255ZM11.9687 18.6735L11.3678 18.4257C11.0111 19.2907 10.4055 20.0303 9.62793 20.5508L9.98946 21.0909L10.351 21.6311C11.3426 20.9675 12.1147 20.0244 12.5697 18.9213L11.9687 18.6735ZM9.98946 21.0909L9.62793 20.5508C8.85032 21.0712 7.9357 21.349 7 21.349V21.999V22.649C8.19315 22.649 9.35944 22.2948 10.351 21.6311L9.98946 21.0909ZM7 21.999V21.349C6.0643 21.349 5.14968 21.0712 4.37207 20.5508L4.01054 21.0909L3.649 21.6311C4.64056 22.2948 5.80685 22.649 7 22.649V21.999ZM4.01054 21.0909L4.37207 20.5508C3.59447 20.0303 2.9889 19.2907 2.63215 18.4257L2.03125 18.6735L1.43035 18.9213C1.88526 20.0244 2.65744 20.9675 3.649 21.6311L4.01054 21.0909ZM8.49992 18.4995H7.84992C7.84992 18.9689 7.46939 19.3494 6.99999 19.3494V19.9994V20.6494C8.18736 20.6494 9.14992 19.6868 9.14992 18.4995H8.49992ZM6.99999 19.9994V19.3494C6.53059 19.3494 6.15007 18.9689 6.15007 18.4995H5.50007H4.85007C4.85007 19.6868 5.81262 20.6494 6.99999 20.6494V19.9994ZM5.50007 18.4995H6.15007C6.15007 18.0301 6.53059 17.6495 6.99999 17.6495V16.9995V16.3495C5.81262 16.3495 4.85007 17.3121 4.85007 18.4995H5.50007ZM6.99999 16.9995V17.6495C7.46939 17.6495 7.84992 18.0301 7.84992 18.4995H8.49992H9.14992C9.14992 17.3121 8.18736 16.3495 6.99999 16.3495V16.9995ZM10 8L10.4596 8.45962L15.4596 3.45962L15 3L14.5404 2.54038L9.54038 7.54038L10 8ZM13 11L13.4596 11.4596L20.4596 4.45962L20 4L19.5404 3.54038L12.5404 10.5404L13 11ZM16 14L16.4596 14.4596L21.4596 9.45962L21 9L20.5404 8.54038L15.5404 13.5404L16 14ZM5 3V3.65H19V3V2.35H5V3ZM19 3V3.65C19.7456 3.65 20.35 4.25442 20.35 5H21H21.65C21.65 3.53645 20.4636 2.35 19 2.35V3ZM21 5H20.35V19H21H21.65V5H21ZM21 19H20.35C20.35 19.7456 19.7456 20.35 19 20.35V21V21.65C20.4636 21.65 21.65 20.4636 21.65 19H21ZM3 5H3.65C3.65 4.25442 4.25442 3.65 5 3.65V3V2.35C3.53645 2.35 2.35 3.53645 2.35 5H3ZM19 21V20.35H14.5V21V21.65H19V21ZM3 13H3.65V5H3H2.35V13H3ZM5 3L4.54038 3.45962L20.5404 19.4596L21 19L21.4596 18.5404L5.45962 2.54038L5 3Z" fill="#8A8A8A"/>
+</svg>
diff --git a/packages/design-system/src/icons/image-batch.svg b/packages/design-system/src/icons/image-batch.svg
new file mode 100644
index 0000000000..727c3de251
--- /dev/null
+++ b/packages/design-system/src/icons/image-batch.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 17L12.9427 14.9426C12.6926 14.6927 12.3536 14.5522 12 14.5522C11.6464 14.5522 11.3074 14.6927 11.0573 14.9426L5 21M20 15C20.5523 15 21 14.5523 21 14V5C21 4.46957 20.7893 3.96086 20.4142 3.58579C20.0391 3.21071 19.5304 3 19 3H10C9.44772 3 9 3.44772 9 4M17 18C17.5523 18 18 17.5523 18 17V8C18 7.46957 17.7893 6.96086 17.4142 6.58579C17.0391 6.21071 16.5304 6 16 6H7C6.44772 6 6 6.44772 6 7M4.33333 9H13.6667C14.403 9 15 9.59695 15 10.3333V19.6667C15 20.403 14.403 21 13.6667 21H4.33333C3.59695 21 3 20.403 3 19.6667V10.3333C3 9.59695 3.59695 9 4.33333 9ZM8.33333 13C8.33333 13.7364 7.73638 14.3333 7 14.3333C6.26362 14.3333 5.66667 13.7364 5.66667 13C5.66667 12.2636 6.26362 11.6667 7 11.6667C7.73638 11.6667 8.33333 12.2636 8.33333 13Z" stroke="#8A8A8A" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/design-system/src/icons/image-blur.svg b/packages/design-system/src/icons/image-blur.svg
new file mode 100644
index 0000000000..a59f889931
--- /dev/null
+++ b/packages/design-system/src/icons/image-blur.svg
@@ -0,0 +1,11 @@
+<svg width="48" height="24" viewBox="0 0 48 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1683_13217)">
+<path d="M33.2579 14.2434C33.2579 8.04845 24.8306 0.0257698 24.4718 -0.312477C24.2037 -0.565892 23.7862 -0.561497 23.5226 -0.305153C23.1637 0.0434776 14.7439 8.30814 14.7439 14.2436C14.7439 19.3484 18.8966 23.5 24.0003 23.5C29.1067 23.5015 33.2579 19.3486 33.2579 14.2434ZM24.0015 22.1299C19.6538 22.1299 16.1165 18.5924 16.1165 14.2449C16.1165 9.63656 22.2409 2.98187 24.009 1.15676C25.7829 2.94092 31.8885 9.42993 31.8885 14.2449C31.887 18.5926 28.349 22.1299 24.0015 22.1299Z" fill="#8A8A8A"/>
+<path d="M28.4502 12.5882C28.0766 12.6482 27.8218 12.9998 27.8804 13.3733C28.1265 14.9143 27.5918 16.2605 26.0933 17.8748C25.8355 18.1516 25.8516 18.5852 26.1284 18.843C26.2603 18.9661 26.4273 19.0261 26.5943 19.0261C26.7788 19.0261 26.9619 18.9529 27.0967 18.8064C28.3037 17.5071 29.6381 15.6907 29.2339 13.1552C29.1753 12.7831 28.8222 12.5295 28.4502 12.5882Z" fill="#8A8A8A"/>
+</g>
+<defs>
+<clipPath id="clip0_1683_13217">
+<rect width="48" height="24" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/design-system/src/icons/image-crop.svg b/packages/design-system/src/icons/image-crop.svg
new file mode 100644
index 0000000000..d0cddd2399
--- /dev/null
+++ b/packages/design-system/src/icons/image-crop.svg
@@ -0,0 +1,3 @@
+<svg width="48" height="24" viewBox="0 0 48 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18 1.2002C18.4418 1.2002 18.7998 1.55817 18.7998 2V5.2002H29C29.9941 5.2002 30.7998 6.00589 30.7998 7V17.7002H34C34.4418 17.7002 34.7998 18.0582 34.7998 18.5C34.7998 18.9418 34.4418 19.2998 34 19.2998H30.7998V22.5C30.7998 22.9418 30.4418 23.2998 30 23.2998C29.5582 23.2998 29.2002 22.9418 29.2002 22.5V19.2998H19C18.0059 19.2998 17.2002 18.4941 17.2002 17.5V6.7998H14C13.5582 6.7998 13.2002 6.44183 13.2002 6C13.2002 5.55817 13.5582 5.2002 14 5.2002H17.2002V2C17.2002 1.55817 17.5582 1.2002 18 1.2002ZM18.7998 17.5C18.7998 17.6105 18.8895 17.7002 19 17.7002H29.2002V7C29.2002 6.88954 29.1105 6.79981 29 6.7998H18.7998V17.5Z" fill="#8A8A8A"/>
+</svg>
diff --git a/packages/design-system/src/icons/image-invert.svg b/packages/design-system/src/icons/image-invert.svg
new file mode 100644
index 0000000000..3281aa5d19
--- /dev/null
+++ b/packages/design-system/src/icons/image-invert.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.9999 4L11.9999 3.35L11.3499 3.35V4H11.9999ZM11.9999 20H11.3499C11.3499 20.1724 11.4184 20.3377 11.5403 20.4596C11.6622 20.5815 11.8275 20.65 11.9999 20.65L11.9999 20ZM11.9999 11.35H11.3499V12.65H11.9999V12V11.35ZM19.9999 12.65C20.3589 12.65 20.6499 12.359 20.6499 12C20.6499 11.641 20.3589 11.35 19.9999 11.35V12V12.65ZM11.9999 13.35H11.3499V14.65H11.9999V14V13.35ZM19.9999 14.65C20.3589 14.65 20.6499 14.359 20.6499 14C20.6499 13.641 20.3589 13.35 19.9999 13.35V14V14.65ZM11.9999 9.34999H11.3499V10.65H11.9999V9.99999V9.34999ZM19.9999 10.65C20.3589 10.65 20.6499 10.359 20.6499 9.99999C20.6499 9.64101 20.3589 9.34999 19.9999 9.34999V9.99999V10.65ZM11.9999 7.34999H11.3499V8.64999H11.9999V7.99999V7.34999ZM18.9999 8.64999C19.3589 8.64999 19.6499 8.35898 19.6499 7.99999C19.6499 7.64101 19.3589 7.34999 18.9999 7.34999V7.99999V8.64999ZM11.9999 15.35H11.3499V16.65H11.9999V16V15.35ZM18.9999 16.65C19.3589 16.65 19.6499 16.359 19.6499 16C19.6499 15.641 19.3589 15.35 18.9999 15.35V16V16.65ZM11.9999 17.35H11.3499V18.65H11.9999V18V17.35ZM17.4999 18.65C17.8589 18.65 18.1499 18.359 18.1499 18C18.1499 17.641 17.8589 17.35 17.4999 17.35V18V18.65ZM11.9999 5.34999H11.3499V6.64999H11.9999V5.99999V5.34999ZM17.4999 6.64999C17.8589 6.64999 18.1499 6.35898 18.1499 5.99999C18.1499 5.64101 17.8589 5.34999 17.4999 5.34999V5.99999V6.64999ZM14.4999 4.64999C14.8589 4.64999 15.1499 4.35897 15.1499 3.99999C15.1499 3.641 14.8589 3.34999 14.4999 3.34999L14.4999 3.99999L14.4999 4.64999ZM14.4999 20.65C14.8589 20.65 15.1499 20.359 15.1499 20C15.1499 19.641 14.8589 19.35 14.4999 19.35L14.4999 20L14.4999 20.65ZM11.9999 4H11.3499V20H11.9999H12.6499V4H11.9999ZM11.9999 12V12.65H19.9999V12V11.35H11.9999V12ZM11.9999 14V14.65H19.9999V14V13.35H11.9999V14ZM11.9999 9.99999V10.65H19.9999V9.99999V9.34999H11.9999V9.99999ZM11.9999 7.99999V8.64999H18.9999V7.99999V7.34999H11.9999V7.99999ZM11.9999 16V16.65H18.9999V16V15.35H11.9999V16ZM11.9999 18V18.65H17.4999V18V17.35H11.9999V18ZM11.9999 5.99999V6.64999H17.4999V5.99999V5.34999H11.9999V5.99999ZM11.9999 4L11.9999 4.65L14.4999 4.64999L14.4999 3.99999L14.4999 3.34999L11.9999 3.35L11.9999 4ZM11.9999 20L11.9999 20.65L14.4999 20.65L14.4999 20L14.4999 19.35L11.9999 19.35L11.9999 20ZM20.4852 11.9705H19.8352C19.8352 16.2978 16.3272 19.8058 11.9999 19.8058V20.4558V21.1058C17.0452 21.1058 21.1352 17.0158 21.1352 11.9705H20.4852ZM11.9999 20.4558V19.8058C7.67262 19.8058 4.16465 16.2978 4.16465 11.9705H3.51465H2.86465C2.86465 17.0158 6.95465 21.1058 11.9999 21.1058V20.4558ZM3.51465 11.9705H4.16465C4.16465 7.64323 7.67262 4.13526 11.9999 4.13526V3.48526V2.83526C6.95465 2.83526 2.86465 6.92526 2.86465 11.9705H3.51465ZM11.9999 3.48526V4.13526C16.3272 4.13526 19.8352 7.64323 19.8352 11.9705H20.4852H21.1352C21.1352 6.92526 17.0452 2.83526 11.9999 2.83526V3.48526Z" fill="#8A8A8A"/>
+</svg>
diff --git a/packages/design-system/src/icons/image-preview-from-latent.svg b/packages/design-system/src/icons/image-preview-from-latent.svg
new file mode 100644
index 0000000000..d3433c8738
--- /dev/null
+++ b/packages/design-system/src/icons/image-preview-from-latent.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 14.9999L17.914 11.9139C17.5389 11.539 17.0303 11.3284 16.5 11.3284C15.9697 11.3284 15.4611 11.539 15.086 11.9139L12.6935 14.3064M14.5 21H19C20.1046 21 21 20.1046 21 19V5C21 3.89543 20.1046 3 19 3H5C3.89543 3 3 3.89543 3 5V13M11 9C11 10.1046 10.1046 11 9 11C7.89543 11 7 10.1046 7 9C7 7.89543 7.89543 7 9 7C10.1046 7 11 7.89543 11 9ZM2.03125 18.6735C1.98958 18.5613 1.98958 18.4378 2.03125 18.3255C2.43708 17.3415 3.12595 16.5001 4.01054 15.9081C4.89512 15.3161 5.93558 15 7 15C8.06442 15 9.10488 15.3161 9.98946 15.9081C10.874 16.5001 11.5629 17.3415 11.9687 18.3255C12.0104 18.4378 12.0104 18.5613 11.9687 18.6735C11.5629 19.6575 10.874 20.4989 9.98946 21.0909C9.10488 21.683 8.06442 21.999 7 21.999C5.93558 21.999 4.89512 21.683 4.01054 21.0909C3.12595 20.4989 2.43708 19.6575 2.03125 18.6735ZM8.49992 18.4995C8.49992 19.3278 7.82838 19.9994 6.99999 19.9994C6.17161 19.9994 5.50007 19.3278 5.50007 18.4995C5.50007 17.6711 6.17161 16.9995 6.99999 16.9995C7.82838 16.9995 8.49992 17.6711 8.49992 18.4995Z" stroke="#8A8A8A" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/design-system/src/icons/image-rotate.svg b/packages/design-system/src/icons/image-rotate.svg
new file mode 100644
index 0000000000..733f41913e
--- /dev/null
+++ b/packages/design-system/src/icons/image-rotate.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 17L12.9427 14.9426C12.6926 14.6927 12.3536 14.5522 12 14.5522C11.6464 14.5522 11.3074 14.6927 11.0573 14.9426L5 21M23 10L21 12M21 12L19 10M21 12V8C21 5.23858 18.7614 3 16 3H13M4.33333 9H13.6667C14.403 9 15 9.59695 15 10.3333V19.6667C15 20.403 14.403 21 13.6667 21H4.33333C3.59695 21 3 20.403 3 19.6667V10.3333C3 9.59695 3.59695 9 4.33333 9ZM8.33333 13C8.33333 13.7364 7.73638 14.3333 7 14.3333C6.26362 14.3333 5.66667 13.7364 5.66667 13C5.66667 12.2636 6.26362 11.6667 7 11.6667C7.73638 11.6667 8.33333 12.2636 8.33333 13Z" stroke="#8A8A8A" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/design-system/src/icons/image-scale.svg b/packages/design-system/src/icons/image-scale.svg
new file mode 100644
index 0000000000..a007ae5585
--- /dev/null
+++ b/packages/design-system/src/icons/image-scale.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16 3H21M21 3V8M21 3L17 7M18 21H19C19.5304 21 20.0391 20.7893 20.4142 20.4142C20.7893 20.0391 21 19.5304 21 19M21 12V15M3 6V5C3 4.46957 3.21071 3.96086 3.58579 3.58579C3.96086 3.21071 4.46957 3 5 3M9 3H12M15 17L12.9427 14.9426C12.6926 14.6927 12.3536 14.5522 12 14.5522C11.6464 14.5522 11.3074 14.6927 11.0573 14.9426L5 21M4.33333 9H13.6667C14.403 9 15 9.59695 15 10.3333V19.6667C15 20.403 14.403 21 13.6667 21H4.33333C3.59695 21 3 20.403 3 19.6667V10.3333C3 9.59695 3.59695 9 4.33333 9ZM8.33333 13C8.33333 13.7364 7.73638 14.3333 7 14.3333C6.26362 14.3333 5.66667 13.7364 5.66667 13C5.66667 12.2636 6.26362 11.6667 7 11.6667C7.73638 11.6667 8.33333 12.2636 8.33333 13Z" stroke="#8A8A8A" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/design-system/src/icons/kling-lip-sync-audio-to-video-node.svg b/packages/design-system/src/icons/kling-lip-sync-audio-to-video-node.svg
new file mode 100644
index 0000000000..4a74ae4845
--- /dev/null
+++ b/packages/design-system/src/icons/kling-lip-sync-audio-to-video-node.svg
@@ -0,0 +1,3 @@
+<svg width="48" height="24" viewBox="0 0 48 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M22.0936 7.58276L16.0996 15.7728C15.9586 15.9654 15.8911 16.2022 15.9095 16.4403C15.9278 16.6783 16.0307 16.902 16.1996 17.0708L17.0166 17.8888C17.1879 18.0599 17.4156 18.1631 17.6573 18.1791C17.8989 18.1951 18.1382 18.1228 18.3306 17.9758L26.1836 11.9818M27.5935 21.1557C26.5935 20.4817 25.4655 19.9817 24.0935 19.9817C22.0355 19.9817 20.1655 22.3377 18.0935 21.9817C16.0215 21.6257 15.3185 18.6127 16.5935 17.4817M32.0935 6.98169C32.0935 9.74311 29.8549 11.9817 27.0935 11.9817C24.3321 11.9817 22.0935 9.74311 22.0935 6.98169C22.0935 4.22027 24.3321 1.98169 27.0935 1.98169C29.8549 1.98169 32.0935 4.22027 32.0935 6.98169Z" stroke="#8A8A8A" stroke-width="1.95" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/design-system/src/icons/kling.svg b/packages/design-system/src/icons/kling.svg
new file mode 100644
index 0000000000..32dc0f806e
--- /dev/null
+++ b/packages/design-system/src/icons/kling.svg
@@ -0,0 +1,38 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1471_12763)">
+<g clip-path="url(#clip1_1471_12763)">
+<path d="M115.456 293.867C126.281 260.775 140.568 228.919 158.08 198.827C225.707 81.6641 324.373 12.0108 378.453 43.2214C256.811 -27.0079 98.0907 20.1388 23.936 148.565C15.0858 163.888 7.67965 180 1.81333 196.693C-3.71201 212.459 3.77599 229.419 18.24 237.781L115.456 293.888V293.867Z" fill="url(#paint0_radial_1471_12763)"/>
+<path d="M396.544 216.832C385.713 249.925 371.419 281.781 353.899 311.872C286.272 429.035 187.605 498.709 133.525 467.477C255.189 537.728 413.909 490.56 488.064 362.133C496.912 346.817 504.318 330.713 510.187 314.027C515.712 298.283 508.224 281.301 493.76 272.96L396.544 216.853V216.832Z" fill="url(#paint1_radial_1471_12763)"/>
+<path d="M353.92 311.893C421.547 194.731 432.555 74.4533 378.453 43.2213C324.416 12.0106 225.749 81.7066 158.08 198.827C202.325 122.24 282.005 85.4399 336.085 116.651C390.144 147.883 398.123 235.264 353.899 311.872L353.92 311.893Z" fill="url(#paint2_linear_1471_12763)"/>
+<path d="M158.08 198.827C90.4533 315.989 79.4454 436.267 133.547 467.477C187.605 498.709 286.272 429.035 353.92 311.872C309.675 388.48 229.995 425.28 175.915 394.048C121.856 362.837 113.877 275.435 158.101 198.848L158.08 198.827Z" fill="url(#paint3_linear_1471_12763)"/>
+</g>
+</g>
+<defs>
+<radialGradient id="paint0_radial_1471_12763" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(110.357 290.923) rotate(-59.132) scale(310.927 426.086)">
+<stop offset="0.095" stop-color="#FFF959"/>
+<stop offset="0.326" stop-color="#0DF35E"/>
+<stop offset="0.64" stop-color="#0BF2F9"/>
+<stop offset="1" stop-color="#04A6F0"/>
+</radialGradient>
+<radialGradient id="paint1_radial_1471_12763" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(401.627 219.775) rotate(120.868) scale(310.927 426.086)">
+<stop offset="0.095" stop-color="#FFF959"/>
+<stop offset="0.326" stop-color="#0DF35E"/>
+<stop offset="0.64" stop-color="#0BF2F9"/>
+<stop offset="1" stop-color="#04A6F0"/>
+</radialGradient>
+<linearGradient id="paint2_linear_1471_12763" x1="332.331" y1="38.3572" x2="385.323" y2="210.368" gradientUnits="userSpaceOnUse">
+<stop stop-color="#003EFF"/>
+<stop offset="1" stop-color="#0BFFE7"/>
+</linearGradient>
+<linearGradient id="paint3_linear_1471_12763" x1="179.669" y1="472.363" x2="126.677" y2="300.352" gradientUnits="userSpaceOnUse">
+<stop stop-color="#003EFF"/>
+<stop offset="1" stop-color="#0BFFE7"/>
+</linearGradient>
+<clipPath id="clip0_1471_12763">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+<clipPath id="clip1_1471_12763">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/design-system/src/icons/layer-mask-mask-preview.svg b/packages/design-system/src/icons/layer-mask-mask-preview.svg
new file mode 100644
index 0000000000..84698c8048
--- /dev/null
+++ b/packages/design-system/src/icons/layer-mask-mask-preview.svg
@@ -0,0 +1,7 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.07572 3C8.28083 10.9427 13.8455 15.7083 21 14.914" stroke="#8A8A8A" stroke-width="1.3"/>
+<path d="M9.75 8.25L15 3" stroke="#8A8A8A" stroke-width="1.3" stroke-linecap="round"/>
+<path d="M12 12L18.75 5.25" stroke="#8A8A8A" stroke-width="1.3" stroke-linecap="square"/>
+<path d="M15.75 14.25L21 9" stroke="#8A8A8A" stroke-width="1.3" stroke-linecap="round"/>
+<path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" stroke="#8A8A8A" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/design-system/src/icons/load-3-d.svg b/packages/design-system/src/icons/load-3-d.svg
new file mode 100644
index 0000000000..fa3b72b915
--- /dev/null
+++ b/packages/design-system/src/icons/load-3-d.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11 21.7299L4 17.7299C3.69626 17.5545 3.44398 17.3024 3.26846 16.9987C3.09294 16.6951 3.00036 16.3506 3 15.9999V7.9999C3.00036 7.64918 3.09294 7.30471 3.26846 7.00106C3.44398 6.69742 3.69626 6.44526 4 6.2699L11 2.2699C11.304 2.09437 11.6489 2.00195 12 2.00195C12.3511 2.00195 12.696 2.09437 13 2.2699L20 6.2699C20.3037 6.44526 20.556 6.69742 20.7315 7.00106C20.9071 7.30471 20.9996 7.64918 21 7.9999V15M3.30005 7L12 12M12 12L20.7001 7M12 12V16.5M14 19.5L17 16.5M17 16.5V22M17 16.5L20 19.5" stroke="#8A8A8A" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/design-system/src/icons/load-audio.svg b/packages/design-system/src/icons/load-audio.svg
new file mode 100644
index 0000000000..85b89fea5f
--- /dev/null
+++ b/packages/design-system/src/icons/load-audio.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2 10V13M6 6V17M10 3V21M14 8V14.5M18 5V12.5M22 10V13M14 19.5L17 16.5M17 16.5V22M17 16.5L20 19.5" stroke="#8A8A8A" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/design-system/src/icons/load-video.svg b/packages/design-system/src/icons/load-video.svg
new file mode 100644
index 0000000000..18ad7b6a3c
--- /dev/null
+++ b/packages/design-system/src/icons/load-video.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11 21H5C3.89543 21 3 20.1046 3 19V5C3 3.89543 3.89543 3 5 3H19C20.1046 3 21 3.89543 21 5V15M14 19.5L17 16.5M17 16.5V22M17 16.5L20 19.5M9 8L15 12L9 16V8Z" stroke="#8A8A8A" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/design-system/src/icons/lora-loader-model-only.svg b/packages/design-system/src/icons/lora-loader-model-only.svg
new file mode 100644
index 0000000000..aaa9b6301f
--- /dev/null
+++ b/packages/design-system/src/icons/lora-loader-model-only.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.41 20H4C3.46957 20 2.96086 19.7893 2.58579 19.4142C2.21071 19.0391 2 18.5304 2 18V5C2 4.46957 2.21071 3.96086 2.58579 3.58579C2.96086 3.21071 3.46957 3 4 3H7.93C8.26111 3.00005 8.58702 3.08231 8.8785 3.2394C9.16997 3.39648 9.41789 3.62347 9.6 3.9L10.41 5.1C10.594 5.37938 10.8451 5.60815 11.1403 5.76538C11.4355 5.92261 11.7655 6.00328 12.1 6H20C20.5304 6 21.0391 6.21071 21.4142 6.58579C21.7893 6.96086 22 7.46957 22 8V15M14 19.5L17 16.5M17 16.5V22M17 16.5L20 19.5" stroke="#8A8A8A" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/design-system/src/icons/lora-loader.svg b/packages/design-system/src/icons/lora-loader.svg
new file mode 100644
index 0000000000..aaa9b6301f
--- /dev/null
+++ b/packages/design-system/src/icons/lora-loader.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.41 20H4C3.46957 20 2.96086 19.7893 2.58579 19.4142C2.21071 19.0391 2 18.5304 2 18V5C2 4.46957 2.21071 3.96086 2.58579 3.58579C2.96086 3.21071 3.46957 3 4 3H7.93C8.26111 3.00005 8.58702 3.08231 8.8785 3.2394C9.16997 3.39648 9.41789 3.62347 9.6 3.9L10.41 5.1C10.594 5.37938 10.8451 5.60815 11.1403 5.76538C11.4355 5.92261 11.7655 6.00328 12.1 6H20C20.5304 6 21.0391 6.21071 21.4142 6.58579C21.7893 6.96086 22 7.46957 22 8V15M14 19.5L17 16.5M17 16.5V22M17 16.5L20 19.5" stroke="#8A8A8A" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/design-system/src/icons/ltxv.svg b/packages/design-system/src/icons/ltxv.svg
new file mode 100644
index 0000000000..0f2db5f5e1
--- /dev/null
+++ b/packages/design-system/src/icons/ltxv.svg
@@ -0,0 +1,10 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1484_17507)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M419.563 282.517C419.627 282.517 419.627 282.517 419.563 282.517C431.125 256.512 439.488 231.872 442.688 211.221C446.784 184.832 442.859 164.011 430.912 149.291C416.619 131.648 394.347 126.741 372.117 126.571C355.776 126.571 336.64 129.408 316.203 134.208C301.803 78.8267 272.256 0 216.789 0C152.683 0 101.824 113.429 72.064 213.248C61.1626 249.941 42.6666 322.859 42.6666 358.677C42.6666 443.2 109.504 512 191.659 512C284.672 512 462.592 452.267 462.592 358.677C462.592 329.771 445.675 304.213 419.563 282.517ZM371.989 160.491C383.573 160.576 399.232 162.112 406.336 171.584C412.779 180.203 412.16 194.987 410.475 205.824C407.531 224.896 399.915 245.845 392.448 263.424C374.059 252.295 354.711 242.835 334.635 235.157C331.949 212.332 328.32 189.628 323.755 167.104C341.632 162.923 358.123 160.491 371.989 160.491ZM338.368 272.811C352.235 278.869 365.397 285.525 378.304 293.589C367 315.774 354.517 337.337 340.907 358.187C341.739 336.213 341.12 306.24 338.368 272.811ZM300.331 223.381C270.421 214.421 240.576 208.597 214.613 206.379C239.818 194.534 265.756 184.316 292.267 175.787C295.445 191.424 298.112 207.488 300.331 223.381ZM125.803 155.563C155.712 79.36 189.803 33.8987 216.981 33.8987C251.819 33.8987 275.584 107.989 284.715 142.869C249.773 153.916 215.784 167.779 183.083 184.32C151.509 200.192 119.808 221.397 98.3893 239.211C105.088 212.075 119.296 172.309 125.803 155.563ZM190.869 478.101C127.083 477.675 75.3493 424.235 75.3493 358.677C75.3493 292.757 127.531 239.189 191.701 239.189C224.704 239.189 265.899 246.976 304.683 259.883C308.949 303.616 309.803 343.68 307.627 369.131C302.165 433.173 247.616 477.931 190.869 478.101ZM345.408 441.365C332.907 447.125 319.659 452.373 306.048 456.939C338.944 422.016 376.896 367.061 404.693 313.429C421.035 328.427 429.931 343.893 429.931 358.656C429.973 386.411 399.125 416.555 345.408 441.365Z" fill="#B6B6B6"/>
+</g>
+<defs>
+<clipPath id="clip0_1484_17507">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/design-system/src/icons/luma.svg b/packages/design-system/src/icons/luma.svg
new file mode 100644
index 0000000000..a124becca8
--- /dev/null
+++ b/packages/design-system/src/icons/luma.svg
@@ -0,0 +1,35 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1471_13095)">
+<path d="M42.6667 127.979L264.363 0V512L42.6667 384V127.979Z" fill="black"/>
+<path d="M264.363 512L42.6667 384L264.363 256L486.08 384L264.363 512Z" fill="url(#paint0_linear_1471_13095)"/>
+<path d="M264.363 512L42.6667 384L264.363 256L486.08 384L264.363 512Z" fill="url(#paint1_linear_1471_13095)"/>
+<path d="M42.6667 127.979L264.363 0V512L42.6667 384V127.979Z" fill="url(#paint2_linear_1471_13095)" style="mix-blend-mode:screen"/>
+<path d="M264.363 512L42.6667 384L264.363 256L486.08 384L264.363 512Z" fill="url(#paint3_linear_1471_13095)" style="mix-blend-mode:overlay"/>
+<path d="M42.6667 127.979L264.363 0V512L42.6667 384V127.979Z" fill="url(#paint4_linear_1471_13095)" style="mix-blend-mode:overlay"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_1471_13095" x1="42.6667" y1="384" x2="486.08" y2="384" gradientUnits="userSpaceOnUse">
+<stop stop-color="#0000AA"/>
+<stop offset="1" stop-color="#A78DFF"/>
+</linearGradient>
+<linearGradient id="paint1_linear_1471_13095" x1="42.6667" y1="384" x2="486.08" y2="384" gradientUnits="userSpaceOnUse">
+<stop stop-color="#0000AA"/>
+<stop offset="1" stop-color="#A78DFF"/>
+</linearGradient>
+<linearGradient id="paint2_linear_1471_13095" x1="293.291" y1="483.029" x2="99.6694" y2="79.8933" gradientUnits="userSpaceOnUse">
+<stop stop-color="#004EFF"/>
+<stop offset="1" stop-color="#00FFFF"/>
+</linearGradient>
+<linearGradient id="paint3_linear_1471_13095" x1="42.6667" y1="384" x2="486.08" y2="384" gradientUnits="userSpaceOnUse">
+<stop stop-color="#0000AA"/>
+<stop offset="1" stop-color="#A78DFF"/>
+</linearGradient>
+<linearGradient id="paint4_linear_1471_13095" x1="293.291" y1="483.029" x2="99.6694" y2="79.8933" gradientUnits="userSpaceOnUse">
+<stop stop-color="#004EFF"/>
+<stop offset="1" stop-color="#00FFFF"/>
+</linearGradient>
+<clipPath id="clip0_1471_13095">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/design-system/src/icons/magnific.svg b/packages/design-system/src/icons/magnific.svg
new file mode 100644
index 0000000000..67d06535d6
--- /dev/null
+++ b/packages/design-system/src/icons/magnific.svg
@@ -0,0 +1,14 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<defs>
+  <linearGradient id="magnific_gradient" x1="0%" y1="0%" x2="100%" y2="100%">
+    <stop offset="0%" stop-color="#F19F3A"/>
+    <stop offset="13%" stop-color="#EA6040"/>
+    <stop offset="31%" stop-color="#E95267"/>
+    <stop offset="50%" stop-color="#7380BD"/>
+    <stop offset="66%" stop-color="#5FB2CF"/>
+    <stop offset="79%" stop-color="#91BB8F"/>
+    <stop offset="100%" stop-color="#E6B051"/>
+  </linearGradient>
+</defs>
+<path d="M492.858 461.125H19.1416L256 50.875L492.858 461.125ZM148.18 386.625H363.82L256 199.875L148.18 386.625Z" fill="url(#magnific_gradient)"/>
+</svg>
diff --git a/packages/design-system/src/icons/mask-preview.svg b/packages/design-system/src/icons/mask-preview.svg
new file mode 100644
index 0000000000..9c4609bdfc
--- /dev/null
+++ b/packages/design-system/src/icons/mask-preview.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.72252 3.06471C9.75827 2.70751 9.49768 2.38896 9.14048 2.35322C8.78328 2.31747 8.46473 2.57806 8.42898 2.93526L9.07575 2.99998L9.72252 3.06471ZM21.0718 15.56C21.4285 15.5204 21.6857 15.1991 21.6461 14.8423C21.6065 14.4855 21.2851 14.2284 20.9283 14.268L21 14.914L21.0718 15.56ZM9.29041 7.79037C9.03657 8.04421 9.03657 8.45576 9.29041 8.7096C9.54425 8.96344 9.95581 8.96344 10.2097 8.7096L9.75003 8.24998L9.29041 7.79037ZM15.4597 3.4596C15.7135 3.20576 15.7135 2.79421 15.4597 2.54037C15.2058 2.28652 14.7943 2.28652 14.5404 2.54037L15 2.99998L15.4597 3.4596ZM11.5404 11.5404L11.0808 12L12 12.9192L12.4597 12.4596L12 12L11.5404 11.5404ZM19.2097 5.7096C19.4635 5.45576 19.4635 5.04421 19.2097 4.79037C18.9558 4.53652 18.5443 4.53652 18.2904 4.79037L18.75 5.24998L19.2097 5.7096ZM15.2904 13.7904C15.0366 14.0442 15.0366 14.4558 15.2904 14.7096C15.5443 14.9634 15.9558 14.9634 16.2097 14.7096L15.75 14.25L15.2904 13.7904ZM21.4597 9.4596C21.7135 9.20576 21.7135 8.79421 21.4597 8.54037C21.2058 8.28652 20.7943 8.28652 20.5404 8.54037L21 8.99998L21.4597 9.4596ZM1.35 12C1.35 12.359 1.64101 12.65 2 12.65C2.35899 12.65 2.65 12.359 2.65 12H2H1.35ZM15.7398 20.5723C15.4108 20.716 15.2606 21.0992 15.4044 21.4282C15.5481 21.7571 15.9313 21.9073 16.2602 21.7635L16 21.1679L15.7398 20.5723ZM2.03128 18.6735L1.42191 18.8997C1.4246 18.9069 1.42743 18.9142 1.43038 18.9213L2.03128 18.6735ZM2.03128 18.3255L1.43038 18.0777C1.42743 18.0848 1.4246 18.0921 1.42191 18.0993L2.03128 18.3255ZM11.9688 18.3255L12.5782 18.0993C12.5755 18.0921 12.5726 18.0848 12.5697 18.0777L11.9688 18.3255ZM11.9688 18.6735L12.5697 18.9213C12.5726 18.9142 12.5755 18.9069 12.5782 18.8997L11.9688 18.6735ZM9.07575 2.99998L8.42898 2.93526C8.01458 7.07604 9.25668 10.461 11.6083 12.7037C13.9543 14.9412 17.3344 15.9749 21.0718 15.56L21 14.914L20.9283 14.268C17.5111 14.6473 14.5317 13.6954 12.5055 11.763C10.4848 9.83582 9.34203 6.8666 9.72252 3.06471L9.07575 2.99998ZM9.75003 8.24998L10.2097 8.7096L15.4597 3.4596L15 2.99998L14.5404 2.54037L9.29041 7.79037L9.75003 8.24998ZM12 12L12.4597 12.4596L19.2097 5.7096L18.75 5.24998L18.2904 4.79037L11.5404 11.5404L12 12ZM15.75 14.25L16.2097 14.7096L21.4597 9.4596L21 8.99998L20.5404 8.54037L15.2904 13.7904L15.75 14.25ZM2 12H2.65C2.65 6.83614 6.83614 2.65 12 2.65V2V1.35C6.11817 1.35 1.35 6.11817 1.35 12H2ZM12 2V2.65C17.1639 2.65 21.35 6.83614 21.35 12H22H22.65C22.65 6.11817 17.8818 1.35 12 1.35V2ZM22 12H21.35C21.35 15.8331 19.0434 19.1289 15.7398 20.5723L16 21.1679L16.2602 21.7635C20.0203 20.1207 22.65 16.3682 22.65 12H22ZM2.03128 18.6735L2.64065 18.4473C2.65316 18.481 2.65316 18.518 2.64065 18.5517L2.03128 18.3255L1.42191 18.0993C1.32607 18.3575 1.32607 18.6415 1.42191 18.8997L2.03128 18.6735ZM2.03128 18.3255L2.63218 18.5733C2.98893 17.7083 3.5945 16.9687 4.3721 16.4483L4.01057 15.9081L3.64903 15.3679C2.65747 16.0315 1.88529 16.9747 1.43038 18.0777L2.03128 18.3255ZM4.01057 15.9081L4.3721 16.4483C5.14971 15.9278 6.06433 15.65 7.00003 15.65V15V14.35C5.80688 14.35 4.64059 14.7043 3.64903 15.3679L4.01057 15.9081ZM7.00003 15V15.65C7.93573 15.65 8.85035 15.9278 9.62796 16.4483L9.98949 15.9081L10.351 15.3679C9.35947 14.7043 8.19318 14.35 7.00003 14.35V15ZM9.98949 15.9081L9.62796 16.4483C10.4056 16.9687 11.0111 17.7083 11.3679 18.5733L11.9688 18.3255L12.5697 18.0777C12.1148 16.9747 11.3426 16.0315 10.351 15.3679L9.98949 15.9081ZM11.9688 18.3255L11.3594 18.5517C11.3469 18.518 11.3469 18.481 11.3594 18.4473L11.9688 18.6735L12.5782 18.8997C12.674 18.6415 12.674 18.3575 12.5782 18.0993L11.9688 18.3255ZM11.9688 18.6735L11.3679 18.4257C11.0111 19.2907 10.4056 20.0303 9.62796 20.5507L9.98949 21.0909L10.351 21.6311C11.3426 20.9675 12.1148 20.0243 12.5697 18.9213L11.9688 18.6735ZM9.98949 21.0909L9.62796 20.5507C8.85035 21.0712 7.93573 21.349 7.00003 21.349V21.999V22.649C8.19318 22.649 9.35947 22.2947 10.351 21.6311L9.98949 21.0909ZM7.00003 21.999V21.349C6.06433 21.349 5.14971 21.0712 4.3721 20.5507L4.01057 21.0909L3.64903 21.6311C4.64059 22.2947 5.80688 22.649 7.00003 22.649V21.999ZM4.01057 21.0909L4.3721 20.5507C3.5945 20.0303 2.98893 19.2907 2.63218 18.4257L2.03128 18.6735L1.43038 18.9213C1.88529 20.0243 2.65747 20.9675 3.64903 21.6311L4.01057 21.0909ZM8.49995 18.4994H7.84995C7.84995 18.9688 7.46942 19.3494 7.00002 19.3494V19.9994V20.6494C8.18739 20.6494 9.14995 19.6868 9.14995 18.4994H8.49995ZM7.00002 19.9994V19.3494C6.53062 19.3494 6.1501 18.9688 6.1501 18.4994H5.5001H4.8501C4.8501 19.6868 5.81265 20.6494 7.00002 20.6494V19.9994ZM5.5001 18.4994H6.1501C6.1501 18.03 6.53062 17.6495 7.00002 17.6495V16.9995V16.3495C5.81265 16.3495 4.8501 17.3121 4.8501 18.4994H5.5001ZM7.00002 16.9995V17.6495C7.46942 17.6495 7.84995 18.03 7.84995 18.4994H8.49995H9.14995C9.14995 17.3121 8.18739 16.3495 7.00002 16.3495V16.9995Z" fill="#8A8A8A"/>
+</svg>
diff --git a/packages/design-system/src/icons/meshy.svg b/packages/design-system/src/icons/meshy.svg
new file mode 100644
index 0000000000..e0bdc68ff1
--- /dev/null
+++ b/packages/design-system/src/icons/meshy.svg
@@ -0,0 +1,33 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1485_17648)">
+<path d="M77.2098 19.4619C78.2934 20.5687 82.6957 43.8103 87.369 48.6664C92.0422 53.5225 108.455 55.9167 114.844 59.395C116.853 60.4792 120.962 61.1794 117.711 64.4092C116.56 65.5386 89.1073 71.6144 86.7594 73.9408C85.3823 75.296 77.0066 108.182 72.7849 104.884C70.0532 98.4924 65.4929 78.4355 61.4969 74.5506C57.7493 70.9142 41.6978 67.7972 35.4894 64.6125C33.7511 63.7316 28.4457 63.822 32.3062 59.9371C34.3606 57.8817 57.7719 52.8449 61.4743 49.7506C65.1768 46.6562 68.1117 28.745 72.1979 22.3078C73.3267 20.5235 73.9137 16.0739 77.2323 19.4394L77.2098 19.4619Z" fill="#C4F855"/>
+<path d="M30.5227 120.153C31.7193 121.35 53.5276 124.196 48.0191 129.617C47.3644 130.249 33.1641 131.559 30.5453 134.676C27.7007 138.064 28.5586 148.477 24.4046 152.113C19.6637 148.544 19.5057 137.996 15.9612 134.721C13.7939 132.711 -3.9959 130.136 0.790199 125.19C1.85127 124.083 13.0038 122.841 15.9612 120.085C19.4831 116.788 19.6637 106.262 24.4046 102.694C28.0168 105.607 28.5812 118.278 30.5002 120.176L30.5227 120.153Z" fill="#C4F855"/>
+<path d="M299.764 493.803C279.174 495.361 246.123 495.429 225.579 493.803C177.56 490.008 133.469 472.617 97.4379 440.995C64.4318 412.039 69.2179 359.368 108.681 340.937C111.435 361.626 124.619 376.85 144.622 382.564C169.229 389.588 177.041 385.026 189.615 363.433C70.6854 363.162 58.2912 238.62 103.037 152.045C161.147 39.6092 299.515 -21.5779 415.917 43.8103C504.324 93.4782 552.298 215.943 468.406 292.602C495.587 315.595 510.081 345.07 500.509 380.938C481.365 452.673 365.189 488.856 299.786 493.803H299.764Z" fill="#C4F855"/>
+<path d="M200.881 464.553L239.576 459.471C269.986 453.621 303.105 445.355 328.774 427.285C332.408 424.733 338.639 422.994 337.939 417.37C286.692 440.905 229.688 452.131 173.361 443.728C140.355 438.805 87.0078 422.61 104.211 379.176L115.634 398.058C184.152 436.794 298.161 414.411 364.963 378.092C370.065 375.314 405.916 350.355 407.609 352.208C401.942 383.626 378.463 408.448 355.933 429.77C364.805 432.209 377.741 423.852 385.823 419.199C431.697 392.931 464.816 347.239 425.602 298.271C501.502 330.457 488.431 392.638 424.044 430.448C358.98 468.664 274.366 474.627 200.836 464.576L200.881 464.553Z" fill="#181818"/>
+<path d="M315.499 145.36L319.36 149.199C302.044 195.434 258.969 230.082 212.146 242.527C203.838 246.186 196.659 253.82 203.297 262.448L224.428 284.403C231.517 292.76 240.141 304.731 230.094 313.946C227.227 314.646 219.596 315.934 216.616 316.205C210.273 314.262 196.953 304.776 198.623 298.226L189.457 297.435C168.101 287.09 144.712 283.928 121.188 284.199L115.476 280.247C113.851 277.853 112.564 276.226 110.983 273.493C109.019 272.658 107.529 270.399 106.491 266.74C102.224 236.451 106.243 209.889 117.756 181.34L125.748 196.925C127.396 200.313 131.121 201.645 133.469 203.791C165.866 233.583 225.331 222.086 260.03 201.103C281.545 188.071 302.631 162.458 315.544 140.842C318.208 141.068 316.944 143.349 315.544 145.337L315.499 145.36Z" fill="#FE3E8E"/>
+<path d="M304.256 264.504C356.768 258.428 345.999 349.994 315.499 370.164C311.751 372.264 308.839 374.817 304.256 376.917C280.168 387.94 266.103 387.781 241.314 388.165C261.971 348.594 248.787 277.017 304.256 264.526V264.504Z" fill="#FEFEFE"/>
+<path d="M304.256 68.9266C303.782 70.7561 302.066 71.0271 301.999 71.1852C288.814 80.2199 268.315 84.5339 252.557 82.4333C250.706 88.735 237.905 96.0079 232.329 91.4228C223.705 95.6917 199.684 110.17 194.108 111.66C192.866 116.042 190.857 115.974 189.616 111.66C187.787 116.313 183.249 118.843 175.957 119.227C175.618 126.455 173.429 130.678 169.387 131.898C153.359 142.039 141.551 156.743 131.166 172.373C128.051 175.355 126.945 174.09 128.909 170.114C135.298 152.339 142.793 138.177 153.629 122.909C168.372 113.377 180.382 100.977 195.643 91.8745C208.873 83.9918 228.559 74.0989 243.549 71.2078C262.378 66.9841 287.121 61.5182 304.234 68.9492L304.256 68.9266Z" fill="#E8FDCC"/>
+<path d="M252.557 82.4108C255.628 82.0494 256.395 82.7947 254.815 84.6694C262.513 101.564 260.572 154.214 234.587 154.372C233.232 153.739 230.32 154.53 228.898 152.294C224.902 145.992 236.822 103.077 232.329 91.4454C241.811 86.77 240.073 86.2053 252.557 82.4559V82.4108Z" fill="#1A1919"/>
+<path d="M189.616 111.638C202.439 126.748 197.201 182.085 171.623 183.576C170.336 183.17 165.482 181.34 165.279 180.979C162.705 176.619 168.62 155.636 169.342 148.68C169.907 143.101 168.981 137.409 169.388 131.853C170.968 110.26 172.548 116.178 189.616 111.615V111.638Z" fill="#1A1919"/>
+<path d="M194.108 111.638C206.119 120.831 199.775 157.059 195.689 170.566C191.986 182.853 184.333 187.506 171.623 183.576C193.047 172.938 193.499 132.643 189.616 111.638C190.902 111.299 192.821 111.977 194.108 111.638Z" fill="#FA418C"/>
+<path d="M254.815 149.854C254.77 153.784 246.484 160.967 243.572 156.608C238.854 157.466 237.951 155.953 234.587 154.349C257.592 144.343 252.806 106.014 254.815 84.6468C255.266 82.8625 259.985 81.9816 261.407 82.5237C273.056 87.0184 267.593 145.337 254.815 149.832V149.854Z" fill="#FB428C"/>
+<path d="M257.05 152.09C252.873 156.856 250.164 159.183 245.807 163.339L243.55 156.585C245.31 156.269 253.776 151.119 254.792 149.832C257.953 146.85 259.104 148.115 257.05 152.09Z" fill="#C4F855"/>
+<path d="M131.189 172.328C129.27 175.242 128.751 180.324 124.461 181.317C123.355 176.642 127.735 173.39 128.931 170.069L131.189 172.328Z" fill="#E1FDB3"/>
+<path d="M230.072 313.968C236.89 289.078 196.592 272.454 196.163 256.576C195.598 236.519 228.762 233.831 244.362 225.971C268.248 213.955 311.774 172.463 315.499 145.36C316.673 141.384 318.186 137.635 319.992 134.111C326.697 112.88 340.671 92.7328 340.22 68.904C359.048 67.9102 374.219 88.8254 373.61 106.127C373.271 115.455 349.566 137.432 342.906 149.177C332.092 168.24 328.029 191.368 315.093 209.054C295.384 235.977 261.61 245.373 246.913 278.011C241.721 289.575 241.631 311.1 230.049 313.991L230.072 313.968Z" fill="#C81C65"/>
+<path d="M198.623 298.226C193.092 307.983 174.354 308.006 163.45 307.283C150.469 306.425 139.926 303.127 128.931 295.967C121.256 288.897 121.052 288.446 115.453 280.224C144.328 278.711 174.106 282.076 198.623 298.203V298.226Z" fill="#C4F755"/>
+<path d="M302.021 71.1626C292.539 101.926 278.339 127.855 257.073 152.09L254.815 149.832C257.953 145.834 260.436 131.627 261.294 125.958C262.581 117.307 265.403 93.1394 260.346 86.8603C258.472 84.5339 256.576 85.3018 254.815 84.6242C253.912 84.2854 253.167 83.1561 252.557 82.3656C268.88 77.4643 285.089 73.4891 301.999 71.1175L302.021 71.1626Z" fill="#C4F855"/>
+<path d="M153.652 122.886C225.511 21.6077 395.17 11.3534 463.439 122.163C506.966 192.791 488.769 291.653 391.919 287C390.429 288.423 398.082 308.299 398.466 313.133C401.762 353.834 347.015 371.768 315.138 377.708C311.864 378.318 306.378 381.141 304.256 376.895C302.563 370.909 311.232 364.992 315.499 370.141L326.606 358.622C384.559 334.071 366.114 261.048 304.256 264.481L301.412 269.857C279.31 275.955 268.993 296.374 264.094 317.244C260.278 340.372 254.815 363.027 247.681 385.207L241.314 388.12C239.712 388.143 234.226 392.186 229.011 392.683C225.127 393.044 205.306 393.789 205.396 389.25C205.419 387.894 218.987 374.546 222.305 367.973C227.001 358.645 228.785 348.368 232.329 338.678C177.876 345.364 124.281 337.639 108.703 277.965C108.297 274.645 109.042 273.155 110.961 273.471C117.124 271.415 118.704 274.803 115.453 280.224C122.497 281.489 130.67 288.468 128.931 295.967C153.9 310.355 182.752 315.595 211.288 312.116L216.594 316.182C216.978 309.406 226.934 308.299 230.072 313.923C241.111 271.935 259.24 245.283 297.303 221.409C316.041 200.81 329.948 175.964 339.023 146.873L368.169 108.747C373.203 96.6855 358.1 74.8443 344.667 73.5794C341.213 93.6815 334.847 113.038 325.545 131.627L319.969 134.089C318.75 137.228 317.26 139.487 315.476 140.842C295.926 196.744 229.439 233.718 171.532 225.361C158.957 223.554 134.214 217.659 133.424 203.791C137.691 203.768 141.19 207.269 144.667 208.286C146.066 206.682 147.805 205.395 149.95 205.485C181.511 206.885 203.274 206.321 231.584 189.019C274.885 162.548 303.985 116.426 314.483 67.2552C310.352 66.8486 306.423 66.4195 304.234 62.1732L301.389 65.1094C281.771 64.6125 262.491 66.6453 243.527 71.1852L241.066 76.335C211.04 84.9856 184.31 103.01 161.034 123.292L153.607 122.909L153.652 122.886Z" fill="#181818"/>
+<path d="M304.256 62.1732C309.494 62.3313 314.777 62.0376 319.992 62.1732C310.713 118.662 271.16 178.562 217.384 201.216C196.185 210.16 166.949 214.904 144.644 208.286L142.409 199.296C143.267 198.212 145.276 201.532 145.75 201.532H181.714C200.226 201.532 232.758 175.716 245.784 163.316C244.949 157.985 252.309 152.903 257.027 152.068C264.861 136.099 273.688 120.492 283.509 105.268C287.956 91.8971 294.12 80.5361 301.999 71.14C301.502 70.1462 302.247 69.4009 304.256 68.8814C298.048 68.136 298.161 63.7768 304.256 62.128V62.1732Z" fill="#67B700"/>
+<path d="M110.961 273.493L108.703 277.988C107.439 273.155 107.168 271.822 106.446 266.74C109.177 268.298 109.606 271.167 110.938 273.493H110.961Z" fill="#363524"/>
+<path d="M412.147 118.391L394.673 149.244C384.83 176.687 385.71 206.66 405.013 229.698C392.483 242.188 388.645 254.611 373.023 237.31C343.516 204.649 372.526 132.711 412.124 118.391H412.147Z" fill="#4C8600"/>
+<path d="M315.499 370.164C320.669 359.39 328.39 349.926 331.912 338.249C339.475 313.11 340.062 264.12 304.256 264.504C345.525 255.198 371.126 285.283 364.805 326.188C361.915 344.889 330.805 361.581 315.499 370.164Z" fill="#FE96C1"/>
+<path d="M198.623 298.226C206.751 303.579 212.146 306.402 216.616 316.205C183.43 319.118 153.787 318.847 128.954 295.967C151.801 304.053 175.347 305.295 198.646 298.226H198.623Z" fill="#67B601"/>
+<path d="M304.256 62.1732C303.94 64.2737 304.73 67.097 304.256 68.9266C284.141 69.4912 263.416 67.3455 243.572 71.1852C262.626 63.0089 283.848 61.5859 304.256 62.1958V62.1732Z" fill="#C1F258"/>
+<path d="M315.499 145.36C315.702 143.914 315.364 142.333 315.499 140.865C316.628 138.968 315.928 135.15 319.992 134.111C318.885 137.635 320.33 142.581 315.499 145.36Z" fill="#E6327E"/>
+</g>
+<defs>
+<clipPath id="clip0_1485_17648">
+<rect width="512" height="478" fill="white" transform="translate(0 17)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/design-system/src/icons/minimax.svg b/packages/design-system/src/icons/minimax.svg
new file mode 100644
index 0000000000..a72b1c52a6
--- /dev/null
+++ b/packages/design-system/src/icons/minimax.svg
@@ -0,0 +1,14 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1484_17519)">
+<path d="M347.264 42.6667C371.925 42.6667 391.915 62.4427 391.915 86.8267V353.515C392.086 357.601 393.836 361.461 396.797 364.282C399.757 367.103 403.697 368.666 407.787 368.64C411.873 368.66 415.807 367.095 418.763 364.275C421.719 361.454 423.466 357.597 423.637 353.515V194.112C423.668 188.341 424.835 182.632 427.072 177.312C429.309 171.992 432.572 167.165 436.675 163.106C440.777 159.047 445.639 155.835 450.983 153.655C456.327 151.475 462.048 150.369 467.819 150.4C473.592 150.369 479.314 151.476 484.659 153.657C490.004 155.839 494.867 159.052 498.97 163.113C503.073 167.174 506.336 172.004 508.571 177.327C510.807 182.649 511.972 188.36 512 194.133V334.101C511.977 337.77 510.5 341.279 507.892 343.859C505.284 346.439 501.759 347.878 498.091 347.861C496.272 347.873 494.47 347.526 492.786 346.84C491.102 346.155 489.569 345.144 488.275 343.867C486.982 342.589 485.953 341.069 485.247 339.393C484.54 337.718 484.171 335.92 484.16 334.101V194.133C484.149 191.999 483.717 189.887 482.89 187.919C482.063 185.951 480.856 184.165 479.338 182.664C477.821 181.162 476.023 179.974 474.046 179.167C472.07 178.361 469.953 177.951 467.819 177.963C465.684 177.951 463.568 178.361 461.591 179.167C459.615 179.974 457.816 181.162 456.299 182.664C454.781 184.165 453.575 185.951 452.747 187.919C451.92 189.887 451.489 191.999 451.477 194.133V353.536C451.447 359.243 450.292 364.888 448.08 370.148C445.867 375.409 442.641 380.182 438.584 384.195C434.527 388.209 429.719 391.384 424.435 393.539C419.15 395.695 413.493 396.788 407.787 396.757C402.08 396.788 396.423 395.695 391.139 393.539C385.855 391.384 381.047 388.209 376.99 384.195C372.933 380.182 369.706 375.409 367.494 370.148C365.281 364.888 364.127 359.243 364.096 353.536V86.8693C363.919 82.5361 362.068 78.4405 358.933 75.4443C355.798 72.4481 351.622 70.7851 347.285 70.8053C342.948 70.7794 338.771 72.437 335.631 75.4292C332.492 78.4214 330.636 82.5149 330.453 86.848L330.432 426.133C330.364 437.655 325.724 448.678 317.531 456.779C309.338 464.88 298.263 469.396 286.741 469.333C281.035 469.364 275.378 468.271 270.093 466.115C264.809 463.96 260.001 460.785 255.944 456.771C251.887 452.758 248.661 447.985 246.448 442.724C244.236 437.464 243.081 431.819 243.051 426.112V384.853C243.051 377.259 249.28 371.093 256.96 371.093C264.64 371.093 270.869 377.259 270.869 384.853V426.112C270.869 431.723 273.899 436.907 278.805 439.723C283.712 442.517 289.771 442.517 294.677 439.723C297.085 438.358 299.088 436.379 300.482 433.988C301.876 431.597 302.611 428.88 302.613 426.112V86.8267C302.613 62.4427 322.603 42.6667 347.264 42.6667ZM226.219 42.6667C250.88 42.6667 270.869 62.4427 270.869 86.8267V332.651C270.861 334.468 270.494 336.266 269.791 337.941C269.087 339.616 268.06 341.137 266.768 342.415C265.476 343.693 263.945 344.703 262.262 345.389C260.579 346.075 258.777 346.422 256.96 346.411C255.143 346.422 253.341 346.075 251.658 345.389C249.975 344.703 248.444 343.693 247.152 342.415C245.86 341.137 244.833 339.616 244.129 337.941C243.426 336.266 243.059 334.468 243.051 332.651V86.8267C243.022 82.3889 241.234 78.1437 238.078 75.0237C234.922 71.9037 230.657 70.164 226.219 70.1867C221.781 70.164 217.515 71.9037 214.359 75.0237C211.203 78.1437 209.415 82.3889 209.387 86.8267V385.771C209.319 397.419 204.63 408.563 196.349 416.756C188.069 424.948 176.875 429.518 165.227 429.461C153.575 429.524 142.375 424.956 134.09 416.763C125.805 408.57 121.113 397.422 121.045 385.771V194.133C121.034 191.999 120.603 189.887 119.775 187.919C118.948 185.951 117.741 184.165 116.224 182.664C114.706 181.162 112.908 179.974 110.931 179.167C108.955 178.361 106.839 177.951 104.704 177.963C102.569 177.951 100.453 178.361 98.4766 179.167C96.5 179.974 94.7017 181.162 93.1842 182.664C91.6668 184.165 90.46 185.951 89.6327 187.919C88.8054 189.887 88.3739 191.999 88.3627 194.133V275.2C88.3319 280.971 87.1648 286.68 84.9278 292C82.6908 297.32 79.4279 302.147 75.3252 306.206C71.2226 310.265 66.3606 313.477 61.017 315.657C55.6733 317.837 49.9525 318.943 44.1813 318.912C38.4102 318.943 32.6894 317.837 27.3457 315.657C22.002 313.477 17.1401 310.265 13.0374 306.206C8.9348 302.147 5.67185 297.32 3.43488 292C1.19791 286.68 0.0307347 280.971 0 275.2L0 245.803C0 238.187 6.22933 232.021 13.9093 232.021C21.5893 232.021 27.84 238.208 27.84 245.803V275.2C27.84 284.117 35.1573 291.349 44.1813 291.349C53.2053 291.349 60.5227 284.117 60.5227 275.2V194.112C60.5904 182.464 65.2796 171.319 73.5601 163.127C81.8405 154.935 93.0346 150.365 104.683 150.421C116.334 150.359 127.534 154.926 135.819 163.119C144.104 171.312 148.796 182.46 148.864 194.112V385.771C148.864 394.709 156.181 401.941 165.227 401.941C174.251 401.941 181.568 394.709 181.568 385.771V86.8267C181.568 62.4427 201.557 42.6667 226.219 42.6667Z" fill="url(#paint0_linear_1484_17519)"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_1484_17519" x1="0" y1="21400.4" x2="51293.2" y2="21400.4" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E2167E"/>
+<stop offset="1" stop-color="#FE603C"/>
+</linearGradient>
+<clipPath id="clip0_1484_17519">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/design-system/src/icons/moonvalley-marey.svg b/packages/design-system/src/icons/moonvalley-marey.svg
new file mode 100644
index 0000000000..f8201735f8
--- /dev/null
+++ b/packages/design-system/src/icons/moonvalley-marey.svg
@@ -0,0 +1,18 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1484_17527)">
+<g clip-path="url(#clip1_1484_17527)">
+<path d="M512 0.256927V512H0.256958V0.256927H512ZM100.809 185.251H61.6616V327.263H87.5061V211.866L153.65 327.015L154.401 327.282C161.367 326.73 169.341 327.967 176.183 327.282C177.772 327.12 177.534 326.254 178.39 325.141L243.335 211.876V326.892C243.335 326.892 243.687 327.272 243.715 327.272H269.179V185.261H230.412L166.163 296.289L165.287 297.336C144.02 259.854 122.019 222.733 100.809 185.261V185.251ZM316.13 185.251H286.574L360.901 327.006L361.653 327.272L397.108 327.13L397.669 326.406C421.677 280.246 446.37 234.447 470.417 188.325C470.921 187.354 471.511 186.298 471.815 185.251H441.879L379.314 304.749L316.12 185.251H316.13Z" fill="#DAD9C5"/>
+<path d="M0.256923 512H0V0H512V0.256923H0.256923V512Z" fill="#FEFEFE"/>
+<path d="M100.809 185.251C122.019 222.724 144.029 259.844 165.287 297.327L166.163 296.28L230.412 185.251H269.179V327.263H243.715C243.715 327.263 243.335 326.911 243.335 326.882V211.866L178.39 325.131C177.543 326.245 177.772 327.12 176.183 327.272C169.341 327.957 161.367 326.72 154.401 327.272L153.649 327.006L87.506 211.857V327.253H61.6615V185.242H100.809V185.251Z" fill="#110D09"/>
+<path d="M316.13 185.251L379.323 304.749L441.889 185.251H471.825C471.52 186.298 470.93 187.354 470.426 188.325C446.38 234.457 421.677 280.255 397.679 326.406L397.117 327.13L361.662 327.272L360.91 327.006L286.583 185.251H316.139H316.13Z" fill="#110D09"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_1484_17527">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+<clipPath id="clip1_1484_17527">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/design-system/src/icons/nodeSlot2.svg b/packages/design-system/src/icons/nodeSlot2.svg
deleted file mode 100644
index cc12805700..0000000000
--- a/packages/design-system/src/icons/nodeSlot2.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-  <defs>
-    <clipPath id="hollow">
-      <path
-    d="M -50 50
-       A 100 100, 0, 0, 1, 150 50
-       A 100 100, 0, 0, 1, -50 50
-       M 30 50
-       A 20 20, 0, 0, 0, 70 50
-       A 20 20, 0, 0, 0, 30 50"/>
-    </clipPath>
-  </defs>
-  <g clip-path="var(--shape)" stroke-width="4">
-    <path d="M 50 0 A 50 50, 0, 0, 1, 50 100" fill="var(--type1, red)"/>
-    <path d="M 50 100 A 50 50, 0, 0, 1, 50 0" fill="var(--type2, blue)"/>
-    <path d="M50 0L50 100" stroke="var(--inner-stroke, black)"/>
-    <path d="M50 2A48 48 0 0 1 50 98A48 48 0 0 1 50 2" fill="transparent" stroke="var(--outer-stroke, transparent)"/>
-  </g>
-</svg>
diff --git a/packages/design-system/src/icons/nodeSlot3.svg b/packages/design-system/src/icons/nodeSlot3.svg
deleted file mode 100644
index fc94a178bb..0000000000
--- a/packages/design-system/src/icons/nodeSlot3.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-  <defs>
-    <clipPath id="hollow">
-        <path
-    d="M-50 50
-       A100 100 0 0 1 150 50
-       A100 100 0 0 1 -50 50
-       M30 50
-       A20 20 0 0 0 70 50
-       A20 20 0 0 0 30 50"/>
-    </clipPath>
-  </defs>
-  <g clip-path="var(--shape)" stroke-width="4">
-    <path d="M50 0A50 50 0 0 1 93 75L50 50" fill="var(--type1, red)"/>
-    <path d="M93 75A50 50 0 0 1 7 75L50 50" fill="var(--type2, blue)"/>
-    <path d="M7 75A50 50 0 0 1 50 0L50 50" fill="var(--type3, green)"/>
-    <path d="M50 50L50 0M50 50L93 75M50 50L7 75" stroke="var(--inner-stroke, black)"/>
-    <path d="M50 2A48 48 0 0 1 50 98A48 48 0 0 1 50 2" fill="transparent" stroke="var(--outer-stroke, transparent)"/>
-  </g>
-</svg>
diff --git a/packages/design-system/src/icons/open-ai-chat-node.svg b/packages/design-system/src/icons/open-ai-chat-node.svg
new file mode 100644
index 0000000000..7a6df566d4
--- /dev/null
+++ b/packages/design-system/src/icons/open-ai-chat-node.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.3333 11.0335H3M15 15.0335H3M11.0667 18.9667H3M17.7169 10.6415L18.8234 8.05975C18.8689 7.95355 18.9535 7.86892 19.0597 7.8234L21.6415 6.71693C22.0051 6.56108 22.0051 6.04555 21.6415 5.8897L19.0597 4.78323C18.9535 4.73772 18.8689 4.65309 18.8234 4.54688L17.7169 1.96512C17.5611 1.60147 17.0455 1.60147 16.8897 1.96512L15.7832 4.54688C15.7377 4.65309 15.6531 4.73772 15.5469 4.78323L12.9651 5.8897C12.6015 6.04555 12.6015 6.56108 12.9651 6.71693L15.5469 7.8234C15.6531 7.86892 15.7377 7.95355 15.7832 8.05975L16.8897 10.6415C17.0455 11.0052 17.5611 11.0052 17.7169 10.6415Z" stroke="#8A8A8A" stroke-width="1.3" stroke-linecap="round"/>
+</svg>
diff --git a/packages/design-system/src/icons/openai.svg b/packages/design-system/src/icons/openai.svg
new file mode 100644
index 0000000000..ec77e07300
--- /dev/null
+++ b/packages/design-system/src/icons/openai.svg
@@ -0,0 +1,10 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1483_15836)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M196.373 184.704V136.491C196.373 132.437 197.909 129.387 201.451 127.36L298.368 71.552C311.573 63.936 327.296 60.3947 343.531 60.3947C404.416 60.3947 442.987 107.584 442.987 157.803C442.987 161.365 442.987 165.419 442.475 169.472L341.995 110.613C339.266 108.876 336.099 107.954 332.864 107.954C329.629 107.954 326.462 108.876 323.733 110.613L196.373 184.704ZM422.699 372.437V257.28C422.699 250.176 419.648 245.12 413.547 241.557L286.187 167.467L327.787 143.616C329.294 142.624 331.059 142.095 332.864 142.095C334.669 142.095 336.434 142.624 337.941 143.616L434.859 199.445C462.784 215.659 481.557 250.176 481.557 283.669C481.557 322.24 458.731 357.76 422.677 372.48L422.699 372.437ZM166.443 270.997L124.843 246.635C121.28 244.608 119.744 241.557 119.744 237.504V125.845C119.744 71.552 161.344 30.4427 217.685 30.4427C239.019 30.4427 258.795 37.5467 275.541 50.24L175.573 108.096C169.493 111.637 166.443 116.715 166.443 123.819V270.976V270.997ZM256 322.731L196.373 289.237V218.197L256 184.704L315.627 218.197V289.237L256 322.731ZM294.315 476.971C272.981 476.971 253.205 469.888 236.459 457.195L336.427 399.339C342.507 395.797 345.557 390.72 345.557 383.616V236.459L387.669 260.821C391.232 262.848 392.747 265.899 392.747 269.952V381.589C392.747 435.883 350.635 476.971 294.315 476.971ZM174.059 363.84L77.12 308.011C49.216 291.776 30.4427 257.28 30.4427 223.787C30.3769 204.756 35.9917 186.138 46.5684 170.317C57.1451 154.495 72.2025 142.19 89.8133 134.976V250.667C89.8133 257.771 92.864 262.848 98.944 266.411L225.813 339.989L184.213 363.84C182.707 364.835 180.941 365.365 179.136 365.365C177.331 365.365 175.565 364.835 174.059 363.84ZM168.469 447.04C111.125 447.04 69.0133 403.925 69.0133 350.635C69.0133 346.581 69.5253 342.528 70.016 338.475L169.984 396.288C176.085 399.851 182.165 399.851 188.245 396.288L315.605 322.731V370.944C315.605 374.997 314.112 378.048 310.549 380.075L213.632 435.883C200.427 443.499 184.704 447.04 168.469 447.04ZM294.315 507.413C323.553 507.416 351.895 497.319 374.547 478.831C397.198 460.343 412.768 434.598 418.624 405.952C475.456 391.232 512 337.92 512 283.648C512 248.128 496.789 213.632 469.376 188.757C471.915 178.091 473.429 167.445 473.429 156.8C473.429 84.2453 414.571 29.9307 346.581 29.9307C332.885 29.9307 319.701 31.9573 306.475 36.544C282.795 13.2354 250.933 0.118797 217.707 1.37049e-07C188.465 -0.00135846 160.121 10.0985 137.469 28.5908C114.817 47.0831 99.2486 72.8325 93.3973 101.483C36.544 116.203 0 169.493 0 223.787C0 259.328 15.2107 293.824 42.624 318.677C40.0853 329.344 38.5707 340.011 38.5707 350.656C38.5707 423.211 97.4293 477.504 165.419 477.504C179.115 477.504 192.299 475.477 205.525 470.912C229.208 494.23 261.08 507.347 294.315 507.456V507.413Z" fill="#B6B6B6"/>
+</g>
+<defs>
+<clipPath id="clip0_1483_15836">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/design-system/src/icons/pixverse.svg b/packages/design-system/src/icons/pixverse.svg
new file mode 100644
index 0000000000..5fcad5cd88
--- /dev/null
+++ b/packages/design-system/src/icons/pixverse.svg
@@ -0,0 +1,15 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1485_17548)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M374.997 200.192C385.237 200.192 393.557 208.512 393.557 218.752V301.248L484.117 223.104C485.462 221.938 487.114 221.183 488.876 220.929C490.638 220.676 492.435 220.935 494.054 221.674C495.673 222.414 497.045 223.604 498.007 225.102C498.968 226.6 499.479 228.343 499.477 230.123V459.072C499.477 460.828 498.979 462.547 498.043 464.032C497.106 465.517 495.768 466.706 494.184 467.463C492.599 468.219 490.833 468.512 489.09 468.307C487.346 468.102 485.696 467.407 484.331 466.304L393.557 392.896V475.904C393.554 480.325 391.973 484.599 389.099 487.957L387.243 489.835C385.26 491.575 382.93 492.873 380.406 493.642C377.883 494.411 375.224 494.633 372.608 494.293L139.925 464.213V492.032C139.925 496.951 137.973 501.668 134.497 505.148C131.021 508.628 126.305 510.586 121.387 510.592H18.56C13.6413 510.592 8.9237 508.64 5.44363 505.163C1.96357 501.687 0.00565371 496.972 0 492.053L0 218.773C0 208.533 8.32 200.213 18.56 200.192H374.997ZM243.627 292.949H148.864C146.406 292.949 144.049 293.924 142.31 295.66C140.57 297.396 139.59 299.751 139.584 302.208V362.944C139.584 368.064 143.744 372.203 148.864 372.203H243.627C248.747 372.203 252.885 368.064 252.907 362.944V302.208C252.901 299.751 251.921 297.396 250.181 295.66C248.441 293.924 246.084 292.949 243.627 292.949ZM273.621 0C298.256 0 321.882 9.78611 339.301 27.2055C356.721 44.6249 366.507 68.2506 366.507 92.8853C366.507 117.52 356.721 141.146 339.301 158.565C321.882 175.985 298.256 185.771 273.621 185.771C248.987 185.771 225.361 175.985 207.941 158.565C190.522 141.146 180.736 117.52 180.736 92.8853C180.736 68.2506 190.522 44.6249 207.941 27.2055C225.361 9.78611 248.987 0 273.621 0ZM103.381 28.0107C113.545 28.0107 123.61 30.0126 133 33.9022C142.39 37.7918 150.923 43.4928 158.11 50.6798C165.297 57.8668 170.998 66.399 174.887 75.7893C178.777 85.1796 180.779 95.244 180.779 105.408C180.779 115.572 178.777 125.636 174.887 135.027C170.998 144.417 165.297 152.949 158.11 160.136C150.923 167.323 142.39 173.024 133 176.914C123.61 180.803 113.545 182.805 103.381 182.805C82.8543 182.805 63.168 174.651 48.6531 160.136C34.1383 145.621 25.984 125.935 25.984 105.408C25.984 84.881 34.1383 65.1946 48.6531 50.6798C63.168 36.165 82.8543 28.0107 103.381 28.0107Z" fill="url(#paint0_linear_1485_17548)"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_1485_17548" x1="320" y1="21.3333" x2="-10.6667" y2="512" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E8632A" stop-opacity="0.996"/>
+<stop offset="0.586" stop-color="#B465E6" stop-opacity="0.996"/>
+<stop offset="1" stop-color="#979FD9" stop-opacity="0.996"/>
+</linearGradient>
+<clipPath id="clip0_1485_17548">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/design-system/src/icons/preview-image.svg b/packages/design-system/src/icons/preview-image.svg
new file mode 100644
index 0000000000..d3433c8738
--- /dev/null
+++ b/packages/design-system/src/icons/preview-image.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 14.9999L17.914 11.9139C17.5389 11.539 17.0303 11.3284 16.5 11.3284C15.9697 11.3284 15.4611 11.539 15.086 11.9139L12.6935 14.3064M14.5 21H19C20.1046 21 21 20.1046 21 19V5C21 3.89543 20.1046 3 19 3H5C3.89543 3 3 3.89543 3 5V13M11 9C11 10.1046 10.1046 11 9 11C7.89543 11 7 10.1046 7 9C7 7.89543 7.89543 7 9 7C10.1046 7 11 7.89543 11 9ZM2.03125 18.6735C1.98958 18.5613 1.98958 18.4378 2.03125 18.3255C2.43708 17.3415 3.12595 16.5001 4.01054 15.9081C4.89512 15.3161 5.93558 15 7 15C8.06442 15 9.10488 15.3161 9.98946 15.9081C10.874 16.5001 11.5629 17.3415 11.9687 18.3255C12.0104 18.4378 12.0104 18.5613 11.9687 18.6735C11.5629 19.6575 10.874 20.4989 9.98946 21.0909C9.10488 21.683 8.06442 21.999 7 21.999C5.93558 21.999 4.89512 21.683 4.01054 21.0909C3.12595 20.4989 2.43708 19.6575 2.03125 18.6735ZM8.49992 18.4995C8.49992 19.3278 7.82838 19.9994 6.99999 19.9994C6.17161 19.9994 5.50007 19.3278 5.50007 18.4995C5.50007 17.6711 6.17161 16.9995 6.99999 16.9995C7.82838 16.9995 8.49992 17.6711 8.49992 18.4995Z" stroke="#8A8A8A" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/design-system/src/icons/primitive-string-multiline.svg b/packages/design-system/src/icons/primitive-string-multiline.svg
new file mode 100644
index 0000000000..ea6fb966b2
--- /dev/null
+++ b/packages/design-system/src/icons/primitive-string-multiline.svg
@@ -0,0 +1,3 @@
+<svg width="48" height="24" viewBox="0 0 48 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M34 3.11111V6.07407C34 6.68795 33.4163 7.18519 32.6956 7.18519C31.975 7.18519 31.3913 6.68795 31.3913 6.07407V4.22222H25.3042V19.7778H28.3479C29.0685 19.7778 29.6523 20.275 29.6523 20.8889C29.6523 21.5028 29.0685 22 28.3479 22H19.6521C18.9315 22 18.3477 21.5028 18.3477 20.8889C18.3477 20.275 18.9315 19.7778 19.6521 19.7778H22.6958V4.22222H16.6087V6.07407C16.6087 6.68795 16.025 7.18519 15.3044 7.18519C14.5837 7.18519 14 6.68795 14 6.07407V3.11111C14 2.49723 14.5837 2 15.3044 2H32.6959C33.4166 2 34 2.49723 34 3.11111Z" fill="#8A8A8A"/>
+</svg>
diff --git a/packages/design-system/src/icons/recraft-remove-background-node.svg b/packages/design-system/src/icons/recraft-remove-background-node.svg
new file mode 100644
index 0000000000..376468f19a
--- /dev/null
+++ b/packages/design-system/src/icons/recraft-remove-background-node.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M19 3C20.1046 3 21 3.89543 21 5M21 19C21 20.1046 20.1046 21 19 21H18C18 19.4087 17.3679 17.8826 16.2426 16.7574C15.1174 15.6321 13.5913 15 12 15C10.4087 15 8.88258 15.6321 7.75736 16.7574C6.63214 17.8826 6 19.4087 6 21H5C3.89543 21 3 20.1046 3 19M3 5C3 3.89543 3.89543 3 5 3M21 13.5V16M21 8V11M3 11V8M3 16V13.5M8 3H10.5M13.5 3H16M10.5 21H8.5M15.5 21H13.5M14.1213 12.1213C15.2929 10.9497 15.2929 9.05025 14.1213 7.87868C12.9497 6.70711 11.0503 6.70711 9.87868 7.87868C8.70711 9.05025 8.70711 10.9497 9.87868 12.1213C11.0503 13.2929 12.9497 13.2929 14.1213 12.1213Z" stroke="#8A8A8A" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/design-system/src/icons/recraft.svg b/packages/design-system/src/icons/recraft.svg
new file mode 100644
index 0000000000..ff93cb8403
--- /dev/null
+++ b/packages/design-system/src/icons/recraft.svg
@@ -0,0 +1,11 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1483_16751)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M419.563 176.533C419.563 79.04 331.029 0 221.803 0C183.957 0 153.259 79.04 153.259 176.533C153.259 200.917 155.179 224.171 158.656 245.312H91.52L21.3333 490.667H221.867V353.131C331.029 353.131 419.541 274.048 419.541 176.597L419.563 176.555V176.533ZM221.803 32.32C241.643 32.32 257.685 96.9173 257.685 176.533C257.685 256.171 241.643 320.747 221.824 320.747C201.984 320.747 185.963 256.171 185.963 176.533C185.963 96.9173 202.005 32.32 221.803 32.32Z" fill="#B6B6B6"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M423.424 353.109H222.037L299.264 490.667H500.608L423.424 353.109Z" fill="#B6B6B6"/>
+</g>
+<defs>
+<clipPath id="clip0_1483_16751">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/design-system/src/icons/rodin.svg b/packages/design-system/src/icons/rodin.svg
new file mode 100644
index 0000000000..f628f41bfe
--- /dev/null
+++ b/packages/design-system/src/icons/rodin.svg
@@ -0,0 +1,18 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1485_17729)">
+<path d="M405.193 151.462C410.542 145.833 441.167 177.892 445.432 182.856C483.26 227.291 510.074 300.044 494.482 357.869C470.744 445.795 355.164 425.693 375.266 326.055C379.531 304.904 397.291 282.354 404.354 260.749C416.275 224.18 414.562 188.415 405.228 151.497L405.193 151.462Z" fill="#FEFEFE"/>
+<path d="M38.1066 196.876C37.5472 121.99 112.992 17.8425 190.185 11.6195C269.126 5.25668 289.823 101.154 217.315 129.646C185.85 141.988 149.946 135.66 115.125 146.323C83.4505 156.042 61.5652 174.641 38.0717 196.841L38.1066 196.876Z" fill="#FEFEFE"/>
+<path d="M268.777 476.595L216.545 495.999C157.427 508.794 59.2927 490.265 24.6467 435.796C-13.1806 376.433 51.6363 311.826 111.244 352.695C135.437 369.266 146.065 397.235 164 418.806C189.241 449.221 228.991 473.064 268.777 476.595Z" fill="#FEFEFE"/>
+<path d="M289.788 256.309C294.857 255.609 299.612 247.673 299.996 265.294C301.29 323.118 247.975 366.26 191.898 350.702V280.781C213.259 286.585 233.956 283.823 254.827 277.285L255.492 272.181C267.868 268.23 279.3 262.951 289.788 256.309Z" fill="#FDFDFD"/>
+<path d="M349.221 396.186C340.69 420.239 303.667 468.554 277.517 469.778C237.871 471.666 176.62 433.104 160.434 396.186C173.893 399.682 183.578 408.387 197.072 413.701C233.536 428 283.495 429.958 319.085 413.212C324.609 410.59 346.529 393.704 349.221 396.186Z" fill="#FCFCFC"/>
+<path d="M386.733 134.891C390.789 138.981 398.9 161.321 400.613 168.208C408.793 201.071 406.276 232.92 393.795 264.21C393.096 265.993 386.489 287.633 380.685 280.781C380.056 280.047 384.391 266.762 384.391 261.693C384.391 214.95 362.016 167.369 326.391 137.548L289.788 116.536C311.079 110.628 371.63 119.823 386.733 134.925V134.891Z" fill="#FCFCFC"/>
+<path d="M163.93 147.966L118.446 177.612C82.6113 211.629 65.0611 256.099 64.3269 305.254C47.0214 288.368 27.7581 233.584 38.561 213.062C58.069 175.934 122.152 144.225 163.93 148.001V147.966Z" fill="#FCFCFC"/>
+<path d="M286.292 252.813C282.97 263.58 258.918 276.726 251.331 266.797C251.786 265.014 261.644 258.336 265.001 250.75C271.259 236.556 270.035 223.376 265.42 208.972C262.309 199.218 256.925 196.631 251.331 189.919C268.881 190.338 281.257 207.154 288.145 221.173C295.032 235.192 299.367 240.821 286.257 252.813H286.292Z" fill="#F7F7F7"/>
+<path d="M289.788 256.309C281.292 267.566 267.728 273.23 254.827 277.285C253.289 274.523 250.597 269.699 251.331 266.797C263.043 267.881 277.796 260.574 286.292 252.813C285.767 255.12 287.76 256.588 289.788 256.309Z" fill="#1F1F1F"/>
+</g>
+<defs>
+<clipPath id="clip0_1485_17729">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/design-system/src/icons/runway.svg b/packages/design-system/src/icons/runway.svg
new file mode 100644
index 0000000000..6cc20d7498
--- /dev/null
+++ b/packages/design-system/src/icons/runway.svg
@@ -0,0 +1,10 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1483_16761)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M381.013 490.496C324.075 495.723 276.757 429.141 240.277 395.477C221.824 528.192 21.3333 515.776 21.3333 381.013V131.2C21.3333 111.552 26.5387 91.4988 36.9707 74.6668C56.2133 42.1761 93.504 20.9068 131.2 21.3335H381.013C515.755 21.3335 528.597 221.824 395.456 239.851L458.816 302.805C528.192 368.171 476.053 493.291 381.035 490.475L381.013 490.496ZM350.549 411.115C389.845 451.605 452.395 389.056 411.904 349.76L302.421 240.277H241.067V301.632L335.701 396.267L350.549 411.115ZM87.8933 380.629C87.104 436.779 175.723 436.779 174.507 380.629V130.816C175.317 102.741 145.643 80.6828 118.784 89.1095C117.568 89.5148 116.373 89.8988 115.584 90.3041C98.7307 96.7254 87.104 113.557 87.488 131.605V380.629H87.8933ZM381.013 174.123C437.163 174.912 437.163 86.6988 381.013 87.5095H232.256C243.477 111.168 240.683 148.459 241.067 174.123H381.013Z" fill="#B6B6B6"/>
+</g>
+<defs>
+<clipPath id="clip0_1483_16761">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/design-system/src/icons/save-audio.svg b/packages/design-system/src/icons/save-audio.svg
new file mode 100644
index 0000000000..85e1a8e7a8
--- /dev/null
+++ b/packages/design-system/src/icons/save-audio.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2 10V13M6 6V17M10 3V21M14 8V14.5M18 5V12.5M22 10V13M14 19L17 22M17 22V16.5M17 22L20 19" stroke="#8A8A8A" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/design-system/src/icons/save-glb.svg b/packages/design-system/src/icons/save-glb.svg
new file mode 100644
index 0000000000..e99fadc824
--- /dev/null
+++ b/packages/design-system/src/icons/save-glb.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11 21.7299L4 17.7299C3.69626 17.5545 3.44398 17.3024 3.26846 16.9987C3.09294 16.6951 3.00036 16.3506 3 15.9999V7.9999C3.00036 7.64918 3.09294 7.30471 3.26846 7.00106C3.44398 6.69742 3.69626 6.44526 4 6.2699L11 2.2699C11.304 2.09437 11.6489 2.00195 12 2.00195C12.3511 2.00195 12.696 2.09437 13 2.2699L20 6.2699C20.3037 6.44526 20.556 6.69742 20.7315 7.00106C20.9071 7.30471 20.9996 7.64918 21 7.9999V15M3.30005 7L12 12M12 12L20.7001 7M12 12V16.5M14 19L17 22M17 22V16.5M17 22L20 19" stroke="#8A8A8A" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/design-system/src/icons/save-image.svg b/packages/design-system/src/icons/save-image.svg
new file mode 100644
index 0000000000..f137b72425
--- /dev/null
+++ b/packages/design-system/src/icons/save-image.svg
@@ -0,0 +1,3 @@
+<svg width="48" height="24" viewBox="0 0 48 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M24 13.7999C24.3312 13.8 24.5996 14.0692 24.5996 14.4005V21.9464L26.1162 20.4298C26.3504 20.1957 26.7305 20.1959 26.9648 20.4298C27.1991 20.664 27.1991 21.0441 26.9648 21.2784L24.4189 23.8243C24.3311 23.912 24.2227 23.9674 24.1094 23.9893C24.0338 24.0039 23.9554 24.004 23.8799 23.9893C23.7667 23.9673 23.658 23.9119 23.5703 23.8243L21.0254 21.2784C20.7915 21.0441 20.7914 20.664 21.0254 20.4298C21.2595 20.196 21.6388 20.1962 21.873 20.4298L23.3994 21.9571V14.4005C23.3994 14.0692 23.6687 13.8 24 13.7999ZM31.6309 7.62939e-05C32.379 0.000170143 33 0.5993 33 1.32039V11.88C33 12.601 32.379 13.2002 31.6309 13.2003H16.3691C15.6211 13.2 15 12.601 15 11.88V1.32039C15 0.599386 15.6211 0.000313691 16.3691 7.62939e-05H31.6309ZM16.1738 9.91805V11.88C16.1738 11.994 16.2509 12.0683 16.3691 12.0684H31.6309C31.7492 12.0683 31.8262 11.994 31.8262 11.88V10.2657L28.4697 7.67879L25.7002 9.51668C25.4938 9.65074 25.1963 9.63839 25.0029 9.48738L21.2363 6.55281L16.1738 9.91805ZM16.3691 1.13191C16.2509 1.1321 16.1738 1.20636 16.1738 1.32039V8.53914L20.9248 5.37996C21.0041 5.32563 21.0973 5.29142 21.1934 5.28035C21.3478 5.26414 21.5079 5.31009 21.6279 5.40437L25.3945 8.3448L28.1699 6.50594C28.3763 6.37187 28.6738 6.38423 28.8672 6.53523L31.8262 8.81648V1.32039C31.8262 1.20627 31.7492 1.13199 31.6309 1.13191H16.3691ZM25.3701 2.63972C26.3351 2.63993 27.1306 3.40693 27.1309 4.33699C27.1309 5.26721 26.3352 6.03405 25.3701 6.03426C24.4048 6.03426 23.6084 5.26734 23.6084 4.33699C23.6086 3.40681 24.405 2.63972 25.3701 2.63972ZM25.3701 3.77156C25.0393 3.77156 24.7834 4.01822 24.7832 4.33699C24.7832 4.65594 25.0392 4.9034 25.3701 4.9034C25.7009 4.9032 25.957 4.65582 25.957 4.33699C25.9568 4.01834 25.7007 3.77176 25.3701 3.77156Z" fill="#8A8A8A"/>
+</svg>
diff --git a/packages/design-system/src/icons/save-video.svg b/packages/design-system/src/icons/save-video.svg
new file mode 100644
index 0000000000..66281ba2c0
--- /dev/null
+++ b/packages/design-system/src/icons/save-video.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11 21H5C3.89543 21 3 20.1046 3 19V5C3 3.89543 3.89543 3 5 3H19C20.1046 3 21 3.89543 21 5V15M14 19L17 22M17 22V16.5M17 22L20 19M9 8L15 12L9 16V8Z" stroke="#8A8A8A" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/design-system/src/icons/send.svg b/packages/design-system/src/icons/send.svg
new file mode 100644
index 0000000000..918ac4a455
--- /dev/null
+++ b/packages/design-system/src/icons/send.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.5693 3L9.67677 14.099C9.59169 14.292 9.33927 14.3393 9.19012 14.1901L5.5 10.5M14.5693 3L1.65457 8.23468C1.40927 8.33411 1.40355 8.67936 1.64543 8.78686L5.5 10.5M14.5693 3L5.5 10.5M5.5 10.5C5.66712 10.5669 5.37259 10.3728 5.5 10.5ZM5.5 10.5C5.62741 10.6272 5.43279 10.333 5.5 10.5ZM5.5 10.5V13.5L7 12" stroke="white" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/design-system/src/icons/sora.svg b/packages/design-system/src/icons/sora.svg
new file mode 100644
index 0000000000..5d2c8b4967
--- /dev/null
+++ b/packages/design-system/src/icons/sora.svg
@@ -0,0 +1,9 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M176.099 20.3503C195.763 12.2704 217.167 9.35603 238.275 11.8844C265.497 14.9876 289.753 26.584 311.04 46.5644C311.323 46.8398 311.672 47.0392 312.052 47.1439C312.433 47.2486 312.834 47.2553 313.218 47.1633C340.893 40.0143 370.19 42.6592 396.137 54.6492L397.417 55.2208L400.575 56.7997C427.733 70.5571 448.919 93.7756 460.137 122.077C465.826 135.959 468.685 150.414 468.739 165.495C469.147 176.792 467.922 187.898 465.064 198.814C464.912 199.365 464.907 199.947 465.05 200.502C465.193 201.056 465.48 201.563 465.881 201.971C482.051 218.467 492.776 238.148 498.085 260.987C505.952 299.805 497.894 334.757 473.939 365.926L470.236 370.444C454.369 388.598 433.544 401.72 410.32 408.2C409.815 408.349 409.353 408.616 408.974 408.981C408.595 409.346 408.31 409.797 408.142 410.296C402.943 425.295 397.689 438.144 387.971 450.965C363.47 483.25 327.51 501.216 286.949 500.998C254.636 500.835 225.971 489.021 201.008 465.556C200.631 465.197 200.163 464.946 199.655 464.831C199.147 464.716 198.617 464.741 198.122 464.903C187.56 468.305 176.889 468.822 165.374 468.686C146.978 468.535 128.86 464.187 112.399 455.974C95.159 447.427 80.1516 434.974 68.5715 419.606C64.4337 414.135 60.3231 408.963 57.3287 402.838C53.2029 394.433 49.8322 385.679 47.2564 376.678C41.8193 356.187 41.6975 334.648 46.9025 314.096C47.0617 313.614 47.1083 313.102 47.0386 312.599C46.9474 312.093 46.6885 311.633 46.3036 311.292C33.7183 298.568 24.0976 283.222 18.1286 266.35C14.173 255.958 11.8764 245.008 11.323 233.902C10.3314 219.273 11.6264 204.578 15.1613 190.348C24.3353 160.078 41.8936 136.313 67.782 119.055C73.5531 115.244 78.9976 112.25 84.1426 110.099C89.9954 107.649 95.8482 105.608 101.728 103.893C102.148 103.769 102.529 103.543 102.838 103.234C103.148 102.924 103.374 102.543 103.498 102.123C107.951 86.0836 115.62 71.1171 126.038 58.1335C139.194 41.4396 156.438 28.4251 176.099 20.3503ZM195.781 176.465C172.234 159.751 140.03 168.026 128.188 194.322C122.036 207.933 120.838 222.251 124.568 237.332L127.508 249.309L132.816 268.691C134.994 279.579 139.132 289.515 145.311 298.525L145.91 299.397C149.177 303.262 152.77 306.801 156.636 309.986C184.92 333.233 223.493 317.717 231.197 282.982L232.205 278.627L232.477 276.993C233.675 268.827 233.294 260.824 231.388 252.984C227.972 239.139 224.251 225.37 220.227 211.689C215.79 196.609 207.65 184.876 195.781 176.465ZM340.822 142.846C323.236 126.514 296.095 125.888 278.619 142.329C271.813 148.726 267.049 157.355 264.381 168.162C261.724 179.128 261.724 190.57 264.381 201.536L264.654 202.625L265.797 206.327C268.383 214.901 270.779 223.34 272.984 231.643C275.298 240.272 277.121 246.07 278.537 249.01C290.243 273.645 315.695 291.366 343.38 280.069C369.133 269.562 376.864 239.047 371.038 214.33C370.166 210.589 369.213 206.868 368.18 203.169C364.097 187.299 361.211 176.601 359.442 171.075C355.808 160.2 349.388 150.467 340.822 142.846Z" fill="url(#paint0_linear_1485_17562)"/>
+<defs>
+<linearGradient id="paint0_linear_1485_17562" x1="197.714" y1="11.0133" x2="316.396" y2="501.463" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#6BB6FE"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/packages/design-system/src/icons/stability-ai.svg b/packages/design-system/src/icons/stability-ai.svg
new file mode 100644
index 0000000000..c84cae68ed
--- /dev/null
+++ b/packages/design-system/src/icons/stability-ai.svg
@@ -0,0 +1,15 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1483_16770)">
+<path d="M154.091 448C244.8 448 303.808 400.64 303.808 329.387C303.808 274.133 267.925 239.019 203.755 224.469L162.581 212.288C126.443 204.288 105.344 194.688 110.315 170.155C114.453 149.739 126.805 138.219 155.584 138.219C246.997 138.219 280.875 170.155 280.875 170.155V93.3547C280.875 93.3547 247.893 64 155.584 64C68.544 64 21.3333 108.16 21.3333 176.491C21.3333 231.744 54.0587 263.893 120.427 279.147L127.552 280.917C137.643 283.989 151.275 288.064 168.427 293.12C202.347 301.12 211.072 309.611 211.072 335.061C211.072 358.315 186.539 371.541 154.112 371.541C60.608 371.541 21.3333 324.928 21.3333 324.928V410.027C21.3333 410.027 45.9093 448 154.091 448Z" fill="url(#paint0_linear_1483_16770)"/>
+<path d="M434.645 442.24C466.752 442.24 490.667 419.349 490.667 388.352C490.667 356.693 467.435 334.464 434.645 334.464C402.539 334.464 379.307 356.693 379.307 388.352C379.307 420.011 402.539 442.24 434.645 442.24Z" fill="#E80000"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_1483_16770" x1="14145.1" y1="64" x2="14145.1" y2="38464" gradientUnits="userSpaceOnUse">
+<stop stop-color="#9D39FF"/>
+<stop offset="1" stop-color="#A380FF"/>
+</linearGradient>
+<clipPath id="clip0_1483_16770">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/design-system/src/icons/stability-text-to-audio.svg b/packages/design-system/src/icons/stability-text-to-audio.svg
new file mode 100644
index 0000000000..f42c97f148
--- /dev/null
+++ b/packages/design-system/src/icons/stability-text-to-audio.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7 10.3334L6.89314 9.69219L6.35 9.78272V10.3334H7ZM15.65 13C15.65 12.641 15.359 12.35 15 12.35C14.641 12.35 14.35 12.641 14.35 13H15H15.65ZM12.1069 10.1412C12.461 10.0822 12.7002 9.74726 12.6412 9.39316C12.5821 9.03906 12.2472 8.79984 11.8931 8.85886L12 9.50002L12.1069 10.1412ZM17.7169 10.6415L17.1195 10.3855V10.3855L17.7169 10.6415ZM18.8234 8.05975L18.2259 7.80371L18.2259 7.80371L18.8234 8.05975ZM19.0597 7.8234L18.8037 7.22596V7.22596L19.0597 7.8234ZM21.6415 6.71693L21.8975 7.31438V7.31438L21.6415 6.71693ZM21.6415 5.8897L21.3855 6.48715V6.48715L21.6415 5.8897ZM19.0597 4.78323L18.8037 5.38068L18.8037 5.38068L19.0597 4.78323ZM18.8234 4.54688L18.2259 4.80293V4.80293L18.8234 4.54688ZM17.7169 1.96512L18.3144 1.70907V1.70907L17.7169 1.96512ZM16.8897 1.96512L16.2922 1.70907V1.70907L16.8897 1.96512ZM15.7832 4.54688L15.1858 4.29083V4.29083L15.7832 4.54688ZM15.5469 4.78323L15.2908 4.18579V4.18579L15.5469 4.78323ZM12.9651 5.8897L13.2212 6.48715V6.48715L12.9651 5.8897ZM12.9651 6.71693L12.7091 7.31438V7.31438L12.9651 6.71693ZM15.5469 7.8234L15.2908 8.42085V8.42085L15.5469 7.8234ZM15.7832 8.05975L15.1858 8.3158V8.3158L15.7832 8.05975ZM16.8897 10.6415L17.4871 10.3855V10.3855L16.8897 10.6415ZM7 19H7.65V10.3334H7H6.35V19H7ZM7 19H6.35C6.35 19.7456 5.74558 20.35 5 20.35V21V21.65C6.46355 21.65 7.65 20.4636 7.65 19H7ZM5 21V20.35C4.25442 20.35 3.65 19.7456 3.65 19H3H2.35C2.35 20.4636 3.53645 21.65 5 21.65V21ZM3 19H3.65C3.65 18.2544 4.25442 17.65 5 17.65V17V16.35C3.53644 16.35 2.35 17.5365 2.35 19H3ZM5 17V17.65C5.74558 17.65 6.35 18.2544 6.35 19H7H7.65C7.65 17.5365 6.46355 16.35 5 16.35V17ZM15 17.6667H14.35C14.35 18.4123 13.7456 19.0167 13 19.0167V19.6667V20.3167C14.4636 20.3167 15.65 19.1302 15.65 17.6667H15ZM13 19.6667V19.0167C12.2544 19.0167 11.65 18.4123 11.65 17.6667H11H10.35C10.35 19.1302 11.5364 20.3167 13 20.3167V19.6667ZM11 17.6667H11.65C11.65 16.9211 12.2544 16.3167 13 16.3167V15.6667V15.0167C11.5364 15.0167 10.35 16.2031 10.35 17.6667H11ZM13 15.6667V16.3167C13.7456 16.3167 14.35 16.9211 14.35 17.6667H15H15.65C15.65 16.2031 14.4636 15.0167 13 15.0167V15.6667ZM15 13H14.35V17.6667H15H15.65V13H15ZM7 10.3334L7.10686 10.9745L12.1069 10.1412L12 9.50002L11.8931 8.85886L6.89314 9.69219L7 10.3334ZM17.7169 10.6415L18.3144 10.8976L19.4208 8.3158L18.8234 8.05975L18.2259 7.80371L17.1195 10.3855L17.7169 10.6415ZM19.0597 7.8234L19.3158 8.42085L21.8975 7.31438L21.6415 6.71693L21.3855 6.11949L18.8037 7.22596L19.0597 7.8234ZM21.6415 5.8897L21.8975 5.29226L19.3158 4.18579L19.0597 4.78323L18.8037 5.38068L21.3855 6.48715L21.6415 5.8897ZM18.8234 4.54688L19.4208 4.29083L18.3144 1.70907L17.7169 1.96512L17.1195 2.22117L18.2259 4.80293L18.8234 4.54688ZM16.8897 1.96512L16.2922 1.70907L15.1858 4.29083L15.7832 4.54688L16.3807 4.80293L17.4871 2.22117L16.8897 1.96512ZM15.5469 4.78323L15.2908 4.18579L12.7091 5.29226L12.9651 5.8897L13.2212 6.48715L15.8029 5.38068L15.5469 4.78323ZM12.9651 6.71693L12.7091 7.31438L15.2908 8.42085L15.5469 7.8234L15.8029 7.22596L13.2211 6.11949L12.9651 6.71693ZM15.7832 8.05975L15.1858 8.3158L16.2922 10.8976L16.8897 10.6415L17.4871 10.3855L16.3807 7.80371L15.7832 8.05975ZM15.5469 7.8234L15.2908 8.42085C15.2436 8.40062 15.206 8.363 15.1858 8.3158L15.7832 8.05975L16.3807 7.80371C16.2694 7.54409 16.0625 7.33722 15.8029 7.22596L15.5469 7.8234ZM15.7832 4.54688L15.1858 4.29083C15.206 4.24363 15.2436 4.20602 15.2908 4.18579L15.5469 4.78323L15.8029 5.38068C16.0625 5.26941 16.2694 5.06255 16.3807 4.80293L15.7832 4.54688ZM19.0597 4.78323L19.3158 4.18579C19.363 4.20602 19.4006 4.24363 19.4208 4.29083L18.8234 4.54688L18.2259 4.80293C18.3372 5.06254 18.5441 5.26941 18.8037 5.38068L19.0597 4.78323ZM18.8234 8.05975L19.4208 8.3158C19.4006 8.363 19.363 8.40062 19.3158 8.42085L19.0597 7.8234L18.8037 7.22596C18.5441 7.33722 18.3372 7.54409 18.2259 7.80371L18.8234 8.05975ZM17.7169 1.96512L18.3144 1.70907C17.9334 0.820155 16.6732 0.820152 16.2922 1.70907L16.8897 1.96512L17.4871 2.22117C17.4179 2.38279 17.1887 2.38279 17.1195 2.22117L17.7169 1.96512ZM21.6415 6.71693L21.8975 7.31438C22.7865 6.93341 22.7865 5.67322 21.8975 5.29226L21.6415 5.8897L21.3855 6.48715C21.2238 6.41788 21.2238 6.18875 21.3855 6.11949L21.6415 6.71693ZM17.7169 10.6415L17.1195 10.3855C17.1887 10.2238 17.4179 10.2238 17.4871 10.3855L16.8897 10.6415L16.2922 10.8976C16.6732 11.7865 17.9334 11.7865 18.3144 10.8976L17.7169 10.6415ZM12.9651 5.8897L12.7091 5.29226C11.8201 5.67322 11.8201 6.93341 12.7091 7.31438L12.9651 6.71693L13.2211 6.11949C13.3828 6.18876 13.3828 6.41788 13.2212 6.48715L12.9651 5.8897Z" fill="#8A8A8A"/>
+</svg>
diff --git a/packages/design-system/src/icons/subgraph-blueprint-canny-to-video-ltx-2-0.svg b/packages/design-system/src/icons/subgraph-blueprint-canny-to-video-ltx-2-0.svg
new file mode 100644
index 0000000000..f3f654b75b
--- /dev/null
+++ b/packages/design-system/src/icons/subgraph-blueprint-canny-to-video-ltx-2-0.svg
@@ -0,0 +1,5 @@
+<svg width="48" height="24" viewBox="0 0 48 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.0245 11.721C27.2587 11.9553 27.2588 12.3354 27.0245 12.5696L24.4796 15.1155C24.2454 15.3497 23.8653 15.3494 23.631 15.1155C23.3967 14.8812 23.3967 14.5012 23.631 14.2669L25.1485 12.7493L17.6007 12.7493C17.2693 12.7493 17.0001 12.4811 17.0001 12.1497C17.0001 11.8184 17.2693 11.5501 17.6007 11.5501L25.1573 11.5501L23.631 10.0238C23.3966 9.78943 23.3966 9.40944 23.631 9.17512C23.8653 8.94106 24.2454 8.94089 24.4796 9.17512L27.0245 11.721Z" fill="#8A8A8A"/>
+<path d="M11.7002 5.11523C12.418 5.11532 12.9999 5.69721 13 6.41504V16.8154C12.9999 17.4884 12.4884 18.0418 11.833 18.1084L11.7002 18.1152H1.2998C0.58201 18.1151 0.000105634 17.5332 0 16.8154V6.41504C0.00010567 5.69724 0.582009 5.11536 1.2998 5.11523H11.7002ZM1.61133 6.11523C1.27382 6.11523 1 6.38906 1 6.72656V16.5039L1.00098 16.5352C1.01736 16.858 1.28438 17.1152 1.61133 17.1152H2.21875L2.23438 17.0215C2.2781 16.7553 2.34514 16.494 2.43359 16.2412C2.49287 16.0719 2.67829 15.9818 2.84766 16.041C3.01696 16.1003 3.10596 16.2858 3.04688 16.4551C2.97203 16.6689 2.91558 16.8901 2.87793 17.1152H11.2598C11.2221 16.8901 11.1657 16.6689 11.0908 16.4551C11.0317 16.2857 11.1207 16.1003 11.29 16.041C11.4594 15.9819 11.6448 16.0719 11.7041 16.2412C11.7759 16.4463 11.8325 16.6569 11.875 16.8711C11.9465 16.7765 11.9926 16.6613 11.999 16.5352L12 16.5039V6.72656C12 6.39978 11.7435 6.13284 11.4209 6.11621L11.3887 6.11523H1.61133ZM3.89355 14.1768C4.03366 14.065 4.23755 14.0877 4.34961 14.2275C4.46159 14.3678 4.43904 14.5726 4.29883 14.6846C4.17833 14.7809 4.06266 14.8846 3.95312 14.9961C3.79051 15.1616 3.64424 15.3407 3.51465 15.5303C3.41337 15.6784 3.21068 15.7165 3.0625 15.6152C2.91465 15.514 2.87664 15.3121 2.97754 15.1641C3.12866 14.943 3.30037 14.7342 3.49023 14.541L3.58691 14.4453C3.68536 14.351 3.78792 14.2612 3.89355 14.1768ZM9.78809 14.2275C9.9002 14.0876 10.105 14.0648 10.2451 14.1768C10.3858 14.2891 10.5198 14.4111 10.6475 14.541C10.8373 14.7342 11.009 14.943 11.1602 15.1641C11.261 15.3121 11.223 15.514 11.0752 15.6152C10.927 15.7165 10.7243 15.6784 10.623 15.5303C10.4934 15.3406 10.3462 15.1616 10.1836 14.9961C10.0742 14.8849 9.95915 14.7807 9.83887 14.6846C9.69877 14.5725 9.6761 14.3677 9.78809 14.2275ZM3.86719 12.3652C4.01994 12.2712 4.22029 12.319 4.31445 12.4717C4.4436 12.6811 4.59609 12.8772 4.77051 13.0547C4.82117 13.1062 4.87418 13.1554 4.92773 13.2031C4.97248 13.2431 5.00242 13.2934 5.01953 13.3467C5.07536 13.3521 5.13103 13.3719 5.17969 13.4072C5.23802 13.4496 5.29764 13.49 5.3584 13.5283C5.46222 13.5938 5.52049 13.7118 5.50879 13.834C5.49704 13.9562 5.41715 14.061 5.30273 14.1055C5.15842 14.1616 5.01769 14.2274 4.88086 14.3008C4.72274 14.3855 4.5253 14.326 4.44043 14.168C4.35766 14.0137 4.41306 13.8225 4.5625 13.7344C4.53882 13.7221 4.51594 13.707 4.49512 13.6885C4.43084 13.6312 4.36743 13.5716 4.30664 13.5098C4.09786 13.2973 3.91506 13.0628 3.76074 12.8125C3.66688 12.6598 3.71454 12.4594 3.86719 12.3652ZM9.82422 12.4717C9.91844 12.3191 10.1188 12.2722 10.2715 12.3662C10.4243 12.4604 10.4721 12.6607 10.3779 12.8135C10.2244 13.0626 10.0424 13.2951 9.83496 13.5068C9.833 13.5089 9.83111 13.5117 9.8291 13.5137C9.76904 13.5746 9.70701 13.6339 9.64355 13.6904C9.62301 13.7086 9.60046 13.7232 9.57715 13.7354C9.72606 13.8236 9.77988 14.014 9.69727 14.168C9.61238 14.3261 9.41594 14.3856 9.25781 14.3008C9.12111 14.2274 8.98011 14.1625 8.83594 14.1064C8.72164 14.062 8.64171 13.957 8.62988 13.835C8.61816 13.7128 8.67644 13.5938 8.78027 13.5283C8.84105 13.49 8.90064 13.4496 8.95898 13.4072C9.0074 13.3721 9.06263 13.3531 9.11816 13.3477C9.13534 13.2944 9.16708 13.244 9.21191 13.2041C9.26504 13.1568 9.31692 13.1077 9.36719 13.0566L9.36816 13.0557L9.43262 12.9873C9.58035 12.828 9.71129 12.655 9.82422 12.4717ZM3.66992 9.52051C3.84436 9.56274 3.95138 9.73865 3.90918 9.91309C3.85316 10.1446 3.82132 10.3833 3.81543 10.625V10.6465C3.81536 10.6527 3.81488 10.6589 3.81445 10.665C3.81478 10.6717 3.81551 10.6788 3.81543 10.6855L3.81445 10.7109C3.81501 10.9596 3.84297 11.2057 3.89648 11.4443C3.93576 11.6195 3.82551 11.7937 3.65039 11.833C3.47541 11.8721 3.30201 11.7619 3.2627 11.5869C3.19856 11.3011 3.16544 11.0067 3.16504 10.709V10.6777C3.16512 10.6712 3.16556 10.6646 3.16602 10.6582C3.16572 10.6519 3.16497 10.6451 3.16504 10.6387L3.16602 10.6133V10.6094C3.17305 10.321 3.21047 10.036 3.27734 9.75977C3.31961 9.58537 3.4955 9.47829 3.66992 9.52051ZM10.4883 9.58203C10.6632 9.5431 10.8367 9.65322 10.876 9.82812C10.9399 10.1142 10.9726 10.409 10.9727 10.707C10.9727 11.0052 10.94 11.3007 10.876 11.5869C10.8367 11.7617 10.6632 11.8719 10.4883 11.833C10.3131 11.7938 10.202 11.6195 10.2412 11.4443C10.2948 11.2044 10.3232 10.9571 10.3232 10.707C10.3232 10.4572 10.2948 10.2104 10.2412 9.9707C10.202 9.79554 10.3131 9.6212 10.4883 9.58203ZM8.64453 7.4209C8.73858 7.26802 8.93892 7.2204 9.0918 7.31445C9.33139 7.46188 9.55613 7.63606 9.76172 7.83496C9.76275 7.83596 9.76461 7.83688 9.76562 7.83789L9.7832 7.85645C9.78798 7.8612 9.79246 7.86612 9.79688 7.87109C9.80128 7.87502 9.8063 7.87862 9.81055 7.88281L9.83203 7.9043C10.0408 8.11695 10.2236 8.35111 10.3779 8.60156C10.472 8.75437 10.4243 8.9547 10.2715 9.04883C10.1187 9.14288 9.91834 9.09517 9.82422 8.94238C9.69581 8.73398 9.5443 8.53913 9.37109 8.3623L9.33887 8.33008C9.33425 8.32599 9.32963 8.32177 9.3252 8.31738L9.31055 8.30176C9.13882 8.1356 8.9507 7.99006 8.75098 7.86719C8.59838 7.77312 8.55074 7.57366 8.64453 7.4209ZM4.9873 7.35156C5.13831 7.25497 5.33868 7.29845 5.43555 7.44922C5.53224 7.60025 5.48874 7.80156 5.33789 7.89844C5.13483 8.02844 4.94427 8.18205 4.77148 8.35742L4.76953 8.35938C4.60066 8.53136 4.45167 8.72078 4.3252 8.92285C4.22988 9.07474 4.02997 9.12055 3.87793 9.02539C3.72595 8.93021 3.67948 8.73021 3.77441 8.57812C3.92535 8.33699 4.10291 8.11092 4.30469 7.90527L4.38477 7.8252C4.57083 7.64639 4.77331 7.48857 4.9873 7.35156ZM7.06836 6.74023C7.35486 6.74023 7.63866 6.77195 7.91406 6.83398C8.08913 6.87344 8.19859 7.04758 8.15918 7.22266C8.11974 7.39759 7.94643 7.50792 7.77148 7.46875C7.54259 7.41719 7.30642 7.39062 7.06836 7.39062C6.8226 7.39066 6.57958 7.4187 6.34375 7.47363C6.16899 7.51426 5.99481 7.40523 5.9541 7.23047C5.91352 7.05579 6.02167 6.88163 6.19629 6.84082C6.48006 6.77473 6.77257 6.74027 7.06836 6.74023Z" fill="#8A8A8A"/>
+<path d="M44.203 5C46.2974 5 48.01 6.71671 48.01 8.84956V14.3804C48.01 16.5133 46.2974 18.23 44.203 18.23H34.807C32.7125 18.23 31 16.5133 31 14.3804V8.84956C31 6.71671 32.7125 5 34.807 5H44.203ZM34.807 6.37812C33.4315 6.37812 32.3499 7.48086 32.3499 8.84956V14.3804C32.3499 15.7491 33.4315 16.8519 34.807 16.8519H44.203C45.5785 16.8519 46.6601 15.7491 46.6601 14.3804V8.84956C46.6601 7.48086 45.5785 6.37812 44.203 6.37812H34.807ZM37.5598 8.12949C37.6752 8.13322 37.7884 8.16994 37.8862 8.23544L42.193 11.0009C42.4194 11.1419 42.5025 11.403 42.5025 11.615C42.5025 11.8269 42.419 12.0878 42.1927 12.2288L37.8865 14.9946C37.6809 15.132 37.4135 15.1341 37.2063 15.002L37.2046 15.0009C37 14.8683 36.8785 14.6208 36.8848 14.3727V8.84956C36.88 8.49772 37.1469 8.14891 37.5089 8.13007L37.5598 8.12949ZM38.2041 13.1249L40.5626 11.6144L38.2041 10.0996V13.1249ZM42.1753 11.8255C42.1606 11.8574 42.1424 11.887 42.1205 11.913L42.1506 11.8717C42.1598 11.8571 42.168 11.8414 42.1753 11.8255Z" fill="#8A8A8A"/>
+</svg>
diff --git a/packages/design-system/src/icons/subgraph-blueprint-pose-to-video-ltx-2-0.svg b/packages/design-system/src/icons/subgraph-blueprint-pose-to-video-ltx-2-0.svg
new file mode 100644
index 0000000000..cfdaa8630e
--- /dev/null
+++ b/packages/design-system/src/icons/subgraph-blueprint-pose-to-video-ltx-2-0.svg
@@ -0,0 +1,5 @@
+<svg width="49" height="24" viewBox="0 0 49 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.5243 11.7208C26.7584 11.955 26.7583 12.3351 26.5243 12.5694L23.9794 15.1153C23.7452 15.3495 23.3651 15.3493 23.1308 15.1153C22.8965 14.881 22.8965 14.501 23.1308 14.2667L24.6474 12.7501L17.0995 12.7501C16.7683 12.7499 16.4999 12.4807 16.4999 12.1495C16.5001 11.8184 16.7685 11.5501 17.0995 11.5499L24.6571 11.5499L23.1308 10.0235C22.8965 9.7892 22.8965 9.40919 23.1308 9.17489C23.3651 8.94127 23.7453 8.94083 23.9794 9.17489L26.5243 11.7208Z" fill="#8A8A8A"/>
+<path d="M4.50779 3.61371C4.6735 3.55748 4.85537 3.56703 5.0156 3.64203L6.14353 4.16938L6.9199 3.685L6.99509 3.64496C7.17632 3.56122 7.38691 3.56099 7.57029 3.64692L8.95798 4.29633C9.2306 4.42419 9.34839 4.74924 9.22068 5.02192C9.09287 5.29443 8.76771 5.4121 8.49509 5.28461L7.30857 4.72797L6.5449 5.20551V6.97211H9.32127C9.55299 6.97221 9.76687 7.08954 9.89158 7.27973L9.93943 7.36567L11.2588 10.1918C11.2714 10.2189 11.282 10.2474 11.291 10.2758L11.3125 10.3627L11.9902 14.2407C12.042 14.5373 11.8435 14.8206 11.5469 14.8725C11.2505 14.924 10.9681 14.7254 10.916 14.4291L10.247 10.6049L9.06052 8.06293H6.5449V11.6079C6.54489 11.6553 6.53579 11.7007 6.52439 11.7446H7.03318C7.26977 11.7446 7.48688 11.8665 7.61033 12.0629L7.6572 12.1518L8.89548 14.9711C8.9258 15.0402 8.94492 15.1138 8.95115 15.1889L9.26951 19.0629C9.29388 19.3627 9.07125 19.6259 8.77146 19.6508C8.47137 19.6755 8.20837 19.4519 8.18357 19.1518L7.86912 15.3471L6.7656 12.8344H5.52048L4.12693 15.3715L3.81541 19.1518C3.79062 19.4519 3.52762 19.6755 3.22752 19.6508C2.92759 19.626 2.70508 19.3628 2.72947 19.0629L3.04685 15.1957L3.05662 15.1245C3.06994 15.0542 3.09436 14.9862 3.12888 14.9233L4.68064 12.0981L4.73045 12.02C4.85779 11.8482 5.05991 11.7448 5.27732 11.7446H5.47361C5.46224 11.7007 5.45409 11.6553 5.45408 11.6079V8.06293H3.24412L1.74509 10.6323L1.08103 14.1127C1.02439 14.4084 0.738116 14.6018 0.44236 14.5454C0.146978 14.4885 -0.0465728 14.2032 0.00974259 13.9077L0.687477 10.3598L0.718727 10.2485C0.732186 10.2126 0.748186 10.1772 0.767555 10.144L2.42088 7.31C2.54303 7.10073 2.76744 6.97221 3.00974 6.97211H5.45408V5.05121L4.72654 4.71039L3.50388 5.28461C3.23123 5.41225 2.90614 5.2945 2.7783 5.02192C2.65052 4.74922 2.76835 4.4242 3.04099 4.29633L4.43748 3.64203L4.50779 3.61371Z" fill="#8A8A8A"/>
+<path d="M44.7027 5C46.7971 5 48.5097 6.71671 48.5097 8.84956V14.3804C48.5097 16.5133 46.7971 18.23 44.7027 18.23H35.3067C33.2122 18.23 31.4997 16.5133 31.4997 14.3804V8.84956C31.4997 6.71671 33.2122 5 35.3067 5H44.7027ZM35.3067 6.37812C33.9312 6.37812 32.8496 7.48086 32.8496 8.84956V14.3804C32.8496 15.7491 33.9312 16.8519 35.3067 16.8519H44.7027C46.0781 16.8519 47.1597 15.7491 47.1597 14.3804V8.84956C47.1597 7.48086 46.0781 6.37812 44.7027 6.37812H35.3067ZM38.0595 8.12949C38.1749 8.13322 38.2881 8.16994 38.3859 8.23544L42.6927 11.0009C42.9191 11.1419 43.0022 11.403 43.0022 11.615C43.0022 11.8269 42.9187 12.0878 42.6924 12.2288L38.3862 14.9946C38.1806 15.132 37.9132 15.1341 37.706 15.002L37.7043 15.0009C37.4997 14.8683 37.3782 14.6208 37.3845 14.3727V8.84956C37.3797 8.49772 37.6466 8.14891 38.0086 8.13007L38.0595 8.12949ZM38.7038 13.1249L41.0623 11.6144L38.7038 10.0996V13.1249ZM42.675 11.8255C42.6603 11.8574 42.6421 11.887 42.6201 11.913L42.6503 11.8717C42.6595 11.8571 42.6677 11.8414 42.675 11.8255Z" fill="#8A8A8A"/>
+</svg>
diff --git a/packages/design-system/src/icons/tencent-image-to-model-node.svg b/packages/design-system/src/icons/tencent-image-to-model-node.svg
new file mode 100644
index 0000000000..4d72442e19
--- /dev/null
+++ b/packages/design-system/src/icons/tencent-image-to-model-node.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 9.96651L11.9427 7.90918C11.6926 7.65922 11.3536 7.5188 11 7.5188C10.6464 7.5188 10.3074 7.65922 10.0573 7.90918L4 13.9665M5 21.9999L7 19.9999M7 19.9999H4C3.46957 19.9999 2.96086 19.7892 2.58579 19.4142C2.21071 19.0391 2 18.5304 2 17.9999V16.9999M7 19.9999L5 17.9999M16.6001 10.1607L20.8005 12.561C20.9827 12.6662 21.1341 12.8175 21.2394 12.9997C21.3448 13.1819 21.4003 13.3886 21.4005 13.5991V18.3995C21.4003 18.61 21.3448 18.8167 21.2394 18.9989C21.1341 19.1811 20.9827 19.3324 20.8005 19.4376L16.6001 21.8379C16.4176 21.9432 16.2107 21.9986 16 21.9986C15.7894 21.9986 15.5824 21.9432 15.4 21.8379L11.1995 19.4376C11.0173 19.3324 10.8659 19.1811 10.7606 18.9989C10.6553 18.8167 10.5997 18.61 10.5995 18.3995V16.4999M16 15.9994L21.2206 12.9991M16 15.9994L15 15.4246M16 15.9994L16 21.9999M3.33333 1.96655H12.6667C13.403 1.96655 14 2.56351 14 3.29989V12.6332C14 13.3696 13.403 13.9666 12.6667 13.9666H3.33333C2.59695 13.9666 2 13.3696 2 12.6332V3.29989C2 2.56351 2.59695 1.96655 3.33333 1.96655ZM7.33333 5.96655C7.33333 6.70293 6.73638 7.29989 6 7.29989C5.26362 7.29989 4.66667 6.70293 4.66667 5.96655C4.66667 5.23017 5.26362 4.63322 6 4.63322C6.73638 4.63322 7.33333 5.23017 7.33333 5.96655Z" stroke="#8A8A8A" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/design-system/src/icons/tencent-text-to-model-node.svg b/packages/design-system/src/icons/tencent-text-to-model-node.svg
new file mode 100644
index 0000000000..3d0a1c874f
--- /dev/null
+++ b/packages/design-system/src/icons/tencent-text-to-model-node.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.7795 12.999L16 15.9993M16 15.9993L21.2205 12.999M16 15.9993L16 21.9999M11.3333 2H2M14 6H2M8 9.93327L2 9.93327M5 22L7 20M7 20H4C3.46957 20 2.96086 19.7893 2.58579 19.4142C2.21071 19.0391 2 18.5304 2 18V14M7 20L5 18M21.4005 13.599C21.4003 13.3886 21.3448 13.1819 21.2394 12.9997C21.1341 12.8175 20.9827 12.6662 20.8005 12.5609L16.6001 10.1607C16.4176 10.0554 16.2107 9.99992 16 9.99992C15.7893 9.99992 15.5824 10.0554 15.3999 10.1607L11.1995 12.5609C11.0173 12.6662 10.8659 12.8175 10.7606 12.9997C10.6552 13.1819 10.5997 13.3886 10.5995 13.599V18.3995C10.5997 18.61 10.6552 18.8167 10.7606 18.9989C10.8659 19.1811 11.0173 19.3324 11.1995 19.4376L15.3999 21.8378C15.5824 21.9432 15.7893 21.9986 16 21.9986C16.2107 21.9986 16.4176 21.9432 16.6001 21.8378L20.8005 19.4376C20.9827 19.3324 21.1341 19.1811 21.2394 18.9989C21.3448 18.8167 21.4003 18.61 21.4005 18.3995V13.599Z" stroke="#8A8A8A" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/design-system/src/icons/tencent.svg b/packages/design-system/src/icons/tencent.svg
new file mode 100644
index 0000000000..7eaa231218
--- /dev/null
+++ b/packages/design-system/src/icons/tencent.svg
@@ -0,0 +1,23 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1485_17631)">
+<g clip-path="url(#clip1_1485_17631)">
+<path d="M227.84 506.88C124.8 494.72 93.7729 356.352 165.607 289.203C177.434 278.144 199.424 260.659 215.04 266.24L219.751 272.896C217.626 366.95 308.608 382.234 373.581 330.675C468.864 255.104 456.218 110.438 357.376 44.416L353.255 35.84C349.875 32.4864 351.309 31.4624 355.815 33.28C524.621 110.08 558.362 329.421 416.051 450.637C370.637 489.318 287.079 519.168 227.815 506.88H227.84Z" fill="#004BE5"/>
+<path d="M286.72 12.7999C281.165 13.1071 285.927 14.8735 300.979 18.0991L302.08 20.4799C307.866 19.6607 319.488 21.6319 317.44 28.1599C315.776 29.7215 316.39 31.7695 316.774 31.7951C342.707 34.7903 358.963 89.7791 357.683 114.432C354.509 176.026 307.405 198.528 257.178 216.806C239.13 224.742 220.493 247.91 222.694 263.654C223.744 270.848 219.008 272.281 215.014 266.214C96.9729 303.616 107.725 481.997 227.814 506.854C216.986 508.083 207.232 504.269 197.094 501.734L199.45 499.891C190.771 498.97 184.013 496.179 179.174 491.494C174.336 492.365 167.526 491.187 166.374 486.374C52.8129 442.368 35.5585 274.381 119.578 192.486C160 146.022 100.89 88.7551 54.8097 124.058L48.6145 122.854C55.5521 108.16 70.0161 91.9295 81.8689 80.5887C134.221 30.5151 215.091 1.74071 286.72 12.7999Z" fill="#9DD9F2"/>
+<path d="M307.2 17.9199C318.182 20.7871 324.557 20.5055 335.36 25.5999C341.939 27.1871 350.003 30.1055 353.28 35.8399C467.123 103.322 476.774 272.41 363.315 344.115C290.048 390.4 207.334 358.144 215.04 266.24C217.395 265.498 221.107 264.064 222.72 263.68L226.611 257.536C286.387 252.851 341.325 243.917 366.336 180.096C389.453 121.088 362.854 66.2783 317.44 28.1599C311.859 25.0111 308.326 22.8351 302.08 20.4799C300.134 18.3039 301.85 17.4591 307.2 17.9199Z" fill="#00B3FE"/>
+<path d="M48.6401 122.88C81.9457 89.3952 140.928 116.198 138.266 162.458C136.704 189.798 102.81 215.885 89.9073 242.227C48.3073 327.091 80.4865 443.93 166.4 486.4C169.011 489.19 167.296 490.061 161.28 488.96C51.9169 442.65 -2.91833 345.754 8.01287 226.893C10.4705 200.192 29.7729 141.85 48.6401 122.88Z" fill="#004BE5"/>
+<path d="M179.2 491.52C186.112 494.336 212.071 501.299 197.12 501.76C187.418 499.354 182.835 497.229 174.08 494.08C171.623 491.443 173.338 490.598 179.2 491.52Z" fill="#3B7FEA"/>
+<path d="M286.72 12.8C295.655 14.1824 299.52 15.8976 307.2 17.92L302.08 20.48C294.656 17.664 287.155 15.2832 279.066 15.3344C278.144 11.136 282.803 13.1072 286.72 12.8Z" fill="#41C3FC"/>
+<path d="M355.84 33.2799L353.28 35.8399C348.339 32.9215 340.045 27.8015 335.36 25.5999C344.013 24.4479 349.875 30.5663 355.84 33.2799Z" fill="#1872ED"/>
+<path d="M179.2 491.52L174.08 494.08C169.267 492.339 165.888 490.906 161.28 488.96L166.4 486.4C169.6 487.987 175.335 489.933 179.2 491.52Z" fill="#1A61E7"/>
+<path d="M317.44 28.1599C400.589 75.0847 400.41 198.349 316.595 243.635C281.395 262.656 257.869 255.027 222.72 263.68C214.374 265.242 217.446 257.587 218.803 253.363C235.443 201.626 287.872 209.152 321.203 179.098C362.906 141.491 361.651 82.3295 326.502 40.8319C325.12 39.2191 304.64 27.2383 317.44 28.1343V28.1599Z" fill="#E8E8EA"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_1485_17631">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+<clipPath id="clip1_1485_17631">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/design-system/src/icons/topaz.svg b/packages/design-system/src/icons/topaz.svg
new file mode 100644
index 0000000000..f83e03ebcd
--- /dev/null
+++ b/packages/design-system/src/icons/topaz.svg
@@ -0,0 +1,10 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1483_16780)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13 337.575V499H174.595V337.575H13ZM336.676 337.575V176.15H175.081V337.575H336.676ZM499 174.425V13H337.405V174.425H499Z" fill="#B6B6B6"/>
+</g>
+<defs>
+<clipPath id="clip0_1483_16780">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/design-system/src/icons/tripo.svg b/packages/design-system/src/icons/tripo.svg
new file mode 100644
index 0000000000..8de6a38c4f
--- /dev/null
+++ b/packages/design-system/src/icons/tripo.svg
@@ -0,0 +1,16 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1485_17765)">
+<g clip-path="url(#clip1_1485_17765)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M270.101 101.376C270.22 101.184 270.257 100.952 270.205 100.732C270.153 100.512 270.016 100.322 269.824 100.203C269.694 100.128 269.547 100.092 269.397 100.096H138.581C137.874 100.104 137.178 99.9274 136.56 99.5831C135.943 99.2388 135.426 98.739 135.061 98.1333L90.56 22.4426C90.5118 22.3577 90.4813 22.2638 90.4702 22.1667C90.4592 22.0696 90.4679 21.9713 90.4958 21.8777C90.5237 21.784 90.5702 21.697 90.6325 21.6218C90.6949 21.5466 90.7718 21.4847 90.8587 21.44C90.9631 21.3795 91.0797 21.343 91.2 21.3333C208.363 21.3333 320.171 21.3333 426.581 21.376C471.147 21.376 505.493 54.2293 511.979 98.1333C512.149 99.456 511.573 100.096 510.272 100.096H367.979C367.229 100.102 366.493 100.301 365.842 100.675C365.192 101.048 364.649 101.584 364.267 102.229C334.101 153.643 304.107 204.693 274.283 255.36C268.309 265.429 254.656 268.587 244.992 262.656C240.939 260.181 237.376 256.171 234.283 250.688C228.253 239.958 221.98 229.367 215.467 218.923C210.731 211.328 210.475 203.84 214.72 196.48C233.064 164.693 251.532 132.977 270.123 101.333L270.101 101.376Z" fill="#F6D85A"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M229.803 362.368C241.963 383.104 271.083 381.909 282.901 361.771L405.333 152.832C405.572 152.387 405.93 152.017 406.367 151.765C406.804 151.512 407.303 151.387 407.808 151.403H498.048C498.411 151.403 498.688 151.701 498.645 152.043C498.645 152.149 498.624 152.256 498.581 152.32C443.008 246.869 386.965 342.315 330.475 438.613C303.104 485.355 239.211 492.309 198.656 458.816C192.085 453.397 184.469 443.307 175.851 428.587C121.984 336.341 67.0934 242.773 11.1574 147.797C-11.52 109.333 2.11203 63.5947 36.544 36.864C37.6747 35.9893 38.5707 36.16 39.296 37.3547C101.269 142.955 164.779 251.285 229.803 362.368Z" fill="#B6B6B6"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_1485_17765">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+<clipPath id="clip1_1485_17765">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/design-system/src/icons/veo.svg b/packages/design-system/src/icons/veo.svg
new file mode 100644
index 0000000000..c92e4c632b
--- /dev/null
+++ b/packages/design-system/src/icons/veo.svg
@@ -0,0 +1,13 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1485_17574)">
+<path d="M490.667 261.227C490.667 241.92 489.067 227.84 485.632 213.227H260.779V300.331H392.747C390.101 321.963 375.744 354.56 343.808 376.469L343.36 379.371L414.443 433.344L419.349 433.813C464.619 392.896 490.667 332.651 490.667 261.227Z" fill="#4285F4"/>
+<path d="M260.8 490.667C325.44 490.667 379.712 469.803 419.371 433.813L343.808 376.469C323.584 390.293 296.448 399.936 260.8 399.936C230.751 399.939 201.455 390.534 177.022 373.042C152.59 355.549 134.246 330.847 124.565 302.4L121.749 302.635L47.8294 358.699L46.8694 361.344C86.2507 437.995 167.147 490.667 260.8 490.667Z" fill="#34A853"/>
+<path d="M124.587 302.4C119.34 287.489 116.621 271.807 116.544 256C116.544 239.829 119.488 224.192 124.245 209.6L124.117 206.464L49.28 149.504L46.8267 150.656C30.097 183.253 21.3588 219.361 21.3334 256C21.3334 293.803 30.6347 329.536 46.8694 361.344L124.587 302.4Z" fill="#FBBC05"/>
+<path d="M260.8 112.064C305.771 112.064 336.085 131.093 353.387 147.008L420.949 82.3466C379.456 44.5439 325.44 21.3333 260.8 21.3333C167.125 21.3333 86.2507 74.0053 46.8694 150.656L124.309 209.6C134.073 181.155 152.473 156.468 176.942 138.983C201.41 121.498 230.726 112.087 260.8 112.064Z" fill="#EB4335"/>
+</g>
+<defs>
+<clipPath id="clip0_1485_17574">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/design-system/src/icons/video-slice.svg b/packages/design-system/src/icons/video-slice.svg
new file mode 100644
index 0000000000..8a9f0d44e1
--- /dev/null
+++ b/packages/design-system/src/icons/video-slice.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18 21V17.8889H21.5M6 21V17.8889H2.5M2.5 17.8889V20C2.5 20.5523 2.94772 21 3.5 21H9.5V19.5M2.5 17.8889V10.1111M2.5 10.1111V8C2.5 7.44771 2.94772 7 3.5 7L6 7V10.1111H2.5ZM21.5 10.1111L21.5 8C21.5 7.44771 21.0523 7 20.5 7L18 7V10.1111H21.5ZM21.5 10.1111V17.8889M21.5 17.8889L21.5 20C21.5 20.5523 21.0523 21 20.5 21L14.5 21V19.5M8.5 13.8889H15.5M12 17V13.8889M8.5 6.11111H15.5M12 6.11111V3M15.5 6.11111L15.5 3L8.5 3V17L15.5 17L15.5 13.8889M15.5 6.11111V13.8889" stroke="#8A8A8A" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/design-system/src/icons/vidu.svg b/packages/design-system/src/icons/vidu.svg
new file mode 100644
index 0000000000..3000b25bf7
--- /dev/null
+++ b/packages/design-system/src/icons/vidu.svg
@@ -0,0 +1,24 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1485_17589)">
+<g clip-path="url(#clip1_1485_17589)">
+<path d="M439.616 47.9361C377.387 27.3281 323.861 71.0614 311.381 111.083C311.381 111.083 266.475 255.296 247.339 315.456C238.208 344.171 215.573 391.147 172.949 391.147C138.24 391.147 120.405 358.571 112.875 339.157L61.12 201.195C55.1253 186.667 61.3973 157.675 85.44 148.992C111.125 139.776 127.637 161.259 131.904 172.672L196.373 337.792C211.733 317.995 221.504 285.781 227.861 262.976L185.536 151.829C165.461 99.9681 112.363 76.3734 63.1893 94.5067C23.3599 109.184 -14.976 159.445 5.86662 222.613L59.2853 360C67.392 380.821 99.4133 448.811 171.819 448.811C258.709 448.811 291.307 374.72 309.397 316.16C318.443 286.869 368.043 128.491 368.043 128.491C375.253 104.832 404.523 98.0267 422.827 104C435.733 108.181 459.051 125.995 451.52 153.6C450.112 158.635 410.56 286.059 395.968 324.821C388.352 345.045 369.045 388.949 325.056 382.848C311.659 412.501 300.523 429.76 283.669 445.248C338.539 471.232 418.496 445.056 452.16 343.36C464.661 305.536 508.565 169.152 508.565 169.152C521.323 127.275 498.56 67.4347 439.616 47.9361Z" fill="url(#paint0_linear_1485_17589)"/>
+</g>
+</g>
+<defs>
+<linearGradient id="paint0_linear_1485_17589" x1="16.1919" y1="120.256" x2="557.973" y2="369.301" gradientUnits="userSpaceOnUse">
+<stop stop-color="#40EDD8"/>
+<stop offset="0.024" stop-color="#38E7E2"/>
+<stop offset="0.084" stop-color="#28DAF7"/>
+<stop offset="0.124" stop-color="#22D5FF"/>
+<stop offset="0.36" stop-color="#1ABFFF"/>
+<stop offset="0.85" stop-color="#0786FE"/>
+<stop offset="0.909" stop-color="#047FFE"/>
+</linearGradient>
+<clipPath id="clip0_1485_17589">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+<clipPath id="clip1_1485_17589">
+<rect width="512" height="512" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/design-system/src/icons/wan.svg b/packages/design-system/src/icons/wan.svg
new file mode 100644
index 0000000000..ed9b8c6d2a
--- /dev/null
+++ b/packages/design-system/src/icons/wan.svg
@@ -0,0 +1,13 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1483_16792)">
+<path d="M259.402 2C268.253 6.96049 293.807 62.6864 297.334 63.5283C339.134 66.0996 385.508 59.7738 426.762 63.3463C430.425 63.6648 435.886 63.6648 438.617 66.3043L473.818 127.787L475.729 135.114C474.432 147.766 442.826 187.063 444.055 195.982L512 316.013V320.564C499.622 330.485 479.78 382.638 468.744 387.667C456.047 393.446 407.329 383.89 399.342 391.08L329.964 509.426H250.323C241.175 504.511 215.918 448.74 212.391 447.898C170.591 445.327 124.217 451.653 82.9631 448.08C79.2996 447.762 73.8385 447.762 71.108 445.122C59.7762 421.73 43.3247 400.296 33.9498 376.267C34.1318 365.959 60.4361 332.919 64.8049 320.427C65.6696 317.947 66.8529 315.944 65.6014 313.214L1.77485 203.878L0 190.863C8.96529 179.872 31.1055 128.242 40.9809 123.76C53.678 117.98 102.395 127.537 110.382 120.346L179.761 2H259.402ZM186.587 133.976C190.114 120.301 219.149 84.9858 218.421 73.8589C218.193 70.4002 188.794 15.7665 185.45 15.6982L180.125 21.7054L123.375 121.825C127.175 131.132 161.307 193.707 165.312 195.05L428.445 195.436C439.982 175.481 454.294 155.434 461.917 133.954H186.587V133.976ZM116.048 133.976H47.7845L184.312 377.45H113.773L81.9164 436.612H205.929L247.547 363.046L116.048 133.976ZM427.785 316.013H498.325L436.523 207.155L352.695 207.929L221.015 436.02C219.991 443.461 242.495 471.722 245.317 481.37L255.943 495.774L393.631 257.943C396.293 255.85 399.661 264.769 400.844 266.704C410.583 282.541 419.298 299.447 427.785 315.99V316.013Z" fill="#615CEC"/>
+<path d="M186.587 133.977H461.917C454.317 155.457 440.005 175.504 428.445 195.46L165.312 195.073C161.307 193.753 127.175 131.178 123.375 121.849L180.125 21.7289L185.45 15.7217C188.794 15.7672 218.193 70.4236 218.421 73.8823C219.149 85.032 190.114 120.324 186.587 134V133.977Z" fill="#FDFDFE"/>
+<path d="M427.785 316.013C419.321 299.47 410.606 282.541 400.844 266.726C399.661 264.815 396.316 255.895 393.631 257.966L255.943 495.796L245.317 481.393C242.472 471.745 219.991 443.506 221.015 436.043L352.695 207.951L436.523 207.178L498.325 316.035H427.785V316.013Z" fill="#FDFDFE"/>
+<path d="M116.048 133.977L247.547 363.047L205.929 436.612H81.9164L113.773 377.45H184.312L47.7845 133.977H116.048Z" fill="#FDFDFE"/>
+</g>
+<defs>
+<clipPath id="clip0_1483_16792">
+<rect width="512" height="508" fill="white" transform="translate(0 2)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/design-system/src/icons/wavespeed.svg b/packages/design-system/src/icons/wavespeed.svg
new file mode 100644
index 0000000000..d04d8365b5
--- /dev/null
+++ b/packages/design-system/src/icons/wavespeed.svg
@@ -0,0 +1,12 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1483_17263)">
+<path d="M219.566 100.584L317.571 100.351C322.357 101.117 327.896 106.65 328.363 111.586C315.613 206.169 272.888 295.881 208.93 366.046C191.16 385.529 170.524 409.285 142.935 411.441C115.282 413.61 69.6647 413.376 41.8557 411.441C26.6802 410.389 13.8782 403.804 11.6084 387.282C6.74438 351.979 32.478 348.135 55.9158 332.068C114.154 292.167 160.537 233.523 184.986 167.047C190.161 152.98 195.401 124.094 201.524 113.612C204.948 107.741 212.821 101.714 219.579 100.571L219.566 100.584Z" fill="#B6B6B6"/>
+<path d="M395.615 100.584C407.665 98.5321 471.221 98.4152 483.037 100.584C498.628 103.429 503.18 119.171 501.754 132.978C495.437 194.076 458.432 287.594 430.286 342.718C414.332 373.969 401.18 408.532 361.697 411.441C335.951 413.337 289.996 413.701 264.509 411.441C253.276 410.441 245.935 403.934 249.385 392.283C301.306 324.119 341.191 248.187 364.525 165.359C368.598 150.915 373.578 116.43 382.969 107.351C385.797 104.611 391.75 101.234 395.628 100.571L395.615 100.584Z" fill="#B6B6B6"/>
+<path d="M31.8425 100.571L127.267 100.351C142.728 102.766 134.803 130.185 132.533 140.472C120.95 192.908 81.001 257.006 33.373 283.594C22.2702 289.79 14.1506 287.958 11.4527 274.658C15.0066 226.938 6.7833 172.489 11.4916 125.562C12.6979 113.547 20.4413 104.286 31.8425 100.571Z" fill="#B6B6B6"/>
+</g>
+<defs>
+<clipPath id="clip0_1483_17263">
+<rect width="492" height="314" fill="white" transform="translate(10 99)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/design-system/tailwind.config.ts b/packages/design-system/tailwind.config.ts
deleted file mode 100644
index 62b611426c..0000000000
--- a/packages/design-system/tailwind.config.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import lucide from '@iconify-json/lucide/icons.json' with { type: 'json' }
-import { addDynamicIconSelectors } from '@iconify/tailwind'
-
-import { iconCollection } from './src/iconCollection'
-
-export default {
-  theme: {
-    extend: {
-      boxShadow: {
-        interface: 'var(--interface-panel-box-shadow)'
-      }
-    }
-  },
-  plugins: [
-    addDynamicIconSelectors({
-      iconSets: {
-        comfy: iconCollection,
-        lucide
-      },
-      scale: 1.2,
-      prefix: 'icon'
-    })
-  ]
-}
diff --git a/packages/registry-types/package.json b/packages/registry-types/package.json
index bdc63b1224..096c8eede3 100644
--- a/packages/registry-types/package.json
+++ b/packages/registry-types/package.json
@@ -2,11 +2,11 @@
   "name": "@comfyorg/registry-types",
   "version": "1.0.0",
   "description": "Comfy Registry API TypeScript types",
-  "packageManager": "pnpm@10.17.1",
   "type": "module",
   "exports": {
     ".": "./src/comfyRegistryTypes.ts"
   },
+  "packageManager": "pnpm@10.17.1",
   "nx": {
     "tags": [
       "scope:shared",
diff --git a/packages/registry-types/src/comfyRegistryTypes.ts b/packages/registry-types/src/comfyRegistryTypes.ts
index f2d69fd29d..452f91816f 100644
--- a/packages/registry-types/src/comfyRegistryTypes.ts
+++ b/packages/registry-types/src/comfyRegistryTypes.ts
@@ -3952,7 +3952,7 @@ export interface components {
          * @description The subscription tier level
          * @enum {string}
          */
-        SubscriptionTier: "STANDARD" | "CREATOR" | "PRO" | "FOUNDERS_EDITION";
+        SubscriptionTier: "FREE" | "STANDARD" | "CREATOR" | "PRO" | "FOUNDERS_EDITION";
         /**
          * @description The subscription billing duration
          * @enum {string}
diff --git a/packages/shared-frontend-utils/package.json b/packages/shared-frontend-utils/package.json
index 0157b5d1c5..aa18c7a940 100644
--- a/packages/shared-frontend-utils/package.json
+++ b/packages/shared-frontend-utils/package.json
@@ -1,22 +1,23 @@
 {
   "name": "@comfyorg/shared-frontend-utils",
-  "private": true,
   "version": "1.0.0",
+  "private": true,
   "description": "Shared frontend utils for ComfyUI Frontend",
-  "scripts": {
-    "typecheck": "tsc --noEmit"
-  },
   "keywords": [],
-  "packageManager": "pnpm@10.17.1",
   "type": "module",
   "exports": {
     "./formatUtil": "./src/formatUtil.ts",
     "./networkUtil": "./src/networkUtil.ts"
   },
+  "scripts": {
+    "typecheck": "tsc --noEmit"
+  },
   "dependencies": {
-    "axios": "catalog:"
+    "axios": "catalog:",
+    "dompurify": "catalog:"
   },
   "devDependencies": {
     "typescript": "catalog:"
-  }
+  },
+  "packageManager": "pnpm@10.17.1"
 }
diff --git a/packages/shared-frontend-utils/src/formatUtil.test.ts b/packages/shared-frontend-utils/src/formatUtil.test.ts
new file mode 100644
index 0000000000..d494126db5
--- /dev/null
+++ b/packages/shared-frontend-utils/src/formatUtil.test.ts
@@ -0,0 +1,359 @@
+import { describe, expect, it } from 'vitest'
+
+import {
+  appendWorkflowJsonExt,
+  ensureWorkflowSuffix,
+  getFilenameDetails,
+  getMediaTypeFromFilename,
+  getPathDetails,
+  highlightQuery,
+  isPreviewableMediaType,
+  truncateFilename
+} from './formatUtil'
+
+describe('formatUtil', () => {
+  describe('truncateFilename', () => {
+    it('should not truncate short filenames', () => {
+      expect(truncateFilename('test.png')).toBe('test.png')
+      expect(truncateFilename('short.jpg', 10)).toBe('short.jpg')
+    })
+
+    it('should truncate long filenames while preserving extension', () => {
+      const longName = 'this-is-a-very-long-filename-that-needs-truncation.png'
+      const truncated = truncateFilename(longName, 20)
+      expect(truncated).toContain('...')
+      expect(truncated.endsWith('.png')).toBe(true)
+      expect(truncated.length).toBeLessThanOrEqual(25) // 20 + '...' + extension
+    })
+
+    it('should handle filenames without extensions', () => {
+      const longName = 'this-is-a-very-long-filename-without-extension'
+      const truncated = truncateFilename(longName, 20)
+      expect(truncated).toContain('...')
+      expect(truncated.length).toBeLessThanOrEqual(23) // 20 + '...'
+    })
+
+    it('should handle empty strings', () => {
+      expect(truncateFilename('')).toBe('')
+      expect(truncateFilename('', 10)).toBe('')
+    })
+
+    it('should preserve the start and end of the filename', () => {
+      const longName = 'ComfyUI_00001_timestamp_2024_01_01.png'
+      const truncated = truncateFilename(longName, 20)
+      expect(truncated).toMatch(/^ComfyUI.*01\.png$/)
+      expect(truncated).toContain('...')
+    })
+
+    it('should handle files with multiple dots', () => {
+      const filename = 'my.file.with.multiple.dots.txt'
+      const truncated = truncateFilename(filename, 15)
+      expect(truncated.endsWith('.txt')).toBe(true)
+      expect(truncated).toContain('...')
+    })
+  })
+
+  describe('getMediaTypeFromFilename', () => {
+    describe('image files', () => {
+      const imageTestCases = [
+        { filename: 'test.png', expected: 'image' },
+        { filename: 'photo.jpg', expected: 'image' },
+        { filename: 'image.jpeg', expected: 'image' },
+        { filename: 'animation.gif', expected: 'image' },
+        { filename: 'web.webp', expected: 'image' },
+        { filename: 'bitmap.bmp', expected: 'image' },
+        { filename: 'modern.avif', expected: 'image' }
+      ]
+
+      it.for(imageTestCases)(
+        'should identify $filename as $expected',
+        ({ filename, expected }) => {
+          expect(getMediaTypeFromFilename(filename)).toBe(expected)
+        }
+      )
+
+      it('should handle uppercase extensions', () => {
+        expect(getMediaTypeFromFilename('test.PNG')).toBe('image')
+        expect(getMediaTypeFromFilename('photo.JPG')).toBe('image')
+      })
+    })
+
+    describe('video files', () => {
+      it('should identify video extensions correctly', () => {
+        expect(getMediaTypeFromFilename('video.mp4')).toBe('video')
+        expect(getMediaTypeFromFilename('clip.webm')).toBe('video')
+        expect(getMediaTypeFromFilename('movie.mov')).toBe('video')
+        expect(getMediaTypeFromFilename('film.avi')).toBe('video')
+      })
+    })
+
+    describe('audio files', () => {
+      it('should identify audio extensions correctly', () => {
+        expect(getMediaTypeFromFilename('song.mp3')).toBe('audio')
+        expect(getMediaTypeFromFilename('sound.wav')).toBe('audio')
+        expect(getMediaTypeFromFilename('music.ogg')).toBe('audio')
+        expect(getMediaTypeFromFilename('audio.flac')).toBe('audio')
+      })
+    })
+
+    describe('3D files', () => {
+      it('should identify 3D file extensions correctly', () => {
+        expect(getMediaTypeFromFilename('model.obj')).toBe('3D')
+        expect(getMediaTypeFromFilename('scene.fbx')).toBe('3D')
+        expect(getMediaTypeFromFilename('asset.gltf')).toBe('3D')
+        expect(getMediaTypeFromFilename('binary.glb')).toBe('3D')
+        expect(getMediaTypeFromFilename('apple.usdz')).toBe('3D')
+      })
+    })
+
+    describe('text files', () => {
+      it('should identify text file extensions correctly', () => {
+        expect(getMediaTypeFromFilename('notes.txt')).toBe('text')
+        expect(getMediaTypeFromFilename('readme.md')).toBe('text')
+        expect(getMediaTypeFromFilename('data.json')).toBe('text')
+        expect(getMediaTypeFromFilename('table.csv')).toBe('text')
+        expect(getMediaTypeFromFilename('config.yaml')).toBe('text')
+      })
+    })
+
+    describe('edge cases', () => {
+      it('should handle empty strings', () => {
+        expect(getMediaTypeFromFilename('')).toBe('other')
+      })
+
+      it('should handle files without extensions', () => {
+        expect(getMediaTypeFromFilename('README')).toBe('other')
+      })
+
+      it('should handle unknown extensions', () => {
+        expect(getMediaTypeFromFilename('document.pdf')).toBe('other')
+        expect(getMediaTypeFromFilename('archive.bin')).toBe('other')
+      })
+
+      it('should handle files with multiple dots', () => {
+        expect(getMediaTypeFromFilename('my.file.name.png')).toBe('image')
+        expect(getMediaTypeFromFilename('archive.tar.gz')).toBe('other')
+      })
+
+      it('should handle paths with directories', () => {
+        expect(getMediaTypeFromFilename('/path/to/image.png')).toBe('image')
+        expect(getMediaTypeFromFilename('C:\\Windows\\video.mp4')).toBe('video')
+      })
+
+      it('should handle null and undefined gracefully', () => {
+        expect(getMediaTypeFromFilename(null)).toBe('other')
+        expect(getMediaTypeFromFilename(undefined)).toBe('other')
+      })
+
+      it('should handle special characters in filenames', () => {
+        expect(getMediaTypeFromFilename('test@#$.png')).toBe('image')
+        expect(getMediaTypeFromFilename('video (1).mp4')).toBe('video')
+        expect(getMediaTypeFromFilename('[2024] audio.mp3')).toBe('audio')
+      })
+
+      it('should handle very long filenames', () => {
+        const longFilename = 'a'.repeat(1000) + '.png'
+        expect(getMediaTypeFromFilename(longFilename)).toBe('image')
+      })
+
+      it('should handle mixed case extensions', () => {
+        expect(getMediaTypeFromFilename('test.PnG')).toBe('image')
+        expect(getMediaTypeFromFilename('video.Mp4')).toBe('video')
+        expect(getMediaTypeFromFilename('audio.WaV')).toBe('audio')
+      })
+    })
+  })
+
+  describe('highlightQuery', () => {
+    it('should return text unchanged when query is empty', () => {
+      expect(highlightQuery('Hello World', '')).toBe('Hello World')
+    })
+
+    it('should wrap matching text in highlight span', () => {
+      const result = highlightQuery('Hello World', 'World')
+      expect(result).toBe('Hello <span class="highlight">World</span>')
+    })
+
+    it('should be case-insensitive', () => {
+      const result = highlightQuery('Hello World', 'hello')
+      expect(result).toBe('<span class="highlight">Hello</span> World')
+    })
+
+    it('should sanitize text by default', () => {
+      const result = highlightQuery('<script>alert("xss")</script>', 'alert')
+      expect(result).not.toContain('<script>')
+    })
+
+    it('should skip sanitization when sanitize is false', () => {
+      const result = highlightQuery('<b>bold</b>', 'bold', false)
+      expect(result).toContain('<b>')
+    })
+
+    it('should escape special regex characters in query', () => {
+      const result = highlightQuery('price is $10.00', '$10')
+      expect(result).toContain('<span class="highlight">$10</span>')
+    })
+
+    it('should highlight multiple occurrences', () => {
+      const result = highlightQuery('foo bar foo', 'foo')
+      expect(result).toBe(
+        '<span class="highlight">foo</span> bar <span class="highlight">foo</span>'
+      )
+    })
+  })
+
+  describe('getFilenameDetails', () => {
+    it('splits simple filenames into name and suffix', () => {
+      expect(getFilenameDetails('file.txt')).toEqual({
+        filename: 'file',
+        suffix: 'txt'
+      })
+    })
+
+    it('handles filenames with multiple dots', () => {
+      expect(getFilenameDetails('my.file.name.png')).toEqual({
+        filename: 'my.file.name',
+        suffix: 'png'
+      })
+    })
+
+    it('handles filenames without extension', () => {
+      expect(getFilenameDetails('README')).toEqual({
+        filename: 'README',
+        suffix: null
+      })
+    })
+
+    it('recognises .app.json as a compound extension', () => {
+      expect(getFilenameDetails('workflow.app.json')).toEqual({
+        filename: 'workflow',
+        suffix: 'app.json'
+      })
+    })
+
+    it('recognises .app.json case-insensitively', () => {
+      expect(getFilenameDetails('Workflow.APP.JSON')).toEqual({
+        filename: 'Workflow',
+        suffix: 'app.json'
+      })
+    })
+
+    it('handles regular .json files normally', () => {
+      expect(getFilenameDetails('workflow.json')).toEqual({
+        filename: 'workflow',
+        suffix: 'json'
+      })
+    })
+
+    it('treats bare .app.json as a dotfile without basename', () => {
+      expect(getFilenameDetails('.app.json')).toEqual({
+        filename: '.app',
+        suffix: 'json'
+      })
+    })
+  })
+
+  describe('getPathDetails', () => {
+    it('splits a path with .app.json extension', () => {
+      const result = getPathDetails('workflows/test.app.json')
+      expect(result).toEqual({
+        directory: 'workflows',
+        fullFilename: 'test.app.json',
+        filename: 'test',
+        suffix: 'app.json'
+      })
+    })
+
+    it('splits a path with .json extension', () => {
+      const result = getPathDetails('workflows/test.json')
+      expect(result).toEqual({
+        directory: 'workflows',
+        fullFilename: 'test.json',
+        filename: 'test',
+        suffix: 'json'
+      })
+    })
+  })
+
+  describe('appendWorkflowJsonExt', () => {
+    it('appends .app.json when isApp is true', () => {
+      expect(appendWorkflowJsonExt('test', true)).toBe('test.app.json')
+    })
+
+    it('appends .json when isApp is false', () => {
+      expect(appendWorkflowJsonExt('test', false)).toBe('test.json')
+    })
+
+    it('replaces .json with .app.json when isApp is true', () => {
+      expect(appendWorkflowJsonExt('test.json', true)).toBe('test.app.json')
+    })
+
+    it('replaces .app.json with .json when isApp is false', () => {
+      expect(appendWorkflowJsonExt('test.app.json', false)).toBe('test.json')
+    })
+
+    it('leaves .app.json unchanged when isApp is true', () => {
+      expect(appendWorkflowJsonExt('test.app.json', true)).toBe('test.app.json')
+    })
+
+    it('leaves .json unchanged when isApp is false', () => {
+      expect(appendWorkflowJsonExt('test.json', false)).toBe('test.json')
+    })
+
+    it('handles case-insensitive extensions', () => {
+      expect(appendWorkflowJsonExt('test.JSON', true)).toBe('test.app.json')
+      expect(appendWorkflowJsonExt('test.APP.JSON', false)).toBe('test.json')
+    })
+  })
+
+  describe('ensureWorkflowSuffix', () => {
+    it('appends suffix when missing', () => {
+      expect(ensureWorkflowSuffix('file', 'json')).toBe('file.json')
+    })
+
+    it('does not double-append when suffix already present', () => {
+      expect(ensureWorkflowSuffix('file.json', 'json')).toBe('file.json')
+    })
+
+    it('appends compound suffix when missing', () => {
+      expect(ensureWorkflowSuffix('file', 'app.json')).toBe('file.app.json')
+    })
+
+    it('does not double-append compound suffix', () => {
+      expect(ensureWorkflowSuffix('file.app.json', 'app.json')).toBe(
+        'file.app.json'
+      )
+    })
+
+    it('replaces .json with .app.json when suffix is app.json', () => {
+      expect(ensureWorkflowSuffix('file.json', 'app.json')).toBe(
+        'file.app.json'
+      )
+    })
+
+    it('replaces .app.json with .json when suffix is json', () => {
+      expect(ensureWorkflowSuffix('file.app.json', 'json')).toBe('file.json')
+    })
+
+    it('handles case-insensitive extension detection', () => {
+      expect(ensureWorkflowSuffix('file.JSON', 'json')).toBe('file.json')
+      expect(ensureWorkflowSuffix('file.APP.JSON', 'app.json')).toBe(
+        'file.app.json'
+      )
+    })
+  })
+
+  describe('isPreviewableMediaType', () => {
+    it('returns true for image/video/audio/3D', () => {
+      expect(isPreviewableMediaType('image')).toBe(true)
+      expect(isPreviewableMediaType('video')).toBe(true)
+      expect(isPreviewableMediaType('audio')).toBe(true)
+      expect(isPreviewableMediaType('3D')).toBe(true)
+    })
+
+    it('returns false for text/other', () => {
+      expect(isPreviewableMediaType('text')).toBe(false)
+      expect(isPreviewableMediaType('other')).toBe(false)
+    })
+  })
+})
diff --git a/packages/shared-frontend-utils/src/formatUtil.ts b/packages/shared-frontend-utils/src/formatUtil.ts
index 032d1c9edb..74845409fa 100644
--- a/packages/shared-frontend-utils/src/formatUtil.ts
+++ b/packages/shared-frontend-utils/src/formatUtil.ts
@@ -1,3 +1,4 @@
+import { default as DOMPurify } from 'dompurify'
 import type { operations } from '@comfyorg/registry-types'
 
 export function formatCamelCase(str: string): string {
@@ -25,15 +26,53 @@ export function formatCamelCase(str: string): string {
   return processedWords.join(' ')
 }
 
+// Metadata cannot be associated with workflows, so extension encodes the mode.
+const JSON_SUFFIX = 'json'
+const APP_JSON_SUFFIX = `app.${JSON_SUFFIX}`
+const JSON_EXT = `.${JSON_SUFFIX}`
+const APP_JSON_EXT = `.${APP_JSON_SUFFIX}`
+
 export function appendJsonExt(path: string) {
-  if (!path.toLowerCase().endsWith('.json')) {
-    path += '.json'
+  if (!path.toLowerCase().endsWith(JSON_EXT)) {
+    path += JSON_EXT
   }
   return path
 }
 
-export function highlightQuery(text: string, query: string) {
+export type WorkflowSuffix = typeof JSON_SUFFIX | typeof APP_JSON_SUFFIX
+
+export function getWorkflowSuffix(
+  suffix: string | null | undefined
+): WorkflowSuffix {
+  return suffix === APP_JSON_SUFFIX ? APP_JSON_SUFFIX : JSON_SUFFIX
+}
+
+export function appendWorkflowJsonExt(path: string, isApp: boolean): string {
+  return ensureWorkflowSuffix(path, isApp ? APP_JSON_SUFFIX : JSON_SUFFIX)
+}
+
+export function ensureWorkflowSuffix(
+  name: string,
+  suffix: WorkflowSuffix
+): string {
+  const lower = name.toLowerCase()
+  if (lower.endsWith(APP_JSON_EXT)) {
+    name = name.slice(0, -APP_JSON_EXT.length)
+  } else if (lower.endsWith(JSON_EXT)) {
+    name = name.slice(0, -JSON_EXT.length)
+  }
+  return name + '.' + suffix
+}
+
+export function highlightQuery(
+  text: string,
+  query: string,
+  sanitize: boolean = true
+) {
   if (!query) return text
+  if (sanitize) {
+    text = DOMPurify.sanitize(text)
+  }
 
   // Escape special regex characters in the query string
   const escapedQuery = query.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
@@ -88,19 +127,27 @@ export function formatCommitHash(value: string): string {
 
 /**
  * Returns various filename components.
+ * Recognises compound extensions like `.app.json`.
  * Example:
- * - fullFilename: 'file.txt'
- * - filename: 'file'
- * - suffix: 'txt'
+ * - fullFilename: 'file.txt'       → { filename: 'file',  suffix: 'txt' }
+ * - fullFilename: 'file.app.json'  → { filename: 'file',  suffix: 'app.json' }
  */
 export function getFilenameDetails(fullFilename: string) {
-  if (fullFilename.includes('.')) {
+  const lower = fullFilename.toLowerCase()
+  if (
+    lower.endsWith(APP_JSON_EXT) &&
+    fullFilename.length > APP_JSON_EXT.length
+  ) {
     return {
-      filename: fullFilename.split('.').slice(0, -1).join('.'),
-      suffix: fullFilename.split('.').pop() ?? null
+      filename: fullFilename.slice(0, -APP_JSON_EXT.length),
+      suffix: APP_JSON_SUFFIX
     }
-  } else {
-    return { filename: fullFilename, suffix: null }
+  }
+  const dotIndex = fullFilename.lastIndexOf('.')
+  if (dotIndex <= 0) return { filename: fullFilename, suffix: null }
+  return {
+    filename: fullFilename.slice(0, dotIndex),
+    suffix: fullFilename.slice(dotIndex + 1)
   }
 }
 
@@ -486,19 +533,41 @@ export function formatDuration(milliseconds: number): string {
   return parts.join(' ')
 }
 
-const IMAGE_EXTENSIONS = ['png', 'jpg', 'jpeg', 'gif', 'webp', 'bmp'] as const
+const IMAGE_EXTENSIONS = [
+  'png',
+  'jpg',
+  'jpeg',
+  'gif',
+  'webp',
+  'bmp',
+  'avif',
+  'tif',
+  'tiff'
+] as const
 const VIDEO_EXTENSIONS = ['mp4', 'webm', 'mov', 'avi'] as const
 const AUDIO_EXTENSIONS = ['mp3', 'wav', 'ogg', 'flac'] as const
-const THREE_D_EXTENSIONS = ['obj', 'fbx', 'gltf', 'glb'] as const
+const THREE_D_EXTENSIONS = ['obj', 'fbx', 'gltf', 'glb', 'usdz'] as const
+const TEXT_EXTENSIONS = [
+  'txt',
+  'md',
+  'markdown',
+  'json',
+  'csv',
+  'yaml',
+  'yml',
+  'xml',
+  'log'
+] as const
 
-const MEDIA_TYPES = ['image', 'video', 'audio', '3D'] as const
-type MediaType = (typeof MEDIA_TYPES)[number]
+const MEDIA_TYPES = ['image', 'video', 'audio', '3D', 'text', 'other'] as const
+export type MediaType = (typeof MEDIA_TYPES)[number]
 
 // Type guard helper for checking array membership
 type ImageExtension = (typeof IMAGE_EXTENSIONS)[number]
 type VideoExtension = (typeof VIDEO_EXTENSIONS)[number]
 type AudioExtension = (typeof AUDIO_EXTENSIONS)[number]
 type ThreeDExtension = (typeof THREE_D_EXTENSIONS)[number]
+type TextExtension = (typeof TEXT_EXTENSIONS)[number]
 
 /**
  * Truncates a filename while preserving the extension
@@ -535,18 +604,30 @@ export function truncateFilename(
 /**
  * Determines the media type from a filename's extension (singular form)
  * @param filename The filename to analyze
- * @returns The media type: 'image', 'video', 'audio', or '3D'
+ * @returns The media type: 'image', 'video', 'audio', '3D', 'text', or 'other'
  */
-export function getMediaTypeFromFilename(filename: string): MediaType {
-  if (!filename) return 'image'
+export function getMediaTypeFromFilename(
+  filename: string | null | undefined
+): MediaType {
+  if (!filename) return 'other'
   const ext = filename.split('.').pop()?.toLowerCase()
-  if (!ext) return 'image'
+  if (!ext) return 'other'
 
   // Type-safe array includes check using type assertion
   if (IMAGE_EXTENSIONS.includes(ext as ImageExtension)) return 'image'
   if (VIDEO_EXTENSIONS.includes(ext as VideoExtension)) return 'video'
   if (AUDIO_EXTENSIONS.includes(ext as AudioExtension)) return 'audio'
   if (THREE_D_EXTENSIONS.includes(ext as ThreeDExtension)) return '3D'
+  if (TEXT_EXTENSIONS.includes(ext as TextExtension)) return 'text'
 
-  return 'image'
+  return 'other'
+}
+
+export function isPreviewableMediaType(mediaType: MediaType): boolean {
+  return (
+    mediaType === 'image' ||
+    mediaType === 'video' ||
+    mediaType === 'audio' ||
+    mediaType === '3D'
+  )
 }
diff --git a/packages/tailwind-utils/package.json b/packages/tailwind-utils/package.json
index 8a62e71ebb..8f36f7e6a0 100644
--- a/packages/tailwind-utils/package.json
+++ b/packages/tailwind-utils/package.json
@@ -1,8 +1,8 @@
 {
   "name": "@comfyorg/tailwind-utils",
   "version": "1.0.0",
-  "type": "module",
   "description": "Shared Tailwind CSS utilities for ComfyUI Frontend",
+  "type": "module",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
   "exports": {
@@ -11,17 +11,17 @@
   "scripts": {
     "typecheck": "tsc --noEmit"
   },
-  "nx": {
-    "tags": [
-      "scope:shared",
-      "type:util"
-    ]
-  },
   "dependencies": {
     "clsx": "^2.1.1",
     "tailwind-merge": "^2.2.0"
   },
   "devDependencies": {
     "typescript": "catalog:"
+  },
+  "nx": {
+    "tags": [
+      "scope:shared",
+      "type:util"
+    ]
   }
 }
diff --git a/playwright.config.ts b/playwright.config.ts
index e080f0c85a..cf5d199370 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -36,7 +36,18 @@ export default defineConfig({
       name: 'chromium',
       use: { ...devices['Desktop Chrome'] },
       timeout: 15000,
-      grepInvert: /@mobile/ // Run all tests except those tagged with @mobile
+      grepInvert: /@mobile|@perf/ // Run all tests except those tagged with @mobile or @perf
+    },
+
+    {
+      name: 'performance',
+      use: {
+        ...devices['Desktop Chrome'],
+        trace: 'retain-on-failure'
+      },
+      timeout: 60_000,
+      grep: /@perf/,
+      fullyParallel: false
     },
 
     {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6eea185643..5f4e45abac 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -15,42 +15,45 @@ catalogs:
     '@eslint/js':
       specifier: ^9.39.1
       version: 9.39.1
+    '@formkit/auto-animate':
+      specifier: ^0.9.0
+      version: 0.9.0
     '@iconify-json/lucide':
       specifier: ^1.1.178
       version: 1.2.79
     '@iconify/json':
       specifier: ^2.2.380
       version: 2.2.380
-    '@iconify/tailwind':
-      specifier: ^1.1.3
-      version: 1.2.0
+    '@iconify/tailwind4':
+      specifier: ^1.2.0
+      version: 1.2.1
+    '@iconify/utils':
+      specifier: ^3.1.0
+      version: 3.1.0
     '@intlify/eslint-plugin-vue-i18n':
-      specifier: ^4.1.0
-      version: 4.1.0
+      specifier: ^4.1.1
+      version: 4.1.1
     '@lobehub/i18n-cli':
-      specifier: ^1.25.1
-      version: 1.25.1
+      specifier: ^1.26.1
+      version: 1.26.1
     '@nx/eslint':
-      specifier: 22.2.6
-      version: 22.2.6
+      specifier: 22.5.2
+      version: 22.5.2
     '@nx/playwright':
-      specifier: 22.2.6
-      version: 22.2.6
+      specifier: 22.5.2
+      version: 22.5.2
     '@nx/storybook':
-      specifier: 22.2.4
-      version: 22.2.4
+      specifier: 22.5.2
+      version: 22.5.2
     '@nx/vite':
-      specifier: 22.2.6
-      version: 22.2.6
+      specifier: 22.5.2
+      version: 22.5.2
     '@pinia/testing':
       specifier: ^1.0.3
       version: 1.0.3
     '@playwright/test':
-      specifier: ^1.57.0
-      version: 1.57.0
-    '@prettier/plugin-oxc':
-      specifier: ^0.1.3
-      version: 0.1.3
+      specifier: ^1.58.1
+      version: 1.58.1
     '@primeuix/forms':
       specifier: 0.0.2
       version: 0.0.2
@@ -82,20 +85,44 @@ catalogs:
       specifier: ^0.1.10
       version: 0.1.10
     '@storybook/addon-docs':
-      specifier: ^10.1.9
-      version: 10.1.9
+      specifier: ^10.2.10
+      version: 10.2.10
+    '@storybook/addon-mcp':
+      specifier: 0.1.6
+      version: 0.1.6
     '@storybook/vue3':
-      specifier: ^10.1.9
-      version: 10.1.9
+      specifier: ^10.2.10
+      version: 10.2.10
     '@storybook/vue3-vite':
-      specifier: ^10.1.9
-      version: 10.1.9
+      specifier: ^10.2.10
+      version: 10.2.10
     '@tailwindcss/vite':
-      specifier: ^4.1.12
-      version: 4.1.12
-    '@trivago/prettier-plugin-sort-imports':
-      specifier: ^5.2.0
-      version: 5.2.2
+      specifier: ^4.2.0
+      version: 4.2.0
+    '@tiptap/core':
+      specifier: ^2.27.2
+      version: 2.27.2
+    '@tiptap/extension-link':
+      specifier: ^2.27.2
+      version: 2.27.2
+    '@tiptap/extension-table':
+      specifier: ^2.27.2
+      version: 2.27.2
+    '@tiptap/extension-table-cell':
+      specifier: ^2.27.2
+      version: 2.27.2
+    '@tiptap/extension-table-header':
+      specifier: ^2.27.2
+      version: 2.27.2
+    '@tiptap/extension-table-row':
+      specifier: ^2.27.2
+      version: 2.27.2
+    '@tiptap/pm':
+      specifier: 2.27.2
+      version: 2.27.2
+    '@tiptap/starter-kit':
+      specifier: ^2.27.2
+      version: 2.27.2
     '@types/fs-extra':
       specifier: ^11.0.4
       version: 11.0.4
@@ -124,11 +151,11 @@ catalogs:
       specifier: ^2.4.6
       version: 2.4.6
     '@vueuse/core':
-      specifier: ^11.0.0
-      version: 11.0.0
+      specifier: ^14.2.0
+      version: 14.2.0
     '@vueuse/integrations':
-      specifier: ^13.9.0
-      version: 13.9.0
+      specifier: ^14.2.0
+      version: 14.2.0
     '@webgpu/types':
       specifier: ^0.1.66
       version: 0.1.66
@@ -136,14 +163,17 @@ catalogs:
       specifier: ^5.21.0
       version: 5.21.0
     axios:
-      specifier: ^1.8.2
-      version: 1.13.2
+      specifier: ^1.13.5
+      version: 1.13.5
     cross-env:
       specifier: ^10.1.0
       version: 10.1.0
     cva:
       specifier: 1.0.0-beta.4
       version: 1.0.0-beta.4
+    dompurify:
+      specifier: ^3.3.1
+      version: 3.3.1
     dotenv:
       specifier: ^16.4.5
       version: 16.6.1
@@ -156,6 +186,9 @@ catalogs:
     eslint-import-resolver-typescript:
       specifier: ^4.4.4
       version: 4.4.4
+    eslint-plugin-better-tailwindcss:
+      specifier: ^4.3.1
+      version: 4.3.1
     eslint-plugin-import-x:
       specifier: ^4.16.1
       version: 4.16.1
@@ -163,8 +196,8 @@ catalogs:
       specifier: 1.25.0
       version: 1.25.0
     eslint-plugin-storybook:
-      specifier: ^10.1.9
-      version: 10.1.9
+      specifier: ^10.2.10
+      version: 10.2.10
     eslint-plugin-unused-imports:
       specifier: ^4.3.0
       version: 4.3.0
@@ -174,6 +207,9 @@ catalogs:
     firebase:
       specifier: ^11.6.0
       version: 11.6.0
+    glob:
+      specifier: ^13.0.6
+      version: 13.0.6
     globals:
       specifier: ^16.5.0
       version: 16.5.0
@@ -189,6 +225,12 @@ catalogs:
     jsdom:
       specifier: ^27.4.0
       version: 27.4.0
+    jsonata:
+      specifier: ^2.1.0
+      version: 2.1.0
+    jsondiffpatch:
+      specifier: ^0.7.3
+      version: 0.7.3
     knip:
       specifier: ^5.75.1
       version: 5.75.1
@@ -202,26 +244,29 @@ catalogs:
       specifier: ^2.71.0
       version: 2.71.0
     nx:
-      specifier: 22.2.6
-      version: 22.2.6
+      specifier: 22.5.2
+      version: 22.5.2
+    oxfmt:
+      specifier: ^0.34.0
+      version: 0.34.0
     oxlint:
-      specifier: ^1.33.0
-      version: 1.33.0
+      specifier: ^1.49.0
+      version: 1.49.0
     oxlint-tsgolint:
-      specifier: ^0.9.1
-      version: 0.9.1
+      specifier: ^0.14.2
+      version: 0.14.2
     picocolors:
       specifier: ^1.1.1
       version: 1.1.1
     pinia:
       specifier: ^3.0.4
-      version: 2.2.2
+      version: 3.0.4
     postcss-html:
       specifier: ^1.8.0
       version: 1.8.0
-    prettier:
-      specifier: ^3.7.4
-      version: 3.7.4
+    posthog-js:
+      specifier: ^1.358.1
+      version: 1.358.1
     pretty-bytes:
       specifier: ^7.1.0
       version: 7.1.0
@@ -238,14 +283,14 @@ catalogs:
       specifier: ^6.0.4
       version: 6.0.4
     storybook:
-      specifier: ^10.1.9
-      version: 10.1.9
+      specifier: ^10.2.10
+      version: 10.2.10
     stylelint:
       specifier: ^16.26.1
       version: 16.26.1
     tailwindcss:
-      specifier: ^4.1.12
-      version: 4.1.12
+      specifier: ^4.2.0
+      version: 4.2.0
     tailwindcss-primeui:
       specifier: ^0.6.1
       version: 0.6.1
@@ -273,9 +318,6 @@ catalogs:
     unplugin-vue-components:
       specifier: ^30.0.0
       version: 30.0.0
-    vite:
-      specifier: ^7.3.0
-      version: 7.3.0
     vite-plugin-dts:
       specifier: ^4.5.4
       version: 4.5.4
@@ -293,19 +335,19 @@ catalogs:
       version: 3.5.13
     vue-component-type-helpers:
       specifier: ^3.2.1
-      version: 3.2.1
+      version: 3.2.5
     vue-eslint-parser:
-      specifier: ^10.2.0
-      version: 10.2.0
+      specifier: ^10.4.0
+      version: 10.4.0
     vue-i18n:
-      specifier: ^9.14.3
-      version: 9.14.3
+      specifier: ^9.14.5
+      version: 9.14.5
     vue-router:
       specifier: ^4.4.3
       version: 4.4.3
     vue-tsc:
-      specifier: ^3.2.1
-      version: 3.2.1
+      specifier: ^3.2.5
+      version: 3.2.5
     vuefire:
       specifier: ^3.2.1
       version: 3.2.1
@@ -326,7 +368,7 @@ catalogs:
       version: 3.3.0
 
 overrides:
-  '@types/eslint': '-'
+  vite: 8.0.0-beta.13
 
 importers:
 
@@ -353,6 +395,9 @@ importers:
       '@comfyorg/tailwind-utils':
         specifier: workspace:*
         version: link:packages/tailwind-utils
+      '@formkit/auto-animate':
+        specifier: 'catalog:'
+        version: 0.9.0
       '@iconify/json':
         specifier: 'catalog:'
         version: 2.2.380
@@ -379,37 +424,40 @@ importers:
         version: 4.2.5
       '@sentry/vue':
         specifier: 'catalog:'
-        version: 10.32.1(pinia@2.2.2(typescript@5.9.3)(vue@3.5.13(typescript@5.9.3)))(vue@3.5.13(typescript@5.9.3))
+        version: 10.32.1(pinia@3.0.4(typescript@5.9.3)(vue@3.5.13(typescript@5.9.3)))(vue@3.5.13(typescript@5.9.3))
       '@sparkjsdev/spark':
         specifier: 'catalog:'
         version: 0.1.10
       '@tiptap/core':
-        specifier: ^2.10.4
-        version: 2.10.4(@tiptap/pm@2.10.4)
+        specifier: 'catalog:'
+        version: 2.27.2(@tiptap/pm@2.27.2)
       '@tiptap/extension-link':
-        specifier: ^2.10.4
-        version: 2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))(@tiptap/pm@2.10.4)
+        specifier: 'catalog:'
+        version: 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2)
       '@tiptap/extension-table':
-        specifier: ^2.10.4
-        version: 2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))(@tiptap/pm@2.10.4)
+        specifier: 'catalog:'
+        version: 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2)
       '@tiptap/extension-table-cell':
-        specifier: ^2.10.4
-        version: 2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))
+        specifier: 'catalog:'
+        version: 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))
       '@tiptap/extension-table-header':
-        specifier: ^2.10.4
-        version: 2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))
+        specifier: 'catalog:'
+        version: 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))
       '@tiptap/extension-table-row':
-        specifier: ^2.10.4
-        version: 2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))
+        specifier: 'catalog:'
+        version: 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))
+      '@tiptap/pm':
+        specifier: 'catalog:'
+        version: 2.27.2
       '@tiptap/starter-kit':
-        specifier: ^2.10.4
-        version: 2.10.4
+        specifier: 'catalog:'
+        version: 2.27.2
       '@vueuse/core':
         specifier: 'catalog:'
-        version: 11.0.0(vue@3.5.13(typescript@5.9.3))
+        version: 14.2.0(vue@3.5.13(typescript@5.9.3))
       '@vueuse/integrations':
         specifier: 'catalog:'
-        version: 13.9.0(axios@1.13.2)(fuse.js@7.0.0)(vue@3.5.13(typescript@5.9.3))
+        version: 14.2.0(axios@1.13.5)(fuse.js@7.0.0)(vue@3.5.13(typescript@5.9.3))
       '@xterm/addon-fit':
         specifier: ^0.10.0
         version: 0.10.0(@xterm/xterm@5.5.0)
@@ -424,7 +472,7 @@ importers:
         version: 5.21.0
       axios:
         specifier: 'catalog:'
-        version: 1.13.2
+        version: 1.13.5
       chart.js:
         specifier: ^4.5.0
         version: 4.5.0
@@ -433,7 +481,7 @@ importers:
         version: 1.0.0-beta.4(typescript@5.9.3)
       dompurify:
         specifier: ^3.2.5
-        version: 3.2.5
+        version: 3.3.1
       dotenv:
         specifier: 'catalog:'
         version: 16.6.1
@@ -453,11 +501,14 @@ importers:
         specifier: ^7.0.0
         version: 7.0.0
       glob:
-        specifier: ^11.0.3
-        version: 11.0.3
+        specifier: 'catalog:'
+        version: 13.0.6
+      jsonata:
+        specifier: 'catalog:'
+        version: 2.1.0
       jsondiffpatch:
-        specifier: ^0.6.0
-        version: 0.6.0
+        specifier: 'catalog:'
+        version: 0.7.3
       loglevel:
         specifier: ^1.9.2
         version: 1.9.2
@@ -466,7 +517,10 @@ importers:
         version: 15.0.11
       pinia:
         specifier: 'catalog:'
-        version: 2.2.2(typescript@5.9.3)(vue@3.5.13(typescript@5.9.3))
+        version: 3.0.4(typescript@5.9.3)(vue@3.5.13(typescript@5.9.3))
+      posthog-js:
+        specifier: 'catalog:'
+        version: 1.358.1
       primeicons:
         specifier: 'catalog:'
         version: 7.0.0
@@ -478,13 +532,13 @@ importers:
         version: 2.5.0(typescript@5.9.3)(vue@3.5.13(typescript@5.9.3))
       semver:
         specifier: ^7.7.2
-        version: 7.7.3
+        version: 7.7.4
       three:
         specifier: ^0.170.0
         version: 0.170.0
       tiptap-markdown:
         specifier: ^0.8.10
-        version: 0.8.10(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))
+        version: 0.8.10(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))
       typegpu:
         specifier: 'catalog:'
         version: 0.8.2
@@ -493,7 +547,7 @@ importers:
         version: 3.5.13(typescript@5.9.3)
       vue-i18n:
         specifier: 'catalog:'
-        version: 9.14.3(vue@3.5.13(typescript@5.9.3))
+        version: 9.14.5(vue@3.5.13(typescript@5.9.3))
       vue-router:
         specifier: 'catalog:'
         version: 4.4.3(vue@3.5.13(typescript@5.9.3))
@@ -518,49 +572,46 @@ importers:
         version: 9.39.1
       '@intlify/eslint-plugin-vue-i18n':
         specifier: 'catalog:'
-        version: 4.1.0(eslint@9.39.1(jiti@2.6.1))(jsonc-eslint-parser@2.4.0)(vue-eslint-parser@10.2.0(eslint@9.39.1(jiti@2.6.1)))(yaml-eslint-parser@1.3.0)
+        version: 4.1.1(eslint@9.39.1(jiti@2.6.1))(jsonc-eslint-parser@2.4.0)(vue-eslint-parser@10.4.0(eslint@9.39.1(jiti@2.6.1)))(yaml-eslint-parser@1.3.0)
       '@lobehub/i18n-cli':
         specifier: 'catalog:'
-        version: 1.25.1(@types/react@19.1.9)(typescript@5.9.3)(use-sync-external-store@1.6.0(react@19.2.3))(ws@8.18.3)(zod@3.24.1)
+        version: 1.26.1(@types/react@19.1.9)(typescript@5.9.3)(use-sync-external-store@1.6.0(react@19.2.4))(ws@8.19.0)(zod@3.24.1)
       '@nx/eslint':
         specifier: 'catalog:'
-        version: 22.2.6(@babel/traverse@7.28.5)(@zkochan/js-yaml@0.0.7)(eslint@9.39.1(jiti@2.6.1))(nx@22.2.6)
+        version: 22.5.2(@babel/traverse@7.29.0)(@zkochan/js-yaml@0.0.7)(eslint@9.39.1(jiti@2.6.1))(nx@22.5.2)
       '@nx/playwright':
         specifier: 'catalog:'
-        version: 22.2.6(@babel/traverse@7.28.5)(@playwright/test@1.57.0)(@zkochan/js-yaml@0.0.7)(eslint@9.39.1(jiti@2.6.1))(nx@22.2.6)
+        version: 22.5.2(@babel/traverse@7.29.0)(@playwright/test@1.58.1)(@zkochan/js-yaml@0.0.7)(eslint@9.39.1(jiti@2.6.1))(nx@22.5.2)
       '@nx/storybook':
         specifier: 'catalog:'
-        version: 22.2.4(@babel/traverse@7.28.5)(@zkochan/js-yaml@0.0.7)(eslint@9.39.1(jiti@2.6.1))(nx@22.2.6)(storybook@10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(typescript@5.9.3)
+        version: 22.5.2(@babel/traverse@7.29.0)(@zkochan/js-yaml@0.0.7)(eslint@9.39.1(jiti@2.6.1))(nx@22.5.2)(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))(typescript@5.9.3)
       '@nx/vite':
         specifier: 'catalog:'
-        version: 22.2.6(@babel/traverse@7.28.5)(nx@22.2.6)(typescript@5.9.3)(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))(vitest@4.0.16)
+        version: 22.5.2(@babel/traverse@7.29.0)(nx@22.5.2)(typescript@5.9.3)(vite@8.0.0-beta.13(@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))(vitest@4.0.16)
       '@pinia/testing':
         specifier: 'catalog:'
-        version: 1.0.3(pinia@2.2.2(typescript@5.9.3)(vue@3.5.13(typescript@5.9.3)))
+        version: 1.0.3(pinia@3.0.4(typescript@5.9.3)(vue@3.5.13(typescript@5.9.3)))
       '@playwright/test':
         specifier: 'catalog:'
-        version: 1.57.0
-      '@prettier/plugin-oxc':
-        specifier: 'catalog:'
-        version: 0.1.3
+        version: 1.58.1
       '@sentry/vite-plugin':
         specifier: 'catalog:'
         version: 4.6.0
       '@storybook/addon-docs':
         specifier: 'catalog:'
-        version: 10.1.9(@types/react@19.1.9)(esbuild@0.27.1)(rollup@4.53.5)(storybook@10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
+        version: 10.2.10(@types/react@19.1.9)(esbuild@0.27.3)(rollup@4.53.5)(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))(vite@8.0.0-beta.13(@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))
+      '@storybook/addon-mcp':
+        specifier: 'catalog:'
+        version: 0.1.6(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))(typescript@5.9.3)
       '@storybook/vue3':
         specifier: 'catalog:'
-        version: 10.1.9(storybook@10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(vue@3.5.13(typescript@5.9.3))
+        version: 10.2.10(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))(vue@3.5.13(typescript@5.9.3))
       '@storybook/vue3-vite':
         specifier: 'catalog:'
-        version: 10.1.9(esbuild@0.27.1)(rollup@4.53.5)(storybook@10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))(vue@3.5.13(typescript@5.9.3))
+        version: 10.2.10(esbuild@0.27.3)(rollup@4.53.5)(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))(vite@8.0.0-beta.13(@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))
       '@tailwindcss/vite':
         specifier: 'catalog:'
-        version: 4.1.12(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
-      '@trivago/prettier-plugin-sort-imports':
-        specifier: 'catalog:'
-        version: 5.2.2(@vue/compiler-sfc@3.5.25)(prettier@3.7.4)
+        version: 4.2.0(vite@8.0.0-beta.13(@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))
       '@types/fs-extra':
         specifier: 'catalog:'
         version: 11.0.4
@@ -578,7 +629,7 @@ importers:
         version: 0.169.0
       '@vitejs/plugin-vue':
         specifier: 'catalog:'
-        version: 6.0.3(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))(vue@3.5.13(typescript@5.9.3))
+        version: 6.0.3(vite@8.0.0-beta.13(@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))
       '@vitest/coverage-v8':
         specifier: 'catalog:'
         version: 4.0.16(vitest@4.0.16)
@@ -602,22 +653,25 @@ importers:
         version: 10.1.8(eslint@9.39.1(jiti@2.6.1))
       eslint-import-resolver-typescript:
         specifier: 'catalog:'
-        version: 4.4.4(eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.50.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.1(jiti@2.6.1)))(eslint-plugin-import@2.32.0)(eslint@9.39.1(jiti@2.6.1))
+        version: 4.4.4(eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.56.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.1(jiti@2.6.1)))(eslint-plugin-import@2.32.0)(eslint@9.39.1(jiti@2.6.1))
+      eslint-plugin-better-tailwindcss:
+        specifier: 'catalog:'
+        version: 4.3.1(eslint@9.39.1(jiti@2.6.1))(oxlint@1.49.0(oxlint-tsgolint@0.14.2))(tailwindcss@4.2.0)(typescript@5.9.3)
       eslint-plugin-import-x:
         specifier: 'catalog:'
-        version: 4.16.1(@typescript-eslint/utils@8.50.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.1(jiti@2.6.1))
+        version: 4.16.1(@typescript-eslint/utils@8.56.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.1(jiti@2.6.1))
       eslint-plugin-oxlint:
         specifier: 'catalog:'
         version: 1.25.0
       eslint-plugin-storybook:
         specifier: 'catalog:'
-        version: 10.1.9(eslint@9.39.1(jiti@2.6.1))(storybook@10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(typescript@5.9.3)
+        version: 10.2.10(eslint@9.39.1(jiti@2.6.1))(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))(typescript@5.9.3)
       eslint-plugin-unused-imports:
         specifier: 'catalog:'
         version: 4.3.0(@typescript-eslint/eslint-plugin@8.49.0(@typescript-eslint/parser@8.49.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))
       eslint-plugin-vue:
         specifier: 'catalog:'
-        version: 10.6.2(@typescript-eslint/parser@8.49.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(vue-eslint-parser@10.2.0(eslint@9.39.1(jiti@2.6.1)))
+        version: 10.6.2(@typescript-eslint/parser@8.49.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(vue-eslint-parser@10.4.0(eslint@9.39.1(jiti@2.6.1)))
       fs-extra:
         specifier: ^11.2.0
         version: 11.3.2
@@ -650,40 +704,40 @@ importers:
         version: 2.71.0
       nx:
         specifier: 'catalog:'
-        version: 22.2.6
+        version: 22.5.2
+      oxfmt:
+        specifier: 'catalog:'
+        version: 0.34.0
       oxlint:
         specifier: 'catalog:'
-        version: 1.33.0(oxlint-tsgolint@0.9.1)
+        version: 1.49.0(oxlint-tsgolint@0.14.2)
       oxlint-tsgolint:
         specifier: 'catalog:'
-        version: 0.9.1
+        version: 0.14.2
       picocolors:
         specifier: 'catalog:'
         version: 1.1.1
       postcss-html:
         specifier: 'catalog:'
         version: 1.8.0
-      prettier:
-        specifier: 'catalog:'
-        version: 3.7.4
       pretty-bytes:
         specifier: 'catalog:'
         version: 7.1.0
       rollup-plugin-visualizer:
         specifier: 'catalog:'
-        version: 6.0.4(rollup@4.53.5)
+        version: 6.0.4(rolldown@1.0.0-rc.3)(rollup@4.53.5)
       storybook:
         specifier: 'catalog:'
-        version: 10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+        version: 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)
       stylelint:
         specifier: 'catalog:'
         version: 16.26.1(typescript@5.9.3)
       tailwindcss:
         specifier: 'catalog:'
-        version: 4.1.12
+        version: 4.2.0
       tailwindcss-primeui:
         specifier: 'catalog:'
-        version: 0.6.1(tailwindcss@4.1.12)
+        version: 0.6.1(tailwindcss@4.2.0)
       tsx:
         specifier: 'catalog:'
         version: 4.19.4
@@ -698,40 +752,40 @@ importers:
         version: 8.49.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
       unplugin-icons:
         specifier: 'catalog:'
-        version: 22.5.0(@vue/compiler-sfc@3.5.25)
+        version: 22.5.0(@vue/compiler-sfc@3.5.28)
       unplugin-typegpu:
         specifier: 'catalog:'
         version: 0.8.0(typegpu@0.8.2)
       unplugin-vue-components:
         specifier: 'catalog:'
-        version: 30.0.0(@babel/parser@7.28.5)(vue@3.5.13(typescript@5.9.3))
+        version: 30.0.0(@babel/parser@7.29.0)(vue@3.5.13(typescript@5.9.3))
       uuid:
         specifier: ^11.1.0
         version: 11.1.0
       vite:
-        specifier: 'catalog:'
-        version: 7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+        specifier: 8.0.0-beta.13
+        version: 8.0.0-beta.13(@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)
       vite-plugin-dts:
         specifier: 'catalog:'
-        version: 4.5.4(@types/node@24.10.4)(rollup@4.53.5)(typescript@5.9.3)(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
+        version: 4.5.4(@types/node@24.10.4)(rollup@4.53.5)(typescript@5.9.3)(vite@8.0.0-beta.13(@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))
       vite-plugin-html:
         specifier: 'catalog:'
-        version: 3.2.2(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
+        version: 3.2.2(vite@8.0.0-beta.13(@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))
       vite-plugin-vue-devtools:
         specifier: 'catalog:'
-        version: 8.0.5(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))(vue@3.5.13(typescript@5.9.3))
+        version: 8.0.5(vite@8.0.0-beta.13(@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))
       vitest:
         specifier: 'catalog:'
-        version: 4.0.16(@types/node@24.10.4)(@vitest/ui@4.0.16)(happy-dom@20.0.11)(jiti@2.6.1)(jsdom@27.4.0)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+        version: 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)
       vue-component-type-helpers:
         specifier: 'catalog:'
-        version: 3.2.1
+        version: 3.2.5
       vue-eslint-parser:
         specifier: 'catalog:'
-        version: 10.2.0(eslint@9.39.1(jiti@2.6.1))
+        version: 10.4.0(eslint@9.39.1(jiti@2.6.1))
       vue-tsc:
         specifier: 'catalog:'
-        version: 3.2.1(typescript@5.9.3)
+        version: 3.2.5(typescript@5.9.3)
       zip-dir:
         specifier: ^2.0.0
         version: 2.0.0
@@ -755,10 +809,10 @@ importers:
         version: 4.2.5
       '@vueuse/core':
         specifier: 'catalog:'
-        version: 11.0.0(vue@3.5.13(typescript@5.9.3))
+        version: 14.2.0(vue@3.5.13(typescript@5.9.3))
       pinia:
         specifier: 'catalog:'
-        version: 2.2.2(typescript@5.9.3)(vue@3.5.13(typescript@5.9.3))
+        version: 3.0.4(typescript@5.9.3)(vue@3.5.13(typescript@5.9.3))
       primeicons:
         specifier: 'catalog:'
         version: 7.0.0
@@ -770,51 +824,54 @@ importers:
         version: 3.5.13(typescript@5.9.3)
       vue-i18n:
         specifier: 'catalog:'
-        version: 9.14.3(vue@3.5.13(typescript@5.9.3))
+        version: 9.14.5(vue@3.5.13(typescript@5.9.3))
       vue-router:
         specifier: 'catalog:'
         version: 4.4.3(vue@3.5.13(typescript@5.9.3))
     devDependencies:
       '@tailwindcss/vite':
         specifier: 'catalog:'
-        version: 4.1.12(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
+        version: 4.2.0(vite@8.0.0-beta.13(@types/node@25.0.3)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
       '@vitejs/plugin-vue':
         specifier: 'catalog:'
-        version: 6.0.3(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))(vue@3.5.13(typescript@5.9.3))
+        version: 6.0.3(vite@8.0.0-beta.13(@types/node@25.0.3)(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))
       dotenv:
         specifier: 'catalog:'
         version: 16.6.1
       unplugin-icons:
         specifier: 'catalog:'
-        version: 22.5.0(@vue/compiler-sfc@3.5.25)
+        version: 22.5.0(@vue/compiler-sfc@3.5.28)
       unplugin-vue-components:
         specifier: 'catalog:'
-        version: 30.0.0(@babel/parser@7.28.5)(vue@3.5.13(typescript@5.9.3))
+        version: 30.0.0(@babel/parser@7.29.0)(vue@3.5.13(typescript@5.9.3))
       vite:
-        specifier: 'catalog:'
-        version: 7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+        specifier: 8.0.0-beta.13
+        version: 8.0.0-beta.13(@types/node@25.0.3)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
       vite-plugin-html:
         specifier: 'catalog:'
-        version: 3.2.2(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
+        version: 3.2.2(vite@8.0.0-beta.13(@types/node@25.0.3)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
       vite-plugin-vue-devtools:
         specifier: 'catalog:'
-        version: 8.0.5(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))(vue@3.5.13(typescript@5.9.3))
+        version: 8.0.5(vite@8.0.0-beta.13(@types/node@25.0.3)(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))
       vue-tsc:
         specifier: 'catalog:'
-        version: 3.2.1(typescript@5.9.3)
+        version: 3.2.5(typescript@5.9.3)
 
   packages/design-system:
     dependencies:
       '@iconify-json/lucide':
         specifier: 'catalog:'
         version: 1.2.79
-      '@iconify/tailwind':
+      '@iconify/tailwind4':
         specifier: 'catalog:'
-        version: 1.2.0
+        version: 1.2.1(tailwindcss@4.2.0)
+      '@iconify/utils':
+        specifier: 'catalog:'
+        version: 3.1.0
     devDependencies:
       tailwindcss:
         specifier: 'catalog:'
-        version: 4.1.12
+        version: 4.2.0
       typescript:
         specifier: 'catalog:'
         version: 5.9.3
@@ -825,7 +882,10 @@ importers:
     dependencies:
       axios:
         specifier: 'catalog:'
-        version: 1.13.2
+        version: 1.13.5
+      dompurify:
+        specifier: 'catalog:'
+        version: 3.3.1
     devDependencies:
       typescript:
         specifier: 'catalog:'
@@ -852,8 +912,8 @@ packages:
   '@adobe/css-tools@4.4.4':
     resolution: {integrity: sha512-Elp+iwUx5rN5+Y8xLt5/GRoG20WGoDCQ/1Fb+1LiGtvwbDavuSk0jhD/eZdckHAuzcDzccnkv+rEjyWfRx18gg==}
 
-  '@alcalzone/ansi-tokenize@0.2.0':
-    resolution: {integrity: sha512-qI/5TaaaCZE4yeSZ83lu0+xi1r88JSxUjnH4OP/iZF7+KKZ75u3ee5isd0LxX+6N8U0npL61YrpbthILHB6BnA==}
+  '@alcalzone/ansi-tokenize@0.2.5':
+    resolution: {integrity: sha512-3NX/MpTdroi0aKz134A6RC2Gb2iXVECN4QaAXnvCIxxIm3C3AVB1mkUe8NaaiyvOpDfsrqWhYtj+Q6a62RrTsw==}
     engines: {node: '>=18'}
 
   '@algolia/client-abtesting@5.21.0':
@@ -927,44 +987,44 @@ packages:
   '@atlaskit/pragmatic-drag-and-drop@1.3.1':
     resolution: {integrity: sha512-MptcLppK78B2eplL5fHk93kfCbZ6uCpt33YauBPrOwI5zcHYJhZGeaGEaAXoVAHnSJOdQUhy6kGVVC9qggz2Fg==}
 
-  '@babel/code-frame@7.27.1':
-    resolution: {integrity: sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==}
+  '@babel/code-frame@7.29.0':
+    resolution: {integrity: sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/compat-data@7.28.5':
-    resolution: {integrity: sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA==}
+  '@babel/compat-data@7.29.0':
+    resolution: {integrity: sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/core@7.28.5':
-    resolution: {integrity: sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==}
+  '@babel/core@7.29.0':
+    resolution: {integrity: sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/generator@7.28.5':
-    resolution: {integrity: sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==}
+  '@babel/generator@7.29.1':
+    resolution: {integrity: sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==}
     engines: {node: '>=6.9.0'}
 
   '@babel/helper-annotate-as-pure@7.27.3':
     resolution: {integrity: sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-compilation-targets@7.27.2':
-    resolution: {integrity: sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==}
+  '@babel/helper-compilation-targets@7.28.6':
+    resolution: {integrity: sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-create-class-features-plugin@7.28.5':
-    resolution: {integrity: sha512-q3WC4JfdODypvxArsJQROfupPBq9+lMwjKq7C33GhbFYJsufD0yd/ziwD+hJucLeWsnFPWZjsU2DNFqBPE7jwQ==}
+  '@babel/helper-create-class-features-plugin@7.28.6':
+    resolution: {integrity: sha512-dTOdvsjnG3xNT9Y0AUg1wAl38y+4Rl4sf9caSQZOXdNqVn+H+HbbJ4IyyHaIqNR6SW9oJpA/RuRjsjCw2IdIow==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/helper-create-regexp-features-plugin@7.27.1':
-    resolution: {integrity: sha512-uVDC72XVf8UbrH5qQTc18Agb8emwjTiZrQE11Nv3CuBEZmVvTwwE9CBUEvHku06gQCAyYf8Nv6ja1IN+6LMbxQ==}
+  '@babel/helper-create-regexp-features-plugin@7.28.5':
+    resolution: {integrity: sha512-N1EhvLtHzOvj7QQOUCCS3NrPJP8c5W6ZXCHDn7Yialuy1iu4r5EmIYkXlKNqT99Ciw+W0mDqWoR6HWMZlFP3hw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/helper-define-polyfill-provider@0.6.5':
-    resolution: {integrity: sha512-uJnGFcPsWQK8fvjgGP5LZUZZsYGIoPeRjSF5PGwrelYgq7Q15/Ft9NGFp1zglwgIv//W0uG4BevRuSJRyylZPg==}
+  '@babel/helper-define-polyfill-provider@0.6.6':
+    resolution: {integrity: sha512-mOAsxeeKkUKayvZR3HeTYD/fICpCPLJrU5ZjelT/PA6WHtNDBOE436YiaEUvHN454bRM3CebhDsIpieCc4texA==}
     peerDependencies:
       '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
 
@@ -976,12 +1036,12 @@ packages:
     resolution: {integrity: sha512-cwM7SBRZcPCLgl8a7cY0soT1SptSzAlMH39vwiRpOQkJlh53r5hdHwLSCZpQdVLT39sZt+CRpNwYG4Y2v77atg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-module-imports@7.27.1':
-    resolution: {integrity: sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==}
+  '@babel/helper-module-imports@7.28.6':
+    resolution: {integrity: sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-module-transforms@7.28.3':
-    resolution: {integrity: sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==}
+  '@babel/helper-module-transforms@7.28.6':
+    resolution: {integrity: sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
@@ -990,8 +1050,8 @@ packages:
     resolution: {integrity: sha512-URMGH08NzYFhubNSGJrpUEphGKQwMQYBySzat5cAByY1/YgIRkULnIy3tAMeszlL/so2HbeilYloUmSpd7GdVw==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-plugin-utils@7.27.1':
-    resolution: {integrity: sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==}
+  '@babel/helper-plugin-utils@7.28.6':
+    resolution: {integrity: sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==}
     engines: {node: '>=6.9.0'}
 
   '@babel/helper-remap-async-to-generator@7.27.1':
@@ -1000,8 +1060,8 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/helper-replace-supers@7.27.1':
-    resolution: {integrity: sha512-7EHz6qDZc8RYS5ElPoShMheWvEgERonFCs7IAonWLLUTXW59DP14bCZt89/GKyreYn8g3S83m21FelHKbeDCKA==}
+  '@babel/helper-replace-supers@7.28.6':
+    resolution: {integrity: sha512-mq8e+laIk94/yFec3DxSjCRD2Z0TAjhVbEJY3UQrlwVo15Lmt7C2wAUbK4bjnTs4APkwsYLTahXRraQXhb1WCg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
@@ -1022,16 +1082,16 @@ packages:
     resolution: {integrity: sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-wrap-function@7.28.3':
-    resolution: {integrity: sha512-zdf983tNfLZFletc0RRXYrHrucBEg95NIFMkn6K9dbeMYnsgHaSBGcQqdsCSStG2PYwRre0Qc2NNSCXbG+xc6g==}
+  '@babel/helper-wrap-function@7.28.6':
+    resolution: {integrity: sha512-z+PwLziMNBeSQJonizz2AGnndLsP2DeGHIxDAn+wdHOGuo4Fo1x1HBPPXeE9TAOPHNNWQKCSlA2VZyYyyibDnQ==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helpers@7.28.4':
-    resolution: {integrity: sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==}
+  '@babel/helpers@7.28.6':
+    resolution: {integrity: sha512-xOBvwq86HHdB7WUDTfKfT/Vuxh7gElQ+Sfti2Cy6yIWNW05P8iUslOVcZ4/sKbE+/jQaukQAdz/gf3724kYdqw==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/parser@7.28.5':
-    resolution: {integrity: sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==}
+  '@babel/parser@7.29.0':
+    resolution: {integrity: sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==}
     engines: {node: '>=6.0.0'}
     hasBin: true
 
@@ -1059,14 +1119,14 @@ packages:
     peerDependencies:
       '@babel/core': ^7.13.0
 
-  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.28.3':
-    resolution: {integrity: sha512-b6YTX108evsvE4YgWyQ921ZAFFQm3Bn+CA3+ZXlNVnPhx+UfsVURoPjfGAPCjBgrqo30yX/C2nZGX96DxvR9Iw==}
+  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.28.6':
+    resolution: {integrity: sha512-a0aBScVTlNaiUe35UtfxAN7A/tehvvG4/ByO6+46VPKTRSlfnAFsgKy0FUh+qAkQrDTmhDkT+IBOKlOoMUxQ0g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/plugin-proposal-decorators@7.28.0':
-    resolution: {integrity: sha512-zOiZqvANjWDUaUS9xMxbMcK/Zccztbe/6ikvUXaG9nsPH3w6qh5UaPGAnirI/WhIbZ8m3OHU0ReyPrknG+ZKeg==}
+  '@babel/plugin-proposal-decorators@7.29.0':
+    resolution: {integrity: sha512-CVBVv3VY/XRMxRYq5dwr2DS7/MvqPm23cOCjbwNnVrfOqcWlnefua1uUs0sjdKOGjvPUG633o07uWzJq4oI6dA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1077,20 +1137,20 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-syntax-decorators@7.27.1':
-    resolution: {integrity: sha512-YMq8Z87Lhl8EGkmb0MwYkt36QnxC+fzCgrl66ereamPlYToRpIk5nUjKUY3QKLWq8mwUB1BgbeXcTJhZOCDg5A==}
+  '@babel/plugin-syntax-decorators@7.28.6':
+    resolution: {integrity: sha512-71EYI0ONURHJBL4rSFXnITXqXrrY8q4P0q006DPfN+Rk+ASM+++IBXem/ruokgBZR8YNEWZ8R6B+rCb8VcUTqA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-syntax-import-assertions@7.27.1':
-    resolution: {integrity: sha512-UT/Jrhw57xg4ILHLFnzFpPDlMbcdEicaAtjPQpbj9wa8T4r5KVWCimHcL/460g8Ht0DMxDyjsLgiWSkVjnwPFg==}
+  '@babel/plugin-syntax-import-assertions@7.28.6':
+    resolution: {integrity: sha512-pSJUpFHdx9z5nqTSirOCMtYVP2wFgoWhP0p3g8ONK/4IHhLIBd0B9NYqAvIUAhq+OkhO4VM1tENCt0cjlsNShw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-syntax-import-attributes@7.27.1':
-    resolution: {integrity: sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==}
+  '@babel/plugin-syntax-import-attributes@7.28.6':
+    resolution: {integrity: sha512-jiLC0ma9XkQT3TKJ9uYvlakm66Pamywo+qwL+oL8HJOvc6TWdZXVfhqJr8CCzbSGUAbDOzlGHJC1U+vRfLQDvw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1100,14 +1160,14 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-syntax-jsx@7.27.1':
-    resolution: {integrity: sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==}
+  '@babel/plugin-syntax-jsx@7.28.6':
+    resolution: {integrity: sha512-wgEmr06G6sIpqr8YDwA2dSRTE3bJ+V0IfpzfSY3Lfgd7YWOaAdlykvJi13ZKBt8cZHfgH1IXN+CL656W3uUa4w==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-syntax-typescript@7.27.1':
-    resolution: {integrity: sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==}
+  '@babel/plugin-syntax-typescript@7.28.6':
+    resolution: {integrity: sha512-+nDNmQye7nlnuuHDboPbGm00Vqg3oO8niRRL27/4LYHUsHYh0zJ1xWOz0uRwNFmM1Avzk8wZbc6rdiYhomzv/A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1124,14 +1184,14 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-async-generator-functions@7.28.0':
-    resolution: {integrity: sha512-BEOdvX4+M765icNPZeidyADIvQ1m1gmunXufXxvRESy/jNNyfovIqUyE7MVgGBjWktCoJlzvFA1To2O4ymIO3Q==}
+  '@babel/plugin-transform-async-generator-functions@7.29.0':
+    resolution: {integrity: sha512-va0VdWro4zlBr2JsXC+ofCPB2iG12wPtVGTWFx2WLDOM3nYQZZIGP82qku2eW/JR83sD+k2k+CsNtyEbUqhU6w==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-async-to-generator@7.27.1':
-    resolution: {integrity: sha512-NREkZsZVJS4xmTr8qzE5y8AfIPqsdQfRuUiLRTEzb7Qii8iFWCyDKaUV2c0rCuh4ljDZ98ALHP/PetiBV2nddA==}
+  '@babel/plugin-transform-async-to-generator@7.28.6':
+    resolution: {integrity: sha512-ilTRcmbuXjsMmcZ3HASTe4caH5Tpo93PkTxF9oG2VZsSWsahydmcEHhix9Ik122RcTnZnUzPbmux4wh1swfv7g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1142,32 +1202,32 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-block-scoping@7.28.5':
-    resolution: {integrity: sha512-45DmULpySVvmq9Pj3X9B+62Xe+DJGov27QravQJU1LLcapR6/10i+gYVAucGGJpHBp5mYxIMK4nDAT/QDLr47g==}
+  '@babel/plugin-transform-block-scoping@7.28.6':
+    resolution: {integrity: sha512-tt/7wOtBmwHPNMPu7ax4pdPz6shjFrmHDghvNC+FG9Qvj7D6mJcoRQIF5dy4njmxR941l6rgtvfSB2zX3VlUIw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-class-properties@7.27.1':
-    resolution: {integrity: sha512-D0VcalChDMtuRvJIu3U/fwWjf8ZMykz5iZsg77Nuj821vCKI3zCyRLwRdWbsuJ/uRwZhZ002QtCqIkwC/ZkvbA==}
+  '@babel/plugin-transform-class-properties@7.28.6':
+    resolution: {integrity: sha512-dY2wS3I2G7D697VHndN91TJr8/AAfXQNt5ynCTI/MpxMsSzHp+52uNivYT5wCPax3whc47DR8Ba7cmlQMg24bw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-class-static-block@7.28.3':
-    resolution: {integrity: sha512-LtPXlBbRoc4Njl/oh1CeD/3jC+atytbnf/UqLoqTDcEYGUPj022+rvfkbDYieUrSj3CaV4yHDByPE+T2HwfsJg==}
+  '@babel/plugin-transform-class-static-block@7.28.6':
+    resolution: {integrity: sha512-rfQ++ghVwTWTqQ7w8qyDxL1XGihjBss4CmTgGRCTAC9RIbhVpyp4fOeZtta0Lbf+dTNIVJer6ych2ibHwkZqsQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.12.0
 
-  '@babel/plugin-transform-classes@7.28.4':
-    resolution: {integrity: sha512-cFOlhIYPBv/iBoc+KS3M6et2XPtbT2HiCRfBXWtfpc9OAyostldxIf9YAYB6ypURBBbx+Qv6nyrLzASfJe+hBA==}
+  '@babel/plugin-transform-classes@7.28.6':
+    resolution: {integrity: sha512-EF5KONAqC5zAqT783iMGuM2ZtmEBy+mJMOKl2BCvPZ2lVrwvXnB6o+OBWCS+CoeCCpVRF2sA2RBKUxvT8tQT5Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-computed-properties@7.27.1':
-    resolution: {integrity: sha512-lj9PGWvMTVksbWiDT2tW68zGS/cyo4AkZ/QTp0sQT0mjPopCmrSkzxeXkznjqBxzDI6TclZhOJbBmbBLjuOZUw==}
+  '@babel/plugin-transform-computed-properties@7.28.6':
+    resolution: {integrity: sha512-bcc3k0ijhHbc2lEfpFHgx7eYw9KNXqOerKWfzbxEHUGKnS3sz9C4CNL9OiFN1297bDNfUiSO7DaLzbvHQQQ1BQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1178,8 +1238,8 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-dotall-regex@7.27.1':
-    resolution: {integrity: sha512-gEbkDVGRvjj7+T1ivxrfgygpT7GUd4vmODtYpbs0gZATdkX8/iSnOtZSxiZnsgm1YjTgjI6VKBGSJJevkrclzw==}
+  '@babel/plugin-transform-dotall-regex@7.28.6':
+    resolution: {integrity: sha512-SljjowuNKB7q5Oayv4FoPzeB74g3QgLt8IVJw9ADvWy3QnUb/01aw8I4AVv8wYnPvQz2GDDZ/g3GhcNyDBI4Bg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1190,8 +1250,8 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.27.1':
-    resolution: {integrity: sha512-hkGcueTEzuhB30B3eJCbCYeCaaEQOmQR0AdvzpD4LoN0GXMWzzGSuRrxR2xTnCrvNbVwK9N6/jQ92GSLfiZWoQ==}
+  '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.29.0':
+    resolution: {integrity: sha512-zBPcW2lFGxdiD8PUnPwJjag2J9otbcLQzvbiOzDxpYXyCuYX9agOwMPGn1prVH0a4qzhCKu24rlH4c1f7yA8rw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
@@ -1202,14 +1262,14 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-explicit-resource-management@7.28.0':
-    resolution: {integrity: sha512-K8nhUcn3f6iB+P3gwCv/no7OdzOZQcKchW6N389V6PD8NUWKZHzndOd9sPDVbMoBsbmjMqlB4L9fm+fEFNVlwQ==}
+  '@babel/plugin-transform-explicit-resource-management@7.28.6':
+    resolution: {integrity: sha512-Iao5Konzx2b6g7EPqTy40UZbcdXE126tTxVFr/nAIj+WItNxjKSYTEw3RC+A2/ZetmdJsgueL1KhaMCQHkLPIg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-exponentiation-operator@7.28.5':
-    resolution: {integrity: sha512-D4WIMaFtwa2NizOp+dnoFjRez/ClKiC2BqqImwKd1X28nqBtZEyCYJ2ozQrrzlxAFrcrjxo39S6khe9RNDlGzw==}
+  '@babel/plugin-transform-exponentiation-operator@7.28.6':
+    resolution: {integrity: sha512-WitabqiGjV/vJ0aPOLSFfNY1u9U3R7W36B03r5I2KoNix+a3sOhJ3pKFB3R5It9/UiK78NiO0KE9P21cMhlPkw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1232,8 +1292,8 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-json-strings@7.27.1':
-    resolution: {integrity: sha512-6WVLVJiTjqcQauBhn1LkICsR2H+zm62I3h9faTDKt1qP4jn2o72tSvqMwtGFKGTpojce0gJs+76eZ2uCHRZh0Q==}
+  '@babel/plugin-transform-json-strings@7.28.6':
+    resolution: {integrity: sha512-Nr+hEN+0geQkzhbdgQVPoqr47lZbm+5fCUmO70722xJZd0Mvb59+33QLImGj6F+DkK3xgDi1YVysP8whD6FQAw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1244,8 +1304,8 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-logical-assignment-operators@7.28.5':
-    resolution: {integrity: sha512-axUuqnUTBuXyHGcJEVVh9pORaN6wC5bYfE7FGzPiaWa3syib9m7g+/IT/4VgCOe2Upef43PHzeAvcrVek6QuuA==}
+  '@babel/plugin-transform-logical-assignment-operators@7.28.6':
+    resolution: {integrity: sha512-+anKKair6gpi8VsM/95kmomGNMD0eLz1NQ8+Pfw5sAwWH9fGYXT50E55ZpV0pHUHWf6IUTWPM+f/7AAff+wr9A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1262,14 +1322,14 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-modules-commonjs@7.27.1':
-    resolution: {integrity: sha512-OJguuwlTYlN0gBZFRPqwOGNWssZjfIUdS7HMYtN8c1KmwpwHFBwTeFZrg9XZa+DFTitWOW5iTAG7tyCUPsCCyw==}
+  '@babel/plugin-transform-modules-commonjs@7.28.6':
+    resolution: {integrity: sha512-jppVbf8IV9iWWwWTQIxJMAJCWBuuKx71475wHwYytrRGQ2CWiDvYlADQno3tcYpS/T2UUWFQp3nVtYfK/YBQrA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-modules-systemjs@7.28.5':
-    resolution: {integrity: sha512-vn5Jma98LCOeBy/KpeQhXcV2WZgaRUtjwQmjoBuLNlOmkg0fB5pdvYVeWRYI69wWKwK2cD1QbMiUQnoujWvrew==}
+  '@babel/plugin-transform-modules-systemjs@7.29.0':
+    resolution: {integrity: sha512-PrujnVFbOdUpw4UHiVwKvKRLMMic8+eC0CuNlxjsyZUiBjhFdPsewdXCkveh2KqBA9/waD0W1b4hXSOBQJezpQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1280,8 +1340,8 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-named-capturing-groups-regex@7.27.1':
-    resolution: {integrity: sha512-SstR5JYy8ddZvD6MhV0tM/j16Qds4mIpJTOd1Yu9J9pJjH93bxHECF7pgtc28XvkzTD6Pxcm/0Z73Hvk7kb3Ng==}
+  '@babel/plugin-transform-named-capturing-groups-regex@7.29.0':
+    resolution: {integrity: sha512-1CZQA5KNAD6ZYQLPw7oi5ewtDNxH/2vuCh+6SmvgDfhumForvs8a1o9n0UrEoBD8HU4djO2yWngTQlXl1NDVEQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
@@ -1292,20 +1352,20 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-nullish-coalescing-operator@7.27.1':
-    resolution: {integrity: sha512-aGZh6xMo6q9vq1JGcw58lZ1Z0+i0xB2x0XaauNIUXd6O1xXc3RwoWEBlsTQrY4KQ9Jf0s5rgD6SiNkaUdJegTA==}
+  '@babel/plugin-transform-nullish-coalescing-operator@7.28.6':
+    resolution: {integrity: sha512-3wKbRgmzYbw24mDJXT7N+ADXw8BC/imU9yo9c9X9NKaLF1fW+e5H1U5QjMUBe4Qo4Ox/o++IyUkl1sVCLgevKg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-numeric-separator@7.27.1':
-    resolution: {integrity: sha512-fdPKAcujuvEChxDBJ5c+0BTaS6revLV7CJL08e4m3de8qJfNIuCc2nc7XJYOjBoTMJeqSmwXJ0ypE14RCjLwaw==}
+  '@babel/plugin-transform-numeric-separator@7.28.6':
+    resolution: {integrity: sha512-SJR8hPynj8outz+SlStQSwvziMN4+Bq99it4tMIf5/Caq+3iOc0JtKyse8puvyXkk3eFRIA5ID/XfunGgO5i6w==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-object-rest-spread@7.28.4':
-    resolution: {integrity: sha512-373KA2HQzKhQCYiRVIRr+3MjpCObqzDlyrM6u4I201wL8Mp2wHf7uB8GhDwis03k2ti8Zr65Zyyqs1xOxUF/Ew==}
+  '@babel/plugin-transform-object-rest-spread@7.28.6':
+    resolution: {integrity: sha512-5rh+JR4JBC4pGkXLAcYdLHZjXudVxWMXbB6u6+E9lRL5TrGVbHt1TjxGbZ8CkmYw9zjkB7jutzOROArsqtncEA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1316,14 +1376,14 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-optional-catch-binding@7.27.1':
-    resolution: {integrity: sha512-txEAEKzYrHEX4xSZN4kJ+OfKXFVSWKB2ZxM9dpcE3wT7smwkNmXo5ORRlVzMVdJbD+Q8ILTgSD7959uj+3Dm3Q==}
+  '@babel/plugin-transform-optional-catch-binding@7.28.6':
+    resolution: {integrity: sha512-R8ja/Pyrv0OGAvAXQhSTmWyPJPml+0TMqXlO5w+AsMEiwb2fg3WkOvob7UxFSL3OIttFSGSRFKQsOhJ/X6HQdQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-optional-chaining@7.28.5':
-    resolution: {integrity: sha512-N6fut9IZlPnjPwgiQkXNhb+cT8wQKFlJNqcZkWlcTqkcqx6/kU4ynGmLFoa4LViBSirn05YAwk+sQBbPfxtYzQ==}
+  '@babel/plugin-transform-optional-chaining@7.28.6':
+    resolution: {integrity: sha512-A4zobikRGJTsX9uqVFdafzGkqD30t26ck2LmOzAuLL8b2x6k3TIqRiT2xVvA9fNmFeTX484VpsdgmKNA0bS23w==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1334,14 +1394,14 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-private-methods@7.27.1':
-    resolution: {integrity: sha512-10FVt+X55AjRAYI9BrdISN9/AQWHqldOeZDUoLyif1Kn05a56xVBXb8ZouL8pZ9jem8QpXaOt8TS7RHUIS+GPA==}
+  '@babel/plugin-transform-private-methods@7.28.6':
+    resolution: {integrity: sha512-piiuapX9CRv7+0st8lmuUlRSmX6mBcVeNQ1b4AYzJxfCMuBfB0vBXDiGSmm03pKJw1v6cZ8KSeM+oUnM6yAExg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-private-property-in-object@7.27.1':
-    resolution: {integrity: sha512-5J+IhqTi1XPa0DXF83jYOaARrX+41gOewWbkPyjMNRDqgOCqdffGh8L3f/Ek5utaEBZExjSAzcyjmV9SSAWObQ==}
+  '@babel/plugin-transform-private-property-in-object@7.28.6':
+    resolution: {integrity: sha512-b97jvNSOb5+ehyQmBpmhOCiUC5oVK4PMnpRvO7+ymFBoqYjeDHIU9jnrNUuwHOiL9RpGDoKBpSViarV+BU+eVA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1352,14 +1412,14 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-regenerator@7.28.4':
-    resolution: {integrity: sha512-+ZEdQlBoRg9m2NnzvEeLgtvBMO4tkFBw5SQIUgLICgTrumLoU7lr+Oghi6km2PFj+dbUt2u1oby2w3BDO9YQnA==}
+  '@babel/plugin-transform-regenerator@7.29.0':
+    resolution: {integrity: sha512-FijqlqMA7DmRdg/aINBSs04y8XNTYw/lr1gJ2WsmBnnaNw1iS43EPkJW+zK7z65auG3AWRFXWj+NcTQwYptUog==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-regexp-modifiers@7.27.1':
-    resolution: {integrity: sha512-TtEciroaiODtXvLZv4rmfMhkCv8jx3wgKpL68PuiPh2M4fvz5jhsA7697N1gMvkvr/JTF13DrFYyEbY9U7cVPA==}
+  '@babel/plugin-transform-regexp-modifiers@7.28.6':
+    resolution: {integrity: sha512-QGWAepm9qxpaIs7UM9FvUSnCGlb8Ua1RhyM4/veAxLwt3gMat/LSGrZixyuj4I6+Kn9iwvqCyPTtbdxanYoWYg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
@@ -1370,8 +1430,8 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-runtime@7.28.5':
-    resolution: {integrity: sha512-20NUVgOrinudkIBzQ2bNxP08YpKprUkRTiRSd2/Z5GOdPImJGkoN4Z7IQe1T5AdyKI1i5L6RBmluqdSzvaq9/w==}
+  '@babel/plugin-transform-runtime@7.29.0':
+    resolution: {integrity: sha512-jlaRT5dJtMaMCV6fAuLbsQMSwz/QkvaHOHOSXRitGGwSpR1blCY4KUKoyP2tYO8vJcqYe8cEj96cqSztv3uF9w==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1382,8 +1442,8 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-spread@7.27.1':
-    resolution: {integrity: sha512-kpb3HUqaILBJcRFVhFUs6Trdd4mkrzcGXss+6/mxUd273PfbWqSDHRzMT2234gIg2QYfAjvXLSquP1xECSg09Q==}
+  '@babel/plugin-transform-spread@7.28.6':
+    resolution: {integrity: sha512-9U4QObUC0FtJl05AsUcodau/RWDytrU6uKgkxu09mLR9HLDAtUMoPuuskm5huQsoktmsYpI+bGmq+iapDcriKA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1406,8 +1466,8 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-typescript@7.28.5':
-    resolution: {integrity: sha512-x2Qa+v/CuEoX7Dr31iAfr0IhInrVOWZU/2vJMJ00FOR/2nM0BcBEclpaf9sWCDc+v5e9dMrhSH8/atq/kX7+bA==}
+  '@babel/plugin-transform-typescript@7.28.6':
+    resolution: {integrity: sha512-0YWL2RFxOqEm9Efk5PvreamxPME8OyY0wM5wh5lHjF+VtVhdneCWGzZeSqzOfiobVqQaNCd2z0tQvnI9DaPWPw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1418,8 +1478,8 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-unicode-property-regex@7.27.1':
-    resolution: {integrity: sha512-uW20S39PnaTImxp39O5qFlHLS9LJEmANjMG7SxIhap8rCHqu0Ik+tLEPX5DKmHn6CsWQ7j3lix2tFOa5YtL12Q==}
+  '@babel/plugin-transform-unicode-property-regex@7.28.6':
+    resolution: {integrity: sha512-4Wlbdl/sIZjzi/8St0evF0gEZrgOswVO6aOzqxh1kDZOl9WmLrHq2HtGhnOJZmHZYKP8WZ1MDLCt5DAWwRo57A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1430,14 +1490,14 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-unicode-sets-regex@7.27.1':
-    resolution: {integrity: sha512-EtkOujbc4cgvb0mlpQefi4NTPBzhSIevblFevACNLUspmrALgmEBdL/XfnyyITfd8fKBZrZys92zOWcik7j9Tw==}
+  '@babel/plugin-transform-unicode-sets-regex@7.28.6':
+    resolution: {integrity: sha512-/wHc/paTUmsDYN7SZkpWxogTOBNnlx7nBQYfy6JJlCT7G3mVhltk3e++N7zV0XfgGsrqBxd4rJQt9H16I21Y1Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/preset-env@7.28.5':
-    resolution: {integrity: sha512-S36mOoi1Sb6Fz98fBfE+UZSpYw5mJm0NUHtIKrOuNcqeFauy1J6dIvXm2KRVKobOSaGq4t/hBXdN4HGU3wL9Wg==}
+  '@babel/preset-env@7.29.0':
+    resolution: {integrity: sha512-fNEdfc0yi16lt6IZo2Qxk3knHVdfMYX33czNb4v8yWhemoBhibCpQK/uYHtSKIiO+p/zd3+8fYVXhQdOVV608w==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1453,24 +1513,24 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/runtime@7.28.4':
-    resolution: {integrity: sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==}
+  '@babel/runtime@7.28.6':
+    resolution: {integrity: sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==}
     engines: {node: '>=6.9.0'}
 
   '@babel/standalone@7.28.5':
     resolution: {integrity: sha512-1DViPYJpRU50irpGMfLBQ9B4kyfQuL6X7SS7pwTeWeZX0mNkjzPi0XFqxCjSdddZXUQy4AhnQnnesA/ZHnvAdw==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/template@7.27.2':
-    resolution: {integrity: sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==}
+  '@babel/template@7.28.6':
+    resolution: {integrity: sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/traverse@7.28.5':
-    resolution: {integrity: sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==}
+  '@babel/traverse@7.29.0':
+    resolution: {integrity: sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/types@7.28.5':
-    resolution: {integrity: sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==}
+  '@babel/types@7.29.0':
+    resolution: {integrity: sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==}
     engines: {node: '>=6.9.0'}
 
   '@bcoe/v8-coverage@1.0.2':
@@ -1531,14 +1591,20 @@ packages:
     peerDependencies:
       postcss-selector-parser: ^7.0.0
 
+  '@cyberalien/svg-utils@1.1.1':
+    resolution: {integrity: sha512-i05Cnpzeezf3eJAXLx7aFirTYYoq5D1XUItp1XsjqkerNJh//6BG9sOYHbiO7v0KYMvJAx3kosrZaRcNlQPdsA==}
+
+  '@dmsnell/diff-match-patch@1.1.0':
+    resolution: {integrity: sha512-yejLPmM5pjsGvxS9gXablUSbInW7H976c/FJ4iQxWIm7/38xBySRemTPDe34lhg1gVLbJntX0+sH0jYfU+PN9A==}
+
   '@dual-bundle/import-meta-resolve@4.2.1':
     resolution: {integrity: sha512-id+7YRUgoUX6CgV0DtuhirQWodeeA7Lf4i2x71JS/vtA5pRb/hIGWlw+G6MeXvsM+MXrz0VAydTGElX1rAfgPg==}
 
-  '@emnapi/core@1.7.1':
-    resolution: {integrity: sha512-o1uhUASyo921r2XtHYOHy7gdkGLge8ghBEQHMWmyJFoXlpU58kIrhhN3w26lpQb6dspetweapMn2CSNwQ8I4wg==}
+  '@emnapi/core@1.8.1':
+    resolution: {integrity: sha512-AvT9QFpxK0Zd8J0jopedNm+w/2fIzvtPKPjqyw9jwvBaReTTqPBk9Hixaz7KbjimP+QNz605/XnjFcDAL2pqBg==}
 
-  '@emnapi/runtime@1.7.1':
-    resolution: {integrity: sha512-PVtJr5CmLwYAU9PZDMITZoR5iAOShYREoR45EyyLrbntV50mdePTgUn4AmOw90Ifcj+x2kRjdzr1HP3RrNiHGA==}
+  '@emnapi/runtime@1.8.1':
+    resolution: {integrity: sha512-mehfKSMWjjNol8659Z8KxEMrdSJDDot5SXMq00dM8BN4o+CLNXQ0xH2V7EchNHV4RmbZLmmPdEaXZc5H2FXmDg==}
 
   '@emnapi/wasi-threads@1.1.0':
     resolution: {integrity: sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==}
@@ -1552,8 +1618,8 @@ packages:
     cpu: [ppc64]
     os: [aix]
 
-  '@esbuild/aix-ppc64@0.27.1':
-    resolution: {integrity: sha512-HHB50pdsBX6k47S4u5g/CaLjqS3qwaOVE5ILsq64jyzgMhLuCuZ8rGzM9yhsAjfjkbgUPMzZEPa7DAp7yz6vuA==}
+  '@esbuild/aix-ppc64@0.27.3':
+    resolution: {integrity: sha512-9fJMTNFTWZMh5qwrBItuziu834eOCUcEqymSH7pY+zoMVEZg3gcPuBNxH1EvfVYe9h0x/Ptw8KBzv7qxb7l8dg==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [aix]
@@ -1564,8 +1630,8 @@ packages:
     cpu: [arm64]
     os: [android]
 
-  '@esbuild/android-arm64@0.27.1':
-    resolution: {integrity: sha512-45fuKmAJpxnQWixOGCrS+ro4Uvb4Re9+UTieUY2f8AEc+t7d4AaZ6eUJ3Hva7dtrxAAWHtlEFsXFMAgNnGU9uQ==}
+  '@esbuild/android-arm64@0.27.3':
+    resolution: {integrity: sha512-YdghPYUmj/FX2SYKJ0OZxf+iaKgMsKHVPF1MAq/P8WirnSpCStzKJFjOjzsW0QQ7oIAiccHdcqjbHmJxRb/dmg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [android]
@@ -1576,8 +1642,8 @@ packages:
     cpu: [arm]
     os: [android]
 
-  '@esbuild/android-arm@0.27.1':
-    resolution: {integrity: sha512-kFqa6/UcaTbGm/NncN9kzVOODjhZW8e+FRdSeypWe6j33gzclHtwlANs26JrupOntlcWmB0u8+8HZo8s7thHvg==}
+  '@esbuild/android-arm@0.27.3':
+    resolution: {integrity: sha512-i5D1hPY7GIQmXlXhs2w8AWHhenb00+GxjxRncS2ZM7YNVGNfaMxgzSGuO8o8SJzRc/oZwU2bcScvVERk03QhzA==}
     engines: {node: '>=18'}
     cpu: [arm]
     os: [android]
@@ -1588,8 +1654,8 @@ packages:
     cpu: [x64]
     os: [android]
 
-  '@esbuild/android-x64@0.27.1':
-    resolution: {integrity: sha512-LBEpOz0BsgMEeHgenf5aqmn/lLNTFXVfoWMUox8CtWWYK9X4jmQzWjoGoNb8lmAYml/tQ/Ysvm8q7szu7BoxRQ==}
+  '@esbuild/android-x64@0.27.3':
+    resolution: {integrity: sha512-IN/0BNTkHtk8lkOM8JWAYFg4ORxBkZQf9zXiEOfERX/CzxW3Vg1ewAhU7QSWQpVIzTW+b8Xy+lGzdYXV6UZObQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [android]
@@ -1600,8 +1666,8 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@esbuild/darwin-arm64@0.27.1':
-    resolution: {integrity: sha512-veg7fL8eMSCVKL7IW4pxb54QERtedFDfY/ASrumK/SbFsXnRazxY4YykN/THYqFnFwJ0aVjiUrVG2PwcdAEqQQ==}
+  '@esbuild/darwin-arm64@0.27.3':
+    resolution: {integrity: sha512-Re491k7ByTVRy0t3EKWajdLIr0gz2kKKfzafkth4Q8A5n1xTHrkqZgLLjFEHVD+AXdUGgQMq+Godfq45mGpCKg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [darwin]
@@ -1612,8 +1678,8 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@esbuild/darwin-x64@0.27.1':
-    resolution: {integrity: sha512-+3ELd+nTzhfWb07Vol7EZ+5PTbJ/u74nC6iv4/lwIU99Ip5uuY6QoIf0Hn4m2HoV0qcnRivN3KSqc+FyCHjoVQ==}
+  '@esbuild/darwin-x64@0.27.3':
+    resolution: {integrity: sha512-vHk/hA7/1AckjGzRqi6wbo+jaShzRowYip6rt6q7VYEDX4LEy1pZfDpdxCBnGtl+A5zq8iXDcyuxwtv3hNtHFg==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [darwin]
@@ -1624,8 +1690,8 @@ packages:
     cpu: [arm64]
     os: [freebsd]
 
-  '@esbuild/freebsd-arm64@0.27.1':
-    resolution: {integrity: sha512-/8Rfgns4XD9XOSXlzUDepG8PX+AVWHliYlUkFI3K3GB6tqbdjYqdhcb4BKRd7C0BhZSoaCxhv8kTcBrcZWP+xg==}
+  '@esbuild/freebsd-arm64@0.27.3':
+    resolution: {integrity: sha512-ipTYM2fjt3kQAYOvo6vcxJx3nBYAzPjgTCk7QEgZG8AUO3ydUhvelmhrbOheMnGOlaSFUoHXB6un+A7q4ygY9w==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [freebsd]
@@ -1636,8 +1702,8 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
-  '@esbuild/freebsd-x64@0.27.1':
-    resolution: {integrity: sha512-GITpD8dK9C+r+5yRT/UKVT36h/DQLOHdwGVwwoHidlnA168oD3uxA878XloXebK4Ul3gDBBIvEdL7go9gCUFzQ==}
+  '@esbuild/freebsd-x64@0.27.3':
+    resolution: {integrity: sha512-dDk0X87T7mI6U3K9VjWtHOXqwAMJBNN2r7bejDsc+j03SEjtD9HrOl8gVFByeM0aJksoUuUVU9TBaZa2rgj0oA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [freebsd]
@@ -1648,8 +1714,8 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@esbuild/linux-arm64@0.27.1':
-    resolution: {integrity: sha512-W9//kCrh/6in9rWIBdKaMtuTTzNj6jSeG/haWBADqLLa9P8O5YSRDzgD5y9QBok4AYlzS6ARHifAb75V6G670Q==}
+  '@esbuild/linux-arm64@0.27.3':
+    resolution: {integrity: sha512-sZOuFz/xWnZ4KH3YfFrKCf1WyPZHakVzTiqji3WDc0BCl2kBwiJLCXpzLzUBLgmp4veFZdvN5ChW4Eq/8Fc2Fg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [linux]
@@ -1660,8 +1726,8 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@esbuild/linux-arm@0.27.1':
-    resolution: {integrity: sha512-ieMID0JRZY/ZeCrsFQ3Y3NlHNCqIhTprJfDgSB3/lv5jJZ8FX3hqPyXWhe+gvS5ARMBJ242PM+VNz/ctNj//eA==}
+  '@esbuild/linux-arm@0.27.3':
+    resolution: {integrity: sha512-s6nPv2QkSupJwLYyfS+gwdirm0ukyTFNl3KTgZEAiJDd+iHZcbTPPcWCcRYH+WlNbwChgH2QkE9NSlNrMT8Gfw==}
     engines: {node: '>=18'}
     cpu: [arm]
     os: [linux]
@@ -1672,8 +1738,8 @@ packages:
     cpu: [ia32]
     os: [linux]
 
-  '@esbuild/linux-ia32@0.27.1':
-    resolution: {integrity: sha512-VIUV4z8GD8rtSVMfAj1aXFahsi/+tcoXXNYmXgzISL+KB381vbSTNdeZHHHIYqFyXcoEhu9n5cT+05tRv13rlw==}
+  '@esbuild/linux-ia32@0.27.3':
+    resolution: {integrity: sha512-yGlQYjdxtLdh0a3jHjuwOrxQjOZYD/C9PfdbgJJF3TIZWnm/tMd/RcNiLngiu4iwcBAOezdnSLAwQDPqTmtTYg==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [linux]
@@ -1684,8 +1750,8 @@ packages:
     cpu: [loong64]
     os: [linux]
 
-  '@esbuild/linux-loong64@0.27.1':
-    resolution: {integrity: sha512-l4rfiiJRN7sTNI//ff65zJ9z8U+k6zcCg0LALU5iEWzY+a1mVZ8iWC1k5EsNKThZ7XCQ6YWtsZ8EWYm7r1UEsg==}
+  '@esbuild/linux-loong64@0.27.3':
+    resolution: {integrity: sha512-WO60Sn8ly3gtzhyjATDgieJNet/KqsDlX5nRC5Y3oTFcS1l0KWba+SEa9Ja1GfDqSF1z6hif/SkpQJbL63cgOA==}
     engines: {node: '>=18'}
     cpu: [loong64]
     os: [linux]
@@ -1696,8 +1762,8 @@ packages:
     cpu: [mips64el]
     os: [linux]
 
-  '@esbuild/linux-mips64el@0.27.1':
-    resolution: {integrity: sha512-U0bEuAOLvO/DWFdygTHWY8C067FXz+UbzKgxYhXC0fDieFa0kDIra1FAhsAARRJbvEyso8aAqvPdNxzWuStBnA==}
+  '@esbuild/linux-mips64el@0.27.3':
+    resolution: {integrity: sha512-APsymYA6sGcZ4pD6k+UxbDjOFSvPWyZhjaiPyl/f79xKxwTnrn5QUnXR5prvetuaSMsb4jgeHewIDCIWljrSxw==}
     engines: {node: '>=18'}
     cpu: [mips64el]
     os: [linux]
@@ -1708,8 +1774,8 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
-  '@esbuild/linux-ppc64@0.27.1':
-    resolution: {integrity: sha512-NzdQ/Xwu6vPSf/GkdmRNsOfIeSGnh7muundsWItmBsVpMoNPVpM61qNzAVY3pZ1glzzAxLR40UyYM23eaDDbYQ==}
+  '@esbuild/linux-ppc64@0.27.3':
+    resolution: {integrity: sha512-eizBnTeBefojtDb9nSh4vvVQ3V9Qf9Df01PfawPcRzJH4gFSgrObw+LveUyDoKU3kxi5+9RJTCWlj4FjYXVPEA==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [linux]
@@ -1720,8 +1786,8 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
-  '@esbuild/linux-riscv64@0.27.1':
-    resolution: {integrity: sha512-7zlw8p3IApcsN7mFw0O1Z1PyEk6PlKMu18roImfl3iQHTnr/yAfYv6s4hXPidbDoI2Q0pW+5xeoM4eTCC0UdrQ==}
+  '@esbuild/linux-riscv64@0.27.3':
+    resolution: {integrity: sha512-3Emwh0r5wmfm3ssTWRQSyVhbOHvqegUDRd0WhmXKX2mkHJe1SFCMJhagUleMq+Uci34wLSipf8Lagt4LlpRFWQ==}
     engines: {node: '>=18'}
     cpu: [riscv64]
     os: [linux]
@@ -1732,8 +1798,8 @@ packages:
     cpu: [s390x]
     os: [linux]
 
-  '@esbuild/linux-s390x@0.27.1':
-    resolution: {integrity: sha512-cGj5wli+G+nkVQdZo3+7FDKC25Uh4ZVwOAK6A06Hsvgr8WqBBuOy/1s+PUEd/6Je+vjfm6stX0kmib5b/O2Ykw==}
+  '@esbuild/linux-s390x@0.27.3':
+    resolution: {integrity: sha512-pBHUx9LzXWBc7MFIEEL0yD/ZVtNgLytvx60gES28GcWMqil8ElCYR4kvbV2BDqsHOvVDRrOxGySBM9Fcv744hw==}
     engines: {node: '>=18'}
     cpu: [s390x]
     os: [linux]
@@ -1744,8 +1810,8 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@esbuild/linux-x64@0.27.1':
-    resolution: {integrity: sha512-z3H/HYI9MM0HTv3hQZ81f+AKb+yEoCRlUby1F80vbQ5XdzEMyY/9iNlAmhqiBKw4MJXwfgsh7ERGEOhrM1niMA==}
+  '@esbuild/linux-x64@0.27.3':
+    resolution: {integrity: sha512-Czi8yzXUWIQYAtL/2y6vogER8pvcsOsk5cpwL4Gk5nJqH5UZiVByIY8Eorm5R13gq+DQKYg0+JyQoytLQas4dA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [linux]
@@ -1756,8 +1822,8 @@ packages:
     cpu: [arm64]
     os: [netbsd]
 
-  '@esbuild/netbsd-arm64@0.27.1':
-    resolution: {integrity: sha512-wzC24DxAvk8Em01YmVXyjl96Mr+ecTPyOuADAvjGg+fyBpGmxmcr2E5ttf7Im8D0sXZihpxzO1isus8MdjMCXQ==}
+  '@esbuild/netbsd-arm64@0.27.3':
+    resolution: {integrity: sha512-sDpk0RgmTCR/5HguIZa9n9u+HVKf40fbEUt+iTzSnCaGvY9kFP0YKBWZtJaraonFnqef5SlJ8/TiPAxzyS+UoA==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [netbsd]
@@ -1768,8 +1834,8 @@ packages:
     cpu: [x64]
     os: [netbsd]
 
-  '@esbuild/netbsd-x64@0.27.1':
-    resolution: {integrity: sha512-1YQ8ybGi2yIXswu6eNzJsrYIGFpnlzEWRl6iR5gMgmsrR0FcNoV1m9k9sc3PuP5rUBLshOZylc9nqSgymI+TYg==}
+  '@esbuild/netbsd-x64@0.27.3':
+    resolution: {integrity: sha512-P14lFKJl/DdaE00LItAukUdZO5iqNH7+PjoBm+fLQjtxfcfFE20Xf5CrLsmZdq5LFFZzb5JMZ9grUwvtVYzjiA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [netbsd]
@@ -1780,8 +1846,8 @@ packages:
     cpu: [arm64]
     os: [openbsd]
 
-  '@esbuild/openbsd-arm64@0.27.1':
-    resolution: {integrity: sha512-5Z+DzLCrq5wmU7RDaMDe2DVXMRm2tTDvX2KU14JJVBN2CT/qov7XVix85QoJqHltpvAOZUAc3ndU56HSMWrv8g==}
+  '@esbuild/openbsd-arm64@0.27.3':
+    resolution: {integrity: sha512-AIcMP77AvirGbRl/UZFTq5hjXK+2wC7qFRGoHSDrZ5v5b8DK/GYpXW3CPRL53NkvDqb9D+alBiC/dV0Fb7eJcw==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openbsd]
@@ -1792,14 +1858,14 @@ packages:
     cpu: [x64]
     os: [openbsd]
 
-  '@esbuild/openbsd-x64@0.27.1':
-    resolution: {integrity: sha512-Q73ENzIdPF5jap4wqLtsfh8YbYSZ8Q0wnxplOlZUOyZy7B4ZKW8DXGWgTCZmF8VWD7Tciwv5F4NsRf6vYlZtqg==}
+  '@esbuild/openbsd-x64@0.27.3':
+    resolution: {integrity: sha512-DnW2sRrBzA+YnE70LKqnM3P+z8vehfJWHXECbwBmH/CU51z6FiqTQTHFenPlHmo3a8UgpLyH3PT+87OViOh1AQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [openbsd]
 
-  '@esbuild/openharmony-arm64@0.27.1':
-    resolution: {integrity: sha512-ajbHrGM/XiK+sXM0JzEbJAen+0E+JMQZ2l4RR4VFwvV9JEERx+oxtgkpoKv1SevhjavK2z2ReHk32pjzktWbGg==}
+  '@esbuild/openharmony-arm64@0.27.3':
+    resolution: {integrity: sha512-NinAEgr/etERPTsZJ7aEZQvvg/A6IsZG/LgZy+81wON2huV7SrK3e63dU0XhyZP4RKGyTm7aOgmQk0bGp0fy2g==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openharmony]
@@ -1810,8 +1876,8 @@ packages:
     cpu: [x64]
     os: [sunos]
 
-  '@esbuild/sunos-x64@0.27.1':
-    resolution: {integrity: sha512-IPUW+y4VIjuDVn+OMzHc5FV4GubIwPnsz6ubkvN8cuhEqH81NovB53IUlrlBkPMEPxvNnf79MGBoz8rZ2iW8HA==}
+  '@esbuild/sunos-x64@0.27.3':
+    resolution: {integrity: sha512-PanZ+nEz+eWoBJ8/f8HKxTTD172SKwdXebZ0ndd953gt1HRBbhMsaNqjTyYLGLPdoWHy4zLU7bDVJztF5f3BHA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [sunos]
@@ -1822,8 +1888,8 @@ packages:
     cpu: [arm64]
     os: [win32]
 
-  '@esbuild/win32-arm64@0.27.1':
-    resolution: {integrity: sha512-RIVRWiljWA6CdVu8zkWcRmGP7iRRIIwvhDKem8UMBjPql2TXM5PkDVvvrzMtj1V+WFPB4K7zkIGM7VzRtFkjdg==}
+  '@esbuild/win32-arm64@0.27.3':
+    resolution: {integrity: sha512-B2t59lWWYrbRDw/tjiWOuzSsFh1Y/E95ofKz7rIVYSQkUYBjfSgf6oeYPNWHToFRr2zx52JKApIcAS/D5TUBnA==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [win32]
@@ -1834,8 +1900,8 @@ packages:
     cpu: [ia32]
     os: [win32]
 
-  '@esbuild/win32-ia32@0.27.1':
-    resolution: {integrity: sha512-2BR5M8CPbptC1AK5JbJT1fWrHLvejwZidKx3UMSF0ecHMa+smhi16drIrCEggkgviBwLYd5nwrFLSl5Kho96RQ==}
+  '@esbuild/win32-ia32@0.27.3':
+    resolution: {integrity: sha512-QLKSFeXNS8+tHW7tZpMtjlNb7HKau0QDpwm49u0vUp9y1WOF+PEzkU84y9GqYaAVW8aH8f3GcBck26jh54cX4Q==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [win32]
@@ -1846,14 +1912,14 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@esbuild/win32-x64@0.27.1':
-    resolution: {integrity: sha512-d5X6RMYv6taIymSk8JBP+nxv8DQAMY6A51GPgusqLdK9wBz5wWIXy1KjTck6HnjE9hqJzJRdk+1p/t5soSbCtw==}
+  '@esbuild/win32-x64@0.27.3':
+    resolution: {integrity: sha512-4uJGhsxuptu3OcpVAzli+/gWusVGwZZHTlS63hh++ehExkVT8SgiEf7/uC/PclrPPkLhZqGgCTjd0VWLo6xMqA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [win32]
 
-  '@eslint-community/eslint-utils@4.9.0':
-    resolution: {integrity: sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==}
+  '@eslint-community/eslint-utils@4.9.1':
+    resolution: {integrity: sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
@@ -1874,8 +1940,12 @@ packages:
     resolution: {integrity: sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@eslint/eslintrc@3.3.1':
-    resolution: {integrity: sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==}
+  '@eslint/css-tree@3.6.9':
+    resolution: {integrity: sha512-3D5/OHibNEGk+wKwNwMbz63NMf367EoR4mVNNpxddCHKEb2Nez7z62J2U6YjtErSsZDoY0CsccmoUpdEbkogNA==}
+    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
+
+  '@eslint/eslintrc@3.3.3':
+    resolution: {integrity: sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@eslint/js@9.39.1':
@@ -2121,6 +2191,9 @@ packages:
   '@floating-ui/vue@1.1.9':
     resolution: {integrity: sha512-BfNqNW6KA83Nexspgb9DZuz578R7HT8MZw1CfK9I6Ah4QReNWEJsXWHN+SdmOVLNGmTPDi+fDT535Df5PzMLbQ==}
 
+  '@formkit/auto-animate@0.9.0':
+    resolution: {integrity: sha512-VhP4zEAacXS3dfTpJpJ88QdLqMTcabMg0jwpOSxZ/VzfQVfl3GkZSCZThhGC5uhq/TxPHPzW0dzr4H9Bb1OgKA==}
+
   '@grpc/grpc-js@1.9.15':
     resolution: {integrity: sha512-nqE7Hc0AzI+euzUwDAy0aY5hCp10r734gMGRdU+qOPX0XSceI2ULrcXB5U2xSc5VkWwalCj4M7GzCAygZl2KoQ==}
     engines: {node: ^8.13.0 || >=10.10.0}
@@ -2152,8 +2225,13 @@ packages:
   '@iconify/json@2.2.380':
     resolution: {integrity: sha512-+Al/Q+mMB/nLz/tawmJEOkCs6+RKKVUS/Yg9I80h2yRpu0kIzxVLQRfF0NifXz/fH92vDVXbS399wio4lMVF4Q==}
 
-  '@iconify/tailwind@1.2.0':
-    resolution: {integrity: sha512-KgpIHWOTcRYw1XcoUqyNSrmYyfLLqZYu3AmP8zdfLk0F5TqRO8YerhlvlQmGfn7rJXgPeZN569xPAJnJ53zZxA==}
+  '@iconify/tailwind4@1.2.1':
+    resolution: {integrity: sha512-Hd7k8y7uzT3hk8ltw0jGku0r0wA8sc3d2iMvVTYv/9tMxBb+frZtWZGD9hDMU3EYuE+lMn58wi2lS8R2ZbwFcQ==}
+    peerDependencies:
+      tailwindcss: '>= 4.0.0'
+
+  '@iconify/tools@5.0.3':
+    resolution: {integrity: sha512-W5nbH5fNv20TvU49Al19Foos/ViAnmppbCNV9ieGl6/dRMDRzxeFol6peXX/NAgaOytQwZZxTTJRq/Kxd4eWsA==}
 
   '@iconify/types@2.0.0':
     resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==}
@@ -2167,16 +2245,16 @@ packages:
   '@internationalized/number@3.6.5':
     resolution: {integrity: sha512-6hY4Kl4HPBvtfS62asS/R22JzNNy8vi/Ssev7x6EobfCp+9QIB2hKvI2EtbdJ0VSQacxVNtqhE/NmF/NZ0gm6g==}
 
-  '@intlify/core-base@11.1.12':
-    resolution: {integrity: sha512-whh0trqRsSqVLNEUCwU59pyJZYpU8AmSWl8M3Jz2Mv5ESPP6kFh4juas2NpZ1iCvy7GlNRffUD1xr84gceimjg==}
+  '@intlify/core-base@11.2.8':
+    resolution: {integrity: sha512-nBq6Y1tVkjIUsLsdOjDSJj4AsjvD0UG3zsg9Fyc+OivwlA/oMHSKooUy9tpKj0HqZ+NWFifweHavdljlBLTwdA==}
     engines: {node: '>= 16'}
 
-  '@intlify/core-base@9.14.3':
-    resolution: {integrity: sha512-nbJ7pKTlXFnaXPblyfiH6awAx1C0PWNNuqXAR74yRwgi5A/Re/8/5fErLY0pv4R8+EHj3ZaThMHdnuC/5OBa6g==}
+  '@intlify/core-base@9.14.5':
+    resolution: {integrity: sha512-5ah5FqZG4pOoHjkvs8mjtv+gPKYU0zCISaYNjBNNqYiaITxW8ZtVih3GS/oTOqN8d9/mDLyrjD46GBApNxmlsA==}
     engines: {node: '>= 16'}
 
-  '@intlify/eslint-plugin-vue-i18n@4.1.0':
-    resolution: {integrity: sha512-MPAr3LGTrkB5CZBHN5eUf4kASUEiSaDM371jADmxNbTL1Ew7IAyCIBGm3+/1sWcvsfVHe4wz8RFoo6FpeQZ4Nw==}
+  '@intlify/eslint-plugin-vue-i18n@4.1.1':
+    resolution: {integrity: sha512-TgeLqdNEwt9wDOxXwJ7lSxw4f2saXd0QfZ4ZM3oCU4m1H1r1tBbuV6nRuhtsy4DwGqC0nlFFhsvKONlEyUxZkg==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
       eslint: ^8.0.0 || ^9.0.0-0
@@ -2184,38 +2262,34 @@ packages:
       vue-eslint-parser: ^10.0.0
       yaml-eslint-parser: ^1.2.2
 
-  '@intlify/message-compiler@11.1.12':
-    resolution: {integrity: sha512-Fv9iQSJoJaXl4ZGkOCN1LDM3trzze0AS2zRz2EHLiwenwL6t0Ki9KySYlyr27yVOj5aVz0e55JePO+kELIvfdQ==}
+  '@intlify/message-compiler@11.2.8':
+    resolution: {integrity: sha512-A5n33doOjmHsBtCN421386cG1tWp5rpOjOYPNsnpjIJbQ4POF0QY2ezhZR9kr0boKwaHjbOifvyQvHj2UTrDFQ==}
     engines: {node: '>= 16'}
 
-  '@intlify/message-compiler@9.14.3':
-    resolution: {integrity: sha512-ANwC226BQdd+MpJ36rOYkChSESfPwu3Ss2Faw0RHTOknYLoHTX6V6e/JjIKVDMbzs0/H/df/rO6yU0SPiWHqNg==}
+  '@intlify/message-compiler@9.14.5':
+    resolution: {integrity: sha512-IHzgEu61/YIpQV5Pc3aRWScDcnFKWvQA9kigcINcCBXN8mbW+vk9SK+lDxA6STzKQsVJxUPg9ACC52pKKo3SVQ==}
     engines: {node: '>= 16'}
 
-  '@intlify/shared@11.1.12':
-    resolution: {integrity: sha512-Om86EjuQtA69hdNj3GQec9ZC0L0vPSAnXzB3gP/gyJ7+mA7t06d9aOAiqMZ+xEOsumGP4eEBlfl8zF2LOTzf2A==}
+  '@intlify/shared@11.2.8':
+    resolution: {integrity: sha512-l6e4NZyUgv8VyXXH4DbuucFOBmxLF56C/mqh2tvApbzl2Hrhi1aTDcuv5TKdxzfHYmpO3UB0Cz04fgDT9vszfw==}
     engines: {node: '>= 16'}
 
-  '@intlify/shared@9.14.3':
-    resolution: {integrity: sha512-hJXz9LA5VG7qNE00t50bdzDv8Z4q9fpcL81wj4y4duKavrv0KM8YNLTwXNEFINHjTsfrG9TXvPuEjVaAvZ7yWg==}
+  '@intlify/shared@9.14.5':
+    resolution: {integrity: sha512-9gB+E53BYuAEMhbCAxVgG38EZrk59sxBtv3jSizNL2hEWlgjBjAw1AwpLHtNaeda12pe6W20OGEa0TwuMSRbyQ==}
     engines: {node: '>= 16'}
 
   '@isaacs/balanced-match@4.0.1':
     resolution: {integrity: sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==}
     engines: {node: 20 || >=22}
 
-  '@isaacs/brace-expansion@5.0.0':
-    resolution: {integrity: sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==}
+  '@isaacs/brace-expansion@5.0.1':
+    resolution: {integrity: sha512-WMz71T1JS624nWj2n2fnYAuPovhv7EUhk69R6i9dsVyzxt5eM3bjwvgk9L+APE1TRscGysAVMANkB0jh0LQZrQ==}
     engines: {node: 20 || >=22}
 
   '@isaacs/cliui@8.0.2':
     resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
     engines: {node: '>=12'}
 
-  '@isaacs/fs-minipass@4.0.1':
-    resolution: {integrity: sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==}
-    engines: {node: '>=18.0.0'}
-
   '@jest/diff-sequences@30.0.1':
     resolution: {integrity: sha512-n5H8QLDJ47QqbCNn5SuFjCRDrOLEZ0h8vAHCK5RL9Ls7Xa8AQLa/YxAc9UjFqoEDM48muwtBGjtMY5cr0PLDCw==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
@@ -2263,8 +2337,8 @@ packages:
     resolution: {integrity: sha512-7kXm84dc6yiniEFb/KRZv5H4g43n+xKTSpKSczlv54DY3tHSuZjBARyI/UDxFVgn7ezWYAIFuphzs0hSdhs6hw==}
     engines: {node: '>=18'}
 
-  '@lobehub/i18n-cli@1.25.1':
-    resolution: {integrity: sha512-LQSLcU7l5Wfnsq7hMydVmjJ2d4GZKKKEbsQ1EKzYU+S5jTJYAtbNY2f3mg1llJZ+RLOlgKdfkPZhPc41TacA1A==}
+  '@lobehub/i18n-cli@1.26.1':
+    resolution: {integrity: sha512-/LEKOY25KZ5yvBZ9OFy6lXvWURghSkLcVFQF5Us/7o9awzzO65d7VOP59QI0ddThE1ynVFdVhYhAu4tJ0WkTQA==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -2274,18 +2348,18 @@ packages:
       '@types/react': '>=16'
       react: '>=16'
 
-  '@microsoft/api-extractor-model@7.30.7':
-    resolution: {integrity: sha512-TBbmSI2/BHpfR9YhQA7nH0nqVmGgJ0xH0Ex4D99/qBDAUpnhA2oikGmdXanbw9AWWY/ExBYIpkmY8dBHdla3YQ==}
+  '@microsoft/api-extractor-model@7.33.1':
+    resolution: {integrity: sha512-KX0LI6xzI0gcBOXXmr5mnnbdhsK2W93pqvJo8OgJgWvRRh+wMEp0Ccj38h1XKeJ29E1tuAZKSUOfHUQ1WA8fZg==}
 
-  '@microsoft/api-extractor@7.52.13':
-    resolution: {integrity: sha512-K6/bBt8zZfn9yc06gNvA+/NlBGJC/iJlObpdufXHEJtqcD4Dln4ITCLZpwP3DNZ5NyBFeTkKdv596go3V72qlA==}
+  '@microsoft/api-extractor@7.57.2':
+    resolution: {integrity: sha512-Dih58xLlG+M6k2qVSksk9xJx8HvmJEyK3LcHrcqXE7eK/U7pg/8cTT8j1TKijU4P4639wvCy1zhDuvtjRy+02Q==}
     hasBin: true
 
-  '@microsoft/tsdoc-config@0.17.1':
-    resolution: {integrity: sha512-UtjIFe0C6oYgTnad4q1QP4qXwLhe6tIpNTRStJ2RZEPIkqQPREAwE5spzVxsdn9UaEMUqhh0AqSx3X4nWAKXWw==}
+  '@microsoft/tsdoc-config@0.18.0':
+    resolution: {integrity: sha512-8N/vClYyfOH+l4fLkkr9+myAoR6M7akc8ntBJ4DJdWH2b09uVfr71+LTMpNyG19fNqWDg8KEDZhx5wxuqHyGjw==}
 
-  '@microsoft/tsdoc@0.15.1':
-    resolution: {integrity: sha512-4aErSrCR/On/e5G2hDP0wjooqDdauzEbIq8hIkIe5pXV0rtWJZvdCEKL0ykZxex+IxIwBp0eGeV48hQN07dXtw==}
+  '@microsoft/tsdoc@0.16.0':
+    resolution: {integrity: sha512-xgAyonlVVS+q7Vc7qLW0UrJU7rSFcETRWsqdXZtjzRU8dF+6CkozTK4V4y1LwOX7j8r/vHphjDeMeGI4tNGeGA==}
 
   '@mixpanel/rrdom@2.0.0-alpha.18.2':
     resolution: {integrity: sha512-vX/tbnS14ZzzatC7vOyvAm9tOLU8tof0BuppBlphzEx1YHTSw8DQiAmyAc0AmXidchLV0W+cUHV/WsehPLh2hQ==}
@@ -2308,8 +2382,8 @@ packages:
   '@napi-rs/wasm-runtime@0.2.4':
     resolution: {integrity: sha512-9zESzOO5aDByvhIAsOy9TbpZ0Ur2AJbUI7UT73kcUTS2mxAMHOBaa1st/jAymNoCtvrit99kkzT1FZuXVcgfIQ==}
 
-  '@napi-rs/wasm-runtime@1.1.0':
-    resolution: {integrity: sha512-Fq6DJW+Bb5jaWE69/qOE0D1TUN9+6uWhCeZpdnSBk14pjLcCWR7Q8n49PTSPHazM37JqrsdpEthXy2xn6jWWiA==}
+  '@napi-rs/wasm-runtime@1.1.1':
+    resolution: {integrity: sha512-p64ah1M1ld8xjWv3qbvFwHiFVWrq1yFvV4f7w+mzaqiR4IlSgkqhcRdHwsGgomwzBH51sRY4NEowLxnaBjcW/A==}
 
   '@nodelib/fs.scandir@2.1.5':
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
@@ -2323,26 +2397,21 @@ packages:
     resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
     engines: {node: '>= 8'}
 
-  '@nx/cypress@22.2.4':
-    resolution: {integrity: sha512-wB6BoJO3Q6YULYVlqr+UvFBcyTG9F+Xt81YT5PkA3UMXWNoUvs6dnmrH3sJEbgAUvaMUiclzJUucHqVvy2ucxQ==}
+  '@nx/cypress@22.5.2':
+    resolution: {integrity: sha512-zrBScx4nTJQnRrK/WdNNspsTviOPrBN4+5cTQZ4yZCn9eYasqMTBcKPaCRgFmsPvmA7bU4QbPUeC6u+7iHjlqw==}
     peerDependencies:
       cypress: '>= 13 < 16'
     peerDependenciesMeta:
       cypress:
         optional: true
 
-  '@nx/devkit@22.2.4':
-    resolution: {integrity: sha512-gD68Zj3eYnpqeXFikw6moHChGHXriw64vJv/TPBrJn1jMTwYqRHI+lqXScz5ITuKVL2V58zj6JXE5eZkK2nFCQ==}
+  '@nx/devkit@22.5.2':
+    resolution: {integrity: sha512-5JuCMlU6AwXBKCoMWp1hTyTzjfB5vXL5khmoziZPmnaIBg+gX0Hp13YhWfO1C6/HuXS+i4mor7dtFHukPKWemQ==}
     peerDependencies:
       nx: '>= 21 <= 23 || ^22.0.0-0'
 
-  '@nx/devkit@22.2.6':
-    resolution: {integrity: sha512-XWw0Igo924l82CsT3AjrKZeYCGva4bLRY+ICyqGGgrPe7RPIytOOO4Xnr8SsXD7Gq9Gk4SRScN1PoAfI7NMg4w==}
-    peerDependencies:
-      nx: '>= 21 <= 23 || ^22.0.0-0'
-
-  '@nx/eslint@22.2.4':
-    resolution: {integrity: sha512-hCT7WihltKs/uuNEr2+QxlpoEbciTjVAsombGg+wNimNncS7j64sIupCZ/J/Cet4MniyqNX0BL9EKH7b7x0I2A==}
+  '@nx/eslint@22.5.2':
+    resolution: {integrity: sha512-TDMaZzqJNZYB+6dOtzUPWBJHR5IrV0+i8k5domvHB+kPkynrIvgg8Ys5vRQ4p7j80p7L+KJhR9RgZ04llQ99Lw==}
     peerDependencies:
       '@zkochan/js-yaml': 0.0.7
       eslint: ^8.0.0 || ^9.0.0
@@ -2350,154 +2419,87 @@ packages:
       '@zkochan/js-yaml':
         optional: true
 
-  '@nx/eslint@22.2.6':
-    resolution: {integrity: sha512-O84rusxXR/GJjolW2VrTSO8NVC8DHS9kjOMAdDXjlc16a+CXqjkOLiQHdAoO/qrk/zKSTBGaNhPpqyJ2x8QREQ==}
-    peerDependencies:
-      '@zkochan/js-yaml': 0.0.7
-      eslint: ^8.0.0 || ^9.0.0
-    peerDependenciesMeta:
-      '@zkochan/js-yaml':
-        optional: true
-
-  '@nx/js@22.2.4':
-    resolution: {integrity: sha512-In9d7u2307bk7YaPxRYLVl0Ea1yVcetPUIiyfpwHlnKWplLl4PEYGcOWFANpJNZoBT0YajaHSDBZr/RoW9qLiw==}
+  '@nx/js@22.5.2':
+    resolution: {integrity: sha512-7FO+EYdYgR3tOY0h584jiVw8s4GVoqKZMMXldF7LciTSNS4aApO4Lz79B6gKnR4QGHExcRX/FBd0mznioXCNCQ==}
     peerDependencies:
       verdaccio: ^6.0.5
     peerDependenciesMeta:
       verdaccio:
         optional: true
 
-  '@nx/js@22.2.6':
-    resolution: {integrity: sha512-/UL2prUJJDNTc7gqjM5ZDGQlOTU2fc07s+V+uT4d6JlfygnGb/g9oSaECPWCh2huAVlrZclYGP19N+U4SjcHFg==}
-    peerDependencies:
-      verdaccio: ^6.0.5
-    peerDependenciesMeta:
-      verdaccio:
-        optional: true
-
-  '@nx/nx-darwin-arm64@22.2.4':
-    resolution: {integrity: sha512-pKZuwVihuG/5Xl936YYDOwXswdEJ7WP7h0luW6c4OE0wjA5RvJVjOeOh5xxiC0TljLOI4jyxvAVvRPrWBzxqNA==}
+  '@nx/nx-darwin-arm64@22.5.2':
+    resolution: {integrity: sha512-CPtgK/s4FQ0Y/6WmHpJccOTANve5UjlFajLp+S8Z538zHdc5a5MjJBcXo9oRzKNvhTHoGijr/fCMU2erMrYYtg==}
     cpu: [arm64]
     os: [darwin]
 
-  '@nx/nx-darwin-arm64@22.2.6':
-    resolution: {integrity: sha512-DnaKm1ooehUX6FVdKBR499kD3l7Zu4yXjyjAHm6uvNgYFMB1t1FDCTMdHPDV3ChZoNXsrPqSKQKw3ZEK9WrMYg==}
-    cpu: [arm64]
-    os: [darwin]
-
-  '@nx/nx-darwin-x64@22.2.4':
-    resolution: {integrity: sha512-dRp6z87zUBAAEd+bUT/osLjESUb7ZYMxad/5w2xpkpvxcxB1SVzX2xNNWQuYvmAD0lkFmerKqNzPrcgd9LUfMQ==}
+  '@nx/nx-darwin-x64@22.5.2':
+    resolution: {integrity: sha512-YuFGIpmtMPbMM3QchJttlLFE5oNenE+3mRCWcMNrXPOixsw28flvYWhFcHE3CPV8q/E+Yg0FsOG+8u1p7eEgWg==}
     cpu: [x64]
     os: [darwin]
 
-  '@nx/nx-darwin-x64@22.2.6':
-    resolution: {integrity: sha512-2XVLo6tgD6peM8K3hOg7X5GjCYFwpYwhspJZ2+y8OiaWxOS/qKOkR80wZEjzOf51G1BSuLYWmusfW2HozrqaqQ==}
-    cpu: [x64]
-    os: [darwin]
-
-  '@nx/nx-freebsd-x64@22.2.4':
-    resolution: {integrity: sha512-Z1PcgASVBISdM84LTiWE3oQrv4t8bKgOQn2JubuFvbZ4E96LsPvO3KotB+m19BMCamIMx+LJp3QBHodIJpXU0w==}
+  '@nx/nx-freebsd-x64@22.5.2':
+    resolution: {integrity: sha512-Oy3jejPB7lszxAf4rdTpJfOBVgAUtkUZJCLTdGdnpveF/m3s9MN9DaeEXgUs0mMp1qV3Y0KE3KcVHqII54AoBQ==}
     cpu: [x64]
     os: [freebsd]
 
-  '@nx/nx-freebsd-x64@22.2.6':
-    resolution: {integrity: sha512-PiXRKevdQ0R9UnKo9iB8fM2gYb/frPvePH/ZnXNM6ufBztLhXYROAeZED90kjy7PmuG3KMXPMF19HioJ8JVD0w==}
-    cpu: [x64]
-    os: [freebsd]
-
-  '@nx/nx-linux-arm-gnueabihf@22.2.4':
-    resolution: {integrity: sha512-nSXt8q7M60syXhtT3+cglD0pLEpvoduWJKDaCWPXpB1bjdnBuiHrjU0PWskZOfDtbC/TiqEHVEPJZSKqiyM0aA==}
+  '@nx/nx-linux-arm-gnueabihf@22.5.2':
+    resolution: {integrity: sha512-38bZGStG6bZ+R7ZbGxvnDVjVrV6bRTsiX8rr3fmM/AkEfvgyhWgE3R+xqUHoJVM4PK0I2YlYoSjIny4gFeOBxQ==}
     cpu: [arm]
     os: [linux]
 
-  '@nx/nx-linux-arm-gnueabihf@22.2.6':
-    resolution: {integrity: sha512-/gOvH/4ssB9jBdYpK50myTDkgVkZn74XVL5Abc7AWbJo9z038YGljBKP9zO0bAL/X9KpMD20qUAQqvPs5jA47A==}
-    cpu: [arm]
-    os: [linux]
-
-  '@nx/nx-linux-arm64-gnu@22.2.4':
-    resolution: {integrity: sha512-RcVICKulADKSKgLpLLtBqbf6HInWUrVznnrELNUkRbAmcf89KcaZD49VZROADTe8hHYeSw1JGqmiUuvP30KY2g==}
+  '@nx/nx-linux-arm64-gnu@22.5.2':
+    resolution: {integrity: sha512-D+tPXB0tkSuDPsuXvyQIsF3f3PBWfAwIe9FkBWtVoDVYqE+jbz+tVGsjQMNWGafLE4sC8ZQdjhsxyT8I53Anbw==}
     cpu: [arm64]
     os: [linux]
 
-  '@nx/nx-linux-arm64-gnu@22.2.6':
-    resolution: {integrity: sha512-mW13bpfNalzm1X2UVBkmPJTI++NntjWHVv0TNFPXKTm3W8nBYd5uoN+EC3YRw8AoVqFR+pNkit5kHRSLFjjx3A==}
+  '@nx/nx-linux-arm64-musl@22.5.2':
+    resolution: {integrity: sha512-UbO527qqa8KLBi13uXto5SmxcZv1Smer7sPexJonshDlmrJsyvx5m8nm6tcSv04W5yQEL90vPlTux8dNvEDWrw==}
     cpu: [arm64]
     os: [linux]
 
-  '@nx/nx-linux-arm64-musl@22.2.4':
-    resolution: {integrity: sha512-I1Er5bUJ/cXq/82KgFVd/u1F4urzcegPXTqI8H/TIrhNIf3jCNThXsbOvDb8R8pGzq8QgIojkF2HiL5BRvKf7w==}
-    cpu: [arm64]
-    os: [linux]
-
-  '@nx/nx-linux-arm64-musl@22.2.6':
-    resolution: {integrity: sha512-9gHCDIjf8dsEZyQFHZvB4Kp/e649lxf1Df/tExpoedLct91vrluTzbDKvXILg2FkaNUehryZYFSQy3y5Qpl5iQ==}
-    cpu: [arm64]
-    os: [linux]
-
-  '@nx/nx-linux-x64-gnu@22.2.4':
-    resolution: {integrity: sha512-5n2+0Hl+baEtsWjK9Mh4ipCwIyxbGCQs6cEzDjf9MlscL7YvYRlUub4tLBU3qREFfycm2RExWoRbb5BSGNpRHg==}
+  '@nx/nx-linux-x64-gnu@22.5.2':
+    resolution: {integrity: sha512-wR6596Vr/Z+blUAmjLHG2TCQMs4O1oi9JXK1J/PoPeO9UqdHwStCJBAd61zDFSUYJe0x+dkeRQu96fE5BW8Kcg==}
     cpu: [x64]
     os: [linux]
 
-  '@nx/nx-linux-x64-gnu@22.2.6':
-    resolution: {integrity: sha512-7m3gcJ1FEFEqZtYXhKHnY2+b+WEP2oK1PjBdVoa9YW1QXgCGLUXyEb703eMM7vAtLR0mM2/ih+o2WNSRze+tgg==}
+  '@nx/nx-linux-x64-musl@22.5.2':
+    resolution: {integrity: sha512-MBXOw4AH4FWl4orwVykj/e75awTNDePogrl3pXNX9NcQLdj6JzS4e2jaALQeRBQLxQzeFvFQV/W4PBzoPV6/NA==}
     cpu: [x64]
     os: [linux]
 
-  '@nx/nx-linux-x64-musl@22.2.4':
-    resolution: {integrity: sha512-89KSy981mS4nvO2n7UpbDEpj2J3EyuIbSBrjXQ7hCBO+1b7/KNRBnxJ6Lspo689A7FUguHweC+wbIqvhuXT2mg==}
-    cpu: [x64]
-    os: [linux]
-
-  '@nx/nx-linux-x64-musl@22.2.6':
-    resolution: {integrity: sha512-VE7KqT8W4rILaBWrwO5pY3K14fwNMDmQTfdpY2GC5gkpwqkMPBwj4nb2hKY0jzylI1nqR629IT4elmatKTiF4g==}
-    cpu: [x64]
-    os: [linux]
-
-  '@nx/nx-win32-arm64-msvc@22.2.4':
-    resolution: {integrity: sha512-ziFjoeJlYE2eQIwMVsZm6h8Zl5eMSj9EMsE4E3RGWat9oYGJnH8nMZ/bF4OptvHIfiGZs2pHxFtq9wtturaFWw==}
+  '@nx/nx-win32-arm64-msvc@22.5.2':
+    resolution: {integrity: sha512-SaWSZkRH5uV8vP2lj6RRv+kw2IzaIDXkutReOXpooshIWZl9KjrQELNTCZTYyhLDsMlcyhSvLFlTiA4NkZ8udw==}
     cpu: [arm64]
     os: [win32]
 
-  '@nx/nx-win32-arm64-msvc@22.2.6':
-    resolution: {integrity: sha512-uRjerjowcGRa6obKr14Og9JPzonXECnGGVcRjVUFK7BWVc7cT0DlPF2YZXTuOfZhdZWqvd20H/TZEy98vAwjlg==}
-    cpu: [arm64]
-    os: [win32]
-
-  '@nx/nx-win32-x64-msvc@22.2.4':
-    resolution: {integrity: sha512-348+gbvDYyaUKBAjrosqZhhMN2u7gki30dzWBilm1m1g2ya1Gnq55K6fN0fFv4lJJF94PV8JY+9/nA/vUPKiAA==}
+  '@nx/nx-win32-x64-msvc@22.5.2':
+    resolution: {integrity: sha512-IK9Xd5Gh9ys4oun5ko8Uv8AEi2byN2FPXBsR1BLkt93SJ0bJVTdXGyEA+fWmEclLZIM0PiZj1KbCajVn9NEPtw==}
     cpu: [x64]
     os: [win32]
 
-  '@nx/nx-win32-x64-msvc@22.2.6':
-    resolution: {integrity: sha512-LM5wLh69uRXJXPdAffRhezqMYxJQexsZe1JqzeNMQG+k9ZGN+Efi8x3YxlXGb7bYPmDPF+89hfp7j4gYORKkIw==}
-    cpu: [x64]
-    os: [win32]
-
-  '@nx/playwright@22.2.6':
-    resolution: {integrity: sha512-C45BXBrAjm8WjDCweNR/4UHEgYufSibg+T2cjqxK57M2IM7YORajcRb82XbG4IQ6XaBGdxh/9d0wjcYo2CNe6w==}
+  '@nx/playwright@22.5.2':
+    resolution: {integrity: sha512-1ti4+Q5pmEoYtMZBqUwksgAoMvQe5dVeRlgwvb79Oux+UNZYWzjr9Y/HZbAIJpelNCgeA0grofDVBIQkR4c9Ew==}
     peerDependencies:
       '@playwright/test': ^1.36.0
     peerDependenciesMeta:
       '@playwright/test':
         optional: true
 
-  '@nx/storybook@22.2.4':
-    resolution: {integrity: sha512-/I4QhkAXUAiNo+vuqNYGBosZnlfMzWdYHGU/TIzZLhIT344X+xaEuJZhpQUcIg1bT0UhgNvVd/42UfOK9cU4ew==}
+  '@nx/storybook@22.5.2':
+    resolution: {integrity: sha512-B3CZUOXdzoYJEkQqGASxAgKhndixvqK6tIUkUMWq2iarSJTv1nLXq4iu0h9GVFaNv791f6sr5Myhfu3i2RacLg==}
     peerDependencies:
       storybook: '>=7.0.0 <11.0.0'
 
-  '@nx/vite@22.2.6':
-    resolution: {integrity: sha512-eA5I0tkYbGxG9e1FlbQyiTzvNEzeOdDKFfC+qaSfLmFzlVD9/X3SeNd8qBUDKC0MXxDc4BRb5vL63NoEaVPVRA==}
+  '@nx/vite@22.5.2':
+    resolution: {integrity: sha512-E3zTMLfY203lW8RxH+j3U4mR9btSVwWw3mY8XslND0Png1AliZ4fH638moH/eRsJvWS454oSYp86m3FlouSkqA==}
     peerDependencies:
-      vite: ^5.0.0 || ^6.0.0 || ^7.0.0
+      vite: 8.0.0-beta.13
       vitest: ^1.3.1 || ^2.0.0 || ^3.0.0 || ^4.0.0
 
-  '@nx/vitest@22.2.6':
-    resolution: {integrity: sha512-JfZ5qAmb2vf8PKPO0C5DTm0HiRSF7PLPDYJZ+rt1vvJ6i17E5ViwygvBoLfGGLzaV6m4zEJYN0jimAo9LBquAw==}
+  '@nx/vitest@22.5.2':
+    resolution: {integrity: sha512-hKtKB5BInOwub7+3QOolZZvqv89pkaU2+CbN0iD3Wk2BzTfGY/dlcTvvgcEUDRCTMDn7G+G30cyq+nbz6Z+R6A==}
     peerDependencies:
-      vite: ^5.0.0 || ^6.0.0 || ^7.0.0
+      vite: 8.0.0-beta.13
       vitest: ^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0
     peerDependenciesMeta:
       vite:
@@ -2505,106 +2507,90 @@ packages:
       vitest:
         optional: true
 
-  '@nx/workspace@22.2.4':
-    resolution: {integrity: sha512-9tpnGxvrks3a2RKpxgIi/kVvD5wuD5uVm5wCYZX2nlyLtRIjxcTp4pBXBTh4SsuB01FrS+zNRfG6/AWC2uAN5w==}
-
-  '@nx/workspace@22.2.6':
-    resolution: {integrity: sha512-DQnyxoFcf0oDrYIlwAHU4JOxDTA9AKODF3L3JUjNyKqMBSj9Z9o9FEf32wZZCzi0Akf4LDZxyPxU7wz+o1u/WA==}
+  '@nx/workspace@22.5.2':
+    resolution: {integrity: sha512-XImJ2NhUXo/bgNkuF1NAdYJjSzhN/iXZYSdhSREPN6Bh/thhloAQfpOrgFkxgxgNZv3RvldnnYNmGeKqMEW2jg==}
 
   '@one-ini/wasm@0.1.1':
     resolution: {integrity: sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==}
 
-  '@oxc-parser/binding-android-arm64@0.99.0':
-    resolution: {integrity: sha512-V4jhmKXgQQdRnm73F+r3ZY4pUEsijQeSraFeaCGng7abSNJGs76X6l82wHnmjLGFAeY00LWtjcELs7ZmbJ9+lA==}
+  '@opentelemetry/api-logs@0.208.0':
+    resolution: {integrity: sha512-CjruKY9V6NMssL/T1kAFgzosF1v9o6oeN+aX5JB/C/xPNtmgIJqcXHG7fA82Ou1zCpWGl4lROQUKwUNE1pMCyg==}
+    engines: {node: '>=8.0.0'}
+
+  '@opentelemetry/api@1.9.0':
+    resolution: {integrity: sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==}
+    engines: {node: '>=8.0.0'}
+
+  '@opentelemetry/core@2.2.0':
+    resolution: {integrity: sha512-FuabnnUm8LflnieVxs6eP7Z383hgQU4W1e3KJS6aOG3RxWxcHyBxH8fDMHNgu/gFx/M2jvTOW/4/PHhLz6bjWw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/core@2.6.0':
+    resolution: {integrity: sha512-HLM1v2cbZ4TgYN6KEOj+Bbj8rAKriOdkF9Ed3tG25FoprSiQl7kYc+RRT6fUZGOvx0oMi5U67GoFdT+XUn8zEg==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/exporter-logs-otlp-http@0.208.0':
+    resolution: {integrity: sha512-jOv40Bs9jy9bZVLo/i8FwUiuCvbjWDI+ZW13wimJm4LjnlwJxGgB+N/VWOZUTpM+ah/awXeQqKdNlpLf2EjvYg==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/otlp-exporter-base@0.208.0':
+    resolution: {integrity: sha512-gMd39gIfVb2OgxldxUtOwGJYSH8P1kVFFlJLuut32L6KgUC4gl1dMhn+YC2mGn0bDOiQYSk/uHOdSjuKp58vvA==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/otlp-transformer@0.208.0':
+    resolution: {integrity: sha512-DCFPY8C6lAQHUNkzcNT9R+qYExvsk6C5Bto2pbNxgicpcSWbe2WHShLxkOxIdNcBiYPdVHv/e7vH7K6TI+C+fQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/resources@2.2.0':
+    resolution: {integrity: sha512-1pNQf/JazQTMA0BiO5NINUzH0cbLbbl7mntLa4aJNmCCXSj0q03T5ZXXL0zw4G55TjdL9Tz32cznGClf+8zr5A==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.3.0 <1.10.0'
+
+  '@opentelemetry/resources@2.6.0':
+    resolution: {integrity: sha512-D4y/+OGe3JSuYUCBxtH5T9DSAWNcvCb/nQWIga8HNtXTVPQn59j0nTBAgaAXxUVBDl40mG3Tc76b46wPlZaiJQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.3.0 <1.10.0'
+
+  '@opentelemetry/sdk-logs@0.208.0':
+    resolution: {integrity: sha512-QlAyL1jRpOeaqx7/leG1vJMp84g0xKP6gJmfELBpnI4O/9xPX+Hu5m1POk9Kl+veNkyth5t19hRlN6tNY1sjbA==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.4.0 <1.10.0'
+
+  '@opentelemetry/sdk-metrics@2.2.0':
+    resolution: {integrity: sha512-G5KYP6+VJMZzpGipQw7Giif48h6SGQ2PFKEYCybeXJsOCB4fp8azqMAAzE5lnnHK3ZVwYQrgmFbsUJO/zOnwGw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.9.0 <1.10.0'
+
+  '@opentelemetry/sdk-trace-base@2.2.0':
+    resolution: {integrity: sha512-xWQgL0Bmctsalg6PaXExmzdedSp3gyKV8mQBwK/j9VGdCDu2fmXIb2gAehBKbkXCpJ4HPkgv3QfoJWRT4dHWbw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.3.0 <1.10.0'
+
+  '@opentelemetry/semantic-conventions@1.40.0':
+    resolution: {integrity: sha512-cifvXDhcqMwwTlTK04GBNeIe7yyo28Mfby85QXFe1Yk8nmi36Ab/5UQwptOx84SsoGNRg+EVSjwzfSZMy6pmlw==}
+    engines: {node: '>=14'}
+
+  '@oxc-project/runtime@0.112.0':
+    resolution: {integrity: sha512-4vYtWXMnXM6EaweCxbJ6bISAhkNHeN33SihvuX3wrpqaSJA4ZEoW35i9mSvE74+GDf1yTeVE+aEHA+WBpjDk/g==}
     engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [arm64]
-    os: [android]
 
-  '@oxc-parser/binding-darwin-arm64@0.99.0':
-    resolution: {integrity: sha512-Rp41nf9zD5FyLZciS9l1GfK8PhYqrD5kEGxyTOA2esTLeAy37rZxetG2E3xteEolAkeb2WDkVrlxPtibeAncMg==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [arm64]
-    os: [darwin]
-
-  '@oxc-parser/binding-darwin-x64@0.99.0':
-    resolution: {integrity: sha512-WVonp40fPPxo5Gs0POTI57iEFv485TvNKOHMwZRhigwZRhZY2accEAkYIhei9eswF4HN5B44Wybkz7Gd1Qr/5Q==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [x64]
-    os: [darwin]
-
-  '@oxc-parser/binding-freebsd-x64@0.99.0':
-    resolution: {integrity: sha512-H30bjOOttPmG54gAqu6+HzbLEzuNOYO2jZYrIq4At+NtLJwvNhXz28Hf5iEAFZIH/4hMpLkM4VN7uc+5UlNW3Q==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [x64]
-    os: [freebsd]
-
-  '@oxc-parser/binding-linux-arm-gnueabihf@0.99.0':
-    resolution: {integrity: sha512-0Z/Th0SYqzSRDPs6tk5lQdW0i73UCupnim3dgq2oW0//UdLonV/5wIZCArfKGC7w9y4h8TxgXpgtIyD1kKzzlQ==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [arm]
-    os: [linux]
-
-  '@oxc-parser/binding-linux-arm-musleabihf@0.99.0':
-    resolution: {integrity: sha512-xo0wqNd5bpbzQVNpAIFbHk1xa+SaS/FGBABCd942SRTnrpxl6GeDj/s1BFaGcTl8MlwlKVMwOcyKrw/2Kdfquw==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [arm]
-    os: [linux]
-
-  '@oxc-parser/binding-linux-arm64-gnu@0.99.0':
-    resolution: {integrity: sha512-u26I6LKoLTPTd4Fcpr0aoAtjnGf5/ulMllo+QUiBhupgbVCAlaj4RyXH/mvcjcsl2bVBv9E/gYJZz2JjxQWXBA==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [arm64]
-    os: [linux]
-
-  '@oxc-parser/binding-linux-arm64-musl@0.99.0':
-    resolution: {integrity: sha512-qhftDo2D37SqCEl3ZTa367NqWSZNb1Ddp34CTmShLKFrnKdNiUn55RdokLnHtf1AL5ssaQlYDwBECX7XiBWOhw==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [arm64]
-    os: [linux]
-
-  '@oxc-parser/binding-linux-riscv64-gnu@0.99.0':
-    resolution: {integrity: sha512-zxn/xkf519f12FKkpL5XwJipsylfSSnm36h6c1zBDTz4fbIDMGyIhHfWfwM7uUmHo9Aqw1pLxFpY39Etv398+Q==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [riscv64]
-    os: [linux]
-
-  '@oxc-parser/binding-linux-s390x-gnu@0.99.0':
-    resolution: {integrity: sha512-Y1eSDKDS5E4IVC7Oxw+NbYAKRmJPMJTIjW+9xOWwteDHkFqpocKe0USxog+Q1uhzalD9M0p9eXWEWdGQCMDBMQ==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [s390x]
-    os: [linux]
-
-  '@oxc-parser/binding-linux-x64-gnu@0.99.0':
-    resolution: {integrity: sha512-YVJMfk5cFWB8i2/nIrbk6n15bFkMHqWnMIWkVx7r2KwpTxHyFMfu2IpeVKo1ITDSmt5nBrGdLHD36QRlu2nDLg==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [x64]
-    os: [linux]
-
-  '@oxc-parser/binding-linux-x64-musl@0.99.0':
-    resolution: {integrity: sha512-2+SDPrie5f90A1b9EirtVggOgsqtsYU5raZwkDYKyS1uvJzjqHCDhG/f4TwQxHmIc5YkczdQfwvN91lwmjsKYQ==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [x64]
-    os: [linux]
-
-  '@oxc-parser/binding-wasm32-wasi@0.99.0':
-    resolution: {integrity: sha512-DKA4j0QerUWSMADziLM5sAyM7V53Fj95CV9SjP77bPfEfT7MnvFKnneaRMqPK1cpzjAGiQF52OBUIKyk0dwOQA==}
-    engines: {node: '>=14.0.0'}
-    cpu: [wasm32]
-
-  '@oxc-parser/binding-win32-arm64-msvc@0.99.0':
-    resolution: {integrity: sha512-EaB3AvsxqdNUhh9FOoAxRZ2L4PCRwDlDb//QXItwyOJrX7XS+uGK9B1KEUV4FZ/7rDhHsWieLt5e07wl2Ti5AQ==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [arm64]
-    os: [win32]
-
-  '@oxc-parser/binding-win32-x64-msvc@0.99.0':
-    resolution: {integrity: sha512-sJN1Q8h7ggFOyDn0zsHaXbP/MklAVUvhrbq0LA46Qum686P3SZQHjbATqJn9yaVEvaSKXCshgl0vQ1gWkGgpcQ==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-    cpu: [x64]
-    os: [win32]
-
-  '@oxc-project/types@0.99.0':
-    resolution: {integrity: sha512-LLDEhXB7g1m5J+woRSgfKsFPS3LhR9xRhTeIoEBm5WrkwMxn6eZ0Ld0c0K5eHB57ChZX6I3uSmmLjZ8pcjlRcw==}
+  '@oxc-project/types@0.112.0':
+    resolution: {integrity: sha512-m6RebKHIRsax2iCwVpYW2ErQwa4ywHJrE4sCK3/8JK8ZZAWOKXaRJFl/uP51gaVyyXlaS4+chU1nSCdzYf6QqQ==}
 
   '@oxc-resolver/binding-android-arm-eabi@11.15.0':
     resolution: {integrity: sha512-Q+lWuFfq7whNelNJIP1dhXaVz4zO9Tu77GcQHyxDWh3MaCoO2Bisphgzmsh4ZoUe2zIchQh6OvQL99GlWHg9Tw==}
@@ -2706,78 +2692,266 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@oxlint-tsgolint/darwin-arm64@0.9.1':
-    resolution: {integrity: sha512-vk+8kChWqN+F+QUOvp4/6jDTlDCzXPgYGkxdi6EOUSOmCP1ix0uYOlIi/ytH2imXmC8YfPgLR/1BhqbsuDKuew==}
+  '@oxfmt/binding-android-arm-eabi@0.34.0':
+    resolution: {integrity: sha512-sqkqjh/Z38l+duOb1HtVqJTAj1grt2ttkobCopC/72+a4Xxz4xUgZPFyQ4HxrYMvyqO/YA0tvM1QbfOu70Gk1Q==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [android]
+
+  '@oxfmt/binding-android-arm64@0.34.0':
+    resolution: {integrity: sha512-1KRCtasHcVcGOMwfOP9d5Bus2NFsN8yAYM5cBwi8LBg5UtXC3C49WHKrlEa8iF1BjOS6CR2qIqiFbGoA0DJQNQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [android]
+
+  '@oxfmt/binding-darwin-arm64@0.34.0':
+    resolution: {integrity: sha512-b+Rmw9Bva6e/7PBES2wLO8sEU7Mi0+/Kv+pXSe/Y8i4fWNftZZlGwp8P01eECaUqpXATfSgNxdEKy7+ssVNz7g==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
 
-  '@oxlint-tsgolint/darwin-x64@0.9.1':
-    resolution: {integrity: sha512-yXmqr7El17+Oo56fWkPdUluU8d0jWxwRwAe1QZ0Xprxul9FHJeR/O2oYuBUngvCi02dbt0VZlwgJXcljQEdHlQ==}
+  '@oxfmt/binding-darwin-x64@0.34.0':
+    resolution: {integrity: sha512-QGjpevWzf1T9COEokZEWt80kPOtthW1zhRbo7x4Qoz646eTTfi6XsHG2uHeDWJmTbgBoJZPMgj2TAEV/ppEZaA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
 
-  '@oxlint-tsgolint/linux-arm64@0.9.1':
-    resolution: {integrity: sha512-ukLb35BHSsxXaVEe8eIvYXMTxOdv8K4CySmtkWyc0pJT0q8zh85by1bsREWAP2hZc0wN0ClHjZHPdKY3958Jwg==}
+  '@oxfmt/binding-freebsd-x64@0.34.0':
+    resolution: {integrity: sha512-VMSaC02cG75qL59M9M/szEaqq/RsLfgpzQ4nqUu8BUnX1zkiZIW2gTpUv3ZJ6qpWnHxIlAXiRZjQwmcwpvtbcg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@oxfmt/binding-linux-arm-gnueabihf@0.34.0':
+    resolution: {integrity: sha512-Klm367PFJhH6vYK3vdIOxFepSJZHPaBfIuqwxdkOcfSQ4qqc/M8sgK0UTFnJWWTA/IkhMIh1kW6uEqiZ/xtQqg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [linux]
+
+  '@oxfmt/binding-linux-arm-musleabihf@0.34.0':
+    resolution: {integrity: sha512-nqn0QueVXRfbN9m58/E9Zij0Ap8lzayx591eWBYn0sZrGzY1IRv9RYS7J/1YUXbb0Ugedo0a8qIWzUHU9bWQuA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [linux]
+
+  '@oxfmt/binding-linux-arm64-gnu@0.34.0':
+    resolution: {integrity: sha512-DDn+dcqW+sMTCEjvLoQvC/VWJjG7h8wcdN/J+g7ZTdf/3/Dx730pQElxPPGsCXPhprb11OsPyMp5FwXjMY3qvA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
 
-  '@oxlint-tsgolint/linux-x64@0.9.1':
-    resolution: {integrity: sha512-kkxSS/meANLun4dHep2wnfvo8OHJKgdxzuY3RoooSWorVqw3/K5Qttmo0OQFt7UNq/oisn0YTaNhV28S0nAWyQ==}
+  '@oxfmt/binding-linux-arm64-musl@0.34.0':
+    resolution: {integrity: sha512-H+F8+71gHQoGTFPPJ6z4dD0Fzfzi0UP8Zx94h5kUmIFThLvMq5K1Y/bUUubiXwwHfwb5C3MPjUpYijiy0rj51Q==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+
+  '@oxfmt/binding-linux-ppc64-gnu@0.34.0':
+    resolution: {integrity: sha512-dIGnzTNhCXqQD5pzBwduLg8pClm+t8R53qaE9i5h8iua1iaFAJyLffh4847CNZSlASb7gn1Ofuv7KoG/EpoGZg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@oxfmt/binding-linux-riscv64-gnu@0.34.0':
+    resolution: {integrity: sha512-FGQ2GTTooilDte/ogwWwkHuuL3lGtcE3uKM2EcC7kOXNWdUfMY6Jx3JCodNVVbFoybv4A+HuCj8WJji2uu1Ceg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@oxfmt/binding-linux-riscv64-musl@0.34.0':
+    resolution: {integrity: sha512-2dGbGneJ7ptOIVKMwEIHdCkdZEomh74X3ggo4hCzEXL/rl9HwfsZDR15MkqfQqAs6nVXMvtGIOMxjDYa5lwKaA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@oxfmt/binding-linux-s390x-gnu@0.34.0':
+    resolution: {integrity: sha512-cCtGgmrTrxq3OeSG0UAO+w6yLZTMeOF4XM9SAkNrRUxYhRQELSDQ/iNPCLyHhYNi38uHJQbS5RQweLUDpI4ajA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [s390x]
+    os: [linux]
+
+  '@oxfmt/binding-linux-x64-gnu@0.34.0':
+    resolution: {integrity: sha512-7AvMzmeX+k7GdgitXp99GQoIV/QZIpAS7rwxQvC/T541yWC45nwvk4mpnU8N+V6dE5SPEObnqfhCjO80s7qIsg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
 
-  '@oxlint-tsgolint/win32-arm64@0.9.1':
-    resolution: {integrity: sha512-F9tiZZRn3x+kjXJC8GAE5C5xkvD8b8unoFeh7mS5W4USAH8+AzYydzLev5rAW2uXdOqtkO30EJl0ygl68Zlb8w==}
+  '@oxfmt/binding-linux-x64-musl@0.34.0':
+    resolution: {integrity: sha512-uNiglhcmivJo1oDMh3hoN/Z0WsbEXOpRXZdQ3W/IkOpyV8WF308jFjSC1ZxajdcNRXWej0zgge9QXba58Owt+g==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+
+  '@oxfmt/binding-openharmony-arm64@0.34.0':
+    resolution: {integrity: sha512-5eFsTjCyji25j6zznzlMc+wQAZJoL9oWy576xhqd2efv+N4g1swIzuSDcb1dz4gpcVC6veWe9pAwD7HnrGjLwg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [openharmony]
+
+  '@oxfmt/binding-win32-arm64-msvc@0.34.0':
+    resolution: {integrity: sha512-6id8kK0t5hKfbV6LHDzRO21wRTA6ctTlKGTZIsG/mcoir0rssvaYsedUymF4HDj7tbCUlnxCX/qOajKlEuqbIw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
 
-  '@oxlint-tsgolint/win32-x64@0.9.1':
-    resolution: {integrity: sha512-DKTBgKUbycKNYgpWpglEHzkgiNVSG1rZmfiqw7w31keAq8q7avNGhz2WNmsRvXh8IGNw1PMb7vgxwUK8eyXIeg==}
+  '@oxfmt/binding-win32-ia32-msvc@0.34.0':
+    resolution: {integrity: sha512-QHaz+w673mlYqn9v/+fuiKZpjkmagleXQ+NygShDv8tdHpRYX2oYhTJwwt9j1ZfVhRgza1EIUW3JmzCXmtPdhQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [ia32]
+    os: [win32]
+
+  '@oxfmt/binding-win32-x64-msvc@0.34.0':
+    resolution: {integrity: sha512-CXKQM/VaF+yuvGru8ktleHLJoBdjBtTFmAsLGePiESiTN0NjCI/PiaiOCfHMJ1HdP1LykvARUwMvgaN3tDhcrg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
 
-  '@oxlint/darwin-arm64@1.33.0':
-    resolution: {integrity: sha512-PmEQDLHAxiAdyttQ1ZWXd+5VpHLbHf3FTMJL9bg5TZamDnhNiW/v0Pamv3MTAdymnoDI3H8IVLAN/SAseV/adw==}
+  '@oxlint-tsgolint/darwin-arm64@0.14.2':
+    resolution: {integrity: sha512-03WxIXguCXf1pTmoG2C6vqRcbrU9GaJCW6uTIiQdIQq4BrJnVWZv99KEUQQRkuHK78lOLa9g7B4K58NcVcB54g==}
     cpu: [arm64]
     os: [darwin]
 
-  '@oxlint/darwin-x64@1.33.0':
-    resolution: {integrity: sha512-2R9aH3kR0X2M30z5agGikv3tfNTi8/uLhU5/tYktu33VGUXpbf0OLZSlD25UEuwOKAlf3RVtzV5oDyjoq93JuQ==}
+  '@oxlint-tsgolint/darwin-x64@0.14.2':
+    resolution: {integrity: sha512-ksMLl1cIWz3Jw+U79BhyCPdvohZcJ/xAKri5bpT6oeEM2GVnQCHBk/KZKlYrd7hZUTxz0sLnnKHE11XFnLASNQ==}
     cpu: [x64]
     os: [darwin]
 
-  '@oxlint/linux-arm64-gnu@1.33.0':
-    resolution: {integrity: sha512-yb/k8GaMDgnX2LyO6km33kKItZ/n573SlbiHBBFU2HmeU7tzEHL5jHkHQXXcysUkapmqHd7UsDhOZDqPmXaQRg==}
+  '@oxlint-tsgolint/linux-arm64@0.14.2':
+    resolution: {integrity: sha512-2BgR535w7GLxBCyQD5DR3dBzbAgiBbG5QX1kAEVzOmWxJhhGxt5lsHdHebRo7ilukYLpBDkerz0mbMErblghCQ==}
     cpu: [arm64]
     os: [linux]
 
-  '@oxlint/linux-arm64-musl@1.33.0':
-    resolution: {integrity: sha512-03pt9IO1C4ZfVOW6SQiOK26mzklAhLM3Kc79OXpX1kgZRlxk+rvFoMhlgCOzn7tEdrEgbePkBoxNnwDnJDFqJQ==}
-    cpu: [arm64]
-    os: [linux]
-
-  '@oxlint/linux-x64-gnu@1.33.0':
-    resolution: {integrity: sha512-Z7ImLWM50FoVXzYvyxUQ+QwBkBfRyK4YdLEGonyAGMp7iT3DksonDaTK9ODnJ1qHyAyAZCvuqXD7AEDsDvzDbA==}
+  '@oxlint-tsgolint/linux-x64@0.14.2':
+    resolution: {integrity: sha512-TUHFyVHfbbGtnTQZbUFgwvv3NzXBgzNLKdMUJw06thpiC7u5OW5qdk4yVXIC/xeVvdl3NAqTfcT4sA32aiMubg==}
     cpu: [x64]
     os: [linux]
 
-  '@oxlint/linux-x64-musl@1.33.0':
-    resolution: {integrity: sha512-idb55Uzu5kkqqpMiVUfI9nP7zOqPZinQKsIRQAIU40wILcf/ijvhNZKIu3ucDMmye0n6IWOaSnxIRL5W2fNoUQ==}
-    cpu: [x64]
-    os: [linux]
-
-  '@oxlint/win32-arm64@1.33.0':
-    resolution: {integrity: sha512-wKKFt7cubfrLelNzdmDsNSmtBrlSUe1fWus587+uSxDZdpFbQ7liU0gsUlCbcHvym0H1Tc2O3K3cnLrgQORLPQ==}
+  '@oxlint-tsgolint/win32-arm64@0.14.2':
+    resolution: {integrity: sha512-OfYHa/irfVggIFEC4TbawsI7Hwrttppv//sO/e00tu4b2QRga7+VHAwtCkSFWSr0+BsO4InRYVA0+pun5BinpQ==}
     cpu: [arm64]
     os: [win32]
 
-  '@oxlint/win32-x64@1.33.0':
-    resolution: {integrity: sha512-ReyR8rNHjKNnO7dxGny9RCPELRAdhm3y780FNBcA07E1wvxSCkB+Mn5db0Pa5bRmxrsU/MTZ/aaBFa+ERXDdXw==}
+  '@oxlint-tsgolint/win32-x64@0.14.2':
+    resolution: {integrity: sha512-5gxwbWYE2pP+pzrO4SEeYvLk4N609eAe18rVXUx+en3qtHBkU8VM2jBmMcZdIHn+G05leu4pYvwAvw6tvT9VbA==}
     cpu: [x64]
     os: [win32]
 
-  '@phenomnomnominal/tsquery@5.0.1':
-    resolution: {integrity: sha512-3nVv+e2FQwsW8Aw6qTU6f+1rfcJ3hrcnvH/mu9i8YhxO+9sqbOfpL8m6PbET5+xKOlz/VSbp0RoYWYCtIsnmuA==}
+  '@oxlint/binding-android-arm-eabi@1.49.0':
+    resolution: {integrity: sha512-2WPoh/2oK9r/i2R4o4J18AOrm3HVlWiHZ8TnuCaS4dX8m5ZzRmHW0I3eLxEurQLHWVruhQN7fHgZnah+ag5iQg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [android]
+
+  '@oxlint/binding-android-arm64@1.49.0':
+    resolution: {integrity: sha512-YqJAGvNB11EzoKm1euVhZntb79alhMvWW/j12bYqdvVxn6xzEQWrEDCJg9BPo3A3tBCSUBKH7bVkAiCBqK/L1w==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [android]
+
+  '@oxlint/binding-darwin-arm64@1.49.0':
+    resolution: {integrity: sha512-WFocCRlvVkMhChCJ2qpJfp1Gj/IjvyjuifH9Pex8m8yHonxxQa3d8DZYreuDQU3T4jvSY8rqhoRqnpc61Nlbxw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@oxlint/binding-darwin-x64@1.49.0':
+    resolution: {integrity: sha512-BN0KniwvehbUfYztOMwEDkYoojGm/narf5oJf+/ap+6PnzMeWLezMaVARNIS0j3OdMkjHTEP8s3+GdPJ7WDywQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [darwin]
+
+  '@oxlint/binding-freebsd-x64@1.49.0':
+    resolution: {integrity: sha512-SnkAc/DPIY6joMCiP/+53Q+N2UOGMU6ULvbztpmvPJNF/jYPGhNbKtN982uj2Gs6fpbxYkmyj08QnpkD4fbHJA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@oxlint/binding-linux-arm-gnueabihf@1.49.0':
+    resolution: {integrity: sha512-6Z3EzRvpQVIpO7uFhdiGhdE8Mh3S2VWKLL9xuxVqD6fzPhyI3ugthpYXlCChXzO8FzcYIZ3t1+Kau+h2NY1hqA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [linux]
+
+  '@oxlint/binding-linux-arm-musleabihf@1.49.0':
+    resolution: {integrity: sha512-wdjXaQYAL/L25732mLlngfst4Jdmi/HLPVHb3yfCoP5mE3lO/pFFrmOJpqWodgv29suWY74Ij+RmJ/YIG5VuzQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [linux]
+
+  '@oxlint/binding-linux-arm64-gnu@1.49.0':
+    resolution: {integrity: sha512-oSHpm8zmSvAG1BWUumbDRSg7moJbnwoEXKAkwDf/xTQJOzvbUknq95NVQdw/AduZr5dePftalB8rzJNGBogUMg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+
+  '@oxlint/binding-linux-arm64-musl@1.49.0':
+    resolution: {integrity: sha512-xeqkMOARgGBlEg9BQuPDf6ZW711X6BT5qjDyeM5XNowCJeTSdmMhpePJjTEiVbbr3t21sIlK8RE6X5bc04nWyQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+
+  '@oxlint/binding-linux-ppc64-gnu@1.49.0':
+    resolution: {integrity: sha512-uvcqRO6PnlJGbL7TeePhTK5+7/JXbxGbN+C6FVmfICDeeRomgQqrfVjf0lUrVpUU8ii8TSkIbNdft3M+oNlOsQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@oxlint/binding-linux-riscv64-gnu@1.49.0':
+    resolution: {integrity: sha512-Dw1HkdXAwHNH+ZDserHP2RzXQmhHtpsYYI0hf8fuGAVCIVwvS6w1+InLxpPMY25P8ASRNiFN3hADtoh6lI+4lg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@oxlint/binding-linux-riscv64-musl@1.49.0':
+    resolution: {integrity: sha512-EPlMYaA05tJ9km/0dI9K57iuMq3Tw+nHst7TNIegAJZrBPtsOtYaMFZEaWj02HA8FI5QvSnRHMt+CI+RIhXJBQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@oxlint/binding-linux-s390x-gnu@1.49.0':
+    resolution: {integrity: sha512-yZiQL9qEwse34aMbnMb5VqiAWfDY+fLFuoJbHOuzB1OaJZbN1MRF9Nk+W89PIpGr5DNPDipwjZb8+Q7wOywoUQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [s390x]
+    os: [linux]
+
+  '@oxlint/binding-linux-x64-gnu@1.49.0':
+    resolution: {integrity: sha512-CcCDwMMXSchNkhdgvhVn3DLZ4EnBXAD8o8+gRzahg+IdSt/72y19xBgShJgadIRF0TsRcV/MhDUMwL5N/W54aQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+
+  '@oxlint/binding-linux-x64-musl@1.49.0':
+    resolution: {integrity: sha512-u3HfKV8BV6t6UCCbN0RRiyqcymhrnpunVmLFI8sEa5S/EBu+p/0bJ3D7LZ2KT6PsBbrB71SWq4DeFrskOVgIZg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+
+  '@oxlint/binding-openharmony-arm64@1.49.0':
+    resolution: {integrity: sha512-dRDpH9fw+oeUMpM4br0taYCFpW6jQtOuEIec89rOgDA1YhqwmeRcx0XYeCv7U48p57qJ1XZHeMGM9LdItIjfzA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [openharmony]
+
+  '@oxlint/binding-win32-arm64-msvc@1.49.0':
+    resolution: {integrity: sha512-6rrKe/wL9tn0qnOy76i1/0f4Dc3dtQnibGlU4HqR/brVHlVjzLSoaH0gAFnLnznh9yQ6gcFTBFOPrcN/eKPDGA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [win32]
+
+  '@oxlint/binding-win32-ia32-msvc@1.49.0':
+    resolution: {integrity: sha512-CXHLWAtLs2xG/aVy1OZiYJzrULlq0QkYpI6cd7VKMrab+qur4fXVE/B1Bp1m0h1qKTj5/FTGg6oU4qaXMjS/ug==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [ia32]
+    os: [win32]
+
+  '@oxlint/binding-win32-x64-msvc@1.49.0':
+    resolution: {integrity: sha512-VteIelt78kwzSglOozaQcs6BCS4Lk0j+QA+hGV0W8UeyaqQ3XpbZRhDU55NW1PPvCy1tg4VXsTlEaPovqto7nQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [win32]
+
+  '@phenomnomnominal/tsquery@6.1.4':
+    resolution: {integrity: sha512-3tHlGy/fxjJCHqIV8nelAzbRTNkCUY+k7lqBGKNuQz99H2OKGRt6oU+U2SZs6LYrbOe8mxMFl6kq6gzHapFRkw==}
     peerDependencies:
       typescript: ^3 || ^4 || ^5
 
@@ -2794,8 +2968,8 @@ packages:
     resolution: {integrity: sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==}
     engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
 
-  '@playwright/test@1.57.0':
-    resolution: {integrity: sha512-6TyEnHgd6SArQO8UO2OMTxshln3QMWBtPGrOCgs3wVEmQmwyuNtB10IZMfmYDE0riwNR1cu4q+pPcxMVtaG3TA==}
+  '@playwright/test@1.58.1':
+    resolution: {integrity: sha512-6LdVIUERWxQMmUSSQi0I53GgCBYgM2RpGngCPY7hSeju+VrKjq3lvs7HpJoPbDiY5QM5EYRtRX5fvrinnMAz3w==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -2807,16 +2981,18 @@ packages:
     resolution: {integrity: sha512-YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA==}
     engines: {node: '>=12.22.0'}
 
-  '@pnpm/npm-conf@2.3.1':
-    resolution: {integrity: sha512-c83qWb22rNRuB0UaVCI0uRPNRr8Z0FWnEIvT47jiHAmOIUHbBOg5XvV7pM5x+rKn9HRpjxquDbXYSXr3fAKFcw==}
+  '@pnpm/npm-conf@3.0.2':
+    resolution: {integrity: sha512-h104Kh26rR8tm+a3Qkc5S4VLYint3FE48as7+/5oCEcKR2idC/pF1G6AhIXKI+eHPJa/3J9i5z0Al47IeGHPkA==}
     engines: {node: '>=12'}
 
   '@polka/url@1.0.0-next.29':
     resolution: {integrity: sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==}
 
-  '@prettier/plugin-oxc@0.1.3':
-    resolution: {integrity: sha512-aABz3zIRilpWMekbt1FL1JVBQrQLR8L4Td2SRctECrWSsXGTNn/G1BqNSKCdbvQS1LWstAXfqcXzDki7GAAJyg==}
-    engines: {node: '>=14'}
+  '@posthog/core@1.23.2':
+    resolution: {integrity: sha512-zTDdda9NuSHrnwSOfFMxX/pyXiycF4jtU1kTr8DL61dHhV+7LF6XF1ndRZZTuaGGbfbb/GJYkEsjEX9SXfNZeQ==}
+
+  '@posthog/types@1.358.1':
+    resolution: {integrity: sha512-SFfhm+NHYqsk+SAxx5FlSg9FuvqsEPZidfTjPP5TYYM24fif//L+pAzxVGqaxJcnyZojIfF66NRZ3NfM5Jd+eg==}
 
   '@primeuix/forms@0.0.2':
     resolution: {integrity: sha512-DpecPQd/Qf/kav4LKCaIeGuT3AkwhJzuHCkLANTVlN/zBvo8KIj3OZHsCkm0zlIMVVnaJdtx1ULNlRQdudef+A==}
@@ -2847,7 +3023,7 @@ packages:
   '@primevue/themes@4.2.5':
     resolution: {integrity: sha512-8F7yA36xYIKtNuAuyBdZZEks/bKDwlhH5WjpqGGB0FdwfAEoBYsynQ5sdqcT2Lb/NsajHmS5lc++Ttlvr1g1Lw==}
     engines: {node: '>=12.11.0'}
-    deprecated: This package is deprecated. Use @primeuix/themes instead.
+    deprecated: 'Deprecated. This package is no longer maintained. Please migrate to @primeuix/themes: https://www.npmjs.com/package/@primeuix/themes'
 
   '@protobufjs/aspromise@1.1.2':
     resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==}
@@ -2882,9 +3058,89 @@ packages:
   '@remirror/core-constants@3.0.0':
     resolution: {integrity: sha512-42aWfPrimMfDKDi4YegyS7x+/0tlzaqwPQCULLanv3DMIlu96KTJR0fM5isWX2UViOqlGnX6YFgqWepcX+XMNg==}
 
+  '@rolldown/binding-android-arm64@1.0.0-rc.3':
+    resolution: {integrity: sha512-0T1k9FinuBZ/t7rZ8jN6OpUKPnUjNdYHoj/cESWrQ3ZraAJ4OMm6z7QjSfCxqj8mOp9kTKc1zHK3kGz5vMu+nQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [android]
+
+  '@rolldown/binding-darwin-arm64@1.0.0-rc.3':
+    resolution: {integrity: sha512-JWWLzvcmc/3pe7qdJqPpuPk91SoE/N+f3PcWx/6ZwuyDVyungAEJPvKm/eEldiDdwTmaEzWfIR+HORxYWrCi1A==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@rolldown/binding-darwin-x64@1.0.0-rc.3':
+    resolution: {integrity: sha512-MTakBxfx3tde5WSmbHxuqlDsIW0EzQym+PJYGF4P6lG2NmKzi128OGynoFUqoD5ryCySEY85dug4v+LWGBElIw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [darwin]
+
+  '@rolldown/binding-freebsd-x64@1.0.0-rc.3':
+    resolution: {integrity: sha512-jje3oopyOLs7IwfvXoS6Lxnmie5JJO7vW29fdGFu5YGY1EDbVDhD+P9vDihqS5X6fFiqL3ZQZCMBg6jyHkSVww==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@rolldown/binding-linux-arm-gnueabihf@1.0.0-rc.3':
+    resolution: {integrity: sha512-A0n8P3hdLAaqzSFrQoA42p23ZKBYQOw+8EH5r15Sa9X1kD9/JXe0YT2gph2QTWvdr0CVK2BOXiK6ENfy6DXOag==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [linux]
+
+  '@rolldown/binding-linux-arm64-gnu@1.0.0-rc.3':
+    resolution: {integrity: sha512-kWXkoxxarYISBJ4bLNf5vFkEbb4JvccOwxWDxuK9yee8lg5XA7OpvlTptfRuwEvYcOZf+7VS69Uenpmpyo5Bjw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+
+  '@rolldown/binding-linux-arm64-musl@1.0.0-rc.3':
+    resolution: {integrity: sha512-Z03/wrqau9Bicfgb3Dbs6SYTHliELk2PM2LpG2nFd+cGupTMF5kanLEcj2vuuJLLhptNyS61rtk7SOZ+lPsTUA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+
+  '@rolldown/binding-linux-x64-gnu@1.0.0-rc.3':
+    resolution: {integrity: sha512-iSXXZsQp08CSilff/DCTFZHSVEpEwdicV3W8idHyrByrcsRDVh9sGC3sev6d8BygSGj3vt8GvUKBPCoyMA4tgQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+
+  '@rolldown/binding-linux-x64-musl@1.0.0-rc.3':
+    resolution: {integrity: sha512-qaj+MFudtdCv9xZo9znFvkgoajLdc+vwf0Kz5N44g+LU5XMe+IsACgn3UG7uTRlCCvhMAGXm1XlpEA5bZBrOcw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+
+  '@rolldown/binding-openharmony-arm64@1.0.0-rc.3':
+    resolution: {integrity: sha512-U662UnMETyjT65gFmG9ma+XziENrs7BBnENi/27swZPYagubfHRirXHG2oMl+pEax2WvO7Kb9gHZmMakpYqBHQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [openharmony]
+
+  '@rolldown/binding-wasm32-wasi@1.0.0-rc.3':
+    resolution: {integrity: sha512-gekrQ3Q2HiC1T5njGyuUJoGpK/l6B/TNXKed3fZXNf9YRTJn3L5MOZsFBn4bN2+UX+8+7hgdlTcEsexX988G4g==}
+    engines: {node: '>=14.0.0'}
+    cpu: [wasm32]
+
+  '@rolldown/binding-win32-arm64-msvc@1.0.0-rc.3':
+    resolution: {integrity: sha512-85y5JifyMgs8m5K2XzR/VDsapKbiFiohl7s5lEj7nmNGO0pkTXE7q6TQScei96BNAsoK7JC3pA7ukA8WRHVJpg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [win32]
+
+  '@rolldown/binding-win32-x64-msvc@1.0.0-rc.3':
+    resolution: {integrity: sha512-a4VUQZH7LxGbUJ3qJ/TzQG8HxdHvf+jOnqf7B7oFx1TEBm+j2KNL2zr5SQ7wHkNAcaPevF6gf9tQnVBnC4mD+A==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [win32]
+
   '@rolldown/pluginutils@1.0.0-beta.53':
     resolution: {integrity: sha512-vENRlFU4YbrwVqNDZ7fLvy+JR1CRkyr01jhSiDpE1u6py3OMzQfztQU2jxykW3ALNxO4kSlqIDeYyD0Y9RcQeQ==}
 
+  '@rolldown/pluginutils@1.0.0-rc.3':
+    resolution: {integrity: sha512-eybk3TjzzzV97Dlj5c+XrBFW57eTNhzod66y9HrBlzJ6NsCrWCp/2kaPS3K9wJmurBC0Tdw4yPjXKZqlznim3Q==}
+
   '@rollup/pluginutils@4.2.1':
     resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==}
     engines: {node: '>= 8.0.0'}
@@ -3011,27 +3267,35 @@ packages:
   '@rtsao/scc@1.1.0':
     resolution: {integrity: sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==}
 
-  '@rushstack/node-core-library@5.14.0':
-    resolution: {integrity: sha512-eRong84/rwQUlATGFW3TMTYVyqL1vfW9Lf10PH+mVGfIb9HzU3h5AASNIw+axnBLjnD0n3rT5uQBwu9fvzATrg==}
+  '@rushstack/node-core-library@5.20.1':
+    resolution: {integrity: sha512-QvxZyh+RsTJ77JpQkS9K9lJujh6lj5WyMxieT0bdACtwqxEkGB9zCuSMX5UlXRweaIgSpu1ztdHmhV07fKUpMg==}
     peerDependencies:
       '@types/node': '*'
     peerDependenciesMeta:
       '@types/node':
         optional: true
 
-  '@rushstack/rig-package@0.5.3':
-    resolution: {integrity: sha512-olzSSjYrvCNxUFZowevC3uz8gvKr3WTpHQ7BkpjtRpA3wK+T0ybep/SRUMfr195gBzJm5gaXw0ZMgjIyHqJUow==}
-
-  '@rushstack/terminal@0.16.0':
-    resolution: {integrity: sha512-WEvNuKkoR1PXorr9SxO0dqFdSp1BA+xzDrIm/Bwlc5YHg2FFg6oS+uCTYjerOhFuqCW+A3vKBm6EmKWSHfgx/A==}
+  '@rushstack/problem-matcher@0.2.1':
+    resolution: {integrity: sha512-gulfhBs6n+I5b7DvjKRfhMGyUejtSgOHTclF/eONr8hcgF1APEDjhxIsfdUYYMzC3rvLwGluqLjbwCFZ8nxrog==}
     peerDependencies:
       '@types/node': '*'
     peerDependenciesMeta:
       '@types/node':
         optional: true
 
-  '@rushstack/ts-command-line@5.0.3':
-    resolution: {integrity: sha512-bgPhQEqLVv/2hwKLYv/XvsTWNZ9B/+X1zJ7WgQE9rO5oiLzrOZvkIW4pk13yOQBhHyjcND5qMOa6p83t+Z66iQ==}
+  '@rushstack/rig-package@0.7.1':
+    resolution: {integrity: sha512-hLwDnp4yMcAd/gcUol8NPWNctpIXzVOgMyhZ8DagnEJls9TOZd0xF//5hS+YTiX7/+4rLfBra+NoB3rtFxjDdA==}
+
+  '@rushstack/terminal@0.22.1':
+    resolution: {integrity: sha512-Mdtu0VN7v31O5Zcno8ZZH5kQHF13Ez7WN9Aio7nFJVcR36i4bkERionYrWgBDQJ0JdVPLKGecZER/xRU5IvGLw==}
+    peerDependencies:
+      '@types/node': '*'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
+  '@rushstack/ts-command-line@5.3.1':
+    resolution: {integrity: sha512-mid/JIZSJafwy3x9e4v0wVLuAqSSYYErEHV0HXPALYLSBN13YNkR5caOk0hf97lSRKrxhtvQjGaDKSEelR3sMg==}
 
   '@sentry-internal/browser-utils@10.32.1':
     resolution: {integrity: sha512-sjLLep1es3rTkbtAdTtdpc/a6g7v7bK5YJiZJsUigoJ4NTiFeMI5uIDCxbH/tjJ1q23YE1LzVn7T96I+qBRjHA==}
@@ -3134,8 +3398,8 @@ packages:
       pinia:
         optional: true
 
-  '@sinclair/typebox@0.34.40':
-    resolution: {integrity: sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==}
+  '@sinclair/typebox@0.34.48':
+    resolution: {integrity: sha512-kKJTNuK3AQOrgjjotVxMrCn1sUJwM76wMszfq1kdU4uYVJjvEWuFQ6HgvLt4Xz3fSmZlTOxJ/Ie13KnIcWQXFA==}
 
   '@sparkjsdev/spark@0.1.10':
     resolution: {integrity: sha512-CiijdZQuj7KPDUqIZPiEqyUkJCYo1JqR05vq/V+ElxMwqR7L70ZuZDyIKcasjZHSiPB8pGRMH8HZGqUKO9aRPQ==}
@@ -3143,24 +3407,29 @@ packages:
   '@standard-schema/spec@1.1.0':
     resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
 
-  '@storybook/addon-docs@10.1.9':
-    resolution: {integrity: sha512-SvwEZ32lyk5p3PRmE3pmfAhs4HMiVo5zxjTBVmK9kgz9zGgWCTlikb56tJ998hVe52CFyCvt3I9rkHeYMCKPww==}
+  '@storybook/addon-docs@10.2.10':
+    resolution: {integrity: sha512-2wIYtdvZIzPbQ5194M5Igpy8faNbQ135nuO5ZaZ2VuttqGr+IJcGnDP42zYwbAsGs28G8ohpkbSgIzVyJWUhPQ==}
     peerDependencies:
-      storybook: ^10.1.9
+      storybook: ^10.2.10
 
-  '@storybook/builder-vite@10.1.9':
-    resolution: {integrity: sha512-rUILpjGV7gKfXrUeZzpNAer9PspB3LJI1d+gJHISx2Gs24bdneA3y/gu0fWw46ccOSIcwb91xoK5QxliJcWsWg==}
+  '@storybook/addon-mcp@0.1.6':
+    resolution: {integrity: sha512-+EagCHqwIb9tg3DKskEsXpsqQVnMljxgR5Tt3Bu0ZpWweB1HdMy+ok128gzNfTZ3r+5ljksr0q66YCEkrQwdDA==}
     peerDependencies:
-      storybook: ^10.1.9
-      vite: ^5.0.0 || ^6.0.0 || ^7.0.0
+      storybook: ^9.1.16 || ^10.0.0 || ^10.1.0-0 || ^10.2.0-0 || ^10.3.0-0 || ^10.4.0-0
 
-  '@storybook/csf-plugin@10.1.9':
-    resolution: {integrity: sha512-17LXUqpbVvsMt7KJwgr0bPUX+uEGArc6EOi+DC5X/CQ+i0nXxxLMpDHdTyrsdKxCZIT087OpSNbTEWP5ACEAlA==}
+  '@storybook/builder-vite@10.2.10':
+    resolution: {integrity: sha512-Wd6CYL7LvRRNiXMz977x9u/qMm7nmMw/7Dow2BybQo+Xbfy1KhVjIoZ/gOiG515zpojSozctNrJUbM0+jH1jwg==}
+    peerDependencies:
+      storybook: ^10.2.10
+      vite: 8.0.0-beta.13
+
+  '@storybook/csf-plugin@10.2.10':
+    resolution: {integrity: sha512-aFvgaNDAnKMjuyhPK5ialT22pPqMN0XfPBNPeeNVPYztngkdKBa8WFqF/umDd47HxAjebq+vn6uId1xHyOHH3g==}
     peerDependencies:
       esbuild: '*'
       rollup: '*'
-      storybook: ^10.1.9
-      vite: '*'
+      storybook: ^10.2.10
+      vite: 8.0.0-beta.13
       webpack: '*'
     peerDependenciesMeta:
       esbuild:
@@ -3181,87 +3450,90 @@ packages:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
 
-  '@storybook/react-dom-shim@10.1.9':
-    resolution: {integrity: sha512-gJsR6fI1gG4DSin6sQx8RmGDQF8Lije0cZbxHyVedNleBsveGXIPFUKFVi+pRNdwBPni1Z2g/gYyHzkOEqPD2w==}
+  '@storybook/mcp@0.1.1':
+    resolution: {integrity: sha512-+AivFDms1XkY2VUvZBBYy0co5qvRh20eYXYwhaDPQXX2Q4y96arSkWn22e/l3DQwA9Ywzv481vj4gl4zPrCQkg==}
+
+  '@storybook/react-dom-shim@10.2.10':
+    resolution: {integrity: sha512-TmBrhyLHn8B8rvDHKk5uW5BqzO1M1T+fqFNWg88NIAJOoyX4Uc90FIJjDuN1OJmWKGwB5vLmPwaKBYsTe1yS+w==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-      storybook: ^10.1.9
+      storybook: ^10.2.10
 
-  '@storybook/vue3-vite@10.1.9':
-    resolution: {integrity: sha512-DYvh3ilOcJAa5HQg6mICQ2GYS717hGjy5V/WGkW9LM4dlaJN8/H5LoXqf5AADrTBQD7WRRPd80bZ+mp9vUV5SA==}
+  '@storybook/vue3-vite@10.2.10':
+    resolution: {integrity: sha512-r2mmbY2Cskk/pN56OTVT0cu9Ocn+h8/sq8M2C0NhViJWQeoANTMCCScR1a2GxFuYs1bX8YMWnwR6wghgvGJLBw==}
     peerDependencies:
-      storybook: ^10.1.9
-      vite: ^5.0.0 || ^6.0.0 || ^7.0.0
+      storybook: ^10.2.10
+      vite: 8.0.0-beta.13
 
-  '@storybook/vue3@10.1.9':
-    resolution: {integrity: sha512-U+W/G93kWQQgVtm8n27aeQsbRvlchuJd7/wHNRHvQLNaZWEfXRC39JECOdGi8L8LXilyvyFKAUC5/fHH5Exlpw==}
+  '@storybook/vue3@10.2.10':
+    resolution: {integrity: sha512-hp9d11+Nz2hQCbAoggVJYDuNIguEUwaeuBmYjX84vSUI2jafYHAo9ir3xE2jdWwQsbvdNIUc0puFKD0S3WR0TA==}
     peerDependencies:
-      storybook: ^10.1.9
+      storybook: ^10.2.10
       vue: ^3.0.0
 
   '@swc/helpers@0.5.17':
     resolution: {integrity: sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A==}
 
-  '@tailwindcss/node@4.1.12':
-    resolution: {integrity: sha512-3hm9brwvQkZFe++SBt+oLjo4OLDtkvlE8q2WalaD/7QWaeM7KEJbAiY/LJZUaCs7Xa8aUu4xy3uoyX4q54UVdQ==}
+  '@tailwindcss/node@4.2.0':
+    resolution: {integrity: sha512-Yv+fn/o2OmL5fh/Ir62VXItdShnUxfpkMA4Y7jdeC8O81WPB8Kf6TT6GSHvnqgSwDzlB5iT7kDpeXxLsUS0T6Q==}
 
-  '@tailwindcss/oxide-android-arm64@4.1.12':
-    resolution: {integrity: sha512-oNY5pq+1gc4T6QVTsZKwZaGpBb2N1H1fsc1GD4o7yinFySqIuRZ2E4NvGasWc6PhYJwGK2+5YT1f9Tp80zUQZQ==}
-    engines: {node: '>= 10'}
+  '@tailwindcss/oxide-android-arm64@4.2.0':
+    resolution: {integrity: sha512-F0QkHAVaW/JNBWl4CEKWdZ9PMb0khw5DCELAOnu+RtjAfx5Zgw+gqCHFvqg3AirU1IAd181fwOtJQ5I8Yx5wtw==}
+    engines: {node: '>= 20'}
     cpu: [arm64]
     os: [android]
 
-  '@tailwindcss/oxide-darwin-arm64@4.1.12':
-    resolution: {integrity: sha512-cq1qmq2HEtDV9HvZlTtrj671mCdGB93bVY6J29mwCyaMYCP/JaUBXxrQQQm7Qn33AXXASPUb2HFZlWiiHWFytw==}
-    engines: {node: '>= 10'}
+  '@tailwindcss/oxide-darwin-arm64@4.2.0':
+    resolution: {integrity: sha512-I0QylkXsBsJMZ4nkUNSR04p6+UptjcwhcVo3Zu828ikiEqHjVmQL9RuQ6uT/cVIiKpvtVA25msu/eRV97JeNSA==}
+    engines: {node: '>= 20'}
     cpu: [arm64]
     os: [darwin]
 
-  '@tailwindcss/oxide-darwin-x64@4.1.12':
-    resolution: {integrity: sha512-6UCsIeFUcBfpangqlXay9Ffty9XhFH1QuUFn0WV83W8lGdX8cD5/+2ONLluALJD5+yJ7k8mVtwy3zMZmzEfbLg==}
-    engines: {node: '>= 10'}
+  '@tailwindcss/oxide-darwin-x64@4.2.0':
+    resolution: {integrity: sha512-6TmQIn4p09PBrmnkvbYQ0wbZhLtbaksCDx7Y7R3FYYx0yxNA7xg5KP7dowmQ3d2JVdabIHvs3Hx4K3d5uCf8xg==}
+    engines: {node: '>= 20'}
     cpu: [x64]
     os: [darwin]
 
-  '@tailwindcss/oxide-freebsd-x64@4.1.12':
-    resolution: {integrity: sha512-JOH/f7j6+nYXIrHobRYCtoArJdMJh5zy5lr0FV0Qu47MID/vqJAY3r/OElPzx1C/wdT1uS7cPq+xdYYelny1ww==}
-    engines: {node: '>= 10'}
+  '@tailwindcss/oxide-freebsd-x64@4.2.0':
+    resolution: {integrity: sha512-qBudxDvAa2QwGlq9y7VIzhTvp2mLJ6nD/G8/tI70DCDoneaUeLWBJaPcbfzqRIWraj+o969aDQKvKW9dvkUizw==}
+    engines: {node: '>= 20'}
     cpu: [x64]
     os: [freebsd]
 
-  '@tailwindcss/oxide-linux-arm-gnueabihf@4.1.12':
-    resolution: {integrity: sha512-v4Ghvi9AU1SYgGr3/j38PD8PEe6bRfTnNSUE3YCMIRrrNigCFtHZ2TCm8142X8fcSqHBZBceDx+JlFJEfNg5zQ==}
-    engines: {node: '>= 10'}
+  '@tailwindcss/oxide-linux-arm-gnueabihf@4.2.0':
+    resolution: {integrity: sha512-7XKkitpy5NIjFZNUQPeUyNJNJn1CJeV7rmMR+exHfTuOsg8rxIO9eNV5TSEnqRcaOK77zQpsyUkBWmPy8FgdSg==}
+    engines: {node: '>= 20'}
     cpu: [arm]
     os: [linux]
 
-  '@tailwindcss/oxide-linux-arm64-gnu@4.1.12':
-    resolution: {integrity: sha512-YP5s1LmetL9UsvVAKusHSyPlzSRqYyRB0f+Kl/xcYQSPLEw/BvGfxzbH+ihUciePDjiXwHh+p+qbSP3SlJw+6g==}
-    engines: {node: '>= 10'}
+  '@tailwindcss/oxide-linux-arm64-gnu@4.2.0':
+    resolution: {integrity: sha512-Mff5a5Q3WoQR01pGU1gr29hHM1N93xYrKkGXfPw/aRtK4bOc331Ho4Tgfsm5WDGvpevqMpdlkCojT3qlCQbCpA==}
+    engines: {node: '>= 20'}
     cpu: [arm64]
     os: [linux]
 
-  '@tailwindcss/oxide-linux-arm64-musl@4.1.12':
-    resolution: {integrity: sha512-V8pAM3s8gsrXcCv6kCHSuwyb/gPsd863iT+v1PGXC4fSL/OJqsKhfK//v8P+w9ThKIoqNbEnsZqNy+WDnwQqCA==}
-    engines: {node: '>= 10'}
+  '@tailwindcss/oxide-linux-arm64-musl@4.2.0':
+    resolution: {integrity: sha512-XKcSStleEVnbH6W/9DHzZv1YhjE4eSS6zOu2eRtYAIh7aV4o3vIBs+t/B15xlqoxt6ef/0uiqJVB6hkHjWD/0A==}
+    engines: {node: '>= 20'}
     cpu: [arm64]
     os: [linux]
 
-  '@tailwindcss/oxide-linux-x64-gnu@4.1.12':
-    resolution: {integrity: sha512-xYfqYLjvm2UQ3TZggTGrwxjYaLB62b1Wiysw/YE3Yqbh86sOMoTn0feF98PonP7LtjsWOWcXEbGqDL7zv0uW8Q==}
-    engines: {node: '>= 10'}
+  '@tailwindcss/oxide-linux-x64-gnu@4.2.0':
+    resolution: {integrity: sha512-/hlXCBqn9K6fi7eAM0RsobHwJYa5V/xzWspVTzxnX+Ft9v6n+30Pz8+RxCn7sQL/vRHHLS30iQPrHQunu6/vJA==}
+    engines: {node: '>= 20'}
     cpu: [x64]
     os: [linux]
 
-  '@tailwindcss/oxide-linux-x64-musl@4.1.12':
-    resolution: {integrity: sha512-ha0pHPamN+fWZY7GCzz5rKunlv9L5R8kdh+YNvP5awe3LtuXb5nRi/H27GeL2U+TdhDOptU7T6Is7mdwh5Ar3A==}
-    engines: {node: '>= 10'}
+  '@tailwindcss/oxide-linux-x64-musl@4.2.0':
+    resolution: {integrity: sha512-lKUaygq4G7sWkhQbfdRRBkaq4LY39IriqBQ+Gk6l5nKq6Ay2M2ZZb1tlIyRNgZKS8cbErTwuYSor0IIULC0SHw==}
+    engines: {node: '>= 20'}
     cpu: [x64]
     os: [linux]
 
-  '@tailwindcss/oxide-wasm32-wasi@4.1.12':
-    resolution: {integrity: sha512-4tSyu3dW+ktzdEpuk6g49KdEangu3eCYoqPhWNsZgUhyegEda3M9rG0/j1GV/JjVVsj+lG7jWAyrTlLzd/WEBg==}
+  '@tailwindcss/oxide-wasm32-wasi@4.2.0':
+    resolution: {integrity: sha512-xuDjhAsFdUuFP5W9Ze4k/o4AskUtI8bcAGU4puTYprr89QaYFmhYOPfP+d1pH+k9ets6RoE23BXZM1X1jJqoyw==}
     engines: {node: '>=14.0.0'}
     cpu: [wasm32]
     bundledDependencies:
@@ -3272,26 +3544,26 @@ packages:
       - '@emnapi/wasi-threads'
       - tslib
 
-  '@tailwindcss/oxide-win32-arm64-msvc@4.1.12':
-    resolution: {integrity: sha512-iGLyD/cVP724+FGtMWslhcFyg4xyYyM+5F4hGvKA7eifPkXHRAUDFaimu53fpNg9X8dfP75pXx/zFt/jlNF+lg==}
-    engines: {node: '>= 10'}
+  '@tailwindcss/oxide-win32-arm64-msvc@4.2.0':
+    resolution: {integrity: sha512-2UU/15y1sWDEDNJXxEIrfWKC2Yb4YgIW5Xz2fKFqGzFWfoMHWFlfa1EJlGO2Xzjkq/tvSarh9ZTjvbxqWvLLXA==}
+    engines: {node: '>= 20'}
     cpu: [arm64]
     os: [win32]
 
-  '@tailwindcss/oxide-win32-x64-msvc@4.1.12':
-    resolution: {integrity: sha512-NKIh5rzw6CpEodv/++r0hGLlfgT/gFN+5WNdZtvh6wpU2BpGNgdjvj6H2oFc8nCM839QM1YOhjpgbAONUb4IxA==}
-    engines: {node: '>= 10'}
+  '@tailwindcss/oxide-win32-x64-msvc@4.2.0':
+    resolution: {integrity: sha512-CrFadmFoc+z76EV6LPG1jx6XceDsaCG3lFhyLNo/bV9ByPrE+FnBPckXQVP4XRkN76h3Fjt/a+5Er/oA/nCBvQ==}
+    engines: {node: '>= 20'}
     cpu: [x64]
     os: [win32]
 
-  '@tailwindcss/oxide@4.1.12':
-    resolution: {integrity: sha512-gM5EoKHW/ukmlEtphNwaGx45fGoEmP10v51t9unv55voWh6WrOL19hfuIdo2FjxIaZzw776/BUQg7Pck++cIVw==}
-    engines: {node: '>= 10'}
+  '@tailwindcss/oxide@4.2.0':
+    resolution: {integrity: sha512-AZqQzADaj742oqn2xjl5JbIOzZB/DGCYF/7bpvhA8KvjUj9HJkag6bBuwZvH1ps6dfgxNHyuJVlzSr2VpMgdTQ==}
+    engines: {node: '>= 20'}
 
-  '@tailwindcss/vite@4.1.12':
-    resolution: {integrity: sha512-4pt0AMFDx7gzIrAOIYgYP0KCBuKWqyW8ayrdiLEjoJTT4pKTjrzG/e4uzWtTLDziC+66R9wbUqZBccJalSE5vQ==}
+  '@tailwindcss/vite@4.2.0':
+    resolution: {integrity: sha512-da9mFCaHpoOgtQiWtDGIikTrSpUFBtIZCG3jy/u2BGV+l/X1/pbxzmIUxNt6JWm19N3WtGi4KlJdSH/Si83WOA==}
     peerDependencies:
-      vite: ^5.2.0 || ^6 || ^7
+      vite: 8.0.0-beta.13
 
   '@tanstack/virtual-core@3.13.12':
     resolution: {integrity: sha512-1YBOJfRHV4sXUmWsFSf5rQor4Ss82G8dQWLRbnk3GA4jeP8hQt1hxXh0tmflpC0dz3VgEv/1+qwPyLeWkQuPFA==}
@@ -3315,158 +3587,162 @@ packages:
     peerDependencies:
       '@testing-library/dom': '>=7.21.4'
 
-  '@tiptap/core@2.10.4':
-    resolution: {integrity: sha512-fExFRTRgb6MSpg2VvR5qO2dPTQAZWuUoU4UsBCurIVcPWcyVv4FG1YzgMyoLDKy44rebFtwUGJbfU9NzX7Q/bA==}
+  '@tiptap/core@2.27.2':
+    resolution: {integrity: sha512-ABL1N6eoxzDzC1bYvkMbvyexHacszsKdVPYqhl5GwHLOvpZcv9VE9QaKwDILTyz5voCA0lGcAAXZp+qnXOk5lQ==}
     peerDependencies:
       '@tiptap/pm': ^2.7.0
 
-  '@tiptap/extension-blockquote@2.10.4':
-    resolution: {integrity: sha512-4JSwAM3B92YWvGzu/Vd5rovPrCGwLSaSLD5rxcLyfxLSrTDQd3n7lp78pzVgGhunVECzaGF5A0ByWWpEyS0a3w==}
+  '@tiptap/extension-blockquote@2.27.2':
+    resolution: {integrity: sha512-oIGZgiAeA4tG3YxbTDfrmENL4/CIwGuP3THtHsNhwRqwsl9SfMk58Ucopi2GXTQSdYXpRJ0ahE6nPqB5D6j/Zw==}
     peerDependencies:
       '@tiptap/core': ^2.7.0
 
-  '@tiptap/extension-bold@2.10.4':
-    resolution: {integrity: sha512-SdO4oFQKaERCGfwOc1CLYQRtThENam2KWfWmvpsymknokt5qYzU57ft0SE1HQV9vVYEzZ9HrWIgv2xrgu0g9kg==}
+  '@tiptap/extension-bold@2.27.2':
+    resolution: {integrity: sha512-bR7J5IwjCGQ0s3CIxyMvOCnMFMzIvsc5OVZKscTN5UkXzFsaY6muUAIqtKxayBUucjtUskm5qZowJITCeCb1/A==}
     peerDependencies:
       '@tiptap/core': ^2.7.0
 
-  '@tiptap/extension-bullet-list@2.10.4':
-    resolution: {integrity: sha512-JVwDPgOBYRU2ivaadOh4IaQYXQEiSw6sB36KT/bwqJF2GnEvLiMwptdRMn9Uuh6xYR3imjIZtV6uZAoneZdd6g==}
+  '@tiptap/extension-bullet-list@2.27.2':
+    resolution: {integrity: sha512-gmFuKi97u5f8uFc/GQs+zmezjiulZmFiDYTh3trVoLRoc2SAHOjGEB7qxdx7dsqmMN7gwiAWAEVurLKIi1lnnw==}
     peerDependencies:
       '@tiptap/core': ^2.7.0
 
-  '@tiptap/extension-code-block@2.10.4':
-    resolution: {integrity: sha512-qS4jnbJqghNMT2+B+GQ807ATgqkL9OQ//NlL+ZwVSe+DPDduNA9B6IB9SrWENDfOnzekpi7kcEcm+RenELARRQ==}
+  '@tiptap/extension-code-block@2.27.2':
+    resolution: {integrity: sha512-KgvdQHS4jXr79aU3wZOGBIZYYl9vCB7uDEuRFV4so2rYrfmiYMw3T8bTnlNEEGe4RUeAms1i4fdwwvQp9nR1Dw==}
     peerDependencies:
       '@tiptap/core': ^2.7.0
       '@tiptap/pm': ^2.7.0
 
-  '@tiptap/extension-code@2.10.4':
-    resolution: {integrity: sha512-Vj/N0nbSQiV1o7X7pRySK9Fu72Dd266gm27TSlsts6IwJu5MklFvz7ezJUWoLjt2wmCV8/U/USmk/39ic9qjvg==}
+  '@tiptap/extension-code@2.27.2':
+    resolution: {integrity: sha512-7X9AgwqiIGXoZX7uvdHQsGsjILnN/JaEVtqfXZnPECzKGaWHeK/Ao4sYvIIIffsyZJA8k5DC7ny2/0sAgr2TuA==}
     peerDependencies:
       '@tiptap/core': ^2.7.0
 
-  '@tiptap/extension-document@2.10.4':
-    resolution: {integrity: sha512-1Pqrl6Rr9bVEHJ3zO2dM7UUA0Qn/r70JQ9YLlestjW1sbMaMuY3Ifvu2uSyUE7SAGV3gvxwNVQCrv8f0VlVEaA==}
+  '@tiptap/extension-document@2.27.2':
+    resolution: {integrity: sha512-CFhAYsPnyYnosDC4639sCJnBUnYH4Cat9qH5NZWHVvdgtDwu8GZgZn2eSzaKSYXWH1vJ9DSlCK+7UyC3SNXIBA==}
     peerDependencies:
       '@tiptap/core': ^2.7.0
 
-  '@tiptap/extension-dropcursor@2.10.4':
-    resolution: {integrity: sha512-0XEM/yNLaMc/sZlYOau7XpHyYiHT9LwXUe7kmze/L8eowIa/iLvmRbcnUd3rtlZ7x7wooE6UO9c7OtlREg4ZBw==}
+  '@tiptap/extension-dropcursor@2.27.2':
+    resolution: {integrity: sha512-oEu/OrktNoQXq1x29NnH/GOIzQZm8ieTQl3FK27nxfBPA89cNoH4mFEUmBL5/OFIENIjiYG3qWpg6voIqzswNw==}
     peerDependencies:
       '@tiptap/core': ^2.7.0
       '@tiptap/pm': ^2.7.0
 
-  '@tiptap/extension-gapcursor@2.10.4':
-    resolution: {integrity: sha512-KbJfoaqTZePpkWAN+klpK5j0UVtELxN7H5B0J556/UCB/rnq+OsdEFHPks2Ss9TidqWzRUqcxUE50UZ7b8h7Ug==}
+  '@tiptap/extension-gapcursor@2.27.2':
+    resolution: {integrity: sha512-/c9VF1HBxj+AP54XGVgCmD9bEGYc5w5OofYCFQgM7l7PB1J00A4vOke0oPkHJnqnOOyPlFaxO/7N6l3XwFcnKA==}
     peerDependencies:
       '@tiptap/core': ^2.7.0
       '@tiptap/pm': ^2.7.0
 
-  '@tiptap/extension-hard-break@2.10.4':
-    resolution: {integrity: sha512-nW9wubW1A/CO2Ssn9wNMP08tR9Oarg9VUGzJ5qNuz38DDNyntE1SyDS+XStkeMq5nKqJ3YKhukyAJH/PiRq4Mg==}
+  '@tiptap/extension-hard-break@2.27.2':
+    resolution: {integrity: sha512-kSRVGKlCYK6AGR0h8xRkk0WOFGXHIIndod3GKgWU49APuIGDiXd8sziXsSlniUsWmqgDmDXcNnSzPcV7AQ8YNg==}
     peerDependencies:
       '@tiptap/core': ^2.7.0
 
-  '@tiptap/extension-heading@2.10.4':
-    resolution: {integrity: sha512-7D0h0MIvE97Gx3Qwuo2xnPDK07WfCnyh4tpOPBOus4e1g6sgxVkwDwhbkYWiwvIrf4BUVJflnke/DEDCVp6/Eg==}
+  '@tiptap/extension-heading@2.27.2':
+    resolution: {integrity: sha512-iM3yeRWuuQR/IRQ1djwNooJGfn9Jts9zF43qZIUf+U2NY8IlvdNsk2wTOdBgh6E0CamrStPxYGuln3ZS4fuglw==}
     peerDependencies:
       '@tiptap/core': ^2.7.0
 
-  '@tiptap/extension-history@2.10.4':
-    resolution: {integrity: sha512-fg6BNxbpMMtgKaiNI/GLcCzkxIQMwSYBhO9LA0CxLvmsWGU+My4r9W3DK6HwNoRJ9+6OleDPSLo1P73fbSTtEA==}
+  '@tiptap/extension-history@2.27.2':
+    resolution: {integrity: sha512-+hSyqERoFNTWPiZx4/FCyZ/0eFqB9fuMdTB4AC/q9iwu3RNWAQtlsJg5230bf/qmyO6bZxRUc0k8p4hrV6ybAw==}
     peerDependencies:
       '@tiptap/core': ^2.7.0
       '@tiptap/pm': ^2.7.0
 
-  '@tiptap/extension-horizontal-rule@2.10.4':
-    resolution: {integrity: sha512-s9ycm/BOGoW3L0Epnj541vdngHbFbMM488HoODd1CmVSw1C+wBWFgsukgqKjlyE3VGfZXuSb1ur9zinW0RiLJQ==}
+  '@tiptap/extension-horizontal-rule@2.27.2':
+    resolution: {integrity: sha512-WGWUSgX+jCsbtf9Y9OCUUgRZYuwjVoieW5n6mAUohJ9/6gc6sGIOrUpBShf+HHo6WD+gtQjRd+PssmX3NPWMpg==}
     peerDependencies:
       '@tiptap/core': ^2.7.0
       '@tiptap/pm': ^2.7.0
 
-  '@tiptap/extension-italic@2.10.4':
-    resolution: {integrity: sha512-8MIQ+wsbyxNCZDCFTVTOXrS2AvFyOhtlBNgVU2+6r6xnJV4AcfEA3qclysqrjOlL117ped/nzDeoB0AeX0CI+Q==}
+  '@tiptap/extension-italic@2.27.2':
+    resolution: {integrity: sha512-1OFsw2SZqfaqx5Fa5v90iNlPRcqyt+lVSjBwTDzuPxTPFY4Q0mL89mKgkq2gVHYNCiaRkXvFLDxaSvBWbmthgg==}
     peerDependencies:
       '@tiptap/core': ^2.7.0
 
-  '@tiptap/extension-link@2.10.4':
-    resolution: {integrity: sha512-9lbtMUPc9IYCRMKV/B4k/no9J5OQQl/jJn9W2ce3NjJZSrOjuZs0CjJZgCESIaj6911s7nEJUvxKKmsbD3UC3Q==}
+  '@tiptap/extension-link@2.27.2':
+    resolution: {integrity: sha512-bnP61qkr0Kj9Cgnop1hxn2zbOCBzNtmawxr92bVTOE31fJv6FhtCnQiD6tuPQVGMYhcmAj7eihtvuEMFfqEPcQ==}
     peerDependencies:
       '@tiptap/core': ^2.7.0
       '@tiptap/pm': ^2.7.0
 
-  '@tiptap/extension-list-item@2.10.4':
-    resolution: {integrity: sha512-8K3WUD5fPyw2poQKnJGGm7zlfeIbpld92+SRF4M9wkp95EzvgexTlodvxlrL3i8zKXcQQVyExWA8kCcGPFb9bA==}
+  '@tiptap/extension-list-item@2.27.2':
+    resolution: {integrity: sha512-eJNee7IEGXMnmygM5SdMGDC8m/lMWmwNGf9fPCK6xk0NxuQRgmZHL6uApKcdH6gyNcRPHCqvTTkhEP7pbny/fg==}
     peerDependencies:
       '@tiptap/core': ^2.7.0
 
-  '@tiptap/extension-ordered-list@2.10.4':
-    resolution: {integrity: sha512-NaeEu+qFG2O0emc8WlwOM7DKNKOaqHWuNkuKrrmQzslgL+UQSEGlGMo6NEJ5sLLckPBDpIa0MuRm30407JE+cg==}
+  '@tiptap/extension-ordered-list@2.27.2':
+    resolution: {integrity: sha512-M7A4tLGJcLPYdLC4CI2Gwl8LOrENQW59u3cMVa+KkwG1hzSJyPsbDpa1DI6oXPC2WtYiTf22zrbq3gVvH+KA2w==}
     peerDependencies:
       '@tiptap/core': ^2.7.0
 
-  '@tiptap/extension-paragraph@2.10.4':
-    resolution: {integrity: sha512-SRNVhT8OXqjpZtcyuOtofbtOpXXFrQrjqqCc/yXebda//2SfUTOvB16Lss77vQOWi6xr7TF1mZuowJgSTkcczw==}
+  '@tiptap/extension-paragraph@2.27.2':
+    resolution: {integrity: sha512-elYVn2wHJJ+zB9LESENWOAfI4TNT0jqEN34sMA/hCtA4im1ZG2DdLHwkHIshj/c4H0dzQhmsS/YmNC5Vbqab/A==}
     peerDependencies:
       '@tiptap/core': ^2.7.0
 
-  '@tiptap/extension-strike@2.10.4':
-    resolution: {integrity: sha512-OibipsomFpOJWTPVX/z4Z53HgwDA93lE/loHGa+ONJfML1dO6Zd6UTwzaVO1/g8WOwRgwkYu/6JnhxLKRlP8Lg==}
+  '@tiptap/extension-strike@2.27.2':
+    resolution: {integrity: sha512-HHIjhafLhS2lHgfAsCwC1okqMsQzR4/mkGDm4M583Yftyjri1TNA7lzhzXWRFWiiMfJxKtdjHjUAQaHuteRTZw==}
     peerDependencies:
       '@tiptap/core': ^2.7.0
 
-  '@tiptap/extension-table-cell@2.10.4':
-    resolution: {integrity: sha512-vYwRYt3xPaAU4hxoz3OMGPQzcAxaxEVri6VSRMWg4BN3x4DwWevBTAk59Ho9nkJpaRuXO6c5pIxcwWCZM0Aw0w==}
+  '@tiptap/extension-table-cell@2.27.2':
+    resolution: {integrity: sha512-9Lk46MjZMFzVZfOj9Kd7VgC6Odt6vmEhlCYVumErShUY7EkFqCw3b2IYoUtQkntfOEx/Afnhff/okNQwPsJeUA==}
     peerDependencies:
       '@tiptap/core': ^2.7.0
 
-  '@tiptap/extension-table-header@2.10.4':
-    resolution: {integrity: sha512-NVi/KMBh9IAzpukjptCsH+gibZB3VxgCc+wuFk41QqI5ABnTPKWflnQ0wRo7IC6wC/tUi4YBahh20dL/wBJn3w==}
+  '@tiptap/extension-table-header@2.27.2':
+    resolution: {integrity: sha512-ZEb6lbG0NbbodWLV0b4BS/QrDIPlUbCcuOsUxzqVvlMUY1Vg6Fj6fKwLaBcsIUDHi8sxZDBEgYEDw3BR/zcO6A==}
     peerDependencies:
       '@tiptap/core': ^2.7.0
 
-  '@tiptap/extension-table-row@2.10.4':
-    resolution: {integrity: sha512-kpQQSZQNYHhencIk+lzs+zWtgg6nUXHIVQKZUg5dVT0VP2JNO7wPM6d8HgnscvxOkJNRVF/Q5dYe0Cb4tROIKg==}
+  '@tiptap/extension-table-row@2.27.2':
+    resolution: {integrity: sha512-Nw9+tA56Y5HtLVP01NGCZSUuTQhJPtfK9OfmDgGgcxynn2cRVdEtj+9FNZqRhQ1iRVaAI+Rd4xRvX9qYePMOxw==}
     peerDependencies:
       '@tiptap/core': ^2.7.0
 
-  '@tiptap/extension-table@2.10.4':
-    resolution: {integrity: sha512-ak1RT8n0WQFNnVsZ9e6QFLWlRQP0IjT+Yp/PTsx5fSmqkiiwQKGs1ILCJWlBB3H0hV7N69aaOtK3h/35lmqoEg==}
+  '@tiptap/extension-table@2.27.2':
+    resolution: {integrity: sha512-pDbhOpT5phZkcsyPjGBQlXv0+0hmdrvqHJ+dJjkGcCtlfy2pHiEIhmIItOFagc7wXy8G9iUFZ9Jie4zvDf+brg==}
     peerDependencies:
       '@tiptap/core': ^2.7.0
       '@tiptap/pm': ^2.7.0
 
-  '@tiptap/extension-text-style@2.10.4':
-    resolution: {integrity: sha512-ibq7avkcwHyUSG53Hf+P31rrwsKVbbiqbWZM4kXC7M2X3iUwFrtvaa+SWzyWQfE1jl2cCrD1+rfSkj/alcOKGg==}
+  '@tiptap/extension-text-style@2.27.2':
+    resolution: {integrity: sha512-Omk+uxjJLyEY69KStpCw5fA9asvV+MGcAX2HOxyISDFoLaL49TMrNjhGAuz09P1L1b0KGXo4ml7Q3v/Lfy4WPA==}
     peerDependencies:
       '@tiptap/core': ^2.7.0
 
-  '@tiptap/extension-text@2.10.4':
-    resolution: {integrity: sha512-wPdVxCHrIS9S+8n08lgyyqRZPj9FBbyLlFt74/lV5yBC3LOorq1VKdjrTskmaj4jud7ImXoKDyBddAYTHdJ1xw==}
+  '@tiptap/extension-text@2.27.2':
+    resolution: {integrity: sha512-Xk7nYcigljAY0GO9hAQpZ65ZCxqOqaAlTPDFcKerXmlkQZP/8ndx95OgUb1Xf63kmPOh3xypurGS2is3v0MXSA==}
     peerDependencies:
       '@tiptap/core': ^2.7.0
 
-  '@tiptap/pm@2.10.4':
-    resolution: {integrity: sha512-pZ4NEkRtYoDLe0spARvXZ1N3hNv/5u6vfPdPtEbmNpoOSjSNqDC1kVM+qJY0iaCYpxbxcv7cxn3kBumcFLQpJQ==}
+  '@tiptap/pm@2.27.2':
+    resolution: {integrity: sha512-kaEg7BfiJPDQMKbjVIzEPO3wlcA+pZb2tlcK9gPrdDnEFaec2QTF1sXz2ak2IIb2curvnIrQ4yrfHgLlVA72wA==}
 
-  '@tiptap/starter-kit@2.10.4':
-    resolution: {integrity: sha512-tu/WCs9Mkr5Nt8c3/uC4VvAbQlVX0OY7ygcqdzHGUeG9zP3twdW7o5xM3kyDKR2++sbVzqu5Ll5qNU+1JZvPGQ==}
+  '@tiptap/starter-kit@2.27.2':
+    resolution: {integrity: sha512-bb0gJvPoDuyRUQ/iuN52j1//EtWWttw+RXAv1uJxfR0uKf8X7uAqzaOOgwjknoCIDC97+1YHwpGdnRjpDkOBxw==}
 
-  '@trivago/prettier-plugin-sort-imports@5.2.2':
-    resolution: {integrity: sha512-fYDQA9e6yTNmA13TLVSA+WMQRc5Bn/c0EUBditUHNfMMxN7M82c38b1kEggVE3pLpZ0FwkwJkUEKMiOi52JXFA==}
-    engines: {node: '>18.12'}
+  '@tmcp/adapter-valibot@0.1.5':
+    resolution: {integrity: sha512-9P2wrVYPngemNK0UvPb/opC722/jfd09QxXmme1TRp/wPsl98vpSk/MXt24BCMqBRv4Dvs0xxJH4KHDcjXW52Q==}
     peerDependencies:
-      '@vue/compiler-sfc': 3.x
-      prettier: 2.x - 3.x
-      prettier-plugin-svelte: 3.x
-      svelte: 4.x || 5.x
+      tmcp: ^1.17.0
+      valibot: ^1.1.0
+
+  '@tmcp/session-manager@0.2.1':
+    resolution: {integrity: sha512-DOGy9LfufXCy1wfpGHZ6qPSDQtRnTVwOb71+41ffovTqzLMZlK3iLK/LIsekHxIiku+iIAUiqEKN+DHbqEm8IA==}
+    peerDependencies:
+      tmcp: ^1.16.3
+
+  '@tmcp/transport-http@0.8.3':
+    resolution: {integrity: sha512-gnoBjDBd8/ppl4WRrNKPKHlioCxE8D0zTyNUOzqUjsg0s6GRsyB5iMirh9lC4QjQt0NEOrI+sIJdz+9ymf0MDA==}
+    peerDependencies:
+      '@tmcp/auth': ^0.3.3 || ^0.4.0
+      tmcp: ^1.18.0
     peerDependenciesMeta:
-      '@vue/compiler-sfc':
-        optional: true
-      prettier-plugin-svelte:
-        optional: true
-      svelte:
+      '@tmcp/auth':
         optional: true
 
   '@tweenjs/tween.js@23.1.3':
@@ -3496,8 +3772,11 @@ packages:
   '@types/deep-eql@4.0.2':
     resolution: {integrity: sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==}
 
-  '@types/diff-match-patch@1.0.36':
-    resolution: {integrity: sha512-xFdR6tkm0MWvBfO8xXCSsinYxHcqkQUlcHeSpMC2ukzOb6lwQAfDmW+Qt0AvlGd8HpsS28qKsB+oPeJn9I39jg==}
+  '@types/esquery@1.5.4':
+    resolution: {integrity: sha512-yYO4Q8H+KJHKW1rEeSzHxcZi90durqYgWVfnh5K6ZADVBjBv2e1NEveYX5yT2bffgN7RqzH3k9930m+i2yBoMA==}
+
+  '@types/esrecurse@4.3.1':
+    resolution: {integrity: sha512-xJBAbDifo5hpffDBuHl0Y8ywswbiAp/Wi7Y/GtAgSlZyIABppyurxVueOPE8LUQOxdlgi6Zqce7uoEpqNTeiUw==}
 
   '@types/estree@1.0.8':
     resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}
@@ -3583,9 +3862,6 @@ packages:
   '@types/unist@3.0.3':
     resolution: {integrity: sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==}
 
-  '@types/web-bluetooth@0.0.20':
-    resolution: {integrity: sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==}
-
   '@types/web-bluetooth@0.0.21':
     resolution: {integrity: sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==}
 
@@ -3616,8 +3892,8 @@ packages:
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/project-service@8.50.0':
-    resolution: {integrity: sha512-Cg/nQcL1BcoTijEWyx4mkVC56r8dj44bFDvBdygifuS20f3OZCHmFbjF34DPSi07kwlFvqfv/xOLnJ5DquxSGQ==}
+  '@typescript-eslint/project-service@8.56.0':
+    resolution: {integrity: sha512-M3rnyL1vIQOMeWxTWIW096/TtVP+8W3p/XnaFflhmcFp+U4zlxUxWj4XwNs6HbDeTtN4yun0GNTTDBw/SvufKg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
@@ -3626,8 +3902,8 @@ packages:
     resolution: {integrity: sha512-npgS3zi+/30KSOkXNs0LQXtsg9ekZ8OISAOLGWA/ZOEn0ZH74Ginfl7foziV8DT+D98WfQ5Kopwqb/PZOaIJGg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/scope-manager@8.50.0':
-    resolution: {integrity: sha512-xCwfuCZjhIqy7+HKxBLrDVT5q/iq7XBVBXLn57RTIIpelLtEIZHXAF/Upa3+gaCpeV1NNS5Z9A+ID6jn50VD4A==}
+  '@typescript-eslint/scope-manager@8.56.0':
+    resolution: {integrity: sha512-7UiO/XwMHquH+ZzfVCfUNkIXlp/yQjjnlYUyYz7pfvlK3/EyyN6BK+emDmGNyQLBtLGaYrTAI6KOw8tFucWL2w==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@typescript-eslint/tsconfig-utils@8.49.0':
@@ -3636,8 +3912,8 @@ packages:
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/tsconfig-utils@8.50.0':
-    resolution: {integrity: sha512-vxd3G/ybKTSlm31MOA96gqvrRGv9RJ7LGtZCn2Vrc5htA0zCDvcMqUkifcjrWNNKXHUU3WCkYOzzVSFBd0wa2w==}
+  '@typescript-eslint/tsconfig-utils@8.56.0':
+    resolution: {integrity: sha512-bSJoIIt4o3lKXD3xmDh9chZcjCz5Lk8xS7Rxn+6l5/pKrDpkCwtQNQQwZ2qRPk7TkUYhrq3WPIHXOXlbXP0itg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
@@ -3653,8 +3929,8 @@ packages:
     resolution: {integrity: sha512-e9k/fneezorUo6WShlQpMxXh8/8wfyc+biu6tnAqA81oWrEic0k21RHzP9uqqpyBBeBKu4T+Bsjy9/b8u7obXQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/types@8.50.0':
-    resolution: {integrity: sha512-iX1mgmGrXdANhhITbpp2QQM2fGehBse9LbTf0sidWK6yg/NE+uhV5dfU1g6EYPlcReYmkE9QLPq/2irKAmtS9w==}
+  '@typescript-eslint/types@8.56.0':
+    resolution: {integrity: sha512-DBsLPs3GsWhX5HylbP9HNG15U0bnwut55Lx12bHB9MpXxQ+R5GC8MwQe+N1UFXxAeQDvEsEDY6ZYwX03K7Z6HQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@typescript-eslint/typescript-estree@8.49.0':
@@ -3663,8 +3939,8 @@ packages:
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/typescript-estree@8.50.0':
-    resolution: {integrity: sha512-W7SVAGBR/IX7zm1t70Yujpbk+zdPq/u4soeFSknWFdXIFuWsBGBOUu/Tn/I6KHSKvSh91OiMuaSnYp3mtPt5IQ==}
+  '@typescript-eslint/typescript-estree@8.56.0':
+    resolution: {integrity: sha512-ex1nTUMWrseMltXUHmR2GAQ4d+WjkZCT4f+4bVsps8QEdh0vlBsaCokKTPlnqBFqqGaxilDNJG7b8dolW2m43Q==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
@@ -3676,19 +3952,19 @@ packages:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/utils@8.50.0':
-    resolution: {integrity: sha512-87KgUXET09CRjGCi2Ejxy3PULXna63/bMYv72tCAlDJC3Yqwln0HiFJ3VJMst2+mEtNtZu5oFvX4qJGjKsnAgg==}
+  '@typescript-eslint/utils@8.56.0':
+    resolution: {integrity: sha512-RZ3Qsmi2nFGsS+n+kjLAYDPVlrzf7UhTffrDIKr+h2yzAlYP/y5ZulU0yeDEPItos2Ph46JAL5P/On3pe7kDIQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      eslint: ^8.57.0 || ^9.0.0
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
       typescript: '>=4.8.4 <6.0.0'
 
   '@typescript-eslint/visitor-keys@8.49.0':
     resolution: {integrity: sha512-LlKaciDe3GmZFphXIc79THF/YYBugZ7FS1pO581E/edlVVNbZKDy93evqmrfQ9/Y4uN0vVhX4iuchq26mK/iiA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/visitor-keys@8.50.0':
-    resolution: {integrity: sha512-Xzmnb58+Db78gT/CCj/PVCvK+zxbnsw6F+O1oheYszJbBSdEjVhQi3C/Xttzxgi/GLmpvOggRs1RFpiJ8+c34Q==}
+  '@typescript-eslint/visitor-keys@8.56.0':
+    resolution: {integrity: sha512-q+SL+b+05Ud6LbEE35qe4A99P+htKTKVbyiNEe45eCbJFyh/HVK9QXwlrbz+Q4L8SOW4roxSVwXYj4DMBT7Ieg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@unrs/resolver-binding-android-arm-eabi@1.11.1':
@@ -3786,11 +4062,16 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@valibot/to-json-schema@1.5.0':
+    resolution: {integrity: sha512-GE7DmSr1C2UCWPiV0upRH6mv0cCPsqYGs819fb6srCS1tWhyXrkGGe+zxUiwzn/L1BOfADH4sNjY/YHCuP8phQ==}
+    peerDependencies:
+      valibot: ^1.2.0
+
   '@vitejs/plugin-vue@6.0.3':
     resolution: {integrity: sha512-TlGPkLFLVOY3T7fZrwdvKpjprR3s4fxRln0ORDo1VQ7HHyxJwTlrjKU3kpVWTlaAjIEuCTokmjkZnr8Tpc925w==}
     engines: {node: ^20.19.0 || >=22.12.0}
     peerDependencies:
-      vite: ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
+      vite: 8.0.0-beta.13
       vue: ^3.2.25
 
   '@vitest/coverage-v8@4.0.16':
@@ -3808,22 +4089,11 @@ packages:
   '@vitest/expect@4.0.16':
     resolution: {integrity: sha512-eshqULT2It7McaJkQGLkPjPjNph+uevROGuIMJdG3V+0BSR2w9u6J9Lwu+E8cK5TETlfou8GRijhafIMhXsimA==}
 
-  '@vitest/mocker@3.2.4':
-    resolution: {integrity: sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==}
-    peerDependencies:
-      msw: ^2.4.9
-      vite: ^5.0.0 || ^6.0.0 || ^7.0.0-0
-    peerDependenciesMeta:
-      msw:
-        optional: true
-      vite:
-        optional: true
-
   '@vitest/mocker@4.0.16':
     resolution: {integrity: sha512-yb6k4AZxJTB+q9ycAvsoxGn+j/po0UaPgajllBgt1PzoMAAmJGYFdDk0uCcRcxb3BrME34I6u8gHZTQlkqSZpg==}
     peerDependencies:
       msw: ^2.4.9
-      vite: ^6.0.0 || ^7.0.0-0
+      vite: 8.0.0-beta.13
     peerDependenciesMeta:
       msw:
         optional: true
@@ -3862,20 +4132,20 @@ packages:
   '@volar/language-core@2.4.15':
     resolution: {integrity: sha512-3VHw+QZU0ZG9IuQmzT68IyN4hZNd9GchGPhbD9+pa8CVv7rnoOZwo7T8weIbrRmihqy3ATpdfXFnqRrfPVK6CA==}
 
-  '@volar/language-core@2.4.27':
-    resolution: {integrity: sha512-DjmjBWZ4tJKxfNC1F6HyYERNHPYS7L7OPFyCrestykNdUZMFYzI9WTyvwPcaNaHlrEUwESHYsfEw3isInncZxQ==}
+  '@volar/language-core@2.4.28':
+    resolution: {integrity: sha512-w4qhIJ8ZSitgLAkVay6AbcnC7gP3glYM3fYwKV3srj8m494E3xtrCv6E+bWviiK/8hs6e6t1ij1s2Endql7vzQ==}
 
   '@volar/source-map@2.4.15':
     resolution: {integrity: sha512-CPbMWlUN6hVZJYGcU/GSoHu4EnCHiLaXI9n8c9la6RaI9W5JHX+NqG+GSQcB0JdC2FIBLdZJwGsfKyBB71VlTg==}
 
-  '@volar/source-map@2.4.27':
-    resolution: {integrity: sha512-ynlcBReMgOZj2i6po+qVswtDUeeBRCTgDurjMGShbm8WYZgJ0PA4RmtebBJ0BCYol1qPv3GQF6jK7C9qoVc7lg==}
+  '@volar/source-map@2.4.28':
+    resolution: {integrity: sha512-yX2BDBqJkRXfKw8my8VarTyjv48QwxdJtvRgUpNE5erCsgEUdI2DsLbpa+rOQVAJYshY99szEcRDmyHbF10ggQ==}
 
   '@volar/typescript@2.4.15':
     resolution: {integrity: sha512-2aZ8i0cqPGjXb4BhkMsPYDkkuc2ZQ6yOpqwAuNwUoncELqoy5fRgOQtLR9gB0g902iS0NAkvpIzs27geVyVdPg==}
 
-  '@volar/typescript@2.4.27':
-    resolution: {integrity: sha512-eWaYCcl/uAPInSK2Lze6IqVWaBu/itVqR5InXcHXFyles4zO++Mglt3oxdgj75BDcv1Knr9Y93nowS8U3wqhxg==}
+  '@volar/typescript@2.4.28':
+    resolution: {integrity: sha512-Ja6yvWrbis2QtN4ClAKreeUZPVYMARDYZl9LMEv1iQ1QdepB6wn0jTRxA9MftYmYa4DQ4k/DaSZpFPUfxl8giw==}
 
   '@vue/babel-helper-vue-transform-on@1.4.0':
     resolution: {integrity: sha512-mCokbouEQ/ocRce/FpKCRItGo+013tHg7tixg3DUNS+6bmIchPt66012kBMm476vyEIJPafrvOf4E5OYj3shSw==}
@@ -3896,50 +4166,50 @@ packages:
   '@vue/compiler-core@3.5.13':
     resolution: {integrity: sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==}
 
-  '@vue/compiler-core@3.5.25':
-    resolution: {integrity: sha512-vay5/oQJdsNHmliWoZfHPoVZZRmnSWhug0BYT34njkYTPqClh3DNWLkZNJBVSjsNMrg0CCrBfoKkjZQPM/QVUw==}
-
-  '@vue/compiler-core@3.5.26':
-    resolution: {integrity: sha512-vXyI5GMfuoBCnv5ucIT7jhHKl55Y477yxP6fc4eUswjP8FG3FFVFd41eNDArR+Uk3QKn2Z85NavjaxLxOC19/w==}
+  '@vue/compiler-core@3.5.28':
+    resolution: {integrity: sha512-kviccYxTgoE8n6OCw96BNdYlBg2GOWfBuOW4Vqwrt7mSKWKwFVvI8egdTltqRgITGPsTFYtKYfxIG8ptX2PJHQ==}
 
   '@vue/compiler-dom@3.5.13':
     resolution: {integrity: sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==}
 
-  '@vue/compiler-dom@3.5.25':
-    resolution: {integrity: sha512-4We0OAcMZsKgYoGlMjzYvaoErltdFI2/25wqanuTu+S4gismOTRTBPi4IASOjxWdzIwrYSjnqONfKvuqkXzE2Q==}
-
-  '@vue/compiler-dom@3.5.26':
-    resolution: {integrity: sha512-y1Tcd3eXs834QjswshSilCBnKGeQjQXB6PqFn/1nxcQw4pmG42G8lwz+FZPAZAby6gZeHSt/8LMPfZ4Rb+Bd/A==}
+  '@vue/compiler-dom@3.5.28':
+    resolution: {integrity: sha512-/1ZepxAb159jKR1btkefDP+J2xuWL5V3WtleRmxaT+K2Aqiek/Ab/+Ebrw2pPj0sdHO8ViAyyJWfhXXOP/+LQA==}
 
   '@vue/compiler-sfc@3.5.13':
     resolution: {integrity: sha512-6VdaljMpD82w6c2749Zhf5T9u5uLBWKnVue6XWxprDobftnletJ8+oel7sexFfM3qIxNmVE7LSFGTpv6obNyaQ==}
 
-  '@vue/compiler-sfc@3.5.25':
-    resolution: {integrity: sha512-PUgKp2rn8fFsI++lF2sO7gwO2d9Yj57Utr5yEsDf3GNaQcowCLKL7sf+LvVFvtJDXUp/03+dC6f2+LCv5aK1ag==}
+  '@vue/compiler-sfc@3.5.28':
+    resolution: {integrity: sha512-6TnKMiNkd6u6VeVDhZn/07KhEZuBSn43Wd2No5zaP5s3xm8IqFTHBj84HJah4UepSUJTro5SoqqlOY22FKY96g==}
 
   '@vue/compiler-ssr@3.5.13':
     resolution: {integrity: sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==}
 
-  '@vue/compiler-ssr@3.5.25':
-    resolution: {integrity: sha512-ritPSKLBcParnsKYi+GNtbdbrIE1mtuFEJ4U1sWeuOMlIziK5GtOL85t5RhsNy4uWIXPgk+OUdpnXiTdzn8o3A==}
+  '@vue/compiler-ssr@3.5.28':
+    resolution: {integrity: sha512-JCq//9w1qmC6UGLWJX7RXzrGpKkroubey/ZFqTpvEIDJEKGgntuDMqkuWiZvzTzTA5h2qZvFBFHY7fAAa9475g==}
 
   '@vue/compiler-vue2@2.7.16':
     resolution: {integrity: sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==}
 
-  '@vue/devtools-api@6.6.3':
-    resolution: {integrity: sha512-0MiMsFma/HqA6g3KLKn+AGpL1kgKhFWszC9U29NfpWK5LE7bjeXxySWJrOJ77hBz+TBrBQ7o4QJqbPbqbs8rJw==}
-
   '@vue/devtools-api@6.6.4':
     resolution: {integrity: sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==}
 
+  '@vue/devtools-api@7.7.9':
+    resolution: {integrity: sha512-kIE8wvwlcZ6TJTbNeU2HQNtaxLx3a84aotTITUuL/4bzfPxzajGBOoqjMhwZJ8L9qFYDU/lAYMEEm11dnZOD6g==}
+
   '@vue/devtools-core@8.0.5':
     resolution: {integrity: sha512-dpCw8nl0GDBuiL9SaY0mtDxoGIEmU38w+TQiYEPOLhW03VDC0lfNMYXS/qhl4I0YlysGp04NLY4UNn6xgD0VIQ==}
     peerDependencies:
       vue: ^3.0.0
 
+  '@vue/devtools-kit@7.7.9':
+    resolution: {integrity: sha512-PyQ6odHSgiDVd4hnTP+aDk2X4gl2HmLDfiyEnn3/oV+ckFDuswRs4IbBT7vacMuGdwY/XemxBoh302ctbsptuA==}
+
   '@vue/devtools-kit@8.0.5':
     resolution: {integrity: sha512-q2VV6x1U3KJMTQPUlRMyWEKVbcHuxhqJdSr6Jtjz5uAThAIrfJ6WVZdGZm5cuO63ZnSUz0RCsVwiUUb0mDV0Yg==}
 
+  '@vue/devtools-shared@7.7.9':
+    resolution: {integrity: sha512-iWAb0v2WYf0QWmxCGy0seZNDPdO3Sp5+u78ORnyeonS6MT4PC7VPrryX2BpMJrwlDeaZ6BD4vP4XKjK0SZqaeA==}
+
   '@vue/devtools-shared@8.0.5':
     resolution: {integrity: sha512-bRLn6/spxpmgLk+iwOrR29KrYnJjG9DGpHGkDFG82UM21ZpJ39ztUT9OXX3g+usW7/b2z+h46I9ZiYyB07XMXg==}
 
@@ -3959,8 +4229,8 @@ packages:
       typescript:
         optional: true
 
-  '@vue/language-core@3.2.1':
-    resolution: {integrity: sha512-g6oSenpnGMtpxHGAwKuu7HJJkNZpemK/zg3vZzZbJ6cnnXq1ssxuNrXSsAHYM3NvH8p4IkTw+NLmuxyeYz4r8A==}
+  '@vue/language-core@3.2.5':
+    resolution: {integrity: sha512-d3OIxN/+KRedeM5wQ6H6NIpwS3P5gC9nmyaHgBk+rO6dIsjY+tOh4UlPpiZbAh3YtLdCGEX4M16RmsBqPmJV+g==}
 
   '@vue/reactivity@3.5.13':
     resolution: {integrity: sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==}
@@ -3979,34 +4249,28 @@ packages:
   '@vue/shared@3.5.13':
     resolution: {integrity: sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==}
 
-  '@vue/shared@3.5.25':
-    resolution: {integrity: sha512-AbOPdQQnAnzs58H2FrrDxYj/TJfmeS2jdfEEhgiKINy+bnOANmVizIEgq1r+C5zsbs6l1CCQxtcj71rwNQ4jWg==}
-
-  '@vue/shared@3.5.26':
-    resolution: {integrity: sha512-7Z6/y3uFI5PRoKeorTOSXKcDj0MSasfNNltcslbFrPpcw6aXRUALq4IfJlaTRspiWIUOEZbrpM+iQGmCOiWe4A==}
+  '@vue/shared@3.5.28':
+    resolution: {integrity: sha512-cfWa1fCGBxrvaHRhvV3Is0MgmrbSCxYTXCSCau2I0a1Xw1N1pHAvkWCiXPRAqjvToILvguNyEwjevUqAuBQWvQ==}
 
   '@vue/test-utils@2.4.6':
     resolution: {integrity: sha512-FMxEjOpYNYiFe0GkaHsnJPXFHxQ6m4t8vI/ElPGpMWxZKpmRvQ33OIrvRXemy6yha03RxhOlQuy+gZMC3CQSow==}
 
-  '@vueuse/core@11.0.0':
-    resolution: {integrity: sha512-shibzNGjmRjZucEm97B8V0NO5J3vPHMCE/mltxQ3vHezbDoFQBMtK11XsfwfPionxSbo+buqPmsCljtYuXIBpw==}
-
   '@vueuse/core@12.8.2':
     resolution: {integrity: sha512-HbvCmZdzAu3VGi/pWYm5Ut+Kd9mn1ZHnn4L5G8kOQTPs/IwIAmJoBrmYk2ckLArgMXZj0AW3n5CAejLUO+PhdQ==}
 
-  '@vueuse/core@13.9.0':
-    resolution: {integrity: sha512-ts3regBQyURfCE2BcytLqzm8+MmLlo5Ln/KLoxDVcsZ2gzIwVNnQpQOL/UKV8alUqjSZOlpFZcRNsLRqj+OzyA==}
+  '@vueuse/core@14.2.0':
+    resolution: {integrity: sha512-tpjzVl7KCQNVd/qcaCE9XbejL38V6KJAEq/tVXj7mDPtl6JtzmUdnXelSS+ULRkkrDgzYVK7EerQJvd2jR794Q==}
     peerDependencies:
       vue: ^3.5.0
 
-  '@vueuse/integrations@13.9.0':
-    resolution: {integrity: sha512-SDobKBbPIOe0cVL7QxMzGkuUGHvWTdihi9zOrrWaWUgFKe15cwEcwfWmgrcNzjT6kHnNmWuTajPHoIzUjYNYYQ==}
+  '@vueuse/integrations@14.2.0':
+    resolution: {integrity: sha512-Yuo5XbIi6XkfSXOYKd5SBZwyBEyO3Hd41eeG2555hDbE0Maz/P0BfPJDYhgDXjS9xI0jkWUUp1Zh5lXHOgkwLw==}
     peerDependencies:
       async-validator: ^4
       axios: ^1
       change-case: ^5
       drauu: ^0.4
-      focus-trap: ^7
+      focus-trap: ^7 || ^8
       fuse.js: ^7
       idb-keyval: ^6
       jwt-decode: ^4
@@ -4041,23 +4305,17 @@ packages:
       universal-cookie:
         optional: true
 
-  '@vueuse/metadata@11.0.0':
-    resolution: {integrity: sha512-0TKsAVT0iUOAPWyc9N79xWYfovJVPATiOPVKByG6jmAYdDiwvMVm9xXJ5hp4I8nZDxpCcYlLq/Rg9w1Z/jrGcg==}
-
   '@vueuse/metadata@12.8.2':
     resolution: {integrity: sha512-rAyLGEuoBJ/Il5AmFHiziCPdQzRt88VxR+Y/A/QhJ1EWtWqPBBAxTAFaSkviwEuOEZNtW8pvkPgoCZQ+HxqW1A==}
 
-  '@vueuse/metadata@13.9.0':
-    resolution: {integrity: sha512-1AFRvuiGphfF7yWixZa0KwjYH8ulyjDCC0aFgrGRz8+P4kvDFSdXLVfTk5xAN9wEuD1J6z4/myMoYbnHoX07zg==}
-
-  '@vueuse/shared@11.0.0':
-    resolution: {integrity: sha512-i4ZmOrIEjSsL94uAEt3hz88UCz93fMyP/fba9S+vypX90fKg3uYX9cThqvWc9aXxuTzR0UGhOKOTQd//Goh1nQ==}
+  '@vueuse/metadata@14.2.0':
+    resolution: {integrity: sha512-i3axTGjU8b13FtyR4Keeama+43iD+BwX9C2TmzBVKqjSHArF03hjkp2SBZ1m72Jk2UtrX0aYCugBq2R1fhkuAQ==}
 
   '@vueuse/shared@12.8.2':
     resolution: {integrity: sha512-dznP38YzxZoNloI0qpEfpkms8knDtaoQ6Y/sfS0L7Yki4zh40LFHEhur0odJC6xTHG5dxWVPiUWBXn+wCG2s5w==}
 
-  '@vueuse/shared@13.9.0':
-    resolution: {integrity: sha512-e89uuTLMh0U5cZ9iDpEI2senqPGfbPRTHM/0AaQkcxnpqjkZqDYP8rpfm7edOz8s+pOCOROEy1PIveSW8+fL5g==}
+  '@vueuse/shared@14.2.0':
+    resolution: {integrity: sha512-Z0bmluZTlAXgUcJ4uAFaML16JcD8V0QG00Db3quR642I99JXIDRa2MI2LGxiLVhcBjVnL1jOzIvT5TT2lqJlkA==}
     peerDependencies:
       vue: ^3.5.0
 
@@ -4112,8 +4370,8 @@ packages:
     engines: {node: '>=0.4.0'}
     hasBin: true
 
-  acorn@8.15.0:
-    resolution: {integrity: sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==}
+  acorn@8.16.0:
+    resolution: {integrity: sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==}
     engines: {node: '>=0.4.0'}
     hasBin: true
 
@@ -4149,8 +4407,8 @@ packages:
       ajv:
         optional: true
 
-  ajv@6.12.6:
-    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
+  ajv@6.14.0:
+    resolution: {integrity: sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==}
 
   ajv@8.12.0:
     resolution: {integrity: sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==}
@@ -4158,8 +4416,8 @@ packages:
   ajv@8.13.0:
     resolution: {integrity: sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==}
 
-  ajv@8.17.1:
-    resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==}
+  ajv@8.18.0:
+    resolution: {integrity: sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==}
 
   algoliasearch@5.21.0:
     resolution: {integrity: sha512-hexLq2lSO1K5SW9j21Ubc+q9Ptx7dyRTY7se19U8lhIlVMLCNXWCyQ6C22p9ez8ccX0v7QVmwkl2l1CnuGoO2Q==}
@@ -4181,8 +4439,8 @@ packages:
     resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==}
     engines: {node: '>=6'}
 
-  ansi-escapes@7.2.0:
-    resolution: {integrity: sha512-g6LhBsl+GBPRWGWsBtutpzBYuIIdBkLEvad5C/va/74Db018+5TZiyA26cZJAr3Rft5lprVqOIPxf5Vid6tqAw==}
+  ansi-escapes@7.3.0:
+    resolution: {integrity: sha512-BvU8nYgGQBxcmMuEeUEmNTvrMVjJNSH7RgW24vXexN4Ven6qCvy4TntnvlnwnMLTVlcRQQdbRY8NKnaIoeWDNg==}
     engines: {node: '>=18'}
 
   ansi-regex@5.0.1:
@@ -4293,8 +4551,8 @@ packages:
   asynckit@0.4.0:
     resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
 
-  atomically@2.0.3:
-    resolution: {integrity: sha512-kU6FmrwZ3Lx7/7y3hPS5QnbJfaohcIul5fGqf7ok+4KklIEk9tJ0C2IQPdacSbVUWv6zVHXEBWoWd6NrVMT7Cw==}
+  atomically@2.1.1:
+    resolution: {integrity: sha512-P4w9o2dqARji6P7MHprklbfiArZAWvo07yW7qs3pdljb3BWr12FIB7W+p0zJiuiVsUpRO0iZn1kFFcpPegg0tQ==}
 
   auto-bind@5.0.1:
     resolution: {integrity: sha512-ooviqdwwgfIfNmDwo94wlshcdzfO64XV0Cg6oDsDYBJfITDz1EngD2z7DkbvCWn+XIMsIqW27sEVF6qcpJrRcg==}
@@ -4308,8 +4566,8 @@ packages:
     resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
     engines: {node: '>= 0.4'}
 
-  axios@1.13.2:
-    resolution: {integrity: sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==}
+  axios@1.13.5:
+    resolution: {integrity: sha512-cz4ur7Vb0xS4/KUN0tPWe44eqxrIu31me+fbang3ijiNscE129POzipJJA6zniq2C/Z6sJCjMimjS8Lc/GAs8Q==}
 
   babel-plugin-const-enum@1.2.0:
     resolution: {integrity: sha512-o1m/6iyyFnp9MRsK1dHF3bneqyf3AlM2q3A/YbgQr2pCat6B6XJVDv2TXqzfY2RYUi4mak6WAksSBPlyYGx9dg==}
@@ -4320,8 +4578,8 @@ packages:
     resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==}
     engines: {node: '>=10', npm: '>=6'}
 
-  babel-plugin-polyfill-corejs2@0.4.14:
-    resolution: {integrity: sha512-Co2Y9wX854ts6U8gAAPXfn0GmAyctHuK8n0Yhfjd6t30g7yvKjspvvOo9yG+z52PZRgFErt7Ka2pYnXCjLKEpg==}
+  babel-plugin-polyfill-corejs2@0.4.15:
+    resolution: {integrity: sha512-hR3GwrRwHUfYwGfrisXPIDP3JcYfBrW7wKE7+Au6wDYl7fm/ka1NEII6kORzxNU556JjfidZeBsO10kYvtV1aw==}
     peerDependencies:
       '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
 
@@ -4330,8 +4588,13 @@ packages:
     peerDependencies:
       '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
 
-  babel-plugin-polyfill-regenerator@0.6.5:
-    resolution: {integrity: sha512-ISqQ2frbiNU9vIJkzg7dlPpznPZ4jOiUQ1uSmB0fEHeowtN3COYRsXr/xexn64NpU13P06jc/L5TgiJXOgrbEg==}
+  babel-plugin-polyfill-corejs3@0.14.0:
+    resolution: {integrity: sha512-AvDcMxJ34W4Wgy4KBIIePQTAOP1Ie2WFwkQp3dB7FQ/f0lI5+nM96zUnYEOE1P9sEg0es5VCP0HxiWu5fUHZAQ==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+
+  babel-plugin-polyfill-regenerator@0.6.6:
+    resolution: {integrity: sha512-hYm+XLYRMvupxiQzrvXUj7YyvFFVfv5gI0R71AJzudg1g2AI2vyCPPIFEBjk162/wFzti3inBHo7isWFuEVS/A==}
     peerDependencies:
       '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
 
@@ -4357,6 +4620,10 @@ packages:
   balanced-match@2.0.0:
     resolution: {integrity: sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==}
 
+  balanced-match@4.0.3:
+    resolution: {integrity: sha512-1pHv8LX9CpKut1Zp4EXey7Z8OfH11ONNH6Dhi2WDUt31VVZFXZzKwXcysBgqSumFCmR+0dqjMK5v5JiFHzi0+g==}
+    engines: {node: 20 || >=22}
+
   base64-arraybuffer@1.0.2:
     resolution: {integrity: sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==}
     engines: {node: '>= 0.6.0'}
@@ -4397,6 +4664,10 @@ packages:
   brace-expansion@2.0.2:
     resolution: {integrity: sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==}
 
+  brace-expansion@5.0.2:
+    resolution: {integrity: sha512-Pdk8c9poy+YhOgVWw1JNN22/HcivgKWwpxKq04M/jTmHyCZn12WPJebZxdjSa5TmBqISrUSgNYU3eRORljfCCw==}
+    engines: {node: 20 || >=22}
+
   braces@3.0.3:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
     engines: {node: '>=8'}
@@ -4477,8 +4748,8 @@ packages:
     resolution: {integrity: sha512-aYeC/jDgSEx8SHWZvANYMioYMZ2KX02W6f6uVfyteuCGcadDLcYVHdfdygsTQkQ4TKn5lghoojAsPj5pu0SnvQ==}
     engines: {pnpm: '>=8'}
 
-  check-error@2.1.1:
-    resolution: {integrity: sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==}
+  check-error@2.1.3:
+    resolution: {integrity: sha512-PAJdDJusoxnwm1VwW07VWwUN1sl7smmC3OKggvndJFadxxDRyFJBX/ggnu/KE4kQAB7a3Dp8f/YXC1FlUprWmA==}
     engines: {node: '>= 16'}
 
   chokidar@3.6.0:
@@ -4489,10 +4760,6 @@ packages:
     resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==}
     engines: {node: '>= 14.16.0'}
 
-  chownr@3.0.0:
-    resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==}
-    engines: {node: '>=18'}
-
   clean-css@5.3.3:
     resolution: {integrity: sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==}
     engines: {node: '>= 10.0'}
@@ -4517,18 +4784,10 @@ packages:
     resolution: {integrity: sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==}
     engines: {node: '>=6'}
 
-  cli-spinners@2.9.2:
-    resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==}
-    engines: {node: '>=6'}
-
-  cli-spinners@3.2.0:
-    resolution: {integrity: sha512-pXftdQloMZzjCr3pCTIRniDcys6dDzgpgVhAHHk6TKBDbRuP1MkuetTF5KSv4YUutbOPa7+7ZrAJ2kVtbMqyXA==}
+  cli-spinners@3.4.0:
+    resolution: {integrity: sha512-bXfOC4QcT1tKXGorxL3wbJm6XJPDqEnij2gQ2m7ESQuE+/z9YFIWnl/5RpTiKWbMq3EVKR4fRLJGn6DVfu0mpw==}
     engines: {node: '>=18.20'}
 
-  cli-truncate@4.0.0:
-    resolution: {integrity: sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==}
-    engines: {node: '>=18'}
-
   cli-truncate@5.1.1:
     resolution: {integrity: sha512-SroPvNHxUnk+vIW/dOSfNqdy1sPEFkrTk6TUtqLCnBlo3N7TNYYkzzN7uSD6+jVjrdO4+p8nH7JzH6cIvUem6A==}
     engines: {node: '>=20'}
@@ -4574,6 +4833,10 @@ packages:
     resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==}
     engines: {node: '>=14'}
 
+  commander@11.1.0:
+    resolution: {integrity: sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==}
+    engines: {node: '>=16'}
+
   commander@13.1.0:
     resolution: {integrity: sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==}
     engines: {node: '>=18'}
@@ -4612,8 +4875,8 @@ packages:
   config-chain@1.1.13:
     resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==}
 
-  configstore@7.0.0:
-    resolution: {integrity: sha512-yk7/5PN5im4qwz0WFZW3PXnzHgPu9mX29Y8uZ3aefe2lBPC1FYttWZRcaW9fKkT0pBCJyuQ2HfbmPVaODi9jcQ==}
+  configstore@7.1.0:
+    resolution: {integrity: sha512-N4oog6YJWbR9kGyXvS7jEykLDXIE2C0ILYqNBZBp9iwiJpoCBWYsuAdW6PPFn6w06jjnC+3JstVvWHO4cZqvRg==}
     engines: {node: '>=18'}
 
   connect-history-api-fallback@1.6.0:
@@ -4641,8 +4904,11 @@ packages:
     resolution: {integrity: sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==}
     engines: {node: '>=12.13'}
 
-  core-js-compat@3.47.0:
-    resolution: {integrity: sha512-IGfuznZ/n7Kp9+nypamBhvwdwLsW6KC8IOaURw2doAK5e98AG3acVLdh0woOnEqCfUtS+Vu882JE4k/DAm3ItQ==}
+  core-js-compat@3.48.0:
+    resolution: {integrity: sha512-OM4cAF3D6VtH/WkLtWvyNC56EZVXsZdU3iqaMG2B4WvYrlqU831pc4UtG5yp0sE9z8Y02wVN7PjW5Zf9Gt0f1Q==}
+
+  core-js@3.48.0:
+    resolution: {integrity: sha512-zpEHTy1fjTMZCKLHUZoVeylt9XrzaIN2rbPXEt0k+q7JE5CkCZdo6bNq55bn24a69CH7ErAVLKijxJja4fw+UQ==}
 
   core-util-is@1.0.3:
     resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
@@ -4679,6 +4945,13 @@ packages:
   css-select@4.3.0:
     resolution: {integrity: sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==}
 
+  css-select@5.2.2:
+    resolution: {integrity: sha512-TizTzUddG/xYLA3NXodFM0fSbNizXjOKhqiQQwvhlspadZokn1KDy0NZFS0wuEubIYAV5/c1/lAr0TaaFXEXzw==}
+
+  css-tree@2.2.1:
+    resolution: {integrity: sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==}
+    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0, npm: '>=7.0.0'}
+
   css-tree@3.1.0:
     resolution: {integrity: sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==}
     engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
@@ -4695,6 +4968,10 @@ packages:
     engines: {node: '>=4'}
     hasBin: true
 
+  csso@5.0.5:
+    resolution: {integrity: sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==}
+    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0, npm: '>=7.0.0'}
+
   cssstyle@5.3.5:
     resolution: {integrity: sha512-GlsEptulso7Jg0VaOZ8BXQi3AkYM5BOJKEO/rjMidSCq70FkIC5y0eawrCXeYzxgt3OCf4Ls+eoxN+/05vN0Ag==}
     engines: {node: '>=20'}
@@ -4753,8 +5030,8 @@ packages:
   decimal.js@10.6.0:
     resolution: {integrity: sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==}
 
-  decode-named-character-reference@1.2.0:
-    resolution: {integrity: sha512-c6fcElNV6ShtZXmsgNgFFV5tVX2PaV4g+MOAkb8eXHvn6sryJBrZa9r0zV6+dtTyoCKxtDy5tyQ5ZwQuidtd+Q==}
+  decode-named-character-reference@1.3.0:
+    resolution: {integrity: sha512-GtpQYB283KrPp6nRw50q3U9/VfOutZOe103qlN7BPP6Ad27xYnOIWv4lPzo8HCAL+mMZofJ9KEy30fq6MfaK6Q==}
 
   deep-eql@5.0.2:
     resolution: {integrity: sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==}
@@ -4775,8 +5052,8 @@ packages:
     resolution: {integrity: sha512-x1VCxdX4t+8wVfd1so/9w+vQ4vx7lKd2Qp5tDRutErwmR85OgmfX7RlLRMWafRMY7hbEiXIbudNrjOAPa/hL8Q==}
     engines: {node: '>=18'}
 
-  default-browser@5.4.0:
-    resolution: {integrity: sha512-XDuvSq38Hr1MdN47EDvYtx3U0MTqpCEn+F6ft8z2vYDzMrvQhVp0ui9oQdqW3MvK3vqUETglt1tVGgjLuJ5izg==}
+  default-browser@5.5.0:
+    resolution: {integrity: sha512-H9LMLr5zwIbSxrmvikGuI/5KGhZ8E2zH3stkMgM5LpOWDutGM2JZaj460Udnf1a+946zc7YBgrqEWwbk7zHvGw==}
     engines: {node: '>=18'}
 
   defaults@1.0.4:
@@ -4809,8 +5086,8 @@ packages:
     resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==}
     engines: {node: '>=6'}
 
-  detect-libc@2.0.4:
-    resolution: {integrity: sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==}
+  detect-libc@2.1.2:
+    resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}
     engines: {node: '>=8'}
 
   detect-port@1.6.1:
@@ -4821,8 +5098,9 @@ packages:
   devlop@1.1.0:
     resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==}
 
-  diff-match-patch@1.0.5:
-    resolution: {integrity: sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==}
+  diff@8.0.3:
+    resolution: {integrity: sha512-qejHi7bcSD4hQAZE0tNAawRK1ZtafHDmMTMkrrIGgSLl7hTnQHmKCeB45xAcbfTqK2zowkM3j3bHt/4b/ARbYQ==}
+    engines: {node: '>=0.3.1'}
 
   dir-glob@3.0.1:
     resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
@@ -4862,8 +5140,8 @@ packages:
     resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
     engines: {node: '>= 4'}
 
-  dompurify@3.2.5:
-    resolution: {integrity: sha512-mLPd29uoRe9HpvwP2TxClGQBzGXeEC/we/q+bFlmPPmj2p2Ugl3r6ATu/UU1v77DXNcehiBg9zsr1dREyA/dJQ==}
+  dompurify@3.3.1:
+    resolution: {integrity: sha512-qkdCKzLNtrgPFP1Vo+98FRzJnBRGe4ffyCea9IwHB1fyxPOeNTHpLKYGd4Uk9xvNoH0ZoOjwZxNptyMwqrId1Q==}
 
   domutils@2.8.0:
     resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==}
@@ -4926,8 +5204,8 @@ packages:
   end-of-stream@1.4.5:
     resolution: {integrity: sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==}
 
-  enhanced-resolve@5.18.3:
-    resolution: {integrity: sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==}
+  enhanced-resolve@5.19.0:
+    resolution: {integrity: sha512-phv3E1Xl4tQOShqSte26C7Fl84EwUdZsyOuSSk9qtAGyyQs2s3jJzComh+Abf4g187lUUAvH+H26omrqia2aGg==}
     engines: {node: '>=10.13.0'}
 
   enquirer@2.3.6:
@@ -4945,8 +5223,8 @@ packages:
     resolution: {integrity: sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==}
     engines: {node: '>=0.12'}
 
-  entities@7.0.0:
-    resolution: {integrity: sha512-FDWG5cmEYf2Z00IkYRhbFrwIwvdFKH07uV8dvNy0omp/Qb1xcyCWp2UDtcwJF4QZZvk0sLudP6/hAu42TaqVhQ==}
+  entities@7.0.1:
+    resolution: {integrity: sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==}
     engines: {node: '>=0.12'}
 
   env-paths@2.2.1:
@@ -5006,8 +5284,8 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
-  esbuild@0.27.1:
-    resolution: {integrity: sha512-yY35KZckJJuVVPXpvjgxiCuVEJT67F6zDeVTv4rizyPrfGBUpZQsvmxnN+C371c2esD/hNMjj4tpBhuueLN7aA==}
+  esbuild@0.27.3:
+    resolution: {integrity: sha512-8VwMnyGCONIs6cWue2IdpHxHnAjzxnw2Zr7MkVxB2vjmQ2ivqGFb4LEG3SMnv0Gb2F/G/2yA8zUaiL1gywDCCg==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -5093,6 +5371,19 @@ packages:
       eslint-import-resolver-webpack:
         optional: true
 
+  eslint-plugin-better-tailwindcss@4.3.1:
+    resolution: {integrity: sha512-b6xM31GukKz0WlgMD0tQdY/rLjf/9mWIk8EcA45ngOKJPPQf1C482xZtBlT357jyunQE2mOk4NlPcL4i9Pr85A==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=23.0.0}
+    peerDependencies:
+      eslint: ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0
+      oxlint: ^1.35.0
+      tailwindcss: ^3.3.0 || ^4.1.17
+    peerDependenciesMeta:
+      eslint:
+        optional: true
+      oxlint:
+        optional: true
+
   eslint-plugin-import-x@4.16.1:
     resolution: {integrity: sha512-vPZZsiOKaBAIATpFE2uMI4w5IRwdv/FpQ+qZZMR4E+PeOcM4OeoEbqxRMnywdxP19TyB/3h6QBB0EWon7letSQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -5119,11 +5410,11 @@ packages:
   eslint-plugin-oxlint@1.25.0:
     resolution: {integrity: sha512-grS4KdR9FAxoQC+wMkepeQHL4osMhoYfUI11Pot6Gitqr4wWi+JZrX0Shr8Bs9fjdWhEjtaZIV6cr4mbfytmyw==}
 
-  eslint-plugin-storybook@10.1.9:
-    resolution: {integrity: sha512-2XCnHhu+9ShW8U/MsvnlT4ZkzADIPtlfYVD/GBBbs8loWu0x9IZ3EfNg1LEImjvvNVDhwpd5K04lK4CAP+2bWA==}
+  eslint-plugin-storybook@10.2.10:
+    resolution: {integrity: sha512-aWkoh2rhTaEsMA4yB1iVIcISM5wb0uffp09ZqhwpoD4GAngCs131uq6un+QdnOMc7vXyAnBBfsuhtOj8WwCUgw==}
     peerDependencies:
       eslint: '>=8'
-      storybook: ^10.1.9
+      storybook: ^10.2.10
 
   eslint-plugin-unused-imports@4.3.0:
     resolution: {integrity: sha512-ZFBmXMGBYfHttdRtOG9nFFpmUvMtbHSjsKrS20vdWdbfiVYsO3yA2SGYy9i9XmZJDfMGBflZGBCm70SEnFQtOA==}
@@ -5152,6 +5443,10 @@ packages:
     resolution: {integrity: sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  eslint-scope@9.1.1:
+    resolution: {integrity: sha512-GaUN0sWim5qc8KVErfPBWmc31LEsOkrUJbvJZV+xuL3u2phMUK4HIvXlWAakfC8W4nzlK+chPEAkYOYb5ZScIw==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+
   eslint-visitor-keys@3.4.3:
     resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -5160,6 +5455,10 @@ packages:
     resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  eslint-visitor-keys@5.0.1:
+    resolution: {integrity: sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+
   eslint@9.39.1:
     resolution: {integrity: sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -5170,6 +5469,9 @@ packages:
       jiti:
         optional: true
 
+  esm-env@1.2.2:
+    resolution: {integrity: sha512-Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA==}
+
   esm-resolve@1.0.11:
     resolution: {integrity: sha512-LxF0wfUQm3ldUDHkkV2MIbvvY0TgzIpJ420jHSV1Dm+IlplBEWiJTKWM61GtxUfvjV6iD4OtTYFGAGM2uuIUWg==}
 
@@ -5177,6 +5479,10 @@ packages:
     resolution: {integrity: sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  espree@11.1.1:
+    resolution: {integrity: sha512-AVHPqQoZYc+RUM4/3Ly5udlZY/U4LS8pIG05jEjWM2lQMU/oaZ7qshzAl2YP1tfNmXfftH3ohurfwNAug+MnsQ==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+
   espree@9.6.1:
     resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -5186,8 +5492,8 @@ packages:
     engines: {node: '>=4'}
     hasBin: true
 
-  esquery@1.6.0:
-    resolution: {integrity: sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==}
+  esquery@1.7.0:
+    resolution: {integrity: sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==}
     engines: {node: '>=0.10'}
 
   esrecurse@4.3.0:
@@ -5258,8 +5564,8 @@ packages:
     resolution: {integrity: sha512-dBR+30yHAqBGvOuxxQdnn2lTLHCO6r/9B+M4yF8mNrzr3u1yiF+YVJ6u3GTyPN/VRWqaE1FcscZDdBgVKmrmQQ==}
     engines: {node: '>=18.2.0'}
 
-  fast-uri@3.0.3:
-    resolution: {integrity: sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==}
+  fast-uri@3.1.0:
+    resolution: {integrity: sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==}
 
   fastest-levenshtein@1.0.16:
     resolution: {integrity: sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==}
@@ -5287,6 +5593,9 @@ packages:
       picomatch:
         optional: true
 
+  fflate@0.4.8:
+    resolution: {integrity: sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA==}
+
   fflate@0.8.2:
     resolution: {integrity: sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==}
 
@@ -5423,8 +5732,8 @@ packages:
     resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
     engines: {node: 6.* || 8.* || >= 10.*}
 
-  get-east-asian-width@1.4.0:
-    resolution: {integrity: sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q==}
+  get-east-asian-width@1.5.0:
+    resolution: {integrity: sha512-CQ+bEO+Tva/qlmw24dCejulK5pMzVnUOFOijVogd3KQs07HnRIgp8TGipvCCRT06xeYEbpbgwaCxglFyiuIcmA==}
     engines: {node: '>=18'}
 
   get-intrinsic@1.3.0:
@@ -5450,18 +5759,19 @@ packages:
     resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
     engines: {node: '>=10.13.0'}
 
-  glob@10.4.5:
-    resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==}
+  glob@10.5.0:
+    resolution: {integrity: sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==}
+    deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
     hasBin: true
 
-  glob@11.0.3:
-    resolution: {integrity: sha512-2Nim7dha1KVkaiF4q6Dj+ngPPMdfvLJEOpZk/jKiUAkqKebpGAWQXAq9z1xu9HKu5lWfqw/FASuccEjyznjPaA==}
-    engines: {node: 20 || >=22}
-    hasBin: true
+  glob@13.0.6:
+    resolution: {integrity: sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==}
+    engines: {node: 18 || 20 || >=22}
 
   glob@9.3.5:
     resolution: {integrity: sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==}
     engines: {node: '>=16 || 14 >=14.17'}
+    deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
 
   global-directory@4.0.1:
     resolution: {integrity: sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==}
@@ -5648,13 +5958,13 @@ packages:
     resolution: {integrity: sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
 
-  ink@6.2.2:
-    resolution: {integrity: sha512-LN1f+/D8KKqMqRux08fIfA9wsEAJ9Bu9CiI3L6ih7bnqNSDUXT/JVJ0rUIc4NkjPiPaeI3BVNREcLYLz9ePSEg==}
+  ink@6.8.0:
+    resolution: {integrity: sha512-sbl1RdLOgkO9isK42WCZlJCFN9hb++sX9dsklOvfd1YQ3bQ2AiFu12Q6tFlr0HvEUvzraJntQCCpfEoUe9DSzA==}
     engines: {node: '>=20'}
     peerDependencies:
       '@types/react': '>=19.0.0'
       react: '>=19.0.0'
-      react-devtools-core: ^4.19.1
+      react-devtools-core: '>=6.1.2'
     peerDependenciesMeta:
       '@types/react':
         optional: true
@@ -5736,10 +6046,6 @@ packages:
     resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
     engines: {node: '>=8'}
 
-  is-fullwidth-code-point@4.0.0:
-    resolution: {integrity: sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==}
-    engines: {node: '>=12'}
-
   is-fullwidth-code-point@5.1.0:
     resolution: {integrity: sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==}
     engines: {node: '>=18'}
@@ -5786,8 +6092,8 @@ packages:
     resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==}
     engines: {node: '>= 0.4'}
 
-  is-npm@6.0.0:
-    resolution: {integrity: sha512-JEjxbSmtPSt1c8XTkVrlujcXdKV1/tvuQ7GwKcAlyiVLeYFQ2VHat8xfrDJsIkhCdF/tZ7CiIR3sy141c6+gPQ==}
+  is-npm@6.1.0:
+    resolution: {integrity: sha512-O2z4/kNgyjhQwVR1Wpkbfc19JIhggF97NZNCpWTnjH7kVcZMUrnut9XSN7txI7VdyIYk5ZatOq3zvSuWpU8hoA==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
   is-number-object@1.1.1:
@@ -5868,8 +6174,8 @@ packages:
     resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==}
     engines: {node: '>=8'}
 
-  is-wsl@3.1.0:
-    resolution: {integrity: sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==}
+  is-wsl@3.1.1:
+    resolution: {integrity: sha512-e6rvdUCiQCAuumZslxRJWR/Doq4VpPR82kqclvcS0efgt430SlGIk05vdCN58+VrzgtIcfNODjozVielycD4Sw==}
     engines: {node: '>=16'}
 
   isarray@1.0.0:
@@ -5900,22 +6206,14 @@ packages:
     resolution: {integrity: sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==}
     engines: {node: '>=8'}
 
-  jackspeak@3.4.0:
-    resolution: {integrity: sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==}
-    engines: {node: '>=14'}
-
-  jackspeak@4.1.1:
-    resolution: {integrity: sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==}
-    engines: {node: 20 || >=22}
+  jackspeak@3.4.3:
+    resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==}
 
   jake@10.9.2:
     resolution: {integrity: sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==}
     engines: {node: '>=10'}
     hasBin: true
 
-  javascript-natural-sort@0.7.1:
-    resolution: {integrity: sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==}
-
   jest-diff@30.2.0:
     resolution: {integrity: sha512-dQHFo3Pt4/NLlG5z4PxZ/3yZTZ1C7s9hveiOj+GCN+uT109NC2QgsoVZsVOAvbJ3RgKkvyLGXZV9+piDpWbm6A==}
     engines: {node: ^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0}
@@ -5945,8 +6243,8 @@ packages:
   js-tokens@9.0.1:
     resolution: {integrity: sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==}
 
-  js-yaml@3.14.1:
-    resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
+  js-yaml@3.14.2:
+    resolution: {integrity: sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==}
     hasBin: true
 
   js-yaml@4.1.1:
@@ -5962,11 +6260,6 @@ packages:
       canvas:
         optional: true
 
-  jsesc@3.0.2:
-    resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==}
-    engines: {node: '>=6'}
-    hasBin: true
-
   jsesc@3.1.0:
     resolution: {integrity: sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==}
     engines: {node: '>=6'}
@@ -5978,14 +6271,17 @@ packages:
   json-parse-even-better-errors@2.3.1:
     resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
 
+  json-rpc-2.0@1.7.1:
+    resolution: {integrity: sha512-JqZjhjAanbpkXIzFE7u8mE/iFblawwlXtONaCvRqI+pyABVz7B4M1EUNpyVW+dZjqgQ2L5HFmZCmOCgUKm00hg==}
+
   json-schema-traverse@0.4.1:
     resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
 
   json-schema-traverse@1.0.0:
     resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
 
-  json-schema-typed@8.0.1:
-    resolution: {integrity: sha512-XQmWYj2Sm4kn4WeTYvmpKEbyPsL7nBsb647c7pMe6l02/yx2+Jfc4dT6UZkEXnIUb5LhD55r2HPsJ1milQ4rDg==}
+  json-schema-typed@8.0.2:
+    resolution: {integrity: sha512-fQhoXdcvc3V28x7C7BMs4P5+kNlgUURe2jmUT1T//oBRMDrqy1QPelJimwZGo7Hg9VPV3EQV5Bnq4hbFy2vetA==}
 
   json-stable-stringify-without-jsonify@1.0.1:
     resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
@@ -6003,6 +6299,10 @@ packages:
     engines: {node: '>=6'}
     hasBin: true
 
+  jsonata@2.1.0:
+    resolution: {integrity: sha512-OCzaRMK8HobtX8fp37uIVmL8CY1IGc/a6gLsDqz3quExFR09/U78HUzWYr7T31UEB6+Eu0/8dkVD5fFDOl9a8w==}
+    engines: {node: '>= 8'}
+
   jsonc-eslint-parser@2.4.0:
     resolution: {integrity: sha512-WYDyuc/uFcGp6YtM2H0uKmUwieOuzeE/5YocFJLnLfclZ4inf3mRn8ZVy1s7Hxji7Jxm6Ss8gqpexD/GlKoGgg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -6013,8 +6313,8 @@ packages:
   jsonc-parser@3.3.1:
     resolution: {integrity: sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==}
 
-  jsondiffpatch@0.6.0:
-    resolution: {integrity: sha512-3QItJOXp2AP1uv7waBkao5nCvhEv+QmJAd38Ybq7wNI74Q+BBmnLn4EDKz6yI9xGAIQoUF87qHt+kc1IVxB4zQ==}
+  jsondiffpatch@0.7.3:
+    resolution: {integrity: sha512-zd4dqFiXSYyant2WgSXAZ9+yYqilNVvragVNkNRn2IFZKgjyULNrKRznqN4Zon0MkLueCg+3QaPVCnDAVP20OQ==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
 
@@ -6057,8 +6357,8 @@ packages:
   kolorist@1.8.0:
     resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==}
 
-  ky@1.9.0:
-    resolution: {integrity: sha512-NgBeR/cu7kuC4BAeF1rnXhfoI2uQ9RBe8zl5vo87ASsf1iIQoCeOxyt6Io6K4Ki++5ItCavXAtbEWWCGFciQ6g==}
+  ky@1.14.3:
+    resolution: {integrity: sha512-9zy9lkjac+TR1c2tG+mkNSVlyOpInnWdSMiue4F+kq8TwJSgv6o8jhLRg8Ho6SnZ9wOYUq/yozts9qQCfk7bIw==}
     engines: {node: '>=18'}
 
   latest-version@9.0.0:
@@ -6081,68 +6381,74 @@ packages:
   lie@3.3.0:
     resolution: {integrity: sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==}
 
-  lightningcss-darwin-arm64@1.30.1:
-    resolution: {integrity: sha512-c8JK7hyE65X1MHMN+Viq9n11RRC7hgin3HhYKhrMyaXflk5GVplZ60IxyoVtzILeKr+xAJwg6zK6sjTBJ0FKYQ==}
+  lightningcss-android-arm64@1.31.1:
+    resolution: {integrity: sha512-HXJF3x8w9nQ4jbXRiNppBCqeZPIAfUo8zE/kOEGbW5NZvGc/K7nMxbhIr+YlFlHW5mpbg/YFPdbnCh1wAXCKFg==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [android]
+
+  lightningcss-darwin-arm64@1.31.1:
+    resolution: {integrity: sha512-02uTEqf3vIfNMq3h/z2cJfcOXnQ0GRwQrkmPafhueLb2h7mqEidiCzkE4gBMEH65abHRiQvhdcQ+aP0D0g67sg==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [darwin]
 
-  lightningcss-darwin-x64@1.30.1:
-    resolution: {integrity: sha512-k1EvjakfumAQoTfcXUcHQZhSpLlkAuEkdMBsI/ivWw9hL+7FtilQc0Cy3hrx0AAQrVtQAbMI7YjCgYgvn37PzA==}
+  lightningcss-darwin-x64@1.31.1:
+    resolution: {integrity: sha512-1ObhyoCY+tGxtsz1lSx5NXCj3nirk0Y0kB/g8B8DT+sSx4G9djitg9ejFnjb3gJNWo7qXH4DIy2SUHvpoFwfTA==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [darwin]
 
-  lightningcss-freebsd-x64@1.30.1:
-    resolution: {integrity: sha512-kmW6UGCGg2PcyUE59K5r0kWfKPAVy4SltVeut+umLCFoJ53RdCUWxcRDzO1eTaxf/7Q2H7LTquFHPL5R+Gjyig==}
+  lightningcss-freebsd-x64@1.31.1:
+    resolution: {integrity: sha512-1RINmQKAItO6ISxYgPwszQE1BrsVU5aB45ho6O42mu96UiZBxEXsuQ7cJW4zs4CEodPUioj/QrXW1r9pLUM74A==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [freebsd]
 
-  lightningcss-linux-arm-gnueabihf@1.30.1:
-    resolution: {integrity: sha512-MjxUShl1v8pit+6D/zSPq9S9dQ2NPFSQwGvxBCYaBYLPlCWuPh9/t1MRS8iUaR8i+a6w7aps+B4N0S1TYP/R+Q==}
+  lightningcss-linux-arm-gnueabihf@1.31.1:
+    resolution: {integrity: sha512-OOCm2//MZJ87CdDK62rZIu+aw9gBv4azMJuA8/KB74wmfS3lnC4yoPHm0uXZ/dvNNHmnZnB8XLAZzObeG0nS1g==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm]
     os: [linux]
 
-  lightningcss-linux-arm64-gnu@1.30.1:
-    resolution: {integrity: sha512-gB72maP8rmrKsnKYy8XUuXi/4OctJiuQjcuqWNlJQ6jZiWqtPvqFziskH3hnajfvKB27ynbVCucKSm2rkQp4Bw==}
+  lightningcss-linux-arm64-gnu@1.31.1:
+    resolution: {integrity: sha512-WKyLWztD71rTnou4xAD5kQT+982wvca7E6QoLpoawZ1gP9JM0GJj4Tp5jMUh9B3AitHbRZ2/H3W5xQmdEOUlLg==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
 
-  lightningcss-linux-arm64-musl@1.30.1:
-    resolution: {integrity: sha512-jmUQVx4331m6LIX+0wUhBbmMX7TCfjF5FoOH6SD1CttzuYlGNVpA7QnrmLxrsub43ClTINfGSYyHe2HWeLl5CQ==}
+  lightningcss-linux-arm64-musl@1.31.1:
+    resolution: {integrity: sha512-mVZ7Pg2zIbe3XlNbZJdjs86YViQFoJSpc41CbVmKBPiGmC4YrfeOyz65ms2qpAobVd7WQsbW4PdsSJEMymyIMg==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
 
-  lightningcss-linux-x64-gnu@1.30.1:
-    resolution: {integrity: sha512-piWx3z4wN8J8z3+O5kO74+yr6ze/dKmPnI7vLqfSqI8bccaTGY5xiSGVIJBDd5K5BHlvVLpUB3S2YCfelyJ1bw==}
+  lightningcss-linux-x64-gnu@1.31.1:
+    resolution: {integrity: sha512-xGlFWRMl+0KvUhgySdIaReQdB4FNudfUTARn7q0hh/V67PVGCs3ADFjw+6++kG1RNd0zdGRlEKa+T13/tQjPMA==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
 
-  lightningcss-linux-x64-musl@1.30.1:
-    resolution: {integrity: sha512-rRomAK7eIkL+tHY0YPxbc5Dra2gXlI63HL+v1Pdi1a3sC+tJTcFrHX+E86sulgAXeI7rSzDYhPSeHHjqFhqfeQ==}
+  lightningcss-linux-x64-musl@1.31.1:
+    resolution: {integrity: sha512-eowF8PrKHw9LpoZii5tdZwnBcYDxRw2rRCyvAXLi34iyeYfqCQNA9rmUM0ce62NlPhCvof1+9ivRaTY6pSKDaA==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
 
-  lightningcss-win32-arm64-msvc@1.30.1:
-    resolution: {integrity: sha512-mSL4rqPi4iXq5YVqzSsJgMVFENoa4nGTT/GjO2c0Yl9OuQfPsIfncvLrEW6RbbB24WtZ3xP/2CCmI3tNkNV4oA==}
+  lightningcss-win32-arm64-msvc@1.31.1:
+    resolution: {integrity: sha512-aJReEbSEQzx1uBlQizAOBSjcmr9dCdL3XuC/6HLXAxmtErsj2ICo5yYggg1qOODQMtnjNQv2UHb9NpOuFtYe4w==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [win32]
 
-  lightningcss-win32-x64-msvc@1.30.1:
-    resolution: {integrity: sha512-PVqXh48wh4T53F/1CCu8PIPCxLzWyCnn/9T5W1Jpmdy5h9Cwd+0YQS6/LwhHXSafuc61/xg9Lv5OrCby6a++jg==}
+  lightningcss-win32-x64-msvc@1.31.1:
+    resolution: {integrity: sha512-I9aiFrbd7oYHwlnQDqr1Roz+fTz61oDDJX7n9tYF9FJymH1cIN1DtKw3iYt6b8WZgEjoNwVSncwF4wx/ZedMhw==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [win32]
 
-  lightningcss@1.30.1:
-    resolution: {integrity: sha512-xi6IyHML+c9+Q3W0S4fCQJOym42pyurFiJUHEcEyHS0CeKzia4yZDEsLlqOFykxOdHpNy0NmvVO31vcSqAxJCg==}
+  lightningcss@1.31.1:
+    resolution: {integrity: sha512-l51N2r93WmGUye3WuFoN5k10zyvrVs0qfKBhyC5ogUQ6Ew6JUSswh78mbSO+IU3nTWsyOArqPCcShdQSadghBQ==}
     engines: {node: '>= 12.0.0'}
 
   lines-and-columns@1.2.4:
@@ -6155,8 +6461,8 @@ packages:
   linkify-it@5.0.0:
     resolution: {integrity: sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==}
 
-  linkifyjs@4.2.0:
-    resolution: {integrity: sha512-pCj3PrQyATaoTYKHrgWRF3SJwsm61udVh+vuls/Rl6SptiDhgE7ziUIudAedRY9QEfynmM7/RmLEfPUyw1HPCw==}
+  linkifyjs@4.3.2:
+    resolution: {integrity: sha512-NT1CJtq3hHIreOianA8aSXn6Cw0JzYOuDQbOrSPe7gqFnCpKP++MQe3ODgO3oh2GJFORkAAdqredOa60z63GbA==}
 
   lint-staged@16.2.7:
     resolution: {integrity: sha512-lDIj4RnYmK7/kXMya+qJsmkRFkGolciXjrsZ6PC25GdTfWOAWetR0ZbsNXRAj1EHHImRSalc+whZFg56F5DVow==}
@@ -6175,8 +6481,8 @@ packages:
     resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
     engines: {node: '>=10'}
 
-  lodash-es@4.17.21:
-    resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
+  lodash-es@4.17.23:
+    resolution: {integrity: sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==}
 
   lodash.camelcase@4.3.0:
     resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
@@ -6190,8 +6496,8 @@ packages:
   lodash.truncate@4.4.2:
     resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
 
-  lodash@4.17.21:
-    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
+  lodash@4.17.23:
+    resolution: {integrity: sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==}
 
   log-symbols@4.1.0:
     resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
@@ -6220,8 +6526,8 @@ packages:
   lru-cache@10.4.3:
     resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
 
-  lru-cache@11.2.4:
-    resolution: {integrity: sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==}
+  lru-cache@11.2.6:
+    resolution: {integrity: sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==}
     engines: {node: 20 || >=22}
 
   lru-cache@5.1.1:
@@ -6260,8 +6566,8 @@ packages:
   markdown-it-task-lists@2.1.1:
     resolution: {integrity: sha512-TxFAc76Jnhb2OUu+n3yz9RMu4CwGfaT788br6HhEDlvWfdeJcLUsxk1Hgw2yJio0OXsxv7pyIPmvECY7bMbluA==}
 
-  markdown-it@14.1.0:
-    resolution: {integrity: sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==}
+  markdown-it@14.1.1:
+    resolution: {integrity: sha512-BuU2qnTti9YKgK5N+IeMubp14ZUKUUw7yeJbkjtosvHiP0AZ5c8IAgEMk79D0eC8F23r4Ac/q8cAIFdm2FtyoA==}
     hasBin: true
 
   markdown-table@3.0.4:
@@ -6282,8 +6588,8 @@ packages:
   mdast-util-find-and-replace@3.0.2:
     resolution: {integrity: sha512-Tmd1Vg/m3Xz43afeNxDIhWRtFZgM2VLyaf4vSTYwudTyeuTneoL3qtWMA5jeLyz/O1vDJmmV4QuScFCA2tBPwg==}
 
-  mdast-util-from-markdown@2.0.2:
-    resolution: {integrity: sha512-uZhTV/8NBuw0WHkPTrCqDOl0zVe1BIng5ZtHoDk49ME1qqcjYmmLmOf0gELgcRMxN4w2iuIeVso5/6QymSrgmA==}
+  mdast-util-from-markdown@2.0.3:
+    resolution: {integrity: sha512-W4mAWTvSlKvf8L6J+VN9yLSqQ9AOAAvHuoDAmPkz4dHf553m5gVj2ejadHJhoJmcmxEnOv6Pa8XJhpxE93kb8Q==}
 
   mdast-util-frontmatter@2.0.1:
     resolution: {integrity: sha512-LRqI9+wdgC25P0URIJY9vwocIzCcksduHQ9OF2joxQoyTNVduwLAFUzjoopuRJbJAReaKrNQKAZKL3uCMugWJA==}
@@ -6315,9 +6621,15 @@ packages:
   mdast-util-to-string@4.0.0:
     resolution: {integrity: sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==}
 
+  mdn-data@2.0.28:
+    resolution: {integrity: sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==}
+
   mdn-data@2.12.2:
     resolution: {integrity: sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==}
 
+  mdn-data@2.23.0:
+    resolution: {integrity: sha512-786vq1+4079JSeu2XdcDjrhi/Ry7BWtjDl9WtGPWLiIHb2T66GvIVflZTBoSNZ5JqTtJGYEVMuFA/lbQlMOyDQ==}
+
   mdurl@2.0.0:
     resolution: {integrity: sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==}
 
@@ -6452,10 +6764,18 @@ packages:
     resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
     engines: {node: '>=4'}
 
-  minimatch@10.0.3:
-    resolution: {integrity: sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==}
+  minimatch@10.1.1:
+    resolution: {integrity: sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==}
     engines: {node: 20 || >=22}
 
+  minimatch@10.2.1:
+    resolution: {integrity: sha512-MClCe8IL5nRRmawL6ib/eT4oLyeKMGCghibcDWK+J0hh0Q8kqSdia6BvbRMVk6mPa6WqUa5uR2oxt6C5jd533A==}
+    engines: {node: 20 || >=22}
+
+  minimatch@10.2.2:
+    resolution: {integrity: sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==}
+    engines: {node: 18 || 20 || >=22}
+
   minimatch@3.1.2:
     resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
 
@@ -6471,10 +6791,6 @@ packages:
     resolution: {integrity: sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==}
     engines: {node: '>=16 || 14 >=14.17'}
 
-  minimatch@9.0.3:
-    resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==}
-    engines: {node: '>=16 || 14 >=14.17'}
-
   minimatch@9.0.5:
     resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==}
     engines: {node: '>=16 || 14 >=14.17'}
@@ -6486,28 +6802,23 @@ packages:
     resolution: {integrity: sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==}
     engines: {node: '>=8'}
 
-  minipass@7.1.2:
-    resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
+  minipass@7.1.3:
+    resolution: {integrity: sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==}
     engines: {node: '>=16 || 14 >=14.17'}
 
-  minizlib@3.0.2:
-    resolution: {integrity: sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==}
-    engines: {node: '>= 18'}
-
   mitt@3.0.1:
     resolution: {integrity: sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==}
 
   mixpanel-browser@2.71.0:
     resolution: {integrity: sha512-jKmDXe68/oQFgk/9ns9Z36bA0CJ31PH8Y77XTLLGfJvhsUPbvu+7Se9e281NejZF6+OMqx7cE+zFxToozYyNrA==}
 
-  mkdirp@3.0.1:
-    resolution: {integrity: sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==}
-    engines: {node: '>=10'}
-    hasBin: true
-
   mlly@1.8.0:
     resolution: {integrity: sha512-l8D9ODSRWLe2KHJSifWGwBqpTZXIXTeo8mlKjY+E2HAakaTeNpqAyBZ8GSqLzHgw4XmHmC8whvpjJNMbFZN7/g==}
 
+  modern-tar@0.7.3:
+    resolution: {integrity: sha512-4W79zekKGyYU4JXVmB78DOscMFaJth2gGhgfTl2alWE4rNe3nf4N2pqenQ0rEtIewrnD79M687Ouba3YGTLOvg==}
+    engines: {node: '>=18.0.0'}
+
   mrmime@2.0.1:
     resolution: {integrity: sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==}
     engines: {node: '>=10'}
@@ -6586,24 +6897,12 @@ packages:
   nth-check@2.1.1:
     resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
 
-  nx@22.2.4:
-    resolution: {integrity: sha512-x94oITsrX1jjSIZDSW/9+aPH9zJNK1m5Hfs2PMkcHR4i6h0fL/vv3+JzGbMF8RZRMTLfqm1ZCxJgAFVh3tPatg==}
+  nx@22.5.2:
+    resolution: {integrity: sha512-s7dd2BZQOremv1AYhxwBY6NzJV9ETa6/OJ/zau/ulbLnHu8E5UAv+EjMC80m3qP3nob5OXnWiITKM9CcOHy6qw==}
     hasBin: true
     peerDependencies:
-      '@swc-node/register': ^1.8.0
-      '@swc/core': ^1.3.85
-    peerDependenciesMeta:
-      '@swc-node/register':
-        optional: true
-      '@swc/core':
-        optional: true
-
-  nx@22.2.6:
-    resolution: {integrity: sha512-6eI+VVX7yTN4UUc6DTmewFyGf8lAa4zFd0p8ttXJ00CXp/xGxAZVvhG7fMg5JXo4EPWx6TfEL49oPZeQjh9ctA==}
-    hasBin: true
-    peerDependencies:
-      '@swc-node/register': ^1.8.0
-      '@swc/core': ^1.3.85
+      '@swc-node/register': ^1.11.1
+      '@swc/core': ^1.15.8
     peerDependenciesMeta:
       '@swc-node/register':
         optional: true
@@ -6690,23 +6989,24 @@ packages:
     resolution: {integrity: sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==}
     engines: {node: '>= 0.4'}
 
-  oxc-parser@0.99.0:
-    resolution: {integrity: sha512-MpS1lbd2vR0NZn1v0drpgu7RUFu3x9Rd0kxExObZc2+F+DIrV0BOMval/RO3BYGwssIOerII6iS8EbbpCCZQpQ==}
-    engines: {node: ^20.19.0 || >=22.12.0}
-
   oxc-resolver@11.15.0:
     resolution: {integrity: sha512-Hk2J8QMYwmIO9XTCUiOH00+Xk2/+aBxRUnhrSlANDyCnLYc32R1WSIq1sU2yEdlqd53FfMpPEpnBYIKQMzliJw==}
 
-  oxlint-tsgolint@0.9.1:
-    resolution: {integrity: sha512-w1lIvUDkkiAPFyo268SFGrdh1LQ3Lcs1XShES7I4X75TliQA0os5XJ5hNZ4lYsSevqcofgEtq4xq7rBumv69iQ==}
+  oxfmt@0.34.0:
+    resolution: {integrity: sha512-t+zTE4XGpzPTK+Zk9gSwcJcFi4pqjl6PwO/ZxPBJiJQ2XCKMucwjPlHxvPHyVKJtkMSyrDGfQ7Ntg/hUr4OgHQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
 
-  oxlint@1.33.0:
-    resolution: {integrity: sha512-4WCL0K8jiOshwJ8WrVk35VAuVaZHC0iX6asjKsrENOrynkAAGcTLLx0Urf0eXZ1Tq7r+qAe3Z9EyHMFPzVyUkg==}
+  oxlint-tsgolint@0.14.2:
+    resolution: {integrity: sha512-XJsFIQwnYJgXFlNDz2MncQMWYxwnfy4BCy73mdiFN/P13gEZrAfBU4Jmz2XXFf9UG0wPILdi7hYa6t0KmKQLhw==}
+    hasBin: true
+
+  oxlint@1.49.0:
+    resolution: {integrity: sha512-YZffp0gM+63CJoRhHjtjRnwKtAgUnXM6j63YQ++aigji2NVvLGsUlrXo9gJUXZOdcbfShLYtA6RuTu8GZ4lzOQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
-      oxlint-tsgolint: '>=0.9.0'
+      oxlint-tsgolint: '>=0.14.1'
     peerDependenciesMeta:
       oxlint-tsgolint:
         optional: true
@@ -6719,12 +7019,12 @@ packages:
     resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
     engines: {node: '>=10'}
 
-  p-map@7.0.3:
-    resolution: {integrity: sha512-VkndIv2fIB99swvQoA65bm+fsmt6UNdGeIB0oxBs+WhAhdh08QA04JXpI7rbB9r08/nkbysKoya9rtDERYOYMA==}
+  p-map@7.0.4:
+    resolution: {integrity: sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==}
     engines: {node: '>=18'}
 
-  package-json-from-dist@1.0.0:
-    resolution: {integrity: sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==}
+  package-json-from-dist@1.0.1:
+    resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==}
 
   package-json@10.0.1:
     resolution: {integrity: sha512-ua1L4OgXSBdsu1FPb7F3tYH0F48a6kxvod4pLUlGY9COeJAJQNX/sNH2IiEmsxw7lqYiAwrdHMjz1FctOsyDQg==}
@@ -6782,9 +7082,9 @@ packages:
     resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==}
     engines: {node: '>=16 || 14 >=14.18'}
 
-  path-scurry@2.0.0:
-    resolution: {integrity: sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==}
-    engines: {node: 20 || >=22}
+  path-scurry@2.0.2:
+    resolution: {integrity: sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==}
+    engines: {node: 18 || 20 || >=22}
 
   path-type@4.0.0:
     resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
@@ -6803,6 +7103,9 @@ packages:
     resolution: {integrity: sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==}
     engines: {node: '>= 14.16'}
 
+  perfect-debounce@1.0.0:
+    resolution: {integrity: sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==}
+
   perfect-debounce@2.0.0:
     resolution: {integrity: sha512-fkEH/OBiKrqqI/yIgjR92lMfs2K8105zt/VT6+7eTjNwisrsh47CeIED9z58zI7DfKdH3uHAn25ziRZn3kgAow==}
 
@@ -6826,15 +7129,12 @@ packages:
     engines: {node: '>=0.10'}
     hasBin: true
 
-  pinia@2.2.2:
-    resolution: {integrity: sha512-ja2XqFWZC36mupU4z1ZzxeTApV7DOw44cV4dhQ9sGwun+N89v/XP7+j7q6TanS1u1tdbK4r+1BUx7heMaIdagA==}
+  pinia@3.0.4:
+    resolution: {integrity: sha512-l7pqLUFTI/+ESXn6k3nu30ZIzW5E2WZF/LaHJEpoq6ElcLD+wduZoB2kBN19du6K/4FDpPMazY2wJr+IndBtQw==}
     peerDependencies:
-      '@vue/composition-api': ^1.4.0
-      typescript: '>=4.4.4'
-      vue: ^2.6.14 || ^3.3.0
+      typescript: '>=4.5.0'
+      vue: ^3.5.11
     peerDependenciesMeta:
-      '@vue/composition-api':
-        optional: true
       typescript:
         optional: true
 
@@ -6844,13 +7144,13 @@ packages:
   pkg-types@2.3.0:
     resolution: {integrity: sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==}
 
-  playwright-core@1.57.0:
-    resolution: {integrity: sha512-agTcKlMw/mjBWOnD6kFZttAAGHgi/Nw0CZ2o6JqWSbMlI219lAFLZZCyqByTsvVAJq5XA5H8cA6PrvBRpBWEuQ==}
+  playwright-core@1.58.1:
+    resolution: {integrity: sha512-bcWzOaTxcW+VOOGBCQgnaKToLJ65d6AqfLVKEWvexyS3AS6rbXl+xdpYRMGSRBClPvyj44njOWoxjNdL/H9UNg==}
     engines: {node: '>=18'}
     hasBin: true
 
-  playwright@1.57.0:
-    resolution: {integrity: sha512-ilYQj1s8sr2ppEJ2YVadYBN0Mb3mdo9J0wQ+UuDhzYqURwSoW4n1Xs5vs7ORwgDGmyEh33tRMeS8KhdkMoLXQw==}
+  playwright@1.58.1:
+    resolution: {integrity: sha512-+2uTZHxSCcxjvGc5C891LrS1/NlxglGxzrC4seZiVjcYVQfUa87wBL6rTDqzGjuoWNjnBzRqKmF6zRYGMvQUaQ==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -6888,6 +7188,12 @@ packages:
     resolution: {integrity: sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==}
     engines: {node: ^10 || ^12 || >=14}
 
+  posthog-js@1.358.1:
+    resolution: {integrity: sha512-teipwLZtfErKDrURiUlLMnmpjgjGlni15JxyJ7oRaSlT3sX4E/mgvNatHIbWnp+7z1zYm3Jz5BYwGqwgyesRnw==}
+
+  preact@10.28.4:
+    resolution: {integrity: sha512-uKFfOHWuSNpRFVTnljsCluEFq57OKT+0QdOiQo8XWnQ/pSvg7OpX5eNOejELXJMWy+BwM2nobz0FkvzmnpCNsQ==}
+
   prelude-ls@1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
@@ -6926,50 +7232,50 @@ packages:
   promise@7.3.1:
     resolution: {integrity: sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==}
 
-  prosemirror-changeset@2.2.1:
-    resolution: {integrity: sha512-J7msc6wbxB4ekDFj+n9gTW/jav/p53kdlivvuppHsrZXCaQdVgRghoZbSS3kwrRyAstRVQ4/+u5k7YfLgkkQvQ==}
+  prosemirror-changeset@2.4.0:
+    resolution: {integrity: sha512-LvqH2v7Q2SF6yxatuPP2e8vSUKS/L+xAU7dPDC4RMyHMhZoGDfBC74mYuyYF4gLqOEG758wajtyhNnsTkuhvng==}
 
   prosemirror-collab@1.3.1:
     resolution: {integrity: sha512-4SnynYR9TTYaQVXd/ieUvsVV4PDMBzrq2xPUWutHivDuOshZXqQ5rGbZM84HEaXKbLdItse7weMGOUdDVcLKEQ==}
 
-  prosemirror-commands@1.6.2:
-    resolution: {integrity: sha512-0nDHH++qcf/BuPLYvmqZTUUsPJUCPBUXt0J1ErTcDIS369CTp773itzLGIgIXG4LJXOlwYCr44+Mh4ii6MP1QA==}
+  prosemirror-commands@1.7.1:
+    resolution: {integrity: sha512-rT7qZnQtx5c0/y/KlYaGvtG411S97UaL6gdp6RIZ23DLHanMYLyfGBV5DtSnZdthQql7W+lEVbpSfwtO8T+L2w==}
 
-  prosemirror-dropcursor@1.8.1:
-    resolution: {integrity: sha512-M30WJdJZLyXHi3N8vxN6Zh5O8ZBbQCz0gURTfPmTIBNQ5pxrdU7A58QkNqfa98YEjSAL1HUyyU34f6Pm5xBSGw==}
+  prosemirror-dropcursor@1.8.2:
+    resolution: {integrity: sha512-CCk6Gyx9+Tt2sbYk5NK0nB1ukHi2ryaRgadV/LvyNuO3ena1payM2z6Cg0vO1ebK8cxbzo41ku2DE5Axj1Zuiw==}
 
-  prosemirror-gapcursor@1.3.2:
-    resolution: {integrity: sha512-wtjswVBd2vaQRrnYZaBCbyDqr232Ed4p2QPtRIUK5FuqHYKGWkEwl08oQM4Tw7DOR0FsasARV5uJFvMZWxdNxQ==}
+  prosemirror-gapcursor@1.4.0:
+    resolution: {integrity: sha512-z00qvurSdCEWUIulij/isHaqu4uLS8r/Fi61IbjdIPJEonQgggbJsLnstW7Lgdk4zQ68/yr6B6bf7sJXowIgdQ==}
 
-  prosemirror-history@1.4.1:
-    resolution: {integrity: sha512-2JZD8z2JviJrboD9cPuX/Sv/1ChFng+xh2tChQ2X4bB2HeK+rra/bmJ3xGntCcjhOqIzSDG6Id7e8RJ9QPXLEQ==}
+  prosemirror-history@1.5.0:
+    resolution: {integrity: sha512-zlzTiH01eKA55UAf1MEjtssJeHnGxO0j4K4Dpx+gnmX9n+SHNlDqI2oO1Kv1iPN5B1dm5fsljCfqKF9nFL6HRg==}
 
-  prosemirror-inputrules@1.4.0:
-    resolution: {integrity: sha512-6ygpPRuTJ2lcOXs9JkefieMst63wVJBgHZGl5QOytN7oSZs3Co/BYbc3Yx9zm9H37Bxw8kVzCnDsihsVsL4yEg==}
+  prosemirror-inputrules@1.5.1:
+    resolution: {integrity: sha512-7wj4uMjKaXWAQ1CDgxNzNtR9AlsuwzHfdFH1ygEHA2KHF2DOEaXl1CJfNPAKCg9qNEh4rum975QLaCiQPyY6Fw==}
 
-  prosemirror-keymap@1.2.2:
-    resolution: {integrity: sha512-EAlXoksqC6Vbocqc0GtzCruZEzYgrn+iiGnNjsJsH4mrnIGex4qbLdWWNza3AW5W36ZRrlBID0eM6bdKH4OStQ==}
+  prosemirror-keymap@1.2.3:
+    resolution: {integrity: sha512-4HucRlpiLd1IPQQXNqeo81BGtkY8Ai5smHhKW9jjPKRc2wQIxksg7Hl1tTI2IfT2B/LgX6bfYvXxEpJl7aKYKw==}
 
-  prosemirror-markdown@1.13.1:
-    resolution: {integrity: sha512-Sl+oMfMtAjWtlcZoj/5L/Q39MpEnVZ840Xo330WJWUvgyhNmLBLN7MsHn07s53nG/KImevWHSE6fEj4q/GihHw==}
+  prosemirror-markdown@1.13.4:
+    resolution: {integrity: sha512-D98dm4cQ3Hs6EmjK500TdAOew4Z03EV71ajEFiWra3Upr7diytJsjF4mPV2dW+eK5uNectiRj0xFxYI9NLXDbw==}
 
-  prosemirror-menu@1.2.4:
-    resolution: {integrity: sha512-S/bXlc0ODQup6aiBbWVsX/eM+xJgCTAfMq/nLqaO5ID/am4wS0tTCIkzwytmao7ypEtjj39i7YbJjAgO20mIqA==}
+  prosemirror-menu@1.3.0:
+    resolution: {integrity: sha512-TImyPXCHPcDsSka2/lwJ6WjTASr4re/qWq1yoTTuLOqfXucwF6VcRa2LWCkM/EyTD1UO3CUwiH8qURJoWJRxwg==}
 
-  prosemirror-model@1.24.1:
-    resolution: {integrity: sha512-YM053N+vTThzlWJ/AtPtF1j0ebO36nvbmDy4U7qA2XQB8JVaQp1FmB9Jhrps8s+z+uxhhVTny4m20ptUvhk0Mg==}
+  prosemirror-model@1.25.4:
+    resolution: {integrity: sha512-PIM7E43PBxKce8OQeezAs9j4TP+5yDpZVbuurd1h5phUxEKIu+G2a+EUZzIC5nS1mJktDJWzbqS23n1tsAf5QA==}
 
-  prosemirror-schema-basic@1.2.3:
-    resolution: {integrity: sha512-h+H0OQwZVqMon1PNn0AG9cTfx513zgIG2DY00eJ00Yvgb3UD+GQ/VlWW5rcaxacpCGT1Yx8nuhwXk4+QbXUfJA==}
+  prosemirror-schema-basic@1.2.4:
+    resolution: {integrity: sha512-ELxP4TlX3yr2v5rM7Sb70SqStq5NvI15c0j9j/gjsrO5vaw+fnnpovCLEGIcpeGfifkuqJwl4fon6b+KdrODYQ==}
 
-  prosemirror-schema-list@1.5.0:
-    resolution: {integrity: sha512-gg1tAfH1sqpECdhIHOA/aLg2VH3ROKBWQ4m8Qp9mBKrOxQRW61zc+gMCI8nh22gnBzd1t2u1/NPLmO3nAa3ssg==}
+  prosemirror-schema-list@1.5.1:
+    resolution: {integrity: sha512-927lFx/uwyQaGwJxLWCZRkjXG0p48KpMj6ueoYiu4JX05GGuGcgzAy62dfiV8eFZftgyBUvLx76RsMe20fJl+Q==}
 
-  prosemirror-state@1.4.3:
-    resolution: {integrity: sha512-goFKORVbvPuAQaXhpbemJFRKJ2aixr+AZMGiquiqKxaucC6hlpHNZHWgz5R7dS4roHiwq9vDctE//CZ++o0W1Q==}
+  prosemirror-state@1.4.4:
+    resolution: {integrity: sha512-6jiYHH2CIGbCfnxdHbXZ12gySFY/fz/ulZE333G6bPqIZ4F+TXo9ifiR86nAHpWnfoNjOb3o5ESi7J8Uz1jXHw==}
 
-  prosemirror-tables@1.6.2:
-    resolution: {integrity: sha512-97dKocVLrEVTQjZ4GBLdrrMw7Gv3no8H8yMwf5IRM9OoHrzbWpcH5jJxYgNQIRCtdIqwDctT1HdMHrGTiwp1dQ==}
+  prosemirror-tables@1.8.5:
+    resolution: {integrity: sha512-V/0cDCsHKHe/tfWkeCmthNUcEp1IVO3p6vwN8XtwE9PZQLAZJigbw3QoraAdfJPir4NKJtNvOB8oYGKRl+t0Dw==}
 
   prosemirror-trailing-node@3.0.0:
     resolution: {integrity: sha512-xiun5/3q0w5eRnGYfNlW1uU9W6x5MoFKWwq/0TIRgt09lv7Hcser2QYV8t4muXbEr+Fwo0geYn79Xs4GKywrRQ==}
@@ -6978,11 +7284,11 @@ packages:
       prosemirror-state: ^1.4.2
       prosemirror-view: ^1.33.8
 
-  prosemirror-transform@1.10.2:
-    resolution: {integrity: sha512-2iUq0wv2iRoJO/zj5mv8uDUriOHWzXRnOTVgCzSXnktS/2iQRa3UUQwVlkBlYZFtygw6Nh1+X4mGqoYBINn5KQ==}
+  prosemirror-transform@1.11.0:
+    resolution: {integrity: sha512-4I7Ce4KpygXb9bkiPS3hTEk4dSHorfRw8uI0pE8IhxlK2GXsqv5tIA7JUSxtSu7u8APVOTtbUBxTmnHIxVkIJw==}
 
-  prosemirror-view@1.37.1:
-    resolution: {integrity: sha512-MEAnjOdXU1InxEmhjgmEzQAikaS6lF3hD64MveTPpjOGNTl87iRLA1HupC/DEV6YuK7m4Q9DHFNTjwIVtqz5NA==}
+  prosemirror-view@1.41.6:
+    resolution: {integrity: sha512-mxpcDG4hNQa/CPtzxjdlir5bJFDlm0/x5nGBbStB2BWX+XOQ9M8ekEG+ojqB5BcVu2Rc80/jssCMZzSstJuSYg==}
 
   proto-list@1.2.4:
     resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==}
@@ -7038,8 +7344,8 @@ packages:
     resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
     engines: {node: '>=6'}
 
-  pupa@3.1.0:
-    resolution: {integrity: sha512-FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug==}
+  pupa@3.3.0:
+    resolution: {integrity: sha512-LjgDO2zPtoXP2wJpDjZrGdojii1uqO0cnwKoIoUzkfS98HDmbeiGmYiXo3lXeFlq2xvne1QFQhwYXSUCLKtEuA==}
     engines: {node: '>=12.20'}
 
   qified@0.5.3:
@@ -7049,6 +7355,9 @@ packages:
   quansync@0.2.11:
     resolution: {integrity: sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA==}
 
+  query-selector-shadow-dom@1.0.1:
+    resolution: {integrity: sha512-lT5yCqEBgfoMYpf3F2xQRK7zEr1rhIIZuceDK6+xRkJQ4NMbHTwXqk4NkwDwQMNqXgG9r9fyHnzwNVs6zV5KRw==}
+
   queue-microtask@1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
 
@@ -7059,10 +7368,10 @@ packages:
     resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
     hasBin: true
 
-  react-dom@19.2.3:
-    resolution: {integrity: sha512-yELu4WmLPw5Mr/lmeEpox5rw3RETacE++JgHqQzd2dg+YbJuat3jH4ingc+WPZhxaoFzdv9y33G+F7Nl5O0GBg==}
+  react-dom@19.2.4:
+    resolution: {integrity: sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ==}
     peerDependencies:
-      react: ^19.2.3
+      react: ^19.2.4
 
   react-is@17.0.2:
     resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
@@ -7070,14 +7379,14 @@ packages:
   react-is@18.3.1:
     resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==}
 
-  react-reconciler@0.32.0:
-    resolution: {integrity: sha512-2NPMOzgTlG0ZWdIf3qG+dcbLSoAc/uLfOwckc3ofy5sSK0pLJqnQLpUFxvGcN2rlXSjnVtGeeFLNimCQEj5gOQ==}
+  react-reconciler@0.33.0:
+    resolution: {integrity: sha512-KetWRytFv1epdpJc3J4G75I4WrplZE5jOL7Yq0p34+OVOKF4Se7WrdIdVC45XsSSmUTlht2FM/fM1FZb1mfQeA==}
     engines: {node: '>=0.10.0'}
     peerDependencies:
-      react: ^19.1.0
+      react: ^19.2.0
 
-  react@19.2.3:
-    resolution: {integrity: sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA==}
+  react@19.2.4:
+    resolution: {integrity: sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==}
     engines: {node: '>=0.10.0'}
 
   readable-stream@2.3.8:
@@ -7113,8 +7422,8 @@ packages:
     resolution: {integrity: sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==}
     engines: {node: '>= 0.4'}
 
-  regenerate-unicode-properties@10.2.0:
-    resolution: {integrity: sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==}
+  regenerate-unicode-properties@10.2.2:
+    resolution: {integrity: sha512-m03P+zhBeQd1RGnYxrGyDAPpWX/epKirLrp8e3qevZdVkKtnCrjjWczIbYc8+xd6vcTStVlqfycTx1KR4LOr0g==}
     engines: {node: '>=4'}
 
   regenerate@1.4.2:
@@ -7124,12 +7433,12 @@ packages:
     resolution: {integrity: sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==}
     engines: {node: '>= 0.4'}
 
-  regexpu-core@6.2.0:
-    resolution: {integrity: sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==}
+  regexpu-core@6.4.0:
+    resolution: {integrity: sha512-0ghuzq67LI9bLXpOX/ISfve/Mq33a4aFRzoQYhnnok1JOFpmE/A2TBGkNVenOGEeSBCjIiWcc6MVOG5HEQv0sA==}
     engines: {node: '>=4'}
 
-  registry-auth-token@5.1.0:
-    resolution: {integrity: sha512-GdekYuwLXLxMuFTwAPg5UKGLW/UXzQrZvH/Zj791BQif5T05T0RsaLfHc9q3ZOKi7n+BoprPD9mJ0O0k4xzUlw==}
+  registry-auth-token@5.1.1:
+    resolution: {integrity: sha512-P7B4+jq8DeD2nMsAcdfaqHbssgHtZ7Z5+++a5ask90fvmJ8p5je4mOa+wzu+DB4vQ5tdJV/xywY+UnVFeQLV5Q==}
     engines: {node: '>=14'}
 
   registry-url@6.0.1:
@@ -7139,8 +7448,8 @@ packages:
   regjsgen@0.8.0:
     resolution: {integrity: sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==}
 
-  regjsparser@0.12.0:
-    resolution: {integrity: sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==}
+  regjsparser@0.13.0:
+    resolution: {integrity: sha512-NZQZdC5wOE/H3UT28fVGL+ikOZcEzfMGk/c3iN9UGxzWHMa1op7274oyiUVrAG4B2EuFhus8SvkaYnhvW92p9Q==}
     hasBin: true
 
   reka-ui@2.5.0:
@@ -7211,6 +7520,11 @@ packages:
   rfdc@1.4.1:
     resolution: {integrity: sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==}
 
+  rolldown@1.0.0-rc.3:
+    resolution: {integrity: sha512-Po/YZECDOqVXjIXrtC5h++a5NLvKAQNrd9ggrIG3sbDfGO5BqTUsrI6l8zdniKRp3r5Tp/2JTrXqx4GIguFCMw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    hasBin: true
+
   rollup-plugin-visualizer@6.0.4:
     resolution: {integrity: sha512-q8Q7J/6YofkmaGW1sH/fPRAz37x/+pd7VBuaUU7lwvOS/YikuiiEU9jeb9PH8XHiq50XFrUsBbOxeAMYQ7KZkg==}
     engines: {node: '>=18'}
@@ -7260,13 +7574,14 @@ packages:
     resolution: {integrity: sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==}
     engines: {node: '>= 0.4'}
 
+  sax@1.4.4:
+    resolution: {integrity: sha512-1n3r/tGXO6b6VXMdFT54SHzT9ytu9yr7TaELowdYpMqY/Ao7EnlQGmAQ1+RatX7Tkkdm6hONI2owqNx2aZj5Sw==}
+    engines: {node: '>=11.0.0'}
+
   saxes@6.0.0:
     resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
     engines: {node: '>=v12.22.7'}
 
-  scheduler@0.26.0:
-    resolution: {integrity: sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA==}
-
   scheduler@0.27.0:
     resolution: {integrity: sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==}
 
@@ -7283,8 +7598,8 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
-  semver@7.7.3:
-    resolution: {integrity: sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==}
+  semver@7.7.4:
+    resolution: {integrity: sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==}
     engines: {node: '>=10'}
     hasBin: true
 
@@ -7349,14 +7664,14 @@ packages:
     resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}
     engines: {node: '>=10'}
 
-  slice-ansi@5.0.0:
-    resolution: {integrity: sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==}
-    engines: {node: '>=12'}
-
   slice-ansi@7.1.2:
     resolution: {integrity: sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==}
     engines: {node: '>=18'}
 
+  slice-ansi@8.0.0:
+    resolution: {integrity: sha512-stxByr12oeeOyY2BlviTNQlYV5xOj47GirPr4yA1hE9JCtxfQN0+tVbkxwCtYDQWhEKWFHsEK48ORg5jrouCAg==}
+    engines: {node: '>=20'}
+
   smol-toml@1.5.2:
     resolution: {integrity: sha512-QlaZEqcAH3/RtNyet1IPIYPsEWAaYyXXv1Krsi+1L/QHppjX4Ifm8MQsBISz9vE8cHicIq3clogsheili5vhaQ==}
     engines: {node: '>= 18'}
@@ -7386,6 +7701,9 @@ packages:
   sprintf-js@1.0.3:
     resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
 
+  sqids@0.3.0:
+    resolution: {integrity: sha512-lOQK1ucVg+W6n3FhRwwSeUijxe93b51Bfz5PMRMihVf1iVkl82ePQG7V5vwrhzB11v0NtsR25PSZRGiSomJaJw==}
+
   stable-hash-x@0.2.0:
     resolution: {integrity: sha512-o3yWv49B/o4QZk5ZcsALc6t0+eCelPc44zZsLtCQnZPDwFpDYSWcDnrv2TtMmMbQ7uKo3J0HTURCqckw23czNQ==}
     engines: {node: '>=12.0.0'}
@@ -7407,8 +7725,8 @@ packages:
     resolution: {integrity: sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==}
     engines: {node: '>= 0.4'}
 
-  storybook@10.1.9:
-    resolution: {integrity: sha512-gHW/jOxLNzVw/Ys1XJovgrMFyh37ftMsLIw0l0h4fLsEyXhUABwrgjDp5bWrUmbQqemAIYVAAtw7UjPEdcHgkA==}
+  storybook@10.2.10:
+    resolution: {integrity: sha512-N4U42qKgzMHS7DjqLz5bY4P7rnvJtYkWFCyKspZr3FhPUuy6CWOae3aYC2BjXkHrdug0Jyta6VxFTuB1tYUKhg==}
     hasBin: true
     peerDependencies:
       prettier: ^2 || ^3
@@ -7432,8 +7750,8 @@ packages:
     resolution: {integrity: sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==}
     engines: {node: '>=18'}
 
-  string-width@8.1.0:
-    resolution: {integrity: sha512-Kxl3KJGb/gxkaUMOjRsQ8IrXiGW75O4E3RPjFIINOVH8AMl2SQ/yWdTzWwF3FevIX9LcMAjJW+GRwAlAbTSXdg==}
+  string-width@8.2.0:
+    resolution: {integrity: sha512-6hJPQ8N0V0P3SNmP6h2J99RLuzrWz2gvT7VnK5tKvrNqJoyS9W4/Fb8mo31UiPvy00z7DQXkP2hnKBVav76thw==}
     engines: {node: '>=20'}
 
   string.fromcodepoint@0.2.1:
@@ -7454,6 +7772,9 @@ packages:
   string_decoder@1.1.1:
     resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}
 
+  string_decoder@1.3.0:
+    resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
+
   strip-ansi@6.0.1:
     resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
     engines: {node: '>=8'}
@@ -7486,8 +7807,11 @@ packages:
     resolution: {integrity: sha512-1tB5mhVo7U+ETBKNf92xT4hrQa3pm0MZ0PQvuDnWgAAGHDsfp4lPSpiS6psrSiet87wyGPh9ft6wmhOMQ0hDiw==}
     engines: {node: '>=14.16'}
 
-  stubborn-fs@1.2.5:
-    resolution: {integrity: sha512-H2N9c26eXjzL/S/K+i/RHHcFanE74dptvvjM8iwzwbVcWY/zjBbgRqF3K0DY4+OD+uTTASTBvDoxPDaPN02D7g==}
+  stubborn-fs@2.0.0:
+    resolution: {integrity: sha512-Y0AvSwDw8y+nlSNFXMm2g6L51rBGdAQT20J3YSOqxC53Lo3bjWRtr2BKcfYoAf352WYpsZSTURrA0tqhfgudPA==}
+
+  stubborn-utils@1.0.2:
+    resolution: {integrity: sha512-zOh9jPYI+xrNOyisSelgym4tolKTJCQd5GBhK0+0xJvcYDcwlOoxF/rnFKQ2KRZknXSG9jWAp66fwP6AxN9STg==}
 
   stylelint@16.26.1:
     resolution: {integrity: sha512-v20V59/crfc8sVTAtge0mdafI3AdnzQ2KsWe6v523L4OA1bJO02S7MO2oyXDCS6iWb9ckIPnqAFVItqSBQr7jw==}
@@ -7520,8 +7844,13 @@ packages:
   svg-tags@1.0.0:
     resolution: {integrity: sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==}
 
-  swr@2.3.6:
-    resolution: {integrity: sha512-wfHRmHWk/isGNMwlLGlZX5Gzz/uTgo0o2IRuTMcf4CPuPFJZlq0rDaKUx+ozB5nBOReNV1kiOyzMfj+MBMikLw==}
+  svgo@4.0.0:
+    resolution: {integrity: sha512-VvrHQ+9uniE+Mvx3+C9IEe/lWasXCU0nXMY2kZeLrHNICuRiC8uMPyM14UEaMOFA5mhyQqEkB02VoQ16n3DLaw==}
+    engines: {node: '>=16'}
+    hasBin: true
+
+  swr@2.4.0:
+    resolution: {integrity: sha512-sUlC20T8EOt1pHmDiqueUWMmRRX03W7w5YxovWX7VR2KHEPCTMly85x05vpkP5i6Bu4h44ePSMD9Tc+G2MItFw==}
     peerDependencies:
       react: ^16.11.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
 
@@ -7532,10 +7861,22 @@ packages:
     resolution: {integrity: sha512-2SG1TnJGjMkD4+gblONMGYSrwAzYi+ymOitD+Jb/iMYm57nH20PlkVeMQRah3yDMKEa0QQYUF/QPWpdW7C6zNg==}
     engines: {node: ^14.18.0 || >=16.0.0}
 
+  synckit@0.11.12:
+    resolution: {integrity: sha512-Bh7QjT8/SuKUIfObSXNHNSK6WHo6J1tHCqJsuaFDP7gP0fkzSfTxI8y85JrppZ0h8l0maIgc2tfuZQ6/t3GtnQ==}
+    engines: {node: ^14.18.0 || >=16.0.0}
+
   table@6.9.0:
     resolution: {integrity: sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==}
     engines: {node: '>=10.0.0'}
 
+  tagged-tag@1.0.0:
+    resolution: {integrity: sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==}
+    engines: {node: '>=20'}
+
+  tailwind-csstree@0.1.4:
+    resolution: {integrity: sha512-FzD187HuFIZEyeR7Xy6sJbJll2d4SybS90satC8SKIuaNRC05CxMvdzN7BUsfDQffcnabckRM5OIcfArjsZ0mg==}
+    engines: {node: '>=18.18'}
+
   tailwind-merge@2.6.0:
     resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==}
 
@@ -7544,19 +7885,19 @@ packages:
     peerDependencies:
       tailwindcss: '>=3.1.0'
 
-  tailwindcss@4.1.12:
-    resolution: {integrity: sha512-DzFtxOi+7NsFf7DBtI3BJsynR+0Yp6etH+nRPTbpWnS2pZBaSksv/JGctNwSWzbFjp0vxSqknaUylseZqMDGrA==}
+  tailwindcss@4.2.0:
+    resolution: {integrity: sha512-yYzTZ4++b7fNYxFfpnberEEKu43w44aqDMNM9MHMmcKuCH7lL8jJ4yJ7LGHv7rSwiqM0nkiobF9I6cLlpS2P7Q==}
 
-  tapable@2.2.3:
-    resolution: {integrity: sha512-ZL6DDuAlRlLGghwcfmSn9sK3Hr6ArtyudlSAiCqQ6IfE+b+HHbydbYDIG15IfS5do+7XQQBdBiubF/cV2dnDzg==}
+  tapable@2.3.0:
+    resolution: {integrity: sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==}
     engines: {node: '>=6'}
 
   tar-stream@2.2.0:
     resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
     engines: {node: '>=6'}
 
-  tar@7.4.3:
-    resolution: {integrity: sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==}
+  terminal-size@4.0.1:
+    resolution: {integrity: sha512-avMLDQpUI9I5XFrklECw1ZEUPJhqzcwSWsyyI8blhRLT+8N1jLJWLWWYQpB2q2xthq8xDvjZPISVh53T/+CLYQ==}
     engines: {node: '>=18'}
 
   terser@5.39.2:
@@ -7589,6 +7930,10 @@ packages:
     resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==}
     engines: {node: '>=12.0.0'}
 
+  tinypool@2.1.0:
+    resolution: {integrity: sha512-Pugqs6M0m7Lv1I7FtxN4aoyToKg1C4tu+/381vH35y8oENM/Ai7f7C4StcoK4/+BSw9ebcS8jRiVrORFKCALLw==}
+    engines: {node: ^20.0.0 || >=22.0.0}
+
   tinyrainbow@2.0.0:
     resolution: {integrity: sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==}
     engines: {node: '>=14.0.0'}
@@ -7613,6 +7958,9 @@ packages:
     resolution: {integrity: sha512-8PWx8tvC4jDB39BQw1m4x8y5MH1BcQ5xHeL2n7UVFulMPH/3Q0uiamahFJ3lXA0zO2SUyRXuVVbWSDmstlt9YA==}
     hasBin: true
 
+  tmcp@1.19.0:
+    resolution: {integrity: sha512-wOY449EdaWDo7wLZEOVjeH9fn/AqfFF4f+3pDerCI8xHpy2Z8msUjAF0Vkg01aEFIdFMmiNDiY4hu6E7jVX79w==}
+
   tmp@0.2.5:
     resolution: {integrity: sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==}
     engines: {node: '>=14.14'}
@@ -7646,8 +7994,8 @@ packages:
   trough@2.2.0:
     resolution: {integrity: sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==}
 
-  ts-api-utils@2.1.0:
-    resolution: {integrity: sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==}
+  ts-api-utils@2.4.0:
+    resolution: {integrity: sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==}
     engines: {node: '>=18.12'}
     peerDependencies:
       typescript: '>=4.8.4'
@@ -7659,6 +8007,10 @@ packages:
   ts-map@1.0.3:
     resolution: {integrity: sha512-vDWbsl26LIcPGmDpoVzjEP6+hvHZkBkLW7JpvwbCv/5IYPJlsbzCVXY3wsCeAxAUeTclNOUZxnLdGh3VBD/J6w==}
 
+  tsconfig-paths-webpack-plugin@4.2.0:
+    resolution: {integrity: sha512-zbem3rfRS8BgeNK50Zz5SIQgXzLafiHjOwUAvk/38/o1jHn/V5QAgVUcz884or7WYcPaH3N2CIfUc2u0ul7UcA==}
+    engines: {node: '>=10.13.0'}
+
   tsconfig-paths@3.15.0:
     resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==}
 
@@ -7689,6 +8041,10 @@ packages:
     resolution: {integrity: sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==}
     engines: {node: '>=16'}
 
+  type-fest@5.4.4:
+    resolution: {integrity: sha512-JnTrzGu+zPV3aXIUhnyWJj4z/wigMsdYajGLIYakqyOW1nPllzXEJee0QQbHj+CTIQtXGlAjuK0UY+2xTyjVAw==}
+    engines: {node: '>=20'}
+
   typed-array-buffer@1.0.3:
     resolution: {integrity: sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==}
     engines: {node: '>= 0.4'}
@@ -7763,28 +8119,28 @@ packages:
     resolution: {integrity: sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==}
     engines: {node: '>=4'}
 
-  unicode-match-property-value-ecmascript@2.2.0:
-    resolution: {integrity: sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==}
+  unicode-match-property-value-ecmascript@2.2.1:
+    resolution: {integrity: sha512-JQ84qTuMg4nVkx8ga4A16a1epI9H6uTXAknqxkGF/aFfRLw1xC/Bp24HNLaZhHSkWd3+84t8iXnp1J0kYcZHhg==}
     engines: {node: '>=4'}
 
-  unicode-property-aliases-ecmascript@2.1.0:
-    resolution: {integrity: sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==}
+  unicode-property-aliases-ecmascript@2.2.0:
+    resolution: {integrity: sha512-hpbDzxUY9BFwX+UeBnxv3Sh1q7HFxj48DTmXchNgRa46lO8uj3/1iEn3MiNUYTg1g9ctIqXCCERn8gYZhHC5lQ==}
     engines: {node: '>=4'}
 
   unified@11.0.5:
     resolution: {integrity: sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==}
 
-  unist-util-is@6.0.0:
-    resolution: {integrity: sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==}
+  unist-util-is@6.0.1:
+    resolution: {integrity: sha512-LsiILbtBETkDz8I9p1dQ0uyRUWuaQzd/cuEeS1hoRSyW5E5XGmTzlwY1OrNzzakGowI9Dr/I8HVaw4hTtnxy8g==}
 
   unist-util-stringify-position@4.0.0:
     resolution: {integrity: sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==}
 
-  unist-util-visit-parents@6.0.1:
-    resolution: {integrity: sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==}
+  unist-util-visit-parents@6.0.2:
+    resolution: {integrity: sha512-goh1s1TBrqSqukSc8wrjwWhL0hiJxgA8m4kFxGlQ+8FYQ3C/m11FcTs4YYem7V664AhHVvgoQLk890Ssdsr2IQ==}
 
-  unist-util-visit@5.0.0:
-    resolution: {integrity: sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==}
+  unist-util-visit@5.1.0:
+    resolution: {integrity: sha512-m+vIdyeCOpdr/QeQCu2EzxX/ohgS8KbnPDgFni4dQsfSCtpz8UqDyY5GjRru8PDKuYn7Fq19j1CQ+nJSsGKOzg==}
 
   universalify@2.0.1:
     resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
@@ -7858,6 +8214,9 @@ packages:
   uri-js@4.4.1:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
 
+  uri-template-matcher@1.1.2:
+    resolution: {integrity: sha512-uZc1h12jdO3m/R77SfTEOuo6VbMhgWznaawKpBjRGSJb7i91x5PgI37NQJtG+Cerxkk0yr1pylBY2qG1kQ+aEQ==}
+
   use-sync-external-store@1.6.0:
     resolution: {integrity: sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==}
     peerDependencies:
@@ -7873,6 +8232,14 @@ packages:
     resolution: {integrity: sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==}
     hasBin: true
 
+  valibot@1.2.0:
+    resolution: {integrity: sha512-mm1rxUsmOxzrwnX5arGS+U4T25RdvpPjPN4yR0u9pUBov9+zGVtO84tif1eY4r6zWxVxu3KzIyknJy3rxfRZZg==}
+    peerDependencies:
+      typescript: '>=5'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
   vfile-message@4.0.3:
     resolution: {integrity: sha512-QTHzsGd1EhbZs4AsQ20JX1rC3cOlt/IWJruk893DfLRr57lcnOeMaWG4K0JrRta4mIJZKth2Au3mM3u03/JWKw==}
 
@@ -7882,18 +8249,18 @@ packages:
   vite-dev-rpc@1.1.0:
     resolution: {integrity: sha512-pKXZlgoXGoE8sEKiKJSng4hI1sQ4wi5YT24FCrwrLt6opmkjlqPPVmiPWWJn8M8byMxRGzp1CrFuqQs4M/Z39A==}
     peerDependencies:
-      vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0-0 || ^5.0.0-0 || ^6.0.1 || ^7.0.0-0
+      vite: 8.0.0-beta.13
 
   vite-hot-client@2.1.0:
     resolution: {integrity: sha512-7SpgZmU7R+dDnSmvXE1mfDtnHLHQSisdySVR7lO8ceAXvM0otZeuQQ6C8LrS5d/aYyP/QZ0hI0L+dIPrm4YlFQ==}
     peerDependencies:
-      vite: ^2.6.0 || ^3.0.0 || ^4.0.0 || ^5.0.0-0 || ^6.0.0-0 || ^7.0.0-0
+      vite: 8.0.0-beta.13
 
   vite-plugin-dts@4.5.4:
     resolution: {integrity: sha512-d4sOM8M/8z7vRXHHq/ebbblfaxENjogAAekcfcDCCwAyvGqnPrc7f4NZbvItS+g4WTgerW0xDwSz5qz11JT3vg==}
     peerDependencies:
       typescript: '*'
-      vite: '*'
+      vite: 8.0.0-beta.13
     peerDependenciesMeta:
       vite:
         optional: true
@@ -7901,14 +8268,14 @@ packages:
   vite-plugin-html@3.2.2:
     resolution: {integrity: sha512-vb9C9kcdzcIo/Oc3CLZVS03dL5pDlOFuhGlZYDCJ840BhWl/0nGeZWf3Qy7NlOayscY4Cm/QRgULCQkEZige5Q==}
     peerDependencies:
-      vite: '>=2.0.0'
+      vite: 8.0.0-beta.13
 
   vite-plugin-inspect@11.3.3:
     resolution: {integrity: sha512-u2eV5La99oHoYPHE6UvbwgEqKKOQGz86wMg40CCosP6q8BkB6e5xPneZfYagK4ojPJSj5anHCrnvC20DpwVdRA==}
     engines: {node: '>=14'}
     peerDependencies:
       '@nuxt/kit': '*'
-      vite: ^6.0.0 || ^7.0.0-0
+      vite: 8.0.0-beta.13
     peerDependenciesMeta:
       '@nuxt/kit':
         optional: true
@@ -7917,22 +8284,23 @@ packages:
     resolution: {integrity: sha512-p619BlKFOqQXJ6uDWS1vUPQzuJOD6xJTfftj57JXBGoBD/yeQCowR7pnWcr/FEX4/HVkFbreI6w2uuGBmQOh6A==}
     engines: {node: '>=v14.21.3'}
     peerDependencies:
-      vite: ^6.0.0 || ^7.0.0-0
+      vite: 8.0.0-beta.13
 
   vite-plugin-vue-inspector@5.3.2:
     resolution: {integrity: sha512-YvEKooQcSiBTAs0DoYLfefNja9bLgkFM7NI2b07bE2SruuvX0MEa9cMaxjKVMkeCp5Nz9FRIdcN1rOdFVBeL6Q==}
     peerDependencies:
-      vite: ^3.0.0-0 || ^4.0.0-0 || ^5.0.0-0 || ^6.0.0-0 || ^7.0.0-0
+      vite: 8.0.0-beta.13
 
-  vite@7.3.0:
-    resolution: {integrity: sha512-dZwN5L1VlUBewiP6H9s2+B3e3Jg96D0vzN+Ry73sOefebhYr9f94wwkMNN/9ouoU8pV1BqA1d1zGk8928cx0rg==}
+  vite@8.0.0-beta.13:
+    resolution: {integrity: sha512-7s/rfpYOAo7WUHh9irzaGjhhKb12hGv0BpDegAMV5A391wdyvM45WtX6VMV7hvEtZF2j/QtpDpR6ldXI3GgARQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
       '@types/node': ^20.19.0 || >=22.12.0
+      '@vitejs/devtools': ^0.0.0-alpha.24
+      esbuild: ^0.27.0
       jiti: '>=1.21.0'
       less: ^4.0.0
-      lightningcss: ^1.21.0
       sass: ^1.70.0
       sass-embedded: ^1.70.0
       stylus: '>=0.54.8'
@@ -7943,12 +8311,14 @@ packages:
     peerDependenciesMeta:
       '@types/node':
         optional: true
+      '@vitejs/devtools':
+        optional: true
+      esbuild:
+        optional: true
       jiti:
         optional: true
       less:
         optional: true
-      lightningcss:
-        optional: true
       sass:
         optional: true
       sass-embedded:
@@ -8016,8 +8386,8 @@ packages:
   vue-component-type-helpers@2.2.12:
     resolution: {integrity: sha512-YbGqHZ5/eW4SnkPNR44mKVc6ZKQoRs/Rux1sxC6rdwXb4qpbOSYfDr9DsTHolOTGmIKgM9j141mZbBeg05R1pw==}
 
-  vue-component-type-helpers@3.2.1:
-    resolution: {integrity: sha512-gKV7XOkQl4urSuLHNY1tnVQf7wVgtb/mKbRyxSLWGZUY9RK7aDPhBenTjm+i8ZFe0zC2PZeHMPtOZXZfyaFOzQ==}
+  vue-component-type-helpers@3.2.5:
+    resolution: {integrity: sha512-tkvNr+bU8+xD/onAThIe7CHFvOJ/BO6XCOrxMzeytJq40nTfpGDJuVjyCM8ccGZKfAbGk2YfuZyDMXM56qheZQ==}
 
   vue-demi@0.14.10:
     resolution: {integrity: sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==}
@@ -8035,15 +8405,16 @@ packages:
     peerDependencies:
       vue: '>=2'
 
-  vue-eslint-parser@10.2.0:
-    resolution: {integrity: sha512-CydUvFOQKD928UzZhTp4pr2vWz1L+H99t7Pkln2QSPdvmURT0MoC4wUccfCnuEaihNsu9aYYyk+bep8rlfkUXw==}
+  vue-eslint-parser@10.4.0:
+    resolution: {integrity: sha512-Vxi9pJdbN3ZnVGLODVtZ7y4Y2kzAAE2Cm0CZ3ZDRvydVYxZ6VrnBhLikBsRS+dpwj4Jv4UCv21PTEwF5rQ9WXg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      eslint: ^8.57.0 || ^9.0.0
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
 
-  vue-i18n@9.14.3:
-    resolution: {integrity: sha512-C+E0KE8ihKjdYCQx8oUkXX+8tBItrYNMnGJuzEPevBARQFUN2tKez6ZVOvBrWH0+KT5wEk3vOWjNk7ygb2u9ig==}
+  vue-i18n@9.14.5:
+    resolution: {integrity: sha512-0jQ9Em3ymWngyiIkj0+c/k7WgaPO+TNzjKSNq9BvBQaKJECqn9cd9fL4tkDhB5G1QBskGl9YxxbDAhgbFtpe2g==}
     engines: {node: '>= 16'}
+    deprecated: v9 and v10 no longer supported. please migrate to v11. about maintenance status, see https://vue-i18n.intlify.dev/guide/maintenance.html
     peerDependencies:
       vue: ^3.0.0
 
@@ -8057,8 +8428,8 @@ packages:
     peerDependencies:
       vue: ^3.2.0
 
-  vue-tsc@3.2.1:
-    resolution: {integrity: sha512-I23Rk8dkQfmcSbxDO0dmg9ioMLjKA1pjlU3Lz6Jfk2pMGu3Uryu9810XkcZH24IzPbhzPCnkKo2rEMRX0skSrw==}
+  vue-tsc@3.2.5:
+    resolution: {integrity: sha512-/htfTCMluQ+P2FISGAooul8kO4JMheOTCbCy4M6dYnYYjqLe3BExZudAua6MSIKSFYQtFOYAll7XobYwcpokGA==}
     hasBin: true
     peerDependencies:
       typescript: '>=5.0.0'
@@ -8108,6 +8479,9 @@ packages:
   web-vitals@4.2.4:
     resolution: {integrity: sha512-r4DIlprAGwJ7YM11VZp4R884m0Vmgr6EAKe3P+kO0PPj3Unqyvv59rczf6UiGcb9Z8QxZVcqKNwv/g0WNdWwsw==}
 
+  web-vitals@5.1.0:
+    resolution: {integrity: sha512-ArI3kx5jI0atlTtmV0fWU3fjpLmq/nD3Zr1iFFlJLaqa5wLBkUSzINwBPySCX/8jRyjlmy1Volw1kz1g9XE4Jg==}
+
   webidl-conversions@3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
 
@@ -8148,8 +8522,8 @@ packages:
   whatwg-url@5.0.0:
     resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
 
-  when-exit@2.1.4:
-    resolution: {integrity: sha512-4rnvd3A1t16PWzrBUcSDZqcAmsUIy4minDXT/CZ8F2mVDgd65i4Aalimgz1aQkRGU0iH5eT5+6Rx2TK8o443Pg==}
+  when-exit@2.1.5:
+    resolution: {integrity: sha512-VGkKJ564kzt6Ms1dbgPP/yuIoQCrsFAnRbptpC5wOEsDaNsbCB2bnfnaA8i/vRs5tjUSEOtIuvl9/MyVsvQZCg==}
 
   which-boxed-primitive@1.1.1:
     resolution: {integrity: sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==}
@@ -8163,8 +8537,8 @@ packages:
     resolution: {integrity: sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==}
     engines: {node: '>= 0.4'}
 
-  which-typed-array@1.1.19:
-    resolution: {integrity: sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==}
+  which-typed-array@1.1.20:
+    resolution: {integrity: sha512-LYfpUkmqwl0h9A2HL09Mms427Q1RZWuOHsukfVcKRq9q95iQxdw0ix1JQrqbcDR9PH1QDwf5Qo8OZb5lksZ8Xg==}
     engines: {node: '>= 0.4'}
 
   which@1.3.1:
@@ -8185,6 +8559,10 @@ packages:
     resolution: {integrity: sha512-c9bZp7b5YtRj2wOe6dlj32MK+Bx/M/d+9VB2SHM1OtsUHR0aV0tdP6DWh/iMt0kWi1t5g1Iudu6hQRNd1A4PVA==}
     engines: {node: '>=18'}
 
+  widest-line@6.0.0:
+    resolution: {integrity: sha512-U89AsyEeAsyoF0zVJBkG9zBgekjgjK7yk9sje3F4IQpXBJ10TF6ByLlIfjMhcmHMJgHZI4KHt4rdNfktzxIAMA==}
+    engines: {node: '>=20'}
+
   with@7.0.2:
     resolution: {integrity: sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==}
     engines: {node: '>= 10.0.0'}
@@ -8215,8 +8593,8 @@ packages:
     resolution: {integrity: sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
 
-  ws@8.18.3:
-    resolution: {integrity: sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==}
+  ws@8.19.0:
+    resolution: {integrity: sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==}
     engines: {node: '>=10.0.0'}
     peerDependencies:
       bufferutil: ^4.0.1
@@ -8269,10 +8647,6 @@ packages:
   yallist@4.0.0:
     resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
 
-  yallist@5.0.0:
-    resolution: {integrity: sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==}
-    engines: {node: '>=18'}
-
   yaml-eslint-parser@1.3.0:
     resolution: {integrity: sha512-E/+VitOorXSLiAqtTd7Yqax0/pAS3xaYMP+AUUJGOK1OZG3rhcj9fcJOM5HJ2VrP1FrStVCWr1muTfQCdj4tAA==}
     engines: {node: ^14.17.0 || >=16.0.0}
@@ -8325,8 +8699,8 @@ packages:
   zod@4.2.1:
     resolution: {integrity: sha512-0wZ1IRqGGhMP76gLqz8EyfBXKk0J2qo2+H3fi4mcUP/KtTocoX08nmIAHl1Z2kJIZbZee8KOpBCSNPRgauucjw==}
 
-  zustand@5.0.8:
-    resolution: {integrity: sha512-gyPKpIaxY9XcO2vSMrLbiER7QMAMGOQZVRdJ6Zi782jkbzZygq5GI9nG8g+sMgitRtndwaBSl7uiqC49o1SSiw==}
+  zustand@5.0.11:
+    resolution: {integrity: sha512-fdZY+dk7zn/vbWNCYmzZULHRrss0jx5pPFiOuMZ/5HJN6Yv3u+1Wswy/4MpZEkEGhtNH+pwxZB8OKgUBPzYAGg==}
     engines: {node: '>=12.20.0'}
     peerDependencies:
       '@types/react': '>=18.0.0'
@@ -8352,7 +8726,7 @@ snapshots:
 
   '@adobe/css-tools@4.4.4': {}
 
-  '@alcalzone/ansi-tokenize@0.2.0':
+  '@alcalzone/ansi-tokenize@0.2.5':
     dependencies:
       ansi-styles: 6.2.3
       is-fullwidth-code-point: 5.1.0
@@ -8447,7 +8821,7 @@ snapshots:
       '@csstools/css-color-parser': 3.1.0(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-tokenizer': 3.0.4
-      lru-cache: 11.2.4
+      lru-cache: 11.2.6
 
   '@asamuzakjp/dom-selector@6.7.6':
     dependencies:
@@ -8455,35 +8829,35 @@ snapshots:
       bidi-js: 1.0.3
       css-tree: 3.1.0
       is-potential-custom-element-name: 1.0.1
-      lru-cache: 11.2.4
+      lru-cache: 11.2.6
 
   '@asamuzakjp/nwsapi@2.3.9': {}
 
   '@atlaskit/pragmatic-drag-and-drop@1.3.1':
     dependencies:
-      '@babel/runtime': 7.28.4
+      '@babel/runtime': 7.28.6
       bind-event-listener: 3.0.0
       raf-schd: 4.0.3
 
-  '@babel/code-frame@7.27.1':
+  '@babel/code-frame@7.29.0':
     dependencies:
       '@babel/helper-validator-identifier': 7.28.5
       js-tokens: 4.0.0
       picocolors: 1.1.1
 
-  '@babel/compat-data@7.28.5': {}
+  '@babel/compat-data@7.29.0': {}
 
-  '@babel/core@7.28.5':
+  '@babel/core@7.29.0':
     dependencies:
-      '@babel/code-frame': 7.27.1
-      '@babel/generator': 7.28.5
-      '@babel/helper-compilation-targets': 7.27.2
-      '@babel/helper-module-transforms': 7.28.3(@babel/core@7.28.5)
-      '@babel/helpers': 7.28.4
-      '@babel/parser': 7.28.5
-      '@babel/template': 7.27.2
-      '@babel/traverse': 7.28.5
-      '@babel/types': 7.28.5
+      '@babel/code-frame': 7.29.0
+      '@babel/generator': 7.29.1
+      '@babel/helper-compilation-targets': 7.28.6
+      '@babel/helper-module-transforms': 7.28.6(@babel/core@7.29.0)
+      '@babel/helpers': 7.28.6
+      '@babel/parser': 7.29.0
+      '@babel/template': 7.28.6
+      '@babel/traverse': 7.29.0
+      '@babel/types': 7.29.0
       '@jridgewell/remapping': 2.3.5
       convert-source-map: 2.0.0
       debug: 4.4.3
@@ -8493,51 +8867,51 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/generator@7.28.5':
+  '@babel/generator@7.29.1':
     dependencies:
-      '@babel/parser': 7.28.5
-      '@babel/types': 7.28.5
+      '@babel/parser': 7.29.0
+      '@babel/types': 7.29.0
       '@jridgewell/gen-mapping': 0.3.13
       '@jridgewell/trace-mapping': 0.3.31
       jsesc: 3.1.0
 
   '@babel/helper-annotate-as-pure@7.27.3':
     dependencies:
-      '@babel/types': 7.28.5
+      '@babel/types': 7.29.0
 
-  '@babel/helper-compilation-targets@7.27.2':
+  '@babel/helper-compilation-targets@7.28.6':
     dependencies:
-      '@babel/compat-data': 7.28.5
+      '@babel/compat-data': 7.29.0
       '@babel/helper-validator-option': 7.27.1
       browserslist: 4.28.1
       lru-cache: 5.1.1
       semver: 6.3.1
 
-  '@babel/helper-create-class-features-plugin@7.28.5(@babel/core@7.28.5)':
+  '@babel/helper-create-class-features-plugin@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
+      '@babel/core': 7.29.0
       '@babel/helper-annotate-as-pure': 7.27.3
       '@babel/helper-member-expression-to-functions': 7.28.5
       '@babel/helper-optimise-call-expression': 7.27.1
-      '@babel/helper-replace-supers': 7.27.1(@babel/core@7.28.5)
+      '@babel/helper-replace-supers': 7.28.6(@babel/core@7.29.0)
       '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
-      '@babel/traverse': 7.28.5
+      '@babel/traverse': 7.29.0
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helper-create-regexp-features-plugin@7.27.1(@babel/core@7.28.5)':
+  '@babel/helper-create-regexp-features-plugin@7.28.5(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
+      '@babel/core': 7.29.0
       '@babel/helper-annotate-as-pure': 7.27.3
-      regexpu-core: 6.2.0
+      regexpu-core: 6.4.0
       semver: 6.3.1
 
-  '@babel/helper-define-polyfill-provider@0.6.5(@babel/core@7.28.5)':
+  '@babel/helper-define-polyfill-provider@0.6.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-compilation-targets': 7.27.2
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-compilation-targets': 7.28.6
+      '@babel/helper-plugin-utils': 7.28.6
       debug: 4.4.3
       lodash.debounce: 4.0.8
       resolve: 1.22.11
@@ -8548,55 +8922,55 @@ snapshots:
 
   '@babel/helper-member-expression-to-functions@7.28.5':
     dependencies:
-      '@babel/traverse': 7.28.5
-      '@babel/types': 7.28.5
+      '@babel/traverse': 7.29.0
+      '@babel/types': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helper-module-imports@7.27.1':
+  '@babel/helper-module-imports@7.28.6':
     dependencies:
-      '@babel/traverse': 7.28.5
-      '@babel/types': 7.28.5
+      '@babel/traverse': 7.29.0
+      '@babel/types': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helper-module-transforms@7.28.3(@babel/core@7.28.5)':
+  '@babel/helper-module-transforms@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-module-imports': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-module-imports': 7.28.6
       '@babel/helper-validator-identifier': 7.28.5
-      '@babel/traverse': 7.28.5
+      '@babel/traverse': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
   '@babel/helper-optimise-call-expression@7.27.1':
     dependencies:
-      '@babel/types': 7.28.5
+      '@babel/types': 7.29.0
 
-  '@babel/helper-plugin-utils@7.27.1': {}
+  '@babel/helper-plugin-utils@7.28.6': {}
 
-  '@babel/helper-remap-async-to-generator@7.27.1(@babel/core@7.28.5)':
+  '@babel/helper-remap-async-to-generator@7.27.1(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
+      '@babel/core': 7.29.0
       '@babel/helper-annotate-as-pure': 7.27.3
-      '@babel/helper-wrap-function': 7.28.3
-      '@babel/traverse': 7.28.5
+      '@babel/helper-wrap-function': 7.28.6
+      '@babel/traverse': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helper-replace-supers@7.27.1(@babel/core@7.28.5)':
+  '@babel/helper-replace-supers@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
+      '@babel/core': 7.29.0
       '@babel/helper-member-expression-to-functions': 7.28.5
       '@babel/helper-optimise-call-expression': 7.27.1
-      '@babel/traverse': 7.28.5
+      '@babel/traverse': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
   '@babel/helper-skip-transparent-expression-wrappers@7.27.1':
     dependencies:
-      '@babel/traverse': 7.28.5
-      '@babel/types': 7.28.5
+      '@babel/traverse': 7.29.0
+      '@babel/types': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
@@ -8606,580 +8980,580 @@ snapshots:
 
   '@babel/helper-validator-option@7.27.1': {}
 
-  '@babel/helper-wrap-function@7.28.3':
+  '@babel/helper-wrap-function@7.28.6':
     dependencies:
-      '@babel/template': 7.27.2
-      '@babel/traverse': 7.28.5
-      '@babel/types': 7.28.5
+      '@babel/template': 7.28.6
+      '@babel/traverse': 7.29.0
+      '@babel/types': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helpers@7.28.4':
+  '@babel/helpers@7.28.6':
     dependencies:
-      '@babel/template': 7.27.2
-      '@babel/types': 7.28.5
+      '@babel/template': 7.28.6
+      '@babel/types': 7.29.0
 
-  '@babel/parser@7.28.5':
+  '@babel/parser@7.29.0':
     dependencies:
-      '@babel/types': 7.28.5
+      '@babel/types': 7.29.0
 
-  '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.28.5(@babel/core@7.28.5)':
+  '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.28.5(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
-      '@babel/traverse': 7.28.5
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/traverse': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.27.1(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.27.1(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.27.1(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
       '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
-      '@babel/plugin-transform-optional-chaining': 7.28.5(@babel/core@7.28.5)
+      '@babel/plugin-transform-optional-chaining': 7.28.6(@babel/core@7.29.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.28.3(@babel/core@7.28.5)':
+  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
-      '@babel/traverse': 7.28.5
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/traverse': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-proposal-decorators@7.28.0(@babel/core@7.28.5)':
+  '@babel/plugin-proposal-decorators@7.29.0(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-create-class-features-plugin': 7.28.5(@babel/core@7.28.5)
-      '@babel/helper-plugin-utils': 7.27.1
-      '@babel/plugin-syntax-decorators': 7.27.1(@babel/core@7.28.5)
+      '@babel/core': 7.29.0
+      '@babel/helper-create-class-features-plugin': 7.28.6(@babel/core@7.29.0)
+      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/plugin-syntax-decorators': 7.28.6(@babel/core@7.29.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.28.5)':
+  '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
+      '@babel/core': 7.29.0
 
-  '@babel/plugin-syntax-decorators@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-syntax-decorators@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-import-assertions@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-syntax-import-assertions@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-import-attributes@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-syntax-import-attributes@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.28.5)':
+  '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-jsx@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-syntax-jsx@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-typescript@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-syntax-typescript@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.28.5)':
+  '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-create-regexp-features-plugin': 7.27.1(@babel/core@7.28.5)
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0)
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-arrow-functions@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-arrow-functions@7.27.1(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-async-generator-functions@7.28.0(@babel/core@7.28.5)':
+  '@babel/plugin-transform-async-generator-functions@7.29.0(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
-      '@babel/helper-remap-async-to-generator': 7.27.1(@babel/core@7.28.5)
-      '@babel/traverse': 7.28.5
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/helper-remap-async-to-generator': 7.27.1(@babel/core@7.29.0)
+      '@babel/traverse': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-async-to-generator@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-async-to-generator@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-module-imports': 7.27.1
-      '@babel/helper-plugin-utils': 7.27.1
-      '@babel/helper-remap-async-to-generator': 7.27.1(@babel/core@7.28.5)
+      '@babel/core': 7.29.0
+      '@babel/helper-module-imports': 7.28.6
+      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/helper-remap-async-to-generator': 7.27.1(@babel/core@7.29.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-block-scoped-functions@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-block-scoped-functions@7.27.1(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-block-scoping@7.28.5(@babel/core@7.28.5)':
+  '@babel/plugin-transform-block-scoping@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-class-properties@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-class-properties@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-create-class-features-plugin': 7.28.5(@babel/core@7.28.5)
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-create-class-features-plugin': 7.28.6(@babel/core@7.29.0)
+      '@babel/helper-plugin-utils': 7.28.6
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-class-static-block@7.28.3(@babel/core@7.28.5)':
+  '@babel/plugin-transform-class-static-block@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-create-class-features-plugin': 7.28.5(@babel/core@7.28.5)
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-create-class-features-plugin': 7.28.6(@babel/core@7.29.0)
+      '@babel/helper-plugin-utils': 7.28.6
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-classes@7.28.4(@babel/core@7.28.5)':
+  '@babel/plugin-transform-classes@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
+      '@babel/core': 7.29.0
       '@babel/helper-annotate-as-pure': 7.27.3
-      '@babel/helper-compilation-targets': 7.27.2
+      '@babel/helper-compilation-targets': 7.28.6
       '@babel/helper-globals': 7.28.0
-      '@babel/helper-plugin-utils': 7.27.1
-      '@babel/helper-replace-supers': 7.27.1(@babel/core@7.28.5)
-      '@babel/traverse': 7.28.5
+      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/helper-replace-supers': 7.28.6(@babel/core@7.29.0)
+      '@babel/traverse': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-computed-properties@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-computed-properties@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
-      '@babel/template': 7.27.2
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/template': 7.28.6
 
-  '@babel/plugin-transform-destructuring@7.28.5(@babel/core@7.28.5)':
+  '@babel/plugin-transform-destructuring@7.28.5(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
-      '@babel/traverse': 7.28.5
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/traverse': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-dotall-regex@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-dotall-regex@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-create-regexp-features-plugin': 7.27.1(@babel/core@7.28.5)
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0)
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-duplicate-keys@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-duplicate-keys@7.27.1(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.29.0(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-create-regexp-features-plugin': 7.27.1(@babel/core@7.28.5)
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0)
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-dynamic-import@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-dynamic-import@7.27.1(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-explicit-resource-management@7.28.0(@babel/core@7.28.5)':
+  '@babel/plugin-transform-explicit-resource-management@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
-      '@babel/plugin-transform-destructuring': 7.28.5(@babel/core@7.28.5)
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/plugin-transform-destructuring': 7.28.5(@babel/core@7.29.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-exponentiation-operator@7.28.5(@babel/core@7.28.5)':
+  '@babel/plugin-transform-exponentiation-operator@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-export-namespace-from@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-export-namespace-from@7.27.1(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-for-of@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-for-of@7.27.1(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
       '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-function-name@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-function-name@7.27.1(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-compilation-targets': 7.27.2
-      '@babel/helper-plugin-utils': 7.27.1
-      '@babel/traverse': 7.28.5
+      '@babel/core': 7.29.0
+      '@babel/helper-compilation-targets': 7.28.6
+      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/traverse': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-json-strings@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-json-strings@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-literals@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-literals@7.27.1(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-logical-assignment-operators@7.28.5(@babel/core@7.28.5)':
+  '@babel/plugin-transform-logical-assignment-operators@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-member-expression-literals@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-member-expression-literals@7.27.1(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-modules-amd@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-modules-amd@7.27.1(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-module-transforms': 7.28.3(@babel/core@7.28.5)
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-module-transforms': 7.28.6(@babel/core@7.29.0)
+      '@babel/helper-plugin-utils': 7.28.6
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-modules-commonjs@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-modules-commonjs@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-module-transforms': 7.28.3(@babel/core@7.28.5)
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-module-transforms': 7.28.6(@babel/core@7.29.0)
+      '@babel/helper-plugin-utils': 7.28.6
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-modules-systemjs@7.28.5(@babel/core@7.28.5)':
+  '@babel/plugin-transform-modules-systemjs@7.29.0(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-module-transforms': 7.28.3(@babel/core@7.28.5)
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-module-transforms': 7.28.6(@babel/core@7.29.0)
+      '@babel/helper-plugin-utils': 7.28.6
       '@babel/helper-validator-identifier': 7.28.5
-      '@babel/traverse': 7.28.5
+      '@babel/traverse': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-modules-umd@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-modules-umd@7.27.1(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-module-transforms': 7.28.3(@babel/core@7.28.5)
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-module-transforms': 7.28.6(@babel/core@7.29.0)
+      '@babel/helper-plugin-utils': 7.28.6
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-named-capturing-groups-regex@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-named-capturing-groups-regex@7.29.0(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-create-regexp-features-plugin': 7.27.1(@babel/core@7.28.5)
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0)
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-new-target@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-new-target@7.27.1(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-nullish-coalescing-operator@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-nullish-coalescing-operator@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-numeric-separator@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-numeric-separator@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-object-rest-spread@7.28.4(@babel/core@7.28.5)':
+  '@babel/plugin-transform-object-rest-spread@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-compilation-targets': 7.27.2
-      '@babel/helper-plugin-utils': 7.27.1
-      '@babel/plugin-transform-destructuring': 7.28.5(@babel/core@7.28.5)
-      '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.28.5)
-      '@babel/traverse': 7.28.5
+      '@babel/core': 7.29.0
+      '@babel/helper-compilation-targets': 7.28.6
+      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/plugin-transform-destructuring': 7.28.5(@babel/core@7.29.0)
+      '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.29.0)
+      '@babel/traverse': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-object-super@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-object-super@7.27.1(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
-      '@babel/helper-replace-supers': 7.27.1(@babel/core@7.28.5)
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/helper-replace-supers': 7.28.6(@babel/core@7.29.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-optional-catch-binding@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-optional-catch-binding@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-optional-chaining@7.28.5(@babel/core@7.28.5)':
+  '@babel/plugin-transform-optional-chaining@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
       '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-parameters@7.27.7(@babel/core@7.28.5)':
+  '@babel/plugin-transform-parameters@7.27.7(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-private-methods@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-private-methods@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-create-class-features-plugin': 7.28.5(@babel/core@7.28.5)
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-create-class-features-plugin': 7.28.6(@babel/core@7.29.0)
+      '@babel/helper-plugin-utils': 7.28.6
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-private-property-in-object@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-private-property-in-object@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
+      '@babel/core': 7.29.0
       '@babel/helper-annotate-as-pure': 7.27.3
-      '@babel/helper-create-class-features-plugin': 7.28.5(@babel/core@7.28.5)
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/helper-create-class-features-plugin': 7.28.6(@babel/core@7.29.0)
+      '@babel/helper-plugin-utils': 7.28.6
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-property-literals@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-property-literals@7.27.1(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-regenerator@7.28.4(@babel/core@7.28.5)':
+  '@babel/plugin-transform-regenerator@7.29.0(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-regexp-modifiers@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-regexp-modifiers@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-create-regexp-features-plugin': 7.27.1(@babel/core@7.28.5)
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0)
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-reserved-words@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-reserved-words@7.27.1(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-runtime@7.28.5(@babel/core@7.28.5)':
+  '@babel/plugin-transform-runtime@7.29.0(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-module-imports': 7.27.1
-      '@babel/helper-plugin-utils': 7.27.1
-      babel-plugin-polyfill-corejs2: 0.4.14(@babel/core@7.28.5)
-      babel-plugin-polyfill-corejs3: 0.13.0(@babel/core@7.28.5)
-      babel-plugin-polyfill-regenerator: 0.6.5(@babel/core@7.28.5)
+      '@babel/core': 7.29.0
+      '@babel/helper-module-imports': 7.28.6
+      '@babel/helper-plugin-utils': 7.28.6
+      babel-plugin-polyfill-corejs2: 0.4.15(@babel/core@7.29.0)
+      babel-plugin-polyfill-corejs3: 0.13.0(@babel/core@7.29.0)
+      babel-plugin-polyfill-regenerator: 0.6.6(@babel/core@7.29.0)
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-shorthand-properties@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-shorthand-properties@7.27.1(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-spread@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-spread@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
       '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-sticky-regex@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-sticky-regex@7.27.1(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-template-literals@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-template-literals@7.27.1(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-typeof-symbol@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-typeof-symbol@7.27.1(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-typescript@7.28.5(@babel/core@7.28.5)':
+  '@babel/plugin-transform-typescript@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
+      '@babel/core': 7.29.0
       '@babel/helper-annotate-as-pure': 7.27.3
-      '@babel/helper-create-class-features-plugin': 7.28.5(@babel/core@7.28.5)
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/helper-create-class-features-plugin': 7.28.6(@babel/core@7.29.0)
+      '@babel/helper-plugin-utils': 7.28.6
       '@babel/helper-skip-transparent-expression-wrappers': 7.27.1
-      '@babel/plugin-syntax-typescript': 7.27.1(@babel/core@7.28.5)
+      '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-transform-unicode-escapes@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-unicode-escapes@7.27.1(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-unicode-property-regex@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-unicode-property-regex@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-create-regexp-features-plugin': 7.27.1(@babel/core@7.28.5)
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0)
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-unicode-regex@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-unicode-regex@7.27.1(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-create-regexp-features-plugin': 7.27.1(@babel/core@7.28.5)
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0)
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/plugin-transform-unicode-sets-regex@7.27.1(@babel/core@7.28.5)':
+  '@babel/plugin-transform-unicode-sets-regex@7.28.6(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-create-regexp-features-plugin': 7.27.1(@babel/core@7.28.5)
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-create-regexp-features-plugin': 7.28.5(@babel/core@7.29.0)
+      '@babel/helper-plugin-utils': 7.28.6
 
-  '@babel/preset-env@7.28.5(@babel/core@7.28.5)':
+  '@babel/preset-env@7.29.0(@babel/core@7.29.0)':
     dependencies:
-      '@babel/compat-data': 7.28.5
-      '@babel/core': 7.28.5
-      '@babel/helper-compilation-targets': 7.27.2
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/compat-data': 7.29.0
+      '@babel/core': 7.29.0
+      '@babel/helper-compilation-targets': 7.28.6
+      '@babel/helper-plugin-utils': 7.28.6
       '@babel/helper-validator-option': 7.27.1
-      '@babel/plugin-bugfix-firefox-class-in-computed-class-key': 7.28.5(@babel/core@7.28.5)
-      '@babel/plugin-bugfix-safari-class-field-initializer-scope': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.28.3(@babel/core@7.28.5)
-      '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.28.5)
-      '@babel/plugin-syntax-import-assertions': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-syntax-import-attributes': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.28.5)
-      '@babel/plugin-transform-arrow-functions': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-async-generator-functions': 7.28.0(@babel/core@7.28.5)
-      '@babel/plugin-transform-async-to-generator': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-block-scoped-functions': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-block-scoping': 7.28.5(@babel/core@7.28.5)
-      '@babel/plugin-transform-class-properties': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-class-static-block': 7.28.3(@babel/core@7.28.5)
-      '@babel/plugin-transform-classes': 7.28.4(@babel/core@7.28.5)
-      '@babel/plugin-transform-computed-properties': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-destructuring': 7.28.5(@babel/core@7.28.5)
-      '@babel/plugin-transform-dotall-regex': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-duplicate-keys': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-duplicate-named-capturing-groups-regex': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-dynamic-import': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-explicit-resource-management': 7.28.0(@babel/core@7.28.5)
-      '@babel/plugin-transform-exponentiation-operator': 7.28.5(@babel/core@7.28.5)
-      '@babel/plugin-transform-export-namespace-from': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-for-of': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-function-name': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-json-strings': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-literals': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-logical-assignment-operators': 7.28.5(@babel/core@7.28.5)
-      '@babel/plugin-transform-member-expression-literals': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-modules-amd': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-modules-commonjs': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-modules-systemjs': 7.28.5(@babel/core@7.28.5)
-      '@babel/plugin-transform-modules-umd': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-named-capturing-groups-regex': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-new-target': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-nullish-coalescing-operator': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-numeric-separator': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-object-rest-spread': 7.28.4(@babel/core@7.28.5)
-      '@babel/plugin-transform-object-super': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-optional-catch-binding': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-optional-chaining': 7.28.5(@babel/core@7.28.5)
-      '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.28.5)
-      '@babel/plugin-transform-private-methods': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-private-property-in-object': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-property-literals': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-regenerator': 7.28.4(@babel/core@7.28.5)
-      '@babel/plugin-transform-regexp-modifiers': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-reserved-words': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-shorthand-properties': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-spread': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-sticky-regex': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-template-literals': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-typeof-symbol': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-unicode-escapes': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-unicode-property-regex': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-unicode-regex': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-unicode-sets-regex': 7.27.1(@babel/core@7.28.5)
-      '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.28.5)
-      babel-plugin-polyfill-corejs2: 0.4.14(@babel/core@7.28.5)
-      babel-plugin-polyfill-corejs3: 0.13.0(@babel/core@7.28.5)
-      babel-plugin-polyfill-regenerator: 0.6.5(@babel/core@7.28.5)
-      core-js-compat: 3.47.0
+      '@babel/plugin-bugfix-firefox-class-in-computed-class-key': 7.28.5(@babel/core@7.29.0)
+      '@babel/plugin-bugfix-safari-class-field-initializer-scope': 7.27.1(@babel/core@7.29.0)
+      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.27.1(@babel/core@7.29.0)
+      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.27.1(@babel/core@7.29.0)
+      '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.29.0)
+      '@babel/plugin-syntax-import-assertions': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-syntax-import-attributes': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.29.0)
+      '@babel/plugin-transform-arrow-functions': 7.27.1(@babel/core@7.29.0)
+      '@babel/plugin-transform-async-generator-functions': 7.29.0(@babel/core@7.29.0)
+      '@babel/plugin-transform-async-to-generator': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-transform-block-scoped-functions': 7.27.1(@babel/core@7.29.0)
+      '@babel/plugin-transform-block-scoping': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-transform-class-properties': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-transform-class-static-block': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-transform-classes': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-transform-computed-properties': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-transform-destructuring': 7.28.5(@babel/core@7.29.0)
+      '@babel/plugin-transform-dotall-regex': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-transform-duplicate-keys': 7.27.1(@babel/core@7.29.0)
+      '@babel/plugin-transform-duplicate-named-capturing-groups-regex': 7.29.0(@babel/core@7.29.0)
+      '@babel/plugin-transform-dynamic-import': 7.27.1(@babel/core@7.29.0)
+      '@babel/plugin-transform-explicit-resource-management': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-transform-exponentiation-operator': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-transform-export-namespace-from': 7.27.1(@babel/core@7.29.0)
+      '@babel/plugin-transform-for-of': 7.27.1(@babel/core@7.29.0)
+      '@babel/plugin-transform-function-name': 7.27.1(@babel/core@7.29.0)
+      '@babel/plugin-transform-json-strings': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-transform-literals': 7.27.1(@babel/core@7.29.0)
+      '@babel/plugin-transform-logical-assignment-operators': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-transform-member-expression-literals': 7.27.1(@babel/core@7.29.0)
+      '@babel/plugin-transform-modules-amd': 7.27.1(@babel/core@7.29.0)
+      '@babel/plugin-transform-modules-commonjs': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-transform-modules-systemjs': 7.29.0(@babel/core@7.29.0)
+      '@babel/plugin-transform-modules-umd': 7.27.1(@babel/core@7.29.0)
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.29.0(@babel/core@7.29.0)
+      '@babel/plugin-transform-new-target': 7.27.1(@babel/core@7.29.0)
+      '@babel/plugin-transform-nullish-coalescing-operator': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-transform-numeric-separator': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-transform-object-rest-spread': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-transform-object-super': 7.27.1(@babel/core@7.29.0)
+      '@babel/plugin-transform-optional-catch-binding': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-transform-optional-chaining': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.29.0)
+      '@babel/plugin-transform-private-methods': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-transform-private-property-in-object': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-transform-property-literals': 7.27.1(@babel/core@7.29.0)
+      '@babel/plugin-transform-regenerator': 7.29.0(@babel/core@7.29.0)
+      '@babel/plugin-transform-regexp-modifiers': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-transform-reserved-words': 7.27.1(@babel/core@7.29.0)
+      '@babel/plugin-transform-shorthand-properties': 7.27.1(@babel/core@7.29.0)
+      '@babel/plugin-transform-spread': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-transform-sticky-regex': 7.27.1(@babel/core@7.29.0)
+      '@babel/plugin-transform-template-literals': 7.27.1(@babel/core@7.29.0)
+      '@babel/plugin-transform-typeof-symbol': 7.27.1(@babel/core@7.29.0)
+      '@babel/plugin-transform-unicode-escapes': 7.27.1(@babel/core@7.29.0)
+      '@babel/plugin-transform-unicode-property-regex': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-transform-unicode-regex': 7.27.1(@babel/core@7.29.0)
+      '@babel/plugin-transform-unicode-sets-regex': 7.28.6(@babel/core@7.29.0)
+      '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.29.0)
+      babel-plugin-polyfill-corejs2: 0.4.15(@babel/core@7.29.0)
+      babel-plugin-polyfill-corejs3: 0.14.0(@babel/core@7.29.0)
+      babel-plugin-polyfill-regenerator: 0.6.6(@babel/core@7.29.0)
+      core-js-compat: 3.48.0
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.28.5)':
+  '@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
-      '@babel/types': 7.28.5
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/types': 7.29.0
       esutils: 2.0.3
 
-  '@babel/preset-typescript@7.28.5(@babel/core@7.28.5)':
+  '@babel/preset-typescript@7.28.5(@babel/core@7.29.0)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
       '@babel/helper-validator-option': 7.27.1
-      '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-modules-commonjs': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-typescript': 7.28.5(@babel/core@7.28.5)
+      '@babel/plugin-syntax-jsx': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-transform-modules-commonjs': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/runtime@7.28.4': {}
+  '@babel/runtime@7.28.6': {}
 
   '@babel/standalone@7.28.5': {}
 
-  '@babel/template@7.27.2':
+  '@babel/template@7.28.6':
     dependencies:
-      '@babel/code-frame': 7.27.1
-      '@babel/parser': 7.28.5
-      '@babel/types': 7.28.5
+      '@babel/code-frame': 7.29.0
+      '@babel/parser': 7.29.0
+      '@babel/types': 7.29.0
 
-  '@babel/traverse@7.28.5':
+  '@babel/traverse@7.29.0':
     dependencies:
-      '@babel/code-frame': 7.27.1
-      '@babel/generator': 7.28.5
+      '@babel/code-frame': 7.29.0
+      '@babel/generator': 7.29.1
       '@babel/helper-globals': 7.28.0
-      '@babel/parser': 7.28.5
-      '@babel/template': 7.27.2
-      '@babel/types': 7.28.5
+      '@babel/parser': 7.29.0
+      '@babel/template': 7.28.6
+      '@babel/types': 7.29.0
       debug: 4.4.3
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/types@7.28.5':
+  '@babel/types@7.29.0':
     dependencies:
       '@babel/helper-string-parser': 7.27.1
       '@babel/helper-validator-identifier': 7.28.5
@@ -9231,14 +9605,20 @@ snapshots:
     dependencies:
       postcss-selector-parser: 7.1.1
 
+  '@cyberalien/svg-utils@1.1.1':
+    dependencies:
+      '@iconify/types': 2.0.0
+
+  '@dmsnell/diff-match-patch@1.1.0': {}
+
   '@dual-bundle/import-meta-resolve@4.2.1': {}
 
-  '@emnapi/core@1.7.1':
+  '@emnapi/core@1.8.1':
     dependencies:
       '@emnapi/wasi-threads': 1.1.0
       tslib: 2.8.1
 
-  '@emnapi/runtime@1.7.1':
+  '@emnapi/runtime@1.8.1':
     dependencies:
       tslib: 2.8.1
 
@@ -9251,157 +9631,157 @@ snapshots:
   '@esbuild/aix-ppc64@0.25.5':
     optional: true
 
-  '@esbuild/aix-ppc64@0.27.1':
+  '@esbuild/aix-ppc64@0.27.3':
     optional: true
 
   '@esbuild/android-arm64@0.25.5':
     optional: true
 
-  '@esbuild/android-arm64@0.27.1':
+  '@esbuild/android-arm64@0.27.3':
     optional: true
 
   '@esbuild/android-arm@0.25.5':
     optional: true
 
-  '@esbuild/android-arm@0.27.1':
+  '@esbuild/android-arm@0.27.3':
     optional: true
 
   '@esbuild/android-x64@0.25.5':
     optional: true
 
-  '@esbuild/android-x64@0.27.1':
+  '@esbuild/android-x64@0.27.3':
     optional: true
 
   '@esbuild/darwin-arm64@0.25.5':
     optional: true
 
-  '@esbuild/darwin-arm64@0.27.1':
+  '@esbuild/darwin-arm64@0.27.3':
     optional: true
 
   '@esbuild/darwin-x64@0.25.5':
     optional: true
 
-  '@esbuild/darwin-x64@0.27.1':
+  '@esbuild/darwin-x64@0.27.3':
     optional: true
 
   '@esbuild/freebsd-arm64@0.25.5':
     optional: true
 
-  '@esbuild/freebsd-arm64@0.27.1':
+  '@esbuild/freebsd-arm64@0.27.3':
     optional: true
 
   '@esbuild/freebsd-x64@0.25.5':
     optional: true
 
-  '@esbuild/freebsd-x64@0.27.1':
+  '@esbuild/freebsd-x64@0.27.3':
     optional: true
 
   '@esbuild/linux-arm64@0.25.5':
     optional: true
 
-  '@esbuild/linux-arm64@0.27.1':
+  '@esbuild/linux-arm64@0.27.3':
     optional: true
 
   '@esbuild/linux-arm@0.25.5':
     optional: true
 
-  '@esbuild/linux-arm@0.27.1':
+  '@esbuild/linux-arm@0.27.3':
     optional: true
 
   '@esbuild/linux-ia32@0.25.5':
     optional: true
 
-  '@esbuild/linux-ia32@0.27.1':
+  '@esbuild/linux-ia32@0.27.3':
     optional: true
 
   '@esbuild/linux-loong64@0.25.5':
     optional: true
 
-  '@esbuild/linux-loong64@0.27.1':
+  '@esbuild/linux-loong64@0.27.3':
     optional: true
 
   '@esbuild/linux-mips64el@0.25.5':
     optional: true
 
-  '@esbuild/linux-mips64el@0.27.1':
+  '@esbuild/linux-mips64el@0.27.3':
     optional: true
 
   '@esbuild/linux-ppc64@0.25.5':
     optional: true
 
-  '@esbuild/linux-ppc64@0.27.1':
+  '@esbuild/linux-ppc64@0.27.3':
     optional: true
 
   '@esbuild/linux-riscv64@0.25.5':
     optional: true
 
-  '@esbuild/linux-riscv64@0.27.1':
+  '@esbuild/linux-riscv64@0.27.3':
     optional: true
 
   '@esbuild/linux-s390x@0.25.5':
     optional: true
 
-  '@esbuild/linux-s390x@0.27.1':
+  '@esbuild/linux-s390x@0.27.3':
     optional: true
 
   '@esbuild/linux-x64@0.25.5':
     optional: true
 
-  '@esbuild/linux-x64@0.27.1':
+  '@esbuild/linux-x64@0.27.3':
     optional: true
 
   '@esbuild/netbsd-arm64@0.25.5':
     optional: true
 
-  '@esbuild/netbsd-arm64@0.27.1':
+  '@esbuild/netbsd-arm64@0.27.3':
     optional: true
 
   '@esbuild/netbsd-x64@0.25.5':
     optional: true
 
-  '@esbuild/netbsd-x64@0.27.1':
+  '@esbuild/netbsd-x64@0.27.3':
     optional: true
 
   '@esbuild/openbsd-arm64@0.25.5':
     optional: true
 
-  '@esbuild/openbsd-arm64@0.27.1':
+  '@esbuild/openbsd-arm64@0.27.3':
     optional: true
 
   '@esbuild/openbsd-x64@0.25.5':
     optional: true
 
-  '@esbuild/openbsd-x64@0.27.1':
+  '@esbuild/openbsd-x64@0.27.3':
     optional: true
 
-  '@esbuild/openharmony-arm64@0.27.1':
+  '@esbuild/openharmony-arm64@0.27.3':
     optional: true
 
   '@esbuild/sunos-x64@0.25.5':
     optional: true
 
-  '@esbuild/sunos-x64@0.27.1':
+  '@esbuild/sunos-x64@0.27.3':
     optional: true
 
   '@esbuild/win32-arm64@0.25.5':
     optional: true
 
-  '@esbuild/win32-arm64@0.27.1':
+  '@esbuild/win32-arm64@0.27.3':
     optional: true
 
   '@esbuild/win32-ia32@0.25.5':
     optional: true
 
-  '@esbuild/win32-ia32@0.27.1':
+  '@esbuild/win32-ia32@0.27.3':
     optional: true
 
   '@esbuild/win32-x64@0.25.5':
     optional: true
 
-  '@esbuild/win32-x64@0.27.1':
+  '@esbuild/win32-x64@0.27.3':
     optional: true
 
-  '@eslint-community/eslint-utils@4.9.0(eslint@9.39.1(jiti@2.6.1))':
+  '@eslint-community/eslint-utils@4.9.1(eslint@9.39.1(jiti@2.6.1))':
     dependencies:
       eslint: 9.39.1(jiti@2.6.1)
       eslint-visitor-keys: 3.4.3
@@ -9424,9 +9804,14 @@ snapshots:
     dependencies:
       '@types/json-schema': 7.0.15
 
-  '@eslint/eslintrc@3.3.1':
+  '@eslint/css-tree@3.6.9':
     dependencies:
-      ajv: 6.12.6
+      mdn-data: 2.23.0
+      source-map-js: 1.2.1
+
+  '@eslint/eslintrc@3.3.3':
+    dependencies:
+      ajv: 6.14.0
       debug: 4.4.3
       espree: 10.4.0
       globals: 14.0.0
@@ -9787,6 +10172,8 @@ snapshots:
       - '@vue/composition-api'
       - vue
 
+  '@formkit/auto-animate@0.9.0': {}
+
   '@grpc/grpc-js@1.9.15':
     dependencies:
       '@grpc/proto-loader': 0.7.13
@@ -9819,9 +10206,22 @@ snapshots:
       '@iconify/types': 2.0.0
       pathe: 1.1.2
 
-  '@iconify/tailwind@1.2.0':
+  '@iconify/tailwind4@1.2.1(tailwindcss@4.2.0)':
     dependencies:
+      '@iconify/tools': 5.0.3
       '@iconify/types': 2.0.0
+      '@iconify/utils': 3.1.0
+      tailwindcss: 4.2.0
+
+  '@iconify/tools@5.0.3':
+    dependencies:
+      '@cyberalien/svg-utils': 1.1.1
+      '@iconify/types': 2.0.0
+      '@iconify/utils': 3.1.0
+      fflate: 0.8.2
+      modern-tar: 0.7.3
+      pathe: 2.0.3
+      svgo: 4.0.0
 
   '@iconify/types@2.0.0': {}
 
@@ -9839,25 +10239,25 @@ snapshots:
     dependencies:
       '@swc/helpers': 0.5.17
 
-  '@intlify/core-base@11.1.12':
+  '@intlify/core-base@11.2.8':
     dependencies:
-      '@intlify/message-compiler': 11.1.12
-      '@intlify/shared': 11.1.12
+      '@intlify/message-compiler': 11.2.8
+      '@intlify/shared': 11.2.8
 
-  '@intlify/core-base@9.14.3':
+  '@intlify/core-base@9.14.5':
     dependencies:
-      '@intlify/message-compiler': 9.14.3
-      '@intlify/shared': 9.14.3
+      '@intlify/message-compiler': 9.14.5
+      '@intlify/shared': 9.14.5
 
-  '@intlify/eslint-plugin-vue-i18n@4.1.0(eslint@9.39.1(jiti@2.6.1))(jsonc-eslint-parser@2.4.0)(vue-eslint-parser@10.2.0(eslint@9.39.1(jiti@2.6.1)))(yaml-eslint-parser@1.3.0)':
+  '@intlify/eslint-plugin-vue-i18n@4.1.1(eslint@9.39.1(jiti@2.6.1))(jsonc-eslint-parser@2.4.0)(vue-eslint-parser@10.4.0(eslint@9.39.1(jiti@2.6.1)))(yaml-eslint-parser@1.3.0)':
     dependencies:
-      '@eslint/eslintrc': 3.3.1
-      '@intlify/core-base': 11.1.12
-      '@intlify/message-compiler': 11.1.12
+      '@eslint/eslintrc': 3.3.3
+      '@intlify/core-base': 11.2.8
+      '@intlify/message-compiler': 11.2.8
       debug: 4.4.3
       eslint: 9.39.1(jiti@2.6.1)
       eslint-compat-utils: 0.6.5(eslint@9.39.1(jiti@2.6.1))
-      glob: 10.4.5
+      glob: 10.5.0
       globals: 16.5.0
       ignore: 7.0.5
       import-fresh: 3.3.1
@@ -9865,32 +10265,32 @@ snapshots:
       js-yaml: 4.1.1
       json5: 2.2.3
       jsonc-eslint-parser: 2.4.0
-      lodash: 4.17.21
+      lodash: 4.17.23
       parse5: 7.3.0
-      semver: 7.7.3
+      semver: 7.7.4
       synckit: 0.10.4
-      vue-eslint-parser: 10.2.0(eslint@9.39.1(jiti@2.6.1))
+      vue-eslint-parser: 10.4.0(eslint@9.39.1(jiti@2.6.1))
       yaml-eslint-parser: 1.3.0
     transitivePeerDependencies:
       - supports-color
 
-  '@intlify/message-compiler@11.1.12':
+  '@intlify/message-compiler@11.2.8':
     dependencies:
-      '@intlify/shared': 11.1.12
+      '@intlify/shared': 11.2.8
       source-map-js: 1.2.1
 
-  '@intlify/message-compiler@9.14.3':
+  '@intlify/message-compiler@9.14.5':
     dependencies:
-      '@intlify/shared': 9.14.3
+      '@intlify/shared': 9.14.5
       source-map-js: 1.2.1
 
-  '@intlify/shared@11.1.12': {}
+  '@intlify/shared@11.2.8': {}
 
-  '@intlify/shared@9.14.3': {}
+  '@intlify/shared@9.14.5': {}
 
   '@isaacs/balanced-match@4.0.1': {}
 
-  '@isaacs/brace-expansion@5.0.0':
+  '@isaacs/brace-expansion@5.0.1':
     dependencies:
       '@isaacs/balanced-match': 4.0.1
 
@@ -9903,17 +10303,13 @@ snapshots:
       wrap-ansi: 8.1.0
       wrap-ansi-cjs: wrap-ansi@7.0.0
 
-  '@isaacs/fs-minipass@4.0.1':
-    dependencies:
-      minipass: 7.1.2
-
   '@jest/diff-sequences@30.0.1': {}
 
   '@jest/get-type@30.1.0': {}
 
   '@jest/schemas@30.0.5':
     dependencies:
-      '@sinclair/typebox': 0.34.40
+      '@sinclair/typebox': 0.34.48
 
   '@jridgewell/gen-mapping@0.3.13':
     dependencies:
@@ -9953,20 +10349,20 @@ snapshots:
     dependencies:
       arr-rotate: 1.0.0
       chalk: 5.6.2
-      cli-spinners: 3.2.0
+      cli-spinners: 3.4.0
       consola: 3.4.2
       deepmerge: 4.3.1
       fast-deep-equal: 3.1.3
       figures: 6.1.0
-      ink: 6.2.2(@types/react@19.1.9)(react@19.2.3)
-      react: 19.2.3
+      ink: 6.8.0(@types/react@19.1.9)(react@19.2.4)
+      react: 19.2.4
     transitivePeerDependencies:
       - '@types/react'
       - bufferutil
       - react-devtools-core
       - utf-8-validate
 
-  '@lobehub/i18n-cli@1.25.1(@types/react@19.1.9)(typescript@5.9.3)(use-sync-external-store@1.6.0(react@19.2.3))(ws@8.18.3)(zod@3.24.1)':
+  '@lobehub/i18n-cli@1.26.1(@types/react@19.1.9)(typescript@5.9.3)(use-sync-external-store@1.6.0(react@19.2.4))(ws@8.19.0)(zod@3.24.1)':
     dependencies:
       '@lobehub/cli-ui': 1.13.0(@types/react@19.1.9)
       '@yutengjing/eld': 0.0.2
@@ -9978,26 +10374,26 @@ snapshots:
       dirty-json: 0.9.2
       dotenv: 16.6.1
       fast-deep-equal: 3.1.3
-      glob: 10.4.5
+      glob: 10.5.0
       gpt-tokenizer: 2.9.0
       gray-matter: 4.0.3
-      ink: 6.2.2(@types/react@19.1.9)(react@19.2.3)
+      ink: 6.8.0(@types/react@19.1.9)(react@19.2.4)
       json-stable-stringify: 1.3.0
       just-diff: 6.0.2
-      lodash-es: 4.17.21
-      openai: 4.104.0(ws@8.18.3)(zod@3.24.1)
-      p-map: 7.0.3
+      lodash-es: 4.17.23
+      openai: 4.104.0(ws@8.19.0)(zod@3.24.1)
+      p-map: 7.0.4
       pangu: 4.0.7
-      react: 19.2.3
+      react: 19.2.4
       remark-frontmatter: 5.0.0
       remark-gfm: 4.0.1
       remark-parse: 11.0.0
       remark-stringify: 11.0.0
-      swr: 2.3.6(react@19.2.3)
+      swr: 2.4.0(react@19.2.4)
       unified: 11.0.5
-      unist-util-visit: 5.0.0
+      unist-util-visit: 5.1.0
       update-notifier: 7.3.1
-      zustand: 5.0.8(@types/react@19.1.9)(react@19.2.3)(use-sync-external-store@1.6.0(react@19.2.3))
+      zustand: 5.0.11(@types/react@19.1.9)(react@19.2.4)(use-sync-external-store@1.6.0(react@19.2.4))
     transitivePeerDependencies:
       - '@types/react'
       - bufferutil
@@ -10011,31 +10407,32 @@ snapshots:
       - ws
       - zod
 
-  '@mdx-js/react@3.1.1(@types/react@19.1.9)(react@19.2.3)':
+  '@mdx-js/react@3.1.1(@types/react@19.1.9)(react@19.2.4)':
     dependencies:
       '@types/mdx': 2.0.13
       '@types/react': 19.1.9
-      react: 19.2.3
+      react: 19.2.4
 
-  '@microsoft/api-extractor-model@7.30.7(@types/node@24.10.4)':
+  '@microsoft/api-extractor-model@7.33.1(@types/node@24.10.4)':
     dependencies:
-      '@microsoft/tsdoc': 0.15.1
-      '@microsoft/tsdoc-config': 0.17.1
-      '@rushstack/node-core-library': 5.14.0(@types/node@24.10.4)
+      '@microsoft/tsdoc': 0.16.0
+      '@microsoft/tsdoc-config': 0.18.0
+      '@rushstack/node-core-library': 5.20.1(@types/node@24.10.4)
     transitivePeerDependencies:
       - '@types/node'
 
-  '@microsoft/api-extractor@7.52.13(@types/node@24.10.4)':
+  '@microsoft/api-extractor@7.57.2(@types/node@24.10.4)':
     dependencies:
-      '@microsoft/api-extractor-model': 7.30.7(@types/node@24.10.4)
-      '@microsoft/tsdoc': 0.15.1
-      '@microsoft/tsdoc-config': 0.17.1
-      '@rushstack/node-core-library': 5.14.0(@types/node@24.10.4)
-      '@rushstack/rig-package': 0.5.3
-      '@rushstack/terminal': 0.16.0(@types/node@24.10.4)
-      '@rushstack/ts-command-line': 5.0.3(@types/node@24.10.4)
-      lodash: 4.17.21
-      minimatch: 10.0.3
+      '@microsoft/api-extractor-model': 7.33.1(@types/node@24.10.4)
+      '@microsoft/tsdoc': 0.16.0
+      '@microsoft/tsdoc-config': 0.18.0
+      '@rushstack/node-core-library': 5.20.1(@types/node@24.10.4)
+      '@rushstack/rig-package': 0.7.1
+      '@rushstack/terminal': 0.22.1(@types/node@24.10.4)
+      '@rushstack/ts-command-line': 5.3.1(@types/node@24.10.4)
+      diff: 8.0.3
+      lodash: 4.17.23
+      minimatch: 10.2.1
       resolve: 1.22.11
       semver: 7.5.4
       source-map: 0.6.1
@@ -10043,14 +10440,14 @@ snapshots:
     transitivePeerDependencies:
       - '@types/node'
 
-  '@microsoft/tsdoc-config@0.17.1':
+  '@microsoft/tsdoc-config@0.18.0':
     dependencies:
-      '@microsoft/tsdoc': 0.15.1
+      '@microsoft/tsdoc': 0.16.0
       ajv: 8.12.0
       jju: 1.4.0
       resolve: 1.22.11
 
-  '@microsoft/tsdoc@0.15.1': {}
+  '@microsoft/tsdoc@0.16.0': {}
 
   '@mixpanel/rrdom@2.0.0-alpha.18.2':
     dependencies:
@@ -10077,21 +10474,21 @@ snapshots:
 
   '@napi-rs/wasm-runtime@0.2.12':
     dependencies:
-      '@emnapi/core': 1.7.1
-      '@emnapi/runtime': 1.7.1
+      '@emnapi/core': 1.8.1
+      '@emnapi/runtime': 1.8.1
       '@tybys/wasm-util': 0.10.1
     optional: true
 
   '@napi-rs/wasm-runtime@0.2.4':
     dependencies:
-      '@emnapi/core': 1.7.1
-      '@emnapi/runtime': 1.7.1
+      '@emnapi/core': 1.8.1
+      '@emnapi/runtime': 1.8.1
       '@tybys/wasm-util': 0.9.0
 
-  '@napi-rs/wasm-runtime@1.1.0':
+  '@napi-rs/wasm-runtime@1.1.1':
     dependencies:
-      '@emnapi/core': 1.7.1
-      '@emnapi/runtime': 1.7.1
+      '@emnapi/core': 1.8.1
+      '@emnapi/runtime': 1.8.1
       '@tybys/wasm-util': 0.10.1
     optional: true
 
@@ -10107,14 +10504,14 @@ snapshots:
       '@nodelib/fs.scandir': 2.1.5
       fastq: 1.19.1
 
-  '@nx/cypress@22.2.4(@babel/traverse@7.28.5)(@zkochan/js-yaml@0.0.7)(eslint@9.39.1(jiti@2.6.1))(nx@22.2.6)(typescript@5.9.3)':
+  '@nx/cypress@22.5.2(@babel/traverse@7.29.0)(@zkochan/js-yaml@0.0.7)(eslint@9.39.1(jiti@2.6.1))(nx@22.5.2)(typescript@5.9.3)':
     dependencies:
-      '@nx/devkit': 22.2.4(nx@22.2.6)
-      '@nx/eslint': 22.2.4(@babel/traverse@7.28.5)(@zkochan/js-yaml@0.0.7)(eslint@9.39.1(jiti@2.6.1))(nx@22.2.6)
-      '@nx/js': 22.2.4(@babel/traverse@7.28.5)(nx@22.2.6)
-      '@phenomnomnominal/tsquery': 5.0.1(typescript@5.9.3)
+      '@nx/devkit': 22.5.2(nx@22.5.2)
+      '@nx/eslint': 22.5.2(@babel/traverse@7.29.0)(@zkochan/js-yaml@0.0.7)(eslint@9.39.1(jiti@2.6.1))(nx@22.5.2)
+      '@nx/js': 22.5.2(@babel/traverse@7.29.0)(nx@22.5.2)
+      '@phenomnomnominal/tsquery': 6.1.4(typescript@5.9.3)
       detect-port: 1.6.1
-      semver: 7.7.3
+      semver: 7.7.4
       tree-kill: 1.2.2
       tslib: 2.8.1
     transitivePeerDependencies:
@@ -10129,45 +10526,23 @@ snapshots:
       - typescript
       - verdaccio
 
-  '@nx/devkit@22.2.4(nx@22.2.4)':
+  '@nx/devkit@22.5.2(nx@22.5.2)':
     dependencies:
       '@zkochan/js-yaml': 0.0.7
       ejs: 3.1.10
       enquirer: 2.3.6
-      minimatch: 9.0.3
-      nx: 22.2.4
-      semver: 7.7.3
+      minimatch: 10.1.1
+      nx: 22.5.2
+      semver: 7.7.4
       tslib: 2.8.1
       yargs-parser: 21.1.1
 
-  '@nx/devkit@22.2.4(nx@22.2.6)':
+  '@nx/eslint@22.5.2(@babel/traverse@7.29.0)(@zkochan/js-yaml@0.0.7)(eslint@9.39.1(jiti@2.6.1))(nx@22.5.2)':
     dependencies:
-      '@zkochan/js-yaml': 0.0.7
-      ejs: 3.1.10
-      enquirer: 2.3.6
-      minimatch: 9.0.3
-      nx: 22.2.6
-      semver: 7.7.3
-      tslib: 2.8.1
-      yargs-parser: 21.1.1
-
-  '@nx/devkit@22.2.6(nx@22.2.6)':
-    dependencies:
-      '@zkochan/js-yaml': 0.0.7
-      ejs: 3.1.10
-      enquirer: 2.3.6
-      minimatch: 9.0.3
-      nx: 22.2.6
-      semver: 7.7.3
-      tslib: 2.8.1
-      yargs-parser: 21.1.1
-
-  '@nx/eslint@22.2.4(@babel/traverse@7.28.5)(@zkochan/js-yaml@0.0.7)(eslint@9.39.1(jiti@2.6.1))(nx@22.2.6)':
-    dependencies:
-      '@nx/devkit': 22.2.4(nx@22.2.6)
-      '@nx/js': 22.2.4(@babel/traverse@7.28.5)(nx@22.2.6)
+      '@nx/devkit': 22.5.2(nx@22.5.2)
+      '@nx/js': 22.5.2(@babel/traverse@7.29.0)(nx@22.5.2)
       eslint: 9.39.1(jiti@2.6.1)
-      semver: 7.7.3
+      semver: 7.7.4
       tslib: 2.8.1
       typescript: 5.9.3
     optionalDependencies:
@@ -10181,40 +10556,21 @@ snapshots:
       - supports-color
       - verdaccio
 
-  '@nx/eslint@22.2.6(@babel/traverse@7.28.5)(@zkochan/js-yaml@0.0.7)(eslint@9.39.1(jiti@2.6.1))(nx@22.2.6)':
+  '@nx/js@22.5.2(@babel/traverse@7.29.0)(nx@22.5.2)':
     dependencies:
-      '@nx/devkit': 22.2.6(nx@22.2.6)
-      '@nx/js': 22.2.6(@babel/traverse@7.28.5)(nx@22.2.6)
-      eslint: 9.39.1(jiti@2.6.1)
-      semver: 7.7.3
-      tslib: 2.8.1
-      typescript: 5.9.3
-    optionalDependencies:
+      '@babel/core': 7.29.0
+      '@babel/plugin-proposal-decorators': 7.29.0(@babel/core@7.29.0)
+      '@babel/plugin-transform-class-properties': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-transform-runtime': 7.29.0(@babel/core@7.29.0)
+      '@babel/preset-env': 7.29.0(@babel/core@7.29.0)
+      '@babel/preset-typescript': 7.28.5(@babel/core@7.29.0)
+      '@babel/runtime': 7.28.6
+      '@nx/devkit': 22.5.2(nx@22.5.2)
+      '@nx/workspace': 22.5.2
       '@zkochan/js-yaml': 0.0.7
-    transitivePeerDependencies:
-      - '@babel/traverse'
-      - '@swc-node/register'
-      - '@swc/core'
-      - debug
-      - nx
-      - supports-color
-      - verdaccio
-
-  '@nx/js@22.2.4(@babel/traverse@7.28.5)(nx@22.2.6)':
-    dependencies:
-      '@babel/core': 7.28.5
-      '@babel/plugin-proposal-decorators': 7.28.0(@babel/core@7.28.5)
-      '@babel/plugin-transform-class-properties': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-runtime': 7.28.5(@babel/core@7.28.5)
-      '@babel/preset-env': 7.28.5(@babel/core@7.28.5)
-      '@babel/preset-typescript': 7.28.5(@babel/core@7.28.5)
-      '@babel/runtime': 7.28.4
-      '@nx/devkit': 22.2.4(nx@22.2.6)
-      '@nx/workspace': 22.2.4
-      '@zkochan/js-yaml': 0.0.7
-      babel-plugin-const-enum: 1.2.0(@babel/core@7.28.5)
+      babel-plugin-const-enum: 1.2.0(@babel/core@7.29.0)
       babel-plugin-macros: 3.1.0
-      babel-plugin-transform-typescript-metadata: 0.3.2(@babel/core@7.28.5)(@babel/traverse@7.28.5)
+      babel-plugin-transform-typescript-metadata: 0.3.2(@babel/core@7.29.0)(@babel/traverse@7.29.0)
       chalk: 4.1.2
       columnify: 1.6.0
       detect-port: 1.6.1
@@ -10224,7 +10580,7 @@ snapshots:
       npm-run-path: 4.0.1
       picocolors: 1.1.1
       picomatch: 4.0.2
-      semver: 7.7.3
+      semver: 7.7.4
       source-map-support: 0.5.19
       tinyglobby: 0.2.15
       tslib: 2.8.1
@@ -10236,111 +10592,45 @@ snapshots:
       - nx
       - supports-color
 
-  '@nx/js@22.2.6(@babel/traverse@7.28.5)(nx@22.2.6)':
+  '@nx/nx-darwin-arm64@22.5.2':
+    optional: true
+
+  '@nx/nx-darwin-x64@22.5.2':
+    optional: true
+
+  '@nx/nx-freebsd-x64@22.5.2':
+    optional: true
+
+  '@nx/nx-linux-arm-gnueabihf@22.5.2':
+    optional: true
+
+  '@nx/nx-linux-arm64-gnu@22.5.2':
+    optional: true
+
+  '@nx/nx-linux-arm64-musl@22.5.2':
+    optional: true
+
+  '@nx/nx-linux-x64-gnu@22.5.2':
+    optional: true
+
+  '@nx/nx-linux-x64-musl@22.5.2':
+    optional: true
+
+  '@nx/nx-win32-arm64-msvc@22.5.2':
+    optional: true
+
+  '@nx/nx-win32-x64-msvc@22.5.2':
+    optional: true
+
+  '@nx/playwright@22.5.2(@babel/traverse@7.29.0)(@playwright/test@1.58.1)(@zkochan/js-yaml@0.0.7)(eslint@9.39.1(jiti@2.6.1))(nx@22.5.2)':
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/plugin-proposal-decorators': 7.28.0(@babel/core@7.28.5)
-      '@babel/plugin-transform-class-properties': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-transform-runtime': 7.28.5(@babel/core@7.28.5)
-      '@babel/preset-env': 7.28.5(@babel/core@7.28.5)
-      '@babel/preset-typescript': 7.28.5(@babel/core@7.28.5)
-      '@babel/runtime': 7.28.4
-      '@nx/devkit': 22.2.6(nx@22.2.6)
-      '@nx/workspace': 22.2.6
-      '@zkochan/js-yaml': 0.0.7
-      babel-plugin-const-enum: 1.2.0(@babel/core@7.28.5)
-      babel-plugin-macros: 3.1.0
-      babel-plugin-transform-typescript-metadata: 0.3.2(@babel/core@7.28.5)(@babel/traverse@7.28.5)
-      chalk: 4.1.2
-      columnify: 1.6.0
-      detect-port: 1.6.1
-      ignore: 5.3.2
-      js-tokens: 4.0.0
-      jsonc-parser: 3.2.0
-      npm-run-path: 4.0.1
-      picocolors: 1.1.1
-      picomatch: 4.0.2
-      semver: 7.7.3
-      source-map-support: 0.5.19
-      tinyglobby: 0.2.15
-      tslib: 2.8.1
-    transitivePeerDependencies:
-      - '@babel/traverse'
-      - '@swc-node/register'
-      - '@swc/core'
-      - debug
-      - nx
-      - supports-color
-
-  '@nx/nx-darwin-arm64@22.2.4':
-    optional: true
-
-  '@nx/nx-darwin-arm64@22.2.6':
-    optional: true
-
-  '@nx/nx-darwin-x64@22.2.4':
-    optional: true
-
-  '@nx/nx-darwin-x64@22.2.6':
-    optional: true
-
-  '@nx/nx-freebsd-x64@22.2.4':
-    optional: true
-
-  '@nx/nx-freebsd-x64@22.2.6':
-    optional: true
-
-  '@nx/nx-linux-arm-gnueabihf@22.2.4':
-    optional: true
-
-  '@nx/nx-linux-arm-gnueabihf@22.2.6':
-    optional: true
-
-  '@nx/nx-linux-arm64-gnu@22.2.4':
-    optional: true
-
-  '@nx/nx-linux-arm64-gnu@22.2.6':
-    optional: true
-
-  '@nx/nx-linux-arm64-musl@22.2.4':
-    optional: true
-
-  '@nx/nx-linux-arm64-musl@22.2.6':
-    optional: true
-
-  '@nx/nx-linux-x64-gnu@22.2.4':
-    optional: true
-
-  '@nx/nx-linux-x64-gnu@22.2.6':
-    optional: true
-
-  '@nx/nx-linux-x64-musl@22.2.4':
-    optional: true
-
-  '@nx/nx-linux-x64-musl@22.2.6':
-    optional: true
-
-  '@nx/nx-win32-arm64-msvc@22.2.4':
-    optional: true
-
-  '@nx/nx-win32-arm64-msvc@22.2.6':
-    optional: true
-
-  '@nx/nx-win32-x64-msvc@22.2.4':
-    optional: true
-
-  '@nx/nx-win32-x64-msvc@22.2.6':
-    optional: true
-
-  '@nx/playwright@22.2.6(@babel/traverse@7.28.5)(@playwright/test@1.57.0)(@zkochan/js-yaml@0.0.7)(eslint@9.39.1(jiti@2.6.1))(nx@22.2.6)':
-    dependencies:
-      '@nx/devkit': 22.2.6(nx@22.2.6)
-      '@nx/eslint': 22.2.6(@babel/traverse@7.28.5)(@zkochan/js-yaml@0.0.7)(eslint@9.39.1(jiti@2.6.1))(nx@22.2.6)
-      '@nx/js': 22.2.6(@babel/traverse@7.28.5)(nx@22.2.6)
-      minimatch: 9.0.3
+      '@nx/devkit': 22.5.2(nx@22.5.2)
+      '@nx/eslint': 22.5.2(@babel/traverse@7.29.0)(@zkochan/js-yaml@0.0.7)(eslint@9.39.1(jiti@2.6.1))(nx@22.5.2)
+      '@nx/js': 22.5.2(@babel/traverse@7.29.0)(nx@22.5.2)
+      minimatch: 10.1.1
       tslib: 2.8.1
     optionalDependencies:
-      '@playwright/test': 1.57.0
+      '@playwright/test': 1.58.1
     transitivePeerDependencies:
       - '@babel/traverse'
       - '@swc-node/register'
@@ -10352,15 +10642,15 @@ snapshots:
       - supports-color
       - verdaccio
 
-  '@nx/storybook@22.2.4(@babel/traverse@7.28.5)(@zkochan/js-yaml@0.0.7)(eslint@9.39.1(jiti@2.6.1))(nx@22.2.6)(storybook@10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(typescript@5.9.3)':
+  '@nx/storybook@22.5.2(@babel/traverse@7.29.0)(@zkochan/js-yaml@0.0.7)(eslint@9.39.1(jiti@2.6.1))(nx@22.5.2)(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))(typescript@5.9.3)':
     dependencies:
-      '@nx/cypress': 22.2.4(@babel/traverse@7.28.5)(@zkochan/js-yaml@0.0.7)(eslint@9.39.1(jiti@2.6.1))(nx@22.2.6)(typescript@5.9.3)
-      '@nx/devkit': 22.2.4(nx@22.2.6)
-      '@nx/eslint': 22.2.4(@babel/traverse@7.28.5)(@zkochan/js-yaml@0.0.7)(eslint@9.39.1(jiti@2.6.1))(nx@22.2.6)
-      '@nx/js': 22.2.4(@babel/traverse@7.28.5)(nx@22.2.6)
-      '@phenomnomnominal/tsquery': 5.0.1(typescript@5.9.3)
-      semver: 7.7.3
-      storybook: 10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@nx/cypress': 22.5.2(@babel/traverse@7.29.0)(@zkochan/js-yaml@0.0.7)(eslint@9.39.1(jiti@2.6.1))(nx@22.5.2)(typescript@5.9.3)
+      '@nx/devkit': 22.5.2(nx@22.5.2)
+      '@nx/eslint': 22.5.2(@babel/traverse@7.29.0)(@zkochan/js-yaml@0.0.7)(eslint@9.39.1(jiti@2.6.1))(nx@22.5.2)
+      '@nx/js': 22.5.2(@babel/traverse@7.29.0)(nx@22.5.2)
+      '@phenomnomnominal/tsquery': 6.1.4(typescript@5.9.3)
+      semver: 7.7.4
+      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)
       tslib: 2.8.1
     transitivePeerDependencies:
       - '@babel/traverse'
@@ -10375,20 +10665,20 @@ snapshots:
       - typescript
       - verdaccio
 
-  '@nx/vite@22.2.6(@babel/traverse@7.28.5)(nx@22.2.6)(typescript@5.9.3)(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))(vitest@4.0.16)':
+  '@nx/vite@22.5.2(@babel/traverse@7.29.0)(nx@22.5.2)(typescript@5.9.3)(vite@8.0.0-beta.13(@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))(vitest@4.0.16)':
     dependencies:
-      '@nx/devkit': 22.2.6(nx@22.2.6)
-      '@nx/js': 22.2.6(@babel/traverse@7.28.5)(nx@22.2.6)
-      '@nx/vitest': 22.2.6(@babel/traverse@7.28.5)(nx@22.2.6)(typescript@5.9.3)(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))(vitest@4.0.16)
-      '@phenomnomnominal/tsquery': 5.0.1(typescript@5.9.3)
-      ajv: 8.17.1
+      '@nx/devkit': 22.5.2(nx@22.5.2)
+      '@nx/js': 22.5.2(@babel/traverse@7.29.0)(nx@22.5.2)
+      '@nx/vitest': 22.5.2(@babel/traverse@7.29.0)(nx@22.5.2)(typescript@5.9.3)(vite@8.0.0-beta.13(@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))(vitest@4.0.16)
+      '@phenomnomnominal/tsquery': 6.1.4(typescript@5.9.3)
+      ajv: 8.18.0
       enquirer: 2.3.6
       picomatch: 4.0.2
-      semver: 7.7.3
+      semver: 7.7.4
       tsconfig-paths: 4.2.0
       tslib: 2.8.1
-      vite: 7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
-      vitest: 4.0.16(@types/node@24.10.4)(@vitest/ui@4.0.16)(happy-dom@20.0.11)(jiti@2.6.1)(jsdom@27.4.0)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+      vite: 8.0.0-beta.13(@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)
+      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)
     transitivePeerDependencies:
       - '@babel/traverse'
       - '@swc-node/register'
@@ -10399,16 +10689,16 @@ snapshots:
       - typescript
       - verdaccio
 
-  '@nx/vitest@22.2.6(@babel/traverse@7.28.5)(nx@22.2.6)(typescript@5.9.3)(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))(vitest@4.0.16)':
+  '@nx/vitest@22.5.2(@babel/traverse@7.29.0)(nx@22.5.2)(typescript@5.9.3)(vite@8.0.0-beta.13(@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))(vitest@4.0.16)':
     dependencies:
-      '@nx/devkit': 22.2.6(nx@22.2.6)
-      '@nx/js': 22.2.6(@babel/traverse@7.28.5)(nx@22.2.6)
-      '@phenomnomnominal/tsquery': 5.0.1(typescript@5.9.3)
-      semver: 7.7.3
+      '@nx/devkit': 22.5.2(nx@22.5.2)
+      '@nx/js': 22.5.2(@babel/traverse@7.29.0)(nx@22.5.2)
+      '@phenomnomnominal/tsquery': 6.1.4(typescript@5.9.3)
+      semver: 7.7.4
       tslib: 2.8.1
     optionalDependencies:
-      vite: 7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
-      vitest: 4.0.16(@types/node@24.10.4)(@vitest/ui@4.0.16)(happy-dom@20.0.11)(jiti@2.6.1)(jsdom@27.4.0)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+      vite: 8.0.0-beta.13(@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)
+      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)
     transitivePeerDependencies:
       - '@babel/traverse'
       - '@swc-node/register'
@@ -10419,31 +10709,15 @@ snapshots:
       - typescript
       - verdaccio
 
-  '@nx/workspace@22.2.4':
+  '@nx/workspace@22.5.2':
     dependencies:
-      '@nx/devkit': 22.2.4(nx@22.2.4)
+      '@nx/devkit': 22.5.2(nx@22.5.2)
       '@zkochan/js-yaml': 0.0.7
       chalk: 4.1.2
       enquirer: 2.3.6
-      nx: 22.2.4
+      nx: 22.5.2
       picomatch: 4.0.2
-      semver: 7.7.3
-      tslib: 2.8.1
-      yargs-parser: 21.1.1
-    transitivePeerDependencies:
-      - '@swc-node/register'
-      - '@swc/core'
-      - debug
-
-  '@nx/workspace@22.2.6':
-    dependencies:
-      '@nx/devkit': 22.2.6(nx@22.2.6)
-      '@zkochan/js-yaml': 0.0.7
-      chalk: 4.1.2
-      enquirer: 2.3.6
-      nx: 22.2.6
-      picomatch: 4.0.2
-      semver: 7.7.3
+      semver: 7.7.4
       tslib: 2.8.1
       yargs-parser: 21.1.1
     transitivePeerDependencies:
@@ -10453,54 +10727,85 @@ snapshots:
 
   '@one-ini/wasm@0.1.1': {}
 
-  '@oxc-parser/binding-android-arm64@0.99.0':
-    optional: true
-
-  '@oxc-parser/binding-darwin-arm64@0.99.0':
-    optional: true
-
-  '@oxc-parser/binding-darwin-x64@0.99.0':
-    optional: true
-
-  '@oxc-parser/binding-freebsd-x64@0.99.0':
-    optional: true
-
-  '@oxc-parser/binding-linux-arm-gnueabihf@0.99.0':
-    optional: true
-
-  '@oxc-parser/binding-linux-arm-musleabihf@0.99.0':
-    optional: true
-
-  '@oxc-parser/binding-linux-arm64-gnu@0.99.0':
-    optional: true
-
-  '@oxc-parser/binding-linux-arm64-musl@0.99.0':
-    optional: true
-
-  '@oxc-parser/binding-linux-riscv64-gnu@0.99.0':
-    optional: true
-
-  '@oxc-parser/binding-linux-s390x-gnu@0.99.0':
-    optional: true
-
-  '@oxc-parser/binding-linux-x64-gnu@0.99.0':
-    optional: true
-
-  '@oxc-parser/binding-linux-x64-musl@0.99.0':
-    optional: true
-
-  '@oxc-parser/binding-wasm32-wasi@0.99.0':
+  '@opentelemetry/api-logs@0.208.0':
     dependencies:
-      '@napi-rs/wasm-runtime': 1.1.0
-    optional: true
+      '@opentelemetry/api': 1.9.0
 
-  '@oxc-parser/binding-win32-arm64-msvc@0.99.0':
-    optional: true
+  '@opentelemetry/api@1.9.0': {}
 
-  '@oxc-parser/binding-win32-x64-msvc@0.99.0':
-    optional: true
+  '@opentelemetry/core@2.2.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/semantic-conventions': 1.40.0
 
-  '@oxc-project/types@0.99.0': {}
+  '@opentelemetry/core@2.6.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/semantic-conventions': 1.40.0
+
+  '@opentelemetry/exporter-logs-otlp-http@0.208.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api-logs': 0.208.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-logs': 0.208.0(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/otlp-exporter-base@0.208.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.208.0(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/otlp-transformer@0.208.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api-logs': 0.208.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-logs': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-metrics': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.2.0(@opentelemetry/api@1.9.0)
+      protobufjs: 7.5.0
+
+  '@opentelemetry/resources@2.2.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.40.0
+
+  '@opentelemetry/resources@2.6.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.6.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.40.0
+
+  '@opentelemetry/sdk-logs@0.208.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api-logs': 0.208.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/sdk-metrics@2.2.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/sdk-trace-base@2.2.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.40.0
+
+  '@opentelemetry/semantic-conventions@1.40.0': {}
+
+  '@oxc-project/runtime@0.112.0': {}
+
+  '@oxc-project/types@0.112.0': {}
 
   '@oxc-resolver/binding-android-arm-eabi@11.15.0':
     optional: true
@@ -10552,7 +10857,7 @@ snapshots:
 
   '@oxc-resolver/binding-wasm32-wasi@11.15.0':
     dependencies:
-      '@napi-rs/wasm-runtime': 1.1.0
+      '@napi-rs/wasm-runtime': 1.1.1
     optional: true
 
   '@oxc-resolver/binding-win32-arm64-msvc@11.15.0':
@@ -10564,65 +10869,156 @@ snapshots:
   '@oxc-resolver/binding-win32-x64-msvc@11.15.0':
     optional: true
 
-  '@oxlint-tsgolint/darwin-arm64@0.9.1':
+  '@oxfmt/binding-android-arm-eabi@0.34.0':
     optional: true
 
-  '@oxlint-tsgolint/darwin-x64@0.9.1':
+  '@oxfmt/binding-android-arm64@0.34.0':
     optional: true
 
-  '@oxlint-tsgolint/linux-arm64@0.9.1':
+  '@oxfmt/binding-darwin-arm64@0.34.0':
     optional: true
 
-  '@oxlint-tsgolint/linux-x64@0.9.1':
+  '@oxfmt/binding-darwin-x64@0.34.0':
     optional: true
 
-  '@oxlint-tsgolint/win32-arm64@0.9.1':
+  '@oxfmt/binding-freebsd-x64@0.34.0':
     optional: true
 
-  '@oxlint-tsgolint/win32-x64@0.9.1':
+  '@oxfmt/binding-linux-arm-gnueabihf@0.34.0':
     optional: true
 
-  '@oxlint/darwin-arm64@1.33.0':
+  '@oxfmt/binding-linux-arm-musleabihf@0.34.0':
     optional: true
 
-  '@oxlint/darwin-x64@1.33.0':
+  '@oxfmt/binding-linux-arm64-gnu@0.34.0':
     optional: true
 
-  '@oxlint/linux-arm64-gnu@1.33.0':
+  '@oxfmt/binding-linux-arm64-musl@0.34.0':
     optional: true
 
-  '@oxlint/linux-arm64-musl@1.33.0':
+  '@oxfmt/binding-linux-ppc64-gnu@0.34.0':
     optional: true
 
-  '@oxlint/linux-x64-gnu@1.33.0':
+  '@oxfmt/binding-linux-riscv64-gnu@0.34.0':
     optional: true
 
-  '@oxlint/linux-x64-musl@1.33.0':
+  '@oxfmt/binding-linux-riscv64-musl@0.34.0':
     optional: true
 
-  '@oxlint/win32-arm64@1.33.0':
+  '@oxfmt/binding-linux-s390x-gnu@0.34.0':
     optional: true
 
-  '@oxlint/win32-x64@1.33.0':
+  '@oxfmt/binding-linux-x64-gnu@0.34.0':
     optional: true
 
-  '@phenomnomnominal/tsquery@5.0.1(typescript@5.9.3)':
+  '@oxfmt/binding-linux-x64-musl@0.34.0':
+    optional: true
+
+  '@oxfmt/binding-openharmony-arm64@0.34.0':
+    optional: true
+
+  '@oxfmt/binding-win32-arm64-msvc@0.34.0':
+    optional: true
+
+  '@oxfmt/binding-win32-ia32-msvc@0.34.0':
+    optional: true
+
+  '@oxfmt/binding-win32-x64-msvc@0.34.0':
+    optional: true
+
+  '@oxlint-tsgolint/darwin-arm64@0.14.2':
+    optional: true
+
+  '@oxlint-tsgolint/darwin-x64@0.14.2':
+    optional: true
+
+  '@oxlint-tsgolint/linux-arm64@0.14.2':
+    optional: true
+
+  '@oxlint-tsgolint/linux-x64@0.14.2':
+    optional: true
+
+  '@oxlint-tsgolint/win32-arm64@0.14.2':
+    optional: true
+
+  '@oxlint-tsgolint/win32-x64@0.14.2':
+    optional: true
+
+  '@oxlint/binding-android-arm-eabi@1.49.0':
+    optional: true
+
+  '@oxlint/binding-android-arm64@1.49.0':
+    optional: true
+
+  '@oxlint/binding-darwin-arm64@1.49.0':
+    optional: true
+
+  '@oxlint/binding-darwin-x64@1.49.0':
+    optional: true
+
+  '@oxlint/binding-freebsd-x64@1.49.0':
+    optional: true
+
+  '@oxlint/binding-linux-arm-gnueabihf@1.49.0':
+    optional: true
+
+  '@oxlint/binding-linux-arm-musleabihf@1.49.0':
+    optional: true
+
+  '@oxlint/binding-linux-arm64-gnu@1.49.0':
+    optional: true
+
+  '@oxlint/binding-linux-arm64-musl@1.49.0':
+    optional: true
+
+  '@oxlint/binding-linux-ppc64-gnu@1.49.0':
+    optional: true
+
+  '@oxlint/binding-linux-riscv64-gnu@1.49.0':
+    optional: true
+
+  '@oxlint/binding-linux-riscv64-musl@1.49.0':
+    optional: true
+
+  '@oxlint/binding-linux-s390x-gnu@1.49.0':
+    optional: true
+
+  '@oxlint/binding-linux-x64-gnu@1.49.0':
+    optional: true
+
+  '@oxlint/binding-linux-x64-musl@1.49.0':
+    optional: true
+
+  '@oxlint/binding-openharmony-arm64@1.49.0':
+    optional: true
+
+  '@oxlint/binding-win32-arm64-msvc@1.49.0':
+    optional: true
+
+  '@oxlint/binding-win32-ia32-msvc@1.49.0':
+    optional: true
+
+  '@oxlint/binding-win32-x64-msvc@1.49.0':
+    optional: true
+
+  '@phenomnomnominal/tsquery@6.1.4(typescript@5.9.3)':
     dependencies:
-      esquery: 1.6.0
+      '@types/esquery': 1.5.4
+      esquery: 1.7.0
       typescript: 5.9.3
 
-  '@pinia/testing@1.0.3(pinia@2.2.2(typescript@5.9.3)(vue@3.5.13(typescript@5.9.3)))':
+  '@pinia/testing@1.0.3(pinia@3.0.4(typescript@5.9.3)(vue@3.5.13(typescript@5.9.3)))':
     dependencies:
-      pinia: 2.2.2(typescript@5.9.3)(vue@3.5.13(typescript@5.9.3))
+      pinia: 3.0.4(typescript@5.9.3)(vue@3.5.13(typescript@5.9.3))
 
   '@pkgjs/parseargs@0.11.0':
     optional: true
 
   '@pkgr/core@0.2.9': {}
 
-  '@playwright/test@1.57.0':
+  '@playwright/test@1.58.1':
     dependencies:
-      playwright: 1.57.0
+      playwright: 1.58.1
 
   '@pnpm/config.env-replace@1.1.0': {}
 
@@ -10630,7 +11026,7 @@ snapshots:
     dependencies:
       graceful-fs: 4.2.10
 
-  '@pnpm/npm-conf@2.3.1':
+  '@pnpm/npm-conf@3.0.2':
     dependencies:
       '@pnpm/config.env-replace': 1.1.0
       '@pnpm/network.ca-file': 1.0.2
@@ -10638,9 +11034,11 @@ snapshots:
 
   '@polka/url@1.0.0-next.29': {}
 
-  '@prettier/plugin-oxc@0.1.3':
+  '@posthog/core@1.23.2':
     dependencies:
-      oxc-parser: 0.99.0
+      cross-spawn: 7.0.6
+
+  '@posthog/types@1.358.1': {}
 
   '@primeuix/forms@0.0.2':
     dependencies:
@@ -10702,8 +11100,51 @@ snapshots:
 
   '@remirror/core-constants@3.0.0': {}
 
+  '@rolldown/binding-android-arm64@1.0.0-rc.3':
+    optional: true
+
+  '@rolldown/binding-darwin-arm64@1.0.0-rc.3':
+    optional: true
+
+  '@rolldown/binding-darwin-x64@1.0.0-rc.3':
+    optional: true
+
+  '@rolldown/binding-freebsd-x64@1.0.0-rc.3':
+    optional: true
+
+  '@rolldown/binding-linux-arm-gnueabihf@1.0.0-rc.3':
+    optional: true
+
+  '@rolldown/binding-linux-arm64-gnu@1.0.0-rc.3':
+    optional: true
+
+  '@rolldown/binding-linux-arm64-musl@1.0.0-rc.3':
+    optional: true
+
+  '@rolldown/binding-linux-x64-gnu@1.0.0-rc.3':
+    optional: true
+
+  '@rolldown/binding-linux-x64-musl@1.0.0-rc.3':
+    optional: true
+
+  '@rolldown/binding-openharmony-arm64@1.0.0-rc.3':
+    optional: true
+
+  '@rolldown/binding-wasm32-wasi@1.0.0-rc.3':
+    dependencies:
+      '@napi-rs/wasm-runtime': 1.1.1
+    optional: true
+
+  '@rolldown/binding-win32-arm64-msvc@1.0.0-rc.3':
+    optional: true
+
+  '@rolldown/binding-win32-x64-msvc@1.0.0-rc.3':
+    optional: true
+
   '@rolldown/pluginutils@1.0.0-beta.53': {}
 
+  '@rolldown/pluginutils@1.0.0-rc.3': {}
+
   '@rollup/pluginutils@4.2.1':
     dependencies:
       estree-walker: 2.0.2
@@ -10786,7 +11227,7 @@ snapshots:
   '@rtsao/scc@1.1.0':
     optional: true
 
-  '@rushstack/node-core-library@5.14.0(@types/node@24.10.4)':
+  '@rushstack/node-core-library@5.20.1(@types/node@24.10.4)':
     dependencies:
       ajv: 8.13.0
       ajv-draft-04: 1.0.0(ajv@8.13.0)
@@ -10799,21 +11240,26 @@ snapshots:
     optionalDependencies:
       '@types/node': 24.10.4
 
-  '@rushstack/rig-package@0.5.3':
+  '@rushstack/problem-matcher@0.2.1(@types/node@24.10.4)':
+    optionalDependencies:
+      '@types/node': 24.10.4
+
+  '@rushstack/rig-package@0.7.1':
     dependencies:
       resolve: 1.22.11
       strip-json-comments: 3.1.1
 
-  '@rushstack/terminal@0.16.0(@types/node@24.10.4)':
+  '@rushstack/terminal@0.22.1(@types/node@24.10.4)':
     dependencies:
-      '@rushstack/node-core-library': 5.14.0(@types/node@24.10.4)
+      '@rushstack/node-core-library': 5.20.1(@types/node@24.10.4)
+      '@rushstack/problem-matcher': 0.2.1(@types/node@24.10.4)
       supports-color: 8.1.1
     optionalDependencies:
       '@types/node': 24.10.4
 
-  '@rushstack/ts-command-line@5.0.3(@types/node@24.10.4)':
+  '@rushstack/ts-command-line@5.3.1(@types/node@24.10.4)':
     dependencies:
-      '@rushstack/terminal': 0.16.0(@types/node@24.10.4)
+      '@rushstack/terminal': 0.22.1(@types/node@24.10.4)
       '@types/argparse': 1.0.38
       argparse: 1.0.10
       string-argv: 0.3.2
@@ -10850,7 +11296,7 @@ snapshots:
 
   '@sentry/bundler-plugin-core@4.6.0':
     dependencies:
-      '@babel/core': 7.28.5
+      '@babel/core': 7.29.0
       '@sentry/babel-plugin-component-annotate': 4.6.0
       '@sentry/cli': 2.57.0
       dotenv: 16.6.1
@@ -10916,15 +11362,15 @@ snapshots:
       - encoding
       - supports-color
 
-  '@sentry/vue@10.32.1(pinia@2.2.2(typescript@5.9.3)(vue@3.5.13(typescript@5.9.3)))(vue@3.5.13(typescript@5.9.3))':
+  '@sentry/vue@10.32.1(pinia@3.0.4(typescript@5.9.3)(vue@3.5.13(typescript@5.9.3)))(vue@3.5.13(typescript@5.9.3))':
     dependencies:
       '@sentry/browser': 10.32.1
       '@sentry/core': 10.32.1
       vue: 3.5.13(typescript@5.9.3)
     optionalDependencies:
-      pinia: 2.2.2(typescript@5.9.3)(vue@3.5.13(typescript@5.9.3))
+      pinia: 3.0.4(typescript@5.9.3)(vue@3.5.13(typescript@5.9.3))
 
-  '@sinclair/typebox@0.34.40': {}
+  '@sinclair/typebox@0.34.48': {}
 
   '@sparkjsdev/spark@0.1.10':
     dependencies:
@@ -10932,15 +11378,15 @@ snapshots:
 
   '@standard-schema/spec@1.1.0': {}
 
-  '@storybook/addon-docs@10.1.9(@types/react@19.1.9)(esbuild@0.27.1)(rollup@4.53.5)(storybook@10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))':
+  '@storybook/addon-docs@10.2.10(@types/react@19.1.9)(esbuild@0.27.3)(rollup@4.53.5)(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))(vite@8.0.0-beta.13(@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))':
     dependencies:
-      '@mdx-js/react': 3.1.1(@types/react@19.1.9)(react@19.2.3)
-      '@storybook/csf-plugin': 10.1.9(esbuild@0.27.1)(rollup@4.53.5)(storybook@10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
-      '@storybook/icons': 2.0.1(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@storybook/react-dom-shim': 10.1.9(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(storybook@10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-      storybook: 10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@mdx-js/react': 3.1.1(@types/react@19.1.9)(react@19.2.4)
+      '@storybook/csf-plugin': 10.2.10(esbuild@0.27.3)(rollup@4.53.5)(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))(vite@8.0.0-beta.13(@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))
+      '@storybook/icons': 2.0.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@storybook/react-dom-shim': 10.2.10(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(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))
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+      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)
       ts-dedent: 2.2.0
     transitivePeerDependencies:
       - '@types/react'
@@ -10949,147 +11395,163 @@ snapshots:
       - vite
       - webpack
 
-  '@storybook/builder-vite@10.1.9(esbuild@0.27.1)(rollup@4.53.5)(storybook@10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))':
+  '@storybook/addon-mcp@0.1.6(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))(typescript@5.9.3)':
     dependencies:
-      '@storybook/csf-plugin': 10.1.9(esbuild@0.27.1)(rollup@4.53.5)(storybook@10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
-      '@vitest/mocker': 3.2.4(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
-      storybook: 10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@storybook/mcp': 0.1.1(typescript@5.9.3)
+      '@tmcp/adapter-valibot': 0.1.5(tmcp@1.19.0(typescript@5.9.3))(valibot@1.2.0(typescript@5.9.3))
+      '@tmcp/transport-http': 0.8.3(tmcp@1.19.0(typescript@5.9.3))
+      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)
+      tmcp: 1.19.0(typescript@5.9.3)
+      valibot: 1.2.0(typescript@5.9.3)
+    transitivePeerDependencies:
+      - '@tmcp/auth'
+      - typescript
+
+  '@storybook/builder-vite@10.2.10(esbuild@0.27.3)(rollup@4.53.5)(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))(vite@8.0.0-beta.13(@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))':
+    dependencies:
+      '@storybook/csf-plugin': 10.2.10(esbuild@0.27.3)(rollup@4.53.5)(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))(vite@8.0.0-beta.13(@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))
+      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)
       ts-dedent: 2.2.0
-      vite: 7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+      vite: 8.0.0-beta.13(@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)
     transitivePeerDependencies:
       - esbuild
-      - msw
       - rollup
       - webpack
 
-  '@storybook/csf-plugin@10.1.9(esbuild@0.27.1)(rollup@4.53.5)(storybook@10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))':
+  '@storybook/csf-plugin@10.2.10(esbuild@0.27.3)(rollup@4.53.5)(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))(vite@8.0.0-beta.13(@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))':
     dependencies:
-      storybook: 10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      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)
       unplugin: 2.3.11
     optionalDependencies:
-      esbuild: 0.27.1
+      esbuild: 0.27.3
       rollup: 4.53.5
-      vite: 7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+      vite: 8.0.0-beta.13(@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)
 
   '@storybook/global@5.0.0': {}
 
-  '@storybook/icons@2.0.1(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+  '@storybook/icons@2.0.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
 
-  '@storybook/react-dom-shim@10.1.9(react-dom@19.2.3(react@19.2.3))(react@19.2.3)(storybook@10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))':
+  '@storybook/mcp@0.1.1(typescript@5.9.3)':
     dependencies:
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-      storybook: 10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@tmcp/adapter-valibot': 0.1.5(tmcp@1.19.0(typescript@5.9.3))(valibot@1.2.0(typescript@5.9.3))
+      '@tmcp/transport-http': 0.8.3(tmcp@1.19.0(typescript@5.9.3))
+      tmcp: 1.19.0(typescript@5.9.3)
+      valibot: 1.2.0(typescript@5.9.3)
+    transitivePeerDependencies:
+      - '@tmcp/auth'
+      - typescript
 
-  '@storybook/vue3-vite@10.1.9(esbuild@0.27.1)(rollup@4.53.5)(storybook@10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))(vue@3.5.13(typescript@5.9.3))':
+  '@storybook/react-dom-shim@10.2.10(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(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))':
     dependencies:
-      '@storybook/builder-vite': 10.1.9(esbuild@0.27.1)(rollup@4.53.5)(storybook@10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
-      '@storybook/vue3': 10.1.9(storybook@10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(vue@3.5.13(typescript@5.9.3))
+      react: 19.2.4
+      react-dom: 19.2.4(react@19.2.4)
+      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)
+
+  '@storybook/vue3-vite@10.2.10(esbuild@0.27.3)(rollup@4.53.5)(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))(vite@8.0.0-beta.13(@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))':
+    dependencies:
+      '@storybook/builder-vite': 10.2.10(esbuild@0.27.3)(rollup@4.53.5)(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))(vite@8.0.0-beta.13(@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))
+      '@storybook/vue3': 10.2.10(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))(vue@3.5.13(typescript@5.9.3))
       magic-string: 0.30.21
-      storybook: 10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      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)
       typescript: 5.9.3
-      vite: 7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+      vite: 8.0.0-beta.13(@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-component-meta: 2.2.12(typescript@5.9.3)
       vue-docgen-api: 4.79.2(vue@3.5.13(typescript@5.9.3))
     transitivePeerDependencies:
       - esbuild
-      - msw
       - rollup
       - vue
       - webpack
 
-  '@storybook/vue3@10.1.9(storybook@10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(vue@3.5.13(typescript@5.9.3))':
+  '@storybook/vue3@10.2.10(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))(vue@3.5.13(typescript@5.9.3))':
     dependencies:
       '@storybook/global': 5.0.0
-      storybook: 10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      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.1
+      vue-component-type-helpers: 3.2.5
 
   '@swc/helpers@0.5.17':
     dependencies:
       tslib: 2.8.1
 
-  '@tailwindcss/node@4.1.12':
+  '@tailwindcss/node@4.2.0':
     dependencies:
       '@jridgewell/remapping': 2.3.5
-      enhanced-resolve: 5.18.3
+      enhanced-resolve: 5.19.0
       jiti: 2.6.1
-      lightningcss: 1.30.1
+      lightningcss: 1.31.1
       magic-string: 0.30.21
       source-map-js: 1.2.1
-      tailwindcss: 4.1.12
+      tailwindcss: 4.2.0
 
-  '@tailwindcss/oxide-android-arm64@4.1.12':
+  '@tailwindcss/oxide-android-arm64@4.2.0':
     optional: true
 
-  '@tailwindcss/oxide-darwin-arm64@4.1.12':
+  '@tailwindcss/oxide-darwin-arm64@4.2.0':
     optional: true
 
-  '@tailwindcss/oxide-darwin-x64@4.1.12':
+  '@tailwindcss/oxide-darwin-x64@4.2.0':
     optional: true
 
-  '@tailwindcss/oxide-freebsd-x64@4.1.12':
+  '@tailwindcss/oxide-freebsd-x64@4.2.0':
     optional: true
 
-  '@tailwindcss/oxide-linux-arm-gnueabihf@4.1.12':
+  '@tailwindcss/oxide-linux-arm-gnueabihf@4.2.0':
     optional: true
 
-  '@tailwindcss/oxide-linux-arm64-gnu@4.1.12':
+  '@tailwindcss/oxide-linux-arm64-gnu@4.2.0':
     optional: true
 
-  '@tailwindcss/oxide-linux-arm64-musl@4.1.12':
+  '@tailwindcss/oxide-linux-arm64-musl@4.2.0':
     optional: true
 
-  '@tailwindcss/oxide-linux-x64-gnu@4.1.12':
+  '@tailwindcss/oxide-linux-x64-gnu@4.2.0':
     optional: true
 
-  '@tailwindcss/oxide-linux-x64-musl@4.1.12':
+  '@tailwindcss/oxide-linux-x64-musl@4.2.0':
     optional: true
 
-  '@tailwindcss/oxide-wasm32-wasi@4.1.12':
+  '@tailwindcss/oxide-wasm32-wasi@4.2.0':
     optional: true
 
-  '@tailwindcss/oxide-win32-arm64-msvc@4.1.12':
+  '@tailwindcss/oxide-win32-arm64-msvc@4.2.0':
     optional: true
 
-  '@tailwindcss/oxide-win32-x64-msvc@4.1.12':
+  '@tailwindcss/oxide-win32-x64-msvc@4.2.0':
     optional: true
 
-  '@tailwindcss/oxide@4.1.12':
-    dependencies:
-      detect-libc: 2.0.4
-      tar: 7.4.3
+  '@tailwindcss/oxide@4.2.0':
     optionalDependencies:
-      '@tailwindcss/oxide-android-arm64': 4.1.12
-      '@tailwindcss/oxide-darwin-arm64': 4.1.12
-      '@tailwindcss/oxide-darwin-x64': 4.1.12
-      '@tailwindcss/oxide-freebsd-x64': 4.1.12
-      '@tailwindcss/oxide-linux-arm-gnueabihf': 4.1.12
-      '@tailwindcss/oxide-linux-arm64-gnu': 4.1.12
-      '@tailwindcss/oxide-linux-arm64-musl': 4.1.12
-      '@tailwindcss/oxide-linux-x64-gnu': 4.1.12
-      '@tailwindcss/oxide-linux-x64-musl': 4.1.12
-      '@tailwindcss/oxide-wasm32-wasi': 4.1.12
-      '@tailwindcss/oxide-win32-arm64-msvc': 4.1.12
-      '@tailwindcss/oxide-win32-x64-msvc': 4.1.12
+      '@tailwindcss/oxide-android-arm64': 4.2.0
+      '@tailwindcss/oxide-darwin-arm64': 4.2.0
+      '@tailwindcss/oxide-darwin-x64': 4.2.0
+      '@tailwindcss/oxide-freebsd-x64': 4.2.0
+      '@tailwindcss/oxide-linux-arm-gnueabihf': 4.2.0
+      '@tailwindcss/oxide-linux-arm64-gnu': 4.2.0
+      '@tailwindcss/oxide-linux-arm64-musl': 4.2.0
+      '@tailwindcss/oxide-linux-x64-gnu': 4.2.0
+      '@tailwindcss/oxide-linux-x64-musl': 4.2.0
+      '@tailwindcss/oxide-wasm32-wasi': 4.2.0
+      '@tailwindcss/oxide-win32-arm64-msvc': 4.2.0
+      '@tailwindcss/oxide-win32-x64-msvc': 4.2.0
 
-  '@tailwindcss/vite@4.1.12(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))':
+  '@tailwindcss/vite@4.2.0(vite@8.0.0-beta.13(@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))':
     dependencies:
-      '@tailwindcss/node': 4.1.12
-      '@tailwindcss/oxide': 4.1.12
-      tailwindcss: 4.1.12
-      vite: 7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+      '@tailwindcss/node': 4.2.0
+      '@tailwindcss/oxide': 4.2.0
+      tailwindcss: 4.2.0
+      vite: 8.0.0-beta.13(@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)
 
-  '@tailwindcss/vite@4.1.12(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))':
+  '@tailwindcss/vite@4.2.0(vite@8.0.0-beta.13(@types/node@25.0.3)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))':
     dependencies:
-      '@tailwindcss/node': 4.1.12
-      '@tailwindcss/oxide': 4.1.12
-      tailwindcss: 4.1.12
-      vite: 7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+      '@tailwindcss/node': 4.2.0
+      '@tailwindcss/oxide': 4.2.0
+      tailwindcss: 4.2.0
+      vite: 8.0.0-beta.13(@types/node@25.0.3)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
 
   '@tanstack/virtual-core@3.13.12': {}
 
@@ -11100,8 +11562,8 @@ snapshots:
 
   '@testing-library/dom@10.4.1':
     dependencies:
-      '@babel/code-frame': 7.27.1
-      '@babel/runtime': 7.28.4
+      '@babel/code-frame': 7.29.0
+      '@babel/runtime': 7.28.6
       '@types/aria-query': 5.0.4
       aria-query: 5.3.0
       dom-accessibility-api: 0.5.16
@@ -11122,172 +11584,175 @@ snapshots:
     dependencies:
       '@testing-library/dom': 10.4.1
 
-  '@tiptap/core@2.10.4(@tiptap/pm@2.10.4)':
+  '@tiptap/core@2.27.2(@tiptap/pm@2.27.2)':
     dependencies:
-      '@tiptap/pm': 2.10.4
+      '@tiptap/pm': 2.27.2
 
-  '@tiptap/extension-blockquote@2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))':
+  '@tiptap/extension-blockquote@2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))':
     dependencies:
-      '@tiptap/core': 2.10.4(@tiptap/pm@2.10.4)
+      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
 
-  '@tiptap/extension-bold@2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))':
+  '@tiptap/extension-bold@2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))':
     dependencies:
-      '@tiptap/core': 2.10.4(@tiptap/pm@2.10.4)
+      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
 
-  '@tiptap/extension-bullet-list@2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))':
+  '@tiptap/extension-bullet-list@2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))':
     dependencies:
-      '@tiptap/core': 2.10.4(@tiptap/pm@2.10.4)
+      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
 
-  '@tiptap/extension-code-block@2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))(@tiptap/pm@2.10.4)':
+  '@tiptap/extension-code-block@2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2)':
     dependencies:
-      '@tiptap/core': 2.10.4(@tiptap/pm@2.10.4)
-      '@tiptap/pm': 2.10.4
+      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
+      '@tiptap/pm': 2.27.2
 
-  '@tiptap/extension-code@2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))':
+  '@tiptap/extension-code@2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))':
     dependencies:
-      '@tiptap/core': 2.10.4(@tiptap/pm@2.10.4)
+      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
 
-  '@tiptap/extension-document@2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))':
+  '@tiptap/extension-document@2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))':
     dependencies:
-      '@tiptap/core': 2.10.4(@tiptap/pm@2.10.4)
+      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
 
-  '@tiptap/extension-dropcursor@2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))(@tiptap/pm@2.10.4)':
+  '@tiptap/extension-dropcursor@2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2)':
     dependencies:
-      '@tiptap/core': 2.10.4(@tiptap/pm@2.10.4)
-      '@tiptap/pm': 2.10.4
+      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
+      '@tiptap/pm': 2.27.2
 
-  '@tiptap/extension-gapcursor@2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))(@tiptap/pm@2.10.4)':
+  '@tiptap/extension-gapcursor@2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2)':
     dependencies:
-      '@tiptap/core': 2.10.4(@tiptap/pm@2.10.4)
-      '@tiptap/pm': 2.10.4
+      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
+      '@tiptap/pm': 2.27.2
 
-  '@tiptap/extension-hard-break@2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))':
+  '@tiptap/extension-hard-break@2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))':
     dependencies:
-      '@tiptap/core': 2.10.4(@tiptap/pm@2.10.4)
+      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
 
-  '@tiptap/extension-heading@2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))':
+  '@tiptap/extension-heading@2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))':
     dependencies:
-      '@tiptap/core': 2.10.4(@tiptap/pm@2.10.4)
+      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
 
-  '@tiptap/extension-history@2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))(@tiptap/pm@2.10.4)':
+  '@tiptap/extension-history@2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2)':
     dependencies:
-      '@tiptap/core': 2.10.4(@tiptap/pm@2.10.4)
-      '@tiptap/pm': 2.10.4
+      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
+      '@tiptap/pm': 2.27.2
 
-  '@tiptap/extension-horizontal-rule@2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))(@tiptap/pm@2.10.4)':
+  '@tiptap/extension-horizontal-rule@2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2)':
     dependencies:
-      '@tiptap/core': 2.10.4(@tiptap/pm@2.10.4)
-      '@tiptap/pm': 2.10.4
+      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
+      '@tiptap/pm': 2.27.2
 
-  '@tiptap/extension-italic@2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))':
+  '@tiptap/extension-italic@2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))':
     dependencies:
-      '@tiptap/core': 2.10.4(@tiptap/pm@2.10.4)
+      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
 
-  '@tiptap/extension-link@2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))(@tiptap/pm@2.10.4)':
+  '@tiptap/extension-link@2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2)':
     dependencies:
-      '@tiptap/core': 2.10.4(@tiptap/pm@2.10.4)
-      '@tiptap/pm': 2.10.4
-      linkifyjs: 4.2.0
+      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
+      '@tiptap/pm': 2.27.2
+      linkifyjs: 4.3.2
 
-  '@tiptap/extension-list-item@2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))':
+  '@tiptap/extension-list-item@2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))':
     dependencies:
-      '@tiptap/core': 2.10.4(@tiptap/pm@2.10.4)
+      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
 
-  '@tiptap/extension-ordered-list@2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))':
+  '@tiptap/extension-ordered-list@2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))':
     dependencies:
-      '@tiptap/core': 2.10.4(@tiptap/pm@2.10.4)
+      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
 
-  '@tiptap/extension-paragraph@2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))':
+  '@tiptap/extension-paragraph@2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))':
     dependencies:
-      '@tiptap/core': 2.10.4(@tiptap/pm@2.10.4)
+      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
 
-  '@tiptap/extension-strike@2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))':
+  '@tiptap/extension-strike@2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))':
     dependencies:
-      '@tiptap/core': 2.10.4(@tiptap/pm@2.10.4)
+      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
 
-  '@tiptap/extension-table-cell@2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))':
+  '@tiptap/extension-table-cell@2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))':
     dependencies:
-      '@tiptap/core': 2.10.4(@tiptap/pm@2.10.4)
+      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
 
-  '@tiptap/extension-table-header@2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))':
+  '@tiptap/extension-table-header@2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))':
     dependencies:
-      '@tiptap/core': 2.10.4(@tiptap/pm@2.10.4)
+      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
 
-  '@tiptap/extension-table-row@2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))':
+  '@tiptap/extension-table-row@2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))':
     dependencies:
-      '@tiptap/core': 2.10.4(@tiptap/pm@2.10.4)
+      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
 
-  '@tiptap/extension-table@2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))(@tiptap/pm@2.10.4)':
+  '@tiptap/extension-table@2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2)':
     dependencies:
-      '@tiptap/core': 2.10.4(@tiptap/pm@2.10.4)
-      '@tiptap/pm': 2.10.4
+      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
+      '@tiptap/pm': 2.27.2
 
-  '@tiptap/extension-text-style@2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))':
+  '@tiptap/extension-text-style@2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))':
     dependencies:
-      '@tiptap/core': 2.10.4(@tiptap/pm@2.10.4)
+      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
 
-  '@tiptap/extension-text@2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))':
+  '@tiptap/extension-text@2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))':
     dependencies:
-      '@tiptap/core': 2.10.4(@tiptap/pm@2.10.4)
+      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
 
-  '@tiptap/pm@2.10.4':
+  '@tiptap/pm@2.27.2':
     dependencies:
-      prosemirror-changeset: 2.2.1
+      prosemirror-changeset: 2.4.0
       prosemirror-collab: 1.3.1
-      prosemirror-commands: 1.6.2
-      prosemirror-dropcursor: 1.8.1
-      prosemirror-gapcursor: 1.3.2
-      prosemirror-history: 1.4.1
-      prosemirror-inputrules: 1.4.0
-      prosemirror-keymap: 1.2.2
-      prosemirror-markdown: 1.13.1
-      prosemirror-menu: 1.2.4
-      prosemirror-model: 1.24.1
-      prosemirror-schema-basic: 1.2.3
-      prosemirror-schema-list: 1.5.0
-      prosemirror-state: 1.4.3
-      prosemirror-tables: 1.6.2
-      prosemirror-trailing-node: 3.0.0(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.1)
-      prosemirror-transform: 1.10.2
-      prosemirror-view: 1.37.1
+      prosemirror-commands: 1.7.1
+      prosemirror-dropcursor: 1.8.2
+      prosemirror-gapcursor: 1.4.0
+      prosemirror-history: 1.5.0
+      prosemirror-inputrules: 1.5.1
+      prosemirror-keymap: 1.2.3
+      prosemirror-markdown: 1.13.4
+      prosemirror-menu: 1.3.0
+      prosemirror-model: 1.25.4
+      prosemirror-schema-basic: 1.2.4
+      prosemirror-schema-list: 1.5.1
+      prosemirror-state: 1.4.4
+      prosemirror-tables: 1.8.5
+      prosemirror-trailing-node: 3.0.0(prosemirror-model@1.25.4)(prosemirror-state@1.4.4)(prosemirror-view@1.41.6)
+      prosemirror-transform: 1.11.0
+      prosemirror-view: 1.41.6
 
-  '@tiptap/starter-kit@2.10.4':
+  '@tiptap/starter-kit@2.27.2':
     dependencies:
-      '@tiptap/core': 2.10.4(@tiptap/pm@2.10.4)
-      '@tiptap/extension-blockquote': 2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))
-      '@tiptap/extension-bold': 2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))
-      '@tiptap/extension-bullet-list': 2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))
-      '@tiptap/extension-code': 2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))
-      '@tiptap/extension-code-block': 2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))(@tiptap/pm@2.10.4)
-      '@tiptap/extension-document': 2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))
-      '@tiptap/extension-dropcursor': 2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))(@tiptap/pm@2.10.4)
-      '@tiptap/extension-gapcursor': 2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))(@tiptap/pm@2.10.4)
-      '@tiptap/extension-hard-break': 2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))
-      '@tiptap/extension-heading': 2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))
-      '@tiptap/extension-history': 2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))(@tiptap/pm@2.10.4)
-      '@tiptap/extension-horizontal-rule': 2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))(@tiptap/pm@2.10.4)
-      '@tiptap/extension-italic': 2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))
-      '@tiptap/extension-list-item': 2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))
-      '@tiptap/extension-ordered-list': 2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))
-      '@tiptap/extension-paragraph': 2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))
-      '@tiptap/extension-strike': 2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))
-      '@tiptap/extension-text': 2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))
-      '@tiptap/extension-text-style': 2.10.4(@tiptap/core@2.10.4(@tiptap/pm@2.10.4))
-      '@tiptap/pm': 2.10.4
+      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
+      '@tiptap/extension-blockquote': 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))
+      '@tiptap/extension-bold': 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))
+      '@tiptap/extension-bullet-list': 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))
+      '@tiptap/extension-code': 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))
+      '@tiptap/extension-code-block': 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2)
+      '@tiptap/extension-document': 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))
+      '@tiptap/extension-dropcursor': 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2)
+      '@tiptap/extension-gapcursor': 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2)
+      '@tiptap/extension-hard-break': 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))
+      '@tiptap/extension-heading': 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))
+      '@tiptap/extension-history': 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2)
+      '@tiptap/extension-horizontal-rule': 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))(@tiptap/pm@2.27.2)
+      '@tiptap/extension-italic': 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))
+      '@tiptap/extension-list-item': 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))
+      '@tiptap/extension-ordered-list': 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))
+      '@tiptap/extension-paragraph': 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))
+      '@tiptap/extension-strike': 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))
+      '@tiptap/extension-text': 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))
+      '@tiptap/extension-text-style': 2.27.2(@tiptap/core@2.27.2(@tiptap/pm@2.27.2))
+      '@tiptap/pm': 2.27.2
 
-  '@trivago/prettier-plugin-sort-imports@5.2.2(@vue/compiler-sfc@3.5.25)(prettier@3.7.4)':
+  '@tmcp/adapter-valibot@0.1.5(tmcp@1.19.0(typescript@5.9.3))(valibot@1.2.0(typescript@5.9.3))':
     dependencies:
-      '@babel/generator': 7.28.5
-      '@babel/parser': 7.28.5
-      '@babel/traverse': 7.28.5
-      '@babel/types': 7.28.5
-      javascript-natural-sort: 0.7.1
-      lodash: 4.17.21
-      prettier: 3.7.4
-    optionalDependencies:
-      '@vue/compiler-sfc': 3.5.25
-    transitivePeerDependencies:
-      - supports-color
+      '@standard-schema/spec': 1.1.0
+      '@valibot/to-json-schema': 1.5.0(valibot@1.2.0(typescript@5.9.3))
+      tmcp: 1.19.0(typescript@5.9.3)
+      valibot: 1.2.0(typescript@5.9.3)
+
+  '@tmcp/session-manager@0.2.1(tmcp@1.19.0(typescript@5.9.3))':
+    dependencies:
+      tmcp: 1.19.0(typescript@5.9.3)
+
+  '@tmcp/transport-http@0.8.3(tmcp@1.19.0(typescript@5.9.3))':
+    dependencies:
+      '@tmcp/session-manager': 0.2.1(tmcp@1.19.0(typescript@5.9.3))
+      esm-env: 1.2.2
+      tmcp: 1.19.0(typescript@5.9.3)
 
   '@tweenjs/tween.js@23.1.3': {}
 
@@ -11317,7 +11782,11 @@ snapshots:
 
   '@types/deep-eql@4.0.2': {}
 
-  '@types/diff-match-patch@1.0.36': {}
+  '@types/esquery@1.5.4':
+    dependencies:
+      '@types/estree': 1.0.8
+
+  '@types/esrecurse@4.3.1': {}
 
   '@types/estree@1.0.8': {}
 
@@ -11414,8 +11883,6 @@ snapshots:
 
   '@types/unist@3.0.3': {}
 
-  '@types/web-bluetooth@0.0.20': {}
-
   '@types/web-bluetooth@0.0.21': {}
 
   '@types/webxr@0.5.20': {}
@@ -11433,7 +11900,7 @@ snapshots:
       eslint: 9.39.1(jiti@2.6.1)
       ignore: 7.0.5
       natural-compare: 1.4.0
-      ts-api-utils: 2.1.0(typescript@5.9.3)
+      ts-api-utils: 2.4.0(typescript@5.9.3)
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
@@ -11452,17 +11919,17 @@ snapshots:
 
   '@typescript-eslint/project-service@8.49.0(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/tsconfig-utils': 8.50.0(typescript@5.9.3)
-      '@typescript-eslint/types': 8.50.0
+      '@typescript-eslint/tsconfig-utils': 8.56.0(typescript@5.9.3)
+      '@typescript-eslint/types': 8.56.0
       debug: 4.4.3
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/project-service@8.50.0(typescript@5.9.3)':
+  '@typescript-eslint/project-service@8.56.0(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/tsconfig-utils': 8.50.0(typescript@5.9.3)
-      '@typescript-eslint/types': 8.50.0
+      '@typescript-eslint/tsconfig-utils': 8.56.0(typescript@5.9.3)
+      '@typescript-eslint/types': 8.56.0
       debug: 4.4.3
       typescript: 5.9.3
     transitivePeerDependencies:
@@ -11473,16 +11940,16 @@ snapshots:
       '@typescript-eslint/types': 8.49.0
       '@typescript-eslint/visitor-keys': 8.49.0
 
-  '@typescript-eslint/scope-manager@8.50.0':
+  '@typescript-eslint/scope-manager@8.56.0':
     dependencies:
-      '@typescript-eslint/types': 8.50.0
-      '@typescript-eslint/visitor-keys': 8.50.0
+      '@typescript-eslint/types': 8.56.0
+      '@typescript-eslint/visitor-keys': 8.56.0
 
   '@typescript-eslint/tsconfig-utils@8.49.0(typescript@5.9.3)':
     dependencies:
       typescript: 5.9.3
 
-  '@typescript-eslint/tsconfig-utils@8.50.0(typescript@5.9.3)':
+  '@typescript-eslint/tsconfig-utils@8.56.0(typescript@5.9.3)':
     dependencies:
       typescript: 5.9.3
 
@@ -11493,14 +11960,14 @@ snapshots:
       '@typescript-eslint/utils': 8.49.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
       debug: 4.4.3
       eslint: 9.39.1(jiti@2.6.1)
-      ts-api-utils: 2.1.0(typescript@5.9.3)
+      ts-api-utils: 2.4.0(typescript@5.9.3)
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
   '@typescript-eslint/types@8.49.0': {}
 
-  '@typescript-eslint/types@8.50.0': {}
+  '@typescript-eslint/types@8.56.0': {}
 
   '@typescript-eslint/typescript-estree@8.49.0(typescript@5.9.3)':
     dependencies:
@@ -11510,31 +11977,31 @@ snapshots:
       '@typescript-eslint/visitor-keys': 8.49.0
       debug: 4.4.3
       minimatch: 9.0.5
-      semver: 7.7.3
+      semver: 7.7.4
       tinyglobby: 0.2.15
-      ts-api-utils: 2.1.0(typescript@5.9.3)
+      ts-api-utils: 2.4.0(typescript@5.9.3)
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/typescript-estree@8.50.0(typescript@5.9.3)':
+  '@typescript-eslint/typescript-estree@8.56.0(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/project-service': 8.50.0(typescript@5.9.3)
-      '@typescript-eslint/tsconfig-utils': 8.50.0(typescript@5.9.3)
-      '@typescript-eslint/types': 8.50.0
-      '@typescript-eslint/visitor-keys': 8.50.0
+      '@typescript-eslint/project-service': 8.56.0(typescript@5.9.3)
+      '@typescript-eslint/tsconfig-utils': 8.56.0(typescript@5.9.3)
+      '@typescript-eslint/types': 8.56.0
+      '@typescript-eslint/visitor-keys': 8.56.0
       debug: 4.4.3
       minimatch: 9.0.5
-      semver: 7.7.3
+      semver: 7.7.4
       tinyglobby: 0.2.15
-      ts-api-utils: 2.1.0(typescript@5.9.3)
+      ts-api-utils: 2.4.0(typescript@5.9.3)
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
   '@typescript-eslint/utils@8.49.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.0(eslint@9.39.1(jiti@2.6.1))
+      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.1(jiti@2.6.1))
       '@typescript-eslint/scope-manager': 8.49.0
       '@typescript-eslint/types': 8.49.0
       '@typescript-eslint/typescript-estree': 8.49.0(typescript@5.9.3)
@@ -11543,12 +12010,12 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@8.50.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
+  '@typescript-eslint/utils@8.56.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.0(eslint@9.39.1(jiti@2.6.1))
-      '@typescript-eslint/scope-manager': 8.50.0
-      '@typescript-eslint/types': 8.50.0
-      '@typescript-eslint/typescript-estree': 8.50.0(typescript@5.9.3)
+      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.1(jiti@2.6.1))
+      '@typescript-eslint/scope-manager': 8.56.0
+      '@typescript-eslint/types': 8.56.0
+      '@typescript-eslint/typescript-estree': 8.56.0(typescript@5.9.3)
       eslint: 9.39.1(jiti@2.6.1)
       typescript: 5.9.3
     transitivePeerDependencies:
@@ -11559,10 +12026,10 @@ snapshots:
       '@typescript-eslint/types': 8.49.0
       eslint-visitor-keys: 4.2.1
 
-  '@typescript-eslint/visitor-keys@8.50.0':
+  '@typescript-eslint/visitor-keys@8.56.0':
     dependencies:
-      '@typescript-eslint/types': 8.50.0
-      eslint-visitor-keys: 4.2.1
+      '@typescript-eslint/types': 8.56.0
+      eslint-visitor-keys: 5.0.1
 
   '@unrs/resolver-binding-android-arm-eabi@1.11.1':
     optional: true
@@ -11623,16 +12090,20 @@ snapshots:
   '@unrs/resolver-binding-win32-x64-msvc@1.11.1':
     optional: true
 
-  '@vitejs/plugin-vue@6.0.3(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))(vue@3.5.13(typescript@5.9.3))':
+  '@valibot/to-json-schema@1.5.0(valibot@1.2.0(typescript@5.9.3))':
+    dependencies:
+      valibot: 1.2.0(typescript@5.9.3)
+
+  '@vitejs/plugin-vue@6.0.3(vite@8.0.0-beta.13(@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))':
     dependencies:
       '@rolldown/pluginutils': 1.0.0-beta.53
-      vite: 7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+      vite: 8.0.0-beta.13(@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)
 
-  '@vitejs/plugin-vue@6.0.3(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))(vue@3.5.13(typescript@5.9.3))':
+  '@vitejs/plugin-vue@6.0.3(vite@8.0.0-beta.13(@types/node@25.0.3)(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))':
     dependencies:
       '@rolldown/pluginutils': 1.0.0-beta.53
-      vite: 7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+      vite: 8.0.0-beta.13(@types/node@25.0.3)(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)
 
   '@vitest/coverage-v8@4.0.16(vitest@4.0.16)':
@@ -11648,7 +12119,7 @@ snapshots:
       obug: 2.1.1
       std-env: 3.10.0
       tinyrainbow: 3.0.3
-      vitest: 4.0.16(@types/node@24.10.4)(@vitest/ui@4.0.16)(happy-dom@20.0.11)(jiti@2.6.1)(jsdom@27.4.0)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+      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)
     transitivePeerDependencies:
       - supports-color
 
@@ -11669,21 +12140,13 @@ snapshots:
       chai: 6.2.2
       tinyrainbow: 3.0.3
 
-  '@vitest/mocker@3.2.4(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))':
-    dependencies:
-      '@vitest/spy': 3.2.4
-      estree-walker: 3.0.3
-      magic-string: 0.30.21
-    optionalDependencies:
-      vite: 7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
-
-  '@vitest/mocker@4.0.16(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))':
+  '@vitest/mocker@4.0.16(vite@8.0.0-beta.13(@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))':
     dependencies:
       '@vitest/spy': 4.0.16
       estree-walker: 3.0.3
       magic-string: 0.30.21
     optionalDependencies:
-      vite: 7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+      vite: 8.0.0-beta.13(@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)
 
   '@vitest/pretty-format@3.2.4':
     dependencies:
@@ -11719,7 +12182,7 @@ snapshots:
       sirv: 3.0.2
       tinyglobby: 0.2.15
       tinyrainbow: 3.0.3
-      vitest: 4.0.16(@types/node@24.10.4)(@vitest/ui@4.0.16)(happy-dom@20.0.11)(jiti@2.6.1)(jsdom@27.4.0)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+      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/utils@3.2.4':
     dependencies:
@@ -11736,13 +12199,13 @@ snapshots:
     dependencies:
       '@volar/source-map': 2.4.15
 
-  '@volar/language-core@2.4.27':
+  '@volar/language-core@2.4.28':
     dependencies:
-      '@volar/source-map': 2.4.27
+      '@volar/source-map': 2.4.28
 
   '@volar/source-map@2.4.15': {}
 
-  '@volar/source-map@2.4.27': {}
+  '@volar/source-map@2.4.28': {}
 
   '@volar/typescript@2.4.15':
     dependencies:
@@ -11750,62 +12213,54 @@ snapshots:
       path-browserify: 1.0.1
       vscode-uri: 3.1.0
 
-  '@volar/typescript@2.4.27':
+  '@volar/typescript@2.4.28':
     dependencies:
-      '@volar/language-core': 2.4.27
+      '@volar/language-core': 2.4.28
       path-browserify: 1.0.1
       vscode-uri: 3.1.0
 
   '@vue/babel-helper-vue-transform-on@1.4.0': {}
 
-  '@vue/babel-plugin-jsx@1.4.0(@babel/core@7.28.5)':
+  '@vue/babel-plugin-jsx@1.4.0(@babel/core@7.29.0)':
     dependencies:
-      '@babel/helper-module-imports': 7.27.1
-      '@babel/helper-plugin-utils': 7.27.1
-      '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.28.5)
-      '@babel/template': 7.27.2
-      '@babel/traverse': 7.28.5
-      '@babel/types': 7.28.5
+      '@babel/helper-module-imports': 7.28.6
+      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/plugin-syntax-jsx': 7.28.6(@babel/core@7.29.0)
+      '@babel/template': 7.28.6
+      '@babel/traverse': 7.29.0
+      '@babel/types': 7.29.0
       '@vue/babel-helper-vue-transform-on': 1.4.0
-      '@vue/babel-plugin-resolve-type': 1.4.0(@babel/core@7.28.5)
-      '@vue/shared': 3.5.26
+      '@vue/babel-plugin-resolve-type': 1.4.0(@babel/core@7.29.0)
+      '@vue/shared': 3.5.28
     optionalDependencies:
-      '@babel/core': 7.28.5
+      '@babel/core': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
-  '@vue/babel-plugin-resolve-type@1.4.0(@babel/core@7.28.5)':
+  '@vue/babel-plugin-resolve-type@1.4.0(@babel/core@7.29.0)':
     dependencies:
-      '@babel/code-frame': 7.27.1
-      '@babel/core': 7.28.5
-      '@babel/helper-module-imports': 7.27.1
-      '@babel/helper-plugin-utils': 7.27.1
-      '@babel/parser': 7.28.5
-      '@vue/compiler-sfc': 3.5.25
+      '@babel/code-frame': 7.29.0
+      '@babel/core': 7.29.0
+      '@babel/helper-module-imports': 7.28.6
+      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/parser': 7.29.0
+      '@vue/compiler-sfc': 3.5.28
     transitivePeerDependencies:
       - supports-color
 
   '@vue/compiler-core@3.5.13':
     dependencies:
-      '@babel/parser': 7.28.5
+      '@babel/parser': 7.29.0
       '@vue/shared': 3.5.13
       entities: 4.5.0
       estree-walker: 2.0.2
       source-map-js: 1.2.1
 
-  '@vue/compiler-core@3.5.25':
+  '@vue/compiler-core@3.5.28':
     dependencies:
-      '@babel/parser': 7.28.5
-      '@vue/shared': 3.5.25
-      entities: 4.5.0
-      estree-walker: 2.0.2
-      source-map-js: 1.2.1
-
-  '@vue/compiler-core@3.5.26':
-    dependencies:
-      '@babel/parser': 7.28.5
-      '@vue/shared': 3.5.26
-      entities: 7.0.0
+      '@babel/parser': 7.29.0
+      '@vue/shared': 3.5.28
+      entities: 7.0.1
       estree-walker: 2.0.2
       source-map-js: 1.2.1
 
@@ -11814,19 +12269,14 @@ snapshots:
       '@vue/compiler-core': 3.5.13
       '@vue/shared': 3.5.13
 
-  '@vue/compiler-dom@3.5.25':
+  '@vue/compiler-dom@3.5.28':
     dependencies:
-      '@vue/compiler-core': 3.5.25
-      '@vue/shared': 3.5.25
-
-  '@vue/compiler-dom@3.5.26':
-    dependencies:
-      '@vue/compiler-core': 3.5.26
-      '@vue/shared': 3.5.26
+      '@vue/compiler-core': 3.5.28
+      '@vue/shared': 3.5.28
 
   '@vue/compiler-sfc@3.5.13':
     dependencies:
-      '@babel/parser': 7.28.5
+      '@babel/parser': 7.29.0
       '@vue/compiler-core': 3.5.13
       '@vue/compiler-dom': 3.5.13
       '@vue/compiler-ssr': 3.5.13
@@ -11836,13 +12286,13 @@ snapshots:
       postcss: 8.5.6
       source-map-js: 1.2.1
 
-  '@vue/compiler-sfc@3.5.25':
+  '@vue/compiler-sfc@3.5.28':
     dependencies:
-      '@babel/parser': 7.28.5
-      '@vue/compiler-core': 3.5.25
-      '@vue/compiler-dom': 3.5.25
-      '@vue/compiler-ssr': 3.5.25
-      '@vue/shared': 3.5.25
+      '@babel/parser': 7.29.0
+      '@vue/compiler-core': 3.5.28
+      '@vue/compiler-dom': 3.5.28
+      '@vue/compiler-ssr': 3.5.28
+      '@vue/shared': 3.5.28
       estree-walker: 2.0.2
       magic-string: 0.30.21
       postcss: 8.5.6
@@ -11853,44 +12303,56 @@ snapshots:
       '@vue/compiler-dom': 3.5.13
       '@vue/shared': 3.5.13
 
-  '@vue/compiler-ssr@3.5.25':
+  '@vue/compiler-ssr@3.5.28':
     dependencies:
-      '@vue/compiler-dom': 3.5.25
-      '@vue/shared': 3.5.25
+      '@vue/compiler-dom': 3.5.28
+      '@vue/shared': 3.5.28
 
   '@vue/compiler-vue2@2.7.16':
     dependencies:
       de-indent: 1.0.2
       he: 1.2.0
 
-  '@vue/devtools-api@6.6.3': {}
-
   '@vue/devtools-api@6.6.4': {}
 
-  '@vue/devtools-core@8.0.5(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))(vue@3.5.13(typescript@5.9.3))':
+  '@vue/devtools-api@7.7.9':
+    dependencies:
+      '@vue/devtools-kit': 7.7.9
+
+  '@vue/devtools-core@8.0.5(vite@8.0.0-beta.13(@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))':
     dependencies:
       '@vue/devtools-kit': 8.0.5
       '@vue/devtools-shared': 8.0.5
       mitt: 3.0.1
       nanoid: 5.1.5
       pathe: 2.0.3
-      vite-hot-client: 2.1.0(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
+      vite-hot-client: 2.1.0(vite@8.0.0-beta.13(@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)
     transitivePeerDependencies:
       - vite
 
-  '@vue/devtools-core@8.0.5(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))(vue@3.5.13(typescript@5.9.3))':
+  '@vue/devtools-core@8.0.5(vite@8.0.0-beta.13(@types/node@25.0.3)(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))':
     dependencies:
       '@vue/devtools-kit': 8.0.5
       '@vue/devtools-shared': 8.0.5
       mitt: 3.0.1
       nanoid: 5.1.5
       pathe: 2.0.3
-      vite-hot-client: 2.1.0(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
+      vite-hot-client: 2.1.0(vite@8.0.0-beta.13(@types/node@25.0.3)(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)
     transitivePeerDependencies:
       - vite
 
+  '@vue/devtools-kit@7.7.9':
+    dependencies:
+      '@vue/devtools-shared': 7.7.9
+      birpc: 2.9.0
+      hookable: 5.5.3
+      mitt: 3.0.1
+      perfect-debounce: 1.0.0
+      speakingurl: 14.0.1
+      superjson: 2.2.2
+
   '@vue/devtools-kit@8.0.5':
     dependencies:
       '@vue/devtools-shared': 8.0.5
@@ -11901,16 +12363,20 @@ snapshots:
       speakingurl: 14.0.1
       superjson: 2.2.2
 
+  '@vue/devtools-shared@7.7.9':
+    dependencies:
+      rfdc: 1.4.1
+
   '@vue/devtools-shared@8.0.5':
     dependencies:
       rfdc: 1.4.1
 
   '@vue/language-core@2.2.0(typescript@5.9.3)':
     dependencies:
-      '@volar/language-core': 2.4.27
-      '@vue/compiler-dom': 3.5.26
+      '@volar/language-core': 2.4.28
+      '@vue/compiler-dom': 3.5.28
       '@vue/compiler-vue2': 2.7.16
-      '@vue/shared': 3.5.26
+      '@vue/shared': 3.5.28
       alien-signals: 0.4.14
       minimatch: 9.0.5
       muggle-string: 0.4.1
@@ -11921,9 +12387,9 @@ snapshots:
   '@vue/language-core@2.2.12(typescript@5.9.3)':
     dependencies:
       '@volar/language-core': 2.4.15
-      '@vue/compiler-dom': 3.5.26
+      '@vue/compiler-dom': 3.5.28
       '@vue/compiler-vue2': 2.7.16
-      '@vue/shared': 3.5.26
+      '@vue/shared': 3.5.28
       alien-signals: 1.0.13
       minimatch: 9.0.5
       muggle-string: 0.4.1
@@ -11931,11 +12397,11 @@ snapshots:
     optionalDependencies:
       typescript: 5.9.3
 
-  '@vue/language-core@3.2.1':
+  '@vue/language-core@3.2.5':
     dependencies:
-      '@volar/language-core': 2.4.27
-      '@vue/compiler-dom': 3.5.26
-      '@vue/shared': 3.5.26
+      '@volar/language-core': 2.4.28
+      '@vue/compiler-dom': 3.5.28
+      '@vue/shared': 3.5.28
       alien-signals: 3.1.2
       muggle-string: 0.4.1
       path-browserify: 1.0.1
@@ -11965,25 +12431,13 @@ snapshots:
 
   '@vue/shared@3.5.13': {}
 
-  '@vue/shared@3.5.25': {}
-
-  '@vue/shared@3.5.26': {}
+  '@vue/shared@3.5.28': {}
 
   '@vue/test-utils@2.4.6':
     dependencies:
       js-beautify: 1.15.1
       vue-component-type-helpers: 2.2.12
 
-  '@vueuse/core@11.0.0(vue@3.5.13(typescript@5.9.3))':
-    dependencies:
-      '@types/web-bluetooth': 0.0.20
-      '@vueuse/metadata': 11.0.0
-      '@vueuse/shared': 11.0.0(vue@3.5.13(typescript@5.9.3))
-      vue-demi: 0.14.10(vue@3.5.13(typescript@5.9.3))
-    transitivePeerDependencies:
-      - '@vue/composition-api'
-      - vue
-
   '@vueuse/core@12.8.2(typescript@5.9.3)':
     dependencies:
       '@types/web-bluetooth': 0.0.21
@@ -11993,34 +12447,25 @@ snapshots:
     transitivePeerDependencies:
       - typescript
 
-  '@vueuse/core@13.9.0(vue@3.5.13(typescript@5.9.3))':
+  '@vueuse/core@14.2.0(vue@3.5.13(typescript@5.9.3))':
     dependencies:
       '@types/web-bluetooth': 0.0.21
-      '@vueuse/metadata': 13.9.0
-      '@vueuse/shared': 13.9.0(vue@3.5.13(typescript@5.9.3))
+      '@vueuse/metadata': 14.2.0
+      '@vueuse/shared': 14.2.0(vue@3.5.13(typescript@5.9.3))
       vue: 3.5.13(typescript@5.9.3)
 
-  '@vueuse/integrations@13.9.0(axios@1.13.2)(fuse.js@7.0.0)(vue@3.5.13(typescript@5.9.3))':
+  '@vueuse/integrations@14.2.0(axios@1.13.5)(fuse.js@7.0.0)(vue@3.5.13(typescript@5.9.3))':
     dependencies:
-      '@vueuse/core': 13.9.0(vue@3.5.13(typescript@5.9.3))
-      '@vueuse/shared': 13.9.0(vue@3.5.13(typescript@5.9.3))
+      '@vueuse/core': 14.2.0(vue@3.5.13(typescript@5.9.3))
+      '@vueuse/shared': 14.2.0(vue@3.5.13(typescript@5.9.3))
       vue: 3.5.13(typescript@5.9.3)
     optionalDependencies:
-      axios: 1.13.2
+      axios: 1.13.5
       fuse.js: 7.0.0
 
-  '@vueuse/metadata@11.0.0': {}
-
   '@vueuse/metadata@12.8.2': {}
 
-  '@vueuse/metadata@13.9.0': {}
-
-  '@vueuse/shared@11.0.0(vue@3.5.13(typescript@5.9.3))':
-    dependencies:
-      vue-demi: 0.14.10(vue@3.5.13(typescript@5.9.3))
-    transitivePeerDependencies:
-      - '@vue/composition-api'
-      - vue
+  '@vueuse/metadata@14.2.0': {}
 
   '@vueuse/shared@12.8.2(typescript@5.9.3)':
     dependencies:
@@ -12028,7 +12473,7 @@ snapshots:
     transitivePeerDependencies:
       - typescript
 
-  '@vueuse/shared@13.9.0(vue@3.5.13(typescript@5.9.3))':
+  '@vueuse/shared@14.2.0(vue@3.5.13(typescript@5.9.3))':
     dependencies:
       vue: 3.5.13(typescript@5.9.3)
 
@@ -12050,7 +12495,7 @@ snapshots:
 
   '@yarnpkg/parsers@3.0.2':
     dependencies:
-      js-yaml: 3.14.1
+      js-yaml: 3.14.2
       tslib: 2.8.1
 
   '@yutengjing/eld@0.0.2': {}
@@ -12065,13 +12510,13 @@ snapshots:
     dependencies:
       event-target-shim: 5.0.1
 
-  acorn-jsx@5.3.2(acorn@8.15.0):
+  acorn-jsx@5.3.2(acorn@8.16.0):
     dependencies:
-      acorn: 8.15.0
+      acorn: 8.16.0
 
   acorn@7.4.1: {}
 
-  acorn@8.15.0: {}
+  acorn@8.16.0: {}
 
   address@1.2.2: {}
 
@@ -12095,11 +12540,11 @@ snapshots:
     optionalDependencies:
       ajv: 8.13.0
 
-  ajv-formats@3.0.1(ajv@8.17.1):
+  ajv-formats@3.0.1(ajv@8.18.0):
     optionalDependencies:
-      ajv: 8.17.1
+      ajv: 8.18.0
 
-  ajv@6.12.6:
+  ajv@6.14.0:
     dependencies:
       fast-deep-equal: 3.1.3
       fast-json-stable-stringify: 2.1.0
@@ -12120,10 +12565,10 @@ snapshots:
       require-from-string: 2.0.2
       uri-js: 4.4.1
 
-  ajv@8.17.1:
+  ajv@8.18.0:
     dependencies:
       fast-deep-equal: 3.1.3
-      fast-uri: 3.0.3
+      fast-uri: 3.1.0
       json-schema-traverse: 1.0.0
       require-from-string: 2.0.2
 
@@ -12155,7 +12600,7 @@ snapshots:
 
   ansi-colors@4.1.3: {}
 
-  ansi-escapes@7.2.0:
+  ansi-escapes@7.3.0:
     dependencies:
       environment: 1.1.0
 
@@ -12279,16 +12724,16 @@ snapshots:
 
   asynckit@0.4.0: {}
 
-  atomically@2.0.3:
+  atomically@2.1.1:
     dependencies:
-      stubborn-fs: 1.2.5
-      when-exit: 2.1.4
+      stubborn-fs: 2.0.0
+      when-exit: 2.1.5
 
   auto-bind@5.0.1: {}
 
   automation-events@7.1.11:
     dependencies:
-      '@babel/runtime': 7.28.4
+      '@babel/runtime': 7.28.6
       tslib: 2.8.1
 
   available-typed-arrays@1.0.7:
@@ -12296,7 +12741,7 @@ snapshots:
       possible-typed-array-names: 1.1.0
     optional: true
 
-  axios@1.13.2:
+  axios@1.13.5:
     dependencies:
       follow-redirects: 1.15.11
       form-data: 4.0.5
@@ -12304,55 +12749,63 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
-  babel-plugin-const-enum@1.2.0(@babel/core@7.28.5):
+  babel-plugin-const-enum@1.2.0(@babel/core@7.29.0):
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
-      '@babel/plugin-syntax-typescript': 7.27.1(@babel/core@7.28.5)
-      '@babel/traverse': 7.28.5
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
+      '@babel/plugin-syntax-typescript': 7.28.6(@babel/core@7.29.0)
+      '@babel/traverse': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
   babel-plugin-macros@3.1.0:
     dependencies:
-      '@babel/runtime': 7.28.4
+      '@babel/runtime': 7.28.6
       cosmiconfig: 7.1.0
       resolve: 1.22.11
 
-  babel-plugin-polyfill-corejs2@0.4.14(@babel/core@7.28.5):
+  babel-plugin-polyfill-corejs2@0.4.15(@babel/core@7.29.0):
     dependencies:
-      '@babel/compat-data': 7.28.5
-      '@babel/core': 7.28.5
-      '@babel/helper-define-polyfill-provider': 0.6.5(@babel/core@7.28.5)
+      '@babel/compat-data': 7.29.0
+      '@babel/core': 7.29.0
+      '@babel/helper-define-polyfill-provider': 0.6.6(@babel/core@7.29.0)
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
 
-  babel-plugin-polyfill-corejs3@0.13.0(@babel/core@7.28.5):
+  babel-plugin-polyfill-corejs3@0.13.0(@babel/core@7.29.0):
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-define-polyfill-provider': 0.6.5(@babel/core@7.28.5)
-      core-js-compat: 3.47.0
+      '@babel/core': 7.29.0
+      '@babel/helper-define-polyfill-provider': 0.6.6(@babel/core@7.29.0)
+      core-js-compat: 3.48.0
     transitivePeerDependencies:
       - supports-color
 
-  babel-plugin-polyfill-regenerator@0.6.5(@babel/core@7.28.5):
+  babel-plugin-polyfill-corejs3@0.14.0(@babel/core@7.29.0):
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-define-polyfill-provider': 0.6.5(@babel/core@7.28.5)
+      '@babel/core': 7.29.0
+      '@babel/helper-define-polyfill-provider': 0.6.6(@babel/core@7.29.0)
+      core-js-compat: 3.48.0
     transitivePeerDependencies:
       - supports-color
 
-  babel-plugin-transform-typescript-metadata@0.3.2(@babel/core@7.28.5)(@babel/traverse@7.28.5):
+  babel-plugin-polyfill-regenerator@0.6.6(@babel/core@7.29.0):
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/helper-plugin-utils': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/helper-define-polyfill-provider': 0.6.6(@babel/core@7.29.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  babel-plugin-transform-typescript-metadata@0.3.2(@babel/core@7.29.0)(@babel/traverse@7.29.0):
+    dependencies:
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.28.6
     optionalDependencies:
-      '@babel/traverse': 7.28.5
+      '@babel/traverse': 7.29.0
 
   babel-walk@3.0.0-canary-5:
     dependencies:
-      '@babel/types': 7.28.5
+      '@babel/types': 7.29.0
 
   bail@2.0.2: {}
 
@@ -12360,6 +12813,8 @@ snapshots:
 
   balanced-match@2.0.0: {}
 
+  balanced-match@4.0.3: {}
+
   base64-arraybuffer@1.0.2: {}
 
   base64-js@1.5.1: {}
@@ -12404,13 +12859,17 @@ snapshots:
     dependencies:
       balanced-match: 1.0.2
 
+  brace-expansion@5.0.2:
+    dependencies:
+      balanced-match: 4.0.3
+
   braces@3.0.3:
     dependencies:
       fill-range: 7.1.1
 
   broker-factory@3.1.7:
     dependencies:
-      '@babel/runtime': 7.28.4
+      '@babel/runtime': 7.28.6
       fast-unique-numbers: 9.0.22
       tslib: 2.8.1
       worker-factory: 7.0.43
@@ -12475,7 +12934,7 @@ snapshots:
   chai@5.3.3:
     dependencies:
       assertion-error: 2.0.1
-      check-error: 2.1.1
+      check-error: 2.1.3
       deep-eql: 5.0.2
       loupe: 3.2.1
       pathval: 2.0.1
@@ -12499,7 +12958,7 @@ snapshots:
     dependencies:
       '@kurkle/color': 0.3.4
 
-  check-error@2.1.1: {}
+  check-error@2.1.3: {}
 
   chokidar@3.6.0:
     dependencies:
@@ -12517,8 +12976,6 @@ snapshots:
     dependencies:
       readdirp: 4.1.2
 
-  chownr@3.0.0: {}
-
   clean-css@5.3.3:
     dependencies:
       source-map: 0.6.1
@@ -12539,19 +12996,12 @@ snapshots:
 
   cli-spinners@2.6.1: {}
 
-  cli-spinners@2.9.2: {}
-
-  cli-spinners@3.2.0: {}
-
-  cli-truncate@4.0.0:
-    dependencies:
-      slice-ansi: 5.0.0
-      string-width: 7.2.0
+  cli-spinners@3.4.0: {}
 
   cli-truncate@5.1.1:
     dependencies:
       slice-ansi: 7.1.2
-      string-width: 8.1.0
+      string-width: 8.2.0
 
   cliui@8.0.1:
     dependencies:
@@ -12588,6 +13038,8 @@ snapshots:
 
   commander@10.0.1: {}
 
+  commander@11.1.0: {}
+
   commander@13.1.0: {}
 
   commander@14.0.2: {}
@@ -12604,14 +13056,14 @@ snapshots:
 
   conf@13.1.0:
     dependencies:
-      ajv: 8.17.1
-      ajv-formats: 3.0.1(ajv@8.17.1)
-      atomically: 2.0.3
+      ajv: 8.18.0
+      ajv-formats: 3.0.1(ajv@8.18.0)
+      atomically: 2.1.1
       debounce-fn: 6.0.0
       dot-prop: 9.0.0
       env-paths: 3.0.0
-      json-schema-typed: 8.0.1
-      semver: 7.7.3
+      json-schema-typed: 8.0.2
+      semver: 7.7.4
       uint8array-extras: 1.5.0
 
   confbox@0.1.8: {}
@@ -12623,9 +13075,9 @@ snapshots:
       ini: 1.3.8
       proto-list: 1.2.4
 
-  configstore@7.0.0:
+  configstore@7.1.0:
     dependencies:
-      atomically: 2.0.3
+      atomically: 2.1.1
       dot-prop: 9.0.0
       graceful-fs: 4.2.11
       xdg-basedir: 5.1.0
@@ -12638,8 +13090,8 @@ snapshots:
 
   constantinople@4.0.1:
     dependencies:
-      '@babel/parser': 7.28.5
-      '@babel/types': 7.28.5
+      '@babel/parser': 7.29.0
+      '@babel/types': 7.29.0
 
   convert-source-map@2.0.0: {}
 
@@ -12649,10 +13101,12 @@ snapshots:
     dependencies:
       is-what: 4.1.16
 
-  core-js-compat@3.47.0:
+  core-js-compat@3.48.0:
     dependencies:
       browserslist: 4.28.1
 
+  core-js@3.48.0: {}
+
   core-util-is@1.0.3: {}
 
   cosmiconfig@7.1.0:
@@ -12695,6 +13149,19 @@ snapshots:
       domutils: 2.8.0
       nth-check: 2.1.1
 
+  css-select@5.2.2:
+    dependencies:
+      boolbase: 1.0.0
+      css-what: 6.1.0
+      domhandler: 5.0.3
+      domutils: 3.2.2
+      nth-check: 2.1.1
+
+  css-tree@2.2.1:
+    dependencies:
+      mdn-data: 2.0.28
+      source-map-js: 1.2.1
+
   css-tree@3.1.0:
     dependencies:
       mdn-data: 2.12.2
@@ -12706,6 +13173,10 @@ snapshots:
 
   cssesc@3.0.0: {}
 
+  csso@5.0.5:
+    dependencies:
+      css-tree: 2.2.1
+
   cssstyle@5.3.5:
     dependencies:
       '@asamuzakjp/css-color': 4.1.1
@@ -12763,7 +13234,7 @@ snapshots:
 
   decimal.js@10.6.0: {}
 
-  decode-named-character-reference@1.2.0:
+  decode-named-character-reference@1.3.0:
     dependencies:
       character-entities: 2.0.2
 
@@ -12777,7 +13248,7 @@ snapshots:
 
   default-browser-id@5.0.1: {}
 
-  default-browser@5.4.0:
+  default-browser@5.5.0:
     dependencies:
       bundle-name: 4.1.0
       default-browser-id: 5.0.1
@@ -12809,7 +13280,7 @@ snapshots:
 
   dequal@2.0.3: {}
 
-  detect-libc@2.0.4: {}
+  detect-libc@2.1.2: {}
 
   detect-port@1.6.1:
     dependencies:
@@ -12822,7 +13293,7 @@ snapshots:
     dependencies:
       dequal: 2.0.3
 
-  diff-match-patch@1.0.5: {}
+  diff@8.0.3: {}
 
   dir-glob@3.0.1:
     dependencies:
@@ -12867,7 +13338,7 @@ snapshots:
     dependencies:
       domelementtype: 2.3.0
 
-  dompurify@3.2.5:
+  dompurify@3.3.1:
     optionalDependencies:
       '@types/trusted-types': 2.0.7
 
@@ -12915,7 +13386,7 @@ snapshots:
       '@one-ini/wasm': 0.1.1
       commander: 10.0.1
       minimatch: 9.0.1
-      semver: 7.7.3
+      semver: 7.7.4
 
   ejs@3.1.10:
     dependencies:
@@ -12933,10 +13404,10 @@ snapshots:
     dependencies:
       once: 1.4.0
 
-  enhanced-resolve@5.18.3:
+  enhanced-resolve@5.19.0:
     dependencies:
       graceful-fs: 4.2.11
-      tapable: 2.2.3
+      tapable: 2.3.0
 
   enquirer@2.3.6:
     dependencies:
@@ -12948,7 +13419,7 @@ snapshots:
 
   entities@6.0.1: {}
 
-  entities@7.0.0: {}
+  entities@7.0.1: {}
 
   env-paths@2.2.1: {}
 
@@ -13017,7 +13488,7 @@ snapshots:
       typed-array-byte-offset: 1.0.4
       typed-array-length: 1.0.7
       unbox-primitive: 1.1.0
-      which-typed-array: 1.1.19
+      which-typed-array: 1.1.20
     optional: true
 
   es-define-property@1.0.1: {}
@@ -13079,34 +13550,34 @@ snapshots:
       '@esbuild/win32-ia32': 0.25.5
       '@esbuild/win32-x64': 0.25.5
 
-  esbuild@0.27.1:
+  esbuild@0.27.3:
     optionalDependencies:
-      '@esbuild/aix-ppc64': 0.27.1
-      '@esbuild/android-arm': 0.27.1
-      '@esbuild/android-arm64': 0.27.1
-      '@esbuild/android-x64': 0.27.1
-      '@esbuild/darwin-arm64': 0.27.1
-      '@esbuild/darwin-x64': 0.27.1
-      '@esbuild/freebsd-arm64': 0.27.1
-      '@esbuild/freebsd-x64': 0.27.1
-      '@esbuild/linux-arm': 0.27.1
-      '@esbuild/linux-arm64': 0.27.1
-      '@esbuild/linux-ia32': 0.27.1
-      '@esbuild/linux-loong64': 0.27.1
-      '@esbuild/linux-mips64el': 0.27.1
-      '@esbuild/linux-ppc64': 0.27.1
-      '@esbuild/linux-riscv64': 0.27.1
-      '@esbuild/linux-s390x': 0.27.1
-      '@esbuild/linux-x64': 0.27.1
-      '@esbuild/netbsd-arm64': 0.27.1
-      '@esbuild/netbsd-x64': 0.27.1
-      '@esbuild/openbsd-arm64': 0.27.1
-      '@esbuild/openbsd-x64': 0.27.1
-      '@esbuild/openharmony-arm64': 0.27.1
-      '@esbuild/sunos-x64': 0.27.1
-      '@esbuild/win32-arm64': 0.27.1
-      '@esbuild/win32-ia32': 0.27.1
-      '@esbuild/win32-x64': 0.27.1
+      '@esbuild/aix-ppc64': 0.27.3
+      '@esbuild/android-arm': 0.27.3
+      '@esbuild/android-arm64': 0.27.3
+      '@esbuild/android-x64': 0.27.3
+      '@esbuild/darwin-arm64': 0.27.3
+      '@esbuild/darwin-x64': 0.27.3
+      '@esbuild/freebsd-arm64': 0.27.3
+      '@esbuild/freebsd-x64': 0.27.3
+      '@esbuild/linux-arm': 0.27.3
+      '@esbuild/linux-arm64': 0.27.3
+      '@esbuild/linux-ia32': 0.27.3
+      '@esbuild/linux-loong64': 0.27.3
+      '@esbuild/linux-mips64el': 0.27.3
+      '@esbuild/linux-ppc64': 0.27.3
+      '@esbuild/linux-riscv64': 0.27.3
+      '@esbuild/linux-s390x': 0.27.3
+      '@esbuild/linux-x64': 0.27.3
+      '@esbuild/netbsd-arm64': 0.27.3
+      '@esbuild/netbsd-x64': 0.27.3
+      '@esbuild/openbsd-arm64': 0.27.3
+      '@esbuild/openbsd-x64': 0.27.3
+      '@esbuild/openharmony-arm64': 0.27.3
+      '@esbuild/sunos-x64': 0.27.3
+      '@esbuild/win32-arm64': 0.27.3
+      '@esbuild/win32-ia32': 0.27.3
+      '@esbuild/win32-x64': 0.27.3
 
   escalade@3.2.0: {}
 
@@ -13123,7 +13594,7 @@ snapshots:
   eslint-compat-utils@0.6.5(eslint@9.39.1(jiti@2.6.1)):
     dependencies:
       eslint: 9.39.1(jiti@2.6.1)
-      semver: 7.7.3
+      semver: 7.7.4
 
   eslint-config-prettier@10.1.8(eslint@9.39.1(jiti@2.6.1)):
     dependencies:
@@ -13145,7 +13616,7 @@ snapshots:
       - supports-color
     optional: true
 
-  eslint-import-resolver-typescript@4.4.4(eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.50.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.1(jiti@2.6.1)))(eslint-plugin-import@2.32.0)(eslint@9.39.1(jiti@2.6.1)):
+  eslint-import-resolver-typescript@4.4.4(eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.56.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.1(jiti@2.6.1)))(eslint-plugin-import@2.32.0)(eslint@9.39.1(jiti@2.6.1)):
     dependencies:
       debug: 4.4.3
       eslint: 9.39.1(jiti@2.6.1)
@@ -13157,7 +13628,7 @@ snapshots:
       unrs-resolver: 1.11.1
     optionalDependencies:
       eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.49.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint-import-resolver-typescript@4.4.4)(eslint@9.39.1(jiti@2.6.1))
-      eslint-plugin-import-x: 4.16.1(@typescript-eslint/utils@8.50.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.1(jiti@2.6.1))
+      eslint-plugin-import-x: 4.16.1(@typescript-eslint/utils@8.56.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.1(jiti@2.6.1))
     transitivePeerDependencies:
       - supports-color
 
@@ -13168,25 +13639,42 @@ snapshots:
       '@typescript-eslint/parser': 8.49.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
       eslint: 9.39.1(jiti@2.6.1)
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 4.4.4(eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.50.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.1(jiti@2.6.1)))(eslint-plugin-import@2.32.0)(eslint@9.39.1(jiti@2.6.1))
+      eslint-import-resolver-typescript: 4.4.4(eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.56.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.1(jiti@2.6.1)))(eslint-plugin-import@2.32.0)(eslint@9.39.1(jiti@2.6.1))
     transitivePeerDependencies:
       - supports-color
     optional: true
 
-  eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.50.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.1(jiti@2.6.1)):
+  eslint-plugin-better-tailwindcss@4.3.1(eslint@9.39.1(jiti@2.6.1))(oxlint@1.49.0(oxlint-tsgolint@0.14.2))(tailwindcss@4.2.0)(typescript@5.9.3):
     dependencies:
-      '@typescript-eslint/types': 8.50.0
+      '@eslint/css-tree': 3.6.9
+      '@valibot/to-json-schema': 1.5.0(valibot@1.2.0(typescript@5.9.3))
+      enhanced-resolve: 5.19.0
+      jiti: 2.6.1
+      synckit: 0.11.12
+      tailwind-csstree: 0.1.4
+      tailwindcss: 4.2.0
+      tsconfig-paths-webpack-plugin: 4.2.0
+      valibot: 1.2.0(typescript@5.9.3)
+    optionalDependencies:
+      eslint: 9.39.1(jiti@2.6.1)
+      oxlint: 1.49.0(oxlint-tsgolint@0.14.2)
+    transitivePeerDependencies:
+      - typescript
+
+  eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.56.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.39.1(jiti@2.6.1)):
+    dependencies:
+      '@typescript-eslint/types': 8.56.0
       comment-parser: 1.4.1
       debug: 4.4.3
       eslint: 9.39.1(jiti@2.6.1)
       eslint-import-context: 0.1.9(unrs-resolver@1.11.1)
       is-glob: 4.0.3
-      minimatch: 10.0.3
-      semver: 7.7.3
+      minimatch: 10.2.2
+      semver: 7.7.4
       stable-hash-x: 0.2.0
       unrs-resolver: 1.11.1
     optionalDependencies:
-      '@typescript-eslint/utils': 8.50.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.56.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
       eslint-import-resolver-node: 0.3.9
     transitivePeerDependencies:
       - supports-color
@@ -13225,11 +13713,11 @@ snapshots:
     dependencies:
       jsonc-parser: 3.3.1
 
-  eslint-plugin-storybook@10.1.9(eslint@9.39.1(jiti@2.6.1))(storybook@10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3))(typescript@5.9.3):
+  eslint-plugin-storybook@10.2.10(eslint@9.39.1(jiti@2.6.1))(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))(typescript@5.9.3):
     dependencies:
-      '@typescript-eslint/utils': 8.50.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.56.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
       eslint: 9.39.1(jiti@2.6.1)
-      storybook: 10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      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)
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -13240,15 +13728,15 @@ snapshots:
     optionalDependencies:
       '@typescript-eslint/eslint-plugin': 8.49.0(@typescript-eslint/parser@8.49.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
 
-  eslint-plugin-vue@10.6.2(@typescript-eslint/parser@8.49.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(vue-eslint-parser@10.2.0(eslint@9.39.1(jiti@2.6.1))):
+  eslint-plugin-vue@10.6.2(@typescript-eslint/parser@8.49.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.1(jiti@2.6.1))(vue-eslint-parser@10.4.0(eslint@9.39.1(jiti@2.6.1))):
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.0(eslint@9.39.1(jiti@2.6.1))
+      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.1(jiti@2.6.1))
       eslint: 9.39.1(jiti@2.6.1)
       natural-compare: 1.4.0
       nth-check: 2.1.1
       postcss-selector-parser: 7.1.1
-      semver: 7.7.3
-      vue-eslint-parser: 10.2.0(eslint@9.39.1(jiti@2.6.1))
+      semver: 7.7.4
+      vue-eslint-parser: 10.4.0(eslint@9.39.1(jiti@2.6.1))
       xml-name-validator: 4.0.0
     optionalDependencies:
       '@typescript-eslint/parser': 8.49.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3)
@@ -13258,25 +13746,34 @@ snapshots:
       esrecurse: 4.3.0
       estraverse: 5.3.0
 
+  eslint-scope@9.1.1:
+    dependencies:
+      '@types/esrecurse': 4.3.1
+      '@types/estree': 1.0.8
+      esrecurse: 4.3.0
+      estraverse: 5.3.0
+
   eslint-visitor-keys@3.4.3: {}
 
   eslint-visitor-keys@4.2.1: {}
 
+  eslint-visitor-keys@5.0.1: {}
+
   eslint@9.39.1(jiti@2.6.1):
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.0(eslint@9.39.1(jiti@2.6.1))
+      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.1(jiti@2.6.1))
       '@eslint-community/regexpp': 4.12.2
       '@eslint/config-array': 0.21.1
       '@eslint/config-helpers': 0.4.2
       '@eslint/core': 0.17.0
-      '@eslint/eslintrc': 3.3.1
+      '@eslint/eslintrc': 3.3.3
       '@eslint/js': 9.39.1
       '@eslint/plugin-kit': 0.4.1
       '@humanfs/node': 0.16.7
       '@humanwhocodes/module-importer': 1.0.1
       '@humanwhocodes/retry': 0.4.3
       '@types/estree': 1.0.8
-      ajv: 6.12.6
+      ajv: 6.14.0
       chalk: 4.1.2
       cross-spawn: 7.0.6
       debug: 4.4.3
@@ -13284,7 +13781,7 @@ snapshots:
       eslint-scope: 8.4.0
       eslint-visitor-keys: 4.2.1
       espree: 10.4.0
-      esquery: 1.6.0
+      esquery: 1.7.0
       esutils: 2.0.3
       fast-deep-equal: 3.1.3
       file-entry-cache: 8.0.0
@@ -13303,23 +13800,31 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  esm-env@1.2.2: {}
+
   esm-resolve@1.0.11: {}
 
   espree@10.4.0:
     dependencies:
-      acorn: 8.15.0
-      acorn-jsx: 5.3.2(acorn@8.15.0)
+      acorn: 8.16.0
+      acorn-jsx: 5.3.2(acorn@8.16.0)
       eslint-visitor-keys: 4.2.1
 
+  espree@11.1.1:
+    dependencies:
+      acorn: 8.16.0
+      acorn-jsx: 5.3.2(acorn@8.16.0)
+      eslint-visitor-keys: 5.0.1
+
   espree@9.6.1:
     dependencies:
-      acorn: 8.15.0
-      acorn-jsx: 5.3.2(acorn@8.15.0)
+      acorn: 8.16.0
+      acorn-jsx: 5.3.2(acorn@8.16.0)
       eslint-visitor-keys: 3.4.3
 
   esprima@4.0.1: {}
 
-  esquery@1.6.0:
+  esquery@1.7.0:
     dependencies:
       estraverse: 5.3.0
 
@@ -13353,27 +13858,27 @@ snapshots:
 
   extendable-media-recorder-wav-encoder-broker@7.0.119:
     dependencies:
-      '@babel/runtime': 7.28.4
+      '@babel/runtime': 7.28.6
       broker-factory: 3.1.7
       extendable-media-recorder-wav-encoder-worker: 8.0.116
       tslib: 2.8.1
 
   extendable-media-recorder-wav-encoder-worker@8.0.116:
     dependencies:
-      '@babel/runtime': 7.28.4
+      '@babel/runtime': 7.28.6
       tslib: 2.8.1
       worker-factory: 7.0.43
 
   extendable-media-recorder-wav-encoder@7.0.129:
     dependencies:
-      '@babel/runtime': 7.28.4
+      '@babel/runtime': 7.28.6
       extendable-media-recorder-wav-encoder-broker: 7.0.119
       extendable-media-recorder-wav-encoder-worker: 8.0.116
       tslib: 2.8.1
 
   extendable-media-recorder@9.2.27:
     dependencies:
-      '@babel/runtime': 7.28.4
+      '@babel/runtime': 7.28.6
       media-encoder-host: 9.0.20
       multi-buffer-data-view: 6.0.22
       recorder-audio-worklet: 6.0.48
@@ -13397,10 +13902,10 @@ snapshots:
 
   fast-unique-numbers@9.0.22:
     dependencies:
-      '@babel/runtime': 7.28.4
+      '@babel/runtime': 7.28.6
       tslib: 2.8.1
 
-  fast-uri@3.0.3: {}
+  fast-uri@3.1.0: {}
 
   fastest-levenshtein@1.0.16: {}
 
@@ -13424,6 +13929,8 @@ snapshots:
     optionalDependencies:
       picomatch: 4.0.3
 
+  fflate@0.4.8: {}
+
   fflate@0.8.2: {}
 
   figures@3.2.0:
@@ -13538,7 +14045,7 @@ snapshots:
 
   front-matter@4.0.2:
     dependencies:
-      js-yaml: 3.14.1
+      js-yaml: 3.14.2
 
   fs-constants@1.0.0: {}
 
@@ -13586,7 +14093,7 @@ snapshots:
 
   get-caller-file@2.0.5: {}
 
-  get-east-asian-width@1.4.0: {}
+  get-east-asian-width@1.5.0: {}
 
   get-intrinsic@1.3.0:
     dependencies:
@@ -13625,23 +14132,20 @@ snapshots:
     dependencies:
       is-glob: 4.0.3
 
-  glob@10.4.5:
+  glob@10.5.0:
     dependencies:
       foreground-child: 3.3.1
-      jackspeak: 3.4.0
+      jackspeak: 3.4.3
       minimatch: 9.0.5
-      minipass: 7.1.2
-      package-json-from-dist: 1.0.0
+      minipass: 7.1.3
+      package-json-from-dist: 1.0.1
       path-scurry: 1.11.1
 
-  glob@11.0.3:
+  glob@13.0.6:
     dependencies:
-      foreground-child: 3.3.1
-      jackspeak: 4.1.1
-      minimatch: 10.0.3
-      minipass: 7.1.2
-      package-json-from-dist: 1.0.0
-      path-scurry: 2.0.0
+      minimatch: 10.2.2
+      minipass: 7.1.3
+      path-scurry: 2.0.2
 
   glob@9.3.5:
     dependencies:
@@ -13695,7 +14199,7 @@ snapshots:
 
   gray-matter@4.0.3:
     dependencies:
-      js-yaml: 3.14.1
+      js-yaml: 3.14.2
       kind-of: 6.0.3
       section-matter: 1.0.0
       strip-bom-string: 1.0.0
@@ -13827,32 +14331,33 @@ snapshots:
 
   ini@4.1.1: {}
 
-  ink@6.2.2(@types/react@19.1.9)(react@19.2.3):
+  ink@6.8.0(@types/react@19.1.9)(react@19.2.4):
     dependencies:
-      '@alcalzone/ansi-tokenize': 0.2.0
-      ansi-escapes: 7.2.0
+      '@alcalzone/ansi-tokenize': 0.2.5
+      ansi-escapes: 7.3.0
       ansi-styles: 6.2.3
       auto-bind: 5.0.1
       chalk: 5.6.2
       cli-boxes: 3.0.0
       cli-cursor: 4.0.0
-      cli-truncate: 4.0.0
+      cli-truncate: 5.1.1
       code-excerpt: 4.0.0
       es-toolkit: 1.39.10
       indent-string: 5.0.0
       is-in-ci: 2.0.0
       patch-console: 2.0.0
-      react: 19.2.3
-      react-reconciler: 0.32.0(react@19.2.3)
-      scheduler: 0.26.0
+      react: 19.2.4
+      react-reconciler: 0.33.0(react@19.2.4)
+      scheduler: 0.27.0
       signal-exit: 3.0.7
-      slice-ansi: 7.1.2
+      slice-ansi: 8.0.0
       stack-utils: 2.0.6
-      string-width: 7.2.0
-      type-fest: 4.41.0
-      widest-line: 5.0.0
+      string-width: 8.2.0
+      terminal-size: 4.0.1
+      type-fest: 5.4.4
+      widest-line: 6.0.0
       wrap-ansi: 9.0.2
-      ws: 8.18.3
+      ws: 8.19.0
       yoga-layout: 3.2.1
     optionalDependencies:
       '@types/react': 19.1.9
@@ -13902,7 +14407,7 @@ snapshots:
 
   is-bun-module@2.0.0:
     dependencies:
-      semver: 7.7.3
+      semver: 7.7.4
 
   is-callable@1.2.7:
     optional: true
@@ -13944,11 +14449,9 @@ snapshots:
 
   is-fullwidth-code-point@3.0.0: {}
 
-  is-fullwidth-code-point@4.0.0: {}
-
   is-fullwidth-code-point@5.1.0:
     dependencies:
-      get-east-asian-width: 1.4.0
+      get-east-asian-width: 1.5.0
 
   is-generator-function@1.1.2:
     dependencies:
@@ -13980,7 +14483,7 @@ snapshots:
 
   is-language-code@3.1.0:
     dependencies:
-      '@babel/runtime': 7.28.4
+      '@babel/runtime': 7.28.6
 
   is-map@2.0.3:
     optional: true
@@ -13988,7 +14491,7 @@ snapshots:
   is-negative-zero@2.0.3:
     optional: true
 
-  is-npm@6.0.0: {}
+  is-npm@6.1.0: {}
 
   is-number-object@1.1.1:
     dependencies:
@@ -14038,7 +14541,7 @@ snapshots:
 
   is-typed-array@1.1.15:
     dependencies:
-      which-typed-array: 1.1.19
+      which-typed-array: 1.1.20
     optional: true
 
   is-unicode-supported@0.1.0: {}
@@ -14065,7 +14568,7 @@ snapshots:
     dependencies:
       is-docker: 2.2.1
 
-  is-wsl@3.1.0:
+  is-wsl@3.1.1:
     dependencies:
       is-inside-container: 1.0.0
 
@@ -14098,16 +14601,12 @@ snapshots:
       html-escaper: 2.0.2
       istanbul-lib-report: 3.0.1
 
-  jackspeak@3.4.0:
+  jackspeak@3.4.3:
     dependencies:
       '@isaacs/cliui': 8.0.2
     optionalDependencies:
       '@pkgjs/parseargs': 0.11.0
 
-  jackspeak@4.1.1:
-    dependencies:
-      '@isaacs/cliui': 8.0.2
-
   jake@10.9.2:
     dependencies:
       async: 3.2.5
@@ -14115,8 +14614,6 @@ snapshots:
       filelist: 1.0.4
       minimatch: 3.1.2
 
-  javascript-natural-sort@0.7.1: {}
-
   jest-diff@30.2.0:
     dependencies:
       '@jest/diff-sequences': 30.0.1
@@ -14132,7 +14629,7 @@ snapshots:
     dependencies:
       config-chain: 1.1.13
       editorconfig: 1.0.4
-      glob: 10.4.5
+      glob: 10.5.0
       js-cookie: 3.0.5
       nopt: 7.2.1
 
@@ -14144,7 +14641,7 @@ snapshots:
 
   js-tokens@9.0.1: {}
 
-  js-yaml@3.14.1:
+  js-yaml@3.14.2:
     dependencies:
       argparse: 1.0.10
       esprima: 4.0.1
@@ -14173,7 +14670,7 @@ snapshots:
       webidl-conversions: 8.0.0
       whatwg-mimetype: 4.0.0
       whatwg-url: 15.1.0
-      ws: 8.18.3
+      ws: 8.19.0
       xml-name-validator: 5.0.0
     transitivePeerDependencies:
       - '@exodus/crypto'
@@ -14181,19 +14678,19 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  jsesc@3.0.2: {}
-
   jsesc@3.1.0: {}
 
   json-buffer@3.0.1: {}
 
   json-parse-even-better-errors@2.3.1: {}
 
+  json-rpc-2.0@1.7.1: {}
+
   json-schema-traverse@0.4.1: {}
 
   json-schema-traverse@1.0.0: {}
 
-  json-schema-typed@8.0.1: {}
+  json-schema-typed@8.0.2: {}
 
   json-stable-stringify-without-jsonify@1.0.1: {}
 
@@ -14212,22 +14709,22 @@ snapshots:
 
   json5@2.2.3: {}
 
+  jsonata@2.1.0: {}
+
   jsonc-eslint-parser@2.4.0:
     dependencies:
-      acorn: 8.15.0
+      acorn: 8.16.0
       eslint-visitor-keys: 3.4.3
       espree: 9.6.1
-      semver: 7.7.3
+      semver: 7.7.4
 
   jsonc-parser@3.2.0: {}
 
   jsonc-parser@3.3.1: {}
 
-  jsondiffpatch@0.6.0:
+  jsondiffpatch@0.7.3:
     dependencies:
-      '@types/diff-match-patch': 1.0.36
-      chalk: 5.6.2
-      diff-match-patch: 1.0.5
+      '@dmsnell/diff-match-patch': 1.1.0
 
   jsonfile@6.2.0:
     dependencies:
@@ -14282,7 +14779,7 @@ snapshots:
 
   kolorist@1.8.0: {}
 
-  ky@1.9.0: {}
+  ky@1.14.3: {}
 
   latest-version@9.0.0:
     dependencies:
@@ -14303,50 +14800,54 @@ snapshots:
     dependencies:
       immediate: 3.0.6
 
-  lightningcss-darwin-arm64@1.30.1:
+  lightningcss-android-arm64@1.31.1:
     optional: true
 
-  lightningcss-darwin-x64@1.30.1:
+  lightningcss-darwin-arm64@1.31.1:
     optional: true
 
-  lightningcss-freebsd-x64@1.30.1:
+  lightningcss-darwin-x64@1.31.1:
     optional: true
 
-  lightningcss-linux-arm-gnueabihf@1.30.1:
+  lightningcss-freebsd-x64@1.31.1:
     optional: true
 
-  lightningcss-linux-arm64-gnu@1.30.1:
+  lightningcss-linux-arm-gnueabihf@1.31.1:
     optional: true
 
-  lightningcss-linux-arm64-musl@1.30.1:
+  lightningcss-linux-arm64-gnu@1.31.1:
     optional: true
 
-  lightningcss-linux-x64-gnu@1.30.1:
+  lightningcss-linux-arm64-musl@1.31.1:
     optional: true
 
-  lightningcss-linux-x64-musl@1.30.1:
+  lightningcss-linux-x64-gnu@1.31.1:
     optional: true
 
-  lightningcss-win32-arm64-msvc@1.30.1:
+  lightningcss-linux-x64-musl@1.31.1:
     optional: true
 
-  lightningcss-win32-x64-msvc@1.30.1:
+  lightningcss-win32-arm64-msvc@1.31.1:
     optional: true
 
-  lightningcss@1.30.1:
+  lightningcss-win32-x64-msvc@1.31.1:
+    optional: true
+
+  lightningcss@1.31.1:
     dependencies:
-      detect-libc: 2.0.4
+      detect-libc: 2.1.2
     optionalDependencies:
-      lightningcss-darwin-arm64: 1.30.1
-      lightningcss-darwin-x64: 1.30.1
-      lightningcss-freebsd-x64: 1.30.1
-      lightningcss-linux-arm-gnueabihf: 1.30.1
-      lightningcss-linux-arm64-gnu: 1.30.1
-      lightningcss-linux-arm64-musl: 1.30.1
-      lightningcss-linux-x64-gnu: 1.30.1
-      lightningcss-linux-x64-musl: 1.30.1
-      lightningcss-win32-arm64-msvc: 1.30.1
-      lightningcss-win32-x64-msvc: 1.30.1
+      lightningcss-android-arm64: 1.31.1
+      lightningcss-darwin-arm64: 1.31.1
+      lightningcss-darwin-x64: 1.31.1
+      lightningcss-freebsd-x64: 1.31.1
+      lightningcss-linux-arm-gnueabihf: 1.31.1
+      lightningcss-linux-arm64-gnu: 1.31.1
+      lightningcss-linux-arm64-musl: 1.31.1
+      lightningcss-linux-x64-gnu: 1.31.1
+      lightningcss-linux-x64-musl: 1.31.1
+      lightningcss-win32-arm64-msvc: 1.31.1
+      lightningcss-win32-x64-msvc: 1.31.1
 
   lines-and-columns@1.2.4: {}
 
@@ -14356,7 +14857,7 @@ snapshots:
     dependencies:
       uc.micro: 2.1.0
 
-  linkifyjs@4.2.0: {}
+  linkifyjs@4.3.2: {}
 
   lint-staged@16.2.7:
     dependencies:
@@ -14387,7 +14888,7 @@ snapshots:
     dependencies:
       p-locate: 5.0.0
 
-  lodash-es@4.17.21: {}
+  lodash-es@4.17.23: {}
 
   lodash.camelcase@4.3.0: {}
 
@@ -14397,7 +14898,7 @@ snapshots:
 
   lodash.truncate@4.4.2: {}
 
-  lodash@4.17.21: {}
+  lodash@4.17.23: {}
 
   log-symbols@4.1.0:
     dependencies:
@@ -14406,7 +14907,7 @@ snapshots:
 
   log-update@6.1.0:
     dependencies:
-      ansi-escapes: 7.2.0
+      ansi-escapes: 7.3.0
       cli-cursor: 5.0.0
       slice-ansi: 7.1.2
       strip-ansi: 7.1.2
@@ -14426,7 +14927,7 @@ snapshots:
 
   lru-cache@10.4.3: {}
 
-  lru-cache@11.2.4: {}
+  lru-cache@11.2.6: {}
 
   lru-cache@5.1.1:
     dependencies:
@@ -14454,17 +14955,17 @@ snapshots:
 
   magicast@0.5.1:
     dependencies:
-      '@babel/parser': 7.28.5
-      '@babel/types': 7.28.5
+      '@babel/parser': 7.29.0
+      '@babel/types': 7.29.0
       source-map-js: 1.2.1
 
   make-dir@4.0.0:
     dependencies:
-      semver: 7.7.3
+      semver: 7.7.4
 
   markdown-it-task-lists@2.1.1: {}
 
-  markdown-it@14.1.0:
+  markdown-it@14.1.1:
     dependencies:
       argparse: 2.0.1
       entities: 4.5.0
@@ -14485,14 +14986,14 @@ snapshots:
     dependencies:
       '@types/mdast': 4.0.4
       escape-string-regexp: 5.0.0
-      unist-util-is: 6.0.0
-      unist-util-visit-parents: 6.0.1
+      unist-util-is: 6.0.1
+      unist-util-visit-parents: 6.0.2
 
-  mdast-util-from-markdown@2.0.2:
+  mdast-util-from-markdown@2.0.3:
     dependencies:
       '@types/mdast': 4.0.4
       '@types/unist': 3.0.3
-      decode-named-character-reference: 1.2.0
+      decode-named-character-reference: 1.3.0
       devlop: 1.1.0
       mdast-util-to-string: 4.0.0
       micromark: 4.0.2
@@ -14510,7 +15011,7 @@ snapshots:
       '@types/mdast': 4.0.4
       devlop: 1.1.0
       escape-string-regexp: 5.0.0
-      mdast-util-from-markdown: 2.0.2
+      mdast-util-from-markdown: 2.0.3
       mdast-util-to-markdown: 2.1.2
       micromark-extension-frontmatter: 2.0.0
     transitivePeerDependencies:
@@ -14528,7 +15029,7 @@ snapshots:
     dependencies:
       '@types/mdast': 4.0.4
       devlop: 1.1.0
-      mdast-util-from-markdown: 2.0.2
+      mdast-util-from-markdown: 2.0.3
       mdast-util-to-markdown: 2.1.2
       micromark-util-normalize-identifier: 2.0.1
     transitivePeerDependencies:
@@ -14537,7 +15038,7 @@ snapshots:
   mdast-util-gfm-strikethrough@2.0.0:
     dependencies:
       '@types/mdast': 4.0.4
-      mdast-util-from-markdown: 2.0.2
+      mdast-util-from-markdown: 2.0.3
       mdast-util-to-markdown: 2.1.2
     transitivePeerDependencies:
       - supports-color
@@ -14547,7 +15048,7 @@ snapshots:
       '@types/mdast': 4.0.4
       devlop: 1.1.0
       markdown-table: 3.0.4
-      mdast-util-from-markdown: 2.0.2
+      mdast-util-from-markdown: 2.0.3
       mdast-util-to-markdown: 2.1.2
     transitivePeerDependencies:
       - supports-color
@@ -14556,14 +15057,14 @@ snapshots:
     dependencies:
       '@types/mdast': 4.0.4
       devlop: 1.1.0
-      mdast-util-from-markdown: 2.0.2
+      mdast-util-from-markdown: 2.0.3
       mdast-util-to-markdown: 2.1.2
     transitivePeerDependencies:
       - supports-color
 
   mdast-util-gfm@3.1.0:
     dependencies:
-      mdast-util-from-markdown: 2.0.2
+      mdast-util-from-markdown: 2.0.3
       mdast-util-gfm-autolink-literal: 2.0.1
       mdast-util-gfm-footnote: 2.1.0
       mdast-util-gfm-strikethrough: 2.0.0
@@ -14576,7 +15077,7 @@ snapshots:
   mdast-util-phrasing@4.1.0:
     dependencies:
       '@types/mdast': 4.0.4
-      unist-util-is: 6.0.0
+      unist-util-is: 6.0.1
 
   mdast-util-to-markdown@2.1.2:
     dependencies:
@@ -14587,20 +15088,24 @@ snapshots:
       mdast-util-to-string: 4.0.0
       micromark-util-classify-character: 2.0.1
       micromark-util-decode-string: 2.0.1
-      unist-util-visit: 5.0.0
+      unist-util-visit: 5.1.0
       zwitch: 2.0.4
 
   mdast-util-to-string@4.0.0:
     dependencies:
       '@types/mdast': 4.0.4
 
+  mdn-data@2.0.28: {}
+
   mdn-data@2.12.2: {}
 
+  mdn-data@2.23.0: {}
+
   mdurl@2.0.0: {}
 
   media-encoder-host-broker@8.0.19:
     dependencies:
-      '@babel/runtime': 7.28.4
+      '@babel/runtime': 7.28.6
       broker-factory: 3.1.7
       fast-unique-numbers: 9.0.22
       media-encoder-host-worker: 10.0.19
@@ -14608,14 +15113,14 @@ snapshots:
 
   media-encoder-host-worker@10.0.19:
     dependencies:
-      '@babel/runtime': 7.28.4
+      '@babel/runtime': 7.28.6
       extendable-media-recorder-wav-encoder-broker: 7.0.119
       tslib: 2.8.1
       worker-factory: 7.0.43
 
   media-encoder-host@9.0.20:
     dependencies:
-      '@babel/runtime': 7.28.4
+      '@babel/runtime': 7.28.6
       media-encoder-host-broker: 8.0.19
       media-encoder-host-worker: 10.0.19
       tslib: 2.8.1
@@ -14628,7 +15133,7 @@ snapshots:
 
   micromark-core-commonmark@2.0.3:
     dependencies:
-      decode-named-character-reference: 1.2.0
+      decode-named-character-reference: 1.3.0
       devlop: 1.1.0
       micromark-factory-destination: 2.0.1
       micromark-factory-label: 2.0.1
@@ -14768,7 +15273,7 @@ snapshots:
 
   micromark-util-decode-string@2.0.1:
     dependencies:
-      decode-named-character-reference: 1.2.0
+      decode-named-character-reference: 1.3.0
       micromark-util-character: 2.1.1
       micromark-util-decode-numeric-character-reference: 2.0.2
       micromark-util-symbol: 2.0.1
@@ -14806,7 +15311,7 @@ snapshots:
     dependencies:
       '@types/debug': 4.1.12
       debug: 4.4.3
-      decode-named-character-reference: 1.2.0
+      decode-named-character-reference: 1.3.0
       devlop: 1.1.0
       micromark-core-commonmark: 2.0.3
       micromark-factory-space: 2.0.1
@@ -14841,9 +15346,17 @@ snapshots:
 
   min-indent@1.0.1: {}
 
-  minimatch@10.0.3:
+  minimatch@10.1.1:
     dependencies:
-      '@isaacs/brace-expansion': 5.0.0
+      '@isaacs/brace-expansion': 5.0.1
+
+  minimatch@10.2.1:
+    dependencies:
+      brace-expansion: 5.0.2
+
+  minimatch@10.2.2:
+    dependencies:
+      brace-expansion: 5.0.2
 
   minimatch@3.1.2:
     dependencies:
@@ -14861,10 +15374,6 @@ snapshots:
     dependencies:
       brace-expansion: 2.0.2
 
-  minimatch@9.0.3:
-    dependencies:
-      brace-expansion: 2.0.2
-
   minimatch@9.0.5:
     dependencies:
       brace-expansion: 2.0.2
@@ -14873,11 +15382,7 @@ snapshots:
 
   minipass@4.2.8: {}
 
-  minipass@7.1.2: {}
-
-  minizlib@3.0.2:
-    dependencies:
-      minipass: 7.1.2
+  minipass@7.1.3: {}
 
   mitt@3.0.1: {}
 
@@ -14885,15 +15390,15 @@ snapshots:
     dependencies:
       '@mixpanel/rrweb': 2.0.0-alpha.18.2
 
-  mkdirp@3.0.1: {}
-
   mlly@1.8.0:
     dependencies:
-      acorn: 8.15.0
+      acorn: 8.16.0
       pathe: 2.0.3
       pkg-types: 1.3.1
       ufo: 1.6.1
 
+  modern-tar@0.7.3: {}
+
   mrmime@2.0.1: {}
 
   ms@2.1.3: {}
@@ -14902,7 +15407,7 @@ snapshots:
 
   multi-buffer-data-view@6.0.22:
     dependencies:
-      '@babel/runtime': 7.28.4
+      '@babel/runtime': 7.28.6
       tslib: 2.8.1
 
   nano-spawn@2.0.0: {}
@@ -14949,19 +15454,19 @@ snapshots:
     dependencies:
       boolbase: 1.0.0
 
-  nx@22.2.4:
+  nx@22.5.2:
     dependencies:
       '@napi-rs/wasm-runtime': 0.2.4
       '@yarnpkg/lockfile': 1.1.0
       '@yarnpkg/parsers': 3.0.2
       '@zkochan/js-yaml': 0.0.7
-      axios: 1.13.2
-      chalk: 4.1.2
+      axios: 1.13.5
       cli-cursor: 3.1.0
       cli-spinners: 2.6.1
       cliui: 8.0.1
       dotenv: 16.4.7
       dotenv-expand: 11.0.7
+      ejs: 3.1.10
       enquirer: 2.3.6
       figures: 3.2.0
       flat: 5.0.2
@@ -14970,13 +15475,14 @@ snapshots:
       jest-diff: 30.2.0
       jsonc-parser: 3.2.0
       lines-and-columns: 2.0.3
-      minimatch: 9.0.3
+      minimatch: 10.1.1
       node-machine-id: 1.1.12
       npm-run-path: 4.0.1
       open: 8.4.2
       ora: 5.3.0
+      picocolors: 1.1.1
       resolve.exports: 2.0.3
-      semver: 7.7.3
+      semver: 7.7.4
       string-width: 4.2.3
       tar-stream: 2.2.0
       tmp: 0.2.5
@@ -14987,67 +15493,16 @@ snapshots:
       yargs: 17.7.2
       yargs-parser: 21.1.1
     optionalDependencies:
-      '@nx/nx-darwin-arm64': 22.2.4
-      '@nx/nx-darwin-x64': 22.2.4
-      '@nx/nx-freebsd-x64': 22.2.4
-      '@nx/nx-linux-arm-gnueabihf': 22.2.4
-      '@nx/nx-linux-arm64-gnu': 22.2.4
-      '@nx/nx-linux-arm64-musl': 22.2.4
-      '@nx/nx-linux-x64-gnu': 22.2.4
-      '@nx/nx-linux-x64-musl': 22.2.4
-      '@nx/nx-win32-arm64-msvc': 22.2.4
-      '@nx/nx-win32-x64-msvc': 22.2.4
-    transitivePeerDependencies:
-      - debug
-
-  nx@22.2.6:
-    dependencies:
-      '@napi-rs/wasm-runtime': 0.2.4
-      '@yarnpkg/lockfile': 1.1.0
-      '@yarnpkg/parsers': 3.0.2
-      '@zkochan/js-yaml': 0.0.7
-      axios: 1.13.2
-      chalk: 4.1.2
-      cli-cursor: 3.1.0
-      cli-spinners: 2.6.1
-      cliui: 8.0.1
-      dotenv: 16.4.7
-      dotenv-expand: 11.0.7
-      enquirer: 2.3.6
-      figures: 3.2.0
-      flat: 5.0.2
-      front-matter: 4.0.2
-      ignore: 7.0.5
-      jest-diff: 30.2.0
-      jsonc-parser: 3.2.0
-      lines-and-columns: 2.0.3
-      minimatch: 9.0.3
-      node-machine-id: 1.1.12
-      npm-run-path: 4.0.1
-      open: 8.4.2
-      ora: 5.3.0
-      resolve.exports: 2.0.3
-      semver: 7.7.3
-      string-width: 4.2.3
-      tar-stream: 2.2.0
-      tmp: 0.2.5
-      tree-kill: 1.2.2
-      tsconfig-paths: 4.2.0
-      tslib: 2.8.1
-      yaml: 2.8.2
-      yargs: 17.7.2
-      yargs-parser: 21.1.1
-    optionalDependencies:
-      '@nx/nx-darwin-arm64': 22.2.6
-      '@nx/nx-darwin-x64': 22.2.6
-      '@nx/nx-freebsd-x64': 22.2.6
-      '@nx/nx-linux-arm-gnueabihf': 22.2.6
-      '@nx/nx-linux-arm64-gnu': 22.2.6
-      '@nx/nx-linux-arm64-musl': 22.2.6
-      '@nx/nx-linux-x64-gnu': 22.2.6
-      '@nx/nx-linux-x64-musl': 22.2.6
-      '@nx/nx-win32-arm64-msvc': 22.2.6
-      '@nx/nx-win32-x64-msvc': 22.2.6
+      '@nx/nx-darwin-arm64': 22.5.2
+      '@nx/nx-darwin-x64': 22.5.2
+      '@nx/nx-freebsd-x64': 22.5.2
+      '@nx/nx-linux-arm-gnueabihf': 22.5.2
+      '@nx/nx-linux-arm64-gnu': 22.5.2
+      '@nx/nx-linux-arm64-musl': 22.5.2
+      '@nx/nx-linux-x64-gnu': 22.5.2
+      '@nx/nx-linux-x64-musl': 22.5.2
+      '@nx/nx-win32-arm64-msvc': 22.5.2
+      '@nx/nx-win32-x64-msvc': 22.5.2
     transitivePeerDependencies:
       - debug
 
@@ -15109,7 +15564,7 @@ snapshots:
 
   open@10.2.0:
     dependencies:
-      default-browser: 5.4.0
+      default-browser: 5.5.0
       define-lazy-prop: 3.0.0
       is-inside-container: 1.0.0
       wsl-utils: 0.1.0
@@ -15120,7 +15575,7 @@ snapshots:
       is-docker: 2.2.1
       is-wsl: 2.2.0
 
-  openai@4.104.0(ws@8.18.3)(zod@3.24.1):
+  openai@4.104.0(ws@8.19.0)(zod@3.24.1):
     dependencies:
       '@types/node': 18.19.130
       '@types/node-fetch': 2.6.13
@@ -15130,7 +15585,7 @@ snapshots:
       formdata-node: 4.4.1
       node-fetch: 2.7.0
     optionalDependencies:
-      ws: 8.18.3
+      ws: 8.19.0
       zod: 3.24.1
     transitivePeerDependencies:
       - encoding
@@ -15149,7 +15604,7 @@ snapshots:
       bl: 4.1.0
       chalk: 4.1.2
       cli-cursor: 3.1.0
-      cli-spinners: 2.9.2
+      cli-spinners: 2.6.1
       is-interactive: 1.0.0
       log-symbols: 4.1.0
       strip-ansi: 6.0.1
@@ -15164,26 +15619,6 @@ snapshots:
       safe-push-apply: 1.0.0
     optional: true
 
-  oxc-parser@0.99.0:
-    dependencies:
-      '@oxc-project/types': 0.99.0
-    optionalDependencies:
-      '@oxc-parser/binding-android-arm64': 0.99.0
-      '@oxc-parser/binding-darwin-arm64': 0.99.0
-      '@oxc-parser/binding-darwin-x64': 0.99.0
-      '@oxc-parser/binding-freebsd-x64': 0.99.0
-      '@oxc-parser/binding-linux-arm-gnueabihf': 0.99.0
-      '@oxc-parser/binding-linux-arm-musleabihf': 0.99.0
-      '@oxc-parser/binding-linux-arm64-gnu': 0.99.0
-      '@oxc-parser/binding-linux-arm64-musl': 0.99.0
-      '@oxc-parser/binding-linux-riscv64-gnu': 0.99.0
-      '@oxc-parser/binding-linux-s390x-gnu': 0.99.0
-      '@oxc-parser/binding-linux-x64-gnu': 0.99.0
-      '@oxc-parser/binding-linux-x64-musl': 0.99.0
-      '@oxc-parser/binding-wasm32-wasi': 0.99.0
-      '@oxc-parser/binding-win32-arm64-msvc': 0.99.0
-      '@oxc-parser/binding-win32-x64-msvc': 0.99.0
-
   oxc-resolver@11.15.0:
     optionalDependencies:
       '@oxc-resolver/binding-android-arm-eabi': 11.15.0
@@ -15207,26 +15642,61 @@ snapshots:
       '@oxc-resolver/binding-win32-ia32-msvc': 11.15.0
       '@oxc-resolver/binding-win32-x64-msvc': 11.15.0
 
-  oxlint-tsgolint@0.9.1:
+  oxfmt@0.34.0:
+    dependencies:
+      tinypool: 2.1.0
     optionalDependencies:
-      '@oxlint-tsgolint/darwin-arm64': 0.9.1
-      '@oxlint-tsgolint/darwin-x64': 0.9.1
-      '@oxlint-tsgolint/linux-arm64': 0.9.1
-      '@oxlint-tsgolint/linux-x64': 0.9.1
-      '@oxlint-tsgolint/win32-arm64': 0.9.1
-      '@oxlint-tsgolint/win32-x64': 0.9.1
+      '@oxfmt/binding-android-arm-eabi': 0.34.0
+      '@oxfmt/binding-android-arm64': 0.34.0
+      '@oxfmt/binding-darwin-arm64': 0.34.0
+      '@oxfmt/binding-darwin-x64': 0.34.0
+      '@oxfmt/binding-freebsd-x64': 0.34.0
+      '@oxfmt/binding-linux-arm-gnueabihf': 0.34.0
+      '@oxfmt/binding-linux-arm-musleabihf': 0.34.0
+      '@oxfmt/binding-linux-arm64-gnu': 0.34.0
+      '@oxfmt/binding-linux-arm64-musl': 0.34.0
+      '@oxfmt/binding-linux-ppc64-gnu': 0.34.0
+      '@oxfmt/binding-linux-riscv64-gnu': 0.34.0
+      '@oxfmt/binding-linux-riscv64-musl': 0.34.0
+      '@oxfmt/binding-linux-s390x-gnu': 0.34.0
+      '@oxfmt/binding-linux-x64-gnu': 0.34.0
+      '@oxfmt/binding-linux-x64-musl': 0.34.0
+      '@oxfmt/binding-openharmony-arm64': 0.34.0
+      '@oxfmt/binding-win32-arm64-msvc': 0.34.0
+      '@oxfmt/binding-win32-ia32-msvc': 0.34.0
+      '@oxfmt/binding-win32-x64-msvc': 0.34.0
 
-  oxlint@1.33.0(oxlint-tsgolint@0.9.1):
+  oxlint-tsgolint@0.14.2:
     optionalDependencies:
-      '@oxlint/darwin-arm64': 1.33.0
-      '@oxlint/darwin-x64': 1.33.0
-      '@oxlint/linux-arm64-gnu': 1.33.0
-      '@oxlint/linux-arm64-musl': 1.33.0
-      '@oxlint/linux-x64-gnu': 1.33.0
-      '@oxlint/linux-x64-musl': 1.33.0
-      '@oxlint/win32-arm64': 1.33.0
-      '@oxlint/win32-x64': 1.33.0
-      oxlint-tsgolint: 0.9.1
+      '@oxlint-tsgolint/darwin-arm64': 0.14.2
+      '@oxlint-tsgolint/darwin-x64': 0.14.2
+      '@oxlint-tsgolint/linux-arm64': 0.14.2
+      '@oxlint-tsgolint/linux-x64': 0.14.2
+      '@oxlint-tsgolint/win32-arm64': 0.14.2
+      '@oxlint-tsgolint/win32-x64': 0.14.2
+
+  oxlint@1.49.0(oxlint-tsgolint@0.14.2):
+    optionalDependencies:
+      '@oxlint/binding-android-arm-eabi': 1.49.0
+      '@oxlint/binding-android-arm64': 1.49.0
+      '@oxlint/binding-darwin-arm64': 1.49.0
+      '@oxlint/binding-darwin-x64': 1.49.0
+      '@oxlint/binding-freebsd-x64': 1.49.0
+      '@oxlint/binding-linux-arm-gnueabihf': 1.49.0
+      '@oxlint/binding-linux-arm-musleabihf': 1.49.0
+      '@oxlint/binding-linux-arm64-gnu': 1.49.0
+      '@oxlint/binding-linux-arm64-musl': 1.49.0
+      '@oxlint/binding-linux-ppc64-gnu': 1.49.0
+      '@oxlint/binding-linux-riscv64-gnu': 1.49.0
+      '@oxlint/binding-linux-riscv64-musl': 1.49.0
+      '@oxlint/binding-linux-s390x-gnu': 1.49.0
+      '@oxlint/binding-linux-x64-gnu': 1.49.0
+      '@oxlint/binding-linux-x64-musl': 1.49.0
+      '@oxlint/binding-openharmony-arm64': 1.49.0
+      '@oxlint/binding-win32-arm64-msvc': 1.49.0
+      '@oxlint/binding-win32-ia32-msvc': 1.49.0
+      '@oxlint/binding-win32-x64-msvc': 1.49.0
+      oxlint-tsgolint: 0.14.2
 
   p-limit@3.1.0:
     dependencies:
@@ -15236,16 +15706,16 @@ snapshots:
     dependencies:
       p-limit: 3.1.0
 
-  p-map@7.0.3: {}
+  p-map@7.0.4: {}
 
-  package-json-from-dist@1.0.0: {}
+  package-json-from-dist@1.0.1: {}
 
   package-json@10.0.1:
     dependencies:
-      ky: 1.9.0
-      registry-auth-token: 5.1.0
+      ky: 1.14.3
+      registry-auth-token: 5.1.1
       registry-url: 6.0.1
-      semver: 7.7.3
+      semver: 7.7.4
 
   package-manager-detector@1.6.0: {}
 
@@ -15264,7 +15734,7 @@ snapshots:
 
   parse-json@5.2.0:
     dependencies:
-      '@babel/code-frame': 7.27.1
+      '@babel/code-frame': 7.29.0
       error-ex: 1.3.2
       json-parse-even-better-errors: 2.3.1
       lines-and-columns: 1.2.4
@@ -15295,12 +15765,12 @@ snapshots:
   path-scurry@1.11.1:
     dependencies:
       lru-cache: 10.4.3
-      minipass: 7.1.2
+      minipass: 7.1.3
 
-  path-scurry@2.0.0:
+  path-scurry@2.0.2:
     dependencies:
-      lru-cache: 11.2.4
-      minipass: 7.1.2
+      lru-cache: 11.2.6
+      minipass: 7.1.3
 
   path-type@4.0.0: {}
 
@@ -15312,6 +15782,8 @@ snapshots:
 
   pathval@2.0.1: {}
 
+  perfect-debounce@1.0.0: {}
+
   perfect-debounce@2.0.0: {}
 
   picocolors@1.1.1: {}
@@ -15324,11 +15796,10 @@ snapshots:
 
   pidtree@0.6.0: {}
 
-  pinia@2.2.2(typescript@5.9.3)(vue@3.5.13(typescript@5.9.3)):
+  pinia@3.0.4(typescript@5.9.3)(vue@3.5.13(typescript@5.9.3)):
     dependencies:
-      '@vue/devtools-api': 6.6.4
+      '@vue/devtools-api': 7.7.9
       vue: 3.5.13(typescript@5.9.3)
-      vue-demi: 0.14.10(vue@3.5.13(typescript@5.9.3))
     optionalDependencies:
       typescript: 5.9.3
 
@@ -15344,11 +15815,11 @@ snapshots:
       exsolve: 1.0.8
       pathe: 2.0.3
 
-  playwright-core@1.57.0: {}
+  playwright-core@1.58.1: {}
 
-  playwright@1.57.0:
+  playwright@1.58.1:
     dependencies:
-      playwright-core: 1.57.0
+      playwright-core: 1.58.1
     optionalDependencies:
       fsevents: 2.3.2
 
@@ -15385,9 +15856,28 @@ snapshots:
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
+  posthog-js@1.358.1:
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api-logs': 0.208.0
+      '@opentelemetry/exporter-logs-otlp-http': 0.208.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.6.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-logs': 0.208.0(@opentelemetry/api@1.9.0)
+      '@posthog/core': 1.23.2
+      '@posthog/types': 1.358.1
+      core-js: 3.48.0
+      dompurify: 3.3.1
+      fflate: 0.4.8
+      preact: 10.28.4
+      query-selector-shadow-dom: 1.0.1
+      web-vitals: 5.1.0
+
+  preact@10.28.4: {}
+
   prelude-ls@1.2.1: {}
 
-  prettier@3.7.4: {}
+  prettier@3.7.4:
+    optional: true
 
   pretty-bytes@7.1.0: {}
 
@@ -15422,108 +15912,108 @@ snapshots:
     dependencies:
       asap: 2.0.6
 
-  prosemirror-changeset@2.2.1:
+  prosemirror-changeset@2.4.0:
     dependencies:
-      prosemirror-transform: 1.10.2
+      prosemirror-transform: 1.11.0
 
   prosemirror-collab@1.3.1:
     dependencies:
-      prosemirror-state: 1.4.3
+      prosemirror-state: 1.4.4
 
-  prosemirror-commands@1.6.2:
+  prosemirror-commands@1.7.1:
     dependencies:
-      prosemirror-model: 1.24.1
-      prosemirror-state: 1.4.3
-      prosemirror-transform: 1.10.2
+      prosemirror-model: 1.25.4
+      prosemirror-state: 1.4.4
+      prosemirror-transform: 1.11.0
 
-  prosemirror-dropcursor@1.8.1:
+  prosemirror-dropcursor@1.8.2:
     dependencies:
-      prosemirror-state: 1.4.3
-      prosemirror-transform: 1.10.2
-      prosemirror-view: 1.37.1
+      prosemirror-state: 1.4.4
+      prosemirror-transform: 1.11.0
+      prosemirror-view: 1.41.6
 
-  prosemirror-gapcursor@1.3.2:
+  prosemirror-gapcursor@1.4.0:
     dependencies:
-      prosemirror-keymap: 1.2.2
-      prosemirror-model: 1.24.1
-      prosemirror-state: 1.4.3
-      prosemirror-view: 1.37.1
+      prosemirror-keymap: 1.2.3
+      prosemirror-model: 1.25.4
+      prosemirror-state: 1.4.4
+      prosemirror-view: 1.41.6
 
-  prosemirror-history@1.4.1:
+  prosemirror-history@1.5.0:
     dependencies:
-      prosemirror-state: 1.4.3
-      prosemirror-transform: 1.10.2
-      prosemirror-view: 1.37.1
+      prosemirror-state: 1.4.4
+      prosemirror-transform: 1.11.0
+      prosemirror-view: 1.41.6
       rope-sequence: 1.3.4
 
-  prosemirror-inputrules@1.4.0:
+  prosemirror-inputrules@1.5.1:
     dependencies:
-      prosemirror-state: 1.4.3
-      prosemirror-transform: 1.10.2
+      prosemirror-state: 1.4.4
+      prosemirror-transform: 1.11.0
 
-  prosemirror-keymap@1.2.2:
+  prosemirror-keymap@1.2.3:
     dependencies:
-      prosemirror-state: 1.4.3
+      prosemirror-state: 1.4.4
       w3c-keyname: 2.2.8
 
-  prosemirror-markdown@1.13.1:
+  prosemirror-markdown@1.13.4:
     dependencies:
       '@types/markdown-it': 14.1.2
-      markdown-it: 14.1.0
-      prosemirror-model: 1.24.1
+      markdown-it: 14.1.1
+      prosemirror-model: 1.25.4
 
-  prosemirror-menu@1.2.4:
+  prosemirror-menu@1.3.0:
     dependencies:
       crelt: 1.0.6
-      prosemirror-commands: 1.6.2
-      prosemirror-history: 1.4.1
-      prosemirror-state: 1.4.3
+      prosemirror-commands: 1.7.1
+      prosemirror-history: 1.5.0
+      prosemirror-state: 1.4.4
 
-  prosemirror-model@1.24.1:
+  prosemirror-model@1.25.4:
     dependencies:
       orderedmap: 2.1.1
 
-  prosemirror-schema-basic@1.2.3:
+  prosemirror-schema-basic@1.2.4:
     dependencies:
-      prosemirror-model: 1.24.1
+      prosemirror-model: 1.25.4
 
-  prosemirror-schema-list@1.5.0:
+  prosemirror-schema-list@1.5.1:
     dependencies:
-      prosemirror-model: 1.24.1
-      prosemirror-state: 1.4.3
-      prosemirror-transform: 1.10.2
+      prosemirror-model: 1.25.4
+      prosemirror-state: 1.4.4
+      prosemirror-transform: 1.11.0
 
-  prosemirror-state@1.4.3:
+  prosemirror-state@1.4.4:
     dependencies:
-      prosemirror-model: 1.24.1
-      prosemirror-transform: 1.10.2
-      prosemirror-view: 1.37.1
+      prosemirror-model: 1.25.4
+      prosemirror-transform: 1.11.0
+      prosemirror-view: 1.41.6
 
-  prosemirror-tables@1.6.2:
+  prosemirror-tables@1.8.5:
     dependencies:
-      prosemirror-keymap: 1.2.2
-      prosemirror-model: 1.24.1
-      prosemirror-state: 1.4.3
-      prosemirror-transform: 1.10.2
-      prosemirror-view: 1.37.1
+      prosemirror-keymap: 1.2.3
+      prosemirror-model: 1.25.4
+      prosemirror-state: 1.4.4
+      prosemirror-transform: 1.11.0
+      prosemirror-view: 1.41.6
 
-  prosemirror-trailing-node@3.0.0(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.1):
+  prosemirror-trailing-node@3.0.0(prosemirror-model@1.25.4)(prosemirror-state@1.4.4)(prosemirror-view@1.41.6):
     dependencies:
       '@remirror/core-constants': 3.0.0
       escape-string-regexp: 4.0.0
-      prosemirror-model: 1.24.1
-      prosemirror-state: 1.4.3
-      prosemirror-view: 1.37.1
+      prosemirror-model: 1.25.4
+      prosemirror-state: 1.4.4
+      prosemirror-view: 1.41.6
 
-  prosemirror-transform@1.10.2:
+  prosemirror-transform@1.11.0:
     dependencies:
-      prosemirror-model: 1.24.1
+      prosemirror-model: 1.25.4
 
-  prosemirror-view@1.37.1:
+  prosemirror-view@1.41.6:
     dependencies:
-      prosemirror-model: 1.24.1
-      prosemirror-state: 1.4.3
-      prosemirror-transform: 1.10.2
+      prosemirror-model: 1.25.4
+      prosemirror-state: 1.4.4
+      prosemirror-transform: 1.11.0
 
   proto-list@1.2.4: {}
 
@@ -15615,7 +16105,7 @@ snapshots:
 
   punycode@2.3.1: {}
 
-  pupa@3.1.0:
+  pupa@3.3.0:
     dependencies:
       escape-goat: 4.0.0
 
@@ -15625,6 +16115,8 @@ snapshots:
 
   quansync@0.2.11: {}
 
+  query-selector-shadow-dom@1.0.1: {}
+
   queue-microtask@1.2.3: {}
 
   raf-schd@4.0.3: {}
@@ -15636,21 +16128,21 @@ snapshots:
       minimist: 1.2.8
       strip-json-comments: 2.0.1
 
-  react-dom@19.2.3(react@19.2.3):
+  react-dom@19.2.4(react@19.2.4):
     dependencies:
-      react: 19.2.3
+      react: 19.2.4
       scheduler: 0.27.0
 
   react-is@17.0.2: {}
 
   react-is@18.3.1: {}
 
-  react-reconciler@0.32.0(react@19.2.3):
+  react-reconciler@0.33.0(react@19.2.4):
     dependencies:
-      react: 19.2.3
-      scheduler: 0.26.0
+      react: 19.2.4
+      scheduler: 0.27.0
 
-  react@19.2.3: {}
+  react@19.2.4: {}
 
   readable-stream@2.3.8:
     dependencies:
@@ -15665,7 +16157,7 @@ snapshots:
   readable-stream@3.6.2:
     dependencies:
       inherits: 2.0.4
-      string_decoder: 1.1.1
+      string_decoder: 1.3.0
       util-deprecate: 1.0.2
 
   readdirp@3.6.0:
@@ -15684,12 +16176,12 @@ snapshots:
 
   recorder-audio-worklet-processor@5.0.35:
     dependencies:
-      '@babel/runtime': 7.28.4
+      '@babel/runtime': 7.28.6
       tslib: 2.8.1
 
   recorder-audio-worklet@6.0.48:
     dependencies:
-      '@babel/runtime': 7.28.4
+      '@babel/runtime': 7.28.6
       broker-factory: 3.1.7
       fast-unique-numbers: 9.0.22
       recorder-audio-worklet-processor: 5.0.35
@@ -15715,7 +16207,7 @@ snapshots:
       which-builtin-type: 1.2.1
     optional: true
 
-  regenerate-unicode-properties@10.2.0:
+  regenerate-unicode-properties@10.2.2:
     dependencies:
       regenerate: 1.4.2
 
@@ -15731,18 +16223,18 @@ snapshots:
       set-function-name: 2.0.2
     optional: true
 
-  regexpu-core@6.2.0:
+  regexpu-core@6.4.0:
     dependencies:
       regenerate: 1.4.2
-      regenerate-unicode-properties: 10.2.0
+      regenerate-unicode-properties: 10.2.2
       regjsgen: 0.8.0
-      regjsparser: 0.12.0
+      regjsparser: 0.13.0
       unicode-match-property-ecmascript: 2.0.0
-      unicode-match-property-value-ecmascript: 2.2.0
+      unicode-match-property-value-ecmascript: 2.2.1
 
-  registry-auth-token@5.1.0:
+  registry-auth-token@5.1.1:
     dependencies:
-      '@pnpm/npm-conf': 2.3.1
+      '@pnpm/npm-conf': 3.0.2
 
   registry-url@6.0.1:
     dependencies:
@@ -15750,9 +16242,9 @@ snapshots:
 
   regjsgen@0.8.0: {}
 
-  regjsparser@0.12.0:
+  regjsparser@0.13.0:
     dependencies:
-      jsesc: 3.0.2
+      jsesc: 3.1.0
 
   reka-ui@2.5.0(typescript@5.9.3)(vue@3.5.13(typescript@5.9.3)):
     dependencies:
@@ -15796,7 +16288,7 @@ snapshots:
   remark-parse@11.0.0:
     dependencies:
       '@types/mdast': 4.0.4
-      mdast-util-from-markdown: 2.0.2
+      mdast-util-from-markdown: 2.0.3
       micromark-util-types: 2.0.2
       unified: 11.0.5
     transitivePeerDependencies:
@@ -15845,13 +16337,33 @@ snapshots:
 
   rfdc@1.4.1: {}
 
-  rollup-plugin-visualizer@6.0.4(rollup@4.53.5):
+  rolldown@1.0.0-rc.3:
+    dependencies:
+      '@oxc-project/types': 0.112.0
+      '@rolldown/pluginutils': 1.0.0-rc.3
+    optionalDependencies:
+      '@rolldown/binding-android-arm64': 1.0.0-rc.3
+      '@rolldown/binding-darwin-arm64': 1.0.0-rc.3
+      '@rolldown/binding-darwin-x64': 1.0.0-rc.3
+      '@rolldown/binding-freebsd-x64': 1.0.0-rc.3
+      '@rolldown/binding-linux-arm-gnueabihf': 1.0.0-rc.3
+      '@rolldown/binding-linux-arm64-gnu': 1.0.0-rc.3
+      '@rolldown/binding-linux-arm64-musl': 1.0.0-rc.3
+      '@rolldown/binding-linux-x64-gnu': 1.0.0-rc.3
+      '@rolldown/binding-linux-x64-musl': 1.0.0-rc.3
+      '@rolldown/binding-openharmony-arm64': 1.0.0-rc.3
+      '@rolldown/binding-wasm32-wasi': 1.0.0-rc.3
+      '@rolldown/binding-win32-arm64-msvc': 1.0.0-rc.3
+      '@rolldown/binding-win32-x64-msvc': 1.0.0-rc.3
+
+  rollup-plugin-visualizer@6.0.4(rolldown@1.0.0-rc.3)(rollup@4.53.5):
     dependencies:
       open: 8.4.2
       picomatch: 4.0.3
       source-map: 0.7.6
       yargs: 17.7.2
     optionalDependencies:
+      rolldown: 1.0.0-rc.3
       rollup: 4.53.5
 
   rollup@4.53.5:
@@ -15881,6 +16393,7 @@ snapshots:
       '@rollup/rollup-win32-x64-gnu': 4.53.5
       '@rollup/rollup-win32-x64-msvc': 4.53.5
       fsevents: 2.3.3
+    optional: true
 
   rope-sequence@1.3.4: {}
 
@@ -15918,12 +16431,12 @@ snapshots:
       is-regex: 1.2.1
     optional: true
 
+  sax@1.4.4: {}
+
   saxes@6.0.0:
     dependencies:
       xmlchars: 2.2.0
 
-  scheduler@0.26.0: {}
-
   scheduler@0.27.0: {}
 
   section-matter@1.0.0:
@@ -15937,7 +16450,7 @@ snapshots:
     dependencies:
       lru-cache: 6.0.0
 
-  semver@7.7.3: {}
+  semver@7.7.4: {}
 
   set-function-length@1.2.2:
     dependencies:
@@ -16023,12 +16536,12 @@ snapshots:
       astral-regex: 2.0.0
       is-fullwidth-code-point: 3.0.0
 
-  slice-ansi@5.0.0:
+  slice-ansi@7.1.2:
     dependencies:
       ansi-styles: 6.2.3
-      is-fullwidth-code-point: 4.0.0
+      is-fullwidth-code-point: 5.1.0
 
-  slice-ansi@7.1.2:
+  slice-ansi@8.0.0:
     dependencies:
       ansi-styles: 6.2.3
       is-fullwidth-code-point: 5.1.0
@@ -16055,6 +16568,8 @@ snapshots:
 
   sprintf-js@1.0.3: {}
 
+  sqids@0.3.0: {}
+
   stable-hash-x@0.2.0: {}
 
   stack-utils@2.0.6:
@@ -16065,7 +16580,7 @@ snapshots:
 
   standardized-audio-context@25.3.77:
     dependencies:
-      '@babel/runtime': 7.28.4
+      '@babel/runtime': 7.28.6
       automation-events: 7.1.11
       tslib: 2.8.1
 
@@ -16077,20 +16592,20 @@ snapshots:
       internal-slot: 1.1.0
     optional: true
 
-  storybook@10.1.9(@testing-library/dom@10.4.1)(prettier@3.7.4)(react-dom@19.2.3(react@19.2.3))(react@19.2.3):
+  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):
     dependencies:
       '@storybook/global': 5.0.0
-      '@storybook/icons': 2.0.1(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@storybook/icons': 2.0.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@testing-library/jest-dom': 6.9.1
       '@testing-library/user-event': 14.6.1(@testing-library/dom@10.4.1)
       '@vitest/expect': 3.2.4
       '@vitest/spy': 3.2.4
-      esbuild: 0.27.1
+      esbuild: 0.27.3
       open: 10.2.0
       recast: 0.23.11
-      semver: 7.7.3
-      use-sync-external-store: 1.6.0(react@19.2.3)
-      ws: 8.18.3
+      semver: 7.7.4
+      use-sync-external-store: 1.6.0(react@19.2.4)
+      ws: 8.19.0
     optionalDependencies:
       prettier: 3.7.4
     transitivePeerDependencies:
@@ -16117,12 +16632,12 @@ snapshots:
   string-width@7.2.0:
     dependencies:
       emoji-regex: 10.4.0
-      get-east-asian-width: 1.4.0
+      get-east-asian-width: 1.5.0
       strip-ansi: 7.1.2
 
-  string-width@8.1.0:
+  string-width@8.2.0:
     dependencies:
-      get-east-asian-width: 1.4.0
+      get-east-asian-width: 1.5.0
       strip-ansi: 7.1.2
 
   string.fromcodepoint@0.2.1: {}
@@ -16157,6 +16672,10 @@ snapshots:
     dependencies:
       safe-buffer: 5.1.2
 
+  string_decoder@1.3.0:
+    dependencies:
+      safe-buffer: 5.2.1
+
   strip-ansi@6.0.1:
     dependencies:
       ansi-regex: 5.0.1
@@ -16179,7 +16698,11 @@ snapshots:
 
   strip-json-comments@5.0.3: {}
 
-  stubborn-fs@1.2.5: {}
+  stubborn-fs@2.0.0:
+    dependencies:
+      stubborn-utils: 1.0.2
+
+  stubborn-utils@1.0.2: {}
 
   stylelint@16.26.1(typescript@5.9.3):
     dependencies:
@@ -16228,7 +16751,7 @@ snapshots:
 
   subscribable-things@2.1.53:
     dependencies:
-      '@babel/runtime': 7.28.4
+      '@babel/runtime': 7.28.6
       rxjs-interop: 2.0.0
       tslib: 2.8.1
 
@@ -16253,11 +16776,21 @@ snapshots:
 
   svg-tags@1.0.0: {}
 
-  swr@2.3.6(react@19.2.3):
+  svgo@4.0.0:
+    dependencies:
+      commander: 11.1.0
+      css-select: 5.2.2
+      css-tree: 3.1.0
+      css-what: 6.1.0
+      csso: 5.0.5
+      picocolors: 1.1.1
+      sax: 1.4.4
+
+  swr@2.4.0(react@19.2.4):
     dependencies:
       dequal: 2.0.3
-      react: 19.2.3
-      use-sync-external-store: 1.6.0(react@19.2.3)
+      react: 19.2.4
+      use-sync-external-store: 1.6.0(react@19.2.4)
 
   symbol-tree@3.2.4: {}
 
@@ -16266,23 +16799,31 @@ snapshots:
       '@pkgr/core': 0.2.9
       tslib: 2.8.1
 
+  synckit@0.11.12:
+    dependencies:
+      '@pkgr/core': 0.2.9
+
   table@6.9.0:
     dependencies:
-      ajv: 8.17.1
+      ajv: 8.18.0
       lodash.truncate: 4.4.2
       slice-ansi: 4.0.0
       string-width: 4.2.3
       strip-ansi: 6.0.1
 
+  tagged-tag@1.0.0: {}
+
+  tailwind-csstree@0.1.4: {}
+
   tailwind-merge@2.6.0: {}
 
-  tailwindcss-primeui@0.6.1(tailwindcss@4.1.12):
+  tailwindcss-primeui@0.6.1(tailwindcss@4.2.0):
     dependencies:
-      tailwindcss: 4.1.12
+      tailwindcss: 4.2.0
 
-  tailwindcss@4.1.12: {}
+  tailwindcss@4.2.0: {}
 
-  tapable@2.2.3: {}
+  tapable@2.3.0: {}
 
   tar-stream@2.2.0:
     dependencies:
@@ -16292,19 +16833,12 @@ snapshots:
       inherits: 2.0.4
       readable-stream: 3.6.2
 
-  tar@7.4.3:
-    dependencies:
-      '@isaacs/fs-minipass': 4.0.1
-      chownr: 3.0.0
-      minipass: 7.1.2
-      minizlib: 3.0.2
-      mkdirp: 3.0.1
-      yallist: 5.0.0
+  terminal-size@4.0.1: {}
 
   terser@5.39.2:
     dependencies:
       '@jridgewell/source-map': 0.3.6
-      acorn: 8.15.0
+      acorn: 8.16.0
       commander: 2.20.3
       source-map-support: 0.5.21
 
@@ -16327,19 +16861,21 @@ snapshots:
       fdir: 6.5.0(picomatch@4.0.3)
       picomatch: 4.0.3
 
+  tinypool@2.1.0: {}
+
   tinyrainbow@2.0.0: {}
 
   tinyrainbow@3.0.3: {}
 
   tinyspy@4.0.4: {}
 
-  tiptap-markdown@0.8.10(@tiptap/core@2.10.4(@tiptap/pm@2.10.4)):
+  tiptap-markdown@0.8.10(@tiptap/core@2.27.2(@tiptap/pm@2.27.2)):
     dependencies:
-      '@tiptap/core': 2.10.4(@tiptap/pm@2.10.4)
+      '@tiptap/core': 2.27.2(@tiptap/pm@2.27.2)
       '@types/markdown-it': 13.0.9
-      markdown-it: 14.1.0
+      markdown-it: 14.1.1
       markdown-it-task-lists: 2.1.1
-      prosemirror-markdown: 1.13.1
+      prosemirror-markdown: 1.13.4
 
   tldts-core@7.0.19: {}
 
@@ -16347,6 +16883,16 @@ snapshots:
     dependencies:
       tldts-core: 7.0.19
 
+  tmcp@1.19.0(typescript@5.9.3):
+    dependencies:
+      '@standard-schema/spec': 1.1.0
+      json-rpc-2.0: 1.7.1
+      sqids: 0.3.0
+      uri-template-matcher: 1.1.2
+      valibot: 1.2.0(typescript@5.9.3)
+    transitivePeerDependencies:
+      - typescript
+
   tmp@0.2.5: {}
 
   to-regex-range@5.0.1:
@@ -16371,7 +16917,7 @@ snapshots:
 
   trough@2.2.0: {}
 
-  ts-api-utils@2.1.0(typescript@5.9.3):
+  ts-api-utils@2.4.0(typescript@5.9.3):
     dependencies:
       typescript: 5.9.3
 
@@ -16379,6 +16925,13 @@ snapshots:
 
   ts-map@1.0.3: {}
 
+  tsconfig-paths-webpack-plugin@4.2.0:
+    dependencies:
+      chalk: 4.1.2
+      enhanced-resolve: 5.19.0
+      tapable: 2.3.0
+      tsconfig-paths: 4.2.0
+
   tsconfig-paths@3.15.0:
     dependencies:
       '@types/json5': 0.0.29
@@ -16412,6 +16965,10 @@ snapshots:
 
   type-fest@4.41.0: {}
 
+  type-fest@5.4.4:
+    dependencies:
+      tagged-tag: 1.0.0
+
   typed-array-buffer@1.0.3:
     dependencies:
       call-bound: 1.0.4
@@ -16500,11 +17057,11 @@ snapshots:
   unicode-match-property-ecmascript@2.0.0:
     dependencies:
       unicode-canonical-property-names-ecmascript: 2.0.1
-      unicode-property-aliases-ecmascript: 2.1.0
+      unicode-property-aliases-ecmascript: 2.2.0
 
-  unicode-match-property-value-ecmascript@2.2.0: {}
+  unicode-match-property-value-ecmascript@2.2.1: {}
 
-  unicode-property-aliases-ecmascript@2.1.0: {}
+  unicode-property-aliases-ecmascript@2.2.0: {}
 
   unified@11.0.5:
     dependencies:
@@ -16516,7 +17073,7 @@ snapshots:
       trough: 2.2.0
       vfile: 6.0.3
 
-  unist-util-is@6.0.0:
+  unist-util-is@6.0.1:
     dependencies:
       '@types/unist': 3.0.3
 
@@ -16524,20 +17081,20 @@ snapshots:
     dependencies:
       '@types/unist': 3.0.3
 
-  unist-util-visit-parents@6.0.1:
+  unist-util-visit-parents@6.0.2:
     dependencies:
       '@types/unist': 3.0.3
-      unist-util-is: 6.0.0
+      unist-util-is: 6.0.1
 
-  unist-util-visit@5.0.0:
+  unist-util-visit@5.1.0:
     dependencies:
       '@types/unist': 3.0.3
-      unist-util-is: 6.0.0
-      unist-util-visit-parents: 6.0.1
+      unist-util-is: 6.0.1
+      unist-util-visit-parents: 6.0.2
 
   universalify@2.0.1: {}
 
-  unplugin-icons@22.5.0(@vue/compiler-sfc@3.5.25):
+  unplugin-icons@22.5.0(@vue/compiler-sfc@3.5.28):
     dependencies:
       '@antfu/install-pkg': 1.1.0
       '@iconify/utils': 3.1.0
@@ -16545,7 +17102,7 @@ snapshots:
       local-pkg: 1.1.2
       unplugin: 2.3.11
     optionalDependencies:
-      '@vue/compiler-sfc': 3.5.25
+      '@vue/compiler-sfc': 3.5.28
     transitivePeerDependencies:
       - supports-color
 
@@ -16567,7 +17124,7 @@ snapshots:
       pathe: 2.0.3
       picomatch: 4.0.3
 
-  unplugin-vue-components@30.0.0(@babel/parser@7.28.5)(vue@3.5.13(typescript@5.9.3)):
+  unplugin-vue-components@30.0.0(@babel/parser@7.29.0)(vue@3.5.13(typescript@5.9.3)):
     dependencies:
       chokidar: 4.0.3
       debug: 4.4.3
@@ -16579,13 +17136,13 @@ snapshots:
       unplugin-utils: 0.3.1
       vue: 3.5.13(typescript@5.9.3)
     optionalDependencies:
-      '@babel/parser': 7.28.5
+      '@babel/parser': 7.29.0
     transitivePeerDependencies:
       - supports-color
 
   unplugin@1.0.1:
     dependencies:
-      acorn: 8.15.0
+      acorn: 8.16.0
       chokidar: 3.6.0
       webpack-sources: 3.3.3
       webpack-virtual-modules: 0.5.0
@@ -16593,7 +17150,7 @@ snapshots:
   unplugin@2.3.11:
     dependencies:
       '@jridgewell/remapping': 2.3.5
-      acorn: 8.15.0
+      acorn: 8.16.0
       picomatch: 4.0.3
       webpack-virtual-modules: 0.6.2
 
@@ -16631,22 +17188,24 @@ snapshots:
     dependencies:
       boxen: 8.0.1
       chalk: 5.6.2
-      configstore: 7.0.0
+      configstore: 7.1.0
       is-in-ci: 1.0.0
       is-installed-globally: 1.0.0
-      is-npm: 6.0.0
+      is-npm: 6.1.0
       latest-version: 9.0.0
-      pupa: 3.1.0
-      semver: 7.7.3
+      pupa: 3.3.0
+      semver: 7.7.4
       xdg-basedir: 5.1.0
 
   uri-js@4.4.1:
     dependencies:
       punycode: 2.3.1
 
-  use-sync-external-store@1.6.0(react@19.2.3):
+  uri-template-matcher@1.1.2: {}
+
+  use-sync-external-store@1.6.0(react@19.2.4):
     dependencies:
-      react: 19.2.3
+      react: 19.2.4
 
   utf8@3.0.0: {}
 
@@ -16654,6 +17213,10 @@ snapshots:
 
   uuid@11.1.0: {}
 
+  valibot@1.2.0(typescript@5.9.3):
+    optionalDependencies:
+      typescript: 5.9.3
+
   vfile-message@4.0.3:
     dependencies:
       '@types/unist': 3.0.3
@@ -16664,31 +17227,31 @@ snapshots:
       '@types/unist': 3.0.3
       vfile-message: 4.0.3
 
-  vite-dev-rpc@1.1.0(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)):
+  vite-dev-rpc@1.1.0(vite@8.0.0-beta.13(@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)):
     dependencies:
       birpc: 2.9.0
-      vite: 7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
-      vite-hot-client: 2.1.0(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
+      vite: 8.0.0-beta.13(@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)
+      vite-hot-client: 2.1.0(vite@8.0.0-beta.13(@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))
 
-  vite-dev-rpc@1.1.0(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)):
+  vite-dev-rpc@1.1.0(vite@8.0.0-beta.13(@types/node@25.0.3)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)):
     dependencies:
       birpc: 2.9.0
-      vite: 7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
-      vite-hot-client: 2.1.0(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
+      vite: 8.0.0-beta.13(@types/node@25.0.3)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+      vite-hot-client: 2.1.0(vite@8.0.0-beta.13(@types/node@25.0.3)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
 
-  vite-hot-client@2.1.0(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)):
+  vite-hot-client@2.1.0(vite@8.0.0-beta.13(@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)):
     dependencies:
-      vite: 7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+      vite: 8.0.0-beta.13(@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)
 
-  vite-hot-client@2.1.0(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)):
+  vite-hot-client@2.1.0(vite@8.0.0-beta.13(@types/node@25.0.3)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)):
     dependencies:
-      vite: 7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+      vite: 8.0.0-beta.13(@types/node@25.0.3)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
 
-  vite-plugin-dts@4.5.4(@types/node@24.10.4)(rollup@4.53.5)(typescript@5.9.3)(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)):
+  vite-plugin-dts@4.5.4(@types/node@24.10.4)(rollup@4.53.5)(typescript@5.9.3)(vite@8.0.0-beta.13(@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)):
     dependencies:
-      '@microsoft/api-extractor': 7.52.13(@types/node@24.10.4)
+      '@microsoft/api-extractor': 7.57.2(@types/node@24.10.4)
       '@rollup/pluginutils': 5.3.0(rollup@4.53.5)
-      '@volar/typescript': 2.4.27
+      '@volar/typescript': 2.4.28
       '@vue/language-core': 2.2.0(typescript@5.9.3)
       compare-versions: 6.1.1
       debug: 4.4.3
@@ -16697,13 +17260,13 @@ snapshots:
       magic-string: 0.30.21
       typescript: 5.9.3
     optionalDependencies:
-      vite: 7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+      vite: 8.0.0-beta.13(@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)
     transitivePeerDependencies:
       - '@types/node'
       - rollup
       - supports-color
 
-  vite-plugin-html@3.2.2(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)):
+  vite-plugin-html@3.2.2(vite@8.0.0-beta.13(@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)):
     dependencies:
       '@rollup/pluginutils': 4.2.1
       colorette: 2.0.20
@@ -16717,9 +17280,9 @@ snapshots:
       html-minifier-terser: 6.1.0
       node-html-parser: 5.4.2
       pathe: 0.2.0
-      vite: 7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+      vite: 8.0.0-beta.13(@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)
 
-  vite-plugin-html@3.2.2(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)):
+  vite-plugin-html@3.2.2(vite@8.0.0-beta.13(@types/node@25.0.3)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)):
     dependencies:
       '@rollup/pluginutils': 4.2.1
       colorette: 2.0.20
@@ -16733,9 +17296,9 @@ snapshots:
       html-minifier-terser: 6.1.0
       node-html-parser: 5.4.2
       pathe: 0.2.0
-      vite: 7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+      vite: 8.0.0-beta.13(@types/node@25.0.3)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
 
-  vite-plugin-inspect@11.3.3(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)):
+  vite-plugin-inspect@11.3.3(vite@8.0.0-beta.13(@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)):
     dependencies:
       ansis: 4.2.0
       debug: 4.4.3
@@ -16745,12 +17308,12 @@ snapshots:
       perfect-debounce: 2.0.0
       sirv: 3.0.2
       unplugin-utils: 0.3.1
-      vite: 7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
-      vite-dev-rpc: 1.1.0(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
+      vite: 8.0.0-beta.13(@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)
+      vite-dev-rpc: 1.1.0(vite@8.0.0-beta.13(@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))
     transitivePeerDependencies:
       - supports-color
 
-  vite-plugin-inspect@11.3.3(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)):
+  vite-plugin-inspect@11.3.3(vite@8.0.0-beta.13(@types/node@25.0.3)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)):
     dependencies:
       ansis: 4.2.0
       debug: 4.4.3
@@ -16760,107 +17323,109 @@ snapshots:
       perfect-debounce: 2.0.0
       sirv: 3.0.2
       unplugin-utils: 0.3.1
-      vite: 7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
-      vite-dev-rpc: 1.1.0(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
+      vite: 8.0.0-beta.13(@types/node@25.0.3)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+      vite-dev-rpc: 1.1.0(vite@8.0.0-beta.13(@types/node@25.0.3)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
     transitivePeerDependencies:
       - supports-color
 
-  vite-plugin-vue-devtools@8.0.5(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))(vue@3.5.13(typescript@5.9.3)):
+  vite-plugin-vue-devtools@8.0.5(vite@8.0.0-beta.13(@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)):
     dependencies:
-      '@vue/devtools-core': 8.0.5(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))(vue@3.5.13(typescript@5.9.3))
+      '@vue/devtools-core': 8.0.5(vite@8.0.0-beta.13(@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))
       '@vue/devtools-kit': 8.0.5
       '@vue/devtools-shared': 8.0.5
       sirv: 3.0.2
-      vite: 7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
-      vite-plugin-inspect: 11.3.3(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
-      vite-plugin-vue-inspector: 5.3.2(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
+      vite: 8.0.0-beta.13(@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)
+      vite-plugin-inspect: 11.3.3(vite@8.0.0-beta.13(@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))
+      vite-plugin-vue-inspector: 5.3.2(vite@8.0.0-beta.13(@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))
     transitivePeerDependencies:
       - '@nuxt/kit'
       - supports-color
       - vue
 
-  vite-plugin-vue-devtools@8.0.5(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))(vue@3.5.13(typescript@5.9.3)):
+  vite-plugin-vue-devtools@8.0.5(vite@8.0.0-beta.13(@types/node@25.0.3)(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)):
     dependencies:
-      '@vue/devtools-core': 8.0.5(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))(vue@3.5.13(typescript@5.9.3))
+      '@vue/devtools-core': 8.0.5(vite@8.0.0-beta.13(@types/node@25.0.3)(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))
       '@vue/devtools-kit': 8.0.5
       '@vue/devtools-shared': 8.0.5
       sirv: 3.0.2
-      vite: 7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
-      vite-plugin-inspect: 11.3.3(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
-      vite-plugin-vue-inspector: 5.3.2(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
+      vite: 8.0.0-beta.13(@types/node@25.0.3)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+      vite-plugin-inspect: 11.3.3(vite@8.0.0-beta.13(@types/node@25.0.3)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
+      vite-plugin-vue-inspector: 5.3.2(vite@8.0.0-beta.13(@types/node@25.0.3)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
     transitivePeerDependencies:
       - '@nuxt/kit'
       - supports-color
       - vue
 
-  vite-plugin-vue-inspector@5.3.2(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)):
+  vite-plugin-vue-inspector@5.3.2(vite@8.0.0-beta.13(@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)):
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/plugin-proposal-decorators': 7.28.0(@babel/core@7.28.5)
-      '@babel/plugin-syntax-import-attributes': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.28.5)
-      '@babel/plugin-transform-typescript': 7.28.5(@babel/core@7.28.5)
-      '@vue/babel-plugin-jsx': 1.4.0(@babel/core@7.28.5)
-      '@vue/compiler-dom': 3.5.26
+      '@babel/core': 7.29.0
+      '@babel/plugin-proposal-decorators': 7.29.0(@babel/core@7.29.0)
+      '@babel/plugin-syntax-import-attributes': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.29.0)
+      '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.0)
+      '@vue/babel-plugin-jsx': 1.4.0(@babel/core@7.29.0)
+      '@vue/compiler-dom': 3.5.28
       kolorist: 1.8.0
       magic-string: 0.30.21
-      vite: 7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+      vite: 8.0.0-beta.13(@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)
     transitivePeerDependencies:
       - supports-color
 
-  vite-plugin-vue-inspector@5.3.2(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)):
+  vite-plugin-vue-inspector@5.3.2(vite@8.0.0-beta.13(@types/node@25.0.3)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)):
     dependencies:
-      '@babel/core': 7.28.5
-      '@babel/plugin-proposal-decorators': 7.28.0(@babel/core@7.28.5)
-      '@babel/plugin-syntax-import-attributes': 7.27.1(@babel/core@7.28.5)
-      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.28.5)
-      '@babel/plugin-transform-typescript': 7.28.5(@babel/core@7.28.5)
-      '@vue/babel-plugin-jsx': 1.4.0(@babel/core@7.28.5)
-      '@vue/compiler-dom': 3.5.26
+      '@babel/core': 7.29.0
+      '@babel/plugin-proposal-decorators': 7.29.0(@babel/core@7.29.0)
+      '@babel/plugin-syntax-import-attributes': 7.28.6(@babel/core@7.29.0)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.29.0)
+      '@babel/plugin-transform-typescript': 7.28.6(@babel/core@7.29.0)
+      '@vue/babel-plugin-jsx': 1.4.0(@babel/core@7.29.0)
+      '@vue/compiler-dom': 3.5.28
       kolorist: 1.8.0
       magic-string: 0.30.21
-      vite: 7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+      vite: 8.0.0-beta.13(@types/node@25.0.3)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
     transitivePeerDependencies:
       - supports-color
 
-  vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2):
+  vite@8.0.0-beta.13(@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):
     dependencies:
-      esbuild: 0.27.1
+      '@oxc-project/runtime': 0.112.0
       fdir: 6.5.0(picomatch@4.0.3)
+      lightningcss: 1.31.1
       picomatch: 4.0.3
       postcss: 8.5.6
-      rollup: 4.53.5
+      rolldown: 1.0.0-rc.3
       tinyglobby: 0.2.15
     optionalDependencies:
       '@types/node': 24.10.4
+      esbuild: 0.27.3
       fsevents: 2.3.3
       jiti: 2.6.1
-      lightningcss: 1.30.1
       terser: 5.39.2
       tsx: 4.19.4
       yaml: 2.8.2
 
-  vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2):
+  vite@8.0.0-beta.13(@types/node@25.0.3)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2):
     dependencies:
-      esbuild: 0.27.1
+      '@oxc-project/runtime': 0.112.0
       fdir: 6.5.0(picomatch@4.0.3)
+      lightningcss: 1.31.1
       picomatch: 4.0.3
       postcss: 8.5.6
-      rollup: 4.53.5
+      rolldown: 1.0.0-rc.3
       tinyglobby: 0.2.15
     optionalDependencies:
       '@types/node': 25.0.3
+      esbuild: 0.27.3
       fsevents: 2.3.3
       jiti: 2.6.1
-      lightningcss: 1.30.1
       terser: 5.39.2
       tsx: 4.19.4
       yaml: 2.8.2
 
-  vitest@4.0.16(@types/node@24.10.4)(@vitest/ui@4.0.16)(happy-dom@20.0.11)(jiti@2.6.1)(jsdom@27.4.0)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2):
+  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):
     dependencies:
       '@vitest/expect': 4.0.16
-      '@vitest/mocker': 4.0.16(vite@7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2))
+      '@vitest/mocker': 4.0.16(vite@8.0.0-beta.13(@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))
       '@vitest/pretty-format': 4.0.16
       '@vitest/runner': 4.0.16
       '@vitest/snapshot': 4.0.16
@@ -16877,17 +17442,19 @@ snapshots:
       tinyexec: 1.0.2
       tinyglobby: 0.2.15
       tinyrainbow: 3.0.3
-      vite: 7.3.0(@types/node@24.10.4)(jiti@2.6.1)(lightningcss@1.30.1)(terser@5.39.2)(tsx@4.19.4)(yaml@2.8.2)
+      vite: 8.0.0-beta.13(@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)
       why-is-node-running: 2.3.0
     optionalDependencies:
+      '@opentelemetry/api': 1.9.0
       '@types/node': 24.10.4
       '@vitest/ui': 4.0.16(vitest@4.0.16)
       happy-dom: 20.0.11
       jsdom: 27.4.0
     transitivePeerDependencies:
+      - '@vitejs/devtools'
+      - esbuild
       - jiti
       - less
-      - lightningcss
       - msw
       - sass
       - sass-embedded
@@ -16912,7 +17479,7 @@ snapshots:
 
   vue-component-type-helpers@2.2.12: {}
 
-  vue-component-type-helpers@3.2.1: {}
+  vue-component-type-helpers@3.2.5: {}
 
   vue-demi@0.14.10(vue@3.5.13(typescript@5.9.3)):
     dependencies:
@@ -16920,10 +17487,10 @@ snapshots:
 
   vue-docgen-api@4.79.2(vue@3.5.13(typescript@5.9.3)):
     dependencies:
-      '@babel/parser': 7.28.5
-      '@babel/types': 7.28.5
-      '@vue/compiler-dom': 3.5.26
-      '@vue/compiler-sfc': 3.5.25
+      '@babel/parser': 7.29.0
+      '@babel/types': 7.29.0
+      '@vue/compiler-dom': 3.5.28
+      '@vue/compiler-sfc': 3.5.28
       ast-types: 0.16.1
       esm-resolve: 1.0.11
       hash-sum: 2.0.0
@@ -16934,23 +17501,23 @@ snapshots:
       vue: 3.5.13(typescript@5.9.3)
       vue-inbrowser-compiler-independent-utils: 4.71.1(vue@3.5.13(typescript@5.9.3))
 
-  vue-eslint-parser@10.2.0(eslint@9.39.1(jiti@2.6.1)):
+  vue-eslint-parser@10.4.0(eslint@9.39.1(jiti@2.6.1)):
     dependencies:
       debug: 4.4.3
       eslint: 9.39.1(jiti@2.6.1)
-      eslint-scope: 8.4.0
-      eslint-visitor-keys: 4.2.1
-      espree: 10.4.0
-      esquery: 1.6.0
-      semver: 7.7.3
+      eslint-scope: 9.1.1
+      eslint-visitor-keys: 5.0.1
+      espree: 11.1.1
+      esquery: 1.7.0
+      semver: 7.7.4
     transitivePeerDependencies:
       - supports-color
 
-  vue-i18n@9.14.3(vue@3.5.13(typescript@5.9.3)):
+  vue-i18n@9.14.5(vue@3.5.13(typescript@5.9.3)):
     dependencies:
-      '@intlify/core-base': 9.14.3
-      '@intlify/shared': 9.14.3
-      '@vue/devtools-api': 6.6.3
+      '@intlify/core-base': 9.14.5
+      '@intlify/shared': 9.14.5
+      '@vue/devtools-api': 6.6.4
       vue: 3.5.13(typescript@5.9.3)
 
   vue-inbrowser-compiler-independent-utils@4.71.1(vue@3.5.13(typescript@5.9.3)):
@@ -16959,13 +17526,13 @@ snapshots:
 
   vue-router@4.4.3(vue@3.5.13(typescript@5.9.3)):
     dependencies:
-      '@vue/devtools-api': 6.6.3
+      '@vue/devtools-api': 6.6.4
       vue: 3.5.13(typescript@5.9.3)
 
-  vue-tsc@3.2.1(typescript@5.9.3):
+  vue-tsc@3.2.5(typescript@5.9.3):
     dependencies:
-      '@volar/typescript': 2.4.27
-      '@vue/language-core': 3.2.1
+      '@volar/typescript': 2.4.28
+      '@vue/language-core': 3.2.5
       typescript: 5.9.3
 
   vue@3.5.13(typescript@5.9.3):
@@ -17002,6 +17569,8 @@ snapshots:
 
   web-vitals@4.2.4: {}
 
+  web-vitals@5.1.0: {}
+
   webidl-conversions@3.0.1: {}
 
   webidl-conversions@8.0.0: {}
@@ -17034,7 +17603,7 @@ snapshots:
       tr46: 0.0.3
       webidl-conversions: 3.0.1
 
-  when-exit@2.1.4: {}
+  when-exit@2.1.5: {}
 
   which-boxed-primitive@1.1.1:
     dependencies:
@@ -17059,7 +17628,7 @@ snapshots:
       isarray: 2.0.5
       which-boxed-primitive: 1.1.1
       which-collection: 1.0.2
-      which-typed-array: 1.1.19
+      which-typed-array: 1.1.20
     optional: true
 
   which-collection@1.0.2:
@@ -17070,7 +17639,7 @@ snapshots:
       is-weakset: 2.0.4
     optional: true
 
-  which-typed-array@1.1.19:
+  which-typed-array@1.1.20:
     dependencies:
       available-typed-arrays: 1.0.7
       call-bind: 1.0.8
@@ -17098,10 +17667,14 @@ snapshots:
     dependencies:
       string-width: 7.2.0
 
+  widest-line@6.0.0:
+    dependencies:
+      string-width: 8.2.0
+
   with@7.0.2:
     dependencies:
-      '@babel/parser': 7.28.5
-      '@babel/types': 7.28.5
+      '@babel/parser': 7.29.0
+      '@babel/types': 7.29.0
       assert-never: 1.4.0
       babel-walk: 3.0.0-canary-5
 
@@ -17109,7 +17682,7 @@ snapshots:
 
   worker-factory@7.0.43:
     dependencies:
-      '@babel/runtime': 7.28.4
+      '@babel/runtime': 7.28.6
       fast-unique-numbers: 9.0.22
       tslib: 2.8.1
 
@@ -17138,11 +17711,11 @@ snapshots:
       imurmurhash: 0.1.4
       signal-exit: 4.1.0
 
-  ws@8.18.3: {}
+  ws@8.19.0: {}
 
   wsl-utils@0.1.0:
     dependencies:
-      is-wsl: 3.1.0
+      is-wsl: 3.1.1
 
   wtd-core@3.0.0: {}
 
@@ -17171,8 +17744,6 @@ snapshots:
 
   yallist@4.0.0: {}
 
-  yallist@5.0.0: {}
-
   yaml-eslint-parser@1.3.0:
     dependencies:
       eslint-visitor-keys: 3.4.3
@@ -17219,10 +17790,10 @@ snapshots:
 
   zod@4.2.1: {}
 
-  zustand@5.0.8(@types/react@19.1.9)(react@19.2.3)(use-sync-external-store@1.6.0(react@19.2.3)):
+  zustand@5.0.11(@types/react@19.1.9)(react@19.2.4)(use-sync-external-store@1.6.0(react@19.2.4)):
     optionalDependencies:
       '@types/react': 19.1.9
-      react: 19.2.3
-      use-sync-external-store: 1.6.0(react@19.2.3)
+      react: 19.2.4
+      use-sync-external-store: 1.6.0(react@19.2.4)
 
   zwitch@2.0.4: {}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index bd4638b0d2..c455964545 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -6,18 +6,19 @@ catalog:
   '@alloc/quick-lru': ^5.2.0
   '@comfyorg/comfyui-electron-types': 0.6.2
   '@eslint/js': ^9.39.1
+  '@formkit/auto-animate': ^0.9.0
   '@iconify-json/lucide': ^1.1.178
   '@iconify/json': ^2.2.380
-  '@iconify/tailwind': ^1.1.3
-  '@intlify/eslint-plugin-vue-i18n': ^4.1.0
-  '@lobehub/i18n-cli': ^1.25.1
-  '@nx/eslint': 22.2.6
-  '@nx/playwright': 22.2.6
-  '@nx/storybook': 22.2.4
-  '@nx/vite': 22.2.6
+  '@iconify/tailwind4': ^1.2.0
+  '@iconify/utils': ^3.1.0
+  '@intlify/eslint-plugin-vue-i18n': ^4.1.1
+  '@lobehub/i18n-cli': ^1.26.1
+  '@nx/eslint': 22.5.2
+  '@nx/playwright': 22.5.2
+  '@nx/storybook': 22.5.2
+  '@nx/vite': 22.5.2
   '@pinia/testing': ^1.0.3
-  '@playwright/test': ^1.57.0
-  '@prettier/plugin-oxc': ^0.1.3
+  '@playwright/test': ^1.58.1
   '@primeuix/forms': 0.0.2
   '@primeuix/styled': 0.3.2
   '@primeuix/utils': ^0.3.2
@@ -28,11 +29,19 @@ catalog:
   '@sentry/vite-plugin': ^4.6.0
   '@sentry/vue': ^10.32.1
   '@sparkjsdev/spark': ^0.1.10
-  '@storybook/addon-docs': ^10.1.9
-  '@storybook/vue3': ^10.1.9
-  '@storybook/vue3-vite': ^10.1.9
-  '@tailwindcss/vite': ^4.1.12
-  '@trivago/prettier-plugin-sort-imports': ^5.2.0
+  '@storybook/addon-docs': ^10.2.10
+  '@storybook/addon-mcp': 0.1.6
+  '@storybook/vue3': ^10.2.10
+  '@storybook/vue3-vite': ^10.2.10
+  '@tailwindcss/vite': ^4.2.0
+  '@tiptap/core': ^2.27.2
+  '@tiptap/extension-link': ^2.27.2
+  '@tiptap/extension-table': ^2.27.2
+  '@tiptap/extension-table-cell': ^2.27.2
+  '@tiptap/extension-table-header': ^2.27.2
+  '@tiptap/extension-table-row': ^2.27.2
+  '@tiptap/pm': 2.27.2
+  '@tiptap/starter-kit': ^2.27.2
   '@types/fs-extra': ^11.0.4
   '@types/jsdom': ^21.1.7
   '@types/node': ^24.1.0
@@ -42,47 +51,53 @@ catalog:
   '@vitest/coverage-v8': ^4.0.16
   '@vitest/ui': ^4.0.16
   '@vue/test-utils': ^2.4.6
-  '@vueuse/core': ^11.0.0
-  '@vueuse/integrations': ^13.9.0
+  '@vueuse/core': ^14.2.0
+  '@vueuse/integrations': ^14.2.0
   '@webgpu/types': ^0.1.66
   algoliasearch: ^5.21.0
-  axios: ^1.8.2
+  axios: ^1.13.5
   cross-env: ^10.1.0
   cva: 1.0.0-beta.4
+  dompurify: ^3.3.1
   dotenv: ^16.4.5
   eslint: ^9.39.1
   eslint-config-prettier: ^10.1.8
   eslint-import-resolver-typescript: ^4.4.4
+  eslint-plugin-better-tailwindcss: ^4.3.1
   eslint-plugin-import-x: ^4.16.1
   eslint-plugin-oxlint: 1.25.0
-  eslint-plugin-storybook: ^10.1.9
+  eslint-plugin-storybook: ^10.2.10
   eslint-plugin-unused-imports: ^4.3.0
   eslint-plugin-vue: ^10.6.2
   firebase: ^11.6.0
+  glob: ^13.0.6
   globals: ^16.5.0
   happy-dom: ^20.0.11
   husky: ^9.1.7
   jiti: 2.6.1
   jsdom: ^27.4.0
+  jsonata: ^2.1.0
+  jsondiffpatch: ^0.7.3
   knip: ^5.75.1
   lint-staged: ^16.2.7
   markdown-table: ^3.0.4
   mixpanel-browser: ^2.71.0
-  nx: 22.2.6
-  oxlint: ^1.33.0
-  oxlint-tsgolint: ^0.9.1
+  nx: 22.5.2
+  oxfmt: ^0.34.0
+  oxlint: ^1.49.0
+  oxlint-tsgolint: ^0.14.2
   picocolors: ^1.1.1
   pinia: ^3.0.4
   postcss-html: ^1.8.0
-  prettier: ^3.7.4
+  posthog-js: ^1.358.1
   pretty-bytes: ^7.1.0
   primeicons: ^7.0.0
   primevue: ^4.2.5
   reka-ui: ^2.5.0
   rollup-plugin-visualizer: ^6.0.4
-  storybook: ^10.1.9
+  storybook: ^10.2.10
   stylelint: ^16.26.1
-  tailwindcss: ^4.1.12
+  tailwindcss: ^4.2.0
   tailwindcss-primeui: ^0.6.1
   tsx: ^4.15.6
   tw-animate-css: ^1.3.8
@@ -92,17 +107,17 @@ catalog:
   unplugin-icons: ^22.5.0
   unplugin-typegpu: 0.8.0
   unplugin-vue-components: ^30.0.0
-  vite: ^7.3.0
+  vite: 8.0.0-beta.13
   vite-plugin-dts: ^4.5.4
   vite-plugin-html: ^3.2.2
   vite-plugin-vue-devtools: ^8.0.0
   vitest: ^4.0.16
   vue: ^3.5.13
   vue-component-type-helpers: ^3.2.1
-  vue-eslint-parser: ^10.2.0
-  vue-i18n: ^9.14.3
+  vue-eslint-parser: ^10.4.0
+  vue-i18n: ^9.14.5
   vue-router: ^4.4.3
-  vue-tsc: ^3.2.1
+  vue-tsc: ^3.2.5
   vuefire: ^3.2.1
   wwobjloader2: ^6.2.1
   yjs: ^13.6.27
@@ -129,4 +144,5 @@ onlyBuiltDependencies:
   - oxc-resolver
 
 overrides:
+  '@tiptap/pm': 2.27.2
   '@types/eslint': '-'
diff --git a/public/assets/sorted-custom-node-map.json b/public/assets/sorted-custom-node-map.json
index d22bd3b296..3bd0889fe1 100644
--- a/public/assets/sorted-custom-node-map.json
+++ b/public/assets/sorted-custom-node-map.json
@@ -3197,4 +3197,4 @@
   "Perlin Power Fractal Latent (PPF Noise)": 0.3919410832855843,
   "Cross-Hatch Power Fractal (PPF Noise)": 0.3919410832855843,
   "Linear Cross-Hatch Power Fractal (PPF Noise)": 0.3919410832855843
-}
\ No newline at end of file
+}
diff --git a/scripts/check-unused-i18n-keys.ts b/scripts/check-unused-i18n-keys.ts
index f459b8c23f..5998369d78 100755
--- a/scripts/check-unused-i18n-keys.ts
+++ b/scripts/check-unused-i18n-keys.ts
@@ -2,10 +2,7 @@
 import { execSync } from 'child_process'
 import * as fs from 'fs'
 import { globSync } from 'glob'
-
-interface LocaleData {
-  [key: string]: any
-}
+import type { LocaleData } from './i18n-types'
 
 // Configuration
 const SOURCE_PATTERNS = ['src/**/*.{js,ts,vue}', '!src/locales/**/*']
@@ -45,7 +42,7 @@ function getStagedLocaleFiles(): string[] {
 }
 
 // Extract all keys from a nested object
-function extractKeys(obj: any, prefix = ''): string[] {
+function extractKeys(obj: LocaleData, prefix = ''): string[] {
   const keys: string[] = []
 
   for (const [key, value] of Object.entries(obj)) {
@@ -166,17 +163,17 @@ async function checkNewUnusedKeys() {
 
   // Report results
   if (unusedNewKeys.length > 0) {
-    console.log('\n⚠️  Warning: Found unused NEW i18n keys:\n')
+    console.warn('\n⚠️  Warning: Found unused NEW i18n keys:\n')
 
     for (const key of unusedNewKeys.sort()) {
-      console.log(`  - ${key}`)
+      console.warn(`  - ${key}`)
     }
 
-    console.log(`\n✨ Total unused new keys: ${unusedNewKeys.length}`)
-    console.log(
+    console.warn(`\n✨ Total unused new keys: ${unusedNewKeys.length}`)
+    console.warn(
       '\nThese keys were added but are not used anywhere in the codebase.'
     )
-    console.log('Consider using them or removing them in a future update.')
+    console.warn('Consider using them or removing them in a future update.')
 
     // Changed from process.exit(1) to process.exit(0) for warning only
     process.exit(0)
diff --git a/scripts/cicd/extract-playwright-counts.ts b/scripts/cicd/extract-playwright-counts.ts
index ff6f44db30..1a79228166 100755
--- a/scripts/cicd/extract-playwright-counts.ts
+++ b/scripts/cicd/extract-playwright-counts.ts
@@ -10,37 +10,158 @@ interface TestStats {
   finished?: number
 }
 
+interface TestResult {
+  status: string
+  duration?: number
+  error?: {
+    message?: string
+    stack?: string
+  }
+  attachments?: Array<{
+    name: string
+    path?: string
+    contentType: string
+  }>
+}
+
+interface TestCase {
+  title: string
+  ok: boolean
+  outcome: string
+  results: TestResult[]
+}
+
+interface Suite {
+  title: string
+  file: string
+  suites?: Suite[]
+  tests?: TestCase[]
+}
+
+interface FullReportData {
+  stats?: TestStats
+  suites?: Suite[]
+}
+
 interface ReportData {
   stats?: TestStats
 }
 
+interface FailedTest {
+  name: string
+  file: string
+  traceUrl?: string
+  error?: string
+}
+
 interface TestCounts {
   passed: number
   failed: number
   flaky: number
   skipped: number
   total: number
+  failures?: FailedTest[]
+}
+
+/**
+ * Extract failed test details from Playwright report
+ */
+function extractFailedTests(
+  reportData: FullReportData,
+  baseUrl?: string
+): FailedTest[] {
+  const failures: FailedTest[] = []
+
+  function processTest(test: TestCase, file: string, suitePath: string[]) {
+    // Check if test failed or is flaky
+    const hasFailed = test.results.some(
+      (r) => r.status === 'failed' || r.status === 'timedOut'
+    )
+    const isFlaky = test.outcome === 'flaky'
+
+    if (hasFailed || isFlaky) {
+      const fullTestName = [...suitePath, test.title]
+        .filter(Boolean)
+        .join(' › ')
+      const failedResult = test.results.find(
+        (r) => r.status === 'failed' || r.status === 'timedOut'
+      )
+
+      // Find trace attachment
+      let traceUrl: string | undefined
+      if (failedResult?.attachments) {
+        const traceAttachment = failedResult.attachments.find(
+          (a) => a.name === 'trace' && a.contentType === 'application/zip'
+        )
+        if (traceAttachment?.path) {
+          // Convert local path to URL path
+          const tracePath = traceAttachment.path.replace(/\\/g, '/')
+          const traceFile = path.basename(tracePath)
+          if (baseUrl) {
+            // Construct trace viewer URL
+            const traceDataUrl = `${baseUrl}/data/${traceFile}`
+            traceUrl = `${baseUrl}/trace/?trace=${encodeURIComponent(traceDataUrl)}`
+          }
+        }
+      }
+
+      failures.push({
+        name: fullTestName,
+        file: file,
+        traceUrl,
+        error: failedResult?.error?.message
+      })
+    }
+  }
+
+  function processSuite(suite: Suite, parentPath: string[] = []) {
+    const suitePath = suite.title ? [...parentPath, suite.title] : parentPath
+
+    // Process tests in this suite
+    if (suite.tests) {
+      for (const test of suite.tests) {
+        processTest(test, suite.file, suitePath)
+      }
+    }
+
+    // Recursively process nested suites
+    if (suite.suites) {
+      for (const childSuite of suite.suites) {
+        processSuite(childSuite, suitePath)
+      }
+    }
+  }
+
+  if (reportData.suites) {
+    for (const suite of reportData.suites) {
+      processSuite(suite)
+    }
+  }
+
+  return failures
 }
 
 /**
  * Extract test counts from Playwright HTML report
  * @param reportDir - Path to the playwright-report directory
- * @returns Test counts { passed, failed, flaky, skipped, total }
+ * @param baseUrl - Base URL of the deployed report (for trace links)
+ * @returns Test counts { passed, failed, flaky, skipped, total, failures }
  */
-function extractTestCounts(reportDir: string): TestCounts {
+function extractTestCounts(reportDir: string, baseUrl?: string): TestCounts {
   const counts: TestCounts = {
     passed: 0,
     failed: 0,
     flaky: 0,
     skipped: 0,
-    total: 0
+    total: 0,
+    failures: []
   }
 
   try {
     // First, try to find report.json which Playwright generates with JSON reporter
     const jsonReportFile = path.join(reportDir, 'report.json')
     if (fs.existsSync(jsonReportFile)) {
-      const reportJson: ReportData = JSON.parse(
+      const reportJson: FullReportData = JSON.parse(
         fs.readFileSync(jsonReportFile, 'utf-8')
       )
       if (reportJson.stats) {
@@ -54,6 +175,12 @@ function extractTestCounts(reportDir: string): TestCounts {
         counts.failed = stats.unexpected || 0
         counts.flaky = stats.flaky || 0
         counts.skipped = stats.skipped || 0
+
+        // Extract detailed failure information
+        if (counts.failed > 0 || counts.flaky > 0) {
+          counts.failures = extractFailedTests(reportJson, baseUrl)
+        }
+
         return counts
       }
     }
@@ -169,15 +296,18 @@ function extractTestCounts(reportDir: string): TestCounts {
 
 // Main execution
 const reportDir = process.argv[2]
+const baseUrl = process.argv[3] // Optional: base URL for trace links
 
 if (!reportDir) {
-  console.error('Usage: extract-playwright-counts.ts <report-directory>')
+  console.error(
+    'Usage: extract-playwright-counts.ts <report-directory> [base-url]'
+  )
   process.exit(1)
 }
 
-const counts = extractTestCounts(reportDir)
+const counts = extractTestCounts(reportDir, baseUrl)
 
 // Output as JSON for easy parsing in shell script
-console.log(JSON.stringify(counts))
+process.stdout.write(JSON.stringify(counts) + '\n')
 
-export { extractTestCounts }
+export { extractTestCounts, extractFailedTests }
diff --git a/scripts/cicd/pr-playwright-deploy-and-comment.sh b/scripts/cicd/pr-playwright-deploy-and-comment.sh
index 840203f44a..f32a67e62e 100755
--- a/scripts/cicd/pr-playwright-deploy-and-comment.sh
+++ b/scripts/cicd/pr-playwright-deploy-and-comment.sh
@@ -2,7 +2,7 @@
 set -e
 
 # Deploy Playwright test reports to Cloudflare Pages and comment on PR
-# Usage: ./pr-playwright-deploy-and-comment.sh <pr_number> <branch_name> <status> [start_time]
+# Usage: ./pr-playwright-deploy-and-comment.sh <pr_number> <branch_name> <status>
 
 # Input validation
 # Validate PR number is numeric
@@ -31,8 +31,6 @@ case "$STATUS" in
         ;;
 esac
 
-START_TIME="${4:-$(date -u '+%m/%d/%Y, %I:%M:%S %p')}"
-
 # Required environment variables
 : "${GITHUB_TOKEN:?GITHUB_TOKEN is required}"
 : "${GITHUB_REPOSITORY:?GITHUB_REPOSITORY is required}"
@@ -134,25 +132,9 @@ post_comment() {
 
 # Main execution
 if [ "$STATUS" = "starting" ]; then
-    # Post starting comment
-    comment=$(cat <<EOF
-$COMMENT_MARKER
-## 🎭 Playwright Test Results
-
-<img alt='loading' src='https://github.com/user-attachments/assets/755c86ee-e445-4ea8-bc2c-cca85df48686' width='14px' height='14px'/> **Tests are starting...**
-
-⏰ Started at: $START_TIME UTC
-
-### 🚀 Running Tests
-- 🧪 **chromium**: Running tests...
-- 🧪 **chromium-0.5x**: Running tests...
-- 🧪 **chromium-2x**: Running tests...
-- 🧪 **mobile-chrome**: Running tests...
-
----
-⏱️ Please wait while tests are running...
-EOF
-)
+    # Post concise starting comment
+    comment="$COMMENT_MARKER
+## 🎭 Playwright: ⏳ Running..."
     post_comment "$comment"
     
 else
@@ -189,7 +171,8 @@ else
                 
                 if command -v tsx > /dev/null 2>&1 && [ -f "$EXTRACT_SCRIPT" ]; then
                     echo "Extracting counts from $REPORT_DIR using $EXTRACT_SCRIPT" >&2
-                    counts=$(tsx "$EXTRACT_SCRIPT" "$REPORT_DIR" 2>&1 || echo '{}')
+                    # Pass the base URL so we can generate trace links
+                    counts=$(tsx "$EXTRACT_SCRIPT" "$REPORT_DIR" "$url" 2>&1 || echo '{}')
                     echo "Extracted counts for $browser: $counts" >&2
                     echo "$counts" > "$temp_dir/$i.counts"
                 else
@@ -283,46 +266,70 @@ else
     done
     unset IFS
     
-    # Determine overall status
+    # Determine overall status (flaky tests are treated as passing)
     if [ $total_failed -gt 0 ]; then
         status_icon="❌"
-        status_text="Some tests failed"
-    elif [ $total_flaky -gt 0 ]; then
-        status_icon="⚠️"
-        status_text="Tests passed with flaky tests"
     elif [ $total_tests -gt 0 ]; then
         status_icon="✅"
-        status_text="All tests passed!"
     else
         status_icon="🕵🏻"
-        status_text="No test results found"
     fi
     
-    # Generate completion comment
+    # Build flaky indicator if any (small subtext, no warning icon)
+    flaky_note=""
+    if [ $total_flaky -gt 0 ]; then
+        flaky_note=" · $total_flaky flaky"
+    fi
+    
+    # Generate compact single-line comment
     comment="$COMMENT_MARKER
-## 🎭 Playwright Test Results
+## 🎭 Playwright: $status_icon $total_passed passed, $total_failed failed$flaky_note"
 
-$status_icon **$status_text**
-
-⏰ Completed at: $(date -u '+%m/%d/%Y, %I:%M:%S %p') UTC"
-
-    # Add summary counts if we have test data
-    if [ $total_tests -gt 0 ]; then
+    # Extract and display failed tests from all browsers (flaky tests are treated as passing)
+    if [ $total_failed -gt 0 ]; then
         comment="$comment
 
-### 📈 Summary
-- **Total Tests:** $total_tests
-- **Passed:** $total_passed ✅
-- **Failed:** $total_failed $([ $total_failed -gt 0 ] && echo '❌' || echo '')
-- **Flaky:** $total_flaky $([ $total_flaky -gt 0 ] && echo '⚠️' || echo '')
-- **Skipped:** $total_skipped $([ $total_skipped -gt 0 ] && echo '⏭️' || echo '')"
+### ❌ Failed Tests"
+        
+        # Process each browser's failures
+        for counts_json in "${counts_array[@]}"; do
+            [ -z "$counts_json" ] || [ "$counts_json" = "{}" ] && continue
+            
+            if command -v jq > /dev/null 2>&1; then
+                # Extract failures array from JSON
+                failures=$(echo "$counts_json" | jq -r '.failures // [] | .[]? | "\(.name)|\(.file)|\(.traceUrl // "")"')
+                
+                if [ -n "$failures" ]; then
+                    while IFS='|' read -r test_name test_file trace_url; do
+                        [ -z "$test_name" ] && continue
+                        
+                        # Convert file path to GitHub URL (relative to repo root)
+                        github_file_url="https://github.com/$GITHUB_REPOSITORY/blob/$GITHUB_SHA/$test_file"
+                        
+                        # Build the failed test line
+                        test_line="- [$test_name]($github_file_url)"
+                        
+                        if [ -n "$trace_url" ] && [ "$trace_url" != "null" ]; then
+                            test_line="$test_line: [View trace]($trace_url)"
+                        fi
+                        
+                        comment="$comment
+$test_line"
+                    done <<< "$failures"
+                fi
+            fi
+        done
     fi
     
+    # Add browser reports in collapsible section
     comment="$comment
 
-### 📊 Test Reports by Browser"
+<details>
+<summary>📊 Browser Reports</summary>
+
+"
     
-    # Add browser results with individual counts
+    # Add browser results
     i=0
     IFS=' ' read -r -a browser_array <<< "$BROWSERS"
     IFS=' ' read -r -a url_array <<< "$urls"
@@ -349,7 +356,7 @@ $status_icon **$status_text**
                 fi
                 
                 if [ -n "$b_total" ] && [ "$b_total" != "0" ]; then
-                    counts_str=" • ✅ $b_passed / ❌ $b_failed / ⚠️ $b_flaky / ⏭️ $b_skipped"
+                    counts_str=" (✅ $b_passed / ❌ $b_failed / ⚠️ $b_flaky / ⏭️ $b_skipped)"
                 else
                     counts_str=""
                 fi
@@ -358,10 +365,10 @@ $status_icon **$status_text**
             fi
             
             comment="$comment
-- ✅ **${browser}**: [View Report](${url})${counts_str}"
+- **${browser}**: [View Report](${url})${counts_str}"
         else
             comment="$comment
-- ❌ **${browser}**: Deployment failed"
+- **${browser}**: ❌ Deployment failed"
         fi
         i=$((i + 1))
     done
@@ -369,8 +376,7 @@ $status_icon **$status_text**
     
     comment="$comment
 
----
-🎉 Click on the links above to view detailed test results for each browser configuration."
+</details>"
     
     post_comment "$comment"
 fi
diff --git a/scripts/cicd/pr-storybook-deploy-and-comment.sh b/scripts/cicd/pr-storybook-deploy-and-comment.sh
index a2a1d37e96..2b2051737c 100755
--- a/scripts/cicd/pr-storybook-deploy-and-comment.sh
+++ b/scripts/cicd/pr-storybook-deploy-and-comment.sh
@@ -2,7 +2,7 @@
 set -e
 
 # Deploy Storybook to Cloudflare Pages and comment on PR
-# Usage: ./pr-storybook-deploy-and-comment.sh <pr_number> <branch_name> <status> [start_time]
+# Usage: ./pr-storybook-deploy-and-comment.sh <pr_number> <branch_name> <status>
 
 # Input validation
 # Validate PR number is numeric
@@ -31,7 +31,6 @@ case "$STATUS" in
         ;;
 esac
 
-START_TIME="${4:-$(date -u '+%m/%d/%Y, %I:%M:%S %p')}"
 
 # Required environment variables
 : "${GITHUB_TOKEN:?GITHUB_TOKEN is required}"
@@ -120,50 +119,9 @@ post_comment() {
 
 # Main execution
 if [ "$STATUS" = "starting" ]; then
-    # Check if this is a version-bump branch
-    IS_VERSION_BUMP="false"
-    if echo "$BRANCH_NAME" | grep -q "^version-bump-"; then
-        IS_VERSION_BUMP="true"
-    fi
-    
-    # Post starting comment with appropriate message
-    if [ "$IS_VERSION_BUMP" = "true" ]; then
-        comment=$(cat <<EOF
-$COMMENT_MARKER
-## 🎨 Storybook Build Status
-
-<img alt='loading' src='https://github.com/user-attachments/assets/755c86ee-e445-4ea8-bc2c-cca85df48686' width='14px' height='14px'/> **Build is starting...**
-
-⏰ Started at: $START_TIME UTC
-
-### 🚀 Building Storybook
-- 📦 Installing dependencies...
-- 🔧 Building Storybook components...
-- 🎨 Running Chromatic visual tests...
-
----
-⏱️ Please wait while the Storybook build is in progress...
-EOF
-)
-    else
-        comment=$(cat <<EOF
-$COMMENT_MARKER
-## 🎨 Storybook Build Status
-
-<img alt='loading' src='https://github.com/user-attachments/assets/755c86ee-e445-4ea8-bc2c-cca85df48686' width='14px' height='14px'/> **Build is starting...**
-
-⏰ Started at: $START_TIME UTC
-
-### 🚀 Building Storybook
-- 📦 Installing dependencies...
-- 🔧 Building Storybook components...
-- 🌐 Preparing deployment to Cloudflare Pages...
-
----
-⏱️ Please wait while the Storybook build is in progress...
-EOF
-)
-    fi
+    # Post starting comment
+    comment="$COMMENT_MARKER
+## 🎨 Storybook: <img alt='loading' src='https://github.com/user-attachments/assets/755c86ee-e445-4ea8-bc2c-cca85df48686' width='14px' height='14px'/> Building..."
     post_comment "$comment"
     
 elif [ "$STATUS" = "completed" ]; then
@@ -192,56 +150,57 @@ elif [ "$STATUS" = "completed" ]; then
     WORKFLOW_CONCLUSION="${WORKFLOW_CONCLUSION:-success}"
     WORKFLOW_URL="${WORKFLOW_URL:-}"
     
-    # Generate completion comment based on conclusion
+    # Generate compact header based on conclusion
     if [ "$WORKFLOW_CONCLUSION" = "success" ]; then
         status_icon="✅"
-        status_text="Build completed successfully!"
-        footer_text="🎉 Your Storybook is ready for review!"
+        status_text="Built"
     elif [ "$WORKFLOW_CONCLUSION" = "skipped" ]; then
         status_icon="⏭️"
-        status_text="Build skipped."
-        footer_text="ℹ️ Chromatic was skipped for this PR."
+        status_text="Skipped"
     elif [ "$WORKFLOW_CONCLUSION" = "cancelled" ]; then
         status_icon="🚫"
-        status_text="Build cancelled."
-        footer_text="ℹ️ The Chromatic run was cancelled."
+        status_text="Cancelled"
     else
         status_icon="❌"
-        status_text="Build failed!"
-        footer_text="⚠️ Please check the workflow logs for error details."
+        status_text="Failed"
     fi
-    
-    comment="$COMMENT_MARKER
-## 🎨 Storybook Build Status
 
-$status_icon **$status_text**
+    # Build compact header with optional storybook link
+    header="## 🎨 Storybook: $status_icon $status_text"
+    if [ "$deployment_url" != "Not deployed" ] && [ "$deployment_url" != "Deployment failed" ] && [ "$WORKFLOW_CONCLUSION" = "success" ]; then
+        header="$header — $deployment_url"
+    fi
+
+    # Build details section
+    details="<details>
+<summary>Details</summary>
 
 ⏰ Completed at: $(date -u '+%m/%d/%Y, %I:%M:%S %p') UTC
 
-### 🔗 Links
+**Links**
 - [📊 View Workflow Run]($WORKFLOW_URL)"
-    
-    # Add deployment status
+
     if [ "$deployment_url" != "Not deployed" ]; then
         if [ "$deployment_url" = "Deployment failed" ]; then
-            comment="$comment
+            details="$details
 - ❌ Storybook deployment failed"
-        elif [ "$WORKFLOW_CONCLUSION" = "success" ]; then
-            comment="$comment
-- 🎨 $deployment_url"
-        else
-            comment="$comment
-- ⚠️ Build failed - $deployment_url"
+        elif [ "$WORKFLOW_CONCLUSION" != "success" ]; then
+            details="$details
+- ⚠️ Build failed — $deployment_url"
         fi
     elif [ "$WORKFLOW_CONCLUSION" != "success" ]; then
-        comment="$comment
+        details="$details
 - ⏭️ Storybook deployment skipped (build did not succeed)"
     fi
-    
-    comment="$comment
 
----
-$footer_text"
+    details="$details
+
+</details>"
+
+    comment="$COMMENT_MARKER
+$header
+
+$details"
     
     post_comment "$comment"
 fi
\ No newline at end of file
diff --git a/scripts/collect-i18n-general.ts b/scripts/collect-i18n-general.ts
index 5165e89bef..42ca568a8a 100644
--- a/scripts/collect-i18n-general.ts
+++ b/scripts/collect-i18n-general.ts
@@ -11,7 +11,7 @@ import {
 } from '../packages/shared-frontend-utils/src/formatUtil'
 import { CORE_MENU_COMMANDS } from '../src/constants/coreMenuCommands'
 import { SERVER_CONFIG_ITEMS } from '../src/constants/serverConfig'
-import type { FormItem, SettingParams } from '../src/platform/settings/types'
+import type { SettingParams } from '../src/platform/settings/types'
 import type { ComfyCommandImpl } from '../src/stores/commandStore'
 
 const localePath = './src/locales/en/main.json'
@@ -123,8 +123,8 @@ test('collect-i18n-general', async ({ comfyPage }) => {
     SERVER_CONFIG_ITEMS.map((config) => [
       normalizeI18nKey(config.id),
       {
-        name: (config as unknown as FormItem).name,
-        tooltip: (config as unknown as FormItem).tooltip
+        name: config.name,
+        tooltip: config.tooltip
       }
     ])
   )
diff --git a/scripts/diff-i18n.ts b/scripts/diff-i18n.ts
index 7b4ff8da11..cf71177aa2 100644
--- a/scripts/diff-i18n.ts
+++ b/scripts/diff-i18n.ts
@@ -7,6 +7,7 @@ import {
   writeFileSync
 } from 'fs'
 import { dirname, join } from 'path'
+import type { LocaleData } from './i18n-types'
 
 // Ensure directories exist
 function ensureDir(dir: string) {
@@ -41,8 +42,8 @@ function getAllJsonFiles(dir: string): string[] {
 }
 
 // Find additions in new object compared to base
-function findAdditions(base: any, updated: any): Record<string, any> {
-  const additions: Record<string, any> = {}
+function findAdditions(base: LocaleData, updated: LocaleData): LocaleData {
+  const additions: LocaleData = {}
 
   for (const key in updated) {
     if (!(key in base)) {
@@ -74,7 +75,7 @@ function capture(srcLocaleDir: string, tempBaseDir: string) {
     ensureDir(dirname(targetPath))
     writeFileSync(targetPath, readFileSync(file, 'utf8'))
   }
-  console.log('Captured current locale files to temp/base/')
+  console.warn('Captured current locale files to temp/base/')
 }
 
 // Diff command
@@ -94,7 +95,7 @@ function diff(srcLocaleDir: string, tempBaseDir: string, tempDiffDir: string) {
     if (Object.keys(additions).length > 0) {
       ensureDir(dirname(diffPath))
       writeFileSync(diffPath, JSON.stringify(additions, null, 2))
-      console.log(`Wrote diff to ${diffPath}`)
+      console.warn(`Wrote diff to ${diffPath}`)
     }
   }
 }
@@ -116,9 +117,9 @@ switch (command) {
     // Remove temp directory recursively
     if (existsSync('temp')) {
       rmSync('temp', { recursive: true, force: true })
-      console.log('Removed temp directory')
+      console.warn('Removed temp directory')
     }
     break
   default:
-    console.log('Please specify either "capture" or "diff" command')
+    console.error('Please specify either "capture" or "diff" command')
 }
diff --git a/scripts/i18n-types.ts b/scripts/i18n-types.ts
new file mode 100644
index 0000000000..5a64c1dbe4
--- /dev/null
+++ b/scripts/i18n-types.ts
@@ -0,0 +1,5 @@
+/**
+ * Shared types for i18n-related scripts
+ */
+
+export type LocaleData = { [key: string]: string | LocaleData }
diff --git a/scripts/perf-report.ts b/scripts/perf-report.ts
new file mode 100644
index 0000000000..5967c5a59c
--- /dev/null
+++ b/scripts/perf-report.ts
@@ -0,0 +1,311 @@
+import { existsSync, readFileSync, readdirSync } from 'node:fs'
+import { join } from 'node:path'
+
+import type { MetricStats } from './perf-stats'
+import {
+  classifyChange,
+  computeStats,
+  formatSignificance,
+  isNoteworthy,
+  zScore
+} from './perf-stats'
+
+interface PerfMeasurement {
+  name: string
+  durationMs: number
+  styleRecalcs: number
+  styleRecalcDurationMs: number
+  layouts: number
+  layoutDurationMs: number
+  taskDurationMs: number
+  heapDeltaBytes: number
+}
+
+interface PerfReport {
+  timestamp: string
+  gitSha: string
+  branch: string
+  measurements: PerfMeasurement[]
+}
+
+const CURRENT_PATH = 'test-results/perf-metrics.json'
+const BASELINE_PATH = 'temp/perf-baseline/perf-metrics.json'
+const HISTORY_DIR = 'temp/perf-history'
+
+type MetricKey = 'styleRecalcs' | 'layouts' | 'taskDurationMs'
+const REPORTED_METRICS: { key: MetricKey; label: string; unit: string }[] = [
+  { key: 'styleRecalcs', label: 'style recalcs', unit: '' },
+  { key: 'layouts', label: 'layouts', unit: '' },
+  { key: 'taskDurationMs', label: 'task duration', unit: 'ms' }
+]
+
+function groupByName(
+  measurements: PerfMeasurement[]
+): Map<string, PerfMeasurement[]> {
+  const map = new Map<string, PerfMeasurement[]>()
+  for (const m of measurements) {
+    const list = map.get(m.name) ?? []
+    list.push(m)
+    map.set(m.name, list)
+  }
+  return map
+}
+
+function loadHistoricalReports(): PerfReport[] {
+  if (!existsSync(HISTORY_DIR)) return []
+  const reports: PerfReport[] = []
+  for (const dir of readdirSync(HISTORY_DIR)) {
+    const filePath = join(HISTORY_DIR, dir, 'perf-metrics.json')
+    if (!existsSync(filePath)) continue
+    try {
+      reports.push(JSON.parse(readFileSync(filePath, 'utf-8')) as PerfReport)
+    } catch {
+      console.warn(`Skipping malformed perf history: ${filePath}`)
+    }
+  }
+  return reports
+}
+
+function getHistoricalStats(
+  reports: PerfReport[],
+  testName: string,
+  metric: MetricKey
+): MetricStats {
+  const values: number[] = []
+  for (const r of reports) {
+    const group = groupByName(r.measurements)
+    const samples = group.get(testName)
+    if (samples) {
+      const mean =
+        samples.reduce((sum, s) => sum + s[metric], 0) / samples.length
+      values.push(mean)
+    }
+  }
+  return computeStats(values)
+}
+
+function computeCV(stats: MetricStats): number {
+  return stats.mean > 0 ? (stats.stddev / stats.mean) * 100 : 0
+}
+
+function formatValue(value: number, unit: string): string {
+  return unit === 'ms' ? `${value.toFixed(0)}ms` : `${value.toFixed(0)}`
+}
+
+function formatDelta(pct: number | null): string {
+  if (pct === null) return '—'
+  const sign = pct >= 0 ? '+' : ''
+  return `${sign}${pct.toFixed(0)}%`
+}
+
+function meanMetric(samples: PerfMeasurement[], key: MetricKey): number {
+  return samples.reduce((sum, s) => sum + s[key], 0) / samples.length
+}
+
+function formatBytes(bytes: number): string {
+  if (Math.abs(bytes) < 1024) return `${bytes} B`
+  if (Math.abs(bytes) < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`
+  return `${(bytes / (1024 * 1024)).toFixed(1)} MB`
+}
+
+function renderFullReport(
+  prGroups: Map<string, PerfMeasurement[]>,
+  baseline: PerfReport,
+  historical: PerfReport[]
+): string[] {
+  const lines: string[] = []
+  const baselineGroups = groupByName(baseline.measurements)
+  const tableHeader = [
+    '| Metric | Baseline | PR (n=3) | Δ | Sig |',
+    '|--------|----------|----------|---|-----|'
+  ]
+
+  const flaggedRows: string[] = []
+  const allRows: string[] = []
+
+  for (const [testName, prSamples] of prGroups) {
+    const baseSamples = baselineGroups.get(testName)
+
+    for (const { key, label, unit } of REPORTED_METRICS) {
+      const prValues = prSamples.map((s) => s[key])
+      const prMean = prValues.reduce((a, b) => a + b, 0) / prValues.length
+      const histStats = getHistoricalStats(historical, testName, key)
+      const cv = computeCV(histStats)
+
+      if (!baseSamples?.length) {
+        allRows.push(
+          `| ${testName}: ${label} | — | ${formatValue(prMean, unit)} | new | — |`
+        )
+        continue
+      }
+
+      const baseVal = meanMetric(baseSamples, key)
+      const deltaPct =
+        baseVal === 0
+          ? prMean === 0
+            ? 0
+            : null
+          : ((prMean - baseVal) / baseVal) * 100
+      const z = zScore(prMean, histStats)
+      const sig = classifyChange(z, cv)
+
+      const row = `| ${testName}: ${label} | ${formatValue(baseVal, unit)} | ${formatValue(prMean, unit)} | ${formatDelta(deltaPct)} | ${formatSignificance(sig, z)} |`
+      allRows.push(row)
+      if (isNoteworthy(sig)) {
+        flaggedRows.push(row)
+      }
+    }
+  }
+
+  if (flaggedRows.length > 0) {
+    lines.push(
+      `⚠️ **${flaggedRows.length} regression${flaggedRows.length > 1 ? 's' : ''} detected**`,
+      '',
+      ...tableHeader,
+      ...flaggedRows,
+      ''
+    )
+  } else {
+    lines.push('No regressions detected.', '')
+  }
+
+  lines.push(
+    `<details><summary>All metrics</summary>`,
+    '',
+    ...tableHeader,
+    ...allRows,
+    '',
+    '</details>',
+    ''
+  )
+
+  lines.push(
+    `<details><summary>Historical variance (last ${historical.length} runs)</summary>`,
+    '',
+    '| Metric | μ | σ | CV |',
+    '|--------|---|---|-----|'
+  )
+  for (const [testName] of prGroups) {
+    for (const { key, label, unit } of REPORTED_METRICS) {
+      const stats = getHistoricalStats(historical, testName, key)
+      if (stats.n < 2) continue
+      const cv = computeCV(stats)
+      lines.push(
+        `| ${testName}: ${label} | ${formatValue(stats.mean, unit)} | ${formatValue(stats.stddev, unit)} | ${cv.toFixed(1)}% |`
+      )
+    }
+  }
+  lines.push('', '</details>')
+
+  return lines
+}
+
+function renderColdStartReport(
+  prGroups: Map<string, PerfMeasurement[]>,
+  baseline: PerfReport,
+  historicalCount: number
+): string[] {
+  const lines: string[] = []
+  const baselineGroups = groupByName(baseline.measurements)
+  lines.push(
+    `> ℹ️ Collecting baseline variance data (${historicalCount}/5 runs). Significance will appear after 2 main branch runs.`,
+    '',
+    '| Metric | Baseline | PR | Δ |',
+    '|--------|----------|-----|---|'
+  )
+
+  for (const [testName, prSamples] of prGroups) {
+    const baseSamples = baselineGroups.get(testName)
+
+    for (const { key, label, unit } of REPORTED_METRICS) {
+      const prValues = prSamples.map((s) => s[key])
+      const prMean = prValues.reduce((a, b) => a + b, 0) / prValues.length
+
+      if (!baseSamples?.length) {
+        lines.push(
+          `| ${testName}: ${label} | — | ${formatValue(prMean, unit)} | new |`
+        )
+        continue
+      }
+
+      const baseVal = meanMetric(baseSamples, key)
+      const deltaPct =
+        baseVal === 0
+          ? prMean === 0
+            ? 0
+            : null
+          : ((prMean - baseVal) / baseVal) * 100
+      lines.push(
+        `| ${testName}: ${label} | ${formatValue(baseVal, unit)} | ${formatValue(prMean, unit)} | ${formatDelta(deltaPct)} |`
+      )
+    }
+  }
+
+  return lines
+}
+
+function renderNoBaselineReport(
+  prGroups: Map<string, PerfMeasurement[]>
+): string[] {
+  const lines: string[] = []
+  lines.push(
+    'No baseline found — showing absolute values.\n',
+    '| Metric | Value |',
+    '|--------|-------|'
+  )
+  for (const [testName, prSamples] of prGroups) {
+    const prMean = (key: MetricKey) =>
+      prSamples.reduce((sum, s) => sum + s[key], 0) / prSamples.length
+
+    lines.push(
+      `| ${testName}: style recalcs | ${prMean('styleRecalcs').toFixed(0)} |`
+    )
+    lines.push(`| ${testName}: layouts | ${prMean('layouts').toFixed(0)} |`)
+    lines.push(
+      `| ${testName}: task duration | ${prMean('taskDurationMs').toFixed(0)}ms |`
+    )
+    const heapMean =
+      prSamples.reduce((sum, s) => sum + s.heapDeltaBytes, 0) / prSamples.length
+    lines.push(`| ${testName}: heap delta | ${formatBytes(heapMean)} |`)
+  }
+  return lines
+}
+
+function main() {
+  if (!existsSync(CURRENT_PATH)) {
+    process.stdout.write(
+      '## ⚡ Performance Report\n\nNo perf metrics found. Perf tests may not have run.\n'
+    )
+    process.exit(0)
+  }
+
+  const current: PerfReport = JSON.parse(readFileSync(CURRENT_PATH, 'utf-8'))
+
+  const baseline: PerfReport | null = existsSync(BASELINE_PATH)
+    ? JSON.parse(readFileSync(BASELINE_PATH, 'utf-8'))
+    : null
+
+  const historical = loadHistoricalReports()
+  const prGroups = groupByName(current.measurements)
+
+  const lines: string[] = []
+  lines.push('## ⚡ Performance Report\n')
+
+  if (baseline && historical.length >= 2) {
+    lines.push(...renderFullReport(prGroups, baseline, historical))
+  } else if (baseline) {
+    lines.push(...renderColdStartReport(prGroups, baseline, historical.length))
+  } else {
+    lines.push(...renderNoBaselineReport(prGroups))
+  }
+
+  lines.push('\n<details><summary>Raw data</summary>\n')
+  lines.push('```json')
+  lines.push(JSON.stringify(current, null, 2))
+  lines.push('```')
+  lines.push('\n</details>')
+
+  process.stdout.write(lines.join('\n') + '\n')
+}
+
+main()
diff --git a/scripts/perf-stats.test.ts b/scripts/perf-stats.test.ts
new file mode 100644
index 0000000000..e78340f1a5
--- /dev/null
+++ b/scripts/perf-stats.test.ts
@@ -0,0 +1,133 @@
+import { describe, expect, it } from 'vitest'
+
+import {
+  classifyChange,
+  computeStats,
+  formatSignificance,
+  isNoteworthy,
+  zScore
+} from './perf-stats'
+
+describe('computeStats', () => {
+  it('returns zeros for empty array', () => {
+    const stats = computeStats([])
+    expect(stats).toEqual({ mean: 0, stddev: 0, min: 0, max: 0, n: 0 })
+  })
+
+  it('returns value with zero stddev for single element', () => {
+    const stats = computeStats([42])
+    expect(stats).toEqual({ mean: 42, stddev: 0, min: 42, max: 42, n: 1 })
+  })
+
+  it('computes correct stats for known values', () => {
+    // Values: [2, 4, 4, 4, 5, 5, 7, 9]
+    // Mean = 5, sample variance ≈ 4.57, sample stddev ≈ 2.14
+    const stats = computeStats([2, 4, 4, 4, 5, 5, 7, 9])
+    expect(stats.mean).toBe(5)
+    expect(stats.stddev).toBeCloseTo(2.138, 2)
+    expect(stats.min).toBe(2)
+    expect(stats.max).toBe(9)
+    expect(stats.n).toBe(8)
+  })
+
+  it('uses sample stddev (n-1 denominator)', () => {
+    // [10, 20] → mean=15, variance=(25+25)/1=50, stddev≈7.07
+    const stats = computeStats([10, 20])
+    expect(stats.mean).toBe(15)
+    expect(stats.stddev).toBeCloseTo(7.071, 2)
+    expect(stats.n).toBe(2)
+  })
+
+  it('handles identical values', () => {
+    const stats = computeStats([5, 5, 5, 5])
+    expect(stats.mean).toBe(5)
+    expect(stats.stddev).toBe(0)
+  })
+})
+
+describe('zScore', () => {
+  it('returns null when stddev is 0', () => {
+    const stats = computeStats([5, 5, 5])
+    expect(zScore(10, stats)).toBeNull()
+  })
+
+  it('returns null when n < 2', () => {
+    const stats = computeStats([5])
+    expect(zScore(10, stats)).toBeNull()
+  })
+
+  it('computes correct z-score', () => {
+    const stats = { mean: 100, stddev: 10, min: 80, max: 120, n: 5 }
+    expect(zScore(120, stats)).toBe(2)
+    expect(zScore(80, stats)).toBe(-2)
+    expect(zScore(100, stats)).toBe(0)
+  })
+})
+
+describe('classifyChange', () => {
+  it('returns noisy when CV > 50%', () => {
+    expect(classifyChange(3, 60)).toBe('noisy')
+    expect(classifyChange(-3, 51)).toBe('noisy')
+  })
+
+  it('does not classify as noisy when CV is exactly 50%', () => {
+    expect(classifyChange(3, 50)).toBe('regression')
+    expect(classifyChange(-3, 50)).toBe('improvement')
+  })
+
+  it('returns neutral when z is null', () => {
+    expect(classifyChange(null, 10)).toBe('neutral')
+  })
+
+  it('returns regression when z > 2', () => {
+    expect(classifyChange(2.1, 10)).toBe('regression')
+    expect(classifyChange(5, 10)).toBe('regression')
+  })
+
+  it('returns improvement when z < -2', () => {
+    expect(classifyChange(-2.1, 10)).toBe('improvement')
+    expect(classifyChange(-5, 10)).toBe('improvement')
+  })
+
+  it('returns neutral when z is within [-2, 2]', () => {
+    expect(classifyChange(0, 10)).toBe('neutral')
+    expect(classifyChange(1.9, 10)).toBe('neutral')
+    expect(classifyChange(-1.9, 10)).toBe('neutral')
+    expect(classifyChange(2, 10)).toBe('neutral')
+    expect(classifyChange(-2, 10)).toBe('neutral')
+  })
+})
+
+describe('formatSignificance', () => {
+  it('formats regression with z-score and emoji', () => {
+    expect(formatSignificance('regression', 3.2)).toBe('⚠️ z=3.2')
+  })
+
+  it('formats improvement with z-score without emoji', () => {
+    expect(formatSignificance('improvement', -2.5)).toBe('z=-2.5')
+  })
+
+  it('formats noisy as descriptive text', () => {
+    expect(formatSignificance('noisy', null)).toBe('variance too high')
+  })
+
+  it('formats neutral with z-score without emoji', () => {
+    expect(formatSignificance('neutral', 0.5)).toBe('z=0.5')
+  })
+
+  it('formats neutral without z-score as dash', () => {
+    expect(formatSignificance('neutral', null)).toBe('—')
+  })
+})
+
+describe('isNoteworthy', () => {
+  it('returns true for regressions', () => {
+    expect(isNoteworthy('regression')).toBe(true)
+  })
+
+  it('returns false for non-regressions', () => {
+    expect(isNoteworthy('improvement')).toBe(false)
+    expect(isNoteworthy('neutral')).toBe(false)
+    expect(isNoteworthy('noisy')).toBe(false)
+  })
+})
diff --git a/scripts/perf-stats.ts b/scripts/perf-stats.ts
new file mode 100644
index 0000000000..1aab994521
--- /dev/null
+++ b/scripts/perf-stats.ts
@@ -0,0 +1,63 @@
+export interface MetricStats {
+  mean: number
+  stddev: number
+  min: number
+  max: number
+  n: number
+}
+
+export function computeStats(values: number[]): MetricStats {
+  const n = values.length
+  if (n === 0) return { mean: 0, stddev: 0, min: 0, max: 0, n: 0 }
+  if (n === 1)
+    return { mean: values[0], stddev: 0, min: values[0], max: values[0], n: 1 }
+
+  const mean = values.reduce((a, b) => a + b, 0) / n
+  const variance = values.reduce((sum, v) => sum + (v - mean) ** 2, 0) / (n - 1)
+
+  return {
+    mean,
+    stddev: Math.sqrt(variance),
+    min: Math.min(...values),
+    max: Math.max(...values),
+    n
+  }
+}
+
+export function zScore(value: number, stats: MetricStats): number | null {
+  if (stats.stddev === 0 || stats.n < 2) return null
+  return (value - stats.mean) / stats.stddev
+}
+
+export type Significance = 'regression' | 'improvement' | 'neutral' | 'noisy'
+
+export function classifyChange(
+  z: number | null,
+  historicalCV: number
+): Significance {
+  if (historicalCV > 50) return 'noisy'
+  if (z === null) return 'neutral'
+  if (z > 2) return 'regression'
+  if (z < -2) return 'improvement'
+  return 'neutral'
+}
+
+export function formatSignificance(
+  sig: Significance,
+  z: number | null
+): string {
+  switch (sig) {
+    case 'regression':
+      return `⚠️ z=${z!.toFixed(1)}`
+    case 'improvement':
+      return `z=${z!.toFixed(1)}`
+    case 'noisy':
+      return 'variance too high'
+    case 'neutral':
+      return z !== null ? `z=${z.toFixed(1)}` : '—'
+  }
+}
+
+export function isNoteworthy(sig: Significance): boolean {
+  return sig === 'regression'
+}
diff --git a/scripts/size-report.js b/scripts/size-report.js
index b6d2a0d6ae..9c6ce83b8e 100644
--- a/scripts/size-report.js
+++ b/scripts/size-report.js
@@ -175,15 +175,9 @@ async function buildBundleReport() {
  * @returns {string}
  */
 function renderReport(report) {
-  const parts = ['## Bundle Size Report\n']
-
-  parts.push(renderSummary(report))
+  const parts = [renderCompactHeader(report)]
 
   if (report.categories.length > 0) {
-    const glance = renderCategoryGlance(report)
-    if (glance) {
-      parts.push('\n' + glance)
-    }
     parts.push('\n' + renderCategoryDetails(report))
   }
 
@@ -195,6 +189,24 @@ function renderReport(report) {
   )
 }
 
+/**
+ * Render compact single-line header with key metrics
+ * @param {BundleReport} report
+ * @returns {string}
+ */
+function renderCompactHeader(report) {
+  const { overall, hasBaseline } = report
+
+  const gzipSize = prettyBytes(overall.metrics.current.gzip)
+  let header = `## 📦 Bundle: ${gzipSize} gzip`
+
+  if (hasBaseline) {
+    header += ` ${formatDiffIndicator(overall.metrics.diff.gzip)}`
+  }
+
+  return header
+}
+
 /**
  * Render overall summary bullets
  * @param {BundleReport} report
@@ -310,7 +322,16 @@ function renderCategoryGlance(report) {
  * @returns {string}
  */
 function renderCategoryDetails(report) {
-  const lines = ['<details>', '<summary>Per-category breakdown</summary>', '']
+  const lines = ['<details>', '<summary>Details</summary>', '']
+
+  lines.push(renderSummary(report))
+  lines.push('')
+
+  const glance = renderCategoryGlance(report)
+  if (glance) {
+    lines.push(glance)
+    lines.push('')
+  }
 
   for (const category of report.categories) {
     lines.push(renderCategoryBlock(category, report.hasBaseline))
diff --git a/scripts/tsconfig.json b/scripts/tsconfig.json
index 789e142b8d..c6e485ef40 100644
--- a/scripts/tsconfig.json
+++ b/scripts/tsconfig.json
@@ -8,7 +8,5 @@
     "noUnusedParameters": true,
     "resolveJsonModule": true
   },
-  "include": [
-    "**/*.ts"
-  ]
-}
\ No newline at end of file
+  "include": ["**/*.ts"]
+}
diff --git a/scripts/vite-define-shim.ts b/scripts/vite-define-shim.ts
index e12b126f32..970d09aef0 100644
--- a/scripts/vite-define-shim.ts
+++ b/scripts/vite-define-shim.ts
@@ -12,6 +12,7 @@ declare global {
   const __ALGOLIA_API_KEY__: string
   const __USE_PROD_CONFIG__: boolean
   const __DISTRIBUTION__: 'desktop' | 'localhost' | 'cloud'
+  const __IS_NIGHTLY__: boolean
 }
 
 type GlobalWithDefines = typeof globalThis & {
@@ -22,6 +23,7 @@ type GlobalWithDefines = typeof globalThis & {
   __ALGOLIA_API_KEY__: string
   __USE_PROD_CONFIG__: boolean
   __DISTRIBUTION__: 'desktop' | 'localhost' | 'cloud'
+  __IS_NIGHTLY__: boolean
   window?: Record<string, unknown>
 }
 
@@ -36,6 +38,7 @@ globalWithDefines.__ALGOLIA_APP_ID__ = ''
 globalWithDefines.__ALGOLIA_API_KEY__ = ''
 globalWithDefines.__USE_PROD_CONFIG__ = false
 globalWithDefines.__DISTRIBUTION__ = 'localhost'
+globalWithDefines.__IS_NIGHTLY__ = false
 
 // Provide a minimal window shim for Node environment
 // This is needed for code that checks window existence during imports
diff --git a/scripts/zipdist.js b/scripts/zipdist.js
index 383fa774aa..4f944c7f85 100644
--- a/scripts/zipdist.js
+++ b/scripts/zipdist.js
@@ -1,9 +1,14 @@
 import zipdir from 'zip-dir'
 
-zipdir('./dist', { saveTo: './dist.zip' }, function (err, buffer) {
+const sourceDir = process.argv[2] || './dist'
+const outputPath = process.argv[3] || './dist.zip'
+
+zipdir(sourceDir, { saveTo: outputPath }, function (err, buffer) {
   if (err) {
-    console.error('Error zipping "dist" directory:', err)
+    console.error(`Error zipping "${sourceDir}" directory:`, err)
   } else {
-    console.log('Successfully zipped "dist" directory.')
+    process.stdout.write(
+      `Successfully zipped "${sourceDir}" directory to "${outputPath}".\n`
+    )
   }
 })
diff --git a/src/AGENTS.md b/src/AGENTS.md
new file mode 100644
index 0000000000..2769482546
--- /dev/null
+++ b/src/AGENTS.md
@@ -0,0 +1,27 @@
+# Source Code Guidelines
+
+## Error Handling
+
+- User-friendly and actionable messages
+- Proper error propagation
+
+## Security
+
+- Sanitize HTML with DOMPurify
+- Validate trusted sources
+- Never log secrets
+
+## State Management (Stores)
+
+- Follow domain-driven design for organizing files/folders
+- Clear public interfaces
+- Restrict extension access
+- Clean up subscriptions
+- Only expose state/actions that are used externally; keep internal state private
+
+## General Guidelines
+
+- Use `es-toolkit` for utility functions
+- Use TypeScript for type safety
+- Avoid `@ts-expect-error` - fix the underlying issue
+- Use `vue-i18n` for ALL user-facing strings (`src/locales/en/main.json`)
diff --git a/src/App.vue b/src/App.vue
index 6b7c56be07..d8f25a1bf3 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,40 +1,35 @@
 <template>
   <router-view />
-  <ProgressSpinner
-    v-if="isLoading"
-    class="absolute inset-0 flex h-[unset] items-center justify-center"
-  />
   <GlobalDialog />
   <BlockUI full-screen :blocked="isLoading" />
+  <div
+    v-if="isLoading"
+    class="pointer-events-none fixed inset-0 z-1200 flex items-center justify-center"
+  >
+    <LogoComfyWaveLoader size="xl" color="yellow" />
+  </div>
 </template>
 
 <script setup lang="ts">
-import { useEventListener } from '@vueuse/core'
+import { captureException } from '@sentry/vue'
 import BlockUI from 'primevue/blockui'
-import ProgressSpinner from 'primevue/progressspinner'
 import { computed, onMounted } from 'vue'
 
+import LogoComfyWaveLoader from '@/components/loader/LogoComfyWaveLoader.vue'
 import GlobalDialog from '@/components/dialog/GlobalDialog.vue'
 import config from '@/config'
-import { t } from '@/i18n'
-import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
-import { app } from '@/scripts/app'
-import { useDialogService } from '@/services/dialogService'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
 import { useConflictDetection } from '@/workbench/extensions/manager/composables/useConflictDetection'
 
-import { electronAPI, isElectron } from './utils/envUtil'
+import { electronAPI } from '@/utils/envUtil'
+import { isDesktop } from '@/platform/distribution/types'
+import { app } from '@/scripts/app'
 
 const workspaceStore = useWorkspaceStore()
+app.extensionManager = useWorkspaceStore()
+
 const conflictDetection = useConflictDetection()
-const workflowStore = useWorkflowStore()
-const dialogService = useDialogService()
 const isLoading = computed<boolean>(() => workspaceStore.spinner)
-const handleKey = (e: KeyboardEvent) => {
-  workspaceStore.shiftDown = e.shiftKey
-}
-useEventListener(window, 'keydown', handleKey)
-useEventListener(window, 'keyup', handleKey)
 
 const showContextMenu = (event: MouseEvent) => {
   const { target } = event
@@ -50,27 +45,20 @@ const showContextMenu = (event: MouseEvent) => {
 onMounted(() => {
   window['__COMFYUI_FRONTEND_VERSION__'] = config.app_version
 
-  if (isElectron()) {
+  if (isDesktop) {
     document.addEventListener('contextmenu', showContextMenu)
   }
 
-  // Handle Vite preload errors (e.g., when assets are deleted after deployment)
-  window.addEventListener('vite:preloadError', async (_event) => {
-    // Auto-reload if app is not ready or there are no unsaved changes
-    if (!app.vueAppReady || !workflowStore.activeWorkflow?.isModified) {
-      window.location.reload()
+  // Handle preload errors that occur during dynamic imports (e.g., stale chunks after deployment)
+  // See: https://vite.dev/guide/build#load-error-handling
+  window.addEventListener('vite:preloadError', (event) => {
+    event.preventDefault()
+    if (__DISTRIBUTION__ === 'cloud') {
+      captureException(event.payload, {
+        tags: { error_type: 'vite_preload_error' }
+      })
     } else {
-      // Show confirmation dialog if there are unsaved changes
-      await dialogService
-        .confirm({
-          title: t('g.vitePreloadErrorTitle'),
-          message: t('g.vitePreloadErrorMessage')
-        })
-        .then((confirmed) => {
-          if (confirmed) {
-            window.location.reload()
-          }
-        })
+      console.error('[vite:preloadError]', event.payload)
     }
   })
 
diff --git a/src/CLAUDE.md b/src/CLAUDE.md
index 8a651b3c14..d50cb7c30f 100644
--- a/src/CLAUDE.md
+++ b/src/CLAUDE.md
@@ -1,57 +1,4 @@
-# Source Code Guidelines
+<!-- We forked the path, yet here we are again—
+     Maintaining two files where one would have been sane. -->
 
-## Service Layer
-
-### API Calls
-
-- Use `api.apiURL()` for backend endpoints
-- Use `api.fileURL()` for static files
-
-#### ✅ Correct Usage
-```typescript
-// Backend API call
-const response = await api.get(api.apiURL('/prompt'))
-
-// Static file
-const template = await fetch(api.fileURL('/templates/default.json'))
-```
-
-#### ❌ Incorrect Usage
-```typescript
-// WRONG - Direct URL construction
-const response = await fetch('/api/prompt')
-const template = await fetch('/templates/default.json')
-```
-
-### Error Handling
-
-- User-friendly and actionable messages
-- Proper error propagation
-
-### Security
-
-- Sanitize HTML with DOMPurify
-- Validate trusted sources
-- Never log secrets
-
-## State Management (Stores)
-
-### Store Design
-
-- Follow domain-driven design
-- Clear public interfaces
-- Restrict extension access
-
-### Best Practices
-
-- Use TypeScript for type safety
-- Implement proper error handling
-- Clean up subscriptions
-- Avoid @ts-expect-error
-
-## General Guidelines
-
-- Use es-toolkit for utility functions
-- Implement proper TypeScript types
-- Follow Vue 3 composition API style guide
-- Use vue-i18n for ALL user-facing strings in `src/locales/en/main.json`
+@AGENTS.md
diff --git a/src/assets/css/style.css b/src/assets/css/style.css
index 627b129e40..a618e22ef0 100644
--- a/src/assets/css/style.css
+++ b/src/assets/css/style.css
@@ -1 +1,23 @@
-@import '@comfyorg/design-system/css/style.css';
\ No newline at end of file
+@import '@comfyorg/design-system/css/style.css';
+
+@media (prefers-reduced-motion: no-preference) {
+  /* List transition animations */
+  .list-scale-move,
+  .list-scale-enter-active,
+  .list-scale-leave-active {
+    transition:
+      opacity 150ms ease,
+      transform 150ms ease;
+  }
+
+  .list-scale-enter-from,
+  .list-scale-leave-to {
+    opacity: 0;
+    transform: scale(70%);
+  }
+
+  .list-scale-leave-active {
+    position: absolute;
+    width: 100%;
+  }
+}
diff --git a/src/base/common/async.ts b/src/base/common/async.ts
index a97f6f1bd0..d5aa306793 100644
--- a/src/base/common/async.ts
+++ b/src/base/common/async.ts
@@ -14,6 +14,7 @@ interface IdleDeadline {
 interface IDisposable {
   dispose(): void
 }
+type GlobalWindow = typeof globalThis
 
 /**
  * Internal implementation function that handles the actual scheduling logic.
@@ -21,7 +22,7 @@ interface IDisposable {
  * or fall back to setTimeout-based implementation.
  */
 let _runWhenIdle: (
-  targetWindow: any,
+  targetWindow: GlobalWindow,
   callback: (idle: IdleDeadline) => void,
   timeout?: number
 ) => IDisposable
@@ -37,7 +38,7 @@ export let runWhenGlobalIdle: (
 
   // Self-invoking function to set up the idle callback implementation
 ;(function () {
-  const safeGlobal: any = globalThis
+  const safeGlobal: GlobalWindow = globalThis as GlobalWindow
 
   if (
     typeof safeGlobal.requestIdleCallback !== 'function' ||
diff --git a/src/base/common/downloadUtil.test.ts b/src/base/common/downloadUtil.test.ts
new file mode 100644
index 0000000000..e601d870c9
--- /dev/null
+++ b/src/base/common/downloadUtil.test.ts
@@ -0,0 +1,457 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import {
+  downloadFile,
+  extractFilenameFromContentDisposition,
+  openFileInNewTab
+} from '@/base/common/downloadUtil'
+
+const { mockIsCloud } = vi.hoisted(() => ({
+  mockIsCloud: { value: false }
+}))
+
+vi.mock('@/platform/distribution/types', () => ({
+  get isCloud() {
+    return mockIsCloud.value
+  }
+}))
+
+vi.mock('@/i18n', () => ({
+  t: (key: string) => key
+}))
+
+vi.mock('@/platform/updates/common/toastStore', () => ({
+  useToastStore: vi.fn(() => ({ addAlert: vi.fn() }))
+}))
+
+// Global stubs
+const createObjectURLSpy = vi
+  .spyOn(URL, 'createObjectURL')
+  .mockReturnValue('blob:mock-url')
+const revokeObjectURLSpy = vi
+  .spyOn(URL, 'revokeObjectURL')
+  .mockImplementation(() => {})
+
+describe('downloadUtil', () => {
+  let mockLink: HTMLAnchorElement
+  let fetchMock: ReturnType<typeof vi.fn>
+
+  beforeEach(() => {
+    mockIsCloud.value = false
+    fetchMock = vi.fn()
+    vi.stubGlobal('fetch', fetchMock)
+    createObjectURLSpy.mockClear().mockReturnValue('blob:mock-url')
+    revokeObjectURLSpy.mockClear().mockImplementation(() => {})
+    // Create a mock anchor element
+    mockLink = {
+      href: '',
+      download: '',
+      click: vi.fn(),
+      style: { display: '' }
+    } as unknown as HTMLAnchorElement
+
+    // Spy on DOM methods
+    vi.spyOn(document, 'createElement').mockReturnValue(mockLink)
+    vi.spyOn(document.body, 'appendChild').mockImplementation(() => mockLink)
+    vi.spyOn(document.body, 'removeChild').mockImplementation(() => mockLink)
+  })
+
+  afterEach(() => {
+    vi.unstubAllGlobals()
+  })
+
+  describe('downloadFile', () => {
+    it('should create and trigger download with basic URL', () => {
+      const testUrl = 'https://example.com/image.png'
+
+      downloadFile(testUrl)
+
+      expect(document.createElement).toHaveBeenCalledWith('a')
+      expect(mockLink.href).toBe(testUrl)
+      expect(mockLink.download).toBe('download.png') // Default filename
+      expect(document.body.appendChild).toHaveBeenCalledWith(mockLink)
+      expect(mockLink.click).toHaveBeenCalled()
+      expect(document.body.removeChild).toHaveBeenCalledWith(mockLink)
+      expect(fetchMock).not.toHaveBeenCalled()
+      expect(createObjectURLSpy).not.toHaveBeenCalled()
+    })
+
+    it('should use custom filename when provided', () => {
+      const testUrl = 'https://example.com/image.png'
+      const customFilename = 'my-custom-image.png'
+
+      downloadFile(testUrl, customFilename)
+
+      expect(mockLink.href).toBe(testUrl)
+      expect(mockLink.download).toBe(customFilename)
+      expect(fetchMock).not.toHaveBeenCalled()
+      expect(createObjectURLSpy).not.toHaveBeenCalled()
+    })
+
+    it('should extract filename from URL query parameters', () => {
+      const testUrl =
+        'https://example.com/api/file?filename=extracted-image.jpg&other=param'
+
+      downloadFile(testUrl)
+
+      expect(mockLink.href).toBe(testUrl)
+      expect(mockLink.download).toBe('extracted-image.jpg')
+      expect(createObjectURLSpy).not.toHaveBeenCalled()
+    })
+
+    it('should use default filename when URL has no filename parameter', () => {
+      const testUrl = 'https://example.com/api/file?other=param'
+
+      downloadFile(testUrl)
+
+      expect(mockLink.href).toBe(testUrl)
+      expect(mockLink.download).toBe('download.png')
+      expect(createObjectURLSpy).not.toHaveBeenCalled()
+    })
+
+    it('should handle invalid URLs gracefully', () => {
+      const invalidUrl = 'not-a-valid-url'
+
+      downloadFile(invalidUrl)
+
+      expect(mockLink.href).toBe(invalidUrl)
+      expect(mockLink.download).toBe('download.png')
+      expect(mockLink.click).toHaveBeenCalled()
+      expect(fetchMock).not.toHaveBeenCalled()
+      expect(createObjectURLSpy).not.toHaveBeenCalled()
+    })
+
+    it('should prefer custom filename over extracted filename', () => {
+      const testUrl =
+        'https://example.com/api/file?filename=extracted-image.jpg'
+      const customFilename = 'custom-override.png'
+
+      downloadFile(testUrl, customFilename)
+
+      expect(mockLink.download).toBe(customFilename)
+      expect(createObjectURLSpy).not.toHaveBeenCalled()
+    })
+
+    it('should handle URLs with empty filename parameter', () => {
+      const testUrl = 'https://example.com/api/file?filename='
+
+      downloadFile(testUrl)
+
+      expect(mockLink.download).toBe('download.png')
+      expect(createObjectURLSpy).not.toHaveBeenCalled()
+    })
+
+    it('should handle relative URLs by using window.location.origin', () => {
+      const relativeUrl = '/api/file?filename=relative-image.png'
+
+      downloadFile(relativeUrl)
+
+      expect(mockLink.href).toBe(relativeUrl)
+      expect(mockLink.download).toBe('relative-image.png')
+      expect(fetchMock).not.toHaveBeenCalled()
+      expect(createObjectURLSpy).not.toHaveBeenCalled()
+    })
+
+    it('should clean up DOM elements after download', () => {
+      const testUrl = 'https://example.com/image.png'
+
+      downloadFile(testUrl)
+
+      // Verify the element was added and then removed
+      expect(document.body.appendChild).toHaveBeenCalledWith(mockLink)
+      expect(document.body.removeChild).toHaveBeenCalledWith(mockLink)
+      expect(fetchMock).not.toHaveBeenCalled()
+      expect(createObjectURLSpy).not.toHaveBeenCalled()
+    })
+
+    it('streams downloads via blob when running in cloud', async () => {
+      mockIsCloud.value = true
+      const testUrl = 'https://storage.googleapis.com/bucket/file.bin'
+      const blob = new Blob(['test'])
+      const blobFn = vi.fn().mockResolvedValue(blob)
+      const headersMock = {
+        get: vi.fn().mockReturnValue(null)
+      }
+      fetchMock.mockResolvedValue({
+        ok: true,
+        status: 200,
+        blob: blobFn,
+        headers: headersMock
+      } as unknown as Response)
+
+      downloadFile(testUrl)
+
+      expect(fetchMock).toHaveBeenCalledWith(testUrl)
+      const fetchPromise = fetchMock.mock.results[0].value as Promise<Response>
+      await fetchPromise
+      await Promise.resolve() // let fetchAsBlob return
+      const blobPromise = blobFn.mock.results[0].value as Promise<Blob>
+      await blobPromise
+      await Promise.resolve()
+      expect(blobFn).toHaveBeenCalled()
+      expect(createObjectURLSpy).toHaveBeenCalledWith(blob)
+      expect(revokeObjectURLSpy).toHaveBeenCalledWith('blob:mock-url')
+      expect(mockLink.click).toHaveBeenCalled()
+    })
+
+    it('logs an error when cloud fetch fails', async () => {
+      mockIsCloud.value = true
+      const testUrl = 'https://storage.googleapis.com/bucket/missing.bin'
+      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
+      fetchMock.mockResolvedValue({
+        ok: false,
+        status: 404,
+        blob: vi.fn()
+      } as Partial<Response> as Response)
+
+      downloadFile(testUrl)
+
+      expect(fetchMock).toHaveBeenCalledWith(testUrl)
+      const fetchPromise = fetchMock.mock.results[0].value as Promise<Response>
+      await fetchPromise
+      await Promise.resolve() // let fetchAsBlob throw
+      await Promise.resolve() // let .catch handler run
+      expect(consoleSpy).toHaveBeenCalled()
+      expect(createObjectURLSpy).not.toHaveBeenCalled()
+      consoleSpy.mockRestore()
+    })
+
+    it('uses filename from Content-Disposition header in cloud mode', async () => {
+      mockIsCloud.value = true
+      const testUrl = 'https://storage.googleapis.com/bucket/abc123.png'
+      const blob = new Blob(['test'])
+      const blobFn = vi.fn().mockResolvedValue(blob)
+      const headersMock = {
+        get: vi.fn().mockReturnValue('attachment; filename="user-friendly.png"')
+      }
+      fetchMock.mockResolvedValue({
+        ok: true,
+        status: 200,
+        blob: blobFn,
+        headers: headersMock
+      } as unknown as Response)
+
+      downloadFile(testUrl)
+
+      expect(fetchMock).toHaveBeenCalledWith(testUrl)
+      const fetchPromise = fetchMock.mock.results[0].value as Promise<Response>
+      await fetchPromise
+      await Promise.resolve() // let fetchAsBlob return
+      const blobPromise = blobFn.mock.results[0].value as Promise<Blob>
+      await blobPromise
+      await Promise.resolve()
+      expect(headersMock.get).toHaveBeenCalledWith('Content-Disposition')
+      expect(mockLink.download).toBe('user-friendly.png')
+    })
+
+    it('uses RFC 5987 filename from Content-Disposition header', async () => {
+      mockIsCloud.value = true
+      const testUrl = 'https://storage.googleapis.com/bucket/abc123.png'
+      const blob = new Blob(['test'])
+      const blobFn = vi.fn().mockResolvedValue(blob)
+      const headersMock = {
+        get: vi
+          .fn()
+          .mockReturnValue(
+            'attachment; filename="fallback.png"; filename*=UTF-8\'\'%E4%B8%AD%E6%96%87.png'
+          )
+      }
+      fetchMock.mockResolvedValue({
+        ok: true,
+        status: 200,
+        blob: blobFn,
+        headers: headersMock
+      } as unknown as Response)
+
+      downloadFile(testUrl)
+
+      const fetchPromise = fetchMock.mock.results[0].value as Promise<Response>
+      await fetchPromise
+      await Promise.resolve() // let fetchAsBlob return
+      const blobPromise = blobFn.mock.results[0].value as Promise<Blob>
+      await blobPromise
+      await Promise.resolve()
+      expect(mockLink.download).toBe('中文.png')
+    })
+
+    it('falls back to provided filename when Content-Disposition is missing', async () => {
+      mockIsCloud.value = true
+      const testUrl = 'https://storage.googleapis.com/bucket/abc123.png'
+      const blob = new Blob(['test'])
+      const blobFn = vi.fn().mockResolvedValue(blob)
+      const headersMock = {
+        get: vi.fn().mockReturnValue(null)
+      }
+      fetchMock.mockResolvedValue({
+        ok: true,
+        status: 200,
+        blob: blobFn,
+        headers: headersMock
+      } as unknown as Response)
+
+      downloadFile(testUrl, 'my-fallback.png')
+
+      const fetchPromise = fetchMock.mock.results[0].value as Promise<Response>
+      await fetchPromise
+      await Promise.resolve() // let fetchAsBlob return
+      const blobPromise = blobFn.mock.results[0].value as Promise<Blob>
+      await blobPromise
+      await Promise.resolve()
+      expect(mockLink.download).toBe('my-fallback.png')
+    })
+  })
+
+  describe('openFileInNewTab', () => {
+    let windowOpenSpy: ReturnType<typeof vi.spyOn>
+
+    beforeEach(() => {
+      vi.useFakeTimers()
+      windowOpenSpy = vi.spyOn(window, 'open').mockImplementation(() => null)
+    })
+
+    afterEach(() => {
+      vi.useRealTimers()
+    })
+
+    it('opens URL directly when not in cloud mode', async () => {
+      mockIsCloud.value = false
+      const testUrl = 'https://example.com/image.png'
+
+      await openFileInNewTab(testUrl)
+
+      expect(windowOpenSpy).toHaveBeenCalledWith(testUrl, '_blank')
+      expect(fetchMock).not.toHaveBeenCalled()
+    })
+
+    it('opens blank tab synchronously then navigates to blob URL in cloud mode', async () => {
+      mockIsCloud.value = true
+      const testUrl = 'https://storage.googleapis.com/bucket/image.png'
+      const blob = new Blob(['test'], { type: 'image/png' })
+      const mockTab = { location: { href: '' }, closed: false, close: vi.fn() }
+      windowOpenSpy.mockReturnValue(mockTab as unknown as Window)
+      fetchMock.mockResolvedValue({
+        ok: true,
+        blob: vi.fn().mockResolvedValue(blob)
+      } as unknown as Response)
+
+      await openFileInNewTab(testUrl)
+
+      expect(windowOpenSpy).toHaveBeenCalledWith('', '_blank')
+      expect(fetchMock).toHaveBeenCalledWith(testUrl)
+      expect(createObjectURLSpy).toHaveBeenCalledWith(blob)
+      expect(mockTab.location.href).toBe('blob:mock-url')
+    })
+
+    it('revokes blob URL after timeout in cloud mode', async () => {
+      mockIsCloud.value = true
+      const blob = new Blob(['test'], { type: 'image/png' })
+      const mockTab = { location: { href: '' }, closed: false, close: vi.fn() }
+      windowOpenSpy.mockReturnValue(mockTab as unknown as Window)
+      fetchMock.mockResolvedValue({
+        ok: true,
+        blob: vi.fn().mockResolvedValue(blob)
+      } as unknown as Response)
+
+      await openFileInNewTab('https://example.com/image.png')
+
+      expect(revokeObjectURLSpy).not.toHaveBeenCalled()
+      vi.advanceTimersByTime(60_000)
+      expect(revokeObjectURLSpy).toHaveBeenCalledWith('blob:mock-url')
+    })
+
+    it('closes blank tab and logs error when cloud fetch fails', async () => {
+      mockIsCloud.value = true
+      const testUrl = 'https://storage.googleapis.com/bucket/missing.png'
+      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
+      const mockTab = { location: { href: '' }, closed: false, close: vi.fn() }
+      windowOpenSpy.mockReturnValue(mockTab as unknown as Window)
+      fetchMock.mockResolvedValue({
+        ok: false,
+        status: 404
+      } as unknown as Response)
+
+      await openFileInNewTab(testUrl)
+
+      expect(mockTab.close).toHaveBeenCalled()
+      expect(consoleSpy).toHaveBeenCalled()
+      consoleSpy.mockRestore()
+    })
+
+    it('revokes blob URL immediately if tab was closed by user', async () => {
+      mockIsCloud.value = true
+      const blob = new Blob(['test'], { type: 'image/png' })
+      const mockTab = { location: { href: '' }, closed: true, close: vi.fn() }
+      windowOpenSpy.mockReturnValue(mockTab as unknown as Window)
+      fetchMock.mockResolvedValue({
+        ok: true,
+        blob: vi.fn().mockResolvedValue(blob)
+      } as unknown as Response)
+
+      await openFileInNewTab('https://example.com/image.png')
+
+      expect(revokeObjectURLSpy).toHaveBeenCalledWith('blob:mock-url')
+      expect(mockTab.location.href).toBe('')
+    })
+  })
+
+  describe('extractFilenameFromContentDisposition', () => {
+    it('returns null for null header', () => {
+      expect(extractFilenameFromContentDisposition(null)).toBeNull()
+    })
+
+    it('returns null for empty header', () => {
+      expect(extractFilenameFromContentDisposition('')).toBeNull()
+    })
+
+    it('extracts filename from simple quoted format', () => {
+      const header = 'attachment; filename="test-file.png"'
+      expect(extractFilenameFromContentDisposition(header)).toBe(
+        'test-file.png'
+      )
+    })
+
+    it('extracts filename from unquoted format', () => {
+      const header = 'attachment; filename=test-file.png'
+      expect(extractFilenameFromContentDisposition(header)).toBe(
+        'test-file.png'
+      )
+    })
+
+    it('extracts filename from RFC 5987 format', () => {
+      const header = "attachment; filename*=UTF-8''test%20file.png"
+      expect(extractFilenameFromContentDisposition(header)).toBe(
+        'test file.png'
+      )
+    })
+
+    it('prefers RFC 5987 format over simple format', () => {
+      const header =
+        'attachment; filename="fallback.png"; filename*=UTF-8\'\'preferred.png'
+      expect(extractFilenameFromContentDisposition(header)).toBe(
+        'preferred.png'
+      )
+    })
+
+    it('handles unicode characters in RFC 5987 format', () => {
+      const header =
+        "attachment; filename*=UTF-8''%E4%B8%AD%E6%96%87%E6%96%87%E4%BB%B6.png"
+      expect(extractFilenameFromContentDisposition(header)).toBe('中文文件.png')
+    })
+
+    it('falls back to simple format when RFC 5987 decoding fails', () => {
+      const header =
+        'attachment; filename="fallback.png"; filename*=UTF-8\'\'%invalid'
+      expect(extractFilenameFromContentDisposition(header)).toBe('fallback.png')
+    })
+
+    it('handles header with only attachment disposition', () => {
+      const header = 'attachment'
+      expect(extractFilenameFromContentDisposition(header)).toBeNull()
+    })
+
+    it('handles case-insensitive filename parameter', () => {
+      const header = 'attachment; FILENAME="test.png"'
+      expect(extractFilenameFromContentDisposition(header)).toBe('test.png')
+    })
+  })
+})
diff --git a/src/base/common/downloadUtil.ts b/src/base/common/downloadUtil.ts
index 4462dd1a72..78c208c776 100644
--- a/src/base/common/downloadUtil.ts
+++ b/src/base/common/downloadUtil.ts
@@ -1,7 +1,9 @@
 /**
  * Utility functions for downloading files
  */
+import { t } from '@/i18n'
 import { isCloud } from '@/platform/distribution/types'
+import { useToastStore } from '@/platform/updates/common/toastStore'
 
 // Constants
 const DEFAULT_DOWNLOAD_FILENAME = 'download.png'
@@ -75,14 +77,107 @@ const extractFilenameFromUrl = (url: string): string | null => {
   }
 }
 
-const downloadViaBlobFetch = async (
-  href: string,
-  filename: string
-): Promise<void> => {
-  const response = await fetch(href)
-  if (!response.ok) {
-    throw new Error(`Failed to fetch ${href}: ${response.status}`)
+/**
+ * Extract filename from Content-Disposition header
+ * Handles both simple format: attachment; filename="name.png"
+ * And RFC 5987 format: attachment; filename="fallback.png"; filename*=UTF-8''encoded%20name.png
+ * @param header - The Content-Disposition header value
+ * @returns The extracted filename or null if not found
+ */
+export function extractFilenameFromContentDisposition(
+  header: string | null
+): string | null {
+  if (!header) return null
+
+  // Try RFC 5987 extended format first (filename*=UTF-8''...)
+  const extendedMatch = header.match(/filename\*=UTF-8''([^;]+)/i)
+  if (extendedMatch?.[1]) {
+    try {
+      return decodeURIComponent(extendedMatch[1])
+    } catch {
+      // Fall through to simple format
+    }
+  }
+
+  // Try simple quoted format: filename="..."
+  const quotedMatch = header.match(/filename="([^"]+)"/i)
+  if (quotedMatch?.[1]) {
+    return quotedMatch[1]
+  }
+
+  // Try unquoted format: filename=...
+  const unquotedMatch = header.match(/filename=([^;\s]+)/i)
+  if (unquotedMatch?.[1]) {
+    return unquotedMatch[1]
+  }
+
+  return null
+}
+
+/**
+ * Fetch a URL and return its body as a Blob.
+ * Shared by download and open-in-new-tab cloud paths.
+ */
+async function fetchAsBlob(url: string): Promise<Response> {
+  const response = await fetch(url)
+  if (!response.ok) {
+    throw new Error(`Failed to fetch ${url}: ${response.status}`)
+  }
+  return response
+}
+
+async function downloadViaBlobFetch(
+  href: string,
+  fallbackFilename: string
+): Promise<void> {
+  const response = await fetchAsBlob(href)
+
+  // Try to get filename from Content-Disposition header (set by backend)
+  const contentDisposition = response.headers.get('Content-Disposition')
+  const headerFilename =
+    extractFilenameFromContentDisposition(contentDisposition)
+
+  const blob = await response.blob()
+  downloadBlob(headerFilename ?? fallbackFilename, blob)
+}
+
+/**
+ * Open a file URL in a new browser tab.
+ * On cloud, fetches the resource as a blob first to avoid GCS redirects
+ * that would trigger an auto-download instead of displaying the file.
+ *
+ * Opens the tab synchronously to preserve the user-gesture context
+ * (browsers block window.open after an await), then navigates it to
+ * the blob URL once the fetch completes.
+ */
+export async function openFileInNewTab(url: string): Promise<void> {
+  if (!isCloud) {
+    window.open(url, '_blank')
+    return
+  }
+
+  // Open immediately to preserve user-gesture activation.
+  const tab = window.open('', '_blank')
+
+  try {
+    const response = await fetchAsBlob(url)
+    const blob = await response.blob()
+    const blobUrl = URL.createObjectURL(blob)
+
+    if (tab && !tab.closed) {
+      tab.location.href = blobUrl
+      // Revoke after the tab has had time to load the blob.
+      setTimeout(() => URL.revokeObjectURL(blobUrl), 60_000)
+    } else {
+      URL.revokeObjectURL(blobUrl)
+    }
+  } catch (error) {
+    tab?.close()
+    console.error('Failed to open image:', error)
+    useToastStore().addAlert(
+      t('toastMessages.errorOpenImage', {
+        error: error instanceof Error ? error.message : String(error)
+      })
+    )
   }
-  const blob = await response.blob()
-  downloadBlob(filename, blob)
 }
diff --git a/tests-ui/tests/base/credits/comfyCredits.test.ts b/src/base/credits/comfyCredits.test.ts
similarity index 100%
rename from tests-ui/tests/base/credits/comfyCredits.test.ts
rename to src/base/credits/comfyCredits.test.ts
diff --git a/src/components/AGENTS.md b/src/components/AGENTS.md
new file mode 100644
index 0000000000..a79be1c62a
--- /dev/null
+++ b/src/components/AGENTS.md
@@ -0,0 +1,6 @@
+# Component Guidelines
+
+## Component Communication
+
+- Prefer `emit/@event-name` for state changes
+- Use `defineExpose` only for imperative operations (`form.validate()`, `modal.open()`)
diff --git a/src/components/CLAUDE.md b/src/components/CLAUDE.md
index 1cb50da671..25d6077c3e 100644
--- a/src/components/CLAUDE.md
+++ b/src/components/CLAUDE.md
@@ -1,45 +1,4 @@
-# Component Guidelines
+<!-- "Play nice with others," mother always said,
+     But Claude prefers its own file name instead. -->
 
-## Vue 3 Composition API
-
-- Use setup() function
-- Destructure props (Vue 3.5 style)
-- Use ref/reactive for state
-- Implement computed() for derived state
-- Use provide/inject for dependency injection
-
-## Component Communication
-
-- Prefer `emit/@event-name` for state changes
-- Use `defineExpose` only for imperative operations (`form.validate()`, `modal.open()`)
-- Events promote loose coupling
-
-## UI Framework
-
-- Deprecated PrimeVue component replacements:
-  - Dropdown → Select
-  - OverlayPanel → Popover
-  - Calendar → DatePicker
-  - InputSwitch → ToggleSwitch
-  - Sidebar → Drawer
-  - Chips → AutoComplete with multiple enabled
-  - TabMenu → Tabs without panels
-  - Steps → Stepper without panels
-  - InlineMessage → Message
-
-## Styling
-
-- Use Tailwind CSS only (no custom CSS)
-- Use the correct tokens from style.css in the design system package
-- For common operations, try to use existing VueUse composables that automatically handle effect scope
-  - Example: Use `useElementHover` instead of manually managing mouseover/mouseout event listeners
-  - Example: Use `useIntersectionObserver` for visibility detection instead of custom scroll handlers
-
-## Best Practices
-
-- Extract complex conditionals to computed
-- Implement cleanup for async operations
-- Use vue-i18n for ALL UI strings
-- Use lifecycle hooks: onMounted, onUpdated
-- Use Teleport/Suspense when needed
-- Proper props and emits definitions
+@AGENTS.md
diff --git a/src/components/LiteGraphCanvasSplitterOverlay.vue b/src/components/LiteGraphCanvasSplitterOverlay.vue
index 4a7695d184..0ed3737133 100644
--- a/src/components/LiteGraphCanvasSplitterOverlay.vue
+++ b/src/components/LiteGraphCanvasSplitterOverlay.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="w-full h-full absolute top-0 left-0 z-999 pointer-events-none flex flex-col"
+    class="pointer-events-none absolute top-0 left-0 z-999 flex size-full flex-col"
   >
     <slot name="workflow-tabs" />
 
@@ -17,26 +17,28 @@
 
       <Splitter
         :key="splitterRefreshKey"
-        class="bg-transparent pointer-events-none border-none flex-1 overflow-hidden"
-        :state-key="sidebarStateKey"
+        class="pointer-events-none flex-1 overflow-hidden border-none bg-transparent"
+        :state-key="isSelectMode ? 'builder-splitter' : sidebarStateKey"
         state-storage="local"
         @resizestart="onResizestart"
       >
         <!-- First panel: sidebar when left, properties when right -->
         <SplitterPanel
           v-if="
-            !focusMode && (sidebarLocation === 'left' || rightSidePanelVisible)
+            !focusMode && (sidebarLocation === 'left' || showOffsideSplitter)
           "
           :class="
             sidebarLocation === 'left'
               ? cn(
-                  'side-bar-panel bg-comfy-menu-bg pointer-events-auto',
+                  'side-bar-panel pointer-events-auto bg-comfy-menu-bg',
                   sidebarPanelVisible && 'min-w-78'
                 )
-              : 'bg-comfy-menu-bg pointer-events-auto'
+              : 'pointer-events-auto bg-comfy-menu-bg'
           "
-          :min-size="sidebarLocation === 'left' ? 10 : 15"
-          :size="20"
+          :min-size="
+            sidebarLocation === 'left' ? SIDEBAR_MIN_SIZE : BUILDER_MIN_SIZE
+          "
+          :size="SIDE_PANEL_SIZE"
           :style="firstPanelStyle"
           :role="sidebarLocation === 'left' ? 'complementary' : undefined"
           :aria-label="
@@ -54,15 +56,15 @@
         </SplitterPanel>
 
         <!-- Main panel (always present) -->
-        <SplitterPanel :size="80" class="flex flex-col">
+        <SplitterPanel :size="CENTER_PANEL_SIZE" class="flex flex-col">
           <slot name="topmenu" :sidebar-panel-visible />
 
           <Splitter
-            class="bg-transparent pointer-events-none border-none splitter-overlay-bottom mr-1 mb-1 ml-1 flex-1"
+            class="splitter-overlay-bottom pointer-events-none mx-1 mb-1 flex-1 border-none bg-transparent"
             layout="vertical"
             :pt:gutter="
               cn(
-                'rounded-tl-lg rounded-tr-lg ',
+                'rounded-t-lg',
                 !(bottomPanelVisible && !focusMode) && 'hidden'
               )
             "
@@ -75,7 +77,7 @@
             </SplitterPanel>
             <SplitterPanel
               v-show="bottomPanelVisible && !focusMode"
-              class="bottom-panel border border-(--p-panel-border-color) max-w-full overflow-x-auto bg-comfy-menu-bg pointer-events-auto rounded-lg"
+              class="bottom-panel pointer-events-auto max-w-full overflow-x-auto rounded-lg border border-(--p-panel-border-color) bg-comfy-menu-bg"
             >
               <slot name="bottom-panel" />
             </SplitterPanel>
@@ -85,18 +87,20 @@
         <!-- Last panel: properties when left, sidebar when right -->
         <SplitterPanel
           v-if="
-            !focusMode && (sidebarLocation === 'right' || rightSidePanelVisible)
+            !focusMode && (sidebarLocation === 'right' || showOffsideSplitter)
           "
           :class="
             sidebarLocation === 'right'
               ? cn(
-                  'side-bar-panel bg-comfy-menu-bg pointer-events-auto',
+                  'side-bar-panel pointer-events-auto bg-comfy-menu-bg',
                   sidebarPanelVisible && 'min-w-78'
                 )
-              : 'bg-comfy-menu-bg pointer-events-auto'
+              : 'pointer-events-auto bg-comfy-menu-bg'
           "
-          :min-size="sidebarLocation === 'right' ? 10 : 15"
-          :size="20"
+          :min-size="
+            sidebarLocation === 'right' ? SIDEBAR_MIN_SIZE : BUILDER_MIN_SIZE
+          "
+          :size="SIDE_PANEL_SIZE"
           :style="lastPanelStyle"
           :role="sidebarLocation === 'right' ? 'complementary' : undefined"
           :aria-label="
@@ -123,6 +127,13 @@ import SplitterPanel from 'primevue/splitterpanel'
 import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 
+import { useAppMode } from '@/composables/useAppMode'
+import {
+  BUILDER_MIN_SIZE,
+  CENTER_PANEL_SIZE,
+  SIDEBAR_MIN_SIZE,
+  SIDE_PANEL_SIZE
+} from '@/constants/splitterConstants'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { useBottomPanelStore } from '@/stores/workspace/bottomPanelStore'
 import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore'
@@ -144,11 +155,17 @@ const unifiedWidth = computed(() =>
 
 const { focusMode } = storeToRefs(workspaceStore)
 
+const { isSelectMode, isBuilderMode } = useAppMode()
 const { activeSidebarTabId, activeSidebarTab } = storeToRefs(sidebarTabStore)
 const { bottomPanelVisible } = storeToRefs(useBottomPanelStore())
 const { isOpen: rightSidePanelVisible } = storeToRefs(rightSidePanelStore)
+const showOffsideSplitter = computed(
+  () => rightSidePanelVisible.value || isSelectMode.value
+)
 
-const sidebarPanelVisible = computed(() => activeSidebarTab.value !== null)
+const sidebarPanelVisible = computed(
+  () => activeSidebarTab.value !== null && !isBuilderMode.value
+)
 
 const sidebarStateKey = computed(() => {
   return unifiedWidth.value
@@ -169,7 +186,7 @@ function onResizestart({ originalEvent: event }: SplitterResizeStartEvent) {
  * to recalculate the width and panel order
  */
 const splitterRefreshKey = computed(() => {
-  return `main-splitter${rightSidePanelVisible.value ? '-with-right-panel' : ''}-${sidebarLocation.value}`
+  return `main-splitter${rightSidePanelVisible.value ? '-with-right-panel' : ''}${isSelectMode.value ? '-builder' : ''}-${sidebarLocation.value}`
 })
 
 const firstPanelStyle = computed(() => {
diff --git a/src/components/MenuHamburger.vue b/src/components/MenuHamburger.vue
index fa99e032c2..5b4103a495 100644
--- a/src/components/MenuHamburger.vue
+++ b/src/components/MenuHamburger.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     v-show="workspaceState.focusMode"
-    class="fixed z-9999 flex flex-row no-drag top-0 right-0"
+    class="no-drag fixed top-0 right-0 z-9999 flex flex-row"
   >
     <Button
       v-tooltip="{ value: $t('menu.showMenu'), showDelay: 300 }"
diff --git a/src/components/TopMenuSection.test.ts b/src/components/TopMenuSection.test.ts
new file mode 100644
index 0000000000..f10e4f577f
--- /dev/null
+++ b/src/components/TopMenuSection.test.ts
@@ -0,0 +1,509 @@
+import { createTestingPinia } from '@pinia/testing'
+import { mount } from '@vue/test-utils'
+import type { MenuItem } from 'primevue/menuitem'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { computed, defineComponent, h, nextTick, onMounted, ref } from 'vue'
+import type { Component } from 'vue'
+import { createI18n } from 'vue-i18n'
+
+import TopMenuSection from '@/components/TopMenuSection.vue'
+import QueueNotificationBannerHost from '@/components/queue/QueueNotificationBannerHost.vue'
+import CurrentUserButton from '@/components/topbar/CurrentUserButton.vue'
+import LoginButton from '@/components/topbar/LoginButton.vue'
+import type {
+  JobListItem,
+  JobStatus
+} from '@/platform/remote/comfyui/jobs/jobTypes'
+import { useSettingStore } from '@/platform/settings/settingStore'
+import { useCommandStore } from '@/stores/commandStore'
+import { useExecutionStore } from '@/stores/executionStore'
+import { TaskItemImpl, useQueueStore } from '@/stores/queueStore'
+import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
+
+const mockData = vi.hoisted(() => ({
+  isLoggedIn: false,
+  isDesktop: false,
+  setShowConflictRedDot: (_value: boolean) => {}
+}))
+
+vi.mock('@/composables/auth/useCurrentUser', () => ({
+  useCurrentUser: () => {
+    return {
+      isLoggedIn: computed(() => mockData.isLoggedIn)
+    }
+  }
+}))
+
+vi.mock('@/platform/distribution/types', () => ({
+  isCloud: false,
+  isNightly: false,
+  get isDesktop() {
+    return mockData.isDesktop
+  }
+}))
+
+vi.mock('@/platform/updates/common/releaseStore', () => ({
+  useReleaseStore: () => ({
+    shouldShowRedDot: computed(() => true)
+  })
+}))
+
+vi.mock(
+  '@/workbench/extensions/manager/composables/useConflictAcknowledgment',
+  () => {
+    const shouldShowConflictRedDot = ref(false)
+    mockData.setShowConflictRedDot = (value: boolean) => {
+      shouldShowConflictRedDot.value = value
+    }
+
+    return {
+      useConflictAcknowledgment: () => ({
+        shouldShowRedDot: shouldShowConflictRedDot
+      })
+    }
+  }
+)
+
+vi.mock('@/workbench/extensions/manager/composables/useManagerState', () => ({
+  useManagerState: () => ({
+    shouldShowManagerButtons: computed(() => true),
+    openManager: vi.fn()
+  })
+}))
+
+vi.mock('@/stores/firebaseAuthStore', () => ({
+  useFirebaseAuthStore: vi.fn(() => ({
+    currentUser: null,
+    loading: false
+  }))
+}))
+
+type WrapperOptions = {
+  pinia?: ReturnType<typeof createTestingPinia>
+  stubs?: Record<string, boolean | Component>
+  attachTo?: HTMLElement
+}
+
+function createWrapper({
+  pinia = createTestingPinia({ createSpy: vi.fn }),
+  stubs = {},
+  attachTo
+}: WrapperOptions = {}) {
+  const i18n = createI18n({
+    legacy: false,
+    locale: 'en',
+    messages: {
+      en: {
+        sideToolbar: {
+          queueProgressOverlay: {
+            viewJobHistory: 'View job history',
+            expandCollapsedQueue: 'Expand collapsed queue',
+            activeJobsShort: '{count} active | {count} active',
+            clearQueueTooltip: 'Clear queue'
+          }
+        }
+      }
+    }
+  })
+
+  return mount(TopMenuSection, {
+    attachTo,
+    global: {
+      plugins: [pinia, i18n],
+      stubs: {
+        SubgraphBreadcrumb: true,
+        QueueProgressOverlay: true,
+        QueueInlineProgressSummary: true,
+        QueueNotificationBannerHost: true,
+        CurrentUserButton: true,
+        LoginButton: true,
+        ContextMenu: {
+          name: 'ContextMenu',
+          props: ['model'],
+          template: '<div />'
+        },
+        ...stubs
+      },
+      directives: {
+        tooltip: () => {}
+      }
+    }
+  })
+}
+
+function createJob(id: string, status: JobStatus): JobListItem {
+  return {
+    id,
+    status,
+    create_time: 0,
+    priority: 0
+  }
+}
+
+function createTask(id: string, status: JobStatus): TaskItemImpl {
+  return new TaskItemImpl(createJob(id, status))
+}
+
+function createComfyActionbarStub(actionbarTarget: HTMLElement) {
+  return defineComponent({
+    name: 'ComfyActionbar',
+    setup(_, { emit }) {
+      onMounted(() => {
+        emit('update:progressTarget', actionbarTarget)
+      })
+      return () => h('div')
+    }
+  })
+}
+
+describe('TopMenuSection', () => {
+  beforeEach(() => {
+    vi.resetAllMocks()
+    localStorage.clear()
+    mockData.isDesktop = false
+    mockData.isLoggedIn = false
+    mockData.setShowConflictRedDot(false)
+  })
+
+  describe('authentication state', () => {
+    describe('when user is logged in', () => {
+      beforeEach(() => {
+        mockData.isLoggedIn = true
+      })
+
+      it('should display CurrentUserButton and not display LoginButton', () => {
+        const wrapper = createWrapper()
+        expect(wrapper.findComponent(CurrentUserButton).exists()).toBe(true)
+        expect(wrapper.findComponent(LoginButton).exists()).toBe(false)
+      })
+    })
+
+    describe('when user is not logged in', () => {
+      beforeEach(() => {
+        mockData.isLoggedIn = false
+      })
+
+      describe('on desktop platform', () => {
+        it('should display LoginButton and not display CurrentUserButton', () => {
+          mockData.isDesktop = true
+          const wrapper = createWrapper()
+          expect(wrapper.findComponent(LoginButton).exists()).toBe(true)
+          expect(wrapper.findComponent(CurrentUserButton).exists()).toBe(false)
+        })
+      })
+
+      describe('on web platform', () => {
+        it('should not display CurrentUserButton and not display LoginButton', () => {
+          const wrapper = createWrapper()
+          expect(wrapper.findComponent(CurrentUserButton).exists()).toBe(false)
+          expect(wrapper.findComponent(LoginButton).exists()).toBe(false)
+        })
+      })
+    })
+  })
+
+  it('shows the active jobs label with the current count', async () => {
+    const wrapper = createWrapper()
+    const queueStore = useQueueStore()
+    queueStore.pendingTasks = [createTask('pending-1', 'pending')]
+    queueStore.runningTasks = [
+      createTask('running-1', 'in_progress'),
+      createTask('running-2', 'in_progress')
+    ]
+
+    await nextTick()
+
+    const queueButton = wrapper.find('[data-testid="queue-overlay-toggle"]')
+    expect(queueButton.text()).toContain('3 active')
+    expect(wrapper.find('[data-testid="active-jobs-indicator"]').exists()).toBe(
+      true
+    )
+  })
+
+  it('hides the active jobs indicator when no jobs are active', () => {
+    const wrapper = createWrapper()
+
+    expect(wrapper.find('[data-testid="active-jobs-indicator"]').exists()).toBe(
+      false
+    )
+  })
+
+  it('hides queue progress overlay when QPO V2 is enabled', async () => {
+    const pinia = createTestingPinia({ createSpy: vi.fn })
+    const settingStore = useSettingStore(pinia)
+    vi.mocked(settingStore.get).mockImplementation((key) =>
+      key === 'Comfy.Queue.QPOV2' ? true : undefined
+    )
+    const wrapper = createWrapper({ pinia })
+
+    await nextTick()
+
+    expect(wrapper.find('[data-testid="queue-overlay-toggle"]').exists()).toBe(
+      true
+    )
+    expect(
+      wrapper.findComponent({ name: 'QueueProgressOverlay' }).exists()
+    ).toBe(false)
+  })
+
+  it('toggles the queue progress overlay when QPO V2 is disabled', async () => {
+    const pinia = createTestingPinia({ createSpy: vi.fn, stubActions: false })
+    const settingStore = useSettingStore(pinia)
+    vi.mocked(settingStore.get).mockImplementation((key) =>
+      key === 'Comfy.Queue.QPOV2' ? false : undefined
+    )
+    const wrapper = createWrapper({ pinia })
+    const commandStore = useCommandStore(pinia)
+
+    await wrapper.find('[data-testid="queue-overlay-toggle"]').trigger('click')
+
+    expect(commandStore.execute).toHaveBeenCalledWith(
+      'Comfy.Queue.ToggleOverlay'
+    )
+  })
+
+  it('opens the job history sidebar tab when QPO V2 is enabled', async () => {
+    const pinia = createTestingPinia({ createSpy: vi.fn, stubActions: false })
+    const settingStore = useSettingStore(pinia)
+    vi.mocked(settingStore.get).mockImplementation((key) =>
+      key === 'Comfy.Queue.QPOV2' ? true : undefined
+    )
+    const wrapper = createWrapper({ pinia })
+    const sidebarTabStore = useSidebarTabStore(pinia)
+
+    await wrapper.find('[data-testid="queue-overlay-toggle"]').trigger('click')
+
+    expect(sidebarTabStore.activeSidebarTabId).toBe('job-history')
+  })
+
+  it('toggles the job history sidebar tab when QPO V2 is enabled', async () => {
+    const pinia = createTestingPinia({ createSpy: vi.fn, stubActions: false })
+    const settingStore = useSettingStore(pinia)
+    vi.mocked(settingStore.get).mockImplementation((key) =>
+      key === 'Comfy.Queue.QPOV2' ? true : undefined
+    )
+    const wrapper = createWrapper({ pinia })
+    const sidebarTabStore = useSidebarTabStore(pinia)
+    const toggleButton = wrapper.find('[data-testid="queue-overlay-toggle"]')
+
+    await toggleButton.trigger('click')
+    expect(sidebarTabStore.activeSidebarTabId).toBe('job-history')
+
+    await toggleButton.trigger('click')
+    expect(sidebarTabStore.activeSidebarTabId).toBe(null)
+  })
+
+  describe('inline progress summary', () => {
+    const configureSettings = (
+      pinia: ReturnType<typeof createTestingPinia>,
+      qpoV2Enabled: boolean,
+      showRunProgressBar = true
+    ) => {
+      const settingStore = useSettingStore(pinia)
+      vi.mocked(settingStore.get).mockImplementation((key) => {
+        if (key === 'Comfy.Queue.QPOV2') return qpoV2Enabled
+        if (key === 'Comfy.Queue.ShowRunProgressBar') return showRunProgressBar
+        if (key === 'Comfy.UseNewMenu') return 'Top'
+        return undefined
+      })
+    }
+
+    it('renders inline progress summary when QPO V2 is enabled', async () => {
+      const pinia = createTestingPinia({ createSpy: vi.fn })
+      configureSettings(pinia, true)
+
+      const wrapper = createWrapper({ pinia })
+
+      await nextTick()
+
+      expect(
+        wrapper.findComponent({ name: 'QueueInlineProgressSummary' }).exists()
+      ).toBe(true)
+    })
+
+    it('does not render inline progress summary when QPO V2 is disabled', async () => {
+      const pinia = createTestingPinia({ createSpy: vi.fn })
+      configureSettings(pinia, false)
+
+      const wrapper = createWrapper({ pinia })
+
+      await nextTick()
+
+      expect(
+        wrapper.findComponent({ name: 'QueueInlineProgressSummary' }).exists()
+      ).toBe(false)
+    })
+
+    it('does not render inline progress summary when run progress bar is disabled', async () => {
+      const pinia = createTestingPinia({ createSpy: vi.fn })
+      configureSettings(pinia, true, false)
+
+      const wrapper = createWrapper({ pinia })
+
+      await nextTick()
+
+      expect(
+        wrapper.findComponent({ name: 'QueueInlineProgressSummary' }).exists()
+      ).toBe(false)
+    })
+
+    it('teleports inline progress summary when actionbar is floating', async () => {
+      localStorage.setItem('Comfy.MenuPosition.Docked', 'false')
+      const actionbarTarget = document.createElement('div')
+      document.body.appendChild(actionbarTarget)
+      const pinia = createTestingPinia({ createSpy: vi.fn })
+      configureSettings(pinia, true)
+      const executionStore = useExecutionStore(pinia)
+      executionStore.activeJobId = 'job-1'
+
+      const ComfyActionbarStub = createComfyActionbarStub(actionbarTarget)
+
+      const wrapper = createWrapper({
+        pinia,
+        attachTo: document.body,
+        stubs: {
+          ComfyActionbar: ComfyActionbarStub,
+          QueueInlineProgressSummary: false
+        }
+      })
+
+      try {
+        await nextTick()
+
+        expect(actionbarTarget.querySelector('[role="status"]')).not.toBeNull()
+      } finally {
+        wrapper.unmount()
+        actionbarTarget.remove()
+      }
+    })
+  })
+
+  describe(QueueNotificationBannerHost, () => {
+    const configureSettings = (
+      pinia: ReturnType<typeof createTestingPinia>,
+      qpoV2Enabled: boolean
+    ) => {
+      const settingStore = useSettingStore(pinia)
+      vi.mocked(settingStore.get).mockImplementation((key) => {
+        if (key === 'Comfy.Queue.QPOV2') return qpoV2Enabled
+        if (key === 'Comfy.UseNewMenu') return 'Top'
+        return undefined
+      })
+    }
+
+    it('renders queue notification banners when QPO V2 is enabled', async () => {
+      const pinia = createTestingPinia({ createSpy: vi.fn })
+      configureSettings(pinia, true)
+
+      const wrapper = createWrapper({ pinia })
+
+      await nextTick()
+
+      expect(
+        wrapper.findComponent({ name: 'QueueNotificationBannerHost' }).exists()
+      ).toBe(true)
+    })
+
+    it('renders queue notification banners when QPO V2 is disabled', async () => {
+      const pinia = createTestingPinia({ createSpy: vi.fn })
+      configureSettings(pinia, false)
+
+      const wrapper = createWrapper({ pinia })
+
+      await nextTick()
+
+      expect(
+        wrapper.findComponent({ name: 'QueueNotificationBannerHost' }).exists()
+      ).toBe(true)
+    })
+
+    it('renders inline summary above banners when both are visible', async () => {
+      const pinia = createTestingPinia({ createSpy: vi.fn })
+      configureSettings(pinia, true)
+      const wrapper = createWrapper({ pinia })
+
+      await nextTick()
+
+      const html = wrapper.html()
+      const inlineSummaryIndex = html.indexOf(
+        'queue-inline-progress-summary-stub'
+      )
+      const queueBannerIndex = html.indexOf(
+        'queue-notification-banner-host-stub'
+      )
+
+      expect(inlineSummaryIndex).toBeGreaterThan(-1)
+      expect(queueBannerIndex).toBeGreaterThan(-1)
+      expect(inlineSummaryIndex).toBeLessThan(queueBannerIndex)
+    })
+
+    it('does not teleport queue notification banners when actionbar is floating', async () => {
+      localStorage.setItem('Comfy.MenuPosition.Docked', 'false')
+      const actionbarTarget = document.createElement('div')
+      document.body.appendChild(actionbarTarget)
+      const pinia = createTestingPinia({ createSpy: vi.fn })
+      configureSettings(pinia, true)
+      const executionStore = useExecutionStore(pinia)
+      executionStore.activeJobId = 'job-1'
+
+      const ComfyActionbarStub = createComfyActionbarStub(actionbarTarget)
+
+      const wrapper = createWrapper({
+        pinia,
+        attachTo: document.body,
+        stubs: {
+          ComfyActionbar: ComfyActionbarStub,
+          QueueNotificationBannerHost: true
+        }
+      })
+
+      try {
+        await nextTick()
+
+        expect(
+          actionbarTarget.querySelector('queue-notification-banner-host-stub')
+        ).toBeNull()
+        expect(
+          wrapper
+            .findComponent({ name: 'QueueNotificationBannerHost' })
+            .exists()
+        ).toBe(true)
+      } finally {
+        wrapper.unmount()
+        actionbarTarget.remove()
+      }
+    })
+  })
+
+  it('disables the clear queue context menu item when no queued jobs exist', () => {
+    const wrapper = createWrapper()
+    const menu = wrapper.findComponent({ name: 'ContextMenu' })
+    const model = menu.props('model') as MenuItem[]
+    expect(model[0]?.label).toBe('Clear queue')
+    expect(model[0]?.disabled).toBe(true)
+  })
+
+  it('enables the clear queue context menu item when queued jobs exist', async () => {
+    const wrapper = createWrapper()
+    const queueStore = useQueueStore()
+    queueStore.pendingTasks = [createTask('pending-1', 'pending')]
+
+    await nextTick()
+
+    const menu = wrapper.findComponent({ name: 'ContextMenu' })
+    const model = menu.props('model') as MenuItem[]
+    expect(model[0]?.disabled).toBe(false)
+  })
+
+  it('shows manager red dot only for manager conflicts', async () => {
+    const wrapper = createWrapper()
+
+    // Release red dot is mocked as true globally for this test file.
+    expect(wrapper.find('span.bg-red-500').exists()).toBe(false)
+
+    mockData.setShowConflictRedDot(true)
+    await nextTick()
+
+    expect(wrapper.find('span.bg-red-500').exists()).toBe(true)
+  })
+})
diff --git a/src/components/TopMenuSection.vue b/src/components/TopMenuSection.vue
index 448a081f9e..b28cd81bb8 100644
--- a/src/components/TopMenuSection.vue
+++ b/src/components/TopMenuSection.vue
@@ -1,124 +1,229 @@
 <template>
   <div
     v-if="!workspaceStore.focusMode"
-    class="ml-1 flex gap-x-0.5 pt-1"
+    class="ml-1 flex flex-col gap-1 pt-1"
     @mouseenter="isTopMenuHovered = true"
     @mouseleave="isTopMenuHovered = false"
   >
-    <div class="min-w-0 flex-1">
-      <SubgraphBreadcrumb />
+    <div class="flex gap-x-0.5">
+      <div class="min-w-0 flex-1">
+        <SubgraphBreadcrumb />
+      </div>
+
+      <div class="mx-1 flex flex-col items-end gap-1">
+        <div class="flex items-center gap-2">
+          <div
+            v-if="managerState.shouldShowManagerButtons.value"
+            class="pointer-events-auto flex h-12 shrink-0 items-center rounded-lg border border-interface-stroke bg-comfy-menu-bg px-2 shadow-interface"
+          >
+            <Button
+              v-tooltip.bottom="customNodesManagerTooltipConfig"
+              variant="secondary"
+              :aria-label="t('menu.manageExtensions')"
+              class="relative"
+              @click="openCustomNodeManager"
+            >
+              <i class="icon-[comfy--extensions-blocks] size-4" />
+              <span class="not-md:hidden">
+                {{ t('menu.manageExtensions') }}
+              </span>
+              <span
+                v-if="shouldShowRedDot"
+                class="absolute top-0.5 right-1 size-2 rounded-full bg-red-500"
+              />
+            </Button>
+          </div>
+
+          <div
+            ref="actionbarContainerRef"
+            :class="
+              cn(
+                'actionbar-container pointer-events-auto relative flex h-12 items-center gap-2 rounded-lg border bg-comfy-menu-bg px-2 shadow-interface',
+                hasAnyError
+                  ? 'border-destructive-background-hover'
+                  : 'border-interface-stroke'
+              )
+            "
+          >
+            <ActionBarButtons />
+            <!-- Support for legacy topbar elements attached by custom scripts, hidden if no elements present -->
+            <div
+              ref="legacyCommandsContainerRef"
+              class="[&:not(:has(*>*:not(:empty)))]:hidden"
+            ></div>
+
+            <ComfyActionbar
+              :top-menu-container="actionbarContainerRef"
+              :queue-overlay-expanded="isQueueOverlayExpanded"
+              @update:progress-target="updateProgressTarget"
+            />
+            <CurrentUserButton
+              v-if="isLoggedIn && !isIntegratedTabBar"
+              class="shrink-0"
+            />
+            <LoginButton v-else-if="isDesktop && !isIntegratedTabBar" />
+            <Button
+              v-if="isCloud && flags.workflowSharingEnabled"
+              v-tooltip.bottom="shareTooltipConfig"
+              variant="secondary"
+              :aria-label="t('actionbar.shareTooltip')"
+              @click="() => openShareDialog().catch(toastErrorHandler)"
+              @pointerenter="prefetchShareDialog"
+            >
+              <i class="icon-[lucide--share-2] size-4" />
+              <span class="not-md:hidden">
+                {{ t('actionbar.share') }}
+              </span>
+            </Button>
+            <Button
+              v-if="!isRightSidePanelOpen"
+              v-tooltip.bottom="rightSidePanelTooltipConfig"
+              type="secondary"
+              size="icon"
+              :aria-label="t('rightSidePanel.togglePanel')"
+              @click="rightSidePanelStore.togglePanel"
+            >
+              <i class="icon-[lucide--panel-right] size-4" />
+            </Button>
+          </div>
+        </div>
+        <ErrorOverlay />
+        <QueueProgressOverlay
+          v-if="isQueueProgressOverlayEnabled"
+          v-model:expanded="isQueueOverlayExpanded"
+          :menu-hovered="isTopMenuHovered"
+        />
+      </div>
     </div>
 
-    <div class="mx-1 flex flex-col items-end gap-1">
-      <div class="flex items-center gap-2">
+    <div class="flex flex-col items-end gap-1">
+      <Teleport
+        v-if="inlineProgressSummaryTarget"
+        :to="inlineProgressSummaryTarget"
+      >
         <div
-          v-if="managerState.shouldShowManagerButtons.value"
-          class="pointer-events-auto flex h-12 shrink-0 items-center rounded-lg border border-interface-stroke bg-comfy-menu-bg px-2 shadow-interface"
+          class="pointer-events-none absolute inset-x-0 top-full mt-1 flex justify-end pr-1"
         >
-          <Button
-            v-tooltip.bottom="customNodesManagerTooltipConfig"
-            variant="secondary"
-            size="icon"
-            :aria-label="t('menu.customNodesManager')"
-            @click="openCustomNodeManager"
-          >
-            <i class="icon-[lucide--puzzle] size-4" />
-          </Button>
+          <QueueInlineProgressSummary
+            :hidden="shouldHideInlineProgressSummary"
+          />
         </div>
-
-        <div
-          class="actionbar-container pointer-events-auto flex gap-2 h-12 items-center rounded-lg border border-interface-stroke bg-comfy-menu-bg px-2 shadow-interface"
-        >
-          <ActionBarButtons />
-          <!-- Support for legacy topbar elements attached by custom scripts, hidden if no elements present -->
-          <div
-            ref="legacyCommandsContainerRef"
-            class="[&:not(:has(*>*:not(:empty)))]:hidden"
-          ></div>
-          <ComfyActionbar />
-          <Button
-            v-tooltip.bottom="queueHistoryTooltipConfig"
-            type="destructive"
-            size="icon"
-            :aria-pressed="isQueueOverlayExpanded"
-            :aria-label="
-              t('sideToolbar.queueProgressOverlay.expandCollapsedQueue')
-            "
-            @click="toggleQueueOverlay"
-          >
-            <i class="icon-[lucide--history] size-4" />
-            <span
-              v-if="queuedCount > 0"
-              class="absolute -top-1 -right-1 min-w-[16px] rounded-full bg-primary-background py-0.25 text-[10px] font-medium leading-[14px] text-white"
-            >
-              {{ queuedCount }}
-            </span>
-          </Button>
-          <CurrentUserButton v-if="isLoggedIn" class="shrink-0" />
-          <LoginButton v-else-if="isDesktop" />
-          <Button
-            v-if="!isRightSidePanelOpen"
-            v-tooltip.bottom="rightSidePanelTooltipConfig"
-            type="secondary"
-            size="icon"
-            :aria-label="t('rightSidePanel.togglePanel')"
-            @click="rightSidePanelStore.togglePanel"
-          >
-            <i class="icon-[lucide--panel-right] size-4" />
-          </Button>
-        </div>
-      </div>
-      <QueueProgressOverlay
-        v-model:expanded="isQueueOverlayExpanded"
-        :menu-hovered="isTopMenuHovered"
+      </Teleport>
+      <QueueInlineProgressSummary
+        v-else-if="shouldShowInlineProgressSummary && !isActionbarFloating"
+        class="pr-1"
+        :hidden="shouldHideInlineProgressSummary"
+      />
+      <QueueNotificationBannerHost
+        v-if="shouldShowQueueNotificationBanners"
+        class="pr-1"
       />
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
+import { useLocalStorage } from '@vueuse/core'
 import { storeToRefs } from 'pinia'
 import { computed, onMounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import ComfyActionbar from '@/components/actionbar/ComfyActionbar.vue'
 import SubgraphBreadcrumb from '@/components/breadcrumb/SubgraphBreadcrumb.vue'
+import QueueInlineProgressSummary from '@/components/queue/QueueInlineProgressSummary.vue'
+import QueueNotificationBannerHost from '@/components/queue/QueueNotificationBannerHost.vue'
 import QueueProgressOverlay from '@/components/queue/QueueProgressOverlay.vue'
+import ErrorOverlay from '@/components/error/ErrorOverlay.vue'
 import ActionBarButtons from '@/components/topbar/ActionBarButtons.vue'
 import CurrentUserButton from '@/components/topbar/CurrentUserButton.vue'
 import LoginButton from '@/components/topbar/LoginButton.vue'
 import Button from '@/components/ui/button/Button.vue'
 import { useCurrentUser } from '@/composables/auth/useCurrentUser'
+import { useQueueFeatureFlags } from '@/composables/queue/useQueueFeatureFlags'
 import { useErrorHandling } from '@/composables/useErrorHandling'
 import { buildTooltipConfig } from '@/composables/useTooltipConfig'
+import { useSettingStore } from '@/platform/settings/settingStore'
 import { app } from '@/scripts/app'
-import { useCommandStore } from '@/stores/commandStore'
-import { useQueueStore, useQueueUIStore } from '@/stores/queueStore'
+import { useExecutionErrorStore } from '@/stores/executionErrorStore'
+import { useQueueUIStore } from '@/stores/queueStore'
 import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
-import { isElectron } from '@/utils/envUtil'
+import { isCloud, isDesktop } from '@/platform/distribution/types'
+import { useFeatureFlags } from '@/composables/useFeatureFlags'
+import {
+  openShareDialog,
+  prefetchShareDialog
+} from '@/platform/workflow/sharing/composables/lazyShareDialog'
+import { useConflictAcknowledgment } from '@/workbench/extensions/manager/composables/useConflictAcknowledgment'
 import { useManagerState } from '@/workbench/extensions/manager/composables/useManagerState'
 import { ManagerTab } from '@/workbench/extensions/manager/types/comfyManagerTypes'
+import { cn } from '@/utils/tailwindUtil'
 
+const settingStore = useSettingStore()
 const workspaceStore = useWorkspaceStore()
 const rightSidePanelStore = useRightSidePanelStore()
 const managerState = useManagerState()
+const { flags } = useFeatureFlags()
 const { isLoggedIn } = useCurrentUser()
-const isDesktop = isElectron()
 const { t } = useI18n()
 const { toastErrorHandler } = useErrorHandling()
-const commandStore = useCommandStore()
-const queueStore = useQueueStore()
+const executionErrorStore = useExecutionErrorStore()
 const queueUIStore = useQueueUIStore()
 const { isOverlayExpanded: isQueueOverlayExpanded } = storeToRefs(queueUIStore)
+const { shouldShowRedDot: shouldShowConflictRedDot } =
+  useConflictAcknowledgment()
 const isTopMenuHovered = ref(false)
-const queuedCount = computed(() => queueStore.pendingTasks.length)
-const queueHistoryTooltipConfig = computed(() =>
-  buildTooltipConfig(t('sideToolbar.queueProgressOverlay.viewJobHistory'))
+const actionbarContainerRef = ref<HTMLElement>()
+const isActionbarDocked = useLocalStorage('Comfy.MenuPosition.Docked', true)
+const actionbarPosition = computed(() => settingStore.get('Comfy.UseNewMenu'))
+const isActionbarEnabled = computed(
+  () => actionbarPosition.value !== 'Disabled'
+)
+const isActionbarFloating = computed(
+  () => isActionbarEnabled.value && !isActionbarDocked.value
+)
+const isIntegratedTabBar = computed(
+  () => settingStore.get('Comfy.UI.TabBarLayout') === 'Integrated'
+)
+const { isQueuePanelV2Enabled, isRunProgressBarEnabled } =
+  useQueueFeatureFlags()
+const isQueueProgressOverlayEnabled = computed(
+  () => !isQueuePanelV2Enabled.value
+)
+const shouldShowInlineProgressSummary = computed(
+  () =>
+    isQueuePanelV2Enabled.value &&
+    isActionbarEnabled.value &&
+    isRunProgressBarEnabled.value
+)
+const shouldShowQueueNotificationBanners = computed(
+  () => isActionbarEnabled.value
+)
+const progressTarget = ref<HTMLElement | null>(null)
+function updateProgressTarget(target: HTMLElement | null) {
+  progressTarget.value = target
+}
+const inlineProgressSummaryTarget = computed(() => {
+  if (!shouldShowInlineProgressSummary.value || !isActionbarFloating.value) {
+    return null
+  }
+  return progressTarget.value
+})
+const shouldHideInlineProgressSummary = computed(
+  () => isQueueProgressOverlayEnabled.value && isQueueOverlayExpanded.value
 )
 const customNodesManagerTooltipConfig = computed(() =>
-  buildTooltipConfig(t('menu.customNodesManager'))
+  buildTooltipConfig(t('menu.manageExtensions'))
 )
+const shareTooltipConfig = computed(() =>
+  buildTooltipConfig(t('actionbar.shareTooltip'))
+)
+
+const shouldShowRedDot = computed((): boolean => {
+  return shouldShowConflictRedDot.value
+})
+
+const { hasAnyError } = storeToRefs(executionErrorStore)
 
 // Right side panel toggle
 const { isOpen: isRightSidePanelOpen } = storeToRefs(rightSidePanelStore)
@@ -135,10 +240,6 @@ onMounted(() => {
   }
 })
 
-const toggleQueueOverlay = () => {
-  commandStore.execute('Comfy.Queue.ToggleOverlay')
-}
-
 const openCustomNodeManager = async () => {
   try {
     await managerState.openManager({
diff --git a/src/components/actionbar/ComfyActionbar.test.ts b/src/components/actionbar/ComfyActionbar.test.ts
new file mode 100644
index 0000000000..f0a5237b58
--- /dev/null
+++ b/src/components/actionbar/ComfyActionbar.test.ts
@@ -0,0 +1,101 @@
+import { createTestingPinia } from '@pinia/testing'
+import { mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { nextTick } from 'vue'
+
+import ComfyActionbar from '@/components/actionbar/ComfyActionbar.vue'
+import { i18n } from '@/i18n'
+import { useSettingStore } from '@/platform/settings/settingStore'
+
+const configureSettings = (
+  pinia: ReturnType<typeof createTestingPinia>,
+  showRunProgressBar: boolean
+) => {
+  const settingStore = useSettingStore(pinia)
+  vi.mocked(settingStore.get).mockImplementation((key) => {
+    if (key === 'Comfy.UseNewMenu') return 'Top'
+    if (key === 'Comfy.Queue.QPOV2') return true
+    if (key === 'Comfy.Queue.ShowRunProgressBar') return showRunProgressBar
+    return undefined
+  })
+}
+
+const mountActionbar = (showRunProgressBar: boolean) => {
+  const topMenuContainer = document.createElement('div')
+  document.body.appendChild(topMenuContainer)
+
+  const pinia = createTestingPinia({ createSpy: vi.fn })
+  configureSettings(pinia, showRunProgressBar)
+
+  const wrapper = mount(ComfyActionbar, {
+    attachTo: document.body,
+    props: {
+      topMenuContainer,
+      queueOverlayExpanded: false
+    },
+    global: {
+      plugins: [pinia, i18n],
+      stubs: {
+        ContextMenu: {
+          name: 'ContextMenu',
+          template: '<div />'
+        },
+        Panel: {
+          name: 'Panel',
+          template: '<div><slot /></div>'
+        },
+        StatusBadge: true,
+        ComfyRunButton: {
+          name: 'ComfyRunButton',
+          template: '<button type="button">Run</button>'
+        },
+        QueueInlineProgress: true
+      },
+      directives: {
+        tooltip: () => {}
+      }
+    }
+  })
+
+  return {
+    wrapper,
+    topMenuContainer
+  }
+}
+
+describe('ComfyActionbar', () => {
+  beforeEach(() => {
+    i18n.global.locale.value = 'en'
+    localStorage.clear()
+  })
+
+  it('teleports inline progress when run progress bar is enabled', async () => {
+    const { wrapper, topMenuContainer } = mountActionbar(true)
+
+    try {
+      await nextTick()
+
+      expect(
+        topMenuContainer.querySelector('[data-testid="queue-inline-progress"]')
+      ).not.toBeNull()
+    } finally {
+      wrapper.unmount()
+      topMenuContainer.remove()
+    }
+  })
+
+  it('does not teleport inline progress when run progress bar is disabled', async () => {
+    const { wrapper, topMenuContainer } = mountActionbar(false)
+
+    try {
+      await nextTick()
+
+      expect(
+        topMenuContainer.querySelector('[data-testid="queue-inline-progress"]')
+      ).toBeNull()
+    } finally {
+      wrapper.unmount()
+      topMenuContainer.remove()
+    }
+  })
+})
diff --git a/src/components/actionbar/ComfyActionbar.vue b/src/components/actionbar/ComfyActionbar.vue
index 1d24e48385..bb56630f90 100644
--- a/src/components/actionbar/ComfyActionbar.vue
+++ b/src/components/actionbar/ComfyActionbar.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex h-full items-center">
+  <div class="flex h-full items-center" :class="cn(!isDocked && '-ml-2')">
     <div
       v-if="isDragging && !isDocked"
       :class="actionbarClass"
@@ -10,6 +10,7 @@
     </div>
 
     <Panel
+      ref="panelRef"
       class="pointer-events-auto"
       :style="style"
       :class="panelClass"
@@ -18,12 +19,12 @@
         content: { class: isDocked ? 'p-0' : 'p-1' }
       }"
     >
-      <div ref="panelRef" class="flex items-center select-none gap-2">
+      <div class="relative flex items-center gap-2 select-none">
         <span
           ref="dragHandleRef"
           :class="
             cn(
-              'drag-handle cursor-grab w-3 h-max',
+              'drag-handle h-max w-3 cursor-grab',
               isDragging && 'cursor-grabbing'
             )
           "
@@ -41,8 +42,48 @@
         >
           <i class="icon-[lucide--x] size-4" />
         </Button>
+        <Button
+          v-tooltip.bottom="queueHistoryTooltipConfig"
+          variant="secondary"
+          size="md"
+          :aria-pressed="
+            isQueuePanelV2Enabled
+              ? activeSidebarTabId === 'job-history'
+              : queueOverlayExpanded
+          "
+          class="relative px-3"
+          data-testid="queue-overlay-toggle"
+          @click="toggleQueueOverlay"
+          @contextmenu.stop.prevent="showQueueContextMenu"
+        >
+          <span class="text-sm font-normal tabular-nums">
+            {{ activeJobsLabel }}
+          </span>
+          <StatusBadge
+            v-if="activeJobsCount > 0"
+            data-testid="active-jobs-indicator"
+            variant="dot"
+            class="pointer-events-none absolute -top-0.5 -right-0.5 animate-pulse"
+          />
+          <span class="sr-only">
+            {{
+              isQueuePanelV2Enabled
+                ? t('sideToolbar.queueProgressOverlay.viewJobHistory')
+                : t('sideToolbar.queueProgressOverlay.expandCollapsedQueue')
+            }}
+          </span>
+        </Button>
+        <ContextMenu ref="queueContextMenu" :model="queueContextMenuItems" />
       </div>
     </Panel>
+
+    <Teleport v-if="inlineProgressTarget" :to="inlineProgressTarget">
+      <QueueInlineProgress
+        :hidden="shouldHideInlineProgress"
+        :radius-class="cn(isDocked ? 'rounded-[7px]' : 'rounded-[5px]')"
+        data-testid="queue-inline-progress"
+      />
+    </Teleport>
   </div>
 </template>
 
@@ -51,51 +92,72 @@ import {
   useDraggable,
   useEventListener,
   useLocalStorage,
+  unrefElement,
   watchDebounced
 } from '@vueuse/core'
 import { clamp } from 'es-toolkit/compat'
 import { storeToRefs } from 'pinia'
+import ContextMenu from 'primevue/contextmenu'
+import type { MenuItem } from 'primevue/menuitem'
 import Panel from 'primevue/panel'
 import { computed, nextTick, ref, watch } from 'vue'
+import type { ComponentPublicInstance } from 'vue'
 import { useI18n } from 'vue-i18n'
 
+import StatusBadge from '@/components/common/StatusBadge.vue'
+import QueueInlineProgress from '@/components/queue/QueueInlineProgress.vue'
 import Button from '@/components/ui/button/Button.vue'
+import { useQueueFeatureFlags } from '@/composables/queue/useQueueFeatureFlags'
 import { buildTooltipConfig } from '@/composables/useTooltipConfig'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { useTelemetry } from '@/platform/telemetry'
 import { useCommandStore } from '@/stores/commandStore'
 import { useExecutionStore } from '@/stores/executionStore'
+import { useQueueStore } from '@/stores/queueStore'
+import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
 import { cn } from '@/utils/tailwindUtil'
 
 import ComfyRunButton from './ComfyRunButton'
 
-const settingsStore = useSettingStore()
+const { topMenuContainer, queueOverlayExpanded = false } = defineProps<{
+  topMenuContainer?: HTMLElement | null
+  queueOverlayExpanded?: boolean
+}>()
+
+const emit = defineEmits<{
+  (event: 'update:progressTarget', target: HTMLElement | null): void
+}>()
+
+const settingStore = useSettingStore()
 const commandStore = useCommandStore()
-const { t } = useI18n()
-const { isIdle: isExecutionIdle } = storeToRefs(useExecutionStore())
+const executionStore = useExecutionStore()
+const queueStore = useQueueStore()
+const sidebarTabStore = useSidebarTabStore()
+const { t, n } = useI18n()
+const { isIdle: isExecutionIdle } = storeToRefs(executionStore)
+const { activeJobsCount } = storeToRefs(queueStore)
+const { activeSidebarTabId } = storeToRefs(sidebarTabStore)
 
-const position = computed(() => settingsStore.get('Comfy.UseNewMenu'))
+const position = computed(() => settingStore.get('Comfy.UseNewMenu'))
 const visible = computed(() => position.value !== 'Disabled')
+const { isQueuePanelV2Enabled, isRunProgressBarEnabled } =
+  useQueueFeatureFlags()
 
-const tabContainer = document.querySelector('.workflow-tabs-container')
-const panelRef = ref<HTMLElement | null>(null)
+const panelRef = ref<ComponentPublicInstance | null>(null)
+const panelElement = computed<HTMLElement | null>(() => {
+  const element = unrefElement(panelRef)
+  return element instanceof HTMLElement ? element : null
+})
 const dragHandleRef = ref<HTMLElement | null>(null)
 const isDocked = useLocalStorage('Comfy.MenuPosition.Docked', true)
 const storedPosition = useLocalStorage('Comfy.MenuPosition.Floating', {
   x: 0,
   y: 0
 })
-const { x, y, style, isDragging } = useDraggable(panelRef, {
+const { x, y, style, isDragging } = useDraggable(panelElement, {
   initialValue: { x: 0, y: 0 },
   handle: dragHandleRef,
-  containerElement: document.body,
-  onMove: (event) => {
-    // Prevent dragging the menu over the top of the tabs
-    const minY = tabContainer?.getBoundingClientRect().bottom ?? 40
-    if (event.y < minY) {
-      event.y = minY
-    }
-  }
+  containerElement: document.body
 })
 
 // Update storedPosition when x or y changes
@@ -109,11 +171,12 @@ watchDebounced(
 
 // Set initial position to bottom center
 const setInitialPosition = () => {
-  if (panelRef.value) {
+  const panel = panelElement.value
+  if (panel) {
     const screenWidth = window.innerWidth
     const screenHeight = window.innerHeight
-    const menuWidth = panelRef.value.offsetWidth
-    const menuHeight = panelRef.value.offsetHeight
+    const menuWidth = panel.offsetWidth
+    const menuHeight = panel.offsetHeight
 
     if (menuWidth === 0 || menuHeight === 0) {
       return
@@ -189,11 +252,12 @@ watch(
 )
 
 const adjustMenuPosition = () => {
-  if (panelRef.value) {
+  const panel = panelElement.value
+  if (panel) {
     const screenWidth = window.innerWidth
     const screenHeight = window.innerHeight
-    const menuWidth = panelRef.value.offsetWidth
-    const menuHeight = panelRef.value.offsetHeight
+    const menuWidth = panel.offsetWidth
+    const menuHeight = panel.offsetHeight
 
     // Calculate distances to all edges
     const distanceLeft = lastDragState.value.x
@@ -260,6 +324,28 @@ const onMouseLeaveDropZone = () => {
   }
 }
 
+const inlineProgressTarget = computed(() => {
+  if (
+    !visible.value ||
+    !isQueuePanelV2Enabled.value ||
+    !isRunProgressBarEnabled.value
+  ) {
+    return null
+  }
+  if (isDocked.value) return topMenuContainer ?? null
+  return panelElement.value
+})
+const shouldHideInlineProgress = computed(
+  () => !isQueuePanelV2Enabled.value && queueOverlayExpanded
+)
+watch(
+  panelElement,
+  (target) => {
+    emit('update:progressTarget', target)
+  },
+  { immediate: true }
+)
+
 // Handle drag state changes
 watch(isDragging, (dragging) => {
   if (dragging) {
@@ -280,28 +366,75 @@ watch(isDragging, (dragging) => {
 const cancelJobTooltipConfig = computed(() =>
   buildTooltipConfig(t('menu.interrupt'))
 )
+const queueHistoryTooltipConfig = computed(() =>
+  buildTooltipConfig(
+    t(
+      isQueuePanelV2Enabled.value
+        ? 'sideToolbar.queueProgressOverlay.viewJobHistory'
+        : 'sideToolbar.queueProgressOverlay.expandCollapsedQueue'
+    )
+  )
+)
+const activeJobsLabel = computed(() => {
+  const count = activeJobsCount.value
+  return t(
+    'sideToolbar.queueProgressOverlay.activeJobsShort',
+    { count: n(count) },
+    count
+  )
+})
+const queueContextMenu = ref<InstanceType<typeof ContextMenu> | null>(null)
+const queueContextMenuItems = computed<MenuItem[]>(() => [
+  {
+    label: t('sideToolbar.queueProgressOverlay.clearQueueTooltip'),
+    icon: 'icon-[lucide--list-x] text-destructive-background',
+    class: '*:text-destructive-background',
+    disabled: queueStore.pendingTasks.length === 0,
+    command: () => {
+      void handleClearQueue()
+    }
+  }
+])
 
 const cancelCurrentJob = async () => {
   if (isExecutionIdle.value) return
   await commandStore.execute('Comfy.Interrupt')
 }
+const toggleQueueOverlay = () => {
+  if (isQueuePanelV2Enabled.value) {
+    sidebarTabStore.toggleSidebarTab('job-history')
+    return
+  }
+  commandStore.execute('Comfy.Queue.ToggleOverlay')
+}
+const showQueueContextMenu = (event: MouseEvent) => {
+  queueContextMenu.value?.show(event)
+}
+const handleClearQueue = async () => {
+  const pendingJobIds = queueStore.pendingTasks
+    .map((task) => task.jobId)
+    .filter((id): id is string => typeof id === 'string' && id.length > 0)
+
+  await commandStore.execute('Comfy.ClearPendingTasks')
+  executionStore.clearInitializationByJobIds(pendingJobIds)
+}
 
 const actionbarClass = computed(() =>
   cn(
     'w-[200px] border-dashed border-blue-500 opacity-80',
     'm-1.5 flex items-center justify-center self-stretch',
-    'rounded-md before:w-50 before:-ml-50 before:h-full',
+    'rounded-md before:-ml-50 before:h-full before:w-50',
     'pointer-events-auto',
     isMouseOverDropZone.value &&
-      'border-[3px] opacity-100 scale-105 shadow-[0_0_20px] shadow-blue-500'
+      'scale-105 border-[3px] opacity-100 shadow-[0_0_20px] shadow-blue-500'
   )
 )
 const panelClass = computed(() =>
   cn(
     'actionbar pointer-events-auto z-1300',
-    isDragging.value && 'select-none pointer-events-none',
+    isDragging.value && 'pointer-events-none select-none',
     isDocked.value
-      ? 'p-0 static border-none bg-transparent'
+      ? 'static border-none bg-transparent p-0'
       : 'fixed shadow-interface'
   )
 )
diff --git a/src/components/actionbar/ComfyRunButton/CloudRunButtonWrapper.vue b/src/components/actionbar/ComfyRunButton/CloudRunButtonWrapper.vue
index c0cda19bff..6aa543eeca 100644
--- a/src/components/actionbar/ComfyRunButton/CloudRunButtonWrapper.vue
+++ b/src/components/actionbar/ComfyRunButton/CloudRunButtonWrapper.vue
@@ -8,10 +8,10 @@
 import { computed } from 'vue'
 
 import ComfyQueueButton from '@/components/actionbar/ComfyRunButton/ComfyQueueButton.vue'
+import { useBillingContext } from '@/composables/billing/useBillingContext'
 import SubscribeToRunButton from '@/platform/cloud/subscription/components/SubscribeToRun.vue'
-import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
 
-const { isActiveSubscription } = useSubscription()
+const { isActiveSubscription } = useBillingContext()
 
 const currentButton = computed(() =>
   isActiveSubscription.value ? ComfyQueueButton : SubscribeToRunButton
diff --git a/src/components/actionbar/ComfyRunButton/ComfyQueueButton.test.ts b/src/components/actionbar/ComfyRunButton/ComfyQueueButton.test.ts
new file mode 100644
index 0000000000..41470be2b2
--- /dev/null
+++ b/src/components/actionbar/ComfyRunButton/ComfyQueueButton.test.ts
@@ -0,0 +1,197 @@
+import { createTestingPinia } from '@pinia/testing'
+import { mount } from '@vue/test-utils'
+import { describe, expect, it, vi } from 'vitest'
+import { defineComponent, nextTick } from 'vue'
+import { createI18n } from 'vue-i18n'
+
+import type {
+  JobListItem,
+  JobStatus
+} from '@/platform/remote/comfyui/jobs/jobTypes'
+import { useCommandStore } from '@/stores/commandStore'
+import {
+  TaskItemImpl,
+  useQueueSettingsStore,
+  useQueueStore
+} from '@/stores/queueStore'
+
+import ComfyQueueButton from './ComfyQueueButton.vue'
+
+vi.mock('@/platform/distribution/types', () => ({
+  isCloud: false
+}))
+
+vi.mock('@/platform/telemetry', () => ({
+  useTelemetry: () => null
+}))
+
+vi.mock('@/workbench/extensions/manager/utils/graphHasMissingNodes', () => ({
+  graphHasMissingNodes: () => false
+}))
+
+vi.mock('@/scripts/app', () => ({
+  app: {
+    rootGraph: {}
+  }
+}))
+
+vi.mock('@/stores/workspaceStore', () => ({
+  useWorkspaceStore: () => ({
+    shiftDown: false
+  })
+}))
+
+const SplitButtonStub = defineComponent({
+  name: 'SplitButton',
+  props: {
+    label: {
+      type: String,
+      default: ''
+    },
+    severity: {
+      type: String,
+      default: 'primary'
+    }
+  },
+  template: `
+    <button
+      data-testid="split-button"
+      :data-label="label"
+      :data-severity="severity"
+    >
+      <slot name="icon" />
+    </button>
+  `
+})
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      menu: {
+        run: 'Run',
+        disabledTooltip: 'Disabled tooltip',
+        onChange: 'On Change',
+        onChangeTooltip: 'On change tooltip',
+        instant: 'Instant',
+        instantTooltip: 'Instant tooltip',
+        stopRunInstant: 'Stop Run (Instant)',
+        stopRunInstantTooltip: 'Stop running',
+        runWorkflow: 'Run workflow',
+        runWorkflowFront: 'Run workflow front',
+        runWorkflowDisabled: 'Run workflow disabled'
+      }
+    }
+  }
+})
+
+function createTask(id: string, status: JobStatus): TaskItemImpl {
+  const job: JobListItem = {
+    id,
+    status,
+    create_time: Date.now(),
+    priority: 1
+  }
+
+  return new TaskItemImpl(job)
+}
+
+function createWrapper() {
+  const pinia = createTestingPinia({ createSpy: vi.fn })
+
+  return mount(ComfyQueueButton, {
+    global: {
+      plugins: [pinia, i18n],
+      directives: {
+        tooltip: () => {}
+      },
+      stubs: {
+        SplitButton: SplitButtonStub,
+        BatchCountEdit: true
+      }
+    }
+  })
+}
+
+describe('ComfyQueueButton', () => {
+  it('keeps the run instant presentation while idle even with active jobs', async () => {
+    const wrapper = createWrapper()
+    const queueSettingsStore = useQueueSettingsStore()
+    const queueStore = useQueueStore()
+
+    queueSettingsStore.mode = 'instant-idle'
+    queueStore.runningTasks = [createTask('run-1', 'in_progress')]
+    await nextTick()
+
+    const splitButton = wrapper.get('[data-testid="queue-button"]')
+
+    expect(splitButton.attributes('data-label')).toBe('Run (Instant)')
+    expect(splitButton.attributes('data-severity')).toBe('primary')
+    expect(wrapper.find('.icon-\\[lucide--fast-forward\\]').exists()).toBe(true)
+  })
+
+  it('switches to stop presentation when instant mode is armed', async () => {
+    const wrapper = createWrapper()
+    const queueSettingsStore = useQueueSettingsStore()
+
+    queueSettingsStore.mode = 'instant-running'
+    await nextTick()
+
+    const splitButton = wrapper.get('[data-testid="queue-button"]')
+
+    expect(splitButton.attributes('data-label')).toBe('Stop Run (Instant)')
+    expect(splitButton.attributes('data-severity')).toBe('danger')
+    expect(wrapper.find('.icon-\\[lucide--square\\]').exists()).toBe(true)
+  })
+
+  it('disarms instant mode without interrupting even when jobs are active', async () => {
+    const wrapper = createWrapper()
+    const queueSettingsStore = useQueueSettingsStore()
+    const queueStore = useQueueStore()
+    const commandStore = useCommandStore()
+
+    queueSettingsStore.mode = 'instant-running'
+    queueStore.runningTasks = [createTask('run-1', 'in_progress')]
+    await nextTick()
+
+    await wrapper.get('[data-testid="queue-button"]').trigger('click')
+    await nextTick()
+
+    expect(queueSettingsStore.mode).toBe('instant-idle')
+    const splitButtonWhileStopping = wrapper.get('[data-testid="queue-button"]')
+    expect(splitButtonWhileStopping.attributes('data-label')).toBe(
+      'Run (Instant)'
+    )
+    expect(splitButtonWhileStopping.attributes('data-severity')).toBe('primary')
+    expect(wrapper.find('.icon-\\[lucide--fast-forward\\]').exists()).toBe(true)
+
+    expect(commandStore.execute).not.toHaveBeenCalled()
+
+    const splitButton = wrapper.get('[data-testid="queue-button"]')
+    expect(queueSettingsStore.mode).toBe('instant-idle')
+    expect(splitButton.attributes('data-label')).toBe('Run (Instant)')
+    expect(splitButton.attributes('data-severity')).toBe('primary')
+    expect(wrapper.find('.icon-\\[lucide--fast-forward\\]').exists()).toBe(true)
+  })
+
+  it('activates instant running mode when queueing again', async () => {
+    const wrapper = createWrapper()
+    const queueSettingsStore = useQueueSettingsStore()
+    const commandStore = useCommandStore()
+
+    queueSettingsStore.mode = 'instant-idle'
+    await nextTick()
+
+    await wrapper.get('[data-testid="queue-button"]').trigger('click')
+    await nextTick()
+
+    expect(queueSettingsStore.mode).toBe('instant-running')
+    expect(commandStore.execute).toHaveBeenCalledWith('Comfy.QueuePrompt', {
+      metadata: {
+        subscribe_to_run: false,
+        trigger_source: 'button'
+      }
+    })
+  })
+})
diff --git a/src/components/actionbar/ComfyRunButton/ComfyQueueButton.vue b/src/components/actionbar/ComfyRunButton/ComfyQueueButton.vue
index 4c0ea84e43..1218b7228e 100644
--- a/src/components/actionbar/ComfyRunButton/ComfyQueueButton.vue
+++ b/src/components/actionbar/ComfyRunButton/ComfyQueueButton.vue
@@ -6,8 +6,8 @@
         showDelay: 600
       }"
       class="comfyui-queue-button"
-      :label="String(activeQueueModeMenuItem?.label ?? '')"
-      severity="primary"
+      :label="queueButtonLabel"
+      :severity="queueButtonSeverity"
       size="small"
       :model="queueModeMenuItems"
       data-testid="queue-button"
@@ -22,7 +22,7 @@
             value: item.tooltip,
             showDelay: 600
           }"
-          :variant="item.key === queueMode ? 'primary' : 'secondary'"
+          :variant="item.key === selectedQueueMode ? 'primary' : 'secondary'"
           size="sm"
           class="w-full justify-start"
         >
@@ -48,7 +48,11 @@ import { useTelemetry } from '@/platform/telemetry'
 import { app } from '@/scripts/app'
 import { useCommandStore } from '@/stores/commandStore'
 import { useNodeDefStore } from '@/stores/nodeDefStore'
-import { useQueueSettingsStore } from '@/stores/queueStore'
+import {
+  isInstantMode,
+  isInstantRunningMode,
+  useQueueSettingsStore
+} from '@/stores/queueStore'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
 import { graphHasMissingNodes } from '@/workbench/extensions/manager/utils/graphHasMissingNodes'
 
@@ -63,6 +67,12 @@ const hasMissingNodes = computed(() =>
 )
 
 const { t } = useI18n()
+type QueueModeMenuKey = 'disabled' | 'change' | 'instant-idle'
+
+const selectedQueueMode = computed<QueueModeMenuKey>(() =>
+  isInstantMode(queueMode.value) ? 'instant-idle' : queueMode.value
+)
+
 const queueModeMenuItemLookup = computed(() => {
   const items: Record<string, MenuItem> = {
     disabled: {
@@ -86,15 +96,15 @@ const queueModeMenuItemLookup = computed(() => {
     }
   }
   if (!isCloud) {
-    items.instant = {
-      key: 'instant',
+    items['instant-idle'] = {
+      key: 'instant-idle',
       label: `${t('menu.run')} (${t('menu.instant')})`,
       tooltip: t('menu.instantTooltip'),
       command: () => {
         useTelemetry()?.trackUiButtonClicked({
           button_id: 'queue_mode_option_run_instant_selected'
         })
-        queueMode.value = 'instant'
+        queueMode.value = 'instant-idle'
       }
     }
   }
@@ -104,7 +114,7 @@ const queueModeMenuItemLookup = computed(() => {
 const activeQueueModeMenuItem = computed(() => {
   // Fallback to disabled mode if current mode is not available (e.g., instant mode in cloud)
   return (
-    queueModeMenuItemLookup.value[queueMode.value] ||
+    queueModeMenuItemLookup.value[selectedQueueMode.value] ||
     queueModeMenuItemLookup.value.disabled
   )
 })
@@ -112,7 +122,24 @@ const queueModeMenuItems = computed(() =>
   Object.values(queueModeMenuItemLookup.value)
 )
 
+const isStopInstantAction = computed(() =>
+  isInstantRunningMode(queueMode.value)
+)
+
+const queueButtonLabel = computed(() =>
+  isStopInstantAction.value
+    ? t('menu.stopRunInstant')
+    : String(activeQueueModeMenuItem.value?.label ?? '')
+)
+
+const queueButtonSeverity = computed(() =>
+  isStopInstantAction.value ? 'danger' : 'primary'
+)
+
 const iconClass = computed(() => {
+  if (isStopInstantAction.value) {
+    return 'icon-[lucide--square]'
+  }
   if (hasMissingNodes.value) {
     return 'icon-[lucide--triangle-alert]'
   }
@@ -122,7 +149,7 @@ const iconClass = computed(() => {
   if (queueMode.value === 'disabled') {
     return 'icon-[lucide--play]'
   }
-  if (queueMode.value === 'instant') {
+  if (isInstantMode(queueMode.value)) {
     return 'icon-[lucide--fast-forward]'
   }
   if (queueMode.value === 'change') {
@@ -132,6 +159,9 @@ const iconClass = computed(() => {
 })
 
 const queueButtonTooltip = computed(() => {
+  if (isStopInstantAction.value) {
+    return t('menu.stopRunInstantTooltip')
+  }
   if (hasMissingNodes.value) {
     return t('menu.runWorkflowDisabled')
   }
@@ -143,11 +173,20 @@ const queueButtonTooltip = computed(() => {
 
 const commandStore = useCommandStore()
 const queuePrompt = async (e: Event) => {
+  if (isStopInstantAction.value) {
+    queueMode.value = 'instant-idle'
+    return
+  }
+
   const isShiftPressed = 'shiftKey' in e && e.shiftKey
   const commandId = isShiftPressed
     ? 'Comfy.QueuePromptFront'
     : 'Comfy.QueuePrompt'
 
+  if (isInstantMode(queueMode.value)) {
+    queueMode.value = 'instant-running'
+  }
+
   if (batchCount.value > 1) {
     useTelemetry()?.trackUiButtonClicked({
       button_id: 'queue_run_multiple_batches_submitted'
diff --git a/src/components/appMode/AppModeToolbar.vue b/src/components/appMode/AppModeToolbar.vue
new file mode 100644
index 0000000000..3d66fafc0e
--- /dev/null
+++ b/src/components/appMode/AppModeToolbar.vue
@@ -0,0 +1,134 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import WorkflowActionsDropdown from '@/components/common/WorkflowActionsDropdown.vue'
+import { useErrorHandling } from '@/composables/useErrorHandling'
+import { useFeatureFlags } from '@/composables/useFeatureFlags'
+import Button from '@/components/ui/button/Button.vue'
+import { useAppMode } from '@/composables/useAppMode'
+import { useWorkflowTemplateSelectorDialog } from '@/composables/useWorkflowTemplateSelectorDialog'
+import { isCloud } from '@/platform/distribution/types'
+import {
+  openShareDialog,
+  prefetchShareDialog
+} from '@/platform/workflow/sharing/composables/lazyShareDialog'
+import { useAppModeStore } from '@/stores/appModeStore'
+import { useCommandStore } from '@/stores/commandStore'
+import { useWorkspaceStore } from '@/stores/workspaceStore'
+import { cn } from '@/utils/tailwindUtil'
+import { storeToRefs } from 'pinia'
+
+const { t } = useI18n()
+const commandStore = useCommandStore()
+const workspaceStore = useWorkspaceStore()
+const { enableAppBuilder } = useAppMode()
+const appModeStore = useAppModeStore()
+const { enterBuilder } = appModeStore
+const { toastErrorHandler } = useErrorHandling()
+const { flags } = useFeatureFlags()
+const { hasNodes } = storeToRefs(appModeStore)
+const tooltipOptions = { showDelay: 300, hideDelay: 300 }
+
+const isAssetsActive = computed(
+  () => workspaceStore.sidebarTab.activeSidebarTab?.id === 'assets'
+)
+const isAppsActive = computed(
+  () => workspaceStore.sidebarTab.activeSidebarTab?.id === 'apps'
+)
+
+function openAssets() {
+  void commandStore.execute('Workspace.ToggleSidebarTab.assets')
+}
+
+function showApps() {
+  void commandStore.execute('Workspace.ToggleSidebarTab.apps')
+}
+
+function openTemplates() {
+  useWorkflowTemplateSelectorDialog().show('sidebar')
+}
+</script>
+
+<template>
+  <div class="pointer-events-auto flex flex-col gap-2">
+    <WorkflowActionsDropdown source="app_mode_toolbar" />
+
+    <Button
+      v-if="enableAppBuilder"
+      v-tooltip.right="{
+        value: t('linearMode.appModeToolbar.appBuilder'),
+        ...tooltipOptions
+      }"
+      variant="secondary"
+      size="unset"
+      :disabled="!hasNodes"
+      :aria-label="t('linearMode.appModeToolbar.appBuilder')"
+      class="size-10 rounded-lg"
+      @click="enterBuilder"
+    >
+      <i class="icon-[lucide--hammer] size-4" />
+    </Button>
+    <Button
+      v-if="isCloud && flags.workflowSharingEnabled"
+      v-tooltip.right="{
+        value: t('actionbar.shareTooltip'),
+        ...tooltipOptions
+      }"
+      variant="secondary"
+      size="unset"
+      :aria-label="t('actionbar.shareTooltip')"
+      class="size-10 rounded-lg"
+      @click="() => openShareDialog().catch(toastErrorHandler)"
+      @pointerenter="prefetchShareDialog"
+    >
+      <i class="icon-[lucide--send] size-4" />
+    </Button>
+
+    <div
+      class="flex w-10 flex-col overflow-hidden rounded-lg bg-secondary-background"
+    >
+      <Button
+        v-tooltip.right="{
+          value: t('sideToolbar.mediaAssets.title'),
+          ...tooltipOptions
+        }"
+        variant="textonly"
+        size="unset"
+        :aria-label="t('sideToolbar.mediaAssets.title')"
+        :class="
+          cn('size-10', isAssetsActive && 'bg-secondary-background-hover')
+        "
+        @click="openAssets"
+      >
+        <i class="icon-[comfy--image-ai-edit] size-4" />
+      </Button>
+      <Button
+        v-tooltip.right="{
+          value: t('linearMode.appModeToolbar.apps'),
+          ...tooltipOptions
+        }"
+        variant="textonly"
+        size="unset"
+        :aria-label="t('linearMode.appModeToolbar.apps')"
+        :class="cn('size-10', isAppsActive && 'bg-secondary-background-hover')"
+        @click="showApps"
+      >
+        <i class="icon-[lucide--panels-top-left] size-4" />
+      </Button>
+      <Button
+        v-tooltip.right="{
+          value: t('sideToolbar.templates'),
+          ...tooltipOptions
+        }"
+        variant="textonly"
+        size="unset"
+        :aria-label="t('sideToolbar.templates')"
+        class="size-10"
+        @click="openTemplates"
+      >
+        <i class="icon-[comfy--template] size-4" />
+      </Button>
+    </div>
+  </div>
+</template>
diff --git a/src/components/bottomPanel/BottomPanel.vue b/src/components/bottomPanel/BottomPanel.vue
index aa68006779..08f23c5098 100644
--- a/src/components/bottomPanel/BottomPanel.vue
+++ b/src/components/bottomPanel/BottomPanel.vue
@@ -89,12 +89,12 @@ import { useI18n } from 'vue-i18n'
 
 import ExtensionSlot from '@/components/common/ExtensionSlot.vue'
 import Button from '@/components/ui/button/Button.vue'
-import { useDialogService } from '@/services/dialogService'
+import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
 import { useBottomPanelStore } from '@/stores/workspace/bottomPanelStore'
 import type { BottomPanelExtension } from '@/types/extensionTypes'
 
 const bottomPanelStore = useBottomPanelStore()
-const dialogService = useDialogService()
+const settingsDialog = useSettingsDialog()
 const { t } = useI18n()
 
 const isShortcutsTabActive = computed(() => {
@@ -115,7 +115,7 @@ const getTabDisplayTitle = (tab: BottomPanelExtension): string => {
 }
 
 const openKeybindingSettings = async () => {
-  dialogService.showSettingsDialog('keybinding')
+  settingsDialog.show('keybinding')
 }
 
 const closeBottomPanel = () => {
diff --git a/tests-ui/tests/components/bottomPanel/EssentialsPanel.test.ts b/src/components/bottomPanel/tabs/shortcuts/EssentialsPanel.test.ts
similarity index 100%
rename from tests-ui/tests/components/bottomPanel/EssentialsPanel.test.ts
rename to src/components/bottomPanel/tabs/shortcuts/EssentialsPanel.test.ts
diff --git a/tests-ui/tests/components/bottomPanel/ShortcutsList.spec.ts b/src/components/bottomPanel/tabs/shortcuts/ShortcutsList.test.ts
similarity index 100%
rename from tests-ui/tests/components/bottomPanel/ShortcutsList.spec.ts
rename to src/components/bottomPanel/tabs/shortcuts/ShortcutsList.test.ts
diff --git a/src/components/bottomPanel/tabs/shortcuts/ShortcutsList.vue b/src/components/bottomPanel/tabs/shortcuts/ShortcutsList.vue
index d8992332bc..b9a9ff6894 100644
--- a/src/components/bottomPanel/tabs/shortcuts/ShortcutsList.vue
+++ b/src/components/bottomPanel/tabs/shortcuts/ShortcutsList.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="shortcuts-list flex justify-center">
-    <div class="grid h-full w-[90%] grid-cols-1 gap-4 md:grid-cols-3 md:gap-24">
+    <div
+      data-testid="shortcuts-columns"
+      class="grid h-full w-[90%] grid-cols-1 gap-4 md:grid-cols-3 md:gap-24"
+    >
       <div
         v-for="(subcategoryCommands, subcategory) in filteredSubcategories"
         :key="subcategory"
@@ -16,7 +19,7 @@
           <div
             v-for="command in subcategoryCommands"
             :key="command.id"
-            class="shortcut-item flex items-center justify-between rounded py-2 transition-colors duration-200"
+            class="shortcut-item flex items-center justify-between rounded-sm py-2 transition-colors duration-200"
           >
             <div class="shortcut-info grow pr-4">
               <div class="shortcut-name text-sm font-medium">
@@ -32,7 +35,7 @@
                 <span
                   v-for="key in command.keybinding!.combo.getKeySequences()"
                   :key="key"
-                  class="key-badge min-w-6 rounded bg-muted-background px-2 py-1 text-center font-mono text-xs"
+                  class="key-badge min-w-6 rounded-sm bg-muted-background px-2 py-1 text-center font-mono text-xs"
                 >
                   {{ formatKey(key) }}
                 </span>
diff --git a/tests-ui/tests/components/bottomPanel/tabs/terminal/BaseTerminal.test.ts b/src/components/bottomPanel/tabs/terminal/BaseTerminal.test.ts
similarity index 94%
rename from tests-ui/tests/components/bottomPanel/tabs/terminal/BaseTerminal.test.ts
rename to src/components/bottomPanel/tabs/terminal/BaseTerminal.test.ts
index faa20f654d..a651475fb0 100644
--- a/tests-ui/tests/components/bottomPanel/tabs/terminal/BaseTerminal.test.ts
+++ b/src/components/bottomPanel/tabs/terminal/BaseTerminal.test.ts
@@ -1,6 +1,7 @@
 import { createTestingPinia } from '@pinia/testing'
 import type { VueWrapper } from '@vue/test-utils'
 import { mount } from '@vue/test-utils'
+import type { Mock } from 'vitest'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { nextTick } from 'vue'
 import { createI18n } from 'vue-i18n'
@@ -54,10 +55,17 @@ vi.mock('@/composables/bottomPanelTabs/useTerminal', () => ({
 }))
 
 vi.mock('@/utils/envUtil', () => ({
-  isElectron: vi.fn(() => false),
   electronAPI: vi.fn(() => null)
 }))
 
+const mockData = vi.hoisted(() => ({ isDesktop: false }))
+
+vi.mock('@/platform/distribution/types', () => ({
+  get isDesktop() {
+    return mockData.isDesktop
+  }
+}))
+
 // Mock clipboard API
 Object.defineProperty(navigator, 'clipboard', {
   value: {
@@ -151,8 +159,8 @@ describe('BaseTerminal', () => {
     // Trigger the selection change callback that was registered during mount
     expect(mockTerminal.onSelectionChange).toHaveBeenCalled()
     // Access the mock calls - TypeScript can't infer the mock structure dynamically
-    const selectionCallback = (mockTerminal.onSelectionChange as any).mock
-      .calls[0][0]
+    const mockCalls = (mockTerminal.onSelectionChange as Mock).mock.calls
+    const selectionCallback = mockCalls[0][0] as () => void
     selectionCallback()
     await nextTick()
 
diff --git a/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue b/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue
index 655df0b650..b1a7f30b75 100644
--- a/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue
+++ b/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue
@@ -1,9 +1,6 @@
 <template>
-  <div
-    ref="rootEl"
-    class="relative h-full w-full overflow-hidden bg-neutral-900"
-  >
-    <div class="p-terminal h-full w-full rounded-none p-2">
+  <div ref="rootEl" class="relative size-full overflow-hidden bg-neutral-900">
+    <div class="p-terminal size-full rounded-none p-2">
       <div ref="terminalEl" class="terminal-host h-full" />
     </div>
     <Button
@@ -15,7 +12,7 @@
       size="sm"
       :class="
         cn('absolute top-2 right-8 transition-opacity', {
-          'opacity-0 pointer-events-none select-none': !isHovered
+          'pointer-events-none opacity-0 select-none': !isHovered
         })
       "
       :aria-label="tooltipText"
@@ -35,7 +32,8 @@ import { useI18n } from 'vue-i18n'
 
 import Button from '@/components/ui/button/Button.vue'
 import { useTerminal } from '@/composables/bottomPanelTabs/useTerminal'
-import { electronAPI, isElectron } from '@/utils/envUtil'
+import { electronAPI } from '@/utils/envUtil'
+import { isDesktop } from '@/platform/distribution/types'
 import { cn } from '@/utils/tailwindUtil'
 
 const { t } = useI18n()
@@ -85,7 +83,7 @@ const showContextMenu = (event: MouseEvent) => {
   electronAPI()?.showContextMenu({ type: 'text' })
 }
 
-if (isElectron()) {
+if (isDesktop) {
   useEventListener(terminalEl, 'contextmenu', showContextMenu)
 }
 
@@ -102,13 +100,12 @@ onUnmounted(() => {
 </script>
 
 <style scoped>
-@reference '../../../../assets/css/style.css';
-
 :deep(.p-terminal) .xterm {
-  @apply overflow-hidden;
+  overflow: hidden;
 }
 
 :deep(.p-terminal) .xterm-screen {
-  @apply bg-neutral-900 overflow-hidden;
+  overflow: hidden;
+  background-color: var(--color-neutral-900);
 }
 </style>
diff --git a/src/components/bottomPanel/tabs/terminal/LogsTerminal.vue b/src/components/bottomPanel/tabs/terminal/LogsTerminal.vue
index 98cdb450e5..93b987ee5c 100644
--- a/src/components/bottomPanel/tabs/terminal/LogsTerminal.vue
+++ b/src/components/bottomPanel/tabs/terminal/LogsTerminal.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="h-full w-full bg-transparent">
+  <div class="size-full bg-transparent">
     <p v-if="errorMessage" class="p-4 text-center">
       {{ errorMessage }}
     </p>
diff --git a/src/components/boundingbox/WidgetBoundingBox.vue b/src/components/boundingbox/WidgetBoundingBox.vue
new file mode 100644
index 0000000000..581ec8eaa4
--- /dev/null
+++ b/src/components/boundingbox/WidgetBoundingBox.vue
@@ -0,0 +1,59 @@
+<template>
+  <div class="grid grid-cols-[auto_1fr] gap-x-2 gap-y-1">
+    <label class="content-center text-xs text-node-component-slot-text">
+      {{ $t('boundingBox.x') }}
+    </label>
+    <ScrubableNumberInput v-model="x" :min="0" :step="1" />
+    <label class="content-center text-xs text-node-component-slot-text">
+      {{ $t('boundingBox.y') }}
+    </label>
+    <ScrubableNumberInput v-model="y" :min="0" :step="1" />
+    <label class="content-center text-xs text-node-component-slot-text">
+      {{ $t('boundingBox.width') }}
+    </label>
+    <ScrubableNumberInput v-model="width" :min="1" :step="1" />
+    <label class="content-center text-xs text-node-component-slot-text">
+      {{ $t('boundingBox.height') }}
+    </label>
+    <ScrubableNumberInput v-model="height" :min="1" :step="1" />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+
+import ScrubableNumberInput from '@/components/common/ScrubableNumberInput.vue'
+import type { Bounds } from '@/renderer/core/layout/types'
+
+const modelValue = defineModel<Bounds>({
+  default: () => ({ x: 0, y: 0, width: 512, height: 512 })
+})
+
+const x = computed({
+  get: () => modelValue.value.x,
+  set: (x) => {
+    modelValue.value = { ...modelValue.value, x }
+  }
+})
+
+const y = computed({
+  get: () => modelValue.value.y,
+  set: (y) => {
+    modelValue.value = { ...modelValue.value, y }
+  }
+})
+
+const width = computed({
+  get: () => modelValue.value.width,
+  set: (width) => {
+    modelValue.value = { ...modelValue.value, width }
+  }
+})
+
+const height = computed({
+  get: () => modelValue.value.height,
+  set: (height) => {
+    modelValue.value = { ...modelValue.value, height }
+  }
+})
+</script>
diff --git a/src/components/breadcrumb/SubgraphBreadcrumb.vue b/src/components/breadcrumb/SubgraphBreadcrumb.vue
index 6795ee97d3..4a562685d0 100644
--- a/src/components/breadcrumb/SubgraphBreadcrumb.vue
+++ b/src/components/breadcrumb/SubgraphBreadcrumb.vue
@@ -1,6 +1,7 @@
 <template>
   <div
-    class="subgraph-breadcrumb w-auto drop-shadow-[var(--interface-panel-drop-shadow)]"
+    data-testid="subgraph-breadcrumb"
+    class="subgraph-breadcrumb -mt-3 flex w-auto items-center pt-4 pl-1 drop-shadow-(--interface-panel-drop-shadow)"
     :class="{
       'subgraph-breadcrumb-collapse': collapseTabs,
       'subgraph-breadcrumb-overflow': overflowingTabs
@@ -13,9 +14,21 @@
       '--p-breadcrumb-icon-width': `${ICON_WIDTH}px`
     }"
   >
+    <WorkflowActionsDropdown source="breadcrumb_subgraph_menu_selected" />
+    <Button
+      v-if="isInSubgraph"
+      class="back-button pointer-events-auto ml-1.5 size-8 shrink-0 border border-transparent bg-transparent p-0 transition-all hover:rounded-lg hover:border-interface-stroke hover:bg-comfy-menu-bg"
+      text
+      severity="secondary"
+      size="small"
+      @click="handleBackClick"
+    >
+      <i class="icon-[lucide--undo-2]" />
+    </Button>
     <Breadcrumb
       ref="breadcrumbRef"
       class="w-fit rounded-lg p-0"
+      :class="{ hidden: !isInSubgraph }"
       :model="items"
       :pt="{ item: { class: 'pointer-events-auto' } }"
       :aria-label="$t('g.graphNavigation')"
@@ -23,7 +36,7 @@
       <template #item="{ item }">
         <SubgraphBreadcrumbItem
           :item="item"
-          :is-active="item === items.at(-1)"
+          :is-active="item.key === activeItemKey"
         />
       </template>
       <template #separator
@@ -35,14 +48,17 @@
 
 <script setup lang="ts">
 import Breadcrumb from 'primevue/breadcrumb'
+import Button from 'primevue/button'
 import type { MenuItem } from 'primevue/menuitem'
 import { computed, onUpdated, ref, watch } from 'vue'
 
 import SubgraphBreadcrumbItem from '@/components/breadcrumb/SubgraphBreadcrumbItem.vue'
+import WorkflowActionsDropdown from '@/components/common/WorkflowActionsDropdown.vue'
 import { useOverflowObserver } from '@/composables/element/useOverflowObserver'
 import { useTelemetry } from '@/platform/telemetry'
 import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import { useCommandStore } from '@/stores/commandStore'
 import { useSubgraphNavigationStore } from '@/stores/subgraphNavigationStore'
 import { useSubgraphStore } from '@/stores/subgraphStore'
 import { forEachSubgraphNode } from '@/utils/graphTraversalUtil'
@@ -62,17 +78,28 @@ const isBlueprint = computed(() =>
 const collapseTabs = ref(false)
 const overflowingTabs = ref(false)
 
-const breadcrumbElement = computed(() => {
-  if (!breadcrumbRef.value) return null
+const isInSubgraph = computed(() => navigationStore.navigationStack.length > 0)
 
-  const el = (breadcrumbRef.value as unknown as { $el: HTMLElement }).$el
-  const list = el?.querySelector('.p-breadcrumb-list') as HTMLElement
-  return list
-})
+const home = computed(() => ({
+  label: workflowName.value,
+  icon: 'pi pi-home',
+  key: 'root',
+  isBlueprint: isBlueprint.value,
+  command: () => {
+    useTelemetry()?.trackUiButtonClicked({
+      button_id: 'breadcrumb_subgraph_root_selected'
+    })
+    const canvas = useCanvasStore().getCanvas()
+    if (!canvas.graph) throw new TypeError('Canvas has no graph')
+
+    canvas.setGraph(canvas.graph.rootGraph)
+  }
+}))
 
 const items = computed(() => {
   const items = navigationStore.navigationStack.map<MenuItem>((subgraph) => ({
     label: subgraph.name,
+    key: `subgraph-${subgraph.id}`,
     command: () => {
       useTelemetry()?.trackUiButtonClicked({
         button_id: 'breadcrumb_subgraph_item_selected'
@@ -95,21 +122,19 @@ const items = computed(() => {
   return [home.value, ...items]
 })
 
-const home = computed(() => ({
-  label: workflowName.value,
-  icon: 'pi pi-home',
-  key: 'root',
-  isBlueprint: isBlueprint.value,
-  command: () => {
-    useTelemetry()?.trackUiButtonClicked({
-      button_id: 'breadcrumb_subgraph_root_selected'
-    })
-    const canvas = useCanvasStore().getCanvas()
-    if (!canvas.graph) throw new TypeError('Canvas has no graph')
+const activeItemKey = computed(() => items.value.at(-1)?.key)
 
-    canvas.setGraph(canvas.graph.rootGraph)
-  }
-}))
+const handleBackClick = () => {
+  void useCommandStore().execute('Comfy.Graph.ExitSubgraph')
+}
+
+const breadcrumbElement = computed(() => {
+  if (!breadcrumbRef.value) return null
+
+  const el = (breadcrumbRef.value as unknown as { $el: HTMLElement }).$el
+  const list = el?.querySelector('.p-breadcrumb-list') as HTMLElement
+  return list
+})
 
 // Check for overflow on breadcrumb items and collapse/expand the breadcrumb to fit
 let overflowObserver: ReturnType<typeof useOverflowObserver> | undefined
@@ -170,8 +195,6 @@ onUpdated(() => {
 </script>
 
 <style scoped>
-@reference '../../assets/css/style.css';
-
 .subgraph-breadcrumb:not(:empty) {
   flex: auto;
   flex-shrink: 10000;
@@ -180,7 +203,7 @@ onUpdated(() => {
 
 .subgraph-breadcrumb,
 :deep(.p-breadcrumb) {
-  @apply overflow-hidden;
+  overflow: hidden;
 }
 
 :deep(.p-breadcrumb) {
@@ -189,13 +212,21 @@ onUpdated(() => {
 }
 
 :deep(.p-breadcrumb-item) {
-  @apply flex items-center overflow-hidden;
+  display: flex;
+  align-items: center;
+  overflow: hidden;
+  height: calc(var(--spacing) * 8);
   min-width: calc(var(--p-breadcrumb-item-min-width) + 1rem);
+  border: 1px solid transparent;
+  background-color: transparent;
+  transition: all 0.2s;
   /* Collapse middle items first */
   flex-shrink: 10000;
 }
 
 :deep(.p-breadcrumb-separator) {
+  border: 1px solid transparent;
+  background-color: transparent;
   display: flex;
   padding: 0 var(--p-breadcrumb-item-margin);
 }
@@ -205,11 +236,9 @@ onUpdated(() => {
     calc(var(--p-breadcrumb-item-margin) + var(--p-breadcrumb-item-padding));
 }
 
-:deep(.p-breadcrumb-separator),
-:deep(.p-breadcrumb-item) {
-  @apply h-12;
-  border-top: 1px solid var(--interface-stroke);
-  border-bottom: 1px solid var(--interface-stroke);
+:deep(.p-breadcrumb-item:hover) {
+  border-radius: var(--radius-lg);
+  border-color: var(--interface-stroke);
   background-color: var(--comfy-menu-bg);
 }
 
@@ -218,10 +247,8 @@ onUpdated(() => {
 }
 
 :deep(.p-breadcrumb-item:first-child) {
-  @apply rounded-l-lg;
   /* Then collapse the root workflow */
   flex-shrink: 5000;
-  border-left: 1px solid var(--interface-stroke);
 
   .p-breadcrumb-item-link {
     padding-left: var(--p-breadcrumb-item-padding);
@@ -229,13 +256,10 @@ onUpdated(() => {
 }
 
 :deep(.p-breadcrumb-item:last-child) {
-  @apply rounded-r-lg;
   /* Then collapse the active item */
   flex-shrink: 1;
-  border-right: 1px solid var(--interface-stroke);
 }
 
-:deep(.p-breadcrumb-item-link:hover),
 :deep(.p-breadcrumb-item-link-menu-visible) {
   background-color: color-mix(
     in srgb,
@@ -247,18 +271,16 @@ onUpdated(() => {
 </style>
 
 <style>
-@reference '../../assets/css/style.css';
-
 .subgraph-breadcrumb-collapse .p-breadcrumb-list {
   .p-breadcrumb-item,
   .p-breadcrumb-separator {
-    @apply hidden;
+    display: none;
   }
 
   .p-breadcrumb-item:nth-last-child(3),
   .p-breadcrumb-separator:nth-last-child(2),
   .p-breadcrumb-item:nth-last-child(1) {
-    @apply flex;
+    display: flex;
   }
 }
 </style>
diff --git a/src/components/breadcrumb/SubgraphBreadcrumbItem.vue b/src/components/breadcrumb/SubgraphBreadcrumbItem.vue
index 8ffbd1e792..20739cab7a 100644
--- a/src/components/breadcrumb/SubgraphBreadcrumbItem.vue
+++ b/src/components/breadcrumb/SubgraphBreadcrumbItem.vue
@@ -7,7 +7,7 @@
     }"
     draggable="false"
     href="#"
-    class="p-breadcrumb-item-link h-12 cursor-pointer px-2"
+    class="p-breadcrumb-item-link h-8 cursor-pointer px-2"
     :class="{
       'flex items-center gap-1': isActive,
       'p-breadcrumb-item-link-menu-visible': menu?.overlayVisible,
@@ -25,7 +25,7 @@
     <i v-if="isActive" class="pi pi-angle-down text-[10px]"></i>
   </a>
   <Menu
-    v-if="isActive"
+    v-if="isActive || isRoot"
     ref="menu"
     :model="menuItems"
     :popup="true"
@@ -42,7 +42,7 @@
     v-if="isEditing"
     ref="itemInputRef"
     v-model="itemLabel"
-    class="fixed z-10000 px-2 py-2 text-[.8rem]"
+    class="fixed z-10000 p-2 text-[.8rem]"
     @blur="inputBlur(false)"
     @click.stop
     @keydown.enter="inputBlur(true)"
@@ -59,6 +59,8 @@ import Tag from 'primevue/tag'
 import { computed, nextTick, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
+import { useWorkflowActionsMenu } from '@/composables/useWorkflowActionsMenu'
+import { ensureWorkflowSuffix, getWorkflowSuffix } from '@/utils/formatUtil'
 import { useWorkflowService } from '@/platform/workflow/core/services/workflowService'
 import {
   ComfyWorkflow,
@@ -69,7 +71,6 @@ import { useDialogService } from '@/services/dialogService'
 import { useCommandStore } from '@/stores/commandStore'
 import { useNodeDefStore } from '@/stores/nodeDefStore'
 import { useSubgraphNavigationStore } from '@/stores/subgraphNavigationStore'
-import { appendJsonExt } from '@/utils/formatUtil'
 import { graphHasMissingNodes } from '@/workbench/extensions/manager/utils/graphHasMissingNodes'
 
 interface Props {
@@ -77,9 +78,7 @@ interface Props {
   isActive?: boolean
 }
 
-const props = withDefaults(defineProps<Props>(), {
-  isActive: false
-})
+const { item, isActive } = defineProps<Props>()
 
 const nodeDefStore = useNodeDefStore()
 const hasMissingNodes = computed(() =>
@@ -102,15 +101,16 @@ const rename = async (
 ) => {
   if (newName && newName !== initialName) {
     // Synchronize the node titles with the new name
-    props.item.updateTitle?.(newName)
+    item.updateTitle?.(newName)
 
     if (workflowStore.activeSubgraph) {
       workflowStore.activeSubgraph.name = newName
     } else if (workflowStore.activeWorkflow) {
       try {
+        const suffix = getWorkflowSuffix(workflowStore.activeWorkflow.suffix)
         await workflowService.renameWorkflow(
           workflowStore.activeWorkflow,
-          ComfyWorkflow.basePath + appendJsonExt(newName)
+          ComfyWorkflow.basePath + ensureWorkflowSuffix(newName, suffix)
         )
       } catch (error) {
         console.error(error)
@@ -126,111 +126,25 @@ const rename = async (
   }
 }
 
-const isRoot = props.item.key === 'root'
+const isRoot = item.key === 'root'
 
 const tooltipText = computed(() => {
   if (hasMissingNodes.value && isRoot) {
     return t('breadcrumbsMenu.missingNodesWarning')
   }
-  return props.item.label
+  return item.label
 })
 
-const menuItems = computed<MenuItem[]>(() => {
-  return [
-    {
-      label: t('g.rename'),
-      icon: 'pi pi-pencil',
-      command: startRename
-    },
-    {
-      label: t('breadcrumbsMenu.duplicate'),
-      icon: 'pi pi-copy',
-      command: async () => {
-        await workflowService.duplicateWorkflow(workflowStore.activeWorkflow!)
-      },
-      visible: isRoot && !props.item.isBlueprint
-    },
-    {
-      separator: true,
-      visible: isRoot
-    },
-    {
-      label: t('menuLabels.Save'),
-      icon: 'pi pi-save',
-      command: async () => {
-        await useCommandStore().execute('Comfy.SaveWorkflow')
-      },
-      visible: isRoot
-    },
-    {
-      label: t('menuLabels.Save As'),
-      icon: 'pi pi-save',
-      command: async () => {
-        await useCommandStore().execute('Comfy.SaveWorkflowAs')
-      },
-      visible: isRoot
-    },
-    {
-      separator: true
-    },
-    {
-      label: t('breadcrumbsMenu.clearWorkflow'),
-      icon: 'pi pi-trash',
-      command: async () => {
-        await useCommandStore().execute('Comfy.ClearWorkflow')
-      }
-    },
-    {
-      separator: true,
-      visible: props.item.key === 'root' && props.item.isBlueprint
-    },
-    {
-      label: t('subgraphStore.publish'),
-      icon: 'pi pi-copy',
-      command: async () => {
-        await workflowService.saveWorkflowAs(workflowStore.activeWorkflow!)
-      },
-      visible: props.item.key === 'root' && props.item.isBlueprint
-    },
-    {
-      separator: true,
-      visible: isRoot
-    },
-    {
-      label: props.item.isBlueprint
-        ? t('breadcrumbsMenu.deleteBlueprint')
-        : t('breadcrumbsMenu.deleteWorkflow'),
-      icon: 'pi pi-times',
-      command: async () => {
-        await workflowService.deleteWorkflow(workflowStore.activeWorkflow!)
-      },
-      visible: isRoot
-    }
-  ]
-})
-
-const handleClick = (event: MouseEvent) => {
-  if (isEditing.value) {
+const startRename = async () => {
+  // Check if element is hidden (collapsed breadcrumb)
+  // When collapsed, root item is hidden via CSS display:none, so use rename command
+  if (isRoot && wrapperRef.value?.offsetParent === null) {
+    await useCommandStore().execute('Comfy.RenameWorkflow')
     return
   }
 
-  if (event.detail === 1) {
-    if (props.isActive) {
-      menu.value?.toggle(event)
-    } else {
-      props.item.command?.({ item: props.item, originalEvent: event })
-    }
-  } else if (props.isActive && event.detail === 2) {
-    menu.value?.hide()
-    event.stopPropagation()
-    event.preventDefault()
-    startRename()
-  }
-}
-
-const startRename = () => {
   isEditing.value = true
-  itemLabel.value = props.item.label as string
+  itemLabel.value = item.label as string
   void nextTick(() => {
     if (itemInputRef.value?.$el) {
       itemInputRef.value.$el.focus()
@@ -242,9 +156,30 @@ const startRename = () => {
   })
 }
 
+const { menuItems } = useWorkflowActionsMenu(startRename, { isRoot })
+
+const handleClick = (event: MouseEvent) => {
+  if (isEditing.value) {
+    return
+  }
+
+  if (event.detail === 1) {
+    if (isActive) {
+      menu.value?.toggle(event)
+    } else {
+      item.command?.({ item: item, originalEvent: event })
+    }
+  } else if (isActive && event.detail === 2) {
+    menu.value?.hide()
+    event.stopPropagation()
+    event.preventDefault()
+    startRename()
+  }
+}
+
 const inputBlur = async (doRename: boolean) => {
   if (doRename) {
-    await rename(itemLabel.value, props.item.label as string)
+    await rename(itemLabel.value, item.label as string)
   }
 
   isEditing.value = false
@@ -252,19 +187,19 @@ const inputBlur = async (doRename: boolean) => {
 </script>
 
 <style scoped>
-@reference '../../assets/css/style.css';
-
 .p-breadcrumb-item-link,
 .p-breadcrumb-item-icon {
-  @apply select-none;
+  user-select: none;
 }
 
 .p-breadcrumb-item-link {
-  @apply overflow-hidden;
+  overflow: hidden;
 }
 
 .p-breadcrumb-item-label {
-  @apply whitespace-nowrap text-ellipsis overflow-hidden;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .active-breadcrumb-item {
diff --git a/src/components/builder/AppBuilder.vue b/src/components/builder/AppBuilder.vue
new file mode 100644
index 0000000000..24318aa44f
--- /dev/null
+++ b/src/components/builder/AppBuilder.vue
@@ -0,0 +1,415 @@
+<script setup lang="ts">
+import { remove } from 'es-toolkit'
+import { computed, provide, ref, toValue } from 'vue'
+import type { MaybeRef } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import DraggableList from '@/components/common/DraggableList.vue'
+import IoItem from '@/components/builder/IoItem.vue'
+import PropertiesAccordionItem from '@/components/rightSidePanel/layout/PropertiesAccordionItem.vue'
+import WidgetItem from '@/components/rightSidePanel/parameters/WidgetItem.vue'
+import { LiteGraph } from '@/lib/litegraph/src/litegraph'
+import type { LGraphNode, NodeId } from '@/lib/litegraph/src/LGraphNode'
+import type { INodeInputSlot } from '@/lib/litegraph/src/interfaces'
+import type { LGraphCanvas } from '@/lib/litegraph/src/LGraphCanvas'
+import {
+  LGraphEventMode,
+  TitleMode
+} from '@/lib/litegraph/src/types/globalEnums'
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+import { BaseWidget } from '@/lib/litegraph/src/widgets/BaseWidget'
+import { useSettingStore } from '@/platform/settings/settingStore'
+import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
+import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import { useCanvasInteractions } from '@/renderer/core/canvas/useCanvasInteractions'
+import TransformPane from '@/renderer/core/layout/transform/TransformPane.vue'
+import { app } from '@/scripts/app'
+import { DOMWidgetImpl } from '@/scripts/domWidget'
+import { useDialogService } from '@/services/dialogService'
+import { useAppMode } from '@/composables/useAppMode'
+import { useAppModeStore } from '@/stores/appModeStore'
+import { resolveNode } from '@/utils/litegraphUtil'
+import { cn } from '@/utils/tailwindUtil'
+import { HideLayoutFieldKey } from '@/types/widgetTypes'
+
+type BoundStyle = { top: string; left: string; width: string; height: string }
+
+const appModeStore = useAppModeStore()
+const canvasInteractions = useCanvasInteractions()
+const canvasStore = useCanvasStore()
+const settingStore = useSettingStore()
+const workflowStore = useWorkflowStore()
+const { t } = useI18n()
+const canvas: LGraphCanvas = canvasStore.getCanvas()
+
+const { isSelectMode, isSelectInputsMode, isSelectOutputsMode, isArrangeMode } =
+  useAppMode()
+const hoveringSelectable = ref(false)
+
+provide(HideLayoutFieldKey, true)
+
+workflowStore.activeWorkflow?.changeTracker?.reset()
+
+const arrangeInputs = computed(() =>
+  appModeStore.selectedInputs
+    .map(([nodeId, widgetName]) => {
+      const node = resolveNode(nodeId)
+      if (!node) return null
+      const widget = node.widgets?.find((w) => w.name === widgetName)
+      return { nodeId, widgetName, node, widget }
+    })
+    .filter((item): item is NonNullable<typeof item> => item !== null)
+)
+
+const inputsWithState = computed(() =>
+  appModeStore.selectedInputs.map(([nodeId, widgetName]) => {
+    const node = resolveNode(nodeId)
+    const widget = node?.widgets?.find((w) => w.name === widgetName)
+    if (!node || !widget) {
+      return {
+        nodeId,
+        widgetName,
+        subLabel: t('linearMode.builder.unknownWidget')
+      }
+    }
+
+    const input = node.inputs.find((i) => i.widget?.name === widget.name)
+    const rename = input && (() => renameWidget(widget, input))
+
+    return {
+      nodeId,
+      widgetName,
+      label: widget.label,
+      subLabel: node.title,
+      rename
+    }
+  })
+)
+const outputsWithState = computed<[NodeId, string][]>(() =>
+  appModeStore.selectedOutputs.map((nodeId) => [
+    nodeId,
+    app.rootGraph.getNodeById(nodeId)?.title ?? String(nodeId)
+  ])
+)
+
+async function renameWidget(widget: IBaseWidget, input: INodeInputSlot) {
+  const newLabel = await useDialogService().prompt({
+    title: t('g.rename'),
+    message: t('g.enterNewNamePrompt'),
+    defaultValue: widget.label,
+    placeholder: widget.name
+  })
+  if (newLabel === null) return
+  widget.label = newLabel || undefined
+  input.label = newLabel || undefined
+  widget.callback?.(widget.value)
+  useCanvasStore().canvas?.setDirty(true)
+}
+
+function getHovered(
+  e: MouseEvent
+): undefined | [LGraphNode, undefined] | [LGraphNode, IBaseWidget] {
+  const { graph } = canvas
+  if (!canvas || !graph) return
+
+  if (settingStore.get('Comfy.VueNodes.Enabled')) return undefined
+  if (!e) return
+
+  canvas.adjustMouseEvent(e)
+  const node = graph.getNodeOnPos(e.canvasX, e.canvasY)
+  if (!node) return
+
+  const widget = node.getWidgetOnPos(e.canvasX, e.canvasY, false)
+
+  if (widget || node.constructor.nodeData?.output_node) return [node, widget]
+}
+
+function getBounding(nodeId: NodeId, widgetName?: string) {
+  if (settingStore.get('Comfy.VueNodes.Enabled')) return undefined
+  const node = app.rootGraph.getNodeById(nodeId)
+  if (!node) return
+
+  const titleOffset =
+    node.title_mode === TitleMode.NORMAL_TITLE ? LiteGraph.NODE_TITLE_HEIGHT : 0
+
+  if (!widgetName)
+    return {
+      width: `${node.size[0]}px`,
+      height: `${node.size[1] + titleOffset}px`,
+      left: `${node.pos[0]}px`,
+      top: `${node.pos[1] - titleOffset}px`
+    }
+  const widget = node.widgets?.find((w) => w.name === widgetName)
+  if (!widget) return
+
+  const margin = widget instanceof DOMWidgetImpl ? widget.margin : undefined
+  const marginX = margin ?? BaseWidget.margin
+  const height =
+    (widget.computedHeight !== undefined
+      ? widget.computedHeight - 4
+      : LiteGraph.NODE_WIDGET_HEIGHT) - (margin ? 2 * margin - 4 : 0)
+  return {
+    width: `${node.size[0] - marginX * 2}px`,
+    height: `${height}px`,
+    left: `${node.pos[0] + marginX}px`,
+    top: `${node.pos[1] + widget.y + (margin ?? 0)}px`
+  }
+}
+
+function handleDown(e: MouseEvent) {
+  const [node] = getHovered(e) ?? []
+  if (!node || e.button > 0) canvasInteractions.forwardEventToCanvas(e)
+}
+function handleClick(e: MouseEvent) {
+  const [node, widget] = getHovered(e) ?? []
+  if (node?.mode !== LGraphEventMode.ALWAYS)
+    return canvasInteractions.forwardEventToCanvas(e)
+
+  if (!widget) {
+    if (!isSelectOutputsMode.value) return
+    if (!node.constructor.nodeData?.output_node)
+      return canvasInteractions.forwardEventToCanvas(e)
+    const index = appModeStore.selectedOutputs.findIndex((id) => id == node.id)
+    if (index === -1) appModeStore.selectedOutputs.push(node.id)
+    else appModeStore.selectedOutputs.splice(index, 1)
+    return
+  }
+  if (!isSelectInputsMode.value) return
+
+  const index = appModeStore.selectedInputs.findIndex(
+    ([nodeId, widgetName]) => node.id == nodeId && widget.name === widgetName
+  )
+  if (index === -1) appModeStore.selectedInputs.push([node.id, widget.name])
+  else appModeStore.selectedInputs.splice(index, 1)
+}
+
+function nodeToDisplayTuple(
+  n: LGraphNode
+): [NodeId, MaybeRef<BoundStyle> | undefined, boolean] {
+  return [
+    n.id,
+    getBounding(n.id),
+    appModeStore.selectedOutputs.some((id) => n.id === id)
+  ]
+}
+
+const renderedOutputs = computed(() => {
+  void appModeStore.selectedOutputs.length
+  return canvas
+    .graph!.nodes.filter(
+      (n) =>
+        n.constructor.nodeData?.output_node && n.mode === LGraphEventMode.ALWAYS
+    )
+    .map(nodeToDisplayTuple)
+})
+const renderedInputs = computed<[string, MaybeRef<BoundStyle> | undefined][]>(
+  () =>
+    appModeStore.selectedInputs.map(([nodeId, widgetName]) => [
+      `${nodeId}: ${widgetName}`,
+      getBounding(nodeId, widgetName)
+    ])
+)
+</script>
+<template>
+  <div class="flex h-full flex-col">
+    <div class="flex items-center border-b border-border-subtle p-2 font-bold">
+      {{
+        isArrangeMode ? t('nodeHelpPage.inputs') : t('linearMode.builder.title')
+      }}
+    </div>
+    <div class="min-h-0 flex-1 overflow-y-auto">
+      <DraggableList
+        v-if="isArrangeMode"
+        v-slot="{ dragClass }"
+        v-model="appModeStore.selectedInputs"
+        class="overflow-x-clip"
+      >
+        <div
+          v-for="{ nodeId, widgetName, node, widget } in arrangeInputs"
+          :key="`${nodeId}: ${widgetName}`"
+          :class="cn(dragClass, 'pointer-events-auto my-2 p-2')"
+          :aria-label="`${widget?.label ?? widgetName} — ${node.title}`"
+        >
+          <div v-if="widget" class="pointer-events-none" inert>
+            <WidgetItem
+              :widget="widget"
+              :node="node"
+              show-node-name
+              hidden-widget-actions
+            />
+          </div>
+          <div
+            v-else
+            class="pointer-events-none p-1 text-sm text-muted-foreground"
+          >
+            {{ widgetName }}
+            <p class="text-xs italic">
+              ({{ t('linearMode.builder.unknownWidget') }})
+            </p>
+          </div>
+        </div>
+      </DraggableList>
+      <PropertiesAccordionItem
+        v-if="isSelectInputsMode"
+        :label="t('nodeHelpPage.inputs')"
+        enable-empty-state
+        :disabled="!appModeStore.selectedInputs.length"
+        class="border-b border-border-subtle"
+        :tooltip="`${t('linearMode.builder.inputsDesc')}\n${t('linearMode.builder.inputsExample')}`"
+        :tooltip-delay="100"
+      >
+        <template #label>
+          <div class="flex gap-3">
+            {{ t('nodeHelpPage.inputs') }}
+            <i class="icon-[lucide--circle-alert] bg-muted-foreground" />
+          </div>
+        </template>
+        <template #empty>
+          <div
+            class="w-full p-4 pt-2 text-muted-foreground"
+            v-text="t('linearMode.builder.promptAddInputs')"
+          />
+        </template>
+        <div
+          class="w-full p-4 pt-2 text-muted-foreground"
+          v-text="t('linearMode.builder.promptAddInputs')"
+        />
+        <DraggableList
+          v-slot="{ dragClass }"
+          v-model="appModeStore.selectedInputs"
+        >
+          <IoItem
+            v-for="{
+              nodeId,
+              widgetName,
+              label,
+              subLabel,
+              rename
+            } in inputsWithState"
+            :key="`${nodeId}: ${widgetName}`"
+            :class="
+              cn(dragClass, 'my-2 rounded-lg bg-primary-background/30 p-2')
+            "
+            :title="label ?? widgetName"
+            :sub-title="subLabel"
+            :rename
+            :remove="
+              () =>
+                remove(
+                  appModeStore.selectedInputs,
+                  ([id, name]) => nodeId == id && widgetName === name
+                )
+            "
+          />
+        </DraggableList>
+      </PropertiesAccordionItem>
+      <PropertiesAccordionItem
+        v-if="isSelectOutputsMode"
+        :label="t('nodeHelpPage.outputs')"
+        enable-empty-state
+        :disabled="!appModeStore.selectedOutputs.length"
+        :tooltip="`${t('linearMode.builder.outputsDesc')}\n${t('linearMode.builder.outputsExample')}`"
+        :tooltip-delay="100"
+      >
+        <template #label>
+          <div class="flex gap-3">
+            {{ t('nodeHelpPage.outputs') }}
+            <i class="icon-[lucide--circle-alert] bg-muted-foreground" />
+          </div>
+        </template>
+        <template #empty>
+          <div
+            class="w-full p-4 pt-2 text-muted-foreground"
+            v-text="t('linearMode.builder.promptAddOutputs')"
+          />
+        </template>
+        <div
+          class="w-full p-4 pt-2 text-muted-foreground"
+          v-text="t('linearMode.builder.promptAddOutputs')"
+        />
+        <DraggableList
+          v-slot="{ dragClass }"
+          v-model="appModeStore.selectedOutputs"
+        >
+          <IoItem
+            v-for="([key, title], index) in outputsWithState"
+            :key
+            :class="
+              cn(
+                dragClass,
+                'my-2 rounded-lg bg-warning-background/40 p-2',
+                index === 0 && 'ring-2 ring-warning-background'
+              )
+            "
+            :title
+            :sub-title="String(key)"
+            :remove="
+              () => remove(appModeStore.selectedOutputs, (k) => k == key)
+            "
+          />
+        </DraggableList>
+      </PropertiesAccordionItem>
+    </div>
+  </div>
+
+  <Teleport
+    v-if="isSelectMode && !settingStore.get('Comfy.VueNodes.Enabled')"
+    to="body"
+  >
+    <div
+      :class="
+        cn(
+          'pointer-events-auto absolute size-full',
+          hoveringSelectable ? 'cursor-pointer' : 'cursor-grab'
+        )
+      "
+      @pointerdown="handleDown"
+      @pointermove="hoveringSelectable = !!getHovered($event)"
+      @click="handleClick"
+      @wheel="canvasInteractions.forwardEventToCanvas"
+    >
+      <TransformPane :canvas="canvasStore.getCanvas()">
+        <template v-if="isSelectInputsMode">
+          <div
+            v-for="[key, style] in renderedInputs"
+            :key
+            :style="toValue(style)"
+            class="fixed rounded-lg bg-primary-background/30"
+          />
+        </template>
+        <template v-else>
+          <div
+            v-for="[key, style, isSelected] in renderedOutputs"
+            :key
+            :style="toValue(style)"
+            :class="
+              cn(
+                'fixed rounded-2xl ring-5 ring-warning-background',
+                !isSelected && 'ring-warning-background/50'
+              )
+            "
+          >
+            <div class="absolute top-0 right-0 size-8">
+              <div
+                v-if="isSelected"
+                class="pointer-events-auto absolute -top-1/2 -right-1/2 size-full cursor-pointer rounded-lg bg-warning-background p-2"
+                @click.stop="
+                  remove(appModeStore.selectedOutputs, (k) => k == key)
+                "
+                @pointerdown.stop
+              >
+                <i class="bg-text-foreground icon-[lucide--check] size-full" />
+              </div>
+              <div
+                v-else
+                class="pointer-events-auto absolute -top-1/2 -right-1/2 size-full cursor-pointer rounded-lg bg-component-node-background ring-4 ring-warning-background/50 ring-inset"
+                @click.stop="appModeStore.selectedOutputs.push(key)"
+                @pointerdown.stop
+              />
+            </div>
+          </div>
+        </template>
+      </TransformPane>
+    </div>
+  </Teleport>
+</template>
diff --git a/src/components/builder/BuilderDefaultModeAppliedDialogContent.vue b/src/components/builder/BuilderDefaultModeAppliedDialogContent.vue
new file mode 100644
index 0000000000..ee8c8f4dcd
--- /dev/null
+++ b/src/components/builder/BuilderDefaultModeAppliedDialogContent.vue
@@ -0,0 +1,62 @@
+<template>
+  <BuilderDialog @close="$emit('close')">
+    <template #title>
+      <span class="inline-flex items-center gap-2">
+        {{ $t('builderToolbar.defaultModeAppliedTitle') }}
+        <i
+          aria-hidden="true"
+          class="icon-[lucide--circle-check-big] size-4 text-green-500"
+        />
+      </span>
+    </template>
+
+    <p class="m-0 text-sm text-muted-foreground">
+      {{
+        appliedAsApp
+          ? $t('builderToolbar.defaultModeAppliedAppBody')
+          : $t('builderToolbar.defaultModeAppliedGraphBody')
+      }}
+    </p>
+    <p class="m-0 text-sm text-muted-foreground">
+      {{
+        appliedAsApp
+          ? $t('builderToolbar.defaultModeAppliedAppPrompt')
+          : $t('builderToolbar.defaultModeAppliedGraphPrompt')
+      }}
+    </p>
+
+    <template #footer>
+      <template v-if="appliedAsApp">
+        <Button variant="muted-textonly" size="lg" @click="$emit('close')">
+          {{ $t('g.close') }}
+        </Button>
+        <Button variant="secondary" size="lg" @click="$emit('viewApp')">
+          {{ $t('builderToolbar.viewApp') }}
+        </Button>
+      </template>
+      <template v-else>
+        <Button variant="muted-textonly" size="lg" @click="$emit('viewApp')">
+          {{ $t('builderToolbar.viewApp') }}
+        </Button>
+        <Button variant="secondary" size="lg" @click="$emit('close')">
+          {{ $t('g.close') }}
+        </Button>
+      </template>
+    </template>
+  </BuilderDialog>
+</template>
+
+<script setup lang="ts">
+import Button from '@/components/ui/button/Button.vue'
+
+import BuilderDialog from './BuilderDialog.vue'
+
+defineProps<{
+  appliedAsApp: boolean
+}>()
+
+defineEmits<{
+  viewApp: []
+  close: []
+}>()
+</script>
diff --git a/src/components/builder/BuilderDialog.vue b/src/components/builder/BuilderDialog.vue
new file mode 100644
index 0000000000..70586024ea
--- /dev/null
+++ b/src/components/builder/BuilderDialog.vue
@@ -0,0 +1,48 @@
+<template>
+  <div
+    class="flex min-h-80 w-full min-w-116 flex-col rounded-2xl bg-base-background"
+  >
+    <!-- Header -->
+    <div
+      class="flex h-12 items-center justify-between border-b border-border-default px-4"
+    >
+      <div class="flex items-center gap-2">
+        <slot name="header-icon" />
+        <h2 class="m-0 text-sm font-normal text-base-foreground">
+          <slot name="title" />
+        </h2>
+      </div>
+      <Button
+        v-if="showClose"
+        variant="muted-textonly"
+        class="-mr-1"
+        :aria-label="$t('g.close')"
+        @click="$emit('close')"
+      >
+        <i class="pi pi-times size-4" />
+      </Button>
+    </div>
+
+    <!-- Body -->
+    <div class="flex flex-1 flex-col gap-4 p-4">
+      <slot />
+    </div>
+
+    <!-- Footer -->
+    <div class="flex items-center justify-end gap-4 p-4">
+      <slot name="footer" />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import Button from '@/components/ui/button/Button.vue'
+
+const { showClose = true } = defineProps<{
+  showClose?: boolean
+}>()
+
+defineEmits<{
+  close: []
+}>()
+</script>
diff --git a/src/components/builder/BuilderFooterToolbar.test.ts b/src/components/builder/BuilderFooterToolbar.test.ts
new file mode 100644
index 0000000000..7447d3e2c3
--- /dev/null
+++ b/src/components/builder/BuilderFooterToolbar.test.ts
@@ -0,0 +1,147 @@
+import { mount } from '@vue/test-utils'
+import { createPinia, setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { computed, ref } from 'vue'
+import { createI18n } from 'vue-i18n'
+
+import type { AppMode } from '@/composables/useAppMode'
+
+import BuilderFooterToolbar from '@/components/builder/BuilderFooterToolbar.vue'
+
+const mockSetMode = vi.hoisted(() => vi.fn())
+const mockExitBuilder = vi.hoisted(() => vi.fn())
+const mockShowDialog = vi.hoisted(() => vi.fn())
+
+const mockState = {
+  mode: 'builder:select' as AppMode,
+  settingView: false
+}
+
+vi.mock('@/composables/useAppMode', () => ({
+  useAppMode: () => ({
+    mode: computed(() => mockState.mode),
+    isBuilderMode: ref(true),
+    setMode: mockSetMode
+  })
+}))
+
+const mockHasOutputs = ref(true)
+
+vi.mock('@/stores/appModeStore', () => ({
+  useAppModeStore: () => ({
+    exitBuilder: mockExitBuilder,
+    hasOutputs: mockHasOutputs,
+    $id: 'appMode'
+  })
+}))
+
+vi.mock('@/stores/dialogStore', () => ({
+  useDialogStore: () => ({
+    dialogStack: []
+  })
+}))
+
+vi.mock('@/components/builder/useAppSetDefaultView', () => ({
+  useAppSetDefaultView: () => ({
+    settingView: computed(() => mockState.settingView),
+    showDialog: mockShowDialog
+  })
+}))
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      builderMenu: { exitAppBuilder: 'Exit app builder' },
+      g: { back: 'Back', next: 'Next' }
+    }
+  }
+})
+
+describe('BuilderFooterToolbar', () => {
+  beforeEach(() => {
+    setActivePinia(createPinia())
+    vi.clearAllMocks()
+    mockState.mode = 'builder:inputs'
+    mockHasOutputs.value = true
+    mockState.settingView = false
+  })
+
+  function mountComponent() {
+    return mount(BuilderFooterToolbar, {
+      global: {
+        plugins: [i18n],
+        stubs: { Button: false }
+      }
+    })
+  }
+
+  function getButtons(wrapper: ReturnType<typeof mountComponent>) {
+    const buttons = wrapper.findAll('button')
+    return {
+      exit: buttons[0],
+      back: buttons[1],
+      next: buttons[2]
+    }
+  }
+
+  it('disables back on the first step', () => {
+    mockState.mode = 'builder:inputs'
+    const { back } = getButtons(mountComponent())
+    expect(back.attributes('disabled')).toBeDefined()
+  })
+
+  it('enables back on the second step', () => {
+    mockState.mode = 'builder:arrange'
+    const { back } = getButtons(mountComponent())
+    expect(back.attributes('disabled')).toBeUndefined()
+  })
+
+  it('disables next on the setDefaultView step', () => {
+    mockState.settingView = true
+    const { next } = getButtons(mountComponent())
+    expect(next.attributes('disabled')).toBeDefined()
+  })
+
+  it('disables next on arrange step when no outputs', () => {
+    mockState.mode = 'builder:arrange'
+    mockHasOutputs.value = false
+    const { next } = getButtons(mountComponent())
+    expect(next.attributes('disabled')).toBeDefined()
+  })
+
+  it('enables next on inputs step', () => {
+    mockState.mode = 'builder:inputs'
+    const { next } = getButtons(mountComponent())
+    expect(next.attributes('disabled')).toBeUndefined()
+  })
+
+  it('calls setMode on back click', async () => {
+    mockState.mode = 'builder:arrange'
+    const { back } = getButtons(mountComponent())
+    await back.trigger('click')
+    expect(mockSetMode).toHaveBeenCalledWith('builder:outputs')
+  })
+
+  it('calls setMode on next click from inputs step', async () => {
+    mockState.mode = 'builder:inputs'
+    const { next } = getButtons(mountComponent())
+    await next.trigger('click')
+    expect(mockSetMode).toHaveBeenCalledWith('builder:outputs')
+  })
+
+  it('opens default view dialog on next click from arrange step', async () => {
+    mockState.mode = 'builder:arrange'
+    const { next } = getButtons(mountComponent())
+    await next.trigger('click')
+    expect(mockSetMode).toHaveBeenCalledWith('builder:arrange')
+    expect(mockShowDialog).toHaveBeenCalledOnce()
+  })
+
+  it('calls exitBuilder on exit button click', async () => {
+    const { exit } = getButtons(mountComponent())
+    await exit.trigger('click')
+    expect(mockExitBuilder).toHaveBeenCalledOnce()
+  })
+})
diff --git a/src/components/builder/BuilderFooterToolbar.vue b/src/components/builder/BuilderFooterToolbar.vue
new file mode 100644
index 0000000000..b76752947b
--- /dev/null
+++ b/src/components/builder/BuilderFooterToolbar.vue
@@ -0,0 +1,63 @@
+<template>
+  <nav
+    class="fixed bottom-4 left-1/2 z-1000 flex -translate-x-1/2 items-center gap-2 rounded-2xl border border-border-default bg-base-background p-2 shadow-interface"
+  >
+    <Button variant="textonly" size="lg" @click="onExitBuilder">
+      {{ t('builderMenu.exitAppBuilder') }}
+    </Button>
+    <Button
+      variant="textonly"
+      size="lg"
+      :disabled="isFirstStep"
+      @click="goBack"
+    >
+      <i class="icon-[lucide--chevron-left]" aria-hidden="true" />
+      {{ t('g.back') }}
+    </Button>
+    <Button size="lg" :disabled="isLastStep" @click="goNext">
+      {{ t('g.next') }}
+      <i class="icon-[lucide--chevron-right]" aria-hidden="true" />
+    </Button>
+  </nav>
+</template>
+
+<script setup lang="ts">
+import { useEventListener } from '@vueuse/core'
+import { storeToRefs } from 'pinia'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+import { useAppMode } from '@/composables/useAppMode'
+import { useAppModeStore } from '@/stores/appModeStore'
+import { useDialogStore } from '@/stores/dialogStore'
+
+import { useBuilderSteps } from './useBuilderSteps'
+
+const { t } = useI18n()
+const appModeStore = useAppModeStore()
+const dialogStore = useDialogStore()
+const { isBuilderMode } = useAppMode()
+const { hasOutputs } = storeToRefs(appModeStore)
+const { isFirstStep, isLastStep, goBack, goNext } = useBuilderSteps({
+  hasOutputs
+})
+
+useEventListener(window, 'keydown', (e: KeyboardEvent) => {
+  if (
+    e.key === 'Escape' &&
+    !e.ctrlKey &&
+    !e.altKey &&
+    !e.metaKey &&
+    dialogStore.dialogStack.length === 0 &&
+    isBuilderMode.value
+  ) {
+    e.preventDefault()
+    e.stopPropagation()
+    onExitBuilder()
+  }
+})
+
+function onExitBuilder() {
+  void appModeStore.exitBuilder()
+}
+</script>
diff --git a/src/components/builder/BuilderMenu.vue b/src/components/builder/BuilderMenu.vue
new file mode 100644
index 0000000000..cc23990845
--- /dev/null
+++ b/src/components/builder/BuilderMenu.vue
@@ -0,0 +1,100 @@
+<template>
+  <Popover :show-arrow="false" class="min-w-56 p-3">
+    <template #button>
+      <button
+        :class="
+          cn(
+            'absolute top-[calc(var(--workflow-tabs-height)+16px)] left-4 z-1000 inline-flex h-10 cursor-pointer items-center gap-2.5 rounded-lg border-none py-2 pr-2 pl-3 shadow-interface transition-colors',
+            'bg-secondary-background hover:bg-secondary-background-hover',
+            'data-[state=open]:bg-secondary-background-hover'
+          )
+        "
+        :aria-label="t('linearMode.appModeToolbar.appBuilder')"
+      >
+        <i class="icon-[lucide--hammer] size-4" />
+        <span class="text-sm font-medium">
+          {{ t('linearMode.appModeToolbar.appBuilder') }}
+        </span>
+        <i class="icon-[lucide--chevron-down] size-4 text-muted-foreground" />
+      </button>
+    </template>
+    <template #default="{ close }">
+      <template v-for="(item, index) in menuItems" :key="item.label">
+        <div v-if="index > 0" class="my-1 border-t border-border-default" />
+        <Button
+          variant="textonly"
+          size="unset"
+          class="flex w-full items-center justify-start gap-3 rounded-md px-3 py-2 text-sm"
+          :disabled="item.disabled"
+          @click="item.action(close)"
+        >
+          <i :class="cn(item.icon, 'size-4')" />
+          {{ item.label }}
+        </Button>
+      </template>
+    </template>
+  </Popover>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+import { storeToRefs } from 'pinia'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+import Popover from '@/components/ui/Popover.vue'
+import { useAppMode } from '@/composables/useAppMode'
+import { useErrorHandling } from '@/composables/useErrorHandling'
+import { useWorkflowService } from '@/platform/workflow/core/services/workflowService'
+import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
+import { useAppModeStore } from '@/stores/appModeStore'
+import { cn } from '@/utils/tailwindUtil'
+
+const { t } = useI18n()
+const appModeStore = useAppModeStore()
+const { hasOutputs } = storeToRefs(appModeStore)
+const { setMode } = useAppMode()
+const workflowService = useWorkflowService()
+const workflowStore = useWorkflowStore()
+const { toastErrorHandler } = useErrorHandling()
+
+const menuItems = computed(() => [
+  {
+    label: t('g.save'),
+    icon: 'icon-[lucide--save]',
+    disabled: !hasOutputs.value,
+    action: onSave
+  },
+  {
+    label: t('builderMenu.enterAppMode'),
+    icon: 'icon-[lucide--panels-top-left]',
+    action: onEnterAppMode
+  },
+  {
+    label: t('builderMenu.exitAppBuilder'),
+    icon: 'icon-[lucide--square-pen]',
+    action: onExitBuilder
+  }
+])
+
+async function onSave(close: () => void) {
+  const workflow = workflowStore.activeWorkflow
+  if (!workflow) return
+  try {
+    await workflowService.saveWorkflow(workflow)
+    close()
+  } catch (error) {
+    toastErrorHandler(error)
+  }
+}
+
+function onEnterAppMode(close: () => void) {
+  setMode('app')
+  close()
+}
+
+function onExitBuilder(close: () => void) {
+  void appModeStore.exitBuilder()
+  close()
+}
+</script>
diff --git a/src/components/builder/BuilderToolbar.vue b/src/components/builder/BuilderToolbar.vue
new file mode 100644
index 0000000000..9e5aa3f67c
--- /dev/null
+++ b/src/components/builder/BuilderToolbar.vue
@@ -0,0 +1,117 @@
+<template>
+  <nav
+    class="fixed top-[calc(var(--workflow-tabs-height)+var(--spacing)*1.5)] left-1/2 z-1000 -translate-x-1/2"
+    :aria-label="t('builderToolbar.label')"
+  >
+    <div
+      class="inline-flex items-center gap-1 rounded-2xl border border-border-default bg-base-background p-2 shadow-interface"
+    >
+      <template v-for="(step, index) in steps" :key="step.id">
+        <button
+          :class="
+            cn(
+              stepClasses,
+              activeStep === step.id
+                ? 'bg-interface-builder-mode-background'
+                : 'bg-transparent hover:bg-secondary-background'
+            )
+          "
+          :aria-current="activeStep === step.id ? 'step' : undefined"
+          @click="navigateToStep(step.id)"
+        >
+          <StepBadge :step :index :model-value="activeStep" />
+          <StepLabel :step />
+        </button>
+
+        <div class="mx-1 h-px w-4 bg-border-default" role="separator" />
+      </template>
+
+      <!-- Default view -->
+      <ConnectOutputPopover
+        v-if="!hasOutputs"
+        :is-select-active="isSelectStep"
+        @switch="navigateToStep('builder:outputs')"
+      >
+        <button :class="cn(stepClasses, 'bg-transparent opacity-30')">
+          <StepBadge
+            :step="defaultViewStep"
+            :index="steps.length"
+            :model-value="activeStep"
+          />
+          <StepLabel :step="defaultViewStep" />
+        </button>
+      </ConnectOutputPopover>
+      <button
+        v-else
+        :class="
+          cn(
+            stepClasses,
+            activeStep === 'setDefaultView'
+              ? 'bg-interface-builder-mode-background'
+              : 'bg-transparent hover:bg-secondary-background'
+          )
+        "
+        @click="navigateToStep('setDefaultView')"
+      >
+        <StepBadge
+          :step="defaultViewStep"
+          :index="steps.length"
+          :model-value="activeStep"
+        />
+        <StepLabel :step="defaultViewStep" />
+      </button>
+    </div>
+  </nav>
+</template>
+
+<script setup lang="ts">
+import { storeToRefs } from 'pinia'
+import { useI18n } from 'vue-i18n'
+
+import { useAppModeStore } from '@/stores/appModeStore'
+import { cn } from '@/utils/tailwindUtil'
+
+import ConnectOutputPopover from './ConnectOutputPopover.vue'
+import StepBadge from './StepBadge.vue'
+import StepLabel from './StepLabel.vue'
+import type { BuilderToolbarStep } from './types'
+import type { BuilderStepId } from './useBuilderSteps'
+import { useBuilderSteps } from './useBuilderSteps'
+
+const { t } = useI18n()
+const appModeStore = useAppModeStore()
+const { hasOutputs } = storeToRefs(appModeStore)
+const { activeStep, isSelectStep, navigateToStep } = useBuilderSteps()
+
+const stepClasses =
+  'inline-flex h-14 min-h-8 cursor-pointer items-center gap-3 rounded-lg py-2 pr-4 pl-2 transition-colors border-none'
+
+const selectInputsStep: BuilderToolbarStep<BuilderStepId> = {
+  id: 'builder:inputs',
+  title: t('builderToolbar.inputs'),
+  subtitle: t('builderToolbar.inputsDescription'),
+  icon: 'icon-[lucide--mouse-pointer-click]'
+}
+
+const selectOutputsStep: BuilderToolbarStep<BuilderStepId> = {
+  id: 'builder:outputs',
+  title: t('builderToolbar.outputs'),
+  subtitle: t('builderToolbar.outputsDescription'),
+  icon: 'icon-[lucide--mouse-pointer-click]'
+}
+
+const arrangeStep: BuilderToolbarStep<BuilderStepId> = {
+  id: 'builder:arrange',
+  title: t('builderToolbar.arrange'),
+  subtitle: t('builderToolbar.arrangeDescription'),
+  icon: 'icon-[lucide--layout-panel-left]'
+}
+
+const defaultViewStep: BuilderToolbarStep<BuilderStepId> = {
+  id: 'setDefaultView',
+  title: t('builderToolbar.defaultView'),
+  subtitle: t('builderToolbar.defaultViewDescription'),
+  icon: 'icon-[lucide--eye]'
+}
+const steps = [selectInputsStep, selectOutputsStep, arrangeStep]
+</script>
diff --git a/src/components/builder/ConnectOutputPopover.vue b/src/components/builder/ConnectOutputPopover.vue
new file mode 100644
index 0000000000..11b45cc1b6
--- /dev/null
+++ b/src/components/builder/ConnectOutputPopover.vue
@@ -0,0 +1,78 @@
+<template>
+  <PopoverRoot>
+    <PopoverTrigger as-child>
+      <slot />
+    </PopoverTrigger>
+    <PopoverContent
+      side="bottom"
+      :side-offset="8"
+      :collision-padding="10"
+      class="data-[state=open]:data-[side=bottom]:animate-slideUpAndFade z-1001 w-80 rounded-xl border border-border-default bg-base-background shadow-interface will-change-[transform,opacity]"
+    >
+      <div class="flex h-12 items-center justify-between px-4">
+        <h3 class="text-sm font-medium text-base-foreground">
+          {{ t('builderToolbar.connectOutput') }}
+        </h3>
+        <PopoverClose
+          :aria-label="t('g.close')"
+          class="flex cursor-pointer appearance-none items-center justify-center border-none bg-transparent p-0 text-muted-foreground hover:text-base-foreground"
+        >
+          <i class="icon-[lucide--x] size-4" />
+        </PopoverClose>
+      </div>
+      <div class="border-t border-border-default" />
+      <p class="mt-3 px-4 text-xs/relaxed text-muted-foreground">
+        {{ t('builderToolbar.connectOutputBody1') }}
+      </p>
+      <p
+        v-if="!isSelectActive"
+        class="mt-2 px-4 text-xs/relaxed text-muted-foreground"
+      >
+        {{ t('builderToolbar.connectOutputBody2') }}
+      </p>
+      <div class="mt-4 flex items-center justify-end gap-2 px-4 pb-4">
+        <template v-if="isSelectActive">
+          <PopoverClose as-child>
+            <Button variant="secondary" size="md">
+              {{ t('g.ok') }}
+            </Button>
+          </PopoverClose>
+        </template>
+        <template v-else>
+          <PopoverClose as-child>
+            <Button variant="muted-textonly" size="md">
+              {{ t('g.cancel') }}
+            </Button>
+          </PopoverClose>
+          <PopoverClose as-child>
+            <Button variant="secondary" size="md" @click="emit('switch')">
+              {{ t('builderToolbar.switchToOutputs') }}
+            </Button>
+          </PopoverClose>
+        </template>
+      </div>
+    </PopoverContent>
+  </PopoverRoot>
+</template>
+
+<script setup lang="ts">
+import {
+  PopoverClose,
+  PopoverContent,
+  PopoverRoot,
+  PopoverTrigger
+} from 'reka-ui'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+
+const { isSelectActive = false } = defineProps<{
+  isSelectActive?: boolean
+}>()
+
+const { t } = useI18n()
+
+const emit = defineEmits<{
+  switch: []
+}>()
+</script>
diff --git a/src/components/builder/DefaultViewDialogContent.vue b/src/components/builder/DefaultViewDialogContent.vue
new file mode 100644
index 0000000000..ebbe612658
--- /dev/null
+++ b/src/components/builder/DefaultViewDialogContent.vue
@@ -0,0 +1,97 @@
+<template>
+  <BuilderDialog @close="$emit('close')">
+    <template #title>
+      {{ $t('builderToolbar.defaultViewTitle') }}
+    </template>
+
+    <div class="flex flex-col gap-2">
+      <label class="text-sm text-muted-foreground">
+        {{ $t('builderToolbar.defaultViewLabel') }}
+      </label>
+      <div role="radiogroup" class="flex flex-col gap-2">
+        <Button
+          v-for="option in viewTypeOptions"
+          :key="option.value.toString()"
+          role="radio"
+          :aria-checked="openAsApp === option.value"
+          :class="
+            cn(
+              itemClasses,
+              openAsApp === option.value && 'bg-secondary-background'
+            )
+          "
+          variant="textonly"
+          @click="openAsApp = option.value"
+        >
+          <div
+            class="flex size-8 min-h-8 items-center justify-center rounded-lg bg-secondary-background-hover"
+          >
+            <i :class="cn(option.icon, 'size-4')" />
+          </div>
+          <div class="mx-2 flex flex-1 flex-col items-start">
+            <span class="text-sm font-medium text-base-foreground">
+              {{ option.title }}
+            </span>
+            <span class="text-xs text-muted-foreground">
+              {{ option.subtitle }}
+            </span>
+          </div>
+          <i
+            v-if="openAsApp === option.value"
+            class="icon-[lucide--check] size-4 text-base-foreground"
+          />
+        </Button>
+      </div>
+    </div>
+
+    <template #footer>
+      <Button variant="muted-textonly" size="lg" @click="$emit('close')">
+        {{ $t('g.cancel') }}
+      </Button>
+      <Button variant="secondary" size="lg" @click="$emit('apply', openAsApp)">
+        {{ $t('g.apply') }}
+      </Button>
+    </template>
+  </BuilderDialog>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+import { cn } from '@/utils/tailwindUtil'
+
+import BuilderDialog from './BuilderDialog.vue'
+
+const { t } = useI18n()
+
+const { initialOpenAsApp = true } = defineProps<{
+  initialOpenAsApp?: boolean
+}>()
+
+defineEmits<{
+  apply: [openAsApp: boolean]
+  close: []
+}>()
+
+const openAsApp = ref(initialOpenAsApp)
+
+const viewTypeOptions = [
+  {
+    value: true,
+    icon: 'icon-[lucide--app-window]',
+    title: t('builderToolbar.app'),
+    subtitle: t('builderToolbar.appDescription')
+  },
+  {
+    value: false,
+    icon: 'icon-[comfy--workflow]',
+    title: t('builderToolbar.nodeGraph'),
+    subtitle: t('builderToolbar.nodeGraphDescription')
+  }
+]
+
+const itemClasses =
+  'flex h-14 cursor-pointer items-center gap-2 self-stretch rounded-lg border-none bg-transparent py-2 pr-4 pl-2 text-base-foreground transition-colors hover:bg-secondary-background'
+</script>
diff --git a/src/components/builder/EmptyWorkflowDialogContent.vue b/src/components/builder/EmptyWorkflowDialogContent.vue
new file mode 100644
index 0000000000..e790478b30
--- /dev/null
+++ b/src/components/builder/EmptyWorkflowDialogContent.vue
@@ -0,0 +1,40 @@
+<template>
+  <BuilderDialog :show-close="false">
+    <template #title>
+      {{ $t('builderToolbar.emptyWorkflowTitle') }}
+    </template>
+
+    <div class="flex flex-col gap-2">
+      <p class="m-0 text-sm text-muted-foreground">
+        {{ $t('linearMode.emptyWorkflowExplanation') }}
+      </p>
+      <p class="m-0 text-sm text-muted-foreground">
+        {{ $t('builderToolbar.emptyWorkflowPrompt') }}
+      </p>
+    </div>
+
+    <template #footer>
+      <Button
+        variant="muted-textonly"
+        size="lg"
+        @click="$emit('backToWorkflow')"
+      >
+        {{ $t('linearMode.backToWorkflow') }}
+      </Button>
+      <Button variant="secondary" size="lg" @click="$emit('loadTemplate')">
+        {{ $t('linearMode.loadTemplate') }}
+      </Button>
+    </template>
+  </BuilderDialog>
+</template>
+
+<script setup lang="ts">
+import Button from '@/components/ui/button/Button.vue'
+
+import BuilderDialog from './BuilderDialog.vue'
+
+defineEmits<{
+  backToWorkflow: []
+  loadTemplate: []
+}>()
+</script>
diff --git a/src/components/builder/IoItem.vue b/src/components/builder/IoItem.vue
new file mode 100644
index 0000000000..2e31e94807
--- /dev/null
+++ b/src/components/builder/IoItem.vue
@@ -0,0 +1,52 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Popover from '@/components/ui/Popover.vue'
+import Button from '@/components/ui/button/Button.vue'
+
+const { t } = useI18n()
+
+const { rename, remove } = defineProps<{
+  title: string
+  subTitle?: string
+  rename?: () => void
+  remove?: () => void
+}>()
+
+const entries = computed(() => {
+  const items = []
+  if (rename)
+    items.push({
+      label: t('g.rename'),
+      command: rename,
+      icon: 'icon-[lucide--pencil]'
+    })
+  if (remove)
+    items.push({
+      label: t('g.delete'),
+      command: remove,
+      icon: 'icon-[lucide--trash-2]'
+    })
+  return items
+})
+</script>
+<template>
+  <div class="my-2 flex items-center-safe gap-2 rounded-lg p-2">
+    <div
+      class="drag-handle mr-auto inline max-w-max min-w-0 flex-[4_1_0%] truncate"
+      v-text="title"
+    />
+    <div
+      class="drag-handle inline max-w-max min-w-0 flex-[2_1_0%] truncate text-end text-muted-foreground"
+      v-text="subTitle"
+    />
+    <Popover :entries>
+      <template #button>
+        <Button variant="muted-textonly">
+          <i class="icon-[lucide--ellipsis]" />
+        </Button>
+      </template>
+    </Popover>
+  </div>
+</template>
diff --git a/src/components/builder/StepBadge.vue b/src/components/builder/StepBadge.vue
new file mode 100644
index 0000000000..a1c3cbb0eb
--- /dev/null
+++ b/src/components/builder/StepBadge.vue
@@ -0,0 +1,22 @@
+<template>
+  <div
+    class="flex size-10 shrink-0 items-center justify-center rounded-lg bg-interface-builder-mode-button-background text-interface-builder-mode-button-foreground"
+  >
+    <i v-if="modelValue === step.id" :class="cn(step.icon, 'size-5')" />
+    <span v-else class="text-sm font-bold">
+      {{ index + 1 }}
+    </span>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { cn } from '@/utils/tailwindUtil'
+
+import type { BuilderToolbarStep } from './types'
+
+defineProps<{
+  step: BuilderToolbarStep
+  index: number
+  modelValue: string
+}>()
+</script>
diff --git a/src/components/builder/StepLabel.vue b/src/components/builder/StepLabel.vue
new file mode 100644
index 0000000000..ba234ba1b8
--- /dev/null
+++ b/src/components/builder/StepLabel.vue
@@ -0,0 +1,20 @@
+<template>
+  <div class="flex flex-col gap-0.5 text-left">
+    <span class="text-sm font-medium text-base-foreground">
+      {{ step.title }}
+    </span>
+    <span
+      class="hidden text-xs whitespace-nowrap text-muted-foreground sm:inline"
+    >
+      {{ step.subtitle }}
+    </span>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { BuilderToolbarStep } from './types'
+
+const { step } = defineProps<{
+  step: BuilderToolbarStep
+}>()
+</script>
diff --git a/src/components/builder/types.ts b/src/components/builder/types.ts
new file mode 100644
index 0000000000..66fd3d2934
--- /dev/null
+++ b/src/components/builder/types.ts
@@ -0,0 +1,6 @@
+export interface BuilderToolbarStep<T extends string = string> {
+  id: T
+  title: string
+  subtitle: string
+  icon: string
+}
diff --git a/src/components/builder/useAppSetDefaultView.test.ts b/src/components/builder/useAppSetDefaultView.test.ts
new file mode 100644
index 0000000000..a2e010fb7b
--- /dev/null
+++ b/src/components/builder/useAppSetDefaultView.test.ts
@@ -0,0 +1,222 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const mockDialogService = vi.hoisted(() => ({
+  showLayoutDialog: vi.fn()
+}))
+
+const mockDialogStore = vi.hoisted(() => ({
+  closeDialog: vi.fn(),
+  isDialogOpen: vi.fn<(key: string) => boolean>().mockReturnValue(false)
+}))
+
+const mockWorkflowStore = vi.hoisted(() => ({
+  activeWorkflow: null as {
+    initialMode?: string | null
+    changeTracker?: { checkState: () => void }
+  } | null
+}))
+
+const mockApp = vi.hoisted(() => ({
+  rootGraph: { extra: {} as Record<string, unknown> }
+}))
+
+const mockSetMode = vi.hoisted(() => vi.fn())
+
+vi.mock('@/services/dialogService', () => ({
+  useDialogService: () => mockDialogService
+}))
+
+vi.mock('@/stores/dialogStore', () => ({
+  useDialogStore: () => mockDialogStore
+}))
+
+vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
+  useWorkflowStore: () => mockWorkflowStore
+}))
+
+vi.mock('@/scripts/app', () => ({
+  app: mockApp
+}))
+
+vi.mock('@/composables/useAppMode', () => ({
+  useAppMode: () => ({ setMode: mockSetMode })
+}))
+
+vi.mock('./DefaultViewDialogContent.vue', () => ({
+  default: { name: 'MockDefaultViewDialogContent' }
+}))
+
+vi.mock('./BuilderDefaultModeAppliedDialogContent.vue', () => ({
+  default: { name: 'MockBuilderDefaultModeAppliedDialogContent' }
+}))
+
+import { useAppSetDefaultView } from './useAppSetDefaultView'
+
+describe('useAppSetDefaultView', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockWorkflowStore.activeWorkflow = null
+    mockApp.rootGraph.extra = {}
+  })
+
+  describe('settingView', () => {
+    it('reflects dialogStore.isDialogOpen', () => {
+      mockDialogStore.isDialogOpen.mockReturnValue(true)
+      const { settingView } = useAppSetDefaultView()
+      expect(settingView.value).toBe(true)
+    })
+  })
+
+  describe('showDialog', () => {
+    it('opens dialog via dialogService', () => {
+      const { showDialog } = useAppSetDefaultView()
+      showDialog()
+
+      expect(mockDialogService.showLayoutDialog).toHaveBeenCalledOnce()
+    })
+
+    it('passes initialOpenAsApp true when initialMode is not graph', () => {
+      mockWorkflowStore.activeWorkflow = { initialMode: 'app' }
+      const { showDialog } = useAppSetDefaultView()
+      showDialog()
+
+      const call = mockDialogService.showLayoutDialog.mock.calls[0][0]
+      expect(call.props.initialOpenAsApp).toBe(true)
+    })
+
+    it('passes initialOpenAsApp false when initialMode is graph', () => {
+      mockWorkflowStore.activeWorkflow = { initialMode: 'graph' }
+      const { showDialog } = useAppSetDefaultView()
+      showDialog()
+
+      const call = mockDialogService.showLayoutDialog.mock.calls[0][0]
+      expect(call.props.initialOpenAsApp).toBe(false)
+    })
+
+    it('passes initialOpenAsApp true when no active workflow', () => {
+      mockWorkflowStore.activeWorkflow = null
+      const { showDialog } = useAppSetDefaultView()
+      showDialog()
+
+      const call = mockDialogService.showLayoutDialog.mock.calls[0][0]
+      expect(call.props.initialOpenAsApp).toBe(true)
+    })
+  })
+
+  describe('handleApply', () => {
+    it('sets initialMode to app when openAsApp is true', () => {
+      const workflow = { initialMode: null as string | null }
+      mockWorkflowStore.activeWorkflow = workflow
+
+      const { showDialog } = useAppSetDefaultView()
+      showDialog()
+
+      const call = mockDialogService.showLayoutDialog.mock.calls[0][0]
+      call.props.onApply(true)
+
+      expect(workflow.initialMode).toBe('app')
+    })
+
+    it('sets initialMode to graph when openAsApp is false', () => {
+      const workflow = { initialMode: null as string | null }
+      mockWorkflowStore.activeWorkflow = workflow
+
+      const { showDialog } = useAppSetDefaultView()
+      showDialog()
+
+      const call = mockDialogService.showLayoutDialog.mock.calls[0][0]
+      call.props.onApply(false)
+
+      expect(workflow.initialMode).toBe('graph')
+    })
+
+    it('sets linearMode on rootGraph.extra', () => {
+      mockWorkflowStore.activeWorkflow = { initialMode: null }
+
+      const { showDialog } = useAppSetDefaultView()
+      showDialog()
+
+      const call = mockDialogService.showLayoutDialog.mock.calls[0][0]
+      call.props.onApply(true)
+
+      expect(mockApp.rootGraph.extra.linearMode).toBe(true)
+    })
+
+    it('closes dialog after applying', () => {
+      mockWorkflowStore.activeWorkflow = { initialMode: null }
+
+      const { showDialog } = useAppSetDefaultView()
+      showDialog()
+
+      const call = mockDialogService.showLayoutDialog.mock.calls[0][0]
+      call.props.onApply(true)
+
+      expect(mockDialogStore.closeDialog).toHaveBeenCalledWith({
+        key: 'builder-default-view'
+      })
+    })
+
+    it('shows confirmation dialog after applying', () => {
+      mockWorkflowStore.activeWorkflow = { initialMode: null }
+
+      const { showDialog } = useAppSetDefaultView()
+      showDialog()
+
+      const call = mockDialogService.showLayoutDialog.mock.calls[0][0]
+      call.props.onApply(true)
+
+      expect(mockDialogService.showLayoutDialog).toHaveBeenCalledTimes(2)
+      const confirmCall = mockDialogService.showLayoutDialog.mock.calls[1][0]
+      expect(confirmCall.key).toBe('builder-default-view-applied')
+      expect(confirmCall.props.appliedAsApp).toBe(true)
+    })
+
+    it('passes appliedAsApp false to confirmation dialog when graph', () => {
+      mockWorkflowStore.activeWorkflow = { initialMode: null }
+
+      const { showDialog } = useAppSetDefaultView()
+      showDialog()
+
+      const call = mockDialogService.showLayoutDialog.mock.calls[0][0]
+      call.props.onApply(false)
+
+      const confirmCall = mockDialogService.showLayoutDialog.mock.calls[1][0]
+      expect(confirmCall.props.appliedAsApp).toBe(false)
+    })
+  })
+
+  describe('applied dialog', () => {
+    function applyAndGetConfirmDialog(openAsApp: boolean) {
+      mockWorkflowStore.activeWorkflow = { initialMode: null }
+
+      const { showDialog } = useAppSetDefaultView()
+      showDialog()
+
+      const applyCall = mockDialogService.showLayoutDialog.mock.calls[0][0]
+      applyCall.props.onApply(openAsApp)
+
+      return mockDialogService.showLayoutDialog.mock.calls[1][0]
+    }
+
+    it('onViewApp sets mode to app and closes dialog', () => {
+      const confirmCall = applyAndGetConfirmDialog(true)
+      confirmCall.props.onViewApp()
+
+      expect(mockDialogStore.closeDialog).toHaveBeenCalledWith({
+        key: 'builder-default-view-applied'
+      })
+      expect(mockSetMode).toHaveBeenCalledWith('app')
+    })
+
+    it('onClose closes confirmation dialog', () => {
+      const confirmCall = applyAndGetConfirmDialog(true)
+
+      mockDialogStore.closeDialog.mockClear()
+      confirmCall.props.onClose()
+
+      expect(mockDialogStore.closeDialog).toHaveBeenCalledWith({
+        key: 'builder-default-view-applied'
+      })
+    })
+  })
+})
diff --git a/src/components/builder/useAppSetDefaultView.ts b/src/components/builder/useAppSetDefaultView.ts
new file mode 100644
index 0000000000..5c5fb668a9
--- /dev/null
+++ b/src/components/builder/useAppSetDefaultView.ts
@@ -0,0 +1,71 @@
+import { computed } from 'vue'
+
+import { useAppMode } from '@/composables/useAppMode'
+import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
+import { app } from '@/scripts/app'
+import { useDialogService } from '@/services/dialogService'
+import { useDialogStore } from '@/stores/dialogStore'
+
+import BuilderDefaultModeAppliedDialogContent from './BuilderDefaultModeAppliedDialogContent.vue'
+import DefaultViewDialogContent from './DefaultViewDialogContent.vue'
+
+const DIALOG_KEY = 'builder-default-view'
+const APPLIED_DIALOG_KEY = 'builder-default-view-applied'
+
+export function useAppSetDefaultView() {
+  const workflowStore = useWorkflowStore()
+  const dialogService = useDialogService()
+  const dialogStore = useDialogStore()
+  const { setMode } = useAppMode()
+
+  const settingView = computed(() => dialogStore.isDialogOpen(DIALOG_KEY))
+
+  function showDialog() {
+    dialogService.showLayoutDialog({
+      key: DIALOG_KEY,
+      component: DefaultViewDialogContent,
+      props: {
+        initialOpenAsApp: workflowStore.activeWorkflow?.initialMode !== 'graph',
+        onApply: handleApply,
+        onClose: closeDialog
+      }
+    })
+  }
+
+  function handleApply(openAsApp: boolean) {
+    const workflow = workflowStore.activeWorkflow
+    if (!workflow) return
+
+    workflow.initialMode = openAsApp ? 'app' : 'graph'
+    const extra = (app.rootGraph.extra ??= {})
+    extra.linearMode = openAsApp
+    workflow.changeTracker?.checkState()
+    closeDialog()
+    showAppliedDialog(openAsApp)
+  }
+
+  function showAppliedDialog(appliedAsApp: boolean) {
+    dialogService.showLayoutDialog({
+      key: APPLIED_DIALOG_KEY,
+      component: BuilderDefaultModeAppliedDialogContent,
+      props: {
+        appliedAsApp,
+        onViewApp: () => {
+          closeAppliedDialog()
+          setMode('app')
+        },
+        onClose: closeAppliedDialog
+      }
+    })
+  }
+
+  function closeDialog() {
+    dialogStore.closeDialog({ key: DIALOG_KEY })
+  }
+
+  function closeAppliedDialog() {
+    dialogStore.closeDialog({ key: APPLIED_DIALOG_KEY })
+  }
+
+  return { settingView, showDialog }
+}
diff --git a/src/components/builder/useBuilderSteps.ts b/src/components/builder/useBuilderSteps.ts
new file mode 100644
index 0000000000..5d7a4732dd
--- /dev/null
+++ b/src/components/builder/useBuilderSteps.ts
@@ -0,0 +1,79 @@
+import type { Ref } from 'vue'
+
+import { computed } from 'vue'
+
+import { useAppMode } from '@/composables/useAppMode'
+
+import { useAppSetDefaultView } from './useAppSetDefaultView'
+
+const BUILDER_STEPS = [
+  'builder:inputs',
+  'builder:outputs',
+  'builder:arrange',
+  'setDefaultView'
+] as const
+
+export type BuilderStepId = (typeof BUILDER_STEPS)[number]
+
+const ARRANGE_INDEX = BUILDER_STEPS.indexOf('builder:arrange')
+
+export function useBuilderSteps(options?: { hasOutputs?: Ref<boolean> }) {
+  const { mode, isBuilderMode, setMode } = useAppMode()
+  const { settingView, showDialog } = useAppSetDefaultView()
+
+  const activeStep = computed<BuilderStepId>(() => {
+    if (settingView.value) return 'setDefaultView'
+    if (isBuilderMode.value) {
+      return mode.value as BuilderStepId
+    }
+    return 'builder:inputs'
+  })
+
+  const activeStepIndex = computed(() =>
+    BUILDER_STEPS.indexOf(activeStep.value)
+  )
+
+  const isFirstStep = computed(() => activeStepIndex.value === 0)
+
+  const isLastStep = computed(() => {
+    if (!options?.hasOutputs?.value)
+      return activeStepIndex.value >= ARRANGE_INDEX
+    return activeStepIndex.value >= BUILDER_STEPS.length - 1
+  })
+
+  const isSelectStep = computed(
+    () =>
+      activeStep.value === 'builder:inputs' ||
+      activeStep.value === 'builder:outputs'
+  )
+
+  function navigateToStep(stepId: BuilderStepId) {
+    if (stepId === 'setDefaultView') {
+      setMode('builder:arrange')
+      showDialog()
+    } else {
+      setMode(stepId)
+    }
+  }
+
+  function goBack() {
+    if (isFirstStep.value) return
+    navigateToStep(BUILDER_STEPS[activeStepIndex.value - 1])
+  }
+
+  function goNext() {
+    if (isLastStep.value) return
+    navigateToStep(BUILDER_STEPS[activeStepIndex.value + 1])
+  }
+
+  return {
+    activeStep,
+    activeStepIndex,
+    isFirstStep,
+    isLastStep,
+    isSelectStep,
+    navigateToStep,
+    goBack,
+    goNext
+  }
+}
diff --git a/src/components/builder/useEmptyWorkflowDialog.ts b/src/components/builder/useEmptyWorkflowDialog.ts
new file mode 100644
index 0000000000..a87af3baf5
--- /dev/null
+++ b/src/components/builder/useEmptyWorkflowDialog.ts
@@ -0,0 +1,44 @@
+import { useWorkflowTemplateSelectorDialog } from '@/composables/useWorkflowTemplateSelectorDialog'
+import { app } from '@/scripts/app'
+import { useDialogService } from '@/services/dialogService'
+import { useDialogStore } from '@/stores/dialogStore'
+
+import EmptyWorkflowDialogContent from './EmptyWorkflowDialogContent.vue'
+
+const DIALOG_KEY = 'builder-empty-workflow'
+
+export function useEmptyWorkflowDialog() {
+  const dialogService = useDialogService()
+  const dialogStore = useDialogStore()
+  const templateSelectorDialog = useWorkflowTemplateSelectorDialog()
+
+  function show(options: {
+    onEnterBuilder: () => void
+    onDismiss: () => void
+  }) {
+    dialogService.showLayoutDialog({
+      key: DIALOG_KEY,
+      component: EmptyWorkflowDialogContent,
+      props: {
+        onBackToWorkflow: () => {
+          closeDialog()
+          options.onDismiss()
+        },
+        onLoadTemplate: () => {
+          closeDialog()
+          templateSelectorDialog.show('appbuilder', {
+            afterClose: () => {
+              if (app.rootGraph?.nodes?.length) options.onEnterBuilder()
+            }
+          })
+        }
+      }
+    })
+  }
+
+  function closeDialog() {
+    dialogStore.closeDialog({ key: DIALOG_KEY })
+  }
+
+  return { show }
+}
diff --git a/src/components/button/IconGroup.vue b/src/components/button/IconGroup.vue
index 2575d37aea..06bc7dbbda 100644
--- a/src/components/button/IconGroup.vue
+++ b/src/components/button/IconGroup.vue
@@ -2,7 +2,8 @@
   <div
     :class="
       cn(
-        'flex justify-center items-center shrink-0 outline-hidden border-none p-0 rounded-lg bg-secondary-background shadow-sm transition-all duration-200 cursor-pointer'
+        'flex shrink-0 cursor-pointer items-center justify-center rounded-lg border-none bg-secondary-background p-0 shadow-sm outline-hidden transition-all duration-200',
+        backgroundClass
       )
     "
   >
@@ -12,4 +13,8 @@
 
 <script setup lang="ts">
 import { cn } from '@/utils/tailwindUtil'
+
+const { backgroundClass } = defineProps<{
+  backgroundClass?: string
+}>()
 </script>
diff --git a/src/components/button/MoreButton.vue b/src/components/button/MoreButton.vue
index d192efb90c..0ffea76ce5 100644
--- a/src/components/button/MoreButton.vue
+++ b/src/components/button/MoreButton.vue
@@ -1,6 +1,11 @@
 <template>
   <div class="relative inline-flex items-center">
-    <Button size="icon" variant="secondary" @click="popover?.toggle">
+    <Button
+      size="icon"
+      variant="secondary"
+      v-bind="$attrs"
+      @click="popover?.toggle"
+    >
       <i
         :class="
           cn(
@@ -60,6 +65,10 @@ import { ref } from 'vue'
 import Button from '@/components/ui/button/Button.vue'
 import { cn } from '@/utils/tailwindUtil'
 
+defineOptions({
+  inheritAttrs: false
+})
+
 interface MoreButtonProps {
   isVertical?: boolean
 }
diff --git a/src/components/card/CardBottom.vue b/src/components/card/CardBottom.vue
index 4a0ae10475..31ade62ce0 100644
--- a/src/components/card/CardBottom.vue
+++ b/src/components/card/CardBottom.vue
@@ -14,6 +14,6 @@ const { fullHeight = true } = defineProps<{
 }>()
 
 const containerClasses = computed(() =>
-  cn('flex-1 w-full', fullHeight && 'h-full')
+  cn('w-full flex-1', fullHeight && 'h-full')
 )
 </script>
diff --git a/src/components/card/CardContainer.vue b/src/components/card/CardContainer.vue
index 8b8f81944c..1a5dcb4951 100644
--- a/src/components/card/CardContainer.vue
+++ b/src/components/card/CardContainer.vue
@@ -59,7 +59,7 @@ const containerClasses = computed(() => {
     outline: cn(
       hasBorder && 'border-2 border-border-subtle',
       hasCursor && 'cursor-pointer',
-      'hover:border-border-subtle/50 transition-colors'
+      'transition-colors hover:border-border-subtle/50'
     )
   }
 
diff --git a/src/components/card/CardTop.vue b/src/components/card/CardTop.vue
index fb3a528b6c..56b19b1bef 100644
--- a/src/components/card/CardTop.vue
+++ b/src/components/card/CardTop.vue
@@ -1,6 +1,6 @@
 <template>
   <div :class="topStyle">
-    <slot class="absolute top-0 left-0 h-full w-full"></slot>
+    <slot class="absolute top-0 left-0 size-full"></slot>
 
     <div v-if="slots['top-left']" :class="slotClasses['top-left']">
       <slot name="top-left"></slot>
diff --git a/src/components/chip/SquareChip.vue b/src/components/chip/SquareChip.vue
index b31e283dbc..e9f4979226 100644
--- a/src/components/chip/SquareChip.vue
+++ b/src/components/chip/SquareChip.vue
@@ -19,9 +19,9 @@ const baseClasses =
 
 const variantStyles = {
   dark: 'bg-zinc-500/40 text-white/90',
-  light: cn('backdrop-blur-[2px] bg-base-background/50 text-base-foreground'),
+  light: cn('bg-base-background/50 text-base-foreground backdrop-blur-[2px]'),
   gray: cn(
-    'backdrop-blur-[2px] bg-modal-card-tag-background text-base-foreground'
+    'bg-modal-card-tag-background text-base-foreground backdrop-blur-[2px]'
   )
 }
 
diff --git a/src/components/common/BackgroundImageUpload.vue b/src/components/common/BackgroundImageUpload.vue
index 5835aeace4..72f5af1f25 100644
--- a/src/components/common/BackgroundImageUpload.vue
+++ b/src/components/common/BackgroundImageUpload.vue
@@ -40,6 +40,7 @@ import InputText from 'primevue/inputtext'
 import { ref } from 'vue'
 
 import Button from '@/components/ui/button/Button.vue'
+import { appendCloudResParam } from '@/platform/distribution/cloudPreviewUtil'
 import { useToastStore } from '@/platform/updates/common/toastStore'
 import { api } from '@/scripts/api'
 
@@ -88,6 +89,7 @@ const handleFileUpload = async (event: Event) => {
           type: 'input',
           subfolder: 'backgrounds'
         })
+        appendCloudResParam(params, file.name)
         modelValue.value = `/api/view?${params.toString()}`
       }
     } catch (error) {
diff --git a/src/components/common/BadgePill.test.ts b/src/components/common/BadgePill.test.ts
new file mode 100644
index 0000000000..2d864154e0
--- /dev/null
+++ b/src/components/common/BadgePill.test.ts
@@ -0,0 +1,89 @@
+import { mount } from '@vue/test-utils'
+import { describe, expect, it } from 'vitest'
+
+import BadgePill from './BadgePill.vue'
+
+describe('BadgePill', () => {
+  it('renders text content', () => {
+    const wrapper = mount(BadgePill, {
+      props: { text: 'Test Badge' }
+    })
+    expect(wrapper.text()).toBe('Test Badge')
+  })
+
+  it('renders icon when provided', () => {
+    const wrapper = mount(BadgePill, {
+      props: { icon: 'icon-[comfy--credits]', text: 'Credits' }
+    })
+    expect(wrapper.find('i.icon-\\[comfy--credits\\]').exists()).toBe(true)
+  })
+
+  it('applies iconClass to icon', () => {
+    const wrapper = mount(BadgePill, {
+      props: {
+        icon: 'icon-[comfy--credits]',
+        iconClass: 'text-amber-400'
+      }
+    })
+    const icon = wrapper.find('i')
+    expect(icon.classes()).toContain('text-amber-400')
+  })
+
+  it('uses default border color when no borderStyle', () => {
+    const wrapper = mount(BadgePill, {
+      props: { text: 'Default' }
+    })
+    expect(wrapper.attributes('style')).toContain(
+      'border-color: var(--border-color)'
+    )
+  })
+
+  it('applies solid border color when borderStyle is a color', () => {
+    const wrapper = mount(BadgePill, {
+      props: { text: 'Colored', borderStyle: '#f59e0b' }
+    })
+    expect(wrapper.attributes('style')).toContain('border-color: #f59e0b')
+  })
+
+  it('applies gradient border when borderStyle contains linear-gradient', () => {
+    const gradient = 'linear-gradient(90deg, #3186FF, #FABC12)'
+    const wrapper = mount(BadgePill, {
+      props: { text: 'Gradient', borderStyle: gradient }
+    })
+    const element = wrapper.element as HTMLElement
+    expect(element.style.borderColor).toBe('transparent')
+    expect(element.style.backgroundOrigin).toBe('border-box')
+    expect(element.style.backgroundClip).toBe('padding-box, border-box')
+  })
+
+  it('applies filled style with background and text color', () => {
+    const wrapper = mount(BadgePill, {
+      props: { text: 'Filled', borderStyle: '#f59e0b', filled: true }
+    })
+    const style = wrapper.attributes('style')
+    expect(style).toContain('border-color: #f59e0b')
+    expect(style).toContain('background-color: #f59e0b33')
+    expect(style).toContain('color: #f59e0b')
+  })
+
+  it('has foreground text when not filled', () => {
+    const wrapper = mount(BadgePill, {
+      props: { text: 'Not Filled', borderStyle: '#f59e0b' }
+    })
+    expect(wrapper.classes()).toContain('text-foreground')
+  })
+
+  it('does not have foreground text class when filled', () => {
+    const wrapper = mount(BadgePill, {
+      props: { text: 'Filled', borderStyle: '#f59e0b', filled: true }
+    })
+    expect(wrapper.classes()).not.toContain('text-foreground')
+  })
+
+  it('renders slot content', () => {
+    const wrapper = mount(BadgePill, {
+      slots: { default: 'Slot Content' }
+    })
+    expect(wrapper.text()).toBe('Slot Content')
+  })
+})
diff --git a/src/components/common/BadgePill.vue b/src/components/common/BadgePill.vue
new file mode 100644
index 0000000000..77c13e6f84
--- /dev/null
+++ b/src/components/common/BadgePill.vue
@@ -0,0 +1,58 @@
+<template>
+  <span
+    :class="
+      cn(
+        'flex items-center gap-1 rounded-sm border px-1.5 py-0.5 text-xxs',
+        textColorClass
+      )
+    "
+    :style="customStyle"
+  >
+    <i v-if="icon" :class="cn(icon, 'size-2.5', iconClass)" />
+    <slot>{{ text }}</slot>
+  </span>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+const { borderStyle, filled } = defineProps<{
+  text?: string
+  icon?: string
+  iconClass?: string
+  borderStyle?: string
+  filled?: boolean
+}>()
+
+const textColorClass = computed(() =>
+  borderStyle && filled ? '' : 'text-foreground'
+)
+
+const customStyle = computed(() => {
+  if (!borderStyle) {
+    return { borderColor: 'var(--border-color)' }
+  }
+
+  const isGradient = borderStyle.includes('linear-gradient')
+  if (isGradient) {
+    return {
+      borderColor: 'transparent',
+      backgroundImage: `linear-gradient(var(--base-background), var(--base-background)), ${borderStyle}`,
+      backgroundOrigin: 'border-box',
+      backgroundClip: 'padding-box, border-box'
+    }
+  }
+
+  if (filled) {
+    return {
+      borderColor: borderStyle,
+      backgroundColor: `${borderStyle}33`,
+      color: borderStyle
+    }
+  }
+
+  return { borderColor: borderStyle }
+})
+</script>
diff --git a/src/components/common/ComfyImage.vue b/src/components/common/ComfyImage.vue
index aa6a66c55f..351d1cde49 100644
--- a/src/components/common/ComfyImage.vue
+++ b/src/components/common/ComfyImage.vue
@@ -38,7 +38,10 @@ const {
   alt = 'Image content'
 } = defineProps<{
   src: string
-  class?: any
+  class?:
+    | string
+    | Record<string, boolean>
+    | (string | Record<string, boolean>)[]
   contain?: boolean
   alt?: string
 }>()
diff --git a/src/components/common/DeviceInfo.vue b/src/components/common/DeviceInfo.vue
index 8e00fd16ba..ab141cfbc0 100644
--- a/src/components/common/DeviceInfo.vue
+++ b/src/components/common/DeviceInfo.vue
@@ -28,13 +28,17 @@ const deviceColumns: { field: keyof DeviceStats; header: string }[] = [
   { field: 'torch_vram_free', header: 'Torch VRAM Free' }
 ]
 
-const formatValue = (value: any, field: string) => {
+const formatValue = (value: string | number, field: string) => {
   if (
     ['vram_total', 'vram_free', 'torch_vram_total', 'torch_vram_free'].includes(
       field
     )
   ) {
-    return formatSize(value)
+    const num = Number(value)
+    if (Number.isFinite(num)) {
+      return formatSize(num)
+    }
+    return value
   }
   return value
 }
diff --git a/src/components/common/DraggableList.vue b/src/components/common/DraggableList.vue
new file mode 100644
index 0000000000..415a8225e0
--- /dev/null
+++ b/src/components/common/DraggableList.vue
@@ -0,0 +1,59 @@
+<script setup lang="ts" generic="T">
+import { onBeforeUnmount, ref, useTemplateRef, watchPostEffect } from 'vue'
+
+import { DraggableList } from '@/scripts/ui/draggableList'
+
+const modelValue = defineModel<T[]>({ required: true })
+const draggableList = ref<DraggableList>()
+const draggableItems = useTemplateRef('draggableItems')
+
+watchPostEffect(() => {
+  void modelValue.value.length
+  draggableList.value?.dispose()
+  if (!draggableItems.value?.children?.length) return
+  draggableList.value = new DraggableList(
+    draggableItems.value,
+    '.draggable-item'
+  )
+  draggableList.value.applyNewItemsOrder = function () {
+    const reorderedItems = []
+
+    let oldPosition = -1
+    this.getAllItems().forEach((item, index) => {
+      if (item === this.draggableItem) {
+        oldPosition = index
+        return
+      }
+      if (!this.isItemToggled(item)) {
+        reorderedItems[index] = item
+        return
+      }
+      const newIndex = this.isItemAbove(item) ? index + 1 : index - 1
+      reorderedItems[newIndex] = item
+    })
+
+    for (let index = 0; index < this.getAllItems().length; index++) {
+      const item = reorderedItems[index]
+      if (typeof item === 'undefined') {
+        reorderedItems[index] = this.draggableItem
+      }
+    }
+    const newPosition = reorderedItems.indexOf(this.draggableItem)
+    const itemList = modelValue.value
+    const [item] = itemList.splice(oldPosition, 1)
+    itemList.splice(newPosition, 0, item)
+    modelValue.value = [...itemList]
+  }
+})
+
+onBeforeUnmount(() => {
+  draggableList.value?.dispose()
+})
+</script>
+<template>
+  <div ref="draggableItems" class="mt-0.5 space-y-0.5 px-2 pb-2">
+    <slot
+      drag-class="draggable-item drag-handle cursor-grab [&.is-draggable]:cursor-grabbing"
+    />
+  </div>
+</template>
diff --git a/src/components/common/DropdownItem.vue b/src/components/common/DropdownItem.vue
new file mode 100644
index 0000000000..0ed17b2106
--- /dev/null
+++ b/src/components/common/DropdownItem.vue
@@ -0,0 +1,65 @@
+<script setup lang="ts">
+import type { MenuItem } from 'primevue/menuitem'
+import {
+  DropdownMenuItem,
+  DropdownMenuPortal,
+  DropdownMenuSeparator,
+  DropdownMenuSub,
+  DropdownMenuSubContent,
+  DropdownMenuSubTrigger
+} from 'reka-ui'
+import { useI18n } from 'vue-i18n'
+import { toValue } from 'vue'
+
+const { t } = useI18n()
+
+defineOptions({
+  inheritAttrs: false
+})
+
+defineProps<{ itemClass: string; contentClass: string; item: MenuItem }>()
+</script>
+<template>
+  <DropdownMenuSeparator
+    v-if="item.separator"
+    class="m-1 h-px bg-border-subtle"
+  />
+  <DropdownMenuSub v-else-if="item.items">
+    <DropdownMenuSubTrigger
+      :class="itemClass"
+      :disabled="toValue(item.disabled) ?? !item.items?.length"
+    >
+      {{ item.label }}
+      <i class="ml-auto icon-[lucide--chevron-right]" />
+    </DropdownMenuSubTrigger>
+    <DropdownMenuPortal>
+      <DropdownMenuSubContent
+        :class="contentClass"
+        :side-offset="2"
+        :align-offset="-5"
+      >
+        <DropdownItem
+          v-for="(subitem, index) in item.items"
+          :key="toValue(subitem.label) ?? index"
+          :item="subitem"
+          :item-class
+          :content-class
+        />
+      </DropdownMenuSubContent>
+    </DropdownMenuPortal>
+  </DropdownMenuSub>
+  <DropdownMenuItem
+    v-else
+    :class="itemClass"
+    :disabled="toValue(item.disabled) ?? !item.command"
+    @select="item.command?.({ originalEvent: $event, item })"
+  >
+    <i class="size-5" :class="item.icon" />
+    {{ item.label }}
+    <div
+      v-if="item.new"
+      class="ml-auto flex items-center rounded-full bg-primary-background px-1 text-xxs leading-none font-bold"
+      v-text="t('contextMenu.new')"
+    />
+  </DropdownMenuItem>
+</template>
diff --git a/src/components/common/DropdownMenu.vue b/src/components/common/DropdownMenu.vue
new file mode 100644
index 0000000000..880a7c4798
--- /dev/null
+++ b/src/components/common/DropdownMenu.vue
@@ -0,0 +1,74 @@
+<script setup lang="ts">
+import type { MenuItem } from 'primevue/menuitem'
+import {
+  DropdownMenuArrow,
+  DropdownMenuContent,
+  DropdownMenuPortal,
+  DropdownMenuRoot,
+  DropdownMenuTrigger
+} from 'reka-ui'
+import { computed, toValue } from 'vue'
+
+import DropdownItem from '@/components/common/DropdownItem.vue'
+import Button from '@/components/ui/button/Button.vue'
+import { cn } from '@/utils/tailwindUtil'
+
+defineOptions({
+  inheritAttrs: false
+})
+
+const { itemClass: itemProp, contentClass: contentProp } = defineProps<{
+  entries?: MenuItem[]
+  icon?: string
+  to?: string | HTMLElement
+  itemClass?: string
+  contentClass?: string
+}>()
+
+const itemClass = computed(() =>
+  cn(
+    'm-1 flex cursor-pointer gap-1 rounded-lg p-2 leading-none data-disabled:pointer-events-none data-disabled:text-muted-foreground data-highlighted:bg-secondary-background-hover',
+    itemProp
+  )
+)
+
+const contentClass = computed(() =>
+  cn(
+    'data-[side=top]:animate-slideDownAndFade data-[side=right]:animate-slideLeftAndFade data-[side=bottom]:animate-slideUpAndFade data-[side=left]:animate-slideRightAndFade z-1700 min-w-[220px] rounded-lg border border-border-subtle bg-base-background p-2 shadow-sm will-change-[opacity,transform]',
+    contentProp
+  )
+)
+</script>
+
+<template>
+  <DropdownMenuRoot>
+    <DropdownMenuTrigger as-child>
+      <slot name="button">
+        <Button size="icon">
+          <i :class="icon ?? 'icon-[lucide--menu]'" />
+        </Button>
+      </slot>
+    </DropdownMenuTrigger>
+
+    <DropdownMenuPortal :to>
+      <DropdownMenuContent
+        side="bottom"
+        :side-offset="5"
+        :collision-padding="10"
+        v-bind="$attrs"
+        :class="contentClass"
+      >
+        <slot :item-class>
+          <DropdownItem
+            v-for="(item, index) in entries ?? []"
+            :key="toValue(item.label) ?? index"
+            :item-class
+            :content-class
+            :item
+          />
+        </slot>
+        <DropdownMenuArrow class="fill-base-background stroke-border-subtle" />
+      </DropdownMenuContent>
+    </DropdownMenuPortal>
+  </DropdownMenuRoot>
+</template>
diff --git a/src/components/common/EditableText.test.ts b/src/components/common/EditableText.test.ts
index 2d31123b98..df1ea5152f 100644
--- a/src/components/common/EditableText.test.ts
+++ b/src/components/common/EditableText.test.ts
@@ -51,7 +51,7 @@ describe('EditableText', () => {
       isEditing: true
     })
     await wrapper.findComponent(InputText).setValue('New Text')
-    await wrapper.findComponent(InputText).trigger('keyup.enter')
+    await wrapper.findComponent(InputText).trigger('keydown.enter')
     // Blur event should have been triggered
     expect(wrapper.findComponent(InputText).element).not.toBe(
       document.activeElement
@@ -79,7 +79,7 @@ describe('EditableText', () => {
     await wrapper.findComponent(InputText).setValue('Modified Text')
 
     // Press escape
-    await wrapper.findComponent(InputText).trigger('keyup.escape')
+    await wrapper.findComponent(InputText).trigger('keydown.escape')
 
     // Should emit cancel event
     expect(wrapper.emitted('cancel')).toBeTruthy()
@@ -103,7 +103,7 @@ describe('EditableText', () => {
     await wrapper.findComponent(InputText).setValue('Modified Text')
 
     // Press escape (which triggers blur internally)
-    await wrapper.findComponent(InputText).trigger('keyup.escape')
+    await wrapper.findComponent(InputText).trigger('keydown.escape')
 
     // Manually trigger blur to simulate the blur that happens after escape
     await wrapper.findComponent(InputText).trigger('blur')
@@ -120,7 +120,7 @@ describe('EditableText', () => {
       isEditing: true
     })
     await enterWrapper.findComponent(InputText).setValue('Saved Text')
-    await enterWrapper.findComponent(InputText).trigger('keyup.enter')
+    await enterWrapper.findComponent(InputText).trigger('keydown.enter')
     // Trigger blur that happens after enter
     await enterWrapper.findComponent(InputText).trigger('blur')
     expect(enterWrapper.emitted('edit')).toBeTruthy()
@@ -133,7 +133,7 @@ describe('EditableText', () => {
       isEditing: true
     })
     await escapeWrapper.findComponent(InputText).setValue('Cancelled Text')
-    await escapeWrapper.findComponent(InputText).trigger('keyup.escape')
+    await escapeWrapper.findComponent(InputText).trigger('keydown.escape')
     expect(escapeWrapper.emitted('cancel')).toBeTruthy()
     expect(escapeWrapper.emitted('edit')).toBeFalsy()
   })
diff --git a/src/components/common/EditableText.vue b/src/components/common/EditableText.vue
index 322d332a46..440935fb9d 100644
--- a/src/components/common/EditableText.vue
+++ b/src/components/common/EditableText.vue
@@ -3,7 +3,7 @@
     <span v-if="!isEditing">
       {{ modelValue }}
     </span>
-    <!-- Avoid double triggering finishEditing event when keyup.enter is triggered -->
+    <!-- Avoid double triggering finishEditing event when keydown.enter is triggered -->
     <InputText
       v-else
       ref="inputRef"
@@ -18,8 +18,8 @@
           ...inputAttrs
         }
       }"
-      @keyup.enter.capture.stop="blurInputElement"
-      @keyup.escape.stop="cancelEditing"
+      @keydown.enter.capture.stop="blurInputElement"
+      @keydown.escape.capture.stop="cancelEditing"
       @click.stop
       @contextmenu.stop
       @pointerdown.stop.capture
diff --git a/src/components/common/ElectronFileDownload.vue b/src/components/common/ElectronFileDownload.vue
deleted file mode 100644
index 0a85a197b7..0000000000
--- a/src/components/common/ElectronFileDownload.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<!-- A Electron-backed download button with a label, size hint and progress bar -->
-<template>
-  <div class="flex flex-col">
-    <div class="flex flex-row items-center gap-2">
-      <i v-if="status === 'completed'" class="pi pi-check text-green-500" />
-      <div class="file-info">
-        <div class="file-details">
-          <span class="file-type" :title="hint">{{ label }}</span>
-        </div>
-        <div v-if="props.error" class="file-error">
-          {{ props.error }}
-        </div>
-      </div>
-
-      <div class="file-action flex flex-row items-center gap-2">
-        <Button
-          v-if="status === null || status === 'error'"
-          class="file-action-button"
-          variant="secondary"
-          size="sm"
-          :disabled="!!props.error"
-          @click="triggerDownload"
-        >
-          <i class="pi pi-download" />
-          {{ $t('g.download') + ' (' + fileSize + ')' }}
-        </Button>
-        <Button
-          v-if="(status === null || status === 'error') && !!props.url"
-          variant="secondary"
-          size="sm"
-          @click="copyURL"
-        >
-          {{ $t('g.copyURL') }}
-        </Button>
-      </div>
-    </div>
-    <div
-      v-if="status === 'in_progress' || status === 'paused'"
-      class="flex flex-row items-center gap-2"
-    >
-      <!-- Temporary fix for issue when % only comes into view only if the progress bar is large enough
-           https://comfy-organization.slack.com/archives/C07H3GLKDPF/p1731551013385499
-      -->
-      <ProgressBar
-        class="flex-1"
-        :value="downloadProgress"
-        :show-value="downloadProgress > 10"
-      />
-
-      <Button
-        v-if="status === 'in_progress'"
-        v-tooltip.top="t('electronFileDownload.pause')"
-        class="file-action-button"
-        variant="secondary"
-        size="sm"
-        :disabled="!!props.error"
-        @click="triggerPauseDownload"
-      >
-        <i class="pi pi-pause-circle" />
-      </Button>
-
-      <Button
-        v-if="status === 'paused'"
-        v-tooltip.top="t('electronFileDownload.resume')"
-        class="file-action-button"
-        variant="secondary"
-        size="sm"
-        :aria-label="t('electronFileDownload.resume')"
-        :disabled="!!props.error"
-        @click="triggerResumeDownload"
-      >
-        <i class="pi pi-play-circle" />
-      </Button>
-
-      <Button
-        v-tooltip.top="t('electronFileDownload.cancel')"
-        class="file-action-button"
-        variant="destructive"
-        size="sm"
-        :aria-label="t('electronFileDownload.cancel')"
-        :disabled="!!props.error"
-        @click="triggerCancelDownload"
-      >
-        <i class="pi pi-times-circle" />
-      </Button>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import ProgressBar from 'primevue/progressbar'
-import { computed, ref } from 'vue'
-import { useI18n } from 'vue-i18n'
-
-import Button from '@/components/ui/button/Button.vue'
-import { useCopyToClipboard } from '@/composables/useCopyToClipboard'
-import { useDownload } from '@/composables/useDownload'
-import { useElectronDownloadStore } from '@/stores/electronDownloadStore'
-import { formatSize } from '@/utils/formatUtil'
-
-const props = defineProps<{
-  url: string
-  hint?: string
-  label?: string
-  error?: string
-}>()
-
-const { t } = useI18n()
-const label = computed(() => props.label || props.url.split('/').pop())
-const hint = computed(() => props.hint || props.url)
-const download = useDownload(props.url)
-const downloadProgress = ref<number>(0)
-const status = ref<string | null>(null)
-const fileSize = computed(() =>
-  download.fileSize.value ? formatSize(download.fileSize.value) : '?'
-)
-const { copyToClipboard } = useCopyToClipboard()
-const electronDownloadStore = useElectronDownloadStore()
-// @ts-expect-error fixme ts strict error
-const [savePath, filename] = props.label.split('/')
-
-electronDownloadStore.$subscribe((_, { downloads }) => {
-  const download = downloads.find((download) => props.url === download.url)
-
-  if (download) {
-    // @ts-expect-error fixme ts strict error
-    downloadProgress.value = Number((download.progress * 100).toFixed(1))
-    // @ts-expect-error fixme ts strict error
-    status.value = download.status
-  }
-})
-
-const triggerDownload = async () => {
-  await electronDownloadStore.start({
-    url: props.url,
-    savePath: savePath.trim(),
-    filename: filename.trim()
-  })
-}
-
-const triggerCancelDownload = () => electronDownloadStore.cancel(props.url)
-const triggerPauseDownload = () => electronDownloadStore.pause(props.url)
-const triggerResumeDownload = () => electronDownloadStore.resume(props.url)
-
-const copyURL = async () => {
-  await copyToClipboard(props.url)
-}
-</script>
diff --git a/src/components/common/FileDownload.vue b/src/components/common/FileDownload.vue
deleted file mode 100644
index b0aa1e54b6..0000000000
--- a/src/components/common/FileDownload.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-<!-- A file download button with a label and a size hint -->
-<template>
-  <div class="flex flex-row items-center gap-2">
-    <div>
-      <div>
-        <span :title="hint">{{ label }}</span>
-      </div>
-      <Message
-        v-if="props.error"
-        severity="error"
-        icon="pi pi-exclamation-triangle"
-        size="small"
-        variant="outlined"
-        class="my-2 h-min max-w-xs px-1"
-        :title="props.error"
-        :pt="{
-          text: { class: 'overflow-hidden text-ellipsis' }
-        }"
-      >
-        {{ props.error }}
-      </Message>
-    </div>
-    <div>
-      <Button
-        variant="secondary"
-        :disabled="!!props.error"
-        :title="props.url"
-        @click="download.triggerBrowserDownload"
-      >
-        {{ $t('g.download') + ' (' + fileSize + ')' }}
-      </Button>
-    </div>
-    <div>
-      <Button variant="secondary" :disabled="!!props.error" @click="copyURL">
-        {{ $t('g.copyURL') }}
-      </Button>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import Message from 'primevue/message'
-import { computed } from 'vue'
-
-import Button from '@/components/ui/button/Button.vue'
-import { useCopyToClipboard } from '@/composables/useCopyToClipboard'
-import { useDownload } from '@/composables/useDownload'
-import { formatSize } from '@/utils/formatUtil'
-
-const props = defineProps<{
-  url: string
-  hint?: string
-  label?: string
-  error?: string
-}>()
-
-const label = computed(() => props.label || props.url.split('/').pop())
-
-const hint = computed(() => props.hint || props.url)
-const download = useDownload(props.url)
-const fileSize = computed(() =>
-  download.fileSize.value ? formatSize(download.fileSize.value) : '?'
-)
-const copyURL = async () => {
-  await copyToClipboard(props.url)
-}
-
-const { copyToClipboard } = useCopyToClipboard()
-</script>
diff --git a/src/components/common/FormImageUpload.vue b/src/components/common/FormImageUpload.vue
index 7e0b9916d0..479b84e627 100644
--- a/src/components/common/FormImageUpload.vue
+++ b/src/components/common/FormImageUpload.vue
@@ -2,7 +2,7 @@
   <div class="image-upload-wrapper">
     <div class="flex items-center gap-2">
       <div
-        class="preview-box flex h-16 w-16 items-center justify-center rounded border p-2"
+        class="preview-box flex size-16 items-center justify-center rounded-sm border p-2"
         :class="{ 'bg-base-background': !modelValue }"
       >
         <img
diff --git a/src/components/common/FormItem.vue b/src/components/common/FormItem.vue
index 011f807537..c3c76afe84 100644
--- a/src/components/common/FormItem.vue
+++ b/src/components/common/FormItem.vue
@@ -47,7 +47,7 @@ import InputSlider from '@/components/common/InputSlider.vue'
 import UrlInput from '@/components/common/UrlInput.vue'
 import type { FormItem } from '@/platform/settings/types'
 
-const formValue = defineModel<any>('formValue')
+const formValue = defineModel<unknown>('formValue')
 const props = defineProps<{
   item: FormItem
   id?: string
@@ -61,7 +61,7 @@ function getFormAttrs(item: FormItem) {
     attrs['renderFunction'] = () =>
       inputType(
         props.item.name,
-        (v: any) => (formValue.value = v),
+        (v: unknown) => (formValue.value = v),
         formValue.value,
         item.attrs
       )
@@ -117,20 +117,18 @@ function getFormComponent(item: FormItem): Component {
 </script>
 
 <style scoped>
-@reference '../../assets/css/style.css';
-
 .form-input :deep(.input-slider) .p-inputnumber input,
 .form-input :deep(.input-slider) .slider-part {
-  @apply w-20;
+  width: 5rem;
 }
 
 .form-input :deep(.input-knob) .p-inputnumber input,
 .form-input :deep(.input-knob) .knob-part {
-  @apply w-32;
+  width: 8rem;
 }
 
 .form-input :deep(.p-inputtext),
 .form-input :deep(.p-select) {
-  @apply w-44;
+  width: 11rem;
 }
 </style>
diff --git a/src/components/common/FormRadioGroup.test.ts b/src/components/common/FormRadioGroup.test.ts
index a014b8ecdf..2ec26e9af0 100644
--- a/src/components/common/FormRadioGroup.test.ts
+++ b/src/components/common/FormRadioGroup.test.ts
@@ -7,6 +7,7 @@ import { createApp } from 'vue'
 import type { SettingOption } from '@/platform/settings/types'
 
 import FormRadioGroup from './FormRadioGroup.vue'
+import type { ComponentProps } from 'vue-component-type-helpers'
 
 describe('FormRadioGroup', () => {
   beforeAll(() => {
@@ -14,7 +15,8 @@ describe('FormRadioGroup', () => {
     app.use(PrimeVue)
   })
 
-  const mountComponent = (props: any, options = {}) => {
+  type FormRadioGroupProps = ComponentProps<typeof FormRadioGroup>
+  const mountComponent = (props: FormRadioGroupProps, options = {}) => {
     return mount(FormRadioGroup, {
       global: {
         plugins: [PrimeVue],
@@ -92,9 +94,9 @@ describe('FormRadioGroup', () => {
 
     it('handles custom object with optionLabel and optionValue', () => {
       const options = [
-        { name: 'First Option', id: 1 },
-        { name: 'Second Option', id: 2 },
-        { name: 'Third Option', id: 3 }
+        { name: 'First Option', id: '1' },
+        { name: 'Second Option', id: '2' },
+        { name: 'Third Option', id: '3' }
       ]
 
       const wrapper = mountComponent({
@@ -108,9 +110,9 @@ describe('FormRadioGroup', () => {
       const radioButtons = wrapper.findAllComponents(RadioButton)
       expect(radioButtons).toHaveLength(3)
 
-      expect(radioButtons[0].props('value')).toBe(1)
-      expect(radioButtons[1].props('value')).toBe(2)
-      expect(radioButtons[2].props('value')).toBe(3)
+      expect(radioButtons[0].props('value')).toBe('1')
+      expect(radioButtons[1].props('value')).toBe('2')
+      expect(radioButtons[2].props('value')).toBe('3')
 
       const labels = wrapper.findAll('label')
       expect(labels[0].text()).toBe('First Option')
@@ -167,10 +169,7 @@ describe('FormRadioGroup', () => {
     })
 
     it('handles object with missing properties gracefully', () => {
-      const options = [
-        { label: 'Option 1', val: 'opt1' },
-        { text: 'Option 2', value: 'opt2' }
-      ]
+      const options = [{ label: 'Option 1', val: 'opt1' }]
 
       const wrapper = mountComponent({
         modelValue: 'opt1',
@@ -179,11 +178,10 @@ describe('FormRadioGroup', () => {
       })
 
       const radioButtons = wrapper.findAllComponents(RadioButton)
-      expect(radioButtons).toHaveLength(2)
+      expect(radioButtons).toHaveLength(1)
 
       const labels = wrapper.findAll('label')
       expect(labels[0].text()).toBe('Unknown')
-      expect(labels[1].text()).toBe('Option 2')
     })
   })
 
diff --git a/src/components/common/FormRadioGroup.vue b/src/components/common/FormRadioGroup.vue
index 19889132b7..607a3c4076 100644
--- a/src/components/common/FormRadioGroup.vue
+++ b/src/components/common/FormRadioGroup.vue
@@ -20,22 +20,22 @@
   </div>
 </template>
 
-<script setup lang="ts">
+<script setup lang="ts" generic="T extends string | number | boolean | null">
 import RadioButton from 'primevue/radiobutton'
 import { computed } from 'vue'
 
 import type { SettingOption } from '@/platform/settings/types'
 
 const props = defineProps<{
-  modelValue: any
-  options: (SettingOption | string)[]
+  modelValue: T
+  options?: (string | SettingOption | Record<string, string>)[]
   optionLabel?: string
   optionValue?: string
   id?: string
 }>()
 
 defineEmits<{
-  'update:modelValue': [value: any]
+  'update:modelValue': [value: T]
 }>()
 
 const normalizedOptions = computed<SettingOption[]>(() => {
diff --git a/src/components/common/LazyImage.vue b/src/components/common/LazyImage.vue
index 938fc93875..1b34db33ba 100644
--- a/src/components/common/LazyImage.vue
+++ b/src/components/common/LazyImage.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     ref="containerRef"
-    class="relative flex h-full w-full items-center justify-center overflow-hidden"
+    class="relative flex size-full items-center justify-center overflow-hidden"
     :class="containerClass"
   >
     <Skeleton
@@ -38,6 +38,7 @@
 <script setup lang="ts">
 import Skeleton from 'primevue/skeleton'
 import { computed, onUnmounted, ref, watch } from 'vue'
+import type { StyleValue } from 'vue'
 
 import { useIntersectionObserver } from '@/composables/useIntersectionObserver'
 import { useMediaCache } from '@/services/mediaCacheService'
@@ -55,7 +56,7 @@ const {
   alt?: string
   containerClass?: ClassValue
   imageClass?: ClassValue
-  imageStyle?: Record<string, any>
+  imageStyle?: StyleValue
   rootMargin?: string
 }>()
 
diff --git a/src/components/common/LoadingOverlay.vue b/src/components/common/LoadingOverlay.vue
new file mode 100644
index 0000000000..ccc34908e1
--- /dev/null
+++ b/src/components/common/LoadingOverlay.vue
@@ -0,0 +1,49 @@
+<template>
+  <Transition name="fade">
+    <div
+      v-if="loading"
+      class="absolute inset-0 z-50 flex items-center justify-center bg-backdrop/50"
+    >
+      <div class="flex flex-col items-center">
+        <div class="grid place-items-center">
+          <div
+            :class="
+              cn(
+                'col-start-1 row-start-1 animate-spin rounded-full border-muted-foreground border-t-base-foreground',
+                spinnerSizeClass
+              )
+            "
+          />
+          <div class="col-start-1 row-start-1">
+            <slot />
+          </div>
+        </div>
+        <div v-if="loadingMessage" class="mt-4 text-lg text-base-foreground">
+          {{ loadingMessage }}
+        </div>
+      </div>
+    </div>
+  </Transition>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+const { size = 'md' } = defineProps<{
+  loading: boolean
+  loadingMessage?: string
+  size?: 'sm' | 'md'
+}>()
+
+const spinnerSizeClass = computed(() => {
+  switch (size) {
+    case 'sm':
+      return 'h-6 w-6 border-2'
+    case 'md':
+    default:
+      return 'h-12 w-12 border-4'
+  }
+})
+</script>
diff --git a/src/components/common/MarqueeLine.test.ts b/src/components/common/MarqueeLine.test.ts
new file mode 100644
index 0000000000..210f388c1a
--- /dev/null
+++ b/src/components/common/MarqueeLine.test.ts
@@ -0,0 +1,22 @@
+import { mount } from '@vue/test-utils'
+import { describe, expect, it } from 'vitest'
+
+import MarqueeLine from './MarqueeLine.vue'
+
+describe(MarqueeLine, () => {
+  it('renders slot content', () => {
+    const wrapper = mount(MarqueeLine, {
+      slots: { default: 'Hello World' }
+    })
+    expect(wrapper.text()).toBe('Hello World')
+  })
+
+  it('renders content inside a span within the container', () => {
+    const wrapper = mount(MarqueeLine, {
+      slots: { default: 'Test Text' }
+    })
+    const span = wrapper.find('span')
+    expect(span.exists()).toBe(true)
+    expect(span.text()).toBe('Test Text')
+  })
+})
diff --git a/src/components/common/MarqueeLine.vue b/src/components/common/MarqueeLine.vue
new file mode 100644
index 0000000000..0d89ff07ea
--- /dev/null
+++ b/src/components/common/MarqueeLine.vue
@@ -0,0 +1,24 @@
+<template>
+  <div
+    class="@container overflow-hidden mask-[linear-gradient(to_right,black_70%,transparent)] motion-safe:group-hover:mask-none"
+  >
+    <span
+      class="inline-block min-w-full text-center whitespace-nowrap [--_marquee-end:min(calc(-100%+100cqw),0px)] motion-safe:group-hover:animate-[marquee-scroll_3s_linear_infinite_alternate]"
+    >
+      <slot />
+    </span>
+  </div>
+</template>
+
+<style>
+@keyframes marquee-scroll {
+  0%,
+  20% {
+    transform: translateX(0);
+  }
+  80%,
+  100% {
+    transform: translateX(var(--_marquee-end));
+  }
+}
+</style>
diff --git a/src/components/common/NoResultsPlaceholder.vue b/src/components/common/NoResultsPlaceholder.vue
index a96ca2298d..ce27362838 100644
--- a/src/components/common/NoResultsPlaceholder.vue
+++ b/src/components/common/NoResultsPlaceholder.vue
@@ -3,14 +3,18 @@
     <Card>
       <template #content>
         <div class="flex flex-col items-center">
-          <i :class="icon" style="font-size: 3rem; margin-bottom: 1rem" />
-          <h3>{{ title }}</h3>
+          <i
+            v-if="icon"
+            :class="icon"
+            style="font-size: 3rem; margin-bottom: 1rem"
+          />
+          <h3 v-if="title">{{ title }}</h3>
           <p :class="textClass" class="text-center whitespace-pre-line">
             {{ message }}
           </p>
           <Button
             v-if="buttonLabel"
-            variant="textonly"
+            :variant="buttonVariant ?? 'textonly'"
             @click="$emit('action')"
           >
             {{ buttonLabel }}
@@ -25,14 +29,16 @@
 import Card from 'primevue/card'
 
 import Button from '@/components/ui/button/Button.vue'
+import type { ButtonVariants } from '../ui/button/button.variants'
 
 const props = defineProps<{
   class?: string
   icon?: string
-  title: string
+  title?: string
   message: string
   textClass?: string
   buttonLabel?: string
+  buttonVariant?: ButtonVariants['variant']
 }>()
 
 defineEmits(['action'])
@@ -51,7 +57,6 @@ defineEmits(['action'])
 }
 
 .no-results-placeholder p {
-  color: var(--text-color-secondary);
   margin-bottom: 1rem;
 }
 </style>
diff --git a/src/components/common/OverlayIcon.vue b/src/components/common/OverlayIcon.vue
new file mode 100644
index 0000000000..4e15006e8b
--- /dev/null
+++ b/src/components/common/OverlayIcon.vue
@@ -0,0 +1,65 @@
+<template>
+  <span class="relative inline-flex size-[1em] items-center justify-center">
+    <i :class="mainIcon" class="text-[1em]" />
+    <i
+      :class="
+        cn(
+          subIcon,
+          'pointer-events-none absolute leading-none',
+          positionX === 'left' ? 'left-0' : 'right-0',
+          positionY === 'top' ? 'top-0' : 'bottom-0'
+        )
+      "
+      :style="subIconStyle"
+    />
+  </span>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+type Position = 'top' | 'bottom' | 'left' | 'right'
+
+export interface OverlayIconProps {
+  mainIcon: string
+  subIcon: string
+  positionX?: Position
+  positionY?: Position
+  offsetX?: number
+  offsetY?: number
+  subIconScale?: number
+}
+const {
+  mainIcon,
+  subIcon,
+  positionX = 'right',
+  positionY = 'bottom',
+  offsetX = 0,
+  offsetY = 0,
+  subIconScale = 0.6
+} = defineProps<OverlayIconProps>()
+
+const textShadow = [
+  `-1px -1px 0 rgba(0, 0, 0, 0.7)`,
+  `1px -1px 0 rgba(0, 0, 0, 0.7)`,
+  `-1px 1px 0 rgba(0, 0, 0, 0.7)`,
+  `1px 1px 0 rgba(0, 0, 0, 0.7)`,
+  `-1px 0 0 rgba(0, 0, 0, 0.7)`,
+  `1px 0 0 rgba(0, 0, 0, 0.7)`,
+  `0 -1px 0 rgba(0, 0, 0, 0.7)`,
+  `0 1px 0 rgba(0, 0, 0, 0.7)`
+].join(', ')
+
+const subIconStyle = computed(() => ({
+  fontSize: `${subIconScale}em`,
+  textShadow,
+  ...(offsetX !== 0 && {
+    [positionX === 'left' ? 'left' : 'right']: `${offsetX}px`
+  }),
+  ...(offsetY !== 0 && {
+    [positionY === 'top' ? 'top' : 'bottom']: `${offsetY}px`
+  })
+}))
+</script>
diff --git a/src/components/common/ScrubableNumberInput.vue b/src/components/common/ScrubableNumberInput.vue
new file mode 100644
index 0000000000..b8a39ecf05
--- /dev/null
+++ b/src/components/common/ScrubableNumberInput.vue
@@ -0,0 +1,175 @@
+<template>
+  <div
+    ref="container"
+    class="flex h-7 rounded-lg bg-component-node-widget-background text-xs text-component-node-foreground"
+  >
+    <slot name="background" />
+    <Button
+      v-if="!hideButtons"
+      :aria-label="t('g.decrement')"
+      data-testid="decrement"
+      class="aspect-8/7 h-full rounded-r-none hover:bg-base-foreground/20 disabled:opacity-30"
+      variant="muted-textonly"
+      :disabled="!canDecrement"
+      tabindex="-1"
+      @click="modelValue = clamp(modelValue - step)"
+    >
+      <i class="pi pi-minus" />
+    </Button>
+    <div class="relative my-0.25 min-w-[4ch] flex-1 py-1.5">
+      <input
+        ref="inputField"
+        v-bind="inputAttrs"
+        :value="displayValue ?? modelValue"
+        :disabled
+        :class="
+          cn(
+            'absolute inset-0 truncate border-0 bg-transparent p-1 text-sm focus:outline-0'
+          )
+        "
+        inputmode="decimal"
+        autocomplete="off"
+        autocorrect="off"
+        spellcheck="false"
+        @blur="handleBlur"
+        @keyup.enter="handleBlur"
+        @dragstart.prevent
+      />
+      <div
+        :class="
+          cn(
+            'absolute inset-0 z-10 cursor-ew-resize',
+            textEdit && 'pointer-events-none hidden'
+          )
+        "
+        @pointerdown="handlePointerDown"
+        @pointermove="handlePointerMove"
+        @pointerup="handlePointerUp"
+        @pointercancel="resetDrag"
+      />
+    </div>
+    <slot />
+    <Button
+      v-if="!hideButtons"
+      :aria-label="t('g.increment')"
+      data-testid="increment"
+      class="aspect-8/7 h-full rounded-l-none hover:bg-base-foreground/20 disabled:opacity-30"
+      variant="muted-textonly"
+      :disabled="!canIncrement"
+      tabindex="-1"
+      @click="modelValue = clamp(modelValue + step)"
+    >
+      <i class="pi pi-plus" />
+    </Button>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { onClickOutside } from '@vueuse/core'
+import { computed, ref, useTemplateRef } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+import { cn } from '@/utils/tailwindUtil'
+
+const {
+  min,
+  max,
+  step = 1,
+  disabled = false,
+  hideButtons = false,
+  displayValue,
+  parseValue
+} = defineProps<{
+  min?: number
+  max?: number
+  step?: number
+  disabled?: boolean
+  hideButtons?: boolean
+  displayValue?: string
+  parseValue?: (raw: string) => number | undefined
+  inputAttrs?: Record<string, unknown>
+}>()
+
+const { t } = useI18n()
+const modelValue = defineModel<number>({ default: 0 })
+
+const container = useTemplateRef<HTMLDivElement>('container')
+const inputField = useTemplateRef<HTMLInputElement>('inputField')
+const textEdit = ref(false)
+
+onClickOutside(container, () => {
+  if (textEdit.value) textEdit.value = false
+})
+
+function clamp(value: number): number {
+  const lo = min ?? -Infinity
+  const hi = max ?? Infinity
+  return Math.min(hi, Math.max(lo, value))
+}
+
+const canDecrement = computed(
+  () => modelValue.value > (min ?? -Infinity) && !disabled
+)
+const canIncrement = computed(
+  () => modelValue.value < (max ?? Infinity) && !disabled
+)
+
+const dragging = ref(false)
+const dragDelta = ref(0)
+const hasDragged = ref(false)
+
+function handleBlur(e: Event) {
+  const target = e.target as HTMLInputElement
+  const raw = target.value.trim()
+  const parsed = parseValue
+    ? parseValue(raw)
+    : raw === ''
+      ? undefined
+      : Number(raw)
+  if (parsed != null && !isNaN(parsed)) {
+    modelValue.value = clamp(parsed)
+  } else {
+    target.value = displayValue ?? String(modelValue.value)
+  }
+  textEdit.value = false
+}
+
+function handlePointerDown(e: PointerEvent) {
+  if (e.button !== 0) return
+  if (disabled) return
+  const target = e.target as HTMLElement
+  target.setPointerCapture(e.pointerId)
+  dragging.value = true
+  dragDelta.value = 0
+  hasDragged.value = false
+}
+
+function handlePointerMove(e: PointerEvent) {
+  if (!dragging.value) return
+  dragDelta.value += e.movementX
+  const steps = (dragDelta.value / 10) | 0
+  if (steps === 0) return
+  hasDragged.value = true
+  const unclipped = modelValue.value + steps * step
+  dragDelta.value %= 10
+  modelValue.value = clamp(unclipped)
+}
+
+function handlePointerUp() {
+  if (!dragging.value) return
+
+  if (!hasDragged.value) {
+    textEdit.value = true
+    inputField.value?.focus()
+    inputField.value?.select()
+  }
+
+  resetDrag()
+}
+
+function resetDrag() {
+  dragging.value = false
+  dragDelta.value = 0
+}
+</script>
diff --git a/src/components/common/SearchBox.vue b/src/components/common/SearchBox.vue
index 3d91ddfe06..ac0d9cae0a 100644
--- a/src/components/common/SearchBox.vue
+++ b/src/components/common/SearchBox.vue
@@ -2,7 +2,7 @@
   <div
     :class="
       cn(
-        'relative flex w-full items-center gap-2 bg-comfy-input cursor-text text-comfy-input-foreground',
+        'relative flex w-full cursor-text items-center gap-2 bg-comfy-input text-comfy-input-foreground',
         customClass,
         wrapperStyle
       )
@@ -14,14 +14,19 @@
       :placeholder
       :autofocus
       unstyled
-      class="absolute inset-0 size-full pl-11 border-none outline-none bg-transparent text-sm"
+      :class="
+        cn(
+          'absolute inset-0 size-full border-none bg-transparent text-sm outline-none',
+          isLarge ? 'pl-11' : 'pl-8'
+        )
+      "
       :aria-label="placeholder"
     />
     <Button
       v-if="filterIcon"
       size="icon"
       variant="textonly"
-      class="filter-button absolute right-0 inset-y-0 m-0 p-0"
+      class="filter-button absolute inset-y-0 right-0 m-0 p-0"
       @click="$emit('showFilter', $event)"
     >
       <i :class="filterIcon" />
@@ -29,7 +34,7 @@
     <InputIcon v-if="!modelValue" :class="icon" />
     <Button
       v-if="modelValue"
-      class="clear-button absolute left-0"
+      :class="cn('clear-button absolute', isLarge ? 'left-2' : 'left-0')"
       variant="textonly"
       size="icon"
       @click="modelValue = ''"
@@ -83,6 +88,8 @@ const {
   class?: string
 }>()
 
+const isLarge = computed(() => size === 'lg')
+
 const emit = defineEmits<{
   (e: 'search', value: string, filters: TFilter[]): void
   (e: 'showFilter', event: Event): void
@@ -109,7 +116,10 @@ watchDebounced(
 
 const wrapperStyle = computed(() => {
   if (showBorder) {
-    return cn('rounded p-2 border border-solid border-border-default')
+    return cn(
+      'box-border rounded-sm border border-solid border-border-default p-2',
+      isLarge.value ? 'h-10' : 'h-8'
+    )
   }
 
   // Size-specific classes matching button sizes for consistency
@@ -123,8 +133,6 @@ const wrapperStyle = computed(() => {
 </script>
 
 <style scoped>
-@reference '../../assets/css/style.css';
-
 :deep(.p-inputtext) {
   --p-form-field-padding-x: 0.625rem;
 }
diff --git a/src/components/common/SearchBoxV2.test.ts b/src/components/common/SearchBoxV2.test.ts
new file mode 100644
index 0000000000..dfb2feaaf9
--- /dev/null
+++ b/src/components/common/SearchBoxV2.test.ts
@@ -0,0 +1,90 @@
+import { mount } from '@vue/test-utils'
+import { describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+import SearchBoxV2 from './SearchBoxV2.vue'
+
+vi.mock('@vueuse/core', () => ({
+  watchDebounced: vi.fn(() => vi.fn())
+}))
+
+describe('SearchBoxV2', () => {
+  const i18n = createI18n({
+    legacy: false,
+    locale: 'en',
+    messages: {
+      en: {
+        g: {
+          clear: 'Clear',
+          searchPlaceholder: 'Search...'
+        }
+      }
+    }
+  })
+
+  function mountComponent(props = {}) {
+    return mount(SearchBoxV2, {
+      global: {
+        plugins: [i18n],
+        stubs: {
+          ComboboxRoot: {
+            template: '<div><slot /></div>'
+          },
+          ComboboxAnchor: {
+            template: '<div><slot /></div>'
+          },
+          ComboboxInput: {
+            template:
+              '<input :placeholder="placeholder" :value="modelValue" @input="$emit(\'update:modelValue\', $event.target.value)" />',
+            props: ['placeholder', 'modelValue', 'autoFocus']
+          }
+        }
+      },
+      props: {
+        modelValue: '',
+        ...props
+      }
+    })
+  }
+
+  it('uses i18n placeholder when no placeholder prop provided', () => {
+    const wrapper = mountComponent()
+    const input = wrapper.find('input')
+    expect(input.attributes('placeholder')).toBe('Search...')
+  })
+
+  it('uses custom placeholder when provided', () => {
+    const wrapper = mountComponent({
+      placeholder: 'Custom placeholder'
+    })
+    const input = wrapper.find('input')
+    expect(input.attributes('placeholder')).toBe('Custom placeholder')
+  })
+
+  it('shows search icon when search term is empty', () => {
+    const wrapper = mountComponent({ modelValue: '' })
+    expect(wrapper.find('i.icon-\\[lucide--search\\]').exists()).toBe(true)
+  })
+
+  it('shows clear button when search term is not empty', () => {
+    const wrapper = mountComponent({ modelValue: 'test' })
+    expect(wrapper.find('button').exists()).toBe(true)
+  })
+
+  it('clears search term when clear button is clicked', async () => {
+    const wrapper = mountComponent({ modelValue: 'test' })
+    const clearButton = wrapper.find('button')
+    await clearButton.trigger('click')
+    expect(wrapper.emitted('update:modelValue')?.[0]).toEqual([''])
+  })
+
+  it('applies large size classes when size is lg', () => {
+    const wrapper = mountComponent({ size: 'lg' })
+    expect(wrapper.html()).toContain('size-5')
+  })
+
+  it('applies medium size classes when size is md', () => {
+    const wrapper = mountComponent({ size: 'md' })
+    expect(wrapper.html()).toContain('size-4')
+  })
+})
diff --git a/src/components/common/SearchBoxV2.vue b/src/components/common/SearchBoxV2.vue
new file mode 100644
index 0000000000..dba26c8aa6
--- /dev/null
+++ b/src/components/common/SearchBoxV2.vue
@@ -0,0 +1,117 @@
+<template>
+  <div class="flex flex-auto flex-col gap-2">
+    <ComboboxRoot :ignore-filter="true" :open="false">
+      <ComboboxAnchor
+        :class="
+          cn(
+            'relative flex w-full cursor-text items-center',
+            'rounded-lg bg-comfy-input text-comfy-input-foreground',
+            showBorder &&
+              'box-border border border-solid border-border-default',
+            sizeClasses,
+            className
+          )
+        "
+      >
+        <i
+          v-if="!searchTerm"
+          :class="cn('pointer-events-none absolute left-4', icon, iconClass)"
+        />
+        <Button
+          v-else
+          class="absolute left-2"
+          variant="textonly"
+          size="icon"
+          :aria-label="$t('g.clear')"
+          @click="clearSearch"
+        >
+          <i class="icon-[lucide--x] size-4" />
+        </Button>
+
+        <ComboboxInput
+          ref="inputRef"
+          v-model="searchTerm"
+          :class="
+            cn(
+              'size-full border-none bg-transparent text-sm outline-none',
+              inputPadding
+            )
+          "
+          :placeholder="placeholderText"
+          :auto-focus="autofocus"
+        />
+      </ComboboxAnchor>
+    </ComboboxRoot>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { cn } from '@/utils/tailwindUtil'
+import { watchDebounced } from '@vueuse/core'
+import { ComboboxAnchor, ComboboxInput, ComboboxRoot } from 'reka-ui'
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+
+const { t } = useI18n()
+
+const {
+  placeholder,
+  icon = 'icon-[lucide--search]',
+  debounceTime = 300,
+  autofocus = false,
+  showBorder = false,
+  size = 'md',
+  class: className
+} = defineProps<{
+  placeholder?: string
+  icon?: string
+  debounceTime?: number
+  autofocus?: boolean
+  showBorder?: boolean
+  size?: 'md' | 'lg'
+  class?: string
+}>()
+
+const emit = defineEmits<{
+  search: [value: string]
+}>()
+
+const searchTerm = defineModel<string>({ required: true })
+
+const inputRef = ref<InstanceType<typeof ComboboxInput> | null>(null)
+
+defineExpose({
+  focus: () => {
+    inputRef.value?.$el?.focus()
+  }
+})
+
+const isLarge = computed(() => size === 'lg')
+const placeholderText = computed(
+  () => placeholder ?? t('g.searchPlaceholder', { subject: '' })
+)
+
+const sizeClasses = computed(() => {
+  if (showBorder) {
+    return isLarge.value ? 'h-10 p-2' : 'h-8 p-2'
+  }
+  return isLarge.value ? 'h-12 px-4 py-2' : 'h-10 px-4 py-2'
+})
+
+const iconClass = computed(() => (isLarge.value ? 'size-5' : 'size-4'))
+const inputPadding = computed(() => (isLarge.value ? 'pl-8' : 'pl-6'))
+
+function clearSearch() {
+  searchTerm.value = ''
+}
+
+watchDebounced(
+  searchTerm,
+  (value: string) => {
+    emit('search', value)
+  },
+  { debounce: debounceTime }
+)
+</script>
diff --git a/src/components/common/SearchFilterChip.vue b/src/components/common/SearchFilterChip.vue
index d4cd7704b1..8ed1fa821f 100644
--- a/src/components/common/SearchFilterChip.vue
+++ b/src/components/common/SearchFilterChip.vue
@@ -1,6 +1,6 @@
 <template>
-  <Chip removable @remove="$emit('remove', $event)">
-    <Badge size="small" :class="badgeClass">
+  <Chip removable @remove="emit('remove', $event)">
+    <Badge size="small" :class="semanticBadgeClass">
       {{ badge }}
     </Badge>
     {{ text }}
@@ -10,6 +10,7 @@
 <script setup lang="ts">
 import Badge from 'primevue/badge'
 import Chip from 'primevue/chip'
+import { computed } from 'vue'
 
 export interface SearchFilter {
   text: string
@@ -18,26 +19,19 @@ export interface SearchFilter {
   id: string | number
 }
 
-defineProps<Omit<SearchFilter, 'id'>>()
-defineEmits(['remove'])
+const semanticClassMap: Record<string, string> = {
+  'i-badge': 'bg-green-500 text-white',
+  'o-badge': 'bg-red-500 text-white',
+  'c-badge': 'bg-blue-500 text-white',
+  's-badge': 'bg-yellow-500'
+}
+
+const props = defineProps<Omit<SearchFilter, 'id'>>()
+const emit = defineEmits<{
+  (e: 'remove', event: Event): void
+}>()
+
+const semanticBadgeClass = computed(() => {
+  return semanticClassMap[props.badgeClass] ?? props.badgeClass
+})
 </script>
-
-<style scoped>
-@reference '../../assets/css/style.css';
-
-:deep(.i-badge) {
-  @apply bg-green-500 text-white;
-}
-
-:deep(.o-badge) {
-  @apply bg-red-500 text-white;
-}
-
-:deep(.c-badge) {
-  @apply bg-blue-500 text-white;
-}
-
-:deep(.s-badge) {
-  @apply bg-yellow-500;
-}
-</style>
diff --git a/src/components/common/StatusBadge.stories.ts b/src/components/common/StatusBadge.stories.ts
new file mode 100644
index 0000000000..39ef6253cd
--- /dev/null
+++ b/src/components/common/StatusBadge.stories.ts
@@ -0,0 +1,95 @@
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+
+import StatusBadge from './StatusBadge.vue'
+
+const meta = {
+  title: 'Common/StatusBadge',
+  component: StatusBadge,
+  tags: ['autodocs'],
+  argTypes: {
+    label: { control: 'text' },
+    severity: {
+      control: 'select',
+      options: ['default', 'secondary', 'warn', 'danger', 'contrast']
+    },
+    variant: {
+      control: 'select',
+      options: ['label', 'dot', 'circle']
+    }
+  },
+  args: {
+    label: 'Status',
+    severity: 'default'
+  }
+} satisfies Meta<typeof StatusBadge>
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const Default: Story = {}
+
+export const Failed: Story = {
+  args: {
+    label: 'Failed',
+    severity: 'danger'
+  }
+}
+
+export const Finished: Story = {
+  args: {
+    label: 'Finished',
+    severity: 'contrast'
+  }
+}
+
+export const Dot: Story = {
+  args: {
+    label: undefined,
+    variant: 'dot',
+    severity: 'danger'
+  }
+}
+
+export const Circle: Story = {
+  args: {
+    label: '3',
+    variant: 'circle'
+  }
+}
+
+export const AllSeverities: Story = {
+  render: () => ({
+    components: { StatusBadge },
+    template: `
+      <div class="flex items-center gap-2">
+        <StatusBadge label="Default" severity="default" />
+        <StatusBadge label="Secondary" severity="secondary" />
+        <StatusBadge label="Warn" severity="warn" />
+        <StatusBadge label="Danger" severity="danger" />
+        <StatusBadge label="Contrast" severity="contrast" />
+      </div>
+    `
+  })
+}
+
+export const AllVariants: Story = {
+  render: () => ({
+    components: { StatusBadge },
+    template: `
+      <div class="flex items-center gap-4">
+        <div class="flex flex-col items-center gap-1">
+          <StatusBadge label="Label" variant="label" />
+          <span class="text-xs text-muted">label</span>
+        </div>
+        <div class="flex flex-col items-center gap-1">
+          <StatusBadge variant="dot" severity="danger" />
+          <span class="text-xs text-muted">dot</span>
+        </div>
+        <div class="flex flex-col items-center gap-1">
+          <StatusBadge label="5" variant="circle" />
+          <span class="text-xs text-muted">circle</span>
+        </div>
+      </div>
+    `
+  })
+}
diff --git a/src/components/common/StatusBadge.vue b/src/components/common/StatusBadge.vue
new file mode 100644
index 0000000000..13d3bf0e45
--- /dev/null
+++ b/src/components/common/StatusBadge.vue
@@ -0,0 +1,36 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+import { statusBadgeVariants } from './statusBadge.variants'
+import type { StatusBadgeVariants } from './statusBadge.variants'
+
+const {
+  label,
+  severity = 'default',
+  variant,
+  class: className
+} = defineProps<{
+  label?: string | number
+  severity?: StatusBadgeVariants['severity']
+  variant?: StatusBadgeVariants['variant']
+  class?: string
+}>()
+
+const badgeClass = computed(() =>
+  cn(
+    statusBadgeVariants({
+      severity,
+      variant: variant ?? (label == null ? 'dot' : 'label')
+    }),
+    className
+  )
+)
+</script>
+
+<template>
+  <span :class="badgeClass">
+    {{ label }}
+  </span>
+</template>
diff --git a/src/components/common/SystemStatsPanel.vue b/src/components/common/SystemStatsPanel.vue
index 5d3cd89659..e9b01a9299 100644
--- a/src/components/common/SystemStatsPanel.vue
+++ b/src/components/common/SystemStatsPanel.vue
@@ -6,10 +6,12 @@
       </h2>
       <div class="grid grid-cols-2 gap-2">
         <template v-for="col in systemColumns" :key="col.field">
-          <div class="font-medium">
+          <div :class="cn('font-medium', isOutdated(col) && 'text-danger-100')">
             {{ col.header }}
           </div>
-          <div>{{ getDisplayValue(col) }}</div>
+          <div :class="cn(isOutdated(col) && 'text-danger-100')">
+            {{ getDisplayValue(col) }}
+          </div>
         </template>
       </div>
     </div>
@@ -47,6 +49,7 @@ import DeviceInfo from '@/components/common/DeviceInfo.vue'
 import { isCloud } from '@/platform/distribution/types'
 import type { SystemStats } from '@/schemas/apiSchema'
 import { formatCommitHash, formatSize } from '@/utils/formatUtil'
+import { cn } from '@/utils/tailwindUtil'
 
 const props = defineProps<{
   stats: SystemStats
@@ -76,7 +79,8 @@ const localColumns: ColumnDef[] = [
   { field: 'pytorch_version', header: 'Pytorch Version' },
   { field: 'argv', header: 'Arguments' },
   { field: 'ram_total', header: 'RAM Total', formatNumber: formatSize },
-  { field: 'ram_free', header: 'RAM Free', formatNumber: formatSize }
+  { field: 'ram_free', header: 'RAM Free', formatNumber: formatSize },
+  { field: 'installed_templates_version', header: 'Templates Version' }
 ]
 
 /** Columns for cloud distribution */
@@ -97,6 +101,13 @@ const cloudColumns: ColumnDef[] = [
 
 const systemColumns = computed(() => (isCloud ? cloudColumns : localColumns))
 
+function isOutdated(column: ColumnDef): boolean {
+  if (column.field !== 'installed_templates_version') return false
+  const installed = props.stats.system.installed_templates_version
+  const required = props.stats.system.required_templates_version
+  return !!installed && !!required && installed !== required
+}
+
 const getDisplayValue = (column: ColumnDef) => {
   const value = systemInfo.value[column.field]
   if (column.formatNumber && typeof value === 'number') {
diff --git a/src/components/common/TextTicker.test.ts b/src/components/common/TextTicker.test.ts
new file mode 100644
index 0000000000..0d94b84b40
--- /dev/null
+++ b/src/components/common/TextTicker.test.ts
@@ -0,0 +1,122 @@
+import { mount } from '@vue/test-utils'
+import { nextTick } from 'vue'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import TextTicker from './TextTicker.vue'
+
+function mockScrollWidth(el: HTMLElement, scrollWidth: number) {
+  Object.defineProperty(el, 'scrollWidth', {
+    value: scrollWidth,
+    configurable: true
+  })
+}
+
+describe(TextTicker, () => {
+  let rafCallbacks: ((time: number) => void)[]
+  let wrapper: ReturnType<typeof mount>
+
+  beforeEach(() => {
+    vi.useFakeTimers()
+    rafCallbacks = []
+    vi.spyOn(window, 'requestAnimationFrame').mockImplementation((cb) => {
+      rafCallbacks.push(cb)
+      return rafCallbacks.length
+    })
+    vi.spyOn(window, 'cancelAnimationFrame').mockImplementation(() => {})
+  })
+
+  afterEach(() => {
+    wrapper?.unmount()
+    vi.useRealTimers()
+    vi.restoreAllMocks()
+  })
+
+  it('renders slot content', () => {
+    wrapper = mount(TextTicker, {
+      slots: { default: 'Hello World' }
+    })
+    expect(wrapper.text()).toBe('Hello World')
+  })
+
+  it('scrolls on hover after delay', async () => {
+    wrapper = mount(TextTicker, {
+      slots: { default: 'Very long text that overflows' },
+      props: { speed: 100 }
+    })
+
+    const el = wrapper.element as HTMLElement
+    mockScrollWidth(el, 300)
+
+    await nextTick()
+    await wrapper.trigger('mouseenter')
+    await nextTick()
+
+    expect(rafCallbacks.length).toBe(0)
+
+    vi.advanceTimersByTime(350)
+    await nextTick()
+    expect(rafCallbacks.length).toBeGreaterThan(0)
+
+    rafCallbacks[0](performance.now() + 500)
+    expect(el.scrollLeft).toBeGreaterThan(0)
+  })
+
+  it('cancels delayed scroll on mouse leave before delay elapses', async () => {
+    wrapper = mount(TextTicker, {
+      slots: { default: 'Very long text that overflows' },
+      props: { speed: 100 }
+    })
+
+    mockScrollWidth(wrapper.element as HTMLElement, 300)
+
+    await nextTick()
+    await wrapper.trigger('mouseenter')
+    await nextTick()
+
+    vi.advanceTimersByTime(200)
+    await wrapper.trigger('mouseleave')
+    await nextTick()
+
+    vi.advanceTimersByTime(350)
+    await nextTick()
+    expect(rafCallbacks.length).toBe(0)
+  })
+
+  it('resets scroll position on mouse leave', async () => {
+    wrapper = mount(TextTicker, {
+      slots: { default: 'Very long text that overflows' },
+      props: { speed: 100 }
+    })
+
+    const el = wrapper.element as HTMLElement
+    mockScrollWidth(el, 300)
+
+    await nextTick()
+    await wrapper.trigger('mouseenter')
+    await nextTick()
+    vi.advanceTimersByTime(350)
+    await nextTick()
+
+    rafCallbacks[0](performance.now() + 500)
+    expect(el.scrollLeft).toBeGreaterThan(0)
+
+    await wrapper.trigger('mouseleave')
+    await nextTick()
+
+    expect(el.scrollLeft).toBe(0)
+  })
+
+  it('does not scroll when content fits', async () => {
+    wrapper = mount(TextTicker, {
+      slots: { default: 'Short' }
+    })
+
+    await nextTick()
+    await wrapper.trigger('mouseenter')
+    await nextTick()
+    vi.advanceTimersByTime(350)
+    await nextTick()
+
+    expect(rafCallbacks.length).toBe(0)
+  })
+})
diff --git a/src/components/common/TextTicker.vue b/src/components/common/TextTicker.vue
new file mode 100644
index 0000000000..057a910667
--- /dev/null
+++ b/src/components/common/TextTicker.vue
@@ -0,0 +1,69 @@
+<template>
+  <div
+    ref="containerRef"
+    :class="
+      cn('overflow-hidden whitespace-nowrap', !isScrolling && 'text-ellipsis')
+    "
+  >
+    <slot />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useElementHover, useElementSize, useRafFn } from '@vueuse/core'
+import { ref, watch } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+const { speed = 70 } = defineProps<{
+  /** Scroll speed in pixels per second */
+  speed?: number
+}>()
+
+const containerRef = ref<HTMLElement | null>(null)
+const isHovered = useElementHover(containerRef, { delayEnter: 350 })
+const { width: containerWidth } = useElementSize(containerRef)
+const isScrolling = ref(false)
+let scrollStartTime = 0
+let overflowAmount = 0
+
+const { pause, resume } = useRafFn(
+  ({ timestamp }) => {
+    const el = containerRef.value
+    if (!el || overflowAmount <= 0) return pause()
+
+    const elapsed = timestamp - scrollStartTime
+    const duration = (overflowAmount / speed) * 1000
+    const progress = Math.min(elapsed / duration, 1)
+    el.scrollLeft = overflowAmount * progress
+
+    if (progress >= 1) pause()
+  },
+  { immediate: false }
+)
+
+function startScroll() {
+  const el = containerRef.value
+  if (!el) return
+
+  overflowAmount = el.scrollWidth - containerWidth.value
+  if (overflowAmount <= 0) return
+
+  isScrolling.value = true
+  scrollStartTime = performance.now()
+  resume()
+}
+
+function stopScroll() {
+  pause()
+  if (containerRef.value) {
+    containerRef.value.scrollLeft = 0
+  }
+  isScrolling.value = false
+}
+
+watch(isHovered, (hovered) => {
+  if (hovered) startScroll()
+  else stopScroll()
+})
+</script>
diff --git a/src/components/common/TextTickerMultiLine.test.ts b/src/components/common/TextTickerMultiLine.test.ts
new file mode 100644
index 0000000000..9680472965
--- /dev/null
+++ b/src/components/common/TextTickerMultiLine.test.ts
@@ -0,0 +1,105 @@
+import { mount } from '@vue/test-utils'
+import { nextTick } from 'vue'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+
+import MarqueeLine from './MarqueeLine.vue'
+import TextTickerMultiLine from './TextTickerMultiLine.vue'
+
+type Callback = () => void
+
+const resizeCallbacks: Callback[] = []
+const mutationCallbacks: Callback[] = []
+
+vi.mock('@vueuse/core', async () => {
+  const actual = await vi.importActual('@vueuse/core')
+  return {
+    ...actual,
+    useResizeObserver: (_target: unknown, cb: Callback) => {
+      resizeCallbacks.push(cb)
+      return { stop: vi.fn() }
+    },
+    useMutationObserver: (_target: unknown, cb: Callback) => {
+      mutationCallbacks.push(cb)
+      return { stop: vi.fn() }
+    }
+  }
+})
+
+function mockElementSize(
+  el: HTMLElement,
+  clientWidth: number,
+  scrollWidth: number
+) {
+  Object.defineProperty(el, 'clientWidth', {
+    value: clientWidth,
+    configurable: true
+  })
+  Object.defineProperty(el, 'scrollWidth', {
+    value: scrollWidth,
+    configurable: true
+  })
+}
+
+describe(TextTickerMultiLine, () => {
+  let wrapper: ReturnType<typeof mount>
+
+  afterEach(() => {
+    wrapper?.unmount()
+    resizeCallbacks.length = 0
+    mutationCallbacks.length = 0
+  })
+
+  function mountComponent(text: string) {
+    wrapper = mount(TextTickerMultiLine, {
+      slots: { default: text }
+    })
+    return wrapper
+  }
+
+  function getMeasureEl(): HTMLElement {
+    return wrapper.find('[aria-hidden="true"]').element as HTMLElement
+  }
+
+  async function triggerSplitLines() {
+    resizeCallbacks.forEach((cb) => cb())
+    await nextTick()
+  }
+
+  it('renders slot content', () => {
+    mountComponent('Load Checkpoint')
+    expect(wrapper.text()).toContain('Load Checkpoint')
+  })
+
+  it('renders a single MarqueeLine when text fits', async () => {
+    mountComponent('Short')
+    mockElementSize(getMeasureEl(), 200, 100)
+    await triggerSplitLines()
+
+    expect(wrapper.findAllComponents(MarqueeLine)).toHaveLength(1)
+  })
+
+  it('renders two MarqueeLines when text overflows', async () => {
+    mountComponent('Load Checkpoint Loader Simple')
+    mockElementSize(getMeasureEl(), 100, 300)
+    await triggerSplitLines()
+
+    expect(wrapper.findAllComponents(MarqueeLine)).toHaveLength(2)
+  })
+
+  it('splits text at word boundary when overflowing', async () => {
+    mountComponent('Load Checkpoint Loader')
+    mockElementSize(getMeasureEl(), 100, 200)
+    await triggerSplitLines()
+
+    const lines = wrapper.findAllComponents(MarqueeLine)
+    expect(lines[0].text()).toBe('Load')
+    expect(lines[1].text()).toBe('Checkpoint Loader')
+  })
+
+  it('has hidden measurement element with aria-hidden', () => {
+    mountComponent('Test')
+    const measureEl = wrapper.find('[aria-hidden="true"]')
+    expect(measureEl.exists()).toBe(true)
+    expect(measureEl.classes()).toContain('invisible')
+  })
+})
diff --git a/src/components/common/TextTickerMultiLine.vue b/src/components/common/TextTickerMultiLine.vue
new file mode 100644
index 0000000000..81506b01db
--- /dev/null
+++ b/src/components/common/TextTickerMultiLine.vue
@@ -0,0 +1,66 @@
+<template>
+  <div>
+    <!-- Hidden single-line measurement element for overflow detection -->
+    <div
+      ref="measureRef"
+      class="pointer-events-none invisible absolute inset-x-0 top-0 overflow-hidden whitespace-nowrap"
+      aria-hidden="true"
+    >
+      <slot />
+    </div>
+
+    <MarqueeLine v-if="!secondLine">
+      <slot />
+    </MarqueeLine>
+
+    <div v-else class="flex w-full flex-col">
+      <MarqueeLine>{{ firstLine }}</MarqueeLine>
+      <MarqueeLine>{{ secondLine }}</MarqueeLine>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useMutationObserver, useResizeObserver } from '@vueuse/core'
+import { ref } from 'vue'
+
+import MarqueeLine from './MarqueeLine.vue'
+import { splitTextAtWordBoundary } from '@/utils/textTickerUtils'
+
+const measureRef = ref<HTMLElement | null>(null)
+const firstLine = ref('')
+const secondLine = ref('')
+
+function splitLines() {
+  const el = measureRef.value
+  const text = el?.textContent?.trim()
+  if (!el || !text) {
+    firstLine.value = ''
+    secondLine.value = ''
+    return
+  }
+
+  const containerWidth = el.clientWidth
+  const textWidth = el.scrollWidth
+
+  if (textWidth <= containerWidth) {
+    firstLine.value = text
+    secondLine.value = ''
+    return
+  }
+
+  const [first, second] = splitTextAtWordBoundary(
+    text,
+    containerWidth / textWidth
+  )
+  firstLine.value = first
+  secondLine.value = second
+}
+
+useResizeObserver(measureRef, splitLines)
+useMutationObserver(measureRef, splitLines, {
+  childList: true,
+  characterData: true,
+  subtree: true
+})
+</script>
diff --git a/src/components/common/TreeExplorer.vue b/src/components/common/TreeExplorer.vue
index 828d8ff45a..b7434be697 100644
--- a/src/components/common/TreeExplorer.vue
+++ b/src/components/common/TreeExplorer.vue
@@ -1,8 +1,9 @@
 <template>
   <Tree
+    v-bind="$attrs"
     v-model:expanded-keys="expandedKeys"
     v-model:selection-keys="selectionKeys"
-    class="tree-explorer px-2 py-0 2xl:px-4 bg-transparent"
+    class="tree-explorer bg-transparent px-2 py-0 2xl:px-4"
     :class="props.class"
     :value="renderedRoot.children"
     selection-mode="single"
@@ -11,9 +12,9 @@
       nodeContent: ({ context }) => ({
         class: 'group/tree-node',
         onClick: (e: MouseEvent) =>
-          onNodeContentClick(e, context.node as RenderedTreeExplorerNode),
+          onNodeContentClick(e, context.node as RenderedTreeExplorerNode<T>),
         onContextmenu: (e: MouseEvent) =>
-          handleContextMenu(e, context.node as RenderedTreeExplorerNode)
+          handleContextMenu(e, context.node as RenderedTreeExplorerNode<T>)
       }),
       nodeToggleButton: () => ({
         onClick: (e: MouseEvent) => {
@@ -35,11 +36,11 @@
   </Tree>
   <ContextMenu ref="menu" :model="menuItems" />
 </template>
-<script setup lang="ts">
+<script setup lang="ts" generic="T">
 import ContextMenu from 'primevue/contextmenu'
 import type { MenuItem, MenuItemCommandEvent } from 'primevue/menuitem'
 import Tree from 'primevue/tree'
-import { computed, provide, ref } from 'vue'
+import { computed, provide, ref, shallowRef } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import TreeExplorerTreeNode from '@/components/common/TreeExplorerTreeNode.vue'
@@ -55,6 +56,10 @@ import type {
 } from '@/types/treeExplorerTypes'
 import { combineTrees, findNodeByKey } from '@/utils/treeUtil'
 
+defineOptions({
+  inheritAttrs: false
+})
+
 const expandedKeys = defineModel<Record<string, boolean>>('expandedKeys', {
   required: true
 })
@@ -64,13 +69,13 @@ const selectionKeys = defineModel<Record<string, boolean>>('selectionKeys')
 const storeSelectionKeys = selectionKeys.value !== undefined
 
 const props = defineProps<{
-  root: TreeExplorerNode
+  root: TreeExplorerNode<T>
   class?: string
 }>()
 const emit = defineEmits<{
-  (e: 'nodeClick', node: RenderedTreeExplorerNode, event: MouseEvent): void
-  (e: 'nodeDelete', node: RenderedTreeExplorerNode): void
-  (e: 'contextMenu', node: RenderedTreeExplorerNode, event: MouseEvent): void
+  (e: 'nodeClick', node: RenderedTreeExplorerNode<T>, event: MouseEvent): void
+  (e: 'nodeDelete', node: RenderedTreeExplorerNode<T>): void
+  (e: 'contextMenu', node: RenderedTreeExplorerNode<T>, event: MouseEvent): void
 }>()
 
 const {
@@ -78,19 +83,19 @@ const {
   getAddFolderMenuItem,
   handleFolderCreation,
   addFolderCommand
-} = useTreeFolderOperations(
-  /* expandNode */ (node: TreeExplorerNode) => {
+} = useTreeFolderOperations<T>(
+  /* expandNode */ (node: TreeExplorerNode<T>) => {
     expandedKeys.value[node.key] = true
   }
 )
 
-const renderedRoot = computed<RenderedTreeExplorerNode>(() => {
+const renderedRoot = computed<RenderedTreeExplorerNode<T>>(() => {
   const renderedRoot = fillNodeInfo(props.root)
   return newFolderNode.value
     ? combineTrees(renderedRoot, newFolderNode.value)
     : renderedRoot
 })
-const getTreeNodeIcon = (node: TreeExplorerNode) => {
+const getTreeNodeIcon = (node: TreeExplorerNode<T>) => {
   if (node.getIcon) {
     const icon = node.getIcon()
     if (icon) {
@@ -106,7 +111,9 @@ const getTreeNodeIcon = (node: TreeExplorerNode) => {
   const isExpanded = expandedKeys.value?.[node.key] ?? false
   return isExpanded ? 'pi pi-folder-open' : 'pi pi-folder'
 }
-const fillNodeInfo = (node: TreeExplorerNode): RenderedTreeExplorerNode => {
+const fillNodeInfo = (
+  node: TreeExplorerNode<T>
+): RenderedTreeExplorerNode<T> => {
   const children = node.children?.map(fillNodeInfo) ?? []
   const totalLeaves = node.leaf
     ? 1
@@ -123,7 +130,7 @@ const fillNodeInfo = (node: TreeExplorerNode): RenderedTreeExplorerNode => {
 }
 const onNodeContentClick = async (
   e: MouseEvent,
-  node: RenderedTreeExplorerNode
+  node: RenderedTreeExplorerNode<T>
 ) => {
   if (!storeSelectionKeys) {
     selectionKeys.value = {}
@@ -134,20 +141,22 @@ const onNodeContentClick = async (
   emit('nodeClick', node, e)
 }
 const menu = ref<InstanceType<typeof ContextMenu> | null>(null)
-const menuTargetNode = ref<RenderedTreeExplorerNode | null>(null)
+const menuTargetNode = shallowRef<RenderedTreeExplorerNode<T> | null>(null)
 const extraMenuItems = computed(() => {
-  return menuTargetNode.value?.contextMenuItems
-    ? typeof menuTargetNode.value.contextMenuItems === 'function'
-      ? menuTargetNode.value.contextMenuItems(menuTargetNode.value)
-      : menuTargetNode.value.contextMenuItems
+  const node = menuTargetNode.value
+  return node?.contextMenuItems
+    ? typeof node.contextMenuItems === 'function'
+      ? node.contextMenuItems(node)
+      : node.contextMenuItems
     : []
 })
-const renameEditingNode = ref<RenderedTreeExplorerNode | null>(null)
+const renameEditingNode = shallowRef<RenderedTreeExplorerNode<T> | null>(null)
 const errorHandling = useErrorHandling()
 const handleNodeLabelEdit = async (
-  node: RenderedTreeExplorerNode,
+  n: RenderedTreeExplorerNode,
   newName: string
 ) => {
+  const node = n as RenderedTreeExplorerNode<T>
   await errorHandling.wrapWithErrorHandlingAsync(
     async () => {
       if (node.key === newFolderNode.value?.key) {
@@ -165,35 +174,36 @@ const handleNodeLabelEdit = async (
 provide(InjectKeyHandleEditLabelFunction, handleNodeLabelEdit)
 
 const { t } = useI18n()
-const renameCommand = (node: RenderedTreeExplorerNode) => {
+const renameCommand = (node: RenderedTreeExplorerNode<T>) => {
   renameEditingNode.value = node
 }
-const deleteCommand = async (node: RenderedTreeExplorerNode) => {
+const deleteCommand = async (node: RenderedTreeExplorerNode<T>) => {
   await node.handleDelete?.()
   emit('nodeDelete', node)
 }
-const menuItems = computed<MenuItem[]>(() =>
-  [
-    getAddFolderMenuItem(menuTargetNode.value),
+const menuItems = computed<MenuItem[]>(() => {
+  const node = menuTargetNode.value
+  return [
+    getAddFolderMenuItem(node),
     {
       label: t('g.rename'),
       icon: 'pi pi-file-edit',
       command: () => {
-        if (menuTargetNode.value) {
-          renameCommand(menuTargetNode.value)
+        if (node) {
+          renameCommand(node)
         }
       },
-      visible: menuTargetNode.value?.handleRename !== undefined
+      visible: node?.handleRename !== undefined
     },
     {
       label: t('g.delete'),
       icon: 'pi pi-trash',
       command: async () => {
-        if (menuTargetNode.value) {
-          await deleteCommand(menuTargetNode.value)
+        if (node) {
+          await deleteCommand(node)
         }
       },
-      visible: menuTargetNode.value?.handleDelete !== undefined,
+      visible: node?.handleDelete !== undefined,
       isAsync: true // The delete command can be async
     },
     ...extraMenuItems.value
@@ -205,9 +215,12 @@ const menuItems = computed<MenuItem[]>(() =>
         })
       : undefined
   }))
-)
+})
 
-const handleContextMenu = (e: MouseEvent, node: RenderedTreeExplorerNode) => {
+const handleContextMenu = (
+  e: MouseEvent,
+  node: RenderedTreeExplorerNode<T>
+) => {
   menuTargetNode.value = node
   emit('contextMenu', node, e)
   if (menuItems.value.filter((item) => item.visible).length > 0) {
@@ -219,15 +232,13 @@ const wrapCommandWithErrorHandler = (
   command: (event: MenuItemCommandEvent) => void,
   { isAsync = false }: { isAsync: boolean }
 ) => {
+  const node = menuTargetNode.value
   return isAsync
     ? errorHandling.wrapWithErrorHandlingAsync(
-        command as (...args: any[]) => Promise<any>,
-        menuTargetNode.value?.handleError
-      )
-    : errorHandling.wrapWithErrorHandling(
-        command,
-        menuTargetNode.value?.handleError
+        command as (event: MenuItemCommandEvent) => Promise<void>,
+        node?.handleError
       )
+    : errorHandling.wrapWithErrorHandling(command, node?.handleError)
 }
 
 defineExpose({
diff --git a/src/components/common/TreeExplorerTreeNode.vue b/src/components/common/TreeExplorerTreeNode.vue
index 186769c198..1982f7d711 100644
--- a/src/components/common/TreeExplorerTreeNode.vue
+++ b/src/components/common/TreeExplorerTreeNode.vue
@@ -9,6 +9,7 @@
         'tree-leaf': props.node.leaf
       }
     ]"
+    :data-testid="`tree-node-${node.key}`"
   >
     <div class="node-content">
       <span class="node-label">
@@ -28,14 +29,14 @@
       />
     </div>
     <div
-      class="node-actions motion-safe:opacity-0 motion-safe:group-hover/tree-node:opacity-100"
+      class="node-actions flex gap-1 motion-safe:opacity-0 motion-safe:group-hover/tree-node:opacity-100 touch:opacity-100"
     >
       <slot name="actions" :node="props.node" />
     </div>
   </div>
 </template>
 
-<script setup lang="ts">
+<script setup lang="ts" generic="T">
 import { setCustomNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/element/set-custom-native-drag-preview'
 import Badge from 'primevue/badge'
 import { computed, inject, ref } from 'vue'
@@ -52,17 +53,17 @@ import type {
 } from '@/types/treeExplorerTypes'
 
 const props = defineProps<{
-  node: RenderedTreeExplorerNode
+  node: RenderedTreeExplorerNode<T>
 }>()
 
 const emit = defineEmits<{
   (
     e: 'itemDropped',
-    node: RenderedTreeExplorerNode,
-    data: RenderedTreeExplorerNode
+    node: RenderedTreeExplorerNode<T>,
+    data: RenderedTreeExplorerNode<T>
   ): void
-  (e: 'dragStart', node: RenderedTreeExplorerNode): void
-  (e: 'dragEnd', node: RenderedTreeExplorerNode): void
+  (e: 'dragStart', node: RenderedTreeExplorerNode<T>): void
+  (e: 'dragEnd', node: RenderedTreeExplorerNode<T>): void
 }>()
 
 const nodeBadgeText = computed<string>(() => {
@@ -79,7 +80,7 @@ const showNodeBadgeText = computed<boolean>(() => nodeBadgeText.value !== '')
 const isEditing = computed<boolean>(() => props.node.isEditingLabel ?? false)
 const handleEditLabel = inject(InjectKeyHandleEditLabelFunction)
 const handleRename = (newName: string) => {
-  handleEditLabel?.(props.node, newName)
+  handleEditLabel?.(props.node as RenderedTreeExplorerNode, newName)
 }
 
 const container = ref<HTMLElement | null>(null)
@@ -116,9 +117,13 @@ if (props.node.droppable) {
     onDrop: async (event) => {
       const dndData = event.source.data as TreeExplorerDragAndDropData
       if (dndData.type === 'tree-explorer-node') {
-        await props.node.handleDrop?.(dndData)
+        await props.node.handleDrop?.(dndData as TreeExplorerDragAndDropData<T>)
         canDrop.value = false
-        emit('itemDropped', props.node, dndData.data)
+        emit(
+          'itemDropped',
+          props.node,
+          dndData.data as RenderedTreeExplorerNode<T>
+        )
       }
     },
     onDragEnter: (event) => {
diff --git a/src/components/common/TreeExplorerV2.vue b/src/components/common/TreeExplorerV2.vue
new file mode 100644
index 0000000000..e72f317a34
--- /dev/null
+++ b/src/components/common/TreeExplorerV2.vue
@@ -0,0 +1,122 @@
+<template>
+  <ContextMenuRoot>
+    <ContextMenuTrigger :disabled="!showContextMenu" as-child>
+      <TreeRoot
+        :expanded="[...expandedKeys]"
+        :items="root.children ?? []"
+        :get-key="(item) => item.key"
+        :get-children="
+          (item) => (item.children?.length ? item.children : undefined)
+        "
+        class="m-0 p-0 pb-6"
+      >
+        <TreeVirtualizer
+          v-slot="{ item }"
+          :estimate-size="36"
+          :text-content="(item) => item.value.label ?? ''"
+        >
+          <TreeExplorerV2Node
+            :item="
+              item as FlattenedItem<RenderedTreeExplorerNode<ComfyNodeDefImpl>>
+            "
+            @node-click="
+              (
+                node: RenderedTreeExplorerNode<ComfyNodeDefImpl>,
+                e: MouseEvent
+              ) => emit('nodeClick', node, e)
+            "
+          >
+            <template #folder="{ node }">
+              <slot name="folder" :node="node" />
+            </template>
+            <template #node="{ node }">
+              <slot name="node" :node="node" />
+            </template>
+          </TreeExplorerV2Node>
+        </TreeVirtualizer>
+      </TreeRoot>
+    </ContextMenuTrigger>
+
+    <ContextMenuPortal v-if="showContextMenu">
+      <ContextMenuContent
+        class="z-9999 min-w-32 overflow-hidden rounded-md border border-border-default bg-comfy-menu-bg p-1 shadow-md"
+      >
+        <ContextMenuItem
+          class="flex cursor-pointer items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none select-none hover:bg-highlight focus:bg-highlight"
+          @select="handleAddToFavorites"
+        >
+          <i
+            :class="
+              isCurrentNodeBookmarked
+                ? 'icon-[ph--star-fill]'
+                : 'icon-[lucide--star]'
+            "
+            class="size-4"
+          />
+          {{
+            isCurrentNodeBookmarked
+              ? $t('sideToolbar.nodeLibraryTab.sections.unfavoriteNode')
+              : $t('sideToolbar.nodeLibraryTab.sections.favoriteNode')
+          }}
+        </ContextMenuItem>
+      </ContextMenuContent>
+    </ContextMenuPortal>
+  </ContextMenuRoot>
+</template>
+
+<script setup lang="ts">
+import type { FlattenedItem } from 'reka-ui'
+import {
+  ContextMenuContent,
+  ContextMenuItem,
+  ContextMenuPortal,
+  ContextMenuRoot,
+  ContextMenuTrigger,
+  TreeRoot,
+  TreeVirtualizer
+} from 'reka-ui'
+import { computed, provide, ref } from 'vue'
+
+import { useNodeBookmarkStore } from '@/stores/nodeBookmarkStore'
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+import type { RenderedTreeExplorerNode } from '@/types/treeExplorerTypes'
+import { InjectKeyContextMenuNode } from '@/types/treeExplorerTypes'
+
+import TreeExplorerV2Node from './TreeExplorerV2Node.vue'
+
+const { showContextMenu = false } = defineProps<{
+  root: RenderedTreeExplorerNode<ComfyNodeDefImpl>
+  showContextMenu?: boolean
+}>()
+
+const expandedKeys = defineModel<string[]>('expandedKeys', {
+  default: () => []
+})
+
+const emit = defineEmits<{
+  nodeClick: [
+    node: RenderedTreeExplorerNode<ComfyNodeDefImpl>,
+    event: MouseEvent
+  ]
+  addToFavorites: [node: RenderedTreeExplorerNode<ComfyNodeDefImpl>]
+}>()
+
+const contextMenuNode = ref<RenderedTreeExplorerNode<ComfyNodeDefImpl> | null>(
+  null
+)
+provide(InjectKeyContextMenuNode, contextMenuNode)
+
+const nodeBookmarkStore = useNodeBookmarkStore()
+
+const isCurrentNodeBookmarked = computed(() => {
+  const node = contextMenuNode.value
+  if (!node?.data) return false
+  return nodeBookmarkStore.isBookmarked(node.data)
+})
+
+function handleAddToFavorites() {
+  if (contextMenuNode.value) {
+    emit('addToFavorites', contextMenuNode.value)
+  }
+}
+</script>
diff --git a/src/components/common/TreeExplorerV2Node.test.ts b/src/components/common/TreeExplorerV2Node.test.ts
new file mode 100644
index 0000000000..e8433a4510
--- /dev/null
+++ b/src/components/common/TreeExplorerV2Node.test.ts
@@ -0,0 +1,326 @@
+import { mount } from '@vue/test-utils'
+import type { FlattenedItem } from 'reka-ui'
+import { ref } from 'vue'
+import { describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+import type { RenderedTreeExplorerNode } from '@/types/treeExplorerTypes'
+import { InjectKeyContextMenuNode } from '@/types/treeExplorerTypes'
+
+import TreeExplorerV2Node from './TreeExplorerV2Node.vue'
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: { en: {} }
+})
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: () => ({
+    get: vi.fn().mockReturnValue('left')
+  })
+}))
+
+vi.mock('@/stores/nodeBookmarkStore', () => ({
+  useNodeBookmarkStore: () => ({
+    isBookmarked: vi.fn().mockReturnValue(false),
+    toggleBookmark: vi.fn()
+  })
+}))
+
+vi.mock('@/components/node/NodePreviewCard.vue', () => ({
+  default: { template: '<div />' }
+}))
+
+const mockStartDrag = vi.fn()
+const mockHandleNativeDrop = vi.fn()
+
+vi.mock('@/composables/node/useNodeDragToCanvas', () => ({
+  useNodeDragToCanvas: () => ({
+    startDrag: mockStartDrag,
+    handleNativeDrop: mockHandleNativeDrop
+  })
+}))
+
+describe('TreeExplorerV2Node', () => {
+  function createMockItem(
+    type: 'node' | 'folder',
+    overrides: Record<string, unknown> = {}
+  ): FlattenedItem<RenderedTreeExplorerNode<ComfyNodeDefImpl>> {
+    const value = {
+      key: 'test-key',
+      label: 'Test Label',
+      type,
+      icon: 'pi pi-folder',
+      totalLeaves: 5,
+      ...overrides
+    } as RenderedTreeExplorerNode<ComfyNodeDefImpl>
+    return {
+      _id: 'test-id',
+      index: 0,
+      value,
+      level: 1,
+      hasChildren: type === 'folder',
+      bind: { value, level: 1 }
+    }
+  }
+
+  function createTreeItemStub() {
+    const handleToggle = vi.fn()
+    const handleSelect = vi.fn()
+    return {
+      handleToggle,
+      handleSelect,
+      stub: {
+        template: `<div data-testid="tree-item"><slot :isExpanded="false" :isSelected="false" :handleToggle="handleToggle" :handleSelect="handleSelect" /></div>`,
+        setup() {
+          return { handleToggle, handleSelect }
+        }
+      }
+    }
+  }
+
+  function mountComponent(
+    props: Record<string, unknown> = {},
+    options: {
+      provide?: Record<string, unknown>
+      treeItemStub?: ReturnType<typeof createTreeItemStub>
+    } = {}
+  ) {
+    const treeItemStub = options.treeItemStub ?? createTreeItemStub()
+    return {
+      wrapper: mount(TreeExplorerV2Node, {
+        global: {
+          plugins: [i18n],
+          stubs: {
+            TreeItem: treeItemStub.stub,
+            Teleport: { template: '<div />' }
+          },
+          provide: {
+            ...options.provide
+          }
+        },
+        props: {
+          item: createMockItem('node'),
+          ...props
+        }
+      }),
+      treeItemStub
+    }
+  }
+
+  describe('handleClick', () => {
+    it('emits nodeClick event when clicked', async () => {
+      const { wrapper } = mountComponent({
+        item: createMockItem('node')
+      })
+
+      const nodeDiv = wrapper.find('div.group\\/tree-node')
+      await nodeDiv.trigger('click')
+
+      expect(wrapper.emitted('nodeClick')).toBeTruthy()
+      expect(wrapper.emitted('nodeClick')?.[0]?.[0]).toMatchObject({
+        type: 'node',
+        label: 'Test Label'
+      })
+    })
+
+    it('calls handleToggle for folder items', async () => {
+      const treeItemStub = createTreeItemStub()
+      const { wrapper } = mountComponent(
+        { item: createMockItem('folder') },
+        { treeItemStub }
+      )
+
+      const folderDiv = wrapper.find('div.group\\/tree-node')
+      await folderDiv.trigger('click')
+
+      expect(wrapper.emitted('nodeClick')).toBeTruthy()
+      expect(treeItemStub.handleToggle).toHaveBeenCalled()
+    })
+
+    it('does not call handleToggle for node items', async () => {
+      const treeItemStub = createTreeItemStub()
+      const { wrapper } = mountComponent(
+        { item: createMockItem('node') },
+        { treeItemStub }
+      )
+
+      const nodeDiv = wrapper.find('div.group\\/tree-node')
+      await nodeDiv.trigger('click')
+
+      expect(wrapper.emitted('nodeClick')).toBeTruthy()
+      expect(treeItemStub.handleToggle).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('context menu', () => {
+    it('sets contextMenuNode when contextmenu event is triggered on node', async () => {
+      const contextMenuNode = ref<RenderedTreeExplorerNode | null>(null)
+      const nodeItem = createMockItem('node')
+
+      const { wrapper } = mountComponent(
+        { item: nodeItem },
+        {
+          provide: {
+            [InjectKeyContextMenuNode as symbol]: contextMenuNode
+          }
+        }
+      )
+
+      const nodeDiv = wrapper.find('div.group\\/tree-node')
+      await nodeDiv.trigger('contextmenu')
+
+      expect(contextMenuNode.value).toEqual(nodeItem.value)
+    })
+
+    it('does not set contextMenuNode for folder items', async () => {
+      const contextMenuNode = ref<RenderedTreeExplorerNode | null>(null)
+
+      const { wrapper } = mountComponent(
+        { item: createMockItem('folder') },
+        {
+          provide: {
+            [InjectKeyContextMenuNode as symbol]: contextMenuNode
+          }
+        }
+      )
+
+      const folderDiv = wrapper.find('div.group\\/tree-node')
+      await folderDiv.trigger('contextmenu')
+
+      expect(contextMenuNode.value).toBeNull()
+    })
+  })
+
+  describe('rendering', () => {
+    it('renders node icon for node type', () => {
+      const { wrapper } = mountComponent({
+        item: createMockItem('node')
+      })
+
+      expect(wrapper.find('i.icon-\\[comfy--node\\]').exists()).toBe(true)
+    })
+
+    it('renders folder icon for folder type', () => {
+      const { wrapper } = mountComponent({
+        item: createMockItem('folder', { icon: 'icon-[lucide--folder]' })
+      })
+
+      expect(wrapper.find('i.icon-\\[lucide--folder\\]').exists()).toBe(true)
+    })
+
+    it('renders label text', () => {
+      const { wrapper } = mountComponent({
+        item: createMockItem('node', { label: 'My Node' })
+      })
+
+      expect(wrapper.text()).toContain('My Node')
+    })
+
+    it('renders chevron for folder with children', () => {
+      const { wrapper } = mountComponent({
+        item: {
+          ...createMockItem('folder'),
+          hasChildren: true
+        }
+      })
+
+      expect(wrapper.find('i.icon-\\[lucide--chevron-down\\]').exists()).toBe(
+        true
+      )
+    })
+  })
+
+  describe('drag and drop', () => {
+    beforeEach(() => {
+      vi.clearAllMocks()
+    })
+
+    it('sets draggable attribute on node items', () => {
+      const { wrapper } = mountComponent({
+        item: createMockItem('node')
+      })
+
+      const nodeDiv = wrapper.find('div.group\\/tree-node')
+      expect(nodeDiv.attributes('draggable')).toBe('true')
+    })
+
+    it('does not set draggable on folder items', () => {
+      const { wrapper } = mountComponent({
+        item: createMockItem('folder')
+      })
+
+      const folderDiv = wrapper.find('div.group\\/tree-node')
+      expect(folderDiv.attributes('draggable')).toBeUndefined()
+    })
+
+    it('calls startDrag with native mode on dragstart', async () => {
+      const mockData = { name: 'TestNode' }
+      const { wrapper } = mountComponent({
+        item: createMockItem('node', { data: mockData })
+      })
+
+      const nodeDiv = wrapper.find('div.group\\/tree-node')
+      await nodeDiv.trigger('dragstart')
+
+      expect(mockStartDrag).toHaveBeenCalledWith(mockData, 'native')
+    })
+
+    it('does not call startDrag for folder items on dragstart', async () => {
+      const { wrapper } = mountComponent({
+        item: createMockItem('folder')
+      })
+
+      const folderDiv = wrapper.find('div.group\\/tree-node')
+      await folderDiv.trigger('dragstart')
+
+      expect(mockStartDrag).not.toHaveBeenCalled()
+    })
+
+    it('calls handleNativeDrop on dragend with drop coordinates', async () => {
+      const mockData = { name: 'TestNode' }
+      const { wrapper } = mountComponent({
+        item: createMockItem('node', { data: mockData })
+      })
+
+      const nodeDiv = wrapper.find('div.group\\/tree-node')
+
+      await nodeDiv.trigger('dragstart')
+
+      const dragEndEvent = new DragEvent('dragend', { bubbles: true })
+      Object.defineProperty(dragEndEvent, 'clientX', { value: 100 })
+      Object.defineProperty(dragEndEvent, 'clientY', { value: 200 })
+
+      await nodeDiv.element.dispatchEvent(dragEndEvent)
+      await wrapper.vm.$nextTick()
+
+      expect(mockHandleNativeDrop).toHaveBeenCalledWith(100, 200)
+    })
+
+    it('calls handleNativeDrop regardless of dropEffect', async () => {
+      const mockData = { name: 'TestNode' }
+      const { wrapper } = mountComponent({
+        item: createMockItem('node', { data: mockData })
+      })
+
+      const nodeDiv = wrapper.find('div.group\\/tree-node')
+
+      await nodeDiv.trigger('dragstart')
+      mockHandleNativeDrop.mockClear()
+
+      const dragEndEvent = new DragEvent('dragend', { bubbles: true })
+      Object.defineProperty(dragEndEvent, 'clientX', { value: 300 })
+      Object.defineProperty(dragEndEvent, 'clientY', { value: 400 })
+      Object.defineProperty(dragEndEvent, 'dataTransfer', {
+        value: { dropEffect: 'none' }
+      })
+
+      await nodeDiv.element.dispatchEvent(dragEndEvent)
+      await wrapper.vm.$nextTick()
+
+      expect(mockHandleNativeDrop).toHaveBeenCalledWith(300, 400)
+    })
+  })
+})
diff --git a/src/components/common/TreeExplorerV2Node.vue b/src/components/common/TreeExplorerV2Node.vue
new file mode 100644
index 0000000000..e5140cb789
--- /dev/null
+++ b/src/components/common/TreeExplorerV2Node.vue
@@ -0,0 +1,172 @@
+<template>
+  <TreeItem
+    v-slot="{ isExpanded, isSelected, handleToggle, handleSelect }"
+    :value="item.value"
+    :level="item.level"
+    as-child
+  >
+    <!-- Node -->
+    <div
+      v-if="item.value.type === 'node'"
+      :class="cn(ROW_CLASS, isSelected && 'bg-comfy-input')"
+      :style="rowStyle"
+      draggable="true"
+      @click.stop="handleClick($event, handleToggle, handleSelect)"
+      @contextmenu="handleContextMenu"
+      @mouseenter="handleMouseEnter"
+      @mouseleave="handleMouseLeave"
+      @dragstart="handleDragStart"
+      @dragend="handleDragEnd"
+    >
+      <i class="icon-[comfy--node] size-4 shrink-0 text-muted-foreground" />
+      <span class="text-foreground min-w-0 flex-1 truncate text-sm">
+        <slot name="node" :node="item.value">
+          {{ item.value.label }}
+        </slot>
+      </span>
+      <button
+        :class="
+          cn(
+            'hover:text-foreground flex size-6 shrink-0 cursor-pointer items-center justify-center rounded-sm border-none bg-transparent text-muted-foreground',
+            'opacity-0 group-hover/tree-node:opacity-100'
+          )
+        "
+        :aria-label="$t('icon.bookmark')"
+        @click.stop="toggleBookmark"
+      >
+        <i
+          :class="
+            cn(
+              isBookmarked ? 'pi pi-bookmark-fill' : 'pi pi-bookmark',
+              'text-xs'
+            )
+          "
+        />
+      </button>
+    </div>
+
+    <!-- Folder -->
+    <div
+      v-else
+      :class="cn(ROW_CLASS, isSelected && 'bg-comfy-input')"
+      :style="rowStyle"
+      @click.stop="handleClick($event, handleToggle, handleSelect)"
+    >
+      <i
+        v-if="item.hasChildren"
+        :class="
+          cn(
+            'icon-[lucide--chevron-down] size-4 shrink-0 text-muted-foreground transition-transform',
+            !isExpanded && '-rotate-90'
+          )
+        "
+      />
+      <i
+        :class="cn(item.value.icon, 'size-4 shrink-0 text-muted-foreground')"
+      />
+      <span class="text-foreground min-w-0 flex-1 truncate text-sm">
+        <slot name="folder" :node="item.value">
+          {{ item.value.label }}
+        </slot>
+      </span>
+    </div>
+  </TreeItem>
+
+  <Teleport
+    v-if="showPreview && item.value.type === 'node' && item.value.data"
+    to="body"
+  >
+    <div
+      :ref="(el) => (previewRef = el as HTMLElement)"
+      :style="nodePreviewStyle"
+    >
+      <NodePreviewCard :node-def="item.value.data as ComfyNodeDefImpl" />
+    </div>
+  </Teleport>
+</template>
+
+<script setup lang="ts">
+import type { FlattenedItem } from 'reka-ui'
+import { TreeItem } from 'reka-ui'
+import { computed, inject } from 'vue'
+
+import NodePreviewCard from '@/components/node/NodePreviewCard.vue'
+import { useNodePreviewAndDrag } from '@/composables/node/useNodePreviewAndDrag'
+import { useNodeBookmarkStore } from '@/stores/nodeBookmarkStore'
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+import { InjectKeyContextMenuNode } from '@/types/treeExplorerTypes'
+import type { RenderedTreeExplorerNode } from '@/types/treeExplorerTypes'
+import { cn } from '@/utils/tailwindUtil'
+
+const ROW_CLASS =
+  'group/tree-node flex cursor-pointer select-none items-center gap-3 overflow-hidden py-2 outline-none hover:bg-comfy-input mx-2 rounded'
+
+const { item } = defineProps<{
+  item: FlattenedItem<RenderedTreeExplorerNode<ComfyNodeDefImpl>>
+}>()
+
+const emit = defineEmits<{
+  nodeClick: [
+    node: RenderedTreeExplorerNode<ComfyNodeDefImpl>,
+    event: MouseEvent
+  ]
+}>()
+
+const contextMenuNode = inject(InjectKeyContextMenuNode)
+const nodeBookmarkStore = useNodeBookmarkStore()
+
+const nodeDef = computed(() => item.value.data)
+
+const isBookmarked = computed(() => {
+  if (!nodeDef.value) return false
+  return nodeBookmarkStore.isBookmarked(nodeDef.value)
+})
+
+function toggleBookmark() {
+  if (nodeDef.value) {
+    nodeBookmarkStore.toggleBookmark(nodeDef.value)
+  }
+}
+
+const {
+  previewRef,
+  showPreview,
+  nodePreviewStyle,
+  handleMouseEnter: baseHandleMouseEnter,
+  handleMouseLeave,
+  handleDragStart: baseHandleDragStart,
+  handleDragEnd
+} = useNodePreviewAndDrag(nodeDef)
+
+const rowStyle = computed(() => ({
+  paddingLeft: `${8 + (item.level - 1) * 24}px`
+}))
+
+function handleClick(
+  e: MouseEvent,
+  handleToggle: () => void,
+  handleSelect: () => void
+) {
+  handleSelect()
+  if (item.value.type === 'folder') {
+    handleToggle()
+  }
+  emit('nodeClick', item.value, e)
+}
+
+function handleContextMenu() {
+  if (contextMenuNode) {
+    contextMenuNode.value = item.value
+  }
+}
+
+function handleMouseEnter(e: MouseEvent) {
+  if (item.value.type !== 'node') return
+  baseHandleMouseEnter(e)
+}
+
+function handleDragStart(e: DragEvent) {
+  if (item.value.type !== 'node' || !item.value.data) return
+  baseHandleDragStart(e)
+}
+</script>
diff --git a/src/components/common/UrlInput.test.ts b/src/components/common/UrlInput.test.ts
index e3fc81d294..9c34c11c55 100644
--- a/src/components/common/UrlInput.test.ts
+++ b/src/components/common/UrlInput.test.ts
@@ -7,6 +7,7 @@ import { beforeEach, describe, expect, it } from 'vitest'
 import { createApp, nextTick } from 'vue'
 
 import UrlInput from './UrlInput.vue'
+import type { ComponentProps } from 'vue-component-type-helpers'
 
 describe('UrlInput', () => {
   beforeEach(() => {
@@ -14,7 +15,13 @@ describe('UrlInput', () => {
     app.use(PrimeVue)
   })
 
-  const mountComponent = (props: any, options = {}) => {
+  const mountComponent = (
+    props: ComponentProps<typeof UrlInput> & {
+      placeholder?: string
+      disabled?: boolean
+    },
+    options = {}
+  ) => {
     return mount(UrlInput, {
       global: {
         plugins: [PrimeVue],
@@ -169,25 +176,25 @@ describe('UrlInput', () => {
       await input.setValue('  https://leading-space.com')
       await input.trigger('input')
       await nextTick()
-      expect(wrapper.vm.internalValue).toBe('https://leading-space.com')
+      expect(input.element.value).toBe('https://leading-space.com')
 
       // Test trailing whitespace
       await input.setValue('https://trailing-space.com  ')
       await input.trigger('input')
       await nextTick()
-      expect(wrapper.vm.internalValue).toBe('https://trailing-space.com')
+      expect(input.element.value).toBe('https://trailing-space.com')
 
       // Test both leading and trailing whitespace
       await input.setValue('  https://both-spaces.com  ')
       await input.trigger('input')
       await nextTick()
-      expect(wrapper.vm.internalValue).toBe('https://both-spaces.com')
+      expect(input.element.value).toBe('https://both-spaces.com')
 
       // Test whitespace in the middle of the URL
       await input.setValue('https:// middle-space.com')
       await input.trigger('input')
       await nextTick()
-      expect(wrapper.vm.internalValue).toBe('https://middle-space.com')
+      expect(input.element.value).toBe('https://middle-space.com')
     })
 
     it('trims whitespace when value set externally', async () => {
@@ -196,15 +203,17 @@ describe('UrlInput', () => {
         placeholder: 'Enter URL'
       })
 
+      const input = wrapper.find('input')
+
       // Check initial value is trimmed
-      expect(wrapper.vm.internalValue).toBe('https://initial-value.com')
+      expect(input.element.value).toBe('https://initial-value.com')
 
       // Update props with whitespace
       await wrapper.setProps({ modelValue: '  https://updated-value.com  ' })
       await nextTick()
 
       // Check updated value is trimmed
-      expect(wrapper.vm.internalValue).toBe('https://updated-value.com')
+      expect(input.element.value).toBe('https://updated-value.com')
     })
   })
 })
diff --git a/src/components/common/UserAvatar.test.ts b/src/components/common/UserAvatar.test.ts
index 0c6b26e4e0..0b5df70523 100644
--- a/src/components/common/UserAvatar.test.ts
+++ b/src/components/common/UserAvatar.test.ts
@@ -1,3 +1,5 @@
+import type { ComponentProps } from 'vue-component-type-helpers'
+
 import { mount } from '@vue/test-utils'
 import Avatar from 'primevue/avatar'
 import PrimeVue from 'primevue/config'
@@ -27,7 +29,7 @@ describe('UserAvatar', () => {
     app.use(PrimeVue)
   })
 
-  const mountComponent = (props: any = {}) => {
+  const mountComponent = (props: ComponentProps<typeof UserAvatar> = {}) => {
     return mount(UserAvatar, {
       global: {
         plugins: [PrimeVue, i18n],
diff --git a/src/components/common/VirtualGrid.test.ts b/src/components/common/VirtualGrid.test.ts
new file mode 100644
index 0000000000..b76640a7f7
--- /dev/null
+++ b/src/components/common/VirtualGrid.test.ts
@@ -0,0 +1,189 @@
+import { mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type { Ref } from 'vue'
+import { nextTick, ref } from 'vue'
+
+import VirtualGrid from './VirtualGrid.vue'
+
+type TestItem = { key: string; name: string }
+
+let mockedWidth: Ref<number>
+let mockedHeight: Ref<number>
+let mockedScrollY: Ref<number>
+
+vi.mock('@vueuse/core', async () => {
+  const actual = await vi.importActual<Record<string, unknown>>('@vueuse/core')
+  return {
+    ...actual,
+    useElementSize: () => ({ width: mockedWidth, height: mockedHeight }),
+    useScroll: () => ({ y: mockedScrollY })
+  }
+})
+
+beforeEach(() => {
+  mockedWidth = ref(400)
+  mockedHeight = ref(200)
+  mockedScrollY = ref(0)
+})
+
+function createItems(count: number): TestItem[] {
+  return Array.from({ length: count }, (_, i) => ({
+    key: `item-${i}`,
+    name: `Item ${i}`
+  }))
+}
+
+describe('VirtualGrid', () => {
+  const defaultGridStyle = {
+    display: 'grid',
+    gridTemplateColumns: 'repeat(4, 1fr)',
+    gap: '1rem'
+  }
+
+  it('renders items within the visible range', async () => {
+    const items = createItems(100)
+    mockedWidth.value = 400
+    mockedHeight.value = 200
+    mockedScrollY.value = 0
+
+    const wrapper = mount(VirtualGrid<TestItem>, {
+      props: {
+        items,
+        gridStyle: defaultGridStyle,
+        defaultItemHeight: 100,
+        defaultItemWidth: 100,
+        maxColumns: 4,
+        bufferRows: 1
+      },
+      slots: {
+        item: `<template #item="{ item }">
+          <div class="test-item">{{ item.name }}</div>
+        </template>`
+      },
+      attachTo: document.body
+    })
+
+    await nextTick()
+
+    const renderedItems = wrapper.findAll('.test-item')
+    expect(renderedItems.length).toBeGreaterThan(0)
+    expect(renderedItems.length).toBeLessThan(items.length)
+
+    wrapper.unmount()
+  })
+
+  it('provides correct index in slot props', async () => {
+    const items = createItems(20)
+    const receivedIndices: number[] = []
+    mockedWidth.value = 400
+    mockedHeight.value = 200
+    mockedScrollY.value = 0
+
+    const wrapper = mount(VirtualGrid<TestItem>, {
+      props: {
+        items,
+        gridStyle: defaultGridStyle,
+        defaultItemHeight: 50,
+        defaultItemWidth: 100,
+        maxColumns: 1,
+        bufferRows: 0
+      },
+      slots: {
+        item: ({ index }: { index: number }) => {
+          receivedIndices.push(index)
+          return null
+        }
+      },
+      attachTo: document.body
+    })
+
+    await nextTick()
+
+    expect(receivedIndices.length).toBeGreaterThan(0)
+    expect(receivedIndices[0]).toBe(0)
+    for (let i = 1; i < receivedIndices.length; i++) {
+      expect(receivedIndices[i]).toBe(receivedIndices[i - 1] + 1)
+    }
+
+    wrapper.unmount()
+  })
+
+  it('respects maxColumns prop', async () => {
+    const items = createItems(10)
+    mockedWidth.value = 400
+    mockedHeight.value = 200
+    mockedScrollY.value = 0
+
+    const wrapper = mount(VirtualGrid<TestItem>, {
+      props: {
+        items,
+        gridStyle: defaultGridStyle,
+        maxColumns: 2
+      },
+      attachTo: document.body
+    })
+
+    await nextTick()
+
+    const gridElement = wrapper.find('[style*="display: grid"]')
+    expect(gridElement.exists()).toBe(true)
+
+    const gridEl = gridElement.element as HTMLElement
+    expect(gridEl.style.gridTemplateColumns).toBe('repeat(2, minmax(0, 1fr))')
+
+    wrapper.unmount()
+  })
+
+  it('renders empty when no items provided', async () => {
+    const wrapper = mount(VirtualGrid<TestItem>, {
+      props: {
+        items: [],
+        gridStyle: defaultGridStyle
+      },
+      slots: {
+        item: `<template #item="{ item }">
+          <div class="test-item">{{ item.name }}</div>
+        </template>`
+      }
+    })
+
+    await nextTick()
+
+    const renderedItems = wrapper.findAll('.test-item')
+    expect(renderedItems.length).toBe(0)
+
+    wrapper.unmount()
+  })
+
+  it('forces cols to maxColumns when maxColumns is finite', async () => {
+    mockedWidth.value = 100
+    mockedHeight.value = 200
+    mockedScrollY.value = 0
+
+    const items = createItems(20)
+    const wrapper = mount(VirtualGrid<TestItem>, {
+      props: {
+        items,
+        gridStyle: defaultGridStyle,
+        defaultItemHeight: 50,
+        defaultItemWidth: 200,
+        maxColumns: 4,
+        bufferRows: 0
+      },
+      slots: {
+        item: `<template #item="{ item }">
+          <div class="test-item">{{ item.name }}</div>
+        </template>`
+      },
+      attachTo: document.body
+    })
+
+    await nextTick()
+
+    const renderedItems = wrapper.findAll('.test-item')
+    expect(renderedItems.length).toBeGreaterThan(0)
+    expect(renderedItems.length % 4).toBe(0)
+
+    wrapper.unmount()
+  })
+})
diff --git a/src/components/common/VirtualGrid.vue b/src/components/common/VirtualGrid.vue
index 134778778a..dd8546c75c 100644
--- a/src/components/common/VirtualGrid.vue
+++ b/src/components/common/VirtualGrid.vue
@@ -1,16 +1,19 @@
 <template>
-  <div ref="container" class="scroll-container">
-    <div :style="{ height: `${(state.start / cols) * itemHeight}px` }" />
-    <div :style="gridStyle">
-      <div v-for="item in renderedItems" :key="item.key" data-virtual-grid-item>
-        <slot name="item" :item="item" />
+  <div
+    ref="container"
+    class="scrollbar-thin scrollbar-track-transparent scrollbar-thumb-(--dialog-surface) h-full overflow-y-auto [overflow-anchor:none] [scrollbar-gutter:stable]"
+  >
+    <div :style="topSpacerStyle" />
+    <div :style="mergedGridStyle">
+      <div
+        v-for="(item, i) in renderedItems"
+        :key="item.key"
+        data-virtual-grid-item
+      >
+        <slot name="item" :item :index="state.start + i" />
       </div>
     </div>
-    <div
-      :style="{
-        height: `${((items.length - state.end) / cols) * itemHeight}px`
-      }"
-    />
+    <div :style="bottomSpacerStyle" />
   </div>
 </template>
 
@@ -28,19 +31,22 @@ type GridState = {
 
 const {
   items,
+  gridStyle,
   bufferRows = 1,
   scrollThrottle = 64,
   resizeDebounce = 64,
   defaultItemHeight = 200,
-  defaultItemWidth = 200
+  defaultItemWidth = 200,
+  maxColumns = Infinity
 } = defineProps<{
   items: (T & { key: string })[]
-  gridStyle: Partial<CSSProperties>
+  gridStyle: CSSProperties
   bufferRows?: number
   scrollThrottle?: number
   resizeDebounce?: number
   defaultItemHeight?: number
   defaultItemWidth?: number
+  maxColumns?: number
 }>()
 
 const emit = defineEmits<{
@@ -59,7 +65,19 @@ const { y: scrollY } = useScroll(container, {
   eventListenerOptions: { passive: true }
 })
 
-const cols = computed(() => Math.floor(width.value / itemWidth.value) || 1)
+const cols = computed(() => {
+  if (maxColumns !== Infinity) return maxColumns
+  return Math.floor(width.value / itemWidth.value) || 1
+})
+
+const mergedGridStyle = computed<CSSProperties>(() => {
+  if (maxColumns === Infinity) return gridStyle
+  return {
+    ...gridStyle,
+    gridTemplateColumns: `repeat(${maxColumns}, minmax(0, 1fr))`
+  }
+})
+
 const viewRows = computed(() => Math.ceil(height.value / itemHeight.value))
 const offsetRows = computed(() => Math.floor(scrollY.value / itemHeight.value))
 const isValidGrid = computed(() => height.value && width.value && items?.length)
@@ -83,6 +101,17 @@ const renderedItems = computed(() =>
   isValidGrid.value ? items.slice(state.value.start, state.value.end) : []
 )
 
+function rowsToHeight(itemsCount: number): string {
+  const rows = Math.ceil(itemsCount / cols.value)
+  return `${rows * itemHeight.value}px`
+}
+const topSpacerStyle = computed<CSSProperties>(() => ({
+  height: rowsToHeight(state.value.start)
+}))
+const bottomSpacerStyle = computed<CSSProperties>(() => ({
+  height: rowsToHeight(items.length - state.value.end)
+}))
+
 whenever(
   () => state.value.isNearEnd,
   () => {
@@ -90,11 +119,10 @@ whenever(
   }
 )
 
-const updateItemSize = () => {
+function updateItemSize(): void {
   if (container.value) {
     const firstItem = container.value.querySelector('[data-virtual-grid-item]')
 
-    // Don't update item size if the first item is not rendered yet
     if (!firstItem?.clientHeight || !firstItem?.clientWidth) return
 
     if (itemHeight.value !== firstItem.clientHeight) {
@@ -109,15 +137,6 @@ const onResize = debounce(updateItemSize, resizeDebounce)
 watch([width, height], onResize, { flush: 'post' })
 whenever(() => items, updateItemSize, { flush: 'post' })
 onBeforeUnmount(() => {
-  onResize.cancel() // Clear pending debounced calls
+  onResize.cancel()
 })
 </script>
-
-<style scoped>
-.scroll-container {
-  height: 100%;
-  overflow-y: auto;
-  scrollbar-width: thin;
-  scrollbar-color: var(--dialog-surface) transparent;
-}
-</style>
diff --git a/src/components/common/WorkflowActionsDropdown.vue b/src/components/common/WorkflowActionsDropdown.vue
new file mode 100644
index 0000000000..3e94c375cb
--- /dev/null
+++ b/src/components/common/WorkflowActionsDropdown.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts">
+import {
+  DropdownMenuContent,
+  DropdownMenuPortal,
+  DropdownMenuRoot,
+  DropdownMenuTrigger
+} from 'reka-ui'
+import { ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import WorkflowActionsList from '@/components/common/WorkflowActionsList.vue'
+import Button from '@/components/ui/button/Button.vue'
+import { useNewMenuItemIndicator } from '@/composables/useNewMenuItemIndicator'
+import { useWorkflowActionsMenu } from '@/composables/useWorkflowActionsMenu'
+import { useTelemetry } from '@/platform/telemetry'
+import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import { useCommandStore } from '@/stores/commandStore'
+
+const { source, align = 'start' } = defineProps<{
+  source: string
+  align?: 'start' | 'center' | 'end'
+}>()
+
+const { t } = useI18n()
+const canvasStore = useCanvasStore()
+const dropdownOpen = ref(false)
+
+const { menuItems } = useWorkflowActionsMenu(
+  () => useCommandStore().execute('Comfy.RenameWorkflow'),
+  { isRoot: true }
+)
+
+const { hasUnseenItems, markAsSeen } = useNewMenuItemIndicator(
+  () => menuItems.value
+)
+
+function handleOpen(open: boolean) {
+  if (open) {
+    markAsSeen()
+    useTelemetry()?.trackUiButtonClicked({
+      button_id: source
+    })
+  }
+}
+
+function toggleLinearMode() {
+  dropdownOpen.value = false
+  void useCommandStore().execute('Comfy.ToggleLinear', {
+    metadata: { source }
+  })
+}
+</script>
+
+<template>
+  <DropdownMenuRoot v-model:open="dropdownOpen" @update:open="handleOpen">
+    <slot name="button" :has-unseen-items="hasUnseenItems">
+      <div
+        class="pointer-events-auto inline-flex items-center rounded-lg bg-secondary-background"
+      >
+        <Button
+          v-tooltip="{
+            value: canvasStore.linearMode
+              ? t('breadcrumbsMenu.enterNodeGraph')
+              : t('breadcrumbsMenu.enterAppMode'),
+            showDelay: 300,
+            hideDelay: 300
+          }"
+          :aria-label="
+            canvasStore.linearMode
+              ? t('breadcrumbsMenu.enterNodeGraph')
+              : t('breadcrumbsMenu.enterAppMode')
+          "
+          variant="base"
+          class="m-1"
+          @pointerdown.stop
+          @click="toggleLinearMode"
+        >
+          <i
+            class="size-4"
+            :class="
+              canvasStore.linearMode
+                ? 'icon-[lucide--panels-top-left]'
+                : 'icon-[comfy--workflow]'
+            "
+          />
+        </Button>
+        <DropdownMenuTrigger as-child>
+          <Button
+            v-tooltip="{
+              value: t('breadcrumbsMenu.workflowActions'),
+              showDelay: 300,
+              hideDelay: 300
+            }"
+            variant="secondary"
+            size="unset"
+            :aria-label="t('breadcrumbsMenu.workflowActions')"
+            class="relative h-10 gap-1 rounded-lg pr-2 pl-2.5 text-center data-[state=open]:bg-secondary-background-hover data-[state=open]:shadow-interface"
+          >
+            <span>{{
+              canvasStore.linearMode
+                ? t('breadcrumbsMenu.app')
+                : t('breadcrumbsMenu.graph')
+            }}</span>
+            <i
+              class="icon-[lucide--chevron-down] size-4 text-muted-foreground"
+            />
+            <span
+              v-if="hasUnseenItems"
+              aria-hidden="true"
+              class="absolute -top-0.5 -right-0.5 size-2 rounded-full bg-primary-background"
+            />
+          </Button>
+        </DropdownMenuTrigger>
+      </div>
+    </slot>
+    <DropdownMenuPortal>
+      <DropdownMenuContent
+        :align
+        :side-offset="5"
+        :collision-padding="10"
+        class="z-1000 min-w-56 rounded-lg border border-border-subtle bg-base-background px-2 py-3 shadow-interface"
+      >
+        <WorkflowActionsList :items="menuItems" />
+      </DropdownMenuContent>
+    </DropdownMenuPortal>
+  </DropdownMenuRoot>
+</template>
diff --git a/src/components/common/WorkflowActionsList.test.ts b/src/components/common/WorkflowActionsList.test.ts
new file mode 100644
index 0000000000..e5483c65a0
--- /dev/null
+++ b/src/components/common/WorkflowActionsList.test.ts
@@ -0,0 +1,100 @@
+import { shallowMount } from '@vue/test-utils'
+import { describe, expect, it, vi } from 'vitest'
+
+import WorkflowActionsList from '@/components/common/WorkflowActionsList.vue'
+import type {
+  WorkflowMenuAction,
+  WorkflowMenuItem
+} from '@/types/workflowMenuItem'
+
+function createWrapper(items: WorkflowMenuItem[]) {
+  return shallowMount(WorkflowActionsList, {
+    props: { items },
+    global: { renderStubDefaultSlot: true }
+  })
+}
+
+describe('WorkflowActionsList', () => {
+  it('renders action items with label and icon', () => {
+    const items: WorkflowMenuItem[] = [
+      { id: 'save', label: 'Save', icon: 'pi pi-save', command: vi.fn() }
+    ]
+
+    const wrapper = createWrapper(items)
+
+    expect(wrapper.text()).toContain('Save')
+    expect(wrapper.find('.pi-save').exists()).toBe(true)
+  })
+
+  it('renders separator items', () => {
+    const items: WorkflowMenuItem[] = [
+      { id: 'before', label: 'Before', icon: 'pi pi-a', command: vi.fn() },
+      { separator: true },
+      { id: 'after', label: 'After', icon: 'pi pi-b', command: vi.fn() }
+    ]
+
+    const wrapper = createWrapper(items)
+    const html = wrapper.html()
+
+    expect(html).toContain('dropdown-menu-separator-stub')
+    expect(wrapper.text()).toContain('Before')
+    expect(wrapper.text()).toContain('After')
+  })
+
+  it('dispatches command on select', async () => {
+    const command = vi.fn()
+    const items: WorkflowMenuItem[] = [
+      { id: 'action', label: 'Action', icon: 'pi pi-play', command }
+    ]
+
+    const wrapper = createWrapper(items)
+    const item = wrapper.findComponent({ name: 'DropdownMenuItem' })
+    await item.vm.$emit('select')
+
+    expect(command).toHaveBeenCalledOnce()
+  })
+
+  it('renders badge when present', () => {
+    const items: WorkflowMenuItem[] = [
+      {
+        id: 'new-feature',
+        label: 'New Feature',
+        icon: 'pi pi-star',
+        command: vi.fn(),
+        badge: 'NEW'
+      }
+    ]
+
+    const wrapper = createWrapper(items)
+
+    expect(wrapper.text()).toContain('NEW')
+  })
+
+  it('does not render items with visible set to false', () => {
+    const items: WorkflowMenuItem[] = [
+      {
+        id: 'hidden',
+        label: 'Hidden Item',
+        icon: 'pi pi-eye-slash',
+        command: vi.fn(),
+        visible: false
+      },
+      { id: 'shown', label: 'Shown Item', icon: 'pi pi-eye', command: vi.fn() }
+    ]
+
+    const wrapper = createWrapper(items)
+
+    expect(wrapper.text()).not.toContain('Hidden Item')
+    expect(wrapper.text()).toContain('Shown Item')
+  })
+
+  it('does not render badge when absent', () => {
+    const items: WorkflowMenuAction[] = [
+      { id: 'plain', label: 'Plain', icon: 'pi pi-check', command: vi.fn() }
+    ]
+
+    const wrapper = createWrapper(items)
+
+    expect(wrapper.text()).not.toContain('NEW')
+  })
+})
diff --git a/src/components/common/WorkflowActionsList.vue b/src/components/common/WorkflowActionsList.vue
new file mode 100644
index 0000000000..d17c0db0a9
--- /dev/null
+++ b/src/components/common/WorkflowActionsList.vue
@@ -0,0 +1,53 @@
+<script setup lang="ts">
+import { DropdownMenuItem, DropdownMenuSeparator } from 'reka-ui'
+import type { Component } from 'vue'
+
+import OverlayIcon from '@/components/common/OverlayIcon.vue'
+import type { WorkflowMenuItem } from '@/types/workflowMenuItem'
+import { cn } from '@/utils/tailwindUtil'
+
+const {
+  items,
+  itemComponent = DropdownMenuItem,
+  separatorComponent = DropdownMenuSeparator
+} = defineProps<{
+  items: WorkflowMenuItem[]
+  itemComponent?: Component
+  separatorComponent?: Component
+}>()
+</script>
+
+<template>
+  <template v-for="(item, index) in items" :key="index">
+    <component
+      :is="separatorComponent"
+      v-if="item.separator"
+      class="my-1 w-full border-b border-border-subtle"
+    />
+    <component
+      :is="itemComponent"
+      v-else-if="item.visible !== false"
+      :disabled="item.disabled"
+      :class="
+        cn(
+          'flex min-h-6 items-center gap-2 self-stretch rounded-sm p-2 outline-none',
+          !item.disabled && item.command && 'cursor-pointer',
+          'data-highlighted:bg-secondary-background-hover',
+          !item.disabled && 'hover:bg-secondary-background-hover',
+          'data-disabled:cursor-default data-disabled:opacity-50'
+        )
+      "
+      @select="() => item.command?.()"
+    >
+      <OverlayIcon v-if="item.overlayIcon" v-bind="item.overlayIcon" />
+      <i v-else-if="item.icon" :class="item.icon" />
+      <span class="flex-1">{{ item.label }}</span>
+      <span
+        v-if="item.badge"
+        class="ml-3 flex items-center gap-1 rounded-full bg-(--primary-background) px-1.5 py-0.5 text-xxs text-base-foreground uppercase"
+      >
+        {{ item.badge }}
+      </span>
+    </component>
+  </template>
+</template>
diff --git a/src/components/common/statusBadge.variants.ts b/src/components/common/statusBadge.variants.ts
new file mode 100644
index 0000000000..479a0dda8b
--- /dev/null
+++ b/src/components/common/statusBadge.variants.ts
@@ -0,0 +1,26 @@
+import type { VariantProps } from 'cva'
+import { cva } from 'cva'
+
+export const statusBadgeVariants = cva({
+  base: 'inline-flex items-center justify-center rounded-full',
+  variants: {
+    severity: {
+      default: 'bg-primary-background text-base-foreground',
+      secondary: 'bg-secondary-background text-base-foreground',
+      warn: 'bg-warning-background text-base-background',
+      danger: 'bg-destructive-background text-white',
+      contrast: 'bg-base-foreground text-base-background'
+    },
+    variant: {
+      label: 'h-3.5 px-1 text-xxxs font-semibold uppercase',
+      dot: 'size-2',
+      circle: 'size-3.5 text-xxxs font-semibold'
+    }
+  },
+  defaultVariants: {
+    severity: 'default',
+    variant: 'label'
+  }
+})
+
+export type StatusBadgeVariants = VariantProps<typeof statusBadgeVariants>
diff --git a/src/components/curve/CurveEditor.test.ts b/src/components/curve/CurveEditor.test.ts
new file mode 100644
index 0000000000..e04eae8329
--- /dev/null
+++ b/src/components/curve/CurveEditor.test.ts
@@ -0,0 +1,113 @@
+import { mount } from '@vue/test-utils'
+import { describe, expect, it } from 'vitest'
+
+import type { CurvePoint } from './types'
+
+import CurveEditor from './CurveEditor.vue'
+
+function mountEditor(points: CurvePoint[], extraProps = {}) {
+  return mount(CurveEditor, {
+    props: { modelValue: points, ...extraProps }
+  })
+}
+
+function getCurvePath(wrapper: ReturnType<typeof mount>) {
+  return wrapper.find('[data-testid="curve-path"]')
+}
+
+describe('CurveEditor', () => {
+  it('renders SVG with curve path', () => {
+    const wrapper = mountEditor([
+      [0, 0],
+      [1, 1]
+    ])
+    expect(wrapper.find('svg').exists()).toBe(true)
+    const curvePath = getCurvePath(wrapper)
+    expect(curvePath.exists()).toBe(true)
+    expect(curvePath.attributes('d')).toBeTruthy()
+  })
+
+  it('renders a circle for each control point', () => {
+    const wrapper = mountEditor([
+      [0, 0],
+      [0.5, 0.7],
+      [1, 1]
+    ])
+    expect(wrapper.findAll('circle')).toHaveLength(3)
+  })
+
+  it('renders histogram path when provided', () => {
+    const histogram = new Uint32Array(256)
+    for (let i = 0; i < 256; i++) histogram[i] = i + 1
+    const wrapper = mountEditor(
+      [
+        [0, 0],
+        [1, 1]
+      ],
+      { histogram }
+    )
+    const histogramPath = wrapper.find('[data-testid="histogram-path"]')
+    expect(histogramPath.exists()).toBe(true)
+    expect(histogramPath.attributes('d')).toContain('M0,1')
+  })
+
+  it('does not render histogram path when not provided', () => {
+    const wrapper = mountEditor([
+      [0, 0],
+      [1, 1]
+    ])
+    expect(wrapper.find('[data-testid="histogram-path"]').exists()).toBe(false)
+  })
+
+  it('returns empty path with fewer than 2 points', () => {
+    const wrapper = mountEditor([[0.5, 0.5]])
+    expect(getCurvePath(wrapper).attributes('d')).toBe('')
+  })
+
+  it('generates path starting with M and containing L segments', () => {
+    const wrapper = mountEditor([
+      [0, 0],
+      [0.5, 0.8],
+      [1, 1]
+    ])
+    const d = getCurvePath(wrapper).attributes('d')!
+    expect(d).toMatch(/^M/)
+    expect(d).toContain('L')
+  })
+
+  it('curve path only spans the x-range of control points', () => {
+    const wrapper = mountEditor([
+      [0.2, 0.3],
+      [0.8, 0.9]
+    ])
+    const d = getCurvePath(wrapper).attributes('d')!
+    const xValues = d
+      .split(/[ML]/)
+      .filter(Boolean)
+      .map((s) => parseFloat(s.split(',')[0]))
+    expect(Math.min(...xValues)).toBeCloseTo(0.2, 2)
+    expect(Math.max(...xValues)).toBeCloseTo(0.8, 2)
+  })
+
+  it('deletes a point on right-click but keeps minimum 2', async () => {
+    const points: CurvePoint[] = [
+      [0, 0],
+      [0.5, 0.5],
+      [1, 1]
+    ]
+    const wrapper = mountEditor(points)
+    expect(wrapper.findAll('circle')).toHaveLength(3)
+
+    await wrapper.findAll('circle')[1].trigger('pointerdown', {
+      button: 2,
+      pointerId: 1
+    })
+    expect(wrapper.findAll('circle')).toHaveLength(2)
+
+    await wrapper.findAll('circle')[0].trigger('pointerdown', {
+      button: 2,
+      pointerId: 1
+    })
+    expect(wrapper.findAll('circle')).toHaveLength(2)
+  })
+})
diff --git a/src/components/curve/CurveEditor.vue b/src/components/curve/CurveEditor.vue
new file mode 100644
index 0000000000..85a64bc5b2
--- /dev/null
+++ b/src/components/curve/CurveEditor.vue
@@ -0,0 +1,104 @@
+<template>
+  <svg
+    ref="svgRef"
+    viewBox="-0.04 -0.04 1.08 1.08"
+    preserveAspectRatio="xMidYMid meet"
+    class="aspect-square w-full cursor-crosshair rounded-[5px] bg-node-component-surface"
+    @pointerdown.stop="handleSvgPointerDown"
+    @contextmenu.prevent.stop
+  >
+    <line
+      v-for="v in [0.25, 0.5, 0.75]"
+      :key="'h' + v"
+      :x1="0"
+      :y1="v"
+      :x2="1"
+      :y2="v"
+      stroke="currentColor"
+      stroke-opacity="0.1"
+      stroke-width="0.003"
+    />
+    <line
+      v-for="v in [0.25, 0.5, 0.75]"
+      :key="'v' + v"
+      :x1="v"
+      :y1="0"
+      :x2="v"
+      :y2="1"
+      stroke="currentColor"
+      stroke-opacity="0.1"
+      stroke-width="0.003"
+    />
+
+    <line
+      x1="0"
+      y1="1"
+      x2="1"
+      y2="0"
+      stroke="currentColor"
+      stroke-opacity="0.15"
+      stroke-width="0.003"
+    />
+
+    <path
+      v-if="histogramPath"
+      data-testid="histogram-path"
+      :d="histogramPath"
+      :fill="curveColor"
+      fill-opacity="0.15"
+      stroke="none"
+    />
+
+    <path
+      data-testid="curve-path"
+      :d="curvePath"
+      fill="none"
+      :stroke="curveColor"
+      stroke-width="0.008"
+      stroke-linecap="round"
+    />
+
+    <circle
+      v-for="(point, i) in modelValue"
+      :key="i"
+      :cx="point[0]"
+      :cy="1 - point[1]"
+      r="0.02"
+      :fill="curveColor"
+      stroke="white"
+      stroke-width="0.004"
+      class="cursor-grab"
+      @pointerdown.stop="startDrag(i, $event)"
+    />
+  </svg>
+</template>
+
+<script setup lang="ts">
+import { computed, useTemplateRef } from 'vue'
+
+import { useCurveEditor } from '@/composables/useCurveEditor'
+
+import type { CurvePoint } from './types'
+
+import { histogramToPath } from './curveUtils'
+
+const { curveColor = 'white', histogram } = defineProps<{
+  curveColor?: string
+  histogram?: Uint32Array | null
+}>()
+
+const modelValue = defineModel<CurvePoint[]>({
+  required: true
+})
+
+const svgRef = useTemplateRef<SVGSVGElement>('svgRef')
+
+const { curvePath, handleSvgPointerDown, startDrag } = useCurveEditor({
+  svgRef,
+  modelValue
+})
+
+const histogramPath = computed(() =>
+  histogram ? histogramToPath(histogram) : ''
+)
+</script>
diff --git a/src/components/curve/WidgetCurve.vue b/src/components/curve/WidgetCurve.vue
new file mode 100644
index 0000000000..85a16adc64
--- /dev/null
+++ b/src/components/curve/WidgetCurve.vue
@@ -0,0 +1,16 @@
+<template>
+  <CurveEditor v-model="modelValue" />
+</template>
+
+<script setup lang="ts">
+import type { CurvePoint } from './types'
+
+import CurveEditor from './CurveEditor.vue'
+
+const modelValue = defineModel<CurvePoint[]>({
+  default: () => [
+    [0, 0],
+    [1, 1]
+  ]
+})
+</script>
diff --git a/src/components/curve/curveUtils.test.ts b/src/components/curve/curveUtils.test.ts
new file mode 100644
index 0000000000..6aa021e734
--- /dev/null
+++ b/src/components/curve/curveUtils.test.ts
@@ -0,0 +1,141 @@
+import { describe, expect, it } from 'vitest'
+
+import type { CurvePoint } from './types'
+
+import {
+  createMonotoneInterpolator,
+  curvesToLUT,
+  histogramToPath
+} from './curveUtils'
+
+describe('createMonotoneInterpolator', () => {
+  it('returns 0 for empty points', () => {
+    const interpolate = createMonotoneInterpolator([])
+    expect(interpolate(0.5)).toBe(0)
+  })
+
+  it('returns constant for single point', () => {
+    const interpolate = createMonotoneInterpolator([[0.5, 0.7]])
+    expect(interpolate(0)).toBe(0.7)
+    expect(interpolate(1)).toBe(0.7)
+  })
+
+  it('passes through control points exactly', () => {
+    const points: CurvePoint[] = [
+      [0, 0],
+      [0.5, 0.8],
+      [1, 1]
+    ]
+    const interpolate = createMonotoneInterpolator(points)
+    expect(interpolate(0)).toBeCloseTo(0, 5)
+    expect(interpolate(0.5)).toBeCloseTo(0.8, 5)
+    expect(interpolate(1)).toBeCloseTo(1, 5)
+  })
+
+  it('clamps to endpoint values outside range', () => {
+    const points: CurvePoint[] = [
+      [0.2, 0.3],
+      [0.8, 0.9]
+    ]
+    const interpolate = createMonotoneInterpolator(points)
+    expect(interpolate(0)).toBe(0.3)
+    expect(interpolate(1)).toBe(0.9)
+  })
+
+  it('produces monotone output for monotone input', () => {
+    const points: CurvePoint[] = [
+      [0, 0],
+      [0.25, 0.2],
+      [0.5, 0.5],
+      [0.75, 0.8],
+      [1, 1]
+    ]
+    const interpolate = createMonotoneInterpolator(points)
+
+    let prev = -Infinity
+    for (let x = 0; x <= 1; x += 0.01) {
+      const y = interpolate(x)
+      expect(y).toBeGreaterThanOrEqual(prev)
+      prev = y
+    }
+  })
+
+  it('handles unsorted input points', () => {
+    const points: CurvePoint[] = [
+      [1, 1],
+      [0, 0],
+      [0.5, 0.5]
+    ]
+    const interpolate = createMonotoneInterpolator(points)
+    expect(interpolate(0)).toBeCloseTo(0, 5)
+    expect(interpolate(0.5)).toBeCloseTo(0.5, 5)
+    expect(interpolate(1)).toBeCloseTo(1, 5)
+  })
+})
+
+describe('curvesToLUT', () => {
+  it('returns a 256-entry Uint8Array', () => {
+    const lut = curvesToLUT([
+      [0, 0],
+      [1, 1]
+    ])
+    expect(lut).toBeInstanceOf(Uint8Array)
+    expect(lut.length).toBe(256)
+  })
+
+  it('produces identity LUT for diagonal curve', () => {
+    const lut = curvesToLUT([
+      [0, 0],
+      [1, 1]
+    ])
+    for (let i = 0; i < 256; i++) {
+      expect(lut[i]).toBeCloseTo(i, 0)
+    }
+  })
+
+  it('clamps output to [0, 255]', () => {
+    const lut = curvesToLUT([
+      [0, 0],
+      [0.5, 1.5],
+      [1, 1]
+    ])
+    for (let i = 0; i < 256; i++) {
+      expect(lut[i]).toBeGreaterThanOrEqual(0)
+      expect(lut[i]).toBeLessThanOrEqual(255)
+    }
+  })
+})
+
+describe('histogramToPath', () => {
+  it('returns empty string for empty histogram', () => {
+    expect(histogramToPath(new Uint32Array(0))).toBe('')
+  })
+
+  it('returns empty string when all bins are zero', () => {
+    expect(histogramToPath(new Uint32Array(256))).toBe('')
+  })
+
+  it('returns a closed SVG path for valid histogram', () => {
+    const histogram = new Uint32Array(256)
+    for (let i = 0; i < 256; i++) histogram[i] = i + 1
+    const path = histogramToPath(histogram)
+    expect(path).toMatch(/^M0,1/)
+    expect(path).toMatch(/L1,1 Z$/)
+  })
+
+  it('normalizes using 99.5th percentile to suppress outliers', () => {
+    const histogram = new Uint32Array(256)
+    for (let i = 0; i < 256; i++) histogram[i] = 100
+    histogram[255] = 100000
+    const path = histogramToPath(histogram)
+    // Most bins should map to y=0 (1 - 100/100 = 0) since
+    // the 99.5th percentile is 100, not the outlier 100000
+    const yValues = path
+      .split(/[ML]/)
+      .filter(Boolean)
+      .map((s) => parseFloat(s.split(',')[1]))
+      .filter((y) => !isNaN(y))
+    const nearZero = yValues.filter((y) => Math.abs(y) < 0.01)
+    expect(nearZero.length).toBeGreaterThan(200)
+  })
+})
diff --git a/src/components/curve/curveUtils.ts b/src/components/curve/curveUtils.ts
new file mode 100644
index 0000000000..f46f0c92b5
--- /dev/null
+++ b/src/components/curve/curveUtils.ts
@@ -0,0 +1,120 @@
+import type { CurvePoint } from './types'
+
+/**
+ * Monotone cubic Hermite interpolation.
+ * Produces a smooth curve that passes through all control points
+ * without overshooting (monotone property).
+ *
+ * Returns a function that evaluates y for any x in [0, 1].
+ */
+export function createMonotoneInterpolator(
+  points: CurvePoint[]
+): (x: number) => number {
+  if (points.length === 0) return () => 0
+  if (points.length === 1) return () => points[0][1]
+
+  const sorted = [...points].sort((a, b) => a[0] - b[0])
+  const n = sorted.length
+  const xs = sorted.map((p) => p[0])
+  const ys = sorted.map((p) => p[1])
+
+  const deltas: number[] = []
+  const slopes: number[] = []
+  for (let i = 0; i < n - 1; i++) {
+    const dx = xs[i + 1] - xs[i]
+    deltas.push(dx === 0 ? 0 : (ys[i + 1] - ys[i]) / dx)
+  }
+
+  slopes.push(deltas[0] ?? 0)
+  for (let i = 1; i < n - 1; i++) {
+    if (deltas[i - 1] * deltas[i] <= 0) {
+      slopes.push(0)
+    } else {
+      slopes.push((deltas[i - 1] + deltas[i]) / 2)
+    }
+  }
+  slopes.push(deltas[n - 2] ?? 0)
+
+  for (let i = 0; i < n - 1; i++) {
+    if (deltas[i] === 0) {
+      slopes[i] = 0
+      slopes[i + 1] = 0
+    } else {
+      const alpha = slopes[i] / deltas[i]
+      const beta = slopes[i + 1] / deltas[i]
+      const s = alpha * alpha + beta * beta
+      if (s > 9) {
+        const t = 3 / Math.sqrt(s)
+        slopes[i] = t * alpha * deltas[i]
+        slopes[i + 1] = t * beta * deltas[i]
+      }
+    }
+  }
+
+  return (x: number): number => {
+    if (x <= xs[0]) return ys[0]
+    if (x >= xs[n - 1]) return ys[n - 1]
+
+    let lo = 0
+    let hi = n - 1
+    while (lo < hi - 1) {
+      const mid = (lo + hi) >> 1
+      if (xs[mid] <= x) lo = mid
+      else hi = mid
+    }
+
+    const dx = xs[hi] - xs[lo]
+    if (dx === 0) return ys[lo]
+
+    const t = (x - xs[lo]) / dx
+    const t2 = t * t
+    const t3 = t2 * t
+
+    const h00 = 2 * t3 - 3 * t2 + 1
+    const h10 = t3 - 2 * t2 + t
+    const h01 = -2 * t3 + 3 * t2
+    const h11 = t3 - t2
+
+    return (
+      h00 * ys[lo] +
+      h10 * dx * slopes[lo] +
+      h01 * ys[hi] +
+      h11 * dx * slopes[hi]
+    )
+  }
+}
+
+/**
+ * Convert a 256-bin histogram into an SVG path string.
+ * Normalizes using the 99.5th percentile to avoid outlier spikes.
+ */
+export function histogramToPath(histogram: Uint32Array): string {
+  if (!histogram.length) return ''
+
+  const sorted = Array.from(histogram).sort((a, b) => a - b)
+  const max = sorted[Math.floor(255 * 0.995)]
+  if (max === 0) return ''
+
+  const invMax = 1 / max
+  const parts: string[] = ['M0,1']
+  for (let i = 0; i < 256; i++) {
+    const x = i / 255
+    const y = 1 - Math.min(1, histogram[i] * invMax)
+    parts.push(`L${x},${y}`)
+  }
+  parts.push('L1,1 Z')
+  return parts.join(' ')
+}
+
+export function curvesToLUT(points: CurvePoint[]): Uint8Array {
+  const lut = new Uint8Array(256)
+  const interpolate = createMonotoneInterpolator(points)
+
+  for (let i = 0; i < 256; i++) {
+    const x = i / 255
+    const y = interpolate(x)
+    lut[i] = Math.max(0, Math.min(255, Math.round(y * 255)))
+  }
+
+  return lut
+}
diff --git a/src/components/curve/types.ts b/src/components/curve/types.ts
new file mode 100644
index 0000000000..2f098f8061
--- /dev/null
+++ b/src/components/curve/types.ts
@@ -0,0 +1 @@
+export type CurvePoint = [x: number, y: number]
diff --git a/src/components/custom/widget/WorkflowTemplateSelectorDialog.vue b/src/components/custom/widget/WorkflowTemplateSelectorDialog.vue
index 5f96fe4c26..1d708df507 100644
--- a/src/components/custom/widget/WorkflowTemplateSelectorDialog.vue
+++ b/src/components/custom/widget/WorkflowTemplateSelectorDialog.vue
@@ -1,23 +1,25 @@
 <template>
   <BaseModalLayout
     :content-title="$t('templateWorkflows.title', 'Workflow Templates')"
-    class="workflow-template-selector-dialog"
+    size="md"
   >
+    <template #leftPanelHeaderTitle>
+      <i class="icon-[comfy--template]" />
+      <h2 class="text-neutral text-base">
+        {{ $t('sideToolbar.templates', 'Templates') }}
+      </h2>
+    </template>
     <template #leftPanel>
-      <LeftSidePanel v-model="selectedNavItem" :nav-items="navItems">
-        <template #header-icon>
-          <i class="icon-[comfy--template]" />
-        </template>
-        <template #header-title>
-          <span class="text-neutral text-base">{{
-            $t('sideToolbar.templates', 'Templates')
-          }}</span>
-        </template>
-      </LeftSidePanel>
+      <LeftSidePanel v-model="selectedNavItem" :nav-items="navItems" />
     </template>
 
     <template #header>
-      <SearchBox v-model="searchQuery" size="lg" class="max-w-[384px]" />
+      <SearchBox
+        v-model="searchQuery"
+        size="lg"
+        class="max-w-[384px]"
+        autofocus
+      />
     </template>
 
     <template #header-right-area>
@@ -114,7 +116,7 @@
         v-if="!isLoading && filteredTemplates.length === 0"
         class="flex h-64 flex-col items-center justify-center text-neutral-500"
       >
-        <i class="mb-4 icon-[lucide--search] h-12 w-12 opacity-50" />
+        <i class="mb-4 icon-[lucide--search] size-12 opacity-50" />
         <p class="mb-2 text-lg">
           {{ $t('templateWorkflows.noResults', 'No templates found') }}
         </p>
@@ -131,7 +133,7 @@
         <!-- Title -->
         <span
           v-if="isLoading"
-          class="inline-block h-8 w-48 animate-pulse rounded bg-dialog-surface"
+          class="inline-block h-8 w-48 animate-pulse rounded-sm bg-dialog-surface"
         ></span>
 
         <!-- Template Cards Grid -->
@@ -152,9 +154,7 @@
             <template #top>
               <CardTop ratio="landscape">
                 <template #default>
-                  <div
-                    class="h-full w-full animate-pulse bg-dialog-surface"
-                  ></div>
+                  <div class="size-full animate-pulse bg-dialog-surface"></div>
                 </template>
               </CardTop>
             </template>
@@ -162,10 +162,10 @@
               <CardBottom>
                 <div class="px-4 py-3">
                   <div
-                    class="mb-2 h-6 animate-pulse rounded bg-dialog-surface"
+                    class="mb-2 h-6 animate-pulse rounded-sm bg-dialog-surface"
                   ></div>
                   <div
-                    class="h-4 animate-pulse rounded bg-dialog-surface"
+                    class="h-4 animate-pulse rounded-sm bg-dialog-surface"
                   ></div>
                 </div>
               </CardBottom>
@@ -175,6 +175,7 @@
           <!-- Actual Template Cards -->
           <CardContainer
             v-for="template in isLoading ? [] : displayTemplates"
+            v-show="isTemplateVisibleOnDistribution(template)"
             :key="template.name"
             ref="cardRefs"
             size="compact"
@@ -190,9 +191,7 @@
               <CardTop ratio="square">
                 <template #default>
                   <!-- Template Thumbnail -->
-                  <div
-                    class="relative h-full w-full overflow-hidden rounded-lg"
-                  >
+                  <div class="relative size-full overflow-hidden rounded-lg">
                     <template v-if="template.mediaType === 'audio'">
                       <AudioThumbnail :src="getBaseThumbnailSrc(template)" />
                     </template>
@@ -253,9 +252,14 @@
                         "
                       />
                     </template>
+                    <LogoOverlay
+                      v-if="template.logos?.length"
+                      :logos="template.logos"
+                      :get-logo-url="workflowTemplatesStore.getLogoUrl"
+                    />
                     <ProgressSpinner
                       v-if="loadingTemplate === template.name"
-                      class="absolute inset-0 z-10 m-auto h-12 w-12"
+                      class="absolute inset-0 z-10 m-auto size-12"
                     />
                   </div>
                 </template>
@@ -331,9 +335,7 @@
             <template #top>
               <CardTop ratio="square">
                 <template #default>
-                  <div
-                    class="h-full w-full animate-pulse bg-dialog-surface"
-                  ></div>
+                  <div class="size-full animate-pulse bg-dialog-surface"></div>
                 </template>
               </CardTop>
             </template>
@@ -341,10 +343,10 @@
               <CardBottom>
                 <div class="px-4 py-3">
                   <div
-                    class="mb-2 h-6 animate-pulse rounded bg-dialog-surface"
+                    class="mb-2 h-6 animate-pulse rounded-sm bg-dialog-surface"
                   ></div>
                   <div
-                    class="h-4 animate-pulse rounded bg-dialog-surface"
+                    class="h-4 animate-pulse rounded-sm bg-dialog-surface"
                   ></div>
                 </div>
               </CardBottom>
@@ -394,6 +396,7 @@ import AudioThumbnail from '@/components/templates/thumbnails/AudioThumbnail.vue
 import CompareSliderThumbnail from '@/components/templates/thumbnails/CompareSliderThumbnail.vue'
 import DefaultThumbnail from '@/components/templates/thumbnails/DefaultThumbnail.vue'
 import HoverDissolveThumbnail from '@/components/templates/thumbnails/HoverDissolveThumbnail.vue'
+import LogoOverlay from '@/components/templates/thumbnails/LogoOverlay.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'
@@ -403,16 +406,19 @@ import { useTemplateFiltering } from '@/composables/useTemplateFiltering'
 import { isCloud } from '@/platform/distribution/types'
 import { useTelemetry } from '@/platform/telemetry'
 import { useTemplateWorkflows } from '@/platform/workflow/templates/composables/useTemplateWorkflows'
-import { useWorkflowTemplatesStore } from '@/platform/workflow/templates/repositories/workflowTemplatesStore'
 import type { TemplateInfo } from '@/platform/workflow/templates/types/template'
+import { useWorkflowTemplatesStore } from '@/platform/workflow/templates/repositories/workflowTemplatesStore'
+import { TemplateIncludeOnDistributionEnum } from '@/platform/workflow/templates/types/template'
+import { useSystemStatsStore } from '@/stores/systemStatsStore'
 import type { NavGroupData, NavItemData } from '@/types/navTypes'
 import { OnCloseKey } from '@/types/widgetTypes'
 import { createGridStyle } from '@/utils/gridUtil'
 
 const { t } = useI18n()
 
-const { onClose: originalOnClose } = defineProps<{
+const { onClose: originalOnClose, initialCategory = 'all' } = defineProps<{
   onClose: () => void
+  initialCategory?: string
 }>()
 
 // Track session time for telemetry
@@ -423,6 +429,29 @@ onMounted(() => {
   sessionStartTime.value = Date.now()
 })
 
+const systemStatsStore = useSystemStatsStore()
+
+const distributions = computed(() => {
+  switch (__DISTRIBUTION__) {
+    case 'cloud':
+      return [TemplateIncludeOnDistributionEnum.Cloud]
+    case 'localhost':
+      return [TemplateIncludeOnDistributionEnum.Local]
+    case 'desktop':
+    default:
+      if (systemStatsStore.systemStats?.system.os === 'darwin') {
+        return [
+          TemplateIncludeOnDistributionEnum.Desktop,
+          TemplateIncludeOnDistributionEnum.Mac
+        ]
+      }
+      return [
+        TemplateIncludeOnDistributionEnum.Desktop,
+        TemplateIncludeOnDistributionEnum.Windows
+      ]
+  }
+})
+
 // Wrap onClose to track session end
 const onClose = () => {
   if (isCloud) {
@@ -511,6 +540,9 @@ const allTemplates = computed(() => {
   return workflowTemplatesStore.enhancedTemplates
 })
 
+// Navigation
+const selectedNavItem = ref<string | null>(initialCategory)
+
 // Filter templates based on selected navigation item
 const navigationFilteredTemplates = computed(() => {
   if (!selectedNavItem.value) {
@@ -520,26 +552,61 @@ const navigationFilteredTemplates = computed(() => {
   return workflowTemplatesStore.filterTemplatesByCategory(selectedNavItem.value)
 })
 
-// Template filtering
+// Template filtering with scope awareness
 const {
   searchQuery,
   selectedModels,
   selectedUseCases,
   selectedRunsOn,
   sortBy,
+  activeModels,
+  activeUseCases,
   filteredTemplates,
   availableModels,
   availableUseCases,
   availableRunsOn,
   filteredCount,
   totalCount,
-  resetFilters
-} = useTemplateFiltering(navigationFilteredTemplates)
+  resetFilters,
+  loadFuseOptions
+} = useTemplateFiltering(navigationFilteredTemplates, selectedNavItem)
+
+/**
+ * Coordinates state between the selected navigation item and the sort order to
+ * create deterministic, predictable behavior.
+ * @param source The origin of the change ('nav' or 'sort').
+ */
+const coordinateNavAndSort = (source: 'nav' | 'sort') => {
+  const isPopularNav = selectedNavItem.value === 'popular'
+  const isPopularSort = sortBy.value === 'popular'
+
+  if (source === 'nav') {
+    if (isPopularNav && !isPopularSort) {
+      // When navigating to 'Popular' category, automatically set sort to 'Popular'.
+      sortBy.value = 'popular'
+    } else if (!isPopularNav && isPopularSort) {
+      // When navigating away from 'Popular' category while sort is 'Popular', reset sort to default.
+      sortBy.value = 'default'
+    }
+  } else if (source === 'sort') {
+    // When sort is changed away from 'Popular' while in the 'Popular' category,
+    // reset the category to 'All Templates' to avoid a confusing state.
+    if (isPopularNav && !isPopularSort) {
+      selectedNavItem.value = 'all'
+    }
+  }
+}
+
+// Watch for changes from the two sources ('nav' and 'sort') and trigger the coordinator.
+watch(selectedNavItem, () => coordinateNavAndSort('nav'))
+watch(sortBy, () => coordinateNavAndSort('sort'))
 
 // Convert between string array and object array for MultiSelect component
+// Only show selected items that exist in the current scope
 const selectedModelObjects = computed({
   get() {
-    return selectedModels.value.map((model) => ({ name: model, value: model }))
+    // Only include selected models that exist in availableModels
+    return activeModels.value.map((model) => ({ name: model, value: model }))
   },
   set(value: { name: string; value: string }[]) {
     selectedModels.value = value.map((item) => item.value)
@@ -548,7 +615,7 @@ const selectedModelObjects = computed({
 
 const selectedUseCaseObjects = computed({
   get() {
-    return selectedUseCases.value.map((useCase) => ({
+    return activeUseCases.value.map((useCase) => ({
       name: useCase,
       value: useCase
     }))
@@ -578,9 +645,6 @@ const cardRefs = ref<HTMLElement[]>([])
 // Force re-render key for templates when sorting changes
 const templateListKey = ref(0)
 
-// Navigation
-const selectedNavItem = ref<string | null>('all')
-
 // Search text for model filter
 const modelSearchText = ref<string>('')
 
@@ -645,11 +709,19 @@ const runsOnFilterLabel = computed(() => {
 
 // Sort options
 const sortOptions = computed(() => [
-  { name: t('templateWorkflows.sort.newest', 'Newest'), value: 'newest' },
   {
     name: t('templateWorkflows.sort.default', 'Default'),
     value: 'default'
   },
+  {
+    name: t('templateWorkflows.sort.recommended', 'Recommended'),
+    value: 'recommended'
+  },
+  {
+    name: t('templateWorkflows.sort.popular', 'Popular'),
+    value: 'popular'
+  },
+  { name: t('templateWorkflows.sort.newest', 'Newest'), value: 'newest' },
   {
     name: t('templateWorkflows.sort.vramLowToHigh', 'VRAM Usage (Low to High)'),
     value: 'vram-low-to-high'
@@ -700,7 +772,7 @@ useIntersectionObserver(loadTrigger, () => {
 // Reset pagination when filters change
 watch(
   [
-    searchQuery,
+    filteredTemplates,
     selectedNavItem,
     sortBy,
     selectedModels,
@@ -716,7 +788,7 @@ watch(
 )
 
 // Methods
-const onLoadWorkflow = async (template: any) => {
+const onLoadWorkflow = async (template: TemplateInfo) => {
   loadingTemplate.value = template.name
   try {
     await loadWorkflowTemplate(
@@ -750,10 +822,10 @@ const pageTitle = computed(() => {
 // Initialize templates loading with useAsyncState
 const { isLoading } = useAsyncState(
   async () => {
-    // Run both operations in parallel for better performance
     await Promise.all([
       loadTemplates(),
-      workflowTemplatesStore.loadWorkflowTemplates()
+      workflowTemplatesStore.loadWorkflowTemplates(),
+      loadFuseOptions()
     ])
     return true
   },
@@ -763,23 +835,15 @@ const { isLoading } = useAsyncState(
   }
 )
 
+const isTemplateVisibleOnDistribution = (template: TemplateInfo) => {
+  return (template.includeOnDistributions?.length ?? 0) > 0
+    ? distributions.value.some((d) =>
+        template.includeOnDistributions?.includes(d)
+      )
+    : true
+}
+
 onBeforeUnmount(() => {
   cardRefs.value = [] // Release DOM refs
 })
 </script>
-
-<style>
-/* Ensure the workflow template selector dialog fits within provided dialog */
-.workflow-template-selector-dialog.base-widget-layout {
-  width: 100% !important;
-  max-width: 1400px;
-  height: 100% !important;
-  aspect-ratio: auto !important;
-}
-
-@media (min-width: 1600px) {
-  .workflow-template-selector-dialog.base-widget-layout {
-    max-width: 1600px;
-  }
-}
-</style>
diff --git a/src/components/dialog/GlobalDialog.vue b/src/components/dialog/GlobalDialog.vue
index 2074132b5b..0e8c9a016d 100644
--- a/src/components/dialog/GlobalDialog.vue
+++ b/src/components/dialog/GlobalDialog.vue
@@ -6,7 +6,7 @@
     v-model:visible="item.visible"
     class="global-dialog"
     v-bind="item.dialogComponentProps"
-    :pt="item.dialogComponentProps.pt"
+    :pt="getDialogPt(item)"
     :aria-labelledby="item.key"
   >
     <template #header>
@@ -36,24 +36,78 @@
 </template>
 
 <script setup lang="ts">
+import { merge } from 'es-toolkit/compat'
 import Dialog from 'primevue/dialog'
+import type { DialogPassThroughOptions } from 'primevue/dialog'
+import { computed } from 'vue'
 
+import { useFeatureFlags } from '@/composables/useFeatureFlags'
+import { isCloud } from '@/platform/distribution/types'
+import type { DialogComponentProps } from '@/stores/dialogStore'
 import { useDialogStore } from '@/stores/dialogStore'
 
+const { flags } = useFeatureFlags()
+const teamWorkspacesEnabled = computed(
+  () => isCloud && flags.teamWorkspacesEnabled
+)
+
 const dialogStore = useDialogStore()
+
+function getDialogPt(item: {
+  key: string
+  dialogComponentProps: DialogComponentProps
+}): DialogPassThroughOptions {
+  const isWorkspaceSettingsDialog =
+    item.key === 'global-settings' && teamWorkspacesEnabled.value
+  const basePt = item.dialogComponentProps.pt || {}
+
+  if (isWorkspaceSettingsDialog) {
+    return merge(basePt, {
+      mask: { class: 'p-8' }
+    })
+  }
+  return basePt
+}
 </script>
 
 <style>
-@reference '../../assets/css/style.css';
+.global-dialog {
+  max-width: calc(100vw - 1rem);
+}
 
 .global-dialog .p-dialog-header {
-  @apply p-2 2xl:p-[var(--p-dialog-header-padding)];
-  @apply pb-0;
+  padding: calc(var(--spacing) * 2);
+  padding-bottom: 0;
 }
 
 .global-dialog .p-dialog-content {
-  @apply p-2 2xl:p-[var(--p-dialog-content-padding)];
-  @apply pt-0;
+  padding: calc(var(--spacing) * 2);
+  padding-top: 0;
+}
+
+@media (min-width: 1536px) {
+  .global-dialog .p-dialog-header {
+    padding: var(--p-dialog-header-padding);
+    padding-bottom: 0;
+  }
+
+  .global-dialog .p-dialog-content {
+    padding: var(--p-dialog-content-padding);
+    padding-top: 0;
+  }
+}
+
+/* Workspace mode: wider settings dialog */
+.settings-dialog-workspace {
+  width: 100%;
+  max-width: 1440px;
+  height: 100%;
+}
+
+.settings-dialog-workspace .p-dialog-content {
+  width: 100%;
+  height: 100%;
+  overflow-y: auto;
 }
 
 .manager-dialog {
diff --git a/src/components/dialog/confirm/ConfirmBody.vue b/src/components/dialog/confirm/ConfirmBody.vue
index 9a1cd5980d..5c6a6e9d3d 100644
--- a/src/components/dialog/confirm/ConfirmBody.vue
+++ b/src/components/dialog/confirm/ConfirmBody.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="flex flex-col px-4 py-2 text-sm text-muted-foreground border-t border-border-default"
+    class="flex flex-col border-t border-border-default px-4 py-2 text-sm wrap-break-word text-muted-foreground"
   >
     <p v-if="promptTextReal">
       {{ promptTextReal }}
diff --git a/src/components/dialog/confirm/ConfirmFooter.vue b/src/components/dialog/confirm/ConfirmFooter.vue
index 9cdd6e37b8..da3405a8c3 100644
--- a/src/components/dialog/confirm/ConfirmFooter.vue
+++ b/src/components/dialog/confirm/ConfirmFooter.vue
@@ -1,5 +1,5 @@
 <template>
-  <section class="w-full flex gap-2 justify-end px-2 pb-2">
+  <section class="flex w-full flex-wrap justify-end gap-2 px-2 pb-2">
     <Button :disabled variant="textonly" autofocus @click="$emit('cancel')">
       {{ cancelTextX }}
     </Button>
diff --git a/src/components/dialog/confirm/ConfirmHeader.vue b/src/components/dialog/confirm/ConfirmHeader.vue
index 3c83377331..c0a85f8bc0 100644
--- a/src/components/dialog/confirm/ConfirmHeader.vue
+++ b/src/components/dialog/confirm/ConfirmHeader.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="flex items-center gap-2 p-4 font-bold text-sm text-base-foreground font-inter"
+    class="flex items-center gap-2 p-4 font-inter text-sm font-bold text-base-foreground"
   >
     <span v-if="title" class="flex-auto">{{ title }}</span>
   </div>
diff --git a/src/components/dialog/content/ConfirmationDialogContent.test.ts b/src/components/dialog/content/ConfirmationDialogContent.test.ts
new file mode 100644
index 0000000000..51d8faf7fd
--- /dev/null
+++ b/src/components/dialog/content/ConfirmationDialogContent.test.ts
@@ -0,0 +1,45 @@
+import { mount } from '@vue/test-utils'
+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 ConfirmationDialogContent from './ConfirmationDialogContent.vue'
+
+type Props = ComponentProps<typeof ConfirmationDialogContent>
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: { en: {} },
+  missingWarn: false,
+  fallbackWarn: false
+})
+
+describe('ConfirmationDialogContent', () => {
+  beforeEach(() => {
+    setActivePinia(createPinia())
+  })
+
+  function mountComponent(props: Partial<Props> = {}) {
+    return mount(ConfirmationDialogContent, {
+      global: {
+        plugins: [PrimeVue, i18n]
+      },
+      props: {
+        message: 'Test message',
+        type: 'default',
+        onConfirm: vi.fn(),
+        ...props
+      } as Props
+    })
+  }
+
+  it('renders long messages without breaking layout', () => {
+    const longFilename =
+      'workflow_checkpoint_' + 'a'.repeat(200) + '.safetensors'
+    const wrapper = mountComponent({ message: longFilename })
+    expect(wrapper.text()).toContain(longFilename)
+  })
+})
diff --git a/src/components/dialog/content/ConfirmationDialogContent.vue b/src/components/dialog/content/ConfirmationDialogContent.vue
index 5dbb6cd9e7..cc5c730142 100644
--- a/src/components/dialog/content/ConfirmationDialogContent.vue
+++ b/src/components/dialog/content/ConfirmationDialogContent.vue
@@ -1,37 +1,65 @@
 <template>
-  <section class="prompt-dialog-content m-2 mt-4 flex flex-col gap-6">
-    <span>{{ message }}</span>
-    <ul v-if="itemList?.length" class="m-0 flex flex-col gap-2 pl-4">
-      <li v-for="item of itemList" :key="item">
-        {{ item }}
-      </li>
-    </ul>
-    <Message
-      v-if="hint"
-      icon="pi pi-info-circle"
-      severity="secondary"
-      size="small"
-      variant="simple"
-    >
-      {{ hint }}
-    </Message>
-    <div class="flex justify-end gap-4">
+  <section
+    class="m-2 mt-4 flex flex-col gap-6 wrap-break-word whitespace-pre-wrap"
+  >
+    <div>
+      <span>{{ message }}</span>
+      <ul v-if="itemList?.length" class="m-0 mt-2 flex flex-col gap-2 pl-4">
+        <li v-for="item of itemList" :key="item">
+          {{ item }}
+        </li>
+      </ul>
+      <Message
+        v-if="hint"
+        class="mt-2"
+        icon="pi pi-info-circle"
+        severity="secondary"
+        size="small"
+        variant="simple"
+      >
+        {{ hint }}
+      </Message>
+    </div>
+    <div class="flex shrink-0 flex-wrap justify-end gap-4">
       <div
         v-if="type === 'overwriteBlueprint'"
-        class="flex justify-start gap-4"
+        class="flex flex-col justify-start gap-1"
       >
-        <Checkbox
-          v-model="doNotAskAgain"
-          class="flex justify-start gap-4"
-          input-id="doNotAskAgain"
-          binary
-        />
-        <label for="doNotAskAgain" severity="secondary">{{
-          t('missingModelsDialog.doNotAskAgain')
-        }}</label>
+        <div class="flex gap-4">
+          <input
+            id="doNotAskAgain"
+            v-model="doNotAskAgain"
+            type="checkbox"
+            class="size-4 cursor-pointer"
+          />
+          <label for="doNotAskAgain">{{
+            t('missingModelsDialog.doNotAskAgain')
+          }}</label>
+        </div>
+        <i18n-t
+          v-if="doNotAskAgain"
+          keypath="missingModelsDialog.reEnableInSettings"
+          tag="span"
+          class="ml-8 text-sm text-muted-foreground"
+        >
+          <template #link>
+            <Button
+              variant="textonly"
+              class="cursor-pointer p-0 text-sm text-muted-foreground underline hover:bg-transparent"
+              @click="openBlueprintOverwriteSetting"
+            >
+              {{ t('missingModelsDialog.reEnableInSettingsLink') }}
+            </Button>
+          </template>
+        </i18n-t>
       </div>
 
-      <Button variant="secondary" autofocus @click="onCancel">
+      <Button
+        v-if="type !== 'info'"
+        variant="secondary"
+        autofocus
+        @click="onCancel"
+      >
         <i class="pi pi-undo" />
         {{ $t('g.cancel') }}
       </Button>
@@ -73,6 +101,10 @@
         <i class="pi pi-eraser" />
         {{ $t('desktopMenu.reinstall') }}
       </Button>
+      <!-- Info - just show an OK button -->
+      <Button v-else-if="type === 'info'" variant="primary" @click="onCancel">
+        {{ $t('g.ok') }}
+      </Button>
       <!-- Invalid - just show a close button. -->
       <Button v-else variant="primary" @click="onCancel">
         <i class="pi pi-times" />
@@ -83,13 +115,13 @@
 </template>
 
 <script setup lang="ts">
-import Checkbox from 'primevue/checkbox'
 import Message from 'primevue/message'
 import { ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import Button from '@/components/ui/button/Button.vue'
 import { useSettingStore } from '@/platform/settings/settingStore'
+import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
 import type { ConfirmationDialogType } from '@/services/dialogService'
 import { useDialogStore } from '@/stores/dialogStore'
 
@@ -105,6 +137,11 @@ const { t } = useI18n()
 
 const onCancel = () => useDialogStore().closeDialog()
 
+function openBlueprintOverwriteSetting() {
+  useDialogStore().closeDialog()
+  useSettingsDialog().show(undefined, 'Comfy.Workflow.WarnBlueprintOverwrite')
+}
+
 const doNotAskAgain = ref(false)
 
 const onDeny = () => {
@@ -119,9 +156,3 @@ const onConfirm = () => {
   useDialogStore().closeDialog()
 }
 </script>
-
-<style lang="css" scoped>
-.prompt-dialog-content {
-  white-space: pre-wrap;
-}
-</style>
diff --git a/src/components/dialog/content/ErrorDialogContent.vue b/src/components/dialog/content/ErrorDialogContent.vue
index caac4274ca..3c03a4a26e 100644
--- a/src/components/dialog/content/ErrorDialogContent.vue
+++ b/src/components/dialog/content/ErrorDialogContent.vue
@@ -28,7 +28,9 @@
     <template v-if="reportOpen">
       <Divider />
       <ScrollPanel class="h-[400px] w-full max-w-[80vw]">
-        <pre class="break-words whitespace-pre-wrap">{{ reportContent }}</pre>
+        <pre class="wrap-break-word whitespace-pre-wrap">{{
+          reportContent
+        }}</pre>
       </ScrollPanel>
       <Divider />
     </template>
diff --git a/tests-ui/tests/components/dialog/content/MissingCoreNodesMessage.test.ts b/src/components/dialog/content/MissingCoreNodesMessage.test.ts
similarity index 100%
rename from tests-ui/tests/components/dialog/content/MissingCoreNodesMessage.test.ts
rename to src/components/dialog/content/MissingCoreNodesMessage.test.ts
diff --git a/src/components/dialog/content/MissingCoreNodesMessage.vue b/src/components/dialog/content/MissingCoreNodesMessage.vue
index 0274191af2..14f2d76786 100644
--- a/src/components/dialog/content/MissingCoreNodesMessage.vue
+++ b/src/components/dialog/content/MissingCoreNodesMessage.vue
@@ -3,7 +3,7 @@
     v-if="hasMissingCoreNodes"
     severity="info"
     icon="pi pi-info-circle"
-    class="mx-2 my-2"
+    class="m-2"
     :pt="{
       root: { class: 'flex-col' },
       text: { class: 'flex-1' }
diff --git a/src/components/dialog/content/MissingModelsContent.vue b/src/components/dialog/content/MissingModelsContent.vue
new file mode 100644
index 0000000000..701c010f0c
--- /dev/null
+++ b/src/components/dialog/content/MissingModelsContent.vue
@@ -0,0 +1,189 @@
+<template>
+  <div
+    class="flex w-full max-w-[490px] flex-col border-t border-border-default"
+  >
+    <div class="flex size-full flex-col gap-4 p-4">
+      <p class="m-0 text-sm/5 text-muted-foreground">
+        {{ $t('missingModelsDialog.description') }}
+      </p>
+
+      <div
+        class="flex scrollbar-custom max-h-[300px] flex-col overflow-y-auto rounded-lg bg-secondary-background"
+      >
+        <div
+          v-for="model in processedModels"
+          :key="model.name"
+          class="flex items-center justify-between px-3 py-2"
+        >
+          <div class="flex items-center gap-2 overflow-hidden">
+            <span
+              class="text-foreground min-w-0 truncate text-sm"
+              :title="model.name"
+            >
+              {{ model.name }}
+            </span>
+            <span
+              class="inline-flex h-4 shrink-0 items-center rounded-full bg-muted-foreground/20 px-1.5 text-xxxs font-semibold text-muted-foreground uppercase"
+            >
+              {{ model.badgeLabel }}
+            </span>
+          </div>
+          <div class="flex shrink-0 items-center gap-2">
+            <Skeleton v-if="showSkeleton(model)" class="ml-1.5 h-4 w-12" />
+            <span
+              v-else-if="model.isDownloadable && fileSizes.get(model.url)"
+              class="pl-1.5 text-xs text-muted-foreground"
+            >
+              {{ formatSize(fileSizes.get(model.url)) }}
+            </span>
+            <a
+              v-else-if="gatedModelUrls.has(model.url)"
+              :href="gatedModelUrls.get(model.url)"
+              target="_blank"
+              rel="noopener noreferrer"
+              class="text-xs text-primary hover:underline"
+            >
+              {{ $t('missingModelsDialog.acceptTerms') }}
+            </a>
+            <Button
+              v-else-if="model.isDownloadable"
+              variant="textonly"
+              size="icon"
+              :title="model.url"
+              :aria-label="$t('g.download')"
+              @click="downloadModel(model, paths)"
+            >
+              <i class="icon-[lucide--download] size-4" />
+            </Button>
+            <Button
+              v-else
+              variant="textonly"
+              size="icon"
+              :title="model.url"
+              :aria-label="$t('g.copyURL')"
+              @click="void copyToClipboard(model.url)"
+            >
+              <i class="icon-[lucide--copy] size-4" />
+            </Button>
+          </div>
+        </div>
+
+        <div
+          v-if="totalDownloadSize > 0"
+          class="sticky bottom-0 flex items-center justify-between border-t border-border-default bg-secondary-background px-3 py-2"
+        >
+          <span class="text-xs font-medium text-muted-foreground">
+            {{ $t('missingModelsDialog.totalSize') }}
+          </span>
+          <span class="text-xs text-muted-foreground">
+            {{ formatSize(totalDownloadSize) }}
+          </span>
+        </div>
+      </div>
+
+      <p class="m-0 text-xs/5 whitespace-pre-line text-muted-foreground">
+        {{ $t('missingModelsDialog.footerDescription') }}
+      </p>
+
+      <div
+        v-if="hasCustomModels"
+        class="flex gap-3 rounded-lg border border-warning-background bg-warning-background/10 p-3"
+      >
+        <i
+          class="mt-0.5 icon-[lucide--triangle-alert] size-4 shrink-0 text-warning-background"
+        />
+        <div class="flex flex-col gap-1">
+          <p class="m-0 text-xs/5 font-semibold text-warning-background">
+            {{ $t('missingModelsDialog.customModelsWarning') }}
+          </p>
+          <p class="m-0 text-xs/5 text-warning-background">
+            {{ $t('missingModelsDialog.customModelsInstruction') }}
+          </p>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, onMounted, reactive, ref } from 'vue'
+
+import Button from '@/components/ui/button/Button.vue'
+import Skeleton from '@/components/ui/skeleton/Skeleton.vue'
+import { useCopyToClipboard } from '@/composables/useCopyToClipboard'
+import { formatSize } from '@/utils/formatUtil'
+
+import type { ModelWithUrl } from './missingModelsUtils'
+import {
+  downloadModel,
+  fetchModelMetadata,
+  getBadgeLabel,
+  hasValidDirectory,
+  isModelDownloadable
+} from './missingModelsUtils'
+
+const { missingModels, paths } = defineProps<{
+  missingModels: ModelWithUrl[]
+  paths: Record<string, string[]>
+}>()
+
+interface ProcessedModel {
+  name: string
+  url: string
+  directory: string
+  badgeLabel: string
+  isDownloadable: boolean
+}
+
+const processedModels = computed<ProcessedModel[]>(() =>
+  missingModels.map((model) => ({
+    name: model.name,
+    url: model.url,
+    directory: model.directory,
+    badgeLabel: getBadgeLabel(model.directory),
+    isDownloadable:
+      hasValidDirectory(model, paths) && isModelDownloadable(model)
+  }))
+)
+
+const hasCustomModels = computed(() =>
+  processedModels.value.some((m) => !m.isDownloadable)
+)
+
+const loading = ref(true)
+const fileSizes = reactive(new Map<string, number>())
+
+const totalDownloadSize = computed(() =>
+  processedModels.value
+    .filter((model) => model.isDownloadable)
+    .reduce((total, model) => total + (fileSizes.get(model.url) ?? 0), 0)
+)
+
+const gatedModelUrls = reactive(new Map<string, string>())
+
+function showSkeleton(model: ProcessedModel): boolean {
+  return (
+    model.isDownloadable &&
+    loading.value &&
+    !fileSizes.has(model.url) &&
+    !gatedModelUrls.has(model.url)
+  )
+}
+
+onMounted(async () => {
+  const downloadableUrls = processedModels.value
+    .filter((m) => m.isDownloadable)
+    .map((m) => m.url)
+
+  await Promise.allSettled(
+    downloadableUrls.map(async (url) => {
+      const metadata = await fetchModelMetadata(url)
+      if (metadata.fileSize !== null) fileSizes.set(url, metadata.fileSize)
+      if (metadata.gatedRepoUrl) gatedModelUrls.set(url, metadata.gatedRepoUrl)
+    })
+  )
+  loading.value = false
+})
+
+const { copyToClipboard } = useCopyToClipboard()
+</script>
diff --git a/src/components/dialog/content/MissingModelsFooter.vue b/src/components/dialog/content/MissingModelsFooter.vue
new file mode 100644
index 0000000000..8481e71f6f
--- /dev/null
+++ b/src/components/dialog/content/MissingModelsFooter.vue
@@ -0,0 +1,103 @@
+<template>
+  <div class="flex w-full flex-col gap-2 px-4 py-2">
+    <div class="flex flex-col gap-1 text-sm text-muted-foreground">
+      <div class="flex items-center gap-1">
+        <input
+          id="doNotAskAgainModels"
+          v-model="doNotAskAgain"
+          type="checkbox"
+          class="size-4 cursor-pointer"
+        />
+        <label for="doNotAskAgainModels">{{
+          $t('missingModelsDialog.doNotAskAgain')
+        }}</label>
+      </div>
+      <i18n-t
+        v-if="doNotAskAgain"
+        keypath="missingModelsDialog.reEnableInSettings"
+        tag="span"
+        class="ml-6 text-sm text-muted-foreground"
+      >
+        <template #link>
+          <Button
+            variant="textonly"
+            class="cursor-pointer p-0 text-sm text-muted-foreground underline hover:bg-transparent"
+            @click="openShowMissingModelsSetting"
+          >
+            {{ $t('missingModelsDialog.reEnableInSettingsLink') }}
+          </Button>
+        </template>
+      </i18n-t>
+    </div>
+
+    <div class="flex justify-end gap-1">
+      <Button variant="secondary" size="md" @click="handleAction">
+        {{ buttonLabel }}
+      </Button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+import { useSettingStore } from '@/platform/settings/settingStore'
+import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
+import { useDialogStore } from '@/stores/dialogStore'
+
+import type { ModelWithUrl } from './missingModelsUtils'
+import {
+  downloadModel,
+  hasValidDirectory,
+  isModelDownloadable
+} from './missingModelsUtils'
+
+const { missingModels, paths } = defineProps<{
+  missingModels: ModelWithUrl[]
+  paths: Record<string, string[]>
+}>()
+
+const DIALOG_KEY = 'global-missing-models-warning'
+const { t } = useI18n()
+const dialogStore = useDialogStore()
+const doNotAskAgain = ref(false)
+
+watch(doNotAskAgain, (value) => {
+  void useSettingStore().set('Comfy.Workflow.ShowMissingModelsWarning', !value)
+})
+
+function openShowMissingModelsSetting() {
+  dialogStore.closeDialog({ key: DIALOG_KEY })
+  useSettingsDialog().show(undefined, 'Comfy.Workflow.ShowMissingModelsWarning')
+}
+
+const downloadableModels = computed(() =>
+  missingModels.filter(
+    (model) => hasValidDirectory(model, paths) && isModelDownloadable(model)
+  )
+)
+
+const hasDownloadable = computed(() => downloadableModels.value.length > 0)
+
+const hasCustom = computed(
+  () => downloadableModels.value.length < missingModels.length
+)
+
+const buttonLabel = computed(() => {
+  if (hasDownloadable.value && hasCustom.value)
+    return t('missingModelsDialog.downloadAvailable')
+  if (hasDownloadable.value) return t('missingModelsDialog.downloadAll')
+  return t('missingModelsDialog.gotIt')
+})
+
+function handleAction() {
+  if (hasDownloadable.value) {
+    for (const model of downloadableModels.value) {
+      downloadModel(model, paths)
+    }
+  }
+  dialogStore.closeDialog({ key: DIALOG_KEY })
+}
+</script>
diff --git a/src/components/dialog/content/MissingModelsHeader.vue b/src/components/dialog/content/MissingModelsHeader.vue
new file mode 100644
index 0000000000..df46375fec
--- /dev/null
+++ b/src/components/dialog/content/MissingModelsHeader.vue
@@ -0,0 +1,10 @@
+<template>
+  <div class="flex w-full items-center justify-between p-4">
+    <div class="flex items-center gap-2">
+      <i class="icon-[lucide--triangle-alert] text-warning-background"></i>
+      <p class="m-0 text-sm">
+        {{ $t('missingModelsDialog.title') }}
+      </p>
+    </div>
+  </div>
+</template>
diff --git a/src/components/dialog/content/MissingModelsWarning.vue b/src/components/dialog/content/MissingModelsWarning.vue
deleted file mode 100644
index 1b044e4d33..0000000000
--- a/src/components/dialog/content/MissingModelsWarning.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<template>
-  <NoResultsPlaceholder
-    class="pb-0"
-    icon="pi pi-exclamation-circle"
-    :title="t('missingModelsDialog.missingModels')"
-    :message="t('missingModelsDialog.missingModelsMessage')"
-  />
-  <div class="mb-4 flex gap-1">
-    <Checkbox v-model="doNotAskAgain" binary input-id="doNotAskAgain" />
-    <label for="doNotAskAgain">{{
-      t('missingModelsDialog.doNotAskAgain')
-    }}</label>
-  </div>
-  <ListBox :options="missingModels" class="comfy-missing-models">
-    <template #option="{ option }">
-      <Suspense v-if="isElectron()">
-        <ElectronFileDownload
-          :url="option.url"
-          :label="option.label"
-          :error="option.error"
-        />
-      </Suspense>
-      <FileDownload
-        v-else
-        :url="option.url"
-        :label="option.label"
-        :error="option.error"
-      />
-    </template>
-  </ListBox>
-</template>
-
-<script setup lang="ts">
-import Checkbox from 'primevue/checkbox'
-import ListBox from 'primevue/listbox'
-import { computed, onBeforeUnmount, ref } from 'vue'
-import { useI18n } from 'vue-i18n'
-
-import ElectronFileDownload from '@/components/common/ElectronFileDownload.vue'
-import FileDownload from '@/components/common/FileDownload.vue'
-import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
-import { useSettingStore } from '@/platform/settings/settingStore'
-import { isElectron } from '@/utils/envUtil'
-
-// TODO: Read this from server internal API rather than hardcoding here
-// as some installations may wish to use custom sources
-const allowedSources = [
-  'https://civitai.com/',
-  'https://huggingface.co/',
-  'http://localhost:' // Included for testing usage only
-]
-const allowedSuffixes = ['.safetensors', '.sft']
-// Models that fail above conditions but are still allowed
-const whiteListedUrls = new Set([
-  'https://huggingface.co/stabilityai/stable-zero123/resolve/main/stable_zero123.ckpt',
-  'https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_depth_sd14v1.pth?download=true',
-  'https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth'
-])
-
-interface ModelInfo {
-  name: string
-  directory: string
-  directory_invalid?: boolean
-  url: string
-  downloading?: boolean
-  completed?: boolean
-  progress?: number
-  error?: string
-  folder_path?: string
-}
-
-const props = defineProps<{
-  missingModels: ModelInfo[]
-  paths: Record<string, string[]>
-}>()
-
-const { t } = useI18n()
-
-const doNotAskAgain = ref(false)
-
-const modelDownloads = ref<Record<string, ModelInfo>>({})
-const missingModels = computed(() => {
-  return props.missingModels.map((model) => {
-    const paths = props.paths[model.directory]
-    if (model.directory_invalid || !paths) {
-      return {
-        label: `${model.directory} / ${model.name}`,
-        url: model.url,
-        error: 'Invalid directory specified (does this require custom nodes?)'
-      }
-    }
-    const downloadInfo: ModelInfo = modelDownloads.value[model.name] ?? {
-      downloading: false,
-      completed: false,
-      progress: 0,
-      error: null,
-      name: model.name,
-      directory: model.directory,
-      url: model.url,
-      folder_path: paths[0]
-    }
-    modelDownloads.value[model.name] = downloadInfo
-    if (!whiteListedUrls.has(model.url)) {
-      if (!allowedSources.some((source) => model.url.startsWith(source))) {
-        return {
-          label: `${model.directory} / ${model.name}`,
-          url: model.url,
-          error: `Download not allowed from source '${model.url}', only allowed from '${allowedSources.join("', '")}'`
-        }
-      }
-      if (!allowedSuffixes.some((suffix) => model.name.endsWith(suffix))) {
-        return {
-          label: `${model.directory} / ${model.name}`,
-          url: model.url,
-          error: `Only allowed suffixes are: '${allowedSuffixes.join("', '")}'`
-        }
-      }
-    }
-    return {
-      url: model.url,
-      label: `${model.directory} / ${model.name}`,
-      downloading: downloadInfo.downloading,
-      completed: downloadInfo.completed,
-      progress: downloadInfo.progress,
-      error: downloadInfo.error,
-      name: model.name,
-      paths: paths,
-      folderPath: downloadInfo.folder_path
-    }
-  })
-})
-
-onBeforeUnmount(async () => {
-  if (doNotAskAgain.value) {
-    await useSettingStore().set(
-      'Comfy.Workflow.ShowMissingModelsWarning',
-      false
-    )
-  }
-})
-</script>
-
-<style scoped>
-.comfy-missing-models {
-  max-height: 300px;
-  overflow-y: auto;
-}
-</style>
diff --git a/src/components/dialog/content/MissingNodesContent.vue b/src/components/dialog/content/MissingNodesContent.vue
index 7c3a35b248..c5a4f17990 100644
--- a/src/components/dialog/content/MissingNodesContent.vue
+++ b/src/components/dialog/content/MissingNodesContent.vue
@@ -1,12 +1,13 @@
 <template>
   <div
-    class="flex w-[490px] flex-col border-t-1 border-border-default"
-    :class="isCloud ? 'border-b-1' : ''"
+    data-testid="missing-nodes-warning"
+    class="comfy-missing-nodes flex w-[490px] flex-col border-t border-border-default"
+    :class="isCloud ? 'border-b' : ''"
   >
-    <div class="flex h-full w-full flex-col gap-4 p-4">
+    <div class="flex size-full flex-col gap-4 p-4">
       <!-- Description -->
       <div>
-        <p class="m-0 text-sm leading-4 text-muted-foreground">
+        <p class="m-0 text-sm/5 text-muted-foreground">
           {{
             isCloud
               ? $t('missingNodes.cloud.description')
@@ -14,32 +15,210 @@
           }}
         </p>
       </div>
+
       <MissingCoreNodesMessage v-if="!isCloud" :missing-core-nodes />
 
-      <!-- Missing Nodes List Wrapper -->
-      <div
-        class="comfy-missing-nodes flex flex-col max-h-[256px] rounded-lg py-2 scrollbar-custom bg-secondary-background"
-      >
+      <!-- QUICK FIX AVAILABLE Section -->
+      <div v-if="replaceableNodes.length > 0" class="flex flex-col gap-2">
+        <!-- Section header with Replace button -->
+        <div class="flex items-center justify-between">
+          <div class="flex items-center gap-2">
+            <span class="text-xs font-semibold text-primary uppercase">
+              {{ $t('nodeReplacement.quickFixAvailable') }}
+            </span>
+            <div class="size-2 rounded-full bg-primary" />
+          </div>
+          <Button
+            v-tooltip.top="$t('nodeReplacement.replaceWarning')"
+            variant="primary"
+            size="md"
+            :disabled="selectedTypes.size === 0"
+            @click="handleReplaceSelected"
+          >
+            <i class="mr-1.5 icon-[lucide--refresh-cw] size-4" />
+            {{
+              $t('nodeReplacement.replaceSelected', {
+                count: selectedTypes.size
+              })
+            }}
+          </Button>
+        </div>
+
+        <!-- Replaceable nodes list -->
         <div
-          v-for="(node, i) in uniqueNodes"
-          :key="i"
-          class="flex min-h-8 items-center justify-between px-4 py-2 bg-secondary-background text-muted-foreground"
+          class="flex scrollbar-custom max-h-[200px] flex-col overflow-y-auto rounded-lg bg-secondary-background"
         >
-          <span class="text-xs">
-            {{ node.label }}
-          </span>
-          <span v-if="node.hint" class="text-xs">{{ node.hint }}</span>
+          <!-- Select All row (sticky header) -->
+          <div
+            :class="
+              cn(
+                'sticky top-0 z-10 flex items-center gap-3 border-b border-border-default bg-secondary-background px-3 py-2',
+                pendingNodes.length > 0
+                  ? 'cursor-pointer hover:bg-secondary-background-hover'
+                  : 'pointer-events-none opacity-50'
+              )
+            "
+            tabindex="0"
+            role="checkbox"
+            :aria-checked="
+              isAllSelected ? 'true' : isSomeSelected ? 'mixed' : 'false'
+            "
+            @click="toggleSelectAll"
+            @keydown.enter.prevent="toggleSelectAll"
+            @keydown.space.prevent="toggleSelectAll"
+          >
+            <div
+              class="flex size-4 shrink-0 items-center justify-center rounded-sm p-0.5 transition-all duration-200"
+              :class="
+                isAllSelected || isSomeSelected
+                  ? 'bg-primary-background'
+                  : 'bg-secondary-background'
+              "
+            >
+              <i
+                v-if="isAllSelected"
+                class="text-bold icon-[lucide--check] text-xs text-base-foreground"
+              />
+              <i
+                v-else-if="isSomeSelected"
+                class="text-bold icon-[lucide--minus] text-xs text-base-foreground"
+              />
+            </div>
+            <span class="text-xs font-medium text-muted-foreground uppercase">
+              {{ $t('nodeReplacement.compatibleAlternatives') }}
+            </span>
+          </div>
+
+          <!-- Replaceable node items -->
+          <div
+            v-for="node in replaceableNodes"
+            :key="node.label"
+            :class="
+              cn(
+                'flex items-center gap-3 px-3 py-2',
+                replacedTypes.has(node.label)
+                  ? 'pointer-events-none opacity-50'
+                  : 'cursor-pointer hover:bg-secondary-background-hover'
+              )
+            "
+            tabindex="0"
+            role="checkbox"
+            :aria-checked="
+              replacedTypes.has(node.label) || selectedTypes.has(node.label)
+                ? 'true'
+                : 'false'
+            "
+            @click="toggleNode(node.label)"
+            @keydown.enter.prevent="toggleNode(node.label)"
+            @keydown.space.prevent="toggleNode(node.label)"
+          >
+            <div
+              class="flex size-4 shrink-0 items-center justify-center rounded-sm p-0.5 transition-all duration-200"
+              :class="
+                replacedTypes.has(node.label) || selectedTypes.has(node.label)
+                  ? 'bg-primary-background'
+                  : 'bg-secondary-background'
+              "
+            >
+              <i
+                v-if="
+                  replacedTypes.has(node.label) || selectedTypes.has(node.label)
+                "
+                class="text-bold icon-[lucide--check] text-xs text-base-foreground"
+              />
+            </div>
+            <div class="flex flex-col gap-0.5">
+              <div class="flex items-center gap-2">
+                <span
+                  v-if="replacedTypes.has(node.label)"
+                  class="border-success bg-success/10 text-success inline-flex h-4 items-center rounded-full border px-1.5 text-xxxs font-semibold uppercase"
+                >
+                  {{ $t('nodeReplacement.replaced') }}
+                </span>
+                <span
+                  v-else
+                  class="inline-flex h-4 items-center rounded-full border border-primary bg-primary/10 px-1.5 text-xxxs font-semibold text-primary uppercase"
+                >
+                  {{ $t('nodeReplacement.replaceable') }}
+                </span>
+                <span class="text-foreground text-sm">
+                  {{ node.label }}
+                </span>
+              </div>
+              <span class="text-xs text-muted-foreground">
+                {{ node.replacement?.new_node_id ?? node.hint ?? '' }}
+              </span>
+            </div>
+          </div>
         </div>
       </div>
 
-      <!-- Bottom instruction -->
-      <div>
-        <p class="m-0 text-sm leading-4 text-muted-foreground">
-          {{
-            isCloud
-              ? $t('missingNodes.cloud.replacementInstruction')
-              : $t('missingNodes.oss.replacementInstruction')
-          }}
+      <!-- MANUAL INSTALLATION REQUIRED Section -->
+      <div
+        v-if="nonReplaceableNodes.length > 0"
+        class="flex max-h-[200px] flex-col gap-2"
+      >
+        <!-- Section header -->
+        <div class="flex items-center gap-2">
+          <span class="text-xs font-semibold text-error uppercase">
+            {{ $t('nodeReplacement.installationRequired') }}
+          </span>
+          <i class="icon-[lucide--info] text-xs text-error" />
+        </div>
+
+        <!-- Non-replaceable nodes list -->
+        <div
+          class="flex scrollbar-custom flex-col overflow-y-auto rounded-lg bg-secondary-background"
+        >
+          <div
+            v-for="node in nonReplaceableNodes"
+            :key="node.label"
+            class="flex items-center justify-between px-4 py-3"
+          >
+            <div class="flex items-center gap-3">
+              <div class="flex flex-col gap-0.5">
+                <div class="flex items-center gap-2">
+                  <span
+                    class="inline-flex h-4 items-center rounded-full border border-error bg-error/10 px-1.5 text-xxxs font-semibold text-error uppercase"
+                  >
+                    {{ $t('nodeReplacement.notReplaceable') }}
+                  </span>
+                  <span class="text-foreground text-sm">
+                    {{ node.label }}
+                  </span>
+                </div>
+                <span v-if="node.hint" class="text-xs text-muted-foreground">
+                  {{ node.hint }}
+                </span>
+              </div>
+            </div>
+            <Button
+              v-if="node.action"
+              variant="destructive-textonly"
+              size="sm"
+              @click="node.action.callback"
+            >
+              {{ node.action.text }}
+            </Button>
+          </div>
+        </div>
+      </div>
+
+      <!-- Bottom instruction box -->
+      <div
+        class="flex gap-3 rounded-lg border border-warning-background bg-warning-background/10 p-3"
+      >
+        <i
+          class="mt-0.5 icon-[lucide--triangle-alert] size-4 shrink-0 text-warning-background"
+        />
+        <p class="text-neutral-foreground m-0 text-xs/5">
+          <i18n-t keypath="nodeReplacement.instructionMessage">
+            <template #red>
+              <span class="text-error">{{
+                $t('nodeReplacement.redHighlight')
+              }}</span>
+            </template>
+          </i18n-t>
         </p>
       </div>
     </div>
@@ -47,23 +226,41 @@
 </template>
 
 <script setup lang="ts">
-import { computed } from 'vue'
+import { computed, ref } from 'vue'
 
 import MissingCoreNodesMessage from '@/components/dialog/content/MissingCoreNodesMessage.vue'
+import Button from '@/components/ui/button/Button.vue'
 import { isCloud } from '@/platform/distribution/types'
+import type { NodeReplacement } from '@/platform/nodeReplacement/types'
+import { useNodeReplacement } from '@/platform/nodeReplacement/useNodeReplacement'
+import { useDialogStore } from '@/stores/dialogStore'
+import { useExecutionErrorStore } from '@/stores/executionErrorStore'
 import type { MissingNodeType } from '@/types/comfy'
+import { cn } from '@/utils/tailwindUtil'
 import { useMissingNodes } from '@/workbench/extensions/manager/composables/nodePack/useMissingNodes'
 
-const props = defineProps<{
+const { missingNodeTypes } = defineProps<{
   missingNodeTypes: MissingNodeType[]
 }>()
 
-// Get missing core nodes for OSS mode
 const { missingCoreNodes } = useMissingNodes()
+const { replaceNodesInPlace } = useNodeReplacement()
+const dialogStore = useDialogStore()
+const executionErrorStore = useExecutionErrorStore()
 
-const uniqueNodes = computed(() => {
-  const seenTypes = new Set()
-  return props.missingNodeTypes
+interface ProcessedNode {
+  label: string
+  hint?: string
+  action?: { text: string; callback: () => void }
+  isReplaceable: boolean
+  replacement?: NodeReplacement
+}
+
+const replacedTypes = ref<Set<string>>(new Set())
+
+const uniqueNodes = computed<ProcessedNode[]>(() => {
+  const seenTypes = new Set<string>()
+  return missingNodeTypes
     .filter((node) => {
       const type = typeof node === 'object' ? node.type : node
       if (seenTypes.has(type)) return false
@@ -75,10 +272,89 @@ const uniqueNodes = computed(() => {
         return {
           label: node.type,
           hint: node.hint,
-          action: node.action
+          action: node.action,
+          isReplaceable: node.isReplaceable ?? false,
+          replacement: node.replacement
         }
       }
-      return { label: node }
+      return { label: node, isReplaceable: false }
     })
 })
+
+const replaceableNodes = computed(() =>
+  uniqueNodes.value.filter((n) => n.isReplaceable)
+)
+
+const pendingNodes = computed(() =>
+  replaceableNodes.value.filter((n) => !replacedTypes.value.has(n.label))
+)
+
+const nonReplaceableNodes = computed(() =>
+  uniqueNodes.value.filter((n) => !n.isReplaceable)
+)
+
+// Selection state - all pending nodes selected by default
+const selectedTypes = ref(new Set(pendingNodes.value.map((n) => n.label)))
+
+const isAllSelected = computed(
+  () =>
+    pendingNodes.value.length > 0 &&
+    pendingNodes.value.every((n) => selectedTypes.value.has(n.label))
+)
+
+const isSomeSelected = computed(
+  () => selectedTypes.value.size > 0 && !isAllSelected.value
+)
+
+function toggleNode(label: string) {
+  if (replacedTypes.value.has(label)) return
+  const next = new Set(selectedTypes.value)
+  if (next.has(label)) {
+    next.delete(label)
+  } else {
+    next.add(label)
+  }
+  selectedTypes.value = next
+}
+
+function toggleSelectAll() {
+  if (isAllSelected.value) {
+    selectedTypes.value = new Set()
+  } else {
+    selectedTypes.value = new Set(pendingNodes.value.map((n) => n.label))
+  }
+}
+
+function handleReplaceSelected() {
+  const selected = missingNodeTypes.filter((node) => {
+    const type = typeof node === 'object' ? node.type : node
+    return selectedTypes.value.has(type)
+  })
+
+  const result = replaceNodesInPlace(selected)
+  const nextReplaced = new Set(replacedTypes.value)
+  const nextSelected = new Set(selectedTypes.value)
+  for (const type of result) {
+    nextReplaced.add(type)
+    nextSelected.delete(type)
+  }
+  replacedTypes.value = nextReplaced
+  selectedTypes.value = nextSelected
+
+  // replaceNodesInPlace() handles canvas rendering via onNodeAdded(),
+  // but the modal only updates its own local UI state above.
+  // Without this call the Errors Tab would still list the replaced nodes
+  // as missing because executionErrorStore is not aware of the replacement.
+  if (result.length > 0) {
+    executionErrorStore.removeMissingNodesByType(result)
+  }
+
+  // Auto-close when all replaceable nodes replaced and no non-replaceable remain
+  const allReplaced = replaceableNodes.value.every((n) =>
+    nextReplaced.has(n.label)
+  )
+  if (allReplaced && nonReplaceableNodes.value.length === 0) {
+    dialogStore.closeDialog({ key: 'global-missing-nodes' })
+  }
+}
 </script>
diff --git a/src/components/dialog/content/MissingNodesFooter.vue b/src/components/dialog/content/MissingNodesFooter.vue
index 3638e5ee44..d9a144e3d0 100644
--- a/src/components/dialog/content/MissingNodesFooter.vue
+++ b/src/components/dialog/content/MissingNodesFooter.vue
@@ -1,72 +1,135 @@
 <template>
-  <!-- Cloud mode: Learn More + Got It buttons -->
-  <div
-    v-if="isCloud"
-    class="flex w-full items-center justify-between gap-2 py-2 px-4"
-  >
-    <Button
-      variant="textonly"
-      size="sm"
-      as="a"
-      href="https://www.comfy.org/cloud"
-      target="_blank"
-      rel="noopener noreferrer"
-    >
-      <i class="icon-[lucide--info]"></i>
-      <span>{{ $t('missingNodes.cloud.learnMore') }}</span>
-    </Button>
-    <Button variant="secondary" size="md" @click="handleGotItClick">{{
-      $t('missingNodes.cloud.gotIt')
-    }}</Button>
-  </div>
+  <div class="flex w-full flex-col gap-2 px-4 py-2">
+    <div class="flex flex-col gap-1 text-sm text-muted-foreground">
+      <div class="flex items-center gap-1">
+        <input
+          id="doNotAskAgainNodes"
+          v-model="doNotAskAgain"
+          type="checkbox"
+          class="size-4 cursor-pointer"
+        />
+        <label for="doNotAskAgainNodes">{{
+          $t('missingModelsDialog.doNotAskAgain')
+        }}</label>
+      </div>
+      <i18n-t
+        v-if="doNotAskAgain"
+        keypath="missingModelsDialog.reEnableInSettings"
+        tag="span"
+        class="ml-6 text-sm text-muted-foreground"
+      >
+        <template #link>
+          <Button
+            variant="textonly"
+            class="cursor-pointer p-0 text-sm text-muted-foreground underline hover:bg-transparent"
+            @click="openShowMissingNodesSetting"
+          >
+            {{ $t('missingModelsDialog.reEnableInSettingsLink') }}
+          </Button>
+        </template>
+      </i18n-t>
+    </div>
 
-  <!-- OSS mode: Open Manager + Install All buttons -->
-  <div v-else-if="showManagerButtons" class="flex justify-end gap-1 py-2 px-4">
-    <Button variant="textonly" size="sm" @click="openManager">{{
-      $t('g.openManager')
-    }}</Button>
-    <PackInstallButton
-      v-if="showInstallAllButton"
-      type="secondary"
-      size="md"
-      :disabled="
-        isLoading || !!error || missingNodePacks.length === 0 || isInstalling
-      "
-      :is-loading="isLoading"
-      :node-packs="missingNodePacks"
-      :label="
-        isLoading
-          ? $t('manager.gettingInfo')
-          : $t('manager.installAllMissingNodes')
-      "
-    />
+    <!-- All nodes replaceable: Skip button (cloud + OSS) -->
+    <div v-if="!hasNonReplaceableNodes" class="flex justify-end gap-1">
+      <Button variant="secondary" size="md" @click="handleGotItClick">
+        {{ $t('nodeReplacement.skipForNow') }}
+      </Button>
+    </div>
+
+    <!-- Cloud mode: Learn More + Got It buttons -->
+    <div
+      v-else-if="isCloud"
+      class="flex w-full items-center justify-between gap-2"
+    >
+      <Button
+        variant="textonly"
+        size="sm"
+        as="a"
+        href="https://www.comfy.org/cloud"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        <i class="icon-[lucide--info]"></i>
+        <span>{{ $t('missingNodes.cloud.learnMore') }}</span>
+      </Button>
+      <Button variant="secondary" size="md" @click="handleGotItClick">{{
+        $t('missingNodes.cloud.gotIt')
+      }}</Button>
+    </div>
+
+    <!-- OSS mode: Manager buttons -->
+    <div v-else-if="showManagerButtons" class="flex justify-end gap-1">
+      <Button variant="textonly" @click="handleOpenManager">{{
+        $t('g.openManager')
+      }}</Button>
+      <PackInstallButton
+        v-if="showInstallAllButton"
+        type="secondary"
+        size="md"
+        :disabled="
+          isLoading || !!error || missingNodePacks.length === 0 || isInstalling
+        "
+        :is-loading="isLoading"
+        :node-packs="missingNodePacks"
+        :label="
+          isLoading
+            ? $t('manager.gettingInfo')
+            : $t('manager.installAllMissingNodes')
+        "
+      />
+    </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { computed, nextTick, watch } from 'vue'
+import { computed, nextTick, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import Button from '@/components/ui/button/Button.vue'
 import { isCloud } from '@/platform/distribution/types'
+import { useSettingStore } from '@/platform/settings/settingStore'
 import { useToastStore } from '@/platform/updates/common/toastStore'
+import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
 import { useDialogStore } from '@/stores/dialogStore'
+import type { MissingNodeType } from '@/types/comfy'
 import PackInstallButton from '@/workbench/extensions/manager/components/manager/button/PackInstallButton.vue'
 import { useMissingNodes } from '@/workbench/extensions/manager/composables/nodePack/useMissingNodes'
 import { useManagerState } from '@/workbench/extensions/manager/composables/useManagerState'
 import { useComfyManagerStore } from '@/workbench/extensions/manager/stores/comfyManagerStore'
 import { ManagerTab } from '@/workbench/extensions/manager/types/comfyManagerTypes'
 
+const { missingNodeTypes } = defineProps<{
+  missingNodeTypes?: MissingNodeType[]
+}>()
+
 const dialogStore = useDialogStore()
 const { t } = useI18n()
 
+const doNotAskAgain = ref(false)
+
+watch(doNotAskAgain, (value) => {
+  void useSettingStore().set('Comfy.Workflow.ShowMissingNodesWarning', !value)
+})
+
 const handleGotItClick = () => {
   dialogStore.closeDialog({ key: 'global-missing-nodes' })
 }
 
+function openShowMissingNodesSetting() {
+  dialogStore.closeDialog({ key: 'global-missing-nodes' })
+  useSettingsDialog().show(undefined, 'Comfy.Workflow.ShowMissingNodesWarning')
+}
+
 const { missingNodePacks, isLoading, error } = useMissingNodes()
 const comfyManagerStore = useComfyManagerStore()
 const managerState = useManagerState()
+function handleOpenManager() {
+  managerState.openManager({
+    initialTab: ManagerTab.Missing,
+    showToastOnLegacyError: true
+  })
+}
 
 // Check if any of the missing packs are currently being installed
 const isInstalling = computed(() => {
@@ -86,15 +149,29 @@ const showInstallAllButton = computed(() => {
   return managerState.shouldShowInstallButton.value
 })
 
-const openManager = async () => {
-  await managerState.openManager({
-    initialTab: ManagerTab.Missing,
-    showToastOnLegacyError: true
-  })
-}
+const hasNonReplaceableNodes = computed(
+  () =>
+    missingNodeTypes?.some(
+      (n) =>
+        typeof n === 'string' || (typeof n === 'object' && !n.isReplaceable)
+    ) ?? false
+)
 
-// Computed to check if all missing nodes have been installed
+// Track whether missingNodePacks was ever non-empty (i.e. there were packs to install)
+const hadMissingPacks = ref(false)
+
+watch(
+  missingNodePacks,
+  (packs) => {
+    if (packs && packs.length > 0) hadMissingPacks.value = true
+  },
+  { immediate: true }
+)
+
+// Only consider "all installed" when packs transitioned from non-empty to empty
+// (actual installation happened). Replaceable-only case is handled by Content auto-close.
 const allMissingNodesInstalled = computed(() => {
+  if (!hadMissingPacks.value) return false
   return (
     !isLoading.value &&
     !isInstalling.value &&
diff --git a/src/components/dialog/content/MissingNodesHeader.vue b/src/components/dialog/content/MissingNodesHeader.vue
index 4dd483fd09..1e150c3d3c 100644
--- a/src/components/dialog/content/MissingNodesHeader.vue
+++ b/src/components/dialog/content/MissingNodesHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex w-full items-center justify-between p-4">
     <div class="flex items-center gap-2">
-      <i class="icon-[lucide--triangle-alert] text-gold-600"></i>
+      <i class="icon-[lucide--triangle-alert] text-warning-background"></i>
       <p class="m-0 text-sm">
         {{
           isCloud
diff --git a/src/components/dialog/content/SignInContent.vue b/src/components/dialog/content/SignInContent.vue
index bc4f8e7e00..14258b8f0c 100644
--- a/src/components/dialog/content/SignInContent.vue
+++ b/src/components/dialog/content/SignInContent.vue
@@ -8,7 +8,7 @@
     <template v-else>
       <!-- Header -->
       <div class="mb-8 flex flex-col gap-4">
-        <h1 class="my-0 text-2xl leading-normal font-medium">
+        <h1 class="my-0 text-2xl/normal font-medium">
           {{ isSignIn ? t('auth.login.title') : t('auth.signup.title') }}
         </h1>
         <p class="my-0 text-base">
@@ -85,7 +85,7 @@
         >
           <img
             src="/assets/images/comfy-logo-mono.svg"
-            class="mr-2 h-5 w-5"
+            class="mr-2 size-5"
             :alt="$t('g.comfy')"
           />
           {{ t('auth.login.useApiKey') }}
diff --git a/src/components/dialog/content/TopUpCreditsDialogContent.vue b/src/components/dialog/content/TopUpCreditsDialogContent.vue
deleted file mode 100644
index 6985aa7ad9..0000000000
--- a/src/components/dialog/content/TopUpCreditsDialogContent.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-<template>
-  <div class="flex w-112 flex-col gap-8 p-8">
-    <!-- Header -->
-    <div class="flex flex-col gap-4">
-      <h1 class="text-2xl font-semibold text-base-foreground m-0">
-        {{
-          isInsufficientCredits
-            ? $t('credits.topUp.addMoreCreditsToRun')
-            : $t('credits.topUp.addMoreCredits')
-        }}
-      </h1>
-      <div v-if="isInsufficientCredits" class="flex flex-col gap-2">
-        <p class="text-sm text-muted-foreground m-0 w-96">
-          {{ $t('credits.topUp.insufficientWorkflowMessage') }}
-        </p>
-      </div>
-      <div v-else class="flex flex-col gap-2">
-        <p class="text-sm text-muted-foreground m-0">
-          {{ $t('credits.topUp.creditsDescription') }}
-        </p>
-      </div>
-    </div>
-
-    <!-- Current Balance Section -->
-    <div class="flex flex-col gap-4">
-      <div class="flex items-baseline gap-2">
-        <UserCredit text-class="text-3xl font-bold" show-credits-only />
-        <span class="text-sm text-muted-foreground">{{
-          $t('credits.creditsAvailable')
-        }}</span>
-      </div>
-      <div v-if="formattedRenewalDate" class="text-sm text-muted-foreground">
-        {{ $t('credits.refreshes', { date: formattedRenewalDate }) }}
-      </div>
-    </div>
-
-    <!-- Credit Options Section -->
-    <div class="flex flex-col gap-4">
-      <span class="text-sm text-muted-foreground">
-        {{ $t('credits.topUp.howManyCredits') }}
-      </span>
-      <div class="flex flex-col gap-2">
-        <CreditTopUpOption
-          v-for="option in creditOptions"
-          :key="option.credits"
-          :credits="option.credits"
-          :description="option.description"
-          :selected="selectedCredits === option.credits"
-          @select="selectedCredits = option.credits"
-        />
-      </div>
-      <div class="text-xs text-muted-foreground w-96">
-        {{ $t('credits.topUp.templateNote') }}
-      </div>
-    </div>
-
-    <!-- Buy Button -->
-    <Button
-      :disabled="!selectedCredits || loading"
-      :loading="loading"
-      variant="primary"
-      :class="cn('w-full', (!selectedCredits || loading) && 'opacity-30')"
-      @click="handleBuy"
-    >
-      {{ $t('credits.topUp.buy') }}
-    </Button>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { useToast } from 'primevue/usetoast'
-import { ref } from 'vue'
-import { useI18n } from 'vue-i18n'
-
-import { creditsToUsd } from '@/base/credits/comfyCredits'
-import UserCredit from '@/components/common/UserCredit.vue'
-import Button from '@/components/ui/button/Button.vue'
-import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
-import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
-import { useTelemetry } from '@/platform/telemetry'
-import { cn } from '@/utils/tailwindUtil'
-
-import CreditTopUpOption from './credit/CreditTopUpOption.vue'
-
-interface CreditOption {
-  credits: number
-  description: string
-}
-
-const { isInsufficientCredits = false } = defineProps<{
-  isInsufficientCredits?: boolean
-}>()
-
-const { formattedRenewalDate } = useSubscription()
-
-const { t } = useI18n()
-const authActions = useFirebaseAuthActions()
-const telemetry = useTelemetry()
-const toast = useToast()
-
-const selectedCredits = ref<number | null>(null)
-const loading = ref(false)
-
-const creditOptions: CreditOption[] = [
-  {
-    credits: 1055, // $5.00
-    description: t('credits.topUp.videosEstimate', { count: 41 })
-  },
-  {
-    credits: 2110, // $10.00
-    description: t('credits.topUp.videosEstimate', { count: 82 })
-  },
-  {
-    credits: 4220, // $20.00
-    description: t('credits.topUp.videosEstimate', { count: 184 })
-  },
-  {
-    credits: 10550, // $50.00
-    description: t('credits.topUp.videosEstimate', { count: 412 })
-  }
-]
-
-const handleBuy = async () => {
-  if (!selectedCredits.value) return
-
-  loading.value = true
-  try {
-    const usdAmount = creditsToUsd(selectedCredits.value)
-    telemetry?.trackApiCreditTopupButtonPurchaseClicked(usdAmount)
-    await authActions.purchaseCredits(usdAmount)
-  } catch (error) {
-    console.error('Purchase failed:', error)
-
-    const errorMessage =
-      error instanceof Error ? error.message : t('credits.topUp.unknownError')
-    toast.add({
-      severity: 'error',
-      summary: t('credits.topUp.purchaseError'),
-      detail: t('credits.topUp.purchaseErrorDetail', { error: errorMessage }),
-      life: 5000
-    })
-  } finally {
-    loading.value = false
-  }
-}
-</script>
diff --git a/src/components/dialog/content/TopUpCreditsDialogContentLegacy.vue b/src/components/dialog/content/TopUpCreditsDialogContentLegacy.vue
new file mode 100644
index 0000000000..1035979597
--- /dev/null
+++ b/src/components/dialog/content/TopUpCreditsDialogContentLegacy.vue
@@ -0,0 +1,285 @@
+<template>
+  <div
+    class="flex min-w-[460px] flex-col rounded-2xl border border-border-default bg-base-background shadow-[1px_1px_8px_0_rgba(0,0,0,0.4)]"
+  >
+    <!-- Header -->
+    <div class="flex items-center justify-between p-8">
+      <h2 class="m-0 text-lg font-bold text-base-foreground">
+        {{
+          isInsufficientCredits
+            ? $t('credits.topUp.addMoreCreditsToRun')
+            : $t('credits.topUp.addMoreCredits')
+        }}
+      </h2>
+      <button
+        class="focus-visible:ring-secondary-foreground cursor-pointer rounded-sm border-none bg-transparent p-0 text-muted-foreground transition-colors hover:text-base-foreground focus-visible:ring-1 focus-visible:outline-none"
+        @click="() => handleClose()"
+      >
+        <i class="icon-[lucide--x] size-6" />
+      </button>
+    </div>
+    <p
+      v-if="isInsufficientCredits"
+      class="m-0 px-8 text-sm text-muted-foreground"
+    >
+      {{ $t('credits.topUp.insufficientWorkflowMessage') }}
+    </p>
+
+    <!-- Preset amount buttons -->
+    <div class="px-8">
+      <h3 class="m-0 text-sm font-normal text-muted-foreground">
+        {{ $t('credits.topUp.selectAmount') }}
+      </h3>
+      <div class="flex gap-2 pt-3">
+        <Button
+          v-for="amount in PRESET_AMOUNTS"
+          :key="amount"
+          :autofocus="amount === 50"
+          variant="secondary"
+          size="lg"
+          :class="
+            cn(
+              'focus-visible:ring-secondary-foreground h-10 w-full text-base font-medium',
+              selectedPreset === amount && 'bg-secondary-background-selected'
+            )
+          "
+          @click="handlePresetClick(amount)"
+        >
+          ${{ amount }}
+        </Button>
+      </div>
+    </div>
+    <!-- Amount (USD) / Credits -->
+    <div class="flex gap-2 px-8 pt-8">
+      <!-- You Pay -->
+      <div class="flex flex-1 flex-col gap-3">
+        <div class="text-sm text-muted-foreground">
+          {{ $t('credits.topUp.youPay') }}
+        </div>
+        <FormattedNumberStepper
+          :model-value="payAmount"
+          :min="0"
+          :max="MAX_AMOUNT"
+          :step="getStepAmount"
+          @update:model-value="handlePayAmountChange"
+          @max-reached="showCeilingWarning = true"
+        >
+          <template #prefix>
+            <span class="shrink-0 text-base font-semibold text-base-foreground"
+              >$</span
+            >
+          </template>
+        </FormattedNumberStepper>
+      </div>
+
+      <!-- You Get -->
+      <div class="flex flex-1 flex-col gap-3">
+        <div class="text-sm text-muted-foreground">
+          {{ $t('credits.topUp.youGet') }}
+        </div>
+        <FormattedNumberStepper
+          v-model="creditsModel"
+          :min="0"
+          :max="usdToCredits(MAX_AMOUNT)"
+          :step="getCreditsStepAmount"
+          @max-reached="showCeilingWarning = true"
+        >
+          <template #prefix>
+            <i class="icon-[lucide--component] size-4 shrink-0 text-gold-500" />
+          </template>
+        </FormattedNumberStepper>
+      </div>
+    </div>
+
+    <!-- Warnings -->
+
+    <p
+      v-if="isBelowMin"
+      class="m-0 flex items-center justify-center gap-1 px-8 pt-4 text-center text-sm text-red-500"
+    >
+      <i class="icon-[lucide--component] size-4" />
+      {{
+        $t('credits.topUp.minRequired', {
+          credits: formatNumber(usdToCredits(MIN_AMOUNT))
+        })
+      }}
+    </p>
+    <p
+      v-if="showCeilingWarning"
+      class="m-0 flex items-center justify-center gap-1 px-8 pt-4 text-center text-sm text-gold-500"
+    >
+      <i class="icon-[lucide--component] size-4" />
+      {{
+        $t('credits.topUp.maxAllowed', {
+          credits: formatNumber(usdToCredits(MAX_AMOUNT))
+        })
+      }}
+      <span>{{ $t('credits.topUp.needMore') }}</span>
+      <a
+        href="https://www.comfy.org/cloud/enterprise"
+        target="_blank"
+        class="ml-1 text-inherit"
+        >{{ $t('credits.topUp.contactUs') }}</a
+      >
+    </p>
+
+    <div class="flex flex-col gap-8 p-8">
+      <Button
+        :disabled="!isValidAmount || loading"
+        :loading="loading"
+        variant="primary"
+        size="lg"
+        class="h-10 justify-center"
+        @click="handleBuy"
+      >
+        {{ $t('credits.topUp.buyCredits') }}
+      </Button>
+      <div class="flex items-center justify-center gap-1">
+        <a
+          :href="pricingUrl"
+          target="_blank"
+          class="flex items-center gap-1 text-sm text-muted-foreground no-underline transition-colors hover:text-base-foreground"
+        >
+          {{ $t('credits.topUp.viewPricing') }}
+          <i class="icon-[lucide--external-link] size-4" />
+        </a>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useToast } from 'primevue/usetoast'
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import { creditsToUsd, usdToCredits } from '@/base/credits/comfyCredits'
+import Button from '@/components/ui/button/Button.vue'
+import FormattedNumberStepper from '@/components/ui/stepper/FormattedNumberStepper.vue'
+import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
+import { useExternalLink } from '@/composables/useExternalLink'
+import { useFeatureFlags } from '@/composables/useFeatureFlags'
+import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
+import { useTelemetry } from '@/platform/telemetry'
+import { clearTopupTracking } from '@/platform/telemetry/topupTracker'
+import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
+import { useDialogStore } from '@/stores/dialogStore'
+import { cn } from '@/utils/tailwindUtil'
+
+const { isInsufficientCredits = false } = defineProps<{
+  isInsufficientCredits?: boolean
+}>()
+
+const { t } = useI18n()
+const authActions = useFirebaseAuthActions()
+const dialogStore = useDialogStore()
+const settingsDialog = useSettingsDialog()
+const telemetry = useTelemetry()
+const toast = useToast()
+const { buildDocsUrl, docsPaths } = useExternalLink()
+const { flags } = useFeatureFlags()
+
+const { isSubscriptionEnabled } = useSubscription()
+// Constants
+const PRESET_AMOUNTS = [10, 25, 50, 100]
+const MIN_AMOUNT = 5
+const MAX_AMOUNT = 10000
+
+// State
+const selectedPreset = ref<number | null>(50)
+const payAmount = ref(50)
+const showCeilingWarning = ref(false)
+const loading = ref(false)
+
+// Computed
+const pricingUrl = computed(() =>
+  buildDocsUrl(docsPaths.partnerNodesPricing, { includeLocale: true })
+)
+
+const creditsModel = computed({
+  get: () => usdToCredits(payAmount.value),
+  set: (newCredits: number) => {
+    payAmount.value = Math.round(creditsToUsd(newCredits))
+    selectedPreset.value = null
+  }
+})
+
+const isValidAmount = computed(
+  () => payAmount.value >= MIN_AMOUNT && payAmount.value <= MAX_AMOUNT
+)
+
+const isBelowMin = computed(() => payAmount.value < MIN_AMOUNT)
+
+// Utility functions
+function formatNumber(num: number): string {
+  return num.toLocaleString('en-US')
+}
+
+// Step amount functions
+function getStepAmount(currentAmount: number): number {
+  if (currentAmount < 100) return 5
+  if (currentAmount < 1000) return 50
+  return 100
+}
+
+function getCreditsStepAmount(currentCredits: number): number {
+  const usdAmount = creditsToUsd(currentCredits)
+  return usdToCredits(getStepAmount(usdAmount))
+}
+
+// Event handlers
+function handlePayAmountChange(value: number) {
+  payAmount.value = value
+  selectedPreset.value = null
+  showCeilingWarning.value = false
+}
+
+function handlePresetClick(amount: number) {
+  showCeilingWarning.value = false
+  payAmount.value = amount
+  selectedPreset.value = amount
+}
+
+function handleClose(clearTracking = true) {
+  if (clearTracking) {
+    clearTopupTracking()
+  }
+  dialogStore.closeDialog({ key: 'top-up-credits' })
+}
+
+async function handleBuy() {
+  // Prevent double-clicks
+  if (loading.value || !isValidAmount.value) return
+
+  loading.value = true
+  try {
+    telemetry?.trackApiCreditTopupButtonPurchaseClicked(payAmount.value)
+    await authActions.purchaseCredits(payAmount.value)
+
+    // Close top-up dialog (keep tracking) and open credits panel to show updated balance
+    handleClose(false)
+
+    // In workspace mode (personal workspace), show workspace settings panel
+    // Otherwise, show legacy subscription/credits panel
+    const settingsPanel = flags.teamWorkspacesEnabled
+      ? 'workspace'
+      : isSubscriptionEnabled()
+        ? 'subscription'
+        : 'credits'
+    settingsDialog.show(settingsPanel)
+  } catch (error) {
+    console.error('Purchase failed:', error)
+
+    const errorMessage =
+      error instanceof Error ? error.message : t('credits.topUp.unknownError')
+    toast.add({
+      severity: 'error',
+      summary: t('credits.topUp.purchaseError'),
+      detail: t('credits.topUp.purchaseErrorDetail', { error: errorMessage }),
+      life: 5000
+    })
+  } finally {
+    loading.value = false
+  }
+}
+</script>
diff --git a/tests-ui/tests/components/dialog/content/credit/CreditTopUpOption.test.ts b/src/components/dialog/content/credit/CreditTopUpOption.test.ts
similarity index 100%
rename from tests-ui/tests/components/dialog/content/credit/CreditTopUpOption.test.ts
rename to src/components/dialog/content/credit/CreditTopUpOption.test.ts
diff --git a/src/components/dialog/content/credit/CreditTopUpOption.vue b/src/components/dialog/content/credit/CreditTopUpOption.vue
index c67c273a27..90985020d6 100644
--- a/src/components/dialog/content/credit/CreditTopUpOption.vue
+++ b/src/components/dialog/content/credit/CreditTopUpOption.vue
@@ -1,10 +1,10 @@
 <template>
   <div
-    class="flex items-center justify-between p-2 rounded-lg cursor-pointer transition-all duration-200"
+    class="flex cursor-pointer items-center justify-between rounded-lg p-2 transition-all duration-200"
     :class="[
       selected
-        ? 'bg-secondary-background border-2 border-border-default'
-        : 'bg-component-node-disabled hover:bg-secondary-background border-2 border-transparent'
+        ? 'border-2 border-border-default bg-secondary-background'
+        : 'bg-component-node-disabled border-2 border-transparent hover:bg-secondary-background'
     ]"
     @click="$emit('select')"
   >
diff --git a/src/components/dialog/content/missingModelsUtils.test.ts b/src/components/dialog/content/missingModelsUtils.test.ts
new file mode 100644
index 0000000000..555917b4d3
--- /dev/null
+++ b/src/components/dialog/content/missingModelsUtils.test.ts
@@ -0,0 +1,142 @@
+import { describe, expect, it, vi, beforeEach } from 'vitest'
+
+import { fetchModelMetadata } from './missingModelsUtils'
+
+const fetchMock = vi.fn()
+vi.stubGlobal('fetch', fetchMock)
+
+vi.mock('@/platform/distribution/types', () => ({ isDesktop: false }))
+vi.mock('@/stores/electronDownloadStore', () => ({}))
+
+let testId = 0
+
+describe('fetchModelMetadata', () => {
+  beforeEach(() => {
+    fetchMock.mockReset()
+    testId++
+  })
+
+  it('fetches file size via HEAD for non-Civitai URLs', async () => {
+    fetchMock.mockResolvedValueOnce({
+      ok: true,
+      headers: new Headers({ 'content-length': '1048576' })
+    })
+
+    const url = `https://huggingface.co/org/model/resolve/main/head-${testId}.safetensors`
+    const metadata = await fetchModelMetadata(url)
+    expect(metadata.fileSize).toBe(1048576)
+    expect(metadata.gatedRepoUrl).toBeNull()
+    expect(fetchMock).toHaveBeenCalledWith(url, { method: 'HEAD' })
+  })
+
+  it('uses Civitai API for Civitai model URLs', async () => {
+    const url = `https://civitai.com/api/download/models/${testId}`
+    fetchMock.mockResolvedValueOnce({
+      ok: true,
+      json: async () => ({
+        files: [{ sizeKB: 1024, downloadUrl: url }]
+      })
+    })
+
+    const metadata = await fetchModelMetadata(url)
+    expect(metadata.fileSize).toBe(1024 * 1024)
+    expect(metadata.gatedRepoUrl).toBeNull()
+    expect(fetchMock).toHaveBeenCalledWith(
+      `https://civitai.com/api/v1/model-versions/${testId}`
+    )
+  })
+
+  it('returns null fileSize when Civitai API fails', async () => {
+    fetchMock.mockResolvedValueOnce({ ok: false })
+
+    const metadata = await fetchModelMetadata(
+      `https://civitai.com/api/download/models/${testId}`
+    )
+    expect(metadata.fileSize).toBeNull()
+    expect(metadata.gatedRepoUrl).toBeNull()
+    expect(fetchMock).toHaveBeenCalledTimes(1)
+  })
+
+  it('returns gatedRepoUrl for gated HuggingFace HEAD requests (403)', async () => {
+    fetchMock.mockResolvedValueOnce({ ok: false, status: 403 })
+
+    const metadata = await fetchModelMetadata(
+      `https://huggingface.co/bfl/FLUX.1/resolve/main/gated-${testId}.safetensors`
+    )
+    expect(metadata.gatedRepoUrl).toBe('https://huggingface.co/bfl/FLUX.1')
+    expect(metadata.fileSize).toBeNull()
+  })
+
+  it('does not treat HuggingFace 404/500 as gated', async () => {
+    fetchMock.mockResolvedValueOnce({ ok: false, status: 404 })
+
+    const metadata = await fetchModelMetadata(
+      `https://huggingface.co/org/model/resolve/main/notfound-${testId}.safetensors`
+    )
+    expect(metadata.gatedRepoUrl).toBeNull()
+    expect(metadata.fileSize).toBeNull()
+  })
+
+  it('returns null for unrecognized Civitai URL patterns', async () => {
+    const url = `https://civitai.com/api/v1/models/${testId}`
+    const metadata = await fetchModelMetadata(url)
+    expect(metadata.fileSize).toBeNull()
+    expect(metadata.gatedRepoUrl).toBeNull()
+    expect(fetchMock).not.toHaveBeenCalled()
+  })
+
+  it('returns cached metadata on second call', async () => {
+    const url = `https://huggingface.co/org/model/resolve/main/cached-${testId}.safetensors`
+
+    fetchMock.mockResolvedValueOnce({
+      ok: true,
+      headers: new Headers({ 'content-length': '500' })
+    })
+
+    const first = await fetchModelMetadata(url)
+    const second = await fetchModelMetadata(url)
+
+    expect(first.fileSize).toBe(500)
+    expect(second.fileSize).toBe(500)
+    expect(fetchMock).toHaveBeenCalledTimes(1)
+  })
+
+  it('does not cache incomplete results so retries are possible', async () => {
+    const url = `https://example.com/retry-${testId}.safetensors`
+
+    fetchMock
+      .mockResolvedValueOnce({
+        ok: true,
+        headers: new Headers({})
+      })
+      .mockResolvedValueOnce({
+        ok: true,
+        headers: new Headers({ 'content-length': '1024' })
+      })
+
+    const first = await fetchModelMetadata(url)
+    const second = await fetchModelMetadata(url)
+
+    expect(first.fileSize).toBeNull()
+    expect(second.fileSize).toBe(1024)
+    expect(fetchMock).toHaveBeenCalledTimes(2)
+  })
+
+  it('deduplicates concurrent requests for the same URL', async () => {
+    const url = `https://huggingface.co/org/model/resolve/main/dedup-${testId}.safetensors`
+
+    fetchMock.mockResolvedValueOnce({
+      ok: true,
+      headers: new Headers({ 'content-length': '2048' })
+    })
+
+    const [first, second] = await Promise.all([
+      fetchModelMetadata(url),
+      fetchModelMetadata(url)
+    ])
+
+    expect(first.fileSize).toBe(2048)
+    expect(second.fileSize).toBe(2048)
+    expect(fetchMock).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/src/components/dialog/content/missingModelsUtils.ts b/src/components/dialog/content/missingModelsUtils.ts
new file mode 100644
index 0000000000..0c98b7d400
--- /dev/null
+++ b/src/components/dialog/content/missingModelsUtils.ts
@@ -0,0 +1,180 @@
+import { downloadUrlToHfRepoUrl, isCivitaiModelUrl } from '@/utils/formatUtil'
+import { isDesktop } from '@/platform/distribution/types'
+import { useElectronDownloadStore } from '@/stores/electronDownloadStore'
+
+const ALLOWED_SOURCES = [
+  'https://civitai.com/',
+  'https://huggingface.co/',
+  'http://localhost:'
+] as const
+
+const ALLOWED_SUFFIXES = [
+  '.safetensors',
+  '.sft',
+  '.ckpt',
+  '.pth',
+  '.pt'
+] as const
+
+const WHITE_LISTED_URLS: ReadonlySet<string> = new Set([
+  'https://huggingface.co/stabilityai/stable-zero123/resolve/main/stable_zero123.ckpt',
+  'https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_depth_sd14v1.pth?download=true',
+  'https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth'
+])
+
+const DIRECTORY_BADGE_MAP = {
+  vae: 'VAE',
+  diffusion_models: 'DIFFUSION',
+  text_encoders: 'TEXT ENCODER',
+  loras: 'LORA',
+  checkpoints: 'CHECKPOINT'
+} as const
+
+export interface ModelWithUrl {
+  name: string
+  url: string
+  directory: string
+}
+
+export function isModelDownloadable(model: ModelWithUrl): boolean {
+  if (WHITE_LISTED_URLS.has(model.url)) return true
+  if (!ALLOWED_SOURCES.some((source) => model.url.startsWith(source)))
+    return false
+  if (!ALLOWED_SUFFIXES.some((suffix) => model.name.endsWith(suffix)))
+    return false
+  return true
+}
+
+export function hasValidDirectory(
+  model: ModelWithUrl,
+  paths: Record<string, string[]>
+): boolean {
+  return !!paths[model.directory]
+}
+
+export function getBadgeLabel(directory: string): string {
+  if (directory in DIRECTORY_BADGE_MAP) {
+    return DIRECTORY_BADGE_MAP[directory as keyof typeof DIRECTORY_BADGE_MAP]
+  }
+  return directory.toUpperCase()
+}
+
+export function downloadModel(
+  model: ModelWithUrl,
+  paths: Record<string, string[]>
+): void {
+  if (!isDesktop) {
+    const link = document.createElement('a')
+    link.href = model.url
+    link.download = model.name
+    link.target = '_blank'
+    link.rel = 'noopener noreferrer'
+    link.click()
+    return
+  }
+
+  const modelPaths = paths[model.directory]
+  if (modelPaths?.[0]) {
+    void useElectronDownloadStore().start({
+      url: model.url,
+      savePath: modelPaths[0],
+      filename: model.name
+    })
+  }
+}
+
+interface ModelMetadata {
+  fileSize: number | null
+  gatedRepoUrl: string | null
+}
+
+interface CivitaiModelFile {
+  sizeKB: number
+  downloadUrl: string
+}
+
+interface CivitaiModelVersionResponse {
+  files: CivitaiModelFile[]
+}
+
+const metadataCache = new Map<string, ModelMetadata>()
+const inflight = new Map<string, Promise<ModelMetadata>>()
+
+async function fetchCivitaiMetadata(url: string): Promise<ModelMetadata> {
+  try {
+    const pathname = new URL(url).pathname
+    const versionIdMatch =
+      pathname.match(/^\/api\/download\/models\/(\d+)$/) ??
+      pathname.match(/^\/api\/v1\/models-versions\/(\d+)$/)
+
+    if (!versionIdMatch) return { fileSize: null, gatedRepoUrl: null }
+
+    const [, modelVersionId] = versionIdMatch
+    const apiUrl = `https://civitai.com/api/v1/model-versions/${modelVersionId}`
+    const res = await fetch(apiUrl)
+    if (!res.ok) return { fileSize: null, gatedRepoUrl: null }
+
+    const data: CivitaiModelVersionResponse = await res.json()
+    const matchingFile = data.files?.find(
+      (file) => file.downloadUrl && file.downloadUrl.startsWith(url)
+    )
+    const fileSize = matchingFile?.sizeKB ? matchingFile.sizeKB * 1024 : null
+    return { fileSize, gatedRepoUrl: null }
+  } catch {
+    return { fileSize: null, gatedRepoUrl: null }
+  }
+}
+
+const GATED_STATUS_CODES = new Set([401, 403, 451])
+
+async function fetchHeadMetadata(url: string): Promise<ModelMetadata> {
+  try {
+    const response = await fetch(url, { method: 'HEAD' })
+    if (!response.ok) {
+      if (
+        url.includes('huggingface.co') &&
+        GATED_STATUS_CODES.has(response.status)
+      ) {
+        return { fileSize: null, gatedRepoUrl: downloadUrlToHfRepoUrl(url) }
+      }
+      return { fileSize: null, gatedRepoUrl: null }
+    }
+    const size = response.headers.get('content-length')
+    return {
+      fileSize: size ? parseInt(size, 10) : null,
+      gatedRepoUrl: null
+    }
+  } catch {
+    return { fileSize: null, gatedRepoUrl: null }
+  }
+}
+
+function isComplete(metadata: ModelMetadata): boolean {
+  return metadata.fileSize !== null || metadata.gatedRepoUrl !== null
+}
+
+export async function fetchModelMetadata(url: string): Promise<ModelMetadata> {
+  const cached = metadataCache.get(url)
+  if (cached !== undefined) return cached
+
+  const existing = inflight.get(url)
+  if (existing) return existing
+
+  const promise = (async () => {
+    const metadata = isCivitaiModelUrl(url)
+      ? await fetchCivitaiMetadata(url)
+      : await fetchHeadMetadata(url)
+
+    if (isComplete(metadata)) {
+      metadataCache.set(url, metadata)
+    }
+    return metadata
+  })()
+
+  inflight.set(url, promise)
+  try {
+    return await promise
+  } finally {
+    inflight.delete(url)
+  }
+}
diff --git a/src/components/dialog/content/setting/AboutPanel.vue b/src/components/dialog/content/setting/AboutPanel.vue
index 33ada1ce30..12d320a488 100644
--- a/src/components/dialog/content/setting/AboutPanel.vue
+++ b/src/components/dialog/content/setting/AboutPanel.vue
@@ -1,5 +1,5 @@
 <template>
-  <PanelTemplate value="About" class="about-container">
+  <div class="about-container flex flex-col gap-2" data-testid="about-panel">
     <h2 class="mb-2 text-2xl font-bold">
       {{ $t('g.about') }}
     </h2>
@@ -13,7 +13,7 @@
         class="about-badge inline-flex items-center no-underline"
         :title="badge.url"
       >
-        <Tag class="mr-2">
+        <Tag class="mr-2" :severity="badge.severity">
           <template #icon>
             <i :class="[badge.icon, 'mr-2 text-xl']" />
           </template>
@@ -28,7 +28,7 @@
       v-if="systemStatsStore.systemStats"
       :stats="systemStatsStore.systemStats"
     />
-  </PanelTemplate>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -39,8 +39,6 @@ import SystemStatsPanel from '@/components/common/SystemStatsPanel.vue'
 import { useAboutPanelStore } from '@/stores/aboutPanelStore'
 import { useSystemStatsStore } from '@/stores/systemStatsStore'
 
-import PanelTemplate from './PanelTemplate.vue'
-
 const systemStatsStore = useSystemStatsStore()
 const aboutPanelStore = useAboutPanelStore()
 </script>
diff --git a/src/components/dialog/content/setting/CurrentUserMessage.vue b/src/components/dialog/content/setting/CurrentUserMessage.vue
index 8e4a81e804..8ad4475621 100644
--- a/src/components/dialog/content/setting/CurrentUserMessage.vue
+++ b/src/components/dialog/content/setting/CurrentUserMessage.vue
@@ -5,9 +5,10 @@
     severity="info"
     icon="pi pi-user"
     pt:text="w-full"
+    data-testid="current-user-indicator"
   >
     <div class="flex items-center justify-between">
-      <div>
+      <div class="tabular-nums">
         {{ $t('g.currentUser') }}: {{ userStore.currentUser?.username }}
       </div>
       <Button
diff --git a/src/components/dialog/content/setting/KeybindingPanel.vue b/src/components/dialog/content/setting/KeybindingPanel.vue
index 03ca3df47c..4cec61c717 100644
--- a/src/components/dialog/content/setting/KeybindingPanel.vue
+++ b/src/components/dialog/content/setting/KeybindingPanel.vue
@@ -1,11 +1,9 @@
 <template>
-  <PanelTemplate value="Keybinding" class="keybinding-panel">
-    <template #header>
-      <SearchBox
-        v-model="filters['global'].value"
-        :placeholder="$t('g.searchKeybindings') + '...'"
-      />
-    </template>
+  <div class="keybinding-panel flex flex-col gap-2">
+    <SearchBox
+      v-model="filters['global'].value"
+      :placeholder="$t('g.searchPlaceholder', { subject: $t('g.keybindings') })"
+    />
 
     <DataTable
       v-model:selection="selectedCommandData"
@@ -19,9 +17,9 @@
       }"
       @row-dblclick="editKeybinding($event.data)"
     >
-      <Column field="actions" header="">
+      <Column field="actions" header="" :pt="{ bodyCell: 'p-1 min-h-8' }">
         <template #body="slotProps">
-          <div class="actions invisible flex flex-row">
+          <div class="actions flex flex-row">
             <Button
               variant="textonly"
               size="icon"
@@ -58,6 +56,7 @@
         :header="$t('g.command')"
         sortable
         class="max-w-64 2xl:max-w-full"
+        :pt="{ bodyCell: 'p-1 min-h-8' }"
       >
         <template #body="slotProps">
           <div class="truncate" :title="slotProps.data.id">
@@ -65,7 +64,11 @@
           </div>
         </template>
       </Column>
-      <Column field="keybinding" :header="$t('g.keybinding')">
+      <Column
+        field="keybinding"
+        :header="$t('g.keybinding')"
+        :pt="{ bodyCell: 'p-1 min-h-8' }"
+      >
         <template #body="slotProps">
           <KeyComboDisplay
             v-if="slotProps.data.keybinding"
@@ -77,7 +80,11 @@
           <span v-else>-</span>
         </template>
       </Column>
-      <Column field="source" :header="$t('g.source')">
+      <Column
+        field="source"
+        :header="$t('g.source')"
+        :pt="{ bodyCell: 'p-1 min-h-8' }"
+      >
         <template #body="slotProps">
           <span class="overflow-hidden text-ellipsis">{{
             slotProps.data.source || '-'
@@ -133,7 +140,7 @@
       <i class="pi pi-replay" />
       {{ $t('g.resetAll') }}
     </Button>
-  </PanelTemplate>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -150,16 +157,13 @@ import { useI18n } from 'vue-i18n'
 
 import SearchBox from '@/components/common/SearchBox.vue'
 import Button from '@/components/ui/button/Button.vue'
-import { useKeybindingService } from '@/services/keybindingService'
+import { KeyComboImpl } from '@/platform/keybindings/keyCombo'
+import { KeybindingImpl } from '@/platform/keybindings/keybinding'
+import { useKeybindingService } from '@/platform/keybindings/keybindingService'
+import { useKeybindingStore } from '@/platform/keybindings/keybindingStore'
 import { useCommandStore } from '@/stores/commandStore'
-import {
-  KeyComboImpl,
-  KeybindingImpl,
-  useKeybindingStore
-} from '@/stores/keybindingStore'
 import { normalizeI18nKey } from '@/utils/formatUtil'
 
-import PanelTemplate from './PanelTemplate.vue'
 import KeyComboDisplay from './keybinding/KeyComboDisplay.vue'
 
 const filters = ref({
@@ -265,18 +269,15 @@ function cancelEdit() {
 }
 
 async function saveKeybinding() {
-  if (currentEditingCommand.value && newBindingKeyCombo.value) {
-    const updated = keybindingStore.updateKeybindingOnCommand(
-      new KeybindingImpl({
-        commandId: currentEditingCommand.value.id,
-        combo: newBindingKeyCombo.value
-      })
-    )
-    if (updated) {
-      await keybindingService.persistUserKeybindings()
-    }
-  }
+  const commandId = currentEditingCommand.value?.id
+  const combo = newBindingKeyCombo.value
   cancelEdit()
+  if (!combo || commandId == undefined) return
+
+  const updated = keybindingStore.updateKeybindingOnCommand(
+    new KeybindingImpl({ commandId, combo })
+  )
+  if (updated) await keybindingService.persistUserKeybindings()
 }
 
 async function resetKeybinding(commandData: ICommandData) {
@@ -301,17 +302,3 @@ async function resetAllKeybindings() {
   })
 }
 </script>
-
-<style scoped>
-@reference '../../../../assets/css/style.css';
-
-:deep(.p-datatable-tbody) > tr > td {
-  @apply p-1;
-  min-height: 2rem;
-}
-
-:deep(.p-datatable-row-selected) .actions,
-:deep(.p-datatable-selectable-row:hover) .actions {
-  @apply visible;
-}
-</style>
diff --git a/src/components/dialog/content/setting/LegacyCreditsPanel.vue b/src/components/dialog/content/setting/LegacyCreditsPanel.vue
index c85fc4b379..680963996a 100644
--- a/src/components/dialog/content/setting/LegacyCreditsPanel.vue
+++ b/src/components/dialog/content/setting/LegacyCreditsPanel.vue
@@ -1,5 +1,5 @@
 <template>
-  <TabPanel value="Credits" class="credits-container h-full">
+  <div class="credits-container h-full">
     <!-- Legacy Design -->
     <div class="flex h-full flex-col">
       <h2 class="mb-2 text-2xl font-bold">
@@ -102,7 +102,7 @@
         </Button>
       </div>
     </div>
-  </TabPanel>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -110,15 +110,14 @@ import Column from 'primevue/column'
 import DataTable from 'primevue/datatable'
 import Divider from 'primevue/divider'
 import Skeleton from 'primevue/skeleton'
-import TabPanel from 'primevue/tabpanel'
 import { computed, ref, watch } from 'vue'
 
 import UserCredit from '@/components/common/UserCredit.vue'
 import UsageLogsTable from '@/components/dialog/content/setting/UsageLogsTable.vue'
 import Button from '@/components/ui/button/Button.vue'
+import { useBillingContext } from '@/composables/billing/useBillingContext'
 import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
 import { useExternalLink } from '@/composables/useExternalLink'
-import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
 import { useTelemetry } from '@/platform/telemetry'
 import { useDialogService } from '@/services/dialogService'
 import { useCommandStore } from '@/stores/commandStore'
@@ -138,7 +137,7 @@ const authStore = useFirebaseAuthStore()
 const authActions = useFirebaseAuthActions()
 const commandStore = useCommandStore()
 const telemetry = useTelemetry()
-const { isActiveSubscription } = useSubscription()
+const { isActiveSubscription } = useBillingContext()
 const loading = computed(() => authStore.loading)
 const balanceLoading = computed(() => authStore.isFetchingBalance)
 
diff --git a/src/components/dialog/content/setting/PanelTemplate.vue b/src/components/dialog/content/setting/PanelTemplate.vue
deleted file mode 100644
index 3521d3f6d0..0000000000
--- a/src/components/dialog/content/setting/PanelTemplate.vue
+++ /dev/null
@@ -1,21 +0,0 @@
-<template>
-  <TabPanel :value="props.value" class="h-full w-full" :class="props.class">
-    <div class="flex h-full w-full flex-col gap-2">
-      <slot name="header" />
-      <ScrollPanel class="h-0 grow pr-2">
-        <slot />
-      </ScrollPanel>
-      <slot name="footer" />
-    </div>
-  </TabPanel>
-</template>
-
-<script setup lang="ts">
-import ScrollPanel from 'primevue/scrollpanel'
-import TabPanel from 'primevue/tabpanel'
-
-const props = defineProps<{
-  value: string
-  class?: string
-}>()
-</script>
diff --git a/src/components/dialog/content/setting/SettingItem.test.ts b/src/components/dialog/content/setting/SettingItem.test.ts
index 17e3bab067..673fe5894c 100644
--- a/src/components/dialog/content/setting/SettingItem.test.ts
+++ b/src/components/dialog/content/setting/SettingItem.test.ts
@@ -18,7 +18,7 @@ vi.mock('@/utils/formatUtil', () => ({
 }))
 
 describe('SettingItem', () => {
-  const mountComponent = (props: any, options = {}): any => {
+  const mountComponent = (props: Record<string, unknown>, options = {}) => {
     return mount(SettingItem, {
       global: {
         plugins: [PrimeVue, i18n, createPinia()],
@@ -32,6 +32,7 @@ describe('SettingItem', () => {
           'i-material-symbols:experiment-outline': true
         }
       },
+      // @ts-expect-error - Test utility accepts flexible props for testing edge cases
       props,
       ...options
     })
@@ -48,8 +49,9 @@ describe('SettingItem', () => {
       }
     })
 
-    // Get the options property of the FormItem
-    const options = wrapper.vm.formItem.options
+    // Check the FormItem component's item prop for the options
+    const formItem = wrapper.findComponent({ name: 'FormItem' })
+    const options = formItem.props('item').options
     expect(options).toEqual([
       { text: 'Correctly Translated', value: 'Correctly Translated' }
     ])
@@ -67,7 +69,8 @@ describe('SettingItem', () => {
     })
 
     // Should not throw an error and tooltip should be preserved as-is
-    expect(wrapper.vm.formItem.tooltip).toBe(
+    const formItem = wrapper.findComponent({ name: 'FormItem' })
+    expect(formItem.props('item').tooltip).toBe(
       'This will load a larger version of @mtb/markdown-parser that bundles shiki'
     )
   })
diff --git a/src/components/dialog/content/setting/UsageLogsTable.test.ts b/src/components/dialog/content/setting/UsageLogsTable.test.ts
index b986646686..72a4fbdba8 100644
--- a/src/components/dialog/content/setting/UsageLogsTable.test.ts
+++ b/src/components/dialog/content/setting/UsageLogsTable.test.ts
@@ -12,6 +12,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { nextTick } from 'vue'
 import { createI18n } from 'vue-i18n'
 
+import type { AuditLog } from '@/services/customerEventsService'
 import { EventType } from '@/services/customerEventsService'
 
 import UsageLogsTable from './UsageLogsTable.vue'
@@ -19,7 +20,7 @@ import UsageLogsTable from './UsageLogsTable.vue'
 type ComponentInstance = InstanceType<typeof UsageLogsTable> & {
   loading: boolean
   error: string | null
-  events: any[]
+  events: Partial<AuditLog>[]
   pagination: {
     page: number
     limit: number
diff --git a/src/components/dialog/content/setting/UserPanel.vue b/src/components/dialog/content/setting/UserPanel.vue
index 60bc6dba31..705baf26c0 100644
--- a/src/components/dialog/content/setting/UserPanel.vue
+++ b/src/components/dialog/content/setting/UserPanel.vue
@@ -1,5 +1,5 @@
 <template>
-  <TabPanel value="User" class="user-settings-container h-full">
+  <div class="user-settings-container h-full">
     <div class="flex h-full flex-col">
       <h2 class="mb-2 text-2xl font-bold">{{ $t('userSettings.title') }}</h2>
       <Divider class="mb-3" />
@@ -55,7 +55,7 @@
 
         <ProgressSpinner
           v-if="loading"
-          class="mt-4 h-8 w-8"
+          class="mt-4 size-8"
           style="--pc-spinner-color: #000"
         />
         <div v-else class="mt-4 flex flex-col gap-2">
@@ -63,14 +63,18 @@
             <i class="pi pi-sign-out" />
             {{ $t('auth.signOut.signOut') }}
           </Button>
-          <Button
+          <i18n-t
             v-if="!isApiKeyLogin"
-            class="w-fit"
-            variant="destructive-textonly"
-            @click="handleDeleteAccount"
+            keypath="auth.deleteAccount.contactSupport"
+            tag="p"
+            class="text-sm text-muted"
           >
-            {{ $t('auth.deleteAccount.deleteAccount') }}
-          </Button>
+            <template #email>
+              <a href="mailto:support@comfy.org" class="underline"
+                >support@comfy.org</a
+              >
+            </template>
+          </i18n-t>
         </div>
       </div>
 
@@ -91,13 +95,12 @@
         </Button>
       </div>
     </div>
-  </TabPanel>
+  </div>
 </template>
 
 <script setup lang="ts">
 import Divider from 'primevue/divider'
 import ProgressSpinner from 'primevue/progressspinner'
-import TabPanel from 'primevue/tabpanel'
 
 import UserAvatar from '@/components/common/UserAvatar.vue'
 import Button from '@/components/ui/button/Button.vue'
@@ -116,7 +119,6 @@ const {
   providerName,
   providerIcon,
   handleSignOut,
-  handleSignIn,
-  handleDeleteAccount
+  handleSignIn
 } = useCurrentUser()
 </script>
diff --git a/src/components/dialog/content/setting/keybinding/KeyComboDisplay.vue b/src/components/dialog/content/setting/keybinding/KeyComboDisplay.vue
index ded8cb18b0..911a0f41b8 100644
--- a/src/components/dialog/content/setting/keybinding/KeyComboDisplay.vue
+++ b/src/components/dialog/content/setting/keybinding/KeyComboDisplay.vue
@@ -13,7 +13,7 @@
 import Tag from 'primevue/tag'
 import { computed } from 'vue'
 
-import type { KeyComboImpl } from '@/stores/keybindingStore'
+import type { KeyComboImpl } from '@/platform/keybindings/keyCombo'
 
 const { keyCombo, isModified = false } = defineProps<{
   keyCombo: KeyComboImpl
diff --git a/src/components/dialog/content/signin/ApiKeyForm.test.ts b/src/components/dialog/content/signin/ApiKeyForm.test.ts
index 5d6a726b89..4d073cb088 100644
--- a/src/components/dialog/content/signin/ApiKeyForm.test.ts
+++ b/src/components/dialog/content/signin/ApiKeyForm.test.ts
@@ -1,3 +1,5 @@
+import type { ComponentProps } from 'vue-component-type-helpers'
+
 import { Form } from '@primevue/forms'
 import { mount } from '@vue/test-utils'
 import { createPinia } from 'pinia'
@@ -63,7 +65,7 @@ describe('ApiKeyForm', () => {
     mockLoading.mockReset()
   })
 
-  const mountComponent = (props: any = {}) => {
+  const mountComponent = (props: ComponentProps<typeof ApiKeyForm> = {}) => {
     return mount(ApiKeyForm, {
       global: {
         plugins: [PrimeVue, createPinia(), i18n],
diff --git a/src/components/dialog/content/signin/ApiKeyForm.vue b/src/components/dialog/content/signin/ApiKeyForm.vue
index 22ecb3205a..a2ea85dbf7 100644
--- a/src/components/dialog/content/signin/ApiKeyForm.vue
+++ b/src/components/dialog/content/signin/ApiKeyForm.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex flex-col gap-6">
     <div class="mb-8 flex flex-col gap-4">
-      <h1 class="my-0 text-2xl leading-normal font-medium">
+      <h1 class="my-0 text-2xl/normal font-medium">
         {{ t('auth.apiKey.title') }}
       </h1>
       <div class="flex flex-col gap-2">
diff --git a/src/components/dialog/content/signin/SignInForm.test.ts b/src/components/dialog/content/signin/SignInForm.test.ts
index da898532ab..916d03e66d 100644
--- a/src/components/dialog/content/signin/SignInForm.test.ts
+++ b/src/components/dialog/content/signin/SignInForm.test.ts
@@ -98,22 +98,25 @@ describe('SignInForm', () => {
       await nextTick()
 
       const forgotPasswordSpan = wrapper.find(
-        'span.text-muted.text-base.font-medium.cursor-pointer'
+        'span.text-muted.text-base.font-medium.select-none'
       )
 
-      expect(forgotPasswordSpan.classes()).toContain('text-link-disabled')
+      expect(forgotPasswordSpan.classes()).toContain('cursor-not-allowed')
+      expect(forgotPasswordSpan.classes()).toContain('opacity-50')
     })
 
     it('shows toast and focuses email input when clicked while disabled', async () => {
       const wrapper = mountComponent()
       const forgotPasswordSpan = wrapper.find(
-        'span.text-muted.text-base.font-medium.cursor-pointer'
+        'span.text-muted.text-base.font-medium.select-none'
       )
 
       // Mock getElementById to track focus
       const mockFocus = vi.fn()
-      const mockElement = { focus: mockFocus }
-      vi.spyOn(document, 'getElementById').mockReturnValue(mockElement as any)
+      const mockElement: Partial<HTMLElement> = { focus: mockFocus }
+      vi.spyOn(document, 'getElementById').mockReturnValue(
+        mockElement as HTMLElement
+      )
 
       // Click forgot password link while email is empty
       await forgotPasswordSpan.trigger('click')
@@ -138,7 +141,10 @@ describe('SignInForm', () => {
 
     it('calls handleForgotPassword with email when link is clicked', async () => {
       const wrapper = mountComponent()
-      const component = wrapper.vm as any
+      const component = wrapper.vm as typeof wrapper.vm & {
+        handleForgotPassword: (email: string, valid: boolean) => void
+        onSubmit: (data: { valid: boolean; values: unknown }) => void
+      }
 
       // Spy on handleForgotPassword
       const handleForgotPasswordSpy = vi.spyOn(
@@ -147,7 +153,7 @@ describe('SignInForm', () => {
       )
 
       const forgotPasswordSpan = wrapper.find(
-        'span.text-muted.text-base.font-medium.cursor-pointer'
+        'span.text-muted.text-base.font-medium.select-none'
       )
 
       // Click the forgot password link
@@ -161,7 +167,10 @@ describe('SignInForm', () => {
   describe('Form Submission', () => {
     it('emits submit event when onSubmit is called with valid data', async () => {
       const wrapper = mountComponent()
-      const component = wrapper.vm as any
+      const component = wrapper.vm as typeof wrapper.vm & {
+        handleForgotPassword: (email: string, valid: boolean) => void
+        onSubmit: (data: { valid: boolean; values: unknown }) => void
+      }
 
       // Call onSubmit directly with valid data
       component.onSubmit({
@@ -181,7 +190,10 @@ describe('SignInForm', () => {
 
     it('does not emit submit event when form is invalid', async () => {
       const wrapper = mountComponent()
-      const component = wrapper.vm as any
+      const component = wrapper.vm as typeof wrapper.vm & {
+        handleForgotPassword: (email: string, valid: boolean) => void
+        onSubmit: (data: { valid: boolean; values: unknown }) => void
+      }
 
       // Call onSubmit with invalid form
       component.onSubmit({ valid: false, values: {} })
@@ -254,12 +266,17 @@ describe('SignInForm', () => {
   describe('Focus Behavior', () => {
     it('focuses email input when handleForgotPassword is called with invalid email', async () => {
       const wrapper = mountComponent()
-      const component = wrapper.vm as any
+      const component = wrapper.vm as typeof wrapper.vm & {
+        handleForgotPassword: (email: string, valid: boolean) => void
+        onSubmit: (data: { valid: boolean; values: unknown }) => void
+      }
 
       // Mock getElementById to track focus
       const mockFocus = vi.fn()
-      const mockElement = { focus: mockFocus }
-      vi.spyOn(document, 'getElementById').mockReturnValue(mockElement as any)
+      const mockElement: Partial<HTMLElement> = { focus: mockFocus }
+      vi.spyOn(document, 'getElementById').mockReturnValue(
+        mockElement as HTMLElement
+      )
 
       // Call handleForgotPassword with no email
       await component.handleForgotPassword('', false)
@@ -273,12 +290,17 @@ describe('SignInForm', () => {
 
     it('does not focus email input when valid email is provided', async () => {
       const wrapper = mountComponent()
-      const component = wrapper.vm as any
+      const component = wrapper.vm as typeof wrapper.vm & {
+        handleForgotPassword: (email: string, valid: boolean) => void
+        onSubmit: (data: { valid: boolean; values: unknown }) => void
+      }
 
       // Mock getElementById
       const mockFocus = vi.fn()
-      const mockElement = { focus: mockFocus }
-      vi.spyOn(document, 'getElementById').mockReturnValue(mockElement as any)
+      const mockElement: Partial<HTMLElement> = { focus: mockFocus }
+      vi.spyOn(document, 'getElementById').mockReturnValue(
+        mockElement as HTMLElement
+      )
 
       // Call handleForgotPassword with valid email
       await component.handleForgotPassword('test@example.com', true)
diff --git a/src/components/dialog/content/signin/SignInForm.vue b/src/components/dialog/content/signin/SignInForm.vue
index cbc946fea6..3e8fbc70de 100644
--- a/src/components/dialog/content/signin/SignInForm.vue
+++ b/src/components/dialog/content/signin/SignInForm.vue
@@ -34,10 +34,13 @@
           {{ t('auth.login.passwordLabel') }}
         </label>
         <span
-          class="cursor-pointer text-base font-medium text-muted select-none"
-          :class="{
-            'text-link-disabled': !$form.email?.value || $form.email?.invalid
-          }"
+          :class="
+            cn('text-base font-medium text-muted select-none', {
+              'cursor-not-allowed opacity-50':
+                !$form.email?.value || $form.email?.invalid,
+              'cursor-pointer': $form.email?.value && !$form.email?.invalid
+            })
+          "
           @click="handleForgotPassword($form.email?.value, $form.email?.valid)"
         >
           {{ t('auth.login.forgotPassword') }}
@@ -60,7 +63,7 @@
     </div>
 
     <!-- Submit Button -->
-    <ProgressSpinner v-if="loading" class="mx-auto h-8 w-8" />
+    <ProgressSpinner v-if="loading" class="mx-auto size-8" />
     <Button
       v-else
       type="submit"
@@ -89,6 +92,7 @@ import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthAction
 import { signInSchema } from '@/schemas/signInSchema'
 import type { SignInData } from '@/schemas/signInSchema'
 import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
+import { cn } from '@/utils/tailwindUtil'
 
 const authStore = useFirebaseAuthStore()
 const firebaseAuthActions = useFirebaseAuthActions()
@@ -126,11 +130,3 @@ const handleForgotPassword = async (
   await firebaseAuthActions.sendPasswordReset(email)
 }
 </script>
-
-<style scoped>
-@reference '../../../../assets/css/style.css';
-
-.text-link-disabled {
-  @apply opacity-50 cursor-not-allowed;
-}
-</style>
diff --git a/src/components/dialog/content/signin/SignUpForm.vue b/src/components/dialog/content/signin/SignUpForm.vue
index 58b44578f7..9d642a0371 100644
--- a/src/components/dialog/content/signin/SignUpForm.vue
+++ b/src/components/dialog/content/signin/SignUpForm.vue
@@ -29,7 +29,7 @@
     <PasswordFields />
 
     <!-- Submit Button -->
-    <ProgressSpinner v-if="loading" class="mx-auto h-8 w-8" />
+    <ProgressSpinner v-if="loading" class="mx-auto size-8" />
     <Button
       v-else
       type="submit"
diff --git a/src/components/dialog/content/subscription/CancelSubscriptionDialogContent.vue b/src/components/dialog/content/subscription/CancelSubscriptionDialogContent.vue
new file mode 100644
index 0000000000..5c5c39ba19
--- /dev/null
+++ b/src/components/dialog/content/subscription/CancelSubscriptionDialogContent.vue
@@ -0,0 +1,108 @@
+<template>
+  <div
+    class="flex w-full max-w-[400px] flex-col rounded-2xl border border-border-default bg-base-background"
+  >
+    <!-- Header -->
+    <div
+      class="flex h-12 items-center justify-between border-b border-border-default px-4"
+    >
+      <h2 class="m-0 text-sm font-normal text-base-foreground">
+        {{ $t('subscription.cancelDialog.title') }}
+      </h2>
+      <button
+        class="focus-visible:ring-secondary-foreground cursor-pointer rounded-sm border-none bg-transparent p-0 text-muted-foreground transition-colors hover:text-base-foreground focus-visible:ring-1 focus-visible:outline-none"
+        :aria-label="$t('g.close')"
+        :disabled="isLoading"
+        @click="onClose"
+      >
+        <i class="pi pi-times size-4" />
+      </button>
+    </div>
+
+    <!-- Body -->
+    <div class="flex flex-col gap-4 p-4">
+      <p class="m-0 text-sm text-muted-foreground">
+        {{ description }}
+      </p>
+    </div>
+
+    <!-- Footer -->
+    <div class="flex items-center justify-end gap-4 p-4">
+      <Button variant="muted-textonly" :disabled="isLoading" @click="onClose">
+        {{ $t('subscription.cancelDialog.keepSubscription') }}
+      </Button>
+      <Button
+        variant="destructive"
+        size="lg"
+        :loading="isLoading"
+        @click="onConfirmCancel"
+      >
+        {{ $t('subscription.cancelDialog.confirmCancel') }}
+      </Button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useToast } from 'primevue/usetoast'
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+import { useBillingContext } from '@/composables/billing/useBillingContext'
+import { useDialogStore } from '@/stores/dialogStore'
+
+const props = defineProps<{
+  cancelAt?: string
+}>()
+
+const { t } = useI18n()
+const dialogStore = useDialogStore()
+const toast = useToast()
+const { cancelSubscription, fetchStatus, subscription } = useBillingContext()
+
+const isLoading = ref(false)
+
+const formattedEndDate = computed(() => {
+  const dateStr = props.cancelAt ?? subscription.value?.endDate
+  if (!dateStr) return t('subscription.cancelDialog.endOfBillingPeriod')
+  const date = new Date(dateStr)
+  return date.toLocaleDateString('en-US', {
+    month: 'long',
+    day: 'numeric',
+    year: 'numeric'
+  })
+})
+
+const description = computed(() =>
+  t('subscription.cancelDialog.description', { date: formattedEndDate.value })
+)
+
+function onClose() {
+  if (isLoading.value) return
+  dialogStore.closeDialog({ key: 'cancel-subscription' })
+}
+
+async function onConfirmCancel() {
+  isLoading.value = true
+  try {
+    await cancelSubscription()
+    await fetchStatus()
+    dialogStore.closeDialog({ key: 'cancel-subscription' })
+    toast.add({
+      severity: 'success',
+      summary: t('subscription.cancelSuccess'),
+      life: 5000
+    })
+  } catch (error) {
+    toast.add({
+      severity: 'error',
+      summary: t('subscription.cancelDialog.failed'),
+      detail: error instanceof Error ? error.message : t('g.unknownError'),
+      life: 5000
+    })
+  } finally {
+    isLoading.value = false
+  }
+}
+</script>
diff --git a/src/components/dialog/header/SettingDialogHeader.vue b/src/components/dialog/header/SettingDialogHeader.vue
deleted file mode 100644
index 959cfa14da..0000000000
--- a/src/components/dialog/header/SettingDialogHeader.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<template>
-  <div>
-    <h2 class="px-4">
-      <i class="pi pi-cog" />
-      <span>{{ $t('g.settings') }}</span>
-      <Tag
-        v-if="isStaging"
-        value="staging"
-        severity="warn"
-        class="ml-2 text-xs"
-      />
-    </h2>
-  </div>
-</template>
-<script setup lang="ts">
-import Tag from 'primevue/tag'
-
-import { isStaging } from '@/config/staging'
-</script>
-
-<style scoped>
-.pi-cog {
-  font-size: 1.25rem;
-  margin-right: 0.5rem;
-}
-.version-tag {
-  margin-left: 0.5rem;
-}
-</style>
diff --git a/src/components/error/ErrorOverlay.vue b/src/components/error/ErrorOverlay.vue
new file mode 100644
index 0000000000..aefda39435
--- /dev/null
+++ b/src/components/error/ErrorOverlay.vue
@@ -0,0 +1,105 @@
+<template>
+  <Transition
+    enter-active-class="transition-all duration-300 ease-out"
+    enter-from-class="-translate-y-3 opacity-0"
+    enter-to-class="translate-y-0 opacity-100"
+  >
+    <div v-if="isVisible" class="pointer-events-none flex w-full justify-end">
+      <div
+        role="alert"
+        aria-live="assertive"
+        data-testid="error-overlay"
+        class="pointer-events-auto flex w-80 min-w-72 flex-col overflow-hidden rounded-lg border border-interface-stroke bg-comfy-menu-bg shadow-interface transition-colors duration-200 ease-in-out"
+      >
+        <!-- Header -->
+        <div class="flex h-12 items-center gap-2 px-4">
+          <span class="flex-1 text-sm font-bold text-destructive-background">
+            {{ errorCountLabel }}
+          </span>
+          <Button
+            variant="muted-textonly"
+            size="icon-sm"
+            :aria-label="t('g.close')"
+            @click="dismiss"
+          >
+            <i class="icon-[lucide--x] block size-5 leading-none" />
+          </Button>
+        </div>
+
+        <!-- Body -->
+        <div class="px-4 pb-3">
+          <ul class="m-0 flex list-none flex-col gap-1.5 p-0">
+            <li
+              v-for="(message, idx) in groupedErrorMessages"
+              :key="idx"
+              class="flex min-w-0 items-baseline gap-2 text-sm/snug text-muted-foreground"
+            >
+              <span
+                class="mt-1.5 size-1 shrink-0 rounded-full bg-muted-foreground"
+              />
+              <span class="line-clamp-3 wrap-break-word whitespace-pre-wrap">{{
+                message
+              }}</span>
+            </li>
+          </ul>
+        </div>
+
+        <!-- Footer -->
+        <div class="flex items-center justify-end gap-4 px-4 py-3">
+          <Button variant="muted-textonly" size="unset" @click="dismiss">
+            {{ t('g.dismiss') }}
+          </Button>
+          <Button variant="secondary" size="lg" @click="seeErrors">
+            {{ t('errorOverlay.seeErrors') }}
+          </Button>
+        </div>
+      </div>
+    </div>
+  </Transition>
+</template>
+
+<script setup lang="ts">
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+import { storeToRefs } from 'pinia'
+
+import Button from '@/components/ui/button/Button.vue'
+import { useExecutionErrorStore } from '@/stores/executionErrorStore'
+import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore'
+import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import { useErrorGroups } from '@/components/rightSidePanel/errors/useErrorGroups'
+
+const { t } = useI18n()
+const executionErrorStore = useExecutionErrorStore()
+const rightSidePanelStore = useRightSidePanelStore()
+const canvasStore = useCanvasStore()
+
+const { totalErrorCount, isErrorOverlayOpen } = storeToRefs(executionErrorStore)
+const { groupedErrorMessages } = useErrorGroups(ref(''), t)
+
+const errorCountLabel = computed(() =>
+  t(
+    'errorOverlay.errorCount',
+    { count: totalErrorCount.value },
+    totalErrorCount.value
+  )
+)
+
+const isVisible = computed(
+  () => isErrorOverlayOpen.value && totalErrorCount.value > 0
+)
+
+function dismiss() {
+  executionErrorStore.dismissErrorOverlay()
+}
+
+function seeErrors() {
+  if (canvasStore.canvas) {
+    canvasStore.canvas.deselectAll()
+    canvasStore.updateSelectedItems()
+  }
+
+  rightSidePanelStore.openPanel('errors')
+  executionErrorStore.dismissErrorOverlay()
+}
+</script>
diff --git a/src/components/gradientslider/GradientSlider.test.ts b/src/components/gradientslider/GradientSlider.test.ts
new file mode 100644
index 0000000000..711f04bdd9
--- /dev/null
+++ b/src/components/gradientslider/GradientSlider.test.ts
@@ -0,0 +1,80 @@
+import { mount } from '@vue/test-utils'
+import { describe, expect, it } from 'vitest'
+
+import GradientSlider from './GradientSlider.vue'
+import type { ColorStop } from '@/lib/litegraph/src/interfaces'
+import { interpolateStops, stopsToGradient } from './gradients'
+
+const TEST_STOPS: ColorStop[] = [
+  { offset: 0, color: [0, 0, 0] },
+  { offset: 1, color: [255, 255, 255] }
+]
+
+function mountSlider(props: {
+  stops?: ColorStop[]
+  modelValue: number
+  min?: number
+  max?: number
+  step?: number
+}) {
+  return mount(GradientSlider, {
+    props: { stops: TEST_STOPS, ...props }
+  })
+}
+
+describe('GradientSlider', () => {
+  it('passes min, max, step to SliderRoot', () => {
+    const wrapper = mountSlider({
+      modelValue: 50,
+      min: -100,
+      max: 100,
+      step: 5
+    })
+    const thumb = wrapper.find('[role="slider"]')
+    expect(thumb.attributes('aria-valuemin')).toBe('-100')
+    expect(thumb.attributes('aria-valuemax')).toBe('100')
+  })
+
+  it('renders slider root with track and thumb', () => {
+    const wrapper = mountSlider({ modelValue: 0 })
+    expect(wrapper.find('[data-slider-impl]').exists()).toBe(true)
+    expect(wrapper.find('[role="slider"]').exists()).toBe(true)
+  })
+
+  it('does not render SliderRange', () => {
+    const wrapper = mountSlider({ modelValue: 50 })
+    expect(wrapper.find('[data-slot="slider-range"]').exists()).toBe(false)
+  })
+})
+
+describe('stopsToGradient', () => {
+  it('returns transparent for empty stops', () => {
+    expect(stopsToGradient([])).toBe('transparent')
+  })
+})
+
+describe('interpolateStops', () => {
+  it('returns transparent for empty stops', () => {
+    expect(interpolateStops([], 0.5)).toBe('transparent')
+  })
+
+  it('returns start color at t=0', () => {
+    expect(interpolateStops(TEST_STOPS, 0)).toBe('rgb(0,0,0)')
+  })
+
+  it('returns end color at t=1', () => {
+    expect(interpolateStops(TEST_STOPS, 1)).toBe('rgb(255,255,255)')
+  })
+
+  it('returns midpoint color at t=0.5', () => {
+    expect(interpolateStops(TEST_STOPS, 0.5)).toBe('rgb(128,128,128)')
+  })
+
+  it('clamps values below 0', () => {
+    expect(interpolateStops(TEST_STOPS, -1)).toBe('rgb(0,0,0)')
+  })
+
+  it('clamps values above 1', () => {
+    expect(interpolateStops(TEST_STOPS, 2)).toBe('rgb(255,255,255)')
+  })
+})
diff --git a/src/components/gradientslider/GradientSlider.vue b/src/components/gradientslider/GradientSlider.vue
new file mode 100644
index 0000000000..e2ab617dde
--- /dev/null
+++ b/src/components/gradientslider/GradientSlider.vue
@@ -0,0 +1,90 @@
+<script setup lang="ts">
+import { SliderRoot, SliderThumb, SliderTrack } from 'reka-ui'
+import { computed, ref } from 'vue'
+
+import type { ColorStop } from '@/lib/litegraph/src/interfaces'
+import {
+  interpolateStops,
+  stopsToGradient
+} from '@/components/gradientslider/gradients'
+import { cn } from '@/utils/tailwindUtil'
+
+const {
+  stops,
+  min = 0,
+  max = 100,
+  step = 1,
+  disabled = false,
+  ariaLabel
+} = defineProps<{
+  stops: ColorStop[]
+  min?: number
+  max?: number
+  step?: number
+  disabled?: boolean
+  ariaLabel?: string
+}>()
+
+const modelValue = defineModel<number>({ required: true })
+
+const sliderValue = computed({
+  get: () => [modelValue.value],
+  set: (v: number[]) => {
+    if (v.length) modelValue.value = v[0]
+  }
+})
+
+const gradient = computed(() => stopsToGradient(stops))
+
+const thumbColor = computed(() => {
+  const t = max === min ? 0 : (modelValue.value - min) / (max - min)
+  return interpolateStops(stops, t)
+})
+
+const pressed = ref(false)
+</script>
+
+<template>
+  <SliderRoot
+    v-model="sliderValue"
+    :min
+    :max
+    :step
+    :disabled
+    :class="
+      cn(
+        'relative flex w-full touch-none items-center select-none',
+        'data-disabled:opacity-50'
+      )
+    "
+    :style="{ '--reka-slider-thumb-transform': 'translate(-50%, -50%)' }"
+    @slide-start="pressed = true"
+    @slide-move="pressed = true"
+    @slide-end="pressed = false"
+  >
+    <SliderTrack
+      :class="
+        cn(
+          'relative h-2.5 w-full grow cursor-pointer overflow-visible rounded-full',
+          'before:absolute before:-inset-2 before:block before:bg-transparent'
+        )
+      "
+      :style="{ background: gradient }"
+    >
+      <SliderThumb
+        :class="
+          cn(
+            'top-1/2 block size-4 shrink-0 cursor-grab rounded-full shadow-md ring-1 ring-black/25',
+            'transition-[color,box-shadow,background-color]',
+            'before:absolute before:-inset-1.5 before:block before:rounded-full before:bg-transparent',
+            'hover:ring-2 hover:ring-black/40 focus-visible:ring-2 focus-visible:ring-black/40 focus-visible:outline-hidden',
+            'disabled:pointer-events-none disabled:opacity-50',
+            { 'cursor-grabbing': pressed }
+          )
+        "
+        :style="{ backgroundColor: thumbColor }"
+        :aria-label
+      />
+    </SliderTrack>
+  </SliderRoot>
+</template>
diff --git a/src/components/gradientslider/gradients.ts b/src/components/gradientslider/gradients.ts
new file mode 100644
index 0000000000..b9a1da90c3
--- /dev/null
+++ b/src/components/gradientslider/gradients.ts
@@ -0,0 +1,40 @@
+import type { ColorStop } from '@/lib/litegraph/src/interfaces'
+
+export function stopsToGradient(stops: ColorStop[]): string {
+  if (!stops.length) return 'transparent'
+  const colors = stops.map(
+    ({ offset, color: [r, g, b] }) => `rgb(${r},${g},${b}) ${offset * 100}%`
+  )
+  return `linear-gradient(to right, ${colors.join(', ')})`
+}
+
+export function interpolateStops(stops: ColorStop[], t: number): string {
+  if (!stops.length) return 'transparent'
+  const clamped = Math.max(0, Math.min(1, t))
+
+  if (clamped <= stops[0].offset) {
+    const [r, g, b] = stops[0].color
+    return `rgb(${r},${g},${b})`
+  }
+
+  for (let i = 0; i < stops.length - 1; i++) {
+    const {
+      offset: o1,
+      color: [r1, g1, b1]
+    } = stops[i]
+    const {
+      offset: o2,
+      color: [r2, g2, b2]
+    } = stops[i + 1]
+    if (clamped >= o1 && clamped <= o2) {
+      const f = o2 === o1 ? 0 : (clamped - o1) / (o2 - o1)
+      const r = Math.round(r1 + (r2 - r1) * f)
+      const g = Math.round(g1 + (g2 - g1) * f)
+      const b = Math.round(b1 + (b2 - b1) * f)
+      return `rgb(${r},${g},${b})`
+    }
+  }
+
+  const [r, g, b] = stops[stops.length - 1].color
+  return `rgb(${r},${g},${b})`
+}
diff --git a/src/components/graph/CanvasModeSelector.vue b/src/components/graph/CanvasModeSelector.vue
index e6c78fd1ad..c339d5f989 100644
--- a/src/components/graph/CanvasModeSelector.vue
+++ b/src/components/graph/CanvasModeSelector.vue
@@ -10,9 +10,9 @@
       <div
         class="rounded-lg bg-interface-panel-selected-surface p-2 group-hover:bg-interface-button-hover-surface"
       >
-        <i :class="currentModeIcon" class="block h-4 w-4" />
+        <i :class="currentModeIcon" class="block size-4" />
       </div>
-      <i class="icon-[lucide--chevron-down] block h-4 w-4 pr-1.5" />
+      <i class="icon-[lucide--chevron-down] block size-4 pr-1.5" />
     </div>
   </Button>
 
@@ -31,7 +31,7 @@
         @click="setMode('select')"
       >
         <div class="flex items-center gap-2">
-          <i class="icon-[lucide--mouse-pointer-2] h-4 w-4" />
+          <i class="icon-[lucide--mouse-pointer-2] size-4" />
           <span>{{ $t('graphCanvasMenu.select') }}</span>
         </div>
         <span class="text-[9px] text-text-primary">{{
@@ -40,11 +40,11 @@
       </div>
 
       <div
-        class="flex cursor-pointer items-center justify-between rounded px-3 py-2 text-sm hover:bg-node-component-surface-hovered"
+        class="flex cursor-pointer items-center justify-between rounded-sm px-3 py-2 text-sm hover:bg-node-component-surface-hovered"
         @click="setMode('hand')"
       >
         <div class="flex items-center gap-2">
-          <i class="icon-[lucide--hand] h-4 w-4" />
+          <i class="icon-[lucide--hand] size-4" />
           <span>{{ $t('graphCanvasMenu.hand') }}</span>
         </div>
         <span class="text-[9px] text-text-primary">{{ lockCommandText }}</span>
@@ -55,6 +55,7 @@
 
 <script setup lang="ts">
 import Popover from 'primevue/popover'
+import type { ComponentPublicInstance } from 'vue'
 import { computed, ref } from 'vue'
 
 import Button from '@/components/ui/button/Button.vue'
@@ -66,7 +67,7 @@ interface Props {
 }
 
 defineProps<Props>()
-const buttonRef = ref<InstanceType<typeof Button>>()
+const buttonRef = ref<ComponentPublicInstance | null>(null)
 const popover = ref<InstanceType<typeof Popover>>()
 const commandStore = useCommandStore()
 const canvasStore = useCanvasStore()
@@ -92,7 +93,7 @@ const lockCommandText = computed(() =>
 )
 
 const toggle = (event: Event) => {
-  const el = (buttonRef.value as any)?.$el || buttonRef.value
+  const el = buttonRef.value?.$el || buttonRef.value
   popover.value?.toggle(event, el)
 }
 
diff --git a/src/components/graph/DomWidgets.test.ts b/src/components/graph/DomWidgets.test.ts
new file mode 100644
index 0000000000..2b9c1fbf77
--- /dev/null
+++ b/src/components/graph/DomWidgets.test.ts
@@ -0,0 +1,209 @@
+import { mount } from '@vue/test-utils'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import DomWidgets from '@/components/graph/DomWidgets.vue'
+import { Rectangle } from '@/lib/litegraph/src/infrastructure/Rectangle'
+import { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type { LGraphCanvas } from '@/lib/litegraph/src/LGraphCanvas'
+import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import type { BaseDOMWidget } from '@/scripts/domWidget'
+import { useDomWidgetStore } from '@/stores/domWidgetStore'
+import { createTestingPinia } from '@pinia/testing'
+
+type TestWidget = BaseDOMWidget<object | string>
+
+function createNode(
+  graph: LGraph,
+  id: number,
+  title: string,
+  pos: [number, number]
+) {
+  const node = new LGraphNode(title)
+  node.id = id
+  node.pos = [...pos]
+  node.size = [240, 120]
+  graph.add(node)
+  return node
+}
+
+function createWidget(id: string, node: LGraphNode, y = 12): TestWidget {
+  return {
+    id,
+    node,
+    name: 'test_widget',
+    type: 'custom',
+    value: '',
+    options: {},
+    y,
+    width: 120,
+    computedHeight: 40,
+    margin: 10,
+    isVisible: () => true
+  } as unknown as TestWidget
+}
+
+function createCanvas(graph: LGraph): LGraphCanvas {
+  return {
+    graph,
+    low_quality: false,
+    read_only: false,
+    isNodeVisible: vi.fn(() => true)
+  } as unknown as LGraphCanvas
+}
+
+function drawFrame(canvas: LGraphCanvas) {
+  canvas.onDrawForeground?.({} as CanvasRenderingContext2D, new Rectangle())
+}
+
+describe('DomWidgets transition grace characterization', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+  })
+
+  it('applies transition grace for exactly one frame when override exists but is not active', () => {
+    const canvasStore = useCanvasStore()
+    const domWidgetStore = useDomWidgetStore()
+
+    const graphA = new LGraph()
+    const graphB = new LGraph()
+    const interiorNode = createNode(graphA, 1, 'interior', [100, 200])
+    const overrideNode = createNode(graphB, 2, 'override', [600, 700])
+
+    const widget = createWidget('widget-transition', interiorNode, 14)
+    const overrideWidget = createWidget('override-widget', overrideNode, 22)
+
+    domWidgetStore.registerWidget(widget)
+    domWidgetStore.setPositionOverride(widget.id, {
+      node: overrideNode,
+      widget: overrideWidget
+    })
+    domWidgetStore.deactivateWidget(widget.id)
+
+    const widgetState = domWidgetStore.widgetStates.get(widget.id)
+    if (!widgetState) throw new Error('Widget state not registered')
+    widgetState.visible = true
+    widgetState.pos = [321, 654]
+
+    const canvas = createCanvas(graphA)
+    canvasStore.canvas = canvas
+
+    mount(DomWidgets, {
+      global: {
+        stubs: {
+          DomWidget: true
+        }
+      }
+    })
+
+    drawFrame(canvas)
+    expect(widgetState.visible).toBe(true)
+    expect(widgetState.pos).toEqual([321, 654])
+
+    drawFrame(canvas)
+    expect(widgetState.visible).toBe(false)
+  })
+
+  it('uses override positioning while override node is in current graph even when widget is inactive', () => {
+    const canvasStore = useCanvasStore()
+    const domWidgetStore = useDomWidgetStore()
+
+    const graphA = new LGraph()
+    const graphB = new LGraph()
+    const interiorNode = createNode(graphA, 1, 'interior', [10, 20])
+    const overrideNode = createNode(graphB, 2, 'override', [300, 400])
+
+    const widget = createWidget('widget-override-active', interiorNode, 8)
+    const overrideWidget = createWidget(
+      'override-position-source',
+      overrideNode,
+      18
+    )
+
+    domWidgetStore.registerWidget(widget)
+    domWidgetStore.setPositionOverride(widget.id, {
+      node: overrideNode,
+      widget: overrideWidget
+    })
+    domWidgetStore.deactivateWidget(widget.id)
+
+    const widgetState = domWidgetStore.widgetStates.get(widget.id)
+    if (!widgetState) throw new Error('Widget state not registered')
+
+    const canvas = createCanvas(graphB)
+    canvasStore.canvas = canvas
+
+    mount(DomWidgets, {
+      global: {
+        stubs: {
+          DomWidget: true
+        }
+      }
+    })
+
+    drawFrame(canvas)
+
+    expect(widgetState.visible).toBe(true)
+    expect(widgetState.pos).toEqual([310, 428])
+  })
+
+  it('cleans orphaned transition-grace ids after widget removal', () => {
+    const canvasStore = useCanvasStore()
+    const domWidgetStore = useDomWidgetStore()
+
+    const graphA = new LGraph()
+    const graphB = new LGraph()
+    const interiorNode = createNode(graphA, 1, 'interior', [0, 0])
+    const overrideNode = createNode(graphB, 2, 'override', [200, 200])
+
+    const canvas = createCanvas(graphA)
+    canvasStore.canvas = canvas
+
+    mount(DomWidgets, {
+      global: {
+        stubs: {
+          DomWidget: true
+        }
+      }
+    })
+
+    const oldWidget = createWidget('shared-widget-id', interiorNode, 10)
+    const overrideWidget = createWidget(
+      'shared-override-widget',
+      overrideNode,
+      14
+    )
+
+    domWidgetStore.registerWidget(oldWidget)
+    domWidgetStore.setPositionOverride(oldWidget.id, {
+      node: overrideNode,
+      widget: overrideWidget
+    })
+    domWidgetStore.deactivateWidget(oldWidget.id)
+
+    drawFrame(canvas)
+    domWidgetStore.unregisterWidget(oldWidget.id)
+
+    drawFrame(canvas)
+
+    const replacementWidget = createWidget('shared-widget-id', interiorNode, 10)
+    domWidgetStore.registerWidget(replacementWidget)
+    domWidgetStore.setPositionOverride(replacementWidget.id, {
+      node: overrideNode,
+      widget: overrideWidget
+    })
+    domWidgetStore.deactivateWidget(replacementWidget.id)
+
+    const replacementState = domWidgetStore.widgetStates.get(
+      replacementWidget.id
+    )
+    if (!replacementState) throw new Error('Replacement widget missing state')
+    replacementState.visible = true
+    replacementState.pos = [999, 999]
+
+    drawFrame(canvas)
+
+    expect(replacementState.visible).toBe(true)
+    expect(replacementState.pos).toEqual([999, 999])
+  })
+})
diff --git a/src/components/graph/DomWidgets.vue b/src/components/graph/DomWidgets.vue
index a68e580c9a..69231e9a43 100644
--- a/src/components/graph/DomWidgets.vue
+++ b/src/components/graph/DomWidgets.vue
@@ -15,11 +15,13 @@ import { whenever } from '@vueuse/core'
 import { computed } from 'vue'
 
 import DomWidget from '@/components/graph/widgets/DomWidget.vue'
+import { getDomWidgetZIndex } from '@/components/graph/widgets/domWidgetZIndex'
 import { useChainCallback } from '@/composables/functional/useChainCallback'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import { useDomWidgetStore } from '@/stores/domWidgetStore'
 
 const domWidgetStore = useDomWidgetStore()
+const overrideTransitionGrace = new Set<string>()
 
 const widgetStates = computed(() => [...domWidgetStore.widgetStates.values()])
 
@@ -29,37 +31,76 @@ const updateWidgets = () => {
 
   const lowQuality = lgCanvas.low_quality
   const currentGraph = lgCanvas.graph
+  const seenWidgetIds = new Set<string>()
 
   for (const widgetState of widgetStates.value) {
     const widget = widgetState.widget
+    seenWidgetIds.add(widget.id)
 
-    // Early exit for non-visible widgets
-    if (!widget.isVisible() || !widgetState.active) {
+    // Use position override only when the override node (SubgraphNode) is
+    // in the current graph. When the user enters the subgraph, the override
+    // node is no longer visible — fall back to the widget's own node.
+    // Use graph reference equality (IDs are not unique across graphs).
+    const override = widgetState.positionOverride
+    const useOverride = !!override && currentGraph === override.node.graph
+    const inOverrideTransitionGap =
+      !!override && !useOverride && !widgetState.active
+    const useTransitionGrace =
+      inOverrideTransitionGap && !overrideTransitionGrace.has(widget.id)
+
+    if (useTransitionGrace) {
+      overrideTransitionGrace.add(widget.id)
+    } else if (!inOverrideTransitionGap) {
+      overrideTransitionGrace.delete(widget.id)
+    }
+
+    // Early exit for non-visible widgets.
+    // When a position override is active (widget promoted to SubgraphNode),
+    // the interior widget's `active` flag is false (its node is in the
+    // subgraph, not the current graph) — bypass that check.
+    if (
+      !widget.isVisible() ||
+      (!widgetState.active && !useOverride && !useTransitionGrace)
+    ) {
       widgetState.visible = false
       continue
     }
 
-    // Check if the widget's node is in the current graph
-    const node = widget.node
-    const isInCorrectGraph = currentGraph?.nodes.includes(node)
+    // During graph transitions, hold the previous position for one frame
+    // so promoted widgets don't briefly disappear before activation flips.
+    if (useTransitionGrace) continue
+
+    const posNode = useOverride ? override.node : widget.node
+    const posWidget = useOverride ? override.widget : widget
+
+    const isInCorrectGraph = posNode.graph === currentGraph
+    const nodeVisible = lgCanvas.isNodeVisible(posNode)
 
     widgetState.visible =
-      !!isInCorrectGraph &&
-      lgCanvas.isNodeVisible(node) &&
+      isInCorrectGraph &&
+      nodeVisible &&
       !(widget.options.hideOnZoom && lowQuality)
 
-    if (widgetState.visible && node) {
+    if (widgetState.visible) {
       const margin = widget.margin
-      widgetState.pos = [node.pos[0] + margin, node.pos[1] + margin + widget.y]
-      widgetState.size = [
-        (widget.width ?? node.width) - margin * 2,
-        (widget.computedHeight ?? 50) - margin * 2
+      widgetState.pos = [
+        posNode.pos[0] + margin,
+        posNode.pos[1] + margin + posWidget.y
       ]
-      // TODO: optimize this logic as it's O(n), where n is the number of nodes
-      widgetState.zIndex = lgCanvas.graph?.nodes.indexOf(node) ?? -1
+      widgetState.size = [
+        (posWidget.width ?? posNode.width) - margin * 2,
+        (posWidget.computedHeight ?? 50) - margin * 2
+      ]
+      widgetState.zIndex = getDomWidgetZIndex(posNode, currentGraph)
       widgetState.readonly = lgCanvas.read_only
     }
   }
+
+  for (const widgetId of overrideTransitionGrace) {
+    if (!seenWidgetIds.has(widgetId)) {
+      overrideTransitionGrace.delete(widgetId)
+    }
+  }
 }
 
 const canvasStore = useCanvasStore()
diff --git a/src/components/graph/GraphCanvas.vue b/src/components/graph/GraphCanvas.vue
index 48d82e44b4..c4797a3f97 100644
--- a/src/components/graph/GraphCanvas.vue
+++ b/src/components/graph/GraphCanvas.vue
@@ -6,44 +6,51 @@
     <template v-if="showUI" #workflow-tabs>
       <div
         v-if="workflowTabsPosition === 'Topbar'"
-        class="workflow-tabs-container pointer-events-auto relative h-9.5 w-full"
+        class="workflow-tabs-container pointer-events-auto relative h-(--workflow-tabs-height) w-full"
       >
         <!-- Native drag area for Electron -->
         <div
           v-if="isNativeWindow() && workflowTabsPosition !== 'Topbar'"
-          class="app-drag fixed top-0 left-0 z-10 h-[var(--comfy-topbar-height)] w-full"
+          class="app-drag fixed top-0 left-0 z-10 h-(--comfy-topbar-height) w-full"
         />
         <div
           class="flex h-full items-center border-b border-interface-stroke bg-comfy-menu-bg shadow-interface"
         >
           <WorkflowTabs />
           <TopbarBadges />
+          <TopbarSubscribeButton />
         </div>
       </div>
     </template>
-    <template v-if="showUI" #side-toolbar>
+    <template v-if="showUI && !isBuilderMode" #side-toolbar>
       <SideToolbar />
     </template>
     <template v-if="showUI" #side-bar-panel>
       <div
-        class="sidebar-content-container h-full w-full overflow-x-hidden overflow-y-auto"
+        class="sidebar-content-container size-full overflow-x-hidden overflow-y-auto"
       >
         <ExtensionSlot v-if="activeSidebarTab" :extension="activeSidebarTab" />
       </div>
     </template>
-    <template v-if="showUI" #topmenu>
+    <template v-if="showUI && !isBuilderMode" #topmenu>
       <TopMenuSection />
     </template>
     <template v-if="showUI" #bottom-panel>
       <BottomPanel />
     </template>
     <template v-if="showUI" #right-side-panel>
-      <NodePropertiesPanel />
+      <AppBuilder v-if="isBuilderMode" />
+      <NodePropertiesPanel v-else />
     </template>
     <template #graph-canvas-panel>
-      <GraphCanvasMenu v-if="canvasMenuEnabled" class="pointer-events-auto" />
+      <GraphCanvasMenu
+        v-if="canvasMenuEnabled && !isBuilderMode"
+        class="pointer-events-auto"
+      />
       <MiniMap
-        v-if="comfyAppReady && minimapEnabled && betaMenuEnabled"
+        v-if="
+          comfyAppReady && minimapEnabled && betaMenuEnabled && !isBuilderMode
+        "
         class="pointer-events-auto"
       />
     </template>
@@ -60,6 +67,9 @@
     v-if="shouldRenderVueNodes && comfyApp.canvas && comfyAppReady"
     :canvas="comfyApp.canvas"
     @wheel.capture="canvasInteractions.forwardEventToCanvas"
+    @pointerdown.capture="forwardPanEvent"
+    @pointerup.capture="forwardPanEvent"
+    @pointermove.capture="forwardPanEvent"
   >
     <!-- Vue nodes rendered based on graph nodes -->
     <LGraphNode
@@ -67,7 +77,7 @@
       :key="nodeData.id"
       :node-data="nodeData"
       :error="
-        executionStore.lastExecutionError?.node_id === nodeData.id
+        executionErrorStore.lastExecutionError?.node_id === nodeData.id
           ? 'Execution error'
           : null
       "
@@ -76,6 +86,13 @@
     />
   </TransformPane>
 
+  <LinkOverlayCanvas
+    v-if="shouldRenderVueNodes && comfyApp.canvas && comfyAppReady"
+    :canvas="comfyApp.canvas"
+    @ready="onLinkOverlayReady"
+    @dispose="onLinkOverlayDispose"
+  />
+
   <!-- Selection rectangle overlay - rendered in DOM layer to appear above DOM widgets -->
   <SelectionRectangle v-if="comfyAppReady" />
 
@@ -87,13 +104,14 @@
   <template v-if="comfyAppReady">
     <TitleEditor />
     <SelectionToolbox v-if="selectionToolboxEnabled" />
+    <NodeContextMenu />
     <!-- Render legacy DOM widgets only when Vue nodes are disabled -->
     <DomWidgets v-if="!shouldRenderVueNodes" />
   </template>
 </template>
 
 <script setup lang="ts">
-import { useEventListener, whenever } from '@vueuse/core'
+import { until, useEventListener } from '@vueuse/core'
 import {
   computed,
   nextTick,
@@ -104,20 +122,26 @@ import {
   watch,
   watchEffect
 } from 'vue'
+import { useI18n } from 'vue-i18n'
 
+import { isMiddlePointerInput } from '@/base/pointerUtils'
 import LiteGraphCanvasSplitterOverlay from '@/components/LiteGraphCanvasSplitterOverlay.vue'
 import TopMenuSection from '@/components/TopMenuSection.vue'
 import BottomPanel from '@/components/bottomPanel/BottomPanel.vue'
+import AppBuilder from '@/components/builder/AppBuilder.vue'
 import ExtensionSlot from '@/components/common/ExtensionSlot.vue'
 import DomWidgets from '@/components/graph/DomWidgets.vue'
 import GraphCanvasMenu from '@/components/graph/GraphCanvasMenu.vue'
+import LinkOverlayCanvas from '@/components/graph/LinkOverlayCanvas.vue'
 import NodeTooltip from '@/components/graph/NodeTooltip.vue'
+import NodeContextMenu from '@/components/graph/NodeContextMenu.vue'
 import SelectionToolbox from '@/components/graph/SelectionToolbox.vue'
 import TitleEditor from '@/components/graph/TitleEditor.vue'
 import NodePropertiesPanel from '@/components/rightSidePanel/RightSidePanel.vue'
 import NodeSearchboxPopover from '@/components/searchbox/NodeSearchBoxPopover.vue'
 import SideToolbar from '@/components/sidebar/SideToolbar.vue'
 import TopbarBadges from '@/components/topbar/TopbarBadges.vue'
+import TopbarSubscribeButton from '@/components/topbar/TopbarSubscribeButton.vue'
 import WorkflowTabs from '@/components/topbar/WorkflowTabs.vue'
 import { useChainCallback } from '@/composables/functional/useChainCallback'
 import type { VueNodeData } from '@/composables/graph/useGraphNodeManager'
@@ -129,7 +153,6 @@ import { useCopy } from '@/composables/useCopy'
 import { useGlobalLitegraph } from '@/composables/useGlobalLitegraph'
 import { usePaste } from '@/composables/usePaste'
 import { useVueFeatureFlags } from '@/composables/useVueFeatureFlags'
-import { mergeCustomNodesI18n, t } from '@/i18n'
 import { LiteGraph } from '@/lib/litegraph/src/litegraph'
 import { useLitegraphSettings } from '@/platform/settings/composables/useLitegraphSettings'
 import { CORE_SETTINGS } from '@/platform/settings/constants/coreSettings'
@@ -138,29 +161,39 @@ import { useToastStore } from '@/platform/updates/common/toastStore'
 import { useWorkflowService } from '@/platform/workflow/core/services/workflowService'
 import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
 import { useWorkflowAutoSave } from '@/platform/workflow/persistence/composables/useWorkflowAutoSave'
-import { useWorkflowPersistence } from '@/platform/workflow/persistence/composables/useWorkflowPersistence'
+import { useWorkflowPersistenceV2 as useWorkflowPersistence } from '@/platform/workflow/persistence/composables/useWorkflowPersistenceV2'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import { useCanvasInteractions } from '@/renderer/core/canvas/useCanvasInteractions'
 import TransformPane from '@/renderer/core/layout/transform/TransformPane.vue'
 import MiniMap from '@/renderer/extensions/minimap/MiniMap.vue'
 import LGraphNode from '@/renderer/extensions/vueNodes/components/LGraphNode.vue'
-import { UnauthorizedError, api } from '@/scripts/api'
+import { UnauthorizedError } from '@/scripts/api'
 import { app as comfyApp } from '@/scripts/app'
 import { ChangeTracker } from '@/scripts/changeTracker'
 import { IS_CONTROL_WIDGET, updateControlWidgetLabel } from '@/scripts/widgets'
 import { useColorPaletteService } from '@/services/colorPaletteService'
-import { newUserService } from '@/services/newUserService'
+import { useNewUserService } from '@/services/useNewUserService'
+import { shouldIgnoreCopyPaste } from '@/workbench/eventHelpers'
+import { storeToRefs } from 'pinia'
+
+import { useBootstrapStore } from '@/stores/bootstrapStore'
 import { useCommandStore } from '@/stores/commandStore'
 import { useExecutionStore } from '@/stores/executionStore'
+import { useExecutionErrorStore } from '@/stores/executionErrorStore'
 import { useNodeDefStore } from '@/stores/nodeDefStore'
 import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
 import { useSearchBoxStore } from '@/stores/workspace/searchBoxStore'
+import { useAppMode } from '@/composables/useAppMode'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
 import { isNativeWindow } from '@/utils/envUtil'
 import { forEachNode } from '@/utils/graphTraversalUtil'
 
 import SelectionRectangle from './SelectionRectangle.vue'
+import { isCloud } from '@/platform/distribution/types'
+import { useFeatureFlags } from '@/composables/useFeatureFlags'
+import { useInviteUrlLoader } from '@/platform/workspace/composables/useInviteUrlLoader'
 
+const { t } = useI18n()
 const emit = defineEmits<{
   ready: []
 }>()
@@ -171,12 +204,19 @@ const nodeSearchboxPopoverRef = shallowRef<InstanceType<
 const settingStore = useSettingStore()
 const nodeDefStore = useNodeDefStore()
 const workspaceStore = useWorkspaceStore()
+const { isBuilderMode } = useAppMode()
 const canvasStore = useCanvasStore()
+const workflowStore = useWorkflowStore()
 const executionStore = useExecutionStore()
+const executionErrorStore = useExecutionErrorStore()
 const toastStore = useToastStore()
 const colorPaletteStore = useColorPaletteStore()
 const colorPaletteService = useColorPaletteService()
 const canvasInteractions = useCanvasInteractions()
+const bootstrapStore = useBootstrapStore()
+const { isI18nReady, i18nError } = storeToRefs(bootstrapStore)
+const { isReady: isSettingsReady, error: settingsError } =
+  storeToRefs(settingStore)
 
 const betaMenuEnabled = computed(
   () => settingStore.get('Comfy.UseNewMenu') !== 'Disabled'
@@ -230,6 +270,18 @@ const allNodes = computed((): VueNodeData[] =>
   Array.from(vueNodeLifecycle.nodeManager.value?.vueNodeData?.values() ?? [])
 )
 
+function onLinkOverlayReady(el: HTMLCanvasElement) {
+  if (!canvasStore.canvas) return
+  canvasStore.canvas.overlayCanvas = el
+  canvasStore.canvas.overlayCtx = el.getContext('2d')
+}
+
+function onLinkOverlayDispose() {
+  if (!canvasStore.canvas) return
+  canvasStore.canvas.overlayCanvas = null
+  canvasStore.canvas.overlayCtx = null
+}
+
 watchEffect(() => {
   LiteGraph.nodeOpacity = settingStore.get('Comfy.Node.Opacity')
 })
@@ -337,7 +389,7 @@ watch(
 // Update node slot errors for LiteGraph nodes
 // (Vue nodes read from store directly)
 watch(
-  () => executionStore.lastNodeErrors,
+  () => executionErrorStore.lastNodeErrors,
   (lastNodeErrors) => {
     if (!comfyApp.graph) return
 
@@ -383,50 +435,79 @@ useEventListener(
   { passive: true }
 )
 
-const loadCustomNodesI18n = async () => {
-  try {
-    const i18nData = await api.getCustomNodesI18n()
-    mergeCustomNodesI18n(i18nData)
-  } catch (error) {
-    console.error('Failed to load custom nodes i18n', error)
-  }
-}
-
 const comfyAppReady = ref(false)
 const workflowPersistence = useWorkflowPersistence()
+const { flags } = useFeatureFlags()
+// Set up invite loader during setup phase so useRoute/useRouter work correctly
+const inviteUrlLoader = isCloud ? useInviteUrlLoader() : null
 useCanvasDrop(canvasRef)
 useLitegraphSettings()
 useNodeBadge()
 
+useGlobalLitegraph()
+useContextMenuTranslation()
+useCopy()
+usePaste()
+useWorkflowAutoSave()
+
+// Start watching for locale change after the initial value is loaded.
+watch(
+  () => settingStore.get('Comfy.Locale'),
+  async (_newLocale, oldLocale) => {
+    if (!oldLocale) return
+    await Promise.all([
+      until(() => isSettingsReady.value || !!settingsError.value).toBe(true),
+      until(() => isI18nReady.value || !!i18nError.value).toBe(true)
+    ])
+    if (settingsError.value || i18nError.value) {
+      console.warn(
+        'Somehow the Locale setting was changed while the settings or i18n had a setup error'
+      )
+    }
+    await useCommandStore().execute('Comfy.RefreshNodeDefinitions')
+    await useWorkflowService().reloadCurrentWorkflow()
+  }
+)
+useEventListener(
+  () => canvasStore.canvas?.canvas,
+  'litegraph:set-graph',
+  () => {
+    workflowStore.updateActiveGraph()
+  }
+)
+
 onMounted(async () => {
-  useGlobalLitegraph()
-  useContextMenuTranslation()
-  useCopy()
-  usePaste()
-  useWorkflowAutoSave()
-  useVueFeatureFlags()
-
   comfyApp.vueAppReady = true
-
   workspaceStore.spinner = true
   // ChangeTracker needs to be initialized before setup, as it will overwrite
   // some listeners of litegraph canvas.
   ChangeTracker.init()
-  await loadCustomNodesI18n()
-  try {
-    await settingStore.loadSettingValues()
-  } catch (error) {
-    if (error instanceof UnauthorizedError) {
+
+  await until(() => isSettingsReady.value || !!settingsError.value).toBe(true)
+
+  if (settingsError.value) {
+    if (settingsError.value instanceof UnauthorizedError) {
       localStorage.removeItem('Comfy.userId')
       localStorage.removeItem('Comfy.userName')
       window.location.reload()
-    } else {
-      throw error
+      return
     }
+    throw settingsError.value
   }
+
+  // Register core settings immediately after settings are ready
   CORE_SETTINGS.forEach(settingStore.addSetting)
 
-  await newUserService().initializeIfNewUser(settingStore)
+  await Promise.all([
+    until(() => isI18nReady.value || !!i18nError.value).toBe(true),
+    useNewUserService().initializeIfNewUser()
+  ])
+  if (i18nError.value) {
+    console.warn(
+      '[GraphCanvas] Failed to load custom nodes i18n:',
+      i18nError.value
+    )
+  }
 
   // @ts-expect-error fixme ts strict error
   await comfyApp.setup(canvasRef.value)
@@ -456,8 +537,19 @@ onMounted(async () => {
   await workflowPersistence.initializeWorkflow()
   workflowPersistence.restoreWorkflowTabsState()
 
+  const sharedWorkflowLoadStatus =
+    await workflowPersistence.loadSharedWorkflowFromUrlIfPresent()
+
   // Load template from URL if present
-  await workflowPersistence.loadTemplateFromUrlIfPresent()
+  if (sharedWorkflowLoadStatus === 'not-present') {
+    await workflowPersistence.loadTemplateFromUrlIfPresent()
+  }
+
+  // Accept workspace invite from URL if present (e.g., ?invite=TOKEN)
+  // WorkspaceAuthGate ensures flag state is resolved before GraphCanvas mounts
+  if (inviteUrlLoader && flags.teamWorkspacesEnabled) {
+    await inviteUrlLoader.loadInviteFromUrl()
+  }
 
   // Initialize release store to fetch releases from comfy-api (fire-and-forget)
   const { useReleaseStore } =
@@ -465,29 +557,19 @@ onMounted(async () => {
   const releaseStore = useReleaseStore()
   void releaseStore.initialize()
 
-  // Start watching for locale change after the initial value is loaded.
-  watch(
-    () => settingStore.get('Comfy.Locale'),
-    async () => {
-      await useCommandStore().execute('Comfy.RefreshNodeDefinitions')
-      await useWorkflowService().reloadCurrentWorkflow()
-    }
-  )
-
-  whenever(
-    () => useCanvasStore().canvas,
-    (canvas) => {
-      useEventListener(canvas.canvas, 'litegraph:set-graph', () => {
-        useWorkflowStore().updateActiveGraph()
-      })
-    },
-    { immediate: true }
-  )
-
   emit('ready')
 })
 
 onUnmounted(() => {
   vueNodeLifecycle.cleanup()
 })
+function forwardPanEvent(e: PointerEvent) {
+  if (
+    (shouldIgnoreCopyPaste(e.target) && document.activeElement === e.target) ||
+    !isMiddlePointerInput(e)
+  )
+    return
+
+  canvasInteractions.forwardEventToCanvas(e)
+}
 </script>
diff --git a/src/components/graph/GraphCanvasMenu.vue b/src/components/graph/GraphCanvasMenu.vue
index 0b5746d89f..2a31325ab1 100644
--- a/src/components/graph/GraphCanvasMenu.vue
+++ b/src/components/graph/GraphCanvasMenu.vue
@@ -10,7 +10,7 @@
     ></div>
 
     <ButtonGroup
-      class="absolute right-0 bottom-0 z-1200 flex-row gap-1 border-[1px] border-interface-stroke bg-comfy-menu-bg p-2"
+      class="absolute right-0 bottom-0 z-1200 flex-row gap-1 border border-interface-stroke bg-comfy-menu-bg p-2"
       :style="{
         ...stringifiedMinimapStyles.buttonGroupStyles
       }"
@@ -20,17 +20,17 @@
         :button-styles="stringifiedMinimapStyles.buttonStyles"
       />
 
-      <div class="h-[27px] w-[1px] self-center bg-node-divider" />
+      <div class="h-[27px] w-px self-center bg-node-divider" />
 
       <Button
         v-tooltip.top="fitViewTooltip"
         variant="secondary"
         :aria-label="fitViewTooltip"
         :style="stringifiedMinimapStyles.buttonStyles"
-        class="h-8 w-8 bg-comfy-menu-bg p-0 hover:bg-interface-button-hover-surface!"
+        class="size-8 bg-comfy-menu-bg p-0 hover:bg-interface-button-hover-surface!"
         @click="() => commandStore.execute('Comfy.Canvas.FitView')"
       >
-        <i class="icon-[lucide--focus] h-4 w-4" />
+        <i class="icon-[lucide--focus] size-4" />
       </Button>
 
       <Button
@@ -44,11 +44,11 @@
       >
         <span class="inline-flex items-center gap-1 px-2 text-xs">
           <span>{{ canvasStore.appScalePercentage }}%</span>
-          <i class="icon-[lucide--chevron-down] h-4 w-4" />
+          <i class="icon-[lucide--chevron-down] size-4" />
         </span>
       </Button>
 
-      <div class="h-[27px] w-[1px] self-center bg-node-divider" />
+      <div class="h-[27px] w-px self-center bg-node-divider" />
 
       <Button
         v-tooltip.top="minimapTooltip"
@@ -59,7 +59,7 @@
         :class="minimapButtonClass"
         @click="onMinimapToggleClick"
       >
-        <i class="icon-[lucide--map] h-4 w-4" />
+        <i class="icon-[lucide--map] size-4" />
       </Button>
 
       <Button
@@ -78,7 +78,7 @@
         :style="stringifiedMinimapStyles.buttonStyles"
         @click="onLinkVisibilityToggleClick"
       >
-        <i class="icon-[lucide--route-off] h-4 w-4" />
+        <i class="icon-[lucide--route-off] size-4" />
       </Button>
     </ButtonGroup>
   </div>
diff --git a/src/components/graph/LinkOverlayCanvas.vue b/src/components/graph/LinkOverlayCanvas.vue
new file mode 100644
index 0000000000..a29726b25f
--- /dev/null
+++ b/src/components/graph/LinkOverlayCanvas.vue
@@ -0,0 +1,43 @@
+<template>
+  <canvas
+    ref="canvasRef"
+    class="pointer-events-none absolute inset-0 size-full"
+  />
+</template>
+
+<script setup lang="ts">
+import type { LGraphCanvas } from '@/lib/litegraph/src/LGraphCanvas'
+
+import { useRafFn } from '@vueuse/core'
+import { onBeforeUnmount, onMounted, ref } from 'vue'
+
+const { canvas } = defineProps<{
+  canvas: LGraphCanvas
+}>()
+
+const emit = defineEmits<{
+  ready: [canvas: HTMLCanvasElement]
+  dispose: []
+}>()
+
+const canvasRef = ref<HTMLCanvasElement | null>(null)
+
+useRafFn(() => {
+  const el = canvasRef.value
+  const mainCanvas = canvas.canvas
+  if (!el || !mainCanvas) return
+
+  if (el.width !== mainCanvas.width || el.height !== mainCanvas.height) {
+    el.width = mainCanvas.width
+    el.height = mainCanvas.height
+  }
+})
+
+onMounted(() => {
+  if (canvasRef.value) emit('ready', canvasRef.value)
+})
+
+onBeforeUnmount(() => {
+  emit('dispose')
+})
+</script>
diff --git a/src/components/graph/NodeContextMenu.vue b/src/components/graph/NodeContextMenu.vue
index 8382a43ece..5c06c79f65 100644
--- a/src/components/graph/NodeContextMenu.vue
+++ b/src/components/graph/NodeContextMenu.vue
@@ -2,7 +2,7 @@
   <ContextMenu
     ref="contextMenu"
     :model="menuItems"
-    class="max-h-[80vh] md:max-h-none overflow-y-auto md:overflow-y-visible"
+    class="max-h-[80vh] overflow-y-auto md:max-h-none md:overflow-y-visible"
     @show="onMenuShow"
     @hide="onMenuHide"
   >
@@ -16,7 +16,7 @@
         <span class="flex-1">{{ item.label }}</span>
         <span
           v-if="item.shortcut"
-          class="flex h-3.5 min-w-3.5 items-center justify-center rounded bg-interface-menu-keybind-surface-default px-1 py-0 text-xs"
+          class="flex h-3.5 min-w-3.5 items-center justify-center rounded-sm bg-interface-menu-keybind-surface-default px-1 py-0 text-xs"
         >
           {{ item.shortcut }}
         </span>
@@ -220,6 +220,12 @@ function show(event: MouseEvent) {
     y: screenY / scale - offset[1]
   }
 
+  // Initialize last* values to current transform to prevent updateMenuPosition
+  // from overwriting PrimeVue's flip-adjusted position on the first RAF tick
+  lastScale = scale
+  lastOffsetX = offset[0]
+  lastOffsetY = offset[1]
+
   isOpen.value = true
   contextMenu.value?.show(event)
 }
diff --git a/src/components/graph/NodeTooltip.vue b/src/components/graph/NodeTooltip.vue
index c803c05f51..53af7c95ba 100644
--- a/src/components/graph/NodeTooltip.vue
+++ b/src/components/graph/NodeTooltip.vue
@@ -61,7 +61,7 @@ async function showTooltip(tooltip: string | null | undefined) {
 function onIdle() {
   const { canvas } = comfyApp
   const node = canvas?.node_over
-  if (!node) return
+  if (!node || node.flags?.ghost) return
 
   const ctor = node.constructor as { title_mode?: 0 | 1 | 2 | 3 }
   const nodeDef = nodeDefStore.nodeDefsByName[node.type ?? '']
diff --git a/src/components/graph/SelectionToolbox.test.ts b/src/components/graph/SelectionToolbox.test.ts
index 0938a3fe3f..bbbe9d7863 100644
--- a/src/components/graph/SelectionToolbox.test.ts
+++ b/src/components/graph/SelectionToolbox.test.ts
@@ -5,9 +5,28 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { createI18n } from 'vue-i18n'
 
 import SelectionToolbox from '@/components/graph/SelectionToolbox.vue'
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import { useCanvasInteractions } from '@/renderer/core/canvas/useCanvasInteractions'
 import { useExtensionService } from '@/services/extensionService'
+import {
+  createMockCanvas,
+  createMockPositionable
+} from '@/utils/__tests__/litegraphTestUtils'
+import * as litegraphUtil from '@/utils/litegraphUtil'
+import * as nodeFilterUtil from '@/utils/nodeFilterUtil'
+
+function createMockExtensionService(): ReturnType<typeof useExtensionService> {
+  return {
+    extensionCommands: { value: new Map() },
+    loadExtensions: vi.fn(),
+    registerExtension: vi.fn(),
+    invokeExtensions: vi.fn(() => []),
+    invokeExtensionsAsync: vi.fn()
+  } as Partial<ReturnType<typeof useExtensionService>> as ReturnType<
+    typeof useExtensionService
+  >
+}
 
 // Mock the composables and services
 vi.mock('@/renderer/core/canvas/useCanvasInteractions', () => ({
@@ -112,12 +131,7 @@ describe('SelectionToolbox', () => {
     canvasStore = useCanvasStore()
 
     // Mock the canvas to avoid "getCanvas: canvas is null" errors
-    canvasStore.canvas = {
-      setDirty: vi.fn(),
-      state: {
-        selectionChanged: false
-      }
-    } as any
+    canvasStore.canvas = createMockCanvas()
 
     vi.resetAllMocks()
   })
@@ -184,30 +198,27 @@ describe('SelectionToolbox', () => {
   describe('Button Visibility Logic', () => {
     beforeEach(() => {
       const mockExtensionService = vi.mocked(useExtensionService)
-      mockExtensionService.mockReturnValue({
-        extensionCommands: { value: new Map() },
-        invokeExtensions: vi.fn(() => [])
-      } as any)
+      mockExtensionService.mockReturnValue(createMockExtensionService())
     })
 
     it('should show info button only for single selections', () => {
       // Single node selection
-      canvasStore.selectedItems = [{ type: 'TestNode' }] as any
+      canvasStore.selectedItems = [createMockPositionable()]
       const wrapper = mountComponent()
       expect(wrapper.find('.info-button').exists()).toBe(true)
 
       // Multiple node selection
       canvasStore.selectedItems = [
-        { type: 'TestNode1' },
-        { type: 'TestNode2' }
-      ] as any
+        createMockPositionable(),
+        createMockPositionable()
+      ]
       wrapper.unmount()
       const wrapper2 = mountComponent()
       expect(wrapper2.find('.info-button').exists()).toBe(false)
     })
 
     it('should not show info button when node definition is not found', () => {
-      canvasStore.selectedItems = [{ type: 'TestNode' }] as any
+      canvasStore.selectedItems = [createMockPositionable()]
       // mock nodedef and return null
       nodeDefMock = null
       // remount component
@@ -217,7 +228,7 @@ describe('SelectionToolbox', () => {
 
     it('should show color picker for all selections', () => {
       // Single node selection
-      canvasStore.selectedItems = [{ type: 'TestNode' }] as any
+      canvasStore.selectedItems = [createMockPositionable()]
       const wrapper = mountComponent()
       expect(wrapper.find('[data-testid="color-picker-button"]').exists()).toBe(
         true
@@ -225,9 +236,9 @@ describe('SelectionToolbox', () => {
 
       // Multiple node selection
       canvasStore.selectedItems = [
-        { type: 'TestNode1' },
-        { type: 'TestNode2' }
-      ] as any
+        createMockPositionable(),
+        createMockPositionable()
+      ]
       wrapper.unmount()
       const wrapper2 = mountComponent()
       expect(
@@ -237,15 +248,15 @@ describe('SelectionToolbox', () => {
 
     it('should show frame nodes only for multiple selections', () => {
       // Single node selection
-      canvasStore.selectedItems = [{ type: 'TestNode' }] as any
+      canvasStore.selectedItems = [createMockPositionable()]
       const wrapper = mountComponent()
       expect(wrapper.find('.frame-nodes').exists()).toBe(false)
 
       // Multiple node selection
       canvasStore.selectedItems = [
-        { type: 'TestNode1' },
-        { type: 'TestNode2' }
-      ] as any
+        createMockPositionable(),
+        createMockPositionable()
+      ]
       wrapper.unmount()
       const wrapper2 = mountComponent()
       expect(wrapper2.find('.frame-nodes').exists()).toBe(true)
@@ -253,22 +264,22 @@ describe('SelectionToolbox', () => {
 
     it('should show bypass button for appropriate selections', () => {
       // Single node selection
-      canvasStore.selectedItems = [{ type: 'TestNode' }] as any
+      canvasStore.selectedItems = [createMockPositionable()]
       const wrapper = mountComponent()
       expect(wrapper.find('[data-testid="bypass-button"]').exists()).toBe(true)
 
       // Multiple node selection
       canvasStore.selectedItems = [
-        { type: 'TestNode1' },
-        { type: 'TestNode2' }
-      ] as any
+        createMockPositionable(),
+        createMockPositionable()
+      ]
       wrapper.unmount()
       const wrapper2 = mountComponent()
       expect(wrapper2.find('[data-testid="bypass-button"]').exists()).toBe(true)
     })
 
     it('should show common buttons for all selections', () => {
-      canvasStore.selectedItems = [{ type: 'TestNode' }] as any
+      canvasStore.selectedItems = [createMockPositionable()]
       const wrapper = mountComponent()
 
       expect(wrapper.find('[data-testid="delete-button"]').exists()).toBe(true)
@@ -280,63 +291,57 @@ describe('SelectionToolbox', () => {
       )
     })
 
-    it('should show mask editor only for single image nodes', async () => {
-      const mockUtils = await import('@/utils/litegraphUtil')
-      const isImageNodeSpy = vi.spyOn(mockUtils, 'isImageNode')
+    it('should show mask editor only for single image nodes', () => {
+      const isImageNodeSpy = vi.spyOn(litegraphUtil, 'isImageNode')
 
       // Single image node
       isImageNodeSpy.mockReturnValue(true)
-      canvasStore.selectedItems = [{ type: 'ImageNode' }] as any
+      canvasStore.selectedItems = [createMockPositionable()]
       const wrapper = mountComponent()
       expect(wrapper.find('.mask-editor-button').exists()).toBe(true)
 
       // Single non-image node
       isImageNodeSpy.mockReturnValue(false)
-      canvasStore.selectedItems = [{ type: 'TestNode' }] as any
+      canvasStore.selectedItems = [createMockPositionable()]
       wrapper.unmount()
       const wrapper2 = mountComponent()
       expect(wrapper2.find('.mask-editor-button').exists()).toBe(false)
     })
 
-    it('should show Color picker button only for single Load3D nodes', async () => {
-      const mockUtils = await import('@/utils/litegraphUtil')
-      const isLoad3dNodeSpy = vi.spyOn(mockUtils, 'isLoad3dNode')
+    it('should show Color picker button only for single Load3D nodes', () => {
+      const isLoad3dNodeSpy = vi.spyOn(litegraphUtil, 'isLoad3dNode')
 
       // Single Load3D node
       isLoad3dNodeSpy.mockReturnValue(true)
-      canvasStore.selectedItems = [{ type: 'Load3DNode' }] as any
+      canvasStore.selectedItems = [createMockPositionable()]
       const wrapper = mountComponent()
       expect(wrapper.find('.load-3d-viewer-button').exists()).toBe(true)
 
       // Single non-Load3D node
       isLoad3dNodeSpy.mockReturnValue(false)
-      canvasStore.selectedItems = [{ type: 'TestNode' }] as any
+      canvasStore.selectedItems = [createMockPositionable()]
       wrapper.unmount()
       const wrapper2 = mountComponent()
       expect(wrapper2.find('.load-3d-viewer-button').exists()).toBe(false)
     })
 
-    it('should show ExecuteButton only when output nodes are selected', async () => {
-      const mockNodeFilterUtil = await import('@/utils/nodeFilterUtil')
-      const isOutputNodeSpy = vi.spyOn(mockNodeFilterUtil, 'isOutputNode')
-      const filterOutputNodesSpy = vi.spyOn(
-        mockNodeFilterUtil,
-        'filterOutputNodes'
-      )
+    it('should show ExecuteButton only when output nodes are selected', () => {
+      const isOutputNodeSpy = vi.spyOn(nodeFilterUtil, 'isOutputNode')
+      const filterOutputNodesSpy = vi.spyOn(nodeFilterUtil, 'filterOutputNodes')
 
       // With output node selected
       isOutputNodeSpy.mockReturnValue(true)
-      filterOutputNodesSpy.mockReturnValue([{ type: 'SaveImage' }] as any)
-      canvasStore.selectedItems = [
-        { type: 'SaveImage', constructor: { nodeData: { output_node: true } } }
-      ] as any
+      filterOutputNodesSpy.mockReturnValue([
+        { type: 'SaveImage' }
+      ] as LGraphNode[])
+      canvasStore.selectedItems = [createMockPositionable()]
       const wrapper = mountComponent()
       expect(wrapper.find('.execute-button').exists()).toBe(true)
 
       // Without output node selected
       isOutputNodeSpy.mockReturnValue(false)
       filterOutputNodesSpy.mockReturnValue([])
-      canvasStore.selectedItems = [{ type: 'TestNode' }] as any
+      canvasStore.selectedItems = [createMockPositionable()]
       wrapper.unmount()
       const wrapper2 = mountComponent()
       expect(wrapper2.find('.execute-button').exists()).toBe(false)
@@ -352,7 +357,7 @@ describe('SelectionToolbox', () => {
   describe('Divider Visibility Logic', () => {
     it('should show dividers between button groups when both groups have buttons', () => {
       // Setup single node to show info + other buttons
-      canvasStore.selectedItems = [{ type: 'TestNode' }] as any
+      canvasStore.selectedItems = [createMockPositionable()]
       const wrapper = mountComponent()
 
       const dividers = wrapper.findAll('.vertical-divider')
@@ -378,10 +383,13 @@ describe('SelectionToolbox', () => {
             ['test-command', { id: 'test-command', title: 'Test Command' }]
           ])
         },
-        invokeExtensions: vi.fn(() => ['test-command'])
-      } as any)
+        loadExtensions: vi.fn(),
+        registerExtension: vi.fn(),
+        invokeExtensions: vi.fn(() => ['test-command']),
+        invokeExtensionsAsync: vi.fn()
+      } as ReturnType<typeof useExtensionService>)
 
-      canvasStore.selectedItems = [{ type: 'TestNode' }] as any
+      canvasStore.selectedItems = [createMockPositionable()]
       const wrapper = mountComponent()
 
       expect(wrapper.find('.extension-command-button').exists()).toBe(true)
@@ -389,12 +397,9 @@ describe('SelectionToolbox', () => {
 
     it('should not render extension commands when none available', () => {
       const mockExtensionService = vi.mocked(useExtensionService)
-      mockExtensionService.mockReturnValue({
-        extensionCommands: { value: new Map() },
-        invokeExtensions: vi.fn(() => [])
-      } as any)
+      mockExtensionService.mockReturnValue(createMockExtensionService())
 
-      canvasStore.selectedItems = [{ type: 'TestNode' }] as any
+      canvasStore.selectedItems = [createMockPositionable()]
       const wrapper = mountComponent()
 
       expect(wrapper.find('.extension-command-button').exists()).toBe(false)
@@ -404,12 +409,9 @@ describe('SelectionToolbox', () => {
   describe('Container Styling', () => {
     it('should apply minimap container styles', () => {
       const mockExtensionService = vi.mocked(useExtensionService)
-      mockExtensionService.mockReturnValue({
-        extensionCommands: { value: new Map() },
-        invokeExtensions: vi.fn(() => [])
-      } as any)
+      mockExtensionService.mockReturnValue(createMockExtensionService())
 
-      canvasStore.selectedItems = [{ type: 'TestNode' }] as any
+      canvasStore.selectedItems = [createMockPositionable()]
       const wrapper = mountComponent()
 
       const panel = wrapper.find('.panel')
@@ -418,12 +420,9 @@ describe('SelectionToolbox', () => {
 
     it('should have correct CSS classes', () => {
       const mockExtensionService = vi.mocked(useExtensionService)
-      mockExtensionService.mockReturnValue({
-        extensionCommands: { value: new Map() },
-        invokeExtensions: vi.fn(() => [])
-      } as any)
+      mockExtensionService.mockReturnValue(createMockExtensionService())
 
-      canvasStore.selectedItems = [{ type: 'TestNode' }] as any
+      canvasStore.selectedItems = [createMockPositionable()]
       const wrapper = mountComponent()
 
       const panel = wrapper.find('.panel')
@@ -435,12 +434,9 @@ describe('SelectionToolbox', () => {
 
     it('should handle animation class conditionally', () => {
       const mockExtensionService = vi.mocked(useExtensionService)
-      mockExtensionService.mockReturnValue({
-        extensionCommands: { value: new Map() },
-        invokeExtensions: vi.fn(() => [])
-      } as any)
+      mockExtensionService.mockReturnValue(createMockExtensionService())
 
-      canvasStore.selectedItems = [{ type: 'TestNode' }] as any
+      canvasStore.selectedItems = [createMockPositionable()]
       const wrapper = mountComponent()
 
       const panel = wrapper.find('.panel')
@@ -453,16 +449,18 @@ describe('SelectionToolbox', () => {
       const mockCanvasInteractions = vi.mocked(useCanvasInteractions)
       const forwardEventToCanvasSpy = vi.fn()
       mockCanvasInteractions.mockReturnValue({
-        forwardEventToCanvas: forwardEventToCanvasSpy
-      } as any)
+        handleWheel: vi.fn(),
+        handlePointer: vi.fn(),
+        forwardEventToCanvas: forwardEventToCanvasSpy,
+        shouldHandleNodePointerEvents: { value: true } as ReturnType<
+          typeof useCanvasInteractions
+        >['shouldHandleNodePointerEvents']
+      } as ReturnType<typeof useCanvasInteractions>)
 
       const mockExtensionService = vi.mocked(useExtensionService)
-      mockExtensionService.mockReturnValue({
-        extensionCommands: { value: new Map() },
-        invokeExtensions: vi.fn(() => [])
-      } as any)
+      mockExtensionService.mockReturnValue(createMockExtensionService())
 
-      canvasStore.selectedItems = [{ type: 'TestNode' }] as any
+      canvasStore.selectedItems = [createMockPositionable()]
       const wrapper = mountComponent()
 
       const panel = wrapper.find('.panel')
@@ -475,10 +473,7 @@ describe('SelectionToolbox', () => {
   describe('No Selection State', () => {
     beforeEach(() => {
       const mockExtensionService = vi.mocked(useExtensionService)
-      mockExtensionService.mockReturnValue({
-        extensionCommands: { value: new Map() },
-        invokeExtensions: vi.fn(() => [])
-      } as any)
+      mockExtensionService.mockReturnValue(createMockExtensionService())
     })
 
     it('should hide most buttons when no items selected', () => {
diff --git a/src/components/graph/SelectionToolbox.vue b/src/components/graph/SelectionToolbox.vue
index a56a82cf93..ac8263b7df 100644
--- a/src/components/graph/SelectionToolbox.vue
+++ b/src/components/graph/SelectionToolbox.vue
@@ -10,7 +10,7 @@
         class="selection-toolbox pointer-events-auto rounded-lg border border-interface-stroke bg-interface-panel-surface"
         :pt="{
           header: 'hidden',
-          content: 'p-2 h-12 flex flex-row gap-1'
+          content: 'p-1 h-10 flex flex-row gap-1'
         }"
         @wheel="canvasInteractions.forwardEventToCanvas"
       >
@@ -42,7 +42,6 @@
       </Panel>
     </Transition>
   </div>
-  <NodeContextMenu />
 </template>
 
 <script setup lang="ts">
@@ -69,7 +68,6 @@ import { useExtensionService } from '@/services/extensionService'
 import { useCommandStore } from '@/stores/commandStore'
 import type { ComfyCommandImpl } from '@/stores/commandStore'
 
-import NodeContextMenu from './NodeContextMenu.vue'
 import FrameNodes from './selectionToolbox/FrameNodes.vue'
 import NodeOptionsButton from './selectionToolbox/NodeOptionsButton.vue'
 import VerticalDivider from './selectionToolbox/VerticalDivider.vue'
diff --git a/tests-ui/tests/components/graph/ZoomControlsModal.test.ts b/src/components/graph/modals/ZoomControlsModal.test.ts
similarity index 100%
rename from tests-ui/tests/components/graph/ZoomControlsModal.test.ts
rename to src/components/graph/modals/ZoomControlsModal.test.ts
diff --git a/src/components/graph/modals/ZoomControlsModal.vue b/src/components/graph/modals/ZoomControlsModal.vue
index 500b315452..14122761dc 100644
--- a/src/components/graph/modals/ZoomControlsModal.vue
+++ b/src/components/graph/modals/ZoomControlsModal.vue
@@ -10,7 +10,7 @@
     >
       <div class="flex flex-col gap-1">
         <div
-          class="flex cursor-pointer items-center justify-between rounded px-3 py-2 text-sm hover:bg-node-component-surface-hovered"
+          class="flex cursor-pointer items-center justify-between rounded-sm px-3 py-2 text-sm hover:bg-node-component-surface-hovered"
           @mousedown="startRepeat('Comfy.Canvas.ZoomIn')"
           @mouseup="stopRepeat"
           @mouseleave="stopRepeat"
@@ -22,7 +22,7 @@
         </div>
 
         <div
-          class="flex cursor-pointer items-center justify-between rounded px-3 py-2 text-sm hover:bg-node-component-surface-hovered"
+          class="flex cursor-pointer items-center justify-between rounded-sm px-3 py-2 text-sm hover:bg-node-component-surface-hovered"
           @mousedown="startRepeat('Comfy.Canvas.ZoomOut')"
           @mouseup="stopRepeat"
           @mouseleave="stopRepeat"
@@ -34,7 +34,7 @@
         </div>
 
         <div
-          class="flex cursor-pointer items-center justify-between rounded px-3 py-2 text-sm hover:bg-node-component-surface-hovered"
+          class="flex cursor-pointer items-center justify-between rounded-sm px-3 py-2 text-sm hover:bg-node-component-surface-hovered"
           @click="executeCommand('Comfy.Canvas.FitView')"
         >
           <span class="font-medium">{{ $t('zoomControls.zoomToFit') }}</span>
@@ -45,7 +45,7 @@
 
         <div
           ref="zoomInputContainer"
-          class="zoomInputContainer flex items-center gap-1 rounded bg-input-surface p-2"
+          class="zoomInputContainer flex items-center gap-1 rounded-sm bg-input-surface p-2"
         >
           <InputNumber
             :default-value="canvasStore.appScalePercentage"
@@ -59,7 +59,7 @@
             @input="applyZoom"
             @keyup.enter="applyZoom"
           />
-          <span class="flex-shrink-0 text-sm text-text-primary">%</span>
+          <span class="shrink-0 text-sm text-text-primary">%</span>
         </div>
       </div>
     </div>
diff --git a/src/components/graph/selectionToolbox/BypassButton.test.ts b/src/components/graph/selectionToolbox/BypassButton.test.ts
index 9fdcd971f8..a6fa3ff94f 100644
--- a/src/components/graph/selectionToolbox/BypassButton.test.ts
+++ b/src/components/graph/selectionToolbox/BypassButton.test.ts
@@ -6,14 +6,14 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { createI18n } from 'vue-i18n'
 
 import BypassButton from '@/components/graph/selectionToolbox/BypassButton.vue'
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
 import { LGraphEventMode } from '@/lib/litegraph/src/litegraph'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import { useCommandStore } from '@/stores/commandStore'
+import { createMockLGraphNode } from '@/utils/__tests__/litegraphTestUtils'
 
-const mockLGraphNode = {
-  type: 'TestNode',
-  title: 'Test Node',
-  mode: LGraphEventMode.ALWAYS
+function getMockLGraphNode(): LGraphNode {
+  return createMockLGraphNode({ type: 'TestNode' })
 }
 
 vi.mock('@/utils/litegraphUtil', () => ({
@@ -59,21 +59,21 @@ describe('BypassButton', () => {
   }
 
   it('should render bypass button', () => {
-    canvasStore.selectedItems = [mockLGraphNode] as any
+    canvasStore.selectedItems = [getMockLGraphNode()]
     const wrapper = mountComponent()
     const button = wrapper.find('button')
     expect(button.exists()).toBe(true)
   })
 
   it('should have correct test id', () => {
-    canvasStore.selectedItems = [mockLGraphNode] as any
+    canvasStore.selectedItems = [getMockLGraphNode()]
     const wrapper = mountComponent()
     const button = wrapper.find('[data-testid="bypass-button"]')
     expect(button.exists()).toBe(true)
   })
 
   it('should execute bypass command when clicked', async () => {
-    canvasStore.selectedItems = [mockLGraphNode] as any
+    canvasStore.selectedItems = [getMockLGraphNode()]
     const executeSpy = vi.spyOn(commandStore, 'execute').mockResolvedValue()
 
     const wrapper = mountComponent()
@@ -85,8 +85,10 @@ describe('BypassButton', () => {
   })
 
   it('should show bypassed styling when node is bypassed', async () => {
-    const bypassedNode = { ...mockLGraphNode, mode: LGraphEventMode.BYPASS }
-    canvasStore.selectedItems = [bypassedNode] as any
+    const bypassedNode = Object.assign(getMockLGraphNode(), {
+      mode: LGraphEventMode.BYPASS
+    })
+    canvasStore.selectedItems = [bypassedNode]
     vi.spyOn(commandStore, 'execute').mockResolvedValue()
     const wrapper = mountComponent()
 
@@ -100,7 +102,7 @@ describe('BypassButton', () => {
 
   it('should handle multiple selected items', () => {
     vi.spyOn(commandStore, 'execute').mockResolvedValue()
-    canvasStore.selectedItems = [mockLGraphNode, mockLGraphNode] as any
+    canvasStore.selectedItems = [getMockLGraphNode(), getMockLGraphNode()]
     const wrapper = mountComponent()
     const button = wrapper.find('button')
     expect(button.exists()).toBe(true)
diff --git a/src/components/graph/selectionToolbox/ColorPickerButton.test.ts b/src/components/graph/selectionToolbox/ColorPickerButton.test.ts
index ccf07e8b94..718455436c 100644
--- a/src/components/graph/selectionToolbox/ColorPickerButton.test.ts
+++ b/src/components/graph/selectionToolbox/ColorPickerButton.test.ts
@@ -1,3 +1,4 @@
+import type { Mock } from 'vitest'
 import { mount } from '@vue/test-utils'
 import { createPinia, setActivePinia } from 'pinia'
 import PrimeVue from 'primevue/config'
@@ -7,8 +8,39 @@ import { createI18n } from 'vue-i18n'
 
 // Import after mocks
 import ColorPickerButton from '@/components/graph/selectionToolbox/ColorPickerButton.vue'
-import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
+import type { LoadedComfyWorkflow } from '@/platform/workflow/management/stores/comfyWorkflow'
+import {
+  ComfyWorkflow,
+  useWorkflowStore
+} from '@/platform/workflow/management/stores/workflowStore'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import { ChangeTracker } from '@/scripts/changeTracker'
+import { defaultGraph } from '@/scripts/defaultGraph'
+import { createMockPositionable } from '@/utils/__tests__/litegraphTestUtils'
+
+function createMockWorkflow(
+  overrides: Partial<LoadedComfyWorkflow> = {}
+): LoadedComfyWorkflow {
+  const workflow = new ComfyWorkflow({
+    path: 'workflows/color-picker-test.json',
+    modified: 0,
+    size: 0
+  })
+
+  const changeTracker = Object.assign(
+    new ChangeTracker(workflow, structuredClone(defaultGraph)),
+    {
+      checkState: vi.fn() as Mock
+    }
+  )
+
+  const workflowOverrides = {
+    changeTracker,
+    ...overrides
+  } satisfies Partial<LoadedComfyWorkflow>
+
+  return Object.assign(workflow, workflowOverrides) as LoadedComfyWorkflow
+}
 
 // Mock the litegraph module
 vi.mock('@/lib/litegraph/src/litegraph', async () => {
@@ -70,11 +102,7 @@ describe('ColorPickerButton', () => {
     canvasStore.selectedItems = []
 
     // Mock workflow store
-    workflowStore.activeWorkflow = {
-      changeTracker: {
-        checkState: vi.fn()
-      }
-    } as any
+    workflowStore.activeWorkflow = createMockWorkflow()
   })
 
   const createWrapper = () => {
@@ -90,22 +118,24 @@ describe('ColorPickerButton', () => {
 
   it('should render when nodes are selected', () => {
     // Add a mock node to selectedItems
-    canvasStore.selectedItems = [{ type: 'LGraphNode' } as any]
+    canvasStore.selectedItems = [createMockPositionable()]
     const wrapper = createWrapper()
     expect(wrapper.find('button').exists()).toBe(true)
   })
 
   it('should toggle color picker visibility on button click', async () => {
-    canvasStore.selectedItems = [{ type: 'LGraphNode' } as any]
+    canvasStore.selectedItems = [createMockPositionable()]
     const wrapper = createWrapper()
     const button = wrapper.find('button')
 
-    expect(wrapper.find('.color-picker-container').exists()).toBe(false)
+    expect(wrapper.findComponent({ name: 'SelectButton' }).exists()).toBe(false)
 
     await button.trigger('click')
-    expect(wrapper.find('.color-picker-container').exists()).toBe(true)
+    const picker = wrapper.findComponent({ name: 'SelectButton' })
+    expect(picker.exists()).toBe(true)
+    expect(picker.findAll('button').length).toBeGreaterThan(0)
 
     await button.trigger('click')
-    expect(wrapper.find('.color-picker-container').exists()).toBe(false)
+    expect(wrapper.findComponent({ name: 'SelectButton' }).exists()).toBe(false)
   })
 })
diff --git a/src/components/graph/selectionToolbox/ColorPickerButton.vue b/src/components/graph/selectionToolbox/ColorPickerButton.vue
index 17f350dbd9..e78bec6c30 100644
--- a/src/components/graph/selectionToolbox/ColorPickerButton.vue
+++ b/src/components/graph/selectionToolbox/ColorPickerButton.vue
@@ -11,13 +11,17 @@
       @click="() => (showColorPicker = !showColorPicker)"
     >
       <div class="flex items-center gap-1 px-0">
-        <i class="pi pi-circle-fill" :style="{ color: currentColor ?? '' }" />
+        <i
+          class="pi pi-circle-fill"
+          data-testid="color-picker-current-color"
+          :style="{ color: currentColor ?? '' }"
+        />
         <i class="icon-[lucide--chevron-down]" />
       </div>
     </Button>
     <div
       v-if="showColorPicker"
-      class="color-picker-container absolute -top-10 left-1/2"
+      class="absolute -top-10 left-1/2 -translate-x-1/2"
     >
       <SelectButton
         :model-value="selectedColorOption"
@@ -159,13 +163,7 @@ watch(
 </script>
 
 <style scoped>
-@reference '../../../assets/css/style.css';
-
-.color-picker-container {
-  transform: translateX(-50%);
-}
-
 :deep(.p-togglebutton) {
-  @apply py-2 px-1;
+  padding: calc(var(--spacing) * 2) var(--spacing);
 }
 </style>
diff --git a/src/components/graph/selectionToolbox/ColorPickerMenu.vue b/src/components/graph/selectionToolbox/ColorPickerMenu.vue
index dddcfb1d02..188b5ed397 100644
--- a/src/components/graph/selectionToolbox/ColorPickerMenu.vue
+++ b/src/components/graph/selectionToolbox/ColorPickerMenu.vue
@@ -23,7 +23,7 @@
       :class="
         isColorSubmenu
           ? 'flex flex-col gap-1 p-2'
-          : 'flex flex-col p-2 min-w-40'
+          : 'flex min-w-40 flex-col p-2'
       "
     >
       <div
@@ -31,12 +31,12 @@
         :key="subOption.label"
         :class="
           cn(
-            'hover:bg-secondary-background-hover rounded cursor-pointer',
+            'cursor-pointer rounded-sm hover:bg-secondary-background-hover',
             isColorSubmenu
-              ? 'w-7 h-7 flex items-center justify-center'
+              ? 'flex size-7 items-center justify-center'
               : 'flex items-center gap-2 px-3 py-1.5 text-sm',
             subOption.disabled
-              ? 'cursor-not-allowed pointer-events-none text-node-icon-disabled'
+              ? 'pointer-events-none cursor-not-allowed text-node-icon-disabled'
               : 'hover:bg-secondary-background-hover'
           )
         "
@@ -51,9 +51,9 @@
         <template v-else-if="!subOption.color">
           <i
             v-if="isShapeSelected(subOption)"
-            class="icon-[lucide--check] size-4 flex-shrink-0"
+            class="icon-[lucide--check] size-4 shrink-0"
           />
-          <div v-else class="w-4 flex-shrink-0" />
+          <div v-else class="w-4 shrink-0" />
           <span>{{ subOption.label }}</span>
         </template>
       </div>
diff --git a/src/components/graph/selectionToolbox/ExecuteButton.test.ts b/src/components/graph/selectionToolbox/ExecuteButton.test.ts
index b75977b43a..370b96b1d3 100644
--- a/src/components/graph/selectionToolbox/ExecuteButton.test.ts
+++ b/src/components/graph/selectionToolbox/ExecuteButton.test.ts
@@ -1,23 +1,17 @@
 import { mount } from '@vue/test-utils'
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import PrimeVue from 'primevue/config'
 import Tooltip from 'primevue/tooltip'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { createI18n } from 'vue-i18n'
 
 import ExecuteButton from '@/components/graph/selectionToolbox/ExecuteButton.vue'
+import { useSelectionState } from '@/composables/graph/useSelectionState'
+import type { LGraphCanvas, LGraphNode } from '@/lib/litegraph/src/litegraph'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import { useCommandStore } from '@/stores/commandStore'
 
-// Mock the stores
-vi.mock('@/renderer/core/canvas/canvasStore', () => ({
-  useCanvasStore: vi.fn()
-}))
-
-vi.mock('@/stores/commandStore', () => ({
-  useCommandStore: vi.fn()
-}))
-
 // Mock the utils
 vi.mock('@/utils/litegraphUtil', () => ({
   isLGraphNode: vi.fn((node) => !!node?.type)
@@ -37,10 +31,8 @@ vi.mock('@/composables/graph/useSelectionState', () => ({
 }))
 
 describe('ExecuteButton', () => {
-  let mockCanvas: any
-  let mockCanvasStore: any
-  let mockCommandStore: any
-  let mockSelectedNodes: any[]
+  let mockCanvas: LGraphCanvas
+  let mockSelectedNodes: LGraphNode[]
 
   const i18n = createI18n({
     legacy: false,
@@ -56,38 +48,35 @@ describe('ExecuteButton', () => {
     }
   })
 
-  beforeEach(async () => {
-    setActivePinia(createPinia())
+  beforeEach(() => {
+    // Set up Pinia with testing utilities
+    setActivePinia(
+      createTestingPinia({
+        createSpy: vi.fn
+      })
+    )
 
     // Reset mocks
-    mockCanvas = {
+    const partialCanvas: Partial<LGraphCanvas> = {
       setDirty: vi.fn()
     }
+    mockCanvas = partialCanvas as Partial<LGraphCanvas> as LGraphCanvas
 
     mockSelectedNodes = []
 
-    mockCanvasStore = {
-      getCanvas: vi.fn(() => mockCanvas),
-      selectedItems: []
-    }
+    // Get store instances and mock methods
+    const canvasStore = useCanvasStore()
+    const commandStore = useCommandStore()
 
-    mockCommandStore = {
-      execute: vi.fn()
-    }
-
-    // Setup store mocks
-    vi.mocked(useCanvasStore).mockReturnValue(mockCanvasStore as any)
-    vi.mocked(useCommandStore).mockReturnValue(mockCommandStore as any)
+    vi.spyOn(canvasStore, 'getCanvas').mockReturnValue(mockCanvas)
+    vi.spyOn(commandStore, 'execute').mockResolvedValue()
 
     // Update the useSelectionState mock
-    const { useSelectionState } = vi.mocked(
-      await import('@/composables/graph/useSelectionState')
-    )
-    useSelectionState.mockReturnValue({
+    vi.mocked(useSelectionState).mockReturnValue({
       selectedNodes: {
         value: mockSelectedNodes
       }
-    } as any)
+    } as ReturnType<typeof useSelectionState>)
 
     vi.clearAllMocks()
   })
@@ -114,15 +103,16 @@ describe('ExecuteButton', () => {
 
   describe('Click Handler', () => {
     it('should execute Comfy.QueueSelectedOutputNodes command on click', async () => {
+      const commandStore = useCommandStore()
       const wrapper = mountComponent()
       const button = wrapper.find('button')
 
       await button.trigger('click')
 
-      expect(mockCommandStore.execute).toHaveBeenCalledWith(
+      expect(commandStore.execute).toHaveBeenCalledWith(
         'Comfy.QueueSelectedOutputNodes'
       )
-      expect(mockCommandStore.execute).toHaveBeenCalledTimes(1)
+      expect(commandStore.execute).toHaveBeenCalledTimes(1)
     })
   })
 })
diff --git a/src/components/graph/selectionToolbox/InfoButton.test.ts b/src/components/graph/selectionToolbox/InfoButton.test.ts
index da2a13831d..61e2929202 100644
--- a/src/components/graph/selectionToolbox/InfoButton.test.ts
+++ b/src/components/graph/selectionToolbox/InfoButton.test.ts
@@ -6,67 +6,19 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { createI18n } from 'vue-i18n'
 
 import InfoButton from '@/components/graph/selectionToolbox/InfoButton.vue'
-// NOTE: The component import must come after mocks so they take effect.
-import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
-import { useNodeDefStore } from '@/stores/nodeDefStore'
+import Button from '@/components/ui/button/Button.vue'
 
-const mockLGraphNode = {
-  type: 'TestNode',
-  title: 'Test Node'
-}
-
-vi.mock('@/utils/litegraphUtil', () => ({
-  isLGraphNode: vi.fn(() => true)
+const { openPanelMock } = vi.hoisted(() => ({
+  openPanelMock: vi.fn()
 }))
 
-vi.mock('@/composables/sidebarTabs/useNodeLibrarySidebarTab', () => ({
-  useNodeLibrarySidebarTab: () => ({
-    id: 'node-library'
-  })
-}))
-
-const openHelpMock = vi.fn()
-const closeHelpMock = vi.fn()
-const nodeHelpState: { currentHelpNode: any } = { currentHelpNode: null }
-vi.mock('@/stores/workspace/nodeHelpStore', () => ({
-  useNodeHelpStore: () => ({
-    openHelp: (def: any) => {
-      nodeHelpState.currentHelpNode = def
-      openHelpMock(def)
-    },
-    closeHelp: () => {
-      nodeHelpState.currentHelpNode = null
-      closeHelpMock()
-    },
-    get currentHelpNode() {
-      return nodeHelpState.currentHelpNode
-    },
-    get isHelpOpen() {
-      return nodeHelpState.currentHelpNode !== null
-    }
-  })
-}))
-
-const toggleSidebarTabMock = vi.fn((id: string) => {
-  sidebarState.activeSidebarTabId =
-    sidebarState.activeSidebarTabId === id ? null : id
-})
-const sidebarState: { activeSidebarTabId: string | null } = {
-  activeSidebarTabId: 'other-tab'
-}
-vi.mock('@/stores/workspace/sidebarTabStore', () => ({
-  useSidebarTabStore: () => ({
-    get activeSidebarTabId() {
-      return sidebarState.activeSidebarTabId
-    },
-    toggleSidebarTab: toggleSidebarTabMock
+vi.mock('@/stores/workspace/rightSidePanelStore', () => ({
+  useRightSidePanelStore: () => ({
+    openPanel: openPanelMock
   })
 }))
 
 describe('InfoButton', () => {
-  let canvasStore: ReturnType<typeof useCanvasStore>
-  let nodeDefStore: ReturnType<typeof useNodeDefStore>
-
   const i18n = createI18n({
     legacy: false,
     locale: 'en',
@@ -81,9 +33,6 @@ describe('InfoButton', () => {
 
   beforeEach(() => {
     setActivePinia(createPinia())
-    canvasStore = useCanvasStore()
-    nodeDefStore = useNodeDefStore()
-
     vi.clearAllMocks()
   })
 
@@ -92,58 +41,15 @@ describe('InfoButton', () => {
       global: {
         plugins: [i18n, PrimeVue],
         directives: { tooltip: Tooltip },
-        stubs: {
-          'i-lucide:info': true,
-          Button: {
-            template:
-              '<button class="help-button" severity="secondary"><slot /></button>',
-            props: ['severity', 'text', 'class'],
-            emits: ['click']
-          }
-        }
+        components: { Button }
       }
     })
   }
 
-  it('should handle click without errors', async () => {
-    const mockNodeDef = {
-      nodePath: 'test/node',
-      display_name: 'Test Node'
-    }
-    canvasStore.selectedItems = [mockLGraphNode] as any
-    vi.spyOn(nodeDefStore, 'fromLGraphNode').mockReturnValue(mockNodeDef as any)
+  it('should open the info panel on click', async () => {
     const wrapper = mountComponent()
-    const button = wrapper.find('button')
+    const button = wrapper.find('[data-testid="info-button"]')
     await button.trigger('click')
-    expect(button.exists()).toBe(true)
-  })
-
-  it('should have correct CSS classes', () => {
-    const mockNodeDef = {
-      nodePath: 'test/node',
-      display_name: 'Test Node'
-    }
-    canvasStore.selectedItems = [mockLGraphNode] as any
-    vi.spyOn(nodeDefStore, 'fromLGraphNode').mockReturnValue(mockNodeDef as any)
-
-    const wrapper = mountComponent()
-    const button = wrapper.find('button')
-
-    expect(button.classes()).toContain('help-button')
-    expect(button.attributes('severity')).toBe('secondary')
-  })
-
-  it('should have correct tooltip', () => {
-    const mockNodeDef = {
-      nodePath: 'test/node',
-      display_name: 'Test Node'
-    }
-    canvasStore.selectedItems = [mockLGraphNode] as any
-    vi.spyOn(nodeDefStore, 'fromLGraphNode').mockReturnValue(mockNodeDef as any)
-
-    const wrapper = mountComponent()
-    const button = wrapper.find('button')
-
-    expect(button.exists()).toBe(true)
+    expect(openPanelMock).toHaveBeenCalledWith('info')
   })
 })
diff --git a/src/components/graph/widgets/DomWidget.test.ts b/src/components/graph/widgets/DomWidget.test.ts
new file mode 100644
index 0000000000..11121ed85b
--- /dev/null
+++ b/src/components/graph/widgets/DomWidget.test.ts
@@ -0,0 +1,116 @@
+import { mount } from '@vue/test-utils'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { reactive } from 'vue'
+
+import { createMockLGraphNode } from '@/utils/__tests__/litegraphTestUtils'
+import type { BaseDOMWidget } from '@/scripts/domWidget'
+import type { DomWidgetState } from '@/stores/domWidgetStore'
+import { useDomWidgetStore } from '@/stores/domWidgetStore'
+
+import DomWidget from './DomWidget.vue'
+
+const mockUpdatePosition = vi.fn()
+const mockUpdateClipPath = vi.fn()
+const mockCanvasElement = document.createElement('canvas')
+const mockCanvasStore = {
+  canvas: {
+    graph: {
+      getNodeById: vi.fn(() => true)
+    },
+    ds: {
+      offset: [0, 0],
+      scale: 1
+    },
+    canvas: mockCanvasElement,
+    selected_nodes: {}
+  },
+  getCanvas: () => ({ canvas: mockCanvasElement }),
+  linearMode: false
+}
+
+vi.mock('@/composables/element/useAbsolutePosition', () => ({
+  useAbsolutePosition: () => ({
+    style: reactive<Record<string, string>>({}),
+    updatePosition: mockUpdatePosition
+  })
+}))
+
+vi.mock('@/composables/element/useDomClipping', () => ({
+  useDomClipping: () => ({
+    style: reactive<Record<string, string>>({}),
+    updateClipPath: mockUpdateClipPath
+  })
+}))
+
+vi.mock('@/renderer/core/canvas/canvasStore', () => ({
+  useCanvasStore: () => mockCanvasStore
+}))
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: () => ({
+    get: vi.fn(() => false)
+  })
+}))
+
+function createWidgetState(overrideDisabled: boolean): DomWidgetState {
+  const domWidgetStore = useDomWidgetStore()
+  const node = createMockLGraphNode({
+    id: 1,
+    constructor: {
+      nodeData: {}
+    }
+  })
+
+  const widget = {
+    id: 'dom-widget-id',
+    name: 'test_widget',
+    type: 'custom',
+    value: '',
+    options: {},
+    node,
+    computedDisabled: false
+  } as unknown as BaseDOMWidget<object | string>
+
+  domWidgetStore.registerWidget(widget)
+  domWidgetStore.setPositionOverride(widget.id, {
+    node: createMockLGraphNode({ id: 2 }),
+    widget: { computedDisabled: overrideDisabled } as DomWidgetState['widget']
+  })
+
+  const state = domWidgetStore.widgetStates.get(widget.id)
+  if (!state) throw new Error('Expected registered DomWidgetState')
+
+  state.zIndex = 2
+  state.size = [100, 40]
+
+  return reactive(state)
+}
+
+describe('DomWidget disabled style', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+  })
+
+  afterEach(() => {
+    useDomWidgetStore().clear()
+    vi.clearAllMocks()
+  })
+
+  it('uses disabled style when promoted override widget is computedDisabled', async () => {
+    const widgetState = createWidgetState(true)
+    const wrapper = mount(DomWidget, {
+      props: {
+        widgetState
+      }
+    })
+
+    widgetState.zIndex = 3
+    await wrapper.vm.$nextTick()
+
+    const root = wrapper.get('.dom-widget').element as HTMLElement
+    expect(root.style.pointerEvents).toBe('none')
+    expect(root.style.opacity).toBe('0.5')
+  })
+})
diff --git a/src/components/graph/widgets/DomWidget.vue b/src/components/graph/widgets/DomWidget.vue
index f20aac3709..24fce2755a 100644
--- a/src/components/graph/widgets/DomWidget.vue
+++ b/src/components/graph/widgets/DomWidget.vue
@@ -2,13 +2,14 @@
   <div
     v-show="widgetState.visible"
     ref="widgetElement"
-    class="dom-widget"
+    class="dom-widget size-full"
     :title="tooltip"
     :style="style"
   >
     <component
       :is="widget.component"
       v-if="isComponentWidget(widget)"
+      class="size-full"
       :model-value="widget.value"
       :widget="widget"
       v-bind="widget.props"
@@ -18,7 +19,7 @@
 </template>
 
 <script setup lang="ts">
-import { useElementBounding, useEventListener } from '@vueuse/core'
+import { useElementBounding, useEventListener, whenever } from '@vueuse/core'
 import type { CSSProperties } from 'vue'
 import { computed, nextTick, onMounted, ref, watch } from 'vue'
 
@@ -68,7 +69,11 @@ const updateDomClipping = () => {
     return
   }
 
-  const isSelected = selectedNode === widgetState.widget.node
+  const override = widgetState.positionOverride
+  const overrideInGraph =
+    override && lgCanvas.graph?.getNodeById(override.node.id)
+  const ownerNode = overrideInGraph ? override.node : widgetState.widget.node
+  const isSelected = selectedNode === ownerNode
   const renderArea = selectedNode?.renderArea
   const offset = lgCanvas.ds.offset
   const scale = lgCanvas.ds.scale
@@ -97,26 +102,40 @@ const updateDomClipping = () => {
  * and update the position of the widget accordingly.
  */
 const { left, top } = useElementBounding(canvasStore.getCanvas().canvas)
+
+function composeStyle() {
+  const override = widgetState.positionOverride
+  const isDisabled = override
+    ? (override.widget.computedDisabled ?? widget.computedDisabled)
+    : widget.computedDisabled
+
+  style.value = {
+    ...positionStyle.value,
+    ...(enableDomClipping.value ? clippingStyle.value : {}),
+    zIndex: widgetState.zIndex,
+    pointerEvents: widgetState.readonly || isDisabled ? 'none' : 'auto',
+    opacity: isDisabled ? 0.5 : 1
+  }
+}
+
 watch(
-  [() => widgetState, left, top],
-  ([widgetState, _, __]) => {
+  [() => widgetState, left, top, enableDomClipping],
+  ([widgetState]) => {
     updatePosition(widgetState)
     if (enableDomClipping.value) {
       updateDomClipping()
     }
-
-    style.value = {
-      ...positionStyle.value,
-      ...(enableDomClipping.value ? clippingStyle.value : {}),
-      zIndex: widgetState.zIndex,
-      pointerEvents:
-        widgetState.readonly || widget.computedDisabled ? 'none' : 'auto',
-      opacity: widget.computedDisabled ? 0.5 : 1
-    }
+    composeStyle()
   },
   { deep: true }
 )
 
+// Recompose style when clippingStyle updates asynchronously via RAF.
+// updateClipPath() schedules clip-path calculation in a requestAnimationFrame,
+// so clippingStyle.value updates after the main watcher has already composed
+// style. This watcher ensures the new clip-path is applied to the DOM.
+watch(clippingStyle, composeStyle, { deep: true })
+
 watch(
   () => widgetState.visible,
   (newVisible, oldVisible) => {
@@ -143,8 +162,17 @@ onMounted(() => {
     widget.options.selectOn ?? ['focus', 'click'],
     () => {
       const lgCanvas = canvasStore.canvas
-      lgCanvas?.selectNode(widgetState.widget.node)
-      lgCanvas?.bringToFront(widgetState.widget.node)
+      if (!lgCanvas) return
+
+      const override = widgetState.positionOverride
+      const overrideInGraph =
+        override && lgCanvas.graph?.getNodeById(override.node.id)
+      const ownerNode = overrideInGraph
+        ? override.node
+        : widgetState.widget.node
+
+      lgCanvas.selectNode(ownerNode)
+      lgCanvas.bringToFront(ownerNode)
     }
   )
 })
@@ -161,6 +189,8 @@ const mountElementIfVisible = () => {
   if (widgetElement.value.contains(widget.element)) {
     return
   }
+
+  widget.element.classList.add('h-full', 'w-full')
   widgetElement.value.appendChild(widget.element)
 }
 
@@ -180,12 +210,6 @@ watch(
     mountElementIfVisible()
   }
 )
+
+whenever(() => !canvasStore.linearMode, mountElementIfVisible)
 </script>
-
-<style scoped>
-@reference '../../../assets/css/style.css';
-
-.dom-widget > * {
-  @apply h-full w-full;
-}
-</style>
diff --git a/src/components/graph/widgets/domWidgetZIndex.test.ts b/src/components/graph/widgets/domWidgetZIndex.test.ts
new file mode 100644
index 0000000000..fb578d998c
--- /dev/null
+++ b/src/components/graph/widgets/domWidgetZIndex.test.ts
@@ -0,0 +1,37 @@
+import { describe, expect, it } from 'vitest'
+
+import { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph'
+
+import { getDomWidgetZIndex } from './domWidgetZIndex'
+
+describe('getDomWidgetZIndex', () => {
+  it('follows graph node ordering when node.order is stale', () => {
+    const graph = new LGraph()
+    const first = new LGraphNode('first')
+    const second = new LGraphNode('second')
+    graph.add(first)
+    graph.add(second)
+
+    first.order = 0
+    second.order = 1
+
+    const nodes = (graph as unknown as { _nodes: LGraphNode[] })._nodes
+    nodes.splice(nodes.indexOf(first), 1)
+    nodes.push(first)
+
+    expect(first.order).toBe(0)
+    expect(second.order).toBe(1)
+
+    expect(getDomWidgetZIndex(first, graph)).toBe(1)
+    expect(getDomWidgetZIndex(second, graph)).toBe(0)
+  })
+
+  it('falls back to node.order when node is not in current graph', () => {
+    const graph = new LGraph()
+    const node = new LGraphNode('orphan')
+    node.order = 7
+
+    expect(getDomWidgetZIndex(node, graph)).toBe(7)
+    expect(getDomWidgetZIndex(node, undefined)).toBe(7)
+  })
+})
diff --git a/src/components/graph/widgets/domWidgetZIndex.ts b/src/components/graph/widgets/domWidgetZIndex.ts
new file mode 100644
index 0000000000..5e7a19b1af
--- /dev/null
+++ b/src/components/graph/widgets/domWidgetZIndex.ts
@@ -0,0 +1,13 @@
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
+
+export function getDomWidgetZIndex(
+  node: LGraphNode,
+  currentGraph: LGraphNode['graph'] | undefined
+): number {
+  if (!currentGraph) return node.order ?? -1
+
+  const graphOrder = currentGraph.nodes.indexOf(node)
+  if (graphOrder === -1) return node.order ?? -1
+
+  return graphOrder
+}
diff --git a/src/components/helpcenter/HelpCenterMenuContent.vue b/src/components/helpcenter/HelpCenterMenuContent.vue
index d912a29417..c599ee32b1 100644
--- a/src/components/helpcenter/HelpCenterMenuContent.vue
+++ b/src/components/helpcenter/HelpCenterMenuContent.vue
@@ -33,7 +33,7 @@
           <span class="menu-label">{{ menuItem.label }}</span>
           <i
             v-if="menuItem.showExternalIcon"
-            class="icon-[lucide--external-link] text-primary w-4 h-4 ml-auto"
+            class="ml-auto icon-[lucide--external-link] size-4 text-primary"
           />
           <i
             v-if="menuItem.key === 'more'"
@@ -88,7 +88,7 @@
       data-testid="whats-new-section"
     >
       <h3
-        class="section-description flex items-center gap-2.5 self-stretch px-8 pt-2 pb-2"
+        class="section-description flex items-center gap-2.5 self-stretch px-8 py-2"
       >
         {{ $t('helpCenter.whatsNew') }}
       </h3>
@@ -102,7 +102,7 @@
         <article
           v-for="release in releaseStore.recentReleases"
           :key="release.id || release.version"
-          class="release-menu-item flex h-12 min-h-6 cursor-pointer items-center gap-2 self-stretch rounded p-2 transition-colors hover:bg-interface-menu-component-surface-hovered"
+          class="release-menu-item flex h-12 min-h-6 cursor-pointer items-center gap-2 self-stretch rounded-sm p-2 transition-colors hover:bg-interface-menu-component-surface-hovered"
           role="button"
           tabindex="0"
           @click="onReleaseClick(release)"
@@ -159,13 +159,13 @@ import { useI18n } from 'vue-i18n'
 
 import PuzzleIcon from '@/components/icons/PuzzleIcon.vue'
 import { useExternalLink } from '@/composables/useExternalLink'
-import { isCloud } from '@/platform/distribution/types'
+import { isCloud, isDesktop } from '@/platform/distribution/types'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { useTelemetry } from '@/platform/telemetry'
 import type { ReleaseNote } from '@/platform/updates/common/releaseService'
 import { useReleaseStore } from '@/platform/updates/common/releaseStore'
 import { useCommandStore } from '@/stores/commandStore'
-import { electronAPI, isElectron } from '@/utils/envUtil'
+import { electronAPI } from '@/utils/envUtil'
 import { formatVersionAnchor } from '@/utils/formatUtil'
 import { useConflictAcknowledgment } from '@/workbench/extensions/manager/composables/useConflictAcknowledgment'
 import { useManagerState } from '@/workbench/extensions/manager/composables/useManagerState'
@@ -241,7 +241,7 @@ const moreItems = computed<MenuItem[]>(() => {
       key: 'desktop-guide',
       type: 'item',
       label: t('helpCenter.desktopUserGuide'),
-      visible: isElectron(),
+      visible: isDesktop,
       action: () => {
         trackResourceClick('docs', true)
         openExternalLink(
@@ -257,7 +257,7 @@ const moreItems = computed<MenuItem[]>(() => {
       key: 'dev-tools',
       type: 'item',
       label: t('helpCenter.openDevTools'),
-      visible: isElectron(),
+      visible: isDesktop,
       action: () => {
         openDevTools()
         emit('close')
@@ -266,13 +266,13 @@ const moreItems = computed<MenuItem[]>(() => {
     {
       key: 'divider-1',
       type: 'divider',
-      visible: isElectron()
+      visible: isDesktop
     },
     {
       key: 'reinstall',
       type: 'item',
       label: t('helpCenter.reinstall'),
-      visible: isElectron(),
+      visible: isDesktop,
       action: () => {
         onReinstall()
         emit('close')
@@ -374,7 +374,7 @@ const menuItems = computed<MenuItem[]>(() => {
     })
   }
   // Update ComfyUI - only for non-desktop, non-cloud with new manager UI
-  if (!isElectron() && !isCloud && isNewManagerUI.value) {
+  if (!isDesktop && !isCloud && isNewManagerUI.value) {
     items.push({
       key: 'update-comfyui',
       type: 'item',
@@ -551,13 +551,13 @@ const onSubmenuLeave = (): void => {
 }
 
 const openDevTools = (): void => {
-  if (isElectron()) {
+  if (isDesktop) {
     electronAPI().openDevTools()
   }
 }
 
 const onReinstall = (): void => {
-  if (isElectron()) {
+  if (isDesktop) {
     void electronAPI().reinstall()
   }
 }
diff --git a/src/components/helpcenter/HelpCenterPopups.vue b/src/components/helpcenter/HelpCenterPopups.vue
new file mode 100644
index 0000000000..516ecb976a
--- /dev/null
+++ b/src/components/helpcenter/HelpCenterPopups.vue
@@ -0,0 +1,134 @@
+<template>
+  <!-- Help Center Popup positioned within canvas area -->
+  <Teleport to="body">
+    <div
+      v-if="isHelpCenterVisible"
+      class="help-center-popup"
+      :class="{
+        'sidebar-left':
+          triggerLocation === 'sidebar' && sidebarLocation === 'left',
+        'sidebar-right':
+          triggerLocation === 'sidebar' && sidebarLocation === 'right',
+        'topbar-right': triggerLocation === 'topbar',
+        'small-sidebar': isSmall
+      }"
+    >
+      <HelpCenterMenuContent @close="closeHelpCenter" />
+    </div>
+  </Teleport>
+
+  <!-- Release Notification Toast positioned within canvas area -->
+  <Teleport to="#graph-canvas-container">
+    <ReleaseNotificationToast
+      :class="{
+        'sidebar-left': sidebarLocation === 'left',
+        'sidebar-right': sidebarLocation === 'right',
+        'small-sidebar': isSmall
+      }"
+    />
+  </Teleport>
+
+  <!-- WhatsNew Popup positioned within canvas area -->
+  <Teleport to="#graph-canvas-container">
+    <WhatsNewPopup
+      :class="{
+        'sidebar-left': sidebarLocation === 'left',
+        'sidebar-right': sidebarLocation === 'right',
+        'small-sidebar': isSmall
+      }"
+      @whats-new-dismissed="handleWhatsNewDismissed"
+    />
+  </Teleport>
+
+  <!-- Backdrop to close popup when clicking outside -->
+  <Teleport to="body">
+    <div
+      v-if="isHelpCenterVisible"
+      class="help-center-backdrop"
+      @click="closeHelpCenter"
+    />
+  </Teleport>
+</template>
+
+<script setup lang="ts">
+import { useHelpCenter } from '@/composables/useHelpCenter'
+import ReleaseNotificationToast from '@/platform/updates/components/ReleaseNotificationToast.vue'
+import WhatsNewPopup from '@/platform/updates/components/WhatsNewPopup.vue'
+
+import HelpCenterMenuContent from './HelpCenterMenuContent.vue'
+
+const { isSmall = false } = defineProps<{
+  isSmall?: boolean
+}>()
+
+const {
+  isHelpCenterVisible,
+  triggerLocation,
+  sidebarLocation,
+  closeHelpCenter,
+  handleWhatsNewDismissed
+} = useHelpCenter()
+</script>
+
+<style scoped>
+.help-center-backdrop {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 9999;
+  background: transparent;
+}
+
+.help-center-popup {
+  position: absolute;
+  bottom: 1rem;
+  z-index: 10000;
+  animation: slideInUp 0.2s ease-out;
+  pointer-events: auto;
+}
+
+.help-center-popup.sidebar-left {
+  left: 1rem;
+}
+
+.help-center-popup.sidebar-left.small-sidebar {
+  left: 1rem;
+}
+
+.help-center-popup.sidebar-right {
+  right: 1rem;
+}
+
+.help-center-popup.topbar-right {
+  top: 2rem;
+  right: 1rem;
+  bottom: auto;
+  animation: slideInDown 0.2s ease-out;
+}
+
+@keyframes slideInDown {
+  from {
+    opacity: 0;
+    transform: translateY(-20px);
+  }
+
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+@keyframes slideInUp {
+  from {
+    opacity: 0;
+    transform: translateY(20px);
+  }
+
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+</style>
diff --git a/src/components/honeyToast/HoneyToast.stories.ts b/src/components/honeyToast/HoneyToast.stories.ts
new file mode 100644
index 0000000000..74331d49f9
--- /dev/null
+++ b/src/components/honeyToast/HoneyToast.stories.ts
@@ -0,0 +1,293 @@
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+import { ref } from 'vue'
+
+import ProgressToastItem from '@/components/toast/ProgressToastItem.vue'
+import Button from '@/components/ui/button/Button.vue'
+import type { AssetDownload } from '@/stores/assetDownloadStore'
+import { cn } from '@/utils/tailwindUtil'
+
+import HoneyToast from './HoneyToast.vue'
+
+function createMockJob(overrides: Partial<AssetDownload> = {}): AssetDownload {
+  return {
+    taskId: 'task-1',
+    assetId: 'asset-1',
+    assetName: 'model-v1.safetensors',
+    bytesTotal: 1000000,
+    bytesDownloaded: 0,
+    progress: 0,
+    status: 'created',
+    lastUpdate: Date.now(),
+    ...overrides
+  }
+}
+
+const meta: Meta<typeof HoneyToast> = {
+  title: 'Toast/HoneyToast',
+  component: HoneyToast,
+  parameters: {
+    layout: 'fullscreen'
+  },
+  decorators: [
+    () => ({
+      template: '<div class="h-screen bg-base-background p-8"><story /></div>'
+    })
+  ]
+}
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const Default: Story = {
+  render: () => ({
+    components: { HoneyToast, Button, ProgressToastItem },
+    setup() {
+      const isExpanded = ref(false)
+      const jobs = [
+        createMockJob({
+          taskId: 'task-1',
+          assetName: 'model-v1.safetensors',
+          status: 'completed',
+          progress: 1
+        }),
+        createMockJob({
+          taskId: 'task-2',
+          assetName: 'lora-style.safetensors',
+          status: 'running',
+          progress: 0.45
+        }),
+        createMockJob({
+          taskId: 'task-3',
+          assetName: 'vae-decoder.safetensors',
+          status: 'created'
+        })
+      ]
+      return { isExpanded, cn, jobs }
+    },
+    template: `
+      <HoneyToast v-model:expanded="isExpanded" :visible="true">
+        <template #default>
+          <div class="flex h-12 items-center justify-between border-b border-border-default px-4">
+            <h3 class="text-sm font-bold text-base-foreground">Download Queue</h3>
+          </div>
+          <div class="relative max-h-[300px] overflow-y-auto px-4 py-4">
+            <div class="flex flex-col gap-2">
+              <ProgressToastItem v-for="job in jobs" :key="job.taskId" :job="job" />
+            </div>
+          </div>
+        </template>
+        
+        <template #footer="{ toggle }">
+          <div class="flex h-12 items-center justify-between border-t border-border-default px-4">
+            <div class="flex items-center gap-2 text-sm">
+              <i class="icon-[lucide--loader-circle] size-4 animate-spin text-muted-foreground" />
+              <span class="font-bold text-base-foreground">lora-style.safetensors</span>
+            </div>
+            <div class="flex items-center gap-2">
+              <span class="text-sm text-muted-foreground">1 of 3</span>
+              <div class="flex items-center">
+                <Button variant="muted-textonly" size="icon" @click.stop="toggle">
+                  <i :class="cn('size-4', isExpanded ? 'icon-[lucide--chevron-down]' : 'icon-[lucide--chevron-up]')" />
+                </Button>
+              </div>
+            </div>
+          </div>
+        </template>
+      </HoneyToast>
+    `
+  })
+}
+
+export const Expanded: Story = {
+  render: () => ({
+    components: { HoneyToast, Button, ProgressToastItem },
+    setup() {
+      const isExpanded = ref(true)
+      const jobs = [
+        createMockJob({
+          taskId: 'task-1',
+          assetName: 'model-v1.safetensors',
+          status: 'completed',
+          progress: 1
+        }),
+        createMockJob({
+          taskId: 'task-2',
+          assetName: 'lora-style.safetensors',
+          status: 'running',
+          progress: 0.45
+        }),
+        createMockJob({
+          taskId: 'task-3',
+          assetName: 'vae-decoder.safetensors',
+          status: 'created'
+        })
+      ]
+      return { isExpanded, cn, jobs }
+    },
+    template: `
+      <HoneyToast v-model:expanded="isExpanded" :visible="true">
+        <template #default>
+          <div class="flex h-12 items-center justify-between border-b border-border-default px-4">
+            <h3 class="text-sm font-bold text-base-foreground">Download Queue</h3>
+          </div>
+          <div class="relative max-h-[300px] overflow-y-auto px-4 py-4">
+            <div class="flex flex-col gap-2">
+              <ProgressToastItem v-for="job in jobs" :key="job.taskId" :job="job" />
+            </div>
+          </div>
+        </template>
+        
+        <template #footer="{ toggle }">
+          <div class="flex h-12 items-center justify-between border-t border-border-default px-4">
+            <div class="flex items-center gap-2 text-sm">
+              <i class="icon-[lucide--loader-circle] size-4 animate-spin text-muted-foreground" />
+              <span class="font-bold text-base-foreground">lora-style.safetensors</span>
+            </div>
+            <div class="flex items-center gap-2">
+              <span class="text-sm text-muted-foreground">1 of 3</span>
+              <div class="flex items-center">
+                <Button variant="muted-textonly" size="icon" @click.stop="toggle">
+                  <i :class="cn('size-4', isExpanded ? 'icon-[lucide--chevron-down]' : 'icon-[lucide--chevron-up]')" />
+                </Button>
+              </div>
+            </div>
+          </div>
+        </template>
+      </HoneyToast>
+    `
+  })
+}
+
+export const Completed: Story = {
+  render: () => ({
+    components: { HoneyToast, Button, ProgressToastItem },
+    setup() {
+      const isExpanded = ref(false)
+      const jobs = [
+        createMockJob({
+          taskId: 'task-1',
+          assetName: 'model-v1.safetensors',
+          bytesDownloaded: 1000000,
+          progress: 1,
+          status: 'completed'
+        }),
+        createMockJob({
+          taskId: 'task-2',
+          assetId: 'asset-2',
+          assetName: 'lora-style.safetensors',
+          bytesTotal: 500000,
+          bytesDownloaded: 500000,
+          progress: 1,
+          status: 'completed'
+        })
+      ]
+      return { isExpanded, cn, jobs }
+    },
+    template: `
+      <HoneyToast v-model:expanded="isExpanded" :visible="true">
+        <template #default>
+          <div class="flex h-12 items-center justify-between border-b border-border-default px-4">
+            <h3 class="text-sm font-bold text-base-foreground">Download Queue</h3>
+          </div>
+          <div class="relative max-h-[300px] overflow-y-auto px-4 py-4">
+            <div class="flex flex-col gap-2">
+              <ProgressToastItem v-for="job in jobs" :key="job.taskId" :job="job" />
+            </div>
+          </div>
+        </template>
+        
+        <template #footer="{ toggle }">
+          <div class="flex h-12 items-center justify-between border-t border-border-default px-4">
+            <div class="flex items-center gap-2 text-sm">
+              <i class="icon-[lucide--check-circle] size-4 text-jade-600" />
+              <span class="font-bold text-base-foreground">All downloads completed</span>
+            </div>
+            <div class="flex items-center">
+              <Button variant="muted-textonly" size="icon" @click.stop="toggle">
+                <i :class="cn('size-4', isExpanded ? 'icon-[lucide--chevron-down]' : 'icon-[lucide--chevron-up]')" />
+              </Button>
+              <Button variant="muted-textonly" size="icon">
+                <i class="icon-[lucide--x] size-4" />
+              </Button>
+            </div>
+          </div>
+        </template>
+      </HoneyToast>
+    `
+  })
+}
+
+export const WithError: Story = {
+  render: () => ({
+    components: { HoneyToast, Button, ProgressToastItem },
+    setup() {
+      const isExpanded = ref(true)
+      const jobs = [
+        createMockJob({
+          taskId: 'task-1',
+          assetName: 'model-v1.safetensors',
+          status: 'failed',
+          progress: 0.23
+        }),
+        createMockJob({
+          taskId: 'task-2',
+          assetName: 'lora-style.safetensors',
+          status: 'completed',
+          progress: 1
+        })
+      ]
+      return { isExpanded, cn, jobs }
+    },
+    template: `
+      <HoneyToast v-model:expanded="isExpanded" :visible="true">
+        <template #default>
+          <div class="flex h-12 items-center justify-between border-b border-border-default px-4">
+            <h3 class="text-sm font-bold text-base-foreground">Download Queue</h3>
+          </div>
+          <div class="relative max-h-[300px] overflow-y-auto px-4 py-4">
+            <div class="flex flex-col gap-2">
+              <ProgressToastItem v-for="job in jobs" :key="job.taskId" :job="job" />
+            </div>
+          </div>
+        </template>
+        
+        <template #footer="{ toggle }">
+          <div class="flex h-12 items-center justify-between border-t border-border-default px-4">
+            <div class="flex items-center gap-2 text-sm">
+              <i class="icon-[lucide--circle-alert] size-4 text-destructive-background" />
+              <span class="font-bold text-base-foreground">1 download failed</span>
+            </div>
+            <div class="flex items-center">
+              <Button variant="muted-textonly" size="icon" @click.stop="toggle">
+                <i :class="cn('size-4', isExpanded ? 'icon-[lucide--chevron-down]' : 'icon-[lucide--chevron-up]')" />
+              </Button>
+              <Button variant="muted-textonly" size="icon">
+                <i class="icon-[lucide--x] size-4" />
+              </Button>
+            </div>
+          </div>
+        </template>
+      </HoneyToast>
+    `
+  })
+}
+
+export const Hidden: Story = {
+  render: () => ({
+    components: { HoneyToast },
+    template: `
+      <div>
+        <p class="text-base-foreground">HoneyToast is hidden when visible=false. Nothing appears at the bottom.</p>
+        
+        <HoneyToast :visible="false">
+          <template #default>
+            <div class="px-4 py-4">Content</div>
+          </template>
+          <template #footer>
+            <div class="h-12 px-4">Footer</div>
+          </template>
+        </HoneyToast>
+      </div>
+    `
+  })
+}
diff --git a/src/components/honeyToast/HoneyToast.test.ts b/src/components/honeyToast/HoneyToast.test.ts
new file mode 100644
index 0000000000..7174208fed
--- /dev/null
+++ b/src/components/honeyToast/HoneyToast.test.ts
@@ -0,0 +1,120 @@
+import type { VueWrapper } from '@vue/test-utils'
+import { mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { defineComponent, h, nextTick, ref } from 'vue'
+
+import HoneyToast from './HoneyToast.vue'
+
+describe('HoneyToast', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    document.body.innerHTML = ''
+  })
+
+  function mountComponent(
+    props: { visible: boolean; expanded?: boolean } = { visible: true }
+  ): VueWrapper {
+    return mount(HoneyToast, {
+      props,
+      slots: {
+        default: (slotProps: { isExpanded: boolean }) =>
+          h(
+            'div',
+            { 'data-testid': 'content' },
+            slotProps.isExpanded ? 'expanded' : 'collapsed'
+          ),
+        footer: (slotProps: { isExpanded: boolean; toggle: () => void }) =>
+          h(
+            'button',
+            {
+              'data-testid': 'toggle-btn',
+              onClick: slotProps.toggle
+            },
+            slotProps.isExpanded ? 'Collapse' : 'Expand'
+          )
+      },
+      attachTo: document.body
+    })
+  }
+
+  it('renders when visible is true', async () => {
+    const wrapper = mountComponent({ visible: true })
+    await nextTick()
+
+    const toast = document.body.querySelector('[role="status"]')
+    expect(toast).toBeTruthy()
+
+    wrapper.unmount()
+  })
+
+  it('does not render when visible is false', async () => {
+    const wrapper = mountComponent({ visible: false })
+    await nextTick()
+
+    const toast = document.body.querySelector('[role="status"]')
+    expect(toast).toBeFalsy()
+
+    wrapper.unmount()
+  })
+
+  it('passes is-expanded=false to slots by default', async () => {
+    const wrapper = mountComponent({ visible: true })
+    await nextTick()
+
+    const content = document.body.querySelector('[data-testid="content"]')
+    expect(content?.textContent).toBe('collapsed')
+
+    wrapper.unmount()
+  })
+
+  it('has aria-live="polite" for accessibility', async () => {
+    const wrapper = mountComponent({ visible: true })
+    await nextTick()
+
+    const toast = document.body.querySelector('[role="status"]')
+    expect(toast?.getAttribute('aria-live')).toBe('polite')
+
+    wrapper.unmount()
+  })
+
+  it('supports v-model:expanded with reactive parent state', async () => {
+    const TestWrapper = defineComponent({
+      components: { HoneyToast },
+      setup() {
+        const expanded = ref(false)
+        return { expanded }
+      },
+      template: `
+        <HoneyToast :visible="true" v-model:expanded="expanded">
+          <template #default="slotProps">
+            <div data-testid="content">{{ slotProps.isExpanded ? 'expanded' : 'collapsed' }}</div>
+          </template>
+          <template #footer="slotProps">
+            <button data-testid="toggle-btn" @click="slotProps.toggle">
+              {{ slotProps.isExpanded ? 'Collapse' : 'Expand' }}
+            </button>
+          </template>
+        </HoneyToast>
+      `
+    })
+
+    const wrapper = mount(TestWrapper, { attachTo: document.body })
+    await nextTick()
+
+    const content = document.body.querySelector('[data-testid="content"]')
+    expect(content?.textContent).toBe('collapsed')
+
+    const toggleBtn = document.body.querySelector(
+      '[data-testid="toggle-btn"]'
+    ) as HTMLButtonElement
+    expect(toggleBtn?.textContent?.trim()).toBe('Expand')
+
+    toggleBtn?.click()
+    await nextTick()
+
+    expect(content?.textContent).toBe('expanded')
+    expect(toggleBtn?.textContent?.trim()).toBe('Collapse')
+
+    wrapper.unmount()
+  })
+})
diff --git a/src/components/honeyToast/HoneyToast.vue b/src/components/honeyToast/HoneyToast.vue
new file mode 100644
index 0000000000..4ecc539258
--- /dev/null
+++ b/src/components/honeyToast/HoneyToast.vue
@@ -0,0 +1,48 @@
+<script setup lang="ts">
+import { cn } from '@/utils/tailwindUtil'
+
+const { visible } = defineProps<{
+  visible: boolean
+}>()
+
+const isExpanded = defineModel<boolean>('expanded', { default: false })
+
+function toggle() {
+  isExpanded.value = !isExpanded.value
+}
+</script>
+
+<template>
+  <Teleport to="body">
+    <Transition
+      enter-active-class="transition-all duration-300 ease-out"
+      enter-from-class="translate-y-full opacity-0"
+      enter-to-class="translate-y-0 opacity-100"
+      leave-active-class="transition-all duration-200 ease-in"
+      leave-from-class="translate-y-0 opacity-100"
+      leave-to-class="translate-y-full opacity-0"
+    >
+      <div
+        v-if="visible"
+        role="status"
+        aria-live="polite"
+        class="fixed inset-x-4 bottom-6 z-9999 mx-auto w-auto max-w-3xl overflow-hidden rounded-lg border border-border-default bg-base-background shadow-lg transition-all duration-300 sm:inset-x-0 sm:w-min sm:min-w-0"
+      >
+        <div
+          :class="
+            cn(
+              'max-w-full min-w-0 overflow-hidden transition-all duration-300',
+              isExpanded
+                ? 'max-h-100 w-full sm:w-[max(400px,40vw)]'
+                : 'max-h-0 w-0'
+            )
+          "
+        >
+          <slot :is-expanded />
+        </div>
+
+        <slot name="footer" :is-expanded :toggle />
+      </div>
+    </Transition>
+  </Teleport>
+</template>
diff --git a/src/components/imagecrop/WidgetImageCrop.vue b/src/components/imagecrop/WidgetImageCrop.vue
new file mode 100644
index 0000000000..5d55ddb8b9
--- /dev/null
+++ b/src/components/imagecrop/WidgetImageCrop.vue
@@ -0,0 +1,143 @@
+<template>
+  <div
+    class="widget-expands relative flex size-full flex-col gap-1"
+    @pointerdown.stop
+    @pointermove.stop
+    @pointerup.stop
+  >
+    <!-- Image preview container -->
+    <div
+      ref="containerEl"
+      class="relative min-h-0 flex-1 overflow-hidden rounded-[5px] bg-node-component-surface"
+    >
+      <div v-if="isLoading" class="flex size-full items-center justify-center">
+        <span class="text-sm">{{ $t('imageCrop.loading') }}</span>
+      </div>
+
+      <div
+        v-else-if="!imageUrl"
+        class="flex size-full flex-col items-center justify-center text-center"
+      >
+        <i class="mb-2 icon-[lucide--image] size-12" />
+        <p class="text-sm">{{ $t('imageCrop.noInputImage') }}</p>
+      </div>
+
+      <img
+        v-else
+        ref="imageEl"
+        :src="imageUrl"
+        :alt="$t('imageCrop.cropPreviewAlt')"
+        draggable="false"
+        class="block size-full object-contain select-none"
+        @load="handleImageLoad"
+        @error="handleImageError"
+        @dragstart.prevent
+      />
+
+      <div
+        v-if="imageUrl && !isLoading"
+        class="absolute box-content cursor-move border-2 border-white shadow-[0_0_0_9999px_rgba(0,0,0,0.5)]"
+        :style="cropBoxStyle"
+        @pointerdown="handleDragStart"
+        @pointermove="handleDragMove"
+        @pointerup="handleDragEnd"
+      />
+
+      <div
+        v-for="handle in resizeHandles"
+        v-show="imageUrl && !isLoading"
+        :key="handle.direction"
+        :class="['absolute', handle.class]"
+        :style="handle.style"
+        @pointerdown="(e) => handleResizeStart(e, handle.direction)"
+        @pointermove="handleResizeMove"
+        @pointerup="handleResizeEnd"
+      />
+    </div>
+
+    <div class="flex shrink-0 items-center gap-2">
+      <label class="text-xs text-muted-foreground">
+        {{ $t('imageCrop.ratio') }}
+      </label>
+      <Select v-model="selectedRatio">
+        <SelectTrigger class="h-7 w-24 text-xs">
+          <SelectValue />
+        </SelectTrigger>
+        <SelectContent>
+          <SelectItem v-for="key in ratioKeys" :key="key" :value="key">
+            {{ key === 'custom' ? $t('imageCrop.custom') : key }}
+          </SelectItem>
+        </SelectContent>
+      </Select>
+      <Button
+        size="icon"
+        :variant="isLockEnabled ? 'primary' : 'secondary'"
+        class="size-7"
+        :aria-label="
+          isLockEnabled
+            ? $t('imageCrop.unlockRatio')
+            : $t('imageCrop.lockRatio')
+        "
+        @click="isLockEnabled = !isLockEnabled"
+      >
+        <i
+          :class="
+            isLockEnabled
+              ? 'icon-[lucide--lock] size-3.5'
+              : 'icon-[lucide--lock-open] size-3.5'
+          "
+        />
+      </Button>
+    </div>
+
+    <WidgetBoundingBox v-model="modelValue" class="shrink-0" />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useTemplateRef } from 'vue'
+
+import WidgetBoundingBox from '@/components/boundingbox/WidgetBoundingBox.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 { ASPECT_RATIOS, useImageCrop } from '@/composables/useImageCrop'
+import type { NodeId } from '@/platform/workflow/validation/schemas/workflowSchema'
+import type { Bounds } from '@/renderer/core/layout/types'
+
+const props = defineProps<{
+  nodeId: NodeId
+}>()
+
+const modelValue = defineModel<Bounds>({
+  default: () => ({ x: 0, y: 0, width: 512, height: 512 })
+})
+
+const imageEl = useTemplateRef<HTMLImageElement>('imageEl')
+const containerEl = useTemplateRef<HTMLDivElement>('containerEl')
+
+const ratioKeys = Object.keys(ASPECT_RATIOS)
+
+const {
+  imageUrl,
+  isLoading,
+
+  selectedRatio,
+  isLockEnabled,
+
+  cropBoxStyle,
+  resizeHandles,
+
+  handleImageLoad,
+  handleImageError,
+  handleDragStart,
+  handleDragMove,
+  handleDragEnd,
+  handleResizeStart,
+  handleResizeMove,
+  handleResizeEnd
+} = useImageCrop(props.nodeId, { imageEl, containerEl, modelValue })
+</script>
diff --git a/src/components/input/MultiSelect.vue b/src/components/input/MultiSelect.vue
index aaa372d73d..8ea06f1eee 100644
--- a/src/components/input/MultiSelect.vue
+++ b/src/components/input/MultiSelect.vue
@@ -16,7 +16,7 @@
     :pt="{
       root: ({ props }: MultiSelectPassThroughMethodOptions) => ({
         class: cn(
-          'h-10 relative inline-flex cursor-pointer select-none',
+          'relative inline-flex h-10 cursor-pointer select-none',
           'rounded-lg bg-secondary-background text-base-foreground',
           'transition-all duration-200 ease-in-out',
           'border-[2.5px] border-solid',
@@ -24,7 +24,7 @@
             ? 'border-node-component-border'
             : 'border-transparent',
           'focus-within:border-node-component-border',
-          { 'opacity-60 cursor-default': props.disabled }
+          { 'cursor-default opacity-60': props.disabled }
         )
       }),
       labelContainer: {
@@ -46,7 +46,7 @@
       // Overlay & list visuals unchanged
       overlay: {
         class: cn(
-          'mt-2 rounded-lg py-2 px-2',
+          'mt-2 rounded-lg p-2',
           'bg-base-background',
           'text-base-foreground',
           'border border-solid border-border-default'
@@ -62,7 +62,7 @@
       // Option row hover and focus tone
       option: ({ context }: MultiSelectPassThroughMethodOptions) => ({
         class: cn(
-          'flex gap-2 items-center h-10 px-2 rounded-lg cursor-pointer',
+          'flex h-10 cursor-pointer items-center gap-2 rounded-lg px-2',
           'hover:bg-secondary-background-hover',
           // Add focus/highlight state for keyboard navigation
           context?.focused &&
@@ -77,6 +77,9 @@
       pcOptionCheckbox: {
         root: { class: 'hidden' },
         style: { display: 'none' }
+      },
+      emptyMessage: {
+        class: 'px-3 pb-4 text-sm text-muted-foreground'
       }
     }"
     :aria-label="label || t('g.multiSelectDropdown')"
@@ -132,7 +135,7 @@
       </span>
       <span
         v-if="selectedCount > 0"
-        class="pointer-events-none absolute -top-2 -right-2 z-10 flex h-5 w-5 items-center justify-center rounded-full bg-primary-background text-xs font-semibold text-base-foreground"
+        class="pointer-events-none absolute -top-2 -right-2 z-10 flex size-5 items-center justify-center rounded-full bg-primary-background text-xs font-semibold text-base-foreground"
       >
         {{ selectedCount }}
       </span>
@@ -147,11 +150,11 @@
     <template #option="slotProps">
       <div
         role="button"
-        class="flex items-center gap-2 cursor-pointer"
+        class="flex cursor-pointer items-center gap-2"
         :style="popoverStyle"
       >
         <div
-          class="flex size-4 shrink-0 items-center justify-center rounded p-0.5 transition-all duration-200"
+          class="flex size-4 shrink-0 items-center justify-center rounded-sm p-0.5 transition-all duration-200"
           :class="
             slotProps.selected
               ? 'bg-primary-background'
@@ -160,7 +163,7 @@
         >
           <i
             v-if="slotProps.selected"
-            class="text-bold icon-[lucide--check] text-xs text-white"
+            class="text-bold icon-[lucide--check] text-xs text-base-foreground"
           />
         </div>
         <span>
diff --git a/src/components/input/SingleSelect.vue b/src/components/input/SingleSelect.vue
index 2a3f7cdee8..85d3415b03 100644
--- a/src/components/input/SingleSelect.vue
+++ b/src/components/input/SingleSelect.vue
@@ -40,7 +40,7 @@
       },
       overlay: {
         class: cn(
-          'mt-2 p-2 rounded-lg',
+          'mt-2 rounded-lg p-2',
           'bg-base-background text-base-foreground',
           'border border-solid border-border-default'
         )
@@ -57,7 +57,7 @@
       option: ({ context }: SelectPassThroughMethodOptions<SelectOption>) => ({
         class: cn(
           // Row layout
-          'flex items-center justify-between gap-3 px-2 py-3 rounded',
+          'flex items-center justify-between gap-3 rounded-sm px-2 py-3',
           'hover:bg-secondary-background-hover',
           // Add focus state for keyboard navigation
           context.focused && 'bg-secondary-background-hover',
diff --git a/src/components/load3d/Load3D.vue b/src/components/load3d/Load3D.vue
index b69eab4aaa..f6942e7c32 100644
--- a/src/components/load3d/Load3D.vue
+++ b/src/components/load3d/Load3D.vue
@@ -24,6 +24,7 @@
         v-model:light-config="lightConfig"
         :is-splat-model="isSplatModel"
         :is-ply-model="isPlyModel"
+        :has-skeleton="hasSkeleton"
         @update-background-image="handleBackgroundImageUpdate"
         @export-model="handleExportModel"
       />
@@ -116,6 +117,7 @@ const {
   isPreview,
   isSplatModel,
   isPlyModel,
+  hasSkeleton,
   hasRecording,
   recordingDuration,
   animations,
diff --git a/src/components/load3d/Load3DControls.vue b/src/components/load3d/Load3DControls.vue
index cabf5c0e5a..68251c7412 100644
--- a/src/components/load3d/Load3DControls.vue
+++ b/src/components/load3d/Load3DControls.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="pointer-events-auto absolute top-12 left-2 z-20 flex flex-col rounded-lg bg-smoke-700/30"
+    class="pointer-events-auto absolute top-12 left-2 z-20 flex flex-col rounded-lg bg-backdrop/30"
     @pointerdown.stop
     @pointermove.stop
     @pointerup.stop
@@ -14,12 +14,12 @@
         class="rounded-full"
         @click="toggleMenu"
       >
-        <i class="pi pi-bars text-lg text-white" />
+        <i class="pi pi-bars text-lg text-base-foreground" />
       </Button>
 
       <div
         v-show="isMenuOpen"
-        class="absolute top-0 left-12 rounded-lg bg-black/50 shadow-lg"
+        class="absolute top-0 left-12 rounded-lg bg-interface-menu-surface shadow-lg"
       >
         <div class="flex flex-col">
           <Button
@@ -29,13 +29,13 @@
             :class="
               cn(
                 'flex w-full items-center justify-start',
-                activeCategory === category && 'bg-smoke-600'
+                activeCategory === category && 'bg-button-active-surface'
               )
             "
             @click="selectCategory(category)"
           >
             <i :class="getCategoryIcon(category)" />
-            <span class="whitespace-nowrap text-white">{{
+            <span class="whitespace-nowrap text-base-foreground">{{
               $t(categoryLabels[category])
             }}</span>
           </Button>
@@ -58,8 +58,10 @@
         v-if="showModelControls"
         v-model:material-mode="modelConfig!.materialMode"
         v-model:up-direction="modelConfig!.upDirection"
+        v-model:show-skeleton="modelConfig!.showSkeleton"
         :hide-material-mode="isSplatModel"
         :is-ply-model="isPlyModel"
+        :has-skeleton="hasSkeleton"
       />
 
       <CameraControls
@@ -99,9 +101,14 @@ import type {
 } from '@/extensions/core/load3d/interfaces'
 import { cn } from '@/utils/tailwindUtil'
 
-const { isSplatModel = false, isPlyModel = false } = defineProps<{
+const {
+  isSplatModel = false,
+  isPlyModel = false,
+  hasSkeleton = false
+} = defineProps<{
   isSplatModel?: boolean
   isPlyModel?: boolean
+  hasSkeleton?: boolean
 }>()
 
 const sceneConfig = defineModel<SceneConfig>('sceneConfig')
@@ -162,7 +169,7 @@ const getCategoryIcon = (category: string) => {
     export: 'pi pi-download'
   }
   // @ts-expect-error fixme ts strict error
-  return `${icons[category]} text-white text-lg`
+  return `${icons[category]} text-base-foreground text-lg`
 }
 
 const emit = defineEmits<{
diff --git a/src/components/load3d/Load3DScene.vue b/src/components/load3d/Load3DScene.vue
index cf497dea59..c1334142b0 100644
--- a/src/components/load3d/Load3DScene.vue
+++ b/src/components/load3d/Load3DScene.vue
@@ -1,9 +1,10 @@
 <template>
   <div
     ref="container"
-    class="relative h-full w-full min-h-[200px]"
+    class="relative size-full min-h-[200px]"
     data-capture-wheel="true"
-    @pointerdown.stop
+    tabindex="-1"
+    @pointerdown.stop="focusContainer"
     @pointermove.stop
     @pointerup.stop
     @mousedown.stop
@@ -31,7 +32,7 @@
 <script setup lang="ts">
 import { computed, onMounted, onUnmounted, ref } from 'vue'
 
-import LoadingOverlay from '@/components/load3d/LoadingOverlay.vue'
+import LoadingOverlay from '@/components/common/LoadingOverlay.vue'
 import { useLoad3dDrag } from '@/composables/useLoad3dDrag'
 
 const props = defineProps<{
@@ -45,6 +46,10 @@ const props = defineProps<{
 
 const container = ref<HTMLElement | null>(null)
 
+function focusContainer() {
+  container.value?.focus()
+}
+
 const { isDragging, dragMessage, handleDragOver, handleDragLeave, handleDrop } =
   useLoad3dDrag({
     onModelDrop: async (file) => {
diff --git a/src/components/load3d/Load3dViewerContent.vue b/src/components/load3d/Load3dViewerContent.vue
index b0ae308cb7..f7476fde03 100644
--- a/src/components/load3d/Load3dViewerContent.vue
+++ b/src/components/load3d/Load3dViewerContent.vue
@@ -9,7 +9,7 @@
     <div class="relative flex-1">
       <div
         ref="containerRef"
-        class="absolute h-full w-full"
+        class="absolute size-full"
         @resize="viewer.handleResize"
         @dragover.prevent.stop="handleDragOver"
         @dragleave.stop="handleDragLeave"
@@ -94,6 +94,7 @@
 
 <script setup lang="ts">
 import { onBeforeUnmount, onMounted, ref, toRaw } from 'vue'
+import { useI18n } from 'vue-i18n'
 
 import AnimationControls from '@/components/load3d/controls/AnimationControls.vue'
 import CameraControls from '@/components/load3d/controls/viewer/ViewerCameraControls.vue'
@@ -104,11 +105,11 @@ import SceneControls from '@/components/load3d/controls/viewer/ViewerSceneContro
 import Button from '@/components/ui/button/Button.vue'
 import { useLoad3dDrag } from '@/composables/useLoad3dDrag'
 import { useLoad3dViewer } from '@/composables/useLoad3dViewer'
-import { t } from '@/i18n'
 import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
 import { useLoad3dService } from '@/services/load3dService'
 import { useDialogStore } from '@/stores/dialogStore'
 
+const { t } = useI18n()
 const props = defineProps<{
   node?: LGraphNode
   modelUrl?: string
@@ -121,8 +122,9 @@ const mutationObserver = ref<MutationObserver | null>(null)
 
 const isStandaloneMode = !props.node && props.modelUrl
 
+// Use sync version since useLoad3dViewer is already imported (module is loaded)
 const viewer = props.node
-  ? useLoad3dService().getOrCreateViewer(toRaw(props.node))
+  ? useLoad3dService().getOrCreateViewerSync(toRaw(props.node), useLoad3dViewer)
   : useLoad3dViewer()
 
 const { isDragging, dragMessage, handleDragOver, handleDragLeave, handleDrop } =
@@ -130,7 +132,7 @@ const { isDragging, dragMessage, handleDragOver, handleDragLeave, handleDrop } =
     onModelDrop: async (file) => {
       await viewer.handleModelDrop(file)
     },
-    disabled: viewer.isPreview.value || isStandaloneMode
+    disabled: viewer.isPreview.value || !!isStandaloneMode
   })
 
 onMounted(async () => {
diff --git a/src/components/load3d/LoadingOverlay.vue b/src/components/load3d/LoadingOverlay.vue
deleted file mode 100644
index d5094f9b0e..0000000000
--- a/src/components/load3d/LoadingOverlay.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<template>
-  <Transition name="fade">
-    <div
-      v-if="loading"
-      class="bg-opacity-50 absolute inset-0 z-50 flex items-center justify-center bg-black"
-    >
-      <div class="flex flex-col items-center">
-        <div class="spinner" />
-        <div class="mt-4 text-lg text-white">
-          {{ loadingMessage }}
-        </div>
-      </div>
-    </div>
-  </Transition>
-</template>
-
-<script setup lang="ts">
-defineProps<{
-  loading: boolean
-  loadingMessage: string
-}>()
-</script>
-
-<style scoped>
-.spinner {
-  width: 50px;
-  height: 50px;
-  border: 4px solid #f3f3f3;
-  border-top: 4px solid #3498db;
-  border-radius: 50%;
-  animation: spin 1s linear infinite;
-}
-
-@keyframes spin {
-  0% {
-    transform: rotate(0deg);
-  }
-  100% {
-    transform: rotate(360deg);
-  }
-}
-</style>
diff --git a/src/components/load3d/controls/AnimationControls.vue b/src/components/load3d/controls/AnimationControls.vue
index 16df631e5c..5cdfb7b345 100644
--- a/src/components/load3d/controls/AnimationControls.vue
+++ b/src/components/load3d/controls/AnimationControls.vue
@@ -15,7 +15,7 @@
           :class="[
             'pi',
             playing ? 'pi-pause' : 'pi-play',
-            'text-lg text-white'
+            'text-lg text-base-foreground'
           ]"
         />
       </Button>
@@ -46,7 +46,7 @@
         class="flex-1"
         @update:model-value="handleSliderChange"
       />
-      <span class="min-w-16 text-xs text-white">
+      <span class="min-w-16 text-xs text-base-foreground">
         {{ formatTime(currentTime) }} / {{ formatTime(animationDuration) }}
       </span>
     </div>
diff --git a/src/components/load3d/controls/CameraControls.vue b/src/components/load3d/controls/CameraControls.vue
index 85ab914d81..7922e6f1ea 100644
--- a/src/components/load3d/controls/CameraControls.vue
+++ b/src/components/load3d/controls/CameraControls.vue
@@ -11,7 +11,7 @@
       :aria-label="$t('load3d.switchCamera')"
       @click="switchCamera"
     >
-      <i :class="['pi', 'pi-camera', 'text-lg text-white']" />
+      <i :class="['pi', 'pi-camera', 'text-lg text-base-foreground']" />
     </Button>
     <PopupSlider
       v-if="showFOVButton"
diff --git a/src/components/load3d/controls/ExportControls.vue b/src/components/load3d/controls/ExportControls.vue
index 7f55406948..3957cd12b8 100644
--- a/src/components/load3d/controls/ExportControls.vue
+++ b/src/components/load3d/controls/ExportControls.vue
@@ -12,18 +12,18 @@
         :aria-label="$t('load3d.exportModel')"
         @click="toggleExportFormats"
       >
-        <i class="pi pi-download text-lg text-white" />
+        <i class="pi pi-download text-lg text-base-foreground" />
       </Button>
       <div
         v-show="showExportFormats"
-        class="absolute top-0 left-12 rounded-lg bg-black/50 shadow-lg"
+        class="absolute top-0 left-12 rounded-lg bg-interface-menu-surface shadow-lg"
       >
         <div class="flex flex-col">
           <Button
             v-for="format in exportFormats"
             :key="format.value"
             variant="textonly"
-            class="text-white"
+            class="text-base-foreground"
             @click="exportModel(format.value)"
           >
             {{ format.label }}
diff --git a/src/components/load3d/controls/LightControls.vue b/src/components/load3d/controls/LightControls.vue
index 82cbe8ebc7..ebf693913d 100644
--- a/src/components/load3d/controls/LightControls.vue
+++ b/src/components/load3d/controls/LightControls.vue
@@ -12,7 +12,7 @@
         :aria-label="$t('load3d.lightIntensity')"
         @click="toggleLightIntensity"
       >
-        <i class="pi pi-sun text-lg text-white" />
+        <i class="pi pi-sun text-lg text-base-foreground" />
       </Button>
       <div
         v-show="showLightIntensity"
diff --git a/src/components/load3d/controls/ModelControls.vue b/src/components/load3d/controls/ModelControls.vue
index 581a497218..79b67a54b6 100644
--- a/src/components/load3d/controls/ModelControls.vue
+++ b/src/components/load3d/controls/ModelControls.vue
@@ -12,11 +12,11 @@
         :aria-label="t('load3d.upDirection')"
         @click="toggleUpDirection"
       >
-        <i class="pi pi-arrow-up text-lg text-white" />
+        <i class="pi pi-arrow-up text-lg text-base-foreground" />
       </Button>
       <div
         v-show="showUpDirection"
-        class="absolute top-0 left-12 rounded-lg bg-black/50 shadow-lg"
+        class="absolute top-0 left-12 rounded-lg bg-interface-menu-surface shadow-lg"
       >
         <div class="flex flex-col">
           <Button
@@ -24,7 +24,10 @@
             :key="direction"
             variant="textonly"
             :class="
-              cn('text-white', upDirection === direction && 'bg-blue-500')
+              cn(
+                'text-base-foreground',
+                upDirection === direction && 'bg-blue-500'
+              )
             "
             @click="selectUpDirection(direction)"
           >
@@ -46,11 +49,11 @@
         :aria-label="t('load3d.materialMode')"
         @click="toggleMaterialMode"
       >
-        <i class="pi pi-box text-lg text-white" />
+        <i class="pi pi-box text-lg text-base-foreground" />
       </Button>
       <div
         v-show="showMaterialMode"
-        class="absolute top-0 left-12 rounded-lg bg-black/50 shadow-lg"
+        class="absolute top-0 left-12 rounded-lg bg-interface-menu-surface shadow-lg"
       >
         <div class="flex flex-col">
           <Button
@@ -59,7 +62,7 @@
             variant="textonly"
             :class="
               cn(
-                'whitespace-nowrap text-white',
+                'whitespace-nowrap text-base-foreground',
                 materialMode === mode && 'bg-blue-500'
               )
             "
@@ -70,27 +73,50 @@
         </div>
       </div>
     </div>
+
+    <div v-if="hasSkeleton">
+      <Button
+        v-tooltip.right="{
+          value: t('load3d.showSkeleton'),
+          showDelay: 300
+        }"
+        size="icon"
+        variant="textonly"
+        :class="cn('rounded-full', showSkeleton && 'bg-blue-500')"
+        :aria-label="t('load3d.showSkeleton')"
+        @click="showSkeleton = !showSkeleton"
+      >
+        <i class="pi pi-sitemap text-lg text-base-foreground" />
+      </Button>
+    </div>
   </div>
 </template>
 
 <script setup lang="ts">
 import { computed, onMounted, onUnmounted, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
 
 import Button from '@/components/ui/button/Button.vue'
 import type {
   MaterialMode,
   UpDirection
 } from '@/extensions/core/load3d/interfaces'
-import { t } from '@/i18n'
 import { cn } from '@/utils/tailwindUtil'
 
-const { hideMaterialMode = false, isPlyModel = false } = defineProps<{
+const { t } = useI18n()
+const {
+  hideMaterialMode = false,
+  isPlyModel = false,
+  hasSkeleton = false
+} = defineProps<{
   hideMaterialMode?: boolean
   isPlyModel?: boolean
+  hasSkeleton?: boolean
 }>()
 
 const materialMode = defineModel<MaterialMode>('materialMode')
 const upDirection = defineModel<UpDirection>('upDirection')
+const showSkeleton = defineModel<boolean>('showSkeleton')
 
 const showUpDirection = ref(false)
 const showMaterialMode = ref(false)
diff --git a/src/components/load3d/controls/PopupSlider.vue b/src/components/load3d/controls/PopupSlider.vue
index 5ab1fe3d60..b8e35b125d 100644
--- a/src/components/load3d/controls/PopupSlider.vue
+++ b/src/components/load3d/controls/PopupSlider.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="relative show-slider">
+  <div class="show-slider relative">
     <Button
       v-tooltip.right="{ value: tooltipText, showDelay: 300 }"
       size="icon"
@@ -8,11 +8,11 @@
       :aria-label="tooltipText"
       @click="toggleSlider"
     >
-      <i :class="['pi', icon, 'text-lg text-white']" />
+      <i :class="['pi', icon, 'text-lg text-base-foreground']" />
     </Button>
     <div
       v-show="showSlider"
-      class="absolute top-0 left-12 rounded-lg bg-black/50 p-4 shadow-lg w-[150px]"
+      class="absolute top-0 left-12 w-[150px] rounded-lg bg-interface-menu-surface p-4 shadow-lg"
     >
       <Slider
         v-model="value"
diff --git a/src/components/load3d/controls/RecordingControls.vue b/src/components/load3d/controls/RecordingControls.vue
index 98a6ea09d6..3650388e4a 100644
--- a/src/components/load3d/controls/RecordingControls.vue
+++ b/src/components/load3d/controls/RecordingControls.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="relative rounded-lg bg-smoke-700/30">
+  <div class="relative rounded-lg bg-backdrop/30">
     <div class="flex flex-col gap-2">
       <Button
         v-tooltip.right="{
@@ -13,7 +13,7 @@
         :class="
           cn(
             'rounded-full',
-            isRecording && 'text-red-500 recording-button-blink'
+            isRecording && 'recording-button-blink text-red-500'
           )
         "
         :aria-label="
@@ -25,7 +25,7 @@
           :class="[
             'pi',
             isRecording ? 'pi-circle-fill' : 'pi-video',
-            'text-lg text-white'
+            'text-lg text-base-foreground'
           ]"
         />
       </Button>
@@ -42,7 +42,7 @@
         :aria-label="$t('load3d.exportRecording')"
         @click="handleExportRecording"
       >
-        <i class="pi pi-download text-lg text-white" />
+        <i class="pi pi-download text-lg text-base-foreground" />
       </Button>
 
       <Button
@@ -57,12 +57,12 @@
         :aria-label="$t('load3d.clearRecording')"
         @click="handleClearRecording"
       >
-        <i class="pi pi-trash text-lg text-white" />
+        <i class="pi pi-trash text-lg text-base-foreground" />
       </Button>
 
       <div
         v-if="recordingDuration && recordingDuration > 0 && !isRecording"
-        class="mt-1 text-center text-xs text-white"
+        class="mt-1 text-center text-xs text-base-foreground"
       >
         {{ formatDuration(recordingDuration) }}
       </div>
diff --git a/src/components/load3d/controls/SceneControls.vue b/src/components/load3d/controls/SceneControls.vue
index 4521df3db7..911bea78a0 100644
--- a/src/components/load3d/controls/SceneControls.vue
+++ b/src/components/load3d/controls/SceneControls.vue
@@ -8,7 +8,7 @@
       :aria-label="$t('load3d.showGrid')"
       @click="toggleGrid"
     >
-      <i class="pi pi-table text-lg text-white" />
+      <i class="pi pi-table text-lg text-base-foreground" />
     </Button>
 
     <div v-if="!hasBackgroundImage">
@@ -23,12 +23,12 @@
         :aria-label="$t('load3d.backgroundColor')"
         @click="openColorPicker"
       >
-        <i class="pi pi-palette text-lg text-white" />
+        <i class="pi pi-palette text-lg text-base-foreground" />
         <input
           ref="colorPickerRef"
           type="color"
           :value="backgroundColor"
-          class="pointer-events-none absolute m-0 h-0 w-0 p-0 opacity-0"
+          class="pointer-events-none absolute m-0 size-0 p-0 opacity-0"
           @input="
             updateBackgroundColor(($event.target as HTMLInputElement).value)
           "
@@ -48,12 +48,12 @@
         :aria-label="$t('load3d.uploadBackgroundImage')"
         @click="openImagePicker"
       >
-        <i class="pi pi-image text-lg text-white" />
+        <i class="pi pi-image text-lg text-base-foreground" />
         <input
           ref="imagePickerRef"
           type="file"
           accept="image/*"
-          class="pointer-events-none absolute m-0 h-0 w-0 p-0 opacity-0"
+          class="pointer-events-none absolute m-0 size-0 p-0 opacity-0"
           @change="uploadBackgroundImage"
         />
       </Button>
@@ -76,7 +76,7 @@
         :aria-label="$t('load3d.panoramaMode')"
         @click="toggleBackgroundRenderMode"
       >
-        <i class="pi pi-globe text-lg text-white" />
+        <i class="pi pi-globe text-lg text-base-foreground" />
       </Button>
     </div>
 
@@ -98,7 +98,7 @@
         :aria-label="$t('load3d.removeBackgroundImage')"
         @click="removeBackgroundImage"
       >
-        <i class="pi pi-times text-lg text-white" />
+        <i class="pi pi-times text-lg text-base-foreground" />
       </Button>
     </div>
   </div>
diff --git a/src/components/load3d/controls/ViewerControls.vue b/src/components/load3d/controls/ViewerControls.vue
index af751d4f19..4b8e8442c2 100644
--- a/src/components/load3d/controls/ViewerControls.vue
+++ b/src/components/load3d/controls/ViewerControls.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="relative rounded-lg bg-smoke-700/30">
+  <div class="relative rounded-lg bg-backdrop/30">
     <div class="flex flex-col gap-2">
       <Button
         v-tooltip.right="{
@@ -12,20 +12,22 @@
         :aria-label="t('load3d.openIn3DViewer')"
         @click="openIn3DViewer"
       >
-        <i class="pi pi-expand text-lg text-white" />
+        <i class="pi pi-expand text-lg text-base-foreground" />
       </Button>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
+import { useI18n } from 'vue-i18n'
+
 import Load3DViewerContent from '@/components/load3d/Load3dViewerContent.vue'
 import Button from '@/components/ui/button/Button.vue'
-import { t } from '@/i18n'
 import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
 import { useLoad3dService } from '@/services/load3dService'
 import { useDialogStore } from '@/stores/dialogStore'
 
+const { t } = useI18n()
 const { node } = defineProps<{
   node: LGraphNode
 }>()
diff --git a/src/components/load3d/controls/viewer/ViewerCameraControls.vue b/src/components/load3d/controls/viewer/ViewerCameraControls.vue
index d675ab77a4..bc63d39df8 100644
--- a/src/components/load3d/controls/viewer/ViewerCameraControls.vue
+++ b/src/components/load3d/controls/viewer/ViewerCameraControls.vue
@@ -30,10 +30,11 @@
 import Select from 'primevue/select'
 import Slider from 'primevue/slider'
 import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
 
 import type { CameraType } from '@/extensions/core/load3d/interfaces'
-import { t } from '@/i18n'
 
+const { t } = useI18n()
 const cameras = [
   { title: t('load3d.cameraType.perspective'), value: 'perspective' },
   { title: t('load3d.cameraType.orthographic'), value: 'orthographic' }
diff --git a/src/components/load3d/controls/viewer/ViewerModelControls.vue b/src/components/load3d/controls/viewer/ViewerModelControls.vue
index 23a67577db..8a850c4a95 100644
--- a/src/components/load3d/controls/viewer/ViewerModelControls.vue
+++ b/src/components/load3d/controls/viewer/ViewerModelControls.vue
@@ -25,13 +25,14 @@
 <script setup lang="ts">
 import Select from 'primevue/select'
 import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
 
 import type {
   MaterialMode,
   UpDirection
 } from '@/extensions/core/load3d/interfaces'
-import { t } from '@/i18n'
 
+const { t } = useI18n()
 const { hideMaterialMode = false, isPlyModel = false } = defineProps<{
   hideMaterialMode?: boolean
   isPlyModel?: boolean
diff --git a/src/components/loader/Loader.stories.ts b/src/components/loader/Loader.stories.ts
new file mode 100644
index 0000000000..519920c548
--- /dev/null
+++ b/src/components/loader/Loader.stories.ts
@@ -0,0 +1,50 @@
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+
+import Loader from './Loader.vue'
+
+const meta: Meta<typeof Loader> = {
+  title: 'Components/Loader/Loader',
+  component: Loader,
+  tags: ['autodocs'],
+  parameters: {
+    layout: 'centered'
+  },
+  argTypes: {
+    size: {
+      control: 'select',
+      options: ['sm', 'md', 'lg'],
+      description: 'Spinner size: sm (16px), md (32px), lg (48px)'
+    }
+  }
+}
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const Default: Story = {}
+
+export const Small: Story = {
+  args: { size: 'sm' }
+}
+
+export const Medium: Story = {
+  args: { size: 'md' }
+}
+
+export const Large: Story = {
+  args: { size: 'lg' }
+}
+
+export const CustomColor: Story = {
+  render: (args) => ({
+    components: { Loader },
+    setup() {
+      return { args }
+    },
+    template:
+      '<div class="flex gap-4 items-center"><Loader size="lg" class="text-white" /><Loader size="md" class="text-muted-foreground" /><Loader size="sm" class="text-base-foreground" /></div>'
+  }),
+  parameters: {
+    backgrounds: { default: 'dark' }
+  }
+}
diff --git a/src/components/loader/Loader.vue b/src/components/loader/Loader.vue
new file mode 100644
index 0000000000..34bfcc9d4e
--- /dev/null
+++ b/src/components/loader/Loader.vue
@@ -0,0 +1,29 @@
+<template>
+  <span role="status" class="inline-flex">
+    <i
+      aria-hidden="true"
+      :class="cn('icon-[lucide--loader-circle] animate-spin', sizeClass)"
+    />
+    <span class="sr-only">{{ t('g.loading') }}</span>
+  </span>
+</template>
+
+<script setup lang="ts">
+import { useI18n } from 'vue-i18n'
+
+import { cn } from '@/utils/tailwindUtil'
+
+const { size } = defineProps<{
+  size?: 'sm' | 'md' | 'lg'
+}>()
+
+const { t } = useI18n()
+
+const sizeMap = {
+  sm: 'size-4',
+  md: 'size-8',
+  lg: 'size-12'
+} as const
+
+const sizeClass = size ? sizeMap[size] : ''
+</script>
diff --git a/src/components/loader/LogoCFillLoader.stories.ts b/src/components/loader/LogoCFillLoader.stories.ts
new file mode 100644
index 0000000000..13550cc7ad
--- /dev/null
+++ b/src/components/loader/LogoCFillLoader.stories.ts
@@ -0,0 +1,96 @@
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+
+import LogoCFillLoader from './LogoCFillLoader.vue'
+
+const meta: Meta<typeof LogoCFillLoader> = {
+  title: 'Components/Loader/LogoCFillLoader',
+  component: LogoCFillLoader,
+  tags: ['autodocs'],
+  parameters: {
+    layout: 'centered',
+    backgrounds: { default: 'dark' }
+  },
+  argTypes: {
+    size: {
+      control: 'select',
+      options: ['sm', 'md', 'lg', 'xl']
+    },
+    color: {
+      control: 'select',
+      options: ['yellow', 'blue', 'white', 'black']
+    },
+    bordered: {
+      control: 'boolean'
+    },
+    disableAnimation: {
+      control: 'boolean'
+    }
+  }
+}
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const Default: Story = {}
+
+export const Small: Story = {
+  args: { size: 'sm' }
+}
+
+export const Large: Story = {
+  args: { size: 'lg' }
+}
+
+export const ExtraLarge: Story = {
+  args: { size: 'xl' }
+}
+
+export const NoBorder: Story = {
+  args: { bordered: false }
+}
+
+export const Static: Story = {
+  args: { disableAnimation: true }
+}
+
+export const BrandColors: Story = {
+  render: () => ({
+    components: { LogoCFillLoader },
+    template: `
+      <div class="flex items-end gap-12">
+        <div class="flex flex-col items-center gap-2">
+          <span class="text-xs text-neutral-400">Yellow</span>
+          <LogoCFillLoader size="lg" color="yellow" />
+        </div>
+        <div class="flex flex-col items-center gap-2">
+          <span class="text-xs text-neutral-400">Blue</span>
+          <LogoCFillLoader size="lg" color="blue" />
+        </div>
+        <div class="flex flex-col items-center gap-2">
+          <span class="text-xs text-neutral-400">White</span>
+          <LogoCFillLoader size="lg" color="white" />
+        </div>
+        <div class="p-4 bg-white rounded" style="background: white">
+          <div class="flex flex-col items-center gap-2">
+            <span class="text-xs text-neutral-600">Black</span>
+            <LogoCFillLoader size="lg" color="black" />
+          </div>
+        </div>
+      </div>
+    `
+  })
+}
+
+export const AllSizes: Story = {
+  render: () => ({
+    components: { LogoCFillLoader },
+    template: `
+      <div class="flex items-end gap-8">
+        <LogoCFillLoader size="sm" color="yellow" />
+        <LogoCFillLoader size="md" color="yellow" />
+        <LogoCFillLoader size="lg" color="yellow" />
+        <LogoCFillLoader size="xl" color="yellow" />
+      </div>
+    `
+  })
+}
diff --git a/src/components/loader/LogoCFillLoader.vue b/src/components/loader/LogoCFillLoader.vue
new file mode 100644
index 0000000000..05ec3b5938
--- /dev/null
+++ b/src/components/loader/LogoCFillLoader.vue
@@ -0,0 +1,100 @@
+<template>
+  <span role="status" :class="cn('inline-flex', colorClass)">
+    <svg
+      :width="Math.round(heightMap[size] * (VB_W / VB_H))"
+      :height="heightMap[size]"
+      :viewBox="`0 0 ${VB_W} ${VB_H}`"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <defs>
+        <mask :id="maskId">
+          <path :d="C_PATH" fill="white" />
+        </mask>
+      </defs>
+      <path
+        v-if="bordered"
+        :d="C_PATH"
+        stroke="currentColor"
+        stroke-width="2"
+        fill="none"
+        opacity="0.4"
+      />
+      <g :mask="`url(#${maskId})`">
+        <rect
+          :class="disableAnimation ? undefined : 'c-fill-rect'"
+          :x="-BLEED"
+          :y="-BLEED"
+          :width="VB_W + BLEED * 2"
+          :height="VB_H + BLEED * 2"
+          fill="currentColor"
+        />
+      </g>
+    </svg>
+    <span class="sr-only">{{ t('g.loading') }}</span>
+  </span>
+</template>
+
+<script setup lang="ts">
+import { useId, computed } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+import { useI18n } from 'vue-i18n'
+
+const {
+  size = 'md',
+  color = 'black',
+  bordered = true,
+  disableAnimation = false
+} = defineProps<{
+  size?: 'sm' | 'md' | 'lg' | 'xl'
+  color?: 'yellow' | 'blue' | 'white' | 'black'
+  bordered?: boolean
+  disableAnimation?: boolean
+}>()
+
+const { t } = useI18n()
+const maskId = `c-mask-${useId()}`
+
+const VB_W = 185
+const VB_H = 201
+const BLEED = 1
+
+// Larger than LogoComfyWaveLoader because the C logo is near-square (185×201)
+// while the COMFY wordmark is wide (879×284), so larger heights are needed
+// for visually comparable perceived size.
+const heightMap = { sm: 48, md: 80, lg: 120, xl: 200 } as const
+const colorMap = {
+  yellow: 'text-brand-yellow',
+  blue: 'text-brand-blue',
+  white: 'text-white',
+  black: 'text-black'
+} as const
+
+const colorClass = computed(() => colorMap[color])
+
+const C_PATH =
+  'M42.1217 200.812C37.367 200.812 33.5304 199.045 31.0285 195.703C28.4569 192.27 27.7864 187.477 29.1882 182.557L34.8172 162.791C35.2661 161.217 34.9537 159.523 33.9747 158.214C32.9958 156.908 31.464 156.139 29.8371 156.139L13.6525 156.139C8.89521 156.139 5.05862 154.374 2.55797 151.032C-0.0136533 147.597-0.684085 142.804 0.71869 137.883L20.0565 70.289L22.1916 62.8625C25.0617 52.7847 35.5288 44.5943 45.528 44.5943L64.8938 44.5943C67.2048 44.5943 69.2376 43.0535 69.8738 40.8175L76.2782 18.3344C79.1454 8.26681 89.6127 0.0763962 99.6117 0.0763945L141.029 0.00258328L171.349-2.99253e-05C176.104-3.0756e-05 179.941 1.765 182.442 5.10626C185.013 8.53932 185.684 13.3324 184.282 18.2528L175.612 48.6947C172.746 58.7597 162.279 66.9475 152.28 66.9475L110.771 67.0265L91.4113 67.0265C89.1029 67.0265 87.0727 68.5647 86.4326 70.7983L70.2909 127.179C69.8394 128.756 70.1518 130.454 71.1334 131.763C72.1123 133.07 73.6441 133.839 75.2697 133.839C75.2736 133.839 102.699 133.785 102.699 133.785L132.929 133.785C137.685 133.785 141.522 135.55 144.023 138.892C146.594 142.327 147.265 147.12 145.862 152.041L137.192 182.478C134.326 192.545 123.859 200.733 113.86 200.733L72.3517 200.812L42.1217 200.812Z'
+</script>
+
+<style scoped>
+.c-fill-rect {
+  animation: c-fill-up 2.5s cubic-bezier(0.25, 0, 0.3, 1) forwards;
+  will-change: transform;
+}
+
+@keyframes c-fill-up {
+  0% {
+    transform: translateY(calc(v-bind(VB_H) * 1px + v-bind(BLEED) * 1px));
+  }
+  100% {
+    transform: translateY(calc(v-bind(BLEED) * -1px));
+  }
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .c-fill-rect {
+    animation: none;
+  }
+}
+</style>
diff --git a/src/components/loader/LogoComfyWaveLoader.stories.ts b/src/components/loader/LogoComfyWaveLoader.stories.ts
new file mode 100644
index 0000000000..7057b1a12e
--- /dev/null
+++ b/src/components/loader/LogoComfyWaveLoader.stories.ts
@@ -0,0 +1,96 @@
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+
+import LogoComfyWaveLoader from './LogoComfyWaveLoader.vue'
+
+const meta: Meta<typeof LogoComfyWaveLoader> = {
+  title: 'Components/Loader/LogoComfyWaveLoader',
+  component: LogoComfyWaveLoader,
+  tags: ['autodocs'],
+  parameters: {
+    layout: 'centered',
+    backgrounds: { default: 'dark' }
+  },
+  argTypes: {
+    size: {
+      control: 'select',
+      options: ['sm', 'md', 'lg', 'xl']
+    },
+    color: {
+      control: 'select',
+      options: ['yellow', 'blue', 'white', 'black']
+    },
+    bordered: {
+      control: 'boolean'
+    },
+    disableAnimation: {
+      control: 'boolean'
+    }
+  }
+}
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const Default: Story = {}
+
+export const Small: Story = {
+  args: { size: 'sm' }
+}
+
+export const Large: Story = {
+  args: { size: 'lg' }
+}
+
+export const ExtraLarge: Story = {
+  args: { size: 'xl' }
+}
+
+export const NoBorder: Story = {
+  args: { bordered: false }
+}
+
+export const Static: Story = {
+  args: { disableAnimation: true }
+}
+
+export const BrandColors: Story = {
+  render: () => ({
+    components: { LogoComfyWaveLoader },
+    template: `
+      <div class="flex flex-col items-center gap-12">
+        <div class="flex flex-col items-center gap-2">
+          <span class="text-xs text-neutral-400">#F0FF41 (Yellow)</span>
+          <LogoComfyWaveLoader size="lg" color="yellow" />
+        </div>
+        <div class="flex flex-col items-center gap-2">
+          <span class="text-xs text-neutral-400">#172DD7 (Blue)</span>
+          <LogoComfyWaveLoader size="lg" color="blue" />
+        </div>
+        <div class="flex flex-col items-center gap-2">
+          <span class="text-xs text-neutral-400">White</span>
+          <LogoComfyWaveLoader size="lg" color="white" />
+        </div>
+        <div class="p-4 bg-white rounded" style="background: white">
+          <div class="flex flex-col items-center gap-2">
+            <span class="text-xs text-neutral-600">Black</span>
+            <LogoComfyWaveLoader size="lg" color="black" />
+          </div>
+        </div>
+      </div>
+    `
+  })
+}
+
+export const AllSizes: Story = {
+  render: () => ({
+    components: { LogoComfyWaveLoader },
+    template: `
+      <div class="flex flex-col items-center gap-8">
+        <LogoComfyWaveLoader size="sm" color="yellow" />
+        <LogoComfyWaveLoader size="md" color="yellow" />
+        <LogoComfyWaveLoader size="lg" color="yellow" />
+        <LogoComfyWaveLoader size="xl" color="yellow" />
+      </div>
+    `
+  })
+}
diff --git a/src/components/loader/LogoComfyWaveLoader.vue b/src/components/loader/LogoComfyWaveLoader.vue
new file mode 100644
index 0000000000..56f584d2aa
--- /dev/null
+++ b/src/components/loader/LogoComfyWaveLoader.vue
@@ -0,0 +1,111 @@
+<template>
+  <span role="status" :class="cn('inline-flex', colorClass)">
+    <svg
+      :width="Math.round(heightMap[size] * (879 / 284))"
+      :height="heightMap[size]"
+      viewBox="0 0 879 284"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <defs>
+        <mask :id="maskId">
+          <path :d="COMFY_PATH" fill="white" />
+        </mask>
+      </defs>
+      <path
+        v-if="bordered"
+        :d="COMFY_PATH"
+        stroke="currentColor"
+        stroke-width="2"
+        fill="none"
+        opacity="0.4"
+      />
+      <g :mask="`url(#${maskId})`">
+        <g :class="disableAnimation ? 'wave-group-static' : 'wave-group'">
+          <path
+            :class="disableAnimation ? undefined : 'wave-path'"
+            d="M 0 50 Q 110 0 220 50 T 440 50 T 660 50 T 880 50 T 1100 50 T 1320 50 T 1540 50 T 1760 50 V 400 H 0 Z"
+            fill="currentColor"
+          />
+        </g>
+      </g>
+    </svg>
+    <span class="sr-only">{{ t('g.loading') }}</span>
+  </span>
+</template>
+
+<script setup lang="ts">
+import { cn } from '@/utils/tailwindUtil'
+import { computed, useId } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+const {
+  size = 'md',
+  color = 'black',
+  bordered = true,
+  disableAnimation = false
+} = defineProps<{
+  size?: 'sm' | 'md' | 'lg' | 'xl'
+  color?: 'yellow' | 'blue' | 'white' | 'black'
+  bordered?: boolean
+  disableAnimation?: boolean
+}>()
+
+const { t } = useI18n()
+const maskId = `comfy-mask-${useId()}`
+
+const heightMap = { sm: 40, md: 64, lg: 80, xl: 120 } as const
+const colorMap = {
+  yellow: 'text-brand-yellow',
+  blue: 'text-brand-blue',
+  white: 'text-white',
+  black: 'text-black'
+} as const
+
+const colorClass = computed(() => colorMap[color])
+
+const COMFY_PATH =
+  'M711.422 248.72C707.034 248.72 703.494 247.183 701.186 244.272C698.813 241.279 698.194 237.103 699.489 232.817L707.489 206.3C710.133 197.531 719.791 190.399 729.019 190.399H746.955C749.088 190.399 750.963 189.056 751.55 187.108L754.645 176.854C755.059 175.48 754.771 174.005 753.867 172.865C752.964 171.726 751.549 171.056 750.048 171.056L710.741 171.063C710.521 171.034 710.315 171.021 710.091 171.021H696.848C692.46 171.021 688.92 169.483 686.612 166.572C684.24 163.579 683.621 159.404 684.914 155.12L686.458 149.999C686.872 148.628 686.583 147.153 685.68 146.012C684.776 144.874 683.363 144.204 681.862 144.204H676.789C674.655 144.204 672.781 145.546 672.194 147.496L669.894 155.12C667.25 163.888 657.591 171.021 648.363 171.021H630.472C628.343 171.021 626.47 172.359 625.879 174.302L620.795 191.024C620.773 191.088 620.714 191.259 620.696 191.324L613.437 215.218C613.406 215.3 613.361 215.432 613.337 215.516L608.085 232.812C605.44 241.587 595.781 248.72 586.553 248.72H558.654C554.265 248.72 550.725 247.183 548.417 244.272C546.044 241.281 545.426 237.106 546.719 232.819L570.103 155.73C570.132 155.65 570.186 155.49 570.211 155.408L571.845 150.004C572.261 148.633 571.974 147.155 571.07 146.015C570.167 144.874 568.752 144.204 567.251 144.204H562.23C560.1 144.204 558.228 145.544 557.637 147.488L547.458 181.009C547.427 181.091 547.383 181.224 547.359 181.307L543.518 193.96C540.872 202.737 531.213 209.872 521.986 209.872H494.087C489.697 209.872 486.157 208.334 483.849 205.423C481.478 202.428 480.858 198.253 482.152 193.968L499.106 138.023C499.521 136.652 499.234 135.174 498.332 134.032C497.429 132.891 496.014 132.221 494.512 132.221H489.46C487.328 132.221 485.453 133.564 484.865 135.511L477.637 159.435C477.607 159.515 477.563 159.646 477.539 159.728L467.135 193.96C464.486 202.737 454.827 209.872 445.602 209.872H417.702C413.314 209.872 409.773 208.334 407.466 205.423C405.093 202.43 404.474 198.255 405.768 193.968L413.768 167.451C413.798 167.371 413.841 167.245 413.866 167.163L422.735 137.976C423.152 136.605 422.866 135.125 421.964 133.985C421.06 132.844 419.644 132.172 418.142 132.172H413.138C411.008 132.172 409.136 133.512 408.545 135.456L407.821 137.843C407.795 137.912 407.74 138.074 407.719 138.143L391.406 191.801C391.382 191.872 391.322 192.045 391.301 192.116L390.745 193.977C388.102 202.736 378.444 209.872 369.217 209.872H341.317C336.929 209.872 333.389 208.334 331.081 205.423C328.708 202.43 328.09 198.255 329.383 193.968L330.92 188.87C331.335 187.499 331.046 186.023 330.143 184.883C329.24 183.745 327.826 183.075 326.325 183.075H321.269C319.14 183.075 317.267 184.413 316.676 186.358L314.366 193.959C311.718 202.736 302.059 209.872 292.832 209.872H274.751C272.619 209.872 270.743 211.214 270.156 213.162L264.225 232.817C261.582 241.587 251.923 248.72 242.695 248.72H214.796C210.406 248.72 206.866 247.182 204.559 244.272C202.186 241.279 201.567 237.103 202.861 232.817L208.034 215.667C208.449 214.296 208.16 212.82 207.257 211.68C206.354 210.542 204.94 209.872 203.439 209.872H188.549C184.162 209.872 180.622 208.334 178.312 205.423C175.94 202.43 175.32 198.255 176.614 193.971L178.152 188.87C178.565 187.499 178.277 186.023 177.374 184.883C176.47 183.745 175.057 183.075 173.556 183.075H168.484C166.352 183.075 164.477 184.417 163.889 186.365L161.594 193.968C158.949 202.739 149.29 209.872 140.064 209.872L101.849 209.936L73.8677 209.938C69.4791 209.938 65.9389 208.4 63.6315 205.49C61.2597 202.497 60.6399 198.321 61.9333 194.037L67.1284 176.818C67.5427 175.445 67.2544 173.969 66.351 172.829C65.4477 171.691 64.0342 171.021 62.5331 171.021H47.5966C43.208 171.021 39.6678 169.483 37.3603 166.572C34.9886 163.579 34.3687 159.404 35.6622 155.12L49.5706 109.183C49.5961 109.114 49.6535 108.941 49.6755 108.872L54.1657 94.0759C54.2065 93.9693 54.2414 93.8651 54.2742 93.7565L55.4811 89.7518C58.1259 80.9836 67.7834 73.8485 77.0099 73.8485H94.8809C97.0133 73.8485 98.8891 72.5063 99.4762 70.5584L105.386 50.9721C108.031 42.2017 117.689 35.0688 126.917 35.0688L165.219 35H193.112C197.501 35 201.041 36.5376 203.348 39.4484C205.721 42.4414 206.34 46.6169 205.046 50.9033L197.046 77.4229C194.4 86.1911 184.742 93.3239 175.515 93.3239L137.214 93.3905H119.35C117.219 93.3905 115.344 94.7327 114.755 96.6786L106.875 122.741C106.846 122.823 106.801 122.954 106.777 123.036L99.8637 145.791C99.4458 147.164 99.7329 148.644 100.639 149.786C101.542 150.925 102.955 151.595 104.457 151.595C104.46 151.595 129.766 151.548 129.766 151.548H157.66C162.048 151.548 165.588 153.086 167.896 155.996C170.269 158.989 170.887 163.165 169.594 167.451L168.001 172.736C167.586 174.107 167.875 175.583 168.778 176.723C169.681 177.861 171.095 178.531 172.596 178.531H177.668C179.799 178.531 181.673 177.189 182.263 175.243L185.271 165.297C185.3 165.215 196.429 128.61 196.429 128.61C199.076 119.833 208.735 112.7 217.963 112.7H235.772C237.904 112.7 239.78 111.358 240.367 109.407L246.281 89.8011C248.928 81.0329 258.588 73.8978 267.814 73.8978H295.712C300.1 73.8978 303.641 75.4354 305.948 78.3462C308.321 81.3392 308.941 85.5147 307.647 89.7988L302.487 106.905C302.073 108.276 302.361 109.751 303.265 110.892C304.168 112.03 305.581 112.7 307.083 112.7H322.247C326.635 112.7 330.176 114.237 332.483 117.148C334.856 120.141 335.475 124.317 334.18 128.603L320.819 172.732C320.404 174.103 320.691 175.581 321.594 176.721C322.496 177.862 323.911 178.532 325.414 178.532H330.437C332.567 178.532 334.441 177.192 335.031 175.246L341.321 154.506C341.344 154.444 341.399 154.277 341.419 154.215L357.733 100.555C357.763 100.471 357.809 100.335 357.835 100.251L361.017 89.7591C363.664 80.9843 373.322 73.8492 382.549 73.8492H448.624C453.011 73.8492 456.551 75.3889 458.86 78.2999C461.233 81.2906 461.853 85.4661 460.559 89.7502L455.384 106.903C454.97 108.276 455.258 109.751 456.162 110.89C457.065 112.03 458.478 112.7 459.979 112.7H465.191C467.324 112.7 469.199 111.358 469.786 109.41L475.702 89.8013C478.348 81.0332 488.006 73.8981 497.233 73.8981H525.132C529.521 73.8981 533.061 75.4357 535.369 78.3464C537.742 81.3394 538.36 85.5149 537.067 89.8013L531.908 106.905C531.493 108.276 531.782 109.751 532.685 110.892C533.588 112.03 535.002 112.7 536.503 112.7H551.4C555.788 112.7 559.329 114.238 561.636 117.148C564.008 120.141 564.628 124.317 563.334 128.601L561.747 133.866C561.333 135.237 561.621 136.712 562.524 137.853C563.427 138.991 564.841 139.661 566.342 139.661H571.396C573.525 139.661 575.397 138.323 575.989 136.38L590.169 89.7616C592.816 80.9823 602.475 73.8494 611.702 73.8494H629.638C631.77 73.8494 633.645 72.5072 634.233 70.5593L640.165 50.9042C642.81 42.1338 652.468 35.0009 661.695 35.0009H689.594C693.984 35.0009 697.524 36.5385 699.832 39.4493C702.205 42.4423 702.823 46.6178 701.529 50.9042L693.529 77.4238C690.884 86.192 681.225 93.3248 671.999 93.3248H654.061C651.929 93.3248 650.053 94.667 649.466 96.6172L646.363 106.905C645.948 108.276 646.237 109.752 647.14 110.892C648.043 112.03 649.457 112.7 650.958 112.7H665.96C670.349 112.7 673.889 114.238 676.196 117.149C678.569 120.139 679.188 124.315 677.894 128.601L676.307 133.866C675.893 135.237 676.181 136.713 677.084 137.853C677.988 138.991 679.401 139.661 680.902 139.661H685.975C688.105 139.661 689.977 138.323 690.568 136.378L704.728 89.7616C707.378 80.9846 717.036 73.8494 726.262 73.8494H754.162C758.551 73.8494 762.091 75.3871 764.399 78.2978C766.772 81.2908 767.39 85.4663 766.096 89.7527L753.502 131.375C753.47 131.457 753.427 131.588 753.401 131.672L752.052 136.125C751.636 137.498 751.922 138.976 752.826 140.116C753.729 141.256 755.144 141.927 756.646 141.927H761.637C763.767 141.927 765.64 140.587 766.231 138.643L781.068 89.7618C783.717 80.9848 793.375 73.8497 802.602 73.8497H830.501C834.889 73.8497 838.429 75.3893 840.737 78.3003C843.11 81.291 843.729 85.4665 842.436 89.7529L810.847 193.965C808.2 202.74 798.541 209.873 789.316 209.873H771.378C769.246 209.873 767.37 211.215 766.783 213.163L760.852 232.818C758.208 241.589 748.549 248.721 739.322 248.721L711.422 248.72ZM260.308 132.221C258.177 132.221 256.304 133.561 255.713 135.507L240.828 184.597C240.413 185.968 240.698 187.446 241.602 188.586C242.505 189.729 243.92 190.399 245.422 190.399H250.472C252.602 190.399 254.476 189.059 255.067 187.113L269.952 138.023C270.367 136.652 270.081 135.175 269.178 134.034C268.275 132.891 266.86 132.221 265.358 132.221H260.308Z'
+</script>
+
+<style scoped>
+.wave-group {
+  animation: rise-up 4s ease-in-out infinite alternate;
+}
+
+.wave-path {
+  animation: wave-move 1.2s linear infinite;
+}
+
+@keyframes rise-up {
+  0% {
+    transform: translateY(280px);
+  }
+  100% {
+    transform: translateY(-80px);
+  }
+}
+
+@keyframes wave-move {
+  0% {
+    transform: translateX(0);
+  }
+  100% {
+    transform: translateX(-880px);
+  }
+}
+
+.wave-group-static {
+  transform: translateY(280px);
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .wave-group,
+  .wave-path {
+    animation: none;
+  }
+  .wave-group {
+    transform: translateY(-80px);
+  }
+}
+</style>
diff --git a/src/components/maskeditor/BrushSettingsPanel.vue b/src/components/maskeditor/BrushSettingsPanel.vue
index 7054f1a15a..4778d2cff3 100644
--- a/src/components/maskeditor/BrushSettingsPanel.vue
+++ b/src/components/maskeditor/BrushSettingsPanel.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="flex flex-col gap-3 pb-3">
-    <h3 class="text-center text-[15px] font-sans text-descrip-text mt-2.5">
+    <h3 class="text-descrip-text mt-2.5 text-center font-sans text-[15px]">
       {{ t('maskEditor.brushSettings') }}
     </h3>
 
@@ -10,19 +10,19 @@
 
     <!-- Brush Shape -->
     <div class="flex flex-col gap-3 pb-3">
-      <span class="text-left text-xs font-sans text-descrip-text">
+      <span class="text-descrip-text text-left font-sans text-xs">
         {{ t('maskEditor.brushShape') }}
       </span>
 
       <div
-        class="flex flex-row gap-2.5 items-center h-[50px] w-full rounded-[10px] bg-secondary-background-hover"
+        class="flex h-[50px] w-full flex-row items-center gap-2.5 rounded-[10px] bg-secondary-background-hover"
       >
         <div
           class="maskEditor_sidePanelBrushShapeCircle hover:bg-comfy-menu-bg"
           :class="
             cn(
               store.brushSettings.type === BrushShape.Arc
-                ? 'bg-[var(--p-button-text-primary-color)] active'
+                ? 'active bg-(--p-button-text-primary-color)'
                 : 'bg-transparent'
             )
           "
@@ -34,7 +34,7 @@
           :class="
             cn(
               store.brushSettings.type === BrushShape.Rect
-                ? 'bg-[var(--p-button-text-primary-color)] active'
+                ? 'active bg-(--p-button-text-primary-color)'
                 : 'bg-transparent'
             )
           "
@@ -45,27 +45,27 @@
 
     <!-- Color -->
     <div class="flex flex-col gap-3 pb-3">
-      <span class="text-left text-xs font-sans text-descrip-text">
+      <span class="text-descrip-text text-left font-sans text-xs">
         {{ t('maskEditor.colorSelector') }}
       </span>
       <input
         ref="colorInputRef"
         v-model="store.rgbColor"
         type="color"
-        class="h-10 rounded-md cursor-pointer"
+        class="h-10 cursor-pointer rounded-md"
       />
     </div>
 
     <!-- Thickness -->
     <div class="flex flex-col gap-2">
       <div class="flex items-center justify-between">
-        <span class="text-left text-xs font-sans text-descrip-text">
+        <span class="text-descrip-text text-left font-sans text-xs">
           {{ t('maskEditor.thickness') }}
         </span>
         <input
           v-model.number="brushSize"
           type="number"
-          class="w-16 px-2 py-1 text-sm text-center border rounded-md bg-comfy-menu-bg border-p-form-field-border-color text-input-text"
+          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"
           :max="250"
           :step="1"
@@ -84,13 +84,13 @@
     <!-- Opacity -->
     <div class="flex flex-col gap-2">
       <div class="flex items-center justify-between">
-        <span class="text-left text-xs font-sans text-descrip-text">
+        <span class="text-descrip-text text-left font-sans text-xs">
           {{ t('maskEditor.opacity') }}
         </span>
         <input
           v-model.number="brushOpacity"
           type="number"
-          class="w-16 px-2 py-1 text-sm text-center border rounded-md bg-comfy-menu-bg border-p-form-field-border-color text-input-text"
+          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="0"
           :max="1"
           :step="0.01"
@@ -109,13 +109,13 @@
     <!-- Hardness -->
     <div class="flex flex-col gap-2">
       <div class="flex items-center justify-between">
-        <span class="text-left text-xs font-sans text-descrip-text">
+        <span class="text-descrip-text text-left font-sans text-xs">
           {{ t('maskEditor.hardness') }}
         </span>
         <input
           v-model.number="brushHardness"
           type="number"
-          class="w-16 px-2 py-1 text-sm text-center border rounded-md bg-comfy-menu-bg border-p-form-field-border-color text-input-text"
+          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="0"
           :max="1"
           :step="0.01"
@@ -134,13 +134,13 @@
     <!-- Step Size -->
     <div class="flex flex-col gap-2">
       <div class="flex items-center justify-between">
-        <span class="text-left text-xs font-sans text-descrip-text">
+        <span class="text-descrip-text text-left font-sans text-xs">
           {{ t('maskEditor.stepSize') }}
         </span>
         <input
           v-model.number="brushStepSize"
           type="number"
-          class="w-16 px-2 py-1 text-sm text-center border rounded-md bg-comfy-menu-bg border-p-form-field-border-color text-input-text"
+          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"
           :max="100"
           :step="1"
@@ -160,14 +160,15 @@
 
 <script setup lang="ts">
 import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
 
 import { BrushShape } from '@/extensions/core/maskeditor/types'
-import { t } from '@/i18n'
 import { useMaskEditorStore } from '@/stores/maskEditorStore'
 import { cn } from '@/utils/tailwindUtil'
 
 import SliderControl from './controls/SliderControl.vue'
 
+const { t } = useI18n()
 const store = useMaskEditorStore()
 
 const colorInputRef = ref<HTMLInputElement>()
diff --git a/src/components/maskeditor/ColorSelectSettingsPanel.vue b/src/components/maskeditor/ColorSelectSettingsPanel.vue
index 5a643c3d44..fd67be084c 100644
--- a/src/components/maskeditor/ColorSelectSettingsPanel.vue
+++ b/src/components/maskeditor/ColorSelectSettingsPanel.vue
@@ -1,8 +1,6 @@
 <template>
   <div class="flex flex-col gap-3 pb-3">
-    <h3
-      class="text-center text-[15px] font-sans text-[var(--descrip-text)] mt-2.5"
-    >
+    <h3 class="mt-2.5 text-center font-sans text-[15px] text-(--descrip-text)">
       {{ t('maskEditor.colorSelectSettings') }}
     </h3>
 
@@ -61,14 +59,16 @@
 </template>
 
 <script setup lang="ts">
+import { useI18n } from 'vue-i18n'
+
 import { ColorComparisonMethod } from '@/extensions/core/maskeditor/types'
-import { t } from '@/i18n'
 import { useMaskEditorStore } from '@/stores/maskEditorStore'
 
 import DropdownControl from './controls/DropdownControl.vue'
 import SliderControl from './controls/SliderControl.vue'
 import ToggleControl from './controls/ToggleControl.vue'
 
+const { t } = useI18n()
 const store = useMaskEditorStore()
 
 const methodOptions = Object.values(ColorComparisonMethod)
diff --git a/src/components/maskeditor/ImageLayerSettingsPanel.vue b/src/components/maskeditor/ImageLayerSettingsPanel.vue
index e1c43d92ab..5022b1432f 100644
--- a/src/components/maskeditor/ImageLayerSettingsPanel.vue
+++ b/src/components/maskeditor/ImageLayerSettingsPanel.vue
@@ -1,8 +1,6 @@
 <template>
   <div class="flex flex-col gap-3 pb-3">
-    <h3
-      class="text-center text-[15px] font-sans text-[var(--descrip-text)] mt-2.5"
-    >
+    <h3 class="mt-2.5 text-center font-sans text-[15px] text-(--descrip-text)">
       {{ t('maskEditor.layers') }}
     </h3>
 
@@ -15,12 +13,12 @@
       @update:model-value="onMaskOpacityChange"
     />
 
-    <span class="text-left text-xs font-sans text-[var(--descrip-text)]">{{
+    <span class="text-left font-sans text-xs text-(--descrip-text)">{{
       t('maskEditor.maskBlendingOptions')
     }}</span>
 
     <div
-      class="flex flex-row gap-2.5 items-center min-h-6 relative h-[50px] w-full rounded-[10px] -mt-2 -mb-1.5"
+      class="relative -mt-2 -mb-1.5 flex h-[50px] min-h-6 w-full flex-row items-center gap-2.5 rounded-[10px]"
     >
       <select
         class="maskEditor_sidePanelDropdown"
@@ -33,11 +31,11 @@
       </select>
     </div>
 
-    <span class="text-left text-xs font-sans text-[var(--descrip-text)]">{{
+    <span class="text-left font-sans text-xs text-(--descrip-text)">{{
       t('maskEditor.maskLayer')
     }}</span>
     <div
-      class="flex flex-row gap-2.5 items-center min-h-6 relative h-[50px] w-full rounded-[10px] bg-secondary-background-hover"
+      class="relative flex h-[50px] min-h-6 w-full flex-row items-center gap-2.5 rounded-[10px] bg-secondary-background-hover"
       :style="{
         border: store.activeLayer === 'mask' ? '2px solid #007acc' : 'none'
       }"
@@ -66,11 +64,11 @@
       </button>
     </div>
 
-    <span class="text-left text-xs font-sans text-[var(--descrip-text)]">{{
+    <span class="text-left font-sans text-xs text-(--descrip-text)">{{
       t('maskEditor.paintLayer')
     }}</span>
     <div
-      class="flex flex-row gap-2.5 items-center min-h-6 relative h-[50px] w-full rounded-[10px] bg-secondary-background-hover"
+      class="relative flex h-[50px] min-h-6 w-full flex-row items-center gap-2.5 rounded-[10px] bg-secondary-background-hover"
       :style="{
         border: store.activeLayer === 'rgb' ? '2px solid #007acc' : 'none'
       }"
@@ -106,11 +104,11 @@
       </button>
     </div>
 
-    <span class="text-left text-xs font-sans text-[var(--descrip-text)]">{{
+    <span class="text-left font-sans text-xs text-(--descrip-text)">{{
       t('maskEditor.baseImageLayer')
     }}</span>
     <div
-      class="flex flex-row gap-2.5 items-center min-h-6 relative h-[50px] w-full rounded-[10px] bg-secondary-background-hover"
+      class="relative flex h-[50px] min-h-6 w-full flex-row items-center gap-2.5 rounded-[10px] bg-secondary-background-hover"
     >
       <input
         type="checkbox"
@@ -131,12 +129,12 @@
 
 <script setup lang="ts">
 import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
 
 import { useCanvasManager } from '@/composables/maskeditor/useCanvasManager'
 import type { useToolManager } from '@/composables/maskeditor/useToolManager'
 import type { ImageLayer } from '@/extensions/core/maskeditor/types'
 import { MaskBlendMode, Tools } from '@/extensions/core/maskeditor/types'
-import { t } from '@/i18n'
 import { useMaskEditorStore } from '@/stores/maskEditorStore'
 
 import SliderControl from './controls/SliderControl.vue'
@@ -145,6 +143,7 @@ const { toolManager } = defineProps<{
   toolManager?: ReturnType<typeof useToolManager>
 }>()
 
+const { t } = useI18n()
 const store = useMaskEditorStore()
 const canvasManager = useCanvasManager()
 
diff --git a/src/components/maskeditor/MaskEditorContent.vue b/src/components/maskeditor/MaskEditorContent.vue
index a524edfcb5..89fdf262e2 100644
--- a/src/components/maskeditor/MaskEditorContent.vue
+++ b/src/components/maskeditor/MaskEditorContent.vue
@@ -1,9 +1,10 @@
 <template>
   <div
     ref="containerRef"
-    class="maskEditor-dialog-root flex h-full w-full flex-col"
+    class="maskEditor-dialog-root flex size-full flex-col"
     @contextmenu.prevent
     @dragstart="handleDragStart"
+    @keydown.stop
   >
     <div
       id="maskEditorCanvasContainer"
@@ -12,29 +13,29 @@
     >
       <canvas
         ref="imgCanvasRef"
-        class="absolute top-0 left-0 w-full h-full z-0"
+        class="absolute top-0 left-0 z-0 size-full"
         @contextmenu.prevent
       />
       <canvas
         ref="rgbCanvasRef"
-        class="absolute top-0 left-0 w-full h-full z-10"
+        class="absolute top-0 left-0 z-10 size-full"
         @contextmenu.prevent
       />
       <canvas
         ref="maskCanvasRef"
-        class="absolute top-0 left-0 w-full h-full z-30"
+        class="absolute top-0 left-0 z-30 size-full"
         @contextmenu.prevent
       />
       <!-- GPU Preview Canvas -->
       <canvas
         ref="gpuCanvasRef"
-        class="absolute top-0 left-0 w-full h-full pointer-events-none"
+        class="pointer-events-none absolute top-0 left-0 size-full"
         :class="{
           'z-20': store.activeLayer === 'rgb',
           'z-40': store.activeLayer === 'mask'
         }"
       />
-      <div ref="canvasBackgroundRef" class="bg-white w-full h-full" />
+      <div ref="canvasBackgroundRef" class="size-full bg-white" />
     </div>
 
     <div class="maskEditor-ui-container flex min-h-0 flex-1 flex-col">
diff --git a/src/components/maskeditor/PaintBucketSettingsPanel.vue b/src/components/maskeditor/PaintBucketSettingsPanel.vue
index c5d674b77f..672c752076 100644
--- a/src/components/maskeditor/PaintBucketSettingsPanel.vue
+++ b/src/components/maskeditor/PaintBucketSettingsPanel.vue
@@ -1,8 +1,6 @@
 <template>
   <div class="flex flex-col gap-3 pb-3">
-    <h3
-      class="text-center text-[15px] font-sans text-[var(--descrip-text)] mt-2.5"
-    >
+    <h3 class="mt-2.5 text-center font-sans text-[15px] text-(--descrip-text)">
       {{ t('maskEditor.paintBucketSettings') }}
     </h3>
 
@@ -27,11 +25,13 @@
 </template>
 
 <script setup lang="ts">
-import { t } from '@/i18n'
+import { useI18n } from 'vue-i18n'
+
 import { useMaskEditorStore } from '@/stores/maskEditorStore'
 
 import SliderControl from './controls/SliderControl.vue'
 
+const { t } = useI18n()
 const store = useMaskEditorStore()
 
 const onToleranceChange = (value: number) => {
diff --git a/src/components/maskeditor/PointerZone.vue b/src/components/maskeditor/PointerZone.vue
index 082b16ca73..f7f75d5c58 100644
--- a/src/components/maskeditor/PointerZone.vue
+++ b/src/components/maskeditor/PointerZone.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     ref="pointerZoneRef"
-    class="w-[calc(100%-4rem-220px)] h-full"
+    class="h-full w-[calc(100%-4rem-220px)]"
     @pointerdown="handlePointerDown"
     @pointermove="handlePointerMove"
     @pointerup="handlePointerUp"
diff --git a/src/components/maskeditor/SidePanel.vue b/src/components/maskeditor/SidePanel.vue
index 7d1fea82db..c19c9dca18 100644
--- a/src/components/maskeditor/SidePanel.vue
+++ b/src/components/maskeditor/SidePanel.vue
@@ -1,11 +1,11 @@
 <template>
   <div
-    class="flex flex-col gap-3 pb-3 h-full !items-stretch bg-[var(--comfy-menu-bg)] overflow-y-auto w-55 px-2.5"
+    class="flex h-full w-55 flex-col items-stretch! gap-3 overflow-y-auto bg-(--comfy-menu-bg) px-2.5 pb-3"
   >
-    <div class="w-full min-h-full">
+    <div class="min-h-full w-full">
       <SettingsPanelContainer />
 
-      <div class="w-full h-0.5 bg-[var(--border-color)] mt-6 mb-1.5" />
+      <div class="mt-6 mb-1.5 h-0.5 w-full bg-(--border-color)" />
 
       <ImageLayerSettingsPanel :tool-manager="toolManager" />
     </div>
diff --git a/src/components/maskeditor/ToolPanel.vue b/src/components/maskeditor/ToolPanel.vue
index 89c8001f77..2bdc06ccfb 100644
--- a/src/components/maskeditor/ToolPanel.vue
+++ b/src/components/maskeditor/ToolPanel.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="h-full z-8888 flex flex-col justify-between bg-comfy-menu-bg">
+  <div class="z-8888 flex h-full flex-col justify-between bg-comfy-menu-bg">
     <div class="flex flex-col">
       <div
         v-for="tool in allTools"
@@ -19,7 +19,7 @@
     </div>
 
     <div
-      class="flex flex-col items-center cursor-pointer rounded-md mb-2 transition-colors duration-200 hover:bg-secondary-background-hover"
+      class="mb-2 flex cursor-pointer flex-col items-center rounded-md transition-colors duration-200 hover:bg-secondary-background-hover"
       :title="t('maskEditor.clickToResetZoom')"
       @click="onResetZoom"
     >
@@ -31,18 +31,19 @@
 
 <script setup lang="ts">
 import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
 
 import type { useToolManager } from '@/composables/maskeditor/useToolManager'
 import { iconsHtml } from '@/extensions/core/maskeditor/constants'
 import type { Tools } from '@/extensions/core/maskeditor/types'
 import { allTools } from '@/extensions/core/maskeditor/types'
-import { t } from '@/i18n'
 import { useMaskEditorStore } from '@/stores/maskEditorStore'
 
 const { toolManager } = defineProps<{
   toolManager: ReturnType<typeof useToolManager>
 }>()
 
+const { t } = useI18n()
 const store = useMaskEditorStore()
 
 const onToolSelect = (tool: Tools) => {
diff --git a/src/components/maskeditor/controls/DropdownControl.vue b/src/components/maskeditor/controls/DropdownControl.vue
index ec16ac92b2..0f4b0a8d23 100644
--- a/src/components/maskeditor/controls/DropdownControl.vue
+++ b/src/components/maskeditor/controls/DropdownControl.vue
@@ -1,10 +1,10 @@
 <template>
-  <div class="flex flex-row gap-2.5 items-center min-h-6 relative">
-    <span class="text-left text-xs font-sans text-[var(--descrip-text)]">{{
+  <div class="relative flex min-h-6 flex-row items-center gap-2.5">
+    <span class="text-left font-sans text-xs text-(--descrip-text)">{{
       label
     }}</span>
     <select
-      class="absolute right-0 h-6 px-1.5 rounded-md border border-border-default transition-colors duration-100 bg-secondary-background focus:outline focus:outline-node-component-border"
+      class="absolute right-0 h-6 rounded-md border border-border-default bg-secondary-background px-1.5 transition-colors duration-100 focus:outline focus:outline-node-component-border"
       :value="modelValue"
       @change="onChange"
     >
diff --git a/src/components/maskeditor/controls/SliderControl.vue b/src/components/maskeditor/controls/SliderControl.vue
index 83969db3b1..cecc8e3de0 100644
--- a/src/components/maskeditor/controls/SliderControl.vue
+++ b/src/components/maskeditor/controls/SliderControl.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="flex flex-col gap-3 pb-3">
-    <span class="text-left text-xs font-sans text-[var(--descrip-text)]">{{
+    <span class="text-left font-sans text-xs text-(--descrip-text)">{{
       label
     }}</span>
     <input
@@ -24,9 +24,7 @@ interface Props {
   modelValue: number
 }
 
-withDefaults(defineProps<Props>(), {
-  step: 1
-})
+const { label, min, max, step = 1, modelValue } = defineProps<Props>()
 
 const emit = defineEmits<{
   'update:modelValue': [value: number]
diff --git a/src/components/maskeditor/controls/ToggleControl.vue b/src/components/maskeditor/controls/ToggleControl.vue
index dd1a98c967..b14d24f8df 100644
--- a/src/components/maskeditor/controls/ToggleControl.vue
+++ b/src/components/maskeditor/controls/ToggleControl.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="flex flex-row gap-2.5 items-center min-h-6 relative">
-    <span class="text-left text-xs font-sans text-[var(--descrip-text)]">{{
+  <div class="relative flex min-h-6 flex-row items-center gap-2.5">
+    <span class="text-left font-sans text-xs text-(--descrip-text)">{{
       label
     }}</span>
     <label class="maskEditor_sidePanelToggleContainer">
diff --git a/src/components/maskeditor/dialog/TopBarHeader.vue b/src/components/maskeditor/dialog/TopBarHeader.vue
index fb89136e4a..5d505a5a3d 100644
--- a/src/components/maskeditor/dialog/TopBarHeader.vue
+++ b/src/components/maskeditor/dialog/TopBarHeader.vue
@@ -11,7 +11,7 @@
         >
           <svg
             viewBox="0 0 15 15"
-            class="h-6.25 w-6.25 pointer-events-none fill-[var(--input-text)]"
+            class="pointer-events-none h-6.25 w-6.25 fill-current"
           >
             <path
               d="M8.77,12.18c-.25,0-.46-.2-.46-.46s.2-.46.46-.46c1.47,0,2.67-1.2,2.67-2.67,0-1.57-1.34-2.67-3.26-2.67h-3.98l1.43,1.43c.18.18.18.47,0,.64-.18.18-.47.18-.64,0l-2.21-2.21c-.18-.18-.18-.47,0-.64l2.21-2.21c.18-.18.47-.18.64,0,.18.18.18.47,0,.64l-1.43,1.43h3.98c2.45,0,4.17,1.47,4.17,3.58,0,1.97-1.61,3.58-3.58,3.58Z"
@@ -26,7 +26,7 @@
         >
           <svg
             viewBox="0 0 15 15"
-            class="h-6.25 w-6.25 pointer-events-none fill-[var(--input-text)]"
+            class="pointer-events-none h-6.25 w-6.25 fill-(--input-text)"
           >
             <path
               class="cls-1"
@@ -35,6 +35,74 @@
           </svg>
         </button>
 
+        <div class="border-border h-5 border-l" />
+
+        <button
+          :class="iconButtonClass"
+          :title="t('maskEditor.rotateLeft')"
+          @click="onRotateLeft"
+        >
+          <svg
+            viewBox="-6 -7 15 15"
+            class="pointer-events-none h-6.25 w-6.25 fill-(--input-text)"
+          >
+            <path
+              d="m2.25-2.625c.3452 0 .625.2798.625.625v5c0 .3452-.2798.625-.625.625h-5c-.3452 0-.625-.2798-.625-.625v-5c0-.3452.2798-.625.625-.625h5zm1.25.625v5c0 .6904-.5596 1.25-1.25 1.25h-5c-.6904 0-1.25-.5596-1.25-1.25v-5c0-.6904.5596-1.25 1.25-1.25h5c.6904 0 1.25.5596 1.25 1.25zm-.1673-2.3757-.4419.4419-1.5246-1.5246 1.5416-1.5417.442.4419-.7871.7872h.9373c1.3807 0 2.5 1.1193 2.5 2.5h-.625c0-1.0355-.8395-1.875-1.875-1.875h-.9375l.7702.7702z"
+            />
+          </svg>
+        </button>
+
+        <button
+          :class="iconButtonClass"
+          :title="t('maskEditor.rotateRight')"
+          @click="onRotateRight"
+        >
+          <svg
+            viewBox="-9 -7 15 15"
+            class="pointer-events-none h-6.25 w-6.25 fill-(--input-text)"
+          >
+            <g transform="scale(-1, 1)">
+              <path
+                d="m2.25-2.625c.3452 0 .625.2798.625.625v5c0 .3452-.2798.625-.625.625h-5c-.3452 0-.625-.2798-.625-.625v-5c0-.3452.2798-.625.625-.625h5zm1.25.625v5c0 .6904-.5596 1.25-1.25 1.25h-5c-.6904 0-1.25-.5596-1.25-1.25v-5c0-.6904.5596-1.25 1.25-1.25h5c.6904 0 1.25.5596 1.25 1.25zm-.1673-2.3757-.4419.4419-1.5246-1.5246 1.5416-1.5417.442.4419-.7871.7872h.9373c1.3807 0 2.5 1.1193 2.5 2.5h-.625c0-1.0355-.8395-1.875-1.875-1.875h-.9375l.7702.7702z"
+              />
+            </g>
+          </svg>
+        </button>
+
+        <button
+          :class="iconButtonClass"
+          :title="t('maskEditor.mirrorHorizontal')"
+          @click="onMirrorHorizontal"
+        >
+          <svg
+            viewBox="0 0 15 15"
+            class="pointer-events-none h-6.25 w-6.25 fill-(--input-text)"
+          >
+            <path
+              d="M7.5,1.5c-.28,0-.5.22-.5.5v11c0,.28.22.5.5.5s.5-.22.5-.5v-11c0-.28-.22-.5-.5-.5Z"
+            />
+            <path d="M3.5,4.5l-2,3,2,3v-6ZM11.5,4.5v6l2-3-2-3Z" />
+          </svg>
+        </button>
+
+        <button
+          :class="iconButtonClass"
+          :title="t('maskEditor.mirrorVertical')"
+          @click="onMirrorVertical"
+        >
+          <svg
+            viewBox="0 0 15 15"
+            class="pointer-events-none h-6.25 w-6.25 fill-(--input-text)"
+          >
+            <path
+              d="M2,7.5c0-.28.22-.5.5-.5h11c.28,0,.5.22.5.5s-.22.5-.5.5h-11c-.28,0-.5-.22-.5-.5Z"
+            />
+            <path d="M4.5,4.5l3-2,3,2h-6ZM4.5,10.5h6l-3,2-3-2Z" />
+          </svg>
+        </button>
+
+        <div class="h-5 w-px bg-(--p-form-field-border-color)" />
+
         <button :class="textButtonClass" @click="onInvert">
           {{ t('maskEditor.invert') }}
         </button>
@@ -60,27 +128,30 @@
 
 <script setup lang="ts">
 import { ref } from 'vue'
+import { useI18n } from 'vue-i18n'
 
 import Button from '@/components/ui/button/Button.vue'
 import { useCanvasTools } from '@/composables/maskeditor/useCanvasTools'
+import { useCanvasTransform } from '@/composables/maskeditor/useCanvasTransform'
 import { useMaskEditorSaver } from '@/composables/maskeditor/useMaskEditorSaver'
-import { t } from '@/i18n'
 import { useDialogStore } from '@/stores/dialogStore'
 import { useMaskEditorStore } from '@/stores/maskEditorStore'
 
+const { t } = useI18n()
 const store = useMaskEditorStore()
 const dialogStore = useDialogStore()
 const canvasTools = useCanvasTools()
+const canvasTransform = useCanvasTransform()
 const saver = useMaskEditorSaver()
 
 const saveButtonText = ref(t('g.save'))
 const saveEnabled = ref(true)
 
 const iconButtonClass =
-  'flex h-7.5 w-12.5 items-center justify-center rounded-[10px] border border-[var(--p-form-field-border-color)] pointer-events-auto transition-colors duration-100 bg-[var(--comfy-menu-bg)] hover:bg-secondary-background-hover'
+  'flex h-7.5 w-12.5 items-center justify-center rounded-[10px] border border-border-default pointer-events-auto transition-colors duration-100 bg-comfy-menu-bg hover:bg-secondary-background-hover'
 
 const textButtonClass =
-  'h-7.5 w-15 rounded-[10px] border border-[var(--p-form-field-border-color)] text-[var(--input-text)] font-sans pointer-events-auto transition-colors duration-100 bg-[var(--comfy-menu-bg)] hover:bg-secondary-background-hover'
+  'h-7.5 w-15 rounded-[10px] border border-border-default text-current font-sans pointer-events-auto transition-colors duration-100 bg-comfy-menu-bg hover:bg-secondary-background-hover'
 
 const onUndo = () => {
   store.canvasHistory.undo()
@@ -90,6 +161,38 @@ const onRedo = () => {
   store.canvasHistory.redo()
 }
 
+const onRotateLeft = async () => {
+  try {
+    await canvasTransform.rotateCounterclockwise()
+  } catch (error) {
+    console.error('[TopBarHeader] Rotate left failed:', error)
+  }
+}
+
+const onRotateRight = async () => {
+  try {
+    await canvasTransform.rotateClockwise()
+  } catch (error) {
+    console.error('[TopBarHeader] Rotate right failed:', error)
+  }
+}
+
+const onMirrorHorizontal = async () => {
+  try {
+    await canvasTransform.mirrorHorizontal()
+  } catch (error) {
+    console.error('[TopBarHeader] Mirror horizontal failed:', error)
+  }
+}
+
+const onMirrorVertical = async () => {
+  try {
+    await canvasTransform.mirrorVertical()
+  } catch (error) {
+    console.error('[TopBarHeader] Mirror vertical failed:', error)
+  }
+}
+
 const onInvert = () => {
   canvasTools.invertMask()
 }
diff --git a/src/components/node/NodeHelpContent.vue b/src/components/node/NodeHelpContent.vue
index 8cf058f813..6e020b5ae0 100644
--- a/src/components/node/NodeHelpContent.vue
+++ b/src/components/node/NodeHelpContent.vue
@@ -8,11 +8,14 @@
     <!-- Markdown fetched successfully -->
     <div
       v-else-if="!error"
-      class="markdown-content"
+      class="markdown-content overflow-visible text-sm leading-(--text-sm--line-height)"
       v-html="renderedHelpHtml"
     />
     <!-- Fallback: markdown not found or fetch error -->
-    <div v-else class="fallback-content space-y-6 text-sm">
+    <div
+      v-else
+      class="fallback-content space-y-6 text-sm leading-(--text-sm--line-height)"
+    >
       <p v-if="node.description">
         <strong>{{ $t('g.description') }}:</strong> {{ node.description }}
       </p>
@@ -22,65 +25,69 @@
           <strong>{{ $t('nodeHelpPage.inputs') }}:</strong>
         </p>
         <!-- Using plain HTML table instead of DataTable for consistent styling with markdown content -->
-        <table class="overflow-x-auto">
-          <thead>
-            <tr>
-              <th>{{ $t('g.name') }}</th>
-              <th>{{ $t('nodeHelpPage.type') }}</th>
-              <th>{{ $t('g.description') }}</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr v-for="input in inputList" :key="input.name">
-              <td>
-                <code>{{ input.name }}</code>
-              </td>
-              <td>{{ input.type }}</td>
-              <td>{{ input.tooltip || '-' }}</td>
-            </tr>
-          </tbody>
-        </table>
+        <div class="overflow-x-auto">
+          <table>
+            <thead>
+              <tr>
+                <th>{{ $t('g.name') }}</th>
+                <th>{{ $t('nodeHelpPage.type') }}</th>
+                <th>{{ $t('g.description') }}</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="input in inputList" :key="input.name">
+                <td>
+                  <code>{{ input.name }}</code>
+                </td>
+                <td>{{ input.type }}</td>
+                <td>{{ input.tooltip || '-' }}</td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
       </div>
 
       <div v-if="outputList.length">
         <p>
           <strong>{{ $t('nodeHelpPage.outputs') }}:</strong>
         </p>
-        <table class="overflow-x-auto">
-          <thead>
-            <tr>
-              <th>{{ $t('g.name') }}</th>
-              <th>{{ $t('nodeHelpPage.type') }}</th>
-              <th>{{ $t('g.description') }}</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr v-for="output in outputList" :key="output.name">
-              <td>
-                <code>{{ output.name }}</code>
-              </td>
-              <td>{{ output.type }}</td>
-              <td>{{ output.tooltip || '-' }}</td>
-            </tr>
-          </tbody>
-        </table>
+        <div class="overflow-x-auto">
+          <table>
+            <thead>
+              <tr>
+                <th>{{ $t('g.name') }}</th>
+                <th>{{ $t('nodeHelpPage.type') }}</th>
+                <th>{{ $t('g.description') }}</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="output in outputList" :key="output.name">
+                <td>
+                  <code>{{ output.name }}</code>
+                </td>
+                <td>{{ output.type }}</td>
+                <td>{{ output.tooltip || '-' }}</td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
       </div>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { storeToRefs } from 'pinia'
 import ProgressSpinner from 'primevue/progressspinner'
 import { computed } from 'vue'
 
+import { useNodeHelpContent } from '@/composables/useNodeHelpContent'
 import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
-import { useNodeHelpStore } from '@/stores/workspace/nodeHelpStore'
 
-const { node } = defineProps<{ node: ComfyNodeDefImpl }>()
+const { node } = defineProps<{
+  node: ComfyNodeDefImpl
+}>()
 
-const nodeHelpStore = useNodeHelpStore()
-const { renderedHelpHtml, isLoading, error } = storeToRefs(nodeHelpStore)
+const { renderedHelpHtml, isLoading, error } = useNodeHelpContent(() => node)
 
 const inputList = computed(() =>
   Object.values(node.inputs).map((spec) => ({
@@ -100,39 +107,59 @@ const outputList = computed(() =>
 </script>
 
 <style scoped>
-@reference './../../assets/css/style.css';
-
 .node-help-content :deep(:is(img, video)) {
-  @apply max-w-full h-auto block mb-4;
-}
-
-.markdown-content,
-.fallback-content {
-  @apply text-sm overflow-visible;
+  display: block;
+  max-width: 100%;
+  height: auto;
+  margin-bottom: calc(var(--spacing) * 4);
 }
 
 .markdown-content :deep(h1),
 .fallback-content h1 {
-  @apply text-[22px] font-bold mt-8 mb-4 first:mt-0;
+  margin-top: calc(var(--spacing) * 8);
+  margin-bottom: calc(var(--spacing) * 4);
+  font-size: var(--text-2xl);
+  font-weight: var(--font-weight-bold);
 }
 
 .markdown-content :deep(h2),
 .fallback-content h2 {
-  @apply text-[18px] font-bold mt-8 mb-4 first:mt-0;
+  margin-top: calc(var(--spacing) * 8);
+  margin-bottom: calc(var(--spacing) * 4);
+  font-size: var(--text-lg);
+  font-weight: var(--font-weight-bold);
 }
 
 .markdown-content :deep(h3),
 .fallback-content h3 {
-  @apply text-[16px] font-bold mt-8 mb-4 first:mt-0;
+  margin-top: calc(var(--spacing) * 8);
+  margin-bottom: calc(var(--spacing) * 4);
+  font-size: var(--text-base);
+  font-weight: var(--font-weight-bold);
 }
 
 .markdown-content :deep(h4),
+.fallback-content h4 {
+  margin-top: calc(var(--spacing) * 8);
+  margin-bottom: calc(var(--spacing) * 4);
+  font-size: var(--text-sm);
+  font-weight: var(--font-weight-bold);
+}
+
 .markdown-content :deep(h5),
+.fallback-content h5 {
+  margin-top: calc(var(--spacing) * 8);
+  margin-bottom: calc(var(--spacing) * 4);
+  font-size: var(--text-sm);
+  font-weight: var(--font-weight-bold);
+}
+
 .markdown-content :deep(h6),
-.fallback-content h4,
-.fallback-content h5,
 .fallback-content h6 {
-  @apply mt-8 mb-4 first:mt-0;
+  margin-top: calc(var(--spacing) * 8);
+  margin-bottom: calc(var(--spacing) * 4);
+  font-size: var(--text-xs);
+  font-weight: var(--font-weight-bold);
 }
 
 .markdown-content :deep(td),
@@ -155,7 +182,8 @@ const outputList = computed(() =>
 .markdown-content :deep(ol),
 .fallback-content ul,
 .fallback-content ol {
-  @apply pl-8 my-2;
+  margin-block: calc(var(--spacing) * 2);
+  padding-left: calc(var(--spacing) * 8);
 }
 
 .markdown-content :deep(ul ul),
@@ -166,36 +194,42 @@ const outputList = computed(() =>
 .fallback-content ol ol,
 .fallback-content ul ol,
 .fallback-content ol ul {
-  @apply pl-6 my-2;
+  margin-block: calc(var(--spacing) * 2);
+  padding-left: calc(var(--spacing) * 6);
 }
 
 .markdown-content :deep(li),
 .fallback-content li {
-  @apply my-2;
+  margin-block: calc(var(--spacing) * 2);
 }
 
 .markdown-content :deep(*:first-child),
 .fallback-content > *:first-child {
-  @apply mt-0;
+  margin-top: 0;
 }
 
 .markdown-content :deep(code),
 .fallback-content code {
   color: var(--code-text-color);
   background-color: var(--code-bg-color);
-  @apply rounded px-1.5 py-0.5;
+  border-radius: var(--radius);
+  padding: calc(var(--spacing) * 0.5) calc(var(--spacing) * 1.5);
 }
 
 .markdown-content :deep(table),
 .fallback-content table {
-  @apply w-full border-collapse;
+  border-collapse: collapse;
+}
+
+.fallback-content table {
+  width: 100%;
 }
 
 .markdown-content :deep(th),
 .markdown-content :deep(td),
 .fallback-content th,
 .fallback-content td {
-  @apply px-2 py-2;
+  padding: calc(var(--spacing) * 2);
 }
 
 .markdown-content :deep(tr),
@@ -215,16 +249,22 @@ const outputList = computed(() =>
 
 .markdown-content :deep(pre),
 .fallback-content pre {
-  @apply rounded p-4 my-4 overflow-x-auto;
+  margin-block: calc(var(--spacing) * 4);
+  overflow-x: auto;
+  border-radius: var(--radius);
+  padding: calc(var(--spacing) * 4);
   background-color: var(--code-block-bg-color);
 
   code {
-    @apply bg-transparent p-0;
+    background-color: transparent;
+    padding: 0;
     color: var(--p-text-color);
   }
 }
 
 .markdown-content :deep(table) {
-  @apply overflow-x-auto;
+  display: block;
+  width: 100%;
+  overflow-x: auto;
 }
 </style>
diff --git a/src/components/node/NodePreview.test.ts b/src/components/node/NodePreview.test.ts
index e52687d429..a5dae56380 100644
--- a/src/components/node/NodePreview.test.ts
+++ b/src/components/node/NodePreview.test.ts
@@ -76,14 +76,6 @@ describe('NodePreview', () => {
     expect(wrapper.find('._sb_preview_badge').text()).toBe('Preview')
   })
 
-  it('applies text-ellipsis class to node header for text truncation', () => {
-    const wrapper = mountComponent()
-    const nodeHeader = wrapper.find('.node_header')
-
-    expect(nodeHeader.classes()).toContain('text-ellipsis')
-    expect(nodeHeader.classes()).toContain('mr-4')
-  })
-
   it('sets title attribute on node header with full display name', () => {
     const wrapper = mountComponent()
     const nodeHeader = wrapper.find('.node_header')
diff --git a/src/components/node/NodePreview.vue b/src/components/node/NodePreview.vue
index 107ee34713..56d80a9c84 100644
--- a/src/components/node/NodePreview.vue
+++ b/src/components/node/NodePreview.vue
@@ -10,7 +10,7 @@ https://github.com/Nuked88/ComfyUI-N-Sidebar/blob/7ae7da4a9761009fb6629bc04c6830
   <div v-else class="_sb_node_preview bg-component-node-background">
     <div class="_sb_table">
       <div
-        class="node_header mr-4 text-ellipsis"
+        class="node_header text-ellipsis"
         :title="nodeDef.display_name"
         :style="{
           backgroundColor: litegraphColors.NODE_DEFAULT_COLOR,
@@ -124,7 +124,10 @@ const slotInputDefs = allInputDefs.filter(
 const widgetInputDefs = allInputDefs.filter((input) =>
   widgetStore.inputIsWidget(input)
 )
-const truncateDefaultValue = (value: any, charLimit: number = 32): string => {
+const truncateDefaultValue = (
+  value: unknown,
+  charLimit: number = 32
+): string => {
   let stringValue: string
 
   if (typeof value === 'object' && value !== null) {
diff --git a/src/components/node/NodePreviewCard.vue b/src/components/node/NodePreviewCard.vue
new file mode 100644
index 0000000000..557369a66f
--- /dev/null
+++ b/src/components/node/NodePreviewCard.vue
@@ -0,0 +1,143 @@
+<template>
+  <div
+    class="flex w-50 flex-col overflow-hidden rounded-2xl border border-border-default bg-base-background"
+  >
+    <div ref="previewContainerRef" class="overflow-hidden p-3">
+      <div ref="previewWrapperRef" class="origin-top-left scale-50">
+        <LGraphNodePreview :node-def="nodeDef" position="relative" />
+      </div>
+    </div>
+
+    <!-- Content Section -->
+    <div class="flex flex-col gap-2 p-3 pt-1">
+      <!-- Title -->
+      <h3 class="text-foreground m-0 text-xs font-semibold">
+        {{ nodeDef.display_name }}
+      </h3>
+
+      <!-- Category Path -->
+      <p
+        v-if="showCategoryPath && nodeDef.category"
+        class="-mt-1 text-xs text-muted-foreground"
+      >
+        {{ nodeDef.category.replaceAll('/', ' > ') }}
+      </p>
+
+      <!-- Badges -->
+      <div class="flex flex-wrap gap-2 empty:hidden">
+        <NodePricingBadge :node-def="nodeDef" />
+        <NodeProviderBadge :node-def="nodeDef" />
+      </div>
+
+      <!-- Description -->
+      <p
+        v-if="nodeDef.description"
+        class="m-0 text-[11px] leading-normal font-normal text-muted-foreground"
+      >
+        {{ nodeDef.description }}
+      </p>
+
+      <!-- Divider -->
+      <div
+        v-if="(inputs.length > 0 || outputs.length > 0) && showInputsAndOutputs"
+        class="border-t border-border-default"
+      />
+
+      <!-- Inputs Section -->
+      <div
+        v-if="inputs.length > 0 && showInputsAndOutputs"
+        class="flex flex-col gap-1"
+      >
+        <h4
+          class="m-0 text-xxs font-semibold tracking-wide text-muted-foreground uppercase"
+        >
+          {{ $t('nodeHelpPage.inputs') }}
+        </h4>
+        <div
+          v-for="input in inputs"
+          :key="input.name"
+          class="flex items-center justify-between gap-2 text-xxs"
+        >
+          <span class="text-foreground shrink-0">{{ input.name }}</span>
+          <span class="min-w-0 truncate text-muted-foreground">{{
+            input.type
+          }}</span>
+        </div>
+      </div>
+
+      <!-- Outputs Section -->
+      <div
+        v-if="outputs.length > 0 && showInputsAndOutputs"
+        class="flex flex-col gap-1"
+      >
+        <h4
+          class="m-0 text-xxs font-semibold tracking-wide text-muted-foreground uppercase"
+        >
+          {{ $t('nodeHelpPage.outputs') }}
+        </h4>
+        <div
+          v-for="output in outputs"
+          :key="output.name"
+          class="flex items-center justify-between gap-2 text-xxs"
+        >
+          <span class="text-foreground shrink-0">{{ output.name }}</span>
+          <span class="min-w-0 truncate text-muted-foreground">{{
+            output.type
+          }}</span>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useResizeObserver } from '@vueuse/core'
+import { computed, ref } from 'vue'
+
+import NodePricingBadge from '@/components/node/NodePricingBadge.vue'
+import NodeProviderBadge from '@/components/node/NodeProviderBadge.vue'
+import LGraphNodePreview from '@/renderer/extensions/vueNodes/components/LGraphNodePreview.vue'
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+
+const SCALE_FACTOR = 0.5
+const PREVIEW_CONTAINER_PADDING_PX = 24
+
+const {
+  nodeDef,
+  showInputsAndOutputs = true,
+  showCategoryPath = false
+} = defineProps<{
+  nodeDef: ComfyNodeDefImpl
+  showInputsAndOutputs?: boolean
+  showCategoryPath?: boolean
+}>()
+
+const previewContainerRef = ref<HTMLElement>()
+const previewWrapperRef = ref<HTMLElement>()
+
+useResizeObserver(previewWrapperRef, (entries) => {
+  const entry = entries[0]
+  if (entry && previewContainerRef.value) {
+    const scaledHeight = entry.contentRect.height * SCALE_FACTOR
+    previewContainerRef.value.style.height = `${scaledHeight + PREVIEW_CONTAINER_PADDING_PX}px`
+  }
+})
+
+const inputs = computed(() => {
+  if (!nodeDef.inputs) return []
+  return Object.entries(nodeDef.inputs)
+    .filter(([_, input]) => !input.hidden)
+    .map(([name, input]) => ({
+      name,
+      type: input.type
+    }))
+})
+
+const outputs = computed(() => {
+  if (!nodeDef.outputs) return []
+  return nodeDef.outputs.map((output) => ({
+    name: output.name,
+    type: output.type
+  }))
+})
+</script>
diff --git a/src/components/node/NodePricingBadge.vue b/src/components/node/NodePricingBadge.vue
new file mode 100644
index 0000000000..74f63499d3
--- /dev/null
+++ b/src/components/node/NodePricingBadge.vue
@@ -0,0 +1,43 @@
+<template>
+  <BadgePill
+    v-if="nodeDef.api_node"
+    v-show="priceLabel"
+    :text="priceLabel"
+    icon="icon-[comfy--credits]"
+    border-style="#f59e0b"
+    filled
+  />
+</template>
+
+<script setup lang="ts">
+import { ref, watch } from 'vue'
+
+import BadgePill from '@/components/common/BadgePill.vue'
+import { evaluateNodeDefPricing } from '@/composables/node/useNodePricing'
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+
+const { nodeDef } = defineProps<{
+  nodeDef: ComfyNodeDefImpl
+}>()
+
+const priceLabel = ref('')
+
+watch(
+  () => nodeDef.name,
+  (name) => {
+    if (!nodeDef.api_node) {
+      priceLabel.value = ''
+      return
+    }
+    const capturedName = name
+    evaluateNodeDefPricing(nodeDef)
+      .then((label) => {
+        if (nodeDef.name === capturedName) priceLabel.value = label
+      })
+      .catch((e) => {
+        console.error('[NodePricingBadge] pricing evaluation failed:', e)
+      })
+  },
+  { immediate: true }
+)
+</script>
diff --git a/src/components/node/NodeProviderBadge.vue b/src/components/node/NodeProviderBadge.vue
new file mode 100644
index 0000000000..fa8fe19894
--- /dev/null
+++ b/src/components/node/NodeProviderBadge.vue
@@ -0,0 +1,26 @@
+<template>
+  <BadgePill
+    v-if="nodeDef.api_node && providerName"
+    :text="providerName"
+    :icon="getProviderIcon(providerName)"
+    :border-style="getProviderBorderStyle(providerName)"
+  />
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+
+import BadgePill from '@/components/common/BadgePill.vue'
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+import {
+  getProviderBorderStyle,
+  getProviderIcon,
+  getProviderName
+} from '@/utils/categoryUtil'
+
+const { nodeDef } = defineProps<{
+  nodeDef: ComfyNodeDefImpl
+}>()
+
+const providerName = computed(() => getProviderName(nodeDef.category))
+</script>
diff --git a/src/components/painter/WidgetPainter.vue b/src/components/painter/WidgetPainter.vue
new file mode 100644
index 0000000000..6e5abbee3f
--- /dev/null
+++ b/src/components/painter/WidgetPainter.vue
@@ -0,0 +1,358 @@
+<template>
+  <div
+    class="widget-expands flex size-full flex-col gap-1"
+    @pointerdown.stop
+    @pointermove.stop
+    @pointerup.stop
+  >
+    <div
+      class="flex min-h-0 flex-1 items-center justify-center overflow-hidden rounded-lg bg-node-component-surface"
+    >
+      <div class="relative max-h-full w-full" :style="canvasContainerStyle">
+        <img
+          v-if="inputImageUrl"
+          :src="inputImageUrl"
+          class="absolute inset-0 size-full"
+          draggable="false"
+          @load="handleInputImageLoad"
+          @dragstart.prevent
+        />
+        <canvas
+          ref="canvasEl"
+          class="absolute inset-0 size-full cursor-none touch-none"
+          @pointerdown="handlePointerDown"
+          @pointermove="handlePointerMove"
+          @pointerup="handlePointerUp"
+          @pointerenter="handlePointerEnter"
+          @pointerleave="handlePointerLeave"
+        />
+        <div
+          v-show="cursorVisible"
+          ref="cursorEl"
+          class="pointer-events-none absolute top-0 left-0 rounded-full border border-black/60 shadow-[0_0_0_1px_rgba(255,255,255,0.8)] will-change-transform"
+          :style="cursorSizeStyle"
+        />
+      </div>
+    </div>
+
+    <div
+      v-if="isImageInputConnected"
+      class="text-center text-xs text-muted-foreground"
+    >
+      {{ canvasWidth }} x {{ canvasHeight }}
+    </div>
+
+    <div
+      ref="controlsEl"
+      :class="
+        cn(
+          'grid shrink-0 gap-1',
+          compact ? 'grid-cols-1' : 'grid-cols-[auto_1fr]'
+        )
+      "
+    >
+      <div
+        v-if="!compact"
+        class="flex w-28 items-center truncate text-sm text-muted-foreground"
+      >
+        {{ $t('painter.tool') }}
+      </div>
+      <div
+        class="flex h-8 items-center gap-1 rounded-sm bg-component-node-widget-background p-1"
+      >
+        <Button
+          variant="textonly"
+          size="unset"
+          :class="
+            cn(
+              'flex-1 self-stretch px-2 text-xs transition-colors',
+              tool === PAINTER_TOOLS.BRUSH
+                ? 'rounded-sm bg-component-node-widget-background-selected text-base-foreground'
+                : 'text-node-text-muted hover:text-node-text'
+            )
+          "
+          @click="tool = PAINTER_TOOLS.BRUSH"
+        >
+          {{ $t('painter.brush') }}
+        </Button>
+        <Button
+          variant="textonly"
+          size="unset"
+          :class="
+            cn(
+              'flex-1 self-stretch px-2 text-xs transition-colors',
+              tool === PAINTER_TOOLS.ERASER
+                ? 'rounded-sm bg-component-node-widget-background-selected text-base-foreground'
+                : 'text-node-text-muted hover:text-node-text'
+            )
+          "
+          @click="tool = PAINTER_TOOLS.ERASER"
+        >
+          {{ $t('painter.eraser') }}
+        </Button>
+      </div>
+
+      <div
+        v-if="!compact"
+        class="flex w-28 items-center truncate text-sm text-muted-foreground"
+      >
+        {{ $t('painter.size') }}
+      </div>
+      <div
+        class="flex h-8 items-center gap-2 rounded-lg bg-component-node-widget-background pr-2 pl-3"
+      >
+        <Slider
+          :model-value="[brushSize]"
+          :min="1"
+          :max="200"
+          :step="1"
+          class="flex-1"
+          @update:model-value="(v) => v?.length && (brushSize = v[0])"
+        />
+        <span class="text-node-text-muted w-8 text-center text-xs">{{
+          brushSize
+        }}</span>
+      </div>
+
+      <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') }}
+        </div>
+        <div
+          class="flex h-8 w-full items-center gap-2 rounded-lg bg-component-node-widget-background px-4"
+        >
+          <input
+            type="color"
+            :value="brushColorDisplay"
+            class="h-4 w-8 cursor-pointer appearance-none overflow-hidden rounded-full border-none bg-transparent [&::-moz-color-swatch]:rounded-full [&::-moz-color-swatch]:border-none [&::-webkit-color-swatch]:rounded-full [&::-webkit-color-swatch]:border-none [&::-webkit-color-swatch-wrapper]:p-0"
+            @input="
+              (e) => (brushColorDisplay = (e.target as HTMLInputElement).value)
+            "
+          />
+          <span class="min-w-[4ch] truncate text-xs">{{
+            brushColorDisplay
+          }}</span>
+          <span class="text-node-text-muted ml-auto flex items-center text-xs">
+            <input
+              type="number"
+              :value="brushOpacityPercent"
+              min="0"
+              max="100"
+              step="1"
+              class="text-node-text-muted w-7 appearance-none border-0 bg-transparent text-right text-xs outline-none [-moz-appearance:textfield] [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none"
+              @click.stop
+              @change="
+                (e) => {
+                  const val = Math.min(
+                    100,
+                    Math.max(0, Number((e.target as HTMLInputElement).value))
+                  )
+                  brushOpacityPercent = val
+                  ;(e.target as HTMLInputElement).value = String(val)
+                }
+              "
+            />%</span
+          >
+        </div>
+
+        <div
+          v-if="!compact"
+          class="flex w-28 items-center truncate text-sm text-muted-foreground"
+        >
+          {{ $t('painter.hardness') }}
+        </div>
+        <div
+          class="flex h-8 items-center gap-2 rounded-lg bg-component-node-widget-background pr-2 pl-3"
+        >
+          <Slider
+            :model-value="[brushHardnessPercent]"
+            :min="0"
+            :max="100"
+            :step="1"
+            class="flex-1"
+            @update:model-value="
+              (v) => v?.length && (brushHardnessPercent = v[0])
+            "
+          />
+          <span class="text-node-text-muted w-8 text-center text-xs"
+            >{{ brushHardnessPercent }}%</span
+          >
+        </div>
+      </template>
+
+      <template v-if="!isImageInputConnected">
+        <div
+          v-if="!compact"
+          class="flex w-28 items-center truncate text-sm text-muted-foreground"
+        >
+          {{ $t('painter.width') }}
+        </div>
+        <div
+          class="flex h-8 items-center gap-2 rounded-lg bg-component-node-widget-background pr-2 pl-3"
+        >
+          <Slider
+            :model-value="[canvasWidth]"
+            :min="64"
+            :max="4096"
+            :step="64"
+            class="flex-1"
+            @update:model-value="(v) => v?.length && (canvasWidth = v[0])"
+          />
+          <span class="text-node-text-muted w-10 text-center text-xs">{{
+            canvasWidth
+          }}</span>
+        </div>
+
+        <div
+          v-if="!compact"
+          class="flex w-28 items-center truncate text-sm text-muted-foreground"
+        >
+          {{ $t('painter.height') }}
+        </div>
+        <div
+          class="flex h-8 items-center gap-2 rounded-lg bg-component-node-widget-background pr-2 pl-3"
+        >
+          <Slider
+            :model-value="[canvasHeight]"
+            :min="64"
+            :max="4096"
+            :step="64"
+            class="flex-1"
+            @update:model-value="(v) => v?.length && (canvasHeight = v[0])"
+          />
+          <span class="text-node-text-muted w-10 text-center text-xs">{{
+            canvasHeight
+          }}</span>
+        </div>
+
+        <div
+          v-if="!compact"
+          class="flex w-28 items-center truncate text-sm text-muted-foreground"
+        >
+          {{ $t('painter.background') }}
+        </div>
+        <div
+          class="flex h-8 w-full items-center gap-2 rounded-lg bg-component-node-widget-background px-4"
+        >
+          <input
+            type="color"
+            :value="backgroundColorDisplay"
+            class="h-4 w-8 cursor-pointer appearance-none overflow-hidden rounded-full border-none bg-transparent [&::-moz-color-swatch]:rounded-full [&::-moz-color-swatch]:border-none [&::-webkit-color-swatch]:rounded-full [&::-webkit-color-swatch]:border-none [&::-webkit-color-swatch-wrapper]:p-0"
+            @input="
+              (e) =>
+                (backgroundColorDisplay = (e.target as HTMLInputElement).value)
+            "
+          />
+          <span class="min-w-[4ch] truncate text-xs">{{
+            backgroundColorDisplay
+          }}</span>
+        </div>
+      </template>
+
+      <Button
+        variant="secondary"
+        size="md"
+        :class="
+          cn(
+            'gap-2 rounded-lg border border-component-node-border bg-component-node-background text-xs text-muted-foreground hover:text-base-foreground',
+            !compact && 'col-span-2'
+          )
+        "
+        @click="handleClear"
+      >
+        <i class="icon-[lucide--undo-2]" />
+        {{ $t('painter.clear') }}
+      </Button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useElementSize } from '@vueuse/core'
+import { computed, useTemplateRef } from 'vue'
+
+import Button from '@/components/ui/button/Button.vue'
+import Slider from '@/components/ui/slider/Slider.vue'
+import { PAINTER_TOOLS, usePainter } from '@/composables/painter/usePainter'
+import { toHexFromFormat } from '@/utils/colorUtil'
+import { cn } from '@/utils/tailwindUtil'
+
+const { nodeId } = defineProps<{
+  nodeId: string
+}>()
+
+const modelValue = defineModel<string>({ default: '' })
+
+const canvasEl = useTemplateRef<HTMLCanvasElement>('canvasEl')
+const cursorEl = useTemplateRef<HTMLElement>('cursorEl')
+const controlsEl = useTemplateRef<HTMLDivElement>('controlsEl')
+const { width: controlsWidth } = useElementSize(controlsEl)
+const compact = computed(
+  () => controlsWidth.value > 0 && controlsWidth.value < 350
+)
+
+const {
+  tool,
+  brushSize,
+  brushColor,
+  brushOpacity,
+  brushHardness,
+  backgroundColor,
+  canvasWidth,
+  canvasHeight,
+  cursorVisible,
+  displayBrushSize,
+  inputImageUrl,
+  isImageInputConnected,
+  handlePointerDown,
+  handlePointerMove,
+  handlePointerUp,
+  handlePointerEnter,
+  handlePointerLeave,
+  handleInputImageLoad,
+  handleClear
+} = usePainter(nodeId, { canvasEl, cursorEl, modelValue })
+
+const canvasContainerStyle = computed(() => ({
+  aspectRatio: `${canvasWidth.value} / ${canvasHeight.value}`,
+  backgroundColor: isImageInputConnected.value
+    ? undefined
+    : backgroundColor.value
+}))
+
+const cursorSizeStyle = computed(() => ({
+  width: `${displayBrushSize.value}px`,
+  height: `${displayBrushSize.value}px`
+}))
+
+const brushOpacityPercent = computed({
+  get: () => Math.round(brushOpacity.value * 100),
+  set: (val: number) => {
+    brushOpacity.value = val / 100
+  }
+})
+
+const brushHardnessPercent = computed({
+  get: () => Math.round(brushHardness.value * 100),
+  set: (val: number) => {
+    brushHardness.value = val / 100
+  }
+})
+
+const brushColorDisplay = computed({
+  get: () => toHexFromFormat(brushColor.value, 'hex'),
+  set: (val: unknown) => {
+    brushColor.value = toHexFromFormat(val, 'hex')
+  }
+})
+
+const backgroundColorDisplay = computed({
+  get: () => toHexFromFormat(backgroundColor.value, 'hex'),
+  set: (val: unknown) => {
+    backgroundColor.value = toHexFromFormat(val, 'hex')
+  }
+})
+</script>
diff --git a/src/components/primevueOverride/SelectPlus.vue b/src/components/primevueOverride/SelectPlus.vue
new file mode 100644
index 0000000000..dc678dc341
--- /dev/null
+++ b/src/components/primevueOverride/SelectPlus.vue
@@ -0,0 +1,19 @@
+<script>
+import Select from 'primevue/select'
+
+export default {
+  name: 'SelectPlus',
+  extends: Select,
+  emits: ['hide'],
+  methods: {
+    onOverlayLeave() {
+      this.unbindOutsideClickListener()
+      this.unbindScrollListener()
+      this.unbindResizeListener()
+
+      this.$emit('hide')
+      this.overlay = null
+    }
+  }
+}
+</script>
diff --git a/src/components/queue/CompletionSummaryBanner.stories.ts b/src/components/queue/CompletionSummaryBanner.stories.ts
deleted file mode 100644
index 51e09dd5e8..0000000000
--- a/src/components/queue/CompletionSummaryBanner.stories.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3-vite'
-
-import CompletionSummaryBanner from './CompletionSummaryBanner.vue'
-
-const meta: Meta<typeof CompletionSummaryBanner> = {
-  title: 'Queue/CompletionSummaryBanner',
-  component: CompletionSummaryBanner,
-  parameters: {
-    layout: 'padded'
-  }
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-const thumb = (hex: string) =>
-  `data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='24' height='24'><rect width='24' height='24' fill='%23${hex}'/></svg>`
-
-const thumbs = [thumb('ff6b6b'), thumb('4dabf7'), thumb('51cf66')]
-
-export const AllSuccessSingle: Story = {
-  args: {
-    mode: 'allSuccess',
-    completedCount: 1,
-    failedCount: 0,
-    thumbnailUrls: [thumbs[0]]
-  }
-}
-
-export const AllSuccessPlural: Story = {
-  args: {
-    mode: 'allSuccess',
-    completedCount: 3,
-    failedCount: 0,
-    thumbnailUrls: thumbs
-  }
-}
-
-export const MixedSingleSingle: Story = {
-  args: {
-    mode: 'mixed',
-    completedCount: 1,
-    failedCount: 1,
-    thumbnailUrls: thumbs.slice(0, 2)
-  }
-}
-
-export const MixedPluralPlural: Story = {
-  args: {
-    mode: 'mixed',
-    completedCount: 2,
-    failedCount: 3,
-    thumbnailUrls: thumbs
-  }
-}
-
-export const AllFailedSingle: Story = {
-  args: {
-    mode: 'allFailed',
-    completedCount: 0,
-    failedCount: 1,
-    thumbnailUrls: []
-  }
-}
-
-export const AllFailedPlural: Story = {
-  args: {
-    mode: 'allFailed',
-    completedCount: 0,
-    failedCount: 4,
-    thumbnailUrls: []
-  }
-}
diff --git a/src/components/queue/CompletionSummaryBanner.test.ts b/src/components/queue/CompletionSummaryBanner.test.ts
deleted file mode 100644
index d80b304667..0000000000
--- a/src/components/queue/CompletionSummaryBanner.test.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import { mount } from '@vue/test-utils'
-import { describe, expect, it } from 'vitest'
-import { createI18n } from 'vue-i18n'
-
-import CompletionSummaryBanner from './CompletionSummaryBanner.vue'
-
-const i18n = createI18n({
-  legacy: false,
-  locale: 'en',
-  messages: {
-    en: {
-      sideToolbar: {
-        queueProgressOverlay: {
-          jobsCompleted: '{count} job completed | {count} jobs completed',
-          jobsFailed: '{count} job failed | {count} jobs failed'
-        }
-      }
-    }
-  }
-})
-
-const mountComponent = (props: Record<string, unknown>) =>
-  mount(CompletionSummaryBanner, {
-    props: {
-      mode: 'allSuccess',
-      completedCount: 0,
-      failedCount: 0,
-      ...props
-    },
-    global: {
-      plugins: [i18n]
-    }
-  })
-
-describe('CompletionSummaryBanner', () => {
-  it('renders success mode text, thumbnails, and aria label', () => {
-    const wrapper = mountComponent({
-      mode: 'allSuccess',
-      completedCount: 3,
-      failedCount: 0,
-      thumbnailUrls: [
-        'https://example.com/thumb-a.png',
-        'https://example.com/thumb-b.png'
-      ],
-      ariaLabel: 'Open queue summary'
-    })
-
-    const button = wrapper.get('button')
-    expect(button.attributes('aria-label')).toBe('Open queue summary')
-    expect(wrapper.text()).toContain('3 jobs completed')
-
-    const thumbnailImages = wrapper.findAll('img')
-    expect(thumbnailImages).toHaveLength(2)
-    expect(thumbnailImages[0].attributes('src')).toBe(
-      'https://example.com/thumb-a.png'
-    )
-    expect(thumbnailImages[1].attributes('src')).toBe(
-      'https://example.com/thumb-b.png'
-    )
-
-    const thumbnailContainers = wrapper.findAll('.inline-block.h-6.w-6')
-    expect(thumbnailContainers[1].attributes('style')).toContain(
-      'margin-left: -12px'
-    )
-
-    expect(wrapper.html()).not.toContain('icon-[lucide--circle-alert]')
-  })
-
-  it('renders mixed mode with success and failure counts', () => {
-    const wrapper = mountComponent({
-      mode: 'mixed',
-      completedCount: 2,
-      failedCount: 1
-    })
-
-    const summaryText = wrapper.text().replace(/\s+/g, ' ').trim()
-    expect(summaryText).toContain('2 jobs completed, 1 job failed')
-  })
-
-  it('renders failure mode icon without thumbnails', () => {
-    const wrapper = mountComponent({
-      mode: 'allFailed',
-      completedCount: 0,
-      failedCount: 4
-    })
-
-    expect(wrapper.text()).toContain('4 jobs failed')
-    expect(wrapper.html()).toContain('icon-[lucide--circle-alert]')
-    expect(wrapper.findAll('img')).toHaveLength(0)
-  })
-})
diff --git a/src/components/queue/CompletionSummaryBanner.vue b/src/components/queue/CompletionSummaryBanner.vue
deleted file mode 100644
index c0bf7aeb91..0000000000
--- a/src/components/queue/CompletionSummaryBanner.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<template>
-  <Button
-    variant="secondary"
-    size="lg"
-    class="group w-full justify-between gap-3 p-1 text-left font-normal hover:cursor-pointer focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-background"
-    :aria-label="props.ariaLabel"
-    @click="emit('click', $event)"
-  >
-    <span class="inline-flex items-center gap-2">
-      <span v-if="props.mode === 'allFailed'" class="inline-flex items-center">
-        <i
-          class="ml-1 icon-[lucide--circle-alert] block size-4 leading-none text-destructive-background"
-        />
-      </span>
-
-      <span class="inline-flex items-center gap-2">
-        <span
-          v-if="props.mode !== 'allFailed'"
-          class="relative inline-flex h-6 items-center"
-        >
-          <span
-            v-for="(url, idx) in props.thumbnailUrls"
-            :key="url + idx"
-            class="inline-block h-6 w-6 overflow-hidden rounded-[6px] border-0 bg-secondary-background"
-            :style="{ marginLeft: idx === 0 ? '0' : '-12px' }"
-          >
-            <img
-              :src="url"
-              :alt="$t('sideToolbar.queueProgressOverlay.preview')"
-              class="h-full w-full object-cover"
-            />
-          </span>
-        </span>
-
-        <span class="text-[14px] font-normal text-text-primary">
-          <template v-if="props.mode === 'allSuccess'">
-            <i18n-t
-              keypath="sideToolbar.queueProgressOverlay.jobsCompleted"
-              :plural="props.completedCount"
-            >
-              <template #count>
-                <span class="font-bold">{{ props.completedCount }}</span>
-              </template>
-            </i18n-t>
-          </template>
-          <template v-else-if="props.mode === 'mixed'">
-            <i18n-t
-              keypath="sideToolbar.queueProgressOverlay.jobsCompleted"
-              :plural="props.completedCount"
-            >
-              <template #count>
-                <span class="font-bold">{{ props.completedCount }}</span>
-              </template>
-            </i18n-t>
-            <span>, </span>
-            <i18n-t
-              keypath="sideToolbar.queueProgressOverlay.jobsFailed"
-              :plural="props.failedCount"
-            >
-              <template #count>
-                <span class="font-bold">{{ props.failedCount }}</span>
-              </template>
-            </i18n-t>
-          </template>
-          <template v-else>
-            <i18n-t
-              keypath="sideToolbar.queueProgressOverlay.jobsFailed"
-              :plural="props.failedCount"
-            >
-              <template #count>
-                <span class="font-bold">{{ props.failedCount }}</span>
-              </template>
-            </i18n-t>
-          </template>
-        </span>
-      </span>
-    </span>
-
-    <span
-      class="flex items-center justify-center rounded p-1 text-text-secondary transition-colors duration-200 ease-in-out"
-    >
-      <i class="icon-[lucide--chevron-down] block size-4 leading-none" />
-    </span>
-  </Button>
-</template>
-
-<script setup lang="ts">
-import Button from '@/components/ui/button/Button.vue'
-import type {
-  CompletionSummary,
-  CompletionSummaryMode
-} from '@/composables/queue/useCompletionSummary'
-
-type Props = {
-  mode: CompletionSummaryMode
-  completedCount: CompletionSummary['completedCount']
-  failedCount: CompletionSummary['failedCount']
-  thumbnailUrls?: CompletionSummary['thumbnailUrls']
-  ariaLabel?: string
-}
-
-const props = withDefaults(defineProps<Props>(), {
-  thumbnailUrls: () => []
-})
-
-const emit = defineEmits<{
-  (e: 'click', event: MouseEvent): void
-}>()
-</script>
diff --git a/src/components/queue/JobHistoryActionsMenu.test.ts b/src/components/queue/JobHistoryActionsMenu.test.ts
new file mode 100644
index 0000000000..550fe8176e
--- /dev/null
+++ b/src/components/queue/JobHistoryActionsMenu.test.ts
@@ -0,0 +1,123 @@
+import { mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { defineComponent, h } from 'vue'
+
+import { i18n } from '@/i18n'
+import JobHistoryActionsMenu from '@/components/queue/JobHistoryActionsMenu.vue'
+
+const popoverCloseSpy = vi.fn()
+
+vi.mock('@/components/ui/Popover.vue', () => {
+  const PopoverStub = defineComponent({
+    name: 'Popover',
+    setup(_, { slots }) {
+      return () =>
+        h('div', [
+          slots.button?.(),
+          slots.default?.({
+            close: () => {
+              popoverCloseSpy()
+            }
+          })
+        ])
+    }
+  })
+  return { default: PopoverStub }
+})
+
+vi.mock('@/platform/distribution/types', () => ({
+  isCloud: false
+}))
+
+const mockGetSetting = vi.fn<(key: string) => boolean | undefined>((key) =>
+  key === 'Comfy.Queue.QPOV2' || key === 'Comfy.Queue.ShowRunProgressBar'
+    ? true
+    : undefined
+)
+const mockSetSetting = vi.fn()
+const mockSetMany = vi.fn()
+const mockSidebarTabStore = {
+  activeSidebarTabId: null as string | null
+}
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: () => ({
+    get: mockGetSetting,
+    set: mockSetSetting,
+    setMany: mockSetMany
+  })
+}))
+
+vi.mock('@/stores/workspace/sidebarTabStore', () => ({
+  useSidebarTabStore: () => mockSidebarTabStore
+}))
+
+const mountMenu = () =>
+  mount(JobHistoryActionsMenu, {
+    global: {
+      plugins: [i18n],
+      directives: { tooltip: () => {} }
+    }
+  })
+
+describe('JobHistoryActionsMenu', () => {
+  beforeEach(() => {
+    i18n.global.locale.value = 'en'
+    popoverCloseSpy.mockClear()
+    mockSetSetting.mockClear()
+    mockSetMany.mockClear()
+    mockSidebarTabStore.activeSidebarTabId = null
+    mockGetSetting.mockImplementation((key: string) =>
+      key === 'Comfy.Queue.QPOV2' || key === 'Comfy.Queue.ShowRunProgressBar'
+        ? true
+        : undefined
+    )
+  })
+
+  it('toggles show run progress bar setting from the menu', async () => {
+    const wrapper = mountMenu()
+
+    const showRunProgressBarButton = wrapper.get(
+      '[data-testid="show-run-progress-bar-action"]'
+    )
+    await showRunProgressBarButton.trigger('click')
+
+    expect(mockSetSetting).toHaveBeenCalledTimes(1)
+    expect(mockSetSetting).toHaveBeenCalledWith(
+      'Comfy.Queue.ShowRunProgressBar',
+      false
+    )
+  })
+
+  it('opens docked job history sidebar when enabling from the menu', async () => {
+    mockGetSetting.mockImplementation((key: string) => {
+      if (key === 'Comfy.Queue.QPOV2') return false
+      if (key === 'Comfy.Queue.ShowRunProgressBar') return true
+      return undefined
+    })
+    const wrapper = mountMenu()
+
+    const dockedJobHistoryButton = wrapper.get(
+      '[data-testid="docked-job-history-action"]'
+    )
+    await dockedJobHistoryButton.trigger('click')
+
+    expect(popoverCloseSpy).toHaveBeenCalledTimes(1)
+    expect(mockSetSetting).toHaveBeenCalledTimes(1)
+    expect(mockSetSetting).toHaveBeenCalledWith('Comfy.Queue.QPOV2', true)
+    expect(mockSetMany).not.toHaveBeenCalled()
+    expect(mockSidebarTabStore.activeSidebarTabId).toBe('job-history')
+  })
+
+  it('emits clear history from the menu', async () => {
+    const wrapper = mountMenu()
+
+    const clearHistoryButton = wrapper.get(
+      '[data-testid="clear-history-action"]'
+    )
+    await clearHistoryButton.trigger('click')
+
+    expect(popoverCloseSpy).toHaveBeenCalledTimes(1)
+    expect(wrapper.emitted('clearHistory')).toHaveLength(1)
+  })
+})
diff --git a/src/components/queue/JobHistoryActionsMenu.vue b/src/components/queue/JobHistoryActionsMenu.vue
new file mode 100644
index 0000000000..3e021fb029
--- /dev/null
+++ b/src/components/queue/JobHistoryActionsMenu.vue
@@ -0,0 +1,146 @@
+<template>
+  <div class="flex items-center gap-1">
+    <Popover :show-arrow="false">
+      <template #button>
+        <Button
+          v-tooltip.top="moreTooltipConfig"
+          variant="textonly"
+          size="icon"
+          :aria-label="t('sideToolbar.queueProgressOverlay.moreOptions')"
+        >
+          <i
+            class="icon-[lucide--more-horizontal] block size-4 leading-none text-text-secondary"
+          />
+        </Button>
+      </template>
+      <template #default="{ close }">
+        <div class="flex min-w-56 flex-col items-stretch font-inter">
+          <Button
+            data-testid="docked-job-history-action"
+            class="w-full justify-between text-sm font-light"
+            variant="textonly"
+            size="md"
+            @click="onToggleDockedJobHistory(close)"
+          >
+            <span class="flex items-center gap-2">
+              <i
+                class="icon-[lucide--panel-left-close] size-4 text-text-secondary"
+              />
+              <span>{{
+                t('sideToolbar.queueProgressOverlay.dockedJobHistory')
+              }}</span>
+            </span>
+            <i
+              v-if="isQueuePanelV2Enabled"
+              class="icon-[lucide--check] size-4"
+            />
+          </Button>
+          <Button
+            data-testid="show-run-progress-bar-action"
+            class="w-full justify-between text-sm font-light"
+            variant="textonly"
+            size="md"
+            @click="onToggleRunProgressBar"
+          >
+            <span class="flex items-center gap-2">
+              <i class="icon-[lucide--hourglass] size-4 text-text-secondary" />
+              <span>{{
+                t('sideToolbar.queueProgressOverlay.showRunProgressBar')
+              }}</span>
+            </span>
+            <i
+              v-if="isRunProgressBarEnabled"
+              class="icon-[lucide--check] size-4"
+            />
+          </Button>
+          <!-- TODO: Bug in assets sidebar panel derives assets from history, so despite this not deleting the assets, it still effectively shows to the user as deleted -->
+          <template v-if="showClearHistoryAction">
+            <div class="my-1 border-t border-interface-stroke" />
+            <Button
+              data-testid="clear-history-action"
+              class="h-auto min-h-8 w-full items-start justify-start whitespace-normal"
+              variant="textonly"
+              size="md"
+              @click="onClearHistoryFromMenu(close)"
+            >
+              <i
+                class="icon-[lucide--trash-2] size-4 shrink-0 self-center text-destructive-background"
+              />
+              <span
+                class="flex flex-col items-start text-left leading-tight wrap-break-word"
+              >
+                <span class="text-sm font-light">
+                  {{ t('sideToolbar.queueProgressOverlay.clearHistory') }}
+                </span>
+                <span class="text-xs font-light text-text-secondary">
+                  {{
+                    t(
+                      'sideToolbar.queueProgressOverlay.clearHistoryMenuAssetsNote'
+                    )
+                  }}
+                </span>
+              </span>
+            </Button>
+          </template>
+        </div>
+      </template>
+    </Popover>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Popover from '@/components/ui/Popover.vue'
+import Button from '@/components/ui/button/Button.vue'
+import { useQueueFeatureFlags } from '@/composables/queue/useQueueFeatureFlags'
+import { buildTooltipConfig } from '@/composables/useTooltipConfig'
+import { isCloud } from '@/platform/distribution/types'
+import { useSettingStore } from '@/platform/settings/settingStore'
+import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
+
+const emit = defineEmits<{
+  (e: 'clearHistory'): void
+}>()
+
+const { t } = useI18n()
+const settingStore = useSettingStore()
+const sidebarTabStore = useSidebarTabStore()
+
+const moreTooltipConfig = computed(() => buildTooltipConfig(t('g.more')))
+const { isQueuePanelV2Enabled, isRunProgressBarEnabled } =
+  useQueueFeatureFlags()
+const showClearHistoryAction = computed(() => !isCloud)
+
+const onClearHistoryFromMenu = (close: () => void) => {
+  close()
+  emit('clearHistory')
+}
+
+const onToggleDockedJobHistory = async (close: () => void) => {
+  close()
+
+  try {
+    if (isQueuePanelV2Enabled.value) {
+      await settingStore.setMany({
+        'Comfy.Queue.QPOV2': false,
+        'Comfy.Queue.History.Expanded': true
+      })
+      return
+    }
+
+    sidebarTabStore.activeSidebarTabId = 'job-history'
+    await settingStore.set('Comfy.Queue.QPOV2', true)
+  } catch {
+    return
+  }
+}
+
+const onToggleRunProgressBar = async () => {
+  await settingStore.set(
+    'Comfy.Queue.ShowRunProgressBar',
+    !isRunProgressBarEnabled.value
+  )
+}
+</script>
diff --git a/src/components/queue/QueueInlineProgress.test.ts b/src/components/queue/QueueInlineProgress.test.ts
new file mode 100644
index 0000000000..a065789f3d
--- /dev/null
+++ b/src/components/queue/QueueInlineProgress.test.ts
@@ -0,0 +1,75 @@
+import { mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { nextTick, ref } from 'vue'
+import type { Ref } from 'vue'
+
+import QueueInlineProgress from '@/components/queue/QueueInlineProgress.vue'
+
+const mockProgress = vi.hoisted(() => ({
+  totalPercent: null! as Ref<number>,
+  currentNodePercent: null! as Ref<number>
+}))
+
+vi.mock('@/composables/queue/useQueueProgress', () => ({
+  useQueueProgress: () => ({
+    totalPercent: mockProgress.totalPercent,
+    currentNodePercent: mockProgress.currentNodePercent
+  })
+}))
+
+const createWrapper = (props: { hidden?: boolean } = {}) =>
+  mount(QueueInlineProgress, { props })
+
+describe('QueueInlineProgress', () => {
+  beforeEach(() => {
+    mockProgress.totalPercent = ref(0)
+    mockProgress.currentNodePercent = ref(0)
+  })
+
+  it('renders when total progress is non-zero', () => {
+    mockProgress.totalPercent.value = 12
+
+    const wrapper = createWrapper()
+
+    expect(wrapper.find('[aria-hidden="true"]').exists()).toBe(true)
+  })
+
+  it('renders when current node progress is non-zero', () => {
+    mockProgress.currentNodePercent.value = 33
+
+    const wrapper = createWrapper()
+
+    expect(wrapper.find('[aria-hidden="true"]').exists()).toBe(true)
+  })
+
+  it('does not render when hidden', () => {
+    mockProgress.totalPercent.value = 45
+
+    const wrapper = createWrapper({ hidden: true })
+
+    expect(wrapper.find('[aria-hidden="true"]').exists()).toBe(false)
+  })
+
+  it('shows when progress becomes non-zero', async () => {
+    const wrapper = createWrapper()
+
+    expect(wrapper.find('[aria-hidden="true"]').exists()).toBe(false)
+
+    mockProgress.totalPercent.value = 10
+    await nextTick()
+    expect(wrapper.find('[aria-hidden="true"]').exists()).toBe(true)
+  })
+
+  it('hides when progress returns to zero', async () => {
+    mockProgress.totalPercent.value = 10
+
+    const wrapper = createWrapper()
+
+    expect(wrapper.find('[aria-hidden="true"]').exists()).toBe(true)
+
+    mockProgress.totalPercent.value = 0
+    mockProgress.currentNodePercent.value = 0
+    await nextTick()
+    expect(wrapper.find('[aria-hidden="true"]').exists()).toBe(false)
+  })
+})
diff --git a/src/components/queue/QueueInlineProgress.vue b/src/components/queue/QueueInlineProgress.vue
new file mode 100644
index 0000000000..e591e50d20
--- /dev/null
+++ b/src/components/queue/QueueInlineProgress.vue
@@ -0,0 +1,36 @@
+<template>
+  <div
+    v-if="shouldShow"
+    aria-hidden="true"
+    :class="
+      cn('pointer-events-none absolute inset-0 overflow-hidden', radiusClass)
+    "
+  >
+    <div
+      class="pointer-events-none absolute bottom-0 left-0 h-[3px] bg-interface-panel-job-progress-primary transition-[width]"
+      :style="{ width: `${totalPercent}%` }"
+    />
+    <div
+      class="pointer-events-none absolute bottom-0 left-0 h-[3px] bg-interface-panel-job-progress-secondary transition-[width]"
+      :style="{ width: `${currentNodePercent}%` }"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+
+import { useQueueProgress } from '@/composables/queue/useQueueProgress'
+import { cn } from '@/utils/tailwindUtil'
+
+const { hidden = false, radiusClass = 'rounded-[7px]' } = defineProps<{
+  hidden?: boolean
+  radiusClass?: string
+}>()
+
+const { totalPercent, currentNodePercent } = useQueueProgress()
+
+const shouldShow = computed(
+  () => !hidden && (totalPercent.value > 0 || currentNodePercent.value > 0)
+)
+</script>
diff --git a/src/components/queue/QueueInlineProgressSummary.vue b/src/components/queue/QueueInlineProgressSummary.vue
new file mode 100644
index 0000000000..69ad77c650
--- /dev/null
+++ b/src/components/queue/QueueInlineProgressSummary.vue
@@ -0,0 +1,71 @@
+<template>
+  <div v-if="shouldShow" class="flex justify-end">
+    <div
+      class="flex items-center text-[0.75rem] leading-[normal] whitespace-nowrap drop-shadow-[1px_1px_8px_rgba(0,0,0,0.4)]"
+      role="status"
+      aria-live="polite"
+      aria-atomic="true"
+    >
+      <div class="flex items-center text-base-foreground">
+        <span class="font-normal">
+          {{ t('sideToolbar.queueProgressOverlay.inlineTotalLabel') }}:
+        </span>
+        <span class="w-[5ch] shrink-0 text-right font-bold tabular-nums">
+          {{ totalPercentFormatted }}
+        </span>
+      </div>
+
+      <div class="flex items-center text-muted-foreground">
+        <span
+          class="w-[16ch] shrink-0 truncate text-right"
+          :title="currentNodeName"
+        >
+          {{ currentNodeName }}:
+        </span>
+        <span class="w-[5ch] shrink-0 text-right tabular-nums">
+          {{ currentNodePercentFormatted }}
+        </span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import { st } from '@/i18n'
+import { useQueueProgress } from '@/composables/queue/useQueueProgress'
+import { useExecutionStore } from '@/stores/executionStore'
+import { resolveNodeDisplayName } from '@/utils/nodeTitleUtil'
+
+const props = defineProps<{
+  hidden?: boolean
+}>()
+
+const { t } = useI18n()
+
+const executionStore = useExecutionStore()
+const {
+  totalPercent,
+  totalPercentFormatted,
+  currentNodePercent,
+  currentNodePercentFormatted
+} = useQueueProgress()
+
+const currentNodeName = computed(() => {
+  return resolveNodeDisplayName(executionStore.executingNode, {
+    emptyLabel: t('g.emDash'),
+    untitledLabel: t('g.untitled'),
+    st
+  })
+})
+
+const shouldShow = computed(
+  () =>
+    !props.hidden &&
+    (!executionStore.isIdle ||
+      totalPercent.value > 0 ||
+      currentNodePercent.value > 0)
+)
+</script>
diff --git a/src/components/queue/QueueNotificationBanner.stories.ts b/src/components/queue/QueueNotificationBanner.stories.ts
new file mode 100644
index 0000000000..7d0dab9d3a
--- /dev/null
+++ b/src/components/queue/QueueNotificationBanner.stories.ts
@@ -0,0 +1,140 @@
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+
+import type { QueueNotificationBanner as QueueNotificationBannerItem } from '@/composables/queue/useQueueNotificationBanners'
+
+import QueueNotificationBanner from './QueueNotificationBanner.vue'
+
+const meta: Meta<typeof QueueNotificationBanner> = {
+  title: 'Queue/QueueNotificationBanner',
+  component: QueueNotificationBanner,
+  parameters: {
+    layout: 'padded'
+  }
+}
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+const thumbnail = (hex: string) =>
+  `data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='256' height='256'><rect width='256' height='256' fill='%23${hex}'/></svg>`
+
+const args = (notification: QueueNotificationBannerItem) => ({ notification })
+
+export const Queueing: Story = {
+  args: args({
+    type: 'queuedPending',
+    count: 1
+  })
+}
+
+export const QueueingMultiple: Story = {
+  args: args({
+    type: 'queuedPending',
+    count: 3
+  })
+}
+
+export const Queued: Story = {
+  args: args({
+    type: 'queued',
+    count: 1
+  })
+}
+
+export const QueuedMultiple: Story = {
+  args: args({
+    type: 'queued',
+    count: 4
+  })
+}
+
+export const Completed: Story = {
+  args: args({
+    type: 'completed',
+    count: 1,
+    thumbnailUrls: [thumbnail('4dabf7')]
+  })
+}
+
+export const CompletedMultiple: Story = {
+  args: args({
+    type: 'completed',
+    count: 4
+  })
+}
+
+export const CompletedMultipleWithThumbnail: Story = {
+  args: args({
+    type: 'completed',
+    count: 4,
+    thumbnailUrls: [
+      thumbnail('ff6b6b'),
+      thumbnail('4dabf7'),
+      thumbnail('51cf66')
+    ]
+  })
+}
+
+export const Failed: Story = {
+  args: args({
+    type: 'failed',
+    count: 1
+  })
+}
+
+export const Gallery: Story = {
+  render: () => ({
+    components: { QueueNotificationBanner },
+    setup() {
+      const queueing = args({
+        type: 'queuedPending',
+        count: 1
+      })
+      const queued = args({
+        type: 'queued',
+        count: 2
+      })
+      const completed = args({
+        type: 'completed',
+        count: 1,
+        thumbnailUrls: [thumbnail('ff6b6b')]
+      })
+      const completedMultiple = args({
+        type: 'completed',
+        count: 4
+      })
+      const completedMultipleWithThumbnail = args({
+        type: 'completed',
+        count: 4,
+        thumbnailUrls: [
+          thumbnail('51cf66'),
+          thumbnail('ffd43b'),
+          thumbnail('ff922b')
+        ]
+      })
+      const failed = args({
+        type: 'failed',
+        count: 2
+      })
+
+      return {
+        queueing,
+        queued,
+        completed,
+        completedMultiple,
+        completedMultipleWithThumbnail,
+        failed
+      }
+    },
+    template: `
+      <div class="flex flex-col gap-2">
+        <QueueNotificationBanner v-bind="queueing" />
+        <QueueNotificationBanner v-bind="queued" />
+        <QueueNotificationBanner v-bind="completed" />
+        <QueueNotificationBanner v-bind="completedMultiple" />
+        <QueueNotificationBanner v-bind="completedMultipleWithThumbnail" />
+        <QueueNotificationBanner v-bind="failed" />
+      </div>
+    `
+  })
+}
diff --git a/src/components/queue/QueueNotificationBanner.test.ts b/src/components/queue/QueueNotificationBanner.test.ts
new file mode 100644
index 0000000000..629758447e
--- /dev/null
+++ b/src/components/queue/QueueNotificationBanner.test.ts
@@ -0,0 +1,136 @@
+import { mount } from '@vue/test-utils'
+import { describe, expect, it } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+import QueueNotificationBanner from '@/components/queue/QueueNotificationBanner.vue'
+import type { QueueNotificationBanner as QueueNotificationBannerItem } from '@/composables/queue/useQueueNotificationBanners'
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      queue: {
+        jobAddedToQueue: 'Job added to queue',
+        jobQueueing: 'Job queueing'
+      },
+      sideToolbar: {
+        queueProgressOverlay: {
+          preview: 'Preview',
+          jobCompleted: 'Job completed',
+          jobFailed: 'Job failed',
+          jobsAddedToQueue:
+            '{count} job added to queue | {count} jobs added to queue',
+          jobsCompleted: '{count} job completed | {count} jobs completed',
+          jobsFailed: '{count} job failed | {count} jobs failed'
+        }
+      }
+    }
+  }
+})
+
+const mountComponent = (notification: QueueNotificationBannerItem) =>
+  mount(QueueNotificationBanner, {
+    props: { notification },
+    global: {
+      plugins: [i18n]
+    }
+  })
+
+describe(QueueNotificationBanner, () => {
+  it('renders singular queued message without count prefix', () => {
+    const wrapper = mountComponent({
+      type: 'queued',
+      count: 1
+    })
+
+    expect(wrapper.text()).toContain('Job added to queue')
+    expect(wrapper.text()).not.toContain('1 job')
+  })
+
+  it('renders queued message with pluralization', () => {
+    const wrapper = mountComponent({
+      type: 'queued',
+      count: 2
+    })
+
+    expect(wrapper.text()).toContain('2 jobs added to queue')
+    expect(wrapper.html()).toContain('icon-[lucide--check]')
+  })
+
+  it('renders queued pending message with spinner icon', () => {
+    const wrapper = mountComponent({
+      type: 'queuedPending',
+      count: 1
+    })
+
+    expect(wrapper.text()).toContain('Job queueing')
+    expect(wrapper.html()).toContain('icon-[lucide--loader-circle]')
+    expect(wrapper.html()).toContain('animate-spin')
+  })
+
+  it('renders failed message and alert icon', () => {
+    const wrapper = mountComponent({
+      type: 'failed',
+      count: 1
+    })
+
+    expect(wrapper.text()).toContain('Job failed')
+    expect(wrapper.html()).toContain('icon-[lucide--circle-alert]')
+  })
+
+  it('renders completed message with thumbnail preview when provided', () => {
+    const wrapper = mountComponent({
+      type: 'completed',
+      count: 3,
+      thumbnailUrls: ['https://example.com/preview.png']
+    })
+
+    expect(wrapper.text()).toContain('3 jobs completed')
+    const image = wrapper.get('img')
+    expect(image.attributes('src')).toBe('https://example.com/preview.png')
+    expect(image.attributes('alt')).toBe('Preview')
+  })
+
+  it('renders two completion thumbnail previews', () => {
+    const wrapper = mountComponent({
+      type: 'completed',
+      count: 4,
+      thumbnailUrls: [
+        'https://example.com/preview-1.png',
+        'https://example.com/preview-2.png'
+      ]
+    })
+
+    const images = wrapper.findAll('img')
+    expect(images.length).toBe(2)
+    expect(images[0].attributes('src')).toBe(
+      'https://example.com/preview-1.png'
+    )
+    expect(images[1].attributes('src')).toBe(
+      'https://example.com/preview-2.png'
+    )
+  })
+
+  it('caps completion thumbnail previews at two', () => {
+    const wrapper = mountComponent({
+      type: 'completed',
+      count: 4,
+      thumbnailUrls: [
+        'https://example.com/preview-1.png',
+        'https://example.com/preview-2.png',
+        'https://example.com/preview-3.png',
+        'https://example.com/preview-4.png'
+      ]
+    })
+
+    const images = wrapper.findAll('img')
+    expect(images.length).toBe(2)
+    expect(images[0].attributes('src')).toBe(
+      'https://example.com/preview-1.png'
+    )
+    expect(images[1].attributes('src')).toBe(
+      'https://example.com/preview-2.png'
+    )
+  })
+})
diff --git a/src/components/queue/QueueNotificationBanner.vue b/src/components/queue/QueueNotificationBanner.vue
new file mode 100644
index 0000000000..b57e5f3a91
--- /dev/null
+++ b/src/components/queue/QueueNotificationBanner.vue
@@ -0,0 +1,149 @@
+<template>
+  <div class="inline-flex overflow-hidden rounded-lg bg-secondary-background">
+    <div class="flex items-center gap-2 p-1 pr-3">
+      <div
+        :class="
+          cn(
+            'relative shrink-0 items-center rounded-[4px]',
+            showsCompletionPreview && showThumbnails
+              ? 'flex h-8 overflow-visible p-0'
+              : showsCompletionPreview
+                ? 'flex size-8 justify-center overflow-hidden p-0'
+                : 'flex size-8 justify-center p-1'
+          )
+        "
+      >
+        <template v-if="showThumbnails">
+          <div class="flex h-8 shrink-0 items-center">
+            <div
+              v-for="(thumbnailUrl, index) in thumbnailUrls"
+              :key="`completion-preview-${index}`"
+              :class="
+                cn(
+                  'relative size-8 shrink-0 overflow-hidden rounded-[4px]',
+                  index > 0 && '-ml-3 ring-2 ring-secondary-background'
+                )
+              "
+            >
+              <img
+                :src="thumbnailUrl"
+                :alt="t('sideToolbar.queueProgressOverlay.preview')"
+                class="size-full object-cover"
+              />
+            </div>
+          </div>
+        </template>
+        <div
+          v-else-if="showCompletionGradientFallback"
+          class="size-full bg-linear-to-br from-coral-500 via-coral-500 to-azure-600"
+        />
+        <i
+          v-else
+          :class="cn(iconClass, 'size-4', iconColorClass)"
+          aria-hidden="true"
+        />
+      </div>
+      <div class="flex h-full items-center">
+        <span
+          class="overflow-hidden text-center font-inter text-[12px] leading-normal font-normal text-ellipsis text-base-foreground"
+        >
+          {{ bannerText }}
+        </span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import type { QueueNotificationBanner } from '@/composables/queue/useQueueNotificationBanners'
+import { cn } from '@/utils/tailwindUtil'
+
+const { notification } = defineProps<{
+  notification: QueueNotificationBanner
+}>()
+
+const { t, n } = useI18n()
+
+const thumbnailUrls = computed(() => {
+  if (notification.type !== 'completed') {
+    return []
+  }
+  return notification.thumbnailUrls?.slice(0, 2) ?? []
+})
+
+const showThumbnails = computed(() => {
+  if (notification.type !== 'completed') {
+    return false
+  }
+  return thumbnailUrls.value.length > 0
+})
+
+const showCompletionGradientFallback = computed(
+  () => notification.type === 'completed' && !showThumbnails.value
+)
+
+const showsCompletionPreview = computed(
+  () => showThumbnails.value || showCompletionGradientFallback.value
+)
+
+const bannerText = computed(() => {
+  const count = notification.count
+  if (notification.type === 'queuedPending') {
+    return t('queue.jobQueueing')
+  }
+  if (notification.type === 'queued') {
+    if (count === 1) {
+      return t('queue.jobAddedToQueue')
+    }
+    return t(
+      'sideToolbar.queueProgressOverlay.jobsAddedToQueue',
+      { count: n(count) },
+      count
+    )
+  }
+  if (notification.type === 'failed') {
+    if (count === 1) {
+      return t('sideToolbar.queueProgressOverlay.jobFailed')
+    }
+    return t(
+      'sideToolbar.queueProgressOverlay.jobsFailed',
+      { count: n(count) },
+      count
+    )
+  }
+  if (count === 1) {
+    return t('sideToolbar.queueProgressOverlay.jobCompleted')
+  }
+  return t(
+    'sideToolbar.queueProgressOverlay.jobsCompleted',
+    { count: n(count) },
+    count
+  )
+})
+
+const iconClass = computed(() => {
+  if (notification.type === 'queuedPending') {
+    return 'icon-[lucide--loader-circle]'
+  }
+  if (notification.type === 'queued') {
+    return 'icon-[lucide--check]'
+  }
+  if (notification.type === 'failed') {
+    return 'icon-[lucide--circle-alert]'
+  }
+  return 'icon-[lucide--image]'
+})
+
+const iconColorClass = computed(() => {
+  if (notification.type === 'queuedPending') {
+    return 'animate-spin text-slate-100'
+  }
+  if (notification.type === 'failed') {
+    return 'text-danger-200'
+  }
+  return 'text-slate-100'
+})
+</script>
diff --git a/src/components/queue/QueueNotificationBannerHost.vue b/src/components/queue/QueueNotificationBannerHost.vue
new file mode 100644
index 0000000000..48fb3e2247
--- /dev/null
+++ b/src/components/queue/QueueNotificationBannerHost.vue
@@ -0,0 +1,18 @@
+<template>
+  <div
+    v-if="currentNotification"
+    class="flex justify-end"
+    role="status"
+    aria-live="polite"
+    aria-atomic="true"
+  >
+    <QueueNotificationBanner :notification="currentNotification" />
+  </div>
+</template>
+
+<script setup lang="ts">
+import QueueNotificationBanner from '@/components/queue/QueueNotificationBanner.vue'
+import { useQueueNotificationBanners } from '@/composables/queue/useQueueNotificationBanners'
+
+const { currentNotification } = useQueueNotificationBanners()
+</script>
diff --git a/src/components/queue/QueueOverlayActive.vue b/src/components/queue/QueueOverlayActive.vue
index 69805deca7..9cd6b3c7bf 100644
--- a/src/components/queue/QueueOverlayActive.vue
+++ b/src/components/queue/QueueOverlayActive.vue
@@ -23,7 +23,7 @@
         </div>
         <div class="flex items-center gap-1 text-text-secondary">
           <span>{{ t('sideToolbar.queueProgressOverlay.currentNode') }}</span>
-          <span class="inline-block max-w-[10rem] truncate">{{
+          <span class="inline-block max-w-40 truncate">{{
             currentNodeName
           }}</span>
           <span class="flex items-center gap-1">
diff --git a/src/components/queue/QueueOverlayEmpty.test.ts b/src/components/queue/QueueOverlayEmpty.test.ts
deleted file mode 100644
index 76509dc3d9..0000000000
--- a/src/components/queue/QueueOverlayEmpty.test.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { mount } from '@vue/test-utils'
-import { describe, expect, it } from 'vitest'
-import { createI18n } from 'vue-i18n'
-
-import QueueOverlayEmpty from './QueueOverlayEmpty.vue'
-import type { CompletionSummary } from '@/composables/queue/useCompletionSummary'
-
-const i18n = createI18n({
-  legacy: false,
-  locale: 'en',
-  messages: {
-    en: {
-      sideToolbar: {
-        queueProgressOverlay: {
-          expandCollapsedQueue: 'Expand job queue',
-          noActiveJobs: 'No active jobs'
-        }
-      }
-    }
-  }
-})
-
-const CompletionSummaryBannerStub = {
-  name: 'CompletionSummaryBanner',
-  props: [
-    'mode',
-    'completedCount',
-    'failedCount',
-    'thumbnailUrls',
-    'ariaLabel'
-  ],
-  emits: ['click'],
-  template: '<button class="summary-banner" @click="$emit(\'click\')"></button>'
-}
-
-const mountComponent = (summary: CompletionSummary) =>
-  mount(QueueOverlayEmpty, {
-    props: { summary },
-    global: {
-      plugins: [i18n],
-      components: { CompletionSummaryBanner: CompletionSummaryBannerStub }
-    }
-  })
-
-describe('QueueOverlayEmpty', () => {
-  it('renders completion summary banner and proxies click', async () => {
-    const summary: CompletionSummary = {
-      mode: 'mixed',
-      completedCount: 2,
-      failedCount: 1,
-      thumbnailUrls: ['thumb-a']
-    }
-
-    const wrapper = mountComponent(summary)
-    const summaryBanner = wrapper.findComponent(CompletionSummaryBannerStub)
-
-    expect(summaryBanner.exists()).toBe(true)
-    expect(summaryBanner.props()).toMatchObject({
-      mode: 'mixed',
-      completedCount: 2,
-      failedCount: 1,
-      thumbnailUrls: ['thumb-a'],
-      ariaLabel: 'Expand job queue'
-    })
-
-    await summaryBanner.trigger('click')
-    expect(wrapper.emitted('summaryClick')).toHaveLength(1)
-  })
-})
diff --git a/src/components/queue/QueueOverlayEmpty.vue b/src/components/queue/QueueOverlayEmpty.vue
deleted file mode 100644
index 83a55aec20..0000000000
--- a/src/components/queue/QueueOverlayEmpty.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-<template>
-  <div class="pointer-events-auto">
-    <CompletionSummaryBanner
-      :mode="summary.mode"
-      :completed-count="summary.completedCount"
-      :failed-count="summary.failedCount"
-      :thumbnail-urls="summary.thumbnailUrls"
-      :aria-label="t('sideToolbar.queueProgressOverlay.expandCollapsedQueue')"
-      @click="$emit('summaryClick')"
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-import { useI18n } from 'vue-i18n'
-
-import CompletionSummaryBanner from '@/components/queue/CompletionSummaryBanner.vue'
-import type { CompletionSummary } from '@/composables/queue/useCompletionSummary'
-
-defineProps<{ summary: CompletionSummary }>()
-
-defineEmits<{
-  (e: 'summaryClick'): void
-}>()
-
-const { t } = useI18n()
-</script>
diff --git a/src/components/queue/QueueOverlayExpanded.test.ts b/src/components/queue/QueueOverlayExpanded.test.ts
new file mode 100644
index 0000000000..89c3064df3
--- /dev/null
+++ b/src/components/queue/QueueOverlayExpanded.test.ts
@@ -0,0 +1,85 @@
+import { mount } from '@vue/test-utils'
+import { describe, expect, it, vi } from 'vitest'
+
+import type { JobListItem } from '@/composables/queue/useJobList'
+
+vi.mock('@/composables/queue/useJobMenu', () => ({
+  useJobMenu: () => ({ jobMenuEntries: [] })
+}))
+
+vi.mock('@/composables/useErrorHandling', () => ({
+  useErrorHandling: () => ({
+    wrapWithErrorHandlingAsync: <T extends (...args: never[]) => unknown>(
+      fn: T
+    ) => fn
+  })
+}))
+
+import QueueOverlayExpanded from '@/components/queue/QueueOverlayExpanded.vue'
+
+const QueueOverlayHeaderStub = {
+  template: '<div />'
+}
+
+const JobFiltersBarStub = {
+  template: '<div />'
+}
+
+const JobAssetsListStub = {
+  name: 'JobAssetsList',
+  template: '<div class="job-assets-list-stub" />'
+}
+
+const JobContextMenuStub = {
+  template: '<div />'
+}
+
+const createJob = (): JobListItem => ({
+  id: 'job-1',
+  title: 'Job 1',
+  meta: 'meta',
+  state: 'pending'
+})
+
+const mountComponent = () =>
+  mount(QueueOverlayExpanded, {
+    props: {
+      headerTitle: 'Jobs',
+      queuedCount: 1,
+      selectedJobTab: 'All',
+      selectedWorkflowFilter: 'all',
+      selectedSortMode: 'mostRecent',
+      displayedJobGroups: [],
+      hasFailedJobs: false
+    },
+    global: {
+      stubs: {
+        QueueOverlayHeader: QueueOverlayHeaderStub,
+        JobFiltersBar: JobFiltersBarStub,
+        JobAssetsList: JobAssetsListStub,
+        JobContextMenu: JobContextMenuStub
+      }
+    }
+  })
+
+describe('QueueOverlayExpanded', () => {
+  it('renders JobAssetsList', () => {
+    const wrapper = mountComponent()
+    expect(wrapper.find('.job-assets-list-stub').exists()).toBe(true)
+  })
+
+  it('re-emits list item actions from JobAssetsList', async () => {
+    const wrapper = mountComponent()
+    const job = createJob()
+    const jobAssetsList = wrapper.findComponent({ name: 'JobAssetsList' })
+
+    jobAssetsList.vm.$emit('cancel-item', job)
+    jobAssetsList.vm.$emit('delete-item', job)
+    jobAssetsList.vm.$emit('view-item', job)
+    await wrapper.vm.$nextTick()
+
+    expect(wrapper.emitted('cancelItem')?.[0]).toEqual([job])
+    expect(wrapper.emitted('deleteItem')?.[0]).toEqual([job])
+    expect(wrapper.emitted('viewItem')?.[0]).toEqual([job])
+  })
+})
diff --git a/src/components/queue/QueueOverlayExpanded.vue b/src/components/queue/QueueOverlayExpanded.vue
index 1d20040983..526ea34f2e 100644
--- a/src/components/queue/QueueOverlayExpanded.vue
+++ b/src/components/queue/QueueOverlayExpanded.vue
@@ -2,48 +2,17 @@
   <div class="flex w-full flex-col gap-4">
     <QueueOverlayHeader
       :header-title="headerTitle"
-      :show-concurrent-indicator="showConcurrentIndicator"
-      :concurrent-workflow-count="concurrentWorkflowCount"
+      :queued-count="queuedCount"
       @clear-history="$emit('clearHistory')"
+      @clear-queued="$emit('clearQueued')"
     />
 
-    <div class="flex items-center justify-between px-3">
-      <Button
-        class="grow gap-1 justify-center"
-        variant="secondary"
-        size="sm"
-        @click="$emit('showAssets')"
-      >
-        <i class="icon-[comfy--image-ai-edit] size-4" />
-        <span>{{ t('sideToolbar.queueProgressOverlay.showAssets') }}</span>
-      </Button>
-      <div class="ml-4 inline-flex items-center">
-        <div
-          class="inline-flex h-6 items-center text-[12px] leading-none text-text-primary opacity-90"
-        >
-          <span class="font-bold">{{ queuedCount }}</span>
-          <span class="ml-1">{{
-            t('sideToolbar.queueProgressOverlay.queuedSuffix')
-          }}</span>
-        </div>
-        <Button
-          v-if="queuedCount > 0"
-          class="ml-2"
-          variant="destructive"
-          size="icon"
-          :aria-label="t('sideToolbar.queueProgressOverlay.clearQueued')"
-          @click="$emit('clearQueued')"
-        >
-          <i class="icon-[lucide--list-x] size-4" />
-        </Button>
-      </div>
-    </div>
-
     <JobFiltersBar
       :selected-job-tab="selectedJobTab"
       :selected-workflow-filter="selectedWorkflowFilter"
       :selected-sort-mode="selectedSortMode"
       :has-failed-jobs="hasFailedJobs"
+      @show-assets="$emit('showAssets')"
       @update:selected-job-tab="$emit('update:selectedJobTab', $event)"
       @update:selected-workflow-filter="
         $emit('update:selectedWorkflowFilter', $event)
@@ -51,8 +20,8 @@
       @update:selected-sort-mode="$emit('update:selectedSortMode', $event)"
     />
 
-    <div class="flex-1 min-h-0 overflow-y-auto">
-      <JobGroupsList
+    <div class="min-h-0 flex-1 overflow-y-auto">
+      <JobAssetsList
         :displayed-job-groups="displayedJobGroups"
         @cancel-item="onCancelItemEvent"
         @delete-item="onDeleteItemEvent"
@@ -71,9 +40,7 @@
 
 <script setup lang="ts">
 import { ref } from 'vue'
-import { useI18n } from 'vue-i18n'
 
-import Button from '@/components/ui/button/Button.vue'
 import type {
   JobGroup,
   JobListItem,
@@ -82,16 +49,15 @@ import type {
 } from '@/composables/queue/useJobList'
 import type { MenuEntry } from '@/composables/queue/useJobMenu'
 import { useJobMenu } from '@/composables/queue/useJobMenu'
+import { useErrorHandling } from '@/composables/useErrorHandling'
 
 import QueueOverlayHeader from './QueueOverlayHeader.vue'
 import JobContextMenu from './job/JobContextMenu.vue'
+import JobAssetsList from './job/JobAssetsList.vue'
 import JobFiltersBar from './job/JobFiltersBar.vue'
-import JobGroupsList from './job/JobGroupsList.vue'
 
 defineProps<{
   headerTitle: string
-  showConcurrentIndicator: boolean
-  concurrentWorkflowCount: number
   queuedCount: number
   selectedJobTab: JobTab
   selectedWorkflowFilter: 'all' | 'current'
@@ -112,10 +78,9 @@ const emit = defineEmits<{
   (e: 'viewItem', item: JobListItem): void
 }>()
 
-const { t } = useI18n()
-
 const currentMenuItem = ref<JobListItem | null>(null)
 const jobContextMenuRef = ref<InstanceType<typeof JobContextMenu> | null>(null)
+const { wrapWithErrorHandlingAsync } = useErrorHandling()
 
 const { jobMenuEntries } = useJobMenu(
   () => currentMenuItem.value,
@@ -135,9 +100,9 @@ const onMenuItem = (item: JobListItem, event: Event) => {
   jobContextMenuRef.value?.open(event)
 }
 
-const onJobMenuAction = async (entry: MenuEntry) => {
+const onJobMenuAction = wrapWithErrorHandlingAsync(async (entry: MenuEntry) => {
   if (entry.kind === 'divider') return
   if (entry.onClick) await entry.onClick()
   jobContextMenuRef.value?.hide()
-}
+})
 </script>
diff --git a/src/components/queue/QueueOverlayHeader.test.ts b/src/components/queue/QueueOverlayHeader.test.ts
index 2a64cdc6f3..858e62f88f 100644
--- a/src/components/queue/QueueOverlayHeader.test.ts
+++ b/src/components/queue/QueueOverlayHeader.test.ts
@@ -1,28 +1,52 @@
 import { mount } from '@vue/test-utils'
-import { describe, expect, it, vi } from 'vitest'
-import { createI18n } from 'vue-i18n'
-import { defineComponent } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { defineComponent, h } from 'vue'
 
-const popoverToggleSpy = vi.fn()
-const popoverHideSpy = vi.fn()
+import { i18n } from '@/i18n'
 
-vi.mock('primevue/popover', () => {
+const popoverCloseSpy = vi.fn()
+
+vi.mock('@/components/ui/Popover.vue', () => {
   const PopoverStub = defineComponent({
     name: 'Popover',
-    setup(_, { slots, expose }) {
-      const toggle = (event: Event) => {
-        popoverToggleSpy(event)
-      }
-      const hide = () => {
-        popoverHideSpy()
-      }
-      expose({ toggle, hide })
-      return () => slots.default?.()
+    setup(_, { slots }) {
+      return () =>
+        h('div', [
+          slots.button?.(),
+          slots.default?.({
+            close: () => {
+              popoverCloseSpy()
+            }
+          })
+        ])
     }
   })
   return { default: PopoverStub }
 })
 
+const mockGetSetting = vi.fn<(key: string) => boolean | undefined>((key) =>
+  key === 'Comfy.Queue.QPOV2' || key === 'Comfy.Queue.ShowRunProgressBar'
+    ? true
+    : undefined
+)
+const mockSetSetting = vi.fn()
+const mockSetMany = vi.fn()
+const mockSidebarTabStore = {
+  activeSidebarTabId: null as string | null
+}
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: () => ({
+    get: mockGetSetting,
+    set: mockSetSetting,
+    setMany: mockSetMany
+  })
+}))
+
+vi.mock('@/stores/workspace/sidebarTabStore', () => ({
+  useSidebarTabStore: () => mockSidebarTabStore
+}))
+
 import QueueOverlayHeader from './QueueOverlayHeader.vue'
 import * as tooltipConfig from '@/composables/useTooltipConfig'
 
@@ -31,29 +55,11 @@ const tooltipDirectiveStub = {
   updated: vi.fn()
 }
 
-const i18n = createI18n({
-  legacy: false,
-  locale: 'en',
-  messages: {
-    en: {
-      g: { more: 'More' },
-      sideToolbar: {
-        queueProgressOverlay: {
-          running: 'running',
-          moreOptions: 'More options',
-          clearHistory: 'Clear history'
-        }
-      }
-    }
-  }
-})
-
 const mountHeader = (props = {}) =>
   mount(QueueOverlayHeader, {
     props: {
       headerTitle: 'Job queue',
-      showConcurrentIndicator: true,
-      concurrentWorkflowCount: 2,
+      queuedCount: 3,
       ...props
     },
     global: {
@@ -63,36 +69,140 @@ const mountHeader = (props = {}) =>
   })
 
 describe('QueueOverlayHeader', () => {
-  it('renders header title and concurrent indicator when enabled', () => {
-    const wrapper = mountHeader({ concurrentWorkflowCount: 3 })
-
-    expect(wrapper.text()).toContain('Job queue')
-    const indicator = wrapper.find('.inline-flex.items-center.gap-1')
-    expect(indicator.exists()).toBe(true)
-    expect(indicator.text()).toContain('3')
-    expect(indicator.text()).toContain('running')
+  beforeEach(() => {
+    i18n.global.locale.value = 'en'
+    popoverCloseSpy.mockClear()
+    mockSetSetting.mockClear()
+    mockSetMany.mockClear()
+    mockSidebarTabStore.activeSidebarTabId = null
+    mockGetSetting.mockImplementation((key: string) =>
+      key === 'Comfy.Queue.QPOV2' ? true : undefined
+    )
   })
 
-  it('hides concurrent indicator when flag is false', () => {
-    const wrapper = mountHeader({ showConcurrentIndicator: false })
-
+  it('renders header title', () => {
+    const wrapper = mountHeader()
     expect(wrapper.text()).toContain('Job queue')
-    expect(wrapper.find('.inline-flex.items-center.gap-1').exists()).toBe(false)
   })
 
-  it('toggles popover and emits clear history', async () => {
+  it('shows clear queue text and emits clear queued', async () => {
+    const wrapper = mountHeader({ queuedCount: 4 })
+
+    expect(wrapper.text()).toContain('Clear queue')
+    expect(wrapper.text()).not.toContain('4 queued')
+
+    const clearQueuedButton = wrapper.get('button[aria-label="Clear queued"]')
+    await clearQueuedButton.trigger('click')
+    expect(wrapper.emitted('clearQueued')).toHaveLength(1)
+  })
+
+  it('disables clear queued button when queued count is zero', () => {
+    const wrapper = mountHeader({ queuedCount: 0 })
+    const clearQueuedButton = wrapper.get('button[aria-label="Clear queued"]')
+
+    expect(clearQueuedButton.attributes('disabled')).toBeDefined()
+    expect(wrapper.text()).toContain('Clear queue')
+  })
+
+  it('emits clear history from the menu', async () => {
     const spy = vi.spyOn(tooltipConfig, 'buildTooltipConfig')
 
     const wrapper = mountHeader()
 
-    const moreButton = wrapper.get('button[aria-label="More options"]')
-    await moreButton.trigger('click')
-    expect(popoverToggleSpy).toHaveBeenCalledTimes(1)
+    expect(wrapper.find('button[aria-label="More options"]').exists()).toBe(
+      true
+    )
     expect(spy).toHaveBeenCalledWith('More')
 
-    const clearHistoryButton = wrapper.get('button[aria-label="Clear history"]')
+    const clearHistoryButton = wrapper.get(
+      '[data-testid="clear-history-action"]'
+    )
     await clearHistoryButton.trigger('click')
-    expect(popoverHideSpy).toHaveBeenCalledTimes(1)
+    expect(popoverCloseSpy).toHaveBeenCalledTimes(1)
     expect(wrapper.emitted('clearHistory')).toHaveLength(1)
   })
+
+  it('opens floating queue progress overlay when disabling from the menu', async () => {
+    const wrapper = mountHeader()
+
+    const dockedJobHistoryButton = wrapper.get(
+      '[data-testid="docked-job-history-action"]'
+    )
+    await dockedJobHistoryButton.trigger('click')
+
+    expect(popoverCloseSpy).toHaveBeenCalledTimes(1)
+    expect(mockSetMany).toHaveBeenCalledTimes(1)
+    expect(mockSetMany).toHaveBeenCalledWith({
+      'Comfy.Queue.QPOV2': false,
+      'Comfy.Queue.History.Expanded': true
+    })
+    expect(mockSetSetting).not.toHaveBeenCalled()
+    expect(mockSidebarTabStore.activeSidebarTabId).toBe(null)
+  })
+
+  it('opens docked job history sidebar when enabling from the menu', async () => {
+    mockGetSetting.mockImplementation((key: string) =>
+      key === 'Comfy.Queue.QPOV2' ? false : undefined
+    )
+    const wrapper = mountHeader()
+
+    const dockedJobHistoryButton = wrapper.get(
+      '[data-testid="docked-job-history-action"]'
+    )
+    await dockedJobHistoryButton.trigger('click')
+
+    expect(popoverCloseSpy).toHaveBeenCalledTimes(1)
+    expect(mockSetSetting).toHaveBeenCalledTimes(1)
+    expect(mockSetSetting).toHaveBeenCalledWith('Comfy.Queue.QPOV2', true)
+    expect(mockSetMany).not.toHaveBeenCalled()
+    expect(mockSidebarTabStore.activeSidebarTabId).toBe('job-history')
+  })
+
+  it('keeps docked target open even when enabling persistence fails', async () => {
+    mockGetSetting.mockImplementation((key: string) =>
+      key === 'Comfy.Queue.QPOV2' ? false : undefined
+    )
+    mockSetSetting.mockRejectedValueOnce(new Error('persistence failed'))
+    const wrapper = mountHeader()
+
+    const dockedJobHistoryButton = wrapper.get(
+      '[data-testid="docked-job-history-action"]'
+    )
+    await dockedJobHistoryButton.trigger('click')
+
+    expect(popoverCloseSpy).toHaveBeenCalledTimes(1)
+    expect(mockSetSetting).toHaveBeenCalledWith('Comfy.Queue.QPOV2', true)
+    expect(mockSidebarTabStore.activeSidebarTabId).toBe('job-history')
+  })
+
+  it('closes the menu when disabling persistence fails', async () => {
+    mockSetMany.mockRejectedValueOnce(new Error('persistence failed'))
+    const wrapper = mountHeader()
+
+    const dockedJobHistoryButton = wrapper.get(
+      '[data-testid="docked-job-history-action"]'
+    )
+    await dockedJobHistoryButton.trigger('click')
+
+    expect(popoverCloseSpy).toHaveBeenCalledTimes(1)
+    expect(mockSetMany).toHaveBeenCalledWith({
+      'Comfy.Queue.QPOV2': false,
+      'Comfy.Queue.History.Expanded': true
+    })
+  })
+
+  it('toggles show run progress bar setting from the menu', async () => {
+    const wrapper = mountHeader()
+
+    const showRunProgressBarButton = wrapper.get(
+      '[data-testid="show-run-progress-bar-action"]'
+    )
+    await showRunProgressBarButton.trigger('click')
+
+    expect(mockSetSetting).toHaveBeenCalledTimes(1)
+    expect(mockSetSetting).toHaveBeenCalledWith(
+      'Comfy.Queue.ShowRunProgressBar',
+      false
+    )
+  })
 })
diff --git a/src/components/queue/QueueOverlayHeader.vue b/src/components/queue/QueueOverlayHeader.vue
index 9ae82346a3..d7a427fe86 100644
--- a/src/components/queue/QueueOverlayHeader.vue
+++ b/src/components/queue/QueueOverlayHeader.vue
@@ -1,99 +1,51 @@
 <template>
   <div
-    class="flex h-12 items-center justify-between gap-2 border-b border-interface-stroke px-2"
+    class="flex h-12 items-center gap-2 border-b border-interface-stroke px-2"
   >
-    <div class="px-2 text-[14px] font-normal text-text-primary">
+    <div class="min-w-0 flex-1 px-2 text-[14px] font-normal text-text-primary">
       <span>{{ headerTitle }}</span>
-      <span
-        v-if="showConcurrentIndicator"
-        class="ml-4 inline-flex items-center gap-1 text-blue-100"
-      >
-        <span class="inline-block size-2 rounded-full bg-blue-100" />
-        <span>
-          <span class="font-bold">{{ concurrentWorkflowCount }}</span>
-          <span class="ml-1">{{
-            t('sideToolbar.queueProgressOverlay.running')
-          }}</span>
-        </span>
-      </span>
     </div>
-    <div v-if="!isCloud" class="flex items-center gap-1">
+    <div
+      class="inline-flex h-6 items-center gap-2 text-[12px] leading-none text-text-primary"
+    >
+      <span :class="{ 'opacity-50': queuedCount === 0 }">{{
+        t('sideToolbar.queueProgressOverlay.clearQueueTooltip')
+      }}</span>
       <Button
-        v-tooltip.top="moreTooltipConfig"
-        variant="textonly"
+        v-tooltip.top="clearAllJobsTooltip"
+        variant="destructive"
         size="icon"
-        :aria-label="t('sideToolbar.queueProgressOverlay.moreOptions')"
-        @click="onMoreClick"
+        :aria-label="t('sideToolbar.queueProgressOverlay.clearQueued')"
+        :disabled="queuedCount === 0"
+        @click="$emit('clearQueued')"
       >
-        <i
-          class="icon-[lucide--more-horizontal] block size-4 leading-none text-text-secondary"
-        />
+        <i class="icon-[lucide--list-x] size-4" />
       </Button>
-      <Popover
-        ref="morePopoverRef"
-        :dismissable="true"
-        :close-on-escape="true"
-        unstyled
-        :pt="{
-          root: { class: 'absolute z-50' },
-          content: {
-            class: [
-              'bg-transparent border-none p-0 pt-2 rounded-lg shadow-lg font-inter'
-            ]
-          }
-        }"
-      >
-        <div
-          class="flex flex-col items-stretch rounded-lg border border-interface-stroke bg-interface-panel-surface px-2 py-3 font-inter"
-        >
-          <Button
-            class="w-full justify-start"
-            variant="textonly"
-            size="sm"
-            :aria-label="t('sideToolbar.queueProgressOverlay.clearHistory')"
-            @click="onClearHistoryFromMenu"
-          >
-            <i class="icon-[lucide--file-x-2] size-4 text-muted" />
-            <span>{{
-              t('sideToolbar.queueProgressOverlay.clearHistory')
-            }}</span>
-          </Button>
-        </div>
-      </Popover>
     </div>
+    <JobHistoryActionsMenu @clear-history="$emit('clearHistory')" />
   </div>
 </template>
 
 <script setup lang="ts">
-import Popover from 'primevue/popover'
-import type { PopoverMethods } from 'primevue/popover'
-import { computed, ref } from 'vue'
+import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 
+import JobHistoryActionsMenu from '@/components/queue/JobHistoryActionsMenu.vue'
 import Button from '@/components/ui/button/Button.vue'
 import { buildTooltipConfig } from '@/composables/useTooltipConfig'
-import { isCloud } from '@/platform/distribution/types'
 
 defineProps<{
   headerTitle: string
-  showConcurrentIndicator: boolean
-  concurrentWorkflowCount: number
+  queuedCount: number
 }>()
 
-const emit = defineEmits<{
+defineEmits<{
   (e: 'clearHistory'): void
+  (e: 'clearQueued'): void
 }>()
 
 const { t } = useI18n()
-
-const morePopoverRef = ref<PopoverMethods | null>(null)
-const moreTooltipConfig = computed(() => buildTooltipConfig(t('g.more')))
-
-const onMoreClick = (event: MouseEvent) => {
-  morePopoverRef.value?.toggle(event)
-}
-const onClearHistoryFromMenu = () => {
-  morePopoverRef.value?.hide()
-  emit('clearHistory')
-}
+const clearAllJobsTooltip = computed(() =>
+  buildTooltipConfig(t('sideToolbar.queueProgressOverlay.clearAllJobsTooltip'))
+)
 </script>
diff --git a/src/components/queue/QueueProgressOverlay.test.ts b/src/components/queue/QueueProgressOverlay.test.ts
new file mode 100644
index 0000000000..3ed240c897
--- /dev/null
+++ b/src/components/queue/QueueProgressOverlay.test.ts
@@ -0,0 +1,123 @@
+import { createTestingPinia } from '@pinia/testing'
+import { mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { defineComponent } from 'vue'
+
+import QueueProgressOverlay from '@/components/queue/QueueProgressOverlay.vue'
+import { i18n } from '@/i18n'
+import type { JobStatus } from '@/platform/remote/comfyui/jobs/jobTypes'
+import { TaskItemImpl, useQueueStore } from '@/stores/queueStore'
+import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
+
+vi.mock('@/platform/distribution/types', () => ({
+  isCloud: false
+}))
+
+const QueueOverlayExpandedStub = defineComponent({
+  name: 'QueueOverlayExpanded',
+  props: {
+    headerTitle: {
+      type: String,
+      required: true
+    }
+  },
+  template: `
+    <div>
+      <div data-testid="expanded-title">{{ headerTitle }}</div>
+      <button data-testid="show-assets-button" @click="$emit('show-assets')" />
+    </div>
+  `
+})
+
+function createTask(id: string, status: JobStatus): TaskItemImpl {
+  return new TaskItemImpl({
+    id,
+    status,
+    create_time: 0,
+    priority: 0
+  })
+}
+
+const mountComponent = (
+  runningTasks: TaskItemImpl[],
+  pendingTasks: TaskItemImpl[]
+) => {
+  const pinia = createTestingPinia({
+    createSpy: vi.fn,
+    stubActions: false
+  })
+  const queueStore = useQueueStore(pinia)
+  const sidebarTabStore = useSidebarTabStore(pinia)
+  queueStore.runningTasks = runningTasks
+  queueStore.pendingTasks = pendingTasks
+
+  const wrapper = mount(QueueProgressOverlay, {
+    props: {
+      expanded: true
+    },
+    global: {
+      plugins: [pinia, i18n],
+      stubs: {
+        QueueOverlayExpanded: QueueOverlayExpandedStub,
+        QueueOverlayActive: true,
+        ResultGallery: true
+      },
+      directives: {
+        tooltip: () => {}
+      }
+    }
+  })
+
+  return { wrapper, sidebarTabStore }
+}
+
+describe('QueueProgressOverlay', () => {
+  beforeEach(() => {
+    i18n.global.locale.value = 'en'
+  })
+
+  it('shows expanded header with running and queued labels', () => {
+    const { wrapper } = mountComponent(
+      [
+        createTask('running-1', 'in_progress'),
+        createTask('running-2', 'in_progress')
+      ],
+      [createTask('pending-1', 'pending')]
+    )
+
+    expect(wrapper.get('[data-testid="expanded-title"]').text()).toBe(
+      '2 running, 1 queued'
+    )
+  })
+
+  it('shows only running label when queued count is zero', () => {
+    const { wrapper } = mountComponent(
+      [createTask('running-1', 'in_progress')],
+      []
+    )
+
+    expect(wrapper.get('[data-testid="expanded-title"]').text()).toBe(
+      '1 running'
+    )
+  })
+
+  it('shows job queue title when there are no active jobs', () => {
+    const { wrapper } = mountComponent([], [])
+
+    expect(wrapper.get('[data-testid="expanded-title"]').text()).toBe(
+      'Job Queue'
+    )
+  })
+
+  it('toggles the assets sidebar tab when show-assets is clicked', async () => {
+    const { wrapper, sidebarTabStore } = mountComponent([], [])
+
+    expect(sidebarTabStore.activeSidebarTabId).toBe(null)
+
+    await wrapper.get('[data-testid="show-assets-button"]').trigger('click')
+    expect(sidebarTabStore.activeSidebarTabId).toBe('assets')
+
+    await wrapper.get('[data-testid="show-assets-button"]').trigger('click')
+    expect(sidebarTabStore.activeSidebarTabId).toBe(null)
+  })
+})
diff --git a/src/components/queue/QueueProgressOverlay.vue b/src/components/queue/QueueProgressOverlay.vue
index 78efb7a789..ef16c19487 100644
--- a/src/components/queue/QueueProgressOverlay.vue
+++ b/src/components/queue/QueueProgressOverlay.vue
@@ -4,7 +4,7 @@
     :class="['flex', 'justify-end', 'w-full', 'pointer-events-none']"
   >
     <div
-      class="pointer-events-auto flex w-[350px] min-w-[310px] max-h-[60vh] flex-col overflow-hidden rounded-lg border font-inter transition-colors duration-200 ease-in-out"
+      class="pointer-events-auto flex max-h-[60vh] w-[350px] min-w-[310px] flex-col overflow-hidden rounded-lg border font-inter transition-colors duration-200 ease-in-out"
       :class="containerClass"
       @mouseenter="isHovered = true"
       @mouseleave="isHovered = false"
@@ -15,14 +15,12 @@
         v-model:selected-job-tab="selectedJobTab"
         v-model:selected-workflow-filter="selectedWorkflowFilter"
         v-model:selected-sort-mode="selectedSortMode"
-        class="flex-1 min-h-0"
+        class="min-h-0 flex-1"
         :header-title="headerTitle"
-        :show-concurrent-indicator="showConcurrentIndicator"
-        :concurrent-workflow-count="concurrentWorkflowCount"
         :queued-count="queuedCount"
         :displayed-job-groups="displayedJobGroups"
         :has-failed-jobs="hasFailedJobs"
-        @show-assets="openAssetsSidebar"
+        @show-assets="toggleAssetsSidebar"
         @clear-history="onClearHistoryFromMenu"
         @clear-queued="cancelQueuedWorkflows"
         @cancel-item="onCancelItem"
@@ -44,12 +42,6 @@
         @clear-queued="cancelQueuedWorkflows"
         @view-all-jobs="viewAllJobs"
       />
-
-      <QueueOverlayEmpty
-        v-else-if="completionSummary"
-        :summary="completionSummary"
-        @summary-click="onSummaryClick"
-      />
     </div>
   </div>
 
@@ -64,13 +56,11 @@ import { computed, nextTick, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import QueueOverlayActive from '@/components/queue/QueueOverlayActive.vue'
-import QueueOverlayEmpty from '@/components/queue/QueueOverlayEmpty.vue'
 import QueueOverlayExpanded from '@/components/queue/QueueOverlayExpanded.vue'
-import QueueClearHistoryDialog from '@/components/queue/dialogs/QueueClearHistoryDialog.vue'
 import ResultGallery from '@/components/sidebar/tabs/queue/ResultGallery.vue'
-import { useCompletionSummary } from '@/composables/queue/useCompletionSummary'
 import { useJobList } from '@/composables/queue/useJobList'
 import type { JobListItem } from '@/composables/queue/useJobList'
+import { useQueueClearHistoryDialog } from '@/composables/queue/useQueueClearHistoryDialog'
 import { useQueueProgress } from '@/composables/queue/useQueueProgress'
 import { useResultGallery } from '@/composables/queue/useResultGallery'
 import { useErrorHandling } from '@/composables/useErrorHandling'
@@ -79,35 +69,29 @@ import { isCloud } from '@/platform/distribution/types'
 import { api } from '@/scripts/api'
 import { useAssetsStore } from '@/stores/assetsStore'
 import { useCommandStore } from '@/stores/commandStore'
-import { useDialogStore } from '@/stores/dialogStore'
 import { useExecutionStore } from '@/stores/executionStore'
 import { useQueueStore } from '@/stores/queueStore'
 import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
 
-type OverlayState = 'hidden' | 'empty' | 'active' | 'expanded'
+type OverlayState = 'hidden' | 'active' | 'expanded'
 
-const props = withDefaults(
-  defineProps<{
-    expanded?: boolean
-    menuHovered?: boolean
-  }>(),
-  {
-    menuHovered: false
-  }
-)
+const { expanded, menuHovered } = defineProps<{
+  expanded?: boolean
+  menuHovered?: boolean
+}>()
 
 const emit = defineEmits<{
   (e: 'update:expanded', value: boolean): void
 }>()
 
-const { t } = useI18n()
+const { t, n } = useI18n()
 const queueStore = useQueueStore()
 const commandStore = useCommandStore()
 const executionStore = useExecutionStore()
 const sidebarTabStore = useSidebarTabStore()
-const dialogStore = useDialogStore()
 const assetsStore = useAssetsStore()
 const assetSelectionStore = useAssetSelectionStore()
+const { showQueueClearHistoryDialog } = useQueueClearHistoryDialog()
 const { wrapWithErrorHandlingAsync } = useErrorHandling()
 
 const {
@@ -117,39 +101,32 @@ const {
   currentNodeProgressStyle
 } = useQueueProgress()
 const isHovered = ref(false)
-const isOverlayHovered = computed(() => isHovered.value || props.menuHovered)
+const isOverlayHovered = computed(() => isHovered.value || menuHovered)
 const internalExpanded = ref(false)
 const isExpanded = computed({
-  get: () =>
-    props.expanded === undefined ? internalExpanded.value : props.expanded,
+  get: () => (expanded === undefined ? internalExpanded.value : expanded),
   set: (value) => {
-    if (props.expanded === undefined) {
+    if (expanded === undefined) {
       internalExpanded.value = value
     }
     emit('update:expanded', value)
   }
 })
 
-const { summary: completionSummary, clearSummary } = useCompletionSummary()
-const hasCompletionSummary = computed(() => completionSummary.value !== null)
-
 const runningCount = computed(() => queueStore.runningTasks.length)
 const queuedCount = computed(() => queueStore.pendingTasks.length)
 const isExecuting = computed(() => !executionStore.isIdle)
 const hasActiveJob = computed(() => runningCount.value > 0 || isExecuting.value)
-const activeJobsCount = computed(() => runningCount.value + queuedCount.value)
 
 const overlayState = computed<OverlayState>(() => {
   if (isExpanded.value) return 'expanded'
   if (hasActiveJob.value) return 'active'
-  if (hasCompletionSummary.value) return 'empty'
   return 'hidden'
 })
 
 const showBackground = computed(
   () =>
     overlayState.value === 'expanded' ||
-    overlayState.value === 'empty' ||
     (overlayState.value === 'active' && isOverlayHovered.value)
 )
 
@@ -169,18 +146,34 @@ const bottomRowClass = computed(
         : 'opacity-0 pointer-events-none'
     }`
 )
-const headerTitle = computed(() =>
-  hasActiveJob.value
-    ? `${activeJobsCount.value} ${t('sideToolbar.queueProgressOverlay.activeJobsSuffix')}`
-    : t('sideToolbar.queueProgressOverlay.jobQueue')
+const runningJobsLabel = computed(() =>
+  t('sideToolbar.queueProgressOverlay.runningJobsLabel', {
+    count: n(runningCount.value)
+  })
 )
+const queuedJobsLabel = computed(() =>
+  t('sideToolbar.queueProgressOverlay.queuedJobsLabel', {
+    count: n(queuedCount.value)
+  })
+)
+const headerTitle = computed(() => {
+  if (!hasActiveJob.value) {
+    return t('sideToolbar.queueProgressOverlay.jobQueue')
+  }
 
-const concurrentWorkflowCount = computed(
-  () => executionStore.runningWorkflowCount
-)
-const showConcurrentIndicator = computed(
-  () => concurrentWorkflowCount.value > 1
-)
+  if (queuedCount.value === 0) {
+    return runningJobsLabel.value
+  }
+
+  if (runningCount.value === 0) {
+    return queuedJobsLabel.value
+  }
+
+  return t('sideToolbar.queueProgressOverlay.runningQueuedSummary', {
+    running: runningJobsLabel.value,
+    queued: queuedJobsLabel.value
+  })
+})
 
 const {
   selectedJobTab,
@@ -195,16 +188,22 @@ const {
 const displayedJobGroups = computed(() => groupedJobItems.value)
 
 const onCancelItem = wrapWithErrorHandlingAsync(async (item: JobListItem) => {
-  const promptId = item.taskRef?.promptId
-  if (!promptId) return
+  const jobId = item.taskRef?.jobId
+  if (!jobId) return
 
   if (item.state === 'running' || item.state === 'initialization') {
     // Running/initializing jobs: interrupt execution
-    await api.interrupt(promptId)
+    // Cloud backend uses deleteItem, local uses interrupt
+    if (isCloud) {
+      await api.deleteItem('queue', jobId)
+    } else {
+      await api.interrupt(jobId)
+    }
+    executionStore.clearInitializationByJobId(jobId)
     await queueStore.update()
   } else if (item.state === 'pending') {
     // Pending jobs: remove from queue
-    await api.deleteItem('queue', promptId)
+    await api.deleteItem('queue', jobId)
     await queueStore.update()
   }
 })
@@ -224,17 +223,12 @@ const setExpanded = (expanded: boolean) => {
   isExpanded.value = expanded
 }
 
-const openExpandedFromEmpty = () => {
-  setExpanded(true)
-}
-
 const viewAllJobs = () => {
   setExpanded(true)
 }
 
-const onSummaryClick = () => {
-  openExpandedFromEmpty()
-  clearSummary()
+const toggleAssetsSidebar = () => {
+  sidebarTabStore.toggleSidebarTab('assets')
 }
 
 const openAssetsSidebar = () => {
@@ -243,11 +237,11 @@ const openAssetsSidebar = () => {
 
 const focusAssetInSidebar = async (item: JobListItem) => {
   const task = item.taskRef
-  const promptId = task?.promptId
+  const jobId = task?.jobId
   const preview = task?.previewOutput
-  if (!promptId || !preview) return
+  if (!jobId || !preview) return
 
-  const assetId = String(promptId)
+  const assetId = String(jobId)
   openAssetsSidebar()
   await nextTick()
   await assetsStore.updateHistory()
@@ -258,60 +252,52 @@ const focusAssetInSidebar = async (item: JobListItem) => {
     throw new Error('Asset not found in media assets panel')
   }
   assetSelectionStore.setSelection([assetId])
+  assetSelectionStore.setLastSelectedAssetId(assetId)
 }
 
 const inspectJobAsset = wrapWithErrorHandlingAsync(
   async (item: JobListItem) => {
-    openResultGallery(item)
+    await openResultGallery(item)
     await focusAssetInSidebar(item)
   }
 )
 
 const cancelQueuedWorkflows = wrapWithErrorHandlingAsync(async () => {
+  // Capture pending jobIds before clearing
+  const pendingJobIds = queueStore.pendingTasks
+    .map((task) => task.jobId)
+    .filter((id): id is string => typeof id === 'string' && id.length > 0)
+
   await commandStore.execute('Comfy.ClearPendingTasks')
+
+  // Clear initialization state for removed jobs
+  executionStore.clearInitializationByJobIds(pendingJobIds)
 })
 
 const interruptAll = wrapWithErrorHandlingAsync(async () => {
   const tasks = queueStore.runningTasks
-  const promptIds = tasks
-    .map((task) => task.promptId)
+  const jobIds = tasks
+    .map((task) => task.jobId)
     .filter((id): id is string => typeof id === 'string' && id.length > 0)
 
-  if (!promptIds.length) return
+  if (!jobIds.length) return
 
   // Cloud backend supports cancelling specific jobs via /queue delete,
   // while /interrupt always targets the "first" job. Use the targeted API
   // on cloud to ensure we cancel the workflow the user clicked.
   if (isCloud) {
-    await Promise.all(promptIds.map((id) => api.deleteItem('queue', id)))
+    await Promise.all(jobIds.map((id) => api.deleteItem('queue', id)))
+    executionStore.clearInitializationByJobIds(jobIds)
+    await queueStore.update()
     return
   }
 
-  await Promise.all(promptIds.map((id) => api.interrupt(id)))
+  await Promise.all(jobIds.map((id) => api.interrupt(id)))
+  executionStore.clearInitializationByJobIds(jobIds)
+  await queueStore.update()
 })
 
-const showClearHistoryDialog = () => {
-  dialogStore.showDialog({
-    key: 'queue-clear-history',
-    component: QueueClearHistoryDialog,
-    dialogComponentProps: {
-      headless: true,
-      closable: false,
-      closeOnEscape: true,
-      dismissableMask: true,
-      pt: {
-        root: {
-          class: 'max-w-[360px] w-auto bg-transparent border-none shadow-none'
-        },
-        content: {
-          class: '!p-0 bg-transparent'
-        }
-      }
-    }
-  })
-}
-
 const onClearHistoryFromMenu = () => {
-  showClearHistoryDialog()
+  showQueueClearHistoryDialog()
 }
 </script>
diff --git a/src/components/queue/dialogs/QueueClearHistoryDialog.vue b/src/components/queue/dialogs/QueueClearHistoryDialog.vue
index 0884dcf6fc..4fb9bacc3f 100644
--- a/src/components/queue/dialogs/QueueClearHistoryDialog.vue
+++ b/src/components/queue/dialogs/QueueClearHistoryDialog.vue
@@ -1,11 +1,11 @@
 <template>
   <section
-    class="w-[360px] rounded-2xl border border-interface-stroke bg-interface-panel-surface text-text-primary shadow-interface font-inter"
+    class="w-[360px] rounded-2xl border border-interface-stroke bg-interface-panel-surface font-inter text-text-primary shadow-interface"
   >
     <header
-      class="flex items-center justify-between border-b border-interface-stroke px-4 py-4"
+      class="flex items-center justify-between border-b border-interface-stroke p-4"
     >
-      <p class="m-0 text-[14px] font-normal leading-none">
+      <p class="m-0 text-[14px] leading-none font-normal">
         {{ t('sideToolbar.queueProgressOverlay.clearHistoryDialogTitle') }}
       </p>
       <Button
@@ -18,7 +18,7 @@
       </Button>
     </header>
 
-    <div class="flex flex-col gap-4 px-4 py-4 text-[14px] text-text-secondary">
+    <div class="flex flex-col gap-4 p-4 text-[14px] text-text-secondary">
       <p class="m-0">
         {{
           t('sideToolbar.queueProgressOverlay.clearHistoryDialogDescription')
@@ -29,7 +29,7 @@
       </p>
     </div>
 
-    <footer class="flex items-center justify-end px-4 py-4">
+    <footer class="flex items-center justify-end p-4">
       <div class="flex items-center gap-4 leading-none">
         <Button variant="muted-textonly" size="lg" @click="onCancel">
           {{ t('g.cancel') }}
diff --git a/src/components/queue/job/JobAssetsList.test.ts b/src/components/queue/job/JobAssetsList.test.ts
new file mode 100644
index 0000000000..aa09a96615
--- /dev/null
+++ b/src/components/queue/job/JobAssetsList.test.ts
@@ -0,0 +1,146 @@
+import { mount } from '@vue/test-utils'
+import { describe, expect, it, vi } from 'vitest'
+
+import type { JobGroup, JobListItem } from '@/composables/queue/useJobList'
+import type { JobListItem as ApiJobListItem } from '@/platform/remote/comfyui/jobs/jobTypes'
+import { ResultItemImpl, TaskItemImpl } from '@/stores/queueStore'
+
+import JobAssetsList from './JobAssetsList.vue'
+
+vi.mock('vue-i18n', () => {
+  return {
+    createI18n: () => ({
+      global: {
+        t: (key: string) => key,
+        te: () => true,
+        d: (value: string) => value
+      }
+    }),
+    useI18n: () => ({
+      t: (key: string) => key
+    })
+  }
+})
+
+const createResultItem = (
+  filename: string,
+  mediaType: string = 'images'
+): ResultItemImpl => {
+  const item = new ResultItemImpl({
+    filename,
+    subfolder: '',
+    type: 'output',
+    nodeId: 'node-1',
+    mediaType
+  })
+  Object.defineProperty(item, 'url', {
+    get: () => `/api/view/${filename}`
+  })
+  return item
+}
+
+const createTaskRef = (preview?: ResultItemImpl): TaskItemImpl => {
+  const job: ApiJobListItem = {
+    id: `task-${Math.random().toString(36).slice(2)}`,
+    status: 'completed',
+    create_time: Date.now(),
+    preview_output: null,
+    outputs_count: preview ? 1 : 0,
+    priority: 0
+  }
+  const flatOutputs = preview ? [preview] : []
+  return new TaskItemImpl(job, {}, flatOutputs)
+}
+
+const buildJob = (overrides: Partial<JobListItem> = {}): JobListItem => ({
+  id: 'job-1',
+  title: 'Job 1',
+  meta: 'meta',
+  state: 'completed',
+  taskRef: createTaskRef(createResultItem('job-1.png')),
+  ...overrides
+})
+
+const mountJobAssetsList = (jobs: JobListItem[]) => {
+  const displayedJobGroups: JobGroup[] = [
+    {
+      key: 'group-1',
+      label: 'Group 1',
+      items: jobs
+    }
+  ]
+
+  return mount(JobAssetsList, {
+    props: { displayedJobGroups }
+  })
+}
+
+describe('JobAssetsList', () => {
+  it('emits viewItem on preview-click for completed jobs with preview', async () => {
+    const job = buildJob()
+    const wrapper = mountJobAssetsList([job])
+
+    const listItem = wrapper.findComponent({ name: 'AssetsListItem' })
+    listItem.vm.$emit('preview-click')
+    await wrapper.vm.$nextTick()
+
+    expect(wrapper.emitted('viewItem')).toEqual([[job]])
+  })
+
+  it('emits viewItem on double-click for completed jobs with preview', async () => {
+    const job = buildJob()
+    const wrapper = mountJobAssetsList([job])
+
+    const listItem = wrapper.findComponent({ name: 'AssetsListItem' })
+    await listItem.trigger('dblclick')
+    await wrapper.vm.$nextTick()
+
+    expect(wrapper.emitted('viewItem')).toEqual([[job]])
+  })
+
+  it('emits viewItem on double-click for completed video jobs without icon image', async () => {
+    const job = buildJob({
+      iconImageUrl: undefined,
+      taskRef: createTaskRef(createResultItem('job-1.webm', 'video'))
+    })
+    const wrapper = mountJobAssetsList([job])
+
+    const listItem = wrapper.findComponent({ name: 'AssetsListItem' })
+    expect(listItem.props('previewUrl')).toBe('/api/view/job-1.webm')
+    expect(listItem.props('isVideoPreview')).toBe(true)
+
+    await listItem.trigger('dblclick')
+    await wrapper.vm.$nextTick()
+
+    expect(wrapper.emitted('viewItem')).toEqual([[job]])
+  })
+
+  it('emits viewItem on icon click for completed 3D jobs without preview tile', async () => {
+    const job = buildJob({
+      iconImageUrl: undefined,
+      taskRef: createTaskRef(createResultItem('job-1.glb', 'model'))
+    })
+    const wrapper = mountJobAssetsList([job])
+
+    const listItem = wrapper.findComponent({ name: 'AssetsListItem' })
+
+    await listItem.find('i').trigger('click')
+    await wrapper.vm.$nextTick()
+
+    expect(wrapper.emitted('viewItem')).toEqual([[job]])
+  })
+
+  it('does not emit viewItem on double-click for non-completed jobs', async () => {
+    const job = buildJob({
+      state: 'running',
+      taskRef: createTaskRef(createResultItem('job-1.png'))
+    })
+    const wrapper = mountJobAssetsList([job])
+
+    const listItem = wrapper.findComponent({ name: 'AssetsListItem' })
+    await listItem.trigger('dblclick')
+    await wrapper.vm.$nextTick()
+
+    expect(wrapper.emitted('viewItem')).toBeUndefined()
+  })
+})
diff --git a/src/components/queue/job/JobAssetsList.vue b/src/components/queue/job/JobAssetsList.vue
new file mode 100644
index 0000000000..3c7b6effbb
--- /dev/null
+++ b/src/components/queue/job/JobAssetsList.vue
@@ -0,0 +1,135 @@
+<template>
+  <div class="flex flex-col gap-4 px-3 pb-4">
+    <div
+      v-for="group in displayedJobGroups"
+      :key="group.key"
+      class="flex flex-col gap-2"
+    >
+      <div class="text-xs leading-none text-text-secondary">
+        {{ group.label }}
+      </div>
+      <AssetsListItem
+        v-for="job in group.items"
+        :key="job.id"
+        class="w-full shrink-0 cursor-default text-text-primary transition-colors hover:bg-secondary-background-hover"
+        :preview-url="getJobPreviewUrl(job)"
+        :is-video-preview="isVideoPreviewJob(job)"
+        :preview-alt="job.title"
+        :icon-name="job.iconName ?? iconForJobState(job.state)"
+        :icon-class="getJobIconClass(job)"
+        :primary-text="job.title"
+        :secondary-text="job.meta"
+        :progress-total-percent="job.progressTotalPercent"
+        :progress-current-percent="job.progressCurrentPercent"
+        @mouseenter="hoveredJobId = job.id"
+        @mouseleave="onJobLeave(job.id)"
+        @contextmenu.prevent.stop="$emit('menu', job, $event)"
+        @dblclick.stop="emitViewItem(job)"
+        @preview-click="emitViewItem(job)"
+        @click.stop
+      >
+        <template v-if="hoveredJobId === job.id" #actions>
+          <Button
+            v-if="isCancelable(job)"
+            variant="destructive"
+            size="icon"
+            :aria-label="t('g.cancel')"
+            @click.stop="$emit('cancelItem', job)"
+          >
+            <i class="icon-[lucide--x] size-4" />
+          </Button>
+          <Button
+            v-else-if="isFailedDeletable(job)"
+            variant="destructive"
+            size="icon"
+            :aria-label="t('g.delete')"
+            @click.stop="$emit('deleteItem', job)"
+          >
+            <i class="icon-[lucide--trash-2] size-4" />
+          </Button>
+          <Button
+            v-else-if="job.state === 'completed'"
+            variant="textonly"
+            size="sm"
+            @click.stop="$emit('viewItem', job)"
+          >
+            {{ t('menuLabels.View') }}
+          </Button>
+          <Button
+            variant="secondary"
+            size="icon"
+            :aria-label="t('g.more')"
+            @click.stop="$emit('menu', job, $event)"
+          >
+            <i class="icon-[lucide--ellipsis] size-4" />
+          </Button>
+        </template>
+      </AssetsListItem>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useI18n } from 'vue-i18n'
+import { ref } from 'vue'
+
+import Button from '@/components/ui/button/Button.vue'
+import type { JobGroup, JobListItem } from '@/composables/queue/useJobList'
+import AssetsListItem from '@/platform/assets/components/AssetsListItem.vue'
+import { iconForJobState } from '@/utils/queueDisplay'
+import { isActiveJobState } from '@/utils/queueUtil'
+
+defineProps<{ displayedJobGroups: JobGroup[] }>()
+
+const emit = defineEmits<{
+  (e: 'cancelItem', item: JobListItem): void
+  (e: 'deleteItem', item: JobListItem): void
+  (e: 'menu', item: JobListItem, ev: MouseEvent): void
+  (e: 'viewItem', item: JobListItem): void
+}>()
+
+const { t } = useI18n()
+const hoveredJobId = ref<string | null>(null)
+
+const onJobLeave = (jobId: string) => {
+  if (hoveredJobId.value === jobId) {
+    hoveredJobId.value = null
+  }
+}
+
+const isCancelable = (job: JobListItem) =>
+  job.showClear !== false && isActiveJobState(job.state)
+
+const isFailedDeletable = (job: JobListItem) =>
+  job.showClear !== false && job.state === 'failed'
+
+const getPreviewOutput = (job: JobListItem) => job.taskRef?.previewOutput
+
+const getJobPreviewUrl = (job: JobListItem) => {
+  const preview = getPreviewOutput(job)
+  if (preview?.isImage || preview?.isVideo) {
+    return preview.url
+  }
+  return job.iconImageUrl
+}
+
+const isVideoPreviewJob = (job: JobListItem) =>
+  job.state === 'completed' && !!getPreviewOutput(job)?.isVideo
+
+const isPreviewableCompletedJob = (job: JobListItem) =>
+  job.state === 'completed' && !!getPreviewOutput(job)
+
+const emitViewItem = (job: JobListItem) => {
+  if (isPreviewableCompletedJob(job)) {
+    emit('viewItem', job)
+  }
+}
+
+const getJobIconClass = (job: JobListItem): string | undefined => {
+  const iconName = job.iconName ?? iconForJobState(job.state)
+  if (!job.iconImageUrl && iconName === iconForJobState('pending')) {
+    return 'animate-spin'
+  }
+  return undefined
+}
+</script>
diff --git a/src/components/queue/job/JobContextMenu.test.ts b/src/components/queue/job/JobContextMenu.test.ts
new file mode 100644
index 0000000000..57c248e70d
--- /dev/null
+++ b/src/components/queue/job/JobContextMenu.test.ts
@@ -0,0 +1,81 @@
+import { mount } from '@vue/test-utils'
+import { describe, expect, it, vi } from 'vitest'
+
+import JobContextMenu from '@/components/queue/job/JobContextMenu.vue'
+import type { MenuEntry } from '@/composables/queue/useJobMenu'
+
+const buttonStub = {
+  props: {
+    disabled: {
+      type: Boolean,
+      default: false
+    }
+  },
+  template: `
+    <div
+      class="button-stub"
+      :data-disabled="String(disabled)"
+    >
+      <slot />
+    </div>
+  `
+}
+
+const createEntries = (): MenuEntry[] => [
+  { key: 'enabled', label: 'Enabled action', onClick: vi.fn() },
+  {
+    key: 'disabled',
+    label: 'Disabled action',
+    disabled: true,
+    onClick: vi.fn()
+  },
+  { kind: 'divider', key: 'divider-1' }
+]
+
+const mountComponent = (entries: MenuEntry[]) =>
+  mount(JobContextMenu, {
+    props: { entries },
+    global: {
+      stubs: {
+        Popover: {
+          template: '<div class="popover-stub"><slot /></div>'
+        },
+        Button: buttonStub
+      }
+    }
+  })
+
+describe('JobContextMenu', () => {
+  it('passes disabled state to action buttons', () => {
+    const wrapper = mountComponent(createEntries())
+
+    const buttons = wrapper.findAll('.button-stub')
+    expect(buttons).toHaveLength(2)
+    expect(buttons[0].attributes('data-disabled')).toBe('false')
+    expect(buttons[1].attributes('data-disabled')).toBe('true')
+  })
+
+  it('emits action for enabled entries', async () => {
+    const entries = createEntries()
+    const wrapper = mountComponent(entries)
+
+    await wrapper.findAll('.button-stub')[0].trigger('click')
+
+    expect(wrapper.emitted('action')).toEqual([[entries[0]]])
+  })
+
+  it('does not emit action for disabled entries', async () => {
+    const wrapper = mountComponent([
+      {
+        key: 'disabled',
+        label: 'Disabled action',
+        disabled: true,
+        onClick: vi.fn()
+      }
+    ])
+
+    await wrapper.get('.button-stub').trigger('click')
+
+    expect(wrapper.emitted('action')).toBeUndefined()
+  })
+})
diff --git a/src/components/queue/job/JobContextMenu.vue b/src/components/queue/job/JobContextMenu.vue
index 5ed96ad9ec..dc43c5ceb6 100644
--- a/src/components/queue/job/JobContextMenu.vue
+++ b/src/components/queue/job/JobContextMenu.vue
@@ -14,7 +14,7 @@
     }"
   >
     <div
-      class="flex min-w-[14rem] flex-col items-stretch rounded-lg border border-interface-stroke bg-interface-panel-surface px-2 py-3 font-inter"
+      class="flex min-w-56 flex-col items-stretch rounded-lg border border-interface-stroke bg-interface-panel-surface px-2 py-3 font-inter"
     >
       <template v-for="entry in entries" :key="entry.key">
         <div v-if="entry.kind === 'divider'" class="px-2 py-1">
@@ -26,6 +26,7 @@
           variant="textonly"
           size="sm"
           :aria-label="entry.label"
+          :disabled="entry.disabled"
           @click="onEntry(entry)"
         >
           <i
@@ -68,6 +69,7 @@ function hide() {
 }
 
 function onEntry(entry: MenuEntry) {
+  if (entry.kind === 'divider' || entry.disabled) return
   emit('action', entry)
 }
 
diff --git a/src/components/queue/job/JobDetailsPopover.stories.ts b/src/components/queue/job/JobDetailsPopover.stories.ts
index 2343a8fa22..3e9d4781b2 100644
--- a/src/components/queue/job/JobDetailsPopover.stories.ts
+++ b/src/components/queue/job/JobDetailsPopover.stories.ts
@@ -1,6 +1,9 @@
 import type { Meta, StoryObj } from '@storybook/vue3-vite'
 
-import type { TaskStatus } from '@/schemas/apiSchema'
+import type {
+  JobListItem,
+  JobStatus
+} from '@/platform/remote/comfyui/jobs/jobTypes'
 import { useExecutionStore } from '@/stores/executionStore'
 import { TaskItemImpl, useQueueStore } from '@/stores/queueStore'
 
@@ -34,94 +37,89 @@ function resetStores() {
   queue.runningTasks = []
   queue.historyTasks = []
 
-  exec.nodeProgressStatesByPrompt = {}
+  exec.nodeProgressStatesByJob = {}
+}
+
+function makeTask(
+  id: string,
+  priority: number,
+  fields: Partial<JobListItem> & { status: JobStatus; create_time: number }
+): TaskItemImpl {
+  const job: JobListItem = {
+    id,
+    priority,
+    last_state_update: null,
+    update_time: fields.create_time,
+    ...fields
+  }
+  return new TaskItemImpl(job)
 }
 
 function makePendingTask(
   id: string,
-  index: number,
-  createTimeMs?: number
+  priority: number,
+  createTimeMs: number
 ): TaskItemImpl {
-  const extraData = {
-    client_id: 'c1',
-    ...(typeof createTimeMs === 'number' ? { create_time: createTimeMs } : {})
-  }
-  return new TaskItemImpl('Pending', [index, id, {}, extraData, []])
+  return makeTask(id, priority, {
+    status: 'pending',
+    create_time: createTimeMs
+  })
 }
 
 function makeRunningTask(
   id: string,
-  index: number,
-  createTimeMs?: number
+  priority: number,
+  createTimeMs: number
 ): TaskItemImpl {
-  const extraData = {
-    client_id: 'c1',
-    ...(typeof createTimeMs === 'number' ? { create_time: createTimeMs } : {})
-  }
-  return new TaskItemImpl('Running', [index, id, {}, extraData, []])
+  return makeTask(id, priority, {
+    status: 'in_progress',
+    create_time: createTimeMs
+  })
 }
 
 function makeRunningTaskWithStart(
   id: string,
-  index: number,
+  priority: number,
   startedSecondsAgo: number
 ): TaskItemImpl {
   const start = Date.now() - startedSecondsAgo * 1000
-  const status: TaskStatus = {
-    status_str: 'success',
-    completed: false,
-    messages: [['execution_start', { prompt_id: id, timestamp: start } as any]]
-  }
-  return new TaskItemImpl(
-    'Running',
-    [index, id, {}, { client_id: 'c1', create_time: start - 5000 }, []],
-    status
-  )
+  return makeTask(id, priority, {
+    status: 'in_progress',
+    create_time: start - 5000,
+    update_time: start
+  })
 }
 
 function makeHistoryTask(
   id: string,
-  index: number,
+  priority: number,
   durationSec: number,
   ok: boolean,
   errorMessage?: string
 ): TaskItemImpl {
-  const start = Date.now() - durationSec * 1000 - 1000
-  const end = start + durationSec * 1000
-  const messages: TaskStatus['messages'] = ok
-    ? [
-        ['execution_start', { prompt_id: id, timestamp: start } as any],
-        ['execution_success', { prompt_id: id, timestamp: end } as any]
-      ]
-    : [
-        ['execution_start', { prompt_id: id, timestamp: start } as any],
-        [
-          'execution_error',
-          {
-            prompt_id: id,
-            timestamp: end,
-            node_id: '1',
-            node_type: 'Node',
-            executed: [],
-            exception_message:
-              errorMessage || 'Demo error: Node failed during execution',
-            exception_type: 'RuntimeError',
-            traceback: [],
-            current_inputs: {},
-            current_outputs: {}
-          } as any
-        ]
-      ]
-  const status: TaskStatus = {
-    status_str: ok ? 'success' : 'error',
-    completed: true,
-    messages
-  }
-  return new TaskItemImpl(
-    'History',
-    [index, id, {}, { client_id: 'c1', create_time: start }, []],
-    status
-  )
+  const now = Date.now()
+  const executionEndTime = now
+  const executionStartTime = now - durationSec * 1000
+  return makeTask(id, priority, {
+    status: ok ? 'completed' : 'failed',
+    create_time: executionStartTime - 5000,
+    update_time: now,
+    execution_start_time: executionStartTime,
+    execution_end_time: executionEndTime,
+    execution_error: errorMessage
+      ? {
+          prompt_id: id,
+          timestamp: now,
+          node_id: '1',
+          node_type: 'ExampleNode',
+          exception_message: errorMessage,
+          exception_type: 'RuntimeError',
+          traceback: [],
+          current_inputs: {},
+          current_outputs: {}
+        }
+      : undefined
+  })
 }
 
 export const Queued: Story = {
@@ -133,20 +131,24 @@ export const Queued: Story = {
       const exec = useExecutionStore()
 
       const jobId = 'job-queued-1'
-      const queueIndex = 104
+      const priority = 104
 
       // Current job in pending
       queue.pendingTasks = [
-        makePendingTask(jobId, queueIndex, Date.now() - 90_000)
+        makePendingTask(jobId, priority, Date.now() - 90_000)
       ]
       // Add some other pending jobs to give context
-      queue.pendingTasks.push(makePendingTask('job-older-1', 100))
-      queue.pendingTasks.push(makePendingTask('job-older-2', 101))
+      queue.pendingTasks.push(
+        makePendingTask('job-older-1', 100, Date.now() - 60_000)
+      )
+      queue.pendingTasks.push(
+        makePendingTask('job-older-2', 101, Date.now() - 30_000)
+      )
 
-      // Queued at (in metadata on prompt[4])
+      // Queued at (in metadata on job tuple)
 
       // One running workflow
-      exec.nodeProgressStatesByPrompt = {
+      exec.nodeProgressStatesByJob = {
         p1: {
           '1': {
             value: 1,
@@ -156,7 +158,7 @@ export const Queued: Story = {
             prompt_id: 'p1'
           }
         }
-      } as any
+      }
 
       return { args: { ...args, jobId } }
     },
@@ -177,13 +179,13 @@ export const QueuedParallel: Story = {
       const exec = useExecutionStore()
 
       const jobId = 'job-queued-parallel'
-      const queueIndex = 210
+      const priority = 210
 
       // Current job in pending with some ahead
       queue.pendingTasks = [
         makePendingTask('job-ahead-1', 200, Date.now() - 180_000),
         makePendingTask('job-ahead-2', 205, Date.now() - 150_000),
-        makePendingTask(jobId, queueIndex, Date.now() - 120_000)
+        makePendingTask(jobId, priority, Date.now() - 120_000)
       ]
 
       // Seen 2 minutes ago - set via prompt metadata above
@@ -196,7 +198,7 @@ export const QueuedParallel: Story = {
       ]
 
       // Two parallel workflows running
-      exec.nodeProgressStatesByPrompt = {
+      exec.nodeProgressStatesByJob = {
         p1: {
           '1': {
             value: 1,
@@ -215,7 +217,7 @@ export const QueuedParallel: Story = {
             prompt_id: 'p2'
           }
         }
-      } as any
+      }
 
       return { args: { ...args, jobId } }
     },
@@ -236,9 +238,9 @@ export const Running: Story = {
       const exec = useExecutionStore()
 
       const jobId = 'job-running-1'
-      const queueIndex = 300
+      const priority = 300
       queue.runningTasks = [
-        makeRunningTask(jobId, queueIndex, Date.now() - 65_000)
+        makeRunningTask(jobId, priority, Date.now() - 65_000)
       ]
       queue.historyTasks = [
         makeHistoryTask('hist-r1', 250, 30, true),
@@ -246,7 +248,7 @@ export const Running: Story = {
         makeHistoryTask('hist-r3', 252, 60, true)
       ]
 
-      exec.nodeProgressStatesByPrompt = {
+      exec.nodeProgressStatesByJob = {
         p1: {
           '1': {
             value: 5,
@@ -256,7 +258,7 @@ export const Running: Story = {
             prompt_id: 'p1'
           }
         }
-      } as any
+      }
 
       return { args: { ...args, jobId } }
     },
@@ -277,10 +279,10 @@ export const QueuedZeroAheadSingleRunning: Story = {
       const exec = useExecutionStore()
 
       const jobId = 'job-queued-zero-ahead-single'
-      const queueIndex = 510
+      const priority = 510
 
       queue.pendingTasks = [
-        makePendingTask(jobId, queueIndex, Date.now() - 45_000)
+        makePendingTask(jobId, priority, Date.now() - 45_000)
       ]
 
       queue.historyTasks = [
@@ -291,7 +293,7 @@ export const QueuedZeroAheadSingleRunning: Story = {
 
       queue.runningTasks = [makeRunningTaskWithStart('running-1', 505, 20)]
 
-      exec.nodeProgressStatesByPrompt = {
+      exec.nodeProgressStatesByJob = {
         p1: {
           '1': {
             value: 1,
@@ -301,7 +303,7 @@ export const QueuedZeroAheadSingleRunning: Story = {
             prompt_id: 'p1'
           }
         }
-      } as any
+      }
 
       return { args: { ...args, jobId } }
     },
@@ -322,10 +324,10 @@ export const QueuedZeroAheadMultiRunning: Story = {
       const exec = useExecutionStore()
 
       const jobId = 'job-queued-zero-ahead-multi'
-      const queueIndex = 520
+      const priority = 520
 
       queue.pendingTasks = [
-        makePendingTask(jobId, queueIndex, Date.now() - 20_000)
+        makePendingTask(jobId, priority, Date.now() - 20_000)
       ]
 
       queue.historyTasks = [
@@ -339,7 +341,7 @@ export const QueuedZeroAheadMultiRunning: Story = {
         makeRunningTaskWithStart('running-b', 507, 10)
       ]
 
-      exec.nodeProgressStatesByPrompt = {
+      exec.nodeProgressStatesByJob = {
         p1: {
           '1': {
             value: 2,
@@ -358,7 +360,7 @@ export const QueuedZeroAheadMultiRunning: Story = {
             prompt_id: 'p2'
           }
         }
-      } as any
+      }
 
       return { args: { ...args, jobId } }
     },
@@ -378,8 +380,8 @@ export const Completed: Story = {
       const queue = useQueueStore()
 
       const jobId = 'job-completed-1'
-      const queueIndex = 400
-      queue.historyTasks = [makeHistoryTask(jobId, queueIndex, 37, true)]
+      const priority = 400
+      queue.historyTasks = [makeHistoryTask(jobId, priority, 37, true)]
 
       return { args: { ...args, jobId } }
     },
@@ -399,11 +401,11 @@ export const Failed: Story = {
       const queue = useQueueStore()
 
       const jobId = 'job-failed-1'
-      const queueIndex = 410
+      const priority = 410
       queue.historyTasks = [
         makeHistoryTask(
           jobId,
-          queueIndex,
+          priority,
           12,
           false,
           'Example error: invalid inputs for node X'
diff --git a/src/components/queue/job/JobDetailsPopover.vue b/src/components/queue/job/JobDetailsPopover.vue
index d2d3a7ad18..55a391c096 100644
--- a/src/components/queue/job/JobDetailsPopover.vue
+++ b/src/components/queue/job/JobDetailsPopover.vue
@@ -3,21 +3,20 @@
     class="w-[300px] min-w-[260px] rounded-lg border border-interface-stroke bg-interface-panel-surface shadow-md"
   >
     <div class="flex items-center border-b border-interface-stroke p-4">
-      <span
-        class="text-[0.875rem] leading-normal font-normal text-text-primary"
-        >{{ t('queue.jobDetails.header') }}</span
-      >
+      <span class="text-sm/normal font-normal text-text-primary">{{
+        t('queue.jobDetails.header')
+      }}</span>
     </div>
-    <div class="flex flex-col gap-6 px-4 pt-4 pb-4">
-      <div class="grid grid-cols-2 items-center gap-x-2 gap-y-2">
+    <div class="flex flex-col gap-6 p-4">
+      <div class="grid grid-cols-2 items-center gap-2">
         <template v-for="row in baseRows" :key="row.label">
           <div
-            class="flex items-center text-[0.75rem] leading-normal font-normal text-text-primary"
+            class="flex items-center text-xs/normal font-normal text-text-primary"
           >
             {{ row.label }}
           </div>
           <div
-            class="flex min-w-0 items-center text-[0.75rem] leading-normal font-normal text-text-secondary"
+            class="flex min-w-0 items-center text-xs/normal font-normal text-text-secondary"
           >
             <span class="block min-w-0 truncate">{{ row.value }}</span>
             <Button
@@ -33,18 +32,15 @@
         </template>
       </div>
 
-      <div
-        v-if="extraRows.length"
-        class="grid grid-cols-2 items-center gap-x-2 gap-y-2"
-      >
+      <div v-if="extraRows.length" class="grid grid-cols-2 items-center gap-2">
         <template v-for="row in extraRows" :key="row.label">
           <div
-            class="flex items-center text-[0.75rem] leading-normal font-normal text-text-primary"
+            class="flex items-center text-xs/normal font-normal text-text-primary"
           >
             {{ row.label }}
           </div>
           <div
-            class="flex min-w-0 items-center text-[0.75rem] leading-normal font-normal text-text-secondary"
+            class="flex min-w-0 items-center text-xs/normal font-normal text-text-secondary"
           >
             <span class="block min-w-0 truncate">{{ row.value }}</span>
           </div>
@@ -53,7 +49,7 @@
 
       <div v-if="jobState === 'failed'" class="grid grid-cols-2 gap-x-2">
         <div
-          class="flex items-center text-[0.75rem] leading-normal font-normal text-text-primary"
+          class="flex items-center text-xs/normal font-normal text-text-primary"
         >
           {{ t('queue.jobDetails.errorMessage') }}
         </div>
@@ -82,7 +78,7 @@
           </Button>
         </div>
         <div
-          class="col-span-2 mt-2 rounded bg-interface-panel-hover-surface px-4 py-2 text-[0.75rem] leading-normal text-text-secondary"
+          class="col-span-2 mt-2 rounded-sm bg-interface-panel-hover-surface px-4 py-2 text-xs/normal text-text-secondary"
         >
           {{ errorMessageValue }}
         </div>
@@ -139,7 +135,7 @@ const copyJobId = () => void copyToClipboard(jobIdValue.value)
 const taskForJob = computed(() => {
   const pid = props.jobId
   const findIn = (arr: TaskItemImpl[]) =>
-    arr.find((t) => String(t.promptId ?? '') === String(pid))
+    arr.find((t) => String(t.jobId ?? '') === String(pid))
   return (
     findIn(queueStore.pendingTasks) ||
     findIn(queueStore.runningTasks) ||
@@ -151,9 +147,7 @@ const taskForJob = computed(() => {
 const jobState = computed(() => {
   const task = taskForJob.value
   if (!task) return null
-  const isInitializing = executionStore.isPromptInitializing(
-    String(task?.promptId)
-  )
+  const isInitializing = executionStore.isJobInitializing(String(task?.jobId))
   return jobStateFromTask(task, isInitializing)
 })
 
@@ -168,16 +162,16 @@ const queuedAtValue = computed(() =>
     : ''
 )
 
-const currentQueueIndex = computed<number | null>(() => {
+const currentJobPriority = computed<number | null>(() => {
   const task = taskForJob.value
-  return task ? Number(task.queueIndex) : null
+  return task ? Number(task.job.priority) : null
 })
 
 const jobsAhead = computed<number | null>(() => {
-  const idx = currentQueueIndex.value
+  const idx = currentJobPriority.value
   if (idx == null) return null
   const ahead = queueStore.pendingTasks.filter(
-    (t: TaskItemImpl) => Number(t.queueIndex) < idx
+    (t: TaskItemImpl) => Number(t.job.priority) < idx
   )
   return ahead.length
 })
@@ -296,7 +290,7 @@ const extraRows = computed<DetailRow[]>(() => {
     ]
   }
   if (jobState.value === 'completed') {
-    const task = taskForJob.value as any
+    const task = taskForJob.value
     const endTs: number | undefined = task?.executionEndTimestamp
     const execMs: number | undefined = task?.executionTime
     const generatedOnValue = endTs ? formatClockTime(endTs, locale.value) : ''
@@ -321,7 +315,7 @@ const extraRows = computed<DetailRow[]>(() => {
     return rows
   }
   if (jobState.value === 'failed') {
-    const task = taskForJob.value as any
+    const task = taskForJob.value
     const execMs: number | undefined = task?.executionTime
     const failedAfterValue =
       execMs !== undefined ? formatElapsedTime(execMs) : ''
diff --git a/src/components/queue/job/JobFilterActions.vue b/src/components/queue/job/JobFilterActions.vue
new file mode 100644
index 0000000000..67991c2e19
--- /dev/null
+++ b/src/components/queue/job/JobFilterActions.vue
@@ -0,0 +1,199 @@
+<template>
+  <div class="flex min-w-0 items-center gap-2">
+    <SearchBox
+      v-if="showSearch"
+      :model-value="searchQuery"
+      class="min-w-0 flex-1"
+      :placeholder="searchPlaceholderText"
+      @update:model-value="onSearchQueryUpdate"
+    />
+    <div
+      class="flex shrink-0 items-center gap-2"
+      :class="{ 'ml-2': !showSearch }"
+    >
+      <Popover :show-arrow="false">
+        <template #button>
+          <Button
+            v-tooltip.top="filterTooltipConfig"
+            variant="secondary"
+            size="icon"
+            :aria-label="t('sideToolbar.queueProgressOverlay.filterJobs')"
+          >
+            <i class="icon-[lucide--list-filter] size-4" />
+            <span
+              v-if="selectedWorkflowFilter !== 'all'"
+              class="pointer-events-none absolute -top-1 -right-1 inline-block size-2 rounded-full bg-base-foreground"
+            />
+          </Button>
+        </template>
+        <template #default="{ close }">
+          <div class="flex min-w-48 flex-col items-stretch">
+            <Button
+              class="w-full justify-between"
+              variant="textonly"
+              size="md"
+              @click="onSelectWorkflowFilter('all', close)"
+            >
+              <span>{{
+                t('sideToolbar.queueProgressOverlay.filterAllWorkflows')
+              }}</span>
+              <i
+                v-if="selectedWorkflowFilter === 'all'"
+                class="icon-[lucide--check] size-4"
+              />
+            </Button>
+            <div class="mx-2 mt-1 h-px" />
+            <Button
+              class="w-full justify-between"
+              variant="textonly"
+              size="md"
+              @click="onSelectWorkflowFilter('current', close)"
+            >
+              <span>{{
+                t('sideToolbar.queueProgressOverlay.filterCurrentWorkflow')
+              }}</span>
+              <i
+                v-if="selectedWorkflowFilter === 'current'"
+                class="icon-[lucide--check] block size-4 leading-none text-text-secondary"
+              />
+            </Button>
+          </div>
+        </template>
+      </Popover>
+      <Popover :show-arrow="false">
+        <template #button>
+          <Button
+            v-tooltip.top="sortTooltipConfig"
+            variant="secondary"
+            size="icon"
+            :aria-label="t('sideToolbar.queueProgressOverlay.sortJobs')"
+          >
+            <i class="icon-[lucide--arrow-up-down] size-4" />
+            <span
+              v-if="selectedSortMode !== 'mostRecent'"
+              class="pointer-events-none absolute -top-1 -right-1 inline-block size-2 rounded-full bg-base-foreground"
+            />
+          </Button>
+        </template>
+        <template #default="{ close }">
+          <div class="flex min-w-48 flex-col items-stretch">
+            <template v-for="(mode, index) in jobSortModes" :key="mode">
+              <Button
+                class="w-full justify-between"
+                variant="textonly"
+                size="md"
+                @click="onSelectSortMode(mode, close)"
+              >
+                <span>{{ sortLabel(mode) }}</span>
+                <i
+                  v-if="selectedSortMode === mode"
+                  class="icon-[lucide--check] size-4 text-text-secondary"
+                />
+              </Button>
+              <div
+                v-if="index < jobSortModes.length - 1"
+                class="mx-2 mt-1 h-px"
+              />
+            </template>
+          </div>
+        </template>
+      </Popover>
+      <Button
+        v-if="showAssetsAction"
+        v-tooltip.top="showAssetsTooltipConfig"
+        variant="secondary"
+        size="icon"
+        :aria-label="t('sideToolbar.queueProgressOverlay.showAssetsPanel')"
+        @click="emit('showAssets')"
+      >
+        <i class="icon-[comfy--image-ai-edit] size-4" />
+      </Button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import SearchBox from '@/components/common/SearchBox.vue'
+import Popover from '@/components/ui/Popover.vue'
+import Button from '@/components/ui/button/Button.vue'
+import { jobSortModes } from '@/composables/queue/useJobList'
+import type { JobSortMode } from '@/composables/queue/useJobList'
+import { buildTooltipConfig } from '@/composables/useTooltipConfig'
+
+const {
+  hideShowAssetsAction = false,
+  showSearch = false,
+  searchPlaceholder
+} = defineProps<{
+  hideShowAssetsAction?: boolean
+  showSearch?: boolean
+  searchPlaceholder?: string
+}>()
+
+const selectedWorkflowFilter = defineModel<'all' | 'current'>(
+  'selectedWorkflowFilter',
+  { required: true }
+)
+const selectedSortMode = defineModel<JobSortMode>('selectedSortMode', {
+  required: true
+})
+const searchQuery = defineModel<string>('searchQuery', { default: '' })
+
+const emit = defineEmits<{
+  (e: 'showAssets'): void
+}>()
+
+const { t } = useI18n()
+
+const filterTooltipConfig = computed(() =>
+  buildTooltipConfig(t('sideToolbar.queueProgressOverlay.filterBy'))
+)
+const sortTooltipConfig = computed(() =>
+  buildTooltipConfig(t('sideToolbar.queueProgressOverlay.sortBy'))
+)
+const showAssetsTooltipConfig = computed(() =>
+  buildTooltipConfig(t('sideToolbar.queueProgressOverlay.showAssets'))
+)
+const showAssetsAction = computed(() => !hideShowAssetsAction)
+const searchPlaceholderText = computed(
+  () => searchPlaceholder ?? t('sideToolbar.queueProgressOverlay.searchJobs')
+)
+
+const selectWorkflowFilter = (value: 'all' | 'current') => {
+  selectedWorkflowFilter.value = value
+}
+
+const onSelectWorkflowFilter = (
+  value: 'all' | 'current',
+  close: () => void
+) => {
+  selectWorkflowFilter(value)
+  close()
+}
+
+const selectSortMode = (value: JobSortMode) => {
+  selectedSortMode.value = value
+}
+
+const onSelectSortMode = (value: JobSortMode, close: () => void) => {
+  selectSortMode(value)
+  close()
+}
+
+const onSearchQueryUpdate = (value: string | undefined) => {
+  searchQuery.value = value ?? ''
+}
+
+const sortLabel = (mode: JobSortMode) => {
+  if (mode === 'mostRecent') {
+    return t('queue.jobList.sortMostRecent')
+  }
+  if (mode === 'totalGenerationTime') {
+    return t('queue.jobList.sortTotalGenerationTime')
+  }
+  return ''
+}
+</script>
diff --git a/src/components/queue/job/JobFilterTabs.vue b/src/components/queue/job/JobFilterTabs.vue
new file mode 100644
index 0000000000..83a2a19025
--- /dev/null
+++ b/src/components/queue/job/JobFilterTabs.vue
@@ -0,0 +1,45 @@
+<template>
+  <div class="min-w-0 flex-1 overflow-x-auto">
+    <div class="inline-flex items-center gap-1 whitespace-nowrap">
+      <Button
+        v-for="tab in visibleJobTabs"
+        :key="tab"
+        :variant="selectedJobTab === tab ? 'secondary' : 'muted-textonly'"
+        size="md"
+        @click="$emit('update:selectedJobTab', tab)"
+      >
+        {{ tabLabel(tab) }}
+      </Button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+import { jobTabs } from '@/composables/queue/useJobList'
+import type { JobTab } from '@/composables/queue/useJobList'
+
+const { selectedJobTab, hasFailedJobs } = defineProps<{
+  selectedJobTab: JobTab
+  hasFailedJobs: boolean
+}>()
+
+defineEmits<{
+  (e: 'update:selectedJobTab', value: JobTab): void
+}>()
+
+const { t } = useI18n()
+
+const visibleJobTabs = computed(() =>
+  hasFailedJobs ? jobTabs : jobTabs.filter((tab) => tab !== 'Failed')
+)
+
+const tabLabel = (tab: JobTab) => {
+  if (tab === 'All') return t('g.all')
+  if (tab === 'Completed') return t('g.completed')
+  return t('g.failed')
+}
+</script>
diff --git a/src/components/queue/job/JobFiltersBar.test.ts b/src/components/queue/job/JobFiltersBar.test.ts
new file mode 100644
index 0000000000..c4043f534c
--- /dev/null
+++ b/src/components/queue/job/JobFiltersBar.test.ts
@@ -0,0 +1,99 @@
+import { mount } from '@vue/test-utils'
+import { describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+import { defineComponent } from 'vue'
+
+vi.mock('primevue/popover', () => {
+  const PopoverStub = defineComponent({
+    name: 'Popover',
+    setup(_, { slots, expose }) {
+      expose({
+        hide: () => undefined,
+        toggle: (_event: Event) => undefined
+      })
+      return () => slots.default?.()
+    }
+  })
+  return { default: PopoverStub }
+})
+
+vi.mock('@/platform/distribution/types', () => ({
+  isCloud: false
+}))
+
+import JobFiltersBar from '@/components/queue/job/JobFiltersBar.vue'
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      g: {
+        all: 'All',
+        completed: 'Completed'
+      },
+      queue: {
+        jobList: {
+          sortMostRecent: 'Most recent',
+          sortTotalGenerationTime: 'Total generation time'
+        }
+      },
+      sideToolbar: {
+        queueProgressOverlay: {
+          filterJobs: 'Filter jobs',
+          filterBy: 'Filter by',
+          sortJobs: 'Sort jobs',
+          sortBy: 'Sort by',
+          showAssets: 'Show assets',
+          showAssetsPanel: 'Show assets panel',
+          filterAllWorkflows: 'All workflows',
+          filterCurrentWorkflow: 'Current workflow'
+        }
+      }
+    }
+  }
+})
+
+describe('JobFiltersBar', () => {
+  it('emits showAssets when the assets icon button is clicked', async () => {
+    const wrapper = mount(JobFiltersBar, {
+      props: {
+        selectedJobTab: 'All',
+        selectedWorkflowFilter: 'all',
+        selectedSortMode: 'mostRecent',
+        hasFailedJobs: false
+      },
+      global: {
+        plugins: [i18n],
+        directives: { tooltip: () => undefined }
+      }
+    })
+
+    const showAssetsButton = wrapper.get(
+      'button[aria-label="Show assets panel"]'
+    )
+    await showAssetsButton.trigger('click')
+
+    expect(wrapper.emitted('showAssets')).toHaveLength(1)
+  })
+
+  it('hides the assets icon button when hideShowAssetsAction is true', () => {
+    const wrapper = mount(JobFiltersBar, {
+      props: {
+        selectedJobTab: 'All',
+        selectedWorkflowFilter: 'all',
+        selectedSortMode: 'mostRecent',
+        hasFailedJobs: false,
+        hideShowAssetsAction: true
+      },
+      global: {
+        plugins: [i18n],
+        directives: { tooltip: () => undefined }
+      }
+    })
+
+    expect(
+      wrapper.find('button[aria-label="Show assets panel"]').exists()
+    ).toBe(false)
+  })
+})
diff --git a/src/components/queue/job/JobFiltersBar.vue b/src/components/queue/job/JobFiltersBar.vue
index 6631d4b38a..23366ce69a 100644
--- a/src/components/queue/job/JobFiltersBar.vue
+++ b/src/components/queue/job/JobFiltersBar.vue
@@ -1,212 +1,46 @@
 <template>
   <div class="flex items-center justify-between gap-2 px-3">
-    <div class="min-w-0 flex-1 overflow-x-auto">
-      <div class="inline-flex items-center gap-1 whitespace-nowrap">
-        <Button
-          v-for="tab in visibleJobTabs"
-          :key="tab"
-          :variant="selectedJobTab === tab ? 'secondary' : 'muted-textonly'"
-          size="sm"
-          class="px-3"
-          @click="$emit('update:selectedJobTab', tab)"
-        >
-          {{ tabLabel(tab) }}
-        </Button>
-      </div>
-    </div>
-    <div class="ml-2 flex shrink-0 items-center gap-2">
-      <Button
-        v-if="showWorkflowFilter"
-        v-tooltip.top="filterTooltipConfig"
-        variant="secondary"
-        size="icon"
-        :aria-label="t('sideToolbar.queueProgressOverlay.filterJobs')"
-        @click="onFilterClick"
-      >
-        <i class="icon-[lucide--list-filter] size-4" />
-        <span
-          v-if="selectedWorkflowFilter !== 'all'"
-          class="pointer-events-none absolute -top-1 -right-1 inline-block size-2 rounded-full bg-base-foreground"
-        />
-      </Button>
-      <Popover
-        v-if="showWorkflowFilter"
-        ref="filterPopoverRef"
-        :dismissable="true"
-        :close-on-escape="true"
-        unstyled
-        :pt="{
-          root: { class: 'absolute z-50' },
-          content: {
-            class: [
-              'bg-transparent border-none p-0 pt-2 rounded-lg shadow-lg font-inter'
-            ]
-          }
-        }"
-      >
-        <div
-          class="flex min-w-[12rem] flex-col items-stretch rounded-lg border border-interface-stroke bg-interface-panel-surface px-2 py-3"
-        >
-          <Button
-            class="w-full justify-between"
-            variant="textonly"
-            size="sm"
-            @click="selectWorkflowFilter('all')"
-          >
-            <span>{{
-              t('sideToolbar.queueProgressOverlay.filterAllWorkflows')
-            }}</span>
-            <i
-              v-if="selectedWorkflowFilter === 'all'"
-              class="icon-[lucide--check] size-4"
-            />
-          </Button>
-          <div class="mx-2 mt-1 h-px" />
-          <Button
-            class="w-full justify-between"
-            variant="textonly"
-            @click="selectWorkflowFilter('current')"
-          >
-            <span>{{
-              t('sideToolbar.queueProgressOverlay.filterCurrentWorkflow')
-            }}</span>
-            <i
-              v-if="selectedWorkflowFilter === 'current'"
-              class="icon-[lucide--check] block size-4 leading-none text-text-secondary"
-            />
-          </Button>
-        </div>
-      </Popover>
-      <Button
-        v-tooltip.top="sortTooltipConfig"
-        variant="secondary"
-        size="icon"
-        :aria-label="t('sideToolbar.queueProgressOverlay.sortJobs')"
-        @click="onSortClick"
-      >
-        <i class="icon-[lucide--arrow-up-down] size-4" />
-        <span
-          v-if="selectedSortMode !== 'mostRecent'"
-          class="pointer-events-none absolute -top-1 -right-1 inline-block size-2 rounded-full bg-base-foreground"
-        />
-      </Button>
-      <Popover
-        ref="sortPopoverRef"
-        :dismissable="true"
-        :close-on-escape="true"
-        unstyled
-        :pt="{
-          root: { class: 'absolute z-50' },
-          content: {
-            class: [
-              'bg-transparent border-none p-0 pt-2 rounded-lg shadow-lg font-inter'
-            ]
-          }
-        }"
-      >
-        <div
-          class="flex min-w-[12rem] flex-col items-stretch rounded-lg border border-interface-stroke bg-interface-panel-surface px-2 py-3"
-        >
-          <template v-for="(mode, index) in jobSortModes" :key="mode">
-            <Button
-              class="w-full justify-between"
-              variant="textonly"
-              size="sm"
-              @click="selectSortMode(mode)"
-            >
-              <span>{{ sortLabel(mode) }}</span>
-              <i
-                v-if="selectedSortMode === mode"
-                class="icon-[lucide--check] size-4 text-text-secondary"
-              />
-            </Button>
-            <div
-              v-if="index < jobSortModes.length - 1"
-              class="mx-2 mt-1 h-px"
-            />
-          </template>
-        </div>
-      </Popover>
-    </div>
+    <JobFilterTabs
+      :selected-job-tab="selectedJobTab"
+      :has-failed-jobs="hasFailedJobs"
+      @update:selected-job-tab="$emit('update:selectedJobTab', $event)"
+    />
+    <JobFilterActions
+      :selected-workflow-filter="selectedWorkflowFilter"
+      :selected-sort-mode="selectedSortMode"
+      :hide-show-assets-action="hideShowAssetsAction"
+      @show-assets="$emit('showAssets')"
+      @update:selected-workflow-filter="
+        $emit('update:selectedWorkflowFilter', $event)
+      "
+      @update:selected-sort-mode="$emit('update:selectedSortMode', $event)"
+    />
   </div>
 </template>
 
 <script setup lang="ts">
-import Popover from 'primevue/popover'
-import { computed, ref } from 'vue'
-import { useI18n } from 'vue-i18n'
-
-import Button from '@/components/ui/button/Button.vue'
-import { jobSortModes, jobTabs } from '@/composables/queue/useJobList'
+import JobFilterActions from '@/components/queue/job/JobFilterActions.vue'
+import JobFilterTabs from '@/components/queue/job/JobFilterTabs.vue'
 import type { JobSortMode, JobTab } from '@/composables/queue/useJobList'
-import { buildTooltipConfig } from '@/composables/useTooltipConfig'
-import { isCloud } from '@/platform/distribution/types'
 
-const props = defineProps<{
+const {
+  selectedJobTab,
+  selectedWorkflowFilter,
+  selectedSortMode,
+  hasFailedJobs,
+  hideShowAssetsAction
+} = defineProps<{
   selectedJobTab: JobTab
   selectedWorkflowFilter: 'all' | 'current'
   selectedSortMode: JobSortMode
   hasFailedJobs: boolean
+  hideShowAssetsAction?: boolean
 }>()
 
-const emit = defineEmits<{
+defineEmits<{
+  (e: 'showAssets'): void
   (e: 'update:selectedJobTab', value: JobTab): void
   (e: 'update:selectedWorkflowFilter', value: 'all' | 'current'): void
   (e: 'update:selectedSortMode', value: JobSortMode): void
 }>()
-
-const { t } = useI18n()
-const filterPopoverRef = ref<InstanceType<typeof Popover> | null>(null)
-const sortPopoverRef = ref<InstanceType<typeof Popover> | null>(null)
-
-const filterTooltipConfig = computed(() =>
-  buildTooltipConfig(t('sideToolbar.queueProgressOverlay.filterBy'))
-)
-const sortTooltipConfig = computed(() =>
-  buildTooltipConfig(t('sideToolbar.queueProgressOverlay.sortBy'))
-)
-
-// This can be removed when cloud implements /jobs and we switch to it.
-const showWorkflowFilter = !isCloud
-
-const visibleJobTabs = computed(() =>
-  props.hasFailedJobs ? jobTabs : jobTabs.filter((tab) => tab !== 'Failed')
-)
-
-const onFilterClick = (event: Event) => {
-  if (filterPopoverRef.value) {
-    filterPopoverRef.value.toggle(event)
-  }
-}
-const selectWorkflowFilter = (value: 'all' | 'current') => {
-  ;(filterPopoverRef.value as any)?.hide?.()
-  emit('update:selectedWorkflowFilter', value)
-}
-
-const onSortClick = (event: Event) => {
-  if (sortPopoverRef.value) {
-    sortPopoverRef.value.toggle(event)
-  }
-}
-
-const selectSortMode = (value: JobSortMode) => {
-  ;(sortPopoverRef.value as any)?.hide?.()
-  emit('update:selectedSortMode', value)
-}
-
-const tabLabel = (tab: JobTab) => {
-  if (tab === 'All') return t('g.all')
-  if (tab === 'Completed') return t('g.completed')
-  return t('g.failed')
-}
-
-const sortLabel = (mode: JobSortMode) => {
-  if (mode === 'mostRecent') {
-    return t('queue.jobList.sortMostRecent')
-  }
-  if (mode === 'totalGenerationTime') {
-    return t('queue.jobList.sortTotalGenerationTime')
-  }
-  return ''
-}
 </script>
diff --git a/tests-ui/tests/components/queue/JobGroupsList.test.ts b/src/components/queue/job/JobGroupsList.test.ts
similarity index 83%
rename from tests-ui/tests/components/queue/JobGroupsList.test.ts
rename to src/components/queue/job/JobGroupsList.test.ts
index b9635eca85..f4fcda8538 100644
--- a/tests-ui/tests/components/queue/JobGroupsList.test.ts
+++ b/src/components/queue/job/JobGroupsList.test.ts
@@ -4,6 +4,7 @@ import { defineComponent, nextTick } from 'vue'
 
 import JobGroupsList from '@/components/queue/job/JobGroupsList.vue'
 import type { JobGroup, JobListItem } from '@/composables/queue/useJobList'
+import type { TaskItemImpl } from '@/stores/queueStore'
 
 const QueueJobItemStub = defineComponent({
   name: 'QueueJobItemStub',
@@ -22,24 +23,28 @@ const QueueJobItemStub = defineComponent({
     runningNodeName: { type: String, default: undefined },
     activeDetailsId: { type: String, default: null }
   },
-  emits: ['cancel', 'delete', 'menu', 'view', 'details-enter', 'details-leave'],
   template: '<div class="queue-job-item-stub"></div>'
 })
 
-const createJobItem = (overrides: Partial<JobListItem> = {}): JobListItem => ({
-  id: 'job-id',
-  title: 'Example job',
-  meta: 'Meta text',
-  state: 'running',
-  iconName: 'icon',
-  iconImageUrl: 'https://example.com/icon.png',
-  showClear: true,
-  taskRef: { workflow: { id: 'workflow-id' } },
-  progressTotalPercent: 60,
-  progressCurrentPercent: 30,
-  runningNodeName: 'Node A',
-  ...overrides
-})
+const createJobItem = (overrides: Partial<JobListItem> = {}): JobListItem => {
+  const { taskRef, ...rest } = overrides
+  return {
+    id: 'job-id',
+    title: 'Example job',
+    meta: 'Meta text',
+    state: 'running',
+    iconName: 'icon',
+    iconImageUrl: 'https://example.com/icon.png',
+    showClear: true,
+    taskRef: (taskRef ?? {
+      workflow: { id: 'workflow-id' }
+    }) as TaskItemImpl,
+    progressTotalPercent: 60,
+    progressCurrentPercent: 30,
+    runningNodeName: 'Node A',
+    ...rest
+  }
+}
 
 const mountComponent = (groups: JobGroup[]) =>
   mount(JobGroupsList, {
diff --git a/src/components/queue/job/JobGroupsList.vue b/src/components/queue/job/JobGroupsList.vue
index 482016d346..3a7c6d6af9 100644
--- a/src/components/queue/job/JobGroupsList.vue
+++ b/src/components/queue/job/JobGroupsList.vue
@@ -12,7 +12,7 @@
         v-for="ji in group.items"
         :key="ji.id"
         :job-id="ji.id"
-        :workflow-id="ji.taskRef?.workflow?.id"
+        :workflow-id="ji.taskRef?.workflowId"
         :state="ji.state"
         :title="ji.title"
         :right-text="ji.meta"
diff --git a/src/components/queue/job/QueueAssetPreview.vue b/src/components/queue/job/QueueAssetPreview.vue
index d815065e98..040a0ebf61 100644
--- a/src/components/queue/job/QueueAssetPreview.vue
+++ b/src/components/queue/job/QueueAssetPreview.vue
@@ -6,13 +6,13 @@
           ref="imgRef"
           :src="imageUrl"
           :alt="name"
-          class="h-full w-full cursor-pointer object-contain"
+          class="size-full cursor-pointer object-contain"
           @click="$emit('image-click')"
           @load="onImgLoad"
         />
         <div
           v-if="timeLabel"
-          class="absolute bottom-2 left-2 rounded px-2 py-0.5 text-xs text-text-primary"
+          class="absolute bottom-2 left-2 rounded-sm px-2 py-0.5 text-xs text-text-primary"
           :style="{
             background: 'rgba(217, 217, 217, 0.40)',
             backdropFilter: 'blur(2px)'
@@ -23,14 +23,14 @@
       </div>
       <div class="mt-2 text-center">
         <div
-          class="truncate text-[0.875rem] leading-normal font-semibold text-text-primary"
+          class="truncate text-sm/normal font-semibold text-text-primary"
           :title="name"
         >
           {{ name }}
         </div>
         <div
           v-if="width && height"
-          class="mt-1 text-[0.75rem] leading-normal text-text-secondary"
+          class="mt-1 text-xs/normal text-text-secondary"
         >
           {{ width }}x{{ height }}
         </div>
diff --git a/src/components/queue/job/QueueJobItem.vue b/src/components/queue/job/QueueJobItem.vue
index 7e71840bc3..68182f2991 100644
--- a/src/components/queue/job/QueueJobItem.vue
+++ b/src/components/queue/job/QueueJobItem.vue
@@ -17,10 +17,7 @@
         @mouseenter="onPopoverEnter"
         @mouseleave="onPopoverLeave"
       >
-        <JobDetailsPopover
-          :job-id="props.jobId"
-          :workflow-id="props.workflowId"
-        />
+        <JobDetailsPopover :job-id="jobId" :workflow-id="workflowId" />
       </div>
     </Teleport>
     <Teleport to="body">
@@ -36,7 +33,7 @@
       >
         <QueueAssetPreview
           :image-url="iconImageUrl!"
-          :name="props.title"
+          :name="title"
           :time-label="rightText || undefined"
           @image-click="emit('view')"
         />
@@ -49,38 +46,37 @@
     >
       <div
         v-if="
-          props.state === 'running' &&
-          (props.progressTotalPercent !== undefined ||
-            props.progressCurrentPercent !== undefined)
+          state === 'running' &&
+          hasAnyProgressPercent(progressTotalPercent, progressCurrentPercent)
         "
-        class="absolute inset-0"
+        :class="progressBarContainerClass"
       >
         <div
-          v-if="props.progressTotalPercent !== undefined"
-          class="pointer-events-none absolute inset-y-0 left-0 h-full bg-interface-panel-job-progress-primary transition-[width]"
-          :style="{ width: `${props.progressTotalPercent}%` }"
+          v-if="hasProgressPercent(progressTotalPercent)"
+          :class="progressBarPrimaryClass"
+          :style="progressPercentStyle(progressTotalPercent)"
         />
         <div
-          v-if="props.progressCurrentPercent !== undefined"
-          class="pointer-events-none absolute inset-y-0 left-0 h-full bg-interface-panel-job-progress-secondary transition-[width]"
-          :style="{ width: `${props.progressCurrentPercent}%` }"
+          v-if="hasProgressPercent(progressCurrentPercent)"
+          :class="progressBarSecondaryClass"
+          :style="progressPercentStyle(progressCurrentPercent)"
         />
       </div>
 
       <div class="relative z-1 flex items-center gap-1">
         <div class="relative inline-flex items-center justify-center">
           <div
-            class="absolute left-1/2 top-1/2 size-10 -translate-x-1/2 -translate-y-1/2"
+            class="absolute top-1/2 left-1/2 size-10 -translate-1/2"
             @mouseenter.stop="onIconEnter"
             @mouseleave.stop="onIconLeave"
           />
           <div
-            class="inline-flex h-6 w-6 items-center justify-center overflow-hidden rounded-[6px]"
+            class="inline-flex size-6 items-center justify-center overflow-hidden rounded-[6px]"
           >
             <img
               v-if="iconImageUrl"
               :src="iconImageUrl"
-              class="h-full w-full object-cover"
+              class="size-full object-cover"
             />
             <i
               v-else
@@ -91,8 +87,8 @@
       </div>
 
       <div class="relative z-1 min-w-0 flex-1">
-        <div class="truncate opacity-90" :title="props.title">
-          <slot name="primary">{{ props.title }}</slot>
+        <div class="truncate opacity-90" :title="title">
+          <slot name="primary">{{ title }}</slot>
         </div>
       </div>
 
@@ -129,7 +125,7 @@
             class="inline-flex items-center gap-2 pr-1"
           >
             <Button
-              v-if="props.state === 'failed' && computedShowClear"
+              v-if="state === 'failed' && computedShowClear"
               v-tooltip.top="deleteTooltipConfig"
               variant="destructive"
               size="icon"
@@ -140,8 +136,8 @@
             </Button>
             <Button
               v-else-if="
-                props.state !== 'completed' &&
-                props.state !== 'running' &&
+                state !== 'completed' &&
+                state !== 'running' &&
                 computedShowClear
               "
               v-tooltip.top="cancelTooltipConfig"
@@ -153,14 +149,14 @@
               <i class="icon-[lucide--x] size-4" />
             </Button>
             <Button
-              v-else-if="props.state === 'completed'"
+              v-else-if="state === 'completed'"
               variant="textonly"
               size="sm"
               @click.stop="emit('view')"
               >{{ t('menuLabels.View') }}</Button
             >
             <Button
-              v-if="props.showMenu !== undefined ? props.showMenu : true"
+              v-if="showMenu !== undefined ? showMenu : true"
               v-tooltip.top="moreTooltipConfig"
               variant="textonly"
               size="icon-sm"
@@ -170,17 +166,13 @@
               <i class="icon-[lucide--more-horizontal] size-4" />
             </Button>
           </div>
-          <div
-            v-else-if="props.state !== 'running'"
-            key="secondary"
-            class="pr-2"
-          >
-            <slot name="secondary">{{ props.rightText }}</slot>
+          <div v-else-if="state !== 'running'" key="secondary" class="pr-2">
+            <slot name="secondary">{{ rightText }}</slot>
           </div>
         </Transition>
         <!-- Running job cancel button - always visible -->
         <Button
-          v-if="props.state === 'running' && computedShowClear"
+          v-if="state === 'running' && computedShowClear"
           v-tooltip.top="cancelTooltipConfig"
           variant="destructive"
           size="icon"
@@ -201,39 +193,39 @@ import { useI18n } from 'vue-i18n'
 import JobDetailsPopover from '@/components/queue/job/JobDetailsPopover.vue'
 import QueueAssetPreview from '@/components/queue/job/QueueAssetPreview.vue'
 import Button from '@/components/ui/button/Button.vue'
+import { useProgressBarBackground } from '@/composables/useProgressBarBackground'
 import { buildTooltipConfig } from '@/composables/useTooltipConfig'
 import type { JobState } from '@/types/queue'
 import { iconForJobState } from '@/utils/queueDisplay'
 import { cn } from '@/utils/tailwindUtil'
 
-const props = withDefaults(
-  defineProps<{
-    jobId: string
-    workflowId?: string
-    state: JobState
-    title: string
-    rightText?: string
-    iconName?: string
-    iconImageUrl?: string
-    showClear?: boolean
-    showMenu?: boolean
-    progressTotalPercent?: number
-    progressCurrentPercent?: number
-    activeDetailsId?: string | null
-  }>(),
-  {
-    workflowId: undefined,
-    rightText: '',
-    iconName: undefined,
-    iconImageUrl: undefined,
-    showClear: undefined,
-    showMenu: undefined,
-    progressTotalPercent: undefined,
-    progressCurrentPercent: undefined,
-    runningNodeName: undefined,
-    activeDetailsId: null
-  }
-)
+const {
+  jobId,
+  workflowId,
+  state,
+  title,
+  rightText = '',
+  iconName,
+  iconImageUrl,
+  showClear,
+  showMenu,
+  progressTotalPercent,
+  progressCurrentPercent,
+  activeDetailsId = null
+} = defineProps<{
+  jobId: string
+  workflowId?: string
+  state: JobState
+  title: string
+  rightText?: string
+  iconName?: string
+  iconImageUrl?: string
+  showClear?: boolean
+  showMenu?: boolean
+  progressTotalPercent?: number
+  progressCurrentPercent?: number
+  activeDetailsId?: string | null
+}>()
 
 const emit = defineEmits<{
   (e: 'cancel'): void
@@ -245,20 +237,28 @@ const emit = defineEmits<{
 }>()
 
 const { t } = useI18n()
+const {
+  progressBarContainerClass,
+  progressBarPrimaryClass,
+  progressBarSecondaryClass,
+  hasProgressPercent,
+  hasAnyProgressPercent,
+  progressPercentStyle
+} = useProgressBarBackground()
 
 const cancelTooltipConfig = computed(() => buildTooltipConfig(t('g.cancel')))
 const deleteTooltipConfig = computed(() => buildTooltipConfig(t('g.delete')))
 const moreTooltipConfig = computed(() => buildTooltipConfig(t('g.more')))
 
 const rowRef = ref<HTMLDivElement | null>(null)
-const showDetails = computed(() => props.activeDetailsId === props.jobId)
+const showDetails = computed(() => activeDetailsId === jobId)
 
 const onRowEnter = () => {
-  if (!isPreviewVisible.value) emit('details-enter', props.jobId)
+  if (!isPreviewVisible.value) emit('details-enter', jobId)
 }
-const onRowLeave = () => emit('details-leave', props.jobId)
-const onPopoverEnter = () => emit('details-enter', props.jobId)
-const onPopoverLeave = () => emit('details-leave', props.jobId)
+const onRowLeave = () => emit('details-leave', jobId)
+const onPopoverEnter = () => emit('details-enter', jobId)
+const onPopoverLeave = () => emit('details-leave', jobId)
 
 const isPreviewVisible = ref(false)
 const previewHideTimer = ref<number | null>(null)
@@ -275,9 +275,7 @@ const clearPreviewShowTimer = () => {
     previewShowTimer.value = null
   }
 }
-const canShowPreview = computed(
-  () => props.state === 'completed' && !!props.iconImageUrl
-)
+const canShowPreview = computed(() => state === 'completed' && !!iconImageUrl)
 const scheduleShowPreview = () => {
   if (!canShowPreview.value) return
   clearPreviewHideTimer()
@@ -332,23 +330,23 @@ watch(
 const isHovered = ref(false)
 
 const iconClass = computed(() => {
-  if (props.iconName) return props.iconName
-  return iconForJobState(props.state)
+  if (iconName) return iconName
+  return iconForJobState(state)
 })
 
 const shouldSpin = computed(
   () =>
-    props.state === 'pending' &&
+    state === 'pending' &&
     iconClass.value === iconForJobState('pending') &&
-    !props.iconImageUrl
+    !iconImageUrl
 )
 
 const computedShowClear = computed(() => {
-  if (props.showClear !== undefined) return props.showClear
-  return props.state !== 'completed'
+  if (showClear !== undefined) return showClear
+  return state !== 'completed'
 })
 
-const emitDetailsLeave = () => emit('details-leave', props.jobId)
+const emitDetailsLeave = () => emit('details-leave', jobId)
 
 const onCancelClick = () => {
   emitDetailsLeave()
@@ -361,7 +359,7 @@ const onDeleteClick = () => {
 }
 
 const onContextMenu = (event: MouseEvent) => {
-  const shouldShowMenu = props.showMenu !== undefined ? props.showMenu : true
+  const shouldShowMenu = showMenu !== undefined ? showMenu : true
   if (shouldShowMenu) emit('menu', event)
 }
 </script>
diff --git a/src/components/queue/job/useJobErrorReporting.test.ts b/src/components/queue/job/useJobErrorReporting.test.ts
new file mode 100644
index 0000000000..32f8c21723
--- /dev/null
+++ b/src/components/queue/job/useJobErrorReporting.test.ts
@@ -0,0 +1,140 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { computed, ref } from 'vue'
+import type { ComputedRef } from 'vue'
+
+import type { TaskItemImpl } from '@/stores/queueStore'
+import type { JobErrorDialogService } from '@/components/queue/job/useJobErrorReporting'
+import { useJobErrorReporting } from '@/components/queue/job/useJobErrorReporting'
+import type { ExecutionError } from '@/platform/remote/comfyui/jobs/jobTypes'
+
+const createTaskWithError = (
+  jobId: string,
+  errorMessage?: string,
+  executionError?: ExecutionError,
+  createTime?: number
+): TaskItemImpl =>
+  ({
+    jobId,
+    errorMessage,
+    executionError,
+    createTime: createTime ?? Date.now()
+  }) as Partial<TaskItemImpl> as TaskItemImpl
+
+describe('useJobErrorReporting', () => {
+  let taskState = ref<TaskItemImpl | null>(null)
+  let taskForJob: ComputedRef<TaskItemImpl | null>
+  let copyToClipboard: ReturnType<typeof vi.fn>
+  let showErrorDialog: ReturnType<typeof vi.fn>
+  let showExecutionErrorDialog: ReturnType<typeof vi.fn>
+  let dialog: JobErrorDialogService
+  let composable: ReturnType<typeof useJobErrorReporting>
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    taskState = ref<TaskItemImpl | null>(null)
+    taskForJob = computed(() => taskState.value)
+    copyToClipboard = vi.fn()
+    showErrorDialog = vi.fn()
+    showExecutionErrorDialog = vi.fn()
+    dialog = {
+      showErrorDialog,
+      showExecutionErrorDialog
+    } as Partial<JobErrorDialogService> as JobErrorDialogService
+    composable = useJobErrorReporting({
+      taskForJob,
+      copyToClipboard: copyToClipboard as (
+        value: string
+      ) => void | Promise<void>,
+      dialog
+    })
+  })
+
+  afterEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it('exposes a computed message that reflects the current task error', () => {
+    taskState.value = createTaskWithError('job-1', 'First failure')
+    expect(composable.errorMessageValue.value).toBe('First failure')
+
+    taskState.value = createTaskWithError('job-2', 'Second failure')
+    expect(composable.errorMessageValue.value).toBe('Second failure')
+  })
+
+  it('returns empty string when no error message', () => {
+    taskState.value = createTaskWithError('job-1')
+    expect(composable.errorMessageValue.value).toBe('')
+  })
+
+  it('returns empty string when task is null', () => {
+    taskState.value = null
+    expect(composable.errorMessageValue.value).toBe('')
+  })
+
+  it('only calls the copy handler when a message exists', () => {
+    taskState.value = createTaskWithError('job-1', 'Clipboard failure')
+    composable.copyErrorMessage()
+    expect(copyToClipboard).toHaveBeenCalledTimes(1)
+    expect(copyToClipboard).toHaveBeenCalledWith('Clipboard failure')
+
+    copyToClipboard.mockClear()
+    taskState.value = createTaskWithError('job-2')
+    composable.copyErrorMessage()
+    expect(copyToClipboard).not.toHaveBeenCalled()
+  })
+
+  it('shows simple error dialog when only errorMessage present', () => {
+    taskState.value = createTaskWithError('job-1', 'Queue job error')
+    composable.reportJobError()
+
+    expect(showErrorDialog).toHaveBeenCalledTimes(1)
+    const [errorArg, optionsArg] = showErrorDialog.mock.calls[0]
+    expect(errorArg).toBeInstanceOf(Error)
+    expect(errorArg.message).toBe('Queue job error')
+    expect(optionsArg).toEqual({ reportType: 'queueJobError' })
+    expect(showExecutionErrorDialog).not.toHaveBeenCalled()
+  })
+
+  it('does nothing when no task exists', () => {
+    taskState.value = null
+    composable.reportJobError()
+    expect(showErrorDialog).not.toHaveBeenCalled()
+    expect(showExecutionErrorDialog).not.toHaveBeenCalled()
+  })
+
+  it('shows rich error dialog when execution_error available on task', () => {
+    const executionError: ExecutionError = {
+      prompt_id: 'job-1',
+      timestamp: 12345,
+      node_id: '5',
+      node_type: 'KSampler',
+      executed: ['1', '2'],
+      exception_message: 'CUDA out of memory',
+      exception_type: 'RuntimeError',
+      traceback: ['line 1', 'line 2'],
+      current_inputs: {},
+      current_outputs: {}
+    }
+    taskState.value = createTaskWithError(
+      'job-1',
+      'CUDA out of memory',
+      executionError,
+      12345
+    )
+
+    composable.reportJobError()
+
+    expect(showExecutionErrorDialog).toHaveBeenCalledTimes(1)
+    expect(showExecutionErrorDialog).toHaveBeenCalledWith(executionError)
+    expect(showErrorDialog).not.toHaveBeenCalled()
+  })
+
+  it('does nothing when no error message and no execution_error', () => {
+    taskState.value = createTaskWithError('job-1')
+
+    composable.reportJobError()
+
+    expect(showErrorDialog).not.toHaveBeenCalled()
+    expect(showExecutionErrorDialog).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/components/queue/job/useJobErrorReporting.ts b/src/components/queue/job/useJobErrorReporting.ts
index afc0baf3e7..b008238a62 100644
--- a/src/components/queue/job/useJobErrorReporting.ts
+++ b/src/components/queue/job/useJobErrorReporting.ts
@@ -1,13 +1,13 @@
 import { computed } from 'vue'
 import type { ComputedRef } from 'vue'
 
-import type { ExecutionErrorWsMessage } from '@/schemas/apiSchema'
+import type { ExecutionErrorDialogInput } from '@/services/dialogService'
 import type { TaskItemImpl } from '@/stores/queueStore'
 
 type CopyHandler = (value: string) => void | Promise<void>
 
 export type JobErrorDialogService = {
-  showExecutionErrorDialog: (error: ExecutionErrorWsMessage) => void
+  showExecutionErrorDialog: (executionError: ExecutionErrorDialogInput) => void
   showErrorDialog: (
     error: Error,
     options?: {
@@ -17,30 +17,7 @@ export type JobErrorDialogService = {
   ) => void
 }
 
-type JobExecutionError = {
-  detail?: ExecutionErrorWsMessage
-  message: string
-}
-
-export const extractExecutionError = (
-  task: TaskItemImpl | null
-): JobExecutionError | null => {
-  const status = (task as TaskItemImpl | null)?.status
-  const messages = (status as { messages?: unknown[] } | undefined)?.messages
-  if (!Array.isArray(messages) || !messages.length) return null
-  const record = messages.find((entry: unknown) => {
-    return Array.isArray(entry) && entry[0] === 'execution_error'
-  }) as [string, ExecutionErrorWsMessage?] | undefined
-  if (!record) return null
-  const detail = record[1]
-  const message = String(detail?.exception_message ?? '')
-  return {
-    detail,
-    message
-  }
-}
-
-export type UseJobErrorReportingOptions = {
+type UseJobErrorReportingOptions = {
   taskForJob: ComputedRef<TaskItemImpl | null>
   copyToClipboard: CopyHandler
   dialog: JobErrorDialogService
@@ -51,10 +28,7 @@ export const useJobErrorReporting = ({
   copyToClipboard,
   dialog
 }: UseJobErrorReportingOptions) => {
-  const errorMessageValue = computed(() => {
-    const error = extractExecutionError(taskForJob.value)
-    return error?.message ?? ''
-  })
+  const errorMessageValue = computed(() => taskForJob.value?.errorMessage ?? '')
 
   const copyErrorMessage = () => {
     if (errorMessageValue.value) {
@@ -63,11 +37,12 @@ export const useJobErrorReporting = ({
   }
 
   const reportJobError = () => {
-    const error = extractExecutionError(taskForJob.value)
-    if (error?.detail) {
-      dialog.showExecutionErrorDialog(error.detail)
+    const executionError = taskForJob.value?.executionError
+    if (executionError) {
+      dialog.showExecutionErrorDialog(executionError)
       return
     }
+
     if (errorMessageValue.value) {
       dialog.showErrorDialog(new Error(errorMessageValue.value), {
         reportType: 'queueJobError'
diff --git a/src/components/rightSidePanel/RightSidePanel.vue b/src/components/rightSidePanel/RightSidePanel.vue
index 4eb2ae31b8..6f0697932c 100644
--- a/src/components/rightSidePanel/RightSidePanel.vue
+++ b/src/components/rightSidePanel/RightSidePanel.vue
@@ -1,32 +1,51 @@
 <script setup lang="ts">
 import { storeToRefs } from 'pinia'
-import { computed, ref, toValue, watchEffect } from 'vue'
+import { computed, provide, ref, watchEffect } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import EditableText from '@/components/common/EditableText.vue'
 import Tab from '@/components/tab/Tab.vue'
 import TabList from '@/components/tab/TabList.vue'
 import Button from '@/components/ui/button/Button.vue'
+import { useGraphHierarchy } from '@/composables/graph/useGraphHierarchy'
+import { st } from '@/i18n'
 import { SubgraphNode } from '@/lib/litegraph/src/litegraph'
 import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import { useExecutionErrorStore } from '@/stores/executionErrorStore'
 import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore'
 import type { RightSidePanelTab } from '@/stores/workspace/rightSidePanelStore'
-import { isLGraphNode } from '@/utils/litegraphUtil'
+import { resolveNodeDisplayName } from '@/utils/nodeTitleUtil'
 import { cn } from '@/utils/tailwindUtil'
+import { isGroupNode } from '@/utils/executableGroupNodeDto'
 
 import TabInfo from './info/TabInfo.vue'
-import TabParameters from './parameters/TabParameters.vue'
+import TabGlobalParameters from './parameters/TabGlobalParameters.vue'
+import TabNodes from './parameters/TabNodes.vue'
+import TabNormalInputs from './parameters/TabNormalInputs.vue'
+import TabSubgraphInputs from './parameters/TabSubgraphInputs.vue'
+import TabGlobalSettings from './settings/TabGlobalSettings.vue'
 import TabSettings from './settings/TabSettings.vue'
+import {
+  GetNodeParentGroupKey,
+  useFlatAndCategorizeSelectedItems
+} from './shared'
 import SubgraphEditor from './subgraph/SubgraphEditor.vue'
+import TabErrors from './errors/TabErrors.vue'
 
 const canvasStore = useCanvasStore()
+const executionErrorStore = useExecutionErrorStore()
 const rightSidePanelStore = useRightSidePanelStore()
 const settingStore = useSettingStore()
 const { t } = useI18n()
 
-const { selectedItems } = storeToRefs(canvasStore)
+const { hasAnyError, allErrorExecutionIds, activeMissingNodeGraphIds } =
+  storeToRefs(executionErrorStore)
+
+const { findParentGroup } = useGraphHierarchy()
+
+const { selectedItems: directlySelectedItems } = storeToRefs(canvasStore)
 const { activeTab, isEditingSubgraph } = storeToRefs(rightSidePanelStore)
 
 const sidebarLocation = computed<'left' | 'right'>(() =>
@@ -40,29 +59,31 @@ const panelIcon = computed(() =>
     : 'icon-[lucide--panel-right]'
 )
 
-const hasSelection = computed(() => selectedItems.value.length > 0)
+const { flattedItems, selectedNodes, selectedGroups, nodeToParentGroup } =
+  useFlatAndCategorizeSelectedItems(directlySelectedItems)
 
-const selectedNodes = computed((): LGraphNode[] => {
-  return selectedItems.value.filter(isLGraphNode)
+const shouldShowGroupNames = computed(() => {
+  return !(
+    directlySelectedItems.value.length === 1 &&
+    (selectedGroups.value.length === 1 || selectedNodes.value.length === 1)
+  )
 })
 
-const isSubgraphNode = computed(() => {
-  return selectedNode.value instanceof SubgraphNode
+provide(GetNodeParentGroupKey, (node: LGraphNode) => {
+  if (!shouldShowGroupNames.value) return null
+  return nodeToParentGroup.value.get(node) ?? findParentGroup(node)
 })
 
-const isSingleNodeSelected = computed(() => selectedNodes.value.length === 1)
+const hasSelection = computed(() => flattedItems.value.length > 0)
 
-const selectedNode = computed(() => {
-  return isSingleNodeSelected.value ? selectedNodes.value[0] : null
+const selectedSingleNode = computed(() => {
+  return selectedNodes.value.length === 1 && flattedItems.value.length === 1
+    ? selectedNodes.value[0]
+    : null
 })
 
-const selectionCount = computed(() => selectedItems.value.length)
-
-const panelTitle = computed(() => {
-  if (isSingleNodeSelected.value && selectedNode.value) {
-    return selectedNode.value.title || selectedNode.value.type || 'Node'
-  }
-  return t('rightSidePanel.title', { count: selectionCount.value })
+const isSingleSubgraphNode = computed(() => {
+  return selectedSingleNode.value instanceof SubgraphNode
 })
 
 function closePanel() {
@@ -72,28 +93,86 @@ function closePanel() {
 type RightSidePanelTabList = Array<{
   label: () => string
   value: RightSidePanelTab
+  icon?: string
 }>
 
+const hasDirectNodeError = computed(() =>
+  selectedNodes.value.some((node) =>
+    executionErrorStore.activeGraphErrorNodeIds.has(String(node.id))
+  )
+)
+
+const hasContainerInternalError = computed(() => {
+  if (allErrorExecutionIds.value.length === 0) return false
+  return selectedNodes.value.some((node) => {
+    if (!(node instanceof SubgraphNode || isGroupNode(node))) return false
+    return executionErrorStore.isContainerWithInternalError(node)
+  })
+})
+
+const hasMissingNodeSelected = computed(
+  () =>
+    hasSelection.value &&
+    selectedNodes.value.some((node) =>
+      activeMissingNodeGraphIds.value.has(String(node.id))
+    )
+)
+
+const hasRelevantErrors = computed(() => {
+  if (!hasSelection.value) return hasAnyError.value
+  return (
+    hasDirectNodeError.value ||
+    hasContainerInternalError.value ||
+    hasMissingNodeSelected.value
+  )
+})
+
 const tabs = computed<RightSidePanelTabList>(() => {
-  const list: RightSidePanelTabList = [
-    {
-      label: () => t('rightSidePanel.parameters'),
-      value: 'parameters'
-    },
-    {
-      label: () => t('g.settings'),
-      value: 'settings'
-    }
-  ]
+  const list: RightSidePanelTabList = []
+
   if (
-    !hasSelection.value ||
-    (isSingleNodeSelected.value && !isSubgraphNode.value)
+    settingStore.get('Comfy.RightSidePanel.ShowErrorsTab') &&
+    hasRelevantErrors.value
   ) {
     list.push({
-      label: () => t('rightSidePanel.info'),
-      value: 'info'
+      label: () => t('rightSidePanel.errors'),
+      value: 'errors',
+      icon: 'icon-[lucide--octagon-alert] bg-node-stroke-error ml-1'
     })
   }
+
+  list.push({
+    label: () =>
+      flattedItems.value.length > 1
+        ? t('rightSidePanel.nodes')
+        : t('rightSidePanel.parameters'),
+    value: 'parameters'
+  })
+
+  if (!hasSelection.value) {
+    list.push({
+      label: () => t('rightSidePanel.nodes'),
+      value: 'nodes'
+    })
+  }
+
+  if (hasSelection.value) {
+    if (selectedSingleNode.value && !isSingleSubgraphNode.value) {
+      list.push({
+        label: () => t('rightSidePanel.info'),
+        value: 'info'
+      })
+    }
+  }
+
+  list.push({
+    label: () =>
+      hasSelection.value
+        ? t('g.settings')
+        : t('rightSidePanel.globalSettings.title'),
+    value: 'settings'
+  })
+
   return list
 })
 
@@ -101,27 +180,62 @@ const tabs = computed<RightSidePanelTabList>(() => {
 watchEffect(() => {
   if (
     !tabs.value.some((tab) => tab.value === activeTab.value) &&
-    !(activeTab.value === 'subgraph' && isSubgraphNode.value)
+    !(activeTab.value === 'subgraph' && isSingleSubgraphNode.value)
   ) {
     rightSidePanelStore.openPanel(tabs.value[0].value)
   }
 })
 
+function resolveTitle() {
+  const items = flattedItems.value
+  const nodes = selectedNodes.value
+  const groups = selectedGroups.value
+
+  if (items.length === 0) {
+    return t('rightSidePanel.workflowOverview')
+  }
+  if (directlySelectedItems.value.length === 1) {
+    if (groups.length === 1) {
+      return groups[0].title || t('rightSidePanel.fallbackGroupTitle')
+    }
+    if (nodes.length === 1) {
+      const fallbackNodeTitle = t('rightSidePanel.fallbackNodeTitle')
+      return resolveNodeDisplayName(nodes[0], {
+        emptyLabel: fallbackNodeTitle,
+        untitledLabel: fallbackNodeTitle,
+        st
+      })
+    }
+  }
+  return t('rightSidePanel.title', { count: items.length })
+}
+
+const panelTitle = ref(resolveTitle())
+watchEffect(() => (panelTitle.value = resolveTitle()))
+
 const isEditing = ref(false)
 
+const allowTitleEdit = computed(() => {
+  return (
+    directlySelectedItems.value.length === 1 &&
+    (selectedGroups.value.length === 1 || selectedNodes.value.length === 1)
+  )
+})
+
 function handleTitleEdit(newTitle: string) {
   isEditing.value = false
 
   const trimmedTitle = newTitle.trim()
   if (!trimmedTitle) return
 
-  const node = toValue(selectedNode)
+  const node = selectedGroups.value[0] || selectedNodes.value[0]
   if (!node) return
 
   if (trimmedTitle === node.title) return
 
   node.title = trimmedTitle
-  canvasStore.canvas?.setDirty(true, false)
+  panelTitle.value = trimmedTitle
+  canvasStore.canvas?.setDirty(true, true)
 }
 
 function handleTitleCancel() {
@@ -132,21 +246,28 @@ function handleTitleCancel() {
 <template>
   <div
     data-testid="properties-panel"
-    class="flex size-full flex-col bg-interface-panel-surface"
+    class="flex size-full flex-col bg-comfy-menu-bg"
   >
     <!-- Panel Header -->
     <section class="pt-1">
-      <div class="flex items-center justify-between pl-4 pr-3">
-        <h3 class="my-3.5 text-sm font-semibold line-clamp-2">
-          <EditableText
-            v-if="isSingleNodeSelected"
-            :model-value="panelTitle"
-            :is-editing="isEditing"
-            :input-attrs="{ 'data-testid': 'node-title-input' }"
-            @edit="handleTitleEdit"
-            @cancel="handleTitleCancel"
-            @dblclick="isEditing = true"
-          />
+      <div class="flex items-center justify-between pr-3 pl-4">
+        <h3 class="my-3.5 line-clamp-2 cursor-default text-sm font-semibold">
+          <template v-if="allowTitleEdit">
+            <EditableText
+              :model-value="panelTitle"
+              :is-editing="isEditing"
+              :input-attrs="{ 'data-testid': 'node-title-input' }"
+              class="cursor-text"
+              @edit="handleTitleEdit"
+              @cancel="handleTitleCancel"
+              @click="isEditing = true"
+            />
+            <i
+              v-if="!isEditing"
+              class="relative top-[2px] ml-2 icon-[lucide--pencil] size-4 shrink-0 cursor-pointer content-center text-muted-foreground hover:text-base-foreground"
+              @click="isEditing = true"
+            />
+          </template>
           <template v-else>
             {{ panelTitle }}
           </template>
@@ -154,7 +275,7 @@ function handleTitleCancel() {
 
         <div class="flex gap-2">
           <Button
-            v-if="isSubgraphNode"
+            v-if="isSingleSubgraphNode"
             variant="secondary"
             size="icon"
             :class="cn(isEditingSubgraph && 'bg-secondary-background-selected')"
@@ -177,7 +298,7 @@ function handleTitleCancel() {
           </Button>
         </div>
       </div>
-      <nav v-if="hasSelection" class="px-4 pb-2 pt-1">
+      <nav class="overflow-x-auto px-4 pt-1 pb-2">
         <TabList
           :model-value="activeTab"
           @update:model-value="
@@ -189,10 +310,11 @@ function handleTitleCancel() {
           <Tab
             v-for="tab in tabs"
             :key="tab.value"
-            class="text-sm py-1 px-2 font-inter"
+            class="px-2 py-1 font-inter text-sm transition-all active:scale-95"
             :value="tab.value"
           >
             {{ tab.label() }}
+            <i v-if="tab.icon" :class="cn(tab.icon, 'size-4')" />
           </Tab>
         </TabList>
       </nav>
@@ -200,25 +322,30 @@ function handleTitleCancel() {
 
     <!-- Panel Content -->
     <div class="scrollbar-thin flex-1 overflow-y-auto">
-      <div
-        v-if="!hasSelection"
-        class="flex size-full p-4 items-start justify-start text-sm text-muted-foreground"
-      >
-        {{ $t('rightSidePanel.noSelection') }}
-      </div>
+      <TabErrors v-if="activeTab === 'errors'" />
+      <template v-else-if="!hasSelection">
+        <TabGlobalParameters v-if="activeTab === 'parameters'" />
+        <TabNodes v-else-if="activeTab === 'nodes'" />
+        <TabGlobalSettings v-else-if="activeTab === 'settings'" />
+      </template>
       <SubgraphEditor
-        v-else-if="isSubgraphNode && isEditingSubgraph"
-        :node="selectedNode"
+        v-else-if="isSingleSubgraphNode && isEditingSubgraph"
+        :node="selectedSingleNode"
       />
       <template v-else>
-        <TabParameters
-          v-if="activeTab === 'parameters'"
+        <TabSubgraphInputs
+          v-if="activeTab === 'parameters' && isSingleSubgraphNode"
+          :node="selectedSingleNode as SubgraphNode"
+        />
+        <TabNormalInputs
+          v-else-if="activeTab === 'parameters'"
           :nodes="selectedNodes"
+          :must-show-node-title="selectedGroups.length > 0"
         />
         <TabInfo v-else-if="activeTab === 'info'" :nodes="selectedNodes" />
         <TabSettings
           v-else-if="activeTab === 'settings'"
-          :nodes="selectedNodes"
+          :nodes="flattedItems"
         />
       </template>
     </div>
diff --git a/src/components/rightSidePanel/errors/ErrorNodeCard.stories.ts b/src/components/rightSidePanel/errors/ErrorNodeCard.stories.ts
new file mode 100644
index 0000000000..44e264aeaa
--- /dev/null
+++ b/src/components/rightSidePanel/errors/ErrorNodeCard.stories.ts
@@ -0,0 +1,162 @@
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+import ErrorNodeCard from './ErrorNodeCard.vue'
+import type { ErrorCardData } from './types'
+
+/**
+ * ErrorNodeCard displays a single error card inside the error tab.
+ * It shows the node header (ID badge, title, action buttons)
+ * and the list of error items (message, traceback, copy button).
+ */
+const meta: Meta<typeof ErrorNodeCard> = {
+  title: 'RightSidePanel/Errors/ErrorNodeCard',
+  component: ErrorNodeCard,
+  parameters: {
+    layout: 'centered'
+  },
+  argTypes: {
+    showNodeIdBadge: { control: 'boolean' }
+  },
+  decorators: [
+    (story) => ({
+      components: { story },
+      template:
+        '<div class="w-[330px] bg-base-surface border border-interface-stroke rounded-lg p-4"><story /></div>'
+    })
+  ]
+}
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+const singleErrorCard: ErrorCardData = {
+  id: 'node-10',
+  title: 'CLIPTextEncode',
+  nodeId: '10',
+  nodeTitle: 'CLIP Text Encode (Prompt)',
+  isSubgraphNode: false,
+  errors: [
+    {
+      message: 'Required input "text" is missing.',
+      details: 'Input: text\nExpected: STRING'
+    }
+  ]
+}
+
+const multipleErrorsCard: ErrorCardData = {
+  id: 'node-24',
+  title: 'VAEDecode',
+  nodeId: '24',
+  nodeTitle: 'VAE Decode',
+  isSubgraphNode: false,
+  errors: [
+    {
+      message: 'Required input "samples" is missing.',
+      details: ''
+    },
+    {
+      message: 'Value "NaN" is not a valid number for "strength".',
+      details: 'Expected: FLOAT [0.0 .. 1.0]'
+    }
+  ]
+}
+
+const runtimeErrorCard: ErrorCardData = {
+  id: 'exec-45',
+  title: 'KSampler',
+  nodeId: '45',
+  nodeTitle: 'KSampler',
+  isSubgraphNode: false,
+  errors: [
+    {
+      message: 'OutOfMemoryError: CUDA out of memory. Tried to allocate 1.2GB.',
+      details: [
+        'Traceback (most recent call last):',
+        '  File "ksampler.py", line 142, in sample',
+        '    samples = model.apply(latent)',
+        'RuntimeError: CUDA out of memory.'
+      ].join('\n'),
+      isRuntimeError: true
+    }
+  ]
+}
+
+const subgraphErrorCard: ErrorCardData = {
+  id: 'node-3:15',
+  title: 'KSampler',
+  nodeId: '3:15',
+  nodeTitle: 'Nested KSampler',
+  isSubgraphNode: true,
+  errors: [
+    {
+      message: 'Latent input is required.',
+      details: ''
+    }
+  ]
+}
+
+const promptOnlyCard: ErrorCardData = {
+  id: '__prompt__',
+  title: 'Prompt has no outputs.',
+  errors: [
+    {
+      message:
+        'The workflow does not contain any output nodes (e.g. Save Image, Preview Image) to produce a result.'
+    }
+  ]
+}
+
+/** Single validation error with node ID badge visible */
+export const WithNodeIdBadge: Story = {
+  args: {
+    card: singleErrorCard,
+    showNodeIdBadge: true
+  }
+}
+
+/** Single validation error without node ID badge */
+export const WithoutNodeIdBadge: Story = {
+  args: {
+    card: singleErrorCard,
+    showNodeIdBadge: false
+  }
+}
+
+/** Subgraph node error — shows "Enter subgraph" button */
+export const WithEnterSubgraphButton: Story = {
+  args: {
+    card: subgraphErrorCard,
+    showNodeIdBadge: true
+  }
+}
+
+/** Regular node error — no "Enter subgraph" button */
+export const WithoutEnterSubgraphButton: Story = {
+  args: {
+    card: singleErrorCard,
+    showNodeIdBadge: true
+  }
+}
+
+/** Multiple validation errors on one node */
+export const MultipleErrors: Story = {
+  args: {
+    card: multipleErrorsCard,
+    showNodeIdBadge: true
+  }
+}
+
+/** Runtime execution error with full traceback */
+export const RuntimeError: Story = {
+  args: {
+    card: runtimeErrorCard,
+    showNodeIdBadge: true
+  }
+}
+
+/** Prompt-level error (no node header) */
+export const PromptError: Story = {
+  args: {
+    card: promptOnlyCard,
+    showNodeIdBadge: false
+  }
+}
diff --git a/src/components/rightSidePanel/errors/ErrorNodeCard.vue b/src/components/rightSidePanel/errors/ErrorNodeCard.vue
new file mode 100644
index 0000000000..98b1746ee0
--- /dev/null
+++ b/src/components/rightSidePanel/errors/ErrorNodeCard.vue
@@ -0,0 +1,134 @@
+<template>
+  <div class="overflow-hidden">
+    <!-- Card Header -->
+    <div
+      v-if="card.nodeId && !compact"
+      class="flex flex-wrap items-center gap-2 py-2"
+    >
+      <span
+        v-if="showNodeIdBadge"
+        class="shrink-0 rounded-md bg-secondary-background-selected px-2 py-0.5 font-mono text-xs font-bold text-muted-foreground"
+      >
+        #{{ card.nodeId }}
+      </span>
+      <span
+        v-if="card.nodeTitle"
+        class="flex-1 truncate text-sm font-medium text-muted-foreground"
+      >
+        {{ card.nodeTitle }}
+      </span>
+      <div class="flex shrink-0 items-center">
+        <Button
+          v-if="card.isSubgraphNode"
+          variant="secondary"
+          size="sm"
+          class="h-8 shrink-0 rounded-lg text-sm"
+          @click.stop="handleEnterSubgraph"
+        >
+          {{ t('rightSidePanel.enterSubgraph') }}
+        </Button>
+        <Button
+          variant="textonly"
+          size="icon-sm"
+          class="size-8 shrink-0 text-muted-foreground hover:text-base-foreground"
+          :aria-label="t('rightSidePanel.locateNode')"
+          @click.stop="handleLocateNode"
+        >
+          <i class="icon-[lucide--locate] size-4" />
+        </Button>
+      </div>
+    </div>
+
+    <!-- Multiple Errors within one Card -->
+    <div class="space-y-4 divide-y divide-interface-stroke/20">
+      <!-- Card Content -->
+      <div
+        v-for="(error, idx) in card.errors"
+        :key="idx"
+        class="flex flex-col gap-3"
+      >
+        <!-- Error Message -->
+        <p
+          v-if="error.message"
+          class="m-0 max-h-[4lh] overflow-y-auto px-0.5 text-sm/relaxed wrap-break-word whitespace-pre-wrap"
+        >
+          {{ error.message }}
+        </p>
+
+        <!-- Traceback / Details -->
+        <div
+          v-if="error.details"
+          :class="
+            cn(
+              'overflow-y-auto rounded-lg border border-interface-stroke/30 bg-secondary-background-hover p-2.5',
+              error.isRuntimeError ? 'max-h-[10lh]' : 'max-h-[6lh]'
+            )
+          "
+        >
+          <p
+            class="m-0 font-mono text-xs/relaxed wrap-break-word whitespace-pre-wrap text-muted-foreground"
+          >
+            {{ error.details }}
+          </p>
+        </div>
+
+        <Button
+          variant="secondary"
+          size="sm"
+          class="h-8 w-full justify-center gap-2 text-xs"
+          @click="handleCopyError(error)"
+        >
+          <i class="icon-[lucide--copy] size-3.5" />
+          {{ t('g.copy') }}
+        </Button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+import { cn } from '@/utils/tailwindUtil'
+
+import type { ErrorCardData, ErrorItem } from './types'
+
+const {
+  card,
+  showNodeIdBadge = false,
+  compact = false
+} = defineProps<{
+  card: ErrorCardData
+  showNodeIdBadge?: boolean
+  /** Hide card header and error message (used in single-node selection mode) */
+  compact?: boolean
+}>()
+
+const emit = defineEmits<{
+  locateNode: [nodeId: string]
+  enterSubgraph: [nodeId: string]
+  copyToClipboard: [text: string]
+}>()
+
+const { t } = useI18n()
+
+function handleLocateNode() {
+  if (card.nodeId) {
+    emit('locateNode', card.nodeId)
+  }
+}
+
+function handleEnterSubgraph() {
+  if (card.nodeId) {
+    emit('enterSubgraph', card.nodeId)
+  }
+}
+
+function handleCopyError(error: ErrorItem) {
+  emit(
+    'copyToClipboard',
+    [error.message, error.details].filter(Boolean).join('\n\n')
+  )
+}
+</script>
diff --git a/src/components/rightSidePanel/errors/MissingNodeCard.test.ts b/src/components/rightSidePanel/errors/MissingNodeCard.test.ts
new file mode 100644
index 0000000000..a85a1436d1
--- /dev/null
+++ b/src/components/rightSidePanel/errors/MissingNodeCard.test.ts
@@ -0,0 +1,237 @@
+import { mount } from '@vue/test-utils'
+import { createTestingPinia } from '@pinia/testing'
+import PrimeVue from 'primevue/config'
+import { ref } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+import type { MissingPackGroup } from '@/components/rightSidePanel/errors/useErrorGroups'
+
+const mockIsCloud = { value: false }
+vi.mock('@/platform/distribution/types', () => ({
+  get isCloud() {
+    return mockIsCloud.value
+  }
+}))
+
+const mockApplyChanges = vi.fn()
+const mockIsRestarting = ref(false)
+vi.mock('@/workbench/extensions/manager/composables/useApplyChanges', () => ({
+  useApplyChanges: () => ({
+    isRestarting: mockIsRestarting,
+    applyChanges: mockApplyChanges
+  })
+}))
+
+const mockIsPackInstalled = vi.fn(() => false)
+vi.mock('@/workbench/extensions/manager/stores/comfyManagerStore', () => ({
+  useComfyManagerStore: () => ({
+    isPackInstalled: mockIsPackInstalled
+  })
+}))
+
+const mockShouldShowManagerButtons = { value: false }
+vi.mock('@/workbench/extensions/manager/composables/useManagerState', () => ({
+  useManagerState: () => ({
+    shouldShowManagerButtons: mockShouldShowManagerButtons
+  })
+}))
+
+vi.mock('./MissingPackGroupRow.vue', () => ({
+  default: {
+    name: 'MissingPackGroupRow',
+    template: '<div class="pack-row" />',
+    props: ['group', 'showInfoButton', 'showNodeIdBadge'],
+    emits: ['locate-node', 'open-manager-info']
+  }
+}))
+
+import MissingNodeCard from './MissingNodeCard.vue'
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      rightSidePanel: {
+        missingNodePacks: {
+          ossMessage: 'Missing node packs detected. Install them.',
+          cloudMessage: 'Unsupported node packs detected.',
+          ossManagerDisabledHint:
+            'To install missing nodes, first run {pipCmd} in your Python environment to install Node Manager, then restart ComfyUI with the {flag} flag.',
+          applyChanges: 'Apply Changes'
+        }
+      }
+    }
+  },
+  missingWarn: false,
+  fallbackWarn: false
+})
+
+function makePackGroups(count = 2): MissingPackGroup[] {
+  return Array.from({ length: count }, (_, i) => ({
+    packId: `pack-${i}`,
+    nodeTypes: [
+      { type: `MissingNode${i}`, nodeId: String(i), isReplaceable: false }
+    ],
+    isResolving: false
+  }))
+}
+
+function mountCard(
+  props: Partial<{
+    showInfoButton: boolean
+    showNodeIdBadge: boolean
+    missingPackGroups: MissingPackGroup[]
+  }> = {}
+) {
+  return mount(MissingNodeCard, {
+    props: {
+      showInfoButton: false,
+      showNodeIdBadge: false,
+      missingPackGroups: makePackGroups(),
+      ...props
+    },
+    global: {
+      plugins: [createTestingPinia({ createSpy: vi.fn }), PrimeVue, i18n],
+      stubs: {
+        DotSpinner: { template: '<span role="status" aria-label="loading" />' }
+      }
+    }
+  })
+}
+
+describe('MissingNodeCard', () => {
+  beforeEach(() => {
+    mockApplyChanges.mockClear()
+    mockIsPackInstalled.mockReset()
+    mockIsPackInstalled.mockReturnValue(false)
+    mockIsCloud.value = false
+    mockShouldShowManagerButtons.value = false
+    mockIsRestarting.value = false
+  })
+
+  describe('Rendering & Props', () => {
+    it('renders cloud message when isCloud is true', () => {
+      mockIsCloud.value = true
+      const wrapper = mountCard()
+      expect(wrapper.text()).toContain('Unsupported node packs detected')
+    })
+
+    it('renders OSS message when isCloud is false', () => {
+      const wrapper = mountCard()
+      expect(wrapper.text()).toContain('Missing node packs detected')
+    })
+
+    it('renders correct number of MissingPackGroupRow components', () => {
+      const wrapper = mountCard({ missingPackGroups: makePackGroups(3) })
+      expect(
+        wrapper.findAllComponents({ name: 'MissingPackGroupRow' })
+      ).toHaveLength(3)
+    })
+
+    it('renders zero rows when missingPackGroups is empty', () => {
+      const wrapper = mountCard({ missingPackGroups: [] })
+      expect(
+        wrapper.findAllComponents({ name: 'MissingPackGroupRow' })
+      ).toHaveLength(0)
+    })
+
+    it('passes props correctly to MissingPackGroupRow children', () => {
+      const wrapper = mountCard({
+        showInfoButton: true,
+        showNodeIdBadge: true
+      })
+      const row = wrapper.findComponent({ name: 'MissingPackGroupRow' })
+      expect(row.props('showInfoButton')).toBe(true)
+      expect(row.props('showNodeIdBadge')).toBe(true)
+    })
+  })
+
+  describe('Manager Disabled Hint', () => {
+    it('shows hint when OSS and manager is disabled (showInfoButton false)', () => {
+      mockIsCloud.value = false
+      const wrapper = mountCard({ showInfoButton: false })
+      expect(wrapper.text()).toContain('pip install -U --pre comfyui-manager')
+      expect(wrapper.text()).toContain('--enable-manager')
+    })
+
+    it('hides hint when manager is enabled (showInfoButton true)', () => {
+      mockIsCloud.value = false
+      const wrapper = mountCard({ showInfoButton: true })
+      expect(wrapper.text()).not.toContain('--enable-manager')
+    })
+
+    it('hides hint on Cloud even when showInfoButton is false', () => {
+      mockIsCloud.value = true
+      const wrapper = mountCard({ showInfoButton: false })
+      expect(wrapper.text()).not.toContain('--enable-manager')
+    })
+  })
+
+  describe('Apply Changes Section', () => {
+    it('hides Apply Changes when manager is not enabled', () => {
+      mockShouldShowManagerButtons.value = false
+      const wrapper = mountCard()
+      expect(wrapper.text()).not.toContain('Apply Changes')
+    })
+
+    it('hides Apply Changes when manager enabled but no packs pending', () => {
+      mockShouldShowManagerButtons.value = true
+      mockIsPackInstalled.mockReturnValue(false)
+      const wrapper = mountCard()
+      expect(wrapper.text()).not.toContain('Apply Changes')
+    })
+
+    it('shows Apply Changes when at least one pack is pending restart', () => {
+      mockShouldShowManagerButtons.value = true
+      mockIsPackInstalled.mockReturnValue(true)
+      const wrapper = mountCard()
+      expect(wrapper.text()).toContain('Apply Changes')
+    })
+
+    it('displays spinner during restart', () => {
+      mockShouldShowManagerButtons.value = true
+      mockIsPackInstalled.mockReturnValue(true)
+      mockIsRestarting.value = true
+      const wrapper = mountCard()
+      expect(wrapper.find('[role="status"]').exists()).toBe(true)
+    })
+
+    it('disables button during restart', () => {
+      mockShouldShowManagerButtons.value = true
+      mockIsPackInstalled.mockReturnValue(true)
+      mockIsRestarting.value = true
+      const wrapper = mountCard()
+      const btn = wrapper.find('button')
+      expect(btn.attributes('disabled')).toBeDefined()
+    })
+
+    it('calls applyChanges when Apply Changes button is clicked', async () => {
+      mockShouldShowManagerButtons.value = true
+      mockIsPackInstalled.mockReturnValue(true)
+      const wrapper = mountCard()
+      const btn = wrapper.find('button')
+      await btn.trigger('click')
+      expect(mockApplyChanges).toHaveBeenCalledOnce()
+    })
+  })
+
+  describe('Event Handling', () => {
+    it('emits locateNode when child emits locate-node', async () => {
+      const wrapper = mountCard()
+      const row = wrapper.findComponent({ name: 'MissingPackGroupRow' })
+      await row.vm.$emit('locate-node', '42')
+      expect(wrapper.emitted('locateNode')).toBeTruthy()
+      expect(wrapper.emitted('locateNode')?.[0]).toEqual(['42'])
+    })
+
+    it('emits openManagerInfo when child emits open-manager-info', async () => {
+      const wrapper = mountCard()
+      const row = wrapper.findComponent({ name: 'MissingPackGroupRow' })
+      await row.vm.$emit('open-manager-info', 'pack-0')
+      expect(wrapper.emitted('openManagerInfo')).toBeTruthy()
+      expect(wrapper.emitted('openManagerInfo')?.[0]).toEqual(['pack-0'])
+    })
+  })
+})
diff --git a/src/components/rightSidePanel/errors/MissingNodeCard.vue b/src/components/rightSidePanel/errors/MissingNodeCard.vue
new file mode 100644
index 0000000000..c7f6daa7ce
--- /dev/null
+++ b/src/components/rightSidePanel/errors/MissingNodeCard.vue
@@ -0,0 +1,110 @@
+<template>
+  <div class="px-4 pb-2">
+    <!-- Sub-label: cloud or OSS message shown above all pack groups -->
+    <p
+      class="m-0 text-sm/relaxed text-muted-foreground"
+      :class="showManagerHint ? 'pb-3' : 'pb-5'"
+    >
+      {{
+        isCloud
+          ? t('rightSidePanel.missingNodePacks.cloudMessage')
+          : t('rightSidePanel.missingNodePacks.ossMessage')
+      }}
+    </p>
+
+    <!-- Manager disabled hint: shown on OSS when manager is not active -->
+    <i18n-t
+      v-if="showManagerHint"
+      keypath="rightSidePanel.missingNodePacks.ossManagerDisabledHint"
+      tag="p"
+      class="m-0 pb-5 text-sm/relaxed text-muted-foreground"
+    >
+      <template #pipCmd>
+        <code
+          class="rounded-sm bg-comfy-menu-bg px-1 py-0.5 font-mono text-xs text-comfy-input-foreground"
+          >pip install -U --pre comfyui-manager</code
+        >
+      </template>
+      <template #flag>
+        <code
+          class="rounded-sm bg-comfy-menu-bg px-1 py-0.5 font-mono text-xs text-comfy-input-foreground"
+          >--enable-manager</code
+        >
+      </template>
+    </i18n-t>
+    <MissingPackGroupRow
+      v-for="group in missingPackGroups"
+      :key="group.packId ?? '__unknown__'"
+      :group="group"
+      :show-info-button="showInfoButton"
+      :show-node-id-badge="showNodeIdBadge"
+      @locate-node="emit('locateNode', $event)"
+      @open-manager-info="emit('openManagerInfo', $event)"
+    />
+  </div>
+
+  <!-- Apply Changes: shown when manager enabled and at least one pack install succeeded -->
+  <div v-if="shouldShowManagerButtons" class="px-4">
+    <Button
+      v-if="hasInstalledPacksPendingRestart"
+      variant="primary"
+      :disabled="isRestarting"
+      class="mt-2 h-9 w-full justify-center gap-2 text-sm font-semibold"
+      @click="applyChanges()"
+    >
+      <DotSpinner v-if="isRestarting" duration="1s" :size="14" />
+      <i v-else class="icon-[lucide--refresh-cw] size-4 shrink-0" />
+      <span class="min-w-0 truncate">{{
+        t('rightSidePanel.missingNodePacks.applyChanges')
+      }}</span>
+    </Button>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+import Button from '@/components/ui/button/Button.vue'
+import DotSpinner from '@/components/common/DotSpinner.vue'
+import { useApplyChanges } from '@/workbench/extensions/manager/composables/useApplyChanges'
+import { useComfyManagerStore } from '@/workbench/extensions/manager/stores/comfyManagerStore'
+import { isCloud } from '@/platform/distribution/types'
+import { useManagerState } from '@/workbench/extensions/manager/composables/useManagerState'
+import type { MissingPackGroup } from '@/components/rightSidePanel/errors/useErrorGroups'
+import MissingPackGroupRow from '@/components/rightSidePanel/errors/MissingPackGroupRow.vue'
+
+const props = defineProps<{
+  showInfoButton: boolean
+  showNodeIdBadge: boolean
+  missingPackGroups: MissingPackGroup[]
+}>()
+
+const emit = defineEmits<{
+  locateNode: [nodeId: string]
+  openManagerInfo: [packId: string]
+}>()
+
+const { t } = useI18n()
+
+const comfyManagerStore = useComfyManagerStore()
+const { isRestarting, applyChanges } = useApplyChanges()
+const { shouldShowManagerButtons } = useManagerState()
+
+/**
+ * Show the --enable-manager hint when:
+ * - Not on Cloud (OSS/local only)
+ * - Manager is disabled (showInfoButton is false)
+ */
+const showManagerHint = computed(() => !isCloud && !props.showInfoButton)
+
+/**
+ * Show Apply Changes when any pack from the error group is already installed
+ * on disk but ComfyUI hasn't restarted yet to load it.
+ * This is server-state based → persists across browser refreshes.
+ */
+const hasInstalledPacksPendingRestart = computed(() =>
+  props.missingPackGroups.some(
+    (g) => g.packId !== null && comfyManagerStore.isPackInstalled(g.packId)
+  )
+)
+</script>
diff --git a/src/components/rightSidePanel/errors/MissingPackGroupRow.test.ts b/src/components/rightSidePanel/errors/MissingPackGroupRow.test.ts
new file mode 100644
index 0000000000..b923a4f0e9
--- /dev/null
+++ b/src/components/rightSidePanel/errors/MissingPackGroupRow.test.ts
@@ -0,0 +1,368 @@
+import { mount } from '@vue/test-utils'
+import { createTestingPinia } from '@pinia/testing'
+import PrimeVue from 'primevue/config'
+import { ref } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+import type { MissingPackGroup } from '@/components/rightSidePanel/errors/useErrorGroups'
+
+const mockInstallAllPacks = vi.fn()
+const mockIsInstalling = ref(false)
+const mockIsPackInstalled = vi.fn(() => false)
+const mockShouldShowManagerButtons = { value: false }
+const mockOpenManager = vi.fn()
+const mockMissingNodePacks = ref<Array<{ id: string; name: string }>>([])
+const mockIsLoading = ref(false)
+
+vi.mock(
+  '@/workbench/extensions/manager/composables/nodePack/useMissingNodes',
+  () => ({
+    useMissingNodes: () => ({
+      missingNodePacks: mockMissingNodePacks,
+      isLoading: mockIsLoading
+    })
+  })
+)
+
+vi.mock(
+  '@/workbench/extensions/manager/composables/nodePack/usePackInstall',
+  () => ({
+    usePackInstall: () => ({
+      isInstalling: mockIsInstalling,
+      installAllPacks: mockInstallAllPacks
+    })
+  })
+)
+
+vi.mock('@/workbench/extensions/manager/stores/comfyManagerStore', () => ({
+  useComfyManagerStore: () => ({
+    isPackInstalled: mockIsPackInstalled
+  })
+}))
+
+vi.mock('@/workbench/extensions/manager/composables/useManagerState', () => ({
+  useManagerState: () => ({
+    shouldShowManagerButtons: mockShouldShowManagerButtons,
+    openManager: mockOpenManager
+  })
+}))
+
+vi.mock('@/workbench/extensions/manager/types/comfyManagerTypes', () => ({
+  ManagerTab: { Missing: 'missing', All: 'all' }
+}))
+
+import MissingPackGroupRow from './MissingPackGroupRow.vue'
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      g: {
+        loading: 'Loading'
+      },
+      rightSidePanel: {
+        locateNode: 'Locate node on canvas',
+        missingNodePacks: {
+          unknownPack: 'Unknown pack',
+          installNodePack: 'Install node pack',
+          installing: 'Installing...',
+          installed: 'Installed',
+          searchInManager: 'Search in Node Manager',
+          viewInManager: 'View in Manager',
+          collapse: 'Collapse',
+          expand: 'Expand'
+        }
+      }
+    }
+  },
+  missingWarn: false,
+  fallbackWarn: false
+})
+
+function makeGroup(
+  overrides: Partial<MissingPackGroup> = {}
+): MissingPackGroup {
+  return {
+    packId: 'my-pack',
+    nodeTypes: [
+      { type: 'MissingA', nodeId: '10', isReplaceable: false },
+      { type: 'MissingB', nodeId: '11', isReplaceable: false }
+    ],
+    isResolving: false,
+    ...overrides
+  }
+}
+
+function mountRow(
+  props: Partial<{
+    group: MissingPackGroup
+    showInfoButton: boolean
+    showNodeIdBadge: boolean
+  }> = {}
+) {
+  return mount(MissingPackGroupRow, {
+    props: {
+      group: makeGroup(),
+      showInfoButton: false,
+      showNodeIdBadge: false,
+      ...props
+    },
+    global: {
+      plugins: [createTestingPinia({ createSpy: vi.fn }), PrimeVue, i18n],
+      stubs: {
+        TransitionCollapse: { template: '<div><slot /></div>' },
+        DotSpinner: {
+          template: '<span role="status" aria-label="loading" />'
+        }
+      }
+    }
+  })
+}
+
+describe('MissingPackGroupRow', () => {
+  beforeEach(() => {
+    mockInstallAllPacks.mockClear()
+    mockOpenManager.mockClear()
+    mockIsPackInstalled.mockReset()
+    mockIsPackInstalled.mockReturnValue(false)
+    mockShouldShowManagerButtons.value = false
+    mockIsInstalling.value = false
+    mockMissingNodePacks.value = []
+    mockIsLoading.value = false
+  })
+
+  describe('Basic Rendering', () => {
+    it('renders pack name from packId', () => {
+      const wrapper = mountRow()
+      expect(wrapper.text()).toContain('my-pack')
+    })
+
+    it('renders "Unknown pack" when packId is null', () => {
+      const wrapper = mountRow({ group: makeGroup({ packId: null }) })
+      expect(wrapper.text()).toContain('Unknown pack')
+    })
+
+    it('renders loading text when isResolving is true', () => {
+      const wrapper = mountRow({ group: makeGroup({ isResolving: true }) })
+      expect(wrapper.text()).toContain('Loading')
+    })
+
+    it('renders node count', () => {
+      const wrapper = mountRow()
+      expect(wrapper.text()).toContain('(2)')
+    })
+
+    it('renders count of 5 for 5 nodeTypes', () => {
+      const wrapper = mountRow({
+        group: makeGroup({
+          nodeTypes: Array.from({ length: 5 }, (_, i) => ({
+            type: `Node${i}`,
+            nodeId: String(i),
+            isReplaceable: false
+          }))
+        })
+      })
+      expect(wrapper.text()).toContain('(5)')
+    })
+  })
+
+  describe('Expand / Collapse', () => {
+    it('starts collapsed', () => {
+      const wrapper = mountRow()
+      expect(wrapper.text()).not.toContain('MissingA')
+    })
+
+    it('expands when chevron is clicked', async () => {
+      const wrapper = mountRow()
+      await wrapper.get('button[aria-label="Expand"]').trigger('click')
+      expect(wrapper.text()).toContain('MissingA')
+      expect(wrapper.text()).toContain('MissingB')
+    })
+
+    it('collapses when chevron is clicked again', async () => {
+      const wrapper = mountRow()
+      await wrapper.get('button[aria-label="Expand"]').trigger('click')
+      expect(wrapper.text()).toContain('MissingA')
+      await wrapper.get('button[aria-label="Collapse"]').trigger('click')
+      expect(wrapper.text()).not.toContain('MissingA')
+    })
+  })
+
+  describe('Node Type List', () => {
+    async function expand(wrapper: ReturnType<typeof mountRow>) {
+      await wrapper.get('button[aria-label="Expand"]').trigger('click')
+    }
+
+    it('renders all nodeTypes when expanded', async () => {
+      const wrapper = mountRow({
+        group: makeGroup({
+          nodeTypes: [
+            { type: 'NodeA', nodeId: '1', isReplaceable: false },
+            { type: 'NodeB', nodeId: '2', isReplaceable: false },
+            { type: 'NodeC', nodeId: '3', isReplaceable: false }
+          ]
+        })
+      })
+      await expand(wrapper)
+      expect(wrapper.text()).toContain('NodeA')
+      expect(wrapper.text()).toContain('NodeB')
+      expect(wrapper.text()).toContain('NodeC')
+    })
+
+    it('shows nodeId badge when showNodeIdBadge is true', async () => {
+      const wrapper = mountRow({ showNodeIdBadge: true })
+      await expand(wrapper)
+      expect(wrapper.text()).toContain('#10')
+    })
+
+    it('hides nodeId badge when showNodeIdBadge is false', async () => {
+      const wrapper = mountRow({ showNodeIdBadge: false })
+      await expand(wrapper)
+      expect(wrapper.text()).not.toContain('#10')
+    })
+
+    it('emits locateNode when Locate button is clicked', async () => {
+      const wrapper = mountRow({ showNodeIdBadge: true })
+      await expand(wrapper)
+      await wrapper
+        .get('button[aria-label="Locate node on canvas"]')
+        .trigger('click')
+      expect(wrapper.emitted('locateNode')).toBeTruthy()
+      expect(wrapper.emitted('locateNode')?.[0]).toEqual(['10'])
+    })
+
+    it('does not show Locate for nodeType without nodeId', async () => {
+      const wrapper = mountRow({
+        group: makeGroup({
+          nodeTypes: [{ type: 'NoId', isReplaceable: false } as never]
+        })
+      })
+      await expand(wrapper)
+      expect(
+        wrapper.find('button[aria-label="Locate node on canvas"]').exists()
+      ).toBe(false)
+    })
+
+    it('handles mixed nodeTypes with and without nodeId', async () => {
+      const wrapper = mountRow({
+        showNodeIdBadge: true,
+        group: makeGroup({
+          nodeTypes: [
+            { type: 'WithId', nodeId: '100', isReplaceable: false },
+            { type: 'WithoutId', isReplaceable: false } as never
+          ]
+        })
+      })
+      await expand(wrapper)
+      expect(wrapper.text()).toContain('WithId')
+      expect(wrapper.text()).toContain('WithoutId')
+      expect(
+        wrapper.findAll('button[aria-label="Locate node on canvas"]')
+      ).toHaveLength(1)
+    })
+  })
+
+  describe('Manager Integration', () => {
+    it('hides install UI when shouldShowManagerButtons is false', () => {
+      mockShouldShowManagerButtons.value = false
+      const wrapper = mountRow()
+      expect(wrapper.text()).not.toContain('Install node pack')
+    })
+
+    it('hides install UI when packId is null', () => {
+      mockShouldShowManagerButtons.value = true
+      const wrapper = mountRow({ group: makeGroup({ packId: null }) })
+      expect(wrapper.text()).not.toContain('Install node pack')
+    })
+
+    it('shows "Search in Node Manager" when packId exists but pack not in registry', () => {
+      mockShouldShowManagerButtons.value = true
+      mockIsPackInstalled.mockReturnValue(false)
+      mockMissingNodePacks.value = []
+      const wrapper = mountRow()
+      expect(wrapper.text()).toContain('Search in Node Manager')
+    })
+
+    it('shows "Installed" state when pack is installed', () => {
+      mockShouldShowManagerButtons.value = true
+      mockIsPackInstalled.mockReturnValue(true)
+      mockMissingNodePacks.value = [{ id: 'my-pack', name: 'My Pack' }]
+      const wrapper = mountRow()
+      expect(wrapper.text()).toContain('Installed')
+    })
+
+    it('shows spinner when installing', () => {
+      mockShouldShowManagerButtons.value = true
+      mockIsInstalling.value = true
+      mockMissingNodePacks.value = [{ id: 'my-pack', name: 'My Pack' }]
+      const wrapper = mountRow()
+      expect(wrapper.find('[role="status"]').exists()).toBe(true)
+    })
+
+    it('shows install button when not installed and pack found', () => {
+      mockShouldShowManagerButtons.value = true
+      mockIsPackInstalled.mockReturnValue(false)
+      mockMissingNodePacks.value = [{ id: 'my-pack', name: 'My Pack' }]
+      const wrapper = mountRow()
+      expect(wrapper.text()).toContain('Install node pack')
+    })
+
+    it('calls installAllPacks when Install button is clicked', async () => {
+      mockShouldShowManagerButtons.value = true
+      mockIsPackInstalled.mockReturnValue(false)
+      mockMissingNodePacks.value = [{ id: 'my-pack', name: 'My Pack' }]
+      const wrapper = mountRow()
+      await wrapper.get('button:not([aria-label])').trigger('click')
+      expect(mockInstallAllPacks).toHaveBeenCalledOnce()
+    })
+
+    it('shows loading spinner when registry is loading', () => {
+      mockShouldShowManagerButtons.value = true
+      mockIsLoading.value = true
+      const wrapper = mountRow()
+      expect(wrapper.find('[role="status"]').exists()).toBe(true)
+    })
+  })
+
+  describe('Info Button', () => {
+    it('shows Info button when showInfoButton true and packId not null', () => {
+      const wrapper = mountRow({ showInfoButton: true })
+      expect(
+        wrapper.find('button[aria-label="View in Manager"]').exists()
+      ).toBe(true)
+    })
+
+    it('hides Info button when showInfoButton is false', () => {
+      const wrapper = mountRow({ showInfoButton: false })
+      expect(
+        wrapper.find('button[aria-label="View in Manager"]').exists()
+      ).toBe(false)
+    })
+
+    it('hides Info button when packId is null', () => {
+      const wrapper = mountRow({
+        showInfoButton: true,
+        group: makeGroup({ packId: null })
+      })
+      expect(
+        wrapper.find('button[aria-label="View in Manager"]').exists()
+      ).toBe(false)
+    })
+
+    it('emits openManagerInfo when Info button is clicked', async () => {
+      const wrapper = mountRow({ showInfoButton: true })
+      await wrapper.get('button[aria-label="View in Manager"]').trigger('click')
+      expect(wrapper.emitted('openManagerInfo')).toBeTruthy()
+      expect(wrapper.emitted('openManagerInfo')?.[0]).toEqual(['my-pack'])
+    })
+  })
+
+  describe('Edge Cases', () => {
+    it('handles empty nodeTypes array', () => {
+      const wrapper = mountRow({ group: makeGroup({ nodeTypes: [] }) })
+      expect(wrapper.text()).toContain('(0)')
+    })
+  })
+})
diff --git a/src/components/rightSidePanel/errors/MissingPackGroupRow.vue b/src/components/rightSidePanel/errors/MissingPackGroupRow.vue
new file mode 100644
index 0000000000..f026ad772e
--- /dev/null
+++ b/src/components/rightSidePanel/errors/MissingPackGroupRow.vue
@@ -0,0 +1,250 @@
+<template>
+  <div class="mb-2 flex w-full flex-col">
+    <!-- Pack header row: pack name + info + chevron -->
+    <div class="flex h-8 w-full items-center">
+      <!-- Warning icon for unknown packs -->
+      <i
+        v-if="group.packId === null && !group.isResolving"
+        class="mr-1.5 icon-[lucide--triangle-alert] size-4 shrink-0 text-warning-background"
+      />
+      <p
+        class="min-w-0 flex-1 truncate text-sm font-medium"
+        :class="
+          group.packId === null && !group.isResolving
+            ? 'text-warning-background'
+            : 'text-foreground'
+        "
+      >
+        <span v-if="group.isResolving" class="text-muted-foreground italic">
+          {{ t('g.loading') }}...
+        </span>
+        <span v-else>
+          {{
+            `${group.packId ?? t('rightSidePanel.missingNodePacks.unknownPack')} (${group.nodeTypes.length})`
+          }}
+        </span>
+      </p>
+      <Button
+        v-if="showInfoButton && group.packId !== null"
+        variant="textonly"
+        size="icon-sm"
+        class="size-8 shrink-0 text-muted-foreground hover:text-base-foreground"
+        :aria-label="t('rightSidePanel.missingNodePacks.viewInManager')"
+        @click="emit('openManagerInfo', group.packId ?? '')"
+      >
+        <i class="icon-[lucide--info] size-4" />
+      </Button>
+      <Button
+        variant="textonly"
+        size="icon-sm"
+        :class="
+          cn(
+            'size-8 shrink-0 transition-transform duration-200 hover:bg-transparent',
+            { 'rotate-180': expanded }
+          )
+        "
+        :aria-label="
+          expanded
+            ? t('rightSidePanel.missingNodePacks.collapse')
+            : t('rightSidePanel.missingNodePacks.expand')
+        "
+        @click="toggleExpand"
+      >
+        <i
+          class="icon-[lucide--chevron-down] size-4 text-muted-foreground group-hover:text-base-foreground"
+        />
+      </Button>
+    </div>
+
+    <!-- Sub-labels: individual node instances, each with their own Locate button -->
+    <TransitionCollapse>
+      <div
+        v-if="expanded"
+        class="mb-1 flex flex-col gap-0.5 overflow-hidden pl-2"
+      >
+        <div
+          v-for="nodeType in group.nodeTypes"
+          :key="getKey(nodeType)"
+          class="flex h-7 items-center"
+        >
+          <span
+            v-if="
+              showNodeIdBadge &&
+              typeof nodeType !== 'string' &&
+              nodeType.nodeId != null
+            "
+            class="mr-1 shrink-0 rounded-md bg-secondary-background-selected px-2 py-0.5 font-mono text-xs font-bold text-muted-foreground"
+          >
+            #{{ nodeType.nodeId }}
+          </span>
+          <p class="min-w-0 flex-1 truncate text-xs text-muted-foreground">
+            {{ getLabel(nodeType) }}
+          </p>
+          <Button
+            v-if="typeof nodeType !== 'string' && nodeType.nodeId != null"
+            variant="textonly"
+            size="icon-sm"
+            class="mr-1 size-6 shrink-0 text-muted-foreground hover:text-base-foreground"
+            :aria-label="t('rightSidePanel.locateNode')"
+            @click="handleLocateNode(nodeType)"
+          >
+            <i class="icon-[lucide--locate] size-3" />
+          </Button>
+        </div>
+      </div>
+    </TransitionCollapse>
+
+    <!-- Install button: shown when manager enabled, registry knows the pack or it's already installed -->
+    <div
+      v-if="
+        shouldShowManagerButtons &&
+        group.packId !== null &&
+        (nodePack || comfyManagerStore.isPackInstalled(group.packId))
+      "
+      class="flex w-full items-start py-1"
+    >
+      <Button
+        variant="secondary"
+        size="md"
+        class="flex w-full flex-1"
+        :disabled="
+          comfyManagerStore.isPackInstalled(group.packId) || isInstalling
+        "
+        @click="handlePackInstallClick"
+      >
+        <DotSpinner
+          v-if="isInstalling"
+          duration="1s"
+          :size="12"
+          class="mr-1.5 shrink-0"
+        />
+        <i
+          v-else-if="comfyManagerStore.isPackInstalled(group.packId)"
+          class="text-foreground mr-1 icon-[lucide--check] size-4 shrink-0"
+        />
+        <i
+          v-else
+          class="text-foreground mr-1 icon-[lucide--download] size-4 shrink-0"
+        />
+        <span class="text-foreground min-w-0 truncate text-sm">
+          {{
+            isInstalling
+              ? t('rightSidePanel.missingNodePacks.installing')
+              : comfyManagerStore.isPackInstalled(group.packId)
+                ? t('rightSidePanel.missingNodePacks.installed')
+                : t('rightSidePanel.missingNodePacks.installNodePack')
+          }}
+        </span>
+      </Button>
+    </div>
+
+    <!-- Registry still loading: packId known but result not yet available -->
+    <div
+      v-else-if="group.packId !== null && shouldShowManagerButtons && isLoading"
+      class="flex w-full items-start py-1"
+    >
+      <div
+        class="flex h-8 min-w-0 flex-1 cursor-not-allowed items-center justify-center overflow-hidden rounded-lg bg-secondary-background p-2 opacity-60 select-none"
+      >
+        <DotSpinner duration="1s" :size="12" class="mr-1.5 shrink-0" />
+        <span class="text-foreground min-w-0 truncate text-sm">
+          {{ t('g.loading') }}
+        </span>
+      </div>
+    </div>
+
+    <!-- Search in Manager: fetch done but pack not found in registry -->
+    <div
+      v-else-if="group.packId !== null && shouldShowManagerButtons"
+      class="flex w-full items-start py-1"
+    >
+      <Button
+        variant="secondary"
+        size="md"
+        class="flex w-full flex-1"
+        @click="
+          openManager({
+            initialTab: ManagerTab.All,
+            initialPackId: group.packId!
+          })
+        "
+      >
+        <i class="text-foreground mr-1 icon-[lucide--search] size-4 shrink-0" />
+        <span class="text-foreground min-w-0 truncate text-sm">
+          {{ t('rightSidePanel.missingNodePacks.searchInManager') }}
+        </span>
+      </Button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, computed } from 'vue'
+import { cn } from '@/utils/tailwindUtil'
+import { useI18n } from 'vue-i18n'
+import Button from '@/components/ui/button/Button.vue'
+import DotSpinner from '@/components/common/DotSpinner.vue'
+import TransitionCollapse from '@/components/rightSidePanel/layout/TransitionCollapse.vue'
+import { useMissingNodes } from '@/workbench/extensions/manager/composables/nodePack/useMissingNodes'
+import { usePackInstall } from '@/workbench/extensions/manager/composables/nodePack/usePackInstall'
+import { useComfyManagerStore } from '@/workbench/extensions/manager/stores/comfyManagerStore'
+import { useManagerState } from '@/workbench/extensions/manager/composables/useManagerState'
+import { ManagerTab } from '@/workbench/extensions/manager/types/comfyManagerTypes'
+import type { MissingNodeType } from '@/types/comfy'
+import type { MissingPackGroup } from '@/components/rightSidePanel/errors/useErrorGroups'
+
+const props = defineProps<{
+  group: MissingPackGroup
+  showInfoButton: boolean
+  showNodeIdBadge: boolean
+}>()
+
+const emit = defineEmits<{
+  locateNode: [nodeId: string]
+  openManagerInfo: [packId: string]
+}>()
+
+const { t } = useI18n()
+
+const { missingNodePacks, isLoading } = useMissingNodes()
+const comfyManagerStore = useComfyManagerStore()
+const { shouldShowManagerButtons, openManager } = useManagerState()
+
+const nodePack = computed(() => {
+  if (!props.group.packId) return null
+  return missingNodePacks.value.find((p) => p.id === props.group.packId) ?? null
+})
+
+const { isInstalling, installAllPacks } = usePackInstall(() =>
+  nodePack.value ? [nodePack.value] : []
+)
+
+function handlePackInstallClick() {
+  if (!props.group.packId) return
+  if (!comfyManagerStore.isPackInstalled(props.group.packId)) {
+    void installAllPacks()
+  }
+}
+
+const expanded = ref(false)
+
+function toggleExpand() {
+  expanded.value = !expanded.value
+}
+
+function getKey(nodeType: MissingNodeType): string {
+  if (typeof nodeType === 'string') return nodeType
+  return nodeType.nodeId != null ? String(nodeType.nodeId) : nodeType.type
+}
+
+function getLabel(nodeType: MissingNodeType): string {
+  return typeof nodeType === 'string' ? nodeType : nodeType.type
+}
+
+function handleLocateNode(nodeType: MissingNodeType) {
+  if (typeof nodeType === 'string') return
+  if (nodeType.nodeId != null) {
+    emit('locateNode', String(nodeType.nodeId))
+  }
+}
+</script>
diff --git a/src/components/rightSidePanel/errors/TabErrors.test.ts b/src/components/rightSidePanel/errors/TabErrors.test.ts
new file mode 100644
index 0000000000..6c5222a492
--- /dev/null
+++ b/src/components/rightSidePanel/errors/TabErrors.test.ts
@@ -0,0 +1,220 @@
+import { mount } from '@vue/test-utils'
+import { createTestingPinia } from '@pinia/testing'
+import PrimeVue from 'primevue/config'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+import TabErrors from './TabErrors.vue'
+
+// Mock dependencies
+vi.mock('@/scripts/app', () => ({
+  app: {
+    rootGraph: {
+      serialize: vi.fn(() => ({})),
+      getNodeById: vi.fn()
+    }
+  }
+}))
+
+vi.mock('@/utils/graphTraversalUtil', () => ({
+  getNodeByExecutionId: vi.fn(),
+  getRootParentNode: vi.fn(() => null),
+  forEachNode: vi.fn(),
+  mapAllNodes: vi.fn(() => [])
+}))
+
+vi.mock('@/composables/useCopyToClipboard', () => ({
+  useCopyToClipboard: vi.fn(() => ({
+    copyToClipboard: vi.fn()
+  }))
+}))
+
+vi.mock('@/services/litegraphService', () => ({
+  useLitegraphService: vi.fn(() => ({
+    fitView: vi.fn()
+  }))
+}))
+
+describe('TabErrors.vue', () => {
+  let i18n: ReturnType<typeof createI18n>
+
+  beforeEach(() => {
+    i18n = createI18n({
+      legacy: false,
+      locale: 'en',
+      messages: {
+        en: {
+          g: {
+            workflow: 'Workflow',
+            copy: 'Copy'
+          },
+          rightSidePanel: {
+            noErrors: 'No errors',
+            noneSearchDesc: 'No results found',
+            promptErrors: {
+              prompt_no_outputs: {
+                desc: 'Prompt has no outputs'
+              }
+            }
+          }
+        }
+      }
+    })
+  })
+
+  function mountComponent(initialState = {}) {
+    return mount(TabErrors, {
+      global: {
+        plugins: [
+          PrimeVue,
+          i18n,
+          createTestingPinia({
+            createSpy: vi.fn,
+            initialState
+          })
+        ],
+        stubs: {
+          FormSearchInput: {
+            template:
+              '<input @input="$emit(\'update:modelValue\', $event.target.value)" />'
+          },
+          PropertiesAccordionItem: {
+            template: '<div><slot name="label" /><slot /></div>'
+          },
+          Button: {
+            template: '<button><slot /></button>'
+          }
+        }
+      }
+    })
+  }
+
+  it('renders "no errors" state when store is empty', () => {
+    const wrapper = mountComponent()
+    expect(wrapper.text()).toContain('No errors')
+  })
+
+  it('renders prompt-level errors (Group title = error message)', async () => {
+    const wrapper = mountComponent({
+      executionError: {
+        lastPromptError: {
+          type: 'prompt_no_outputs',
+          message: 'Server Error: No outputs',
+          details: 'Error details'
+        }
+      }
+    })
+
+    // Group title should be the raw message from store
+    expect(wrapper.text()).toContain('Server Error: No outputs')
+    // Item message should be localized desc
+    expect(wrapper.text()).toContain('Prompt has no outputs')
+    // Details should not be rendered for prompt errors
+    expect(wrapper.text()).not.toContain('Error details')
+  })
+
+  it('renders node validation errors grouped by class_type', async () => {
+    const { getNodeByExecutionId } = await import('@/utils/graphTraversalUtil')
+    vi.mocked(getNodeByExecutionId).mockReturnValue({
+      title: 'CLIP Text Encode'
+    } as ReturnType<typeof getNodeByExecutionId>)
+
+    const wrapper = mountComponent({
+      executionError: {
+        lastNodeErrors: {
+          '6': {
+            class_type: 'CLIPTextEncode',
+            errors: [
+              { message: 'Required input is missing', details: 'Input: text' }
+            ]
+          }
+        }
+      }
+    })
+
+    expect(wrapper.text()).toContain('CLIPTextEncode')
+    expect(wrapper.text()).toContain('#6')
+    expect(wrapper.text()).toContain('CLIP Text Encode')
+    expect(wrapper.text()).toContain('Required input is missing')
+  })
+
+  it('renders runtime execution errors from WebSocket', async () => {
+    const { getNodeByExecutionId } = await import('@/utils/graphTraversalUtil')
+    vi.mocked(getNodeByExecutionId).mockReturnValue({
+      title: 'KSampler'
+    } as ReturnType<typeof getNodeByExecutionId>)
+
+    const wrapper = mountComponent({
+      executionError: {
+        lastExecutionError: {
+          prompt_id: 'abc',
+          node_id: '10',
+          node_type: 'KSampler',
+          exception_message: 'Out of memory',
+          exception_type: 'RuntimeError',
+          traceback: ['Line 1', 'Line 2'],
+          timestamp: Date.now()
+        }
+      }
+    })
+
+    expect(wrapper.text()).toContain('KSampler')
+    expect(wrapper.text()).toContain('#10')
+    expect(wrapper.text()).toContain('RuntimeError: Out of memory')
+    expect(wrapper.text()).toContain('Line 1')
+  })
+
+  it('filters errors based on search query', async () => {
+    const { getNodeByExecutionId } = await import('@/utils/graphTraversalUtil')
+    vi.mocked(getNodeByExecutionId).mockReturnValue(null)
+
+    const wrapper = mountComponent({
+      executionError: {
+        lastNodeErrors: {
+          '1': {
+            class_type: 'CLIPTextEncode',
+            errors: [{ message: 'Missing text input' }]
+          },
+          '2': {
+            class_type: 'KSampler',
+            errors: [{ message: 'Out of memory' }]
+          }
+        }
+      }
+    })
+
+    expect(wrapper.text()).toContain('CLIPTextEncode')
+    expect(wrapper.text()).toContain('KSampler')
+
+    const searchInput = wrapper.find('input')
+    await searchInput.setValue('Missing text input')
+
+    expect(wrapper.text()).toContain('CLIPTextEncode')
+    expect(wrapper.text()).not.toContain('KSampler')
+  })
+
+  it('calls copyToClipboard when copy button is clicked', async () => {
+    const { useCopyToClipboard } =
+      await import('@/composables/useCopyToClipboard')
+    const mockCopy = vi.fn()
+    vi.mocked(useCopyToClipboard).mockReturnValue({ copyToClipboard: mockCopy })
+
+    const wrapper = mountComponent({
+      executionError: {
+        lastNodeErrors: {
+          '1': {
+            class_type: 'TestNode',
+            errors: [{ message: 'Test message', details: 'Test details' }]
+          }
+        }
+      }
+    })
+
+    // Find the copy button (rendered inside ErrorNodeCard)
+    const copyButtons = wrapper.findAll('button')
+    const copyButton = copyButtons.find((btn) => btn.text().includes('Copy'))
+    expect(copyButton).toBeTruthy()
+    await copyButton!.trigger('click')
+
+    expect(mockCopy).toHaveBeenCalledWith('Test message\n\nTest details')
+  })
+})
diff --git a/src/components/rightSidePanel/errors/TabErrors.vue b/src/components/rightSidePanel/errors/TabErrors.vue
new file mode 100644
index 0000000000..bc5b0de55b
--- /dev/null
+++ b/src/components/rightSidePanel/errors/TabErrors.vue
@@ -0,0 +1,322 @@
+<template>
+  <div class="flex h-full min-w-0 flex-col">
+    <!-- Search bar + collapse toggle -->
+    <div
+      class="flex min-w-0 shrink-0 items-center border-b border-interface-stroke px-4 pt-1 pb-4"
+    >
+      <FormSearchInput v-model="searchQuery" class="flex-1" />
+      <CollapseToggleButton
+        v-model="isAllCollapsed"
+        :show="!isSearching && tabErrorGroups.length > 1"
+      />
+    </div>
+
+    <!-- Scrollable content -->
+    <div class="min-w-0 flex-1 overflow-y-auto">
+      <TransitionGroup tag="div" name="list-scale" class="relative">
+        <div
+          v-if="filteredGroups.length === 0"
+          key="empty"
+          class="px-4 pt-5 pb-15 text-center text-sm text-muted-foreground"
+        >
+          {{
+            searchQuery.trim()
+              ? t('rightSidePanel.noneSearchDesc')
+              : t('rightSidePanel.noErrors')
+          }}
+        </div>
+
+        <!-- Group by Class Type -->
+        <PropertiesAccordionItem
+          v-for="group in filteredGroups"
+          :key="group.title"
+          :collapse="isSectionCollapsed(group.title) && !isSearching"
+          class="border-b border-interface-stroke"
+          :size="
+            group.type === 'missing_node' || group.type === 'swap_nodes'
+              ? 'lg'
+              : 'default'
+          "
+          @update:collapse="setSectionCollapsed(group.title, $event)"
+        >
+          <template #label>
+            <div class="flex min-w-0 flex-1 items-center gap-2">
+              <span class="flex min-w-0 flex-1 items-center gap-2">
+                <i
+                  class="icon-[lucide--octagon-alert] size-4 shrink-0 text-destructive-background-hover"
+                />
+                <span class="truncate text-destructive-background-hover">
+                  {{
+                    group.type === 'missing_node'
+                      ? `${group.title} (${missingPackGroups.length})`
+                      : group.type === 'swap_nodes'
+                        ? `${group.title} (${swapNodeGroups.length})`
+                        : group.title
+                  }}
+                </span>
+                <span
+                  v-if="group.type === 'execution' && group.cards.length > 1"
+                  class="text-destructive-background-hover"
+                >
+                  ({{ group.cards.length }})
+                </span>
+              </span>
+              <Button
+                v-if="
+                  group.type === 'missing_node' &&
+                  missingNodePacks.length > 0 &&
+                  shouldShowInstallButton
+                "
+                variant="secondary"
+                size="sm"
+                class="mr-2 h-8 shrink-0 rounded-lg text-sm"
+                :disabled="isInstallingAll"
+                @click.stop="installAll"
+              >
+                <DotSpinner v-if="isInstallingAll" duration="1s" :size="12" />
+                {{
+                  isInstallingAll
+                    ? t('rightSidePanel.missingNodePacks.installing')
+                    : t('rightSidePanel.missingNodePacks.installAll')
+                }}
+              </Button>
+              <Button
+                v-else-if="group.type === 'swap_nodes'"
+                v-tooltip.top="
+                  t(
+                    'nodeReplacement.replaceAllWarning',
+                    'Replaces all available nodes in this group.'
+                  )
+                "
+                variant="secondary"
+                size="sm"
+                class="mr-2 h-8 shrink-0 rounded-lg text-sm"
+                @click.stop="handleReplaceAll()"
+              >
+                {{ t('nodeReplacement.replaceAll', 'Replace All') }}
+              </Button>
+            </div>
+          </template>
+
+          <!-- Missing Node Packs -->
+          <MissingNodeCard
+            v-if="group.type === 'missing_node'"
+            :show-info-button="shouldShowManagerButtons"
+            :show-node-id-badge="showNodeIdBadge"
+            :missing-pack-groups="missingPackGroups"
+            @locate-node="handleLocateMissingNode"
+            @open-manager-info="handleOpenManagerInfo"
+          />
+
+          <!-- Swap Nodes -->
+          <SwapNodesCard
+            v-else-if="group.type === 'swap_nodes'"
+            :swap-node-groups="swapNodeGroups"
+            :show-node-id-badge="showNodeIdBadge"
+            @locate-node="handleLocateMissingNode"
+            @replace="handleReplaceGroup"
+          />
+
+          <!-- Execution Errors -->
+          <div v-else-if="group.type === 'execution'" class="space-y-3 px-4">
+            <ErrorNodeCard
+              v-for="card in group.cards"
+              :key="card.id"
+              :card="card"
+              :show-node-id-badge="showNodeIdBadge"
+              :compact="isSingleNodeSelected"
+              @locate-node="handleLocateNode"
+              @enter-subgraph="handleEnterSubgraph"
+              @copy-to-clipboard="copyToClipboard"
+            />
+          </div>
+        </PropertiesAccordionItem>
+      </TransitionGroup>
+    </div>
+
+    <!-- Fixed Footer: Help Links -->
+    <div class="min-w-0 shrink-0 border-t border-interface-stroke p-4">
+      <i18n-t
+        keypath="rightSidePanel.errorHelp"
+        tag="p"
+        class="m-0 text-sm/tight wrap-break-word text-muted-foreground"
+      >
+        <template #github>
+          <Button
+            variant="textonly"
+            size="unset"
+            class="inline text-sm whitespace-nowrap text-inherit underline"
+            @click="openGitHubIssues"
+          >
+            {{ t('rightSidePanel.errorHelpGithub') }}
+          </Button>
+        </template>
+        <template #support>
+          <Button
+            variant="textonly"
+            size="unset"
+            class="inline text-sm whitespace-nowrap text-inherit underline"
+            @click="contactSupport"
+          >
+            {{ t('rightSidePanel.errorHelpSupport') }}
+          </Button>
+        </template>
+      </i18n-t>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import { useCommandStore } from '@/stores/commandStore'
+import { useCopyToClipboard } from '@/composables/useCopyToClipboard'
+import { useFocusNode } from '@/composables/canvas/useFocusNode'
+import { useExternalLink } from '@/composables/useExternalLink'
+import { useSettingStore } from '@/platform/settings/settingStore'
+import { useTelemetry } from '@/platform/telemetry'
+import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore'
+import { useManagerState } from '@/workbench/extensions/manager/composables/useManagerState'
+import { ManagerTab } from '@/workbench/extensions/manager/types/comfyManagerTypes'
+import { NodeBadgeMode } from '@/types/nodeSource'
+
+import PropertiesAccordionItem from '../layout/PropertiesAccordionItem.vue'
+import CollapseToggleButton from '../layout/CollapseToggleButton.vue'
+import FormSearchInput from '@/renderer/extensions/vueNodes/widgets/components/form/FormSearchInput.vue'
+import ErrorNodeCard from './ErrorNodeCard.vue'
+import MissingNodeCard from './MissingNodeCard.vue'
+import SwapNodesCard from '@/platform/nodeReplacement/components/SwapNodesCard.vue'
+import Button from '@/components/ui/button/Button.vue'
+import DotSpinner from '@/components/common/DotSpinner.vue'
+import { usePackInstall } from '@/workbench/extensions/manager/composables/nodePack/usePackInstall'
+import { useMissingNodes } from '@/workbench/extensions/manager/composables/nodePack/useMissingNodes'
+import { useErrorGroups } from './useErrorGroups'
+import type { SwapNodeGroup } from './useErrorGroups'
+import { useNodeReplacement } from '@/platform/nodeReplacement/useNodeReplacement'
+
+const { t } = useI18n()
+const { copyToClipboard } = useCopyToClipboard()
+const { focusNode, enterSubgraph } = useFocusNode()
+const { staticUrls } = useExternalLink()
+const settingStore = useSettingStore()
+const rightSidePanelStore = useRightSidePanelStore()
+const { shouldShowManagerButtons, shouldShowInstallButton, openManager } =
+  useManagerState()
+const { missingNodePacks } = useMissingNodes()
+const { isInstalling: isInstallingAll, installAllPacks: installAll } =
+  usePackInstall(() => missingNodePacks.value)
+const { replaceGroup, replaceAllGroups } = useNodeReplacement()
+
+const searchQuery = ref('')
+const isSearching = computed(() => searchQuery.value.trim() !== '')
+
+const showNodeIdBadge = computed(
+  () =>
+    (settingStore.get('Comfy.NodeBadge.NodeIdBadgeMode') as NodeBadgeMode) !==
+    NodeBadgeMode.None
+)
+
+const {
+  allErrorGroups,
+  tabErrorGroups,
+  filteredGroups,
+  collapseState,
+  isSingleNodeSelected,
+  errorNodeCache,
+  missingNodeCache,
+  missingPackGroups,
+  swapNodeGroups
+} = useErrorGroups(searchQuery, t)
+
+const isAllCollapsed = computed({
+  get() {
+    return filteredGroups.value.every((g) => isSectionCollapsed(g.title))
+  },
+  set(collapse: boolean) {
+    for (const group of tabErrorGroups.value) {
+      setSectionCollapsed(group.title, collapse)
+    }
+  }
+})
+
+function isSectionCollapsed(title: string): boolean {
+  // Defaults to expanded when not explicitly set by the user
+  return collapseState[title] ?? false
+}
+
+function setSectionCollapsed(title: string, collapsed: boolean) {
+  collapseState[title] = collapsed
+}
+
+/**
+ * When an external trigger (e.g. "See Error" button in SectionWidgets)
+ * sets focusedErrorNodeId, expand only the group containing the target
+ * node and collapse all others so the user sees the relevant errors
+ * immediately.
+ */
+watch(
+  () => rightSidePanelStore.focusedErrorNodeId,
+  (graphNodeId) => {
+    if (!graphNodeId) return
+    const prefix = `${graphNodeId}:`
+    for (const group of allErrorGroups.value) {
+      const hasMatch =
+        group.type === 'execution' &&
+        group.cards.some(
+          (card) =>
+            card.graphNodeId === graphNodeId ||
+            (card.nodeId?.startsWith(prefix) ?? false)
+        )
+      setSectionCollapsed(group.title, !hasMatch)
+    }
+    rightSidePanelStore.focusedErrorNodeId = null
+  },
+  { immediate: true }
+)
+
+function handleLocateNode(nodeId: string) {
+  focusNode(nodeId, errorNodeCache.value)
+}
+
+function handleLocateMissingNode(nodeId: string) {
+  focusNode(nodeId, missingNodeCache.value)
+}
+
+function handleOpenManagerInfo(packId: string) {
+  const isKnownToRegistry = missingNodePacks.value.some((p) => p.id === packId)
+  if (isKnownToRegistry) {
+    openManager({ initialTab: ManagerTab.Missing, initialPackId: packId })
+  } else {
+    openManager({ initialTab: ManagerTab.All, initialPackId: packId })
+  }
+}
+
+function handleReplaceGroup(group: SwapNodeGroup) {
+  replaceGroup(group)
+}
+
+function handleReplaceAll() {
+  replaceAllGroups(swapNodeGroups.value)
+}
+
+function handleEnterSubgraph(nodeId: string) {
+  enterSubgraph(nodeId, errorNodeCache.value)
+}
+
+function openGitHubIssues() {
+  useTelemetry()?.trackUiButtonClicked({
+    button_id: 'error_tab_github_issues_clicked'
+  })
+  window.open(staticUrls.githubIssues, '_blank', 'noopener,noreferrer')
+}
+
+async function contactSupport() {
+  useTelemetry()?.trackHelpResourceClicked({
+    resource_type: 'help_feedback',
+    is_external: true,
+    source: 'error_dialog'
+  })
+  useCommandStore().execute('Comfy.ContactSupport')
+}
+</script>
diff --git a/src/components/rightSidePanel/errors/swapNodeGroups.test.ts b/src/components/rightSidePanel/errors/swapNodeGroups.test.ts
new file mode 100644
index 0000000000..de497e3cbc
--- /dev/null
+++ b/src/components/rightSidePanel/errors/swapNodeGroups.test.ts
@@ -0,0 +1,187 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { nextTick, ref } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { MissingNodeType } from '@/types/comfy'
+
+vi.mock('@/scripts/app', () => ({
+  app: {
+    rootGraph: {
+      serialize: vi.fn(() => ({})),
+      getNodeById: vi.fn()
+    }
+  }
+}))
+
+vi.mock('@/utils/graphTraversalUtil', () => ({
+  getNodeByExecutionId: vi.fn(),
+  getExecutionIdByNode: vi.fn(),
+  getRootParentNode: vi.fn(() => null),
+  forEachNode: vi.fn(),
+  mapAllNodes: vi.fn(() => [])
+}))
+
+vi.mock('@/platform/distribution/types', () => ({
+  isCloud: false
+}))
+
+vi.mock('@/i18n', () => ({
+  st: vi.fn((_key: string, fallback: string) => fallback)
+}))
+
+vi.mock('@/stores/comfyRegistryStore', () => ({
+  useComfyRegistryStore: () => ({
+    inferPackFromNodeName: vi.fn()
+  })
+}))
+
+vi.mock('@/utils/nodeTitleUtil', () => ({
+  resolveNodeDisplayName: vi.fn(() => '')
+}))
+
+vi.mock('@/utils/litegraphUtil', () => ({
+  isLGraphNode: vi.fn(() => false)
+}))
+
+vi.mock('@/utils/executableGroupNodeDto', () => ({
+  isGroupNode: vi.fn(() => false)
+}))
+
+import { useExecutionErrorStore } from '@/stores/executionErrorStore'
+import { useErrorGroups } from './useErrorGroups'
+
+function makeMissingNodeType(
+  type: string,
+  opts: {
+    nodeId?: string
+    isReplaceable?: boolean
+    replacement?: { new_node_id: string }
+  } = {}
+): MissingNodeType {
+  return {
+    type,
+    nodeId: opts.nodeId ?? '1',
+    isReplaceable: opts.isReplaceable ?? false,
+    replacement: opts.replacement
+      ? {
+          old_node_id: type,
+          new_node_id: opts.replacement.new_node_id,
+          old_widget_ids: null,
+          input_mapping: null,
+          output_mapping: null
+        }
+      : undefined
+  }
+}
+
+describe('swapNodeGroups computed', () => {
+  beforeEach(() => {
+    setActivePinia(createPinia())
+  })
+
+  function getSwapNodeGroups(nodeTypes: MissingNodeType[]) {
+    const store = useExecutionErrorStore()
+    store.surfaceMissingNodes(nodeTypes)
+
+    const searchQuery = ref('')
+    const t = (key: string) => key
+    const { swapNodeGroups } = useErrorGroups(searchQuery, t)
+    return swapNodeGroups
+  }
+
+  it('returns empty array when no missing nodes', () => {
+    const swap = getSwapNodeGroups([])
+    expect(swap.value).toEqual([])
+  })
+
+  it('returns empty array when no nodes are replaceable', () => {
+    const swap = getSwapNodeGroups([
+      makeMissingNodeType('NodeA', { isReplaceable: false }),
+      makeMissingNodeType('NodeB', { isReplaceable: false })
+    ])
+    expect(swap.value).toEqual([])
+  })
+
+  it('groups replaceable nodes by type', async () => {
+    const swap = getSwapNodeGroups([
+      makeMissingNodeType('OldNode', {
+        nodeId: '1',
+        isReplaceable: true,
+        replacement: { new_node_id: 'NewNode' }
+      }),
+      makeMissingNodeType('OldNode', {
+        nodeId: '2',
+        isReplaceable: true,
+        replacement: { new_node_id: 'NewNode' }
+      })
+    ])
+    await nextTick()
+    expect(swap.value).toHaveLength(1)
+    expect(swap.value[0].type).toBe('OldNode')
+    expect(swap.value[0].newNodeId).toBe('NewNode')
+    expect(swap.value[0].nodeTypes).toHaveLength(2)
+  })
+
+  it('creates separate groups for different types', async () => {
+    const swap = getSwapNodeGroups([
+      makeMissingNodeType('TypeA', {
+        nodeId: '1',
+        isReplaceable: true,
+        replacement: { new_node_id: 'NewA' }
+      }),
+      makeMissingNodeType('TypeB', {
+        nodeId: '2',
+        isReplaceable: true,
+        replacement: { new_node_id: 'NewB' }
+      })
+    ])
+    await nextTick()
+    expect(swap.value).toHaveLength(2)
+    expect(swap.value.map((g) => g.type)).toEqual(['TypeA', 'TypeB'])
+  })
+
+  it('sorts groups alphabetically by type', async () => {
+    const swap = getSwapNodeGroups([
+      makeMissingNodeType('Zebra', {
+        nodeId: '1',
+        isReplaceable: true,
+        replacement: { new_node_id: 'NewZ' }
+      }),
+      makeMissingNodeType('Alpha', {
+        nodeId: '2',
+        isReplaceable: true,
+        replacement: { new_node_id: 'NewA' }
+      })
+    ])
+    await nextTick()
+    expect(swap.value[0].type).toBe('Alpha')
+    expect(swap.value[1].type).toBe('Zebra')
+  })
+
+  it('excludes string nodeType entries', async () => {
+    const swap = getSwapNodeGroups([
+      'StringGroupNode' as unknown as MissingNodeType,
+      makeMissingNodeType('OldNode', {
+        nodeId: '1',
+        isReplaceable: true,
+        replacement: { new_node_id: 'NewNode' }
+      })
+    ])
+    await nextTick()
+    expect(swap.value).toHaveLength(1)
+    expect(swap.value[0].type).toBe('OldNode')
+  })
+
+  it('sets newNodeId to undefined when replacement is missing', async () => {
+    const swap = getSwapNodeGroups([
+      makeMissingNodeType('OldNode', {
+        nodeId: '1',
+        isReplaceable: true
+        // no replacement
+      })
+    ])
+    await nextTick()
+    expect(swap.value).toHaveLength(1)
+    expect(swap.value[0].newNodeId).toBeUndefined()
+  })
+})
diff --git a/src/components/rightSidePanel/errors/types.ts b/src/components/rightSidePanel/errors/types.ts
new file mode 100644
index 0000000000..223fe4650d
--- /dev/null
+++ b/src/components/rightSidePanel/errors/types.ts
@@ -0,0 +1,25 @@
+export interface ErrorItem {
+  message: string
+  details?: string
+  isRuntimeError?: boolean
+}
+
+export interface ErrorCardData {
+  id: string
+  title: string
+  nodeId?: string
+  nodeTitle?: string
+  graphNodeId?: string
+  isSubgraphNode?: boolean
+  errors: ErrorItem[]
+}
+
+export type ErrorGroup =
+  | {
+      type: 'execution'
+      title: string
+      cards: ErrorCardData[]
+      priority: number
+    }
+  | { type: 'missing_node'; title: string; priority: number }
+  | { type: 'swap_nodes'; title: string; priority: number }
diff --git a/src/components/rightSidePanel/errors/useErrorGroups.test.ts b/src/components/rightSidePanel/errors/useErrorGroups.test.ts
new file mode 100644
index 0000000000..eca0453761
--- /dev/null
+++ b/src/components/rightSidePanel/errors/useErrorGroups.test.ts
@@ -0,0 +1,523 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { nextTick, ref } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { MissingNodeType } from '@/types/comfy'
+
+vi.mock('@/scripts/app', () => ({
+  app: {
+    rootGraph: {
+      serialize: vi.fn(() => ({})),
+      getNodeById: vi.fn()
+    }
+  }
+}))
+
+vi.mock('@/utils/graphTraversalUtil', () => ({
+  getNodeByExecutionId: vi.fn(),
+  getExecutionIdByNode: vi.fn(),
+  getRootParentNode: vi.fn(() => null),
+  forEachNode: vi.fn(),
+  mapAllNodes: vi.fn(() => [])
+}))
+
+vi.mock('@/platform/distribution/types', () => ({
+  isCloud: false
+}))
+
+vi.mock('@/i18n', () => ({
+  st: vi.fn((_key: string, fallback: string) => fallback)
+}))
+
+vi.mock('@/stores/comfyRegistryStore', () => ({
+  useComfyRegistryStore: () => ({
+    inferPackFromNodeName: vi.fn()
+  })
+}))
+
+vi.mock('@/utils/nodeTitleUtil', () => ({
+  resolveNodeDisplayName: vi.fn(() => '')
+}))
+
+vi.mock('@/utils/litegraphUtil', () => ({
+  isLGraphNode: vi.fn(() => false)
+}))
+
+vi.mock('@/utils/executableGroupNodeDto', () => ({
+  isGroupNode: vi.fn(() => false)
+}))
+
+import { useExecutionErrorStore } from '@/stores/executionErrorStore'
+import { useErrorGroups } from './useErrorGroups'
+
+function makeMissingNodeType(
+  type: string,
+  opts: {
+    nodeId?: string
+    isReplaceable?: boolean
+    cnrId?: string
+    replacement?: { new_node_id: string }
+  } = {}
+): MissingNodeType {
+  return {
+    type,
+    nodeId: opts.nodeId ?? '1',
+    isReplaceable: opts.isReplaceable ?? false,
+    cnrId: opts.cnrId,
+    replacement: opts.replacement
+      ? {
+          old_node_id: type,
+          new_node_id: opts.replacement.new_node_id,
+          old_widget_ids: null,
+          input_mapping: null,
+          output_mapping: null
+        }
+      : undefined
+  }
+}
+
+function createErrorGroups() {
+  const store = useExecutionErrorStore()
+  const searchQuery = ref('')
+  const t = (key: string) => key
+  const groups = useErrorGroups(searchQuery, t)
+  return { store, searchQuery, groups }
+}
+
+describe('useErrorGroups', () => {
+  beforeEach(() => {
+    setActivePinia(createPinia())
+  })
+
+  describe('missingPackGroups', () => {
+    it('returns empty array when no missing nodes', () => {
+      const { groups } = createErrorGroups()
+      expect(groups.missingPackGroups.value).toEqual([])
+    })
+
+    it('groups non-replaceable nodes by cnrId', async () => {
+      const { store, groups } = createErrorGroups()
+      store.setMissingNodeTypes([
+        makeMissingNodeType('NodeA', { cnrId: 'pack-1' }),
+        makeMissingNodeType('NodeB', { cnrId: 'pack-1', nodeId: '2' }),
+        makeMissingNodeType('NodeC', { cnrId: 'pack-2', nodeId: '3' })
+      ])
+      await nextTick()
+
+      expect(groups.missingPackGroups.value).toHaveLength(2)
+      const pack1 = groups.missingPackGroups.value.find(
+        (g) => g.packId === 'pack-1'
+      )
+      expect(pack1?.nodeTypes).toHaveLength(2)
+      const pack2 = groups.missingPackGroups.value.find(
+        (g) => g.packId === 'pack-2'
+      )
+      expect(pack2?.nodeTypes).toHaveLength(1)
+    })
+
+    it('excludes replaceable nodes from missingPackGroups', async () => {
+      const { store, groups } = createErrorGroups()
+      store.setMissingNodeTypes([
+        makeMissingNodeType('OldNode', {
+          isReplaceable: true,
+          replacement: { new_node_id: 'NewNode' }
+        }),
+        makeMissingNodeType('MissingNode', {
+          nodeId: '2',
+          cnrId: 'some-pack'
+        })
+      ])
+      await nextTick()
+
+      expect(groups.missingPackGroups.value).toHaveLength(1)
+      expect(groups.missingPackGroups.value[0].packId).toBe('some-pack')
+    })
+
+    it('groups nodes without cnrId under null packId', async () => {
+      const { store, groups } = createErrorGroups()
+      store.setMissingNodeTypes([
+        makeMissingNodeType('UnknownNode', { nodeId: '1' }),
+        makeMissingNodeType('AnotherUnknown', { nodeId: '2' })
+      ])
+      await nextTick()
+
+      expect(groups.missingPackGroups.value).toHaveLength(1)
+      expect(groups.missingPackGroups.value[0].packId).toBeNull()
+      expect(groups.missingPackGroups.value[0].nodeTypes).toHaveLength(2)
+    })
+
+    it('sorts groups alphabetically with null packId last', async () => {
+      const { store, groups } = createErrorGroups()
+      store.setMissingNodeTypes([
+        makeMissingNodeType('NodeA', { cnrId: 'zebra-pack' }),
+        makeMissingNodeType('NodeB', { nodeId: '2' }),
+        makeMissingNodeType('NodeC', { cnrId: 'alpha-pack', nodeId: '3' })
+      ])
+      await nextTick()
+
+      const packIds = groups.missingPackGroups.value.map((g) => g.packId)
+      expect(packIds).toEqual(['alpha-pack', 'zebra-pack', null])
+    })
+
+    it('sorts nodeTypes within each group alphabetically by type then nodeId', async () => {
+      const { store, groups } = createErrorGroups()
+      store.setMissingNodeTypes([
+        makeMissingNodeType('NodeB', { cnrId: 'pack-1', nodeId: '2' }),
+        makeMissingNodeType('NodeA', { cnrId: 'pack-1', nodeId: '3' }),
+        makeMissingNodeType('NodeA', { cnrId: 'pack-1', nodeId: '1' })
+      ])
+      await nextTick()
+
+      const group = groups.missingPackGroups.value[0]
+      const types = group.nodeTypes.map((n) =>
+        typeof n === 'string' ? n : `${n.type}:${n.nodeId}`
+      )
+      expect(types).toEqual(['NodeA:1', 'NodeA:3', 'NodeB:2'])
+    })
+
+    it('handles string nodeType entries', async () => {
+      const { store, groups } = createErrorGroups()
+      store.setMissingNodeTypes([
+        'StringGroupNode' as unknown as MissingNodeType
+      ])
+      await nextTick()
+
+      expect(groups.missingPackGroups.value).toHaveLength(1)
+      expect(groups.missingPackGroups.value[0].packId).toBeNull()
+    })
+  })
+
+  describe('allErrorGroups', () => {
+    it('returns empty array when no errors', () => {
+      const { groups } = createErrorGroups()
+      expect(groups.allErrorGroups.value).toEqual([])
+    })
+
+    it('includes missing_node group when missing nodes exist', async () => {
+      const { store, groups } = createErrorGroups()
+      store.setMissingNodeTypes([
+        makeMissingNodeType('NodeA', { cnrId: 'pack-1' })
+      ])
+      await nextTick()
+
+      const missingGroup = groups.allErrorGroups.value.find(
+        (g) => g.type === 'missing_node'
+      )
+      expect(missingGroup).toBeDefined()
+    })
+
+    it('includes swap_nodes group when replaceable nodes exist', async () => {
+      const { store, groups } = createErrorGroups()
+      store.setMissingNodeTypes([
+        makeMissingNodeType('OldNode', {
+          isReplaceable: true,
+          replacement: { new_node_id: 'NewNode' }
+        })
+      ])
+      await nextTick()
+
+      const swapGroup = groups.allErrorGroups.value.find(
+        (g) => g.type === 'swap_nodes'
+      )
+      expect(swapGroup).toBeDefined()
+    })
+
+    it('includes both swap_nodes and missing_node when both exist', async () => {
+      const { store, groups } = createErrorGroups()
+      store.setMissingNodeTypes([
+        makeMissingNodeType('OldNode', {
+          isReplaceable: true,
+          replacement: { new_node_id: 'NewNode' }
+        }),
+        makeMissingNodeType('MissingNode', {
+          nodeId: '2',
+          cnrId: 'some-pack'
+        })
+      ])
+      await nextTick()
+
+      const types = groups.allErrorGroups.value.map((g) => g.type)
+      expect(types).toContain('swap_nodes')
+      expect(types).toContain('missing_node')
+    })
+
+    it('swap_nodes has lower priority than missing_node', async () => {
+      const { store, groups } = createErrorGroups()
+      store.setMissingNodeTypes([
+        makeMissingNodeType('OldNode', {
+          isReplaceable: true,
+          replacement: { new_node_id: 'NewNode' }
+        }),
+        makeMissingNodeType('MissingNode', {
+          nodeId: '2',
+          cnrId: 'some-pack'
+        })
+      ])
+      await nextTick()
+
+      const swapIdx = groups.allErrorGroups.value.findIndex(
+        (g) => g.type === 'swap_nodes'
+      )
+      const missingIdx = groups.allErrorGroups.value.findIndex(
+        (g) => g.type === 'missing_node'
+      )
+      expect(swapIdx).toBeLessThan(missingIdx)
+    })
+
+    it('includes execution error groups from node errors', async () => {
+      const { store, groups } = createErrorGroups()
+      store.lastNodeErrors = {
+        '1': {
+          class_type: 'KSampler',
+          dependent_outputs: [],
+          errors: [
+            {
+              type: 'value_not_valid',
+              message: 'Value not valid',
+              details: 'some detail'
+            }
+          ]
+        }
+      }
+      await nextTick()
+
+      const execGroups = groups.allErrorGroups.value.filter(
+        (g) => g.type === 'execution'
+      )
+      expect(execGroups.length).toBeGreaterThan(0)
+    })
+
+    it('includes execution error from runtime errors', async () => {
+      const { store, groups } = createErrorGroups()
+      store.lastExecutionError = {
+        prompt_id: 'test-prompt',
+        timestamp: Date.now(),
+        node_id: 5,
+        node_type: 'KSampler',
+        executed: [],
+        exception_type: 'RuntimeError',
+        exception_message: 'CUDA out of memory',
+        traceback: ['line 1', 'line 2'],
+        current_inputs: {},
+        current_outputs: {}
+      }
+      await nextTick()
+
+      const execGroups = groups.allErrorGroups.value.filter(
+        (g) => g.type === 'execution'
+      )
+      expect(execGroups.length).toBeGreaterThan(0)
+    })
+
+    it('includes prompt error when present', async () => {
+      const { store, groups } = createErrorGroups()
+      store.lastPromptError = {
+        type: 'prompt_no_outputs',
+        message: 'No outputs',
+        details: ''
+      }
+      await nextTick()
+
+      const promptGroup = groups.allErrorGroups.value.find(
+        (g) => g.type === 'execution' && g.title === 'No outputs'
+      )
+      expect(promptGroup).toBeDefined()
+    })
+
+    it('sorts cards within an execution group by nodeId numerically', async () => {
+      const { store, groups } = createErrorGroups()
+      store.lastNodeErrors = {
+        '10': {
+          class_type: 'KSampler',
+          dependent_outputs: [],
+          errors: [{ type: 'err', message: 'Error', details: '' }]
+        },
+        '2': {
+          class_type: 'KSampler',
+          dependent_outputs: [],
+          errors: [{ type: 'err', message: 'Error', details: '' }]
+        },
+        '1': {
+          class_type: 'KSampler',
+          dependent_outputs: [],
+          errors: [{ type: 'err', message: 'Error', details: '' }]
+        }
+      }
+      await nextTick()
+
+      const execGroup = groups.allErrorGroups.value.find(
+        (g) => g.type === 'execution'
+      )
+      const nodeIds = execGroup?.cards.map((c) => c.nodeId)
+      expect(nodeIds).toEqual(['1', '2', '10'])
+    })
+
+    it('sorts cards with subpath nodeIds before higher root IDs', async () => {
+      const { store, groups } = createErrorGroups()
+      store.lastNodeErrors = {
+        '2': {
+          class_type: 'KSampler',
+          dependent_outputs: [],
+          errors: [{ type: 'err', message: 'Error', details: '' }]
+        },
+        '1:20': {
+          class_type: 'KSampler',
+          dependent_outputs: [],
+          errors: [{ type: 'err', message: 'Error', details: '' }]
+        },
+        '1': {
+          class_type: 'KSampler',
+          dependent_outputs: [],
+          errors: [{ type: 'err', message: 'Error', details: '' }]
+        }
+      }
+      await nextTick()
+
+      const execGroup = groups.allErrorGroups.value.find(
+        (g) => g.type === 'execution'
+      )
+      const nodeIds = execGroup?.cards.map((c) => c.nodeId)
+      expect(nodeIds).toEqual(['1', '1:20', '2'])
+    })
+
+    it('sorts deeply nested nodeIds by each segment numerically', async () => {
+      const { store, groups } = createErrorGroups()
+      store.lastNodeErrors = {
+        '10:11:99': {
+          class_type: 'KSampler',
+          dependent_outputs: [],
+          errors: [{ type: 'err', message: 'Error', details: '' }]
+        },
+        '10:11:12': {
+          class_type: 'KSampler',
+          dependent_outputs: [],
+          errors: [{ type: 'err', message: 'Error', details: '' }]
+        },
+        '10:2': {
+          class_type: 'KSampler',
+          dependent_outputs: [],
+          errors: [{ type: 'err', message: 'Error', details: '' }]
+        }
+      }
+      await nextTick()
+
+      const execGroup = groups.allErrorGroups.value.find(
+        (g) => g.type === 'execution'
+      )
+      const nodeIds = execGroup?.cards.map((c) => c.nodeId)
+      expect(nodeIds).toEqual(['10:2', '10:11:12', '10:11:99'])
+    })
+  })
+
+  describe('filteredGroups', () => {
+    it('returns all groups when search query is empty', async () => {
+      const { store, groups } = createErrorGroups()
+      store.lastNodeErrors = {
+        '1': {
+          class_type: 'KSampler',
+          dependent_outputs: [],
+          errors: [{ type: 'value_error', message: 'Bad value', details: '' }]
+        }
+      }
+      await nextTick()
+
+      expect(groups.filteredGroups.value.length).toBeGreaterThan(0)
+    })
+
+    it('filters groups based on search query', async () => {
+      const { store, groups, searchQuery } = createErrorGroups()
+      store.lastNodeErrors = {
+        '1': {
+          class_type: 'KSampler',
+          dependent_outputs: [],
+          errors: [
+            {
+              type: 'value_error',
+              message: 'Value error in sampler',
+              details: ''
+            }
+          ]
+        },
+        '2': {
+          class_type: 'CLIPLoader',
+          dependent_outputs: [],
+          errors: [
+            {
+              type: 'file_not_found',
+              message: 'File not found',
+              details: ''
+            }
+          ]
+        }
+      }
+      await nextTick()
+
+      searchQuery.value = 'sampler'
+      await nextTick()
+
+      const executionGroups = groups.filteredGroups.value.filter(
+        (g) => g.type === 'execution'
+      )
+      for (const group of executionGroups) {
+        if (group.type !== 'execution') continue
+        const hasMatch = group.cards.some(
+          (c) =>
+            c.title.toLowerCase().includes('sampler') ||
+            c.errors.some((e) => e.message.toLowerCase().includes('sampler'))
+        )
+        expect(hasMatch).toBe(true)
+      }
+    })
+  })
+
+  describe('groupedErrorMessages', () => {
+    it('returns empty array when no errors', () => {
+      const { groups } = createErrorGroups()
+      expect(groups.groupedErrorMessages.value).toEqual([])
+    })
+
+    it('collects unique error messages from node errors', async () => {
+      const { store, groups } = createErrorGroups()
+      store.lastNodeErrors = {
+        '1': {
+          class_type: 'KSampler',
+          dependent_outputs: [],
+          errors: [
+            { type: 'err_a', message: 'Error A', details: '' },
+            { type: 'err_b', message: 'Error B', details: '' }
+          ]
+        },
+        '2': {
+          class_type: 'CLIPLoader',
+          dependent_outputs: [],
+          errors: [{ type: 'err_a', message: 'Error A', details: '' }]
+        }
+      }
+      await nextTick()
+
+      const messages = groups.groupedErrorMessages.value
+      expect(messages).toContain('Error A')
+      expect(messages).toContain('Error B')
+      // Deduplication: Error A appears twice but should only be listed once
+      expect(messages.filter((m) => m === 'Error A')).toHaveLength(1)
+    })
+
+    it('includes missing node group title as message', async () => {
+      const { store, groups } = createErrorGroups()
+      store.setMissingNodeTypes([
+        makeMissingNodeType('NodeA', { cnrId: 'pack-1' })
+      ])
+      await nextTick()
+
+      expect(groups.groupedErrorMessages.value.length).toBeGreaterThan(0)
+    })
+  })
+
+  describe('collapseState', () => {
+    it('returns a reactive object', () => {
+      const { groups } = createErrorGroups()
+      expect(groups.collapseState).toBeDefined()
+      expect(typeof groups.collapseState).toBe('object')
+    })
+  })
+})
diff --git a/src/components/rightSidePanel/errors/useErrorGroups.ts b/src/components/rightSidePanel/errors/useErrorGroups.ts
new file mode 100644
index 0000000000..2fdf2eab44
--- /dev/null
+++ b/src/components/rightSidePanel/errors/useErrorGroups.ts
@@ -0,0 +1,620 @@
+import { computed, reactive, ref, watch } from 'vue'
+import type { Ref } from 'vue'
+import Fuse from 'fuse.js'
+import type { IFuseOptions } from 'fuse.js'
+
+import { useExecutionErrorStore } from '@/stores/executionErrorStore'
+import { useComfyRegistryStore } from '@/stores/comfyRegistryStore'
+import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import { app } from '@/scripts/app'
+import { isCloud } from '@/platform/distribution/types'
+import { SubgraphNode } from '@/lib/litegraph/src/litegraph'
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+
+import {
+  getNodeByExecutionId,
+  getExecutionIdByNode,
+  getRootParentNode
+} from '@/utils/graphTraversalUtil'
+import { resolveNodeDisplayName } from '@/utils/nodeTitleUtil'
+import { isLGraphNode } from '@/utils/litegraphUtil'
+import { isGroupNode } from '@/utils/executableGroupNodeDto'
+import { st } from '@/i18n'
+import type { MissingNodeType } from '@/types/comfy'
+import type { ErrorCardData, ErrorGroup, ErrorItem } from './types'
+import type { NodeExecutionId } from '@/types/nodeIdentification'
+import {
+  isNodeExecutionId,
+  compareExecutionId
+} from '@/types/nodeIdentification'
+
+const PROMPT_CARD_ID = '__prompt__'
+const SINGLE_GROUP_KEY = '__single__'
+const KNOWN_PROMPT_ERROR_TYPES = new Set([
+  'prompt_no_outputs',
+  'no_prompt',
+  'server_error'
+])
+
+/** Sentinel: distinguishes "fetch in-flight" from "fetch done, pack not found (null)". */
+const RESOLVING = '__RESOLVING__'
+
+export interface MissingPackGroup {
+  packId: string | null
+  nodeTypes: MissingNodeType[]
+  isResolving: boolean
+}
+
+export interface SwapNodeGroup {
+  type: string
+  newNodeId: string | undefined
+  nodeTypes: MissingNodeType[]
+}
+
+interface GroupEntry {
+  type: 'execution'
+  priority: number
+  cards: Map<string, ErrorCardData>
+}
+
+interface ErrorSearchItem {
+  groupIndex: number
+  cardIndex: number
+  searchableNodeId: string
+  searchableNodeTitle: string
+  searchableMessage: string
+  searchableDetails: string
+}
+
+/**
+ * Resolve display info for a node by its execution ID.
+ * For group node internals, resolves the parent group node's title instead.
+ */
+function resolveNodeInfo(nodeId: string) {
+  const graphNode = getNodeByExecutionId(app.rootGraph, nodeId)
+
+  const parentNode = getRootParentNode(app.rootGraph, nodeId)
+  const isParentGroupNode = parentNode ? isGroupNode(parentNode) : false
+
+  return {
+    title: isParentGroupNode
+      ? parentNode?.title || ''
+      : resolveNodeDisplayName(graphNode, {
+          emptyLabel: '',
+          untitledLabel: '',
+          st
+        }),
+    graphNodeId: graphNode ? String(graphNode.id) : undefined,
+    isParentGroupNode
+  }
+}
+
+function getOrCreateGroup(
+  groupsMap: Map<string, GroupEntry>,
+  title: string,
+  priority = 1
+): Map<string, ErrorCardData> {
+  let entry = groupsMap.get(title)
+  if (!entry) {
+    entry = { type: 'execution', priority, cards: new Map() }
+    groupsMap.set(title, entry)
+  }
+  return entry.cards
+}
+
+function createErrorCard(
+  nodeId: string,
+  classType: string,
+  idPrefix: string
+): ErrorCardData {
+  const nodeInfo = resolveNodeInfo(nodeId)
+  return {
+    id: `${idPrefix}-${nodeId}`,
+    title: classType,
+    nodeId,
+    nodeTitle: nodeInfo.title,
+    graphNodeId: nodeInfo.graphNodeId,
+    isSubgraphNode: isNodeExecutionId(nodeId) && !nodeInfo.isParentGroupNode,
+    errors: []
+  }
+}
+
+/**
+ * In single-node mode, regroup cards by error message instead of class_type.
+ * This lets the user see "what kinds of errors this node has" at a glance.
+ */
+function regroupByErrorMessage(
+  groupsMap: Map<string, GroupEntry>
+): Map<string, GroupEntry> {
+  const allCards = Array.from(groupsMap.values()).flatMap((g) =>
+    Array.from(g.cards.values())
+  )
+
+  const cardErrorPairs = allCards.flatMap((card) =>
+    card.errors.map((error) => ({ card, error }))
+  )
+
+  const messageMap = new Map<string, GroupEntry>()
+  for (const { card, error } of cardErrorPairs) {
+    addCardErrorToGroup(messageMap, card, error)
+  }
+
+  return messageMap
+}
+
+function addCardErrorToGroup(
+  messageMap: Map<string, GroupEntry>,
+  card: ErrorCardData,
+  error: ErrorItem
+) {
+  const group = getOrCreateGroup(messageMap, error.message, 1)
+  if (!group.has(card.id)) {
+    group.set(card.id, { ...card, errors: [] })
+  }
+  group.get(card.id)?.errors.push(error)
+}
+
+function compareNodeId(a: ErrorCardData, b: ErrorCardData): number {
+  return compareExecutionId(a.nodeId, b.nodeId)
+}
+
+function toSortedGroups(groupsMap: Map<string, GroupEntry>): ErrorGroup[] {
+  return Array.from(groupsMap.entries())
+    .map(([title, groupData]) => ({
+      type: 'execution' as const,
+      title,
+      cards: Array.from(groupData.cards.values()).sort(compareNodeId),
+      priority: groupData.priority
+    }))
+    .sort((a, b) => {
+      if (a.priority !== b.priority) return a.priority - b.priority
+      return a.title.localeCompare(b.title)
+    })
+}
+
+function searchErrorGroups(groups: ErrorGroup[], query: string) {
+  if (!query) return groups
+
+  const searchableList: ErrorSearchItem[] = []
+  for (let gi = 0; gi < groups.length; gi++) {
+    const group = groups[gi]
+    if (group.type !== 'execution') continue
+    for (let ci = 0; ci < group.cards.length; ci++) {
+      const card = group.cards[ci]
+      searchableList.push({
+        groupIndex: gi,
+        cardIndex: ci,
+        searchableNodeId: card.nodeId ?? '',
+        searchableNodeTitle: card.nodeTitle ?? '',
+        searchableMessage: card.errors
+          .map((e: ErrorItem) => e.message)
+          .join(' '),
+        searchableDetails: card.errors
+          .map((e: ErrorItem) => e.details ?? '')
+          .join(' ')
+      })
+    }
+  }
+
+  const fuseOptions: IFuseOptions<ErrorSearchItem> = {
+    keys: [
+      { name: 'searchableNodeId', weight: 0.3 },
+      { name: 'searchableNodeTitle', weight: 0.3 },
+      { name: 'searchableMessage', weight: 0.3 },
+      { name: 'searchableDetails', weight: 0.1 }
+    ],
+    threshold: 0.3
+  }
+
+  const fuse = new Fuse(searchableList, fuseOptions)
+  const results = fuse.search(query)
+
+  const matchedCardKeys = new Set(
+    results.map((r) => `${r.item.groupIndex}:${r.item.cardIndex}`)
+  )
+
+  return groups
+    .map((group, gi) => {
+      if (group.type !== 'execution') return group
+      return {
+        ...group,
+        cards: group.cards.filter((_: ErrorCardData, ci: number) =>
+          matchedCardKeys.has(`${gi}:${ci}`)
+        )
+      }
+    })
+    .filter((group) => group.type !== 'execution' || group.cards.length > 0)
+}
+
+export function useErrorGroups(
+  searchQuery: Ref<string>,
+  t: (key: string) => string
+) {
+  const executionErrorStore = useExecutionErrorStore()
+  const canvasStore = useCanvasStore()
+  const { inferPackFromNodeName } = useComfyRegistryStore()
+  const collapseState = reactive<Record<string, boolean>>({})
+
+  const selectedNodeInfo = computed(() => {
+    const items = canvasStore.selectedItems
+    const nodeIds = new Set<string>()
+    const containerExecutionIds = new Set<NodeExecutionId>()
+
+    for (const item of items) {
+      if (!isLGraphNode(item)) continue
+      nodeIds.add(String(item.id))
+      if (
+        (item instanceof SubgraphNode || isGroupNode(item)) &&
+        app.rootGraph
+      ) {
+        const execId = getExecutionIdByNode(app.rootGraph, item)
+        if (execId) containerExecutionIds.add(execId)
+      }
+    }
+
+    return {
+      nodeIds: nodeIds.size > 0 ? nodeIds : null,
+      containerExecutionIds
+    }
+  })
+
+  const isSingleNodeSelected = computed(
+    () =>
+      selectedNodeInfo.value.nodeIds?.size === 1 &&
+      selectedNodeInfo.value.containerExecutionIds.size === 0
+  )
+
+  const errorNodeCache = computed(() => {
+    const map = new Map<string, LGraphNode>()
+    for (const execId of executionErrorStore.allErrorExecutionIds) {
+      const node = getNodeByExecutionId(app.rootGraph, execId)
+      if (node) map.set(execId, node)
+    }
+    return map
+  })
+
+  const missingNodeCache = computed(() => {
+    const map = new Map<string, LGraphNode>()
+    const nodeTypes = executionErrorStore.missingNodesError?.nodeTypes ?? []
+    for (const nodeType of nodeTypes) {
+      if (typeof nodeType === 'string') continue
+      if (nodeType.nodeId == null) continue
+      const nodeId = String(nodeType.nodeId)
+      const node = getNodeByExecutionId(app.rootGraph, nodeId)
+      if (node) map.set(nodeId, node)
+    }
+    return map
+  })
+
+  function isErrorInSelection(executionNodeId: string): boolean {
+    const nodeIds = selectedNodeInfo.value.nodeIds
+    if (!nodeIds) return true
+
+    const graphNode = errorNodeCache.value.get(executionNodeId)
+    if (graphNode && nodeIds.has(String(graphNode.id))) return true
+
+    for (const containerExecId of selectedNodeInfo.value
+      .containerExecutionIds) {
+      if (executionNodeId.startsWith(`${containerExecId}:`)) return true
+    }
+
+    return false
+  }
+
+  function addNodeErrorToGroup(
+    groupsMap: Map<string, GroupEntry>,
+    nodeId: string,
+    classType: string,
+    idPrefix: string,
+    errors: ErrorItem[],
+    filterBySelection = false
+  ) {
+    if (filterBySelection && !isErrorInSelection(nodeId)) return
+    const groupKey = isSingleNodeSelected.value ? SINGLE_GROUP_KEY : classType
+    const cards = getOrCreateGroup(groupsMap, groupKey, 1)
+    if (!cards.has(nodeId)) {
+      cards.set(nodeId, createErrorCard(nodeId, classType, idPrefix))
+    }
+    cards.get(nodeId)?.errors.push(...errors)
+  }
+
+  function processPromptError(groupsMap: Map<string, GroupEntry>) {
+    if (selectedNodeInfo.value.nodeIds || !executionErrorStore.lastPromptError)
+      return
+
+    const error = executionErrorStore.lastPromptError
+    const groupTitle = error.message
+    const cards = getOrCreateGroup(groupsMap, groupTitle, 0)
+    const isKnown = KNOWN_PROMPT_ERROR_TYPES.has(error.type)
+
+    // For server_error, resolve the i18n key based on the environment
+    let errorTypeKey = error.type
+    if (error.type === 'server_error') {
+      errorTypeKey = isCloud ? 'server_error_cloud' : 'server_error_local'
+    }
+    const i18nKey = `rightSidePanel.promptErrors.${errorTypeKey}.desc`
+
+    // Prompt errors are not tied to a node, so they bypass addNodeErrorToGroup.
+    cards.set(PROMPT_CARD_ID, {
+      id: PROMPT_CARD_ID,
+      title: groupTitle,
+      errors: [
+        {
+          message: isKnown ? t(i18nKey) : error.message
+        }
+      ]
+    })
+  }
+
+  function processNodeErrors(
+    groupsMap: Map<string, GroupEntry>,
+    filterBySelection = false
+  ) {
+    if (!executionErrorStore.lastNodeErrors) return
+
+    for (const [nodeId, nodeError] of Object.entries(
+      executionErrorStore.lastNodeErrors
+    )) {
+      addNodeErrorToGroup(
+        groupsMap,
+        nodeId,
+        nodeError.class_type,
+        'node',
+        nodeError.errors.map((e) => ({
+          message: e.message,
+          details: e.details ?? undefined
+        })),
+        filterBySelection
+      )
+    }
+  }
+
+  function processExecutionError(
+    groupsMap: Map<string, GroupEntry>,
+    filterBySelection = false
+  ) {
+    if (!executionErrorStore.lastExecutionError) return
+
+    const e = executionErrorStore.lastExecutionError
+    addNodeErrorToGroup(
+      groupsMap,
+      String(e.node_id),
+      e.node_type,
+      'exec',
+      [
+        {
+          message: `${e.exception_type}: ${e.exception_message}`,
+          details: e.traceback.join('\n'),
+          isRuntimeError: true
+        }
+      ],
+      filterBySelection
+    )
+  }
+
+  // Async pack-ID resolution for missing node types that lack a cnrId
+  const asyncResolvedIds = ref<Map<string, string | null>>(new Map())
+
+  const pendingTypes = computed(() =>
+    (executionErrorStore.missingNodesError?.nodeTypes ?? []).filter(
+      (n): n is Exclude<MissingNodeType, string> =>
+        typeof n !== 'string' && !n.cnrId
+    )
+  )
+
+  watch(
+    pendingTypes,
+    async (pending, _, onCleanup) => {
+      const toResolve = pending.filter(
+        (n) => asyncResolvedIds.value.get(n.type) === undefined
+      )
+      if (!toResolve.length) return
+
+      const resolvingTypes = toResolve.map((n) => n.type)
+      let cancelled = false
+      onCleanup(() => {
+        cancelled = true
+        const next = new Map(asyncResolvedIds.value)
+        for (const type of resolvingTypes) {
+          if (next.get(type) === RESOLVING) next.delete(type)
+        }
+        asyncResolvedIds.value = next
+      })
+
+      const updated = new Map(asyncResolvedIds.value)
+      for (const type of resolvingTypes) updated.set(type, RESOLVING)
+      asyncResolvedIds.value = updated
+
+      const results = await Promise.allSettled(
+        toResolve.map(async (n) => ({
+          type: n.type,
+          packId: (await inferPackFromNodeName.call(n.type))?.id ?? null
+        }))
+      )
+      if (cancelled) return
+
+      const final = new Map(asyncResolvedIds.value)
+      for (const r of results) {
+        if (r.status === 'fulfilled') {
+          final.set(r.value.type, r.value.packId)
+        }
+      }
+      // Clear any remaining RESOLVING markers for failed lookups
+      for (const type of resolvingTypes) {
+        if (final.get(type) === RESOLVING) final.set(type, null)
+      }
+      asyncResolvedIds.value = final
+    },
+    { immediate: true }
+  )
+
+  const missingPackGroups = computed<MissingPackGroup[]>(() => {
+    const nodeTypes = executionErrorStore.missingNodesError?.nodeTypes ?? []
+    const map = new Map<
+      string | null,
+      { nodeTypes: MissingNodeType[]; isResolving: boolean }
+    >()
+    const resolvingKeys = new Set<string | null>()
+
+    for (const nodeType of nodeTypes) {
+      if (typeof nodeType !== 'string' && nodeType.isReplaceable) continue
+
+      let packId: string | null
+
+      if (typeof nodeType === 'string') {
+        packId = null
+      } else if (nodeType.cnrId) {
+        packId = nodeType.cnrId
+      } else {
+        const resolved = asyncResolvedIds.value.get(nodeType.type)
+        if (resolved === undefined || resolved === RESOLVING) {
+          packId = null
+          resolvingKeys.add(null)
+        } else {
+          packId = resolved
+        }
+      }
+
+      const existing = map.get(packId)
+      if (existing) {
+        existing.nodeTypes.push(nodeType)
+      } else {
+        map.set(packId, { nodeTypes: [nodeType], isResolving: false })
+      }
+    }
+
+    for (const key of resolvingKeys) {
+      const group = map.get(key)
+      if (group) group.isResolving = true
+    }
+
+    return Array.from(map.entries())
+      .sort(([packIdA], [packIdB]) => {
+        // null (Unknown Pack) always goes last
+        if (packIdA === null) return 1
+        if (packIdB === null) return -1
+        return packIdA.localeCompare(packIdB)
+      })
+      .map(([packId, { nodeTypes, isResolving }]) => ({
+        packId,
+        nodeTypes: [...nodeTypes].sort((a, b) => {
+          const typeA = typeof a === 'string' ? a : a.type
+          const typeB = typeof b === 'string' ? b : b.type
+          const typeCmp = typeA.localeCompare(typeB)
+          if (typeCmp !== 0) return typeCmp
+          const idA = typeof a === 'string' ? '' : String(a.nodeId ?? '')
+          const idB = typeof b === 'string' ? '' : String(b.nodeId ?? '')
+          return idA.localeCompare(idB, undefined, { numeric: true })
+        }),
+        isResolving
+      }))
+  })
+
+  const swapNodeGroups = computed<SwapNodeGroup[]>(() => {
+    const nodeTypes = executionErrorStore.missingNodesError?.nodeTypes ?? []
+    const map = new Map<string, SwapNodeGroup>()
+
+    for (const nodeType of nodeTypes) {
+      if (typeof nodeType === 'string' || !nodeType.isReplaceable) continue
+
+      const typeName = nodeType.type
+      const existing = map.get(typeName)
+      if (existing) {
+        existing.nodeTypes.push(nodeType)
+      } else {
+        map.set(typeName, {
+          type: typeName,
+          newNodeId: nodeType.replacement?.new_node_id,
+          nodeTypes: [nodeType]
+        })
+      }
+    }
+
+    return Array.from(map.values()).sort((a, b) => a.type.localeCompare(b.type))
+  })
+
+  /** Builds an ErrorGroup from missingNodesError. Returns [] when none present. */
+  function buildMissingNodeGroups(): ErrorGroup[] {
+    const error = executionErrorStore.missingNodesError
+    if (!error) return []
+
+    const groups: ErrorGroup[] = []
+
+    if (swapNodeGroups.value.length > 0) {
+      groups.push({
+        type: 'swap_nodes' as const,
+        title: st('nodeReplacement.swapNodesTitle', 'Swap Nodes'),
+        priority: 0
+      })
+    }
+
+    if (missingPackGroups.value.length > 0) {
+      groups.push({
+        type: 'missing_node' as const,
+        title: error.message,
+        priority: 1
+      })
+    }
+
+    return groups.sort((a, b) => a.priority - b.priority)
+  }
+
+  const allErrorGroups = computed<ErrorGroup[]>(() => {
+    const groupsMap = new Map<string, GroupEntry>()
+
+    processPromptError(groupsMap)
+    processNodeErrors(groupsMap)
+    processExecutionError(groupsMap)
+
+    return [...buildMissingNodeGroups(), ...toSortedGroups(groupsMap)]
+  })
+
+  const tabErrorGroups = computed<ErrorGroup[]>(() => {
+    const groupsMap = new Map<string, GroupEntry>()
+
+    processPromptError(groupsMap)
+    processNodeErrors(groupsMap, true)
+    processExecutionError(groupsMap, true)
+
+    const executionGroups = isSingleNodeSelected.value
+      ? toSortedGroups(regroupByErrorMessage(groupsMap))
+      : toSortedGroups(groupsMap)
+
+    return [...buildMissingNodeGroups(), ...executionGroups]
+  })
+
+  const filteredGroups = computed<ErrorGroup[]>(() => {
+    const query = searchQuery.value.trim()
+    return searchErrorGroups(tabErrorGroups.value, query)
+  })
+
+  const groupedErrorMessages = computed<string[]>(() => {
+    const messages = new Set<string>()
+    for (const group of allErrorGroups.value) {
+      if (group.type === 'execution') {
+        for (const card of group.cards) {
+          for (const err of card.errors) {
+            messages.add(err.message)
+          }
+        }
+      } else {
+        // Groups without cards (e.g. missing_node) surface their title as the message.
+        messages.add(group.title)
+      }
+    }
+    return Array.from(messages)
+  })
+
+  return {
+    allErrorGroups,
+    tabErrorGroups,
+    filteredGroups,
+    collapseState,
+    isSingleNodeSelected,
+    errorNodeCache,
+    missingNodeCache,
+    groupedErrorMessages,
+    missingPackGroups,
+    swapNodeGroups
+  }
+}
diff --git a/src/components/rightSidePanel/info/TabInfo.vue b/src/components/rightSidePanel/info/TabInfo.vue
index fa13e14c4d..0ae8719099 100644
--- a/src/components/rightSidePanel/info/TabInfo.vue
+++ b/src/components/rightSidePanel/info/TabInfo.vue
@@ -1,11 +1,9 @@
 <script setup lang="ts">
-import { whenever } from '@vueuse/core'
 import { computed } from 'vue'
 
 import NodeHelpContent from '@/components/node/NodeHelpContent.vue'
 import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
 import { useNodeDefStore } from '@/stores/nodeDefStore'
-import { useNodeHelpStore } from '@/stores/workspace/nodeHelpStore'
 
 const { nodes } = defineProps<{
   nodes: LGraphNode[]
@@ -13,20 +11,10 @@ const { nodes } = defineProps<{
 const node = computed(() => nodes[0])
 
 const nodeDefStore = useNodeDefStore()
-const nodeHelpStore = useNodeHelpStore()
 
 const nodeInfo = computed(() => {
   return nodeDefStore.fromLGraphNode(node.value)
 })
-
-// Open node help when the selected node changes
-whenever(
-  nodeInfo,
-  (info) => {
-    nodeHelpStore.openHelp(info)
-  },
-  { immediate: true }
-)
 </script>
 
 <template>
diff --git a/src/components/rightSidePanel/layout/CollapseToggleButton.vue b/src/components/rightSidePanel/layout/CollapseToggleButton.vue
new file mode 100644
index 0000000000..8384b772a0
--- /dev/null
+++ b/src/components/rightSidePanel/layout/CollapseToggleButton.vue
@@ -0,0 +1,52 @@
+<template>
+  <Transition
+    enter-active-class="transition-all duration-300 ease-in-out"
+    enter-from-class="max-w-0 opacity-0 ml-0"
+    enter-to-class="max-w-10 opacity-100 ml-2"
+    leave-active-class="transition-all duration-300 ease-in-out"
+    leave-from-class="max-w-10 opacity-100 ml-2"
+    leave-to-class="max-w-0 opacity-0 ml-0"
+  >
+    <div v-if="show" class="ml-2 flex items-center overflow-hidden">
+      <Button
+        v-tooltip.bottom="
+          isAllCollapsed ? t('g.expandAll') : t('g.collapseAll')
+        "
+        :aria-label="isAllCollapsed ? t('g.expandAll') : t('g.collapseAll')"
+        variant="textonly"
+        size="icon-sm"
+        class="size-8 shrink-0 text-muted-foreground hover:text-base-foreground"
+        @click="toggle"
+      >
+        <i
+          :class="
+            cn(
+              'size-4',
+              isAllCollapsed
+                ? 'icon-[lucide--list-tree]'
+                : 'icon-[lucide--list-collapse]'
+            )
+          "
+        />
+      </Button>
+    </div>
+  </Transition>
+</template>
+
+<script setup lang="ts">
+import { useI18n } from 'vue-i18n'
+import { cn } from '@/utils/tailwindUtil'
+import Button from '@/components/ui/button/Button.vue'
+
+const { t } = useI18n()
+
+const isAllCollapsed = defineModel<boolean>({ required: true })
+
+defineProps<{
+  show: boolean
+}>()
+
+function toggle() {
+  isAllCollapsed.value = !isAllCollapsed.value
+}
+</script>
diff --git a/src/components/rightSidePanel/layout/PropertiesAccordionItem.vue b/src/components/rightSidePanel/layout/PropertiesAccordionItem.vue
index 2a4448b047..328b5c97f0 100644
--- a/src/components/rightSidePanel/layout/PropertiesAccordionItem.vue
+++ b/src/components/rightSidePanel/layout/PropertiesAccordionItem.vue
@@ -1,54 +1,82 @@
 <script lang="ts" setup>
+import { computed } from 'vue'
+
 import { cn } from '@/utils/tailwindUtil'
 
-defineProps<{
-  isEmpty?: boolean
+import TransitionCollapse from './TransitionCollapse.vue'
+
+const {
+  disabled,
+  label,
+  enableEmptyState,
+  tooltip,
+  size = 'default',
+  tooltipDelay = 1000,
+  class: className
+} = defineProps<{
+  disabled?: boolean
+  label?: string
+  enableEmptyState?: boolean
+  tooltip?: string
+  size?: 'default' | 'lg'
+  tooltipDelay?: number
+  class?: string
 }>()
 
 const isCollapse = defineModel<boolean>('collapse', { default: false })
+
+const isExpanded = computed(() => !isCollapse.value && !disabled)
+
+const tooltipConfig = computed(() => {
+  if (!tooltip) return undefined
+  return { value: tooltip, showDelay: tooltipDelay }
+})
 </script>
 
 <template>
-  <div class="flex flex-col bg-interface-panel-surface">
+  <div :class="cn('flex flex-col bg-comfy-menu-bg', className)">
     <div
-      class="sticky top-0 z-10 flex items-center justify-between backdrop-blur-xl bg-inherit"
+      class="sticky top-0 z-10 flex items-center justify-between bg-inherit backdrop-blur-xl"
     >
       <button
-        v-tooltip="
-          isEmpty
-            ? {
-                value: $t('rightSidePanel.inputsNoneTooltip'),
-                showDelay: 1_000
-              }
-            : undefined
-        "
+        v-tooltip="tooltipConfig"
         type="button"
         :class="
           cn(
-            'group min-h-12 bg-transparent border-0 outline-0 ring-0 w-full text-left flex items-center justify-between pl-4 pr-3',
-            !isEmpty && 'cursor-pointer'
+            'group flex w-full items-center justify-between border-0 bg-transparent pr-3 pl-4 text-left ring-0 outline-0',
+            size === 'lg' ? 'min-h-16' : 'min-h-12',
+            !disabled && 'cursor-pointer'
           )
         "
-        :disabled="isEmpty"
+        :disabled="disabled"
         @click="isCollapse = !isCollapse"
       >
-        <span class="text-sm font-semibold line-clamp-2">
-          <slot name="label" />
+        <span class="line-clamp-2 flex-1 text-sm font-semibold">
+          <slot name="label">
+            {{ label }}
+          </slot>
         </span>
 
         <i
-          v-if="!isEmpty"
           :class="
             cn(
-              'text-muted-foreground group-hover:text-base-foreground group-focus:text-base-foreground icon-[lucide--chevron-up] size-4 transition-all',
-              isCollapse && '-rotate-180'
+              'icon-[lucide--chevron-up] size-4 text-muted-foreground transition-all group-hover:text-base-foreground group-focus:text-base-foreground group-has-[.subbutton:hover]:text-muted-foreground',
+              isCollapse && '-rotate-180',
+              disabled && 'opacity-0'
             )
           "
         />
       </button>
     </div>
-    <div v-if="!isCollapse && !isEmpty" class="pb-4">
-      <slot />
-    </div>
+    <TransitionCollapse>
+      <div v-if="isExpanded" class="pb-4">
+        <slot />
+      </div>
+      <slot v-else-if="enableEmptyState && disabled" name="empty">
+        <div>
+          {{ $t('g.empty') }}
+        </div>
+      </slot>
+    </TransitionCollapse>
   </div>
 </template>
diff --git a/src/components/rightSidePanel/layout/SidePanelSearch.vue b/src/components/rightSidePanel/layout/SidePanelSearch.vue
deleted file mode 100644
index efbe22159f..0000000000
--- a/src/components/rightSidePanel/layout/SidePanelSearch.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<script setup lang="ts">
-import { refDebounced } from '@vueuse/core'
-import { ref, toRef, toValue, watch } from 'vue'
-import type { MaybeRefOrGetter } from 'vue'
-
-import { cn } from '@/utils/tailwindUtil'
-
-const { searcher = async () => {}, updateKey } = defineProps<{
-  searcher?: (
-    query: string,
-    onCleanup: (cleanupFn: () => void) => void
-  ) => Promise<void>
-  updateKey?: MaybeRefOrGetter<unknown>
-}>()
-
-const searchQuery = defineModel<string>({ default: '' })
-
-const isQuerying = ref(false)
-const debouncedSearchQuery = refDebounced(searchQuery, 100, {
-  maxWait: 100
-})
-watch(searchQuery, (value) => {
-  isQuerying.value = value !== debouncedSearchQuery.value
-})
-const updateKeyRef = toRef(() => toValue(updateKey))
-
-watch(
-  [debouncedSearchQuery, updateKeyRef],
-  (_, __, onCleanup) => {
-    let isCleanup = false
-    let cleanupFn: undefined | (() => void)
-    onCleanup(() => {
-      isCleanup = true
-      cleanupFn?.()
-    })
-
-    void searcher(debouncedSearchQuery.value, (cb) => (cleanupFn = cb))
-      .catch((error) => {
-        console.error('[SidePanelSearch] searcher failed', error)
-      })
-      .finally(() => {
-        if (!isCleanup) isQuerying.value = false
-      })
-  },
-  { immediate: true }
-)
-</script>
-
-<template>
-  <label
-    :class="
-      cn(
-        'mt-1 py-1.5 bg-secondary-background rounded-lg transition-all duration-150',
-        'flex-1 flex gap-2 px-2 items-center',
-        'text-base-foreground border-0',
-        'focus-within:ring focus-within:ring-component-node-widget-background-highlighted/80'
-      )
-    "
-  >
-    <i
-      :class="
-        cn(
-          'size-4 text-muted-foreground',
-          isQuerying
-            ? 'icon-[lucide--loader-circle] animate-spin'
-            : 'icon-[lucide--search]'
-        )
-      "
-    />
-    <input
-      v-model="searchQuery"
-      type="text"
-      class="bg-transparent border-0 outline-0 ring-0 h-5"
-      :placeholder="$t('g.searchPlaceholder')"
-    />
-  </label>
-</template>
diff --git a/src/components/rightSidePanel/layout/TransitionCollapse.vue b/src/components/rightSidePanel/layout/TransitionCollapse.vue
new file mode 100644
index 0000000000..3f8abf6076
--- /dev/null
+++ b/src/components/rightSidePanel/layout/TransitionCollapse.vue
@@ -0,0 +1,145 @@
+<script setup lang="ts">
+import { computed, onMounted, ref } from 'vue'
+
+// From: https://stackoverflow.com/a/71426342/22392721
+interface Props {
+  duration?: number
+  easingEnter?: string
+  easingLeave?: string
+  opacityClosed?: number
+  opacityOpened?: number
+  disable?: boolean
+}
+
+const {
+  duration = 150,
+  easingEnter = 'ease-in-out',
+  easingLeave = 'ease-in-out',
+  opacityClosed = 0,
+  opacityOpened = 1,
+  disable
+} = defineProps<Props>()
+
+const closed = '0px'
+
+const isMounted = ref(false)
+onMounted(() => (isMounted.value = true))
+
+const animationDuration = computed(() =>
+  isMounted.value && !disable ? duration : 0
+)
+
+interface initialStyle {
+  height: string
+  width: string
+  position: string
+  visibility: string
+  overflow: string
+  paddingTop: string
+  paddingBottom: string
+  borderTopWidth: string
+  borderBottomWidth: string
+  marginTop: string
+  marginBottom: string
+}
+
+function getElementStyle(element: HTMLElement) {
+  return {
+    height: element.style.height,
+    width: element.style.width,
+    position: element.style.position,
+    visibility: element.style.visibility,
+    overflow: element.style.overflow,
+    paddingTop: element.style.paddingTop,
+    paddingBottom: element.style.paddingBottom,
+    borderTopWidth: element.style.borderTopWidth,
+    borderBottomWidth: element.style.borderBottomWidth,
+    marginTop: element.style.marginTop,
+    marginBottom: element.style.marginBottom
+  }
+}
+
+function prepareElement(element: HTMLElement, initialStyle: initialStyle) {
+  const { width } = getComputedStyle(element)
+  element.style.width = width
+  element.style.position = 'absolute'
+  element.style.visibility = 'hidden'
+  element.style.height = ''
+  const { height } = getComputedStyle(element)
+  element.style.width = initialStyle.width
+  element.style.position = initialStyle.position
+  element.style.visibility = initialStyle.visibility
+  element.style.height = closed
+  element.style.overflow = 'hidden'
+  return initialStyle.height && initialStyle.height !== closed
+    ? initialStyle.height
+    : height
+}
+
+function animateTransition(
+  element: HTMLElement,
+  initialStyle: initialStyle,
+  done: () => void,
+  keyframes: Keyframe[] | PropertyIndexedKeyframes | null,
+  options?: number | KeyframeAnimationOptions
+) {
+  const animation = element.animate(keyframes, options)
+  // Set height to 'auto' to restore it after animation
+  element.style.height = initialStyle.height
+  animation.onfinish = () => {
+    element.style.overflow = initialStyle.overflow
+    done()
+  }
+}
+
+function getEnterKeyframes(height: string, initialStyle: initialStyle) {
+  return [
+    {
+      height: closed,
+      opacity: opacityClosed,
+      paddingTop: closed,
+      paddingBottom: closed,
+      borderTopWidth: closed,
+      borderBottomWidth: closed,
+      marginTop: closed,
+      marginBottom: closed
+    },
+    {
+      height,
+      opacity: opacityOpened,
+      paddingTop: initialStyle.paddingTop,
+      paddingBottom: initialStyle.paddingBottom,
+      borderTopWidth: initialStyle.borderTopWidth,
+      borderBottomWidth: initialStyle.borderBottomWidth,
+      marginTop: initialStyle.marginTop,
+      marginBottom: initialStyle.marginBottom
+    }
+  ]
+}
+
+function enterTransition(element: Element, done: () => void) {
+  const HTMLElement = element as HTMLElement
+  const initialStyle = getElementStyle(HTMLElement)
+  const height = prepareElement(HTMLElement, initialStyle)
+  const keyframes = getEnterKeyframes(height, initialStyle)
+  const options = { duration: animationDuration.value, easing: easingEnter }
+  animateTransition(HTMLElement, initialStyle, done, keyframes, options)
+}
+
+function leaveTransition(element: Element, done: () => void) {
+  const HTMLElement = element as HTMLElement
+  const initialStyle = getElementStyle(HTMLElement)
+  const { height } = getComputedStyle(HTMLElement)
+  HTMLElement.style.height = height
+  HTMLElement.style.overflow = 'hidden'
+  const keyframes = getEnterKeyframes(height, initialStyle).reverse()
+  const options = { duration: animationDuration.value, easing: easingLeave }
+  animateTransition(HTMLElement, initialStyle, done, keyframes, options)
+}
+</script>
+
+<template>
+  <Transition :css="false" @enter="enterTransition" @leave="leaveTransition">
+    <slot />
+  </Transition>
+</template>
diff --git a/src/components/rightSidePanel/parameters/SectionWidgets.vue b/src/components/rightSidePanel/parameters/SectionWidgets.vue
index 71ee6194f9..7a86a2f4cb 100644
--- a/src/components/rightSidePanel/parameters/SectionWidgets.vue
+++ b/src/components/rightSidePanel/parameters/SectionWidgets.vue
@@ -1,87 +1,290 @@
 <script setup lang="ts">
-import { computed, provide } from 'vue'
+import { computed, inject, provide, ref, shallowRef, watchEffect } from 'vue'
 import { useI18n } from 'vue-i18n'
 
-import { useReactiveWidgetValue } from '@/composables/graph/useGraphNodeManager'
-import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import Button from '@/components/ui/button/Button.vue'
+import { isPromotedWidgetView } from '@/core/graph/subgraph/promotedWidgetTypes'
+import type { LGraphGroup, LGraphNode } from '@/lib/litegraph/src/litegraph'
+import { SubgraphNode } from '@/lib/litegraph/src/litegraph'
+import { usePromotionStore } from '@/stores/promotionStore'
 import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
-import WidgetLegacy from '@/renderer/extensions/vueNodes/widgets/components/WidgetLegacy.vue'
-import {
-  getComponent,
-  shouldExpand
-} from '@/renderer/extensions/vueNodes/widgets/registry/widgetRegistry'
+import { useExecutionErrorStore } from '@/stores/executionErrorStore'
+import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore'
+import { useSettingStore } from '@/platform/settings/settingStore'
 import { cn } from '@/utils/tailwindUtil'
+import { isGroupNode } from '@/utils/executableGroupNodeDto'
+import { useNodeDefStore } from '@/stores/nodeDefStore'
+import { getWidgetDefaultValue } from '@/utils/widgetUtil'
+import type { WidgetValue } from '@/utils/widgetUtil'
 
 import PropertiesAccordionItem from '../layout/PropertiesAccordionItem.vue'
+import { HideLayoutFieldKey } from '@/types/widgetTypes'
 
-const { label, widgets } = defineProps<{
+import { GetNodeParentGroupKey } from '../shared'
+import WidgetItem from './WidgetItem.vue'
+
+const {
+  label,
+  node,
+  widgets: widgetsProp,
+  showLocateButton = false,
+  isDraggable = false,
+  hiddenFavoriteIndicator = false,
+  showNodeName = false,
+  parents = [],
+  enableEmptyState = false,
+  tooltip
+} = defineProps<{
   label?: string
+  parents?: SubgraphNode[]
+  node?: LGraphNode
   widgets: { widget: IBaseWidget; node: LGraphNode }[]
+  showLocateButton?: boolean
+  isDraggable?: boolean
+  hiddenFavoriteIndicator?: boolean
+  showNodeName?: boolean
+  /**
+   * Whether to show the empty state slot when there are no widgets.
+   */
+  enableEmptyState?: boolean
+  tooltip?: string
 }>()
 
-provide('hideLayoutField', true)
+const collapse = defineModel<boolean>('collapse', { default: false })
+
+const widgetsContainer = ref<HTMLElement>()
+const rootElement = ref<HTMLElement>()
+
+const widgets = shallowRef(widgetsProp)
+watchEffect(() => (widgets.value = widgetsProp))
+
+provide(HideLayoutFieldKey, true)
 
 const canvasStore = useCanvasStore()
+const executionErrorStore = useExecutionErrorStore()
+const rightSidePanelStore = useRightSidePanelStore()
+const nodeDefStore = useNodeDefStore()
 const { t } = useI18n()
 
-function getWidgetComponent(widget: IBaseWidget) {
-  const component = getComponent(widget.type, widget.name)
-  return component || WidgetLegacy
+const getNodeParentGroup = inject(GetNodeParentGroupKey, null)
+
+const promotionStore = usePromotionStore()
+
+function isWidgetShownOnParents(
+  widgetNode: LGraphNode,
+  widget: IBaseWidget
+): boolean {
+  return parents.some((parent) => {
+    if (isPromotedWidgetView(widget)) {
+      return promotionStore.isPromoted(
+        parent.rootGraph.id,
+        parent.id,
+        widget.sourceNodeId,
+        widget.sourceWidgetName
+      )
+    }
+    return promotionStore.isPromoted(
+      parent.rootGraph.id,
+      parent.id,
+      String(widgetNode.id),
+      widget.name
+    )
+  })
 }
 
-function onWidgetValueChange(
-  widget: IBaseWidget,
-  value: string | number | boolean | object
-) {
+const isEmpty = computed(() => widgets.value.length === 0)
+
+const displayLabel = computed(
+  () => label ?? (node ? node.title : t('rightSidePanel.inputs'))
+)
+
+const targetNode = computed<LGraphNode | null>(() => {
+  if (node) return node
+  if (isEmpty.value) return null
+
+  const firstNodeId = widgets.value[0].node.id
+  const allSameNode = widgets.value.every(({ node }) => node.id === firstNodeId)
+
+  return allSameNode ? widgets.value[0].node : null
+})
+
+const hasDirectError = computed(() => {
+  if (!targetNode.value) return false
+  return executionErrorStore.activeGraphErrorNodeIds.has(
+    String(targetNode.value.id)
+  )
+})
+
+const hasContainerInternalError = computed(() => {
+  if (!targetNode.value) return false
+  const isContainer =
+    targetNode.value instanceof SubgraphNode || isGroupNode(targetNode.value)
+  if (!isContainer) return false
+
+  return executionErrorStore.isContainerWithInternalError(targetNode.value)
+})
+
+const nodeHasError = computed(() => {
+  if (!targetNode.value) return false
+  if (canvasStore.selectedItems.length === 1) return false
+  return hasDirectError.value || hasContainerInternalError.value
+})
+
+const showSeeError = computed(
+  () =>
+    nodeHasError.value &&
+    useSettingStore().get('Comfy.RightSidePanel.ShowErrorsTab')
+)
+
+const parentGroup = computed<LGraphGroup | null>(() => {
+  if (!targetNode.value || !getNodeParentGroup) return null
+  return getNodeParentGroup(targetNode.value)
+})
+
+const canShowLocateButton = computed(
+  () => showLocateButton && targetNode.value !== null
+)
+
+function handleLocateNode() {
+  if (!targetNode.value || !canvasStore.canvas) return
+
+  const graphNode = canvasStore.canvas.graph?.getNodeById(targetNode.value.id)
+  if (graphNode) {
+    canvasStore.canvas.animateToBounds(graphNode.boundingRect)
+  }
+}
+
+function navigateToErrorTab() {
+  if (!targetNode.value) return
+  if (!useSettingStore().get('Comfy.RightSidePanel.ShowErrorsTab')) return
+  rightSidePanelStore.focusedErrorNodeId = String(targetNode.value.id)
+  rightSidePanelStore.openPanel('errors')
+}
+
+function writeWidgetValue(widget: IBaseWidget, value: WidgetValue) {
   widget.value = value
   widget.callback?.(value)
   canvasStore.canvas?.setDirty(true, true)
 }
 
-const isEmpty = computed(() => widgets.length === 0)
+function handleResetAllWidgets() {
+  for (const { widget, node: widgetNode } of widgetsProp) {
+    const spec = nodeDefStore.getInputSpecForWidget(widgetNode, widget.name)
+    const defaultValue = getWidgetDefaultValue(spec)
+    if (defaultValue !== undefined) {
+      writeWidgetValue(widget, defaultValue)
+    }
+  }
+}
 
-const displayLabel = computed(
-  () =>
-    label ??
-    (isEmpty.value
-      ? t('rightSidePanel.inputsNone')
-      : t('rightSidePanel.inputs'))
-)
+function handleWidgetValueUpdate(widget: IBaseWidget, newValue: WidgetValue) {
+  if (newValue === undefined) return
+  writeWidgetValue(widget, newValue)
+}
+
+function handleWidgetReset(widget: IBaseWidget, newValue: WidgetValue) {
+  writeWidgetValue(widget, newValue)
+}
+
+defineExpose({
+  widgetsContainer,
+  rootElement
+})
 </script>
 
 <template>
-  <PropertiesAccordionItem :is-empty>
-    <template #label>
-      <slot name="label">
-        {{ displayLabel }}
-      </slot>
-    </template>
-
-    <div v-if="!isEmpty" class="space-y-4 rounded-lg bg-interface-surface px-4">
-      <div
-        v-for="({ widget, node }, index) in widgets"
-        :key="`widget-${index}-${widget.name}`"
-        class="widget-item gap-1.5 col-span-full grid grid-cols-subgrid"
-      >
-        <div class="min-h-8">
-          <p v-if="widget.name" class="text-sm leading-8 p-0 m-0 line-clamp-1">
-            {{ widget.label || widget.name }}
-          </p>
+  <div ref="rootElement">
+    <PropertiesAccordionItem
+      v-model:collapse="collapse"
+      :enable-empty-state
+      :disabled="isEmpty"
+      :tooltip
+      :size="showSeeError ? 'lg' : 'default'"
+    >
+      <template #label>
+        <div class="flex min-w-0 flex-1 flex-wrap items-center gap-2">
+          <span class="flex min-w-0 flex-1 items-center gap-2">
+            <i
+              v-if="nodeHasError"
+              class="icon-[lucide--octagon-alert] size-4 shrink-0 text-destructive-background-hover"
+            />
+            <span
+              :class="
+                cn(
+                  'truncate',
+                  nodeHasError && 'text-destructive-background-hover'
+                )
+              "
+            >
+              <slot name="label">
+                {{ displayLabel }}
+              </slot>
+            </span>
+            <span
+              v-if="parentGroup"
+              class="min-w-11 flex-1 truncate text-right text-xs text-muted-foreground"
+              :title="parentGroup.title"
+            >
+              {{ parentGroup.title }}
+            </span>
+          </span>
+          <Button
+            v-if="showSeeError"
+            variant="secondary"
+            size="sm"
+            class="h-8 shrink-0 rounded-lg text-sm"
+            @click.stop="navigateToErrorTab"
+          >
+            {{ t('rightSidePanel.seeError') }}
+          </Button>
+          <Button
+            v-if="!isEmpty"
+            variant="muted-textonly"
+            size="icon-sm"
+            class="subbutton size-8 shrink-0 hover:text-base-foreground"
+            :title="t('rightSidePanel.resetAllParameters')"
+            :aria-label="t('rightSidePanel.resetAllParameters')"
+            @click.stop="handleResetAllWidgets"
+          >
+            <i class="icon-[lucide--rotate-ccw] size-4" />
+          </Button>
+          <Button
+            v-if="canShowLocateButton"
+            variant="muted-textonly"
+            size="icon-sm"
+            class="subbutton mr-3 size-8 shrink-0 hover:text-base-foreground"
+            :title="t('rightSidePanel.locateNode')"
+            :aria-label="t('rightSidePanel.locateNode')"
+            @click.stop="handleLocateNode"
+          >
+            <i class="icon-[lucide--locate] size-4" />
+          </Button>
         </div>
-        <component
-          :is="getWidgetComponent(widget)"
-          :widget="widget"
-          :model-value="useReactiveWidgetValue(widget)"
-          :node-id="String(node.id)"
-          :node-type="node.type"
-          :class="cn('col-span-1', shouldExpand(widget.type) && 'min-h-36')"
-          @update:model-value="
-            (value: string | number | boolean | object) =>
-              onWidgetValueChange(widget, value)
-          "
-        />
+      </template>
+
+      <template #empty><slot name="empty" /></template>
+
+      <div
+        ref="widgetsContainer"
+        class="relative space-y-2 rounded-lg px-4 pt-1"
+      >
+        <TransitionGroup name="list-scale">
+          <WidgetItem
+            v-for="{ widget, node } in widgets"
+            :key="`${node.id}-${widget.name}-${widget.type}`"
+            :widget="widget"
+            :node="node"
+            :is-draggable="isDraggable"
+            :hidden-favorite-indicator="hiddenFavoriteIndicator"
+            :show-node-name="showNodeName"
+            :parents="parents"
+            :is-shown-on-parents="isWidgetShownOnParents(node, widget)"
+            @update:widget-value="handleWidgetValueUpdate(widget, $event)"
+            @reset-to-default="handleWidgetReset(widget, $event)"
+          />
+        </TransitionGroup>
       </div>
-    </div>
-  </PropertiesAccordionItem>
+    </PropertiesAccordionItem>
+  </div>
 </template>
diff --git a/src/components/rightSidePanel/parameters/TabGlobalParameters.vue b/src/components/rightSidePanel/parameters/TabGlobalParameters.vue
new file mode 100644
index 0000000000..ab83511af5
--- /dev/null
+++ b/src/components/rightSidePanel/parameters/TabGlobalParameters.vue
@@ -0,0 +1,167 @@
+<script setup lang="ts">
+import { useMounted, watchDebounced } from '@vueuse/core'
+import { storeToRefs } from 'pinia'
+import {
+  computed,
+  nextTick,
+  onBeforeUnmount,
+  onMounted,
+  ref,
+  shallowRef
+} from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import FormSearchInput from '@/renderer/extensions/vueNodes/widgets/components/form/FormSearchInput.vue'
+import { DraggableList } from '@/scripts/ui/draggableList'
+import { useFavoritedWidgetsStore } from '@/stores/workspace/favoritedWidgetsStore'
+import type { ValidFavoritedWidget } from '@/stores/workspace/favoritedWidgetsStore'
+import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore'
+
+import { searchWidgets } from '../shared'
+import SectionWidgets from './SectionWidgets.vue'
+
+const favoritedWidgetsStore = useFavoritedWidgetsStore()
+const rightSidePanelStore = useRightSidePanelStore()
+const { searchQuery } = storeToRefs(rightSidePanelStore)
+const { t } = useI18n()
+
+const draggableList = ref<DraggableList | undefined>(undefined)
+const sectionWidgetsRef = ref<{ widgetsContainer: HTMLElement }>()
+const isSearching = ref(false)
+
+const favoritedWidgets = computed(
+  () => favoritedWidgetsStore.validFavoritedWidgets
+)
+
+const label = computed(() =>
+  favoritedWidgets.value.length === 0
+    ? t('rightSidePanel.favoritesNone')
+    : t('rightSidePanel.favorites')
+)
+
+const searchedFavoritedWidgets = shallowRef<ValidFavoritedWidget[]>(
+  favoritedWidgets.value
+)
+
+async function searcher(query: string) {
+  isSearching.value = query.trim().length > 0
+  searchedFavoritedWidgets.value = searchWidgets(favoritedWidgets.value, query)
+}
+
+const isMounted = useMounted()
+
+function setDraggableState() {
+  if (!isMounted.value) return
+  draggableList.value?.dispose()
+  const container = sectionWidgetsRef.value?.widgetsContainer
+  if (isSearching.value || !container?.children?.length) return
+
+  draggableList.value = new DraggableList(container, '.draggable-item')
+
+  draggableList.value.applyNewItemsOrder = function () {
+    const reorderedItems: HTMLElement[] = []
+
+    let oldPosition = -1
+    this.getAllItems().forEach((item, index) => {
+      if (item === this.draggableItem) {
+        oldPosition = index
+        return
+      }
+      if (!this.isItemToggled(item)) {
+        reorderedItems[index] = item
+        return
+      }
+      const newIndex = this.isItemAbove(item) ? index + 1 : index - 1
+      reorderedItems[newIndex] = item
+    })
+
+    for (let index = 0; index < this.getAllItems().length; index++) {
+      const item = reorderedItems[index]
+      if (typeof item === 'undefined') {
+        reorderedItems[index] = this.draggableItem as HTMLElement
+      }
+    }
+
+    const newPosition = reorderedItems.indexOf(
+      this.draggableItem as HTMLElement
+    )
+    const widgets = [...searchedFavoritedWidgets.value]
+    const [widget] = widgets.splice(oldPosition, 1)
+    widgets.splice(newPosition, 0, widget)
+    searchedFavoritedWidgets.value = widgets
+    favoritedWidgetsStore.reorderFavorites(widgets)
+  }
+}
+
+watchDebounced(
+  searchedFavoritedWidgets,
+  () => {
+    setDraggableState()
+  },
+  { debounce: 100 }
+)
+
+onMounted(() => {
+  setDraggableState()
+})
+
+onBeforeUnmount(() => {
+  draggableList.value?.dispose()
+})
+
+function onCollapseUpdate() {
+  // Rebuild draggable list after the section header is toggled
+  nextTick(setDraggableState)
+}
+</script>
+
+<template>
+  <div
+    class="flex items-center border-b border-interface-stroke px-4 pt-1 pb-4"
+  >
+    <FormSearchInput
+      v-model="searchQuery"
+      :searcher
+      :update-key="favoritedWidgets"
+      class="flex-1"
+    />
+  </div>
+  <SectionWidgets
+    ref="sectionWidgetsRef"
+    :label
+    :widgets="searchedFavoritedWidgets"
+    :is-draggable="!isSearching"
+    hidden-favorite-indicator
+    show-node-name
+    enable-empty-state
+    class="border-b border-interface-stroke"
+    @update:collapse="onCollapseUpdate"
+  >
+    <template #empty>
+      <div class="px-4 py-10 text-center text-sm text-muted-foreground">
+        <p>
+          {{
+            isSearching
+              ? t('rightSidePanel.noneSearchDesc')
+              : t('rightSidePanel.favoritesNoneDesc')
+          }}
+        </p>
+        <i18n-t
+          v-if="!isSearching"
+          keypath="rightSidePanel.favoritesNoneHint"
+          tag="p"
+          class="mt-2 text-xs"
+        >
+          <template #moreIcon>
+            <span
+              aria-hidden="true"
+              class="text-secondary-foreground inline-flex size-5 items-center justify-center rounded-md bg-secondary-background-hover align-middle"
+            >
+              <i class="icon-[lucide--more-vertical] text-sm" />
+            </span>
+          </template>
+        </i18n-t>
+      </div>
+    </template>
+  </SectionWidgets>
+</template>
diff --git a/src/components/rightSidePanel/parameters/TabNodes.vue b/src/components/rightSidePanel/parameters/TabNodes.vue
new file mode 100644
index 0000000000..da5da33d26
--- /dev/null
+++ b/src/components/rightSidePanel/parameters/TabNodes.vue
@@ -0,0 +1,115 @@
+<script setup lang="ts">
+import { storeToRefs } from 'pinia'
+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 { 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'
+import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore'
+
+import { computedSectionDataList, searchWidgetsAndNodes } from '../shared'
+import type { NodeWidgetsListList } from '../shared'
+import SectionWidgets from './SectionWidgets.vue'
+
+const canvasStore = useCanvasStore()
+const workflowStore = useWorkflowStore()
+
+const nodes = computed((): LGraphNode[] => {
+  // Depend on activeWorkflow to trigger recomputation when workflow changes
+  void workflowStore.activeWorkflow?.path
+  return (canvasStore.canvas?.graph?.nodes ?? []) as LGraphNode[]
+})
+
+const rightSidePanelStore = useRightSidePanelStore()
+const { searchQuery } = storeToRefs(rightSidePanelStore)
+
+const { widgetsSectionDataList } = computedSectionDataList(nodes)
+
+const searchedWidgetsSectionDataList = shallowRef<NodeWidgetsListList>(
+  widgetsSectionDataList.value
+)
+const isSearching = ref(false)
+
+const collapseMap = reactive<Record<string, boolean>>({})
+
+watch(
+  () => workflowStore.activeWorkflow?.path,
+  () => {
+    for (const key of Object.keys(collapseMap)) {
+      delete collapseMap[key]
+    }
+  }
+)
+
+function isSectionCollapsed(nodeId: string): boolean {
+  // Defaults to collapsed when not explicitly set by the user
+  return collapseMap[nodeId] ?? true
+}
+
+function setSectionCollapsed(nodeId: string, collapsed: boolean) {
+  collapseMap[nodeId] = collapsed
+}
+
+const isAllCollapsed = computed({
+  get() {
+    return searchedWidgetsSectionDataList.value.every(({ node }) =>
+      isSectionCollapsed(String(node.id))
+    )
+  },
+  set(collapse: boolean) {
+    for (const { node } of widgetsSectionDataList.value) {
+      setSectionCollapsed(String(node.id), collapse)
+    }
+  }
+})
+
+async function searcher(query: string) {
+  const list = widgetsSectionDataList.value
+  const target = searchedWidgetsSectionDataList
+  isSearching.value = query.trim() !== ''
+  target.value = searchWidgetsAndNodes(list, query)
+}
+</script>
+
+<template>
+  <div
+    class="flex items-center border-b border-interface-stroke px-4 pt-1 pb-4"
+  >
+    <FormSearchInput
+      v-model="searchQuery"
+      :searcher
+      :update-key="widgetsSectionDataList"
+      class="flex-1"
+    />
+    <CollapseToggleButton
+      v-model="isAllCollapsed"
+      :show="!isSearching && widgetsSectionDataList.length > 1"
+    />
+  </div>
+  <TransitionGroup tag="div" name="list-scale" class="relative">
+    <div
+      v-if="isSearching && searchedWidgetsSectionDataList.length === 0"
+      class="px-4 pt-5 pb-15 text-center text-sm text-muted-foreground"
+    >
+      {{ $t('rightSidePanel.noneSearchDesc') }}
+    </div>
+    <SectionWidgets
+      v-for="{ node, widgets } in searchedWidgetsSectionDataList"
+      :key="node.id"
+      :node
+      :widgets
+      :collapse="isSectionCollapsed(String(node.id)) && !isSearching"
+      :tooltip="
+        isSearching || widgets.length
+          ? ''
+          : $t('rightSidePanel.inputsNoneTooltip')
+      "
+      show-locate-button
+      class="border-b border-interface-stroke"
+      @update:collapse="setSectionCollapsed(String(node.id), $event)"
+    />
+  </TransitionGroup>
+</template>
diff --git a/src/components/rightSidePanel/parameters/TabNormalInputs.vue b/src/components/rightSidePanel/parameters/TabNormalInputs.vue
new file mode 100644
index 0000000000..e104b98f4c
--- /dev/null
+++ b/src/components/rightSidePanel/parameters/TabNormalInputs.vue
@@ -0,0 +1,180 @@
+<script setup lang="ts">
+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 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'
+import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore'
+
+import { computedSectionDataList, searchWidgetsAndNodes } from '../shared'
+import type { NodeWidgetsListList } from '../shared'
+import SectionWidgets from './SectionWidgets.vue'
+
+const { nodes, mustShowNodeTitle } = defineProps<{
+  mustShowNodeTitle?: boolean
+  nodes: LGraphNode[]
+}>()
+
+const { t } = useI18n()
+const workflowStore = useWorkflowStore()
+
+const rightSidePanelStore = useRightSidePanelStore()
+const { searchQuery } = storeToRefs(rightSidePanelStore)
+
+const { widgetsSectionDataList, includesAdvanced } = computedSectionDataList(
+  () => nodes
+)
+
+const advancedWidgetsSectionDataList = computed((): NodeWidgetsListList => {
+  if (includesAdvanced.value) {
+    return []
+  }
+  return nodes
+    .map((node) => {
+      const { widgets = [] } = node
+      const advancedWidgets = widgets
+        .filter(
+          (w) =>
+            !(w.options?.canvasOnly || w.options?.hidden) && w.options?.advanced
+        )
+        .map((widget) => ({ node, widget }))
+      return { widgets: advancedWidgets, node }
+    })
+    .filter(({ widgets }) => widgets.length > 0)
+})
+
+const isMultipleNodesSelected = computed(
+  () => widgetsSectionDataList.value.length > 1
+)
+
+const searchedWidgetsSectionDataList = shallowRef<NodeWidgetsListList>(
+  widgetsSectionDataList.value
+)
+const isSearching = ref(false)
+
+const collapseMap = reactive<Record<string, boolean>>({})
+const advancedCollapsed = ref(true)
+
+watch(
+  () => workflowStore.activeWorkflow?.path,
+  () => {
+    for (const key of Object.keys(collapseMap)) {
+      delete collapseMap[key]
+    }
+    advancedCollapsed.value = true
+  }
+)
+
+function isSectionCollapsed(nodeId: string): boolean {
+  // When not explicitly set, sections are collapsed if multiple nodes are selected
+  return collapseMap[nodeId] ?? isMultipleNodesSelected.value
+}
+
+function setSectionCollapsed(nodeId: string, collapsed: boolean) {
+  collapseMap[nodeId] = collapsed
+}
+
+const isAllCollapsed = computed({
+  get() {
+    const normalAllCollapsed = searchedWidgetsSectionDataList.value.every(
+      ({ node }) => isSectionCollapsed(String(node.id))
+    )
+    const hasAdvanced = advancedWidgetsSectionDataList.value.length > 0
+    return hasAdvanced
+      ? normalAllCollapsed && advancedCollapsed.value
+      : normalAllCollapsed
+  },
+  set(collapse: boolean) {
+    for (const { node } of widgetsSectionDataList.value) {
+      setSectionCollapsed(String(node.id), collapse)
+    }
+    advancedCollapsed.value = collapse
+  }
+})
+
+async function searcher(query: string) {
+  const list = widgetsSectionDataList.value
+  const target = searchedWidgetsSectionDataList
+  isSearching.value = query.trim() !== ''
+  target.value = searchWidgetsAndNodes(list, query)
+}
+
+const label = computed(() => {
+  const sections = widgetsSectionDataList.value
+  return !mustShowNodeTitle && sections.length === 1
+    ? sections[0].widgets.length !== 0
+      ? t('rightSidePanel.inputs')
+      : t('rightSidePanel.inputsNone')
+    : undefined // SectionWidgets display node titles by default
+})
+
+const advancedLabel = computed(() => {
+  return !mustShowNodeTitle && !isMultipleNodesSelected.value
+    ? t('rightSidePanel.advancedInputs')
+    : undefined // SectionWidgets display node titles by default
+})
+</script>
+
+<template>
+  <div
+    class="flex items-center border-b border-interface-stroke px-4 pt-1 pb-4"
+  >
+    <FormSearchInput
+      v-model="searchQuery"
+      :searcher
+      :update-key="widgetsSectionDataList"
+      class="flex-1"
+    />
+    <CollapseToggleButton
+      v-model="isAllCollapsed"
+      :show="
+        !isSearching &&
+        widgetsSectionDataList.length + advancedWidgetsSectionDataList.length >
+          1
+      "
+    />
+  </div>
+  <TransitionGroup tag="div" name="list-scale" class="relative">
+    <div
+      v-if="searchedWidgetsSectionDataList.length === 0"
+      class="px-4 py-10 text-center text-sm text-muted-foreground"
+    >
+      {{
+        isSearching
+          ? t('rightSidePanel.noneSearchDesc')
+          : t('rightSidePanel.nodesNoneDesc')
+      }}
+    </div>
+    <SectionWidgets
+      v-for="{ widgets, node } in searchedWidgetsSectionDataList"
+      :key="node.id"
+      :node
+      :label
+      :widgets
+      :collapse="isSectionCollapsed(String(node.id)) && !isSearching"
+      :show-locate-button="isMultipleNodesSelected"
+      :tooltip="
+        isSearching || widgets.length
+          ? ''
+          : t('rightSidePanel.inputsNoneTooltip')
+      "
+      class="border-b border-interface-stroke"
+      @update:collapse="setSectionCollapsed(String(node.id), $event)"
+    />
+  </TransitionGroup>
+  <template v-if="advancedWidgetsSectionDataList.length > 0 && !isSearching">
+    <SectionWidgets
+      v-for="{ widgets, node } in advancedWidgetsSectionDataList"
+      :key="`advanced-${node.id}`"
+      v-model:collapse="advancedCollapsed"
+      :node
+      :label="advancedLabel"
+      :widgets
+      :show-locate-button="isMultipleNodesSelected"
+      class="border-b border-interface-stroke"
+    />
+  </template>
+</template>
diff --git a/src/components/rightSidePanel/parameters/TabParameters.vue b/src/components/rightSidePanel/parameters/TabParameters.vue
deleted file mode 100644
index 1953da7817..0000000000
--- a/src/components/rightSidePanel/parameters/TabParameters.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup lang="ts">
-import { computed, shallowRef } from 'vue'
-
-import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
-import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
-
-import SidePanelSearch from '../layout/SidePanelSearch.vue'
-import SectionWidgets from './SectionWidgets.vue'
-
-const { nodes } = defineProps<{
-  nodes: LGraphNode[]
-}>()
-
-type NodeWidgetsList = Array<{ node: LGraphNode; widget: IBaseWidget }>
-type NodeWidgetsListList = Array<{
-  node: LGraphNode
-  widgets: NodeWidgetsList
-}>
-
-const widgetsSectionDataList = computed((): NodeWidgetsListList => {
-  return nodes.map((node) => {
-    const { widgets = [] } = node
-    const shownWidgets = widgets
-      .filter((w) => !(w.options?.canvasOnly || w.options?.hidden))
-      .map((widget) => ({ node, widget }))
-    return {
-      widgets: shownWidgets,
-      node
-    }
-  })
-})
-
-const searchedWidgetsSectionDataList = shallowRef<NodeWidgetsListList>([])
-
-/**
- * Searches widgets in all selected nodes and returns search results.
- * Filters by name, localized label, type, and user-input value.
- * Performs basic tokenization of the query string.
- */
-async function searcher(query: string) {
-  if (query.trim() === '') {
-    searchedWidgetsSectionDataList.value = widgetsSectionDataList.value
-    return
-  }
-  const words = query.trim().toLowerCase().split(' ')
-  searchedWidgetsSectionDataList.value = widgetsSectionDataList.value
-    .map((item) => {
-      return {
-        ...item,
-        widgets: item.widgets.filter(({ widget }) => {
-          const label = widget.label?.toLowerCase()
-          const name = widget.name.toLowerCase()
-          const type = widget.type.toLowerCase()
-          const value = widget.value?.toString().toLowerCase()
-          return words.every(
-            (word) =>
-              name.includes(word) ||
-              label?.includes(word) ||
-              type?.includes(word) ||
-              value?.includes(word)
-          )
-        })
-      }
-    })
-    .filter((item) => item.widgets.length > 0)
-}
-</script>
-
-<template>
-  <div class="px-4 pb-4 flex gap-2 border-b border-interface-stroke">
-    <SidePanelSearch :searcher :update-key="widgetsSectionDataList" />
-  </div>
-  <SectionWidgets
-    v-for="section in searchedWidgetsSectionDataList"
-    :key="section.node.id"
-    :label="widgetsSectionDataList.length > 1 ? section.node.title : undefined"
-    :widgets="section.widgets"
-    :default-collapse="
-      widgetsSectionDataList.length > 1 &&
-      widgetsSectionDataList === searchedWidgetsSectionDataList
-    "
-    class="border-b border-interface-stroke"
-  />
-</template>
diff --git a/src/components/rightSidePanel/parameters/TabSubgraphInputs.vue b/src/components/rightSidePanel/parameters/TabSubgraphInputs.vue
new file mode 100644
index 0000000000..305d85dc26
--- /dev/null
+++ b/src/components/rightSidePanel/parameters/TabSubgraphInputs.vue
@@ -0,0 +1,255 @@
+<script setup lang="ts">
+import { useMounted, watchDebounced } from '@vueuse/core'
+import { storeToRefs } from 'pinia'
+import {
+  computed,
+  nextTick,
+  onBeforeUnmount,
+  onMounted,
+  ref,
+  shallowRef,
+  useTemplateRef,
+  watch
+} from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import { isPromotedWidgetView } from '@/core/graph/subgraph/promotedWidgetTypes'
+import type { SubgraphNode } from '@/lib/litegraph/src/subgraph/SubgraphNode'
+import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import FormSearchInput from '@/renderer/extensions/vueNodes/widgets/components/form/FormSearchInput.vue'
+import CollapseToggleButton from '@/components/rightSidePanel/layout/CollapseToggleButton.vue'
+import { DraggableList } from '@/scripts/ui/draggableList'
+import { usePromotionStore } from '@/stores/promotionStore'
+import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore'
+
+import { searchWidgets } from '../shared'
+import type { NodeWidgetsList } from '../shared'
+import SectionWidgets from './SectionWidgets.vue'
+
+const { node } = defineProps<{
+  node: SubgraphNode
+}>()
+
+const { t } = useI18n()
+const canvasStore = useCanvasStore()
+const promotionStore = usePromotionStore()
+const rightSidePanelStore = useRightSidePanelStore()
+const { focusedSection, searchQuery } = storeToRefs(rightSidePanelStore)
+
+const advancedInputsCollapsed = ref(true)
+const firstSectionCollapsed = ref(false)
+const isAllCollapsed = computed({
+  get() {
+    const hasAdvanced = advancedInputsWidgets.value.length > 0
+    return hasAdvanced
+      ? firstSectionCollapsed.value && advancedInputsCollapsed.value
+      : firstSectionCollapsed.value
+  },
+  set(collapse: boolean) {
+    firstSectionCollapsed.value = collapse
+    advancedInputsCollapsed.value = collapse
+  }
+})
+const draggableList = ref<DraggableList | undefined>(undefined)
+const sectionWidgetsRef = useTemplateRef('sectionWidgetsRef')
+const advancedInputsSectionRef = useTemplateRef('advancedInputsSectionRef')
+
+const promotionEntries = computed(() =>
+  promotionStore.getPromotions(node.rootGraph.id, node.id)
+)
+
+watch(
+  focusedSection,
+  async (section) => {
+    if (section === 'advanced-inputs') {
+      advancedInputsCollapsed.value = false
+      rightSidePanelStore.clearFocusedSection()
+
+      await nextTick()
+
+      await new Promise((resolve) => setTimeout(resolve, 300))
+
+      const sectionComponent = advancedInputsSectionRef.value
+      const sectionElement = sectionComponent?.rootElement
+      if (sectionElement) {
+        sectionElement.scrollIntoView({ behavior: 'smooth', block: 'start' })
+      }
+    }
+  },
+  { immediate: true }
+)
+
+const widgetsList = computed((): NodeWidgetsList => {
+  const entries = promotionEntries.value
+  const { widgets = [] } = node
+
+  const result: NodeWidgetsList = []
+  for (const { interiorNodeId, widgetName } of entries) {
+    const widget = widgets.find((w) => {
+      if (isPromotedWidgetView(w)) {
+        return (
+          String(w.sourceNodeId) === interiorNodeId &&
+          w.sourceWidgetName === widgetName
+        )
+      }
+      return w.name === widgetName
+    })
+    if (widget) {
+      result.push({ node, widget })
+    }
+  }
+  return result
+})
+
+const advancedInputsWidgets = computed((): NodeWidgetsList => {
+  const interiorNodes = node.subgraph.nodes
+
+  const allInteriorWidgets = interiorNodes.flatMap((interiorNode) => {
+    const { widgets = [] } = interiorNode
+    return widgets
+      .filter((w) => !w.computedDisabled)
+      .map((widget) => ({ node: interiorNode, widget }))
+  })
+
+  return allInteriorWidgets.filter(
+    ({ node: interiorNode, widget }) =>
+      !promotionStore.isPromoted(
+        node.rootGraph.id,
+        node.id,
+        String(interiorNode.id),
+        widget.name
+      )
+  )
+})
+
+const parents = computed<SubgraphNode[]>(() => [node])
+
+const searchedWidgetsList = shallowRef<NodeWidgetsList>(widgetsList.value)
+const isSearching = ref(false)
+
+async function searcher(query: string) {
+  isSearching.value = query.trim() !== ''
+  searchedWidgetsList.value = searchWidgets(widgetsList.value, query)
+}
+
+const isMounted = useMounted()
+
+function setDraggableState() {
+  if (!isMounted.value) return
+
+  draggableList.value?.dispose()
+  const container = sectionWidgetsRef.value?.widgetsContainer
+  if (isSearching.value || !container?.children?.length) return
+
+  draggableList.value = new DraggableList(container, '.draggable-item')
+
+  draggableList.value.applyNewItemsOrder = function () {
+    const reorderedItems: HTMLElement[] = []
+
+    let oldPosition = -1
+    this.getAllItems().forEach((item, index) => {
+      if (item === this.draggableItem) {
+        oldPosition = index
+        return
+      }
+      if (!this.isItemToggled(item)) {
+        reorderedItems[index] = item
+        return
+      }
+      const newIndex = this.isItemAbove(item) ? index + 1 : index - 1
+      reorderedItems[newIndex] = item
+    })
+
+    if (oldPosition === -1) {
+      console.error('[TabSubgraphInputs] draggableItem not found in items')
+      return
+    }
+
+    for (let index = 0; index < this.getAllItems().length; index++) {
+      const item = reorderedItems[index]
+      if (typeof item === 'undefined') {
+        reorderedItems[index] = this.draggableItem as HTMLElement
+      }
+    }
+
+    const newPosition = reorderedItems.indexOf(
+      this.draggableItem as HTMLElement
+    )
+
+    promotionStore.movePromotion(
+      node.rootGraph.id,
+      node.id,
+      oldPosition,
+      newPosition
+    )
+    canvasStore.canvas?.setDirty(true, true)
+  }
+}
+
+watchDebounced(searchedWidgetsList, () => setDraggableState(), {
+  debounce: 100
+})
+onMounted(() => setDraggableState())
+onBeforeUnmount(() => draggableList.value?.dispose())
+
+const label = computed(() => {
+  return searchedWidgetsList.value.length !== 0
+    ? t('rightSidePanel.inputs')
+    : t('rightSidePanel.inputsNone')
+})
+</script>
+
+<template>
+  <div
+    class="flex items-center border-b border-interface-stroke px-4 pt-1 pb-4"
+  >
+    <FormSearchInput
+      v-model="searchQuery"
+      :searcher
+      :update-key="widgetsList"
+      class="flex-1"
+    />
+    <CollapseToggleButton
+      v-model="isAllCollapsed"
+      :show="!isSearching && advancedInputsWidgets.length > 0"
+    />
+  </div>
+  <SectionWidgets
+    ref="sectionWidgetsRef"
+    :collapse="firstSectionCollapsed && !isSearching"
+    :node
+    :label
+    :parents
+    :widgets="searchedWidgetsList"
+    :is-draggable="!isSearching"
+    :enable-empty-state="isSearching"
+    :tooltip="
+      isSearching || searchedWidgetsList.length
+        ? ''
+        : t('rightSidePanel.inputsNoneTooltip')
+    "
+    class="border-b border-interface-stroke"
+    @update:collapse="
+      (v) => {
+        firstSectionCollapsed = v
+        nextTick(setDraggableState)
+      }
+    "
+  >
+    <template #empty>
+      <div class="px-4 pt-5 pb-15 text-center text-sm text-muted-foreground">
+        {{ t('rightSidePanel.noneSearchDesc') }}
+      </div>
+    </template>
+  </SectionWidgets>
+  <SectionWidgets
+    v-if="advancedInputsWidgets.length > 0"
+    ref="advancedInputsSectionRef"
+    v-model:collapse="advancedInputsCollapsed"
+    :label="t('rightSidePanel.advancedInputs')"
+    :parents="parents"
+    :widgets="advancedInputsWidgets"
+    show-node-name
+    class="border-b border-interface-stroke"
+  />
+</template>
diff --git a/src/components/rightSidePanel/parameters/WidgetActions.test.ts b/src/components/rightSidePanel/parameters/WidgetActions.test.ts
new file mode 100644
index 0000000000..2dee71b1fd
--- /dev/null
+++ b/src/components/rightSidePanel/parameters/WidgetActions.test.ts
@@ -0,0 +1,209 @@
+import { createTestingPinia } from '@pinia/testing'
+import { mount } from '@vue/test-utils'
+import { setActivePinia } from 'pinia'
+import type { Slots } from 'vue'
+import { h } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+
+import WidgetActions from './WidgetActions.vue'
+
+const { mockGetInputSpecForWidget } = vi.hoisted(() => ({
+  mockGetInputSpecForWidget: vi.fn()
+}))
+
+vi.mock('@/stores/nodeDefStore', () => ({
+  useNodeDefStore: () => ({
+    getInputSpecForWidget: mockGetInputSpecForWidget
+  })
+}))
+
+vi.mock('@/renderer/core/canvas/canvasStore', () => ({
+  useCanvasStore: () => ({
+    canvas: { setDirty: vi.fn() }
+  })
+}))
+
+vi.mock('@/stores/workspace/favoritedWidgetsStore', () => ({
+  useFavoritedWidgetsStore: () => ({
+    isFavorited: vi.fn().mockReturnValue(false),
+    toggleFavorite: vi.fn()
+  })
+}))
+
+vi.mock('@/services/dialogService', () => ({
+  useDialogService: () => ({
+    prompt: vi.fn()
+  })
+}))
+
+vi.mock('@/components/button/MoreButton.vue', () => ({
+  default: (_: unknown, { slots }: { slots: Slots }) =>
+    h('div', slots.default?.({ close: () => {} }))
+}))
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      g: {
+        rename: 'Rename',
+        enterNewName: 'Enter new name'
+      },
+      rightSidePanel: {
+        hideInput: 'Hide input',
+        showInput: 'Show input',
+        addFavorite: 'Favorite',
+        removeFavorite: 'Unfavorite',
+        resetToDefault: 'Reset to default'
+      }
+    }
+  }
+})
+
+describe('WidgetActions', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    vi.resetAllMocks()
+    mockGetInputSpecForWidget.mockReturnValue({
+      type: 'INT',
+      default: 42
+    })
+  })
+
+  function createMockWidget(
+    value: number = 100,
+    callback?: () => void
+  ): IBaseWidget {
+    return {
+      name: 'test_widget',
+      type: 'number',
+      value,
+      label: 'Test Widget',
+      options: {},
+      y: 0,
+      callback
+    } as IBaseWidget
+  }
+
+  function createMockNode(): LGraphNode {
+    return {
+      id: 1,
+      type: 'TestNode'
+    } as LGraphNode
+  }
+
+  function mountWidgetActions(widget: IBaseWidget, node: LGraphNode) {
+    return mount(WidgetActions, {
+      props: {
+        widget,
+        node,
+        label: 'Test Widget'
+      },
+      global: {
+        plugins: [i18n]
+      }
+    })
+  }
+
+  it('shows reset button when widget has default value', () => {
+    const widget = createMockWidget()
+    const node = createMockNode()
+
+    const wrapper = mountWidgetActions(widget, node)
+
+    const resetButton = wrapper
+      .findAll('button')
+      .find((b) => b.text().includes('Reset'))
+    expect(resetButton).toBeDefined()
+  })
+
+  it('emits resetToDefault with default value when reset button clicked', async () => {
+    const widget = createMockWidget(100)
+    const node = createMockNode()
+
+    const wrapper = mountWidgetActions(widget, node)
+
+    const resetButton = wrapper
+      .findAll('button')
+      .find((b) => b.text().includes('Reset'))
+
+    await resetButton?.trigger('click')
+
+    expect(wrapper.emitted('resetToDefault')).toHaveLength(1)
+    expect(wrapper.emitted('resetToDefault')![0]).toEqual([42])
+  })
+
+  it('disables reset button when value equals default', () => {
+    const widget = createMockWidget(42)
+    const node = createMockNode()
+
+    const wrapper = mountWidgetActions(widget, node)
+
+    const resetButton = wrapper
+      .findAll('button')
+      .find((b) => b.text().includes('Reset'))
+
+    expect(resetButton?.attributes('disabled')).toBeDefined()
+  })
+
+  it('does not show reset button when no default value exists', () => {
+    mockGetInputSpecForWidget.mockReturnValue({
+      type: 'CUSTOM'
+    })
+
+    const widget = createMockWidget(100)
+    const node = createMockNode()
+
+    const wrapper = mountWidgetActions(widget, node)
+
+    const resetButton = wrapper
+      .findAll('button')
+      .find((b) => b.text().includes('Reset'))
+
+    expect(resetButton).toBeUndefined()
+  })
+
+  it('uses fallback default for INT type without explicit default', async () => {
+    mockGetInputSpecForWidget.mockReturnValue({
+      type: 'INT'
+    })
+
+    const widget = createMockWidget(100)
+    const node = createMockNode()
+
+    const wrapper = mountWidgetActions(widget, node)
+
+    const resetButton = wrapper
+      .findAll('button')
+      .find((b) => b.text().includes('Reset'))
+
+    await resetButton?.trigger('click')
+
+    expect(wrapper.emitted('resetToDefault')![0]).toEqual([0])
+  })
+
+  it('uses first option as default for combo without explicit default', async () => {
+    mockGetInputSpecForWidget.mockReturnValue({
+      type: 'COMBO',
+      options: ['option1', 'option2', 'option3']
+    })
+
+    const widget = createMockWidget(100)
+    const node = createMockNode()
+
+    const wrapper = mountWidgetActions(widget, node)
+
+    const resetButton = wrapper
+      .findAll('button')
+      .find((b) => b.text().includes('Reset'))
+
+    await resetButton?.trigger('click')
+
+    expect(wrapper.emitted('resetToDefault')![0]).toEqual(['option1'])
+  })
+})
diff --git a/src/components/rightSidePanel/parameters/WidgetActions.vue b/src/components/rightSidePanel/parameters/WidgetActions.vue
new file mode 100644
index 0000000000..d7a60c2863
--- /dev/null
+++ b/src/components/rightSidePanel/parameters/WidgetActions.vue
@@ -0,0 +1,200 @@
+<script setup lang="ts">
+import { isEqual } from 'es-toolkit'
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import MoreButton from '@/components/button/MoreButton.vue'
+import Button from '@/components/ui/button/Button.vue'
+import { isPromotedWidgetView } from '@/core/graph/subgraph/promotedWidgetTypes'
+import { resolvePromotedWidgetSource } from '@/core/graph/subgraph/resolvePromotedWidgetSource'
+import {
+  demoteWidget,
+  promoteWidget
+} from '@/core/graph/subgraph/promotionUtils'
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type { SubgraphNode } from '@/lib/litegraph/src/subgraph/SubgraphNode'
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import { useDialogService } from '@/services/dialogService'
+import { useNodeDefStore } from '@/stores/nodeDefStore'
+import { useFavoritedWidgetsStore } from '@/stores/workspace/favoritedWidgetsStore'
+import { getWidgetDefaultValue } from '@/utils/widgetUtil'
+import type { WidgetValue } from '@/utils/widgetUtil'
+
+const {
+  widget,
+  node,
+  parents = [],
+  isShownOnParents = false
+} = defineProps<{
+  widget: IBaseWidget
+  node: LGraphNode
+  parents?: SubgraphNode[]
+  isShownOnParents?: boolean
+}>()
+
+const emit = defineEmits<{
+  resetToDefault: [value: WidgetValue]
+}>()
+
+const label = defineModel<string>('label', { required: true })
+
+const canvasStore = useCanvasStore()
+const favoritedWidgetsStore = useFavoritedWidgetsStore()
+const nodeDefStore = useNodeDefStore()
+const dialogService = useDialogService()
+const { t } = useI18n()
+
+const hasParents = computed(() => parents?.length > 0)
+const favoriteNode = computed(() =>
+  isShownOnParents && hasParents.value ? parents[0] : node
+)
+const isFavorited = computed(() =>
+  favoritedWidgetsStore.isFavorited(favoriteNode.value, widget.name)
+)
+
+const inputSpec = computed(() =>
+  nodeDefStore.getInputSpecForWidget(node, widget.name)
+)
+
+const defaultValue = computed(() => getWidgetDefaultValue(inputSpec.value))
+
+const hasDefault = computed(() => defaultValue.value !== undefined)
+
+const isCurrentValueDefault = computed(() => {
+  if (!hasDefault.value) return true
+  return isEqual(widget.value, defaultValue.value)
+})
+
+async function handleRename() {
+  const newLabel = await dialogService.prompt({
+    title: t('g.rename'),
+    message: t('g.enterNewNamePrompt'),
+    defaultValue: widget.label,
+    placeholder: widget.name
+  })
+
+  if (newLabel === null) return
+  label.value = newLabel
+}
+
+function handleHideInput() {
+  if (!parents?.length) return
+
+  if (isPromotedWidgetView(widget)) {
+    const sourceWidget = resolvePromotedWidgetSource(node, widget)
+    if (!sourceWidget) {
+      console.error('Could not resolve source widget for promoted widget')
+      return
+    }
+
+    demoteWidget(sourceWidget.node, sourceWidget.widget, parents)
+  } else {
+    // For regular widgets (not yet promoted), use them directly
+    demoteWidget(node, widget, parents)
+  }
+
+  canvasStore.canvas?.setDirty(true, true)
+}
+
+function handleShowInput() {
+  if (!parents?.length) return
+
+  promoteWidget(node, widget, parents)
+  canvasStore.canvas?.setDirty(true, true)
+}
+
+function handleToggleFavorite() {
+  favoritedWidgetsStore.toggleFavorite(favoriteNode.value, widget.name)
+}
+
+function handleResetToDefault() {
+  if (!hasDefault.value) return
+  emit('resetToDefault', defaultValue.value)
+}
+</script>
+
+<template>
+  <MoreButton
+    is-vertical
+    class="bg-transparent text-muted-foreground transition-all hover:bg-secondary-background-hover hover:text-base-foreground active:scale-95"
+  >
+    <template #default="{ close }">
+      <Button
+        variant="textonly"
+        size="unset"
+        class="flex w-full items-center gap-2 rounded-sm px-3 py-2 text-sm transition-all active:scale-95"
+        @click="
+          () => {
+            handleRename()
+            close()
+          }
+        "
+      >
+        <i class="icon-[lucide--edit] size-4" />
+        <span>{{ t('g.rename') }}</span>
+      </Button>
+
+      <Button
+        v-if="hasParents"
+        variant="textonly"
+        size="unset"
+        class="flex w-full items-center gap-2 rounded-sm px-3 py-2 text-sm transition-all active:scale-95"
+        @click="
+          () => {
+            if (isShownOnParents) handleHideInput()
+            else handleShowInput()
+            close()
+          }
+        "
+      >
+        <template v-if="isShownOnParents">
+          <i class="icon-[lucide--eye-off] size-4" />
+          <span>{{ t('rightSidePanel.hideInput') }}</span>
+        </template>
+        <template v-else>
+          <i class="icon-[lucide--eye] size-4" />
+          <span>{{ t('rightSidePanel.showInput') }}</span>
+        </template>
+      </Button>
+
+      <Button
+        variant="textonly"
+        size="unset"
+        class="flex w-full items-center gap-2 rounded-sm px-3 py-2 text-sm transition-all active:scale-95"
+        @click="
+          () => {
+            handleToggleFavorite()
+            close()
+          }
+        "
+      >
+        <template v-if="isFavorited">
+          <i class="icon-[lucide--star] size-4" />
+          <span>{{ t('rightSidePanel.removeFavorite') }}</span>
+        </template>
+        <template v-else>
+          <i class="icon-[lucide--star] size-4" />
+          <span>{{ t('rightSidePanel.addFavorite') }}</span>
+        </template>
+      </Button>
+
+      <Button
+        v-if="hasDefault"
+        variant="textonly"
+        size="unset"
+        class="flex w-full items-center gap-2 rounded-sm px-3 py-2 text-sm transition-all active:scale-95"
+        :disabled="isCurrentValueDefault"
+        @click="
+          () => {
+            handleResetToDefault()
+            close()
+          }
+        "
+      >
+        <i class="icon-[lucide--rotate-ccw] size-4" />
+        <span>{{ t('rightSidePanel.resetToDefault') }}</span>
+      </Button>
+    </template>
+  </MoreButton>
+</template>
diff --git a/src/components/rightSidePanel/parameters/WidgetItem.test.ts b/src/components/rightSidePanel/parameters/WidgetItem.test.ts
new file mode 100644
index 0000000000..c1d8f50eb2
--- /dev/null
+++ b/src/components/rightSidePanel/parameters/WidgetItem.test.ts
@@ -0,0 +1,204 @@
+import { createTestingPinia } from '@pinia/testing'
+import { mount } from '@vue/test-utils'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+import WidgetItem from './WidgetItem.vue'
+
+const { mockGetInputSpecForWidget, StubWidgetComponent } = vi.hoisted(() => ({
+  mockGetInputSpecForWidget: vi.fn(),
+  StubWidgetComponent: {
+    name: 'StubWidget',
+    props: ['widget', 'modelValue', 'nodeId', 'nodeType'],
+    template: '<div class="stub-widget" />'
+  }
+}))
+
+vi.mock('@/stores/nodeDefStore', () => ({
+  useNodeDefStore: () => ({
+    getInputSpecForWidget: mockGetInputSpecForWidget
+  })
+}))
+
+vi.mock('@/renderer/core/canvas/canvasStore', () => ({
+  useCanvasStore: () => ({
+    canvas: { setDirty: vi.fn() }
+  })
+}))
+
+vi.mock('@/stores/workspace/favoritedWidgetsStore', () => ({
+  useFavoritedWidgetsStore: () => ({
+    isFavorited: vi.fn().mockReturnValue(false),
+    toggleFavorite: vi.fn()
+  })
+}))
+
+vi.mock('@/composables/graph/useGraphNodeManager', () => ({
+  getControlWidget: vi.fn(() => undefined)
+}))
+
+vi.mock('@/core/graph/subgraph/resolvePromotedWidgetSource', () => ({
+  resolvePromotedWidgetSource: vi.fn(() => undefined)
+}))
+
+vi.mock(
+  '@/renderer/extensions/vueNodes/widgets/registry/widgetRegistry',
+  () => ({
+    getComponent: () => StubWidgetComponent,
+    shouldExpand: () => false
+  })
+)
+
+vi.mock(
+  '@/renderer/extensions/vueNodes/widgets/components/WidgetLegacy.vue',
+  () => ({
+    default: StubWidgetComponent
+  })
+)
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      rightSidePanel: {
+        fallbackNodeTitle: 'Untitled'
+      }
+    }
+  }
+})
+
+function createMockNode(overrides: Partial<LGraphNode> = {}): LGraphNode {
+  return {
+    id: 1,
+    type: 'TestNode',
+    isSubgraphNode: () => false,
+    graph: { rootGraph: { id: 'test-graph-id' } },
+    ...overrides
+  } as unknown as LGraphNode
+}
+
+function createMockWidget(overrides: Partial<IBaseWidget> = {}): IBaseWidget {
+  return {
+    name: 'test_widget',
+    type: 'combo',
+    value: 'option_a',
+    y: 0,
+    options: {
+      values: ['option_a', 'option_b', 'option_c']
+    },
+    ...overrides
+  } as IBaseWidget
+}
+
+/**
+ * Creates a mock PromotedWidgetView that mirrors the real class:
+ * properties like name, type, value, options are prototype getters,
+ * NOT own properties — so object spread loses them.
+ */
+function createMockPromotedWidgetView(
+  sourceOptions: IBaseWidget['options'] = {
+    values: ['model_a.safetensors', 'model_b.safetensors']
+  }
+): IBaseWidget {
+  class MockPromotedWidgetView {
+    readonly sourceNodeId = '42'
+    readonly sourceWidgetName = 'ckpt_name'
+    readonly serialize = false
+
+    get name(): string {
+      return 'ckpt_name'
+    }
+    get type(): string {
+      return 'combo'
+    }
+    get value(): unknown {
+      return 'model_a.safetensors'
+    }
+    get options(): IBaseWidget['options'] {
+      return sourceOptions
+    }
+    get label(): string | undefined {
+      return undefined
+    }
+    get y(): number {
+      return 0
+    }
+  }
+  return new MockPromotedWidgetView() as unknown as IBaseWidget
+}
+
+function mountWidgetItem(
+  widget: IBaseWidget,
+  node: LGraphNode = createMockNode()
+) {
+  return mount(WidgetItem, {
+    props: { widget, node },
+    global: {
+      plugins: [i18n],
+      stubs: {
+        EditableText: { template: '<span />' },
+        WidgetActions: { template: '<span />' }
+      }
+    }
+  })
+}
+
+describe('WidgetItem', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    vi.clearAllMocks()
+  })
+
+  describe('promoted widget options', () => {
+    it('passes options from a regular widget to the widget component', () => {
+      const widget = createMockWidget({
+        options: { values: ['a', 'b', 'c'] }
+      })
+      const wrapper = mountWidgetItem(widget)
+      const stub = wrapper.findComponent(StubWidgetComponent)
+
+      expect(stub.props('widget').options).toEqual({
+        values: ['a', 'b', 'c']
+      })
+    })
+
+    it('passes options from a PromotedWidgetView to the widget component', () => {
+      const expectedOptions = {
+        values: ['model_a.safetensors', 'model_b.safetensors']
+      }
+      const widget = createMockPromotedWidgetView(expectedOptions)
+      const wrapper = mountWidgetItem(widget)
+      const stub = wrapper.findComponent(StubWidgetComponent)
+
+      expect(stub.props('widget').options).toEqual(expectedOptions)
+    })
+
+    it('passes type from a PromotedWidgetView to the widget component', () => {
+      const widget = createMockPromotedWidgetView()
+      const wrapper = mountWidgetItem(widget)
+      const stub = wrapper.findComponent(StubWidgetComponent)
+
+      expect(stub.props('widget').type).toBe('combo')
+    })
+
+    it('passes name from a PromotedWidgetView to the widget component', () => {
+      const widget = createMockPromotedWidgetView()
+      const wrapper = mountWidgetItem(widget)
+      const stub = wrapper.findComponent(StubWidgetComponent)
+
+      expect(stub.props('widget').name).toBe('ckpt_name')
+    })
+
+    it('passes value from a PromotedWidgetView to the widget component', () => {
+      const widget = createMockPromotedWidgetView()
+      const wrapper = mountWidgetItem(widget)
+      const stub = wrapper.findComponent(StubWidgetComponent)
+
+      expect(stub.props('widget').value).toBe('model_a.safetensors')
+    })
+  })
+})
diff --git a/src/components/rightSidePanel/parameters/WidgetItem.vue b/src/components/rightSidePanel/parameters/WidgetItem.vue
new file mode 100644
index 0000000000..bed07698d7
--- /dev/null
+++ b/src/components/rightSidePanel/parameters/WidgetItem.vue
@@ -0,0 +1,221 @@
+<script setup lang="ts">
+import { computed, customRef, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import EditableText from '@/components/common/EditableText.vue'
+import { getControlWidget } from '@/composables/graph/useGraphNodeManager'
+import { resolvePromotedWidgetSource } from '@/core/graph/subgraph/resolvePromotedWidgetSource'
+import { st } from '@/i18n'
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type { SubgraphNode } from '@/lib/litegraph/src/subgraph/SubgraphNode'
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import WidgetLegacy from '@/renderer/extensions/vueNodes/widgets/components/WidgetLegacy.vue'
+import {
+  getComponent,
+  shouldExpand
+} from '@/renderer/extensions/vueNodes/widgets/registry/widgetRegistry'
+import { useNodeDefStore } from '@/stores/nodeDefStore'
+import {
+  useWidgetValueStore,
+  stripGraphPrefix
+} from '@/stores/widgetValueStore'
+import { useFavoritedWidgetsStore } from '@/stores/workspace/favoritedWidgetsStore'
+import type { SimplifiedWidget } from '@/types/simplifiedWidget'
+import { resolveNodeDisplayName } from '@/utils/nodeTitleUtil'
+import { cn } from '@/utils/tailwindUtil'
+import { renameWidget } from '@/utils/widgetUtil'
+import type { WidgetValue } from '@/utils/widgetUtil'
+
+import WidgetActions from './WidgetActions.vue'
+
+const {
+  widget,
+  node,
+  isDraggable = false,
+  hiddenFavoriteIndicator = false,
+  hiddenWidgetActions = false,
+  showNodeName = false,
+  parents = [],
+  isShownOnParents = false
+} = defineProps<{
+  widget: IBaseWidget
+  node: LGraphNode
+  isDraggable?: boolean
+  hiddenFavoriteIndicator?: boolean
+  hiddenWidgetActions?: boolean
+  showNodeName?: boolean
+  parents?: SubgraphNode[]
+  isShownOnParents?: boolean
+}>()
+
+const emit = defineEmits<{
+  'update:widgetValue': [value: WidgetValue]
+  resetToDefault: [value: WidgetValue]
+}>()
+
+const { t } = useI18n()
+
+const canvasStore = useCanvasStore()
+const nodeDefStore = useNodeDefStore()
+const widgetValueStore = useWidgetValueStore()
+const favoritedWidgetsStore = useFavoritedWidgetsStore()
+const isEditing = ref(false)
+
+const widgetComponent = computed(() => {
+  const component = getComponent(widget.type)
+  return component || WidgetLegacy
+})
+
+function resolveSourceWidget(): { node: LGraphNode; widget: IBaseWidget } {
+  const source = resolvePromotedWidgetSource(node, widget)
+  return source ?? { node, widget }
+}
+
+const simplifiedWidget = computed((): SimplifiedWidget => {
+  const { node: sourceNode, widget: sourceWidget } = resolveSourceWidget()
+  const graphId = node.graph?.rootGraph?.id
+  const bareNodeId = stripGraphPrefix(String(sourceNode.id))
+  const widgetState = graphId
+    ? widgetValueStore.getWidget(graphId, bareNodeId, sourceWidget.name)
+    : undefined
+
+  return {
+    name: widget.name,
+    type: widget.type,
+    value: widgetState?.value ?? widget.value,
+    label: widgetState?.label ?? widget.label,
+    options: widgetState?.options ?? widget.options,
+    spec: nodeDefStore.getInputSpecForWidget(sourceNode, sourceWidget.name),
+    controlWidget: getControlWidget(sourceWidget)
+  }
+})
+
+const sourceNodeName = computed((): string | null => {
+  const sourceNode = resolvePromotedWidgetSource(node, widget)?.node ?? node
+  if (!sourceNode) return null
+  const fallbackNodeTitle = t('rightSidePanel.fallbackNodeTitle')
+  return resolveNodeDisplayName(sourceNode, {
+    emptyLabel: fallbackNodeTitle,
+    untitledLabel: fallbackNodeTitle,
+    st
+  })
+})
+
+const hasParents = computed(() => parents?.length > 0)
+const favoriteNode = computed(() =>
+  isShownOnParents && hasParents.value ? parents[0] : node
+)
+
+const widgetValue = computed({
+  get: () => widget.value,
+  set: (newValue: WidgetValue) => {
+    emit('update:widgetValue', newValue)
+  }
+})
+
+const displayLabel = customRef((track, trigger) => {
+  return {
+    get() {
+      track()
+      return widget.label || widget.name
+    },
+    set(newValue: string) {
+      isEditing.value = false
+
+      const trimmedLabel = newValue.trim()
+
+      const success = renameWidget(widget, node, trimmedLabel, parents)
+
+      if (success) {
+        canvasStore.canvas?.setDirty(true)
+        trigger()
+      }
+    }
+  }
+})
+</script>
+
+<template>
+  <div
+    :class="
+      cn(
+        'widget-item group col-span-full grid grid-cols-subgrid rounded-lg',
+        isDraggable &&
+          'draggable-item drag-handle cursor-grab bg-comfy-menu-bg outline-comfy-menu-bg will-change-auto! [&.is-draggable]:cursor-grabbing [&.is-draggable]:opacity-70 [&.is-draggable]:outline-4 [&.is-draggable]:outline-offset-0'
+      )
+    "
+  >
+    <!-- widget header -->
+    <div
+      :class="
+        cn(
+          'mb-1.5 flex min-h-8 min-w-0 items-center justify-between gap-1',
+          isDraggable && 'pointer-events-none'
+        )
+      "
+    >
+      <EditableText
+        v-if="widget.name"
+        :model-value="displayLabel"
+        :is-editing="isEditing"
+        :input-attrs="{ placeholder: widget.name }"
+        class="pointer-events-auto m-0 cursor-text truncate p-0 text-sm/8"
+        @edit="displayLabel = $event"
+        @cancel="isEditing = false"
+        @click="isEditing = true"
+      />
+
+      <span
+        v-if="(showNodeName || hasParents) && sourceNodeName"
+        class="mx-1 my-0 min-w-10 flex-1 truncate p-0 text-right text-xs text-muted-foreground"
+      >
+        {{ sourceNodeName }}
+      </span>
+      <div
+        v-if="!hiddenWidgetActions"
+        class="pointer-events-auto flex shrink-0 items-center gap-1"
+      >
+        <WidgetActions
+          v-model:label="displayLabel"
+          :widget="widget"
+          :node="node"
+          :parents="parents"
+          :is-shown-on-parents="isShownOnParents"
+          @reset-to-default="emit('resetToDefault', $event)"
+        />
+      </div>
+    </div>
+    <!-- favorite indicator -->
+    <div
+      v-if="
+        !hiddenFavoriteIndicator &&
+        favoritedWidgetsStore.isFavorited(favoriteNode, widget.name)
+      "
+      class="pointer-events-none relative z-2"
+    >
+      <i
+        class="pi pi-star-fill pointer-events-none absolute -top-1 -right-1 text-xs text-muted-foreground"
+      />
+    </div>
+    <!-- widget content -->
+    <component
+      :is="widgetComponent"
+      v-model="widgetValue"
+      :widget="simplifiedWidget"
+      :node-id="String(node.id)"
+      :node-type="node.type"
+      :class="cn('col-span-1', shouldExpand(widget.type) && 'min-h-36')"
+    />
+    <!-- Drag handle -->
+    <div
+      :class="
+        cn(
+          'pointer-events-none mx-auto mt-1.5 h-1 w-1/2 max-w-40 rounded-lg bg-transparent transition-colors duration-150',
+          'group-hover:bg-interface-stroke group-[.is-draggable]:bg-component-node-widget-background-highlighted',
+          !isDraggable && 'opacity-0'
+        )
+      "
+    />
+  </div>
+</template>
diff --git a/src/components/rightSidePanel/settings/FieldSwitch.vue b/src/components/rightSidePanel/settings/FieldSwitch.vue
new file mode 100644
index 0000000000..84b509720c
--- /dev/null
+++ b/src/components/rightSidePanel/settings/FieldSwitch.vue
@@ -0,0 +1,21 @@
+<script setup lang="ts">
+import ToggleSwitch from 'primevue/toggleswitch'
+
+import LayoutField from './LayoutField.vue'
+
+defineProps<{
+  label: string
+  tooltip?: string
+}>()
+
+const modelValue = defineModel<boolean>({ default: false })
+</script>
+
+<template>
+  <LayoutField singleline :label :tooltip>
+    <ToggleSwitch
+      v-model="modelValue"
+      class="transition-transform active:scale-90"
+    />
+  </LayoutField>
+</template>
diff --git a/src/components/rightSidePanel/settings/LayoutField.vue b/src/components/rightSidePanel/settings/LayoutField.vue
new file mode 100644
index 0000000000..9cc1bcd500
--- /dev/null
+++ b/src/components/rightSidePanel/settings/LayoutField.vue
@@ -0,0 +1,43 @@
+<script setup lang="ts">
+import { cn } from '@comfyorg/tailwind-utils'
+
+defineProps<{
+  label: string
+  tooltip?: string
+  singleline?: boolean
+}>()
+</script>
+
+<template>
+  <div
+    :class="
+      cn('flex gap-2', singleline ? 'items-center justify-between' : 'flex-col')
+    "
+  >
+    <span
+      v-tooltip.left="
+        tooltip
+          ? {
+              value: tooltip,
+              showDelay: 300
+            }
+          : null
+      "
+      :class="
+        cn(
+          'group truncate text-sm text-muted-foreground',
+          tooltip ? 'cursor-help' : '',
+          singleline ? 'flex-1' : ''
+        )
+      "
+    >
+      {{ label }}
+
+      <i
+        v-if="tooltip"
+        class="relative top-px ml-0.5 icon-[lucide--info] size-3 group-hover:text-primary"
+      />
+    </span>
+    <slot />
+  </div>
+</template>
diff --git a/src/components/rightSidePanel/settings/NodeSettings.vue b/src/components/rightSidePanel/settings/NodeSettings.vue
new file mode 100644
index 0000000000..f4048c98b8
--- /dev/null
+++ b/src/components/rightSidePanel/settings/NodeSettings.vue
@@ -0,0 +1,61 @@
+<template>
+  <div class="space-y-4 text-sm text-muted-foreground">
+    <SetNodeState
+      v-if="isNodes(targetNodes)"
+      :nodes="targetNodes"
+      @changed="handleChanged"
+    />
+    <SetNodeColor :nodes="targetNodes" @changed="handleChanged" />
+    <SetPinned :nodes="targetNodes" @changed="handleChanged" />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { shallowRef, watchEffect } from 'vue'
+
+import type { LGraphGroup, LGraphNode } from '@/lib/litegraph/src/litegraph'
+import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import { isLGraphGroup } from '@/utils/litegraphUtil'
+
+import SetNodeColor from './SetNodeColor.vue'
+import SetNodeState from './SetNodeState.vue'
+import SetPinned from './SetPinned.vue'
+
+const props = defineProps<{
+  /**
+   * - If the item is a Group, Node State cannot be set
+   * as Groups do not have a 'mode' property.
+   *
+   * - The nodes array can contain either all Nodes or all Groups,
+   * but it must not be a mix of both.
+   */
+  nodes?: LGraphNode[] | LGraphGroup[]
+}>()
+
+const targetNodes = shallowRef<LGraphNode[] | LGraphGroup[]>([])
+watchEffect(() => {
+  if (props.nodes) {
+    targetNodes.value = props.nodes
+  } else {
+    targetNodes.value = []
+  }
+})
+
+const canvasStore = useCanvasStore()
+
+function isNodes(nodes: LGraphNode[] | LGraphGroup[]): nodes is LGraphNode[] {
+  return !nodes.some((node) => isLGraphGroup(node))
+}
+
+function handleChanged() {
+  /**
+   * This is not a random comment—it's crucial.
+   * Otherwise, the UI cannot update correctly.
+   * There is a bug with triggerRef here, so we can't use triggerRef.
+   * We'll work around it for now and later submit a Vue issue and pull request to fix it.
+   */
+  targetNodes.value = targetNodes.value.slice()
+
+  canvasStore.canvas?.setDirty(true, true)
+}
+</script>
diff --git a/src/components/rightSidePanel/settings/SetNodeColor.vue b/src/components/rightSidePanel/settings/SetNodeColor.vue
new file mode 100644
index 0000000000..63a7e3d552
--- /dev/null
+++ b/src/components/rightSidePanel/settings/SetNodeColor.vue
@@ -0,0 +1,144 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
+import { LGraphCanvas, LiteGraph } from '@/lib/litegraph/src/litegraph'
+import type { ColorOption } from '@/lib/litegraph/src/litegraph'
+import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
+import { adjustColor } from '@/utils/colorUtil'
+import { cn } from '@/utils/tailwindUtil'
+
+import LayoutField from './LayoutField.vue'
+
+/**
+ * Good design limits dependencies and simplifies the interface of the abstraction layer.
+ * Here, we only care about the getColorOption and setColorOption methods,
+ * and do not concern ourselves with other methods.
+ */
+type PickedNode = Pick<LGraphNode, 'getColorOption' | 'setColorOption'>
+
+const { nodes } = defineProps<{ nodes: PickedNode[] }>()
+const emit = defineEmits<{ (e: 'changed'): void }>()
+
+const { t } = useI18n()
+
+const colorPaletteStore = useColorPaletteStore()
+
+type NodeColorOption = {
+  name: string
+  localizedName: () => string
+  value: {
+    dark: string
+    light: string
+    ringDark: string
+    ringLight: string
+  }
+}
+
+const nodeColorEntries = Object.entries(LGraphCanvas.node_colors)
+
+function getColorValue(color: string): NodeColorOption['value'] {
+  return {
+    dark: adjustColor(color, { lightness: 0.3 }),
+    light: adjustColor(color, { lightness: 0.4 }),
+    ringDark: adjustColor(color, { lightness: 0.5 }),
+    ringLight: adjustColor(color, { lightness: 0.1 })
+  }
+}
+
+const NO_COLOR_OPTION: NodeColorOption = {
+  name: 'noColor',
+  localizedName: () => t('color.noColor'),
+  value: getColorValue(LiteGraph.NODE_DEFAULT_BGCOLOR)
+}
+
+const colorOptions: NodeColorOption[] = [
+  NO_COLOR_OPTION,
+  ...nodeColorEntries.map(([name, color]) => ({
+    name,
+    localizedName: () => t(`color.${name}`),
+    value: getColorValue(color.bgcolor)
+  }))
+]
+
+const isLightTheme = computed(
+  () => colorPaletteStore.completedActivePalette.light_theme
+)
+
+const nodeColor = computed<NodeColorOption['name'] | null>({
+  get() {
+    if (nodes.length === 0) return null
+    const theColorOptions = nodes.map((item) => item.getColorOption())
+
+    let colorOption: ColorOption | null | false = theColorOptions[0]
+    if (!theColorOptions.every((option) => option === colorOption)) {
+      colorOption = false
+    }
+
+    if (colorOption === false) return null
+    if (colorOption == null || (!colorOption.bgcolor && !colorOption.color))
+      return NO_COLOR_OPTION.name
+    return (
+      nodeColorEntries.find(
+        ([_, color]) =>
+          color.bgcolor === colorOption.bgcolor &&
+          color.color === colorOption.color
+      )?.[0] ?? null
+    )
+  },
+  set(colorName) {
+    if (colorName === null) return
+
+    const canvasColorOption =
+      colorName === NO_COLOR_OPTION.name
+        ? null
+        : LGraphCanvas.node_colors[colorName]
+
+    for (const item of nodes) {
+      item.setColorOption(canvasColorOption)
+    }
+
+    emit('changed')
+  }
+})
+</script>
+
+<template>
+  <LayoutField :label="t('rightSidePanel.color')">
+    <div
+      class="grid grid-cols-5 justify-items-center gap-1 rounded-lg border-none bg-secondary-background p-1"
+    >
+      <button
+        v-for="option of colorOptions"
+        :key="option.name"
+        :class="
+          cn(
+            'flex size-8 cursor-pointer items-center justify-center rounded-lg border-0 bg-transparent text-left ring-0 outline-0',
+            option.name === nodeColor
+              ? 'bg-interface-menu-component-surface-selected'
+              : 'hover:bg-interface-menu-component-surface-selected'
+          )
+        "
+        @click="nodeColor = option.name"
+      >
+        <div
+          v-tooltip.top="option.localizedName()"
+          :class="cn('size-4 rounded-full ring-2 ring-gray-500/10')"
+          :style="{
+            backgroundColor: isLightTheme
+              ? option.value.light
+              : option.value.dark,
+            '--tw-ring-color':
+              option.name === nodeColor
+                ? isLightTheme
+                  ? option.value.ringLight
+                  : option.value.ringDark
+                : undefined
+          }"
+          :data-testid="option.name"
+        />
+      </button>
+    </div>
+  </LayoutField>
+</template>
diff --git a/src/components/rightSidePanel/settings/SetNodeState.vue b/src/components/rightSidePanel/settings/SetNodeState.vue
new file mode 100644
index 0000000000..7d64fefeff
--- /dev/null
+++ b/src/components/rightSidePanel/settings/SetNodeState.vue
@@ -0,0 +1,71 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
+import { LGraphEventMode } from '@/lib/litegraph/src/litegraph'
+import FormSelectButton from '@/renderer/extensions/vueNodes/widgets/components/form/FormSelectButton.vue'
+
+import LayoutField from './LayoutField.vue'
+
+/**
+ * Good design limits dependencies and simplifies the interface of the abstraction layer.
+ * Here, we only care about the mode method,
+ * and do not concern ourselves with other methods.
+ */
+type PickedNode = Pick<LGraphNode, 'mode'>
+
+const { nodes } = defineProps<{ nodes: PickedNode[] }>()
+const emit = defineEmits<{ (e: 'changed'): void }>()
+
+const { t } = useI18n()
+
+const nodeState = computed({
+  get() {
+    let mode: LGraphNode['mode'] | null = null
+
+    if (nodes.length === 0) return null
+
+    // For multiple nodes, if all nodes have the same mode, return that mode, otherwise return null
+    if (nodes.length > 1) {
+      mode = nodes[0].mode
+      if (!nodes.every((node) => node.mode === mode)) {
+        mode = null
+      }
+    } else {
+      mode = nodes[0].mode
+    }
+
+    return mode
+  },
+  set(value: LGraphNode['mode']) {
+    nodes.forEach((node) => {
+      node.mode = value
+    })
+    emit('changed')
+  }
+})
+</script>
+
+<template>
+  <LayoutField :label="t('rightSidePanel.nodeState')">
+    <FormSelectButton
+      v-model="nodeState"
+      class="w-full"
+      :options="[
+        {
+          label: t('rightSidePanel.normal'),
+          value: LGraphEventMode.ALWAYS
+        },
+        {
+          label: t('rightSidePanel.bypass'),
+          value: LGraphEventMode.BYPASS
+        },
+        {
+          label: t('rightSidePanel.mute'),
+          value: LGraphEventMode.NEVER
+        }
+      ]"
+    />
+  </LayoutField>
+</template>
diff --git a/src/components/rightSidePanel/settings/SetPinned.vue b/src/components/rightSidePanel/settings/SetPinned.vue
new file mode 100644
index 0000000000..24f4cbe6fd
--- /dev/null
+++ b/src/components/rightSidePanel/settings/SetPinned.vue
@@ -0,0 +1,35 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
+
+import FieldSwitch from './FieldSwitch.vue'
+
+type PickedNode = Pick<LGraphNode, 'pinned' | 'pin'>
+
+/**
+ * Good design limits dependencies and simplifies the interface of the abstraction layer.
+ * Here, we only care about the pinned and pin methods,
+ * and do not concern ourselves with other methods.
+ */
+const { nodes } = defineProps<{ nodes: PickedNode[] }>()
+const emit = defineEmits<{ (e: 'changed'): void }>()
+
+const { t } = useI18n()
+
+// Pinned state
+const isPinned = computed<boolean>({
+  get() {
+    return nodes.some((node) => node.pinned)
+  },
+  set(value) {
+    nodes.forEach((node) => node.pin(value))
+    emit('changed')
+  }
+})
+</script>
+
+<template>
+  <FieldSwitch v-model="isPinned" :label="t('rightSidePanel.pinned')" />
+</template>
diff --git a/src/components/rightSidePanel/settings/TabGlobalSettings.vue b/src/components/rightSidePanel/settings/TabGlobalSettings.vue
new file mode 100644
index 0000000000..8cd5873dba
--- /dev/null
+++ b/src/components/rightSidePanel/settings/TabGlobalSettings.vue
@@ -0,0 +1,213 @@
+<script setup lang="ts">
+import InputNumber from 'primevue/inputnumber'
+import Select from 'primevue/select'
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+import Slider from '@/components/ui/slider/Slider.vue'
+import { LiteGraph } from '@/lib/litegraph/src/litegraph'
+import type { LinkRenderType } from '@/lib/litegraph/src/types/globalEnums'
+import { LinkMarkerShape } from '@/lib/litegraph/src/types/globalEnums'
+import { useSettingStore } from '@/platform/settings/settingStore'
+import { WidgetInputBaseClass } from '@/renderer/extensions/vueNodes/widgets/components/layout'
+import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
+import { cn } from '@/utils/tailwindUtil'
+
+import PropertiesAccordionItem from '../layout/PropertiesAccordionItem.vue'
+import FieldSwitch from './FieldSwitch.vue'
+import LayoutField from './LayoutField.vue'
+
+const { t } = useI18n()
+const settingStore = useSettingStore()
+const settingsDialog = useSettingsDialog()
+
+// NODES settings
+const showAdvancedParameters = computed({
+  get: () => settingStore.get('Comfy.Node.AlwaysShowAdvancedWidgets'),
+  set: (value) =>
+    settingStore.set('Comfy.Node.AlwaysShowAdvancedWidgets', value)
+})
+
+const showToolbox = computed({
+  get: () => settingStore.get('Comfy.Canvas.SelectionToolbox'),
+  set: (value) => settingStore.set('Comfy.Canvas.SelectionToolbox', value)
+})
+
+const nodes2Enabled = computed({
+  get: () => settingStore.get('Comfy.VueNodes.Enabled'),
+  set: (value) => settingStore.set('Comfy.VueNodes.Enabled', value)
+})
+
+// CANVAS settings
+const gridSpacing = computed({
+  get: () => settingStore.get('Comfy.SnapToGrid.GridSize'),
+  set: (value) => settingStore.set('Comfy.SnapToGrid.GridSize', value)
+})
+
+const snapToGrid = computed({
+  get: () => settingStore.get('pysssss.SnapToGrid'),
+  set: (value) => settingStore.set('pysssss.SnapToGrid', value)
+})
+
+// CONNECTION LINKS settings
+const linkShape = computed({
+  get: () => settingStore.get('Comfy.Graph.LinkMarkers'),
+  set: (value) => settingStore.set('Comfy.Graph.LinkMarkers', value)
+})
+
+const linkShapeOptions = computed(() => [
+  { value: LinkMarkerShape.None, label: t('g.none') },
+  { value: LinkMarkerShape.Circle, label: t('shape.circle') },
+  { value: LinkMarkerShape.Arrow, label: t('shape.arrow') }
+])
+
+let theOldLinkRenderMode: LinkRenderType = LiteGraph.SPLINE_LINK
+const showConnectedLinks = computed({
+  get: () => settingStore.get('Comfy.LinkRenderMode') !== LiteGraph.HIDDEN_LINK,
+  set: (value) => {
+    let oldLinkRenderMode = settingStore.get('Comfy.LinkRenderMode')
+    if (oldLinkRenderMode !== LiteGraph.HIDDEN_LINK) {
+      theOldLinkRenderMode = oldLinkRenderMode
+    }
+    const newMode = value ? theOldLinkRenderMode : LiteGraph.HIDDEN_LINK
+    settingStore.set('Comfy.LinkRenderMode', newMode)
+  }
+})
+
+const GRID_SIZE_MIN = 1
+const GRID_SIZE_MAX = 100
+const GRID_SIZE_STEP = 1
+
+function updateGridSpacingFromSlider(values?: number[]) {
+  if (!values?.length) return
+  gridSpacing.value = values[0]
+}
+
+function updateGridSpacingFromInput(value: number | null | undefined) {
+  if (typeof value !== 'number') return
+
+  const clampedValue = Math.min(GRID_SIZE_MAX, Math.max(GRID_SIZE_MIN, value))
+  gridSpacing.value = Math.round(clampedValue / GRID_SIZE_STEP) * GRID_SIZE_STEP
+}
+
+function openFullSettings() {
+  settingsDialog.show()
+}
+</script>
+
+<template>
+  <div class="flex flex-col border-t border-interface-stroke">
+    <!-- NODES Section -->
+    <PropertiesAccordionItem class="border-b border-interface-stroke">
+      <template #label>
+        {{ t('rightSidePanel.globalSettings.nodes') }}
+      </template>
+      <div class="space-y-4 px-4 py-3">
+        <FieldSwitch
+          v-model="showAdvancedParameters"
+          :label="t('rightSidePanel.globalSettings.showAdvanced')"
+          :tooltip="t('settings.Comfy_Node_AlwaysShowAdvancedWidgets.tooltip')"
+        />
+        <FieldSwitch
+          v-model="showToolbox"
+          :label="t('rightSidePanel.globalSettings.showToolbox')"
+          :tooltip="t('settings.Comfy_Canvas_SelectionToolbox.tooltip')"
+        />
+        <FieldSwitch
+          v-model="nodes2Enabled"
+          :label="t('rightSidePanel.globalSettings.nodes2')"
+          :tooltip="t('settings.Comfy_VueNodes_Enabled.tooltip')"
+        />
+      </div>
+    </PropertiesAccordionItem>
+
+    <!-- CANVAS Section -->
+    <PropertiesAccordionItem class="border-b border-interface-stroke">
+      <template #label>
+        {{ t('rightSidePanel.globalSettings.canvas') }}
+      </template>
+      <div class="space-y-4 px-4 py-3">
+        <LayoutField :label="t('rightSidePanel.globalSettings.gridSpacing')">
+          <div
+            :class="
+              cn(WidgetInputBaseClass, 'flex items-center gap-2 pr-2 pl-3')
+            "
+          >
+            <Slider
+              :model-value="[gridSpacing]"
+              class="grow text-xs"
+              :min="GRID_SIZE_MIN"
+              :max="GRID_SIZE_MAX"
+              :step="GRID_SIZE_STEP"
+              @update:model-value="updateGridSpacingFromSlider"
+            />
+            <InputNumber
+              :model-value="gridSpacing"
+              class="w-16"
+              size="small"
+              pt:pc-input-text:root="min-w-[4ch] bg-transparent border-none text-center truncate"
+              :min="GRID_SIZE_MIN"
+              :max="GRID_SIZE_MAX"
+              :step="GRID_SIZE_STEP"
+              :allow-empty="false"
+              @update:model-value="updateGridSpacingFromInput"
+            />
+          </div>
+        </LayoutField>
+        <FieldSwitch
+          v-model="snapToGrid"
+          :label="t('rightSidePanel.globalSettings.snapNodesToGrid')"
+          :tooltip="t('settings.pysssss_SnapToGrid.tooltip')"
+        />
+      </div>
+    </PropertiesAccordionItem>
+
+    <!-- CONNECTION LINKS Section -->
+    <PropertiesAccordionItem class="border-b border-interface-stroke">
+      <template #label>
+        {{ t('rightSidePanel.globalSettings.connectionLinks') }}
+      </template>
+      <div class="space-y-4 px-4 py-3">
+        <LayoutField :label="t('rightSidePanel.globalSettings.linkShape')">
+          <Select
+            v-model="linkShape"
+            :options="linkShapeOptions"
+            :aria-label="t('rightSidePanel.globalSettings.linkShape')"
+            :class="cn(WidgetInputBaseClass, 'w-full text-xs')"
+            size="small"
+            :pt="{
+              option: 'text-xs',
+              dropdown: 'w-8',
+              label: cn('min-w-[4ch] truncate', $slots.default && 'mr-5'),
+              overlay: 'w-fit min-w-full'
+            }"
+            data-capture-wheel="true"
+            option-label="label"
+            option-value="value"
+          />
+        </LayoutField>
+        <FieldSwitch
+          v-model="showConnectedLinks"
+          :label="t('rightSidePanel.globalSettings.showConnectedLinks')"
+          :tooltip="t('settings.Comfy_LinkRenderMode.tooltip')"
+        />
+      </div>
+    </PropertiesAccordionItem>
+
+    <!-- View all settings button -->
+    <div
+      class="flex items-center justify-center border-b border-interface-stroke p-4"
+    >
+      <Button
+        variant="muted-textonly"
+        size="sm"
+        class="gap-2 text-sm"
+        @click="openFullSettings"
+      >
+        {{ t('rightSidePanel.globalSettings.viewAllSettings') }}
+        <i class="icon-[lucide--settings] size-4" />
+      </Button>
+    </div>
+  </div>
+</template>
diff --git a/src/components/rightSidePanel/settings/TabSettings.vue b/src/components/rightSidePanel/settings/TabSettings.vue
index cf2aeb6a31..06e17ef340 100644
--- a/src/components/rightSidePanel/settings/TabSettings.vue
+++ b/src/components/rightSidePanel/settings/TabSettings.vue
@@ -1,245 +1,58 @@
 <template>
-  <div class="space-y-4 p-3 text-sm text-muted-foreground">
-    <!-- Node State -->
-    <div class="flex flex-col gap-2">
-      <span>
-        {{ t('rightSidePanel.nodeState') }}
-      </span>
-      <FormSelectButton
-        v-model="nodeState"
-        class="w-full"
-        :options="[
-          {
-            label: t('rightSidePanel.normal'),
-            value: LGraphEventMode.ALWAYS
-          },
-          {
-            label: t('rightSidePanel.bypass'),
-            value: LGraphEventMode.BYPASS
-          },
-          {
-            label: t('rightSidePanel.mute'),
-            value: LGraphEventMode.NEVER
-          }
-        ]"
-      />
-    </div>
-
-    <!-- Color Picker -->
-    <div class="flex flex-col gap-2">
-      <span>
-        {{ t('rightSidePanel.color') }}
-      </span>
-      <div
-        class="bg-secondary-background border-none rounded-lg p-1 grid grid-cols-5 gap-1 justify-items-center"
-      >
-        <button
-          v-for="option of colorOptions"
-          :key="option.name"
-          :class="
-            cn(
-              'size-8 rounded-lg bg-transparent border-0 outline-0 ring-0 text-left flex justify-center items-center cursor-pointer',
-              option.name === nodeColor
-                ? 'bg-interface-menu-component-surface-selected'
-                : 'hover:bg-interface-menu-component-surface-selected'
-            )
-          "
-          @click="nodeColor = option.name"
-        >
-          <div
-            v-tooltip.top="option.localizedName()"
-            :class="cn('size-4 rounded-full ring-2 ring-gray-500/10')"
-            :style="{
-              backgroundColor: isLightTheme
-                ? option.value.light
-                : option.value.dark,
-              '--tw-ring-color':
-                option.name === nodeColor
-                  ? isLightTheme
-                    ? option.value.ringLight
-                    : option.value.ringDark
-                  : undefined
-            }"
-            :data-testid="option.name"
-          />
-        </button>
-      </div>
-    </div>
-
-    <!-- Pinned Toggle -->
-    <div class="flex items-center justify-between">
-      <span>
-        {{ t('rightSidePanel.pinned') }}
-      </span>
-      <ToggleSwitch v-model="isPinned" />
-    </div>
+  <div v-if="isOnlyHasNodes" class="p-4">
+    <NodeSettings :nodes="theNodes" />
+  </div>
+  <div v-else class="border-t border-interface-stroke">
+    <PropertiesAccordionItem
+      v-if="hasNodes"
+      class="border-b border-interface-stroke"
+      :label="$t('rightSidePanel.nodes')"
+    >
+      <NodeSettings :nodes="theNodes" class="p-4" />
+    </PropertiesAccordionItem>
+    <PropertiesAccordionItem
+      v-if="hasGroups"
+      class="border-b border-interface-stroke"
+      :label="$t('rightSidePanel.groups')"
+    >
+      <NodeSettings :nodes="theGroups" class="p-4" />
+    </PropertiesAccordionItem>
   </div>
 </template>
 
 <script setup lang="ts">
-import ToggleSwitch from 'primevue/toggleswitch'
-import { computed, shallowRef, triggerRef, watchEffect } from 'vue'
-import { useI18n } from 'vue-i18n'
+/**
+ * If we only need to show settings for Nodes,
+ * there's no need to wrap them in PropertiesAccordionItem,
+ * making the UI cleaner.
+ * But if there are multiple types of settings,
+ * it's better to wrap them; otherwise,
+ * the UI would look messy.
+ */
+import { computed } from 'vue'
+import type { Raw } from 'vue'
 
-import { LGraphCanvas, LiteGraph } from '@/lib/litegraph/src/litegraph'
-import type { ColorOption, LGraphNode } from '@/lib/litegraph/src/litegraph'
-import { LGraphEventMode } from '@/lib/litegraph/src/types/globalEnums'
-import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
-import FormSelectButton from '@/renderer/extensions/vueNodes/widgets/components/form/FormSelectButton.vue'
-import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
-import { adjustColor } from '@/utils/colorUtil'
-import { cn } from '@/utils/tailwindUtil'
+import type { LGraphGroup } from '@/lib/litegraph/src/LGraphGroup'
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
+import type { Positionable } from '@/lib/litegraph/src/interfaces'
+import { isLGraphGroup, isLGraphNode } from '@/utils/litegraphUtil'
+
+import PropertiesAccordionItem from '../layout/PropertiesAccordionItem.vue'
+import NodeSettings from './NodeSettings.vue'
 
 const props = defineProps<{
-  nodes?: LGraphNode[]
+  nodes: Raw<Positionable>[]
 }>()
 
-/**
- * This is not random writing. It is very important.
- * Otherwise, the UI cannot be updated correctly.
- */
-const targetNodes = shallowRef<LGraphNode[]>([])
-watchEffect(() => {
-  if (props.nodes) {
-    targetNodes.value = props.nodes
-  } else {
-    targetNodes.value = []
-  }
-})
-
-const { t } = useI18n()
-
-const canvasStore = useCanvasStore()
-const colorPaletteStore = useColorPaletteStore()
-const isLightTheme = computed(
-  () => colorPaletteStore.completedActivePalette.light_theme
+const theNodes = computed<LGraphNode[]>(() =>
+  props.nodes.filter((node) => isLGraphNode(node))
 )
 
-const nodeState = computed({
-  get() {
-    let mode: LGraphNode['mode'] | null = null
-    const nodes = targetNodes.value
+const theGroups = computed<LGraphGroup[]>(() =>
+  props.nodes.filter((node) => isLGraphGroup(node))
+)
 
-    if (nodes.length === 0) return null
-
-    // For multiple nodes, if all nodes have the same mode, return that mode, otherwise return null
-    if (nodes.length > 1) {
-      mode = nodes[0].mode
-      if (!nodes.every((node) => node.mode === mode)) {
-        mode = null
-      }
-    } else {
-      mode = nodes[0].mode
-    }
-
-    return mode
-  },
-  set(value: LGraphNode['mode']) {
-    targetNodes.value.forEach((node) => {
-      node.mode = value
-    })
-    /*
-     * This is not random writing. It is very important.
-     * Otherwise, the UI cannot be updated correctly.
-     */
-    triggerRef(targetNodes)
-    canvasStore.canvas?.setDirty(true, true)
-  }
-})
-
-// Pinned state
-const isPinned = computed<boolean>({
-  get() {
-    return targetNodes.value.some((node) => node.pinned)
-  },
-  set(value) {
-    targetNodes.value.forEach((node) => node.pin(value))
-    /*
-     * This is not random writing. It is very important.
-     * Otherwise, the UI cannot be updated correctly.
-     */
-    triggerRef(targetNodes)
-    canvasStore.canvas?.setDirty(true, true)
-  }
-})
-
-type NodeColorOption = {
-  name: string
-  localizedName: () => string
-  value: {
-    dark: string
-    light: string
-    ringDark: string
-    ringLight: string
-  }
-}
-
-function getColorValue(color: string): NodeColorOption['value'] {
-  return {
-    dark: adjustColor(color, { lightness: 0.3 }),
-    light: adjustColor(color, { lightness: 0.4 }),
-    ringDark: adjustColor(color, { lightness: 0.5 }),
-    ringLight: adjustColor(color, { lightness: 0.1 })
-  }
-}
-
-const NO_COLOR_OPTION: NodeColorOption = {
-  name: 'noColor',
-  localizedName: () => t('color.noColor'),
-  value: getColorValue(LiteGraph.NODE_DEFAULT_BGCOLOR)
-}
-
-const nodeColorEntries = Object.entries(LGraphCanvas.node_colors)
-
-const colorOptions: NodeColorOption[] = [
-  NO_COLOR_OPTION,
-  ...nodeColorEntries.map(([name, color]) => ({
-    name,
-    localizedName: () => t(`color.${name}`),
-    value: getColorValue(color.bgcolor)
-  }))
-]
-
-const nodeColor = computed<NodeColorOption['name'] | null>({
-  get() {
-    if (targetNodes.value.length === 0) return null
-    const theColorOptions = targetNodes.value.map((item) =>
-      item.getColorOption()
-    )
-
-    let colorOption: ColorOption | null | false = theColorOptions[0]
-    if (!theColorOptions.every((option) => option === colorOption)) {
-      colorOption = false
-    }
-
-    if (colorOption === false) return null
-    if (colorOption == null || (!colorOption.bgcolor && !colorOption.color))
-      return NO_COLOR_OPTION.name
-    return (
-      nodeColorEntries.find(
-        ([_, color]) =>
-          color.bgcolor === colorOption.bgcolor &&
-          color.color === colorOption.color
-      )?.[0] ?? null
-    )
-  },
-  set(colorName) {
-    if (colorName === null) return
-
-    const canvasColorOption =
-      colorName === NO_COLOR_OPTION.name
-        ? null
-        : LGraphCanvas.node_colors[colorName]
-
-    for (const item of targetNodes.value) {
-      item.setColorOption(canvasColorOption)
-    }
-    /*
-     * This is not random writing. It is very important.
-     * Otherwise, the UI cannot be updated correctly.
-     */
-    triggerRef(targetNodes)
-    canvasStore.canvas?.setDirty(true, true)
-  }
-})
+const hasGroups = computed(() => theGroups.value.length > 0)
+const hasNodes = computed(() => theNodes.value.length > 0)
+const isOnlyHasNodes = computed(() => hasNodes.value && !hasGroups.value)
 </script>
diff --git a/src/components/rightSidePanel/shared.test.ts b/src/components/rightSidePanel/shared.test.ts
new file mode 100644
index 0000000000..f8a01582f9
--- /dev/null
+++ b/src/components/rightSidePanel/shared.test.ts
@@ -0,0 +1,189 @@
+import { LGraphGroup } from '@/lib/litegraph/src/LGraphGroup'
+import { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
+import type { Positionable } from '@/lib/litegraph/src/interfaces'
+import { describe, expect, it, beforeEach } from 'vitest'
+import { flatAndCategorizeSelectedItems, searchWidgets } from './shared'
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+
+describe('searchWidgets', () => {
+  const createWidget = (
+    name: string,
+    type: string,
+    value?: string,
+    label?: string
+  ): { widget: IBaseWidget } => ({
+    widget: {
+      name,
+      type,
+      value,
+      label
+    } as IBaseWidget
+  })
+
+  it('should return all widgets when query is empty', () => {
+    const widgets = [
+      createWidget('width', 'number', '100'),
+      createWidget('height', 'number', '200')
+    ]
+    const result = searchWidgets(widgets, '')
+    expect(result).toEqual(widgets)
+  })
+
+  it('should filter widgets by name, label, type, or value', () => {
+    const widgets = [
+      createWidget('width', 'number', '100', 'Size Control'),
+      createWidget('height', 'slider', '200', 'Image Height'),
+      createWidget('quality', 'text', 'high', 'Quality')
+    ]
+
+    expect(searchWidgets(widgets, 'width')).toHaveLength(1)
+    expect(searchWidgets(widgets, 'slider')).toHaveLength(1)
+    expect(searchWidgets(widgets, 'image')).toHaveLength(1)
+  })
+
+  it('should support fuzzy matching (e.g., "high" matches both "height" and value "high")', () => {
+    const widgets = [
+      createWidget('width', 'number', '100', 'Size Control'),
+      createWidget('height', 'slider', '200', 'Image Height'),
+      createWidget('quality', 'text', 'high', 'Quality')
+    ]
+
+    const results = searchWidgets(widgets, 'high')
+    expect(results).toHaveLength(2)
+    expect(results.some((r) => r.widget.name === 'height')).toBe(true)
+    expect(results.some((r) => r.widget.name === 'quality')).toBe(true)
+  })
+
+  it('should handle multiple search words', () => {
+    const widgets = [
+      createWidget('width', 'number', '100', 'Image Width'),
+      createWidget('height', 'number', '200', 'Image Height')
+    ]
+    const result = searchWidgets(widgets, 'image width')
+    expect(result).toHaveLength(1)
+    expect(result[0].widget.name).toBe('width')
+  })
+
+  it('should be case insensitive', () => {
+    const widgets = [createWidget('Width', 'Number', '100', 'Image Width')]
+    const result = searchWidgets(widgets, 'IMAGE width')
+    expect(result).toHaveLength(1)
+  })
+})
+
+describe('flatAndCategorizeSelectedItems', () => {
+  let testGroup1: LGraphGroup
+  let testGroup2: LGraphGroup
+  let testNode1: LGraphNode
+  let testNode2: LGraphNode
+  let testNode3: LGraphNode
+
+  beforeEach(() => {
+    testGroup1 = new LGraphGroup('Group 1', 1)
+    testGroup2 = new LGraphGroup('Group 2', 2)
+    testNode1 = new LGraphNode('Node 1')
+    testNode2 = new LGraphNode('Node 2')
+    testNode3 = new LGraphNode('Node 3')
+  })
+
+  it('should return empty arrays for empty input', () => {
+    const result = flatAndCategorizeSelectedItems([])
+
+    expect(result.all).toEqual([])
+    expect(result.nodes).toEqual([])
+    expect(result.groups).toEqual([])
+    expect(result.others).toEqual([])
+    expect(result.nodeToParentGroup.size).toBe(0)
+  })
+
+  it('should categorize nodes', () => {
+    const result = flatAndCategorizeSelectedItems([testNode1])
+
+    expect(result.all).toEqual([testNode1])
+    expect(result.nodes).toEqual([testNode1])
+    expect(result.groups).toEqual([])
+    expect(result.others).toEqual([])
+    expect(result.nodeToParentGroup.size).toBe(0)
+  })
+
+  it('should categorize single group without children', () => {
+    const result = flatAndCategorizeSelectedItems([testGroup1])
+
+    expect(result.all).toEqual([testGroup1])
+    expect(result.nodes).toEqual([])
+    expect(result.groups).toEqual([testGroup1])
+    expect(result.others).toEqual([])
+  })
+
+  it('should flatten group with child nodes', () => {
+    testGroup1._children.add(testNode1)
+    testGroup1._children.add(testNode2)
+
+    const result = flatAndCategorizeSelectedItems([testGroup1])
+
+    expect(result.all).toEqual([testGroup1, testNode1, testNode2])
+    expect(result.nodes).toEqual([testNode1, testNode2])
+    expect(result.groups).toEqual([testGroup1])
+    expect(result.nodeToParentGroup.get(testNode1)).toBe(testGroup1)
+    expect(result.nodeToParentGroup.get(testNode2)).toBe(testGroup1)
+  })
+
+  it('should handle nested groups', () => {
+    testGroup1._children.add(testGroup2)
+    testGroup2._children.add(testNode1)
+
+    const result = flatAndCategorizeSelectedItems([testGroup1])
+
+    expect(result.all).toEqual([testGroup1, testGroup2, testNode1])
+    expect(result.nodes).toEqual([testNode1])
+    expect(result.groups).toEqual([testGroup1, testGroup2])
+    expect(result.nodeToParentGroup.get(testNode1)).toBe(testGroup2)
+  })
+
+  it('should handle mixed selection of nodes and groups', () => {
+    testGroup1._children.add(testNode2)
+
+    const result = flatAndCategorizeSelectedItems([
+      testNode1,
+      testGroup1,
+      testNode3
+    ])
+
+    expect(result.all).toContain(testNode1)
+    expect(result.all).toContain(testNode2)
+    expect(result.all).toContain(testNode3)
+    expect(result.all).toContain(testGroup1)
+
+    expect(result.nodes).toEqual([testNode1, testNode2, testNode3])
+    expect(result.groups).toEqual([testGroup1])
+    expect(result.nodeToParentGroup.get(testNode1)).toBeUndefined()
+    expect(result.nodeToParentGroup.get(testNode2)).toBe(testGroup1)
+    expect(result.nodeToParentGroup.get(testNode3)).toBeUndefined()
+  })
+
+  it('should remove duplicate items across group and direct selection', () => {
+    testGroup1._children.add(testNode1)
+
+    const result = flatAndCategorizeSelectedItems([testGroup1, testNode1])
+
+    expect(result.all).toEqual([testGroup1, testNode1])
+    expect(result.nodes).toEqual([testNode1])
+    expect(result.groups).toEqual([testGroup1])
+    expect(result.nodeToParentGroup.get(testNode1)).toBe(testGroup1)
+  })
+
+  it('should handle non-node/non-group items as others', () => {
+    const unknownItem = { pos: [0, 0], size: [100, 100] } as Positionable
+
+    const result = flatAndCategorizeSelectedItems([
+      testNode1,
+      unknownItem,
+      testGroup1
+    ])
+
+    expect(result.nodes).toEqual([testNode1])
+    expect(result.groups).toEqual([testGroup1])
+    expect(result.others).toEqual([unknownItem])
+    expect(result.all).not.toContain(unknownItem)
+  })
+})
diff --git a/src/components/rightSidePanel/shared.ts b/src/components/rightSidePanel/shared.ts
new file mode 100644
index 0000000000..0d70d6d34b
--- /dev/null
+++ b/src/components/rightSidePanel/shared.ts
@@ -0,0 +1,281 @@
+import type { InjectionKey, MaybeRefOrGetter } from 'vue'
+import { computed, toValue } from 'vue'
+import Fuse from 'fuse.js'
+import type { IFuseOptions } from 'fuse.js'
+
+import type { Positionable } from '@/lib/litegraph/src/interfaces'
+import type { LGraphGroup } from '@/lib/litegraph/src/LGraphGroup'
+import type { LGraphNode, NodeId } from '@/lib/litegraph/src/LGraphNode'
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+import { isLGraphGroup, isLGraphNode } from '@/utils/litegraphUtil'
+import { useSettingStore } from '@/platform/settings/settingStore'
+
+export const GetNodeParentGroupKey: InjectionKey<
+  (node: LGraphNode) => LGraphGroup | null
+> = Symbol('getNodeParentGroup')
+
+export type NodeWidgetsList = Array<{ node: LGraphNode; widget: IBaseWidget }>
+export type NodeWidgetsListList = Array<{
+  node: LGraphNode
+  widgets: NodeWidgetsList
+}>
+
+interface WidgetSearchItem {
+  index: number
+  searchableLabel: string
+  searchableName: string
+  searchableType: string
+  searchableValue: string
+}
+
+/**
+ * Searches widgets in a list using fuzzy search and returns search results.
+ * Uses Fuse.js for better matching with typo tolerance and relevance ranking.
+ * Filters by name, localized label, type, and user-input value.
+ */
+export function searchWidgets<T extends { widget: IBaseWidget }[]>(
+  list: T,
+  query: string
+): T {
+  if (query.trim() === '') {
+    return list
+  }
+
+  const searchableList: WidgetSearchItem[] = list.map((item, index) => {
+    const searchableItem = {
+      index,
+      searchableLabel: item.widget.label?.toLowerCase() || '',
+      searchableName: item.widget.name.toLowerCase(),
+      searchableType: item.widget.type.toLowerCase(),
+      searchableValue: item.widget.value?.toString().toLowerCase() || ''
+    }
+    return searchableItem
+  })
+
+  const fuseOptions: IFuseOptions<WidgetSearchItem> = {
+    keys: [
+      { name: 'searchableName', weight: 0.4 },
+      { name: 'searchableLabel', weight: 0.3 },
+      { name: 'searchableValue', weight: 0.3 },
+      { name: 'searchableType', weight: 0.2 }
+    ],
+    threshold: 0.3
+  }
+
+  const fuse = new Fuse(searchableList, fuseOptions)
+  const results = fuse.search(query.trim())
+
+  const matchedItems = new Set(
+    results.map((result) => list[result.item.index]!)
+  )
+
+  return list.filter((item) => matchedItems.has(item)) as T
+}
+
+type NodeSearchItem = {
+  nodeId: NodeId
+  searchableTitle: string
+}
+
+/**
+ * Searches widgets and nodes in a list using fuzzy search and returns search results.
+ * Uses Fuse.js for node title matching with typo tolerance and relevance ranking.
+ * First checks if the node title matches the query (if so, keeps entire node).
+ * Otherwise, filters widgets using searchWidgets.
+ */
+export function searchWidgetsAndNodes(
+  list: NodeWidgetsListList,
+  query: string
+): NodeWidgetsListList {
+  if (query.trim() === '') {
+    return list
+  }
+
+  const searchableList: NodeSearchItem[] = list.map((item) => ({
+    nodeId: item.node.id,
+    searchableTitle: (item.node.getTitle() ?? '').toLowerCase()
+  }))
+
+  const fuseOptions: IFuseOptions<NodeSearchItem> = {
+    keys: [{ name: 'searchableTitle', weight: 1.0 }],
+    threshold: 0.3
+  }
+
+  const fuse = new Fuse(searchableList, fuseOptions)
+  const nodeMatches = fuse.search(query.trim())
+  const matchedNodeIds = new Set(
+    nodeMatches.map((result) => result.item.nodeId)
+  )
+
+  return list
+    .map((item) => {
+      if (matchedNodeIds.has(item.node.id)) {
+        return { ...item, keep: true }
+      }
+      return {
+        ...item,
+        keep: false,
+        widgets: searchWidgets(item.widgets, query)
+      }
+    })
+    .filter((item) => item.keep || item.widgets.length > 0)
+}
+
+type MixedSelectionItem = LGraphGroup | LGraphNode
+type FlatAndCategorizeSelectedItemsResult = {
+  all: MixedSelectionItem[]
+  nodes: LGraphNode[]
+  groups: LGraphGroup[]
+  others: Positionable[]
+  nodeToParentGroup: Map<LGraphNode, LGraphGroup>
+}
+
+type FlatItemsContext = {
+  nodeToParentGroup: Map<LGraphNode, LGraphGroup>
+  depth: number
+  parentGroup?: LGraphGroup
+}
+
+/**
+ * The selected items may contain "Group" nodes, which can include child nodes.
+ * This function flattens such structures and categorizes items into:
+ * - all: all categorizable nodes (does not include nodes in "others")
+ * - nodes: node items
+ * - groups: group items
+ * - others: items not currently supported
+ * - nodeToParentGroup: a map from each node to its direct parent group (if any)
+ * @param items The selected items to flatten and categorize
+ * @returns An object containing arrays: all, nodes, groups, others, and nodeToParentGroup map
+ */
+export function flatAndCategorizeSelectedItems(
+  items: Positionable[]
+): FlatAndCategorizeSelectedItemsResult {
+  const ctx: FlatItemsContext = {
+    nodeToParentGroup: new Map<LGraphNode, LGraphGroup>(),
+    depth: 0
+  }
+  const { all, nodes, groups, others } = flatItems(items, ctx)
+  return {
+    all: repeatItems(all),
+    nodes: repeatItems(nodes),
+    groups: repeatItems(groups),
+    others: repeatItems(others),
+    nodeToParentGroup: ctx.nodeToParentGroup
+  }
+}
+
+export function useFlatAndCategorizeSelectedItems(
+  items: MaybeRefOrGetter<Positionable[]>
+) {
+  const result = computed(() => flatAndCategorizeSelectedItems(toValue(items)))
+
+  return {
+    flattedItems: computed(() => result.value.all),
+    selectedNodes: computed(() => result.value.nodes),
+    selectedGroups: computed(() => result.value.groups),
+    selectedOthers: computed(() => result.value.others),
+    nodeToParentGroup: computed(() => result.value.nodeToParentGroup)
+  }
+}
+
+function flatItems(
+  items: Positionable[],
+  ctx: FlatItemsContext
+): Omit<FlatAndCategorizeSelectedItemsResult, 'nodeToParentGroup'> {
+  const result: MixedSelectionItem[] = []
+  const nodes: LGraphNode[] = []
+  const groups: LGraphGroup[] = []
+  const others: Positionable[] = []
+
+  if (ctx.depth > 1000) {
+    return {
+      all: [],
+      nodes: [],
+      groups: [],
+      others: []
+    }
+  }
+
+  for (let i = 0; i < items.length; i++) {
+    const item = items[i] as Positionable
+
+    if (isLGraphGroup(item)) {
+      result.push(item)
+      groups.push(item)
+
+      const children = Array.from(item.children)
+      const childCtx: FlatItemsContext = {
+        nodeToParentGroup: ctx.nodeToParentGroup,
+        depth: ctx.depth + 1,
+        parentGroup: item
+      }
+      const {
+        all: childAll,
+        nodes: childNodes,
+        groups: childGroups,
+        others: childOthers
+      } = flatItems(children, childCtx)
+      result.push(...childAll)
+      nodes.push(...childNodes)
+      groups.push(...childGroups)
+      others.push(...childOthers)
+    } else if (isLGraphNode(item)) {
+      result.push(item)
+      nodes.push(item)
+      if (ctx.parentGroup) {
+        ctx.nodeToParentGroup.set(item, ctx.parentGroup)
+      }
+    } else {
+      // Other types of items are not supported yet
+      // Do not add to all
+      others.push(item)
+    }
+  }
+  return {
+    all: result,
+    nodes,
+    groups,
+    others
+  }
+}
+
+function repeatItems<T>(items: T[]): T[] {
+  const itemSet = new Set<T>()
+  const result: T[] = []
+  for (const item of items) {
+    if (itemSet.has(item)) continue
+    itemSet.add(item)
+    result.push(item)
+  }
+  return result
+}
+
+export function computedSectionDataList(nodes: MaybeRefOrGetter<LGraphNode[]>) {
+  const settingStore = useSettingStore()
+
+  const includesAdvanced = computed(() =>
+    settingStore.get('Comfy.Node.AlwaysShowAdvancedWidgets')
+  )
+
+  const widgetsSectionDataList = computed((): NodeWidgetsListList => {
+    return toValue(nodes).map((node) => {
+      const { widgets = [] } = node
+      const shownWidgets = widgets
+        .filter(
+          (w) =>
+            !(
+              w.options?.canvasOnly ||
+              w.options?.hidden ||
+              (w.options?.advanced && !includesAdvanced.value)
+            )
+        )
+        .map((widget) => ({ node, widget }))
+      return { widgets: shownWidgets, node }
+    })
+  })
+
+  return {
+    widgetsSectionDataList,
+    includesAdvanced
+  }
+}
diff --git a/src/components/rightSidePanel/subgraph/SubgraphEditor.vue b/src/components/rightSidePanel/subgraph/SubgraphEditor.vue
index 8d406b76d5..6914cfee26 100644
--- a/src/components/rightSidePanel/subgraph/SubgraphEditor.vue
+++ b/src/components/rightSidePanel/subgraph/SubgraphEditor.vue
@@ -1,64 +1,41 @@
 <script setup lang="ts">
-import { watchDebounced } from '@vueuse/core'
-import {
-  computed,
-  customRef,
-  onBeforeUnmount,
-  onMounted,
-  ref,
-  triggerRef
-} from 'vue'
+import { storeToRefs } from 'pinia'
+import { computed, onMounted } from 'vue'
+import { useI18n } from 'vue-i18n'
 
+import DraggableList from '@/components/common/DraggableList.vue'
 import Button from '@/components/ui/button/Button.vue'
 import {
   demoteWidget,
+  getPromotableWidgets,
+  getWidgetName,
   isRecommendedWidget,
-  matchesPropertyItem,
-  matchesWidgetItem,
   promoteWidget,
-  pruneDisconnected,
-  widgetItemToProperty
-} from '@/core/graph/subgraph/proxyWidgetUtils'
-import type { WidgetItem } from '@/core/graph/subgraph/proxyWidgetUtils'
-import { parseProxyWidgets } from '@/core/schemas/proxyWidget'
-import type { ProxyWidgetsProperty } from '@/core/schemas/proxyWidget'
+  pruneDisconnected
+} from '@/core/graph/subgraph/promotionUtils'
+import type { WidgetItem } from '@/core/graph/subgraph/promotionUtils'
 import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
 import { SubgraphNode } from '@/lib/litegraph/src/subgraph/SubgraphNode'
-import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
-import { DraggableList } from '@/scripts/ui/draggableList'
+import FormSearchInput from '@/renderer/extensions/vueNodes/widgets/components/form/FormSearchInput.vue'
 import { useLitegraphService } from '@/services/litegraphService'
+import { usePromotionStore } from '@/stores/promotionStore'
+import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore'
+import { cn } from '@/utils/tailwindUtil'
 
-import SidePanelSearch from '../layout/SidePanelSearch.vue'
 import SubgraphNodeWidget from './SubgraphNodeWidget.vue'
 
+const { t } = useI18n()
 const canvasStore = useCanvasStore()
+const promotionStore = usePromotionStore()
+const rightSidePanelStore = useRightSidePanelStore()
+const { searchQuery } = storeToRefs(rightSidePanelStore)
 
-const draggableList = ref<DraggableList | undefined>(undefined)
-const draggableItems = ref()
-const searchQuery = ref<string>('')
-const proxyWidgets = customRef<ProxyWidgetsProperty>((track, trigger) => ({
-  get() {
-    track()
-    const node = activeNode.value
-    if (!node) return []
-    return parseProxyWidgets(node.properties.proxyWidgets)
-  },
-  set(value?: ProxyWidgetsProperty) {
-    trigger()
-    const node = activeNode.value
-    if (!value) return
-    if (!node) {
-      console.error('Attempted to toggle widgets with no node selected')
-      return
-    }
-    node.properties.proxyWidgets = value
-  }
-}))
-
-async function searcher(query: string) {
-  searchQuery.value = query
-}
+const promotionEntries = computed(() => {
+  const node = activeNode.value
+  if (!node) return []
+  return promotionStore.getPromotions(node.rootGraph.id, node.id)
+})
 
 const activeNode = computed(() => {
   const node = canvasStore.selectedItems[0]
@@ -68,21 +45,27 @@ const activeNode = computed(() => {
 
 const activeWidgets = computed<WidgetItem[]>({
   get() {
-    if (!activeNode.value) return []
     const node = activeNode.value
-    function mapWidgets([id, name]: [string, string]): WidgetItem[] {
-      if (id === '-1') {
-        const widget = node.widgets.find((w) => w.name === name)
+    if (!node) return []
+
+    return promotionEntries.value.flatMap(
+      ({ interiorNodeId, widgetName }): WidgetItem[] => {
+        if (interiorNodeId === '-1') {
+          const widget = node.widgets.find((w) => w.name === widgetName)
+          if (!widget) return []
+          return [
+            [{ id: -1, title: t('subgraphStore.linked'), type: '' }, widget]
+          ]
+        }
+        const wNode = node.subgraph._nodes_by_id[interiorNodeId]
+        if (!wNode) return []
+        const widget = getPromotableWidgets(wNode).find(
+          (w) => w.name === widgetName
+        )
         if (!widget) return []
-        return [[{ id: -1, title: '(Linked)', type: '' }, widget]]
+        return [[wNode, widget]]
       }
-      const wNode = node.subgraph._nodes_by_id[id]
-      if (!wNode?.widgets) return []
-      const widget = wNode.widgets.find((w) => w.name === name)
-      if (!widget) return []
-      return [[wNode, widget]]
-    }
-    return proxyWidgets.value.flatMap(mapWidgets)
+    )
   },
   set(value: WidgetItem[]) {
     const node = activeNode.value
@@ -90,7 +73,14 @@ const activeWidgets = computed<WidgetItem[]>({
       console.error('Attempted to toggle widgets with no node selected')
       return
     }
-    proxyWidgets.value = value.map(widgetItemToProperty)
+    promotionStore.setPromotions(
+      node.rootGraph.id,
+      node.id,
+      value.map(([n, w]) => ({
+        interiorNodeId: String(n.id),
+        widgetName: getWidgetName(w)
+      }))
+    )
   }
 })
 
@@ -111,9 +101,14 @@ const interiorWidgets = computed<WidgetItem[]>(() => {
 const candidateWidgets = computed<WidgetItem[]>(() => {
   const node = activeNode.value
   if (!node) return []
-  const widgets = proxyWidgets.value
   return interiorWidgets.value.filter(
-    (widgetItem: WidgetItem) => !widgets.some(matchesPropertyItem(widgetItem))
+    ([n, w]: WidgetItem) =>
+      !promotionStore.isPromoted(
+        node.rootGraph.id,
+        node.id,
+        String(n.id),
+        w.name
+      )
   )
 })
 const filteredCandidates = computed<WidgetItem[]>(() => {
@@ -146,163 +141,134 @@ function toKey(item: WidgetItem) {
   return `${item[0].id}: ${item[1].name}`
 }
 function nodeWidgets(n: LGraphNode): WidgetItem[] {
-  if (!n.widgets) return []
-  return n.widgets.map((w: IBaseWidget) => [n, w])
+  return getPromotableWidgets(n).map((w) => [n, w])
 }
 function demote([node, widget]: WidgetItem) {
   const subgraphNode = activeNode.value
-  if (!subgraphNode) return []
+  if (!subgraphNode) return
   demoteWidget(node, widget, [subgraphNode])
-  triggerRef(proxyWidgets)
+  promotionStore.demote(
+    subgraphNode.rootGraph.id,
+    subgraphNode.id,
+    String(node.id),
+    getWidgetName(widget)
+  )
 }
 function promote([node, widget]: WidgetItem) {
   const subgraphNode = activeNode.value
-  if (!subgraphNode) return []
+  if (!subgraphNode) return
   promoteWidget(node, widget, [subgraphNode])
-  triggerRef(proxyWidgets)
+  promotionStore.promote(
+    subgraphNode.rootGraph.id,
+    subgraphNode.id,
+    String(node.id),
+    widget.name
+  )
 }
 function showAll() {
   const node = activeNode.value
   if (!node) return
-  const widgets = proxyWidgets.value
-  const toAdd: ProxyWidgetsProperty =
-    filteredCandidates.value.map(widgetItemToProperty)
-  widgets.push(...toAdd)
-  proxyWidgets.value = widgets
+  for (const [n, w] of filteredCandidates.value) {
+    promotionStore.promote(node.rootGraph.id, node.id, String(n.id), w.name)
+  }
 }
 function hideAll() {
   const node = activeNode.value
   if (!node) return
-  proxyWidgets.value = proxyWidgets.value.filter(
-    (propertyItem) =>
-      !filteredActive.value.some(matchesWidgetItem(propertyItem)) ||
-      propertyItem[0] === '-1'
-  )
+  for (const [n, w] of filteredActive.value) {
+    if (String(n.id) === '-1') continue
+    promotionStore.demote(
+      node.rootGraph.id,
+      node.id,
+      String(n.id),
+      getWidgetName(w)
+    )
+  }
 }
 function showRecommended() {
   const node = activeNode.value
   if (!node) return
-  const widgets = proxyWidgets.value
-  const toAdd: ProxyWidgetsProperty =
-    recommendedWidgets.value.map(widgetItemToProperty)
-  widgets.push(...toAdd)
-  proxyWidgets.value = widgets
-}
-
-function setDraggableState() {
-  draggableList.value?.dispose()
-  if (searchQuery.value || !draggableItems.value?.children?.length) return
-  draggableList.value = new DraggableList(
-    draggableItems.value,
-    '.draggable-item'
-  )
-  draggableList.value.applyNewItemsOrder = function () {
-    const reorderedItems = []
-
-    let oldPosition = -1
-    this.getAllItems().forEach((item, index) => {
-      if (item === this.draggableItem) {
-        oldPosition = index
-        return
-      }
-      if (!this.isItemToggled(item)) {
-        reorderedItems[index] = item
-        return
-      }
-      const newIndex = this.isItemAbove(item) ? index + 1 : index - 1
-      reorderedItems[newIndex] = item
-    })
-
-    for (let index = 0; index < this.getAllItems().length; index++) {
-      const item = reorderedItems[index]
-      if (typeof item === 'undefined') {
-        reorderedItems[index] = this.draggableItem
-      }
-    }
-    const newPosition = reorderedItems.indexOf(this.draggableItem)
-    const aw = activeWidgets.value
-    const [w] = aw.splice(oldPosition, 1)
-    aw.splice(newPosition, 0, w)
-    activeWidgets.value = aw
+  for (const [n, w] of recommendedWidgets.value) {
+    promotionStore.promote(node.rootGraph.id, node.id, String(n.id), w.name)
   }
 }
-watchDebounced(
-  filteredActive,
-  () => {
-    setDraggableState()
-  },
-  { debounce: 100 }
-)
+
 onMounted(() => {
-  setDraggableState()
   if (activeNode.value) pruneDisconnected(activeNode.value)
 })
-onBeforeUnmount(() => {
-  draggableList.value?.dispose()
-})
 </script>
 
 <template>
   <div v-if="activeNode" class="subgraph-edit-section flex h-full flex-col">
-    <div class="p-4 flex gap-2">
-      <SidePanelSearch :searcher />
+    <div class="flex gap-2 border-b border-interface-stroke px-4 pt-1 pb-4">
+      <FormSearchInput v-model="searchQuery" />
     </div>
 
     <div class="flex-1">
+      <div
+        v-if="
+          searchQuery &&
+          filteredActive.length === 0 &&
+          filteredCandidates.length === 0
+        "
+        class="px-4 py-10 text-center text-sm text-muted-foreground"
+      >
+        {{ $t('rightSidePanel.noneSearchDesc') }}
+      </div>
+
       <div
         v-if="filteredActive.length"
-        class="flex flex-col border-t border-interface-stroke"
+        class="flex flex-col border-b border-interface-stroke"
       >
         <div
-          class="sticky top-0 z-10 flex items-center justify-between backdrop-blur-xl min-h-12 px-4"
+          class="sticky top-0 z-10 flex min-h-12 items-center justify-between px-4 backdrop-blur-xl"
         >
-          <div class="text-sm font-semibold uppercase line-clamp-1">
+          <div class="line-clamp-1 text-sm font-semibold uppercase">
             {{ $t('subgraphStore.shown') }}
           </div>
           <a
-            class="cursor-pointer text-right text-xs font-normal text-text-secondary hover:text-azure-600 whitespace-nowrap"
+            class="cursor-pointer text-right text-xs font-normal whitespace-nowrap text-text-secondary hover:text-azure-600"
             @click.stop="hideAll"
           >
             {{ $t('subgraphStore.hideAll') }}</a
           >
         </div>
-        <div ref="draggableItems" class="pb-2 px-2 space-y-0.5 mt-0.5">
+        <DraggableList v-slot="{ dragClass }" v-model="activeWidgets">
           <SubgraphNodeWidget
             v-for="[node, widget] in filteredActive"
             :key="toKey([node, widget])"
-            class="bg-interface-panel-surface"
+            :class="cn(!searchQuery && dragClass, 'bg-comfy-menu-bg')"
             :node-title="node.title"
             :widget-name="widget.name"
-            :is-shown="true"
-            :is-draggable="!searchQuery"
             :is-physical="node.id === -1"
+            :is-draggable="!searchQuery"
             @toggle-visibility="demote([node, widget])"
           />
-        </div>
+        </DraggableList>
       </div>
 
       <div
         v-if="filteredCandidates.length"
-        class="flex flex-col border-t border-interface-stroke"
+        class="flex flex-col border-b border-interface-stroke"
       >
         <div
-          class="sticky top-0 z-10 flex items-center justify-between backdrop-blur-xl min-h-12 px-4"
+          class="sticky top-0 z-10 flex min-h-12 items-center justify-between px-4 backdrop-blur-xl"
         >
-          <div class="text-sm font-semibold uppercase line-clamp-1">
+          <div class="line-clamp-1 text-sm font-semibold uppercase">
             {{ $t('subgraphStore.hidden') }}
           </div>
           <a
-            class="cursor-pointer text-right text-xs font-normal text-text-secondary hover:text-azure-600 whitespace-nowrap"
+            class="cursor-pointer text-right text-xs font-normal whitespace-nowrap text-text-secondary hover:text-azure-600"
             @click.stop="showAll"
           >
             {{ $t('subgraphStore.showAll') }}</a
           >
         </div>
-        <div class="pb-2 px-2 space-y-0.5 mt-0.5">
+        <div class="mt-0.5 space-y-0.5 px-2 pb-2">
           <SubgraphNodeWidget
             v-for="[node, widget] in filteredCandidates"
             :key="toKey([node, widget])"
-            class="bg-interface-panel-surface"
+            class="bg-comfy-menu-bg"
             :node-title="node.title"
             :widget-name="widget.name"
             @toggle-visibility="promote([node, widget])"
@@ -312,11 +278,11 @@ onBeforeUnmount(() => {
 
       <div
         v-if="recommendedWidgets.length"
-        class="flex justify-center border-t border-interface-stroke py-4"
+        class="flex justify-center border-b border-interface-stroke py-4"
       >
         <Button
           size="sm"
-          class="rounded border-none px-3 py-0.5"
+          class="rounded-sm border-none px-3 py-0.5"
           @click.stop="showRecommended"
         >
           {{ $t('subgraphStore.showRecommended') }}
diff --git a/src/components/rightSidePanel/subgraph/SubgraphNodeWidget.vue b/src/components/rightSidePanel/subgraph/SubgraphNodeWidget.vue
index 9c4b72d6a7..b206aac4ce 100644
--- a/src/components/rightSidePanel/subgraph/SubgraphNodeWidget.vue
+++ b/src/components/rightSidePanel/subgraph/SubgraphNodeWidget.vue
@@ -27,19 +27,18 @@ function getIcon() {
   <div
     :class="
       cn(
-        'flex py-1 px-2 break-all rounded items-center gap-1',
+        'flex items-center gap-1 rounded-sm px-2 py-1 break-all',
         'bg-node-component-surface',
-        props.isDraggable &&
-          'draggable-item drag-handle cursor-grab [&.is-draggable]:cursor-grabbing hover:ring-1 ring-accent-background',
+        props.isDraggable && 'ring-accent-background hover:ring-1',
         props.class
       )
     "
   >
     <div class="pointer-events-none flex-1">
-      <div class="text-xs text-text-secondary line-clamp-1">
+      <div class="line-clamp-1 text-xs text-text-secondary">
         {{ nodeTitle }}
       </div>
-      <div class="text-sm line-clamp-1 leading-8">{{ widgetName }}</div>
+      <div class="line-clamp-1 text-sm/8">{{ widgetName }}</div>
     </div>
     <Button
       variant="muted-textonly"
@@ -51,7 +50,7 @@ function getIcon() {
     </Button>
     <div
       v-if="isDraggable"
-      class="size-4 pointer-events-none icon-[lucide--grip-vertical]"
+      class="pointer-events-none icon-[lucide--grip-vertical] size-4"
     />
   </div>
 </template>
diff --git a/src/components/searchbox/NodeSearchBox.vue b/src/components/searchbox/NodeSearchBox.vue
index abda187a5c..747f829cc0 100644
--- a/src/components/searchbox/NodeSearchBox.vue
+++ b/src/components/searchbox/NodeSearchBox.vue
@@ -5,7 +5,7 @@
     <div
       v-if="enableNodePreview && hoveredSuggestion"
       class="comfy-vue-node-preview-container absolute top-[50px] left-[-375px] z-50 cursor-pointer"
-      @mousedown.stop="onAddNode(hoveredSuggestion!)"
+      @mousedown.stop="onAddNode(hoveredSuggestion!, $event)"
     >
       <NodePreview
         :key="hoveredSuggestion?.name || ''"
@@ -118,7 +118,9 @@ const suggestions = ref<ComfyNodeDefImpl[]>([])
 const hoveredSuggestion = ref<ComfyNodeDefImpl | null>(null)
 const currentQuery = ref('')
 const placeholder = computed(() => {
-  return filters.length === 0 ? t('g.searchNodes') + '...' : ''
+  return filters.length === 0
+    ? t('g.searchPlaceholder', { subject: t('g.nodes') })
+    : ''
 })
 
 const nodeDefStore = useNodeDefStore()
@@ -146,15 +148,19 @@ const search = (query: string) => {
   debouncedTrackSearch(query)
 }
 
-const emit = defineEmits(['addFilter', 'removeFilter', 'addNode'])
+const emit = defineEmits<{
+  addFilter: [filter: FuseFilterWithValue<ComfyNodeDefImpl, string>]
+  removeFilter: [filter: FuseFilterWithValue<ComfyNodeDefImpl, string>]
+  addNode: [nodeDef: ComfyNodeDefImpl, dragEvent?: MouseEvent]
+}>()
 
 // Track node selection and emit addNode event
-const onAddNode = (nodeDef: ComfyNodeDefImpl) => {
+function onAddNode(nodeDef: ComfyNodeDefImpl, event?: MouseEvent) {
   telemetry?.trackNodeSearchResultSelected({
     node_type: nodeDef.name,
     last_query: currentQuery.value
   })
-  emit('addNode', nodeDef)
+  emit('addNode', nodeDef, event)
 }
 
 let inputElement: HTMLInputElement | null = null
diff --git a/src/components/searchbox/NodeSearchBoxPopover.test.ts b/src/components/searchbox/NodeSearchBoxPopover.test.ts
new file mode 100644
index 0000000000..2f0da1dc89
--- /dev/null
+++ b/src/components/searchbox/NodeSearchBoxPopover.test.ts
@@ -0,0 +1,173 @@
+import { mount } from '@vue/test-utils'
+import { createPinia, setActivePinia } from 'pinia'
+import PrimeVue from 'primevue/config'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { defineComponent } from 'vue'
+import { createI18n } from 'vue-i18n'
+
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+import type { FuseFilter, FuseFilterWithValue } from '@/utils/fuseUtil'
+
+import NodeSearchBoxPopover from './NodeSearchBoxPopover.vue'
+
+const mockStoreRefs = vi.hoisted(() => ({
+  visible: { value: false },
+  newSearchBoxEnabled: { value: true }
+}))
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: () => ({
+    get: vi.fn()
+  })
+}))
+
+vi.mock('pinia', async () => {
+  const actual = await vi.importActual('pinia')
+  return {
+    ...(actual as Record<string, unknown>),
+    storeToRefs: () => mockStoreRefs
+  }
+})
+
+vi.mock('@/stores/workspace/searchBoxStore', () => ({
+  useSearchBoxStore: () => ({})
+}))
+
+vi.mock('@/services/litegraphService', () => ({
+  useLitegraphService: () => ({
+    getCanvasCenter: vi.fn(() => [0, 0]),
+    addNodeOnGraph: vi.fn()
+  })
+}))
+
+vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
+  useWorkflowStore: () => ({
+    activeWorkflow: null
+  })
+}))
+
+vi.mock('@/renderer/core/canvas/canvasStore', () => ({
+  useCanvasStore: () => ({
+    canvas: null,
+    getCanvas: vi.fn(() => ({
+      linkConnector: {
+        events: new EventTarget(),
+        renderLinks: []
+      }
+    }))
+  })
+}))
+
+vi.mock('@/stores/nodeDefStore', () => ({
+  useNodeDefStore: () => ({
+    nodeSearchService: {
+      nodeFilters: [],
+      inputTypeFilter: {},
+      outputTypeFilter: {}
+    }
+  })
+}))
+
+const NodeSearchBoxStub = defineComponent({
+  name: 'NodeSearchBox',
+  props: {
+    filters: { type: Array, default: () => [] }
+  },
+  template: '<div class="node-search-box" />'
+})
+
+function createFilter(
+  id: string,
+  value: string
+): FuseFilterWithValue<ComfyNodeDefImpl, string> {
+  return {
+    filterDef: { id } as FuseFilter<ComfyNodeDefImpl, string>,
+    value
+  }
+}
+
+describe('NodeSearchBoxPopover', () => {
+  const i18n = createI18n({
+    legacy: false,
+    locale: 'en',
+    messages: { en: {} }
+  })
+
+  beforeEach(() => {
+    setActivePinia(createPinia())
+    mockStoreRefs.visible.value = false
+  })
+
+  const mountComponent = () => {
+    return mount(NodeSearchBoxPopover, {
+      global: {
+        plugins: [i18n, PrimeVue],
+        stubs: {
+          NodeSearchBox: NodeSearchBoxStub,
+          Dialog: {
+            template: '<div><slot name="container" /></div>',
+            props: ['visible', 'modal', 'dismissableMask', 'pt']
+          }
+        }
+      }
+    })
+  }
+
+  describe('addFilter duplicate prevention', () => {
+    it('should add a filter when no duplicates exist', async () => {
+      const wrapper = mountComponent()
+      const searchBox = wrapper.findComponent(NodeSearchBoxStub)
+
+      searchBox.vm.$emit('addFilter', createFilter('outputType', 'IMAGE'))
+      await wrapper.vm.$nextTick()
+
+      const filters = searchBox.props('filters') as FuseFilterWithValue<
+        ComfyNodeDefImpl,
+        string
+      >[]
+      expect(filters).toHaveLength(1)
+      expect(filters[0]).toEqual(
+        expect.objectContaining({
+          filterDef: expect.objectContaining({ id: 'outputType' }),
+          value: 'IMAGE'
+        })
+      )
+    })
+
+    it('should not add a duplicate filter with same id and value', async () => {
+      const wrapper = mountComponent()
+      const searchBox = wrapper.findComponent(NodeSearchBoxStub)
+
+      searchBox.vm.$emit('addFilter', createFilter('outputType', 'IMAGE'))
+      await wrapper.vm.$nextTick()
+      searchBox.vm.$emit('addFilter', createFilter('outputType', 'IMAGE'))
+      await wrapper.vm.$nextTick()
+
+      expect(searchBox.props('filters')).toHaveLength(1)
+    })
+
+    it('should allow filters with same id but different values', async () => {
+      const wrapper = mountComponent()
+      const searchBox = wrapper.findComponent(NodeSearchBoxStub)
+
+      searchBox.vm.$emit('addFilter', createFilter('outputType', 'IMAGE'))
+      await wrapper.vm.$nextTick()
+      searchBox.vm.$emit('addFilter', createFilter('outputType', 'MASK'))
+      await wrapper.vm.$nextTick()
+
+      expect(searchBox.props('filters')).toHaveLength(2)
+    })
+
+    it('should allow filters with different ids but same value', async () => {
+      const wrapper = mountComponent()
+      const searchBox = wrapper.findComponent(NodeSearchBoxStub)
+
+      searchBox.vm.$emit('addFilter', createFilter('outputType', 'IMAGE'))
+      await wrapper.vm.$nextTick()
+      searchBox.vm.$emit('addFilter', createFilter('inputType', 'IMAGE'))
+      await wrapper.vm.$nextTick()
+
+      expect(searchBox.props('filters')).toHaveLength(2)
+    })
+  })
+})
diff --git a/src/components/searchbox/NodeSearchBoxPopover.vue b/src/components/searchbox/NodeSearchBoxPopover.vue
index 470853b08c..20f0fa97f7 100644
--- a/src/components/searchbox/NodeSearchBoxPopover.vue
+++ b/src/components/searchbox/NodeSearchBoxPopover.vue
@@ -6,10 +6,13 @@
       :dismissable-mask="dismissable"
       :pt="{
         root: {
-          class: 'invisible-dialog-root',
-          role: 'search'
+          class: useSearchBoxV2
+            ? 'w-4/5 min-w-[32rem] max-w-[56rem] border-0 bg-transparent mt-[10vh] max-md:w-[95%] max-md:min-w-0 overflow-visible'
+            : 'invisible-dialog-root'
+        },
+        mask: {
+          class: useSearchBoxV2 ? 'items-start' : 'node-search-box-dialog-mask'
         },
-        mask: { class: 'node-search-box-dialog-mask' },
         transition: {
           enterFromClass: 'opacity-0 scale-75',
           // 100ms is the duration of the transition in the dialog component
@@ -21,7 +24,24 @@
       @hide="clearFilters"
     >
       <template #container>
+        <div v-if="useSearchBoxV2" role="search" class="relative">
+          <NodeSearchContent
+            :filters="nodeFilters"
+            @add-filter="addFilter"
+            @remove-filter="removeFilter"
+            @add-node="addNode"
+            @hover-node="hoveredNodeDef = $event"
+          />
+          <NodePreviewCard
+            v-if="hoveredNodeDef && enableNodePreview"
+            :key="hoveredNodeDef.name"
+            :node-def="hoveredNodeDef"
+            show-category-path
+            class="absolute top-0 left-full ml-3"
+          />
+        </div>
         <NodeSearchBox
+          v-else
           :filters="nodeFilters"
           @add-filter="addFilter"
           @remove-filter="removeFilter"
@@ -33,7 +53,7 @@
 </template>
 
 <script setup lang="ts">
-import { useEventListener } from '@vueuse/core'
+import { useEventListener, useWindowSize } from '@vueuse/core'
 import { storeToRefs } from 'pinia'
 import Dialog from 'primevue/dialog'
 import { computed, ref, toRaw, watch, watchEffect } from 'vue'
@@ -52,6 +72,9 @@ import { useSearchBoxStore } from '@/stores/workspace/searchBoxStore'
 import { LinkReleaseTriggerAction } from '@/types/searchBoxTypes'
 import type { FuseFilterWithValue } from '@/utils/fuseUtil'
 
+import NodePreviewCard from '@/components/node/NodePreviewCard.vue'
+
+import NodeSearchContent from './v2/NodeSearchContent.vue'
 import NodeSearchBox from './NodeSearchBox.vue'
 
 let triggerEvent: CanvasPointerEvent | null = null
@@ -62,8 +85,19 @@ const settingStore = useSettingStore()
 const searchBoxStore = useSearchBoxStore()
 const litegraphService = useLitegraphService()
 
-const { visible, newSearchBoxEnabled } = storeToRefs(searchBoxStore)
+const { visible, newSearchBoxEnabled, useSearchBoxV2 } =
+  storeToRefs(searchBoxStore)
 const dismissable = ref(true)
+const hoveredNodeDef = ref<ComfyNodeDefImpl | null>(null)
+const { width: windowWidth } = useWindowSize()
+// Minimum viewport width for the preview panel to fit beside the dialog
+const MIN_WIDTH_FOR_PREVIEW = 1320
+const enableNodePreview = computed(
+  () =>
+    useSearchBoxV2.value &&
+    settingStore.get('Comfy.NodeSearchBoxImpl.NodePreview') &&
+    windowWidth.value >= MIN_WIDTH_FOR_PREVIEW
+)
 function getNewNodeLocation(): Point {
   return triggerEvent
     ? [triggerEvent.canvasX, triggerEvent.canvasY]
@@ -71,7 +105,10 @@ function getNewNodeLocation(): Point {
 }
 const nodeFilters = ref<FuseFilterWithValue<ComfyNodeDefImpl, string>[]>([])
 function addFilter(filter: FuseFilterWithValue<ComfyNodeDefImpl, string>) {
-  nodeFilters.value.push(filter)
+  const isDuplicate = nodeFilters.value.some(
+    (f) => f.filterDef.id === filter.filterDef.id && f.value === filter.value
+  )
+  if (!isDuplicate) nodeFilters.value.push(filter)
 }
 function removeFilter(filter: FuseFilterWithValue<ComfyNodeDefImpl, string>) {
   nodeFilters.value = nodeFilters.value.filter(
@@ -80,16 +117,20 @@ function removeFilter(filter: FuseFilterWithValue<ComfyNodeDefImpl, string>) {
 }
 function clearFilters() {
   nodeFilters.value = []
+  hoveredNodeDef.value = null
 }
 function closeDialog() {
   visible.value = false
 }
 const canvasStore = useCanvasStore()
 
-function addNode(nodeDef: ComfyNodeDefImpl) {
-  const node = litegraphService.addNodeOnGraph(nodeDef, {
-    pos: getNewNodeLocation()
-  })
+function addNode(nodeDef: ComfyNodeDefImpl, dragEvent?: MouseEvent) {
+  const node = litegraphService.addNodeOnGraph(
+    nodeDef,
+    { pos: getNewNodeLocation() },
+    { ghost: useSearchBoxV2.value, dragEvent }
+  )
+  if (!node) return
 
   if (disconnectOnReset && triggerEvent) {
     canvasStore.getCanvas().linkConnector.connectToNode(node, triggerEvent)
diff --git a/src/components/searchbox/NodeSearchFilter.vue b/src/components/searchbox/NodeSearchFilter.vue
index 0f54248268..a308150797 100644
--- a/src/components/searchbox/NodeSearchFilter.vue
+++ b/src/components/searchbox/NodeSearchFilter.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="_content">
+  <div class="flex flex-col gap-2">
     <SelectButton
       v-model="selectedFilter"
       class="filter-type-select"
@@ -16,7 +16,7 @@
       auto-filter-focus
     />
   </div>
-  <div class="_footer">
+  <div class="flex flex-col items-end pt-4">
     <Button type="button" @click="submit">{{ $t('g.add') }}</Button>
   </div>
 </template>
@@ -67,15 +67,3 @@ const submit = () => {
   })
 }
 </script>
-
-<style scoped>
-@reference '../../assets/css/style.css';
-
-._content {
-  @apply flex flex-col space-y-2;
-}
-
-._footer {
-  @apply flex flex-col pt-4 items-end;
-}
-</style>
diff --git a/src/components/searchbox/NodeSearchItem.vue b/src/components/searchbox/NodeSearchItem.vue
index da9a0cd830..a9859eca4d 100644
--- a/src/components/searchbox/NodeSearchItem.vue
+++ b/src/components/searchbox/NodeSearchItem.vue
@@ -21,16 +21,17 @@
       </div>
     </div>
     <div class="option-badges">
-      <Tag
-        v-if="nodeDef.experimental"
-        :value="$t('g.experimental')"
-        severity="primary"
-      />
       <Tag
         v-if="nodeDef.deprecated"
         :value="$t('g.deprecated')"
         severity="danger"
       />
+      <Tag
+        v-if="nodeDef.experimental"
+        :value="$t('g.experimental')"
+        severity="primary"
+      />
+      <Tag v-if="nodeDef.dev_only" :value="$t('g.devOnly')" severity="info" />
       <Tag
         v-if="showNodeFrequency && nodeFrequency > 0"
         :value="formatNumberWithSuffix(nodeFrequency, { roundToInt: true })"
diff --git a/src/components/searchbox/v2/NodeSearchCategorySidebar.test.ts b/src/components/searchbox/v2/NodeSearchCategorySidebar.test.ts
new file mode 100644
index 0000000000..34140f201c
--- /dev/null
+++ b/src/components/searchbox/v2/NodeSearchCategorySidebar.test.ts
@@ -0,0 +1,265 @@
+import { mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { nextTick } from 'vue'
+
+import NodeSearchCategorySidebar from '@/components/searchbox/v2/NodeSearchCategorySidebar.vue'
+import {
+  createMockNodeDef,
+  setupTestPinia,
+  testI18n
+} from '@/components/searchbox/v2/__test__/testUtils'
+import { useNodeDefStore } from '@/stores/nodeDefStore'
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: vi.fn(() => ({
+    get: vi.fn(() => undefined),
+    set: vi.fn()
+  }))
+}))
+
+describe('NodeSearchCategorySidebar', () => {
+  beforeEach(() => {
+    vi.restoreAllMocks()
+    setupTestPinia()
+  })
+
+  async function createWrapper(props = {}) {
+    const wrapper = mount(NodeSearchCategorySidebar, {
+      props: { selectedCategory: 'most-relevant', ...props },
+      global: { plugins: [testI18n] }
+    })
+    await nextTick()
+    return wrapper
+  }
+
+  async function clickCategory(
+    wrapper: ReturnType<typeof mount>,
+    text: string,
+    exact = false
+  ) {
+    const btn = wrapper
+      .findAll('button')
+      .find((b) => (exact ? b.text().trim() === text : b.text().includes(text)))
+    expect(btn, `Expected to find a button with text "${text}"`).toBeDefined()
+    await btn!.trigger('click')
+    await nextTick()
+  }
+
+  describe('preset categories', () => {
+    it('should render all preset categories', async () => {
+      useNodeDefStore().updateNodeDefs([
+        createMockNodeDef({
+          name: 'EssentialNode',
+          essentials_category: 'basic',
+          python_module: 'comfy_essentials'
+        })
+      ])
+      await nextTick()
+
+      const wrapper = await createWrapper()
+
+      expect(wrapper.text()).toContain('Most relevant')
+      expect(wrapper.text()).toContain('Recents')
+      expect(wrapper.text()).toContain('Favorites')
+      expect(wrapper.text()).toContain('Essentials')
+      expect(wrapper.text()).toContain('Blueprints')
+      expect(wrapper.text()).toContain('Partner')
+      expect(wrapper.text()).toContain('Comfy')
+      expect(wrapper.text()).toContain('Extensions')
+    })
+
+    it('should mark the selected preset category as selected', async () => {
+      const wrapper = await createWrapper({ selectedCategory: 'most-relevant' })
+
+      const mostRelevantBtn = wrapper.find(
+        '[data-testid="category-most-relevant"]'
+      )
+
+      expect(mostRelevantBtn.attributes('aria-current')).toBe('true')
+    })
+
+    it('should emit update:selectedCategory when preset is clicked', async () => {
+      const wrapper = await createWrapper({ selectedCategory: 'most-relevant' })
+
+      await clickCategory(wrapper, 'Favorites')
+
+      expect(wrapper.emitted('update:selectedCategory')).toBeTruthy()
+      expect(wrapper.emitted('update:selectedCategory')![0]).toEqual([
+        'favorites'
+      ])
+    })
+  })
+
+  describe('category tree', () => {
+    it('should render top-level categories from node definitions', async () => {
+      useNodeDefStore().updateNodeDefs([
+        createMockNodeDef({ name: 'Node1', category: 'sampling' }),
+        createMockNodeDef({ name: 'Node2', category: 'loaders' }),
+        createMockNodeDef({ name: 'Node3', category: 'conditioning' })
+      ])
+      await nextTick()
+
+      const wrapper = await createWrapper()
+
+      expect(wrapper.text()).toContain('sampling')
+      expect(wrapper.text()).toContain('loaders')
+      expect(wrapper.text()).toContain('conditioning')
+    })
+
+    it('should emit update:selectedCategory when category is clicked', async () => {
+      useNodeDefStore().updateNodeDefs([
+        createMockNodeDef({ name: 'Node1', category: 'sampling' })
+      ])
+      await nextTick()
+
+      const wrapper = await createWrapper()
+
+      await clickCategory(wrapper, 'sampling')
+
+      expect(wrapper.emitted('update:selectedCategory')![0]).toEqual([
+        'sampling'
+      ])
+    })
+  })
+
+  describe('expand/collapse functionality', () => {
+    it('should expand category when clicked and show subcategories', async () => {
+      useNodeDefStore().updateNodeDefs([
+        createMockNodeDef({ name: 'Node1', category: 'sampling' }),
+        createMockNodeDef({ name: 'Node2', category: 'sampling/advanced' }),
+        createMockNodeDef({ name: 'Node3', category: 'sampling/basic' })
+      ])
+      await nextTick()
+
+      const wrapper = await createWrapper()
+
+      expect(wrapper.text()).not.toContain('advanced')
+
+      await clickCategory(wrapper, 'sampling')
+
+      expect(wrapper.text()).toContain('advanced')
+      expect(wrapper.text()).toContain('basic')
+    })
+
+    it('should collapse sibling category when another is expanded', async () => {
+      useNodeDefStore().updateNodeDefs([
+        createMockNodeDef({ name: 'Node1', category: 'sampling' }),
+        createMockNodeDef({ name: 'Node2', category: 'sampling/advanced' }),
+        createMockNodeDef({ name: 'Node3', category: 'image' }),
+        createMockNodeDef({ name: 'Node4', category: 'image/upscale' })
+      ])
+      await nextTick()
+
+      const wrapper = await createWrapper()
+
+      // Expand sampling
+      await clickCategory(wrapper, 'sampling', true)
+      expect(wrapper.text()).toContain('advanced')
+
+      // Expand image — sampling should collapse
+      await clickCategory(wrapper, 'image', true)
+
+      expect(wrapper.text()).toContain('upscale')
+      expect(wrapper.text()).not.toContain('advanced')
+    })
+
+    it('should emit update:selectedCategory when subcategory is clicked', async () => {
+      useNodeDefStore().updateNodeDefs([
+        createMockNodeDef({ name: 'Node1', category: 'sampling' }),
+        createMockNodeDef({ name: 'Node2', category: 'sampling/advanced' })
+      ])
+      await nextTick()
+
+      const wrapper = await createWrapper()
+
+      // Expand sampling category
+      await clickCategory(wrapper, 'sampling', true)
+
+      // Click on advanced subcategory
+      await clickCategory(wrapper, 'advanced')
+
+      const emitted = wrapper.emitted('update:selectedCategory')!
+      expect(emitted[emitted.length - 1]).toEqual(['sampling/advanced'])
+    })
+  })
+
+  describe('category selection highlighting', () => {
+    it('should mark selected top-level category as selected', async () => {
+      useNodeDefStore().updateNodeDefs([
+        createMockNodeDef({ name: 'Node1', category: 'sampling' })
+      ])
+      await nextTick()
+
+      const wrapper = await createWrapper({ selectedCategory: 'sampling' })
+
+      expect(
+        wrapper
+          .find('[data-testid="category-sampling"]')
+          .attributes('aria-current')
+      ).toBe('true')
+    })
+
+    it('should emit selected subcategory when expanded', async () => {
+      useNodeDefStore().updateNodeDefs([
+        createMockNodeDef({ name: 'Node1', category: 'sampling' }),
+        createMockNodeDef({ name: 'Node2', category: 'sampling/advanced' })
+      ])
+      await nextTick()
+
+      const wrapper = await createWrapper({ selectedCategory: 'most-relevant' })
+
+      // Expand and click subcategory
+      await clickCategory(wrapper, 'sampling', true)
+      await clickCategory(wrapper, 'advanced')
+
+      const emitted = wrapper.emitted('update:selectedCategory')!
+      expect(emitted[emitted.length - 1]).toEqual(['sampling/advanced'])
+    })
+  })
+
+  it('should support deeply nested categories (3+ levels)', async () => {
+    useNodeDefStore().updateNodeDefs([
+      createMockNodeDef({ name: 'Node1', category: 'api' }),
+      createMockNodeDef({ name: 'Node2', category: 'api/image' }),
+      createMockNodeDef({ name: 'Node3', category: 'api/image/BFL' })
+    ])
+    await nextTick()
+
+    const wrapper = await createWrapper()
+
+    // Only top-level visible initially
+    expect(wrapper.text()).toContain('api')
+    expect(wrapper.text()).not.toContain('image')
+    expect(wrapper.text()).not.toContain('BFL')
+
+    // Expand api
+    await clickCategory(wrapper, 'api', true)
+
+    expect(wrapper.text()).toContain('image')
+    expect(wrapper.text()).not.toContain('BFL')
+
+    // Expand image
+    await clickCategory(wrapper, 'image', true)
+
+    expect(wrapper.text()).toContain('BFL')
+
+    // Click BFL and verify emission
+    await clickCategory(wrapper, 'BFL', true)
+
+    const emitted = wrapper.emitted('update:selectedCategory')!
+    expect(emitted[emitted.length - 1]).toEqual(['api/image/BFL'])
+  })
+
+  it('should emit category without root/ prefix', async () => {
+    useNodeDefStore().updateNodeDefs([
+      createMockNodeDef({ name: 'Node1', category: 'sampling' })
+    ])
+    await nextTick()
+
+    const wrapper = await createWrapper()
+
+    await clickCategory(wrapper, 'sampling')
+
+    expect(wrapper.emitted('update:selectedCategory')![0][0]).toBe('sampling')
+  })
+})
diff --git a/src/components/searchbox/v2/NodeSearchCategorySidebar.vue b/src/components/searchbox/v2/NodeSearchCategorySidebar.vue
new file mode 100644
index 0000000000..730351718c
--- /dev/null
+++ b/src/components/searchbox/v2/NodeSearchCategorySidebar.vue
@@ -0,0 +1,141 @@
+<template>
+  <div class="flex min-h-0 flex-col overflow-y-auto py-2.5">
+    <!-- Preset categories -->
+    <div class="flex flex-col px-1">
+      <button
+        v-for="preset in topCategories"
+        :key="preset.id"
+        type="button"
+        :data-testid="`category-${preset.id}`"
+        :aria-current="selectedCategory === preset.id || undefined"
+        :class="categoryBtnClass(preset.id)"
+        @click="selectCategory(preset.id)"
+      >
+        {{ preset.label }}
+      </button>
+    </div>
+
+    <!-- Source categories -->
+    <div class="my-2 flex flex-col border-y border-border-subtle px-1 py-2">
+      <button
+        v-for="preset in sourceCategories"
+        :key="preset.id"
+        type="button"
+        :data-testid="`category-${preset.id}`"
+        :aria-current="selectedCategory === preset.id || undefined"
+        :class="categoryBtnClass(preset.id)"
+        @click="selectCategory(preset.id)"
+      >
+        {{ preset.label }}
+      </button>
+    </div>
+
+    <!-- Category tree -->
+    <div class="flex flex-col px-1">
+      <NodeSearchCategoryTreeNode
+        v-for="category in categoryTree"
+        :key="category.key"
+        :node="category"
+        :selected-category="selectedCategory"
+        :selected-collapsed="selectedCollapsed"
+        @select="selectCategory"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import NodeSearchCategoryTreeNode, {
+  CATEGORY_SELECTED_CLASS,
+  CATEGORY_UNSELECTED_CLASS
+} from '@/components/searchbox/v2/NodeSearchCategoryTreeNode.vue'
+import type { CategoryNode } from '@/components/searchbox/v2/NodeSearchCategoryTreeNode.vue'
+import { nodeOrganizationService } from '@/services/nodeOrganizationService'
+import { useNodeDefStore } from '@/stores/nodeDefStore'
+import { NodeSourceType } from '@/types/nodeSource'
+import type { TreeNode } from '@/types/treeExplorerTypes'
+import { cn } from '@/utils/tailwindUtil'
+
+const selectedCategory = defineModel<string>('selectedCategory', {
+  required: true
+})
+
+const { t } = useI18n()
+const nodeDefStore = useNodeDefStore()
+
+const topCategories = computed(() => [
+  { id: 'most-relevant', label: t('g.mostRelevant') },
+  { id: 'recents', label: t('g.recents') },
+  { id: 'favorites', label: t('g.favorites') }
+])
+
+const hasEssentialNodes = computed(() =>
+  nodeDefStore.visibleNodeDefs.some(
+    (n) => n.nodeSource.type === NodeSourceType.Essentials
+  )
+)
+
+const sourceCategories = computed(() => {
+  const categories = []
+  if (hasEssentialNodes.value) {
+    categories.push({ id: 'essentials', label: t('g.essentials') })
+  }
+  categories.push(
+    {
+      id: 'blueprints',
+      label: t('sideToolbar.nodeLibraryTab.filterOptions.blueprints')
+    },
+    { id: 'partner', label: t('g.partner') },
+    { id: 'comfy', label: t('g.comfy') },
+    { id: 'extensions', label: t('g.extensions') }
+  )
+  return categories
+})
+
+const categoryTree = computed<CategoryNode[]>(() => {
+  const tree = nodeOrganizationService.organizeNodes(
+    nodeDefStore.visibleNodeDefs,
+    { groupBy: 'category' }
+  )
+
+  const stripRootPrefix = (key: string) => key.replace(/^root\//, '')
+
+  function mapNode(node: TreeNode): CategoryNode {
+    const children = node.children
+      ?.filter((child): child is TreeNode => !child.leaf)
+      .map(mapNode)
+    return {
+      key: stripRootPrefix(node.key as string),
+      label: node.label,
+      ...(children?.length ? { children } : {})
+    }
+  }
+
+  return (tree.children ?? [])
+    .filter((node): node is TreeNode => !node.leaf)
+    .map(mapNode)
+})
+
+function categoryBtnClass(id: string) {
+  return cn(
+    'cursor-pointer rounded-sm border-none bg-transparent px-3 py-2.5 text-left text-sm transition-colors',
+    selectedCategory.value === id
+      ? CATEGORY_SELECTED_CLASS
+      : CATEGORY_UNSELECTED_CLASS
+  )
+}
+
+const selectedCollapsed = ref(false)
+
+function selectCategory(categoryId: string) {
+  if (selectedCategory.value === categoryId) {
+    selectedCollapsed.value = !selectedCollapsed.value
+  } else {
+    selectedCollapsed.value = false
+    selectedCategory.value = categoryId
+  }
+}
+</script>
diff --git a/src/components/searchbox/v2/NodeSearchCategoryTreeNode.vue b/src/components/searchbox/v2/NodeSearchCategoryTreeNode.vue
new file mode 100644
index 0000000000..f7597f084c
--- /dev/null
+++ b/src/components/searchbox/v2/NodeSearchCategoryTreeNode.vue
@@ -0,0 +1,70 @@
+<template>
+  <button
+    type="button"
+    :data-testid="`category-${node.key}`"
+    :aria-current="selectedCategory === node.key || undefined"
+    :style="{ paddingLeft: `${0.75 + depth * 1.25}rem` }"
+    :class="
+      cn(
+        'w-full cursor-pointer rounded-sm border-none bg-transparent py-2.5 pr-3 text-left text-sm transition-colors',
+        selectedCategory === node.key
+          ? CATEGORY_SELECTED_CLASS
+          : CATEGORY_UNSELECTED_CLASS
+      )
+    "
+    @click="$emit('select', node.key)"
+  >
+    {{ node.label }}
+  </button>
+  <template v-if="isExpanded && node.children?.length">
+    <NodeSearchCategoryTreeNode
+      v-for="child in node.children"
+      :key="child.key"
+      :node="child"
+      :depth="depth + 1"
+      :selected-category="selectedCategory"
+      :selected-collapsed="selectedCollapsed"
+      @select="$emit('select', $event)"
+    />
+  </template>
+</template>
+
+<script lang="ts">
+export interface CategoryNode {
+  key: string
+  label: string
+  children?: CategoryNode[]
+}
+
+export const CATEGORY_SELECTED_CLASS =
+  'bg-secondary-background-hover font-semibold text-foreground'
+export const CATEGORY_UNSELECTED_CLASS =
+  'text-muted-foreground hover:bg-secondary-background-hover hover:text-foreground'
+</script>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+const {
+  node,
+  depth = 0,
+  selectedCategory,
+  selectedCollapsed = false
+} = defineProps<{
+  node: CategoryNode
+  depth?: number
+  selectedCategory: string
+  selectedCollapsed?: boolean
+}>()
+
+defineEmits<{
+  select: [key: string]
+}>()
+
+const isExpanded = computed(() => {
+  if (selectedCategory === node.key) return !selectedCollapsed
+  return selectedCategory.startsWith(node.key + '/')
+})
+</script>
diff --git a/src/components/searchbox/v2/NodeSearchContent.test.ts b/src/components/searchbox/v2/NodeSearchContent.test.ts
new file mode 100644
index 0000000000..7ef891f9bb
--- /dev/null
+++ b/src/components/searchbox/v2/NodeSearchContent.test.ts
@@ -0,0 +1,729 @@
+import type { VueWrapper } from '@vue/test-utils'
+import { mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { nextTick } from 'vue'
+
+import NodeSearchCategorySidebar from '@/components/searchbox/v2/NodeSearchCategorySidebar.vue'
+import NodeSearchContent from '@/components/searchbox/v2/NodeSearchContent.vue'
+import {
+  createMockNodeDef,
+  setupTestPinia,
+  testI18n
+} from '@/components/searchbox/v2/__test__/testUtils'
+import { useNodeBookmarkStore } from '@/stores/nodeBookmarkStore'
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+import { useNodeDefStore, useNodeFrequencyStore } from '@/stores/nodeDefStore'
+import { NodeSourceType } from '@/types/nodeSource'
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: vi.fn(() => ({
+    get: vi.fn((key: string) => {
+      if (key === 'Comfy.NodeLibrary.Bookmarks.V2') return []
+      if (key === 'Comfy.NodeLibrary.BookmarksCustomization') return {}
+      return undefined
+    }),
+    set: vi.fn()
+  }))
+}))
+
+describe('NodeSearchContent', () => {
+  beforeEach(() => {
+    setupTestPinia()
+    vi.restoreAllMocks()
+  })
+
+  async function createWrapper(props = {}) {
+    const wrapper = mount(NodeSearchContent, {
+      props: { filters: [], ...props },
+      global: {
+        plugins: [testI18n],
+        stubs: {
+          NodeSearchListItem: {
+            template: '<div class="node-item">{{ nodeDef.display_name }}</div>',
+            props: [
+              'nodeDef',
+              'currentQuery',
+              'showDescription',
+              'showSourceBadge',
+              'hideBookmarkIcon'
+            ]
+          }
+        }
+      }
+    })
+    await nextTick()
+    return wrapper
+  }
+
+  async function setupFavorites(
+    nodes: Parameters<typeof createMockNodeDef>[0][]
+  ) {
+    useNodeDefStore().updateNodeDefs(nodes.map(createMockNodeDef))
+    vi.spyOn(useNodeBookmarkStore(), 'isBookmarked').mockReturnValue(true)
+    const wrapper = await createWrapper()
+    await wrapper.find('[data-testid="category-favorites"]').trigger('click')
+    await nextTick()
+    return wrapper
+  }
+
+  function getResultItems(wrapper: VueWrapper) {
+    return wrapper.findAll('[data-testid="result-item"]')
+  }
+
+  function getNodeItems(wrapper: VueWrapper) {
+    return wrapper.findAll('.node-item')
+  }
+
+  describe('category selection', () => {
+    it('should show top nodes when Most relevant is selected', async () => {
+      useNodeDefStore().updateNodeDefs([
+        createMockNodeDef({
+          name: 'FrequentNode',
+          display_name: 'Frequent Node'
+        }),
+        createMockNodeDef({ name: 'RareNode', display_name: 'Rare Node' })
+      ])
+
+      vi.spyOn(useNodeFrequencyStore(), 'topNodeDefs', 'get').mockReturnValue([
+        useNodeDefStore().nodeDefsByName['FrequentNode']
+      ])
+
+      const wrapper = await createWrapper()
+
+      const items = getNodeItems(wrapper)
+      expect(items).toHaveLength(1)
+      expect(items[0].text()).toContain('Frequent Node')
+    })
+
+    it('should show only bookmarked nodes when Favorites is selected', async () => {
+      useNodeDefStore().updateNodeDefs([
+        createMockNodeDef({
+          name: 'BookmarkedNode',
+          display_name: 'Bookmarked Node'
+        }),
+        createMockNodeDef({
+          name: 'RegularNode',
+          display_name: 'Regular Node'
+        })
+      ])
+      vi.spyOn(useNodeBookmarkStore(), 'isBookmarked').mockImplementation(
+        (node: ComfyNodeDefImpl) => node.name === 'BookmarkedNode'
+      )
+
+      const wrapper = await createWrapper()
+      await wrapper.find('[data-testid="category-favorites"]').trigger('click')
+      await nextTick()
+
+      const items = getNodeItems(wrapper)
+      expect(items).toHaveLength(1)
+      expect(items[0].text()).toContain('Bookmarked')
+    })
+
+    it('should show empty state when no bookmarks exist', async () => {
+      useNodeDefStore().updateNodeDefs([
+        createMockNodeDef({ name: 'Node1', display_name: 'Node One' })
+      ])
+      vi.spyOn(useNodeBookmarkStore(), 'isBookmarked').mockReturnValue(false)
+
+      const wrapper = await createWrapper()
+      await wrapper.find('[data-testid="category-favorites"]').trigger('click')
+      await nextTick()
+
+      expect(wrapper.text()).toContain('No results')
+    })
+
+    it('should show only CustomNodes when Extensions is selected', async () => {
+      useNodeDefStore().updateNodeDefs([
+        createMockNodeDef({
+          name: 'CoreNode',
+          display_name: 'Core Node',
+          python_module: 'nodes'
+        }),
+        createMockNodeDef({
+          name: 'CustomNode',
+          display_name: 'Custom Node',
+          python_module: 'custom_nodes.my_extension'
+        })
+      ])
+      await nextTick()
+
+      expect(useNodeDefStore().nodeDefsByName['CoreNode'].nodeSource.type).toBe(
+        NodeSourceType.Core
+      )
+      expect(
+        useNodeDefStore().nodeDefsByName['CustomNode'].nodeSource.type
+      ).toBe(NodeSourceType.CustomNodes)
+
+      const wrapper = await createWrapper()
+      await wrapper.find('[data-testid="category-extensions"]').trigger('click')
+      await nextTick()
+
+      const items = getNodeItems(wrapper)
+      expect(items).toHaveLength(1)
+      expect(items[0].text()).toContain('Custom Node')
+    })
+
+    it('should hide Essentials category when no essential nodes exist', async () => {
+      useNodeDefStore().updateNodeDefs([
+        createMockNodeDef({
+          name: 'RegularNode',
+          display_name: 'Regular Node'
+        })
+      ])
+
+      const wrapper = await createWrapper()
+      expect(wrapper.find('[data-testid="category-essentials"]').exists()).toBe(
+        false
+      )
+    })
+
+    it('should show only essential nodes when Essentials is selected', async () => {
+      useNodeDefStore().updateNodeDefs([
+        createMockNodeDef({
+          name: 'EssentialNode',
+          display_name: 'Essential Node',
+          essentials_category: 'basic'
+        }),
+        createMockNodeDef({
+          name: 'RegularNode',
+          display_name: 'Regular Node'
+        })
+      ])
+      await nextTick()
+
+      const wrapper = await createWrapper()
+      await wrapper.find('[data-testid="category-essentials"]').trigger('click')
+      await nextTick()
+
+      const items = getNodeItems(wrapper)
+      expect(items).toHaveLength(1)
+      expect(items[0].text()).toContain('Essential Node')
+    })
+
+    it('should include subcategory nodes when parent category is selected', async () => {
+      useNodeDefStore().updateNodeDefs([
+        createMockNodeDef({
+          name: 'KSampler',
+          display_name: 'KSampler',
+          category: 'sampling'
+        }),
+        createMockNodeDef({
+          name: 'LoadCheckpoint',
+          display_name: 'Load Checkpoint',
+          category: 'loaders'
+        }),
+        createMockNodeDef({
+          name: 'KSamplerAdvanced',
+          display_name: 'KSampler Advanced',
+          category: 'sampling/advanced'
+        })
+      ])
+
+      const wrapper = await createWrapper()
+      await wrapper.find('[data-testid="category-sampling"]').trigger('click')
+      await nextTick()
+
+      const texts = getNodeItems(wrapper).map((i) => i.text())
+      expect(texts).toHaveLength(2)
+      expect(texts).toContain('KSampler')
+      expect(texts).toContain('KSampler Advanced')
+    })
+  })
+
+  describe('search and category interaction', () => {
+    it('should override category to most-relevant when search query is active', async () => {
+      useNodeDefStore().updateNodeDefs([
+        createMockNodeDef({
+          name: 'KSampler',
+          display_name: 'KSampler',
+          category: 'sampling'
+        }),
+        createMockNodeDef({
+          name: 'LoadCheckpoint',
+          display_name: 'Load Checkpoint',
+          category: 'loaders'
+        })
+      ])
+
+      const wrapper = await createWrapper()
+      await wrapper.find('[data-testid="category-sampling"]').trigger('click')
+      await nextTick()
+
+      expect(getNodeItems(wrapper)).toHaveLength(1)
+
+      const input = wrapper.find('input[type="text"]')
+      await input.setValue('Load')
+      await nextTick()
+
+      const texts = getNodeItems(wrapper).map((i) => i.text())
+      expect(texts.some((t) => t.includes('Load Checkpoint'))).toBe(true)
+    })
+
+    it('should clear search query when category changes', async () => {
+      useNodeDefStore().updateNodeDefs([
+        createMockNodeDef({ name: 'TestNode', display_name: 'Test Node' })
+      ])
+
+      const wrapper = await createWrapper()
+
+      const input = wrapper.find('input[type="text"]')
+      await input.setValue('test query')
+      await nextTick()
+      expect((input.element as HTMLInputElement).value).toBe('test query')
+
+      await wrapper.find('[data-testid="category-favorites"]').trigger('click')
+      await nextTick()
+      expect((input.element as HTMLInputElement).value).toBe('')
+    })
+
+    it('should reset selected index when search query changes', async () => {
+      const wrapper = await setupFavorites([
+        { name: 'Node1', display_name: 'Node One' },
+        { name: 'Node2', display_name: 'Node Two' }
+      ])
+
+      const input = wrapper.find('input[type="text"]')
+      await input.trigger('keydown', { key: 'ArrowDown' })
+      await nextTick()
+      expect(getResultItems(wrapper)[1].attributes('aria-selected')).toBe(
+        'true'
+      )
+
+      await input.setValue('Node')
+      await nextTick()
+      expect(getResultItems(wrapper)[0].attributes('aria-selected')).toBe(
+        'true'
+      )
+    })
+
+    it('should reset selected index when category changes', async () => {
+      const wrapper = await setupFavorites([
+        { name: 'Node1', display_name: 'Node One' },
+        { name: 'Node2', display_name: 'Node Two' }
+      ])
+
+      const input = wrapper.find('input[type="text"]')
+      await input.trigger('keydown', { key: 'ArrowDown' })
+      await nextTick()
+
+      await wrapper
+        .find('[data-testid="category-most-relevant"]')
+        .trigger('click')
+      await nextTick()
+      await wrapper.find('[data-testid="category-favorites"]').trigger('click')
+      await nextTick()
+
+      expect(getResultItems(wrapper)[0].attributes('aria-selected')).toBe(
+        'true'
+      )
+    })
+  })
+
+  describe('keyboard and mouse interaction', () => {
+    it('should navigate results with ArrowDown/ArrowUp and clamp to bounds', async () => {
+      const wrapper = await setupFavorites([
+        { name: 'Node1', display_name: 'Node One' },
+        { name: 'Node2', display_name: 'Node Two' },
+        { name: 'Node3', display_name: 'Node Three' }
+      ])
+
+      const input = wrapper.find('input[type="text"]')
+      const selectedIndex = () =>
+        getResultItems(wrapper).findIndex(
+          (r) => r.attributes('aria-selected') === 'true'
+        )
+
+      expect(selectedIndex()).toBe(0)
+
+      await input.trigger('keydown', { key: 'ArrowDown' })
+      await nextTick()
+      expect(selectedIndex()).toBe(1)
+
+      await input.trigger('keydown', { key: 'ArrowDown' })
+      await nextTick()
+      expect(selectedIndex()).toBe(2)
+
+      await input.trigger('keydown', { key: 'ArrowUp' })
+      await nextTick()
+      expect(selectedIndex()).toBe(1)
+
+      // Navigate to first, then try going above — should clamp
+      await input.trigger('keydown', { key: 'ArrowUp' })
+      await nextTick()
+      expect(selectedIndex()).toBe(0)
+
+      await input.trigger('keydown', { key: 'ArrowUp' })
+      await nextTick()
+      expect(selectedIndex()).toBe(0)
+    })
+
+    it('should select current result with Enter key', async () => {
+      const wrapper = await setupFavorites([
+        { name: 'TestNode', display_name: 'Test Node' }
+      ])
+
+      await wrapper
+        .find('input[type="text"]')
+        .trigger('keydown', { key: 'Enter' })
+      await nextTick()
+
+      expect(wrapper.emitted('addNode')).toBeTruthy()
+      expect(wrapper.emitted('addNode')![0][0]).toMatchObject({
+        name: 'TestNode'
+      })
+    })
+
+    it('should select item on hover', async () => {
+      const wrapper = await setupFavorites([
+        { name: 'Node1', display_name: 'Node One' },
+        { name: 'Node2', display_name: 'Node Two' }
+      ])
+
+      const results = getResultItems(wrapper)
+      await results[1].trigger('mouseenter')
+      await nextTick()
+
+      expect(results[1].attributes('aria-selected')).toBe('true')
+    })
+
+    it('should add node on click', async () => {
+      const wrapper = await setupFavorites([
+        { name: 'TestNode', display_name: 'Test Node' }
+      ])
+
+      await getResultItems(wrapper)[0].trigger('click')
+      await nextTick()
+
+      expect(wrapper.emitted('addNode')![0][0]).toMatchObject({
+        name: 'TestNode'
+      })
+    })
+  })
+
+  describe('hoverNode emission', () => {
+    it('should emit hoverNode with the currently selected node', async () => {
+      const wrapper = await setupFavorites([
+        { name: 'HoverNode', display_name: 'Hover Node' }
+      ])
+
+      const emitted = wrapper.emitted('hoverNode')!
+      expect(emitted[emitted.length - 1][0]).toMatchObject({
+        name: 'HoverNode'
+      })
+    })
+
+    it('should emit null hoverNode when no results', async () => {
+      const wrapper = await createWrapper()
+
+      vi.spyOn(useNodeBookmarkStore(), 'isBookmarked').mockReturnValue(false)
+      await wrapper.find('[data-testid="category-favorites"]').trigger('click')
+      await nextTick()
+
+      const emitted = wrapper.emitted('hoverNode')!
+      expect(emitted[emitted.length - 1][0]).toBeNull()
+    })
+  })
+
+  describe('filter integration', () => {
+    it('should display active filters in the input area', async () => {
+      useNodeDefStore().updateNodeDefs([
+        createMockNodeDef({
+          name: 'ImageNode',
+          display_name: 'Image Node',
+          input: { required: { image: ['IMAGE', {}] } }
+        })
+      ])
+
+      const wrapper = await createWrapper({
+        filters: [
+          {
+            filterDef: useNodeDefStore().nodeSearchService.inputTypeFilter,
+            value: 'IMAGE'
+          }
+        ]
+      })
+
+      expect(
+        wrapper.findAll('[data-testid="filter-chip"]').length
+      ).toBeGreaterThan(0)
+    })
+  })
+
+  describe('chip removal', () => {
+    function createFilters(count: number) {
+      const types = ['IMAGE', 'LATENT', 'MODEL']
+      useNodeDefStore().updateNodeDefs(
+        types.slice(0, count).map((type) =>
+          createMockNodeDef({
+            name: `${type}Node`,
+            display_name: `${type} Node`,
+            input: {
+              required: { [type.toLowerCase()]: [type, {}] }
+            }
+          })
+        )
+      )
+      return types.slice(0, count).map((type) => ({
+        filterDef: useNodeDefStore().nodeSearchService.inputTypeFilter,
+        value: type
+      }))
+    }
+
+    it('should emit removeFilter on backspace', async () => {
+      const filters = createFilters(1)
+      const wrapper = await createWrapper({ filters })
+
+      const input = wrapper.find('input[type="text"]')
+      await input.trigger('keydown', { key: 'Backspace' })
+      await nextTick()
+      await input.trigger('keydown', { key: 'Backspace' })
+      await nextTick()
+
+      expect(wrapper.emitted('removeFilter')).toHaveLength(1)
+      expect(wrapper.emitted('removeFilter')![0][0]).toMatchObject({
+        value: 'IMAGE'
+      })
+    })
+
+    it('should not interact with chips when no filters exist', async () => {
+      const wrapper = await createWrapper({ filters: [] })
+
+      const input = wrapper.find('input[type="text"]')
+      await input.trigger('keydown', { key: 'Backspace' })
+      await nextTick()
+
+      expect(wrapper.emitted('removeFilter')).toBeUndefined()
+    })
+
+    it('should remove chip when clicking its delete button', async () => {
+      const filters = createFilters(1)
+      const wrapper = await createWrapper({ filters })
+
+      const deleteBtn = wrapper.find('[data-testid="chip-delete"]')
+      await deleteBtn.trigger('click')
+      await nextTick()
+
+      expect(wrapper.emitted('removeFilter')).toHaveLength(1)
+      expect(wrapper.emitted('removeFilter')![0][0]).toMatchObject({
+        value: 'IMAGE'
+      })
+    })
+  })
+
+  describe('filter selection mode', () => {
+    function setupNodesWithTypes() {
+      useNodeDefStore().updateNodeDefs([
+        createMockNodeDef({
+          name: 'ImageNode',
+          display_name: 'Image Node',
+          input: { required: { image: ['IMAGE', {}] } },
+          output: ['IMAGE']
+        }),
+        createMockNodeDef({
+          name: 'LatentNode',
+          display_name: 'Latent Node',
+          input: { required: { latent: ['LATENT', {}] } },
+          output: ['LATENT']
+        }),
+        createMockNodeDef({
+          name: 'ModelNode',
+          display_name: 'Model Node',
+          input: { required: { model: ['MODEL', {}] } },
+          output: ['MODEL']
+        })
+      ])
+    }
+
+    function findFilterBarButton(wrapper: VueWrapper, label: string) {
+      return wrapper
+        .findAll('button[aria-pressed]')
+        .find((b) => b.text() === label)
+    }
+
+    async function enterFilterMode(wrapper: VueWrapper) {
+      await findFilterBarButton(wrapper, 'Input')!.trigger('click')
+      await nextTick()
+    }
+
+    function getFilterOptions(wrapper: VueWrapper) {
+      return wrapper.findAll('[data-testid="filter-option"]')
+    }
+
+    function getFilterOptionTexts(wrapper: VueWrapper) {
+      return getFilterOptions(wrapper).map(
+        (o) =>
+          o
+            .findAll('span')[0]
+            ?.text()
+            .replace(/^[•·]\s*/, '')
+            .trim() ?? ''
+      )
+    }
+
+    function hasSidebar(wrapper: VueWrapper) {
+      return wrapper.findComponent(NodeSearchCategorySidebar).exists()
+    }
+
+    it('should enter filter mode when a filter chip is selected', async () => {
+      setupNodesWithTypes()
+      const wrapper = await createWrapper()
+
+      expect(hasSidebar(wrapper)).toBe(true)
+
+      await enterFilterMode(wrapper)
+
+      expect(hasSidebar(wrapper)).toBe(false)
+      expect(getFilterOptions(wrapper).length).toBeGreaterThan(0)
+    })
+
+    it('should show available filter options sorted alphabetically', async () => {
+      setupNodesWithTypes()
+      const wrapper = await createWrapper()
+      await enterFilterMode(wrapper)
+
+      const texts = getFilterOptionTexts(wrapper)
+      expect(texts).toContain('IMAGE')
+      expect(texts).toContain('LATENT')
+      expect(texts).toContain('MODEL')
+      expect(texts).toEqual([...texts].sort())
+    })
+
+    it('should filter options when typing in filter mode', async () => {
+      setupNodesWithTypes()
+      const wrapper = await createWrapper()
+      await enterFilterMode(wrapper)
+
+      await wrapper.find('input[type="text"]').setValue('IMAGE')
+      await nextTick()
+
+      const texts = getFilterOptionTexts(wrapper)
+      expect(texts).toContain('IMAGE')
+      expect(texts).not.toContain('MODEL')
+    })
+
+    it('should show no results when filter query has no matches', async () => {
+      setupNodesWithTypes()
+      const wrapper = await createWrapper()
+      await enterFilterMode(wrapper)
+
+      await wrapper.find('input[type="text"]').setValue('NONEXISTENT_TYPE')
+      await nextTick()
+
+      expect(wrapper.text()).toContain('No results')
+    })
+
+    it('should emit addFilter when a filter option is clicked', async () => {
+      setupNodesWithTypes()
+      const wrapper = await createWrapper()
+      await enterFilterMode(wrapper)
+
+      const imageOption = getFilterOptions(wrapper).find((o) =>
+        o.text().includes('IMAGE')
+      )
+      await imageOption!.trigger('click')
+      await nextTick()
+
+      expect(wrapper.emitted('addFilter')![0][0]).toMatchObject({
+        filterDef: expect.objectContaining({ id: 'input' }),
+        value: 'IMAGE'
+      })
+    })
+
+    it('should exit filter mode after applying a filter', async () => {
+      setupNodesWithTypes()
+      const wrapper = await createWrapper()
+      await enterFilterMode(wrapper)
+
+      await getFilterOptions(wrapper)[0].trigger('click')
+      await nextTick()
+      await nextTick()
+
+      expect(hasSidebar(wrapper)).toBe(true)
+    })
+
+    it('should emit addFilter when Enter is pressed on selected option', async () => {
+      setupNodesWithTypes()
+      const wrapper = await createWrapper()
+      await enterFilterMode(wrapper)
+
+      await wrapper
+        .find('input[type="text"]')
+        .trigger('keydown', { key: 'Enter' })
+      await nextTick()
+
+      expect(wrapper.emitted('addFilter')![0][0]).toMatchObject({
+        filterDef: expect.objectContaining({ id: 'input' }),
+        value: 'IMAGE'
+      })
+    })
+
+    it('should navigate filter options with ArrowDown/ArrowUp', async () => {
+      setupNodesWithTypes()
+      const wrapper = await createWrapper()
+      await enterFilterMode(wrapper)
+
+      const input = wrapper.find('input[type="text"]')
+
+      expect(getFilterOptions(wrapper)[0].attributes('aria-selected')).toBe(
+        'true'
+      )
+
+      await input.trigger('keydown', { key: 'ArrowDown' })
+      await nextTick()
+      expect(getFilterOptions(wrapper)[1].attributes('aria-selected')).toBe(
+        'true'
+      )
+
+      await input.trigger('keydown', { key: 'ArrowUp' })
+      await nextTick()
+      expect(getFilterOptions(wrapper)[0].attributes('aria-selected')).toBe(
+        'true'
+      )
+    })
+
+    it('should toggle filter mode off when same chip is clicked again', async () => {
+      setupNodesWithTypes()
+      const wrapper = await createWrapper()
+      await enterFilterMode(wrapper)
+
+      await findFilterBarButton(wrapper, 'Input')!.trigger('click')
+      await nextTick()
+      await nextTick()
+
+      expect(hasSidebar(wrapper)).toBe(true)
+    })
+
+    it('should reset filter query when re-entering filter mode', async () => {
+      setupNodesWithTypes()
+      const wrapper = await createWrapper()
+      await enterFilterMode(wrapper)
+
+      const input = wrapper.find('input[type="text"]')
+      await input.setValue('IMAGE')
+      await nextTick()
+
+      await findFilterBarButton(wrapper, 'Input')!.trigger('click')
+      await nextTick()
+      await nextTick()
+
+      await enterFilterMode(wrapper)
+
+      expect((input.element as HTMLInputElement).value).toBe('')
+    })
+
+    it('should exit filter mode when cancel button is clicked', async () => {
+      setupNodesWithTypes()
+      const wrapper = await createWrapper()
+      await enterFilterMode(wrapper)
+
+      expect(hasSidebar(wrapper)).toBe(false)
+
+      const cancelBtn = wrapper.find('[data-testid="cancel-filter"]')
+      await cancelBtn.trigger('click')
+      await nextTick()
+      await nextTick()
+
+      expect(hasSidebar(wrapper)).toBe(true)
+    })
+  })
+})
diff --git a/src/components/searchbox/v2/NodeSearchContent.vue b/src/components/searchbox/v2/NodeSearchContent.vue
new file mode 100644
index 0000000000..e31652b338
--- /dev/null
+++ b/src/components/searchbox/v2/NodeSearchContent.vue
@@ -0,0 +1,298 @@
+<template>
+  <div
+    ref="dialogRef"
+    class="flex max-h-[50vh] min-h-[400px] w-full flex-col overflow-hidden rounded-lg border border-interface-stroke bg-base-background"
+  >
+    <!-- Search input row -->
+    <NodeSearchInput
+      ref="searchInputRef"
+      v-model:search-query="searchQuery"
+      v-model:filter-query="filterQuery"
+      :filters="filters"
+      :active-filter="activeFilter"
+      @remove-filter="emit('removeFilter', $event)"
+      @cancel-filter="cancelFilter"
+      @navigate-down="onKeyDown"
+      @navigate-up="onKeyUp"
+      @select-current="onKeyEnter"
+    />
+
+    <!-- Filter header row -->
+    <div class="flex items-center">
+      <NodeSearchFilterBar
+        class="flex-1"
+        :active-chip-key="activeFilter?.key"
+        @select-chip="onSelectFilterChip"
+      />
+    </div>
+
+    <!-- Content area -->
+    <div class="flex min-h-0 flex-1 overflow-hidden">
+      <!-- Category sidebar (hidden in filter mode) -->
+      <NodeSearchCategorySidebar
+        v-if="!activeFilter"
+        v-model:selected-category="sidebarCategory"
+        class="w-52 shrink-0"
+      />
+
+      <!-- Filter options list (filter selection mode) -->
+      <NodeSearchFilterPanel
+        v-if="activeFilter"
+        ref="filterPanelRef"
+        v-model:query="filterQuery"
+        :chip="activeFilter"
+        @apply="onFilterApply"
+      />
+
+      <!-- Results list (normal mode) -->
+      <div
+        v-else
+        id="results-list"
+        role="listbox"
+        class="flex-1 overflow-y-auto py-2"
+      >
+        <div
+          v-for="(node, index) in displayedResults"
+          :id="`result-item-${index}`"
+          :key="node.name"
+          role="option"
+          data-testid="result-item"
+          :aria-selected="index === selectedIndex"
+          :class="
+            cn(
+              'flex h-14 cursor-pointer items-center px-4',
+              index === selectedIndex && 'bg-secondary-background-hover'
+            )
+          "
+          @click="emit('addNode', node, $event)"
+          @mouseenter="selectedIndex = index"
+        >
+          <NodeSearchListItem
+            :node-def="node"
+            :current-query="searchQuery"
+            show-description
+            :show-source-badge="effectiveCategory !== 'essentials'"
+            :hide-bookmark-icon="effectiveCategory === 'favorites'"
+          />
+        </div>
+        <div
+          v-if="displayedResults.length === 0"
+          class="px-4 py-8 text-center text-muted-foreground"
+        >
+          {{ $t('g.noResults') }}
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, nextTick, ref, watch } from 'vue'
+
+import type { FilterChip } from '@/components/searchbox/v2/NodeSearchFilterBar.vue'
+import NodeSearchFilterBar from '@/components/searchbox/v2/NodeSearchFilterBar.vue'
+import NodeSearchCategorySidebar from '@/components/searchbox/v2/NodeSearchCategorySidebar.vue'
+import NodeSearchFilterPanel from '@/components/searchbox/v2/NodeSearchFilterPanel.vue'
+import NodeSearchInput from '@/components/searchbox/v2/NodeSearchInput.vue'
+import NodeSearchListItem from '@/components/searchbox/v2/NodeSearchListItem.vue'
+import { useNodeBookmarkStore } from '@/stores/nodeBookmarkStore'
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+import { useNodeDefStore, useNodeFrequencyStore } from '@/stores/nodeDefStore'
+import { NodeSourceType } from '@/types/nodeSource'
+import type { FuseFilterWithValue } from '@/utils/fuseUtil'
+import { cn } from '@/utils/tailwindUtil'
+
+const { filters } = defineProps<{
+  filters: FuseFilterWithValue<ComfyNodeDefImpl, string>[]
+}>()
+
+const emit = defineEmits<{
+  addNode: [nodeDef: ComfyNodeDefImpl, dragEvent?: MouseEvent]
+  addFilter: [filter: FuseFilterWithValue<ComfyNodeDefImpl, string>]
+  removeFilter: [filter: FuseFilterWithValue<ComfyNodeDefImpl, string>]
+  hoverNode: [nodeDef: ComfyNodeDefImpl | null]
+}>()
+
+const nodeDefStore = useNodeDefStore()
+const nodeFrequencyStore = useNodeFrequencyStore()
+const nodeBookmarkStore = useNodeBookmarkStore()
+
+const dialogRef = ref<HTMLElement>()
+const searchInputRef = ref<InstanceType<typeof NodeSearchInput>>()
+const filterPanelRef = ref<InstanceType<typeof NodeSearchFilterPanel>>()
+
+const searchQuery = ref('')
+const selectedCategory = ref('most-relevant')
+const selectedIndex = ref(0)
+
+const activeFilter = ref<FilterChip | null>(null)
+const filterQuery = ref('')
+
+function lockDialogHeight() {
+  if (dialogRef.value) {
+    dialogRef.value.style.height = `${dialogRef.value.offsetHeight}px`
+  }
+}
+
+function unlockDialogHeight() {
+  if (dialogRef.value) {
+    dialogRef.value.style.height = ''
+  }
+}
+
+function onSelectFilterChip(chip: FilterChip) {
+  if (activeFilter.value?.key === chip.key) {
+    cancelFilter()
+    return
+  }
+  lockDialogHeight()
+  activeFilter.value = chip
+  filterQuery.value = ''
+  nextTick(() => searchInputRef.value?.focus())
+}
+
+function onFilterApply(value: string) {
+  if (!activeFilter.value) return
+  emit('addFilter', { filterDef: activeFilter.value.filter, value })
+  activeFilter.value = null
+  filterQuery.value = ''
+  unlockDialogHeight()
+  nextTick(() => searchInputRef.value?.focus())
+}
+
+function cancelFilter() {
+  activeFilter.value = null
+  filterQuery.value = ''
+  unlockDialogHeight()
+  nextTick(() => searchInputRef.value?.focus())
+}
+
+const searchResults = computed(() => {
+  if (!searchQuery.value && filters.length === 0) {
+    return nodeFrequencyStore.topNodeDefs
+  }
+  return nodeDefStore.nodeSearchService.searchNode(searchQuery.value, filters, {
+    limit: 64
+  })
+})
+
+const effectiveCategory = computed(() =>
+  searchQuery.value ? 'most-relevant' : selectedCategory.value
+)
+
+const sidebarCategory = computed({
+  get: () => effectiveCategory.value,
+  set: (category: string) => {
+    selectedCategory.value = category
+    searchQuery.value = ''
+  }
+})
+
+function matchesFilters(node: ComfyNodeDefImpl): boolean {
+  return filters.every(({ filterDef, value }) => filterDef.matches(node, value))
+}
+
+const displayedResults = computed<ComfyNodeDefImpl[]>(() => {
+  const allNodes = nodeDefStore.visibleNodeDefs
+
+  let results: ComfyNodeDefImpl[]
+  switch (effectiveCategory.value) {
+    case 'most-relevant':
+      return searchResults.value
+    case 'favorites':
+      results = allNodes.filter((n) => nodeBookmarkStore.isBookmarked(n))
+      break
+    case 'essentials':
+      results = allNodes.filter(
+        (n) => n.nodeSource.type === NodeSourceType.Essentials
+      )
+      break
+    case 'recents':
+      return searchResults.value
+    case 'blueprints':
+      results = allNodes.filter(
+        (n) => n.nodeSource.type === NodeSourceType.Blueprint
+      )
+      break
+    case 'partner':
+      results = allNodes.filter((n) => n.api_node)
+      break
+    case 'comfy':
+      results = allNodes.filter(
+        (n) => n.nodeSource.type === NodeSourceType.Core
+      )
+      break
+    case 'extensions':
+      results = allNodes.filter(
+        (n) => n.nodeSource.type === NodeSourceType.CustomNodes
+      )
+      break
+    default:
+      results = allNodes.filter(
+        (n) =>
+          n.category === effectiveCategory.value ||
+          n.category.startsWith(effectiveCategory.value + '/')
+      )
+      break
+  }
+
+  return filters.length > 0 ? results.filter(matchesFilters) : results
+})
+
+const hoveredNodeDef = computed(
+  () => displayedResults.value[selectedIndex.value] ?? null
+)
+
+watch(
+  hoveredNodeDef,
+  (newVal) => {
+    emit('hoverNode', newVal)
+  },
+  { immediate: true }
+)
+
+watch([selectedCategory, searchQuery, () => filters], () => {
+  selectedIndex.value = 0
+})
+
+function onKeyDown() {
+  if (activeFilter.value) {
+    filterPanelRef.value?.navigate(1)
+  } else {
+    navigateResults(1)
+  }
+}
+
+function onKeyUp() {
+  if (activeFilter.value) {
+    filterPanelRef.value?.navigate(-1)
+  } else {
+    navigateResults(-1)
+  }
+}
+
+function onKeyEnter() {
+  if (activeFilter.value) {
+    filterPanelRef.value?.selectCurrent()
+  } else {
+    selectCurrentResult()
+  }
+}
+
+function navigateResults(direction: number) {
+  const newIndex = selectedIndex.value + direction
+  if (newIndex >= 0 && newIndex < displayedResults.value.length) {
+    selectedIndex.value = newIndex
+    nextTick(() => {
+      dialogRef.value
+        ?.querySelector(`#result-item-${newIndex}`)
+        ?.scrollIntoView({ block: 'nearest' })
+    })
+  }
+}
+
+function selectCurrentResult() {
+  const node = displayedResults.value[selectedIndex.value]
+  if (node) emit('addNode', node)
+}
+</script>
diff --git a/src/components/searchbox/v2/NodeSearchFilterBar.test.ts b/src/components/searchbox/v2/NodeSearchFilterBar.test.ts
new file mode 100644
index 0000000000..6708bc6b4a
--- /dev/null
+++ b/src/components/searchbox/v2/NodeSearchFilterBar.test.ts
@@ -0,0 +1,83 @@
+import { mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { nextTick } from 'vue'
+
+import NodeSearchFilterBar from '@/components/searchbox/v2/NodeSearchFilterBar.vue'
+import {
+  createMockNodeDef,
+  setupTestPinia,
+  testI18n
+} from '@/components/searchbox/v2/__test__/testUtils'
+import { useNodeDefStore } from '@/stores/nodeDefStore'
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: vi.fn(() => ({
+    get: vi.fn(() => undefined),
+    set: vi.fn()
+  }))
+}))
+
+describe(NodeSearchFilterBar, () => {
+  beforeEach(() => {
+    vi.restoreAllMocks()
+    setupTestPinia()
+    useNodeDefStore().updateNodeDefs([
+      createMockNodeDef({
+        name: 'ImageNode',
+        input: { required: { image: ['IMAGE', {}] } },
+        output: ['IMAGE']
+      })
+    ])
+  })
+
+  async function createWrapper(props = {}) {
+    const wrapper = mount(NodeSearchFilterBar, {
+      props,
+      global: { plugins: [testI18n] }
+    })
+    await nextTick()
+    return wrapper
+  }
+
+  it('should render all filter chips', async () => {
+    const wrapper = await createWrapper()
+
+    const buttons = wrapper.findAll('button')
+    expect(buttons).toHaveLength(6)
+    expect(buttons[0].text()).toBe('Blueprints')
+    expect(buttons[1].text()).toBe('Partner Nodes')
+    expect(buttons[2].text()).toBe('Essentials')
+    expect(buttons[3].text()).toBe('Extensions')
+    expect(buttons[4].text()).toBe('Input')
+    expect(buttons[5].text()).toBe('Output')
+  })
+
+  it('should mark active chip as pressed when activeChipKey matches', async () => {
+    const wrapper = await createWrapper({ activeChipKey: 'input' })
+
+    const inputBtn = wrapper.findAll('button').find((b) => b.text() === 'Input')
+    expect(inputBtn?.attributes('aria-pressed')).toBe('true')
+  })
+
+  it('should not mark chips as pressed when activeChipKey does not match', async () => {
+    const wrapper = await createWrapper({ activeChipKey: null })
+
+    wrapper.findAll('button').forEach((btn) => {
+      expect(btn.attributes('aria-pressed')).toBe('false')
+    })
+  })
+
+  it('should emit selectChip with chip data when clicked', async () => {
+    const wrapper = await createWrapper()
+
+    const inputBtn = wrapper.findAll('button').find((b) => b.text() === 'Input')
+    await inputBtn?.trigger('click')
+
+    const emitted = wrapper.emitted('selectChip')!
+    expect(emitted[0][0]).toMatchObject({
+      key: 'input',
+      label: 'Input',
+      filter: expect.anything()
+    })
+  })
+})
diff --git a/src/components/searchbox/v2/NodeSearchFilterBar.vue b/src/components/searchbox/v2/NodeSearchFilterBar.vue
new file mode 100644
index 0000000000..b7fb519e44
--- /dev/null
+++ b/src/components/searchbox/v2/NodeSearchFilterBar.vue
@@ -0,0 +1,87 @@
+<template>
+  <div class="flex items-center gap-2 px-2 py-1.5">
+    <button
+      v-for="chip in chips"
+      :key="chip.key"
+      type="button"
+      :aria-pressed="activeChipKey === chip.key"
+      :class="
+        cn(
+          'flex-auto cursor-pointer rounded-md border border-secondary-background px-3 py-1 text-sm transition-colors',
+          activeChipKey === chip.key
+            ? 'text-foreground bg-secondary-background'
+            : 'bg-transparent text-muted-foreground hover:border-base-foreground/60 hover:text-base-foreground/60'
+        )
+      "
+      @click="emit('selectChip', chip)"
+    >
+      {{ chip.label }}
+    </button>
+  </div>
+</template>
+
+<script lang="ts">
+import type { FuseFilter } from '@/utils/fuseUtil'
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+
+export interface FilterChip {
+  key: string
+  label: string
+  filter: FuseFilter<ComfyNodeDefImpl, string>
+}
+</script>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import { useNodeDefStore } from '@/stores/nodeDefStore'
+import { cn } from '@/utils/tailwindUtil'
+
+const { activeChipKey = null } = defineProps<{
+  activeChipKey?: string | null
+}>()
+
+const emit = defineEmits<{
+  selectChip: [chip: FilterChip]
+}>()
+
+const { t } = useI18n()
+const nodeDefStore = useNodeDefStore()
+
+const chips = computed<FilterChip[]>(() => {
+  const searchService = nodeDefStore.nodeSearchService
+  return [
+    {
+      key: 'blueprints',
+      label: t('sideToolbar.nodeLibraryTab.filterOptions.blueprints'),
+      filter: searchService.nodeSourceFilter
+    },
+    {
+      key: 'partnerNodes',
+      label: t('sideToolbar.nodeLibraryTab.filterOptions.partnerNodes'),
+      filter: searchService.nodeSourceFilter
+    },
+    {
+      key: 'essentials',
+      label: t('g.essentials'),
+      filter: searchService.nodeSourceFilter
+    },
+    {
+      key: 'extensions',
+      label: t('g.extensions'),
+      filter: searchService.nodeSourceFilter
+    },
+    {
+      key: 'input',
+      label: t('g.input'),
+      filter: searchService.inputTypeFilter
+    },
+    {
+      key: 'output',
+      label: t('g.output'),
+      filter: searchService.outputTypeFilter
+    }
+  ]
+})
+</script>
diff --git a/src/components/searchbox/v2/NodeSearchFilterPanel.vue b/src/components/searchbox/v2/NodeSearchFilterPanel.vue
new file mode 100644
index 0000000000..d9d9077f22
--- /dev/null
+++ b/src/components/searchbox/v2/NodeSearchFilterPanel.vue
@@ -0,0 +1,90 @@
+<template>
+  <div
+    id="filter-options-list"
+    ref="listRef"
+    role="listbox"
+    class="flex-1 overflow-y-auto py-2"
+  >
+    <div
+      v-for="(option, index) in options"
+      :id="`filter-option-${index}`"
+      :key="option"
+      role="option"
+      data-testid="filter-option"
+      :aria-selected="index === selectedIndex"
+      :class="
+        cn(
+          'cursor-pointer px-6 py-1.5',
+          index === selectedIndex && 'bg-secondary-background-hover'
+        )
+      "
+      @click="emit('apply', option)"
+      @mouseenter="selectedIndex = index"
+    >
+      <span class="text-foreground text-base font-semibold">
+        <span class="mr-1 text-2xl" :style="{ color: getLinkTypeColor(option) }"
+          >&bull;</span
+        >
+        {{ option }}
+      </span>
+    </div>
+    <div
+      v-if="options.length === 0"
+      class="px-4 py-8 text-center text-muted-foreground"
+    >
+      {{ $t('g.noResults') }}
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, nextTick, ref, watch } from 'vue'
+
+import type { FilterChip } from '@/components/searchbox/v2/NodeSearchFilterBar.vue'
+import { getLinkTypeColor } from '@/utils/litegraphUtil'
+import { cn } from '@/utils/tailwindUtil'
+
+const { chip } = defineProps<{
+  chip: FilterChip
+}>()
+
+const query = defineModel<string>('query', { required: true })
+
+const emit = defineEmits<{
+  apply: [value: string]
+}>()
+
+const listRef = ref<HTMLElement>()
+const selectedIndex = ref(0)
+
+const options = computed(() => {
+  const { fuseSearch } = chip.filter
+  if (query.value) {
+    return fuseSearch.search(query.value).slice(0, 64)
+  }
+  return fuseSearch.data.slice().sort()
+})
+
+watch(query, () => {
+  selectedIndex.value = 0
+})
+
+function navigate(direction: number) {
+  const newIndex = selectedIndex.value + direction
+  if (newIndex >= 0 && newIndex < options.value.length) {
+    selectedIndex.value = newIndex
+    nextTick(() => {
+      listRef.value
+        ?.querySelector(`#filter-option-${newIndex}`)
+        ?.scrollIntoView({ block: 'nearest' })
+    })
+  }
+}
+
+function selectCurrent() {
+  const option = options.value[selectedIndex.value]
+  if (option) emit('apply', option)
+}
+
+defineExpose({ navigate, selectCurrent })
+</script>
diff --git a/src/components/searchbox/v2/NodeSearchInput.test.ts b/src/components/searchbox/v2/NodeSearchInput.test.ts
new file mode 100644
index 0000000000..5bc875466a
--- /dev/null
+++ b/src/components/searchbox/v2/NodeSearchInput.test.ts
@@ -0,0 +1,167 @@
+import { mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { FilterChip } from '@/components/searchbox/v2/NodeSearchFilterBar.vue'
+import NodeSearchInput from '@/components/searchbox/v2/NodeSearchInput.vue'
+import {
+  setupTestPinia,
+  testI18n
+} from '@/components/searchbox/v2/__test__/testUtils'
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+import type { FuseFilter, FuseFilterWithValue } from '@/utils/fuseUtil'
+
+vi.mock('@/utils/litegraphUtil', () => ({
+  getLinkTypeColor: vi.fn((type: string) =>
+    type === 'IMAGE' ? '#64b5f6' : undefined
+  )
+}))
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: vi.fn(() => ({
+    get: vi.fn(),
+    set: vi.fn()
+  }))
+}))
+
+function createFilter(
+  id: string,
+  value: string
+): FuseFilterWithValue<ComfyNodeDefImpl, string> {
+  return {
+    filterDef: {
+      id,
+      matches: vi.fn(() => true)
+    } as Partial<FuseFilter<ComfyNodeDefImpl, string>> as FuseFilter<
+      ComfyNodeDefImpl,
+      string
+    >,
+    value
+  }
+}
+
+function createActiveFilter(label: string): FilterChip {
+  return {
+    key: label.toLowerCase(),
+    label,
+    filter: {
+      id: label.toLowerCase(),
+      matches: vi.fn(() => true)
+    } as Partial<FuseFilter<ComfyNodeDefImpl, string>> as FuseFilter<
+      ComfyNodeDefImpl,
+      string
+    >
+  }
+}
+
+describe('NodeSearchInput', () => {
+  beforeEach(() => {
+    setupTestPinia()
+    vi.restoreAllMocks()
+  })
+
+  function createWrapper(
+    props: Partial<{
+      filters: FuseFilterWithValue<ComfyNodeDefImpl, string>[]
+      activeFilter: FilterChip | null
+      searchQuery: string
+      filterQuery: string
+    }> = {}
+  ) {
+    return mount(NodeSearchInput, {
+      props: {
+        filters: [],
+        activeFilter: null,
+        searchQuery: '',
+        filterQuery: '',
+        ...props
+      },
+      global: { plugins: [testI18n] }
+    })
+  }
+
+  it('should route input to searchQuery when no active filter', async () => {
+    const wrapper = createWrapper()
+    await wrapper.find('input').setValue('test search')
+
+    expect(wrapper.emitted('update:searchQuery')![0]).toEqual(['test search'])
+  })
+
+  it('should route input to filterQuery when active filter is set', async () => {
+    const wrapper = createWrapper({
+      activeFilter: createActiveFilter('Input')
+    })
+    await wrapper.find('input').setValue('IMAGE')
+
+    expect(wrapper.emitted('update:filterQuery')![0]).toEqual(['IMAGE'])
+    expect(wrapper.emitted('update:searchQuery')).toBeUndefined()
+  })
+
+  it('should show filter label placeholder when active filter is set', () => {
+    const wrapper = createWrapper({
+      activeFilter: createActiveFilter('Input')
+    })
+
+    expect(
+      (wrapper.find('input').element as HTMLInputElement).placeholder
+    ).toContain('input')
+  })
+
+  it('should show add node placeholder when no active filter', () => {
+    const wrapper = createWrapper()
+
+    expect(
+      (wrapper.find('input').element as HTMLInputElement).placeholder
+    ).toContain('Add a node')
+  })
+
+  it('should hide filter chips when active filter is set', () => {
+    const wrapper = createWrapper({
+      filters: [createFilter('input', 'IMAGE')],
+      activeFilter: createActiveFilter('Input')
+    })
+
+    expect(wrapper.findAll('[data-testid="filter-chip"]')).toHaveLength(0)
+  })
+
+  it('should show filter chips when no active filter', () => {
+    const wrapper = createWrapper({
+      filters: [createFilter('input', 'IMAGE')]
+    })
+
+    expect(wrapper.findAll('[data-testid="filter-chip"]')).toHaveLength(1)
+  })
+
+  it('should emit cancelFilter when cancel button is clicked', async () => {
+    const wrapper = createWrapper({
+      activeFilter: createActiveFilter('Input')
+    })
+
+    await wrapper.find('[data-testid="cancel-filter"]').trigger('click')
+
+    expect(wrapper.emitted('cancelFilter')).toHaveLength(1)
+  })
+
+  it('should emit selectCurrent on Enter', async () => {
+    const wrapper = createWrapper()
+
+    await wrapper.find('input').trigger('keydown', { key: 'Enter' })
+
+    expect(wrapper.emitted('selectCurrent')).toHaveLength(1)
+  })
+
+  it('should emit navigateDown on ArrowDown', async () => {
+    const wrapper = createWrapper()
+
+    await wrapper.find('input').trigger('keydown', { key: 'ArrowDown' })
+
+    expect(wrapper.emitted('navigateDown')).toHaveLength(1)
+  })
+
+  it('should emit navigateUp on ArrowUp', async () => {
+    const wrapper = createWrapper()
+
+    await wrapper.find('input').trigger('keydown', { key: 'ArrowUp' })
+
+    expect(wrapper.emitted('navigateUp')).toHaveLength(1)
+  })
+})
diff --git a/src/components/searchbox/v2/NodeSearchInput.vue b/src/components/searchbox/v2/NodeSearchInput.vue
new file mode 100644
index 0000000000..e6ffc02612
--- /dev/null
+++ b/src/components/searchbox/v2/NodeSearchInput.vue
@@ -0,0 +1,145 @@
+<template>
+  <div class="p-3">
+    <TagsInputRoot
+      :model-value="tagValues"
+      delimiter=""
+      class="flex cursor-text flex-wrap items-center gap-2 rounded-lg bg-secondary-background px-4 py-3"
+      @remove-tag="onRemoveTag"
+      @click="inputRef?.focus()"
+    >
+      <!-- Active filter label (filter selection mode) -->
+      <span
+        v-if="activeFilter"
+        class="text-foreground -my-1 inline-flex shrink-0 items-center gap-1 rounded-lg bg-base-background px-2 py-1 text-sm opacity-80"
+      >
+        {{ activeFilter.label }}:
+        <button
+          type="button"
+          data-testid="cancel-filter"
+          class="aspect-square cursor-pointer rounded-full border-none bg-transparent text-muted-foreground hover:text-base-foreground"
+          :aria-label="$t('g.remove')"
+          @click="emit('cancelFilter')"
+        >
+          <i class="pi pi-times text-xs" />
+        </button>
+      </span>
+      <!-- Applied filter chips -->
+      <template v-if="!activeFilter">
+        <TagsInputItem
+          v-for="filter in filters"
+          :key="filterKey(filter)"
+          :value="filterKey(filter)"
+          data-testid="filter-chip"
+          class="-my-1 inline-flex items-center gap-1 rounded-lg bg-base-background px-2 py-1 data-[state=active]:ring-2 data-[state=active]:ring-primary"
+        >
+          <span class="text-sm opacity-80">
+            {{ t(`g.${filter.filterDef.id}`) }}:
+          </span>
+          <span :style="{ color: getLinkTypeColor(filter.value) }">
+            &bull;
+          </span>
+          <span class="text-sm">{{ filter.value }}</span>
+          <TagsInputItemDelete
+            as="button"
+            type="button"
+            data-testid="chip-delete"
+            :aria-label="$t('g.remove')"
+            class="ml-1 aspect-square cursor-pointer rounded-full border-none bg-transparent text-muted-foreground hover:text-base-foreground"
+          >
+            <i class="pi pi-times text-xs" />
+          </TagsInputItemDelete>
+        </TagsInputItem>
+      </template>
+      <TagsInputInput as-child>
+        <input
+          ref="inputRef"
+          v-model="inputValue"
+          type="text"
+          role="combobox"
+          aria-autocomplete="list"
+          :aria-expanded="true"
+          :aria-controls="activeFilter ? 'filter-options-list' : 'results-list'"
+          :aria-label="inputPlaceholder"
+          :placeholder="inputPlaceholder"
+          class="text-foreground h-6 min-w-[min(300px,80vw)] flex-1 border-none bg-transparent text-sm outline-none placeholder:text-muted-foreground"
+          @keydown.enter.prevent="emit('selectCurrent')"
+          @keydown.down.prevent="emit('navigateDown')"
+          @keydown.up.prevent="emit('navigateUp')"
+        />
+      </TagsInputInput>
+    </TagsInputRoot>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, onMounted, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+import {
+  TagsInputInput,
+  TagsInputItem,
+  TagsInputItemDelete,
+  TagsInputRoot
+} from 'reka-ui'
+
+import type { FilterChip } from '@/components/searchbox/v2/NodeSearchFilterBar.vue'
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+import type { FuseFilterWithValue } from '@/utils/fuseUtil'
+import { getLinkTypeColor } from '@/utils/litegraphUtil'
+
+const { filters, activeFilter } = defineProps<{
+  filters: FuseFilterWithValue<ComfyNodeDefImpl, string>[]
+  activeFilter: FilterChip | null
+}>()
+
+const searchQuery = defineModel<string>('searchQuery', { required: true })
+const filterQuery = defineModel<string>('filterQuery', { required: true })
+
+const emit = defineEmits<{
+  removeFilter: [filter: FuseFilterWithValue<ComfyNodeDefImpl, string>]
+  cancelFilter: []
+  navigateDown: []
+  navigateUp: []
+  selectCurrent: []
+}>()
+
+const { t } = useI18n()
+const inputRef = ref<HTMLInputElement>()
+
+const inputValue = computed({
+  get: () => (activeFilter ? filterQuery.value : searchQuery.value),
+  set: (value: string) => {
+    if (activeFilter) {
+      filterQuery.value = value
+    } else {
+      searchQuery.value = value
+    }
+  }
+})
+
+const inputPlaceholder = computed(() =>
+  activeFilter
+    ? t('g.filterByType', { type: activeFilter.label.toLowerCase() })
+    : t('g.addNode')
+)
+
+const tagValues = computed(() => filters.map(filterKey))
+
+function filterKey(filter: FuseFilterWithValue<ComfyNodeDefImpl, string>) {
+  return `${filter.filterDef.id}:${filter.value}`
+}
+
+function onRemoveTag(tagValue: string) {
+  const filter = filters.find((f) => filterKey(f) === tagValue)
+  if (filter) emit('removeFilter', filter)
+}
+
+function focus() {
+  inputRef.value?.focus()
+}
+
+onMounted(() => {
+  focus()
+})
+
+defineExpose({ focus })
+</script>
diff --git a/src/components/searchbox/v2/NodeSearchListItem.vue b/src/components/searchbox/v2/NodeSearchListItem.vue
new file mode 100644
index 0000000000..7073fb400e
--- /dev/null
+++ b/src/components/searchbox/v2/NodeSearchListItem.vue
@@ -0,0 +1,125 @@
+<template>
+  <div
+    class="option-container flex w-full cursor-pointer items-center justify-between overflow-hidden"
+  >
+    <div class="flex flex-col gap-0.5 overflow-hidden">
+      <div class="text-foreground flex items-center gap-2 font-semibold">
+        <span v-if="isBookmarked && !hideBookmarkIcon">
+          <i class="pi pi-bookmark-fill mr-1 text-sm" />
+        </span>
+        <span v-html="highlightQuery(nodeDef.display_name, currentQuery)" />
+        <span v-if="showIdName">&nbsp;</span>
+        <span
+          v-if="showIdName"
+          class="rounded-sm bg-secondary-background px-1.5 py-0.5 text-xs text-muted-foreground"
+          v-html="highlightQuery(nodeDef.name, currentQuery)"
+        />
+
+        <NodePricingBadge :node-def="nodeDef" />
+        <NodeProviderBadge v-if="nodeDef.api_node" :node-def="nodeDef" />
+      </div>
+      <div
+        v-if="showDescription"
+        class="flex items-center gap-1 text-[11px] text-muted-foreground"
+      >
+        <span
+          v-if="
+            showSourceBadge &&
+            nodeDef.nodeSource.type !== NodeSourceType.Core &&
+            nodeDef.nodeSource.type !== NodeSourceType.Unknown
+          "
+          class="border-border mr-0.5 inline-flex shrink-0 rounded-sm border bg-base-foreground/5 px-1.5 py-0.5 text-xs text-base-foreground/70"
+        >
+          {{ nodeDef.nodeSource.displayText }}
+        </span>
+        <TextTicker v-if="nodeDef.description">
+          {{ nodeDef.description }}
+        </TextTicker>
+      </div>
+      <div
+        v-else-if="showCategory"
+        class="option-category truncate text-sm font-light text-muted"
+      >
+        {{ nodeDef.category.replaceAll('/', ' > ') }}
+      </div>
+    </div>
+    <div v-if="!showDescription" class="flex items-center gap-1">
+      <span
+        v-if="nodeDef.deprecated"
+        class="rounded-sm bg-red-500/20 px-1.5 py-0.5 text-xs text-red-400"
+      >
+        {{ $t('g.deprecated') }}
+      </span>
+      <span
+        v-if="nodeDef.experimental"
+        class="rounded-sm bg-blue-500/20 px-1.5 py-0.5 text-xs text-blue-400"
+      >
+        {{ $t('g.experimental') }}
+      </span>
+      <span
+        v-if="nodeDef.dev_only"
+        class="rounded-sm bg-cyan-500/20 px-1.5 py-0.5 text-xs text-cyan-400"
+      >
+        {{ $t('g.devOnly') }}
+      </span>
+      <span
+        v-if="showNodeFrequency && nodeFrequency > 0"
+        class="rounded-sm bg-secondary-background px-1.5 py-0.5 text-xs text-muted-foreground"
+      >
+        {{ formatNumberWithSuffix(nodeFrequency, { roundToInt: true }) }}
+      </span>
+      <span
+        v-if="nodeDef.nodeSource.type !== NodeSourceType.Unknown"
+        class="rounded-sm bg-secondary-background px-2 py-0.5 text-sm text-muted-foreground"
+      >
+        {{ nodeDef.nodeSource.displayText }}
+      </span>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+
+import TextTicker from '@/components/common/TextTicker.vue'
+import NodePricingBadge from '@/components/node/NodePricingBadge.vue'
+import NodeProviderBadge from '@/components/node/NodeProviderBadge.vue'
+import { useSettingStore } from '@/platform/settings/settingStore'
+import { useNodeBookmarkStore } from '@/stores/nodeBookmarkStore'
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+import { useNodeFrequencyStore } from '@/stores/nodeDefStore'
+import { NodeSourceType } from '@/types/nodeSource'
+import { formatNumberWithSuffix, highlightQuery } from '@/utils/formatUtil'
+
+const {
+  nodeDef,
+  currentQuery,
+  showDescription = false,
+  showSourceBadge = false,
+  hideBookmarkIcon = false
+} = defineProps<{
+  nodeDef: ComfyNodeDefImpl
+  currentQuery: string
+  showDescription?: boolean
+  showSourceBadge?: boolean
+  hideBookmarkIcon?: boolean
+}>()
+
+const settingStore = useSettingStore()
+const showCategory = computed(() =>
+  settingStore.get('Comfy.NodeSearchBoxImpl.ShowCategory')
+)
+const showIdName = computed(() =>
+  settingStore.get('Comfy.NodeSearchBoxImpl.ShowIdName')
+)
+const showNodeFrequency = computed(() =>
+  settingStore.get('Comfy.NodeSearchBoxImpl.ShowNodeFrequency')
+)
+const nodeFrequencyStore = useNodeFrequencyStore()
+const nodeFrequency = computed(() =>
+  nodeFrequencyStore.getNodeFrequency(nodeDef)
+)
+
+const nodeBookmarkStore = useNodeBookmarkStore()
+const isBookmarked = computed(() => nodeBookmarkStore.isBookmarked(nodeDef))
+</script>
diff --git a/src/components/searchbox/v2/__test__/testUtils.ts b/src/components/searchbox/v2/__test__/testUtils.ts
new file mode 100644
index 0000000000..5e1dc700c7
--- /dev/null
+++ b/src/components/searchbox/v2/__test__/testUtils.ts
@@ -0,0 +1,64 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { createI18n } from 'vue-i18n'
+
+import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'
+
+export function createMockNodeDef(
+  overrides: Partial<ComfyNodeDef> = {}
+): ComfyNodeDef {
+  return {
+    name: 'TestNode',
+    display_name: 'Test Node',
+    category: 'test',
+    python_module: 'nodes',
+    description: 'Test description',
+    input: {},
+    output: [],
+    output_is_list: [],
+    output_name: [],
+    output_node: false,
+    deprecated: false,
+    experimental: false,
+    ...overrides
+  }
+}
+
+export function setupTestPinia() {
+  setActivePinia(createTestingPinia({ stubActions: false }))
+}
+
+export const testI18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      g: {
+        addNode: 'Add a node...',
+        filterBy: 'Filter by:',
+        mostRelevant: 'Most relevant',
+        recents: 'Recents',
+        favorites: 'Favorites',
+        essentials: 'Essentials',
+        custom: 'Custom',
+        comfy: 'Comfy',
+        partner: 'Partner',
+        extensions: 'Extensions',
+        noResults: 'No results',
+        filterByType: 'Filter by {type}...',
+        input: 'Input',
+        output: 'Output',
+        source: 'Source',
+        search: 'Search'
+      },
+      sideToolbar: {
+        nodeLibraryTab: {
+          filterOptions: {
+            blueprints: 'Blueprints',
+            partnerNodes: 'Partner Nodes'
+          }
+        }
+      }
+    }
+  }
+})
diff --git a/src/components/sidebar/ComfyMenuButton.vue b/src/components/sidebar/ComfyMenuButton.vue
index 6a7010a974..6f89e1f7b8 100644
--- a/src/components/sidebar/ComfyMenuButton.vue
+++ b/src/components/sidebar/ComfyMenuButton.vue
@@ -11,7 +11,7 @@
     }"
     @click="onLogoMenuClick($event)"
   >
-    <div class="flex h-8 w-8 items-center justify-center rounded-lg bg-black">
+    <div class="flex size-8 items-center justify-center rounded-lg bg-black">
       <ComfyLogo
         alt="ComfyUI Logo"
         class="comfyui-logo h-[18px] w-[18px] text-white"
@@ -60,7 +60,7 @@
         />
         <span
           v-if="item?.comfyCommand?.keybinding"
-          class="keybinding-tag ml-auto rounded border border-surface p-1 text-xs text-nowrap text-muted"
+          class="keybinding-tag ml-auto rounded-sm border border-surface p-1 text-xs text-nowrap text-muted"
         >
           {{ item.comfyCommand.keybinding.combo.toString() }}
         </span>
@@ -108,15 +108,14 @@ import ToggleSwitch from 'primevue/toggleswitch'
 import { computed, nextTick, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
-import SettingDialogHeader from '@/components/dialog/header/SettingDialogHeader.vue'
 import ComfyLogo from '@/components/icons/ComfyLogo.vue'
 import { useWorkflowTemplateSelectorDialog } from '@/composables/useWorkflowTemplateSelectorDialog'
-import SettingDialogContent from '@/platform/settings/components/SettingDialogContent.vue'
 import { useSettingStore } from '@/platform/settings/settingStore'
+import type { SettingPanelType } from '@/platform/settings/types'
 import { useTelemetry } from '@/platform/telemetry'
 import { useColorPaletteService } from '@/services/colorPaletteService'
+import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
 import { useCommandStore } from '@/stores/commandStore'
-import { useDialogStore } from '@/stores/dialogStore'
 import { useMenuItemStore } from '@/stores/menuItemStore'
 import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
 import { normalizeI18nKey } from '@/utils/formatUtil'
@@ -129,7 +128,7 @@ const commandStore = useCommandStore()
 const menuItemStore = useMenuItemStore()
 const colorPaletteStore = useColorPaletteStore()
 const colorPaletteService = useColorPaletteService()
-const dialogStore = useDialogStore()
+const settingsDialog = useSettingsDialog()
 const managerState = useManagerState()
 const settingStore = useSettingStore()
 
@@ -166,15 +165,8 @@ const translateMenuItem = (item: MenuItem): MenuItem => {
   }
 }
 
-const showSettings = (defaultPanel?: string) => {
-  dialogStore.showDialog({
-    key: 'global-settings',
-    headerComponent: SettingDialogHeader,
-    component: SettingDialogContent,
-    props: {
-      defaultPanel
-    }
-  })
+const showSettings = (defaultPanel?: SettingPanelType) => {
+  settingsDialog.show(defaultPanel)
 }
 
 const showManageExtensions = async () => {
@@ -219,7 +211,7 @@ const extraMenuItems = computed(() => [
   {
     key: 'settings',
     label: t('g.settings'),
-    icon: 'mdi mdi-cog-outline',
+    icon: 'icon-[lucide--settings]',
     command: () => {
       telemetry?.trackUiButtonClicked({
         button_id: 'sidebar_settings_menu_opened'
@@ -230,7 +222,7 @@ const extraMenuItems = computed(() => [
   {
     key: 'manage-extensions',
     label: t('menu.manageExtensions'),
-    icon: 'mdi mdi-puzzle-outline',
+    icon: 'icon-[comfy--extensions-blocks]',
     command: showManageExtensions
   }
 ])
diff --git a/src/components/sidebar/SideToolbar.vue b/src/components/sidebar/SideToolbar.vue
index 41bca82f00..ad166438a6 100644
--- a/src/components/sidebar/SideToolbar.vue
+++ b/src/components/sidebar/SideToolbar.vue
@@ -1,20 +1,21 @@
 <template>
   <nav
     ref="sideToolbarRef"
-    class="side-tool-bar-container flex h-full flex-col items-center bg-transparent [.floating-sidebar]:-mr-2 pointer-events-auto"
+    data-testid="side-toolbar"
+    class="side-tool-bar-container flex h-full flex-col items-center bg-transparent [.floating-sidebar]:-mr-2"
     :class="{
       'small-sidebar': isSmall,
-      'connected-sidebar': isConnected,
+      'connected-sidebar pointer-events-auto': isConnected,
       'floating-sidebar': !isConnected,
       'overflowing-sidebar': isOverflowing,
-      'border-r border-[var(--interface-stroke)] shadow-interface': isConnected
+      'border-r border-(--interface-stroke) shadow-interface': isConnected
     }"
   >
     <div
       :class="
         isOverflowing
           ? 'side-tool-bar-container overflow-y-auto'
-          : 'flex flex-col h-full'
+          : 'flex h-full flex-col'
       "
     >
       <div ref="topToolbarRef" :class="groupClasses">
@@ -40,12 +41,13 @@
           v-if="userStore.isMultiUserServer"
           :is-small="isSmall"
         />
-        <SidebarHelpCenterIcon :is-small="isSmall" />
-        <SidebarBottomPanelToggleButton :is-small="isSmall" />
+        <SidebarHelpCenterIcon v-if="!isIntegratedTabBar" :is-small="isSmall" />
+        <SidebarBottomPanelToggleButton v-if="!isCloud" :is-small="isSmall" />
         <SidebarShortcutsToggleButton :is-small="isSmall" />
         <SidebarSettingsButton :is-small="isSmall" />
       </div>
     </div>
+    <HelpCenterPopups :is-small="isSmall" />
   </nav>
 </template>
 
@@ -53,16 +55,19 @@
 import { useResizeObserver } from '@vueuse/core'
 import { debounce } from 'es-toolkit/compat'
 import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
+import { useI18n } from 'vue-i18n'
 
+import HelpCenterPopups from '@/components/helpcenter/HelpCenterPopups.vue'
 import ComfyMenuButton from '@/components/sidebar/ComfyMenuButton.vue'
 import SidebarBottomPanelToggleButton from '@/components/sidebar/SidebarBottomPanelToggleButton.vue'
 import SidebarSettingsButton from '@/components/sidebar/SidebarSettingsButton.vue'
 import SidebarShortcutsToggleButton from '@/components/sidebar/SidebarShortcutsToggleButton.vue'
+import { isCloud } from '@/platform/distribution/types'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { useTelemetry } from '@/platform/telemetry'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import { useCommandStore } from '@/stores/commandStore'
-import { useKeybindingStore } from '@/stores/keybindingStore'
+import { useKeybindingStore } from '@/platform/keybindings/keybindingStore'
 import { useUserStore } from '@/stores/userStore'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
 import type { SidebarTabExtension } from '@/types/extensionTypes'
@@ -73,6 +78,7 @@ import SidebarIcon from './SidebarIcon.vue'
 import SidebarLogoutIcon from './SidebarLogoutIcon.vue'
 import SidebarTemplatesButton from './SidebarTemplatesButton.vue'
 
+const { t } = useI18n()
 const workspaceStore = useWorkspaceStore()
 const settingStore = useSettingStore()
 const userStore = useUserStore()
@@ -89,6 +95,9 @@ const sidebarLocation = computed<'left' | 'right'>(() =>
   settingStore.get('Comfy.Sidebar.Location')
 )
 const sidebarStyle = computed(() => settingStore.get('Comfy.Sidebar.Style'))
+const isIntegratedTabBar = computed(
+  () => settingStore.get('Comfy.UI.TabBarLayout') === 'Integrated'
+)
 const isConnected = computed(
   () =>
     selectedTab.value ||
@@ -136,17 +145,17 @@ const onTabClick = async (item: SidebarTabExtension) => {
 
 const keybindingStore = useKeybindingStore()
 const getTabTooltipSuffix = (tab: SidebarTabExtension) => {
-  const keybinding = keybindingStore.getKeybindingByCommandId(
-    `Workspace.ToggleSidebarTab.${tab.id}`
-  )
-  return keybinding ? ` (${keybinding.combo.toString()})` : ''
+  const shortcut = keybindingStore
+    .getKeybindingByCommandId(`Workspace.ToggleSidebarTab.${tab.id}`)
+    ?.combo.toString()
+  return shortcut ? t('g.shortcutSuffix', { shortcut }) : ''
 }
 
 const isOverflowing = ref(false)
 const groupClasses = computed(() =>
   cn(
-    'sidebar-item-group flex flex-col items-center overflow-hidden flex-shrink-0' +
-      (isConnected.value ? '' : ' rounded-lg shadow-interface')
+    'sidebar-item-group flex shrink-0 flex-col items-center overflow-hidden',
+    !isConnected.value && 'pointer-events-auto rounded-lg shadow-interface'
   )
 )
 
@@ -246,8 +255,6 @@ onMounted(() => {
 </style>
 
 <style scoped>
-@reference "tailwindcss";
-
 .floating-sidebar {
   padding: var(--sidebar-padding);
 }
diff --git a/src/components/sidebar/SidebarHelpCenterIcon.vue b/src/components/sidebar/SidebarHelpCenterIcon.vue
index b8d8cea396..fda2330182 100644
--- a/src/components/sidebar/SidebarHelpCenterIcon.vue
+++ b/src/components/sidebar/SidebarHelpCenterIcon.vue
@@ -1,220 +1,24 @@
 <template>
-  <div>
-    <SidebarIcon
-      icon="pi pi-question-circle"
-      class="comfy-help-center-btn"
-      :label="$t('menu.help')"
-      :tooltip="$t('sideToolbar.helpCenter')"
-      :icon-badge="shouldShowRedDot ? '•' : ''"
-      :is-small="isSmall"
-      @click="toggleHelpCenter"
-    />
-
-    <!-- Help Center Popup positioned within canvas area -->
-    <Teleport to="#graph-canvas-container">
-      <div
-        v-if="isHelpCenterVisible"
-        class="help-center-popup"
-        :class="{
-          'sidebar-left': sidebarLocation === 'left',
-          'sidebar-right': sidebarLocation === 'right',
-          'small-sidebar': isSmall
-        }"
-      >
-        <HelpCenterMenuContent @close="closeHelpCenter" />
-      </div>
-    </Teleport>
-
-    <!-- Release Notification Toast positioned within canvas area -->
-    <Teleport to="#graph-canvas-container">
-      <ReleaseNotificationToast
-        :class="{
-          'sidebar-left': sidebarLocation === 'left',
-          'sidebar-right': sidebarLocation === 'right',
-          'small-sidebar': isSmall
-        }"
-      />
-    </Teleport>
-
-    <!-- WhatsNew Popup positioned within canvas area -->
-    <Teleport to="#graph-canvas-container">
-      <WhatsNewPopup
-        :class="{
-          'sidebar-left': sidebarLocation === 'left',
-          'sidebar-right': sidebarLocation === 'right',
-          'small-sidebar': isSmall
-        }"
-        @whats-new-dismissed="handleWhatsNewDismissed"
-      />
-    </Teleport>
-
-    <!-- Backdrop to close popup when clicking outside -->
-    <Teleport to="body">
-      <div
-        v-if="isHelpCenterVisible"
-        class="help-center-backdrop"
-        @click="closeHelpCenter"
-      />
-    </Teleport>
-  </div>
+  <SidebarIcon
+    icon="pi pi-question-circle"
+    class="comfy-help-center-btn"
+    :label="$t('menu.help')"
+    :tooltip="$t('sideToolbar.helpCenter')"
+    :icon-badge="shouldShowRedDot ? '•' : ''"
+    badge-class="-top-1 -right-1 min-w-2 w-2 h-2 p-0 rounded-full text-[0px] bg-[#ff3b30]"
+    :is-small="isSmall"
+    @click="toggleHelpCenter"
+  />
 </template>
 
 <script setup lang="ts">
-import { storeToRefs } from 'pinia'
-import { computed, onMounted, toRefs } from 'vue'
-
-import HelpCenterMenuContent from '@/components/helpcenter/HelpCenterMenuContent.vue'
-import { useSettingStore } from '@/platform/settings/settingStore'
-import { useTelemetry } from '@/platform/telemetry'
-import { useReleaseStore } from '@/platform/updates/common/releaseStore'
-import ReleaseNotificationToast from '@/platform/updates/components/ReleaseNotificationToast.vue'
-import WhatsNewPopup from '@/platform/updates/components/WhatsNewPopup.vue'
-import { useDialogService } from '@/services/dialogService'
-import { useHelpCenterStore } from '@/stores/helpCenterStore'
-import { useConflictAcknowledgment } from '@/workbench/extensions/manager/composables/useConflictAcknowledgment'
-import { useConflictDetection } from '@/workbench/extensions/manager/composables/useConflictDetection'
+import { useHelpCenter } from '@/composables/useHelpCenter'
 
 import SidebarIcon from './SidebarIcon.vue'
 
-const settingStore = useSettingStore()
-const releaseStore = useReleaseStore()
-const helpCenterStore = useHelpCenterStore()
-const { isVisible: isHelpCenterVisible } = storeToRefs(helpCenterStore)
-const { shouldShowRedDot: showReleaseRedDot } = storeToRefs(releaseStore)
-
-const conflictDetection = useConflictDetection()
-
-const { showNodeConflictDialog } = useDialogService()
-
-// Use conflict acknowledgment state from composable - call only once
-const { shouldShowRedDot: shouldShowConflictRedDot, markConflictsAsSeen } =
-  useConflictAcknowledgment()
-
-const props = defineProps<{
+defineProps<{
   isSmall: boolean
 }>()
-const { isSmall } = toRefs(props)
 
-// Use either release red dot or conflict red dot
-const shouldShowRedDot = computed((): boolean => {
-  const releaseRedDot = showReleaseRedDot.value
-  return releaseRedDot || shouldShowConflictRedDot.value
-})
-
-const sidebarLocation = computed(() =>
-  settingStore.get('Comfy.Sidebar.Location')
-)
-
-/**
- * Toggle Help Center and track UI button click.
- */
-const toggleHelpCenter = () => {
-  useTelemetry()?.trackUiButtonClicked({
-    button_id: 'sidebar_help_center_toggled'
-  })
-  helpCenterStore.toggle()
-}
-
-const closeHelpCenter = () => {
-  helpCenterStore.hide()
-}
-
-/**
- * Handle What's New popup dismissal
- * Check if conflict modal should be shown after ComfyUI update
- */
-const handleWhatsNewDismissed = async () => {
-  try {
-    // Check if conflict modal should be shown after update
-    const shouldShow =
-      await conflictDetection.shouldShowConflictModalAfterUpdate()
-    if (shouldShow) {
-      showConflictModal()
-    }
-  } catch (error) {
-    console.error('[HelpCenter] Error checking conflict modal:', error)
-  }
-}
-/**
- * Show the node conflict dialog with current conflict data
- */
-const showConflictModal = () => {
-  showNodeConflictDialog({
-    showAfterWhatsNew: true,
-    dialogComponentProps: {
-      onClose: () => {
-        markConflictsAsSeen()
-      }
-    }
-  })
-}
-
-// Initialize release store on mount
-onMounted(async () => {
-  // Initialize release store to fetch releases for toast and popup
-  await releaseStore.initialize()
-})
+const { shouldShowRedDot, toggleHelpCenter } = useHelpCenter()
 </script>
-
-<style scoped>
-.help-center-backdrop {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 9999;
-  background: transparent;
-}
-
-.help-center-popup {
-  position: absolute;
-  bottom: 1rem;
-  z-index: 10000;
-  animation: slideInUp 0.2s ease-out;
-  pointer-events: auto;
-}
-
-.help-center-popup.sidebar-left {
-  left: 1rem;
-}
-
-.help-center-popup.sidebar-left.small-sidebar {
-  left: 1rem;
-}
-
-.help-center-popup.sidebar-right {
-  right: 1rem;
-}
-
-@keyframes slideInUp {
-  from {
-    opacity: 0;
-    transform: translateY(20px);
-  }
-
-  to {
-    opacity: 1;
-    transform: translateY(0);
-  }
-}
-
-:deep(.p-badge) {
-  background: #ff3b30;
-  color: #ff3b30;
-  min-width: 8px;
-  height: 8px;
-  padding: 0;
-  border-radius: 9999px;
-  font-size: 0;
-  margin-top: 4px;
-  margin-right: 4px;
-  border: none;
-  outline: none;
-  box-shadow: none;
-}
-
-:deep(.p-badge.p-badge-dot) {
-  width: 8px !important;
-}
-</style>
diff --git a/src/components/sidebar/SidebarIcon.test.ts b/src/components/sidebar/SidebarIcon.test.ts
index 7564e7bcdc..284a298251 100644
--- a/src/components/sidebar/SidebarIcon.test.ts
+++ b/src/components/sidebar/SidebarIcon.test.ts
@@ -1,6 +1,5 @@
 import { mount } from '@vue/test-utils'
 import PrimeVue from 'primevue/config'
-import OverlayBadge from 'primevue/overlaybadge'
 import Tooltip from 'primevue/tooltip'
 import { describe, expect, it } from 'vitest'
 import { createI18n } from 'vue-i18n'
@@ -33,8 +32,7 @@ describe('SidebarIcon', () => {
     return mount(SidebarIcon, {
       global: {
         plugins: [PrimeVue, i18n],
-        directives: { tooltip: Tooltip },
-        components: { OverlayBadge }
+        directives: { tooltip: Tooltip }
       },
       props: { ...exampleProps, ...props },
       ...options
@@ -54,9 +52,9 @@ describe('SidebarIcon', () => {
   it('creates badge when iconBadge prop is set', () => {
     const badge = '2'
     const wrapper = mountSidebarIcon({ iconBadge: badge })
-    const badgeEl = wrapper.findComponent(OverlayBadge)
+    const badgeEl = wrapper.find('.sidebar-icon-badge')
     expect(badgeEl.exists()).toBe(true)
-    expect(badgeEl.find('.p-badge').text()).toEqual(badge)
+    expect(badgeEl.text()).toEqual(badge)
   })
 
   it('shows tooltip on hover', async () => {
diff --git a/src/components/sidebar/SidebarIcon.vue b/src/components/sidebar/SidebarIcon.vue
index 88900c1a70..66e469e8e3 100644
--- a/src/components/sidebar/SidebarIcon.vue
+++ b/src/components/sidebar/SidebarIcon.vue
@@ -15,48 +15,54 @@
     :aria-label="computedTooltip"
     @click="emit('click', $event)"
   >
-    <div class="side-bar-button-content">
+    <div class="side-bar-button-content flex flex-col items-center gap-2">
       <slot name="icon">
-        <OverlayBadge v-if="shouldShowBadge" :value="overlayValue">
+        <div class="sidebar-icon-wrapper relative">
           <i
             v-if="typeof icon === 'string'"
             :class="icon + ' side-bar-button-icon'"
           />
-          <component :is="icon" v-else class="side-bar-button-icon" />
-        </OverlayBadge>
-        <i
-          v-else-if="typeof icon === 'string'"
-          :class="icon + ' side-bar-button-icon'"
-        />
-        <component
-          :is="icon"
-          v-else-if="typeof icon === 'object'"
-          class="side-bar-button-icon"
-        />
+          <component
+            :is="icon"
+            v-else-if="typeof icon === 'object'"
+            class="side-bar-button-icon"
+          />
+          <span
+            v-if="shouldShowBadge"
+            :class="
+              cn(
+                'sidebar-icon-badge absolute min-w-[16px] rounded-full bg-primary-background py-0.25 text-[10px] leading-[14px] font-medium text-base-foreground',
+                badgeClass || '-top-1 -right-1'
+              )
+            "
+          >
+            {{ overlayValue }}
+          </span>
+        </div>
       </slot>
-      <span v-if="label && !isSmall" class="side-bar-button-label">{{
-        t(label)
-      }}</span>
+      <span
+        v-if="label && !isSmall"
+        class="side-bar-button-label text-center text-[10px]"
+        >{{ st(label, label) }}</span
+      >
     </div>
   </Button>
 </template>
 
 <script setup lang="ts">
-import OverlayBadge from 'primevue/overlaybadge'
 import { computed } from 'vue'
 import type { Component } from 'vue'
-import { useI18n } from 'vue-i18n'
 
 import Button from '@/components/ui/button/Button.vue'
+import { st } from '@/i18n'
 import { cn } from '@/utils/tailwindUtil'
-
-const { t } = useI18n()
 const {
   icon = '',
   selected = false,
   tooltip = '',
   tooltipSuffix = '',
   iconBadge = '',
+  badgeClass = '',
   label = '',
   isSmall = false
 } = defineProps<{
@@ -65,6 +71,7 @@ const {
   tooltip?: string
   tooltipSuffix?: string
   iconBadge?: string | (() => string | null)
+  badgeClass?: string
   label?: string
   isSmall?: boolean
 }>()
@@ -76,7 +83,7 @@ const overlayValue = computed(() =>
   typeof iconBadge === 'function' ? (iconBadge() ?? '') : iconBadge
 )
 const shouldShowBadge = computed(() => !!overlayValue.value)
-const computedTooltip = computed(() => t(tooltip) + tooltipSuffix)
+const computedTooltip = computed(() => st(tooltip, tooltip) + tooltipSuffix)
 </script>
 
 <style>
@@ -99,8 +106,6 @@ const computedTooltip = computed(() => t(tooltip) + tooltipSuffix)
 </style>
 
 <style scoped>
-@reference '../../assets/css/style.css';
-
 .side-bar-button {
   width: var(--sidebar-width);
   height: var(--sidebar-item-height);
@@ -112,12 +117,7 @@ const computedTooltip = computed(() => t(tooltip) + tooltipSuffix)
   height: var(--sidebar-width);
 }
 
-.side-bar-button-content {
-  @apply flex flex-col items-center gap-2;
-}
-
 .side-bar-button-label {
-  @apply text-[10px] text-center;
   line-height: 1;
 }
 
diff --git a/src/components/sidebar/tabs/AppsSidebarTab.vue b/src/components/sidebar/tabs/AppsSidebarTab.vue
new file mode 100644
index 0000000000..9a3a4bc3d7
--- /dev/null
+++ b/src/components/sidebar/tabs/AppsSidebarTab.vue
@@ -0,0 +1,49 @@
+<template>
+  <BaseWorkflowsSidebarTab
+    :title="$t('linearMode.appModeToolbar.apps')"
+    :filter="isAppWorkflow"
+    hide-leaf-icon
+    :search-subject="$t('linearMode.appModeToolbar.apps')"
+    data-testid="apps-sidebar"
+  >
+    <template #alt-title>
+      <span
+        class="ml-2 flex items-center rounded-full bg-primary-background px-1.5 py-0.5 text-xxs text-base-foreground uppercase"
+      >
+        {{ $t('g.beta') }}
+      </span>
+    </template>
+    <template #empty-state>
+      <NoResultsPlaceholder
+        button-variant="secondary"
+        text-class="text-muted-foreground text-sm"
+        :message="
+          isAppMode
+            ? $t('linearMode.appModeToolbar.appsEmptyMessage')
+            : `${$t('linearMode.appModeToolbar.appsEmptyMessage')}\n${$t('linearMode.appModeToolbar.appsEmptyMessageAction')}`
+        "
+        :button-label="
+          isAppMode ? undefined : $t('linearMode.appModeToolbar.enterAppMode')
+        "
+        @action="enterAppMode"
+      />
+    </template>
+  </BaseWorkflowsSidebarTab>
+</template>
+
+<script setup lang="ts">
+import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
+import BaseWorkflowsSidebarTab from '@/components/sidebar/tabs/BaseWorkflowsSidebarTab.vue'
+import { useAppMode } from '@/composables/useAppMode'
+import type { ComfyWorkflow } from '@/platform/workflow/management/stores/workflowStore'
+
+const { isAppMode, setMode } = useAppMode()
+
+function isAppWorkflow(workflow: ComfyWorkflow): boolean {
+  return workflow.suffix === 'app.json'
+}
+
+function enterAppMode() {
+  setMode('app')
+}
+</script>
diff --git a/src/components/sidebar/tabs/AssetsSidebarGridView.vue b/src/components/sidebar/tabs/AssetsSidebarGridView.vue
new file mode 100644
index 0000000000..81669d56a1
--- /dev/null
+++ b/src/components/sidebar/tabs/AssetsSidebarGridView.vue
@@ -0,0 +1,88 @@
+<template>
+  <div class="flex h-full flex-col">
+    <!-- Assets Header -->
+    <div v-if="assets.length" class="px-2 2xl:px-4">
+      <div
+        class="flex items-center py-2 font-inter text-sm/normal font-normal text-muted-foreground"
+      >
+        {{
+          t(
+            assetType === 'input'
+              ? 'sideToolbar.importedAssetsHeader'
+              : 'sideToolbar.generatedAssetsHeader'
+          )
+        }}
+      </div>
+    </div>
+
+    <!-- Assets Grid -->
+    <VirtualGrid
+      class="flex-1"
+      :items="assetItems"
+      :grid-style="gridStyle"
+      @approach-end="emit('approach-end')"
+    >
+      <template #item="{ item }">
+        <MediaAssetCard
+          :asset="item.asset"
+          :selected="isSelected(item.asset.id)"
+          :show-output-count="showOutputCount(item.asset)"
+          :output-count="getOutputCount(item.asset)"
+          @click="emit('select-asset', item.asset)"
+          @context-menu="emit('context-menu', $event, item.asset)"
+          @zoom="emit('zoom', item.asset)"
+          @output-count-click="emit('output-count-click', item.asset)"
+        />
+      </template>
+    </VirtualGrid>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import VirtualGrid from '@/components/common/VirtualGrid.vue'
+import MediaAssetCard from '@/platform/assets/components/MediaAssetCard.vue'
+import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+
+const {
+  assets,
+  isSelected,
+  assetType = 'output',
+  showOutputCount,
+  getOutputCount
+} = defineProps<{
+  assets: AssetItem[]
+  isSelected: (assetId: string) => boolean
+  assetType?: 'input' | 'output'
+  showOutputCount: (asset: AssetItem) => boolean
+  getOutputCount: (asset: AssetItem) => number
+}>()
+
+const emit = defineEmits<{
+  (e: 'select-asset', asset: AssetItem): void
+  (e: 'context-menu', event: MouseEvent, asset: AssetItem): void
+  (e: 'approach-end'): void
+  (e: 'zoom', asset: AssetItem): void
+  (e: 'output-count-click', asset: AssetItem): void
+}>()
+
+const { t } = useI18n()
+
+type AssetGridItem = { key: string; asset: AssetItem }
+
+const assetItems = computed<AssetGridItem[]>(() =>
+  assets.map((asset) => ({
+    key: `asset-${asset.id}`,
+    asset
+  }))
+)
+
+const gridStyle = {
+  display: 'grid',
+  gridTemplateColumns: 'repeat(auto-fill, minmax(min(200px, 30vw), 1fr))',
+  padding: '0 0.5rem',
+  gap: '0.5rem'
+}
+</script>
diff --git a/src/components/sidebar/tabs/AssetsSidebarListView.stories.ts b/src/components/sidebar/tabs/AssetsSidebarListView.stories.ts
new file mode 100644
index 0000000000..add90360a8
--- /dev/null
+++ b/src/components/sidebar/tabs/AssetsSidebarListView.stories.ts
@@ -0,0 +1,199 @@
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+import { toRef } from 'vue'
+
+import type { JobAction } from '@/composables/queue/useJobActions'
+import type { JobListItem } from '@/composables/queue/useJobList'
+import { useOutputStacks } from '@/platform/assets/composables/useOutputStacks'
+import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import { setMockJobActions } from '@/storybook/mocks/useJobActions'
+import { setMockJobItems } from '@/storybook/mocks/useJobList'
+import { iconForJobState } from '@/utils/queueDisplay'
+
+import AssetsSidebarListView from './AssetsSidebarListView.vue'
+
+type StoryArgs = {
+  assets: AssetItem[]
+  jobs: JobListItem[]
+  selectedAssetIds?: string[]
+  actionsByJobId?: Record<string, JobAction[]>
+}
+
+function baseDecorator() {
+  return {
+    template: `
+        <div class="bg-base-background p-6">
+          <story />
+        </div>
+      `
+  }
+}
+
+const meta: Meta<StoryArgs> = {
+  title: 'Components/Sidebar/AssetsSidebarListView',
+  component: AssetsSidebarListView,
+  parameters: {
+    layout: 'centered'
+  },
+  decorators: [baseDecorator]
+}
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+const baseTimestamp = '2024-01-15T10:00:00Z'
+
+const sampleJobs: JobListItem[] = [
+  {
+    id: 'job-pending-1',
+    title: 'In queue',
+    meta: '8:59:30pm',
+    state: 'pending',
+    iconName: iconForJobState('pending'),
+    showClear: true
+  },
+  {
+    id: 'job-init-1',
+    title: 'Initializing...',
+    meta: '8:59:35pm',
+    state: 'initialization',
+    iconName: iconForJobState('initialization'),
+    showClear: true
+  },
+  {
+    id: 'job-running-1',
+    title: 'Total: 30%',
+    meta: 'KSampler: 70%',
+    state: 'running',
+    iconName: iconForJobState('running'),
+    showClear: true,
+    progressTotalPercent: 30,
+    progressCurrentPercent: 70
+  }
+]
+
+const sampleAssets: AssetItem[] = [
+  {
+    id: 'asset-image-1',
+    name: 'image-032.png',
+    created_at: baseTimestamp,
+    preview_url: '/assets/images/comfy-logo-single.svg',
+    size: 1887437,
+    tags: [],
+    user_metadata: {
+      jobId: 'job-running-1',
+      nodeId: 12,
+      executionTimeInSeconds: 1.84
+    }
+  },
+  {
+    id: 'asset-video-1',
+    name: 'clip-01.mp4',
+    created_at: baseTimestamp,
+    preview_url: '/assets/images/default-template.png',
+    size: 8394820,
+    tags: [],
+    user_metadata: {
+      duration: 132000
+    }
+  },
+  {
+    id: 'asset-audio-1',
+    name: 'soundtrack-01.mp3',
+    created_at: baseTimestamp,
+    size: 5242880,
+    tags: [],
+    user_metadata: {
+      duration: 200000
+    }
+  },
+  {
+    id: 'asset-3d-1',
+    name: 'scene-01.glb',
+    created_at: baseTimestamp,
+    size: 134217728,
+    tags: []
+  },
+  {
+    id: 'asset-text-1',
+    name: 'generation-notes.txt',
+    created_at: baseTimestamp,
+    preview_url: '/assets/images/default-template.png',
+    size: 2048,
+    tags: []
+  },
+  {
+    id: 'asset-other-1',
+    name: 'workflow-payload.bin',
+    created_at: baseTimestamp,
+    preview_url: '/assets/images/default-template.png',
+    size: 4096,
+    tags: []
+  }
+]
+
+const cancelAction: JobAction = {
+  icon: 'icon-[lucide--x]',
+  label: 'Cancel',
+  variant: 'destructive'
+}
+
+export const RunningAndGenerated: Story = {
+  args: {
+    assets: sampleAssets,
+    jobs: sampleJobs,
+    actionsByJobId: {
+      'job-pending-1': [cancelAction],
+      'job-init-1': [cancelAction],
+      'job-running-1': [cancelAction]
+    }
+  },
+  render: renderAssetsSidebarListView
+}
+
+export const TextAndMiscGeneratedAssets: Story = {
+  args: {
+    assets: sampleAssets.filter((asset) =>
+      ['.txt', '.bin'].some((suffix) => asset.name.endsWith(suffix))
+    ),
+    jobs: []
+  },
+  render: renderAssetsSidebarListView
+}
+
+function renderAssetsSidebarListView(args: StoryArgs) {
+  return {
+    components: { AssetsSidebarListView },
+    setup() {
+      setMockJobItems(args.jobs)
+      setMockJobActions(args.actionsByJobId ?? {})
+      const { assetItems, selectableAssets, isStackExpanded, toggleStack } =
+        useOutputStacks({
+          assets: toRef(args, 'assets')
+        })
+      const selectedIds = new Set(args.selectedAssetIds ?? [])
+      function isSelected(assetId: string) {
+        return selectedIds.has(assetId)
+      }
+
+      return {
+        args,
+        assetItems,
+        selectableAssets,
+        isSelected,
+        isStackExpanded,
+        toggleStack
+      }
+    },
+    template: `
+      <div class="h-[520px] w-[320px] overflow-hidden rounded-lg border border-panel-border">
+        <AssetsSidebarListView
+          :asset-items="assetItems"
+          :selectable-assets="selectableAssets"
+          :is-selected="isSelected"
+          :is-stack-expanded="isStackExpanded"
+          :toggle-stack="toggleStack"
+        />
+      </div>
+    `
+  }
+}
diff --git a/src/components/sidebar/tabs/AssetsSidebarListView.test.ts b/src/components/sidebar/tabs/AssetsSidebarListView.test.ts
new file mode 100644
index 0000000000..49e2d8ef8d
--- /dev/null
+++ b/src/components/sidebar/tabs/AssetsSidebarListView.test.ts
@@ -0,0 +1,147 @@
+import { mount } from '@vue/test-utils'
+import { defineComponent } from 'vue'
+import { describe, expect, it, vi } from 'vitest'
+
+import type { OutputStackListItem } from '@/platform/assets/composables/useOutputStacks'
+import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+
+import AssetsSidebarListView from './AssetsSidebarListView.vue'
+
+vi.mock('vue-i18n', () => ({
+  useI18n: () => ({
+    t: (key: string) => key
+  })
+}))
+
+vi.mock('@/stores/assetsStore', () => ({
+  useAssetsStore: () => ({
+    isAssetDeleting: () => false
+  })
+}))
+
+const VirtualGridStub = defineComponent({
+  name: 'VirtualGrid',
+  props: {
+    items: {
+      type: Array,
+      default: () => []
+    }
+  },
+  template:
+    '<div><slot v-for="item in items" :key="item.key" name="item" :item="item" /></div>'
+})
+
+const buildAsset = (id: string, name: string): AssetItem =>
+  ({
+    id,
+    name,
+    tags: []
+  }) satisfies AssetItem
+
+const buildOutputItem = (asset: AssetItem): OutputStackListItem => ({
+  key: `asset-${asset.id}`,
+  asset
+})
+
+const mountListView = (assetItems: OutputStackListItem[] = []) =>
+  mount(AssetsSidebarListView, {
+    props: {
+      assetItems,
+      selectableAssets: [],
+      isSelected: () => false,
+      isStackExpanded: () => false,
+      toggleStack: async () => {},
+      assetType: 'output'
+    },
+    global: {
+      stubs: {
+        VirtualGrid: VirtualGridStub
+      }
+    }
+  })
+
+describe('AssetsSidebarListView', () => {
+  it('shows generated assets header when there are assets', () => {
+    const wrapper = mountListView([buildOutputItem(buildAsset('a1', 'x.png'))])
+
+    expect(wrapper.text()).toContain('sideToolbar.generatedAssetsHeader')
+  })
+
+  it('does not show assets header when there are no assets', () => {
+    const wrapper = mountListView([])
+
+    expect(wrapper.text()).not.toContain('sideToolbar.generatedAssetsHeader')
+  })
+
+  it('marks mp4 assets as video previews', () => {
+    const videoAsset = {
+      ...buildAsset('video-asset', 'clip.mp4'),
+      preview_url: '/api/view/clip.mp4',
+      user_metadata: {}
+    } satisfies AssetItem
+
+    const wrapper = mountListView([buildOutputItem(videoAsset)])
+
+    const listItems = wrapper.findAllComponents({ name: 'AssetsListItem' })
+    const assetListItem = listItems.at(-1)
+
+    expect(assetListItem).toBeDefined()
+    expect(assetListItem?.props('previewUrl')).toBe('/api/view/clip.mp4')
+    expect(assetListItem?.props('isVideoPreview')).toBe(true)
+  })
+
+  it('uses icon fallback for text assets even when preview_url exists', () => {
+    const textAsset = {
+      ...buildAsset('text-asset', 'notes.txt'),
+      preview_url: '/api/view/notes.txt',
+      user_metadata: {}
+    } satisfies AssetItem
+
+    const wrapper = mountListView([buildOutputItem(textAsset)])
+
+    const listItems = wrapper.findAllComponents({ name: 'AssetsListItem' })
+    const assetListItem = listItems.at(-1)
+
+    expect(assetListItem).toBeDefined()
+    expect(assetListItem?.props('previewUrl')).toBe('')
+    expect(assetListItem?.props('isVideoPreview')).toBe(false)
+  })
+
+  it('emits preview-asset when item preview is clicked', async () => {
+    const imageAsset = {
+      ...buildAsset('image-asset', 'image.png'),
+      preview_url: '/api/view/image.png',
+      user_metadata: {}
+    } satisfies AssetItem
+
+    const wrapper = mountListView([buildOutputItem(imageAsset)])
+    const listItems = wrapper.findAllComponents({ name: 'AssetsListItem' })
+    const assetListItem = listItems.at(-1)
+
+    expect(assetListItem).toBeDefined()
+
+    assetListItem!.vm.$emit('preview-click')
+    await wrapper.vm.$nextTick()
+
+    expect(wrapper.emitted('preview-asset')).toEqual([[imageAsset]])
+  })
+
+  it('emits preview-asset when item is double-clicked', async () => {
+    const imageAsset = {
+      ...buildAsset('image-asset-dbl', 'image.png'),
+      preview_url: '/api/view/image.png',
+      user_metadata: {}
+    } satisfies AssetItem
+
+    const wrapper = mountListView([buildOutputItem(imageAsset)])
+    const listItems = wrapper.findAllComponents({ name: 'AssetsListItem' })
+    const assetListItem = listItems.at(-1)
+
+    expect(assetListItem).toBeDefined()
+
+    await assetListItem!.trigger('dblclick')
+    await wrapper.vm.$nextTick()
+
+    expect(wrapper.emitted('preview-asset')).toEqual([[imageAsset]])
+  })
+})
diff --git a/src/components/sidebar/tabs/AssetsSidebarListView.vue b/src/components/sidebar/tabs/AssetsSidebarListView.vue
new file mode 100644
index 0000000000..95050adb18
--- /dev/null
+++ b/src/components/sidebar/tabs/AssetsSidebarListView.vue
@@ -0,0 +1,205 @@
+<template>
+  <div class="flex h-full flex-col">
+    <div v-if="assetItems.length" class="px-2">
+      <div
+        class="flex items-center p-2 font-inter text-sm/normal font-normal text-muted-foreground"
+      >
+        {{
+          t(
+            assetType === 'input'
+              ? 'sideToolbar.importedAssetsHeader'
+              : 'sideToolbar.generatedAssetsHeader'
+          )
+        }}
+      </div>
+    </div>
+
+    <VirtualGrid
+      class="flex-1"
+      :items="assetItems"
+      :grid-style="listGridStyle"
+      @approach-end="emit('approach-end')"
+    >
+      <template #item="{ item }">
+        <div class="relative">
+          <LoadingOverlay
+            :loading="assetsStore.isAssetDeleting(item.asset.id)"
+            size="sm"
+          >
+            <i class="pi pi-trash text-xs" />
+          </LoadingOverlay>
+          <AssetsListItem
+            role="button"
+            tabindex="0"
+            :aria-label="
+              t('assetBrowser.ariaLabel.assetCard', {
+                name: item.asset.name,
+                type: getAssetMediaType(item.asset)
+              })
+            "
+            :class="
+              cn(
+                getAssetCardClass(isSelected(item.asset.id)),
+                item.isChild && 'pl-6'
+              )
+            "
+            :preview-url="getAssetPreviewUrl(item.asset)"
+            :preview-alt="item.asset.name"
+            :icon-name="iconForMediaType(getAssetMediaType(item.asset))"
+            :is-video-preview="isVideoAsset(item.asset)"
+            :primary-text="getAssetPrimaryText(item.asset)"
+            :secondary-text="getAssetSecondaryText(item.asset)"
+            :stack-count="getStackCount(item.asset)"
+            :stack-indicator-label="t('mediaAsset.actions.seeMoreOutputs')"
+            :stack-expanded="isStackExpanded(item.asset)"
+            @mouseenter="onAssetEnter(item.asset.id)"
+            @mouseleave="onAssetLeave(item.asset.id)"
+            @contextmenu.prevent.stop="emit('context-menu', $event, item.asset)"
+            @click.stop="emit('select-asset', item.asset, selectableAssets)"
+            @dblclick.stop="emit('preview-asset', item.asset)"
+            @preview-click="emit('preview-asset', item.asset)"
+            @stack-toggle="void toggleStack(item.asset)"
+          >
+            <template v-if="hoveredAssetId === item.asset.id" #actions>
+              <Button
+                variant="secondary"
+                size="icon"
+                :aria-label="t('mediaAsset.actions.moreOptions')"
+                @click.stop="emit('context-menu', $event, item.asset)"
+              >
+                <i class="icon-[lucide--ellipsis] size-4" />
+              </Button>
+            </template>
+          </AssetsListItem>
+        </div>
+      </template>
+    </VirtualGrid>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import LoadingOverlay from '@/components/common/LoadingOverlay.vue'
+import VirtualGrid from '@/components/common/VirtualGrid.vue'
+import Button from '@/components/ui/button/Button.vue'
+import AssetsListItem from '@/platform/assets/components/AssetsListItem.vue'
+import type { OutputStackListItem } from '@/platform/assets/composables/useOutputStacks'
+import { getOutputAssetMetadata } from '@/platform/assets/schemas/assetMetadataSchema'
+import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import { iconForMediaType } from '@/platform/assets/utils/mediaIconUtil'
+import { useAssetsStore } from '@/stores/assetsStore'
+import {
+  formatDuration,
+  formatSize,
+  getMediaTypeFromFilename,
+  truncateFilename
+} from '@/utils/formatUtil'
+import { cn } from '@/utils/tailwindUtil'
+
+const {
+  assetItems,
+  selectableAssets,
+  isSelected,
+  isStackExpanded,
+  toggleStack,
+  assetType = 'output'
+} = defineProps<{
+  assetItems: OutputStackListItem[]
+  selectableAssets: AssetItem[]
+  isSelected: (assetId: string) => boolean
+  isStackExpanded: (asset: AssetItem) => boolean
+  toggleStack: (asset: AssetItem) => Promise<void>
+  assetType?: 'input' | 'output'
+}>()
+
+const assetsStore = useAssetsStore()
+
+const emit = defineEmits<{
+  (e: 'select-asset', asset: AssetItem, assets?: AssetItem[]): void
+  (e: 'preview-asset', asset: AssetItem): void
+  (e: 'context-menu', event: MouseEvent, asset: AssetItem): void
+  (e: 'approach-end'): void
+}>()
+
+const { t } = useI18n()
+const hoveredAssetId = ref<string | null>(null)
+
+const listGridStyle = {
+  display: 'grid',
+  gridTemplateColumns: 'minmax(0, 1fr)',
+  padding: '0 0.5rem',
+  gap: '0.5rem'
+}
+
+function getAssetPrimaryText(asset: AssetItem): string {
+  return truncateFilename(asset.name)
+}
+
+function getAssetMediaType(asset: AssetItem) {
+  return getMediaTypeFromFilename(asset.name)
+}
+
+function isVideoAsset(asset: AssetItem): boolean {
+  return getAssetMediaType(asset) === 'video'
+}
+
+function getAssetPreviewUrl(asset: AssetItem): string {
+  const mediaType = getAssetMediaType(asset)
+  if (mediaType === 'image' || mediaType === 'video') {
+    return asset.preview_url || ''
+  }
+  return ''
+}
+
+function getAssetSecondaryText(asset: AssetItem): string {
+  const metadata = getOutputAssetMetadata(asset.user_metadata)
+  if (typeof metadata?.executionTimeInSeconds === 'number') {
+    return `${metadata.executionTimeInSeconds.toFixed(2)}s`
+  }
+
+  const duration = asset.user_metadata?.duration
+  if (typeof duration === 'number') {
+    return formatDuration(duration)
+  }
+
+  if (typeof asset.size === 'number') {
+    return formatSize(asset.size)
+  }
+
+  return ''
+}
+
+function getStackCount(asset: AssetItem): number | undefined {
+  const metadata = getOutputAssetMetadata(asset.user_metadata)
+  if (typeof metadata?.outputCount === 'number') {
+    return metadata.outputCount
+  }
+
+  if (Array.isArray(metadata?.allOutputs)) {
+    return metadata.allOutputs.length
+  }
+
+  return undefined
+}
+
+function getAssetCardClass(selected: boolean): string {
+  return cn(
+    'w-full text-text-primary transition-colors hover:bg-secondary-background-hover',
+    'cursor-pointer',
+    selected &&
+      'bg-secondary-background-hover ring-1 ring-modal-card-border-highlighted ring-inset'
+  )
+}
+
+function onAssetEnter(assetId: string) {
+  hoveredAssetId.value = assetId
+}
+
+function onAssetLeave(assetId: string) {
+  if (hoveredAssetId.value === assetId) {
+    hoveredAssetId.value = null
+  }
+}
+</script>
diff --git a/src/components/sidebar/tabs/AssetsSidebarTab.vue b/src/components/sidebar/tabs/AssetsSidebarTab.vue
index 827bd68516..a1210c8a2f 100644
--- a/src/components/sidebar/tabs/AssetsSidebarTab.vue
+++ b/src/components/sidebar/tabs/AssetsSidebarTab.vue
@@ -1,6 +1,7 @@
 <template>
   <SidebarTabTemplate
     :title="isInFolderView ? '' : $t('sideToolbar.mediaAssets.title')"
+    v-bind="$attrs"
   >
     <template #alt-title>
       <div
@@ -9,7 +10,7 @@
       >
         <div class="flex items-center gap-2">
           <span class="font-bold">{{ $t('assetBrowser.jobId') }}:</span>
-          <span class="text-sm">{{ folderPromptId?.substring(0, 8) }}</span>
+          <span class="text-sm">{{ folderJobId?.substring(0, 8) }}</span>
           <button
             class="m-0 cursor-pointer border-0 bg-transparent p-0 outline-0"
             role="button"
@@ -47,17 +48,31 @@
       <MediaAssetFilterBar
         v-model:search-query="searchQuery"
         v-model:sort-by="sortBy"
+        v-model:view-mode="viewMode"
         v-model:media-type-filters="mediaTypeFilters"
-        class="pb-1 px-2 2xl:px-4"
+        class="px-2 pb-1 2xl:px-4"
         :show-generation-time-sort="activeTab === 'output'"
       />
       <Divider type="dashed" class="my-2" />
     </template>
     <template #body>
-      <div v-if="loading && !displayAssets.length">
-        <ProgressSpinner class="absolute left-1/2 w-[50px] -translate-x-1/2" />
+      <div
+        v-if="showLoadingState"
+        class="grid grid-cols-[repeat(auto-fill,minmax(200px,1fr))] gap-2 px-2"
+      >
+        <div
+          v-for="n in skeletonCount"
+          :key="`skeleton-${n}`"
+          class="flex flex-col gap-2 p-2"
+        >
+          <Skeleton class="aspect-square w-full rounded-lg" />
+          <div class="flex flex-col gap-1">
+            <Skeleton class="h-4 w-3/4" />
+            <Skeleton class="h-3 w-1/2" />
+          </div>
+        </div>
       </div>
-      <div v-else-if="!loading && !displayAssets.length">
+      <div v-else-if="showEmptyState">
         <NoResultsPlaceholder
           icon="pi pi-info-circle"
           :title="
@@ -71,45 +86,44 @@
         />
       </div>
       <div v-else class="relative size-full" @click="handleEmptySpaceClick">
-        <VirtualGrid
-          :items="mediaAssetsWithKey"
-          :grid-style="{
-            display: 'grid',
-            gridTemplateColumns: 'repeat(auto-fill, minmax(200px, 1fr))',
-            padding: '0 0.5rem',
-            gap: '0.5rem'
-          }"
+        <AssetsSidebarListView
+          v-if="isListView"
+          :asset-items="listViewAssetItems"
+          :is-selected="isSelected"
+          :selectable-assets="listViewSelectableAssets"
+          :is-stack-expanded="isListViewStackExpanded"
+          :toggle-stack="toggleListViewStack"
+          :asset-type="activeTab"
+          @select-asset="handleAssetSelect"
+          @preview-asset="handleZoomClick"
+          @context-menu="handleAssetContextMenu"
           @approach-end="handleApproachEnd"
-        >
-          <template #item="{ item }">
-            <MediaAssetCard
-              :asset="item"
-              :selected="isSelected(item.id)"
-              :show-output-count="shouldShowOutputCount(item)"
-              :output-count="getOutputCount(item)"
-              :show-delete-button="shouldShowDeleteButton"
-              :open-context-menu-id="openContextMenuId"
-              @click="handleAssetSelect(item)"
-              @zoom="handleZoomClick(item)"
-              @output-count-click="enterFolderView(item)"
-              @asset-deleted="refreshAssets"
-              @context-menu-opened="openContextMenuId = item.id"
-            />
-          </template>
-        </VirtualGrid>
+        />
+        <AssetsSidebarGridView
+          v-else
+          :assets="displayAssets"
+          :is-selected="isSelected"
+          :asset-type="activeTab"
+          :show-output-count="shouldShowOutputCount"
+          :get-output-count="getOutputCount"
+          @select-asset="handleAssetSelect"
+          @context-menu="handleAssetContextMenu"
+          @approach-end="handleApproachEnd"
+          @zoom="handleZoomClick"
+          @output-count-click="enterFolderView"
+        />
       </div>
     </template>
     <template #footer>
       <div
         v-if="hasSelection"
         ref="footerRef"
-        class="flex gap-1 h-18 w-full items-center justify-between"
+        class="flex h-18 w-full items-center justify-between gap-1"
       >
         <div class="flex-1 pl-4">
           <div ref="selectionCountButtonRef" class="inline-flex w-48">
             <Button
               variant="secondary"
-              size="lg"
               :class="cn(isCompact && 'text-left')"
               @click="handleDeselectAll"
             >
@@ -123,7 +137,7 @@
             </Button>
           </div>
         </div>
-        <div class="flex shrink gap-2 pr-4 items-center-safe justify-end-safe">
+        <div class="flex shrink items-center-safe justify-end-safe gap-2 pr-4">
           <template v-if="isCompact">
             <!-- Compact mode: Icon only -->
             <Button
@@ -160,47 +174,101 @@
     v-model:active-index="galleryActiveIndex"
     :all-gallery-items="galleryItems"
   />
+  <MediaAssetContextMenu
+    v-if="contextMenuAsset"
+    ref="contextMenuRef"
+    :asset="contextMenuAsset"
+    :asset-type="contextMenuAssetType"
+    :file-kind="contextMenuFileKind"
+    :show-delete-button="shouldShowDeleteButton"
+    :selected-assets="selectedAssets"
+    :is-bulk-mode="isBulkMode"
+    @zoom="handleZoomClick(contextMenuAsset)"
+    @hide="handleContextMenuHide"
+    @asset-deleted="refreshAssets"
+    @bulk-download="handleBulkDownload"
+    @bulk-delete="handleBulkDelete"
+    @bulk-add-to-workflow="handleBulkAddToWorkflow"
+    @bulk-open-workflow="handleBulkOpenWorkflow"
+    @bulk-export-workflow="handleBulkExportWorkflow"
+  />
 </template>
 
 <script setup lang="ts">
-import { useDebounceFn, useElementHover, useResizeObserver } from '@vueuse/core'
-import { Divider } from 'primevue'
-import ProgressSpinner from 'primevue/progressspinner'
+import {
+  useAsyncState,
+  useDebounceFn,
+  useElementHover,
+  useResizeObserver,
+  useStorage,
+  useTimeoutFn
+} from '@vueuse/core'
+import Divider from 'primevue/divider'
 import { useToast } from 'primevue/usetoast'
-import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
+import {
+  computed,
+  defineAsyncComponent,
+  nextTick,
+  onMounted,
+  onUnmounted,
+  ref,
+  watch
+} from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
-import VirtualGrid from '@/components/common/VirtualGrid.vue'
-import Load3dViewerContent from '@/components/load3d/Load3dViewerContent.vue'
+import AssetsSidebarGridView from '@/components/sidebar/tabs/AssetsSidebarGridView.vue'
+import AssetsSidebarListView from '@/components/sidebar/tabs/AssetsSidebarListView.vue'
 import SidebarTabTemplate from '@/components/sidebar/tabs/SidebarTabTemplate.vue'
+import Skeleton from '@/components/ui/skeleton/Skeleton.vue'
 import ResultGallery from '@/components/sidebar/tabs/queue/ResultGallery.vue'
 import Tab from '@/components/tab/Tab.vue'
 import TabList from '@/components/tab/TabList.vue'
 import Button from '@/components/ui/button/Button.vue'
-import MediaAssetCard from '@/platform/assets/components/MediaAssetCard.vue'
+import MediaAssetContextMenu from '@/platform/assets/components/MediaAssetContextMenu.vue'
 import MediaAssetFilterBar from '@/platform/assets/components/MediaAssetFilterBar.vue'
+import { getAssetType } from '@/platform/assets/composables/media/assetMappers'
 import { useMediaAssets } from '@/platform/assets/composables/media/useMediaAssets'
 import { useAssetSelection } from '@/platform/assets/composables/useAssetSelection'
 import { useMediaAssetActions } from '@/platform/assets/composables/useMediaAssetActions'
 import { useMediaAssetFiltering } from '@/platform/assets/composables/useMediaAssetFiltering'
+import { useOutputStacks } from '@/platform/assets/composables/useOutputStacks'
+import type { OutputAssetMetadata } from '@/platform/assets/schemas/assetMetadataSchema'
 import { getOutputAssetMetadata } from '@/platform/assets/schemas/assetMetadataSchema'
 import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import type { MediaKind } from '@/platform/assets/schemas/mediaAssetSchema'
+import { resolveOutputAssetItems } from '@/platform/assets/utils/outputAssetUtil'
 import { isCloud } from '@/platform/distribution/types'
 import { useDialogStore } from '@/stores/dialogStore'
 import { ResultItemImpl } from '@/stores/queueStore'
-import { formatDuration, getMediaTypeFromFilename } from '@/utils/formatUtil'
+import {
+  formatDuration,
+  getMediaTypeFromFilename,
+  isPreviewableMediaType
+} from '@/utils/formatUtil'
 import { cn } from '@/utils/tailwindUtil'
 
+const Load3dViewerContent = defineAsyncComponent(
+  () => import('@/components/load3d/Load3dViewerContent.vue')
+)
+
 const { t } = useI18n()
 
-const activeTab = ref<'input' | 'output'>('output')
-const folderPromptId = ref<string | null>(null)
-const folderExecutionTime = ref<number | undefined>(undefined)
-const isInFolderView = computed(() => folderPromptId.value !== null)
+const emit = defineEmits<{ assetSelected: [asset: AssetItem] }>()
 
-// Track which asset's context menu is open (for single-instance context menu management)
-const openContextMenuId = ref<string | null>(null)
+const activeTab = ref<'input' | 'output'>('output')
+const folderJobId = ref<string | null>(null)
+const folderExecutionTime = ref<number | undefined>(undefined)
+const expectedFolderCount = ref(0)
+const isInFolderView = computed(() => folderJobId.value !== null)
+const viewMode = useStorage<'list' | 'grid'>(
+  'Comfy.Assets.Sidebar.ViewMode',
+  'grid'
+)
+const isListView = computed(() => viewMode.value === 'list')
+
+const contextMenuRef = ref<InstanceType<typeof MediaAssetContextMenu>>()
+const contextMenuAsset = ref<AssetItem | null>(null)
 
 // Determine if delete button should be shown
 // Hide delete button when in input tab and not in cloud (OSS mode - files are from local folders)
@@ -209,10 +277,13 @@ const shouldShowDeleteButton = computed(() => {
   return true
 })
 
-const getOutputCount = (item: AssetItem): number => {
-  const count = item.user_metadata?.outputCount
-  return typeof count === 'number' && count > 0 ? count : 1
-}
+const contextMenuAssetType = computed(() =>
+  contextMenuAsset.value ? getAssetType(contextMenuAsset.value.tags) : 'input'
+)
+
+const contextMenuFileKind = computed<MediaKind>(() =>
+  getMediaTypeFromFilename(contextMenuAsset.value?.name ?? '')
+)
 
 const shouldShowOutputCount = (item: AssetItem): boolean => {
   if (activeTab.value !== 'output' || isInFolderView.value) {
@@ -238,11 +309,20 @@ const {
   hasSelection,
   clearSelection,
   getSelectedAssets,
+  reconcileSelection,
+  getOutputCount,
+  getTotalOutputCount,
   activate: activateSelection,
   deactivate: deactivateSelection
 } = useAssetSelection()
 
-const { downloadMultipleAssets, deleteMultipleAssets } = useMediaAssetActions()
+const {
+  downloadMultipleAssets,
+  deleteAssets,
+  addMultipleToWorkflow,
+  openMultipleWorkflows,
+  exportMultipleWorkflows
+} = useMediaAssetActions()
 
 // Footer responsive behavior
 const footerRef = ref<HTMLElement | null>(null)
@@ -268,8 +348,7 @@ const isHoveringSelectionCount = useElementHover(selectionCountButtonRef)
 
 // Total output count for all selected assets
 const totalOutputCount = computed(() => {
-  const selectedAssets = getSelectedAssets(displayAssets.value)
-  return selectedAssets.reduce((sum, asset) => sum + getOutputCount(asset), 0)
+  return getTotalOutputCount(selectedAssets.value)
 })
 
 const currentAssets = computed(() =>
@@ -282,7 +361,24 @@ const mediaAssets = computed(() => currentAssets.value.media.value)
 const galleryActiveIndex = ref(-1)
 const currentGalleryAssetId = ref<string | null>(null)
 
-const folderAssets = ref<AssetItem[]>([])
+const DEFAULT_SKELETON_COUNT = 6
+const skeletonCount = computed(() =>
+  expectedFolderCount.value > 0
+    ? expectedFolderCount.value
+    : DEFAULT_SKELETON_COUNT
+)
+
+const {
+  state: folderAssets,
+  isLoading: folderLoading,
+  error: folderError,
+  execute: loadFolderAssets
+} = useAsyncState(
+  (metadata: OutputAssetMetadata, options: { createdAt?: string } = {}) =>
+    resolveOutputAssetItems(metadata, options),
+  [] as AssetItem[],
+  { immediate: false, resetOnExecute: true }
+)
 
 // Base assets before search filtering
 const baseAssets = computed(() => {
@@ -300,14 +396,55 @@ const displayAssets = computed(() => {
   return filteredAssets.value
 })
 
-watch(displayAssets, (newAssets) => {
+const {
+  assetItems: listViewAssetItems,
+  selectableAssets: listViewSelectableAssets,
+  isStackExpanded: isListViewStackExpanded,
+  toggleStack: toggleListViewStack
+} = useOutputStacks({
+  assets: computed(() => displayAssets.value)
+})
+
+const visibleAssets = computed(() => {
+  if (!isListView.value) return displayAssets.value
+  return listViewSelectableAssets.value
+})
+
+const previewableVisibleAssets = computed(() =>
+  visibleAssets.value.filter((asset) =>
+    isPreviewableMediaType(getMediaTypeFromFilename(asset.name))
+  )
+)
+
+const selectedAssets = computed(() => getSelectedAssets(visibleAssets.value))
+
+const isBulkMode = computed(
+  () => hasSelection.value && selectedAssets.value.length > 1
+)
+
+const isFolderLoading = computed(
+  () => isInFolderView.value && folderLoading.value
+)
+
+const showLoadingState = computed(
+  () =>
+    (loading.value || isFolderLoading.value) && displayAssets.value.length === 0
+)
+
+const showEmptyState = computed(
+  () =>
+    !loading.value && !isFolderLoading.value && displayAssets.value.length === 0
+)
+
+watch(visibleAssets, (newAssets) => {
+  // Alternative: keep hidden selections and surface them in UI; for now prune
+  // so selection stays consistent with what this view can act on.
+  reconcileSelection(newAssets)
   if (currentGalleryAssetId.value && galleryActiveIndex.value !== -1) {
-    const newIndex = newAssets.findIndex(
+    const newIndex = previewableVisibleAssets.value.findIndex(
       (asset) => asset.id === currentGalleryAssetId.value
     )
-    if (newIndex !== -1) {
-      galleryActiveIndex.value = newIndex
-    }
+    galleryActiveIndex.value = newIndex
   }
 })
 
@@ -318,7 +455,7 @@ watch(galleryActiveIndex, (index) => {
 })
 
 const galleryItems = computed(() => {
-  return displayAssets.value.map((asset) => {
+  return previewableVisibleAssets.value.map((asset) => {
     const mediaType = getMediaTypeFromFilename(asset.name)
     const resultItem = new ResultItemImpl({
       filename: asset.name,
@@ -339,14 +476,6 @@ const galleryItems = computed(() => {
   })
 })
 
-// Add key property for VirtualGrid
-const mediaAssetsWithKey = computed(() => {
-  return displayAssets.value.map((asset) => ({
-    ...asset,
-    key: asset.id
-  }))
-})
-
 const refreshAssets = async () => {
   await currentAssets.value.fetchMediaList()
   if (error.value) {
@@ -366,13 +495,75 @@ watch(
   { immediate: true }
 )
 
-const handleAssetSelect = (asset: AssetItem) => {
-  const index = displayAssets.value.findIndex((a) => a.id === asset.id)
-  handleAssetClick(asset, index, displayAssets.value)
+function handleAssetSelect(asset: AssetItem, assets?: AssetItem[]) {
+  const assetList = assets ?? visibleAssets.value
+  const index = assetList.findIndex((a) => a.id === asset.id)
+  emit('assetSelected', asset)
+  handleAssetClick(asset, index, assetList)
+}
+
+const { start: scheduleCleanup, stop: cancelCleanup } = useTimeoutFn(
+  () => {
+    contextMenuAsset.value = null
+  },
+  0,
+  { immediate: false }
+)
+
+function handleAssetContextMenu(event: MouseEvent, asset: AssetItem) {
+  cancelCleanup()
+  contextMenuAsset.value = asset
+  void nextTick(() => {
+    contextMenuRef.value?.show(event)
+  })
+}
+
+function handleContextMenuHide() {
+  scheduleCleanup()
+}
+
+const handleBulkDownload = (assets: AssetItem[]) => {
+  downloadMultipleAssets(assets)
+  clearSelection()
+}
+
+const handleBulkDelete = async (assets: AssetItem[]) => {
+  if (await deleteAssets(assets)) {
+    clearSelection()
+  }
+}
+
+const handleBulkAddToWorkflow = async (assets: AssetItem[]) => {
+  await addMultipleToWorkflow(assets)
+  clearSelection()
+}
+
+const handleBulkOpenWorkflow = async (assets: AssetItem[]) => {
+  await openMultipleWorkflows(assets)
+  clearSelection()
+}
+
+const handleBulkExportWorkflow = async (assets: AssetItem[]) => {
+  await exportMultipleWorkflows(assets)
+  clearSelection()
+}
+
+const handleDownloadSelected = () => {
+  downloadMultipleAssets(selectedAssets.value)
+  clearSelection()
+}
+
+const handleDeleteSelected = async () => {
+  if (await deleteAssets(selectedAssets.value)) {
+    clearSelection()
+  }
 }
 
 const handleZoomClick = (asset: AssetItem) => {
   const mediaType = getMediaTypeFromFilename(asset.name)
+  if (!isPreviewableMediaType(mediaType)) {
+    return
+  }
 
   if (mediaType === '3D') {
     const dialogStore = useDialogStore()
@@ -392,49 +583,49 @@ const handleZoomClick = (asset: AssetItem) => {
   }
 
   currentGalleryAssetId.value = asset.id
-  const index = displayAssets.value.findIndex((a) => a.id === asset.id)
+  const index = previewableVisibleAssets.value.findIndex(
+    (a) => a.id === asset.id
+  )
   if (index !== -1) {
     galleryActiveIndex.value = index
   }
 }
 
-const enterFolderView = (asset: AssetItem) => {
+const enterFolderView = async (asset: AssetItem) => {
   const metadata = getOutputAssetMetadata(asset.user_metadata)
   if (!metadata) {
     console.warn('Invalid output asset metadata')
     return
   }
 
-  const { promptId, allOutputs, executionTimeInSeconds } = metadata
+  const { jobId, executionTimeInSeconds } = metadata
 
-  if (!promptId || !Array.isArray(allOutputs) || allOutputs.length === 0) {
+  if (!jobId) {
     console.warn('Missing required folder view data')
     return
   }
 
-  folderPromptId.value = promptId
+  folderJobId.value = jobId
   folderExecutionTime.value = executionTimeInSeconds
+  expectedFolderCount.value = metadata.outputCount ?? 0
 
-  folderAssets.value = allOutputs.map((output) => ({
-    id: `${output.nodeId}-${output.filename}`,
-    name: output.filename,
-    size: 0,
-    created_at: asset.created_at,
-    tags: ['output'],
-    preview_url: output.url,
-    user_metadata: {
-      promptId,
-      nodeId: output.nodeId,
-      subfolder: output.subfolder,
-      executionTimeInSeconds,
-      workflow: metadata.workflow
-    }
-  }))
+  await loadFolderAssets(0, metadata, { createdAt: asset.created_at })
+
+  if (folderError.value) {
+    toast.add({
+      severity: 'error',
+      summary: t('sideToolbar.folderView.errorSummary'),
+      detail: t('sideToolbar.folderView.errorDetail'),
+      life: 5000
+    })
+    exitFolderView()
+  }
 }
 
 const exitFolderView = () => {
-  folderPromptId.value = null
+  folderJobId.value = null
   folderExecutionTime.value = undefined
+  expectedFolderCount.value = 0
   folderAssets.value = []
   searchQuery.value = ''
 }
@@ -458,9 +649,9 @@ const handleEmptySpaceClick = () => {
 }
 
 const copyJobId = async () => {
-  if (folderPromptId.value) {
+  if (folderJobId.value) {
     try {
-      await navigator.clipboard.writeText(folderPromptId.value)
+      await navigator.clipboard.writeText(folderJobId.value)
       toast.add({
         severity: 'success',
         summary: t('mediaAsset.jobIdToast.copied'),
@@ -478,18 +669,6 @@ const copyJobId = async () => {
   }
 }
 
-const handleDownloadSelected = () => {
-  const selectedAssets = getSelectedAssets(displayAssets.value)
-  downloadMultipleAssets(selectedAssets)
-  clearSelection()
-}
-
-const handleDeleteSelected = async () => {
-  const selectedAssets = getSelectedAssets(displayAssets.value)
-  await deleteMultipleAssets(selectedAssets)
-  clearSelection()
-}
-
 const handleApproachEnd = useDebounceFn(async () => {
   if (
     activeTab.value === 'output' &&
diff --git a/src/components/sidebar/tabs/BaseWorkflowsSidebarTab.vue b/src/components/sidebar/tabs/BaseWorkflowsSidebarTab.vue
new file mode 100644
index 0000000000..c3de2c89bf
--- /dev/null
+++ b/src/components/sidebar/tabs/BaseWorkflowsSidebarTab.vue
@@ -0,0 +1,353 @@
+<template>
+  <SidebarTabTemplate
+    :title="title"
+    v-bind="$attrs"
+    :data-testid="dataTestid"
+    class="workflows-sidebar-tab"
+  >
+    <template #alt-title>
+      <slot name="alt-title" />
+    </template>
+    <template #tool-buttons>
+      <Button
+        v-tooltip.bottom="$t('g.refresh')"
+        variant="muted-textonly"
+        size="icon"
+        :aria-label="$t('g.refresh')"
+        @click="workflowStore.syncWorkflows()"
+      >
+        <i class="icon-[lucide--refresh-cw] size-4" />
+      </Button>
+    </template>
+    <template #header>
+      <div class="px-2 2xl:px-4">
+        <SearchBox
+          ref="searchBoxRef"
+          v-model:model-value="searchQuery"
+          class="workflows-search-box"
+          :placeholder="$t('g.searchPlaceholder', { subject: searchSubject })"
+          @search="handleSearch"
+        />
+      </div>
+    </template>
+    <template #body>
+      <div v-if="!isSearching" class="comfyui-workflows-panel">
+        <div
+          v-if="workflowTabsPosition === 'Sidebar'"
+          class="comfyui-workflows-open"
+        >
+          <TextDivider
+            :text="t('sideToolbar.workflowTab.workflowTreeType.open')"
+            type="dashed"
+            class="ml-2"
+          />
+          <TreeExplorer
+            v-model:expanded-keys="dummyExpandedKeys"
+            :root="renderTreeNode(openWorkflowsTree, WorkflowTreeType.Open)"
+            :selection-keys="selectionKeys"
+          >
+            <template #node="{ node }">
+              <TreeExplorerTreeNode :node="node">
+                <template #before-label="{ node: treeNode }">
+                  <span
+                    v-if="
+                      (treeNode.data as ComfyWorkflow)?.isModified ||
+                      !(treeNode.data as ComfyWorkflow)?.isPersisted
+                    "
+                    >*</span
+                  >
+                </template>
+                <template #actions="{ node: treeNode }">
+                  <Button
+                    class="close-workflow-button"
+                    :variant="
+                      workspaceStore.shiftDown ? 'destructive' : 'textonly'
+                    "
+                    size="icon-sm"
+                    :aria-label="$t('g.close')"
+                    @click.stop="
+                      handleCloseWorkflow(treeNode.data as ComfyWorkflow)
+                    "
+                  >
+                    <i class="icon-[lucide--x] size-3" />
+                  </Button>
+                </template>
+              </TreeExplorerTreeNode>
+            </template>
+          </TreeExplorer>
+        </div>
+        <div
+          v-show="filteredBookmarkedWorkflows.length > 0"
+          class="comfyui-workflows-bookmarks"
+        >
+          <TextDivider
+            :text="t('sideToolbar.workflowTab.workflowTreeType.bookmarks')"
+            type="dashed"
+            class="ml-2"
+          />
+          <TreeExplorer
+            v-model:expanded-keys="dummyExpandedKeys"
+            :root="
+              renderTreeNode(
+                bookmarkedWorkflowsTree,
+                WorkflowTreeType.Bookmarks
+              )
+            "
+            :selection-keys="selectionKeys"
+          >
+            <template #node="{ node }">
+              <WorkflowTreeLeaf :node="node" />
+            </template>
+          </TreeExplorer>
+        </div>
+        <div class="comfyui-workflows-browse">
+          <TextDivider
+            :text="t('sideToolbar.workflowTab.workflowTreeType.browse')"
+            type="dashed"
+            class="ml-2"
+          />
+          <TreeExplorer
+            v-if="filteredPersistedWorkflows.length > 0"
+            v-model:expanded-keys="expandedKeys"
+            :root="renderTreeNode(workflowsTree, WorkflowTreeType.Browse)"
+            :selection-keys="selectionKeys"
+          >
+            <template #node="{ node }">
+              <WorkflowTreeLeaf :node="node" />
+            </template>
+          </TreeExplorer>
+          <slot v-else name="empty-state">
+            <NoResultsPlaceholder
+              icon="pi pi-folder"
+              :title="$t('g.empty')"
+              :message="$t('g.noWorkflowsFound')"
+            />
+          </slot>
+        </div>
+      </div>
+      <div v-else class="comfyui-workflows-search-panel">
+        <TreeExplorer
+          v-model:expanded-keys="expandedKeys"
+          :root="renderTreeNode(filteredRoot, WorkflowTreeType.Browse)"
+        >
+          <template #node="{ node }">
+            <WorkflowTreeLeaf :node="node" />
+          </template>
+        </TreeExplorer>
+      </div>
+    </template>
+  </SidebarTabTemplate>
+  <ConfirmDialog />
+</template>
+
+<script setup lang="ts">
+import ConfirmDialog from 'primevue/confirmdialog'
+import { computed, nextTick, onMounted, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
+import SearchBox from '@/components/common/SearchBox.vue'
+import TextDivider from '@/components/common/TextDivider.vue'
+import TreeExplorer from '@/components/common/TreeExplorer.vue'
+import TreeExplorerTreeNode from '@/components/common/TreeExplorerTreeNode.vue'
+import SidebarTabTemplate from '@/components/sidebar/tabs/SidebarTabTemplate.vue'
+import WorkflowTreeLeaf from '@/components/sidebar/tabs/workflows/WorkflowTreeLeaf.vue'
+import Button from '@/components/ui/button/Button.vue'
+import { useTreeExpansion } from '@/composables/useTreeExpansion'
+import { useAppMode } from '@/composables/useAppMode'
+import { useSettingStore } from '@/platform/settings/settingStore'
+import { useWorkflowService } from '@/platform/workflow/core/services/workflowService'
+import {
+  ComfyWorkflow,
+  useWorkflowBookmarkStore,
+  useWorkflowStore
+} from '@/platform/workflow/management/stores/workflowStore'
+import { useWorkspaceStore } from '@/stores/workspaceStore'
+import type { TreeExplorerNode, TreeNode } from '@/types/treeExplorerTypes'
+import {
+  ensureWorkflowSuffix,
+  getFilenameDetails,
+  getWorkflowSuffix
+} from '@/utils/formatUtil'
+import { buildTree, sortedTree } from '@/utils/treeUtil'
+
+const { title, filter, searchSubject, dataTestid, hideLeafIcon } = defineProps<{
+  title: string
+  filter?: (workflow: ComfyWorkflow) => boolean
+  searchSubject: string
+  dataTestid: string
+  hideLeafIcon?: boolean
+}>()
+
+const { t } = useI18n()
+const { isAppMode } = useAppMode()
+
+const applyFilter = (workflows: ComfyWorkflow[]) =>
+  filter ? workflows.filter(filter) : workflows
+
+const settingStore = useSettingStore()
+const workflowTabsPosition = computed(() =>
+  settingStore.get('Comfy.Workflow.WorkflowTabsPosition')
+)
+
+const searchBoxRef = ref()
+
+const searchQuery = ref('')
+const isSearching = computed(() => searchQuery.value.length > 0)
+const filteredWorkflows = ref<ComfyWorkflow[]>([])
+const filteredRoot = computed<TreeNode>(() => {
+  return buildWorkflowTree(filteredWorkflows.value as ComfyWorkflow[])
+})
+const handleSearch = async (query: string) => {
+  if (query.length === 0) {
+    filteredWorkflows.value = []
+    expandedKeys.value = {}
+    return
+  }
+  const lowerQuery = query.toLocaleLowerCase()
+  filteredWorkflows.value = applyFilter(workflowStore.workflows).filter(
+    (workflow) => {
+      return workflow.path.toLocaleLowerCase().includes(lowerQuery)
+    }
+  )
+  await nextTick()
+  expandNode(filteredRoot.value)
+}
+
+const workflowStore = useWorkflowStore()
+const workflowService = useWorkflowService()
+const workspaceStore = useWorkspaceStore()
+const expandedKeys = ref<Record<string, boolean>>({})
+const { expandNode, toggleNodeOnEvent } = useTreeExpansion(expandedKeys)
+const dummyExpandedKeys = ref<Record<string, boolean>>({})
+
+const handleCloseWorkflow = async (workflow?: ComfyWorkflow) => {
+  if (workflow) {
+    await workflowService.closeWorkflow(workflow, {
+      warnIfUnsaved: !workspaceStore.shiftDown
+    })
+  }
+}
+
+enum WorkflowTreeType {
+  Open = 'Open',
+  Bookmarks = 'Bookmarks',
+  Browse = 'Browse'
+}
+
+const buildWorkflowTree = (workflows: ComfyWorkflow[]) => {
+  return buildTree(workflows, (workflow: ComfyWorkflow) =>
+    workflow.key.split('/')
+  )
+}
+
+const filteredPersistedWorkflows = computed(() =>
+  applyFilter(workflowStore.persistedWorkflows)
+)
+const filteredBookmarkedWorkflows = computed(() =>
+  applyFilter(workflowStore.bookmarkedWorkflows)
+)
+
+const workflowsTree = computed(() =>
+  sortedTree(buildWorkflowTree(filteredPersistedWorkflows.value), {
+    groupLeaf: true
+  })
+)
+// Bookmarked workflows tree is flat.
+const bookmarkedWorkflowsTree = computed(() =>
+  buildTree(filteredBookmarkedWorkflows.value, (workflow) => [workflow.key])
+)
+// Open workflows tree is flat.
+const openWorkflowsTree = computed(() =>
+  buildTree(applyFilter(workflowStore.openWorkflows), (workflow) => [
+    workflow.key
+  ])
+)
+
+const renderTreeNode = (
+  node: TreeNode,
+  type: WorkflowTreeType
+): TreeExplorerNode<ComfyWorkflow> => {
+  const children = node.children?.map((child) => renderTreeNode(child, type))
+
+  const workflow: ComfyWorkflow = node.data
+
+  async function handleClick(
+    this: TreeExplorerNode<ComfyWorkflow>,
+    e: MouseEvent
+  ) {
+    if (this.leaf) {
+      await workflowService.openWorkflow(workflow)
+    } else {
+      toggleNodeOnEvent(e, this)
+    }
+  }
+
+  const actions = node.leaf
+    ? {
+        handleClick,
+        async handleRename(newName: string) {
+          const suffix = getWorkflowSuffix(workflow.suffix)
+          const newPath =
+            type === WorkflowTreeType.Browse
+              ? workflow.directory + '/' + ensureWorkflowSuffix(newName, suffix)
+              : ComfyWorkflow.basePath + ensureWorkflowSuffix(newName, suffix)
+
+          await workflowService.renameWorkflow(workflow, newPath)
+        },
+        handleDelete: workflow.isTemporary
+          ? undefined
+          : async function () {
+              await workflowService.deleteWorkflow(workflow)
+            },
+        contextMenuItems() {
+          return [
+            ...(isAppMode.value
+              ? []
+              : [
+                  {
+                    label: t('g.insert'),
+                    icon: 'pi pi-file-export',
+                    command: async () => {
+                      const workflow = node.data
+                      await workflowService.insertWorkflow(workflow)
+                    }
+                  }
+                ]),
+            {
+              label: t('g.duplicate'),
+              icon: 'pi pi-file-export',
+              command: async () => {
+                const workflow = node.data
+                await workflowService.duplicateWorkflow(workflow)
+              }
+            }
+          ]
+        },
+        draggable: true
+      }
+    : { handleClick }
+
+  const label = node.leaf ? getFilenameDetails(node.label).filename : node.label
+
+  return {
+    key: node.key,
+    label,
+    leaf: node.leaf,
+    icon: node.leaf && hideLeafIcon ? 'hidden' : undefined,
+    data: node.data,
+    children,
+    ...actions
+  }
+}
+
+const selectionKeys = computed(() => ({
+  [`root/${workflowStore.activeWorkflow?.key}`]: true
+}))
+
+const workflowBookmarkStore = useWorkflowBookmarkStore()
+onMounted(async () => {
+  searchBoxRef.value?.focus()
+  await workflowBookmarkStore.loadBookmarks()
+})
+</script>
diff --git a/src/components/sidebar/tabs/JobHistorySidebarTab.vue b/src/components/sidebar/tabs/JobHistorySidebarTab.vue
new file mode 100644
index 0000000000..edafc76be4
--- /dev/null
+++ b/src/components/sidebar/tabs/JobHistorySidebarTab.vue
@@ -0,0 +1,212 @@
+<template>
+  <SidebarTabTemplate :title="$t('queue.jobHistory')">
+    <template #alt-title>
+      <div class="ml-auto flex shrink-0 items-center">
+        <JobHistoryActionsMenu @clear-history="showQueueClearHistoryDialog" />
+      </div>
+    </template>
+    <template #header>
+      <div class="flex flex-col gap-2 pb-1">
+        <div class="px-3 py-2">
+          <JobFilterTabs
+            v-model:selected-job-tab="selectedJobTab"
+            :has-failed-jobs="hasFailedJobs"
+          />
+        </div>
+        <JobFilterActions
+          v-model:selected-workflow-filter="selectedWorkflowFilter"
+          v-model:selected-sort-mode="selectedSortMode"
+          v-model:search-query="searchQuery"
+          class="px-3"
+          :hide-show-assets-action="true"
+          :show-search="true"
+          :search-placeholder="t('sideToolbar.queueProgressOverlay.searchJobs')"
+        />
+      </div>
+      <div
+        class="flex items-center justify-between px-3 pb-1 text-xs leading-none text-text-primary"
+      >
+        <span class="text-text-secondary">{{ activeQueueSummary }}</span>
+        <div class="flex items-center gap-2">
+          <span class="text-xs text-base-foreground">
+            {{ t('sideToolbar.queueProgressOverlay.clearQueueTooltip') }}
+          </span>
+          <Button
+            variant="destructive"
+            size="icon"
+            :aria-label="
+              t('sideToolbar.queueProgressOverlay.clearQueueTooltip')
+            "
+            :disabled="queuedCount === 0"
+            @click="clearQueuedWorkflows"
+          >
+            <i class="icon-[lucide--list-x] size-4" />
+          </Button>
+        </div>
+      </div>
+    </template>
+    <template #body>
+      <JobAssetsList
+        :displayed-job-groups="displayedJobGroups"
+        @cancel-item="onCancelItem"
+        @delete-item="onDeleteItem"
+        @view-item="onViewItem"
+        @menu="onMenuItem"
+      />
+      <JobContextMenu
+        ref="jobContextMenuRef"
+        :entries="jobMenuEntries"
+        @action="onJobMenuAction"
+      />
+      <ResultGallery
+        v-model:active-index="galleryActiveIndex"
+        :all-gallery-items="galleryItems"
+      />
+    </template>
+  </SidebarTabTemplate>
+</template>
+
+<script setup lang="ts">
+import { computed, defineAsyncComponent, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import JobFilterActions from '@/components/queue/job/JobFilterActions.vue'
+import JobFilterTabs from '@/components/queue/job/JobFilterTabs.vue'
+import JobAssetsList from '@/components/queue/job/JobAssetsList.vue'
+import JobContextMenu from '@/components/queue/job/JobContextMenu.vue'
+import JobHistoryActionsMenu from '@/components/queue/JobHistoryActionsMenu.vue'
+import type { MenuEntry } from '@/composables/queue/useJobMenu'
+import { useJobMenu } from '@/composables/queue/useJobMenu'
+import { useJobList } from '@/composables/queue/useJobList'
+import type { JobListItem } from '@/composables/queue/useJobList'
+import { useQueueClearHistoryDialog } from '@/composables/queue/useQueueClearHistoryDialog'
+import { useResultGallery } from '@/composables/queue/useResultGallery'
+import { useErrorHandling } from '@/composables/useErrorHandling'
+import SidebarTabTemplate from '@/components/sidebar/tabs/SidebarTabTemplate.vue'
+import ResultGallery from '@/components/sidebar/tabs/queue/ResultGallery.vue'
+import Button from '@/components/ui/button/Button.vue'
+import { useCommandStore } from '@/stores/commandStore'
+import { useDialogStore } from '@/stores/dialogStore'
+import { useExecutionStore } from '@/stores/executionStore'
+import { useQueueStore } from '@/stores/queueStore'
+
+const Load3dViewerContent = defineAsyncComponent(
+  () => import('@/components/load3d/Load3dViewerContent.vue')
+)
+
+const { t, n } = useI18n()
+const commandStore = useCommandStore()
+const dialogStore = useDialogStore()
+const executionStore = useExecutionStore()
+const queueStore = useQueueStore()
+const { showQueueClearHistoryDialog } = useQueueClearHistoryDialog()
+const { wrapWithErrorHandlingAsync } = useErrorHandling()
+const {
+  selectedJobTab,
+  selectedWorkflowFilter,
+  selectedSortMode,
+  searchQuery,
+  hasFailedJobs,
+  filteredTasks,
+  groupedJobItems
+} = useJobList()
+
+const displayedJobGroups = computed(() => groupedJobItems.value)
+const runningCount = computed(() => queueStore.runningTasks.length)
+const queuedCount = computed(() => queueStore.pendingTasks.length)
+
+const runningJobsLabel = computed(() =>
+  t('sideToolbar.queueProgressOverlay.runningJobsLabel', {
+    count: n(runningCount.value)
+  })
+)
+const queuedJobsLabel = computed(() =>
+  t('sideToolbar.queueProgressOverlay.queuedJobsLabel', {
+    count: n(queuedCount.value)
+  })
+)
+const activeQueueSummary = computed(() => {
+  if (runningCount.value === 0 && queuedCount.value === 0) {
+    return t('sideToolbar.queueProgressOverlay.noActiveJobs')
+  }
+  if (queuedCount.value === 0) {
+    return runningJobsLabel.value
+  }
+  if (runningCount.value === 0) {
+    return queuedJobsLabel.value
+  }
+  return t('sideToolbar.queueProgressOverlay.runningQueuedSummary', {
+    running: runningJobsLabel.value,
+    queued: queuedJobsLabel.value
+  })
+})
+
+const clearQueuedWorkflows = wrapWithErrorHandlingAsync(async () => {
+  const pendingJobIds = queueStore.pendingTasks
+    .map((task) => task.jobId)
+    .filter((id): id is string => typeof id === 'string' && id.length > 0)
+
+  await commandStore.execute('Comfy.ClearPendingTasks')
+  executionStore.clearInitializationByJobIds(pendingJobIds)
+})
+
+const {
+  galleryActiveIndex,
+  galleryItems,
+  onViewItem: openResultGallery
+} = useResultGallery(() => filteredTasks.value)
+
+const onViewItem = wrapWithErrorHandlingAsync(async (item: JobListItem) => {
+  const previewOutput = item.taskRef?.previewOutput
+
+  if (previewOutput?.is3D) {
+    dialogStore.showDialog({
+      key: 'asset-3d-viewer',
+      title: item.title,
+      component: Load3dViewerContent,
+      props: {
+        modelUrl: previewOutput.url || ''
+      },
+      dialogComponentProps: {
+        style: 'width: 80vw; height: 80vh;',
+        maximizable: true
+      }
+    })
+    return
+  }
+
+  await openResultGallery(item)
+})
+
+const onInspectAsset = (item: JobListItem) => {
+  void onViewItem(item)
+}
+
+const currentMenuItem = ref<JobListItem | null>(null)
+const jobContextMenuRef = ref<InstanceType<typeof JobContextMenu> | null>(null)
+
+const { jobMenuEntries, cancelJob } = useJobMenu(
+  () => currentMenuItem.value,
+  onInspectAsset
+)
+
+const onCancelItem = wrapWithErrorHandlingAsync(async (item: JobListItem) => {
+  await cancelJob(item)
+})
+
+const onDeleteItem = wrapWithErrorHandlingAsync(async (item: JobListItem) => {
+  if (!item.taskRef) return
+  await queueStore.delete(item.taskRef)
+})
+
+const onMenuItem = (item: JobListItem, event: Event) => {
+  currentMenuItem.value = item
+  jobContextMenuRef.value?.open(event)
+}
+
+const onJobMenuAction = wrapWithErrorHandlingAsync(async (entry: MenuEntry) => {
+  if (entry.kind === 'divider') return
+  if (entry.onClick) await entry.onClick()
+  jobContextMenuRef.value?.hide()
+})
+</script>
diff --git a/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue b/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue
index 2186552314..8b15fa2b35 100644
--- a/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue
+++ b/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue
@@ -25,13 +25,17 @@
         <SearchBox
           ref="searchBoxRef"
           v-model:model-value="searchQuery"
-          :placeholder="$t('g.searchModels') + '...'"
+          :placeholder="
+            $t('g.searchPlaceholder', {
+              subject: $t('sideToolbar.labels.models')
+            })
+          "
           @search="handleSearch"
         />
       </div>
     </template>
     <template #body>
-      <ElectronDownloadItems v-if="isElectron()" />
+      <ElectronDownloadItems v-if="isDesktop" />
 
       <Divider type="dashed" class="m-2" />
       <TreeExplorer
@@ -65,7 +69,7 @@ import type { ComfyModelDef, ModelFolder } from '@/stores/modelStore'
 import { ResourceState, useModelStore } from '@/stores/modelStore'
 import { useModelToNodeStore } from '@/stores/modelToNodeStore'
 import type { TreeExplorerNode, TreeNode } from '@/types/treeExplorerTypes'
-import { isElectron } from '@/utils/envUtil'
+import { isDesktop } from '@/platform/distribution/types'
 import { buildTree } from '@/utils/treeUtil'
 
 const modelStore = useModelStore()
diff --git a/src/components/sidebar/tabs/NodeLibrarySidebarTab.vue b/src/components/sidebar/tabs/NodeLibrarySidebarTab.vue
index 2240a60b1a..061f92a2cb 100644
--- a/src/components/sidebar/tabs/NodeLibrarySidebarTab.vue
+++ b/src/components/sidebar/tabs/NodeLibrarySidebarTab.vue
@@ -89,8 +89,9 @@
           <SearchBox
             ref="searchBoxRef"
             v-model:model-value="searchQuery"
+            data-testid="node-library-search"
             class="node-lib-search-box"
-            :placeholder="$t('g.searchNodes') + '...'"
+            :placeholder="$t('g.searchPlaceholder', { subject: $t('g.nodes') })"
             filter-icon="pi pi-filter"
             :filters
             @search="handleSearch"
@@ -117,9 +118,13 @@
           />
           <TreeExplorer
             v-model:expanded-keys="expandedKeys"
+            data-testid="node-library-tree"
             class="node-lib-tree-explorer"
             :root="renderedRoot"
           >
+            <template #folder="{ node }">
+              <NodeTreeFolder :node="node" />
+            </template>
             <template #node="{ node }">
               <NodeTreeLeaf :node="node" :open-node-help="openHelp" />
             </template>
@@ -139,8 +144,17 @@ import { storeToRefs } from 'pinia'
 import Divider from 'primevue/divider'
 import Popover from 'primevue/popover'
 import type { Ref } from 'vue'
-import { computed, h, nextTick, onMounted, ref, render } from 'vue'
+import {
+  computed,
+  getCurrentInstance,
+  h,
+  nextTick,
+  onMounted,
+  ref,
+  render
+} from 'vue'
 
+import { resolveEssentialsDisplayName } from '@/constants/essentialsDisplayNames'
 import SearchBox from '@/components/common/SearchBox.vue'
 import type { SearchFilter } from '@/components/common/SearchFilterChip.vue'
 import TreeExplorer from '@/components/common/TreeExplorer.vue'
@@ -148,6 +162,7 @@ import NodePreview from '@/components/node/NodePreview.vue'
 import NodeSearchFilter from '@/components/searchbox/NodeSearchFilter.vue'
 import SidebarTabTemplate from '@/components/sidebar/tabs/SidebarTabTemplate.vue'
 import NodeHelpPage from '@/components/sidebar/tabs/nodeLibrary/NodeHelpPage.vue'
+import NodeTreeFolder from '@/components/sidebar/tabs/nodeLibrary/NodeTreeFolder.vue'
 import NodeTreeLeaf from '@/components/sidebar/tabs/nodeLibrary/NodeTreeLeaf.vue'
 import Button from '@/components/ui/button/Button.vue'
 import { useTreeExpansion } from '@/composables/useTreeExpansion'
@@ -171,6 +186,8 @@ import type { FuseFilterWithValue } from '@/utils/fuseUtil'
 
 import NodeBookmarkTreeExplorer from './nodeLibrary/NodeBookmarkTreeExplorer.vue'
 
+const instance = getCurrentInstance()!
+const appContext = instance.appContext
 const nodeDefStore = useNodeDefStore()
 const nodeBookmarkStore = useNodeBookmarkStore()
 const nodeHelpStore = useNodeHelpStore()
@@ -260,7 +277,9 @@ const renderedRoot = computed<TreeExplorerNode<ComfyNodeDefImpl>>(() => {
 
     return {
       key: node.key,
-      label: node.leaf ? node.data.display_name : node.label,
+      label: node.leaf
+        ? (resolveEssentialsDisplayName(node.data) ?? node.data.display_name)
+        : node.label,
       leaf: node.leaf,
       data: node.data,
       getIcon() {
@@ -272,6 +291,7 @@ const renderedRoot = computed<TreeExplorerNode<ComfyNodeDefImpl>>(() => {
       draggable: node.leaf,
       renderDragPreview(container) {
         const vnode = h(NodePreview, { nodeDef: node.data })
+        vnode.appContext = appContext
         render(vnode, container)
         return () => {
           render(null, container)
diff --git a/src/components/sidebar/tabs/NodeLibrarySidebarTabV2.test.ts b/src/components/sidebar/tabs/NodeLibrarySidebarTabV2.test.ts
new file mode 100644
index 0000000000..e687abe6db
--- /dev/null
+++ b/src/components/sidebar/tabs/NodeLibrarySidebarTabV2.test.ts
@@ -0,0 +1,134 @@
+import { mount } from '@vue/test-utils'
+import { createTestingPinia } from '@pinia/testing'
+import { TabsContent, TabsList, TabsRoot, TabsTrigger } from 'reka-ui'
+import { ref } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+import NodeLibrarySidebarTabV2 from './NodeLibrarySidebarTabV2.vue'
+
+vi.mock('@vueuse/core', async () => {
+  const actual = await vi.importActual('@vueuse/core')
+  return {
+    ...actual,
+    useLocalStorage: vi.fn((_key: string, defaultValue: unknown) =>
+      ref(defaultValue)
+    )
+  }
+})
+
+vi.mock('@/composables/node/useNodeDragToCanvas', () => ({
+  useNodeDragToCanvas: () => ({
+    isDragging: { value: false },
+    draggedNode: { value: null },
+    cursorPosition: { value: { x: 0, y: 0 } },
+    startDrag: vi.fn(),
+    cancelDrag: vi.fn(),
+    setupGlobalListeners: vi.fn(),
+    cleanupGlobalListeners: vi.fn()
+  })
+}))
+
+vi.mock('@/services/nodeOrganizationService', () => ({
+  DEFAULT_TAB_ID: 'essentials',
+  DEFAULT_SORTING_ID: 'alphabetical',
+  nodeOrganizationService: {
+    organizeNodesByTab: vi.fn(() => []),
+    getSortingStrategies: vi.fn(() => [])
+  }
+}))
+
+vi.mock('./nodeLibrary/AllNodesPanel.vue', () => ({
+  default: {
+    name: 'AllNodesPanel',
+    template: '<div data-testid="all-panel"><slot /></div>',
+    props: ['sections', 'expandedKeys', 'fillNodeInfo']
+  }
+}))
+
+vi.mock('./nodeLibrary/BlueprintsPanel.vue', () => ({
+  default: {
+    name: 'BlueprintsPanel',
+    template: '<div data-testid="blueprints-panel"><slot /></div>',
+    props: ['sections', 'expandedKeys']
+  }
+}))
+
+vi.mock('./nodeLibrary/EssentialNodesPanel.vue', () => ({
+  default: {
+    name: 'EssentialNodesPanel',
+    template: '<div data-testid="essential-panel"><slot /></div>',
+    props: ['root', 'expandedKeys', 'flatNodes']
+  }
+}))
+
+vi.mock('./nodeLibrary/NodeDragPreview.vue', () => ({
+  default: {
+    name: 'NodeDragPreview',
+    template: '<div />'
+  }
+}))
+
+vi.mock('@/components/common/SearchBoxV2.vue', () => ({
+  default: {
+    name: 'SearchBox',
+    template: '<input data-testid="search-box" />',
+    props: ['modelValue', 'placeholder'],
+    setup() {
+      return { focus: vi.fn() }
+    },
+    expose: ['focus']
+  }
+}))
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: { en: {} }
+})
+
+describe('NodeLibrarySidebarTabV2', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  function mountComponent() {
+    return mount(NodeLibrarySidebarTabV2, {
+      global: {
+        plugins: [createTestingPinia({ stubActions: false }), i18n],
+        components: {
+          TabsRoot,
+          TabsList,
+          TabsTrigger,
+          TabsContent
+        },
+        stubs: {
+          teleport: true
+        }
+      }
+    })
+  }
+
+  it('should render with tabs', () => {
+    const wrapper = mountComponent()
+
+    const triggers = wrapper.findAllComponents(TabsTrigger)
+    expect(triggers).toHaveLength(3)
+  })
+
+  it('should render search box', () => {
+    const wrapper = mountComponent()
+
+    expect(wrapper.find('[data-testid="search-box"]').exists()).toBe(true)
+  })
+
+  it('should render only the selected panel', () => {
+    const wrapper = mountComponent()
+
+    expect(wrapper.find('[data-testid="essential-panel"]').exists()).toBe(true)
+    expect(wrapper.find('[data-testid="all-panel"]').exists()).toBe(false)
+    expect(wrapper.find('[data-testid="blueprints-panel"]').exists()).toBe(
+      false
+    )
+  })
+})
diff --git a/src/components/sidebar/tabs/NodeLibrarySidebarTabV2.vue b/src/components/sidebar/tabs/NodeLibrarySidebarTabV2.vue
new file mode 100644
index 0000000000..eda0354c2d
--- /dev/null
+++ b/src/components/sidebar/tabs/NodeLibrarySidebarTabV2.vue
@@ -0,0 +1,480 @@
+<template>
+  <SidebarTabTemplate :title="$t('sideToolbar.nodes')">
+    <template #header>
+      <TabsRoot v-model="selectedTab" class="flex flex-col">
+        <div class="flex items-center justify-between gap-2 px-2 pb-2 2xl:px-4">
+          <SearchBox
+            ref="searchBoxRef"
+            v-model="searchQuery"
+            :placeholder="$t('g.search') + '...'"
+            @search="handleSearch"
+          />
+          <DropdownMenuRoot>
+            <DropdownMenuTrigger as-child>
+              <button
+                :aria-label="$t('g.sort')"
+                class="hover:bg-comfy-input-hover flex size-10 shrink-0 cursor-pointer items-center justify-center rounded-lg border-none bg-comfy-input"
+              >
+                <i class="icon-[lucide--arrow-up-down] size-4" />
+              </button>
+            </DropdownMenuTrigger>
+            <DropdownMenuPortal>
+              <DropdownMenuContent
+                class="z-9999 min-w-32 rounded-lg border border-border-default bg-comfy-menu-bg p-1 shadow-lg"
+                align="end"
+                :side-offset="4"
+              >
+                <DropdownMenuRadioGroup v-model="sortOrder">
+                  <DropdownMenuRadioItem
+                    v-for="option in sortingOptions"
+                    :key="option.id"
+                    :value="option.id"
+                    class="flex cursor-pointer items-center gap-2 rounded-md px-2 py-1.5 text-sm outline-none hover:bg-comfy-input"
+                  >
+                    <span class="flex-1">{{ $t(option.label) }}</span>
+                    <DropdownMenuItemIndicator class="w-4">
+                      <i class="icon-[lucide--check] size-4" />
+                    </DropdownMenuItemIndicator>
+                  </DropdownMenuRadioItem>
+                </DropdownMenuRadioGroup>
+              </DropdownMenuContent>
+            </DropdownMenuPortal>
+          </DropdownMenuRoot>
+          <DropdownMenuRoot v-if="selectedTab === 'all'">
+            <DropdownMenuTrigger as-child>
+              <button
+                :aria-label="$t('sideToolbar.nodeLibraryTab.filter')"
+                class="hover:bg-comfy-input-hover flex size-10 shrink-0 cursor-pointer items-center justify-center rounded-lg border-none bg-comfy-input"
+              >
+                <i class="icon-[lucide--list-filter] size-4" />
+              </button>
+            </DropdownMenuTrigger>
+            <DropdownMenuPortal>
+              <DropdownMenuContent
+                class="z-9999 min-w-32 rounded-lg border border-border-default bg-comfy-menu-bg p-1 shadow-lg"
+                align="end"
+                :side-offset="4"
+              >
+                <DropdownMenuCheckboxItem
+                  v-model="filterOptions.blueprints"
+                  class="flex cursor-pointer items-center gap-2 rounded-md px-2 py-1.5 text-sm outline-none hover:bg-comfy-input"
+                >
+                  <span class="flex-1">{{
+                    $t('sideToolbar.nodeLibraryTab.filterOptions.blueprints')
+                  }}</span>
+                  <DropdownMenuItemIndicator class="w-4">
+                    <i class="icon-[lucide--check] size-4" />
+                  </DropdownMenuItemIndicator>
+                </DropdownMenuCheckboxItem>
+                <DropdownMenuCheckboxItem
+                  v-model="filterOptions.partnerNodes"
+                  class="flex cursor-pointer items-center gap-2 rounded-md px-2 py-1.5 text-sm outline-none hover:bg-comfy-input"
+                >
+                  <span class="flex-1">{{
+                    $t('sideToolbar.nodeLibraryTab.filterOptions.partnerNodes')
+                  }}</span>
+                  <DropdownMenuItemIndicator class="w-4">
+                    <i class="icon-[lucide--check] size-4" />
+                  </DropdownMenuItemIndicator>
+                </DropdownMenuCheckboxItem>
+                <DropdownMenuCheckboxItem
+                  v-model="filterOptions.comfyNodes"
+                  class="flex cursor-pointer items-center gap-2 rounded-md px-2 py-1.5 text-sm outline-none hover:bg-comfy-input"
+                >
+                  <span class="flex-1">{{
+                    $t('sideToolbar.nodeLibraryTab.filterOptions.comfyNodes')
+                  }}</span>
+                  <DropdownMenuItemIndicator class="w-4">
+                    <i class="icon-[lucide--check] size-4" />
+                  </DropdownMenuItemIndicator>
+                </DropdownMenuCheckboxItem>
+                <DropdownMenuCheckboxItem
+                  v-model="filterOptions.extensions"
+                  class="flex cursor-pointer items-center gap-2 rounded-md px-2 py-1.5 text-sm outline-none hover:bg-comfy-input"
+                >
+                  <span class="flex-1">{{
+                    $t('sideToolbar.nodeLibraryTab.filterOptions.extensions')
+                  }}</span>
+                  <DropdownMenuItemIndicator class="w-4">
+                    <i class="icon-[lucide--check] size-4" />
+                  </DropdownMenuItemIndicator>
+                </DropdownMenuCheckboxItem>
+              </DropdownMenuContent>
+            </DropdownMenuPortal>
+          </DropdownMenuRoot>
+        </div>
+        <Separator decorative class="border border-dashed border-comfy-input" />
+        <!-- Tab list in header (fixed) -->
+        <TabsList
+          class="bg-background flex gap-4 border-b border-comfy-input p-4"
+        >
+          <TabsTrigger
+            v-for="tab in tabs"
+            :key="tab.value"
+            :value="tab.value"
+            :class="
+              cn(
+                'cursor-pointer rounded-lg border-none px-3 py-2 outline-none select-none',
+                'text-foreground text-sm transition-colors',
+                selectedTab === tab.value
+                  ? 'bg-comfy-input font-bold'
+                  : 'bg-transparent font-normal'
+              )
+            "
+          >
+            {{ tab.label }}
+          </TabsTrigger>
+        </TabsList>
+      </TabsRoot>
+    </template>
+    <template #body>
+      <NodeDragPreview />
+      <!-- Tab content (scrollable) -->
+      <TabsRoot v-model="selectedTab" class="h-full">
+        <EssentialNodesPanel
+          v-if="
+            flags.nodeLibraryEssentialsEnabled && selectedTab === 'essentials'
+          "
+          v-model:expanded-keys="expandedKeys"
+          :root="renderedEssentialRoot"
+          :flat-nodes="essentialFlatNodes"
+          @node-click="handleNodeClick"
+        />
+        <AllNodesPanel
+          v-if="selectedTab === 'all'"
+          v-model:expanded-keys="expandedKeys"
+          :sections="renderedSections"
+          :fill-node-info="fillNodeInfo"
+          :sort-order="sortOrder"
+          @node-click="handleNodeClick"
+        />
+        <BlueprintsPanel
+          v-if="selectedTab === 'blueprints'"
+          v-model:expanded-keys="expandedKeys"
+          :sections="renderedBlueprintsSections"
+          @node-click="handleNodeClick"
+        />
+      </TabsRoot>
+    </template>
+  </SidebarTabTemplate>
+</template>
+
+<script setup lang="ts">
+import { cn } from '@/utils/tailwindUtil'
+import { useLocalStorage } from '@vueuse/core'
+import {
+  DropdownMenuCheckboxItem,
+  DropdownMenuContent,
+  DropdownMenuItemIndicator,
+  DropdownMenuPortal,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuRoot,
+  DropdownMenuTrigger,
+  Separator,
+  TabsList,
+  TabsRoot,
+  TabsTrigger
+} from 'reka-ui'
+import { computed, nextTick, onMounted, ref, watchEffect } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import { resolveEssentialsDisplayName } from '@/constants/essentialsDisplayNames'
+import SearchBox from '@/components/common/SearchBoxV2.vue'
+import { useFeatureFlags } from '@/composables/useFeatureFlags'
+import { useNodeDragToCanvas } from '@/composables/node/useNodeDragToCanvas'
+import { usePerTabState } from '@/composables/usePerTabState'
+import {
+  DEFAULT_SORTING_ID,
+  DEFAULT_TAB_ID,
+  nodeOrganizationService
+} from '@/services/nodeOrganizationService'
+import { getProviderIcon } from '@/utils/categoryUtil'
+import { flattenTree, sortedTree, unwrapTreeRoot } from '@/utils/treeUtil'
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+import { buildNodeDefTree, useNodeDefStore } from '@/stores/nodeDefStore'
+import type {
+  NodeCategoryId,
+  NodeSection,
+  SortingStrategyId,
+  TabId
+} from '@/types/nodeOrganizationTypes'
+import type {
+  NodeLibrarySection,
+  RenderedTreeExplorerNode,
+  TreeNode
+} from '@/types/treeExplorerTypes'
+
+import AllNodesPanel from './nodeLibrary/AllNodesPanel.vue'
+import BlueprintsPanel from './nodeLibrary/BlueprintsPanel.vue'
+import EssentialNodesPanel from './nodeLibrary/EssentialNodesPanel.vue'
+import NodeDragPreview from './nodeLibrary/NodeDragPreview.vue'
+import SidebarTabTemplate from './SidebarTabTemplate.vue'
+
+const { flags } = useFeatureFlags()
+
+const selectedTab = useLocalStorage<TabId>(
+  'Comfy.NodeLibrary.Tab',
+  DEFAULT_TAB_ID
+)
+
+watchEffect(() => {
+  if (
+    !flags.nodeLibraryEssentialsEnabled &&
+    selectedTab.value === 'essentials'
+  ) {
+    selectedTab.value = DEFAULT_TAB_ID
+  }
+})
+
+const sortOrderByTab = useLocalStorage<Record<TabId, SortingStrategyId>>(
+  'Comfy.NodeLibrary.SortByTab',
+  {
+    essentials: DEFAULT_SORTING_ID,
+    all: DEFAULT_SORTING_ID,
+    blueprints: 'alphabetical'
+  }
+)
+const sortOrder = usePerTabState(selectedTab, sortOrderByTab)
+
+const sortingOptions = computed(() =>
+  nodeOrganizationService.getSortingStrategies().map((strategy) => ({
+    id: strategy.id,
+    label: strategy.label
+  }))
+)
+
+const filterOptions = ref<Record<NodeCategoryId, boolean>>({
+  blueprints: true,
+  partnerNodes: true,
+  comfyNodes: true,
+  extensions: true
+})
+
+const { t } = useI18n()
+
+const searchBoxRef = ref<InstanceType<typeof SearchBox> | null>(null)
+const searchQuery = ref('')
+const expandedKeysByTab = ref<Record<TabId, string[]>>({
+  essentials: [],
+  all: [],
+  blueprints: []
+})
+const expandedKeys = usePerTabState(selectedTab, expandedKeysByTab)
+
+const nodeDefStore = useNodeDefStore()
+const { startDrag } = useNodeDragToCanvas()
+
+const filteredNodeDefs = computed(() => {
+  if (searchQuery.value.length === 0) {
+    return []
+  }
+  return nodeDefStore.nodeSearchService.searchNode(
+    searchQuery.value,
+    [],
+    { limit: 64 },
+    { matchWildcards: false }
+  )
+})
+
+const activeNodes = computed(() =>
+  filteredNodeDefs.value.length > 0
+    ? filteredNodeDefs.value
+    : nodeDefStore.visibleNodeDefs
+)
+
+const sections = computed(() => {
+  if (selectedTab.value !== 'all') return []
+  return nodeOrganizationService.organizeNodesByTab(activeNodes.value, 'all')
+})
+
+function getFolderIcon(node: TreeNode): string {
+  const firstLeaf = findFirstLeaf(node)
+  if (
+    firstLeaf?.data?.api_node &&
+    firstLeaf.key?.replace(`${node.key}/`, '') === firstLeaf.label
+  ) {
+    return getProviderIcon(node.label ?? '')
+  }
+  return 'icon-[lucide--folder]'
+}
+
+function findFirstLeaf(node: TreeNode): TreeNode | undefined {
+  if (node.leaf) return node
+  for (const child of node.children ?? []) {
+    const leaf = findFirstLeaf(child)
+    if (leaf) return leaf
+  }
+  return undefined
+}
+
+function fillNodeInfo(
+  node: TreeNode,
+  { useEssentialsLabels = false }: { useEssentialsLabels?: boolean } = {}
+): RenderedTreeExplorerNode<ComfyNodeDefImpl> {
+  const children = node.children?.map((child) =>
+    fillNodeInfo(child, { useEssentialsLabels })
+  )
+  const totalLeaves = node.leaf
+    ? 1
+    : (children?.reduce((acc, child) => acc + child.totalLeaves, 0) ?? 0)
+
+  return {
+    key: node.key,
+    label: node.leaf
+      ? useEssentialsLabels
+        ? (resolveEssentialsDisplayName(node.data) ?? node.data?.display_name)
+        : node.data?.display_name
+      : node.label,
+    leaf: node.leaf,
+    data: node.data,
+    icon: node.leaf ? 'icon-[comfy--node]' : getFolderIcon(node),
+    type: node.leaf ? 'node' : 'folder',
+    totalLeaves,
+    children
+  }
+}
+
+function applySorting(tree: TreeNode): TreeNode {
+  if (sortOrder.value === 'alphabetical') {
+    return sortedTree(tree, { groupLeaf: true })
+  }
+  return tree
+}
+
+function renderSections(
+  nodeSections: NodeSection[],
+  filter?: (section: NodeSection) => boolean
+): NodeLibrarySection<ComfyNodeDefImpl>[] {
+  const filtered = filter ? nodeSections.filter(filter) : nodeSections
+
+  if (sortOrder.value === 'alphabetical') {
+    const allNodes = filtered.flatMap((section) =>
+      flattenTree<ComfyNodeDefImpl>(section.tree)
+    )
+    const mergedTree = unwrapTreeRoot(buildNodeDefTree(allNodes))
+    return [{ root: fillNodeInfo(applySorting(mergedTree)) }]
+  }
+
+  return filtered.map((section) => ({
+    category: section.category,
+    title: section.title,
+    root: fillNodeInfo(applySorting(section.tree))
+  }))
+}
+
+const renderedSections = computed(() =>
+  renderSections(
+    sections.value,
+    (section) => !section.category || filterOptions.value[section.category]
+  )
+)
+
+const essentialSections = computed(() => {
+  if (selectedTab.value !== 'essentials') return []
+  return nodeOrganizationService.organizeNodesByTab(
+    activeNodes.value,
+    'essentials'
+  )
+})
+
+const renderedEssentialRoot = computed(() => {
+  const section = essentialSections.value[0]
+  return section
+    ? fillNodeInfo(applySorting(section.tree), { useEssentialsLabels: true })
+    : fillNodeInfo({ key: 'root', label: '', children: [] })
+})
+
+function flattenRenderedLeaves(
+  node: RenderedTreeExplorerNode<ComfyNodeDefImpl>
+): RenderedTreeExplorerNode<ComfyNodeDefImpl>[] {
+  if (node.type === 'node') return [node]
+  return node.children?.flatMap(flattenRenderedLeaves) ?? []
+}
+
+const essentialFlatNodes = computed(() => {
+  if (sortOrder.value !== 'alphabetical') return []
+  return flattenRenderedLeaves(renderedEssentialRoot.value).sort((a, b) =>
+    (a.label ?? '').localeCompare(b.label ?? '')
+  )
+})
+
+const blueprintsSections = computed(() => {
+  if (selectedTab.value !== 'blueprints') return []
+  return nodeOrganizationService.organizeNodesByTab(
+    activeNodes.value,
+    'blueprints'
+  )
+})
+
+const renderedBlueprintsSections = computed(() =>
+  renderSections(blueprintsSections.value)
+)
+
+function collectFolderKeys(node: TreeNode): string[] {
+  if (node.leaf) return []
+  const keys = [node.key]
+  for (const child of node.children ?? []) {
+    keys.push(...collectFolderKeys(child))
+  }
+  return keys
+}
+
+function handleNodeClick(node: RenderedTreeExplorerNode<ComfyNodeDefImpl>) {
+  if (node.type === 'node' && node.data) {
+    startDrag(node.data)
+  }
+  if (node.type === 'folder') {
+    const index = expandedKeys.value.indexOf(node.key)
+    if (index === -1) {
+      expandedKeys.value = [...expandedKeys.value, node.key]
+    } else {
+      expandedKeys.value = expandedKeys.value.filter((k) => k !== node.key)
+    }
+  }
+}
+
+async function handleSearch() {
+  await nextTick()
+
+  if (filteredNodeDefs.value.length === 0) {
+    expandedKeys.value = []
+    return
+  }
+
+  const allKeys: string[] = []
+  if (selectedTab.value === 'essentials') {
+    for (const section of essentialSections.value) {
+      allKeys.push(...collectFolderKeys(section.tree))
+    }
+  } else if (selectedTab.value === 'blueprints') {
+    for (const section of blueprintsSections.value) {
+      allKeys.push(...collectFolderKeys(section.tree))
+    }
+  } else {
+    for (const section of sections.value) {
+      allKeys.push(...collectFolderKeys(section.tree))
+    }
+  }
+  expandedKeys.value = allKeys
+}
+
+const tabs = computed(() => {
+  const allTabs: Array<{ value: TabId; label: string }> = [
+    { value: 'all', label: t('sideToolbar.nodeLibraryTab.allNodes') },
+    {
+      value: 'essentials' as TabId,
+      label: t('sideToolbar.nodeLibraryTab.essentials')
+    },
+    {
+      value: 'blueprints',
+      label: t('sideToolbar.nodeLibraryTab.blueprints')
+    }
+  ]
+  return flags.nodeLibraryEssentialsEnabled ? allTabs : [allTabs[0], allTabs[2]]
+})
+
+onMounted(() => {
+  searchBoxRef.value?.focus()
+})
+</script>
diff --git a/src/components/sidebar/tabs/SidebarTabTemplate.vue b/src/components/sidebar/tabs/SidebarTabTemplate.vue
index aa99456539..37d6beb044 100644
--- a/src/components/sidebar/tabs/SidebarTabTemplate.vue
+++ b/src/components/sidebar/tabs/SidebarTabTemplate.vue
@@ -1,11 +1,16 @@
 <template>
   <div
-    class="comfy-vue-side-bar-container group/sidebar-tab flex h-full flex-col"
-    :class="props.class"
+    :class="
+      cn(
+        'comfy-vue-side-bar-container group/sidebar-tab flex size-full flex-col',
+        props.class
+      )
+    "
   >
     <div class="comfy-vue-side-bar-header flex flex-col gap-2">
       <Toolbar
-        class="min-h-16 bg-transparent rounded-none border-x-0 border-t-0 px-2 2xl:px-4"
+        class="min-h-16 rounded-none border-x-0 border-t-0 bg-transparent px-2 2xl:px-4"
+        :pt="sidebarPt"
       >
         <template #start>
           <span class="truncate font-bold" :title="props.title">
@@ -15,7 +20,7 @@
         </template>
         <template #end>
           <div
-            class="touch:w-auto touch:opacity-100 flex flex-row overflow-hidden transition-all duration-200 motion-safe:w-0 motion-safe:opacity-0 motion-safe:group-focus-within/sidebar-tab:w-auto motion-safe:group-focus-within/sidebar-tab:opacity-100 motion-safe:group-hover/sidebar-tab:w-auto motion-safe:group-hover/sidebar-tab:opacity-100"
+            class="flex flex-row overflow-hidden transition-all duration-200 motion-safe:w-0 motion-safe:opacity-0 motion-safe:group-focus-within/sidebar-tab:w-auto motion-safe:group-focus-within/sidebar-tab:opacity-100 motion-safe:group-hover/sidebar-tab:w-auto motion-safe:group-hover/sidebar-tab:opacity-100 touch:w-auto touch:opacity-100 [&_.p-button]:py-1 2xl:[&_.p-button]:py-2"
           >
             <slot name="tool-buttons" />
           </div>
@@ -35,20 +40,13 @@
 import ScrollPanel from 'primevue/scrollpanel'
 import Toolbar from 'primevue/toolbar'
 
+import { cn } from '@/utils/tailwindUtil'
+
 const props = defineProps<{
   title: string
   class?: string
 }>()
+const sidebarPt = {
+  start: 'min-w-0 flex-1 overflow-hidden'
+}
 </script>
-
-<style scoped>
-@reference '../../../assets/css/style.css';
-
-:deep(.p-toolbar-end) .p-button {
-  @apply py-1 2xl:py-2;
-}
-
-:deep(.p-toolbar-start) {
-  @apply min-w-0 flex-1 overflow-hidden;
-}
-</style>
diff --git a/src/components/sidebar/tabs/WorkflowsSidebarTab.vue b/src/components/sidebar/tabs/WorkflowsSidebarTab.vue
index 64b5701ec5..6aae24051b 100644
--- a/src/components/sidebar/tabs/WorkflowsSidebarTab.vue
+++ b/src/components/sidebar/tabs/WorkflowsSidebarTab.vue
@@ -1,309 +1,11 @@
 <template>
-  <SidebarTabTemplate
+  <BaseWorkflowsSidebarTab
     :title="$t('sideToolbar.workflows')"
-    class="workflows-sidebar-tab"
-  >
-    <template #tool-buttons>
-      <Button
-        v-tooltip.bottom="$t('g.refresh')"
-        variant="muted-textonly"
-        size="icon"
-        :aria-label="$t('g.refresh')"
-        @click="workflowStore.syncWorkflows()"
-      >
-        <i class="icon-[lucide--refresh-cw] size-4" />
-      </Button>
-    </template>
-    <template #header>
-      <div class="px-2 2xl:px-4">
-        <SearchBox
-          ref="searchBoxRef"
-          v-model:model-value="searchQuery"
-          class="workflows-search-box"
-          :placeholder="$t('g.searchWorkflows') + '...'"
-          @search="handleSearch"
-        />
-      </div>
-    </template>
-    <template #body>
-      <div v-if="!isSearching" class="comfyui-workflows-panel">
-        <div
-          v-if="workflowTabsPosition === 'Sidebar'"
-          class="comfyui-workflows-open"
-        >
-          <TextDivider
-            :text="t('sideToolbar.workflowTab.workflowTreeType.open')"
-            type="dashed"
-            class="ml-2"
-          />
-          <TreeExplorer
-            v-model:expanded-keys="dummyExpandedKeys"
-            :root="renderTreeNode(openWorkflowsTree, WorkflowTreeType.Open)"
-            :selection-keys="selectionKeys"
-          >
-            <template #node="{ node }">
-              <TreeExplorerTreeNode :node="node">
-                <template #before-label="{ node: treeNode }">
-                  <span
-                    v-if="
-                      treeNode.data?.isModified || !treeNode.data?.isPersisted
-                    "
-                    >*</span
-                  >
-                </template>
-                <template #actions="{ node: treeNode }">
-                  <Button
-                    class="close-workflow-button"
-                    :variant="
-                      workspaceStore.shiftDown ? 'destructive' : 'textonly'
-                    "
-                    size="icon-sm"
-                    :aria-label="$t('g.close')"
-                    @click.stop="
-                      handleCloseWorkflow(treeNode.data as ComfyWorkflow)
-                    "
-                  >
-                    <i class="icon-[lucide--x] size-3" />
-                  </Button>
-                </template>
-              </TreeExplorerTreeNode>
-            </template>
-          </TreeExplorer>
-        </div>
-        <div
-          v-show="workflowStore.bookmarkedWorkflows.length > 0"
-          class="comfyui-workflows-bookmarks"
-        >
-          <TextDivider
-            :text="t('sideToolbar.workflowTab.workflowTreeType.bookmarks')"
-            type="dashed"
-            class="ml-2"
-          />
-          <TreeExplorer
-            v-model:expanded-keys="dummyExpandedKeys"
-            :root="
-              renderTreeNode(
-                bookmarkedWorkflowsTree,
-                WorkflowTreeType.Bookmarks
-              )
-            "
-            :selection-keys="selectionKeys"
-          >
-            <template #node="{ node }">
-              <WorkflowTreeLeaf :node="node" />
-            </template>
-          </TreeExplorer>
-        </div>
-        <div class="comfyui-workflows-browse">
-          <TextDivider
-            :text="t('sideToolbar.workflowTab.workflowTreeType.browse')"
-            type="dashed"
-            class="ml-2"
-          />
-          <TreeExplorer
-            v-if="workflowStore.persistedWorkflows.length > 0"
-            v-model:expanded-keys="expandedKeys"
-            :root="renderTreeNode(workflowsTree, WorkflowTreeType.Browse)"
-            :selection-keys="selectionKeys"
-          >
-            <template #node="{ node }">
-              <WorkflowTreeLeaf :node="node" />
-            </template>
-          </TreeExplorer>
-          <NoResultsPlaceholder
-            v-else
-            icon="pi pi-folder"
-            :title="$t('g.empty')"
-            :message="$t('g.noWorkflowsFound')"
-          />
-        </div>
-      </div>
-      <div v-else class="comfyui-workflows-search-panel">
-        <TreeExplorer
-          v-model:expanded-keys="expandedKeys"
-          :root="renderTreeNode(filteredRoot, WorkflowTreeType.Browse)"
-        >
-          <template #node="{ node }">
-            <WorkflowTreeLeaf :node="node" />
-          </template>
-        </TreeExplorer>
-      </div>
-    </template>
-  </SidebarTabTemplate>
-  <ConfirmDialog />
+    :search-subject="$t('g.workflow')"
+    data-testid="workflows-sidebar"
+  />
 </template>
 
 <script setup lang="ts">
-import ConfirmDialog from 'primevue/confirmdialog'
-import { computed, nextTick, onMounted, ref } from 'vue'
-import { useI18n } from 'vue-i18n'
-
-import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
-import SearchBox from '@/components/common/SearchBox.vue'
-import TextDivider from '@/components/common/TextDivider.vue'
-import TreeExplorer from '@/components/common/TreeExplorer.vue'
-import TreeExplorerTreeNode from '@/components/common/TreeExplorerTreeNode.vue'
-import SidebarTabTemplate from '@/components/sidebar/tabs/SidebarTabTemplate.vue'
-import WorkflowTreeLeaf from '@/components/sidebar/tabs/workflows/WorkflowTreeLeaf.vue'
-import Button from '@/components/ui/button/Button.vue'
-import { useTreeExpansion } from '@/composables/useTreeExpansion'
-import { useSettingStore } from '@/platform/settings/settingStore'
-import { useWorkflowService } from '@/platform/workflow/core/services/workflowService'
-import {
-  ComfyWorkflow,
-  useWorkflowBookmarkStore,
-  useWorkflowStore
-} from '@/platform/workflow/management/stores/workflowStore'
-import { useWorkspaceStore } from '@/stores/workspaceStore'
-import type { TreeExplorerNode, TreeNode } from '@/types/treeExplorerTypes'
-import { appendJsonExt } from '@/utils/formatUtil'
-import { buildTree, sortedTree } from '@/utils/treeUtil'
-
-const settingStore = useSettingStore()
-const workflowTabsPosition = computed(() =>
-  settingStore.get('Comfy.Workflow.WorkflowTabsPosition')
-)
-
-const searchBoxRef = ref()
-
-const searchQuery = ref('')
-const isSearching = computed(() => searchQuery.value.length > 0)
-const filteredWorkflows = ref<ComfyWorkflow[]>([])
-const filteredRoot = computed<TreeNode>(() => {
-  return buildWorkflowTree(filteredWorkflows.value as ComfyWorkflow[])
-})
-const handleSearch = async (query: string) => {
-  if (query.length === 0) {
-    filteredWorkflows.value = []
-    expandedKeys.value = {}
-    return
-  }
-  const lowerQuery = query.toLocaleLowerCase()
-  filteredWorkflows.value = workflowStore.workflows.filter((workflow) => {
-    return workflow.path.toLocaleLowerCase().includes(lowerQuery)
-  })
-  await nextTick()
-  expandNode(filteredRoot.value)
-}
-
-const workflowStore = useWorkflowStore()
-const workflowService = useWorkflowService()
-const workspaceStore = useWorkspaceStore()
-const { t } = useI18n()
-const expandedKeys = ref<Record<string, boolean>>({})
-const { expandNode, toggleNodeOnEvent } = useTreeExpansion(expandedKeys)
-const dummyExpandedKeys = ref<Record<string, boolean>>({})
-
-const handleCloseWorkflow = async (workflow?: ComfyWorkflow) => {
-  if (workflow) {
-    await workflowService.closeWorkflow(workflow, {
-      warnIfUnsaved: !workspaceStore.shiftDown
-    })
-  }
-}
-
-enum WorkflowTreeType {
-  Open = 'Open',
-  Bookmarks = 'Bookmarks',
-  Browse = 'Browse'
-}
-
-const buildWorkflowTree = (workflows: ComfyWorkflow[]) => {
-  return buildTree(workflows, (workflow: ComfyWorkflow) =>
-    workflow.key.split('/')
-  )
-}
-
-const workflowsTree = computed(() =>
-  sortedTree(buildWorkflowTree(workflowStore.persistedWorkflows), {
-    groupLeaf: true
-  })
-)
-// Bookmarked workflows tree is flat.
-const bookmarkedWorkflowsTree = computed(() =>
-  buildTree(workflowStore.bookmarkedWorkflows, (workflow) => [workflow.key])
-)
-// Open workflows tree is flat.
-const openWorkflowsTree = computed(() =>
-  buildTree(workflowStore.openWorkflows, (workflow) => [workflow.key])
-)
-
-const renderTreeNode = (
-  node: TreeNode,
-  type: WorkflowTreeType
-): TreeExplorerNode<ComfyWorkflow> => {
-  const children = node.children?.map((child) => renderTreeNode(child, type))
-
-  const workflow: ComfyWorkflow = node.data
-
-  async function handleClick(
-    this: TreeExplorerNode<ComfyWorkflow>,
-    e: MouseEvent
-  ) {
-    if (this.leaf) {
-      await workflowService.openWorkflow(workflow)
-    } else {
-      toggleNodeOnEvent(e, this)
-    }
-  }
-
-  const actions = node.leaf
-    ? {
-        handleClick,
-        async handleRename(newName: string) {
-          const newPath =
-            type === WorkflowTreeType.Browse
-              ? workflow.directory + '/' + appendJsonExt(newName)
-              : ComfyWorkflow.basePath + appendJsonExt(newName)
-
-          await workflowService.renameWorkflow(workflow, newPath)
-        },
-        handleDelete: workflow.isTemporary
-          ? undefined
-          : async function () {
-              await workflowService.deleteWorkflow(workflow)
-            },
-        contextMenuItems() {
-          return [
-            {
-              label: t('g.insert'),
-              icon: 'pi pi-file-export',
-              command: async () => {
-                const workflow = node.data
-                await workflowService.insertWorkflow(workflow)
-              }
-            },
-            {
-              label: t('g.duplicate'),
-              icon: 'pi pi-file-export',
-              command: async () => {
-                const workflow = node.data
-                await workflowService.duplicateWorkflow(workflow)
-              }
-            }
-          ]
-        },
-        draggable: true
-      }
-    : { handleClick }
-
-  return {
-    key: node.key,
-    label: node.label,
-    leaf: node.leaf,
-    data: node.data,
-    children,
-    ...actions
-  }
-}
-
-const selectionKeys = computed(() => ({
-  [`root/${workflowStore.activeWorkflow?.key}`]: true
-}))
-
-const workflowBookmarkStore = useWorkflowBookmarkStore()
-onMounted(async () => {
-  searchBoxRef.value?.focus()
-  await workflowBookmarkStore.loadBookmarks()
-})
+import BaseWorkflowsSidebarTab from '@/components/sidebar/tabs/BaseWorkflowsSidebarTab.vue'
 </script>
diff --git a/src/components/sidebar/tabs/modelLibrary/ModelTreeLeaf.vue b/src/components/sidebar/tabs/modelLibrary/ModelTreeLeaf.vue
index ed16819e38..442a7b24e6 100644
--- a/src/components/sidebar/tabs/modelLibrary/ModelTreeLeaf.vue
+++ b/src/components/sidebar/tabs/modelLibrary/ModelTreeLeaf.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="container" class="model-lib-node-container h-full w-full">
+  <div ref="container" class="model-lib-node-container size-full">
     <TreeExplorerTreeNode :node="node">
       <template #before-label>
         <span v-if="modelPreviewUrl" class="model-lib-model-icon-container">
diff --git a/src/components/sidebar/tabs/nodeLibrary/AllNodesPanel.vue b/src/components/sidebar/tabs/nodeLibrary/AllNodesPanel.vue
new file mode 100644
index 0000000000..6e5dd0a1d3
--- /dev/null
+++ b/src/components/sidebar/tabs/nodeLibrary/AllNodesPanel.vue
@@ -0,0 +1,83 @@
+<template>
+  <TabsContent value="all" class="h-full flex-1 overflow-y-auto">
+    <!-- Favorites section -->
+    <h3
+      class="mb-0 px-4 py-2 text-xs font-medium tracking-wide text-muted-foreground uppercase"
+    >
+      {{ $t('sideToolbar.nodeLibraryTab.sections.bookmarked') }}
+    </h3>
+    <TreeExplorerV2
+      v-if="hasFavorites"
+      v-model:expanded-keys="expandedKeys"
+      :root="favoritesRoot"
+      show-context-menu
+      @node-click="(node) => emit('nodeClick', node)"
+      @add-to-favorites="handleAddToFavorites"
+    />
+    <div v-else class="px-6 py-2 text-xs text-muted-background">
+      {{ $t('sideToolbar.nodeLibraryTab.noBookmarkedNodes') }}
+    </div>
+
+    <!-- Node sections -->
+    <div v-for="(section, index) in sections" :key="section.category ?? index">
+      <h3
+        v-if="section.category && sortOrder !== 'alphabetical'"
+        class="mb-0 px-4 py-2 text-xs font-medium tracking-wide text-muted-foreground uppercase"
+      >
+        {{ $t(NODE_CATEGORY_LABELS[section.category]) }}
+      </h3>
+      <TreeExplorerV2
+        v-model:expanded-keys="expandedKeys"
+        :root="section.root"
+        show-context-menu
+        @node-click="(node) => emit('nodeClick', node)"
+        @add-to-favorites="handleAddToFavorites"
+      />
+    </div>
+  </TabsContent>
+</template>
+
+<script setup lang="ts">
+import { TabsContent } from 'reka-ui'
+import { computed } from 'vue'
+
+import TreeExplorerV2 from '@/components/common/TreeExplorerV2.vue'
+import { useNodeBookmarkStore } from '@/stores/nodeBookmarkStore'
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+import { NODE_CATEGORY_LABELS } from '@/types/nodeOrganizationTypes'
+import type {
+  NodeLibrarySection,
+  RenderedTreeExplorerNode,
+  TreeNode
+} from '@/types/treeExplorerTypes'
+
+const { fillNodeInfo, sortOrder = 'original' } = defineProps<{
+  sections: NodeLibrarySection<ComfyNodeDefImpl>[]
+  fillNodeInfo: (node: TreeNode) => RenderedTreeExplorerNode<ComfyNodeDefImpl>
+  sortOrder?: string
+}>()
+
+const expandedKeys = defineModel<string[]>('expandedKeys', { required: true })
+
+const emit = defineEmits<{
+  nodeClick: [node: RenderedTreeExplorerNode<ComfyNodeDefImpl>]
+}>()
+
+const nodeBookmarkStore = useNodeBookmarkStore()
+
+const hasFavorites = computed(
+  () => (nodeBookmarkStore.bookmarkedRoot.children?.length ?? 0) > 0
+)
+
+const favoritesRoot = computed(() =>
+  fillNodeInfo(nodeBookmarkStore.bookmarkedRoot)
+)
+
+function handleAddToFavorites(
+  node: RenderedTreeExplorerNode<ComfyNodeDefImpl>
+) {
+  if (node.data) {
+    nodeBookmarkStore.toggleBookmark(node.data)
+  }
+}
+</script>
diff --git a/src/components/sidebar/tabs/nodeLibrary/BlueprintsPanel.vue b/src/components/sidebar/tabs/nodeLibrary/BlueprintsPanel.vue
new file mode 100644
index 0000000000..5d25b955c2
--- /dev/null
+++ b/src/components/sidebar/tabs/nodeLibrary/BlueprintsPanel.vue
@@ -0,0 +1,39 @@
+<template>
+  <TabsContent value="blueprints" class="h-full flex-1 overflow-y-auto">
+    <div v-for="(section, index) in sections" :key="section.title ?? index">
+      <h3
+        v-if="section.title"
+        class="mb-0 px-4 py-2 text-xs font-medium tracking-wide text-muted-foreground uppercase"
+      >
+        {{ $t(section.title) }}
+      </h3>
+      <TreeExplorerV2
+        v-model:expanded-keys="expandedKeys"
+        :root="section.root"
+        :show-context-menu="false"
+        @node-click="(node) => emit('nodeClick', node)"
+      />
+    </div>
+  </TabsContent>
+</template>
+
+<script setup lang="ts">
+import { TabsContent } from 'reka-ui'
+
+import TreeExplorerV2 from '@/components/common/TreeExplorerV2.vue'
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+import type {
+  NodeLibrarySection,
+  RenderedTreeExplorerNode
+} from '@/types/treeExplorerTypes'
+
+defineProps<{
+  sections: NodeLibrarySection<ComfyNodeDefImpl>[]
+}>()
+
+const expandedKeys = defineModel<string[]>('expandedKeys', { required: true })
+
+const emit = defineEmits<{
+  nodeClick: [node: RenderedTreeExplorerNode<ComfyNodeDefImpl>]
+}>()
+</script>
diff --git a/src/components/sidebar/tabs/nodeLibrary/CustomNodesPanel.vue b/src/components/sidebar/tabs/nodeLibrary/CustomNodesPanel.vue
new file mode 100644
index 0000000000..322673ce35
--- /dev/null
+++ b/src/components/sidebar/tabs/nodeLibrary/CustomNodesPanel.vue
@@ -0,0 +1,63 @@
+<template>
+  <TabsContent value="custom" class="flex h-full flex-1 flex-col">
+    <div
+      v-for="(section, index) in sections"
+      :key="section.title ?? index"
+      class="h-full flex-1 overflow-y-auto"
+    >
+      <!-- Section header -->
+      <h3
+        v-if="section.title"
+        class="mb-0 px-4 py-2 text-xs font-medium tracking-wide text-muted-foreground uppercase"
+      >
+        {{ section.title }}
+      </h3>
+      <!-- Section tree -->
+      <TreeExplorerV2
+        v-model:expanded-keys="expandedKeys"
+        :root="section.root"
+        :show-context-menu="false"
+        @node-click="(node) => emit('nodeClick', node)"
+      />
+    </div>
+    <div class="flex-none border-t border-border-default py-3 text-center">
+      <Button
+        variant="secondary"
+        class="justify-start gap-3"
+        @click="handleOpenManager"
+      >
+        <i class="icon-[lucide--blocks] size-5 text-muted-foreground" />
+        {{ $t('g.manageExtensions') }}
+      </Button>
+    </div>
+  </TabsContent>
+</template>
+
+<script setup lang="ts">
+import { TabsContent } from 'reka-ui'
+
+import TreeExplorerV2 from '@/components/common/TreeExplorerV2.vue'
+import Button from '@/components/ui/button/Button.vue'
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+import type {
+  NodeLibrarySection,
+  RenderedTreeExplorerNode
+} from '@/types/treeExplorerTypes'
+import { useManagerState } from '@/workbench/extensions/manager/composables/useManagerState'
+
+defineProps<{
+  sections: NodeLibrarySection<ComfyNodeDefImpl>[]
+}>()
+
+const expandedKeys = defineModel<string[]>('expandedKeys', { required: true })
+
+const emit = defineEmits<{
+  nodeClick: [node: RenderedTreeExplorerNode<ComfyNodeDefImpl>]
+}>()
+
+const managerState = useManagerState()
+
+async function handleOpenManager() {
+  await managerState.openManager()
+}
+</script>
diff --git a/src/components/sidebar/tabs/nodeLibrary/EssentialNodeCard.test.ts b/src/components/sidebar/tabs/nodeLibrary/EssentialNodeCard.test.ts
new file mode 100644
index 0000000000..bd0f6af5b0
--- /dev/null
+++ b/src/components/sidebar/tabs/nodeLibrary/EssentialNodeCard.test.ts
@@ -0,0 +1,204 @@
+import { mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+import type { RenderedTreeExplorerNode } from '@/types/treeExplorerTypes'
+
+import EssentialNodeCard from './EssentialNodeCard.vue'
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: () => ({
+    get: vi.fn().mockReturnValue('left')
+  })
+}))
+
+const { mockStartDrag, mockHandleNativeDrop } = vi.hoisted(() => ({
+  mockStartDrag: vi.fn(),
+  mockHandleNativeDrop: vi.fn()
+}))
+
+vi.mock('@/composables/node/useNodeDragToCanvas', () => ({
+  useNodeDragToCanvas: () => ({
+    startDrag: mockStartDrag,
+    handleNativeDrop: mockHandleNativeDrop
+  })
+}))
+
+vi.mock('@/components/node/NodePreviewCard.vue', () => ({
+  default: { template: '<div class="mock-preview" />' }
+}))
+
+describe('EssentialNodeCard', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  function createMockNode(
+    overrides: Partial<ComfyNodeDefImpl> = {}
+  ): RenderedTreeExplorerNode<ComfyNodeDefImpl> {
+    const data = {
+      name: 'TestNode',
+      display_name: 'Test Node',
+      ...overrides
+    } as ComfyNodeDefImpl
+
+    return {
+      key: 'test-key',
+      label: data.display_name,
+      icon: 'icon-[comfy--node]',
+      type: 'node',
+      totalLeaves: 1,
+      data
+    }
+  }
+
+  function mountComponent(
+    node: RenderedTreeExplorerNode<ComfyNodeDefImpl> = createMockNode()
+  ) {
+    return mount(EssentialNodeCard, {
+      props: { node },
+      global: {
+        stubs: {
+          Teleport: true
+        }
+      }
+    })
+  }
+
+  describe('rendering', () => {
+    it('should display the node display_name', () => {
+      const wrapper = mountComponent(
+        createMockNode({ display_name: 'Load Image' })
+      )
+      expect(wrapper.text()).toContain('Load Image')
+    })
+
+    it('should set data-node-name attribute', () => {
+      const wrapper = mountComponent(
+        createMockNode({ display_name: 'Save Image' })
+      )
+      const card = wrapper.find('[data-node-name]')
+      expect(card.attributes('data-node-name')).toBe('Save Image')
+    })
+
+    it('should be draggable', () => {
+      const wrapper = mountComponent()
+      const card = wrapper.find('[draggable]')
+      expect(card.attributes('draggable')).toBe('true')
+    })
+  })
+
+  describe('icon generation', () => {
+    it('should use override icon for LoadImage', () => {
+      const wrapper = mountComponent(createMockNode({ name: 'LoadImage' }))
+      const icon = wrapper.find('i')
+      expect(icon.classes()).toContain('icon-s1.3-[lucide--image-up]')
+    })
+
+    it('should use override icon for SaveImage', () => {
+      const wrapper = mountComponent(createMockNode({ name: 'SaveImage' }))
+      const icon = wrapper.find('i')
+      expect(icon.classes()).toContain('icon-s1.3-[lucide--image-down]')
+    })
+
+    it('should use override icon for ImageCrop', () => {
+      const wrapper = mountComponent(createMockNode({ name: 'ImageCrop' }))
+      const icon = wrapper.find('i')
+      expect(icon.classes()).toContain('icon-s1.3-[lucide--crop]')
+    })
+
+    it('should use kebab-case for complex node names', () => {
+      const wrapper = mountComponent(
+        createMockNode({ name: 'RecraftRemoveBackgroundNode' })
+      )
+      const icon = wrapper.find('i')
+      expect(icon.classes()).toContain(
+        'icon-[comfy--recraft-remove-background-node]'
+      )
+    })
+
+    it('should use default node icon when nodeDef has no name', () => {
+      const node: RenderedTreeExplorerNode<ComfyNodeDefImpl> = {
+        key: 'test-key',
+        label: 'Test',
+        icon: 'icon',
+        type: 'node',
+        totalLeaves: 1,
+        data: undefined
+      }
+      const wrapper = mountComponent(node)
+      const icon = wrapper.find('i')
+      expect(icon.classes()).toContain('icon-[comfy--node]')
+    })
+  })
+
+  describe('events', () => {
+    it('should emit click event when clicked', async () => {
+      const node = createMockNode()
+      const wrapper = mountComponent(node)
+
+      await wrapper.find('div').trigger('click')
+
+      expect(wrapper.emitted('click')).toBeTruthy()
+      expect(wrapper.emitted('click')?.[0]).toEqual([node])
+    })
+
+    it('should not emit click when nodeDef is undefined', async () => {
+      const node: RenderedTreeExplorerNode<ComfyNodeDefImpl> = {
+        key: 'test-key',
+        label: 'Test',
+        icon: 'icon',
+        type: 'node',
+        totalLeaves: 1,
+        data: undefined
+      }
+      const wrapper = mountComponent(node)
+
+      await wrapper.find('div').trigger('click')
+
+      expect(wrapper.emitted('click')).toBeFalsy()
+    })
+  })
+
+  describe('drag and drop', () => {
+    it('should call startDrag on dragstart', async () => {
+      const wrapper = mountComponent()
+      const card = wrapper.find('div')
+
+      await card.trigger('dragstart')
+
+      expect(mockStartDrag).toHaveBeenCalled()
+    })
+
+    it('should call handleNativeDrop on dragend', async () => {
+      const wrapper = mountComponent()
+      const card = wrapper.find('div')
+
+      await card.trigger('dragend')
+
+      expect(mockHandleNativeDrop).toHaveBeenCalled()
+    })
+  })
+
+  describe('hover preview', () => {
+    it('should show preview on mouseenter', async () => {
+      const wrapper = mountComponent()
+      const card = wrapper.find('div')
+
+      await card.trigger('mouseenter')
+
+      expect(wrapper.find('teleport-stub').exists()).toBe(true)
+    })
+
+    it('should hide preview after mouseleave', async () => {
+      const wrapper = mountComponent()
+      const card = wrapper.find('div')
+
+      await card.trigger('mouseenter')
+      expect(wrapper.find('teleport-stub').exists()).toBe(true)
+
+      await card.trigger('mouseleave')
+      expect(wrapper.find('teleport-stub').exists()).toBe(false)
+    })
+  })
+})
diff --git a/src/components/sidebar/tabs/nodeLibrary/EssentialNodeCard.vue b/src/components/sidebar/tabs/nodeLibrary/EssentialNodeCard.vue
new file mode 100644
index 0000000000..d3cd15b0cd
--- /dev/null
+++ b/src/components/sidebar/tabs/nodeLibrary/EssentialNodeCard.vue
@@ -0,0 +1,84 @@
+<template>
+  <div
+    class="group relative box-content flex cursor-pointer flex-col items-center justify-center rounded-lg bg-component-node-background px-2 py-3 transition-colors duration-150 select-none hover:bg-secondary-background-hover"
+    :data-node-name="node.label"
+    draggable="true"
+    @click="handleClick"
+    @dragstart="handleDragStart"
+    @dragend="handleDragEnd"
+    @mouseenter="handleMouseEnter"
+    @mouseleave="handleMouseLeave"
+  >
+    <i :class="cn(nodeIcon, 'size-6 text-muted-foreground')" />
+
+    <TextTickerMultiLine
+      class="text-foreground mt-2 h-7 w-full shrink-0 text-xs/normal font-normal"
+    >
+      {{ node.label }}
+    </TextTickerMultiLine>
+  </div>
+
+  <Teleport v-if="showPreview" to="body">
+    <div
+      :ref="(el) => (previewRef = el as HTMLElement)"
+      :style="nodePreviewStyle"
+    >
+      <NodePreviewCard
+        :node-def="node.data!"
+        :show-inputs-and-outputs="false"
+      />
+    </div>
+  </Teleport>
+</template>
+
+<script setup lang="ts">
+import { kebabCase } from 'es-toolkit/string'
+import type { Ref } from 'vue'
+import { computed, inject } from 'vue'
+
+import TextTickerMultiLine from '@/components/common/TextTickerMultiLine.vue'
+import NodePreviewCard from '@/components/node/NodePreviewCard.vue'
+import { useNodePreviewAndDrag } from '@/composables/node/useNodePreviewAndDrag'
+import { ESSENTIALS_ICON_OVERRIDES } from '@/constants/essentialsNodes'
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+import type { RenderedTreeExplorerNode } from '@/types/treeExplorerTypes'
+import { cn } from '@/utils/tailwindUtil'
+
+const { node } = defineProps<{
+  node: RenderedTreeExplorerNode<ComfyNodeDefImpl>
+}>()
+
+const panelRef = inject<Ref<HTMLElement | null>>(
+  'essentialsPanelRef',
+  undefined!
+)
+
+const emit = defineEmits<{
+  click: [node: RenderedTreeExplorerNode<ComfyNodeDefImpl>]
+}>()
+
+const nodeDef = computed(() => node.data)
+
+const {
+  previewRef,
+  showPreview,
+  nodePreviewStyle,
+  handleMouseEnter,
+  handleMouseLeave,
+  handleDragStart,
+  handleDragEnd
+} = useNodePreviewAndDrag(nodeDef, panelRef)
+
+const nodeIcon = computed(() => {
+  const nodeName = node.data?.name
+  if (nodeName && nodeName in ESSENTIALS_ICON_OVERRIDES)
+    return ESSENTIALS_ICON_OVERRIDES[nodeName]
+  const iconName = nodeName ? kebabCase(nodeName) : 'node'
+  return `icon-[comfy--${iconName}]`
+})
+
+function handleClick() {
+  if (!node.data) return
+  emit('click', node)
+}
+</script>
diff --git a/src/components/sidebar/tabs/nodeLibrary/EssentialNodesPanel.test.ts b/src/components/sidebar/tabs/nodeLibrary/EssentialNodesPanel.test.ts
new file mode 100644
index 0000000000..cccd1b1f06
--- /dev/null
+++ b/src/components/sidebar/tabs/nodeLibrary/EssentialNodesPanel.test.ts
@@ -0,0 +1,224 @@
+import { flushPromises, mount } from '@vue/test-utils'
+import { nextTick, ref } from 'vue'
+import { describe, expect, it, vi } from 'vitest'
+
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+import type { RenderedTreeExplorerNode } from '@/types/treeExplorerTypes'
+
+import EssentialNodesPanel from './EssentialNodesPanel.vue'
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: () => ({
+    get: vi.fn().mockReturnValue('left')
+  })
+}))
+
+vi.mock('@/composables/node/useNodeDragToCanvas', () => ({
+  useNodeDragToCanvas: () => ({
+    startDrag: vi.fn(),
+    handleNativeDrop: vi.fn(),
+    cancelDrag: vi.fn()
+  })
+}))
+
+vi.mock('@/components/node/NodePreviewCard.vue', () => ({
+  default: { template: '<div />' }
+}))
+
+describe('EssentialNodesPanel', () => {
+  function createMockNode(
+    name: string
+  ): RenderedTreeExplorerNode<ComfyNodeDefImpl> {
+    return {
+      key: `node-${name}`,
+      label: name,
+      icon: 'icon-[comfy--node]',
+      type: 'node',
+      totalLeaves: 1,
+      data: {
+        name,
+        display_name: name
+      } as ComfyNodeDefImpl
+    }
+  }
+
+  function createMockFolder(
+    name: string,
+    children: RenderedTreeExplorerNode<ComfyNodeDefImpl>[]
+  ): RenderedTreeExplorerNode<ComfyNodeDefImpl> {
+    return {
+      key: `folder-${name}`,
+      label: name,
+      icon: 'icon-[lucide--folder]',
+      type: 'folder',
+      totalLeaves: children.length,
+      children
+    }
+  }
+
+  function createMockRoot(): RenderedTreeExplorerNode<ComfyNodeDefImpl> {
+    return {
+      key: 'root',
+      label: 'Root',
+      icon: '',
+      type: 'folder',
+      totalLeaves: 6,
+      children: [
+        createMockFolder('images', [
+          createMockNode('LoadImage'),
+          createMockNode('SaveImage')
+        ]),
+        createMockFolder('video', [
+          createMockNode('LoadVideo'),
+          createMockNode('SaveVideo')
+        ]),
+        createMockFolder('audio', [
+          createMockNode('LoadAudio'),
+          createMockNode('SaveAudio')
+        ])
+      ]
+    }
+  }
+
+  function mountComponent(
+    root = createMockRoot(),
+    expandedKeys: string[] = [],
+    flatNodes: RenderedTreeExplorerNode<ComfyNodeDefImpl>[] = []
+  ) {
+    const WrapperComponent = {
+      template: `<EssentialNodesPanel :root="root" :flat-nodes="flatNodes" v-model:expandedKeys="keys" />`,
+      components: { EssentialNodesPanel },
+      setup() {
+        const keys = ref(expandedKeys)
+        return { root, flatNodes, keys }
+      }
+    }
+    return mount(WrapperComponent, {
+      global: {
+        stubs: {
+          Teleport: true,
+          TabsContent: {
+            template: '<div class="tabs-content"><slot /></div>'
+          },
+          CollapsibleRoot: {
+            template:
+              '<div class="collapsible-root" :data-state="open ? \'open\' : \'closed\'"><slot /></div>',
+            props: ['open'],
+            emits: ['update:open']
+          },
+          CollapsibleTrigger: {
+            template:
+              '<button class="collapsible-trigger" @click="$emit(\'click\')"><slot /></button>'
+          },
+          CollapsibleContent: {
+            template: '<div class="collapsible-content"><slot /></div>'
+          }
+        }
+      }
+    })
+  }
+
+  describe('folder rendering', () => {
+    it('should render all top-level folders', () => {
+      const wrapper = mountComponent()
+      const triggers = wrapper.findAll('.collapsible-trigger')
+      expect(triggers).toHaveLength(3)
+    })
+
+    it('should display folder labels', () => {
+      const wrapper = mountComponent()
+      expect(wrapper.text()).toContain('images')
+      expect(wrapper.text()).toContain('video')
+      expect(wrapper.text()).toContain('audio')
+    })
+  })
+
+  describe('default expansion', () => {
+    it('should expand all folders by default when expandedKeys is empty', async () => {
+      const wrapper = mountComponent(createMockRoot(), [])
+      await nextTick()
+      await flushPromises()
+      await nextTick()
+
+      const roots = wrapper.findAll('.collapsible-root')
+      expect(roots[0].attributes('data-state')).toBe('open')
+      expect(roots[1].attributes('data-state')).toBe('open')
+      expect(roots[2].attributes('data-state')).toBe('open')
+    })
+
+    it('should respect provided expandedKeys', async () => {
+      const wrapper = mountComponent(createMockRoot(), ['folder-audio'])
+      await nextTick()
+
+      const roots = wrapper.findAll('.collapsible-root')
+      expect(roots[0].attributes('data-state')).toBe('closed')
+      expect(roots[1].attributes('data-state')).toBe('closed')
+      expect(roots[2].attributes('data-state')).toBe('open')
+    })
+
+    it('should expand all provided keys', async () => {
+      const wrapper = mountComponent(createMockRoot(), [
+        'folder-images',
+        'folder-video',
+        'folder-audio'
+      ])
+      await nextTick()
+
+      const roots = wrapper.findAll('.collapsible-root')
+      expect(roots[0].attributes('data-state')).toBe('open')
+      expect(roots[1].attributes('data-state')).toBe('open')
+      expect(roots[2].attributes('data-state')).toBe('open')
+    })
+  })
+
+  describe('with single folder', () => {
+    it('should expand only one folder when there is only one', async () => {
+      const root: RenderedTreeExplorerNode<ComfyNodeDefImpl> = {
+        key: 'root',
+        label: 'Root',
+        icon: '',
+        type: 'folder',
+        totalLeaves: 2,
+        children: [
+          createMockFolder('images', [
+            createMockNode('LoadImage'),
+            createMockNode('SaveImage')
+          ])
+        ]
+      }
+
+      const wrapper = mountComponent(root, [])
+      await nextTick()
+      await flushPromises()
+      await nextTick()
+
+      const roots = wrapper.findAll('.collapsible-root')
+      expect(roots).toHaveLength(1)
+      expect(roots[0].attributes('data-state')).toBe('open')
+    })
+  })
+
+  describe('node cards', () => {
+    it('should render node cards for each node in expanded folders', () => {
+      const wrapper = mountComponent(createMockRoot(), ['folder-images'])
+      const cards = wrapper.findAllComponents({ name: 'EssentialNodeCard' })
+      expect(cards.length).toBeGreaterThanOrEqual(2)
+    })
+  })
+
+  describe('flat nodes mode', () => {
+    it('should render flat grid without collapsible folders when flatNodes is provided', () => {
+      const flatNodes = [
+        createMockNode('LoadAudio'),
+        createMockNode('LoadImage'),
+        createMockNode('SaveImage')
+      ]
+      const wrapper = mountComponent(createMockRoot(), [], flatNodes)
+
+      expect(wrapper.findAll('.collapsible-root')).toHaveLength(0)
+
+      const cards = wrapper.findAllComponents({ name: 'EssentialNodeCard' })
+      expect(cards).toHaveLength(3)
+    })
+  })
+})
diff --git a/src/components/sidebar/tabs/nodeLibrary/EssentialNodesPanel.vue b/src/components/sidebar/tabs/nodeLibrary/EssentialNodesPanel.vue
new file mode 100644
index 0000000000..0b92ce95ec
--- /dev/null
+++ b/src/components/sidebar/tabs/nodeLibrary/EssentialNodesPanel.vue
@@ -0,0 +1,135 @@
+<template>
+  <TabsContent
+    ref="panelEl"
+    value="essentials"
+    class="h-full flex-1 overflow-y-auto px-3"
+  >
+    <div class="flex flex-col gap-2 pb-6">
+      <!-- Flat sorted grid when alphabetical -->
+      <div
+        v-if="flatNodes.length > 0"
+        class="grid grid-cols-[repeat(auto-fill,minmax(5rem,1fr))] gap-3 pt-3"
+      >
+        <EssentialNodeCard
+          v-for="node in flatNodes"
+          :key="node.key"
+          :node="node"
+          @click="emit('nodeClick', $event)"
+        />
+      </div>
+
+      <!-- Grouped collapsible folders when original -->
+      <template v-else>
+        <CollapsibleRoot
+          v-for="folder in folders"
+          :key="folder.key"
+          class="rounded-lg"
+          :open="expandedKeys.includes(folder.key)"
+          @update:open="toggleFolder(folder.key, $event)"
+        >
+          <CollapsibleTrigger
+            class="group box-content flex h-8 w-full cursor-pointer items-center justify-between border-0 bg-transparent px-1 py-3 text-xs font-medium tracking-wide text-muted-foreground"
+          >
+            <span class="uppercase">{{ folder.label }}</span>
+            <i
+              :class="
+                cn(
+                  'icon-[lucide--chevron-up] size-4 transition-transform duration-200',
+                  !expandedKeys.includes(folder.key) && '-rotate-180'
+                )
+              "
+            />
+          </CollapsibleTrigger>
+          <CollapsibleContent
+            class="overflow-hidden data-[state=closed]:animate-collapsible-up data-[state=open]:animate-collapsible-down"
+          >
+            <div
+              class="grid grid-cols-[repeat(auto-fill,minmax(5rem,1fr))] gap-3"
+            >
+              <EssentialNodeCard
+                v-for="node in folder.children"
+                :key="node.key"
+                :node="node"
+                @click="emit('nodeClick', $event)"
+              />
+            </div>
+          </CollapsibleContent>
+        </CollapsibleRoot>
+      </template>
+    </div>
+  </TabsContent>
+</template>
+
+<script setup lang="ts">
+import {
+  CollapsibleContent,
+  CollapsibleRoot,
+  CollapsibleTrigger,
+  TabsContent
+} from 'reka-ui'
+import type { ComponentPublicInstance } from 'vue'
+import { computed, provide, ref, watch } from 'vue'
+
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+import type { RenderedTreeExplorerNode } from '@/types/treeExplorerTypes'
+import { cn } from '@/utils/tailwindUtil'
+
+const panelEl = ref<ComponentPublicInstance | null>(null)
+const panelRef = computed(() => panelEl.value?.$el as HTMLElement | null)
+provide('essentialsPanelRef', panelRef)
+
+import EssentialNodeCard from './EssentialNodeCard.vue'
+
+const { root, flatNodes = [] } = defineProps<{
+  root: RenderedTreeExplorerNode<ComfyNodeDefImpl>
+  flatNodes?: RenderedTreeExplorerNode<ComfyNodeDefImpl>[]
+}>()
+
+const expandedKeys = defineModel<string[]>('expandedKeys', { required: true })
+
+const emit = defineEmits<{
+  nodeClick: [node: RenderedTreeExplorerNode<ComfyNodeDefImpl>]
+}>()
+
+function flattenLeaves(
+  node: RenderedTreeExplorerNode<ComfyNodeDefImpl>
+): RenderedTreeExplorerNode<ComfyNodeDefImpl>[] {
+  if (node.type === 'node') return [node]
+  return node.children?.flatMap(flattenLeaves) ?? []
+}
+
+const folders = computed(() => {
+  const topFolders =
+    (root.children?.filter(
+      (child) => child.type === 'folder'
+    ) as RenderedTreeExplorerNode<ComfyNodeDefImpl>[]) ?? []
+
+  return topFolders.map((folder) => ({
+    ...folder,
+    children: flattenLeaves(folder)
+  }))
+})
+
+function toggleFolder(key: string, open: boolean) {
+  if (open) {
+    expandedKeys.value = [...expandedKeys.value, key]
+  } else {
+    expandedKeys.value = expandedKeys.value.filter((k) => k !== key)
+  }
+}
+
+const hasAutoExpanded = ref(false)
+
+watch(
+  folders,
+  (value) => {
+    if (!hasAutoExpanded.value && value.length > 0) {
+      hasAutoExpanded.value = true
+      if (expandedKeys.value.length === 0) {
+        expandedKeys.value = value.map((folder) => folder.key)
+      }
+    }
+  },
+  { immediate: true }
+)
+</script>
diff --git a/src/components/sidebar/tabs/nodeLibrary/NodeBookmarkTreeExplorer.vue b/src/components/sidebar/tabs/nodeLibrary/NodeBookmarkTreeExplorer.vue
index 646f841bb4..74cb0620b8 100644
--- a/src/components/sidebar/tabs/nodeLibrary/NodeBookmarkTreeExplorer.vue
+++ b/src/components/sidebar/tabs/nodeLibrary/NodeBookmarkTreeExplorer.vue
@@ -22,7 +22,15 @@
 </template>
 
 <script setup lang="ts">
-import { computed, h, nextTick, ref, render, watch } from 'vue'
+import {
+  computed,
+  getCurrentInstance,
+  h,
+  nextTick,
+  ref,
+  render,
+  watch
+} from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import FolderCustomizationDialog from '@/components/common/CustomizationDialog.vue'
@@ -41,6 +49,8 @@ import type {
   TreeNode
 } from '@/types/treeExplorerTypes'
 
+const instance = getCurrentInstance()!
+const appContext = instance.appContext
 const props = defineProps<{
   filteredNodeDefs: ComfyNodeDefImpl[]
   openNodeHelp: (nodeDef: ComfyNodeDefImpl) => void
@@ -154,6 +164,7 @@ const renderedBookmarkedRoot = computed<TreeExplorerNode<ComfyNodeDefImpl>>(
         },
         renderDragPreview(container) {
           const vnode = h(NodePreview, { nodeDef: node.data })
+          vnode.appContext = appContext
           render(vnode, container)
           return () => {
             render(null, container)
@@ -204,7 +215,11 @@ const renderedBookmarkedRoot = computed<TreeExplorerNode<ComfyNodeDefImpl>>(
   }
 )
 
-const treeExplorerRef = ref<InstanceType<typeof TreeExplorer> | null>(null)
+interface TreeExplorerExposed {
+  addFolderCommand: (targetNodeKey: string) => void
+}
+
+const treeExplorerRef = ref<TreeExplorerExposed | null>(null)
 defineExpose({
   addNewBookmarkFolder: () => treeExplorerRef.value?.addFolderCommand('root')
 })
diff --git a/src/components/sidebar/tabs/nodeLibrary/NodeDragPreview.vue b/src/components/sidebar/tabs/nodeLibrary/NodeDragPreview.vue
new file mode 100644
index 0000000000..f4a22b1726
--- /dev/null
+++ b/src/components/sidebar/tabs/nodeLibrary/NodeDragPreview.vue
@@ -0,0 +1,69 @@
+<template>
+  <Teleport to="body">
+    <div
+      v-if="isDragging && draggedNode && showPreview"
+      class="pointer-events-none fixed z-10000"
+      :style="{
+        left: `${previewPosition.x + 12}px`,
+        top: `${previewPosition.y + 12}px`
+      }"
+    >
+      <div class="origin-top-left scale-50 opacity-80">
+        <LGraphNodePreview :node-def="draggedNode" position="relative" />
+      </div>
+    </div>
+  </Teleport>
+</template>
+
+<script setup lang="ts">
+import { computed, onMounted, onUnmounted, ref } from 'vue'
+
+import { useNodeDragToCanvas } from '@/composables/node/useNodeDragToCanvas'
+import LGraphNodePreview from '@/renderer/extensions/vueNodes/components/LGraphNodePreview.vue'
+
+const {
+  isDragging,
+  draggedNode,
+  cursorPosition,
+  dragMode,
+  setupGlobalListeners,
+  cleanupGlobalListeners
+} = useNodeDragToCanvas()
+
+const nativeDragPosition = ref({ x: 0, y: 0 })
+
+const previewPosition = computed(() => {
+  if (dragMode.value === 'native') {
+    return nativeDragPosition.value
+  }
+  return cursorPosition.value
+})
+
+const showPreview = computed(() => {
+  if (dragMode.value === 'native') {
+    return nativeDragPosition.value.x > 0 || nativeDragPosition.value.y > 0
+  }
+  return true
+})
+
+function handleDrag(e: DragEvent) {
+  if (e.clientX === 0 && e.clientY === 0) return
+  nativeDragPosition.value = { x: e.clientX, y: e.clientY }
+}
+
+function handleDragEnd() {
+  nativeDragPosition.value = { x: 0, y: 0 }
+}
+
+onMounted(() => {
+  setupGlobalListeners()
+  document.addEventListener('drag', handleDrag)
+  document.addEventListener('dragend', handleDragEnd)
+})
+
+onUnmounted(() => {
+  cleanupGlobalListeners()
+  document.removeEventListener('drag', handleDrag)
+  document.removeEventListener('dragend', handleDragEnd)
+})
+</script>
diff --git a/src/components/sidebar/tabs/nodeLibrary/NodeHelpPage.vue b/src/components/sidebar/tabs/nodeLibrary/NodeHelpPage.vue
index ee3412d7bb..f995685024 100644
--- a/src/components/sidebar/tabs/nodeLibrary/NodeHelpPage.vue
+++ b/src/components/sidebar/tabs/nodeLibrary/NodeHelpPage.vue
@@ -21,32 +21,13 @@
 </template>
 
 <script setup lang="ts">
-import { whenever } from '@vueuse/core'
-import { computed } from 'vue'
-
 import NodeHelpContent from '@/components/node/NodeHelpContent.vue'
 import Button from '@/components/ui/button/Button.vue'
-import { useSelectionState } from '@/composables/graph/useSelectionState'
 import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
-import { useNodeHelpStore } from '@/stores/workspace/nodeHelpStore'
 
 const { node } = defineProps<{ node: ComfyNodeDefImpl }>()
 
 defineEmits<{
   (e: 'close'): void
 }>()
-
-const nodeHelpStore = useNodeHelpStore()
-const { nodeDef } = useSelectionState()
-
-const activeHelpDef = computed(() =>
-  nodeHelpStore.isHelpOpen ? nodeDef.value : null
-)
-
-// Keep the open help page synced with the current selection while help is open.
-whenever(activeHelpDef, (def) => {
-  const currentHelpNode = nodeHelpStore.currentHelpNode
-  if (currentHelpNode?.nodePath === def.nodePath) return
-  nodeHelpStore.openHelp(def)
-})
 </script>
diff --git a/src/components/sidebar/tabs/nodeLibrary/NodeTreeFolder.vue b/src/components/sidebar/tabs/nodeLibrary/NodeTreeFolder.vue
index e42ab5a31c..7283f4b215 100644
--- a/src/components/sidebar/tabs/nodeLibrary/NodeTreeFolder.vue
+++ b/src/components/sidebar/tabs/nodeLibrary/NodeTreeFolder.vue
@@ -1,5 +1,10 @@
 <template>
-  <div ref="container" class="node-lib-node-container">
+  <div
+    ref="container"
+    class="node-lib-node-container"
+    data-testid="node-tree-folder"
+    :data-folder-name="node.label"
+  >
     <TreeExplorerTreeNode :node="node" @item-dropped="handleItemDrop" />
   </div>
 </template>
@@ -58,7 +63,7 @@ onUnmounted(() => {
 })
 
 const expandedKeys = inject(InjectKeyExpandedKeys)
-const handleItemDrop = (node: RenderedTreeExplorerNode) => {
+const handleItemDrop = (node: RenderedTreeExplorerNode<ComfyNodeDefImpl>) => {
   if (!expandedKeys) return
   expandedKeys.value[node.key] = true
 }
diff --git a/src/components/sidebar/tabs/nodeLibrary/NodeTreeLeaf.vue b/src/components/sidebar/tabs/nodeLibrary/NodeTreeLeaf.vue
index fc3cabfcc5..854947b0ef 100644
--- a/src/components/sidebar/tabs/nodeLibrary/NodeTreeLeaf.vue
+++ b/src/components/sidebar/tabs/nodeLibrary/NodeTreeLeaf.vue
@@ -1,5 +1,10 @@
 <template>
-  <div ref="container" class="node-lib-node-container">
+  <div
+    ref="container"
+    class="node-lib-node-container size-full"
+    data-testid="node-tree-leaf"
+    :data-node-name="nodeDef.display_name"
+  >
     <TreeExplorerTreeNode :node="node" @contextmenu="handleContextMenu">
       <template #before-label>
         <Tag
@@ -13,10 +18,7 @@
           severity="danger"
         />
       </template>
-      <template
-        v-if="nodeDef.name.startsWith(useSubgraphStore().typePrefix)"
-        #actions
-      >
+      <template v-if="isUserBlueprint" #actions>
         <Button
           variant="destructive"
           size="icon-sm"
@@ -57,7 +59,7 @@
           variant="muted-textonly"
           size="icon-sm"
           :aria-label="$t('g.learnMore')"
-          @click.stop="props.openNodeHelp(nodeDef)"
+          @click.stop="onHelpClick"
         >
           <i class="pi pi-question size-3.5" />
         </Button>
@@ -85,6 +87,7 @@ import TreeExplorerTreeNode from '@/components/common/TreeExplorerTreeNode.vue'
 import NodePreview from '@/components/node/NodePreview.vue'
 import Button from '@/components/ui/button/Button.vue'
 import { useSettingStore } from '@/platform/settings/settingStore'
+import { useTelemetry } from '@/platform/telemetry'
 import { useNodeBookmarkStore } from '@/stores/nodeBookmarkStore'
 import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
 import { useSubgraphStore } from '@/stores/subgraphStore'
@@ -112,6 +115,13 @@ const sidebarLocation = computed<'left' | 'right'>(() =>
 const toggleBookmark = async () => {
   await nodeBookmarkStore.toggleBookmark(nodeDef.value)
 }
+
+const onHelpClick = () => {
+  useTelemetry()?.trackUiButtonClicked({
+    button_id: 'node_library_help_button'
+  })
+  props.openNodeHelp(nodeDef.value)
+}
 const editBlueprint = async () => {
   if (!props.node.data)
     throw new Error(
@@ -120,8 +130,18 @@ const editBlueprint = async () => {
   await useSubgraphStore().editBlueprint(props.node.data.name)
 }
 const menu = ref<InstanceType<typeof ContextMenu> | null>(null)
+const subgraphStore = useSubgraphStore()
+const isUserBlueprint = computed(() => {
+  const name = nodeDef.value.name
+  if (!name.startsWith(subgraphStore.typePrefix)) return false
+  return !subgraphStore.isGlobalBlueprint(
+    name.slice(subgraphStore.typePrefix.length)
+  )
+})
 const menuItems = computed<MenuItem[]>(() => {
-  const items: MenuItem[] = [
+  if (!isUserBlueprint.value) return []
+
+  return [
     {
       label: t('g.delete'),
       icon: 'pi pi-trash',
@@ -129,15 +149,14 @@ const menuItems = computed<MenuItem[]>(() => {
       command: deleteBlueprint
     }
   ]
-  return items
 })
 function handleContextMenu(event: Event) {
-  if (!nodeDef.value.name.startsWith(useSubgraphStore().typePrefix)) return
+  if (!isUserBlueprint.value) return
   menu.value?.show(event)
 }
 function deleteBlueprint() {
   if (!props.node.data) return
-  void useSubgraphStore().deleteBlueprint(props.node.data.name)
+  void subgraphStore.deleteBlueprint(props.node.data.name)
 }
 
 const nodePreviewStyle = ref<CSSProperties>({
@@ -187,11 +206,3 @@ onUnmounted(() => {
   nodeContentElement.value?.removeEventListener('mouseleave', handleMouseLeave)
 })
 </script>
-
-<style scoped>
-@reference '../../../../assets/css/style.css';
-
-.node-lib-node-container {
-  @apply h-full w-full;
-}
-</style>
diff --git a/src/components/sidebar/tabs/queue/ResultGallery.test.ts b/src/components/sidebar/tabs/queue/ResultGallery.test.ts
index 49b365a0d0..6034d86e7a 100644
--- a/src/components/sidebar/tabs/queue/ResultGallery.test.ts
+++ b/src/components/sidebar/tabs/queue/ResultGallery.test.ts
@@ -92,7 +92,7 @@ describe('ResultGallery', () => {
         }
       },
       props: {
-        allGalleryItems: mockGalleryItems as unknown as ResultItemImpl[],
+        allGalleryItems: mockGalleryItems as ResultItemImpl[],
         activeIndex: 0,
         ...props
       },
@@ -117,7 +117,10 @@ describe('ResultGallery', () => {
     const wrapper = mountGallery({ activeIndex: -1 })
 
     // Initially galleryVisible should be false
-    const vm: any = wrapper.vm
+    type GalleryVM = typeof wrapper.vm & {
+      galleryVisible: boolean
+    }
+    const vm = wrapper.vm as GalleryVM
     expect(vm.galleryVisible).toBe(false)
 
     // Change activeIndex
@@ -167,7 +170,11 @@ describe('ResultGallery', () => {
     expect(galleria.exists()).toBe(true)
 
     // Check that our PT props for positioning work correctly
-    const pt = galleria.props('pt') as any
+    interface GalleriaPT {
+      prevButton?: { style?: string }
+      nextButton?: { style?: string }
+    }
+    const pt = galleria.props('pt') as GalleriaPT
     expect(pt?.prevButton?.style).toContain('position: fixed')
     expect(pt?.nextButton?.style).toContain('position: fixed')
   })
diff --git a/src/components/tab/Tab.vue b/src/components/tab/Tab.vue
index 5176ef24e3..22cf06930b 100644
--- a/src/components/tab/Tab.vue
+++ b/src/components/tab/Tab.vue
@@ -32,12 +32,12 @@ const isActive = computed(() => currentValue?.value === value)
 const tabClasses = computed(() => {
   return cn(
     // Base styles from TextButton
-    'flex items-center justify-center shrink-0',
-    'px-2.5 py-2 text-sm rounded-lg cursor-pointer transition-all duration-200',
-    'outline-hidden border-none',
+    'flex shrink-0 items-center justify-center',
+    'cursor-pointer rounded-lg px-2.5 py-2 text-sm transition-all duration-200',
+    'border-none outline-hidden',
     // State styles with semantic tokens
     isActive.value
-      ? 'bg-interface-menu-component-surface-hovered text-text-primary text-bold'
+      ? 'text-bold bg-interface-menu-component-surface-hovered text-text-primary'
       : 'bg-transparent text-text-secondary hover:bg-button-hover-surface focus:bg-button-hover-surface'
   )
 })
diff --git a/src/components/templates/thumbnails/AudioThumbnail.vue b/src/components/templates/thumbnails/AudioThumbnail.vue
index 2d7c0bc1cb..b5c04f0a2e 100644
--- a/src/components/templates/thumbnails/AudioThumbnail.vue
+++ b/src/components/templates/thumbnails/AudioThumbnail.vue
@@ -1,7 +1,7 @@
 <template>
   <BaseThumbnail>
     <div
-      class="flex h-full w-full items-center justify-center p-4"
+      class="flex size-full items-center justify-center p-4"
       :style="{
         backgroundImage: 'url(/assets/images/default-template.png)',
         backgroundRepeat: 'round'
diff --git a/src/components/templates/thumbnails/BaseThumbnail.test.ts b/src/components/templates/thumbnails/BaseThumbnail.test.ts
index ecb03df419..f1d8571ee8 100644
--- a/src/components/templates/thumbnails/BaseThumbnail.test.ts
+++ b/src/components/templates/thumbnails/BaseThumbnail.test.ts
@@ -4,6 +4,10 @@ import { nextTick } from 'vue'
 
 import BaseThumbnail from '@/components/templates/thumbnails/BaseThumbnail.vue'
 
+type ComponentInstance = InstanceType<typeof BaseThumbnail> & {
+  error: boolean
+}
+
 vi.mock('@vueuse/core', () => ({
   useEventListener: vi.fn()
 }))
@@ -45,7 +49,7 @@ describe('BaseThumbnail', () => {
 
   it('shows error state when image fails to load', async () => {
     const wrapper = mountThumbnail()
-    const vm = wrapper.vm as any
+    const vm = wrapper.vm as ComponentInstance
 
     // Manually set error since useEventListener is mocked
     vm.error = true
diff --git a/src/components/templates/thumbnails/BaseThumbnail.vue b/src/components/templates/thumbnails/BaseThumbnail.vue
index 916d0ebaca..4625176125 100644
--- a/src/components/templates/thumbnails/BaseThumbnail.vue
+++ b/src/components/templates/thumbnails/BaseThumbnail.vue
@@ -5,18 +5,18 @@
     <div
       v-if="!error"
       ref="contentRef"
-      class="h-full w-full transform-gpu transition-transform duration-1000 ease-out"
+      class="size-full transform-gpu transition-transform duration-1000 ease-out"
       :style="
         isHovered ? { transform: `scale(${1 + hoverZoom / 100})` } : undefined
       "
     >
       <slot />
     </div>
-    <div v-else class="flex h-full w-full items-center justify-center">
+    <div v-else class="flex size-full items-center justify-center">
       <img
         src="/assets/images/default-template.png"
         draggable="false"
-        class="h-full w-full transform-gpu object-cover transition-transform duration-300 ease-out"
+        class="size-full transform-gpu object-cover transition-transform duration-300 ease-out"
       />
     </div>
   </div>
diff --git a/src/components/templates/thumbnails/HoverDissolveThumbnail.vue b/src/components/templates/thumbnails/HoverDissolveThumbnail.vue
index 9ba49b565a..3e0b2972ad 100644
--- a/src/components/templates/thumbnails/HoverDissolveThumbnail.vue
+++ b/src/components/templates/thumbnails/HoverDissolveThumbnail.vue
@@ -1,6 +1,6 @@
 <template>
   <BaseThumbnail :is-hovered="isHovered">
-    <div class="relative h-full w-full">
+    <div class="relative size-full">
       <div class="absolute inset-0">
         <LazyImage
           :src="baseImageSrc"
diff --git a/src/components/templates/thumbnails/LogoOverlay.test.ts b/src/components/templates/thumbnails/LogoOverlay.test.ts
new file mode 100644
index 0000000000..69c4eb39ae
--- /dev/null
+++ b/src/components/templates/thumbnails/LogoOverlay.test.ts
@@ -0,0 +1,157 @@
+import { mount } from '@vue/test-utils'
+import type { ComponentProps } from 'vue-component-type-helpers'
+import { nextTick, ref } from 'vue'
+import { describe, expect, it, vi } from 'vitest'
+
+import LogoOverlay from '@/components/templates/thumbnails/LogoOverlay.vue'
+import type { LogoInfo } from '@/platform/workflow/templates/types/template'
+
+vi.mock('vue-i18n', () => ({
+  useI18n: () => ({
+    t: (key: string) =>
+      key === 'templates.logoProviderSeparator' ? ' & ' : key,
+    locale: ref('en')
+  })
+}))
+
+type LogoOverlayProps = ComponentProps<typeof LogoOverlay>
+
+describe('LogoOverlay', () => {
+  function mockGetLogoUrl(provider: string) {
+    return `/logos/${provider}.png`
+  }
+
+  function mountOverlay(
+    logos: LogoInfo[],
+    props: Partial<LogoOverlayProps> = {}
+  ) {
+    return mount(LogoOverlay, {
+      props: {
+        logos,
+        getLogoUrl: mockGetLogoUrl,
+        ...props
+      }
+    })
+  }
+
+  it('renders nothing when logos array is empty', () => {
+    const wrapper = mountOverlay([])
+    expect(wrapper.findAll('img')).toHaveLength(0)
+  })
+
+  it('renders a single logo with correct src and alt', () => {
+    const wrapper = mountOverlay([{ provider: 'Google' }])
+    const img = wrapper.find('img')
+    expect(img.attributes('src')).toBe('/logos/Google.png')
+    expect(img.attributes('alt')).toBe('Google')
+  })
+
+  it('renders multiple separate logo entries', () => {
+    const wrapper = mountOverlay([
+      { provider: 'Google' },
+      { provider: 'OpenAI' },
+      { provider: 'Stability' }
+    ])
+    expect(wrapper.findAll('img')).toHaveLength(3)
+  })
+
+  it('displays provider name as label for single provider', () => {
+    const wrapper = mountOverlay([{ provider: 'Google' }])
+    const span = wrapper.find('span')
+    expect(span.text()).toBe('Google')
+  })
+
+  it('images are not draggable', () => {
+    const wrapper = mountOverlay([{ provider: 'Google' }])
+    const img = wrapper.find('img')
+    expect(img.attributes('draggable')).toBe('false')
+  })
+
+  it('filters out logos with empty URLs', () => {
+    function getLogoUrl(provider: string) {
+      return provider === 'Google' ? '/logos/Google.png' : ''
+    }
+    const wrapper = mount(LogoOverlay, {
+      props: {
+        logos: [{ provider: 'Google' }, { provider: 'Unknown' }],
+        getLogoUrl
+      }
+    })
+    expect(wrapper.findAll('img')).toHaveLength(1)
+  })
+
+  it('renders one logo per unique provider', () => {
+    const wrapper = mountOverlay([
+      { provider: 'Google' },
+      { provider: 'OpenAI' }
+    ])
+    expect(wrapper.findAll('img')).toHaveLength(2)
+  })
+
+  describe('stacked logos', () => {
+    it('renders multiple providers as stacked overlapping logos', () => {
+      const wrapper = mountOverlay([{ provider: ['WaveSpeed', 'Hunyuan'] }])
+      const images = wrapper.findAll('img')
+      expect(images).toHaveLength(2)
+      expect(images[0].attributes('alt')).toBe('WaveSpeed')
+      expect(images[1].attributes('alt')).toBe('Hunyuan')
+    })
+
+    it('joins provider names with locale-aware conjunction for default label', () => {
+      const wrapper = mountOverlay([{ provider: ['WaveSpeed', 'Hunyuan'] }])
+      const span = wrapper.find('span')
+      expect(span.text()).toBe('WaveSpeed and Hunyuan')
+    })
+
+    it('uses custom label when provided', () => {
+      const wrapper = mountOverlay([
+        { provider: ['WaveSpeed', 'Hunyuan'], label: 'Custom Label' }
+      ])
+      const span = wrapper.find('span')
+      expect(span.text()).toBe('Custom Label')
+    })
+
+    it('applies negative gap for overlap effect', () => {
+      const wrapper = mountOverlay([
+        { provider: ['WaveSpeed', 'Hunyuan'], gap: -8 }
+      ])
+      const images = wrapper.findAll('img')
+      expect(images[1].attributes('style')).toContain('margin-left: -8px')
+    })
+
+    it('applies default gap when not specified', () => {
+      const wrapper = mountOverlay([{ provider: ['WaveSpeed', 'Hunyuan'] }])
+      const images = wrapper.findAll('img')
+      expect(images[1].attributes('style')).toContain('margin-left: -6px')
+    })
+
+    it('filters out invalid providers from stacked logos', () => {
+      function getLogoUrl(provider: string) {
+        return provider === 'WaveSpeed' ? '/logos/WaveSpeed.png' : ''
+      }
+      const wrapper = mount(LogoOverlay, {
+        props: {
+          logos: [{ provider: ['WaveSpeed', 'Unknown'] }],
+          getLogoUrl
+        }
+      })
+      expect(wrapper.findAll('img')).toHaveLength(1)
+      expect(wrapper.find('span').text()).toBe('WaveSpeed')
+    })
+  })
+
+  describe('error handling', () => {
+    it('keeps showing remaining providers when one image fails in stacked logos', async () => {
+      const wrapper = mountOverlay([{ provider: ['Google', 'OpenAI'] }])
+      const images = wrapper.findAll('[data-testid="logo-img"]')
+      expect(images).toHaveLength(2)
+
+      await images[0].trigger('error')
+      await nextTick()
+
+      const remainingImages = wrapper.findAll('[data-testid="logo-img"]')
+      expect(remainingImages).toHaveLength(2)
+      expect(remainingImages[1].attributes('alt')).toBe('OpenAI')
+    })
+  })
+})
diff --git a/src/components/templates/thumbnails/LogoOverlay.vue b/src/components/templates/thumbnails/LogoOverlay.vue
new file mode 100644
index 0000000000..fef38a1eec
--- /dev/null
+++ b/src/components/templates/thumbnails/LogoOverlay.vue
@@ -0,0 +1,117 @@
+<template>
+  <div
+    v-for="logo in validLogos"
+    :key="logo.key"
+    :class="
+      cn('pointer-events-none absolute z-10', logo.position ?? defaultPosition)
+    "
+  >
+    <div
+      v-show="!hasAllFailed(logo.providers)"
+      data-testid="logo-pill"
+      class="flex items-center gap-1.5 rounded-full bg-black/20 py-1 pr-2"
+      :style="{ opacity: logo.opacity ?? 0.85 }"
+    >
+      <div class="ml-0.5 flex items-center">
+        <img
+          v-for="(provider, providerIndex) in logo.providers"
+          :key="provider"
+          data-testid="logo-img"
+          :src="logo.urls[providerIndex]"
+          :alt="provider"
+          class="size-6 rounded-full border-2 border-white object-cover"
+          :class="{ relative: providerIndex > 0 }"
+          :style="
+            providerIndex > 0 ? { marginLeft: `${logo.gap ?? -6}px` } : {}
+          "
+          draggable="false"
+          @error="onImageError(provider)"
+        />
+      </div>
+      <span class="text-sm font-medium text-white">
+        {{ logo.label }}
+      </span>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import type { LogoInfo } from '@/platform/workflow/templates/types/template'
+import { cn } from '@/utils/tailwindUtil'
+
+const { t, locale } = useI18n()
+
+function formatProviderList(providers: string[]): string {
+  const localeValue = String(locale.value)
+  try {
+    return new Intl.ListFormat(localeValue, {
+      style: 'long',
+      type: 'conjunction'
+    }).format(providers)
+  } catch {
+    return providers.join(t('templates.logoProviderSeparator'))
+  }
+}
+
+const {
+  logos,
+  getLogoUrl,
+  defaultPosition = 'top-2 left-2'
+} = defineProps<{
+  logos: LogoInfo[]
+  getLogoUrl: (provider: string) => string
+  defaultPosition?: string
+}>()
+
+const failedLogos = ref(new Set<string>())
+
+function onImageError(provider: string) {
+  failedLogos.value = new Set([...failedLogos.value, provider])
+}
+
+function hasAllFailed(providers: string[]): boolean {
+  return providers.every((p) => failedLogos.value.has(p))
+}
+
+interface ValidatedLogo {
+  key: string
+  providers: string[]
+  urls: string[]
+  label: string
+  position: string | undefined
+  opacity: number | undefined
+  gap: number | undefined
+}
+
+const validLogos = computed<ValidatedLogo[]>(() => {
+  const result: ValidatedLogo[] = []
+
+  logos.forEach((logo, index) => {
+    const providers = Array.isArray(logo.provider)
+      ? logo.provider
+      : [logo.provider]
+    const urls = providers.map((p) => getLogoUrl(p))
+    const validProviders = providers.filter((_, i) => urls[i])
+    const validUrls = urls.filter((url) => url)
+
+    if (validProviders.length === 0) return
+
+    const providerKey = validProviders.join('-')
+    const layoutKey = `${logo.position ?? ''}-${logo.opacity ?? ''}-${logo.gap ?? ''}`
+    result.push({
+      key: providerKey ? `${providerKey}-${layoutKey}` : `logo-${index}`,
+      providers: validProviders,
+      urls: validUrls,
+      label: logo.label ?? formatProviderList(validProviders),
+      position: logo.position,
+      opacity: logo.opacity,
+      gap: logo.gap
+    })
+  })
+
+  return result
+})
+</script>
diff --git a/src/components/toast/GlobalToast.vue b/src/components/toast/GlobalToast.vue
index 1955afe65e..e3ed6abed9 100644
--- a/src/components/toast/GlobalToast.vue
+++ b/src/components/toast/GlobalToast.vue
@@ -1,5 +1,13 @@
 <template>
   <Toast />
+  <Toast group="billing-operation" position="top-right">
+    <template #message="slotProps">
+      <div class="flex items-center gap-2">
+        <i class="pi pi-spin pi-spinner text-primary" />
+        <span>{{ slotProps.message.summary }}</span>
+      </div>
+    </template>
+  </Toast>
 </template>
 
 <script setup lang="ts">
diff --git a/src/components/toast/ProgressToastItem.stories.ts b/src/components/toast/ProgressToastItem.stories.ts
new file mode 100644
index 0000000000..cdfa8e28eb
--- /dev/null
+++ b/src/components/toast/ProgressToastItem.stories.ts
@@ -0,0 +1,95 @@
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+
+import type { AssetDownload } from '@/stores/assetDownloadStore'
+
+import ProgressToastItem from './ProgressToastItem.vue'
+
+const meta: Meta<typeof ProgressToastItem> = {
+  title: 'Toast/ProgressToastItem',
+  component: ProgressToastItem,
+  parameters: {
+    layout: 'padded'
+  },
+  decorators: [
+    () => ({
+      template: '<div class="w-[400px] bg-base-background p-4"><story /></div>'
+    })
+  ]
+}
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+function createMockJob(overrides: Partial<AssetDownload> = {}): AssetDownload {
+  return {
+    taskId: 'task-1',
+    assetId: 'asset-1',
+    assetName: 'model-v1.safetensors',
+    bytesTotal: 1000000,
+    bytesDownloaded: 0,
+    progress: 0,
+    status: 'created',
+    lastUpdate: Date.now(),
+    ...overrides
+  }
+}
+
+export const Pending: Story = {
+  args: {
+    job: createMockJob({
+      status: 'created',
+      assetName: 'sd-xl-base-1.0.safetensors'
+    })
+  }
+}
+
+export const Running: Story = {
+  args: {
+    job: createMockJob({
+      status: 'running',
+      progress: 0.45,
+      assetName: 'lora-detail-enhancer.safetensors'
+    })
+  }
+}
+
+export const RunningAlmostComplete: Story = {
+  args: {
+    job: createMockJob({
+      status: 'running',
+      progress: 0.92,
+      assetName: 'vae-ft-mse-840000.safetensors'
+    })
+  }
+}
+
+export const Completed: Story = {
+  args: {
+    job: createMockJob({
+      status: 'completed',
+      progress: 1,
+      assetName: 'controlnet-canny.safetensors'
+    })
+  }
+}
+
+export const Failed: Story = {
+  args: {
+    job: createMockJob({
+      status: 'failed',
+      progress: 0.23,
+      assetName: 'unreachable-model.safetensors'
+    })
+  }
+}
+
+export const LongFileName: Story = {
+  args: {
+    job: createMockJob({
+      status: 'running',
+      progress: 0.67,
+      assetName:
+        'very-long-model-name-with-lots-of-descriptive-text-v2.1-final-release.safetensors'
+    })
+  }
+}
diff --git a/src/components/toast/ProgressToastItem.vue b/src/components/toast/ProgressToastItem.vue
new file mode 100644
index 0000000000..2732c5b36f
--- /dev/null
+++ b/src/components/toast/ProgressToastItem.vue
@@ -0,0 +1,64 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Loader from '@/components/loader/Loader.vue'
+import StatusBadge from '@/components/common/StatusBadge.vue'
+import type { AssetDownload } from '@/stores/assetDownloadStore'
+import { cn } from '@/utils/tailwindUtil'
+
+const { job } = defineProps<{
+  job: AssetDownload
+}>()
+
+const { t } = useI18n()
+
+const progressPercent = computed(() => Math.round(job.progress * 100))
+const isCompleted = computed(() => job.status === 'completed')
+const isFailed = computed(() => job.status === 'failed')
+const isRunning = computed(() => job.status === 'running')
+const isPending = computed(() => job.status === 'created')
+</script>
+
+<template>
+  <div
+    :class="
+      cn(
+        'flex items-center justify-between rounded-lg bg-modal-card-background px-4 py-3',
+        isCompleted && 'opacity-50'
+      )
+    "
+  >
+    <div class="min-w-0 flex-1">
+      <span class="block truncate text-sm text-base-foreground">{{
+        job.assetName
+      }}</span>
+    </div>
+
+    <div class="flex shrink-0 items-center gap-2">
+      <template v-if="isFailed">
+        <i
+          class="icon-[lucide--circle-alert] size-4 text-destructive-background"
+        />
+        <StatusBadge :label="t('progressToast.failed')" severity="danger" />
+      </template>
+
+      <template v-else-if="isCompleted">
+        <StatusBadge :label="t('progressToast.finished')" severity="contrast" />
+      </template>
+
+      <template v-else-if="isRunning">
+        <Loader size="sm" class="text-base-foreground" />
+        <span class="text-xs text-base-foreground">
+          {{ progressPercent }}%
+        </span>
+      </template>
+
+      <template v-else-if="isPending">
+        <span class="text-xs text-muted-foreground">
+          {{ t('progressToast.pending') }}
+        </span>
+      </template>
+    </div>
+  </div>
+</template>
diff --git a/src/components/topbar/ActionBarButtons.vue b/src/components/topbar/ActionBarButtons.vue
index 832bc179b8..e87b1d62f5 100644
--- a/src/components/topbar/ActionBarButtons.vue
+++ b/src/components/topbar/ActionBarButtons.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex h-full shrink-0 items-center gap-1">
+  <div class="flex h-full shrink-0 items-center gap-1 empty:hidden">
     <Button
       v-for="(button, index) in actionBarButtonStore.buttons"
       :key="index"
diff --git a/src/components/topbar/CloudBadge.vue b/src/components/topbar/CloudBadge.vue
index 93772f7f4b..d7f8b0c6e4 100644
--- a/src/components/topbar/CloudBadge.vue
+++ b/src/components/topbar/CloudBadge.vue
@@ -11,28 +11,24 @@
 <script setup lang="ts">
 import { computed } from 'vue'
 
-import { t } from '@/i18n'
 import type { TopbarBadge as TopbarBadgeType } from '@/types/comfy'
 
 import TopbarBadge from './TopbarBadge.vue'
 
-withDefaults(
-  defineProps<{
-    displayMode?: 'full' | 'compact' | 'icon-only'
-    reverseOrder?: boolean
-    noPadding?: boolean
-    backgroundColor?: string
-  }>(),
-  {
-    displayMode: 'full',
-    reverseOrder: false,
-    noPadding: false,
-    backgroundColor: 'var(--comfy-menu-bg)'
-  }
-)
+const {
+  displayMode = 'full',
+  reverseOrder,
+  noPadding,
+  backgroundColor = 'var(--comfy-menu-bg)'
+} = defineProps<{
+  displayMode?: 'full' | 'compact' | 'icon-only'
+  reverseOrder?: boolean
+  noPadding?: boolean
+  backgroundColor?: string
+}>()
 
 const cloudBadge = computed<TopbarBadgeType>(() => ({
-  label: t('g.beta'),
+  icon: 'icon-[lucide--cloud]',
   text: 'Comfy Cloud'
 }))
 </script>
diff --git a/src/components/topbar/CurrentUserButton.test.ts b/src/components/topbar/CurrentUserButton.test.ts
index db5349b49b..7fe06417db 100644
--- a/src/components/topbar/CurrentUserButton.test.ts
+++ b/src/components/topbar/CurrentUserButton.test.ts
@@ -25,7 +25,24 @@ vi.mock('firebase/auth', () => ({
 }))
 
 // Mock pinia
-vi.mock('pinia')
+vi.mock('pinia', () => ({
+  storeToRefs: vi.fn((store) => store)
+}))
+
+// Mock the useFeatureFlags composable
+vi.mock('@/composables/useFeatureFlags', () => ({
+  useFeatureFlags: vi.fn(() => ({
+    flags: { teamWorkspacesEnabled: false }
+  }))
+}))
+
+// Mock the useTeamWorkspaceStore
+vi.mock('@/platform/workspace/stores/teamWorkspaceStore', () => ({
+  useTeamWorkspaceStore: vi.fn(() => ({
+    workspaceName: { value: '' },
+    initState: { value: 'idle' }
+  }))
+}))
 
 // Mock the useCurrentUser composable
 vi.mock('@/composables/auth/useCurrentUser', () => ({
@@ -47,10 +64,10 @@ vi.mock('@/components/common/UserAvatar.vue', () => ({
   }
 }))
 
-// Mock the CurrentUserPopover component
-vi.mock('./CurrentUserPopover.vue', () => ({
+// Mock the CurrentUserPopoverLegacy component
+vi.mock('./CurrentUserPopoverLegacy.vue', () => ({
   default: {
-    name: 'CurrentUserPopoverMock',
+    name: 'CurrentUserPopoverLegacyMock',
     render() {
       return h('div', 'Popover Content')
     },
diff --git a/src/components/topbar/CurrentUserButton.vue b/src/components/topbar/CurrentUserButton.vue
index 39c4f1dd3f..1b538a6cae 100644
--- a/src/components/topbar/CurrentUserButton.vue
+++ b/src/components/topbar/CurrentUserButton.vue
@@ -1,4 +1,4 @@
-<!-- A button that shows current authenticated user's avatar -->
+<!-- A button that shows workspace icon (Cloud) or user avatar -->
 <template>
   <div>
     <Button
@@ -9,11 +9,31 @@
       @click="popover?.toggle($event)"
     >
       <div
-        class="flex items-center gap-1 rounded-full hover:bg-interface-button-hover-surface"
+        :class="
+          cn(
+            'flex items-center justify-center gap-1 rounded-full hover:bg-interface-button-hover-surface',
+            compact && 'size-full'
+          )
+        "
       >
-        <UserAvatar :photo-url="photoURL" />
+        <Skeleton
+          v-if="showWorkspaceSkeleton"
+          shape="circle"
+          width="32px"
+          height="32px"
+        />
+        <WorkspaceProfilePic
+          v-else-if="showWorkspaceIcon"
+          :workspace-name="workspaceName"
+          :class="compact && 'size-full'"
+        />
+        <UserAvatar
+          v-else
+          :photo-url="photoURL"
+          :class="compact && 'size-full'"
+        />
 
-        <i class="icon-[lucide--chevron-down] size-3 px-1" />
+        <i v-if="showArrow" class="icon-[lucide--chevron-down] size-4 px-1" />
       </div>
     </Button>
 
@@ -22,33 +42,88 @@
       :show-arrow="false"
       :pt="{
         root: {
-          class: 'rounded-lg'
+          class: 'rounded-lg w-80'
         }
       }"
+      @show="onPopoverShow"
     >
-      <CurrentUserPopover @close="closePopover" />
+      <!-- Workspace mode: workspace-aware popover (only when ready) -->
+      <CurrentUserPopoverWorkspace
+        v-if="teamWorkspacesEnabled && initState === 'ready'"
+        ref="workspacePopoverContent"
+        @close="closePopover"
+      />
+      <!-- Legacy mode: original popover -->
+      <CurrentUserPopoverLegacy
+        v-else-if="!teamWorkspacesEnabled"
+        @close="closePopover"
+      />
     </Popover>
   </div>
 </template>
 
 <script setup lang="ts">
+import { storeToRefs } from 'pinia'
 import Popover from 'primevue/popover'
-import { computed, ref } from 'vue'
+import Skeleton from 'primevue/skeleton'
+import { computed, defineAsyncComponent, ref } from 'vue'
 
 import UserAvatar from '@/components/common/UserAvatar.vue'
+import WorkspaceProfilePic from '@/platform/workspace/components/WorkspaceProfilePic.vue'
 import Button from '@/components/ui/button/Button.vue'
 import { useCurrentUser } from '@/composables/auth/useCurrentUser'
+import { useFeatureFlags } from '@/composables/useFeatureFlags'
+import { isCloud } from '@/platform/distribution/types'
+import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
+import { cn } from '@/utils/tailwindUtil'
 
-import CurrentUserPopover from './CurrentUserPopover.vue'
+import CurrentUserPopoverLegacy from './CurrentUserPopoverLegacy.vue'
+
+const CurrentUserPopoverWorkspace = defineAsyncComponent(
+  () =>
+    import('../../platform/workspace/components/CurrentUserPopoverWorkspace.vue')
+)
+
+const { showArrow = true, compact = false } = defineProps<{
+  showArrow?: boolean
+  compact?: boolean
+}>()
+
+const { flags } = useFeatureFlags()
+const teamWorkspacesEnabled = computed(() => flags.teamWorkspacesEnabled)
 
 const { isLoggedIn, userPhotoUrl } = useCurrentUser()
 
-const popover = ref<InstanceType<typeof Popover> | null>(null)
 const photoURL = computed<string | undefined>(
   () => userPhotoUrl.value ?? undefined
 )
 
+const { workspaceName: teamWorkspaceName, initState } = storeToRefs(
+  useTeamWorkspaceStore()
+)
+
+const showWorkspaceSkeleton = computed(
+  () => isCloud && teamWorkspacesEnabled.value && initState.value === 'loading'
+)
+const showWorkspaceIcon = computed(
+  () => isCloud && teamWorkspacesEnabled.value && initState.value === 'ready'
+)
+
+const workspaceName = computed(() => {
+  if (!showWorkspaceIcon.value) return ''
+  return teamWorkspaceName.value
+})
+
+const popover = ref<InstanceType<typeof Popover> | null>(null)
+const workspacePopoverContent = ref<{
+  refreshBalance: () => void
+} | null>(null)
+
 const closePopover = () => {
   popover.value?.hide()
 }
+
+const onPopoverShow = () => {
+  workspacePopoverContent.value?.refreshBalance()
+}
 </script>
diff --git a/src/components/topbar/CurrentUserPopover.test.ts b/src/components/topbar/CurrentUserPopoverLegacy.test.ts
similarity index 94%
rename from src/components/topbar/CurrentUserPopover.test.ts
rename to src/components/topbar/CurrentUserPopoverLegacy.test.ts
index d7315dad50..f83a3257ff 100644
--- a/src/components/topbar/CurrentUserPopover.test.ts
+++ b/src/components/topbar/CurrentUserPopoverLegacy.test.ts
@@ -7,7 +7,7 @@ import { createI18n } from 'vue-i18n'
 import { formatCreditsFromCents } from '@/base/credits/comfyCredits'
 import enMessages from '@/locales/en/main.json' with { type: 'json' }
 
-import CurrentUserPopover from './CurrentUserPopover.vue'
+import CurrentUserPopoverLegacy from './CurrentUserPopoverLegacy.vue'
 
 // Mock all firebase modules
 vi.mock('firebase/app', () => ({
@@ -31,6 +31,15 @@ vi.mock('pinia')
 const mockShowSettingsDialog = vi.fn()
 const mockShowTopUpCreditsDialog = vi.fn()
 
+// Mock the settings dialog composable
+vi.mock('@/platform/settings/composables/useSettingsDialog', () => ({
+  useSettingsDialog: vi.fn(() => ({
+    show: mockShowSettingsDialog,
+    hide: vi.fn(),
+    showAbout: vi.fn()
+  }))
+}))
+
 // Mock window.open
 const originalWindowOpen = window.open
 beforeEach(() => {
@@ -64,7 +73,6 @@ vi.mock('@/composables/auth/useFirebaseAuthActions', () => ({
 // Mock the dialog service
 vi.mock('@/services/dialogService', () => ({
   useDialogService: vi.fn(() => ({
-    showSettingsDialog: mockShowSettingsDialog,
     showTopUpCreditsDialog: mockShowTopUpCreditsDialog
   }))
 }))
@@ -105,12 +113,13 @@ vi.mock('@/platform/cloud/subscription/composables/useSubscription', () => ({
 }))
 
 // Mock the useSubscriptionDialog composable
-const mockSubscriptionDialogShow = vi.fn()
+const mockShowPricingTable = vi.fn()
 vi.mock(
   '@/platform/cloud/subscription/composables/useSubscriptionDialog',
   () => ({
     useSubscriptionDialog: vi.fn(() => ({
-      show: mockSubscriptionDialogShow,
+      show: vi.fn(),
+      showPricingTable: mockShowPricingTable,
       hide: vi.fn()
     }))
   })
@@ -172,7 +181,7 @@ vi.mock('@/platform/cloud/subscription/components/SubscribeButton.vue', () => ({
   }
 }))
 
-describe('CurrentUserPopover', () => {
+describe('CurrentUserPopoverLegacy', () => {
   beforeEach(() => {
     vi.clearAllMocks()
     mockAuthStoreState.balance = {
@@ -190,7 +199,7 @@ describe('CurrentUserPopover', () => {
       messages: { en: enMessages }
     })
 
-    return mount(CurrentUserPopover, {
+    return mount(CurrentUserPopoverLegacy, {
       global: {
         plugins: [i18n],
         stubs: {
@@ -310,8 +319,8 @@ describe('CurrentUserPopover', () => {
 
     await plansPricingItem.trigger('click')
 
-    // Verify subscription dialog show was called
-    expect(mockSubscriptionDialogShow).toHaveBeenCalled()
+    // Verify showPricingTable was called
+    expect(mockShowPricingTable).toHaveBeenCalled()
 
     // Verify close event was emitted
     expect(wrapper.emitted('close')).toBeTruthy()
diff --git a/src/components/topbar/CurrentUserPopover.vue b/src/components/topbar/CurrentUserPopoverLegacy.vue
similarity index 70%
rename from src/components/topbar/CurrentUserPopover.vue
rename to src/components/topbar/CurrentUserPopoverLegacy.vue
index 69961628d9..8159ee86f4 100644
--- a/src/components/topbar/CurrentUserPopover.vue
+++ b/src/components/topbar/CurrentUserPopoverLegacy.vue
@@ -1,10 +1,10 @@
 <!-- A popover that shows current user information and actions -->
 <template>
   <div
-    class="current-user-popover w-80 -m-3 p-2 rounded-lg border border-border-default bg-base-background shadow-[1px_1px_8px_0_rgba(0,0,0,0.4)]"
+    class="current-user-popover -m-3 w-80 rounded-lg border border-border-default bg-base-background p-2 shadow-[1px_1px_8px_0_rgba(0,0,0,0.4)]"
   >
     <!-- User Info Section -->
-    <div class="flex flex-col items-center px-0 py-3 mb-4">
+    <div class="mb-4 flex flex-col items-center px-0 py-3">
       <UserAvatar
         class="mb-1"
         :photo-url="userPhotoUrl"
@@ -23,7 +23,7 @@
       </p>
       <span
         v-if="subscriptionTierName"
-        class="my-0 text-xs text-foreground bg-secondary-background-hover rounded-full uppercase px-2 py-0.5 font-bold mt-2"
+        class="text-foreground my-0 mt-2 rounded-full bg-secondary-background-hover px-2 py-0.5 text-xs font-bold uppercase"
       >
         {{ subscriptionTierName }}
       </span>
@@ -31,7 +31,7 @@
 
     <!-- Credits Section -->
     <div v-if="isActiveSubscription" class="flex items-center gap-2 px-4 py-2">
-      <i class="icon-[lucide--component] text-amber-400 text-sm" />
+      <i class="icon-[lucide--component] text-sm text-amber-400" />
       <Skeleton
         v-if="authStore.isFetchingBalance"
         width="4rem"
@@ -43,9 +43,19 @@
       }}</span>
       <i
         v-tooltip="{ value: $t('credits.unified.tooltip'), showDelay: 300 }"
-        class="icon-[lucide--circle-help] cursor-help text-base text-muted-foreground mr-auto"
+        class="mr-auto icon-[lucide--circle-help] cursor-help text-base text-muted-foreground"
       />
       <Button
+        v-if="isFreeTier"
+        variant="gradient"
+        size="sm"
+        data-testid="upgrade-to-add-credits-button"
+        @click="handleUpgradeToAddCredits"
+      >
+        {{ $t('subscription.upgradeToAddCredits') }}
+      </Button>
+      <Button
+        v-else
         variant="secondary"
         size="sm"
         class="text-base-foreground"
@@ -61,37 +71,37 @@
         :fluid="false"
         :label="$t('subscription.subscribeToComfyCloud')"
         size="sm"
-        variant="gradient"
+        button-variant="gradient"
         @subscribed="handleSubscribed"
       />
     </div>
 
-    <Divider class="my-2 mx-0" />
+    <Divider class="mx-0 my-2" />
 
     <div
       v-if="isActiveSubscription"
-      class="flex items-center gap-2 px-4 py-2 cursor-pointer hover:bg-secondary-background-hover"
+      class="flex cursor-pointer items-center gap-2 px-4 py-2 hover:bg-secondary-background-hover"
       data-testid="partner-nodes-menu-item"
       @click="handleOpenPartnerNodesInfo"
     >
-      <i class="icon-[lucide--tag] text-muted-foreground text-sm" />
-      <span class="text-sm text-base-foreground flex-1">{{
+      <i class="icon-[lucide--tag] text-sm text-muted-foreground" />
+      <span class="flex-1 text-sm text-base-foreground">{{
         $t('subscription.partnerNodesCredits')
       }}</span>
     </div>
 
     <div
-      class="flex items-center gap-2 px-4 py-2 cursor-pointer hover:bg-secondary-background-hover"
+      class="flex cursor-pointer items-center gap-2 px-4 py-2 hover:bg-secondary-background-hover"
       data-testid="plans-pricing-menu-item"
       @click="handleOpenPlansAndPricing"
     >
-      <i class="icon-[lucide--receipt-text] text-muted-foreground text-sm" />
-      <span class="text-sm text-base-foreground flex-1">{{
+      <i class="icon-[lucide--receipt-text] text-sm text-muted-foreground" />
+      <span class="flex-1 text-sm text-base-foreground">{{
         $t('subscription.plansAndPricing')
       }}</span>
       <span
         v-if="canUpgrade"
-        class="text-xs font-bold text-base-background bg-base-foreground px-1.5 py-0.5 rounded-full"
+        class="rounded-full bg-base-foreground px-1.5 py-0.5 text-xs font-bold text-base-background"
       >
         {{ $t('subscription.upgrade') }}
       </span>
@@ -99,36 +109,36 @@
 
     <div
       v-if="isActiveSubscription"
-      class="flex items-center gap-2 px-4 py-2 cursor-pointer hover:bg-secondary-background-hover"
+      class="flex cursor-pointer items-center gap-2 px-4 py-2 hover:bg-secondary-background-hover"
       data-testid="manage-plan-menu-item"
       @click="handleOpenPlanAndCreditsSettings"
     >
-      <i class="icon-[lucide--file-text] text-muted-foreground text-sm" />
-      <span class="text-sm text-base-foreground flex-1">{{
+      <i class="icon-[lucide--file-text] text-sm text-muted-foreground" />
+      <span class="flex-1 text-sm text-base-foreground">{{
         $t('subscription.managePlan')
       }}</span>
     </div>
 
     <div
-      class="flex items-center gap-2 px-4 py-2 cursor-pointer hover:bg-secondary-background-hover"
+      class="flex cursor-pointer items-center gap-2 px-4 py-2 hover:bg-secondary-background-hover"
       data-testid="user-settings-menu-item"
       @click="handleOpenUserSettings"
     >
-      <i class="icon-[lucide--settings-2] text-muted-foreground text-sm" />
-      <span class="text-sm text-base-foreground flex-1">{{
+      <i class="icon-[lucide--settings-2] text-sm text-muted-foreground" />
+      <span class="flex-1 text-sm text-base-foreground">{{
         $t('userSettings.accountSettings')
       }}</span>
     </div>
 
-    <Divider class="my-2 mx-0" />
+    <Divider class="mx-0 my-2" />
 
     <div
-      class="flex items-center gap-2 px-4 py-2 cursor-pointer hover:bg-secondary-background-hover"
+      class="flex cursor-pointer items-center gap-2 px-4 py-2 hover:bg-secondary-background-hover"
       data-testid="logout-menu-item"
       @click="handleLogout"
     >
-      <i class="icon-[lucide--log-out] text-muted-foreground text-sm" />
-      <span class="text-sm text-base-foreground flex-1">{{
+      <i class="icon-[lucide--log-out] text-sm text-muted-foreground" />
+      <span class="flex-1 text-sm text-base-foreground">{{
         $t('auth.signOut.signOut')
       }}</span>
     </div>
@@ -152,6 +162,7 @@ import { useSubscription } from '@/platform/cloud/subscription/composables/useSu
 import { useSubscriptionDialog } from '@/platform/cloud/subscription/composables/useSubscriptionDialog'
 import { isCloud } from '@/platform/distribution/types'
 import { useTelemetry } from '@/platform/telemetry'
+import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
 import { useDialogService } from '@/services/dialogService'
 import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
 
@@ -165,9 +176,11 @@ const { userDisplayName, userEmail, userPhotoUrl, handleSignOut } =
   useCurrentUser()
 const authActions = useFirebaseAuthActions()
 const authStore = useFirebaseAuthStore()
+const settingsDialog = useSettingsDialog()
 const dialogService = useDialogService()
 const {
   isActiveSubscription,
+  isFreeTier,
   subscriptionTierName,
   subscriptionTier,
   fetchStatus
@@ -193,25 +206,28 @@ const formattedBalance = computed(() => {
 const canUpgrade = computed(() => {
   const tier = subscriptionTier.value
   return (
-    tier === 'FOUNDERS_EDITION' || tier === 'STANDARD' || tier === 'CREATOR'
+    tier === 'FREE' ||
+    tier === 'FOUNDERS_EDITION' ||
+    tier === 'STANDARD' ||
+    tier === 'CREATOR'
   )
 })
 
 const handleOpenUserSettings = () => {
-  dialogService.showSettingsDialog('user')
+  settingsDialog.show('user')
   emit('close')
 }
 
 const handleOpenPlansAndPricing = () => {
-  subscriptionDialog.show()
+  subscriptionDialog.showPricingTable()
   emit('close')
 }
 
 const handleOpenPlanAndCreditsSettings = () => {
   if (isCloud) {
-    dialogService.showSettingsDialog('subscription')
+    settingsDialog.show('subscription')
   } else {
-    dialogService.showSettingsDialog('credits')
+    settingsDialog.show('credits')
   }
 
   emit('close')
@@ -232,6 +248,11 @@ const handleOpenPartnerNodesInfo = () => {
   emit('close')
 }
 
+const handleUpgradeToAddCredits = () => {
+  subscriptionDialog.showPricingTable()
+  emit('close')
+}
+
 const handleLogout = async () => {
   await handleSignOut()
   emit('close')
diff --git a/src/components/topbar/LoginButton.vue b/src/components/topbar/LoginButton.vue
index 386c67e56a..e755c25eda 100644
--- a/src/components/topbar/LoginButton.vue
+++ b/src/components/topbar/LoginButton.vue
@@ -1,15 +1,19 @@
 <template>
   <Button
     v-if="!isLoggedIn"
-    variant="secondary"
+    variant="textonly"
     size="icon"
-    class="rounded-full bg-secondary-background text-base-foreground hover:bg-secondary-background-hover"
+    :class="cn('group rounded-full p-0 text-base-foreground', className)"
     :aria-label="t('g.login')"
     @click="handleSignIn()"
     @mouseenter="showPopover"
     @mouseleave="hidePopover"
   >
-    <i class="icon-[lucide--user] size-4" />
+    <span
+      class="flex size-full items-center justify-center rounded-full bg-secondary-background transition-colors group-hover:bg-transparent"
+    >
+      <i class="icon-[lucide--user] size-4" />
+    </span>
   </Button>
   <Popover
     ref="popoverRef"
@@ -31,13 +35,20 @@
 
 <script setup lang="ts">
 import Popover from 'primevue/popover'
+import type { HTMLAttributes } from 'vue'
 import { ref } from 'vue'
+import { useI18n } from 'vue-i18n'
 
 import Button from '@/components/ui/button/Button.vue'
 import { useCurrentUser } from '@/composables/auth/useCurrentUser'
 import { useExternalLink } from '@/composables/useExternalLink'
-import { t } from '@/i18n'
+import { cn } from '@/utils/tailwindUtil'
 
+const { class: className } = defineProps<{
+  class?: HTMLAttributes['class']
+}>()
+
+const { t } = useI18n()
 const { isLoggedIn, handleSignIn } = useCurrentUser()
 const { buildDocsUrl } = useExternalLink()
 const apiNodesOverviewUrl = buildDocsUrl(
diff --git a/src/components/topbar/TopMenuHelpButton.vue b/src/components/topbar/TopMenuHelpButton.vue
new file mode 100644
index 0000000000..0dd24b0939
--- /dev/null
+++ b/src/components/topbar/TopMenuHelpButton.vue
@@ -0,0 +1,21 @@
+<template>
+  <Button
+    class="comfy-help-center-btn relative text-base-foreground"
+    variant="textonly"
+    @click="toggleHelpCenter"
+  >
+    <div class="not-md:hidden">{{ $t('menu.helpAndFeedback') }}</div>
+    <i class="ml-0.5 icon-[lucide--circle-help]" />
+    <span
+      v-if="shouldShowRedDot"
+      class="absolute top-[7px] right-[7px] size-1.5 rounded-full bg-[#ff3b30]"
+    />
+  </Button>
+</template>
+
+<script setup lang="ts">
+import Button from '@/components/ui/button/Button.vue'
+import { useHelpCenter } from '@/composables/useHelpCenter'
+
+const { shouldShowRedDot, toggleHelpCenter } = useHelpCenter('topbar')
+</script>
diff --git a/src/components/topbar/TopbarBadge.test.ts b/src/components/topbar/TopbarBadge.test.ts
index ffb8abdcd5..1383c002f2 100644
--- a/src/components/topbar/TopbarBadge.test.ts
+++ b/src/components/topbar/TopbarBadge.test.ts
@@ -161,7 +161,7 @@ describe('TopbarBadge', () => {
       )
 
       expect(wrapper.find('.bg-gold-600').exists()).toBe(true)
-      expect(wrapper.find('.text-gold-600').exists()).toBe(true)
+      expect(wrapper.find('.text-warning-background').exists()).toBe(true)
     })
 
     it('uses default error icon for error variant', () => {
@@ -185,7 +185,9 @@ describe('TopbarBadge', () => {
         'full'
       )
 
-      expect(wrapper.find('.pi-exclamation-triangle').exists()).toBe(true)
+      expect(wrapper.find('.icon-\\[lucide--triangle-alert\\]').exists()).toBe(
+        true
+      )
     })
   })
 
diff --git a/src/components/topbar/TopbarBadge.vue b/src/components/topbar/TopbarBadge.vue
index 552daead02..179589397c 100644
--- a/src/components/topbar/TopbarBadge.vue
+++ b/src/components/topbar/TopbarBadge.vue
@@ -37,7 +37,7 @@
         >
           {{ badge.label }}
         </div>
-        <div class="text-sm font-inter">{{ badge.text }}</div>
+        <div class="font-inter text-sm">{{ badge.text }}</div>
         <div v-if="badge.tooltip" class="text-xs">
           {{ badge.tooltip }}
         </div>
@@ -90,7 +90,7 @@
         >
           {{ badge.label }}
         </div>
-        <div class="text-sm font-inter">{{ badge.text }}</div>
+        <div class="font-inter text-sm">{{ badge.text }}</div>
         <div v-if="badge.tooltip" class="text-xs">
           {{ badge.tooltip }}
         </div>
@@ -129,21 +129,19 @@ import { computed, ref } from 'vue'
 import type { TopbarBadge } from '@/types/comfy'
 import { cn } from '@/utils/tailwindUtil'
 
-const props = withDefaults(
-  defineProps<{
-    badge: TopbarBadge
-    displayMode?: 'full' | 'compact' | 'icon-only'
-    reverseOrder?: boolean
-    noPadding?: boolean
-    backgroundColor?: string
-  }>(),
-  {
-    displayMode: 'full',
-    reverseOrder: false,
-    noPadding: false,
-    backgroundColor: 'var(--comfy-menu-bg)'
-  }
-)
+const {
+  badge,
+  displayMode = 'full',
+  reverseOrder,
+  noPadding,
+  backgroundColor = 'var(--comfy-menu-bg)'
+} = defineProps<{
+  badge: TopbarBadge
+  displayMode?: 'full' | 'compact' | 'icon-only'
+  reverseOrder?: boolean
+  noPadding?: boolean
+  backgroundColor?: string
+}>()
 
 const popover = ref<InstanceType<typeof Popover>>()
 
@@ -151,10 +149,10 @@ const togglePopover = (event: Event) => {
   popover.value?.toggle(event)
 }
 
-const variant = computed(() => props.badge.variant ?? 'info')
+const variant = computed(() => badge.variant ?? 'info')
 
 const menuBackgroundStyle = computed(() => ({
-  backgroundColor: props.backgroundColor
+  backgroundColor: backgroundColor
 }))
 
 const labelClasses = computed(() => {
@@ -174,7 +172,7 @@ const textClasses = computed(() => {
     case 'error':
       return 'text-danger-100'
     case 'warning':
-      return 'text-gold-600'
+      return 'text-warning-background'
     case 'info':
     default:
       return 'text-text-primary'
@@ -184,14 +182,14 @@ const textClasses = computed(() => {
 const iconColorClass = computed(() => textClasses.value)
 
 const iconClass = computed(() => {
-  if (props.badge.icon) {
-    return props.badge.icon
+  if (badge.icon) {
+    return badge.icon
   }
   switch (variant.value) {
     case 'error':
       return 'pi pi-exclamation-circle'
     case 'warning':
-      return 'pi pi-exclamation-triangle'
+      return 'icon-[lucide--triangle-alert]'
     case 'info':
     default:
       return undefined
diff --git a/src/components/topbar/TopbarBadges.vue b/src/components/topbar/TopbarBadges.vue
index 3019739605..27235df2c6 100644
--- a/src/components/topbar/TopbarBadges.vue
+++ b/src/components/topbar/TopbarBadges.vue
@@ -19,16 +19,10 @@ import { useTopbarBadgeStore } from '@/stores/topbarBadgeStore'
 
 import TopbarBadge from './TopbarBadge.vue'
 
-withDefaults(
-  defineProps<{
-    reverseOrder?: boolean
-    noPadding?: boolean
-  }>(),
-  {
-    reverseOrder: false,
-    noPadding: false
-  }
-)
+const { reverseOrder, noPadding } = defineProps<{
+  reverseOrder?: boolean
+  noPadding?: boolean
+}>()
 
 const breakpoints = useBreakpoints(breakpointsTailwind)
 const isXl = breakpoints.greaterOrEqual('xl')
diff --git a/src/components/topbar/TopbarSubscribeButton.vue b/src/components/topbar/TopbarSubscribeButton.vue
new file mode 100644
index 0000000000..bc0488a730
--- /dev/null
+++ b/src/components/topbar/TopbarSubscribeButton.vue
@@ -0,0 +1,25 @@
+<template>
+  <Button
+    v-if="isFreeTier"
+    class="mr-2 shrink-0 whitespace-nowrap"
+    variant="gradient"
+    size="sm"
+    data-testid="topbar-subscribe-button"
+    @click="handleClick"
+  >
+    {{ $t('subscription.subscribeForMore') }}
+  </Button>
+</template>
+
+<script setup lang="ts">
+import Button from '@/components/ui/button/Button.vue'
+import { useBillingContext } from '@/composables/billing/useBillingContext'
+import { useSubscriptionDialog } from '@/platform/cloud/subscription/composables/useSubscriptionDialog'
+
+const { isFreeTier } = useBillingContext()
+const subscriptionDialog = useSubscriptionDialog()
+
+function handleClick() {
+  subscriptionDialog.showPricingTable()
+}
+</script>
diff --git a/src/components/topbar/WorkflowOverflowMenu.vue b/src/components/topbar/WorkflowOverflowMenu.vue
index f22ebfe13f..aa28177199 100644
--- a/src/components/topbar/WorkflowOverflowMenu.vue
+++ b/src/components/topbar/WorkflowOverflowMenu.vue
@@ -2,7 +2,7 @@
   <div>
     <Button
       v-tooltip="{ value: $t('g.moreWorkflows'), showDelay: 300 }"
-      class="rounded-none h-full w-auto aspect-square"
+      class="aspect-square h-full w-auto rounded-none"
       variant="muted-textonly"
       size="icon"
       :aria-label="$t('g.moreWorkflows')"
diff --git a/src/components/topbar/WorkflowTab.vue b/src/components/topbar/WorkflowTab.vue
index e48239b20e..8c1e139b59 100644
--- a/src/components/topbar/WorkflowTab.vue
+++ b/src/components/topbar/WorkflowTab.vue
@@ -1,32 +1,54 @@
 <template>
-  <div
-    ref="workflowTabRef"
-    class="workflow-tab group flex gap-2 p-2"
-    v-bind="$attrs"
-    @mouseenter="handleMouseEnter"
-    @mouseleave="handleMouseLeave"
-    @click="handleClick"
-  >
-    <span class="workflow-label inline-block max-w-[150px] truncate text-sm">
-      {{ workflowOption.workflow.filename }}
-    </span>
-    <div class="relative">
-      <span
-        v-if="shouldShowStatusIndicator"
-        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
+  <ContextMenuRoot>
+    <ContextMenuTrigger as-child>
+      <div
+        ref="workflowTabRef"
+        class="workflow-tab group flex gap-2 p-2"
+        v-bind="$attrs"
+        @mouseenter="handleMouseEnter"
+        @mouseleave="handleMouseLeave"
+        @mouseup="handleMouseUp"
+        @click="handleClick"
       >
-      <Button
-        class="close-button invisible w-auto p-0"
-        variant="muted-textonly"
-        size="icon-sm"
-        :aria-label="t('g.close')"
-        @click.stop="onCloseWorkflow(workflowOption)"
+        <i
+          v-if="workflowOption.workflow.initialMode === 'app'"
+          class="icon-[lucide--panels-top-left] bg-primary-background"
+        />
+        <span
+          class="workflow-label inline-block max-w-[150px] truncate text-sm"
+        >
+          {{ workflowOption.workflow.filename }}
+        </span>
+        <div class="relative">
+          <span
+            v-if="shouldShowStatusIndicator"
+            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
+          >
+          <Button
+            class="close-button invisible w-auto p-0"
+            variant="muted-textonly"
+            size="icon-sm"
+            :aria-label="t('g.close')"
+            @click.stop="onCloseWorkflow(workflowOption)"
+          >
+            <i class="pi pi-times" />
+          </Button>
+        </div>
+      </div>
+    </ContextMenuTrigger>
+    <ContextMenuPortal>
+      <ContextMenuContent
+        class="z-1000 min-w-56 rounded-lg border border-border-subtle bg-base-background px-2 py-3 shadow-interface"
       >
-        <i class="pi pi-times" />
-      </Button>
-    </div>
-  </div>
+        <WorkflowActionsList
+          :items="contextMenuItems"
+          :item-component="ContextMenuItem"
+          :separator-component="ContextMenuSeparator"
+        />
+      </ContextMenuContent>
+    </ContextMenuPortal>
+  </ContextMenuRoot>
 
   <WorkflowTabPopover
     ref="popoverRef"
@@ -37,20 +59,32 @@
 </template>
 
 <script setup lang="ts">
+import {
+  ContextMenuContent,
+  ContextMenuItem,
+  ContextMenuPortal,
+  ContextMenuRoot,
+  ContextMenuSeparator,
+  ContextMenuTrigger
+} from 'reka-ui'
 import { computed, onUnmounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
+import WorkflowActionsList from '@/components/common/WorkflowActionsList.vue'
 import Button from '@/components/ui/button/Button.vue'
 import {
   usePragmaticDraggable,
   usePragmaticDroppable
 } from '@/composables/usePragmaticDragAndDrop'
+import { useWorkflowActionsMenu } from '@/composables/useWorkflowActionsMenu'
 import { useSettingStore } from '@/platform/settings/settingStore'
 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'
 import { useWorkflowThumbnail } from '@/renderer/core/thumbnail/useWorkflowThumbnail'
+import { useCommandStore } from '@/stores/commandStore'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
+import type { WorkflowMenuItem } from '@/types/workflowMenuItem'
 
 import WorkflowTabPopover from './WorkflowTabPopover.vue'
 
@@ -61,6 +95,15 @@ interface WorkflowOption {
 
 const props = defineProps<{
   workflowOption: WorkflowOption
+  isFirst: boolean
+  isLast: boolean
+}>()
+
+const emit = defineEmits<{
+  closeToLeft: []
+  closeToRight: []
+  closeOthers: []
+  mouseup: [event: MouseEvent]
 }>()
 
 const { t } = useI18n()
@@ -127,6 +170,10 @@ const handleClick = (event: Event) => {
   popoverRef.value?.togglePopover(event)
 }
 
+const handleMouseUp = (event: MouseEvent) => {
+  emit('mouseup', event)
+}
+
 const closeWorkflows = async (options: WorkflowOption[]) => {
   for (const opt of options) {
     if (
@@ -144,6 +191,65 @@ const closeWorkflows = async (options: WorkflowOption[]) => {
 const onCloseWorkflow = async (option: WorkflowOption) => {
   await closeWorkflows([option])
 }
+
+const commandStore = useCommandStore()
+const workflow = computed(() => props.workflowOption.workflow)
+
+const { menuItems: baseMenuItems } = useWorkflowActionsMenu(
+  () => commandStore.execute('Comfy.RenameWorkflow'),
+  { includeDelete: false, workflow }
+)
+
+const contextMenuItems = computed<WorkflowMenuItem[]>(() => [
+  ...baseMenuItems.value,
+  { separator: true },
+  {
+    id: 'close-tab',
+    label: t('tabMenu.closeTab'),
+    icon: 'pi pi-times',
+    command: () => onCloseWorkflow(props.workflowOption)
+  },
+  {
+    id: 'close-tabs-to-left',
+    label: t('tabMenu.closeTabsToLeft'),
+    overlayIcon: {
+      mainIcon: 'pi pi-times',
+      subIcon: 'pi pi-arrow-left',
+      positionX: 'right',
+      positionY: 'bottom',
+      subIconScale: 0.5
+    },
+    command: () => emit('closeToLeft'),
+    disabled: props.isFirst
+  },
+  {
+    id: 'close-tabs-to-right',
+    label: t('tabMenu.closeTabsToRight'),
+    overlayIcon: {
+      mainIcon: 'pi pi-times',
+      subIcon: 'pi pi-arrow-right',
+      positionX: 'right',
+      positionY: 'bottom',
+      subIconScale: 0.5
+    },
+    command: () => emit('closeToRight'),
+    disabled: props.isLast
+  },
+  {
+    id: 'close-other-tabs',
+    label: t('tabMenu.closeOtherTabs'),
+    overlayIcon: {
+      mainIcon: 'pi pi-times',
+      subIcon: 'pi pi-arrows-h',
+      positionX: 'right',
+      positionY: 'bottom',
+      subIconScale: 0.5
+    },
+    command: () => emit('closeOthers'),
+    disabled: props.isFirst && props.isLast
+  }
+])
+
 const tabGetter = () => workflowTabRef.value as HTMLElement
 
 usePragmaticDraggable(tabGetter, {
diff --git a/src/components/topbar/WorkflowTabPopover.vue b/src/components/topbar/WorkflowTabPopover.vue
index 27b113e73c..9485c5d268 100644
--- a/src/components/topbar/WorkflowTabPopover.vue
+++ b/src/components/topbar/WorkflowTabPopover.vue
@@ -140,54 +140,65 @@ defineExpose({
 </script>
 
 <style scoped>
-@reference '../../assets/css/style.css';
-
 .workflow-preview-content {
-  @apply flex flex-col rounded-xl overflow-hidden;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  border-radius: var(--radius-xl);
   max-width: var(--popover-width);
   background-color: var(--comfy-menu-bg);
   color: var(--fg-color);
 }
 
 .workflow-preview-thumbnail {
-  @apply relative p-2;
+  position: relative;
+  padding: calc(var(--spacing) * 2);
 }
 
 .workflow-preview-thumbnail img {
-  @apply shadow-md;
+  box-shadow: var(--shadow-md);
   background-color: color-mix(in srgb, var(--comfy-menu-bg) 70%, black);
 }
 
 .dark-theme .workflow-preview-thumbnail img {
-  @apply shadow-lg;
+  box-shadow: var(--shadow-lg);
 }
 
 .workflow-preview-footer {
-  @apply pt-1 pb-2 px-3;
+  padding-top: calc(var(--spacing) * 1);
+  padding-right: calc(var(--spacing) * 3);
+  padding-bottom: calc(var(--spacing) * 2);
+  padding-left: calc(var(--spacing) * 3);
 }
 
 .workflow-preview-name {
-  @apply block text-sm font-medium overflow-hidden text-ellipsis whitespace-nowrap;
+  display: block;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font-size: var(--text-sm);
+  line-height: var(--tw-leading, var(--text-sm--line-height));
+  font-weight: var(--font-weight-medium);
   color: var(--fg-color);
 }
 </style>
 
 <style>
-@reference '../../assets/css/style.css';
-
 .workflow-popover-fade {
   --p-popover-background: transparent;
   --p-popover-content-padding: 0;
-  @apply bg-transparent rounded-xl shadow-lg;
+  border-radius: var(--radius-xl);
+  background-color: transparent;
+  box-shadow: var(--shadow-lg);
   transition: opacity 0.15s ease-out !important;
 }
 
 .workflow-popover-fade.p-popover-flipped {
-  @apply -translate-y-full;
+  transform: translateY(-100%);
 }
 
 .dark-theme .workflow-popover-fade {
-  @apply shadow-2xl;
+  box-shadow: var(--shadow-2xl);
 }
 
 .workflow-popover-fade.p-popover::after,
diff --git a/src/components/topbar/WorkflowTabs.vue b/src/components/topbar/WorkflowTabs.vue
index 9b13c29e7c..21d265662b 100644
--- a/src/components/topbar/WorkflowTabs.vue
+++ b/src/components/topbar/WorkflowTabs.vue
@@ -8,7 +8,7 @@
       v-if="showOverflowArrows"
       variant="muted-textonly"
       size="icon"
-      class="overflow-arrow overflow-arrow-left h-full w-auto aspect-square"
+      class="overflow-arrow overflow-arrow-left aspect-square h-full w-auto"
       :aria-label="$t('g.scrollLeft')"
       :disabled="!leftArrowEnabled"
       @mousedown="whileMouseDown($event, () => scroll(-1))"
@@ -32,11 +32,20 @@
         data-key="value"
         @update:model-value="onWorkflowChange"
       >
-        <template #option="{ option }">
+        <template #option="{ option, index }">
           <WorkflowTab
             :workflow-option="option"
-            @contextmenu="showContextMenu($event, option)"
+            :is-first="index === 0"
+            :is-last="index === options.length - 1"
             @click.middle="onCloseWorkflow(option)"
+            @close-to-left="closeWorkflows(options.slice(0, index))"
+            @close-to-right="closeWorkflows(options.slice(index + 1))"
+            @close-others="
+              closeWorkflows([
+                ...options.slice(index + 1),
+                ...options.slice(0, index)
+              ])
+            "
           />
         </template>
       </SelectButton>
@@ -45,7 +54,7 @@
       v-if="showOverflowArrows"
       variant="muted-textonly"
       size="icon"
-      class="overflow-arrow overflow-arrow-right h-full w-auto aspect-square"
+      class="overflow-arrow overflow-arrow-right aspect-square h-full w-auto"
       :aria-label="$t('g.scrollRight')"
       :disabled="!rightArrowEnabled"
       @mousedown="whileMouseDown($event, () => scroll(1))"
@@ -58,8 +67,11 @@
       :active-workflow="workflowStore.activeWorkflow"
     />
     <Button
-      v-tooltip="{ value: $t('sideToolbar.newBlankWorkflow'), showDelay: 300 }"
-      class="new-blank-workflow-button no-drag shrink-0 rounded-none h-full w-auto aspect-square"
+      v-tooltip="{
+        value: $t('sideToolbar.newBlankWorkflow'),
+        showDelay: 300
+      }"
+      class="new-blank-workflow-button no-drag aspect-square h-full w-auto shrink-0 rounded-none"
       variant="muted-textonly"
       size="icon"
       :aria-label="$t('sideToolbar.newBlankWorkflow')"
@@ -67,32 +79,44 @@
     >
       <i class="pi pi-plus" />
     </Button>
-    <ContextMenu ref="menu" :model="contextMenuItems" />
+    <div
+      v-if="isIntegratedTabBar"
+      class="ml-auto flex shrink-0 items-center gap-2 px-2"
+    >
+      <TopMenuHelpButton />
+      <CurrentUserButton
+        v-if="isLoggedIn"
+        :show-arrow="false"
+        compact
+        class="grid w-10 shrink-0 p-1"
+      />
+      <LoginButton v-else-if="isDesktop" class="p-1" />
+    </div>
     <div v-if="isDesktop" class="window-actions-spacer app-drag shrink-0" />
   </div>
 </template>
 
 <script setup lang="ts">
 import { useScroll } from '@vueuse/core'
-import ContextMenu from 'primevue/contextmenu'
 import ScrollPanel from 'primevue/scrollpanel'
 import SelectButton from 'primevue/selectbutton'
 import { computed, nextTick, onUpdated, ref, watch } from 'vue'
 import type { WatchStopHandle } from 'vue'
-import { useI18n } from 'vue-i18n'
 
+import CurrentUserButton from '@/components/topbar/CurrentUserButton.vue'
+import LoginButton from '@/components/topbar/LoginButton.vue'
+import TopMenuHelpButton from '@/components/topbar/TopMenuHelpButton.vue'
 import WorkflowTab from '@/components/topbar/WorkflowTab.vue'
 import Button from '@/components/ui/button/Button.vue'
+import { useCurrentUser } from '@/composables/auth/useCurrentUser'
 import { useOverflowObserver } from '@/composables/element/useOverflowObserver'
+import { useSettingStore } from '@/platform/settings/settingStore'
 import { useWorkflowService } from '@/platform/workflow/core/services/workflowService'
 import type { ComfyWorkflow } from '@/platform/workflow/management/stores/workflowStore'
-import {
-  useWorkflowBookmarkStore,
-  useWorkflowStore
-} from '@/platform/workflow/management/stores/workflowStore'
+import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
 import { useCommandStore } from '@/stores/commandStore'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
-import { isElectron } from '@/utils/envUtil'
+import { isDesktop } from '@/platform/distribution/types'
 import { whileMouseDown } from '@/utils/mouseDownUtil'
 
 import WorkflowOverflowMenu from './WorkflowOverflowMenu.vue'
@@ -106,21 +130,22 @@ const props = defineProps<{
   class?: string
 }>()
 
-const { t } = useI18n()
+const settingStore = useSettingStore()
 const workspaceStore = useWorkspaceStore()
 const workflowStore = useWorkflowStore()
-const workflowBookmarkStore = useWorkflowBookmarkStore()
 const workflowService = useWorkflowService()
+const commandStore = useCommandStore()
+const { isLoggedIn } = useCurrentUser()
+
+const isIntegratedTabBar = computed(
+  () => settingStore.get('Comfy.UI.TabBarLayout') === 'Integrated'
+)
 
-const rightClickedTab = ref<WorkflowOption | undefined>()
-const menu = ref()
 const containerRef = ref<HTMLElement | null>(null)
 const showOverflowArrows = ref(false)
 const leftArrowEnabled = ref(false)
 const rightArrowEnabled = ref(false)
 
-const isDesktop = isElectron()
-
 const workflowToOption = (workflow: ComfyWorkflow): WorkflowOption => ({
   value: workflow.path,
   workflow
@@ -165,59 +190,6 @@ const onCloseWorkflow = async (option: WorkflowOption) => {
   await closeWorkflows([option])
 }
 
-const showContextMenu = (event: MouseEvent, option: WorkflowOption) => {
-  rightClickedTab.value = option
-  menu.value.show(event)
-}
-const contextMenuItems = computed(() => {
-  const tab = rightClickedTab.value as WorkflowOption
-  if (!tab) return []
-  const index = options.value.findIndex((v) => v.workflow === tab.workflow)
-
-  return [
-    {
-      label: t('tabMenu.duplicateTab'),
-      command: async () => {
-        await workflowService.duplicateWorkflow(tab.workflow)
-      }
-    },
-    {
-      separator: true
-    },
-    {
-      label: t('tabMenu.closeTab'),
-      command: () => onCloseWorkflow(tab)
-    },
-    {
-      label: t('tabMenu.closeTabsToLeft'),
-      command: () => closeWorkflows(options.value.slice(0, index)),
-      disabled: index <= 0
-    },
-    {
-      label: t('tabMenu.closeTabsToRight'),
-      command: () => closeWorkflows(options.value.slice(index + 1)),
-      disabled: index === options.value.length - 1
-    },
-    {
-      label: t('tabMenu.closeOtherTabs'),
-      command: () =>
-        closeWorkflows([
-          ...options.value.slice(index + 1),
-          ...options.value.slice(0, index)
-        ]),
-      disabled: options.value.length <= 1
-    },
-    {
-      label: workflowBookmarkStore.isBookmarked(tab.workflow.path)
-        ? t('tabMenu.removeFromBookmarks')
-        : t('tabMenu.addToBookmarks'),
-      command: () => workflowBookmarkStore.toggleBookmarked(tab.workflow.path),
-      disabled: tab.workflow.isTemporary
-    }
-  ]
-})
-const commandStore = useCommandStore()
-
 // Horizontal scroll on wheel
 const handleWheel = (event: WheelEvent) => {
   const scrollElement = event.currentTarget as HTMLElement
@@ -328,63 +300,72 @@ onUpdated(() => {
 </script>
 
 <style scoped>
-@reference '../../assets/css/style.css';
-
 .workflow-tabs-container {
   background-color: var(--comfy-menu-bg);
 }
 
 :deep(.p-togglebutton) {
-  @apply p-0 bg-transparent rounded-none shrink relative border-0 border-r border-solid;
+  position: relative;
+  flex-shrink: 1;
+  border: 0;
+  border-right-style: solid;
+  border-right-width: 1px;
+  border-radius: 0;
+  background-color: transparent;
+  padding: 0;
   border-right-color: var(--border-color);
   min-width: 90px;
 }
 
 .overflow-arrow {
-  @apply px-2 rounded-none;
+  border-radius: 0;
+  padding-inline: calc(var(--spacing) * 2);
 }
 
 .overflow-arrow[disabled] {
-  @apply opacity-25;
+  opacity: 0.25;
 }
 
 :deep(.p-togglebutton > .p-togglebutton-content) {
-  @apply max-w-full;
+  max-width: 100%;
 }
 
 :deep(.workflow-tab) {
-  @apply max-w-full;
+  max-width: 100%;
 }
 
 :deep(.p-togglebutton::before) {
-  @apply hidden;
+  display: none;
 }
 
 :deep(.p-togglebutton:first-child) {
-  @apply border-l border-solid;
+  border-left-style: solid;
+  border-left-width: 1px;
   border-left-color: var(--border-color);
 }
 
 :deep(.p-togglebutton:not(:first-child)) {
-  @apply border-l-0;
+  border-left-width: 0;
 }
 
 :deep(.p-togglebutton.p-togglebutton-checked) {
-  @apply border-b border-solid h-full;
+  height: 100%;
+  border-bottom-style: solid;
+  border-bottom-width: 1px;
   border-bottom-color: var(--p-button-text-primary-color);
 }
 
 :deep(.p-togglebutton:not(.p-togglebutton-checked)) {
-  @apply opacity-75;
+  opacity: 0.75;
 }
 
 :deep(.p-togglebutton-checked) .close-button,
 :deep(.p-togglebutton:hover) .close-button {
-  @apply visible;
+  visibility: visible;
 }
 
 :deep(.p-scrollpanel-content) {
-  @apply h-full;
+  height: 100%;
 }
 
 :deep(.workflow-tabs) {
@@ -394,11 +375,12 @@ onUpdated(() => {
 /* Scrollbar half opacity to avoid blocking the active tab bottom border */
 :deep(.p-scrollpanel:hover .p-scrollpanel-bar),
 :deep(.p-scrollpanel:active .p-scrollpanel-bar) {
-  @apply opacity-50;
+  opacity: 0.5;
 }
 
 :deep(.p-selectbutton) {
-  @apply rounded-none h-full;
+  height: 100%;
+  border-radius: 0;
 }
 
 .workflow-tabs-container-desktop {
@@ -406,7 +388,7 @@ onUpdated(() => {
 }
 
 .window-actions-spacer {
-  @apply flex-auto;
+  flex: auto;
   /* If we are using custom titlebar, then we need to add a gap for the user to drag the window */
   --window-actions-spacer-width: min(75px, env(titlebar-area-width, 0) * 9999);
   min-width: var(--window-actions-spacer-width);
diff --git a/src/components/ui/AGENTS.md b/src/components/ui/AGENTS.md
new file mode 100644
index 0000000000..53b9979b70
--- /dev/null
+++ b/src/components/ui/AGENTS.md
@@ -0,0 +1,19 @@
+# UI Component Guidelines
+
+## Adding New Components
+
+```bash
+pnpm dlx shadcn-vue@latest add <component-name> --yes
+```
+
+After adding, create `ComponentName.stories.ts` with Default, Disabled, and variant stories.
+
+## Reka UI Wrapper Components
+
+- Use reactive props destructuring with rest: `const { class: className, ...restProps } = defineProps<Props>()`
+- Use `useForwardProps(restProps)` for prop forwarding, or `computed()` if adding defaults
+- Import siblings directly (`./Component.vue`), not from barrel (`'.'`)
+- Use `cn()` for class merging with `className`
+- Use Iconify icons: `<i class="icon-[lucide--check]" />`
+- Use design tokens: `bg-secondary-background`, `text-muted-foreground`, `border-border-default`
+- Tailwind 4 CSS variables use parentheses: `h-(--my-var)` not `h-[--my-var]`
diff --git a/src/components/ui/Popover.vue b/src/components/ui/Popover.vue
new file mode 100644
index 0000000000..ed101e5c72
--- /dev/null
+++ b/src/components/ui/Popover.vue
@@ -0,0 +1,87 @@
+<script setup lang="ts">
+import type { MenuItem } from 'primevue/menuitem'
+import {
+  PopoverArrow,
+  PopoverContent,
+  PopoverPortal,
+  PopoverRoot,
+  PopoverTrigger
+} from 'reka-ui'
+
+import Button from '@/components/ui/button/Button.vue'
+import { cn } from '@/utils/tailwindUtil'
+
+defineOptions({
+  inheritAttrs: false
+})
+
+const {
+  entries,
+  icon,
+  to,
+  showArrow = true
+} = defineProps<{
+  entries?: MenuItem[]
+  icon?: string
+  to?: string | HTMLElement
+  showArrow?: boolean
+}>()
+</script>
+
+<template>
+  <PopoverRoot v-slot="{ close }">
+    <PopoverTrigger as-child>
+      <slot name="button">
+        <Button size="icon">
+          <i :class="icon ?? 'icon-[lucide--ellipsis]'" />
+        </Button>
+      </slot>
+    </PopoverTrigger>
+    <PopoverPortal :to>
+      <PopoverContent
+        side="bottom"
+        :side-offset="5"
+        :collision-padding="10"
+        v-bind="$attrs"
+        class="data-[state=open]:data-[side=top]:animate-slideDownAndFade data-[state=open]:data-[side=right]:animate-slideLeftAndFade data-[state=open]:data-[side=bottom]:animate-slideUpAndFade data-[state=open]:data-[side=left]:animate-slideRightAndFade z-1700 rounded-lg border border-border-subtle bg-base-background p-2 shadow-sm will-change-[transform,opacity]"
+      >
+        <slot :close>
+          <div class="flex flex-col p-1">
+            <template v-for="item in entries ?? []" :key="item.label">
+              <div
+                v-if="item.separator"
+                class="w-full border-b border-border-subtle"
+              />
+              <div
+                v-else
+                :class="
+                  cn(
+                    'my-1 flex flex-row gap-4 rounded-sm p-2',
+                    item.disabled
+                      ? 'pointer-events-none opacity-50'
+                      : item.command &&
+                          'cursor-pointer hover:bg-secondary-background-hover'
+                  )
+                "
+                @click="
+                  (e) => {
+                    if (!item.command || item.disabled) return
+                    item.command({ originalEvent: e, item })
+                    close()
+                  }
+                "
+              >
+                <i v-if="item.icon" :class="item.icon" />
+                {{ item.label }}
+              </div>
+            </template>
+          </div>
+        </slot>
+        <PopoverArrow
+          v-if="showArrow"
+          class="fill-base-background stroke-border-subtle"
+        />
+      </PopoverContent>
+    </PopoverPortal>
+  </PopoverRoot>
+</template>
diff --git a/src/components/ui/TypeformPopoverButton.vue b/src/components/ui/TypeformPopoverButton.vue
new file mode 100644
index 0000000000..42f8f471bb
--- /dev/null
+++ b/src/components/ui/TypeformPopoverButton.vue
@@ -0,0 +1,46 @@
+<script setup lang="ts">
+import { breakpointsTailwind, useBreakpoints, whenever } from '@vueuse/core'
+import { useTemplateRef } from 'vue'
+
+import Popover from '@/components/ui/Popover.vue'
+import Button from '@/components/ui/button/Button.vue'
+
+const { active = true } = defineProps<{
+  dataTfWidget: string
+  active?: boolean
+}>()
+
+const feedbackRef = useTemplateRef('feedbackRef')
+const isMobile = useBreakpoints(breakpointsTailwind).smaller('md')
+
+whenever(feedbackRef, () => {
+  const scriptEl = document.createElement('script')
+  scriptEl.src = '//embed.typeform.com/next/embed.js'
+  feedbackRef.value?.appendChild(scriptEl)
+})
+</script>
+<template>
+  <Button
+    v-if="isMobile"
+    as="a"
+    :href="`https://form.typeform.com/to/${dataTfWidget}`"
+    target="_blank"
+    variant="inverted"
+    class="flex h-10 items-center justify-center gap-2.5 px-3 py-2"
+    v-bind="$attrs"
+  >
+    <i class="icon-[lucide--circle-help] size-4" />
+  </Button>
+  <Popover v-else>
+    <template #button>
+      <Button
+        variant="inverted"
+        class="flex h-10 items-center justify-center gap-2.5 px-3 py-2"
+        v-bind="$attrs"
+      >
+        <i class="icon-[lucide--circle-help] size-4" />
+      </Button>
+    </template>
+    <div v-if="active" ref="feedbackRef" data-tf-auto-resize :data-tf-widget />
+  </Popover>
+</template>
diff --git a/src/components/ui/ZoomPane.vue b/src/components/ui/ZoomPane.vue
new file mode 100644
index 0000000000..e79e64b724
--- /dev/null
+++ b/src/components/ui/ZoomPane.vue
@@ -0,0 +1,60 @@
+<script setup lang="ts">
+import { computed, ref, useTemplateRef } from 'vue'
+
+const zoomPane = useTemplateRef('zoomPane')
+
+const zoom = ref(1.0)
+const panX = ref(0.0)
+const panY = ref(0.0)
+
+function handleWheel(e: WheelEvent) {
+  const zoomPaneEl = zoomPane.value
+  if (!zoomPaneEl || (e.deltaY < 0 ? zoom.value > 1200 : zoom.value < -500))
+    return
+
+  zoom.value -= e.deltaY
+  const { x, y, width, height } = zoomPaneEl.getBoundingClientRect()
+  const offsetX = e.clientX - x - width / 2
+  const offsetY = e.clientY - y - height / 2
+  const scaler = 1.1 ** (e.deltaY / -30)
+
+  panY.value = panY.value * scaler - offsetY * (scaler - 1)
+  panX.value = panX.value * scaler - offsetX * (scaler - 1)
+}
+
+let dragging = false
+function handleDown(e: PointerEvent) {
+  if (e.button !== 0) return
+
+  const zoomPaneEl = zoomPane.value
+  if (!zoomPaneEl) return
+  zoomPaneEl.parentElement?.focus()
+
+  zoomPaneEl.setPointerCapture(e.pointerId)
+  dragging = true
+}
+function handleMove(e: PointerEvent) {
+  if (!dragging) return
+  panX.value += e.movementX
+  panY.value += e.movementY
+}
+
+const transform = computed(() => {
+  const scale = 1.1 ** (zoom.value / 30)
+  const matrix = [scale, 0, 0, scale, panX.value, panY.value]
+  return `matrix(${matrix.join(',')})`
+})
+</script>
+<template>
+  <div
+    ref="zoomPane"
+    class="place-content-center contain-size"
+    @wheel="handleWheel"
+    @pointerdown.prevent="handleDown"
+    @pointermove="handleMove"
+    @pointerup="dragging = false"
+    @pointercancel="dragging = false"
+  >
+    <slot :style="{ transform }" />
+  </div>
+</template>
diff --git a/src/components/ui/button/button.variants.ts b/src/components/ui/button/button.variants.ts
index 2d36d17b6d..ba469550d0 100644
--- a/src/components/ui/button/button.variants.ts
+++ b/src/components/ui/button/button.variants.ts
@@ -2,11 +2,11 @@ import type { VariantProps } from 'cva'
 import { cva } from 'cva'
 
 export const buttonVariants = cva({
-  base: 'inline-flex items-center justify-center gap-2 cursor-pointer whitespace-nowrap appearance-none border-none rounded-md text-sm font-medium font-inter transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',
+  base: 'relative inline-flex items-center justify-center gap-2 cursor-pointer whitespace-nowrap appearance-none border-none rounded-md text-sm font-medium font-inter transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',
   variants: {
     variant: {
       secondary:
-        'bg-secondary-background text-secondary-foreground hover:bg-secondary-background-hover',
+        'text-secondary-foreground bg-secondary-background hover:bg-secondary-background-hover',
       primary:
         'bg-primary-background text-base-foreground hover:bg-primary-background-hover',
       inverted:
@@ -14,18 +14,23 @@ export const buttonVariants = cva({
       destructive:
         'bg-destructive-background text-base-foreground hover:bg-destructive-background-hover',
       textonly:
-        'text-base-foreground bg-transparent hover:bg-secondary-background-hover',
+        'bg-transparent text-base-foreground hover:bg-secondary-background-hover',
       'muted-textonly':
-        'text-muted-foreground bg-transparent hover:bg-secondary-background-hover',
+        'bg-transparent text-muted-foreground hover:bg-secondary-background-hover',
       'destructive-textonly':
-        'text-destructive-background bg-transparent hover:bg-destructive-background/10'
+        'bg-transparent text-destructive-background hover:bg-destructive-background/10',
+      'overlay-white': 'bg-white text-gray-600 hover:bg-white/90',
+      base: 'bg-base-background text-base-foreground hover:bg-secondary-background-hover',
+      gradient:
+        'border-transparent bg-(image:--subscription-button-gradient) text-white hover:opacity-90'
     },
     size: {
       sm: 'h-6 rounded-sm px-2 py-1 text-xs',
       md: 'h-8 rounded-lg p-2 text-xs',
       lg: 'h-10 rounded-lg px-4 py-2 text-sm',
       icon: 'size-8',
-      'icon-sm': 'size-5 p-0'
+      'icon-sm': 'size-5 p-0',
+      unset: ''
     }
   },
 
@@ -44,7 +49,10 @@ const variants = [
   'destructive',
   'textonly',
   'muted-textonly',
-  'destructive-textonly'
+  'destructive-textonly',
+  'base',
+  'overlay-white',
+  'gradient'
 ] as const satisfies Array<ButtonVariants['variant']>
 const sizes = ['sm', 'md', 'lg', 'icon', 'icon-sm'] as const satisfies Array<
   ButtonVariants['size']
diff --git a/src/components/ui/input/Input.stories.ts b/src/components/ui/input/Input.stories.ts
new file mode 100644
index 0000000000..b619baa8a7
--- /dev/null
+++ b/src/components/ui/input/Input.stories.ts
@@ -0,0 +1,33 @@
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+
+import Input from './Input.vue'
+
+const meta: Meta<typeof Input> = {
+  title: 'Components/Input',
+  component: Input,
+  tags: ['autodocs'],
+  render: (args) => ({
+    components: { Input },
+    setup: () => ({ args }),
+    template: '<Input v-bind="args" placeholder="Enter text..." />'
+  })
+}
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const Default: Story = {}
+
+export const WithValue: Story = {
+  args: {
+    modelValue: 'Hello, world!'
+  }
+}
+
+export const Disabled: Story = {
+  render: (args) => ({
+    components: { Input },
+    setup: () => ({ args }),
+    template: '<Input v-bind="args" placeholder="Disabled input" disabled />'
+  })
+}
diff --git a/src/components/ui/input/Input.vue b/src/components/ui/input/Input.vue
new file mode 100644
index 0000000000..557c0cba28
--- /dev/null
+++ b/src/components/ui/input/Input.vue
@@ -0,0 +1,32 @@
+<script setup lang="ts">
+import type { HTMLAttributes } from 'vue'
+import { useTemplateRef } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+const { class: className } = defineProps<{
+  class?: HTMLAttributes['class']
+}>()
+
+const modelValue = defineModel<string | number>()
+
+const inputRef = useTemplateRef<HTMLInputElement>('inputEl')
+
+defineExpose({
+  focus: () => inputRef.value?.focus(),
+  select: () => inputRef.value?.select()
+})
+</script>
+
+<template>
+  <input
+    ref="inputEl"
+    v-model="modelValue"
+    :class="
+      cn(
+        'flex h-10 w-full min-w-0 appearance-none rounded-lg border-none bg-secondary-background px-4 py-2 text-sm text-base-foreground placeholder:text-muted-foreground focus-visible:ring-1 focus-visible:ring-border-default focus-visible:outline-none disabled:pointer-events-none disabled:opacity-50',
+        className
+      )
+    "
+  />
+</template>
diff --git a/src/components/ui/search-input/SearchInput.stories.ts b/src/components/ui/search-input/SearchInput.stories.ts
new file mode 100644
index 0000000000..3adf7af3e0
--- /dev/null
+++ b/src/components/ui/search-input/SearchInput.stories.ts
@@ -0,0 +1,159 @@
+import type {
+  ComponentPropsAndSlots,
+  Meta,
+  StoryObj
+} from '@storybook/vue3-vite'
+
+import { ref } from 'vue'
+
+import SearchInput from './SearchInput.vue'
+import { searchInputStoryConfig } from './searchInput.variants'
+
+const { sizes } = searchInputStoryConfig
+
+const meta: Meta<ComponentPropsAndSlots<typeof SearchInput>> = {
+  title: 'Components/Input/SearchInput',
+  component: SearchInput,
+  tags: ['autodocs'],
+  argTypes: {
+    modelValue: { control: 'text' },
+    placeholder: { control: 'text' },
+    icon: { control: 'text' },
+    debounceTime: { control: 'number' },
+    autofocus: { control: 'boolean' },
+    loading: { control: 'boolean' },
+    size: {
+      control: { type: 'select' },
+      options: sizes
+    },
+    'onUpdate:modelValue': { action: 'update:modelValue' },
+    onSearch: { action: 'search' }
+  },
+  args: {
+    modelValue: '',
+    size: 'md',
+    loading: false,
+    autofocus: false
+  }
+}
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const Default: Story = {
+  render: (args) => ({
+    components: { SearchInput },
+    setup() {
+      const searchText = ref(args.modelValue ?? '')
+      return { searchText, args }
+    },
+    template: `
+      <div style="max-width: 320px;">
+        <SearchInput v-bind="args" v-model="searchText" />
+      </div>
+    `
+  })
+}
+
+export const AllSizes: Story = {
+  render: () => ({
+    components: { SearchInput },
+    setup() {
+      const sm = ref('')
+      const md = ref('')
+      const lg = ref('')
+      const xl = ref('')
+      return { sm, md, lg, xl }
+    },
+    template: `
+      <div class="flex flex-col gap-4" style="max-width: 320px;">
+        <div class="text-xs text-muted-foreground">sm — icon: size-3 (12px)</div>
+        <SearchInput v-model="sm" size="sm" />
+        <div class="text-xs text-muted-foreground">md — icon: size-4 (16px, capped)</div>
+        <SearchInput v-model="md" size="md" />
+        <div class="text-xs text-muted-foreground">lg — icon: size-4 (16px, capped)</div>
+        <SearchInput v-model="lg" size="lg" />
+        <div class="text-xs text-muted-foreground">xl — icon: size-4 (16px, capped)</div>
+        <SearchInput v-model="xl" size="xl" />
+      </div>
+    `
+  })
+}
+
+export const WithValue: Story = {
+  render: (args) => ({
+    components: { SearchInput },
+    setup() {
+      const searchText = ref('neural network')
+      return { searchText, args }
+    },
+    template: `
+      <div style="max-width: 320px;">
+        <SearchInput v-bind="args" v-model="searchText" />
+      </div>
+    `
+  })
+}
+
+export const Loading: Story = {
+  render: (args) => ({
+    components: { SearchInput },
+    setup() {
+      const searchText = ref('')
+      return { searchText, args }
+    },
+    template: `
+      <div style="max-width: 320px;">
+        <SearchInput v-bind="args" v-model="searchText" :loading="true" />
+      </div>
+    `
+  })
+}
+
+export const CustomPlaceholder: Story = {
+  ...Default,
+  args: {
+    placeholder: 'Find a workflow...'
+  }
+}
+
+export const CustomIcon: Story = {
+  ...Default,
+  args: {
+    icon: 'icon-[lucide--filter]'
+  }
+}
+
+export const CustomBackground: Story = {
+  render: (args) => ({
+    components: { SearchInput },
+    setup() {
+      const searchText = ref('')
+      return { searchText, args }
+    },
+    template: `
+      <div style="max-width: 320px;">
+        <SearchInput
+          v-bind="args"
+          v-model="searchText"
+          class="bg-component-node-widget-background"
+        />
+      </div>
+    `
+  })
+}
+
+export const Disabled: Story = {
+  render: (args) => ({
+    components: { SearchInput },
+    setup() {
+      const searchText = ref('')
+      return { searchText, args }
+    },
+    template: `
+      <div style="max-width: 320px;">
+        <SearchInput v-bind="args" v-model="searchText" :disabled="true" />
+      </div>
+    `
+  })
+}
diff --git a/src/components/ui/search-input/SearchInput.vue b/src/components/ui/search-input/SearchInput.vue
new file mode 100644
index 0000000000..d4bbc78e5b
--- /dev/null
+++ b/src/components/ui/search-input/SearchInput.vue
@@ -0,0 +1,132 @@
+<template>
+  <ComboboxRoot :ignore-filter="true" :open="false" :disabled="disabled">
+    <ComboboxAnchor
+      :class="
+        cn(
+          searchInputVariants({ size }),
+          disabled && 'pointer-events-none opacity-50',
+          className
+        )
+      "
+      @click="focus"
+    >
+      <Button
+        v-if="modelValue"
+        :class="cn('absolute', sizeConfig.clearPos)"
+        variant="textonly"
+        size="icon-sm"
+        :aria-label="$t('g.clear')"
+        @click.stop="clearSearch"
+      >
+        <i :class="cn('icon-[lucide--x]', sizeConfig.icon)" />
+      </Button>
+      <i
+        v-else-if="loading"
+        :class="
+          cn(
+            'pointer-events-none absolute icon-[lucide--loader-circle] animate-spin',
+            sizeConfig.iconPos,
+            sizeConfig.icon
+          )
+        "
+      />
+      <i
+        v-else
+        :class="
+          cn(
+            'pointer-events-none absolute',
+            sizeConfig.iconPos,
+            sizeConfig.icon,
+            icon
+          )
+        "
+      />
+
+      <ComboboxInput
+        ref="inputRef"
+        v-model="modelValue"
+        :class="
+          cn(
+            'size-full border-none bg-transparent outline-none',
+            sizeConfig.inputPl,
+            sizeConfig.inputText
+          )
+        "
+        :placeholder="placeholderText"
+        :auto-focus="autofocus"
+      />
+    </ComboboxAnchor>
+  </ComboboxRoot>
+</template>
+
+<script setup lang="ts">
+import type { HTMLAttributes } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+import { watchDebounced } from '@vueuse/core'
+import { ComboboxAnchor, ComboboxInput, ComboboxRoot } from 'reka-ui'
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+import type { SearchInputVariants } from './searchInput.variants'
+import {
+  searchInputSizeConfig,
+  searchInputVariants
+} from './searchInput.variants'
+
+const { t } = useI18n()
+
+const {
+  placeholder,
+  icon = 'icon-[lucide--search]',
+  debounceTime = 300,
+  autofocus = false,
+  loading = false,
+  disabled = false,
+  size = 'md',
+  class: className
+} = defineProps<{
+  placeholder?: string
+  icon?: string
+  debounceTime?: number
+  autofocus?: boolean
+  loading?: boolean
+  disabled?: boolean
+  size?: SearchInputVariants['size']
+  class?: HTMLAttributes['class']
+}>()
+
+const emit = defineEmits<{
+  search: [value: string]
+}>()
+
+const sizeConfig = computed(() => searchInputSizeConfig[size])
+
+const modelValue = defineModel<string>({ required: true })
+
+const inputRef = ref<InstanceType<typeof ComboboxInput> | null>(null)
+
+function focus() {
+  inputRef.value?.$el?.focus()
+}
+
+defineExpose({ focus })
+
+const placeholderText = computed(
+  () => placeholder ?? t('g.searchPlaceholder', { subject: '' })
+)
+
+function clearSearch() {
+  modelValue.value = ''
+  focus()
+}
+
+watchDebounced(
+  modelValue,
+  (value: string) => {
+    emit('search', value)
+  },
+  { debounce: debounceTime }
+)
+</script>
diff --git a/src/components/ui/search-input/searchInput.variants.ts b/src/components/ui/search-input/searchInput.variants.ts
new file mode 100644
index 0000000000..dd4800a2e6
--- /dev/null
+++ b/src/components/ui/search-input/searchInput.variants.ts
@@ -0,0 +1,54 @@
+import type { VariantProps } from 'cva'
+import { cva } from 'cva'
+
+export const searchInputVariants = cva({
+  base: 'relative flex w-full cursor-text items-center rounded-lg bg-secondary-background text-base-foreground',
+  variants: {
+    size: {
+      sm: 'h-6 p-1',
+      md: 'h-8 px-2 py-1.5',
+      lg: 'h-10 p-2',
+      xl: 'h-12 p-2'
+    }
+  },
+  defaultVariants: { size: 'md' }
+})
+
+export type SearchInputVariants = VariantProps<typeof searchInputVariants>
+
+export const searchInputSizeConfig = {
+  sm: {
+    icon: 'size-3',
+    iconPos: 'left-2',
+    inputPl: 'pl-6',
+    inputText: 'text-xs',
+    clearPos: 'left-1'
+  },
+  md: {
+    icon: 'size-4',
+    iconPos: 'left-2.5',
+    inputPl: 'pl-8',
+    inputText: 'text-xs',
+    clearPos: 'left-2.5'
+  },
+  lg: {
+    icon: 'size-4',
+    iconPos: 'left-2.5',
+    inputPl: 'pl-8',
+    inputText: 'text-xs',
+    clearPos: 'left-2.5'
+  },
+  xl: {
+    icon: 'size-4',
+    iconPos: 'left-2.5',
+    inputPl: 'pl-8',
+    inputText: 'text-xs',
+    clearPos: 'left-2'
+  }
+} as const
+
+const sizes = ['sm', 'md', 'lg', 'xl'] as const satisfies Array<
+  SearchInputVariants['size']
+>
+
+export const searchInputStoryConfig = { sizes } as const
diff --git a/src/components/ui/select/Select.stories.ts b/src/components/ui/select/Select.stories.ts
new file mode 100644
index 0000000000..ba2a37e48e
--- /dev/null
+++ b/src/components/ui/select/Select.stories.ts
@@ -0,0 +1,261 @@
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+import { ref } from 'vue'
+
+import Select from './Select.vue'
+import SelectContent from './SelectContent.vue'
+import SelectGroup from './SelectGroup.vue'
+import SelectItem from './SelectItem.vue'
+import SelectLabel from './SelectLabel.vue'
+import SelectSeparator from './SelectSeparator.vue'
+import SelectTrigger from './SelectTrigger.vue'
+import SelectValue from './SelectValue.vue'
+
+const meta = {
+  title: 'Components/Select',
+  component: Select,
+  tags: ['autodocs'],
+  argTypes: {
+    modelValue: {
+      control: 'text',
+      description: 'Selected value'
+    },
+    disabled: {
+      control: 'boolean',
+      description: 'When true, disables the select'
+    },
+    'onUpdate:modelValue': { action: 'update:modelValue' }
+  }
+} satisfies Meta<typeof Select>
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const Default: Story = {
+  render: (args) => ({
+    components: {
+      Select,
+      SelectContent,
+      SelectItem,
+      SelectTrigger,
+      SelectValue
+    },
+    setup() {
+      const value = ref(args.modelValue || '')
+      return { value, args }
+    },
+    template: `
+      <Select v-model="value" :disabled="args.disabled">
+        <SelectTrigger class="w-56">
+          <SelectValue placeholder="Select a fruit" />
+        </SelectTrigger>
+        <SelectContent>
+          <SelectItem value="apple">Apple</SelectItem>
+          <SelectItem value="banana">Banana</SelectItem>
+          <SelectItem value="cherry">Cherry</SelectItem>
+          <SelectItem value="grape">Grape</SelectItem>
+          <SelectItem value="orange">Orange</SelectItem>
+        </SelectContent>
+      </Select>
+      <div class="mt-4 text-sm text-muted-foreground">
+        Selected: {{ value || 'None' }}
+      </div>
+    `
+  }),
+  args: {
+    disabled: false
+  }
+}
+
+export const WithPlaceholder: Story = {
+  render: (args) => ({
+    components: {
+      Select,
+      SelectContent,
+      SelectItem,
+      SelectTrigger,
+      SelectValue
+    },
+    setup() {
+      const value = ref('')
+      return { value, args }
+    },
+    template: `
+      <Select v-model="value" :disabled="args.disabled">
+        <SelectTrigger class="w-56">
+          <SelectValue placeholder="Choose an option..." />
+        </SelectTrigger>
+        <SelectContent>
+          <SelectItem value="option1">Option 1</SelectItem>
+          <SelectItem value="option2">Option 2</SelectItem>
+          <SelectItem value="option3">Option 3</SelectItem>
+        </SelectContent>
+      </Select>
+    `
+  }),
+  args: {
+    disabled: false
+  }
+}
+
+export const Disabled: Story = {
+  render: (args) => ({
+    components: {
+      Select,
+      SelectContent,
+      SelectItem,
+      SelectTrigger,
+      SelectValue
+    },
+    setup() {
+      const value = ref('apple')
+      return { value, args }
+    },
+    template: `
+      <Select v-model="value" disabled>
+        <SelectTrigger class="w-56">
+          <SelectValue placeholder="Select a fruit" />
+        </SelectTrigger>
+        <SelectContent>
+          <SelectItem value="apple">Apple</SelectItem>
+          <SelectItem value="banana">Banana</SelectItem>
+          <SelectItem value="cherry">Cherry</SelectItem>
+        </SelectContent>
+      </Select>
+    `
+  })
+}
+
+export const WithGroups: Story = {
+  render: (args) => ({
+    components: {
+      Select,
+      SelectContent,
+      SelectGroup,
+      SelectItem,
+      SelectLabel,
+      SelectSeparator,
+      SelectTrigger,
+      SelectValue
+    },
+    setup() {
+      const value = ref('')
+      return { value, args }
+    },
+    template: `
+      <Select v-model="value" :disabled="args.disabled">
+        <SelectTrigger class="w-56">
+          <SelectValue placeholder="Select a model type" />
+        </SelectTrigger>
+        <SelectContent>
+          <SelectGroup>
+            <SelectLabel>Checkpoints</SelectLabel>
+            <SelectItem value="sd15">SD 1.5</SelectItem>
+            <SelectItem value="sdxl">SDXL</SelectItem>
+            <SelectItem value="flux">Flux</SelectItem>
+          </SelectGroup>
+          <SelectSeparator />
+          <SelectGroup>
+            <SelectLabel>LoRAs</SelectLabel>
+            <SelectItem value="lora-style">Style LoRA</SelectItem>
+            <SelectItem value="lora-character">Character LoRA</SelectItem>
+          </SelectGroup>
+          <SelectSeparator />
+          <SelectGroup>
+            <SelectLabel>Other</SelectLabel>
+            <SelectItem value="vae">VAE</SelectItem>
+            <SelectItem value="embedding">Embedding</SelectItem>
+          </SelectGroup>
+        </SelectContent>
+      </Select>
+      <div class="mt-4 text-sm text-muted-foreground">
+        Selected: {{ value || 'None' }}
+      </div>
+    `
+  }),
+  args: {
+    disabled: false
+  }
+}
+
+export const Scrollable: Story = {
+  render: (args) => ({
+    components: {
+      Select,
+      SelectContent,
+      SelectItem,
+      SelectTrigger,
+      SelectValue
+    },
+    setup() {
+      const value = ref('')
+      const items = Array.from({ length: 20 }, (_, i) => ({
+        value: `item-${i + 1}`,
+        label: `Option ${i + 1}`
+      }))
+      return { value, items, args }
+    },
+    template: `
+      <Select v-model="value" :disabled="args.disabled">
+        <SelectTrigger class="w-56">
+          <SelectValue placeholder="Select an option" />
+        </SelectTrigger>
+        <SelectContent>
+          <SelectItem
+            v-for="item in items"
+            :key="item.value"
+            :value="item.value"
+          >
+            {{ item.label }}
+          </SelectItem>
+        </SelectContent>
+      </Select>
+    `
+  }),
+  args: {
+    disabled: false
+  }
+}
+
+export const CustomWidth: Story = {
+  render: (args) => ({
+    components: {
+      Select,
+      SelectContent,
+      SelectItem,
+      SelectTrigger,
+      SelectValue
+    },
+    setup() {
+      const value = ref('')
+      return { value, args }
+    },
+    template: `
+      <div class="space-y-4">
+        <Select v-model="value" :disabled="args.disabled">
+          <SelectTrigger class="w-32">
+            <SelectValue placeholder="Small" />
+          </SelectTrigger>
+          <SelectContent>
+            <SelectItem value="a">A</SelectItem>
+            <SelectItem value="b">B</SelectItem>
+            <SelectItem value="c">C</SelectItem>
+          </SelectContent>
+        </Select>
+
+        <Select v-model="value" :disabled="args.disabled">
+          <SelectTrigger class="w-full">
+            <SelectValue placeholder="Full width select" />
+          </SelectTrigger>
+          <SelectContent>
+            <SelectItem value="option1">Option 1</SelectItem>
+            <SelectItem value="option2">Option 2</SelectItem>
+            <SelectItem value="option3">Option 3</SelectItem>
+          </SelectContent>
+        </Select>
+      </div>
+    `
+  }),
+  args: {
+    disabled: false
+  }
+}
diff --git a/src/components/ui/select/Select.vue b/src/components/ui/select/Select.vue
new file mode 100644
index 0000000000..f685b3189b
--- /dev/null
+++ b/src/components/ui/select/Select.vue
@@ -0,0 +1,16 @@
+<script setup lang="ts">
+import type { SelectRootEmits, SelectRootProps } from 'reka-ui'
+import { SelectRoot, useForwardPropsEmits } from 'reka-ui'
+
+// eslint-disable-next-line vue/no-unused-properties
+const props = defineProps<SelectRootProps>()
+const emits = defineEmits<SelectRootEmits>()
+
+const forwarded = useForwardPropsEmits(props, emits)
+</script>
+
+<template>
+  <SelectRoot v-bind="forwarded">
+    <slot />
+  </SelectRoot>
+</template>
diff --git a/src/components/ui/select/SelectContent.vue b/src/components/ui/select/SelectContent.vue
new file mode 100644
index 0000000000..8e0595eddf
--- /dev/null
+++ b/src/components/ui/select/SelectContent.vue
@@ -0,0 +1,82 @@
+<script setup lang="ts">
+import type { SelectContentEmits, SelectContentProps } from 'reka-ui'
+import {
+  SelectContent,
+  SelectPortal,
+  SelectViewport,
+  useForwardPropsEmits
+} from 'reka-ui'
+import type { HTMLAttributes } from 'vue'
+import { computed } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+import SelectScrollDownButton from './SelectScrollDownButton.vue'
+import SelectScrollUpButton from './SelectScrollUpButton.vue'
+
+defineOptions({
+  inheritAttrs: false
+})
+
+const {
+  position = 'popper',
+  // Safari has issues with click events on portaled content inside dialogs.
+  // Set disablePortal to true when using Select inside a Dialog on Safari.
+  // See: https://github.com/chakra-ui/ark/issues/1782
+  disablePortal = false,
+  class: className,
+  ...restProps
+} = defineProps<
+  SelectContentProps & {
+    class?: HTMLAttributes['class']
+    disablePortal?: boolean
+  }
+>()
+const emits = defineEmits<SelectContentEmits>()
+
+const delegatedProps = computed(() => ({
+  position,
+  ...restProps
+}))
+
+const forwarded = useForwardPropsEmits(delegatedProps, emits)
+</script>
+
+<template>
+  <SelectPortal :disabled="disablePortal">
+    <SelectContent
+      v-bind="{ ...forwarded, ...$attrs }"
+      :class="
+        cn(
+          'relative z-3000 max-h-96 min-w-32 overflow-hidden',
+          'mt-2 rounded-lg p-2',
+          'bg-base-background text-base-foreground',
+          'border border-solid border-border-default',
+          'shadow-md',
+          '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',
+          position === 'popper' &&
+            'data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1',
+          className
+        )
+      "
+    >
+      <SelectScrollUpButton />
+      <SelectViewport
+        :class="
+          cn(
+            'flex scrollbar-custom flex-col gap-0',
+            position === 'popper' &&
+              'h-(--reka-select-trigger-height) w-full min-w-(--reka-select-trigger-width)'
+          )
+        "
+      >
+        <slot />
+      </SelectViewport>
+      <SelectScrollDownButton />
+    </SelectContent>
+  </SelectPortal>
+</template>
diff --git a/src/components/ui/select/SelectGroup.vue b/src/components/ui/select/SelectGroup.vue
new file mode 100644
index 0000000000..11f3da9f60
--- /dev/null
+++ b/src/components/ui/select/SelectGroup.vue
@@ -0,0 +1,17 @@
+<script setup lang="ts">
+import type { SelectGroupProps } from 'reka-ui'
+import { SelectGroup } from 'reka-ui'
+import type { HTMLAttributes } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+const { class: className, ...restProps } = defineProps<
+  SelectGroupProps & { class?: HTMLAttributes['class'] }
+>()
+</script>
+
+<template>
+  <SelectGroup :class="cn('w-full', className)" v-bind="restProps">
+    <slot />
+  </SelectGroup>
+</template>
diff --git a/src/components/ui/select/SelectItem.vue b/src/components/ui/select/SelectItem.vue
new file mode 100644
index 0000000000..acf6bcadda
--- /dev/null
+++ b/src/components/ui/select/SelectItem.vue
@@ -0,0 +1,37 @@
+<script setup lang="ts">
+import type { SelectItemProps } from 'reka-ui'
+import { SelectItem, SelectItemIndicator, SelectItemText } from 'reka-ui'
+import type { HTMLAttributes } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+const { class: className, ...restProps } = defineProps<
+  SelectItemProps & { class?: HTMLAttributes['class'] }
+>()
+</script>
+
+<template>
+  <SelectItem
+    v-bind="restProps"
+    :class="
+      cn(
+        'relative flex w-full cursor-pointer items-center justify-between select-none',
+        'gap-3 rounded-sm px-2 py-3 text-sm outline-none',
+        'hover:bg-secondary-background-hover',
+        'focus:bg-secondary-background-hover',
+        'data-[state=checked]:bg-secondary-background-selected',
+        'data-[state=checked]:hover:bg-secondary-background-selected',
+        'data-disabled:pointer-events-none data-disabled:opacity-50',
+        className
+      )
+    "
+  >
+    <SelectItemText class="truncate">
+      <slot />
+    </SelectItemText>
+
+    <SelectItemIndicator class="flex shrink-0 items-center justify-center">
+      <i class="icon-[lucide--check] text-base-foreground" aria-hidden="true" />
+    </SelectItemIndicator>
+  </SelectItem>
+</template>
diff --git a/src/components/ui/select/SelectLabel.vue b/src/components/ui/select/SelectLabel.vue
new file mode 100644
index 0000000000..38a59f4590
--- /dev/null
+++ b/src/components/ui/select/SelectLabel.vue
@@ -0,0 +1,25 @@
+<script setup lang="ts">
+import type { SelectLabelProps } from 'reka-ui'
+import { SelectLabel } from 'reka-ui'
+import type { HTMLAttributes } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+const { class: className, ...restProps } = defineProps<
+  SelectLabelProps & { class?: HTMLAttributes['class'] }
+>()
+</script>
+
+<template>
+  <SelectLabel
+    v-bind="restProps"
+    :class="
+      cn(
+        'px-3 py-2 text-xs tracking-wide text-muted-foreground uppercase',
+        className
+      )
+    "
+  >
+    <slot />
+  </SelectLabel>
+</template>
diff --git a/src/components/ui/select/SelectScrollDownButton.vue b/src/components/ui/select/SelectScrollDownButton.vue
new file mode 100644
index 0000000000..1b1dc1a272
--- /dev/null
+++ b/src/components/ui/select/SelectScrollDownButton.vue
@@ -0,0 +1,27 @@
+<script setup lang="ts">
+import type { SelectScrollDownButtonProps } from 'reka-ui'
+import { SelectScrollDownButton } from 'reka-ui'
+import type { HTMLAttributes } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+const { class: className, ...restProps } = defineProps<
+  SelectScrollDownButtonProps & { class?: HTMLAttributes['class'] }
+>()
+</script>
+
+<template>
+  <SelectScrollDownButton
+    v-bind="restProps"
+    :class="
+      cn(
+        'flex cursor-default items-center justify-center py-1 text-muted-foreground',
+        className
+      )
+    "
+  >
+    <slot>
+      <i class="icon-[lucide--chevron-down]" />
+    </slot>
+  </SelectScrollDownButton>
+</template>
diff --git a/src/components/ui/select/SelectScrollUpButton.vue b/src/components/ui/select/SelectScrollUpButton.vue
new file mode 100644
index 0000000000..ee1ef9263d
--- /dev/null
+++ b/src/components/ui/select/SelectScrollUpButton.vue
@@ -0,0 +1,27 @@
+<script setup lang="ts">
+import type { SelectScrollUpButtonProps } from 'reka-ui'
+import { SelectScrollUpButton } from 'reka-ui'
+import type { HTMLAttributes } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+const { class: className, ...restProps } = defineProps<
+  SelectScrollUpButtonProps & { class?: HTMLAttributes['class'] }
+>()
+</script>
+
+<template>
+  <SelectScrollUpButton
+    v-bind="restProps"
+    :class="
+      cn(
+        'flex cursor-default items-center justify-center py-1 text-muted-foreground',
+        className
+      )
+    "
+  >
+    <slot>
+      <i class="icon-[lucide--chevron-up]" />
+    </slot>
+  </SelectScrollUpButton>
+</template>
diff --git a/src/components/ui/select/SelectSeparator.vue b/src/components/ui/select/SelectSeparator.vue
new file mode 100644
index 0000000000..37947fd0db
--- /dev/null
+++ b/src/components/ui/select/SelectSeparator.vue
@@ -0,0 +1,18 @@
+<script setup lang="ts">
+import type { SelectSeparatorProps } from 'reka-ui'
+import { SelectSeparator } from 'reka-ui'
+import type { HTMLAttributes } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+const { class: className, ...restProps } = defineProps<
+  SelectSeparatorProps & { class?: HTMLAttributes['class'] }
+>()
+</script>
+
+<template>
+  <SelectSeparator
+    v-bind="restProps"
+    :class="cn('-mx-1 my-1 h-px bg-border-default', className)"
+  />
+</template>
diff --git a/src/components/ui/select/SelectTrigger.vue b/src/components/ui/select/SelectTrigger.vue
new file mode 100644
index 0000000000..77f59b7b80
--- /dev/null
+++ b/src/components/ui/select/SelectTrigger.vue
@@ -0,0 +1,36 @@
+<script setup lang="ts">
+import type { SelectTriggerProps } from 'reka-ui'
+import { SelectIcon, SelectTrigger } from 'reka-ui'
+import type { HTMLAttributes } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+const { class: className, ...restProps } = defineProps<
+  SelectTriggerProps & { class?: HTMLAttributes['class'] }
+>()
+</script>
+
+<template>
+  <SelectTrigger
+    v-bind="restProps"
+    :class="
+      cn(
+        'flex h-10 w-full cursor-pointer items-center justify-between select-none',
+        'rounded-lg px-4 py-2 text-sm',
+        'bg-secondary-background text-base-foreground',
+        'border-[2.5px] border-solid border-transparent',
+        'transition-all duration-200 ease-in-out',
+        'focus:border-node-component-border focus:outline-none',
+        'data-placeholder:text-muted-foreground',
+        'disabled:cursor-not-allowed disabled:opacity-60',
+        '[&>span]:truncate',
+        className
+      )
+    "
+  >
+    <slot />
+    <SelectIcon as-child>
+      <i class="icon-[lucide--chevron-down] shrink-0 text-muted-foreground" />
+    </SelectIcon>
+  </SelectTrigger>
+</template>
diff --git a/src/components/ui/select/SelectValue.vue b/src/components/ui/select/SelectValue.vue
new file mode 100644
index 0000000000..4ffa580cac
--- /dev/null
+++ b/src/components/ui/select/SelectValue.vue
@@ -0,0 +1,12 @@
+<script setup lang="ts">
+import type { SelectValueProps } from 'reka-ui'
+import { SelectValue } from 'reka-ui'
+
+const props = defineProps<SelectValueProps>()
+</script>
+
+<template>
+  <SelectValue v-bind="props">
+    <slot />
+  </SelectValue>
+</template>
diff --git a/src/components/ui/skeleton/Skeleton.vue b/src/components/ui/skeleton/Skeleton.vue
new file mode 100644
index 0000000000..369c246835
--- /dev/null
+++ b/src/components/ui/skeleton/Skeleton.vue
@@ -0,0 +1,15 @@
+<script setup lang="ts">
+import type { HTMLAttributes } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+const { class: className } = defineProps<{
+  class?: HTMLAttributes['class']
+}>()
+</script>
+
+<template>
+  <div
+    :class="cn('animate-pulse rounded-md bg-secondary-background', className)"
+  />
+</template>
diff --git a/src/components/ui/slider/Slider.vue b/src/components/ui/slider/Slider.vue
index 7d7a951212..98c924a6bf 100644
--- a/src/components/ui/slider/Slider.vue
+++ b/src/components/ui/slider/Slider.vue
@@ -36,7 +36,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits)
     data-slot="slider"
     :class="
       cn(
-        'relative flex w-full touch-none items-center select-none data-[disabled]:opacity-50',
+        'relative flex w-full touch-none items-center select-none data-disabled:opacity-50',
         'data-[orientation=vertical]:h-full data-[orientation=vertical]:min-h-44 data-[orientation=vertical]:w-auto data-[orientation=vertical]:flex-col',
         props.class
       )
@@ -50,7 +50,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits)
       data-slot="slider-track"
       :class="
         cn(
-          'bg-node-stroke relative grow overflow-hidden rounded-full',
+          'relative grow overflow-hidden rounded-full bg-node-stroke',
           'cursor-pointer overflow-visible',
           `before:absolute before:-inset-2 before:block before:bg-transparent`,
           'data-[orientation=horizontal]:h-0.5 data-[orientation=horizontal]:w-full',
@@ -70,9 +70,9 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits)
       data-slot="slider-thumb"
       :class="
         cn(
-          'bg-node-component-surface-highlight ring-node-component-surface-selected block size-3.5 shrink-0 rounded-full shadow-sm transition-[color,box-shadow]',
+          'block size-3.5 shrink-0 rounded-full bg-node-component-surface-highlight shadow-sm ring-node-component-surface-selected transition-[color,box-shadow]',
           'cursor-grab',
-          'before:absolute before:-inset-1 before:block before:bg-transparent before:rounded-full',
+          'before:absolute before:-inset-1 before:block before:rounded-full before:bg-transparent',
           'hover:ring-2 focus-visible:ring-2 focus-visible:outline-hidden disabled:pointer-events-none disabled:opacity-50',
           { 'cursor-grabbing': pressed }
         )
diff --git a/src/components/ui/stepper/FormattedNumberStepper.vue b/src/components/ui/stepper/FormattedNumberStepper.vue
new file mode 100644
index 0000000000..5ed3993a62
--- /dev/null
+++ b/src/components/ui/stepper/FormattedNumberStepper.vue
@@ -0,0 +1,181 @@
+<template>
+  <label
+    :for="inputId"
+    :class="
+      cn(
+        'text-secondary-foreground focus-within:ring-secondary-foreground flex h-10 cursor-text items-center rounded-lg bg-secondary-background focus-within:ring-1 hover:bg-secondary-background-hover',
+        disabled && 'pointer-events-none opacity-50'
+      )
+    "
+  >
+    <button
+      type="button"
+      class="focus-visible:ring-secondary-foreground flex h-full w-8 cursor-pointer items-center justify-center rounded-l-lg border-none bg-transparent text-muted-foreground transition-colors hover:text-base-foreground focus-visible:ring-1 focus-visible:outline-none focus-visible:ring-inset disabled:opacity-30"
+      :disabled="disabled || modelValue <= min"
+      :aria-label="$t('g.decrement')"
+      @click="handleStep(-1)"
+    >
+      <i class="icon-[lucide--minus] size-4" />
+    </button>
+    <div
+      class="flex flex-1 items-center justify-center gap-0.5 overflow-hidden"
+    >
+      <slot name="prefix" />
+      <input
+        :id="inputId"
+        ref="inputRef"
+        v-model="inputValue"
+        type="text"
+        inputmode="numeric"
+        :style="{ width: `${inputWidth}ch` }"
+        class="min-w-0 rounded-sm border-none bg-transparent text-center text-lg font-medium text-base-foreground focus-visible:outline-none"
+        :disabled="disabled"
+        @input="handleInputChange"
+        @blur="handleInputBlur"
+        @focus="handleInputFocus"
+      />
+      <slot name="suffix" />
+    </div>
+    <button
+      type="button"
+      class="focus-visible:ring-secondary-foreground flex h-full w-8 cursor-pointer items-center justify-center rounded-r-lg border-none bg-transparent text-muted-foreground transition-colors hover:text-base-foreground focus-visible:ring-1 focus-visible:outline-none focus-visible:ring-inset disabled:opacity-30"
+      :disabled="disabled || modelValue >= max"
+      :aria-label="$t('g.increment')"
+      @click="handleStep(1)"
+    >
+      <i class="icon-[lucide--plus] size-4" />
+    </button>
+  </label>
+</template>
+
+<script setup lang="ts">
+import { computed, ref, useId, watch } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+const {
+  min = 0,
+  max = Infinity,
+  step = 1,
+  formatOptions = { useGrouping: true },
+  disabled = false
+} = defineProps<{
+  min?: number
+  max?: number
+  step?: number | ((value: number) => number)
+  formatOptions?: Intl.NumberFormatOptions
+  disabled?: boolean
+}>()
+
+const emit = defineEmits<{
+  'max-reached': []
+}>()
+
+const modelValue = defineModel<number>({ required: true })
+
+const inputId = useId()
+const inputRef = ref<HTMLInputElement | null>(null)
+const inputValue = ref(formatNumber(modelValue.value))
+
+const inputWidth = computed(() =>
+  Math.min(Math.max(inputValue.value.length, 1) + 0.5, 9)
+)
+
+watch(modelValue, (newValue) => {
+  if (document.activeElement !== inputRef.value) {
+    inputValue.value = formatNumber(newValue)
+  }
+})
+
+function formatNumber(num: number): string {
+  return num.toLocaleString('en-US', formatOptions)
+}
+
+function parseFormattedNumber(str: string): number {
+  const cleaned = str.replace(/[^0-9]/g, '')
+  return cleaned === '' ? 0 : parseInt(cleaned, 10)
+}
+
+function clamp(value: number, minVal: number, maxVal: number): number {
+  return Math.min(Math.max(value, minVal), maxVal)
+}
+
+function formatWithCursor(
+  value: string,
+  cursorPos: number
+): { formatted: string; newCursor: number } {
+  const num = parseFormattedNumber(value)
+  const formatted = formatNumber(num)
+
+  const digitsBeforeCursor = value
+    .slice(0, cursorPos)
+    .replace(/[^0-9]/g, '').length
+
+  let digitCount = 0
+  let newCursor = 0
+  for (let i = 0; i < formatted.length; i++) {
+    if (/[0-9]/.test(formatted[i])) {
+      digitCount++
+    }
+    if (digitCount >= digitsBeforeCursor) {
+      newCursor = i + 1
+      break
+    }
+  }
+
+  if (digitCount < digitsBeforeCursor) {
+    newCursor = formatted.length
+  }
+
+  return { formatted, newCursor }
+}
+
+function getStepAmount(): number {
+  return typeof step === 'function' ? step(modelValue.value) : step
+}
+
+function handleInputChange(e: Event) {
+  const input = e.target as HTMLInputElement
+  const raw = input.value
+  const cursorPos = input.selectionStart ?? raw.length
+  const num = parseFormattedNumber(raw)
+
+  const clamped = Math.min(num, max)
+  const wasClamped = num > max
+
+  if (wasClamped) {
+    emit('max-reached')
+  }
+
+  modelValue.value = clamped
+
+  const { formatted, newCursor } = formatWithCursor(
+    wasClamped ? formatNumber(clamped) : raw,
+    wasClamped ? formatNumber(clamped).length : cursorPos
+  )
+  inputValue.value = formatted
+
+  requestAnimationFrame(() => {
+    inputRef.value?.setSelectionRange(newCursor, newCursor)
+  })
+}
+
+function handleInputBlur() {
+  const clamped = clamp(modelValue.value, min, max)
+  modelValue.value = clamped
+  inputValue.value = formatNumber(clamped)
+}
+
+function handleInputFocus(e: FocusEvent) {
+  const input = e.target as HTMLInputElement
+  const len = input.value.length
+  input.setSelectionRange(len, len)
+}
+
+function handleStep(direction: 1 | -1) {
+  const stepAmount = getStepAmount()
+  const newValue = clamp(modelValue.value + stepAmount * direction, min, max)
+  modelValue.value = newValue
+  inputValue.value = formatNumber(newValue)
+}
+</script>
diff --git a/src/components/ui/tags-input/TagsInput.stories.ts b/src/components/ui/tags-input/TagsInput.stories.ts
new file mode 100644
index 0000000000..eeb75a39aa
--- /dev/null
+++ b/src/components/ui/tags-input/TagsInput.stories.ts
@@ -0,0 +1,182 @@
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+import type { ComponentExposed } from 'vue-component-type-helpers'
+import { ref } from 'vue'
+
+import TagsInput from './TagsInput.vue'
+import TagsInputInput from './TagsInputInput.vue'
+import TagsInputItem from './TagsInputItem.vue'
+import TagsInputItemDelete from './TagsInputItemDelete.vue'
+import TagsInputItemText from './TagsInputItemText.vue'
+
+interface GenericMeta<C> extends Omit<Meta<C>, 'component'> {
+  component: ComponentExposed<C>
+}
+
+const meta: GenericMeta<typeof TagsInput> = {
+  title: 'Components/TagsInput',
+  component: TagsInput,
+  tags: ['autodocs'],
+  argTypes: {
+    modelValue: {
+      control: 'object',
+      description: 'Array of tag values'
+    },
+    disabled: {
+      control: 'boolean',
+      description:
+        'When true, completely disables the component. When false (default), shows read-only state with edit icon until clicked.'
+    },
+    'onUpdate:modelValue': { action: 'update:modelValue' }
+  }
+}
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const Default: Story = {
+  render: (args) => ({
+    components: {
+      TagsInput,
+      TagsInputInput,
+      TagsInputItem,
+      TagsInputItemDelete,
+      TagsInputItemText
+    },
+    setup() {
+      const tags = ref(args.modelValue || ['tag1', 'tag2'])
+      return { tags, args }
+    },
+    template: `
+      <TagsInput v-model="tags" :disabled="args.disabled" class="w-80" v-slot="{ isEmpty }">
+        <TagsInputItem v-for="tag in tags" :key="tag" :value="tag">
+          <TagsInputItemText />
+          <TagsInputItemDelete />
+        </TagsInputItem>
+        <TagsInputInput :is-empty="isEmpty" placeholder="Add tag..." />
+      </TagsInput>
+      <div class="mt-4 text-sm text-muted-foreground">
+        Tags: {{ tags.join(', ') }}
+      </div>
+    `
+  }),
+  args: {
+    modelValue: ['Vue', 'TypeScript'],
+    disabled: false
+  }
+}
+
+export const Empty: Story = {
+  args: {
+    disabled: false
+  },
+  render: (args) => ({
+    components: {
+      TagsInput,
+      TagsInputInput,
+      TagsInputItem,
+      TagsInputItemDelete,
+      TagsInputItemText
+    },
+    setup() {
+      const tags = ref<string[]>([])
+      return { tags, args }
+    },
+    template: `
+      <TagsInput v-model="tags" :disabled="args.disabled" class="w-80" v-slot="{ isEmpty }">
+        <TagsInputItem v-for="tag in tags" :key="tag" :value="tag">
+          <TagsInputItemText />
+          <TagsInputItemDelete />
+        </TagsInputItem>
+        <TagsInputInput :is-empty="isEmpty" placeholder="Start typing to add tags..." />
+      </TagsInput>
+    `
+  })
+}
+
+export const ManyTags: Story = {
+  render: (args) => ({
+    components: {
+      TagsInput,
+      TagsInputInput,
+      TagsInputItem,
+      TagsInputItemDelete,
+      TagsInputItemText
+    },
+    setup() {
+      const tags = ref([
+        'JavaScript',
+        'TypeScript',
+        'Vue',
+        'React',
+        'Svelte',
+        'Node.js',
+        'Python',
+        'Rust'
+      ])
+      return { tags, args }
+    },
+    template: `
+      <TagsInput v-model="tags" :disabled="args.disabled" class="w-96" v-slot="{ isEmpty }">
+        <TagsInputItem v-for="tag in tags" :key="tag" :value="tag">
+          <TagsInputItemText />
+          <TagsInputItemDelete />
+        </TagsInputItem>
+        <TagsInputInput :is-empty="isEmpty" placeholder="Add technology..." />
+      </TagsInput>
+    `
+  })
+}
+
+export const Disabled: Story = {
+  args: {
+    disabled: true
+  },
+
+  render: (args) => ({
+    components: {
+      TagsInput,
+      TagsInputInput,
+      TagsInputItem,
+      TagsInputItemDelete,
+      TagsInputItemText
+    },
+    setup() {
+      const tags = ref(['Read', 'Only', 'Tags'])
+      return { tags, args }
+    },
+    template: `
+      <TagsInput v-model="tags" :disabled="args.disabled" class="w-80" v-slot="{ isEmpty }">
+        <TagsInputItem v-for="tag in tags" :key="tag" :value="tag">
+          <TagsInputItemText />
+          <TagsInputItemDelete />
+        </TagsInputItem>
+        <TagsInputInput :is-empty="isEmpty" placeholder="Cannot add tags..." />
+      </TagsInput>
+    `
+  })
+}
+
+export const CustomWidth: Story = {
+  render: (args) => ({
+    components: {
+      TagsInput,
+      TagsInputInput,
+      TagsInputItem,
+      TagsInputItemDelete,
+      TagsInputItemText
+    },
+    setup() {
+      const tags = ref(['Full', 'Width'])
+      return { tags, args }
+    },
+    template: `
+      <TagsInput v-model="tags" :disabled="args.disabled" class="w-full" v-slot="{ isEmpty }">
+        <TagsInputItem v-for="tag in tags" :key="tag" :value="tag">
+          <TagsInputItemText />
+          <TagsInputItemDelete />
+        </TagsInputItem>
+        <TagsInputInput :is-empty="isEmpty" placeholder="Add tag..." />
+      </TagsInput>
+    `
+  })
+}
diff --git a/src/components/ui/tags-input/TagsInput.test.ts b/src/components/ui/tags-input/TagsInput.test.ts
new file mode 100644
index 0000000000..fe0a3a2cc9
--- /dev/null
+++ b/src/components/ui/tags-input/TagsInput.test.ts
@@ -0,0 +1,163 @@
+import { mount } from '@vue/test-utils'
+import { describe, expect, it } from 'vitest'
+import { h, nextTick } from 'vue'
+import { createI18n } from 'vue-i18n'
+
+import TagsInput from './TagsInput.vue'
+import TagsInputInput from './TagsInputInput.vue'
+import TagsInputItem from './TagsInputItem.vue'
+import TagsInputItemDelete from './TagsInputItemDelete.vue'
+import TagsInputItemText from './TagsInputItemText.vue'
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: { en: { g: { removeTag: 'Remove tag' } } }
+})
+
+describe('TagsInput', () => {
+  function mountTagsInput(props = {}, slots = {}) {
+    return mount(TagsInput, {
+      props: {
+        modelValue: [],
+        ...props
+      },
+      slots
+    })
+  }
+
+  it('renders slot content', () => {
+    const wrapper = mountTagsInput({}, { default: '<span>Slot Content</span>' })
+
+    expect(wrapper.text()).toContain('Slot Content')
+  })
+})
+
+describe('TagsInput with child components', () => {
+  function mountFullTagsInput(tags: string[] = ['tag1', 'tag2']) {
+    return mount(TagsInput, {
+      global: { plugins: [i18n] },
+      props: {
+        modelValue: tags
+      },
+      slots: {
+        default: () => [
+          ...tags.map((tag) =>
+            h(TagsInputItem, { key: tag, value: tag }, () => [
+              h(TagsInputItemText),
+              h(TagsInputItemDelete)
+            ])
+          ),
+          h(TagsInputInput, { placeholder: 'Add tag...' })
+        ]
+      }
+    })
+  }
+
+  it('renders tags structure and content', () => {
+    const tags = ['tag1', 'tag2']
+    const wrapper = mountFullTagsInput(tags)
+
+    const items = wrapper.findAllComponents(TagsInputItem)
+    const textElements = wrapper.findAllComponents(TagsInputItemText)
+    const deleteButtons = wrapper.findAllComponents(TagsInputItemDelete)
+
+    expect(items).toHaveLength(tags.length)
+    expect(textElements).toHaveLength(tags.length)
+    expect(deleteButtons).toHaveLength(tags.length)
+
+    textElements.forEach((el, i) => {
+      expect(el.text()).toBe(tags[i])
+    })
+
+    expect(wrapper.findComponent(TagsInputInput).exists()).toBe(true)
+  })
+
+  it('updates model value when adding a tag', async () => {
+    let currentTags = ['existing']
+
+    const wrapper = mount<typeof TagsInput<string>>(TagsInput, {
+      props: {
+        modelValue: currentTags,
+        'onUpdate:modelValue': (payload) => {
+          currentTags = payload
+        }
+      },
+      slots: {
+        default: () => h(TagsInputInput, { placeholder: 'Add tag...' })
+      }
+    })
+
+    await wrapper.trigger('click')
+    await nextTick()
+
+    const input = wrapper.find('input')
+    await input.setValue('newTag')
+    await input.trigger('keydown', { key: 'Enter' })
+    await nextTick()
+
+    expect(currentTags).toContain('newTag')
+  })
+
+  it('does not enter edit mode when disabled', async () => {
+    const wrapper = mount<typeof TagsInput<string>>(TagsInput, {
+      props: {
+        modelValue: ['tag1'],
+        disabled: true
+      },
+      slots: {
+        default: () => h(TagsInputInput, { placeholder: 'Add tag...' })
+      }
+    })
+
+    expect(wrapper.find('input').exists()).toBe(false)
+
+    await wrapper.trigger('click')
+    await nextTick()
+
+    expect(wrapper.find('input').exists()).toBe(false)
+  })
+
+  it('exits edit mode when clicking outside', async () => {
+    const outsideElement = document.createElement('div')
+    document.body.appendChild(outsideElement)
+    const wrapper = mount<typeof TagsInput<string>>(TagsInput, {
+      props: {
+        modelValue: ['tag1']
+      },
+      slots: {
+        default: () => h(TagsInputInput, { placeholder: 'Add tag...' })
+      }
+    })
+
+    await wrapper.trigger('click')
+    await nextTick()
+    expect(wrapper.find('input').exists()).toBe(true)
+
+    outsideElement.dispatchEvent(new PointerEvent('click', { bubbles: true }))
+    await nextTick()
+
+    expect(wrapper.find('input').exists()).toBe(false)
+
+    wrapper.unmount()
+    outsideElement.remove()
+  })
+
+  it('shows placeholder when modelValue is empty', async () => {
+    const wrapper = mount<typeof TagsInput<string>>(TagsInput, {
+      props: {
+        modelValue: []
+      },
+      slots: {
+        default: ({ isEmpty }: { isEmpty: boolean }) =>
+          h(TagsInputInput, { placeholder: 'Add tag...', isEmpty })
+      }
+    })
+
+    await nextTick()
+
+    const input = wrapper.find('input')
+    expect(input.exists()).toBe(true)
+    expect(input.attributes('placeholder')).toBe('Add tag...')
+  })
+})
diff --git a/src/components/ui/tags-input/TagsInput.vue b/src/components/ui/tags-input/TagsInput.vue
new file mode 100644
index 0000000000..e894f68d1f
--- /dev/null
+++ b/src/components/ui/tags-input/TagsInput.vue
@@ -0,0 +1,86 @@
+<script setup lang="ts" generic="T extends AcceptableInputValue = string">
+import { onClickOutside, useCurrentElement } from '@vueuse/core'
+import type {
+  AcceptableInputValue,
+  TagsInputRootEmits,
+  TagsInputRootProps
+} from 'reka-ui'
+import { TagsInputRoot, useForwardPropsEmits } from 'reka-ui'
+import { computed, nextTick, provide, ref } from 'vue'
+import type { HTMLAttributes } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+import { tagsInputFocusKey, tagsInputIsEditingKey } from './tagsInputContext'
+import type { FocusCallback } from './tagsInputContext'
+
+const {
+  disabled = false,
+  alwaysEditing = false,
+  class: className,
+  ...restProps
+} = defineProps<
+  TagsInputRootProps<T> & {
+    class?: HTMLAttributes['class']
+    alwaysEditing?: boolean
+  }
+>()
+const emits = defineEmits<TagsInputRootEmits<T>>()
+
+const isEditing = ref(false)
+const rootEl = useCurrentElement<HTMLElement>()
+const focusInput = ref<FocusCallback>()
+
+provide(tagsInputFocusKey, (callback: FocusCallback) => {
+  focusInput.value = callback
+})
+const isEditingEnabled = computed(() => alwaysEditing || isEditing.value)
+provide(tagsInputIsEditingKey, isEditingEnabled)
+
+const internalDisabled = computed(() => disabled || !isEditingEnabled.value)
+
+const delegatedProps = computed(() => ({
+  ...restProps,
+  disabled: internalDisabled.value
+}))
+
+const forwarded = useForwardPropsEmits(delegatedProps, emits)
+
+async function enableEditing() {
+  if (!disabled && !alwaysEditing && !isEditing.value) {
+    isEditing.value = true
+    await nextTick()
+    focusInput.value?.()
+  }
+}
+
+onClickOutside(rootEl, () => {
+  if (!alwaysEditing) {
+    isEditing.value = false
+  }
+})
+</script>
+
+<template>
+  <TagsInputRoot
+    v-slot="{ modelValue }"
+    v-bind="forwarded"
+    :class="
+      cn(
+        'group relative flex flex-wrap items-center gap-2 rounded-lg bg-transparent p-2 text-xs text-base-foreground',
+        !internalDisabled &&
+          'focus-within:bg-modal-card-background-hovered hover:bg-modal-card-background-hovered',
+        !disabled && !isEditingEnabled && 'cursor-pointer',
+        className
+      )
+    "
+    @click="enableEditing"
+  >
+    <slot :is-empty="modelValue.length === 0" />
+    <i
+      v-if="!disabled && !isEditingEnabled"
+      aria-hidden="true"
+      class="absolute right-2 bottom-2 icon-[lucide--square-pen] size-4 text-muted-foreground opacity-0 transition-opacity group-hover:opacity-100"
+    />
+  </TagsInputRoot>
+</template>
diff --git a/src/components/ui/tags-input/TagsInputInput.vue b/src/components/ui/tags-input/TagsInputInput.vue
new file mode 100644
index 0000000000..343cc6881f
--- /dev/null
+++ b/src/components/ui/tags-input/TagsInputInput.vue
@@ -0,0 +1,54 @@
+<script setup lang="ts">
+import type { TagsInputInputProps } from 'reka-ui'
+import { TagsInputInput, useForwardExpose, useForwardProps } from 'reka-ui'
+import { computed, inject, onMounted, onUnmounted, ref } from 'vue'
+import type { HTMLAttributes } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+import { tagsInputFocusKey, tagsInputIsEditingKey } from './tagsInputContext'
+
+const {
+  isEmpty = false,
+  class: className,
+  ...restProps
+} = defineProps<
+  TagsInputInputProps & { class?: HTMLAttributes['class']; isEmpty?: boolean }
+>()
+
+const forwardedProps = useForwardProps(restProps)
+const isEditing = inject(tagsInputIsEditingKey, ref(true))
+const showInput = computed(() => isEditing.value || isEmpty)
+
+const { forwardRef, currentElement } = useForwardExpose()
+const registerFocus = inject(tagsInputFocusKey, undefined)
+
+function handleEscape() {
+  currentElement.value?.blur()
+  isEditing.value = false
+}
+
+onMounted(() => {
+  registerFocus?.(() => currentElement.value?.focus())
+})
+
+onUnmounted(() => {
+  registerFocus?.(undefined)
+})
+</script>
+
+<template>
+  <TagsInputInput
+    v-if="showInput"
+    :ref="forwardRef"
+    v-bind="forwardedProps"
+    :class="
+      cn(
+        'min-h-6 flex-1 appearance-none border-none bg-transparent text-xs text-muted-foreground placeholder:text-muted-foreground focus:outline-none',
+        !isEditing && 'pointer-events-none',
+        className
+      )
+    "
+    @keydown.escape.stop="handleEscape"
+  />
+</template>
diff --git a/src/components/ui/tags-input/TagsInputItem.vue b/src/components/ui/tags-input/TagsInputItem.vue
new file mode 100644
index 0000000000..037920001d
--- /dev/null
+++ b/src/components/ui/tags-input/TagsInputItem.vue
@@ -0,0 +1,27 @@
+<script setup lang="ts">
+import type { TagsInputItemProps } from 'reka-ui'
+import { TagsInputItem, useForwardProps } from 'reka-ui'
+import type { HTMLAttributes } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+const { class: className, ...restProps } = defineProps<
+  TagsInputItemProps & { class?: HTMLAttributes['class'] }
+>()
+
+const forwardedProps = useForwardProps(restProps)
+</script>
+
+<template>
+  <TagsInputItem
+    v-bind="forwardedProps"
+    :class="
+      cn(
+        'flex h-6 items-center gap-1 rounded-sm bg-modal-card-tag-background py-1 pr-1 pl-2 text-modal-card-tag-foreground ring-offset-base-background backdrop-blur-sm data-[state=active]:ring-2 data-[state=active]:ring-base-foreground data-[state=active]:ring-offset-1',
+        className
+      )
+    "
+  >
+    <slot />
+  </TagsInputItem>
+</template>
diff --git a/src/components/ui/tags-input/TagsInputItemDelete.vue b/src/components/ui/tags-input/TagsInputItemDelete.vue
new file mode 100644
index 0000000000..9496f4aaca
--- /dev/null
+++ b/src/components/ui/tags-input/TagsInputItemDelete.vue
@@ -0,0 +1,36 @@
+<script setup lang="ts">
+import type { TagsInputItemDeleteProps } from 'reka-ui'
+import { TagsInputItemDelete, useForwardProps } from 'reka-ui'
+import type { HTMLAttributes } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+import { cn } from '@/utils/tailwindUtil'
+
+const { class: className, ...restProps } = defineProps<
+  TagsInputItemDeleteProps & { class?: HTMLAttributes['class'] }
+>()
+
+const forwardedProps = useForwardProps(restProps)
+const { t } = useI18n()
+</script>
+
+<template>
+  <TagsInputItemDelete
+    v-bind="forwardedProps"
+    :as="Button"
+    variant="textonly"
+    size="icon-sm"
+    :aria-label="t('g.removeTag')"
+    :class="
+      cn(
+        'w-4 overflow-hidden opacity-60 transition-[opacity,width] duration-150 hover:bg-transparent hover:opacity-100 data-disabled:pointer-events-none data-disabled:w-0 data-disabled:opacity-0',
+        className
+      )
+    "
+  >
+    <slot>
+      <i class="icon-[lucide--x] size-4" />
+    </slot>
+  </TagsInputItemDelete>
+</template>
diff --git a/src/components/ui/tags-input/TagsInputItemText.vue b/src/components/ui/tags-input/TagsInputItemText.vue
new file mode 100644
index 0000000000..f65119c726
--- /dev/null
+++ b/src/components/ui/tags-input/TagsInputItemText.vue
@@ -0,0 +1,20 @@
+<script setup lang="ts">
+import type { TagsInputItemTextProps } from 'reka-ui'
+import { TagsInputItemText, useForwardProps } from 'reka-ui'
+import type { HTMLAttributes } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+const { class: className, ...restProps } = defineProps<
+  TagsInputItemTextProps & { class?: HTMLAttributes['class'] }
+>()
+
+const forwardedProps = useForwardProps(restProps)
+</script>
+
+<template>
+  <TagsInputItemText
+    v-bind="forwardedProps"
+    :class="cn('bg-transparent text-xs', className)"
+  />
+</template>
diff --git a/src/components/ui/tags-input/tagsInputContext.ts b/src/components/ui/tags-input/tagsInputContext.ts
new file mode 100644
index 0000000000..05fff98e55
--- /dev/null
+++ b/src/components/ui/tags-input/tagsInputContext.ts
@@ -0,0 +1,10 @@
+import type { InjectionKey, Ref } from 'vue'
+
+export type FocusCallback = (() => void) | undefined
+
+export const tagsInputFocusKey: InjectionKey<
+  (callback: FocusCallback) => void
+> = Symbol('tagsInputFocus')
+
+export const tagsInputIsEditingKey: InjectionKey<Ref<boolean>> =
+  Symbol('tagsInputIsEditing')
diff --git a/src/components/ui/textarea/Textarea.stories.ts b/src/components/ui/textarea/Textarea.stories.ts
new file mode 100644
index 0000000000..559ef542f1
--- /dev/null
+++ b/src/components/ui/textarea/Textarea.stories.ts
@@ -0,0 +1,54 @@
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+import { ref } from 'vue'
+
+import Textarea from './Textarea.vue'
+
+const meta: Meta<typeof Textarea> = {
+  title: 'UI/Textarea',
+  component: Textarea,
+  tags: ['autodocs']
+}
+
+export default meta
+type Story = StoryObj<typeof Textarea>
+
+export const Default: Story = {
+  render: () => ({
+    components: { Textarea },
+    setup() {
+      const value = ref('Hello world')
+      return { value }
+    },
+    template:
+      '<Textarea v-model="value" placeholder="Type something..." class="max-w-sm" />'
+  })
+}
+
+export const Disabled: Story = {
+  render: () => ({
+    components: { Textarea },
+    template:
+      '<Textarea model-value="Disabled textarea" disabled class="max-w-sm" />'
+  })
+}
+
+export const WithLabel: Story = {
+  render: () => ({
+    components: { Textarea },
+    setup() {
+      const value = ref('Content that sits below the label')
+      return { value }
+    },
+    template: `
+      <div class="relative max-w-sm rounded-lg bg-component-node-widget-background">
+        <label class="pointer-events-none absolute left-3 top-1.5 text-xxs text-muted-foreground z-10">
+          Prompt
+        </label>
+        <Textarea
+          v-model="value"
+          class="size-full resize-none border-none bg-transparent pt-5 text-xs"
+        />
+      </div>
+    `
+  })
+}
diff --git a/src/components/ui/textarea/Textarea.vue b/src/components/ui/textarea/Textarea.vue
new file mode 100644
index 0000000000..f07f3f5bf8
--- /dev/null
+++ b/src/components/ui/textarea/Textarea.vue
@@ -0,0 +1,24 @@
+<script setup lang="ts">
+import type { HTMLAttributes } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+const { class: className, ...restAttrs } = defineProps<{
+  class?: HTMLAttributes['class']
+}>()
+
+const modelValue = defineModel<string | number>()
+</script>
+
+<template>
+  <textarea
+    v-bind="restAttrs"
+    v-model="modelValue"
+    :class="
+      cn(
+        'flex min-h-16 w-full rounded-lg border-none bg-secondary-background px-3 py-2 text-sm text-base-foreground placeholder:text-muted-foreground focus-visible:ring-1 focus-visible:ring-border-default focus-visible:outline-none disabled:pointer-events-none disabled:opacity-50',
+        className
+      )
+    "
+  />
+</template>
diff --git a/src/components/ui/toggle-group/ToggleGroup.stories.ts b/src/components/ui/toggle-group/ToggleGroup.stories.ts
new file mode 100644
index 0000000000..1b0baf0eab
--- /dev/null
+++ b/src/components/ui/toggle-group/ToggleGroup.stories.ts
@@ -0,0 +1,182 @@
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+import { ref } from 'vue'
+
+import ToggleGroup from './ToggleGroup.vue'
+import ToggleGroupItem from './ToggleGroupItem.vue'
+
+const meta = {
+  title: 'Components/ToggleGroup',
+  component: ToggleGroup,
+  tags: ['autodocs'],
+  argTypes: {
+    type: {
+      control: 'select',
+      options: ['single', 'multiple'],
+      description: 'Single or multiple selection'
+    },
+    variant: {
+      control: 'select',
+      options: ['default', 'outline'],
+      description: 'Visual style variant'
+    },
+    disabled: {
+      control: 'boolean',
+      description: 'When true, disables the toggle group'
+    },
+    'onUpdate:modelValue': { action: 'update:modelValue' }
+  }
+} satisfies Meta<typeof ToggleGroup>
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const Default: Story = {
+  render: (args) => ({
+    components: { ToggleGroup, ToggleGroupItem },
+    setup() {
+      const value = ref('center')
+      return { value, args }
+    },
+    template: `
+      <ToggleGroup
+        v-model="value"
+        type="single"
+        :variant="args.variant"
+        :disabled="args.disabled"
+        class="border border-border-default rounded-lg p-1"
+      >
+        <ToggleGroupItem value="left">Left</ToggleGroupItem>
+        <ToggleGroupItem value="center">Center</ToggleGroupItem>
+        <ToggleGroupItem value="right">Right</ToggleGroupItem>
+      </ToggleGroup>
+      <div class="mt-4 text-sm text-muted-foreground">
+        Selected: {{ value || 'None' }}
+      </div>
+    `
+  }),
+  args: {
+    variant: 'default',
+    disabled: false
+  }
+}
+
+export const Disabled: Story = {
+  render: (args) => ({
+    components: { ToggleGroup, ToggleGroupItem },
+    setup() {
+      const value = ref('on')
+      return { value, args }
+    },
+    template: `
+      <ToggleGroup v-model="value" type="single" disabled class="border border-border-default rounded-lg p-1">
+        <ToggleGroupItem value="off">Off</ToggleGroupItem>
+        <ToggleGroupItem value="on">On</ToggleGroupItem>
+      </ToggleGroup>
+    `
+  }),
+  args: {}
+}
+
+export const OutlineVariant: Story = {
+  render: (args) => ({
+    components: { ToggleGroup, ToggleGroupItem },
+    setup() {
+      const value = ref('medium')
+      return { value, args }
+    },
+    template: `
+      <ToggleGroup v-model="value" type="single" variant="outline" class="gap-2">
+        <ToggleGroupItem value="small" size="sm">Small</ToggleGroupItem>
+        <ToggleGroupItem value="medium">Medium</ToggleGroupItem>
+        <ToggleGroupItem value="large" size="lg">Large</ToggleGroupItem>
+      </ToggleGroup>
+    `
+  }),
+  args: {}
+}
+
+export const BooleanToggle: Story = {
+  render: (args) => ({
+    components: { ToggleGroup, ToggleGroupItem },
+    setup() {
+      const value = ref('off')
+      return { value, args }
+    },
+    template: `
+      <div class="space-y-4">
+        <p class="text-sm text-muted-foreground">Boolean toggle with custom labels:</p>
+        <ToggleGroup
+          v-model="value"
+          type="single"
+          class="w-48 border border-border-default rounded-lg p-1"
+        >
+          <ToggleGroupItem value="off" size="sm">Outside</ToggleGroupItem>
+          <ToggleGroupItem value="on" size="sm">Inside</ToggleGroupItem>
+        </ToggleGroup>
+        <div class="text-sm">Value: {{ value === 'on' ? true : false }}</div>
+      </div>
+    `
+  }),
+  args: {}
+}
+
+export const LongLabels: Story = {
+  render: (args) => ({
+    components: { ToggleGroup, ToggleGroupItem },
+    setup() {
+      const value = ref('option1')
+      return { value, args }
+    },
+    template: `
+      <div class="w-64">
+        <p class="text-sm text-muted-foreground mb-2">Labels truncate with ellipsis:</p>
+        <ToggleGroup
+          v-model="value"
+          type="single"
+          class="border border-border-default rounded-lg p-1"
+        >
+          <ToggleGroupItem value="option1" size="sm">Very Long Label One</ToggleGroupItem>
+          <ToggleGroupItem value="option2" size="sm">Another Long Label</ToggleGroupItem>
+        </ToggleGroup>
+      </div>
+    `
+  }),
+  args: {}
+}
+
+export const Sizes: Story = {
+  render: () => ({
+    components: { ToggleGroup, ToggleGroupItem },
+    setup() {
+      const sm = ref('a')
+      const md = ref('a')
+      const lg = ref('a')
+      return { sm, md, lg }
+    },
+    template: `
+      <div class="space-y-4">
+        <div>
+          <p class="text-sm text-muted-foreground mb-2">Small:</p>
+          <ToggleGroup v-model="sm" type="single" class="border border-border-default rounded p-1">
+            <ToggleGroupItem value="a" size="sm">A</ToggleGroupItem>
+            <ToggleGroupItem value="b" size="sm">B</ToggleGroupItem>
+          </ToggleGroup>
+        </div>
+        <div>
+          <p class="text-sm text-muted-foreground mb-2">Default:</p>
+          <ToggleGroup v-model="md" type="single" class="border border-border-default rounded-lg p-1">
+            <ToggleGroupItem value="a">A</ToggleGroupItem>
+            <ToggleGroupItem value="b">B</ToggleGroupItem>
+          </ToggleGroup>
+        </div>
+        <div>
+          <p class="text-sm text-muted-foreground mb-2">Large:</p>
+          <ToggleGroup v-model="lg" type="single" class="border border-border-default rounded-lg p-1">
+            <ToggleGroupItem value="a" size="lg">A</ToggleGroupItem>
+            <ToggleGroupItem value="b" size="lg">B</ToggleGroupItem>
+          </ToggleGroup>
+        </div>
+      </div>
+    `
+  })
+}
diff --git a/src/components/ui/toggle-group/ToggleGroup.vue b/src/components/ui/toggle-group/ToggleGroup.vue
new file mode 100644
index 0000000000..4e58920e60
--- /dev/null
+++ b/src/components/ui/toggle-group/ToggleGroup.vue
@@ -0,0 +1,43 @@
+<script setup lang="ts">
+import type { ToggleGroupRootEmits, ToggleGroupRootProps } from 'reka-ui'
+import { ToggleGroupRoot, useForwardPropsEmits } from 'reka-ui'
+import type { HTMLAttributes } from 'vue'
+import { provide, toRef } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+import type { ToggleGroupVariants } from './toggleGroup.variants'
+import {
+  toggleGroupVariantKey,
+  toggleGroupVariants
+} from './toggleGroup.variants'
+
+interface Props extends ToggleGroupRootProps {
+  class?: HTMLAttributes['class']
+  variant?: ToggleGroupVariants['variant']
+}
+
+const {
+  class: className,
+  variant = 'default',
+  ...restProps
+} = defineProps<Props>()
+
+const emits = defineEmits<ToggleGroupRootEmits>()
+
+const forwarded = useForwardPropsEmits(restProps, emits)
+
+provide(
+  toggleGroupVariantKey,
+  toRef(() => variant)
+)
+</script>
+
+<template>
+  <ToggleGroupRoot
+    v-bind="forwarded"
+    :class="cn(toggleGroupVariants({ variant }), className)"
+  >
+    <slot />
+  </ToggleGroupRoot>
+</template>
diff --git a/src/components/ui/toggle-group/ToggleGroupItem.vue b/src/components/ui/toggle-group/ToggleGroupItem.vue
new file mode 100644
index 0000000000..d4207c5491
--- /dev/null
+++ b/src/components/ui/toggle-group/ToggleGroupItem.vue
@@ -0,0 +1,50 @@
+<script setup lang="ts">
+import type { ToggleGroupItemProps } from 'reka-ui'
+import { ToggleGroupItem, useForwardProps } from 'reka-ui'
+import type { HTMLAttributes } from 'vue'
+import { computed, inject, ref } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+import type { ToggleGroupItemVariants } from './toggleGroup.variants'
+import {
+  toggleGroupItemVariants,
+  toggleGroupVariantKey
+} from './toggleGroup.variants'
+
+interface Props extends ToggleGroupItemProps {
+  class?: HTMLAttributes['class']
+  variant?: ToggleGroupItemVariants['variant']
+  size?: ToggleGroupItemVariants['size']
+}
+
+const {
+  class: className,
+  variant,
+  size = 'default',
+  ...restProps
+} = defineProps<Props>()
+
+const contextVariant = inject(toggleGroupVariantKey, ref('default'))
+
+const forwardedProps = useForwardProps(restProps)
+
+const resolvedVariant = computed(
+  () => variant ?? contextVariant.value ?? 'default'
+)
+</script>
+
+<template>
+  <ToggleGroupItem
+    v-bind="forwardedProps"
+    :class="
+      cn(
+        toggleGroupItemVariants({ variant: resolvedVariant, size }),
+        'min-w-0 flex-1 truncate',
+        className
+      )
+    "
+  >
+    <slot />
+  </ToggleGroupItem>
+</template>
diff --git a/src/components/ui/toggle-group/index.ts b/src/components/ui/toggle-group/index.ts
new file mode 100644
index 0000000000..9f89ad775d
--- /dev/null
+++ b/src/components/ui/toggle-group/index.ts
@@ -0,0 +1,2 @@
+export { default as ToggleGroup } from './ToggleGroup.vue'
+export { default as ToggleGroupItem } from './ToggleGroupItem.vue'
diff --git a/src/components/ui/toggle-group/toggleGroup.variants.ts b/src/components/ui/toggle-group/toggleGroup.variants.ts
new file mode 100644
index 0000000000..122a897509
--- /dev/null
+++ b/src/components/ui/toggle-group/toggleGroup.variants.ts
@@ -0,0 +1,55 @@
+import type { InjectionKey, Ref } from 'vue'
+
+import type { VariantProps } from 'cva'
+import { cva } from 'cva'
+
+export const toggleGroupVariantKey: InjectionKey<
+  Ref<ToggleGroupItemVariants['variant']>
+> = Symbol('toggleGroupVariant')
+
+export const toggleGroupVariants = cva({
+  base: 'flex items-center justify-center gap-1',
+  variants: {
+    variant: {
+      default: 'bg-transparent',
+      outline: 'bg-transparent'
+    }
+  },
+  defaultVariants: {
+    variant: 'default'
+  }
+})
+
+export const toggleGroupItemVariants = cva({
+  base: [
+    'inline-flex items-center justify-center rounded',
+    'border-none cursor-pointer appearance-none',
+    'text-center font-normal',
+    'transition-all duration-150 ease-in-out',
+    'focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring',
+    'disabled:pointer-events-none disabled:opacity-50 disabled:cursor-not-allowed',
+    'data-[state=on]:bg-interface-menu-component-surface-selected data-[state=on]:text-text-primary'
+  ],
+  variants: {
+    variant: {
+      default:
+        'bg-transparent text-text-secondary hover:bg-interface-menu-component-surface-selected/50',
+      outline:
+        'border border-border-default bg-transparent text-text-secondary hover:bg-secondary-background'
+    },
+    size: {
+      default: 'h-7 px-3 text-sm',
+      sm: 'h-6 px-5 py-[5px] text-xs',
+      lg: 'h-9 px-4 text-sm'
+    }
+  },
+  defaultVariants: {
+    variant: 'default',
+    size: 'default'
+  }
+})
+
+export type ToggleGroupVariants = VariantProps<typeof toggleGroupVariants>
+export type ToggleGroupItemVariants = VariantProps<
+  typeof toggleGroupItemVariants
+>
diff --git a/src/components/widget/SampleModelSelector.vue b/src/components/widget/SampleModelSelector.vue
index 6e1db7e7c7..0afe967459 100644
--- a/src/components/widget/SampleModelSelector.vue
+++ b/src/components/widget/SampleModelSelector.vue
@@ -87,12 +87,12 @@
           <template #top>
             <CardTop ratio="landscape">
               <template #default>
-                <div class="h-full w-full bg-blue-500"></div>
+                <div class="size-full bg-blue-500"></div>
               </template>
               <template #top-right>
                 <Button
                   size="icon"
-                  class="!bg-white !text-neutral-900"
+                  class="bg-white! text-neutral-900!"
                   @click="() => {}"
                 >
                   <i class="icon-[lucide--info]" />
@@ -117,7 +117,7 @@
     </template>
 
     <template #rightPanel>
-      <RightSidePanel></RightSidePanel>
+      <div class="size-full bg-modal-panel-background pr-6 pb-8 pl-4"></div>
     </template>
   </BaseModalLayout>
 </template>
@@ -136,7 +136,6 @@ import SingleSelect from '@/components/input/SingleSelect.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 RightSidePanel from '@/components/widget/panel/RightSidePanel.vue'
 import type { NavGroupData, NavItemData } from '@/types/navTypes'
 import { OnCloseKey } from '@/types/widgetTypes'
 import { createGridStyle } from '@/utils/gridUtil'
diff --git a/src/components/widget/layout/BaseModalLayout.stories.ts b/src/components/widget/layout/BaseModalLayout.stories.ts
index abcfae912b..5fdf8258b2 100644
--- a/src/components/widget/layout/BaseModalLayout.stories.ts
+++ b/src/components/widget/layout/BaseModalLayout.stories.ts
@@ -15,7 +15,6 @@ import { OnCloseKey } from '@/types/widgetTypes'
 import { createGridStyle } from '@/utils/gridUtil'
 
 import LeftSidePanel from '../panel/LeftSidePanel.vue'
-import RightSidePanel from '../panel/RightSidePanel.vue'
 import BaseModalLayout from './BaseModalLayout.vue'
 
 interface StoryArgs {
@@ -69,7 +68,6 @@ const createStoryTemplate = (args: StoryArgs) => ({
   components: {
     BaseModalLayout,
     LeftSidePanel,
-    RightSidePanel,
     SearchBox,
     MultiSelect,
     SingleSelect,
@@ -175,16 +173,15 @@ const createStoryTemplate = (args: StoryArgs) => ({
   template: `
     <div>
       <BaseModalLayout v-if="!args.hasRightPanel" :content-title="args.contentTitle || 'Content Title'">
+        <!-- Left Panel Header Title -->
+        <template v-if="args.hasLeftPanel" #leftPanelHeaderTitle>
+          <i class="icon-[lucide--puzzle] size-4 text-neutral" />
+          <span class="text-neutral text-base">Title</span>
+        </template>
+
         <!-- Left Panel -->
         <template v-if="args.hasLeftPanel" #leftPanel>
-          <LeftSidePanel v-model="selectedNavItem" :nav-items="tempNavigation">
-            <template #header-icon>
-              <i class="icon-[lucide--puzzle] size-4 text-neutral" />
-            </template>
-            <template #header-title>
-              <span class="text-neutral text-base">Title</span>
-            </template>
-          </LeftSidePanel>
+          <LeftSidePanel v-model="selectedNavItem" :nav-items="tempNavigation" />
         </template>
 
         <!-- Header -->
@@ -299,16 +296,15 @@ const createStoryTemplate = (args: StoryArgs) => ({
 
       <BaseModalLayout v-else :content-title="args.contentTitle || 'Content Title'">
         <!-- Same content but WITH right panel -->
+        <!-- Left Panel Header Title -->
+        <template v-if="args.hasLeftPanel" #leftPanelHeaderTitle>
+          <i class="icon-[lucide--puzzle] size-4 text-neutral" />
+          <span class="text-neutral text-base">Title</span>
+        </template>
+
         <!-- Left Panel -->
         <template v-if="args.hasLeftPanel" #leftPanel>
-          <LeftSidePanel v-model="selectedNavItem" :nav-items="tempNavigation">
-            <template #header-icon>
-              <i class="icon-[lucide--puzzle] size-4 text-neutral" />
-            </template>
-            <template #header-title>
-              <span class="text-neutral text-base">Title</span>
-            </template>
-          </LeftSidePanel>
+          <LeftSidePanel v-model="selectedNavItem" :nav-items="tempNavigation" />
         </template>
 
         <!-- Header -->
@@ -415,7 +411,7 @@ const createStoryTemplate = (args: StoryArgs) => ({
 
         <!-- Right Panel - Only when hasRightPanel is true -->
         <template #rightPanel>
-          <RightSidePanel />
+          <div class="size-full bg-modal-panel-background pr-6 pb-8 pl-4"></div>
         </template>
       </BaseModalLayout>
     </div>
diff --git a/src/components/widget/layout/BaseModalLayout.vue b/src/components/widget/layout/BaseModalLayout.vue
index 2e4905aab4..615301e5a0 100644
--- a/src/components/widget/layout/BaseModalLayout.vue
+++ b/src/components/widget/layout/BaseModalLayout.vue
@@ -1,97 +1,133 @@
 <template>
-  <div class="base-widget-layout rounded-2xl overflow-hidden relative">
-    <Button
-      v-show="!isRightPanelOpen && hasRightPanel"
-      size="icon"
-      :class="
-        cn('absolute top-4 right-18 z-10', 'transition-opacity duration-200', {
-          'opacity-0 pointer-events-none': isRightPanelOpen || !hasRightPanel
-        })
-      "
-      @click="toggleRightPanel"
+  <div
+    :class="cn('relative overflow-hidden rounded-2xl', sizeClasses)"
+    @keydown.esc.capture="handleEscape"
+  >
+    <div
+      class="grid size-full transition-[grid-template-columns] duration-300 ease-out"
+      :style="gridStyle"
     >
-      <i class="icon-[lucide--panel-right] text-sm" />
-    </Button>
-    <Button
-      class="absolute top-4 right-6 z-10 transition-opacity duration-200"
-      @click="closeDialog"
-    >
-      <i class="pi pi-times text-sm"></i>
-    </Button>
-    <div class="flex h-full w-full">
-      <Transition name="slide-panel">
-        <nav
-          v-if="$slots.leftPanel && showLeftPanel"
-          :class="[
-            PANEL_SIZES.width,
-            PANEL_SIZES.minWidth,
-            PANEL_SIZES.maxWidth
-          ]"
+      <nav
+        class="flex h-full flex-col overflow-hidden bg-modal-panel-background"
+        :inert="!showLeftPanel"
+        :aria-hidden="!showLeftPanel"
+      >
+        <header
+          data-component-id="LeftPanelHeader"
+          class="flex h-18 w-full shrink-0 items-center-safe gap-2 pr-3 pl-6"
         >
-          <slot name="leftPanel"></slot>
-        </nav>
-      </Transition>
-
-      <div class="flex-1 flex bg-base-background">
-        <div class="flex h-full w-full flex-col">
-          <header
-            v-if="$slots.header"
-            class="w-full h-18 px-6 flex items-center justify-between gap-2"
+          <slot name="leftPanelHeaderTitle" />
+          <Button
+            v-if="!notMobile && showLeftPanel"
+            size="lg"
+            class="ml-auto w-10 p-0"
+            :aria-label="t('g.hideLeftPanel')"
+            @click="toggleLeftPanel"
           >
-            <div class="flex flex-1 shrink-0 gap-2">
-              <Button v-if="!notMobile" size="icon" @click="toggleLeftPanel">
-                <i
-                  :class="
-                    cn(
-                      showLeftPanel
-                        ? 'icon-[lucide--panel-left]'
-                        : 'icon-[lucide--panel-left-close]'
-                    )
-                  "
-                />
-              </Button>
-              <slot name="header"></slot>
-            </div>
-            <slot name="header-right-area"></slot>
-            <div
-              :class="
-                cn(
-                  'flex justify-end gap-2 w-0',
-                  hasRightPanel && !isRightPanelOpen ? 'min-w-22' : 'min-w-10'
-                )
-              "
-            >
-              <Button
-                v-if="isRightPanelOpen && hasRightPanel"
-                size="icon"
-                @click="toggleRightPanel"
-              >
-                <i class="icon-[lucide--panel-right-close]" />
-              </Button>
-            </div>
-          </header>
+            <i class="icon-[lucide--panel-left-close]" />
+          </Button>
+        </header>
+        <slot name="leftPanel" />
+      </nav>
 
-          <main class="flex min-h-0 flex-1 flex-col">
-            <!-- Fallback title bar when no leftPanel is provided -->
-            <slot name="contentFilter"></slot>
-            <h2
-              v-if="!$slots.leftPanel"
-              class="text-xxl m-0 px-6 pt-2 pb-6 capitalize"
-            >
-              {{ contentTitle }}
-            </h2>
-            <div class="min-h-0 px-6 pt-0 pb-10 overflow-y-auto">
-              <slot name="content"></slot>
-            </div>
-          </main>
-        </div>
-        <aside
-          v-if="hasRightPanel && isRightPanelOpen"
-          class="w-1/4 min-w-40 max-w-80"
+      <div class="flex flex-col overflow-hidden bg-base-background">
+        <header
+          v-if="$slots.header"
+          class="flex h-18 w-full items-center justify-between gap-2 px-6"
         >
-          <slot name="rightPanel"></slot>
-        </aside>
+          <div class="flex flex-1 shrink-0 gap-2">
+            <Button
+              v-if="!notMobile && !showLeftPanel"
+              size="lg"
+              class="w-10 p-0"
+              :aria-label="t('g.showLeftPanel')"
+              @click="toggleLeftPanel"
+            >
+              <i class="icon-[lucide--panel-left]" />
+            </Button>
+            <slot name="header" />
+          </div>
+          <slot name="header-right-area" />
+          <template v-if="!isRightPanelOpen">
+            <Button
+              v-if="hasRightPanel"
+              size="lg"
+              class="w-10 p-0"
+              :aria-label="t('g.showRightPanel')"
+              @click="toggleRightPanel"
+            >
+              <i class="icon-[lucide--panel-right] size-4" />
+            </Button>
+            <Button
+              size="lg"
+              class="w-10"
+              :aria-label="t('g.closeDialog')"
+              @click="closeDialog"
+            >
+              <i class="pi pi-times" />
+            </Button>
+          </template>
+        </header>
+
+        <main class="flex min-h-0 flex-1 flex-col">
+          <slot name="contentFilter" />
+          <h2
+            v-if="!hasLeftPanel"
+            class="text-xxl m-0 px-6 pt-2 pb-6 capitalize select-none"
+          >
+            {{ contentTitle }}
+          </h2>
+          <div :class="contentContainerClass">
+            <slot name="content" />
+          </div>
+        </main>
       </div>
+
+      <aside
+        v-if="hasRightPanel"
+        class="overflow-hidden"
+        :inert="!isRightPanelOpen"
+        :aria-hidden="!isRightPanelOpen"
+      >
+        <div
+          class="flex h-full w-72 min-w-72 flex-col bg-modal-panel-background"
+        >
+          <header
+            data-component-id="RightPanelHeader"
+            class="flex h-18 shrink-0 items-center gap-2 px-6"
+          >
+            <h2
+              v-if="rightPanelTitle"
+              class="flex-1 text-base font-semibold select-none"
+            >
+              {{ rightPanelTitle }}
+            </h2>
+            <div v-else class="flex-1">
+              <slot name="rightPanelHeaderTitle" />
+            </div>
+            <slot name="rightPanelHeaderActions" />
+            <Button
+              size="lg"
+              class="w-10 p-0"
+              :aria-label="t('g.hideRightPanel')"
+              @click="toggleRightPanel"
+            >
+              <i class="icon-[lucide--panel-right-close] size-4" />
+            </Button>
+            <Button
+              size="lg"
+              class="w-10 p-0"
+              :aria-label="t('g.closeDialog')"
+              @click="closeDialog"
+            >
+              <i class="pi pi-times" />
+            </Button>
+          </header>
+          <div class="min-h-0 flex-1 overflow-y-auto">
+            <slot name="rightPanel" />
+          </div>
+        </div>
+      </aside>
     </div>
   </div>
 </template>
@@ -99,34 +135,58 @@
 <script setup lang="ts">
 import { useBreakpoints } from '@vueuse/core'
 import { computed, inject, ref, useSlots, watch } from 'vue'
+import { useI18n } from 'vue-i18n'
 
 import Button from '@/components/ui/button/Button.vue'
 import { OnCloseKey } from '@/types/widgetTypes'
 import { cn } from '@/utils/tailwindUtil'
 
-const { contentTitle } = defineProps<{
+const { t } = useI18n()
+
+const SIZE_CLASSES = {
+  sm: 'h-[80vh] w-[90vw] max-w-[960px]',
+  md: 'h-[80vh] w-[90vw] max-w-[1400px]',
+  lg: 'h-[80vh] w-[90vw] max-w-[1280px] aspect-[20/13] min-[1450px]:max-w-[1724px]',
+  full: 'h-full w-full max-w-[1400px] 2xl:max-w-[1600px]'
+} as const
+
+type ModalSize = keyof typeof SIZE_CLASSES
+type ContentPadding = 'default' | 'compact' | 'none'
+
+const {
+  contentTitle,
+  rightPanelTitle,
+  size = 'lg',
+  leftPanelWidth = '14rem',
+  contentPadding = 'default'
+} = defineProps<{
   contentTitle: string
+  rightPanelTitle?: string
+  size?: ModalSize
+  leftPanelWidth?: string
+  contentPadding?: ContentPadding
 }>()
 
-const BREAKPOINTS = { md: 880 }
-const PANEL_SIZES = {
-  width: 'w-1/3',
-  minWidth: 'min-w-40',
-  maxWidth: 'max-w-56'
-}
+const sizeClasses = computed(() => SIZE_CLASSES[size])
+
+const isRightPanelOpen = defineModel<boolean>('rightPanelOpen', {
+  default: false
+})
 
 const slots = useSlots()
+const hasLeftPanel = computed(() => !!slots.leftPanel)
+const hasRightPanel = computed(() => !!slots.rightPanel)
+
+const BREAKPOINTS = { md: 880 }
+
 const closeDialog = inject(OnCloseKey, () => {})
 
 const breakpoints = useBreakpoints(BREAKPOINTS)
 const notMobile = breakpoints.greater('md')
 
 const isLeftPanelOpen = ref<boolean>(true)
-const isRightPanelOpen = ref<boolean>(false)
 const mobileMenuOpen = ref<boolean>(false)
 
-const hasRightPanel = computed(() => !!slots.rightPanel)
-
 watch(notMobile, (isDesktop) => {
   if (!isDesktop) {
     mobileMenuOpen.value = false
@@ -140,6 +200,20 @@ const showLeftPanel = computed(() => {
   return shouldShow
 })
 
+const contentContainerClass = computed(() =>
+  cn(
+    'flex scrollbar-custom min-h-0 flex-1 flex-col overflow-y-auto',
+    contentPadding === 'default' && 'px-6 pt-0 pb-10',
+    contentPadding === 'compact' && 'px-6 pt-0 pb-2'
+  )
+)
+
+const gridStyle = computed(() => ({
+  gridTemplateColumns: hasRightPanel.value
+    ? `${hasLeftPanel.value && showLeftPanel.value ? leftPanelWidth : '0rem'} 1fr ${isRightPanelOpen.value ? '18rem' : '0rem'}`
+    : `${hasLeftPanel.value && showLeftPanel.value ? leftPanelWidth : '0rem'} 1fr`
+}))
+
 const toggleLeftPanel = () => {
   if (notMobile.value) {
     isLeftPanelOpen.value = !isLeftPanelOpen.value
@@ -151,42 +225,21 @@ const toggleLeftPanel = () => {
 const toggleRightPanel = () => {
   isRightPanelOpen.value = !isRightPanelOpen.value
 }
-</script>
-<style scoped>
-.base-widget-layout {
-  height: 80vh;
-  width: 90vw;
-  max-width: 1280px;
-  aspect-ratio: 20/13;
-}
 
-@media (min-width: 1450px) {
-  .base-widget-layout {
-    max-width: 1724px;
+function handleEscape(event: KeyboardEvent) {
+  const target = event.target
+  if (!(target instanceof HTMLElement)) return
+  if (
+    target instanceof HTMLInputElement ||
+    target instanceof HTMLTextAreaElement ||
+    target instanceof HTMLSelectElement ||
+    target.isContentEditable
+  ) {
+    return
+  }
+  if (isRightPanelOpen.value) {
+    event.stopPropagation()
+    isRightPanelOpen.value = false
   }
 }
-
-/* Fade transition for buttons */
-.fade-enter-active,
-.fade-leave-active {
-  transition: opacity 0.2s ease;
-}
-
-.fade-enter-from,
-.fade-leave-to {
-  opacity: 0;
-}
-
-/* Slide transition for left panel */
-.slide-panel-enter-active,
-.slide-panel-leave-active {
-  transition: transform 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-  will-change: transform;
-  backface-visibility: hidden;
-}
-
-.slide-panel-enter-from,
-.slide-panel-leave-to {
-  transform: translateX(-100%);
-}
-</style>
+</script>
diff --git a/src/components/widget/nav/NavIcon.vue b/src/components/widget/nav/NavIcon.vue
index bffa99da67..cde652f0f8 100644
--- a/src/components/widget/nav/NavIcon.vue
+++ b/src/components/widget/nav/NavIcon.vue
@@ -1,5 +1,5 @@
 <template>
-  <i :class="icon" class="text-neutral text-sm" />
+  <i :class="icon" class="text-neutral shrink-0 text-sm" />
 </template>
 
 <script setup lang="ts">
diff --git a/src/components/widget/nav/NavItem.vue b/src/components/widget/nav/NavItem.vue
index e4d7d6c4d7..79116e5bcf 100644
--- a/src/components/widget/nav/NavItem.vue
+++ b/src/components/widget/nav/NavItem.vue
@@ -1,30 +1,58 @@
 <template>
   <div
-    class="flex cursor-pointer items-center gap-2 rounded-md px-4 py-3 text-sm transition-colors text-base-foreground"
+    v-tooltip.right="{
+      value: tooltipText,
+      disabled: !isOverflowing,
+      pt: { text: { class: 'w-max whitespace-nowrap' } }
+    }"
+    class="flex cursor-pointer items-center-safe gap-2 rounded-md px-4 py-3 text-sm text-base-foreground transition-colors select-none"
     :class="
       active
         ? 'bg-interface-menu-component-surface-selected'
         : 'hover:bg-interface-menu-component-surface-hovered'
     "
     role="button"
+    @mouseenter="checkOverflow"
     @click="onClick"
   >
     <NavIcon v-if="icon" :icon="icon" />
-    <i v-else class="text-neutral icon-[lucide--folder] text-xs" />
-    <span class="flex items-center">
-      <slot></slot>
+    <i v-else class="text-neutral icon-[lucide--folder] shrink-0 text-xs" />
+    <span ref="textRef" class="min-w-0 truncate">
+      <slot />
     </span>
+    <StatusBadge
+      v-if="badge !== undefined"
+      :label="String(badge)"
+      severity="contrast"
+      variant="circle"
+      class="ml-auto"
+    />
   </div>
 </template>
 
 <script setup lang="ts">
+import { computed, ref } from 'vue'
+
+import StatusBadge from '@/components/common/StatusBadge.vue'
 import type { NavItemData } from '@/types/navTypes'
 
 import NavIcon from './NavIcon.vue'
 
-const { icon, active, onClick } = defineProps<{
+const { icon, badge, active, onClick } = defineProps<{
   icon: NavItemData['icon']
+  badge?: NavItemData['badge']
   active?: boolean
   onClick: () => void
 }>()
+
+const textRef = ref<HTMLElement | null>(null)
+const isOverflowing = ref(false)
+
+const checkOverflow = () => {
+  if (!textRef.value) return
+  isOverflowing.value =
+    textRef.value.scrollWidth > textRef.value.clientWidth + 1
+}
+
+const tooltipText = computed(() => textRef.value?.textContent ?? '')
 </script>
diff --git a/src/components/widget/nav/NavTitle.vue b/src/components/widget/nav/NavTitle.vue
index 35c35b17a3..0f348d3fc7 100644
--- a/src/components/widget/nav/NavTitle.vue
+++ b/src/components/widget/nav/NavTitle.vue
@@ -2,7 +2,7 @@
   <div
     :class="
       cn(
-        'flex items-center justify-between m-0 px-3 py-0 pt-5',
+        'm-0 flex items-center justify-between px-3 py-0 pt-5',
         collapsible && 'cursor-pointer select-none'
       )
     "
@@ -15,7 +15,7 @@
       v-if="collapsible"
       :class="
         cn(
-          'pi transition-transform duration-200 text-xs text-text-secondary ',
+          'pi text-xs text-text-secondary transition-transform duration-200',
           isCollapsed ? 'pi-chevron-right' : 'pi-chevron-down'
         )
       "
diff --git a/src/components/widget/panel/LeftSidePanel.stories.ts b/src/components/widget/panel/LeftSidePanel.stories.ts
index bbfee54c49..98199ad87c 100644
--- a/src/components/widget/panel/LeftSidePanel.stories.ts
+++ b/src/components/widget/panel/LeftSidePanel.stories.ts
@@ -7,20 +7,6 @@ const meta: Meta<typeof LeftSidePanel> = {
   title: 'Components/Widget/Panel/LeftSidePanel',
   component: LeftSidePanel,
   argTypes: {
-    'header-icon': {
-      table: {
-        type: { summary: 'slot' },
-        defaultValue: { summary: 'undefined' }
-      },
-      control: false
-    },
-    'header-title': {
-      table: {
-        type: { summary: 'slot' },
-        defaultValue: { summary: 'undefined' }
-      },
-      control: false
-    },
     'onUpdate:modelValue': {
       table: { disable: true }
     }
@@ -59,14 +45,7 @@ export const Default: Story = {
     },
     template: `
       <div style="height: 500px; width: 256px;">
-        <LeftSidePanel v-model="selectedItem" :nav-items="args.navItems">
-          <template #header-icon>
-            <i class="icon-[lucide--puzzle] size-4 text-neutral" />
-          </template>
-          <template #header-title>
-            <span class="text-neutral text-base">Navigation</span>
-          </template>
-        </LeftSidePanel>
+        <LeftSidePanel v-model="selectedItem" :nav-items="args.navItems" />
       </div>
     `
   })
@@ -126,14 +105,7 @@ export const WithGroups: Story = {
     },
     template: `
       <div style="height: 500px; width: 256px;">
-        <LeftSidePanel v-model="selectedItem" :nav-items="args.navItems">
-          <template #header-icon>
-            <i class="icon-[lucide--puzzle] size-4 text-neutral" />
-          </template>
-          <template #header-title>
-            <span class="text-neutral text-base">Model Selector</span>
-          </template>
-        </LeftSidePanel>
+        <LeftSidePanel v-model="selectedItem" :nav-items="args.navItems" />
         <div class="mt-4 p-2 text-sm">
           Selected: {{ selectedItem }}
         </div>
@@ -176,14 +148,7 @@ export const DefaultIcons: Story = {
     },
     template: `
       <div style="height: 400px; width: 256px;">
-        <LeftSidePanel v-model="selectedItem" :nav-items="args.navItems">
-          <template #header-icon>
-            <i class="icon-[lucide--folder] size-4 text-neutral" />
-          </template>
-          <template #header-title>
-            <span class="text-neutral text-base">Files</span>
-          </template>
-        </LeftSidePanel>
+        <LeftSidePanel v-model="selectedItem" :nav-items="args.navItems" />
       </div>
     `
   })
@@ -228,14 +193,7 @@ export const LongLabels: Story = {
     },
     template: `
       <div style="height: 500px; width: 256px;">
-        <LeftSidePanel v-model="selectedItem" :nav-items="args.navItems">
-          <template #header-icon>
-            <i class="icon-[lucide--settings] size-4 text-neutral" />
-          </template>
-          <template #header-title>
-            <span class="text-neutral text-base">Settings</span>
-          </template>
-        </LeftSidePanel>
+        <LeftSidePanel v-model="selectedItem" :nav-items="args.navItems" />
       </div>
     `
   })
diff --git a/src/components/widget/panel/LeftSidePanel.vue b/src/components/widget/panel/LeftSidePanel.vue
index 94b3104ebe..44483aa9f9 100644
--- a/src/components/widget/panel/LeftSidePanel.vue
+++ b/src/components/widget/panel/LeftSidePanel.vue
@@ -1,45 +1,41 @@
 <template>
-  <div class="flex h-full w-full flex-col bg-modal-panel-background">
-    <PanelHeader>
-      <template #icon>
-        <slot name="header-icon"></slot>
-      </template>
-      <slot name="header-title"></slot>
-    </PanelHeader>
-
-    <nav
-      class="flex scrollbar-hide flex-1 flex-col gap-1 overflow-y-auto px-3 py-4"
+  <div
+    class="flex min-h-0 scrollbar-hide w-full flex-auto flex-col gap-1 overflow-y-auto bg-modal-panel-background px-3"
+  >
+    <template
+      v-for="item in navItems"
+      :key="'title' in item ? item.title : item.id"
     >
-      <template v-for="(item, index) in navItems" :key="index">
-        <div v-if="'items' in item" class="flex flex-col gap-2">
-          <NavTitle
-            v-model="collapsedGroups[item.title]"
-            :title="item.title"
-            :collapsible="item.collapsible"
-          />
-          <template v-if="!item.collapsible || !collapsedGroups[item.title]">
-            <NavItem
-              v-for="subItem in item.items"
-              :key="subItem.id"
-              :icon="subItem.icon"
-              :active="activeItem === subItem.id"
-              @click="activeItem = subItem.id"
-            >
-              {{ subItem.label }}
-            </NavItem>
-          </template>
-        </div>
-        <div v-else class="flex flex-col gap-2">
+      <div v-if="'items' in item" class="flex flex-col gap-2">
+        <NavTitle
+          v-model="collapsedGroups[item.title]"
+          :title="item.title"
+          :collapsible="item.collapsible"
+        />
+        <template v-if="!item.collapsible || !collapsedGroups[item.title]">
           <NavItem
-            :icon="item.icon"
-            :active="activeItem === item.id"
-            @click="activeItem = item.id"
+            v-for="subItem in item.items"
+            :key="subItem.id"
+            :icon="subItem.icon"
+            :badge="subItem.badge"
+            :active="activeItem === subItem.id"
+            @click="activeItem = subItem.id"
           >
-            {{ item.label }}
+            {{ subItem.label }}
           </NavItem>
-        </div>
-      </template>
-    </nav>
+        </template>
+      </div>
+      <div v-else class="flex flex-col gap-2">
+        <NavItem
+          :icon="item.icon"
+          :badge="item.badge"
+          :active="activeItem === item.id"
+          @click="activeItem = item.id"
+        >
+          {{ item.label }}
+        </NavItem>
+      </div>
+    </template>
   </div>
 </template>
 
@@ -50,8 +46,6 @@ import NavItem from '@/components/widget/nav/NavItem.vue'
 import NavTitle from '@/components/widget/nav/NavTitle.vue'
 import type { NavGroupData, NavItemData } from '@/types/navTypes'
 
-import PanelHeader from './PanelHeader.vue'
-
 const { navItems = [], modelValue } = defineProps<{
   navItems?: (NavItemData | NavGroupData)[]
   modelValue?: string | null
diff --git a/src/components/widget/panel/PanelHeader.vue b/src/components/widget/panel/PanelHeader.vue
deleted file mode 100644
index cdcc4eb203..0000000000
--- a/src/components/widget/panel/PanelHeader.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<template>
-  <header class="flex h-16 items-center justify-between px-6">
-    <div class="flex items-center gap-2 pl-1">
-      <slot name="icon">
-        <i class="text-neutral icon-[lucide--puzzle] text-base" />
-      </slot>
-      <h2 class="text-neutral text-base font-bold">
-        <slot></slot>
-      </h2>
-    </div>
-  </header>
-</template>
diff --git a/src/components/widget/panel/RightSidePanel.vue b/src/components/widget/panel/RightSidePanel.vue
deleted file mode 100644
index 85e5aee69c..0000000000
--- a/src/components/widget/panel/RightSidePanel.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<template>
-  <div class="size-full bg-modal-panel-background pr-6 pb-8 pl-4">
-    <slot></slot>
-  </div>
-</template>
diff --git a/src/composables/README.md b/src/composables/README.md
index 229153dae7..e1be581685 100644
--- a/src/composables/README.md
+++ b/src/composables/README.md
@@ -43,6 +43,7 @@ Vue composables are a core part of Vue 3's Composition API and provide a way to
 Composables enable a more modular and functional approach to building components, allowing for better code reuse and separation of concerns. They help keep your component code cleaner by extracting complex logic into separate, reusable functions.
 
 As described in the [Vue.js documentation](https://vuejs.org/guide/reusability/composables.html), composables are:
+
 > Functions that leverage Vue's Composition API to encapsulate and reuse stateful logic.
 
 ## Composable Architecture
@@ -84,157 +85,169 @@ The following diagram shows how composables fit into the application architectur
 
 ## Composable Categories
 
-The following tables list ALL composables in the system as of 2025-01-30:
+The following tables list ALL composables in the system as of 2026-01-30:
 
 ### Auth
+
 Composables for authentication and user management:
 
-| Composable | Description |
-|------------|-------------|
-| `useCurrentUser` | Provides access to the current user information |
-| `useFirebaseAuthActions` | Handles Firebase authentication operations |
+| Composable               | Description                                     |
+| ------------------------ | ----------------------------------------------- |
+| `useCurrentUser`         | Provides access to the current user information |
+| `useFirebaseAuthActions` | Handles Firebase authentication operations      |
 
 ### Bottom Panel Tabs
+
 Composables for terminal and bottom panel functionality:
 
-| Composable | Description |
-|------------|-------------|
-| `useTerminal` | Core terminal functionality |
-| `useTerminalBuffer` | Manages terminal output buffer |
-| `useTerminalTabs` | Handles multiple terminal tab management |
+| Composable          | Description                              |
+| ------------------- | ---------------------------------------- |
+| `useTerminal`       | Core terminal functionality              |
+| `useTerminalBuffer` | Manages terminal output buffer           |
+| `useTerminalTabs`   | Handles multiple terminal tab management |
 
 ### Element
+
 Composables for DOM and element interactions:
 
-| Composable | Description |
-|------------|-------------|
-| `useAbsolutePosition` | Handles element positioning |
+| Composable                    | Description                                 |
+| ----------------------------- | ------------------------------------------- |
+| `useAbsolutePosition`         | Handles element positioning                 |
 | `useCanvasPositionConversion` | Converts between canvas and DOM coordinates |
-| `useDomClipping` | Manages clipping of DOM elements |
-| `useResponsiveCollapse` | Manages responsive collapsing of elements |
+| `useDomClipping`              | Manages clipping of DOM elements            |
+| `useResponsiveCollapse`       | Manages responsive collapsing of elements   |
 
 ### Functional
+
 Utility composables for common patterns:
 
-| Composable | Description |
-|------------|-------------|
+| Composable         | Description                        |
+| ------------------ | ---------------------------------- |
 | `useChainCallback` | Chains multiple callbacks together |
 
 ### Manager
+
 Composables for ComfyUI Manager integration (located in
 `@/workbench/extensions/manager/composables`):
 
-| Composable | Description |
-|------------|-------------|
-| `useManagerStatePersistence` | Persists manager UI state |
-| `useManagerState` | Determines availability of manager UI modes |
-| `useManagerQueue` | Handles manager task queue state |
-| `useConflictAcknowledgment` | Tracks conflict dismissal state |
-| `useConflictDetection` | Orchestrates conflict detection workflow |
-| `useImportFailedDetection` | Handles import-failed conflict dialogs |
-| `useRegistrySearch` | Manages registry search UI state |
+| Composable                   | Description                                 |
+| ---------------------------- | ------------------------------------------- |
+| `useManagerStatePersistence` | Persists manager UI state                   |
+| `useManagerState`            | Determines availability of manager UI modes |
+| `useManagerQueue`            | Handles manager task queue state            |
+| `useConflictAcknowledgment`  | Tracks conflict dismissal state             |
+| `useConflictDetection`       | Orchestrates conflict detection workflow    |
+| `useImportFailedDetection`   | Handles import-failed conflict dialogs      |
+| `useRegistrySearch`          | Manages registry search UI state            |
 
 #### Node Pack
+
 Node package helpers live under
 `@/workbench/extensions/manager/composables/nodePack`:
 
-| Composable | Description |
-|------------|-------------|
-| `useInstalledPacks` | Manages installed node packages |
-| `useMissingNodes` | Detects and handles missing nodes |
-| `useNodePacks` | Core node package functionality |
-| `usePackUpdateStatus` | Tracks package update availability |
-| `usePacksSelection` | Provides selection helpers for pack lists |
-| `usePacksStatus` | Aggregates status across multiple packs |
-| `useUpdateAvailableNodes` | Detects available updates for nodes |
-| `useWorkflowPacks` | Manages packages used in workflows |
+| Composable                | Description                               |
+| ------------------------- | ----------------------------------------- |
+| `useInstalledPacks`       | Manages installed node packages           |
+| `useMissingNodes`         | Detects and handles missing nodes         |
+| `useNodePacks`            | Core node package functionality           |
+| `usePackUpdateStatus`     | Tracks package update availability        |
+| `usePacksSelection`       | Provides selection helpers for pack lists |
+| `usePacksStatus`          | Aggregates status across multiple packs   |
+| `useUpdateAvailableNodes` | Detects available updates for nodes       |
+| `useWorkflowPacks`        | Manages packages used in workflows        |
 
 ### Node
+
 Composables for node-specific functionality:
 
-| Composable | Description |
-|------------|-------------|
-| `useNodeAnimatedImage` | Handles animated images in nodes |
-| `useNodeBadge` | Handles node badge display and interaction |
-| `useNodeCanvasImagePreview` | Canvas-based image preview for nodes |
-| `useNodeDragAndDrop` | Handles drag and drop for nodes |
-| `useNodeFileInput` | Manages file input widgets in nodes |
-| `useNodeImage` | Manages node image preview |
-| `useNodeImageUpload` | Handles image upload for nodes |
-| `useNodePaste` | Manages paste operations for nodes |
-| `useNodePricing` | Handles pricing display for nodes |
-| `useNodeProgressText` | Displays progress text in nodes |
-| `useWatchWidget` | Watches widget value changes |
+| Composable                  | Description                                |
+| --------------------------- | ------------------------------------------ |
+| `useNodeAnimatedImage`      | Handles animated images in nodes           |
+| `useNodeBadge`              | Handles node badge display and interaction |
+| `useNodeCanvasImagePreview` | Canvas-based image preview for nodes       |
+| `useNodeDragAndDrop`        | Handles drag and drop for nodes            |
+| `useNodeFileInput`          | Manages file input widgets in nodes        |
+| `useNodeImage`              | Manages node image preview                 |
+| `useNodeImageUpload`        | Handles image upload for nodes             |
+| `useNodePaste`              | Manages paste operations for nodes         |
+| `useNodePricing`            | Handles pricing display for nodes          |
+| `useNodeProgressText`       | Displays progress text in nodes            |
+| `useWatchWidget`            | Watches widget value changes               |
 
 ### Settings
+
 Composables for settings management:
 
-| Composable | Description |
-|------------|-------------|
+| Composable         | Description                                |
+| ------------------ | ------------------------------------------ |
 | `useSettingSearch` | Provides search functionality for settings |
-| `useSettingUI` | Manages settings UI interactions |
+| `useSettingUI`     | Manages settings UI interactions           |
 
 ### Sidebar Tabs
+
 Composables for sidebar functionality:
 
-| Composable | Description |
-|------------|-------------|
+| Composable                  | Description                           |
+| --------------------------- | ------------------------------------- |
 | `useModelLibrarySidebarTab` | Manages the model library sidebar tab |
-| `useNodeLibrarySidebarTab` | Manages the node library sidebar tab |
-| `useWorkflowsSidebarTab` | Manages the workflows sidebar tab |
+| `useNodeLibrarySidebarTab`  | Manages the node library sidebar tab  |
+| `useWorkflowsSidebarTab`    | Manages the workflows sidebar tab     |
 
 ### Tree
+
 Composables for tree structure operations:
 
-| Composable | Description |
-|------------|-------------|
+| Composable                | Description                             |
+| ------------------------- | --------------------------------------- |
 | `useTreeFolderOperations` | Handles folder operations in tree views |
 
 ### Widgets
+
 Composables for widget functionality:
 
-| Composable | Description |
-|------------|-------------|
-| `useBooleanWidget` | Manages boolean widget interactions |
-| `useComboWidget` | Manages combo box widget interactions |
-| `useFloatWidget` | Manages float input widget interactions |
-| `useImagePreviewWidget` | Manages image preview widget |
-| `useImageUploadWidget` | Handles image upload widget |
-| `useIntWidget` | Manages integer input widget |
-| `useMarkdownWidget` | Handles markdown display widget |
-| `useProgressTextWidget` | Manages progress text widget |
-| `useRemoteWidget` | Handles remote widget connections |
-| `useStringWidget` | Manages string input widget |
+| Composable              | Description                             |
+| ----------------------- | --------------------------------------- |
+| `useBooleanWidget`      | Manages boolean widget interactions     |
+| `useComboWidget`        | Manages combo box widget interactions   |
+| `useFloatWidget`        | Manages float input widget interactions |
+| `useImagePreviewWidget` | Manages image preview widget            |
+| `useImageUploadWidget`  | Handles image upload widget             |
+| `useIntWidget`          | Manages integer input widget            |
+| `useMarkdownWidget`     | Handles markdown display widget         |
+| `useProgressTextWidget` | Manages progress text widget            |
+| `useRemoteWidget`       | Handles remote widget connections       |
+| `useStringWidget`       | Manages string input widget             |
 
 ### Root-level Composables
+
 General-purpose composables:
 
-| Composable | Description |
-|------------|-------------|
-| `useBrowserTabTitle` | Manages browser tab title updates |
-| `useCachedRequest` | Provides request caching functionality |
-| `useCanvasDrop` | Handles drop operations on canvas |
-| `useCivitaiModel` | Integrates with Civitai model API |
-| `useContextMenuTranslation` | Handles context menu translations |
-| `useCopy` | Provides copy functionality |
-| `useCopyToClipboard` | Manages clipboard operations |
-| `useCoreCommands` | Provides core command functionality |
-| `useDownload` | Handles file download operations |
-| `useErrorHandling` | Centralized error handling |
-| `useGlobalLitegraph` | Access to global LiteGraph instance |
-| `useLitegraphSettings` | Manages LiteGraph configuration |
-| `useManagerQueue` | Handles manager queue operations |
-| `usePaste` | Provides paste functionality |
-| `usePragmaticDragAndDrop` | Integrates Atlassian's drag-and-drop library |
-| `useProgressFavicon` | Updates favicon with progress indicator |
-| `useRefreshableSelection` | Manages refreshable selections |
-| `useRegistrySearch` | Searches the ComfyUI registry |
-| `useServerLogs` | Manages server log display |
-| `useTemplateWorkflows` | Manages template workflow loading, selection, and display |
-| `useTreeExpansion` | Handles tree node expansion state |
-| `useValueTransform` | Transforms values between formats |
+| Composable                  | Description                                               |
+| --------------------------- | --------------------------------------------------------- |
+| `useBrowserTabTitle`        | Manages browser tab title updates                         |
+| `useCachedRequest`          | Provides request caching functionality                    |
+| `useCanvasDrop`             | Handles drop operations on canvas                         |
+| `useCivitaiModel`           | Integrates with Civitai model API                         |
+| `useContextMenuTranslation` | Handles context menu translations                         |
+| `useCopy`                   | Provides copy functionality                               |
+| `useCopyToClipboard`        | Manages clipboard operations                              |
+| `useCoreCommands`           | Provides core command functionality                       |
+| `useDownload`               | Handles file download operations                          |
+| `useErrorHandling`          | Centralized error handling                                |
+| `useGlobalLitegraph`        | Access to global LiteGraph instance                       |
+| `useLitegraphSettings`      | Manages LiteGraph configuration                           |
+| `useManagerQueue`           | Handles manager queue operations                          |
+| `usePaste`                  | Provides paste functionality                              |
+| `usePragmaticDragAndDrop`   | Integrates Atlassian's drag-and-drop library              |
+| `useProgressFavicon`        | Updates favicon with progress indicator                   |
+| `useRefreshableSelection`   | Manages refreshable selections                            |
+| `useRegistrySearch`         | Searches the ComfyUI registry                             |
+| `useServerLogs`             | Manages server log display                                |
+| `useTemplateWorkflows`      | Manages template workflow loading, selection, and display |
+| `useTreeExpansion`          | Handles tree node expansion state                         |
+
 | `useWorkflowAutoSave` | Handles automatic workflow saving |
-| `useWorkflowPersistence` | Manages workflow persistence |
+| `useWorkflowPersistenceV2` | Manages workflow persistence |
 | `useWorkflowValidation` | Validates workflow integrity |
 
 ## Usage Guidelines
@@ -251,8 +264,8 @@ Example usage:
 
 ```vue
 <template>
-  <div 
-    :class="{ 'dragging': isDragging }" 
+  <div
+    :class="{ dragging: isDragging }"
     @mousedown="startDrag"
     @mouseup="endDrag"
   >
@@ -261,12 +274,12 @@ Example usage:
 </template>
 
 <script setup lang="ts">
-import { useNodeDragAndDrop } from '@/composables/node/useNodeDragAndDrop';
-import { useNodeImage } from '@/composables/node/useNodeImage';
+import { useNodeDragAndDrop } from '@/composables/node/useNodeDragAndDrop'
+import { useNodeImage } from '@/composables/node/useNodeImage'
 
 // Use composables at the top level
-const { isDragging, startDrag, endDrag } = useNodeDragAndDrop();
-const { imageUrl, loadImage } = useNodeImage();
+const { isDragging, startDrag, endDrag } = useNodeDragAndDrop()
+const { imageUrl, loadImage } = useNodeImage()
 
 // Use returned values in your component
 </script>
@@ -302,7 +315,7 @@ const { width, height, top, left } = useElementBounding(elementRef)
 import { useAsyncState } from '@vueuse/core'
 
 const { state, isReady, isLoading } = useAsyncState(
-  fetch('https://api.example.com/data').then(r => r.json()),
+  fetch('https://api.example.com/data').then((r) => r.json()),
   { data: [] }
 )
 ```
@@ -327,7 +340,7 @@ When creating or modifying composables, follow these best practices:
 Here's a template for creating a new composable:
 
 ```typescript
-import { ref, computed, onMounted, onUnmounted } from 'vue';
+import { ref, computed, onMounted, onUnmounted } from 'vue'
 
 /**
  * Composable for [functionality description]
@@ -338,13 +351,13 @@ export function useExample(options = {}) {
   // State
   const state = ref({
     // Initial state
-  });
+  })
 
   // Computed values
   const derivedValue = computed(() => {
     // Compute from state
-    return state.value.someProperty;
-  });
+    return state.value.someProperty
+  })
 
   // Methods
   function doSomething() {
@@ -354,18 +367,18 @@ export function useExample(options = {}) {
   // Lifecycle hooks
   onMounted(() => {
     // Setup
-  });
+  })
 
   onUnmounted(() => {
     // Cleanup
-  });
+  })
 
   // Return exposed state and methods
   return {
     state,
     derivedValue,
     doSomething
-  };
+  }
 }
 ```
 
@@ -377,60 +390,65 @@ Composables in ComfyUI frequently use these patterns:
 
 ```typescript
 export function useState() {
-  const count = ref(0);
-  
+  const count = ref(0)
+
   function increment() {
-    count.value++;
+    count.value++
   }
-  
+
   return {
     count,
     increment
-  };
+  }
 }
 ```
 
 ### Event Handling with VueUse
 
 ```typescript
-import { useEventListener } from '@vueuse/core';
+import { useEventListener } from '@vueuse/core'
 
 export function useKeyPress(key) {
-  const isPressed = ref(false);
-  
+  const isPressed = ref(false)
+
   useEventListener('keydown', (e) => {
     if (e.key === key) {
-      isPressed.value = true;
+      isPressed.value = true
     }
-  });
-  
+  })
+
   useEventListener('keyup', (e) => {
     if (e.key === key) {
-      isPressed.value = false;
+      isPressed.value = false
     }
-  });
-  
-  return { isPressed };
+  })
+
+  return { isPressed }
 }
 ```
 
 ### Fetch & Load with VueUse
 
 ```typescript
-import { useAsyncState } from '@vueuse/core';
+import { useAsyncState } from '@vueuse/core'
 
 export function useFetchData(url) {
-  const { state: data, isLoading, error, execute: refresh } = useAsyncState(
+  const {
+    state: data,
+    isLoading,
+    error,
+    execute: refresh
+  } = useAsyncState(
     async () => {
-      const response = await fetch(url);
-      if (!response.ok) throw new Error('Failed to fetch data');
-      return response.json();
+      const response = await fetch(url)
+      if (!response.ok) throw new Error('Failed to fetch data')
+      return response.json()
     },
     null,
     { immediate: true }
-  );
-  
-  return { data, isLoading, error, refresh };
+  )
+
+  return { data, isLoading, error, refresh }
 }
 ```
 
diff --git a/src/composables/auth/useCurrentUser.ts b/src/composables/auth/useCurrentUser.ts
index cc5634cae0..28a427749e 100644
--- a/src/composables/auth/useCurrentUser.ts
+++ b/src/composables/auth/useCurrentUser.ts
@@ -1,9 +1,6 @@
 import { whenever } from '@vueuse/core'
 import { computed, watch } from 'vue'
 
-import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
-import { t } from '@/i18n'
-import { useDialogService } from '@/services/dialogService'
 import { useApiKeyAuthStore } from '@/stores/apiKeyAuthStore'
 import { useCommandStore } from '@/stores/commandStore'
 import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
@@ -13,8 +10,6 @@ export const useCurrentUser = () => {
   const authStore = useFirebaseAuthStore()
   const commandStore = useCommandStore()
   const apiKeyStore = useApiKeyAuthStore()
-  const dialogService = useDialogService()
-  const { deleteAccount } = useFirebaseAuthActions()
 
   const firebaseUser = computed(() => authStore.currentUser)
   const isApiKeyLogin = computed(() => apiKeyStore.isAuthenticated)
@@ -41,8 +36,8 @@ export const useCurrentUser = () => {
     whenever(() => authStore.tokenRefreshTrigger, callback)
 
   const onUserLogout = (callback: () => void) => {
-    watch(resolvedUserInfo, (user) => {
-      if (!user) callback()
+    watch(resolvedUserInfo, (user, prevUser) => {
+      if (prevUser && !user) callback()
     })
   }
 
@@ -116,18 +111,6 @@ export const useCurrentUser = () => {
     await commandStore.execute('Comfy.User.OpenSignInDialog')
   }
 
-  const handleDeleteAccount = async () => {
-    const confirmed = await dialogService.confirm({
-      title: t('auth.deleteAccount.confirmTitle'),
-      message: t('auth.deleteAccount.confirmMessage'),
-      type: 'delete'
-    })
-
-    if (confirmed) {
-      await deleteAccount()
-    }
-  }
-
   return {
     loading: authStore.loading,
     isLoggedIn,
@@ -141,7 +124,6 @@ export const useCurrentUser = () => {
     resolvedUserInfo,
     handleSignOut,
     handleSignIn,
-    handleDeleteAccount,
     onUserResolved,
     onTokenRefreshed,
     onUserLogout
diff --git a/src/composables/auth/useFirebaseAuthActions.ts b/src/composables/auth/useFirebaseAuthActions.ts
index da6744c2dc..6da741e3a8 100644
--- a/src/composables/auth/useFirebaseAuthActions.ts
+++ b/src/composables/auth/useFirebaseAuthActions.ts
@@ -2,13 +2,14 @@ import { FirebaseError } from 'firebase/app'
 import { AuthErrorCodes } from 'firebase/auth'
 import { ref } from 'vue'
 
+import { useBillingContext } from '@/composables/billing/useBillingContext'
 import { useErrorHandling } from '@/composables/useErrorHandling'
 import type { ErrorRecoveryStrategy } from '@/composables/useErrorHandling'
 import { t } from '@/i18n'
 import { isCloud } from '@/platform/distribution/types'
-import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
 import { useTelemetry } from '@/platform/telemetry'
 import { useToastStore } from '@/platform/updates/common/toastStore'
+import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
 import { useDialogService } from '@/services/dialogService'
 import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
 import type { BillingPortalTargetTier } from '@/stores/firebaseAuthStore'
@@ -51,6 +52,17 @@ export const useFirebaseAuthActions = () => {
   }
 
   const logout = wrapWithErrorHandlingAsync(async () => {
+    const workflowStore = useWorkflowStore()
+    if (workflowStore.modifiedWorkflows.length > 0) {
+      const dialogService = useDialogService()
+      const confirmed = await dialogService.confirm({
+        title: t('auth.signOut.unsavedChangesTitle'),
+        message: t('auth.signOut.unsavedChangesMessage'),
+        type: 'dirtyClose'
+      })
+      if (!confirmed) return
+    }
+
     await authStore.logout()
     toastStore.add({
       severity: 'success',
@@ -83,7 +95,7 @@ export const useFirebaseAuthActions = () => {
   )
 
   const purchaseCredits = wrapWithErrorHandlingAsync(async (amount: number) => {
-    const { isActiveSubscription } = useSubscription()
+    const { isActiveSubscription } = useBillingContext()
     if (!isActiveSubscription.value) return
 
     const response = await authStore.initiateCreditPurchase({
@@ -104,9 +116,9 @@ export const useFirebaseAuthActions = () => {
   }, reportError)
 
   const accessBillingPortal = wrapWithErrorHandlingAsync<
-    [targetTier?: BillingPortalTargetTier],
+    [targetTier?: BillingPortalTargetTier, openInNewTab?: boolean],
     void
-  >(async (targetTier) => {
+  >(async (targetTier, openInNewTab = true) => {
     const response = await authStore.accessBillingPortal(targetTier)
     if (!response.billing_portal_url) {
       throw new Error(
@@ -115,7 +127,11 @@ export const useFirebaseAuthActions = () => {
         })
       )
     }
-    window.open(response.billing_portal_url, '_blank')
+    if (openInNewTab) {
+      window.open(response.billing_portal_url, '_blank')
+    } else {
+      globalThis.location.href = response.billing_portal_url
+    }
   }, reportError)
 
   const fetchBalance = wrapWithErrorHandlingAsync(async () => {
@@ -202,21 +218,6 @@ export const useFirebaseAuthActions = () => {
     [createReauthenticationRecovery<[string], void>()]
   )
 
-  const deleteAccount = wrapWithErrorHandlingAsync(
-    async () => {
-      await authStore.deleteAccount()
-      toastStore.add({
-        severity: 'success',
-        summary: t('auth.deleteAccount.success'),
-        detail: t('auth.deleteAccount.successDetail'),
-        life: 5000
-      })
-    },
-    reportError,
-    undefined,
-    [createReauthenticationRecovery<[], void>()]
-  )
-
   return {
     logout,
     sendPasswordReset,
@@ -228,7 +229,6 @@ export const useFirebaseAuthActions = () => {
     signInWithEmail,
     signUpWithEmail,
     updatePassword,
-    deleteAccount,
     accessError,
     reportError
   }
diff --git a/src/composables/billing/types.ts b/src/composables/billing/types.ts
new file mode 100644
index 0000000000..1c2f9477b6
--- /dev/null
+++ b/src/composables/billing/types.ts
@@ -0,0 +1,83 @@
+import type { ComputedRef, Ref } from 'vue'
+
+import type { TierKey } from '@/platform/cloud/subscription/constants/tierPricing'
+import type {
+  Plan,
+  PreviewSubscribeResponse,
+  SubscribeResponse,
+  SubscriptionDuration,
+  SubscriptionTier
+} from '@/platform/workspace/api/workspaceApi'
+
+export type BillingType = 'legacy' | 'workspace'
+
+export interface SubscriptionInfo {
+  isActive: boolean
+  tier: SubscriptionTier | null
+  duration: SubscriptionDuration | null
+  planSlug: string | null
+  renewalDate: string | null
+  endDate: string | null
+  isCancelled: boolean
+  hasFunds: boolean
+}
+
+export interface BalanceInfo {
+  amountMicros: number
+  currency: string
+  effectiveBalanceMicros?: number
+  prepaidBalanceMicros?: number
+  cloudCreditBalanceMicros?: number
+}
+
+export interface BillingActions {
+  initialize: () => Promise<void>
+  fetchStatus: () => Promise<void>
+  fetchBalance: () => Promise<void>
+  subscribe: (
+    planSlug: string,
+    returnUrl?: string,
+    cancelUrl?: string
+  ) => Promise<SubscribeResponse | void>
+  previewSubscribe: (
+    planSlug: string
+  ) => Promise<PreviewSubscribeResponse | null>
+  manageSubscription: () => Promise<void>
+  cancelSubscription: () => Promise<void>
+  fetchPlans: () => Promise<void>
+  /**
+   * Ensures billing is initialized and subscription is active.
+   * Shows subscription dialog if not subscribed.
+   * Use this in extensions/entry points that require active subscription.
+   */
+  requireActiveSubscription: () => Promise<void>
+  /**
+   * Shows the subscription dialog.
+   */
+  showSubscriptionDialog: () => void
+}
+
+export interface BillingState {
+  isInitialized: Ref<boolean>
+  subscription: ComputedRef<SubscriptionInfo | null>
+  balance: ComputedRef<BalanceInfo | null>
+  plans: ComputedRef<Plan[]>
+  currentPlanSlug: ComputedRef<string | null>
+  isLoading: Ref<boolean>
+  error: Ref<string | null>
+  /**
+   * Convenience computed for checking if subscription is active.
+   * Equivalent to `subscription.value?.isActive ?? false`
+   */
+  isActiveSubscription: ComputedRef<boolean>
+  /**
+   * Whether the current billing context has a FREE tier subscription.
+   * Workspace-aware: reflects the active workspace's tier, not the user's personal tier.
+   */
+  isFreeTier: ComputedRef<boolean>
+}
+
+export interface BillingContext extends BillingState, BillingActions {
+  type: ComputedRef<BillingType>
+  getMaxSeats: (tierKey: TierKey) => number
+}
diff --git a/src/composables/billing/useBillingContext.test.ts b/src/composables/billing/useBillingContext.test.ts
new file mode 100644
index 0000000000..77a82d22d4
--- /dev/null
+++ b/src/composables/billing/useBillingContext.test.ts
@@ -0,0 +1,237 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { Plan } from '@/platform/workspace/api/workspaceApi'
+
+import { useBillingContext } from './useBillingContext'
+
+const { mockTeamWorkspacesEnabled, mockIsPersonal, mockPlans } = vi.hoisted(
+  () => ({
+    mockTeamWorkspacesEnabled: { value: false },
+    mockIsPersonal: { value: true },
+    mockPlans: { value: [] as Plan[] }
+  })
+)
+
+vi.mock('@vueuse/core', async (importOriginal) => {
+  const original = await importOriginal()
+  return {
+    ...(original as Record<string, unknown>),
+    createSharedComposable: (fn: (...args: unknown[]) => unknown) => fn
+  }
+})
+
+vi.mock('@/composables/useFeatureFlags', () => ({
+  useFeatureFlags: () => ({
+    flags: {
+      get teamWorkspacesEnabled() {
+        return mockTeamWorkspacesEnabled.value
+      }
+    }
+  })
+}))
+
+vi.mock('@/platform/workspace/stores/teamWorkspaceStore', () => ({
+  useTeamWorkspaceStore: () => ({
+    get isInPersonalWorkspace() {
+      return mockIsPersonal.value
+    },
+    get activeWorkspace() {
+      return mockIsPersonal.value
+        ? { id: 'personal-123', type: 'personal' }
+        : { id: 'team-456', type: 'team' }
+    },
+    updateActiveWorkspace: vi.fn()
+  })
+}))
+
+vi.mock('@/platform/cloud/subscription/composables/useSubscription', () => ({
+  useSubscription: () => ({
+    isActiveSubscription: { value: true },
+    subscriptionTier: { value: 'PRO' },
+    subscriptionDuration: { value: 'MONTHLY' },
+    formattedRenewalDate: { value: 'Jan 1, 2025' },
+    formattedEndDate: { value: '' },
+    isCancelled: { value: false },
+    fetchStatus: vi.fn().mockResolvedValue(undefined),
+    manageSubscription: vi.fn().mockResolvedValue(undefined),
+    subscribe: vi.fn().mockResolvedValue(undefined),
+    showSubscriptionDialog: vi.fn()
+  })
+}))
+
+vi.mock(
+  '@/platform/cloud/subscription/composables/useSubscriptionDialog',
+  () => ({
+    useSubscriptionDialog: () => ({
+      show: vi.fn(),
+      hide: vi.fn()
+    })
+  })
+)
+
+vi.mock('@/stores/firebaseAuthStore', () => ({
+  useFirebaseAuthStore: () => ({
+    balance: { amount_micros: 5000000 },
+    fetchBalance: vi.fn().mockResolvedValue({ amount_micros: 5000000 })
+  })
+}))
+
+vi.mock('@/platform/cloud/subscription/composables/useBillingPlans', () => ({
+  useBillingPlans: () => ({
+    get plans() {
+      return mockPlans
+    },
+    currentPlanSlug: { value: null },
+    isLoading: { value: false },
+    error: { value: null },
+    fetchPlans: vi.fn().mockResolvedValue(undefined),
+    getPlanBySlug: vi.fn().mockReturnValue(null)
+  })
+}))
+
+vi.mock('@/platform/workspace/api/workspaceApi', () => ({
+  workspaceApi: {
+    getBillingStatus: vi.fn().mockResolvedValue({
+      is_active: true,
+      has_funds: true,
+      subscription_tier: 'PRO',
+      subscription_duration: 'MONTHLY'
+    }),
+    getBillingBalance: vi.fn().mockResolvedValue({
+      amount_micros: 10000000,
+      currency: 'usd'
+    }),
+    subscribe: vi.fn().mockResolvedValue({ status: 'subscribed' }),
+    previewSubscribe: vi.fn().mockResolvedValue({ allowed: true })
+  }
+}))
+
+describe('useBillingContext', () => {
+  beforeEach(() => {
+    setActivePinia(createPinia())
+    vi.clearAllMocks()
+    mockTeamWorkspacesEnabled.value = false
+    mockIsPersonal.value = true
+    mockPlans.value = []
+  })
+
+  it('returns legacy type for personal workspace', () => {
+    const { type } = useBillingContext()
+    expect(type.value).toBe('legacy')
+  })
+
+  it('provides subscription info from legacy billing', () => {
+    const { subscription } = useBillingContext()
+
+    expect(subscription.value).toEqual({
+      isActive: true,
+      tier: 'PRO',
+      duration: 'MONTHLY',
+      planSlug: null,
+      renewalDate: 'Jan 1, 2025',
+      endDate: null,
+      isCancelled: false,
+      hasFunds: true
+    })
+  })
+
+  it('provides balance info from legacy billing', () => {
+    const { balance } = useBillingContext()
+
+    expect(balance.value).toEqual({
+      amountMicros: 5000000,
+      currency: 'usd',
+      effectiveBalanceMicros: 5000000,
+      prepaidBalanceMicros: 0,
+      cloudCreditBalanceMicros: 0
+    })
+  })
+
+  it('exposes initialize action', async () => {
+    const { initialize } = useBillingContext()
+    await expect(initialize()).resolves.toBeUndefined()
+  })
+
+  it('exposes fetchStatus action', async () => {
+    const { fetchStatus } = useBillingContext()
+    await expect(fetchStatus()).resolves.toBeUndefined()
+  })
+
+  it('exposes fetchBalance action', async () => {
+    const { fetchBalance } = useBillingContext()
+    await expect(fetchBalance()).resolves.toBeUndefined()
+  })
+
+  it('exposes subscribe action', async () => {
+    const { subscribe } = useBillingContext()
+    await expect(subscribe('pro-monthly')).resolves.toBeUndefined()
+  })
+
+  it('exposes manageSubscription action', async () => {
+    const { manageSubscription } = useBillingContext()
+    await expect(manageSubscription()).resolves.toBeUndefined()
+  })
+
+  it('provides isActiveSubscription convenience computed', () => {
+    const { isActiveSubscription } = useBillingContext()
+    expect(isActiveSubscription.value).toBe(true)
+  })
+
+  it('exposes requireActiveSubscription action', async () => {
+    const { requireActiveSubscription } = useBillingContext()
+    await expect(requireActiveSubscription()).resolves.toBeUndefined()
+  })
+
+  it('exposes showSubscriptionDialog action', () => {
+    const { showSubscriptionDialog } = useBillingContext()
+    expect(() => showSubscriptionDialog()).not.toThrow()
+  })
+
+  describe('getMaxSeats', () => {
+    it('returns 1 for personal workspaces regardless of tier', () => {
+      const { getMaxSeats } = useBillingContext()
+      expect(getMaxSeats('standard')).toBe(1)
+      expect(getMaxSeats('creator')).toBe(1)
+      expect(getMaxSeats('pro')).toBe(1)
+      expect(getMaxSeats('founder')).toBe(1)
+    })
+
+    it('falls back to hardcoded values when no API plans available', () => {
+      mockTeamWorkspacesEnabled.value = true
+      mockIsPersonal.value = false
+
+      const { getMaxSeats } = useBillingContext()
+      expect(getMaxSeats('standard')).toBe(1)
+      expect(getMaxSeats('creator')).toBe(5)
+      expect(getMaxSeats('pro')).toBe(20)
+      expect(getMaxSeats('founder')).toBe(1)
+    })
+
+    it('prefers API max_seats when plans are loaded', () => {
+      mockTeamWorkspacesEnabled.value = true
+      mockIsPersonal.value = false
+      mockPlans.value = [
+        {
+          slug: 'pro-monthly',
+          tier: 'PRO',
+          duration: 'MONTHLY',
+          price_cents: 10000,
+          credits_cents: 2110000,
+          max_seats: 50,
+          availability: { available: true },
+          seat_summary: {
+            seat_count: 1,
+            total_cost_cents: 10000,
+            total_credits_cents: 2110000
+          }
+        }
+      ]
+
+      const { getMaxSeats } = useBillingContext()
+      expect(getMaxSeats('pro')).toBe(50)
+      // Tiers without API plans still fall back to hardcoded values
+      expect(getMaxSeats('creator')).toBe(5)
+    })
+  })
+})
diff --git a/src/composables/billing/useBillingContext.ts b/src/composables/billing/useBillingContext.ts
new file mode 100644
index 0000000000..ce1a36cfae
--- /dev/null
+++ b/src/composables/billing/useBillingContext.ts
@@ -0,0 +1,261 @@
+import { computed, ref, shallowRef, toValue, watch } from 'vue'
+import { createSharedComposable } from '@vueuse/core'
+
+import { useFeatureFlags } from '@/composables/useFeatureFlags'
+import {
+  KEY_TO_TIER,
+  getTierFeatures
+} from '@/platform/cloud/subscription/constants/tierPricing'
+import type { TierKey } from '@/platform/cloud/subscription/constants/tierPricing'
+import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
+
+import type {
+  BalanceInfo,
+  BillingActions,
+  BillingContext,
+  BillingType,
+  BillingState,
+  SubscriptionInfo
+} from './types'
+import { useLegacyBilling } from './useLegacyBilling'
+import { useWorkspaceBilling } from '@/platform/workspace/composables/useWorkspaceBilling'
+
+/**
+ * Unified billing context that automatically switches between legacy (user-scoped)
+ * and workspace billing based on the active workspace type.
+ *
+ * - Personal workspaces use legacy billing via /customers/* endpoints
+ * - Team workspaces use workspace billing via /billing/* endpoints
+ *
+ * The context automatically initializes when the workspace changes and provides
+ * a unified interface for subscription status, balance, and billing actions.
+ *
+ * @example
+ * ```typescript
+ * const {
+ *   type,
+ *   subscription,
+ *   balance,
+ *   isInitialized,
+ *   initialize,
+ *   subscribe
+ * } = useBillingContext()
+ *
+ * // Wait for initialization
+ * await initialize()
+ *
+ * // Check subscription status
+ * if (subscription.value?.isActive) {
+ *   console.log(`Tier: ${subscription.value.tier}`)
+ * }
+ *
+ * // Check balance
+ * if (balance.value) {
+ *   const dollars = balance.value.amountMicros / 1_000_000
+ *   console.log(`Balance: $${dollars.toFixed(2)}`)
+ * }
+ * ```
+ */
+function useBillingContextInternal(): BillingContext {
+  const store = useTeamWorkspaceStore()
+  const { flags } = useFeatureFlags()
+
+  const legacyBillingRef = shallowRef<(BillingState & BillingActions) | null>(
+    null
+  )
+  const workspaceBillingRef = shallowRef<
+    (BillingState & BillingActions) | null
+  >(null)
+
+  const getLegacyBilling = () => {
+    if (!legacyBillingRef.value) {
+      legacyBillingRef.value = useLegacyBilling()
+    }
+    return legacyBillingRef.value
+  }
+
+  const getWorkspaceBilling = () => {
+    if (!workspaceBillingRef.value) {
+      workspaceBillingRef.value = useWorkspaceBilling()
+    }
+    return workspaceBillingRef.value
+  }
+
+  const isInitialized = ref(false)
+  const isLoading = ref(false)
+  const error = ref<string | null>(null)
+
+  /**
+   * Determines which billing type to use:
+   * - If team workspaces feature is disabled: always use legacy (/customers)
+   * - If team workspaces feature is enabled:
+   *   - Personal workspace: use legacy (/customers)
+   *   - Team workspace: use workspace (/billing)
+   */
+  const type = computed<BillingType>(() => {
+    if (!flags.teamWorkspacesEnabled) return 'legacy'
+    return store.isInPersonalWorkspace ? 'legacy' : 'workspace'
+  })
+
+  const activeContext = computed(() =>
+    type.value === 'legacy' ? getLegacyBilling() : getWorkspaceBilling()
+  )
+
+  // Proxy state from active context
+  const subscription = computed<SubscriptionInfo | null>(() =>
+    toValue(activeContext.value.subscription)
+  )
+
+  const balance = computed<BalanceInfo | null>(() =>
+    toValue(activeContext.value.balance)
+  )
+
+  const plans = computed(() => toValue(activeContext.value.plans))
+
+  const currentPlanSlug = computed(() =>
+    toValue(activeContext.value.currentPlanSlug)
+  )
+
+  const isActiveSubscription = computed(() =>
+    toValue(activeContext.value.isActiveSubscription)
+  )
+
+  const isFreeTier = computed(() => subscription.value?.tier === 'FREE')
+
+  function getMaxSeats(tierKey: TierKey): number {
+    if (type.value === 'legacy') return 1
+
+    const apiTier = KEY_TO_TIER[tierKey]
+    const plan = plans.value.find(
+      (p) => p.tier === apiTier && p.duration === 'MONTHLY'
+    )
+    return plan?.max_seats ?? getTierFeatures(tierKey).maxMembers
+  }
+
+  // Sync subscription info to workspace store for display in workspace switcher
+  // A subscription is considered "subscribed" for workspace purposes if it's active AND not cancelled
+  // This ensures the delete button is enabled after cancellation, even before the period ends
+  watch(
+    subscription,
+    (sub) => {
+      if (!sub || store.isInPersonalWorkspace) return
+
+      store.updateActiveWorkspace({
+        isSubscribed: sub.isActive && !sub.isCancelled,
+        subscriptionPlan: sub.planSlug
+      })
+    },
+    { immediate: true }
+  )
+
+  // Initialize billing when workspace changes
+  watch(
+    () => store.activeWorkspace?.id,
+    async (newWorkspaceId, oldWorkspaceId) => {
+      if (!newWorkspaceId) {
+        // No workspace selected - reset state
+        isInitialized.value = false
+        error.value = null
+        return
+      }
+
+      if (newWorkspaceId !== oldWorkspaceId) {
+        // Workspace changed - reinitialize
+        isInitialized.value = false
+        try {
+          await initialize()
+        } catch (err) {
+          // Error is already captured in error ref
+          console.error('Failed to initialize billing context:', err)
+        }
+      }
+    },
+    { immediate: true }
+  )
+
+  async function initialize(): Promise<void> {
+    if (isInitialized.value) return
+
+    isLoading.value = true
+    error.value = null
+    try {
+      await activeContext.value.initialize()
+      isInitialized.value = true
+    } catch (err) {
+      error.value =
+        err instanceof Error ? err.message : 'Failed to initialize billing'
+      throw err
+    } finally {
+      isLoading.value = false
+    }
+  }
+
+  async function fetchStatus(): Promise<void> {
+    return activeContext.value.fetchStatus()
+  }
+
+  async function fetchBalance(): Promise<void> {
+    return activeContext.value.fetchBalance()
+  }
+
+  async function subscribe(
+    planSlug: string,
+    returnUrl?: string,
+    cancelUrl?: string
+  ) {
+    return activeContext.value.subscribe(planSlug, returnUrl, cancelUrl)
+  }
+
+  async function previewSubscribe(planSlug: string) {
+    return activeContext.value.previewSubscribe(planSlug)
+  }
+
+  async function manageSubscription() {
+    return activeContext.value.manageSubscription()
+  }
+
+  async function cancelSubscription() {
+    return activeContext.value.cancelSubscription()
+  }
+
+  async function fetchPlans() {
+    return activeContext.value.fetchPlans()
+  }
+
+  async function requireActiveSubscription() {
+    return activeContext.value.requireActiveSubscription()
+  }
+
+  function showSubscriptionDialog() {
+    return activeContext.value.showSubscriptionDialog()
+  }
+
+  return {
+    type,
+    isInitialized,
+    subscription,
+    balance,
+    plans,
+    currentPlanSlug,
+    isLoading,
+    error,
+    isActiveSubscription,
+    isFreeTier,
+    getMaxSeats,
+
+    initialize,
+    fetchStatus,
+    fetchBalance,
+    subscribe,
+    previewSubscribe,
+    manageSubscription,
+    cancelSubscription,
+    fetchPlans,
+    requireActiveSubscription,
+    showSubscriptionDialog
+  }
+}
+
+export const useBillingContext = createSharedComposable(
+  useBillingContextInternal
+)
diff --git a/src/composables/billing/useLegacyBilling.ts b/src/composables/billing/useLegacyBilling.ts
new file mode 100644
index 0000000000..0e94a798bb
--- /dev/null
+++ b/src/composables/billing/useLegacyBilling.ts
@@ -0,0 +1,195 @@
+import { computed, ref } from 'vue'
+
+import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
+import type {
+  PreviewSubscribeResponse,
+  SubscribeResponse
+} from '@/platform/workspace/api/workspaceApi'
+import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
+
+import type {
+  BalanceInfo,
+  BillingActions,
+  BillingState,
+  SubscriptionInfo
+} from './types'
+
+/**
+ * Adapter for legacy user-scoped billing via /customers/* endpoints.
+ * Used for personal workspaces.
+ * @internal - Use useBillingContext() instead of importing directly.
+ */
+export function useLegacyBilling(): BillingState & BillingActions {
+  const {
+    isActiveSubscription: legacyIsActiveSubscription,
+    subscriptionTier,
+    subscriptionDuration,
+    formattedRenewalDate,
+    formattedEndDate,
+    isCancelled,
+    fetchStatus: legacyFetchStatus,
+    manageSubscription: legacyManageSubscription,
+    subscribe: legacySubscribe,
+    showSubscriptionDialog: legacyShowSubscriptionDialog
+  } = useSubscription()
+
+  const firebaseAuthStore = useFirebaseAuthStore()
+
+  const isInitialized = ref(false)
+  const isLoading = ref(false)
+  const error = ref<string | null>(null)
+
+  const isActiveSubscription = computed(() => legacyIsActiveSubscription.value)
+  const isFreeTier = computed(() => subscriptionTier.value === 'FREE')
+
+  const subscription = computed<SubscriptionInfo | null>(() => {
+    if (!legacyIsActiveSubscription.value && !subscriptionTier.value) {
+      return null
+    }
+
+    return {
+      isActive: legacyIsActiveSubscription.value,
+      tier: subscriptionTier.value,
+      duration: subscriptionDuration.value,
+      planSlug: null, // Legacy doesn't use plan slugs
+      renewalDate: formattedRenewalDate.value || null,
+      endDate: formattedEndDate.value || null,
+      isCancelled: isCancelled.value,
+      hasFunds: (firebaseAuthStore.balance?.amount_micros ?? 0) > 0
+    }
+  })
+
+  const balance = computed<BalanceInfo | null>(() => {
+    const legacyBalance = firebaseAuthStore.balance
+    if (!legacyBalance) return null
+
+    return {
+      amountMicros: legacyBalance.amount_micros ?? 0,
+      currency: legacyBalance.currency ?? 'usd',
+      effectiveBalanceMicros:
+        legacyBalance.effective_balance_micros ??
+        legacyBalance.amount_micros ??
+        0,
+      prepaidBalanceMicros: legacyBalance.prepaid_balance_micros ?? 0,
+      cloudCreditBalanceMicros: legacyBalance.cloud_credit_balance_micros ?? 0
+    }
+  })
+
+  // Legacy billing doesn't have workspace-style plans
+  const plans = computed(() => [])
+  const currentPlanSlug = computed(() => null)
+
+  async function initialize(): Promise<void> {
+    if (isInitialized.value) return
+
+    isLoading.value = true
+    error.value = null
+    try {
+      await Promise.all([fetchStatus(), fetchBalance()])
+      // Re-fetch balance if free tier credits were just lazily granted
+      if (isFreeTier.value && balance.value?.amountMicros === 0) {
+        await fetchBalance()
+      }
+      isInitialized.value = true
+    } catch (err) {
+      error.value =
+        err instanceof Error ? err.message : 'Failed to initialize billing'
+      throw err
+    } finally {
+      isLoading.value = false
+    }
+  }
+
+  async function fetchStatus(): Promise<void> {
+    isLoading.value = true
+    error.value = null
+    try {
+      await legacyFetchStatus()
+    } catch (err) {
+      error.value =
+        err instanceof Error ? err.message : 'Failed to fetch subscription'
+      throw err
+    } finally {
+      isLoading.value = false
+    }
+  }
+
+  async function fetchBalance(): Promise<void> {
+    isLoading.value = true
+    error.value = null
+    try {
+      await firebaseAuthStore.fetchBalance()
+    } catch (err) {
+      error.value =
+        err instanceof Error ? err.message : 'Failed to fetch balance'
+      throw err
+    } finally {
+      isLoading.value = false
+    }
+  }
+
+  async function subscribe(
+    _planSlug: string,
+    _returnUrl?: string,
+    _cancelUrl?: string
+  ): Promise<SubscribeResponse | void> {
+    // Legacy billing uses Stripe checkout flow via useSubscription
+    await legacySubscribe()
+  }
+
+  async function previewSubscribe(
+    _planSlug: string
+  ): Promise<PreviewSubscribeResponse | null> {
+    // Legacy billing doesn't support preview - returns null
+    return null
+  }
+
+  async function manageSubscription(): Promise<void> {
+    await legacyManageSubscription()
+  }
+
+  async function cancelSubscription(): Promise<void> {
+    await legacyManageSubscription()
+  }
+
+  async function fetchPlans(): Promise<void> {
+    // Legacy billing doesn't have workspace-style plans
+    // Plans are hardcoded in the UI for legacy subscriptions
+  }
+
+  async function requireActiveSubscription(): Promise<void> {
+    await fetchStatus()
+    if (!isActiveSubscription.value) {
+      legacyShowSubscriptionDialog()
+    }
+  }
+
+  function showSubscriptionDialog(): void {
+    legacyShowSubscriptionDialog()
+  }
+
+  return {
+    // State
+    isInitialized,
+    subscription,
+    balance,
+    plans,
+    currentPlanSlug,
+    isLoading,
+    error,
+    isActiveSubscription,
+    isFreeTier,
+
+    // Actions
+    initialize,
+    fetchStatus,
+    fetchBalance,
+    subscribe,
+    previewSubscribe,
+    manageSubscription,
+    cancelSubscription,
+    fetchPlans,
+    requireActiveSubscription,
+    showSubscriptionDialog
+  }
+}
diff --git a/src/composables/bottomPanelTabs/useTerminalTabs.ts b/src/composables/bottomPanelTabs/useTerminalTabs.ts
index 2abc79c938..b7f48d1d7a 100644
--- a/src/composables/bottomPanelTabs/useTerminalTabs.ts
+++ b/src/composables/bottomPanelTabs/useTerminalTabs.ts
@@ -1,27 +1,24 @@
 import { markRaw } from 'vue'
-import { useI18n } from 'vue-i18n'
 
-import CommandTerminal from '@/components/bottomPanel/tabs/terminal/CommandTerminal.vue'
 import LogsTerminal from '@/components/bottomPanel/tabs/terminal/LogsTerminal.vue'
+import CommandTerminal from '@/components/bottomPanel/tabs/terminal/CommandTerminal.vue'
 import type { BottomPanelExtension } from '@/types/extensionTypes'
 
-export const useLogsTerminalTab = (): BottomPanelExtension => {
-  const { t } = useI18n()
+export function useLogsTerminalTab(): BottomPanelExtension {
   return {
     id: 'logs-terminal',
-    title: t('g.logs'), // For command labels (collected by i18n workflow)
-    titleKey: 'g.logs', // For dynamic translation in UI
+    title: 'Logs',
+    titleKey: 'g.logs',
     component: markRaw(LogsTerminal),
     type: 'vue'
   }
 }
 
-export const useCommandTerminalTab = (): BottomPanelExtension => {
-  const { t } = useI18n()
+export function useCommandTerminalTab(): BottomPanelExtension {
   return {
     id: 'command-terminal',
-    title: t('g.terminal'), // For command labels (collected by i18n workflow)
-    titleKey: 'g.terminal', // For dynamic translation in UI
+    title: 'Terminal',
+    titleKey: 'g.terminal',
     component: markRaw(CommandTerminal),
     type: 'vue'
   }
diff --git a/src/composables/canvas/useFocusNode.ts b/src/composables/canvas/useFocusNode.ts
new file mode 100644
index 0000000000..1e15730236
--- /dev/null
+++ b/src/composables/canvas/useFocusNode.ts
@@ -0,0 +1,84 @@
+import { nextTick } from 'vue'
+
+import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import { app } from '@/scripts/app'
+import type {
+  LGraph,
+  LGraphNode,
+  Subgraph
+} from '@/lib/litegraph/src/litegraph'
+import {
+  getNodeByExecutionId,
+  getRootParentNode
+} from '@/utils/graphTraversalUtil'
+import { isGroupNode } from '@/utils/executableGroupNodeDto'
+import { useLitegraphService } from '@/services/litegraphService'
+
+async function navigateToGraph(targetGraph: LGraph) {
+  const canvasStore = useCanvasStore()
+  const canvas = canvasStore.canvas
+  if (!canvas) return
+
+  if (canvas.graph !== targetGraph) {
+    canvas.subgraph = targetGraph.isRootGraph
+      ? undefined
+      : (targetGraph as Subgraph)
+    canvas.setGraph(targetGraph)
+
+    await nextTick()
+
+    // Double RAF to wait for LiteGraph's internal canvas frame cycle
+    await new Promise((resolve) =>
+      requestAnimationFrame(() => requestAnimationFrame(resolve))
+    )
+  }
+}
+
+export function useFocusNode() {
+  const canvasStore = useCanvasStore()
+
+  /* Locate and focus a node on the canvas by its execution ID. */
+  async function focusNode(
+    nodeId: string,
+    executionIdMap?: Map<string, LGraphNode>
+  ) {
+    if (!canvasStore.canvas) return
+
+    // For group node internals, locate the root parent group node instead
+    const parentNode = getRootParentNode(app.rootGraph, nodeId)
+
+    if (parentNode && isGroupNode(parentNode) && parentNode.graph) {
+      await navigateToGraph(parentNode.graph as LGraph)
+      canvasStore.canvas?.animateToBounds(parentNode.boundingRect)
+      return
+    }
+
+    const graphNode = executionIdMap
+      ? executionIdMap.get(nodeId)
+      : getNodeByExecutionId(app.rootGraph, nodeId)
+    if (!graphNode?.graph) return
+
+    await navigateToGraph(graphNode.graph as LGraph)
+    canvasStore.canvas?.animateToBounds(graphNode.boundingRect)
+  }
+
+  async function enterSubgraph(
+    nodeId: string,
+    executionIdMap?: Map<string, LGraphNode>
+  ) {
+    if (!canvasStore.canvas) return
+
+    const graphNode = executionIdMap
+      ? executionIdMap.get(nodeId)
+      : getNodeByExecutionId(app.rootGraph, nodeId)
+    if (!graphNode?.graph) return
+
+    await navigateToGraph(graphNode.graph as LGraph)
+    useLitegraphService().fitView()
+  }
+
+  return {
+    focusNode,
+    enterSubgraph
+  }
+}
diff --git a/tests-ui/tests/composables/canvas/useSelectedLiteGraphItems.test.ts b/src/composables/canvas/useSelectedLiteGraphItems.test.ts
similarity index 85%
rename from tests-ui/tests/composables/canvas/useSelectedLiteGraphItems.test.ts
rename to src/composables/canvas/useSelectedLiteGraphItems.test.ts
index 303dddc080..45178088a0 100644
--- a/tests-ui/tests/composables/canvas/useSelectedLiteGraphItems.test.ts
+++ b/src/composables/canvas/useSelectedLiteGraphItems.test.ts
@@ -2,14 +2,13 @@ import { createPinia, setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { useSelectedLiteGraphItems } from '@/composables/canvas/useSelectedLiteGraphItems'
-import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
-import {
-  LGraphEventMode,
-  type Positionable,
-  Reroute
-} from '@/lib/litegraph/src/litegraph'
+import type { LGraphNode, Positionable } from '@/lib/litegraph/src/litegraph'
+import { LGraphEventMode, Reroute } from '@/lib/litegraph/src/litegraph'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import { app } from '@/scripts/app'
+import type { NodeId } from '@/renderer/core/layout/types'
+import type { ReadOnlyRect } from '@/lib/litegraph/src/interfaces'
+import { createMockSubgraphNode } from '@/utils/__tests__/litegraphTestUtils'
 
 // Mock the app module
 vi.mock('@/scripts/app', () => ({
@@ -21,22 +20,23 @@ vi.mock('@/scripts/app', () => ({
 }))
 
 // Mock the litegraph module
-vi.mock('@/lib/litegraph/src/litegraph', () => ({
-  Reroute: class Reroute {
-    constructor() {}
-  },
-  LGraphEventMode: {
-    ALWAYS: 0,
-    NEVER: 2,
-    BYPASS: 4
+vi.mock('@/lib/litegraph/src/litegraph', async (importOriginal) => {
+  const actual = (await importOriginal()) as Record<string, unknown>
+  return {
+    ...actual,
+    Reroute: class Reroute {
+      constructor() {}
+    }
   }
-}))
+})
 
 // Mock Positionable objects
-// @ts-expect-error - Mock implementation for testing
+
 class MockNode implements Positionable {
   pos: [number, number]
   size: [number, number]
+  id: NodeId
+  boundingRect: ReadOnlyRect
 
   constructor(
     pos: [number, number] = [0, 0],
@@ -44,6 +44,13 @@ class MockNode implements Positionable {
   ) {
     this.pos = pos
     this.size = size
+    this.id = 'mock-node'
+    this.boundingRect = [0, 0, 0, 0]
+  }
+
+  move(): void {}
+  snapToGrid(_: number): boolean {
+    return true
   }
 }
 
@@ -65,7 +72,7 @@ class MockReroute extends Reroute implements Positionable {
 
 describe('useSelectedLiteGraphItems', () => {
   let canvasStore: ReturnType<typeof useCanvasStore>
-  let mockCanvas: any
+  let mockCanvas: { selectedItems: Set<Positionable> }
 
   beforeEach(() => {
     setActivePinia(createPinia())
@@ -77,7 +84,9 @@ describe('useSelectedLiteGraphItems', () => {
     }
 
     // Mock getCanvas to return our mock canvas
-    vi.spyOn(canvasStore, 'getCanvas').mockReturnValue(mockCanvas)
+    vi.spyOn(canvasStore, 'getCanvas').mockReturnValue(
+      mockCanvas as ReturnType<typeof canvasStore.getCanvas>
+    )
   })
 
   describe('isIgnoredItem', () => {
@@ -90,7 +99,6 @@ describe('useSelectedLiteGraphItems', () => {
     it('should return false for non-Reroute items', () => {
       const { isIgnoredItem } = useSelectedLiteGraphItems()
       const node = new MockNode()
-      // @ts-expect-error - Test mock
       expect(isIgnoredItem(node)).toBe(false)
     })
   })
@@ -102,14 +110,11 @@ describe('useSelectedLiteGraphItems', () => {
       const node2 = new MockNode([100, 100])
       const reroute = new MockReroute([50, 50])
 
-      // @ts-expect-error - Test mocks
       const items = new Set<Positionable>([node1, node2, reroute])
       const filtered = filterSelectableItems(items)
 
       expect(filtered.size).toBe(2)
-      // @ts-expect-error - Test mocks
       expect(filtered.has(node1)).toBe(true)
-      // @ts-expect-error - Test mocks
       expect(filtered.has(node2)).toBe(true)
       expect(filtered.has(reroute)).toBe(false)
     })
@@ -147,9 +152,7 @@ describe('useSelectedLiteGraphItems', () => {
 
       const selectableItems = getSelectableItems()
       expect(selectableItems.size).toBe(2)
-      // @ts-expect-error - Test mock
       expect(selectableItems.has(node1)).toBe(true)
-      // @ts-expect-error - Test mock
       expect(selectableItems.has(node2)).toBe(true)
       expect(selectableItems.has(reroute)).toBe(false)
     })
@@ -259,14 +262,7 @@ describe('useSelectedLiteGraphItems', () => {
       const { getSelectedNodes } = useSelectedLiteGraphItems()
       const subNode1 = { id: 11, mode: LGraphEventMode.ALWAYS } as LGraphNode
       const subNode2 = { id: 12, mode: LGraphEventMode.NEVER } as LGraphNode
-      const subgraphNode = {
-        id: 1,
-        mode: LGraphEventMode.ALWAYS,
-        isSubgraphNode: () => true,
-        subgraph: {
-          nodes: [subNode1, subNode2]
-        }
-      } as unknown as LGraphNode
+      const subgraphNode = createMockSubgraphNode([subNode1, subNode2])
       const regularNode = { id: 2, mode: LGraphEventMode.NEVER } as LGraphNode
 
       app.canvas.selected_nodes = { '0': subgraphNode, '1': regularNode }
@@ -279,18 +275,11 @@ describe('useSelectedLiteGraphItems', () => {
       expect(selectedNodes).toContainEqual(subNode2)
     })
 
-    it('toggleSelectedNodesMode should apply unified state to subgraph children', () => {
+    it('toggleSelectedNodesMode should not apply state to subgraph children', () => {
       const { toggleSelectedNodesMode } = useSelectedLiteGraphItems()
       const subNode1 = { id: 11, mode: LGraphEventMode.ALWAYS } as LGraphNode
       const subNode2 = { id: 12, mode: LGraphEventMode.NEVER } as LGraphNode
-      const subgraphNode = {
-        id: 1,
-        mode: LGraphEventMode.ALWAYS,
-        isSubgraphNode: () => true,
-        subgraph: {
-          nodes: [subNode1, subNode2]
-        }
-      } as unknown as LGraphNode
+      const subgraphNode = createMockSubgraphNode([subNode1, subNode2])
       const regularNode = { id: 2, mode: LGraphEventMode.BYPASS } as LGraphNode
 
       app.canvas.selected_nodes = { '0': subgraphNode, '1': regularNode }
@@ -304,9 +293,8 @@ describe('useSelectedLiteGraphItems', () => {
       // regularNode: BYPASS -> NEVER (since BYPASS != NEVER)
       expect(regularNode.mode).toBe(LGraphEventMode.NEVER)
 
-      // Subgraph children get unified state (same as their parent):
-      // Both children should now be NEVER, regardless of their previous states
-      expect(subNode1.mode).toBe(LGraphEventMode.NEVER) // was ALWAYS, now NEVER
+      // Subgraph children do not change state
+      expect(subNode1.mode).toBe(LGraphEventMode.ALWAYS) // was ALWAYS, stays ALWAYS
       expect(subNode2.mode).toBe(LGraphEventMode.NEVER) // was NEVER, stays NEVER
     })
 
@@ -314,14 +302,10 @@ describe('useSelectedLiteGraphItems', () => {
       const { toggleSelectedNodesMode } = useSelectedLiteGraphItems()
       const subNode1 = { id: 11, mode: LGraphEventMode.ALWAYS } as LGraphNode
       const subNode2 = { id: 12, mode: LGraphEventMode.BYPASS } as LGraphNode
-      const subgraphNode = {
+      const subgraphNode = createMockSubgraphNode([subNode1, subNode2], {
         id: 1,
-        mode: LGraphEventMode.NEVER, // Already in NEVER mode
-        isSubgraphNode: () => true,
-        subgraph: {
-          nodes: [subNode1, subNode2]
-        }
-      } as unknown as LGraphNode
+        mode: LGraphEventMode.NEVER // Already in NEVER mode
+      })
 
       app.canvas.selected_nodes = { '0': subgraphNode }
 
@@ -331,9 +315,9 @@ describe('useSelectedLiteGraphItems', () => {
       // Selected subgraph should toggle to ALWAYS (since it was already NEVER)
       expect(subgraphNode.mode).toBe(LGraphEventMode.ALWAYS)
 
-      // All children should also get ALWAYS (unified with parent's new state)
+      // All children should be unchanged
       expect(subNode1.mode).toBe(LGraphEventMode.ALWAYS)
-      expect(subNode2.mode).toBe(LGraphEventMode.ALWAYS)
+      expect(subNode2.mode).toBe(LGraphEventMode.BYPASS)
     })
   })
 
diff --git a/src/composables/canvas/useSelectedLiteGraphItems.ts b/src/composables/canvas/useSelectedLiteGraphItems.ts
index a4a93b9fbc..c7777d7afb 100644
--- a/src/composables/canvas/useSelectedLiteGraphItems.ts
+++ b/src/composables/canvas/useSelectedLiteGraphItems.ts
@@ -2,10 +2,7 @@ import type { LGraphNode, Positionable } from '@/lib/litegraph/src/litegraph'
 import { LGraphEventMode, Reroute } from '@/lib/litegraph/src/litegraph'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import { app } from '@/scripts/app'
-import {
-  collectFromNodes,
-  traverseNodesDepthFirst
-} from '@/utils/graphTraversalUtil'
+import { collectFromNodes } from '@/utils/graphTraversalUtil'
 
 /**
  * Composable for handling selected LiteGraph items filtering and operations.
@@ -97,16 +94,10 @@ export function useSelectedLiteGraphItems() {
   }
 
   /**
-   * Toggle the execution mode of all selected nodes with unified subgraph behavior.
+   * Toggle the execution mode of all selected nodes
    *
-   * Top-level behavior (selected nodes): Standard toggle logic
-   * - If the selected node is already in the specified mode → set to ALWAYS
-   * - Otherwise → set to the specified mode
-   *
-   * Subgraph behavior (children of selected subgraph nodes): Unified state application
-   * - All children inherit the same mode that their parent subgraph node was set to
-   * - This creates predictable behavior: if you toggle a subgraph to "mute",
-   *   ALL nodes inside become muted, regardless of their previous individual states
+   * - If any nodes are not already the specified node mode → all are set to specified mode
+   * - Otherwise → set all nodes to ALWAYS
    *
    * @param mode - The LGraphEventMode to toggle to (e.g., NEVER for mute, BYPASS for bypass)
    */
@@ -124,27 +115,8 @@ export function useSelectedLiteGraphItems() {
     )
     const newModeForSelectedNode = allNodesMatch ? LGraphEventMode.ALWAYS : mode
 
-    // Process each selected node independently to determine its target state and apply to children
-    selectedNodeArray.forEach((selectedNode) => {
-      // Apply standard toggle logic to the selected node itself
-
+    for (const selectedNode of selectedNodeArray)
       selectedNode.mode = newModeForSelectedNode
-
-      // If this selected node is a subgraph, apply the same mode uniformly to all its children
-      // This ensures predictable behavior: all children get the same state as their parent
-      if (selectedNode.isSubgraphNode?.() && selectedNode.subgraph) {
-        traverseNodesDepthFirst([selectedNode], {
-          visitor: (node) => {
-            // Skip the parent node since we already handled it above
-            if (node === selectedNode) return undefined
-
-            // Apply the parent's new mode to all children uniformly
-            node.mode = newModeForSelectedNode
-            return undefined
-          }
-        })
-      }
-    })
   }
 
   return {
diff --git a/src/composables/element/useDomClipping.test.ts b/src/composables/element/useDomClipping.test.ts
new file mode 100644
index 0000000000..0900d0d24b
--- /dev/null
+++ b/src/composables/element/useDomClipping.test.ts
@@ -0,0 +1,224 @@
+import { describe, expect, it, vi, beforeEach, afterEach } from 'vitest'
+
+import { useDomClipping } from './useDomClipping'
+
+function createMockElement(rect: {
+  left: number
+  top: number
+  width: number
+  height: number
+}): HTMLElement {
+  return {
+    getBoundingClientRect: vi.fn(
+      () =>
+        ({
+          ...rect,
+          x: rect.left,
+          y: rect.top,
+          right: rect.left + rect.width,
+          bottom: rect.top + rect.height,
+          toJSON: () => ({})
+        }) as DOMRect
+    )
+  } as unknown as HTMLElement
+}
+
+function createMockCanvas(rect: {
+  left: number
+  top: number
+  width: number
+  height: number
+}): HTMLCanvasElement {
+  return {
+    getBoundingClientRect: vi.fn(
+      () =>
+        ({
+          ...rect,
+          x: rect.left,
+          y: rect.top,
+          right: rect.left + rect.width,
+          bottom: rect.top + rect.height,
+          toJSON: () => ({})
+        }) as DOMRect
+    )
+  } as unknown as HTMLCanvasElement
+}
+
+describe('useDomClipping', () => {
+  let rafCallbacks: Map<number, FrameRequestCallback>
+  let nextRafId: number
+
+  beforeEach(() => {
+    rafCallbacks = new Map()
+    nextRafId = 1
+
+    vi.stubGlobal(
+      'requestAnimationFrame',
+      vi.fn((cb: FrameRequestCallback) => {
+        const id = nextRafId++
+        rafCallbacks.set(id, cb)
+        return id
+      })
+    )
+
+    vi.stubGlobal(
+      'cancelAnimationFrame',
+      vi.fn((id: number) => {
+        rafCallbacks.delete(id)
+      })
+    )
+  })
+
+  afterEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  function flushRaf() {
+    const callbacks = [...rafCallbacks.values()]
+    rafCallbacks.clear()
+    for (const cb of callbacks) {
+      cb(performance.now())
+    }
+  }
+
+  it('coalesces multiple rapid calls into a single getBoundingClientRect read', () => {
+    const { updateClipPath } = useDomClipping()
+    const element = createMockElement({
+      left: 10,
+      top: 10,
+      width: 100,
+      height: 50
+    })
+    const canvas = createMockCanvas({
+      left: 0,
+      top: 0,
+      width: 800,
+      height: 600
+    })
+
+    updateClipPath(element, canvas, true)
+    updateClipPath(element, canvas, true)
+    updateClipPath(element, canvas, true)
+
+    expect(element.getBoundingClientRect).not.toHaveBeenCalled()
+
+    flushRaf()
+
+    expect(element.getBoundingClientRect).toHaveBeenCalledTimes(1)
+    expect(canvas.getBoundingClientRect).toHaveBeenCalledTimes(1)
+  })
+
+  it('updates style ref after RAF fires', () => {
+    const { style, updateClipPath } = useDomClipping()
+    const element = createMockElement({
+      left: 10,
+      top: 10,
+      width: 100,
+      height: 50
+    })
+    const canvas = createMockCanvas({
+      left: 0,
+      top: 0,
+      width: 800,
+      height: 600
+    })
+
+    updateClipPath(element, canvas, true)
+
+    expect(style.value).toEqual({})
+
+    flushRaf()
+
+    expect(style.value).toEqual({
+      clipPath: 'none',
+      willChange: 'clip-path'
+    })
+  })
+
+  it('cancels previous RAF when called again before it fires', () => {
+    const { style, updateClipPath } = useDomClipping()
+    const element1 = createMockElement({
+      left: 10,
+      top: 10,
+      width: 100,
+      height: 50
+    })
+    const element2 = createMockElement({
+      left: 20,
+      top: 20,
+      width: 200,
+      height: 100
+    })
+    const canvas = createMockCanvas({
+      left: 0,
+      top: 0,
+      width: 800,
+      height: 600
+    })
+
+    updateClipPath(element1, canvas, true)
+    updateClipPath(element2, canvas, true)
+
+    expect(cancelAnimationFrame).toHaveBeenCalledTimes(1)
+
+    flushRaf()
+
+    expect(element1.getBoundingClientRect).not.toHaveBeenCalled()
+    expect(element2.getBoundingClientRect).toHaveBeenCalledTimes(1)
+    expect(style.value).toEqual({
+      clipPath: 'none',
+      willChange: 'clip-path'
+    })
+  })
+
+  it('generates clip-path polygon when element intersects unselected area', () => {
+    const { style, updateClipPath } = useDomClipping()
+    const element = createMockElement({
+      left: 50,
+      top: 50,
+      width: 100,
+      height: 100
+    })
+    const canvas = createMockCanvas({
+      left: 0,
+      top: 0,
+      width: 800,
+      height: 600
+    })
+    const selectedArea = {
+      x: 40,
+      y: 40,
+      width: 200,
+      height: 200,
+      scale: 1,
+      offset: [0, 0] as [number, number]
+    }
+
+    updateClipPath(element, canvas, false, selectedArea)
+    flushRaf()
+
+    expect(style.value.clipPath).toContain('polygon')
+    expect(style.value.willChange).toBe('clip-path')
+  })
+
+  it('does not read layout before RAF fires', () => {
+    const { updateClipPath } = useDomClipping()
+    const element = createMockElement({
+      left: 0,
+      top: 0,
+      width: 50,
+      height: 50
+    })
+    const canvas = createMockCanvas({
+      left: 0,
+      top: 0,
+      width: 800,
+      height: 600
+    })
+
+    updateClipPath(element, canvas, true)
+
+    expect(element.getBoundingClientRect).not.toHaveBeenCalled()
+    expect(canvas.getBoundingClientRect).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/composables/element/useDomClipping.ts b/src/composables/element/useDomClipping.ts
index 7dcc31fb60..60bd1ce3eb 100644
--- a/src/composables/element/useDomClipping.ts
+++ b/src/composables/element/useDomClipping.ts
@@ -85,8 +85,12 @@ export const useDomClipping = (options: ClippingOptions = {}) => {
     return ''
   }
 
+  let pendingRaf = 0
+
   /**
-   * Updates the clip-path style based on element and selection information
+   * Updates the clip-path style based on element and selection information.
+   * Batched via requestAnimationFrame to avoid forcing synchronous layout
+   * from getBoundingClientRect() on every reactive state change.
    */
   const updateClipPath = (
     element: HTMLElement,
@@ -101,20 +105,24 @@ export const useDomClipping = (options: ClippingOptions = {}) => {
       offset: [number, number]
     }
   ) => {
-    const elementRect = element.getBoundingClientRect()
-    const canvasRect = canvasElement.getBoundingClientRect()
+    if (pendingRaf) cancelAnimationFrame(pendingRaf)
+    pendingRaf = requestAnimationFrame(() => {
+      pendingRaf = 0
+      const elementRect = element.getBoundingClientRect()
+      const canvasRect = canvasElement.getBoundingClientRect()
 
-    const clipPath = calculateClipPath(
-      elementRect,
-      canvasRect,
-      isSelected,
-      selectedArea
-    )
+      const clipPath = calculateClipPath(
+        elementRect,
+        canvasRect,
+        isSelected,
+        selectedArea
+      )
 
-    style.value = {
-      clipPath: clipPath || 'none',
-      willChange: 'clip-path'
-    }
+      style.value = {
+        clipPath: clipPath || 'none',
+        willChange: 'clip-path'
+      }
+    })
   }
 
   return {
diff --git a/src/composables/element/useResponsiveCollapse.ts b/src/composables/element/useResponsiveCollapse.ts
deleted file mode 100644
index 4f1846865a..0000000000
--- a/src/composables/element/useResponsiveCollapse.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { breakpointsTailwind, useBreakpoints } from '@vueuse/core'
-import { ref, watch } from 'vue'
-
-type BreakpointKey = keyof typeof breakpointsTailwind
-
-/**
- * Composable for element with responsive collapsed state
- * @param breakpointThreshold - Breakpoint at which the element should become collapsible
- */
-export const useResponsiveCollapse = (
-  breakpointThreshold: BreakpointKey = 'lg'
-) => {
-  const breakpoints = useBreakpoints(breakpointsTailwind)
-
-  const isSmallScreen = breakpoints.smallerOrEqual(breakpointThreshold)
-  const isOpen = ref(!isSmallScreen.value)
-
-  /**
-   * Handles screen size changes to automatically open/close the element
-   * when crossing the breakpoint threshold
-   */
-  const onIsSmallScreenChange = () => {
-    if (isSmallScreen.value && isOpen.value) {
-      isOpen.value = false
-    } else if (!isSmallScreen.value && !isOpen.value) {
-      isOpen.value = true
-    }
-  }
-
-  watch(isSmallScreen, onIsSmallScreenChange)
-
-  return {
-    breakpoints,
-    isOpen,
-    isSmallScreen,
-
-    open: () => (isOpen.value = true),
-    close: () => (isOpen.value = false),
-    toggle: () => (isOpen.value = !isOpen.value)
-  }
-}
diff --git a/tests-ui/tests/composables/functional/useChainCallback.test.ts b/src/composables/functional/useChainCallback.test.ts
similarity index 100%
rename from tests-ui/tests/composables/functional/useChainCallback.test.ts
rename to src/composables/functional/useChainCallback.test.ts
diff --git a/src/composables/functional/useChainCallback.ts b/src/composables/functional/useChainCallback.ts
index 47e32b9fbb..833cd4a18e 100644
--- a/src/composables/functional/useChainCallback.ts
+++ b/src/composables/functional/useChainCallback.ts
@@ -1,19 +1,3 @@
-/**
- * Shorthand for {@link Parameters} of optional callbacks.
- *
- * @example
- * ```ts
- * const { onClick } = CustomClass.prototype
- * CustomClass.prototype.onClick = function (...args: CallbackParams<typeof onClick>) {
- *   const r = onClick?.apply(this, args)
- *   // ...
- *   return r
- * }
- * ```
- */
-export type CallbackParams<T extends ((...args: any) => any) | undefined> =
-  Parameters<Exclude<T, undefined>>
-
 /**
  * Chain multiple callbacks together.
  *
@@ -21,15 +5,21 @@ export type CallbackParams<T extends ((...args: any) => any) | undefined> =
  * @param callbacks - The callbacks to chain.
  * @returns A new callback that chains the original callback with the callbacks.
  */
-export const useChainCallback = <
-  O,
-  T extends (this: O, ...args: any[]) => void
->(
+export function useChainCallback<O, T>(
   originalCallback: T | undefined,
-  ...callbacks: ((this: O, ...args: Parameters<T>) => void)[]
-) => {
-  return function (this: O, ...args: Parameters<T>) {
-    originalCallback?.call(this, ...args)
-    for (const callback of callbacks) callback.call(this, ...args)
-  }
+  ...callbacks: NonNullable<T> extends (this: O, ...args: infer P) => unknown
+    ? ((this: O, ...args: P) => void)[]
+    : never
+) {
+  type Args = NonNullable<T> extends (...args: infer P) => unknown ? P : never
+  type Ret = NonNullable<T> extends (...args: unknown[]) => infer R ? R : never
+
+  return function (this: O, ...args: Args) {
+    if (typeof originalCallback === 'function') {
+      ;(originalCallback as (this: O, ...args: Args) => Ret).call(this, ...args)
+    }
+    for (const callback of callbacks) {
+      callback.call(this, ...args)
+    }
+  } as (this: O, ...args: Args) => Ret
 }
diff --git a/src/composables/graph/contextMenuConverter.test.ts b/src/composables/graph/contextMenuConverter.test.ts
index cc157f220a..c2bf5de6e6 100644
--- a/src/composables/graph/contextMenuConverter.test.ts
+++ b/src/composables/graph/contextMenuConverter.test.ts
@@ -134,6 +134,27 @@ describe('contextMenuConverter', () => {
       // Node Info (section 4) should come before or with Color (section 4)
       expect(getIndex('Node Info')).toBeLessThanOrEqual(getIndex('Color'))
     })
+
+    it('should recognize Frame Nodes as a core menu item', () => {
+      const options: MenuOption[] = [
+        { label: 'Rename', source: 'vue' },
+        { label: 'Frame Nodes', source: 'vue' },
+        { label: 'Custom Extension', source: 'vue' }
+      ]
+
+      const result = buildStructuredMenu(options)
+
+      // Frame Nodes should appear in the core items section (before Extensions)
+      const frameNodesIndex = result.findIndex(
+        (opt) => opt.label === 'Frame Nodes'
+      )
+      const extensionsCategoryIndex = result.findIndex(
+        (opt) => opt.label === 'Extensions' && opt.type === 'category'
+      )
+
+      // Frame Nodes should come before Extensions category
+      expect(frameNodesIndex).toBeLessThan(extensionsCategoryIndex)
+    })
   })
 
   describe('convertContextMenuToOptions', () => {
diff --git a/src/composables/graph/contextMenuConverter.ts b/src/composables/graph/contextMenuConverter.ts
index 3395e18be8..905f2934d7 100644
--- a/src/composables/graph/contextMenuConverter.ts
+++ b/src/composables/graph/contextMenuConverter.ts
@@ -44,6 +44,7 @@ const CORE_MENU_ITEMS = new Set([
   // Structure operations
   'Convert to Subgraph',
   'Frame selection',
+  'Frame Nodes',
   'Minimize Node',
   'Expand',
   'Collapse',
@@ -103,7 +104,8 @@ function isDuplicateItem(label: string, existingItems: MenuOption[]): boolean {
     shape: ['shape', 'shapes'],
     pin: ['pin', 'unpin'],
     delete: ['remove', 'delete'],
-    duplicate: ['clone', 'duplicate']
+    duplicate: ['clone', 'duplicate'],
+    frame: ['frame selection', 'frame nodes']
   }
 
   return existingItems.some((item) => {
@@ -226,6 +228,7 @@ const MENU_ORDER: string[] = [
   // Section 3: Structure operations
   'Convert to Subgraph',
   'Frame selection',
+  'Frame Nodes',
   'Minimize Node',
   'Expand',
   'Collapse',
diff --git a/src/composables/graph/useGraphHierarchy.test.ts b/src/composables/graph/useGraphHierarchy.test.ts
new file mode 100644
index 0000000000..c7b5a8f819
--- /dev/null
+++ b/src/composables/graph/useGraphHierarchy.test.ts
@@ -0,0 +1,160 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { Rectangle } from '@/lib/litegraph/src/infrastructure/Rectangle'
+import type { LGraphGroup, LGraphNode } from '@/lib/litegraph/src/litegraph'
+import * as measure from '@/lib/litegraph/src/measure'
+import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import {
+  createMockLGraphNode,
+  createMockLGraphGroup
+} from '@/utils/__tests__/litegraphTestUtils'
+
+import { useGraphHierarchy } from './useGraphHierarchy'
+
+vi.mock('@/renderer/core/canvas/canvasStore')
+
+function createMockNode(overrides: Partial<LGraphNode> = {}): LGraphNode {
+  return Object.assign(
+    createMockLGraphNode(),
+    {
+      boundingRect: new Rectangle(100, 100, 50, 50)
+    },
+    overrides
+  )
+}
+
+function createMockGroup(overrides: Partial<LGraphGroup> = {}): LGraphGroup {
+  return createMockLGraphGroup(overrides)
+}
+
+describe('useGraphHierarchy', () => {
+  let mockCanvasStore: Partial<ReturnType<typeof useCanvasStore>>
+  let mockNode: LGraphNode
+  let mockGroups: LGraphGroup[]
+
+  beforeEach(() => {
+    mockNode = createMockNode()
+    mockGroups = []
+
+    mockCanvasStore = {
+      canvas: {
+        graph: {
+          groups: mockGroups
+        }
+      },
+      $id: 'canvas',
+      $state: {},
+      $patch: vi.fn(),
+      $reset: vi.fn(),
+      $subscribe: vi.fn(),
+      $onAction: vi.fn(),
+      $dispose: vi.fn(),
+      _customProperties: new Set(),
+      _p: {}
+    } as unknown as Partial<ReturnType<typeof useCanvasStore>>
+
+    vi.mocked(useCanvasStore).mockReturnValue(
+      mockCanvasStore as ReturnType<typeof useCanvasStore>
+    )
+  })
+
+  describe('findParentGroup', () => {
+    it('returns null when no groups exist', () => {
+      const { findParentGroup } = useGraphHierarchy()
+
+      const result = findParentGroup(mockNode)
+
+      expect(result).toBeNull()
+    })
+
+    it('returns null when node is not in any group', () => {
+      const group = createMockGroup({
+        boundingRect: new Rectangle(0, 0, 50, 50)
+      })
+      mockGroups.push(group)
+
+      vi.spyOn(measure, 'containsCentre').mockReturnValue(false)
+
+      const { findParentGroup } = useGraphHierarchy()
+      const result = findParentGroup(mockNode)
+
+      expect(result).toBeNull()
+    })
+
+    it('returns the only group when node is in exactly one group', () => {
+      const group = createMockGroup({
+        boundingRect: new Rectangle(0, 0, 200, 200)
+      })
+      mockGroups.push(group)
+
+      vi.spyOn(measure, 'containsCentre').mockReturnValue(true)
+
+      const { findParentGroup } = useGraphHierarchy()
+      const result = findParentGroup(mockNode)
+
+      expect(result).toBe(group)
+    })
+
+    it('returns the smallest group when node is in multiple groups', () => {
+      const largeGroup = createMockGroup({
+        boundingRect: new Rectangle(0, 0, 300, 300)
+      })
+      const smallGroup = createMockGroup({
+        boundingRect: new Rectangle(50, 50, 100, 100)
+      })
+      mockGroups.push(largeGroup, smallGroup)
+
+      vi.spyOn(measure, 'containsCentre').mockReturnValue(true)
+      vi.spyOn(measure, 'containsRect').mockReturnValue(false)
+
+      const { findParentGroup } = useGraphHierarchy()
+      const result = findParentGroup(mockNode)
+
+      expect(result).toBe(smallGroup)
+    })
+
+    it('returns the inner group when one group contains another', () => {
+      const outerGroup = createMockGroup({
+        boundingRect: new Rectangle(0, 0, 300, 300)
+      })
+      const innerGroup = createMockGroup({
+        boundingRect: new Rectangle(50, 50, 100, 100)
+      })
+      mockGroups.push(outerGroup, innerGroup)
+
+      vi.spyOn(measure, 'containsCentre').mockReturnValue(true)
+      vi.spyOn(measure, 'containsRect').mockImplementation(
+        (container, contained) => {
+          // outerGroup contains innerGroup
+          if (container === outerGroup.boundingRect) {
+            return contained === innerGroup.boundingRect
+          }
+          return false
+        }
+      )
+
+      const { findParentGroup } = useGraphHierarchy()
+      const result = findParentGroup(mockNode)
+
+      expect(result).toBe(innerGroup)
+    })
+
+    it('handles null canvas gracefully', () => {
+      mockCanvasStore.canvas = null
+
+      const { findParentGroup } = useGraphHierarchy()
+      const result = findParentGroup(mockNode)
+
+      expect(result).toBeNull()
+    })
+
+    it('handles null graph gracefully', () => {
+      mockCanvasStore.canvas!.graph = null
+
+      const { findParentGroup } = useGraphHierarchy()
+      const result = findParentGroup(mockNode)
+
+      expect(result).toBeNull()
+    })
+  })
+})
diff --git a/src/composables/graph/useGraphHierarchy.ts b/src/composables/graph/useGraphHierarchy.ts
new file mode 100644
index 0000000000..14e2e310f0
--- /dev/null
+++ b/src/composables/graph/useGraphHierarchy.ts
@@ -0,0 +1,57 @@
+import type { LGraphGroup, LGraphNode } from '@/lib/litegraph/src/litegraph'
+import { containsCentre, containsRect } from '@/lib/litegraph/src/measure'
+import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+
+/**
+ * Composable for working with graph hierarchy, specifically group containment.
+ */
+export function useGraphHierarchy() {
+  const canvasStore = useCanvasStore()
+
+  /**
+   * Finds the smallest group that contains the center of a node's bounding box.
+   * When multiple groups contain the node, returns the one with the smallest area.
+   *
+   * TODO: This traverses the entire graph and could be very slow; needs optimization.
+   * Consider spatial indexing or caching for large graphs.
+   *
+   * @param node - The node to find the parent group for
+   * @returns The parent group if found, otherwise null
+   */
+  function findParentGroup(node: LGraphNode): LGraphGroup | null {
+    const graphGroups = (canvasStore.canvas?.graph?.groups ??
+      []) as LGraphGroup[]
+
+    let parent: LGraphGroup | null = null
+
+    for (const group of graphGroups) {
+      const groupRect = group.boundingRect
+      if (!containsCentre(groupRect, node.boundingRect)) continue
+
+      if (!parent) {
+        parent = group
+        continue
+      }
+
+      const parentRect = parent.boundingRect
+      const candidateInsideParent = containsRect(parentRect, groupRect)
+      const parentInsideCandidate = containsRect(groupRect, parentRect)
+
+      if (candidateInsideParent && !parentInsideCandidate) {
+        parent = group
+        continue
+      }
+
+      const candidateArea = groupRect[2] * groupRect[3]
+      const parentArea = parentRect[2] * parentRect[3]
+
+      if (candidateArea < parentArea) parent = group
+    }
+
+    return parent
+  }
+
+  return {
+    findParentGroup
+  }
+}
diff --git a/src/composables/graph/useGraphNodeManager.test.ts b/src/composables/graph/useGraphNodeManager.test.ts
new file mode 100644
index 0000000000..39a25b2352
--- /dev/null
+++ b/src/composables/graph/useGraphNodeManager.test.ts
@@ -0,0 +1,318 @@
+import { setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { computed, nextTick, watch } from 'vue'
+
+import { useGraphNodeManager } from '@/composables/graph/useGraphNodeManager'
+import { createPromotedWidgetView } from '@/core/graph/subgraph/promotedWidgetView'
+import { BaseWidget, LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph'
+import {
+  createTestSubgraph,
+  createTestSubgraphNode
+} from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers'
+import { NodeSlotType } from '@/lib/litegraph/src/types/globalEnums'
+import { usePromotionStore } from '@/stores/promotionStore'
+import { useWidgetValueStore } from '@/stores/widgetValueStore'
+
+describe('Node Reactivity', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+  })
+
+  function createTestGraph() {
+    const graph = new LGraph()
+    const node = new LGraphNode('test')
+    node.addInput('input', 'INT')
+    node.addWidget('number', 'testnum', 2, () => undefined, {})
+    graph.add(node)
+
+    const { vueNodeData } = useGraphNodeManager(graph)
+
+    return { node, graph, vueNodeData }
+  }
+
+  it('widget values are reactive through the store', async () => {
+    const { node, graph } = createTestGraph()
+    const store = useWidgetValueStore()
+    const widget = node.widgets![0]
+
+    // Verify widget is a BaseWidget with correct value and node assignment
+    expect(widget).toBeInstanceOf(BaseWidget)
+    expect(widget.value).toBe(2)
+    expect((widget as BaseWidget).node.id).toBe(node.id)
+
+    // Initial value should be in store after setNodeId was called
+    expect(store.getWidget(graph.id, node.id, 'testnum')?.value).toBe(2)
+
+    const state = store.getWidget(graph.id, node.id, 'testnum')
+    if (!state) throw new Error('Expected widget state to exist')
+
+    const onValueChange = vi.fn()
+    const widgetValue = computed(() => state.value)
+    watch(widgetValue, onValueChange)
+
+    widget.value = 42
+    await nextTick()
+
+    expect(widgetValue.value).toBe(42)
+    expect(onValueChange).toHaveBeenCalledTimes(1)
+  })
+
+  it('widget values remain reactive after a connection is made', async () => {
+    const { node, graph } = createTestGraph()
+    const store = useWidgetValueStore()
+    const onValueChange = vi.fn()
+
+    graph.trigger('node:slot-links:changed', {
+      nodeId: String(node.id),
+      slotType: NodeSlotType.INPUT
+    })
+    await nextTick()
+
+    const state = store.getWidget(graph.id, node.id, 'testnum')
+    if (!state) throw new Error('Expected widget state to exist')
+
+    const widgetValue = computed(() => state.value)
+    watch(widgetValue, onValueChange)
+
+    node.widgets![0].value = 99
+    await nextTick()
+
+    expect(onValueChange).toHaveBeenCalledTimes(1)
+    expect(widgetValue.value).toBe(99)
+  })
+})
+
+describe('Widget slotMetadata reactivity on link disconnect', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+  })
+
+  function createWidgetInputGraph() {
+    const graph = new LGraph()
+    const node = new LGraphNode('test')
+
+    // Add a widget and an associated input slot (simulates "widget converted to input")
+    node.addWidget('string', 'prompt', 'hello', () => undefined, {})
+    const input = node.addInput('prompt', 'STRING')
+    // Associate the input slot with the widget (as widgetInputs extension does)
+    input.widget = { name: 'prompt' }
+
+    // Start with a connected link
+    input.link = 42
+
+    graph.add(node)
+    return { graph, node }
+  }
+
+  it('sets slotMetadata.linked to true when input has a link', () => {
+    const { graph, node } = createWidgetInputGraph()
+    const { vueNodeData } = useGraphNodeManager(graph)
+
+    const nodeData = vueNodeData.get(String(node.id))
+    const widgetData = nodeData?.widgets?.find((w) => w.name === 'prompt')
+
+    expect(widgetData?.slotMetadata).toBeDefined()
+    expect(widgetData?.slotMetadata?.linked).toBe(true)
+  })
+
+  it('updates slotMetadata.linked to false after link disconnect event', async () => {
+    const { graph, node } = createWidgetInputGraph()
+    const { vueNodeData } = useGraphNodeManager(graph)
+
+    const nodeData = vueNodeData.get(String(node.id))
+    const widgetData = nodeData?.widgets?.find((w) => w.name === 'prompt')
+
+    // Verify initially linked
+    expect(widgetData?.slotMetadata?.linked).toBe(true)
+
+    // Simulate link disconnection (as LiteGraph does before firing the event)
+    node.inputs[0].link = null
+
+    // Fire the trigger event that LiteGraph fires on disconnect
+    graph.trigger('node:slot-links:changed', {
+      nodeId: node.id,
+      slotType: NodeSlotType.INPUT,
+      slotIndex: 0,
+      connected: false,
+      linkId: 42
+    })
+
+    await nextTick()
+
+    // slotMetadata.linked should now be false
+    expect(widgetData?.slotMetadata?.linked).toBe(false)
+  })
+
+  it('reactively updates disabled state in a derived computed after disconnect', async () => {
+    const { graph, node } = createWidgetInputGraph()
+    const { vueNodeData } = useGraphNodeManager(graph)
+
+    const nodeData = vueNodeData.get(String(node.id))!
+
+    // Mimic what processedWidgets does in NodeWidgets.vue:
+    // derive disabled from slotMetadata.linked
+    const derivedDisabled = computed(() => {
+      const widgets = nodeData.widgets ?? []
+      const widget = widgets.find((w) => w.name === 'prompt')
+      return widget?.slotMetadata?.linked ? true : false
+    })
+
+    // Initially linked → disabled
+    expect(derivedDisabled.value).toBe(true)
+
+    // Track changes
+    const onChange = vi.fn()
+    watch(derivedDisabled, onChange)
+
+    // Simulate disconnect
+    node.inputs[0].link = null
+    graph.trigger('node:slot-links:changed', {
+      nodeId: node.id,
+      slotType: NodeSlotType.INPUT,
+      slotIndex: 0,
+      connected: false,
+      linkId: 42
+    })
+
+    await nextTick()
+
+    // The derived computed should now return false
+    expect(derivedDisabled.value).toBe(false)
+    expect(onChange).toHaveBeenCalledTimes(1)
+  })
+
+  it('updates slotMetadata for promoted widgets where SafeWidgetData.name differs from input.widget.name', async () => {
+    // Set up a subgraph with an interior node that has a "prompt" widget.
+    // createPromotedWidgetView resolves against this interior node.
+    const subgraph = createTestSubgraph()
+    const interiorNode = new LGraphNode('interior')
+    interiorNode.id = 10
+    interiorNode.addWidget('string', 'prompt', 'hello', () => undefined, {})
+    subgraph.add(interiorNode)
+
+    const subgraphNode = createTestSubgraphNode(subgraph, { id: 123 })
+
+    // Create a PromotedWidgetView with displayName="value" (subgraph input
+    // slot name) and sourceWidgetName="prompt" (interior widget name).
+    // PromotedWidgetView.name returns "value", but safeWidgetMapper sets
+    // SafeWidgetData.name to sourceWidgetName ("prompt").
+    const promotedView = createPromotedWidgetView(
+      subgraphNode,
+      '10',
+      'prompt',
+      'value'
+    )
+
+    // Host the promoted view on a regular node so we can control widgets
+    // directly (SubgraphNode.widgets is a synthetic getter).
+    const graph = new LGraph()
+    const hostNode = new LGraphNode('host')
+    hostNode.widgets = [promotedView]
+    const input = hostNode.addInput('value', 'STRING')
+    input.widget = { name: 'value' }
+    input.link = 42
+    graph.add(hostNode)
+
+    const { vueNodeData } = useGraphNodeManager(graph)
+    const nodeData = vueNodeData.get(String(hostNode.id))
+
+    // SafeWidgetData.name is "prompt" (sourceWidgetName), but the
+    // input slot widget name is "value" — slotName bridges this gap.
+    const widgetData = nodeData?.widgets?.find((w) => w.name === 'prompt')
+    expect(widgetData).toBeDefined()
+    expect(widgetData?.slotName).toBe('value')
+    expect(widgetData?.slotMetadata?.linked).toBe(true)
+
+    // Disconnect
+    hostNode.inputs[0].link = null
+    graph.trigger('node:slot-links:changed', {
+      nodeId: hostNode.id,
+      slotType: NodeSlotType.INPUT,
+      slotIndex: 0,
+      connected: false,
+      linkId: 42
+    })
+
+    await nextTick()
+
+    expect(widgetData?.slotMetadata?.linked).toBe(false)
+  })
+})
+
+describe('Subgraph Promoted Pseudo Widgets', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+  })
+
+  it('marks promoted $$ widgets as canvasOnly for Vue widget rendering', () => {
+    const subgraph = createTestSubgraph()
+    const interiorNode = new LGraphNode('interior')
+    interiorNode.id = 10
+    subgraph.add(interiorNode)
+
+    const subgraphNode = createTestSubgraphNode(subgraph, { id: 123 })
+    const graph = subgraphNode.graph as LGraph
+    graph.add(subgraphNode)
+
+    usePromotionStore().promote(
+      subgraphNode.rootGraph.id,
+      subgraphNode.id,
+      '10',
+      '$$canvas-image-preview'
+    )
+
+    const { vueNodeData } = useGraphNodeManager(graph)
+    const vueNode = vueNodeData.get(String(subgraphNode.id))
+    const promotedWidget = vueNode?.widgets?.find(
+      (widget) => widget.name === '$$canvas-image-preview'
+    )
+
+    expect(promotedWidget).toBeDefined()
+    expect(promotedWidget?.options?.canvasOnly).toBe(true)
+  })
+})
+
+describe('Nested promoted widget mapping', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+  })
+
+  it('maps store identity to deepest concrete widget for two-layer promotions', () => {
+    const subgraphA = createTestSubgraph({
+      inputs: [{ name: 'a_input', type: '*' }]
+    })
+    const innerNode = new LGraphNode('InnerComboNode')
+    const innerInput = innerNode.addInput('picker_input', '*')
+    innerNode.addWidget('combo', 'picker', 'a', () => undefined, {
+      values: ['a', 'b']
+    })
+    innerInput.widget = { name: 'picker' }
+    subgraphA.add(innerNode)
+    subgraphA.inputNode.slots[0].connect(innerInput, innerNode)
+
+    const subgraphNodeA = createTestSubgraphNode(subgraphA, { id: 11 })
+
+    const subgraphB = createTestSubgraph({
+      inputs: [{ name: 'b_input', type: '*' }]
+    })
+    subgraphB.add(subgraphNodeA)
+    subgraphNodeA._internalConfigureAfterSlots()
+    subgraphB.inputNode.slots[0].connect(subgraphNodeA.inputs[0], subgraphNodeA)
+
+    const subgraphNodeB = createTestSubgraphNode(subgraphB, { id: 22 })
+    const graph = subgraphNodeB.graph as LGraph
+    graph.add(subgraphNodeB)
+
+    const { vueNodeData } = useGraphNodeManager(graph)
+    const nodeData = vueNodeData.get(String(subgraphNodeB.id))
+    const mappedWidget = nodeData?.widgets?.[0]
+
+    expect(mappedWidget).toBeDefined()
+    expect(mappedWidget?.type).toBe('combo')
+    expect(mappedWidget?.storeName).toBe('picker')
+    expect(mappedWidget?.storeNodeId).toBe(
+      `${subgraphNodeB.subgraph.id}:${innerNode.id}`
+    )
+  })
+})
diff --git a/src/composables/graph/useGraphNodeManager.ts b/src/composables/graph/useGraphNodeManager.ts
index a7755afa64..7a7a5900f7 100644
--- a/src/composables/graph/useGraphNodeManager.ts
+++ b/src/composables/graph/useGraphNodeManager.ts
@@ -3,19 +3,20 @@
  * Provides event-driven reactivity with performance optimizations
  */
 import { reactiveComputed } from '@vueuse/core'
-import { customRef, reactive, shallowReactive } from 'vue'
+import { reactive, shallowReactive } from 'vue'
 
 import { useChainCallback } from '@/composables/functional/useChainCallback'
-import { isProxyWidget } from '@/core/graph/subgraph/proxyWidget'
+import { isPromotedWidgetView } from '@/core/graph/subgraph/promotedWidgetTypes'
+import { resolveConcretePromotedWidget } from '@/core/graph/subgraph/resolveConcretePromotedWidget'
+import { resolvePromotedWidgetSource } from '@/core/graph/subgraph/resolvePromotedWidgetSource'
+import { resolveSubgraphInputTarget } from '@/core/graph/subgraph/resolveSubgraphInputTarget'
 import type {
   INodeInputSlot,
   INodeOutputSlot
 } from '@/lib/litegraph/src/interfaces'
-import type {
-  IBaseWidget,
-  IWidgetOptions
-} from '@/lib/litegraph/src/types/widgets'
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
 import { useLayoutMutations } from '@/renderer/core/layout/operations/layoutMutations'
+import { layoutStore } from '@/renderer/core/layout/store/layoutStore'
 import { LayoutSource } from '@/renderer/core/layout/types'
 import type { NodeId } from '@/renderer/core/layout/types'
 import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
@@ -41,20 +42,44 @@ export interface WidgetSlotMetadata {
   linked: boolean
 }
 
+/**
+ * Minimal render-specific widget data extracted from LiteGraph widgets.
+ * Value and metadata (label, hidden, disabled, etc.) are accessed via widgetValueStore.
+ */
 export interface SafeWidgetData {
+  nodeId?: NodeId
+  storeNodeId?: NodeId
   name: string
+  storeName?: string
   type: string
-  value: WidgetValue
-  borderStyle?: string
+  /** Callback to invoke when widget value changes (wraps LiteGraph callback + triggerDraw) */
   callback?: ((value: unknown) => void) | undefined
+  /** Control widget for seed randomization/increment/decrement */
   controlWidget?: SafeControlWidget
+  /** Whether widget has custom layout size computation */
   hasLayoutSize?: boolean
+  /** Whether widget is a DOM widget */
   isDOMWidget?: boolean
-  label?: string
-  nodeType?: string
-  options?: IWidgetOptions<unknown>
+  /**
+   * Widget options needed for render decisions.
+   * Note: Most metadata should be accessed via widgetValueStore.getWidget().
+   */
+  options?: {
+    canvasOnly?: boolean
+    advanced?: boolean
+    hidden?: boolean
+    read_only?: boolean
+  }
+  /** Input specification from node definition */
   spec?: InputSpec
+  /** Input slot metadata (index and link status) */
   slotMetadata?: WidgetSlotMetadata
+  /**
+   * Original LiteGraph widget name used for slot metadata matching.
+   * For promoted widgets, `name` is `sourceWidgetName` (interior widget name)
+   * which differs from the subgraph node's input slot widget name.
+   */
+  slotName?: string
 }
 
 export interface VueNodeData {
@@ -70,12 +95,15 @@ export interface VueNodeData {
   color?: string
   flags?: {
     collapsed?: boolean
+    ghost?: boolean
     pinned?: boolean
   }
   hasErrors?: boolean
   inputs?: INodeInputSlot[]
   outputs?: INodeOutputSlot[]
+  resizable?: boolean
   shape?: number
+  showAdvanced?: boolean
   subgraphId?: string | null
   titleMode?: TitleMode
   widgets?: SafeWidgetData[]
@@ -92,24 +120,21 @@ export interface GraphNodeManager {
   cleanup(): void
 }
 
-function widgetWithVueTrack(
+function isPromotedDOMWidget(widget: IBaseWidget): boolean {
+  if (!isPromotedWidgetView(widget)) return false
+  const sourceWidget = resolvePromotedWidgetSource(widget.node, widget)
+  if (!sourceWidget) return false
+
+  const innerWidget = sourceWidget.widget
+  return (
+    ('element' in innerWidget && !!innerWidget.element) ||
+    ('component' in innerWidget && !!innerWidget.component)
+  )
+}
+
+export function getControlWidget(
   widget: IBaseWidget
-): asserts widget is IBaseWidget & { vueTrack: () => void } {
-  if (widget.vueTrack) return
-
-  customRef((track, trigger) => {
-    widget.callback = useChainCallback(widget.callback, trigger)
-    widget.vueTrack = track
-    return { get() {}, set() {} }
-  })
-}
-export function useReactiveWidgetValue(widget: IBaseWidget) {
-  widgetWithVueTrack(widget)
-  widget.vueTrack()
-  return widget.value
-}
-
-function getControlWidget(widget: IBaseWidget): SafeControlWidget | undefined {
+): SafeControlWidget | undefined {
   const cagWidget = widget.linkedWidgets?.find(
     (w) => w.name == 'control_after_generate'
   )
@@ -119,16 +144,28 @@ function getControlWidget(widget: IBaseWidget): SafeControlWidget | undefined {
     update: (value) => (cagWidget.value = normalizeControlOption(value))
   }
 }
-function getNodeType(node: LGraphNode, widget: IBaseWidget) {
-  if (!node.isSubgraphNode() || !isProxyWidget(widget)) return undefined
-  const subNode = node.subgraph.getNodeById(widget._overlay.nodeId)
-  return subNode?.type
+
+interface SharedWidgetEnhancements {
+  controlWidget?: SafeControlWidget
+  spec?: InputSpec
+}
+
+function getSharedWidgetEnhancements(
+  node: LGraphNode,
+  widget: IBaseWidget
+): SharedWidgetEnhancements {
+  const nodeDefStore = useNodeDefStore()
+
+  return {
+    controlWidget: getControlWidget(widget),
+    spec: nodeDefStore.getInputSpecForWidget(node, widget.name)
+  }
 }
 
 /**
  * Validates that a value is a valid WidgetValue type
  */
-const normalizeWidgetValue = (value: unknown): WidgetValue => {
+function normalizeWidgetValue(value: unknown): WidgetValue {
   if (value === null || value === undefined || value === void 0) {
     return undefined
   }
@@ -156,20 +193,75 @@ const normalizeWidgetValue = (value: unknown): WidgetValue => {
   return undefined
 }
 
-export function safeWidgetMapper(
+function safeWidgetMapper(
   node: LGraphNode,
   slotMetadata: Map<string, WidgetSlotMetadata>
 ): (widget: IBaseWidget) => SafeWidgetData {
-  const nodeDefStore = useNodeDefStore()
+  function extractWidgetDisplayOptions(
+    widget: IBaseWidget
+  ): SafeWidgetData['options'] {
+    if (!widget.options) return undefined
+
+    return {
+      canvasOnly: widget.options.canvasOnly,
+      advanced: widget.advanced,
+      hidden: widget.options.hidden,
+      read_only: widget.options.read_only
+    }
+  }
+
+  function resolvePromotedSourceByInputName(inputName: string): {
+    sourceNodeId: string
+    sourceWidgetName: string
+  } | null {
+    const resolvedTarget = resolveSubgraphInputTarget(node, inputName)
+    if (!resolvedTarget) return null
+
+    return {
+      sourceNodeId: resolvedTarget.nodeId,
+      sourceWidgetName: resolvedTarget.widgetName
+    }
+  }
+
+  function resolvePromotedWidgetIdentity(widget: IBaseWidget): {
+    displayName: string
+    promotedSource: { sourceNodeId: string; sourceWidgetName: string } | null
+  } {
+    if (!isPromotedWidgetView(widget)) {
+      return {
+        displayName: widget.name,
+        promotedSource: null
+      }
+    }
+
+    const promotedInputName = node.inputs?.find((input) => {
+      if (input.name === widget.name) return true
+      if (input._widget === widget) return true
+      return false
+    })?.name
+    const displayName = promotedInputName ?? widget.name
+    const promotedSource = resolvePromotedSourceByInputName(displayName) ?? {
+      sourceNodeId: widget.sourceNodeId,
+      sourceWidgetName: widget.sourceWidgetName
+    }
+
+    return {
+      displayName,
+      promotedSource
+    }
+  }
+
   return function (widget) {
     try {
-      const spec = nodeDefStore.getInputSpecForWidget(node, widget.name)
-      const slotInfo = slotMetadata.get(widget.name)
-      const borderStyle = widget.promoted
-        ? 'ring ring-component-node-widget-promoted'
-        : widget.advanced
-          ? 'ring ring-component-node-widget-advanced'
-          : undefined
+      const { displayName, promotedSource } =
+        resolvePromotedWidgetIdentity(widget)
+
+      // Get shared enhancements (controlWidget, spec, nodeType)
+      const sharedEnhancements = getSharedWidgetEnhancements(node, widget)
+      const slotInfo =
+        slotMetadata.get(displayName) ?? slotMetadata.get(widget.name)
+
+      // Wrapper callback specific to Nodes 2.0 rendering
       const callback = (v: unknown) => {
         const value = normalizeWidgetValue(v)
         widget.value = value ?? undefined
@@ -181,40 +273,169 @@ export function safeWidgetMapper(
         node.widgets?.forEach((w) => w.triggerDraw?.())
       }
 
+      const isPromotedPseudoWidget =
+        isPromotedWidgetView(widget) && widget.sourceWidgetName.startsWith('$$')
+
+      // Extract only render-critical options (canvasOnly, advanced, read_only)
+      const options = extractWidgetDisplayOptions(widget)
+      const subgraphId = node.isSubgraphNode() && node.subgraph.id
+
+      const resolvedSourceResult =
+        isPromotedWidgetView(widget) && promotedSource
+          ? resolveConcretePromotedWidget(
+              node,
+              promotedSource.sourceNodeId,
+              promotedSource.sourceWidgetName
+            )
+          : null
+      const resolvedSource =
+        resolvedSourceResult?.status === 'resolved'
+          ? resolvedSourceResult.resolved
+          : undefined
+      const sourceWidget = resolvedSource?.widget
+      const sourceNode = resolvedSource?.node
+
+      const effectiveWidget = sourceWidget ?? widget
+
+      const localId = isPromotedWidgetView(widget)
+        ? String(sourceNode?.id ?? promotedSource?.sourceNodeId)
+        : undefined
+      const nodeId =
+        subgraphId && localId ? `${subgraphId}:${localId}` : undefined
+      const storeName = isPromotedWidgetView(widget)
+        ? (sourceWidget?.name ?? promotedSource?.sourceWidgetName)
+        : undefined
+      const name = storeName ?? displayName
+
       return {
-        name: widget.name,
-        type: widget.type,
-        value: useReactiveWidgetValue(widget),
-        borderStyle,
+        nodeId,
+        storeNodeId: nodeId,
+        name,
+        storeName,
+        type: effectiveWidget.type,
+        ...sharedEnhancements,
         callback,
-        controlWidget: getControlWidget(widget),
-        hasLayoutSize: typeof widget.computeLayoutSize === 'function',
-        isDOMWidget: isDOMWidget(widget),
-        label: widget.label,
-        nodeType: getNodeType(node, widget),
-        options: widget.options,
-        spec,
-        slotMetadata: slotInfo
+        hasLayoutSize: typeof effectiveWidget.computeLayoutSize === 'function',
+        isDOMWidget: isDOMWidget(widget) || isPromotedDOMWidget(widget),
+        options: isPromotedPseudoWidget
+          ? {
+              ...(extractWidgetDisplayOptions(effectiveWidget) ?? options),
+              canvasOnly: true
+            }
+          : (extractWidgetDisplayOptions(effectiveWidget) ?? options),
+        slotMetadata: slotInfo,
+        slotName: name !== widget.name ? widget.name : undefined
       }
     } catch (error) {
       return {
         name: widget.name || 'unknown',
-        type: widget.type || 'text',
-        value: undefined
+        type: widget.type || 'text'
       }
     }
   }
 }
 
-export function isValidWidgetValue(value: unknown): value is WidgetValue {
-  return (
-    value === null ||
-    value === undefined ||
-    typeof value === 'string' ||
-    typeof value === 'number' ||
-    typeof value === 'boolean' ||
-    typeof value === 'object'
+// Extract safe data from LiteGraph node for Vue consumption
+export function extractVueNodeData(node: LGraphNode): VueNodeData {
+  // Determine subgraph ID - null for root graph, string for subgraphs
+  const subgraphId =
+    node.graph && 'id' in node.graph && node.graph !== node.graph.rootGraph
+      ? String(node.graph.id)
+      : null
+  // Extract safe widget data
+  const slotMetadata = new Map<string, WidgetSlotMetadata>()
+
+  const existingWidgetsDescriptor = Object.getOwnPropertyDescriptor(
+    node,
+    'widgets'
   )
+  const reactiveWidgets = shallowReactive<IBaseWidget[]>(node.widgets ?? [])
+  if (existingWidgetsDescriptor?.get) {
+    // Node has a custom widgets getter (e.g. SubgraphNode's synthetic getter).
+    // Preserve it but sync results into a reactive array for Vue.
+    const originalGetter = existingWidgetsDescriptor.get
+    Object.defineProperty(node, 'widgets', {
+      get() {
+        const current: IBaseWidget[] = originalGetter.call(node) ?? []
+        if (
+          current.length !== reactiveWidgets.length ||
+          current.some((w, i) => w !== reactiveWidgets[i])
+        ) {
+          reactiveWidgets.splice(0, reactiveWidgets.length, ...current)
+        }
+        return reactiveWidgets
+      },
+      set: existingWidgetsDescriptor.set ?? (() => {}),
+      configurable: true,
+      enumerable: true
+    })
+  } else {
+    Object.defineProperty(node, 'widgets', {
+      get() {
+        return reactiveWidgets
+      },
+      set(v) {
+        reactiveWidgets.splice(0, reactiveWidgets.length, ...v)
+      }
+    })
+  }
+  const reactiveInputs = shallowReactive<INodeInputSlot[]>(node.inputs ?? [])
+  Object.defineProperty(node, 'inputs', {
+    get() {
+      return reactiveInputs
+    },
+    set(v) {
+      reactiveInputs.splice(0, reactiveInputs.length, ...v)
+    }
+  })
+
+  const safeWidgets = reactiveComputed<SafeWidgetData[]>(() => {
+    const widgetsSnapshot = node.widgets ?? []
+
+    slotMetadata.clear()
+    node.inputs?.forEach((input, index) => {
+      const slotInfo = {
+        index,
+        linked: input.link != null
+      }
+      if (input.name) slotMetadata.set(input.name, slotInfo)
+      if (input.widget?.name) slotMetadata.set(input.widget.name, slotInfo)
+    })
+    return widgetsSnapshot.map(safeWidgetMapper(node, slotMetadata))
+  })
+
+  const nodeType =
+    node.type ||
+    node.constructor?.comfyClass ||
+    node.constructor?.title ||
+    node.constructor?.name ||
+    'Unknown'
+
+  const apiNode = node.constructor?.nodeData?.api_node ?? false
+  const badges = node.badges
+
+  return {
+    id: String(node.id),
+    title: typeof node.title === 'string' ? node.title : '',
+    type: nodeType,
+    mode: node.mode || 0,
+    titleMode: node.title_mode,
+    selected: node.selected || false,
+    executing: false, // Will be updated separately based on execution state
+    subgraphId,
+    apiNode,
+    badges,
+    hasErrors: !!node.has_errors,
+    widgets: safeWidgets,
+    inputs: reactiveInputs,
+    outputs: node.outputs ? [...node.outputs] : undefined,
+    flags: node.flags ? { ...node.flags } : undefined,
+    color: node.color || undefined,
+    bgcolor: node.bgcolor || undefined,
+    resizable: node.resizable,
+    shape: node.shape,
+    showAdvanced: node.showAdvanced
+  }
 }
 
 export function useGraphNodeManager(graph: LGraph): GraphNodeManager {
@@ -236,96 +457,18 @@ export function useGraphNodeManager(graph: LGraph): GraphNodeManager {
     const slotMetadata = new Map<string, WidgetSlotMetadata>()
 
     nodeRef.inputs?.forEach((input, index) => {
-      if (!input?.widget?.name) return
-      slotMetadata.set(input.widget.name, {
+      const slotInfo = {
         index,
         linked: input.link != null
-      })
+      }
+      if (input.name) slotMetadata.set(input.name, slotInfo)
+      if (input.widget?.name) slotMetadata.set(input.widget.name, slotInfo)
     })
 
     // Update only widgets with new slot metadata, keeping other widget data intact
-    const updatedWidgets = currentData.widgets?.map((widget) => {
-      const slotInfo = slotMetadata.get(widget.name)
-      return slotInfo ? { ...widget, slotMetadata: slotInfo } : widget
-    })
-
-    vueNodeData.set(nodeId, {
-      ...currentData,
-      widgets: updatedWidgets,
-      inputs: nodeRef.inputs ? [...nodeRef.inputs] : undefined,
-      outputs: nodeRef.outputs ? [...nodeRef.outputs] : undefined
-    })
-  }
-
-  // Extract safe data from LiteGraph node for Vue consumption
-  function extractVueNodeData(node: LGraphNode): VueNodeData {
-    // Determine subgraph ID - null for root graph, string for subgraphs
-    const subgraphId =
-      node.graph && 'id' in node.graph && node.graph !== node.graph.rootGraph
-        ? String(node.graph.id)
-        : null
-    // Extract safe widget data
-    const slotMetadata = new Map<string, WidgetSlotMetadata>()
-
-    const reactiveWidgets = shallowReactive<IBaseWidget[]>(node.widgets ?? [])
-    Object.defineProperty(node, 'widgets', {
-      get() {
-        return reactiveWidgets
-      },
-      set(v) {
-        reactiveWidgets.splice(0, reactiveWidgets.length, ...v)
-      }
-    })
-    const reactiveInputs = shallowReactive<INodeInputSlot[]>(node.inputs ?? [])
-    Object.defineProperty(node, 'inputs', {
-      get() {
-        return reactiveInputs
-      },
-      set(v) {
-        reactiveInputs.splice(0, reactiveInputs.length, ...v)
-      }
-    })
-
-    const safeWidgets = reactiveComputed<SafeWidgetData[]>(() => {
-      node.inputs?.forEach((input, index) => {
-        if (!input?.widget?.name) return
-        slotMetadata.set(input.widget.name, {
-          index,
-          linked: input.link != null
-        })
-      })
-      return node.widgets?.map(safeWidgetMapper(node, slotMetadata)) ?? []
-    })
-
-    const nodeType =
-      node.type ||
-      node.constructor?.comfyClass ||
-      node.constructor?.title ||
-      node.constructor?.name ||
-      'Unknown'
-
-    const apiNode = node.constructor?.nodeData?.api_node ?? false
-    const badges = node.badges
-
-    return {
-      id: String(node.id),
-      title: typeof node.title === 'string' ? node.title : '',
-      type: nodeType,
-      mode: node.mode || 0,
-      titleMode: node.title_mode,
-      selected: node.selected || false,
-      executing: false, // Will be updated separately based on execution state
-      subgraphId,
-      apiNode,
-      badges,
-      hasErrors: !!node.has_errors,
-      widgets: safeWidgets,
-      inputs: reactiveInputs,
-      outputs: node.outputs ? [...node.outputs] : undefined,
-      flags: node.flags ? { ...node.flags } : undefined,
-      color: node.color || undefined,
-      bgcolor: node.bgcolor || undefined,
-      shape: node.shape
+    for (const widget of currentData.widgets ?? []) {
+      const slotInfo = slotMetadata.get(widget.slotName ?? widget.name)
+      if (slotInfo) widget.slotMetadata = slotInfo
     }
   }
 
@@ -376,10 +519,18 @@ export function useGraphNodeManager(graph: LGraph): GraphNodeManager {
     vueNodeData.set(id, extractVueNodeData(node))
 
     const initializeVueNodeLayout = () => {
+      // Check if the node was removed mid-sequence
+      if (!nodeRefs.has(id)) return
+
       // Extract actual positions after configure() has potentially updated them
       const nodePosition = { x: node.pos[0], y: node.pos[1] }
       const nodeSize = { width: node.size[0], height: node.size[1] }
 
+      // Skip layout creation if it already exists
+      // (e.g. in-place node replacement where the old node's layout is reused for the new node with the same ID).
+      const existingLayout = layoutStore.getNodeLayoutRef(id).value
+      if (existingLayout) return
+
       // Add node to layout store with final positions
       setSource(LayoutSource.Canvas)
       void createNode(id, {
@@ -499,6 +650,15 @@ export function useGraphNodeManager(graph: LGraph): GraphNodeManager {
                 }
               })
               break
+            case 'flags.ghost':
+              vueNodeData.set(nodeId, {
+                ...currentData,
+                flags: {
+                  ...currentData.flags,
+                  ghost: Boolean(propertyEvent.newValue)
+                }
+              })
+              break
             case 'flags.pinned':
               vueNodeData.set(nodeId, {
                 ...currentData,
@@ -543,6 +703,13 @@ export function useGraphNodeManager(graph: LGraph): GraphNodeManager {
                     ? propertyEvent.newValue
                     : undefined
               })
+              break
+            case 'showAdvanced':
+              vueNodeData.set(nodeId, {
+                ...currentData,
+                showAdvanced: Boolean(propertyEvent.newValue)
+              })
+              break
           }
         }
       },
diff --git a/src/composables/graph/useImageMenuOptions.ts b/src/composables/graph/useImageMenuOptions.ts
index 3956edefa4..a343563773 100644
--- a/src/composables/graph/useImageMenuOptions.ts
+++ b/src/composables/graph/useImageMenuOptions.ts
@@ -1,6 +1,7 @@
 import { useI18n } from 'vue-i18n'
 
-import { downloadFile } from '@/base/common/downloadUtil'
+import { downloadFile, openFileInNewTab } from '@/base/common/downloadUtil'
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
 import { useCommandStore } from '@/stores/commandStore'
 
 import type { MenuOption } from './useMoreOptionsMenu'
@@ -16,16 +17,16 @@ export function useImageMenuOptions() {
     void commandStore.execute('Comfy.MaskEditor.OpenMaskEditor')
   }
 
-  const openImage = (node: any) => {
+  const openImage = (node: LGraphNode) => {
     if (!node?.imgs?.length) return
     const img = node.imgs[node.imageIndex ?? 0]
     if (!img) return
     const url = new URL(img.src)
     url.searchParams.delete('preview')
-    window.open(url.toString(), '_blank')
+    void openFileInNewTab(url.toString())
   }
 
-  const copyImage = async (node: any) => {
+  const copyImage = async (node: LGraphNode) => {
     if (!node?.imgs?.length) return
     const img = node.imgs[node.imageIndex ?? 0]
     if (!img) return
@@ -62,7 +63,7 @@ export function useImageMenuOptions() {
     }
   }
 
-  const saveImage = (node: any) => {
+  const saveImage = (node: LGraphNode) => {
     if (!node?.imgs?.length) return
     const img = node.imgs[node.imageIndex ?? 0]
     if (!img) return
@@ -76,7 +77,7 @@ export function useImageMenuOptions() {
     }
   }
 
-  const getImageMenuOptions = (node: any): MenuOption[] => {
+  const getImageMenuOptions = (node: LGraphNode): MenuOption[] => {
     if (!node?.imgs?.length) return []
 
     return [
diff --git a/src/composables/graph/useMoreOptionsMenu.ts b/src/composables/graph/useMoreOptionsMenu.ts
index 96c677cd59..349a1d7f94 100644
--- a/src/composables/graph/useMoreOptionsMenu.ts
+++ b/src/composables/graph/useMoreOptionsMenu.ts
@@ -1,8 +1,14 @@
 import { computed, ref } from 'vue'
 import type { Ref } from 'vue'
 
-import type { LGraphGroup } from '@/lib/litegraph/src/litegraph'
+import { isPromotedWidgetView } from '@/core/graph/subgraph/promotedWidgetTypes'
+import type {
+  LGraphGroup,
+  LGraphNode,
+  NodeId
+} from '@/lib/litegraph/src/litegraph'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import { getExtraOptionsForWidget } from '@/services/litegraphService'
 import { isLGraphGroup } from '@/utils/litegraphUtil'
 
 import {
@@ -45,6 +51,8 @@ export enum BadgeVariant {
 // Global singleton for NodeOptions component reference
 let nodeOptionsInstance: null | NodeOptionsInstance = null
 
+const hoveredWidget = ref<[string, NodeId | undefined]>()
+
 /**
  * Toggle the node options popover
  * @param event - The trigger event
@@ -60,7 +68,12 @@ export function toggleNodeOptions(event: Event) {
  * Use this for contextmenu events where we always want to show at the new position
  * @param event - The trigger event (must be MouseEvent for position)
  */
-export function showNodeOptions(event: MouseEvent) {
+export function showNodeOptions(
+  event: MouseEvent,
+  widgetName?: string,
+  nodeId?: NodeId
+) {
+  hoveredWidget.value = widgetName ? [widgetName, nodeId] : undefined
   if (nodeOptionsInstance?.show) {
     nodeOptionsInstance.show(event)
   }
@@ -133,8 +146,8 @@ export function useMoreOptionsMenu() {
   } = useGroupMenuOptions()
   const {
     getBasicSelectionOptions,
-    getSubgraphOptions,
-    getMultipleNodesOptions
+    getMultipleNodesOptions,
+    getSubgraphOptions
   } = useSelectionMenuOptions()
 
   const hasSubgraphs = hasSubgraphsComputed
@@ -164,13 +177,13 @@ export function useMoreOptionsMenu() {
 
     // For single node selection, also get LiteGraph menu items to merge
     const litegraphOptions: MenuOption[] = []
+    const node: LGraphNode | undefined = selectedNodes.value[0]
     if (
       selectedNodes.value.length === 1 &&
       !groupContext &&
       canvasStore.canvas
     ) {
       try {
-        const node = selectedNodes.value[0]
         const rawItems = canvasStore.canvas.getNodeMenuOptions(node)
         // Don't apply structuring yet - we'll do it after merging with Vue options
         litegraphOptions.push(
@@ -249,6 +262,26 @@ export function useMoreOptionsMenu() {
       options.push(...getImageMenuOptions(selectedNodes.value[0]))
       options.push({ type: 'divider' })
     }
+    const [widgetName, nodeId] = hoveredWidget.value ?? []
+    const widget =
+      nodeId !== undefined
+        ? node?.widgets?.find(
+            (w) =>
+              isPromotedWidgetView(w) &&
+              w.sourceWidgetName === widgetName &&
+              w.sourceNodeId === nodeId
+          )
+        : node?.widgets?.find((w) => w.name === widgetName)
+    if (widget) {
+      const widgetOptions = convertContextMenuToOptions(
+        getExtraOptionsForWidget(node, widget)
+      )
+      if (widgetOptions) {
+        options.push(...widgetOptions)
+        options.push({ type: 'divider' })
+      }
+    }
+
     // Section 6 & 7: Extensions and Delete are handled by buildStructuredMenu
 
     // Mark all Vue options with source
diff --git a/src/composables/graph/useSelectionMenuOptions.test.ts b/src/composables/graph/useSelectionMenuOptions.test.ts
index 8600e85eec..b35544e87d 100644
--- a/src/composables/graph/useSelectionMenuOptions.test.ts
+++ b/src/composables/graph/useSelectionMenuOptions.test.ts
@@ -2,10 +2,11 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { useSelectionMenuOptions } from '@/composables/graph/useSelectionMenuOptions'
 
-const subgraphMocks = vi.hoisted(() => ({
+const mocks = vi.hoisted(() => ({
   convertToSubgraph: vi.fn(),
   unpackSubgraph: vi.fn(),
   addSubgraphToLibrary: vi.fn(),
+  frameNodes: vi.fn(),
   createI18nMock: vi.fn(() => ({
     global: {
       t: vi.fn(),
@@ -19,7 +20,7 @@ vi.mock('vue-i18n', () => ({
   useI18n: () => ({
     t: (key: string) => key
   }),
-  createI18n: subgraphMocks.createI18nMock
+  createI18n: mocks.createI18nMock
 }))
 
 vi.mock('@/composables/graph/useSelectionOperations', () => ({
@@ -42,18 +43,46 @@ vi.mock('@/composables/graph/useNodeArrangement', () => ({
 
 vi.mock('@/composables/graph/useSubgraphOperations', () => ({
   useSubgraphOperations: () => ({
-    convertToSubgraph: subgraphMocks.convertToSubgraph,
-    unpackSubgraph: subgraphMocks.unpackSubgraph,
-    addSubgraphToLibrary: subgraphMocks.addSubgraphToLibrary
+    convertToSubgraph: mocks.convertToSubgraph,
+    unpackSubgraph: mocks.unpackSubgraph,
+    addSubgraphToLibrary: mocks.addSubgraphToLibrary
   })
 }))
 
 vi.mock('@/composables/graph/useFrameNodes', () => ({
   useFrameNodes: () => ({
-    frameNodes: vi.fn()
+    frameNodes: mocks.frameNodes
   })
 }))
 
+describe('useSelectionMenuOptions - multiple nodes options', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('returns Frame Nodes option that invokes frameNodes when called', () => {
+    const { getMultipleNodesOptions } = useSelectionMenuOptions()
+    const options = getMultipleNodesOptions()
+
+    const frameOption = options.find((opt) => opt.label === 'g.frameNodes')
+    expect(frameOption).toBeDefined()
+    expect(frameOption?.action).toBeDefined()
+
+    frameOption?.action?.()
+    expect(mocks.frameNodes).toHaveBeenCalledOnce()
+  })
+
+  it('returns Convert to Group Node option from getMultipleNodesOptions', () => {
+    const { getMultipleNodesOptions } = useSelectionMenuOptions()
+    const options = getMultipleNodesOptions()
+
+    const groupNodeOption = options.find(
+      (opt) => opt.label === 'contextMenu.Convert to Group Node'
+    )
+    expect(groupNodeOption).toBeDefined()
+  })
+})
+
 describe('useSelectionMenuOptions - subgraph options', () => {
   beforeEach(() => {
     vi.clearAllMocks()
@@ -68,10 +97,10 @@ describe('useSelectionMenuOptions - subgraph options', () => {
 
     expect(options).toHaveLength(1)
     expect(options[0]?.label).toBe('contextMenu.Convert to Subgraph')
-    expect(options[0]?.action).toBe(subgraphMocks.convertToSubgraph)
+    expect(options[0]?.action).toBe(mocks.convertToSubgraph)
   })
 
-  it('includes convert, add to library, and unpack when subgraphs are selected', () => {
+  it('includes convert and unpack but hides add to library when multiple items with subgraphs are selected', () => {
     const { getSubgraphOptions } = useSelectionMenuOptions()
     const options = getSubgraphOptions({
       hasSubgraphs: true,
@@ -80,16 +109,11 @@ describe('useSelectionMenuOptions - subgraph options', () => {
     const labels = options.map((option) => option.label)
 
     expect(labels).toContain('contextMenu.Convert to Subgraph')
-    expect(labels).toContain('contextMenu.Add Subgraph to Library')
+    expect(labels).not.toContain('contextMenu.Add Subgraph to Library')
     expect(labels).toContain('contextMenu.Unpack Subgraph')
-
-    const convertOption = options.find(
-      (option) => option.label === 'contextMenu.Convert to Subgraph'
-    )
-    expect(convertOption?.action).toBe(subgraphMocks.convertToSubgraph)
   })
 
-  it('hides convert option when only a single subgraph is selected', () => {
+  it('shows add to library and unpack when a single subgraph is selected', () => {
     const { getSubgraphOptions } = useSelectionMenuOptions()
     const options = getSubgraphOptions({
       hasSubgraphs: true,
@@ -102,5 +126,10 @@ describe('useSelectionMenuOptions - subgraph options', () => {
       'contextMenu.Add Subgraph to Library',
       'contextMenu.Unpack Subgraph'
     ])
+
+    const addToLibraryOption = options.find(
+      (option) => option.label === 'contextMenu.Add Subgraph to Library'
+    )
+    expect(addToLibraryOption?.action).toBe(mocks.addSubgraphToLibrary)
   })
 })
diff --git a/src/composables/graph/useSelectionMenuOptions.ts b/src/composables/graph/useSelectionMenuOptions.ts
index e896261a5b..b571f9ab5d 100644
--- a/src/composables/graph/useSelectionMenuOptions.ts
+++ b/src/composables/graph/useSelectionMenuOptions.ts
@@ -85,18 +85,18 @@ export function useSelectionMenuOptions() {
     }
 
     if (hasSubgraphs) {
-      options.push(
-        {
+      if (!hasMultipleSelection) {
+        options.push({
           label: t('contextMenu.Add Subgraph to Library'),
           icon: 'icon-[lucide--folder-plus]',
           action: addSubgraphToLibrary
-        },
-        {
-          label: t('contextMenu.Unpack Subgraph'),
-          icon: 'icon-[lucide--expand]',
-          action: unpackSubgraph
-        }
-      )
+        })
+      }
+      options.push({
+        label: t('contextMenu.Unpack Subgraph'),
+        icon: 'icon-[lucide--expand]',
+        action: unpackSubgraph
+      })
     }
 
     return options
diff --git a/src/composables/graph/useSelectionState.test.ts b/src/composables/graph/useSelectionState.test.ts
new file mode 100644
index 0000000000..278365435e
--- /dev/null
+++ b/src/composables/graph/useSelectionState.test.ts
@@ -0,0 +1,190 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, test, vi } from 'vitest'
+
+import { useSelectionState } from '@/composables/graph/useSelectionState'
+import { useNodeLibrarySidebarTab } from '@/composables/sidebarTabs/useNodeLibrarySidebarTab'
+import { LGraphEventMode } from '@/lib/litegraph/src/litegraph'
+import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import { isImageNode, isLGraphNode } from '@/utils/litegraphUtil'
+import { filterOutputNodes } from '@/utils/nodeFilterUtil'
+import {
+  createMockLGraphNode,
+  createMockPositionable
+} from '@/utils/__tests__/litegraphTestUtils'
+
+// Mock composables
+vi.mock('@/composables/sidebarTabs/useNodeLibrarySidebarTab', () => ({
+  useNodeLibrarySidebarTab: vi.fn()
+}))
+
+vi.mock('@/utils/litegraphUtil', () => ({
+  isLGraphNode: vi.fn(),
+  isImageNode: vi.fn()
+}))
+
+vi.mock('@/utils/nodeFilterUtil', () => ({
+  filterOutputNodes: vi.fn()
+}))
+
+// Mock comment/connection objects with additional properties
+const mockComment = {
+  ...createMockPositionable({ id: 999 }),
+  type: 'comment',
+  isNode: false
+}
+const mockConnection = {
+  ...createMockPositionable({ id: 1000 }),
+  type: 'connection',
+  isNode: false
+}
+
+describe('useSelectionState', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+
+    // Create testing Pinia instance
+    setActivePinia(
+      createTestingPinia({
+        createSpy: vi.fn
+      })
+    )
+
+    // Setup mock composables
+    vi.mocked(useNodeLibrarySidebarTab).mockReturnValue({
+      id: 'node-library-tab',
+      title: 'Node Library',
+      type: 'custom',
+      render: () => null
+    } as ReturnType<typeof useNodeLibrarySidebarTab>)
+
+    // Setup mock utility functions
+    vi.mocked(isLGraphNode).mockImplementation((item: unknown) => {
+      const typedItem = item as { isNode?: boolean }
+      return typedItem?.isNode !== false
+    })
+    vi.mocked(isImageNode).mockImplementation((node: unknown) => {
+      const typedNode = node as { type?: string }
+      return typedNode?.type === 'ImageNode'
+    })
+    vi.mocked(filterOutputNodes).mockImplementation((nodes) =>
+      nodes.filter((n) => n.type === 'OutputNode')
+    )
+  })
+
+  describe('Selection Detection', () => {
+    test('should return false when nothing selected', () => {
+      const { hasAnySelection } = useSelectionState()
+      expect(hasAnySelection.value).toBe(false)
+    })
+
+    test('should return true when items selected', () => {
+      const canvasStore = useCanvasStore()
+      const node1 = createMockLGraphNode({ id: 1 })
+      const node2 = createMockLGraphNode({ id: 2 })
+      canvasStore.$state.selectedItems = [node1, node2]
+
+      const { hasAnySelection } = useSelectionState()
+      expect(hasAnySelection.value).toBe(true)
+    })
+
+    test('hasMultipleSelection should be true when 2+ items selected', () => {
+      const canvasStore = useCanvasStore()
+      const node1 = createMockLGraphNode({ id: 1 })
+      const node2 = createMockLGraphNode({ id: 2 })
+      canvasStore.$state.selectedItems = [node1, node2]
+
+      const { hasMultipleSelection } = useSelectionState()
+      expect(hasMultipleSelection.value).toBe(true)
+    })
+
+    test('hasMultipleSelection should be false when only 1 item selected', () => {
+      const canvasStore = useCanvasStore()
+      const node1 = createMockLGraphNode({ id: 1 })
+      canvasStore.$state.selectedItems = [node1]
+
+      const { hasMultipleSelection } = useSelectionState()
+      expect(hasMultipleSelection.value).toBe(false)
+    })
+  })
+
+  describe('Node Type Filtering', () => {
+    test('should pick only LGraphNodes from mixed selections', () => {
+      const canvasStore = useCanvasStore()
+      const graphNode = createMockLGraphNode({ id: 3 })
+      canvasStore.$state.selectedItems = [
+        graphNode,
+        mockComment,
+        mockConnection
+      ]
+
+      const { selectedNodes } = useSelectionState()
+      expect(selectedNodes.value).toHaveLength(1)
+      expect(selectedNodes.value[0]).toEqual(graphNode)
+    })
+  })
+
+  describe('Node State Computation', () => {
+    test('should detect bypassed nodes', () => {
+      const canvasStore = useCanvasStore()
+      const bypassedNode = createMockLGraphNode({
+        id: 4,
+        mode: LGraphEventMode.BYPASS
+      })
+      canvasStore.$state.selectedItems = [bypassedNode]
+
+      const { selectedNodes } = useSelectionState()
+      const isBypassed = selectedNodes.value.some(
+        (n) => n.mode === LGraphEventMode.BYPASS
+      )
+      expect(isBypassed).toBe(true)
+    })
+
+    test('should detect pinned/collapsed states', () => {
+      const canvasStore = useCanvasStore()
+      const pinnedNode = createMockLGraphNode({ id: 5, pinned: true })
+      const collapsedNode = createMockLGraphNode({
+        id: 6,
+        flags: { collapsed: true }
+      })
+      canvasStore.$state.selectedItems = [pinnedNode, collapsedNode]
+
+      const { selectedNodes } = useSelectionState()
+      const isPinned = selectedNodes.value.some((n) => n.pinned === true)
+      const isCollapsed = selectedNodes.value.some(
+        (n) => n.flags?.collapsed === true
+      )
+      const isBypassed = selectedNodes.value.some(
+        (n) => n.mode === LGraphEventMode.BYPASS
+      )
+      expect(isPinned).toBe(true)
+      expect(isCollapsed).toBe(true)
+      expect(isBypassed).toBe(false)
+    })
+
+    test('should provide non-reactive state computation', () => {
+      const canvasStore = useCanvasStore()
+      const node = createMockLGraphNode({ id: 7, pinned: true })
+      canvasStore.$state.selectedItems = [node]
+
+      const { selectedNodes } = useSelectionState()
+      const isPinned = selectedNodes.value.some((n) => n.pinned === true)
+      const isCollapsed = selectedNodes.value.some(
+        (n) => n.flags?.collapsed === true
+      )
+      const isBypassed = selectedNodes.value.some(
+        (n) => n.mode === LGraphEventMode.BYPASS
+      )
+
+      expect(isPinned).toBe(true)
+      expect(isCollapsed).toBe(false)
+      expect(isBypassed).toBe(false)
+
+      // Test with empty selection using new composable instance
+      canvasStore.$state.selectedItems = []
+      const { selectedNodes: newSelectedNodes } = useSelectionState()
+      const newIsPinned = newSelectedNodes.value.some((n) => n.pinned === true)
+      expect(newIsPinned).toBe(false)
+    })
+  })
+})
diff --git a/src/composables/graph/useSubgraphOperations.test.ts b/src/composables/graph/useSubgraphOperations.test.ts
new file mode 100644
index 0000000000..9ed4c66f1e
--- /dev/null
+++ b/src/composables/graph/useSubgraphOperations.test.ts
@@ -0,0 +1,90 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { SubgraphNode } from '@/lib/litegraph/src/litegraph'
+
+const mocks = vi.hoisted(() => ({
+  publishSubgraph: vi.fn(),
+  selectedItems: [] as unknown[]
+}))
+
+vi.mock('@/composables/canvas/useSelectedLiteGraphItems', () => ({
+  useSelectedLiteGraphItems: () => ({
+    getSelectedNodes: vi.fn(() => [])
+  })
+}))
+
+vi.mock('@/renderer/core/canvas/canvasStore', () => ({
+  useCanvasStore: () => ({
+    getCanvas: vi.fn(),
+    get selectedItems() {
+      return mocks.selectedItems
+    },
+    updateSelectedItems: vi.fn()
+  })
+}))
+
+vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
+  useWorkflowStore: () => ({
+    activeWorkflow: null
+  })
+}))
+
+vi.mock('@/stores/nodeOutputStore', () => ({
+  useNodeOutputStore: () => ({
+    revokeSubgraphPreviews: vi.fn()
+  })
+}))
+
+vi.mock('@/stores/subgraphStore', () => ({
+  useSubgraphStore: () => ({
+    publishSubgraph: mocks.publishSubgraph
+  })
+}))
+
+function createSubgraphNode(): SubgraphNode {
+  const node = Object.create(SubgraphNode.prototype)
+  return node
+}
+
+describe('useSubgraphOperations', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mocks.selectedItems = []
+  })
+
+  it('addSubgraphToLibrary calls publishSubgraph when single SubgraphNode selected', async () => {
+    mocks.selectedItems = [createSubgraphNode()]
+
+    const { useSubgraphOperations } =
+      await import('@/composables/graph/useSubgraphOperations')
+    const { addSubgraphToLibrary } = useSubgraphOperations()
+
+    await addSubgraphToLibrary()
+
+    expect(mocks.publishSubgraph).toHaveBeenCalledOnce()
+  })
+
+  it('addSubgraphToLibrary does not call publishSubgraph when no items selected', async () => {
+    mocks.selectedItems = []
+
+    const { useSubgraphOperations } =
+      await import('@/composables/graph/useSubgraphOperations')
+    const { addSubgraphToLibrary } = useSubgraphOperations()
+
+    await addSubgraphToLibrary()
+
+    expect(mocks.publishSubgraph).not.toHaveBeenCalled()
+  })
+
+  it('addSubgraphToLibrary does not call publishSubgraph when multiple items selected', async () => {
+    mocks.selectedItems = [createSubgraphNode(), createSubgraphNode()]
+
+    const { useSubgraphOperations } =
+      await import('@/composables/graph/useSubgraphOperations')
+    const { addSubgraphToLibrary } = useSubgraphOperations()
+
+    await addSubgraphToLibrary()
+
+    expect(mocks.publishSubgraph).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/composables/graph/useSubgraphOperations.ts b/src/composables/graph/useSubgraphOperations.ts
index 45a665d4b4..3df39d3fac 100644
--- a/src/composables/graph/useSubgraphOperations.ts
+++ b/src/composables/graph/useSubgraphOperations.ts
@@ -2,10 +2,8 @@ import { useSelectedLiteGraphItems } from '@/composables/canvas/useSelectedLiteG
 import { SubgraphNode } from '@/lib/litegraph/src/litegraph'
 import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
-import { useNodeOutputStore } from '@/stores/imagePreviewStore'
-import { useNodeBookmarkStore } from '@/stores/nodeBookmarkStore'
-import { useNodeDefStore } from '@/stores/nodeDefStore'
-import { isLGraphNode } from '@/utils/litegraphUtil'
+import { useNodeOutputStore } from '@/stores/nodeOutputStore'
+import { useSubgraphStore } from '@/stores/subgraphStore'
 
 /**
  * Composable for handling subgraph-related operations
@@ -15,8 +13,7 @@ export function useSubgraphOperations() {
   const canvasStore = useCanvasStore()
   const workflowStore = useWorkflowStore()
   const nodeOutputStore = useNodeOutputStore()
-  const nodeDefStore = useNodeDefStore()
-  const nodeBookmarkStore = useNodeBookmarkStore()
+  const subgraphStore = useSubgraphStore()
 
   const convertToSubgraph = () => {
     const canvas = canvasStore.getCanvas()
@@ -73,48 +70,13 @@ export function useSubgraphOperations() {
 
   const addSubgraphToLibrary = async () => {
     const selectedItems = Array.from(canvasStore.selectedItems)
-
-    // Handle single node selection like BookmarkButton.vue
-    if (selectedItems.length === 1) {
-      const item = selectedItems[0]
-      if (isLGraphNode(item)) {
-        const nodeDef = nodeDefStore.fromLGraphNode(item)
-        if (nodeDef) {
-          await nodeBookmarkStore.addBookmark(nodeDef.nodePath)
-          return
-        }
-      }
-    }
-
-    // Handle multiple nodes - convert to subgraph first then bookmark
-    const selectedNodes = getSelectedNodes()
-
-    if (selectedNodes.length === 0) {
-      return
-    }
-
-    // Check if selection contains subgraph nodes
-    const hasSubgraphs = selectedNodes.some(
-      (node) => node instanceof SubgraphNode
+    const subgraphNodes = selectedItems.filter(
+      (item): item is SubgraphNode => item instanceof SubgraphNode
     )
-
-    if (!hasSubgraphs) {
-      // Convert regular nodes to subgraph first
-      convertToSubgraph()
+    if (subgraphNodes.length !== 1) {
       return
     }
-
-    // For subgraph nodes, bookmark them
-    let bookmarkedCount = 0
-    for (const node of selectedNodes) {
-      if (node instanceof SubgraphNode) {
-        const nodeDef = nodeDefStore.fromLGraphNode(node)
-        if (nodeDef) {
-          await nodeBookmarkStore.addBookmark(nodeDef.nodePath)
-          bookmarkedCount++
-        }
-      }
-    }
+    await subgraphStore.publishSubgraph()
   }
 
   const isSubgraphSelected = (): boolean => {
diff --git a/src/composables/graph/useVueNodeLifecycle.ts b/src/composables/graph/useVueNodeLifecycle.ts
index 648427a513..2157f008f4 100644
--- a/src/composables/graph/useVueNodeLifecycle.ts
+++ b/src/composables/graph/useVueNodeLifecycle.ts
@@ -9,7 +9,6 @@ import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import { useLayoutMutations } from '@/renderer/core/layout/operations/layoutMutations'
 import { layoutStore } from '@/renderer/core/layout/store/layoutStore'
 import { useLayoutSync } from '@/renderer/core/layout/sync/useLayoutSync'
-import { removeNodeTitleHeight } from '@/renderer/core/layout/utils/nodeSizeUtil'
 import { ensureCorrectLayoutScale } from '@/renderer/extensions/vueNodes/layout/ensureCorrectLayoutScale'
 import { app as comfyApp } from '@/scripts/app'
 
@@ -33,10 +32,7 @@ function useVueNodeLifecycleIndividual() {
     const nodes = activeGraph._nodes.map((node: LGraphNode) => ({
       id: node.id.toString(),
       pos: [node.pos[0], node.pos[1]] as [number, number],
-      size: [node.size[0], removeNodeTitleHeight(node.size[1])] as [
-        number,
-        number
-      ]
+      size: [node.size[0], node.size[1]] as [number, number]
     }))
     layoutStore.initializeFromLiteGraph(nodes)
 
diff --git a/src/composables/maskeditor/useBrushDrawing.ts b/src/composables/maskeditor/useBrushDrawing.ts
index c62ab14461..f1ea0fb38c 100644
--- a/src/composables/maskeditor/useBrushDrawing.ts
+++ b/src/composables/maskeditor/useBrushDrawing.ts
@@ -1,3 +1,4 @@
+/// <reference types="@webgpu/types" />
 import { ref, watch, nextTick, onUnmounted } from 'vue'
 import QuickLRU from '@alloc/quick-lru'
 import { debounce } from 'es-toolkit/compat'
@@ -233,6 +234,128 @@ export function useBrushDrawing(initialSettings?: {
     }
   )
 
+  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) {
@@ -281,8 +404,9 @@ export function useBrushDrawing(initialSettings?: {
       device = root.device
       console.warn('✅ TypeGPU initialized! Root:', root)
       console.warn('Device info:', root.device.limits)
-    } catch (error: any) {
-      console.warn('Failed to initialize TypeGPU:', error.message)
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error)
+      console.warn('Failed to initialize TypeGPU:', message)
     }
   }
 
diff --git a/tests-ui/tests/composables/maskeditor/useCanvasHistory.test.ts b/src/composables/maskeditor/useCanvasHistory.test.ts
similarity index 55%
rename from tests-ui/tests/composables/maskeditor/useCanvasHistory.test.ts
rename to src/composables/maskeditor/useCanvasHistory.test.ts
index 587b0347d6..2e96eda00c 100644
--- a/tests-ui/tests/composables/maskeditor/useCanvasHistory.test.ts
+++ b/src/composables/maskeditor/useCanvasHistory.test.ts
@@ -2,23 +2,70 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { nextTick } from 'vue'
 import { useCanvasHistory } from '@/composables/maskeditor/useCanvasHistory'
 
-let mockMaskCanvas: any
-let mockRgbCanvas: any
-let mockMaskCtx: any
-let mockRgbCtx: any
+// Define the store shape to avoid 'any' and cast to the expected type
+interface MaskEditorStoreState {
+  maskCanvas: HTMLCanvasElement | null
+  rgbCanvas: HTMLCanvasElement | null
+  imgCanvas: HTMLCanvasElement | null
+  maskCtx: CanvasRenderingContext2D | null
+  rgbCtx: CanvasRenderingContext2D | null
+  imgCtx: CanvasRenderingContext2D | null
+}
 
-const mockStore = {
-  maskCanvas: null as any,
-  rgbCanvas: null as any,
-  maskCtx: null as any,
-  rgbCtx: null as any
+// Use vi.hoisted to create isolated mock state container
+const mockRefs = vi.hoisted(() => ({
+  maskCanvas: null as HTMLCanvasElement | null,
+  rgbCanvas: null as HTMLCanvasElement | null,
+  imgCanvas: null as HTMLCanvasElement | null,
+  maskCtx: null as CanvasRenderingContext2D | null,
+  rgbCtx: null as CanvasRenderingContext2D | null,
+  imgCtx: null as CanvasRenderingContext2D | null
+}))
+
+const mockStore: MaskEditorStoreState = {
+  get maskCanvas() {
+    return mockRefs.maskCanvas
+  },
+  set maskCanvas(val) {
+    mockRefs.maskCanvas = val
+  },
+  get rgbCanvas() {
+    return mockRefs.rgbCanvas
+  },
+  set rgbCanvas(val) {
+    mockRefs.rgbCanvas = val
+  },
+  get imgCanvas() {
+    return mockRefs.imgCanvas
+  },
+  set imgCanvas(val) {
+    mockRefs.imgCanvas = val
+  },
+  get maskCtx() {
+    return mockRefs.maskCtx
+  },
+  set maskCtx(val) {
+    mockRefs.maskCtx = val
+  },
+  get rgbCtx() {
+    return mockRefs.rgbCtx
+  },
+  set rgbCtx(val) {
+    mockRefs.rgbCtx = val
+  },
+  get imgCtx() {
+    return mockRefs.imgCtx
+  },
+  set imgCtx(val) {
+    mockRefs.imgCtx = val
+  }
 }
 
 vi.mock('@/stores/maskEditorStore', () => ({
   useMaskEditorStore: vi.fn(() => mockStore)
 }))
 
-// Mock ImageBitmap for test environment
+// Mock ImageBitmap using safe global augmentation pattern
 if (typeof globalThis.ImageBitmap === 'undefined') {
   globalThis.ImageBitmap = class ImageBitmap {
     width: number
@@ -28,7 +75,7 @@ if (typeof globalThis.ImageBitmap === 'undefined') {
       this.height = height
     }
     close() {}
-  } as any
+  } as typeof ImageBitmap
 }
 
 describe('useCanvasHistory', () => {
@@ -43,9 +90,8 @@ describe('useCanvasHistory', () => {
         return rafCallCount
       }
     )
-    vi.stubGlobal('alert', () => {})
 
-    const createMockImageData = () => {
+    const createMockImageData = (): ImageData => {
       return {
         data: new Uint8ClampedArray(100 * 100 * 4),
         width: 100,
@@ -53,34 +99,43 @@ describe('useCanvasHistory', () => {
       } as ImageData
     }
 
-    mockMaskCtx = {
+    // Mock contexts using explicit partial-cast pattern
+    mockRefs.maskCtx = {
       getImageData: vi.fn(() => createMockImageData()),
       putImageData: vi.fn(),
       clearRect: vi.fn(),
       drawImage: vi.fn()
-    }
+    } as Partial<CanvasRenderingContext2D> as CanvasRenderingContext2D
 
-    mockRgbCtx = {
+    mockRefs.rgbCtx = {
       getImageData: vi.fn(() => createMockImageData()),
       putImageData: vi.fn(),
       clearRect: vi.fn(),
       drawImage: vi.fn()
-    }
+    } as Partial<CanvasRenderingContext2D> as CanvasRenderingContext2D
 
-    mockMaskCanvas = {
+    mockRefs.imgCtx = {
+      getImageData: vi.fn(() => createMockImageData()),
+      putImageData: vi.fn(),
+      clearRect: vi.fn(),
+      drawImage: vi.fn()
+    } as Partial<CanvasRenderingContext2D> as CanvasRenderingContext2D
+
+    // Mock canvases using explicit partial-cast pattern
+    mockRefs.maskCanvas = {
       width: 100,
       height: 100
-    }
+    } as Partial<HTMLCanvasElement> as HTMLCanvasElement
 
-    mockRgbCanvas = {
+    mockRefs.rgbCanvas = {
       width: 100,
       height: 100
-    }
+    } as Partial<HTMLCanvasElement> as HTMLCanvasElement
 
-    mockStore.maskCanvas = mockMaskCanvas
-    mockStore.rgbCanvas = mockRgbCanvas
-    mockStore.maskCtx = mockMaskCtx
-    mockStore.rgbCtx = mockRgbCtx
+    mockRefs.imgCanvas = {
+      width: 100,
+      height: 100
+    } as Partial<HTMLCanvasElement> as HTMLCanvasElement
   })
 
   describe('initialization', () => {
@@ -96,8 +151,14 @@ describe('useCanvasHistory', () => {
 
       history.saveInitialState()
 
-      expect(mockMaskCtx.getImageData).toHaveBeenCalledWith(0, 0, 100, 100)
-      expect(mockRgbCtx.getImageData).toHaveBeenCalledWith(0, 0, 100, 100)
+      expect(mockRefs.maskCtx!.getImageData).toHaveBeenCalledWith(
+        0,
+        0,
+        100,
+        100
+      )
+      expect(mockRefs.rgbCtx!.getImageData).toHaveBeenCalledWith(0, 0, 100, 100)
+      expect(mockRefs.imgCtx!.getImageData).toHaveBeenCalledWith(0, 0, 100, 100)
       expect(history.canUndo.value).toBe(false)
       expect(history.canRedo.value).toBe(false)
     })
@@ -105,27 +166,48 @@ describe('useCanvasHistory', () => {
     it('should wait for canvas to be ready', () => {
       const rafSpy = vi.spyOn(window, 'requestAnimationFrame')
 
-      mockStore.maskCanvas = { ...mockMaskCanvas, width: 0, height: 0 }
+      mockRefs.maskCanvas = {
+        // oxlint-disable-next-line no-misused-spread
+        ...mockRefs.maskCanvas,
+        width: 0,
+        height: 0
+      } as Partial<HTMLCanvasElement> as HTMLCanvasElement
 
       const history = useCanvasHistory()
       history.saveInitialState()
 
       expect(rafSpy).toHaveBeenCalled()
 
-      mockStore.maskCanvas = mockMaskCanvas
+      mockRefs.maskCanvas = {
+        width: 100,
+        height: 100
+      } as Partial<HTMLCanvasElement> as HTMLCanvasElement
     })
 
     it('should wait for context to be ready', () => {
       const rafSpy = vi.spyOn(window, 'requestAnimationFrame')
 
-      mockStore.maskCtx = null
+      mockRefs.maskCtx = null
 
       const history = useCanvasHistory()
       history.saveInitialState()
 
       expect(rafSpy).toHaveBeenCalled()
 
-      mockStore.maskCtx = mockMaskCtx
+      const createMockImageData = (): ImageData => {
+        return {
+          data: new Uint8ClampedArray(100 * 100 * 4),
+          width: 100,
+          height: 100
+        } as ImageData
+      }
+
+      mockRefs.maskCtx = {
+        getImageData: vi.fn(() => createMockImageData()),
+        putImageData: vi.fn(),
+        clearRect: vi.fn(),
+        drawImage: vi.fn()
+      } as Partial<CanvasRenderingContext2D> as CanvasRenderingContext2D
     })
   })
 
@@ -134,13 +216,20 @@ describe('useCanvasHistory', () => {
       const history = useCanvasHistory()
 
       history.saveInitialState()
-      mockMaskCtx.getImageData.mockClear()
-      mockRgbCtx.getImageData.mockClear()
+      vi.mocked(mockRefs.maskCtx!.getImageData).mockClear()
+      vi.mocked(mockRefs.rgbCtx!.getImageData).mockClear()
+      vi.mocked(mockRefs.imgCtx!.getImageData).mockClear()
 
       history.saveState()
 
-      expect(mockMaskCtx.getImageData).toHaveBeenCalledWith(0, 0, 100, 100)
-      expect(mockRgbCtx.getImageData).toHaveBeenCalledWith(0, 0, 100, 100)
+      expect(mockRefs.maskCtx!.getImageData).toHaveBeenCalledWith(
+        0,
+        0,
+        100,
+        100
+      )
+      expect(mockRefs.rgbCtx!.getImageData).toHaveBeenCalledWith(0, 0, 100, 100)
+      expect(mockRefs.imgCtx!.getImageData).toHaveBeenCalledWith(0, 0, 100, 100)
       expect(history.canUndo.value).toBe(true)
     })
 
@@ -184,8 +273,9 @@ describe('useCanvasHistory', () => {
 
       history.saveState()
 
-      expect(mockMaskCtx.getImageData).toHaveBeenCalled()
-      expect(mockRgbCtx.getImageData).toHaveBeenCalled()
+      expect(mockRefs.maskCtx!.getImageData).toHaveBeenCalled()
+      expect(mockRefs.rgbCtx!.getImageData).toHaveBeenCalled()
+      expect(mockRefs.imgCtx!.getImageData).toHaveBeenCalled()
     })
 
     it('should not save state if context is missing', () => {
@@ -193,15 +283,17 @@ describe('useCanvasHistory', () => {
 
       history.saveInitialState()
 
-      mockStore.maskCtx = null
-      mockMaskCtx.getImageData.mockClear()
-      mockRgbCtx.getImageData.mockClear()
+      const savedMaskCtx = mockRefs.maskCtx
+      mockRefs.maskCtx = null
+      vi.mocked(savedMaskCtx!.getImageData).mockClear()
+      vi.mocked(mockRefs.rgbCtx!.getImageData).mockClear()
+      vi.mocked(mockRefs.imgCtx!.getImageData).mockClear()
 
       history.saveState()
 
-      expect(mockMaskCtx.getImageData).not.toHaveBeenCalled()
+      expect(savedMaskCtx!.getImageData).not.toHaveBeenCalled()
 
-      mockStore.maskCtx = mockMaskCtx
+      mockRefs.maskCtx = savedMaskCtx
     })
   })
 
@@ -214,20 +306,27 @@ describe('useCanvasHistory', () => {
 
       history.undo()
 
-      expect(mockMaskCtx.putImageData).toHaveBeenCalled()
-      expect(mockRgbCtx.putImageData).toHaveBeenCalled()
+      expect(mockRefs.maskCtx!.putImageData).toHaveBeenCalled()
+      expect(mockRefs.rgbCtx!.putImageData).toHaveBeenCalled()
+      expect(mockRefs.imgCtx!.putImageData).toHaveBeenCalled()
       expect(history.canUndo.value).toBe(false)
       expect(history.canRedo.value).toBe(true)
     })
 
-    it('should show alert when no undo states available', () => {
-      const alertSpy = vi.spyOn(window, 'alert')
+    it('should not undo when no undo states available', () => {
       const history = useCanvasHistory()
 
       history.saveInitialState()
+
+      vi.mocked(mockRefs.maskCtx!.putImageData).mockClear()
+      vi.mocked(mockRefs.rgbCtx!.putImageData).mockClear()
+      vi.mocked(mockRefs.imgCtx!.putImageData).mockClear()
+
       history.undo()
 
-      expect(alertSpy).toHaveBeenCalledWith('No more undo states available')
+      expect(mockRefs.maskCtx!.putImageData).not.toHaveBeenCalled()
+      expect(mockRefs.rgbCtx!.putImageData).not.toHaveBeenCalled()
+      expect(mockRefs.imgCtx!.putImageData).not.toHaveBeenCalled()
     })
 
     it('should undo multiple times', () => {
@@ -249,16 +348,22 @@ describe('useCanvasHistory', () => {
     })
 
     it('should not undo beyond first state', () => {
-      const alertSpy = vi.spyOn(window, 'alert')
       const history = useCanvasHistory()
 
       history.saveInitialState()
       history.saveState()
 
       history.undo()
+
+      vi.mocked(mockRefs.maskCtx!.putImageData).mockClear()
+      vi.mocked(mockRefs.rgbCtx!.putImageData).mockClear()
+      vi.mocked(mockRefs.imgCtx!.putImageData).mockClear()
+
       history.undo()
 
-      expect(alertSpy).toHaveBeenCalled()
+      expect(mockRefs.maskCtx!.putImageData).not.toHaveBeenCalled()
+      expect(mockRefs.rgbCtx!.putImageData).not.toHaveBeenCalled()
+      expect(mockRefs.imgCtx!.putImageData).not.toHaveBeenCalled()
     })
   })
 
@@ -270,25 +375,33 @@ describe('useCanvasHistory', () => {
       history.saveState()
       history.undo()
 
-      mockMaskCtx.putImageData.mockClear()
-      mockRgbCtx.putImageData.mockClear()
+      vi.mocked(mockRefs.maskCtx!.putImageData).mockClear()
+      vi.mocked(mockRefs.rgbCtx!.putImageData).mockClear()
+      vi.mocked(mockRefs.imgCtx!.putImageData).mockClear()
 
       history.redo()
 
-      expect(mockMaskCtx.putImageData).toHaveBeenCalled()
-      expect(mockRgbCtx.putImageData).toHaveBeenCalled()
+      expect(mockRefs.maskCtx!.putImageData).toHaveBeenCalled()
+      expect(mockRefs.rgbCtx!.putImageData).toHaveBeenCalled()
+      expect(mockRefs.imgCtx!.putImageData).toHaveBeenCalled()
       expect(history.canRedo.value).toBe(false)
       expect(history.canUndo.value).toBe(true)
     })
 
-    it('should show alert when no redo states available', () => {
-      const alertSpy = vi.spyOn(window, 'alert')
+    it('should not redo when no redo states available', () => {
       const history = useCanvasHistory()
 
       history.saveInitialState()
+
+      vi.mocked(mockRefs.maskCtx!.putImageData).mockClear()
+      vi.mocked(mockRefs.rgbCtx!.putImageData).mockClear()
+      vi.mocked(mockRefs.imgCtx!.putImageData).mockClear()
+
       history.redo()
 
-      expect(alertSpy).toHaveBeenCalledWith('No more redo states available')
+      expect(mockRefs.maskCtx!.putImageData).not.toHaveBeenCalled()
+      expect(mockRefs.rgbCtx!.putImageData).not.toHaveBeenCalled()
+      expect(mockRefs.imgCtx!.putImageData).not.toHaveBeenCalled()
     })
 
     it('should redo multiple times', () => {
@@ -314,7 +427,6 @@ describe('useCanvasHistory', () => {
     })
 
     it('should not redo beyond last state', () => {
-      const alertSpy = vi.spyOn(window, 'alert')
       const history = useCanvasHistory()
 
       history.saveInitialState()
@@ -322,9 +434,16 @@ describe('useCanvasHistory', () => {
       history.undo()
 
       history.redo()
+
+      vi.mocked(mockRefs.maskCtx!.putImageData).mockClear()
+      vi.mocked(mockRefs.rgbCtx!.putImageData).mockClear()
+      vi.mocked(mockRefs.imgCtx!.putImageData).mockClear()
+
       history.redo()
 
-      expect(alertSpy).toHaveBeenCalled()
+      expect(mockRefs.maskCtx!.putImageData).not.toHaveBeenCalled()
+      expect(mockRefs.rgbCtx!.putImageData).not.toHaveBeenCalled()
+      expect(mockRefs.imgCtx!.putImageData).not.toHaveBeenCalled()
     })
   })
 
@@ -348,13 +467,15 @@ describe('useCanvasHistory', () => {
       history.saveInitialState()
       history.clearStates()
 
-      mockMaskCtx.getImageData.mockClear()
-      mockRgbCtx.getImageData.mockClear()
+      vi.mocked(mockRefs.maskCtx!.getImageData).mockClear()
+      vi.mocked(mockRefs.rgbCtx!.getImageData).mockClear()
+      vi.mocked(mockRefs.imgCtx!.getImageData).mockClear()
 
       history.saveInitialState()
 
-      expect(mockMaskCtx.getImageData).toHaveBeenCalled()
-      expect(mockRgbCtx.getImageData).toHaveBeenCalled()
+      expect(mockRefs.maskCtx!.getImageData).toHaveBeenCalled()
+      expect(mockRefs.rgbCtx!.getImageData).toHaveBeenCalled()
+      expect(mockRefs.imgCtx!.getImageData).toHaveBeenCalled()
     })
   })
 
@@ -446,15 +567,17 @@ describe('useCanvasHistory', () => {
       history.saveInitialState()
       history.saveState()
 
-      mockStore.maskCtx = null
-      mockMaskCtx.putImageData.mockClear()
-      mockRgbCtx.putImageData.mockClear()
+      const savedMaskCtx = mockRefs.maskCtx
+      mockRefs.maskCtx = null
+      vi.mocked(savedMaskCtx!.putImageData).mockClear()
+      vi.mocked(mockRefs.rgbCtx!.putImageData).mockClear()
+      vi.mocked(mockRefs.imgCtx!.putImageData).mockClear()
 
       history.undo()
 
-      expect(mockMaskCtx.putImageData).not.toHaveBeenCalled()
+      expect(savedMaskCtx!.putImageData).not.toHaveBeenCalled()
 
-      mockStore.maskCtx = mockMaskCtx
+      mockRefs.maskCtx = savedMaskCtx
     })
   })
 
@@ -499,8 +622,12 @@ describe('useCanvasHistory', () => {
     })
 
     it('should handle zero-sized canvas', () => {
-      mockMaskCanvas.width = 0
-      mockMaskCanvas.height = 0
+      if (mockRefs.maskCanvas) {
+        mockRefs.maskCanvas = {
+          width: 0,
+          height: 0
+        } as Partial<HTMLCanvasElement> as HTMLCanvasElement
+      }
 
       const history = useCanvasHistory()
 
diff --git a/src/composables/maskeditor/useCanvasHistory.ts b/src/composables/maskeditor/useCanvasHistory.ts
index 122e888c77..a7c3945307 100644
--- a/src/composables/maskeditor/useCanvasHistory.ts
+++ b/src/composables/maskeditor/useCanvasHistory.ts
@@ -1,12 +1,17 @@
 import { ref, computed } from 'vue'
 import { useMaskEditorStore } from '@/stores/maskEditorStore'
 
+// Define the state interface for better readability
+interface CanvasState {
+  mask: ImageData | ImageBitmap
+  rgb: ImageData | ImageBitmap
+  img: ImageData | ImageBitmap
+}
+
 export function useCanvasHistory(maxStates = 20) {
   const store = useMaskEditorStore()
 
-  const states = ref<
-    { mask: ImageData | ImageBitmap; rgb: ImageData | ImageBitmap }[]
-  >([])
+  const states = ref<CanvasState[]>([])
   const currentStateIndex = ref(-1)
   const initialized = ref(false)
 
@@ -22,22 +27,29 @@ export function useCanvasHistory(maxStates = 20) {
   })
 
   const saveInitialState = () => {
-    const maskCtx = store.maskCtx
-    const rgbCtx = store.rgbCtx
-    const maskCanvas = store.maskCanvas
-    const rgbCanvas = store.rgbCanvas
+    const { maskCtx, rgbCtx, imgCtx, maskCanvas, rgbCanvas, imgCanvas } = store
 
-    if (!maskCtx || !rgbCtx || !maskCanvas || !rgbCanvas) {
+    // Ensure all 3 contexts and canvases are ready
+    if (
+      !maskCtx ||
+      !rgbCtx ||
+      !imgCtx ||
+      !maskCanvas ||
+      !rgbCanvas ||
+      !imgCanvas
+    ) {
       requestAnimationFrame(saveInitialState)
       return
     }
 
-    if (!maskCanvas.width || !rgbCanvas.width) {
+    if (!maskCanvas.width || !rgbCanvas.width || !imgCanvas.width) {
       requestAnimationFrame(saveInitialState)
       return
     }
 
     states.value = []
+
+    // Capture all three layers
     const maskState = maskCtx.getImageData(
       0,
       0,
@@ -50,35 +62,51 @@ export function useCanvasHistory(maxStates = 20) {
       rgbCanvas.width,
       rgbCanvas.height
     )
-    states.value.push({ mask: maskState, rgb: rgbState })
+    const imgState = imgCtx.getImageData(
+      0,
+      0,
+      imgCanvas.width,
+      imgCanvas.height
+    )
+
+    states.value.push({ mask: maskState, rgb: rgbState, img: imgState })
     currentStateIndex.value = 0
     initialized.value = true
   }
 
   const saveState = (
     providedMaskData?: ImageData | ImageBitmap,
-    providedRgbData?: ImageData | ImageBitmap
+    providedRgbData?: ImageData | ImageBitmap,
+    providedImgData?: ImageData | ImageBitmap
   ) => {
-    const maskCtx = store.maskCtx
-    const rgbCtx = store.rgbCtx
-    const maskCanvas = store.maskCanvas
-    const rgbCanvas = store.rgbCanvas
+    const { maskCtx, rgbCtx, imgCtx, maskCanvas, rgbCanvas, imgCanvas } = store
 
-    if (!maskCtx || !rgbCtx || !maskCanvas || !rgbCanvas) return
+    if (
+      !maskCtx ||
+      !rgbCtx ||
+      !imgCtx ||
+      !maskCanvas ||
+      !rgbCanvas ||
+      !imgCanvas
+    )
+      return
 
     if (!initialized.value || currentStateIndex.value === -1) {
       saveInitialState()
       return
     }
 
+    // Clear redo history
     states.value = states.value.slice(0, currentStateIndex.value + 1)
 
     let maskState: ImageData | ImageBitmap
     let rgbState: ImageData | ImageBitmap
+    let imgState: ImageData | ImageBitmap
 
-    if (providedMaskData && providedRgbData) {
+    if (providedMaskData && providedRgbData && providedImgData) {
       maskState = providedMaskData
       rgbState = providedRgbData
+      imgState = providedImgData
     } else {
       maskState = maskCtx.getImageData(
         0,
@@ -87,71 +115,84 @@ export function useCanvasHistory(maxStates = 20) {
         maskCanvas.height
       )
       rgbState = rgbCtx.getImageData(0, 0, rgbCanvas.width, rgbCanvas.height)
+      imgState = imgCtx.getImageData(0, 0, imgCanvas.width, imgCanvas.height)
     }
 
-    states.value.push({ mask: maskState, rgb: rgbState })
+    states.value.push({ mask: maskState, rgb: rgbState, img: imgState })
     currentStateIndex.value++
 
+    // Maintain max history size and clean up memory
     if (states.value.length > maxStates) {
       const removed = states.value.shift()
-      // Cleanup ImageBitmaps to avoid memory leaks
       if (removed) {
-        if (removed.mask instanceof ImageBitmap) removed.mask.close()
-        if (removed.rgb instanceof ImageBitmap) removed.rgb.close()
+        cleanupState(removed)
       }
       currentStateIndex.value--
     }
   }
 
   const undo = () => {
-    if (!canUndo.value) {
-      alert('No more undo states available')
-      return
-    }
-
+    if (!canUndo.value) return
     currentStateIndex.value--
     restoreState(states.value[currentStateIndex.value])
   }
 
   const redo = () => {
-    if (!canRedo.value) {
-      alert('No more redo states available')
-      return
-    }
-
+    if (!canRedo.value) return
     currentStateIndex.value++
     restoreState(states.value[currentStateIndex.value])
   }
 
-  const restoreState = (state: {
-    mask: ImageData | ImageBitmap
-    rgb: ImageData | ImageBitmap
-  }) => {
-    const maskCtx = store.maskCtx
-    const rgbCtx = store.rgbCtx
-    if (!maskCtx || !rgbCtx) return
+  const restoreState = (state: CanvasState) => {
+    const { maskCtx, rgbCtx, imgCtx, maskCanvas, rgbCanvas, imgCanvas } = store
+    if (
+      !maskCtx ||
+      !rgbCtx ||
+      !imgCtx ||
+      !maskCanvas ||
+      !rgbCanvas ||
+      !imgCanvas
+    )
+      return
 
-    if (state.mask instanceof ImageBitmap) {
-      maskCtx.clearRect(0, 0, state.mask.width, state.mask.height)
-      maskCtx.drawImage(state.mask, 0, 0)
-    } else {
-      maskCtx.putImageData(state.mask, 0, 0)
+    // Update canvas dimensions to match state (handles rotation undo/redo)
+    const refData = state.mask
+    const newWidth = refData.width
+    const newHeight = refData.height
+
+    if (maskCanvas.width !== newWidth || maskCanvas.height !== newHeight) {
+      maskCanvas.width = newWidth
+      maskCanvas.height = newHeight
+      rgbCanvas.width = newWidth
+      rgbCanvas.height = newHeight
+      imgCanvas.width = newWidth
+      imgCanvas.height = newHeight
     }
 
-    if (state.rgb instanceof ImageBitmap) {
-      rgbCtx.clearRect(0, 0, state.rgb.width, state.rgb.height)
-      rgbCtx.drawImage(state.rgb, 0, 0)
-    } else {
-      rgbCtx.putImageData(state.rgb, 0, 0)
-    }
+    const layers = [
+      { ctx: maskCtx, data: state.mask },
+      { ctx: rgbCtx, data: state.rgb },
+      { ctx: imgCtx, data: state.img }
+    ]
+
+    layers.forEach(({ ctx, data }) => {
+      if (data instanceof ImageBitmap) {
+        ctx.clearRect(0, 0, data.width, data.height)
+        ctx.drawImage(data, 0, 0)
+      } else {
+        ctx.putImageData(data, 0, 0)
+      }
+    })
+  }
+
+  const cleanupState = (state: CanvasState) => {
+    if (state.mask instanceof ImageBitmap) state.mask.close()
+    if (state.rgb instanceof ImageBitmap) state.rgb.close()
+    if (state.img instanceof ImageBitmap) state.img.close()
   }
 
   const clearStates = () => {
-    // Cleanup bitmaps
-    states.value.forEach((state) => {
-      if (state.mask instanceof ImageBitmap) state.mask.close()
-      if (state.rgb instanceof ImageBitmap) state.rgb.close()
-    })
+    states.value.forEach(cleanupState)
     states.value = []
     currentStateIndex.value = -1
     initialized.value = false
diff --git a/tests-ui/tests/composables/maskeditor/useCanvasManager.test.ts b/src/composables/maskeditor/useCanvasManager.test.ts
similarity index 87%
rename from tests-ui/tests/composables/maskeditor/useCanvasManager.test.ts
rename to src/composables/maskeditor/useCanvasManager.test.ts
index 4fe40df6e9..48e1bf7b4e 100644
--- a/tests-ui/tests/composables/maskeditor/useCanvasManager.test.ts
+++ b/src/composables/maskeditor/useCanvasManager.test.ts
@@ -3,13 +3,13 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { MaskBlendMode } from '@/extensions/core/maskeditor/types'
 import { useCanvasManager } from '@/composables/maskeditor/useCanvasManager'
 const mockStore = {
-  imgCanvas: null as any,
-  maskCanvas: null as any,
-  rgbCanvas: null as any,
-  imgCtx: null as any,
-  maskCtx: null as any,
-  rgbCtx: null as any,
-  canvasBackground: null as any,
+  imgCanvas: null! as HTMLCanvasElement,
+  maskCanvas: null! as HTMLCanvasElement,
+  rgbCanvas: null! as HTMLCanvasElement,
+  imgCtx: null! as CanvasRenderingContext2D,
+  maskCtx: null! as CanvasRenderingContext2D,
+  rgbCtx: null! as CanvasRenderingContext2D,
+  canvasBackground: null! as HTMLElement,
   maskColor: { r: 0, g: 0, b: 0 },
   maskBlendMode: MaskBlendMode.Black,
   maskOpacity: 0.8
@@ -38,26 +38,30 @@ describe('useCanvasManager', () => {
       height: 100
     } as ImageData
 
-    mockStore.imgCtx = {
+    const partialImgCtx: Partial<CanvasRenderingContext2D> = {
       drawImage: vi.fn()
     }
+    mockStore.imgCtx = partialImgCtx as CanvasRenderingContext2D
 
-    mockStore.maskCtx = {
+    const partialMaskCtx: Partial<CanvasRenderingContext2D> = {
       drawImage: vi.fn(),
       getImageData: vi.fn(() => mockImageData),
       putImageData: vi.fn(),
       globalCompositeOperation: 'source-over',
       fillStyle: ''
     }
+    mockStore.maskCtx = partialMaskCtx as CanvasRenderingContext2D
 
-    mockStore.rgbCtx = {
+    const partialRgbCtx: Partial<CanvasRenderingContext2D> = {
       drawImage: vi.fn()
     }
+    mockStore.rgbCtx = partialRgbCtx as CanvasRenderingContext2D
 
-    mockStore.imgCanvas = {
+    const partialImgCanvas: Partial<HTMLCanvasElement> = {
       width: 0,
       height: 0
     }
+    mockStore.imgCanvas = partialImgCanvas as HTMLCanvasElement
 
     mockStore.maskCanvas = {
       width: 0,
@@ -65,19 +69,19 @@ describe('useCanvasManager', () => {
       style: {
         mixBlendMode: '',
         opacity: ''
-      }
-    }
+      } as Pick<CSSStyleDeclaration, 'mixBlendMode' | 'opacity'>
+    } as HTMLCanvasElement
 
     mockStore.rgbCanvas = {
       width: 0,
       height: 0
-    }
+    } as HTMLCanvasElement
 
     mockStore.canvasBackground = {
       style: {
         backgroundColor: ''
-      }
-    }
+      } as Pick<CSSStyleDeclaration, 'backgroundColor'>
+    } as HTMLElement
 
     mockStore.maskColor = { r: 0, g: 0, b: 0 }
     mockStore.maskBlendMode = MaskBlendMode.Black
@@ -163,7 +167,7 @@ describe('useCanvasManager', () => {
     it('should throw error when canvas missing', async () => {
       const manager = useCanvasManager()
 
-      mockStore.imgCanvas = null
+      mockStore.imgCanvas = null! as HTMLCanvasElement
 
       const origImage = createMockImage(512, 512)
       const maskImage = createMockImage(512, 512)
@@ -176,7 +180,7 @@ describe('useCanvasManager', () => {
     it('should throw error when context missing', async () => {
       const manager = useCanvasManager()
 
-      mockStore.imgCtx = null
+      mockStore.imgCtx = null! as CanvasRenderingContext2D
 
       const origImage = createMockImage(512, 512)
       const maskImage = createMockImage(512, 512)
@@ -259,7 +263,7 @@ describe('useCanvasManager', () => {
     it('should return early when canvas missing', async () => {
       const manager = useCanvasManager()
 
-      mockStore.maskCanvas = null
+      mockStore.maskCanvas = null! as HTMLCanvasElement
 
       await manager.updateMaskColor()
 
@@ -269,7 +273,7 @@ describe('useCanvasManager', () => {
     it('should return early when context missing', async () => {
       const manager = useCanvasManager()
 
-      mockStore.maskCtx = null
+      mockStore.maskCtx = null! as CanvasRenderingContext2D
 
       await manager.updateMaskColor()
 
diff --git a/tests-ui/tests/composables/maskeditor/useCanvasTools.test.ts b/src/composables/maskeditor/useCanvasTools.test.ts
similarity index 75%
rename from tests-ui/tests/composables/maskeditor/useCanvasTools.test.ts
rename to src/composables/maskeditor/useCanvasTools.test.ts
index 991d19c00c..17a46f8b61 100644
--- a/tests-ui/tests/composables/maskeditor/useCanvasTools.test.ts
+++ b/src/composables/maskeditor/useCanvasTools.test.ts
@@ -4,17 +4,37 @@ import { ColorComparisonMethod } from '@/extensions/core/maskeditor/types'
 
 import { useCanvasTools } from '@/composables/maskeditor/useCanvasTools'
 
+// Mock store interface matching the real store's nullable fields
+interface MockMaskEditorStore {
+  maskCtx: CanvasRenderingContext2D | null
+  imgCtx: CanvasRenderingContext2D | null
+  maskCanvas: HTMLCanvasElement | null
+  imgCanvas: HTMLCanvasElement | null
+  rgbCtx: CanvasRenderingContext2D | null
+  rgbCanvas: HTMLCanvasElement | null
+  maskColor: { r: number; g: number; b: number }
+  paintBucketTolerance: number
+  fillOpacity: number
+  colorSelectTolerance: number
+  colorComparisonMethod: ColorComparisonMethod
+  selectionOpacity: number
+  applyWholeImage: boolean
+  maskBoundary: boolean
+  maskTolerance: number
+  canvasHistory: { saveState: ReturnType<typeof vi.fn> }
+}
+
 const mockCanvasHistory = {
   saveState: vi.fn()
 }
 
-const mockStore = {
-  maskCtx: null as any,
-  imgCtx: null as any,
-  maskCanvas: null as any,
-  imgCanvas: null as any,
-  rgbCtx: null as any,
-  rgbCanvas: null as any,
+const mockStore: MockMaskEditorStore = {
+  maskCtx: null,
+  imgCtx: null,
+  maskCanvas: null,
+  imgCanvas: null,
+  rgbCtx: null,
+  rgbCanvas: null,
   maskColor: { r: 255, g: 255, b: 255 },
   paintBucketTolerance: 10,
   fillOpacity: 100,
@@ -57,34 +77,40 @@ describe('useCanvasTools', () => {
       mockImgImageData.data[i + 3] = 255
     }
 
-    mockStore.maskCtx = {
+    const partialMaskCtx: Partial<CanvasRenderingContext2D> = {
       getImageData: vi.fn(() => mockMaskImageData),
       putImageData: vi.fn(),
       clearRect: vi.fn()
     }
+    mockStore.maskCtx = partialMaskCtx as CanvasRenderingContext2D
 
-    mockStore.imgCtx = {
+    const partialImgCtx: Partial<CanvasRenderingContext2D> = {
       getImageData: vi.fn(() => mockImgImageData)
     }
+    mockStore.imgCtx = partialImgCtx as CanvasRenderingContext2D
 
-    mockStore.rgbCtx = {
+    const partialRgbCtx: Partial<CanvasRenderingContext2D> = {
       clearRect: vi.fn()
     }
+    mockStore.rgbCtx = partialRgbCtx as CanvasRenderingContext2D
 
-    mockStore.maskCanvas = {
+    const partialMaskCanvas: Partial<HTMLCanvasElement> = {
       width: 100,
       height: 100
     }
+    mockStore.maskCanvas = partialMaskCanvas as HTMLCanvasElement
 
-    mockStore.imgCanvas = {
+    const partialImgCanvas: Partial<HTMLCanvasElement> = {
       width: 100,
       height: 100
     }
+    mockStore.imgCanvas = partialImgCanvas as HTMLCanvasElement
 
-    mockStore.rgbCanvas = {
+    const partialRgbCanvas: Partial<HTMLCanvasElement> = {
       width: 100,
       height: 100
     }
+    mockStore.rgbCanvas = partialRgbCanvas as HTMLCanvasElement
 
     mockStore.maskColor = { r: 255, g: 255, b: 255 }
     mockStore.paintBucketTolerance = 10
@@ -103,13 +129,13 @@ describe('useCanvasTools', () => {
 
       tools.paintBucketFill({ x: 50, y: 50 })
 
-      expect(mockStore.maskCtx.getImageData).toHaveBeenCalledWith(
+      expect(mockStore.maskCtx!.getImageData).toHaveBeenCalledWith(
         0,
         0,
         100,
         100
       )
-      expect(mockStore.maskCtx.putImageData).toHaveBeenCalledWith(
+      expect(mockStore.maskCtx!.putImageData).toHaveBeenCalledWith(
         mockMaskImageData,
         0,
         0
@@ -154,7 +180,7 @@ describe('useCanvasTools', () => {
 
       tools.paintBucketFill({ x: -1, y: 50 })
 
-      expect(mockStore.maskCtx.putImageData).not.toHaveBeenCalled()
+      expect(mockStore.maskCtx!.putImageData).not.toHaveBeenCalled()
     })
 
     it('should return early when canvas missing', () => {
@@ -164,7 +190,7 @@ describe('useCanvasTools', () => {
 
       tools.paintBucketFill({ x: 50, y: 50 })
 
-      expect(mockStore.maskCtx.getImageData).not.toHaveBeenCalled()
+      expect(mockStore.maskCtx?.getImageData).not.toHaveBeenCalled()
     })
 
     it('should apply fill opacity', () => {
@@ -198,14 +224,19 @@ describe('useCanvasTools', () => {
 
       await tools.colorSelectFill({ x: 50, y: 50 })
 
-      expect(mockStore.maskCtx.getImageData).toHaveBeenCalledWith(
+      expect(mockStore.maskCtx!.getImageData).toHaveBeenCalledWith(
         0,
         0,
         100,
         100
       )
-      expect(mockStore.imgCtx.getImageData).toHaveBeenCalledWith(0, 0, 100, 100)
-      expect(mockStore.maskCtx.putImageData).toHaveBeenCalled()
+      expect(mockStore.imgCtx!.getImageData).toHaveBeenCalledWith(
+        0,
+        0,
+        100,
+        100
+      )
+      expect(mockStore.maskCtx!.putImageData).toHaveBeenCalled()
       expect(mockCanvasHistory.saveState).toHaveBeenCalled()
     })
 
@@ -216,7 +247,7 @@ describe('useCanvasTools', () => {
 
       await tools.colorSelectFill({ x: 50, y: 50 })
 
-      expect(mockStore.maskCtx.putImageData).toHaveBeenCalled()
+      expect(mockStore.maskCtx!.putImageData).toHaveBeenCalled()
     })
 
     it('should respect color tolerance', async () => {
@@ -239,7 +270,7 @@ describe('useCanvasTools', () => {
 
       await tools.colorSelectFill({ x: -1, y: 50 })
 
-      expect(mockStore.maskCtx.putImageData).not.toHaveBeenCalled()
+      expect(mockStore.maskCtx!.putImageData).not.toHaveBeenCalled()
     })
 
     it('should return early when canvas missing', async () => {
@@ -249,7 +280,7 @@ describe('useCanvasTools', () => {
 
       await tools.colorSelectFill({ x: 50, y: 50 })
 
-      expect(mockStore.maskCtx.getImageData).not.toHaveBeenCalled()
+      expect(mockStore.maskCtx?.getImageData).not.toHaveBeenCalled()
     })
 
     it('should apply selection opacity', async () => {
@@ -270,7 +301,7 @@ describe('useCanvasTools', () => {
 
       await tools.colorSelectFill({ x: 50, y: 50 })
 
-      expect(mockStore.maskCtx.putImageData).toHaveBeenCalled()
+      expect(mockStore.maskCtx!.putImageData).toHaveBeenCalled()
     })
 
     it('should use LAB color comparison method', async () => {
@@ -280,7 +311,7 @@ describe('useCanvasTools', () => {
 
       await tools.colorSelectFill({ x: 50, y: 50 })
 
-      expect(mockStore.maskCtx.putImageData).toHaveBeenCalled()
+      expect(mockStore.maskCtx!.putImageData).toHaveBeenCalled()
     })
 
     it('should respect mask boundary', async () => {
@@ -295,7 +326,7 @@ describe('useCanvasTools', () => {
 
       await tools.colorSelectFill({ x: 50, y: 50 })
 
-      expect(mockStore.maskCtx.putImageData).toHaveBeenCalled()
+      expect(mockStore.maskCtx!.putImageData).toHaveBeenCalled()
     })
 
     it('should update last color select point', async () => {
@@ -303,7 +334,7 @@ describe('useCanvasTools', () => {
 
       await tools.colorSelectFill({ x: 30, y: 40 })
 
-      expect(mockStore.maskCtx.putImageData).toHaveBeenCalled()
+      expect(mockStore.maskCtx!.putImageData).toHaveBeenCalled()
     })
   })
 
@@ -320,13 +351,13 @@ describe('useCanvasTools', () => {
 
       tools.invertMask()
 
-      expect(mockStore.maskCtx.getImageData).toHaveBeenCalledWith(
+      expect(mockStore.maskCtx!.getImageData).toHaveBeenCalledWith(
         0,
         0,
         100,
         100
       )
-      expect(mockStore.maskCtx.putImageData).toHaveBeenCalledWith(
+      expect(mockStore.maskCtx!.putImageData).toHaveBeenCalledWith(
         mockMaskImageData,
         0,
         0
@@ -369,7 +400,7 @@ describe('useCanvasTools', () => {
 
       tools.invertMask()
 
-      expect(mockStore.maskCtx.getImageData).not.toHaveBeenCalled()
+      expect(mockStore.maskCtx?.getImageData).not.toHaveBeenCalled()
     })
 
     it('should return early when context missing', () => {
@@ -389,8 +420,8 @@ describe('useCanvasTools', () => {
 
       tools.clearMask()
 
-      expect(mockStore.maskCtx.clearRect).toHaveBeenCalledWith(0, 0, 100, 100)
-      expect(mockStore.rgbCtx.clearRect).toHaveBeenCalledWith(0, 0, 100, 100)
+      expect(mockStore.maskCtx!.clearRect).toHaveBeenCalledWith(0, 0, 100, 100)
+      expect(mockStore.rgbCtx!.clearRect).toHaveBeenCalledWith(0, 0, 100, 100)
       expect(mockCanvasHistory.saveState).toHaveBeenCalled()
     })
 
@@ -401,7 +432,7 @@ describe('useCanvasTools', () => {
 
       tools.clearMask()
 
-      expect(mockStore.maskCtx.clearRect).not.toHaveBeenCalled()
+      expect(mockStore.maskCtx?.clearRect).not.toHaveBeenCalled()
       expect(mockCanvasHistory.saveState).toHaveBeenCalled()
     })
 
@@ -412,8 +443,8 @@ describe('useCanvasTools', () => {
 
       tools.clearMask()
 
-      expect(mockStore.maskCtx.clearRect).toHaveBeenCalledWith(0, 0, 100, 100)
-      expect(mockStore.rgbCtx.clearRect).not.toHaveBeenCalled()
+      expect(mockStore.maskCtx?.clearRect).toHaveBeenCalledWith(0, 0, 100, 100)
+      expect(mockStore.rgbCtx?.clearRect).not.toHaveBeenCalled()
       expect(mockCanvasHistory.saveState).toHaveBeenCalled()
     })
   })
@@ -426,26 +457,26 @@ describe('useCanvasTools', () => {
 
       tools.clearLastColorSelectPoint()
 
-      expect(mockStore.maskCtx.putImageData).toHaveBeenCalled()
+      expect(mockStore.maskCtx!.putImageData).toHaveBeenCalled()
     })
   })
 
   describe('edge cases', () => {
     it('should handle small canvas', () => {
-      mockStore.maskCanvas.width = 1
-      mockStore.maskCanvas.height = 1
+      mockStore.maskCanvas!.width = 1
+      mockStore.maskCanvas!.height = 1
       mockMaskImageData = {
         data: new Uint8ClampedArray(1 * 1 * 4),
         width: 1,
         height: 1
       } as ImageData
-      mockStore.maskCtx.getImageData = vi.fn(() => mockMaskImageData)
+      mockStore.maskCtx!.getImageData = vi.fn(() => mockMaskImageData)
 
       const tools = useCanvasTools()
 
       tools.paintBucketFill({ x: 0, y: 0 })
 
-      expect(mockStore.maskCtx.putImageData).toHaveBeenCalled()
+      expect(mockStore.maskCtx!.putImageData).toHaveBeenCalled()
     })
 
     it('should handle fractional coordinates', () => {
@@ -453,7 +484,7 @@ describe('useCanvasTools', () => {
 
       tools.paintBucketFill({ x: 50.7, y: 50.3 })
 
-      expect(mockStore.maskCtx.putImageData).toHaveBeenCalled()
+      expect(mockStore.maskCtx!.putImageData).toHaveBeenCalled()
     })
 
     it('should handle maximum tolerance', () => {
@@ -463,7 +494,7 @@ describe('useCanvasTools', () => {
 
       tools.paintBucketFill({ x: 50, y: 50 })
 
-      expect(mockStore.maskCtx.putImageData).toHaveBeenCalled()
+      expect(mockStore.maskCtx!.putImageData).toHaveBeenCalled()
     })
 
     it('should handle zero opacity', () => {
diff --git a/src/composables/maskeditor/useCanvasTransform.test.ts b/src/composables/maskeditor/useCanvasTransform.test.ts
new file mode 100644
index 0000000000..07ea0bb435
--- /dev/null
+++ b/src/composables/maskeditor/useCanvasTransform.test.ts
@@ -0,0 +1,683 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { useCanvasTransform } from '@/composables/maskeditor/useCanvasTransform'
+
+interface IMockCanvas {
+  width: number
+  height: number
+}
+
+interface IMockContext {
+  getImageData: ReturnType<typeof vi.fn>
+  putImageData: ReturnType<typeof vi.fn>
+  clearRect: ReturnType<typeof vi.fn>
+  drawImage: ReturnType<typeof vi.fn>
+}
+
+interface IMockCanvasHistory {
+  saveState: ReturnType<typeof vi.fn>
+}
+
+interface IMockStore {
+  maskCanvas: IMockCanvas | null
+  rgbCanvas: IMockCanvas | null
+  imgCanvas: IMockCanvas | null
+  maskCtx: IMockContext | null
+  rgbCtx: IMockContext | null
+  imgCtx: IMockContext | null
+  tgpuRoot: unknown
+  canvasHistory: IMockCanvasHistory
+  gpuTexturesNeedRecreation: boolean
+  gpuTextureWidth: number
+  gpuTextureHeight: number
+  pendingGPUMaskData: Uint8ClampedArray | null
+  pendingGPURgbData: Uint8ClampedArray | null
+}
+
+const { mockStore, mockCanvasHistory } = vi.hoisted(() => {
+  const mockCanvasHistory: IMockCanvasHistory = {
+    saveState: vi.fn()
+  }
+
+  const mockStore: IMockStore = {
+    maskCanvas: null,
+    rgbCanvas: null,
+    imgCanvas: null,
+    maskCtx: null,
+    rgbCtx: null,
+    imgCtx: null,
+    tgpuRoot: null,
+    canvasHistory: mockCanvasHistory,
+    gpuTexturesNeedRecreation: false,
+    gpuTextureWidth: 0,
+    gpuTextureHeight: 0,
+    pendingGPUMaskData: null,
+    pendingGPURgbData: null
+  }
+
+  return { mockStore, mockCanvasHistory }
+})
+
+vi.mock('@/stores/maskEditorStore', () => ({
+  useMaskEditorStore: vi.fn(() => mockStore)
+}))
+
+// Mock ImageData with improved type safety
+if (typeof globalThis.ImageData === 'undefined') {
+  globalThis.ImageData = class ImageData {
+    data: Uint8ClampedArray
+    width: number
+    height: number
+
+    constructor(
+      dataOrWidth: Uint8ClampedArray | number,
+      widthOrHeight?: number,
+      height?: number
+    ) {
+      if (dataOrWidth instanceof Uint8ClampedArray) {
+        // Constructor overload: new ImageData(data, width, height)
+        if (widthOrHeight === undefined || height === undefined) {
+          throw new Error(
+            'ImageData constructor requires width and height when data is provided'
+          )
+        }
+        this.data = dataOrWidth
+        this.width = widthOrHeight
+        this.height = height
+      } else {
+        // Constructor overload: new ImageData(width, height)
+        if (widthOrHeight === undefined) {
+          throw new Error(
+            'ImageData constructor requires height when width is provided'
+          )
+        }
+        this.width = dataOrWidth
+        this.height = widthOrHeight
+        this.data = new Uint8ClampedArray(dataOrWidth * widthOrHeight * 4)
+      }
+    }
+  } as typeof ImageData
+}
+
+// Mock ImageBitmap for test environment using safe type casting
+if (typeof globalThis.ImageBitmap === 'undefined') {
+  globalThis.ImageBitmap = class ImageBitmap {
+    width: number
+    height: number
+    constructor(width = 100, height = 100) {
+      this.width = width
+      this.height = height
+    }
+    close() {}
+  } as typeof ImageBitmap
+}
+
+describe('useCanvasTransform', () => {
+  let mockMaskCanvas: IMockCanvas
+  let mockRgbCanvas: IMockCanvas
+  let mockImgCanvas: IMockCanvas
+  let mockMaskCtx: IMockContext
+  let mockRgbCtx: IMockContext
+  let mockImgCtx: IMockContext
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+
+    const createMockImageData = (width: number, height: number) => {
+      const data = new Uint8ClampedArray(width * height * 4)
+      for (let i = 0; i < data.length; i += 4) {
+        data[i] = 255 // R
+        data[i + 1] = 0 // G
+        data[i + 2] = 0 // B
+        data[i + 3] = 255 // A
+      }
+      return {
+        data,
+        width,
+        height
+      } as ImageData
+    }
+
+    mockMaskCtx = {
+      getImageData: vi.fn((_x, _y, w, h) => createMockImageData(w, h)),
+      putImageData: vi.fn(),
+      clearRect: vi.fn(),
+      drawImage: vi.fn()
+    }
+
+    mockRgbCtx = {
+      getImageData: vi.fn((_x, _y, w, h) => createMockImageData(w, h)),
+      putImageData: vi.fn(),
+      clearRect: vi.fn(),
+      drawImage: vi.fn()
+    }
+
+    mockImgCtx = {
+      getImageData: vi.fn((_x, _y, w, h) => createMockImageData(w, h)),
+      putImageData: vi.fn(),
+      clearRect: vi.fn(),
+      drawImage: vi.fn()
+    }
+
+    mockMaskCanvas = {
+      width: 100,
+      height: 50
+    }
+
+    mockRgbCanvas = {
+      width: 100,
+      height: 50
+    }
+
+    mockImgCanvas = {
+      width: 100,
+      height: 50
+    }
+
+    mockStore.maskCanvas = mockMaskCanvas
+    mockStore.rgbCanvas = mockRgbCanvas
+    mockStore.imgCanvas = mockImgCanvas
+    mockStore.maskCtx = mockMaskCtx
+    mockStore.rgbCtx = mockRgbCtx
+    mockStore.imgCtx = mockImgCtx
+    mockStore.tgpuRoot = null
+    mockStore.gpuTexturesNeedRecreation = false
+    mockStore.gpuTextureWidth = 0
+    mockStore.gpuTextureHeight = 0
+    mockStore.pendingGPUMaskData = null
+    mockStore.pendingGPURgbData = null
+  })
+
+  describe('rotateClockwise', () => {
+    it('should rotate canvas 90 degrees clockwise', async () => {
+      const transform = useCanvasTransform()
+      await transform.rotateClockwise()
+
+      expect(mockMaskCanvas.width).toBe(50)
+      expect(mockMaskCanvas.height).toBe(100)
+      expect(mockRgbCanvas.width).toBe(50)
+      expect(mockRgbCanvas.height).toBe(100)
+      expect(mockImgCanvas.width).toBe(50)
+      expect(mockImgCanvas.height).toBe(100)
+    })
+
+    it('should call getImageData with original dimensions', async () => {
+      const transform = useCanvasTransform()
+      await transform.rotateClockwise()
+
+      expect(mockMaskCtx.getImageData).toHaveBeenCalledWith(0, 0, 100, 50)
+      expect(mockRgbCtx.getImageData).toHaveBeenCalledWith(0, 0, 100, 50)
+      expect(mockImgCtx.getImageData).toHaveBeenCalledWith(0, 0, 100, 50)
+    })
+
+    it('should call putImageData with rotated data', async () => {
+      const transform = useCanvasTransform()
+      await transform.rotateClockwise()
+
+      expect(mockMaskCtx.putImageData).toHaveBeenCalled()
+      expect(mockRgbCtx.putImageData).toHaveBeenCalled()
+      expect(mockImgCtx.putImageData).toHaveBeenCalled()
+
+      const maskCall = mockMaskCtx.putImageData.mock.calls[0][0]
+      expect(maskCall.width).toBe(50)
+      expect(maskCall.height).toBe(100)
+    })
+
+    it('should save transformed state to history', async () => {
+      const transform = useCanvasTransform()
+      await transform.rotateClockwise()
+
+      expect(mockCanvasHistory.saveState).toHaveBeenCalled()
+
+      const savedArgs = mockCanvasHistory.saveState.mock.calls[0]
+      expect(savedArgs).toHaveLength(3)
+
+      expect(savedArgs[0].width).toBe(50)
+      expect(savedArgs[0].height).toBe(100)
+      expect(savedArgs[1].width).toBe(50)
+      expect(savedArgs[1].height).toBe(100)
+      expect(savedArgs[2].width).toBe(50)
+      expect(savedArgs[2].height).toBe(100)
+    })
+
+    it('should log error when canvas contexts not ready', async () => {
+      const consoleErrorSpy = vi
+        .spyOn(console, 'error')
+        .mockImplementation(() => {})
+      mockStore.maskCanvas = null
+
+      const transform = useCanvasTransform()
+      await transform.rotateClockwise()
+
+      expect(consoleErrorSpy).toHaveBeenCalledWith(
+        '[useCanvasTransform] Canvas contexts not ready'
+      )
+
+      consoleErrorSpy.mockRestore()
+    })
+
+    it('should handle GPU texture recreation when GPU is active', async () => {
+      mockStore.tgpuRoot = {}
+
+      const transform = useCanvasTransform()
+      await transform.rotateClockwise()
+
+      expect(mockStore.gpuTexturesNeedRecreation).toBe(true)
+      expect(mockStore.gpuTextureWidth).toBe(50)
+      expect(mockStore.gpuTextureHeight).toBe(100)
+    })
+
+    it('should not recreate GPU textures when GPU is inactive', async () => {
+      mockStore.tgpuRoot = null
+
+      const transform = useCanvasTransform()
+      await transform.rotateClockwise()
+
+      expect(mockStore.gpuTexturesNeedRecreation).toBe(false)
+    })
+
+    it('should correctly rotate pixels clockwise at pixel level', async () => {
+      mockMaskCanvas.width = 2
+      mockMaskCanvas.height = 2
+
+      const createTestPattern = () => {
+        const data = new Uint8ClampedArray(2 * 2 * 4)
+        // TL (0,0): Red
+        data[0] = 255
+        data[1] = 0
+        data[2] = 0
+        data[3] = 255
+        // TR (1,0): Green
+        data[4] = 0
+        data[5] = 255
+        data[6] = 0
+        data[7] = 255
+        // BL (0,1): Blue
+        data[8] = 0
+        data[9] = 0
+        data[10] = 255
+        data[11] = 255
+        // BR (1,1): Yellow
+        data[12] = 255
+        data[13] = 255
+        data[14] = 0
+        data[15] = 255
+        return { data, width: 2, height: 2 } as ImageData
+      }
+
+      mockMaskCtx.getImageData = vi.fn(() => createTestPattern())
+      const transform = useCanvasTransform()
+      await transform.rotateClockwise()
+
+      const result = mockMaskCtx.putImageData.mock.calls[0][0] as ImageData
+
+      // After clockwise rotation:
+      // New TL should be old BL (Blue)
+      expect(result.data[0]).toBe(0) // R
+      expect(result.data[1]).toBe(0) // G
+      expect(result.data[2]).toBe(255) // B
+      expect(result.data[3]).toBe(255) // A
+
+      // New TR should be old TL (Red)
+      expect(result.data[4]).toBe(255) // R
+      expect(result.data[5]).toBe(0) // G
+      expect(result.data[6]).toBe(0) // B
+      expect(result.data[7]).toBe(255) // A
+
+      // New BL should be old BR (Yellow)
+      expect(result.data[8]).toBe(255) // R
+      expect(result.data[9]).toBe(255) // G
+      expect(result.data[10]).toBe(0) // B
+      expect(result.data[11]).toBe(255) // A
+
+      // New BR should be old TR (Green)
+      expect(result.data[12]).toBe(0) // R
+      expect(result.data[13]).toBe(255) // G
+      expect(result.data[14]).toBe(0) // B
+      expect(result.data[15]).toBe(255) // A
+    })
+  })
+
+  describe('rotateCounterclockwise', () => {
+    it('should rotate canvas 90 degrees counterclockwise', async () => {
+      const transform = useCanvasTransform()
+      await transform.rotateCounterclockwise()
+
+      expect(mockMaskCanvas.width).toBe(50)
+      expect(mockMaskCanvas.height).toBe(100)
+    })
+
+    it('should call getImageData with original dimensions', async () => {
+      const transform = useCanvasTransform()
+      await transform.rotateCounterclockwise()
+
+      expect(mockMaskCtx.getImageData).toHaveBeenCalledWith(0, 0, 100, 50)
+    })
+
+    it('should correctly rotate pixels counterclockwise at pixel level', async () => {
+      mockMaskCanvas.width = 2
+      mockMaskCanvas.height = 2
+
+      const createTestPattern = () => {
+        const data = new Uint8ClampedArray(2 * 2 * 4)
+        // TL (0,0): Red
+        data[0] = 255
+        data[1] = 0
+        data[2] = 0
+        data[3] = 255
+        // TR (1,0): Green
+        data[4] = 0
+        data[5] = 255
+        data[6] = 0
+        data[7] = 255
+        // BL (0,1): Blue
+        data[8] = 0
+        data[9] = 0
+        data[10] = 255
+        data[11] = 255
+        // BR (1,1): Yellow
+        data[12] = 255
+        data[13] = 255
+        data[14] = 0
+        data[15] = 255
+        return { data, width: 2, height: 2 } as ImageData
+      }
+
+      mockMaskCtx.getImageData = vi.fn(() => createTestPattern())
+      const transform = useCanvasTransform()
+      await transform.rotateCounterclockwise()
+
+      const result = mockMaskCtx.putImageData.mock.calls[0][0] as ImageData
+
+      // After counterclockwise rotation:
+      // New TL should be old TR (Green)
+      expect(result.data[0]).toBe(0) // R
+      expect(result.data[1]).toBe(255) // G
+      expect(result.data[2]).toBe(0) // B
+      expect(result.data[3]).toBe(255) // A
+
+      // New TR should be old BR (Yellow)
+      expect(result.data[4]).toBe(255) // R
+      expect(result.data[5]).toBe(255) // G
+      expect(result.data[6]).toBe(0) // B
+      expect(result.data[7]).toBe(255) // A
+
+      // New BL should be old TL (Red)
+      expect(result.data[8]).toBe(255) // R
+      expect(result.data[9]).toBe(0) // G
+      expect(result.data[10]).toBe(0) // B
+      expect(result.data[11]).toBe(255) // A
+
+      // New BR should be old BL (Blue)
+      expect(result.data[12]).toBe(0) // R
+      expect(result.data[13]).toBe(0) // G
+      expect(result.data[14]).toBe(255) // B
+      expect(result.data[15]).toBe(255) // A
+    })
+
+    it('should produce different result than clockwise rotation', async () => {
+      const transform = useCanvasTransform()
+
+      const createAsymmetricImageData = (width: number, height: number) => {
+        const data = new Uint8ClampedArray(width * height * 4)
+        for (let y = 0; y < height; y++) {
+          for (let x = 0; x < width; x++) {
+            const i = (y * width + x) * 4
+            if (x < width / 2 && y < height / 2) {
+              data[i] = 255
+              data[i + 3] = 255
+            } else {
+              data[i + 3] = 255
+            }
+          }
+        }
+        return { data, width, height } as ImageData
+      }
+
+      mockMaskCtx.getImageData = vi.fn(() => createAsymmetricImageData(100, 50))
+      await transform.rotateCounterclockwise()
+      const ccwResult = mockMaskCtx.putImageData.mock.calls[0][0] as ImageData
+
+      mockMaskCanvas.width = 100
+      mockMaskCanvas.height = 50
+      mockMaskCtx.putImageData.mockClear()
+
+      mockMaskCtx.getImageData = vi.fn(() => createAsymmetricImageData(100, 50))
+      await transform.rotateClockwise()
+      const cwResult = mockMaskCtx.putImageData.mock.calls[0][0] as ImageData
+
+      let pixelDifferences = 0
+      for (let i = 0; i < ccwResult.data.length; i++) {
+        if (ccwResult.data[i] !== cwResult.data[i]) {
+          pixelDifferences++
+        }
+      }
+
+      expect(pixelDifferences).toBeGreaterThan(0)
+    })
+  })
+
+  describe('mirrorHorizontal', () => {
+    it('should mirror canvas horizontally', async () => {
+      const transform = useCanvasTransform()
+      await transform.mirrorHorizontal()
+
+      expect(mockMaskCanvas.width).toBe(100)
+      expect(mockMaskCanvas.height).toBe(50)
+    })
+
+    it('should handle GPU texture recreation when GPU is active', async () => {
+      mockStore.tgpuRoot = {}
+
+      const transform = useCanvasTransform()
+      await transform.mirrorHorizontal()
+
+      expect(mockStore.gpuTexturesNeedRecreation).toBe(true)
+      expect(mockStore.gpuTextureWidth).toBe(100)
+      expect(mockStore.gpuTextureHeight).toBe(50)
+    })
+
+    it('should correctly flip pixels horizontally at pixel level', async () => {
+      mockMaskCanvas.width = 2
+      mockMaskCanvas.height = 2
+
+      const createTestPattern = () => {
+        const data = new Uint8ClampedArray(2 * 2 * 4)
+        // TL (0,0): Red
+        data[0] = 255
+        data[1] = 0
+        data[2] = 0
+        data[3] = 255
+        // TR (1,0): Green
+        data[4] = 0
+        data[5] = 255
+        data[6] = 0
+        data[7] = 255
+        // BL (0,1): Blue
+        data[8] = 0
+        data[9] = 0
+        data[10] = 255
+        data[11] = 255
+        // BR (1,1): Yellow
+        data[12] = 255
+        data[13] = 255
+        data[14] = 0
+        data[15] = 255
+        return { data, width: 2, height: 2 } as ImageData
+      }
+
+      mockMaskCtx.getImageData = vi.fn(() => createTestPattern())
+      const transform = useCanvasTransform()
+      await transform.mirrorHorizontal()
+
+      const result = mockMaskCtx.putImageData.mock.calls[0][0] as ImageData
+
+      // After horizontal flip:
+      // New TL should be old TR (Green)
+      expect(result.data[0]).toBe(0)
+      expect(result.data[1]).toBe(255)
+      // New TR should be old TL (Red)
+      expect(result.data[4]).toBe(255)
+      expect(result.data[5]).toBe(0)
+    })
+  })
+
+  describe('mirrorVertical', () => {
+    it('should mirror canvas vertically', async () => {
+      const transform = useCanvasTransform()
+      await transform.mirrorVertical()
+
+      expect(mockMaskCanvas.width).toBe(100)
+      expect(mockMaskCanvas.height).toBe(50)
+    })
+
+    it('should handle GPU texture recreation when GPU is active', async () => {
+      mockStore.tgpuRoot = {}
+
+      const transform = useCanvasTransform()
+      await transform.mirrorVertical()
+
+      expect(mockStore.gpuTexturesNeedRecreation).toBe(true)
+      expect(mockStore.gpuTextureWidth).toBe(100)
+      expect(mockStore.gpuTextureHeight).toBe(50)
+    })
+
+    it('should correctly flip pixels vertically at pixel level', async () => {
+      mockMaskCanvas.width = 2
+      mockMaskCanvas.height = 2
+
+      const createTestPattern = () => {
+        const data = new Uint8ClampedArray(2 * 2 * 4)
+        // TL (0,0): Red
+        data[0] = 255
+        data[1] = 0
+        data[2] = 0
+        data[3] = 255
+        // TR (1,0): Green
+        data[4] = 0
+        data[5] = 255
+        data[6] = 0
+        data[7] = 255
+        // BL (0,1): Blue
+        data[8] = 0
+        data[9] = 0
+        data[10] = 255
+        data[11] = 255
+        // BR (1,1): Yellow
+        data[12] = 255
+        data[13] = 255
+        data[14] = 0
+        data[15] = 255
+        return { data, width: 2, height: 2 } as ImageData
+      }
+
+      mockMaskCtx.getImageData = vi.fn(() => createTestPattern())
+      const transform = useCanvasTransform()
+      await transform.mirrorVertical()
+
+      const result = mockMaskCtx.putImageData.mock.calls[0][0] as ImageData
+
+      // After vertical flip:
+      // New TL should be old BL (Blue)
+      expect(result.data[0]).toBe(0) // R
+      expect(result.data[1]).toBe(0) // G
+      expect(result.data[2]).toBe(255) // B
+      expect(result.data[3]).toBe(255) // A
+
+      // New TR should be old BR (Yellow)
+      expect(result.data[4]).toBe(255) // R
+      expect(result.data[5]).toBe(255) // G
+      expect(result.data[6]).toBe(0) // B
+      expect(result.data[7]).toBe(255) // A
+
+      // New BL should be old TL (Red)
+      expect(result.data[8]).toBe(255) // R
+      expect(result.data[9]).toBe(0) // G
+      expect(result.data[10]).toBe(0) // B
+      expect(result.data[11]).toBe(255) // A
+
+      // New BR should be old TR (Green)
+      expect(result.data[12]).toBe(0) // R
+      expect(result.data[13]).toBe(255) // G
+      expect(result.data[14]).toBe(0) // B
+      expect(result.data[15]).toBe(255) // A
+    })
+
+    it('should log error when canvas contexts not ready', async () => {
+      const consoleErrorSpy = vi
+        .spyOn(console, 'error')
+        .mockImplementation(() => {})
+      mockStore.maskCanvas = null
+
+      const transform = useCanvasTransform()
+      await transform.mirrorVertical()
+
+      expect(consoleErrorSpy).toHaveBeenCalledWith(
+        '[useCanvasTransform] Canvas contexts not ready'
+      )
+
+      consoleErrorSpy.mockRestore()
+    })
+  })
+
+  describe('GPU integration', () => {
+    it('should set GPU recreation flags for rotation', async () => {
+      mockStore.tgpuRoot = {}
+      mockMaskCanvas.width = 100
+      mockMaskCanvas.height = 50
+
+      const transform = useCanvasTransform()
+      await transform.rotateClockwise()
+
+      expect(mockStore.gpuTexturesNeedRecreation).toBe(true)
+      expect(mockStore.gpuTextureWidth).toBe(50)
+      expect(mockStore.gpuTextureHeight).toBe(100)
+      expect(mockStore.pendingGPUMaskData!.length).toBe(50 * 100 * 4)
+      expect(mockStore.pendingGPURgbData!.length).toBe(50 * 100 * 4)
+    })
+
+    it('should premultiply alpha when preparing GPU data', async () => {
+      mockStore.tgpuRoot = {}
+      mockMaskCanvas.width = 1
+      mockMaskCanvas.height = 1
+
+      // Create 1x1 ImageData with semi-transparent pixel
+      const createSemiTransparentImageData = () => {
+        const data = new Uint8ClampedArray(1 * 1 * 4)
+        data[0] = 200 // R
+        data[1] = 100 // G
+        data[2] = 50 // B
+        data[3] = 128 // A (50% opacity)
+        return { data, width: 1, height: 1 } as ImageData
+      }
+
+      mockMaskCtx.getImageData = vi.fn(() => createSemiTransparentImageData())
+      mockRgbCtx.getImageData = vi.fn(() => createSemiTransparentImageData())
+      mockImgCtx.getImageData = vi.fn(() => createSemiTransparentImageData())
+
+      const transform = useCanvasTransform()
+      await transform.rotateClockwise()
+
+      // Verify pendingGPUMaskData contains premultiplied values
+      expect(mockStore.pendingGPUMaskData).not.toBeNull()
+      const maskData = mockStore.pendingGPUMaskData!
+
+      // Expected premultiplied values: RGB * alpha / 255
+      // R: 200 * 128 / 255 ≈ 100
+      // G: 100 * 128 / 255 ≈ 50
+      // B: 50 * 128 / 255 ≈ 25
+      // A: 128 (preserved)
+      expect(maskData[0]).toBeCloseTo(100, 0) // R premultiplied
+      expect(maskData[1]).toBeCloseTo(50, 0) // G premultiplied
+      expect(maskData[2]).toBeCloseTo(25, 0) // B premultiplied
+      expect(maskData[3]).toBe(128) // A preserved
+
+      // Also verify RGB canvas data
+      expect(mockStore.pendingGPURgbData).not.toBeNull()
+      const rgbData = mockStore.pendingGPURgbData!
+      expect(rgbData[0]).toBeCloseTo(100, 0)
+      expect(rgbData[1]).toBeCloseTo(50, 0)
+      expect(rgbData[2]).toBeCloseTo(25, 0)
+      expect(rgbData[3]).toBe(128)
+    })
+  })
+})
diff --git a/src/composables/maskeditor/useCanvasTransform.ts b/src/composables/maskeditor/useCanvasTransform.ts
new file mode 100644
index 0000000000..1b08c41173
--- /dev/null
+++ b/src/composables/maskeditor/useCanvasTransform.ts
@@ -0,0 +1,359 @@
+import { useMaskEditorStore } from '@/stores/maskEditorStore'
+
+/**
+ * Composable for canvas transformation operations (rotate, mirror)
+ */
+export function useCanvasTransform() {
+  const store = useMaskEditorStore()
+
+  /**
+   * Rotates a canvas 90 degrees clockwise or counter-clockwise
+   */
+  const rotateCanvas = (
+    ctx: CanvasRenderingContext2D,
+    canvas: HTMLCanvasElement,
+    clockwise: boolean
+  ): ImageData => {
+    const width = canvas.width
+    const height = canvas.height
+
+    // Get current canvas data
+    const sourceData = ctx.getImageData(0, 0, width, height)
+
+    // Create new ImageData with swapped dimensions
+    const rotatedData = new ImageData(height, width)
+    const src = sourceData.data
+    const dst = rotatedData.data
+
+    // Rotate pixel by pixel
+    for (let y = 0; y < height; y++) {
+      for (let x = 0; x < width; x++) {
+        const srcIdx = (y * width + x) * 4
+
+        // Calculate destination coordinates
+        let dstX: number, dstY: number
+        if (clockwise) {
+          // Rotate 90° clockwise: (x,y) -> (height-1-y, x)
+          dstX = height - 1 - y
+          dstY = x
+        } else {
+          // Rotate 90° counter-clockwise: (x,y) -> (y, width-1-x)
+          dstX = y
+          dstY = width - 1 - x
+        }
+
+        const dstIdx = (dstY * height + dstX) * 4
+
+        // Copy RGBA values
+        dst[dstIdx] = src[srcIdx]
+        dst[dstIdx + 1] = src[srcIdx + 1]
+        dst[dstIdx + 2] = src[srcIdx + 2]
+        dst[dstIdx + 3] = src[srcIdx + 3]
+      }
+    }
+
+    return rotatedData
+  }
+
+  /**
+   * Mirrors a canvas horizontally or vertically
+   */
+  const mirrorCanvas = (
+    ctx: CanvasRenderingContext2D,
+    canvas: HTMLCanvasElement,
+    horizontal: boolean
+  ): ImageData => {
+    const width = canvas.width
+    const height = canvas.height
+
+    // Get current canvas data
+    const sourceData = ctx.getImageData(0, 0, width, height)
+    const mirroredData = new ImageData(width, height)
+    const src = sourceData.data
+    const dst = mirroredData.data
+
+    // Mirror pixel by pixel
+    for (let y = 0; y < height; y++) {
+      for (let x = 0; x < width; x++) {
+        const srcIdx = (y * width + x) * 4
+
+        // Calculate destination coordinates
+        let dstX: number, dstY: number
+        if (horizontal) {
+          // Mirror horizontally: flip X axis
+          dstX = width - 1 - x
+          dstY = y
+        } else {
+          // Mirror vertically: flip Y axis
+          dstX = x
+          dstY = height - 1 - y
+        }
+
+        const dstIdx = (dstY * width + dstX) * 4
+
+        // Copy RGBA values
+        dst[dstIdx] = src[srcIdx]
+        dst[dstIdx + 1] = src[srcIdx + 1]
+        dst[dstIdx + 2] = src[srcIdx + 2]
+        dst[dstIdx + 3] = src[srcIdx + 3]
+      }
+    }
+
+    return mirroredData
+  }
+
+  /**
+   * Premultiplies alpha for GPU upload
+   */
+  const premultiplyData = (data: Uint8ClampedArray): void => {
+    for (let i = 0; i < data.length; i += 4) {
+      const a = data[i + 3] / 255
+      data[i] = Math.round(data[i] * a)
+      data[i + 1] = Math.round(data[i + 1] * a)
+      data[i + 2] = Math.round(data[i + 2] * a)
+    }
+  }
+
+  /**
+   * Recreates and updates GPU textures after transformation
+   * This is required because GPU textures have immutable dimensions
+   */
+  const recreateGPUTextures = async (
+    width: number,
+    height: number
+  ): Promise<void> => {
+    if (
+      !store.tgpuRoot ||
+      !store.maskCanvas ||
+      !store.rgbCanvas ||
+      !store.maskCtx ||
+      !store.rgbCtx
+    ) {
+      return
+    }
+
+    // Get references to GPU resources from useBrushDrawing
+    // These are stored as module-level variables in useBrushDrawing
+    // We need to trigger a reinitialization through the store
+
+    // Signal to useBrushDrawing that textures need recreation
+    store.gpuTexturesNeedRecreation = true
+    store.gpuTextureWidth = width
+    store.gpuTextureHeight = height
+
+    // Get current canvas data
+    const maskImageData = store.maskCtx.getImageData(0, 0, width, height)
+    const rgbImageData = store.rgbCtx.getImageData(0, 0, width, height)
+
+    // Create new Uint8ClampedArray with ArrayBuffer (not SharedArrayBuffer)
+    // This ensures compatibility with WebGPU writeTexture
+    const maskData = new Uint8ClampedArray(
+      new ArrayBuffer(maskImageData.data.length)
+    )
+    const rgbData = new Uint8ClampedArray(
+      new ArrayBuffer(rgbImageData.data.length)
+    )
+
+    // Copy data
+    maskData.set(maskImageData.data)
+    rgbData.set(rgbImageData.data)
+
+    // Runtime check to ensure we have ArrayBuffer backing
+    if (
+      maskData.buffer instanceof SharedArrayBuffer ||
+      rgbData.buffer instanceof SharedArrayBuffer
+    ) {
+      console.error(
+        '[useCanvasTransform] SharedArrayBuffer detected, WebGPU writeTexture will fail'
+      )
+      return
+    }
+
+    // Premultiply alpha for GPU
+    premultiplyData(maskData)
+    premultiplyData(rgbData)
+
+    // Store the premultiplied data for useBrushDrawing to pick up
+    store.pendingGPUMaskData = maskData
+    store.pendingGPURgbData = rgbData
+  }
+
+  /**
+   * Rotates all canvas layers 90 degrees clockwise and updates GPU
+   */
+  const rotateClockwise = async (): Promise<void> => {
+    const { maskCanvas, maskCtx, rgbCanvas, rgbCtx, imgCanvas, imgCtx } = store
+
+    if (
+      !maskCanvas ||
+      !maskCtx ||
+      !rgbCanvas ||
+      !rgbCtx ||
+      !imgCanvas ||
+      !imgCtx
+    ) {
+      console.error('[useCanvasTransform] Canvas contexts not ready')
+      return
+    }
+
+    // Store original dimensions
+    const origWidth = maskCanvas.width
+    const origHeight = maskCanvas.height
+
+    // Rotate all three layers clockwise
+    const rotatedMask = rotateCanvas(maskCtx, maskCanvas, true)
+    const rotatedRgb = rotateCanvas(rgbCtx, rgbCanvas, true)
+    const rotatedImg = rotateCanvas(imgCtx, imgCanvas, true)
+
+    // Update canvas dimensions (swap width/height)
+    maskCanvas.width = origHeight
+    maskCanvas.height = origWidth
+    rgbCanvas.width = origHeight
+    rgbCanvas.height = origWidth
+    imgCanvas.width = origHeight
+    imgCanvas.height = origWidth
+
+    // Apply rotated data
+    maskCtx.putImageData(rotatedMask, 0, 0)
+    rgbCtx.putImageData(rotatedRgb, 0, 0)
+    imgCtx.putImageData(rotatedImg, 0, 0)
+
+    // Recreate GPU textures with new dimensions if GPU is active
+    if (store.tgpuRoot) {
+      await recreateGPUTextures(origHeight, origWidth)
+    }
+
+    // Save to history
+    store.canvasHistory.saveState(rotatedMask, rotatedRgb, rotatedImg)
+  }
+
+  /**
+   * Rotates all canvas layers 90 degrees counter-clockwise and updates GPU
+   */
+  const rotateCounterclockwise = async (): Promise<void> => {
+    const { maskCanvas, maskCtx, rgbCanvas, rgbCtx, imgCanvas, imgCtx } = store
+
+    if (
+      !maskCanvas ||
+      !maskCtx ||
+      !rgbCanvas ||
+      !rgbCtx ||
+      !imgCanvas ||
+      !imgCtx
+    ) {
+      console.error('[useCanvasTransform] Canvas contexts not ready')
+      return
+    }
+
+    // Store original dimensions
+    const origWidth = maskCanvas.width
+    const origHeight = maskCanvas.height
+
+    // Rotate all three layers counter-clockwise
+    const rotatedMask = rotateCanvas(maskCtx, maskCanvas, false)
+    const rotatedRgb = rotateCanvas(rgbCtx, rgbCanvas, false)
+    const rotatedImg = rotateCanvas(imgCtx, imgCanvas, false)
+
+    // Update canvas dimensions (swap width/height)
+    maskCanvas.width = origHeight
+    maskCanvas.height = origWidth
+    rgbCanvas.width = origHeight
+    rgbCanvas.height = origWidth
+    imgCanvas.width = origHeight
+    imgCanvas.height = origWidth
+
+    // Apply rotated data
+    maskCtx.putImageData(rotatedMask, 0, 0)
+    rgbCtx.putImageData(rotatedRgb, 0, 0)
+    imgCtx.putImageData(rotatedImg, 0, 0)
+
+    // Recreate GPU textures with new dimensions if GPU is active
+    if (store.tgpuRoot) {
+      await recreateGPUTextures(origHeight, origWidth)
+    }
+
+    // Save to history
+    store.canvasHistory.saveState(rotatedMask, rotatedRgb, rotatedImg)
+  }
+
+  /**
+   * Mirrors all canvas layers horizontally and updates GPU
+   */
+  const mirrorHorizontal = async (): Promise<void> => {
+    const { maskCanvas, maskCtx, rgbCanvas, rgbCtx, imgCanvas, imgCtx } = store
+
+    if (
+      !maskCanvas ||
+      !maskCtx ||
+      !rgbCanvas ||
+      !rgbCtx ||
+      !imgCanvas ||
+      !imgCtx
+    ) {
+      console.error('[useCanvasTransform] Canvas contexts not ready')
+      return
+    }
+
+    // Mirror all three layers horizontally
+    const mirroredMask = mirrorCanvas(maskCtx, maskCanvas, true)
+    const mirroredRgb = mirrorCanvas(rgbCtx, rgbCanvas, true)
+    const mirroredImg = mirrorCanvas(imgCtx, imgCanvas, true)
+
+    // Apply mirrored data (dimensions stay the same)
+    maskCtx.putImageData(mirroredMask, 0, 0)
+    rgbCtx.putImageData(mirroredRgb, 0, 0)
+    imgCtx.putImageData(mirroredImg, 0, 0)
+
+    // Update GPU textures if GPU is active (dimensions unchanged, just data)
+    if (store.tgpuRoot) {
+      await recreateGPUTextures(maskCanvas.width, maskCanvas.height)
+    }
+
+    // Save to history
+    store.canvasHistory.saveState(mirroredMask, mirroredRgb, mirroredImg)
+  }
+
+  /**
+   * Mirrors all canvas layers vertically and updates GPU
+   */
+  const mirrorVertical = async (): Promise<void> => {
+    const { maskCanvas, maskCtx, rgbCanvas, rgbCtx, imgCanvas, imgCtx } = store
+
+    if (
+      !maskCanvas ||
+      !maskCtx ||
+      !rgbCanvas ||
+      !rgbCtx ||
+      !imgCanvas ||
+      !imgCtx
+    ) {
+      console.error('[useCanvasTransform] Canvas contexts not ready')
+      return
+    }
+
+    // Mirror all three layers vertically
+    const mirroredMask = mirrorCanvas(maskCtx, maskCanvas, false)
+    const mirroredRgb = mirrorCanvas(rgbCtx, rgbCanvas, false)
+    const mirroredImg = mirrorCanvas(imgCtx, imgCanvas, false)
+
+    // Apply mirrored data (dimensions stay the same)
+    maskCtx.putImageData(mirroredMask, 0, 0)
+    rgbCtx.putImageData(mirroredRgb, 0, 0)
+    imgCtx.putImageData(mirroredImg, 0, 0)
+
+    // Update GPU textures if GPU is active (dimensions unchanged, just data)
+    if (store.tgpuRoot) {
+      await recreateGPUTextures(maskCanvas.width, maskCanvas.height)
+    }
+
+    // Save to history
+    store.canvasHistory.saveState(mirroredMask, mirroredRgb, mirroredImg)
+  }
+
+  return {
+    rotateClockwise,
+    rotateCounterclockwise,
+    mirrorHorizontal,
+    mirrorVertical
+  }
+}
diff --git a/tests-ui/tests/composables/maskeditor/useImageLoader.test.ts b/src/composables/maskeditor/useImageLoader.test.ts
similarity index 71%
rename from tests-ui/tests/composables/maskeditor/useImageLoader.test.ts
rename to src/composables/maskeditor/useImageLoader.test.ts
index ae49383667..b547ac917a 100644
--- a/tests-ui/tests/composables/maskeditor/useImageLoader.test.ts
+++ b/src/composables/maskeditor/useImageLoader.test.ts
@@ -2,22 +2,39 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { useImageLoader } from '@/composables/maskeditor/useImageLoader'
 
+type MockStore = {
+  imgCanvas: HTMLCanvasElement | null
+  maskCanvas: HTMLCanvasElement | null
+  rgbCanvas: HTMLCanvasElement | null
+  imgCtx: CanvasRenderingContext2D | null
+  maskCtx: CanvasRenderingContext2D | null
+  image: HTMLImageElement | null
+}
+
+type MockDataStore = {
+  inputData: {
+    baseLayer: { image: HTMLImageElement }
+    maskLayer: { image: HTMLImageElement }
+    paintLayer: { image: HTMLImageElement } | null
+  } | null
+}
+
 const mockCanvasManager = {
   invalidateCanvas: vi.fn().mockResolvedValue(undefined),
   updateMaskColor: vi.fn().mockResolvedValue(undefined)
 }
 
-const mockStore = {
-  imgCanvas: null as any,
-  maskCanvas: null as any,
-  rgbCanvas: null as any,
-  imgCtx: null as any,
-  maskCtx: null as any,
-  image: null as any
+const mockStore: MockStore = {
+  imgCanvas: null,
+  maskCanvas: null,
+  rgbCanvas: null,
+  imgCtx: null,
+  maskCtx: null,
+  image: null
 }
 
-const mockDataStore = {
-  inputData: null as any
+const mockDataStore: MockDataStore = {
+  inputData: null
 }
 
 vi.mock('@/stores/maskEditorStore', () => ({
@@ -33,7 +50,8 @@ vi.mock('@/composables/maskeditor/useCanvasManager', () => ({
 }))
 
 vi.mock('@vueuse/core', () => ({
-  createSharedComposable: (fn: any) => fn
+  createSharedComposable: <T extends (...args: unknown[]) => unknown>(fn: T) =>
+    fn
 }))
 
 describe('useImageLoader', () => {
@@ -61,26 +79,26 @@ describe('useImageLoader', () => {
 
     mockStore.imgCtx = {
       clearRect: vi.fn()
-    }
+    } as Partial<CanvasRenderingContext2D> as CanvasRenderingContext2D
 
     mockStore.maskCtx = {
       clearRect: vi.fn()
-    }
+    } as Partial<CanvasRenderingContext2D> as CanvasRenderingContext2D
 
     mockStore.imgCanvas = {
       width: 0,
       height: 0
-    }
+    } as Partial<HTMLCanvasElement> as HTMLCanvasElement
 
     mockStore.maskCanvas = {
       width: 0,
       height: 0
-    }
+    } as Partial<HTMLCanvasElement> as HTMLCanvasElement
 
     mockStore.rgbCanvas = {
       width: 0,
       height: 0
-    }
+    } as Partial<HTMLCanvasElement> as HTMLCanvasElement
 
     mockDataStore.inputData = {
       baseLayer: { image: mockBaseImage },
@@ -104,10 +122,10 @@ describe('useImageLoader', () => {
 
       await loader.loadImages()
 
-      expect(mockStore.maskCanvas.width).toBe(512)
-      expect(mockStore.maskCanvas.height).toBe(512)
-      expect(mockStore.rgbCanvas.width).toBe(512)
-      expect(mockStore.rgbCanvas.height).toBe(512)
+      expect(mockStore.maskCanvas?.width).toBe(512)
+      expect(mockStore.maskCanvas?.height).toBe(512)
+      expect(mockStore.rgbCanvas?.width).toBe(512)
+      expect(mockStore.rgbCanvas?.height).toBe(512)
     })
 
     it('should clear canvas contexts', async () => {
@@ -115,8 +133,8 @@ describe('useImageLoader', () => {
 
       await loader.loadImages()
 
-      expect(mockStore.imgCtx.clearRect).toHaveBeenCalledWith(0, 0, 0, 0)
-      expect(mockStore.maskCtx.clearRect).toHaveBeenCalledWith(0, 0, 0, 0)
+      expect(mockStore.imgCtx?.clearRect).toHaveBeenCalledWith(0, 0, 0, 0)
+      expect(mockStore.maskCtx?.clearRect).toHaveBeenCalledWith(0, 0, 0, 0)
     })
 
     it('should call canvasManager methods', async () => {
@@ -188,10 +206,10 @@ describe('useImageLoader', () => {
 
       await loader.loadImages()
 
-      expect(mockStore.maskCanvas.width).toBe(1024)
-      expect(mockStore.maskCanvas.height).toBe(768)
-      expect(mockStore.rgbCanvas.width).toBe(1024)
-      expect(mockStore.rgbCanvas.height).toBe(768)
+      expect(mockStore.maskCanvas?.width).toBe(1024)
+      expect(mockStore.maskCanvas?.height).toBe(768)
+      expect(mockStore.rgbCanvas?.width).toBe(1024)
+      expect(mockStore.rgbCanvas?.height).toBe(768)
     })
   })
 })
diff --git a/src/composables/maskeditor/useMaskEditorLoader.ts b/src/composables/maskeditor/useMaskEditorLoader.ts
index 74d39a5a28..2d8206af11 100644
--- a/src/composables/maskeditor/useMaskEditorLoader.ts
+++ b/src/composables/maskeditor/useMaskEditorLoader.ts
@@ -1,7 +1,7 @@
 import { useMaskEditorDataStore } from '@/stores/maskEditorDataStore'
 import type { ImageRef, ImageLayer } from '@/stores/maskEditorDataStore'
 import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
-import { useNodeOutputStore } from '@/stores/imagePreviewStore'
+import { useNodeOutputStore } from '@/stores/nodeOutputStore'
 import { isCloud } from '@/platform/distribution/types'
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
diff --git a/src/composables/maskeditor/useMaskEditorSaver.ts b/src/composables/maskeditor/useMaskEditorSaver.ts
index 8aa6bb0da8..8f5bc5c468 100644
--- a/src/composables/maskeditor/useMaskEditorSaver.ts
+++ b/src/composables/maskeditor/useMaskEditorSaver.ts
@@ -1,6 +1,6 @@
 import { useMaskEditorDataStore } from '@/stores/maskEditorDataStore'
 import { useMaskEditorStore } from '@/stores/maskEditorStore'
-import { useNodeOutputStore } from '@/stores/imagePreviewStore'
+import { useNodeOutputStore } from '@/stores/nodeOutputStore'
 import type {
   EditorOutputData,
   EditorOutputLayer,
diff --git a/src/composables/node/useNodeBadge.ts b/src/composables/node/useNodeBadge.ts
index 2f31ad0ac5..cfe2ad66f2 100644
--- a/src/composables/node/useNodeBadge.ts
+++ b/src/composables/node/useNodeBadge.ts
@@ -71,8 +71,19 @@ export const useNodeBadge = () => {
   }
 
   onMounted(() => {
+    if (extensionStore.isExtensionInstalled('Comfy.NodeBadge')) return
+
+    // TODO: Fix the composables and watchers being setup in onMounted
     const nodePricing = useNodePricing()
 
+    watch(
+      () => nodePricing.pricingRevision.value,
+      () => {
+        if (!showApiPricingBadge.value) return
+        app.canvas?.setDirty(true, true)
+      }
+    )
+
     extensionStore.registerExtension({
       name: 'Comfy.NodeBadge',
       nodeCreated(node: LGraphNode) {
@@ -111,17 +122,16 @@ export const useNodeBadge = () => {
         node.badges.push(() => badge.value)
 
         if (node.constructor.nodeData?.api_node && showApiPricingBadge.value) {
-          // Get the pricing function to determine if this node has dynamic pricing
+          // JSONata rules are dynamic if they depend on any widgets/inputs/input_groups
           const pricingConfig = nodePricing.getNodePricingConfig(node)
           const hasDynamicPricing =
-            typeof pricingConfig?.displayPrice === 'function'
-
-          let creditsBadge
-          const createBadge = () => {
-            const price = nodePricing.getNodeDisplayPrice(node)
-            return priceBadge.getCreditsBadge(price)
-          }
+            !!pricingConfig &&
+            ((pricingConfig.depends_on?.widgets?.length ?? 0) > 0 ||
+              (pricingConfig.depends_on?.inputs?.length ?? 0) > 0 ||
+              (pricingConfig.depends_on?.input_groups?.length ?? 0) > 0)
 
+          // Keep the existing widget-watch wiring ONLY to trigger redraws on widget change.
+          // (We no longer rely on it to hold the current badge value.)
           if (hasDynamicPricing) {
             // For dynamic pricing nodes, use computed that watches widget changes
             const relevantWidgetNames = nodePricing.getRelevantWidgetNames(
@@ -133,13 +143,63 @@ export const useNodeBadge = () => {
               triggerCanvasRedraw: true
             })
 
-            creditsBadge = computedWithWidgetWatch(createBadge)
-          } else {
-            // For static pricing nodes, use regular computed
-            creditsBadge = computed(createBadge)
+            // Ensure watchers are installed; ignore the returned value.
+            // (This call is what registers the widget listeners in most implementations.)
+            computedWithWidgetWatch(() => 0)
+
+            // Hook into connection changes to trigger price recalculation
+            // This handles both connect and disconnect in VueNodes mode
+            const relevantInputs = pricingConfig?.depends_on?.inputs ?? []
+            const inputGroupPrefixes =
+              pricingConfig?.depends_on?.input_groups ?? []
+            const hasRelevantInputs =
+              relevantInputs.length > 0 || inputGroupPrefixes.length > 0
+
+            if (hasRelevantInputs) {
+              const originalOnConnectionsChange = node.onConnectionsChange
+              node.onConnectionsChange = function (
+                type,
+                slotIndex,
+                isConnected,
+                link,
+                ioSlot
+              ) {
+                originalOnConnectionsChange?.call(
+                  this,
+                  type,
+                  slotIndex,
+                  isConnected,
+                  link,
+                  ioSlot
+                )
+                // Only trigger if this input affects pricing
+                const inputName = ioSlot?.name
+                if (!inputName) return
+                const isRelevantInput =
+                  relevantInputs.includes(inputName) ||
+                  inputGroupPrefixes.some((prefix) =>
+                    inputName.startsWith(prefix + '.')
+                  )
+                if (isRelevantInput) {
+                  nodePricing.triggerPriceRecalculation(node)
+                }
+              }
+            }
           }
 
-          node.badges.push(() => creditsBadge.value)
+          let lastLabel = nodePricing.getNodeDisplayPrice(node)
+          let lastBadge = priceBadge.getCreditsBadge(lastLabel)
+
+          const creditsBadgeGetter: () => LGraphBadge = () => {
+            const label = nodePricing.getNodeDisplayPrice(node)
+            if (label !== lastLabel) {
+              lastLabel = label
+              lastBadge = priceBadge.getCreditsBadge(label)
+            }
+            return lastBadge
+          }
+
+          node.badges.push(creditsBadgeGetter)
         }
       },
       init() {
diff --git a/src/composables/node/useNodeCanvasImagePreview.test.ts b/src/composables/node/useNodeCanvasImagePreview.test.ts
new file mode 100644
index 0000000000..43e58fea23
--- /dev/null
+++ b/src/composables/node/useNodeCanvasImagePreview.test.ts
@@ -0,0 +1,68 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import {
+  createTestSubgraph,
+  createTestSubgraphNode
+} from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers'
+
+import { useNodeCanvasImagePreview } from './useNodeCanvasImagePreview'
+
+const imagePreviewWidget = vi.hoisted(() => vi.fn())
+
+vi.mock(
+  '@/renderer/extensions/vueNodes/widgets/composables/useImagePreviewWidget',
+  () => ({
+    useImagePreviewWidget: () => imagePreviewWidget
+  })
+)
+
+describe('useNodeCanvasImagePreview', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    vi.clearAllMocks()
+  })
+
+  it('does not add preview widget when node has no images', () => {
+    const node = new LGraphNode('test')
+
+    useNodeCanvasImagePreview().showCanvasImagePreview(node)
+
+    expect(imagePreviewWidget).not.toHaveBeenCalled()
+  })
+
+  it('adds preview widget for regular nodes with images', () => {
+    const node = new LGraphNode('test')
+    node.imgs = [new Image()]
+
+    useNodeCanvasImagePreview().showCanvasImagePreview(node)
+
+    expect(imagePreviewWidget).toHaveBeenCalledTimes(1)
+    expect(imagePreviewWidget).toHaveBeenCalledWith(node, {
+      type: 'IMAGE_PREVIEW',
+      name: '$$canvas-image-preview'
+    })
+  })
+
+  it('does not add duplicate preview widget when already present', () => {
+    const node = new LGraphNode('test')
+    node.imgs = [new Image()]
+    node.addWidget('text', '$$canvas-image-preview', '', () => undefined, {})
+
+    useNodeCanvasImagePreview().showCanvasImagePreview(node)
+
+    expect(imagePreviewWidget).not.toHaveBeenCalled()
+  })
+
+  it('does not add preview widget directly on SubgraphNode', () => {
+    const subgraph = createTestSubgraph()
+    const subgraphNode = createTestSubgraphNode(subgraph)
+    subgraphNode.imgs = [new Image()]
+
+    useNodeCanvasImagePreview().showCanvasImagePreview(subgraphNode)
+
+    expect(imagePreviewWidget).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/composables/node/useNodeCanvasImagePreview.ts b/src/composables/node/useNodeCanvasImagePreview.ts
index 008119407e..dccfc7f430 100644
--- a/src/composables/node/useNodeCanvasImagePreview.ts
+++ b/src/composables/node/useNodeCanvasImagePreview.ts
@@ -1,7 +1,16 @@
 import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
 import { useImagePreviewWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useImagePreviewWidget'
 
-const CANVAS_IMAGE_PREVIEW_WIDGET = '$$canvas-image-preview'
+export const CANVAS_IMAGE_PREVIEW_WIDGET = '$$canvas-image-preview'
+const CANVAS_IMAGE_PREVIEW_NODE_TYPES = new Set([
+  'PreviewImage',
+  'SaveImage',
+  'GLSLShader'
+])
+
+export function supportsVirtualCanvasImagePreview(node: LGraphNode): boolean {
+  return CANVAS_IMAGE_PREVIEW_NODE_TYPES.has(node.type)
+}
 
 /**
  * Composable for handling canvas image previews in nodes
@@ -15,6 +24,8 @@ export function useNodeCanvasImagePreview() {
   function showCanvasImagePreview(node: LGraphNode) {
     if (!node.imgs?.length) return
 
+    if (node.isSubgraphNode()) return
+
     if (!node.widgets?.find((w) => w.name === CANVAS_IMAGE_PREVIEW_WIDGET)) {
       imagePreviewWidget(node, {
         type: 'IMAGE_PREVIEW',
diff --git a/src/composables/node/useNodeDragToCanvas.test.ts b/src/composables/node/useNodeDragToCanvas.test.ts
new file mode 100644
index 0000000000..42a990603b
--- /dev/null
+++ b/src/composables/node/useNodeDragToCanvas.test.ts
@@ -0,0 +1,342 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+import type { useNodeDragToCanvas as UseNodeDragToCanvasType } from './useNodeDragToCanvas'
+
+const { mockAddNodeOnGraph, mockConvertEventToCanvasOffset, mockCanvas } =
+  vi.hoisted(() => {
+    const mockConvertEventToCanvasOffset = vi.fn()
+    return {
+      mockAddNodeOnGraph: vi.fn(),
+      mockConvertEventToCanvasOffset,
+      mockCanvas: {
+        canvas: {
+          getBoundingClientRect: vi.fn()
+        },
+        convertEventToCanvasOffset: mockConvertEventToCanvasOffset
+      }
+    }
+  })
+
+vi.mock('@/renderer/core/canvas/canvasStore', () => ({
+  useCanvasStore: vi.fn(() => ({
+    canvas: mockCanvas
+  }))
+}))
+
+vi.mock('@/services/litegraphService', () => ({
+  useLitegraphService: vi.fn(() => ({
+    addNodeOnGraph: mockAddNodeOnGraph
+  }))
+}))
+
+describe('useNodeDragToCanvas', () => {
+  let useNodeDragToCanvas: typeof UseNodeDragToCanvasType
+
+  const mockNodeDef = {
+    name: 'TestNode',
+    display_name: 'Test Node'
+  } as ComfyNodeDefImpl
+
+  beforeEach(async () => {
+    vi.resetModules()
+    vi.resetAllMocks()
+
+    const module = await import('./useNodeDragToCanvas')
+    useNodeDragToCanvas = module.useNodeDragToCanvas
+  })
+
+  afterEach(() => {
+    const { cleanupGlobalListeners } = useNodeDragToCanvas()
+    cleanupGlobalListeners()
+    vi.restoreAllMocks()
+  })
+
+  describe('startDrag', () => {
+    it('should set isDragging to true and store the node definition', () => {
+      const { isDragging, draggedNode, startDrag } = useNodeDragToCanvas()
+
+      expect(isDragging.value).toBe(false)
+      expect(draggedNode.value).toBeNull()
+
+      startDrag(mockNodeDef)
+
+      expect(isDragging.value).toBe(true)
+      expect(draggedNode.value).toBe(mockNodeDef)
+    })
+
+    it('should set dragMode to click by default', () => {
+      const { dragMode, startDrag } = useNodeDragToCanvas()
+
+      startDrag(mockNodeDef)
+
+      expect(dragMode.value).toBe('click')
+    })
+
+    it('should set dragMode to native when specified', () => {
+      const { dragMode, startDrag } = useNodeDragToCanvas()
+
+      startDrag(mockNodeDef, 'native')
+
+      expect(dragMode.value).toBe('native')
+    })
+  })
+
+  describe('cancelDrag', () => {
+    it('should reset isDragging and draggedNode', () => {
+      const { isDragging, draggedNode, startDrag, cancelDrag } =
+        useNodeDragToCanvas()
+
+      startDrag(mockNodeDef)
+      expect(isDragging.value).toBe(true)
+
+      cancelDrag()
+
+      expect(isDragging.value).toBe(false)
+      expect(draggedNode.value).toBeNull()
+    })
+
+    it('should reset dragMode to click', () => {
+      const { dragMode, startDrag, cancelDrag } = useNodeDragToCanvas()
+
+      startDrag(mockNodeDef, 'native')
+      expect(dragMode.value).toBe('native')
+
+      cancelDrag()
+
+      expect(dragMode.value).toBe('click')
+    })
+  })
+
+  describe('setupGlobalListeners', () => {
+    it('should add event listeners to document', () => {
+      const addEventListenerSpy = vi.spyOn(document, 'addEventListener')
+      const { setupGlobalListeners } = useNodeDragToCanvas()
+
+      setupGlobalListeners()
+
+      expect(addEventListenerSpy).toHaveBeenCalledWith(
+        'pointermove',
+        expect.any(Function)
+      )
+      expect(addEventListenerSpy).toHaveBeenCalledWith(
+        'pointerup',
+        expect.any(Function),
+        true
+      )
+      expect(addEventListenerSpy).toHaveBeenCalledWith(
+        'keydown',
+        expect.any(Function)
+      )
+    })
+
+    it('should only setup listeners once', () => {
+      const addEventListenerSpy = vi.spyOn(document, 'addEventListener')
+      const { setupGlobalListeners } = useNodeDragToCanvas()
+
+      setupGlobalListeners()
+      const callCount = addEventListenerSpy.mock.calls.length
+
+      setupGlobalListeners()
+
+      expect(addEventListenerSpy.mock.calls.length).toBe(callCount)
+    })
+  })
+
+  describe('cursorPosition', () => {
+    it('should update on pointermove', () => {
+      const { cursorPosition, setupGlobalListeners } = useNodeDragToCanvas()
+
+      setupGlobalListeners()
+
+      const pointerEvent = new PointerEvent('pointermove', {
+        clientX: 100,
+        clientY: 200
+      })
+      document.dispatchEvent(pointerEvent)
+
+      expect(cursorPosition.value).toEqual({ x: 100, y: 200 })
+    })
+  })
+
+  describe('endDrag behavior', () => {
+    it('should add node when pointer is over canvas', () => {
+      mockCanvas.canvas.getBoundingClientRect.mockReturnValue({
+        left: 0,
+        right: 500,
+        top: 0,
+        bottom: 500
+      })
+      mockConvertEventToCanvasOffset.mockReturnValue([150, 150])
+
+      const { startDrag, setupGlobalListeners } = useNodeDragToCanvas()
+
+      setupGlobalListeners()
+      startDrag(mockNodeDef)
+
+      const pointerEvent = new PointerEvent('pointerup', {
+        clientX: 250,
+        clientY: 250,
+        bubbles: true
+      })
+      document.dispatchEvent(pointerEvent)
+
+      expect(mockAddNodeOnGraph).toHaveBeenCalledWith(mockNodeDef, {
+        pos: [150, 150]
+      })
+    })
+
+    it('should not add node when pointer is outside canvas', () => {
+      mockCanvas.canvas.getBoundingClientRect.mockReturnValue({
+        left: 0,
+        right: 500,
+        top: 0,
+        bottom: 500
+      })
+
+      const { startDrag, setupGlobalListeners, isDragging } =
+        useNodeDragToCanvas()
+
+      setupGlobalListeners()
+      startDrag(mockNodeDef)
+
+      const pointerEvent = new PointerEvent('pointerup', {
+        clientX: 600,
+        clientY: 250,
+        bubbles: true
+      })
+      document.dispatchEvent(pointerEvent)
+
+      expect(mockAddNodeOnGraph).not.toHaveBeenCalled()
+      expect(isDragging.value).toBe(false)
+    })
+
+    it('should cancel drag on Escape key', () => {
+      const { startDrag, setupGlobalListeners, isDragging } =
+        useNodeDragToCanvas()
+
+      setupGlobalListeners()
+      startDrag(mockNodeDef)
+
+      expect(isDragging.value).toBe(true)
+
+      const keyEvent = new KeyboardEvent('keydown', { key: 'Escape' })
+      document.dispatchEvent(keyEvent)
+
+      expect(isDragging.value).toBe(false)
+    })
+
+    it('should not cancel drag on other keys', () => {
+      const { startDrag, setupGlobalListeners, isDragging } =
+        useNodeDragToCanvas()
+
+      setupGlobalListeners()
+      startDrag(mockNodeDef)
+
+      const keyEvent = new KeyboardEvent('keydown', { key: 'Enter' })
+      document.dispatchEvent(keyEvent)
+
+      expect(isDragging.value).toBe(true)
+    })
+
+    it('should not add node on pointerup when in native drag mode', () => {
+      mockCanvas.canvas.getBoundingClientRect.mockReturnValue({
+        left: 0,
+        right: 500,
+        top: 0,
+        bottom: 500
+      })
+      mockConvertEventToCanvasOffset.mockReturnValue([150, 150])
+
+      const { startDrag, setupGlobalListeners, isDragging } =
+        useNodeDragToCanvas()
+
+      setupGlobalListeners()
+      startDrag(mockNodeDef, 'native')
+
+      const pointerEvent = new PointerEvent('pointerup', {
+        clientX: 250,
+        clientY: 250,
+        bubbles: true
+      })
+      document.dispatchEvent(pointerEvent)
+
+      expect(mockAddNodeOnGraph).not.toHaveBeenCalled()
+      expect(isDragging.value).toBe(true)
+    })
+  })
+
+  describe('handleNativeDrop', () => {
+    it('should add node when drop position is over canvas', () => {
+      mockCanvas.canvas.getBoundingClientRect.mockReturnValue({
+        left: 0,
+        right: 500,
+        top: 0,
+        bottom: 500
+      })
+      mockConvertEventToCanvasOffset.mockReturnValue([200, 200])
+
+      const { startDrag, handleNativeDrop } = useNodeDragToCanvas()
+
+      startDrag(mockNodeDef, 'native')
+      handleNativeDrop(250, 250)
+
+      expect(mockAddNodeOnGraph).toHaveBeenCalledWith(mockNodeDef, {
+        pos: [200, 200]
+      })
+    })
+
+    it('should not add node when drop position is outside canvas', () => {
+      mockCanvas.canvas.getBoundingClientRect.mockReturnValue({
+        left: 0,
+        right: 500,
+        top: 0,
+        bottom: 500
+      })
+
+      const { startDrag, handleNativeDrop, isDragging } = useNodeDragToCanvas()
+
+      startDrag(mockNodeDef, 'native')
+      handleNativeDrop(600, 250)
+
+      expect(mockAddNodeOnGraph).not.toHaveBeenCalled()
+      expect(isDragging.value).toBe(false)
+    })
+
+    it('should not add node when dragMode is click', () => {
+      mockCanvas.canvas.getBoundingClientRect.mockReturnValue({
+        left: 0,
+        right: 500,
+        top: 0,
+        bottom: 500
+      })
+      mockConvertEventToCanvasOffset.mockReturnValue([200, 200])
+
+      const { startDrag, handleNativeDrop } = useNodeDragToCanvas()
+
+      startDrag(mockNodeDef, 'click')
+      handleNativeDrop(250, 250)
+
+      expect(mockAddNodeOnGraph).not.toHaveBeenCalled()
+    })
+
+    it('should reset drag state after drop', () => {
+      mockCanvas.canvas.getBoundingClientRect.mockReturnValue({
+        left: 0,
+        right: 500,
+        top: 0,
+        bottom: 500
+      })
+      mockConvertEventToCanvasOffset.mockReturnValue([200, 200])
+
+      const { startDrag, handleNativeDrop, isDragging, dragMode } =
+        useNodeDragToCanvas()
+
+      startDrag(mockNodeDef, 'native')
+      handleNativeDrop(250, 250)
+
+      expect(isDragging.value).toBe(false)
+      expect(dragMode.value).toBe('click')
+    })
+  })
+})
diff --git a/src/composables/node/useNodeDragToCanvas.ts b/src/composables/node/useNodeDragToCanvas.ts
new file mode 100644
index 0000000000..9812a30dd1
--- /dev/null
+++ b/src/composables/node/useNodeDragToCanvas.ts
@@ -0,0 +1,116 @@
+import { ref, shallowRef } from 'vue'
+
+import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import { useLitegraphService } from '@/services/litegraphService'
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+
+type DragMode = 'click' | 'native'
+
+const isDragging = ref(false)
+const draggedNode = shallowRef<ComfyNodeDefImpl | null>(null)
+const cursorPosition = ref({ x: 0, y: 0 })
+const dragMode = ref<DragMode>('click')
+let listenersSetup = false
+
+function updatePosition(e: PointerEvent) {
+  cursorPosition.value = { x: e.clientX, y: e.clientY }
+}
+
+function cancelDrag() {
+  isDragging.value = false
+  draggedNode.value = null
+  dragMode.value = 'click'
+}
+
+function addNodeAtPosition(clientX: number, clientY: number): boolean {
+  if (!draggedNode.value) return false
+
+  const canvasStore = useCanvasStore()
+  const canvas = canvasStore.canvas
+  if (!canvas) return false
+
+  const canvasElement = canvas.canvas as HTMLCanvasElement
+  const rect = canvasElement.getBoundingClientRect()
+  const isOverCanvas =
+    clientX >= rect.left &&
+    clientX <= rect.right &&
+    clientY >= rect.top &&
+    clientY <= rect.bottom
+
+  if (isOverCanvas) {
+    const pos = canvas.convertEventToCanvasOffset({
+      clientX,
+      clientY
+    } as PointerEvent)
+    const litegraphService = useLitegraphService()
+    litegraphService.addNodeOnGraph(draggedNode.value, { pos })
+    return true
+  }
+  return false
+}
+
+function endDrag(e: PointerEvent) {
+  if (!isDragging.value || !draggedNode.value) return
+  if (dragMode.value !== 'click') return
+
+  try {
+    addNodeAtPosition(e.clientX, e.clientY)
+  } finally {
+    cancelDrag()
+  }
+}
+
+function handleKeydown(e: KeyboardEvent) {
+  if (e.key === 'Escape') cancelDrag()
+}
+
+function setupGlobalListeners() {
+  if (listenersSetup) return
+  listenersSetup = true
+
+  document.addEventListener('pointermove', updatePosition)
+  document.addEventListener('pointerup', endDrag, true)
+  document.addEventListener('keydown', handleKeydown)
+}
+
+function cleanupGlobalListeners() {
+  if (!listenersSetup) return
+  listenersSetup = false
+
+  document.removeEventListener('pointermove', updatePosition)
+  document.removeEventListener('pointerup', endDrag, true)
+  document.removeEventListener('keydown', handleKeydown)
+
+  if (isDragging.value && dragMode.value === 'click') {
+    cancelDrag()
+  }
+}
+
+export function useNodeDragToCanvas() {
+  function startDrag(nodeDef: ComfyNodeDefImpl, mode: DragMode = 'click') {
+    isDragging.value = true
+    draggedNode.value = nodeDef
+    dragMode.value = mode
+  }
+
+  function handleNativeDrop(clientX: number, clientY: number) {
+    if (dragMode.value !== 'native') return
+    try {
+      addNodeAtPosition(clientX, clientY)
+    } finally {
+      cancelDrag()
+    }
+  }
+
+  return {
+    isDragging,
+    draggedNode,
+    cursorPosition,
+    dragMode,
+    startDrag,
+    cancelDrag,
+    handleNativeDrop,
+    setupGlobalListeners,
+    cleanupGlobalListeners
+  }
+}
diff --git a/src/composables/node/useNodeImage.ts b/src/composables/node/useNodeImage.ts
index 7927207249..ea3d1d0099 100644
--- a/src/composables/node/useNodeImage.ts
+++ b/src/composables/node/useNodeImage.ts
@@ -1,6 +1,6 @@
 import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
 import { useCanvasInteractions } from '@/renderer/core/canvas/useCanvasInteractions'
-import { useNodeOutputStore } from '@/stores/imagePreviewStore'
+import { useNodeOutputStore } from '@/stores/nodeOutputStore'
 import { fitDimensionsToNodeWidth } from '@/utils/imageUtil'
 
 const VIDEO_WIDGET_NAME = 'video-preview'
diff --git a/src/composables/node/useNodeImageUpload.test.ts b/src/composables/node/useNodeImageUpload.test.ts
new file mode 100644
index 0000000000..ca755faa4a
--- /dev/null
+++ b/src/composables/node/useNodeImageUpload.test.ts
@@ -0,0 +1,175 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+
+const { mockFetchApi, mockAddAlert, mockUpdateInputs } = vi.hoisted(() => ({
+  mockFetchApi: vi.fn(),
+  mockAddAlert: vi.fn(),
+  mockUpdateInputs: vi.fn()
+}))
+
+let capturedDragOnDrop: (files: File[]) => Promise<string[]>
+
+vi.mock('@/composables/node/useNodeDragAndDrop', () => ({
+  useNodeDragAndDrop: (
+    _node: LGraphNode,
+    opts: { onDrop: typeof capturedDragOnDrop }
+  ) => {
+    capturedDragOnDrop = opts.onDrop
+  }
+}))
+
+vi.mock('@/composables/node/useNodeFileInput', () => ({
+  useNodeFileInput: () => ({ openFileSelection: vi.fn() })
+}))
+
+vi.mock('@/composables/node/useNodePaste', () => ({
+  useNodePaste: vi.fn()
+}))
+
+vi.mock('@/i18n', () => ({
+  t: (key: string) => key
+}))
+
+vi.mock('@/platform/updates/common/toastStore', () => ({
+  useToastStore: () => ({ addAlert: mockAddAlert })
+}))
+
+vi.mock('@/scripts/api', () => ({
+  api: { fetchApi: mockFetchApi }
+}))
+
+vi.mock('@/stores/assetsStore', () => ({
+  useAssetsStore: () => ({ updateInputs: mockUpdateInputs })
+}))
+
+function createMockNode(): LGraphNode {
+  return {
+    isUploading: false,
+    imgs: [new Image()],
+    graph: { setDirtyCanvas: vi.fn() },
+    size: [300, 400]
+  } as unknown as LGraphNode
+}
+
+function createFile(name = 'test.png'): File {
+  return new File(['data'], name, { type: 'image/png' })
+}
+
+function successResponse(name: string, subfolder?: string) {
+  return {
+    status: 200,
+    json: () => Promise.resolve({ name, subfolder })
+  }
+}
+
+function failResponse(status = 500) {
+  return {
+    status,
+    statusText: 'Server Error'
+  }
+}
+
+describe('useNodeImageUpload', () => {
+  let node: LGraphNode
+  let onUploadComplete: (paths: string[]) => void
+  let onUploadStart: (files: File[]) => void
+  let onUploadError: () => void
+
+  beforeEach(async () => {
+    vi.resetModules()
+    vi.clearAllMocks()
+    node = createMockNode()
+    onUploadComplete = vi.fn()
+    onUploadStart = vi.fn()
+    onUploadError = vi.fn()
+
+    const { useNodeImageUpload } = await import('./useNodeImageUpload')
+    useNodeImageUpload(node, {
+      onUploadComplete,
+      onUploadStart,
+      onUploadError,
+      folder: 'input'
+    })
+  })
+
+  it('sets isUploading true during upload and false after', async () => {
+    mockFetchApi.mockResolvedValueOnce(successResponse('test.png'))
+
+    const promise = capturedDragOnDrop([createFile()])
+    expect(node.isUploading).toBe(true)
+
+    await promise
+    expect(node.isUploading).toBe(false)
+  })
+
+  it('clears node.imgs on upload start', async () => {
+    mockFetchApi.mockResolvedValueOnce(successResponse('test.png'))
+
+    const promise = capturedDragOnDrop([createFile()])
+    expect(node.imgs).toBeUndefined()
+
+    await promise
+  })
+
+  it('calls onUploadStart with files', async () => {
+    mockFetchApi.mockResolvedValueOnce(successResponse('test.png'))
+    const files = [createFile()]
+
+    await capturedDragOnDrop(files)
+    expect(onUploadStart).toHaveBeenCalledWith(files)
+  })
+
+  it('calls onUploadComplete with valid paths on success', async () => {
+    mockFetchApi.mockResolvedValueOnce(successResponse('test.png'))
+
+    await capturedDragOnDrop([createFile()])
+    expect(onUploadComplete).toHaveBeenCalledWith(['test.png'])
+  })
+
+  it('includes subfolder in returned path', async () => {
+    mockFetchApi.mockResolvedValueOnce(successResponse('test.png', 'pasted'))
+
+    await capturedDragOnDrop([createFile()])
+    expect(onUploadComplete).toHaveBeenCalledWith(['pasted/test.png'])
+  })
+
+  it('calls onUploadError when all uploads fail', async () => {
+    mockFetchApi.mockResolvedValueOnce(failResponse())
+
+    await capturedDragOnDrop([createFile()])
+    expect(onUploadError).toHaveBeenCalled()
+    expect(onUploadComplete).not.toHaveBeenCalled()
+  })
+
+  it('resets isUploading even when upload fails', async () => {
+    mockFetchApi.mockRejectedValueOnce(new Error('Network error'))
+
+    await capturedDragOnDrop([createFile()])
+    expect(node.isUploading).toBe(false)
+  })
+
+  it('rejects concurrent uploads with a toast', async () => {
+    mockFetchApi.mockImplementation(
+      () =>
+        new Promise((resolve) =>
+          setTimeout(() => resolve(successResponse('a.png')), 50)
+        )
+    )
+
+    const first = capturedDragOnDrop([createFile('a.png')])
+    const second = await capturedDragOnDrop([createFile('b.png')])
+
+    expect(second).toEqual([])
+    expect(mockAddAlert).toHaveBeenCalledWith('g.uploadAlreadyInProgress')
+
+    await first
+  })
+
+  it('calls setDirtyCanvas on start and finish', async () => {
+    mockFetchApi.mockResolvedValueOnce(successResponse('test.png'))
+
+    await capturedDragOnDrop([createFile()])
+    expect(node.graph?.setDirtyCanvas).toHaveBeenCalledTimes(2)
+  })
+})
diff --git a/src/composables/node/useNodeImageUpload.ts b/src/composables/node/useNodeImageUpload.ts
index 96d450c1d9..587d67bcdc 100644
--- a/src/composables/node/useNodeImageUpload.ts
+++ b/src/composables/node/useNodeImageUpload.ts
@@ -1,6 +1,7 @@
 import { useNodeDragAndDrop } from '@/composables/node/useNodeDragAndDrop'
 import { useNodeFileInput } from '@/composables/node/useNodeFileInput'
 import { useNodePaste } from '@/composables/node/useNodePaste'
+import { t } from '@/i18n'
 import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
 import { useToastStore } from '@/platform/updates/common/toastStore'
 import type { ResultItemType } from '@/schemas/apiSchema'
@@ -62,6 +63,8 @@ interface ImageUploadOptions {
    * @example 'input', 'output', 'temp'
    */
   folder?: ResultItemType
+  onUploadStart?: (files: File[]) => void
+  onUploadError?: () => void
 }
 
 /**
@@ -90,10 +93,29 @@ export const useNodeImageUpload = (
   }
 
   const handleUploadBatch = async (files: File[]) => {
-    const paths = await Promise.all(files.map(handleUpload))
-    const validPaths = paths.filter((p): p is string => !!p)
-    if (validPaths.length) onUploadComplete(validPaths)
-    return validPaths
+    if (node.isUploading) {
+      useToastStore().addAlert(t('g.uploadAlreadyInProgress'))
+      return []
+    }
+    node.isUploading = true
+
+    try {
+      node.imgs = undefined
+      node.graph?.setDirtyCanvas(true)
+      options.onUploadStart?.(files)
+
+      const paths = await Promise.all(files.map(handleUpload))
+      const validPaths = paths.filter((p): p is string => !!p)
+      if (validPaths.length) {
+        onUploadComplete(validPaths)
+      } else {
+        options.onUploadError?.()
+      }
+      return validPaths
+    } finally {
+      node.isUploading = false
+      node.graph?.setDirtyCanvas(true)
+    }
   }
 
   // Handle drag & drop
diff --git a/src/composables/node/useNodePreviewAndDrag.test.ts b/src/composables/node/useNodePreviewAndDrag.test.ts
new file mode 100644
index 0000000000..bad6d3d7fe
--- /dev/null
+++ b/src/composables/node/useNodePreviewAndDrag.test.ts
@@ -0,0 +1,183 @@
+import { ref } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+
+import { useNodePreviewAndDrag } from './useNodePreviewAndDrag'
+
+const mockStartDrag = vi.fn()
+const mockHandleNativeDrop = vi.fn()
+
+vi.mock('@/composables/node/useNodeDragToCanvas', () => ({
+  useNodeDragToCanvas: () => ({
+    startDrag: mockStartDrag,
+    handleNativeDrop: mockHandleNativeDrop
+  })
+}))
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: () => ({
+    get: vi.fn().mockReturnValue('left')
+  })
+}))
+
+describe('useNodePreviewAndDrag', () => {
+  const mockNodeDef = {
+    name: 'TestNode',
+    display_name: 'Test Node'
+  } as ComfyNodeDefImpl
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  describe('initial state', () => {
+    it('should initialize with correct default values', () => {
+      const nodeDef = ref<ComfyNodeDefImpl | undefined>(mockNodeDef)
+      const result = useNodePreviewAndDrag(nodeDef)
+
+      expect(result.isHovered.value).toBe(false)
+      expect(result.isDragging.value).toBe(false)
+      expect(result.showPreview.value).toBe(false)
+      expect(result.previewRef.value).toBeNull()
+    })
+
+    it('should compute showPreview based on hover and drag state', () => {
+      const nodeDef = ref<ComfyNodeDefImpl | undefined>(mockNodeDef)
+      const result = useNodePreviewAndDrag(nodeDef)
+
+      result.isHovered.value = true
+      expect(result.showPreview.value).toBe(true)
+
+      result.isDragging.value = true
+      expect(result.showPreview.value).toBe(false)
+    })
+  })
+
+  describe('handleMouseEnter', () => {
+    it('should set isHovered to true when nodeDef exists', () => {
+      const nodeDef = ref<ComfyNodeDefImpl | undefined>(mockNodeDef)
+      const result = useNodePreviewAndDrag(nodeDef)
+
+      const mockElement = document.createElement('div')
+      vi.spyOn(mockElement, 'getBoundingClientRect').mockReturnValue({
+        top: 100,
+        left: 50,
+        right: 150,
+        bottom: 200,
+        width: 100,
+        height: 100,
+        x: 50,
+        y: 100,
+        toJSON: () => ({})
+      })
+
+      const mockEvent = {
+        currentTarget: mockElement
+      } as Partial<MouseEvent> as MouseEvent
+      result.handleMouseEnter(mockEvent)
+
+      expect(result.isHovered.value).toBe(true)
+    })
+
+    it('should not set isHovered when nodeDef is undefined', () => {
+      const nodeDef = ref<ComfyNodeDefImpl | undefined>(undefined)
+      const result = useNodePreviewAndDrag(nodeDef)
+
+      const mockElement = document.createElement('div')
+      const mockEvent = {
+        currentTarget: mockElement
+      } as Partial<MouseEvent> as MouseEvent
+      result.handleMouseEnter(mockEvent)
+
+      expect(result.isHovered.value).toBe(false)
+    })
+  })
+
+  describe('handleMouseLeave', () => {
+    it('should set isHovered to false', () => {
+      const nodeDef = ref<ComfyNodeDefImpl | undefined>(mockNodeDef)
+      const result = useNodePreviewAndDrag(nodeDef)
+
+      result.isHovered.value = true
+      result.handleMouseLeave()
+
+      expect(result.isHovered.value).toBe(false)
+    })
+  })
+
+  describe('handleDragStart', () => {
+    it('should call startDrag with native mode when nodeDef exists', () => {
+      const nodeDef = ref<ComfyNodeDefImpl | undefined>(mockNodeDef)
+      const result = useNodePreviewAndDrag(nodeDef)
+
+      const mockDataTransfer = {
+        effectAllowed: '',
+        setData: vi.fn(),
+        setDragImage: vi.fn()
+      }
+      const mockEvent = {
+        dataTransfer: mockDataTransfer
+      } as unknown as DragEvent
+
+      result.handleDragStart(mockEvent)
+
+      expect(result.isDragging.value).toBe(true)
+      expect(result.isHovered.value).toBe(false)
+      expect(mockStartDrag).toHaveBeenCalledWith(mockNodeDef, 'native')
+      expect(mockDataTransfer.effectAllowed).toBe('copy')
+      expect(mockDataTransfer.setData).toHaveBeenCalledWith(
+        'application/x-comfy-node',
+        'TestNode'
+      )
+    })
+
+    it('should not start drag when nodeDef is undefined', () => {
+      const nodeDef = ref<ComfyNodeDefImpl | undefined>(undefined)
+      const result = useNodePreviewAndDrag(nodeDef)
+
+      const mockEvent = { dataTransfer: null } as DragEvent
+      result.handleDragStart(mockEvent)
+
+      expect(result.isDragging.value).toBe(false)
+      expect(mockStartDrag).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('handleDragEnd', () => {
+    it('should call handleNativeDrop with drop coordinates', () => {
+      const nodeDef = ref<ComfyNodeDefImpl | undefined>(mockNodeDef)
+      const result = useNodePreviewAndDrag(nodeDef)
+
+      result.isDragging.value = true
+
+      const mockEvent = {
+        clientX: 100,
+        clientY: 200
+      } as Partial<DragEvent> as DragEvent
+
+      result.handleDragEnd(mockEvent)
+
+      expect(result.isDragging.value).toBe(false)
+      expect(mockHandleNativeDrop).toHaveBeenCalledWith(100, 200)
+    })
+
+    it('should always call handleNativeDrop regardless of dropEffect', () => {
+      const nodeDef = ref<ComfyNodeDefImpl | undefined>(mockNodeDef)
+      const result = useNodePreviewAndDrag(nodeDef)
+
+      result.isDragging.value = true
+
+      const mockEvent = {
+        dataTransfer: { dropEffect: 'none' },
+        clientX: 300,
+        clientY: 400
+      } as Partial<DragEvent> as DragEvent
+
+      result.handleDragEnd(mockEvent)
+
+      expect(result.isDragging.value).toBe(false)
+      expect(mockHandleNativeDrop).toHaveBeenCalledWith(300, 400)
+    })
+  })
+})
diff --git a/src/composables/node/useNodePreviewAndDrag.ts b/src/composables/node/useNodePreviewAndDrag.ts
new file mode 100644
index 0000000000..a12b1bbb58
--- /dev/null
+++ b/src/composables/node/useNodePreviewAndDrag.ts
@@ -0,0 +1,148 @@
+import type { CSSProperties, Ref } from 'vue'
+import { computed, ref } from 'vue'
+
+import { useNodeDragToCanvas } from '@/composables/node/useNodeDragToCanvas'
+import { useSettingStore } from '@/platform/settings/settingStore'
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+
+const PREVIEW_WIDTH = 200
+const PREVIEW_MARGIN = 16
+
+export function useNodePreviewAndDrag(
+  nodeDef: Ref<ComfyNodeDefImpl | undefined>,
+  panelRef?: Ref<HTMLElement | null>
+) {
+  const { startDrag, handleNativeDrop } = useNodeDragToCanvas()
+  const settingStore = useSettingStore()
+  const sidebarLocation = computed<'left' | 'right'>(() =>
+    settingStore.get('Comfy.Sidebar.Location')
+  )
+
+  const previewRef = ref<HTMLElement | null>(null)
+  const isHovered = ref(false)
+  const isDragging = ref(false)
+  const showPreview = computed(() => isHovered.value && !isDragging.value)
+
+  const nodePreviewStyle = ref<CSSProperties>({
+    position: 'fixed',
+    top: '0px',
+    left: '0px',
+    pointerEvents: 'none',
+    zIndex: 1000
+  })
+
+  function calculatePreviewPosition(rect: DOMRect) {
+    const viewportHeight = window.innerHeight
+    const viewportWidth = window.innerWidth
+
+    let left: number
+    if (sidebarLocation.value === 'left') {
+      left = rect.right + PREVIEW_MARGIN
+      if (left + PREVIEW_WIDTH > viewportWidth) {
+        left = rect.left - PREVIEW_MARGIN - PREVIEW_WIDTH
+      }
+    } else {
+      left = rect.left - PREVIEW_MARGIN - PREVIEW_WIDTH
+      if (left < 0) {
+        left = rect.right + PREVIEW_MARGIN
+      }
+    }
+
+    return { left, viewportHeight }
+  }
+
+  function handleMouseEnter(e: MouseEvent) {
+    if (!nodeDef.value) return
+
+    const target = e.currentTarget as HTMLElement
+    const rect = target.getBoundingClientRect()
+    const horizontalRect = panelRef?.value?.getBoundingClientRect() ?? rect
+    const { left, viewportHeight } = calculatePreviewPosition(horizontalRect)
+
+    let top = rect.top
+
+    nodePreviewStyle.value = {
+      position: 'fixed',
+      top: `${top}px`,
+      left: `${left}px`,
+      pointerEvents: 'none',
+      zIndex: 1000,
+      opacity: 0
+    }
+    isHovered.value = true
+
+    requestAnimationFrame(() => {
+      if (previewRef.value) {
+        const previewRect = previewRef.value.getBoundingClientRect()
+        const previewHeight = previewRect.height
+
+        const mouseY = rect.top + rect.height / 2
+        top = mouseY - previewHeight * 0.3
+
+        const minTop = PREVIEW_MARGIN
+        const maxTop = viewportHeight - previewHeight - PREVIEW_MARGIN
+        top = Math.max(minTop, Math.min(top, maxTop))
+
+        nodePreviewStyle.value = {
+          ...nodePreviewStyle.value,
+          top: `${top}px`,
+          opacity: 1
+        }
+      }
+    })
+  }
+
+  function handleMouseLeave() {
+    isHovered.value = false
+  }
+
+  function createEmptyDragImage(): HTMLElement {
+    const el = document.createElement('div')
+    el.style.position = 'absolute'
+    el.style.left = '-9999px'
+    el.style.top = '-9999px'
+    el.style.width = '1px'
+    el.style.height = '1px'
+    return el
+  }
+
+  function handleDragStart(e: DragEvent) {
+    if (!nodeDef.value) return
+
+    isDragging.value = true
+    isHovered.value = false
+
+    startDrag(nodeDef.value, 'native')
+
+    if (e.dataTransfer) {
+      e.dataTransfer.effectAllowed = 'copy'
+      e.dataTransfer.setData('application/x-comfy-node', nodeDef.value.name)
+
+      const dragImage = createEmptyDragImage()
+      document.body.appendChild(dragImage)
+      e.dataTransfer.setDragImage(dragImage, 0, 0)
+
+      requestAnimationFrame(() => {
+        document.body.removeChild(dragImage)
+      })
+    }
+  }
+
+  function handleDragEnd(e: DragEvent) {
+    isDragging.value = false
+    handleNativeDrop(e.clientX, e.clientY)
+  }
+
+  return {
+    previewRef,
+    isHovered,
+    isDragging,
+    showPreview,
+    nodePreviewStyle,
+    sidebarLocation,
+    handleMouseEnter,
+    handleMouseLeave,
+    handleDragStart,
+    handleDragEnd
+  }
+}
diff --git a/src/composables/node/useNodePricing.test.ts b/src/composables/node/useNodePricing.test.ts
new file mode 100644
index 0000000000..3713f2c142
--- /dev/null
+++ b/src/composables/node/useNodePricing.test.ts
@@ -0,0 +1,1224 @@
+import { describe, expect, it } from 'vitest'
+
+import { CREDITS_PER_USD, formatCredits } from '@/base/credits/comfyCredits'
+import {
+  evaluateNodeDefPricing,
+  formatCreditsListValue,
+  formatCreditsRangeValue,
+  formatCreditsValue,
+  formatPricingResult,
+  useNodePricing
+} from '@/composables/node/useNodePricing'
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type { ComfyNodeDef, PriceBadge } from '@/schemas/nodeDefSchema'
+import { createMockLGraphNode } from '@/utils/__tests__/litegraphTestUtils'
+
+// -----------------------------------------------------------------------------
+// Test Types
+// -----------------------------------------------------------------------------
+
+interface MockNodeWidget {
+  name: string
+  value: unknown
+  type: string
+}
+
+interface MockNodeInput {
+  name: string
+  link: number | null
+}
+
+interface MockNodeData {
+  name: string
+  api_node: boolean
+  price_badge?: PriceBadge
+}
+
+// -----------------------------------------------------------------------------
+// Test Helpers
+// -----------------------------------------------------------------------------
+
+/**
+ * Determine if a number should display 1 decimal place.
+ * Shows decimal only when the first decimal digit is non-zero.
+ */
+const shouldShowDecimal = (value: number): boolean => {
+  const rounded = Math.round(value * 10) / 10
+  return rounded % 1 !== 0
+}
+
+const creditValue = (usd: number): string => {
+  const rawCredits = usd * CREDITS_PER_USD
+  return formatCredits({
+    value: rawCredits,
+    numberOptions: {
+      minimumFractionDigits: 0,
+      maximumFractionDigits: shouldShowDecimal(rawCredits) ? 1 : 0
+    }
+  })
+}
+
+const creditsLabel = (usd: number, suffix = '/Run'): string =>
+  `${creditValue(usd)} credits${suffix}`
+
+/**
+ * Create a mock node with price_badge for testing JSONata-based pricing.
+ */
+function createMockNodeWithPriceBadge(
+  nodeTypeName: string,
+  priceBadge: PriceBadge,
+  widgets: Array<{ name: string; value: unknown }> = [],
+  inputs: Array<{ name: string; connected?: boolean }> = []
+): LGraphNode {
+  const mockWidgets = widgets.map(({ name, value }) => ({
+    name,
+    value,
+    type: 'combo'
+  }))
+
+  const mockInputs: MockNodeInput[] = inputs.map(({ name, connected }) => ({
+    name,
+    link: connected ? 1 : null
+  }))
+
+  const baseNode = createMockLGraphNode()
+  return Object.assign(baseNode, {
+    widgets: mockWidgets,
+    inputs: mockInputs,
+    constructor: {
+      nodeData: {
+        name: nodeTypeName,
+        api_node: true,
+        price_badge: priceBadge
+      }
+    }
+  })
+}
+
+/** Helper to create a price badge with defaults */
+const priceBadge = (
+  expr: string,
+  widgets: Array<{ name: string; type: string }> = [],
+  inputs: string[] = [],
+  inputGroups: string[] = []
+): PriceBadge => ({
+  engine: 'jsonata',
+  expr,
+  depends_on: { widgets, inputs, input_groups: inputGroups }
+})
+
+/** Helper to create a mock node for edge case testing */
+function createMockNode(
+  nodeData: MockNodeData,
+  widgets: MockNodeWidget[] = [],
+  inputs: MockNodeInput[] = []
+): LGraphNode {
+  const baseNode = createMockLGraphNode()
+  return Object.assign(baseNode, {
+    widgets,
+    inputs,
+    constructor: { nodeData }
+  })
+}
+
+// -----------------------------------------------------------------------------
+// Tests
+// -----------------------------------------------------------------------------
+
+describe('useNodePricing', () => {
+  describe('static expressions', () => {
+    it('should evaluate simple static USD price', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestStaticNode',
+        priceBadge('{"type":"usd","usd":0.05}')
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toBe(creditsLabel(0.05))
+    })
+
+    it('should evaluate static text result', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestTextNode',
+        priceBadge('{"type":"text","text":"Free"}')
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toBe('Free')
+    })
+  })
+
+  describe('widget value normalization', () => {
+    it('should handle INT widget as number', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestIntNode',
+        priceBadge('{"type":"usd","usd": widgets.count * 0.01}', [
+          { name: 'count', type: 'INT' }
+        ]),
+        [{ name: 'count', value: 5 }]
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toBe(creditsLabel(0.05))
+    })
+
+    it('should handle FLOAT widget as number', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestFloatNode',
+        priceBadge('{"type":"usd","usd": widgets.rate * 10}', [
+          { name: 'rate', type: 'FLOAT' }
+        ]),
+        [{ name: 'rate', value: 0.05 }]
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toBe(creditsLabel(0.5))
+    })
+
+    it('should handle COMBO widget with numeric value', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestComboNumericNode',
+        priceBadge('{"type":"usd","usd": widgets.duration * 0.07}', [
+          { name: 'duration', type: 'COMBO' }
+        ]),
+        [{ name: 'duration', value: 5 }]
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toBe(creditsLabel(0.35))
+    })
+
+    it('should handle COMBO widget with string value', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestComboStringNode',
+        priceBadge(
+          '(widgets.mode = "pro") ? {"type":"usd","usd":0.10} : {"type":"usd","usd":0.05}',
+          [{ name: 'mode', type: 'COMBO' }]
+        ),
+        [{ name: 'mode', value: 'Pro' }] // Should be lowercased to "pro"
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toBe(creditsLabel(0.1))
+    })
+
+    it('should handle BOOLEAN widget', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestBooleanNode',
+        priceBadge('{"type":"usd","usd": widgets.premium ? 0.10 : 0.05}', [
+          { name: 'premium', type: 'BOOLEAN' }
+        ]),
+        [{ name: 'premium', value: true }]
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toBe(creditsLabel(0.1))
+    })
+
+    it('should handle STRING widget (lowercased)', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestStringNode',
+        priceBadge(
+          '$contains(widgets.model, "pro") ? {"type":"usd","usd":0.10} : {"type":"usd","usd":0.05}',
+          [{ name: 'model', type: 'STRING' }]
+        ),
+        [{ name: 'model', value: 'ProModel' }] // Should be lowercased to "promodel"
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toBe(creditsLabel(0.1))
+    })
+  })
+
+  describe('complex expressions', () => {
+    it('should handle lookup tables', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestLookupNode',
+        priceBadge(
+          `(
+            $rates := {"720p": 0.05, "1080p": 0.10};
+            {"type":"usd","usd": $lookup($rates, widgets.resolution)}
+          )`,
+          [{ name: 'resolution', type: 'COMBO' }]
+        ),
+        [{ name: 'resolution', value: '1080p' }]
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toBe(creditsLabel(0.1))
+    })
+
+    it('should handle multiple widgets', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestMultiWidgetNode',
+        priceBadge(
+          `(
+            $rate := (widgets.mode = "pro") ? 0.10 : 0.05;
+            {"type":"usd","usd": $rate * widgets.duration}
+          )`,
+          [
+            { name: 'mode', type: 'COMBO' },
+            { name: 'duration', type: 'INT' }
+          ]
+        ),
+        [
+          { name: 'mode', value: 'pro' },
+          { name: 'duration', value: 10 }
+        ]
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toBe(creditsLabel(1.0))
+    })
+
+    it('should handle conditional pricing based on widget values', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestConditionalNode',
+        priceBadge(
+          `(
+            $mode := (widgets.resolution = "720p") ? "std" : "pro";
+            $rates := {"std": 0.084, "pro": 0.112};
+            {"type":"usd","usd": $lookup($rates, $mode) * widgets.duration}
+          )`,
+          [
+            { name: 'resolution', type: 'COMBO' },
+            { name: 'duration', type: 'COMBO' }
+          ]
+        ),
+        [
+          { name: 'resolution', value: '1080p' },
+          { name: 'duration', value: 5 }
+        ]
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toBe(creditsLabel(0.56))
+    })
+  })
+
+  describe('range and list results', () => {
+    it('should format range_usd result', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestRangeNode',
+        priceBadge('{"type":"range_usd","min_usd":0.05,"max_usd":0.10}')
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toMatch(/\d+\.?\d*-\d+\.?\d* credits\/Run/)
+    })
+
+    it('should format list_usd result', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestListNode',
+        priceBadge('{"type":"list_usd","usd":[0.05, 0.10, 0.15]}')
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toMatch(/\d+\.?\d*\/\d+\.?\d*\/\d+\.?\d* credits\/Run/)
+    })
+
+    it('should respect custom suffix in format options', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestSuffixNode',
+        priceBadge('{"type":"usd","usd":0.07,"format":{"suffix":"/second"}}')
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toBe(creditsLabel(0.07, '/second'))
+    })
+
+    it('should add approximate prefix when specified', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestApproximateNode',
+        priceBadge('{"type":"usd","usd":0.05,"format":{"approximate":true}}')
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toMatch(/^~\d+\.?\d* credits\/Run$/)
+    })
+
+    it('should add note suffix when specified', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestNoteNode',
+        priceBadge('{"type":"usd","usd":0.05,"format":{"note":"(estimated)"}}')
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toMatch(/credits\/Run \(estimated\)$/)
+    })
+
+    it('should combine approximate prefix and note suffix', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestCombinedFormatNode',
+        priceBadge(
+          '{"type":"usd","usd":0.05,"format":{"approximate":true,"note":"(beta)","suffix":"/image"}}'
+        )
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toMatch(/^~\d+\.?\d* credits\/image \(beta\)$/)
+    })
+
+    it('should use custom separator for list_usd', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestListSeparatorNode',
+        priceBadge(
+          '{"type":"list_usd","usd":[0.05, 0.10],"format":{"separator":" or "}}'
+        )
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toMatch(/\d+\.?\d* or \d+\.?\d* credits\/Run/)
+    })
+  })
+
+  describe('input connectivity', () => {
+    it('should handle connected input check', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestInputNode',
+        priceBadge(
+          'inputs.image.connected ? {"type":"usd","usd":0.10} : {"type":"usd","usd":0.05}',
+          [],
+          ['image']
+        ),
+        [],
+        [{ name: 'image', connected: true }]
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toBe(creditsLabel(0.1))
+    })
+
+    it('should handle disconnected input check', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestInputDisconnectedNode',
+        priceBadge(
+          'inputs.image.connected ? {"type":"usd","usd":0.10} : {"type":"usd","usd":0.05}',
+          [],
+          ['image']
+        ),
+        [],
+        [{ name: 'image', connected: false }]
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toBe(creditsLabel(0.05))
+    })
+  })
+
+  describe('edge cases', () => {
+    it('should return empty string for non-API nodes', () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNode({
+        name: 'RegularNode',
+        api_node: false
+      })
+
+      const price = getNodeDisplayPrice(node)
+      expect(price).toBe('')
+    })
+
+    it('should return empty string for nodes without price_badge', () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNode({
+        name: 'ApiNodeNoPricing',
+        api_node: true
+      })
+
+      const price = getNodeDisplayPrice(node)
+      expect(price).toBe('')
+    })
+
+    it('should handle null widget value gracefully', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestNullWidgetNode',
+        priceBadge(
+          '{"type":"usd","usd": (widgets.count != null) ? widgets.count * 0.01 : 0.05}',
+          [{ name: 'count', type: 'INT' }]
+        ),
+        [{ name: 'count', value: null }]
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toBe(creditsLabel(0.05))
+    })
+
+    it('should handle missing widget gracefully', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestMissingWidgetNode',
+        priceBadge(
+          '{"type":"usd","usd": (widgets.count != null) ? widgets.count * 0.01 : 0.05}',
+          [{ name: 'count', type: 'INT' }]
+        ),
+        []
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toBe(creditsLabel(0.05))
+    })
+
+    it('should handle undefined widget value gracefully', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestUndefinedWidgetNode',
+        priceBadge(
+          '{"type":"usd","usd": (widgets.count != null) ? widgets.count * 0.01 : 0.05}',
+          [{ name: 'count', type: 'INT' }]
+        ),
+        [{ name: 'count', value: undefined }]
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toBe(creditsLabel(0.05))
+    })
+  })
+
+  describe('getNodePricingConfig', () => {
+    it('should return pricing config for nodes with price_badge', () => {
+      const { getNodePricingConfig } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestConfigNode',
+        priceBadge('{"type":"usd","usd":0.05}')
+      )
+
+      const config = getNodePricingConfig(node)
+      expect(config).toBeDefined()
+      expect(config?.engine).toBe('jsonata')
+      expect(config?.expr).toBe('{"type":"usd","usd":0.05}')
+      expect(config?.depends_on).toBeDefined()
+    })
+
+    it('should return undefined for nodes without price_badge', () => {
+      const { getNodePricingConfig } = useNodePricing()
+      const node = createMockNode({
+        name: 'NoPricingNode',
+        api_node: true
+      })
+
+      const config = getNodePricingConfig(node)
+      expect(config).toBeUndefined()
+    })
+
+    it('should return undefined for non-API nodes', () => {
+      const { getNodePricingConfig } = useNodePricing()
+      const node = createMockNode({
+        name: 'RegularNode',
+        api_node: false
+      })
+
+      const config = getNodePricingConfig(node)
+      expect(config).toBeUndefined()
+    })
+  })
+
+  describe('getNodeRevisionRef', () => {
+    it('should return a ref for a node ID', () => {
+      const { getNodeRevisionRef } = useNodePricing()
+      const ref = getNodeRevisionRef('node-1')
+
+      expect(ref).toBeDefined()
+      expect(ref.value).toBe(0)
+    })
+
+    it('should return the same ref for the same node ID', () => {
+      const { getNodeRevisionRef } = useNodePricing()
+      const ref1 = getNodeRevisionRef('node-same')
+      const ref2 = getNodeRevisionRef('node-same')
+
+      expect(ref1).toBe(ref2)
+    })
+
+    it('should return different refs for different node IDs', () => {
+      const { getNodeRevisionRef } = useNodePricing()
+      const ref1 = getNodeRevisionRef('node-a')
+      const ref2 = getNodeRevisionRef('node-b')
+
+      expect(ref1).not.toBe(ref2)
+    })
+
+    it('should handle both string and number node IDs', () => {
+      const { getNodeRevisionRef } = useNodePricing()
+      // Number ID gets stringified, so '123' and 123 should return the same ref
+      const refFromNumber = getNodeRevisionRef(123)
+      const refFromString = getNodeRevisionRef('123')
+
+      expect(refFromNumber).toBe(refFromString)
+    })
+  })
+
+  describe('triggerPriceRecalculation', () => {
+    it('should not throw for API nodes with price_badge', () => {
+      const { triggerPriceRecalculation } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestTriggerNode',
+        priceBadge('{"type":"usd","usd":0.05}')
+      )
+
+      expect(() => triggerPriceRecalculation(node)).not.toThrow()
+    })
+
+    it('should not throw for non-API nodes', () => {
+      const { triggerPriceRecalculation } = useNodePricing()
+      const node = createMockNode({
+        name: 'RegularNode',
+        api_node: false
+      })
+
+      expect(() => triggerPriceRecalculation(node)).not.toThrow()
+    })
+  })
+
+  describe('error handling', () => {
+    it('should return empty string for invalid JSONata expression', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestInvalidExprNode',
+        // Invalid JSONata syntax (unclosed parenthesis)
+        priceBadge('{"type":"usd","usd": (widgets.count * 0.01')
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      // Should not crash, just return empty
+      expect(price).toBe('')
+    })
+
+    it('should return empty string for expression that throws at runtime', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestRuntimeErrorNode',
+        // Expression that will fail at runtime (calling function on undefined)
+        priceBadge('$lookup(undefined, "key")')
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toBe('')
+    })
+
+    it('should return empty string for invalid PricingResult type', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestInvalidResultTypeNode',
+        // Returns object with invalid type field
+        priceBadge('{"type":"invalid_type","value":123}')
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toBe('')
+    })
+
+    it('should handle legacy format without type field', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestLegacyFormatNode',
+        // Returns object without type field (legacy format)
+        priceBadge('{"usd":0.05}')
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      // Legacy format {usd: number} is supported
+      expect(price).toBe(creditsLabel(0.05))
+    })
+
+    it('should return empty string for non-object result', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestNonObjectNode',
+        // Returns a plain number instead of PricingResult object
+        priceBadge('0.05')
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toBe('')
+    })
+
+    it('should return empty string for null result', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+      const node = createMockNodeWithPriceBadge(
+        'TestNullResultNode',
+        priceBadge('null')
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      expect(price).toBe('')
+    })
+  })
+
+  describe('input_groups connectivity', () => {
+    it('should count connected inputs in a group', async () => {
+      const { getNodeDisplayPrice } = useNodePricing()
+
+      // Create a node with autogrow-style inputs (group.input1, group.input2, etc.)
+      const node = createMockNode(
+        {
+          name: 'TestInputGroupNode',
+          api_node: true,
+          price_badge: {
+            engine: 'jsonata',
+            expr: '{"type":"usd","usd": inputGroups.videos * 0.05}',
+            depends_on: {
+              widgets: [],
+              inputs: [],
+              input_groups: ['videos']
+            }
+          }
+        },
+        [],
+        [
+          { name: 'videos.clip1', link: 1 }, // connected
+          { name: 'videos.clip2', link: 2 }, // connected
+          { name: 'videos.clip3', link: null }, // disconnected
+          { name: 'other_input', link: 3 } // connected but not in group
+        ]
+      )
+
+      getNodeDisplayPrice(node)
+      await new Promise((r) => setTimeout(r, 50))
+      const price = getNodeDisplayPrice(node)
+      // 2 connected inputs in 'videos' group * 0.05 = 0.10
+      expect(price).toBe(creditsLabel(0.1))
+    })
+  })
+
+  describe('decimal formatting', () => {
+    describe('shouldShowDecimal helper', () => {
+      it('should return true when first decimal digit is non-zero', () => {
+        expect(shouldShowDecimal(10.5)).toBe(true)
+        expect(shouldShowDecimal(10.1)).toBe(true)
+        expect(shouldShowDecimal(10.9)).toBe(true)
+        expect(shouldShowDecimal(1.5)).toBe(true)
+      })
+
+      it('should return false for whole numbers', () => {
+        expect(shouldShowDecimal(10)).toBe(false)
+        expect(shouldShowDecimal(10.0)).toBe(false)
+        expect(shouldShowDecimal(1)).toBe(false)
+        expect(shouldShowDecimal(100)).toBe(false)
+      })
+
+      it('should return false when decimal rounds to zero', () => {
+        // 10.04 rounds to 10.0, so no decimal shown
+        expect(shouldShowDecimal(10.04)).toBe(false)
+        expect(shouldShowDecimal(10.049)).toBe(false)
+      })
+
+      it('should return true when decimal rounds to non-zero', () => {
+        // 10.05 rounds to 10.1, so decimal shown
+        expect(shouldShowDecimal(10.05)).toBe(true)
+        expect(shouldShowDecimal(10.06)).toBe(true)
+        // 10.45 rounds to 10.5
+        expect(shouldShowDecimal(10.45)).toBe(true)
+      })
+    })
+
+    describe('credit value formatting', () => {
+      it('should show decimal for USD values that result in fractional credits', () => {
+        // $0.05 * 211 = 10.55 credits → "10.6"
+        const value1 = creditValue(0.05)
+        expect(value1).toBe('10.6')
+
+        // $0.10 * 211 = 21.1 credits → "21.1"
+        const value2 = creditValue(0.1)
+        expect(value2).toBe('21.1')
+      })
+
+      it('should not show decimal for USD values that result in whole credits', () => {
+        // $1.00 * 211 = 211 credits → "211"
+        const value = creditValue(1.0)
+        expect(value).toBe('211')
+      })
+
+      it('should not show decimal when credits round to whole number', () => {
+        // Find a USD value that results in credits close to a whole number
+        // $0.0473933... * 211 ≈ 10.0 credits
+        // Let's use a value that gives us ~10.02 credits which rounds to 10.0
+        const usd = 10.02 / CREDITS_PER_USD // ~0.0475 USD → ~10.02 credits
+        const value = creditValue(usd)
+        expect(value).toBe('10')
+      })
+    })
+
+    describe('integration with pricing display', () => {
+      it('should display decimal in badge for fractional credits', async () => {
+        const { getNodeDisplayPrice } = useNodePricing()
+        // $0.05 * 211 = 10.55 credits → "10.6 credits/Run"
+        const node = createMockNodeWithPriceBadge(
+          'TestDecimalNode',
+          priceBadge('{"type":"usd","usd":0.05}')
+        )
+
+        getNodeDisplayPrice(node)
+        await new Promise((r) => setTimeout(r, 50))
+        const price = getNodeDisplayPrice(node)
+        expect(price).toBe('10.6 credits/Run')
+      })
+
+      it('should not display decimal in badge for whole credits', async () => {
+        const { getNodeDisplayPrice } = useNodePricing()
+        // $1.00 * 211 = 211 credits → "211 credits/Run"
+        const node = createMockNodeWithPriceBadge(
+          'TestWholeCreditsNode',
+          priceBadge('{"type":"usd","usd":1.00}')
+        )
+
+        getNodeDisplayPrice(node)
+        await new Promise((r) => setTimeout(r, 50))
+        const price = getNodeDisplayPrice(node)
+        expect(price).toBe('211 credits/Run')
+      })
+
+      it('should handle range with mixed decimal display', async () => {
+        const { getNodeDisplayPrice } = useNodePricing()
+        // min: $0.05 * 211 = 10.55 → 10.6
+        // max: $1.00 * 211 = 211 → 211
+        const node = createMockNodeWithPriceBadge(
+          'TestMixedRangeNode',
+          priceBadge('{"type":"range_usd","min_usd":0.05,"max_usd":1.00}')
+        )
+
+        getNodeDisplayPrice(node)
+        await new Promise((r) => setTimeout(r, 50))
+        const price = getNodeDisplayPrice(node)
+        expect(price).toBe('10.6-211 credits/Run')
+      })
+    })
+  })
+})
+
+// -----------------------------------------------------------------------------
+// formatPricingResult Tests
+// -----------------------------------------------------------------------------
+
+describe('formatPricingResult', () => {
+  describe('type: usd', () => {
+    it('should format usd result', () => {
+      const result = formatPricingResult({ type: 'usd', usd: 0.05 })
+      expect(result).toBe('10.6 credits/Run')
+    })
+
+    it('should return valueOnly format', () => {
+      const result = formatPricingResult(
+        { type: 'usd', usd: 0.05 },
+        { valueOnly: true }
+      )
+      expect(result).toBe('10.6')
+    })
+
+    it('should handle approximate prefix in valueOnly mode', () => {
+      const result = formatPricingResult(
+        { type: 'usd', usd: 0.05, format: { approximate: true } },
+        { valueOnly: true }
+      )
+      expect(result).toBe('~10.6')
+    })
+
+    it('should return empty for null usd', () => {
+      const result = formatPricingResult({ type: 'usd', usd: null as never })
+      expect(result).toBe('')
+    })
+  })
+
+  describe('type: range_usd', () => {
+    it('should format range result', () => {
+      const result = formatPricingResult({
+        type: 'range_usd',
+        min_usd: 0.05,
+        max_usd: 0.1
+      })
+      expect(result).toBe('10.6-21.1 credits/Run')
+    })
+
+    it('should return valueOnly format', () => {
+      const result = formatPricingResult(
+        { type: 'range_usd', min_usd: 0.05, max_usd: 0.1 },
+        { valueOnly: true }
+      )
+      expect(result).toBe('10.6-21.1')
+    })
+
+    it('should collapse range when min equals max', () => {
+      const result = formatPricingResult(
+        { type: 'range_usd', min_usd: 0.05, max_usd: 0.05 },
+        { valueOnly: true }
+      )
+      expect(result).toBe('10.6')
+    })
+  })
+
+  describe('type: list_usd', () => {
+    it('should format list result', () => {
+      const result = formatPricingResult({
+        type: 'list_usd',
+        usd: [0.05, 0.1, 0.15]
+      })
+      expect(result).toMatch(/\d+\.?\d*\/\d+\.?\d*\/\d+\.?\d* credits\/Run/)
+    })
+
+    it('should return valueOnly format', () => {
+      const result = formatPricingResult(
+        { type: 'list_usd', usd: [0.05, 0.1] },
+        { valueOnly: true }
+      )
+      expect(result).toBe('10.6/21.1')
+    })
+  })
+
+  describe('type: text', () => {
+    it('should return text as-is', () => {
+      const result = formatPricingResult({ type: 'text', text: 'Free' })
+      expect(result).toBe('Free')
+    })
+  })
+
+  describe('legacy format', () => {
+    it('should handle {usd: number} without type field', () => {
+      const result = formatPricingResult({ usd: 0.05 })
+      expect(result).toBe('10.6 credits/Run')
+    })
+
+    it('should return valueOnly for legacy format', () => {
+      const result = formatPricingResult({ usd: 0.05 }, { valueOnly: true })
+      expect(result).toBe('10.6')
+    })
+  })
+
+  describe('invalid inputs', () => {
+    it('should return empty for invalid type', () => {
+      const result = formatPricingResult({ type: 'invalid' })
+      expect(result).toBe('')
+    })
+
+    it('should return empty for null', () => {
+      const result = formatPricingResult(null)
+      expect(result).toBe('')
+    })
+
+    it('should return empty for undefined', () => {
+      const result = formatPricingResult(undefined)
+      expect(result).toBe('')
+    })
+  })
+})
+
+// -----------------------------------------------------------------------------
+// formatCreditsValue / Range / List Tests
+// -----------------------------------------------------------------------------
+
+describe('formatCreditsValue', () => {
+  it('should format USD to credits', () => {
+    expect(formatCreditsValue(0.05)).toBe('10.6')
+    expect(formatCreditsValue(1.0)).toBe('211')
+  })
+})
+
+describe('formatCreditsRangeValue', () => {
+  it('should format min-max range', () => {
+    expect(formatCreditsRangeValue(0.05, 0.1)).toBe('10.6-21.1')
+  })
+
+  it('should collapse when min equals max', () => {
+    expect(formatCreditsRangeValue(0.05, 0.05)).toBe('10.6')
+  })
+})
+
+describe('formatCreditsListValue', () => {
+  it('should join values with separator', () => {
+    expect(formatCreditsListValue([0.05, 0.1])).toBe('10.6/21.1')
+  })
+
+  it('should use custom separator', () => {
+    expect(formatCreditsListValue([0.05, 0.1], ' | ')).toBe('10.6 | 21.1')
+  })
+})
+
+// -----------------------------------------------------------------------------
+// evaluateNodeDefPricing Tests
+// -----------------------------------------------------------------------------
+
+describe('evaluateNodeDefPricing', () => {
+  const createMockNodeDef = (
+    overrides: Partial<ComfyNodeDef> = {}
+  ): ComfyNodeDef =>
+    ({
+      name: 'TestNode',
+      display_name: 'Test Node',
+      description: '',
+      category: 'test',
+      input: { required: {}, optional: {} },
+      output: [],
+      output_name: [],
+      output_is_list: [],
+      python_module: 'test',
+      ...overrides
+    }) as ComfyNodeDef
+
+  it('should return empty for node without price_badge', async () => {
+    const nodeDef = createMockNodeDef()
+    const result = await evaluateNodeDefPricing(nodeDef)
+    expect(result).toBe('')
+  })
+
+  it('should evaluate static expression', async () => {
+    const nodeDef = createMockNodeDef({
+      name: 'StaticPriceNode',
+      price_badge: {
+        engine: 'jsonata',
+        expr: '{"type":"usd","usd":0.05}',
+        depends_on: { widgets: [], inputs: [], input_groups: [] }
+      }
+    })
+    const result = await evaluateNodeDefPricing(nodeDef)
+    expect(result).toBe('10.6')
+  })
+
+  it('should use default value from input spec', async () => {
+    const nodeDef = createMockNodeDef({
+      name: 'DefaultValueNode',
+      price_badge: {
+        engine: 'jsonata',
+        expr: '{"type":"usd","usd": widgets.count * 0.01}',
+        depends_on: {
+          widgets: [{ name: 'count', type: 'INT' }],
+          inputs: [],
+          input_groups: []
+        }
+      },
+      input: {
+        required: {
+          count: ['INT', { default: 10 }]
+        }
+      }
+    })
+    const result = await evaluateNodeDefPricing(nodeDef)
+    expect(result).toBe('21.1') // 10 * 0.01 = 0.1 USD = 21.1 credits
+  })
+
+  it('should use first option for COMBO without default', async () => {
+    const nodeDef = createMockNodeDef({
+      name: 'ComboNode',
+      price_badge: {
+        engine: 'jsonata',
+        expr: '(widgets.mode = "pro") ? {"type":"usd","usd":0.10} : {"type":"usd","usd":0.05}',
+        depends_on: {
+          widgets: [{ name: 'mode', type: 'COMBO' }],
+          inputs: [],
+          input_groups: []
+        }
+      },
+      input: {
+        required: {
+          mode: [['standard', 'pro'], {}]
+        }
+      }
+    })
+    const result = await evaluateNodeDefPricing(nodeDef)
+    // First option is "standard", not "pro", so should be 0.05 USD
+    expect(result).toBe('10.6')
+  })
+
+  it('should use "original" as fallback for dynamic COMBO without input', async () => {
+    const nodeDef = createMockNodeDef({
+      name: 'DynamicComboNode',
+      price_badge: {
+        engine: 'jsonata',
+        expr: `(
+          $prices := {"original": 0.05, "720p": 0.03};
+          {"type":"usd","usd": $lookup($prices, widgets.resolution)}
+        )`,
+        depends_on: {
+          widgets: [{ name: 'resolution', type: 'COMBO' }],
+          inputs: [],
+          input_groups: []
+        }
+      },
+      input: {
+        required: {
+          // resolution widget is NOT in inputs (dynamically created)
+        }
+      }
+    })
+    const result = await evaluateNodeDefPricing(nodeDef)
+    // Fallback to "original" = 0.05 USD
+    expect(result).toBe('10.6')
+  })
+
+  it('should handle dynamic combo with options array', async () => {
+    const nodeDef = createMockNodeDef({
+      name: 'DynamicOptionsNode',
+      price_badge: {
+        engine: 'jsonata',
+        expr: '{"type":"usd","usd": widgets.model = "model_a" ? 0.05 : 0.10}',
+        depends_on: {
+          widgets: [{ name: 'model', type: 'COMFY_DYNAMICCOMBO_V3' }],
+          inputs: [],
+          input_groups: []
+        }
+      },
+      input: {
+        required: {
+          model: [
+            'COMFY_DYNAMICCOMBO_V3',
+            { options: [{ key: 'model_a' }, { key: 'model_b' }] }
+          ]
+        }
+      }
+    })
+    const result = await evaluateNodeDefPricing(nodeDef)
+    // First option key is "model_a" = 0.05 USD
+    expect(result).toBe('10.6')
+  })
+
+  it('should assume inputs disconnected in preview', async () => {
+    const nodeDef = createMockNodeDef({
+      name: 'InputConnectedNode',
+      price_badge: {
+        engine: 'jsonata',
+        expr: 'inputs.image.connected ? {"type":"usd","usd":0.10} : {"type":"usd","usd":0.05}',
+        depends_on: {
+          widgets: [],
+          inputs: ['image'],
+          input_groups: []
+        }
+      }
+    })
+    const result = await evaluateNodeDefPricing(nodeDef)
+    // In preview, inputs are assumed disconnected
+    expect(result).toBe('10.6')
+  })
+
+  it('should assume inputGroups have 0 count in preview', async () => {
+    const nodeDef = createMockNodeDef({
+      name: 'InputGroupNode',
+      price_badge: {
+        engine: 'jsonata',
+        expr: '{"type":"usd","usd": 0.05 + inputGroups.videos * 0.02}',
+        depends_on: {
+          widgets: [],
+          inputs: [],
+          input_groups: ['videos']
+        }
+      }
+    })
+    const result = await evaluateNodeDefPricing(nodeDef)
+    // 0.05 + 0 * 0.02 = 0.05 USD
+    expect(result).toBe('10.6')
+  })
+
+  it('should return empty on JSONata error', async () => {
+    const nodeDef = createMockNodeDef({
+      name: 'ErrorNode',
+      price_badge: {
+        engine: 'jsonata',
+        expr: '$lookup(undefined, "key")',
+        depends_on: { widgets: [], inputs: [], input_groups: [] }
+      }
+    })
+    const result = await evaluateNodeDefPricing(nodeDef)
+    expect(result).toBe('')
+  })
+
+  it('should handle range_usd result', async () => {
+    const nodeDef = createMockNodeDef({
+      name: 'RangeNode',
+      price_badge: {
+        engine: 'jsonata',
+        expr: '{"type":"range_usd","min_usd":0.05,"max_usd":0.10}',
+        depends_on: { widgets: [], inputs: [], input_groups: [] }
+      }
+    })
+    const result = await evaluateNodeDefPricing(nodeDef)
+    expect(result).toBe('10.6-21.1')
+  })
+
+  it('should handle approximate format in valueOnly mode', async () => {
+    const nodeDef = createMockNodeDef({
+      name: 'ApproximateNode',
+      price_badge: {
+        engine: 'jsonata',
+        expr: '{"type":"usd","usd":0.05,"format":{"approximate":true}}',
+        depends_on: { widgets: [], inputs: [], input_groups: [] }
+      }
+    })
+    const result = await evaluateNodeDefPricing(nodeDef)
+    expect(result).toBe('~10.6')
+  })
+})
diff --git a/src/composables/node/useNodePricing.ts b/src/composables/node/useNodePricing.ts
index cf627b6f92..634d94d0f6 100644
--- a/src/composables/node/useNodePricing.ts
+++ b/src/composables/node/useNodePricing.ts
@@ -1,12 +1,46 @@
-import { formatCreditsFromUsd } from '@/base/credits/comfyCredits'
-import type { INodeInputSlot, LGraphNode } from '@/lib/litegraph/src/litegraph'
-import type { IComboWidget } from '@/lib/litegraph/src/types/widgets'
+// JSONata-based pricing badge evaluation for API nodes.
+//
+// Pricing declarations are read from ComfyUI node definitions (price_badge field).
+// The Frontend evaluates these declarations locally using a JSONata engine.
+//
+// JSONata v2.x NOTE:
+// - jsonata(expression).evaluate(input) returns a Promise in JSONata 2.x.
+// - Therefore, pricing evaluation is async. This file implements:
+//   - sync getter (returns cached label / last-known label),
+//   - async evaluation + cache,
+//   - reactive tick to update UI when async evaluation completes.
 
-const DEFAULT_NUMBER_OPTIONS: Intl.NumberFormatOptions = {
-  minimumFractionDigits: 0,
-  maximumFractionDigits: 0
+import { memoize } from 'es-toolkit'
+import { readonly, ref } from 'vue'
+import type { Ref } from 'vue'
+import { CREDITS_PER_USD, formatCredits } from '@/base/credits/comfyCredits'
+import { LiteGraph } from '@/lib/litegraph/src/litegraph'
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type { INodeInputSlot } from '@/lib/litegraph/src/interfaces'
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+import type {
+  ComfyNodeDef,
+  PriceBadge,
+  WidgetDependency
+} from '@/schemas/nodeDefSchema'
+import { useNodeDefStore } from '@/stores/nodeDefStore'
+import type { Expression } from 'jsonata'
+import jsonata from 'jsonata'
+
+/**
+ * Determine if a number should display 1 decimal place.
+ * Shows decimal only when the first decimal digit is non-zero.
+ */
+const shouldShowDecimal = (value: number): boolean => {
+  const rounded = Math.round(value * 10) / 10
+  return rounded % 1 !== 0
 }
 
+const getNumberOptions = (credits: number): Intl.NumberFormatOptions => ({
+  minimumFractionDigits: 0,
+  maximumFractionDigits: shouldShowDecimal(credits) ? 1 : 0
+})
+
 type CreditFormatOptions = {
   suffix?: string
   note?: string
@@ -14,11 +48,14 @@ type CreditFormatOptions = {
   separator?: string
 }
 
-const formatCreditsValue = (usd: number): string =>
-  formatCreditsFromUsd({
-    usd,
-    numberOptions: DEFAULT_NUMBER_OPTIONS
+export const formatCreditsValue = (usd: number): string => {
+  // Use raw credits value (before rounding) to determine decimal display
+  const rawCredits = usd * CREDITS_PER_USD
+  return formatCredits({
+    value: rawCredits,
+    numberOptions: getNumberOptions(rawCredits)
   })
+}
 
 const makePrefix = (approximate?: boolean) => (approximate ? '~' : '')
 
@@ -32,2237 +69,706 @@ const formatCreditsLabel = (
 ): string =>
   `${makePrefix(approximate)}${formatCreditsValue(usd)} credits${makeSuffix(suffix)}${appendNote(note)}`
 
+export const formatCreditsRangeValue = (
+  minUsd: number,
+  maxUsd: number
+): string => {
+  const min = formatCreditsValue(minUsd)
+  const max = formatCreditsValue(maxUsd)
+  return min === max ? min : `${min}-${max}`
+}
+
 const formatCreditsRangeLabel = (
   minUsd: number,
   maxUsd: number,
   { suffix, note, approximate }: CreditFormatOptions = {}
 ): string => {
-  const min = formatCreditsValue(minUsd)
-  const max = formatCreditsValue(maxUsd)
-  const rangeValue = min === max ? min : `${min}-${max}`
+  const rangeValue = formatCreditsRangeValue(minUsd, maxUsd)
   return `${makePrefix(approximate)}${rangeValue} credits${makeSuffix(suffix)}${appendNote(note)}`
 }
 
+export const formatCreditsListValue = (
+  usdValues: number[],
+  separator = '/'
+): string => {
+  const parts = usdValues.map((value) => formatCreditsValue(value))
+  return parts.join(separator)
+}
+
 const formatCreditsListLabel = (
   usdValues: number[],
   { suffix, note, approximate, separator }: CreditFormatOptions = {}
 ): string => {
-  const parts = usdValues.map((value) => formatCreditsValue(value))
-  const value = parts.join(separator ?? '/')
+  const value = formatCreditsListValue(usdValues, separator)
   return `${makePrefix(approximate)}${value} credits${makeSuffix(suffix)}${appendNote(note)}`
 }
 
-/**
- * Function that calculates dynamic pricing based on node widget values
- */
-type PricingFunction = (node: LGraphNode) => string
-
-/**
- * Safely executes a pricing function with error handling
- * Returns null if the function throws an error, allowing the node to still render
- */
-function safePricingExecution(
-  fn: PricingFunction,
-  node: LGraphNode,
-  fallback: string = ''
-): string {
-  try {
-    return fn(node)
-  } catch (error) {
-    // Log error in development but don't throw to avoid breaking node rendering
-    if (process.env.NODE_ENV === 'development') {
-      console.warn(
-        'Pricing calculation failed for node:',
-        node.constructor?.nodeData?.name,
-        error
-      )
+// -----------------------------
+// JSONata pricing types
+// -----------------------------
+type PricingResult =
+  | { type: 'text'; text: string }
+  | { type: 'usd'; usd: number; format?: CreditFormatOptions }
+  | {
+      type: 'range_usd'
+      min_usd: number
+      max_usd: number
+      format?: CreditFormatOptions
     }
-    return fallback
-  }
-}
+  | { type: 'list_usd'; usd: number[]; format?: CreditFormatOptions }
 
-/**
- * Helper function to calculate Runway duration-based pricing
- * @param node - The LiteGraph node
- * @returns Formatted price string
- */
-const calculateRunwayDurationPrice = (node: LGraphNode): string => {
-  const durationWidget = node.widgets?.find(
-    (w) => w.name === 'duration'
-  ) as IComboWidget
+const PRICING_RESULT_TYPES = ['text', 'usd', 'range_usd', 'list_usd'] as const
 
-  if (!durationWidget) return formatCreditsLabel(0.0715, { suffix: '/second' })
-
-  const duration = Number(durationWidget.value)
-  const validDuration = isNaN(duration) ? 5 : duration
-  const cost = 0.0715 * validDuration
-  return formatCreditsLabel(cost)
-}
-
-const makeOmniProDurationCalculator =
-  (pricePerSecond: number): PricingFunction =>
-  (node: LGraphNode): string => {
-    const durationWidget = node.widgets?.find(
-      (w) => w.name === 'duration'
-    ) as IComboWidget
-    if (!durationWidget)
-      return formatCreditsLabel(pricePerSecond, { suffix: '/second' })
-
-    const seconds = parseFloat(String(durationWidget.value))
-    if (!Number.isFinite(seconds))
-      return formatCreditsLabel(pricePerSecond, { suffix: '/second' })
-
-    const cost = pricePerSecond * seconds
-    return formatCreditsLabel(cost)
-  }
-
-const klingMotionControlPricingCalculator: PricingFunction = (
-  node: LGraphNode
-): string => {
-  const modeWidget = node.widgets?.find(
-    (w) => w.name === 'mode'
-  ) as IComboWidget
-
-  if (!modeWidget) {
-    return formatCreditsListLabel([0.07, 0.112], {
-      suffix: '/second',
-      note: '(std/pro)'
-    })
-  }
-
-  const mode = String(modeWidget.value).toLowerCase()
-
-  if (mode === 'pro') return formatCreditsLabel(0.112, { suffix: '/second' })
-  if (mode === 'std') return formatCreditsLabel(0.07, { suffix: '/second' })
-
-  return formatCreditsListLabel([0.07, 0.112], {
-    suffix: '/second',
-    note: '(std/pro)'
-  })
-}
-
-const pixversePricingCalculator = (node: LGraphNode): string => {
-  const durationWidget = node.widgets?.find(
-    (w) => w.name === 'duration_seconds'
-  ) as IComboWidget
-  const qualityWidget = node.widgets?.find(
-    (w) => w.name === 'quality'
-  ) as IComboWidget
-  const motionModeWidget = node.widgets?.find(
-    (w) => w.name === 'motion_mode'
-  ) as IComboWidget
-
-  if (!durationWidget || !qualityWidget) {
-    return formatCreditsRangeLabel(0.45, 1.2, {
-      note: '(varies with duration, quality & motion mode)'
-    })
-  }
-
-  const duration = String(durationWidget.value)
-  const quality = String(qualityWidget.value)
-  const motionMode = String(motionModeWidget?.value)
-
-  // Basic pricing based on duration and quality
-  if (duration.includes('5')) {
-    if (quality.includes('1080p')) return formatCreditsLabel(1.2)
-    if (quality.includes('720p') && motionMode?.includes('fast'))
-      return formatCreditsLabel(1.2)
-    if (quality.includes('720p') && motionMode?.includes('normal'))
-      return formatCreditsLabel(0.6)
-    if (quality.includes('540p') && motionMode?.includes('fast'))
-      return formatCreditsLabel(0.9)
-    if (quality.includes('540p') && motionMode?.includes('normal'))
-      return formatCreditsLabel(0.45)
-    if (quality.includes('360p') && motionMode?.includes('fast'))
-      return formatCreditsLabel(0.9)
-    if (quality.includes('360p') && motionMode?.includes('normal'))
-      return formatCreditsLabel(0.45)
-  } else if (duration.includes('8')) {
-    if (quality.includes('540p') && motionMode?.includes('normal'))
-      return formatCreditsLabel(0.9)
-    if (quality.includes('540p') && motionMode?.includes('fast'))
-      return formatCreditsLabel(1.2)
-    if (quality.includes('360p') && motionMode?.includes('normal'))
-      return formatCreditsLabel(0.9)
-    if (quality.includes('360p') && motionMode?.includes('fast'))
-      return formatCreditsLabel(1.2)
-    if (quality.includes('1080p') && motionMode?.includes('normal'))
-      return formatCreditsLabel(1.2)
-    if (quality.includes('1080p') && motionMode?.includes('fast'))
-      return formatCreditsLabel(1.2)
-    if (quality.includes('720p') && motionMode?.includes('normal'))
-      return formatCreditsLabel(1.2)
-    if (quality.includes('720p') && motionMode?.includes('fast'))
-      return formatCreditsLabel(1.2)
-  }
-
-  return formatCreditsLabel(0.9)
-}
-
-const byteDanceVideoPricingCalculator = (node: LGraphNode): string => {
-  const modelWidget = node.widgets?.find(
-    (w) => w.name === 'model'
-  ) as IComboWidget
-  const durationWidget = node.widgets?.find(
-    (w) => w.name === 'duration'
-  ) as IComboWidget
-  const resolutionWidget = node.widgets?.find(
-    (w) => w.name === 'resolution'
-  ) as IComboWidget
-
-  if (!modelWidget || !durationWidget || !resolutionWidget) return 'Token-based'
-
-  const model = String(modelWidget.value).toLowerCase()
-  const resolution = String(resolutionWidget.value).toLowerCase()
-  const seconds = parseFloat(String(durationWidget.value))
-  const priceByModel: Record<string, Record<string, [number, number]>> = {
-    'seedance-1-0-pro': {
-      '480p': [0.23, 0.24],
-      '720p': [0.51, 0.56],
-      '1080p': [1.18, 1.22]
-    },
-    'seedance-1-0-pro-fast': {
-      '480p': [0.09, 0.1],
-      '720p': [0.21, 0.23],
-      '1080p': [0.47, 0.49]
-    },
-    'seedance-1-0-lite': {
-      '480p': [0.17, 0.18],
-      '720p': [0.37, 0.41],
-      '1080p': [0.85, 0.88]
-    }
-  }
-
-  const modelKey = model.includes('seedance-1-0-pro-fast')
-    ? 'seedance-1-0-pro-fast'
-    : model.includes('seedance-1-0-pro')
-      ? 'seedance-1-0-pro'
-      : model.includes('seedance-1-0-lite')
-        ? 'seedance-1-0-lite'
-        : ''
-
-  const resKey = resolution.includes('1080')
-    ? '1080p'
-    : resolution.includes('720')
-      ? '720p'
-      : resolution.includes('480')
-        ? '480p'
-        : ''
-
-  const baseRange =
-    modelKey && resKey ? priceByModel[modelKey]?.[resKey] : undefined
-  if (!baseRange) return 'Token-based'
-
-  const [min10s, max10s] = baseRange
-  const scale = seconds / 10
-  const minCost = min10s * scale
-  const maxCost = max10s * scale
-
-  if (minCost === maxCost) return formatCreditsLabel(minCost)
-  return formatCreditsRangeLabel(minCost, maxCost)
-}
-
-const ltxvPricingCalculator = (node: LGraphNode): string => {
-  const modelWidget = node.widgets?.find(
-    (w) => w.name === 'model'
-  ) as IComboWidget
-  const durationWidget = node.widgets?.find(
-    (w) => w.name === 'duration'
-  ) as IComboWidget
-  const resolutionWidget = node.widgets?.find(
-    (w) => w.name === 'resolution'
-  ) as IComboWidget
-
-  const fallback = formatCreditsRangeLabel(0.04, 0.24, {
-    suffix: '/second'
-  })
-  if (!modelWidget || !durationWidget || !resolutionWidget) return fallback
-
-  const model = String(modelWidget.value).toLowerCase()
-  const resolution = String(resolutionWidget.value).toLowerCase()
-  const seconds = parseFloat(String(durationWidget.value))
-  const priceByModel: Record<string, Record<string, number>> = {
-    'ltx-2 (pro)': {
-      '1920x1080': 0.06,
-      '2560x1440': 0.12,
-      '3840x2160': 0.24
-    },
-    'ltx-2 (fast)': {
-      '1920x1080': 0.04,
-      '2560x1440': 0.08,
-      '3840x2160': 0.16
-    }
-  }
-
-  const modelTable = priceByModel[model]
-  if (!modelTable) return fallback
-
-  const pps = modelTable[resolution]
-  if (!pps) return fallback
-
-  const cost = pps * seconds
-  return formatCreditsLabel(cost)
-}
-
-const klingVideoWithAudioPricingCalculator: PricingFunction = (
-  node: LGraphNode
-): string => {
-  const durationWidget = node.widgets?.find(
-    (w) => w.name === 'duration'
-  ) as IComboWidget
-  const generateAudioWidget = node.widgets?.find(
-    (w) => w.name === 'generate_audio'
-  ) as IComboWidget
-
-  if (!durationWidget || !generateAudioWidget) {
-    return formatCreditsRangeLabel(0.35, 1.4, {
-      note: '(varies with duration & audio)'
-    })
-  }
-
-  const duration = String(durationWidget.value)
-  const generateAudio =
-    String(generateAudioWidget.value).toLowerCase() === 'true'
-
-  if (duration === '5') {
-    return generateAudio ? formatCreditsLabel(0.7) : formatCreditsLabel(0.35)
-  }
-
-  if (duration === '10') {
-    return generateAudio ? formatCreditsLabel(1.4) : formatCreditsLabel(0.7)
-  }
-
-  // Fallback for unexpected duration values
-  return formatCreditsRangeLabel(0.35, 1.4, {
-    note: '(varies with duration & audio)'
-  })
-}
-
-// ---- constants ----
-const SORA_SIZES = {
-  BASIC: new Set(['720x1280', '1280x720']),
-  PRO: new Set(['1024x1792', '1792x1024'])
-}
-const ALL_SIZES = new Set([...SORA_SIZES.BASIC, ...SORA_SIZES.PRO])
-
-// ---- sora-2 pricing helpers ----
-function validateSora2Selection(
-  modelRaw: string,
-  duration: number,
-  sizeRaw: string
-): string | undefined {
-  const model = modelRaw?.toLowerCase() ?? ''
-  const size = sizeRaw?.toLowerCase() ?? ''
-
-  if (!duration || Number.isNaN(duration)) return 'Set duration (4s / 8s / 12s)'
-  if (!size) return 'Set size (720x1280, 1280x720, 1024x1792, 1792x1024)'
-  if (!ALL_SIZES.has(size))
-    return 'Invalid size. Must be 720x1280, 1280x720, 1024x1792, or 1792x1024.'
-
-  if (model.includes('sora-2-pro')) return undefined
-
-  if (model.includes('sora-2') && !SORA_SIZES.BASIC.has(size))
-    return 'sora-2 supports only 720x1280 or 1280x720'
-
-  if (!model.includes('sora-2')) return 'Unsupported model'
-
-  return undefined
-}
-
-function perSecForSora2(modelRaw: string, sizeRaw: string): number {
-  const model = modelRaw?.toLowerCase() ?? ''
-  const size = sizeRaw?.toLowerCase() ?? ''
-
-  if (model.includes('sora-2-pro')) {
-    return SORA_SIZES.PRO.has(size) ? 0.5 : 0.3
-  }
-  if (model.includes('sora-2')) return 0.1
-
-  return SORA_SIZES.PRO.has(size) ? 0.5 : 0.1
-}
-
-function formatRunPrice(perSec: number, duration: number) {
-  return formatCreditsLabel(Number((perSec * duration).toFixed(2)))
-}
-
-// ---- pricing calculator ----
-const sora2PricingCalculator: PricingFunction = (node: LGraphNode): string => {
-  const getWidgetValue = (name: string) =>
-    String(node.widgets?.find((w) => w.name === name)?.value ?? '')
-
-  const model = getWidgetValue('model')
-  const size = getWidgetValue('size')
-  const duration = Number(
-    node.widgets?.find((w) => ['duration', 'duration_s'].includes(w.name))
-      ?.value
+/** Type guard to validate that a value is a PricingResult. */
+const isPricingResult = (value: unknown): value is PricingResult =>
+  typeof value === 'object' &&
+  value !== null &&
+  'type' in value &&
+  typeof (value as { type: unknown }).type === 'string' &&
+  PRICING_RESULT_TYPES.includes(
+    (value as { type: string }).type as (typeof PRICING_RESULT_TYPES)[number]
   )
 
-  if (!model || !size || !duration) return 'Set model, duration & size'
+/**
+ * Widget values are normalized based on their declared type:
+ * - INT/FLOAT → number (or null if not parseable)
+ * - BOOLEAN → boolean (or null if not parseable)
+ * - STRING/COMBO/other → string (lowercased, trimmed)
+ */
+type NormalizedWidgetValue = string | number | boolean | null
 
-  const validationError = validateSora2Selection(model, duration, size)
-  if (validationError) return validationError
+type JsonataPricingRule = {
+  engine: 'jsonata'
+  depends_on: {
+    widgets: WidgetDependency[]
+    inputs: string[]
+    input_groups: string[]
+  }
+  expr: string
+}
 
-  const perSec = perSecForSora2(model, size)
-  return formatRunPrice(perSec, duration)
+type CompiledJsonataPricingRule = JsonataPricingRule & {
+  _compiled: Expression | null
 }
 
 /**
- * Pricing for Tripo 3D generation nodes (Text / Image / Multiview)
- * based on Tripo credits:
- *
- * Turbo / V3 / V2.5 / V2.0:
- *   Text  -> 10 (no texture) / 20 (standard texture)
- *   Image -> 20 (no texture) / 30 (standard texture)
- *   Multiview -> 20 (no texture) / 30 (standard texture)
- *
- * V1.4:
- *   Text  -> 20
- *   Image -> 30
- *   (Multiview treated same as Image if used)
- *
- * Advanced extras (added on top of generation credits):
- *   quad               -> +5 credits
- *   style              -> +5 credits (if style != "None")
- *   HD texture         -> +10 credits (texture_quality = "detailed")
- *   detailed geometry  -> +20 credits (geometry_quality = "detailed")
- *
- * 1 credit = $0.01
+ * Shape of nodeData attached to LGraphNode constructor for API nodes.
+ * Uses Pick from schema type to ensure consistency.
  */
-const calculateTripo3DGenerationPrice = (
+type NodeConstructorData = Partial<
+  Pick<ComfyNodeDef, 'name' | 'api_node' | 'price_badge'>
+>
+
+/**
+ * Extract nodeData from an LGraphNode's constructor.
+ * Centralizes the `as any` cast needed to access this runtime property.
+ */
+const getNodeConstructorData = (
+  node: LGraphNode
+): NodeConstructorData | undefined =>
+  (node.constructor as { nodeData?: NodeConstructorData }).nodeData
+
+type JsonataEvalContext = {
+  widgets: Record<string, NormalizedWidgetValue>
+  inputs: Record<string, { connected: boolean }>
+  /** Count of connected inputs per autogrow group */
+  inputGroups: Record<string, number>
+}
+
+// -----------------------------
+// Normalization helpers
+// -----------------------------
+const asFiniteNumber = (v: unknown): number | null => {
+  if (v === null || v === undefined) return null
+
+  if (typeof v === 'number') return Number.isFinite(v) ? v : null
+
+  if (typeof v === 'string') {
+    const t = v.trim()
+    if (t === '') return null
+    const n = Number(t)
+    return Number.isFinite(n) ? n : null
+  }
+
+  // Do not coerce booleans/objects into numbers for pricing purposes.
+  return null
+}
+
+/**
+ * Normalize widget value based on its declared type.
+ * Returns the value in its natural type for simpler JSONata expressions.
+ */
+const normalizeWidgetValue = (
+  raw: unknown,
+  declaredType: string
+): NormalizedWidgetValue => {
+  if (raw === undefined || raw === null) {
+    return null
+  }
+
+  const upperType = declaredType.toUpperCase()
+
+  // Numeric types
+  if (upperType === 'INT' || upperType === 'FLOAT') {
+    return asFiniteNumber(raw)
+  }
+
+  // Boolean type
+  if (upperType === 'BOOLEAN') {
+    if (typeof raw === 'boolean') return raw
+    if (typeof raw === 'string') {
+      const ls = raw.trim().toLowerCase()
+      if (ls === 'true') return true
+      if (ls === 'false') return false
+    }
+    return null
+  }
+
+  // COMBO type - preserve string/numeric values (for options like [5, "10"])
+  if (upperType === 'COMBO') {
+    if (typeof raw === 'number') return raw
+    if (typeof raw === 'boolean') return raw
+    return String(raw).trim().toLowerCase()
+  }
+
+  // String/other types - return as lowercase trimmed string
+  return String(raw).trim().toLowerCase()
+}
+
+const buildJsonataContext = (
   node: LGraphNode,
-  task: 'text' | 'image' | 'multiview'
+  rule: JsonataPricingRule
+): JsonataEvalContext => {
+  const widgets: Record<string, NormalizedWidgetValue> = {}
+  for (const dep of rule.depends_on.widgets) {
+    const widget = node.widgets?.find((x: IBaseWidget) => x.name === dep.name)
+    widgets[dep.name] = normalizeWidgetValue(widget?.value, dep.type)
+  }
+
+  const inputs: Record<string, { connected: boolean }> = {}
+  for (const name of rule.depends_on.inputs) {
+    const slot = node.inputs?.find((x: INodeInputSlot) => x.name === name)
+    inputs[name] = { connected: slot?.link != null }
+  }
+
+  // Count connected inputs per autogrow group
+  const inputGroups: Record<string, number> = {}
+  for (const groupName of rule.depends_on.input_groups) {
+    const prefix = groupName + '.'
+    inputGroups[groupName] =
+      node.inputs?.filter(
+        (inp: INodeInputSlot) =>
+          inp.name?.startsWith(prefix) && inp.link != null
+      ).length ?? 0
+  }
+
+  return { widgets, inputs, inputGroups }
+}
+
+const safeValueForSig = (v: unknown): string => {
+  if (v === null || v === undefined) return ''
+  if (typeof v === 'string' || typeof v === 'number' || typeof v === 'boolean')
+    return String(v)
+  try {
+    return JSON.stringify(v)
+  } catch {
+    return String(v)
+  }
+}
+
+// Signature determines whether we need to re-evaluate when widgets/inputs change.
+const buildSignature = (
+  ctx: JsonataEvalContext,
+  rule: JsonataPricingRule
 ): string => {
-  const getWidget = (name: string): IComboWidget | undefined =>
-    node.widgets?.find((w) => w.name === name) as IComboWidget | undefined
-
-  const getString = (name: string, defaultValue: string): string => {
-    const widget = getWidget(name)
-    if (!widget || widget.value === undefined || widget.value === null) {
-      return defaultValue
-    }
-    return String(widget.value)
+  const parts: string[] = []
+  for (const dep of rule.depends_on.widgets) {
+    parts.push(`w:${dep.name}=${safeValueForSig(ctx.widgets[dep.name])}`)
   }
-
-  const getBool = (name: string, defaultValue: boolean): boolean => {
-    const widget = getWidget(name)
-    if (!widget || widget.value === undefined || widget.value === null) {
-      return defaultValue
-    }
-
-    const v = widget.value
-    if (typeof v === 'number') return v !== 0
-    const lower = String(v).toLowerCase()
-    if (lower === 'true') return true
-    if (lower === 'false') return false
-
-    return defaultValue
+  for (const name of rule.depends_on.inputs) {
+    parts.push(`i:${name}=${ctx.inputs[name]?.connected ? '1' : '0'}`)
   }
-
-  // ---- read widget values with sensible defaults (mirroring backend) ----
-  const modelVersionRaw = getString('model_version', '').toLowerCase()
-  if (modelVersionRaw === '')
-    return formatCreditsRangeLabel(0.1, 0.65, {
-      note: '(varies with quad, style, texture & quality)'
-    })
-  const styleRaw = getString('style', 'None')
-  const hasStyle = styleRaw.toLowerCase() !== 'none'
-
-  // Backend defaults: texture=true, pbr=true, quad=false, qualities="standard"
-  const hasTexture = getBool('texture', false)
-  const hasPbr = getBool('pbr', false)
-  const quad = getBool('quad', false)
-
-  const textureQualityRaw = getString(
-    'texture_quality',
-    'standard'
-  ).toLowerCase()
-  const geometryQualityRaw = getString(
-    'geometry_quality',
-    'standard'
-  ).toLowerCase()
-
-  const isHdTexture = textureQualityRaw === 'detailed'
-  const isDetailedGeometry = geometryQualityRaw === 'detailed'
-
-  const withTexture = hasTexture || hasPbr
-
-  let baseCredits: number
-
-  if (modelVersionRaw.includes('v1.4')) {
-    // V1.4 model: Text=20, Image=30, Refine=30
-    if (task === 'text') {
-      baseCredits = 20
-    } else {
-      // treat Multiview same as Image if V1.4 is ever used there
-      baseCredits = 30
-    }
-  } else {
-    // V3.0, V2.5, V2.0 models
-    if (!withTexture) {
-      if (task === 'text') {
-        baseCredits = 10 // Text to 3D without texture
-      } else {
-        baseCredits = 20 // Image/Multiview to 3D without texture
-      }
-    } else {
-      if (task === 'text') {
-        baseCredits = 20 // Text to 3D with standard texture
-      } else {
-        baseCredits = 30 // Image/Multiview to 3D with standard texture
-      }
-    }
+  for (const name of rule.depends_on.input_groups) {
+    parts.push(`g:${name}=${ctx.inputGroups[name] ?? 0}`)
   }
+  return parts.join('|')
+}
 
-  // ---- advanced extras on top of base generation ----
-  let credits = baseCredits
+// -----------------------------
+// Result formatting
+// -----------------------------
 
-  if (hasStyle) credits += 5 // Style
-  if (quad) credits += 5 // Quad Topology
-  if (isHdTexture) credits += 10 // HD Texture
-  if (isDetailedGeometry) credits += 20 // Detailed Geometry Quality
-
-  const dollars = credits * 0.01
-  return formatCreditsLabel(dollars)
+type FormatPricingResultOptions = {
+  /** If true, return only the value without "credits/Run" suffix */
+  valueOnly?: boolean
+  defaults?: CreditFormatOptions
 }
 
 /**
- * Static pricing data for API nodes, now supporting both strings and functions
+ * Format a PricingResult into a display string.
+ * @param result - The pricing result from JSONata evaluation
+ * @param options - Formatting options
+ * @returns Formatted string, e.g. "10 credits/Run" or "10" if valueOnly
  */
-const apiNodeCosts: Record<string, { displayPrice: string | PricingFunction }> =
-  {
-    FluxProCannyNode: {
-      displayPrice: formatCreditsLabel(0.05)
-    },
-    FluxProDepthNode: {
-      displayPrice: formatCreditsLabel(0.05)
-    },
-    FluxProExpandNode: {
-      displayPrice: formatCreditsLabel(0.05)
-    },
-    FluxProFillNode: {
-      displayPrice: formatCreditsLabel(0.05)
-    },
-    FluxProUltraImageNode: {
-      displayPrice: formatCreditsLabel(0.06)
-    },
-    FluxProKontextProNode: {
-      displayPrice: formatCreditsLabel(0.04)
-    },
-    FluxProKontextMaxNode: {
-      displayPrice: formatCreditsLabel(0.08)
-    },
-    Flux2ProImageNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const widthW = node.widgets?.find(
-          (w) => w.name === 'width'
-        ) as IComboWidget
-        const heightW = node.widgets?.find(
-          (w) => w.name === 'height'
-        ) as IComboWidget
-
-        const w = Number(widthW?.value)
-        const h = Number(heightW?.value)
-        if (!Number.isFinite(w) || !Number.isFinite(h) || w <= 0 || h <= 0) {
-          // global min/max for this node given schema bounds (1MP..4MP output)
-          return formatCreditsRangeLabel(0.03, 0.15)
-        }
-
-        // Is the 'images' input connected?
-        const imagesInput = node.inputs?.find(
-          (i) => i.name === 'images'
-        ) as INodeInputSlot
-        const hasRefs =
-          typeof imagesInput?.link !== 'undefined' && imagesInput.link != null
-
-        // Output cost: ceil((w*h)/MP); first MP $0.03, each additional $0.015
-        const MP = 1024 * 1024
-        const outMP = Math.max(1, Math.floor((w * h + MP - 1) / MP))
-        const outputCost = 0.03 + 0.015 * Math.max(outMP - 1, 0)
-
-        if (hasRefs) {
-          // Unknown ref count/size on the frontend:
-          // min extra is $0.015, max extra is $0.120 (8 MP cap / 8 refs)
-          const minTotal = outputCost + 0.015
-          const maxTotal = outputCost + 0.12
-          return formatCreditsRangeLabel(minTotal, maxTotal, {
-            approximate: true
-          })
-        }
-
-        // Precise text-to-image price
-        return formatCreditsLabel(outputCost)
-      }
-    },
-    Flux2MaxImageNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const widthW = node.widgets?.find(
-          (w) => w.name === 'width'
-        ) as IComboWidget
-        const heightW = node.widgets?.find(
-          (w) => w.name === 'height'
-        ) as IComboWidget
-
-        const w = Number(widthW?.value)
-        const h = Number(heightW?.value)
-        if (!Number.isFinite(w) || !Number.isFinite(h) || w <= 0 || h <= 0) {
-          // global min/max for this node given schema bounds (1MP..4MP output)
-          return formatCreditsRangeLabel(0.07, 0.35)
-        }
-
-        // Is the 'images' input connected?
-        const imagesInput = node.inputs?.find(
-          (i) => i.name === 'images'
-        ) as INodeInputSlot
-        const hasRefs =
-          typeof imagesInput?.link !== 'undefined' && imagesInput.link != null
-
-        // Output cost: ceil((w*h)/MP); first MP $0.07, each additional $0.03
-        const MP = 1024 * 1024
-        const outMP = Math.max(1, Math.floor((w * h + MP - 1) / MP))
-        const outputCost = 0.07 + 0.03 * Math.max(outMP - 1, 0)
-
-        if (hasRefs) {
-          // Unknown ref count/size on the frontend:
-          // min extra is $0.03, max extra is $0.24 (8 MP cap / 8 refs)
-          const minTotal = outputCost + 0.03
-          const maxTotal = outputCost + 0.24
-          return formatCreditsRangeLabel(minTotal, maxTotal)
-        }
-
-        return formatCreditsLabel(outputCost)
-      }
-    },
-    OpenAIVideoSora2: {
-      displayPrice: sora2PricingCalculator
-    },
-    IdeogramV1: {
-      displayPrice: (node: LGraphNode): string => {
-        const numImagesWidget = node.widgets?.find(
-          (w) => w.name === 'num_images'
-        ) as IComboWidget
-        const turboWidget = node.widgets?.find(
-          (w) => w.name === 'turbo'
-        ) as IComboWidget
-
-        if (!numImagesWidget)
-          return formatCreditsRangeLabel(0.03, 0.09, {
-            suffix: ' x num_images/Run'
-          })
-
-        const numImages = Number(numImagesWidget.value) || 1
-        const turbo = String(turboWidget?.value).toLowerCase() === 'true'
-        const basePrice = turbo ? 0.0286 : 0.0858
-        const cost = Number((basePrice * numImages).toFixed(2))
-        return formatCreditsLabel(cost)
-      }
-    },
-    IdeogramV2: {
-      displayPrice: (node: LGraphNode): string => {
-        const numImagesWidget = node.widgets?.find(
-          (w) => w.name === 'num_images'
-        ) as IComboWidget
-        const turboWidget = node.widgets?.find(
-          (w) => w.name === 'turbo'
-        ) as IComboWidget
-
-        if (!numImagesWidget)
-          return formatCreditsRangeLabel(0.07, 0.11, {
-            suffix: ' x num_images/Run'
-          })
-
-        const numImages = Number(numImagesWidget.value) || 1
-        const turbo = String(turboWidget?.value).toLowerCase() === 'true'
-        const basePrice = turbo ? 0.0715 : 0.1144
-        const cost = Number((basePrice * numImages).toFixed(2))
-        return formatCreditsLabel(cost)
-      }
-    },
-    IdeogramV3: {
-      displayPrice: (node: LGraphNode): string => {
-        const renderingSpeedWidget = node.widgets?.find(
-          (w) => w.name === 'rendering_speed'
-        ) as IComboWidget
-        const numImagesWidget = node.widgets?.find(
-          (w) => w.name === 'num_images'
-        ) as IComboWidget
-        const characterInput = node.inputs?.find(
-          (i) => i.name === 'character_image'
-        ) as INodeInputSlot
-        const hasCharacter =
-          typeof characterInput?.link !== 'undefined' &&
-          characterInput.link != null
-
-        if (!renderingSpeedWidget)
-          return formatCreditsRangeLabel(0.04, 0.11, {
-            suffix: ' x num_images/Run',
-            note: '(varies with rendering speed & num_images)'
-          })
-
-        const numImages = Number(numImagesWidget?.value) || 1
-        let basePrice = 0.0858 // default balanced price
-
-        const renderingSpeed = String(renderingSpeedWidget.value)
-        if (renderingSpeed.toLowerCase().includes('quality')) {
-          if (hasCharacter) {
-            basePrice = 0.286
-          } else {
-            basePrice = 0.1287
-          }
-        } else if (renderingSpeed.toLowerCase().includes('default')) {
-          if (hasCharacter) {
-            basePrice = 0.2145
-          } else {
-            basePrice = 0.0858
-          }
-        } else if (renderingSpeed.toLowerCase().includes('turbo')) {
-          if (hasCharacter) {
-            basePrice = 0.143
-          } else {
-            basePrice = 0.0429
-          }
-        }
-
-        const totalCost = Number((basePrice * numImages).toFixed(2))
-        return formatCreditsLabel(totalCost)
-      }
-    },
-    KlingCameraControlI2VNode: {
-      displayPrice: formatCreditsLabel(0.49)
-    },
-    KlingCameraControlT2VNode: {
-      displayPrice: formatCreditsLabel(0.14)
-    },
-    KlingDualCharacterVideoEffectNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const modeWidget = node.widgets?.find(
-          (w) => w.name === 'mode'
-        ) as IComboWidget
-        const modelWidget = node.widgets?.find(
-          (w) => w.name === 'model_name'
-        ) as IComboWidget
-        const durationWidget = node.widgets?.find(
-          (w) => w.name === 'duration'
-        ) as IComboWidget
-        if (!modeWidget || !modelWidget || !durationWidget)
-          return formatCreditsRangeLabel(0.14, 2.8, {
-            note: '(varies with model, mode & duration)'
-          })
-
-        const modeValue = String(modeWidget.value)
-        const durationValue = String(durationWidget.value)
-        const modelValue = String(modelWidget.value)
-
-        // Same pricing matrix as KlingTextToVideoNode
-        if (modelValue.includes('v1-6') || modelValue.includes('v1-5')) {
-          if (modeValue.includes('pro')) {
-            return durationValue.includes('10')
-              ? formatCreditsLabel(0.98)
-              : formatCreditsLabel(0.49)
-          } else {
-            return durationValue.includes('10')
-              ? formatCreditsLabel(0.56)
-              : formatCreditsLabel(0.28)
-          }
-        } else if (modelValue.includes('v1')) {
-          if (modeValue.includes('pro')) {
-            return durationValue.includes('10')
-              ? formatCreditsLabel(0.98)
-              : formatCreditsLabel(0.49)
-          } else {
-            return durationValue.includes('10')
-              ? formatCreditsLabel(0.28)
-              : formatCreditsLabel(0.14)
-          }
-        }
-
-        return formatCreditsLabel(0.14)
-      }
-    },
-    KlingImage2VideoNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const modeWidget = node.widgets?.find(
-          (w) => w.name === 'mode'
-        ) as IComboWidget
-        const modelWidget = node.widgets?.find(
-          (w) => w.name === 'model_name'
-        ) as IComboWidget
-        const durationWidget = node.widgets?.find(
-          (w) => w.name === 'duration'
-        ) as IComboWidget
-
-        if (!modeWidget) {
-          if (!modelWidget)
-            return formatCreditsRangeLabel(0.14, 2.8, {
-              note: '(varies with model, mode & duration)'
-            })
-
-          const modelValue = String(modelWidget.value)
-          if (
-            modelValue.includes('v2-1-master') ||
-            modelValue.includes('v2-master')
-          ) {
-            return formatCreditsLabel(1.4)
-          } else if (
-            modelValue.includes('v1-6') ||
-            modelValue.includes('v1-5')
-          ) {
-            return formatCreditsLabel(0.28)
-          }
-          return formatCreditsLabel(0.14)
-        }
-
-        const modeValue = String(modeWidget.value)
-        const durationValue = String(durationWidget.value)
-        const modelValue = String(modelWidget.value)
-
-        // Same pricing matrix as KlingTextToVideoNode
-        if (modelValue.includes('v2-5-turbo')) {
-          if (durationValue.includes('10')) {
-            return formatCreditsLabel(0.7)
-          }
-          return formatCreditsLabel(0.35) // 5s default
-        } else if (
-          modelValue.includes('v2-1-master') ||
-          modelValue.includes('v2-master')
-        ) {
-          if (durationValue.includes('10')) {
-            return formatCreditsLabel(2.8)
-          }
-          return formatCreditsLabel(1.4) // 5s default
-        } else if (
-          modelValue.includes('v2-1') ||
-          modelValue.includes('v1-6') ||
-          modelValue.includes('v1-5')
-        ) {
-          if (modeValue.includes('pro')) {
-            return durationValue.includes('10')
-              ? formatCreditsLabel(0.98)
-              : formatCreditsLabel(0.49)
-          } else {
-            return durationValue.includes('10')
-              ? formatCreditsLabel(0.56)
-              : formatCreditsLabel(0.28)
-          }
-        } else if (modelValue.includes('v1')) {
-          if (modeValue.includes('pro')) {
-            return durationValue.includes('10')
-              ? formatCreditsLabel(0.98)
-              : formatCreditsLabel(0.49)
-          } else {
-            return durationValue.includes('10')
-              ? formatCreditsLabel(0.28)
-              : formatCreditsLabel(0.14)
-          }
-        }
-
-        return formatCreditsLabel(0.14)
-      }
-    },
-    KlingImageGenerationNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const imageInputWidget = node.inputs?.find((i) => i.name === 'image')
-        // If link is not null => image is connected => modality is image to image
-        const modality = imageInputWidget?.link
-          ? 'image to image'
-          : 'text to image'
-        const modelWidget = node.widgets?.find(
-          (w) => w.name === 'model_name'
-        ) as IComboWidget
-        const nWidget = node.widgets?.find(
-          (w) => w.name === 'n'
-        ) as IComboWidget
-
-        if (!modelWidget)
-          return formatCreditsRangeLabel(0.0035, 0.028, {
-            suffix: ' x n/Run',
-            note: '(varies with modality & model)'
-          })
-
-        const model = String(modelWidget.value)
-        const n = Number(nWidget?.value) || 1
-        let basePrice = 0.014 // default
-
-        if (modality.includes('text to image')) {
-          if (model.includes('kling-v1-5') || model.includes('kling-v2')) {
-            basePrice = 0.014
-          } else if (model.includes('kling-v1')) {
-            basePrice = 0.0035
-          }
-        } else if (modality.includes('image to image')) {
-          if (model.includes('kling-v1-5')) {
-            basePrice = 0.028
-          } else if (model.includes('kling-v1')) {
-            basePrice = 0.0035
-          }
-        }
-
-        const totalCost = basePrice * n
-        return formatCreditsLabel(totalCost)
-      }
-    },
-    KlingLipSyncAudioToVideoNode: {
-      displayPrice: formatCreditsLabel(0.1, { approximate: true })
-    },
-    KlingLipSyncTextToVideoNode: {
-      displayPrice: formatCreditsLabel(0.1, { approximate: true })
-    },
-    KlingSingleImageVideoEffectNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const effectSceneWidget = node.widgets?.find(
-          (w) => w.name === 'effect_scene'
-        ) as IComboWidget
-
-        if (!effectSceneWidget)
-          return formatCreditsRangeLabel(0.28, 0.49, {
-            note: '(varies with effect scene)'
-          })
-
-        const effectScene = String(effectSceneWidget.value)
-        if (
-          effectScene.includes('fuzzyfuzzy') ||
-          effectScene.includes('squish')
-        ) {
-          return formatCreditsLabel(0.28)
-        } else if (effectScene.includes('dizzydizzy')) {
-          return formatCreditsLabel(0.49)
-        } else if (effectScene.includes('bloombloom')) {
-          return formatCreditsLabel(0.49)
-        } else if (effectScene.includes('expansion')) {
-          return formatCreditsLabel(0.28)
-        }
-
-        return formatCreditsLabel(0.28)
-      }
-    },
-    KlingStartEndFrameNode: {
-      displayPrice: (node: LGraphNode): string => {
-        // Same pricing as KlingTextToVideoNode per CSV ("Same as text to video")
-        const modeWidget = node.widgets?.find(
-          (w) => w.name === 'mode'
-        ) as IComboWidget
-        if (!modeWidget)
-          return formatCreditsRangeLabel(0.14, 2.8, {
-            note: '(varies with model, mode & duration)'
-          })
-
-        const modeValue = String(modeWidget.value)
-
-        // Same pricing matrix as KlingTextToVideoNode
-        if (modeValue.includes('v2-5-turbo')) {
-          if (modeValue.includes('10')) {
-            return formatCreditsLabel(0.7)
-          }
-          return formatCreditsLabel(0.35) // 5s default
-        } else if (modeValue.includes('v2-1')) {
-          if (modeValue.includes('10s')) {
-            return formatCreditsLabel(0.98) // pro, 10s
-          }
-          return formatCreditsLabel(0.49) // pro, 5s default
-        } else if (modeValue.includes('v2-master')) {
-          if (modeValue.includes('10s')) {
-            return formatCreditsLabel(2.8)
-          }
-          return formatCreditsLabel(1.4) // 5s default
-        } else if (modeValue.includes('v1-6')) {
-          if (modeValue.includes('pro')) {
-            return modeValue.includes('10s')
-              ? formatCreditsLabel(0.98)
-              : formatCreditsLabel(0.49)
-          } else {
-            return modeValue.includes('10s')
-              ? formatCreditsLabel(0.56)
-              : formatCreditsLabel(0.28)
-          }
-        } else if (modeValue.includes('v1')) {
-          if (modeValue.includes('pro')) {
-            return modeValue.includes('10s')
-              ? formatCreditsLabel(0.98)
-              : formatCreditsLabel(0.49)
-          } else {
-            return modeValue.includes('10s')
-              ? formatCreditsLabel(0.28)
-              : formatCreditsLabel(0.14)
-          }
-        }
-
-        return formatCreditsLabel(0.14)
-      }
-    },
-    KlingTextToVideoNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const modeWidget = node.widgets?.find(
-          (w) => w.name === 'mode'
-        ) as IComboWidget
-        if (!modeWidget)
-          return formatCreditsRangeLabel(0.14, 2.8, {
-            note: '(varies with model, mode & duration)'
-          })
-
-        const modeValue = String(modeWidget.value)
-
-        // Pricing matrix from CSV data based on mode string content
-        if (modeValue.includes('v2-5-turbo')) {
-          if (modeValue.includes('10')) {
-            return formatCreditsLabel(0.7)
-          }
-          return formatCreditsLabel(0.35) // 5s default
-        } else if (modeValue.includes('v2-1-master')) {
-          if (modeValue.includes('10s')) {
-            return formatCreditsLabel(2.8) // price is the same as for v2-master model
-          }
-          return formatCreditsLabel(1.4) // price is the same as for v2-master model
-        } else if (modeValue.includes('v2-master')) {
-          if (modeValue.includes('10s')) {
-            return formatCreditsLabel(2.8)
-          }
-          return formatCreditsLabel(1.4) // 5s default
-        } else if (modeValue.includes('v1-6')) {
-          if (modeValue.includes('pro')) {
-            return modeValue.includes('10s')
-              ? formatCreditsLabel(0.98)
-              : formatCreditsLabel(0.49)
-          } else {
-            return modeValue.includes('10s')
-              ? formatCreditsLabel(0.56)
-              : formatCreditsLabel(0.28)
-          }
-        } else if (modeValue.includes('v1')) {
-          if (modeValue.includes('pro')) {
-            return modeValue.includes('10s')
-              ? formatCreditsLabel(0.98)
-              : formatCreditsLabel(0.49)
-          } else {
-            return modeValue.includes('10s')
-              ? formatCreditsLabel(0.28)
-              : formatCreditsLabel(0.14)
-          }
-        }
-
-        return formatCreditsLabel(0.14)
-      }
-    },
-    KlingVideoExtendNode: {
-      displayPrice: formatCreditsLabel(0.28)
-    },
-    KlingVirtualTryOnNode: {
-      displayPrice: formatCreditsLabel(0.07)
-    },
-    KlingOmniProTextToVideoNode: {
-      displayPrice: makeOmniProDurationCalculator(0.112)
-    },
-    KlingOmniProFirstLastFrameNode: {
-      displayPrice: makeOmniProDurationCalculator(0.112)
-    },
-    KlingOmniProImageToVideoNode: {
-      displayPrice: makeOmniProDurationCalculator(0.112)
-    },
-    KlingOmniProVideoToVideoNode: {
-      displayPrice: makeOmniProDurationCalculator(0.168)
-    },
-    KlingMotionControl: {
-      displayPrice: klingMotionControlPricingCalculator
-    },
-    KlingOmniProEditVideoNode: {
-      displayPrice: formatCreditsLabel(0.168, { suffix: '/second' })
-    },
-    KlingOmniProImageNode: {
-      displayPrice: formatCreditsLabel(0.028)
-    },
-    KlingTextToVideoWithAudio: {
-      displayPrice: klingVideoWithAudioPricingCalculator
-    },
-    KlingImageToVideoWithAudio: {
-      displayPrice: klingVideoWithAudioPricingCalculator
-    },
-    LumaImageToVideoNode: {
-      displayPrice: (node: LGraphNode): string => {
-        // Same pricing as LumaVideoNode per CSV
-        const modelWidget = node.widgets?.find(
-          (w) => w.name === 'model'
-        ) as IComboWidget
-        const resolutionWidget = node.widgets?.find(
-          (w) => w.name === 'resolution'
-        ) as IComboWidget
-        const durationWidget = node.widgets?.find(
-          (w) => w.name === 'duration'
-        ) as IComboWidget
-
-        if (!modelWidget || !resolutionWidget || !durationWidget) {
-          return formatCreditsRangeLabel(0.2, 16.4, {
-            note: '(varies with model, resolution & duration)'
-          })
-        }
-
-        const model = String(modelWidget.value)
-        const resolution = String(resolutionWidget.value).toLowerCase()
-        const duration = String(durationWidget.value)
-
-        if (model.includes('ray-flash-2')) {
-          if (duration.includes('5s')) {
-            if (resolution.includes('4k')) return formatCreditsLabel(3.13)
-            if (resolution.includes('1080p')) return formatCreditsLabel(0.79)
-            if (resolution.includes('720p')) return formatCreditsLabel(0.34)
-            if (resolution.includes('540p')) return formatCreditsLabel(0.2)
-          } else if (duration.includes('9s')) {
-            if (resolution.includes('4k')) return formatCreditsLabel(5.65)
-            if (resolution.includes('1080p')) return formatCreditsLabel(1.42)
-            if (resolution.includes('720p')) return formatCreditsLabel(0.61)
-            if (resolution.includes('540p')) return formatCreditsLabel(0.36)
-          }
-        } else if (model.includes('ray-2')) {
-          if (duration.includes('5s')) {
-            if (resolution.includes('4k')) return formatCreditsLabel(9.11)
-            if (resolution.includes('1080p')) return formatCreditsLabel(2.27)
-            if (resolution.includes('720p')) return formatCreditsLabel(1.02)
-            if (resolution.includes('540p')) return formatCreditsLabel(0.57)
-          } else if (duration.includes('9s')) {
-            if (resolution.includes('4k')) return formatCreditsLabel(16.4)
-            if (resolution.includes('1080p')) return formatCreditsLabel(4.1)
-            if (resolution.includes('720p')) return formatCreditsLabel(1.83)
-            if (resolution.includes('540p')) return formatCreditsLabel(1.03)
-          }
-        } else if (model.includes('ray-1-6')) {
-          return formatCreditsLabel(0.5)
-        }
-
-        return formatCreditsLabel(0.79)
-      }
-    },
-    LumaVideoNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const modelWidget = node.widgets?.find(
-          (w) => w.name === 'model'
-        ) as IComboWidget
-        const resolutionWidget = node.widgets?.find(
-          (w) => w.name === 'resolution'
-        ) as IComboWidget
-        const durationWidget = node.widgets?.find(
-          (w) => w.name === 'duration'
-        ) as IComboWidget
-
-        if (!modelWidget || !resolutionWidget || !durationWidget) {
-          return formatCreditsRangeLabel(0.2, 16.4, {
-            note: '(varies with model, resolution & duration)'
-          })
-        }
-
-        const model = String(modelWidget.value)
-        const resolution = String(resolutionWidget.value).toLowerCase()
-        const duration = String(durationWidget.value)
-
-        if (model.includes('ray-flash-2')) {
-          if (duration.includes('5s')) {
-            if (resolution.includes('4k')) return formatCreditsLabel(3.13)
-            if (resolution.includes('1080p')) return formatCreditsLabel(0.79)
-            if (resolution.includes('720p')) return formatCreditsLabel(0.34)
-            if (resolution.includes('540p')) return formatCreditsLabel(0.2)
-          } else if (duration.includes('9s')) {
-            if (resolution.includes('4k')) return formatCreditsLabel(5.65)
-            if (resolution.includes('1080p')) return formatCreditsLabel(1.42)
-            if (resolution.includes('720p')) return formatCreditsLabel(0.61)
-            if (resolution.includes('540p')) return formatCreditsLabel(0.36)
-          }
-        } else if (model.includes('ray-2')) {
-          if (duration.includes('5s')) {
-            if (resolution.includes('4k')) return formatCreditsLabel(9.11)
-            if (resolution.includes('1080p')) return formatCreditsLabel(2.27)
-            if (resolution.includes('720p')) return formatCreditsLabel(1.02)
-            if (resolution.includes('540p')) return formatCreditsLabel(0.57)
-          } else if (duration.includes('9s')) {
-            if (resolution.includes('4k')) return formatCreditsLabel(16.4)
-            if (resolution.includes('1080p')) return formatCreditsLabel(4.1)
-            if (resolution.includes('720p')) return formatCreditsLabel(1.83)
-            if (resolution.includes('540p')) return formatCreditsLabel(1.03)
-          }
-        } else if (model.includes('ray-1-6')) {
-          return formatCreditsLabel(0.5)
-        }
-
-        return formatCreditsLabel(0.79)
-      }
-    },
-    MinimaxImageToVideoNode: {
-      displayPrice: formatCreditsLabel(0.43)
-    },
-    MinimaxTextToVideoNode: {
-      displayPrice: formatCreditsLabel(0.43)
-    },
-    MinimaxHailuoVideoNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const resolutionWidget = node.widgets?.find(
-          (w) => w.name === 'resolution'
-        ) as IComboWidget
-        const durationWidget = node.widgets?.find(
-          (w) => w.name === 'duration'
-        ) as IComboWidget
-
-        if (!resolutionWidget || !durationWidget) {
-          return formatCreditsRangeLabel(0.28, 0.56, {
-            note: '(varies with resolution & duration)'
-          })
-        }
-
-        const resolution = String(resolutionWidget.value)
-        const duration = String(durationWidget.value)
-
-        if (resolution.includes('768P')) {
-          if (duration.includes('6')) return formatCreditsLabel(0.28)
-          if (duration.includes('10')) return formatCreditsLabel(0.56)
-        } else if (resolution.includes('1080P')) {
-          if (duration.includes('6')) return formatCreditsLabel(0.49)
-        }
-
-        return formatCreditsLabel(0.43) // default median
-      }
-    },
-    OpenAIDalle2: {
-      displayPrice: (node: LGraphNode): string => {
-        const sizeWidget = node.widgets?.find(
-          (w) => w.name === 'size'
-        ) as IComboWidget
-        const nWidget = node.widgets?.find(
-          (w) => w.name === 'n'
-        ) as IComboWidget
-
-        if (!sizeWidget)
-          return formatCreditsRangeLabel(0.016, 0.02, {
-            suffix: ' x n/Run',
-            note: '(varies with size & n)'
-          })
-
-        const size = String(sizeWidget.value)
-        const n = Number(nWidget?.value) || 1
-        let basePrice = 0.02 // default
-
-        if (size.includes('1024x1024')) {
-          basePrice = 0.02
-        } else if (size.includes('512x512')) {
-          basePrice = 0.018
-        } else if (size.includes('256x256')) {
-          basePrice = 0.016
-        }
-
-        const totalCost = Number((basePrice * n).toFixed(3))
-        return formatCreditsLabel(totalCost)
-      }
-    },
-    OpenAIDalle3: {
-      displayPrice: (node: LGraphNode): string => {
-        // Get size and quality widgets
-        const sizeWidget = node.widgets?.find(
-          (w) => w.name === 'size'
-        ) as IComboWidget
-        const qualityWidget = node.widgets?.find(
-          (w) => w.name === 'quality'
-        ) as IComboWidget
-
-        if (!sizeWidget || !qualityWidget)
-          return formatCreditsRangeLabel(0.04, 0.12, {
-            note: '(varies with size & quality)'
-          })
-
-        const size = String(sizeWidget.value)
-        const quality = String(qualityWidget.value)
-
-        // Pricing matrix based on CSV data
-        if (size.includes('1024x1024')) {
-          return quality.includes('hd')
-            ? formatCreditsLabel(0.08)
-            : formatCreditsLabel(0.04)
-        } else if (size.includes('1792x1024') || size.includes('1024x1792')) {
-          return quality.includes('hd')
-            ? formatCreditsLabel(0.12)
-            : formatCreditsLabel(0.08)
-        }
-
-        // Default value
-        return formatCreditsLabel(0.04)
-      }
-    },
-    OpenAIGPTImage1: {
-      displayPrice: (node: LGraphNode): string => {
-        const qualityWidget = node.widgets?.find(
-          (w) => w.name === 'quality'
-        ) as IComboWidget
-        const nWidget = node.widgets?.find(
-          (w) => w.name === 'n'
-        ) as IComboWidget
-
-        if (!qualityWidget)
-          return formatCreditsRangeLabel(0.011, 0.3, {
-            suffix: ' x n/Run',
-            note: '(varies with quality & n)'
-          })
-
-        const quality = String(qualityWidget.value)
-        const n = Number(nWidget?.value) || 1
-        let range: [number, number] = [0.046, 0.07] // default medium
-
-        if (quality.includes('high')) {
-          range = [0.167, 0.3]
-        } else if (quality.includes('medium')) {
-          range = [0.046, 0.07]
-        } else if (quality.includes('low')) {
-          range = [0.011, 0.02]
-        }
-
-        if (n === 1) {
-          return formatCreditsRangeLabel(range[0], range[1])
-        }
-        return formatCreditsRangeLabel(range[0], range[1], {
-          suffix: ` x ${n}/Run`
-        })
-      }
-    },
-    PixverseImageToVideoNode: {
-      displayPrice: pixversePricingCalculator
-    },
-    PixverseTextToVideoNode: {
-      displayPrice: pixversePricingCalculator
-    },
-    PixverseTransitionVideoNode: {
-      displayPrice: pixversePricingCalculator
-    },
-    RecraftCreativeUpscaleNode: {
-      displayPrice: formatCreditsLabel(0.25)
-    },
-    RecraftCrispUpscaleNode: {
-      displayPrice: formatCreditsLabel(0.004)
-    },
-    RecraftGenerateColorFromImageNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const nWidget = node.widgets?.find(
-          (w) => w.name === 'n'
-        ) as IComboWidget
-        if (!nWidget) return formatCreditsLabel(0.04, { suffix: ' x n/Run' })
-
-        const n = Number(nWidget.value) || 1
-        const cost = Number((0.04 * n).toFixed(2))
-        return formatCreditsLabel(cost)
-      }
-    },
-    RecraftGenerateImageNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const nWidget = node.widgets?.find(
-          (w) => w.name === 'n'
-        ) as IComboWidget
-        if (!nWidget) return formatCreditsLabel(0.04, { suffix: ' x n/Run' })
-
-        const n = Number(nWidget.value) || 1
-        const cost = Number((0.04 * n).toFixed(2))
-        return formatCreditsLabel(cost)
-      }
-    },
-    RecraftGenerateVectorImageNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const nWidget = node.widgets?.find(
-          (w) => w.name === 'n'
-        ) as IComboWidget
-        if (!nWidget) return formatCreditsLabel(0.08, { suffix: ' x n/Run' })
-
-        const n = Number(nWidget.value) || 1
-        const cost = Number((0.08 * n).toFixed(2))
-        return formatCreditsLabel(cost)
-      }
-    },
-    RecraftImageInpaintingNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const nWidget = node.widgets?.find(
-          (w) => w.name === 'n'
-        ) as IComboWidget
-        if (!nWidget) return formatCreditsLabel(0.04, { suffix: ' x n/Run' })
-
-        const n = Number(nWidget.value) || 1
-        const cost = Number((0.04 * n).toFixed(2))
-        return formatCreditsLabel(cost)
-      }
-    },
-    RecraftImageToImageNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const nWidget = node.widgets?.find(
-          (w) => w.name === 'n'
-        ) as IComboWidget
-        if (!nWidget) return formatCreditsLabel(0.04, { suffix: ' x n/Run' })
-
-        const n = Number(nWidget.value) || 1
-        const cost = Number((0.04 * n).toFixed(2))
-        return formatCreditsLabel(cost)
-      }
-    },
-    RecraftRemoveBackgroundNode: {
-      displayPrice: formatCreditsLabel(0.01)
-    },
-    RecraftReplaceBackgroundNode: {
-      displayPrice: formatCreditsLabel(0.04)
-    },
-    RecraftTextToImageNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const nWidget = node.widgets?.find(
-          (w) => w.name === 'n'
-        ) as IComboWidget
-        if (!nWidget) return formatCreditsLabel(0.04, { suffix: ' x n/Run' })
-
-        const n = Number(nWidget.value) || 1
-        const cost = Number((0.04 * n).toFixed(2))
-        return formatCreditsLabel(cost)
-      }
-    },
-    RecraftTextToVectorNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const nWidget = node.widgets?.find(
-          (w) => w.name === 'n'
-        ) as IComboWidget
-        if (!nWidget) return formatCreditsLabel(0.08, { suffix: ' x n/Run' })
-
-        const n = Number(nWidget.value) || 1
-        const cost = Number((0.08 * n).toFixed(2))
-        return formatCreditsLabel(cost)
-      }
-    },
-    RecraftVectorizeImageNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const nWidget = node.widgets?.find(
-          (w) => w.name === 'n'
-        ) as IComboWidget
-        if (!nWidget) return formatCreditsLabel(0.01, { suffix: ' x n/Run' })
-
-        const n = Number(nWidget.value) || 1
-        const cost = Number((0.01 * n).toFixed(2))
-        return formatCreditsLabel(cost)
-      }
-    },
-    StabilityStableImageSD_3_5Node: {
-      displayPrice: (node: LGraphNode): string => {
-        const modelWidget = node.widgets?.find(
-          (w) => w.name === 'model'
-        ) as IComboWidget
-
-        if (!modelWidget)
-          return formatCreditsRangeLabel(0.035, 0.065, {
-            note: '(varies with model)'
-          })
-
-        const model = String(modelWidget.value).toLowerCase()
-        if (model.includes('large')) {
-          return formatCreditsLabel(0.065)
-        } else if (model.includes('medium')) {
-          return formatCreditsLabel(0.035)
-        }
-
-        return formatCreditsLabel(0.035)
-      }
-    },
-    StabilityStableImageUltraNode: {
-      displayPrice: formatCreditsLabel(0.08)
-    },
-    StabilityUpscaleConservativeNode: {
-      displayPrice: formatCreditsLabel(0.25)
-    },
-    StabilityUpscaleCreativeNode: {
-      displayPrice: formatCreditsLabel(0.25)
-    },
-    StabilityUpscaleFastNode: {
-      displayPrice: formatCreditsLabel(0.01)
-    },
-    StabilityTextToAudio: {
-      displayPrice: formatCreditsLabel(0.2)
-    },
-    StabilityAudioToAudio: {
-      displayPrice: formatCreditsLabel(0.2)
-    },
-    StabilityAudioInpaint: {
-      displayPrice: formatCreditsLabel(0.2)
-    },
-    VeoVideoGenerationNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const durationWidget = node.widgets?.find(
-          (w) => w.name === 'duration_seconds'
-        ) as IComboWidget
-
-        if (!durationWidget)
-          return formatCreditsRangeLabel(2.5, 5.0, {
-            note: '(varies with duration)'
-          })
-
-        const price = 0.5 * Number(durationWidget.value)
-        return formatCreditsLabel(price)
-      }
-    },
-    Veo3VideoGenerationNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const modelWidget = node.widgets?.find(
-          (w) => w.name === 'model'
-        ) as IComboWidget
-        const generateAudioWidget = node.widgets?.find(
-          (w) => w.name === 'generate_audio'
-        ) as IComboWidget
-
-        if (!modelWidget || !generateAudioWidget) {
-          return formatCreditsRangeLabel(0.8, 3.2, {
-            note: '(varies with model & audio generation)'
-          })
-        }
-
-        const model = String(modelWidget.value)
-        const generateAudio =
-          String(generateAudioWidget.value).toLowerCase() === 'true'
-
-        if (
-          model.includes('veo-3.0-fast-generate-001') ||
-          model.includes('veo-3.1-fast-generate')
-        ) {
-          return generateAudio
-            ? formatCreditsLabel(1.2)
-            : formatCreditsLabel(0.8)
-        } else if (
-          model.includes('veo-3.0-generate-001') ||
-          model.includes('veo-3.1-generate')
-        ) {
-          return generateAudio
-            ? formatCreditsLabel(3.2)
-            : formatCreditsLabel(1.6)
-        }
-
-        // Default fallback
-        return formatCreditsRangeLabel(0.8, 3.2)
-      }
-    },
-    Veo3FirstLastFrameNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const modelWidget = node.widgets?.find(
-          (w) => w.name === 'model'
-        ) as IComboWidget
-        const generateAudioWidget = node.widgets?.find(
-          (w) => w.name === 'generate_audio'
-        ) as IComboWidget
-        const durationWidget = node.widgets?.find(
-          (w) => w.name === 'duration'
-        ) as IComboWidget
-
-        if (!modelWidget || !generateAudioWidget || !durationWidget) {
-          return formatCreditsRangeLabel(0.4, 3.2, {
-            note: '(varies with model & audio generation)'
-          })
-        }
-
-        const model = String(modelWidget.value)
-        const generateAudio =
-          String(generateAudioWidget.value).toLowerCase() === 'true'
-        const seconds = parseFloat(String(durationWidget.value))
-
-        let pricePerSecond: number | null = null
-        if (model.includes('veo-3.1-fast-generate')) {
-          pricePerSecond = generateAudio ? 0.15 : 0.1
-        } else if (model.includes('veo-3.1-generate')) {
-          pricePerSecond = generateAudio ? 0.4 : 0.2
-        }
-        if (pricePerSecond === null) {
-          return formatCreditsRangeLabel(0.4, 3.2)
-        }
-        const cost = pricePerSecond * seconds
-        return formatCreditsLabel(cost)
-      }
-    },
-    LumaImageNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const modelWidget = node.widgets?.find(
-          (w) => w.name === 'model'
-        ) as IComboWidget
-        const aspectRatioWidget = node.widgets?.find(
-          (w) => w.name === 'aspect_ratio'
-        ) as IComboWidget
-
-        if (!modelWidget || !aspectRatioWidget) {
-          return formatCreditsRangeLabel(0.0064, 0.026, {
-            note: '(varies with model & aspect ratio)'
-          })
-        }
-
-        const model = String(modelWidget.value)
-
-        if (model.includes('photon-flash-1')) {
-          return formatCreditsLabel(0.0027)
-        } else if (model.includes('photon-1')) {
-          return formatCreditsLabel(0.0104)
-        }
-
-        return formatCreditsLabel(0.0246)
-      }
-    },
-    LumaImageModifyNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const modelWidget = node.widgets?.find(
-          (w) => w.name === 'model'
-        ) as IComboWidget
-
-        if (!modelWidget) {
-          return formatCreditsRangeLabel(0.0027, 0.0104, {
-            note: '(varies with model)'
-          })
-        }
-
-        const model = String(modelWidget.value)
-
-        if (model.includes('photon-flash-1')) {
-          return formatCreditsLabel(0.0027)
-        } else if (model.includes('photon-1')) {
-          return formatCreditsLabel(0.0104)
-        }
-
-        return formatCreditsLabel(0.0246)
-      }
-    },
-    MoonvalleyTxt2VideoNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const lengthWidget = node.widgets?.find(
-          (w) => w.name === 'length'
-        ) as IComboWidget
-
-        // If no length widget exists, default to 5s pricing
-        if (!lengthWidget) return formatCreditsLabel(1.5)
-
-        const length = String(lengthWidget.value)
-        if (length === '5s') {
-          return formatCreditsLabel(1.5)
-        } else if (length === '10s') {
-          return formatCreditsLabel(3.0)
-        }
-
-        return formatCreditsLabel(1.5)
-      }
-    },
-    MoonvalleyImg2VideoNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const lengthWidget = node.widgets?.find(
-          (w) => w.name === 'length'
-        ) as IComboWidget
-
-        // If no length widget exists, default to 5s pricing
-        if (!lengthWidget) return formatCreditsLabel(1.5)
-
-        const length = String(lengthWidget.value)
-        if (length === '5s') {
-          return formatCreditsLabel(1.5)
-        } else if (length === '10s') {
-          return formatCreditsLabel(3.0)
-        }
-
-        return formatCreditsLabel(1.5)
-      }
-    },
-    MoonvalleyVideo2VideoNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const lengthWidget = node.widgets?.find(
-          (w) => w.name === 'length'
-        ) as IComboWidget
-
-        // If no length widget exists, default to 5s pricing
-        if (!lengthWidget) return formatCreditsLabel(2.25)
-
-        const length = String(lengthWidget.value)
-        if (length === '5s') {
-          return formatCreditsLabel(2.25)
-        } else if (length === '10s') {
-          return formatCreditsLabel(4.0)
-        }
-
-        return formatCreditsLabel(2.25)
-      }
-    },
-    // Runway nodes - using actual node names from ComfyUI
-    RunwayTextToImageNode: {
-      displayPrice: formatCreditsLabel(0.11)
-    },
-    RunwayImageToVideoNodeGen3a: {
-      displayPrice: calculateRunwayDurationPrice
-    },
-    RunwayImageToVideoNodeGen4: {
-      displayPrice: calculateRunwayDurationPrice
-    },
-    RunwayFirstLastFrameNode: {
-      displayPrice: calculateRunwayDurationPrice
-    },
-    // Rodin nodes - all have the same pricing structure
-    Rodin3D_Regular: {
-      displayPrice: formatCreditsLabel(0.4)
-    },
-    Rodin3D_Detail: {
-      displayPrice: formatCreditsLabel(0.4)
-    },
-    Rodin3D_Smooth: {
-      displayPrice: formatCreditsLabel(0.4)
-    },
-    Rodin3D_Sketch: {
-      displayPrice: formatCreditsLabel(0.4)
-    },
-    // Tripo nodes - using actual node names from ComfyUI
-    TripoTextToModelNode: {
-      displayPrice: (node: LGraphNode): string =>
-        calculateTripo3DGenerationPrice(node, 'text')
-    },
-    TripoImageToModelNode: {
-      displayPrice: (node: LGraphNode): string =>
-        calculateTripo3DGenerationPrice(node, 'image')
-    },
-    TripoMultiviewToModelNode: {
-      displayPrice: (node: LGraphNode): string =>
-        calculateTripo3DGenerationPrice(node, 'multiview')
-    },
-    TripoTextureNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const textureQualityWidget = node.widgets?.find(
-          (w) => w.name === 'texture_quality'
-        ) as IComboWidget
-
-        if (!textureQualityWidget)
-          return formatCreditsRangeLabel(0.1, 0.2, {
-            note: '(varies with quality)'
-          })
-
-        const textureQuality = String(textureQualityWidget.value)
-        return textureQuality.includes('detailed')
-          ? formatCreditsLabel(0.2)
-          : formatCreditsLabel(0.1)
-      }
-    },
-    TripoRigNode: {
-      displayPrice: '$0.25/Run'
-    },
-    TripoConversionNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const getWidgetValue = (name: string) =>
-          node.widgets?.find((w) => w.name === name)?.value
-
-        const getNumber = (name: string, defaultValue: number): number => {
-          const raw = getWidgetValue(name)
-          if (raw === undefined || raw === null || raw === '')
-            return defaultValue
-          if (typeof raw === 'number')
-            return Number.isFinite(raw) ? raw : defaultValue
-          const n = Number(raw)
-          return Number.isFinite(n) ? n : defaultValue
-        }
-
-        const getBool = (name: string, defaultValue: boolean): boolean => {
-          const v = getWidgetValue(name)
-          if (v === undefined || v === null) return defaultValue
-
-          if (typeof v === 'number') return v !== 0
-          const lower = String(v).toLowerCase()
-          if (lower === 'true') return true
-          if (lower === 'false') return false
-          return defaultValue
-        }
-
-        let hasAdvancedParam = false
-
-        // ---- booleans that trigger advanced when true ----
-        if (getBool('quad', false)) hasAdvancedParam = true
-        if (getBool('force_symmetry', false)) hasAdvancedParam = true
-        if (getBool('flatten_bottom', false)) hasAdvancedParam = true
-        if (getBool('pivot_to_center_bottom', false)) hasAdvancedParam = true
-        if (getBool('with_animation', false)) hasAdvancedParam = true
-        if (getBool('pack_uv', false)) hasAdvancedParam = true
-        if (getBool('bake', false)) hasAdvancedParam = true
-        if (getBool('export_vertex_colors', false)) hasAdvancedParam = true
-        if (getBool('animate_in_place', false)) hasAdvancedParam = true
-
-        // ---- numeric params with special default sentinels ----
-        const faceLimit = getNumber('face_limit', -1)
-        if (faceLimit !== -1) hasAdvancedParam = true
-
-        const textureSize = getNumber('texture_size', 4096)
-        if (textureSize !== 4096) hasAdvancedParam = true
-
-        const flattenBottomThreshold = getNumber(
-          'flatten_bottom_threshold',
-          0.0
-        )
-        if (flattenBottomThreshold !== 0.0) hasAdvancedParam = true
-
-        const scaleFactor = getNumber('scale_factor', 1.0)
-        if (scaleFactor !== 1.0) hasAdvancedParam = true
-
-        // ---- string / combo params with non-default values ----
-        const textureFormatRaw = String(
-          getWidgetValue('texture_format') ?? 'JPEG'
-        ).toUpperCase()
-        if (textureFormatRaw !== 'JPEG') hasAdvancedParam = true
-
-        const partNamesRaw = String(getWidgetValue('part_names') ?? '')
-        if (partNamesRaw.trim().length > 0) hasAdvancedParam = true
-
-        const fbxPresetRaw = String(
-          getWidgetValue('fbx_preset') ?? 'blender'
-        ).toLowerCase()
-        if (fbxPresetRaw !== 'blender') hasAdvancedParam = true
-
-        const exportOrientationRaw = String(
-          getWidgetValue('export_orientation') ?? 'default'
-        ).toLowerCase()
-        if (exportOrientationRaw !== 'default') hasAdvancedParam = true
-
-        const credits = hasAdvancedParam ? 10 : 5
-        return formatCreditsLabel(credits * 0.01)
-      }
-    },
-    TripoRetargetNode: {
-      displayPrice: formatCreditsLabel(0.1)
-    },
-    TripoRefineNode: {
-      displayPrice: formatCreditsLabel(0.3)
-    },
-    // Google/Gemini nodes
-    GeminiNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const modelWidget = node.widgets?.find(
-          (w) => w.name === 'model'
-        ) as IComboWidget
-
-        if (!modelWidget) return 'Token-based'
-
-        const model = String(modelWidget.value)
-
-        // Google Veo video generation
-        if (model.includes('veo-2.0')) {
-          return formatCreditsLabel(0.5, { suffix: '/second' })
-        } else if (model.includes('gemini-2.5-flash-preview-04-17')) {
-          return formatCreditsListLabel([0.0003, 0.0025], {
-            suffix: ' per 1K tokens'
-          })
-        } else if (model.includes('gemini-2.5-flash')) {
-          return formatCreditsListLabel([0.0003, 0.0025], {
-            suffix: ' per 1K tokens'
-          })
-        } else if (model.includes('gemini-2.5-pro-preview-05-06')) {
-          return formatCreditsListLabel([0.00125, 0.01], {
-            suffix: ' per 1K tokens'
-          })
-        } else if (model.includes('gemini-2.5-pro')) {
-          return formatCreditsListLabel([0.00125, 0.01], {
-            suffix: ' per 1K tokens'
-          })
-        } else if (model.includes('gemini-3-pro-preview')) {
-          return formatCreditsListLabel([0.002, 0.012], {
-            suffix: ' per 1K tokens'
-          })
-        }
-        // For other Gemini models, show token-based pricing info
-        return 'Token-based'
-      }
-    },
-    GeminiImageNode: {
-      displayPrice: formatCreditsLabel(0.039, {
-        suffix: '/Image (1K)',
-        approximate: true
-      })
-    },
-    GeminiImage2Node: {
-      displayPrice: (node: LGraphNode): string => {
-        const resolutionWidget = node.widgets?.find(
-          (w) => w.name === 'resolution'
-        ) as IComboWidget
-
-        if (!resolutionWidget) return 'Token-based'
-
-        const resolution = String(resolutionWidget.value)
-        if (resolution.includes('1K')) {
-          return formatCreditsLabel(0.134, {
-            suffix: '/Image',
-            approximate: true
-          })
-        } else if (resolution.includes('2K')) {
-          return formatCreditsLabel(0.134, {
-            suffix: '/Image',
-            approximate: true
-          })
-        } else if (resolution.includes('4K')) {
-          return formatCreditsLabel(0.24, {
-            suffix: '/Image',
-            approximate: true
-          })
-        }
-        return 'Token-based'
-      }
-    },
-    // OpenAI nodes
-    OpenAIChatNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const modelWidget = node.widgets?.find(
-          (w) => w.name === 'model'
-        ) as IComboWidget
-
-        if (!modelWidget) return 'Token-based'
-
-        const model = String(modelWidget.value)
-
-        // Specific pricing for exposed models based on official pricing data (converted to per 1K tokens)
-        if (model.includes('o4-mini')) {
-          return formatCreditsListLabel([0.0011, 0.0044], {
-            suffix: ' per 1K tokens'
-          })
-        } else if (model.includes('o1-pro')) {
-          return formatCreditsListLabel([0.15, 0.6], {
-            suffix: ' per 1K tokens'
-          })
-        } else if (model.includes('o1')) {
-          return formatCreditsListLabel([0.015, 0.06], {
-            suffix: ' per 1K tokens'
-          })
-        } else if (model.includes('o3-mini')) {
-          return formatCreditsListLabel([0.0011, 0.0044], {
-            suffix: ' per 1K tokens'
-          })
-        } else if (model.includes('o3')) {
-          return formatCreditsListLabel([0.01, 0.04], {
-            suffix: ' per 1K tokens'
-          })
-        } else if (model.includes('gpt-4o')) {
-          return formatCreditsListLabel([0.0025, 0.01], {
-            suffix: ' per 1K tokens'
-          })
-        } else if (model.includes('gpt-4.1-nano')) {
-          return formatCreditsListLabel([0.0001, 0.0004], {
-            suffix: ' per 1K tokens'
-          })
-        } else if (model.includes('gpt-4.1-mini')) {
-          return formatCreditsListLabel([0.0004, 0.0016], {
-            suffix: ' per 1K tokens'
-          })
-        } else if (model.includes('gpt-4.1')) {
-          return formatCreditsListLabel([0.002, 0.008], {
-            suffix: ' per 1K tokens'
-          })
-        } else if (model.includes('gpt-5-nano')) {
-          return formatCreditsListLabel([0.00005, 0.0004], {
-            suffix: ' per 1K tokens'
-          })
-        } else if (model.includes('gpt-5-mini')) {
-          return formatCreditsListLabel([0.00025, 0.002], {
-            suffix: ' per 1K tokens'
-          })
-        } else if (model.includes('gpt-5')) {
-          return formatCreditsListLabel([0.00125, 0.01], {
-            suffix: ' per 1K tokens'
-          })
-        }
-        return 'Token-based'
-      }
-    },
-    ViduTextToVideoNode: {
-      displayPrice: formatCreditsLabel(0.4)
-    },
-    ViduImageToVideoNode: {
-      displayPrice: formatCreditsLabel(0.4)
-    },
-    ViduReferenceVideoNode: {
-      displayPrice: formatCreditsLabel(0.4)
-    },
-    ViduStartEndToVideoNode: {
-      displayPrice: formatCreditsLabel(0.4)
-    },
-    ByteDanceImageNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const modelWidget = node.widgets?.find(
-          (w) => w.name === 'model'
-        ) as IComboWidget
-
-        if (!modelWidget) return 'Token-based'
-
-        const model = String(modelWidget.value)
-
-        if (model.includes('seedream-3-0-t2i')) {
-          return formatCreditsLabel(0.03)
-        }
-        return 'Token-based'
-      }
-    },
-    ByteDanceImageEditNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const modelWidget = node.widgets?.find(
-          (w) => w.name === 'model'
-        ) as IComboWidget
-
-        if (!modelWidget) return 'Token-based'
-
-        const model = String(modelWidget.value)
-
-        if (model.includes('seededit-3-0-i2i')) {
-          return formatCreditsLabel(0.03)
-        }
-        return 'Token-based'
-      }
-    },
-    ByteDanceSeedreamNode: {
-      displayPrice: (node: LGraphNode): string => {
-        const modelWidget = node.widgets?.find(
-          (w) => w.name === 'model'
-        ) as IComboWidget
-
-        const model = String(modelWidget?.value ?? '').toLowerCase()
-        let pricePerImage = 0.03 // default for seedream-4-0-250828 and fallback
-        if (model.includes('seedream-4-5-251128')) {
-          pricePerImage = 0.04
-        } else if (model.includes('seedream-4-0-250828')) {
-          pricePerImage = 0.03
-        }
-        return formatCreditsLabel(pricePerImage, {
-          suffix: ' x images/Run',
-          approximate: true
-        })
-      }
-    },
-    ByteDanceTextToVideoNode: {
-      displayPrice: byteDanceVideoPricingCalculator
-    },
-    ByteDanceImageToVideoNode: {
-      displayPrice: byteDanceVideoPricingCalculator
-    },
-    ByteDanceFirstLastFrameNode: {
-      displayPrice: byteDanceVideoPricingCalculator
-    },
-    ByteDanceImageReferenceNode: {
-      displayPrice: byteDanceVideoPricingCalculator
-    },
-    WanTextToVideoApi: {
-      displayPrice: (node: LGraphNode): string => {
-        const durationWidget = node.widgets?.find(
-          (w) => w.name === 'duration'
-        ) as IComboWidget
-        const resolutionWidget = node.widgets?.find(
-          (w) => w.name === 'size'
-        ) as IComboWidget
-
-        if (!durationWidget || !resolutionWidget)
-          return formatCreditsRangeLabel(0.05, 0.15, { suffix: '/second' })
-
-        const seconds = parseFloat(String(durationWidget.value))
-        const resolutionStr = String(resolutionWidget.value).toLowerCase()
-
-        const resKey = resolutionStr.includes('1080')
-          ? '1080p'
-          : resolutionStr.includes('720')
-            ? '720p'
-            : resolutionStr.includes('480')
-              ? '480p'
-              : (resolutionStr.match(/^\s*(\d{3,4}p)/)?.[1] ?? '')
-
-        const pricePerSecond: Record<string, number> = {
-          '480p': 0.05,
-          '720p': 0.1,
-          '1080p': 0.15
-        }
-
-        const pps = pricePerSecond[resKey]
-        if (isNaN(seconds) || !pps)
-          return formatCreditsRangeLabel(0.05, 0.15, { suffix: '/second' })
-
-        const cost = Number((pps * seconds).toFixed(2))
-        return formatCreditsLabel(cost)
-      }
-    },
-    WanImageToVideoApi: {
-      displayPrice: (node: LGraphNode): string => {
-        const durationWidget = node.widgets?.find(
-          (w) => w.name === 'duration'
-        ) as IComboWidget
-        const resolutionWidget = node.widgets?.find(
-          (w) => w.name === 'resolution'
-        ) as IComboWidget
-
-        if (!durationWidget || !resolutionWidget)
-          return formatCreditsRangeLabel(0.05, 0.15, { suffix: '/second' })
-
-        const seconds = parseFloat(String(durationWidget.value))
-        const resolution = String(resolutionWidget.value).trim().toLowerCase()
-
-        const pricePerSecond: Record<string, number> = {
-          '480p': 0.05,
-          '720p': 0.1,
-          '1080p': 0.15
-        }
-
-        const pps = pricePerSecond[resolution]
-        if (isNaN(seconds) || !pps)
-          return formatCreditsRangeLabel(0.05, 0.15, { suffix: '/second' })
-
-        const cost = Number((pps * seconds).toFixed(2))
-        return formatCreditsLabel(cost)
-      }
-    },
-    WanTextToImageApi: {
-      displayPrice: formatCreditsLabel(0.03)
-    },
-    WanImageToImageApi: {
-      displayPrice: formatCreditsLabel(0.03)
-    },
-    LtxvApiTextToVideo: {
-      displayPrice: ltxvPricingCalculator
-    },
-    LtxvApiImageToVideo: {
-      displayPrice: ltxvPricingCalculator
-    }
+export const formatPricingResult = (
+  result: unknown,
+  options: FormatPricingResultOptions = {}
+): string => {
+  const { valueOnly = false, defaults = {} } = options
+
+  // Handle legacy format: { usd: number } without type field
+  if (
+    result &&
+    typeof result === 'object' &&
+    !('type' in result) &&
+    'usd' in result
+  ) {
+    const r = result as { usd: unknown }
+    const usd = asFiniteNumber(r.usd)
+    if (usd === null) return ''
+    if (valueOnly) return formatCreditsValue(usd)
+    return formatCreditsLabel(usd, defaults)
   }
 
+  if (!isPricingResult(result)) {
+    if (result !== undefined && result !== null) {
+      console.warn('[pricing/jsonata] invalid result format:', result)
+    }
+    return ''
+  }
+
+  if (result.type === 'text') {
+    return result.text ?? ''
+  }
+
+  if (result.type === 'usd') {
+    const usd = asFiniteNumber(result.usd)
+    if (usd === null) return ''
+    const fmt = { ...defaults, ...(result.format ?? {}) }
+    if (valueOnly) {
+      const prefix = fmt.approximate ? '~' : ''
+      return `${prefix}${formatCreditsValue(usd)}`
+    }
+    return formatCreditsLabel(usd, fmt)
+  }
+
+  if (result.type === 'range_usd') {
+    const minUsd = asFiniteNumber(result.min_usd)
+    const maxUsd = asFiniteNumber(result.max_usd)
+    if (minUsd === null || maxUsd === null) return ''
+    const fmt = { ...defaults, ...(result.format ?? {}) }
+    if (valueOnly) {
+      const prefix = fmt.approximate ? '~' : ''
+      return `${prefix}${formatCreditsRangeValue(minUsd, maxUsd)}`
+    }
+    return formatCreditsRangeLabel(minUsd, maxUsd, fmt)
+  }
+
+  if (result.type === 'list_usd') {
+    const arr = Array.isArray(result.usd) ? result.usd : null
+    if (!arr) return ''
+
+    const usdValues = arr
+      .map(asFiniteNumber)
+      .filter((x): x is number => x != null)
+
+    if (usdValues.length === 0) return ''
+
+    const fmt = { ...defaults, ...(result.format ?? {}) }
+    if (valueOnly) {
+      const prefix = fmt.approximate ? '~' : ''
+      return `${prefix}${formatCreditsListValue(usdValues)}`
+    }
+    return formatCreditsListLabel(usdValues, fmt)
+  }
+
+  return ''
+}
+
+// -----------------------------
+// Compile rules (non-fatal)
+// -----------------------------
+const compileRule = (rule: JsonataPricingRule): CompiledJsonataPricingRule => {
+  try {
+    return { ...rule, _compiled: jsonata(rule.expr) }
+  } catch (e) {
+    // Do not crash app on bad expressions; just disable rule.
+    console.error('[pricing/jsonata] failed to compile expr:', rule.expr, e)
+    return { ...rule, _compiled: null }
+  }
+}
+
+// -----------------------------
+// Rule cache (per-node-type)
+// -----------------------------
+// Cache compiled rules by node type name to avoid recompiling on every evaluation.
+const compiledRulesCache = new Map<string, CompiledJsonataPricingRule | null>()
+
 /**
- * Composable to get node pricing information for API nodes
+ * Convert a PriceBadge from node definition to a JsonataPricingRule.
  */
+const priceBadgeToRule = (priceBadge: PriceBadge): JsonataPricingRule => ({
+  engine: priceBadge.engine ?? 'jsonata',
+  depends_on: {
+    widgets: priceBadge.depends_on?.widgets ?? [],
+    inputs: priceBadge.depends_on?.inputs ?? [],
+    input_groups: priceBadge.depends_on?.input_groups ?? []
+  },
+  expr: priceBadge.expr
+})
+
+/**
+ * Get or compile a pricing rule for a node type.
+ */
+const getCompiledRuleForNodeType = (
+  nodeName: string,
+  priceBadge: PriceBadge | undefined
+): CompiledJsonataPricingRule | null => {
+  if (!priceBadge) return null
+
+  // Check cache first
+  if (compiledRulesCache.has(nodeName)) {
+    return compiledRulesCache.get(nodeName) ?? null
+  }
+
+  // Compile and cache
+  const rule = priceBadgeToRule(priceBadge)
+  const compiled = compileRule(rule)
+  compiledRulesCache.set(nodeName, compiled)
+  return compiled
+}
+
+// -----------------------------
+// Async evaluation + cache (JSONata 2.x)
+// -----------------------------
+
+// Reactive tick to force UI updates when async evaluations resolve.
+// We purposely read pricingTick.value inside getNodeDisplayPrice to create a dependency.
+const pricingTick = ref(0)
+
+// Per-node revision tracking for VueNodes mode (more efficient than global tick)
+// Uses plain Map with individual refs per node for fine-grained reactivity
+// Keys are stringified node IDs to handle both string and number ID types
+const nodeRevisions = new Map<string, Ref<number>>()
+
+/**
+ * Get or create a revision ref for a specific node.
+ * Each node has its own independent ref, so updates to one won't trigger others.
+ */
+const getNodeRevisionRef = (nodeId: string | number): Ref<number> => {
+  const key = String(nodeId)
+  let rev = nodeRevisions.get(key)
+  if (!rev) {
+    rev = ref(0)
+    nodeRevisions.set(key, rev)
+  }
+  return rev
+}
+
+// WeakMaps avoid memory leaks when nodes are removed.
+type CacheEntry = { sig: string; label: string }
+type InflightEntry = { sig: string; promise: Promise<void> }
+
+const cache = new WeakMap<LGraphNode, CacheEntry>()
+const desiredSig = new WeakMap<LGraphNode, string>()
+const inflight = new WeakMap<LGraphNode, InflightEntry>()
+
+const scheduleEvaluation = (
+  node: LGraphNode,
+  rule: CompiledJsonataPricingRule,
+  ctx: JsonataEvalContext,
+  sig: string
+) => {
+  desiredSig.set(node, sig)
+
+  const running = inflight.get(node)
+  if (running && running.sig === sig) return
+
+  if (!rule._compiled) return
+
+  const promise = Promise.resolve(rule._compiled.evaluate(ctx))
+    .then((res) => {
+      const label = formatPricingResult(res)
+
+      // Ignore stale results: if the node changed while we were evaluating,
+      // desiredSig will no longer match.
+      if (desiredSig.get(node) !== sig) return
+
+      cache.set(node, { sig, label })
+    })
+    .catch(() => {
+      // Cache empty to avoid retry-spam for same signature
+      if (desiredSig.get(node) === sig) {
+        cache.set(node, { sig, label: '' })
+      }
+    })
+    .finally(() => {
+      const cur = inflight.get(node)
+      if (cur && cur.sig === sig) inflight.delete(node)
+
+      if (LiteGraph.vueNodesMode) {
+        // VueNodes mode: bump per-node revision (only this node re-renders)
+        getNodeRevisionRef(node.id).value++
+      } else {
+        // Nodes 1.0 mode: bump global tick to trigger setDirtyCanvas
+        pricingTick.value++
+      }
+    })
+
+  inflight.set(node, { sig, promise })
+}
+
+/**
+ * Get the pricing rule for a node from its nodeData.price_badge field.
+ */
+const getRuleForNode = (
+  node: LGraphNode
+): CompiledJsonataPricingRule | undefined => {
+  const nodeData = getNodeConstructorData(node)
+  if (!nodeData?.api_node) return undefined
+
+  const nodeName = nodeData?.name ?? ''
+  const priceBadge = nodeData?.price_badge
+
+  if (!priceBadge) return undefined
+
+  const compiled = getCompiledRuleForNodeType(nodeName, priceBadge)
+  return compiled ?? undefined
+}
+
+// -----------------------------
+// Helper to get price badge from node type
+// -----------------------------
+const getNodePriceBadge = (nodeType: string): PriceBadge | undefined => {
+  const nodeDefStore = useNodeDefStore()
+  return nodeDefStore.nodeDefsByName[nodeType]?.price_badge
+}
+
+// -----------------------------
+// Public composable API
+// -----------------------------
 export const useNodePricing = () => {
   /**
-   * Get the price display for a node
+   * Sync getter:
+   * - returns cached label for the current node signature when available
+   * - schedules async evaluation when needed
+   * - remains non-fatal on errors (returns safe fallback '')
    */
   const getNodeDisplayPrice = (node: LGraphNode): string => {
-    if (!node.constructor?.nodeData?.api_node) return ''
+    // Make this function reactive: when async evaluation completes, we bump pricingTick,
+    // which causes this getter to recompute in Vue render/computed contexts.
+    void pricingTick.value
 
-    const nodeName = node.constructor.nodeData.name
-    const priceConfig = apiNodeCosts[nodeName]
+    const nodeData = getNodeConstructorData(node)
+    if (!nodeData?.api_node) return ''
 
-    if (!priceConfig) return ''
+    const rule = getRuleForNode(node)
+    if (!rule) return ''
+    if (rule.engine !== 'jsonata') return ''
+    if (!rule._compiled) return ''
 
-    // If it's a function, call it with the node to get dynamic pricing
-    if (typeof priceConfig.displayPrice === 'function') {
-      return safePricingExecution(priceConfig.displayPrice, node, '')
+    const ctx = buildJsonataContext(node, rule)
+    const sig = buildSignature(ctx, rule)
+
+    const cached = cache.get(node)
+    if (cached && cached.sig === sig) {
+      return cached.label
     }
 
-    // Otherwise return the static price
-    return priceConfig.displayPrice
+    // Cache miss: start async evaluation.
+    // Return last-known label (if any) to avoid flicker; otherwise return empty.
+    scheduleEvaluation(node, rule, ctx, sig)
+    return cached?.label ?? ''
   }
 
-  const getNodePricingConfig = (node: LGraphNode) =>
-    apiNodeCosts[node.constructor.nodeData?.name ?? '']
+  /**
+   * Expose raw pricing config for tooling/debug UI.
+   * (Strips compiled expression from returned object.)
+   */
+  const getNodePricingConfig = (node: LGraphNode) => {
+    const rule = getRuleForNode(node)
+    if (!rule) return undefined
+    const { _compiled, ...config } = rule
+    return config
+  }
 
+  /**
+   * Caller compatibility helper:
+   * returns union of widget dependencies + input dependencies for a node type.
+   */
   const getRelevantWidgetNames = (nodeType: string): string[] => {
-    const widgetMap: Record<string, string[]> = {
-      KlingTextToVideoNode: ['mode', 'model_name', 'duration'],
-      KlingImage2VideoNode: ['mode', 'model_name', 'duration'],
-      KlingImageGenerationNode: ['modality', 'model_name', 'n'],
-      KlingDualCharacterVideoEffectNode: ['mode', 'model_name', 'duration'],
-      KlingSingleImageVideoEffectNode: ['effect_scene'],
-      KlingStartEndFrameNode: ['mode', 'model_name', 'duration'],
-      KlingTextToVideoWithAudio: ['duration', 'generate_audio'],
-      KlingImageToVideoWithAudio: ['duration', 'generate_audio'],
-      KlingOmniProTextToVideoNode: ['duration'],
-      KlingOmniProFirstLastFrameNode: ['duration'],
-      KlingOmniProImageToVideoNode: ['duration'],
-      KlingOmniProVideoToVideoNode: ['duration'],
-      KlingMotionControl: ['mode'],
-      MinimaxHailuoVideoNode: ['resolution', 'duration'],
-      OpenAIDalle3: ['size', 'quality'],
-      OpenAIDalle2: ['size', 'n'],
-      OpenAIVideoSora2: ['model', 'size', 'duration'],
-      OpenAIGPTImage1: ['quality', 'n'],
-      IdeogramV1: ['num_images', 'turbo'],
-      IdeogramV2: ['num_images', 'turbo'],
-      IdeogramV3: ['rendering_speed', 'num_images', 'character_image'],
-      FluxProKontextProNode: [],
-      FluxProKontextMaxNode: [],
-      Flux2ProImageNode: ['width', 'height', 'images'],
-      Flux2MaxImageNode: ['width', 'height', 'images'],
-      VeoVideoGenerationNode: ['duration_seconds'],
-      Veo3VideoGenerationNode: ['model', 'generate_audio'],
-      Veo3FirstLastFrameNode: ['model', 'generate_audio', 'duration'],
-      LumaVideoNode: ['model', 'resolution', 'duration'],
-      LumaImageToVideoNode: ['model', 'resolution', 'duration'],
-      LumaImageNode: ['model', 'aspect_ratio'],
-      LumaImageModifyNode: ['model', 'aspect_ratio'],
-      PixverseTextToVideoNode: ['duration_seconds', 'quality', 'motion_mode'],
-      PixverseTransitionVideoNode: [
-        'duration_seconds',
-        'motion_mode',
-        'quality'
-      ],
-      PixverseImageToVideoNode: ['duration_seconds', 'quality', 'motion_mode'],
-      StabilityStableImageSD_3_5Node: ['model'],
-      RecraftTextToImageNode: ['n'],
-      RecraftImageToImageNode: ['n'],
-      RecraftImageInpaintingNode: ['n'],
-      RecraftTextToVectorNode: ['n'],
-      RecraftVectorizeImageNode: ['n'],
-      RecraftGenerateColorFromImageNode: ['n'],
-      RecraftGenerateImageNode: ['n'],
-      RecraftGenerateVectorImageNode: ['n'],
-      MoonvalleyTxt2VideoNode: ['length'],
-      MoonvalleyImg2VideoNode: ['length'],
-      MoonvalleyVideo2VideoNode: ['length'],
-      // Runway nodes
-      RunwayImageToVideoNodeGen3a: ['duration'],
-      RunwayImageToVideoNodeGen4: ['duration'],
-      RunwayFirstLastFrameNode: ['duration'],
-      // Tripo nodes
-      TripoTextToModelNode: [
-        'model_version',
-        'quad',
-        'style',
-        'texture',
-        'pbr',
-        'texture_quality',
-        'geometry_quality'
-      ],
-      TripoImageToModelNode: [
-        'model_version',
-        'quad',
-        'style',
-        'texture',
-        'pbr',
-        'texture_quality',
-        'geometry_quality'
-      ],
-      TripoMultiviewToModelNode: [
-        'model_version',
-        'quad',
-        'texture',
-        'pbr',
-        'texture_quality',
-        'geometry_quality'
-      ],
-      TripoConversionNode: [
-        'quad',
-        'face_limit',
-        'texture_size',
-        'texture_format',
-        'force_symmetry',
-        'flatten_bottom',
-        'flatten_bottom_threshold',
-        'pivot_to_center_bottom',
-        'scale_factor',
-        'with_animation',
-        'pack_uv',
-        'bake',
-        'part_names',
-        'fbx_preset',
-        'export_vertex_colors',
-        'export_orientation',
-        'animate_in_place'
-      ],
-      TripoTextureNode: ['texture_quality'],
-      // Google/Gemini nodes
-      GeminiNode: ['model'],
-      GeminiImage2Node: ['resolution'],
-      // OpenAI nodes
-      OpenAIChatNode: ['model'],
-      // ByteDance
-      ByteDanceImageNode: ['model'],
-      ByteDanceImageEditNode: ['model'],
-      ByteDanceSeedreamNode: [
-        'model',
-        'sequential_image_generation',
-        'max_images'
-      ],
-      ByteDanceTextToVideoNode: ['model', 'duration', 'resolution'],
-      ByteDanceImageToVideoNode: ['model', 'duration', 'resolution'],
-      ByteDanceFirstLastFrameNode: ['model', 'duration', 'resolution'],
-      ByteDanceImageReferenceNode: ['model', 'duration', 'resolution'],
-      WanTextToVideoApi: ['duration', 'size'],
-      WanImageToVideoApi: ['duration', 'resolution'],
-      LtxvApiTextToVideo: ['model', 'duration', 'resolution'],
-      LtxvApiImageToVideo: ['model', 'duration', 'resolution']
+    const priceBadge = getNodePriceBadge(nodeType)
+    if (!priceBadge) return []
+
+    const dependsOn = priceBadge.depends_on ?? {
+      widgets: [],
+      inputs: [],
+      input_groups: []
     }
-    return widgetMap[nodeType] || []
+
+    const widgetNames = (dependsOn.widgets ?? []).map((w) => w.name)
+
+    // Dedupe while preserving order
+    const out: string[] = []
+    for (const n of [
+      ...widgetNames,
+      ...(dependsOn.inputs ?? []),
+      ...(dependsOn.input_groups ?? [])
+    ]) {
+      if (!out.includes(n)) out.push(n)
+    }
+    return out
+  }
+
+  /**
+   * Check if a node type has dynamic pricing (depends on widgets, inputs, or input_groups).
+   */
+  const hasDynamicPricing = (nodeType: string): boolean => {
+    const priceBadge = getNodePriceBadge(nodeType)
+    if (!priceBadge) return false
+
+    const dependsOn = priceBadge.depends_on
+    if (!dependsOn) return false
+
+    return (
+      (dependsOn.widgets?.length ?? 0) > 0 ||
+      (dependsOn.inputs?.length ?? 0) > 0 ||
+      (dependsOn.input_groups?.length ?? 0) > 0
+    )
+  }
+
+  /**
+   * Get input_groups prefixes for a node type (for watching connection changes).
+   */
+  const getInputGroupPrefixes = (nodeType: string): string[] => {
+    const priceBadge = getNodePriceBadge(nodeType)
+    return priceBadge?.depends_on?.input_groups ?? []
+  }
+
+  /**
+   * Get regular input names for a node type (for watching connection changes).
+   */
+  const getInputNames = (nodeType: string): string[] => {
+    const priceBadge = getNodePriceBadge(nodeType)
+    return priceBadge?.depends_on?.inputs ?? []
+  }
+
+  /**
+   * Trigger price recalculation for a node (call when inputs change).
+   * Forces re-evaluation by calling getNodeDisplayPrice which will detect
+   * the signature change and schedule a new evaluation.
+   */
+  const triggerPriceRecalculation = (node: LGraphNode): void => {
+    const nodeData = getNodeConstructorData(node)
+    if (!nodeData?.api_node) return
+
+    // Call getNodeDisplayPrice to trigger evaluation if signature changed
+    getNodeDisplayPrice(node)
   }
 
   return {
     getNodeDisplayPrice,
     getNodePricingConfig,
-    getRelevantWidgetNames
+    getRelevantWidgetNames,
+    hasDynamicPricing,
+    getInputGroupPrefixes,
+    getInputNames,
+    getNodeRevisionRef, // Each node has its own independent ref, so updates to one won't trigger others
+    triggerPriceRecalculation,
+    pricingRevision: readonly(pricingTick) // reactive invalidation signal
   }
 }
+
+/**
+ * Extract default value from an input spec.
+ */
+function extractDefaultFromSpec(spec: unknown[]): unknown {
+  const specOptions = spec[1] as Record<string, unknown> | undefined
+
+  // Check for explicit default
+  if (specOptions && 'default' in specOptions) {
+    return specOptions.default
+  }
+  // COMBO/DYNAMICCOMBO type with options array
+  if (
+    specOptions &&
+    Array.isArray(specOptions.options) &&
+    specOptions.options.length > 0
+  ) {
+    const firstOption = specOptions.options[0]
+    // Dynamic combo: options are objects with 'key' property
+    if (
+      typeof firstOption === 'object' &&
+      firstOption !== null &&
+      'key' in firstOption
+    ) {
+      return (firstOption as { key: unknown }).key
+    }
+    // Standard combo: options are primitive values
+    return firstOption
+  }
+  // COMBO type (old format): [["option1", "option2"], {...}]
+  if (Array.isArray(spec[0]) && spec[0].length > 0) {
+    return spec[0][0]
+  }
+  return null
+}
+
+/**
+ * Evaluate pricing for a node definition using default widget values.
+ * Used for NodePricingBadge where no LGraphNode instance exists.
+ * Results are memoized by node name since they are deterministic.
+ */
+export const evaluateNodeDefPricing = memoize(
+  async (nodeDef: ComfyNodeDef): Promise<string> => {
+    const priceBadge = nodeDef.price_badge
+    if (!priceBadge?.expr) return ''
+
+    // Reuse compiled expression cache
+    const rule = getCompiledRuleForNodeType(nodeDef.name, priceBadge)
+    if (!rule?._compiled) return ''
+
+    try {
+      // Merge all inputs for lookup
+      const allInputs = {
+        ...(nodeDef.input?.required ?? {}),
+        ...(nodeDef.input?.optional ?? {})
+      }
+
+      // Build widgets context using depends_on.widgets (matches buildJsonataContext)
+      const widgets: Record<string, NormalizedWidgetValue> = {}
+      for (const dep of priceBadge.depends_on?.widgets ?? []) {
+        const spec = allInputs[dep.name]
+        let rawValue: unknown = null
+        if (Array.isArray(spec)) {
+          rawValue = extractDefaultFromSpec(spec)
+        } else if (dep.type.toUpperCase() === 'COMBO') {
+          // For dynamic COMBO widgets without input spec, use a common default
+          // that works with most pricing expressions (e.g., resolution selectors)
+          rawValue = 'original'
+        }
+        widgets[dep.name] = normalizeWidgetValue(rawValue, dep.type)
+      }
+
+      // Build inputs context: assume all inputs are disconnected in preview
+      const inputs: Record<string, { connected: boolean }> = {}
+      for (const name of priceBadge.depends_on?.inputs ?? []) {
+        inputs[name] = { connected: false }
+      }
+
+      // Build inputGroups context: assume 0 connected inputs in preview
+      const inputGroups: Record<string, number> = {}
+      for (const groupName of priceBadge.depends_on?.input_groups ?? []) {
+        inputGroups[groupName] = 0
+      }
+
+      const context: JsonataEvalContext = { widgets, inputs, inputGroups }
+      const result = await rule._compiled.evaluate(context)
+      return formatPricingResult(result, { valueOnly: true })
+    } catch (e) {
+      console.error('[evaluateNodeDefPricing] error:', e)
+      return ''
+    }
+  },
+  { getCacheKey: (nodeDef: ComfyNodeDef) => nodeDef.name }
+)
diff --git a/tests-ui/tests/composables/node/useCreditsBadge.test.ts b/src/composables/node/usePriceBadge.test.ts
similarity index 95%
rename from tests-ui/tests/composables/node/useCreditsBadge.test.ts
rename to src/composables/node/usePriceBadge.test.ts
index eb894566ad..d646dd9629 100644
--- a/tests-ui/tests/composables/node/useCreditsBadge.test.ts
+++ b/src/composables/node/usePriceBadge.test.ts
@@ -2,7 +2,7 @@ import { describe, expect, vi } from 'vitest'
 
 import { LGraphNode } from '@/lib/litegraph/src/litegraph'
 
-import { subgraphTest } from '../../litegraph/subgraph/fixtures/subgraphFixtures'
+import { subgraphTest } from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphFixtures'
 
 import { usePriceBadge } from '@/composables/node/usePriceBadge'
 
diff --git a/src/composables/node/usePriceBadge.ts b/src/composables/node/usePriceBadge.ts
index 93f396a5a3..489e412849 100644
--- a/src/composables/node/usePriceBadge.ts
+++ b/src/composables/node/usePriceBadge.ts
@@ -36,7 +36,9 @@ export const usePriceBadge = () => {
     return badges
   }
 
-  function isCreditsBadge(badge: LGraphBadge | (() => LGraphBadge)): boolean {
+  function isCreditsBadge(
+    badge: Partial<LGraphBadge> | (() => Partial<LGraphBadge>)
+  ): boolean {
     const badgeInstance = typeof badge === 'function' ? badge() : badge
     return badgeInstance.icon?.image === componentIconSvg
   }
@@ -61,6 +63,7 @@ export const usePriceBadge = () => {
   }
   return {
     getCreditsBadge,
+    isCreditsBadge,
     updateSubgraphCredits
   }
 }
diff --git a/src/composables/node/usePromotedPreviews.test.ts b/src/composables/node/usePromotedPreviews.test.ts
new file mode 100644
index 0000000000..e054dd289d
--- /dev/null
+++ b/src/composables/node/usePromotedPreviews.test.ts
@@ -0,0 +1,262 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { reactive } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import {
+  createTestSubgraph,
+  createTestSubgraphNode
+} from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers'
+import { useNodeOutputStore } from '@/stores/nodeOutputStore'
+import { usePromotionStore } from '@/stores/promotionStore'
+import { createNodeLocatorId } from '@/types/nodeIdentification'
+
+import { usePromotedPreviews } from './usePromotedPreviews'
+
+type MockNodeOutputStore = Pick<
+  ReturnType<typeof useNodeOutputStore>,
+  'nodeOutputs' | 'getNodeImageUrls'
+>
+
+const getNodeImageUrls = vi.hoisted(() =>
+  vi.fn<MockNodeOutputStore['getNodeImageUrls']>()
+)
+const useNodeOutputStoreMock = vi.hoisted(() =>
+  vi.fn<() => MockNodeOutputStore>()
+)
+
+vi.mock('@/stores/nodeOutputStore', () => {
+  return {
+    useNodeOutputStore: useNodeOutputStoreMock
+  }
+})
+
+function createMockNodeOutputStore(): MockNodeOutputStore {
+  return {
+    nodeOutputs: reactive<MockNodeOutputStore['nodeOutputs']>({}),
+    getNodeImageUrls
+  }
+}
+
+function createSetup() {
+  const subgraph = createTestSubgraph()
+  const subgraphNode = createTestSubgraphNode(subgraph)
+  return { subgraph, subgraphNode }
+}
+
+function addInteriorNode(
+  setup: ReturnType<typeof createSetup>,
+  options: {
+    id: number
+    previewMediaType?: 'image' | 'video' | 'audio' | 'model'
+  } = { id: 10 }
+): LGraphNode {
+  const node = new LGraphNode('test')
+  node.id = options.id
+  if (options.previewMediaType) {
+    node.previewMediaType = options.previewMediaType
+  }
+  setup.subgraph.add(node)
+  return node
+}
+
+function seedOutputs(subgraphId: string, nodeIds: Array<number | string>) {
+  const store = useNodeOutputStore()
+  for (const nodeId of nodeIds) {
+    const locatorId = createNodeLocatorId(subgraphId, nodeId)
+    store.nodeOutputs[locatorId] = {
+      images: [{ filename: 'output.png' }]
+    }
+  }
+}
+
+describe(usePromotedPreviews, () => {
+  let nodeOutputStore: MockNodeOutputStore
+
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    vi.clearAllMocks()
+
+    nodeOutputStore = createMockNodeOutputStore()
+    useNodeOutputStoreMock.mockReturnValue(nodeOutputStore)
+  })
+
+  it('returns empty array for non-SubgraphNode', () => {
+    const node = new LGraphNode('test')
+    const { promotedPreviews } = usePromotedPreviews(() => node)
+    expect(promotedPreviews.value).toEqual([])
+  })
+
+  it('returns empty array for null node', () => {
+    const { promotedPreviews } = usePromotedPreviews(() => null)
+    expect(promotedPreviews.value).toEqual([])
+  })
+
+  it('returns empty array when no $$ promotions exist', () => {
+    const setup = createSetup()
+    addInteriorNode(setup, { id: 10 })
+    usePromotionStore().promote(
+      setup.subgraphNode.rootGraph.id,
+      setup.subgraphNode.id,
+      '10',
+      'seed'
+    )
+
+    const { promotedPreviews } = usePromotedPreviews(() => setup.subgraphNode)
+    expect(promotedPreviews.value).toEqual([])
+  })
+
+  it('returns image preview for promoted $$ widget with outputs', () => {
+    const setup = createSetup()
+    addInteriorNode(setup, { id: 10, previewMediaType: 'image' })
+    usePromotionStore().promote(
+      setup.subgraphNode.rootGraph.id,
+      setup.subgraphNode.id,
+      '10',
+      '$$canvas-image-preview'
+    )
+
+    const mockUrls = ['/view?filename=output.png']
+    seedOutputs(setup.subgraph.id, [10])
+    vi.mocked(useNodeOutputStore().getNodeImageUrls).mockReturnValue(mockUrls)
+
+    const { promotedPreviews } = usePromotedPreviews(() => setup.subgraphNode)
+    expect(promotedPreviews.value).toEqual([
+      {
+        interiorNodeId: '10',
+        widgetName: '$$canvas-image-preview',
+        type: 'image',
+        urls: mockUrls
+      }
+    ])
+  })
+
+  it('returns video type when interior node has video previewMediaType', () => {
+    const setup = createSetup()
+    addInteriorNode(setup, { id: 10, previewMediaType: 'video' })
+    usePromotionStore().promote(
+      setup.subgraphNode.rootGraph.id,
+      setup.subgraphNode.id,
+      '10',
+      '$$canvas-image-preview'
+    )
+
+    seedOutputs(setup.subgraph.id, [10])
+    vi.mocked(useNodeOutputStore().getNodeImageUrls).mockReturnValue([
+      '/view?filename=output.webm'
+    ])
+
+    const { promotedPreviews } = usePromotedPreviews(() => setup.subgraphNode)
+    expect(promotedPreviews.value[0].type).toBe('video')
+  })
+
+  it('returns audio type when interior node has audio previewMediaType', () => {
+    const setup = createSetup()
+    addInteriorNode(setup, { id: 10, previewMediaType: 'audio' })
+    usePromotionStore().promote(
+      setup.subgraphNode.rootGraph.id,
+      setup.subgraphNode.id,
+      '10',
+      '$$canvas-image-preview'
+    )
+
+    seedOutputs(setup.subgraph.id, [10])
+    vi.mocked(useNodeOutputStore().getNodeImageUrls).mockReturnValue([
+      '/view?filename=output.mp3'
+    ])
+
+    const { promotedPreviews } = usePromotedPreviews(() => setup.subgraphNode)
+    expect(promotedPreviews.value[0].type).toBe('audio')
+  })
+
+  it('returns separate entries for multiple promoted $$ widgets', () => {
+    const setup = createSetup()
+    const node10 = addInteriorNode(setup, {
+      id: 10,
+      previewMediaType: 'image'
+    })
+    const node20 = addInteriorNode(setup, {
+      id: 20,
+      previewMediaType: 'image'
+    })
+    usePromotionStore().promote(
+      setup.subgraphNode.rootGraph.id,
+      setup.subgraphNode.id,
+      '10',
+      '$$canvas-image-preview'
+    )
+    usePromotionStore().promote(
+      setup.subgraphNode.rootGraph.id,
+      setup.subgraphNode.id,
+      '20',
+      '$$canvas-image-preview'
+    )
+
+    seedOutputs(setup.subgraph.id, [10, 20])
+    vi.mocked(useNodeOutputStore().getNodeImageUrls).mockImplementation(
+      (node: LGraphNode) => {
+        if (node === node10) return ['/view?a=1']
+        if (node === node20) return ['/view?b=2']
+        return undefined
+      }
+    )
+
+    const { promotedPreviews } = usePromotedPreviews(() => setup.subgraphNode)
+    expect(promotedPreviews.value).toHaveLength(2)
+    expect(promotedPreviews.value[0].urls).toEqual(['/view?a=1'])
+    expect(promotedPreviews.value[1].urls).toEqual(['/view?b=2'])
+  })
+
+  it('skips interior nodes with no image output', () => {
+    const setup = createSetup()
+    addInteriorNode(setup, { id: 10 })
+    usePromotionStore().promote(
+      setup.subgraphNode.rootGraph.id,
+      setup.subgraphNode.id,
+      '10',
+      '$$canvas-image-preview'
+    )
+
+    const { promotedPreviews } = usePromotedPreviews(() => setup.subgraphNode)
+    expect(promotedPreviews.value).toEqual([])
+  })
+
+  it('skips missing interior nodes', () => {
+    const setup = createSetup()
+    usePromotionStore().promote(
+      setup.subgraphNode.rootGraph.id,
+      setup.subgraphNode.id,
+      '99',
+      '$$canvas-image-preview'
+    )
+
+    const { promotedPreviews } = usePromotedPreviews(() => setup.subgraphNode)
+    expect(promotedPreviews.value).toEqual([])
+  })
+
+  it('ignores non-$$ promoted widgets', () => {
+    const setup = createSetup()
+    addInteriorNode(setup, { id: 10 })
+    usePromotionStore().promote(
+      setup.subgraphNode.rootGraph.id,
+      setup.subgraphNode.id,
+      '10',
+      'seed'
+    )
+    usePromotionStore().promote(
+      setup.subgraphNode.rootGraph.id,
+      setup.subgraphNode.id,
+      '10',
+      '$$canvas-image-preview'
+    )
+
+    const mockUrls = ['/view?filename=img.png']
+    seedOutputs(setup.subgraph.id, [10])
+    vi.mocked(useNodeOutputStore().getNodeImageUrls).mockReturnValue(mockUrls)
+
+    const { promotedPreviews } = usePromotedPreviews(() => setup.subgraphNode)
+    expect(promotedPreviews.value).toHaveLength(1)
+    expect(promotedPreviews.value[0].urls).toEqual(mockUrls)
+  })
+})
diff --git a/src/composables/node/usePromotedPreviews.ts b/src/composables/node/usePromotedPreviews.ts
new file mode 100644
index 0000000000..6345f283f5
--- /dev/null
+++ b/src/composables/node/usePromotedPreviews.ts
@@ -0,0 +1,75 @@
+import type { MaybeRefOrGetter } from 'vue'
+import { computed, toValue } from 'vue'
+
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
+import { SubgraphNode } from '@/lib/litegraph/src/subgraph/SubgraphNode'
+import { useNodeOutputStore } from '@/stores/nodeOutputStore'
+import { usePromotionStore } from '@/stores/promotionStore'
+import { createNodeLocatorId } from '@/types/nodeIdentification'
+
+interface PromotedPreview {
+  interiorNodeId: string
+  widgetName: string
+  type: 'image' | 'video' | 'audio'
+  urls: string[]
+}
+
+/**
+ * Returns reactive preview media from promoted `$$` pseudo-widgets
+ * on a SubgraphNode. Each promoted preview interior node produces
+ * a separate entry so they render independently.
+ */
+export function usePromotedPreviews(
+  lgraphNode: MaybeRefOrGetter<LGraphNode | null | undefined>
+) {
+  const promotionStore = usePromotionStore()
+  const nodeOutputStore = useNodeOutputStore()
+
+  const promotedPreviews = computed((): PromotedPreview[] => {
+    const node = toValue(lgraphNode)
+    if (!(node instanceof SubgraphNode)) return []
+
+    const entries = promotionStore.getPromotions(node.rootGraph.id, node.id)
+    const pseudoEntries = entries.filter((e) => e.widgetName.startsWith('$$'))
+    if (!pseudoEntries.length) return []
+
+    const previews: PromotedPreview[] = []
+
+    for (const entry of pseudoEntries) {
+      const interiorNode = node.subgraph.getNodeById(entry.interiorNodeId)
+      if (!interiorNode) continue
+
+      // Read from the reactive nodeOutputs ref to establish Vue
+      // dependency tracking. getNodeImageUrls reads from the
+      // non-reactive app.nodeOutputs, so without this access the
+      // computed would never re-evaluate when outputs change.
+      const locatorId = createNodeLocatorId(
+        node.subgraph.id,
+        entry.interiorNodeId
+      )
+      const _reactiveOutputs = nodeOutputStore.nodeOutputs[locatorId]
+      if (!_reactiveOutputs?.images?.length) continue
+
+      const urls = nodeOutputStore.getNodeImageUrls(interiorNode)
+      if (!urls?.length) continue
+
+      const type =
+        interiorNode.previewMediaType === 'video'
+          ? 'video'
+          : interiorNode.previewMediaType === 'audio'
+            ? 'audio'
+            : 'image'
+
+      previews.push({
+        interiorNodeId: entry.interiorNodeId,
+        widgetName: entry.widgetName,
+        type,
+        urls
+      })
+    }
+
+    return previews
+  })
+
+  return { promotedPreviews }
+}
diff --git a/tests-ui/tests/composables/useWatchWidget.test.ts b/src/composables/node/useWatchWidget.test.ts
similarity index 87%
rename from tests-ui/tests/composables/useWatchWidget.test.ts
rename to src/composables/node/useWatchWidget.test.ts
index 61363a3f19..346d838a32 100644
--- a/tests-ui/tests/composables/useWatchWidget.test.ts
+++ b/src/composables/node/useWatchWidget.test.ts
@@ -3,11 +3,12 @@ import { nextTick } from 'vue'
 
 import { useComputedWithWidgetWatch } from '@/composables/node/useWatchWidget'
 import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import { createMockLGraphNode } from '@/utils/__tests__/litegraphTestUtils'
 
 // Mock useChainCallback
 vi.mock('@/composables/functional/useChainCallback', () => ({
   useChainCallback: vi.fn((original, newCallback) => {
-    return function (this: any, ...args: any[]) {
+    return function (this: unknown, ...args: unknown[]) {
       original?.call(this, ...args)
       newCallback.call(this, ...args)
     }
@@ -18,11 +19,12 @@ describe('useComputedWithWidgetWatch', () => {
   const createMockNode = (
     widgets: Array<{
       name: string
-      value: any
-      callback?: (...args: any[]) => void
+      value: unknown
+      callback?: (...args: unknown[]) => void
     }> = []
-  ) => {
-    const mockNode = {
+  ): LGraphNode => {
+    const baseNode = createMockLGraphNode()
+    return Object.assign(baseNode, {
       widgets: widgets.map((widget) => ({
         name: widget.name,
         value: widget.value,
@@ -31,9 +33,7 @@ describe('useComputedWithWidgetWatch', () => {
       graph: {
         setDirtyCanvas: vi.fn()
       }
-    } as unknown as LGraphNode
-
-    return mockNode
+    })
   }
 
   it('should create a reactive computed that responds to widget changes', async () => {
@@ -59,9 +59,9 @@ describe('useComputedWithWidgetWatch', () => {
 
     // Change widget value and trigger callback
     const widthWidget = mockNode.widgets?.find((w) => w.name === 'width')
-    if (widthWidget) {
+    if (widthWidget && widthWidget.callback) {
       widthWidget.value = 150
-      ;(widthWidget.callback as any)?.()
+      widthWidget.callback(widthWidget.value)
     }
 
     await nextTick()
@@ -89,9 +89,9 @@ describe('useComputedWithWidgetWatch', () => {
 
     // Change observed widget
     const widthWidget = mockNode.widgets?.find((w) => w.name === 'width')
-    if (widthWidget) {
+    if (widthWidget && widthWidget.callback) {
       widthWidget.value = 150
-      ;(widthWidget.callback as any)?.()
+      widthWidget.callback(widthWidget.value)
     }
 
     await nextTick()
@@ -117,9 +117,9 @@ describe('useComputedWithWidgetWatch', () => {
 
     // Change widget value
     const widget = mockNode.widgets?.[0]
-    if (widget) {
+    if (widget && widget.callback) {
       widget.value = 20
-      ;(widget.callback as any)?.()
+      widget.callback(widget.value)
     }
 
     await nextTick()
@@ -139,9 +139,9 @@ describe('useComputedWithWidgetWatch', () => {
 
     // Change widget value
     const widget = mockNode.widgets?.[0]
-    if (widget) {
+    if (widget && widget.callback) {
       widget.value = 20
-      ;(widget.callback as any)?.()
+      widget.callback(widget.value)
     }
 
     await nextTick()
@@ -171,8 +171,8 @@ describe('useComputedWithWidgetWatch', () => {
 
     // Trigger widget callback
     const widget = mockNode.widgets?.[0]
-    if (widget) {
-      ;(widget.callback as any)?.()
+    if (widget && widget.callback) {
+      widget.callback(widget.value)
     }
 
     await nextTick()
diff --git a/src/composables/node/useWatchWidget.ts b/src/composables/node/useWatchWidget.ts
index a44d0bfb6b..41990de9f6 100644
--- a/src/composables/node/useWatchWidget.ts
+++ b/src/composables/node/useWatchWidget.ts
@@ -47,7 +47,7 @@ export const useComputedWithWidgetWatch = (
   const { widgetNames, triggerCanvasRedraw = false } = options
 
   // Create a reactive trigger based on widget values
-  const widgetValues = ref<Record<string, any>>({})
+  const widgetValues = ref<Record<string, unknown>>({})
 
   // Initialize widget observers
   if (node.widgets) {
@@ -56,7 +56,7 @@ export const useComputedWithWidgetWatch = (
       : node.widgets
 
     // Initialize current values
-    const currentValues: Record<string, any> = {}
+    const currentValues: Record<string, unknown> = {}
     widgetsToObserve.forEach((widget) => {
       currentValues[widget.name] = widget.value
     })
diff --git a/src/composables/painter/usePainter.ts b/src/composables/painter/usePainter.ts
new file mode 100644
index 0000000000..79b9a24c30
--- /dev/null
+++ b/src/composables/painter/usePainter.ts
@@ -0,0 +1,779 @@
+import type { Ref } from 'vue'
+import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
+import { useElementSize } from '@vueuse/core'
+import { useI18n } from 'vue-i18n'
+
+import {
+  getEffectiveBrushSize,
+  getEffectiveHardness
+} from '@/composables/maskeditor/brushUtils'
+import { StrokeProcessor } from '@/composables/maskeditor/StrokeProcessor'
+import { hexToRgb } from '@/utils/colorUtil'
+import type { Point } from '@/extensions/core/maskeditor/types'
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+import { isCloud } from '@/platform/distribution/types'
+import { useToastStore } from '@/platform/updates/common/toastStore'
+import { api } from '@/scripts/api'
+import { app } from '@/scripts/app'
+import { useNodeOutputStore } from '@/stores/nodeOutputStore'
+
+type PainterTool = 'brush' | 'eraser'
+
+export const PAINTER_TOOLS: Record<string, PainterTool> = {
+  BRUSH: 'brush',
+  ERASER: 'eraser'
+} as const
+
+interface UsePainterOptions {
+  canvasEl: Ref<HTMLCanvasElement | null>
+  cursorEl: Ref<HTMLElement | null>
+  modelValue: Ref<string>
+}
+
+export function usePainter(nodeId: string, options: UsePainterOptions) {
+  const { canvasEl, cursorEl, modelValue } = options
+  const { t } = useI18n()
+  const nodeOutputStore = useNodeOutputStore()
+  const toastStore = useToastStore()
+
+  const isDirty = ref(false)
+
+  const canvasWidth = ref(512)
+  const canvasHeight = ref(512)
+
+  const cursorVisible = ref(false)
+
+  const inputImageUrl = ref<string | null>(null)
+  const isImageInputConnected = ref(false)
+
+  let isDrawing = false
+  let strokeProcessor: StrokeProcessor | null = null
+  let lastPoint: Point | null = null
+
+  let cachedRect: DOMRect | null = null
+
+  let mainCtx: CanvasRenderingContext2D | null = null
+
+  let strokeCanvas: HTMLCanvasElement | null = null
+  let strokeCtx: CanvasRenderingContext2D | null = null
+
+  let baseCanvas: HTMLCanvasElement | null = null
+  let baseCtx: CanvasRenderingContext2D | null = null
+  let hasBaseSnapshot = false
+  let hasStrokes = false
+
+  let dirtyX0 = 0
+  let dirtyY0 = 0
+  let dirtyX1 = 0
+  let dirtyY1 = 0
+  let hasDirtyRect = false
+
+  let strokeBrush: {
+    radius: number
+    effectiveRadius: number
+    effectiveHardness: number
+    hardness: number
+    r: number
+    g: number
+    b: number
+  } | null = null
+
+  const litegraphNode = computed(() => {
+    if (!nodeId || !app.canvas.graph) return null
+    return app.canvas.graph.getNodeById(nodeId) as LGraphNode | null
+  })
+
+  function getWidgetByName(name: string): IBaseWidget | undefined {
+    return litegraphNode.value?.widgets?.find(
+      (w: IBaseWidget) => w.name === name
+    )
+  }
+
+  const tool = ref<PainterTool>(PAINTER_TOOLS.BRUSH)
+  const brushSize = ref(20)
+  const brushColor = ref('#ffffff')
+  const brushOpacity = ref(1)
+  const brushHardness = ref(1)
+  const backgroundColor = ref('#000000')
+
+  function restoreSettingsFromProperties() {
+    const node = litegraphNode.value
+    if (!node) return
+
+    const props = node.properties
+    if (props.painterTool != null) tool.value = props.painterTool as PainterTool
+    if (props.painterBrushSize != null)
+      brushSize.value = props.painterBrushSize as number
+    if (props.painterBrushColor != null)
+      brushColor.value = props.painterBrushColor as string
+    if (props.painterBrushOpacity != null)
+      brushOpacity.value = props.painterBrushOpacity as number
+    if (props.painterBrushHardness != null)
+      brushHardness.value = props.painterBrushHardness as number
+
+    const bgColorWidget = getWidgetByName('bg_color')
+    if (bgColorWidget) backgroundColor.value = bgColorWidget.value as string
+  }
+
+  function saveSettingsToProperties() {
+    const node = litegraphNode.value
+    if (!node) return
+
+    node.properties.painterTool = tool.value
+    node.properties.painterBrushSize = brushSize.value
+    node.properties.painterBrushColor = brushColor.value
+    node.properties.painterBrushOpacity = brushOpacity.value
+    node.properties.painterBrushHardness = brushHardness.value
+  }
+
+  function syncCanvasSizeToWidgets() {
+    const widthWidget = getWidgetByName('width')
+    const heightWidget = getWidgetByName('height')
+
+    if (widthWidget && widthWidget.value !== canvasWidth.value) {
+      widthWidget.value = canvasWidth.value
+      widthWidget.callback?.(canvasWidth.value)
+    }
+    if (heightWidget && heightWidget.value !== canvasHeight.value) {
+      heightWidget.value = canvasHeight.value
+      heightWidget.callback?.(canvasHeight.value)
+    }
+  }
+
+  function syncBackgroundColorToWidget() {
+    const bgColorWidget = getWidgetByName('bg_color')
+    if (bgColorWidget && bgColorWidget.value !== backgroundColor.value) {
+      bgColorWidget.value = backgroundColor.value
+      bgColorWidget.callback?.(backgroundColor.value)
+    }
+  }
+
+  function updateInputImageUrl() {
+    const node = litegraphNode.value
+    if (!node) {
+      inputImageUrl.value = null
+      isImageInputConnected.value = false
+      return
+    }
+
+    isImageInputConnected.value = node.isInputConnected(0)
+
+    const inputNode = node.getInputNode(0)
+    if (!inputNode) {
+      inputImageUrl.value = null
+      return
+    }
+
+    const urls = nodeOutputStore.getNodeImageUrls(inputNode)
+    inputImageUrl.value = urls?.length ? urls[0] : null
+  }
+
+  function syncCanvasSizeFromWidgets() {
+    const w = getWidgetByName('width')
+    const h = getWidgetByName('height')
+    canvasWidth.value = (w?.value as number) ?? 512
+    canvasHeight.value = (h?.value as number) ?? 512
+  }
+
+  function activeHardness(): number {
+    return tool.value === PAINTER_TOOLS.ERASER ? 1 : brushHardness.value
+  }
+
+  const { width: canvasDisplayWidth } = useElementSize(canvasEl)
+
+  const displayBrushSize = computed(() => {
+    if (!canvasDisplayWidth.value || !canvasWidth.value) return brushSize.value
+
+    const radius = brushSize.value / 2
+    const effectiveRadius = getEffectiveBrushSize(radius, activeHardness())
+    const effectiveDiameter = effectiveRadius * 2
+    return effectiveDiameter * (canvasDisplayWidth.value / canvasWidth.value)
+  })
+
+  function getCtx() {
+    if (!mainCtx && canvasEl.value) {
+      mainCtx = canvasEl.value.getContext('2d') ?? null
+    }
+    return mainCtx
+  }
+
+  function cacheCanvasRect() {
+    const el = canvasEl.value
+    if (el) cachedRect = el.getBoundingClientRect()
+  }
+
+  function getCanvasPoint(e: PointerEvent): Point | null {
+    const el = canvasEl.value
+    if (!el) return null
+    const rect = cachedRect ?? el.getBoundingClientRect()
+    return {
+      x: ((e.clientX - rect.left) / rect.width) * el.width,
+      y: ((e.clientY - rect.top) / rect.height) * el.height
+    }
+  }
+
+  function expandDirtyRect(cx: number, cy: number, r: number) {
+    const x0 = cx - r
+    const y0 = cy - r
+    const x1 = cx + r
+    const y1 = cy + r
+    if (!hasDirtyRect) {
+      dirtyX0 = x0
+      dirtyY0 = y0
+      dirtyX1 = x1
+      dirtyY1 = y1
+      hasDirtyRect = true
+    } else {
+      if (x0 < dirtyX0) dirtyX0 = x0
+      if (y0 < dirtyY0) dirtyY0 = y0
+      if (x1 > dirtyX1) dirtyX1 = x1
+      if (y1 > dirtyY1) dirtyY1 = y1
+    }
+  }
+
+  function snapshotBrush() {
+    const radius = brushSize.value / 2
+    const hardness = activeHardness()
+    const effectiveRadius = getEffectiveBrushSize(radius, hardness)
+    strokeBrush = {
+      radius,
+      effectiveRadius,
+      effectiveHardness: getEffectiveHardness(
+        radius,
+        hardness,
+        effectiveRadius
+      ),
+      hardness,
+      ...hexToRgb(brushColor.value)
+    }
+  }
+
+  function drawCircle(ctx: CanvasRenderingContext2D, point: Point) {
+    const b = strokeBrush!
+
+    expandDirtyRect(point.x, point.y, b.effectiveRadius)
+
+    ctx.beginPath()
+    ctx.arc(point.x, point.y, b.effectiveRadius, 0, Math.PI * 2)
+
+    if (b.hardness < 1) {
+      const gradient = ctx.createRadialGradient(
+        point.x,
+        point.y,
+        0,
+        point.x,
+        point.y,
+        b.effectiveRadius
+      )
+      gradient.addColorStop(0, `rgba(${b.r}, ${b.g}, ${b.b}, 1)`)
+      gradient.addColorStop(
+        b.effectiveHardness,
+        `rgba(${b.r}, ${b.g}, ${b.b}, 1)`
+      )
+      gradient.addColorStop(1, `rgba(${b.r}, ${b.g}, ${b.b}, 0)`)
+      ctx.fillStyle = gradient
+    }
+
+    ctx.fill()
+  }
+
+  function drawSegment(ctx: CanvasRenderingContext2D, from: Point, to: Point) {
+    const b = strokeBrush!
+
+    if (b.hardness < 1) {
+      const dx = to.x - from.x
+      const dy = to.y - from.y
+      const dist = Math.hypot(dx, dy)
+      const step = Math.max(1, b.effectiveRadius / 2)
+
+      if (dist > 0) {
+        const steps = Math.ceil(dist / step)
+        const dabPoint: Point = { x: 0, y: 0 }
+        for (let i = 1; i <= steps; i++) {
+          const t = i / steps
+          dabPoint.x = from.x + dx * t
+          dabPoint.y = from.y + dy * t
+          drawCircle(ctx, dabPoint)
+        }
+      }
+    } else {
+      expandDirtyRect(from.x, from.y, b.effectiveRadius)
+      ctx.beginPath()
+      ctx.moveTo(from.x, from.y)
+      ctx.lineTo(to.x, to.y)
+      ctx.stroke()
+      drawCircle(ctx, to)
+    }
+  }
+
+  function applyBrushStyle(ctx: CanvasRenderingContext2D) {
+    const b = strokeBrush!
+    const color = `rgb(${b.r}, ${b.g}, ${b.b})`
+
+    ctx.globalCompositeOperation = 'source-over'
+    ctx.globalAlpha = 1
+    ctx.fillStyle = color
+    ctx.strokeStyle = color
+    ctx.lineWidth = b.effectiveRadius * 2
+    ctx.lineCap = 'round'
+    ctx.lineJoin = 'round'
+  }
+
+  function ensureStrokeCanvas() {
+    const el = canvasEl.value
+    if (!el) return null
+
+    if (
+      !strokeCanvas ||
+      strokeCanvas.width !== el.width ||
+      strokeCanvas.height !== el.height
+    ) {
+      strokeCanvas = document.createElement('canvas')
+      strokeCanvas.width = el.width
+      strokeCanvas.height = el.height
+      strokeCtx = strokeCanvas.getContext('2d')
+    }
+
+    strokeCtx?.clearRect(0, 0, strokeCanvas.width, strokeCanvas.height)
+    return strokeCtx
+  }
+
+  function ensureBaseCanvas() {
+    const el = canvasEl.value
+    if (!el) return null
+
+    if (
+      !baseCanvas ||
+      baseCanvas.width !== el.width ||
+      baseCanvas.height !== el.height
+    ) {
+      baseCanvas = document.createElement('canvas')
+      baseCanvas.width = el.width
+      baseCanvas.height = el.height
+      baseCtx = baseCanvas.getContext('2d')
+    }
+
+    return baseCtx
+  }
+
+  function compositeStrokeToMain(isPreview: boolean = false) {
+    const el = canvasEl.value
+    const ctx = getCtx()
+    if (!el || !ctx || !strokeCanvas) return
+
+    const useDirty = hasDirtyRect
+    const sx = Math.max(0, Math.floor(dirtyX0))
+    const sy = Math.max(0, Math.floor(dirtyY0))
+    const sr = Math.min(el.width, Math.ceil(dirtyX1))
+    const sb = Math.min(el.height, Math.ceil(dirtyY1))
+    const sw = sr - sx
+    const sh = sb - sy
+    hasDirtyRect = false
+
+    if (hasBaseSnapshot && baseCanvas) {
+      if (useDirty && sw > 0 && sh > 0) {
+        ctx.clearRect(sx, sy, sw, sh)
+        ctx.drawImage(baseCanvas, sx, sy, sw, sh, sx, sy, sw, sh)
+      } else {
+        ctx.clearRect(0, 0, el.width, el.height)
+        ctx.drawImage(baseCanvas, 0, 0)
+      }
+    }
+
+    ctx.save()
+    const isEraser = tool.value === PAINTER_TOOLS.ERASER
+    ctx.globalAlpha = isEraser ? 1 : brushOpacity.value
+    ctx.globalCompositeOperation = isEraser ? 'destination-out' : 'source-over'
+    if (useDirty && sw > 0 && sh > 0) {
+      ctx.drawImage(strokeCanvas, sx, sy, sw, sh, sx, sy, sw, sh)
+    } else {
+      ctx.drawImage(strokeCanvas, 0, 0)
+    }
+    ctx.restore()
+
+    if (!isPreview) {
+      hasBaseSnapshot = false
+    }
+  }
+
+  function startStroke(e: PointerEvent) {
+    const point = getCanvasPoint(e)
+    if (!point) return
+
+    const el = canvasEl.value
+    if (!el) return
+
+    const bCtx = ensureBaseCanvas()
+    if (bCtx) {
+      bCtx.clearRect(0, 0, el.width, el.height)
+      bCtx.drawImage(el, 0, 0)
+      hasBaseSnapshot = true
+    }
+
+    isDrawing = true
+    isDirty.value = true
+    hasStrokes = true
+    snapshotBrush()
+    strokeProcessor = new StrokeProcessor(Math.max(1, strokeBrush!.radius / 2))
+    strokeProcessor.addPoint(point)
+    lastPoint = point
+
+    const ctx = ensureStrokeCanvas()
+    if (!ctx) return
+    ctx.save()
+    applyBrushStyle(ctx)
+    drawCircle(ctx, point)
+    ctx.restore()
+
+    compositeStrokeToMain(true)
+  }
+
+  function continueStroke(e: PointerEvent) {
+    if (!isDrawing || !strokeProcessor || !strokeCtx) return
+
+    const point = getCanvasPoint(e)
+    if (!point) return
+
+    const points = strokeProcessor.addPoint(point)
+    if (points.length === 0 && lastPoint) {
+      points.push(point)
+    }
+
+    if (points.length === 0) return
+
+    strokeCtx.save()
+    applyBrushStyle(strokeCtx)
+
+    let prev = lastPoint ?? points[0]
+    for (const p of points) {
+      drawSegment(strokeCtx, prev, p)
+      prev = p
+    }
+    lastPoint = prev
+
+    strokeCtx.restore()
+
+    compositeStrokeToMain(true)
+  }
+
+  function endStroke() {
+    if (!isDrawing || !strokeProcessor) return
+
+    const points = strokeProcessor.endStroke()
+    if (strokeCtx && points.length > 0) {
+      strokeCtx.save()
+      applyBrushStyle(strokeCtx)
+      let prev = lastPoint ?? points[0]
+      for (const p of points) {
+        drawSegment(strokeCtx, prev, p)
+        prev = p
+      }
+      strokeCtx.restore()
+    }
+
+    compositeStrokeToMain()
+
+    isDrawing = false
+    strokeProcessor = null
+    strokeBrush = null
+    lastPoint = null
+  }
+
+  function resizeCanvas() {
+    const el = canvasEl.value
+    if (!el) return
+
+    let tmp: HTMLCanvasElement | null = null
+    if (el.width > 0 && el.height > 0) {
+      tmp = document.createElement('canvas')
+      tmp.width = el.width
+      tmp.height = el.height
+      tmp.getContext('2d')!.drawImage(el, 0, 0)
+    }
+
+    el.width = canvasWidth.value
+    el.height = canvasHeight.value
+    mainCtx = null
+
+    if (tmp) {
+      getCtx()?.drawImage(tmp, 0, 0)
+    }
+
+    strokeCanvas = null
+    strokeCtx = null
+    baseCanvas = null
+    baseCtx = null
+    hasBaseSnapshot = false
+  }
+
+  function handleClear() {
+    const el = canvasEl.value
+    const ctx = getCtx()
+    if (!el || !ctx) return
+    ctx.clearRect(0, 0, el.width, el.height)
+    isDirty.value = true
+    hasStrokes = false
+  }
+
+  function updateCursorPos(e: PointerEvent) {
+    const el = cursorEl.value
+    if (!el) return
+    const size = displayBrushSize.value
+    el.style.transform = `translate(${e.offsetX - size / 2}px, ${e.offsetY - size / 2}px)`
+  }
+
+  function handlePointerDown(e: PointerEvent) {
+    if (e.button !== 0) return
+    ;(e.target as HTMLElement).setPointerCapture(e.pointerId)
+    cacheCanvasRect()
+    updateCursorPos(e)
+    startStroke(e)
+  }
+
+  let pendingMoveEvent: PointerEvent | null = null
+  let rafId: number | null = null
+
+  function flushPendingStroke() {
+    if (pendingMoveEvent) {
+      continueStroke(pendingMoveEvent)
+      pendingMoveEvent = null
+    }
+    rafId = null
+  }
+
+  function handlePointerMove(e: PointerEvent) {
+    updateCursorPos(e)
+    if (!isDrawing) return
+
+    pendingMoveEvent = e
+    if (!rafId) {
+      rafId = requestAnimationFrame(flushPendingStroke)
+    }
+  }
+
+  function handlePointerUp(e: PointerEvent) {
+    if (e.button !== 0) return
+    if (rafId) {
+      cancelAnimationFrame(rafId)
+      flushPendingStroke()
+    }
+    ;(e.target as HTMLElement).releasePointerCapture(e.pointerId)
+    endStroke()
+  }
+
+  function handlePointerLeave() {
+    cursorVisible.value = false
+    if (rafId) {
+      cancelAnimationFrame(rafId)
+      flushPendingStroke()
+    }
+    endStroke()
+  }
+
+  function handlePointerEnter() {
+    cursorVisible.value = true
+  }
+
+  function handleInputImageLoad(e: Event) {
+    const img = e.target as HTMLImageElement
+    const widthWidget = getWidgetByName('width')
+    const heightWidget = getWidgetByName('height')
+    if (widthWidget) {
+      widthWidget.value = img.naturalWidth
+      widthWidget.callback?.(img.naturalWidth)
+    }
+    if (heightWidget) {
+      heightWidget.value = img.naturalHeight
+      heightWidget.callback?.(img.naturalHeight)
+    }
+    canvasWidth.value = img.naturalWidth
+    canvasHeight.value = img.naturalHeight
+  }
+
+  function parseMaskFilename(value: string): {
+    filename: string
+    subfolder: string
+    type: string
+  } | null {
+    const trimmed = value?.trim()
+    if (!trimmed) return null
+
+    const typeMatch = trimmed.match(/^(.+?) \[([^\]]+)\]$/)
+    const pathPart = typeMatch ? typeMatch[1] : trimmed
+    const type = typeMatch ? typeMatch[2] : 'input'
+
+    const lastSlash = pathPart.lastIndexOf('/')
+    const subfolder = lastSlash !== -1 ? pathPart.substring(0, lastSlash) : ''
+    const filename =
+      lastSlash !== -1 ? pathPart.substring(lastSlash + 1) : pathPart
+
+    return { filename, subfolder, type }
+  }
+
+  function isCanvasEmpty(): boolean {
+    return !hasStrokes
+  }
+
+  async function serializeValue(): Promise<string> {
+    const el = canvasEl.value
+    if (!el) return ''
+
+    if (isCanvasEmpty()) return ''
+
+    if (!isDirty.value) return modelValue.value
+
+    const blob = await new Promise<Blob | null>((resolve) =>
+      el.toBlob(resolve, 'image/png')
+    )
+    if (!blob) return modelValue.value
+
+    const name = `painter-${nodeId}-${Date.now()}.png`
+    const body = new FormData()
+    body.append('image', blob, name)
+    if (!isCloud) body.append('subfolder', 'painter')
+    body.append('type', isCloud ? 'input' : 'temp')
+
+    let resp: Response
+    try {
+      resp = await api.fetchApi('/upload/image', {
+        method: 'POST',
+        body
+      })
+    } catch (e) {
+      const err = t('painter.uploadError', {
+        status: 0,
+        statusText: e instanceof Error ? e.message : String(e)
+      })
+      toastStore.addAlert(err)
+      throw new Error(err)
+    }
+
+    if (resp.status !== 200) {
+      const err = t('painter.uploadError', {
+        status: resp.status,
+        statusText: resp.statusText
+      })
+      toastStore.addAlert(err)
+      throw new Error(err)
+    }
+
+    let data: { name: string }
+    try {
+      data = await resp.json()
+    } catch (e) {
+      const err = t('painter.uploadError', {
+        status: resp.status,
+        statusText: e instanceof Error ? e.message : String(e)
+      })
+      toastStore.addAlert(err)
+      throw new Error(err)
+    }
+
+    const result = isCloud
+      ? `${data.name} [input]`
+      : `painter/${data.name} [temp]`
+    modelValue.value = result
+    isDirty.value = false
+    return result
+  }
+
+  function registerWidgetSerialization() {
+    const node = litegraphNode.value
+    if (!node?.widgets) return
+    const targetWidget = node.widgets.find(
+      (w: IBaseWidget) => w.name === 'mask'
+    )
+    if (targetWidget) {
+      targetWidget.serializeValue = serializeValue
+    }
+  }
+
+  function restoreCanvas() {
+    const parsed = parseMaskFilename(modelValue.value)
+    if (!parsed) return
+
+    const params = new URLSearchParams()
+    params.set('filename', parsed.filename)
+    if (parsed.subfolder) params.set('subfolder', parsed.subfolder)
+    params.set('type', parsed.type)
+
+    const url = api.apiURL('/view?' + params.toString())
+    const img = new Image()
+    img.crossOrigin = 'anonymous'
+    img.onload = () => {
+      const el = canvasEl.value
+      if (!el) return
+      canvasWidth.value = img.naturalWidth
+      canvasHeight.value = img.naturalHeight
+      mainCtx = null
+      getCtx()?.drawImage(img, 0, 0)
+      isDirty.value = false
+      hasStrokes = true
+    }
+    img.onerror = () => {
+      modelValue.value = ''
+    }
+    img.src = url
+  }
+
+  watch(() => nodeOutputStore.nodeOutputs, updateInputImageUrl, { deep: true })
+  watch(() => nodeOutputStore.nodePreviewImages, updateInputImageUrl, {
+    deep: true
+  })
+  watch([canvasWidth, canvasHeight], resizeCanvas)
+
+  watch(
+    [tool, brushSize, brushColor, brushOpacity, brushHardness],
+    saveSettingsToProperties
+  )
+
+  watch([canvasWidth, canvasHeight], syncCanvasSizeToWidgets)
+
+  watch(backgroundColor, syncBackgroundColorToWidget)
+
+  function initialize() {
+    syncCanvasSizeFromWidgets()
+    resizeCanvas()
+    registerWidgetSerialization()
+    restoreSettingsFromProperties()
+    updateInputImageUrl()
+    restoreCanvas()
+  }
+
+  onMounted(initialize)
+
+  onUnmounted(() => {
+    if (rafId) {
+      cancelAnimationFrame(rafId)
+      rafId = null
+    }
+  })
+
+  return {
+    tool,
+    brushSize,
+    brushColor,
+    brushOpacity,
+    brushHardness,
+    backgroundColor,
+
+    canvasWidth,
+    canvasHeight,
+
+    cursorVisible,
+    displayBrushSize,
+
+    inputImageUrl,
+    isImageInputConnected,
+
+    handlePointerDown,
+    handlePointerMove,
+    handlePointerUp,
+    handlePointerEnter,
+    handlePointerLeave,
+
+    handleInputImageLoad,
+    handleClear
+  }
+}
diff --git a/src/composables/queue/useCompletionSummary.ts b/src/composables/queue/useCompletionSummary.ts
deleted file mode 100644
index ea240c430d..0000000000
--- a/src/composables/queue/useCompletionSummary.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import { computed, ref, watch } from 'vue'
-
-import { useExecutionStore } from '@/stores/executionStore'
-import { useQueueStore } from '@/stores/queueStore'
-import { jobStateFromTask } from '@/utils/queueUtil'
-
-export type CompletionSummaryMode = 'allSuccess' | 'mixed' | 'allFailed'
-
-export type CompletionSummary = {
-  mode: CompletionSummaryMode
-  completedCount: number
-  failedCount: number
-  thumbnailUrls: string[]
-}
-
-/**
- * Tracks queue activity transitions and exposes a short-lived summary of the
- * most recent generation batch.
- */
-export const useCompletionSummary = () => {
-  const queueStore = useQueueStore()
-  const executionStore = useExecutionStore()
-
-  const isActive = computed(
-    () => queueStore.runningTasks.length > 0 || !executionStore.isIdle
-  )
-
-  const lastActiveStartTs = ref<number | null>(null)
-  const _summary = ref<CompletionSummary | null>(null)
-  const dismissTimer = ref<number | null>(null)
-
-  const clearDismissTimer = () => {
-    if (dismissTimer.value !== null) {
-      clearTimeout(dismissTimer.value)
-      dismissTimer.value = null
-    }
-  }
-
-  const startDismissTimer = () => {
-    clearDismissTimer()
-    dismissTimer.value = window.setTimeout(() => {
-      _summary.value = null
-      dismissTimer.value = null
-    }, 6000)
-  }
-
-  const clearSummary = () => {
-    _summary.value = null
-    clearDismissTimer()
-  }
-
-  watch(
-    isActive,
-    (active, prev) => {
-      if (!prev && active) {
-        lastActiveStartTs.value = Date.now()
-      }
-      if (prev && !active) {
-        const start = lastActiveStartTs.value ?? 0
-        const finished = queueStore.historyTasks.filter((t: any) => {
-          const ts: number | undefined = t.executionEndTimestamp
-          return typeof ts === 'number' && ts >= start
-        })
-
-        if (!finished.length) {
-          _summary.value = null
-          clearDismissTimer()
-          return
-        }
-
-        let completedCount = 0
-        let failedCount = 0
-        const imagePreviews: string[] = []
-
-        for (const task of finished) {
-          const state = jobStateFromTask(task, false)
-          if (state === 'completed') {
-            completedCount++
-            const preview = task.previewOutput
-            if (preview?.isImage) {
-              imagePreviews.push(preview.urlWithTimestamp)
-            }
-          } else if (state === 'failed') {
-            failedCount++
-          }
-        }
-
-        if (completedCount === 0 && failedCount === 0) {
-          _summary.value = null
-          clearDismissTimer()
-          return
-        }
-
-        let mode: CompletionSummaryMode = 'mixed'
-        if (failedCount === 0) mode = 'allSuccess'
-        else if (completedCount === 0) mode = 'allFailed'
-
-        _summary.value = {
-          mode,
-          completedCount,
-          failedCount,
-          thumbnailUrls: imagePreviews.slice(0, 3)
-        }
-        startDismissTimer()
-      }
-    },
-    { immediate: true }
-  )
-
-  const summary = computed(() => _summary.value)
-
-  return {
-    summary,
-    clearSummary
-  }
-}
diff --git a/src/composables/queue/useJobActions.ts b/src/composables/queue/useJobActions.ts
new file mode 100644
index 0000000000..41b4aea037
--- /dev/null
+++ b/src/composables/queue/useJobActions.ts
@@ -0,0 +1,83 @@
+import { computed, toValue } from 'vue'
+import type { MaybeRefOrGetter } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import { useErrorHandling } from '@/composables/useErrorHandling'
+import type { JobListItem } from '@/composables/queue/useJobList'
+import { useJobMenu } from '@/composables/queue/useJobMenu'
+import type { TaskItemImpl } from '@/stores/queueStore'
+import { isActiveJobState } from '@/utils/queueUtil'
+
+export type JobAction = {
+  icon: string
+  label: string
+  variant: 'destructive' | 'secondary' | 'textonly'
+}
+
+export function useJobActions(
+  job: MaybeRefOrGetter<JobListItem | null | undefined>
+) {
+  const { t } = useI18n()
+  const { wrapWithErrorHandlingAsync } = useErrorHandling()
+  const { cancelJob, removeFailedJob } = useJobMenu()
+
+  const cancelAction: JobAction = {
+    icon: 'icon-[lucide--x]',
+    label: t('sideToolbar.queueProgressOverlay.cancelJobTooltip'),
+    variant: 'destructive'
+  }
+
+  const deleteAction: JobAction = {
+    icon: 'icon-[lucide--circle-minus]',
+    label: t('queue.jobMenu.removeJob'),
+    variant: 'destructive'
+  }
+
+  const jobRef = computed(() => toValue(job) ?? null)
+
+  const canCancelJob = computed(() => {
+    const currentJob = jobRef.value
+    if (!currentJob) {
+      return false
+    }
+
+    return currentJob.showClear !== false && isActiveJobState(currentJob.state)
+  })
+
+  const canDeleteJob = computed(() => {
+    const currentJob = jobRef.value
+    if (!currentJob) {
+      return false
+    }
+
+    return currentJob.state === 'failed'
+  })
+
+  const runCancelJob = wrapWithErrorHandlingAsync(async () => {
+    const currentJob = jobRef.value
+    if (!currentJob) {
+      return
+    }
+
+    await cancelJob(currentJob)
+  })
+
+  const runDeleteJob = wrapWithErrorHandlingAsync(async () => {
+    const currentJob = jobRef.value
+    const task = currentJob?.taskRef as TaskItemImpl | undefined
+    if (!task) {
+      return
+    }
+
+    await removeFailedJob(task)
+  })
+
+  return {
+    cancelAction,
+    canCancelJob,
+    runCancelJob,
+    deleteAction,
+    canDeleteJob,
+    runDeleteJob
+  }
+}
diff --git a/tests-ui/tests/composables/useJobList.test.ts b/src/composables/queue/useJobList.test.ts
similarity index 65%
rename from tests-ui/tests/composables/useJobList.test.ts
rename to src/composables/queue/useJobList.test.ts
index 2e453bcf10..0c045ccb49 100644
--- a/tests-ui/tests/composables/useJobList.test.ts
+++ b/src/composables/queue/useJobList.test.ts
@@ -5,18 +5,18 @@ import type { Ref } from 'vue'
 
 import { useJobList } from '@/composables/queue/useJobList'
 import type { JobState } from '@/types/queue'
-import { buildJobDisplay } from '@/utils/queueDisplay'
 import type { BuildJobDisplayCtx } from '@/utils/queueDisplay'
+import { buildJobDisplay } from '@/utils/queueDisplay'
 import type { TaskItemImpl } from '@/stores/queueStore'
 
 type TestTask = {
-  promptId: string
-  queueIndex: number
+  jobId: string
+  job: { priority: number }
   mockState: JobState
   executionTime?: number
   executionEndTimestamp?: number
   createTime?: number
-  workflow?: { id?: string }
+  workflowId?: string
 }
 
 const translations: Record<string, string> = {
@@ -70,7 +70,7 @@ vi.mock('@/composables/queue/useQueueProgress', () => ({
 vi.mock('@/utils/queueDisplay', () => ({
   buildJobDisplay: vi.fn(
     (task: TaskItemImpl, state: JobState, options: BuildJobDisplayCtx) => ({
-      primary: `Job ${task.promptId}`,
+      primary: `Job ${task.jobId}`,
       secondary: `${state} meta`,
       iconName: `${state}-icon`,
       iconImageUrl: undefined,
@@ -109,21 +109,21 @@ vi.mock('@/stores/queueStore', () => ({
 }))
 
 let executionStoreMock: {
-  activePromptId: string | null
+  activeJobId: string | null
   executingNode: null | { title?: string; type?: string }
-  isPromptInitializing: (promptId?: string | number) => boolean
+  isJobInitializing: (jobId?: string | number) => boolean
 }
-let isPromptInitializingMock: (promptId?: string | number) => boolean
+let isJobInitializingMock: (jobId?: string | number) => boolean
 const ensureExecutionStore = () => {
-  if (!isPromptInitializingMock) {
-    isPromptInitializingMock = vi.fn(() => false)
+  if (!isJobInitializingMock) {
+    isJobInitializingMock = vi.fn(() => false)
   }
   if (!executionStoreMock) {
     executionStoreMock = reactive({
-      activePromptId: null as string | null,
+      activeJobId: null as string | null,
       executingNode: null as null | { title?: string; type?: string },
-      isPromptInitializing: (promptId?: string | number) =>
-        isPromptInitializingMock(promptId)
+      isJobInitializing: (jobId?: string | number) =>
+        isJobInitializingMock(jobId)
     })
   }
   return executionStoreMock
@@ -134,6 +134,25 @@ vi.mock('@/stores/executionStore', () => ({
   }
 }))
 
+let jobPreviewStoreMock: {
+  previewsByPromptId: Record<string, string>
+  isPreviewEnabled: boolean
+}
+const ensureJobPreviewStore = () => {
+  if (!jobPreviewStoreMock) {
+    jobPreviewStoreMock = reactive({
+      previewsByPromptId: {} as Record<string, string>,
+      isPreviewEnabled: true
+    })
+  }
+  return jobPreviewStoreMock
+}
+vi.mock('@/stores/jobPreviewStore', () => ({
+  useJobPreviewStore: () => {
+    return ensureJobPreviewStore()
+  }
+}))
+
 let workflowStoreMock: {
   activeWorkflow: null | { activeState?: { id?: string } }
 }
@@ -154,14 +173,13 @@ vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
 const createTask = (
   overrides: Partial<TestTask> & { mockState?: JobState } = {}
 ): TestTask => ({
-  promptId:
-    overrides.promptId ?? `task-${Math.random().toString(36).slice(2, 7)}`,
-  queueIndex: overrides.queueIndex ?? 0,
+  jobId: overrides.jobId ?? `task-${Math.random().toString(36).slice(2, 7)}`,
+  job: overrides.job ?? { priority: 0 },
   mockState: overrides.mockState ?? 'pending',
   executionTime: overrides.executionTime,
   executionEndTimestamp: overrides.executionEndTimestamp,
   createTime: overrides.createTime,
-  workflow: overrides.workflow
+  workflowId: overrides.workflowId
 })
 
 const mountUseJobList = () => {
@@ -183,9 +201,13 @@ const resetStores = () => {
   queueStore.historyTasks = []
 
   const executionStore = ensureExecutionStore()
-  executionStore.activePromptId = null
+  executionStore.activeJobId = null
   executionStore.executingNode = null
 
+  const jobPreviewStore = ensureJobPreviewStore()
+  jobPreviewStore.previewsByPromptId = {}
+  jobPreviewStore.isPreviewEnabled = true
+
   const workflowStore = ensureWorkflowStore()
   workflowStore.activeWorkflow = null
 
@@ -197,9 +219,9 @@ const resetStores = () => {
   localeRef.value = 'en-US'
   tMock.mockClear()
 
-  if (isPromptInitializingMock) {
-    vi.mocked(isPromptInitializingMock).mockReset()
-    vi.mocked(isPromptInitializingMock).mockReturnValue(false)
+  if (isJobInitializingMock) {
+    vi.mocked(isJobInitializingMock).mockReset()
+    vi.mocked(isJobInitializingMock).mockReturnValue(false)
   }
 }
 
@@ -236,7 +258,7 @@ describe('useJobList', () => {
   it('tracks recently added pending jobs and clears the hint after expiry', async () => {
     vi.useFakeTimers()
     queueStoreMock.pendingTasks = [
-      createTask({ promptId: '1', queueIndex: 1, mockState: 'pending' })
+      createTask({ jobId: '1', job: { priority: 1 }, mockState: 'pending' })
     ]
 
     const { jobItems } = initComposable()
@@ -265,7 +287,7 @@ describe('useJobList', () => {
     vi.useFakeTimers()
     const taskId = '2'
     queueStoreMock.pendingTasks = [
-      createTask({ promptId: taskId, queueIndex: 1, mockState: 'pending' })
+      createTask({ jobId: taskId, job: { priority: 1 }, mockState: 'pending' })
     ]
 
     const { jobItems } = initComposable()
@@ -278,7 +300,7 @@ describe('useJobList', () => {
 
     vi.mocked(buildJobDisplay).mockClear()
     queueStoreMock.pendingTasks = [
-      createTask({ promptId: taskId, queueIndex: 2, mockState: 'pending' })
+      createTask({ jobId: taskId, job: { priority: 2 }, mockState: 'pending' })
     ]
     await flush()
     jobItems.value
@@ -292,7 +314,7 @@ describe('useJobList', () => {
   it('cleans up timeouts on unmount', async () => {
     vi.useFakeTimers()
     queueStoreMock.pendingTasks = [
-      createTask({ promptId: '3', queueIndex: 1, mockState: 'pending' })
+      createTask({ jobId: '3', job: { priority: 1 }, mockState: 'pending' })
     ]
 
     initComposable()
@@ -305,32 +327,48 @@ describe('useJobList', () => {
     expect(vi.getTimerCount()).toBe(0)
   })
 
-  it('sorts all tasks by queue index descending', async () => {
+  it('sorts all tasks by create time', async () => {
     queueStoreMock.pendingTasks = [
-      createTask({ promptId: 'p', queueIndex: 1, mockState: 'pending' })
+      createTask({
+        jobId: 'p',
+        job: { priority: 1 },
+        mockState: 'pending',
+        createTime: 3000
+      })
     ]
     queueStoreMock.runningTasks = [
-      createTask({ promptId: 'r', queueIndex: 5, mockState: 'running' })
+      createTask({
+        jobId: 'r',
+        job: { priority: 5 },
+        mockState: 'running',
+        createTime: 2000
+      })
     ]
     queueStoreMock.historyTasks = [
-      createTask({ promptId: 'h', queueIndex: 3, mockState: 'completed' })
+      createTask({
+        jobId: 'h',
+        job: { priority: 3 },
+        mockState: 'completed',
+        createTime: 1000,
+        executionEndTimestamp: 5000
+      })
     ]
 
     const { allTasksSorted } = initComposable()
     await flush()
 
-    expect(allTasksSorted.value.map((task) => task.promptId)).toEqual([
+    expect(allTasksSorted.value.map((task) => task.jobId)).toEqual([
+      'p',
       'r',
-      'h',
-      'p'
+      'h'
     ])
   })
 
   it('filters by job tab and resets failed tab when failures disappear', async () => {
     queueStoreMock.historyTasks = [
-      createTask({ promptId: 'c', queueIndex: 3, mockState: 'completed' }),
-      createTask({ promptId: 'f', queueIndex: 2, mockState: 'failed' }),
-      createTask({ promptId: 'p', queueIndex: 1, mockState: 'pending' })
+      createTask({ jobId: 'c', job: { priority: 3 }, mockState: 'completed' }),
+      createTask({ jobId: 'f', job: { priority: 2 }, mockState: 'failed' }),
+      createTask({ jobId: 'p', job: { priority: 1 }, mockState: 'pending' })
     ]
 
     const instance = initComposable()
@@ -338,15 +376,15 @@ describe('useJobList', () => {
 
     instance.selectedJobTab.value = 'Completed'
     await flush()
-    expect(instance.filteredTasks.value.map((t) => t.promptId)).toEqual(['c'])
+    expect(instance.filteredTasks.value.map((t) => t.jobId)).toEqual(['c'])
 
     instance.selectedJobTab.value = 'Failed'
     await flush()
-    expect(instance.filteredTasks.value.map((t) => t.promptId)).toEqual(['f'])
+    expect(instance.filteredTasks.value.map((t) => t.jobId)).toEqual(['f'])
     expect(instance.hasFailedJobs.value).toBe(true)
 
     queueStoreMock.historyTasks = [
-      createTask({ promptId: 'c', queueIndex: 3, mockState: 'completed' })
+      createTask({ jobId: 'c', job: { priority: 3 }, mockState: 'completed' })
     ]
     await flush()
 
@@ -357,16 +395,16 @@ describe('useJobList', () => {
   it('filters by active workflow when requested', async () => {
     queueStoreMock.pendingTasks = [
       createTask({
-        promptId: 'wf-1',
-        queueIndex: 2,
+        jobId: 'wf-1',
+        job: { priority: 2 },
         mockState: 'pending',
-        workflow: { id: 'workflow-1' }
+        workflowId: 'workflow-1'
       }),
       createTask({
-        promptId: 'wf-2',
-        queueIndex: 1,
+        jobId: 'wf-2',
+        job: { priority: 1 },
         mockState: 'pending',
-        workflow: { id: 'workflow-2' }
+        workflowId: 'workflow-2'
       })
     ]
 
@@ -380,28 +418,72 @@ describe('useJobList', () => {
     workflowStoreMock.activeWorkflow = { activeState: { id: 'workflow-1' } }
     await flush()
 
-    expect(instance.filteredTasks.value.map((t) => t.promptId)).toEqual([
-      'wf-1'
+    expect(instance.filteredTasks.value.map((t) => t.jobId)).toEqual(['wf-1'])
+  })
+
+  it('filters jobs by search query', async () => {
+    vi.useFakeTimers()
+    queueStoreMock.historyTasks = [
+      createTask({
+        jobId: 'alpha',
+        job: { priority: 2 },
+        mockState: 'completed',
+        createTime: 2000,
+        executionEndTimestamp: 2000
+      }),
+      createTask({
+        jobId: 'beta',
+        job: { priority: 1 },
+        mockState: 'failed',
+        createTime: 1000,
+        executionEndTimestamp: 1000
+      })
+    ]
+
+    const instance = initComposable()
+    await flush()
+    expect(instance.filteredTasks.value.map((task) => task.jobId)).toEqual([
+      'alpha',
+      'beta'
     ])
+
+    instance.searchQuery.value = 'beta'
+    await vi.advanceTimersByTimeAsync(200)
+    await flush()
+    expect(instance.filteredTasks.value.map((task) => task.jobId)).toEqual([
+      'beta'
+    ])
+
+    instance.searchQuery.value = 'failed meta'
+    await vi.advanceTimersByTimeAsync(200)
+    await flush()
+    expect(instance.filteredTasks.value.map((task) => task.jobId)).toEqual([
+      'beta'
+    ])
+
+    instance.searchQuery.value = 'does-not-exist'
+    await vi.advanceTimersByTimeAsync(200)
+    await flush()
+    expect(instance.filteredTasks.value).toEqual([])
   })
 
   it('hydrates job items with active progress and compute hours', async () => {
     queueStoreMock.runningTasks = [
       createTask({
-        promptId: 'active',
-        queueIndex: 3,
+        jobId: 'active',
+        job: { priority: 3 },
         mockState: 'running',
         executionTime: 7_200_000
       }),
       createTask({
-        promptId: 'other',
-        queueIndex: 2,
+        jobId: 'other',
+        job: { priority: 2 },
         mockState: 'running',
         executionTime: 3_600_000
       })
     ]
 
-    executionStoreMock.activePromptId = 'active'
+    executionStoreMock.activeJobId = 'active'
     executionStoreMock.executingNode = { title: 'Render Node' }
     totalPercent.value = 80
     currentNodePercent.value = 40
@@ -421,6 +503,44 @@ describe('useJobList', () => {
     expect(otherJob.computeHours).toBeCloseTo(1)
   })
 
+  it('assigns preview urls for running jobs when previews enabled', async () => {
+    queueStoreMock.runningTasks = [
+      createTask({
+        jobId: 'live-preview',
+        job: { priority: 1 },
+        mockState: 'running'
+      })
+    ]
+    jobPreviewStoreMock.previewsByPromptId = {
+      'live-preview': 'blob:preview-url'
+    }
+    jobPreviewStoreMock.isPreviewEnabled = true
+
+    const { jobItems } = initComposable()
+    await flush()
+
+    expect(jobItems.value[0].iconImageUrl).toBe('blob:preview-url')
+  })
+
+  it('omits preview urls when previews are disabled', async () => {
+    queueStoreMock.runningTasks = [
+      createTask({
+        jobId: 'disabled-preview',
+        job: { priority: 1 },
+        mockState: 'running'
+      })
+    ]
+    jobPreviewStoreMock.previewsByPromptId = {
+      'disabled-preview': 'blob:preview-url'
+    }
+    jobPreviewStoreMock.isPreviewEnabled = false
+
+    const { jobItems } = initComposable()
+    await flush()
+
+    expect(jobItems.value[0].iconImageUrl).toBeUndefined()
+  })
+
   it('derives current node name from execution store fallbacks', async () => {
     const instance = initComposable()
     await flush()
@@ -446,29 +566,29 @@ describe('useJobList', () => {
     vi.setSystemTime(new Date('2024-01-10T12:00:00Z'))
     queueStoreMock.historyTasks = [
       createTask({
-        promptId: 'today-small',
-        queueIndex: 4,
+        jobId: 'today-small',
+        job: { priority: 4 },
         mockState: 'completed',
         executionEndTimestamp: Date.now(),
         executionTime: 2_000
       }),
       createTask({
-        promptId: 'today-large',
-        queueIndex: 3,
+        jobId: 'today-large',
+        job: { priority: 3 },
         mockState: 'completed',
         executionEndTimestamp: Date.now(),
         executionTime: 5_000
       }),
       createTask({
-        promptId: 'yesterday',
-        queueIndex: 2,
+        jobId: 'yesterday',
+        job: { priority: 2 },
         mockState: 'failed',
         executionEndTimestamp: Date.now() - 86_400_000,
         executionTime: 1_000
       }),
       createTask({
-        promptId: 'undated',
-        queueIndex: 1,
+        jobId: 'undated',
+        job: { priority: 1 },
         mockState: 'pending'
       })
     ]
diff --git a/src/composables/queue/useJobList.ts b/src/composables/queue/useJobList.ts
index 47996636be..f251c69e3a 100644
--- a/src/composables/queue/useJobList.ts
+++ b/src/composables/queue/useJobList.ts
@@ -1,3 +1,5 @@
+import { refDebounced } from '@vueuse/core'
+import { orderBy } from 'es-toolkit/array'
 import { computed, onUnmounted, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 
@@ -6,6 +8,7 @@ import { st } from '@/i18n'
 import { isCloud } from '@/platform/distribution/types'
 import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
 import { useExecutionStore } from '@/stores/executionStore'
+import { useJobPreviewStore } from '@/stores/jobPreviewStore'
 import { useQueueStore } from '@/stores/queueStore'
 import type { TaskItemImpl } from '@/stores/queueStore'
 import type { JobState } from '@/types/queue'
@@ -16,7 +19,7 @@ import {
   isToday,
   isYesterday
 } from '@/utils/dateTimeUtil'
-import { normalizeI18nKey } from '@/utils/formatUtil'
+import { resolveNodeDisplayName } from '@/utils/nodeTitleUtil'
 import { buildJobDisplay } from '@/utils/queueDisplay'
 import { jobStateFromTask } from '@/utils/queueUtil'
 
@@ -38,7 +41,7 @@ export type JobListItem = {
   iconName?: string
   iconImageUrl?: string
   showClear?: boolean
-  taskRef?: any
+  taskRef?: TaskItemImpl
   progressTotalPercent?: number
   progressCurrentPercent?: number
   runningNodeName?: string
@@ -95,6 +98,7 @@ export function useJobList() {
   const { t, locale } = useI18n()
   const queueStore = useQueueStore()
   const executionStore = useExecutionStore()
+  const jobPreviewStore = useJobPreviewStore()
   const workflowStore = useWorkflowStore()
 
   const seenPendingIds = ref<Set<string>>(new Set())
@@ -124,7 +128,7 @@ export function useJobList() {
   watch(
     () =>
       queueStore.pendingTasks
-        .map((task) => taskIdToKey(task.promptId))
+        .map((task) => taskIdToKey(task.jobId))
         .filter((id): id is string => !!id),
     (pendingIds) => {
       const pendingSet = new Set(pendingIds)
@@ -155,7 +159,7 @@ export function useJobList() {
 
   const shouldShowAddedHint = (task: TaskItemImpl, state: JobState) => {
     if (state !== 'pending') return false
-    const id = taskIdToKey(task.promptId)
+    const id = taskIdToKey(task.jobId)
     if (!id) return false
     return recentlyAddedPendingIds.value.has(id)
   }
@@ -180,22 +184,24 @@ export function useJobList() {
   })
   const undatedLabel = computed(() => t('queue.jobList.undated') || 'Undated')
 
-  const isJobInitializing = (promptId: string | number | undefined) =>
-    executionStore.isPromptInitializing(promptId)
+  const isJobInitializing = (jobId: string | number | undefined) =>
+    executionStore.isJobInitializing(jobId)
 
   const currentNodeName = computed(() => {
-    const node = executionStore.executingNode
-    if (!node) return t('g.emDash')
-    const title = (node.title ?? '').toString().trim()
-    if (title) return title
-    const nodeType = (node.type ?? '').toString().trim() || t('g.untitled')
-    const key = `nodeDefs.${normalizeI18nKey(nodeType)}.display_name`
-    return st(key, nodeType)
+    return resolveNodeDisplayName(executionStore.executingNode, {
+      emptyLabel: t('g.emDash'),
+      untitledLabel: t('g.untitled'),
+      st
+    })
   })
 
   const selectedJobTab = ref<JobTab>('All')
   const selectedWorkflowFilter = ref<'all' | 'current'>('all')
   const selectedSortMode = ref<JobSortMode>('mostRecent')
+  const searchQuery = ref('')
+  const debouncedSearchQuery = refDebounced(searchQuery, 150)
+
+  const mostRecentTimestamp = (task: TaskItemImpl) => task.createTime ?? 0
 
   const allTasksSorted = computed<TaskItemImpl[]>(() => {
     const all = [
@@ -203,13 +209,13 @@ export function useJobList() {
       ...queueStore.runningTasks,
       ...queueStore.historyTasks
     ]
-    return all.sort((a, b) => b.queueIndex - a.queueIndex)
+    return orderBy(all, [mostRecentTimestamp], ['desc'])
   })
 
   const tasksWithJobState = computed<TaskWithState[]>(() =>
     allTasksSorted.value.map((task) => ({
       task,
-      state: jobStateFromTask(task, isJobInitializing(task?.promptId))
+      state: jobStateFromTask(task, isJobInitializing(task?.jobId))
     }))
   )
 
@@ -238,23 +244,31 @@ export function useJobList() {
       const activeId = workflowStore.activeWorkflow?.activeState?.id
       if (!activeId) return []
       entries = entries.filter(({ task }) => {
-        const wid = task.workflow?.id
+        const wid = task.workflowId
         return !!wid && wid === activeId
       })
     }
     return entries
   })
 
+  const normalizedSearchQuery = computed(() =>
+    debouncedSearchQuery.value.trim().toLocaleLowerCase()
+  )
+
   const filteredTasks = computed<TaskItemImpl[]>(() =>
-    filteredTaskEntries.value.map(({ task }) => task)
+    searchableTaskEntries.value.map(({ task }) => task)
   )
 
   const jobItems = computed<JobListItem[]>(() => {
     return filteredTaskEntries.value.map(({ task, state }) => {
       const isActive =
-        String(task.promptId ?? '') ===
-        String(executionStore.activePromptId ?? '')
+        String(task.jobId ?? '') === String(executionStore.activeJobId ?? '')
       const showAddedHint = shouldShowAddedHint(task, state)
+      const promptKey = taskIdToKey(task.jobId)
+      const promptPreviewUrl =
+        state === 'running' && jobPreviewStore.isPreviewEnabled && promptKey
+          ? jobPreviewStore.previewsByPromptId[promptKey]
+          : undefined
 
       const display = buildJobDisplay(task, state, {
         t,
@@ -269,12 +283,12 @@ export function useJobList() {
       })
 
       return {
-        id: String(task.promptId),
+        id: String(task.jobId),
         title: display.primary,
         meta: display.secondary,
         state,
         iconName: display.iconName,
-        iconImageUrl: display.iconImageUrl,
+        iconImageUrl: promptPreviewUrl ?? display.iconImageUrl,
         showClear: display.showClear,
         taskRef: task,
         progressTotalPercent:
@@ -300,11 +314,31 @@ export function useJobList() {
     return m
   })
 
+  const searchableTaskEntries = computed<TaskWithState[]>(() => {
+    if (!normalizedSearchQuery.value) return filteredTaskEntries.value
+
+    return filteredTaskEntries.value.filter(({ task }) => {
+      const taskId = String(task.jobId ?? '').toLocaleLowerCase()
+      const item = jobItemById.value.get(String(task.jobId))
+      if (!item) {
+        return taskId.includes(normalizedSearchQuery.value)
+      }
+
+      const title = item.title.toLocaleLowerCase()
+      const meta = item.meta.toLocaleLowerCase()
+      return (
+        title.includes(normalizedSearchQuery.value) ||
+        meta.includes(normalizedSearchQuery.value) ||
+        taskId.includes(normalizedSearchQuery.value)
+      )
+    })
+  })
+
   const groupedJobItems = computed<JobGroup[]>(() => {
     const groups: JobGroup[] = []
     const index = new Map<string, number>()
     const localeValue = locale.value
-    for (const { task, state } of filteredTaskEntries.value) {
+    for (const { task, state } of searchableTaskEntries.value) {
       let ts: number | undefined
       if (state === 'completed' || state === 'failed') {
         ts = task.executionEndTimestamp
@@ -326,7 +360,7 @@ export function useJobList() {
         groupIdx = groups.length - 1
         index.set(key, groupIdx)
       }
-      const ji = jobItemById.value.get(String(task.promptId))
+      const ji = jobItemById.value.get(String(task.jobId))
       if (ji) groups[groupIdx].items.push(ji)
     }
 
@@ -349,6 +383,7 @@ export function useJobList() {
     selectedJobTab,
     selectedWorkflowFilter,
     selectedSortMode,
+    searchQuery,
     hasFailedJobs,
     // data sources
     allTasksSorted,
diff --git a/tests-ui/tests/composables/useJobMenu.test.ts b/src/composables/queue/useJobMenu.test.ts
similarity index 76%
rename from tests-ui/tests/composables/useJobMenu.test.ts
rename to src/composables/queue/useJobMenu.test.ts
index 0bd8769510..3b64ce4b6c 100644
--- a/tests-ui/tests/composables/useJobMenu.test.ts
+++ b/src/composables/queue/useJobMenu.test.ts
@@ -5,15 +5,24 @@ import type { Ref } from 'vue'
 import type { JobListItem } from '@/composables/queue/useJobList'
 import type { MenuEntry } from '@/composables/queue/useJobMenu'
 
+vi.mock('@/platform/distribution/types', () => ({
+  isCloud: false
+}))
+
 const downloadFileMock = vi.fn()
 vi.mock('@/base/common/downloadUtil', () => ({
-  downloadFile: (...args: any[]) => downloadFileMock(...args)
+  downloadFile: (url: string, filename?: string) => {
+    if (filename === undefined) {
+      return downloadFileMock(url)
+    }
+    return downloadFileMock(url, filename)
+  }
 }))
 
 const copyToClipboardMock = vi.fn()
 vi.mock('@/composables/useCopyToClipboard', () => ({
   useCopyToClipboard: () => ({
-    copyToClipboard: (...args: any[]) => copyToClipboardMock(...args)
+    copyToClipboard: (text: string) => copyToClipboardMock(text)
   })
 }))
 
@@ -26,12 +35,12 @@ vi.mock('@/i18n', () => ({
 
 const mapTaskOutputToAssetItemMock = vi.fn()
 vi.mock('@/platform/assets/composables/media/assetMappers', () => ({
-  mapTaskOutputToAssetItem: (...args: any[]) =>
-    mapTaskOutputToAssetItemMock(...args)
+  mapTaskOutputToAssetItem: (taskItem: TaskItemImpl, output: ResultItemImpl) =>
+    mapTaskOutputToAssetItemMock(taskItem, output)
 }))
 
 const mediaAssetActionsMock = {
-  confirmDelete: vi.fn()
+  deleteAssets: vi.fn()
 }
 vi.mock('@/platform/assets/composables/useMediaAssetActions', () => ({
   useMediaAssetActions: () => mediaAssetActionsMock
@@ -55,24 +64,27 @@ const workflowStoreMock = {
   createTemporary: vi.fn()
 }
 vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
-  useWorkflowStore: () => workflowStoreMock
+  useWorkflowStore: () => workflowStoreMock,
+  ComfyWorkflow: class {}
 }))
 
 const interruptMock = vi.fn()
 const deleteItemMock = vi.fn()
 vi.mock('@/scripts/api', () => ({
   api: {
-    interrupt: (...args: any[]) => interruptMock(...args),
-    deleteItem: (...args: any[]) => deleteItemMock(...args)
+    interrupt: (runningJobId: string | null) => interruptMock(runningJobId),
+    deleteItem: (type: string, id: string) => deleteItemMock(type, id)
   }
 }))
 
 const downloadBlobMock = vi.fn()
 vi.mock('@/scripts/utils', () => ({
-  downloadBlob: (...args: any[]) => downloadBlobMock(...args)
+  downloadBlob: (filename: string, blob: Blob) =>
+    downloadBlobMock(filename, blob)
 }))
 
 const dialogServiceMock = {
+  showErrorDialog: vi.fn(),
   showExecutionErrorDialog: vi.fn(),
   prompt: vi.fn()
 }
@@ -88,11 +100,14 @@ vi.mock('@/services/litegraphService', () => ({
   useLitegraphService: () => litegraphServiceMock
 }))
 
-const nodeDefStoreMock = {
-  nodeDefsByName: {} as Record<string, any>
+const nodeDefStoreMock: {
+  nodeDefsByName: Record<string, Partial<ComfyNodeDefImpl>>
+} = {
+  nodeDefsByName: {}
 }
 vi.mock('@/stores/nodeDefStore', () => ({
-  useNodeDefStore: () => nodeDefStoreMock
+  useNodeDefStore: () => nodeDefStoreMock,
+  ComfyNodeDefImpl: class {}
 }))
 
 const queueStoreMock = {
@@ -103,9 +118,22 @@ vi.mock('@/stores/queueStore', () => ({
   useQueueStore: () => queueStoreMock
 }))
 
+const executionStoreMock = {
+  clearInitializationByJobId: vi.fn()
+}
+vi.mock('@/stores/executionStore', () => ({
+  useExecutionStore: () => executionStoreMock
+}))
+
+const getJobWorkflowMock = vi.fn()
+vi.mock('@/services/jobOutputCache', () => ({
+  getJobWorkflow: (jobId: string) => getJobWorkflowMock(jobId)
+}))
+
 const createAnnotatedPathMock = vi.fn()
 vi.mock('@/utils/createAnnotatedPath', () => ({
-  createAnnotatedPath: (...args: any[]) => createAnnotatedPathMock(...args)
+  createAnnotatedPath: (filename: string, subfolder: string, type: string) =>
+    createAnnotatedPathMock(filename, subfolder, type)
 }))
 
 const appendJsonExtMock = vi.fn((value: string) =>
@@ -117,13 +145,23 @@ vi.mock('@/utils/formatUtil', () => ({
 }))
 
 import { useJobMenu } from '@/composables/queue/useJobMenu'
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+import type { ResultItemImpl, TaskItemImpl } from '@/stores/queueStore'
 
-const createJobItem = (overrides: Partial<JobListItem> = {}): JobListItem => ({
+type MockTaskRef = Record<string, unknown>
+
+type TestJobListItem = Omit<JobListItem, 'taskRef'> & {
+  taskRef?: MockTaskRef
+}
+
+const createJobItem = (
+  overrides: Partial<TestJobListItem> = {}
+): JobListItem => ({
   id: overrides.id ?? 'job-1',
   title: overrides.title ?? 'Test job',
   meta: overrides.meta ?? 'meta',
   state: overrides.state ?? 'completed',
-  taskRef: overrides.taskRef,
+  taskRef: overrides.taskRef as TaskItemImpl | undefined,
   iconName: overrides.iconName,
   iconImageUrl: overrides.iconImageUrl,
   showClear: overrides.showClear,
@@ -159,17 +197,19 @@ describe('useJobMenu', () => {
     }))
     queueStoreMock.update.mockResolvedValue(undefined)
     queueStoreMock.delete.mockResolvedValue(undefined)
-    mediaAssetActionsMock.confirmDelete.mockResolvedValue(false)
+    mediaAssetActionsMock.deleteAssets.mockResolvedValue(false)
     mapTaskOutputToAssetItemMock.mockImplementation((task, output) => ({
       task,
       output
     }))
     createAnnotatedPathMock.mockReturnValue('annotated-path')
     nodeDefStoreMock.nodeDefsByName = {
-      LoadImage: { id: 'LoadImage' },
-      LoadVideo: { id: 'LoadVideo' },
-      LoadAudio: { id: 'LoadAudio' }
+      LoadImage: { name: 'LoadImage' },
+      LoadVideo: { name: 'LoadVideo' },
+      LoadAudio: { name: 'LoadAudio' }
     }
+    // Default: no workflow available via lazy loading
+    getJobWorkflowMock.mockResolvedValue(undefined)
   })
 
   const setCurrentItem = (item: JobListItem | null) => {
@@ -179,10 +219,13 @@ describe('useJobMenu', () => {
   it('opens workflow when workflow data exists', async () => {
     const { openJobWorkflow } = mountJobMenu()
     const workflow = { nodes: [] }
-    setCurrentItem(createJobItem({ id: '55', taskRef: { workflow } }))
+    // Mock lazy loading via fetchJobDetail + extractWorkflow
+    getJobWorkflowMock.mockResolvedValue(workflow)
+    setCurrentItem(createJobItem({ id: '55' }))
 
     await openJobWorkflow()
 
+    expect(getJobWorkflowMock).toHaveBeenCalledWith('55')
     expect(workflowStoreMock.createTemporary).toHaveBeenCalledWith(
       'Job 55.json',
       workflow
@@ -225,7 +268,7 @@ describe('useJobMenu', () => {
     ['initialization', interruptMock, deleteItemMock]
   ])('cancels %s job via interrupt', async (state) => {
     const { cancelJob } = mountJobMenu()
-    setCurrentItem(createJobItem({ state: state as any }))
+    setCurrentItem(createJobItem({ state: state as JobListItem['state'] }))
 
     await cancelJob()
 
@@ -257,11 +300,12 @@ describe('useJobMenu', () => {
 
   it('copies error message from failed job entry', async () => {
     const { jobMenuEntries } = mountJobMenu()
-    const error = { exception_message: 'boom' }
     setCurrentItem(
       createJobItem({
         state: 'failed',
-        taskRef: { status: { messages: [['execution_error', error]] } } as any
+        taskRef: {
+          errorMessage: 'Something went wrong'
+        } as Partial<TaskItemImpl>
       })
     )
 
@@ -269,31 +313,77 @@ describe('useJobMenu', () => {
     const entry = findActionEntry(jobMenuEntries.value, 'copy-error')
     await entry?.onClick?.()
 
-    expect(copyToClipboardMock).toHaveBeenCalledWith('boom')
+    expect(copyToClipboardMock).toHaveBeenCalledWith('Something went wrong')
   })
 
-  it('reports error via dialog when entry triggered', async () => {
+  it('reports error via rich dialog when execution_error available', async () => {
+    const executionError = {
+      prompt_id: 'job-1',
+      timestamp: 12345,
+      node_id: '5',
+      node_type: 'KSampler',
+      executed: ['1', '2'],
+      exception_message: 'CUDA out of memory',
+      exception_type: 'RuntimeError',
+      traceback: ['line 1', 'line 2'],
+      current_inputs: {},
+      current_outputs: {}
+    }
     const { jobMenuEntries } = mountJobMenu()
-    const error = { exception_message: 'bad', extra: 1 }
     setCurrentItem(
       createJobItem({
         state: 'failed',
-        taskRef: { status: { messages: [['execution_error', error]] } } as any
+        taskRef: {
+          errorMessage: 'CUDA out of memory',
+          executionError,
+          createTime: 12345
+        } as Partial<TaskItemImpl>
       })
     )
 
     await nextTick()
     const entry = findActionEntry(jobMenuEntries.value, 'report-error')
-    entry?.onClick?.()
+    await entry?.onClick?.()
 
+    expect(dialogServiceMock.showExecutionErrorDialog).toHaveBeenCalledTimes(1)
     expect(dialogServiceMock.showExecutionErrorDialog).toHaveBeenCalledWith(
-      error
+      executionError
     )
+    expect(dialogServiceMock.showErrorDialog).not.toHaveBeenCalled()
+  })
+
+  it('falls back to simple error dialog when no execution_error', async () => {
+    const { jobMenuEntries } = mountJobMenu()
+    setCurrentItem(
+      createJobItem({
+        state: 'failed',
+        taskRef: {
+          errorMessage: 'Job failed with error'
+        } as Partial<TaskItemImpl>
+      })
+    )
+
+    await nextTick()
+    const entry = findActionEntry(jobMenuEntries.value, 'report-error')
+    await entry?.onClick?.()
+
+    expect(dialogServiceMock.showExecutionErrorDialog).not.toHaveBeenCalled()
+    expect(dialogServiceMock.showErrorDialog).toHaveBeenCalledTimes(1)
+    const [errorArg, optionsArg] =
+      dialogServiceMock.showErrorDialog.mock.calls[0]
+    expect(errorArg).toBeInstanceOf(Error)
+    expect(errorArg.message).toBe('Job failed with error')
+    expect(optionsArg).toEqual({ reportType: 'queueJobError' })
   })
 
   it('ignores error actions when message missing', async () => {
     const { jobMenuEntries } = mountJobMenu()
-    setCurrentItem(createJobItem({ state: 'failed', taskRef: { status: {} } }))
+    setCurrentItem(
+      createJobItem({
+        state: 'failed',
+        taskRef: { errorMessage: undefined } as Partial<TaskItemImpl>
+      })
+    )
 
     await nextTick()
     const copyEntry = findActionEntry(jobMenuEntries.value, 'copy-error')
@@ -302,6 +392,7 @@ describe('useJobMenu', () => {
     await reportEntry?.onClick?.()
 
     expect(copyToClipboardMock).not.toHaveBeenCalled()
+    expect(dialogServiceMock.showErrorDialog).not.toHaveBeenCalled()
     expect(dialogServiceMock.showExecutionErrorDialog).not.toHaveBeenCalled()
   })
 
@@ -438,7 +529,12 @@ describe('useJobMenu', () => {
 
   it('ignores add-to-current entry when preview missing entirely', async () => {
     const { jobMenuEntries } = mountJobMenu()
-    setCurrentItem(createJobItem({ state: 'completed', taskRef: {} as any }))
+    setCurrentItem(
+      createJobItem({
+        state: 'completed',
+        taskRef: {} as Partial<TaskItemImpl>
+      })
+    )
 
     await nextTick()
     const entry = findActionEntry(jobMenuEntries.value, 'add-to-current')
@@ -460,29 +556,35 @@ describe('useJobMenu', () => {
 
     await nextTick()
     const entry = findActionEntry(jobMenuEntries.value, 'download')
-    entry?.onClick?.()
+    void entry?.onClick?.()
 
     expect(downloadFileMock).toHaveBeenCalledWith('https://asset')
   })
 
   it('ignores download request when preview missing', async () => {
     const { jobMenuEntries } = mountJobMenu()
-    setCurrentItem(createJobItem({ state: 'completed', taskRef: {} as any }))
+    setCurrentItem(
+      createJobItem({
+        state: 'completed',
+        taskRef: {} as Partial<TaskItemImpl>
+      })
+    )
 
     await nextTick()
     const entry = findActionEntry(jobMenuEntries.value, 'download')
-    entry?.onClick?.()
+    void entry?.onClick?.()
 
     expect(downloadFileMock).not.toHaveBeenCalled()
   })
 
   it('exports workflow with default filename when prompting disabled', async () => {
+    const workflow = { foo: 'bar' }
+    getJobWorkflowMock.mockResolvedValue(workflow)
     const { jobMenuEntries } = mountJobMenu()
     setCurrentItem(
       createJobItem({
         id: '7',
-        state: 'completed',
-        taskRef: { workflow: { foo: 'bar' } }
+        state: 'completed'
       })
     )
 
@@ -502,11 +604,11 @@ describe('useJobMenu', () => {
   it('prompts for filename when setting enabled', async () => {
     settingStoreMock.get.mockReturnValue(true)
     dialogServiceMock.prompt.mockResolvedValue('custom-name')
+    getJobWorkflowMock.mockResolvedValue({})
     const { jobMenuEntries } = mountJobMenu()
     setCurrentItem(
       createJobItem({
-        state: 'completed',
-        taskRef: { workflow: {} }
+        state: 'completed'
       })
     )
 
@@ -526,12 +628,12 @@ describe('useJobMenu', () => {
   it('keeps existing json extension when exporting workflow', async () => {
     settingStoreMock.get.mockReturnValue(true)
     dialogServiceMock.prompt.mockResolvedValue('existing.json')
+    getJobWorkflowMock.mockResolvedValue({ foo: 'bar' })
     const { jobMenuEntries } = mountJobMenu()
     setCurrentItem(
       createJobItem({
         id: '42',
-        state: 'completed',
-        taskRef: { workflow: { foo: 'bar' } }
+        state: 'completed'
       })
     )
 
@@ -547,11 +649,11 @@ describe('useJobMenu', () => {
   it('abandons export when prompt cancelled', async () => {
     settingStoreMock.get.mockReturnValue(true)
     dialogServiceMock.prompt.mockResolvedValue('')
+    getJobWorkflowMock.mockResolvedValue({})
     const { jobMenuEntries } = mountJobMenu()
     setCurrentItem(
       createJobItem({
-        state: 'completed',
-        taskRef: { workflow: {} }
+        state: 'completed'
       })
     )
 
@@ -563,7 +665,7 @@ describe('useJobMenu', () => {
   })
 
   it('deletes preview asset when confirmed', async () => {
-    mediaAssetActionsMock.confirmDelete.mockResolvedValue(true)
+    mediaAssetActionsMock.deleteAssets.mockResolvedValue(true)
     const { jobMenuEntries } = mountJobMenu()
     const preview = { filename: 'foo', subfolder: 'bar', type: 'output' }
     const taskRef = { previewOutput: preview }
@@ -578,7 +680,7 @@ describe('useJobMenu', () => {
   })
 
   it('does not refresh queue when delete cancelled', async () => {
-    mediaAssetActionsMock.confirmDelete.mockResolvedValue(false)
+    mediaAssetActionsMock.deleteAssets.mockResolvedValue(false)
     const { jobMenuEntries } = mountJobMenu()
     setCurrentItem(
       createJobItem({
@@ -640,6 +742,17 @@ describe('useJobMenu', () => {
       'd3',
       'delete'
     ])
+
+    expect(
+      findActionEntry(jobMenuEntries.value, 'inspect-asset')?.disabled
+    ).toBe(false)
+    expect(
+      findActionEntry(jobMenuEntries.value, 'add-to-current')?.disabled
+    ).toBe(false)
+    expect(findActionEntry(jobMenuEntries.value, 'download')?.disabled).toBe(
+      false
+    )
+
     const inspectEntry = findActionEntry(jobMenuEntries.value, 'inspect-asset')
     await inspectEntry?.onClick?.()
     expect(inspectSpy).toHaveBeenCalledWith(currentItem.value)
@@ -657,6 +770,7 @@ describe('useJobMenu', () => {
     await nextTick()
     const inspectEntry = findActionEntry(jobMenuEntries.value, 'inspect-asset')
     expect(inspectEntry?.onClick).toBeUndefined()
+    expect(inspectEntry?.disabled).toBe(true)
   })
 
   it('omits delete asset entry when no preview exists', async () => {
@@ -664,6 +778,15 @@ describe('useJobMenu', () => {
     setCurrentItem(createJobItem({ state: 'completed', taskRef: {} }))
 
     await nextTick()
+    expect(
+      findActionEntry(jobMenuEntries.value, 'inspect-asset')?.disabled
+    ).toBe(true)
+    expect(
+      findActionEntry(jobMenuEntries.value, 'add-to-current')?.disabled
+    ).toBe(true)
+    expect(findActionEntry(jobMenuEntries.value, 'download')?.disabled).toBe(
+      true
+    )
     expect(jobMenuEntries.value.some((entry) => entry.key === 'delete')).toBe(
       false
     )
@@ -671,7 +794,12 @@ describe('useJobMenu', () => {
 
   it('returns failed menu entries with error actions', async () => {
     const { jobMenuEntries } = mountJobMenu()
-    setCurrentItem(createJobItem({ state: 'failed', taskRef: { status: {} } }))
+    setCurrentItem(
+      createJobItem({
+        state: 'failed',
+        taskRef: { errorMessage: 'Some error' } as Partial<TaskItemImpl>
+      })
+    )
 
     await nextTick()
     expect(jobMenuEntries.value.map((entry) => entry.key)).toEqual([
diff --git a/src/composables/queue/useJobMenu.ts b/src/composables/queue/useJobMenu.ts
index db8a1cbc34..1a81a8e582 100644
--- a/src/composables/queue/useJobMenu.ts
+++ b/src/composables/queue/useJobMenu.ts
@@ -6,18 +6,17 @@ import { useCopyToClipboard } from '@/composables/useCopyToClipboard'
 import { st, t } from '@/i18n'
 import { mapTaskOutputToAssetItem } from '@/platform/assets/composables/media/assetMappers'
 import { useMediaAssetActions } from '@/platform/assets/composables/useMediaAssetActions'
+import { isCloud } from '@/platform/distribution/types'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { useWorkflowService } from '@/platform/workflow/core/services/workflowService'
 import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
-import type {
-  ExecutionErrorWsMessage,
-  ResultItem,
-  ResultItemType
-} from '@/schemas/apiSchema'
+import type { ResultItem, ResultItemType } from '@/schemas/apiSchema'
 import { api } from '@/scripts/api'
 import { downloadBlob } from '@/scripts/utils'
 import { useDialogService } from '@/services/dialogService'
+import { getJobWorkflow } from '@/services/jobOutputCache'
 import { useLitegraphService } from '@/services/litegraphService'
+import { useExecutionStore } from '@/stores/executionStore'
 import { useNodeDefStore } from '@/stores/nodeDefStore'
 import { useQueueStore } from '@/stores/queueStore'
 import type { ResultItemImpl, TaskItemImpl } from '@/stores/queueStore'
@@ -30,6 +29,7 @@ export type MenuEntry =
       key: string
       label: string
       icon?: string
+      disabled?: boolean
       onClick?: () => void | Promise<void>
     }
   | { kind: 'divider'; key: string }
@@ -41,63 +41,78 @@ export type MenuEntry =
  * @param onInspectAsset Callback to trigger when inspecting a completed job's asset
  */
 export function useJobMenu(
-  currentMenuItem: () => JobListItem | null,
+  currentMenuItem: () => JobListItem | null = () => null,
   onInspectAsset?: (item: JobListItem) => void
 ) {
   const workflowStore = useWorkflowStore()
   const workflowService = useWorkflowService()
   const queueStore = useQueueStore()
+  const executionStore = useExecutionStore()
   const { copyToClipboard } = useCopyToClipboard()
   const litegraphService = useLitegraphService()
   const nodeDefStore = useNodeDefStore()
   const mediaAssetActions = useMediaAssetActions()
 
-  const openJobWorkflow = async () => {
-    const item = currentMenuItem()
-    if (!item) return
-    const data = item.taskRef?.workflow
+  const resolveItem = (item?: JobListItem | null): JobListItem | null =>
+    item ?? currentMenuItem()
+
+  const openJobWorkflow = async (item?: JobListItem | null) => {
+    const target = resolveItem(item)
+    if (!target) return
+    const data = await getJobWorkflow(target.id)
     if (!data) return
-    const filename = `Job ${item.id}.json`
+    const filename = `Job ${target.id}.json`
     const temp = workflowStore.createTemporary(filename, data)
     await workflowService.openWorkflow(temp)
   }
 
-  const copyJobId = async () => {
-    const item = currentMenuItem()
-    if (!item) return
-    await copyToClipboard(item.id)
+  const copyJobId = async (item?: JobListItem | null) => {
+    const target = resolveItem(item)
+    if (!target) return
+    await copyToClipboard(target.id)
   }
 
-  const cancelJob = async () => {
-    const item = currentMenuItem()
-    if (!item) return
-    if (item.state === 'running' || item.state === 'initialization') {
-      await api.interrupt(item.id)
-    } else if (item.state === 'pending') {
-      await api.deleteItem('queue', item.id)
+  const cancelJob = async (item?: JobListItem | null) => {
+    const target = resolveItem(item)
+    if (!target) return
+    if (target.state === 'running' || target.state === 'initialization') {
+      if (isCloud) {
+        await api.deleteItem('queue', target.id)
+      } else {
+        await api.interrupt(target.id)
+      }
+    } else if (target.state === 'pending') {
+      await api.deleteItem('queue', target.id)
     }
+    executionStore.clearInitializationByJobId(target.id)
     await queueStore.update()
   }
 
-  const copyErrorMessage = async () => {
-    const item = currentMenuItem()
-    if (!item) return
-    const msgs = item.taskRef?.status?.messages as any[] | undefined
-    const err = msgs?.find((m: any) => m?.[0] === 'execution_error')?.[1] as
-      | ExecutionErrorWsMessage
-      | undefined
-    const message = err?.exception_message
-    if (message) await copyToClipboard(String(message))
+  const copyErrorMessage = async (item?: JobListItem | null) => {
+    const target = resolveItem(item)
+    const message = target?.taskRef?.errorMessage
+    if (message) await copyToClipboard(message)
   }
 
-  const reportError = () => {
-    const item = currentMenuItem()
-    if (!item) return
-    const msgs = item.taskRef?.status?.messages as any[] | undefined
-    const err = msgs?.find((m: any) => m?.[0] === 'execution_error')?.[1] as
-      | ExecutionErrorWsMessage
-      | undefined
-    if (err) useDialogService().showExecutionErrorDialog(err)
+  const reportError = (item?: JobListItem | null) => {
+    const target = resolveItem(item)
+    if (!target) return
+
+    // Use execution_error from list response if available
+    const executionError = target.taskRef?.executionError
+
+    if (executionError) {
+      useDialogService().showExecutionErrorDialog(executionError)
+      return
+    }
+
+    // Fall back to simple error dialog
+    const message = target.taskRef?.errorMessage
+    if (message) {
+      useDialogService().showErrorDialog(new Error(message), {
+        reportType: 'queueJobError'
+      })
+    }
   }
 
   // This is very magical only because it matches the respective backend implementation
@@ -167,7 +182,7 @@ export function useJobMenu(
   const exportJobWorkflow = async () => {
     const item = currentMenuItem()
     if (!item) return
-    const data = item.taskRef?.workflow
+    const data = await getJobWorkflow(item.id)
     if (!data) return
 
     const settingStore = useSettingStore()
@@ -176,7 +191,7 @@ export function useJobMenu(
     if (settingStore.get('Comfy.PromptFilename')) {
       const input = await useDialogService().prompt({
         title: t('workflowService.exportWorkflow'),
-        message: t('workflowService.enterFilename') + ':',
+        message: t('workflowService.enterFilenamePrompt'),
         defaultValue: filename
       })
       if (!input) return
@@ -196,16 +211,17 @@ export function useJobMenu(
     if (!task || !preview) return
 
     const asset = mapTaskOutputToAssetItem(task, preview)
-    const success = await mediaAssetActions.confirmDelete(asset)
-    if (success) {
+    const confirmed = await mediaAssetActions.deleteAssets(asset)
+    if (confirmed) {
       await queueStore.update()
     }
   }
 
-  const removeFailedJob = async () => {
-    const task = currentMenuItem()?.taskRef as TaskItemImpl | undefined
-    if (!task) return
-    await queueStore.delete(task)
+  const removeFailedJob = async (task?: TaskItemImpl | null) => {
+    const target =
+      task ?? (currentMenuItem()?.taskRef as TaskItemImpl | undefined)
+    if (!target) return
+    await queueStore.delete(target)
   }
 
   const jobMenuOpenWorkflowLabel = computed(() =>
@@ -225,13 +241,14 @@ export function useJobMenu(
     const item = currentMenuItem()
     const state = item?.state
     if (!state) return []
-    const hasDeletableAsset = !!item?.taskRef?.previewOutput
+    const hasPreviewAsset = !!item?.taskRef?.previewOutput
     if (state === 'completed') {
       return [
         {
           key: 'inspect-asset',
           label: st('queue.jobMenu.inspectAsset', 'Inspect asset'),
           icon: 'icon-[lucide--zoom-in]',
+          disabled: !hasPreviewAsset || !onInspectAsset,
           onClick: onInspectAsset
             ? () => {
                 const item = currentMenuItem()
@@ -246,12 +263,14 @@ export function useJobMenu(
             'Add to current workflow'
           ),
           icon: 'icon-[comfy--node]',
+          disabled: !hasPreviewAsset,
           onClick: addOutputLoaderNode
         },
         {
           key: 'download',
           label: st('queue.jobMenu.download', 'Download'),
           icon: 'icon-[lucide--download]',
+          disabled: !hasPreviewAsset,
           onClick: downloadPreviewAsset
         },
         { kind: 'divider', key: 'd1' },
@@ -275,7 +294,7 @@ export function useJobMenu(
           onClick: copyJobId
         },
         { kind: 'divider', key: 'd3' },
-        ...(hasDeletableAsset
+        ...(hasPreviewAsset
           ? [
               {
                 key: 'delete',
@@ -351,6 +370,7 @@ export function useJobMenu(
     jobMenuEntries,
     openJobWorkflow,
     copyJobId,
-    cancelJob
+    cancelJob,
+    removeFailedJob
   }
 }
diff --git a/src/composables/queue/useQueueClearHistoryDialog.ts b/src/composables/queue/useQueueClearHistoryDialog.ts
new file mode 100644
index 0000000000..bb50abd11b
--- /dev/null
+++ b/src/composables/queue/useQueueClearHistoryDialog.ts
@@ -0,0 +1,32 @@
+import QueueClearHistoryDialog from '@/components/queue/dialogs/QueueClearHistoryDialog.vue'
+import { useDialogStore } from '@/stores/dialogStore'
+
+export const useQueueClearHistoryDialog = () => {
+  const dialogStore = useDialogStore()
+
+  const showQueueClearHistoryDialog = () => {
+    dialogStore.showDialog({
+      key: 'queue-clear-history',
+      component: QueueClearHistoryDialog,
+      dialogComponentProps: {
+        headless: true,
+        closable: false,
+        closeOnEscape: true,
+        dismissableMask: true,
+        pt: {
+          root: {
+            class: 'max-w-90 w-auto bg-transparent border-none shadow-none'
+          },
+          content: {
+            class: 'bg-transparent',
+            style: 'padding: 0'
+          }
+        }
+      }
+    })
+  }
+
+  return {
+    showQueueClearHistoryDialog
+  }
+}
diff --git a/src/composables/queue/useQueueFeatureFlags.ts b/src/composables/queue/useQueueFeatureFlags.ts
new file mode 100644
index 0000000000..c036f9f919
--- /dev/null
+++ b/src/composables/queue/useQueueFeatureFlags.ts
@@ -0,0 +1,19 @@
+import { computed } from 'vue'
+
+import { useSettingStore } from '@/platform/settings/settingStore'
+
+export function useQueueFeatureFlags() {
+  const settingStore = useSettingStore()
+
+  const isQueuePanelV2Enabled = computed(() =>
+    settingStore.get('Comfy.Queue.QPOV2')
+  )
+  const isRunProgressBarEnabled = computed(
+    () => settingStore.get('Comfy.Queue.ShowRunProgressBar') !== false
+  )
+
+  return {
+    isQueuePanelV2Enabled,
+    isRunProgressBarEnabled
+  }
+}
diff --git a/src/composables/queue/useQueueNotificationBanners.test.ts b/src/composables/queue/useQueueNotificationBanners.test.ts
new file mode 100644
index 0000000000..6b51e1e575
--- /dev/null
+++ b/src/composables/queue/useQueueNotificationBanners.test.ts
@@ -0,0 +1,348 @@
+import { mount } from '@vue/test-utils'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { nextTick, reactive } from 'vue'
+
+import { useQueueNotificationBanners } from '@/composables/queue/useQueueNotificationBanners'
+import { useExecutionStore } from '@/stores/executionStore'
+import { useQueueStore } from '@/stores/queueStore'
+
+const mockApi = vi.hoisted(() => new EventTarget())
+
+vi.mock('@/scripts/api', () => ({
+  api: mockApi
+}))
+
+type MockTask = {
+  displayStatus: 'Completed' | 'Failed' | 'Cancelled' | 'Running' | 'Pending'
+  executionEndTimestamp?: number
+  previewOutput?: {
+    isImage: boolean
+    urlWithTimestamp: string
+  }
+}
+
+vi.mock('@/stores/queueStore', () => {
+  const state = reactive({
+    pendingTasks: [] as MockTask[],
+    runningTasks: [] as MockTask[],
+    historyTasks: [] as MockTask[]
+  })
+
+  return {
+    useQueueStore: () => state
+  }
+})
+
+vi.mock('@/stores/executionStore', () => {
+  const state = reactive({
+    isIdle: true
+  })
+
+  return {
+    useExecutionStore: () => state
+  }
+})
+
+const mountComposable = () => {
+  let composable: ReturnType<typeof useQueueNotificationBanners>
+  const wrapper = mount({
+    template: '<div />',
+    setup() {
+      composable = useQueueNotificationBanners()
+      return {}
+    }
+  })
+  return { wrapper, composable: composable! }
+}
+
+describe(useQueueNotificationBanners, () => {
+  const queueStore = () =>
+    useQueueStore() as {
+      pendingTasks: MockTask[]
+      runningTasks: MockTask[]
+      historyTasks: MockTask[]
+    }
+  const executionStore = () => useExecutionStore() as { isIdle: boolean }
+
+  const resetState = () => {
+    queueStore().pendingTasks = []
+    queueStore().runningTasks = []
+    queueStore().historyTasks = []
+    executionStore().isIdle = true
+  }
+
+  const createTask = (
+    options: {
+      state?: MockTask['displayStatus']
+      ts?: number
+      previewUrl?: string
+      isImage?: boolean
+    } = {}
+  ): MockTask => {
+    const {
+      state = 'Completed',
+      ts = Date.now(),
+      previewUrl,
+      isImage = true
+    } = options
+
+    const task: MockTask = {
+      displayStatus: state,
+      executionEndTimestamp: ts
+    }
+
+    if (previewUrl) {
+      task.previewOutput = {
+        isImage,
+        urlWithTimestamp: previewUrl
+      }
+    }
+
+    return task
+  }
+
+  const runBatch = async (options: {
+    start: number
+    finish: number
+    tasks: MockTask[]
+  }) => {
+    const { start, finish, tasks } = options
+
+    vi.setSystemTime(start)
+    executionStore().isIdle = false
+    await nextTick()
+
+    vi.setSystemTime(finish)
+    queueStore().historyTasks = tasks
+    executionStore().isIdle = true
+    await nextTick()
+  }
+
+  beforeEach(() => {
+    vi.useFakeTimers()
+    vi.setSystemTime(0)
+    resetState()
+  })
+
+  afterEach(() => {
+    vi.runOnlyPendingTimers()
+    vi.useRealTimers()
+    resetState()
+  })
+
+  it('shows queued notifications from promptQueued events', async () => {
+    const { wrapper, composable } = mountComposable()
+
+    try {
+      mockApi.dispatchEvent(
+        new CustomEvent('promptQueued', { detail: { batchCount: 4 } })
+      )
+      await nextTick()
+
+      expect(composable.currentNotification.value).toEqual({
+        type: 'queued',
+        count: 4
+      })
+
+      await vi.advanceTimersByTimeAsync(4000)
+      await nextTick()
+      expect(composable.currentNotification.value).toBeNull()
+    } finally {
+      wrapper.unmount()
+    }
+  })
+
+  it('shows queued pending then queued confirmation', async () => {
+    const { wrapper, composable } = mountComposable()
+
+    try {
+      mockApi.dispatchEvent(
+        new CustomEvent('promptQueueing', {
+          detail: { requestId: 1, batchCount: 2 }
+        })
+      )
+      await nextTick()
+
+      expect(composable.currentNotification.value).toEqual({
+        type: 'queuedPending',
+        count: 2,
+        requestId: 1
+      })
+
+      mockApi.dispatchEvent(
+        new CustomEvent('promptQueued', {
+          detail: { requestId: 1, batchCount: 2 }
+        })
+      )
+      await nextTick()
+
+      expect(composable.currentNotification.value).toEqual({
+        type: 'queued',
+        count: 2,
+        requestId: 1
+      })
+    } finally {
+      wrapper.unmount()
+    }
+  })
+
+  it('falls back to 1 when queued batch count is invalid', async () => {
+    const { wrapper, composable } = mountComposable()
+
+    try {
+      mockApi.dispatchEvent(
+        new CustomEvent('promptQueued', { detail: { batchCount: 0 } })
+      )
+      await nextTick()
+
+      expect(composable.currentNotification.value).toEqual({
+        type: 'queued',
+        count: 1
+      })
+    } finally {
+      wrapper.unmount()
+    }
+  })
+
+  it('shows a completed notification from a finished batch', async () => {
+    const { wrapper, composable } = mountComposable()
+
+    try {
+      await runBatch({
+        start: 1_000,
+        finish: 1_200,
+        tasks: [
+          createTask({
+            ts: 1_050,
+            previewUrl: 'https://example.com/preview.png'
+          })
+        ]
+      })
+
+      expect(composable.currentNotification.value).toEqual({
+        type: 'completed',
+        count: 1,
+        thumbnailUrls: ['https://example.com/preview.png']
+      })
+    } finally {
+      wrapper.unmount()
+    }
+  })
+
+  it('shows one completion notification when history updates after queue becomes idle', async () => {
+    const { wrapper, composable } = mountComposable()
+
+    try {
+      vi.setSystemTime(4_000)
+      executionStore().isIdle = false
+      await nextTick()
+
+      vi.setSystemTime(4_100)
+      executionStore().isIdle = true
+      queueStore().historyTasks = []
+      await nextTick()
+
+      expect(composable.currentNotification.value).toBeNull()
+
+      queueStore().historyTasks = [
+        createTask({
+          ts: 4_050,
+          previewUrl: 'https://example.com/race-preview.png'
+        })
+      ]
+      await nextTick()
+
+      expect(composable.currentNotification.value).toEqual({
+        type: 'completed',
+        count: 1,
+        thumbnailUrls: ['https://example.com/race-preview.png']
+      })
+
+      await vi.advanceTimersByTimeAsync(4000)
+      await nextTick()
+      expect(composable.currentNotification.value).toBeNull()
+
+      await vi.advanceTimersByTimeAsync(4000)
+      await nextTick()
+      expect(composable.currentNotification.value).toBeNull()
+    } finally {
+      wrapper.unmount()
+    }
+  })
+
+  it('queues both completed and failed notifications for mixed batches', async () => {
+    const { wrapper, composable } = mountComposable()
+
+    try {
+      await runBatch({
+        start: 2_000,
+        finish: 2_200,
+        tasks: [
+          createTask({
+            ts: 2_050,
+            previewUrl: 'https://example.com/result.png'
+          }),
+          createTask({ ts: 2_060 }),
+          createTask({ ts: 2_070 }),
+          createTask({ state: 'Failed', ts: 2_080 })
+        ]
+      })
+
+      expect(composable.currentNotification.value).toEqual({
+        type: 'completed',
+        count: 3,
+        thumbnailUrls: ['https://example.com/result.png']
+      })
+
+      await vi.advanceTimersByTimeAsync(4000)
+      await nextTick()
+
+      expect(composable.currentNotification.value).toEqual({
+        type: 'failed',
+        count: 1
+      })
+    } finally {
+      wrapper.unmount()
+    }
+  })
+
+  it('uses up to two completion thumbnails for notification icon previews', async () => {
+    const { wrapper, composable } = mountComposable()
+
+    try {
+      await runBatch({
+        start: 3_000,
+        finish: 3_300,
+        tasks: [
+          createTask({
+            ts: 3_050,
+            previewUrl: 'https://example.com/preview-1.png'
+          }),
+          createTask({
+            ts: 3_060,
+            previewUrl: 'https://example.com/preview-2.png'
+          }),
+          createTask({
+            ts: 3_070,
+            previewUrl: 'https://example.com/preview-3.png'
+          }),
+          createTask({
+            ts: 3_080,
+            previewUrl: 'https://example.com/preview-4.png'
+          })
+        ]
+      })
+
+      expect(composable.currentNotification.value).toEqual({
+        type: 'completed',
+        count: 4,
+        thumbnailUrls: [
+          'https://example.com/preview-1.png',
+          'https://example.com/preview-2.png'
+        ]
+      })
+    } finally {
+      wrapper.unmount()
+    }
+  })
+})
diff --git a/src/composables/queue/useQueueNotificationBanners.ts b/src/composables/queue/useQueueNotificationBanners.ts
new file mode 100644
index 0000000000..0858c2b4e8
--- /dev/null
+++ b/src/composables/queue/useQueueNotificationBanners.ts
@@ -0,0 +1,317 @@
+import { computed, nextTick, onUnmounted, ref, watch } from 'vue'
+
+import { api } from '@/scripts/api'
+import type {
+  PromptQueuedEventPayload,
+  PromptQueueingEventPayload
+} from '@/scripts/api'
+import { useExecutionStore } from '@/stores/executionStore'
+import { useQueueStore } from '@/stores/queueStore'
+import { jobStateFromTask } from '@/utils/queueUtil'
+
+const BANNER_DISMISS_DELAY_MS = 4000
+const MAX_COMPLETION_THUMBNAILS = 2
+
+type QueueQueuedNotificationType = 'queuedPending' | 'queued'
+
+type QueueQueuedNotification = {
+  type: QueueQueuedNotificationType
+  count: number
+  requestId?: number
+}
+
+type QueueCompletedNotification = {
+  type: 'completed'
+  count: number
+  thumbnailUrls?: string[]
+}
+
+type QueueFailedNotification = {
+  type: 'failed'
+  count: number
+}
+
+export type QueueNotificationBanner =
+  | QueueQueuedNotification
+  | QueueCompletedNotification
+  | QueueFailedNotification
+
+const sanitizeCount = (value: number | undefined) => {
+  if (!(typeof value === 'number' && value > 0)) {
+    return 1
+  }
+  return Math.floor(value)
+}
+
+export const useQueueNotificationBanners = () => {
+  const queueStore = useQueueStore()
+  const executionStore = useExecutionStore()
+
+  const pendingNotifications = ref<QueueNotificationBanner[]>([])
+  const activeNotification = ref<QueueNotificationBanner | null>(null)
+  const dismissTimer = ref<number | null>(null)
+  const lastActiveStartTs = ref<number | null>(null)
+  let stopIdleHistoryWatch: (() => void) | null = null
+  let idleCompletionScheduleToken = 0
+  const isQueueActive = computed(
+    () =>
+      queueStore.pendingTasks.length > 0 ||
+      queueStore.runningTasks.length > 0 ||
+      !executionStore.isIdle
+  )
+
+  const clearIdleCompletionHooks = () => {
+    idleCompletionScheduleToken++
+    if (!stopIdleHistoryWatch) {
+      return
+    }
+    stopIdleHistoryWatch()
+    stopIdleHistoryWatch = null
+  }
+
+  const clearDismissTimer = () => {
+    if (dismissTimer.value === null) {
+      return
+    }
+    clearTimeout(dismissTimer.value)
+    dismissTimer.value = null
+  }
+
+  const dismissActiveNotification = () => {
+    activeNotification.value = null
+    dismissTimer.value = null
+    showNextNotification()
+  }
+
+  const showNextNotification = () => {
+    if (activeNotification.value !== null) {
+      return
+    }
+    const [nextNotification, ...rest] = pendingNotifications.value
+    pendingNotifications.value = rest
+    if (!nextNotification) {
+      return
+    }
+
+    activeNotification.value = nextNotification
+    clearDismissTimer()
+    dismissTimer.value = window.setTimeout(
+      dismissActiveNotification,
+      BANNER_DISMISS_DELAY_MS
+    )
+  }
+
+  const queueNotification = (notification: QueueNotificationBanner) => {
+    pendingNotifications.value = [...pendingNotifications.value, notification]
+    showNextNotification()
+  }
+
+  const toQueueLifecycleNotification = (
+    type: QueueQueuedNotificationType,
+    count: number,
+    requestId?: number
+  ): QueueQueuedNotification => {
+    if (requestId === undefined) {
+      return {
+        type,
+        count
+      }
+    }
+    return {
+      type,
+      count,
+      requestId
+    }
+  }
+
+  const toCompletedNotification = (
+    count: number,
+    thumbnailUrls: string[]
+  ): QueueCompletedNotification => ({
+    type: 'completed',
+    count,
+    thumbnailUrls: thumbnailUrls.slice(0, MAX_COMPLETION_THUMBNAILS)
+  })
+
+  const toFailedNotification = (count: number): QueueFailedNotification => ({
+    type: 'failed',
+    count
+  })
+
+  const convertQueuedPendingToQueued = (
+    requestId: number | undefined,
+    count: number
+  ) => {
+    if (
+      activeNotification.value?.type === 'queuedPending' &&
+      (requestId === undefined ||
+        activeNotification.value.requestId === requestId)
+    ) {
+      activeNotification.value = toQueueLifecycleNotification(
+        'queued',
+        count,
+        requestId
+      )
+      return true
+    }
+
+    const pendingIndex = pendingNotifications.value.findIndex(
+      (notification) =>
+        notification.type === 'queuedPending' &&
+        (requestId === undefined || notification.requestId === requestId)
+    )
+
+    if (pendingIndex === -1) {
+      return false
+    }
+
+    const queuedPendingNotification = pendingNotifications.value[pendingIndex]
+    if (
+      queuedPendingNotification === undefined ||
+      queuedPendingNotification.type !== 'queuedPending'
+    ) {
+      return false
+    }
+
+    pendingNotifications.value = [
+      ...pendingNotifications.value.slice(0, pendingIndex),
+      toQueueLifecycleNotification(
+        'queued',
+        count,
+        queuedPendingNotification.requestId
+      ),
+      ...pendingNotifications.value.slice(pendingIndex + 1)
+    ]
+
+    return true
+  }
+
+  const handlePromptQueueing = (
+    event: CustomEvent<PromptQueueingEventPayload>
+  ) => {
+    const payload = event.detail
+    const count = sanitizeCount(payload?.batchCount)
+    queueNotification(
+      toQueueLifecycleNotification('queuedPending', count, payload?.requestId)
+    )
+  }
+
+  const handlePromptQueued = (event: CustomEvent<PromptQueuedEventPayload>) => {
+    const payload = event.detail
+    const count = sanitizeCount(payload?.batchCount)
+    const handled = convertQueuedPendingToQueued(payload?.requestId, count)
+    if (!handled) {
+      queueNotification(
+        toQueueLifecycleNotification('queued', count, payload?.requestId)
+      )
+    }
+  }
+
+  api.addEventListener('promptQueueing', handlePromptQueueing)
+  api.addEventListener('promptQueued', handlePromptQueued)
+
+  const queueCompletionBatchNotifications = () => {
+    const startTs = lastActiveStartTs.value ?? 0
+    const finishedTasks = queueStore.historyTasks.filter((task) => {
+      const ts = task.executionEndTimestamp
+      return typeof ts === 'number' && ts >= startTs
+    })
+
+    if (!finishedTasks.length) {
+      return false
+    }
+
+    let completedCount = 0
+    let failedCount = 0
+    const imagePreviews: string[] = []
+
+    for (const task of finishedTasks) {
+      const state = jobStateFromTask(task, false)
+      if (state === 'completed') {
+        completedCount++
+        const preview = task.previewOutput
+        if (preview?.isImage) {
+          imagePreviews.push(preview.urlWithTimestamp)
+        }
+      } else if (state === 'failed') {
+        failedCount++
+      }
+    }
+
+    if (completedCount > 0) {
+      queueNotification(toCompletedNotification(completedCount, imagePreviews))
+    }
+
+    if (failedCount > 0) {
+      queueNotification(toFailedNotification(failedCount))
+    }
+
+    return completedCount > 0 || failedCount > 0
+  }
+
+  const scheduleIdleCompletionBatchNotifications = () => {
+    clearIdleCompletionHooks()
+    const scheduleToken = idleCompletionScheduleToken
+    const startTsSnapshot = lastActiveStartTs.value
+
+    const isStillSameIdleWindow = () =>
+      scheduleToken === idleCompletionScheduleToken &&
+      !isQueueActive.value &&
+      lastActiveStartTs.value === startTsSnapshot
+
+    stopIdleHistoryWatch = watch(
+      () => queueStore.historyTasks,
+      () => {
+        if (!isStillSameIdleWindow()) {
+          clearIdleCompletionHooks()
+          return
+        }
+        queueCompletionBatchNotifications()
+        clearIdleCompletionHooks()
+      }
+    )
+
+    void nextTick(() => {
+      if (!isStillSameIdleWindow()) {
+        clearIdleCompletionHooks()
+        return
+      }
+
+      const hasShownNotifications = queueCompletionBatchNotifications()
+      if (hasShownNotifications) {
+        clearIdleCompletionHooks()
+      }
+    })
+  }
+
+  watch(
+    isQueueActive,
+    (active, prev) => {
+      if (!prev && active) {
+        clearIdleCompletionHooks()
+        lastActiveStartTs.value = Date.now()
+        return
+      }
+      if (prev && !active) {
+        scheduleIdleCompletionBatchNotifications()
+      }
+    },
+    { immediate: true }
+  )
+
+  onUnmounted(() => {
+    api.removeEventListener('promptQueueing', handlePromptQueueing)
+    api.removeEventListener('promptQueued', handlePromptQueued)
+    clearIdleCompletionHooks()
+    clearDismissTimer()
+    pendingNotifications.value = []
+    activeNotification.value = null
+    lastActiveStartTs.value = null
+  })
+
+  const currentNotification = computed(() => activeNotification.value)
+
+  return {
+    currentNotification
+  }
+}
diff --git a/tests-ui/tests/composables/useQueueProgress.test.ts b/src/composables/queue/useQueueProgress.test.ts
similarity index 100%
rename from tests-ui/tests/composables/useQueueProgress.test.ts
rename to src/composables/queue/useQueueProgress.test.ts
diff --git a/src/composables/queue/useResultGallery.test.ts b/src/composables/queue/useResultGallery.test.ts
new file mode 100644
index 0000000000..8b8522a79d
--- /dev/null
+++ b/src/composables/queue/useResultGallery.test.ts
@@ -0,0 +1,171 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it } from 'vitest'
+
+import { useResultGallery } from '@/composables/queue/useResultGallery'
+import type { JobListItem as JobListViewItem } from '@/composables/queue/useJobList'
+import type { JobListItem } from '@/platform/remote/comfyui/jobs/jobTypes'
+import { ResultItemImpl, TaskItemImpl } from '@/stores/queueStore'
+
+const createResultItem = (
+  url: string,
+  supportsPreview = true
+): ResultItemImpl => {
+  const item = new ResultItemImpl({
+    filename: url,
+    subfolder: '',
+    type: 'output',
+    nodeId: 'node-1',
+    mediaType: supportsPreview ? 'images' : 'unknown'
+  })
+  // Override url getter for test matching
+  Object.defineProperty(item, 'url', { get: () => url })
+  Object.defineProperty(item, 'supportsPreview', { get: () => supportsPreview })
+  return item
+}
+
+const createMockJob = (id: string, outputsCount = 1): JobListItem => ({
+  id,
+  status: 'completed',
+  create_time: Date.now(),
+  preview_output: null,
+  outputs_count: outputsCount,
+  priority: 0
+})
+
+const createTask = (
+  preview?: ResultItemImpl,
+  allOutputs?: ResultItemImpl[],
+  outputsCount = 1
+): TaskItemImpl => {
+  const job = createMockJob(
+    `task-${Math.random().toString(36).slice(2)}`,
+    outputsCount
+  )
+  const flatOutputs = allOutputs ?? (preview ? [preview] : [])
+  return new TaskItemImpl(job, {}, flatOutputs)
+}
+
+const createJobViewItem = (
+  id: string,
+  taskRef?: TaskItemImpl
+): JobListViewItem =>
+  ({
+    id,
+    title: `Job ${id}`,
+    meta: '',
+    state: 'completed',
+    showClear: false,
+    taskRef
+  }) as JobListViewItem
+
+describe('useResultGallery', () => {
+  beforeEach(() => {
+    setActivePinia(createPinia())
+  })
+
+  it('collects only previewable outputs and preserves their order', async () => {
+    const previewable = [createResultItem('p-1'), createResultItem('p-2')]
+    const nonPreviewable = createResultItem('skip-me', false)
+    const tasks = [
+      createTask(previewable[0]),
+      createTask(nonPreviewable),
+      createTask(previewable[1]),
+      createTask()
+    ]
+
+    const { galleryItems, galleryActiveIndex, onViewItem } = useResultGallery(
+      () => tasks
+    )
+
+    await onViewItem(createJobViewItem('job-1', tasks[0]))
+
+    expect(galleryItems.value).toEqual([previewable[0]])
+    expect(galleryActiveIndex.value).toBe(0)
+  })
+
+  it('does not change state when there are no previewable tasks', async () => {
+    const { galleryItems, galleryActiveIndex, onViewItem } = useResultGallery(
+      () => []
+    )
+
+    await onViewItem(createJobViewItem('job-missing'))
+
+    expect(galleryItems.value).toEqual([])
+    expect(galleryActiveIndex.value).toBe(-1)
+  })
+
+  it('activates the index that matches the viewed preview URL', async () => {
+    const previewable = [
+      createResultItem('p-1'),
+      createResultItem('p-2'),
+      createResultItem('p-3')
+    ]
+    const tasks = previewable.map((preview) => createTask(preview))
+
+    const { galleryItems, galleryActiveIndex, onViewItem } = useResultGallery(
+      () => tasks
+    )
+
+    await onViewItem(createJobViewItem('job-2', tasks[1]))
+
+    expect(galleryItems.value).toEqual([previewable[1]])
+    expect(galleryActiveIndex.value).toBe(0)
+  })
+
+  it('defaults to the first entry when the clicked job lacks a preview', async () => {
+    const previewable = [createResultItem('p-1'), createResultItem('p-2')]
+    const tasks = previewable.map((preview) => createTask(preview))
+
+    const { galleryItems, galleryActiveIndex, onViewItem } = useResultGallery(
+      () => tasks
+    )
+
+    await onViewItem(createJobViewItem('job-no-preview'))
+
+    expect(galleryItems.value).toEqual(previewable)
+    expect(galleryActiveIndex.value).toBe(0)
+  })
+
+  it('defaults to the first entry when no gallery item matches the preview URL', async () => {
+    const previewable = [createResultItem('p-1'), createResultItem('p-2')]
+    const tasks = previewable.map((preview) => createTask(preview))
+
+    const { galleryItems, galleryActiveIndex, onViewItem } = useResultGallery(
+      () => tasks
+    )
+
+    const taskWithMismatchedPreview = createTask(createResultItem('missing'))
+    await onViewItem(
+      createJobViewItem('job-mismatch', taskWithMismatchedPreview)
+    )
+
+    expect(galleryItems.value).toEqual([createResultItem('missing')])
+    expect(galleryActiveIndex.value).toBe(0)
+  })
+
+  it('loads full outputs when task has only preview outputs', async () => {
+    const previewOutput = createResultItem('preview-1')
+    const fullOutputs = [
+      createResultItem('full-1'),
+      createResultItem('full-2'),
+      createResultItem('full-3')
+    ]
+
+    // Create a task with outputsCount > 1 to trigger lazy loading
+    const job = createMockJob('task-1', 3)
+    const task = new TaskItemImpl(job, {}, [previewOutput])
+
+    // Mock loadFullOutputs to return full outputs
+    const loadedTask = new TaskItemImpl(job, {}, fullOutputs)
+    task.loadFullOutputs = async () => loadedTask
+
+    const { galleryItems, galleryActiveIndex, onViewItem } = useResultGallery(
+      () => [task]
+    )
+
+    await onViewItem(createJobViewItem('job-1', task))
+
+    expect(galleryItems.value).toEqual(fullOutputs)
+    expect(galleryActiveIndex.value).toBe(0)
+  })
+})
diff --git a/src/composables/queue/useResultGallery.ts b/src/composables/queue/useResultGallery.ts
index 0e9934165c..44c6a607dd 100644
--- a/src/composables/queue/useResultGallery.ts
+++ b/src/composables/queue/useResultGallery.ts
@@ -1,27 +1,42 @@
 import { ref, shallowRef } from 'vue'
 
 import type { JobListItem } from '@/composables/queue/useJobList'
-import type { ResultItemImpl } from '@/stores/queueStore'
+import { findActiveIndex, getOutputsForTask } from '@/services/jobOutputCache'
+import type { ResultItemImpl, TaskItemImpl } from '@/stores/queueStore'
 
 /**
  * Manages result gallery state and activation for queue items.
  */
-export function useResultGallery(getFilteredTasks: () => any[]) {
+export function useResultGallery(getFilteredTasks: () => TaskItemImpl[]) {
   const galleryActiveIndex = ref(-1)
   const galleryItems = shallowRef<ResultItemImpl[]>([])
 
-  const onViewItem = (item: JobListItem) => {
-    const items: ResultItemImpl[] = getFilteredTasks().flatMap((t: any) => {
-      const preview = t.previewOutput
-      return preview && preview.supportsPreview ? [preview] : []
-    })
+  async function onViewItem(item: JobListItem) {
+    const tasks = getFilteredTasks()
+    if (!tasks.length) return
+
+    const targetTask = item.taskRef
+    const targetOutputs = targetTask
+      ? await getOutputsForTask(targetTask)
+      : null
+
+    // Request was superseded by a newer one
+    if (targetOutputs === null && targetTask) return
+
+    // Use target's outputs if available, otherwise fall back to all previews
+    const items = targetOutputs?.length
+      ? targetOutputs
+      : tasks
+          .map((t) => t.previewOutput)
+          .filter((o): o is ResultItemImpl => !!o)
 
     if (!items.length) return
 
     galleryItems.value = items
-    const activeUrl: string | undefined = item.taskRef?.previewOutput?.url
-    const idx = activeUrl ? items.findIndex((o) => o.url === activeUrl) : 0
-    galleryActiveIndex.value = idx >= 0 ? idx : 0
+    galleryActiveIndex.value = findActiveIndex(
+      items,
+      item.taskRef?.previewOutput?.url
+    )
   }
 
   return {
diff --git a/src/composables/sidebarTabs/useAssetsSidebarTab.test.ts b/src/composables/sidebarTabs/useAssetsSidebarTab.test.ts
new file mode 100644
index 0000000000..b782efa8e4
--- /dev/null
+++ b/src/composables/sidebarTabs/useAssetsSidebarTab.test.ts
@@ -0,0 +1,55 @@
+import { describe, expect, it, vi } from 'vitest'
+
+import { useAssetsSidebarTab } from '@/composables/sidebarTabs/useAssetsSidebarTab'
+
+const { mockGetSetting, mockUnseenAddedAssetsCount } = vi.hoisted(() => ({
+  mockGetSetting: vi.fn(),
+  mockUnseenAddedAssetsCount: { value: 0 }
+}))
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: () => ({
+    get: mockGetSetting
+  })
+}))
+
+vi.mock('@/components/sidebar/tabs/AssetsSidebarTab.vue', () => ({
+  default: {}
+}))
+
+vi.mock('@/stores/workspace/assetsSidebarBadgeStore', () => ({
+  useAssetsSidebarBadgeStore: () => ({
+    unseenAddedAssetsCount: mockUnseenAddedAssetsCount.value
+  })
+}))
+
+describe('useAssetsSidebarTab', () => {
+  it('hides icon badge when QPO V2 is disabled', () => {
+    mockGetSetting.mockReturnValue(false)
+    mockUnseenAddedAssetsCount.value = 3
+
+    const sidebarTab = useAssetsSidebarTab()
+
+    expect(typeof sidebarTab.iconBadge).toBe('function')
+    expect((sidebarTab.iconBadge as () => string | null)()).toBeNull()
+  })
+
+  it('shows unseen added assets count when QPO V2 is enabled', () => {
+    mockGetSetting.mockReturnValue(true)
+    mockUnseenAddedAssetsCount.value = 3
+
+    const sidebarTab = useAssetsSidebarTab()
+
+    expect(typeof sidebarTab.iconBadge).toBe('function')
+    expect((sidebarTab.iconBadge as () => string | null)()).toBe('3')
+  })
+
+  it('hides badge when there are no unseen added assets', () => {
+    mockGetSetting.mockReturnValue(true)
+    mockUnseenAddedAssetsCount.value = 0
+
+    const sidebarTab = useAssetsSidebarTab()
+
+    expect((sidebarTab.iconBadge as () => string | null)()).toBeNull()
+  })
+})
diff --git a/src/composables/sidebarTabs/useAssetsSidebarTab.ts b/src/composables/sidebarTabs/useAssetsSidebarTab.ts
index ce37531733..a8cf234048 100644
--- a/src/composables/sidebarTabs/useAssetsSidebarTab.ts
+++ b/src/composables/sidebarTabs/useAssetsSidebarTab.ts
@@ -1,6 +1,8 @@
 import { markRaw } from 'vue'
 
 import AssetsSidebarTab from '@/components/sidebar/tabs/AssetsSidebarTab.vue'
+import { useSettingStore } from '@/platform/settings/settingStore'
+import { useAssetsSidebarBadgeStore } from '@/stores/workspace/assetsSidebarBadgeStore'
 import type { SidebarTabExtension } from '@/types/extensionTypes'
 
 export const useAssetsSidebarTab = (): SidebarTabExtension => {
@@ -11,6 +13,17 @@ export const useAssetsSidebarTab = (): SidebarTabExtension => {
     tooltip: 'sideToolbar.assets',
     label: 'sideToolbar.labels.assets',
     component: markRaw(AssetsSidebarTab),
-    type: 'vue'
+    type: 'vue',
+    iconBadge: () => {
+      const settingStore = useSettingStore()
+
+      if (!settingStore.get('Comfy.Queue.QPOV2')) {
+        return null
+      }
+
+      const assetsSidebarBadgeStore = useAssetsSidebarBadgeStore()
+      const count = assetsSidebarBadgeStore.unseenAddedAssetsCount
+      return count > 0 ? count.toString() : null
+    }
   }
 }
diff --git a/src/composables/sidebarTabs/useJobHistorySidebarTab.test.ts b/src/composables/sidebarTabs/useJobHistorySidebarTab.test.ts
new file mode 100644
index 0000000000..0b89eb5639
--- /dev/null
+++ b/src/composables/sidebarTabs/useJobHistorySidebarTab.test.ts
@@ -0,0 +1,59 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { useJobHistorySidebarTab } from '@/composables/sidebarTabs/useJobHistorySidebarTab'
+
+const { mockActiveJobsCount, mockActiveSidebarTabId } = vi.hoisted(() => ({
+  mockActiveJobsCount: { value: 0 },
+  mockActiveSidebarTabId: { value: null as string | null }
+}))
+
+vi.mock('@/components/sidebar/tabs/JobHistorySidebarTab.vue', () => ({
+  default: {}
+}))
+
+vi.mock('@/stores/queueStore', () => ({
+  useQueueStore: () => ({
+    activeJobsCount: mockActiveJobsCount.value
+  })
+}))
+
+vi.mock('@/stores/workspace/sidebarTabStore', () => ({
+  useSidebarTabStore: () => ({
+    activeSidebarTabId: mockActiveSidebarTabId.value
+  })
+}))
+
+describe('useJobHistorySidebarTab', () => {
+  beforeEach(() => {
+    mockActiveSidebarTabId.value = null
+    mockActiveJobsCount.value = 0
+  })
+
+  it('shows active jobs count while the panel is closed', () => {
+    mockActiveSidebarTabId.value = 'assets'
+    mockActiveJobsCount.value = 3
+
+    const sidebarTab = useJobHistorySidebarTab()
+
+    expect(typeof sidebarTab.iconBadge).toBe('function')
+    expect((sidebarTab.iconBadge as () => string | null)()).toBe('3')
+  })
+
+  it('hides badge while the job history panel is open', () => {
+    mockActiveSidebarTabId.value = 'job-history'
+    mockActiveJobsCount.value = 3
+
+    const sidebarTab = useJobHistorySidebarTab()
+
+    expect((sidebarTab.iconBadge as () => string | null)()).toBeNull()
+  })
+
+  it('hides badge when there are no active jobs', () => {
+    mockActiveSidebarTabId.value = null
+    mockActiveJobsCount.value = 0
+
+    const sidebarTab = useJobHistorySidebarTab()
+
+    expect((sidebarTab.iconBadge as () => string | null)()).toBeNull()
+  })
+})
diff --git a/src/composables/sidebarTabs/useJobHistorySidebarTab.ts b/src/composables/sidebarTabs/useJobHistorySidebarTab.ts
new file mode 100644
index 0000000000..0ac800851e
--- /dev/null
+++ b/src/composables/sidebarTabs/useJobHistorySidebarTab.ts
@@ -0,0 +1,28 @@
+import { markRaw } from 'vue'
+
+import JobHistorySidebarTab from '@/components/sidebar/tabs/JobHistorySidebarTab.vue'
+import { useQueueStore } from '@/stores/queueStore'
+import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
+import type { SidebarTabExtension } from '@/types/extensionTypes'
+
+export const useJobHistorySidebarTab = (): SidebarTabExtension => {
+  return {
+    id: 'job-history',
+    icon: 'icon-[lucide--history]',
+    title: 'queue.jobHistory',
+    tooltip: 'queue.jobHistory',
+    label: 'queue.jobHistory',
+    component: markRaw(JobHistorySidebarTab),
+    type: 'vue',
+    iconBadge: () => {
+      const sidebarTabStore = useSidebarTabStore()
+      if (sidebarTabStore.activeSidebarTabId === 'job-history') {
+        return null
+      }
+
+      const queueStore = useQueueStore()
+      const count = queueStore.activeJobsCount
+      return count > 0 ? count.toString() : null
+    }
+  }
+}
diff --git a/src/composables/sidebarTabs/useModelLibrarySidebarTab.ts b/src/composables/sidebarTabs/useModelLibrarySidebarTab.ts
index 269955648c..8970178621 100644
--- a/src/composables/sidebarTabs/useModelLibrarySidebarTab.ts
+++ b/src/composables/sidebarTabs/useModelLibrarySidebarTab.ts
@@ -1,9 +1,9 @@
 import { markRaw } from 'vue'
 
 import ModelLibrarySidebarTab from '@/components/sidebar/tabs/ModelLibrarySidebarTab.vue'
+import { isDesktop } from '@/platform/distribution/types'
 import { useElectronDownloadStore } from '@/stores/electronDownloadStore'
 import type { SidebarTabExtension } from '@/types/extensionTypes'
-import { isElectron } from '@/utils/envUtil'
 
 export const useModelLibrarySidebarTab = (): SidebarTabExtension => {
   return {
@@ -15,7 +15,7 @@ export const useModelLibrarySidebarTab = (): SidebarTabExtension => {
     component: markRaw(ModelLibrarySidebarTab),
     type: 'vue',
     iconBadge: () => {
-      if (isElectron()) {
+      if (isDesktop) {
         const electronDownloadStore = useElectronDownloadStore()
         if (electronDownloadStore.inProgressDownloads.length > 0) {
           return electronDownloadStore.inProgressDownloads.length.toString()
diff --git a/src/composables/sidebarTabs/useNodeLibrarySidebarTab.ts b/src/composables/sidebarTabs/useNodeLibrarySidebarTab.ts
index 7b9d6b3b0c..4af8f858c7 100644
--- a/src/composables/sidebarTabs/useNodeLibrarySidebarTab.ts
+++ b/src/composables/sidebarTabs/useNodeLibrarySidebarTab.ts
@@ -1,16 +1,25 @@
-import { markRaw } from 'vue'
+import { computed, markRaw, reactive } from 'vue'
 
 import NodeLibrarySidebarTab from '@/components/sidebar/tabs/NodeLibrarySidebarTab.vue'
+import NodeLibrarySidebarTabV2 from '@/components/sidebar/tabs/NodeLibrarySidebarTabV2.vue'
+import { useSettingStore } from '@/platform/settings/settingStore'
 import type { SidebarTabExtension } from '@/types/extensionTypes'
 
-export const useNodeLibrarySidebarTab = (): SidebarTabExtension => {
-  return {
+export function useNodeLibrarySidebarTab(): SidebarTabExtension {
+  const settingStore = useSettingStore()
+  const component = computed(() =>
+    settingStore.get('Comfy.NodeLibrary.NewDesign')
+      ? markRaw(NodeLibrarySidebarTabV2)
+      : markRaw(NodeLibrarySidebarTab)
+  )
+
+  return reactive({
     id: 'node-library',
     icon: 'icon-[comfy--node]',
     title: 'sideToolbar.nodeLibrary',
     tooltip: 'sideToolbar.nodeLibrary',
     label: 'sideToolbar.labels.nodes',
-    component: markRaw(NodeLibrarySidebarTab),
-    type: 'vue'
-  }
+    component,
+    type: 'vue' as const
+  })
 }
diff --git a/src/composables/tree/useTreeFolderOperations.ts b/src/composables/tree/useTreeFolderOperations.ts
index bdb0259ffb..0c3cc3d0e5 100644
--- a/src/composables/tree/useTreeFolderOperations.ts
+++ b/src/composables/tree/useTreeFolderOperations.ts
@@ -1,5 +1,5 @@
 import type { MenuItem } from 'primevue/menuitem'
-import { ref } from 'vue'
+import { shallowRef } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import type { RenderedTreeExplorerNode } from '@/types/treeExplorerTypes'
@@ -8,12 +8,14 @@ import type { RenderedTreeExplorerNode } from '@/types/treeExplorerTypes'
  * Use this to handle folder operations in a tree.
  * @param expandNode - The function to expand a node.
  */
-export function useTreeFolderOperations(
-  expandNode: (node: RenderedTreeExplorerNode) => void
+export function useTreeFolderOperations<T>(
+  expandNode: (node: RenderedTreeExplorerNode<T>) => void
 ) {
   const { t } = useI18n()
-  const newFolderNode = ref<RenderedTreeExplorerNode | null>(null)
-  const addFolderTargetNode = ref<RenderedTreeExplorerNode | null>(null)
+  const newFolderNode = shallowRef<RenderedTreeExplorerNode<T> | null>(null)
+  const addFolderTargetNode = shallowRef<RenderedTreeExplorerNode<T> | null>(
+    null
+  )
 
   // Generate a unique temporary key for the new folder
   const generateTempKey = (parentKey: string) => {
@@ -37,7 +39,7 @@ export function useTreeFolderOperations(
    * The command to add a folder to a node via the context menu
    * @param targetNode - The node where the folder will be added under
    */
-  const addFolderCommand = (targetNode: RenderedTreeExplorerNode) => {
+  const addFolderCommand = (targetNode: RenderedTreeExplorerNode<T>) => {
     expandNode(targetNode)
     newFolderNode.value = {
       key: generateTempKey(targetNode.key),
@@ -49,13 +51,13 @@ export function useTreeFolderOperations(
       totalLeaves: 0,
       badgeText: '',
       isEditingLabel: true
-    }
+    } as RenderedTreeExplorerNode<T>
     addFolderTargetNode.value = targetNode
   }
 
   // Generate the "Add Folder" menu item
   const getAddFolderMenuItem = (
-    targetNode: RenderedTreeExplorerNode | null
+    targetNode: RenderedTreeExplorerNode<T> | null
   ): MenuItem => {
     return {
       label: t('g.newFolder'),
diff --git a/src/composables/useAppMode.ts b/src/composables/useAppMode.ts
new file mode 100644
index 0000000000..8f9ff0d9c3
--- /dev/null
+++ b/src/composables/useAppMode.ts
@@ -0,0 +1,58 @@
+import { computed, ref } from 'vue'
+
+import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
+
+export type AppMode =
+  | 'graph'
+  | 'app'
+  | 'builder:inputs'
+  | 'builder:outputs'
+  | 'builder:arrange'
+
+const enableAppBuilder = ref(true)
+
+export function useAppMode() {
+  const workflowStore = useWorkflowStore()
+  const mode = computed(
+    () =>
+      workflowStore.activeWorkflow?.activeMode ??
+      workflowStore.activeWorkflow?.initialMode ??
+      'graph'
+  )
+
+  const isBuilderMode = computed(
+    () => isSelectMode.value || isArrangeMode.value
+  )
+  const isSelectInputsMode = computed(() => mode.value === 'builder:inputs')
+  const isSelectOutputsMode = computed(() => mode.value === 'builder:outputs')
+  const isSelectMode = computed(
+    () => isSelectInputsMode.value || isSelectOutputsMode.value
+  )
+  const isArrangeMode = computed(() => mode.value === 'builder:arrange')
+  const isAppMode = computed(
+    () => mode.value === 'app' || mode.value === 'builder:arrange'
+  )
+  const isGraphMode = computed(
+    () => mode.value === 'graph' || isSelectMode.value
+  )
+
+  function setMode(newMode: AppMode) {
+    if (newMode === mode.value) return
+
+    const workflow = workflowStore.activeWorkflow
+    if (workflow) workflow.activeMode = newMode
+  }
+
+  return {
+    mode,
+    enableAppBuilder,
+    isBuilderMode,
+    isSelectMode,
+    isSelectInputsMode,
+    isSelectOutputsMode,
+    isArrangeMode,
+    isAppMode,
+    isGraphMode,
+    setMode
+  }
+}
diff --git a/tests-ui/tests/composables/BrowserTabTitle.test.ts b/src/composables/useBrowserTabTitle.test.ts
similarity index 82%
rename from tests-ui/tests/composables/BrowserTabTitle.test.ts
rename to src/composables/useBrowserTabTitle.test.ts
index 3c0cc623ff..ec0ce59d57 100644
--- a/tests-ui/tests/composables/BrowserTabTitle.test.ts
+++ b/src/composables/useBrowserTabTitle.test.ts
@@ -11,13 +11,28 @@ vi.mock('@/i18n', () => ({
 }))
 
 // Mock the execution store
-const executionStore = reactive({
+const executionStore = reactive<{
+  isIdle: boolean
+  executionProgress: number
+  executingNode: unknown
+  executingNodeProgress: number
+  nodeProgressStates: Record<string, unknown>
+  activeJob: {
+    workflow: {
+      changeTracker: {
+        activeState: {
+          nodes: { id: number; type: string }[]
+        }
+      }
+    }
+  } | null
+}>({
   isIdle: true,
   executionProgress: 0,
-  executingNode: null as any,
+  executingNode: null,
   executingNodeProgress: 0,
-  nodeProgressStates: {} as any,
-  activePrompt: null as any
+  nodeProgressStates: {},
+  activeJob: null
 })
 vi.mock('@/stores/executionStore', () => ({
   useExecutionStore: () => executionStore
@@ -25,15 +40,21 @@ vi.mock('@/stores/executionStore', () => ({
 
 // Mock the setting store
 const settingStore = reactive({
-  get: vi.fn(() => 'Enabled')
+  get: vi.fn((_key: string) => 'Enabled')
 })
 vi.mock('@/platform/settings/settingStore', () => ({
   useSettingStore: () => settingStore
 }))
 
 // Mock the workflow store
-const workflowStore = reactive({
-  activeWorkflow: null as any
+const workflowStore = reactive<{
+  activeWorkflow: {
+    filename: string
+    isModified: boolean
+    isPersisted: boolean
+  } | null
+}>({
+  activeWorkflow: null
 })
 vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
   useWorkflowStore: () => workflowStore
@@ -52,13 +73,13 @@ describe('useBrowserTabTitle', () => {
     // reset execution store
     executionStore.isIdle = true
     executionStore.executionProgress = 0
-    executionStore.executingNode = null as any
+    executionStore.executingNode = null
     executionStore.executingNodeProgress = 0
     executionStore.nodeProgressStates = {}
-    executionStore.activePrompt = null
+    executionStore.activeJob = null
 
     // reset setting and workflow stores
-    ;(settingStore.get as any).mockReturnValue('Enabled')
+    vi.mocked(settingStore.get).mockReturnValue('Enabled')
     workflowStore.activeWorkflow = null
     workspaceStore.shiftDown = false
 
@@ -74,7 +95,7 @@ describe('useBrowserTabTitle', () => {
   })
 
   it('sets workflow name as title when workflow exists and menu enabled', async () => {
-    ;(settingStore.get as any).mockReturnValue('Enabled')
+    vi.mocked(settingStore.get).mockReturnValue('Enabled')
     workflowStore.activeWorkflow = {
       filename: 'myFlow',
       isModified: false,
@@ -88,7 +109,7 @@ describe('useBrowserTabTitle', () => {
   })
 
   it('adds asterisk for unsaved workflow', async () => {
-    ;(settingStore.get as any).mockReturnValue('Enabled')
+    vi.mocked(settingStore.get).mockReturnValue('Enabled')
     workflowStore.activeWorkflow = {
       filename: 'myFlow',
       isModified: true,
@@ -102,7 +123,7 @@ describe('useBrowserTabTitle', () => {
   })
 
   it('hides asterisk when autosave is enabled', async () => {
-    ;(settingStore.get as any).mockImplementation((key: string) => {
+    vi.mocked(settingStore.get).mockImplementation((key: string) => {
       if (key === 'Comfy.Workflow.AutoSave') return 'after delay'
       if (key === 'Comfy.UseNewMenu') return 'Enabled'
       return 'Enabled'
@@ -118,7 +139,7 @@ describe('useBrowserTabTitle', () => {
   })
 
   it('hides asterisk while Shift key is held', async () => {
-    ;(settingStore.get as any).mockImplementation((key: string) => {
+    vi.mocked(settingStore.get).mockImplementation((key: string) => {
       if (key === 'Comfy.Workflow.AutoSave') return 'off'
       if (key === 'Comfy.UseNewMenu') return 'Enabled'
       return 'Enabled'
@@ -137,7 +158,7 @@ describe('useBrowserTabTitle', () => {
   // Fails when run together with other tests. Suspect to be caused by leaked
   // state from previous tests.
   it.skip('disables workflow title when menu disabled', async () => {
-    ;(settingStore.get as any).mockReturnValue('Disabled')
+    vi.mocked(settingStore.get).mockReturnValue('Disabled')
     workflowStore.activeWorkflow = {
       filename: 'myFlow',
       isModified: false,
@@ -166,7 +187,7 @@ describe('useBrowserTabTitle', () => {
     executionStore.nodeProgressStates = {
       '1': { state: 'running', value: 5, max: 10, node: '1', prompt_id: 'test' }
     }
-    executionStore.activePrompt = {
+    executionStore.activeJob = {
       workflow: {
         changeTracker: {
           activeState: {
diff --git a/src/composables/useBrowserTabTitle.ts b/src/composables/useBrowserTabTitle.ts
index 3245da5ddd..32f8334cbf 100644
--- a/src/composables/useBrowserTabTitle.ts
+++ b/src/composables/useBrowserTabTitle.ts
@@ -77,7 +77,7 @@ export const useBrowserTabTitle = () => {
     const [nodeId, state] = runningNodes[0]
     const progress = Math.round((state.value / state.max) * 100)
     const nodeType =
-      executionStore.activePrompt?.workflow?.changeTracker?.activeState.nodes.find(
+      executionStore.activeJob?.workflow?.changeTracker?.activeState.nodes.find(
         (n) => String(n.id) === nodeId
       )?.type || 'Node'
 
diff --git a/tests-ui/tests/composables/useCachedRequest.test.ts b/src/composables/useCachedRequest.test.ts
similarity index 95%
rename from tests-ui/tests/composables/useCachedRequest.test.ts
rename to src/composables/useCachedRequest.test.ts
index 08faa3aafa..06d344ae15 100644
--- a/tests-ui/tests/composables/useCachedRequest.test.ts
+++ b/src/composables/useCachedRequest.test.ts
@@ -4,7 +4,7 @@ import { useCachedRequest } from '@/composables/useCachedRequest'
 
 describe('useCachedRequest', () => {
   let mockRequestFn: (
-    params: any,
+    params: unknown,
     signal?: AbortSignal
   ) => Promise<unknown | null>
   let abortSpy: () => void
@@ -25,7 +25,7 @@ describe('useCachedRequest', () => {
     )
 
     // Create a mock request function that returns different results based on params
-    mockRequestFn = vi.fn(async (params: any) => {
+    mockRequestFn = vi.fn(async (params: unknown) => {
       // Simulate a request that takes some time
       await new Promise((resolve) => setTimeout(resolve, 8))
 
@@ -138,12 +138,18 @@ describe('useCachedRequest', () => {
 
   it('should use custom cache key function if provided', async () => {
     // Create a cache key function that sorts object keys
-    const cacheKeyFn = (params: any) => {
+    const cacheKeyFn = (params: unknown) => {
       if (typeof params !== 'object' || params === null) return String(params)
       return JSON.stringify(
-        Object.keys(params)
+        Object.keys(params as Record<string, unknown>)
           .sort()
-          .reduce((acc, key) => ({ ...acc, [key]: params[key] }), {})
+          .reduce(
+            (acc, key) => ({
+              ...acc,
+              [key]: (params as Record<string, unknown>)[key]
+            }),
+            {}
+          )
       )
     }
 
diff --git a/src/composables/useCanvasDrop.ts b/src/composables/useCanvasDrop.ts
index 51379e98b4..91b9625e6a 100644
--- a/src/composables/useCanvasDrop.ts
+++ b/src/composables/useCanvasDrop.ts
@@ -2,7 +2,7 @@ import type { Ref } from 'vue'
 
 import { useSharedCanvasPositionConversion } from '@/composables/element/useCanvasPositionConversion'
 import { usePragmaticDroppable } from '@/composables/usePragmaticDragAndDrop'
-import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type { LGraphNode, Point } from '@/lib/litegraph/src/litegraph'
 import { LiteGraph } from '@/lib/litegraph/src/litegraph'
 import { useWorkflowService } from '@/platform/workflow/core/services/workflowService'
 import { ComfyWorkflow } from '@/platform/workflow/management/stores/workflowStore'
@@ -33,7 +33,7 @@ export const useCanvasDrop = (canvasRef: Ref<HTMLCanvasElement | null>) => {
 
         if (node.data instanceof ComfyNodeDefImpl) {
           const nodeDef = node.data
-          const pos = [...basePos]
+          const pos: Point = [...basePos]
           // Add an offset on y to make sure after adding the node, the cursor
           // is on the node (top left corner)
           pos[1] += LiteGraph.NODE_TITLE_HEIGHT
diff --git a/src/composables/useCivitaiModel.ts b/src/composables/useCivitaiModel.ts
deleted file mode 100644
index c47b274831..0000000000
--- a/src/composables/useCivitaiModel.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { useAsyncState } from '@vueuse/core'
-import { computed } from 'vue'
-
-type ModelType =
-  | 'Checkpoint'
-  | 'TextualInversion'
-  | 'Hypernetwork'
-  | 'AestheticGradient'
-  | 'LORA'
-  | 'Controlnet'
-  | 'Poses'
-
-interface CivitaiFileMetadata {
-  fp?: 'fp16' | 'fp32'
-  size?: 'full' | 'pruned'
-  format?: 'SafeTensor' | 'PickleTensor' | 'Other'
-}
-
-interface CivitaiModelFile {
-  name: string
-  id: number
-  sizeKB: number
-  type: string
-  downloadUrl: string
-  metadata: CivitaiFileMetadata
-}
-
-interface CivitaiModel {
-  name: string
-  type: ModelType
-}
-
-interface CivitaiModelVersionResponse {
-  id: number
-  name: string
-  model: CivitaiModel
-  modelId: number
-  files: CivitaiModelFile[]
-  [key: string]: any
-}
-
-/**
- * Composable to manage Civitai model
- * @param url - The URL of the Civitai model, where the model ID is the last part of the URL's pathname
- * @see https://developer.civitai.com/docs/api/public-rest
- * @example
- * const { fileSize, isLoading, error, modelData } =
- *  useCivitaiModel('https://civitai.com/api/download/models/16576?type=Model&format=SafeTensor&size=full&fp=fp16')
- */
-export function useCivitaiModel(url: string) {
-  const createModelVersionUrl = (modelId: string): string =>
-    `https://civitai.com/api/v1/model-versions/${modelId}`
-
-  const extractModelIdFromUrl = (): string | null => {
-    const urlObj = new URL(url)
-    return urlObj.pathname.split('/').pop() || null
-  }
-
-  const fetchModelData =
-    async (): Promise<CivitaiModelVersionResponse | null> => {
-      const modelId = extractModelIdFromUrl()
-      if (!modelId) return null
-
-      const apiUrl = createModelVersionUrl(modelId)
-      const res = await fetch(apiUrl)
-      return res.json()
-    }
-
-  const findMatchingFileSize = (): number | null => {
-    const matchingFile = modelData.value?.files?.find(
-      (file) => file.downloadUrl && url.startsWith(file.downloadUrl)
-    )
-
-    return matchingFile?.sizeKB ? matchingFile.sizeKB << 10 : null
-  }
-
-  const {
-    state: modelData,
-    isLoading,
-    error
-  } = useAsyncState(fetchModelData, null, {
-    immediate: true
-  })
-
-  const fileSize = computed(() =>
-    !isLoading.value ? findMatchingFileSize() : null
-  )
-
-  return {
-    fileSize,
-    isLoading,
-    error,
-    modelData
-  }
-}
diff --git a/src/composables/useContextMenuTranslation.ts b/src/composables/useContextMenuTranslation.ts
index a85cccdc07..0c69343f55 100644
--- a/src/composables/useContextMenuTranslation.ts
+++ b/src/composables/useContextMenuTranslation.ts
@@ -123,7 +123,9 @@ export const useContextMenuTranslation = () => {
       }
 
       // for capture translation text of input and widget
-      const extraInfo: any = options.extra || options.parentMenu?.options?.extra
+      const extraInfo = (options.extra || options.parentMenu?.options?.extra) as
+        | { inputs?: INodeInputSlot[]; widgets?: IWidget[] }
+        | undefined
       // widgets and inputs
       const matchInput = value.content?.match(reInput)
       if (matchInput) {
diff --git a/tests-ui/tests/composables/clipboard.test.ts b/src/composables/useCopy.test.ts
similarity index 100%
rename from tests-ui/tests/composables/clipboard.test.ts
rename to src/composables/useCopy.test.ts
diff --git a/src/composables/useCopyToClipboard.ts b/src/composables/useCopyToClipboard.ts
index ebd9ab5138..05b8537ab6 100644
--- a/src/composables/useCopyToClipboard.ts
+++ b/src/composables/useCopyToClipboard.ts
@@ -4,64 +4,32 @@ import { useToast } from 'primevue/usetoast'
 import { t } from '@/i18n'
 
 export function useCopyToClipboard() {
-  const { copy, copied } = useClipboard()
+  const { copy, copied } = useClipboard({ legacy: true })
   const toast = useToast()
-  const showSuccessToast = () => {
-    toast.add({
-      severity: 'success',
-      summary: t('g.success'),
-      detail: t('clipboard.successMessage'),
-      life: 3000
-    })
-  }
-  const showErrorToast = () => {
-    toast.add({
-      severity: 'error',
-      summary: t('g.error'),
-      detail: t('clipboard.errorMessage')
-    })
-  }
 
-  function fallbackCopy(text: string) {
-    const textarea = document.createElement('textarea')
-    textarea.setAttribute('readonly', '')
-    textarea.value = text
-    textarea.style.position = 'absolute'
-    textarea.style.left = '-9999px'
-    textarea.setAttribute('aria-hidden', 'true')
-    textarea.setAttribute('tabindex', '-1')
-    textarea.style.width = '1px'
-    textarea.style.height = '1px'
-    document.body.appendChild(textarea)
-    textarea.select()
-
-    try {
-      // using legacy document.execCommand for fallback for old and linux browsers
-      const successful = document.execCommand('copy')
-      if (successful) {
-        showSuccessToast()
-      } else {
-        showErrorToast()
-      }
-    } catch (err) {
-      showErrorToast()
-    } finally {
-      textarea.remove()
-    }
-  }
-
-  const copyToClipboard = async (text: string) => {
+  async function copyToClipboard(text: string) {
     try {
       await copy(text)
       if (copied.value) {
-        showSuccessToast()
+        toast.add({
+          severity: 'success',
+          summary: t('g.success'),
+          detail: t('clipboard.successMessage'),
+          life: 3000
+        })
       } else {
-        // If VueUse copy failed, try fallback
-        fallbackCopy(text)
+        toast.add({
+          severity: 'error',
+          summary: t('g.error'),
+          detail: t('clipboard.errorMessage')
+        })
       }
-    } catch (err) {
-      // VueUse copy failed, try fallback
-      fallbackCopy(text)
+    } catch {
+      toast.add({
+        severity: 'error',
+        summary: t('g.error'),
+        detail: t('clipboard.errorMessage')
+      })
     }
   }
 
diff --git a/src/composables/useCoreCommands.test.ts b/src/composables/useCoreCommands.test.ts
new file mode 100644
index 0000000000..f5df599ae4
--- /dev/null
+++ b/src/composables/useCoreCommands.test.ts
@@ -0,0 +1,485 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { ref } from 'vue'
+
+import { useCoreCommands } from '@/composables/useCoreCommands'
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import { useSettingStore } from '@/platform/settings/settingStore'
+import { api } from '@/scripts/api'
+import { app } from '@/scripts/app'
+import { createMockLGraphNode } from '@/utils/__tests__/litegraphTestUtils'
+
+// Mock vue-i18n for useExternalLink
+const mockLocale = ref('en')
+vi.mock('vue-i18n', async () => {
+  const actual = await vi.importActual('vue-i18n')
+  return {
+    ...actual,
+    useI18n: vi.fn(() => ({
+      locale: mockLocale
+    }))
+  }
+})
+
+vi.mock('@/scripts/app', () => {
+  const mockGraphClear = vi.fn()
+  const mockCanvas = {
+    subgraph: undefined,
+    selectedItems: new Set(),
+    copyToClipboard: vi.fn(),
+    pasteFromClipboard: vi.fn(),
+    selectItems: vi.fn()
+  }
+
+  return {
+    app: {
+      clean: vi.fn(() => {
+        // Simulate app.clean() calling graph.clear() only when not in subgraph
+        if (!mockCanvas.subgraph) {
+          mockGraphClear()
+        }
+      }),
+      canvas: mockCanvas,
+      rootGraph: {
+        clear: mockGraphClear
+      }
+    }
+  }
+})
+
+vi.mock('@/scripts/api', () => ({
+  api: {
+    dispatchCustomEvent: vi.fn(),
+    apiURL: vi.fn(() => 'http://localhost:8188')
+  }
+}))
+
+vi.mock('@/platform/settings/settingStore')
+
+vi.mock('@/stores/firebaseAuthStore', () => ({
+  useFirebaseAuthStore: vi.fn(() => ({}))
+}))
+
+vi.mock('@/composables/auth/useFirebaseAuth', () => ({
+  useFirebaseAuth: vi.fn(() => null)
+}))
+
+vi.mock('firebase/auth', () => ({
+  setPersistence: vi.fn(),
+  browserLocalPersistence: {},
+  onAuthStateChanged: vi.fn()
+}))
+
+vi.mock('@/platform/workflow/core/services/workflowService', () => ({
+  useWorkflowService: vi.fn(() => ({}))
+}))
+
+const mockDialogService = vi.hoisted(() => ({
+  prompt: vi.fn()
+}))
+vi.mock('@/services/dialogService', () => ({
+  useDialogService: vi.fn(() => mockDialogService)
+}))
+
+vi.mock('@/services/litegraphService', () => ({
+  useLitegraphService: vi.fn(() => ({}))
+}))
+
+vi.mock('@/stores/executionStore', () => ({
+  useExecutionStore: vi.fn(() => ({}))
+}))
+
+vi.mock('@/stores/toastStore', () => ({
+  useToastStore: vi.fn(() => ({}))
+}))
+
+const mockChangeTracker = vi.hoisted(() => ({
+  checkState: vi.fn()
+}))
+const mockWorkflowStore = vi.hoisted(() => ({
+  activeWorkflow: {
+    changeTracker: mockChangeTracker
+  }
+}))
+vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
+  useWorkflowStore: vi.fn(() => mockWorkflowStore)
+}))
+
+vi.mock('@/stores/subgraphStore', () => ({
+  useSubgraphStore: vi.fn(() => ({}))
+}))
+
+vi.mock('@/renderer/core/canvas/canvasStore', () => ({
+  useCanvasStore: vi.fn(() => ({
+    getCanvas: () => app.canvas,
+    canvas: app.canvas
+  })),
+  useTitleEditorStore: vi.fn(() => ({
+    titleEditorTarget: null
+  }))
+}))
+
+vi.mock('@/stores/workspace/colorPaletteStore', () => ({
+  useColorPaletteStore: vi.fn(() => ({}))
+}))
+
+vi.mock('@/composables/auth/useFirebaseAuthActions', () => ({
+  useFirebaseAuthActions: vi.fn(() => ({}))
+}))
+
+vi.mock('@/platform/cloud/subscription/composables/useSubscription', () => ({
+  useSubscription: vi.fn(() => ({
+    isActiveSubscription: vi.fn().mockReturnValue(true),
+    showSubscriptionDialog: vi.fn()
+  }))
+}))
+
+vi.mock('@/composables/billing/useBillingContext', () => ({
+  useBillingContext: vi.fn(() => ({
+    isActiveSubscription: { value: true },
+    showSubscriptionDialog: vi.fn()
+  }))
+}))
+
+describe('useCoreCommands', () => {
+  const createMockNode = (id: number, comfyClass: string): LGraphNode => {
+    const baseNode = createMockLGraphNode({ id })
+    return Object.assign(baseNode, {
+      constructor: {
+        ...baseNode.constructor,
+        comfyClass
+      }
+    })
+  }
+
+  const createMockSubgraph = () => {
+    const mockNodes = [
+      // Mock input node
+      createMockNode(1, 'SubgraphInputNode'),
+      // Mock output node
+      createMockNode(2, 'SubgraphOutputNode'),
+      // Mock user node
+      createMockNode(3, 'SomeUserNode'),
+      // Another mock user node
+      createMockNode(4, 'AnotherUserNode')
+    ]
+
+    return {
+      nodes: mockNodes,
+      remove: vi.fn(),
+      events: {
+        dispatch: vi.fn(),
+        addEventListener: vi.fn(),
+        removeEventListener: vi.fn(),
+        dispatchEvent: vi.fn()
+      },
+      name: 'test-subgraph',
+      inputNode: undefined,
+      outputNode: undefined,
+      add: vi.fn(),
+      clear: vi.fn(),
+      serialize: vi.fn(),
+      configure: vi.fn(),
+      start: vi.fn(),
+      stop: vi.fn(),
+      runStep: vi.fn(),
+      findNodeByTitle: vi.fn(),
+      findNodesByTitle: vi.fn(),
+      findNodesByType: vi.fn(),
+      findNodeById: vi.fn(),
+      getNodeById: vi.fn(),
+      setDirtyCanvas: vi.fn(),
+      sendActionToCanvas: vi.fn(),
+      extra: {} as Record<string, unknown>
+    } as Partial<typeof app.canvas.subgraph> as typeof app.canvas.subgraph
+  }
+
+  const mockSubgraph = createMockSubgraph()!
+
+  function createMockSettingStore(
+    getReturnValue: boolean
+  ): ReturnType<typeof useSettingStore> {
+    return {
+      get: vi.fn().mockReturnValue(getReturnValue),
+      addSetting: vi.fn(),
+      load: vi.fn(),
+      set: vi.fn(),
+      setMany: vi.fn(),
+      exists: vi.fn(),
+      getDefaultValue: vi.fn(),
+      isReady: true,
+      isLoading: false,
+      error: undefined,
+      settingValues: {},
+      settingsById: {},
+      $id: 'setting',
+      $state: {
+        settingValues: {},
+        settingsById: {},
+        isReady: true,
+        isLoading: false,
+        error: undefined
+      },
+      $patch: vi.fn(),
+      $reset: vi.fn(),
+      $subscribe: vi.fn(),
+      $onAction: vi.fn(),
+      $dispose: vi.fn(),
+      _customProperties: new Set()
+    } satisfies ReturnType<typeof useSettingStore>
+  }
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+
+    // Set up Pinia
+    setActivePinia(createPinia())
+
+    // Reset app state
+    app.canvas.subgraph = undefined
+
+    // Mock settings store
+    vi.mocked(useSettingStore).mockReturnValue(createMockSettingStore(false))
+
+    // Mock global confirm
+    global.confirm = vi.fn().mockReturnValue(true)
+  })
+
+  describe('ClearWorkflow command', () => {
+    it('should clear main graph when not in subgraph', async () => {
+      const commands = useCoreCommands()
+      const clearCommand = commands.find(
+        (cmd) => cmd.id === 'Comfy.ClearWorkflow'
+      )!
+
+      // Execute the command
+      await clearCommand.function()
+
+      expect(app.clean).toHaveBeenCalled()
+      expect(app.rootGraph.clear).toHaveBeenCalled()
+      expect(api.dispatchCustomEvent).toHaveBeenCalledWith('graphCleared')
+    })
+
+    it('should preserve input/output nodes when clearing subgraph', async () => {
+      // Set up subgraph context
+      app.canvas.subgraph = mockSubgraph
+
+      const commands = useCoreCommands()
+      const clearCommand = commands.find(
+        (cmd) => cmd.id === 'Comfy.ClearWorkflow'
+      )!
+
+      // Execute the command
+      await clearCommand.function()
+
+      expect(app.clean).toHaveBeenCalled()
+      expect(app.rootGraph.clear).not.toHaveBeenCalled()
+
+      // Should only remove user nodes, not input/output nodes
+      const subgraph = app.canvas.subgraph!
+      expect(subgraph.remove).toHaveBeenCalledTimes(2)
+      expect(subgraph.remove).toHaveBeenCalledWith(subgraph.nodes[2]) // user1
+      expect(subgraph.remove).toHaveBeenCalledWith(subgraph.nodes[3]) // user2
+      expect(subgraph.remove).not.toHaveBeenCalledWith(subgraph.nodes[0]) // input1
+      expect(subgraph.remove).not.toHaveBeenCalledWith(subgraph.nodes[1]) // output1
+
+      expect(api.dispatchCustomEvent).toHaveBeenCalledWith('graphCleared')
+    })
+
+    it('should respect confirmation setting', async () => {
+      // Mock confirmation required
+      vi.mocked(useSettingStore).mockReturnValue(createMockSettingStore(true))
+
+      global.confirm = vi.fn().mockReturnValue(false) // User cancels
+
+      const commands = useCoreCommands()
+      const clearCommand = commands.find(
+        (cmd) => cmd.id === 'Comfy.ClearWorkflow'
+      )!
+
+      // Execute the command
+      await clearCommand.function()
+
+      // Should not clear anything when user cancels
+      expect(app.clean).not.toHaveBeenCalled()
+      expect(app.rootGraph.clear).not.toHaveBeenCalled()
+      expect(api.dispatchCustomEvent).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('Canvas clipboard commands', () => {
+    function findCommand(id: string) {
+      return useCoreCommands().find((cmd) => cmd.id === id)!
+    }
+
+    beforeEach(() => {
+      app.canvas.selectedItems = new Set()
+      vi.mocked(app.canvas.copyToClipboard).mockClear()
+      vi.mocked(app.canvas.pasteFromClipboard).mockClear()
+      vi.mocked(app.canvas.selectItems).mockClear()
+    })
+
+    it('should copy selected items when selection exists', async () => {
+      app.canvas.selectedItems = new Set([
+        {}
+      ]) as typeof app.canvas.selectedItems
+
+      await findCommand('Comfy.Canvas.CopySelected').function()
+
+      expect(app.canvas.copyToClipboard).toHaveBeenCalledWith()
+    })
+
+    it('should not copy when no items are selected', async () => {
+      await findCommand('Comfy.Canvas.CopySelected').function()
+
+      expect(app.canvas.copyToClipboard).not.toHaveBeenCalled()
+    })
+
+    it('should paste from clipboard', async () => {
+      await findCommand('Comfy.Canvas.PasteFromClipboard').function()
+
+      expect(app.canvas.pasteFromClipboard).toHaveBeenCalledWith()
+    })
+
+    it('should select all items', async () => {
+      await findCommand('Comfy.Canvas.SelectAll').function()
+
+      // No arguments means "select all items on canvas"
+      expect(app.canvas.selectItems).toHaveBeenCalledWith()
+    })
+  })
+
+  describe('Subgraph metadata commands', () => {
+    beforeEach(() => {
+      mockSubgraph.extra = {}
+      vi.clearAllMocks()
+    })
+
+    describe('SetDescription command', () => {
+      it('should do nothing when not in subgraph', async () => {
+        app.canvas.subgraph = undefined
+
+        const commands = useCoreCommands()
+        const setDescCommand = commands.find(
+          (cmd) => cmd.id === 'Comfy.Subgraph.SetDescription'
+        )!
+
+        await setDescCommand.function()
+
+        expect(mockDialogService.prompt).not.toHaveBeenCalled()
+      })
+
+      it('should set description on subgraph.extra', async () => {
+        app.canvas.subgraph = mockSubgraph
+        mockDialogService.prompt.mockResolvedValue('Test description')
+
+        const commands = useCoreCommands()
+        const setDescCommand = commands.find(
+          (cmd) => cmd.id === 'Comfy.Subgraph.SetDescription'
+        )!
+
+        await setDescCommand.function()
+
+        expect(mockDialogService.prompt).toHaveBeenCalled()
+        expect(mockSubgraph.extra.BlueprintDescription).toBe('Test description')
+        expect(mockChangeTracker.checkState).toHaveBeenCalled()
+      })
+
+      it('should not set description when user cancels', async () => {
+        app.canvas.subgraph = mockSubgraph
+        mockDialogService.prompt.mockResolvedValue(null)
+
+        const commands = useCoreCommands()
+        const setDescCommand = commands.find(
+          (cmd) => cmd.id === 'Comfy.Subgraph.SetDescription'
+        )!
+
+        await setDescCommand.function()
+
+        expect(mockSubgraph.extra.BlueprintDescription).toBeUndefined()
+        expect(mockChangeTracker.checkState).not.toHaveBeenCalled()
+      })
+    })
+
+    describe('SetSearchAliases command', () => {
+      it('should do nothing when not in subgraph', async () => {
+        app.canvas.subgraph = undefined
+
+        const commands = useCoreCommands()
+        const setAliasesCommand = commands.find(
+          (cmd) => cmd.id === 'Comfy.Subgraph.SetSearchAliases'
+        )!
+
+        await setAliasesCommand.function()
+
+        expect(mockDialogService.prompt).not.toHaveBeenCalled()
+      })
+
+      it('should set search aliases on subgraph.extra', async () => {
+        app.canvas.subgraph = mockSubgraph
+        mockDialogService.prompt.mockResolvedValue('alias1, alias2, alias3')
+
+        const commands = useCoreCommands()
+        const setAliasesCommand = commands.find(
+          (cmd) => cmd.id === 'Comfy.Subgraph.SetSearchAliases'
+        )!
+
+        await setAliasesCommand.function()
+
+        expect(mockDialogService.prompt).toHaveBeenCalled()
+        expect(mockSubgraph.extra.BlueprintSearchAliases).toEqual([
+          'alias1',
+          'alias2',
+          'alias3'
+        ])
+        expect(mockChangeTracker.checkState).toHaveBeenCalled()
+      })
+
+      it('should trim whitespace and filter empty strings', async () => {
+        app.canvas.subgraph = mockSubgraph
+        mockDialogService.prompt.mockResolvedValue('  alias1  ,  , alias2 ,  ')
+
+        const commands = useCoreCommands()
+        const setAliasesCommand = commands.find(
+          (cmd) => cmd.id === 'Comfy.Subgraph.SetSearchAliases'
+        )!
+
+        await setAliasesCommand.function()
+
+        expect(mockSubgraph.extra.BlueprintSearchAliases).toEqual([
+          'alias1',
+          'alias2'
+        ])
+      })
+
+      it('should set undefined when empty input', async () => {
+        app.canvas.subgraph = mockSubgraph
+        mockDialogService.prompt.mockResolvedValue('')
+
+        const commands = useCoreCommands()
+        const setAliasesCommand = commands.find(
+          (cmd) => cmd.id === 'Comfy.Subgraph.SetSearchAliases'
+        )!
+
+        await setAliasesCommand.function()
+
+        expect(mockSubgraph.extra.BlueprintSearchAliases).toBeUndefined()
+      })
+
+      it('should not set aliases when user cancels', async () => {
+        app.canvas.subgraph = mockSubgraph
+        mockDialogService.prompt.mockResolvedValue(null)
+
+        const commands = useCoreCommands()
+        const setAliasesCommand = commands.find(
+          (cmd) => cmd.id === 'Comfy.Subgraph.SetSearchAliases'
+        )!
+
+        await setAliasesCommand.function()
+
+        expect(mockSubgraph.extra.BlueprintSearchAliases).toBeUndefined()
+        expect(mockChangeTracker.checkState).not.toHaveBeenCalled()
+      })
+    })
+  })
+})
diff --git a/src/composables/useCoreCommands.ts b/src/composables/useCoreCommands.ts
index 2d58f61b51..8210ea385a 100644
--- a/src/composables/useCoreCommands.ts
+++ b/src/composables/useCoreCommands.ts
@@ -8,7 +8,8 @@ import {
   DEFAULT_DARK_COLOR_PALETTE,
   DEFAULT_LIGHT_COLOR_PALETTE
 } from '@/constants/coreColorPalettes'
-import { tryToggleWidgetPromotion } from '@/core/graph/subgraph/proxyWidgetUtils'
+
+import { tryToggleWidgetPromotion } from '@/core/graph/subgraph/promotionUtils'
 import { t } from '@/i18n'
 import {
   LGraphEventMode,
@@ -17,9 +18,9 @@ import {
   LiteGraph
 } from '@/lib/litegraph/src/litegraph'
 import type { Point } from '@/lib/litegraph/src/litegraph'
+import { useBillingContext } from '@/composables/billing/useBillingContext'
 import { useAssetBrowserDialog } from '@/platform/assets/composables/useAssetBrowserDialog'
 import { createModelNodeFromAsset } from '@/platform/assets/utils/createModelNodeFromAsset'
-import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { buildSupportUrl } from '@/platform/support/config'
 import { useTelemetry } from '@/platform/telemetry'
@@ -34,6 +35,7 @@ import {
 } from '@/renderer/core/canvas/canvasStore'
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
+import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
 import { useDialogService } from '@/services/dialogService'
 import { useLitegraphService } from '@/services/litegraphService'
 import type { ComfyCommand } from '@/stores/commandStore'
@@ -51,6 +53,7 @@ import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
 import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore'
 import { useSearchBoxStore } from '@/stores/workspace/searchBoxStore'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
+import { ensureWorkflowSuffix, getWorkflowSuffix } from '@/utils/formatUtil'
 import {
   getAllNonIoNodesInSubgraph,
   getExecutionIdsForSelectedNodes
@@ -64,13 +67,15 @@ import { ManagerTab } from '@/workbench/extensions/manager/types/comfyManagerTyp
 
 import { useWorkflowTemplateSelectorDialog } from './useWorkflowTemplateSelectorDialog'
 
-const { isActiveSubscription, showSubscriptionDialog } = useSubscription()
+import { useMaskEditorStore } from '@/stores/maskEditorStore'
+import { useDialogStore } from '@/stores/dialogStore'
 
 const moveSelectedNodesVersionAdded = '1.22.2'
-
 export function useCoreCommands(): ComfyCommand[] {
+  const { isActiveSubscription, showSubscriptionDialog } = useBillingContext()
   const workflowService = useWorkflowService()
   const workflowStore = useWorkflowStore()
+  const settingsDialog = useSettingsDialog()
   const dialogService = useDialogService()
   const colorPaletteStore = useColorPaletteStore()
   const firebaseAuthActions = useFirebaseAuthActions()
@@ -79,13 +84,25 @@ export function useCoreCommands(): ComfyCommand[] {
   const executionStore = useExecutionStore()
   const telemetry = useTelemetry()
   const { staticUrls, buildDocsUrl } = useExternalLink()
+  const settingStore = useSettingStore()
 
   const bottomPanelStore = useBottomPanelStore()
 
+  const dialogStore = useDialogStore()
+  const maskEditorStore = useMaskEditorStore()
+
   const { getSelectedNodes, toggleSelectedNodesMode } =
     useSelectedLiteGraphItems()
   const getTracker = () => workflowStore.activeWorkflow?.changeTracker
 
+  function isQueuePanelV2Enabled() {
+    return settingStore.get('Comfy.Queue.QPOV2')
+  }
+
+  async function toggleQueuePanelV2() {
+    await settingStore.set('Comfy.Queue.QPOV2', !isQueuePanelV2Enabled())
+  }
+
   const moveSelectedNodes = (
     positionUpdater: (pos: Point, gridSize: number) => Point
   ) => {
@@ -157,8 +174,9 @@ export function useCoreCommands(): ComfyCommand[] {
       icon: 'pi pi-save',
       label: 'Publish Subgraph',
       menubarLabel: 'Publish',
-      function: async () => {
-        await useSubgraphStore().publishSubgraph()
+      function: async (metadata?: Record<string, unknown>) => {
+        const name = metadata?.name as string | undefined
+        await useSubgraphStore().publishSubgraph(name)
       }
     },
     {
@@ -174,6 +192,28 @@ export function useCoreCommands(): ComfyCommand[] {
         await workflowService.saveWorkflowAs(workflow)
       }
     },
+    {
+      id: 'Comfy.RenameWorkflow',
+      icon: 'pi pi-pencil',
+      label: 'Rename Workflow',
+      menubarLabel: 'Rename',
+      function: async () => {
+        const workflow = workflowStore.activeWorkflow
+        if (!workflow || !workflow.isPersisted) return
+
+        const newName = await dialogService.prompt({
+          title: t('g.rename'),
+          message: t('workflowService.enterFilenamePrompt'),
+          defaultValue: workflow.filename
+        })
+        if (!newName || newName === workflow.filename) return
+
+        const suffix = getWorkflowSuffix(workflow.suffix)
+        const newPath =
+          workflow.directory + '/' + ensureWorkflowSuffix(newName, suffix)
+        await workflowService.renameWorkflow(workflow, newPath)
+      }
+    },
     {
       id: 'Comfy.ExportWorkflow',
       icon: 'pi pi-download',
@@ -199,7 +239,12 @@ export function useCoreCommands(): ComfyCommand[] {
       label: 'Undo',
       category: 'essentials' as const,
       function: async () => {
-        await getTracker()?.undo?.()
+        // If Mask Editor is open, use its history instead of the graph
+        if (dialogStore.isDialogOpen('global-mask-editor')) {
+          maskEditorStore.canvasHistory.undo()
+        } else {
+          await getTracker()?.undo?.()
+        }
       }
     },
     {
@@ -208,7 +253,11 @@ export function useCoreCommands(): ComfyCommand[] {
       label: 'Redo',
       category: 'essentials' as const,
       function: async () => {
-        await getTracker()?.redo?.()
+        if (dialogStore.isDialogOpen('global-mask-editor')) {
+          maskEditorStore.canvasHistory.redo()
+        } else {
+          await getTracker()?.redo?.()
+        }
       }
     },
     {
@@ -266,7 +315,7 @@ export function useCoreCommands(): ComfyCommand[] {
       label: 'Interrupt',
       category: 'essentials' as const,
       function: async () => {
-        await api.interrupt(executionStore.activePromptId)
+        await api.interrupt(executionStore.activeJobId)
         toastStore.add({
           severity: 'info',
           summary: t('g.interrupted'),
@@ -538,7 +587,7 @@ export function useCoreCommands(): ComfyCommand[] {
       versionAdded: '1.3.7',
       category: 'view-controls' as const,
       function: () => {
-        dialogService.showSettingsDialog()
+        settingsDialog.show()
       }
     },
     {
@@ -787,7 +836,7 @@ export function useCoreCommands(): ComfyCommand[] {
       menubarLabel: 'About ComfyUI',
       versionAdded: '1.6.4',
       function: () => {
-        dialogService.showSettingsDialog('about')
+        settingsDialog.showAbout()
       }
     },
     {
@@ -820,7 +869,7 @@ export function useCoreCommands(): ComfyCommand[] {
           userEmail: userEmail.value,
           userId: resolvedUserInfo.value?.id
         })
-        window.open(supportUrl, '_blank')
+        window.open(supportUrl, '_blank', 'noopener,noreferrer')
       }
     },
     {
@@ -838,12 +887,52 @@ export function useCoreCommands(): ComfyCommand[] {
         window.open(staticUrls.forum, '_blank')
       }
     },
+    {
+      id: 'Comfy.Canvas.CopySelected',
+      icon: 'icon-[lucide--copy]',
+      label: 'Copy',
+      function: () => {
+        if (app.canvas.selectedItems?.size) {
+          app.canvas.copyToClipboard()
+        }
+      }
+    },
+    {
+      id: 'Comfy.Canvas.PasteFromClipboard',
+      icon: 'icon-[lucide--clipboard-paste]',
+      label: 'Paste',
+      function: () => {
+        app.canvas.pasteFromClipboard()
+      }
+    },
+    {
+      id: 'Comfy.Canvas.PasteFromClipboardWithConnect',
+      icon: 'icon-[lucide--clipboard-paste]',
+      label: () => t('Paste with Connect'),
+      function: () => {
+        app.canvas.pasteFromClipboard({ connectInputs: true })
+      }
+    },
+    {
+      id: 'Comfy.Canvas.SelectAll',
+      icon: 'icon-[lucide--lasso-select]',
+      label: 'Select All',
+      function: () => {
+        app.canvas.selectItems()
+      }
+    },
     {
       id: 'Comfy.Canvas.DeleteSelectedItems',
       icon: 'pi pi-trash',
       label: 'Delete Selected Items',
       versionAdded: '1.10.5',
       function: () => {
+        if (app.canvas.selectedItems.size === 0) {
+          app.canvas.canvas.dispatchEvent(
+            new CustomEvent('litegraph:no-items-selected', { bubbles: true })
+          )
+          return
+        }
         app.canvas.deleteSelected()
         app.canvas.setDirty(true, true)
       }
@@ -897,15 +986,6 @@ export function useCoreCommands(): ComfyCommand[] {
         })
       }
     },
-    {
-      id: 'Comfy.Manager.ToggleManagerProgressDialog',
-      icon: 'pi pi-spinner',
-      label: 'Toggle the Custom Nodes Manager Progress Bar',
-      versionAdded: '1.13.9',
-      function: () => {
-        dialogService.toggleManagerProgressDialog()
-      }
-    },
     {
       id: 'Comfy.User.OpenSignInDialog',
       icon: 'pi pi-user',
@@ -1061,6 +1141,75 @@ export function useCoreCommands(): ComfyCommand[] {
         )
       }
     },
+    {
+      id: 'Comfy.Subgraph.SetDescription',
+      icon: 'pi pi-pencil',
+      label: 'Set Subgraph Description',
+      versionAdded: '1.39.7',
+      function: async (metadata?: Record<string, unknown>) => {
+        const canvas = canvasStore.getCanvas()
+        const subgraph = canvas.subgraph
+        if (!subgraph) return
+
+        const extra = (subgraph.extra ??= {}) as Record<string, unknown>
+        const currentDescription = (extra.BlueprintDescription as string) ?? ''
+
+        let description: string | null | undefined
+        const rawDescription = metadata?.description
+        if (rawDescription != null) {
+          description =
+            typeof rawDescription === 'string'
+              ? rawDescription
+              : String(rawDescription)
+        }
+        description ??= await dialogService.prompt({
+          title: t('g.description'),
+          message: t('subgraphStore.enterDescription'),
+          defaultValue: currentDescription
+        })
+        if (description === null) return
+
+        extra.BlueprintDescription = description.trim() || undefined
+        workflowStore.activeWorkflow?.changeTracker?.checkState()
+      }
+    },
+    {
+      id: 'Comfy.Subgraph.SetSearchAliases',
+      icon: 'pi pi-search',
+      label: 'Set Subgraph Search Aliases',
+      versionAdded: '1.39.7',
+      function: async (metadata?: Record<string, unknown>) => {
+        const canvas = canvasStore.getCanvas()
+        const subgraph = canvas.subgraph
+        if (!subgraph) return
+
+        const parseAliases = (value: unknown): string[] =>
+          (Array.isArray(value) ? value.map(String) : String(value).split(','))
+            .map((s) => s.trim())
+            .filter(Boolean)
+
+        const extra = (subgraph.extra ??= {}) as Record<string, unknown>
+
+        let aliases: string[]
+        const rawAliases = metadata?.aliases
+        if (rawAliases == null) {
+          const input = await dialogService.prompt({
+            title: t('subgraphStore.searchAliases'),
+            message: t('subgraphStore.enterSearchAliases'),
+            defaultValue: parseAliases(extra.BlueprintSearchAliases ?? '').join(
+              ', '
+            )
+          })
+          if (input === null) return
+          aliases = parseAliases(input)
+        } else {
+          aliases = parseAliases(rawAliases)
+        }
+
+        extra.BlueprintSearchAliases = aliases.length > 0 ? aliases : undefined
+        workflowStore.activeWorkflow?.changeTracker?.checkState()
+      }
+    },
     {
       id: 'Comfy.Dev.ShowModelSelector',
       icon: 'pi pi-box',
@@ -1191,11 +1340,23 @@ export function useCoreCommands(): ComfyCommand[] {
         await useWorkflowService().reloadCurrentWorkflow() // ensure changes take effect immediately
       }
     },
+    {
+      id: 'Comfy.ToggleQPOV2',
+      icon: 'pi pi-list',
+      label: 'Toggle Queue Panel V2',
+      function: toggleQueuePanelV2
+    },
     {
       id: 'Comfy.ToggleLinear',
       icon: 'pi pi-database',
-      label: 'toggle linear mode',
-      function: () => (canvasStore.linearMode = !canvasStore.linearMode)
+      label: 'Toggle App Mode',
+      function: (metadata?: Record<string, unknown>) => {
+        const source =
+          typeof metadata?.source === 'string' ? metadata.source : 'keybind'
+        const newMode = !canvasStore.linearMode
+        if (newMode) useTelemetry()?.trackEnterLinear({ source })
+        canvasStore.linearMode = newMode
+      }
     }
   ]
 
diff --git a/src/composables/useCurveEditor.ts b/src/composables/useCurveEditor.ts
new file mode 100644
index 0000000000..c97e9561cf
--- /dev/null
+++ b/src/composables/useCurveEditor.ts
@@ -0,0 +1,141 @@
+import { computed, onBeforeUnmount, ref } from 'vue'
+import type { Ref } from 'vue'
+
+import { createMonotoneInterpolator } from '@/components/curve/curveUtils'
+import type { CurvePoint } from '@/components/curve/types'
+
+interface UseCurveEditorOptions {
+  svgRef: Ref<SVGSVGElement | null>
+  modelValue: Ref<CurvePoint[]>
+}
+
+export function useCurveEditor({ svgRef, modelValue }: UseCurveEditorOptions) {
+  const dragIndex = ref(-1)
+  let cleanupDrag: (() => void) | null = null
+
+  const curvePath = computed(() => {
+    const points = modelValue.value
+    if (points.length < 2) return ''
+
+    const interpolate = createMonotoneInterpolator(points)
+    const xMin = points[0][0]
+    const xMax = points[points.length - 1][0]
+    const segments = 128
+    const range = xMax - xMin
+    const parts: string[] = []
+    for (let i = 0; i <= segments; i++) {
+      const x = xMin + range * (i / segments)
+      const y = 1 - interpolate(x)
+      parts.push(`${i === 0 ? 'M' : 'L'}${x},${y}`)
+    }
+    return parts.join('')
+  })
+
+  function svgCoords(e: PointerEvent): [number, number] {
+    const svg = svgRef.value
+    if (!svg) return [0, 0]
+
+    const ctm = svg.getScreenCTM()
+    if (!ctm) return [0, 0]
+
+    const svgPt = new DOMPoint(e.clientX, e.clientY).matrixTransform(
+      ctm.inverse()
+    )
+    return [
+      Math.max(0, Math.min(1, svgPt.x)),
+      Math.max(0, Math.min(1, 1 - svgPt.y))
+    ]
+  }
+
+  function findNearestPoint(x: number, y: number): number {
+    const threshold2 = 0.04 * 0.04
+    let nearest = -1
+    let minDist2 = threshold2
+    for (let i = 0; i < modelValue.value.length; i++) {
+      const dx = modelValue.value[i][0] - x
+      const dy = modelValue.value[i][1] - y
+      const dist2 = dx * dx + dy * dy
+      if (dist2 < minDist2) {
+        minDist2 = dist2
+        nearest = i
+      }
+    }
+    return nearest
+  }
+
+  function handleSvgPointerDown(e: PointerEvent) {
+    if (e.button !== 0) return
+
+    const [x, y] = svgCoords(e)
+
+    const nearby = findNearestPoint(x, y)
+    if (nearby >= 0) {
+      startDrag(nearby, e)
+      return
+    }
+
+    if (e.ctrlKey) return
+
+    const newPoint: CurvePoint = [x, y]
+    const newPoints: CurvePoint[] = [...modelValue.value, newPoint]
+    newPoints.sort((a, b) => a[0] - b[0])
+    modelValue.value = newPoints
+
+    startDrag(newPoints.indexOf(newPoint), e)
+  }
+
+  function startDrag(index: number, e: PointerEvent) {
+    cleanupDrag?.()
+
+    if (e.button === 2 || (e.button === 0 && e.ctrlKey)) {
+      if (modelValue.value.length > 2) {
+        const newPoints = [...modelValue.value]
+        newPoints.splice(index, 1)
+        modelValue.value = newPoints
+      }
+      return
+    }
+
+    dragIndex.value = index
+    const svg = svgRef.value
+    if (!svg) return
+
+    svg.setPointerCapture(e.pointerId)
+
+    const onMove = (ev: PointerEvent) => {
+      if (dragIndex.value < 0) return
+      const [x, y] = svgCoords(ev)
+      const movedPoint: CurvePoint = [x, y]
+      const newPoints = [...modelValue.value]
+      newPoints[dragIndex.value] = movedPoint
+      newPoints.sort((a, b) => a[0] - b[0])
+      modelValue.value = newPoints
+      dragIndex.value = newPoints.indexOf(movedPoint)
+    }
+
+    const endDrag = () => {
+      if (dragIndex.value < 0) return
+      dragIndex.value = -1
+      svg.removeEventListener('pointermove', onMove)
+      svg.removeEventListener('pointerup', endDrag)
+      svg.removeEventListener('lostpointercapture', endDrag)
+      cleanupDrag = null
+    }
+
+    cleanupDrag = endDrag
+
+    svg.addEventListener('pointermove', onMove)
+    svg.addEventListener('pointerup', endDrag)
+    svg.addEventListener('lostpointercapture', endDrag)
+  }
+
+  onBeforeUnmount(() => {
+    cleanupDrag?.()
+  })
+
+  return {
+    curvePath,
+    handleSvgPointerDown,
+    startDrag
+  }
+}
diff --git a/src/composables/useDownload.ts b/src/composables/useDownload.ts
deleted file mode 100644
index 2b1d8924a7..0000000000
--- a/src/composables/useDownload.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { whenever } from '@vueuse/core'
-import { onMounted, ref } from 'vue'
-
-import { useCivitaiModel } from '@/composables/useCivitaiModel'
-import { downloadUrlToHfRepoUrl, isCivitaiModelUrl } from '@/utils/formatUtil'
-
-export function useDownload(url: string, fileName?: string) {
-  const fileSize = ref<number | null>(null)
-  const error = ref<Error | null>(null)
-
-  const setFileSize = (size: number) => {
-    fileSize.value = size
-  }
-
-  const fetchFileSize = async () => {
-    try {
-      const response = await fetch(url, { method: 'HEAD' })
-      if (!response.ok) throw new Error('Failed to fetch file size')
-
-      const size = response.headers.get('content-length')
-      if (size) {
-        setFileSize(parseInt(size))
-      } else {
-        console.error('"content-length" header not found')
-        return null
-      }
-    } catch (e) {
-      console.error('Error fetching file size:', e)
-      error.value = e instanceof Error ? e : new Error(String(e))
-      return null
-    }
-  }
-
-  /**
-   * Trigger browser download
-   */
-  const triggerBrowserDownload = () => {
-    const link = document.createElement('a')
-    if (url.includes('huggingface.co') && error.value) {
-      // If model is a gated HF model, send user to the repo page so they can sign in first
-      link.href = downloadUrlToHfRepoUrl(url)
-    } else {
-      link.href = url
-      link.download = fileName || url.split('/').pop() || 'download'
-    }
-    link.target = '_blank' // Opens in new tab if download attribute is not supported
-    link.rel = 'noopener noreferrer' // Security best practice for _blank links
-    link.click()
-  }
-
-  onMounted(() => {
-    if (isCivitaiModelUrl(url)) {
-      const { fileSize: civitaiSize, error: civitaiErr } = useCivitaiModel(url)
-      whenever(civitaiSize, setFileSize)
-      // Try falling back to normal fetch if using Civitai API fails
-      whenever(civitaiErr, fetchFileSize, { once: true })
-    } else {
-      // Fetch file size in the background
-      void fetchFileSize()
-    }
-  })
-
-  return {
-    triggerBrowserDownload,
-    fileSize
-  }
-}
diff --git a/tests-ui/tests/composables/useErrorHandling.test.ts b/src/composables/useErrorHandling.test.ts
similarity index 87%
rename from tests-ui/tests/composables/useErrorHandling.test.ts
rename to src/composables/useErrorHandling.test.ts
index 99cf3da115..5c7c8212bd 100644
--- a/tests-ui/tests/composables/useErrorHandling.test.ts
+++ b/src/composables/useErrorHandling.test.ts
@@ -1,15 +1,18 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import type { ErrorRecoveryStrategy } from '@/composables/useErrorHandling'
 import { useErrorHandling } from '@/composables/useErrorHandling'
+import { t } from '@/i18n'
+import { useToastStore } from '@/platform/updates/common/toastStore'
 
 describe('useErrorHandling', () => {
   let errorHandler: ReturnType<typeof useErrorHandling>
 
   beforeEach(() => {
     vi.clearAllMocks()
-    setActivePinia(createPinia())
+    setActivePinia(createTestingPinia())
     errorHandler = useErrorHandling()
   })
 
@@ -320,6 +323,45 @@ describe('useErrorHandling', () => {
       })
     })
 
+    describe('network error detection', () => {
+      it.each([
+        ['Failed to fetch', 'Chrome/Edge'],
+        ['NetworkError when attempting to fetch resource.', 'Firefox'],
+        ['Load failed', 'Safari']
+      ])('should show disconnected toast for "%s" (%s)', async (message) => {
+        const action = vi.fn(async () => {
+          throw new TypeError(message)
+        })
+
+        const wrapped = errorHandler.wrapWithErrorHandlingAsync(action)
+        await wrapped()
+
+        const toastStore = useToastStore()
+        expect(toastStore.add).toHaveBeenCalledWith(
+          expect.objectContaining({
+            severity: 'error',
+            detail: t('g.disconnectedFromBackend')
+          })
+        )
+      })
+
+      it('should not treat non-TypeError as network error', async () => {
+        const action = vi.fn(async () => {
+          throw new Error('Failed to fetch')
+        })
+
+        const wrapped = errorHandler.wrapWithErrorHandlingAsync(action)
+        await wrapped()
+
+        const toastStore = useToastStore()
+        expect(toastStore.add).toHaveBeenCalledWith(
+          expect.objectContaining({
+            detail: 'Failed to fetch'
+          })
+        )
+      })
+    })
+
     describe('backward compatibility', () => {
       it('should work without recovery strategies parameter', async () => {
         const action = vi.fn(async () => 'success')
diff --git a/src/composables/useErrorHandling.ts b/src/composables/useErrorHandling.ts
index 9dce59340c..9bee2812df 100644
--- a/src/composables/useErrorHandling.ts
+++ b/src/composables/useErrorHandling.ts
@@ -52,10 +52,18 @@ export interface ErrorRecoveryStrategy<
 export function useErrorHandling() {
   const toast = useToastStore()
   const toastErrorHandler = (error: unknown) => {
+    const isNetworkError =
+      error instanceof TypeError &&
+      /failed to fetch|networkerror|load failed/i.test(error.message)
+    const message = isNetworkError
+      ? t('g.disconnectedFromBackend')
+      : error instanceof Error
+        ? error.message
+        : t('g.unknownError')
     toast.add({
       severity: 'error',
       summary: t('g.error'),
-      detail: error instanceof Error ? error.message : t('g.unknownError')
+      detail: message
     })
     console.error(error)
   }
diff --git a/tests-ui/tests/composables/useExternalLink.test.ts b/src/composables/useExternalLink.test.ts
similarity index 92%
rename from tests-ui/tests/composables/useExternalLink.test.ts
rename to src/composables/useExternalLink.test.ts
index 7f0ef90aa4..0b068963ae 100644
--- a/tests-ui/tests/composables/useExternalLink.test.ts
+++ b/src/composables/useExternalLink.test.ts
@@ -1,8 +1,15 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
+const mockData = vi.hoisted(() => ({ isDesktop: false }))
+
+vi.mock('@/platform/distribution/types', () => ({
+  get isDesktop() {
+    return mockData.isDesktop
+  }
+}))
+
 // Mock the environment utilities
 vi.mock('@/utils/envUtil', () => ({
-  isElectron: vi.fn(),
   electronAPI: vi.fn()
 }))
 
@@ -20,14 +27,14 @@ vi.mock('@/i18n', () => ({
 
 // Import after mocking to get the mocked versions
 import { useExternalLink } from '@/composables/useExternalLink'
-import { electronAPI, isElectron } from '@/utils/envUtil'
+import { electronAPI } from '@/utils/envUtil'
 
 describe('useExternalLink', () => {
   beforeEach(() => {
     vi.clearAllMocks()
     // Reset to default state
     i18n.global.locale.value = 'en'
-    vi.mocked(isElectron).mockReturnValue(false)
+    mockData.isDesktop = false
   })
 
   describe('staticUrls', () => {
@@ -95,7 +102,7 @@ describe('useExternalLink', () => {
 
     it('should add platform suffix when requested', () => {
       i18n.global.locale.value = 'en'
-      vi.mocked(isElectron).mockReturnValue(true)
+      mockData.isDesktop = true
       vi.mocked(electronAPI).mockReturnValue({
         getPlatform: () => 'darwin'
       } as ReturnType<typeof electronAPI>)
@@ -107,7 +114,7 @@ describe('useExternalLink', () => {
 
     it('should add platform suffix with trailing slash', () => {
       i18n.global.locale.value = 'en'
-      vi.mocked(isElectron).mockReturnValue(true)
+      mockData.isDesktop = true
       vi.mocked(electronAPI).mockReturnValue({
         getPlatform: () => 'win32'
       } as ReturnType<typeof electronAPI>)
@@ -119,7 +126,7 @@ describe('useExternalLink', () => {
 
     it('should combine locale and platform', () => {
       i18n.global.locale.value = 'zh'
-      vi.mocked(isElectron).mockReturnValue(true)
+      mockData.isDesktop = true
       vi.mocked(electronAPI).mockReturnValue({
         getPlatform: () => 'darwin'
       } as ReturnType<typeof electronAPI>)
@@ -136,7 +143,7 @@ describe('useExternalLink', () => {
 
     it('should not add platform when not desktop', () => {
       i18n.global.locale.value = 'en'
-      vi.mocked(isElectron).mockReturnValue(false)
+      mockData.isDesktop = false
 
       const { buildDocsUrl } = useExternalLink()
       const url = buildDocsUrl('/installation/desktop', { platform: true })
diff --git a/src/composables/useExternalLink.ts b/src/composables/useExternalLink.ts
index 75cb074549..8caf621b64 100644
--- a/src/composables/useExternalLink.ts
+++ b/src/composables/useExternalLink.ts
@@ -1,6 +1,7 @@
 import { computed } from 'vue'
 
-import { electronAPI, isElectron } from '@/utils/envUtil'
+import { isDesktop } from '@/platform/distribution/types'
+import { electronAPI } from '@/utils/envUtil'
 import { i18n } from '@/i18n'
 
 /**
@@ -30,7 +31,7 @@ export function useExternalLink() {
   })
 
   const platform = computed(() => {
-    if (!isElectron()) {
+    if (!isDesktop) {
       return null
     }
 
diff --git a/tests-ui/tests/composables/useFeatureFlags.test.ts b/src/composables/useFeatureFlags.test.ts
similarity index 51%
rename from tests-ui/tests/composables/useFeatureFlags.test.ts
rename to src/composables/useFeatureFlags.test.ts
index eddb57b650..0b242d4b79 100644
--- a/tests-ui/tests/composables/useFeatureFlags.test.ts
+++ b/src/composables/useFeatureFlags.test.ts
@@ -1,10 +1,11 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { isReactive, isReadonly } from 'vue'
 
 import {
   ServerFeatureFlag,
   useFeatureFlags
 } from '@/composables/useFeatureFlags'
+import * as distributionTypes from '@/platform/distribution/types'
 import { api } from '@/scripts/api'
 
 // Mock the API module
@@ -14,6 +15,12 @@ vi.mock('@/scripts/api', () => ({
   }
 }))
 
+// Mock the distribution types module
+vi.mock('@/platform/distribution/types', () => ({
+  isCloud: false,
+  isNightly: false
+}))
+
 describe('useFeatureFlags', () => {
   beforeEach(() => {
     vi.clearAllMocks()
@@ -30,8 +37,7 @@ describe('useFeatureFlags', () => {
     it('should access supportsPreviewMetadata', () => {
       vi.mocked(api.getServerFeature).mockImplementation(
         (path, defaultValue) => {
-          if (path === ServerFeatureFlag.SUPPORTS_PREVIEW_METADATA)
-            return true as any
+          if (path === ServerFeatureFlag.SUPPORTS_PREVIEW_METADATA) return true
           return defaultValue
         }
       )
@@ -46,8 +52,7 @@ describe('useFeatureFlags', () => {
     it('should access maxUploadSize', () => {
       vi.mocked(api.getServerFeature).mockImplementation(
         (path, defaultValue) => {
-          if (path === ServerFeatureFlag.MAX_UPLOAD_SIZE)
-            return 209715200 as any // 200MB
+          if (path === ServerFeatureFlag.MAX_UPLOAD_SIZE) return 209715200 // 200MB
           return defaultValue
         }
       )
@@ -62,7 +67,7 @@ describe('useFeatureFlags', () => {
     it('should access supportsManagerV4', () => {
       vi.mocked(api.getServerFeature).mockImplementation(
         (path, defaultValue) => {
-          if (path === ServerFeatureFlag.MANAGER_SUPPORTS_V4) return true as any
+          if (path === ServerFeatureFlag.MANAGER_SUPPORTS_V4) return true
           return defaultValue
         }
       )
@@ -76,7 +81,7 @@ describe('useFeatureFlags', () => {
 
     it('should return undefined when features are not available and no default provided', () => {
       vi.mocked(api.getServerFeature).mockImplementation(
-        (_path, defaultValue) => defaultValue as any
+        (_path, defaultValue) => defaultValue
       )
 
       const { flags } = useFeatureFlags()
@@ -90,7 +95,7 @@ describe('useFeatureFlags', () => {
     it('should create reactive computed for custom feature flags', () => {
       vi.mocked(api.getServerFeature).mockImplementation(
         (path, defaultValue) => {
-          if (path === 'custom.feature') return 'custom-value' as any
+          if (path === 'custom.feature') return 'custom-value'
           return defaultValue
         }
       )
@@ -108,7 +113,7 @@ describe('useFeatureFlags', () => {
     it('should handle nested paths', () => {
       vi.mocked(api.getServerFeature).mockImplementation(
         (path, defaultValue) => {
-          if (path === 'extension.custom.nested.feature') return true as any
+          if (path === 'extension.custom.nested.feature') return true
           return defaultValue
         }
       )
@@ -122,8 +127,7 @@ describe('useFeatureFlags', () => {
     it('should work with ServerFeatureFlag enum', () => {
       vi.mocked(api.getServerFeature).mockImplementation(
         (path, defaultValue) => {
-          if (path === ServerFeatureFlag.MAX_UPLOAD_SIZE)
-            return 104857600 as any
+          if (path === ServerFeatureFlag.MAX_UPLOAD_SIZE) return 104857600
           return defaultValue
         }
       )
@@ -134,4 +138,86 @@ describe('useFeatureFlags', () => {
       expect(maxUploadSize.value).toBe(104857600)
     })
   })
+
+  describe('linearToggleEnabled', () => {
+    it('should return true when isNightly is true', () => {
+      vi.mocked(distributionTypes).isNightly = true
+
+      const { flags } = useFeatureFlags()
+      expect(flags.linearToggleEnabled).toBe(true)
+      expect(api.getServerFeature).not.toHaveBeenCalled()
+    })
+
+    it('should check remote config and server feature when isNightly is false', () => {
+      vi.mocked(distributionTypes).isNightly = false
+      vi.mocked(api.getServerFeature).mockImplementation(
+        (path, defaultValue) => {
+          if (path === ServerFeatureFlag.LINEAR_TOGGLE_ENABLED) return true
+          return defaultValue
+        }
+      )
+
+      const { flags } = useFeatureFlags()
+      expect(flags.linearToggleEnabled).toBe(true)
+      expect(api.getServerFeature).toHaveBeenCalledWith(
+        ServerFeatureFlag.LINEAR_TOGGLE_ENABLED,
+        false
+      )
+    })
+
+    it('should return false when isNightly is false and flag is disabled', () => {
+      vi.mocked(distributionTypes).isNightly = false
+      vi.mocked(api.getServerFeature).mockImplementation(
+        (_path, defaultValue) => defaultValue
+      )
+
+      const { flags } = useFeatureFlags()
+      expect(flags.linearToggleEnabled).toBe(false)
+    })
+  })
+
+  describe('dev override via localStorage', () => {
+    afterEach(() => {
+      localStorage.clear()
+    })
+
+    it('resolveFlag returns localStorage override over remoteConfig and server value', () => {
+      vi.mocked(api.getServerFeature).mockReturnValue(false)
+      localStorage.setItem('ff:model_upload_button_enabled', 'true')
+
+      const { flags } = useFeatureFlags()
+      expect(flags.modelUploadButtonEnabled).toBe(true)
+    })
+
+    it('resolveFlag falls through to server when no override is set', () => {
+      vi.mocked(api.getServerFeature).mockImplementation(
+        (path, defaultValue) => {
+          if (path === ServerFeatureFlag.ASSET_RENAME_ENABLED) return true
+          return defaultValue
+        }
+      )
+
+      const { flags } = useFeatureFlags()
+      expect(flags.assetRenameEnabled).toBe(true)
+    })
+
+    it('direct server flags delegate override to api.getServerFeature', () => {
+      vi.mocked(api.getServerFeature).mockImplementation((path) => {
+        if (path === ServerFeatureFlag.SUPPORTS_PREVIEW_METADATA)
+          return 'overridden'
+        return undefined
+      })
+
+      const { flags } = useFeatureFlags()
+      expect(flags.supportsPreviewMetadata).toBe('overridden')
+    })
+
+    it('teamWorkspacesEnabled override bypasses isCloud and isAuthenticatedConfigLoaded guards', () => {
+      vi.mocked(distributionTypes).isCloud = false
+      localStorage.setItem('ff:team_workspaces_enabled', 'true')
+
+      const { flags } = useFeatureFlags()
+      expect(flags.teamWorkspacesEnabled).toBe(true)
+    })
+  })
 })
diff --git a/src/composables/useFeatureFlags.ts b/src/composables/useFeatureFlags.ts
index 697818c4e3..601cf5cc63 100644
--- a/src/composables/useFeatureFlags.ts
+++ b/src/composables/useFeatureFlags.ts
@@ -1,7 +1,12 @@
 import { computed, reactive, readonly } from 'vue'
 
-import { remoteConfig } from '@/platform/remoteConfig/remoteConfig'
+import { isCloud, isNightly } from '@/platform/distribution/types'
+import {
+  isAuthenticatedConfigLoaded,
+  remoteConfig
+} from '@/platform/remoteConfig/remoteConfig'
 import { api } from '@/scripts/api'
+import { getDevOverride } from '@/utils/devFeatureFlagOverride'
 
 /**
  * Known server feature flags (top-level, not extensions)
@@ -11,10 +16,30 @@ export enum ServerFeatureFlag {
   MAX_UPLOAD_SIZE = 'max_upload_size',
   MANAGER_SUPPORTS_V4 = 'extension.manager.supports_v4',
   MODEL_UPLOAD_BUTTON_ENABLED = 'model_upload_button_enabled',
-  ASSET_UPDATE_OPTIONS_ENABLED = 'asset_update_options_enabled',
+  ASSET_RENAME_ENABLED = 'asset_rename_enabled',
   PRIVATE_MODELS_ENABLED = 'private_models_enabled',
   ONBOARDING_SURVEY_ENABLED = 'onboarding_survey_enabled',
-  HUGGINGFACE_MODEL_IMPORT_ENABLED = 'huggingface_model_import_enabled'
+  LINEAR_TOGGLE_ENABLED = 'linear_toggle_enabled',
+  TEAM_WORKSPACES_ENABLED = 'team_workspaces_enabled',
+  USER_SECRETS_ENABLED = 'user_secrets_enabled',
+  NODE_REPLACEMENTS = 'node_replacements',
+  NODE_LIBRARY_ESSENTIALS_ENABLED = 'node_library_essentials_enabled',
+  WORKFLOW_SHARING_ENABLED = 'workflow_sharing_enabled',
+  COMFYHUB_UPLOAD_ENABLED = 'comfyhub_upload_enabled',
+  COMFYHUB_PROFILE_GATE_ENABLED = 'comfyhub_profile_gate_enabled'
+}
+
+/**
+ * Resolves a feature flag value with dev override > remoteConfig > serverFeature priority.
+ */
+function resolveFlag<T>(
+  flagKey: string,
+  remoteConfigValue: T | undefined,
+  defaultValue: T
+): T {
+  const override = getDevOverride<T>(flagKey)
+  if (override !== undefined) return override
+  return remoteConfigValue ?? api.getServerFeature(flagKey, defaultValue)
 }
 
 /**
@@ -32,47 +57,105 @@ export function useFeatureFlags() {
       return api.getServerFeature(ServerFeatureFlag.MANAGER_SUPPORTS_V4)
     },
     get modelUploadButtonEnabled() {
-      // Check remote config first (from /api/features), fall back to websocket feature flags
-      return (
-        remoteConfig.value.model_upload_button_enabled ??
-        api.getServerFeature(
-          ServerFeatureFlag.MODEL_UPLOAD_BUTTON_ENABLED,
-          false
-        )
+      return resolveFlag(
+        ServerFeatureFlag.MODEL_UPLOAD_BUTTON_ENABLED,
+        remoteConfig.value.model_upload_button_enabled,
+        false
       )
     },
-    get assetUpdateOptionsEnabled() {
-      // Check remote config first (from /api/features), fall back to websocket feature flags
-      return (
-        remoteConfig.value.asset_update_options_enabled ??
-        api.getServerFeature(
-          ServerFeatureFlag.ASSET_UPDATE_OPTIONS_ENABLED,
-          false
-        )
+    get assetRenameEnabled() {
+      return resolveFlag(
+        ServerFeatureFlag.ASSET_RENAME_ENABLED,
+        remoteConfig.value.asset_rename_enabled,
+        false
       )
     },
     get privateModelsEnabled() {
-      // Check remote config first (from /api/features), fall back to websocket feature flags
-      return (
-        remoteConfig.value.private_models_enabled ??
-        api.getServerFeature(ServerFeatureFlag.PRIVATE_MODELS_ENABLED, false)
+      return resolveFlag(
+        ServerFeatureFlag.PRIVATE_MODELS_ENABLED,
+        remoteConfig.value.private_models_enabled,
+        false
       )
     },
     get onboardingSurveyEnabled() {
-      return (
-        remoteConfig.value.onboarding_survey_enabled ??
-        api.getServerFeature(ServerFeatureFlag.ONBOARDING_SURVEY_ENABLED, true)
+      return resolveFlag(
+        ServerFeatureFlag.ONBOARDING_SURVEY_ENABLED,
+        remoteConfig.value.onboarding_survey_enabled,
+        false
       )
     },
-    get huggingfaceModelImportEnabled() {
-      // Check remote config first (from /api/features), fall back to websocket feature flags
+    get linearToggleEnabled() {
+      if (isNightly) return true
+
+      return resolveFlag(
+        ServerFeatureFlag.LINEAR_TOGGLE_ENABLED,
+        remoteConfig.value.linear_toggle_enabled,
+        false
+      )
+    },
+    /**
+     * Whether team workspaces feature is enabled.
+     * IMPORTANT: Returns false until authenticated remote config is loaded.
+     * This ensures we never use workspace tokens when the feature is disabled,
+     * and prevents race conditions during initialization.
+     */
+    get teamWorkspacesEnabled() {
+      const override = getDevOverride<boolean>(
+        ServerFeatureFlag.TEAM_WORKSPACES_ENABLED
+      )
+      if (override !== undefined) return override
+
+      if (!isCloud) return false
+      if (!isAuthenticatedConfigLoaded.value) return false
+
       return (
-        remoteConfig.value.huggingface_model_import_enabled ??
+        remoteConfig.value.team_workspaces_enabled ??
+        api.getServerFeature(ServerFeatureFlag.TEAM_WORKSPACES_ENABLED, false)
+      )
+    },
+    get userSecretsEnabled() {
+      return resolveFlag(
+        ServerFeatureFlag.USER_SECRETS_ENABLED,
+        remoteConfig.value.user_secrets_enabled,
+        false
+      )
+    },
+    get nodeReplacementsEnabled() {
+      return api.getServerFeature(ServerFeatureFlag.NODE_REPLACEMENTS, false)
+    },
+    get nodeLibraryEssentialsEnabled() {
+      if (isNightly || import.meta.env.DEV) return true
+
+      return (
+        remoteConfig.value.node_library_essentials_enabled ??
         api.getServerFeature(
-          ServerFeatureFlag.HUGGINGFACE_MODEL_IMPORT_ENABLED,
+          ServerFeatureFlag.NODE_LIBRARY_ESSENTIALS_ENABLED,
           false
         )
       )
+    },
+    get workflowSharingEnabled() {
+      // UI is also gated on `isCloud` in TopMenuSection; default false
+      // to match other flags' opt-in convention.
+      return resolveFlag(
+        ServerFeatureFlag.WORKFLOW_SHARING_ENABLED,
+        remoteConfig.value.workflow_sharing_enabled,
+        false
+      )
+    },
+    get comfyHubUploadEnabled() {
+      return resolveFlag(
+        ServerFeatureFlag.COMFYHUB_UPLOAD_ENABLED,
+        remoteConfig.value.comfyhub_upload_enabled,
+        false
+      )
+    },
+    get comfyHubProfileGateEnabled() {
+      return resolveFlag(
+        ServerFeatureFlag.COMFYHUB_PROFILE_GATE_ENABLED,
+        remoteConfig.value.comfyhub_profile_gate_enabled,
+        false
+      )
     }
   })
 
diff --git a/src/composables/useHelpCenter.ts b/src/composables/useHelpCenter.ts
new file mode 100644
index 0000000000..20a08b9faa
--- /dev/null
+++ b/src/composables/useHelpCenter.ts
@@ -0,0 +1,100 @@
+import { storeToRefs } from 'pinia'
+import { computed, onMounted } from 'vue'
+
+import { useSettingStore } from '@/platform/settings/settingStore'
+import { useTelemetry } from '@/platform/telemetry'
+import { useReleaseStore } from '@/platform/updates/common/releaseStore'
+import { useHelpCenterStore } from '@/stores/helpCenterStore'
+import type { HelpCenterTriggerLocation } from '@/stores/helpCenterStore'
+import { useConflictAcknowledgment } from '@/workbench/extensions/manager/composables/useConflictAcknowledgment'
+import { useConflictDetection } from '@/workbench/extensions/manager/composables/useConflictDetection'
+import { useNodeConflictDialog } from '@/workbench/extensions/manager/composables/useNodeConflictDialog'
+
+export function useHelpCenter(
+  triggerFrom: HelpCenterTriggerLocation = 'sidebar'
+) {
+  const settingStore = useSettingStore()
+  const releaseStore = useReleaseStore()
+  const helpCenterStore = useHelpCenterStore()
+  const { isVisible: isHelpCenterVisible, triggerLocation } =
+    storeToRefs(helpCenterStore)
+  const { shouldShowRedDot: showReleaseRedDot } = storeToRefs(releaseStore)
+
+  const conflictDetection = useConflictDetection()
+  const { show: showNodeConflictDialog } = useNodeConflictDialog()
+
+  // Use conflict acknowledgment state from composable - call only once
+  const { shouldShowRedDot: shouldShowConflictRedDot, markConflictsAsSeen } =
+    useConflictAcknowledgment()
+
+  // Use either release red dot or conflict red dot
+  const shouldShowRedDot = computed((): boolean => {
+    const releaseRedDot = showReleaseRedDot.value
+    return releaseRedDot || shouldShowConflictRedDot.value
+  })
+
+  const sidebarLocation = computed(() =>
+    settingStore.get('Comfy.Sidebar.Location')
+  )
+
+  /**
+   * Toggle Help Center and track UI button click.
+   */
+  const toggleHelpCenter = () => {
+    useTelemetry()?.trackUiButtonClicked({
+      button_id: `${triggerFrom}_help_center_toggled`
+    })
+    helpCenterStore.toggle(triggerFrom)
+  }
+
+  const closeHelpCenter = () => {
+    helpCenterStore.hide()
+  }
+
+  /**
+   * Handle What's New popup dismissal
+   * Check if conflict modal should be shown after ComfyUI update
+   */
+  const handleWhatsNewDismissed = async () => {
+    try {
+      // Check if conflict modal should be shown after update
+      const shouldShow =
+        await conflictDetection.shouldShowConflictModalAfterUpdate()
+      if (shouldShow) {
+        showConflictModal()
+      }
+    } catch (error) {
+      console.error('[HelpCenter] Error checking conflict modal:', error)
+    }
+  }
+
+  /**
+   * Show the node conflict dialog with current conflict data
+   */
+  const showConflictModal = () => {
+    void showNodeConflictDialog({
+      showAfterWhatsNew: true,
+      dialogComponentProps: {
+        onClose: () => {
+          markConflictsAsSeen()
+        }
+      }
+    })
+  }
+
+  // Initialize release store on mount
+  onMounted(async () => {
+    // Initialize release store to fetch releases for toast and popup
+    await releaseStore.initialize()
+  })
+
+  return {
+    isHelpCenterVisible,
+    triggerLocation,
+    shouldShowRedDot,
+    sidebarLocation,
+    toggleHelpCenter,
+    closeHelpCenter,
+    handleWhatsNewDismissed
+  }
+}
diff --git a/src/composables/useImageCrop.ts b/src/composables/useImageCrop.ts
new file mode 100644
index 0000000000..dd88d6de45
--- /dev/null
+++ b/src/composables/useImageCrop.ts
@@ -0,0 +1,608 @@
+import { useResizeObserver } from '@vueuse/core'
+import type { Ref } from 'vue'
+import { computed, onMounted, ref, watch } from 'vue'
+
+import type { LGraphNode, NodeId } from '@/lib/litegraph/src/LGraphNode'
+import type { Bounds } from '@/renderer/core/layout/types'
+import { app } from '@/scripts/app'
+import { useNodeOutputStore } from '@/stores/nodeOutputStore'
+
+type ResizeDirection =
+  | 'top'
+  | 'bottom'
+  | 'left'
+  | 'right'
+  | 'nw'
+  | 'ne'
+  | 'sw'
+  | 'se'
+
+const HANDLE_SIZE = 8
+const CORNER_SIZE = 10
+const MIN_CROP_SIZE = 16
+const CROP_BOX_BORDER = 2
+
+export const ASPECT_RATIOS = {
+  '1:1': 1,
+  '3:4': 3 / 4,
+  '4:3': 4 / 3,
+  '16:9': 16 / 9,
+  '9:16': 9 / 16,
+  custom: null
+} as const
+
+interface UseImageCropOptions {
+  imageEl: Ref<HTMLImageElement | null>
+  containerEl: Ref<HTMLDivElement | null>
+  modelValue: Ref<Bounds>
+}
+
+export function useImageCrop(nodeId: NodeId, options: UseImageCropOptions) {
+  const { imageEl, containerEl, modelValue } = options
+  const nodeOutputStore = useNodeOutputStore()
+
+  const node = ref<LGraphNode | null>(null)
+
+  const imageUrl = ref<string | null>(null)
+  const isLoading = ref(false)
+
+  const naturalWidth = ref(0)
+  const naturalHeight = ref(0)
+  const displayedWidth = ref(0)
+  const displayedHeight = ref(0)
+  const scaleFactor = ref(1)
+  const imageOffsetX = ref(0)
+  const imageOffsetY = ref(0)
+
+  const cropX = computed({
+    get: () => modelValue.value.x,
+    set: (v: number) => {
+      modelValue.value.x = v
+    }
+  })
+
+  const cropY = computed({
+    get: () => modelValue.value.y,
+    set: (v: number) => {
+      modelValue.value.y = v
+    }
+  })
+
+  const cropWidth = computed({
+    get: () => modelValue.value.width || 512,
+    set: (v: number) => {
+      modelValue.value.width = v
+    }
+  })
+
+  const cropHeight = computed({
+    get: () => modelValue.value.height || 512,
+    set: (v: number) => {
+      modelValue.value.height = v
+    }
+  })
+
+  const isDragging = ref(false)
+  const dragStartX = ref(0)
+  const dragStartY = ref(0)
+  const dragStartCropX = ref(0)
+  const dragStartCropY = ref(0)
+
+  const isResizing = ref(false)
+  const resizeDirection = ref<ResizeDirection | null>(null)
+  const resizeStartX = ref(0)
+  const resizeStartY = ref(0)
+  const resizeStartCropX = ref(0)
+  const resizeStartCropY = ref(0)
+  const resizeStartCropWidth = ref(0)
+  const resizeStartCropHeight = ref(0)
+
+  const lockedRatio = ref<number | null>(null)
+
+  const selectedRatio = computed({
+    get: () => {
+      if (lockedRatio.value == null) return 'custom'
+      const entry = Object.entries(ASPECT_RATIOS).find(
+        ([, v]) => v === lockedRatio.value
+      )
+      return entry ? entry[0] : 'custom'
+    },
+    set: (key: string) => {
+      if (key === 'custom') {
+        lockedRatio.value = null
+        return
+      }
+      lockedRatio.value =
+        ASPECT_RATIOS[key as keyof typeof ASPECT_RATIOS] ?? null
+      applyLockedRatio()
+    }
+  })
+
+  const isLockEnabled = computed({
+    get: () => lockedRatio.value != null,
+    set: (locked: boolean) => {
+      if (locked && lockedRatio.value == null) {
+        lockedRatio.value = cropWidth.value / cropHeight.value
+      }
+      if (!locked) {
+        lockedRatio.value = null
+      }
+    }
+  })
+
+  function applyLockedRatio() {
+    if (lockedRatio.value == null) return
+
+    const ratio = lockedRatio.value
+    const w = cropWidth.value
+    let newHeight = Math.round(w / ratio)
+
+    if (cropY.value + newHeight > naturalHeight.value) {
+      newHeight = naturalHeight.value - cropY.value
+      const newWidth = Math.round(newHeight * ratio)
+      cropWidth.value = Math.max(MIN_CROP_SIZE, newWidth)
+    }
+
+    cropHeight.value = Math.max(MIN_CROP_SIZE, newHeight)
+  }
+
+  useResizeObserver(containerEl, () => {
+    if (imageEl.value && imageUrl.value) {
+      updateDisplayedDimensions()
+    }
+  })
+
+  const getInputImageUrl = (): string | null => {
+    if (!node.value) return null
+
+    let sourceNode = node.value.getInputNode(0)
+    if (!sourceNode) return null
+
+    if (sourceNode.isSubgraphNode()) {
+      const link = node.value.getInputLink(0)
+      if (!link) return null
+      const resolved = sourceNode.resolveSubgraphOutputLink(link.origin_slot)
+      sourceNode = resolved?.outputNode ?? null
+      if (!sourceNode) return null
+    }
+
+    const urls = nodeOutputStore.getNodeImageUrls(sourceNode)
+
+    if (urls?.length) {
+      return urls[0]
+    }
+
+    return null
+  }
+
+  const updateImageUrl = () => {
+    imageUrl.value = getInputImageUrl()
+  }
+
+  const updateDisplayedDimensions = () => {
+    if (!imageEl.value || !containerEl.value) return
+
+    const img = imageEl.value
+    const container = containerEl.value
+
+    naturalWidth.value = img.naturalWidth
+    naturalHeight.value = img.naturalHeight
+
+    if (naturalWidth.value <= 0 || naturalHeight.value <= 0) {
+      scaleFactor.value = 1
+      return
+    }
+
+    const containerWidth = container.clientWidth
+    const containerHeight = container.clientHeight
+
+    const imageAspect = naturalWidth.value / naturalHeight.value
+    const containerAspect = containerWidth / containerHeight
+
+    if (imageAspect > containerAspect) {
+      displayedWidth.value = containerWidth
+      displayedHeight.value = containerWidth / imageAspect
+      imageOffsetX.value = 0
+      imageOffsetY.value = (containerHeight - displayedHeight.value) / 2
+    } else {
+      displayedHeight.value = containerHeight
+      displayedWidth.value = containerHeight * imageAspect
+      imageOffsetX.value = (containerWidth - displayedWidth.value) / 2
+      imageOffsetY.value = 0
+    }
+
+    if (naturalWidth.value <= 0 || displayedWidth.value <= 0) {
+      scaleFactor.value = 1
+    } else {
+      scaleFactor.value = displayedWidth.value / naturalWidth.value
+    }
+  }
+
+  const getEffectiveScale = (): number => {
+    const container = containerEl.value
+
+    if (!container || naturalWidth.value <= 0 || displayedWidth.value <= 0) {
+      return 1
+    }
+
+    const rect = container.getBoundingClientRect()
+    const clientWidth = container.clientWidth
+
+    if (!clientWidth || !rect.width) return 1
+
+    const renderedDisplayedWidth =
+      (displayedWidth.value / clientWidth) * rect.width
+
+    return renderedDisplayedWidth / naturalWidth.value
+  }
+
+  const cropBoxStyle = computed(() => ({
+    left: `${imageOffsetX.value + cropX.value * scaleFactor.value - CROP_BOX_BORDER}px`,
+    top: `${imageOffsetY.value + cropY.value * scaleFactor.value - CROP_BOX_BORDER}px`,
+    width: `${cropWidth.value * scaleFactor.value}px`,
+    height: `${cropHeight.value * scaleFactor.value}px`
+  }))
+
+  interface ResizeHandle {
+    direction: ResizeDirection
+    class: string
+    style: {
+      left: string
+      top: string
+      width?: string
+      height?: string
+    }
+  }
+
+  const CORNER_DIRECTIONS = new Set<ResizeDirection>(['nw', 'ne', 'sw', 'se'])
+
+  const allResizeHandles = computed<ResizeHandle[]>(() => {
+    const x = imageOffsetX.value + cropX.value * scaleFactor.value
+    const y = imageOffsetY.value + cropY.value * scaleFactor.value
+    const w = cropWidth.value * scaleFactor.value
+    const h = cropHeight.value * scaleFactor.value
+
+    return [
+      {
+        direction: 'top',
+        class: 'h-2 cursor-ns-resize',
+        style: {
+          left: `${x + HANDLE_SIZE}px`,
+          top: `${y - HANDLE_SIZE / 2}px`,
+          width: `${Math.max(0, w - HANDLE_SIZE * 2)}px`
+        }
+      },
+      {
+        direction: 'bottom',
+        class: 'h-2 cursor-ns-resize',
+        style: {
+          left: `${x + HANDLE_SIZE}px`,
+          top: `${y + h - HANDLE_SIZE / 2}px`,
+          width: `${Math.max(0, w - HANDLE_SIZE * 2)}px`
+        }
+      },
+      {
+        direction: 'left',
+        class: 'w-2 cursor-ew-resize',
+        style: {
+          left: `${x - HANDLE_SIZE / 2}px`,
+          top: `${y + HANDLE_SIZE}px`,
+          height: `${Math.max(0, h - HANDLE_SIZE * 2)}px`
+        }
+      },
+      {
+        direction: 'right',
+        class: 'w-2 cursor-ew-resize',
+        style: {
+          left: `${x + w - HANDLE_SIZE / 2}px`,
+          top: `${y + HANDLE_SIZE}px`,
+          height: `${Math.max(0, h - HANDLE_SIZE * 2)}px`
+        }
+      },
+      {
+        direction: 'nw',
+        class: 'cursor-nwse-resize rounded-sm bg-white/80',
+        style: {
+          left: `${x - CORNER_SIZE / 2}px`,
+          top: `${y - CORNER_SIZE / 2}px`,
+          width: `${CORNER_SIZE}px`,
+          height: `${CORNER_SIZE}px`
+        }
+      },
+      {
+        direction: 'ne',
+        class: 'cursor-nesw-resize rounded-sm bg-white/80',
+        style: {
+          left: `${x + w - CORNER_SIZE / 2}px`,
+          top: `${y - CORNER_SIZE / 2}px`,
+          width: `${CORNER_SIZE}px`,
+          height: `${CORNER_SIZE}px`
+        }
+      },
+      {
+        direction: 'sw',
+        class: 'cursor-nesw-resize rounded-sm bg-white/80',
+        style: {
+          left: `${x - CORNER_SIZE / 2}px`,
+          top: `${y + h - CORNER_SIZE / 2}px`,
+          width: `${CORNER_SIZE}px`,
+          height: `${CORNER_SIZE}px`
+        }
+      },
+      {
+        direction: 'se',
+        class: 'cursor-nwse-resize rounded-sm bg-white/80',
+        style: {
+          left: `${x + w - CORNER_SIZE / 2}px`,
+          top: `${y + h - CORNER_SIZE / 2}px`,
+          width: `${CORNER_SIZE}px`,
+          height: `${CORNER_SIZE}px`
+        }
+      }
+    ]
+  })
+
+  const resizeHandles = computed<ResizeHandle[]>(() => {
+    if (!isLockEnabled.value) return allResizeHandles.value
+    return allResizeHandles.value.filter((h) =>
+      CORNER_DIRECTIONS.has(h.direction)
+    )
+  })
+
+  const handleImageLoad = () => {
+    isLoading.value = false
+    updateDisplayedDimensions()
+  }
+
+  const handleImageError = () => {
+    isLoading.value = false
+    imageUrl.value = null
+  }
+
+  const capturePointer = (e: PointerEvent) =>
+    (e.target as HTMLElement).setPointerCapture(e.pointerId)
+
+  const releasePointer = (e: PointerEvent) =>
+    (e.target as HTMLElement).releasePointerCapture(e.pointerId)
+
+  const handleDragStart = (e: PointerEvent) => {
+    if (!imageUrl.value) return
+
+    isDragging.value = true
+    dragStartX.value = e.clientX
+    dragStartY.value = e.clientY
+    dragStartCropX.value = cropX.value
+    dragStartCropY.value = cropY.value
+    capturePointer(e)
+  }
+
+  const handleDragMove = (e: PointerEvent) => {
+    if (!isDragging.value) return
+
+    const effectiveScale = getEffectiveScale()
+    if (effectiveScale === 0) return
+
+    const deltaX = (e.clientX - dragStartX.value) / effectiveScale
+    const deltaY = (e.clientY - dragStartY.value) / effectiveScale
+
+    const maxX = naturalWidth.value - cropWidth.value
+    const maxY = naturalHeight.value - cropHeight.value
+
+    cropX.value = Math.round(
+      Math.max(0, Math.min(maxX, dragStartCropX.value + deltaX))
+    )
+    cropY.value = Math.round(
+      Math.max(0, Math.min(maxY, dragStartCropY.value + deltaY))
+    )
+  }
+
+  const handleDragEnd = (e: PointerEvent) => {
+    if (!isDragging.value) return
+
+    isDragging.value = false
+    releasePointer(e)
+  }
+
+  const handleResizeStart = (e: PointerEvent, direction: ResizeDirection) => {
+    if (!imageUrl.value) return
+
+    e.stopPropagation()
+    isResizing.value = true
+    resizeDirection.value = direction
+
+    resizeStartX.value = e.clientX
+    resizeStartY.value = e.clientY
+    resizeStartCropX.value = cropX.value
+    resizeStartCropY.value = cropY.value
+    resizeStartCropWidth.value = cropWidth.value
+    resizeStartCropHeight.value = cropHeight.value
+    capturePointer(e)
+  }
+
+  const handleResizeMove = (e: PointerEvent) => {
+    if (!isResizing.value || !resizeDirection.value) return
+
+    const effectiveScale = getEffectiveScale()
+    if (effectiveScale === 0) return
+
+    const dir = resizeDirection.value
+    const deltaX = (e.clientX - resizeStartX.value) / effectiveScale
+    const deltaY = (e.clientY - resizeStartY.value) / effectiveScale
+
+    const ratioValue = isLockEnabled.value ? lockedRatio.value : null
+
+    if (ratioValue != null && CORNER_DIRECTIONS.has(dir)) {
+      handleConstrainedResize(dir, deltaX, deltaY, ratioValue)
+      return
+    }
+
+    const affectsLeft = dir === 'left' || dir === 'nw' || dir === 'sw'
+    const affectsRight = dir === 'right' || dir === 'ne' || dir === 'se'
+    const affectsTop = dir === 'top' || dir === 'nw' || dir === 'ne'
+    const affectsBottom = dir === 'bottom' || dir === 'sw' || dir === 'se'
+
+    let newX = resizeStartCropX.value
+    let newY = resizeStartCropY.value
+    let newWidth = resizeStartCropWidth.value
+    let newHeight = resizeStartCropHeight.value
+
+    if (affectsLeft) {
+      const maxDeltaX = resizeStartCropWidth.value - MIN_CROP_SIZE
+      const minDeltaX = -resizeStartCropX.value
+      const clampedDeltaX = Math.max(minDeltaX, Math.min(maxDeltaX, deltaX))
+      newX = resizeStartCropX.value + clampedDeltaX
+      newWidth = resizeStartCropWidth.value - clampedDeltaX
+    } else if (affectsRight) {
+      const maxWidth = naturalWidth.value - resizeStartCropX.value
+      newWidth = Math.max(
+        MIN_CROP_SIZE,
+        Math.min(maxWidth, resizeStartCropWidth.value + deltaX)
+      )
+    }
+
+    if (affectsTop) {
+      const maxDeltaY = resizeStartCropHeight.value - MIN_CROP_SIZE
+      const minDeltaY = -resizeStartCropY.value
+      const clampedDeltaY = Math.max(minDeltaY, Math.min(maxDeltaY, deltaY))
+      newY = resizeStartCropY.value + clampedDeltaY
+      newHeight = resizeStartCropHeight.value - clampedDeltaY
+    } else if (affectsBottom) {
+      const maxHeight = naturalHeight.value - resizeStartCropY.value
+      newHeight = Math.max(
+        MIN_CROP_SIZE,
+        Math.min(maxHeight, resizeStartCropHeight.value + deltaY)
+      )
+    }
+
+    if (affectsLeft || affectsRight) {
+      cropX.value = Math.round(newX)
+      cropWidth.value = Math.round(newWidth)
+    }
+    if (affectsTop || affectsBottom) {
+      cropY.value = Math.round(newY)
+      cropHeight.value = Math.round(newHeight)
+    }
+  }
+
+  function handleConstrainedResize(
+    dir: ResizeDirection,
+    deltaX: number,
+    deltaY: number,
+    ratio: number
+  ) {
+    const affectsLeft = dir === 'nw' || dir === 'sw'
+    const affectsTop = dir === 'nw' || dir === 'ne'
+
+    const sx = affectsLeft ? -1 : 1
+    const sy = affectsTop ? -1 : 1
+
+    const invRatio = 1 / ratio
+    const dot = deltaX * sx + deltaY * sy * invRatio
+    const lenSq = 1 + invRatio * invRatio
+    const widthDelta = dot / lenSq
+
+    let newWidth = Math.round(resizeStartCropWidth.value + widthDelta)
+    let newHeight = Math.round(newWidth / ratio)
+
+    if (newWidth < MIN_CROP_SIZE) {
+      newWidth = MIN_CROP_SIZE
+      newHeight = Math.round(newWidth / ratio)
+    }
+    if (newHeight < MIN_CROP_SIZE) {
+      newHeight = MIN_CROP_SIZE
+      newWidth = Math.round(newHeight * ratio)
+    }
+
+    let newX = resizeStartCropX.value
+    let newY = resizeStartCropY.value
+
+    if (affectsLeft) {
+      newX = resizeStartCropX.value + resizeStartCropWidth.value - newWidth
+    }
+    if (affectsTop) {
+      newY = resizeStartCropY.value + resizeStartCropHeight.value - newHeight
+    }
+
+    if (newX < 0) {
+      newWidth += newX
+      newX = 0
+      newHeight = Math.round(newWidth / ratio)
+    }
+    if (newY < 0) {
+      newHeight += newY
+      newY = 0
+      newWidth = Math.round(newHeight * ratio)
+    }
+    if (newX + newWidth > naturalWidth.value) {
+      newWidth = naturalWidth.value - newX
+      newHeight = Math.round(newWidth / ratio)
+    }
+    if (newY + newHeight > naturalHeight.value) {
+      newHeight = naturalHeight.value - newY
+      newWidth = Math.round(newHeight * ratio)
+    }
+
+    cropX.value = Math.round(newX)
+    cropY.value = Math.round(newY)
+    cropWidth.value = Math.max(MIN_CROP_SIZE, newWidth)
+    cropHeight.value = Math.max(MIN_CROP_SIZE, newHeight)
+  }
+
+  const handleResizeEnd = (e: PointerEvent) => {
+    if (!isResizing.value) return
+
+    isResizing.value = false
+    resizeDirection.value = null
+    releasePointer(e)
+  }
+
+  const initialize = () => {
+    if (nodeId != null) {
+      node.value =
+        app.canvas?.graph?.getNodeById(nodeId) ||
+        app.rootGraph?.getNodeById(nodeId) ||
+        null
+    }
+
+    updateImageUrl()
+  }
+
+  watch(
+    () => nodeOutputStore.nodeOutputs,
+    () => updateImageUrl(),
+    { deep: true }
+  )
+
+  watch(
+    () => nodeOutputStore.nodePreviewImages,
+    () => updateImageUrl(),
+    { deep: true }
+  )
+
+  onMounted(initialize)
+
+  return {
+    imageUrl,
+    isLoading,
+
+    cropX,
+    cropY,
+    cropWidth,
+    cropHeight,
+
+    selectedRatio,
+    isLockEnabled,
+
+    cropBoxStyle,
+    resizeHandles,
+
+    handleImageLoad,
+    handleImageError,
+    handleDragStart,
+    handleDragMove,
+    handleDragEnd,
+    handleResizeStart,
+    handleResizeMove,
+    handleResizeEnd
+  }
+}
diff --git a/tests-ui/tests/composables/useLoad3d.test.ts b/src/composables/useLoad3d.test.ts
similarity index 84%
rename from tests-ui/tests/composables/useLoad3d.test.ts
rename to src/composables/useLoad3d.test.ts
index b5e1251c27..dafc199312 100644
--- a/tests-ui/tests/composables/useLoad3d.test.ts
+++ b/src/composables/useLoad3d.test.ts
@@ -1,11 +1,19 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { nextTick, ref } from 'vue'
+import { nextTick, ref, shallowRef } from 'vue'
 
 import { nodeToLoad3dMap, useLoad3d } from '@/composables/useLoad3d'
 import Load3d from '@/extensions/core/load3d/Load3d'
 import Load3dUtils from '@/extensions/core/load3d/Load3dUtils'
+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 { useToastStore } from '@/platform/updates/common/toastStore'
 import { api } from '@/scripts/api'
+import {
+  createMockCanvasPointerEvent,
+  createMockLGraphNode
+} from '@/utils/__tests__/litegraphTestUtils'
 
 vi.mock('@/extensions/core/load3d/Load3d', () => ({
   default: vi.fn()
@@ -36,15 +44,15 @@ vi.mock('@/i18n', () => ({
 }))
 
 describe('useLoad3d', () => {
-  let mockLoad3d: any
-  let mockNode: any
-  let mockToastStore: any
+  let mockLoad3d: Partial<Load3d>
+  let mockNode: LGraphNode
+  let mockToastStore: ReturnType<typeof useToastStore>
 
   beforeEach(() => {
     vi.clearAllMocks()
     nodeToLoad3dMap.clear()
 
-    mockNode = {
+    mockNode = createMockLGraphNode({
       properties: {
         'Scene Config': {
           showGrid: true,
@@ -54,7 +62,8 @@ describe('useLoad3d', () => {
         },
         'Model Config': {
           upDirection: 'original',
-          materialMode: 'original'
+          materialMode: 'original',
+          showSkeleton: false
         },
         'Camera Config': {
           cameraType: 'perspective',
@@ -67,18 +76,21 @@ describe('useLoad3d', () => {
         'Resource Folder': ''
       },
       widgets: [
-        { name: 'width', value: 512 },
-        { name: 'height', value: 512 }
+        { name: 'width', value: 512, type: 'number' } as IWidget,
+        { name: 'height', value: 512, type: 'number' } as IWidget
       ],
       graph: {
         setDirtyCanvas: vi.fn()
-      },
+      } as Partial<LGraph> as LGraph,
       flags: {},
-      onMouseEnter: null,
-      onMouseLeave: null,
-      onResize: null,
-      onDrawBackground: null
-    }
+      onMouseEnter: undefined,
+      onMouseLeave: undefined,
+      onResize: undefined,
+      onDrawBackground: undefined
+    })
+
+    const mockCanvas = document.createElement('canvas')
+    mockCanvas.hidden = false
 
     mockLoad3d = {
       toggleGrid: vi.fn(),
@@ -107,23 +119,26 @@ describe('useLoad3d', () => {
       exportModel: vi.fn().mockResolvedValue(undefined),
       isSplatModel: vi.fn().mockReturnValue(false),
       isPlyModel: vi.fn().mockReturnValue(false),
+      hasSkeleton: vi.fn().mockReturnValue(false),
+      setShowSkeleton: vi.fn(),
       addEventListener: vi.fn(),
       removeEventListener: vi.fn(),
       remove: vi.fn(),
       renderer: {
-        domElement: {
-          hidden: false
-        }
-      }
+        domElement: mockCanvas
+      } as Partial<Load3d['renderer']> as Load3d['renderer']
     }
 
-    vi.mocked(Load3d).mockImplementation(function () {
+    vi.mocked(Load3d).mockImplementation(function (this: Load3d) {
       Object.assign(this, mockLoad3d)
+      return this
     })
 
     mockToastStore = {
       addAlert: vi.fn()
-    }
+    } as Partial<ReturnType<typeof useToastStore>> as ReturnType<
+      typeof useToastStore
+    >
     vi.mocked(useToastStore).mockReturnValue(mockToastStore)
   })
 
@@ -143,7 +158,8 @@ describe('useLoad3d', () => {
       })
       expect(composable.modelConfig.value).toEqual({
         upDirection: 'original',
-        materialMode: 'original'
+        materialMode: 'original',
+        showSkeleton: false
       })
       expect(composable.cameraConfig.value).toEqual({
         cameraType: 'perspective',
@@ -204,14 +220,14 @@ describe('useLoad3d', () => {
       expect(mockNode.onDrawBackground).toBeDefined()
 
       // Test the handlers
-      mockNode.onMouseEnter()
+      mockNode.onMouseEnter?.(createMockCanvasPointerEvent(0, 0))
       expect(mockLoad3d.refreshViewport).toHaveBeenCalled()
       expect(mockLoad3d.updateStatusMouseOnNode).toHaveBeenCalledWith(true)
 
-      mockNode.onMouseLeave()
+      mockNode.onMouseLeave?.(createMockCanvasPointerEvent(0, 0))
       expect(mockLoad3d.updateStatusMouseOnNode).toHaveBeenCalledWith(false)
 
-      mockNode.onResize()
+      mockNode.onResize?.([512, 512] as Size)
       expect(mockLoad3d.handleResize).toHaveBeenCalled()
     })
 
@@ -222,13 +238,17 @@ describe('useLoad3d', () => {
       await composable.initializeLoad3d(containerRef)
 
       mockNode.flags.collapsed = true
-      mockNode.onDrawBackground()
+      mockNode.onDrawBackground?.({} as CanvasRenderingContext2D)
 
-      expect(mockLoad3d.renderer.domElement.hidden).toBe(true)
+      expect(mockLoad3d.renderer!.domElement.hidden).toBe(true)
     })
 
     it('should load model if model_file widget exists', async () => {
-      mockNode.widgets.push({ name: 'model_file', value: 'test.glb' })
+      mockNode.widgets!.push({
+        name: 'model_file',
+        value: 'test.glb',
+        type: 'text'
+      } as IWidget)
       vi.mocked(Load3dUtils.splitFilePath).mockReturnValue([
         'subfolder',
         'test.glb'
@@ -251,8 +271,12 @@ describe('useLoad3d', () => {
     })
 
     it('should restore camera state after loading model', async () => {
-      mockNode.widgets.push({ name: 'model_file', value: 'test.glb' })
-      mockNode.properties['Camera Config'].state = {
+      mockNode.widgets!.push({
+        name: 'model_file',
+        value: 'test.glb',
+        type: 'text'
+      } as IWidget)
+      ;(mockNode.properties!['Camera Config'] as { state: unknown }).state = {
         position: { x: 1, y: 2, z: 3 },
         target: { x: 0, y: 0, z: 0 }
       }
@@ -308,13 +332,13 @@ describe('useLoad3d', () => {
     it('should handle missing container or node', async () => {
       const composable = useLoad3d(mockNode)
 
-      await composable.initializeLoad3d(null as any)
+      await composable.initializeLoad3d(null!)
 
       expect(Load3d).not.toHaveBeenCalled()
     })
 
     it('should accept ref as parameter', () => {
-      const nodeRef = ref(mockNode)
+      const nodeRef = shallowRef<LGraphNode | null>(mockNode)
       const composable = useLoad3d(nodeRef)
 
       expect(composable.sceneConfig.value.backgroundColor).toBe('#000000')
@@ -366,9 +390,9 @@ describe('useLoad3d', () => {
 
       await composable.initializeLoad3d(containerRef)
 
-      mockLoad3d.toggleGrid.mockClear()
-      mockLoad3d.setBackgroundColor.mockClear()
-      mockLoad3d.setBackgroundImage.mockClear()
+      vi.mocked(mockLoad3d.toggleGrid!).mockClear()
+      vi.mocked(mockLoad3d.setBackgroundColor!).mockClear()
+      vi.mocked(mockLoad3d.setBackgroundImage!).mockClear()
 
       composable.sceneConfig.value = {
         showGrid: false,
@@ -399,8 +423,8 @@ describe('useLoad3d', () => {
       await composable.initializeLoad3d(containerRef)
       await nextTick()
 
-      mockLoad3d.setUpDirection.mockClear()
-      mockLoad3d.setMaterialMode.mockClear()
+      vi.mocked(mockLoad3d.setUpDirection!).mockClear()
+      vi.mocked(mockLoad3d.setMaterialMode!).mockClear()
 
       composable.modelConfig.value.upDirection = '+y'
       composable.modelConfig.value.materialMode = 'wireframe'
@@ -410,7 +434,8 @@ describe('useLoad3d', () => {
       expect(mockLoad3d.setMaterialMode).toHaveBeenCalledWith('wireframe')
       expect(mockNode.properties['Model Config']).toEqual({
         upDirection: '+y',
-        materialMode: 'wireframe'
+        materialMode: 'wireframe',
+        showSkeleton: false
       })
     })
 
@@ -421,8 +446,8 @@ describe('useLoad3d', () => {
       await composable.initializeLoad3d(containerRef)
       await nextTick()
 
-      mockLoad3d.toggleCamera.mockClear()
-      mockLoad3d.setFOV.mockClear()
+      vi.mocked(mockLoad3d.toggleCamera!).mockClear()
+      vi.mocked(mockLoad3d.setFOV!).mockClear()
 
       composable.cameraConfig.value.cameraType = 'orthographic'
       composable.cameraConfig.value.fov = 90
@@ -444,7 +469,7 @@ describe('useLoad3d', () => {
       await composable.initializeLoad3d(containerRef)
       await nextTick()
 
-      mockLoad3d.setLightIntensity.mockClear()
+      vi.mocked(mockLoad3d.setLightIntensity!).mockClear()
 
       composable.lightConfig.value.intensity = 10
       await nextTick()
@@ -584,7 +609,7 @@ describe('useLoad3d', () => {
     })
 
     it('should use resource folder for upload', async () => {
-      mockNode.properties['Resource Folder'] = 'subfolder'
+      mockNode.properties!['Resource Folder'] = 'subfolder'
       vi.mocked(Load3dUtils.uploadFile).mockResolvedValue('uploaded-image.jpg')
 
       const composable = useLoad3d(mockNode)
@@ -636,7 +661,9 @@ describe('useLoad3d', () => {
     })
 
     it('should handle export errors', async () => {
-      mockLoad3d.exportModel.mockRejectedValueOnce(new Error('Export failed'))
+      vi.mocked(mockLoad3d.exportModel!).mockRejectedValueOnce(
+        new Error('Export failed')
+      )
 
       const composable = useLoad3d(mockNode)
       const containerRef = document.createElement('div')
@@ -696,10 +723,13 @@ describe('useLoad3d', () => {
         'backgroundImageLoadingEnd',
         'modelLoadingStart',
         'modelLoadingEnd',
+        'skeletonVisibilityChange',
         'exportLoadingStart',
         'exportLoadingEnd',
         'recordingStatusChange',
-        'animationListChange'
+        'animationListChange',
+        'animationProgressChange',
+        'cameraChanged'
       ]
 
       expectedEvents.forEach((event) => {
@@ -711,12 +741,12 @@ describe('useLoad3d', () => {
     })
 
     it('should handle materialModeChange event', async () => {
-      let materialModeHandler: any
+      let materialModeHandler: ((mode: string) => void) | undefined
 
-      mockLoad3d.addEventListener.mockImplementation(
-        (event: string, handler: any) => {
+      vi.mocked(mockLoad3d.addEventListener!).mockImplementation(
+        (event: string, handler: unknown) => {
           if (event === 'materialModeChange') {
-            materialModeHandler = handler
+            materialModeHandler = handler as (mode: string) => void
           }
         }
       )
@@ -726,21 +756,21 @@ describe('useLoad3d', () => {
 
       await composable.initializeLoad3d(containerRef)
 
-      materialModeHandler('wireframe')
+      materialModeHandler?.('wireframe')
 
       expect(composable.modelConfig.value.materialMode).toBe('wireframe')
     })
 
     it('should handle loading events', async () => {
-      let modelLoadingStartHandler: any
-      let modelLoadingEndHandler: any
+      let modelLoadingStartHandler: (() => void) | undefined
+      let modelLoadingEndHandler: (() => void) | undefined
 
-      mockLoad3d.addEventListener.mockImplementation(
-        (event: string, handler: any) => {
+      vi.mocked(mockLoad3d.addEventListener!).mockImplementation(
+        (event: string, handler: unknown) => {
           if (event === 'modelLoadingStart') {
-            modelLoadingStartHandler = handler
+            modelLoadingStartHandler = handler as () => void
           } else if (event === 'modelLoadingEnd') {
-            modelLoadingEndHandler = handler
+            modelLoadingEndHandler = handler as () => void
           }
         }
       )
@@ -750,22 +780,22 @@ describe('useLoad3d', () => {
 
       await composable.initializeLoad3d(containerRef)
 
-      modelLoadingStartHandler()
+      modelLoadingStartHandler?.()
       expect(composable.loading.value).toBe(true)
       expect(composable.loadingMessage.value).toBe('load3d.loadingModel')
 
-      modelLoadingEndHandler()
+      modelLoadingEndHandler?.()
       expect(composable.loading.value).toBe(false)
       expect(composable.loadingMessage.value).toBe('')
     })
 
     it('should handle recordingStatusChange event', async () => {
-      let recordingStatusHandler: any
+      let recordingStatusHandler: ((status: boolean) => void) | undefined
 
-      mockLoad3d.addEventListener.mockImplementation(
-        (event: string, handler: any) => {
+      vi.mocked(mockLoad3d.addEventListener!).mockImplementation(
+        (event: string, handler: unknown) => {
           if (event === 'recordingStatusChange') {
-            recordingStatusHandler = handler
+            recordingStatusHandler = handler as (status: boolean) => void
           }
         }
       )
@@ -775,7 +805,7 @@ describe('useLoad3d', () => {
 
       await composable.initializeLoad3d(containerRef)
 
-      recordingStatusHandler(false)
+      recordingStatusHandler?.(false)
 
       expect(composable.isRecording.value).toBe(false)
       expect(composable.recordingDuration.value).toBe(10)
@@ -806,10 +836,11 @@ describe('useLoad3d', () => {
 
   describe('getModelUrl', () => {
     it('should handle http URLs directly', async () => {
-      mockNode.widgets.push({
+      mockNode.widgets!.push({
         name: 'model_file',
-        value: 'http://example.com/model.glb'
-      })
+        value: 'http://example.com/model.glb',
+        type: 'text'
+      } as IWidget)
 
       const composable = useLoad3d(mockNode)
       const containerRef = document.createElement('div')
@@ -822,7 +853,11 @@ describe('useLoad3d', () => {
     })
 
     it('should construct URL for local files', async () => {
-      mockNode.widgets.push({ name: 'model_file', value: 'models/test.glb' })
+      mockNode.widgets!.push({
+        name: 'model_file',
+        value: 'models/test.glb',
+        type: 'text'
+      } as IWidget)
       vi.mocked(Load3dUtils.splitFilePath).mockReturnValue([
         'models',
         'test.glb'
@@ -852,7 +887,9 @@ describe('useLoad3d', () => {
     })
 
     it('should use output type for preview mode', async () => {
-      mockNode.widgets = [{ name: 'model_file', value: 'test.glb' }] // No width/height widgets
+      mockNode.widgets = [
+        { name: 'model_file', value: 'test.glb', type: 'text' } as IWidget
+      ] // No width/height widgets
       vi.mocked(Load3dUtils.splitFilePath).mockReturnValue(['', 'test.glb'])
       vi.mocked(Load3dUtils.getResourceURL).mockReturnValue(
         '/api/view/test.glb'
@@ -886,10 +923,10 @@ describe('useLoad3d', () => {
     })
 
     it('should handle missing configurations', async () => {
-      delete mockNode.properties['Scene Config']
-      delete mockNode.properties['Model Config']
-      delete mockNode.properties['Camera Config']
-      delete mockNode.properties['Light Config']
+      delete mockNode.properties!['Scene Config']
+      delete mockNode.properties!['Model Config']
+      delete mockNode.properties!['Camera Config']
+      delete mockNode.properties!['Light Config']
 
       const composable = useLoad3d(mockNode)
       const containerRef = document.createElement('div')
@@ -901,7 +938,11 @@ describe('useLoad3d', () => {
     })
 
     it('should handle background image with existing config', async () => {
-      mockNode.properties['Scene Config'].backgroundImage = 'existing.jpg'
+      ;(
+        mockNode.properties!['Scene Config'] as {
+          backgroundImage: string
+        }
+      ).backgroundImage = 'existing.jpg'
 
       const composable = useLoad3d(mockNode)
       const containerRef = document.createElement('div')
diff --git a/src/composables/useLoad3d.ts b/src/composables/useLoad3d.ts
index 8b589fc2be..a9972a0807 100644
--- a/src/composables/useLoad3d.ts
+++ b/src/composables/useLoad3d.ts
@@ -1,5 +1,6 @@
+import type { MaybeRef } from 'vue'
+
 import { toRef } from '@vueuse/core'
-import type { MaybeRef } from '@vueuse/core'
 import { nextTick, ref, toRaw, watch } from 'vue'
 
 import Load3d from '@/extensions/core/load3d/Load3d'
@@ -9,6 +10,7 @@ import type {
   CameraConfig,
   CameraState,
   CameraType,
+  EventCallback,
   LightConfig,
   MaterialMode,
   ModelConfig,
@@ -40,9 +42,12 @@ export const useLoad3d = (nodeOrRef: MaybeRef<LGraphNode | null>) => {
 
   const modelConfig = ref<ModelConfig>({
     upDirection: 'original',
-    materialMode: 'original'
+    materialMode: 'original',
+    showSkeleton: false
   })
 
+  const hasSkeleton = ref(false)
+
   const cameraConfig = ref<CameraConfig>({
     cameraType: 'perspective',
     fov: 75
@@ -214,14 +219,15 @@ export const useLoad3d = (nodeOrRef: MaybeRef<LGraphNode | null>) => {
         return modelPath
       }
 
-      const [subfolder, filename] = Load3dUtils.splitFilePath(modelPath)
-      return api.apiURL(
-        Load3dUtils.getResourceURL(
-          subfolder,
-          filename,
-          isPreview.value ? 'output' : 'input'
-        )
-      )
+      const trimmed = modelPath.trim()
+      const hasOutputSuffix = trimmed.endsWith('[output]')
+      const cleanPath = hasOutputSuffix
+        ? trimmed.replace(/\s*\[output\]$/, '')
+        : trimmed
+      const type = hasOutputSuffix || isPreview.value ? 'output' : 'input'
+
+      const [subfolder, filename] = Load3dUtils.splitFilePath(cleanPath)
+      return api.apiURL(Load3dUtils.getResourceURL(subfolder, filename, type))
     } catch (error) {
       console.error('Failed to construct model URL:', error)
       return null
@@ -273,6 +279,7 @@ export const useLoad3d = (nodeOrRef: MaybeRef<LGraphNode | null>) => {
         nodeRef.value.properties['Model Config'] = newValue
         load3d.setUpDirection(newValue.upDirection)
         load3d.setMaterialMode(newValue.materialMode)
+        load3d.setShowSkeleton(newValue.showSkeleton)
       }
     },
     { deep: true }
@@ -503,6 +510,28 @@ export const useLoad3d = (nodeOrRef: MaybeRef<LGraphNode | null>) => {
       loading.value = false
       isSplatModel.value = load3d?.isSplatModel() ?? false
       isPlyModel.value = load3d?.isPlyModel() ?? false
+      hasSkeleton.value = load3d?.hasSkeleton() ?? false
+      // Reset skeleton visibility when loading new model
+      modelConfig.value.showSkeleton = false
+
+      if (load3d) {
+        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') {
+          void Load3dUtils.generateThumbnailIfNeeded(
+            load3d,
+            value,
+            isPreview.value ? 'output' : 'input'
+          )
+        }
+      }
+    },
+    skeletonVisibilityChange: (value: boolean) => {
+      modelConfig.value.showSkeleton = value
     },
     exportLoadingStart: (message: string) => {
       loadingMessage.value = message || t('load3d.exportingModel')
@@ -554,7 +583,7 @@ export const useLoad3d = (nodeOrRef: MaybeRef<LGraphNode | null>) => {
   const handleEvents = (action: 'add' | 'remove') => {
     Object.entries(eventConfig).forEach(([event, handler]) => {
       const method = `${action}EventListener` as const
-      load3d?.[method](event, handler)
+      load3d?.[method](event, handler as EventCallback)
     })
   }
 
@@ -584,6 +613,7 @@ export const useLoad3d = (nodeOrRef: MaybeRef<LGraphNode | null>) => {
     isPreview,
     isSplatModel,
     isPlyModel,
+    hasSkeleton,
     hasRecording,
     recordingDuration,
     animations,
diff --git a/tests-ui/tests/composables/useLoad3dDrag.test.ts b/src/composables/useLoad3dDrag.test.ts
similarity index 92%
rename from tests-ui/tests/composables/useLoad3dDrag.test.ts
rename to src/composables/useLoad3dDrag.test.ts
index f35c5c7360..dda93e18b9 100644
--- a/tests-ui/tests/composables/useLoad3dDrag.test.ts
+++ b/src/composables/useLoad3dDrag.test.ts
@@ -2,7 +2,9 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { ref } from 'vue'
 
 import { useLoad3dDrag } from '@/composables/useLoad3dDrag'
+import { SUPPORTED_EXTENSIONS } from '@/extensions/core/load3d/constants'
 import { useToastStore } from '@/platform/updates/common/toastStore'
+import { createMockFileList } from '@/utils/__tests__/litegraphTestUtils'
 
 vi.mock('@/platform/updates/common/toastStore', () => ({
   useToastStore: vi.fn()
@@ -19,22 +21,22 @@ function createMockDragEvent(
   const files = options.files || []
   const types = options.hasFiles ? ['Files'] : []
 
-  const dataTransfer = {
+  const dataTransfer: Partial<DataTransfer> = {
     types,
-    files,
+    files: createMockFileList(files),
     dropEffect: 'none' as DataTransfer['dropEffect']
   }
 
-  const event = {
+  const event: Partial<DragEvent> = {
     type,
-    dataTransfer
-  } as unknown as DragEvent
+    dataTransfer: dataTransfer as DataTransfer
+  }
 
-  return event
+  return event as DragEvent
 }
 
 describe('useLoad3dDrag', () => {
-  let mockToastStore: any
+  let mockToastStore: ReturnType<typeof useToastStore>
   let mockOnModelDrop: (file: File) => void | Promise<void>
 
   beforeEach(() => {
@@ -42,7 +44,9 @@ describe('useLoad3dDrag', () => {
 
     mockToastStore = {
       addAlert: vi.fn()
-    }
+    } as Partial<ReturnType<typeof useToastStore>> as ReturnType<
+      typeof useToastStore
+    >
     vi.mocked(useToastStore).mockReturnValue(mockToastStore)
 
     mockOnModelDrop = vi.fn()
@@ -196,7 +200,7 @@ describe('useLoad3dDrag', () => {
         onModelDrop: mockOnModelDrop
       })
 
-      const extensions = ['.gltf', '.glb', '.obj', '.fbx', '.stl']
+      const extensions = [...SUPPORTED_EXTENSIONS]
 
       for (const ext of extensions) {
         vi.mocked(mockOnModelDrop).mockClear()
diff --git a/src/composables/useLoad3dDrag.ts b/src/composables/useLoad3dDrag.ts
index d7d5ea7f03..87a8292ec2 100644
--- a/src/composables/useLoad3dDrag.ts
+++ b/src/composables/useLoad3dDrag.ts
@@ -1,7 +1,7 @@
 import { computed, ref, toValue } from 'vue'
 import type { MaybeRefOrGetter } from 'vue'
 
-import { SUPPORTED_EXTENSIONS } from '@/extensions/core/load3d/interfaces'
+import { SUPPORTED_EXTENSIONS } from '@/extensions/core/load3d/constants'
 import { t } from '@/i18n'
 import { useToastStore } from '@/platform/updates/common/toastStore'
 
diff --git a/tests-ui/tests/composables/useLoad3dViewer.test.ts b/src/composables/useLoad3dViewer.test.ts
similarity index 81%
rename from tests-ui/tests/composables/useLoad3dViewer.test.ts
rename to src/composables/useLoad3dViewer.test.ts
index 77a8e50a0f..757e1400d6 100644
--- a/tests-ui/tests/composables/useLoad3dViewer.test.ts
+++ b/src/composables/useLoad3dViewer.test.ts
@@ -4,8 +4,11 @@ import { nextTick } from 'vue'
 import { useLoad3dViewer } from '@/composables/useLoad3dViewer'
 import Load3d from '@/extensions/core/load3d/Load3d'
 import Load3dUtils from '@/extensions/core/load3d/Load3dUtils'
+import type { LGraph } from '@/lib/litegraph/src/LGraph'
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
 import { useToastStore } from '@/platform/updates/common/toastStore'
 import { useLoad3dService } from '@/services/load3dService'
+import { createMockLGraphNode } from '@/utils/__tests__/litegraphTestUtils'
 
 vi.mock('@/services/load3dService', () => ({
   useLoad3dService: vi.fn()
@@ -29,17 +32,32 @@ vi.mock('@/extensions/core/load3d/Load3d', () => ({
   default: vi.fn()
 }))
 
+function createMockSceneManager(): Load3d['sceneManager'] {
+  const mock: Partial<Load3d['sceneManager']> = {
+    scene: {} as Load3d['sceneManager']['scene'],
+    backgroundScene: {} as Load3d['sceneManager']['backgroundScene'],
+    backgroundCamera: {} as Load3d['sceneManager']['backgroundCamera'],
+    currentBackgroundColor: '#282828',
+    gridHelper: { visible: true } as Load3d['sceneManager']['gridHelper'],
+    getCurrentBackgroundInfo: vi.fn().mockReturnValue({
+      type: 'color',
+      value: '#282828'
+    })
+  }
+  return mock as Load3d['sceneManager']
+}
+
 describe('useLoad3dViewer', () => {
-  let mockLoad3d: any
-  let mockSourceLoad3d: any
-  let mockLoad3dService: any
-  let mockToastStore: any
-  let mockNode: any
+  let mockLoad3d: Partial<Load3d>
+  let mockSourceLoad3d: Partial<Load3d>
+  let mockLoad3dService: ReturnType<typeof useLoad3dService>
+  let mockToastStore: ReturnType<typeof useToastStore>
+  let mockNode: LGraphNode
 
   beforeEach(() => {
     vi.clearAllMocks()
 
-    mockNode = {
+    mockNode = createMockLGraphNode({
       properties: {
         'Scene Config': {
           backgroundColor: '#282828',
@@ -62,9 +80,9 @@ describe('useLoad3dViewer', () => {
       },
       graph: {
         setDirtyCanvas: vi.fn()
-      },
+      } as Partial<LGraph> as LGraph,
       widgets: []
-    } as any
+    })
 
     mockLoad3d = {
       setBackgroundColor: vi.fn(),
@@ -97,24 +115,17 @@ describe('useLoad3dViewer', () => {
         zoom: 1,
         cameraType: 'perspective'
       }),
-      sceneManager: {
-        currentBackgroundColor: '#282828',
-        gridHelper: { visible: true },
-        getCurrentBackgroundInfo: vi.fn().mockReturnValue({
-          type: 'color',
-          value: '#282828'
-        })
-      },
+      sceneManager: createMockSceneManager(),
       lightingManager: {
         lights: [null, { intensity: 1 }]
-      },
+      } as Load3d['lightingManager'],
       cameraManager: {
         perspectiveCamera: { fov: 75 }
-      },
+      } as Load3d['cameraManager'],
       modelManager: {
         currentUpDirection: 'original',
         materialMode: 'original'
-      },
+      } as Load3d['modelManager'],
       setBackgroundImage: vi.fn().mockResolvedValue(undefined),
       setBackgroundRenderMode: vi.fn(),
       forceRender: vi.fn()
@@ -128,12 +139,16 @@ describe('useLoad3dViewer', () => {
       copyLoad3dState: vi.fn().mockResolvedValue(undefined),
       handleViewportRefresh: vi.fn(),
       getLoad3d: vi.fn().mockReturnValue(mockSourceLoad3d)
-    }
+    } as Partial<ReturnType<typeof useLoad3dService>> as ReturnType<
+      typeof useLoad3dService
+    >
     vi.mocked(useLoad3dService).mockReturnValue(mockLoad3dService)
 
     mockToastStore = {
       addAlert: vi.fn()
-    }
+    } as Partial<ReturnType<typeof useToastStore>> as ReturnType<
+      typeof useToastStore
+    >
     vi.mocked(useToastStore).mockReturnValue(mockToastStore)
   })
 
@@ -160,7 +175,7 @@ describe('useLoad3dViewer', () => {
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       expect(Load3d).toHaveBeenCalledWith(containerRef, {
         width: undefined,
@@ -184,16 +199,20 @@ describe('useLoad3dViewer', () => {
     })
 
     it('should handle background image during initialization', async () => {
-      mockSourceLoad3d.sceneManager.getCurrentBackgroundInfo.mockReturnValue({
+      vi.mocked(
+        mockSourceLoad3d.sceneManager!.getCurrentBackgroundInfo
+      ).mockReturnValue({
         type: 'image',
         value: ''
       })
-      mockNode.properties['Scene Config'].backgroundImage = 'test-image.jpg'
+      ;(
+        mockNode.properties!['Scene Config'] as Record<string, unknown>
+      ).backgroundImage = 'test-image.jpg'
 
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       expect(viewer.backgroundImage.value).toBe('test-image.jpg')
       expect(viewer.hasBackgroundImage.value).toBe(true)
@@ -207,7 +226,7 @@ describe('useLoad3dViewer', () => {
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       expect(mockToastStore.addAlert).toHaveBeenCalledWith(
         'toastMessages.failedToInitializeLoad3dViewer'
@@ -220,7 +239,7 @@ describe('useLoad3dViewer', () => {
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       viewer.backgroundColor.value = '#ff0000'
       await nextTick()
@@ -232,7 +251,7 @@ describe('useLoad3dViewer', () => {
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       viewer.showGrid.value = false
       await nextTick()
@@ -244,7 +263,7 @@ describe('useLoad3dViewer', () => {
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       viewer.cameraType.value = 'orthographic'
       await nextTick()
@@ -256,7 +275,7 @@ describe('useLoad3dViewer', () => {
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       viewer.fov.value = 90
       await nextTick()
@@ -268,7 +287,7 @@ describe('useLoad3dViewer', () => {
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       viewer.lightIntensity.value = 2
       await nextTick()
@@ -280,7 +299,7 @@ describe('useLoad3dViewer', () => {
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       viewer.backgroundImage.value = 'new-bg.jpg'
       await nextTick()
@@ -293,7 +312,7 @@ describe('useLoad3dViewer', () => {
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       viewer.upDirection.value = '+y'
       await nextTick()
@@ -305,7 +324,7 @@ describe('useLoad3dViewer', () => {
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       viewer.materialMode.value = 'wireframe'
       await nextTick()
@@ -314,14 +333,16 @@ describe('useLoad3dViewer', () => {
     })
 
     it('should handle watcher errors gracefully', async () => {
-      mockLoad3d.setBackgroundColor.mockImplementationOnce(function () {
-        throw new Error('Color update failed')
-      })
+      vi.mocked(mockLoad3d.setBackgroundColor!).mockImplementationOnce(
+        function () {
+          throw new Error('Color update failed')
+        }
+      )
 
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       viewer.backgroundColor.value = '#ff0000'
       await nextTick()
@@ -337,7 +358,7 @@ describe('useLoad3dViewer', () => {
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       await viewer.exportModel('glb')
 
@@ -345,12 +366,14 @@ describe('useLoad3dViewer', () => {
     })
 
     it('should handle export errors', async () => {
-      mockLoad3d.exportModel.mockRejectedValueOnce(new Error('Export failed'))
+      vi.mocked(mockLoad3d.exportModel!).mockRejectedValueOnce(
+        new Error('Export failed')
+      )
 
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       await viewer.exportModel('glb')
 
@@ -373,7 +396,7 @@ describe('useLoad3dViewer', () => {
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       viewer.handleResize()
 
@@ -384,7 +407,7 @@ describe('useLoad3dViewer', () => {
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       viewer.handleMouseEnter()
 
@@ -395,7 +418,7 @@ describe('useLoad3dViewer', () => {
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       viewer.handleMouseLeave()
 
@@ -408,22 +431,35 @@ describe('useLoad3dViewer', () => {
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
-
-      mockNode.properties['Scene Config'].backgroundColor = '#ff0000'
-      mockNode.properties['Scene Config'].showGrid = false
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
+      ;(
+        mockNode.properties!['Scene Config'] as Record<string, unknown>
+      ).backgroundColor = '#ff0000'
+      ;(
+        mockNode.properties!['Scene Config'] as Record<string, unknown>
+      ).showGrid = false
 
       viewer.restoreInitialState()
 
-      expect(mockNode.properties['Scene Config'].backgroundColor).toBe(
-        '#282828'
-      )
-      expect(mockNode.properties['Scene Config'].showGrid).toBe(true)
-      expect(mockNode.properties['Camera Config'].cameraType).toBe(
-        'perspective'
-      )
-      expect(mockNode.properties['Camera Config'].fov).toBe(75)
-      expect(mockNode.properties['Light Config'].intensity).toBe(1)
+      expect(
+        (mockNode.properties!['Scene Config'] as Record<string, unknown>)
+          .backgroundColor
+      ).toBe('#282828')
+      expect(
+        (mockNode.properties!['Scene Config'] as Record<string, unknown>)
+          .showGrid
+      ).toBe(true)
+      expect(
+        (mockNode.properties!['Camera Config'] as Record<string, unknown>)
+          .cameraType
+      ).toBe('perspective')
+      expect(
+        (mockNode.properties!['Camera Config'] as Record<string, unknown>).fov
+      ).toBe(75)
+      expect(
+        (mockNode.properties!['Light Config'] as Record<string, unknown>)
+          .intensity
+      ).toBe(1)
     })
   })
 
@@ -432,7 +468,7 @@ describe('useLoad3dViewer', () => {
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       viewer.backgroundColor.value = '#ff0000'
       viewer.showGrid.value = false
@@ -440,23 +476,27 @@ describe('useLoad3dViewer', () => {
       const result = await viewer.applyChanges()
 
       expect(result).toBe(true)
-      expect(mockNode.properties['Scene Config'].backgroundColor).toBe(
-        '#ff0000'
-      )
-      expect(mockNode.properties['Scene Config'].showGrid).toBe(false)
+      expect(
+        (mockNode.properties!['Scene Config'] as Record<string, unknown>)
+          .backgroundColor
+      ).toBe('#ff0000')
+      expect(
+        (mockNode.properties!['Scene Config'] as Record<string, unknown>)
+          .showGrid
+      ).toBe(false)
       expect(mockLoad3dService.copyLoad3dState).toHaveBeenCalledWith(
         mockLoad3d,
         mockSourceLoad3d
       )
       expect(mockSourceLoad3d.forceRender).toHaveBeenCalled()
-      expect(mockNode.graph.setDirtyCanvas).toHaveBeenCalledWith(true, true)
+      expect(mockNode.graph!.setDirtyCanvas).toHaveBeenCalledWith(true, true)
     })
 
     it('should handle background image during apply', async () => {
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       viewer.backgroundImage.value = 'new-bg.jpg'
 
@@ -481,7 +521,7 @@ describe('useLoad3dViewer', () => {
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       viewer.refreshViewport()
 
@@ -498,7 +538,7 @@ describe('useLoad3dViewer', () => {
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       const file = new File([''], 'test.jpg', { type: 'image/jpeg' })
       await viewer.handleBackgroundImageUpdate(file)
@@ -515,7 +555,7 @@ describe('useLoad3dViewer', () => {
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       const file = new File([''], 'test.jpg', { type: 'image/jpeg' })
       await viewer.handleBackgroundImageUpdate(file)
@@ -527,7 +567,7 @@ describe('useLoad3dViewer', () => {
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       viewer.backgroundImage.value = 'existing.jpg'
       viewer.hasBackgroundImage.value = true
@@ -546,7 +586,7 @@ describe('useLoad3dViewer', () => {
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       const file = new File([''], 'test.jpg', { type: 'image/jpeg' })
       await viewer.handleBackgroundImageUpdate(file)
@@ -562,7 +602,7 @@ describe('useLoad3dViewer', () => {
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       viewer.cleanup()
 
@@ -580,33 +620,36 @@ describe('useLoad3dViewer', () => {
     it('should handle missing container ref', async () => {
       const viewer = useLoad3dViewer(mockNode)
 
-      await viewer.initializeViewer(null as any, mockSourceLoad3d)
+      await viewer.initializeViewer(null!, mockSourceLoad3d as Load3d)
 
       expect(Load3d).not.toHaveBeenCalled()
     })
 
     it('should handle orthographic camera', async () => {
-      mockSourceLoad3d.getCurrentCameraType.mockReturnValue('orthographic')
+      vi.mocked(mockSourceLoad3d.getCurrentCameraType!).mockReturnValue(
+        'orthographic'
+      )
       mockSourceLoad3d.cameraManager = {
         perspectiveCamera: { fov: 75 }
-      }
-      delete mockNode.properties['Camera Config'].cameraType
+      } as Partial<Load3d['cameraManager']> as Load3d['cameraManager']
+      delete (mockNode.properties!['Camera Config'] as Record<string, unknown>)
+        .cameraType
 
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       expect(viewer.cameraType.value).toBe('orthographic')
     })
 
     it('should handle missing lights', async () => {
-      mockSourceLoad3d.lightingManager.lights = []
+      mockSourceLoad3d.lightingManager!.lights = []
 
       const viewer = useLoad3dViewer(mockNode)
       const containerRef = document.createElement('div')
 
-      await viewer.initializeViewer(containerRef, mockSourceLoad3d)
+      await viewer.initializeViewer(containerRef, mockSourceLoad3d as Load3d)
 
       expect(viewer.lightIntensity.value).toBe(1) // Default value
     })
diff --git a/src/composables/useLoad3dViewer.ts b/src/composables/useLoad3dViewer.ts
index 9022c2d2d0..94e4ebc24c 100644
--- a/src/composables/useLoad3dViewer.ts
+++ b/src/composables/useLoad3dViewer.ts
@@ -5,9 +5,13 @@ import Load3dUtils from '@/extensions/core/load3d/Load3dUtils'
 import type {
   AnimationItem,
   BackgroundRenderModeType,
+  CameraConfig,
   CameraState,
   CameraType,
+  LightConfig,
   MaterialMode,
+  ModelConfig,
+  SceneConfig,
   UpDirection
 } from '@/extensions/core/load3d/interfaces'
 import { t } from '@/i18n'
@@ -271,10 +275,18 @@ export const useLoad3dViewer = (node?: LGraphNode) => {
 
       const sourceCameraState = source.getCameraState()
 
-      const sceneConfig = node.properties['Scene Config'] as any
-      const modelConfig = node.properties['Model Config'] as any
-      const cameraConfig = node.properties['Camera Config'] as any
-      const lightConfig = node.properties['Light Config'] as any
+      const sceneConfig = node.properties['Scene Config'] as
+        | SceneConfig
+        | undefined
+      const modelConfig = node.properties['Model Config'] as
+        | ModelConfig
+        | undefined
+      const cameraConfig = node.properties['Camera Config'] as
+        | CameraConfig
+        | undefined
+      const lightConfig = node.properties['Light Config'] as
+        | LightConfig
+        | undefined
 
       isPreview.value = node.type === 'Preview3D'
 
@@ -438,7 +450,9 @@ export const useLoad3dViewer = (node?: LGraphNode) => {
         materialMode: initialState.value.materialMode
       }
 
-      const currentCameraConfig = nodeValue.properties['Camera Config'] as any
+      const currentCameraConfig = nodeValue.properties['Camera Config'] as
+        | CameraConfig
+        | undefined
       nodeValue.properties['Camera Config'] = {
         ...currentCameraConfig,
         state: initialState.value.cameraState
@@ -616,6 +630,10 @@ export const useLoad3dViewer = (node?: LGraphNode) => {
     handleBackgroundImageUpdate,
     handleModelDrop,
     handleSeek,
-    cleanup
+    cleanup,
+
+    hasSkeleton: false,
+    intensity: lightIntensity,
+    showSkeleton: false
   }
 }
diff --git a/src/composables/useMissingModelsDialog.ts b/src/composables/useMissingModelsDialog.ts
new file mode 100644
index 0000000000..c2e482532d
--- /dev/null
+++ b/src/composables/useMissingModelsDialog.ts
@@ -0,0 +1,31 @@
+import type { ComponentAttrs } from 'vue-component-type-helpers'
+
+import MissingModelsContent from '@/components/dialog/content/MissingModelsContent.vue'
+import MissingModelsFooter from '@/components/dialog/content/MissingModelsFooter.vue'
+import MissingModelsHeader from '@/components/dialog/content/MissingModelsHeader.vue'
+import { useDialogService } from '@/services/dialogService'
+import { useDialogStore } from '@/stores/dialogStore'
+
+const DIALOG_KEY = 'global-missing-models-warning'
+
+export function useMissingModelsDialog() {
+  const { showSmallLayoutDialog } = useDialogService()
+  const dialogStore = useDialogStore()
+
+  function hide() {
+    dialogStore.closeDialog({ key: DIALOG_KEY })
+  }
+
+  function show(props: ComponentAttrs<typeof MissingModelsContent>) {
+    showSmallLayoutDialog({
+      key: DIALOG_KEY,
+      headerComponent: MissingModelsHeader,
+      footerComponent: MissingModelsFooter,
+      component: MissingModelsContent,
+      props,
+      footerProps: props
+    })
+  }
+
+  return { show, hide }
+}
diff --git a/src/composables/useMissingNodesDialog.ts b/src/composables/useMissingNodesDialog.ts
new file mode 100644
index 0000000000..83b7f156fe
--- /dev/null
+++ b/src/composables/useMissingNodesDialog.ts
@@ -0,0 +1,30 @@
+import type { ComponentAttrs } from 'vue-component-type-helpers'
+
+import MissingNodesContent from '@/components/dialog/content/MissingNodesContent.vue'
+import MissingNodesFooter from '@/components/dialog/content/MissingNodesFooter.vue'
+import MissingNodesHeader from '@/components/dialog/content/MissingNodesHeader.vue'
+import { useDialogService } from '@/services/dialogService'
+import { useDialogStore } from '@/stores/dialogStore'
+
+const DIALOG_KEY = 'global-missing-nodes'
+
+export function useMissingNodesDialog() {
+  const { showSmallLayoutDialog } = useDialogService()
+  const dialogStore = useDialogStore()
+
+  function hide() {
+    dialogStore.closeDialog({ key: DIALOG_KEY })
+  }
+
+  function show(props: ComponentAttrs<typeof MissingNodesContent>) {
+    showSmallLayoutDialog({
+      key: DIALOG_KEY,
+      headerComponent: MissingNodesHeader,
+      footerComponent: MissingNodesFooter,
+      component: MissingNodesContent,
+      props
+    })
+  }
+
+  return { show, hide }
+}
diff --git a/src/composables/useNewMenuItemIndicator.test.ts b/src/composables/useNewMenuItemIndicator.test.ts
new file mode 100644
index 0000000000..128704ab53
--- /dev/null
+++ b/src/composables/useNewMenuItemIndicator.test.ts
@@ -0,0 +1,185 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { useNewMenuItemIndicator } from '@/composables/useNewMenuItemIndicator'
+import type { WorkflowMenuItem } from '@/types/workflowMenuItem'
+
+const mockSettingStore = vi.hoisted(() => ({
+  get: vi.fn((): string[] => []),
+  set: vi.fn()
+}))
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: vi.fn(() => mockSettingStore)
+}))
+
+function createItems(...ids: string[]): WorkflowMenuItem[] {
+  return ids.map((id) => ({
+    id,
+    label: `Label for ${id}`,
+    icon: 'pi pi-test',
+    command: vi.fn(),
+    isNew: true,
+    badge: 'BETA'
+  }))
+}
+
+describe('useNewMenuItemIndicator', () => {
+  beforeEach(() => {
+    setActivePinia(createPinia())
+    vi.clearAllMocks()
+    mockSettingStore.get.mockReturnValue([])
+  })
+
+  it('reports unseen items when no items have been seen', () => {
+    const items = createItems('feature-a')
+    const { hasUnseenItems } = useNewMenuItemIndicator(() => items)
+
+    expect(hasUnseenItems.value).toBe(true)
+  })
+
+  it('reports no unseen items when all new items are already seen', () => {
+    mockSettingStore.get.mockReturnValue(['feature-a'])
+    const items = createItems('feature-a')
+    const { hasUnseenItems } = useNewMenuItemIndicator(() => items)
+
+    expect(hasUnseenItems.value).toBe(false)
+  })
+
+  it('reports unseen when some new items are not yet seen', () => {
+    mockSettingStore.get.mockReturnValue(['feature-a'])
+    const items = createItems('feature-a', 'feature-b')
+    const { hasUnseenItems } = useNewMenuItemIndicator(() => items)
+
+    expect(hasUnseenItems.value).toBe(true)
+  })
+
+  it('reports no unseen items when menu has no isNew items', () => {
+    const items: WorkflowMenuItem[] = [
+      { id: 'regular', label: 'Regular', icon: 'pi pi-test', command: vi.fn() }
+    ]
+    const { hasUnseenItems } = useNewMenuItemIndicator(() => items)
+
+    expect(hasUnseenItems.value).toBe(false)
+  })
+
+  it('ignores separators', () => {
+    const items: WorkflowMenuItem[] = [
+      { separator: true },
+      ...createItems('feature-a')
+    ]
+    const { hasUnseenItems } = useNewMenuItemIndicator(() => items)
+
+    expect(hasUnseenItems.value).toBe(true)
+  })
+
+  it('markAsSeen persists current new item ids', () => {
+    const items = createItems('feature-a', 'feature-b')
+    const { markAsSeen } = useNewMenuItemIndicator(() => items)
+
+    markAsSeen()
+
+    expect(mockSettingStore.set).toHaveBeenCalledWith(
+      'Comfy.WorkflowActions.SeenItems',
+      ['feature-a', 'feature-b']
+    )
+  })
+
+  it('markAsSeen replaces stale entries with current new items', () => {
+    mockSettingStore.get.mockReturnValue(['old-feature', 'feature-a'])
+    const items = createItems('feature-a')
+    const { markAsSeen } = useNewMenuItemIndicator(() => items)
+
+    markAsSeen()
+
+    expect(mockSettingStore.set).toHaveBeenCalledWith(
+      'Comfy.WorkflowActions.SeenItems',
+      ['feature-a']
+    )
+  })
+
+  it('does not count hidden items as unseen', () => {
+    const items: WorkflowMenuItem[] = [
+      {
+        id: 'hidden-feature',
+        label: 'Hidden',
+        icon: 'pi pi-test',
+        command: vi.fn(),
+        isNew: true,
+        badge: 'BETA',
+        visible: false
+      }
+    ]
+    const { hasUnseenItems } = useNewMenuItemIndicator(() => items)
+
+    expect(hasUnseenItems.value).toBe(false)
+  })
+
+  it('markAsSeen does not include never-seen hidden items', () => {
+    const items: WorkflowMenuItem[] = [
+      ...createItems('feature-a'),
+      {
+        id: 'hidden-feature',
+        label: 'Hidden',
+        icon: 'pi pi-test',
+        command: vi.fn(),
+        isNew: true,
+        badge: 'BETA',
+        visible: false
+      }
+    ]
+    const { markAsSeen } = useNewMenuItemIndicator(() => items)
+
+    markAsSeen()
+
+    expect(mockSettingStore.set).toHaveBeenCalledWith(
+      'Comfy.WorkflowActions.SeenItems',
+      ['feature-a']
+    )
+  })
+
+  it('markAsSeen retains previously-seen hidden items', () => {
+    mockSettingStore.get.mockReturnValue(['hidden-feature'])
+    const items: WorkflowMenuItem[] = [
+      ...createItems('feature-a'),
+      {
+        id: 'hidden-feature',
+        label: 'Hidden',
+        icon: 'pi pi-test',
+        command: vi.fn(),
+        isNew: true,
+        badge: 'BETA',
+        visible: false
+      }
+    ]
+    const { markAsSeen } = useNewMenuItemIndicator(() => items)
+
+    markAsSeen()
+
+    expect(mockSettingStore.set).toHaveBeenCalledWith(
+      'Comfy.WorkflowActions.SeenItems',
+      ['feature-a', 'hidden-feature']
+    )
+  })
+
+  it('markAsSeen skips write when stored list already matches', () => {
+    mockSettingStore.get.mockReturnValue(['feature-a', 'feature-b'])
+    const items = createItems('feature-a', 'feature-b')
+    const { markAsSeen } = useNewMenuItemIndicator(() => items)
+
+    markAsSeen()
+
+    expect(mockSettingStore.set).not.toHaveBeenCalled()
+  })
+
+  it('markAsSeen does nothing when there are no new items', () => {
+    const items: WorkflowMenuItem[] = [
+      { id: 'regular', label: 'Regular', icon: 'pi pi-test', command: vi.fn() }
+    ]
+    const { markAsSeen } = useNewMenuItemIndicator(() => items)
+
+    markAsSeen()
+
+    expect(mockSettingStore.set).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/composables/useNewMenuItemIndicator.ts b/src/composables/useNewMenuItemIndicator.ts
new file mode 100644
index 0000000000..1c18336241
--- /dev/null
+++ b/src/composables/useNewMenuItemIndicator.ts
@@ -0,0 +1,54 @@
+import type { MaybeRefOrGetter } from 'vue'
+import { computed, toValue } from 'vue'
+
+import { useSettingStore } from '@/platform/settings/settingStore'
+import type {
+  WorkflowMenuAction,
+  WorkflowMenuItem
+} from '@/types/workflowMenuItem'
+
+function getNewActions(items: WorkflowMenuItem[]): WorkflowMenuAction[] {
+  return items
+    .filter((i): i is WorkflowMenuAction => !('separator' in i && i.separator))
+    .filter((i) => i.isNew)
+}
+
+export function useNewMenuItemIndicator(
+  menuItems: MaybeRefOrGetter<WorkflowMenuItem[]>
+) {
+  const settingStore = useSettingStore()
+
+  const newActions = computed(() => getNewActions(toValue(menuItems)))
+
+  const seenItems = computed<string[]>(
+    () => settingStore.get('Comfy.WorkflowActions.SeenItems') ?? []
+  )
+
+  const hasUnseenItems = computed(() => {
+    const seen = new Set(seenItems.value)
+    return newActions.value
+      .filter((i) => i.visible !== false)
+      .some((i) => !seen.has(i.id))
+  })
+
+  function markAsSeen() {
+    const actions = newActions.value
+    if (!actions.length) return
+
+    const seen = new Set(seenItems.value)
+    const visibleIds = actions
+      .filter((i) => i.visible !== false)
+      .map((i) => i.id)
+    const retainedIds = actions
+      .filter((i) => i.visible === false && seen.has(i.id))
+      .map((i) => i.id)
+
+    const nextSeen = [...visibleIds, ...retainedIds]
+    if (nextSeen.length === seen.size && nextSeen.every((id) => seen.has(id)))
+      return
+
+    void settingStore.set('Comfy.WorkflowActions.SeenItems', nextSeen)
+  }
+
+  return { hasUnseenItems, markAsSeen }
+}
diff --git a/tests-ui/tests/store/nodeHelpStore.test.ts b/src/composables/useNodeHelpContent.test.ts
similarity index 50%
rename from tests-ui/tests/store/nodeHelpStore.test.ts
rename to src/composables/useNodeHelpContent.test.ts
index dc8b7b466a..02b3d102f9 100644
--- a/tests-ui/tests/store/nodeHelpStore.test.ts
+++ b/src/composables/useNodeHelpContent.test.ts
@@ -1,9 +1,28 @@
 import { flushPromises } from '@vue/test-utils'
-import { createPinia, setActivePinia } from 'pinia'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { nextTick } from 'vue'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { nextTick, ref } from 'vue'
 
-import { useNodeHelpStore } from '@/stores/workspace/nodeHelpStore'
+import { useNodeHelpContent } from '@/composables/useNodeHelpContent'
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+
+function createMockNode(
+  overrides: Partial<ComfyNodeDefImpl>
+): ComfyNodeDefImpl {
+  return {
+    name: 'TestNode',
+    display_name: 'Test Node',
+    description: 'A test node',
+    category: 'test',
+    python_module: 'comfy.test_node',
+    inputs: {},
+    outputs: [],
+    deprecated: false,
+    experimental: false,
+    output_node: false,
+    api_node: false,
+    ...overrides
+  } as ComfyNodeDefImpl
+}
 
 vi.mock('@/scripts/api', () => ({
   api: {
@@ -11,14 +30,10 @@ vi.mock('@/scripts/api', () => ({
   }
 }))
 
-vi.mock('@/i18n', () => ({
-  i18n: {
-    global: {
-      locale: {
-        value: 'en'
-      }
-    }
-  }
+vi.mock('vue-i18n', () => ({
+  useI18n: () => ({
+    locale: ref('en')
+  })
 }))
 
 vi.mock('@/types/nodeSource', () => ({
@@ -34,233 +49,140 @@ vi.mock('@/types/nodeSource', () => ({
   })
 }))
 
-vi.mock('dompurify', () => ({
-  default: {
-    sanitize: vi.fn((html) => html)
-  }
-}))
-
-vi.mock('marked', () => ({
-  marked: {
-    parse: vi.fn((markdown, options) => {
-      if (options?.renderer) {
-        if (markdown.includes('![')) {
-          const matches = markdown.match(/!\[(.*?)\]\((.*?)\)/)
-          if (matches) {
-            const [, text, href] = matches
-            return options.renderer.image({ href, text, title: '' })
-          }
-        }
-      }
-      return `<p>${markdown}</p>`
-    })
-  },
-  Renderer: class Renderer {
-    image = vi.fn(
-      ({ href, title, text }) =>
-        `<img src="${href}" alt="${text}"${title ? ` title="${title}"` : ''} />`
-    )
-    link = vi.fn(
-      ({ href, title, text }) =>
-        `<a href="${href}"${title ? ` title="${title}"` : ''}>${text}</a>`
-    )
-  }
-}))
-
-describe('nodeHelpStore', () => {
-  // Define a mock node for testing
-  const mockCoreNode = {
+describe('useNodeHelpContent', () => {
+  const mockCoreNode = createMockNode({
     name: 'TestNode',
     display_name: 'Test Node',
     description: 'A test node',
-    inputs: {},
-    outputs: [],
     python_module: 'comfy.test_node'
-  }
+  })
 
-  const mockCustomNode = {
+  const mockCustomNode = createMockNode({
     name: 'CustomNode',
     display_name: 'Custom Node',
     description: 'A custom node',
-    inputs: {},
-    outputs: [],
     python_module: 'custom_nodes.test_module.custom@1.0.0'
-  }
+  })
 
-  // Mock fetch responses
   const mockFetch = vi.fn()
-  global.fetch = mockFetch
 
   beforeEach(() => {
-    // Setup Pinia
-    setActivePinia(createPinia())
     mockFetch.mockReset()
+    vi.stubGlobal('fetch', mockFetch)
   })
 
-  it('should initialize with empty state', () => {
-    const nodeHelpStore = useNodeHelpStore()
-    expect(nodeHelpStore.currentHelpNode).toBeNull()
-    expect(nodeHelpStore.isHelpOpen).toBe(false)
-  })
-
-  it('should open help for a node', () => {
-    const nodeHelpStore = useNodeHelpStore()
-
-    nodeHelpStore.openHelp(mockCoreNode as any)
-
-    expect(nodeHelpStore.currentHelpNode).toStrictEqual(mockCoreNode)
-    expect(nodeHelpStore.isHelpOpen).toBe(true)
-  })
-
-  it('should close help', () => {
-    const nodeHelpStore = useNodeHelpStore()
-
-    nodeHelpStore.openHelp(mockCoreNode as any)
-    expect(nodeHelpStore.isHelpOpen).toBe(true)
-
-    nodeHelpStore.closeHelp()
-    expect(nodeHelpStore.currentHelpNode).toBeNull()
-    expect(nodeHelpStore.isHelpOpen).toBe(false)
+  afterEach(() => {
+    vi.unstubAllGlobals()
   })
 
   it('should generate correct baseUrl for core nodes', async () => {
-    const nodeHelpStore = useNodeHelpStore()
+    const nodeRef = ref(mockCoreNode)
+    mockFetch.mockResolvedValueOnce({
+      ok: true,
+      text: async () => '# Test'
+    })
 
-    nodeHelpStore.openHelp(mockCoreNode as any)
+    const { baseUrl } = useNodeHelpContent(nodeRef)
     await nextTick()
 
-    expect(nodeHelpStore.baseUrl).toBe(`/docs/${mockCoreNode.name}/`)
+    expect(baseUrl.value).toBe(`/docs/${mockCoreNode.name}/`)
   })
 
   it('should generate correct baseUrl for custom nodes', async () => {
-    const nodeHelpStore = useNodeHelpStore()
+    const nodeRef = ref(mockCustomNode)
+    mockFetch.mockResolvedValueOnce({
+      ok: true,
+      text: async () => '# Test'
+    })
 
-    nodeHelpStore.openHelp(mockCustomNode as any)
+    const { baseUrl } = useNodeHelpContent(nodeRef)
     await nextTick()
 
-    expect(nodeHelpStore.baseUrl).toBe('/extensions/test_module/docs/')
+    expect(baseUrl.value).toBe('/extensions/test_module/docs/')
   })
 
   it('should render markdown content correctly', async () => {
-    const nodeHelpStore = useNodeHelpStore()
-
+    const nodeRef = ref(mockCoreNode)
     mockFetch.mockResolvedValueOnce({
       ok: true,
       text: async () => '# Test Help\nThis is test help content'
     })
 
-    nodeHelpStore.openHelp(mockCoreNode as any)
+    const { renderedHelpHtml } = useNodeHelpContent(nodeRef)
     await flushPromises()
 
-    expect(nodeHelpStore.renderedHelpHtml).toContain(
-      'This is test help content'
-    )
+    expect(renderedHelpHtml.value).toContain('This is test help content')
   })
 
   it('should handle fetch errors and fall back to description', async () => {
-    const nodeHelpStore = useNodeHelpStore()
-
+    const nodeRef = ref(mockCoreNode)
     mockFetch.mockResolvedValueOnce({
       ok: false,
       statusText: 'Not Found'
     })
 
-    nodeHelpStore.openHelp(mockCoreNode as any)
+    const { error, renderedHelpHtml } = useNodeHelpContent(nodeRef)
     await flushPromises()
 
-    expect(nodeHelpStore.error).toBe('Not Found')
-    expect(nodeHelpStore.renderedHelpHtml).toContain(mockCoreNode.description)
+    expect(error.value).toBe('Not Found')
+    expect(renderedHelpHtml.value).toContain(mockCoreNode.description)
   })
 
   it('should include alt attribute for images', async () => {
-    const nodeHelpStore = useNodeHelpStore()
-
+    const nodeRef = ref(mockCustomNode)
     mockFetch.mockResolvedValueOnce({
       ok: true,
       text: async () => '![image](test.jpg)'
     })
 
-    nodeHelpStore.openHelp(mockCustomNode as any)
+    const { renderedHelpHtml } = useNodeHelpContent(nodeRef)
     await flushPromises()
-    expect(nodeHelpStore.renderedHelpHtml).toContain('alt="image"')
+
+    expect(renderedHelpHtml.value).toContain('alt="image"')
   })
 
   it('should prefix relative video src in custom nodes', async () => {
-    const nodeHelpStore = useNodeHelpStore()
-
+    const nodeRef = ref(mockCustomNode)
     mockFetch.mockResolvedValueOnce({
       ok: true,
       text: async () => '<video src="video.mp4"></video>'
     })
 
-    nodeHelpStore.openHelp(mockCustomNode as any)
+    const { renderedHelpHtml } = useNodeHelpContent(nodeRef)
     await flushPromises()
-    expect(nodeHelpStore.renderedHelpHtml).toContain(
+
+    expect(renderedHelpHtml.value).toContain(
       'src="/extensions/test_module/docs/video.mp4"'
     )
   })
 
   it('should prefix relative video src for core nodes with node-specific base URL', async () => {
-    const nodeHelpStore = useNodeHelpStore()
-
+    const nodeRef = ref(mockCoreNode)
     mockFetch.mockResolvedValueOnce({
       ok: true,
       text: async () => '<video src="video.mp4"></video>'
     })
 
-    nodeHelpStore.openHelp(mockCoreNode as any)
+    const { renderedHelpHtml } = useNodeHelpContent(nodeRef)
     await flushPromises()
-    expect(nodeHelpStore.renderedHelpHtml).toContain(
+
+    expect(renderedHelpHtml.value).toContain(
       `src="/docs/${mockCoreNode.name}/video.mp4"`
     )
   })
 
-  it('should prefix relative source src in custom nodes', async () => {
-    const nodeHelpStore = useNodeHelpStore()
-
-    mockFetch.mockResolvedValueOnce({
-      ok: true,
-      text: async () =>
-        '<video><source src="video.mp4" type="video/mp4" /></video>'
-    })
-
-    nodeHelpStore.openHelp(mockCustomNode as any)
-    await flushPromises()
-    expect(nodeHelpStore.renderedHelpHtml).toContain(
-      'src="/extensions/test_module/docs/video.mp4"'
-    )
-  })
-
-  it('should prefix relative source src for core nodes with node-specific base URL', async () => {
-    const nodeHelpStore = useNodeHelpStore()
-
-    mockFetch.mockResolvedValueOnce({
-      ok: true,
-      text: async () =>
-        '<video><source src="video.webm" type="video/webm" /></video>'
-    })
-
-    nodeHelpStore.openHelp(mockCoreNode as any)
-    await flushPromises()
-    expect(nodeHelpStore.renderedHelpHtml).toContain(
-      `src="/docs/${mockCoreNode.name}/video.webm"`
-    )
-  })
-
   it('should handle loading state', async () => {
-    const nodeHelpStore = useNodeHelpStore()
-
+    const nodeRef = ref(mockCoreNode)
     mockFetch.mockImplementationOnce(() => new Promise(() => {})) // Never resolves
 
-    nodeHelpStore.openHelp(mockCoreNode as any)
+    const { isLoading } = useNodeHelpContent(nodeRef)
     await nextTick()
 
-    expect(nodeHelpStore.isLoading).toBe(true)
+    expect(isLoading.value).toBe(true)
   })
 
   it('should try fallback URL for custom nodes', async () => {
-    const nodeHelpStore = useNodeHelpStore()
-
+    const nodeRef = ref(mockCustomNode)
     mockFetch
       .mockResolvedValueOnce({
         ok: false,
@@ -271,7 +193,7 @@ describe('nodeHelpStore', () => {
         text: async () => '# Fallback content'
       })
 
-    nodeHelpStore.openHelp(mockCustomNode as any)
+    useNodeHelpContent(nodeRef)
     await flushPromises()
 
     expect(mockFetch).toHaveBeenCalledTimes(2)
@@ -283,74 +205,103 @@ describe('nodeHelpStore', () => {
     )
   })
 
-  it('should prefix relative img src in raw HTML for custom nodes', async () => {
-    const nodeHelpStore = useNodeHelpStore()
+  it('should prefix relative source src in custom nodes', async () => {
+    const nodeRef = ref(mockCustomNode)
+    mockFetch.mockResolvedValueOnce({
+      ok: true,
+      text: async () =>
+        '<video><source src="video.mp4" type="video/mp4" /></video>'
+    })
 
+    const { renderedHelpHtml } = useNodeHelpContent(nodeRef)
+    await flushPromises()
+
+    expect(renderedHelpHtml.value).toContain(
+      'src="/extensions/test_module/docs/video.mp4"'
+    )
+  })
+
+  it('should prefix relative source src for core nodes with node-specific base URL', async () => {
+    const nodeRef = ref(mockCoreNode)
+    mockFetch.mockResolvedValueOnce({
+      ok: true,
+      text: async () =>
+        '<video><source src="video.webm" type="video/webm" /></video>'
+    })
+
+    const { renderedHelpHtml } = useNodeHelpContent(nodeRef)
+    await flushPromises()
+
+    expect(renderedHelpHtml.value).toContain(
+      `src="/docs/${mockCoreNode.name}/video.webm"`
+    )
+  })
+
+  it('should prefix relative img src in raw HTML for custom nodes', async () => {
+    const nodeRef = ref(mockCustomNode)
     mockFetch.mockResolvedValueOnce({
       ok: true,
       text: async () => '# Test\n<img src="image.png" alt="Test image">'
     })
 
-    nodeHelpStore.openHelp(mockCustomNode as any)
+    const { renderedHelpHtml } = useNodeHelpContent(nodeRef)
     await flushPromises()
-    expect(nodeHelpStore.renderedHelpHtml).toContain(
+
+    expect(renderedHelpHtml.value).toContain(
       'src="/extensions/test_module/docs/image.png"'
     )
-    expect(nodeHelpStore.renderedHelpHtml).toContain('alt="Test image"')
+    expect(renderedHelpHtml.value).toContain('alt="Test image"')
   })
 
   it('should prefix relative img src in raw HTML for core nodes', async () => {
-    const nodeHelpStore = useNodeHelpStore()
-
+    const nodeRef = ref(mockCoreNode)
     mockFetch.mockResolvedValueOnce({
       ok: true,
       text: async () => '# Test\n<img src="image.png" alt="Test image">'
     })
 
-    nodeHelpStore.openHelp(mockCoreNode as any)
+    const { renderedHelpHtml } = useNodeHelpContent(nodeRef)
     await flushPromises()
-    expect(nodeHelpStore.renderedHelpHtml).toContain(
+
+    expect(renderedHelpHtml.value).toContain(
       `src="/docs/${mockCoreNode.name}/image.png"`
     )
-    expect(nodeHelpStore.renderedHelpHtml).toContain('alt="Test image"')
+    expect(renderedHelpHtml.value).toContain('alt="Test image"')
   })
 
   it('should not prefix absolute img src in raw HTML', async () => {
-    const nodeHelpStore = useNodeHelpStore()
-
+    const nodeRef = ref(mockCustomNode)
     mockFetch.mockResolvedValueOnce({
       ok: true,
       text: async () => '<img src="/absolute/image.png" alt="Absolute">'
     })
 
-    nodeHelpStore.openHelp(mockCustomNode as any)
+    const { renderedHelpHtml } = useNodeHelpContent(nodeRef)
     await flushPromises()
-    expect(nodeHelpStore.renderedHelpHtml).toContain(
-      'src="/absolute/image.png"'
-    )
-    expect(nodeHelpStore.renderedHelpHtml).toContain('alt="Absolute"')
+
+    expect(renderedHelpHtml.value).toContain('src="/absolute/image.png"')
+    expect(renderedHelpHtml.value).toContain('alt="Absolute"')
   })
 
   it('should not prefix external img src in raw HTML', async () => {
-    const nodeHelpStore = useNodeHelpStore()
-
+    const nodeRef = ref(mockCustomNode)
     mockFetch.mockResolvedValueOnce({
       ok: true,
       text: async () =>
         '<img src="https://example.com/image.png" alt="External">'
     })
 
-    nodeHelpStore.openHelp(mockCustomNode as any)
+    const { renderedHelpHtml } = useNodeHelpContent(nodeRef)
     await flushPromises()
-    expect(nodeHelpStore.renderedHelpHtml).toContain(
+
+    expect(renderedHelpHtml.value).toContain(
       'src="https://example.com/image.png"'
     )
-    expect(nodeHelpStore.renderedHelpHtml).toContain('alt="External"')
+    expect(renderedHelpHtml.value).toContain('alt="External"')
   })
 
   it('should handle various quote styles in media src attributes', async () => {
-    const nodeHelpStore = useNodeHelpStore()
-
+    const nodeRef = ref(mockCoreNode)
     mockFetch.mockResolvedValueOnce({
       ok: true,
       text: async () => `# Media Test
@@ -370,30 +321,61 @@ Testing quote styles in properly formed HTML:
 The MEDIA_SRC_REGEX handles both single and double quotes in img, video and source tags.`
     })
 
-    nodeHelpStore.openHelp(mockCoreNode as any)
+    const { renderedHelpHtml } = useNodeHelpContent(nodeRef)
     await flushPromises()
 
-    // Check that all media elements with different quote styles are prefixed correctly
-    // Double quotes remain as double quotes
-    expect(nodeHelpStore.renderedHelpHtml).toContain(
+    // All media src attributes should be prefixed correctly
+    // Note: marked normalizes quotes to double quotes in output
+    expect(renderedHelpHtml.value).toContain(
       `src="/docs/${mockCoreNode.name}/video1.mp4"`
     )
-    expect(nodeHelpStore.renderedHelpHtml).toContain(
+    expect(renderedHelpHtml.value).toContain(
+      `src="/docs/${mockCoreNode.name}/video2.mp4"`
+    )
+    expect(renderedHelpHtml.value).toContain(
       `src="/docs/${mockCoreNode.name}/image1.png"`
     )
-    expect(nodeHelpStore.renderedHelpHtml).toContain(
+    expect(renderedHelpHtml.value).toContain(
+      `src="/docs/${mockCoreNode.name}/image2.png"`
+    )
+    expect(renderedHelpHtml.value).toContain(
       `src="/docs/${mockCoreNode.name}/video3.mp4"`
     )
-
-    // Single quotes remain as single quotes in the output
-    expect(nodeHelpStore.renderedHelpHtml).toContain(
-      `src='/docs/${mockCoreNode.name}/video2.mp4'`
-    )
-    expect(nodeHelpStore.renderedHelpHtml).toContain(
-      `src='/docs/${mockCoreNode.name}/image2.png'`
-    )
-    expect(nodeHelpStore.renderedHelpHtml).toContain(
-      `src='/docs/${mockCoreNode.name}/video3.webm'`
+    expect(renderedHelpHtml.value).toContain(
+      `src="/docs/${mockCoreNode.name}/video3.webm"`
     )
   })
+
+  it('should ignore stale requests when node changes', async () => {
+    const nodeRef = ref(mockCoreNode)
+    let resolveFirst: (value: unknown) => void
+    const firstRequest = new Promise((resolve) => {
+      resolveFirst = resolve
+    })
+
+    mockFetch
+      .mockImplementationOnce(() => firstRequest)
+      .mockResolvedValueOnce({
+        ok: true,
+        text: async () => '# Second node content'
+      })
+
+    const { helpContent } = useNodeHelpContent(nodeRef)
+    await nextTick()
+
+    // Change node before first request completes
+    nodeRef.value = mockCustomNode
+    await nextTick()
+    await flushPromises()
+
+    // Now resolve the first (stale) request
+    resolveFirst!({
+      ok: true,
+      text: async () => '# First node content'
+    })
+    await flushPromises()
+
+    // Should have second node's content, not first
+    expect(helpContent.value).toBe('# Second node content')
+  })
 })
diff --git a/src/composables/useNodeHelpContent.ts b/src/composables/useNodeHelpContent.ts
new file mode 100644
index 0000000000..81ef9ae473
--- /dev/null
+++ b/src/composables/useNodeHelpContent.ts
@@ -0,0 +1,79 @@
+import type { MaybeRefOrGetter } from 'vue'
+import { computed, ref, toValue, watch } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import { nodeHelpService } from '@/services/nodeHelpService'
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+import { renderMarkdownToHtml } from '@/utils/markdownRendererUtil'
+import { getNodeHelpBaseUrl } from '@/workbench/utils/nodeHelpUtil'
+
+/**
+ * Composable for fetching and rendering node help content.
+ * Creates independent state for each usage, allowing multiple panels
+ * to show help content without interfering with each other.
+ *
+ * @param nodeRef - Reactive reference to the node to show help for
+ * @returns Reactive help content state and rendered HTML
+ */
+export function useNodeHelpContent(
+  nodeRef: MaybeRefOrGetter<ComfyNodeDefImpl | null>
+) {
+  const { locale } = useI18n()
+
+  const helpContent = ref<string>('')
+  const isLoading = ref<boolean>(false)
+  const error = ref<string | null>(null)
+
+  let currentRequest: Promise<string> | null = null
+
+  const baseUrl = computed(() => {
+    const node = toValue(nodeRef)
+    if (!node) return ''
+    return getNodeHelpBaseUrl(node)
+  })
+
+  const renderedHelpHtml = computed(() => {
+    return renderMarkdownToHtml(helpContent.value, baseUrl.value)
+  })
+
+  // Watch for node changes and fetch help content
+  watch(
+    () => toValue(nodeRef),
+    async (node) => {
+      helpContent.value = ''
+      error.value = null
+
+      if (node) {
+        isLoading.value = true
+        const request = (currentRequest = nodeHelpService.fetchNodeHelp(
+          node,
+          locale.value || 'en'
+        ))
+
+        try {
+          const content = await request
+          if (currentRequest !== request) return
+          helpContent.value = content
+        } catch (e: unknown) {
+          if (currentRequest !== request) return
+          error.value = e instanceof Error ? e.message : String(e)
+          helpContent.value = node.description || ''
+        } finally {
+          if (currentRequest === request) {
+            currentRequest = null
+            isLoading.value = false
+          }
+        }
+      }
+    },
+    { immediate: true }
+  )
+
+  return {
+    helpContent,
+    isLoading,
+    error,
+    baseUrl,
+    renderedHelpHtml
+  }
+}
diff --git a/src/composables/usePaste.test.ts b/src/composables/usePaste.test.ts
new file mode 100644
index 0000000000..dcd2acd44e
--- /dev/null
+++ b/src/composables/usePaste.test.ts
@@ -0,0 +1,657 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type {
+  LGraphCanvas,
+  LGraph,
+  LGraphGroup,
+  LGraphNode
+} from '@/lib/litegraph/src/litegraph'
+import { app } from '@/scripts/app'
+import { createMockLGraphNode } from '@/utils/__tests__/litegraphTestUtils'
+import {
+  createNode,
+  isAudioNode,
+  isImageNode,
+  isVideoNode
+} from '@/utils/litegraphUtil'
+import {
+  cloneDataTransfer,
+  pasteAudioNode,
+  pasteAudioNodes,
+  pasteImageNode,
+  pasteImageNodes,
+  pasteVideoNode,
+  pasteVideoNodes,
+  usePaste
+} from './usePaste'
+
+function createMockNode(): LGraphNode {
+  return createMockLGraphNode({
+    pos: [0, 0],
+    pasteFile: vi.fn(),
+    pasteFiles: vi.fn()
+  })
+}
+
+function createImageFile(
+  name: string = 'test.png',
+  type: string = 'image/png'
+): File {
+  return new File([''], name, { type })
+}
+
+function createAudioFile(
+  name: string = 'test.mp3',
+  type: string = 'audio/mpeg'
+): File {
+  return new File([''], name, { type })
+}
+
+function createVideoFile(
+  name: string = 'test.mp4',
+  type: string = 'video/mp4'
+): File {
+  return new File([''], name, { type })
+}
+
+function createDataTransfer(files: File[] = []): DataTransfer {
+  const dataTransfer = new DataTransfer()
+  files.forEach((file) => dataTransfer.items.add(file))
+  return dataTransfer
+}
+
+const mockCanvas = {
+  current_node: null as LGraphNode | null,
+  graph: {
+    add: vi.fn(),
+    change: vi.fn()
+  } as Partial<LGraph> as LGraph,
+  graph_mouse: [100, 200],
+  pasteFromClipboard: vi.fn(),
+  _deserializeItems: vi.fn()
+} as Partial<LGraphCanvas> as LGraphCanvas
+
+const mockCanvasStore = {
+  canvas: mockCanvas,
+  getCanvas: vi.fn(() => mockCanvas)
+}
+
+const mockWorkspaceStore = {
+  shiftDown: false
+}
+
+vi.mock('@vueuse/core', () => ({
+  useEventListener: vi.fn((target, event, handler) => {
+    target.addEventListener(event, handler)
+    return () => target.removeEventListener(event, handler)
+  })
+}))
+
+vi.mock('@/renderer/core/canvas/canvasStore', () => ({
+  useCanvasStore: () => mockCanvasStore
+}))
+
+vi.mock('@/stores/workspaceStore', () => ({
+  useWorkspaceStore: () => mockWorkspaceStore
+}))
+
+vi.mock('@/scripts/app', () => ({
+  app: {
+    loadGraphData: vi.fn()
+  }
+}))
+
+vi.mock('@/lib/litegraph/src/litegraph', async (importOriginal) => ({
+  ...(await importOriginal()),
+  LiteGraph: {
+    createNode: vi.fn()
+  }
+}))
+
+vi.mock('@/utils/litegraphUtil', () => ({
+  createNode: vi.fn(),
+  isAudioNode: vi.fn(),
+  isImageNode: vi.fn(),
+  isVideoNode: vi.fn()
+}))
+
+vi.mock('@/workbench/eventHelpers', () => ({
+  shouldIgnoreCopyPaste: vi.fn()
+}))
+
+describe('pasteImageNode', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    vi.mocked(mockCanvas.graph!.add).mockImplementation(
+      (node: LGraphNode | LGraphGroup | null) => node as LGraphNode
+    )
+  })
+
+  it('should create new LoadImage node when no image node provided', async () => {
+    const mockNode = createMockNode()
+    vi.mocked(createNode).mockResolvedValue(mockNode)
+
+    const file = createImageFile()
+    const dataTransfer = createDataTransfer([file])
+
+    await pasteImageNode(mockCanvas, dataTransfer.items)
+
+    expect(createNode).toHaveBeenCalledWith(mockCanvas, 'LoadImage')
+    expect(mockNode.pasteFile).toHaveBeenCalledWith(file)
+  })
+
+  it('should use existing image node when provided', async () => {
+    const mockNode = createMockNode()
+    const file = createImageFile()
+    const dataTransfer = createDataTransfer([file])
+
+    await pasteImageNode(mockCanvas, dataTransfer.items, mockNode)
+
+    expect(mockNode.pasteFile).toHaveBeenCalledWith(file)
+    expect(mockNode.pasteFiles).toHaveBeenCalledWith([file])
+  })
+
+  it('should handle multiple image files', async () => {
+    const mockNode = createMockNode()
+    const file1 = createImageFile('test1.png')
+    const file2 = createImageFile('test2.jpg', 'image/jpeg')
+    const dataTransfer = createDataTransfer([file1, file2])
+
+    await pasteImageNode(mockCanvas, dataTransfer.items, mockNode)
+
+    expect(mockNode.pasteFile).toHaveBeenCalledWith(file1)
+    expect(mockNode.pasteFiles).toHaveBeenCalledWith([file1, file2])
+  })
+
+  it('should do nothing when no image files present', async () => {
+    const mockNode = createMockNode()
+    const dataTransfer = createDataTransfer()
+
+    await pasteImageNode(mockCanvas, dataTransfer.items, mockNode)
+
+    expect(mockNode.pasteFile).not.toHaveBeenCalled()
+    expect(mockNode.pasteFiles).not.toHaveBeenCalled()
+  })
+
+  it('should filter non-image items', async () => {
+    const mockNode = createMockNode()
+    const imageFile = createImageFile()
+    const textFile = new File([''], 'test.txt', { type: 'text/plain' })
+    const dataTransfer = createDataTransfer([textFile, imageFile])
+
+    await pasteImageNode(mockCanvas, dataTransfer.items, mockNode)
+
+    expect(mockNode.pasteFile).toHaveBeenCalledWith(imageFile)
+    expect(mockNode.pasteFiles).toHaveBeenCalledWith([imageFile])
+  })
+})
+
+describe('pasteImageNodes', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('should create multiple nodes for multiple files', async () => {
+    const mockNode1 = createMockNode()
+    const mockNode2 = createMockNode()
+    vi.mocked(createNode)
+      .mockResolvedValueOnce(mockNode1)
+      .mockResolvedValueOnce(mockNode2)
+
+    const file1 = createImageFile('test1.png')
+    const file2 = createImageFile('test2.jpg', 'image/jpeg')
+
+    const result = await pasteImageNodes(mockCanvas, [file1, file2])
+
+    expect(createNode).toHaveBeenCalledTimes(2)
+    expect(createNode).toHaveBeenNthCalledWith(1, mockCanvas, 'LoadImage')
+    expect(createNode).toHaveBeenNthCalledWith(2, mockCanvas, 'LoadImage')
+    expect(mockNode1.pasteFile).toHaveBeenCalledWith(file1)
+    expect(mockNode2.pasteFile).toHaveBeenCalledWith(file2)
+    expect(result).toEqual([mockNode1, mockNode2])
+  })
+
+  it('should handle empty file list', async () => {
+    const result = await pasteImageNodes(mockCanvas, [])
+
+    expect(createNode).not.toHaveBeenCalled()
+    expect(result).toEqual([])
+  })
+})
+
+describe('pasteAudioNode', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('should create new LoadAudio node when no audio node provided', async () => {
+    const mockNode = createMockNode()
+    vi.mocked(createNode).mockResolvedValue(mockNode)
+
+    const file = createAudioFile()
+    const dataTransfer = createDataTransfer([file])
+
+    await pasteAudioNode(mockCanvas, dataTransfer.items)
+
+    expect(createNode).toHaveBeenCalledWith(mockCanvas, 'LoadAudio')
+    expect(mockNode.pasteFile).toHaveBeenCalledWith(file)
+  })
+
+  it('should use existing audio node when provided', async () => {
+    const mockNode = createMockNode()
+    const file = createAudioFile()
+    const dataTransfer = createDataTransfer([file])
+
+    await pasteAudioNode(mockCanvas, dataTransfer.items, mockNode)
+
+    expect(createNode).not.toHaveBeenCalled()
+    expect(mockNode.pasteFile).toHaveBeenCalledWith(file)
+  })
+
+  it('should filter non-audio items', async () => {
+    const mockNode = createMockNode()
+    const audioFile = createAudioFile()
+    const textFile = new File([''], 'test.txt', { type: 'text/plain' })
+    const dataTransfer = createDataTransfer([textFile, audioFile])
+
+    await pasteAudioNode(mockCanvas, dataTransfer.items, mockNode)
+
+    expect(mockNode.pasteFile).toHaveBeenCalledWith(audioFile)
+    expect(mockNode.pasteFiles).toHaveBeenCalledWith([audioFile])
+  })
+
+  it('should do nothing when no audio files present', async () => {
+    const mockNode = createMockNode()
+    const dataTransfer = createDataTransfer()
+
+    await pasteAudioNode(mockCanvas, dataTransfer.items, mockNode)
+
+    expect(mockNode.pasteFile).not.toHaveBeenCalled()
+    expect(mockNode.pasteFiles).not.toHaveBeenCalled()
+  })
+})
+
+describe('pasteAudioNodes', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('should create multiple nodes for multiple audio files', async () => {
+    const mockNode1 = createMockNode()
+    const mockNode2 = createMockNode()
+    vi.mocked(createNode)
+      .mockResolvedValueOnce(mockNode1)
+      .mockResolvedValueOnce(mockNode2)
+
+    const file1 = createAudioFile('file1.mp3')
+    const file2 = createAudioFile('file2.wav', 'audio/wav')
+
+    const result = await pasteAudioNodes(mockCanvas, [file1, file2])
+
+    expect(createNode).toHaveBeenCalledTimes(2)
+    expect(createNode).toHaveBeenNthCalledWith(1, mockCanvas, 'LoadAudio')
+    expect(createNode).toHaveBeenNthCalledWith(2, mockCanvas, 'LoadAudio')
+    expect(mockNode1.pasteFile).toHaveBeenCalledWith(file1)
+    expect(mockNode2.pasteFile).toHaveBeenCalledWith(file2)
+    expect(result).toEqual([mockNode1, mockNode2])
+  })
+
+  it('should handle empty file list', async () => {
+    const result = await pasteAudioNodes(mockCanvas, [])
+
+    expect(createNode).not.toHaveBeenCalled()
+    expect(result).toEqual([])
+  })
+
+  it('should handle single audio file', async () => {
+    const mockNode = createMockNode()
+    vi.mocked(createNode).mockResolvedValue(mockNode)
+
+    const file = createAudioFile()
+    const result = await pasteAudioNodes(mockCanvas, [file])
+
+    expect(createNode).toHaveBeenCalledTimes(1)
+    expect(result).toEqual([mockNode])
+  })
+})
+
+describe('pasteVideoNode', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('should create new LoadVideo node when no video node provided', async () => {
+    const mockNode = createMockNode()
+    vi.mocked(createNode).mockResolvedValue(mockNode)
+
+    const file = createVideoFile()
+    const dataTransfer = createDataTransfer([file])
+
+    await pasteVideoNode(mockCanvas, dataTransfer.items)
+
+    expect(createNode).toHaveBeenCalledWith(mockCanvas, 'LoadVideo')
+    expect(mockNode.pasteFile).toHaveBeenCalledWith(file)
+  })
+
+  it('should use existing video node when provided', async () => {
+    const mockNode = createMockNode()
+    const file = createVideoFile()
+    const dataTransfer = createDataTransfer([file])
+
+    await pasteVideoNode(mockCanvas, dataTransfer.items, mockNode)
+
+    expect(createNode).not.toHaveBeenCalled()
+    expect(mockNode.pasteFile).toHaveBeenCalledWith(file)
+  })
+
+  it('should filter non-video items', async () => {
+    const mockNode = createMockNode()
+    const videoFile = createVideoFile()
+    const imageFile = createImageFile()
+    const dataTransfer = createDataTransfer([imageFile, videoFile])
+
+    await pasteVideoNode(mockCanvas, dataTransfer.items, mockNode)
+
+    expect(mockNode.pasteFile).toHaveBeenCalledWith(videoFile)
+    expect(mockNode.pasteFiles).toHaveBeenCalledWith([videoFile])
+  })
+
+  it('should do nothing when no video files present', async () => {
+    const mockNode = createMockNode()
+    const dataTransfer = createDataTransfer()
+
+    await pasteVideoNode(mockCanvas, dataTransfer.items, mockNode)
+
+    expect(mockNode.pasteFile).not.toHaveBeenCalled()
+    expect(mockNode.pasteFiles).not.toHaveBeenCalled()
+  })
+})
+
+describe('pasteVideoNodes', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('should create multiple nodes for multiple video files', async () => {
+    const mockNode1 = createMockNode()
+    const mockNode2 = createMockNode()
+    vi.mocked(createNode)
+      .mockResolvedValueOnce(mockNode1)
+      .mockResolvedValueOnce(mockNode2)
+
+    const file1 = createVideoFile('file1.mp4')
+    const file2 = createVideoFile('file2.webm', 'video/webm')
+
+    const result = await pasteVideoNodes(mockCanvas, [file1, file2])
+
+    expect(createNode).toHaveBeenCalledTimes(2)
+    expect(createNode).toHaveBeenNthCalledWith(1, mockCanvas, 'LoadVideo')
+    expect(createNode).toHaveBeenNthCalledWith(2, mockCanvas, 'LoadVideo')
+    expect(mockNode1.pasteFile).toHaveBeenCalledWith(file1)
+    expect(mockNode2.pasteFile).toHaveBeenCalledWith(file2)
+    expect(result).toEqual([mockNode1, mockNode2])
+  })
+
+  it('should handle empty file list', async () => {
+    const result = await pasteVideoNodes(mockCanvas, [])
+
+    expect(createNode).not.toHaveBeenCalled()
+    expect(result).toEqual([])
+  })
+
+  it('should handle single video file', async () => {
+    const mockNode = createMockNode()
+    vi.mocked(createNode).mockResolvedValue(mockNode)
+
+    const file = createVideoFile()
+    const result = await pasteVideoNodes(mockCanvas, [file])
+
+    expect(createNode).toHaveBeenCalledTimes(1)
+    expect(result).toEqual([mockNode])
+  })
+})
+
+describe('usePaste', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockCanvas.current_node = null
+    mockWorkspaceStore.shiftDown = false
+    vi.mocked(mockCanvas.graph!.add).mockImplementation(
+      (node: LGraphNode | LGraphGroup | null) => node as LGraphNode
+    )
+  })
+
+  it('should handle image paste', async () => {
+    const mockNode = createMockNode()
+    vi.mocked(createNode).mockResolvedValue(mockNode)
+
+    usePaste()
+
+    const file = createImageFile()
+    const dataTransfer = createDataTransfer([file])
+    const event = new ClipboardEvent('paste', { clipboardData: dataTransfer })
+    document.dispatchEvent(event)
+
+    await vi.waitFor(() => {
+      expect(createNode).toHaveBeenCalledWith(mockCanvas, 'LoadImage')
+      expect(mockNode.pasteFile).toHaveBeenCalledWith(file)
+    })
+  })
+
+  it('should handle audio paste using createNode helper', async () => {
+    const mockNode = createMockNode()
+    vi.mocked(createNode).mockResolvedValue(mockNode)
+
+    usePaste()
+
+    const file = createAudioFile()
+    const dataTransfer = createDataTransfer([file])
+    const event = new ClipboardEvent('paste', { clipboardData: dataTransfer })
+    document.dispatchEvent(event)
+
+    await vi.waitFor(() => {
+      expect(createNode).toHaveBeenCalledWith(mockCanvas, 'LoadAudio')
+      expect(mockNode.pasteFile).toHaveBeenCalledWith(file)
+    })
+  })
+
+  it('should paste audio onto selected LoadAudio node', async () => {
+    const mockNode = createMockLGraphNode({
+      is_selected: true,
+      pasteFile: vi.fn(),
+      pasteFiles: vi.fn()
+    })
+    mockCanvas.current_node = mockNode
+    vi.mocked(isAudioNode).mockReturnValue(true)
+
+    usePaste()
+
+    const file = createAudioFile()
+    const dataTransfer = createDataTransfer([file])
+    const event = new ClipboardEvent('paste', { clipboardData: dataTransfer })
+    document.dispatchEvent(event)
+
+    await vi.waitFor(() => {
+      expect(createNode).not.toHaveBeenCalled()
+      expect(mockNode.pasteFile).toHaveBeenCalledWith(file)
+    })
+  })
+
+  it('should handle video paste', async () => {
+    const mockNode = createMockNode()
+    vi.mocked(createNode).mockResolvedValue(mockNode)
+
+    usePaste()
+
+    const file = createVideoFile()
+    const dataTransfer = createDataTransfer([file])
+    const event = new ClipboardEvent('paste', { clipboardData: dataTransfer })
+    document.dispatchEvent(event)
+
+    await vi.waitFor(() => {
+      expect(createNode).toHaveBeenCalledWith(mockCanvas, 'LoadVideo')
+      expect(mockNode.pasteFile).toHaveBeenCalledWith(file)
+    })
+  })
+
+  it('should paste video onto selected LoadVideo node', async () => {
+    const mockNode = createMockLGraphNode({
+      is_selected: true,
+      pasteFile: vi.fn(),
+      pasteFiles: vi.fn()
+    })
+    mockCanvas.current_node = mockNode
+    vi.mocked(isVideoNode).mockReturnValue(true)
+
+    usePaste()
+
+    const file = createVideoFile()
+    const dataTransfer = createDataTransfer([file])
+    const event = new ClipboardEvent('paste', { clipboardData: dataTransfer })
+    document.dispatchEvent(event)
+
+    await vi.waitFor(() => {
+      expect(createNode).not.toHaveBeenCalled()
+      expect(mockNode.pasteFile).toHaveBeenCalledWith(file)
+    })
+  })
+
+  it('should handle workflow JSON paste', async () => {
+    const workflow = { version: '1.0', nodes: [], extra: {} }
+
+    usePaste()
+
+    const dataTransfer = new DataTransfer()
+    dataTransfer.setData('text/plain', JSON.stringify(workflow))
+
+    const event = new ClipboardEvent('paste', { clipboardData: dataTransfer })
+    document.dispatchEvent(event)
+
+    await vi.waitFor(() => {
+      expect(app.loadGraphData).toHaveBeenCalledWith(workflow)
+    })
+  })
+
+  it('should ignore paste when shift is down', () => {
+    mockWorkspaceStore.shiftDown = true
+
+    usePaste()
+
+    const file = createImageFile()
+    const dataTransfer = createDataTransfer([file])
+    const event = new ClipboardEvent('paste', { clipboardData: dataTransfer })
+    document.dispatchEvent(event)
+
+    expect(createNode).not.toHaveBeenCalled()
+  })
+
+  it('should use existing image node when selected', () => {
+    const mockNode = createMockLGraphNode({
+      is_selected: true,
+      pasteFile: vi.fn(),
+      pasteFiles: vi.fn()
+    })
+    mockCanvas.current_node = mockNode
+    vi.mocked(isImageNode).mockReturnValue(true)
+
+    usePaste()
+
+    const file = createImageFile()
+    const dataTransfer = createDataTransfer([file])
+    const event = new ClipboardEvent('paste', { clipboardData: dataTransfer })
+    document.dispatchEvent(event)
+
+    expect(mockNode.pasteFile).toHaveBeenCalledWith(file)
+  })
+
+  it('should call canvas pasteFromClipboard for non-workflow text', () => {
+    usePaste()
+
+    const dataTransfer = new DataTransfer()
+    dataTransfer.setData('text/plain', 'just some text')
+
+    const event = new ClipboardEvent('paste', { clipboardData: dataTransfer })
+    document.dispatchEvent(event)
+
+    expect(mockCanvas.pasteFromClipboard).toHaveBeenCalled()
+  })
+
+  it('should handle clipboard items with metadata', async () => {
+    const data = { test: 'data' }
+    const encoded = btoa(JSON.stringify(data))
+    const html = `<div data-metadata="${encoded}"></div>`
+
+    usePaste()
+
+    const dataTransfer = new DataTransfer()
+    dataTransfer.setData('text/html', html)
+
+    const event = new ClipboardEvent('paste', { clipboardData: dataTransfer })
+    document.dispatchEvent(event)
+
+    await vi.waitFor(() => {
+      expect(mockCanvas._deserializeItems).toHaveBeenCalledWith(
+        data,
+        expect.any(Object)
+      )
+    })
+  })
+})
+
+describe('cloneDataTransfer', () => {
+  it('should clone string data', () => {
+    const original = new DataTransfer()
+    original.setData('text/plain', 'test text')
+    original.setData('text/html', '<p>test html</p>')
+
+    const cloned = cloneDataTransfer(original)
+
+    expect(cloned.getData('text/plain')).toBe('test text')
+    expect(cloned.getData('text/html')).toBe('<p>test html</p>')
+  })
+
+  it('should clone files', () => {
+    const file1 = createImageFile('test1.png')
+    const file2 = createImageFile('test2.jpg', 'image/jpeg')
+    const original = createDataTransfer([file1, file2])
+
+    const cloned = cloneDataTransfer(original)
+
+    // Files are added from both .files and .items, causing duplicates
+    expect(cloned.files.length).toBeGreaterThanOrEqual(2)
+    expect(Array.from(cloned.files)).toContain(file1)
+    expect(Array.from(cloned.files)).toContain(file2)
+  })
+
+  it('should preserve dropEffect and effectAllowed', () => {
+    const original = new DataTransfer()
+    original.dropEffect = 'copy'
+    original.effectAllowed = 'copyMove'
+
+    const cloned = cloneDataTransfer(original)
+
+    expect(cloned.dropEffect).toBe('copy')
+    expect(cloned.effectAllowed).toBe('copyMove')
+  })
+
+  it('should handle empty DataTransfer', () => {
+    const original = new DataTransfer()
+
+    const cloned = cloneDataTransfer(original)
+
+    expect(cloned.types.length).toBe(0)
+    expect(cloned.files.length).toBe(0)
+  })
+
+  it('should clone both string data and files', () => {
+    const file = createImageFile()
+    const original = createDataTransfer([file])
+    original.setData('text/plain', 'test')
+
+    const cloned = cloneDataTransfer(original)
+
+    expect(cloned.getData('text/plain')).toBe('test')
+    // Files are added from both .files and .items
+    expect(cloned.files.length).toBeGreaterThanOrEqual(1)
+    expect(Array.from(cloned.files)).toContain(file)
+  })
+})
diff --git a/src/composables/usePaste.ts b/src/composables/usePaste.ts
index 9a40fab9a3..b60afc1501 100644
--- a/src/composables/usePaste.ts
+++ b/src/composables/usePaste.ts
@@ -1,14 +1,45 @@
 import { useEventListener } from '@vueuse/core'
 
-import { LiteGraph } from '@/lib/litegraph/src/litegraph'
-import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type { LGraphCanvas, LGraphNode } from '@/lib/litegraph/src/litegraph'
 import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import { app } from '@/scripts/app'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
-import { isAudioNode, isImageNode, isVideoNode } from '@/utils/litegraphUtil'
+import {
+  createNode,
+  isAudioNode,
+  isImageNode,
+  isVideoNode
+} from '@/utils/litegraphUtil'
 import { shouldIgnoreCopyPaste } from '@/workbench/eventHelpers'
 
+export function cloneDataTransfer(original: DataTransfer): DataTransfer {
+  const persistent = new DataTransfer()
+
+  // Copy string data
+  for (const type of original.types) {
+    const data = original.getData(type)
+    if (data) {
+      persistent.setData(type, data)
+    }
+  }
+
+  for (const item of original.items) {
+    if (item.kind === 'file') {
+      const file = item.getAsFile()
+      if (file) {
+        persistent.items.add(file)
+      }
+    }
+  }
+
+  // Preserve dropEffect and effectAllowed
+  persistent.dropEffect = original.dropEffect
+  persistent.effectAllowed = original.effectAllowed
+
+  return persistent
+}
+
 function pasteClipboardItems(data: DataTransfer): boolean {
   const rawData = data.getData('text/html')
   const match = rawData.match(/data-metadata="([A-Za-z0-9+/=]+)"/)?.[1]
@@ -26,6 +57,123 @@ function pasteClipboardItems(data: DataTransfer): boolean {
   return false
 }
 
+function pasteItemsOnNode(
+  items: DataTransferItemList,
+  node: LGraphNode | null,
+  contentType: string
+): void {
+  if (!node) return
+
+  const filteredItems = Array.from(items).filter((item) =>
+    item.type.startsWith(contentType)
+  )
+
+  const blob = filteredItems[0]?.getAsFile()
+  if (!blob) return
+
+  node.pasteFile?.(blob)
+  node.pasteFiles?.(
+    Array.from(filteredItems)
+      .map((i) => i.getAsFile())
+      .filter((f) => f !== null)
+  )
+}
+
+export async function pasteImageNode(
+  canvas: LGraphCanvas,
+  items: DataTransferItemList,
+  imageNode: LGraphNode | null = null
+): Promise<LGraphNode | null> {
+  // No image node selected: add a new one
+  if (!imageNode) {
+    imageNode = await createNode(canvas, 'LoadImage')
+  }
+
+  pasteItemsOnNode(items, imageNode, 'image')
+  return imageNode
+}
+
+export async function pasteImageNodes(
+  canvas: LGraphCanvas,
+  fileList: File[]
+): Promise<LGraphNode[]> {
+  const nodes: LGraphNode[] = []
+
+  for (const file of fileList) {
+    const transfer = new DataTransfer()
+    transfer.items.add(file)
+    const imageNode = await pasteImageNode(canvas, transfer.items)
+
+    if (imageNode) {
+      nodes.push(imageNode)
+    }
+  }
+
+  return nodes
+}
+
+export async function pasteAudioNode(
+  canvas: LGraphCanvas,
+  items: DataTransferItemList,
+  audioNode: LGraphNode | null = null
+): Promise<LGraphNode | null> {
+  if (!audioNode) {
+    audioNode = await createNode(canvas, 'LoadAudio')
+  }
+  pasteItemsOnNode(items, audioNode, 'audio')
+  return audioNode
+}
+
+export async function pasteAudioNodes(
+  canvas: LGraphCanvas,
+  fileList: File[]
+): Promise<LGraphNode[]> {
+  const nodes: LGraphNode[] = []
+
+  for (const file of fileList) {
+    const transfer = new DataTransfer()
+    transfer.items.add(file)
+    const node = await pasteAudioNode(canvas, transfer.items)
+
+    if (node) {
+      nodes.push(node)
+    }
+  }
+
+  return nodes
+}
+
+export async function pasteVideoNode(
+  canvas: LGraphCanvas,
+  items: DataTransferItemList,
+  videoNode: LGraphNode | null = null
+): Promise<LGraphNode | null> {
+  if (!videoNode) {
+    videoNode = await createNode(canvas, 'LoadVideo')
+  }
+  pasteItemsOnNode(items, videoNode, 'video')
+  return videoNode
+}
+
+export async function pasteVideoNodes(
+  canvas: LGraphCanvas,
+  fileList: File[]
+): Promise<LGraphNode[]> {
+  const nodes: LGraphNode[] = []
+
+  for (const file of fileList) {
+    const transfer = new DataTransfer()
+    transfer.items.add(file)
+    const node = await pasteVideoNode(canvas, transfer.items)
+
+    if (node) {
+      nodes.push(node)
+    }
+  }
+
+  return nodes
+}
+
 /**
  * Adds a handler on paste that extracts and loads images or workflows from pasted JSON data
  */
@@ -33,28 +181,6 @@ export const usePaste = () => {
   const workspaceStore = useWorkspaceStore()
   const canvasStore = useCanvasStore()
 
-  const pasteItemsOnNode = (
-    items: DataTransferItemList,
-    node: LGraphNode | null,
-    contentType: string
-  ) => {
-    if (!node) return
-
-    const filteredItems = Array.from(items).filter((item) =>
-      item.type.startsWith(contentType)
-    )
-
-    const blob = filteredItems[0]?.getAsFile()
-    if (!blob) return
-
-    node.pasteFile?.(blob)
-    node.pasteFiles?.(
-      Array.from(filteredItems)
-        .map((i) => i.getAsFile())
-        .filter((f) => f !== null)
-    )
-  }
-
   useEventListener(document, 'paste', async (e) => {
     if (shouldIgnoreCopyPaste(e.target)) {
       // Default system copy
@@ -67,9 +193,9 @@ export const usePaste = () => {
     const { canvas } = canvasStore
     if (!canvas) return
 
-    const { graph } = canvas
     let data: DataTransfer | string | null = e.clipboardData
     if (!data) throw new Error('No clipboard data on clipboard event')
+    data = cloneDataTransfer(data)
 
     const { items } = data
 
@@ -80,8 +206,12 @@ export const usePaste = () => {
     const isVideoNodeSelected = isNodeSelected && isVideoNode(currentNode)
     const isAudioNodeSelected = isNodeSelected && isAudioNode(currentNode)
 
-    let imageNode: LGraphNode | null = isImageNodeSelected ? currentNode : null
-    let audioNode: LGraphNode | null = isAudioNodeSelected ? currentNode : null
+    const audioNode: LGraphNode | null = isAudioNodeSelected
+      ? currentNode
+      : null
+    const imageNode: LGraphNode | null = isImageNodeSelected
+      ? currentNode
+      : null
     const videoNode: LGraphNode | null = isVideoNodeSelected
       ? currentNode
       : null
@@ -89,36 +219,13 @@ export const usePaste = () => {
     // Look for image paste data
     for (const item of items) {
       if (item.type.startsWith('image/')) {
-        if (!imageNode) {
-          // No image node selected: add a new one
-          const newNode = LiteGraph.createNode('LoadImage')
-          if (newNode) {
-            newNode.pos = [canvas.graph_mouse[0], canvas.graph_mouse[1]]
-            imageNode = graph?.add(newNode) ?? null
-          }
-          graph?.change()
-        }
-        pasteItemsOnNode(items, imageNode, 'image')
+        await pasteImageNode(canvas as LGraphCanvas, items, imageNode)
         return
       } else if (item.type.startsWith('video/')) {
-        if (!videoNode) {
-          // No video node selected: add a new one
-          // TODO: when video node exists
-        } else {
-          pasteItemsOnNode(items, videoNode, 'video')
-          return
-        }
+        await pasteVideoNode(canvas as LGraphCanvas, items, videoNode)
+        return
       } else if (item.type.startsWith('audio/')) {
-        if (!audioNode) {
-          // No audio node selected: add a new one
-          const newNode = LiteGraph.createNode('LoadAudio')
-          if (newNode) {
-            newNode.pos = [canvas.graph_mouse[0], canvas.graph_mouse[1]]
-            audioNode = graph?.add(newNode) ?? null
-          }
-          graph?.change()
-        }
-        pasteItemsOnNode(items, audioNode, 'audio')
+        await pasteAudioNode(canvas as LGraphCanvas, items, audioNode)
         return
       }
     }
diff --git a/src/composables/usePerTabState.test.ts b/src/composables/usePerTabState.test.ts
new file mode 100644
index 0000000000..947124adca
--- /dev/null
+++ b/src/composables/usePerTabState.test.ts
@@ -0,0 +1,73 @@
+import { ref } from 'vue'
+import { describe, expect, it } from 'vitest'
+
+import { usePerTabState } from './usePerTabState'
+
+type TabId = 'a' | 'b' | 'c'
+
+describe('usePerTabState', () => {
+  function setup(initialTab: TabId = 'a') {
+    const selectedTab = ref<TabId>(initialTab)
+    const stateByTab = ref<Record<TabId, string[]>>({
+      a: [],
+      b: [],
+      c: []
+    })
+    const state = usePerTabState(selectedTab, stateByTab)
+    return { selectedTab, stateByTab, state }
+  }
+
+  it('should return state for the current tab', () => {
+    const { selectedTab, stateByTab, state } = setup()
+
+    stateByTab.value.a = ['key1', 'key2']
+    stateByTab.value.b = ['key3']
+
+    expect(state.value).toEqual(['key1', 'key2'])
+
+    selectedTab.value = 'b'
+    expect(state.value).toEqual(['key3'])
+  })
+
+  it('should set state only for the current tab', () => {
+    const { stateByTab, state } = setup()
+
+    state.value = ['new-key1', 'new-key2']
+
+    expect(stateByTab.value.a).toEqual(['new-key1', 'new-key2'])
+    expect(stateByTab.value.b).toEqual([])
+    expect(stateByTab.value.c).toEqual([])
+  })
+
+  it('should preserve state when switching tabs', () => {
+    const { selectedTab, stateByTab, state } = setup()
+
+    state.value = ['a-key']
+    selectedTab.value = 'b'
+    state.value = ['b-key']
+    selectedTab.value = 'c'
+    state.value = ['c-key']
+
+    expect(stateByTab.value.a).toEqual(['a-key'])
+    expect(stateByTab.value.b).toEqual(['b-key'])
+    expect(stateByTab.value.c).toEqual(['c-key'])
+
+    selectedTab.value = 'a'
+    expect(state.value).toEqual(['a-key'])
+  })
+
+  it('should not share state between tabs', () => {
+    const { selectedTab, state } = setup()
+
+    state.value = ['only-a']
+
+    selectedTab.value = 'b'
+    expect(state.value).toEqual([])
+
+    selectedTab.value = 'c'
+    expect(state.value).toEqual([])
+
+    selectedTab.value = 'a'
+    expect(state.value).toEqual(['only-a'])
+  })
+})
diff --git a/src/composables/usePerTabState.ts b/src/composables/usePerTabState.ts
new file mode 100644
index 0000000000..3019dba667
--- /dev/null
+++ b/src/composables/usePerTabState.ts
@@ -0,0 +1,14 @@
+import type { Ref } from 'vue'
+import { computed } from 'vue'
+
+export function usePerTabState<K extends string, V>(
+  selectedTab: Ref<K>,
+  stateByTab: Ref<Record<K, V>>
+) {
+  return computed({
+    get: () => stateByTab.value[selectedTab.value],
+    set: (value) => {
+      stateByTab.value[selectedTab.value] = value
+    }
+  })
+}
diff --git a/src/composables/useProgressBarBackground.ts b/src/composables/useProgressBarBackground.ts
new file mode 100644
index 0000000000..4ff6f73413
--- /dev/null
+++ b/src/composables/useProgressBarBackground.ts
@@ -0,0 +1,47 @@
+type ProgressPercent = number | undefined
+
+const progressBarContainerClass = 'absolute inset-0'
+const progressBarBaseClass =
+  'pointer-events-none absolute inset-y-0 left-0 h-full transition-[width]'
+const progressBarPrimaryClass = `${progressBarBaseClass} bg-interface-panel-job-progress-primary`
+const progressBarSecondaryClass = `${progressBarBaseClass} bg-interface-panel-job-progress-secondary`
+
+function clampPercent(value: number) {
+  return Math.min(100, Math.max(0, value))
+}
+
+function normalizeProgressPercent(value: ProgressPercent) {
+  if (value === undefined || !Number.isFinite(value)) return undefined
+
+  return clampPercent(value)
+}
+
+function hasProgressPercent(value: ProgressPercent) {
+  return normalizeProgressPercent(value) !== undefined
+}
+
+function hasAnyProgressPercent(
+  totalPercent: ProgressPercent,
+  currentPercent: ProgressPercent
+) {
+  return hasProgressPercent(totalPercent) || hasProgressPercent(currentPercent)
+}
+
+function progressPercentStyle(value: ProgressPercent) {
+  const normalized = normalizeProgressPercent(value)
+
+  if (normalized === undefined) return undefined
+
+  return { width: `${normalized}%` }
+}
+
+export function useProgressBarBackground() {
+  return {
+    progressBarContainerClass,
+    progressBarPrimaryClass,
+    progressBarSecondaryClass,
+    hasProgressPercent,
+    hasAnyProgressPercent,
+    progressPercentStyle
+  }
+}
diff --git a/tests-ui/tests/composables/useServerLogs.test.ts b/src/composables/useServerLogs.test.ts
similarity index 100%
rename from tests-ui/tests/composables/useServerLogs.test.ts
rename to src/composables/useServerLogs.test.ts
diff --git a/src/composables/useStablePrimeVueSplitterSizer.test.ts b/src/composables/useStablePrimeVueSplitterSizer.test.ts
new file mode 100644
index 0000000000..05ce12df33
--- /dev/null
+++ b/src/composables/useStablePrimeVueSplitterSizer.test.ts
@@ -0,0 +1,133 @@
+import type { SplitterResizeEndEvent } from 'primevue/splitter'
+
+import { nextTick, ref } from 'vue'
+import { describe, expect, it, vi } from 'vitest'
+
+import { useStablePrimeVueSplitterSizer } from './useStablePrimeVueSplitterSizer'
+
+vi.mock('@vueuse/core', async (importOriginal) => {
+  const actual = await importOriginal()
+  return {
+    ...(actual as object),
+    useStorage: <T>(_key: string, defaultValue: T) => ref(defaultValue)
+  }
+})
+
+function createPanel(width: number) {
+  const el = document.createElement('div')
+  Object.defineProperty(el, 'offsetWidth', { value: width })
+  return ref(el)
+}
+
+function resizeEndEvent(): SplitterResizeEndEvent {
+  return { originalEvent: new Event('mouseup'), sizes: [] }
+}
+
+async function flushWatcher() {
+  await nextTick()
+  await nextTick()
+}
+
+describe('useStablePrimeVueSplitterSizer', () => {
+  it('captures pixel widths on resize end and applies on trigger', async () => {
+    const panelRef = createPanel(400)
+    const trigger = ref(0)
+
+    const { onResizeEnd } = useStablePrimeVueSplitterSizer(
+      [{ ref: panelRef, storageKey: 'test-capture' }],
+      [trigger]
+    )
+    await flushWatcher()
+
+    onResizeEnd(resizeEndEvent())
+
+    trigger.value++
+    await flushWatcher()
+
+    expect(panelRef.value!.style.flexBasis).toBe('400px')
+    expect(panelRef.value!.style.flexGrow).toBe('0')
+    expect(panelRef.value!.style.flexShrink).toBe('0')
+  })
+
+  it('does not apply styles when no stored width exists', async () => {
+    const panelRef = createPanel(300)
+    const trigger = ref(0)
+
+    useStablePrimeVueSplitterSizer(
+      [{ ref: panelRef, storageKey: 'test-no-stored' }],
+      [trigger]
+    )
+    await flushWatcher()
+
+    expect(panelRef.value!.style.flexBasis).toBe('')
+  })
+
+  it('re-applies stored widths when watch sources change', async () => {
+    const panelRef = createPanel(500)
+    const trigger = ref(0)
+
+    const { onResizeEnd } = useStablePrimeVueSplitterSizer(
+      [{ ref: panelRef, storageKey: 'test-reapply' }],
+      [trigger]
+    )
+    await flushWatcher()
+
+    onResizeEnd(resizeEndEvent())
+
+    panelRef.value!.style.flexBasis = ''
+    panelRef.value!.style.flexGrow = ''
+    panelRef.value!.style.flexShrink = ''
+
+    trigger.value++
+    await flushWatcher()
+
+    expect(panelRef.value!.style.flexBasis).toBe('500px')
+    expect(panelRef.value!.style.flexGrow).toBe('0')
+    expect(panelRef.value!.style.flexShrink).toBe('0')
+  })
+
+  it('handles multiple panels independently', async () => {
+    const leftRef = createPanel(300)
+    const rightRef = createPanel(250)
+    const trigger = ref(0)
+
+    const { onResizeEnd } = useStablePrimeVueSplitterSizer(
+      [
+        { ref: leftRef, storageKey: 'test-multi-left' },
+        { ref: rightRef, storageKey: 'test-multi-right' }
+      ],
+      [trigger]
+    )
+    await flushWatcher()
+
+    onResizeEnd(resizeEndEvent())
+
+    trigger.value++
+    await flushWatcher()
+
+    expect(leftRef.value!.style.flexBasis).toBe('300px')
+    expect(rightRef.value!.style.flexBasis).toBe('250px')
+  })
+
+  it('skips panels with null refs', async () => {
+    const nullRef = ref(null)
+    const validRef = createPanel(200)
+    const trigger = ref(0)
+
+    const { onResizeEnd } = useStablePrimeVueSplitterSizer(
+      [
+        { ref: nullRef, storageKey: 'test-null' },
+        { ref: validRef, storageKey: 'test-valid' }
+      ],
+      [trigger]
+    )
+    await flushWatcher()
+
+    onResizeEnd(resizeEndEvent())
+
+    trigger.value++
+    await flushWatcher()
+
+    expect(validRef.value!.style.flexBasis).toBe('200px')
+  })
+})
diff --git a/src/composables/useStablePrimeVueSplitterSizer.ts b/src/composables/useStablePrimeVueSplitterSizer.ts
new file mode 100644
index 0000000000..06ab0860de
--- /dev/null
+++ b/src/composables/useStablePrimeVueSplitterSizer.ts
@@ -0,0 +1,64 @@
+import type { SplitterResizeEndEvent } from 'primevue/splitter'
+import type { WatchSource } from 'vue'
+
+import { unrefElement, useStorage } from '@vueuse/core'
+import type { MaybeComputedElementRef } from '@vueuse/core'
+import { nextTick, watch } from 'vue'
+
+interface PanelConfig {
+  ref: MaybeComputedElementRef
+  storageKey: string
+}
+
+/**
+ * Works around PrimeVue Splitter not properly initializing flexBasis
+ * when panels are conditionally rendered. Captures pixel widths on
+ * resize end and re-applies them as rigid flex values (flex: 0 0 Xpx)
+ * when watched sources change (e.g. tab switch, panel toggle).
+ *
+ * @param panels - array of panel configs with template ref and storage key
+ * @param watchSources - reactive sources that trigger re-application
+ */
+export function useStablePrimeVueSplitterSizer(
+  panels: PanelConfig[],
+  watchSources: WatchSource[]
+) {
+  const storedWidths = panels.map((panel) => ({
+    ref: panel.ref,
+    width: useStorage<number | null>(panel.storageKey, null)
+  }))
+
+  function resolveElement(
+    ref: MaybeComputedElementRef
+  ): HTMLElement | undefined {
+    return unrefElement(ref) as HTMLElement | undefined
+  }
+
+  function applyStoredWidths() {
+    for (const { ref, width } of storedWidths) {
+      const el = resolveElement(ref)
+      if (!el || width.value === null) continue
+      el.style.flexBasis = `${width.value}px`
+      el.style.flexGrow = '0'
+      el.style.flexShrink = '0'
+    }
+  }
+
+  function onResizeEnd(_event: SplitterResizeEndEvent) {
+    for (const { ref, width } of storedWidths) {
+      const el = resolveElement(ref)
+      if (el) width.value = el.offsetWidth
+    }
+  }
+
+  watch(
+    watchSources,
+    async () => {
+      await nextTick()
+      applyStoredWidths()
+    },
+    { immediate: true }
+  )
+
+  return { onResizeEnd }
+}
diff --git a/src/composables/useTemplateFiltering.test.ts b/src/composables/useTemplateFiltering.test.ts
new file mode 100644
index 0000000000..48e7f6fd83
--- /dev/null
+++ b/src/composables/useTemplateFiltering.test.ts
@@ -0,0 +1,479 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { nextTick, ref } from 'vue'
+import type { IFuseOptions } from 'fuse.js'
+
+import type { TemplateInfo } from '@/platform/workflow/templates/types/template'
+import { useTemplateFiltering } from '@/composables/useTemplateFiltering'
+
+const defaultSettingStore = {
+  get: vi.fn((key: string) => {
+    switch (key) {
+      case 'Comfy.Templates.SelectedModels':
+      case 'Comfy.Templates.SelectedUseCases':
+      case 'Comfy.Templates.SelectedRunsOn':
+        return []
+      case 'Comfy.Templates.SortBy':
+        return 'newest'
+      default:
+        return undefined
+    }
+  }),
+  set: vi.fn().mockResolvedValue(undefined)
+}
+
+const defaultRankingStore = {
+  computeDefaultScore: vi.fn(() => 0),
+  computePopularScore: vi.fn(() => 0),
+  getUsageScore: vi.fn(() => 0),
+  computeFreshness: vi.fn(() => 0.5),
+  isLoaded: { value: false }
+}
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: vi.fn(() => defaultSettingStore)
+}))
+
+vi.mock('@/stores/templateRankingStore', () => ({
+  useTemplateRankingStore: vi.fn(() => defaultRankingStore)
+}))
+
+vi.mock('@/platform/telemetry', () => ({
+  useTelemetry: vi.fn(() => ({
+    trackTemplateFilterChanged: vi.fn()
+  }))
+}))
+
+const mockGetFuseOptions = vi.hoisted(() => vi.fn())
+vi.mock('@/scripts/api', () => ({
+  api: {
+    getFuseOptions: mockGetFuseOptions
+  }
+}))
+
+describe('useTemplateFiltering', () => {
+  beforeEach(() => {
+    setActivePinia(createPinia())
+    vi.clearAllMocks()
+    mockGetFuseOptions.mockResolvedValue(null)
+  })
+
+  afterEach(() => {
+    vi.useRealTimers()
+  })
+
+  it('sorts templates by VRAM from low to high and pushes missing values last', () => {
+    const gb = (value: number) => value * 1024 ** 3
+
+    const templates = ref<TemplateInfo[]>([
+      {
+        name: 'missing-vram',
+        description: 'no vram value',
+        mediaType: 'image',
+        mediaSubtype: 'png'
+      },
+      {
+        name: 'highest-vram',
+        description: 'high usage',
+        mediaType: 'image',
+        mediaSubtype: 'png',
+        vram: gb(12)
+      },
+      {
+        name: 'mid-vram',
+        description: 'medium usage',
+        mediaType: 'image',
+        mediaSubtype: 'png',
+        vram: gb(7.5)
+      },
+      {
+        name: 'low-vram',
+        description: 'low usage',
+        mediaType: 'image',
+        mediaSubtype: 'png',
+        vram: gb(5)
+      },
+      {
+        name: 'zero-vram',
+        description: 'unknown usage',
+        mediaType: 'image',
+        mediaSubtype: 'png',
+        vram: 0
+      }
+    ])
+
+    const { sortBy, filteredTemplates } = useTemplateFiltering(templates)
+
+    sortBy.value = 'vram-low-to-high'
+
+    expect(filteredTemplates.value.map((template) => template.name)).toEqual([
+      'low-vram',
+      'mid-vram',
+      'highest-vram',
+      'missing-vram',
+      'zero-vram'
+    ])
+  })
+
+  it('filters by search text, models, tags, and license with debounce handling', async () => {
+    vi.useFakeTimers()
+
+    const templates = ref<TemplateInfo[]>([
+      {
+        name: 'api-template',
+        description: 'Enterprise API workflow for video',
+        mediaType: 'image',
+        mediaSubtype: 'png',
+        tags: ['API', 'Video'],
+        models: ['Flux'],
+        date: '2024-06-01',
+        vram: 15 * 1024 ** 3,
+        openSource: false
+      },
+      {
+        name: 'portrait-flow',
+        description: 'Portrait template tuned for SDXL',
+        mediaType: 'image',
+        mediaSubtype: 'png',
+        tags: ['Portrait'],
+        models: ['SDXL'],
+        date: '2024-05-15',
+        vram: 10 * 1024 ** 3
+      },
+      {
+        name: 'landscape-lite',
+        description: 'Lightweight landscape generator',
+        mediaType: 'image',
+        mediaSubtype: 'png',
+        tags: ['Landscape'],
+        models: ['SDXL', 'Flux'],
+        date: '2024-04-20'
+      }
+    ])
+
+    const {
+      searchQuery,
+      selectedModels,
+      selectedUseCases,
+      selectedRunsOn,
+      filteredTemplates,
+      availableModels,
+      availableUseCases,
+      availableRunsOn,
+      filteredCount,
+      totalCount,
+      removeUseCaseFilter,
+      resetFilters
+    } = useTemplateFiltering(templates)
+
+    expect(totalCount.value).toBe(3)
+    expect(availableModels.value).toEqual(['Flux', 'SDXL'])
+    expect(availableUseCases.value).toEqual([
+      'API',
+      'Landscape',
+      'Portrait',
+      'Video'
+    ])
+    expect(availableRunsOn.value).toEqual(['ComfyUI', 'External or Remote API'])
+
+    searchQuery.value = 'enterprise'
+    await nextTick()
+    await vi.runOnlyPendingTimersAsync()
+    await nextTick()
+    expect(filteredTemplates.value.map((template) => template.name)).toEqual([
+      'api-template'
+    ])
+
+    selectedRunsOn.value = ['External or Remote API']
+    await nextTick()
+    expect(filteredTemplates.value.map((template) => template.name)).toEqual([
+      'api-template'
+    ])
+
+    selectedModels.value = ['Flux']
+    await nextTick()
+    expect(filteredTemplates.value.map((template) => template.name)).toEqual([
+      'api-template'
+    ])
+
+    selectedUseCases.value = ['Video']
+    await nextTick()
+    expect(filteredTemplates.value.map((template) => template.name)).toEqual([
+      'api-template'
+    ])
+    expect(filteredCount.value).toBe(1)
+
+    removeUseCaseFilter('Video')
+    await nextTick()
+    expect(selectedUseCases.value).toHaveLength(0)
+
+    resetFilters()
+    await nextTick()
+    await vi.runOnlyPendingTimersAsync()
+    await nextTick()
+    expect(filteredTemplates.value.map((template) => template.name)).toEqual([
+      'api-template',
+      'portrait-flow',
+      'landscape-lite'
+    ])
+  })
+
+  it('supports alphabetical, newest, and size-based sorting options', async () => {
+    const templates = ref<TemplateInfo[]>([
+      {
+        name: 'zeta-extended',
+        description: 'older template',
+        mediaType: 'image',
+        mediaSubtype: 'png',
+        date: '2024-01-01',
+        size: 300
+      },
+      {
+        name: 'alpha-starter',
+        description: 'new template',
+        mediaType: 'image',
+        mediaSubtype: 'png',
+        date: '2024-07-01',
+        size: 100
+      },
+      {
+        name: 'beta-pro',
+        description: 'mid template',
+        mediaType: 'image',
+        mediaSubtype: 'png',
+        date: '2024-05-01',
+        size: 200
+      }
+    ])
+
+    const { sortBy, filteredTemplates } = useTemplateFiltering(templates)
+
+    // default is 'newest'
+    expect(filteredTemplates.value.map((template) => template.name)).toEqual([
+      'alpha-starter',
+      'beta-pro',
+      'zeta-extended'
+    ])
+
+    sortBy.value = 'alphabetical'
+    await nextTick()
+    expect(filteredTemplates.value.map((template) => template.name)).toEqual([
+      'alpha-starter',
+      'beta-pro',
+      'zeta-extended'
+    ])
+
+    sortBy.value = 'model-size-low-to-high'
+    await nextTick()
+    expect(filteredTemplates.value.map((template) => template.name)).toEqual([
+      'alpha-starter',
+      'beta-pro',
+      'zeta-extended'
+    ])
+
+    sortBy.value = 'default'
+    await nextTick()
+    expect(filteredTemplates.value.map((template) => template.name)).toEqual([
+      'zeta-extended',
+      'alpha-starter',
+      'beta-pro'
+    ])
+  })
+
+  describe('loadFuseOptions', () => {
+    it('updates fuseOptions when getFuseOptions returns valid options', async () => {
+      const templates = ref<TemplateInfo[]>([
+        {
+          name: 'test-template',
+          description: 'Test template',
+          mediaType: 'image',
+          mediaSubtype: 'png'
+        }
+      ])
+
+      const customFuseOptions: IFuseOptions<TemplateInfo> = {
+        keys: [
+          { name: 'name', weight: 0.5 },
+          { name: 'description', weight: 0.5 }
+        ],
+        threshold: 0.4,
+        includeScore: true
+      }
+
+      mockGetFuseOptions.mockResolvedValueOnce(customFuseOptions)
+
+      const { loadFuseOptions, filteredTemplates } =
+        useTemplateFiltering(templates)
+
+      await loadFuseOptions()
+
+      expect(mockGetFuseOptions).toHaveBeenCalledTimes(1)
+      expect(filteredTemplates.value).toBeDefined()
+    })
+
+    it('does not update fuseOptions when getFuseOptions returns null', async () => {
+      const templates = ref<TemplateInfo[]>([
+        {
+          name: 'test-template',
+          description: 'Test template',
+          mediaType: 'image',
+          mediaSubtype: 'png'
+        }
+      ])
+
+      mockGetFuseOptions.mockResolvedValueOnce(null)
+
+      const { loadFuseOptions, filteredTemplates } =
+        useTemplateFiltering(templates)
+
+      const initialResults = filteredTemplates.value
+
+      await loadFuseOptions()
+
+      expect(mockGetFuseOptions).toHaveBeenCalledTimes(1)
+      expect(filteredTemplates.value).toEqual(initialResults)
+    })
+
+    it('handles errors when getFuseOptions fails', async () => {
+      const templates = ref<TemplateInfo[]>([
+        {
+          name: 'test-template',
+          description: 'Test template',
+          mediaType: 'image',
+          mediaSubtype: 'png'
+        }
+      ])
+
+      mockGetFuseOptions.mockRejectedValueOnce(new Error('Network error'))
+
+      const { loadFuseOptions, filteredTemplates } =
+        useTemplateFiltering(templates)
+
+      const initialResults = filteredTemplates.value
+
+      await expect(loadFuseOptions()).rejects.toThrow('Network error')
+      expect(filteredTemplates.value).toEqual(initialResults)
+    })
+
+    it('recreates Fuse instance when fuseOptions change', async () => {
+      const templates = ref<TemplateInfo[]>([
+        {
+          name: 'searchable-template',
+          description: 'This is a searchable template',
+          mediaType: 'image',
+          mediaSubtype: 'png'
+        },
+        {
+          name: 'another-template',
+          description: 'Another template',
+          mediaType: 'image',
+          mediaSubtype: 'png'
+        }
+      ])
+
+      const { loadFuseOptions, searchQuery, filteredTemplates } =
+        useTemplateFiltering(templates)
+
+      const customFuseOptions = {
+        keys: [{ name: 'name', weight: 1.0 }],
+        threshold: 0.2,
+        includeScore: true,
+        includeMatches: true
+      }
+
+      mockGetFuseOptions.mockResolvedValueOnce(customFuseOptions)
+
+      await loadFuseOptions()
+      await nextTick()
+
+      searchQuery.value = 'searchable'
+      await nextTick()
+
+      expect(filteredTemplates.value.length).toBeGreaterThan(0)
+      expect(mockGetFuseOptions).toHaveBeenCalledTimes(1)
+    })
+  })
+
+  describe('Scope-aware filtering', () => {
+    it('filters out inactive models when scope changes', () => {
+      // Start with image templates only
+      const templates = ref<TemplateInfo[]>([
+        {
+          name: 'flux-template',
+          description: 'Flux model template',
+          models: ['Flux', 'Dall-E'],
+          mediaType: 'image',
+          mediaSubtype: 'png'
+        }
+      ])
+
+      const currentScope = ref('image')
+
+      const {
+        selectedModels,
+        activeModels,
+        inactiveModels,
+        filteredTemplates
+      } = useTemplateFiltering(templates, currentScope)
+
+      // Select models from both image and video domains
+      selectedModels.value = ['Flux', 'Luma']
+
+      // In image scope, only Flux should be active because Luma doesn't exist in any image template
+      expect(activeModels.value).toEqual(['Flux'])
+      expect(inactiveModels.value).toEqual(['Luma'])
+      expect(filteredTemplates.value).toHaveLength(1)
+      expect(filteredTemplates.value[0].name).toBe('flux-template')
+
+      // Switch to video scope with only video templates
+      currentScope.value = 'video'
+      templates.value = [
+        {
+          name: 'luma-template',
+          description: 'Luma video template',
+          models: ['Luma', 'Runway'],
+          mediaType: 'video',
+          mediaSubtype: 'mp4'
+        }
+      ]
+
+      // In video scope, only Luma should be active because Flux doesn't exist in any video template
+      expect(activeModels.value).toEqual(['Luma'])
+      expect(inactiveModels.value).toEqual(['Flux'])
+      expect(filteredTemplates.value).toHaveLength(1)
+      expect(filteredTemplates.value[0].name).toBe('luma-template')
+    })
+
+    it('maintains selected filters across scope changes', () => {
+      const templates = ref<TemplateInfo[]>([
+        {
+          name: 'template1',
+          description: 'Template 1',
+          models: ['Model1'],
+          mediaType: 'image',
+          mediaSubtype: 'png'
+        }
+      ])
+
+      const currentScope = ref('image')
+      const { selectedModels, activeModels } = useTemplateFiltering(
+        templates,
+        currentScope
+      )
+
+      // Select a model
+      selectedModels.value = ['Model1', 'Model2']
+
+      // Model1 is active, Model2 is not available
+      expect(activeModels.value).toEqual(['Model1'])
+      expect(selectedModels.value).toEqual(['Model1', 'Model2'])
+
+      // Change scope - selected models should persist
+      currentScope.value = 'video'
+      templates.value = []
+
+      expect(selectedModels.value).toEqual(['Model1', 'Model2'])
+      expect(activeModels.value).toEqual([])
+    })
+  })
+})
diff --git a/src/composables/useTemplateFiltering.ts b/src/composables/useTemplateFiltering.ts
index f447f230b1..905632220a 100644
--- a/src/composables/useTemplateFiltering.ts
+++ b/src/composables/useTemplateFiltering.ts
@@ -1,17 +1,36 @@
 import { refDebounced, watchDebounced } from '@vueuse/core'
 import Fuse from 'fuse.js'
+import type { IFuseOptions } from 'fuse.js'
 import { computed, ref, watch } from 'vue'
 import type { Ref } from 'vue'
 
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { useTelemetry } from '@/platform/telemetry'
 import type { TemplateInfo } from '@/platform/workflow/templates/types/template'
+import { useTemplateRankingStore } from '@/stores/templateRankingStore'
 import { debounce } from 'es-toolkit/compat'
+import { api } from '@/scripts/api'
+
+// Fuse.js configuration for fuzzy search
+const defaultFuseOptions: IFuseOptions<TemplateInfo> = {
+  keys: [
+    { name: 'name', weight: 0.3 },
+    { name: 'title', weight: 0.3 },
+    { name: 'description', weight: 0.1 },
+    { name: 'tags', weight: 0.2 },
+    { name: 'models', weight: 0.3 }
+  ],
+  threshold: 0.33,
+  includeScore: true,
+  includeMatches: true
+}
 
 export function useTemplateFiltering(
-  templates: Ref<TemplateInfo[]> | TemplateInfo[]
+  templates: Ref<TemplateInfo[]> | TemplateInfo[],
+  currentScope?: Ref<string | null>
 ) {
   const settingStore = useSettingStore()
+  const rankingStore = useTemplateRankingStore()
 
   const searchQuery = ref('')
   const selectedModels = ref<string[]>(
@@ -25,32 +44,22 @@ export function useTemplateFiltering(
   )
   const sortBy = ref<
     | 'default'
+    | 'recommended'
+    | 'popular'
     | 'alphabetical'
     | 'newest'
     | 'vram-low-to-high'
     | 'model-size-low-to-high'
   >(settingStore.get('Comfy.Templates.SortBy'))
 
+  const fuseOptions = ref<IFuseOptions<TemplateInfo>>(defaultFuseOptions)
+
   const templatesArray = computed(() => {
     const templateData = 'value' in templates ? templates.value : templates
     return Array.isArray(templateData) ? templateData : []
   })
 
-  // Fuse.js configuration for fuzzy search
-  const fuseOptions = {
-    keys: [
-      { name: 'name', weight: 0.3 },
-      { name: 'title', weight: 0.3 },
-      { name: 'description', weight: 0.1 },
-      { name: 'tags', weight: 0.2 },
-      { name: 'models', weight: 0.3 }
-    ],
-    threshold: 0.33,
-    includeScore: true,
-    includeMatches: true
-  }
-
-  const fuse = computed(() => new Fuse(templatesArray.value, fuseOptions))
+  const fuse = computed(() => new Fuse(templatesArray.value, fuseOptions.value))
 
   const availableModels = computed(() => {
     const modelSet = new Set<string>()
@@ -76,7 +85,41 @@ export function useTemplateFiltering(
     return ['ComfyUI', 'External or Remote API']
   })
 
-  const debouncedSearchQuery = refDebounced(searchQuery, 50)
+  // Compute which selected filters are actually applicable to the current scope
+  const activeModels = computed(() => {
+    if (!currentScope) {
+      return selectedModels.value
+    }
+    return selectedModels.value.filter((model) =>
+      availableModels.value.includes(model)
+    )
+  })
+
+  const activeUseCases = computed(() => {
+    if (!currentScope) {
+      return selectedUseCases.value
+    }
+    return selectedUseCases.value.filter((useCase) =>
+      availableUseCases.value.includes(useCase)
+    )
+  })
+
+  // Track which filters are inactive (selected but not applicable)
+  const inactiveModels = computed(() => {
+    if (!currentScope) return []
+    return selectedModels.value.filter(
+      (model) => !availableModels.value.includes(model)
+    )
+  })
+
+  const inactiveUseCases = computed(() => {
+    if (!currentScope) return []
+    return selectedUseCases.value.filter(
+      (useCase) => !availableUseCases.value.includes(useCase)
+    )
+  })
+
+  const debouncedSearchQuery = refDebounced(searchQuery, 150)
 
   const filteredBySearch = computed(() => {
     if (!debouncedSearchQuery.value.trim()) {
@@ -88,7 +131,8 @@ export function useTemplateFiltering(
   })
 
   const filteredByModels = computed(() => {
-    if (selectedModels.value.length === 0) {
+    // Use active models instead of selected models for filtering
+    if (activeModels.value.length === 0) {
       return filteredBySearch.value
     }
 
@@ -96,14 +140,15 @@ export function useTemplateFiltering(
       if (!template.models || !Array.isArray(template.models)) {
         return false
       }
-      return selectedModels.value.some((selectedModel) =>
-        template.models?.includes(selectedModel)
+      return activeModels.value.some((activeModel) =>
+        template.models?.includes(activeModel)
       )
     })
   })
 
   const filteredByUseCases = computed(() => {
-    if (selectedUseCases.value.length === 0) {
+    // Use active use cases instead of selected use cases for filtering
+    if (activeUseCases.value.length === 0) {
       return filteredByModels.value
     }
 
@@ -111,13 +156,14 @@ export function useTemplateFiltering(
       if (!template.tags || !Array.isArray(template.tags)) {
         return false
       }
-      return selectedUseCases.value.some((selectedTag) =>
-        template.tags?.includes(selectedTag)
+      return activeUseCases.value.some((activeUseCase) =>
+        template.tags?.includes(activeUseCase)
       )
     })
   })
 
   const filteredByRunsOn = computed(() => {
+    // RunsOn filters are scope-independent
     if (selectedRunsOn.value.length === 0) {
       return filteredByUseCases.value
     }
@@ -129,10 +175,10 @@ export function useTemplateFiltering(
       const isExternalAPI = template.openSource === false
       const isComfyUI = template.openSource !== false
 
-      return selectedRunsOn.value.some((selectedRunsOn) => {
-        if (selectedRunsOn === 'External or Remote API') {
+      return selectedRunsOn.value.some((runsOn) => {
+        if (runsOn === 'External or Remote API') {
           return isExternalAPI
-        } else if (selectedRunsOn === 'ComfyUI') {
+        } else if (runsOn === 'ComfyUI') {
           return isComfyUI
         }
         return false
@@ -151,10 +197,42 @@ export function useTemplateFiltering(
     return Number.POSITIVE_INFINITY
   }
 
+  watch(
+    filteredByRunsOn,
+    (templates) => {
+      rankingStore.largestUsageScore = Math.max(
+        ...templates.map((t) => t.usage || 0)
+      )
+    },
+    { immediate: true }
+  )
+
   const sortedTemplates = computed(() => {
     const templates = [...filteredByRunsOn.value]
 
     switch (sortBy.value) {
+      case 'recommended':
+        // Curated: usage × 0.5 + internal × 0.3 + freshness × 0.2
+        return templates.sort((a, b) => {
+          const scoreA = rankingStore.computeDefaultScore(
+            a.date,
+            a.searchRank,
+            a.usage
+          )
+          const scoreB = rankingStore.computeDefaultScore(
+            b.date,
+            b.searchRank,
+            b.usage
+          )
+          return scoreB - scoreA
+        })
+      case 'popular':
+        // User-driven: usage × 0.9 + freshness × 0.1
+        return templates.sort((a, b) => {
+          const scoreA = rankingStore.computePopularScore(a.date, a.usage)
+          const scoreB = rankingStore.computePopularScore(b.date, b.usage)
+          return scoreB - scoreA
+        })
       case 'alphabetical':
         return templates.sort((a, b) => {
           const nameA = a.title || a.name || ''
@@ -184,7 +262,7 @@ export function useTemplateFiltering(
           return vramA - vramB
         })
       case 'model-size-low-to-high':
-        return templates.sort((a: any, b: any) => {
+        return templates.sort((a, b) => {
           const sizeA =
             typeof a.size === 'number' ? a.size : Number.POSITIVE_INFINITY
           const sizeB =
@@ -194,7 +272,6 @@ export function useTemplateFiltering(
         })
       case 'default':
       default:
-        // Keep original order (default order)
         return templates
     }
   })
@@ -206,7 +283,7 @@ export function useTemplateFiltering(
     selectedModels.value = []
     selectedUseCases.value = []
     selectedRunsOn.value = []
-    sortBy.value = 'newest'
+    sortBy.value = 'default'
   }
 
   const removeModelFilter = (model: string) => {
@@ -237,6 +314,13 @@ export function useTemplateFiltering(
     })
   }, 500)
 
+  const loadFuseOptions = async () => {
+    const fetchedOptions = await api.getFuseOptions()
+    if (fetchedOptions) {
+      fuseOptions.value = fetchedOptions
+    }
+  }
+
   // Watch for filter changes and track them
   watch(
     [searchQuery, selectedModels, selectedUseCases, selectedRunsOn, sortBy],
@@ -297,6 +381,14 @@ export function useTemplateFiltering(
     selectedRunsOn,
     sortBy,
 
+    // Computed - Active filters (actually applied)
+    activeModels,
+    activeUseCases,
+
+    // Computed - Inactive filters (selected but not applicable)
+    inactiveModels,
+    inactiveUseCases,
+
     // Computed
     filteredTemplates,
     availableModels,
@@ -309,6 +401,7 @@ export function useTemplateFiltering(
     resetFilters,
     removeModelFilter,
     removeUseCaseFilter,
-    removeRunsOnFilter
+    removeRunsOnFilter,
+    loadFuseOptions
   }
 }
diff --git a/src/composables/useValueTransform.ts b/src/composables/useValueTransform.ts
deleted file mode 100644
index e20dd903ff..0000000000
--- a/src/composables/useValueTransform.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Creates a getter/setter pair that transforms values on access if they have changed.
- * Does not observe deep changes.
- *
- * @example
- * const transformFunction = (items: string[]) => items.map(item => `root/${item}.ext`)
- * const { get, set } = useValueTransform(transformFunction, [])
- * Object.defineProperty(obj, 'value', { get, set })
- *
- * obj.value = ['filename1', 'filename2']
- * console.log(obj.value) // ["root/filename1.ext", "root/filename2.ext"]
- */
-export function useValueTransform<Internal, External>(
-  transform: (value: Internal) => External,
-  initialValue: Internal
-) {
-  let internalValue: Internal = initialValue
-  let cachedValue: External = transform(initialValue)
-  let isChanged = false
-
-  return {
-    get: () => {
-      if (!isChanged) return cachedValue
-      cachedValue = transform(internalValue)
-      return cachedValue
-    },
-    set: (value: Internal) => {
-      isChanged = true
-      internalValue = value
-    }
-  }
-}
diff --git a/src/composables/useWorkflowActionsMenu.test.ts b/src/composables/useWorkflowActionsMenu.test.ts
new file mode 100644
index 0000000000..73a355c809
--- /dev/null
+++ b/src/composables/useWorkflowActionsMenu.test.ts
@@ -0,0 +1,370 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { ref } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { useWorkflowActionsMenu } from '@/composables/useWorkflowActionsMenu'
+import type { ComfyWorkflow } from '@/platform/workflow/management/stores/workflowStore'
+import type { WorkflowMenuAction } from '@/types/workflowMenuItem'
+
+vi.mock('vue-i18n', () => ({
+  useI18n: vi.fn(() => ({
+    t: (key: string) => key
+  }))
+}))
+
+const mockBookmarkStore = vi.hoisted(() => ({
+  isBookmarked: vi.fn(() => false),
+  toggleBookmarked: vi.fn()
+}))
+
+const mockWorkflowStore = vi.hoisted(() => ({
+  activeWorkflow: { path: 'test.json', isPersisted: true } as ComfyWorkflow
+}))
+
+const mockWorkflowService = vi.hoisted(() => ({
+  openWorkflow: vi.fn(),
+  duplicateWorkflow: vi.fn(),
+  saveWorkflowAs: vi.fn(),
+  deleteWorkflow: vi.fn()
+}))
+
+const mockCommandStore = vi.hoisted(() => ({
+  execute: vi.fn()
+}))
+
+const mockSubgraphStore = vi.hoisted(() => ({
+  isSubgraphBlueprint: vi.fn(() => false)
+}))
+
+const mockMenuItemStore = vi.hoisted(() => ({
+  hasSeenLinear: false
+}))
+
+const mockCanvasStore = vi.hoisted(() => ({
+  linearMode: false
+}))
+
+const mockAppModeStore = vi.hoisted(() => ({
+  enterBuilder: vi.fn()
+}))
+
+const mockFeatureFlags = vi.hoisted(() => ({
+  flags: { linearToggleEnabled: false }
+}))
+
+vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
+  useWorkflowStore: vi.fn(() => mockWorkflowStore),
+  useWorkflowBookmarkStore: vi.fn(() => mockBookmarkStore)
+}))
+
+vi.mock('@/platform/workflow/core/services/workflowService', () => ({
+  useWorkflowService: vi.fn(() => mockWorkflowService)
+}))
+
+vi.mock('@/stores/commandStore', () => ({
+  useCommandStore: vi.fn(() => mockCommandStore)
+}))
+
+vi.mock('@/stores/subgraphStore', () => ({
+  useSubgraphStore: vi.fn(() => mockSubgraphStore)
+}))
+
+vi.mock('@/stores/menuItemStore', () => ({
+  useMenuItemStore: vi.fn(() => mockMenuItemStore)
+}))
+
+vi.mock('@/renderer/core/canvas/canvasStore', () => ({
+  useCanvasStore: vi.fn(() => mockCanvasStore)
+}))
+
+vi.mock('@/stores/appModeStore', () => ({
+  useAppModeStore: vi.fn(() => mockAppModeStore)
+}))
+
+vi.mock('@/composables/useErrorHandling', () => ({}))
+
+vi.mock('@/composables/useFeatureFlags', () => ({
+  useFeatureFlags: vi.fn(() => mockFeatureFlags)
+}))
+
+type MenuItems = ReturnType<typeof useWorkflowActionsMenu>['menuItems']['value']
+
+function actionItems(items: MenuItems): WorkflowMenuAction[] {
+  return items.filter(
+    (i): i is WorkflowMenuAction => !i.separator && i.visible !== false
+  )
+}
+
+function menuLabels(items: MenuItems) {
+  return actionItems(items).map((i) => i.label)
+}
+
+function findItem(items: MenuItems, label: string): WorkflowMenuAction {
+  const item = actionItems(items).find((i) => i.label === label)
+  if (!item) throw new Error(`Menu item "${label}" not found`)
+  return item
+}
+
+describe('useWorkflowActionsMenu', () => {
+  beforeEach(() => {
+    setActivePinia(createPinia())
+    vi.clearAllMocks()
+    mockBookmarkStore.isBookmarked.mockReturnValue(false)
+    mockSubgraphStore.isSubgraphBlueprint.mockReturnValue(false)
+    mockMenuItemStore.hasSeenLinear = false
+    mockCanvasStore.linearMode = false
+    mockFeatureFlags.flags.linearToggleEnabled = false
+    mockWorkflowStore.activeWorkflow = {
+      path: 'test.json',
+      isPersisted: true
+    } as ComfyWorkflow
+  })
+
+  it('shows root-level items by default', () => {
+    const { menuItems } = useWorkflowActionsMenu(vi.fn(), { isRoot: true })
+    const labels = menuLabels(menuItems.value)
+
+    expect(labels).toContain('g.rename')
+    expect(labels).toContain('breadcrumbsMenu.duplicate')
+    expect(labels).toContain('menuLabels.Save')
+    expect(labels).toContain('menuLabels.Save As')
+    expect(labels).toContain('menuLabels.Export')
+    expect(labels).toContain('menuLabels.Export (API)')
+    expect(labels).toContain('breadcrumbsMenu.clearWorkflow')
+    expect(labels).toContain('breadcrumbsMenu.deleteWorkflow')
+  })
+
+  it('hides root-only items when isRoot is false', () => {
+    const { menuItems } = useWorkflowActionsMenu(vi.fn(), { isRoot: false })
+    const labels = menuLabels(menuItems.value)
+
+    expect(labels).toContain('g.rename')
+    expect(labels).toContain('breadcrumbsMenu.clearWorkflow')
+    expect(labels).not.toContain('breadcrumbsMenu.duplicate')
+    expect(labels).not.toContain('menuLabels.Save')
+    expect(labels).not.toContain('menuLabels.Save As')
+  })
+
+  it('hides delete item when includeDelete is false', () => {
+    const { menuItems } = useWorkflowActionsMenu(vi.fn(), {
+      isRoot: true,
+      includeDelete: false
+    })
+    const labels = menuLabels(menuItems.value)
+
+    expect(labels).not.toContain('breadcrumbsMenu.deleteWorkflow')
+  })
+
+  it('shows app mode items when linearToggleEnabled flag is set', () => {
+    mockFeatureFlags.flags.linearToggleEnabled = true
+
+    const { menuItems } = useWorkflowActionsMenu(vi.fn(), { isRoot: true })
+    const labels = menuLabels(menuItems.value)
+
+    expect(labels).toContain('breadcrumbsMenu.enterAppMode')
+  })
+
+  it('shows app mode items when user has seen linear mode', () => {
+    mockMenuItemStore.hasSeenLinear = true
+
+    const { menuItems } = useWorkflowActionsMenu(vi.fn(), { isRoot: true })
+    const labels = menuLabels(menuItems.value)
+
+    expect(labels).toContain('breadcrumbsMenu.enterAppMode')
+  })
+
+  it('hides app mode items when conditions not met', () => {
+    mockMenuItemStore.hasSeenLinear = false
+    mockFeatureFlags.flags.linearToggleEnabled = false
+
+    const { menuItems } = useWorkflowActionsMenu(vi.fn(), { isRoot: true })
+    const labels = menuLabels(menuItems.value)
+
+    expect(labels).not.toContain('breadcrumbsMenu.enterAppMode')
+  })
+
+  it('hides app mode items when not root', () => {
+    mockFeatureFlags.flags.linearToggleEnabled = true
+
+    const { menuItems } = useWorkflowActionsMenu(vi.fn(), { isRoot: false })
+    const labels = menuLabels(menuItems.value)
+
+    expect(labels).not.toContain('breadcrumbsMenu.enterAppMode')
+  })
+
+  it('shows "go to workflow mode" when in linear mode', () => {
+    mockFeatureFlags.flags.linearToggleEnabled = true
+    mockCanvasStore.linearMode = true
+
+    const { menuItems } = useWorkflowActionsMenu(vi.fn(), { isRoot: true })
+    const labels = menuLabels(menuItems.value)
+
+    expect(labels).toContain('breadcrumbsMenu.exitAppMode')
+    expect(labels).not.toContain('breadcrumbsMenu.enterAppMode')
+  })
+
+  it('shows bookmark label based on bookmark state', () => {
+    mockBookmarkStore.isBookmarked.mockReturnValue(true)
+
+    const { menuItems } = useWorkflowActionsMenu(vi.fn(), { isRoot: true })
+    const labels = menuLabels(menuItems.value)
+
+    expect(labels).toContain('tabMenu.removeFromBookmarks')
+    expect(labels).not.toContain('tabMenu.addToBookmarks')
+  })
+
+  it('adds badge to app mode items', () => {
+    mockFeatureFlags.flags.linearToggleEnabled = true
+
+    const { menuItems } = useWorkflowActionsMenu(vi.fn(), { isRoot: true })
+    const appModeItem = findItem(
+      menuItems.value,
+      'breadcrumbsMenu.enterAppMode'
+    )
+
+    expect(appModeItem.badge).toBeDefined()
+  })
+
+  it('calls startRename when rename command is invoked', async () => {
+    const startRename = vi.fn()
+    const { menuItems } = useWorkflowActionsMenu(startRename, {
+      isRoot: true
+    })
+
+    await findItem(menuItems.value, 'g.rename').command?.()
+
+    expect(startRename).toHaveBeenCalled()
+  })
+
+  it('uses provided workflow ref instead of activeWorkflow', () => {
+    const customWorkflow = ref({
+      path: 'custom.json',
+      isPersisted: true,
+      isTemporary: false
+    } as ComfyWorkflow)
+
+    mockBookmarkStore.isBookmarked.mockReturnValue(false)
+
+    const { menuItems } = useWorkflowActionsMenu(vi.fn(), {
+      isRoot: true,
+      workflow: customWorkflow
+    })
+
+    expect(menuItems.value.length).toBeGreaterThan(0)
+    expect(mockBookmarkStore.isBookmarked).toHaveBeenCalledWith('custom.json')
+  })
+
+  it('shows publish item for blueprints', () => {
+    mockSubgraphStore.isSubgraphBlueprint.mockReturnValue(true)
+
+    const { menuItems } = useWorkflowActionsMenu(vi.fn(), { isRoot: true })
+    const labels = menuLabels(menuItems.value)
+
+    expect(labels).toContain('subgraphStore.publish')
+    expect(labels).toContain('breadcrumbsMenu.deleteBlueprint')
+    expect(labels).not.toContain('breadcrumbsMenu.duplicate')
+  })
+
+  it('duplicate command calls workflowService.duplicateWorkflow', async () => {
+    const { menuItems } = useWorkflowActionsMenu(vi.fn(), { isRoot: true })
+    await findItem(menuItems.value, 'breadcrumbsMenu.duplicate').command?.()
+
+    expect(mockWorkflowService.duplicateWorkflow).toHaveBeenCalledWith(
+      mockWorkflowStore.activeWorkflow
+    )
+  })
+
+  it('save command executes Comfy.SaveWorkflow', async () => {
+    const { menuItems } = useWorkflowActionsMenu(vi.fn(), { isRoot: true })
+    await findItem(menuItems.value, 'menuLabels.Save').command?.()
+
+    expect(mockCommandStore.execute).toHaveBeenCalledWith('Comfy.SaveWorkflow')
+  })
+
+  it('delete command calls workflowService.deleteWorkflow', async () => {
+    const { menuItems } = useWorkflowActionsMenu(vi.fn(), { isRoot: true })
+    await findItem(
+      menuItems.value,
+      'breadcrumbsMenu.deleteWorkflow'
+    ).command?.()
+
+    expect(mockWorkflowService.deleteWorkflow).toHaveBeenCalledWith(
+      mockWorkflowStore.activeWorkflow
+    )
+  })
+
+  it('bookmark toggle calls bookmarkStore.toggleBookmarked', async () => {
+    const { menuItems } = useWorkflowActionsMenu(vi.fn(), { isRoot: true })
+    await findItem(menuItems.value, 'tabMenu.addToBookmarks').command?.()
+
+    expect(mockBookmarkStore.toggleBookmarked).toHaveBeenCalledWith('test.json')
+  })
+
+  it('enter builder mode calls enterBuilder', async () => {
+    mockFeatureFlags.flags.linearToggleEnabled = true
+
+    const { menuItems } = useWorkflowActionsMenu(vi.fn(), { isRoot: true })
+    await findItem(
+      menuItems.value,
+      'breadcrumbsMenu.enterBuilderMode'
+    ).command?.()
+
+    expect(mockAppModeStore.enterBuilder).toHaveBeenCalled()
+  })
+
+  it('app mode toggle executes Comfy.ToggleLinear', async () => {
+    mockFeatureFlags.flags.linearToggleEnabled = true
+
+    const { menuItems } = useWorkflowActionsMenu(vi.fn(), { isRoot: true })
+    await findItem(menuItems.value, 'breadcrumbsMenu.enterAppMode').command?.()
+
+    expect(mockCommandStore.execute).toHaveBeenCalledWith(
+      'Comfy.ToggleLinear',
+      { metadata: { source: 'breadcrumb_menu' } }
+    )
+  })
+
+  it('rename is disabled for unpersisted root workflows', () => {
+    mockWorkflowStore.activeWorkflow = {
+      path: 'test.json',
+      isPersisted: false
+    } as ComfyWorkflow
+
+    const { menuItems } = useWorkflowActionsMenu(vi.fn(), { isRoot: true })
+    const rename = findItem(menuItems.value, 'g.rename')
+
+    expect(rename.disabled).toBe(true)
+  })
+
+  it('bookmark is disabled for temporary workflows', () => {
+    mockWorkflowStore.activeWorkflow = {
+      path: 'test.json',
+      isPersisted: true,
+      isTemporary: true
+    } as ComfyWorkflow
+
+    const { menuItems } = useWorkflowActionsMenu(vi.fn(), { isRoot: true })
+    const bookmark = findItem(menuItems.value, 'tabMenu.addToBookmarks')
+
+    expect(bookmark.disabled).toBe(true)
+  })
+
+  it('switches to custom workflow before executing rename', async () => {
+    const customWorkflow = ref({
+      path: 'other.json',
+      isPersisted: true
+    } as ComfyWorkflow)
+    const startRename = vi.fn()
+
+    const { menuItems } = useWorkflowActionsMenu(startRename, {
+      isRoot: true,
+      workflow: customWorkflow
+    })
+    await findItem(menuItems.value, 'g.rename').command?.()
+
+    expect(mockWorkflowService.openWorkflow).toHaveBeenCalledWith(
+      customWorkflow.value
+    )
+    expect(startRename).toHaveBeenCalled()
+  })
+})
diff --git a/src/composables/useWorkflowActionsMenu.ts b/src/composables/useWorkflowActionsMenu.ts
new file mode 100644
index 0000000000..9bce704606
--- /dev/null
+++ b/src/composables/useWorkflowActionsMenu.ts
@@ -0,0 +1,275 @@
+import type { ComputedRef, Ref } from 'vue'
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import { useErrorHandling } from '@/composables/useErrorHandling'
+import { useFeatureFlags } from '@/composables/useFeatureFlags'
+import { isCloud } from '@/platform/distribution/types'
+import { openShareDialog } from '@/platform/workflow/sharing/composables/lazyShareDialog'
+import { useWorkflowService } from '@/platform/workflow/core/services/workflowService'
+import type { ComfyWorkflow } from '@/platform/workflow/management/stores/workflowStore'
+import {
+  useWorkflowBookmarkStore,
+  useWorkflowStore
+} from '@/platform/workflow/management/stores/workflowStore'
+import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import { useCommandStore } from '@/stores/commandStore'
+import { useMenuItemStore } from '@/stores/menuItemStore'
+import { useSubgraphStore } from '@/stores/subgraphStore'
+import { useAppModeStore } from '@/stores/appModeStore'
+import type {
+  WorkflowMenuAction,
+  WorkflowMenuItem
+} from '@/types/workflowMenuItem'
+
+interface WorkflowActionsMenuOptions {
+  /** Whether this is the root workflow level. Defaults to true. */
+  isRoot?: boolean
+  /** Whether to include the delete workflow action. Defaults to true. */
+  includeDelete?: boolean
+  /** Override the workflow to operate on. If not provided, uses activeWorkflow. */
+  workflow?: Ref<ComfyWorkflow | null> | ComputedRef<ComfyWorkflow | null>
+}
+
+interface AddItemOptions {
+  id: string
+  label: string
+  icon: string
+  command: () => void
+  visible?: boolean
+  disabled?: boolean
+  prependSeparator?: boolean
+  isNew?: boolean
+}
+
+export function useWorkflowActionsMenu(
+  startRename: () => void,
+  options: WorkflowActionsMenuOptions = {}
+) {
+  const { isRoot = true, includeDelete = true, workflow } = options
+  const { t } = useI18n()
+  const workflowStore = useWorkflowStore()
+  const workflowService = useWorkflowService()
+  const bookmarkStore = useWorkflowBookmarkStore()
+  const commandStore = useCommandStore()
+  const subgraphStore = useSubgraphStore()
+  const menuItemStore = useMenuItemStore()
+  const canvasStore = useCanvasStore()
+  const { flags } = useFeatureFlags()
+  const { enterBuilder } = useAppModeStore()
+
+  const targetWorkflow = computed(
+    () => workflow?.value ?? workflowStore.activeWorkflow
+  )
+
+  /** Switch to the target workflow tab if it's not already active */
+  const ensureWorkflowActive = async (wf: ComfyWorkflow | null) => {
+    if (!wf || wf === workflowStore.activeWorkflow) return
+    await workflowService.openWorkflow(wf)
+  }
+
+  const menuItems = computed<WorkflowMenuItem[]>(() => {
+    const workflow = targetWorkflow.value
+    const isBlueprint = workflow
+      ? subgraphStore.isSubgraphBlueprint(workflow)
+      : false
+
+    const items: WorkflowMenuItem[] = []
+
+    const addItem = ({
+      id,
+      label,
+      icon,
+      command,
+      visible = true,
+      disabled = false,
+      prependSeparator = false,
+      isNew = false
+    }: AddItemOptions) => {
+      if (prependSeparator && visible) items.push({ separator: true })
+      const item: WorkflowMenuAction = { id, label, icon, command, disabled }
+      if (!visible) item.visible = false
+      if (isNew) {
+        item.badge = t('g.experimental')
+        item.isNew = true
+      }
+      items.push(item)
+    }
+
+    const isLinearMode = canvasStore.linearMode
+    const showAppModeItems =
+      isRoot && (menuItemStore.hasSeenLinear || flags.linearToggleEnabled)
+    const isBookmarked = bookmarkStore.isBookmarked(workflow?.path ?? '')
+
+    const toggleLinear = async () => {
+      await commandStore.execute('Comfy.ToggleLinear', {
+        metadata: { source: 'breadcrumb_menu' }
+      })
+    }
+    addItem({
+      id: 'rename',
+      label: t('g.rename'),
+      icon: 'pi pi-pencil',
+      command: async () => {
+        await ensureWorkflowActive(targetWorkflow.value)
+        startRename()
+      },
+      disabled: isRoot && !workflow?.isPersisted
+    })
+
+    addItem({
+      id: 'duplicate',
+      label: t('breadcrumbsMenu.duplicate'),
+      icon: 'pi pi-copy',
+      command: async () => {
+        if (workflow) {
+          await workflowService.duplicateWorkflow(workflow)
+        }
+      },
+      visible: isRoot && !isBlueprint
+    })
+
+    addItem({
+      id: 'toggle-bookmark',
+      label: isBookmarked
+        ? t('tabMenu.removeFromBookmarks')
+        : t('tabMenu.addToBookmarks'),
+      icon: 'pi pi-bookmark' + (isBookmarked ? '-fill' : ''),
+      command: async () => {
+        if (workflow?.path) {
+          await bookmarkStore.toggleBookmarked(workflow.path)
+        }
+      },
+      visible: isRoot,
+      disabled: workflow?.isTemporary ?? false
+    })
+
+    addItem({
+      id: 'save',
+      label: t('menuLabels.Save'),
+      icon: 'pi pi-save',
+      command: async () => {
+        await ensureWorkflowActive(workflow)
+        await commandStore.execute('Comfy.SaveWorkflow')
+      },
+      visible: isRoot,
+      prependSeparator: true
+    })
+
+    addItem({
+      id: 'save-as',
+      label: t('menuLabels.Save As'),
+      icon: 'pi pi-save',
+      command: async () => {
+        await ensureWorkflowActive(workflow)
+        await commandStore.execute('Comfy.SaveWorkflowAs')
+      },
+      visible: isRoot
+    })
+
+    addItem({
+      id: 'export',
+      label: t('menuLabels.Export'),
+      icon: 'pi pi-download',
+      command: async () => {
+        await ensureWorkflowActive(workflow)
+        await commandStore.execute('Comfy.ExportWorkflow')
+      },
+      visible: isRoot,
+      prependSeparator: true
+    })
+
+    addItem({
+      id: 'export-api',
+      label: t('menuLabels.Export (API)'),
+      icon: 'pi pi-download',
+      command: async () => {
+        await ensureWorkflowActive(workflow)
+        await commandStore.execute('Comfy.ExportWorkflowAPI')
+      },
+      visible: isRoot
+    })
+
+    addItem({
+      id: 'share',
+      label: t('breadcrumbsMenu.share'),
+      icon: 'icon-[comfy--send]',
+      command: () =>
+        openShareDialog().catch(useErrorHandling().toastErrorHandler),
+      visible: isCloud && flags.workflowSharingEnabled
+    })
+
+    addItem({
+      id: 'enter-app-mode',
+      label: t('breadcrumbsMenu.enterAppMode'),
+      icon: 'icon-[lucide--panels-top-left]',
+      command: toggleLinear,
+      visible: showAppModeItems && !isLinearMode,
+      prependSeparator: true,
+      isNew: true
+    })
+
+    addItem({
+      id: 'exit-app-mode',
+      label: t('breadcrumbsMenu.exitAppMode'),
+      icon: 'icon-[comfy--workflow]',
+      command: toggleLinear,
+      visible: isLinearMode,
+      prependSeparator: true
+    })
+
+    addItem({
+      id: 'enter-builder-mode',
+      label: t('breadcrumbsMenu.enterBuilderMode'),
+      icon: 'icon-[lucide--hammer]',
+      command: () => enterBuilder(),
+      visible: showAppModeItems,
+      isNew: true
+    })
+
+    addItem({
+      id: 'clear-workflow',
+      label: t('breadcrumbsMenu.clearWorkflow'),
+      icon: 'pi pi-trash',
+      command: async () => {
+        await ensureWorkflowActive(workflow)
+        await commandStore.execute('Comfy.ClearWorkflow')
+      },
+      prependSeparator: true
+    })
+
+    addItem({
+      id: 'publish',
+      label: t('subgraphStore.publish'),
+      icon: 'pi pi-upload',
+      command: async () => {
+        if (workflow) {
+          await workflowService.saveWorkflowAs(workflow)
+        }
+      },
+      visible: isRoot && isBlueprint,
+      prependSeparator: true
+    })
+
+    addItem({
+      id: 'delete',
+      label: isBlueprint
+        ? t('breadcrumbsMenu.deleteBlueprint')
+        : t('breadcrumbsMenu.deleteWorkflow'),
+      icon: 'pi pi-times',
+      command: async () => {
+        if (workflow) {
+          await workflowService.deleteWorkflow(workflow)
+        }
+      },
+      visible: isRoot && includeDelete,
+      prependSeparator: true
+    })
+
+    return items
+  })
+
+  return {
+    menuItems
+  }
+}
diff --git a/src/composables/useWorkflowTemplateSelectorDialog.test.ts b/src/composables/useWorkflowTemplateSelectorDialog.test.ts
new file mode 100644
index 0000000000..7cc024ca93
--- /dev/null
+++ b/src/composables/useWorkflowTemplateSelectorDialog.test.ts
@@ -0,0 +1,158 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const mockDialogService = vi.hoisted(() => ({
+  showLayoutDialog: vi.fn()
+}))
+
+const mockDialogStore = vi.hoisted(() => ({
+  closeDialog: vi.fn()
+}))
+
+const mockNewUserService = vi.hoisted(() => ({
+  isNewUser: vi.fn()
+}))
+
+const mockTelemetry = vi.hoisted(() => ({
+  trackTemplateLibraryOpened: vi.fn()
+}))
+
+vi.mock('@/services/dialogService', () => ({
+  useDialogService: () => mockDialogService
+}))
+
+vi.mock('@/stores/dialogStore', () => ({
+  useDialogStore: () => mockDialogStore
+}))
+
+vi.mock('@/services/useNewUserService', () => ({
+  useNewUserService: () => mockNewUserService
+}))
+
+vi.mock('@/platform/telemetry', () => ({
+  useTelemetry: () => mockTelemetry
+}))
+
+vi.mock(
+  '@/components/custom/widget/WorkflowTemplateSelectorDialog.vue',
+  () => ({
+    default: { name: 'MockWorkflowTemplateSelectorDialog' }
+  })
+)
+
+import { useWorkflowTemplateSelectorDialog } from './useWorkflowTemplateSelectorDialog'
+
+describe('useWorkflowTemplateSelectorDialog', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  describe('show', () => {
+    it('defaults to "all" category for non-new users', () => {
+      mockNewUserService.isNewUser.mockReturnValue(false)
+
+      const dialog = useWorkflowTemplateSelectorDialog()
+      dialog.show()
+
+      expect(mockDialogService.showLayoutDialog).toHaveBeenCalledWith(
+        expect.objectContaining({
+          props: expect.objectContaining({
+            initialCategory: 'all'
+          })
+        })
+      )
+    })
+
+    it('defaults to "basics-getting-started" category for new users', () => {
+      mockNewUserService.isNewUser.mockReturnValue(true)
+
+      const dialog = useWorkflowTemplateSelectorDialog()
+      dialog.show()
+
+      expect(mockDialogService.showLayoutDialog).toHaveBeenCalledWith(
+        expect.objectContaining({
+          props: expect.objectContaining({
+            initialCategory: 'basics-getting-started'
+          })
+        })
+      )
+    })
+
+    it('defaults to "all" when new user status is undetermined', () => {
+      mockNewUserService.isNewUser.mockReturnValue(null)
+
+      const dialog = useWorkflowTemplateSelectorDialog()
+      dialog.show()
+
+      expect(mockDialogService.showLayoutDialog).toHaveBeenCalledWith(
+        expect.objectContaining({
+          props: expect.objectContaining({
+            initialCategory: 'all'
+          })
+        })
+      )
+    })
+
+    it('uses explicit initialCategory when provided', () => {
+      mockNewUserService.isNewUser.mockReturnValue(true)
+
+      const dialog = useWorkflowTemplateSelectorDialog()
+      dialog.show('command', { initialCategory: 'custom-category' })
+
+      expect(mockDialogService.showLayoutDialog).toHaveBeenCalledWith(
+        expect.objectContaining({
+          props: expect.objectContaining({
+            initialCategory: 'custom-category'
+          })
+        })
+      )
+    })
+
+    it('invokes afterClose callback when dialog is closed', () => {
+      mockNewUserService.isNewUser.mockReturnValue(false)
+      const afterClose = vi.fn()
+
+      const dialog = useWorkflowTemplateSelectorDialog()
+      dialog.show('command', { afterClose })
+
+      const onClose =
+        mockDialogService.showLayoutDialog.mock.calls[0][0].props.onClose
+      onClose()
+
+      expect(mockDialogStore.closeDialog).toHaveBeenCalled()
+      expect(afterClose).toHaveBeenCalled()
+    })
+
+    it('does not fail when afterClose is not provided', () => {
+      mockNewUserService.isNewUser.mockReturnValue(false)
+
+      const dialog = useWorkflowTemplateSelectorDialog()
+      dialog.show('command')
+
+      const onClose =
+        mockDialogService.showLayoutDialog.mock.calls[0][0].props.onClose
+      expect(() => onClose()).not.toThrow()
+    })
+
+    it('tracks telemetry with source', () => {
+      mockNewUserService.isNewUser.mockReturnValue(false)
+
+      const dialog = useWorkflowTemplateSelectorDialog()
+      dialog.show('sidebar')
+
+      expect(mockTelemetry.trackTemplateLibraryOpened).toHaveBeenCalledWith({
+        source: 'sidebar'
+      })
+    })
+  })
+
+  describe('hide', () => {
+    it('closes the dialog', () => {
+      const dialog = useWorkflowTemplateSelectorDialog()
+      dialog.hide()
+
+      expect(mockDialogStore.closeDialog).toHaveBeenCalledWith({
+        key: 'global-workflow-template-selector'
+      })
+    })
+  })
+})
diff --git a/src/composables/useWorkflowTemplateSelectorDialog.ts b/src/composables/useWorkflowTemplateSelectorDialog.ts
index db2993698f..eb9a10fc47 100644
--- a/src/composables/useWorkflowTemplateSelectorDialog.ts
+++ b/src/composables/useWorkflowTemplateSelectorDialog.ts
@@ -1,35 +1,41 @@
 import WorkflowTemplateSelectorDialog from '@/components/custom/widget/WorkflowTemplateSelectorDialog.vue'
 import { useTelemetry } from '@/platform/telemetry'
+import type { TemplateLibraryMetadata } from '@/platform/telemetry/types'
 import { useDialogService } from '@/services/dialogService'
+import { useNewUserService } from '@/services/useNewUserService'
 import { useDialogStore } from '@/stores/dialogStore'
 
 const DIALOG_KEY = 'global-workflow-template-selector'
+const GETTING_STARTED_CATEGORY_ID = 'basics-getting-started'
 
 export const useWorkflowTemplateSelectorDialog = () => {
   const dialogService = useDialogService()
   const dialogStore = useDialogStore()
+  const newUserService = useNewUserService()
 
   function hide() {
     dialogStore.closeDialog({ key: DIALOG_KEY })
   }
 
-  function show(source: 'sidebar' | 'menu' | 'command' = 'command') {
+  function show(
+    source: TemplateLibraryMetadata['source'] = 'command',
+    options?: { initialCategory?: string; afterClose?: () => void }
+  ) {
     useTelemetry()?.trackTemplateLibraryOpened({ source })
 
+    const initialCategory =
+      options?.initialCategory ??
+      (newUserService.isNewUser() ? GETTING_STARTED_CATEGORY_ID : 'all')
+
     dialogService.showLayoutDialog({
       key: DIALOG_KEY,
       component: WorkflowTemplateSelectorDialog,
       props: {
-        onClose: hide
-      },
-      dialogComponentProps: {
-        pt: {
-          content: { class: '!px-0 overflow-hidden h-full !py-0' },
-          root: {
-            style:
-              'width: 90vw; height: 85vh; max-width: 1400px; display: flex;'
-          }
-        }
+        onClose: () => {
+          hide()
+          options?.afterClose?.()
+        },
+        initialCategory
       }
     })
   }
diff --git a/src/config/staging.ts b/src/config/staging.ts
deleted file mode 100644
index df525f0b24..0000000000
--- a/src/config/staging.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { computed } from 'vue'
-
-import { isCloud } from '@/platform/distribution/types'
-import { remoteConfig } from '@/platform/remoteConfig/remoteConfig'
-
-const BUILD_TIME_IS_STAGING = !__USE_PROD_CONFIG__
-
-/**
- * Returns whether the current environment is staging.
- * - Cloud builds use runtime configuration (firebase_config.projectId containing '-dev')
- * - OSS / localhost builds fall back to the build-time config determined by __USE_PROD_CONFIG__
- */
-export const isStaging = computed(() => {
-  if (!isCloud) {
-    return BUILD_TIME_IS_STAGING
-  }
-
-  const projectId = remoteConfig.value.firebase_config?.projectId
-  return projectId?.includes('-dev') ?? BUILD_TIME_IS_STAGING
-})
diff --git a/src/constants/coreMenuCommands.ts b/src/constants/coreMenuCommands.ts
index 6444b83099..1b1c52cbc8 100644
--- a/src/constants/coreMenuCommands.ts
+++ b/src/constants/coreMenuCommands.ts
@@ -14,6 +14,14 @@ export const CORE_MENU_COMMANDS = [
     ]
   ],
   [['Edit'], ['Comfy.Undo', 'Comfy.Redo']],
+  [
+    ['Edit'],
+    [
+      'Comfy.Canvas.CopySelected',
+      'Comfy.Canvas.PasteFromClipboard',
+      'Comfy.Canvas.SelectAll'
+    ]
+  ],
   [['Edit'], ['Comfy.ClearWorkflow']],
   [['Edit'], ['Comfy.OpenClipspace']],
   [
diff --git a/src/constants/essentialsDisplayNames.test.ts b/src/constants/essentialsDisplayNames.test.ts
new file mode 100644
index 0000000000..57967510f3
--- /dev/null
+++ b/src/constants/essentialsDisplayNames.test.ts
@@ -0,0 +1,105 @@
+import { describe, expect, it, vi } from 'vitest'
+
+vi.mock('@/i18n', () => ({
+  t: vi.fn((key: string) => key)
+}))
+
+import { resolveEssentialsDisplayName } from '@/constants/essentialsDisplayNames'
+
+describe('resolveEssentialsDisplayName', () => {
+  describe('exact name matches', () => {
+    it.each([
+      ['LoadImage', 'essentials.loadImage'],
+      ['SaveImage', 'essentials.saveImage'],
+      ['PrimitiveStringMultiline', 'essentials.text'],
+      ['ImageScale', 'essentials.resizeImage'],
+      ['LoraLoader', 'essentials.loadStyleLora'],
+      ['OpenAIChatNode', 'essentials.textGenerationLLM'],
+      ['RecraftRemoveBackgroundNode', 'essentials.removeBackground'],
+      ['ImageCompare', 'essentials.imageCompare'],
+      ['StabilityTextToAudio', 'essentials.musicGeneration'],
+      ['BatchImagesNode', 'essentials.batchImage'],
+      ['Video Slice', 'essentials.extractFrame'],
+      ['KlingLipSyncAudioToVideoNode', 'essentials.lipsync'],
+      ['KlingLipSyncTextToVideoNode', 'essentials.lipsync']
+    ])('%s -> %s', (name, expected) => {
+      expect(resolveEssentialsDisplayName({ name })).toBe(expected)
+    })
+  })
+
+  describe('3D API node alternatives', () => {
+    it.each([
+      ['TencentTextToModelNode', 'essentials.textTo3DModel'],
+      ['MeshyTextToModelNode', 'essentials.textTo3DModel'],
+      ['TripoTextToModelNode', 'essentials.textTo3DModel'],
+      ['TencentImageToModelNode', 'essentials.imageTo3DModel'],
+      ['MeshyImageToModelNode', 'essentials.imageTo3DModel'],
+      ['TripoImageToModelNode', 'essentials.imageTo3DModel']
+    ])('%s -> %s', (name, expected) => {
+      expect(resolveEssentialsDisplayName({ name })).toBe(expected)
+    })
+  })
+
+  describe('blueprint prefix matches', () => {
+    it.each([
+      [
+        'SubgraphBlueprint.text_to_image_flux_schnell.json',
+        'essentials.textToImage'
+      ],
+      ['SubgraphBlueprint.text_to_image_sd15.json', 'essentials.textToImage'],
+      [
+        'SubgraphBlueprint.image_edit_something.json',
+        'essentials.imageToImage'
+      ],
+      ['SubgraphBlueprint.pose_to_image_v2.json', 'essentials.poseToImage'],
+      [
+        'SubgraphBlueprint.canny_to_image_z_image_turbo.json',
+        'essentials.cannyToImage'
+      ],
+      [
+        'SubgraphBlueprint.depth_to_image_z_image_turbo.json',
+        'essentials.depthToImage'
+      ],
+      ['SubgraphBlueprint.text_to_video_ltx.json', 'essentials.textToVideo'],
+      ['SubgraphBlueprint.image_to_video_wan.json', 'essentials.imageToVideo'],
+      [
+        'SubgraphBlueprint.pose_to_video_ltx_2_0.json',
+        'essentials.poseToVideo'
+      ],
+      [
+        'SubgraphBlueprint.canny_to_video_ltx_2_0.json',
+        'essentials.cannyToVideo'
+      ],
+      [
+        'SubgraphBlueprint.depth_to_video_ltx_2_0.json',
+        'essentials.depthToVideo'
+      ],
+      [
+        'SubgraphBlueprint.image_inpainting_qwen_image_instantx.json',
+        'essentials.inpaintImage'
+      ],
+      [
+        'SubgraphBlueprint.image_outpainting_qwen_image_instantx.json',
+        'essentials.outpaintImage'
+      ]
+    ])('%s -> %s', (name, expected) => {
+      expect(resolveEssentialsDisplayName({ name })).toBe(expected)
+    })
+  })
+
+  describe('unmapped nodes', () => {
+    it('returns undefined for unknown node names', () => {
+      expect(resolveEssentialsDisplayName({ name: 'SomeRandomNode' })).toBe(
+        undefined
+      )
+    })
+
+    it('returns undefined for unknown blueprint prefixes', () => {
+      expect(
+        resolveEssentialsDisplayName({
+          name: 'SubgraphBlueprint.unknown_workflow.json'
+        })
+      ).toBe(undefined)
+    })
+  })
+})
diff --git a/src/constants/essentialsDisplayNames.ts b/src/constants/essentialsDisplayNames.ts
new file mode 100644
index 0000000000..12c8708d26
--- /dev/null
+++ b/src/constants/essentialsDisplayNames.ts
@@ -0,0 +1,108 @@
+import { t } from '@/i18n'
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+
+const BLUEPRINT_PREFIX = 'SubgraphBlueprint.'
+
+/**
+ * Static mapping of node names to their Essentials tab display name i18n keys.
+ */
+const EXACT_NAME_MAP: Record<string, string> = {
+  // Basics
+  LoadImage: 'essentials.loadImage',
+  SaveImage: 'essentials.saveImage',
+  LoadVideo: 'essentials.loadVideo',
+  SaveVideo: 'essentials.saveVideo',
+  Load3D: 'essentials.load3DModel',
+  SaveGLB: 'essentials.save3DModel',
+  PrimitiveStringMultiline: 'essentials.text',
+
+  // Image Tools
+  BatchImagesNode: 'essentials.batchImage',
+  ImageCrop: 'essentials.cropImage',
+  ImageScale: 'essentials.resizeImage',
+  ImageRotate: 'essentials.rotate',
+  ImageInvert: 'essentials.invert',
+  Canny: 'essentials.canny',
+  RecraftRemoveBackgroundNode: 'essentials.removeBackground',
+  ImageCompare: 'essentials.imageCompare',
+
+  // Video Tools
+  'Video Slice': 'essentials.extractFrame',
+
+  // Image Generation
+  LoraLoader: 'essentials.loadStyleLora',
+
+  // Video Generation
+  KlingLipSyncAudioToVideoNode: 'essentials.lipsync',
+  KlingLipSyncTextToVideoNode: 'essentials.lipsync',
+
+  // Text Generation
+  OpenAIChatNode: 'essentials.textGenerationLLM',
+
+  // 3D
+  TencentTextToModelNode: 'essentials.textTo3DModel',
+  TencentImageToModelNode: 'essentials.imageTo3DModel',
+  MeshyTextToModelNode: 'essentials.textTo3DModel',
+  MeshyImageToModelNode: 'essentials.imageTo3DModel',
+  TripoTextToModelNode: 'essentials.textTo3DModel',
+  TripoImageToModelNode: 'essentials.imageTo3DModel',
+
+  // Audio
+  StabilityTextToAudio: 'essentials.musicGeneration',
+  LoadAudio: 'essentials.loadAudio',
+  SaveAudio: 'essentials.saveAudio'
+}
+
+/**
+ * Blueprint prefix patterns mapped to display name i18n keys.
+ * Entries are matched by checking if the blueprint filename
+ * (after removing the SubgraphBlueprint. prefix) starts with the key.
+ * Ordered longest-first so more specific prefixes match before shorter ones.
+ */
+const BLUEPRINT_PREFIX_MAP: [prefix: string, displayNameKey: string][] = [
+  // Image Generation
+  ['image_inpainting_', 'essentials.inpaintImage'],
+  ['image_outpainting_', 'essentials.outpaintImage'],
+  ['image_edit', 'essentials.imageToImage'],
+  ['text_to_image', 'essentials.textToImage'],
+  ['pose_to_image', 'essentials.poseToImage'],
+  ['canny_to_image', 'essentials.cannyToImage'],
+  ['depth_to_image', 'essentials.depthToImage'],
+
+  // Video Generation
+  ['text_to_video', 'essentials.textToVideo'],
+  ['image_to_video', 'essentials.imageToVideo'],
+  ['pose_to_video', 'essentials.poseToVideo'],
+  ['canny_to_video', 'essentials.cannyToVideo'],
+  ['depth_to_video', 'essentials.depthToVideo']
+]
+
+function resolveBlueprintDisplayName(
+  blueprintName: string
+): string | undefined {
+  for (const [prefix, displayNameKey] of BLUEPRINT_PREFIX_MAP) {
+    if (blueprintName.startsWith(prefix)) {
+      return t(displayNameKey)
+    }
+  }
+  return undefined
+}
+
+/**
+ * Resolves the Essentials tab display name for a given node definition.
+ * Returns `undefined` if the node has no Essentials display name mapping.
+ */
+export function resolveEssentialsDisplayName(
+  nodeDef: Pick<ComfyNodeDefImpl, 'name'> | undefined
+): string | undefined {
+  if (!nodeDef) return undefined
+  const { name } = nodeDef
+
+  if (name.startsWith(BLUEPRINT_PREFIX)) {
+    const blueprintName = name.slice(BLUEPRINT_PREFIX.length)
+    return resolveBlueprintDisplayName(blueprintName)
+  }
+
+  const key = EXACT_NAME_MAP[name]
+  return key ? t(key) : undefined
+}
diff --git a/src/constants/essentialsNodes.test.ts b/src/constants/essentialsNodes.test.ts
new file mode 100644
index 0000000000..23a076799d
--- /dev/null
+++ b/src/constants/essentialsNodes.test.ts
@@ -0,0 +1,62 @@
+import { describe, expect, it } from 'vitest'
+
+import {
+  ESSENTIALS_CATEGORIES,
+  ESSENTIALS_CATEGORY_CANONICAL,
+  ESSENTIALS_CATEGORY_MAP,
+  ESSENTIALS_NODES,
+  TOOLKIT_BLUEPRINT_MODULES,
+  TOOLKIT_NOVEL_NODE_NAMES
+} from './essentialsNodes'
+
+describe('essentialsNodes', () => {
+  it('has no duplicate node names across categories', () => {
+    const seen = new Map<string, string>()
+    for (const [category, nodes] of Object.entries(ESSENTIALS_NODES)) {
+      for (const node of nodes) {
+        expect(
+          seen.has(node),
+          `"${node}" duplicated in "${category}" and "${seen.get(node)}"`
+        ).toBe(false)
+        seen.set(node, category)
+      }
+    }
+  })
+
+  it('ESSENTIALS_CATEGORY_MAP covers every node in ESSENTIALS_NODES', () => {
+    for (const [category, nodes] of Object.entries(ESSENTIALS_NODES)) {
+      for (const node of nodes) {
+        expect(ESSENTIALS_CATEGORY_MAP[node]).toBe(category)
+      }
+    }
+  })
+
+  it('TOOLKIT_NOVEL_NODE_NAMES excludes basics nodes', () => {
+    for (const basicNode of ESSENTIALS_NODES.basics) {
+      expect(TOOLKIT_NOVEL_NODE_NAMES.has(basicNode)).toBe(false)
+    }
+  })
+
+  it('TOOLKIT_NOVEL_NODE_NAMES excludes SubgraphBlueprint-prefixed nodes', () => {
+    for (const name of TOOLKIT_NOVEL_NODE_NAMES) {
+      expect(name.startsWith('SubgraphBlueprint.')).toBe(false)
+    }
+  })
+
+  it('ESSENTIALS_NODES keys match ESSENTIALS_CATEGORIES', () => {
+    const nodeKeys = Object.keys(ESSENTIALS_NODES)
+    expect(nodeKeys).toEqual([...ESSENTIALS_CATEGORIES])
+  })
+
+  it('TOOLKIT_BLUEPRINT_MODULES contains comfy_essentials', () => {
+    expect(TOOLKIT_BLUEPRINT_MODULES.has('comfy_essentials')).toBe(true)
+  })
+
+  it('ESSENTIALS_CATEGORY_CANONICAL maps every category case-insensitively', () => {
+    for (const category of ESSENTIALS_CATEGORIES) {
+      expect(ESSENTIALS_CATEGORY_CANONICAL.get(category.toLowerCase())).toBe(
+        category
+      )
+    }
+  })
+})
diff --git a/src/constants/essentialsNodes.ts b/src/constants/essentialsNodes.ts
new file mode 100644
index 0000000000..07afc8d9c2
--- /dev/null
+++ b/src/constants/essentialsNodes.ts
@@ -0,0 +1,126 @@
+/**
+ * Single source of truth for Essentials tab node categorization and ordering.
+ *
+ * Adding a new node to the Essentials tab? Add it here and nowhere else.
+ *
+ * Source: https://www.notion.so/comfy-org/2fe6d73d365080d0a951d14cdf540778
+ */
+
+export const ESSENTIALS_ICON_OVERRIDES: Record<string, string> = {
+  LoadImage: 'icon-s1.3-[lucide--image-up]',
+  LoadImageOutput: 'icon-s1.3-[lucide--image-up]',
+  SaveImage: 'icon-s1.3-[lucide--image-down]',
+  PrimitiveStringMultiline: 'icon-s1.3-[lucide--text]',
+  ImageCrop: 'icon-s1.3-[lucide--crop]',
+  VideoCrop: 'icon-s1.3-[lucide--crop]',
+  KlingLipSyncAudioToVideoNode: 'icon-s1.3-[lucide--mic-vocal]',
+  WebcamCapture: 'icon-s1.3-[lucide--camera]'
+}
+
+export const ESSENTIALS_CATEGORIES = [
+  'basics',
+  'text generation',
+  'image generation',
+  'video generation',
+  'image tools',
+  'video tools',
+  'audio',
+  '3D'
+] as const
+
+export type EssentialsCategory = (typeof ESSENTIALS_CATEGORIES)[number]
+
+/**
+ * Ordered list of nodes per category.
+ * Array order = display order in the Essentials tab.
+ * Presence in a category = the node's essentials_category mock fallback.
+ */
+export const ESSENTIALS_NODES: Record<EssentialsCategory, readonly string[]> = {
+  basics: [
+    'LoadImage',
+    'LoadVideo',
+    'Load3D',
+    'SaveImage',
+    'SaveVideo',
+    'SaveGLB',
+    'PrimitiveStringMultiline',
+    'PreviewImage'
+  ],
+  'text generation': ['OpenAIChatNode'],
+  'image generation': [
+    'LoraLoader',
+    'LoraLoaderModelOnly',
+    'ConditioningCombine'
+  ],
+  'video generation': [
+    'SubgraphBlueprint.pose_to_video_ltx_2_0',
+    'SubgraphBlueprint.canny_to_video_ltx_2_0',
+    'KlingLipSyncAudioToVideoNode',
+    'KlingOmniProEditVideoNode'
+  ],
+  'image tools': [
+    'ImageBatch',
+    'ImageCrop',
+    'ImageCropV2',
+    'ImageScale',
+    'ImageScaleBy',
+    'ImageRotate',
+    'ImageBlur',
+    'ImageBlend',
+    'ImageInvert',
+    'ImageCompare',
+    'Canny',
+    'RecraftRemoveBackgroundNode',
+    'RecraftVectorizeImageNode',
+    'LoadImageMask',
+    'GLSLShader'
+  ],
+  'video tools': ['GetVideoComponents', 'CreateVideo', 'Video Slice'],
+  audio: [
+    'LoadAudio',
+    'SaveAudio',
+    'SaveAudioMP3',
+    'StabilityTextToAudio',
+    'EmptyLatentAudio'
+  ],
+  '3D': ['TencentTextToModelNode', 'TencentImageToModelNode']
+}
+
+/**
+ * Flat map: node name → category (derived from ESSENTIALS_NODES).
+ * Used as mock/fallback when backend doesn't provide essentials_category.
+ */
+export const ESSENTIALS_CATEGORY_MAP: Record<string, EssentialsCategory> =
+  Object.fromEntries(
+    Object.entries(ESSENTIALS_NODES).flatMap(([category, nodes]) =>
+      nodes.map((node) => [node, category])
+    )
+  ) as Record<string, EssentialsCategory>
+
+/**
+ * Case-insensitive lookup: lowercase category → canonical category.
+ * Used to normalize backend categories (which may be title-cased) to the
+ * canonical form used in ESSENTIALS_CATEGORIES.
+ */
+export const ESSENTIALS_CATEGORY_CANONICAL: ReadonlyMap<
+  string,
+  EssentialsCategory
+> = new Map(ESSENTIALS_CATEGORIES.map((c) => [c.toLowerCase(), c]))
+
+/**
+ * "Novel" toolkit nodes for telemetry — basics excluded.
+ * Derived from ESSENTIALS_NODES minus the 'basics' category.
+ */
+export const TOOLKIT_NOVEL_NODE_NAMES: ReadonlySet<string> = new Set(
+  Object.entries(ESSENTIALS_NODES)
+    .filter(([cat]) => cat !== 'basics')
+    .flatMap(([, nodes]) => nodes)
+    .filter((n) => !n.startsWith('SubgraphBlueprint.'))
+)
+
+/**
+ * python_module values that identify toolkit blueprint nodes.
+ */
+export const TOOLKIT_BLUEPRINT_MODULES: ReadonlySet<string> = new Set([
+  'comfy_essentials'
+])
diff --git a/src/constants/serverConfig.ts b/src/constants/serverConfig.ts
index bd47a0895b..4d5990b0c2 100644
--- a/src/constants/serverConfig.ts
+++ b/src/constants/serverConfig.ts
@@ -9,7 +9,7 @@ import {
   VramManagement
 } from '@/types/serverArgs'
 
-export type ServerConfigValue = string | number | true | null | undefined
+export type ServerConfigValue = string | number | boolean | null | undefined
 
 export interface ServerConfig<T> extends FormItem {
   id: string
@@ -19,7 +19,7 @@ export interface ServerConfig<T> extends FormItem {
   getValue?: (value: T) => Record<string, ServerConfigValue>
 }
 
-export const SERVER_CONFIG_ITEMS: ServerConfig<any>[] = [
+export const SERVER_CONFIG_ITEMS = [
   // Network settings
   {
     id: 'listen',
diff --git a/src/constants/splitterConstants.ts b/src/constants/splitterConstants.ts
new file mode 100644
index 0000000000..792a5a8887
--- /dev/null
+++ b/src/constants/splitterConstants.ts
@@ -0,0 +1,11 @@
+/** Default panel size (%) for sidebar and builder panels */
+export const SIDE_PANEL_SIZE = 20
+
+/** Default panel size (%) for the center/main panel */
+export const CENTER_PANEL_SIZE = 80
+
+/** Minimum panel size (%) for the sidebar */
+export const SIDEBAR_MIN_SIZE = 10
+
+/** Minimum panel size (%) for the builder panel */
+export const BUILDER_MIN_SIZE = 15
diff --git a/src/constants/toolkitNodes.ts b/src/constants/toolkitNodes.ts
new file mode 100644
index 0000000000..1637445890
--- /dev/null
+++ b/src/constants/toolkitNodes.ts
@@ -0,0 +1,10 @@
+/**
+ * Toolkit (Essentials) node detection constants.
+ *
+ * Re-exported from essentialsNodes.ts — the single source of truth.
+ * Used by telemetry to track toolkit node adoption and popularity.
+ */
+export {
+  TOOLKIT_NOVEL_NODE_NAMES as TOOLKIT_NODE_NAMES,
+  TOOLKIT_BLUEPRINT_MODULES
+} from './essentialsNodes'
diff --git a/src/core/graph/subgraph-dynamic-input-limitations.md b/src/core/graph/subgraph-dynamic-input-limitations.md
new file mode 100644
index 0000000000..9ab31faee6
--- /dev/null
+++ b/src/core/graph/subgraph-dynamic-input-limitations.md
@@ -0,0 +1,52 @@
+# Subgraph Limitations: Dynamic Inputs (MatchType / Autogrow)
+
+MatchType and autogrow do not work inside subgraphs. Subgraph boundary slots freeze their type at connection time — whatever type exists at that moment is permanently captured as a fixed string. There is no runtime type resolution or reactivity across the boundary: matchtype mutations and autogrow slot additions on internal nodes are never propagated to the `SubgraphNode`.
+
+```mermaid
+flowchart LR
+  subgraph Parent Graph
+    SN[SubgraphNode]
+  end
+  subgraph Inside Subgraph
+    SIN[SubgraphInputNode]
+    N[Node with matchtype/autogrow]
+  end
+
+  SN -- "mirrors slots on\nconfigure & input-added" --> SIN
+  SIN -- "type frozen as string\non addInput()" --> N
+  N -. "runtime type changes\nNOT propagated" .-> SIN
+  SIN -. "no type update path" .-> SN
+
+  classDef static fill:#1a1a2e,stroke:#e94560,color:#eee
+  classDef dynamic fill:#1a1a2e,stroke:#0f3460,color:#eee
+  class SN,SIN static
+  class N dynamic
+```
+
+## MatchType
+
+`SubgraphInputNode.connectByType` captures the type as a fixed string via `subgraph.addInput(name, String(type))`. `SubgraphNode` mirrors each new input via the `input-added` event, copying the type at that moment.
+
+The subgraph boundary slot type is frozen at connection time with no subsequent reactivity. If the first connection carries a specific type (e.g., `IMAGE`), the slot is correctly typed and incompatible connections are properly blocked on the `SubgraphNode`. However, if the first connection carries `*` (any type) — for example from a switch node — the slot is permanently set to `*`, accepting any connection regardless of the internal node's actual type requirements.
+
+## Autogrow
+
+Autogrow hooks `onConnectionsChange` and splices new inputs into the node's `inputs` array when the last slot is connected. These inputs are added to the **internal node**, not to the subgraph's input/output definitions. `SubgraphNode` only listens for events on the subgraph definition — there is no bridge.
+
+Open UX questions (from the autogrow author):
+
+- Should promoting an autogrow connection cause the `SubgraphNode` to autogrow from that slot?
+- How to distinguish "promote this specific input" vs "promote the autogrow behavior"?
+
+## Workarounds
+
+- Use explicitly typed subgraph inputs instead of relying on matchtype at the boundary.
+- Move matchtype/autogrow nodes outside the subgraph; pass stable typed values in.
+
+## References
+
+- `src/core/graph/widgets/dynamicWidgets.ts` — `applyMatchType`, `applyAutogrow`
+- `src/lib/litegraph/src/subgraph/SubgraphInputNode.ts` — `connectByType`
+- `src/lib/litegraph/src/subgraph/SubgraphNode.ts` — `input-added` event listener
+- [#8352](https://github.com/Comfy-Org/ComfyUI_frontend/pull/8352) (closed) — attempted fix, unresolved edge cases
+- [#7837](https://github.com/Comfy-Org/ComfyUI_frontend/pull/7837) (merged) — partial fix only
diff --git a/src/core/graph/subgraph/promotedWidgetTypes.ts b/src/core/graph/subgraph/promotedWidgetTypes.ts
new file mode 100644
index 0000000000..c96773ae6d
--- /dev/null
+++ b/src/core/graph/subgraph/promotedWidgetTypes.ts
@@ -0,0 +1,20 @@
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type { SubgraphNode } from '@/lib/litegraph/src/subgraph/SubgraphNode'
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+
+export type ResolvedPromotedWidget = {
+  node: LGraphNode
+  widget: IBaseWidget
+}
+
+export interface PromotedWidgetView extends IBaseWidget {
+  readonly node: SubgraphNode
+  readonly sourceNodeId: string
+  readonly sourceWidgetName: string
+}
+
+export function isPromotedWidgetView(
+  widget: IBaseWidget
+): widget is PromotedWidgetView {
+  return 'sourceNodeId' in widget && 'sourceWidgetName' in widget
+}
diff --git a/src/core/graph/subgraph/promotedWidgetView.test.ts b/src/core/graph/subgraph/promotedWidgetView.test.ts
new file mode 100644
index 0000000000..463c7747f3
--- /dev/null
+++ b/src/core/graph/subgraph/promotedWidgetView.test.ts
@@ -0,0 +1,1463 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, test, vi } from 'vitest'
+
+// Barrel import must come first to avoid circular dependency
+// (promotedWidgetView → widgetMap → BaseWidget → LegacyWidget → barrel)
+import {
+  CanvasPointer,
+  LGraphNode,
+  LiteGraph
+} from '@/lib/litegraph/src/litegraph'
+import type {
+  CanvasPointerEvent,
+  SubgraphNode
+} from '@/lib/litegraph/src/litegraph'
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+
+import { createPromotedWidgetView } from '@/core/graph/subgraph/promotedWidgetView'
+import type { PromotedWidgetView } from '@/core/graph/subgraph/promotedWidgetView'
+import { resolvePromotedWidgetSource } from '@/core/graph/subgraph/resolvePromotedWidgetSource'
+import { usePromotionStore } from '@/stores/promotionStore'
+import { useWidgetValueStore } from '@/stores/widgetValueStore'
+
+import {
+  createTestSubgraph,
+  createTestSubgraphNode
+} from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers'
+
+vi.mock('@/renderer/core/canvas/canvasStore', () => ({
+  useCanvasStore: () => ({})
+}))
+const mockDomWidgetStore = vi.hoisted(() => ({
+  widgetStates: new Map(),
+  setPositionOverride: vi.fn(),
+  clearPositionOverride: vi.fn()
+}))
+vi.mock('@/stores/domWidgetStore', () => ({
+  useDomWidgetStore: () => mockDomWidgetStore
+}))
+vi.mock('@/services/litegraphService', () => ({
+  useLitegraphService: () => ({ updatePreviews: () => ({}) })
+}))
+
+function setupSubgraph(
+  innerNodeCount: number = 0
+): [SubgraphNode, LGraphNode[]] {
+  const subgraph = createTestSubgraph()
+  const subgraphNode = createTestSubgraphNode(subgraph)
+  subgraphNode._internalConfigureAfterSlots()
+  const graph = subgraphNode.graph!
+  graph.add(subgraphNode)
+  const innerNodes: LGraphNode[] = []
+  for (let i = 0; i < innerNodeCount; i++) {
+    const innerNode = new LGraphNode(`InnerNode${i}`)
+    subgraph.add(innerNode)
+    innerNodes.push(innerNode)
+  }
+  return [subgraphNode, innerNodes]
+}
+
+function setPromotions(
+  subgraphNode: SubgraphNode,
+  entries: [string, string][]
+) {
+  usePromotionStore().setPromotions(
+    subgraphNode.rootGraph.id,
+    subgraphNode.id,
+    entries.map(([interiorNodeId, widgetName]) => ({
+      interiorNodeId,
+      widgetName
+    }))
+  )
+}
+
+function firstInnerNode(innerNodes: LGraphNode[]): LGraphNode {
+  const innerNode = innerNodes[0]
+  if (!innerNode) throw new Error('Expected at least one inner node')
+  return innerNode
+}
+
+describe(createPromotedWidgetView, () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    mockDomWidgetStore.widgetStates.clear()
+    vi.clearAllMocks()
+  })
+
+  test('exposes sourceNodeId and sourceWidgetName', () => {
+    const [subgraphNode] = setupSubgraph()
+    const view = createPromotedWidgetView(subgraphNode, '42', 'myWidget')
+    expect(view.sourceNodeId).toBe('42')
+    expect(view.sourceWidgetName).toBe('myWidget')
+  })
+
+  test('name defaults to widgetName when no displayName given', () => {
+    const [subgraphNode] = setupSubgraph()
+    const view = createPromotedWidgetView(subgraphNode, '1', 'myWidget')
+    expect(view.name).toBe('myWidget')
+  })
+
+  test('name uses displayName when provided', () => {
+    const [subgraphNode] = setupSubgraph()
+    const view = createPromotedWidgetView(
+      subgraphNode,
+      '1',
+      'myWidget',
+      'Custom Label'
+    )
+    expect(view.name).toBe('Custom Label')
+  })
+
+  test('node getter returns the subgraphNode', () => {
+    const [subgraphNode] = setupSubgraph()
+    const view = createPromotedWidgetView(subgraphNode, '1', 'myWidget')
+    // node is defined via Object.defineProperty at runtime but not on the TS interface
+    expect((view as unknown as Record<string, unknown>).node).toBe(subgraphNode)
+  })
+
+  test('serialize is false', () => {
+    const [subgraphNode] = setupSubgraph()
+    const view = createPromotedWidgetView(subgraphNode, '1', 'myWidget')
+    expect(view.serialize).toBe(false)
+  })
+
+  test('computedDisabled defaults to false and accepts boolean values', () => {
+    const [subgraphNode] = setupSubgraph()
+    const view = createPromotedWidgetView(subgraphNode, '1', 'myWidget')
+    expect(view.computedDisabled).toBe(false)
+    view.computedDisabled = true
+    expect(view.computedDisabled).toBe(true)
+  })
+
+  test('computedDisabled treats undefined as false', () => {
+    const [subgraphNode] = setupSubgraph()
+    const view = createPromotedWidgetView(subgraphNode, '1', 'myWidget')
+    view.computedDisabled = true
+    view.computedDisabled = undefined
+    expect(view.computedDisabled).toBe(false)
+  })
+
+  test('positional properties are writable and independent', () => {
+    const [subgraphNode] = setupSubgraph()
+    const view = createPromotedWidgetView(subgraphNode, '1', 'myWidget')
+    expect(view.y).toBe(0)
+
+    view.y = 100
+    view.last_y = 90
+    view.computedHeight = 30
+
+    expect(view.y).toBe(100)
+    expect(view.last_y).toBe(90)
+    expect(view.computedHeight).toBe(30)
+  })
+
+  test('type delegates to interior widget', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    const innerNode = firstInnerNode(innerNodes)
+    innerNode.addWidget('combo', 'picker', 'a', () => {}, {
+      values: ['a', 'b']
+    })
+    const view = createPromotedWidgetView(
+      subgraphNode,
+      String(innerNode.id),
+      'picker'
+    )
+    expect(view.type).toBe('combo')
+  })
+
+  test('type falls back to button when interior widget is missing', () => {
+    const [subgraphNode] = setupSubgraph()
+    const view = createPromotedWidgetView(subgraphNode, '999', 'missing')
+    expect(view.type).toBe('button')
+  })
+
+  test('options delegates to interior widget', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    const innerNode = firstInnerNode(innerNodes)
+    const opts = { values: ['a', 'b'] as string[] }
+    innerNode.addWidget('combo', 'picker', 'a', () => {}, opts)
+    const view = createPromotedWidgetView(
+      subgraphNode,
+      String(innerNode.id),
+      'picker'
+    )
+    expect(view.options).toBe(opts)
+  })
+
+  test('options falls back to empty object when interior widget is missing', () => {
+    const [subgraphNode] = setupSubgraph()
+    const view = createPromotedWidgetView(subgraphNode, '999', 'missing')
+    expect(view.options).toEqual({})
+  })
+
+  test('linkedWidgets delegates to interior widget', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    const innerNode = firstInnerNode(innerNodes)
+    const seedWidget = innerNode.addWidget('number', 'seed', 1, () => {})
+    const controlWidget = innerNode.addWidget(
+      'combo',
+      'control_after_generate',
+      'randomize',
+      () => {},
+      {
+        values: ['fixed', 'increment', 'decrement', 'randomize']
+      }
+    )
+    seedWidget.linkedWidgets = [controlWidget]
+
+    const view = createPromotedWidgetView(
+      subgraphNode,
+      String(innerNode.id),
+      'seed'
+    )
+
+    expect(view.linkedWidgets).toBe(seedWidget.linkedWidgets)
+    expect(view.linkedWidgets?.[0].name).toBe('control_after_generate')
+  })
+
+  test('value is store-backed via widgetValueStore', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    const innerNode = firstInnerNode(innerNodes)
+    innerNode.addWidget('text', 'myWidget', 'initial', () => {})
+    const view = createPromotedWidgetView(
+      subgraphNode,
+      String(innerNode.id),
+      'myWidget'
+    )
+
+    // Value should read from the store (which was populated by addWidget)
+    expect(view.value).toBe('initial')
+
+    // Setting value through the view updates the store
+    view.value = 'updated'
+    expect(view.value).toBe('updated')
+
+    // The interior widget reads from the same store
+    expect(innerNode.widgets![0].value).toBe('updated')
+  })
+
+  test('value falls back to interior widget when store entry is missing', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    const innerNode = firstInnerNode(innerNodes)
+    const fallbackWidgetShape = {
+      name: 'myWidget',
+      type: 'text',
+      value: 'initial',
+      options: {}
+    } satisfies Pick<IBaseWidget, 'name' | 'type' | 'value' | 'options'>
+    const fallbackWidget = fallbackWidgetShape as unknown as IBaseWidget
+    innerNode.widgets = [fallbackWidget]
+
+    const widgetValueStore = useWidgetValueStore()
+    vi.spyOn(widgetValueStore, 'getWidget').mockReturnValue(undefined)
+
+    const view = createPromotedWidgetView(
+      subgraphNode,
+      String(innerNode.id),
+      'myWidget'
+    )
+
+    expect(view.value).toBe('initial')
+    view.value = 'updated'
+    expect(fallbackWidget.value).toBe('updated')
+  })
+
+  test('label falls back to displayName then widgetName', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    const innerNode = firstInnerNode(innerNodes)
+    innerNode.addWidget('text', 'myWidget', 'val', () => {})
+    const store = useWidgetValueStore()
+    const bareId = String(innerNode.id)
+
+    // No displayName → falls back to widgetName
+    const view1 = createPromotedWidgetView(subgraphNode, bareId, 'myWidget')
+    // Store label is undefined → falls back to displayName/widgetName
+    const state = store.getWidget(
+      subgraphNode.rootGraph.id,
+      bareId as never,
+      'myWidget'
+    )
+    state!.label = undefined
+    expect(view1.label).toBe('myWidget')
+
+    // With displayName → falls back to displayName
+    const view2 = createPromotedWidgetView(
+      subgraphNode,
+      bareId,
+      'myWidget',
+      'Custom'
+    )
+    expect(view2.label).toBe('Custom')
+  })
+
+  test('callback forwards to interior widget', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    const innerNode = firstInnerNode(innerNodes)
+    const callbackSpy = vi.fn()
+    innerNode.addWidget('text', 'myWidget', 'val', callbackSpy)
+    const view = createPromotedWidgetView(
+      subgraphNode,
+      String(innerNode.id),
+      'myWidget'
+    )
+
+    view.callback!('newVal')
+    expect(callbackSpy).toHaveBeenCalled()
+    expect(callbackSpy.mock.calls[0][0]).toBe('newVal')
+  })
+
+  test('callback is safe when interior widget is missing', () => {
+    const [subgraphNode] = setupSubgraph()
+    const view = createPromotedWidgetView(subgraphNode, '999', 'missing')
+    expect(() => view.callback!('val')).not.toThrow()
+  })
+
+  test('computeSize delegates to interior widget computeSize', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    const innerNode = firstInnerNode(innerNodes)
+    const widget = innerNode.addWidget('text', 'legacySize', 'val', () => {})
+    const computeSize = vi.fn<(width?: number) => [number, number]>(
+      (width?: number) => [width ?? 0, 37]
+    )
+    widget.computeSize = computeSize
+
+    const view = createPromotedWidgetView(
+      subgraphNode,
+      String(innerNode.id),
+      'legacySize'
+    )
+
+    expect(typeof view.computeSize).toBe('function')
+    expect(view.computeSize?.(210)).toEqual([210, 37])
+    expect(computeSize).toHaveBeenCalledWith(210)
+  })
+
+  test('onPointerDown falls back to legacy mouse callback', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    subgraphNode.pos = [10, 20]
+    const innerNode = firstInnerNode(innerNodes)
+    const mouse = vi.fn(() => true)
+    const legacyWidget = {
+      name: 'legacyMouse',
+      type: 'mystery-legacy',
+      value: 'val',
+      options: {},
+      mouse
+    } as unknown as IBaseWidget
+    innerNode.widgets = [legacyWidget]
+
+    const view = createPromotedWidgetView(
+      subgraphNode,
+      String(innerNode.id),
+      'legacyMouse'
+    )
+
+    const pointer = new CanvasPointer(document.createElement('div'))
+    pointer.eDown = {
+      canvasX: 110,
+      canvasY: 120,
+      deltaX: 0,
+      deltaY: 0,
+      safeOffsetX: 0,
+      safeOffsetY: 0
+    } as CanvasPointerEvent
+
+    const handled = view.onPointerDown?.(
+      pointer,
+      subgraphNode,
+      {} as Parameters<NonNullable<typeof view.onPointerDown>>[2]
+    )
+
+    expect(handled).toBe(true)
+    expect(mouse).toHaveBeenCalledWith(pointer.eDown, [100, 100], subgraphNode)
+
+    pointer.eUp = {
+      canvasX: 130,
+      canvasY: 140,
+      deltaX: 0,
+      deltaY: 0,
+      safeOffsetX: 0,
+      safeOffsetY: 0
+    } as CanvasPointerEvent
+    pointer.finally?.()
+
+    expect(mouse).toHaveBeenCalledWith(pointer.eUp, [120, 120], subgraphNode)
+  })
+})
+
+describe('SubgraphNode.widgets getter', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+  })
+
+  test('defers promotions while subgraph node id is -1 and flushes on add', () => {
+    const subgraph = createTestSubgraph({
+      inputs: [{ name: 'picker_input', type: '*' }]
+    })
+    const subgraphNode = createTestSubgraphNode(subgraph, { id: -1 })
+
+    const innerNode = new LGraphNode('InnerNode')
+    const innerInput = innerNode.addInput('picker_input', '*')
+    innerNode.addWidget('combo', 'picker', 'a', () => {}, {
+      values: ['a', 'b']
+    })
+    innerInput.widget = { name: 'picker' }
+    subgraph.add(innerNode)
+
+    subgraph.inputNode.slots[0].connect(innerInput, innerNode)
+    subgraphNode._internalConfigureAfterSlots()
+
+    const store = usePromotionStore()
+    expect(store.getPromotions(subgraphNode.rootGraph.id, -1)).toStrictEqual([])
+
+    subgraphNode.graph?.add(subgraphNode)
+    expect(subgraphNode.id).not.toBe(-1)
+    expect(
+      store.getPromotions(subgraphNode.rootGraph.id, subgraphNode.id)
+    ).toStrictEqual([
+      {
+        interiorNodeId: String(innerNode.id),
+        widgetName: 'picker'
+      }
+    ])
+  })
+
+  test('rebinds one input to latest source without stale disconnected views', () => {
+    const subgraph = createTestSubgraph({
+      inputs: [{ name: 'picker_input', type: '*' }]
+    })
+    const subgraphNode = createTestSubgraphNode(subgraph, { id: 41 })
+    subgraphNode.graph?.add(subgraphNode)
+
+    const firstNode = new LGraphNode('FirstNode')
+    const firstInput = firstNode.addInput('picker_input', '*')
+    firstNode.addWidget('combo', 'picker', 'a', () => {}, {
+      values: ['a', 'b']
+    })
+    firstInput.widget = { name: 'picker' }
+    subgraph.add(firstNode)
+    const subgraphInputSlot = subgraph.inputNode.slots[0]
+    subgraphInputSlot.connect(firstInput, firstNode)
+
+    // Mirror user-driven rebind behavior: move the slot connection from first
+    // source to second source, rather than keeping both links connected.
+    subgraphInputSlot.disconnect()
+
+    const secondNode = new LGraphNode('SecondNode')
+    const secondInput = secondNode.addInput('picker_input', '*')
+    secondNode.addWidget('combo', 'picker', 'b', () => {}, {
+      values: ['a', 'b']
+    })
+    secondInput.widget = { name: 'picker' }
+    subgraph.add(secondNode)
+    subgraphInputSlot.connect(secondInput, secondNode)
+
+    const promotions = usePromotionStore().getPromotions(
+      subgraphNode.rootGraph.id,
+      subgraphNode.id
+    )
+
+    expect(promotions).toHaveLength(1)
+    expect(promotions[0]).toStrictEqual({
+      interiorNodeId: String(secondNode.id),
+      widgetName: 'picker'
+    })
+    expect(subgraphNode.widgets).toHaveLength(1)
+    expect(subgraphNode.widgets[0].value).toBe('b')
+  })
+
+  test('preserves distinct promoted display names when two inputs share one concrete widget name', () => {
+    const subgraph = createTestSubgraph({
+      inputs: [
+        { name: 'strength_model', type: '*' },
+        { name: 'strength_model_1', type: '*' }
+      ]
+    })
+    const subgraphNode = createTestSubgraphNode(subgraph, { id: 90 })
+    subgraphNode.graph?.add(subgraphNode)
+
+    const innerNode = new LGraphNode('InnerNumberNode')
+    const firstInput = innerNode.addInput('strength_model', '*')
+    const secondInput = innerNode.addInput('strength_model_1', '*')
+    innerNode.addWidget('number', 'strength_model', 1, () => {})
+    firstInput.widget = { name: 'strength_model' }
+    secondInput.widget = { name: 'strength_model' }
+    subgraph.add(innerNode)
+
+    subgraph.inputNode.slots[0].connect(firstInput, innerNode)
+    subgraph.inputNode.slots[1].connect(secondInput, innerNode)
+
+    expect(subgraphNode.widgets).toHaveLength(2)
+    expect(subgraphNode.widgets.map((widget) => widget.name)).toStrictEqual([
+      'strength_model',
+      'strength_model_1'
+    ])
+  })
+
+  test('returns empty array when no proxyWidgets', () => {
+    const [subgraphNode] = setupSubgraph()
+    expect(subgraphNode.widgets).toEqual([])
+  })
+
+  test('widgets getter prefers live linked entries over stale store entries', () => {
+    const subgraph = createTestSubgraph({
+      inputs: [{ name: 'widgetA', type: '*' }]
+    })
+    const subgraphNode = createTestSubgraphNode(subgraph, { id: 91 })
+    subgraphNode.graph?.add(subgraphNode)
+
+    const liveNode = new LGraphNode('LiveNode')
+    const liveInput = liveNode.addInput('widgetA', '*')
+    liveNode.addWidget('text', 'widgetA', 'a', () => {})
+    liveInput.widget = { name: 'widgetA' }
+    subgraph.add(liveNode)
+    subgraph.inputNode.slots[0].connect(liveInput, liveNode)
+
+    setPromotions(subgraphNode, [
+      [String(liveNode.id), 'widgetA'],
+      ['9999', 'missingWidget']
+    ])
+
+    expect(subgraphNode.widgets).toHaveLength(1)
+    expect(subgraphNode.widgets[0].name).toBe('widgetA')
+  })
+
+  test('partial linked coverage does not destructively prune unresolved store promotions', () => {
+    const subgraph = createTestSubgraph({
+      inputs: [
+        { name: 'widgetA', type: '*' },
+        { name: 'widgetB', type: '*' }
+      ]
+    })
+    const subgraphNode = createTestSubgraphNode(subgraph, { id: 92 })
+    subgraphNode.graph?.add(subgraphNode)
+
+    const liveNode = new LGraphNode('LiveNode')
+    const liveInput = liveNode.addInput('widgetA', '*')
+    liveNode.addWidget('text', 'widgetA', 'a', () => {})
+    liveInput.widget = { name: 'widgetA' }
+    subgraph.add(liveNode)
+    subgraph.inputNode.slots[0].connect(liveInput, liveNode)
+
+    setPromotions(subgraphNode, [
+      [String(liveNode.id), 'widgetA'],
+      ['9999', 'widgetB']
+    ])
+
+    // Trigger widgets getter reconciliation in partial-linked state.
+    void subgraphNode.widgets
+
+    const promotions = usePromotionStore().getPromotions(
+      subgraphNode.rootGraph.id,
+      subgraphNode.id
+    )
+    expect(promotions).toStrictEqual([
+      { interiorNodeId: String(liveNode.id), widgetName: 'widgetA' },
+      { interiorNodeId: '9999', widgetName: 'widgetB' }
+    ])
+  })
+
+  test('caches view objects across getter calls (stable references)', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    innerNodes[0].addWidget('text', 'widgetA', 'a', () => {})
+    setPromotions(subgraphNode, [['1', 'widgetA']])
+
+    const first = subgraphNode.widgets[0]
+    const second = subgraphNode.widgets[0]
+    expect(first).toBe(second)
+  })
+
+  test('memoizes promotion list by reference', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    innerNodes[0].addWidget('text', 'widgetA', 'a', () => {})
+
+    setPromotions(subgraphNode, [['1', 'widgetA']])
+
+    const views1 = subgraphNode.widgets
+    expect(views1).toHaveLength(1)
+
+    // Same reference → same result (memoized)
+    const views2 = subgraphNode.widgets
+    expect(views2[0]).toBe(views1[0])
+
+    // New store value with same content → same cached view object
+    setPromotions(subgraphNode, [['1', 'widgetA']])
+    const views3 = subgraphNode.widgets
+    expect(views3[0]).toBe(views1[0])
+  })
+
+  test('cleans stale cache entries when promotions shrink', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    innerNodes[0].addWidget('text', 'widgetA', 'a', () => {})
+    innerNodes[0].addWidget('text', 'widgetB', 'b', () => {})
+
+    setPromotions(subgraphNode, [
+      ['1', 'widgetA'],
+      ['1', 'widgetB']
+    ])
+    expect(subgraphNode.widgets).toHaveLength(2)
+    const viewA = subgraphNode.widgets[0]
+
+    // Remove widgetA from promotion list
+    setPromotions(subgraphNode, [['1', 'widgetB']])
+    expect(subgraphNode.widgets).toHaveLength(1)
+    expect(subgraphNode.widgets[0].name).toBe('widgetB')
+
+    // Re-adding widgetA creates a new view (old one was cleaned)
+    setPromotions(subgraphNode, [
+      ['1', 'widgetB'],
+      ['1', 'widgetA']
+    ])
+    const newViewA = subgraphNode.widgets[1]
+    expect(newViewA).not.toBe(viewA)
+  })
+
+  test('deduplicates entries with same nodeId:widgetName', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    innerNodes[0].addWidget('text', 'widgetA', 'a', () => {})
+
+    setPromotions(subgraphNode, [
+      ['1', 'widgetA'],
+      ['1', 'widgetA']
+    ])
+    expect(subgraphNode.widgets).toHaveLength(1)
+  })
+
+  test('setter is a no-op', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    innerNodes[0].addWidget('text', 'widgetA', 'a', () => {})
+    setPromotions(subgraphNode, [['1', 'widgetA']])
+
+    // Assigning to widgets does nothing
+    subgraphNode.widgets = []
+    expect(subgraphNode.widgets).toHaveLength(1)
+  })
+
+  test('migrates legacy -1 entries via _resolveLegacyEntry', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    innerNodes[0].addWidget('text', 'stringWidget', 'value', () => {})
+
+    // Simulate a slot-connected widget so legacy resolution works
+    const subgraph = subgraphNode.subgraph
+    subgraph.addInput('stringWidget', '*')
+    subgraphNode._internalConfigureAfterSlots()
+
+    // The _internalConfigureAfterSlots would have set up the slot-connected
+    // widget via _setWidget if there's a link. For unit testing legacy
+    // migration, we need to set up the input._widget manually.
+    const input = subgraphNode.inputs.find((i) => i.name === 'stringWidget')
+    if (input) {
+      input._widget = createPromotedWidgetView(
+        subgraphNode,
+        String(innerNodes[0].id),
+        'stringWidget'
+      )
+    }
+
+    // Set legacy -1 format via properties and re-run hydration
+    subgraphNode.properties.proxyWidgets = [['-1', 'stringWidget']]
+    subgraphNode._internalConfigureAfterSlots()
+
+    // Migration should have rewritten the store with resolved IDs
+    const entries = usePromotionStore().getPromotions(
+      subgraphNode.rootGraph.id,
+      subgraphNode.id
+    )
+    expect(entries).toStrictEqual([
+      {
+        interiorNodeId: String(innerNodes[0].id),
+        widgetName: 'stringWidget'
+      }
+    ])
+  })
+
+  test('hydrate promotions from serialize/configure round-trip', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    const innerNode = firstInnerNode(innerNodes)
+    innerNode.addWidget('text', 'widgetA', 'a', () => {})
+
+    setPromotions(subgraphNode, [[String(innerNode.id), 'widgetA']])
+    const serialized = subgraphNode.serialize()
+
+    const restoredNode = createTestSubgraphNode(subgraphNode.subgraph, {
+      id: 99
+    })
+    restoredNode.configure({
+      ...serialized,
+      id: restoredNode.id,
+      type: subgraphNode.subgraph.id
+    })
+
+    const restoredEntries = usePromotionStore().getPromotions(
+      restoredNode.rootGraph.id,
+      restoredNode.id
+    )
+    expect(restoredEntries).toStrictEqual([
+      {
+        interiorNodeId: String(innerNode.id),
+        widgetName: 'widgetA'
+      }
+    ])
+  })
+
+  test('clone output preserves proxyWidgets for promotion hydration', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    const innerNode = firstInnerNode(innerNodes)
+    innerNode.addWidget('text', 'widgetA', 'a', () => {})
+
+    setPromotions(subgraphNode, [[String(innerNode.id), 'widgetA']])
+
+    const createNodeSpy = vi
+      .spyOn(LiteGraph, 'createNode')
+      .mockImplementation(() =>
+        createTestSubgraphNode(subgraphNode.subgraph, { id: 999 })
+      )
+
+    const clonedNode = subgraphNode.clone()
+    expect(clonedNode).toBeTruthy()
+    createNodeSpy.mockRestore()
+    if (!clonedNode) throw new Error('Expected clone to return a node')
+
+    const clonedSerialized = clonedNode.serialize()
+    expect(clonedSerialized.properties?.proxyWidgets).toStrictEqual([
+      [String(innerNode.id), 'widgetA']
+    ])
+
+    const hydratedClone = createTestSubgraphNode(subgraphNode.subgraph, {
+      id: 100
+    })
+    hydratedClone.configure({
+      ...clonedSerialized,
+      id: hydratedClone.id,
+      type: subgraphNode.subgraph.id
+    })
+
+    const hydratedEntries = usePromotionStore().getPromotions(
+      hydratedClone.rootGraph.id,
+      hydratedClone.id
+    )
+    expect(hydratedEntries).toStrictEqual([
+      {
+        interiorNodeId: String(innerNode.id),
+        widgetName: 'widgetA'
+      }
+    ])
+  })
+})
+
+describe('widgets getter caching', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+  })
+
+  test('preserves view identities when promotion order changes', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    innerNodes[0].addWidget('text', 'widgetA', 'a', () => {})
+    innerNodes[0].addWidget('text', 'widgetB', 'b', () => {})
+    setPromotions(subgraphNode, [
+      ['1', 'widgetA'],
+      ['1', 'widgetB']
+    ])
+
+    const [viewA, viewB] = subgraphNode.widgets
+
+    setPromotions(subgraphNode, [
+      ['1', 'widgetB'],
+      ['1', 'widgetA']
+    ])
+
+    expect(subgraphNode.widgets[0]).toBe(viewB)
+    expect(subgraphNode.widgets[1]).toBe(viewA)
+  })
+
+  test('deduplicates by key while preserving first-occurrence order', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    innerNodes[0].addWidget('text', 'widgetA', 'a', () => {})
+    innerNodes[0].addWidget('text', 'widgetB', 'b', () => {})
+
+    setPromotions(subgraphNode, [
+      ['1', 'widgetB'],
+      ['1', 'widgetA'],
+      ['1', 'widgetB'],
+      ['1', 'widgetA']
+    ])
+
+    expect(subgraphNode.widgets).toHaveLength(2)
+    expect(subgraphNode.widgets[0].name).toBe('widgetB')
+    expect(subgraphNode.widgets[1].name).toBe('widgetA')
+  })
+
+  test('returns same array reference when promotions unchanged', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    innerNodes[0].addWidget('text', 'widgetA', 'a', () => {})
+    setPromotions(subgraphNode, [['1', 'widgetA']])
+
+    const result1 = subgraphNode.widgets
+    const result2 = subgraphNode.widgets
+    expect(result1).toBe(result2)
+  })
+
+  test('returns new array after promotion change', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    innerNodes[0].addWidget('text', 'widgetA', 'a', () => {})
+    innerNodes[0].addWidget('text', 'widgetB', 'b', () => {})
+    setPromotions(subgraphNode, [['1', 'widgetA']])
+
+    const result1 = subgraphNode.widgets
+
+    setPromotions(subgraphNode, [
+      ['1', 'widgetA'],
+      ['1', 'widgetB']
+    ])
+    const result2 = subgraphNode.widgets
+
+    expect(result1).not.toBe(result2)
+    expect(result2).toHaveLength(2)
+  })
+
+  test('invalidates cache on removeWidget', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    innerNodes[0].addWidget('text', 'widgetA', 'a', () => {})
+    innerNodes[0].addWidget('text', 'widgetB', 'b', () => {})
+    setPromotions(subgraphNode, [
+      ['1', 'widgetA'],
+      ['1', 'widgetB']
+    ])
+
+    const result1 = subgraphNode.widgets
+    expect(result1).toHaveLength(2)
+
+    subgraphNode.removeWidget(result1[0])
+    const result2 = subgraphNode.widgets
+    expect(result2).toHaveLength(1)
+    expect(result1).not.toBe(result2)
+  })
+})
+
+describe('promote/demote cycle', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+  })
+
+  test('promoting adds to store and widgets reflects it', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    innerNodes[0].addWidget('text', 'widgetA', 'a', () => {})
+
+    expect(subgraphNode.widgets).toHaveLength(0)
+
+    setPromotions(subgraphNode, [['1', 'widgetA']])
+    expect(subgraphNode.widgets).toHaveLength(1)
+    const view = subgraphNode.widgets[0] as PromotedWidgetView
+    expect(view.sourceNodeId).toBe('1')
+    expect(view.sourceWidgetName).toBe('widgetA')
+  })
+
+  test('demoting via removeWidget removes from store', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    innerNodes[0].addWidget('text', 'widgetA', 'a', () => {})
+    innerNodes[0].addWidget('text', 'widgetB', 'b', () => {})
+    setPromotions(subgraphNode, [
+      ['1', 'widgetA'],
+      ['1', 'widgetB']
+    ])
+
+    const viewA = subgraphNode.widgets[0]
+    subgraphNode.removeWidget(viewA)
+
+    expect(subgraphNode.widgets).toHaveLength(1)
+    expect(subgraphNode.widgets[0].name).toBe('widgetB')
+    const entries = usePromotionStore().getPromotions(
+      subgraphNode.rootGraph.id,
+      subgraphNode.id
+    )
+    expect(entries).toStrictEqual([
+      { interiorNodeId: '1', widgetName: 'widgetB' }
+    ])
+  })
+
+  test('full promote → demote → re-promote cycle', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    innerNodes[0].addWidget('text', 'widgetA', 'a', () => {})
+
+    // Promote
+    setPromotions(subgraphNode, [['1', 'widgetA']])
+    expect(subgraphNode.widgets).toHaveLength(1)
+    const view1 = subgraphNode.widgets[0]
+
+    // Demote
+    subgraphNode.removeWidget(view1)
+    expect(subgraphNode.widgets).toHaveLength(0)
+
+    // Re-promote — creates a new view since the cache was cleared
+    setPromotions(subgraphNode, [['1', 'widgetA']])
+    expect(subgraphNode.widgets).toHaveLength(1)
+    expect(subgraphNode.widgets[0]).not.toBe(view1)
+    expect(
+      (subgraphNode.widgets[0] as PromotedWidgetView).sourceWidgetName
+    ).toBe('widgetA')
+  })
+})
+
+describe('disconnected state', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+  })
+
+  test('view resolves type when interior widget exists', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    innerNodes[0].addWidget('number', 'numWidget', 42, () => {})
+    setPromotions(subgraphNode, [['1', 'numWidget']])
+
+    expect(subgraphNode.widgets[0].type).toBe('number')
+  })
+
+  test('keeps promoted entry as disconnected when interior node is removed', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    innerNodes[0].addWidget('text', 'myWidget', 'val', () => {})
+    setPromotions(subgraphNode, [['1', 'myWidget']])
+
+    expect(subgraphNode.widgets[0].type).toBe('text')
+
+    // Remove the interior node from the subgraph
+    subgraphNode.subgraph.remove(innerNodes[0])
+    expect(subgraphNode.widgets).toHaveLength(1)
+    expect(subgraphNode.widgets[0].type).toBe('button')
+  })
+
+  test('view recovers when interior widget is re-added', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    innerNodes[0].addWidget('text', 'myWidget', 'val', () => {})
+    setPromotions(subgraphNode, [['1', 'myWidget']])
+
+    // Remove widget
+    innerNodes[0].widgets!.pop()
+    expect(subgraphNode.widgets[0].type).toBe('button')
+
+    // Re-add widget
+    innerNodes[0].addWidget('text', 'myWidget', 'val', () => {})
+    expect(subgraphNode.widgets[0].type).toBe('text')
+  })
+
+  test('keeps missing source-node promotions as disconnected views', () => {
+    const [subgraphNode] = setupSubgraph()
+    setPromotions(subgraphNode, [['999', 'ghost']])
+    expect(subgraphNode.widgets).toHaveLength(1)
+    expect(subgraphNode.widgets[0].type).toBe('button')
+  })
+})
+
+function createFakeCanvasContext() {
+  return new Proxy({} as CanvasRenderingContext2D, {
+    get: () => vi.fn(() => ({ width: 10 }))
+  })
+}
+
+function createInspectableCanvasContext(fillText = vi.fn()) {
+  const fallback = vi.fn()
+  return new Proxy(
+    {
+      fillText,
+      beginPath: vi.fn(),
+      roundRect: vi.fn(),
+      rect: vi.fn(),
+      fill: vi.fn(),
+      stroke: vi.fn(),
+      moveTo: vi.fn(),
+      lineTo: vi.fn(),
+      arc: vi.fn(),
+      measureText: (text: string) => ({ width: text.length * 8 }),
+      fillStyle: '#fff',
+      strokeStyle: '#fff',
+      textAlign: 'left',
+      globalAlpha: 1,
+      lineWidth: 1
+    } as Record<string, unknown>,
+    {
+      get(target, key) {
+        if (typeof key === 'string' && key in target)
+          return target[key as keyof typeof target]
+        return fallback
+      }
+    }
+  ) as unknown as CanvasRenderingContext2D
+}
+
+function createTwoLevelNestedSubgraph() {
+  const subgraphA = createTestSubgraph({
+    inputs: [{ name: 'a_input', type: '*' }]
+  })
+  const innerNode = new LGraphNode('InnerComboNode')
+  const innerInput = innerNode.addInput('picker_input', '*')
+  const comboWidget = innerNode.addWidget('combo', 'picker', 'a', () => {}, {
+    values: ['a', 'b']
+  })
+  innerInput.widget = { name: 'picker' }
+  subgraphA.add(innerNode)
+  subgraphA.inputNode.slots[0].connect(innerInput, innerNode)
+
+  const subgraphNodeA = createTestSubgraphNode(subgraphA, { id: 11 })
+
+  const subgraphB = createTestSubgraph({
+    inputs: [{ name: 'b_input', type: '*' }]
+  })
+  subgraphB.add(subgraphNodeA)
+  subgraphNodeA._internalConfigureAfterSlots()
+  subgraphB.inputNode.slots[0].connect(subgraphNodeA.inputs[0], subgraphNodeA)
+
+  const subgraphNodeB = createTestSubgraphNode(subgraphB, { id: 22 })
+  return { innerNode, comboWidget, subgraphNodeB }
+}
+
+describe('promoted combo rendering', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+  })
+
+  test('draw shows value even when interior combo is computedDisabled', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    const innerNode = firstInnerNode(innerNodes)
+    const comboWidget = innerNode.addWidget('combo', 'picker', 'a', () => {}, {
+      values: ['a', 'b']
+    })
+
+    // Simulates source widgets connected to subgraph inputs.
+    comboWidget.computedDisabled = true
+    setPromotions(subgraphNode, [[String(innerNode.id), 'picker']])
+
+    const fillText = vi.fn()
+    const ctx = createInspectableCanvasContext(fillText)
+    subgraphNode.widgets[0].draw?.(
+      ctx,
+      subgraphNode,
+      260,
+      0,
+      LiteGraph.NODE_WIDGET_HEIGHT,
+      false
+    )
+
+    const renderedText = fillText.mock.calls.map((call) => call[0])
+    expect(renderedText).toContain('a')
+  })
+
+  test('draw shows value through two input-based promotion layers', () => {
+    const { comboWidget, subgraphNodeB } = createTwoLevelNestedSubgraph()
+    comboWidget.computedDisabled = true
+    const fillText = vi.fn()
+    const ctx = createInspectableCanvasContext(fillText)
+
+    subgraphNodeB.widgets[0].draw?.(
+      ctx,
+      subgraphNodeB,
+      260,
+      0,
+      LiteGraph.NODE_WIDGET_HEIGHT,
+      false
+    )
+
+    const renderedText = fillText.mock.calls.map((call) => call[0])
+    expect(renderedText).toContain('a')
+  })
+
+  test('value updates propagate through two promoted input layers', () => {
+    const { comboWidget, subgraphNodeB } = createTwoLevelNestedSubgraph()
+    comboWidget.computedDisabled = true
+    const promotedWidget = subgraphNodeB.widgets[0]
+
+    expect(promotedWidget.value).toBe('a')
+    promotedWidget.value = 'b'
+    expect(comboWidget.value).toBe('b')
+
+    const fillText = vi.fn()
+    const ctx = createInspectableCanvasContext(fillText)
+    promotedWidget.draw?.(
+      ctx,
+      subgraphNodeB,
+      260,
+      0,
+      LiteGraph.NODE_WIDGET_HEIGHT,
+      false
+    )
+
+    const renderedText = fillText.mock.calls.map((call) => call[0])
+    expect(renderedText).toContain('b')
+  })
+
+  test('draw projection recovers after transient button fallback in nested promotion', () => {
+    const { innerNode, subgraphNodeB } = createTwoLevelNestedSubgraph()
+    const promotedWidget = subgraphNodeB.widgets[0]
+
+    // Force a transient disconnect to project a fallback widget once.
+    innerNode.widgets = []
+    promotedWidget.draw?.(
+      createInspectableCanvasContext(),
+      subgraphNodeB,
+      260,
+      0,
+      LiteGraph.NODE_WIDGET_HEIGHT,
+      false
+    )
+
+    // Restore the concrete widget and verify draw reflects recovery.
+    innerNode.addWidget('combo', 'picker', 'a', () => {}, {
+      values: ['a', 'b']
+    })
+    const fillText = vi.fn()
+    promotedWidget.draw?.(
+      createInspectableCanvasContext(fillText),
+      subgraphNodeB,
+      260,
+      0,
+      LiteGraph.NODE_WIDGET_HEIGHT,
+      false
+    )
+
+    const renderedText = fillText.mock.calls.map((call) => call[0])
+    expect(renderedText).toContain('a')
+  })
+
+  test('state lookup behavior resolves to deepest promoted widget source', () => {
+    const { comboWidget, subgraphNodeB } = createTwoLevelNestedSubgraph()
+
+    const promotedWidget = subgraphNodeB.widgets[0]
+    expect(promotedWidget.value).toBe('a')
+
+    comboWidget.value = 'b'
+    expect(promotedWidget.value).toBe('b')
+  })
+
+  test('state lookup does not use promotion store fallback when intermediate view is unavailable', () => {
+    const subgraphA = createTestSubgraph({
+      inputs: [{ name: 'strength_model', type: '*' }]
+    })
+    const innerNode = new LGraphNode('InnerNumberNode')
+    const innerInput = innerNode.addInput('strength_model', '*')
+    innerNode.addWidget('number', 'strength_model', 1, () => {})
+    innerInput.widget = { name: 'strength_model' }
+    subgraphA.add(innerNode)
+    subgraphA.inputNode.slots[0].connect(innerInput, innerNode)
+
+    const subgraphNodeA = createTestSubgraphNode(subgraphA, { id: 47 })
+
+    const subgraphB = createTestSubgraph({
+      inputs: [{ name: 'strength_model', type: '*' }]
+    })
+    subgraphB.add(subgraphNodeA)
+    subgraphNodeA._internalConfigureAfterSlots()
+    subgraphB.inputNode.slots[0].connect(subgraphNodeA.inputs[0], subgraphNodeA)
+
+    const subgraphNodeB = createTestSubgraphNode(subgraphB, { id: 46 })
+
+    // Simulate transient stale intermediate view state by forcing host 47
+    // to report no promoted widgets while promotionStore still has entries.
+    Object.defineProperty(subgraphNodeA, 'widgets', {
+      get: () => [],
+      configurable: true
+    })
+
+    expect(subgraphNodeB.widgets[0].type).toBe('button')
+  })
+
+  test('state lookup does not use input-widget fallback when intermediate promotions are absent', () => {
+    const subgraphA = createTestSubgraph({
+      inputs: [{ name: 'strength_model', type: '*' }]
+    })
+    const innerNode = new LGraphNode('InnerNumberNode')
+    const innerInput = innerNode.addInput('strength_model', '*')
+    innerNode.addWidget('number', 'strength_model', 1, () => {})
+    innerInput.widget = { name: 'strength_model' }
+    subgraphA.add(innerNode)
+    subgraphA.inputNode.slots[0].connect(innerInput, innerNode)
+
+    const subgraphNodeA = createTestSubgraphNode(subgraphA, { id: 47 })
+
+    const subgraphB = createTestSubgraph({
+      inputs: [{ name: 'strength_model', type: '*' }]
+    })
+    subgraphB.add(subgraphNodeA)
+    subgraphNodeA._internalConfigureAfterSlots()
+    subgraphB.inputNode.slots[0].connect(subgraphNodeA.inputs[0], subgraphNodeA)
+
+    const subgraphNodeB = createTestSubgraphNode(subgraphB, { id: 46 })
+
+    // Simulate a transient where intermediate promotions are unavailable but
+    // input _widget binding is already updated.
+    usePromotionStore().setPromotions(
+      subgraphNodeA.rootGraph.id,
+      subgraphNodeA.id,
+      []
+    )
+    Object.defineProperty(subgraphNodeA, 'widgets', {
+      get: () => [],
+      configurable: true
+    })
+
+    expect(subgraphNodeB.widgets[0].type).toBe('button')
+  })
+
+  test('state lookup does not use subgraph-link fallback when intermediate bindings are unavailable', () => {
+    const subgraphA = createTestSubgraph({
+      inputs: [{ name: 'strength_model', type: '*' }]
+    })
+    const innerNode = new LGraphNode('InnerNumberNode')
+    const innerInput = innerNode.addInput('strength_model', '*')
+    innerNode.addWidget('number', 'strength_model', 1, () => {})
+    innerInput.widget = { name: 'strength_model' }
+    subgraphA.add(innerNode)
+    subgraphA.inputNode.slots[0].connect(innerInput, innerNode)
+
+    const subgraphNodeA = createTestSubgraphNode(subgraphA, { id: 47 })
+
+    const subgraphB = createTestSubgraph({
+      inputs: [{ name: 'strength_model', type: '*' }]
+    })
+    subgraphB.add(subgraphNodeA)
+    subgraphNodeA._internalConfigureAfterSlots()
+    subgraphB.inputNode.slots[0].connect(subgraphNodeA.inputs[0], subgraphNodeA)
+
+    const subgraphNodeB = createTestSubgraphNode(subgraphB, { id: 46 })
+
+    usePromotionStore().setPromotions(
+      subgraphNodeA.rootGraph.id,
+      subgraphNodeA.id,
+      []
+    )
+    Object.defineProperty(subgraphNodeA, 'widgets', {
+      get: () => [],
+      configurable: true
+    })
+    subgraphNodeA.inputs[0]._widget = undefined
+
+    expect(subgraphNodeB.widgets[0].type).toBe('button')
+  })
+
+  test('nested promotion keeps concrete widget types at top level', () => {
+    const subgraphA = createTestSubgraph({
+      inputs: [
+        { name: 'lora_name', type: '*' },
+        { name: 'strength_model', type: '*' }
+      ]
+    })
+    const innerNode = new LGraphNode('InnerLoraNode')
+    const comboInput = innerNode.addInput('lora_name', '*')
+    const numberInput = innerNode.addInput('strength_model', '*')
+    innerNode.addWidget('combo', 'lora_name', 'a', () => {}, {
+      values: ['a', 'b']
+    })
+    innerNode.addWidget('number', 'strength_model', 1, () => {})
+    comboInput.widget = { name: 'lora_name' }
+    numberInput.widget = { name: 'strength_model' }
+    subgraphA.add(innerNode)
+    subgraphA.inputNode.slots[0].connect(comboInput, innerNode)
+    subgraphA.inputNode.slots[1].connect(numberInput, innerNode)
+
+    const subgraphNodeA = createTestSubgraphNode(subgraphA, { id: 60 })
+
+    const subgraphB = createTestSubgraph({
+      inputs: [
+        { name: 'lora_name', type: '*' },
+        { name: 'strength_model', type: '*' }
+      ]
+    })
+    subgraphB.add(subgraphNodeA)
+    subgraphNodeA._internalConfigureAfterSlots()
+    subgraphB.inputNode.slots[0].connect(subgraphNodeA.inputs[0], subgraphNodeA)
+    subgraphB.inputNode.slots[1].connect(subgraphNodeA.inputs[1], subgraphNodeA)
+
+    const subgraphNodeB = createTestSubgraphNode(subgraphB, { id: 61 })
+
+    expect(subgraphNodeB.widgets[0].type).toBe('combo')
+    expect(subgraphNodeB.widgets[1].type).toBe('number')
+  })
+
+  test('input promotion from promoted view stores immediate source node id', () => {
+    const subgraphA = createTestSubgraph({
+      inputs: [{ name: 'lora_name', type: '*' }]
+    })
+    const innerNode = new LGraphNode('InnerNode')
+    const innerInput = innerNode.addInput('lora_name', '*')
+    innerNode.addWidget('combo', 'lora_name', 'a', () => {}, {
+      values: ['a', 'b']
+    })
+    innerInput.widget = { name: 'lora_name' }
+    subgraphA.add(innerNode)
+    subgraphA.inputNode.slots[0].connect(innerInput, innerNode)
+
+    const subgraphNodeA = createTestSubgraphNode(subgraphA, { id: 70 })
+
+    const subgraphB = createTestSubgraph({
+      inputs: [{ name: 'lora_name', type: '*' }]
+    })
+    subgraphB.add(subgraphNodeA)
+    subgraphNodeA._internalConfigureAfterSlots()
+    subgraphB.inputNode.slots[0].connect(subgraphNodeA.inputs[0], subgraphNodeA)
+
+    const subgraphNodeB = createTestSubgraphNode(subgraphB, { id: 71 })
+    const promotions = usePromotionStore().getPromotions(
+      subgraphNodeB.rootGraph.id,
+      subgraphNodeB.id
+    )
+
+    expect(promotions).toContainEqual({
+      interiorNodeId: String(subgraphNodeA.id),
+      widgetName: 'lora_name'
+    })
+    expect(promotions).not.toContainEqual({
+      interiorNodeId: String(innerNode.id),
+      widgetName: 'lora_name'
+    })
+  })
+
+  test('resolvePromotedWidgetSource is safe for detached subgraph hosts', () => {
+    const subgraph = createTestSubgraph()
+    const subgraphNode = createTestSubgraphNode(subgraph, { id: 101 })
+    const promotedView = createPromotedWidgetView(
+      subgraphNode,
+      '999',
+      'missingWidget'
+    )
+
+    subgraphNode.graph = null
+
+    expect(() =>
+      resolvePromotedWidgetSource(subgraphNode, promotedView)
+    ).not.toThrow()
+    expect(
+      resolvePromotedWidgetSource(subgraphNode, promotedView)
+    ).toBeUndefined()
+  })
+})
+
+describe('DOM widget promotion', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    vi.clearAllMocks()
+  })
+
+  function createMockDOMWidget(node: LGraphNode, name: string) {
+    const widget = node.addWidget('text', name, 'val', () => {})
+    // Add 'element' and 'id' to make it a BaseDOMWidget
+    Object.defineProperties(widget, {
+      element: { value: document.createElement('div'), enumerable: true },
+      id: { value: `dom-widget-${name}`, enumerable: true }
+    })
+    return widget
+  }
+
+  function createMockComponentWidget(node: LGraphNode, name: string) {
+    const widget = node.addWidget('custom', name, 'val', () => {})
+    Object.defineProperties(widget, {
+      component: { value: {}, enumerable: true },
+      id: { value: `comp-widget-${name}`, enumerable: true }
+    })
+    return widget
+  }
+
+  test('draw registers position override for DOM widgets', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    createMockDOMWidget(innerNodes[0], 'textarea')
+    setPromotions(subgraphNode, [['1', 'textarea']])
+
+    const view = subgraphNode.widgets[0]
+    view.draw!(createFakeCanvasContext(), subgraphNode, 200, 0, 30)
+
+    expect(mockDomWidgetStore.setPositionOverride).toHaveBeenCalledWith(
+      'dom-widget-textarea',
+      { node: subgraphNode, widget: view }
+    )
+  })
+
+  test('draw registers position override for component widgets', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    createMockComponentWidget(innerNodes[0], 'compWidget')
+    setPromotions(subgraphNode, [['1', 'compWidget']])
+
+    const view = subgraphNode.widgets[0]
+    view.draw!(createFakeCanvasContext(), subgraphNode, 200, 0, 30)
+
+    expect(mockDomWidgetStore.setPositionOverride).toHaveBeenCalledWith(
+      'comp-widget-compWidget',
+      { node: subgraphNode, widget: view }
+    )
+  })
+
+  test('draw does not register override for non-DOM widgets', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    innerNodes[0].addWidget('text', 'textWidget', 'val', () => {})
+    setPromotions(subgraphNode, [['1', 'textWidget']])
+
+    const view = subgraphNode.widgets[0]
+    view.draw!(createFakeCanvasContext(), subgraphNode, 200, 0, 30, true)
+
+    expect(mockDomWidgetStore.setPositionOverride).not.toHaveBeenCalled()
+  })
+
+  test('draw does not mutate interior node pos or size for non-DOM widgets', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    const interiorNode = firstInnerNode(innerNodes)
+    interiorNode.pos = [10, 20]
+    interiorNode.size = [300, 120]
+    interiorNode.addWidget('text', 'textWidget', 'val', () => {})
+    setPromotions(subgraphNode, [[String(interiorNode.id), 'textWidget']])
+
+    const originalPos = [...interiorNode.pos]
+    const originalSize = [...interiorNode.size]
+    const view = subgraphNode.widgets[0]
+
+    view.draw!(createFakeCanvasContext(), subgraphNode, 200, 0, 30)
+
+    expect(Array.from(interiorNode.pos)).toEqual(originalPos)
+    expect(Array.from(interiorNode.size)).toEqual(originalSize)
+  })
+
+  test('computeLayoutSize delegates to interior DOM widget', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    const domWidget = createMockDOMWidget(innerNodes[0], 'textarea')
+    domWidget.computeLayoutSize = vi.fn(() => ({
+      minHeight: 100,
+      maxHeight: 300,
+      minWidth: 0
+    }))
+    setPromotions(subgraphNode, [['1', 'textarea']])
+
+    const view = subgraphNode.widgets[0]
+    const result = view.computeLayoutSize!(subgraphNode)
+
+    expect(result).toEqual({ minHeight: 100, maxHeight: 300, minWidth: 0 })
+  })
+
+  test('demoting clears position override for DOM widget', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    createMockDOMWidget(innerNodes[0], 'textarea')
+    setPromotions(subgraphNode, [['1', 'textarea']])
+
+    const view = subgraphNode.widgets[0]
+    subgraphNode.removeWidget(view)
+
+    expect(mockDomWidgetStore.clearPositionOverride).toHaveBeenCalledWith(
+      'dom-widget-textarea'
+    )
+  })
+
+  test('onRemoved clears position overrides for all promoted DOM widgets', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    createMockDOMWidget(innerNodes[0], 'widgetA')
+    createMockDOMWidget(innerNodes[0], 'widgetB')
+    setPromotions(subgraphNode, [
+      ['1', 'widgetA'],
+      ['1', 'widgetB']
+    ])
+
+    // Access widgets to populate cache
+    expect(subgraphNode.widgets).toHaveLength(2)
+
+    subgraphNode.onRemoved()
+
+    expect(mockDomWidgetStore.clearPositionOverride).toHaveBeenCalledWith(
+      'dom-widget-widgetA'
+    )
+    expect(mockDomWidgetStore.clearPositionOverride).toHaveBeenCalledWith(
+      'dom-widget-widgetB'
+    )
+  })
+})
diff --git a/src/core/graph/subgraph/promotedWidgetView.ts b/src/core/graph/subgraph/promotedWidgetView.ts
new file mode 100644
index 0000000000..4a404d55ba
--- /dev/null
+++ b/src/core/graph/subgraph/promotedWidgetView.ts
@@ -0,0 +1,425 @@
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
+import type { LGraphCanvas } from '@/lib/litegraph/src/LGraphCanvas'
+import type { CanvasPointer } from '@/lib/litegraph/src/CanvasPointer'
+import type { Point } from '@/lib/litegraph/src/interfaces'
+import type { CanvasPointerEvent } from '@/lib/litegraph/src/types/events'
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+import type { SubgraphNode } from '@/lib/litegraph/src/subgraph/SubgraphNode'
+import type { BaseWidget } from '@/lib/litegraph/src/widgets/BaseWidget'
+import { toConcreteWidget } from '@/lib/litegraph/src/widgets/widgetMap'
+import { t } from '@/i18n'
+import { useDomWidgetStore } from '@/stores/domWidgetStore'
+import {
+  stripGraphPrefix,
+  useWidgetValueStore
+} from '@/stores/widgetValueStore'
+import {
+  resolveConcretePromotedWidget,
+  resolvePromotedWidgetAtHost
+} from '@/core/graph/subgraph/resolveConcretePromotedWidget'
+
+import type { PromotedWidgetView as IPromotedWidgetView } from './promotedWidgetTypes'
+
+export type { PromotedWidgetView } from './promotedWidgetTypes'
+export { isPromotedWidgetView } from './promotedWidgetTypes'
+
+function isWidgetValue(value: unknown): value is IBaseWidget['value'] {
+  if (value === undefined) return true
+  if (typeof value === 'string') return true
+  if (typeof value === 'number') return true
+  if (typeof value === 'boolean') return true
+  return value !== null && typeof value === 'object'
+}
+
+type LegacyMouseWidget = IBaseWidget & {
+  mouse: (e: CanvasPointerEvent, pos: Point, node: LGraphNode) => unknown
+}
+
+function hasLegacyMouse(widget: IBaseWidget): widget is LegacyMouseWidget {
+  return 'mouse' in widget && typeof widget.mouse === 'function'
+}
+
+const designTokenCache = new Map<string, string>()
+
+export function createPromotedWidgetView(
+  subgraphNode: SubgraphNode,
+  nodeId: string,
+  widgetName: string,
+  displayName?: string
+): IPromotedWidgetView {
+  return new PromotedWidgetView(subgraphNode, nodeId, widgetName, displayName)
+}
+
+class PromotedWidgetView implements IPromotedWidgetView {
+  [symbol: symbol]: boolean
+
+  readonly sourceNodeId: string
+  readonly sourceWidgetName: string
+
+  readonly serialize = false
+
+  last_y?: number
+  computedHeight?: number
+
+  private readonly graphId: string
+  private yValue = 0
+  private _computedDisabled = false
+
+  private projectedSourceNode?: LGraphNode
+  private projectedSourceWidget?: IBaseWidget
+  private projectedSourceWidgetType?: IBaseWidget['type']
+  private projectedWidget?: BaseWidget
+  private cachedDeepestByFrame?: { node: LGraphNode; widget: IBaseWidget }
+  private cachedDeepestFrame = -1
+
+  constructor(
+    private readonly subgraphNode: SubgraphNode,
+    nodeId: string,
+    widgetName: string,
+    private readonly displayName?: string
+  ) {
+    this.sourceNodeId = nodeId
+    this.sourceWidgetName = widgetName
+    this.graphId = subgraphNode.rootGraph.id
+  }
+
+  get node(): SubgraphNode {
+    return this.subgraphNode
+  }
+
+  get name(): string {
+    return this.displayName ?? this.sourceWidgetName
+  }
+
+  get y(): number {
+    return this.yValue
+  }
+
+  set y(value: number) {
+    this.yValue = value
+    this.syncDomOverride()
+  }
+
+  get computedDisabled(): boolean {
+    return this._computedDisabled
+  }
+
+  set computedDisabled(value: boolean | undefined) {
+    this._computedDisabled = value ?? false
+  }
+
+  get type(): IBaseWidget['type'] {
+    return this.resolveDeepest()?.widget.type ?? 'button'
+  }
+
+  get options(): IBaseWidget['options'] {
+    return this.resolveDeepest()?.widget.options ?? {}
+  }
+
+  get tooltip(): string | undefined {
+    return this.resolveDeepest()?.widget.tooltip
+  }
+
+  get linkedWidgets(): IBaseWidget[] | undefined {
+    return this.resolveDeepest()?.widget.linkedWidgets
+  }
+
+  get value(): IBaseWidget['value'] {
+    const state = this.getWidgetState()
+    if (state && isWidgetValue(state.value)) return state.value
+    return this.resolveAtHost()?.widget.value
+  }
+
+  set value(value: IBaseWidget['value']) {
+    const state = this.getWidgetState()
+    if (state) {
+      state.value = value
+      return
+    }
+
+    const resolved = this.resolveAtHost()
+    if (resolved && isWidgetValue(value)) {
+      resolved.widget.value = value
+    }
+  }
+
+  get label(): string | undefined {
+    const state = this.getWidgetState()
+    return state?.label ?? this.displayName ?? this.sourceWidgetName
+  }
+
+  set label(value: string | undefined) {
+    const state = this.getWidgetState()
+    if (state) state.label = value
+  }
+
+  get hidden(): boolean {
+    return this.resolveDeepest()?.widget.hidden ?? false
+  }
+
+  get computeLayoutSize(): IBaseWidget['computeLayoutSize'] {
+    const resolved = this.resolveDeepest()
+    const computeLayoutSize = resolved?.widget.computeLayoutSize
+    if (!computeLayoutSize) return undefined
+    return (node: LGraphNode) => computeLayoutSize.call(resolved.widget, node)
+  }
+
+  get computeSize(): IBaseWidget['computeSize'] {
+    const resolved = this.resolveDeepest()
+    const computeSize = resolved?.widget.computeSize
+    if (!computeSize) return undefined
+    return (width?: number) => computeSize.call(resolved.widget, width)
+  }
+
+  draw(
+    ctx: CanvasRenderingContext2D,
+    _node: LGraphNode,
+    widgetWidth: number,
+    y: number,
+    H: number,
+    lowQuality?: boolean
+  ): void {
+    const resolved = this.resolveDeepest()
+    if (!resolved) {
+      drawDisconnectedPlaceholder(ctx, widgetWidth, y, H)
+      return
+    }
+
+    if (isBaseDOMWidget(resolved.widget)) return this.syncDomOverride(resolved)
+
+    const projected = this.getProjectedWidget(resolved)
+    if (!projected || typeof projected.drawWidget !== 'function') return
+
+    const originalY = projected.y
+    const originalComputedHeight = projected.computedHeight
+    const originalComputedDisabled = projected.computedDisabled
+
+    projected.y = this.y
+    projected.computedHeight = this.computedHeight
+    projected.computedDisabled = this.computedDisabled
+    projected.value = this.value
+
+    projected.drawWidget(ctx, {
+      width: widgetWidth,
+      showText: !lowQuality,
+      suppressPromotedOutline: true,
+      previewImages: resolved.node.imgs
+    })
+
+    projected.y = originalY
+    projected.computedHeight = originalComputedHeight
+    projected.computedDisabled = originalComputedDisabled
+  }
+
+  onPointerDown(
+    pointer: CanvasPointer,
+    _node: LGraphNode,
+    canvas: LGraphCanvas
+  ): boolean {
+    const resolved = this.resolveAtHost()
+    if (!resolved) return false
+
+    const interior = resolved.widget
+    if (typeof interior.onPointerDown === 'function') {
+      const handled = interior.onPointerDown(pointer, this.subgraphNode, canvas)
+      if (handled) return true
+    }
+
+    const concrete = toConcreteWidget(interior, this.subgraphNode, false)
+    if (concrete)
+      return this.bindConcretePointerHandlers(pointer, canvas, concrete)
+
+    if (hasLegacyMouse(interior))
+      return this.handleLegacyMouse(pointer, interior)
+
+    return false
+  }
+
+  callback(
+    value: unknown,
+    canvas?: LGraphCanvas,
+    node?: LGraphNode,
+    pos?: Point,
+    e?: CanvasPointerEvent
+  ) {
+    this.resolveAtHost()?.widget.callback?.(value, canvas, node, pos, e)
+  }
+
+  private resolveAtHost():
+    | { node: LGraphNode; widget: IBaseWidget }
+    | undefined {
+    return resolvePromotedWidgetAtHost(
+      this.subgraphNode,
+      this.sourceNodeId,
+      this.sourceWidgetName
+    )
+  }
+
+  private resolveDeepest():
+    | { node: LGraphNode; widget: IBaseWidget }
+    | undefined {
+    const frame = this.subgraphNode.rootGraph.primaryCanvas?.frame
+    if (frame !== undefined && this.cachedDeepestFrame === frame)
+      return this.cachedDeepestByFrame
+
+    const result = resolveConcretePromotedWidget(
+      this.subgraphNode,
+      this.sourceNodeId,
+      this.sourceWidgetName
+    )
+    const resolved = result.status === 'resolved' ? result.resolved : undefined
+
+    if (frame !== undefined) {
+      this.cachedDeepestFrame = frame
+      this.cachedDeepestByFrame = resolved
+    }
+
+    return resolved
+  }
+
+  private getWidgetState() {
+    const resolved = this.resolveDeepest()
+    if (!resolved) return undefined
+    return useWidgetValueStore().getWidget(
+      this.graphId,
+      stripGraphPrefix(String(resolved.node.id)),
+      resolved.widget.name
+    )
+  }
+
+  private getProjectedWidget(resolved: {
+    node: LGraphNode
+    widget: IBaseWidget
+  }): BaseWidget | undefined {
+    const shouldRebuild =
+      !this.projectedWidget ||
+      this.projectedSourceNode !== resolved.node ||
+      this.projectedSourceWidget !== resolved.widget ||
+      this.projectedSourceWidgetType !== resolved.widget.type
+
+    if (!shouldRebuild) return this.projectedWidget
+
+    const concrete = toConcreteWidget(resolved.widget, resolved.node, false)
+    if (!concrete) {
+      this.projectedWidget = undefined
+      this.projectedSourceNode = undefined
+      this.projectedSourceWidget = undefined
+      this.projectedSourceWidgetType = undefined
+      return undefined
+    }
+
+    this.projectedWidget = concrete.createCopyForNode(this.subgraphNode)
+    this.projectedSourceNode = resolved.node
+    this.projectedSourceWidget = resolved.widget
+    this.projectedSourceWidgetType = resolved.widget.type
+    return this.projectedWidget
+  }
+
+  private bindConcretePointerHandlers(
+    pointer: CanvasPointer,
+    canvas: LGraphCanvas,
+    concrete: BaseWidget
+  ): boolean {
+    const downEvent = pointer.eDown
+    if (!downEvent) return false
+
+    pointer.onClick = () =>
+      concrete.onClick({
+        e: downEvent,
+        node: this.subgraphNode,
+        canvas
+      })
+    pointer.onDrag = (eMove) =>
+      concrete.onDrag?.({
+        e: eMove,
+        node: this.subgraphNode,
+        canvas
+      })
+    return true
+  }
+
+  private handleLegacyMouse(
+    pointer: CanvasPointer,
+    interior: LegacyMouseWidget
+  ): boolean {
+    const downEvent = pointer.eDown
+    if (!downEvent) return false
+
+    const downPosition: Point = [
+      downEvent.canvasX - this.subgraphNode.pos[0],
+      downEvent.canvasY - this.subgraphNode.pos[1]
+    ]
+    interior.mouse(downEvent, downPosition, this.subgraphNode)
+
+    pointer.finally = () => {
+      const upEvent = pointer.eUp
+      if (!upEvent) return
+
+      const upPosition: Point = [
+        upEvent.canvasX - this.subgraphNode.pos[0],
+        upEvent.canvasY - this.subgraphNode.pos[1]
+      ]
+      interior.mouse(upEvent, upPosition, this.subgraphNode)
+    }
+
+    return true
+  }
+
+  private syncDomOverride(
+    resolved:
+      | { node: LGraphNode; widget: IBaseWidget }
+      | undefined = this.resolveAtHost()
+  ) {
+    if (!resolved || !isBaseDOMWidget(resolved.widget)) return
+    useDomWidgetStore().setPositionOverride(resolved.widget.id, {
+      node: this.subgraphNode,
+      widget: this
+    })
+  }
+}
+
+/** Checks if a widget is a BaseDOMWidget (DOMWidget or ComponentWidget). */
+function isBaseDOMWidget(
+  widget: IBaseWidget
+): widget is IBaseWidget & { id: string } {
+  return 'id' in widget && ('element' in widget || 'component' in widget)
+}
+
+function drawDisconnectedPlaceholder(
+  ctx: CanvasRenderingContext2D,
+  width: number,
+  y: number,
+  H: number
+) {
+  const backgroundColor = readDesignToken(
+    '--color-secondary-background',
+    '#333'
+  )
+  const textColor = readDesignToken('--color-text-secondary', '#999')
+  const fontSize = readDesignToken('--text-xxs', '11px')
+  const fontFamily = readDesignToken('--font-inter', 'sans-serif')
+
+  ctx.save()
+  ctx.fillStyle = backgroundColor
+  ctx.fillRect(15, y, width - 30, H)
+  ctx.fillStyle = textColor
+  ctx.font = `${fontSize} ${fontFamily}`
+  ctx.textAlign = 'center'
+  ctx.textBaseline = 'middle'
+  ctx.fillText(t('subgraphStore.disconnected'), width / 2, y + H / 2)
+  ctx.restore()
+}
+
+function readDesignToken(token: string, fallback: string): string {
+  if (typeof document === 'undefined') return fallback
+
+  const cachedValue = designTokenCache.get(token)
+  if (cachedValue) return cachedValue
+
+  const value = getComputedStyle(document.documentElement)
+    .getPropertyValue(token)
+    .trim()
+  const resolvedValue = value || fallback
+  designTokenCache.set(token, resolvedValue)
+  return resolvedValue
+}
diff --git a/src/core/graph/subgraph/promotionUtils.test.ts b/src/core/graph/subgraph/promotionUtils.test.ts
new file mode 100644
index 0000000000..ff96cc98bc
--- /dev/null
+++ b/src/core/graph/subgraph/promotionUtils.test.ts
@@ -0,0 +1,267 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+import { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import {
+  createTestSubgraph,
+  createTestSubgraphNode
+} from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers'
+import { usePromotionStore } from '@/stores/promotionStore'
+
+const updatePreviewsMock = vi.hoisted(() => vi.fn())
+vi.mock('@/services/litegraphService', () => ({
+  useLitegraphService: () => ({ updatePreviews: updatePreviewsMock })
+}))
+
+import {
+  CANVAS_IMAGE_PREVIEW_WIDGET,
+  getPromotableWidgets,
+  isPreviewPseudoWidget,
+  promoteRecommendedWidgets,
+  pruneDisconnected
+} from './promotionUtils'
+
+function widget(
+  overrides: Partial<
+    Pick<IBaseWidget, 'name' | 'serialize' | 'type' | 'options'>
+  >
+): IBaseWidget {
+  return { name: 'widget', ...overrides } as unknown as IBaseWidget
+}
+
+describe('isPreviewPseudoWidget', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    vi.restoreAllMocks()
+  })
+
+  it('returns true for $$-prefixed widget names', () => {
+    expect(
+      isPreviewPseudoWidget(widget({ name: '$$canvas-image-preview' }))
+    ).toBe(true)
+    expect(isPreviewPseudoWidget(widget({ name: '$$anything' }))).toBe(true)
+  })
+
+  it('returns true for serialize:false with type "preview"', () => {
+    expect(
+      isPreviewPseudoWidget(
+        widget({ name: 'videopreview', serialize: false, type: 'preview' })
+      )
+    ).toBe(true)
+  })
+
+  it('returns true for options.serialize:false with type "preview" (VHS pattern)', () => {
+    expect(
+      isPreviewPseudoWidget(
+        widget({
+          name: 'videopreview',
+          type: 'preview',
+          options: { serialize: false }
+        })
+      )
+    ).toBe(true)
+  })
+
+  it('returns true for serialize:false with type "video"', () => {
+    expect(
+      isPreviewPseudoWidget(
+        widget({ name: 'vid', serialize: false, type: 'video' })
+      )
+    ).toBe(true)
+  })
+
+  it('returns true for serialize:false with type "audioUI"', () => {
+    expect(
+      isPreviewPseudoWidget(
+        widget({ name: 'audio', serialize: false, type: 'audioUI' })
+      )
+    ).toBe(true)
+  })
+
+  it('returns false for type "preview" when serialize is not false', () => {
+    expect(
+      isPreviewPseudoWidget(
+        widget({ name: 'videopreview', serialize: true, type: 'preview' })
+      )
+    ).toBe(false)
+  })
+
+  it('returns false for regular widgets', () => {
+    expect(
+      isPreviewPseudoWidget(widget({ name: 'seed', type: 'number' }))
+    ).toBe(false)
+  })
+
+  it('returns false for serialize:false with unknown type', () => {
+    expect(
+      isPreviewPseudoWidget(
+        widget({ name: 'text', serialize: false, type: 'customtext' })
+      )
+    ).toBe(false)
+  })
+})
+
+describe('pruneDisconnected', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    vi.restoreAllMocks()
+  })
+
+  it('removes disconnected entries and emits a dev warning', () => {
+    const subgraph = createTestSubgraph()
+    const subgraphNode = createTestSubgraphNode(subgraph)
+    const interiorNode = new LGraphNode('TestNode')
+    subgraphNode.subgraph.add(interiorNode)
+    interiorNode.addWidget('text', 'kept', 'value', () => {})
+
+    const store = usePromotionStore()
+    store.setPromotions(subgraphNode.rootGraph.id, subgraphNode.id, [
+      { interiorNodeId: String(interiorNode.id), widgetName: 'kept' },
+      { interiorNodeId: String(interiorNode.id), widgetName: 'missing-widget' },
+      { interiorNodeId: '9999', widgetName: 'missing-node' }
+    ])
+
+    const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
+
+    pruneDisconnected(subgraphNode)
+
+    expect(
+      store.getPromotions(subgraphNode.rootGraph.id, subgraphNode.id)
+    ).toEqual([{ interiorNodeId: String(interiorNode.id), widgetName: 'kept' }])
+    expect(warnSpy).toHaveBeenCalledOnce()
+  })
+
+  it('keeps virtual canvas preview promotions for PreviewImage nodes', () => {
+    const subgraph = createTestSubgraph()
+    const subgraphNode = createTestSubgraphNode(subgraph)
+    const interiorNode = new LGraphNode('PreviewImage')
+    interiorNode.type = 'PreviewImage'
+    subgraphNode.subgraph.add(interiorNode)
+
+    const store = usePromotionStore()
+    store.setPromotions(subgraphNode.rootGraph.id, subgraphNode.id, [
+      {
+        interiorNodeId: String(interiorNode.id),
+        widgetName: CANVAS_IMAGE_PREVIEW_WIDGET
+      }
+    ])
+
+    pruneDisconnected(subgraphNode)
+
+    expect(
+      store.getPromotions(subgraphNode.rootGraph.id, subgraphNode.id)
+    ).toEqual([
+      {
+        interiorNodeId: String(interiorNode.id),
+        widgetName: CANVAS_IMAGE_PREVIEW_WIDGET
+      }
+    ])
+  })
+})
+
+describe('getPromotableWidgets', () => {
+  it('adds virtual canvas preview widget for PreviewImage nodes', () => {
+    const node = new LGraphNode('PreviewImage')
+    node.type = 'PreviewImage'
+
+    const widgets = getPromotableWidgets(node)
+
+    expect(
+      widgets.some((widget) => widget.name === CANVAS_IMAGE_PREVIEW_WIDGET)
+    ).toBe(true)
+  })
+
+  it('adds virtual canvas preview widget for SaveImage nodes', () => {
+    const node = new LGraphNode('SaveImage')
+    node.type = 'SaveImage'
+
+    const widgets = getPromotableWidgets(node)
+
+    expect(
+      widgets.some((widget) => widget.name === CANVAS_IMAGE_PREVIEW_WIDGET)
+    ).toBe(true)
+  })
+
+  it('adds virtual canvas preview widget for GLSLShader nodes', () => {
+    const node = new LGraphNode('GLSLShader')
+    node.type = 'GLSLShader'
+
+    const widgets = getPromotableWidgets(node)
+
+    expect(
+      widgets.some((widget) => widget.name === CANVAS_IMAGE_PREVIEW_WIDGET)
+    ).toBe(true)
+  })
+
+  it('does not add virtual canvas preview widget for non-image nodes', () => {
+    const node = new LGraphNode('TextNode')
+    node.addOutput('TEXT', 'STRING')
+
+    const widgets = getPromotableWidgets(node)
+
+    expect(
+      widgets.some((widget) => widget.name === CANVAS_IMAGE_PREVIEW_WIDGET)
+    ).toBe(false)
+  })
+
+  it('does not add virtual canvas preview widget for ImageInvert nodes', () => {
+    const node = new LGraphNode('ImageInvert')
+    node.type = 'ImageInvert'
+
+    const widgets = getPromotableWidgets(node)
+
+    expect(
+      widgets.some((widget) => widget.name === CANVAS_IMAGE_PREVIEW_WIDGET)
+    ).toBe(false)
+  })
+})
+
+describe('promoteRecommendedWidgets', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    updatePreviewsMock.mockReset()
+  })
+
+  it('skips deferred updatePreviews when a preview widget already exists', () => {
+    const subgraph = createTestSubgraph()
+    const subgraphNode = createTestSubgraphNode(subgraph)
+    const interiorNode = new LGraphNode('TestNode')
+    subgraph.add(interiorNode)
+
+    const previewWidget = interiorNode.addWidget(
+      'custom',
+      'videopreview',
+      'value',
+      () => {}
+    )
+    previewWidget.type = 'preview'
+    previewWidget.serialize = false
+
+    promoteRecommendedWidgets(subgraphNode)
+
+    expect(updatePreviewsMock).not.toHaveBeenCalled()
+  })
+
+  it('eagerly promotes virtual preview widget for CANVAS_IMAGE_PREVIEW nodes', () => {
+    const subgraph = createTestSubgraph()
+    const subgraphNode = createTestSubgraphNode(subgraph)
+    const glslNode = new LGraphNode('GLSLShader')
+    glslNode.type = 'GLSLShader'
+    subgraph.add(glslNode)
+
+    promoteRecommendedWidgets(subgraphNode)
+
+    const store = usePromotionStore()
+    expect(
+      store.isPromoted(
+        subgraphNode.rootGraph.id,
+        subgraphNode.id,
+        String(glslNode.id),
+        CANVAS_IMAGE_PREVIEW_WIDGET
+      )
+    ).toBe(true)
+    expect(updatePreviewsMock).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/core/graph/subgraph/promotionUtils.ts b/src/core/graph/subgraph/promotionUtils.ts
new file mode 100644
index 0000000000..532c49920b
--- /dev/null
+++ b/src/core/graph/subgraph/promotionUtils.ts
@@ -0,0 +1,308 @@
+import { isPromotedWidgetView } from '@/core/graph/subgraph/promotedWidgetTypes'
+import { t } from '@/i18n'
+import type {
+  IContextMenuValue,
+  LGraphNode
+} from '@/lib/litegraph/src/litegraph'
+import type { SubgraphNode } from '@/lib/litegraph/src/subgraph/SubgraphNode'
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets.ts'
+import { useToastStore } from '@/platform/updates/common/toastStore'
+import {
+  CANVAS_IMAGE_PREVIEW_WIDGET,
+  supportsVirtualCanvasImagePreview
+} from '@/composables/node/useNodeCanvasImagePreview'
+import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import { useLitegraphService } from '@/services/litegraphService'
+import { usePromotionStore } from '@/stores/promotionStore'
+import { useSubgraphNavigationStore } from '@/stores/subgraphNavigationStore'
+
+type PartialNode = Pick<LGraphNode, 'title' | 'id' | 'type'>
+
+export type WidgetItem = [PartialNode, IBaseWidget]
+export { CANVAS_IMAGE_PREVIEW_WIDGET }
+
+export function getWidgetName(w: IBaseWidget): string {
+  return isPromotedWidgetView(w) ? w.sourceWidgetName : w.name
+}
+
+/** Known non-$$ preview widget types added by core or popular extensions. */
+const PREVIEW_WIDGET_TYPES = new Set(['preview', 'video', 'audioUI'])
+
+/**
+ * Returns true for pseudo-widgets that display media previews and should
+ * be auto-promoted when their node is inside a subgraph.
+ * Matches the core `$$` convention as well as custom-node patterns
+ * (e.g. VHS `videopreview` with type `"preview"`).
+ */
+export function isPreviewPseudoWidget(widget: IBaseWidget): boolean {
+  if (widget.name.startsWith('$$')) return true
+  // Custom nodes may set serialize on the widget or in options
+  if (widget.serialize !== false && widget.options?.serialize !== false)
+    return false
+  if (typeof widget.type === 'string' && PREVIEW_WIDGET_TYPES.has(widget.type))
+    return true
+  return false
+}
+
+export function promoteWidget(
+  node: PartialNode,
+  widget: IBaseWidget,
+  parents: SubgraphNode[]
+) {
+  const store = usePromotionStore()
+  const nodeId = String(
+    isPromotedWidgetView(widget) ? widget.sourceNodeId : node.id
+  )
+  const widgetName = getWidgetName(widget)
+  for (const parent of parents) {
+    store.promote(parent.rootGraph.id, parent.id, nodeId, widgetName)
+  }
+}
+
+export function demoteWidget(
+  node: PartialNode,
+  widget: IBaseWidget,
+  parents: SubgraphNode[]
+) {
+  const store = usePromotionStore()
+  const nodeId = String(
+    isPromotedWidgetView(widget) ? widget.sourceNodeId : node.id
+  )
+  const widgetName = getWidgetName(widget)
+  for (const parent of parents) {
+    store.demote(parent.rootGraph.id, parent.id, nodeId, widgetName)
+  }
+}
+
+function getParentNodes(): SubgraphNode[] {
+  const { navigationStack } = useSubgraphNavigationStore()
+  const subgraph = navigationStack.at(-1)
+  if (!subgraph) {
+    useToastStore().add({
+      severity: 'error',
+      summary: t('g.error'),
+      detail: t('subgraphStore.promoteOutsideSubgraph'),
+      life: 2000
+    })
+    return []
+  }
+  const parentGraph = navigationStack.at(-2) ?? subgraph.rootGraph
+  return parentGraph.nodes.filter(
+    (node): node is SubgraphNode =>
+      node.type === subgraph.id && node.isSubgraphNode()
+  )
+}
+
+export function addWidgetPromotionOptions(
+  options: (IContextMenuValue<unknown> | null)[],
+  widget: IBaseWidget,
+  node: LGraphNode
+) {
+  const store = usePromotionStore()
+  const parents = getParentNodes()
+  const nodeId = String(node.id)
+  const widgetName = getWidgetName(widget)
+  const promotableParents = parents.filter(
+    (s) => !store.isPromoted(s.rootGraph.id, s.id, nodeId, widgetName)
+  )
+  if (promotableParents.length > 0)
+    options.unshift({
+      content: t('subgraphStore.promoteWidget', {
+        name: widget.label ?? widget.name
+      }),
+      callback: () => {
+        promoteWidget(node, widget, promotableParents)
+        widget.callback?.(widget.value)
+      }
+    })
+  else {
+    options.unshift({
+      content: t('subgraphStore.unpromoteWidget', {
+        name: widget.label ?? widget.name
+      }),
+      callback: () => {
+        demoteWidget(node, widget, parents)
+        widget.callback?.(widget.value)
+      }
+    })
+  }
+}
+
+export function tryToggleWidgetPromotion() {
+  const canvas = useCanvasStore().getCanvas()
+  const [x, y] = canvas.graph_mouse
+  const node = canvas.graph?.getNodeOnPos(x, y, canvas.visible_nodes)
+  if (!node) return
+  const widget = node.getWidgetOnPos(x, y, true)
+  const parents = getParentNodes()
+  if (!parents.length || !widget) return
+  const store = usePromotionStore()
+  const nodeId = String(node.id)
+  const widgetName = getWidgetName(widget)
+  const promotableParents = parents.filter(
+    (s) => !store.isPromoted(s.rootGraph.id, s.id, nodeId, widgetName)
+  )
+  if (promotableParents.length > 0)
+    promoteWidget(node, widget, promotableParents)
+  else demoteWidget(node, widget, parents)
+}
+
+const recommendedNodes = [
+  'CLIPTextEncode',
+  'LoadImage',
+  'SaveImage',
+  'PreviewImage'
+]
+const recommendedWidgetNames = ['seed']
+export function isRecommendedWidget([node, widget]: WidgetItem) {
+  return (
+    !widget.computedDisabled &&
+    (recommendedNodes.includes(node.type) ||
+      recommendedWidgetNames.includes(widget.name))
+  )
+}
+
+function supportsVirtualPreviewWidget(node: LGraphNode): boolean {
+  return supportsVirtualCanvasImagePreview(node)
+}
+
+function createVirtualCanvasImagePreviewWidget(): IBaseWidget {
+  return {
+    name: CANVAS_IMAGE_PREVIEW_WIDGET,
+    type: 'IMAGE_PREVIEW',
+    options: { serialize: false },
+    serialize: false,
+    y: 0,
+    computedDisabled: false
+  }
+}
+
+export function getPromotableWidgets(node: LGraphNode): IBaseWidget[] {
+  const widgets = [...(node.widgets ?? [])]
+
+  const hasCanvasPreviewWidget = widgets.some(
+    (widget) => widget.name === CANVAS_IMAGE_PREVIEW_WIDGET
+  )
+  const supportsVirtualPreview = supportsVirtualPreviewWidget(node)
+  if (!hasCanvasPreviewWidget && supportsVirtualPreview) {
+    widgets.push(createVirtualCanvasImagePreviewWidget())
+  }
+
+  return widgets
+}
+
+function nodeWidgets(n: LGraphNode): WidgetItem[] {
+  return getPromotableWidgets(n).map((w: IBaseWidget) => [n, w])
+}
+
+export function promoteRecommendedWidgets(subgraphNode: SubgraphNode) {
+  const store = usePromotionStore()
+  const { updatePreviews } = useLitegraphService()
+  const interiorNodes = subgraphNode.subgraph.nodes
+  for (const node of interiorNodes) {
+    node.updateComputedDisabled()
+
+    const hasPreviewWidget = () =>
+      node.widgets?.some(isPreviewPseudoWidget) ?? false
+
+    function promotePreviewWidget() {
+      const widget = node.widgets?.find(isPreviewPseudoWidget)
+      if (!widget) return
+      if (
+        store.isPromoted(
+          subgraphNode.rootGraph.id,
+          subgraphNode.id,
+          String(node.id),
+          widget.name
+        )
+      )
+        return
+      promoteWidget(node, widget, [subgraphNode])
+    }
+    // Promote preview widgets that already exist (e.g. custom node DOM widgets
+    // like VHS videopreview that are created in onNodeCreated).
+    promotePreviewWidget()
+
+    // If a preview widget already exists in this frame, there's nothing to
+    // defer. Core $$ preview widgets are the lazy path that needs updatePreviews.
+    if (hasPreviewWidget()) continue
+
+    // Nodes in CANVAS_IMAGE_PREVIEW_NODE_TYPES support a virtual $$
+    // preview widget. Eagerly promote it so getPseudoWidgetPreviewTargets
+    // includes this node and onDrawBackground can call updatePreviews on it
+    // once execution outputs arrive.
+    if (supportsVirtualCanvasImagePreview(node)) {
+      if (
+        !store.isPromoted(
+          subgraphNode.rootGraph.id,
+          subgraphNode.id,
+          String(node.id),
+          CANVAS_IMAGE_PREVIEW_WIDGET
+        )
+      ) {
+        store.promote(
+          subgraphNode.rootGraph.id,
+          subgraphNode.id,
+          String(node.id),
+          CANVAS_IMAGE_PREVIEW_WIDGET
+        )
+      }
+      continue
+    }
+
+    // Also schedule a deferred check: core $$ widgets are created lazily by
+    // updatePreviews when node outputs are first loaded.
+    requestAnimationFrame(() => updatePreviews(node, promotePreviewWidget))
+  }
+  const filteredWidgets: WidgetItem[] = interiorNodes
+    .flatMap(nodeWidgets)
+    .filter(isRecommendedWidget)
+  for (const [n, w] of filteredWidgets) {
+    store.promote(
+      subgraphNode.rootGraph.id,
+      subgraphNode.id,
+      String(n.id),
+      getWidgetName(w)
+    )
+  }
+  subgraphNode.computeSize(subgraphNode.size)
+}
+
+export function pruneDisconnected(subgraphNode: SubgraphNode) {
+  const store = usePromotionStore()
+  const subgraph = subgraphNode.subgraph
+  const entries = store.getPromotions(
+    subgraphNode.rootGraph.id,
+    subgraphNode.id
+  )
+  const removedEntries: Array<{ interiorNodeId: string; widgetName: string }> =
+    []
+
+  const validEntries = entries.filter((entry) => {
+    const node = subgraph.getNodeById(entry.interiorNodeId)
+    if (!node) {
+      removedEntries.push(entry)
+      return false
+    }
+    const hasWidget = getPromotableWidgets(node).some(
+      (iw) => iw.name === entry.widgetName
+    )
+    if (!hasWidget) {
+      removedEntries.push(entry)
+    }
+    return hasWidget
+  })
+
+  if (removedEntries.length > 0 && import.meta.env.DEV) {
+    console.warn(
+      '[proxyWidgetUtils] Pruned disconnected promotions',
+      removedEntries,
+      {
+        graphId: subgraphNode.rootGraph.id,
+        subgraphNodeId: subgraphNode.id
+      }
+    )
+  }
+
+  store.setPromotions(subgraphNode.rootGraph.id, subgraphNode.id, validEntries)
+}
diff --git a/src/core/graph/subgraph/proxyWidget.ts b/src/core/graph/subgraph/proxyWidget.ts
deleted file mode 100644
index 60f6d456aa..0000000000
--- a/src/core/graph/subgraph/proxyWidget.ts
+++ /dev/null
@@ -1,248 +0,0 @@
-import {
-  demoteWidget,
-  promoteRecommendedWidgets
-} from '@/core/graph/subgraph/proxyWidgetUtils'
-import { parseProxyWidgets } from '@/core/schemas/proxyWidget'
-import type { NodeProperty } from '@/lib/litegraph/src/LGraphNode'
-import type {
-  LGraph,
-  LGraphCanvas,
-  LGraphNode
-} from '@/lib/litegraph/src/litegraph'
-import { SubgraphNode } from '@/lib/litegraph/src/subgraph/SubgraphNode'
-import type { ISerialisedNode } from '@/lib/litegraph/src/types/serialisation'
-import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets.ts'
-import { disconnectedWidget } from '@/lib/litegraph/src/widgets/DisconnectedWidget'
-import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
-import { DOMWidgetImpl } from '@/scripts/domWidget'
-import { useLitegraphService } from '@/services/litegraphService'
-import { useDomWidgetStore } from '@/stores/domWidgetStore'
-import { getNodeByExecutionId } from '@/utils/graphTraversalUtil'
-
-/**
- * @typedef {object} Overlay - Each proxy Widget has an associated overlay object
- * Accessing a property which exists in the overlay object will
- * instead result in the action being performed on the overlay object
- * 3 properties are added for locating the proxied widget
- * @property {LGraph} graph - The graph the widget resides in. Used for widget lookup
- * @property {string} nodeId - The NodeId the proxy Widget is located on
- * @property {string} widgetName - The name of the linked widget
- *
- * @property {boolean} isProxyWidget - Always true, used as type guard
- * @property {LGraphNode} node - not included on IBaseWidget, but required for overlay
- */
-type Overlay = Partial<IBaseWidget> & {
-  graph: LGraph
-  nodeId: string
-  widgetName: string
-  isProxyWidget: boolean
-  node?: LGraphNode
-}
-// A ProxyWidget can be treated like a normal widget.
-// the _overlay property can be used to directly access the Overlay object
-/**
- * @typedef {object} ProxyWidget - a reference to a widget that can
- * be displayed and owned by a separate node
- * @property {Overlay} _overlay - a special property to access the overlay of the widget
- * Any property that exists in the overlay will be accessed instead of the property
- * on the linked widget
- */
-type ProxyWidget = IBaseWidget & { _overlay: Overlay }
-export function isProxyWidget(w: IBaseWidget): w is ProxyWidget {
-  return (w as { _overlay?: Overlay })?._overlay?.isProxyWidget ?? false
-}
-export function isDisconnectedWidget(w: ProxyWidget) {
-  return w instanceof disconnectedWidget.constructor
-}
-
-export function registerProxyWidgets(canvas: LGraphCanvas) {
-  //NOTE: canvasStore hasn't been initialized yet
-  canvas.canvas.addEventListener<'subgraph-opened'>('subgraph-opened', (e) => {
-    const { subgraph, fromNode } = e.detail
-    const proxyWidgets = parseProxyWidgets(fromNode.properties.proxyWidgets)
-    for (const node of subgraph.nodes) {
-      for (const widget of node.widgets ?? []) {
-        widget.promoted = proxyWidgets.some(
-          ([n, w]) => node.id == n && widget.name == w
-        )
-      }
-    }
-  })
-  canvas.canvas.addEventListener<'subgraph-converted'>(
-    'subgraph-converted',
-    (e) => promoteRecommendedWidgets(e.detail.subgraphNode)
-  )
-  SubgraphNode.prototype.onConfigure = onConfigure
-}
-
-const originalOnConfigure = SubgraphNode.prototype.onConfigure
-const onConfigure = function (
-  this: LGraphNode,
-  serialisedNode: ISerialisedNode
-) {
-  if (!this.isSubgraphNode())
-    throw new Error("Can't add proxyWidgets to non-subgraphNode")
-
-  const canvasStore = useCanvasStore()
-  //Must give value to proxyWidgets prior to defining or it won't serialize
-  this.properties.proxyWidgets ??= []
-
-  originalOnConfigure?.call(this, serialisedNode)
-
-  Object.defineProperty(this.properties, 'proxyWidgets', {
-    get: () =>
-      this.widgets.map((w) =>
-        isProxyWidget(w)
-          ? [w._overlay.nodeId, w._overlay.widgetName]
-          : ['-1', w.name]
-      ),
-    set: (property: NodeProperty) => {
-      const parsed = parseProxyWidgets(property)
-      const { deactivateWidget, setWidget } = useDomWidgetStore()
-      const isActiveGraph = useCanvasStore().canvas?.graph === this.graph
-      if (isActiveGraph) {
-        for (const w of this.widgets.filter((w) => isProxyWidget(w))) {
-          if (w instanceof DOMWidgetImpl) deactivateWidget(w.id)
-        }
-      }
-
-      const newWidgets = parsed.flatMap(([nodeId, widgetName]) => {
-        if (nodeId === '-1') {
-          const widget = this.widgets.find((w) => w.name === widgetName)
-          return widget ? [widget] : []
-        }
-        const w = newProxyWidget(this, nodeId, widgetName)
-        if (isActiveGraph && w instanceof DOMWidgetImpl) setWidget(w)
-        return [w]
-      })
-      this.widgets = this.widgets.filter(
-        (w) => !isProxyWidget(w) && !parsed.some(([, name]) => w.name === name)
-      )
-      this.widgets.push(...newWidgets)
-
-      canvasStore.canvas?.setDirty(true, true)
-      this._setConcreteSlots()
-      this.arrange()
-    }
-  })
-  if (serialisedNode.properties?.proxyWidgets) {
-    this.properties.proxyWidgets = serialisedNode.properties.proxyWidgets
-    const parsed = parseProxyWidgets(serialisedNode.properties.proxyWidgets)
-    serialisedNode.widgets_values?.forEach((v, index) => {
-      if (parsed[index]?.[0] !== '-1') return
-      const widget = this.widgets.find((w) => w.name == parsed[index][1])
-      if (v !== null && widget) widget.value = v
-    })
-  }
-}
-
-function newProxyWidget(
-  subgraphNode: SubgraphNode,
-  nodeId: string,
-  widgetName: string
-) {
-  const name = `${nodeId}: ${widgetName}`
-  const overlay = {
-    //items specific for proxy management
-    nodeId,
-    graph: subgraphNode.subgraph,
-    widgetName,
-    //Items which normally exist on widgets
-    afterQueued: undefined,
-    computedHeight: undefined,
-    isProxyWidget: true,
-    last_y: undefined,
-    name,
-    node: subgraphNode,
-    onRemove: undefined,
-    promoted: undefined,
-    serialize: false,
-    width: undefined,
-    y: 0
-  }
-  return newProxyFromOverlay(subgraphNode, overlay)
-}
-function resolveLinkedWidget(
-  overlay: Overlay
-): [LGraphNode | undefined, IBaseWidget | undefined] {
-  const { graph, nodeId, widgetName } = overlay
-  const n = getNodeByExecutionId(graph, nodeId)
-  if (!n) return [undefined, undefined]
-  const widget = n.widgets?.find((w: IBaseWidget) => w.name === widgetName)
-  //Slightly hacky. Force recursive resolution of nested widgets
-  if (widget && isProxyWidget(widget) && isDisconnectedWidget(widget))
-    widget.computedHeight = 20
-  return [n, widget]
-}
-
-function newProxyFromOverlay(subgraphNode: SubgraphNode, overlay: Overlay) {
-  const { updatePreviews } = useLitegraphService()
-  let [linkedNode, linkedWidget] = resolveLinkedWidget(overlay)
-  let backingWidget = linkedWidget ?? disconnectedWidget
-  if (overlay.widgetName.startsWith('$$')) {
-    overlay.node = new Proxy(subgraphNode, {
-      get(_t, p) {
-        if (p !== 'imgs') return Reflect.get(subgraphNode, p)
-        if (!linkedNode) return []
-        return linkedNode.imgs
-      }
-    })
-  }
-  /**
-   * A set of handlers which define widget interaction
-   * Many arguments are shared between function calls
-   * @param {IBaseWidget} _t - The "target" the call is originally made on.
-   *   This argument is never used, but must be defined for typechecking
-   * @param {string} property - The name of the accessed value.
-   *   Checked for conditional logic, but never changed
-   * @param {object} receiver - The object the result is set to
-   *   and the value used as 'this' if property is a get/set method
-   * @param {unknown} value - only used on set calls. The thing being assigned
-   */
-  const handler = {
-    get(_t: IBaseWidget, property: string, receiver: object) {
-      let redirectedTarget: object = backingWidget
-      let redirectedReceiver = receiver
-      if (property == '_overlay') return overlay
-      else if (property == 'value') redirectedReceiver = backingWidget
-      if (Object.prototype.hasOwnProperty.call(overlay, property)) {
-        redirectedTarget = overlay
-        redirectedReceiver = overlay
-      }
-      return Reflect.get(redirectedTarget, property, redirectedReceiver)
-    },
-    set(_t: IBaseWidget, property: string, value: unknown) {
-      let redirectedTarget: object = backingWidget
-      if (property == 'computedHeight') {
-        if (overlay.widgetName.startsWith('$$') && linkedNode) {
-          updatePreviews(linkedNode)
-        }
-        if (linkedNode && linkedWidget?.computedDisabled) {
-          demoteWidget(linkedNode, linkedWidget, [subgraphNode])
-        }
-        //update linkage regularly, but no more than once per frame
-        ;[linkedNode, linkedWidget] = resolveLinkedWidget(overlay)
-        backingWidget = linkedWidget ?? disconnectedWidget
-      }
-      if (Object.prototype.hasOwnProperty.call(overlay, property)) {
-        redirectedTarget = overlay
-      }
-      return Reflect.set(redirectedTarget, property, value, redirectedTarget)
-    },
-    getPrototypeOf() {
-      return Reflect.getPrototypeOf(backingWidget)
-    },
-    ownKeys() {
-      return Reflect.ownKeys(backingWidget)
-    },
-    has(_t: IBaseWidget, property: string) {
-      let redirectedTarget: object = backingWidget
-      if (Object.prototype.hasOwnProperty.call(overlay, property)) {
-        redirectedTarget = overlay
-      }
-      return Reflect.has(redirectedTarget, property)
-    }
-  }
-  const w = new Proxy(disconnectedWidget, handler)
-  return w
-}
diff --git a/src/core/graph/subgraph/proxyWidgetUtils.ts b/src/core/graph/subgraph/proxyWidgetUtils.ts
deleted file mode 100644
index 27961e54dc..0000000000
--- a/src/core/graph/subgraph/proxyWidgetUtils.ts
+++ /dev/null
@@ -1,176 +0,0 @@
-import { parseProxyWidgets } from '@/core/schemas/proxyWidget'
-import type { ProxyWidgetsProperty } from '@/core/schemas/proxyWidget'
-import {
-  isProxyWidget,
-  isDisconnectedWidget
-} from '@/core/graph/subgraph/proxyWidget'
-import { t } from '@/i18n'
-import type {
-  IContextMenuValue,
-  LGraphNode
-} from '@/lib/litegraph/src/litegraph'
-import type { SubgraphNode } from '@/lib/litegraph/src/subgraph/SubgraphNode'
-import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets.ts'
-import { useToastStore } from '@/platform/updates/common/toastStore'
-import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
-import { useLitegraphService } from '@/services/litegraphService'
-import { useSubgraphNavigationStore } from '@/stores/subgraphNavigationStore'
-
-type PartialNode = Pick<LGraphNode, 'title' | 'id' | 'type'>
-
-export type WidgetItem = [PartialNode, IBaseWidget]
-
-function getProxyWidgets(node: SubgraphNode) {
-  return parseProxyWidgets(node.properties.proxyWidgets)
-}
-export function promoteWidget(
-  node: PartialNode,
-  widget: IBaseWidget,
-  parents: SubgraphNode[]
-) {
-  for (const parent of parents) {
-    const proxyWidgets = [
-      ...getProxyWidgets(parent),
-      widgetItemToProperty([node, widget])
-    ]
-    parent.properties.proxyWidgets = proxyWidgets
-  }
-  widget.promoted = true
-}
-
-export function demoteWidget(
-  node: PartialNode,
-  widget: IBaseWidget,
-  parents: SubgraphNode[]
-) {
-  for (const parent of parents) {
-    const proxyWidgets = getProxyWidgets(parent).filter(
-      (widgetItem) => !matchesPropertyItem([node, widget])(widgetItem)
-    )
-    parent.properties.proxyWidgets = proxyWidgets
-  }
-  widget.promoted = false
-}
-
-export function matchesWidgetItem([nodeId, widgetName]: [string, string]) {
-  return ([n, w]: WidgetItem) => n.id == nodeId && w.name === widgetName
-}
-export function matchesPropertyItem([n, w]: WidgetItem) {
-  return ([nodeId, widgetName]: [string, string]) =>
-    n.id == nodeId && w.name === widgetName
-}
-export function widgetItemToProperty([n, w]: WidgetItem): [string, string] {
-  return [`${n.id}`, w.name]
-}
-
-function getParentNodes(): SubgraphNode[] {
-  //NOTE: support for determining parents of a subgraph is limited
-  //This function will require rework to properly support linked subgraphs
-  //Either by including actual parents in the navigation stack,
-  //or by adding a new event for parent listeners to collect from
-  const { navigationStack } = useSubgraphNavigationStore()
-  const subgraph = navigationStack.at(-1)
-  if (!subgraph) {
-    useToastStore().add({
-      severity: 'error',
-      summary: t('g.error'),
-      detail: t('subgraphStore.promoteOutsideSubgraph'),
-      life: 2000
-    })
-    return []
-  }
-  const parentGraph = navigationStack.at(-2) ?? subgraph.rootGraph
-  return parentGraph.nodes.filter(
-    (node): node is SubgraphNode =>
-      node.type === subgraph.id && node.isSubgraphNode()
-  )
-}
-
-export function addWidgetPromotionOptions(
-  options: (IContextMenuValue<unknown> | null)[],
-  widget: IBaseWidget,
-  node: LGraphNode
-) {
-  const parents = getParentNodes()
-  const promotableParents = parents.filter(
-    (s) => !getProxyWidgets(s).some(matchesPropertyItem([node, widget]))
-  )
-  if (promotableParents.length > 0)
-    options.unshift({
-      content: `Promote Widget: ${widget.label ?? widget.name}`,
-      callback: () => {
-        promoteWidget(node, widget, promotableParents)
-      }
-    })
-  else {
-    options.unshift({
-      content: `Un-Promote Widget: ${widget.label ?? widget.name}`,
-      callback: () => {
-        demoteWidget(node, widget, parents)
-      }
-    })
-  }
-}
-export function tryToggleWidgetPromotion() {
-  const canvas = useCanvasStore().getCanvas()
-  const [x, y] = canvas.graph_mouse
-  const node = canvas.graph?.getNodeOnPos(x, y, canvas.visible_nodes)
-  if (!node) return
-  const widget = node.getWidgetOnPos(x, y, true)
-  const parents = getParentNodes()
-  if (!parents.length || !widget) return
-  const promotableParents = parents.filter(
-    (s) => !getProxyWidgets(s).some(matchesPropertyItem([node, widget]))
-  )
-  if (promotableParents.length > 0)
-    promoteWidget(node, widget, promotableParents)
-  else demoteWidget(node, widget, parents)
-}
-const recommendedNodes = [
-  'CLIPTextEncode',
-  'LoadImage',
-  'SaveImage',
-  'PreviewImage'
-]
-const recommendedWidgetNames = ['seed']
-export function isRecommendedWidget([node, widget]: WidgetItem) {
-  return (
-    !widget.computedDisabled &&
-    (recommendedNodes.includes(node.type) ||
-      recommendedWidgetNames.includes(widget.name))
-  )
-}
-
-function nodeWidgets(n: LGraphNode): WidgetItem[] {
-  return n.widgets?.map((w: IBaseWidget) => [n, w]) ?? []
-}
-export function promoteRecommendedWidgets(subgraphNode: SubgraphNode) {
-  const { updatePreviews } = useLitegraphService()
-  const interiorNodes = subgraphNode.subgraph.nodes
-  for (const node of interiorNodes) {
-    node.updateComputedDisabled()
-    function checkWidgets() {
-      updatePreviews(node)
-      const widget = node.widgets?.find((w) => w.name.startsWith('$$'))
-      if (!widget) return
-      const pw = getProxyWidgets(subgraphNode)
-      if (pw.some(matchesPropertyItem([node, widget]))) return
-      promoteWidget(node, widget, [subgraphNode])
-    }
-    requestAnimationFrame(() => updatePreviews(node, checkWidgets))
-  }
-  const filteredWidgets: WidgetItem[] = interiorNodes
-    .flatMap(nodeWidgets)
-    .filter(isRecommendedWidget)
-  const proxyWidgets: ProxyWidgetsProperty =
-    filteredWidgets.map(widgetItemToProperty)
-  subgraphNode.properties.proxyWidgets = proxyWidgets
-  subgraphNode.computeSize(subgraphNode.size)
-}
-
-export function pruneDisconnected(subgraphNode: SubgraphNode) {
-  subgraphNode.properties.proxyWidgets = subgraphNode.widgets
-    .filter(isProxyWidget)
-    .filter((w) => !isDisconnectedWidget(w))
-    .map((w) => [w._overlay.nodeId, w._overlay.widgetName])
-}
diff --git a/src/core/graph/subgraph/resolveConcretePromotedWidget.test.ts b/src/core/graph/subgraph/resolveConcretePromotedWidget.test.ts
new file mode 100644
index 0000000000..ca934ecc0b
--- /dev/null
+++ b/src/core/graph/subgraph/resolveConcretePromotedWidget.test.ts
@@ -0,0 +1,257 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, test, vi } from 'vitest'
+
+import {
+  resolveConcretePromotedWidget,
+  resolvePromotedWidgetAtHost
+} from '@/core/graph/subgraph/resolveConcretePromotedWidget'
+import { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type { SubgraphNode } from '@/lib/litegraph/src/subgraph/SubgraphNode'
+import {
+  createTestSubgraph,
+  createTestSubgraphNode
+} from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers'
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+
+vi.mock('@/renderer/core/canvas/canvasStore', () => ({
+  useCanvasStore: () => ({})
+}))
+vi.mock('@/stores/domWidgetStore', () => ({
+  useDomWidgetStore: () => ({ widgetStates: new Map() })
+}))
+vi.mock('@/services/litegraphService', () => ({
+  useLitegraphService: () => ({ updatePreviews: () => ({}) })
+}))
+
+type PromotedWidgetStub = Pick<
+  IBaseWidget,
+  'name' | 'type' | 'options' | 'value' | 'y'
+> & {
+  sourceNodeId: string
+  sourceWidgetName: string
+  node?: SubgraphNode
+}
+
+function createHostNode(id: number): SubgraphNode {
+  return createTestSubgraphNode(createTestSubgraph(), { id })
+}
+
+function addNodeToHost(host: SubgraphNode, title: string): LGraphNode {
+  const node = new LGraphNode(title)
+  host.subgraph.add(node)
+  return node
+}
+
+function addConcreteWidget(node: LGraphNode, name: string): IBaseWidget {
+  return node.addWidget('text', name, `${name}-value`, () => undefined)
+}
+
+function createPromotedWidget(
+  name: string,
+  sourceNodeId: string,
+  sourceWidgetName: string,
+  node?: SubgraphNode
+): IBaseWidget {
+  const promotedWidget: PromotedWidgetStub = {
+    name,
+    type: 'button',
+    options: {},
+    y: 0,
+    value: undefined,
+    sourceNodeId,
+    sourceWidgetName,
+    node
+  }
+  return promotedWidget as IBaseWidget
+}
+
+beforeEach(() => {
+  setActivePinia(createTestingPinia({ stubActions: false }))
+})
+
+describe('resolvePromotedWidgetAtHost', () => {
+  test('resolves a direct concrete widget on the host subgraph node', () => {
+    const host = createHostNode(100)
+    const concreteNode = addNodeToHost(host, 'leaf')
+    addConcreteWidget(concreteNode, 'seed')
+
+    const resolved = resolvePromotedWidgetAtHost(
+      host,
+      String(concreteNode.id),
+      'seed'
+    )
+
+    expect(resolved).toBeDefined()
+    expect(resolved?.node.id).toBe(concreteNode.id)
+    expect(resolved?.widget.name).toBe('seed')
+  })
+
+  test('returns undefined when host does not contain the target node', () => {
+    const host = createHostNode(100)
+
+    const resolved = resolvePromotedWidgetAtHost(host, 'missing', 'seed')
+
+    expect(resolved).toBeUndefined()
+  })
+})
+
+describe('resolveConcretePromotedWidget', () => {
+  test('resolves a direct concrete source widget', () => {
+    const host = createHostNode(100)
+    const concreteNode = addNodeToHost(host, 'leaf')
+    addConcreteWidget(concreteNode, 'seed')
+
+    const result = resolveConcretePromotedWidget(
+      host,
+      String(concreteNode.id),
+      'seed'
+    )
+
+    expect(result.status).toBe('resolved')
+    if (result.status !== 'resolved') return
+    expect(result.resolved.node.id).toBe(concreteNode.id)
+    expect(result.resolved.widget.name).toBe('seed')
+  })
+
+  test('descends through nested promoted widgets to resolve concrete source', () => {
+    const rootHost = createHostNode(100)
+    const nestedHost = createHostNode(101)
+    const leafNode = addNodeToHost(nestedHost, 'leaf')
+    addConcreteWidget(leafNode, 'seed')
+    const sourceNode = addNodeToHost(rootHost, 'source')
+    sourceNode.widgets = [
+      createPromotedWidget('outer', String(leafNode.id), 'seed', nestedHost)
+    ]
+
+    const result = resolveConcretePromotedWidget(
+      rootHost,
+      String(sourceNode.id),
+      'outer'
+    )
+
+    expect(result.status).toBe('resolved')
+    if (result.status !== 'resolved') return
+    expect(result.resolved.node.id).toBe(leafNode.id)
+    expect(result.resolved.widget.name).toBe('seed')
+  })
+
+  test('returns cycle failure when promoted widgets form a loop', () => {
+    const hostA = createHostNode(200)
+    const hostB = createHostNode(201)
+    const relayA = addNodeToHost(hostA, 'relayA')
+    const relayB = addNodeToHost(hostB, 'relayB')
+
+    relayA.widgets = [
+      createPromotedWidget('wA', String(relayB.id), 'wB', hostB)
+    ]
+    relayB.widgets = [
+      createPromotedWidget('wB', String(relayA.id), 'wA', hostA)
+    ]
+
+    const result = resolveConcretePromotedWidget(hostA, String(relayA.id), 'wA')
+
+    expect(result).toEqual({
+      status: 'failure',
+      failure: 'cycle'
+    })
+  })
+
+  test('does not report a cycle when different host objects share an id', () => {
+    const rootHost = createHostNode(41)
+    const nestedHost = createHostNode(41)
+    const leafNode = addNodeToHost(nestedHost, 'leaf')
+    addConcreteWidget(leafNode, 'w')
+    const sourceNode = addNodeToHost(rootHost, 'source')
+    sourceNode.widgets = [
+      createPromotedWidget('w', String(leafNode.id), 'w', nestedHost)
+    ]
+
+    const result = resolveConcretePromotedWidget(
+      rootHost,
+      String(sourceNode.id),
+      'w'
+    )
+
+    expect(result.status).toBe('resolved')
+    if (result.status !== 'resolved') return
+
+    expect(result.resolved.node.id).toBe(leafNode.id)
+    expect(result.resolved.widget.name).toBe('w')
+  })
+
+  test('returns max-depth-exceeded for very deep non-cyclic promoted chains', () => {
+    const hosts = Array.from({ length: 102 }, (_, index) =>
+      createHostNode(index + 1)
+    )
+    const relayNodes = hosts.map((host, index) =>
+      addNodeToHost(host, `relay-${index}`)
+    )
+
+    for (let index = 0; index < relayNodes.length - 1; index += 1) {
+      relayNodes[index].widgets = [
+        createPromotedWidget(
+          `w-${index}`,
+          String(relayNodes[index + 1].id),
+          `w-${index + 1}`,
+          hosts[index + 1]
+        )
+      ]
+    }
+
+    addConcreteWidget(
+      relayNodes[relayNodes.length - 1],
+      `w-${relayNodes.length - 1}`
+    )
+
+    const result = resolveConcretePromotedWidget(
+      hosts[0],
+      String(relayNodes[0].id),
+      'w-0'
+    )
+
+    expect(result).toEqual({
+      status: 'failure',
+      failure: 'max-depth-exceeded'
+    })
+  })
+
+  test('returns invalid-host for non-subgraph host node', () => {
+    const host = new LGraphNode('plain-host')
+
+    const result = resolveConcretePromotedWidget(host, 'x', 'y')
+
+    expect(result).toEqual({
+      status: 'failure',
+      failure: 'invalid-host'
+    })
+  })
+
+  test('returns missing-node when source node does not exist in host subgraph', () => {
+    const host = createHostNode(100)
+
+    const result = resolveConcretePromotedWidget(host, 'missing-node', 'seed')
+
+    expect(result).toEqual({
+      status: 'failure',
+      failure: 'missing-node'
+    })
+  })
+
+  test('returns missing-widget when source node exists but widget cannot be resolved', () => {
+    const host = createHostNode(100)
+    const sourceNode = addNodeToHost(host, 'source')
+    sourceNode.widgets = []
+
+    const result = resolveConcretePromotedWidget(
+      host,
+      String(sourceNode.id),
+      'missing-widget'
+    )
+
+    expect(result).toEqual({
+      status: 'failure',
+      failure: 'missing-widget'
+    })
+  })
+})
diff --git a/src/core/graph/subgraph/resolveConcretePromotedWidget.ts b/src/core/graph/subgraph/resolveConcretePromotedWidget.ts
new file mode 100644
index 0000000000..0a47d7bceb
--- /dev/null
+++ b/src/core/graph/subgraph/resolveConcretePromotedWidget.ts
@@ -0,0 +1,102 @@
+import type { ResolvedPromotedWidget } from '@/core/graph/subgraph/promotedWidgetTypes'
+import { isPromotedWidgetView } from '@/core/graph/subgraph/promotedWidgetTypes'
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type { SubgraphNode } from '@/lib/litegraph/src/subgraph/SubgraphNode'
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+
+type PromotedWidgetResolutionFailure =
+  | 'invalid-host'
+  | 'cycle'
+  | 'missing-node'
+  | 'missing-widget'
+  | 'max-depth-exceeded'
+
+type PromotedWidgetResolutionResult =
+  | { status: 'resolved'; resolved: ResolvedPromotedWidget }
+  | { status: 'failure'; failure: PromotedWidgetResolutionFailure }
+
+const MAX_PROMOTED_WIDGET_CHAIN_DEPTH = 100
+
+function traversePromotedWidgetChain(
+  hostNode: SubgraphNode,
+  nodeId: string,
+  widgetName: string
+): PromotedWidgetResolutionResult {
+  const visited = new Set<string>()
+  const hostUidByObject = new WeakMap<SubgraphNode, number>()
+  let nextHostUid = 0
+  let currentHost = hostNode
+  let currentNodeId = nodeId
+  let currentWidgetName = widgetName
+
+  for (let depth = 0; depth < MAX_PROMOTED_WIDGET_CHAIN_DEPTH; depth++) {
+    let hostUid = hostUidByObject.get(currentHost)
+    if (hostUid === undefined) {
+      hostUid = nextHostUid
+      nextHostUid += 1
+      hostUidByObject.set(currentHost, hostUid)
+    }
+
+    const key = `${hostUid}:${currentNodeId}:${currentWidgetName}`
+    if (visited.has(key)) {
+      return { status: 'failure', failure: 'cycle' }
+    }
+    visited.add(key)
+
+    const sourceNode = currentHost.subgraph.getNodeById(currentNodeId)
+    if (!sourceNode) {
+      return { status: 'failure', failure: 'missing-node' }
+    }
+
+    const sourceWidget = sourceNode.widgets?.find(
+      (entry) => entry.name === currentWidgetName
+    )
+    if (!sourceWidget) {
+      return { status: 'failure', failure: 'missing-widget' }
+    }
+
+    if (!isPromotedWidgetView(sourceWidget)) {
+      return {
+        status: 'resolved',
+        resolved: { node: sourceNode, widget: sourceWidget }
+      }
+    }
+
+    if (!sourceWidget.node?.isSubgraphNode()) {
+      return { status: 'failure', failure: 'missing-node' }
+    }
+
+    currentHost = sourceWidget.node
+    currentNodeId = sourceWidget.sourceNodeId
+    currentWidgetName = sourceWidget.sourceWidgetName
+  }
+
+  return { status: 'failure', failure: 'max-depth-exceeded' }
+}
+
+export function resolvePromotedWidgetAtHost(
+  hostNode: SubgraphNode,
+  nodeId: string,
+  widgetName: string
+): ResolvedPromotedWidget | undefined {
+  const node = hostNode.subgraph.getNodeById(nodeId)
+  if (!node) return undefined
+
+  const widget = node.widgets?.find(
+    (entry: IBaseWidget) => entry.name === widgetName
+  )
+  if (!widget) return undefined
+
+  return { node, widget }
+}
+
+export function resolveConcretePromotedWidget(
+  hostNode: LGraphNode,
+  nodeId: string,
+  widgetName: string
+): PromotedWidgetResolutionResult {
+  if (!hostNode.isSubgraphNode()) {
+    return { status: 'failure', failure: 'invalid-host' }
+  }
+  return traversePromotedWidgetChain(hostNode, nodeId, widgetName)
+}
diff --git a/src/core/graph/subgraph/resolvePromotedWidgetSource.ts b/src/core/graph/subgraph/resolvePromotedWidgetSource.ts
new file mode 100644
index 0000000000..2b9ff55e7e
--- /dev/null
+++ b/src/core/graph/subgraph/resolvePromotedWidgetSource.ts
@@ -0,0 +1,22 @@
+import type { ResolvedPromotedWidget } from '@/core/graph/subgraph/promotedWidgetTypes'
+import { isPromotedWidgetView } from '@/core/graph/subgraph/promotedWidgetTypes'
+import { resolveConcretePromotedWidget } from '@/core/graph/subgraph/resolveConcretePromotedWidget'
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+
+export function resolvePromotedWidgetSource(
+  hostNode: LGraphNode,
+  widget: IBaseWidget
+): ResolvedPromotedWidget | undefined {
+  if (!isPromotedWidgetView(widget)) return undefined
+  if (!hostNode.isSubgraphNode()) return undefined
+
+  const result = resolveConcretePromotedWidget(
+    hostNode,
+    widget.sourceNodeId,
+    widget.sourceWidgetName
+  )
+  if (result.status === 'resolved') return result.resolved
+
+  return undefined
+}
diff --git a/src/core/graph/subgraph/resolveSubgraphInputLink.test.ts b/src/core/graph/subgraph/resolveSubgraphInputLink.test.ts
new file mode 100644
index 0000000000..450af13ac1
--- /dev/null
+++ b/src/core/graph/subgraph/resolveSubgraphInputLink.test.ts
@@ -0,0 +1,147 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, test, vi } from 'vitest'
+
+import { resolveSubgraphInputLink } from '@/core/graph/subgraph/resolveSubgraphInputLink'
+import { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import {
+  createTestSubgraph,
+  createTestSubgraphNode
+} from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers'
+import type { Subgraph } from '@/lib/litegraph/src/subgraph/Subgraph'
+import type { SubgraphNode } from '@/lib/litegraph/src/subgraph/SubgraphNode'
+
+vi.mock('@/renderer/core/canvas/canvasStore', () => ({
+  useCanvasStore: () => ({})
+}))
+vi.mock('@/stores/domWidgetStore', () => ({
+  useDomWidgetStore: () => ({ widgetStates: new Map() })
+}))
+vi.mock('@/services/litegraphService', () => ({
+  useLitegraphService: () => ({ updatePreviews: () => ({}) })
+}))
+
+function createSubgraphSetup(inputName: string): {
+  subgraph: Subgraph
+  subgraphNode: SubgraphNode
+} {
+  const subgraph = createTestSubgraph({
+    inputs: [{ name: inputName, type: '*' }]
+  })
+  const subgraphNode = createTestSubgraphNode(subgraph, { id: 1 })
+  return { subgraph, subgraphNode }
+}
+
+function addLinkedInteriorInput(
+  subgraph: Subgraph,
+  inputName: string,
+  linkedInputName: string,
+  widgetName: string
+): {
+  node: LGraphNode
+  linkId: number
+} {
+  const inputSlot = subgraph.inputNode.slots.find(
+    (slot) => slot.name === inputName
+  )
+  if (!inputSlot) throw new Error(`Missing subgraph input slot: ${inputName}`)
+
+  const node = new LGraphNode(`Interior-${linkedInputName}`)
+  const input = node.addInput(linkedInputName, '*')
+  node.addWidget('text', widgetName, '', () => undefined)
+  input.widget = { name: widgetName }
+  subgraph.add(node)
+  inputSlot.connect(input, node)
+
+  if (input.link == null)
+    throw new Error(`Expected link to be created for input ${linkedInputName}`)
+
+  return { node, linkId: input.link }
+}
+
+beforeEach(() => {
+  setActivePinia(createTestingPinia({ stubActions: false }))
+  vi.clearAllMocks()
+})
+
+describe('resolveSubgraphInputLink', () => {
+  test('returns undefined for non-subgraph nodes', () => {
+    const node = new LGraphNode('plain-node')
+
+    const result = resolveSubgraphInputLink(node, 'missing', () => 'resolved')
+
+    expect(result).toBeUndefined()
+  })
+
+  test('returns undefined when input slot is missing', () => {
+    const { subgraphNode } = createSubgraphSetup('existing')
+
+    const result = resolveSubgraphInputLink(
+      subgraphNode,
+      'missing',
+      () => 'resolved'
+    )
+
+    expect(result).toBeUndefined()
+  })
+
+  test('skips stale links where inputNode.inputs is unavailable', () => {
+    const { subgraph, subgraphNode } = createSubgraphSetup('prompt')
+    addLinkedInteriorInput(subgraph, 'prompt', 'seed_input', 'seed')
+    const stale = addLinkedInteriorInput(
+      subgraph,
+      'prompt',
+      'stale_input',
+      'stale'
+    )
+
+    const originalGetLink = subgraph.getLink.bind(subgraph)
+    vi.spyOn(subgraph, 'getLink').mockImplementation((linkId) => {
+      if (typeof linkId !== 'number') return originalGetLink(linkId)
+      if (linkId === stale.linkId) {
+        return {
+          resolve: () => ({
+            inputNode: {
+              inputs: undefined,
+              getWidgetFromSlot: () => ({ name: 'ignored' })
+            }
+          })
+        } as unknown as ReturnType<typeof subgraph.getLink>
+      }
+
+      return originalGetLink(linkId)
+    })
+
+    const result = resolveSubgraphInputLink(
+      subgraphNode,
+      'prompt',
+      ({ targetInput }) => targetInput.name
+    )
+
+    expect(result).toBe('seed_input')
+  })
+
+  test('caches getTargetWidget result within the same callback evaluation', () => {
+    const { subgraph, subgraphNode } = createSubgraphSetup('model')
+    const linked = addLinkedInteriorInput(
+      subgraph,
+      'model',
+      'model_input',
+      'modelWidget'
+    )
+    const getWidgetFromSlot = vi.spyOn(linked.node, 'getWidgetFromSlot')
+
+    const result = resolveSubgraphInputLink(
+      subgraphNode,
+      'model',
+      ({ getTargetWidget }) => {
+        expect(getTargetWidget()?.name).toBe('modelWidget')
+        expect(getTargetWidget()?.name).toBe('modelWidget')
+        return 'ok'
+      }
+    )
+
+    expect(result).toBe('ok')
+    expect(getWidgetFromSlot).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/src/core/graph/subgraph/resolveSubgraphInputLink.ts b/src/core/graph/subgraph/resolveSubgraphInputLink.ts
new file mode 100644
index 0000000000..ab1f4f482f
--- /dev/null
+++ b/src/core/graph/subgraph/resolveSubgraphInputLink.ts
@@ -0,0 +1,55 @@
+import type { INodeInputSlot } from '@/lib/litegraph/src/interfaces'
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+
+type SubgraphInputLinkContext = {
+  inputNode: LGraphNode
+  targetInput: INodeInputSlot
+  getTargetWidget: () => ReturnType<LGraphNode['getWidgetFromSlot']>
+}
+
+export function resolveSubgraphInputLink<TResult>(
+  node: LGraphNode,
+  inputName: string,
+  resolve: (context: SubgraphInputLinkContext) => TResult | undefined
+): TResult | undefined {
+  if (!node.isSubgraphNode()) return undefined
+
+  const inputSlot = node.subgraph.inputNode.slots.find(
+    (slot) => slot.name === inputName
+  )
+  if (!inputSlot) return undefined
+
+  // Iterate from newest to oldest so the latest connection wins.
+  for (let index = inputSlot.linkIds.length - 1; index >= 0; index -= 1) {
+    const linkId = inputSlot.linkIds[index]
+    const link = node.subgraph.getLink(linkId)
+    if (!link) continue
+
+    const { inputNode } = link.resolve(node.subgraph)
+    if (!inputNode) continue
+    if (!Array.isArray(inputNode.inputs)) continue
+
+    const targetInput = inputNode.inputs.find((entry) => entry.link === linkId)
+    if (!targetInput) continue
+
+    let cachedTargetWidget:
+      | ReturnType<LGraphNode['getWidgetFromSlot']>
+      | undefined
+    let hasCachedTargetWidget = false
+
+    const resolved = resolve({
+      inputNode,
+      targetInput,
+      getTargetWidget: () => {
+        if (!hasCachedTargetWidget) {
+          cachedTargetWidget = inputNode.getWidgetFromSlot(targetInput)
+          hasCachedTargetWidget = true
+        }
+        return cachedTargetWidget
+      }
+    })
+    if (resolved !== undefined) return resolved
+  }
+
+  return undefined
+}
diff --git a/src/core/graph/subgraph/resolveSubgraphInputTarget.ts b/src/core/graph/subgraph/resolveSubgraphInputTarget.ts
new file mode 100644
index 0000000000..339933db0e
--- /dev/null
+++ b/src/core/graph/subgraph/resolveSubgraphInputTarget.ts
@@ -0,0 +1,34 @@
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+
+import { resolveSubgraphInputLink } from './resolveSubgraphInputLink'
+
+type ResolvedSubgraphInputTarget = {
+  nodeId: string
+  widgetName: string
+}
+
+export function resolveSubgraphInputTarget(
+  node: LGraphNode,
+  inputName: string
+): ResolvedSubgraphInputTarget | undefined {
+  return resolveSubgraphInputLink(
+    node,
+    inputName,
+    ({ inputNode, targetInput, getTargetWidget }) => {
+      if (inputNode.isSubgraphNode()) {
+        return {
+          nodeId: String(inputNode.id),
+          widgetName: targetInput.name
+        }
+      }
+
+      const targetWidget = getTargetWidget()
+      if (!targetWidget) return undefined
+
+      return {
+        nodeId: String(inputNode.id),
+        widgetName: targetWidget.name
+      }
+    }
+  )
+}
diff --git a/src/core/graph/subgraph/subgraphNodePromotion.test.ts b/src/core/graph/subgraph/subgraphNodePromotion.test.ts
new file mode 100644
index 0000000000..f0826b9eb2
--- /dev/null
+++ b/src/core/graph/subgraph/subgraphNodePromotion.test.ts
@@ -0,0 +1,287 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, test, vi } from 'vitest'
+
+import { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type { SubgraphNode } from '@/lib/litegraph/src/litegraph'
+import { usePromotionStore } from '@/stores/promotionStore'
+
+import {
+  createTestSubgraph,
+  createTestSubgraphNode
+} from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers'
+
+vi.mock('@/renderer/core/canvas/canvasStore', () => ({
+  useCanvasStore: () => ({})
+}))
+vi.mock('@/stores/domWidgetStore', () => ({
+  useDomWidgetStore: () => ({ widgetStates: new Map() })
+}))
+vi.mock('@/services/litegraphService', () => ({
+  useLitegraphService: () => ({ updatePreviews: () => ({}) })
+}))
+
+function setupSubgraph(
+  innerNodeCount: number = 0
+): [SubgraphNode, LGraphNode[]] {
+  const subgraph = createTestSubgraph()
+  const subgraphNode = createTestSubgraphNode(subgraph)
+  subgraphNode._internalConfigureAfterSlots()
+  const graph = subgraphNode.graph!
+  graph.add(subgraphNode)
+  const innerNodes = []
+  for (let i = 0; i < innerNodeCount; i++) {
+    const innerNode = new LGraphNode(`InnerNode${i}`)
+    subgraph.add(innerNode)
+    innerNodes.push(innerNode)
+  }
+  return [subgraphNode, innerNodes]
+}
+
+describe('Subgraph proxyWidgets', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+  })
+
+  test('Can add simple widget', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    innerNodes[0].addWidget('text', 'stringWidget', 'value', () => {})
+    usePromotionStore().setPromotions(
+      subgraphNode.rootGraph.id,
+      subgraphNode.id,
+      [{ interiorNodeId: '1', widgetName: 'stringWidget' }]
+    )
+    expect(subgraphNode.widgets.length).toBe(1)
+    expect(
+      usePromotionStore().getPromotions(
+        subgraphNode.rootGraph.id,
+        subgraphNode.id
+      )
+    ).toStrictEqual([{ interiorNodeId: '1', widgetName: 'stringWidget' }])
+  })
+  test('Can add multiple widgets with same name', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(2)
+    for (const innerNode of innerNodes)
+      innerNode.addWidget('text', 'stringWidget', 'value', () => {})
+    usePromotionStore().setPromotions(
+      subgraphNode.rootGraph.id,
+      subgraphNode.id,
+      [
+        { interiorNodeId: '1', widgetName: 'stringWidget' },
+        { interiorNodeId: '2', widgetName: 'stringWidget' }
+      ]
+    )
+    expect(subgraphNode.widgets.length).toBe(2)
+    // Both views share the widget name; they're distinguished by sourceNodeId
+    expect(subgraphNode.widgets[0].name).toBe('stringWidget')
+    expect(subgraphNode.widgets[1].name).toBe('stringWidget')
+  })
+  test('Will reflect proxyWidgets order changes', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    const store = usePromotionStore()
+    innerNodes[0].addWidget('text', 'widgetA', 'value', () => {})
+    innerNodes[0].addWidget('text', 'widgetB', 'value', () => {})
+
+    store.setPromotions(subgraphNode.rootGraph.id, subgraphNode.id, [
+      { interiorNodeId: '1', widgetName: 'widgetA' },
+      { interiorNodeId: '1', widgetName: 'widgetB' }
+    ])
+    expect(subgraphNode.widgets.length).toBe(2)
+    expect(subgraphNode.widgets[0].name).toBe('widgetA')
+    expect(subgraphNode.widgets[1].name).toBe('widgetB')
+
+    // Reorder
+    store.setPromotions(subgraphNode.rootGraph.id, subgraphNode.id, [
+      { interiorNodeId: '1', widgetName: 'widgetB' },
+      { interiorNodeId: '1', widgetName: 'widgetA' }
+    ])
+    expect(subgraphNode.widgets[0].name).toBe('widgetB')
+    expect(subgraphNode.widgets[1].name).toBe('widgetA')
+  })
+  test('Will mirror changes to value', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    innerNodes[0].addWidget('text', 'stringWidget', 'value', () => {})
+    usePromotionStore().setPromotions(
+      subgraphNode.rootGraph.id,
+      subgraphNode.id,
+      [{ interiorNodeId: '1', widgetName: 'stringWidget' }]
+    )
+    expect(subgraphNode.widgets.length).toBe(1)
+    expect(subgraphNode.widgets[0].value).toBe('value')
+    innerNodes[0].widgets![0].value = 'test'
+    expect(subgraphNode.widgets[0].value).toBe('test')
+    subgraphNode.widgets[0].value = 'test2'
+    expect(innerNodes[0].widgets![0].value).toBe('test2')
+  })
+  test('Will not modify position or sizing of existing widgets', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    innerNodes[0].addWidget('text', 'stringWidget', 'value', () => {})
+    usePromotionStore().setPromotions(
+      subgraphNode.rootGraph.id,
+      subgraphNode.id,
+      [{ interiorNodeId: '1', widgetName: 'stringWidget' }]
+    )
+    if (!innerNodes[0].widgets) throw new Error('node has no widgets')
+    innerNodes[0].widgets[0].y = 10
+    innerNodes[0].widgets[0].last_y = 11
+    innerNodes[0].widgets[0].computedHeight = 12
+    subgraphNode.widgets[0].y = 20
+    subgraphNode.widgets[0].last_y = 21
+    subgraphNode.widgets[0].computedHeight = 22
+    expect(innerNodes[0].widgets[0].y).toBe(10)
+    expect(innerNodes[0].widgets[0].last_y).toBe(11)
+    expect(innerNodes[0].widgets[0].computedHeight).toBe(12)
+  })
+  test('Renders placeholder when interior widget is detached', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    innerNodes[0].addWidget('text', 'stringWidget', 'value', () => {})
+    usePromotionStore().setPromotions(
+      subgraphNode.rootGraph.id,
+      subgraphNode.id,
+      [{ interiorNodeId: '1', widgetName: 'stringWidget' }]
+    )
+    if (!innerNodes[0].widgets) throw new Error('node has no widgets')
+
+    // View resolves the interior widget's type
+    expect(subgraphNode.widgets[0].type).toBe('text')
+
+    // Remove interior widget — view falls back to disconnected state
+    innerNodes[0].widgets.pop()
+    expect(subgraphNode.widgets[0].type).toBe('button')
+
+    // Re-add — view resolves again
+    innerNodes[0].addWidget('text', 'stringWidget', 'value', () => {})
+    expect(subgraphNode.widgets[0].type).toBe('text')
+  })
+  test('Prevents duplicate promotion', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    const store = usePromotionStore()
+    innerNodes[0].addWidget('text', 'stringWidget', 'value', () => {})
+
+    // Promote once
+    store.promote(
+      subgraphNode.rootGraph.id,
+      subgraphNode.id,
+      String(innerNodes[0].id),
+      'stringWidget'
+    )
+    expect(subgraphNode.widgets.length).toBe(1)
+    expect(
+      store.getPromotions(subgraphNode.rootGraph.id, subgraphNode.id)
+    ).toHaveLength(1)
+
+    // Try to promote again - should not create duplicate
+    store.promote(
+      subgraphNode.rootGraph.id,
+      subgraphNode.id,
+      String(innerNodes[0].id),
+      'stringWidget'
+    )
+    expect(subgraphNode.widgets.length).toBe(1)
+    expect(
+      store.getPromotions(subgraphNode.rootGraph.id, subgraphNode.id)
+    ).toHaveLength(1)
+    expect(
+      store.getPromotions(subgraphNode.rootGraph.id, subgraphNode.id)
+    ).toStrictEqual([{ interiorNodeId: '1', widgetName: 'stringWidget' }])
+  })
+
+  test('removeWidget removes from promotion list and view cache', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    const store = usePromotionStore()
+    innerNodes[0].addWidget('text', 'widgetA', 'a', () => {})
+    innerNodes[0].addWidget('text', 'widgetB', 'b', () => {})
+    store.setPromotions(subgraphNode.rootGraph.id, subgraphNode.id, [
+      { interiorNodeId: '1', widgetName: 'widgetA' },
+      { interiorNodeId: '1', widgetName: 'widgetB' }
+    ])
+    expect(subgraphNode.widgets).toHaveLength(2)
+
+    const widgetToRemove = subgraphNode.widgets[0]
+    subgraphNode.removeWidget(widgetToRemove)
+
+    expect(subgraphNode.widgets).toHaveLength(1)
+    expect(subgraphNode.widgets[0].name).toBe('widgetB')
+    expect(
+      store.getPromotions(subgraphNode.rootGraph.id, subgraphNode.id)
+    ).toStrictEqual([{ interiorNodeId: '1', widgetName: 'widgetB' }])
+  })
+
+  test('removeWidgetByName removes from promotion list', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    innerNodes[0].addWidget('text', 'widgetA', 'a', () => {})
+    innerNodes[0].addWidget('text', 'widgetB', 'b', () => {})
+    usePromotionStore().setPromotions(
+      subgraphNode.rootGraph.id,
+      subgraphNode.id,
+      [
+        { interiorNodeId: '1', widgetName: 'widgetA' },
+        { interiorNodeId: '1', widgetName: 'widgetB' }
+      ]
+    )
+
+    subgraphNode.removeWidgetByName('widgetA')
+
+    expect(subgraphNode.widgets).toHaveLength(1)
+    expect(subgraphNode.widgets[0].name).toBe('widgetB')
+  })
+
+  test('removeWidget cleans up input references', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    innerNodes[0].addWidget('text', 'stringWidget', 'value', () => {})
+    usePromotionStore().setPromotions(
+      subgraphNode.rootGraph.id,
+      subgraphNode.id,
+      [{ interiorNodeId: '1', widgetName: 'stringWidget' }]
+    )
+
+    const view = subgraphNode.widgets[0]
+    // Simulate an input referencing the widget
+    subgraphNode.addInput('stringWidget', '*')
+    const input = subgraphNode.inputs[subgraphNode.inputs.length - 1]
+    input._widget = view
+
+    subgraphNode.removeWidget(view)
+
+    expect(input._widget).toBeUndefined()
+    expect(subgraphNode.widgets).toHaveLength(0)
+  })
+
+  test('serialize does not produce widgets_values for promoted views', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    innerNodes[0].addWidget('text', 'stringWidget', 'value', () => {})
+    usePromotionStore().setPromotions(
+      subgraphNode.rootGraph.id,
+      subgraphNode.id,
+      [{ interiorNodeId: '1', widgetName: 'stringWidget' }]
+    )
+    expect(subgraphNode.widgets).toHaveLength(1)
+
+    const serialized = subgraphNode.serialize()
+
+    // SubgraphNode doesn't set serialize_widgets, so widgets_values is absent.
+    // Even if it were set, views have serialize: false and would be skipped.
+    expect(serialized.widgets_values).toBeUndefined()
+  })
+
+  test('serialize preserves proxyWidgets in properties', () => {
+    const [subgraphNode, innerNodes] = setupSubgraph(1)
+    innerNodes[0].addWidget('text', 'widgetA', 'a', () => {})
+    innerNodes[0].addWidget('text', 'widgetB', 'b', () => {})
+    usePromotionStore().setPromotions(
+      subgraphNode.rootGraph.id,
+      subgraphNode.id,
+      [
+        { interiorNodeId: '1', widgetName: 'widgetA' },
+        { interiorNodeId: '1', widgetName: 'widgetB' }
+      ]
+    )
+
+    const serialized = subgraphNode.serialize()
+
+    expect(serialized.properties?.proxyWidgets).toStrictEqual([
+      ['1', 'widgetA'],
+      ['1', 'widgetB']
+    ])
+  })
+})
diff --git a/src/core/graph/subgraph/unpromotedWidgetUtils.test.ts b/src/core/graph/subgraph/unpromotedWidgetUtils.test.ts
new file mode 100644
index 0000000000..0a4e5aeb1c
--- /dev/null
+++ b/src/core/graph/subgraph/unpromotedWidgetUtils.test.ts
@@ -0,0 +1,56 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it } from 'vitest'
+
+import { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import {
+  createTestSubgraph,
+  createTestSubgraphNode
+} from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers'
+import { usePromotionStore } from '@/stores/promotionStore'
+
+import { hasUnpromotedWidgets } from './unpromotedWidgetUtils'
+
+describe('hasUnpromotedWidgets', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+  })
+
+  it('returns true when subgraph has at least one enabled unpromoted widget', () => {
+    const subgraph = createTestSubgraph()
+    const subgraphNode = createTestSubgraphNode(subgraph)
+    const interiorNode = new LGraphNode('InnerNode')
+    subgraph.add(interiorNode)
+    interiorNode.addWidget('text', 'seed', '123', () => {})
+
+    expect(hasUnpromotedWidgets(subgraphNode)).toBe(true)
+  })
+
+  it('returns false when all enabled widgets are already promoted', () => {
+    const subgraph = createTestSubgraph()
+    const subgraphNode = createTestSubgraphNode(subgraph)
+    const interiorNode = new LGraphNode('InnerNode')
+    subgraph.add(interiorNode)
+    interiorNode.addWidget('text', 'seed', '123', () => {})
+
+    usePromotionStore().promote(
+      subgraphNode.rootGraph.id,
+      subgraphNode.id,
+      String(interiorNode.id),
+      'seed'
+    )
+
+    expect(hasUnpromotedWidgets(subgraphNode)).toBe(false)
+  })
+
+  it('ignores computed-disabled widgets', () => {
+    const subgraph = createTestSubgraph()
+    const subgraphNode = createTestSubgraphNode(subgraph)
+    const interiorNode = new LGraphNode('InnerNode')
+    subgraph.add(interiorNode)
+    const widget = interiorNode.addWidget('text', 'seed', '123', () => {})
+    widget.computedDisabled = true
+
+    expect(hasUnpromotedWidgets(subgraphNode)).toBe(false)
+  })
+})
diff --git a/src/core/graph/subgraph/unpromotedWidgetUtils.ts b/src/core/graph/subgraph/unpromotedWidgetUtils.ts
new file mode 100644
index 0000000000..990f145bb8
--- /dev/null
+++ b/src/core/graph/subgraph/unpromotedWidgetUtils.ts
@@ -0,0 +1,20 @@
+import type { SubgraphNode } from '@/lib/litegraph/src/subgraph/SubgraphNode'
+import { usePromotionStore } from '@/stores/promotionStore'
+
+export function hasUnpromotedWidgets(subgraphNode: SubgraphNode): boolean {
+  const promotionStore = usePromotionStore()
+  const { id: subgraphNodeId, rootGraph, subgraph } = subgraphNode
+
+  return subgraph.nodes.some((interiorNode) =>
+    (interiorNode.widgets ?? []).some(
+      (widget) =>
+        !widget.computedDisabled &&
+        !promotionStore.isPromoted(
+          rootGraph.id,
+          subgraphNodeId,
+          String(interiorNode.id),
+          widget.name
+        )
+    )
+  )
+}
diff --git a/tests-ui/tests/widgets/dynamicCombo.test.ts b/src/core/graph/widgets/dynamicWidgets.test.ts
similarity index 88%
rename from tests-ui/tests/widgets/dynamicCombo.test.ts
rename to src/core/graph/widgets/dynamicWidgets.test.ts
index c2c4743f7a..0252691d13 100644
--- a/tests-ui/tests/widgets/dynamicCombo.test.ts
+++ b/src/core/graph/widgets/dynamicWidgets.test.ts
@@ -175,4 +175,32 @@ describe('Autogrow', () => {
     await nextTick()
     expect(node.inputs.length).toBe(5)
   })
+  test('Can deserialize a complex node', async () => {
+    const graph = new LGraph()
+    const node = testNode()
+    graph.add(node)
+    addAutogrow(node, { min: 1, input: inputsSpec, prefix: 'a' })
+    addAutogrow(node, { min: 1, input: inputsSpec, prefix: 'b' })
+    addNodeInput(node, { name: 'aa', isOptional: false, type: 'IMAGE' })
+
+    connectInput(node, 0, graph)
+    connectInput(node, 1, graph)
+    connectInput(node, 3, graph)
+    connectInput(node, 4, graph)
+
+    const serialized = graph.serialize()
+    graph.clear()
+    graph.configure(serialized)
+    const newNode = graph.nodes[0]!
+
+    expect(newNode.inputs.map((i) => i.name)).toStrictEqual([
+      '0.a0',
+      '0.a1',
+      '0.a2',
+      '1.b0',
+      '1.b1',
+      '1.b2',
+      'aa'
+    ])
+  })
 })
diff --git a/src/core/graph/widgets/dynamicWidgets.ts b/src/core/graph/widgets/dynamicWidgets.ts
index efef4a3982..21913dedd0 100644
--- a/src/core/graph/widgets/dynamicWidgets.ts
+++ b/src/core/graph/widgets/dynamicWidgets.ts
@@ -1,4 +1,5 @@
 import { remove } from 'es-toolkit'
+import { shallowReactive } from 'vue'
 
 import { useChainCallback } from '@/composables/functional/useChainCallback'
 import type {
@@ -94,7 +95,7 @@ function dynamicComboWidget(
     const newSpec = value ? options[value] : undefined
 
     const removedInputs = remove(node.inputs, isInGroup)
-    remove(node.widgets, isInGroup)
+    for (const widget of remove(node.widgets, isInGroup)) widget.onRemove?.()
 
     if (!newSpec) return
 
@@ -276,6 +277,7 @@ function withComfyMatchType(node: LGraphNode): asserts node is MatchTypeNode {
     ) {
       const input = this.inputs[slot]
       if (contype !== LiteGraph.INPUT || !this.graph || !input) return
+      if (app.configuringGraph) return
       const [matchKey, matchGroup] = Object.entries(
         this.comfyDynamic.matchType
       ).find(([, group]) => input.name in group) ?? ['', undefined]
@@ -341,10 +343,18 @@ function applyMatchType(node: LGraphNode, inputSpec: InputSpecV2) {
   //TODO: instead apply on output add?
   //ensure outputs get updated
   const index = node.inputs.length - 1
-  const input = node.inputs.at(-1)!
-  requestAnimationFrame(() =>
-    node.onConnectionsChange(LiteGraph.INPUT, index, false, undefined, input)
-  )
+  requestAnimationFrame(() => {
+    const input = node.inputs[index]
+    if (!input) return
+    node.inputs[index] = shallowReactive(input)
+    node.onConnectionsChange?.(
+      LiteGraph.INPUT,
+      index,
+      !!input.link,
+      input.link ? node.graph?.links?.[input.link] : undefined,
+      input
+    )
+  })
 }
 
 function autogrowOrdinalToName(
@@ -379,20 +389,32 @@ function addAutogrowGroup(
     ...autogrowOrdinalToName(ordinal, input.name, groupName, node)
   }))
 
-  const newInputs = namedSpecs
-    .filter(
-      (namedSpec) => !node.inputs.some((inp) => inp.name === namedSpec.name)
-    )
-    .map((namedSpec) => {
-      addNodeInput(node, namedSpec)
-      const input = spliceInputs(node, node.inputs.length - 1, 1)[0]
-      if (inputSpecs.length !== 1 || (INLINE_INPUTS && !input.widget))
-        ensureWidgetForInput(node, input)
-      return input
-    })
+  const newInputs = namedSpecs.map((namedSpec) => {
+    addNodeInput(node, namedSpec)
+    const input = spliceInputs(node, node.inputs.length - 1, 1)[0]
+    if (inputSpecs.length !== 1 || (INLINE_INPUTS && !input.widget))
+      ensureWidgetForInput(node, input)
+    return input
+  })
 
+  for (const newInput of newInputs) {
+    for (const existingInput of remove(
+      node.inputs,
+      (inp) => inp.name === newInput.name
+    )) {
+      //NOTE: link.target_slot is updated on spliceInputs call
+      newInput.link ??= existingInput.link
+    }
+  }
+
+  const targetName = autogrowOrdinalToName(
+    ordinal - 1,
+    inputSpecs.at(-1)!.name,
+    groupName,
+    node
+  ).name
   const lastIndex = node.inputs.findLastIndex((inp) =>
-    inp.name.startsWith(groupName)
+    inp.name.startsWith(targetName)
   )
   const insertionIndex = lastIndex === -1 ? node.inputs.length : lastIndex + 1
   spliceInputs(node, insertionIndex, 0, ...newInputs)
@@ -421,13 +443,14 @@ function autogrowInputConnected(index: number, node: AutogrowNode) {
   const input = node.inputs[index]
   const groupName = input.name.slice(0, input.name.lastIndexOf('.'))
   const lastInput = node.inputs.findLast((inp) =>
-    inp.name.startsWith(groupName)
+    inp.name.startsWith(groupName + '.')
   )
   const ordinal = resolveAutogrowOrdinal(input.name, groupName, node)
   if (
     !lastInput ||
     ordinal == undefined ||
-    ordinal !== resolveAutogrowOrdinal(lastInput.name, groupName, node)
+    (ordinal !== resolveAutogrowOrdinal(lastInput.name, groupName, node) &&
+      !app.configuringGraph)
   )
     return
   addAutogrowGroup(ordinal + 1, groupName, node)
@@ -447,6 +470,7 @@ function autogrowInputDisconnected(index: number, node: AutogrowNode) {
       inp.name.lastIndexOf('.') === groupName.length
   )
   const stride = inputSpecs.length
+  if (stride + index >= node.inputs.length) return
   if (groupInputs.length % stride !== 0) {
     console.error('Failed to group multi-input autogrow inputs')
     return
@@ -467,10 +491,24 @@ function autogrowInputDisconnected(index: number, node: AutogrowNode) {
       const curIndex = node.inputs.findIndex((inp) => inp === curInput)
       if (curIndex === -1) throw new Error('missing input')
       link.target_slot = curIndex
+      node.onConnectionsChange?.(
+        LiteGraph.INPUT,
+        curIndex,
+        true,
+        link,
+        curInput
+      )
     }
     const lastInput = groupInputs.at(column - stride)
     if (!lastInput) continue
     lastInput.link = null
+    node.onConnectionsChange?.(
+      LiteGraph.INPUT,
+      node.inputs.length + column - stride,
+      false,
+      null,
+      lastInput
+    )
   }
   const removalChecks = groupInputs.slice((min - 1) * stride)
   let i
@@ -482,7 +520,8 @@ function autogrowInputDisconnected(index: number, node: AutogrowNode) {
   for (const input of toRemove) {
     const widgetName = input?.widget?.name
     if (!widgetName) continue
-    remove(node.widgets, (w) => w.name === widgetName)
+    for (const widget of remove(node.widgets, (w) => w.name === widgetName))
+      widget.onRemove?.()
   }
   node.size[1] = node.computeSize([...node.size])[1]
 }
@@ -519,7 +558,7 @@ function withComfyAutogrow(node: LGraphNode): asserts node is AutogrowNode {
       if (!autogrowGroup) return
       if (app.configuringGraph && input.widget)
         ensureWidgetForInput(node, input)
-      if (iscon && linf) {
+      if (iscon) {
         if (swappingConnection || !linf) return
         autogrowInputConnected(slot, this)
       } else {
@@ -557,5 +596,6 @@ function applyAutogrow(node: LGraphNode, inputSpecV2: InputSpecV2) {
     prefix,
     inputSpecs: inputsV2
   }
-  for (let i = 0; i < min; i++) addAutogrowGroup(i, inputSpecV2.name, node)
+  for (let i = 0; i === 0 || i < min; i++)
+    addAutogrowGroup(i, inputSpecV2.name, node)
 }
diff --git a/src/core/graph/widgets/matchTypeConfiguring.test.ts b/src/core/graph/widgets/matchTypeConfiguring.test.ts
new file mode 100644
index 0000000000..45179b0f52
--- /dev/null
+++ b/src/core/graph/widgets/matchTypeConfiguring.test.ts
@@ -0,0 +1,129 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, test, vi } from 'vitest'
+
+import { LGraph, LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph'
+import { transformInputSpecV1ToV2 } from '@/schemas/nodeDef/migration'
+import { app } from '@/scripts/app'
+import { useLitegraphService } from '@/services/litegraphService'
+
+setActivePinia(createTestingPinia())
+
+const { addNodeInput } = useLitegraphService()
+
+function createMatchTypeNode(graph: LGraph) {
+  const node = new LGraphNode('switch')
+  ;(node.constructor as { nodeData: unknown }).nodeData = {
+    name: 'ComfySwitchAny',
+    output_matchtypes: ['a']
+  }
+  node.addOutput('out', '*')
+  graph.add(node)
+
+  addNodeInput(
+    node,
+    transformInputSpecV1ToV2(
+      [
+        'COMFY_MATCHTYPE_V3',
+        { template: { allowed_types: '*', template_id: 'a' } }
+      ],
+      { name: 'on_true', isOptional: false }
+    )
+  )
+  addNodeInput(
+    node,
+    transformInputSpecV1ToV2(
+      [
+        'COMFY_MATCHTYPE_V3',
+        { template: { allowed_types: '*', template_id: 'a' } }
+      ],
+      { name: 'on_false', isOptional: false }
+    )
+  )
+
+  return node
+}
+
+function createSourceNode(graph: LGraph, type: string) {
+  const node = new LGraphNode('source')
+  node.addOutput('out', type)
+  graph.add(node)
+  return node
+}
+
+describe('MatchType during configure', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  test('skips type recalculation when configuringGraph is true', () => {
+    const graph = new LGraph()
+    const switchNode = createMatchTypeNode(graph)
+    const source1 = createSourceNode(graph, 'IMAGE')
+    const source2 = createSourceNode(graph, 'IMAGE')
+
+    source1.connect(0, switchNode, 0)
+    source2.connect(0, switchNode, 1)
+
+    expect(switchNode.inputs[0].link).not.toBeNull()
+    expect(switchNode.inputs[1].link).not.toBeNull()
+
+    const link1Id = switchNode.inputs[0].link!
+    const link2Id = switchNode.inputs[1].link!
+
+    const outputTypeBefore = switchNode.outputs[0].type
+    ;(
+      app as unknown as { configuringGraphLevel: number }
+    ).configuringGraphLevel = 1
+
+    try {
+      const link1 = graph.links[link1Id]
+      switchNode.onConnectionsChange?.(
+        LiteGraph.INPUT,
+        0,
+        true,
+        link1,
+        switchNode.inputs[0]
+      )
+
+      expect(switchNode.inputs[0].link).toBe(link1Id)
+      expect(switchNode.inputs[1].link).toBe(link2Id)
+      expect(graph.links[link1Id]).toBeDefined()
+      expect(graph.links[link2Id]).toBeDefined()
+      expect(switchNode.outputs[0].type).toBe(outputTypeBefore)
+    } finally {
+      ;(
+        app as unknown as { configuringGraphLevel: number }
+      ).configuringGraphLevel = 0
+    }
+  })
+
+  test('performs type recalculation during normal operation', () => {
+    const graph = new LGraph()
+    const switchNode = createMatchTypeNode(graph)
+    const source1 = createSourceNode(graph, 'IMAGE')
+
+    expect(app.configuringGraph).toBe(false)
+
+    source1.connect(0, switchNode, 0)
+
+    expect(switchNode.inputs[0].link).not.toBeNull()
+    expect(switchNode.outputs[0].type).toBe('IMAGE')
+  })
+
+  test('connects both inputs with same type', () => {
+    const graph = new LGraph()
+    const switchNode = createMatchTypeNode(graph)
+    const source1 = createSourceNode(graph, 'IMAGE')
+    const source2 = createSourceNode(graph, 'IMAGE')
+
+    expect(app.configuringGraph).toBe(false)
+
+    source1.connect(0, switchNode, 0)
+    source2.connect(0, switchNode, 1)
+
+    expect(switchNode.inputs[0].link).not.toBeNull()
+    expect(switchNode.inputs[1].link).not.toBeNull()
+    expect(switchNode.outputs[0].type).toBe('IMAGE')
+  })
+})
diff --git a/src/core/schemas/proxyWidget.ts b/src/core/schemas/promotionSchema.ts
similarity index 89%
rename from src/core/schemas/proxyWidget.ts
rename to src/core/schemas/promotionSchema.ts
index d2df586fcb..e490da9f95 100644
--- a/src/core/schemas/proxyWidget.ts
+++ b/src/core/schemas/promotionSchema.ts
@@ -4,7 +4,7 @@ import { fromZodError } from 'zod-validation-error'
 import type { NodeProperty } from '@/lib/litegraph/src/LGraphNode'
 
 const proxyWidgetsPropertySchema = z.array(z.tuple([z.string(), z.string()]))
-export type ProxyWidgetsProperty = z.infer<typeof proxyWidgetsPropertySchema>
+type ProxyWidgetsProperty = z.infer<typeof proxyWidgetsPropertySchema>
 
 export function parseProxyWidgets(
   property: NodeProperty | undefined
diff --git a/src/extensions/core/README.md b/src/extensions/core/README.md
index aca0a935d2..2855f93459 100644
--- a/src/extensions/core/README.md
+++ b/src/extensions/core/README.md
@@ -25,4 +25,4 @@ and more.
 
 - [Extension Development Guide](/docs/extensions/development.md) - How to develop extensions
 - [Extension Documentation Index](/docs/extensions/README.md) - Overview of all extension docs
-- [ComfyExtension Interface](../../types/comfy.ts) - TypeScript interface for extensions
\ No newline at end of file
+- [ComfyExtension Interface](../../types/comfy.ts) - TypeScript interface for extensions
diff --git a/src/extensions/core/clipspace.ts b/src/extensions/core/clipspace.ts
index bc644d8d76..0f4ff0d9ef 100644
--- a/src/extensions/core/clipspace.ts
+++ b/src/extensions/core/clipspace.ts
@@ -47,8 +47,9 @@ export class ClipspaceDialog extends ComfyDialog {
     if (ClipspaceDialog.instance) {
       const self = ClipspaceDialog.instance
       // allow reconstruct controls when copying from non-image to image content.
+      const imgSettings = self.createImgSettings()
       const children = $el('div.comfy-modal-content', [
-        self.createImgSettings(),
+        ...(imgSettings ? [imgSettings] : []),
         ...self.createButtons()
       ])
 
@@ -103,7 +104,7 @@ export class ClipspaceDialog extends ComfyDialog {
     return buttons
   }
 
-  createImgSettings() {
+  createImgSettings(): HTMLTableElement | null {
     if (ComfyApp.clipspace?.imgs) {
       const combo_items = []
       const imgs = ComfyApp.clipspace.imgs
@@ -167,14 +168,14 @@ export class ClipspaceDialog extends ComfyDialog {
 
       return $el('table', {}, [row1, row2, row3])
     } else {
-      return []
+      return null
     }
   }
 
-  createImgPreview() {
+  createImgPreview(): HTMLImageElement | null {
     if (ComfyApp.clipspace?.imgs) {
       return $el('img', { id: 'clipspace_preview', ondragstart: () => false })
-    } else return []
+    } else return null
   }
 
   override show() {
@@ -186,7 +187,7 @@ export class ClipspaceDialog extends ComfyDialog {
 
 app.registerExtension({
   name: 'Comfy.Clipspace',
-  init(app) {
+  init() {
     app.openClipspace = function () {
       if (!ClipspaceDialog.instance) {
         ClipspaceDialog.instance = new ClipspaceDialog()
diff --git a/src/extensions/core/cloudBadges.ts b/src/extensions/core/cloudBadges.ts
index 45f658717a..ecf7f0f641 100644
--- a/src/extensions/core/cloudBadges.ts
+++ b/src/extensions/core/cloudBadges.ts
@@ -1,7 +1,6 @@
 import { computed } from 'vue'
 
 import { remoteConfig } from '@/platform/remoteConfig/remoteConfig'
-import { t } from '@/i18n'
 import { useExtensionService } from '@/services/extensionService'
 import type { TopbarBadge } from '@/types/comfy'
 
@@ -21,7 +20,7 @@ const badges = computed<TopbarBadge[]>(() => {
 
   // Always add cloud badge last (furthest right)
   result.push({
-    label: t('g.beta'),
+    icon: 'icon-[lucide--cloud]',
     text: 'Comfy Cloud'
   })
 
diff --git a/src/extensions/core/cloudFeedbackTopbarButton.ts b/src/extensions/core/cloudFeedbackTopbarButton.ts
index 144506d7ea..b19f057a7b 100644
--- a/src/extensions/core/cloudFeedbackTopbarButton.ts
+++ b/src/extensions/core/cloudFeedbackTopbarButton.ts
@@ -1,10 +1,17 @@
 import { t } from '@/i18n'
+import { getDistribution, ZENDESK_FIELDS } from '@/platform/support/config'
 import { useExtensionService } from '@/services/extensionService'
 import type { ActionBarButton } from '@/types/comfy'
 
-// Zendesk feedback URL - update this with the actual URL
-const ZENDESK_FEEDBACK_URL =
-  'https://support.comfy.org/hc/en-us/requests/new?ticket_form_id=43066738713236'
+const ZENDESK_BASE_URL = 'https://support.comfy.org/hc/en-us/requests/new'
+const ZENDESK_FEEDBACK_FORM_ID = '43066738713236'
+
+const distribution = getDistribution()
+const params = new URLSearchParams({
+  ticket_form_id: ZENDESK_FEEDBACK_FORM_ID,
+  [ZENDESK_FIELDS.DISTRIBUTION]: distribution
+})
+const feedbackUrl = `${ZENDESK_BASE_URL}?${params.toString()}`
 
 const buttons: ActionBarButton[] = [
   {
@@ -12,7 +19,7 @@ const buttons: ActionBarButton[] = [
     label: t('actionbar.feedback'),
     tooltip: t('actionbar.feedbackTooltip'),
     onClick: () => {
-      window.open(ZENDESK_FEEDBACK_URL, '_blank', 'noopener,noreferrer')
+      window.open(feedbackUrl, '_blank', 'noopener,noreferrer')
     }
   }
 ]
diff --git a/src/extensions/core/cloudRemoteConfig.ts b/src/extensions/core/cloudRemoteConfig.ts
index 0628800d8a..be333caf71 100644
--- a/src/extensions/core/cloudRemoteConfig.ts
+++ b/src/extensions/core/cloudRemoteConfig.ts
@@ -1,8 +1,7 @@
 import { watchDebounced } from '@vueuse/core'
 
 import { useCurrentUser } from '@/composables/auth/useCurrentUser'
-import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
-import { loadRemoteConfig } from '@/platform/remoteConfig/remoteConfig'
+import { useBillingContext } from '@/composables/billing/useBillingContext'
 import { refreshRemoteConfig } from '@/platform/remoteConfig/refreshRemoteConfig'
 import { useExtensionService } from '@/services/extensionService'
 
@@ -15,8 +14,11 @@ useExtensionService().registerExtension({
 
   setup: async () => {
     const { isLoggedIn } = useCurrentUser()
-    const { isActiveSubscription } = useSubscription()
+    const { isActiveSubscription } = useBillingContext()
 
+    // Refresh config when auth or subscription status changes
+    // Primary auth refresh is handled by WorkspaceAuthGate on mount
+    // This watcher handles subscription changes and acts as a backup for auth
     watchDebounced(
       [isLoggedIn, isActiveSubscription],
       () => {
@@ -26,7 +28,7 @@ useExtensionService().registerExtension({
       { debounce: 256, immediate: true }
     )
 
-    // Poll for config updates every 10 minutes
-    setInterval(() => void loadRemoteConfig(), 600_000)
+    // Poll for config updates every 10 minutes (with auth)
+    setInterval(() => void refreshRemoteConfig(), 600_000)
   }
 })
diff --git a/src/extensions/core/cloudSubscription.ts b/src/extensions/core/cloudSubscription.ts
index a483a6d46b..4a107d6f73 100644
--- a/src/extensions/core/cloudSubscription.ts
+++ b/src/extensions/core/cloudSubscription.ts
@@ -1,7 +1,7 @@
 import { watch } from 'vue'
 
 import { useCurrentUser } from '@/composables/auth/useCurrentUser'
-import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
+import { useBillingContext } from '@/composables/billing/useBillingContext'
 import { useExtensionService } from '@/services/extensionService'
 
 /**
@@ -12,7 +12,7 @@ useExtensionService().registerExtension({
 
   setup: async () => {
     const { isLoggedIn } = useCurrentUser()
-    const { requireActiveSubscription } = useSubscription()
+    const { requireActiveSubscription } = useBillingContext()
 
     const checkSubscriptionStatus = () => {
       if (!isLoggedIn.value) return
diff --git a/tests-ui/tests/extensions/contextMenuExtensionName.test.ts b/src/extensions/core/contextMenuFilter.name.test.ts
similarity index 83%
rename from tests-ui/tests/extensions/contextMenuExtensionName.test.ts
rename to src/extensions/core/contextMenuFilter.name.test.ts
index 1fb0b5fd5b..2ee4f6a218 100644
--- a/tests-ui/tests/extensions/contextMenuExtensionName.test.ts
+++ b/src/extensions/core/contextMenuFilter.name.test.ts
@@ -1,6 +1,10 @@
 import { describe, expect, it, vi } from 'vitest'
 
 import { legacyMenuCompat } from '@/lib/litegraph/src/contextMenuCompat'
+import type {
+  IContextMenuValue,
+  LGraphNode
+} from '@/lib/litegraph/src/litegraph'
 import { LGraphCanvas } from '@/lib/litegraph/src/litegraph'
 
 /**
@@ -18,11 +22,12 @@ describe('Context Menu Extension Name in Warnings', () => {
 
     // Extension monkey-patches the method
     const original = LGraphCanvas.prototype.getCanvasMenuOptions
-    LGraphCanvas.prototype.getCanvasMenuOptions = function (...args: any[]) {
-      const items = (original as any).apply(this, args)
-      items.push({ content: 'My Custom Menu Item', callback: () => {} })
-      return items
-    }
+    LGraphCanvas.prototype.getCanvasMenuOptions =
+      function (): (IContextMenuValue | null)[] {
+        const items = original.call(this)
+        items.push({ content: 'My Custom Menu Item', callback: () => {} })
+        return items
+      }
 
     // Clear extension (happens after setup completes)
     legacyMenuCompat.setCurrentExtension(null)
@@ -49,8 +54,8 @@ describe('Context Menu Extension Name in Warnings', () => {
 
     // Extension monkey-patches the method
     const original = LGraphCanvas.prototype.getNodeMenuOptions
-    LGraphCanvas.prototype.getNodeMenuOptions = function (...args: any[]) {
-      const items = (original as any).apply(this, args)
+    LGraphCanvas.prototype.getNodeMenuOptions = function (node: LGraphNode) {
+      const items = original.call(this, node)
       items.push({ content: 'My Node Menu Item', callback: () => {} })
       return items
     }
diff --git a/tests-ui/tests/extensions/contextMenuExtension.test.ts b/src/extensions/core/contextMenuFilter.test.ts
similarity index 92%
rename from tests-ui/tests/extensions/contextMenuExtension.test.ts
rename to src/extensions/core/contextMenuFilter.test.ts
index 5cd9d3664b..72a2d76040 100644
--- a/tests-ui/tests/extensions/contextMenuExtension.test.ts
+++ b/src/extensions/core/contextMenuFilter.test.ts
@@ -7,6 +7,10 @@ import type { LGraphCanvas, LGraphNode } from '@/lib/litegraph/src/litegraph'
 import { useExtensionService } from '@/services/extensionService'
 import { useExtensionStore } from '@/stores/extensionStore'
 import type { ComfyExtension } from '@/types/comfy'
+import {
+  createMockCanvas,
+  createMockLGraphNode
+} from '@/utils/__tests__/litegraphTestUtils'
 
 describe('Context Menu Extension API', () => {
   let mockCanvas: LGraphCanvas
@@ -35,7 +39,7 @@ describe('Context Menu Extension API', () => {
   // Mock extensions
   const createCanvasMenuExtension = (
     name: string,
-    items: IContextMenuValue[]
+    items: (IContextMenuValue | null)[]
   ): ComfyExtension => ({
     name,
     getCanvasMenuItems: () => items
@@ -54,16 +58,16 @@ describe('Context Menu Extension API', () => {
     extensionStore = useExtensionStore()
     extensionService = useExtensionService()
 
-    mockCanvas = {
+    mockCanvas = createMockCanvas({
       graph_mouse: [100, 100],
       selectedItems: new Set()
-    } as unknown as LGraphCanvas
+    })
 
-    mockNode = {
+    mockNode = createMockLGraphNode({
       id: 1,
       type: 'TestNode',
       pos: [0, 0]
-    } as unknown as LGraphNode
+    })
   })
 
   describe('collectCanvasMenuItems', () => {
@@ -79,7 +83,7 @@ describe('Context Menu Extension API', () => {
 
       const items: IContextMenuValue[] = extensionService
         .invokeExtensions('getCanvasMenuItems', mockCanvas)
-        .flat()
+        .flat() as IContextMenuValue[]
 
       expect(items).toHaveLength(3)
       expect(items[0]).toMatchObject({ content: 'Canvas Item 1' })
@@ -99,7 +103,7 @@ describe('Context Menu Extension API', () => {
             ]
           }
         },
-        null as unknown as IContextMenuValue,
+        null,
         { content: 'After Separator', callback: () => {} }
       ])
 
@@ -107,7 +111,7 @@ describe('Context Menu Extension API', () => {
 
       const items: IContextMenuValue[] = extensionService
         .invokeExtensions('getCanvasMenuItems', mockCanvas)
-        .flat()
+        .flat() as IContextMenuValue[]
 
       expect(items).toHaveLength(3)
       expect(items[0].content).toBe('Menu with Submenu')
@@ -129,7 +133,7 @@ describe('Context Menu Extension API', () => {
 
       const items: IContextMenuValue[] = extensionService
         .invokeExtensions('getCanvasMenuItems', mockCanvas)
-        .flat()
+        .flat() as IContextMenuValue[]
 
       expect(items).toHaveLength(1)
       expect(items[0].content).toBe('Canvas Item 1')
@@ -146,11 +150,11 @@ describe('Context Menu Extension API', () => {
       // Collect items multiple times (simulating repeated menu opens)
       const items1: IContextMenuValue[] = extensionService
         .invokeExtensions('getCanvasMenuItems', mockCanvas)
-        .flat()
+        .flat() as IContextMenuValue[]
 
       const items2: IContextMenuValue[] = extensionService
         .invokeExtensions('getCanvasMenuItems', mockCanvas)
-        .flat()
+        .flat() as IContextMenuValue[]
 
       // Both collections should have the same items (no duplication)
       expect(items1).toHaveLength(2)
@@ -180,7 +184,7 @@ describe('Context Menu Extension API', () => {
 
       const items: IContextMenuValue[] = extensionService
         .invokeExtensions('getNodeMenuItems', mockNode)
-        .flat()
+        .flat() as IContextMenuValue[]
 
       expect(items).toHaveLength(3)
       expect(items[0]).toMatchObject({ content: 'Node Item 1' })
@@ -205,7 +209,7 @@ describe('Context Menu Extension API', () => {
 
       const items: IContextMenuValue[] = extensionService
         .invokeExtensions('getNodeMenuItems', mockNode)
-        .flat()
+        .flat() as IContextMenuValue[]
 
       expect(items[0].content).toBe('Node Menu with Submenu')
       expect(items[0].submenu?.options).toHaveLength(2)
@@ -222,7 +226,7 @@ describe('Context Menu Extension API', () => {
 
       const items: IContextMenuValue[] = extensionService
         .invokeExtensions('getNodeMenuItems', mockNode)
-        .flat()
+        .flat() as IContextMenuValue[]
 
       expect(items).toHaveLength(1)
       expect(items[0].content).toBe('Node Item 1')
diff --git a/src/extensions/core/customCombo.ts b/src/extensions/core/customCombo.ts
deleted file mode 100644
index ed7356a40f..0000000000
--- a/src/extensions/core/customCombo.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import { shallowReactive } from 'vue'
-
-import { useChainCallback } from '@/composables/functional/useChainCallback'
-import type { CanvasPointerEvent } from '@/lib/litegraph/src/types/events'
-import { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
-import { LLink } from '@/lib/litegraph/src/litegraph'
-import { app } from '@/scripts/app'
-
-function applyToGraph(this: LGraphNode, extraLinks: LLink[] = []) {
-  if (!this.outputs[0].links?.length || !this.graph) return
-
-  const links = [
-    ...this.outputs[0].links.map((l) => this.graph!.links[l]),
-    ...extraLinks
-  ]
-  let v = this.widgets?.[0].value
-  // For each output link copy our value over the original widget value
-  for (const linkInfo of links) {
-    const node = this.graph?.getNodeById(linkInfo.target_id)
-    const input = node?.inputs[linkInfo.target_slot]
-    if (!input) {
-      console.warn('Unable to resolve node or input for link', linkInfo)
-      continue
-    }
-
-    const widgetName = input.widget?.name
-    if (!widgetName) {
-      console.warn('Invalid widget or widget name', input.widget)
-      continue
-    }
-
-    const widget = node.widgets?.find((w) => w.name === widgetName)
-    if (!widget) {
-      console.warn(`Unable to find widget "${widgetName}" on node [${node.id}]`)
-      continue
-    }
-
-    widget.value = v
-    widget.callback?.(
-      widget.value,
-      app.canvas,
-      node,
-      app.canvas.graph_mouse,
-      {} as CanvasPointerEvent
-    )
-  }
-}
-
-function onNodeCreated(this: LGraphNode) {
-  this.applyToGraph = useChainCallback(this.applyToGraph, applyToGraph)
-
-  const comboWidget = this.widgets![0]
-  const values = shallowReactive<string[]>([])
-  comboWidget.options.values = values
-
-  const updateCombo = () => {
-    values.splice(
-      0,
-      values.length,
-      ...this.widgets!.filter(
-        (w) => w.name.startsWith('option') && w.value
-      ).map((w) => `${w.value}`)
-    )
-    if (app.configuringGraph) return
-    if (values.includes(`${comboWidget.value}`)) return
-    comboWidget.value = values[0] ?? ''
-    comboWidget.callback?.(comboWidget.value)
-  }
-  comboWidget.callback = useChainCallback(comboWidget.callback, () =>
-    this.applyToGraph!()
-  )
-
-  function addOption(node: LGraphNode) {
-    if (!node.widgets) return
-    const newCount = node.widgets.length - 1
-    node.addWidget('string', `option${newCount}`, '', () => {})
-    const widget = node.widgets.at(-1)
-    if (!widget) return
-
-    let value = ''
-    Object.defineProperty(widget, 'value', {
-      get() {
-        return value
-      },
-      set(v) {
-        value = v
-        updateCombo()
-        if (!node.widgets) return
-        const lastWidget = node.widgets.at(-1)
-        if (lastWidget === this) {
-          if (v) addOption(node)
-          return
-        }
-        if (v || node.widgets.at(-2) !== this || lastWidget?.value) return
-        node.widgets.pop()
-        node.computeSize(node.size)
-        this.callback(v)
-      }
-    })
-  }
-  addOption(this)
-}
-
-app.registerExtension({
-  name: 'Comfy.CustomCombo',
-  beforeRegisterNodeDef(nodeType, nodeData) {
-    if (nodeData?.name !== 'CustomCombo') return
-    nodeType.prototype.onNodeCreated = useChainCallback(
-      nodeType.prototype.onNodeCreated,
-      onNodeCreated
-    )
-  }
-})
diff --git a/src/extensions/core/customWidgets.test.ts b/src/extensions/core/customWidgets.test.ts
new file mode 100644
index 0000000000..e76ce43373
--- /dev/null
+++ b/src/extensions/core/customWidgets.test.ts
@@ -0,0 +1,107 @@
+import { describe, expect, it } from 'vitest'
+
+describe('PrimitiveFloat widget type bridging', () => {
+  function createMockNodeAndWidget() {
+    const properties: Record<string, unknown> = {}
+    const options: Record<string, unknown> = {
+      min: -Infinity,
+      max: Infinity
+    }
+    const widget = { type: 'number', options, value: 0, callback: undefined }
+    return { properties, widget }
+  }
+
+  function applyFloatPropertyBridges(
+    properties: Record<string, unknown>,
+    widget: { type: string; options: Record<string, unknown> }
+  ) {
+    const DISPLAY_WIDGET_TYPES = new Set(['gradientslider', 'slider', 'knob'])
+
+    let baseType = widget.type
+    Object.defineProperty(widget, 'type', {
+      get: () => {
+        const display = properties.display as string | undefined
+        if (display && DISPLAY_WIDGET_TYPES.has(display)) return display
+        return baseType
+      },
+      set: (v: string) => {
+        baseType = v
+      }
+    })
+
+    Object.defineProperty(widget.options, 'gradient_stops', {
+      get: () => properties.gradient_stops,
+      set: (v) => {
+        properties.gradient_stops = v
+      }
+    })
+  }
+
+  it('returns base type when display property is not set', () => {
+    const { properties, widget } = createMockNodeAndWidget()
+    applyFloatPropertyBridges(properties, widget)
+
+    expect(widget.type).toBe('number')
+  })
+
+  it('returns gradientslider when display property is set', () => {
+    const { properties, widget } = createMockNodeAndWidget()
+    applyFloatPropertyBridges(properties, widget)
+
+    properties.display = 'gradientslider'
+    expect(widget.type).toBe('gradientslider')
+  })
+
+  it('returns slider when display property is slider', () => {
+    const { properties, widget } = createMockNodeAndWidget()
+    applyFloatPropertyBridges(properties, widget)
+
+    properties.display = 'slider'
+    expect(widget.type).toBe('slider')
+  })
+
+  it('returns base type for unknown display values', () => {
+    const { properties, widget } = createMockNodeAndWidget()
+    applyFloatPropertyBridges(properties, widget)
+
+    properties.display = 'unknown'
+    expect(widget.type).toBe('number')
+  })
+
+  it('bridges gradient_stops from properties to options', () => {
+    const { properties, widget } = createMockNodeAndWidget()
+    applyFloatPropertyBridges(properties, widget)
+
+    expect(widget.options.gradient_stops).toBeUndefined()
+
+    const stops = [
+      { offset: 0, color: [255, 0, 0] },
+      { offset: 1, color: [0, 0, 255] }
+    ]
+    properties.gradient_stops = stops
+    expect(widget.options.gradient_stops).toBe(stops)
+  })
+
+  it('writes gradient_stops back to properties', () => {
+    const { properties, widget } = createMockNodeAndWidget()
+    applyFloatPropertyBridges(properties, widget)
+
+    const stops = [
+      { offset: 0, color: [0, 0, 0] },
+      { offset: 1, color: [255, 255, 255] }
+    ]
+    widget.options.gradient_stops = stops
+    expect(properties.gradient_stops).toBe(stops)
+  })
+
+  it('allows type to be set and overridden', () => {
+    const { properties, widget } = createMockNodeAndWidget()
+    applyFloatPropertyBridges(properties, widget)
+
+    widget.type = 'slider'
+    expect(widget.type).toBe('slider')
+
+    properties.display = 'gradientslider'
+    expect(widget.type).toBe('gradientslider')
+  })
+})
diff --git a/src/extensions/core/customWidgets.ts b/src/extensions/core/customWidgets.ts
new file mode 100644
index 0000000000..3f19322801
--- /dev/null
+++ b/src/extensions/core/customWidgets.ts
@@ -0,0 +1,240 @@
+import { shallowReactive } from 'vue'
+
+import { useChainCallback } from '@/composables/functional/useChainCallback'
+import type { CanvasPointerEvent } from '@/lib/litegraph/src/types/events'
+import { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
+import { LLink } from '@/lib/litegraph/src/litegraph'
+import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'
+import { app } from '@/scripts/app'
+import { useWidgetValueStore } from '@/stores/widgetValueStore'
+
+function applyToGraph(this: LGraphNode, extraLinks: LLink[] = []) {
+  if (!this.outputs[0].links?.length || !this.graph) return
+
+  const links = [
+    ...this.outputs[0].links.map((l) => this.graph!.links[l]),
+    ...extraLinks
+  ]
+  let v = this.widgets?.[0].value
+  // For each output link copy our value over the original widget value
+  for (const linkInfo of links) {
+    const node = this.graph?.getNodeById(linkInfo.target_id)
+    const input = node?.inputs[linkInfo.target_slot]
+    if (!input) {
+      console.warn('Unable to resolve node or input for link', linkInfo)
+      continue
+    }
+
+    const widgetName = input.widget?.name
+    if (!widgetName) {
+      console.warn('Invalid widget or widget name', input.widget)
+      continue
+    }
+
+    const widget = node.widgets?.find((w) => w.name === widgetName)
+    if (!widget) {
+      console.warn(`Unable to find widget "${widgetName}" on node [${node.id}]`)
+      continue
+    }
+
+    widget.value = v
+    widget.callback?.(
+      widget.value,
+      app.canvas,
+      node,
+      app.canvas.graph_mouse,
+      {} as CanvasPointerEvent
+    )
+  }
+}
+
+function onCustomComboCreated(this: LGraphNode) {
+  this.applyToGraph = applyToGraph
+
+  const comboWidget = this.widgets![0]
+  const values = shallowReactive<string[]>([])
+  comboWidget.options.values = values
+
+  const updateCombo = () => {
+    values.splice(
+      0,
+      values.length,
+      ...this.widgets!.filter(
+        (w) => w.name.startsWith('option') && w.value
+      ).map((w) => `${w.value}`)
+    )
+    if (app.configuringGraph) return
+    if (values.includes(`${comboWidget.value}`)) return
+    comboWidget.value = values[0] ?? ''
+    comboWidget.callback?.(comboWidget.value)
+  }
+  comboWidget.callback = useChainCallback(comboWidget.callback, () =>
+    this.applyToGraph!()
+  )
+
+  function addOption(node: LGraphNode) {
+    if (!node.widgets) return
+    const newCount = node.widgets.length - 1
+    const widgetName = `option${newCount}`
+    const widget = node.addWidget('string', widgetName, '', () => {})
+    if (!widget) return
+
+    Object.defineProperty(widget, 'value', {
+      get() {
+        return useWidgetValueStore().getWidget(
+          app.rootGraph.id,
+          node.id,
+          widgetName
+        )?.value
+      },
+      set(v: string) {
+        const state = useWidgetValueStore().getWidget(
+          app.rootGraph.id,
+          node.id,
+          widgetName
+        )
+        if (state) state.value = v
+        updateCombo()
+        if (!node.widgets) return
+        const lastWidget = node.widgets.at(-1)
+        if (lastWidget === this) {
+          if (v) addOption(node)
+          return
+        }
+        if (v || node.widgets.at(-2) !== this || lastWidget?.value) return
+        node.widgets.pop()
+        node.computeSize(node.size)
+        this.callback(v)
+      }
+    })
+  }
+  const widgets = this.widgets!
+  widgets.push({
+    name: 'index',
+    type: 'hidden',
+    get value() {
+      return widgets.slice(2).findIndex((w) => w.value === comboWidget.value)
+    },
+    set value(_) {},
+    draw: () => undefined,
+    computeSize: () => [0, -4],
+    options: { hidden: true },
+    y: 0
+  })
+  addOption(this)
+}
+
+function onCustomIntCreated(this: LGraphNode) {
+  const valueWidget = this.widgets?.[0]
+  if (!valueWidget) return
+
+  Object.defineProperty(valueWidget.options, 'min', {
+    get: () => this.properties.min ?? -(2 ** 63),
+    set: (v) => {
+      this.properties.min = v
+      valueWidget.callback?.(valueWidget.value)
+    }
+  })
+  Object.defineProperty(valueWidget.options, 'max', {
+    get: () => this.properties.max ?? 2 ** 63,
+    set: (v) => {
+      this.properties.max = v
+      valueWidget.callback?.(valueWidget.value)
+    }
+  })
+  Object.defineProperty(valueWidget.options, 'step2', {
+    get: () => this.properties.step ?? 1,
+    set: (v) => {
+      this.properties.step = v
+      valueWidget.callback?.(valueWidget.value) // for vue reactivity
+    }
+  })
+}
+const DISPLAY_WIDGET_TYPES = new Set(['gradientslider', 'slider', 'knob'])
+
+function onCustomFloatCreated(this: LGraphNode) {
+  const valueWidget = this.widgets?.[0]
+  if (!valueWidget) return
+
+  let baseType = valueWidget.type
+  Object.defineProperty(valueWidget, 'type', {
+    get: () => {
+      const display = this.properties.display as string | undefined
+      if (display && DISPLAY_WIDGET_TYPES.has(display)) return display
+      return baseType
+    },
+    set: (v: string) => {
+      baseType = v
+    }
+  })
+
+  Object.defineProperty(valueWidget.options, 'gradient_stops', {
+    get: () => this.properties.gradient_stops,
+    set: (v) => {
+      this.properties.gradient_stops = v
+    }
+  })
+  Object.defineProperty(valueWidget.options, 'min', {
+    get: () => this.properties.min ?? -Infinity,
+    set: (v) => {
+      this.properties.min = v
+      valueWidget.callback?.(valueWidget.value)
+    }
+  })
+  Object.defineProperty(valueWidget.options, 'max', {
+    get: () => this.properties.max ?? Infinity,
+    set: (v) => {
+      this.properties.max = v
+      valueWidget.callback?.(valueWidget.value)
+    }
+  })
+  Object.defineProperty(valueWidget.options, 'precision', {
+    get: () => this.properties.precision ?? 1,
+    set: (v) => {
+      this.properties.precision = v
+      valueWidget.callback?.(valueWidget.value)
+    }
+  })
+  Object.defineProperty(valueWidget.options, 'step2', {
+    get: () => {
+      if (this.properties.step) return this.properties.step
+
+      const { precision } = this.properties
+      return typeof precision === 'number' ? 5 * 10 ** -precision : 1
+    },
+    set: (v) => (this.properties.step = v)
+  })
+  Object.defineProperty(valueWidget.options, 'round', {
+    get: () => {
+      if (this.properties.round) return this.properties.round
+
+      const { precision } = this.properties
+      return typeof precision === 'number' ? 10 ** -precision : 0.1
+    },
+    set: (v) => {
+      this.properties.round = v
+      valueWidget.callback?.(valueWidget.value)
+    }
+  })
+}
+
+app.registerExtension({
+  name: 'Comfy.CustomWidgets',
+  beforeRegisterNodeDef(nodeType: typeof LGraphNode, nodeData: ComfyNodeDef) {
+    if (nodeData?.name === 'CustomCombo')
+      nodeType.prototype.onNodeCreated = useChainCallback(
+        nodeType.prototype.onNodeCreated,
+        onCustomComboCreated
+      )
+    else if (nodeData?.name === 'PrimitiveInt')
+      nodeType.prototype.onNodeCreated = useChainCallback(
+        nodeType.prototype.onNodeCreated,
+        onCustomIntCreated
+      )
+    else if (nodeData?.name === 'PrimitiveFloat')
+      nodeType.prototype.onNodeCreated = useChainCallback(
+        nodeType.prototype.onNodeCreated,
+        onCustomFloatCreated
+      )
+  }
+})
diff --git a/tests-ui/tests/dynamicPrompts.test.ts b/src/extensions/core/dynamicPrompts.test.ts
similarity index 100%
rename from tests-ui/tests/dynamicPrompts.test.ts
rename to src/extensions/core/dynamicPrompts.test.ts
diff --git a/src/extensions/core/dynamicPrompts.ts b/src/extensions/core/dynamicPrompts.ts
index dabccf96bf..57ee13dd2d 100644
--- a/src/extensions/core/dynamicPrompts.ts
+++ b/src/extensions/core/dynamicPrompts.ts
@@ -1,3 +1,4 @@
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
 import { useExtensionService } from '@/services/extensionService'
 import { processDynamicPrompt } from '@/utils/formatUtil'
 
@@ -6,7 +7,7 @@ import { processDynamicPrompt } from '@/utils/formatUtil'
 
 useExtensionService().registerExtension({
   name: 'Comfy.DynamicPrompts',
-  nodeCreated(node) {
+  nodeCreated(node: LGraphNode) {
     if (node.widgets) {
       // Locate dynamic prompt text widgets
       // Include any widgets with dynamicPrompts set to true, and customtext
diff --git a/src/extensions/core/electronAdapter.ts b/src/extensions/core/electronAdapter.ts
index 9fec244148..482318b719 100644
--- a/src/extensions/core/electronAdapter.ts
+++ b/src/extensions/core/electronAdapter.ts
@@ -8,9 +8,10 @@ import { useWorkflowStore } from '@/platform/workflow/management/stores/workflow
 import { app } from '@/scripts/app'
 import { useDialogService } from '@/services/dialogService'
 import { checkMirrorReachable } from '@/utils/electronMirrorCheck'
-import { electronAPI as getElectronAPI, isElectron } from '@/utils/envUtil'
+import { isDesktop } from '@/platform/distribution/types'
+import { electronAPI as getElectronAPI } from '@/utils/envUtil'
 ;(async () => {
-  if (!isElectron()) return
+  if (!isDesktop) return
 
   const electronAPI = getElectronAPI()
   const desktopAppVersion = await electronAPI.getElectronVersion()
@@ -18,7 +19,7 @@ import { electronAPI as getElectronAPI, isElectron } from '@/utils/envUtil'
   const toastStore = useToastStore()
   const { staticUrls, buildDocsUrl } = useExternalLink()
 
-  const onChangeRestartApp = (newValue: string, oldValue: string) => {
+  const onChangeRestartApp = (newValue: unknown, oldValue: unknown) => {
     // Add a delay to allow changes to take effect before restarting.
     if (oldValue !== undefined && newValue !== oldValue) {
       electronAPI.restartApp('Restart ComfyUI to apply changes.', 1500)
diff --git a/src/extensions/core/groupNode.ts b/src/extensions/core/groupNode.ts
index cbc8d25654..aec52616c8 100644
--- a/src/extensions/core/groupNode.ts
+++ b/src/extensions/core/groupNode.ts
@@ -1,21 +1,23 @@
 import { PREFIX, SEPARATOR } from '@/constants/groupNodeConstants'
 import { t } from '@/i18n'
-import { type NodeId } from '@/lib/litegraph/src/LGraphNode'
+import type { GroupNodeWorkflowData } from '@/lib/litegraph/src/LGraph'
+import type { SerialisedLLinkArray } from '@/lib/litegraph/src/LLink'
+import type { NodeId } from '@/lib/litegraph/src/LGraphNode'
 import type { IContextMenuValue } from '@/lib/litegraph/src/interfaces'
 import {
   type ExecutableLGraphNode,
   type ExecutionId,
   LGraphNode,
+  type LGraphNodeConstructor,
   LiteGraph,
   SubgraphNode
 } from '@/lib/litegraph/src/litegraph'
 import { useToastStore } from '@/platform/updates/common/toastStore'
 import {
-  type ComfyLink,
   type ComfyNode,
   type ComfyWorkflowJSON
 } from '@/platform/workflow/validation/schemas/workflowSchema'
-import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'
+import type { ComfyNodeDef, InputSpec } from '@/schemas/nodeDefSchema'
 import { useDialogService } from '@/services/dialogService'
 import { useExecutionStore } from '@/stores/executionStore'
 import { useNodeDefStore } from '@/stores/nodeDefStore'
@@ -30,10 +32,55 @@ import { app } from '../../scripts/app'
 import { ManageGroupDialog } from './groupNodeManage'
 import { mergeIfValid } from './widgetInputs'
 
-type GroupNodeWorkflowData = {
-  external: ComfyLink[]
-  links: ComfyLink[]
-  nodes: ComfyNode[]
+type GroupNodeLink = SerialisedLLinkArray
+type LinksFromMap = Record<number, Record<number, GroupNodeLink[]>>
+type LinksToMap = Record<number, Record<number, GroupNodeLink>>
+type ExternalFromMap = Record<number, Record<number, string | number>>
+
+interface GroupNodeInput {
+  name?: string
+  type?: string
+  label?: string
+  widget?: { name: string }
+}
+
+interface GroupNodeOutput {
+  name?: string
+  type?: string
+  label?: string
+  widget?: { name: string }
+  links?: number[]
+}
+
+interface GroupNodeData extends Omit<
+  GroupNodeWorkflowData['nodes'][number],
+  'inputs' | 'outputs'
+> {
+  title?: string
+  widgets_values?: unknown[]
+  inputs?: GroupNodeInput[]
+  outputs?: GroupNodeOutput[]
+}
+
+interface GroupNodeDef {
+  input: {
+    required: Record<string, unknown>
+    optional?: Record<string, unknown>
+  }
+  output: unknown[]
+  output_name: string[]
+  output_is_list: boolean[]
+}
+
+interface NodeConfigEntry {
+  input?: Record<string, { name?: string; visible?: boolean }>
+  output?: Record<number, { name?: string; visible?: boolean }>
+}
+
+interface SerializedGroupConfig {
+  nodes: unknown[]
+  links: GroupNodeLink[]
+  external?: (number | string)[][]
 }
 
 const Workflow = {
@@ -42,11 +89,9 @@ const Workflow = {
     Registered: 1,
     InWorkflow: 2
   },
-  // @ts-expect-error fixme ts strict error
-  isInUseGroupNode(name) {
+  isInUseGroupNode(name: string) {
     const id = `${PREFIX}${SEPARATOR}${name}`
     // Check if lready registered/in use in this workflow
-    // @ts-expect-error fixme ts strict error
     if (app.rootGraph.extra?.groupNodes?.[name]) {
       if (app.rootGraph.nodes.find((n) => n.type === id)) {
         return Workflow.InUse.InWorkflow
@@ -61,15 +106,13 @@ const Workflow = {
     if (!extra) app.rootGraph.extra = extra = {}
     let groupNodes = extra.groupNodes
     if (!groupNodes) extra.groupNodes = groupNodes = {}
-    // @ts-expect-error fixme ts strict error
     groupNodes[name] = data
   }
 }
 
 class GroupNodeBuilder {
   nodes: LGraphNode[]
-  // @ts-expect-error fixme ts strict error
-  nodeData: GroupNodeWorkflowData
+  nodeData!: GroupNodeWorkflowData
 
   constructor(nodes: LGraphNode[]) {
     this.nodes = nodes
@@ -121,25 +164,25 @@ class GroupNodeBuilder {
     const nodesInOrder = app.rootGraph.computeExecutionOrder(false)
     this.nodes = this.nodes
       .map((node) => ({ index: nodesInOrder.indexOf(node), node }))
-      // @ts-expect-error id might be string
-      .sort((a, b) => a.index - b.index || a.node.id - b.node.id)
+      .sort(
+        (a, b) =>
+          a.index - b.index ||
+          String(a.node.id).localeCompare(String(b.node.id))
+      )
       .map(({ node }) => node)
   }
 
-  getNodeData() {
-    // @ts-expect-error fixme ts strict error
-    const storeLinkTypes = (config) => {
+  getNodeData(): GroupNodeWorkflowData {
+    const storeLinkTypes = (config: SerializedGroupConfig) => {
       // Store link types for dynamically typed nodes e.g. reroutes
       for (const link of config.links) {
-        const origin = app.rootGraph.getNodeById(link[4])
-        // @ts-expect-error fixme ts strict error
-        const type = origin.outputs[link[1]].type
-        link.push(type)
+        const origin = app.rootGraph.getNodeById(link[4] as NodeId)
+        const type = origin?.outputs?.[Number(link[1])]?.type
+        if (type !== undefined) link.push(type)
       }
     }
 
-    // @ts-expect-error fixme ts strict error
-    const storeExternalLinks = (config) => {
+    const storeExternalLinks = (config: SerializedGroupConfig) => {
       // Store any external links to the group in the config so when rebuilding we add extra slots
       config.external = []
       for (let i = 0; i < this.nodes.length; i++) {
@@ -161,54 +204,50 @@ class GroupNodeBuilder {
             }
           }
           if (hasExternal) {
-            config.external.push([i, slot, type])
+            config.external.push([i, slot, String(type)])
           }
         }
       }
     }
 
     // Use the built in copyToClipboard function to generate the node data we need
-    try {
-      // @ts-expect-error fixme ts strict error
-      const serialised = serialise(this.nodes, app.canvas?.graph)
-      const config = JSON.parse(serialised)
+    const graph = app.canvas?.graph
+    if (!graph) return { nodes: [], links: [], external: [] }
+    const serialised = serialise(this.nodes, graph)
+    const config = JSON.parse(serialised) as SerializedGroupConfig
+    config.external = []
 
-      storeLinkTypes(config)
-      storeExternalLinks(config)
+    storeLinkTypes(config)
+    storeExternalLinks(config)
 
-      return config
-    } finally {
-    }
+    return config as GroupNodeWorkflowData
   }
 }
 
 export class GroupNodeConfig {
   name: string
-  nodeData: any
+  nodeData: GroupNodeWorkflowData
   inputCount: number
-  oldToNewOutputMap: {}
-  newToOldOutputMap: {}
-  oldToNewInputMap: {}
-  oldToNewWidgetMap: {}
-  newToOldWidgetMap: {}
-  primitiveDefs: {}
-  widgetToPrimitive: {}
-  primitiveToWidget: {}
-  nodeInputs: {}
-  outputVisibility: any[]
-  // @ts-expect-error fixme ts strict error
-  nodeDef: ComfyNodeDef
-  // @ts-expect-error fixme ts strict error
-  inputs: any[]
-  // @ts-expect-error fixme ts strict error
-  linksFrom: {}
-  // @ts-expect-error fixme ts strict error
-  linksTo: {}
-  // @ts-expect-error fixme ts strict error
-  externalFrom: {}
+  oldToNewOutputMap: Record<number, Record<number, number>>
+  newToOldOutputMap: Record<number, { node: GroupNodeData; slot: number }>
+  oldToNewInputMap: Record<number, Record<string, number>>
+  oldToNewWidgetMap: Record<number, Record<string, string | null>>
+  newToOldWidgetMap: Record<string, { node: GroupNodeData; inputName: string }>
+  primitiveDefs: Record<number, GroupNodeDef>
+  widgetToPrimitive: Record<number, Record<string, number | number[]>>
+  primitiveToWidget: Record<
+    number,
+    { nodeId: number | string | null; inputName: string }[]
+  >
+  nodeInputs: Record<number, Record<string, string>>
+  outputVisibility: boolean[]
+  nodeDef: (ComfyNodeDef & { [GROUP]: GroupNodeConfig }) | undefined
+  inputs!: unknown[]
+  linksFrom!: LinksFromMap
+  linksTo!: LinksToMap
+  externalFrom!: ExternalFromMap
 
-  // @ts-expect-error fixme ts strict error
-  constructor(name, nodeData) {
+  constructor(name: string, nodeData: GroupNodeWorkflowData) {
     this.name = name
     this.nodeData = nodeData
     this.getLinks()
@@ -231,14 +270,12 @@ export class GroupNodeConfig {
       output: [],
       output_name: [],
       output_is_list: [],
-      // @ts-expect-error Unused, doesn't exist
-      output_is_hidden: [],
+      output_node: false, // This is a lie (to satisfy the interface)
       name: source + SEPARATOR + this.name,
       display_name: this.name,
       category: 'group nodes' + (SEPARATOR + source),
       input: { required: {} },
       description: `Group node combining ${this.nodeData.nodes
-        // @ts-expect-error fixme ts strict error
         .map((n) => n.type)
         .join(', ')}`,
       python_module: 'custom_nodes.' + this.name,
@@ -250,17 +287,16 @@ export class GroupNodeConfig {
     const seenInputs = {}
     const seenOutputs = {}
     for (let i = 0; i < this.nodeData.nodes.length; i++) {
-      const node = this.nodeData.nodes[i]
+      const node = this.nodeData.nodes[i] as GroupNodeData
       node.index = i
       this.processNode(node, seenInputs, seenOutputs)
     }
 
-    for (const p of this.#convertedToProcess) {
-      // @ts-expect-error fixme ts strict error
+    for (const p of this._convertedToProcess) {
       p()
     }
-    // @ts-expect-error fixme ts strict error
-    this.#convertedToProcess = null
+    this._convertedToProcess = []
+    if (!this.nodeDef) return
     await app.registerNodeDef(`${PREFIX}${SEPARATOR}` + this.name, this.nodeDef)
     useNodeDefStore().addNodeDef(this.nodeDef)
   }
@@ -271,50 +307,57 @@ export class GroupNodeConfig {
     this.externalFrom = {}
 
     // Extract links for easy lookup
-    for (const l of this.nodeData.links) {
-      const [sourceNodeId, sourceNodeSlot, targetNodeId, targetNodeSlot] = l
+    for (const link of this.nodeData.links) {
+      const [sourceNodeId, sourceNodeSlot, targetNodeId, targetNodeSlot] = link
 
       // Skip links outside the copy config
-      if (sourceNodeId == null) continue
+      if (
+        sourceNodeId == null ||
+        sourceNodeSlot == null ||
+        targetNodeId == null ||
+        targetNodeSlot == null
+      )
+        continue
 
-      // @ts-expect-error fixme ts strict error
-      if (!this.linksFrom[sourceNodeId]) {
-        // @ts-expect-error fixme ts strict error
-        this.linksFrom[sourceNodeId] = {}
-      }
-      // @ts-expect-error fixme ts strict error
-      if (!this.linksFrom[sourceNodeId][sourceNodeSlot]) {
-        // @ts-expect-error fixme ts strict error
-        this.linksFrom[sourceNodeId][sourceNodeSlot] = []
-      }
-      // @ts-expect-error fixme ts strict error
-      this.linksFrom[sourceNodeId][sourceNodeSlot].push(l)
+      const srcId = Number(sourceNodeId)
+      const srcSlot = Number(sourceNodeSlot)
+      const tgtId = Number(targetNodeId)
+      const tgtSlot = Number(targetNodeSlot)
 
-      // @ts-expect-error fixme ts strict error
-      if (!this.linksTo[targetNodeId]) {
-        // @ts-expect-error fixme ts strict error
-        this.linksTo[targetNodeId] = {}
+      if (!this.linksFrom[srcId]) {
+        this.linksFrom[srcId] = {}
       }
-      // @ts-expect-error fixme ts strict error
-      this.linksTo[targetNodeId][targetNodeSlot] = l
+      if (!this.linksFrom[srcId][srcSlot]) {
+        this.linksFrom[srcId][srcSlot] = []
+      }
+      this.linksFrom[srcId][srcSlot].push(link)
+
+      if (!this.linksTo[tgtId]) {
+        this.linksTo[tgtId] = {}
+      }
+      this.linksTo[tgtId][tgtSlot] = link
     }
 
     if (this.nodeData.external) {
       for (const ext of this.nodeData.external) {
-        // @ts-expect-error fixme ts strict error
-        if (!this.externalFrom[ext[0]]) {
-          // @ts-expect-error fixme ts strict error
-          this.externalFrom[ext[0]] = { [ext[1]]: ext[2] }
+        const nodeIdx = Number(ext[0])
+        const slotIdx = Number(ext[1])
+        const typeVal = ext[2]
+        if (typeVal == null) continue
+        if (!this.externalFrom[nodeIdx]) {
+          this.externalFrom[nodeIdx] = { [slotIdx]: typeVal }
         } else {
-          // @ts-expect-error fixme ts strict error
-          this.externalFrom[ext[0]][ext[1]] = ext[2]
+          this.externalFrom[nodeIdx][slotIdx] = typeVal
         }
       }
     }
   }
 
-  // @ts-expect-error fixme ts strict error
-  processNode(node, seenInputs, seenOutputs) {
+  processNode(
+    node: GroupNodeData,
+    seenInputs: Record<string, number>,
+    seenOutputs: Record<string, number>
+  ) {
     const def = this.getNodeDef(node)
     if (!def) return
 
@@ -324,32 +367,45 @@ export class GroupNodeConfig {
     if (def.output?.length) this.processNodeOutputs(node, seenOutputs, def)
   }
 
-  // @ts-expect-error fixme ts strict error
-  getNodeDef(node) {
-    // @ts-expect-error fixme ts strict error
-    const def = globalDefs[node.type]
-    if (def) return def
+  getNodeDef(
+    node: GroupNodeData | GroupNodeWorkflowData['nodes'][number]
+  ): GroupNodeDef | ComfyNodeDef | null | undefined {
+    if (node.type) {
+      const def = globalDefs[node.type]
+      if (def) return def
+    }
 
-    // @ts-expect-error fixme ts strict error
-    const linksFrom = this.linksFrom[node.index]
+    const nodeIndex = node.index
+    if (nodeIndex == null) return undefined
+
+    const linksFrom = this.linksFrom[nodeIndex]
     if (node.type === 'PrimitiveNode') {
       // Skip as its not linked
       if (!linksFrom) return
 
-      let type = linksFrom['0'][0][5]
+      let type: string | number | null = linksFrom[0]?.[0]?.[5] ?? null
       if (type === 'COMBO') {
         // Use the array items
-        const source = node.outputs[0].widget.name
-        const fromTypeName = this.nodeData.nodes[linksFrom['0'][0][2]].type
-        // @ts-expect-error fixme ts strict error
-        const fromType = globalDefs[fromTypeName]
-        const input =
-          fromType.input.required[source] ?? fromType.input.optional[source]
-        type = input[0]
+        const output = node.outputs?.[0] as GroupNodeOutput | undefined
+        const source = output?.widget?.name
+        const nodeIdx = linksFrom[0]?.[0]?.[2]
+        if (source && nodeIdx != null) {
+          const fromTypeName = this.nodeData.nodes[Number(nodeIdx)]?.type
+          if (fromTypeName) {
+            const fromType = globalDefs[fromTypeName]
+            const input =
+              fromType?.input?.required?.[source] ??
+              fromType?.input?.optional?.[source]
+            const inputType = input?.[0]
+            type =
+              typeof inputType === 'string' || typeof inputType === 'number'
+                ? inputType
+                : null
+          }
+        }
       }
 
-      // @ts-expect-error fixme ts strict error
-      const def = (this.primitiveDefs[node.index] = {
+      const def = (this.primitiveDefs[nodeIndex] = {
         input: {
           required: {
             value: [type, {}]
@@ -361,66 +417,85 @@ export class GroupNodeConfig {
       })
       return def
     } else if (node.type === 'Reroute') {
-      // @ts-expect-error fixme ts strict error
-      const linksTo = this.linksTo[node.index]
-      // @ts-expect-error fixme ts strict error
-      if (linksTo && linksFrom && !this.externalFrom[node.index]?.[0]) {
+      const linksTo = this.linksTo[nodeIndex]
+      if (linksTo && linksFrom && !this.externalFrom[nodeIndex]?.[0]) {
         // Being used internally
         return null
       }
 
-      let config = {}
+      let config: Record<string, unknown> = {}
       let rerouteType = '*'
       if (linksFrom) {
-        for (const [, , id, slot] of linksFrom['0']) {
-          const node = this.nodeData.nodes[id]
-          const input = node.inputs[slot]
-          if (rerouteType === '*') {
+        const links = linksFrom[0] ?? []
+        for (const link of links) {
+          const id = link[2]
+          const slot = link[3]
+          if (id == null || slot == null) continue
+          const targetNode = this.nodeData.nodes[Number(id)]
+          const input = targetNode?.inputs?.[Number(slot)] as
+            | GroupNodeInput
+            | undefined
+          if (input?.type && rerouteType === '*') {
             rerouteType = input.type
           }
-          if (input.widget) {
-            // @ts-expect-error fixme ts strict error
-            const targetDef = globalDefs[node.type]
+          if (input?.widget && targetNode?.type) {
+            const targetDef = globalDefs[targetNode.type]
             const targetWidget =
-              targetDef.input.required[input.widget.name] ??
-              targetDef.input.optional[input.widget.name]
+              targetDef?.input?.required?.[input.widget.name] ??
+              targetDef?.input?.optional?.[input.widget.name]
 
-            const widget = [targetWidget[0], config]
-            const res = mergeIfValid(
-              {
-                // @ts-expect-error fixme ts strict error
-                widget
-              },
-              targetWidget,
-              false,
-              null,
-              widget
-            )
-            config = res?.customConfig ?? config
+            if (targetWidget) {
+              const widgetSpec = [targetWidget[0], config] as Parameters<
+                typeof mergeIfValid
+              >[4]
+              const res = mergeIfValid(
+                { widget: widgetSpec } as unknown as Parameters<
+                  typeof mergeIfValid
+                >[0],
+                targetWidget,
+                false,
+                undefined,
+                widgetSpec
+              )
+              config = (res?.customConfig as Record<string, unknown>) ?? config
+            }
           }
         }
       } else if (linksTo) {
-        const [id, slot] = linksTo['0']
-        rerouteType = this.nodeData.nodes[id].outputs[slot].type
+        const link = linksTo[0]
+        if (link) {
+          const id = link[0]
+          const slot = link[1]
+          if (id != null && slot != null) {
+            const outputType =
+              this.nodeData.nodes[Number(id)]?.outputs?.[Number(slot)]
+            if (
+              outputType &&
+              typeof outputType === 'object' &&
+              'type' in outputType
+            ) {
+              rerouteType = String((outputType as GroupNodeOutput).type ?? '*')
+            }
+          }
+        }
       } else {
         // Reroute used as a pipe
         for (const l of this.nodeData.links) {
           if (l[2] === node.index) {
-            rerouteType = l[5]
+            const linkType = l[5]
+            if (linkType != null) rerouteType = String(linkType)
             break
           }
         }
         if (rerouteType === '*') {
           // Check for an external link
-          // @ts-expect-error fixme ts strict error
-          const t = this.externalFrom[node.index]?.[0]
+          const t = this.externalFrom[nodeIndex]?.[0]
           if (t) {
-            rerouteType = t
+            rerouteType = String(t)
           }
         }
       }
 
-      // @ts-expect-error
       config.forceInput = true
       return {
         input: {
@@ -442,12 +517,19 @@ export class GroupNodeConfig {
     )
   }
 
-  // @ts-expect-error fixme ts strict error
-  getInputConfig(node, inputName, seenInputs, config, extra?) {
-    const customConfig = this.nodeData.config?.[node.index]?.input?.[inputName]
+  getInputConfig(
+    node: GroupNodeData,
+    inputName: string,
+    seenInputs: Record<string, number>,
+    config: unknown[],
+    extra?: Record<string, unknown>
+  ) {
+    const nodeConfig = this.nodeData.config?.[node.index ?? -1] as
+      | NodeConfigEntry
+      | undefined
+    const customConfig = nodeConfig?.input?.[inputName]
     let name =
       customConfig?.name ??
-      // @ts-expect-error fixme ts strict error
       node.inputs?.find((inp) => inp.name === inputName)?.label ??
       inputName
     let key = name
@@ -468,36 +550,55 @@ export class GroupNodeConfig {
     }
     if (config[0] === 'IMAGEUPLOAD') {
       if (!extra) extra = {}
-      extra.widget =
-        // @ts-expect-error fixme ts strict error
-        this.oldToNewWidgetMap[node.index]?.[config[1]?.widget ?? 'image'] ??
-        'image'
+      const nodeIndex = node.index ?? -1
+      const configOptions =
+        typeof config[1] === 'object' && config[1] !== null ? config[1] : {}
+      const widgetKey =
+        'widget' in configOptions && typeof configOptions.widget === 'string'
+          ? configOptions.widget
+          : 'image'
+      extra.widget = this.oldToNewWidgetMap[nodeIndex]?.[widgetKey] ?? 'image'
     }
 
     if (extra) {
-      config = [config[0], { ...config[1], ...extra }]
+      const configObj =
+        typeof config[1] === 'object' && config[1] ? config[1] : {}
+      config = [config[0], { ...configObj, ...extra }]
     }
 
     return { name, config, customConfig }
   }
 
-  // @ts-expect-error fixme ts strict error
-  processWidgetInputs(inputs, node, inputNames, seenInputs) {
-    const slots = []
-    const converted = new Map()
-    // @ts-expect-error fixme ts strict error
-    const widgetMap = (this.oldToNewWidgetMap[node.index] = {})
+  processWidgetInputs(
+    inputs: Record<string, unknown>,
+    node: GroupNodeData,
+    inputNames: string[],
+    seenInputs: Record<string, number>
+  ) {
+    const slots: string[] = []
+    const converted = new Map<number, string>()
+    const nodeIndex = node.index ?? -1
+    const widgetMap: Record<string, string | null> = (this.oldToNewWidgetMap[
+      nodeIndex
+    ] = {})
     for (const inputName of inputNames) {
-      if (useWidgetStore().inputIsWidget(inputs[inputName])) {
-        const convertedIndex = node.inputs?.findIndex(
-          // @ts-expect-error fixme ts strict error
-          (inp) => inp.name === inputName && inp.widget?.name === inputName
-        )
+      const inputSpec = inputs[inputName]
+      const isValidSpec =
+        Array.isArray(inputSpec) &&
+        inputSpec.length >= 1 &&
+        typeof inputSpec[0] === 'string'
+      if (
+        isValidSpec &&
+        useWidgetStore().inputIsWidget(inputSpec as InputSpec)
+      ) {
+        const convertedIndex =
+          node.inputs?.findIndex(
+            (inp) => inp.name === inputName && inp.widget?.name === inputName
+          ) ?? -1
         if (convertedIndex > -1) {
           // This widget has been converted to a widget
           // We need to store this in the correct position so link ids line up
           converted.set(convertedIndex, inputName)
-          // @ts-expect-error fixme ts strict error
           widgetMap[inputName] = null
         } else {
           // Normal widget
@@ -505,13 +606,13 @@ export class GroupNodeConfig {
             node,
             inputName,
             seenInputs,
-            inputs[inputName]
+            inputs[inputName] as unknown[]
           )
-          // @ts-expect-error fixme ts strict error
-          this.nodeDef.input.required[name] = config
-          // @ts-expect-error fixme ts strict error
+          if (this.nodeDef?.input?.required) {
+            // @ts-expect-error legacy dynamic input assignment
+            this.nodeDef.input.required[name] = config
+          }
           widgetMap[inputName] = name
-          // @ts-expect-error fixme ts strict error
           this.newToOldWidgetMap[name] = { node, inputName }
         }
       } else {
@@ -522,61 +623,78 @@ export class GroupNodeConfig {
     return { converted, slots }
   }
 
-  // @ts-expect-error fixme ts strict error
-  checkPrimitiveConnection(link, inputName, inputs) {
-    const sourceNode = this.nodeData.nodes[link[0]]
-    if (sourceNode.type === 'PrimitiveNode') {
+  checkPrimitiveConnection(
+    link: GroupNodeLink,
+    inputName: string,
+    inputs: Record<string, unknown[]>
+  ) {
+    const linkSourceIdx = link[0]
+    if (linkSourceIdx == null) return
+    const sourceNode = this.nodeData.nodes[Number(linkSourceIdx)]
+    if (sourceNode?.type === 'PrimitiveNode') {
       // Merge link configurations
-      const [sourceNodeId, _, targetNodeId, __] = link
-      // @ts-expect-error fixme ts strict error
+      const sourceNodeId = Number(link[0])
+      const targetNodeId = Number(link[2])
       const primitiveDef = this.primitiveDefs[sourceNodeId]
+      if (!primitiveDef) return
       const targetWidget = inputs[inputName]
-      const primitiveConfig = primitiveDef.input.required.value
+      const primitiveConfig = primitiveDef.input.required.value as [
+        unknown,
+        Record<string, unknown>
+      ]
       const output = { widget: primitiveConfig }
       const config = mergeIfValid(
-        // @ts-expect-error invalid slot type
+        // @ts-expect-error slot type mismatch - legacy API
         output,
         targetWidget,
         false,
-        null,
+        undefined,
         primitiveConfig
       )
+      const inputConfig = inputs[inputName]?.[1]
       primitiveConfig[1] =
-        (config?.customConfig ?? inputs[inputName][1])
-          ? { ...inputs[inputName][1] }
+        (config?.customConfig ?? inputConfig)
+          ? { ...(typeof inputConfig === 'object' ? inputConfig : {}) }
           : {}
 
-      // @ts-expect-error fixme ts strict error
-      let name = this.oldToNewWidgetMap[sourceNodeId]['value']
-      name = name.substr(0, name.length - 6)
-      primitiveConfig[1].control_after_generate = true
-      primitiveConfig[1].control_prefix = name
+      const widgetName = this.oldToNewWidgetMap[sourceNodeId]?.['value']
+      if (widgetName) {
+        const name = widgetName.substring(0, widgetName.length - 6)
+        primitiveConfig[1].control_after_generate = true
+        primitiveConfig[1].control_prefix = name
+      }
 
-      // @ts-expect-error fixme ts strict error
       let toPrimitive = this.widgetToPrimitive[targetNodeId]
       if (!toPrimitive) {
-        // @ts-expect-error fixme ts strict error
         toPrimitive = this.widgetToPrimitive[targetNodeId] = {}
       }
-      if (toPrimitive[inputName]) {
-        toPrimitive[inputName].push(sourceNodeId)
+      const existing = toPrimitive[inputName]
+      if (Array.isArray(existing)) {
+        existing.push(sourceNodeId)
+      } else if (typeof existing === 'number') {
+        toPrimitive[inputName] = [existing, sourceNodeId]
+      } else {
+        toPrimitive[inputName] = sourceNodeId
       }
-      toPrimitive[inputName] = sourceNodeId
 
-      // @ts-expect-error fixme ts strict error
       let toWidget = this.primitiveToWidget[sourceNodeId]
       if (!toWidget) {
-        // @ts-expect-error fixme ts strict error
         toWidget = this.primitiveToWidget[sourceNodeId] = []
       }
       toWidget.push({ nodeId: targetNodeId, inputName })
     }
   }
 
-  // @ts-expect-error fixme ts strict error
-  processInputSlots(inputs, node, slots, linksTo, inputMap, seenInputs) {
-    // @ts-expect-error fixme ts strict error
-    this.nodeInputs[node.index] = {}
+  processInputSlots(
+    inputs: Record<string, unknown[]>,
+    node: GroupNodeData,
+    slots: string[],
+    linksTo: Record<number, GroupNodeLink>,
+    inputMap: Record<number, number>,
+    seenInputs: Record<string, number>
+  ) {
+    const nodeIdx = node.index ?? -1
+    this.nodeInputs[nodeIdx] = {}
     for (let i = 0; i < slots.length; i++) {
       const inputName = slots[i]
       if (linksTo[i]) {
@@ -592,31 +710,25 @@ export class GroupNodeConfig {
         inputs[inputName]
       )
 
-      // @ts-expect-error fixme ts strict error
-      this.nodeInputs[node.index][inputName] = name
+      this.nodeInputs[nodeIdx][inputName] = name
       if (customConfig?.visible === false) continue
 
-      // @ts-expect-error fixme ts strict error
-      this.nodeDef.input.required[name] = config
+      if (this.nodeDef?.input?.required) {
+        // @ts-expect-error legacy dynamic input assignment
+        this.nodeDef.input.required[name] = config
+      }
       inputMap[i] = this.inputCount++
     }
   }
 
   processConvertedWidgets(
-    // @ts-expect-error fixme ts strict error
-    inputs,
-    // @ts-expect-error fixme ts strict error
-    node,
-    // @ts-expect-error fixme ts strict error
-    slots,
-    // @ts-expect-error fixme ts strict error
-    converted,
-    // @ts-expect-error fixme ts strict error
-    linksTo,
-    // @ts-expect-error fixme ts strict error
-    inputMap,
-    // @ts-expect-error fixme ts strict error
-    seenInputs
+    inputs: Record<string, unknown>,
+    node: GroupNodeData,
+    slots: string[],
+    converted: Map<number, string>,
+    linksTo: Record<number, GroupNodeLink>,
+    inputMap: Record<number, number>,
+    seenInputs: Record<string, number>
   ) {
     // Add converted widgets sorted into their index order (ordered as they were converted) so link ids match up
     const convertedSlots = [...converted.keys()]
@@ -624,11 +736,12 @@ export class GroupNodeConfig {
       .map((k) => converted.get(k))
     for (let i = 0; i < convertedSlots.length; i++) {
       const inputName = convertedSlots[i]
+      if (!inputName) continue
       if (linksTo[slots.length + i]) {
         this.checkPrimitiveConnection(
           linksTo[slots.length + i],
           inputName,
-          inputs
+          inputs as Record<string, unknown[]>
         )
         // This input is linked so we can skip it
         continue
@@ -638,34 +751,35 @@ export class GroupNodeConfig {
         node,
         inputName,
         seenInputs,
-        inputs[inputName],
+        inputs[inputName] as unknown[],
         {
           defaultInput: true
         }
       )
 
-      // @ts-expect-error fixme ts strict error
-      this.nodeDef.input.required[name] = config
-      // @ts-expect-error fixme ts strict error
+      if (this.nodeDef?.input?.required) {
+        // @ts-expect-error legacy dynamic input assignment
+        this.nodeDef.input.required[name] = config
+      }
       this.newToOldWidgetMap[name] = { node, inputName }
 
-      // @ts-expect-error fixme ts strict error
-      if (!this.oldToNewWidgetMap[node.index]) {
-        // @ts-expect-error fixme ts strict error
-        this.oldToNewWidgetMap[node.index] = {}
+      const nodeIndex = node.index ?? -1
+      if (!this.oldToNewWidgetMap[nodeIndex]) {
+        this.oldToNewWidgetMap[nodeIndex] = {}
       }
-      // @ts-expect-error fixme ts strict error
-      this.oldToNewWidgetMap[node.index][inputName] = name
+      this.oldToNewWidgetMap[nodeIndex][inputName] = name
 
       inputMap[slots.length + i] = this.inputCount++
     }
   }
 
-  #convertedToProcess = []
-  // @ts-expect-error fixme ts strict error
-  processNodeInputs(node, seenInputs, inputs) {
-    // @ts-expect-error fixme ts strict error
-    const inputMapping = []
+  private _convertedToProcess: (() => void)[] = []
+  processNodeInputs(
+    node: GroupNodeData,
+    seenInputs: Record<string, number>,
+    inputs: Record<string, unknown>
+  ) {
+    const inputMapping: unknown[] = []
 
     const inputNames = Object.keys(inputs)
     if (!inputNames.length) return
@@ -676,15 +790,21 @@ export class GroupNodeConfig {
       inputNames,
       seenInputs
     )
-    // @ts-expect-error fixme ts strict error
-    const linksTo = this.linksTo[node.index] ?? {}
-    // @ts-expect-error fixme ts strict error
-    const inputMap = (this.oldToNewInputMap[node.index] = {})
-    this.processInputSlots(inputs, node, slots, linksTo, inputMap, seenInputs)
+    const nodeIndex = node.index ?? -1
+    const linksTo = this.linksTo[nodeIndex] ?? {}
+    const inputMap: Record<number, number> = (this.oldToNewInputMap[nodeIndex] =
+      {})
+    this.processInputSlots(
+      inputs as unknown as Record<string, unknown[]>,
+      node,
+      slots,
+      linksTo,
+      inputMap,
+      seenInputs
+    )
 
     // Converted inputs have to be processed after all other nodes as they'll be at the end of the list
-    // @ts-expect-error fixme ts strict error
-    this.#convertedToProcess.push(() =>
+    this._convertedToProcess.push(() =>
       this.processConvertedWidgets(
         inputs,
         node,
@@ -696,79 +816,91 @@ export class GroupNodeConfig {
       )
     )
 
-    // @ts-expect-error fixme ts strict error
     return inputMapping
   }
 
-  // @ts-expect-error fixme ts strict error
-  processNodeOutputs(node, seenOutputs, def) {
-    // @ts-expect-error fixme ts strict error
-    const oldToNew = (this.oldToNewOutputMap[node.index] = {})
+  processNodeOutputs(
+    node: GroupNodeData,
+    seenOutputs: Record<string, number>,
+    def: GroupNodeDef | ComfyNodeDef
+  ) {
+    const nodeIndex = node.index ?? -1
+    const oldToNew: Record<number, number> = (this.oldToNewOutputMap[
+      nodeIndex
+    ] = {})
 
+    const defOutput = def.output ?? []
     // Add outputs
-    for (let outputId = 0; outputId < def.output.length; outputId++) {
-      // @ts-expect-error fixme ts strict error
-      const linksFrom = this.linksFrom[node.index]
+    for (let outputId = 0; outputId < defOutput.length; outputId++) {
+      const linksFrom = this.linksFrom[nodeIndex]
       // If this output is linked internally we flag it to hide
       const hasLink =
-        // @ts-expect-error fixme ts strict error
-        linksFrom?.[outputId] && !this.externalFrom[node.index]?.[outputId]
-      const customConfig =
-        this.nodeData.config?.[node.index]?.output?.[outputId]
+        linksFrom?.[outputId] && !this.externalFrom[nodeIndex]?.[outputId]
+      const outputConfig = this.nodeData.config?.[node.index ?? -1] as
+        | NodeConfigEntry
+        | undefined
+      const customConfig = outputConfig?.output?.[outputId]
       const visible = customConfig?.visible ?? !hasLink
       this.outputVisibility.push(visible)
       if (!visible) {
         continue
       }
 
-      // @ts-expect-error fixme ts strict error
-      oldToNew[outputId] = this.nodeDef.output.length
-      // @ts-expect-error fixme ts strict error
-      this.newToOldOutputMap[this.nodeDef.output.length] = {
-        node,
-        slot: outputId
+      if (this.nodeDef?.output) {
+        oldToNew[outputId] = this.nodeDef.output.length
+        this.newToOldOutputMap[this.nodeDef.output.length] = {
+          node,
+          slot: outputId
+        }
+        // @ts-expect-error legacy dynamic output type assignment
+        this.nodeDef.output.push(defOutput[outputId])
+        this.nodeDef.output_is_list?.push(
+          def.output_is_list?.[outputId] ?? false
+        )
       }
-      // @ts-expect-error fixme ts strict error
-      this.nodeDef.output.push(def.output[outputId])
-      // @ts-expect-error fixme ts strict error
-      this.nodeDef.output_is_list.push(def.output_is_list[outputId])
 
-      let label = customConfig?.name
+      let label: string | undefined = customConfig?.name
       if (!label) {
-        label = def.output_name?.[outputId] ?? def.output[outputId]
-        // @ts-expect-error fixme ts strict error
-        const output = node.outputs.find((o) => o.name === label)
+        const outputVal = defOutput[outputId]
+        label =
+          def.output_name?.[outputId] ??
+          (typeof outputVal === 'string' ? outputVal : undefined)
+        const output = node.outputs?.find((o) => o.name === label)
         if (output?.label) {
           label = output.label
         }
       }
 
-      let name = label
+      let name: string = String(label ?? `output_${outputId}`)
       if (name in seenOutputs) {
         const prefix = `${node.title ?? node.type} `
-        name = `${prefix}${label}`
+        name = `${prefix}${label ?? outputId}`
         if (name in seenOutputs) {
-          name = `${prefix}${node.index} ${label}`
+          name = `${prefix}${node.index} ${label ?? outputId}`
         }
       }
       seenOutputs[name] = 1
 
-      // @ts-expect-error fixme ts strict error
-      this.nodeDef.output_name.push(name)
+      this.nodeDef?.output_name?.push(name)
     }
   }
 
-  // @ts-expect-error fixme ts strict error
-  static async registerFromWorkflow(groupNodes, missingNodeTypes) {
+  static async registerFromWorkflow(
+    groupNodes: Record<string, GroupNodeWorkflowData>,
+    missingNodeTypes: (
+      | string
+      | { type: string; hint?: string; action?: unknown }
+    )[]
+  ) {
     for (const g in groupNodes) {
       const groupData = groupNodes[g]
 
       let hasMissing = false
       for (const n of groupData.nodes) {
         // Find missing node types
-        if (!(n.type in LiteGraph.registered_node_types)) {
+        if (!n.type || !(n.type in LiteGraph.registered_node_types)) {
           missingNodeTypes.push({
-            type: n.type,
+            type: n.type ?? 'unknown',
             hint: ` (In group node '${PREFIX}${SEPARATOR}${g}')`
           })
 
@@ -776,12 +908,12 @@ export class GroupNodeConfig {
             type: `${PREFIX}${SEPARATOR}` + g,
             action: {
               text: 'Remove from workflow',
-              // @ts-expect-error fixme ts strict error
-              callback: (e) => {
+              callback: (e: MouseEvent) => {
                 delete groupNodes[g]
-                e.target.textContent = 'Removed'
-                e.target.style.pointerEvents = 'none'
-                e.target.style.opacity = 0.7
+                const target = e.target as HTMLElement
+                target.textContent = 'Removed'
+                target.style.pointerEvents = 'none'
+                target.style.opacity = '0.7'
               }
             }
           })
@@ -800,12 +932,12 @@ export class GroupNodeConfig {
 
 export class GroupNodeHandler {
   node: LGraphNode
-  groupData: any
-  innerNodes: any
+  groupData: GroupNodeConfig
+  innerNodes: LGraphNode[] | null = null
 
   constructor(node: LGraphNode) {
     this.node = node
-    this.groupData = node.constructor?.nodeData?.[GROUP]
+    this.groupData = node.constructor?.nodeData?.[GROUP] as GroupNodeConfig
 
     this.node.setInnerNodes = (innerNodes) => {
       this.innerNodes = innerNodes
@@ -820,60 +952,63 @@ export class GroupNodeHandler {
 
         for (const w of innerNode.widgets ?? []) {
           if (w.type === 'converted-widget') {
+            // @ts-expect-error legacy widget property for converted widgets
             w.serializeValue = w.origSerializeValue
           }
         }
 
         innerNode.index = innerNodeIndex
-        // @ts-expect-error fixme ts strict error
-        innerNode.getInputNode = (slot) => {
+        innerNode.getInputNode = (slot: number) => {
           // Check if this input is internal or external
-          const externalSlot =
-            this.groupData.oldToNewInputMap[innerNode.index]?.[slot]
+          const nodeIdx = innerNode.index ?? 0
+          const externalSlot = this.groupData.oldToNewInputMap[nodeIdx]?.[slot]
           if (externalSlot != null) {
             return this.node.getInputNode(externalSlot)
           }
 
           // Internal link
-          const innerLink = this.groupData.linksTo[innerNode.index]?.[slot]
+          const innerLink = this.groupData.linksTo[nodeIdx]?.[slot]
           if (!innerLink) return null
 
-          const inputNode = innerNodes[innerLink[0]]
+          const linkSrcIdx = innerLink[0]
+          if (linkSrcIdx == null) return null
+          const inputNode = innerNodes[Number(linkSrcIdx)]
           // Primitives will already apply their values
           if (inputNode.type === 'PrimitiveNode') return null
 
           return inputNode
         }
 
-        // @ts-expect-error fixme ts strict error
-        innerNode.getInputLink = (slot) => {
-          const externalSlot =
-            this.groupData.oldToNewInputMap[innerNode.index]?.[slot]
+        // @ts-expect-error returns partial link object, not full LLink
+        innerNode.getInputLink = (slot: number) => {
+          const nodeIdx = innerNode.index ?? 0
+          const externalSlot = this.groupData.oldToNewInputMap[nodeIdx]?.[slot]
           if (externalSlot != null) {
             // The inner node is connected via the group node inputs
             const linkId = this.node.inputs[externalSlot].link
-            // @ts-expect-error fixme ts strict error
-            let link = app.rootGraph.links[linkId]
+            if (linkId == null) return null
+            const existingLink = app.rootGraph.links[linkId]
+            if (!existingLink) return null
 
             // Use the outer link, but update the target to the inner node
-            link = {
-              ...link,
+            return {
+              ...existingLink,
               target_id: innerNode.id,
               target_slot: +slot
             }
-            return link
           }
 
-          let link = this.groupData.linksTo[innerNode.index]?.[slot]
-          if (!link) return null
+          const innerLink = this.groupData.linksTo[nodeIdx]?.[slot]
+          if (!innerLink) return null
+          const linkSrcIdx = innerLink[0]
+          if (linkSrcIdx == null) return null
           // Use the inner link, but update the origin node to be inner node id
-          link = {
-            origin_id: innerNodes[link[0]].id,
-            origin_slot: link[1],
+          return {
+            origin_id: innerNodes[Number(linkSrcIdx)].id,
+            origin_slot: innerLink[1],
             target_id: innerNode.id,
             target_slot: +slot
           }
-          return link
         }
       }
     }
@@ -883,7 +1018,9 @@ export class GroupNodeHandler {
       // @ts-expect-error Can this be removed?  Or replaced with: LLink.create(link.asSerialisable())
       link = { ...link }
       const output = this.groupData.newToOldOutputMap[link.origin_slot]
-      let innerNode = this.innerNodes[output.node.index]
+      if (!output || !this.innerNodes) return null
+      const nodeIdx = output.node.index ?? 0
+      let innerNode: LGraphNode | null = this.innerNodes[nodeIdx]
       let l
       while (innerNode?.type === 'Reroute') {
         l = innerNode.getInputLink(0)
@@ -894,7 +1031,11 @@ export class GroupNodeHandler {
         return null
       }
 
-      if (l && GroupNodeHandler.isGroupNode(innerNode)) {
+      if (
+        l &&
+        GroupNodeHandler.isGroupNode(innerNode) &&
+        innerNode.updateLink
+      ) {
         return innerNode.updateLink(l)
       }
 
@@ -918,20 +1059,19 @@ export class GroupNodeHandler {
       visited.add(this.node)
 
       if (!this.innerNodes) {
-        // @ts-expect-error fixme ts strict error
-        this.node.setInnerNodes(
-          // @ts-expect-error fixme ts strict error
-          this.groupData.nodeData.nodes.map((n, i) => {
+        const createdNodes = this.groupData.nodeData.nodes
+          .map((n, i) => {
+            if (!n.type) return null
             const innerNode = LiteGraph.createNode(n.type)
-            // @ts-expect-error fixme ts strict error
+            if (!innerNode) return null
+            // @ts-expect-error legacy node data format used for configure
             innerNode.configure(n)
-            // @ts-expect-error fixme ts strict error
             innerNode.id = `${this.node.id}:${i}`
-            // @ts-expect-error fixme ts strict error
             innerNode.graph = this.node.graph
             return innerNode
           })
-        )
+          .filter((n): n is LGraphNode => n !== null)
+        this.node.setInnerNodes?.(createdNodes)
       }
 
       this.updateInnerWidgets()
@@ -943,11 +1083,12 @@ export class GroupNodeHandler {
         subgraphNodePath.at(-1)
       ) ?? undefined) as SubgraphNode | undefined
 
-      for (const node of this.innerNodes) {
+      for (const node of this.innerNodes ?? []) {
         node.graph ??= this.node.graph
 
         // Create minimal DTOs rather than cloning the node
         const currentId = String(node.id)
+        // @ts-expect-error temporary id reassignment for DTO creation
         node.id = currentId.split(':').at(-1)
         const aVeryRealNode = new ExecutableGroupNodeChildDTO(
           node,
@@ -963,95 +1104,87 @@ export class GroupNodeHandler {
       return nodes
     }
 
-    // @ts-expect-error fixme ts strict error
+    // @ts-expect-error recreate returns null if creation fails
     this.node.recreate = async () => {
       const id = this.node.id
       const sz = this.node.size
-      // @ts-expect-error fixme ts strict error
-      const nodes = this.node.convertToNodes()
+      const nodes = (
+        this.node as LGraphNode & { convertToNodes?: () => LGraphNode[] }
+      ).convertToNodes?.()
+      if (!nodes) return null
 
       const groupNode = LiteGraph.createNode(this.node.type)
-      // @ts-expect-error fixme ts strict error
+      if (!groupNode) return null
       groupNode.id = id
 
       // Reuse the existing nodes for this instance
-      // @ts-expect-error fixme ts strict error
-      groupNode.setInnerNodes(nodes)
-      // @ts-expect-error fixme ts strict error
-      groupNode[GROUP].populateWidgets()
-      // @ts-expect-error fixme ts strict error
+      groupNode.setInnerNodes?.(nodes)
+      const handler = GroupNodeHandler.getHandler(groupNode)
+      handler?.populateWidgets()
       app.rootGraph.add(groupNode)
-      // @ts-expect-error fixme ts strict error
-      groupNode.setSize([
-        // @ts-expect-error fixme ts strict error
+      groupNode.setSize?.([
         Math.max(groupNode.size[0], sz[0]),
-        // @ts-expect-error fixme ts strict error
         Math.max(groupNode.size[1], sz[1])
       ])
 
       // Remove all converted nodes and relink them
       const builder = new GroupNodeBuilder(nodes)
       const nodeData = builder.getNodeData()
-      // @ts-expect-error fixme ts strict error
-      groupNode[GROUP].groupData.nodeData.links = nodeData.links
-      // @ts-expect-error fixme ts strict error
-      groupNode[GROUP].replaceNodes(nodes)
+      if (handler) {
+        handler.groupData.nodeData.links = nodeData.links
+        handler.replaceNodes(nodes)
+      }
       return groupNode
     }
-
-    // @ts-expect-error fixme ts strict error
-    this.node.convertToNodes = () => {
+    ;(
+      this.node as LGraphNode & { convertToNodes: () => LGraphNode[] }
+    ).convertToNodes = () => {
       const addInnerNodes = () => {
         // Clone the node data so we dont mutate it for other nodes
         const c = { ...this.groupData.nodeData }
         c.nodes = [...c.nodes]
-        // @ts-expect-error fixme ts strict error
-        const innerNodes = this.node.getInnerNodes()
-        let ids = []
+        // @ts-expect-error getInnerNodes called without args in legacy conversion code
+        const innerNodes = this.node.getInnerNodes?.()
+        const ids: (string | number)[] = []
         for (let i = 0; i < c.nodes.length; i++) {
-          let id = innerNodes?.[i]?.id
+          let id: string | number | undefined = innerNodes?.[i]?.id
           // Use existing IDs if they are set on the inner nodes
-          // @ts-expect-error id can be string or number
-          if (id == null || isNaN(id)) {
-            // @ts-expect-error fixme ts strict error
+          if (id == null || (typeof id === 'number' && isNaN(id))) {
             id = undefined
           } else {
             ids.push(id)
           }
+          // @ts-expect-error adding id to node copy for serialization
           c.nodes[i] = { ...c.nodes[i], id }
         }
         deserialiseAndCreate(JSON.stringify(c), app.canvas)
 
         const [x, y] = this.node.pos
-        let top
-        let left
+        let top: number | undefined
+        let left: number | undefined
         // Configure nodes with current widget data
         const selectedIds = ids.length
           ? ids
           : Object.keys(app.canvas.selected_nodes)
-        const newNodes = []
+        const newNodes: LGraphNode[] = []
         for (let i = 0; i < selectedIds.length; i++) {
           const id = selectedIds[i]
           const newNode = app.rootGraph.getNodeById(id)
-          const innerNode = innerNodes[i]
+          const innerNode = innerNodes?.[i]
+          if (!newNode) continue
           newNodes.push(newNode)
 
-          // @ts-expect-error fixme ts strict error
           if (left == null || newNode.pos[0] < left) {
-            // @ts-expect-error fixme ts strict error
             left = newNode.pos[0]
           }
-          // @ts-expect-error fixme ts strict error
           if (top == null || newNode.pos[1] < top) {
-            // @ts-expect-error fixme ts strict error
             top = newNode.pos[1]
           }
 
-          // @ts-expect-error fixme ts strict error
-          if (!newNode.widgets) continue
+          if (!newNode.widgets || !innerNode) continue
 
-          // @ts-expect-error fixme ts strict error
-          const map = this.groupData.oldToNewWidgetMap[innerNode.index]
+          // @ts-expect-error index property access on ExecutableLGraphNode
+          const map = this.groupData.oldToNewWidgetMap[innerNode.index ?? 0]
           if (map) {
             const widgets = Object.keys(map)
 
@@ -1059,37 +1192,32 @@ export class GroupNodeHandler {
               const newName = map[oldName]
               if (!newName) continue
 
-              // @ts-expect-error fixme ts strict error
-              const widgetIndex = this.node.widgets.findIndex(
-                (w) => w.name === newName
-              )
+              const widgetIndex =
+                this.node.widgets?.findIndex((w) => w.name === newName) ?? -1
               if (widgetIndex === -1) continue
 
               // Populate the main and any linked widgets
               if (innerNode.type === 'PrimitiveNode') {
-                // @ts-expect-error fixme ts strict error
                 for (let i = 0; i < newNode.widgets.length; i++) {
-                  // @ts-expect-error fixme ts strict error
-                  newNode.widgets[i].value =
-                    // @ts-expect-error fixme ts strict error
-                    this.node.widgets[widgetIndex + i].value
+                  const srcWidget = this.node.widgets?.[widgetIndex + i]
+                  if (srcWidget) {
+                    newNode.widgets[i].value = srcWidget.value
+                  }
                 }
               } else {
-                // @ts-expect-error fixme ts strict error
-                const outerWidget = this.node.widgets[widgetIndex]
-                // @ts-expect-error fixme ts strict error
+                const outerWidget = this.node.widgets?.[widgetIndex]
                 const newWidget = newNode.widgets.find(
                   (w) => w.name === oldName
                 )
-                if (!newWidget) continue
+                if (!newWidget || !outerWidget) continue
 
                 newWidget.value = outerWidget.value
-                // @ts-expect-error fixme ts strict error
-                for (let w = 0; w < outerWidget.linkedWidgets?.length; w++) {
-                  // @ts-expect-error fixme ts strict error
-                  newWidget.linkedWidgets[w].value =
-                    // @ts-expect-error fixme ts strict error
-                    outerWidget.linkedWidgets[w].value
+                const linkedWidgets = outerWidget.linkedWidgets ?? []
+                for (let w = 0; w < linkedWidgets.length; w++) {
+                  const newLinked = newWidget.linkedWidgets?.[w]
+                  if (newLinked && linkedWidgets[w]) {
+                    newLinked.value = linkedWidgets[w].value
+                  }
                 }
               }
             }
@@ -1098,23 +1226,21 @@ export class GroupNodeHandler {
 
         // Shift each node
         for (const newNode of newNodes) {
-          // @ts-expect-error fixme ts strict error
-          newNode.pos[0] -= left - x
-          // @ts-expect-error fixme ts strict error
-          newNode.pos[1] -= top - y
+          newNode.pos[0] -= (left ?? 0) - x
+          newNode.pos[1] -= (top ?? 0) - y
         }
 
         return { newNodes, selectedIds }
       }
 
-      // @ts-expect-error fixme ts strict error
-      const reconnectInputs = (selectedIds) => {
+      const reconnectInputs = (selectedIds: (string | number)[]) => {
         for (const innerNodeIndex in this.groupData.oldToNewInputMap) {
-          const id = selectedIds[innerNodeIndex]
+          const id = selectedIds[Number(innerNodeIndex)]
           const newNode = app.rootGraph.getNodeById(id)
-          const map = this.groupData.oldToNewInputMap[innerNodeIndex]
+          if (!newNode) continue
+          const map = this.groupData.oldToNewInputMap[Number(innerNodeIndex)]
           for (const innerInputId in map) {
-            const groupSlotId = map[innerInputId]
+            const groupSlotId = map[Number(innerInputId)]
             if (groupSlotId == null) continue
             const slot = node.inputs[groupSlotId]
             if (slot.link == null) continue
@@ -1122,14 +1248,12 @@ export class GroupNodeHandler {
             if (!link) continue
             //  connect this node output to the input of another node
             const originNode = app.rootGraph.getNodeById(link.origin_id)
-            // @ts-expect-error fixme ts strict error
-            originNode.connect(link.origin_slot, newNode, +innerInputId)
+            originNode?.connect(link.origin_slot, newNode, +innerInputId)
           }
         }
       }
 
-      // @ts-expect-error fixme ts strict error
-      const reconnectOutputs = (selectedIds) => {
+      const reconnectOutputs = (selectedIds: (string | number)[]) => {
         for (
           let groupOutputId = 0;
           groupOutputId < node.outputs?.length;
@@ -1140,13 +1264,16 @@ export class GroupNodeHandler {
           const links = [...output.links]
           for (const l of links) {
             const slot = this.groupData.newToOldOutputMap[groupOutputId]
+            if (!slot) continue
             const link = app.rootGraph.links[l]
+            if (!link) continue
             const targetNode = app.rootGraph.getNodeById(link.target_id)
             const newNode = app.rootGraph.getNodeById(
-              selectedIds[slot.node.index]
+              selectedIds[slot.node.index ?? 0]
             )
-            // @ts-expect-error fixme ts strict error
-            newNode.connect(slot.slot, targetNode, link.target_slot)
+            if (targetNode) {
+              newNode?.connect(slot.slot, targetNode, link.target_slot)
+            }
           }
         }
       }
@@ -1166,10 +1293,9 @@ export class GroupNodeHandler {
     }
 
     const getExtraMenuOptions = this.node.getExtraMenuOptions
-    // @ts-expect-error Should pass patched return value getExtraMenuOptions
-    this.node.getExtraMenuOptions = function (_, options) {
-      // @ts-expect-error fixme ts strict error
-      getExtraMenuOptions?.apply(this, arguments)
+    const handlerNode = this.node
+    this.node.getExtraMenuOptions = function (_canvas, options) {
+      getExtraMenuOptions?.call(this, _canvas, options)
 
       let optionIndex = options.findIndex((o) => o?.content === 'Outputs')
       if (optionIndex === -1) optionIndex = options.length
@@ -1180,10 +1306,14 @@ export class GroupNodeHandler {
         null,
         {
           content: 'Convert to nodes',
-          // @ts-expect-error
-          callback: () => {
-            // @ts-expect-error fixme ts strict error
-            return this.convertToNodes()
+          // @ts-expect-error async callback not expected by legacy menu API
+          callback: async () => {
+            const convertFn = (
+              handlerNode as LGraphNode & {
+                convertToNodes?: () => LGraphNode[]
+              }
+            ).convertToNodes
+            return convertFn?.()
           }
         },
         {
@@ -1191,13 +1321,15 @@ export class GroupNodeHandler {
           callback: () => manageGroupNodes(this.type)
         }
       )
+      // Return empty array to satisfy type signature without triggering
+      // LGraphCanvas concatenation (which only happens when length > 0)
+      return []
     }
 
     // Draw custom collapse icon to identity this as a group
     const onDrawTitleBox = this.node.onDrawTitleBox
-    this.node.onDrawTitleBox = function (ctx, height) {
-      // @ts-expect-error fixme ts strict error
-      onDrawTitleBox?.apply(this, arguments)
+    this.node.onDrawTitleBox = function (ctx, height, size, scale) {
+      onDrawTitleBox?.call(this, ctx, height, size, scale)
 
       const fill = ctx.fillStyle
       ctx.beginPath()
@@ -1219,17 +1351,19 @@ export class GroupNodeHandler {
     // Draw progress label
     const onDrawForeground = node.onDrawForeground
     const groupData = this.groupData.nodeData
-    node.onDrawForeground = function (ctx) {
-      // @ts-expect-error fixme ts strict error
-      onDrawForeground?.apply?.(this, arguments)
+    node.onDrawForeground = function (ctx, canvas, canvasElement) {
+      onDrawForeground?.call(this, ctx, canvas, canvasElement)
       const progressState = useExecutionStore().nodeProgressStates[this.id]
       if (
         progressState &&
         progressState.state === 'running' &&
         this.runningInternalNodeId !== null
       ) {
-        // @ts-expect-error fixme ts strict error
-        const n = groupData.nodes[this.runningInternalNodeId]
+        const nodeIdx =
+          typeof this.runningInternalNodeId === 'number'
+            ? this.runningInternalNodeId
+            : parseInt(String(this.runningInternalNodeId), 10)
+        const n = groupData.nodes[nodeIdx] as { title?: string; type?: string }
         if (!n) return
         const message = `Running ${n.title || n.type} (${this.runningInternalNodeId}/${groupData.nodes.length})`
         ctx.save()
@@ -1255,119 +1389,118 @@ export class GroupNodeHandler {
     // Flag this node as needing to be reset
     const onExecutionStart = this.node.onExecutionStart
     this.node.onExecutionStart = function () {
-      // @ts-expect-error fixme ts strict error
-      this.resetExecution = true
-      // @ts-expect-error fixme ts strict error
-      return onExecutionStart?.apply(this, arguments)
+      ;(this as LGraphNode & { resetExecution?: boolean }).resetExecution = true
+      return onExecutionStart?.call(this)
     }
 
-    const self = this
     const onNodeCreated = this.node.onNodeCreated
+    const handlerGroupData = this.groupData
     this.node.onNodeCreated = function () {
       if (!this.widgets) {
         return
       }
-      const config = self.groupData.nodeData.config
+      const config = handlerGroupData.nodeData.config as
+        | Record<number, NodeConfigEntry>
+        | undefined
       if (config) {
         for (const n in config) {
           const inputs = config[n]?.input
+          if (!inputs) continue
           for (const w in inputs) {
-            if (inputs[w].visible !== false) continue
-            const widgetName = self.groupData.oldToNewWidgetMap[n][w]
-            const widget = this.widgets.find((w) => w.name === widgetName)
+            if (inputs[w]?.visible !== false) continue
+            const widgetName =
+              handlerGroupData.oldToNewWidgetMap[Number(n)]?.[w]
+            const widget = this.widgets.find((wg) => wg.name === widgetName)
             if (widget) {
-              widget.type = 'hidden'
+              widget.hidden = true
               widget.computeSize = () => [0, -4]
             }
           }
         }
       }
 
-      // @ts-expect-error fixme ts strict error
-      return onNodeCreated?.apply(this, arguments)
+      return onNodeCreated?.call(this)
     }
 
-    // @ts-expect-error fixme ts strict error
-    function handleEvent(type, getId, getEvent) {
-      // @ts-expect-error fixme ts strict error
-      const handler = ({ detail }) => {
+    type EventDetail = { display_node?: string; node?: string } | string
+    const handleEvent = (
+      type: string,
+      getId: (detail: EventDetail) => string | undefined,
+      getEvent: (
+        detail: EventDetail,
+        id: string,
+        node: LGraphNode
+      ) => EventDetail
+    ) => {
+      const handler = ({ detail }: CustomEvent<EventDetail>) => {
         const id = getId(detail)
         if (!id) return
-        const node = app.rootGraph.getNodeById(id)
-        if (node) return
+        const existingNode = app.rootGraph.getNodeById(id)
+        if (existingNode) return
 
-        // @ts-expect-error fixme ts strict error
-        const innerNodeIndex = this.innerNodes?.findIndex((n) => n.id == id)
+        const innerNodeIndex =
+          this.innerNodes?.findIndex((n) => n.id == id) ?? -1
         if (innerNodeIndex > -1) {
-          // @ts-expect-error fixme ts strict error
-          this.node.runningInternalNodeId = innerNodeIndex
+          ;(
+            this.node as LGraphNode & { runningInternalNodeId?: number }
+          ).runningInternalNodeId = innerNodeIndex
           api.dispatchCustomEvent(
-            type,
-            // @ts-expect-error fixme ts strict error
-            getEvent(detail, `${this.node.id}`, this.node)
+            type as 'executing',
+            getEvent(detail, `${this.node.id}`, this.node) as string
           )
         }
       }
-      api.addEventListener(type, handler)
+      api.addEventListener(
+        type as 'executing' | 'executed',
+        handler as EventListener
+      )
       return handler
     }
 
-    const executing = handleEvent.call(
-      this,
+    const executing = handleEvent(
       'executing',
-      // @ts-expect-error fixme ts strict error
-      (d) => d,
-      // @ts-expect-error fixme ts strict error
-      (_, id) => id
+      (d) => (typeof d === 'string' ? d : undefined),
+      (_d, id) => id
     )
 
-    const executed = handleEvent.call(
-      this,
+    const executed = handleEvent(
       'executed',
-      // @ts-expect-error fixme ts strict error
-      (d) => d?.display_node || d?.node,
-      // @ts-expect-error fixme ts strict error
+      (d) => (typeof d === 'object' ? d?.display_node || d?.node : undefined),
       (d, id, node) => ({
-        ...d,
+        ...(typeof d === 'object' ? d : {}),
         node: id,
         display_node: id,
-        merge: !node.resetExecution
+        merge: !(node as LGraphNode & { resetExecution?: boolean })
+          .resetExecution
       })
     )
 
     const onRemoved = node.onRemoved
     this.node.onRemoved = function () {
-      // @ts-expect-error fixme ts strict error
-      onRemoved?.apply(this, arguments)
-      // api.removeEventListener('progress_state', progress_state)
-      api.removeEventListener('executing', executing)
-      api.removeEventListener('executed', executed)
+      onRemoved?.call(this)
+      api.removeEventListener('executing', executing as EventListener)
+      api.removeEventListener('executed', executed as EventListener)
     }
 
     this.node.refreshComboInNode = (defs) => {
       // Update combo widget options
       for (const widgetName in this.groupData.newToOldWidgetMap) {
-        // @ts-expect-error fixme ts strict error
-        const widget = this.node.widgets.find((w) => w.name === widgetName)
+        const widget = this.node.widgets?.find((w) => w.name === widgetName)
         if (widget?.type === 'combo') {
           const old = this.groupData.newToOldWidgetMap[widgetName]
+          if (!old.node.type) continue
           const def = defs[old.node.type]
           const input =
             def?.input?.required?.[old.inputName] ??
             def?.input?.optional?.[old.inputName]
           if (!input) continue
 
-          widget.options.values = input[0]
+          widget.options.values = input[0] as unknown[]
 
-          if (
-            old.inputName !== 'image' &&
-            // @ts-expect-error Widget values
-            !widget.options.values.includes(widget.value)
-          ) {
-            // @ts-expect-error fixme ts strict error
-            widget.value = widget.options.values[0]
-            // @ts-expect-error fixme ts strict error
-            widget.callback(widget.value)
+          const values = widget.options.values as unknown[]
+          if (old.inputName !== 'image' && !values.includes(widget.value)) {
+            widget.value = values[0] as typeof widget.value
+            widget.callback?.(widget.value)
           }
         }
       }
@@ -1375,22 +1508,30 @@ export class GroupNodeHandler {
   }
 
   updateInnerWidgets() {
+    if (!this.innerNodes) return
     for (const newWidgetName in this.groupData.newToOldWidgetMap) {
-      // @ts-expect-error fixme ts strict error
-      const newWidget = this.node.widgets.find((w) => w.name === newWidgetName)
+      const newWidget = this.node.widgets?.find((w) => w.name === newWidgetName)
       if (!newWidget) continue
 
       const newValue = newWidget.value
       const old = this.groupData.newToOldWidgetMap[newWidgetName]
-      let innerNode = this.innerNodes[old.node.index]
+      const nodeIdx = old.node.index ?? 0
+      const innerNode = this.innerNodes[nodeIdx]
+      if (!innerNode) continue
 
       if (innerNode.type === 'PrimitiveNode') {
+        // @ts-expect-error primitiveValue is a custom property on PrimitiveNode
         innerNode.primitiveValue = newValue
-        const primitiveLinked = this.groupData.primitiveToWidget[old.node.index]
+        const primitiveLinked = this.groupData.primitiveToWidget[nodeIdx]
         for (const linked of primitiveLinked ?? []) {
-          const node = this.innerNodes[linked.nodeId]
-          // @ts-expect-error fixme ts strict error
-          const widget = node.widgets.find((w) => w.name === linked.inputName)
+          const linkedNodeId =
+            typeof linked.nodeId === 'number'
+              ? linked.nodeId
+              : Number(linked.nodeId)
+          const linkedNode = this.innerNodes[linkedNodeId]
+          const widget = linkedNode?.widgets?.find(
+            (w) => w.name === linked.inputName
+          )
 
           if (widget) {
             widget.value = newValue
@@ -1398,15 +1539,17 @@ export class GroupNodeHandler {
         }
         continue
       } else if (innerNode.type === 'Reroute') {
-        const rerouteLinks = this.groupData.linksFrom[old.node.index]
+        const rerouteLinks = this.groupData.linksFrom[nodeIdx]
         if (rerouteLinks) {
-          for (const [_, , targetNodeId, targetSlot] of rerouteLinks['0']) {
-            const node = this.innerNodes[targetNodeId]
-            const input = node.inputs[targetSlot]
-            if (input.widget) {
-              const widget = node.widgets?.find(
-                // @ts-expect-error fixme ts strict error
-                (w) => w.name === input.widget.name
+          for (const [, , targetNodeId, targetSlot] of rerouteLinks[0] ?? []) {
+            if (targetNodeId == null || targetSlot == null) continue
+            const targetNode = this.innerNodes[Number(targetNodeId)]
+            if (!targetNode) continue
+            const input = targetNode.inputs?.[Number(targetSlot)]
+            if (input?.widget) {
+              const widgetName = input.widget.name
+              const widget = targetNode.widgets?.find(
+                (w) => w.name === widgetName
               )
               if (widget) {
                 widget.value = newValue
@@ -1416,7 +1559,6 @@ export class GroupNodeHandler {
         }
       }
 
-      // @ts-expect-error fixme ts strict error
       const widget = innerNode.widgets?.find((w) => w.name === old.inputName)
       if (widget) {
         widget.value = newValue
@@ -1424,57 +1566,73 @@ export class GroupNodeHandler {
     }
   }
 
-  // @ts-expect-error fixme ts strict error
-  populatePrimitive(_node, nodeId, oldName) {
+  populatePrimitive(
+    _node: GroupNodeData,
+    nodeId: number,
+    oldName: string
+  ): boolean {
     // Converted widget, populate primitive if linked
     const primitiveId = this.groupData.widgetToPrimitive[nodeId]?.[oldName]
-    if (primitiveId == null) return
+    if (primitiveId == null) return false
     const targetWidgetName =
-      this.groupData.oldToNewWidgetMap[primitiveId]['value']
-    // @ts-expect-error fixme ts strict error
-    const targetWidgetIndex = this.node.widgets.findIndex(
-      (w) => w.name === targetWidgetName
-    )
-    if (targetWidgetIndex > -1) {
-      const primitiveNode = this.innerNodes[primitiveId]
+      this.groupData.oldToNewWidgetMap[
+        Array.isArray(primitiveId) ? primitiveId[0] : primitiveId
+      ]?.['value']
+    if (!targetWidgetName) return false
+    const targetWidgetIndex =
+      this.node.widgets?.findIndex((w) => w.name === targetWidgetName) ?? -1
+    if (targetWidgetIndex > -1 && this.innerNodes) {
+      const primIdx = Array.isArray(primitiveId) ? primitiveId[0] : primitiveId
+      const primitiveNode = this.innerNodes[primIdx]
+      if (!primitiveNode?.widgets) return true
       let len = primitiveNode.widgets.length
       if (
         len - 1 !==
-        // @ts-expect-error fixme ts strict error
-        this.node.widgets[targetWidgetIndex].linkedWidgets?.length
+        (this.node.widgets?.[targetWidgetIndex]?.linkedWidgets?.length ?? 0)
       ) {
         // Fallback handling for if some reason the primitive has a different number of widgets
         // we dont want to overwrite random widgets, better to leave blank
         len = 1
       }
       for (let i = 0; i < len; i++) {
-        // @ts-expect-error fixme ts strict error
-        this.node.widgets[targetWidgetIndex + i].value =
-          primitiveNode.widgets[i].value
+        const targetWidget = this.node.widgets?.[targetWidgetIndex + i]
+        const srcWidget = primitiveNode.widgets[i]
+        if (targetWidget && srcWidget) {
+          targetWidget.value = srcWidget.value
+        }
       }
     }
     return true
   }
 
-  // @ts-expect-error fixme ts strict error
-  populateReroute(node, nodeId, map) {
+  populateReroute(
+    node: GroupNodeData,
+    nodeId: number,
+    map: Record<string, string | null>
+  ) {
     if (node.type !== 'Reroute') return
 
     const link = this.groupData.linksFrom[nodeId]?.[0]?.[0]
     if (!link) return
-    const [, , targetNodeId, targetNodeSlot] = link
-    const targetNode = this.groupData.nodeData.nodes[targetNodeId]
-    const inputs = targetNode.inputs
-    const targetWidget = inputs?.[targetNodeSlot]?.widget
+    const targetNodeId = link[2]
+    const targetNodeSlot = link[3]
+    if (targetNodeId == null || targetNodeSlot == null) return
+    const targetNode = this.groupData.nodeData.nodes[Number(targetNodeId)] as
+      | GroupNodeData
+      | undefined
+    const inputs = targetNode?.inputs
+    const targetWidget = (inputs as GroupNodeInput[] | undefined)?.[
+      Number(targetNodeSlot)
+    ]?.widget
     if (!targetWidget) return
 
-    const offset = inputs.length - (targetNode.widgets_values?.length ?? 0)
-    const v = targetNode.widgets_values?.[targetNodeSlot - offset]
+    const offset =
+      (inputs?.length ?? 0) - (targetNode?.widgets_values?.length ?? 0)
+    const v = targetNode?.widgets_values?.[Number(targetNodeSlot) - offset]
     if (v == null) return
 
     const widgetName = Object.values(map)[0]
-    // @ts-expect-error fixme ts strict error
-    const widget = this.node.widgets.find((w) => w.name === widgetName)
+    const widget = this.node.widgets?.find((w) => w.name === widgetName)
     if (widget) {
       widget.value = v
     }
@@ -1488,7 +1646,7 @@ export class GroupNodeHandler {
       nodeId < this.groupData.nodeData.nodes.length;
       nodeId++
     ) {
-      const node = this.groupData.nodeData.nodes[nodeId]
+      const node = this.groupData.nodeData.nodes[nodeId] as GroupNodeData
       const map = this.groupData.oldToNewWidgetMap[nodeId] ?? {}
       const widgets = Object.keys(map)
 
@@ -1512,8 +1670,7 @@ export class GroupNodeHandler {
           widgetIndex === -1
         ) {
           // Find the inner widget and shift by the number of linked widgets as they will have been removed too
-          const innerWidget = this.innerNodes[nodeId].widgets?.find(
-            // @ts-expect-error fixme ts strict error
+          const innerWidget = this.innerNodes?.[nodeId]?.widgets?.find(
             (w) => w.name === oldName
           )
           linkedShift += innerWidget?.linkedWidgets?.length ?? 0
@@ -1523,20 +1680,22 @@ export class GroupNodeHandler {
         }
 
         // Populate the main and any linked widget
-        mainWidget.value = node.widgets_values[i + linkedShift]
-        // @ts-expect-error fixme ts strict error
-        for (let w = 0; w < mainWidget.linkedWidgets?.length; w++) {
-          this.node.widgets[widgetIndex + w + 1].value =
-            node.widgets_values[i + ++linkedShift]
+        mainWidget.value = node.widgets_values?.[
+          i + linkedShift
+        ] as typeof mainWidget.value
+        const linkedWidgets = mainWidget.linkedWidgets ?? []
+        for (let w = 0; w < linkedWidgets.length; w++) {
+          this.node.widgets[widgetIndex + w + 1].value = node.widgets_values?.[
+            i + ++linkedShift
+          ] as typeof mainWidget.value
         }
       }
     }
   }
 
-  // @ts-expect-error fixme ts strict error
-  replaceNodes(nodes) {
-    let top
-    let left
+  replaceNodes(nodes: LGraphNode[]) {
+    let top: number | undefined
+    let left: number | undefined
 
     for (let i = 0; i < nodes.length; i++) {
       const node = nodes[i]
@@ -1555,11 +1714,10 @@ export class GroupNodeHandler {
     }
 
     this.linkInputs()
-    this.node.pos = [left, top]
+    this.node.pos = [left ?? 0, top ?? 0]
   }
 
-  // @ts-expect-error fixme ts strict error
-  linkOutputs(originalNode, nodeId) {
+  linkOutputs(originalNode: LGraphNode, nodeId: number) {
     if (!originalNode.outputs) return
 
     for (const output of originalNode.outputs) {
@@ -1573,8 +1731,7 @@ export class GroupNodeHandler {
         const targetNode = app.rootGraph.getNodeById(link.target_id)
         const newSlot =
           this.groupData.oldToNewOutputMap[nodeId]?.[link.origin_slot]
-        if (newSlot != null) {
-          // @ts-expect-error fixme ts strict error
+        if (newSlot != null && targetNode) {
           this.node.connect(newSlot, targetNode, link.target_slot)
         }
       }
@@ -1584,20 +1741,58 @@ export class GroupNodeHandler {
   linkInputs() {
     for (const link of this.groupData.nodeData.links ?? []) {
       const [, originSlot, targetId, targetSlot, actualOriginId] = link
+      if (actualOriginId == null || typeof actualOriginId === 'object') continue
       const originNode = app.rootGraph.getNodeById(actualOriginId)
       if (!originNode) continue // this node is in the group
-      originNode.connect(
-        originSlot,
-        // @ts-expect-error Valid - uses deprecated interface.  Required check: if (graph.getNodeById(this.node.id) !== this.node) report()
-        this.node.id,
-        this.groupData.oldToNewInputMap[targetId][targetSlot]
-      )
+      if (targetId == null || targetSlot == null) continue
+      const mappedSlot =
+        this.groupData.oldToNewInputMap[Number(targetId)]?.[Number(targetSlot)]
+      if (mappedSlot == null) continue
+      if (typeof originSlot === 'number' || typeof originSlot === 'string') {
+        originNode.connect(
+          originSlot,
+          // @ts-expect-error Valid - uses deprecated interface (node ID instead of node reference)
+          this.node.id,
+          mappedSlot
+        )
+      }
     }
   }
 
-  // @ts-expect-error fixme ts strict error
-  static getGroupData(node) {
-    return (node.nodeData ?? node.constructor?.nodeData)?.[GROUP]
+  static getGroupData(
+    node: LGraphNodeConstructor<LGraphNode>
+  ): GroupNodeConfig | undefined
+  static getGroupData(node: LGraphNode): GroupNodeConfig | undefined
+  static getGroupData(
+    node: LGraphNode | LGraphNodeConstructor<LGraphNode>
+  ): GroupNodeConfig | undefined {
+    // Check if this is a constructor (function) or an instance
+    if (typeof node === 'function') {
+      // Constructor case - access nodeData directly
+      const nodeData = (node as LGraphNodeConstructor & { nodeData?: unknown })
+        .nodeData as Record<symbol, GroupNodeConfig> | undefined
+      return nodeData?.[GROUP]
+    }
+    // Instance case - check instance property first, then constructor
+    const instanceData = (node as LGraphNode & { nodeData?: unknown })
+      .nodeData as Record<symbol, GroupNodeConfig> | undefined
+    if (instanceData?.[GROUP]) return instanceData[GROUP]
+    const ctorData = (
+      node.constructor as LGraphNodeConstructor & { nodeData?: unknown }
+    )?.nodeData as Record<symbol, GroupNodeConfig> | undefined
+    return ctorData?.[GROUP]
+  }
+
+  static getHandler(node: LGraphNode): GroupNodeHandler | undefined {
+    // @ts-expect-error GROUP symbol indexing on LGraphNode
+    let handler = node[GROUP] as GroupNodeHandler | undefined
+    // Handler may not be set yet if nodeCreated async hook hasn't run
+    // Create it synchronously if needed
+    if (!handler && GroupNodeHandler.isGroupNode(node)) {
+      handler = new GroupNodeHandler(node)
+      ;(node as LGraphNode & { [GROUP]: GroupNodeHandler })[GROUP] = handler
+    }
+    return handler
   }
 
   static isGroupNode(node: LGraphNode) {
@@ -1617,17 +1812,15 @@ export class GroupNodeHandler {
     await config.registerType()
 
     const groupNode = LiteGraph.createNode(`${PREFIX}${SEPARATOR}${name}`)
+    if (!groupNode) return
     // Reuse the existing nodes for this instance
-    // @ts-expect-error fixme ts strict error
-    groupNode.setInnerNodes(builder.nodes)
-    // @ts-expect-error fixme ts strict error
-    groupNode[GROUP].populateWidgets()
-    // @ts-expect-error fixme ts strict error
+    groupNode.setInnerNodes?.(builder.nodes)
+    const handler = GroupNodeHandler.getHandler(groupNode)
+    handler?.populateWidgets()
     app.rootGraph.add(groupNode)
 
     // Remove all converted nodes and relink them
-    // @ts-expect-error fixme ts strict error
-    groupNode[GROUP].replaceNodes(builder.nodes)
+    handler?.replaceNodes(builder.nodes)
     return groupNode
   }
 }
@@ -1686,8 +1879,24 @@ function manageGroupNodes(type?: string) {
 }
 
 const id = 'Comfy.GroupNode'
-// @ts-expect-error fixme ts strict error
-let globalDefs
+
+/**
+ * Global node definitions cache, populated and mutated by extension callbacks.
+ *
+ * **Initialization**: Set by `addCustomNodeDefs` during extension initialization.
+ * This callback runs early in the app lifecycle, before any code that reads
+ * `globalDefs` is executed.
+ *
+ * **Mutation**: `refreshComboInNodes` merges updated definitions into this object
+ * when combo options are refreshed (e.g., after model files change).
+ *
+ * **Usage Notes**:
+ * - Functions reading `globalDefs` (e.g., `getNodeDef`, `checkPrimitiveConnection`)
+ *   must only be called after `addCustomNodeDefs` has run.
+ * - Not thread-safe; assumes single-threaded JS execution model.
+ * - The object reference is stable after initialization; only contents are mutated.
+ */
+let globalDefs: Record<string, ComfyNodeDef>
 const ext: ComfyExtension = {
   name: id,
   commands: [
@@ -1740,8 +1949,8 @@ const ext: ComfyExtension = {
     items.push({
       content: `Convert to Group Node (Deprecated)`,
       disabled: !convertEnabled,
-      // @ts-expect-error fixme ts strict error - async callback
-      callback: () => convertSelectedNodesToGroupNode()
+      // @ts-expect-error async callback - legacy menu API doesn't expect Promise
+      callback: async () => convertSelectedNodesToGroupNode()
     })
 
     const groups = canvas.graph?.extra?.groupNodes
@@ -1767,8 +1976,8 @@ const ext: ComfyExtension = {
       {
         content: `Convert to Group Node (Deprecated)`,
         disabled: !convertEnabled,
-        // @ts-expect-error fixme ts strict error - async callback
-        callback: () => convertSelectedNodesToGroupNode()
+        // @ts-expect-error async callback - legacy menu API doesn't expect Promise
+        callback: async () => convertSelectedNodesToGroupNode()
       }
     ]
   },
@@ -1776,37 +1985,38 @@ const ext: ComfyExtension = {
     graphData: ComfyWorkflowJSON,
     missingNodeTypes: string[]
   ) {
-    const nodes = graphData?.extra?.groupNodes
+    const nodes = graphData?.extra?.groupNodes as
+      | Record<string, GroupNodeWorkflowData>
+      | undefined
     if (nodes) {
       replaceLegacySeparators(graphData.nodes)
       await GroupNodeConfig.registerFromWorkflow(nodes, missingNodeTypes)
     }
   },
-  addCustomNodeDefs(defs) {
+  addCustomNodeDefs(defs: Record<string, ComfyNodeDef>) {
     // Store this so we can mutate it later with group nodes
     globalDefs = defs
   },
-  nodeCreated(node) {
+  nodeCreated(node: LGraphNode) {
     if (GroupNodeHandler.isGroupNode(node)) {
-      // @ts-expect-error fixme ts strict error
-      node[GROUP] = new GroupNodeHandler(node)
+      ;(node as LGraphNode & { [GROUP]: GroupNodeHandler })[GROUP] =
+        new GroupNodeHandler(node)
 
       // Ensure group nodes pasted from other workflows are stored
-      // @ts-expect-error fixme ts strict error
-      if (node.title && node[GROUP]?.groupData?.nodeData) {
-        // @ts-expect-error fixme ts strict error
-        Workflow.storeGroupNode(node.title, node[GROUP].groupData.nodeData)
+      const handler = GroupNodeHandler.getHandler(node)
+      if (node.title && handler?.groupData?.nodeData) {
+        Workflow.storeGroupNode(node.title, handler.groupData.nodeData)
       }
     }
   },
-  // @ts-expect-error fixme ts strict error
-  async refreshComboInNodes(defs) {
+  async refreshComboInNodes(defs: Record<string, ComfyNodeDef>) {
     // Re-register group nodes so new ones are created with the correct options
-    // @ts-expect-error fixme ts strict error
     Object.assign(globalDefs, defs)
-    const nodes = app.rootGraph.extra?.groupNodes
+    const nodes = app.rootGraph.extra?.groupNodes as
+      | Record<string, GroupNodeWorkflowData>
+      | undefined
     if (nodes) {
-      await GroupNodeConfig.registerFromWorkflow(nodes, {})
+      await GroupNodeConfig.registerFromWorkflow(nodes, [])
     }
   }
 }
diff --git a/src/extensions/core/groupNodeManage.css b/src/extensions/core/groupNodeManage.css
index 932167ab32..788ea807d7 100644
--- a/src/extensions/core/groupNodeManage.css
+++ b/src/extensions/core/groupNodeManage.css
@@ -95,7 +95,7 @@
   font-size: 15px;
 }
 .comfy-group-manage-node header a:last-child {
-    border-right: none;
+  border-right: none;
 }
 .comfy-group-manage-node header a:not(.active):hover {
   text-decoration: underline;
@@ -123,7 +123,7 @@
   background: var(--comfy-input-bg);
   padding: 5px 10px;
 }
-.comfy-group-manage-node-page input[type="text"] {
+.comfy-group-manage-node-page input[type='text'] {
   flex: auto;
 }
 .comfy-group-manage-node-page label {
diff --git a/src/extensions/core/groupNodeManage.ts b/src/extensions/core/groupNodeManage.ts
index 7ea480614b..38bddb129e 100644
--- a/src/extensions/core/groupNodeManage.ts
+++ b/src/extensions/core/groupNodeManage.ts
@@ -1,9 +1,11 @@
 import { PREFIX, SEPARATOR } from '@/constants/groupNodeConstants'
-import {
-  type LGraphNode,
-  type LGraphNodeConstructor,
-  LiteGraph
+import type {
+  GroupNodeConfigEntry,
+  GroupNodeWorkflowData,
+  LGraphNode,
+  LGraphNodeConstructor
 } from '@/lib/litegraph/src/litegraph'
+import { LiteGraph } from '@/lib/litegraph/src/litegraph'
 import { useToastStore } from '@/platform/updates/common/toastStore'
 
 import { type ComfyApp, app } from '../../scripts/app'
@@ -15,18 +17,20 @@ import './groupNodeManage.css'
 
 const ORDER: symbol = Symbol()
 
-// @ts-expect-error fixme ts strict error
-function merge(target, source) {
-  if (typeof target === 'object' && typeof source === 'object') {
-    for (const key in source) {
-      const sv = source[key]
-      if (typeof sv === 'object') {
-        let tv = target[key]
-        if (!tv) tv = target[key] = {}
-        merge(tv, source[key])
-      } else {
-        target[key] = sv
+function merge(
+  target: Record<string, unknown>,
+  source: Record<string, unknown>
+): Record<string, unknown> {
+  for (const key in source) {
+    const sv = source[key]
+    if (typeof sv === 'object' && sv !== null) {
+      let tv = target[key] as Record<string, unknown> | undefined
+      if (!tv) {
+        tv = target[key] = {}
       }
+      merge(tv, sv as Record<string, unknown>)
+    } else {
+      target[key] = sv
     }
   }
 
@@ -34,8 +38,7 @@ function merge(target, source) {
 }
 
 export class ManageGroupDialog extends ComfyDialog<HTMLDialogElement> {
-  // @ts-expect-error fixme ts strict error
-  tabs: Record<
+  tabs!: Record<
     'Inputs' | 'Outputs' | 'Widgets',
     { tab: HTMLAnchorElement; page: HTMLElement }
   >
@@ -52,31 +55,26 @@ export class ManageGroupDialog extends ComfyDialog<HTMLDialogElement> {
       >
     >
   > = {}
-  // @ts-expect-error fixme ts strict error
-  nodeItems: any[]
+  nodeItems!: HTMLLIElement[]
   app: ComfyApp
-  // @ts-expect-error fixme ts strict error
-  groupNodeType: LGraphNodeConstructor<LGraphNode>
-  groupNodeDef: any
-  groupData: any
+  groupNodeType!: LGraphNodeConstructor<LGraphNode>
+  groupData!: GroupNodeConfig
 
-  // @ts-expect-error fixme ts strict error
-  innerNodesList: HTMLUListElement
-  // @ts-expect-error fixme ts strict error
-  widgetsPage: HTMLElement
-  // @ts-expect-error fixme ts strict error
-  inputsPage: HTMLElement
-  // @ts-expect-error fixme ts strict error
-  outputsPage: HTMLElement
-  draggable: any
+  innerNodesList!: HTMLUListElement
+  widgetsPage!: HTMLElement
+  inputsPage!: HTMLElement
+  outputsPage!: HTMLElement
+  draggable: DraggableList | undefined
 
-  get selectedNodeInnerIndex() {
-    // @ts-expect-error fixme ts strict error
-    return +this.nodeItems[this.selectedNodeIndex].dataset.nodeindex
+  get selectedNodeInnerIndex(): number {
+    const index = this.selectedNodeIndex
+    if (index == null) throw new Error('No node selected')
+    const item = this.nodeItems[index]
+    if (!item?.dataset.nodeindex) throw new Error('Invalid node item')
+    return +item.dataset.nodeindex
   }
 
-  // @ts-expect-error fixme ts strict error
-  constructor(app) {
+  constructor(app: ComfyApp) {
     super()
     this.app = app
     this.element = $el('dialog.comfy-group-manage', {
@@ -84,19 +82,15 @@ export class ManageGroupDialog extends ComfyDialog<HTMLDialogElement> {
     }) as HTMLDialogElement
   }
 
-  // @ts-expect-error fixme ts strict error
-  changeTab(tab) {
+  changeTab(tab: keyof ManageGroupDialog['tabs']): void {
     this.tabs[this.selectedTab].tab.classList.remove('active')
     this.tabs[this.selectedTab].page.classList.remove('active')
-    // @ts-expect-error fixme ts strict error
     this.tabs[tab].tab.classList.add('active')
-    // @ts-expect-error fixme ts strict error
     this.tabs[tab].page.classList.add('active')
     this.selectedTab = tab
   }
 
-  // @ts-expect-error fixme ts strict error
-  changeNode(index, force?) {
+  changeNode(index: number, force?: boolean): void {
     if (!force && this.selectedNodeIndex === index) return
 
     if (this.selectedNodeIndex != null) {
@@ -122,43 +116,41 @@ export class ManageGroupDialog extends ComfyDialog<HTMLDialogElement> {
     this.groupNodeType = LiteGraph.registered_node_types[
       `${PREFIX}${SEPARATOR}` + this.selectedGroup
     ] as unknown as LGraphNodeConstructor<LGraphNode>
-    this.groupNodeDef = this.groupNodeType.nodeData
-    this.groupData = GroupNodeHandler.getGroupData(this.groupNodeType)
+    this.groupData = GroupNodeHandler.getGroupData(this.groupNodeType)!
   }
 
-  // @ts-expect-error fixme ts strict error
-  changeGroup(group, reset = true) {
+  changeGroup(group: string, reset = true): void {
     this.selectedGroup = group
     this.getGroupData()
 
     const nodes = this.groupData.nodeData.nodes
-    // @ts-expect-error fixme ts strict error
-    this.nodeItems = nodes.map((n, i) =>
-      $el(
-        'li.draggable-item',
-        {
-          dataset: {
-            nodeindex: n.index + ''
-          },
-          onclick: () => {
-            this.changeNode(i)
-          }
-        },
-        [
-          $el('span.drag-handle'),
-          $el(
-            'div',
-            {
-              textContent: n.title ?? n.type
+    this.nodeItems = nodes.map(
+      (n, i) =>
+        $el(
+          'li.draggable-item',
+          {
+            dataset: {
+              nodeindex: n.index + ''
             },
-            n.title
-              ? $el('span', {
-                  textContent: n.type
-                })
-              : []
-          )
-        ]
-      )
+            onclick: () => {
+              this.changeNode(i)
+            }
+          },
+          [
+            $el('span.drag-handle'),
+            $el(
+              'div',
+              {
+                textContent: n.title ?? n.type
+              },
+              n.title
+                ? $el('span', {
+                    textContent: n.type
+                  })
+                : []
+            )
+          ]
+        ) as HTMLLIElement
     )
 
     this.innerNodesList.replaceChildren(...this.nodeItems)
@@ -167,47 +159,46 @@ export class ManageGroupDialog extends ComfyDialog<HTMLDialogElement> {
       this.selectedNodeIndex = null
       this.changeNode(0)
     } else {
-      const items = this.draggable.getAllItems()
-      // @ts-expect-error fixme ts strict error
-      let index = items.findIndex((item) => item.classList.contains('selected'))
-      if (index === -1) index = this.selectedNodeIndex
+      const items = this.draggable!.getAllItems()
+      let index = items.findIndex((item: Element) =>
+        item.classList.contains('selected')
+      )
+      if (index === -1) index = this.selectedNodeIndex!
       this.changeNode(index, true)
     }
 
     const ordered = [...nodes]
     this.draggable?.dispose()
     this.draggable = new DraggableList(this.innerNodesList, 'li')
-    this.draggable.addEventListener(
-      'dragend',
-      // @ts-expect-error fixme ts strict error
-      ({ detail: { oldPosition, newPosition } }) => {
-        if (oldPosition === newPosition) return
-        ordered.splice(newPosition, 0, ordered.splice(oldPosition, 1)[0])
-        for (let i = 0; i < ordered.length; i++) {
-          this.storeModification({
-            nodeIndex: ordered[i].index,
-            section: ORDER,
-            prop: 'order',
-            value: i
-          })
-        }
+    this.draggable.addEventListener('dragend', (e: Event) => {
+      const { oldPosition, newPosition } = (e as CustomEvent).detail
+      if (oldPosition === newPosition) return
+      ordered.splice(newPosition, 0, ordered.splice(oldPosition, 1)[0])
+      for (let i = 0; i < ordered.length; i++) {
+        this.storeModification({
+          nodeIndex: ordered[i].index,
+          section: ORDER,
+          prop: 'order',
+          value: i
+        })
       }
-    )
+    })
   }
 
   storeModification(props: {
     nodeIndex?: number
-    section: symbol
+    section: string | symbol
     prop: string
-    value: any
+    value: unknown
   }) {
     const { nodeIndex, section, prop, value } = props
-    // @ts-expect-error fixme ts strict error
-    const groupMod = (this.modifications[this.selectedGroup] ??= {})
-    const nodesMod = (groupMod.nodes ??= {})
+    const groupKey = this.selectedGroup!
+    const groupMod = (this.modifications[groupKey] ??= {})
+    const nodesMod = ((groupMod as Record<string, unknown>).nodes ??=
+      {}) as Record<string, Record<symbol | string, Record<string, unknown>>>
     const nodeMod = (nodesMod[nodeIndex ?? this.selectedNodeInnerIndex] ??= {})
     const typeMod = (nodeMod[section] ??= {})
-    if (typeof value === 'object') {
+    if (typeof value === 'object' && value !== null) {
       const objMod = (typeMod[prop] ??= {})
       Object.assign(objMod, value)
     } else {
@@ -215,35 +206,45 @@ export class ManageGroupDialog extends ComfyDialog<HTMLDialogElement> {
     }
   }
 
-  // @ts-expect-error fixme ts strict error
-  getEditElement(section, prop, value, placeholder, checked, checkable = true) {
-    if (value === placeholder) value = ''
+  getEditElement(
+    section: string,
+    prop: string | number,
+    value: unknown,
+    placeholder: string,
+    checked: boolean,
+    checkable = true
+  ): HTMLDivElement {
+    let displayValue = value === placeholder ? '' : value
 
-    const mods =
-      // @ts-expect-error fixme ts strict error
-      this.modifications[this.selectedGroup]?.nodes?.[
-        this.selectedNodeInnerIndex
-      ]?.[section]?.[prop]
-    if (mods) {
-      if (mods.name != null) {
-        value = mods.name
+    const groupKey = this.selectedGroup!
+    const mods = (
+      this.modifications[groupKey] as Record<string, unknown> | undefined
+    )?.nodes as
+      | Record<
+          number,
+          Record<string, Record<string, { name?: string; visible?: boolean }>>
+        >
+      | undefined
+    const modEntry = mods?.[this.selectedNodeInnerIndex]?.[section]?.[prop]
+    if (modEntry) {
+      if (modEntry.name != null) {
+        displayValue = modEntry.name
       }
-      if (mods.visible != null) {
-        checked = mods.visible
+      if (modEntry.visible != null) {
+        checked = modEntry.visible
       }
     }
 
     return $el('div', [
       $el('input', {
-        value,
+        value: displayValue as string,
         placeholder,
         type: 'text',
-        // @ts-expect-error fixme ts strict error
-        onchange: (e) => {
+        onchange: (e: Event) => {
           this.storeModification({
             section,
-            prop,
-            value: { name: e.target.value }
+            prop: String(prop),
+            value: { name: (e.target as HTMLInputElement).value }
           })
         }
       }),
@@ -252,25 +253,23 @@ export class ManageGroupDialog extends ComfyDialog<HTMLDialogElement> {
           type: 'checkbox',
           checked,
           disabled: !checkable,
-          // @ts-expect-error fixme ts strict error
-          onchange: (e) => {
+          onchange: (e: Event) => {
             this.storeModification({
               section,
-              prop,
-              value: { visible: !!e.target.checked }
+              prop: String(prop),
+              value: { visible: !!(e.target as HTMLInputElement).checked }
             })
           }
         })
       ])
-    ])
+    ]) as HTMLDivElement
   }
 
   buildWidgetsPage() {
     const widgets =
       this.groupData.oldToNewWidgetMap[this.selectedNodeInnerIndex]
     const items = Object.keys(widgets ?? {})
-    // @ts-expect-error fixme ts strict error
-    const type = app.rootGraph.extra.groupNodes[this.selectedGroup]
+    const type = app.rootGraph.extra.groupNodes![this.selectedGroup!]!
     const config = type.config?.[this.selectedNodeInnerIndex]?.input
     this.widgetsPage.replaceChildren(
       ...items.map((oldName) => {
@@ -289,28 +288,25 @@ export class ManageGroupDialog extends ComfyDialog<HTMLDialogElement> {
   buildInputsPage() {
     const inputs = this.groupData.nodeInputs[this.selectedNodeInnerIndex]
     const items = Object.keys(inputs ?? {})
-    // @ts-expect-error fixme ts strict error
-    const type = app.rootGraph.extra.groupNodes[this.selectedGroup]
+    const type = app.rootGraph.extra.groupNodes![this.selectedGroup!]!
     const config = type.config?.[this.selectedNodeInnerIndex]?.input
-    this.inputsPage.replaceChildren(
-      // @ts-expect-error fixme ts strict error
-      ...items
-        .map((oldName) => {
-          let value = inputs[oldName]
-          if (!value) {
-            return
-          }
+    const elements = items
+      .map((oldName) => {
+        const value = inputs[oldName]
+        if (!value) {
+          return null
+        }
 
-          return this.getEditElement(
-            'input',
-            oldName,
-            value,
-            oldName,
-            config?.[oldName]?.visible !== false
-          )
-        })
-        .filter(Boolean)
-    )
+        return this.getEditElement(
+          'input',
+          oldName,
+          value,
+          oldName,
+          config?.[oldName]?.visible !== false
+        )
+      })
+      .filter((el): el is HTMLDivElement => el !== null)
+    this.inputsPage.replaceChildren(...elements)
     return !!items.length
   }
 
@@ -323,38 +319,35 @@ export class ManageGroupDialog extends ComfyDialog<HTMLDialogElement> {
     const groupOutputs =
       this.groupData.oldToNewOutputMap[this.selectedNodeInnerIndex]
 
-    // @ts-expect-error fixme ts strict error
-    const type = app.rootGraph.extra.groupNodes[this.selectedGroup]
+    const type = app.rootGraph.extra.groupNodes![this.selectedGroup!]!
     const config = type.config?.[this.selectedNodeInnerIndex]?.output
     const node = this.groupData.nodeData.nodes[this.selectedNodeInnerIndex]
     const checkable = node.type !== 'PrimitiveNode'
-    this.outputsPage.replaceChildren(
-      ...outputs
-        // @ts-expect-error fixme ts strict error
-        .map((type, slot) => {
-          const groupOutputIndex = groupOutputs?.[slot]
-          const oldName = innerNodeDef.output_name?.[slot] ?? type
-          let value = config?.[slot]?.name
-          const visible = config?.[slot]?.visible || groupOutputIndex != null
-          if (!value || value === oldName) {
-            value = ''
-          }
-          return this.getEditElement(
-            'output',
-            slot,
-            value,
-            oldName,
-            visible,
-            checkable
-          )
-        })
-        .filter(Boolean)
-    )
+    const elements = outputs.map((outputType: unknown, slot: number) => {
+      const groupOutputIndex = groupOutputs?.[slot]
+      const oldName = innerNodeDef?.output_name?.[slot] ?? String(outputType)
+      let value = config?.[slot]?.name
+      const visible = config?.[slot]?.visible || groupOutputIndex != null
+      if (!value || value === oldName) {
+        value = ''
+      }
+      return this.getEditElement(
+        'output',
+        slot,
+        value,
+        oldName,
+        visible,
+        checkable
+      )
+    })
+    this.outputsPage.replaceChildren(...elements)
     return !!outputs.length
   }
 
-  // @ts-expect-error fixme ts strict error
-  show(type?) {
+  override show(groupNodeType?: string | HTMLElement | HTMLElement[]): void {
+    // Extract string type - this method repurposes the show signature
+    const nodeType =
+      typeof groupNodeType === 'string' ? groupNodeType : undefined
     const groupNodes = Object.keys(app.rootGraph.extra?.groupNodes ?? {}).sort(
       (a, b) => a.localeCompare(b)
     )
@@ -371,24 +364,27 @@ export class ManageGroupDialog extends ComfyDialog<HTMLDialogElement> {
       this.outputsPage
     ])
 
-    this.tabs = [
+    type TabName = 'Inputs' | 'Widgets' | 'Outputs'
+    const tabEntries: [TabName, HTMLElement][] = [
       ['Inputs', this.inputsPage],
       ['Widgets', this.widgetsPage],
       ['Outputs', this.outputsPage]
-      // @ts-expect-error fixme ts strict error
-    ].reduce((p, [name, page]: [string, HTMLElement]) => {
-      // @ts-expect-error fixme ts strict error
-      p[name] = {
-        tab: $el('a', {
-          onclick: () => {
-            this.changeTab(name)
-          },
-          textContent: name
-        }),
-        page
-      }
-      return p
-    }, {}) as any
+    ]
+    this.tabs = tabEntries.reduce(
+      (p, [name, page]) => {
+        p[name] = {
+          tab: $el('a', {
+            onclick: () => {
+              this.changeTab(name)
+            },
+            textContent: name
+          }) as HTMLAnchorElement,
+          page
+        }
+        return p
+      },
+      {} as ManageGroupDialog['tabs']
+    )
 
     const outer = $el('div.comfy-group-manage-outer', [
       $el('header', [
@@ -396,15 +392,14 @@ export class ManageGroupDialog extends ComfyDialog<HTMLDialogElement> {
         $el(
           'select',
           {
-            // @ts-expect-error fixme ts strict error
-            onchange: (e) => {
-              this.changeGroup(e.target.value)
+            onchange: (e: Event) => {
+              this.changeGroup((e.target as HTMLSelectElement).value)
             }
           },
           groupNodes.map((g) =>
             $el('option', {
               textContent: g,
-              selected: `${PREFIX}${SEPARATOR}${g}` === type,
+              selected: `${PREFIX}${SEPARATOR}${g}` === nodeType,
               value: g
             })
           )
@@ -439,8 +434,7 @@ export class ManageGroupDialog extends ComfyDialog<HTMLDialogElement> {
                   `Are you sure you want to remove the node: "${this.selectedGroup}"`
                 )
               ) {
-                // @ts-expect-error fixme ts strict error
-                delete app.rootGraph.extra.groupNodes[this.selectedGroup]
+                delete app.rootGraph.extra.groupNodes![this.selectedGroup!]
                 LiteGraph.unregisterNodeType(
                   `${PREFIX}${SEPARATOR}` + this.selectedGroup
                 )
@@ -454,90 +448,106 @@ export class ManageGroupDialog extends ComfyDialog<HTMLDialogElement> {
           'button.comfy-btn',
           {
             onclick: async () => {
-              let nodesByType
-              let recreateNodes = []
-              const types = {}
+              type NodesByType = Record<string, LGraphNode[]>
+              let nodesByType: NodesByType | undefined
+              const recreateNodes: LGraphNode[] = []
+              const types: Record<string, GroupNodeWorkflowData> = {}
               for (const g in this.modifications) {
-                // @ts-expect-error fixme ts strict error
-                const type = app.rootGraph.extra.groupNodes[g]
-                let config = (type.config ??= {})
+                const groupNodeData = app.rootGraph.extra.groupNodes![g]!
+                let config = (groupNodeData.config ??= {})
 
-                let nodeMods = this.modifications[g]?.nodes
+                type NodeMods = Record<
+                  string,
+                  Record<symbol | string, Record<string, unknown>>
+                >
+                let nodeMods = this.modifications[g]?.nodes as
+                  | NodeMods
+                  | undefined
                 if (nodeMods) {
                   const keys = Object.keys(nodeMods)
-                  // @ts-expect-error fixme ts strict error
-                  if (nodeMods[keys[0]][ORDER]) {
+                  if (nodeMods[keys[0]]?.[ORDER]) {
                     // If any node is reordered, they will all need sequencing
-                    const orderedNodes = []
-                    const orderedMods = {}
-                    const orderedConfig = {}
+                    const orderedNodes: GroupNodeWorkflowData['nodes'] = []
+                    const orderedMods: NodeMods = {}
+                    const orderedConfig: Record<number, GroupNodeConfigEntry> =
+                      {}
 
                     for (const n of keys) {
-                      // @ts-expect-error fixme ts strict error
-                      const order = nodeMods[n][ORDER].order
-                      orderedNodes[order] = type.nodes[+n]
-                      // @ts-expect-error fixme ts strict error
+                      const order = (nodeMods[n][ORDER] as { order: number })
+                        .order
+                      orderedNodes[order] = groupNodeData.nodes[+n]
                       orderedMods[order] = nodeMods[n]
                       orderedNodes[order].index = order
                     }
 
                     // Rewrite links
-                    for (const l of type.links) {
-                      if (l[0] != null) l[0] = type.nodes[l[0]].index
-                      if (l[2] != null) l[2] = type.nodes[l[2]].index
+                    const nodesLen = groupNodeData.nodes.length
+                    for (const l of groupNodeData.links) {
+                      const srcIdx = l[0] as number
+                      const dstIdx = l[2] as number
+                      if (srcIdx != null && srcIdx < nodesLen)
+                        l[0] = groupNodeData.nodes[srcIdx].index!
+                      if (dstIdx != null && dstIdx < nodesLen)
+                        l[2] = groupNodeData.nodes[dstIdx].index!
                     }
 
                     // Rewrite externals
-                    if (type.external) {
-                      for (const ext of type.external) {
-                        ext[0] = type.nodes[ext[0]]
+                    if (groupNodeData.external) {
+                      for (const ext of groupNodeData.external) {
+                        const extIdx = ext[0] as number
+                        if (extIdx != null && extIdx < nodesLen) {
+                          ext[0] = groupNodeData.nodes[extIdx].index!
+                        }
                       }
                     }
 
                     // Rewrite modifications
                     for (const id of keys) {
-                      if (config[id]) {
-                        // @ts-expect-error fixme ts strict error
-                        orderedConfig[type.nodes[id].index] = config[id]
+                      if (config[+id]) {
+                        orderedConfig[groupNodeData.nodes[+id].index!] =
+                          config[+id]
                       }
-                      delete config[id]
+                      delete config[+id]
                     }
 
-                    type.nodes = orderedNodes
+                    groupNodeData.nodes = orderedNodes
                     nodeMods = orderedMods
-                    type.config = config = orderedConfig
+                    groupNodeData.config = config = orderedConfig
                   }
 
-                  merge(config, nodeMods)
+                  merge(
+                    config as Record<string, unknown>,
+                    nodeMods as Record<string, unknown>
+                  )
                 }
 
-                // @ts-expect-error fixme ts strict error
-                types[g] = type
+                types[g] = groupNodeData
 
                 if (!nodesByType) {
-                  nodesByType = app.rootGraph.nodes.reduce((p, n) => {
-                    // @ts-expect-error fixme ts strict error
-                    p[n.type] ??= []
-                    // @ts-expect-error fixme ts strict error
-                    p[n.type].push(n)
-                    return p
-                  }, {})
+                  nodesByType = app.rootGraph.nodes.reduce<NodesByType>(
+                    (p, n) => {
+                      const nodeType = n.type ?? ''
+                      p[nodeType] ??= []
+                      p[nodeType].push(n)
+                      return p
+                    },
+                    {}
+                  )
                 }
 
-                // @ts-expect-error fixme ts strict error
-                const nodes = nodesByType[`${PREFIX}${SEPARATOR}` + g]
-                if (nodes) recreateNodes.push(...nodes)
+                const groupTypeNodes = nodesByType[`${PREFIX}${SEPARATOR}` + g]
+                if (groupTypeNodes) recreateNodes.push(...groupTypeNodes)
               }
 
-              await GroupNodeConfig.registerFromWorkflow(types, {})
+              await GroupNodeConfig.registerFromWorkflow(types, [])
 
               for (const node of recreateNodes) {
-                node.recreate()
+                node.recreate?.()
               }
 
               this.modifications = {}
               this.app.canvas.setDirty(true, true)
-              this.changeGroup(this.selectedGroup, false)
+              this.changeGroup(this.selectedGroup!, false)
             }
           },
           'Save'
@@ -552,8 +562,8 @@ export class ManageGroupDialog extends ComfyDialog<HTMLDialogElement> {
 
     this.element.replaceChildren(outer)
     this.changeGroup(
-      type
-        ? (groupNodes.find((g) => `${PREFIX}${SEPARATOR}${g}` === type) ??
+      nodeType
+        ? (groupNodes.find((g) => `${PREFIX}${SEPARATOR}${g}` === nodeType) ??
             groupNodes[0])
         : groupNodes[0]
     )
diff --git a/src/extensions/core/imageCompare.ts b/src/extensions/core/imageCompare.ts
index 608590f1bc..de0ffa61c5 100644
--- a/src/extensions/core/imageCompare.ts
+++ b/src/extensions/core/imageCompare.ts
@@ -1,12 +1,19 @@
-import type { NodeExecutionOutput } from '@/schemas/apiSchema'
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
+import type { NodeOutputWith } from '@/schemas/apiSchema'
+import { appendCloudResParam } from '@/platform/distribution/cloudPreviewUtil'
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
 import { useExtensionService } from '@/services/extensionService'
 
+type ImageCompareOutput = NodeOutputWith<{
+  a_images?: Record<string, string>[]
+  b_images?: Record<string, string>[]
+}>
+
 useExtensionService().registerExtension({
   name: 'Comfy.ImageCompare',
 
-  async nodeCreated(node) {
+  async nodeCreated(node: LGraphNode) {
     if (node.constructor.comfyClass !== 'ImageCompare') return
 
     const [oldWidth, oldHeight] = node.size
@@ -14,33 +21,27 @@ useExtensionService().registerExtension({
 
     const onExecuted = node.onExecuted
 
-    node.onExecuted = function (output: NodeExecutionOutput) {
+    node.onExecuted = function (output: ImageCompareOutput) {
       onExecuted?.call(this, output)
 
-      const aImages = (output as Record<string, unknown>).a_images as
-        | Record<string, string>[]
-        | undefined
-      const bImages = (output as Record<string, unknown>).b_images as
-        | Record<string, string>[]
-        | undefined
+      const { a_images: aImages, b_images: bImages } = output
       const rand = app.getRandParam()
 
-      const beforeUrl =
-        aImages && aImages.length > 0
-          ? api.apiURL(`/view?${new URLSearchParams(aImages[0])}${rand}`)
-          : ''
-      const afterUrl =
-        bImages && bImages.length > 0
-          ? api.apiURL(`/view?${new URLSearchParams(bImages[0])}${rand}`)
-          : ''
+      const toUrl = (record: Record<string, string>) => {
+        const params = new URLSearchParams(record)
+        appendCloudResParam(params, record.filename)
+        return api.apiURL(`/view?${params}${rand}`)
+      }
+
+      const beforeImages =
+        aImages && aImages.length > 0 ? aImages.map(toUrl) : []
+      const afterImages =
+        bImages && bImages.length > 0 ? bImages.map(toUrl) : []
 
       const widget = node.widgets?.find((w) => w.type === 'imagecompare')
 
       if (widget) {
-        widget.value = {
-          before: beforeUrl,
-          after: afterUrl
-        }
+        widget.value = { beforeImages, afterImages }
         widget.callback?.(widget.value)
       }
     }
diff --git a/src/extensions/core/imageCrop.ts b/src/extensions/core/imageCrop.ts
new file mode 100644
index 0000000000..75af2d0869
--- /dev/null
+++ b/src/extensions/core/imageCrop.ts
@@ -0,0 +1,14 @@
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
+import { useExtensionService } from '@/services/extensionService'
+
+useExtensionService().registerExtension({
+  name: 'Comfy.ImageCrop',
+
+  async nodeCreated(node: LGraphNode) {
+    if (node.constructor.comfyClass !== 'ImageCropV2') return
+
+    node.hideOutputImages = true
+    const [oldWidth, oldHeight] = node.size
+    node.setSize([Math.max(oldWidth, 300), Math.max(oldHeight, 450)])
+  }
+})
diff --git a/src/extensions/core/index.ts b/src/extensions/core/index.ts
index ba36f847a4..4cc1c977cf 100644
--- a/src/extensions/core/index.ts
+++ b/src/extensions/core/index.ts
@@ -1,8 +1,8 @@
-import { isCloud } from '@/platform/distribution/types'
+import { isCloud, isNightly } from '@/platform/distribution/types'
 
 import './clipspace'
 import './contextMenuFilter'
-import './customCombo'
+import './customWidgets'
 import './dynamicPrompts'
 import './editAttention'
 import './electronAdapter'
@@ -10,14 +10,20 @@ import './groupNode'
 import './groupNodeManage'
 import './groupOptions'
 import './imageCompare'
-import './load3d'
+import './imageCrop'
+// load3d and saveMesh are loaded on-demand to defer THREE.js (~1.8MB)
+// The lazy loader triggers loading when a 3D node is used
+import './load3dLazy'
 import './maskeditor'
-import './nodeTemplates'
+if (!isCloud) {
+  await import('./nodeTemplates')
+}
 import './noteNode'
+import './painter'
 import './previewAny'
 import './rerouteNode'
 import './saveImageExtraOutput'
-import './saveMesh'
+// saveMesh is loaded on-demand with load3d (see load3dLazy.ts)
 import './selectionBorder'
 import './simpleTouchSupport'
 import './slotDefaults'
@@ -31,9 +37,18 @@ if (isCloud) {
   await import('./cloudRemoteConfig')
   await import('./cloudBadges')
   await import('./cloudSessionCookie')
-  await import('./cloudFeedbackTopbarButton')
 
   if (window.__CONFIG__?.subscription_required) {
     await import('./cloudSubscription')
   }
 }
+
+// Feedback button for cloud and nightly builds
+if (isCloud || isNightly) {
+  await import('./cloudFeedbackTopbarButton')
+}
+
+// Nightly-only extensions
+if (isNightly && !isCloud) {
+  await import('./nightlyBadges')
+}
diff --git a/src/extensions/core/load3d.ts b/src/extensions/core/load3d.ts
index 55358d62ca..2c1cff51d3 100644
--- a/src/extensions/core/load3d.ts
+++ b/src/extensions/core/load3d.ts
@@ -4,14 +4,25 @@ import Load3D from '@/components/load3d/Load3D.vue'
 import Load3DViewerContent from '@/components/load3d/Load3dViewerContent.vue'
 import { nodeToLoad3dMap, useLoad3d } from '@/composables/useLoad3d'
 import { createExportMenuItems } from '@/extensions/core/load3d/exportMenuHelper'
+import type {
+  CameraConfig,
+  CameraState
+} from '@/extensions/core/load3d/interfaces'
 import Load3DConfiguration from '@/extensions/core/load3d/Load3DConfiguration'
+import { 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'
 import type { IContextMenuValue } from '@/lib/litegraph/src/interfaces'
 import type { IStringWidget } from '@/lib/litegraph/src/types/widgets'
 import { useToastStore } from '@/platform/updates/common/toastStore'
-import { type CustomInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
+import type { NodeOutputWith } from '@/schemas/apiSchema'
+import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'
+
+type Load3dPreviewOutput = NodeOutputWith<{
+  result?: [string?, CameraState?, string?]
+}>
+import type { CustomInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
 import { api } from '@/scripts/api'
 import { ComfyApp, app } from '@/scripts/app'
 import { ComponentWidgetImpl, addWidget } from '@/scripts/domWidget'
@@ -32,12 +43,12 @@ const inputSpecPreview3D: CustomInputSpec = {
   isPreview: true
 }
 
-async function handleModelUpload(files: FileList, node: any) {
+async function handleModelUpload(files: FileList, node: LGraphNode) {
   if (!files?.length) return
 
-  const modelWidget = node.widgets?.find(
-    (w: any) => w.name === 'model_file'
-  ) as IStringWidget
+  const modelWidget = node.widgets?.find((w) => w.name === 'model_file') as
+    | IStringWidget
+    | undefined
 
   try {
     const resourceFolder = (node.properties['Resource Folder'] as string) || ''
@@ -81,7 +92,7 @@ async function handleModelUpload(files: FileList, node: any) {
   }
 }
 
-async function handleResourcesUpload(files: FileList, node: any) {
+async function handleResourcesUpload(files: FileList, node: LGraphNode) {
   if (!files?.length) return
 
   try {
@@ -249,10 +260,7 @@ useExtensionService().registerExtension({
   getCustomWidgets() {
     return {
       LOAD_3D(node) {
-        const fileInput = createFileInput(
-          '.gltf,.glb,.obj,.fbx,.stl,.ply,.spz,.splat,.ksplat',
-          false
-        )
+        const fileInput = createFileInput(SUPPORTED_EXTENSIONS_ACCEPT, false)
 
         node.properties['Resource Folder'] = ''
 
@@ -320,7 +328,7 @@ useExtensionService().registerExtension({
     return createExportMenuItems(load3d)
   },
 
-  async nodeCreated(node) {
+  async nodeCreated(node: LGraphNode) {
     if (node.constructor.comfyClass !== 'Load3D') return
 
     const [oldWidth, oldHeight] = node.size
@@ -330,7 +338,9 @@ useExtensionService().registerExtension({
     await nextTick()
 
     useLoad3d(node).waitForLoad3d((load3d) => {
-      const cameraConfig = node.properties['Camera Config'] as any
+      const cameraConfig = node.properties['Camera Config'] as
+        | CameraConfig
+        | undefined
       const cameraState = cameraConfig?.state
 
       const config = new Load3DConfiguration(load3d, node.properties)
@@ -357,7 +367,9 @@ useExtensionService().registerExtension({
             return null
           }
 
-          const cameraConfig = (node.properties['Camera Config'] as any) || {
+          const cameraConfig: CameraConfig = (node.properties[
+            'Camera Config'
+          ] as CameraConfig | undefined) || {
             cameraType: currentLoad3d.getCurrentCameraType(),
             fov: currentLoad3d.cameraManager.perspectiveCamera.fov
           }
@@ -388,7 +400,8 @@ useExtensionService().registerExtension({
             mask: `threed/${dataMask.name} [temp]`,
             normal: `threed/${dataNormal.name} [temp]`,
             camera_info:
-              (node.properties['Camera Config'] as any)?.state || null,
+              (node.properties['Camera Config'] as CameraConfig | undefined)
+                ?.state || null,
             recording: ''
           }
 
@@ -411,7 +424,10 @@ useExtensionService().registerExtension({
 useExtensionService().registerExtension({
   name: 'Comfy.Preview3D',
 
-  async beforeRegisterNodeDef(_nodeType, nodeData) {
+  async beforeRegisterNodeDef(
+    _nodeType: typeof LGraphNode,
+    nodeData: ComfyNodeDef
+  ) {
     if ('Preview3D' === nodeData.name) {
       // @ts-expect-error InputSpec is not typed correctly
       nodeData.input.required.image = ['PREVIEW_3D']
@@ -450,7 +466,7 @@ useExtensionService().registerExtension({
     }
   },
 
-  async nodeCreated(node) {
+  async nodeCreated(node: LGraphNode) {
     if (node.constructor.comfyClass !== 'Preview3D') return
 
     const [oldWidth, oldHeight] = node.size
@@ -472,7 +488,9 @@ useExtensionService().registerExtension({
         if (lastTimeModelFile) {
           modelWidget.value = lastTimeModelFile
 
-          const cameraConfig = node.properties['Camera Config'] as any
+          const cameraConfig = node.properties['Camera Config'] as
+            | CameraConfig
+            | undefined
           const cameraState = cameraConfig?.state
 
           const settings = {
@@ -484,10 +502,11 @@ useExtensionService().registerExtension({
           config.configure(settings)
         }
 
-        node.onExecuted = function (message: any) {
-          onExecuted?.apply(this, arguments as any)
+        node.onExecuted = function (output: Load3dPreviewOutput) {
+          onExecuted?.call(this, output)
 
-          let filePath = message.result[0]
+          const result = output.result
+          const filePath = result?.[0]
 
           if (!filePath) {
             const msg = t('toastMessages.unableToGetModelFilePath')
@@ -495,10 +514,10 @@ useExtensionService().registerExtension({
             useToastStore().addAlert(msg)
           }
 
-          let cameraState = message.result[1]
-          let bgImagePath = message.result[2]
+          const cameraState = result?.[1]
+          const bgImagePath = result?.[2]
 
-          modelWidget.value = filePath.replaceAll('\\', '/')
+          modelWidget.value = filePath?.replaceAll('\\', '/')
 
           node.properties['Last Time Model File'] = modelWidget.value
 
diff --git a/src/extensions/core/load3d/AnimationManager.ts b/src/extensions/core/load3d/AnimationManager.ts
index 80fc6f1537..c6dc3428b7 100644
--- a/src/extensions/core/load3d/AnimationManager.ts
+++ b/src/extensions/core/load3d/AnimationManager.ts
@@ -1,9 +1,10 @@
 import * as THREE from 'three'
+import type { GLTF } from 'three/examples/jsm/loaders/GLTFLoader'
 
-import {
-  type AnimationItem,
-  type AnimationManagerInterface,
-  type EventManagerInterface
+import type {
+  AnimationItem,
+  AnimationManagerInterface,
+  EventManagerInterface
 } from '@/extensions/core/load3d/interfaces'
 
 export class AnimationManager implements AnimationManagerInterface {
@@ -38,7 +39,10 @@ export class AnimationManager implements AnimationManagerInterface {
     this.eventManager.emitEvent('animationListChange', [])
   }
 
-  setupModelAnimations(model: THREE.Object3D, originalModel: any): void {
+  setupModelAnimations(
+    model: THREE.Object3D,
+    originalModel: THREE.Object3D | THREE.BufferGeometry | GLTF | null
+  ): void {
     if (this.currentAnimation) {
       this.currentAnimation.stopAllAction()
       this.animationActions = []
diff --git a/src/extensions/core/load3d/CameraManager.ts b/src/extensions/core/load3d/CameraManager.ts
index c87d384832..c92190b809 100644
--- a/src/extensions/core/load3d/CameraManager.ts
+++ b/src/extensions/core/load3d/CameraManager.ts
@@ -13,8 +13,6 @@ export class CameraManager implements CameraManagerInterface {
   orthographicCamera: THREE.OrthographicCamera
   activeCamera: THREE.Camera
 
-  // @ts-expect-error unused variable
-  private renderer: THREE.WebGLRenderer
   private eventManager: EventManagerInterface
 
   private controls: OrbitControls | null = null
@@ -42,10 +40,9 @@ export class CameraManager implements CameraManagerInterface {
   }
 
   constructor(
-    renderer: THREE.WebGLRenderer,
+    _renderer: THREE.WebGLRenderer,
     eventManager: EventManagerInterface
   ) {
-    this.renderer = renderer
     this.eventManager = eventManager
 
     this.perspectiveCamera = new THREE.PerspectiveCamera(
diff --git a/src/extensions/core/load3d/EventManager.ts b/src/extensions/core/load3d/EventManager.ts
index 64b87eb9b6..3a0a747e95 100644
--- a/src/extensions/core/load3d/EventManager.ts
+++ b/src/extensions/core/load3d/EventManager.ts
@@ -1,16 +1,16 @@
 import { type EventCallback, type EventManagerInterface } from './interfaces'
 
 export class EventManager implements EventManagerInterface {
-  private listeners: { [key: string]: EventCallback[] } = {}
+  private listeners: Record<string, EventCallback[]> = {}
 
-  addEventListener(event: string, callback: EventCallback): void {
+  addEventListener<T>(event: string, callback: EventCallback<T>): void {
     if (!this.listeners[event]) {
       this.listeners[event] = []
     }
-    this.listeners[event].push(callback)
+    this.listeners[event].push(callback as EventCallback)
   }
 
-  removeEventListener(event: string, callback: EventCallback): void {
+  removeEventListener<T>(event: string, callback: EventCallback<T>): void {
     if (this.listeners[event]) {
       this.listeners[event] = this.listeners[event].filter(
         (cb) => cb !== callback
@@ -18,7 +18,7 @@ export class EventManager implements EventManagerInterface {
     }
   }
 
-  emitEvent(event: string, data?: any): void {
+  emitEvent<T>(event: string, data: T): void {
     if (this.listeners[event]) {
       this.listeners[event].forEach((callback) => callback(data))
     }
diff --git a/src/extensions/core/load3d/Load3DConfiguration.ts b/src/extensions/core/load3d/Load3DConfiguration.ts
index 0510a9c82a..d3e6351fd1 100644
--- a/src/extensions/core/load3d/Load3DConfiguration.ts
+++ b/src/extensions/core/load3d/Load3DConfiguration.ts
@@ -156,8 +156,9 @@ class Load3DConfiguration {
 
     return {
       upDirection: 'original',
-      materialMode: 'original'
-    } as ModelConfig
+      materialMode: 'original',
+      showSkeleton: false
+    }
   }
 
   private applySceneConfig(config: SceneConfig, bgImagePath?: string) {
diff --git a/src/extensions/core/load3d/Load3d.ts b/src/extensions/core/load3d/Load3d.ts
index f17683b640..445e9d6087 100644
--- a/src/extensions/core/load3d/Load3d.ts
+++ b/src/extensions/core/load3d/Load3d.ts
@@ -14,6 +14,7 @@ import { ViewHelperManager } from './ViewHelperManager'
 import {
   type CameraState,
   type CaptureResult,
+  type EventCallback,
   type Load3DOptions,
   type MaterialMode,
   type UpDirection
@@ -54,6 +55,7 @@ class Load3d {
   private rightMouseMoved: boolean = false
   private readonly dragThreshold: number = 5
   private contextMenuAbortController: AbortController | null = null
+  private resizeObserver: ResizeObserver | null = null
 
   constructor(container: Element | HTMLElement, options: Load3DOptions = {}) {
     this.clock = new THREE.Clock()
@@ -144,6 +146,7 @@ class Load3d {
     this.STATUS_MOUSE_ON_VIEWER = false
 
     this.initContextMenu()
+    this.initResizeObserver(container)
 
     this.handleResize()
     this.startAnimation()
@@ -153,6 +156,16 @@ class Load3d {
     }, 100)
   }
 
+  private initResizeObserver(container: Element | HTMLElement): void {
+    if (typeof ResizeObserver === 'undefined') return
+
+    this.resizeObserver?.disconnect()
+    this.resizeObserver = new ResizeObserver(() => {
+      this.handleResize()
+    })
+    this.resizeObserver.observe(container)
+  }
+
   /**
    * Initialize context menu on the Three.js canvas
    * Detects right-click vs right-drag to show menu only on click
@@ -511,7 +524,6 @@ class Load3d {
     this.viewHelperManager.recreateViewHelper()
 
     this.handleResize()
-    this.forceRender()
   }
 
   getCurrentCameraType(): 'perspective' | 'orthographic' {
@@ -573,7 +585,6 @@ class Load3d {
     }
 
     this.handleResize()
-    this.forceRender()
 
     this.loadingPromise = null
   }
@@ -607,20 +618,18 @@ class Load3d {
     this.targetHeight = height
     this.targetAspectRatio = width / height
     this.handleResize()
-    this.forceRender()
   }
 
-  addEventListener(event: string, callback: (data?: any) => void): void {
+  addEventListener<T>(event: string, callback: EventCallback<T>): void {
     this.eventManager.addEventListener(event, callback)
   }
 
-  removeEventListener(event: string, callback: (data?: any) => void): void {
+  removeEventListener<T>(event: string, callback: EventCallback<T>): void {
     this.eventManager.removeEventListener(event, callback)
   }
 
   refreshViewport(): void {
     this.handleResize()
-    this.forceRender()
   }
 
   handleResize(): void {
@@ -727,6 +736,19 @@ class Load3d {
     return this.animationManager.animationClips.length > 0
   }
 
+  public hasSkeleton(): boolean {
+    return this.modelManager.hasSkeleton()
+  }
+
+  public setShowSkeleton(show: boolean): void {
+    this.modelManager.setShowSkeleton(show)
+    this.forceRender()
+  }
+
+  public getShowSkeleton(): boolean {
+    return this.modelManager.showSkeleton
+  }
+
   public getAnimationTime(): number {
     return this.animationManager.getAnimationTime()
   }
@@ -740,7 +762,66 @@ class Load3d {
     this.forceRender()
   }
 
+  public async captureThumbnail(
+    width: number = 256,
+    height: number = 256
+  ): Promise<string> {
+    if (!this.modelManager.currentModel) {
+      throw new Error('No model loaded for thumbnail capture')
+    }
+
+    const savedState = this.cameraManager.getCameraState()
+    const savedCameraType = this.cameraManager.getCurrentCameraType()
+    const savedGridVisible = this.sceneManager.gridHelper.visible
+
+    try {
+      this.sceneManager.gridHelper.visible = false
+
+      if (savedCameraType !== 'perspective') {
+        this.cameraManager.toggleCamera('perspective')
+      }
+
+      const box = new THREE.Box3().setFromObject(this.modelManager.currentModel)
+      const size = box.getSize(new THREE.Vector3())
+      const center = box.getCenter(new THREE.Vector3())
+
+      const maxDim = Math.max(size.x, size.y, size.z)
+      const distance = maxDim * 1.5
+
+      const cameraPosition = new THREE.Vector3(
+        center.x - distance * 0.8,
+        center.y + distance * 0.4,
+        center.z + distance * 0.3
+      )
+
+      this.cameraManager.perspectiveCamera.position.copy(cameraPosition)
+      this.cameraManager.perspectiveCamera.lookAt(center)
+      this.cameraManager.perspectiveCamera.updateProjectionMatrix()
+
+      if (this.controlsManager.controls) {
+        this.controlsManager.controls.target.copy(center)
+        this.controlsManager.controls.update()
+      }
+
+      const result = await this.sceneManager.captureScene(width, height)
+      return result.scene
+    } finally {
+      this.sceneManager.gridHelper.visible = savedGridVisible
+
+      if (savedCameraType !== 'perspective') {
+        this.cameraManager.toggleCamera(savedCameraType)
+      }
+      this.cameraManager.setCameraState(savedState)
+      this.controlsManager.controls?.update()
+    }
+  }
+
   public remove(): void {
+    if (this.resizeObserver) {
+      this.resizeObserver.disconnect()
+      this.resizeObserver = null
+    }
+
     if (this.contextMenuAbortController) {
       this.contextMenuAbortController.abort()
       this.contextMenuAbortController = null
diff --git a/src/extensions/core/load3d/Load3dUtils.ts b/src/extensions/core/load3d/Load3dUtils.ts
index 13095ac96b..ba7c36e557 100644
--- a/src/extensions/core/load3d/Load3dUtils.ts
+++ b/src/extensions/core/load3d/Load3dUtils.ts
@@ -1,9 +1,34 @@
+import type Load3d from '@/extensions/core/load3d/Load3d'
 import { t } from '@/i18n'
 import { useToastStore } from '@/platform/updates/common/toastStore'
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
 
 class Load3dUtils {
+  static async generateThumbnailIfNeeded(
+    load3d: Load3d,
+    modelPath: string,
+    folderType: 'input' | 'output'
+  ): Promise<void> {
+    const [subfolder, filename] = this.splitFilePath(modelPath)
+    const thumbnailFilename = this.getThumbnailFilename(filename)
+
+    const exists = await this.fileExists(
+      subfolder,
+      thumbnailFilename,
+      folderType
+    )
+    if (exists) return
+
+    const imageData = await load3d.captureThumbnail(256, 256)
+    await this.uploadThumbnail(
+      imageData,
+      subfolder,
+      thumbnailFilename,
+      folderType
+    )
+  }
+
   static async uploadTempImage(
     imageData: string,
     prefix: string,
@@ -122,6 +147,46 @@ class Load3dUtils {
 
     await Promise.all(uploadPromises)
   }
+
+  static getThumbnailFilename(modelFilename: string): string {
+    return `${modelFilename}.png`
+  }
+
+  static async fileExists(
+    subfolder: string,
+    filename: string,
+    type: string = 'input'
+  ): Promise<boolean> {
+    try {
+      const url = api.apiURL(this.getResourceURL(subfolder, filename, type))
+      const response = await fetch(url, { method: 'HEAD' })
+      return response.ok
+    } catch {
+      return false
+    }
+  }
+
+  static async uploadThumbnail(
+    imageData: string,
+    subfolder: string,
+    filename: string,
+    type: string = 'input'
+  ): Promise<boolean> {
+    const blob = await fetch(imageData).then((r) => r.blob())
+    const file = new File([blob], filename, { type: 'image/png' })
+
+    const body = new FormData()
+    body.append('image', file)
+    body.append('subfolder', subfolder)
+    body.append('type', type)
+
+    const resp = await api.fetchApi('/upload/image', {
+      method: 'POST',
+      body
+    })
+
+    return resp.status === 200
+  }
 }
 
 export default Load3dUtils
diff --git a/src/extensions/core/load3d/LoaderManager.ts b/src/extensions/core/load3d/LoaderManager.ts
index 76e294d80e..3a4db5a3d8 100644
--- a/src/extensions/core/load3d/LoaderManager.ts
+++ b/src/extensions/core/load3d/LoaderManager.ts
@@ -6,7 +6,9 @@ import { MTLLoader } from 'three/examples/jsm/loaders/MTLLoader'
 import { PLYLoader } from 'three/examples/jsm/loaders/PLYLoader'
 import { STLLoader } from 'three/examples/jsm/loaders/STLLoader'
 import { MtlObjBridge, OBJLoader2Parallel } from 'wwobjloader2'
-import OBJLoader2WorkerUrl from 'wwobjloader2/worker?url'
+// Use pre-bundled worker module (has all dependencies included)
+// The unbundled 'wwobjloader2/worker' has ES imports that fail in production builds
+import OBJLoader2WorkerUrl from 'wwobjloader2/bundle/worker/module?url'
 
 import { t } from '@/i18n'
 import { useSettingStore } from '@/platform/settings/settingStore'
@@ -166,6 +168,10 @@ export class LoaderManager implements LoaderManagerInterface {
         fbxModel.traverse((child) => {
           if (child instanceof THREE.Mesh) {
             this.modelManager.originalMaterials.set(child, child.material)
+
+            if (child instanceof THREE.SkinnedMesh) {
+              child.frustumCulled = false
+            }
           }
         })
         break
@@ -212,6 +218,10 @@ export class LoaderManager implements LoaderManagerInterface {
           if (child instanceof THREE.Mesh) {
             child.geometry.computeVertexNormals()
             this.modelManager.originalMaterials.set(child, child.material)
+
+            if (child instanceof THREE.SkinnedMesh) {
+              child.frustumCulled = false
+            }
           }
         })
         break
diff --git a/src/extensions/core/load3d/SceneManager.ts b/src/extensions/core/load3d/SceneManager.ts
index c03a43121c..00a3383d6e 100644
--- a/src/extensions/core/load3d/SceneManager.ts
+++ b/src/extensions/core/load3d/SceneManager.ts
@@ -27,13 +27,11 @@ export class SceneManager implements SceneManagerInterface {
   private renderer: THREE.WebGLRenderer
 
   private getActiveCamera: () => THREE.Camera
-  // @ts-expect-error unused variable
-  private getControls: () => OrbitControls
 
   constructor(
     renderer: THREE.WebGLRenderer,
     getActiveCamera: () => THREE.Camera,
-    getControls: () => OrbitControls,
+    _getControls: () => OrbitControls,
     eventManager: EventManagerInterface
   ) {
     this.renderer = renderer
@@ -41,7 +39,6 @@ export class SceneManager implements SceneManagerInterface {
     this.scene = new THREE.Scene()
 
     this.getActiveCamera = getActiveCamera
-    this.getControls = getControls
 
     this.gridHelper = new THREE.GridHelper(20, 20)
     this.gridHelper.position.set(0, 0, 0)
diff --git a/src/extensions/core/load3d/SceneModelManager.ts b/src/extensions/core/load3d/SceneModelManager.ts
index 8f042c2be8..a480e4554d 100644
--- a/src/extensions/core/load3d/SceneModelManager.ts
+++ b/src/extensions/core/load3d/SceneModelManager.ts
@@ -30,6 +30,8 @@ export class SceneModelManager implements ModelManagerInterface {
   originalURL: string | null = null
   appliedTexture: THREE.Texture | null = null
   textureLoader: THREE.TextureLoader
+  skeletonHelper: THREE.SkeletonHelper | null = null
+  showSkeleton: boolean = false
 
   private scene: THREE.Scene
   private renderer: THREE.WebGLRenderer
@@ -414,9 +416,69 @@ export class SceneModelManager implements ModelManagerInterface {
       this.appliedTexture = null
     }
 
+    if (this.skeletonHelper) {
+      this.scene.remove(this.skeletonHelper)
+      this.skeletonHelper.dispose()
+      this.skeletonHelper = null
+    }
+    this.showSkeleton = false
+
     this.originalMaterials = new WeakMap()
   }
 
+  hasSkeleton(): boolean {
+    if (!this.currentModel) return false
+    let found = false
+    this.currentModel.traverse((child) => {
+      if (child instanceof THREE.SkinnedMesh && child.skeleton) {
+        found = true
+      }
+    })
+    return found
+  }
+
+  setShowSkeleton(show: boolean): void {
+    this.showSkeleton = show
+
+    if (show) {
+      if (!this.skeletonHelper && this.currentModel) {
+        let rootBone: THREE.Bone | null = null
+        this.currentModel.traverse((child) => {
+          if (child instanceof THREE.Bone && !rootBone) {
+            if (!(child.parent instanceof THREE.Bone)) {
+              rootBone = child
+            }
+          }
+        })
+
+        if (rootBone) {
+          this.skeletonHelper = new THREE.SkeletonHelper(rootBone)
+          this.scene.add(this.skeletonHelper)
+        } else {
+          let skinnedMesh: THREE.SkinnedMesh | null = null
+          this.currentModel.traverse((child) => {
+            if (child instanceof THREE.SkinnedMesh && !skinnedMesh) {
+              skinnedMesh = child
+            }
+          })
+
+          if (skinnedMesh) {
+            this.skeletonHelper = new THREE.SkeletonHelper(skinnedMesh)
+            this.scene.add(this.skeletonHelper)
+          }
+        }
+      } else if (this.skeletonHelper) {
+        this.skeletonHelper.visible = true
+      }
+    } else {
+      if (this.skeletonHelper) {
+        this.skeletonHelper.visible = false
+      }
+    }
+
+    this.eventManager.emitEvent('skeletonVisibilityChange', show)
+  }
+
   addModelToScene(model: THREE.Object3D): void {
     this.currentModel = model
     model.name = 'MainModel'
diff --git a/src/extensions/core/load3d/ViewHelperManager.ts b/src/extensions/core/load3d/ViewHelperManager.ts
index 380153ed0d..f7824f1685 100644
--- a/src/extensions/core/load3d/ViewHelperManager.ts
+++ b/src/extensions/core/load3d/ViewHelperManager.ts
@@ -14,16 +14,13 @@ export class ViewHelperManager implements ViewHelperManagerInterface {
   private getActiveCamera: () => THREE.Camera
   private getControls: () => OrbitControls
   private eventManager: EventManagerInterface
-  // @ts-expect-error unused variable
-  private renderer: THREE.WebGLRenderer
 
   constructor(
-    renderer: THREE.WebGLRenderer,
+    _renderer: THREE.WebGLRenderer,
     getActiveCamera: () => THREE.Camera,
     getControls: () => OrbitControls,
     eventManager: EventManagerInterface
   ) {
-    this.renderer = renderer
     this.getActiveCamera = getActiveCamera
     this.getControls = getControls
     this.eventManager = eventManager
diff --git a/src/extensions/core/load3d/constants.ts b/src/extensions/core/load3d/constants.ts
new file mode 100644
index 0000000000..b142da44a9
--- /dev/null
+++ b/src/extensions/core/load3d/constants.ts
@@ -0,0 +1,18 @@
+/**
+ * Load3D constants that don't require THREE.js
+ * This file can be imported without pulling in the entire THREE.js bundle
+ */
+
+export const SUPPORTED_EXTENSIONS = new Set([
+  '.gltf',
+  '.glb',
+  '.obj',
+  '.fbx',
+  '.stl',
+  '.spz',
+  '.splat',
+  '.ply',
+  '.ksplat'
+])
+
+export const SUPPORTED_EXTENSIONS_ACCEPT = [...SUPPORTED_EXTENSIONS].join(',')
diff --git a/src/extensions/core/load3d/interfaces.ts b/src/extensions/core/load3d/interfaces.ts
index 7954f6bfe9..6563eaa2d7 100644
--- a/src/extensions/core/load3d/interfaces.ts
+++ b/src/extensions/core/load3d/interfaces.ts
@@ -1,11 +1,13 @@
-import * as THREE from 'three'
-import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls'
-import { ViewHelper } from 'three/examples/jsm/helpers/ViewHelper'
-import { FBXLoader } from 'three/examples/jsm/loaders/FBXLoader'
-import { type GLTF, GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader'
-import { MTLLoader } from 'three/examples/jsm/loaders/MTLLoader'
-import { STLLoader } from 'three/examples/jsm/loaders/STLLoader'
-import { type OBJLoader2Parallel } from 'wwobjloader2'
+// Use type-only imports to avoid pulling THREE.js into the main bundle
+// These imports are erased at compile time and don't create runtime dependencies
+import type * as THREE from 'three'
+import type { OrbitControls } from 'three/examples/jsm/controls/OrbitControls'
+import type { ViewHelper } from 'three/examples/jsm/helpers/ViewHelper'
+import type { FBXLoader } from 'three/examples/jsm/loaders/FBXLoader'
+import type { GLTF, GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader'
+import type { MTLLoader } from 'three/examples/jsm/loaders/MTLLoader'
+import type { STLLoader } from 'three/examples/jsm/loaders/STLLoader'
+import type { OBJLoader2Parallel } from 'wwobjloader2'
 
 export type MaterialMode =
   | 'original'
@@ -34,6 +36,7 @@ export interface SceneConfig {
 export interface ModelConfig {
   upDirection: UpDirection
   materialMode: MaterialMode
+  showSkeleton: boolean
 }
 
 export interface CameraConfig {
@@ -46,8 +49,8 @@ export interface LightConfig {
   intensity: number
 }
 
-export interface EventCallback {
-  (data?: any): void
+export interface EventCallback<T = unknown> {
+  (data: T): void
 }
 
 export interface Load3DOptions {
@@ -127,9 +130,9 @@ export interface ViewHelperManagerInterface extends BaseManager {
 }
 
 export interface EventManagerInterface {
-  addEventListener(event: string, callback: EventCallback): void
-  removeEventListener(event: string, callback: EventCallback): void
-  emitEvent(event: string, data?: any): void
+  addEventListener<T>(event: string, callback: EventCallback<T>): void
+  removeEventListener<T>(event: string, callback: EventCallback<T>): void
+  emitEvent<T>(event: string, data: T): void
 }
 
 export interface AnimationManagerInterface extends BaseManager {
@@ -140,7 +143,10 @@ export interface AnimationManagerInterface extends BaseManager {
   isAnimationPlaying: boolean
   animationSpeed: number
 
-  setupModelAnimations(model: THREE.Object3D, originalModel: any): void
+  setupModelAnimations(
+    model: THREE.Object3D,
+    originalModel: THREE.Object3D | THREE.BufferGeometry | GLTF | null
+  ): void
   updateAnimationList(): void
   setAnimationSpeed(speed: number): void
   updateSelectedAnimation(index: number): void
@@ -188,15 +194,3 @@ export interface LoaderManagerInterface {
   dispose(): void
   loadModel(url: string, originalFileName?: string): Promise<void>
 }
-
-export const SUPPORTED_EXTENSIONS = new Set([
-  '.gltf',
-  '.glb',
-  '.obj',
-  '.fbx',
-  '.stl',
-  '.spz',
-  '.splat',
-  '.ply',
-  '.ksplat'
-])
diff --git a/src/extensions/core/load3dLazy.ts b/src/extensions/core/load3dLazy.ts
new file mode 100644
index 0000000000..fa777b56f9
--- /dev/null
+++ b/src/extensions/core/load3dLazy.ts
@@ -0,0 +1,83 @@
+/**
+ * Lazy loader for 3D extensions (Load3D, Preview3D, SaveGLB)
+ *
+ * This module defers loading of THREE.js (~1.8MB) until a 3D node is actually
+ * used in a workflow. The heavy imports are only loaded when:
+ * - A workflow containing 3D nodes is loaded
+ * - A user adds a 3D node from the node menu
+ */
+
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
+import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'
+import { app } from '@/scripts/app'
+import { useExtensionService } from '@/services/extensionService'
+import { useExtensionStore } from '@/stores/extensionStore'
+
+import type { ComfyExtension } from '@/types/comfy'
+
+const LOAD3D_NODE_TYPES = new Set(['Load3D', 'Preview3D', 'SaveGLB'])
+
+let load3dExtensionsLoaded = false
+let load3dExtensionsLoading: Promise<ComfyExtension[]> | null = null
+
+/**
+ * Dynamically load the 3D extensions (and THREE.js) on demand.
+ * Returns the list of newly registered extensions so the caller can
+ * replay hooks that they missed.
+ */
+async function loadLoad3dExtensions(): Promise<ComfyExtension[]> {
+  if (load3dExtensionsLoaded) return []
+
+  if (load3dExtensionsLoading) {
+    return load3dExtensionsLoading
+  }
+
+  load3dExtensionsLoading = (async () => {
+    const before = new Set(useExtensionStore().enabledExtensions)
+    // Import both extensions - they will self-register via useExtensionService()
+    await Promise.all([import('./load3d'), import('./saveMesh')])
+    load3dExtensionsLoaded = true
+    return useExtensionStore().enabledExtensions.filter(
+      (ext) => !before.has(ext)
+    )
+  })()
+
+  return load3dExtensionsLoading
+}
+
+/**
+ * Check if a node type is a 3D node that requires THREE.js
+ */
+function isLoad3dNodeType(nodeTypeName: string): boolean {
+  return LOAD3D_NODE_TYPES.has(nodeTypeName)
+}
+
+// Register a lightweight extension that triggers lazy loading
+useExtensionService().registerExtension({
+  name: 'Comfy.Load3DLazy',
+
+  async beforeRegisterNodeDef(
+    nodeType: typeof LGraphNode,
+    nodeData: ComfyNodeDef
+  ) {
+    if (isLoad3dNodeType(nodeData.name)) {
+      // Inject mesh_upload spec flags so WidgetSelect.vue can detect
+      // Load3D's model_file as a mesh upload widget without hardcoding.
+      if (nodeData.name === 'Load3D') {
+        const modelFile = nodeData.input?.required?.model_file
+        if (modelFile?.[1]) {
+          modelFile[1].mesh_upload = true
+          modelFile[1].upload_subfolder = '3d'
+        }
+      }
+
+      // Load the 3D extensions and replay their beforeRegisterNodeDef hooks,
+      // since invokeExtensionsAsync already captured the extensions snapshot
+      // before these new extensions were registered.
+      const newExtensions = await loadLoad3dExtensions()
+      for (const ext of newExtensions) {
+        await ext.beforeRegisterNodeDef?.(nodeType, nodeData, app)
+      }
+    }
+  }
+})
diff --git a/src/extensions/core/maskeditor.ts b/src/extensions/core/maskeditor.ts
index 406fdcd7d4..550bec00a6 100644
--- a/src/extensions/core/maskeditor.ts
+++ b/src/extensions/core/maskeditor.ts
@@ -5,6 +5,7 @@ import { app, ComfyApp } from '@/scripts/app'
 import { useMaskEditorStore } from '@/stores/maskEditorStore'
 import { useDialogStore } from '@/stores/dialogStore'
 import { useMaskEditor } from '@/composables/maskeditor/useMaskEditor'
+import { useCanvasTransform } from '@/composables/maskeditor/useCanvasTransform'
 
 function openMaskEditor(node: LGraphNode): void {
   if (!node) {
@@ -109,6 +110,42 @@ app.registerExtension({
         const store = useMaskEditorStore()
         store.colorInput?.click()
       }
+    },
+    {
+      id: 'Comfy.MaskEditor.Rotate.Right',
+      icon: 'pi pi-refresh',
+      label: 'Rotate Right in MaskEditor',
+      function: async () => {
+        if (!isOpened()) return
+        await useCanvasTransform().rotateClockwise()
+      }
+    },
+    {
+      id: 'Comfy.MaskEditor.Rotate.Left',
+      icon: 'pi pi-undo',
+      label: 'Rotate Left in MaskEditor',
+      function: async () => {
+        if (!isOpened()) return
+        await useCanvasTransform().rotateCounterclockwise()
+      }
+    },
+    {
+      id: 'Comfy.MaskEditor.Mirror.Horizontal',
+      icon: 'pi pi-arrows-h',
+      label: 'Mirror Horizontal in MaskEditor',
+      function: async () => {
+        if (!isOpened()) return
+        await useCanvasTransform().mirrorHorizontal()
+      }
+    },
+    {
+      id: 'Comfy.MaskEditor.Mirror.Vertical',
+      icon: 'pi pi-arrows-v',
+      label: 'Mirror Vertical in MaskEditor',
+      function: async () => {
+        if (!isOpened()) return
+        await useCanvasTransform().mirrorVertical()
+      }
     }
   ],
   init() {
diff --git a/src/extensions/core/nightlyBadges.ts b/src/extensions/core/nightlyBadges.ts
new file mode 100644
index 0000000000..a453a63971
--- /dev/null
+++ b/src/extensions/core/nightlyBadges.ts
@@ -0,0 +1,17 @@
+import { t } from '@/i18n'
+import { useExtensionService } from '@/services/extensionService'
+import type { TopbarBadge } from '@/types/comfy'
+
+const badges: TopbarBadge[] = [
+  {
+    text: t('nightly.badge.label'),
+    label: t('g.nightly'),
+    variant: 'warning',
+    tooltip: t('nightly.badge.tooltip')
+  }
+]
+
+useExtensionService().registerExtension({
+  name: 'Comfy.Nightly.Badges',
+  topbarBadges: badges
+})
diff --git a/src/extensions/core/nodeTemplates.ts b/src/extensions/core/nodeTemplates.ts
index 457f54c482..532fbc410f 100644
--- a/src/extensions/core/nodeTemplates.ts
+++ b/src/extensions/core/nodeTemplates.ts
@@ -32,9 +32,13 @@ import { GroupNodeConfig, GroupNodeHandler } from './groupNode'
 const id = 'Comfy.NodeTemplates'
 const file = 'comfy.templates.json'
 
+interface NodeTemplate {
+  name: string
+  data: string
+}
+
 class ManageTemplates extends ComfyDialog {
-  // @ts-expect-error fixme ts strict error
-  templates: any[]
+  templates: NodeTemplate[] = []
   draggedEl: HTMLElement | null
   saveVisualCue: number | null
   emptyImg: HTMLImageElement
@@ -370,9 +374,10 @@ const ext: ComfyExtension = {
             const node = app.canvas.graph?.getNodeById(nodeIds[i])
             const nodeData = node?.constructor.nodeData
 
-            let groupData = GroupNodeHandler.getGroupData(node)
-            if (groupData) {
-              groupData = groupData.nodeData
+            if (!node) continue
+            const groupConfig = GroupNodeHandler.getGroupData(node)
+            if (groupConfig) {
+              const groupData = groupConfig.nodeData
               // @ts-expect-error
               if (!data.groupNodes) {
                 // @ts-expect-error
@@ -402,7 +407,10 @@ const ext: ComfyExtension = {
         callback: () => {
           clipboardAction(async () => {
             const data = JSON.parse(t.data)
-            await GroupNodeConfig.registerFromWorkflow(data.groupNodes, {})
+            await GroupNodeConfig.registerFromWorkflow(
+              data.groupNodes ?? {},
+              []
+            )
 
             // Check for old clipboard format
             if (!data.reroutes) {
diff --git a/src/extensions/core/painter.ts b/src/extensions/core/painter.ts
new file mode 100644
index 0000000000..159a6a4271
--- /dev/null
+++ b/src/extensions/core/painter.ts
@@ -0,0 +1,22 @@
+import { useExtensionService } from '@/services/extensionService'
+
+const HIDDEN_WIDGETS = new Set(['width', 'height', 'bg_color'])
+
+useExtensionService().registerExtension({
+  name: 'Comfy.Painter',
+
+  nodeCreated(node) {
+    if (node.constructor.comfyClass !== 'Painter') return
+
+    const [oldWidth, oldHeight] = node.size
+    node.setSize([Math.max(oldWidth, 450), Math.max(oldHeight, 550)])
+
+    node.hideOutputImages = true
+
+    for (const widget of node.widgets ?? []) {
+      if (HIDDEN_WIDGETS.has(widget.name)) {
+        widget.options.hidden = true
+      }
+    }
+  }
+})
diff --git a/src/extensions/core/previewAny.ts b/src/extensions/core/previewAny.ts
index 89fcf3cd8a..02d07ae4bf 100644
--- a/src/extensions/core/previewAny.ts
+++ b/src/extensions/core/previewAny.ts
@@ -3,6 +3,8 @@ Preview Any - original implement from
 https://github.com/rgthree/rgthree-comfy/blob/main/py/display_any.py
 upstream requested in https://github.com/Kosinkadink/rfcs/blob/main/rfcs/0000-corenodes.md#preview-nodes
  */
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
+import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'
 import { app } from '@/scripts/app'
 import { type DOMWidget } from '@/scripts/domWidget'
 import { ComfyWidgets } from '@/scripts/widgets'
@@ -10,7 +12,10 @@ import { useExtensionService } from '@/services/extensionService'
 
 useExtensionService().registerExtension({
   name: 'Comfy.PreviewAny',
-  async beforeRegisterNodeDef(nodeType, nodeData) {
+  async beforeRegisterNodeDef(
+    nodeType: typeof LGraphNode,
+    nodeData: ComfyNodeDef
+  ) {
     if (nodeData.name === 'PreviewAny') {
       const onNodeCreated = nodeType.prototype.onNodeCreated
 
@@ -19,14 +24,14 @@ useExtensionService().registerExtension({
 
         const showValueWidget = ComfyWidgets['MARKDOWN'](
           this,
-          'preview',
+          'preview_markdown',
           ['MARKDOWN', {}],
           app
         ).widget as DOMWidget<HTMLTextAreaElement, string>
 
         const showValueWidgetPlain = ComfyWidgets['STRING'](
           this,
-          'preview',
+          'preview_text',
           ['STRING', { multiline: true }],
           app
         ).widget as DOMWidget<HTMLTextAreaElement, string>
@@ -41,25 +46,25 @@ useExtensionService().registerExtension({
           app
         )
 
-        showAsPlaintextWidget.widget.callback = (value) => {
+        showAsPlaintextWidget.widget.callback = (value: boolean) => {
           showValueWidget.hidden = !value
           showValueWidget.options.hidden = !value
           showValueWidgetPlain.hidden = value
           showValueWidgetPlain.options.hidden = value
         }
 
+        showValueWidget.label = 'Preview'
         showValueWidget.hidden = true
         showValueWidget.options.hidden = true
         showValueWidget.options.read_only = true
         showValueWidget.element.readOnly = true
-        showValueWidget.element.disabled = true
         showValueWidget.serialize = false
 
+        showValueWidgetPlain.label = 'Preview'
         showValueWidgetPlain.hidden = false
         showValueWidgetPlain.options.hidden = false
         showValueWidgetPlain.options.read_only = true
         showValueWidgetPlain.element.readOnly = true
-        showValueWidgetPlain.element.disabled = true
         showValueWidgetPlain.serialize = false
       }
 
@@ -71,11 +76,13 @@ useExtensionService().registerExtension({
           : onExecuted.apply(this, [message])
 
         const previewWidgets =
-          this.widgets?.filter((w) => w.name === 'preview') ?? []
+          this.widgets?.filter((w) => w.name.startsWith('preview_')) ?? []
 
         for (const previewWidget of previewWidgets) {
           const text = message.text ?? ''
-          previewWidget.value = Array.isArray(text) ? (text[0] ?? '') : text
+          previewWidget.value = Array.isArray(text)
+            ? (text?.join('\n\n') ?? '')
+            : text
         }
       }
     }
diff --git a/src/extensions/core/rerouteNode.ts b/src/extensions/core/rerouteNode.ts
index 44c3f3150f..522ce14361 100644
--- a/src/extensions/core/rerouteNode.ts
+++ b/src/extensions/core/rerouteNode.ts
@@ -13,7 +13,7 @@ import { getWidgetConfig, mergeIfValid, setWidgetConfig } from './widgetInputs'
 
 app.registerExtension({
   name: 'Comfy.RerouteNode',
-  registerCustomNodes(app) {
+  registerCustomNodes() {
     interface RerouteNode extends LGraphNode {
       __outputType?: string | number
     }
diff --git a/src/extensions/core/saveImageExtraOutput.ts b/src/extensions/core/saveImageExtraOutput.ts
index f216f31a7d..3f53a68013 100644
--- a/src/extensions/core/saveImageExtraOutput.ts
+++ b/src/extensions/core/saveImageExtraOutput.ts
@@ -1,3 +1,5 @@
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
+import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'
 import { applyTextReplacements } from '@/utils/searchAndReplace'
 
 import { app } from '../../scripts/app'
@@ -21,7 +23,10 @@ const saveNodeTypes = new Set([
 
 app.registerExtension({
   name: 'Comfy.SaveImageExtraOutput',
-  async beforeRegisterNodeDef(nodeType, nodeData, app) {
+  async beforeRegisterNodeDef(
+    nodeType: typeof LGraphNode,
+    nodeData: ComfyNodeDef
+  ) {
     if (saveNodeTypes.has(nodeData.name)) {
       const onNodeCreated = nodeType.prototype.onNodeCreated
       // When the SaveImage node is created we want to override the serialization of the output name widget to run our S&R
diff --git a/src/extensions/core/saveMesh.ts b/src/extensions/core/saveMesh.ts
index 9fb33ef94c..b7d5d30749 100644
--- a/src/extensions/core/saveMesh.ts
+++ b/src/extensions/core/saveMesh.ts
@@ -4,9 +4,16 @@ import Load3D from '@/components/load3d/Load3D.vue'
 import { useLoad3d } from '@/composables/useLoad3d'
 import { createExportMenuItems } from '@/extensions/core/load3d/exportMenuHelper'
 import Load3DConfiguration from '@/extensions/core/load3d/Load3DConfiguration'
+import Load3dUtils from '@/extensions/core/load3d/Load3dUtils'
 import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
 import type { IContextMenuValue } from '@/lib/litegraph/src/interfaces'
-import { type CustomInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
+import type { NodeOutputWith, ResultItem } from '@/schemas/apiSchema'
+import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'
+
+type SaveMeshOutput = NodeOutputWith<{
+  '3d'?: ResultItem[]
+}>
+import type { CustomInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
 import { ComponentWidgetImpl, addWidget } from '@/scripts/domWidget'
 import { useExtensionService } from '@/services/extensionService'
 import { useLoad3dService } from '@/services/load3dService'
@@ -20,7 +27,10 @@ const inputSpec: CustomInputSpec = {
 useExtensionService().registerExtension({
   name: 'Comfy.SaveGLB',
 
-  async beforeRegisterNodeDef(_nodeType, nodeData) {
+  async beforeRegisterNodeDef(
+    _nodeType: typeof LGraphNode,
+    nodeData: ComfyNodeDef
+  ) {
     if ('SaveGLB' === nodeData.name) {
       // @ts-expect-error InputSpec is not typed correctly
       nodeData.input.required.image = ['PREVIEW_3D']
@@ -59,7 +69,7 @@ useExtensionService().registerExtension({
     return createExportMenuItems(load3d)
   },
 
-  async nodeCreated(node) {
+  async nodeCreated(node: LGraphNode) {
     if (node.constructor.comfyClass !== 'SaveGLB') return
 
     const [oldWidth, oldHeight] = node.size
@@ -70,22 +80,37 @@ useExtensionService().registerExtension({
 
     const onExecuted = node.onExecuted
 
-    node.onExecuted = function (message: any) {
-      onExecuted?.apply(this, arguments as any)
+    node.onExecuted = function (output: SaveMeshOutput) {
+      onExecuted?.call(this, output)
 
-      const fileInfo = message['3d'][0]
+      const fileInfo = output['3d']?.[0]
+
+      if (!fileInfo) return
 
       useLoad3d(node).waitForLoad3d((load3d) => {
         const modelWidget = node.widgets?.find((w) => w.name === 'image')
 
         if (load3d && modelWidget) {
-          const filePath = fileInfo['subfolder'] + '/' + fileInfo['filename']
+          const filePath =
+            (fileInfo.subfolder ?? '') + '/' + (fileInfo.filename ?? '')
 
           modelWidget.value = filePath
 
           const config = new Load3DConfiguration(load3d, node.properties)
 
-          config.configureForSaveMesh(fileInfo['type'], filePath)
+          const loadFolder = fileInfo.type as 'input' | 'output'
+
+          const onModelLoaded = () => {
+            load3d.removeEventListener('modelLoadingEnd', onModelLoaded)
+            void Load3dUtils.generateThumbnailIfNeeded(
+              load3d,
+              filePath,
+              loadFolder
+            )
+          }
+          load3d.addEventListener('modelLoadingEnd', onModelLoaded)
+
+          config.configureForSaveMesh(loadFolder, filePath)
         }
       })
     }
diff --git a/src/extensions/core/selectionBorder.ts b/src/extensions/core/selectionBorder.ts
index c4afafad11..fd3e98a91d 100644
--- a/src/extensions/core/selectionBorder.ts
+++ b/src/extensions/core/selectionBorder.ts
@@ -1,4 +1,5 @@
-import { type LGraphCanvas, createBounds } from '@/lib/litegraph/src/litegraph'
+import type { LGraphCanvas, Rectangle } from '@/lib/litegraph/src/litegraph'
+import { createBounds } from '@/lib/litegraph/src/litegraph'
 import { app } from '@/scripts/app'
 
 /**
@@ -56,7 +57,7 @@ const ext = {
 
     app.canvas.onDrawForeground = function (
       ctx: CanvasRenderingContext2D,
-      visibleArea: any
+      visibleArea: Rectangle
     ) {
       // Call original if it exists
       originalDrawForeground?.call(this, ctx, visibleArea)
diff --git a/src/extensions/core/slotDefaults.ts b/src/extensions/core/slotDefaults.ts
index f7ca293a44..cf03ddec6b 100644
--- a/src/extensions/core/slotDefaults.ts
+++ b/src/extensions/core/slotDefaults.ts
@@ -1,3 +1,4 @@
+import type { ComfyExtension } from '@/types/comfy'
 import { LiteGraph } from '@/lib/litegraph/src/litegraph'
 
 import { app } from '../../scripts/app'
@@ -5,10 +6,17 @@ import { ComfyWidgets } from '../../scripts/widgets'
 
 // Adds defaults for quickly adding nodes with middle click on the input/output
 
+interface SlotDefaultsExtension extends ComfyExtension {
+  suggestionsNumber: { value: number } | null
+  slot_types_default_out: Record<string, string[]>
+  slot_types_default_in: Record<string, string[]>
+  setDefaults(maxNum?: number | null): void
+}
+
 app.registerExtension({
   name: 'Comfy.SlotDefaults',
   suggestionsNumber: null,
-  init() {
+  init(this: SlotDefaultsExtension) {
     LiteGraph.search_filter_enabled = true
     LiteGraph.middle_click_slot_add_default_node = true
     this.suggestionsNumber = app.ui.settings.addSetting({
@@ -24,13 +32,13 @@ app.registerExtension({
       },
       defaultValue: 5,
       onChange: (newVal) => {
-        this.setDefaults(newVal)
+        this.setDefaults(newVal as number)
       }
     })
   },
   slot_types_default_out: {},
   slot_types_default_in: {},
-  async beforeRegisterNodeDef(nodeType, nodeData) {
+  async beforeRegisterNodeDef(this: SlotDefaultsExtension, nodeType, nodeData) {
     var nodeId = nodeData.name
     const inputs = nodeData['input']?.['required'] //only show required inputs to reduce the mess also not logical to create node with optional inputs
     for (const inputKey in inputs) {
@@ -83,22 +91,23 @@ app.registerExtension({
       }
     }
 
-    var maxNum = this.suggestionsNumber.value
+    var maxNum = this.suggestionsNumber?.value
     this.setDefaults(maxNum)
   },
-  setDefaults(maxNum?: number | null) {
+  setDefaults(this: SlotDefaultsExtension, maxNum?: number | null) {
     LiteGraph.slot_types_default_out = {}
     LiteGraph.slot_types_default_in = {}
 
+    const max = maxNum ?? undefined
     for (const type in this.slot_types_default_out) {
       LiteGraph.slot_types_default_out[type] = this.slot_types_default_out[
         type
-      ].slice(0, maxNum)
+      ].slice(0, max)
     }
     for (const type in this.slot_types_default_in) {
       LiteGraph.slot_types_default_in[type] = this.slot_types_default_in[
         type
-      ].slice(0, maxNum)
+      ].slice(0, max)
     }
   }
 })
diff --git a/src/extensions/core/uploadAudio.ts b/src/extensions/core/uploadAudio.ts
index 71c2295d10..8b6f65ab26 100644
--- a/src/extensions/core/uploadAudio.ts
+++ b/src/extensions/core/uploadAudio.ts
@@ -1,11 +1,11 @@
 import { MediaRecorder as ExtendableMediaRecorder } from 'extendable-media-recorder'
 
-import { useChainCallback } from '@/composables/functional/useChainCallback'
 import { useNodeDragAndDrop } from '@/composables/node/useNodeDragAndDrop'
 import { useNodeFileInput } from '@/composables/node/useNodeFileInput'
 import { useNodePaste } from '@/composables/node/useNodePaste'
 import { t } from '@/i18n'
 import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import { resolveNodeRootGraphId } from '@/lib/litegraph/src/litegraph'
 import type {
   IBaseWidget,
   IStringWidget
@@ -15,6 +15,7 @@ import {
   getResourceURL,
   splitFilePath
 } from '@/renderer/extensions/vueNodes/widgets/utils/audioUtils'
+import type { NodeExecutionOutput } from '@/schemas/apiSchema'
 import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'
 import type { DOMWidget } from '@/scripts/domWidget'
 import { useAudioService } from '@/services/audioService'
@@ -23,6 +24,18 @@ import { getNodeByLocatorId } from '@/utils/graphTraversalUtil'
 
 import { api } from '../../scripts/api'
 import { app } from '../../scripts/app'
+import { useWidgetValueStore } from '@/stores/widgetValueStore'
+
+function updateUIWidget(
+  audioUIWidget: DOMWidget<HTMLAudioElement, string>,
+  url: string = ''
+) {
+  audioUIWidget.element.src = url
+  audioUIWidget.value = url
+  audioUIWidget.callback?.(url)
+  if (url) audioUIWidget.element.classList.remove('empty-audio-widget')
+  else audioUIWidget.element.classList.add('empty-audio-widget')
+}
 
 async function uploadFile(
   audioWidget: IStringWidget,
@@ -30,7 +43,7 @@ async function uploadFile(
   file: File,
   updateNode: boolean,
   pasted: boolean = false
-) {
+): Promise<boolean> {
   try {
     // Wrap file in formdata so it includes filename
     const body = new FormData()
@@ -54,20 +67,24 @@ async function uploadFile(
       }
 
       if (updateNode) {
-        audioUIWidget.element.src = api.apiURL(
-          getResourceURL(...splitFilePath(path))
+        updateUIWidget(
+          audioUIWidget,
+          api.apiURL(getResourceURL(...splitFilePath(path)))
         )
-        audioWidget.value = path
 
+        audioWidget.value = path
         // Manually trigger the callback to update VueNodes
         audioWidget.callback?.(path)
       }
+      return true
     } else {
       useToastStore().addAlert(resp.status + ' - ' + resp.statusText)
+      return false
     }
   } catch (error) {
     // @ts-expect-error fixme ts strict error
     useToastStore().addAlert(error)
+    return false
   }
 }
 
@@ -75,7 +92,10 @@ async function uploadFile(
 // present.
 app.registerExtension({
   name: 'Comfy.AudioWidget',
-  async beforeRegisterNodeDef(nodeType, nodeData) {
+  async beforeRegisterNodeDef(
+    nodeType: typeof LGraphNode,
+    nodeData: ComfyNodeDef
+  ) {
     if (
       [
         'LoadAudio',
@@ -112,56 +132,69 @@ app.registerExtension({
           audioUIWidget.element.classList.add('empty-audio-widget')
           // Populate the audio widget UI on node execution.
           const onExecuted = node.onExecuted
-          node.onExecuted = function (message: any) {
-            // @ts-expect-error fixme ts strict error
-            onExecuted?.apply(this, arguments)
-            const audios = message.audio
-            if (!audios) return
+          node.onExecuted = function (output: NodeExecutionOutput) {
+            onExecuted?.call(this, output)
+            const audios = output.audio
+            if (!audios?.length) return
             const audio = audios[0]
-            audioUIWidget.element.src = api.apiURL(
-              getResourceURL(audio.subfolder, audio.filename, audio.type)
+            const resourceUrl = getResourceURL(
+              audio.subfolder ?? '',
+              audio.filename ?? '',
+              audio.type
             )
-            audioUIWidget.element.classList.remove('empty-audio-widget')
+            updateUIWidget(audioUIWidget, api.apiURL(resourceUrl))
           }
         }
 
-        audioUIWidget.onRemove = useChainCallback(
-          audioUIWidget.onRemove,
-          () => {
-            if (!audioUIWidget.element) return
-            audioUIWidget.element.pause()
-            audioUIWidget.element.src = ''
-            audioUIWidget.element.remove()
-          }
-        )
+        audioUIWidget.options.getValue = () =>
+          (useWidgetValueStore().getWidget(
+            resolveNodeRootGraphId(node, app.rootGraph.id),
+            node.id,
+            inputName
+          )?.value as string) ?? ''
+        audioUIWidget.options.setValue = (v) => {
+          const graphId = resolveNodeRootGraphId(node, app.rootGraph.id)
+          const widgetState = useWidgetValueStore().getWidget(
+            graphId,
+            node.id,
+            inputName
+          )
+          if (widgetState) widgetState.value = v
+        }
 
         return { widget: audioUIWidget }
       }
     }
   },
-  onNodeOutputsUpdated(nodeOutputs: Record<NodeLocatorId, any>) {
+  onNodeOutputsUpdated(
+    nodeOutputs: Record<NodeLocatorId, NodeExecutionOutput>
+  ) {
     for (const [nodeLocatorId, output] of Object.entries(nodeOutputs)) {
-      if ('audio' in output) {
-        const node = getNodeByLocatorId(app.rootGraph, nodeLocatorId)
-        if (!node) continue
+      if (!output.audio?.length) continue
 
-        // @ts-expect-error fixme ts strict error
-        const audioUIWidget = node.widgets.find(
-          (w) => w.name === 'audioUI'
-        ) as unknown as DOMWidget<HTMLAudioElement, string>
-        const audio = output.audio[0]
-        audioUIWidget.element.src = api.apiURL(
-          getResourceURL(audio.subfolder, audio.filename, audio.type)
-        )
-        audioUIWidget.element.classList.remove('empty-audio-widget')
-      }
+      const node = getNodeByLocatorId(app.rootGraph, nodeLocatorId)
+      if (!node) continue
+
+      const audioUIWidget = node.widgets?.find(
+        (w) => w.name === 'audioUI'
+      ) as unknown as DOMWidget<HTMLAudioElement, string>
+      const audio = output.audio[0]
+      const resourceUrl = getResourceURL(
+        audio.subfolder ?? '',
+        audio.filename ?? '',
+        audio.type
+      )
+      updateUIWidget(audioUIWidget, api.apiURL(resourceUrl))
     }
   }
 })
 
 app.registerExtension({
   name: 'Comfy.UploadAudio',
-  async beforeRegisterNodeDef(_nodeType, nodeData: ComfyNodeDef) {
+  async beforeRegisterNodeDef(
+    _nodeType: typeof LGraphNode,
+    nodeData: ComfyNodeDef
+  ) {
     if (nodeData?.input?.required?.audio?.[1]?.audio_upload === true) {
       nodeData.input.required.upload = ['AUDIOUPLOAD', {}]
     }
@@ -178,18 +211,18 @@ app.registerExtension({
         const audioUIWidget = node.widgets.find(
           (w) => w.name === 'audioUI'
         ) as unknown as DOMWidget<HTMLAudioElement, string>
-        audioUIWidget.options.canvasOnly = true
 
         const onAudioWidgetUpdate = () => {
-          if (typeof audioWidget.value !== 'string') return
-          audioUIWidget.element.src = api.apiURL(
-            getResourceURL(...splitFilePath(audioWidget.value))
+          updateUIWidget(
+            audioUIWidget,
+            api.apiURL(
+              getResourceURL(...splitFilePath(audioWidget.value ?? ''))
+            )
           )
         }
         // Initially load default audio file to audioUIWidget.
-        if (audioWidget.value) {
-          onAudioWidgetUpdate()
-        }
+        onAudioWidgetUpdate()
+
         audioWidget.callback = onAudioWidgetUpdate
 
         // Load saved audio file widget values if restoring from workflow
@@ -197,14 +230,22 @@ app.registerExtension({
         node.onGraphConfigured = function () {
           // @ts-expect-error fixme ts strict error
           onGraphConfigured?.apply(this, arguments)
-          if (audioWidget.value) {
-            onAudioWidgetUpdate()
-          }
+          onAudioWidgetUpdate()
         }
 
         const handleUpload = async (files: File[]) => {
           if (files?.length) {
-            uploadFile(audioWidget, audioUIWidget, files[0], true)
+            const previousValue = audioWidget.value
+            audioWidget.value = files[0].name
+            const success = await uploadFile(
+              audioWidget,
+              audioUIWidget,
+              files[0],
+              true
+            )
+            if (!success) {
+              audioWidget.value = previousValue
+            }
           }
           return files
         }
@@ -323,7 +364,7 @@ app.registerExtension({
                     URL.revokeObjectURL(audioUIWidget.element.src)
                   }
 
-                  audioUIWidget.element.src = URL.createObjectURL(audioBlob)
+                  updateUIWidget(audioUIWidget, URL.createObjectURL(audioBlob))
 
                   isRecording = false
 
@@ -403,7 +444,7 @@ app.registerExtension({
     }
   },
 
-  async nodeCreated(node) {
+  async nodeCreated(node: LGraphNode) {
     if (node.constructor.comfyClass !== 'RecordAudio') return
 
     await useAudioService().registerWavEncoder()
diff --git a/src/extensions/core/uploadImage.ts b/src/extensions/core/uploadImage.ts
index 4cb910dae1..58e43bb218 100644
--- a/src/extensions/core/uploadImage.ts
+++ b/src/extensions/core/uploadImage.ts
@@ -1,27 +1,14 @@
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
 import {
   type ComfyNodeDef,
   type InputSpec,
-  isComboInputSpecV1
+  isMediaUploadComboInput
 } from '@/schemas/nodeDefSchema'
 
 import { app } from '../../scripts/app'
 
 // Adds an upload button to the nodes
 
-const isMediaUploadComboInput = (inputSpec: InputSpec) => {
-  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')
-  )
-}
-
 const createUploadInput = (
   imageInputName: string,
   imageInputOptions: InputSpec
@@ -35,7 +22,7 @@ const createUploadInput = (
 
 app.registerExtension({
   name: 'Comfy.UploadImage',
-  beforeRegisterNodeDef(_nodeType, nodeData: ComfyNodeDef) {
+  beforeRegisterNodeDef(_nodeType: typeof LGraphNode, nodeData: ComfyNodeDef) {
     const { input } = nodeData ?? {}
     const { required } = input ?? {}
     if (!required) return
diff --git a/src/extensions/core/webcamCapture.ts b/src/extensions/core/webcamCapture.ts
index 6c02229c5f..87d545d655 100644
--- a/src/extensions/core/webcamCapture.ts
+++ b/src/extensions/core/webcamCapture.ts
@@ -1,4 +1,5 @@
 import { t } from '@/i18n'
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
 import { useToastStore } from '@/platform/updates/common/toastStore'
 
 import { api } from '../../scripts/api'
@@ -66,7 +67,7 @@ app.registerExtension({
       }
     }
   },
-  nodeCreated(node) {
+  nodeCreated(node: LGraphNode) {
     if ((node.type, node.constructor.comfyClass !== 'WebcamCapture')) return
 
     // @ts-expect-error fixme ts strict error
diff --git a/src/extensions/core/widgetInputs.ts b/src/extensions/core/widgetInputs.ts
index c7f9f6eb82..b4a69a3e4a 100644
--- a/src/extensions/core/widgetInputs.ts
+++ b/src/extensions/core/widgetInputs.ts
@@ -1,7 +1,4 @@
-import {
-  type CallbackParams,
-  useChainCallback
-} from '@/composables/functional/useChainCallback'
+import { useChainCallback } from '@/composables/functional/useChainCallback'
 import { LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph'
 import type {
   INodeInputSlot,
@@ -11,22 +8,27 @@ import type {
 } from '@/lib/litegraph/src/litegraph'
 import { NodeSlot } from '@/lib/litegraph/src/node/NodeSlot'
 import type { CanvasPointerEvent } from '@/lib/litegraph/src/types/events'
-import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
-import type { InputSpec } from '@/schemas/nodeDefSchema'
+import type {
+  IBaseWidget,
+  TWidgetValue
+} from '@/lib/litegraph/src/types/widgets'
+import { assetService } from '@/platform/assets/services/assetService'
+import { createAssetWidget } from '@/platform/assets/utils/createAssetWidget'
+import type { ComfyNodeDef, InputSpec } from '@/schemas/nodeDefSchema'
 import { app } from '@/scripts/app'
 import {
   ComfyWidgets,
   addValueControlWidgets,
   isValidWidgetType
 } from '@/scripts/widgets'
+import { isPrimitiveNode } from '@/renderer/utils/nodeTypeGuards'
 import { CONFIG, GET_CONFIG } from '@/services/litegraphService'
 import { mergeInputSpec } from '@/utils/nodeDefUtil'
 import { applyTextReplacements } from '@/utils/searchAndReplace'
-import { isPrimitiveNode } from '@/renderer/utils/nodeTypeGuards'
 
 const replacePropertyName = 'Run widget replace on values'
 export class PrimitiveNode extends LGraphNode {
-  controlValues?: any[]
+  controlValues?: TWidgetValue[]
   lastType?: string
   static override category: string
   constructor(title: string) {
@@ -103,20 +105,20 @@ export class PrimitiveNode extends LGraphNode {
 
   override onAfterGraphConfigured() {
     if (this.outputs[0].links?.length && !this.widgets?.length) {
-      this.#onFirstConnection()
+      this._onFirstConnection()
 
       // Populate widget values from config data
       if (this.widgets && this.widgets_values) {
         for (let i = 0; i < this.widgets_values.length; i++) {
           const w = this.widgets[i]
           if (w) {
-            w.value = this.widgets_values[i] as any
+            w.value = this.widgets_values[i]
           }
         }
       }
 
       // Merge values if required
-      this.#mergeWidgetConfig()
+      this._mergeWidgetConfig()
     }
   }
 
@@ -133,11 +135,11 @@ export class PrimitiveNode extends LGraphNode {
     const links = this.outputs[0].links
     if (connected) {
       if (links?.length && !this.widgets?.length) {
-        this.#onFirstConnection()
+        this._onFirstConnection()
       }
     } else {
       // We may have removed a link that caused the constraints to change
-      this.#mergeWidgetConfig()
+      this._mergeWidgetConfig()
 
       if (!links?.length) {
         this.onLastDisconnect()
@@ -159,7 +161,7 @@ export class PrimitiveNode extends LGraphNode {
     }
 
     if (this.outputs[slot].links?.length) {
-      const valid = this.#isValidConnection(input)
+      const valid = this._isValidConnection(input)
       if (valid) {
         // On connect of additional outputs, copy our value to their widget
         this.applyToGraph([{ target_id: target_node.id, target_slot } as LLink])
@@ -170,7 +172,7 @@ export class PrimitiveNode extends LGraphNode {
     return true
   }
 
-  #onFirstConnection(recreating?: boolean) {
+  private _onFirstConnection(recreating?: boolean) {
     // First connection can fire before the graph is ready on initial load so random things can be missing
     if (!this.outputs[0].links || !this.graph) {
       this.onLastDisconnect()
@@ -204,7 +206,7 @@ export class PrimitiveNode extends LGraphNode {
     this.outputs[0].name = type
     this.outputs[0].widget = widget
 
-    this.#createWidget(
+    this._createWidget(
       widget[CONFIG] ?? config,
       theirNode,
       widget.name,
@@ -213,7 +215,7 @@ export class PrimitiveNode extends LGraphNode {
     )
   }
 
-  #createWidget(
+  private _createWidget(
     inputData: InputSpec,
     node: LGraphNode,
     widgetName: string,
@@ -228,6 +230,18 @@ export class PrimitiveNode extends LGraphNode {
     // Store current size as addWidget resizes the node
     const [oldWidth, oldHeight] = this.size
     let widget: IBaseWidget
+
+    if (
+      type === 'COMBO' &&
+      assetService.shouldUseAssetBrowser(node.comfyClass, widgetName)
+    ) {
+      widget = this._createAssetWidget(node, widgetName, inputData)
+      const theirWidget = node.widgets?.find((w) => w.name === widgetName)
+      if (theirWidget) widget.value = theirWidget.value
+      this._finalizeWidget(widget, oldWidth, oldHeight, recreating)
+      return
+    }
+
     if (isValidWidgetType(type)) {
       widget = (ComfyWidgets[type](this, 'value', inputData, app) || {}).widget
     } else {
@@ -277,20 +291,50 @@ export class PrimitiveNode extends LGraphNode {
       }
     }
 
-    // When our value changes, update other widgets to reflect our changes
-    // e.g. so LoadImage shows correct image
+    this._finalizeWidget(widget, oldWidth, oldHeight, recreating)
+  }
+
+  private _createAssetWidget(
+    targetNode: LGraphNode,
+    targetInputName: string,
+    inputData: InputSpec
+  ): IBaseWidget {
+    const defaultValue = inputData[1]?.default as string | undefined
+    return createAssetWidget({
+      node: this,
+      widgetName: 'value',
+      nodeTypeForBrowser: targetNode.comfyClass ?? '',
+      inputNameForBrowser: targetInputName,
+      defaultValue,
+      onValueChange: (widget, newValue, oldValue) => {
+        widget.callback?.(
+          widget.value,
+          app.canvas,
+          this,
+          app.canvas.graph_mouse,
+          {} as CanvasPointerEvent
+        )
+        this.onWidgetChanged?.(widget.name, newValue, oldValue, widget)
+      }
+    })
+  }
+
+  private _finalizeWidget(
+    widget: IBaseWidget,
+    oldWidth: number,
+    oldHeight: number,
+    recreating: boolean
+  ) {
     widget.callback = useChainCallback(widget.callback, () => {
       this.applyToGraph()
     })
 
-    // Use the biggest dimensions in case the widgets caused the node to grow
     this.setSize([
       Math.max(this.size[0], oldWidth),
       Math.max(this.size[1], oldHeight)
     ])
 
     if (!recreating) {
-      // Grow our node more if required
       const sz = this.computeSize()
       if (this.size[0] < sz[0]) {
         this.size[0] = sz[0]
@@ -307,8 +351,8 @@ export class PrimitiveNode extends LGraphNode {
 
   recreateWidget() {
     const values = this.widgets?.map((w) => w.value)
-    this.#removeWidgets()
-    this.#onFirstConnection(true)
+    this._removeWidgets()
+    this._onFirstConnection(true)
     if (values?.length && this.widgets) {
       for (let i = 0; i < this.widgets.length; i++)
         this.widgets[i].value = values[i]
@@ -316,7 +360,7 @@ export class PrimitiveNode extends LGraphNode {
     return this.widgets?.[0]
   }
 
-  #mergeWidgetConfig() {
+  private _mergeWidgetConfig() {
     // Merge widget configs if the node has multiple outputs
     const output = this.outputs[0]
     const links = output.links ?? []
@@ -348,11 +392,11 @@ export class PrimitiveNode extends LGraphNode {
       const theirInput = theirNode.inputs[link.target_slot]
 
       // Call is valid connection so it can merge the configs when validating
-      this.#isValidConnection(theirInput, hasConfig)
+      this._isValidConnection(theirInput, hasConfig)
     }
   }
 
-  #isValidConnection(input: INodeInputSlot, forceUpdate?: boolean) {
+  private _isValidConnection(input: INodeInputSlot, forceUpdate?: boolean) {
     // Only allow connections where the configs match
     const output = this.outputs?.[0]
     const config2 = (input.widget?.[GET_CONFIG] as () => InputSpec)?.()
@@ -367,7 +411,7 @@ export class PrimitiveNode extends LGraphNode {
     )
   }
 
-  #removeWidgets() {
+  private _removeWidgets() {
     if (this.widgets) {
       // Allow widgets to cleanup
       for (const w of this.widgets) {
@@ -398,7 +442,7 @@ export class PrimitiveNode extends LGraphNode {
     this.outputs[0].name = 'connect to widget input'
     delete this.outputs[0].widget
 
-    this.#removeWidgets()
+    this._removeWidgets()
   }
 }
 
@@ -511,7 +555,10 @@ export function mergeIfValid(
 
 app.registerExtension({
   name: 'Comfy.WidgetInputs',
-  async beforeRegisterNodeDef(nodeType, _nodeData, app) {
+  async beforeRegisterNodeDef(
+    nodeType: typeof LGraphNode,
+    _nodeData: ComfyNodeDef
+  ) {
     // @ts-expect-error adding extra property
     nodeType.prototype.convertWidgetToInput = function (this: LGraphNode) {
       console.warn(
@@ -561,7 +608,7 @@ app.registerExtension({
     const origOnInputDblClick = nodeType.prototype.onInputDblClick
     nodeType.prototype.onInputDblClick = function (
       this: LGraphNode,
-      ...[slot, ...args]: CallbackParams<typeof origOnInputDblClick>
+      ...[slot, ...args]: Parameters<NonNullable<typeof origOnInputDblClick>>
     ) {
       const r = origOnInputDblClick?.apply(this, [slot, ...args])
 
diff --git a/src/i18n.ts b/src/i18n.ts
index 46841c16cf..13f25b0ba7 100644
--- a/src/i18n.ts
+++ b/src/i18n.ts
@@ -30,6 +30,7 @@ const localeLoaders: Record<
 > = {
   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'),
@@ -46,6 +47,7 @@ const nodeDefsLoaders: Record<
 > = {
   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'),
@@ -62,6 +64,7 @@ const commandsLoaders: Record<
 > = {
   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'),
@@ -78,6 +81,7 @@ const settingsLoaders: Record<
 > = {
   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'),
@@ -197,7 +201,6 @@ export const i18n = createI18n({
 })
 
 /** Convenience shorthand: i18n.global */
-/** @deprecated use useI18n */
 export const { t, te, d } = i18n.global
 
 /**
diff --git a/src/lib/litegraph/AGENTS.md b/src/lib/litegraph/AGENTS.md
new file mode 100644
index 0000000000..7aecd566fc
--- /dev/null
+++ b/src/lib/litegraph/AGENTS.md
@@ -0,0 +1,52 @@
+# Litegraph Guidelines
+
+## Code Philosophy
+
+- Write concise, legible, and easily maintainable code
+- Avoid repetition where possible, but not at expense of legibility
+- Prefer running single tests, not the whole suite, for performance
+
+## Widget Serialization
+
+See `docs/WIDGET_SERIALIZATION.md` for the distinction between `widget.serialize` (workflow persistence) and `widget.options.serialize` (API prompt). These are different properties checked by different code paths — a common source of confusion.
+
+## Code Style
+
+- Prefer single line `if` syntax for concise expressions
+- Take advantage of `TypedArray` `subarray` when appropriate
+- The `size` and `pos` properties of `Rectangle` share the same array buffer
+- Prefer returning `undefined` over `null`
+- Type assertions are a last resort (acceptable for legacy code interop)
+
+## Circular Dependencies in Tests
+
+**CRITICAL**: Always import from the barrel export for subgraph code:
+
+```typescript
+// ✅ Correct - barrel import
+import { LGraph, Subgraph, SubgraphNode } from '@/lib/litegraph/src/litegraph'
+
+// ❌ Wrong - causes circular dependency
+import { LGraph } from '@/lib/litegraph/src/LGraph'
+```
+
+**Root cause**: `LGraph` ↔ `Subgraph` circular dependency (Subgraph extends LGraph, LGraph creates Subgraph instances).
+
+## Known Limitations
+
+- Subgraph dynamic input limitations (autogrow/matchtype): see [`src/core/graph/subgraph-dynamic-input-limitations.md`](../../core/graph/subgraph-dynamic-input-limitations.md)
+
+## Test Helpers
+
+```typescript
+import {
+  createTestSubgraph,
+  createTestSubgraphNode
+} from './__fixtures__/subgraphHelpers'
+
+function createTestSetup() {
+  const subgraph = createTestSubgraph()
+  const subgraphNode = createTestSubgraphNode(subgraph)
+  return { subgraph, subgraphNode }
+}
+```
diff --git a/src/lib/litegraph/API.md b/src/lib/litegraph/API.md
index 5604f4e4d3..75982c0224 100644
--- a/src/lib/litegraph/API.md
+++ b/src/lib/litegraph/API.md
@@ -90,11 +90,11 @@ Example usage:
 ```typescript
 const { pointer } = this
 // Click / double click - executed on pointerup
-pointer.onClick = e => node.executeClick(e)
+pointer.onClick = (e) => node.executeClick(e)
 pointer.onDoubleClick = node.gotDoubleClick
 
 // Drag events - executed on pointermove
-pointer.onDragStart = e => {
+pointer.onDragStart = (e) => {
   node.isBeingDragged = true
   canvas.startedDragging(e)
 }
@@ -124,20 +124,20 @@ widget.onPointerDown = function (pointer, node, canvas) {
   const offsetFromNode = [e.canvasX - node.pos[0], e.canvasY - node.pos[1]]
 
   // Click events - no overlap with drag events
-  pointer.onClick = upEvent => {
+  pointer.onClick = (upEvent) => {
     // Provides access to the whole lifecycle of events in every callback
     console.log(pointer.eDown)
     console.log(pointer.eMove ?? "Pointer didn't move")
     console.log(pointer.eUp)
   }
-  pointer.onDoubleClick = upEvent => this.customFunction(upEvent)
+  pointer.onDoubleClick = (upEvent) => this.customFunction(upEvent)
 
   // Runs once before the first onDrag event
   pointer.onDragStart = () => {}
   // Receives every movement event
-  pointer.onDrag = moveEvent => {}
+  pointer.onDrag = (moveEvent) => {}
   // The pointerup event of a drag
-  pointer.onDragEnd = upEvent => {}
+  pointer.onDragEnd = (upEvent) => {}
 
   // Semantics of a "finally" block (try/catch).  Once set, the block always executes.
   pointer.finally = () => {}
@@ -191,7 +191,6 @@ if (canvas.state.hoveringOver & CanvasItem.ResizeSe) element.style.cursor = 'se-
 All are unused and incomplete. Have bugs beyond just typescript typing, and are (currently) not worth maintaining. If any of these features are desired down the track, they can be reimplemented.
 
 - Live mode
-- Subgraph
 - `dragged_node`
 
 ## LiteGraph
diff --git a/src/lib/litegraph/CLAUDE.md b/src/lib/litegraph/CLAUDE.md
index 68f8bea953..dd27f8fabf 100644
--- a/src/lib/litegraph/CLAUDE.md
+++ b/src/lib/litegraph/CLAUDE.md
@@ -1,62 +1,4 @@
-- This codebase has extensive eslint autofix rules and IDEs are configured to use eslint as the format on save tool. Run ESLint instead of manually figuring out whitespace fixes or other trivial style concerns. Review the results and correct any remaining eslint errors.
-- Take advantage of `TypedArray` `subarray` when appropriate.
-- The `size` and `pos` properties of `Rectangle` share the same array buffer (`subarray`); they may be used to set the rectangles size and position.
-- Prefer single line `if` syntax over adding curly braces, when the statement has a very concise expression and concise, single line statement.
-- Do not replace `&&=` or `||=` with `=` when there is no reason to do so. If you do find a reason to remove either `&&=` or `||=`, leave a comment explaining why the removal occurred.
-- You are allowed to research code on https://developer.mozilla.org/ and https://stackoverflow.com without asking.
-- When adding features, always write vitest unit tests using cursor rules in @.cursor
-- When writing methods, prefer returning idiomatic JavaScript `undefined` over `null`.
+<!-- The graphs connect, the nodes align with grace,
+     Yet Claude alone won't join the commonplace. -->
 
-# Bash commands
-
-- `pnpm typecheck` Run the typechecker
-- `pnpm build` Build the project
-- `pnpm lint:fix` Run ESLint
-
-# Code style
-
-- Always prefer best practices when writing code.
-- Write using concise, legible, and easily maintainable code.
-- Avoid repetition where possible, but not at the expense of code legibility.
-- Type assertions are an absolute last resort. In almost all cases, they are a crutch that leads to brittle code.
-
-# Workflow
-
-- Be sure to typecheck when you're done making a series of code changes
-- Prefer running single tests, and not the whole test suite, for performance
-
-# Testing Guidelines
-
-## Avoiding Circular Dependencies in Tests
-
-**CRITICAL**: When writing tests for subgraph-related code, always import from the barrel export to avoid circular dependency issues:
-
-```typescript
-// ✅ CORRECT - Use barrel import
-import { LGraph, Subgraph, SubgraphNode } from "@/lib/litegraph/src/litegraph"
-
-// ❌ WRONG - Direct imports cause circular dependency
-import { LGraph } from "@/lib/litegraph/src/LGraph"
-import { Subgraph } from "@/lib/litegraph/src/subgraph/Subgraph" 
-import { SubgraphNode } from "@/lib/litegraph/src/subgraph/SubgraphNode"
-```
-
-**Root cause**: `LGraph` and `Subgraph` have a circular dependency:
-- `LGraph.ts` imports `Subgraph` (creates instances with `new Subgraph()`)
-- `Subgraph.ts` extends `LGraph` 
-
-The barrel export (`@/litegraph`) handles this properly, but direct imports cause module loading failures.
-
-## Test Setup for Subgraphs
-
-Use the provided test helpers for consistent setup:
-
-```typescript
-import { createTestSubgraph, createTestSubgraphNode } from "./fixtures/subgraphHelpers"
-
-function createTestSetup() {
-  const subgraph = createTestSubgraph()
-  const subgraphNode = createTestSubgraphNode(subgraph)
-  return { subgraph, subgraphNode }
-}
-```
+@AGENTS.md
diff --git a/src/lib/litegraph/CONTRIBUTING.md b/src/lib/litegraph/CONTRIBUTING.md
deleted file mode 100755
index 45043616b4..0000000000
--- a/src/lib/litegraph/CONTRIBUTING.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Contribution Rules
-There are some simple rules that everyone should follow:
-
-### Do not commit files from build folder
-> I usually have horrible merge conflicts when I upload the build version that take me too much time to solve, but I want to keep the build version in the repo, so I guess it would be better if only one of us does the built, which would be me.
-> https://github.com/jagenjo/litegraph.js/pull/155#issuecomment-656602861
-Those files will be updated by owner.
-
-
diff --git a/src/lib/litegraph/README.md b/src/lib/litegraph/README.md
index 998532a82c..3133d0de51 100755
--- a/src/lib/litegraph/README.md
+++ b/src/lib/litegraph/README.md
@@ -1,173 +1,162 @@
-# @ComfyOrg/litegraph
-
-This is the litegraph version used in [ComfyUI_frontend](https://github.com/Comfy-Org/ComfyUI_frontend).
-
-It is a fork of the original `litegraph.js`. Some APIs may by unchanged, however it is largely incompatible with the original.
-
-Some early highlights:
-
-- Accumulated comfyUI custom changes (2024-01 ~ 2024-05) (https://github.com/Comfy-Org/litegraph.js/pull/1)
-- Type schema change for ComfyUI_frontend TS migration (https://github.com/Comfy-Org/litegraph.js/pull/3)
-- Zoom fix (https://github.com/Comfy-Org/litegraph.js/pull/7)
-- Emit search box triggering custom events (<https://github.com/Comfy-Org/litegraph.js/pull/10>)
-- Truncate overflowing combo widget text (<https://github.com/Comfy-Org/litegraph.js/pull/17>)
-- Sort node based on ID on graph serialization (<https://github.com/Comfy-Org/litegraph.js/pull/21>)
-- Fix empty input not used when connecting links (<https://github.com/Comfy-Org/litegraph.js/pull/24>)
-- Batch output connection move/disconnect (<https://github.com/Comfy-Org/litegraph.js/pull/39>)
-- And now with hundreds more...
-
-# Usage
-
-This library is included as a git subtree in the ComfyUI frontend project at `src/lib/litegraph`.
-
-# litegraph.js
-
-A TypeScript library to create graphs in the browser similar to Unreal Blueprints.
-
-<details>
-
-<summary>Description of the original litegraph.js</summary>
-
-A library in Javascript to create graphs in the browser similar to Unreal Blueprints. Nodes can be programmed easily and it includes an editor to construct and tests the graphs.
-
-It can be integrated easily in any existing web applications and graphs can be run without the need of the editor.
-
-</details>
-
-![Node Graph](imgs/node_graph_example.png "Node graph example")
-
-## Features
-
-- Renders on Canvas2D (zoom in/out and panning, easy to render complex interfaces, can be used inside a WebGLTexture)
-- Easy to use editor (searchbox, keyboard shortcuts, multiple selection, context menu, ...)
-- Optimized to support hundreds of nodes per graph (on editor but also on execution)
-- Customizable theme (colors, shapes, background)
-- Callbacks to personalize every action/drawing/event of nodes
-- Graphs can be executed in NodeJS
-- Highly customizable nodes (color, shape, widgets, custom rendering)
-- Easy to integrate in any JS application (one single file, no dependencies)
-- Typescript support
-
-## Integration
-
-This library is integrated as a git subtree in the ComfyUI frontend project. To use it in your code:
-
-```typescript
-import { LGraph, LGraphNode, LiteGraph } from '@/lib/litegraph'
-```
-
-## How to code a new Node type
-
-Here is an example of how to build a node that sums two inputs:
-
-```ts
-import { LiteGraph, LGraphNode } from "./litegraph"
-
-class MyAddNode extends LGraphNode {
-  // Name to show
-  title = "Sum"
-
-  constructor() {
-    this.addInput("A", "number")
-    this.addInput("B", "number")
-    this.addOutput("A+B", "number")
-    this.properties.precision = 1
-  }
-
-  // Function to call when the node is executed
-  onExecute() {
-    var A = this.getInputData(0)
-    if (A === undefined) A = 0
-    var B = this.getInputData(1)
-    if (B === undefined) B = 0
-    this.setOutputData(0, A + B)
-  }
-}
-
-// Register the node type
-LiteGraph.registerNodeType("basic/sum", MyAddNode)
-```
-
-## Server side
-
-It also works server-side using NodeJS although some nodes do not work in server (audio, graphics, input, etc).
-
-```ts
-import { LiteGraph, LGraph } from "./litegraph.js"
-
-const graph = new LGraph()
-
-const firstNode = LiteGraph.createNode("basic/sum")
-graph.add(firstNode)
-
-const secondNode = LiteGraph.createNode("basic/sum")
-graph.add(secondNode)
-
-firstNode.connect(0, secondNode, 1)
-
-graph.start()
-```
-
-## Projects using it
-
-### [ComfyUI](https://github.com/comfyanonymous/ComfyUI)
-
-![ComfyUI default workflow](https://github.com/comfyanonymous/ComfyUI/blob/6efe561c2a7321501b1b27f47039c7616dda1860/comfyui_screenshot.png "ComfyUI default workflow")
-
-### Projects using the original litegraph.js
-
-<details>
-
-<summary>Click to expand</summary>
-
-### [webglstudio.org](http://webglstudio.org)
-
-![WebGLStudio](imgs/webglstudio.gif "WebGLStudio")
-
-### [MOI Elephant](http://moiscript.weebly.com/elephant-systegraveme-nodal.html)
-
-![MOI Elephant](imgs/elephant.gif "MOI Elephant")
-
-### Mynodes
-
-![MyNodes](imgs/mynodes.png "MyNodes")
-
-</details>
-
-## Feedback
-
-Please [open an issue](https://github.com/Comfy-Org/litegraph.js/issues/) on the GitHub repo.
-
-# Development
-
-Litegraph has no runtime dependencies. The build tooling has been tested on Node.JS 20.18.x
-
-## Releasing
-
-Use GitHub actions to release normal versions.
-
-1. Run the `Release a New Version` action, selecting the version increment type
-1. Merge the resolution PR
-1. A GitHub release is automatically published on merge
-
-### Pre-release
-
-The action directly translates `Version increment type` to the pnpm version command. `Pre-release ID (suffix)` is the option for the `--preid` argument.
-
-e.g. Use `prerelease` increment type to automatically bump the patch version and create a pre-release version. Subsequent runs of prerelease will update the prerelease version only.
-Use `patch` when ready to remove the pre-release suffix.
-
-## Contributors
-
-You can find the [current list of contributors](https://github.com/Comfy-Org/litegraph.js/graphs/contributors) on GitHub.
-
-### Contributors (pre-fork)
-
-- atlasan
-- kriffe
-- rappestad
-- InventivetalentDev
-- NateScarlet
-- coderofsalvation
-- ilyabesk
-- gausszhou
+# @ComfyOrg/litegraph
+
+This is the litegraph version used in [ComfyUI_frontend](https://github.com/Comfy-Org/ComfyUI_frontend).
+
+It is a fork of the original `litegraph.js`. Some APIs may by unchanged, however it is largely incompatible with the original.
+
+Some early highlights:
+
+- Accumulated comfyUI custom changes (2024-01 ~ 2024-05) (https://github.com/Comfy-Org/litegraph.js/pull/1)
+- Type schema change for ComfyUI_frontend TS migration (https://github.com/Comfy-Org/litegraph.js/pull/3)
+- Zoom fix (https://github.com/Comfy-Org/litegraph.js/pull/7)
+- Emit search box triggering custom events (<https://github.com/Comfy-Org/litegraph.js/pull/10>)
+- Truncate overflowing combo widget text (<https://github.com/Comfy-Org/litegraph.js/pull/17>)
+- Sort node based on ID on graph serialization (<https://github.com/Comfy-Org/litegraph.js/pull/21>)
+- Fix empty input not used when connecting links (<https://github.com/Comfy-Org/litegraph.js/pull/24>)
+- Batch output connection move/disconnect (<https://github.com/Comfy-Org/litegraph.js/pull/39>)
+- And now with hundreds more...
+
+# Usage
+
+This library is included as a git subtree in the ComfyUI frontend project at `src/lib/litegraph`.
+
+# litegraph.js
+
+A TypeScript library to create graphs in the browser similar to Unreal Blueprints.
+
+<details>
+
+<summary>Description of the original litegraph.js</summary>
+
+A library in Javascript to create graphs in the browser similar to Unreal Blueprints. Nodes can be programmed easily and it includes an editor to construct and tests the graphs.
+
+It can be integrated easily in any existing web applications and graphs can be run without the need of the editor.
+
+</details>
+
+![Node Graph](imgs/node_graph_example.png 'Node graph example')
+
+## Features
+
+- Renders on Canvas2D (zoom in/out and panning, easy to render complex interfaces, can be used inside a WebGLTexture)
+- Easy to use editor (searchbox, keyboard shortcuts, multiple selection, context menu, ...)
+- Optimized to support hundreds of nodes per graph (on editor but also on execution)
+- Customizable theme (colors, shapes, background)
+- Callbacks to personalize every action/drawing/event of nodes
+- Graphs can be executed in NodeJS
+- Highly customizable nodes (color, shape, widgets, custom rendering)
+- Easy to integrate in any JS application (one single file, no dependencies)
+- Typescript support
+
+## Integration
+
+This library is integrated as a git subtree in the ComfyUI frontend project. To use it in your code:
+
+```typescript
+import { LGraph, LGraphNode, LiteGraph } from '@/lib/litegraph'
+```
+
+## How to code a new Node type
+
+Here is an example of how to build a node that sums two inputs:
+
+```ts
+import { LiteGraph, LGraphNode } from './litegraph'
+
+class MyAddNode extends LGraphNode {
+  // Name to show
+  title = 'Sum'
+
+  constructor() {
+    this.addInput('A', 'number')
+    this.addInput('B', 'number')
+    this.addOutput('A+B', 'number')
+    this.properties.precision = 1
+  }
+
+  // Function to call when the node is executed
+  onExecute() {
+    var A = this.getInputData(0)
+    if (A === undefined) A = 0
+    var B = this.getInputData(1)
+    if (B === undefined) B = 0
+    this.setOutputData(0, A + B)
+  }
+}
+
+// Register the node type
+LiteGraph.registerNodeType('basic/sum', MyAddNode)
+```
+
+## Server side
+
+It also works server-side using NodeJS although some nodes do not work in server (audio, graphics, input, etc).
+
+```ts
+import { LiteGraph, LGraph } from './litegraph.js'
+
+const graph = new LGraph()
+
+const firstNode = LiteGraph.createNode('basic/sum')
+graph.add(firstNode)
+
+const secondNode = LiteGraph.createNode('basic/sum')
+graph.add(secondNode)
+
+firstNode.connect(0, secondNode, 1)
+
+graph.start()
+```
+
+## Projects using it
+
+### [ComfyUI](https://github.com/comfyanonymous/ComfyUI)
+
+![ComfyUI default workflow](https://github.com/comfyanonymous/ComfyUI/blob/6efe561c2a7321501b1b27f47039c7616dda1860/comfyui_screenshot.png 'ComfyUI default workflow')
+
+### Projects using the original litegraph.js
+
+<details>
+
+<summary>Click to expand</summary>
+
+### [webglstudio.org](http://webglstudio.org)
+
+![WebGLStudio](imgs/webglstudio.gif 'WebGLStudio')
+
+### [MOI Elephant](http://moiscript.weebly.com/elephant-systegraveme-nodal.html)
+
+![MOI Elephant](imgs/elephant.gif 'MOI Elephant')
+
+### Mynodes
+
+![MyNodes](imgs/mynodes.png 'MyNodes')
+
+</details>
+
+## Feedback
+
+Please [open an issue](https://github.com/Comfy-Org/litegraph.js/issues/) on the GitHub repo.
+
+# Development
+
+Litegraph has no runtime dependencies. The build tooling has been tested on Node.JS 20.18.x
+
+## Releasing
+
+This library is embedded via git subtree in ComfyUI_frontend. Releases are managed through the parent repository's release process.
+
+## Contributors
+
+You can find the [current list of contributors](https://github.com/Comfy-Org/litegraph.js/graphs/contributors) on GitHub.
+
+### Contributors (pre-fork)
+
+- atlasan
+- kriffe
+- rappestad
+- InventivetalentDev
+- NateScarlet
+- coderofsalvation
+- ilyabesk
+- gausszhou
diff --git a/src/lib/litegraph/public/css/litegraph.css b/src/lib/litegraph/public/css/litegraph.css
index 83b36dd98b..0ed31874f8 100644
--- a/src/lib/litegraph/public/css/litegraph.css
+++ b/src/lib/litegraph/public/css/litegraph.css
@@ -613,7 +613,7 @@
   margin: 0 10px;
   padding: 2px 5px;
 }
-.litegraph .graphdialog input[type="checkbox"] {
+.litegraph .graphdialog input[type='checkbox'] {
   width: 16px;
   height: 16px;
 }
diff --git a/tests-ui/tests/litegraph/utils/CanvasPointer.deviceDetection.test.ts b/src/lib/litegraph/src/CanvasPointer.deviceDetection.test.ts
similarity index 100%
rename from tests-ui/tests/litegraph/utils/CanvasPointer.deviceDetection.test.ts
rename to src/lib/litegraph/src/CanvasPointer.deviceDetection.test.ts
diff --git a/src/lib/litegraph/src/CanvasPointer.ts b/src/lib/litegraph/src/CanvasPointer.ts
index b4175e9531..3bd101cf5a 100644
--- a/src/lib/litegraph/src/CanvasPointer.ts
+++ b/src/lib/litegraph/src/CanvasPointer.ts
@@ -31,17 +31,17 @@ export class CanvasPointer {
 
   /** Maximum offset from click location */
   static get maxClickDrift() {
-    return this.#maxClickDrift
+    return this._maxClickDrift
   }
 
   static set maxClickDrift(value) {
-    this.#maxClickDrift = value
-    this.#maxClickDrift2 = value * value
+    this._maxClickDrift = value
+    this._maxClickDrift2 = value * value
   }
 
-  static #maxClickDrift = 6
+  private static _maxClickDrift = 6
   /** {@link maxClickDrift} squared.  Used to calculate click drift without `sqrt`. */
-  static #maxClickDrift2 = this.#maxClickDrift ** 2
+  private static _maxClickDrift2 = this._maxClickDrift ** 2
 
   /** Assume that "wheel" events with both deltaX and deltaY less than this value are trackpad gestures. */
   static trackpadThreshold = 60
@@ -153,18 +153,18 @@ export class CanvasPointer {
    * Therefore, simply setting this value twice will execute the first callback.
    */
   get finally() {
-    return this.#finally
+    return this._finally
   }
 
   set finally(value) {
     try {
-      this.#finally?.()
+      this._finally?.()
     } finally {
-      this.#finally = value
+      this._finally = value
     }
   }
 
-  #finally?: () => unknown
+  private _finally?: () => unknown
 
   constructor(element: Element) {
     this.element = element
@@ -197,7 +197,7 @@ export class CanvasPointer {
 
     // Primary button released - treat as pointerup.
     if (!(e.buttons & eDown.buttons)) {
-      this.#completeClick(e)
+      this._completeClick(e)
       this.reset()
       return
     }
@@ -209,8 +209,8 @@ export class CanvasPointer {
 
     const longerThanBufferTime =
       e.timeStamp - eDown.timeStamp > CanvasPointer.bufferTime
-    if (longerThanBufferTime || !this.#hasSamePosition(e, eDown)) {
-      this.#setDragStarted(e)
+    if (longerThanBufferTime || !this._hasSamePosition(e, eDown)) {
+      this._setDragStarted(e)
     }
   }
 
@@ -221,13 +221,13 @@ export class CanvasPointer {
   up(e: CanvasPointerEvent): boolean {
     if (e.button !== this.eDown?.button) return false
 
-    this.#completeClick(e)
+    this._completeClick(e)
     const { dragStarted } = this
     this.reset()
     return !dragStarted
   }
 
-  #completeClick(e: CanvasPointerEvent): void {
+  private _completeClick(e: CanvasPointerEvent): void {
     const { eDown } = this
     if (!eDown) return
 
@@ -236,11 +236,11 @@ export class CanvasPointer {
     if (this.dragStarted) {
       // A move event already started drag
       this.onDragEnd?.(e)
-    } else if (!this.#hasSamePosition(e, eDown)) {
+    } else if (!this._hasSamePosition(e, eDown)) {
       // Teleport without a move event (e.g. tab out, move, tab back)
-      this.#setDragStarted()
+      this._setDragStarted()
       this.onDragEnd?.(e)
-    } else if (this.onDoubleClick && this.#isDoubleClick()) {
+    } else if (this.onDoubleClick && this._isDoubleClick()) {
       // Double-click event
       this.onDoubleClick(e)
       this.eLastDown = undefined
@@ -258,10 +258,10 @@ export class CanvasPointer {
    * @param tolerance2 The maximum distance (squared) before the positions are considered different
    * @returns `true` if the two events were no more than {@link maxClickDrift} apart, otherwise `false`
    */
-  #hasSamePosition(
+  private _hasSamePosition(
     a: PointerEvent,
     b: PointerEvent,
-    tolerance2 = CanvasPointer.#maxClickDrift2
+    tolerance2 = CanvasPointer._maxClickDrift2
   ): boolean {
     const drift = dist2(a.clientX, a.clientY, b.clientX, b.clientY)
     return drift <= tolerance2
@@ -271,21 +271,21 @@ export class CanvasPointer {
    * Checks whether the pointer is currently past the max click drift threshold.
    * @returns `true` if the latest pointer event is past the the click drift threshold
    */
-  #isDoubleClick(): boolean {
+  private _isDoubleClick(): boolean {
     const { eDown, eLastDown } = this
     if (!eDown || !eLastDown) return false
 
     // Use thrice the drift distance for double-click gap
-    const tolerance2 = (3 * CanvasPointer.#maxClickDrift) ** 2
+    const tolerance2 = (3 * CanvasPointer._maxClickDrift) ** 2
     const diff = eDown.timeStamp - eLastDown.timeStamp
     return (
       diff > 0 &&
       diff < CanvasPointer.doubleClickTime &&
-      this.#hasSamePosition(eDown, eLastDown, tolerance2)
+      this._hasSamePosition(eDown, eLastDown, tolerance2)
     )
   }
 
-  #setDragStarted(eMove?: CanvasPointerEvent): void {
+  private _setDragStarted(eMove?: CanvasPointerEvent): void {
     this.dragStarted = true
     this.onDragStart?.(this, eMove)
     delete this.onDragStart
@@ -303,14 +303,14 @@ export class CanvasPointer {
     const timeSinceLastEvent = Math.max(0, now - this.lastWheelEventTime)
     this.lastWheelEventTime = now
 
-    if (this.#isHighResWheelEvent(e, now)) {
+    if (this._isHighResWheelEvent(e, now)) {
       this.detectedDevice = 'mouse'
-    } else if (this.#isWithinCooldown(timeSinceLastEvent)) {
-      if (this.#shouldBufferLinuxEvent(e)) {
-        this.#bufferLinuxEvent(e, now)
+    } else if (this._isWithinCooldown(timeSinceLastEvent)) {
+      if (this._shouldBufferLinuxEvent(e)) {
+        this._bufferLinuxEvent(e, now)
       }
     } else {
-      this.#updateDeviceMode(e, now)
+      this._updateDeviceMode(e, now)
       this.hasReceivedWheelEvent = true
     }
 
@@ -321,7 +321,7 @@ export class CanvasPointer {
    * Validates buffered high res wheel events and switches to mouse mode if pattern matches.
    * @returns `true` if switched to mouse mode
    */
-  #isHighResWheelEvent(event: WheelEvent, now: number): boolean {
+  private _isHighResWheelEvent(event: WheelEvent, now: number): boolean {
     if (!this.bufferedLinuxEvent || this.bufferedLinuxEventTime <= 0) {
       return false
     }
@@ -329,15 +329,15 @@ export class CanvasPointer {
     const timeSinceBuffer = now - this.bufferedLinuxEventTime
 
     if (timeSinceBuffer > CanvasPointer.maxHighResBufferTime) {
-      this.#clearLinuxBuffer()
+      this._clearLinuxBuffer()
       return false
     }
 
     if (
       event.deltaX === 0 &&
-      this.#isLinuxWheelPattern(this.bufferedLinuxEvent.deltaY, event.deltaY)
+      this._isLinuxWheelPattern(this.bufferedLinuxEvent.deltaY, event.deltaY)
     ) {
-      this.#clearLinuxBuffer()
+      this._clearLinuxBuffer()
       return true
     }
 
@@ -347,7 +347,7 @@ export class CanvasPointer {
   /**
    * Checks if we're within the cooldown period where mode switching is disabled.
    */
-  #isWithinCooldown(timeSinceLastEvent: number): boolean {
+  private _isWithinCooldown(timeSinceLastEvent: number): boolean {
     const isFirstEvent = !this.hasReceivedWheelEvent
     const cooldownExpired = timeSinceLastEvent >= CanvasPointer.trackpadMaxGap
     return !isFirstEvent && !cooldownExpired
@@ -356,23 +356,23 @@ export class CanvasPointer {
   /**
    * Updates the device mode based on event patterns.
    */
-  #updateDeviceMode(event: WheelEvent, now: number): void {
-    if (this.#isTrackpadPattern(event)) {
+  private _updateDeviceMode(event: WheelEvent, now: number): void {
+    if (this._isTrackpadPattern(event)) {
       this.detectedDevice = 'trackpad'
-    } else if (this.#isMousePattern(event)) {
+    } else if (this._isMousePattern(event)) {
       this.detectedDevice = 'mouse'
     } else if (
       this.detectedDevice === 'trackpad' &&
-      this.#shouldBufferLinuxEvent(event)
+      this._shouldBufferLinuxEvent(event)
     ) {
-      this.#bufferLinuxEvent(event, now)
+      this._bufferLinuxEvent(event, now)
     }
   }
 
   /**
    * Clears the buffered Linux wheel event and associated timer.
    */
-  #clearLinuxBuffer(): void {
+  private _clearLinuxBuffer(): void {
     this.bufferedLinuxEvent = undefined
     this.bufferedLinuxEventTime = 0
     if (this.linuxBufferTimeoutId !== undefined) {
@@ -385,7 +385,7 @@ export class CanvasPointer {
    * Checks if the event matches trackpad input patterns.
    * @param event The wheel event to check
    */
-  #isTrackpadPattern(event: WheelEvent): boolean {
+  private _isTrackpadPattern(event: WheelEvent): boolean {
     // Two-finger panning: non-zero deltaX AND deltaY
     if (event.deltaX !== 0 && event.deltaY !== 0) return true
 
@@ -399,7 +399,7 @@ export class CanvasPointer {
    * Checks if the event matches mouse wheel input patterns.
    * @param event The wheel event to check
    */
-  #isMousePattern(event: WheelEvent): boolean {
+  private _isMousePattern(event: WheelEvent): boolean {
     const absoluteDeltaY = Math.abs(event.deltaY)
 
     // Primary threshold for switching from trackpad to mouse
@@ -417,7 +417,7 @@ export class CanvasPointer {
    * Checks if the event should be buffered as a potential Linux wheel event.
    * @param event The wheel event to check
    */
-  #shouldBufferLinuxEvent(event: WheelEvent): boolean {
+  private _shouldBufferLinuxEvent(event: WheelEvent): boolean {
     const absoluteDeltaY = Math.abs(event.deltaY)
     const isInLinuxRange = absoluteDeltaY >= 10 && absoluteDeltaY < 60
     const isVerticalOnly = event.deltaX === 0
@@ -436,7 +436,7 @@ export class CanvasPointer {
    * @param event The event to buffer
    * @param now The current timestamp
    */
-  #bufferLinuxEvent(event: WheelEvent, now: number): void {
+  private _bufferLinuxEvent(event: WheelEvent, now: number): void {
     if (this.linuxBufferTimeoutId !== undefined) {
       clearTimeout(this.linuxBufferTimeoutId)
     }
@@ -446,7 +446,7 @@ export class CanvasPointer {
 
     // Set timeout to clear buffer after 10ms
     this.linuxBufferTimeoutId = setTimeout(() => {
-      this.#clearLinuxBuffer()
+      this._clearLinuxBuffer()
     }, CanvasPointer.maxHighResBufferTime)
   }
 
@@ -455,7 +455,7 @@ export class CanvasPointer {
    * @param deltaY1 The first deltaY value
    * @param deltaY2 The second deltaY value
    */
-  #isLinuxWheelPattern(deltaY1: number, deltaY2: number): boolean {
+  private _isLinuxWheelPattern(deltaY1: number, deltaY2: number): boolean {
     const absolute1 = Math.abs(deltaY1)
     const absolute2 = Math.abs(deltaY2)
 
diff --git a/src/lib/litegraph/src/ContextMenu.ts b/src/lib/litegraph/src/ContextMenu.ts
index dc858da08f..1db6ba0559 100644
--- a/src/lib/litegraph/src/ContextMenu.ts
+++ b/src/lib/litegraph/src/ContextMenu.ts
@@ -1,3 +1,5 @@
+import DOMPurify from 'dompurify'
+
 import type {
   ContextMenuDivElement,
   IContextMenuOptions,
@@ -5,6 +7,38 @@ import type {
 } from './interfaces'
 import { LiteGraph } from './litegraph'
 
+const ALLOWED_TAGS = ['span', 'b', 'i', 'em', 'strong']
+const ALLOWED_STYLE_PROPS = new Set([
+  'display',
+  'color',
+  'background-color',
+  'padding-left',
+  'border-left'
+])
+
+DOMPurify.addHook('uponSanitizeAttribute', (_node, data) => {
+  if (data.attrName === 'style') {
+    const sanitizedStyle = data.attrValue
+      .split(';')
+      .map((s) => s.trim())
+      .filter((s) => {
+        const colonIdx = s.indexOf(':')
+        if (colonIdx === -1) return false
+        const prop = s.slice(0, colonIdx).trim().toLowerCase()
+        return ALLOWED_STYLE_PROPS.has(prop)
+      })
+      .join('; ')
+    data.attrValue = sanitizedStyle
+  }
+})
+
+function sanitizeMenuHTML(html: string): string {
+  return DOMPurify.sanitize(html, {
+    ALLOWED_TAGS,
+    ALLOWED_ATTR: ['style']
+  })
+}
+
 // TODO: Replace this pattern with something more modern.
 export interface ContextMenu<TValue = unknown> {
   constructor: new (
@@ -123,7 +157,7 @@ export class ContextMenu<TValue = unknown> {
     if (options.title) {
       const element = document.createElement('div')
       element.className = 'litemenu-title'
-      element.innerHTML = options.title
+      element.textContent = options.title
       root.append(element)
     }
 
@@ -218,11 +252,18 @@ export class ContextMenu<TValue = unknown> {
     if (value === null) {
       element.classList.add('separator')
     } else {
-      const innerHtml = name === null ? '' : String(name)
+      const label = name === null ? '' : String(name)
       if (typeof value === 'string') {
-        element.innerHTML = innerHtml
+        element.textContent = label
       } else {
-        element.innerHTML = value?.title ?? innerHtml
+        // Use innerHTML for content that contains HTML tags, textContent otherwise
+        const hasHtmlContent =
+          value?.content !== undefined && /<[a-z][\s\S]*>/i.test(value.content)
+        if (hasHtmlContent) {
+          element.innerHTML = sanitizeMenuHTML(value.content!)
+        } else {
+          element.textContent = value?.title ?? label
+        }
 
         if (value.disabled) {
           disabled = true
diff --git a/src/lib/litegraph/src/DragAndScale.ts b/src/lib/litegraph/src/DragAndScale.ts
index d2e35252d2..e193bb1ea5 100644
--- a/src/lib/litegraph/src/DragAndScale.ts
+++ b/src/lib/litegraph/src/DragAndScale.ts
@@ -81,7 +81,7 @@ export class DragAndScale {
    * Returns `true` if the current state has changed from the previous state.
    * @returns `true` if the current state has changed from the previous state, otherwise `false`.
    */
-  #stateHasChanged(): boolean {
+  private _stateHasChanged(): boolean {
     const current = this.state
     const previous = this.lastState
 
@@ -95,7 +95,7 @@ export class DragAndScale {
   computeVisibleArea(viewport: Rect | undefined): void {
     const { scale, offset, visible_area } = this
 
-    if (this.#stateHasChanged()) {
+    if (this._stateHasChanged()) {
       this.onChanged?.(scale, offset)
       copyState(this.state, this.lastState)
     }
diff --git a/tests-ui/tests/litegraph/core/ConfigureGraph.test.ts b/src/lib/litegraph/src/LGraph.configure.test.ts
similarity index 92%
rename from tests-ui/tests/litegraph/core/ConfigureGraph.test.ts
rename to src/lib/litegraph/src/LGraph.configure.test.ts
index 935ec1f285..2401dfe302 100644
--- a/tests-ui/tests/litegraph/core/ConfigureGraph.test.ts
+++ b/src/lib/litegraph/src/LGraph.configure.test.ts
@@ -3,7 +3,7 @@ import { describe } from 'vitest'
 
 import { LGraph } from '@/lib/litegraph/src/litegraph'
 
-import { dirtyTest } from './fixtures/testExtensions'
+import { dirtyTest } from './__fixtures__/testExtensions'
 
 describe.skip('LGraph configure()', () => {
   dirtyTest(
diff --git a/tests-ui/tests/litegraph/core/LGraph_constructor.test.ts b/src/lib/litegraph/src/LGraph.constructor.test.ts
similarity index 90%
rename from tests-ui/tests/litegraph/core/LGraph_constructor.test.ts
rename to src/lib/litegraph/src/LGraph.constructor.test.ts
index 62720b9c03..4e214cae57 100644
--- a/tests-ui/tests/litegraph/core/LGraph_constructor.test.ts
+++ b/src/lib/litegraph/src/LGraph.constructor.test.ts
@@ -3,7 +3,7 @@ import { describe } from 'vitest'
 
 import { LGraph } from '@/lib/litegraph/src/litegraph'
 
-import { dirtyTest } from './fixtures/testExtensions'
+import { dirtyTest } from './__fixtures__/testExtensions'
 
 describe.skip('LGraph (constructor only)', () => {
   dirtyTest(
diff --git a/tests-ui/tests/litegraph/core/serialise.test.ts b/src/lib/litegraph/src/LGraph.serialise.test.ts
similarity index 94%
rename from tests-ui/tests/litegraph/core/serialise.test.ts
rename to src/lib/litegraph/src/LGraph.serialise.test.ts
index 629c50e989..3eee37c6a1 100644
--- a/tests-ui/tests/litegraph/core/serialise.test.ts
+++ b/src/lib/litegraph/src/LGraph.serialise.test.ts
@@ -3,7 +3,7 @@ import { describe } from 'vitest'
 import { LGraph, LGraphGroup, LGraphNode } from '@/lib/litegraph/src/litegraph'
 import type { ISerialisedGraph } from '@/lib/litegraph/src/litegraph'
 
-import { test } from './fixtures/testExtensions'
+import { test } from './__fixtures__/testExtensions'
 
 describe('LGraph Serialisation', () => {
   test('can (de)serialise node / group titles', ({ expect, minimalGraph }) => {
diff --git a/src/lib/litegraph/src/LGraph.test.ts b/src/lib/litegraph/src/LGraph.test.ts
new file mode 100644
index 0000000000..ee37d72ee8
--- /dev/null
+++ b/src/lib/litegraph/src/LGraph.test.ts
@@ -0,0 +1,781 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it } from 'vitest'
+
+import type { NodeId, Subgraph } from '@/lib/litegraph/src/litegraph'
+import {
+  LGraph,
+  LGraphNode,
+  LiteGraph,
+  LLink
+} from '@/lib/litegraph/src/litegraph'
+import type { SerialisableGraph } from '@/lib/litegraph/src/types/serialisation'
+import type { UUID } from '@/lib/litegraph/src/utils/uuid'
+import { usePromotionStore } from '@/stores/promotionStore'
+import { useWidgetValueStore } from '@/stores/widgetValueStore'
+import {
+  createTestSubgraphData,
+  createTestSubgraphNode
+} from './subgraph/__fixtures__/subgraphHelpers'
+
+import { duplicateSubgraphNodeIds } from './__fixtures__/duplicateSubgraphNodeIds'
+import { nestedSubgraphProxyWidgets } from './__fixtures__/nestedSubgraphProxyWidgets'
+import { nodeIdSpaceExhausted } from './__fixtures__/nodeIdSpaceExhausted'
+import { uniqueSubgraphNodeIds } from './__fixtures__/uniqueSubgraphNodeIds'
+import { test } from './__fixtures__/testExtensions'
+
+function swapNodes(nodes: LGraphNode[]) {
+  const firstNode = nodes[0]
+  const lastNode = nodes[nodes.length - 1]
+  nodes[0] = lastNode
+  nodes[nodes.length - 1] = firstNode
+  return nodes
+}
+
+function createGraph(...nodes: LGraphNode[]) {
+  const graph = new LGraph()
+  nodes.forEach((node) => graph.add(node))
+  return graph
+}
+
+class DummyNode extends LGraphNode {
+  constructor() {
+    super('dummy')
+  }
+}
+
+describe('LGraph', () => {
+  it('should serialize deterministic node order', async () => {
+    LiteGraph.registerNodeType('dummy', DummyNode)
+    const node1 = new DummyNode()
+    const node2 = new DummyNode()
+    const graph = createGraph(node1, node2)
+
+    const result1 = graph.serialize({ sortNodes: true })
+    expect(result1.nodes).not.toHaveLength(0)
+    graph._nodes = swapNodes(graph.nodes)
+    const result2 = graph.serialize({ sortNodes: true })
+
+    expect(result1).toEqual(result2)
+  })
+
+  it('should handle adding null node gracefully', () => {
+    const graph = new LGraph()
+    const initialNodeCount = graph.nodes.length
+
+    const result = graph.add(null)
+
+    expect(result).toBeUndefined()
+    expect(graph.nodes.length).toBe(initialNodeCount)
+  })
+
+  test('can be instantiated', ({ expect }) => {
+    // @ts-expect-error Intentional - extra holds any / all consumer data that should be serialised
+    const graph = new LGraph({ extra: 'TestGraph' })
+    expect(graph).toBeInstanceOf(LGraph)
+    expect(graph.extra).toBe('TestGraph')
+    expect(graph.extra).toBe('TestGraph')
+  })
+
+  test('is exactly the same type', ({ expect }) => {
+    // LGraph from barrel export and LiteGraph.LGraph should be the same
+    expect(LiteGraph.LGraph).toBe(LGraph)
+  })
+
+  test('populates optional values', ({ expect, minimalSerialisableGraph }) => {
+    const dGraph = new LGraph(minimalSerialisableGraph)
+    expect(dGraph.links).toBeInstanceOf(Map)
+    expect(dGraph.nodes).toBeInstanceOf(Array)
+    expect(dGraph.groups).toBeInstanceOf(Array)
+  })
+
+  test('supports schema v0.4 graphs', ({ expect, oldSchemaGraph }) => {
+    const fromOldSchema = new LGraph(oldSchemaGraph)
+    expect(fromOldSchema).toMatchSnapshot('oldSchemaGraph')
+  })
+})
+
+describe('Floating Links / Reroutes', () => {
+  test('Floating reroute should be removed when node and link are removed', ({
+    expect,
+    floatingLinkGraph
+  }) => {
+    const graph = new LGraph(floatingLinkGraph)
+    expect(graph.nodes.length).toBe(1)
+    graph.remove(graph.nodes[0])
+    expect(graph.nodes.length).toBe(0)
+    expect(graph.links.size).toBe(0)
+    expect(graph.floatingLinks.size).toBe(0)
+    expect(graph.reroutes.size).toBe(0)
+  })
+
+  test('Can add reroute to existing link', ({ expect, linkedNodesGraph }) => {
+    const graph = new LGraph(linkedNodesGraph)
+    expect(graph.nodes.length).toBe(2)
+    expect(graph.links.size).toBe(1)
+    expect(graph.reroutes.size).toBe(0)
+
+    graph.createReroute([0, 0], graph.links.values().next().value!)
+    expect(graph.links.size).toBe(1)
+    expect(graph.reroutes.size).toBe(1)
+  })
+
+  test('Create floating reroute when one side of node is removed', ({
+    expect,
+    linkedNodesGraph
+  }) => {
+    const graph = new LGraph(linkedNodesGraph)
+    graph.createReroute([0, 0], graph.links.values().next().value!)
+    graph.remove(graph.nodes[0])
+
+    expect(graph.links.size).toBe(0)
+    expect(graph.floatingLinks.size).toBe(1)
+    expect(graph.reroutes.size).toBe(1)
+    expect(graph.reroutes.values().next().value!.floating).not.toBeUndefined()
+  })
+
+  test('Create floating reroute when one side of link is removed', ({
+    expect,
+    linkedNodesGraph
+  }) => {
+    const graph = new LGraph(linkedNodesGraph)
+    graph.createReroute([0, 0], graph.links.values().next().value!)
+    graph.nodes[0].disconnectOutput(0)
+
+    expect(graph.links.size).toBe(0)
+    expect(graph.floatingLinks.size).toBe(1)
+    expect(graph.reroutes.size).toBe(1)
+    expect(graph.reroutes.values().next().value!.floating).not.toBeUndefined()
+  })
+
+  test('Reroutes and branches should be retained when the input node is removed', ({
+    expect,
+    floatingBranchGraph: graph
+  }) => {
+    expect(graph.nodes.length).toBe(3)
+    graph.remove(graph.nodes[2])
+    expect(graph.nodes.length).toBe(2)
+    expect(graph.links.size).toBe(1)
+    expect(graph.floatingLinks.size).toBe(1)
+    expect(graph.reroutes.size).toBe(4)
+    graph.remove(graph.nodes[1])
+    expect(graph.nodes.length).toBe(1)
+    expect(graph.links.size).toBe(0)
+    expect(graph.floatingLinks.size).toBe(2)
+    expect(graph.reroutes.size).toBe(4)
+  })
+
+  test('Floating reroutes should be removed when neither input nor output is connected', ({
+    expect,
+    floatingBranchGraph: graph
+  }) => {
+    // Remove output node
+    graph.remove(graph.nodes[0])
+    expect(graph.nodes.length).toBe(2)
+    expect(graph.links.size).toBe(0)
+    expect(graph.floatingLinks.size).toBe(2)
+    // The original floating reroute should be removed
+    expect(graph.reroutes.size).toBe(3)
+    graph.remove(graph.nodes[0])
+    expect(graph.nodes.length).toBe(1)
+    expect(graph.links.size).toBe(0)
+    expect(graph.floatingLinks.size).toBe(1)
+    expect(graph.reroutes.size).toBe(3)
+    graph.remove(graph.nodes[0])
+    expect(graph.nodes.length).toBe(0)
+    expect(graph.links.size).toBe(0)
+    expect(graph.floatingLinks.size).toBe(0)
+    expect(graph.reroutes.size).toBe(0)
+  })
+})
+
+describe('Graph Clearing and Callbacks', () => {
+  test('clear() calls both node.onRemoved() and graph.onNodeRemoved()', ({
+    expect
+  }) => {
+    const graph = new LGraph()
+
+    // Create test nodes with onRemoved callbacks
+    const node1 = new LGraphNode('TestNode1')
+    const node2 = new LGraphNode('TestNode2')
+
+    // Add nodes to graph
+    graph.add(node1)
+    graph.add(node2)
+
+    // Track callback invocations
+    const nodeRemovedCallbacks = new Set<string>()
+    const graphRemovedCallbacks = new Set<string>()
+
+    // Set up node.onRemoved() callbacks
+    node1.onRemoved = () => {
+      nodeRemovedCallbacks.add(String(node1.id))
+    }
+    node2.onRemoved = () => {
+      nodeRemovedCallbacks.add(String(node2.id))
+    }
+
+    // Set up graph.onNodeRemoved() callback
+    graph.onNodeRemoved = (node) => {
+      graphRemovedCallbacks.add(String(node.id))
+    }
+
+    // Verify nodes are in graph before clearing
+    expect(graph.nodes.length).toBe(2)
+
+    // Clear the graph
+    graph.clear()
+
+    // Verify both types of callbacks were called
+    expect(nodeRemovedCallbacks).toContain(String(node1.id))
+    expect(nodeRemovedCallbacks).toContain(String(node2.id))
+    expect(graphRemovedCallbacks).toContain(String(node1.id))
+    expect(graphRemovedCallbacks).toContain(String(node2.id))
+
+    // Verify nodes were actually removed
+    expect(graph.nodes.length).toBe(0)
+  })
+
+  test('clear() removes graph-scoped promotion and widget-value state', () => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+
+    const graph = new LGraph()
+    const graphId = 'graph-clear-cleanup' as UUID
+    graph.id = graphId
+
+    const promotionStore = usePromotionStore()
+    promotionStore.promote(graphId, 1 as NodeId, '10', 'seed')
+
+    const widgetValueStore = useWidgetValueStore()
+    widgetValueStore.registerWidget(graphId, {
+      nodeId: '10' as NodeId,
+      name: 'seed',
+      type: 'number',
+      value: 1,
+      options: {},
+      label: undefined,
+      serialize: undefined,
+      disabled: undefined
+    })
+
+    expect(promotionStore.isPromotedByAny(graphId, '10', 'seed')).toBe(true)
+    expect(widgetValueStore.getWidget(graphId, '10' as NodeId, 'seed')).toEqual(
+      expect.objectContaining({ value: 1 })
+    )
+
+    graph.clear()
+
+    expect(promotionStore.isPromotedByAny(graphId, '10', 'seed')).toBe(false)
+    expect(
+      widgetValueStore.getWidget(graphId, '10' as NodeId, 'seed')
+    ).toBeUndefined()
+  })
+})
+
+describe('Subgraph Definition Garbage Collection', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+  })
+
+  function createSubgraphWithNodes(rootGraph: LGraph, nodeCount: number) {
+    const subgraph = rootGraph.createSubgraph(createTestSubgraphData())
+
+    const innerNodes: LGraphNode[] = []
+    for (let i = 0; i < nodeCount; i++) {
+      const node = new LGraphNode(`Inner Node ${i}`)
+      subgraph.add(node)
+      innerNodes.push(node)
+    }
+
+    return { subgraph, innerNodes }
+  }
+
+  it('removing SubgraphNode fires onRemoved for inner nodes', () => {
+    const rootGraph = new LGraph()
+    const { subgraph, innerNodes } = createSubgraphWithNodes(rootGraph, 2)
+    const removedNodeIds = new Set<string>()
+
+    for (const node of innerNodes) {
+      node.onRemoved = () => removedNodeIds.add(String(node.id))
+    }
+
+    const subgraphNode = createTestSubgraphNode(subgraph, { pos: [100, 100] })
+    rootGraph.add(subgraphNode)
+
+    expect(subgraph.nodes.length).toBe(2)
+
+    rootGraph.remove(subgraphNode)
+
+    expect(removedNodeIds.size).toBe(2)
+  })
+
+  it('removing SubgraphNode fires onNodeRemoved callback', () => {
+    const rootGraph = new LGraph()
+    const { subgraph } = createSubgraphWithNodes(rootGraph, 2)
+    const graphRemovedNodeIds = new Set<string>()
+
+    subgraph.onNodeRemoved = (node) => graphRemovedNodeIds.add(String(node.id))
+
+    const subgraphNode = createTestSubgraphNode(subgraph, { pos: [100, 100] })
+    rootGraph.add(subgraphNode)
+
+    rootGraph.remove(subgraphNode)
+
+    expect(graphRemovedNodeIds.size).toBe(2)
+  })
+
+  it('subgraph definition is removed when SubgraphNode is removed', () => {
+    const rootGraph = new LGraph()
+    const { subgraph } = createSubgraphWithNodes(rootGraph, 1)
+    const subgraphId = subgraph.id
+
+    const subgraphNode = createTestSubgraphNode(subgraph, { pos: [100, 100] })
+    rootGraph.add(subgraphNode)
+
+    expect(rootGraph.subgraphs.has(subgraphId)).toBe(true)
+
+    rootGraph.remove(subgraphNode)
+
+    expect(rootGraph.subgraphs.has(subgraphId)).toBe(false)
+  })
+})
+
+describe('Legacy LGraph Compatibility Layer', () => {
+  test('can be extended via prototype', ({ expect, minimalGraph }) => {
+    // @ts-expect-error Should always be an error.
+    LGraph.prototype.newMethod = function () {
+      return 'New method added via prototype'
+    }
+    // @ts-expect-error Should always be an error.
+    expect(minimalGraph.newMethod()).toBe('New method added via prototype')
+  })
+
+  test('is correctly assigned to LiteGraph', ({ expect }) => {
+    expect(LiteGraph.LGraph).toBe(LGraph)
+  })
+})
+
+describe('Shared LGraphState', () => {
+  function createSubgraphOnGraph(rootGraph: LGraph): Subgraph {
+    const data = createTestSubgraphData()
+    return rootGraph.createSubgraph(data)
+  }
+
+  it('subgraph state is the same object as rootGraph state', () => {
+    const rootGraph = new LGraph()
+    const subgraph = createSubgraphOnGraph(rootGraph)
+    expect(subgraph.state).toBe(rootGraph.state)
+  })
+
+  it('adding a node in a subgraph increments the root counter', () => {
+    const rootGraph = new LGraph()
+    const subgraph = createSubgraphOnGraph(rootGraph)
+
+    rootGraph.add(new DummyNode())
+    const rootNodeId = rootGraph.state.lastNodeId
+
+    subgraph.add(new DummyNode())
+    expect(rootGraph.state.lastNodeId).toBe(rootNodeId + 1)
+  })
+
+  it('node IDs never collide between root and subgraph', () => {
+    const rootGraph = new LGraph()
+    const subgraph = createSubgraphOnGraph(rootGraph)
+
+    const rootNode = new DummyNode()
+    rootGraph.add(rootNode)
+
+    const subNode = new DummyNode()
+    subgraph.add(subNode)
+
+    expect(rootNode.id).not.toBe(subNode.id)
+  })
+
+  it('configure merges state using max', () => {
+    const rootGraph = new LGraph()
+    rootGraph.state.lastNodeId = 10
+
+    const data = createTestSubgraphData()
+    data.state = {
+      lastNodeId: 5,
+      lastLinkId: 20,
+      lastGroupId: 0,
+      lastRerouteId: 0
+    }
+    const subgraph = rootGraph.createSubgraph(data)
+    subgraph.configure(data)
+
+    expect(rootGraph.state.lastNodeId).toBe(10)
+    expect(rootGraph.state.lastLinkId).toBe(20)
+  })
+})
+
+describe('ensureGlobalIdUniqueness', () => {
+  function createSubgraphOnGraph(rootGraph: LGraph): Subgraph {
+    const data = createTestSubgraphData()
+    return rootGraph.createSubgraph(data)
+  }
+
+  it('reassigns duplicate node IDs in subgraphs', () => {
+    const rootGraph = new LGraph()
+    const subgraph = createSubgraphOnGraph(rootGraph)
+
+    const rootNode = new DummyNode()
+    rootGraph.add(rootNode)
+
+    const subNode = new DummyNode()
+    subNode.id = rootNode.id
+    subgraph._nodes.push(subNode)
+    subgraph._nodes_by_id[subNode.id] = subNode
+
+    rootGraph.ensureGlobalIdUniqueness()
+
+    expect(subNode.id).not.toBe(rootNode.id)
+    expect(subgraph._nodes_by_id[subNode.id]).toBe(subNode)
+    expect(subgraph._nodes_by_id[rootNode.id as number]).toBeUndefined()
+  })
+
+  it('preserves root graph node IDs as canonical', () => {
+    const rootGraph = new LGraph()
+    const subgraph = createSubgraphOnGraph(rootGraph)
+
+    const rootNode = new DummyNode()
+    rootGraph.add(rootNode)
+    const originalRootId = rootNode.id
+
+    const subNode = new DummyNode()
+    subNode.id = rootNode.id
+    subgraph._nodes.push(subNode)
+    subgraph._nodes_by_id[subNode.id] = subNode
+
+    rootGraph.ensureGlobalIdUniqueness()
+
+    expect(rootNode.id).toBe(originalRootId)
+  })
+
+  it('updates lastNodeId to reflect reassigned IDs', () => {
+    const rootGraph = new LGraph()
+    const subgraph = createSubgraphOnGraph(rootGraph)
+
+    const rootNode = new DummyNode()
+    rootGraph.add(rootNode)
+
+    const subNode = new DummyNode()
+    subNode.id = rootNode.id
+    subgraph._nodes.push(subNode)
+    subgraph._nodes_by_id[subNode.id] = subNode
+
+    rootGraph.ensureGlobalIdUniqueness()
+
+    expect(rootGraph.state.lastNodeId).toBeGreaterThanOrEqual(
+      subNode.id as number
+    )
+  })
+
+  it('patches link origin_id and target_id after reassignment', () => {
+    const rootGraph = new LGraph()
+    const subgraph = createSubgraphOnGraph(rootGraph)
+
+    const rootNode = new DummyNode()
+    rootGraph.add(rootNode)
+
+    const subNodeA = new DummyNode()
+    subNodeA.id = rootNode.id
+    subgraph._nodes.push(subNodeA)
+    subgraph._nodes_by_id[subNodeA.id] = subNodeA
+
+    const subNodeB = new DummyNode()
+    subNodeB.id = 999
+    subgraph._nodes.push(subNodeB)
+    subgraph._nodes_by_id[subNodeB.id] = subNodeB
+
+    const link = new LLink(1, 'number', subNodeA.id, 0, subNodeB.id, 0)
+    subgraph._links.set(link.id, link)
+
+    rootGraph.ensureGlobalIdUniqueness()
+
+    expect(link.origin_id).toBe(subNodeA.id)
+    expect(link.target_id).toBe(subNodeB.id)
+    expect(link.origin_id).not.toBe(rootNode.id)
+  })
+
+  it('detects collisions with reserved (not-yet-created) node IDs', () => {
+    const rootGraph = new LGraph()
+    const subgraph = createSubgraphOnGraph(rootGraph)
+
+    const subNode = new DummyNode()
+    subNode.id = 42
+    subgraph._nodes.push(subNode)
+    subgraph._nodes_by_id[subNode.id] = subNode
+
+    rootGraph.ensureGlobalIdUniqueness([42])
+
+    expect(subNode.id).not.toBe(42)
+    expect(subgraph._nodes_by_id[subNode.id]).toBe(subNode)
+  })
+
+  it('is a no-op when there are no collisions', () => {
+    const rootGraph = new LGraph()
+    const subgraph = createSubgraphOnGraph(rootGraph)
+
+    const rootNode = new DummyNode()
+    rootGraph.add(rootNode)
+
+    const subNode = new DummyNode()
+    subgraph.add(subNode)
+
+    const rootId = rootNode.id
+    const subId = subNode.id
+
+    rootGraph.ensureGlobalIdUniqueness()
+
+    expect(rootNode.id).toBe(rootId)
+    expect(subNode.id).toBe(subId)
+  })
+})
+
+describe('Subgraph Unpacking', () => {
+  class TestNode extends LGraphNode {
+    constructor(title?: string) {
+      super(title ?? 'TestNode')
+      this.addInput('input_0', 'number')
+      this.addOutput('output_0', 'number')
+    }
+  }
+
+  class MultiInputNode extends LGraphNode {
+    constructor(title?: string) {
+      super(title ?? 'MultiInputNode')
+      this.addInput('input_0', 'number')
+      this.addInput('input_1', 'number')
+      this.addOutput('output_0', 'number')
+    }
+  }
+
+  function registerTestNodes() {
+    LiteGraph.registerNodeType('test/TestNode', TestNode)
+    LiteGraph.registerNodeType('test/MultiInputNode', MultiInputNode)
+  }
+
+  function createSubgraphOnGraph(rootGraph: LGraph) {
+    return rootGraph.createSubgraph(createTestSubgraphData())
+  }
+
+  it('deduplicates links when unpacking subgraph with duplicate links', () => {
+    registerTestNodes()
+    const rootGraph = new LGraph()
+    const subgraph = createSubgraphOnGraph(rootGraph)
+
+    const sourceNode = LiteGraph.createNode('test/TestNode', 'Source')!
+    const targetNode = LiteGraph.createNode('test/TestNode', 'Target')!
+    subgraph.add(sourceNode)
+    subgraph.add(targetNode)
+
+    // Create a legitimate link
+    sourceNode.connect(0, targetNode, 0)
+    expect(subgraph._links.size).toBe(1)
+
+    // Manually add duplicate links (simulating the bug)
+    const existingLink = subgraph._links.values().next().value!
+    for (let i = 0; i < 3; i++) {
+      const dupLink = new LLink(
+        ++subgraph.state.lastLinkId,
+        existingLink.type,
+        existingLink.origin_id,
+        existingLink.origin_slot,
+        existingLink.target_id,
+        existingLink.target_slot
+      )
+      subgraph._links.set(dupLink.id, dupLink)
+      sourceNode.outputs[0].links!.push(dupLink.id)
+    }
+    expect(subgraph._links.size).toBe(4)
+
+    const subgraphNode = createTestSubgraphNode(subgraph, { pos: [100, 100] })
+    rootGraph.add(subgraphNode)
+
+    rootGraph.unpackSubgraph(subgraphNode)
+
+    // After unpacking, there should be exactly 1 link (not 4)
+    expect(rootGraph.links.size).toBe(1)
+  })
+
+  it('preserves correct link connections when unpacking with duplicate links', () => {
+    registerTestNodes()
+    const rootGraph = new LGraph()
+    const subgraph = createSubgraphOnGraph(rootGraph)
+
+    const sourceNode = LiteGraph.createNode('test/MultiInputNode', 'Source')!
+    const targetNode = LiteGraph.createNode('test/MultiInputNode', 'Target')!
+    subgraph.add(sourceNode)
+    subgraph.add(targetNode)
+
+    // Connect source output 0 → target input 0
+    sourceNode.connect(0, targetNode, 0)
+
+    // Add duplicate links to the same connection
+    const existingLink = subgraph._links.values().next().value!
+    const dupLink = new LLink(
+      ++subgraph.state.lastLinkId,
+      existingLink.type,
+      existingLink.origin_id,
+      existingLink.origin_slot,
+      existingLink.target_id,
+      existingLink.target_slot
+    )
+    subgraph._links.set(dupLink.id, dupLink)
+    sourceNode.outputs[0].links!.push(dupLink.id)
+
+    const subgraphNode = createTestSubgraphNode(subgraph, { pos: [100, 100] })
+    rootGraph.add(subgraphNode)
+
+    rootGraph.unpackSubgraph(subgraphNode)
+
+    // Verify only 1 link exists
+    expect(rootGraph.links.size).toBe(1)
+
+    // Verify target input 1 does NOT have a link (no spurious connection)
+    const unpackedTarget = rootGraph.nodes.find((n) => n.title === 'Target')!
+    expect(unpackedTarget.inputs[0].link).not.toBeNull()
+    expect(unpackedTarget.inputs[1].link).toBeNull()
+  })
+
+  it('keeps subgraph definition when unpacking one instance while another remains', () => {
+    const rootGraph = new LGraph()
+    const subgraph = createSubgraphOnGraph(rootGraph)
+
+    const firstInstance = createTestSubgraphNode(subgraph, { pos: [100, 100] })
+    const secondInstance = createTestSubgraphNode(subgraph, { pos: [300, 100] })
+    secondInstance.id = 2
+    rootGraph.add(firstInstance)
+    rootGraph.add(secondInstance)
+
+    rootGraph.unpackSubgraph(firstInstance)
+
+    expect(rootGraph.subgraphs.has(subgraph.id)).toBe(true)
+
+    const serialized = rootGraph.serialize()
+    const definitionIds =
+      serialized.definitions?.subgraphs?.map((definition) => definition.id) ??
+      []
+    expect(definitionIds).toContain(subgraph.id)
+  })
+})
+
+describe('deduplicateSubgraphNodeIds (via configure)', () => {
+  const SUBGRAPH_A = '11111111-1111-4111-8111-111111111111' as UUID
+  const SUBGRAPH_B = '22222222-2222-4222-8222-222222222222' as UUID
+  const SHARED_NODE_IDS = [3, 8, 37]
+
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    LiteGraph.registerNodeType('dummy', DummyNode)
+  })
+
+  function loadFixture(): SerialisableGraph {
+    return structuredClone(duplicateSubgraphNodeIds)
+  }
+
+  function configureFromFixture() {
+    const graphData = loadFixture()
+    const graph = new LGraph()
+    graph.configure(graphData)
+    return { graph, graphData }
+  }
+
+  function nodeIdSet(graph: LGraph, subgraphId: UUID) {
+    return new Set(graph.subgraphs.get(subgraphId)!.nodes.map((n) => n.id))
+  }
+
+  it('remaps duplicate node IDs so subgraphs have no overlap', () => {
+    const { graph } = configureFromFixture()
+
+    const idsA = nodeIdSet(graph, SUBGRAPH_A)
+    const idsB = nodeIdSet(graph, SUBGRAPH_B)
+
+    for (const id of SHARED_NODE_IDS) {
+      expect(idsA.has(id as NodeId)).toBe(true)
+    }
+    for (const id of idsA) {
+      expect(idsB.has(id)).toBe(false)
+    }
+  })
+
+  it('patches link references in remapped subgraph', () => {
+    const { graph } = configureFromFixture()
+    const idsB = nodeIdSet(graph, SUBGRAPH_B)
+
+    for (const link of graph.subgraphs.get(SUBGRAPH_B)!.links.values()) {
+      expect(idsB.has(link.origin_id)).toBe(true)
+      expect(idsB.has(link.target_id)).toBe(true)
+    }
+  })
+
+  it('patches promoted widget references in remapped subgraph', () => {
+    const { graph } = configureFromFixture()
+    const idsB = nodeIdSet(graph, SUBGRAPH_B)
+
+    for (const widget of graph.subgraphs.get(SUBGRAPH_B)!.widgets) {
+      expect(idsB.has(widget.id)).toBe(true)
+    }
+  })
+
+  it('patches proxyWidgets in root-level nodes referencing remapped IDs', () => {
+    const { graph } = configureFromFixture()
+
+    const idsA = new Set(
+      graph.subgraphs.get(SUBGRAPH_A)!.nodes.map((n) => String(n.id))
+    )
+    const idsB = new Set(
+      graph.subgraphs.get(SUBGRAPH_B)!.nodes.map((n) => String(n.id))
+    )
+
+    const pw102 = graph.getNodeById(102 as NodeId)?.properties?.proxyWidgets
+    expect(Array.isArray(pw102)).toBe(true)
+    for (const entry of pw102 as unknown[][]) {
+      expect(Array.isArray(entry)).toBe(true)
+      expect(idsA.has(String(entry[0]))).toBe(true)
+    }
+
+    const pw103 = graph.getNodeById(103 as NodeId)?.properties?.proxyWidgets
+    expect(Array.isArray(pw103)).toBe(true)
+    for (const entry of pw103 as unknown[][]) {
+      expect(Array.isArray(entry)).toBe(true)
+      expect(idsB.has(String(entry[0]))).toBe(true)
+    }
+  })
+
+  it('patches proxyWidgets inside nested subgraph nodes', () => {
+    const graph = new LGraph()
+    graph.configure(structuredClone(nestedSubgraphProxyWidgets))
+
+    const idsB = new Set(
+      graph.subgraphs.get(SUBGRAPH_B)!.nodes.map((n) => String(n.id))
+    )
+
+    const innerNode = graph.subgraphs
+      .get(SUBGRAPH_A)!
+      .nodes.find((n) => n.id === (50 as NodeId))
+    const pw = innerNode?.properties?.proxyWidgets
+    expect(Array.isArray(pw)).toBe(true)
+    for (const entry of pw as unknown[][]) {
+      expect(Array.isArray(entry)).toBe(true)
+      expect(idsB.has(String(entry[0]))).toBe(true)
+    }
+  })
+
+  it('throws when node ID space is exhausted', () => {
+    expect(() => {
+      const graph = new LGraph()
+      graph.configure(structuredClone(nodeIdSpaceExhausted))
+    }).toThrow('Node ID space exhausted')
+  })
+
+  it('is a no-op when subgraph node IDs are already unique', () => {
+    const graph = new LGraph()
+    graph.configure(structuredClone(uniqueSubgraphNodeIds))
+
+    expect(nodeIdSet(graph, SUBGRAPH_A)).toEqual(new Set([10, 11, 12]))
+    expect(nodeIdSet(graph, SUBGRAPH_B)).toEqual(new Set([20, 21, 22]))
+  })
+})
diff --git a/src/lib/litegraph/src/LGraph.ts b/src/lib/litegraph/src/LGraph.ts
index 478a2a7847..dcf5e0c776 100644
--- a/src/lib/litegraph/src/LGraph.ts
+++ b/src/lib/litegraph/src/LGraph.ts
@@ -4,10 +4,14 @@ import {
   SUBGRAPH_INPUT_ID,
   SUBGRAPH_OUTPUT_ID
 } from '@/lib/litegraph/src/constants'
+import { isNodeBindable } from '@/lib/litegraph/src/utils/type'
 import type { UUID } from '@/lib/litegraph/src/utils/uuid'
 import { createUuidv4, zeroUuid } from '@/lib/litegraph/src/utils/uuid'
 import { useLayoutMutations } from '@/renderer/core/layout/operations/layoutMutations'
 import { LayoutSource } from '@/renderer/core/layout/types'
+import { usePromotionStore } from '@/stores/promotionStore'
+import { useWidgetValueStore } from '@/stores/widgetValueStore'
+import { forEachNode } from '@/utils/graphTraversalUtil'
 
 import type { DragAndScaleState } from './DragAndScale'
 import { LGraphCanvas } from './LGraphCanvas'
@@ -15,7 +19,7 @@ import { LGraphGroup } from './LGraphGroup'
 import { LGraphNode } from './LGraphNode'
 import type { NodeId } from './LGraphNode'
 import { LLink } from './LLink'
-import type { LinkId } from './LLink'
+import type { LinkId, SerialisedLLinkArray } from './LLink'
 import { MapProxyHandler } from './MapProxyHandler'
 import { Reroute } from './Reroute'
 import type { RerouteId } from './Reroute'
@@ -73,6 +77,7 @@ import type {
   SerialisableReroute
 } from './types/serialisation'
 import { getAllNestedItems } from './utils/collections'
+import { deduplicateSubgraphNodeIds } from './utils/subgraphDeduplication'
 
 export type {
   LGraphTriggerAction,
@@ -88,18 +93,48 @@ export interface LGraphState {
   lastRerouteId: number
 }
 
-type ParamsArray<
-  T extends Record<any, any>,
-  K extends MethodNames<T>
-> = Parameters<T[K]>[1] extends undefined
-  ? Parameters<T[K]> | Parameters<T[K]>[0]
-  : Parameters<T[K]>
+type ParamsArray<T, K extends MethodNames<T>> = Parameters<
+  Extract<T[K], (...args: never[]) => unknown>
+>[1] extends undefined
+  ?
+      | Parameters<Extract<T[K], (...args: never[]) => unknown>>
+      | Parameters<Extract<T[K], (...args: never[]) => unknown>>[0]
+  : Parameters<Extract<T[K], (...args: never[]) => unknown>>
 
 /** Configuration used by {@link LGraph} `config`. */
 export interface LGraphConfig {
   /** @deprecated Legacy config - unused */
-  align_to_grid?: any
-  links_ontop?: any
+  align_to_grid?: boolean
+  links_ontop?: boolean
+}
+
+/** Options for {@link LGraph.add} method. */
+export interface GraphAddOptions {
+  /** If true, skip recomputing execution order after adding the node. */
+  skipComputeOrder?: boolean
+  /** If true, the node will be semi-transparent and follow the cursor until placed or cancelled. */
+  ghost?: boolean
+  /** Mouse event for ghost placement. Used to position node under cursor. */
+  dragEvent?: MouseEvent
+}
+
+export interface GroupNodeConfigEntry {
+  input?: Record<string, { name?: string; visible?: boolean }>
+  output?: Record<number, { name?: string; visible?: boolean }>
+}
+
+export interface GroupNodeWorkflowData {
+  external: (number | string)[][]
+  links: SerialisedLLinkArray[]
+  nodes: {
+    index?: number
+    type?: string
+    title?: string
+    inputs?: unknown[]
+    outputs?: unknown[]
+    widgets_values?: unknown[]
+  }[]
+  config?: Record<number, GroupNodeConfigEntry>
 }
 
 export interface LGraphExtra extends Dictionary<unknown> {
@@ -107,6 +142,7 @@ export interface LGraphExtra extends Dictionary<unknown> {
   linkExtensions?: { id: number; parentId: number | undefined }[]
   ds?: DragAndScaleState
   workflowRendererVersion?: RendererType
+  groupNodes?: Record<string, GroupNodeWorkflowData>
 }
 
 export interface BaseLGraph {
@@ -168,13 +204,21 @@ export class LGraph
   list_of_graphcanvas: LGraphCanvas[] | null
   status: number = LGraph.STATUS_STOPPED
 
-  state: LGraphState = {
+  private _state: LGraphState = {
     lastGroupId: 0,
     lastNodeId: 0,
     lastLinkId: 0,
     lastRerouteId: 0
   }
 
+  get state(): LGraphState {
+    return this._state
+  }
+
+  set state(value: LGraphState) {
+    this._state = value
+  }
+
   readonly events = new CustomEventTarget<LGraphEventMap>()
   readonly _subgraphs: Map<UUID, Subgraph> = new Map()
 
@@ -224,7 +268,7 @@ export class LGraph
   }
 
   /** Internal only.  Not required for serialisation; calculated on deserialise. */
-  #lastFloatingLinkId: number = 0
+  private _lastFloatingLinkId: number = 0
 
   private readonly floatingLinksInternal: Map<LinkId, LLink> = new Map()
   get floatingLinks(): ReadonlyMap<LinkId, LLink> {
@@ -311,6 +355,12 @@ export class LGraph
     this.stop()
     this.status = LGraph.STATUS_STOPPED
 
+    const graphId = this.id
+    if (this.isRootGraph && graphId !== zeroUuid) {
+      usePromotionStore().clearGraph(graphId)
+      useWidgetValueStore().clearGraph(graphId)
+    }
+
     this.id = zeroUuid
     this.revision = 0
 
@@ -345,7 +395,7 @@ export class LGraph
     this.reroutes.clear()
     this.floatingLinksInternal.clear()
 
-    this.#lastFloatingLinkId = 0
+    this._lastFloatingLinkId = 0
 
     // other scene stuff
     this._groups = []
@@ -735,8 +785,10 @@ export class LGraph
       let max_size = 100
       let y = margin + LiteGraph.NODE_TITLE_HEIGHT
       for (const node of column) {
-        node.pos[0] = layout == LiteGraph.VERTICAL_LAYOUT ? y : x
-        node.pos[1] = layout == LiteGraph.VERTICAL_LAYOUT ? x : y
+        node.setPos(
+          layout == LiteGraph.VERTICAL_LAYOUT ? y : x,
+          layout == LiteGraph.VERTICAL_LAYOUT ? x : y
+        )
         const max_size_index = layout == LiteGraph.VERTICAL_LAYOUT ? 1 : 0
         if (node.size[max_size_index] > max_size) {
           max_size = node.size[max_size_index]
@@ -829,20 +881,48 @@ export class LGraph
     if (!list_of_graphcanvas) return
 
     for (const c of list_of_graphcanvas) {
-      // eslint-disable-next-line prefer-spread
-      c[action]?.apply(c, params)
+      const method = c[action]
+
+      if (typeof method === 'function') {
+        const args =
+          params == null ? [] : Array.isArray(params) ? params : [params]
+        ;(method as (...args: unknown[]) => unknown).apply(c, args)
+      }
     }
   }
 
   /**
    * Adds a new node instance to this graph
    * @param node the instance of the node
+   * @param options Additional options for adding the node
    */
   add(
     node: LGraphNode | LGraphGroup,
-    skip_compute_order?: boolean
+    options?: GraphAddOptions
+  ): LGraphNode | null | undefined
+  /**
+   * Adds a new node instance to this graph
+   * @param node the instance of the node
+   * @param skipComputeOrder If true, skip recomputing execution order
+   * @deprecated Use options object instead
+   */
+  add(
+    node: LGraphNode | LGraphGroup | null,
+    skipComputeOrder?: boolean
+  ): LGraphNode | null | undefined
+  add(
+    node: LGraphNode | LGraphGroup,
+    skipComputeOrderOrOptions?: boolean | GraphAddOptions
   ): LGraphNode | null | undefined {
     if (!node) return
+
+    // Handle backwards compatibility: 2nd arg can be boolean or options
+    const opts: GraphAddOptions =
+      typeof skipComputeOrderOrOptions === 'object'
+        ? skipComputeOrderOrOptions
+        : { skipComputeOrder: skipComputeOrderOrOptions ?? false }
+    const shouldSkipComputeOrder = opts.skipComputeOrder ?? false
+
     const { state } = this
 
     // Ensure created items are snapped
@@ -889,9 +969,22 @@ export class LGraph
       }
     }
 
+    // Set ghost flag before registration so VueNodeData picks it up
+    if (opts.ghost) {
+      node.flags.ghost = true
+    }
+
     node.graph = this
     this._version++
 
+    // Register all widgets with the WidgetValueStore now that node has a
+    // valid ID and graph reference.
+    if (node.widgets) {
+      for (const widget of node.widgets) {
+        if (isNodeBindable(widget)) widget.setNodeId(node.id)
+      }
+    }
+
     this._nodes.push(node)
     this._nodes_by_id[node.id] = node
 
@@ -899,13 +992,24 @@ export class LGraph
 
     if (this.config.align_to_grid) node.alignToGrid()
 
-    if (!skip_compute_order) this.updateExecutionOrder()
+    if (!shouldSkipComputeOrder) this.updateExecutionOrder()
 
     this.onNodeAdded?.(node)
 
     this.setDirtyCanvas(true)
     this.change()
 
+    if (opts.ghost) {
+      this.canvasAction((c) => c.startGhostPlacement(node, opts.dragEvent))
+    }
+
+    if (node.isSubgraphNode?.()) {
+      forEachNode(node.subgraph, (innerNode) => {
+        if (innerNode.isSubgraphNode())
+          this.subgraphs.set(innerNode.subgraph.id, innerNode.subgraph)
+      })
+    }
+
     // to chain actions
     return node
   }
@@ -967,6 +1071,26 @@ export class LGraph
       }
     }
 
+    if (node.isSubgraphNode()) {
+      const allGraphs = [this.rootGraph, ...this.rootGraph.subgraphs.values()]
+      const hasRemainingReferences = allGraphs.some((graph) =>
+        graph.nodes.some(
+          (candidate) =>
+            candidate !== node &&
+            candidate.isSubgraphNode() &&
+            candidate.type === node.subgraph.id
+        )
+      )
+
+      if (!hasRemainingReferences) {
+        forEachNode(node.subgraph, (innerNode) => {
+          innerNode.onRemoved?.()
+          innerNode.graph?.onNodeRemoved?.(innerNode)
+        })
+        this.rootGraph.subgraphs.delete(node.subgraph.id)
+      }
+    }
+
     // callback
     node.onRemoved?.()
 
@@ -1217,7 +1341,7 @@ export class LGraph
   }
 
   /** @todo Clean up - never implemented. */
-  triggerInput(name: string, value: any): void {
+  triggerInput(name: string, value: unknown): void {
     const nodes = this.findNodesByTitle(name)
     for (const node of nodes) {
       // @ts-expect-error - onTrigger method may not exist on all node types
@@ -1226,7 +1350,7 @@ export class LGraph
   }
 
   /** @todo Clean up - never implemented. */
-  setCallback(name: string, func: any): void {
+  setCallback(name: string, func?: () => void): void {
     const nodes = this.findNodesByTitle(name)
     for (const node of nodes) {
       // @ts-expect-error - setTrigger method may not exist on all node types
@@ -1269,7 +1393,7 @@ export class LGraph
 
   addFloatingLink(link: LLink): LLink {
     if (link.id === -1) {
-      link.id = ++this.#lastFloatingLinkId
+      link.id = ++this._lastFloatingLinkId
     }
     this.floatingLinksInternal.set(link.id, link)
 
@@ -1509,6 +1633,22 @@ export class LGraph
   } {
     if (items.size === 0)
       throw new Error('Cannot convert to subgraph: nothing to convert')
+
+    // Record state before conversion for proper undo support
+    this.beforeChange()
+
+    try {
+      return this._convertToSubgraphImpl(items)
+    } finally {
+      // Mark state change complete for proper undo support
+      this.afterChange()
+    }
+  }
+
+  private _convertToSubgraphImpl(items: Set<Positionable>): {
+    subgraph: Subgraph
+    node: SubgraphNode
+  } {
     const { state, revision, config } = this
     const firstChild = [...items][0]
     if (items.size === 1 && firstChild instanceof LGraphGroup) {
@@ -1537,8 +1677,21 @@ export class LGraph
 
     // Inputs, outputs, and links
     const links = internalLinks.map((x) => x.asSerialisable())
-    const inputs = mapSubgraphInputsAndLinks(resolvedInputLinks, links)
-    const outputs = mapSubgraphOutputsAndLinks(resolvedOutputLinks, links)
+
+    const internalReroutes = new Map([...reroutes].map((r) => [r.id, r]))
+    const externalReroutes = new Map(
+      [...this.reroutes].filter(([id]) => !internalReroutes.has(id))
+    )
+    const inputs = mapSubgraphInputsAndLinks(
+      resolvedInputLinks,
+      links,
+      internalReroutes
+    )
+    const outputs = mapSubgraphOutputsAndLinks(
+      resolvedOutputLinks,
+      links,
+      externalReroutes
+    )
 
     // Prepare subgraph data
     const data = {
@@ -1627,7 +1780,10 @@ export class LGraph
     )
 
     //Correct for title height. It's included in bounding box, but not _posSize
-    subgraphNode.pos[1] += LiteGraph.NODE_TITLE_HEIGHT / 2
+    subgraphNode.setPos(
+      subgraphNode.pos[0],
+      subgraphNode.pos[1] + LiteGraph.NODE_TITLE_HEIGHT / 2
+    )
 
     // Add the subgraph node to the graph
     this.add(subgraphNode)
@@ -1680,10 +1836,10 @@ export class LGraph
     // Reconnect output links in parent graph
     i = 0
     for (const [, connections] of outputsGroupedByOutput.entries()) {
-      // Special handling: Subgraph output node
       i++
       for (const connection of connections) {
         const { input, inputNode, link, subgraphOutput } = connection
+        // Special handling: Subgraph output node
         if (link.target_id === SUBGRAPH_OUTPUT_ID) {
           link.origin_id = subgraphNode.id
           link.origin_slot = i - 1
@@ -1715,6 +1871,7 @@ export class LGraph
 
     subgraphNode._setConcreteSlots()
     subgraphNode.arrange()
+
     this.canvasAction((c) =>
       c.canvas.dispatchEvent(
         new CustomEvent('subgraph-converted', {
@@ -1723,6 +1880,7 @@ export class LGraph
         })
       )
     )
+
     return { subgraph, node: subgraphNode as SubgraphNode }
   }
 
@@ -1733,9 +1891,23 @@ export class LGraph
     if (!(subgraphNode instanceof SubgraphNode))
       throw new Error('Can only unpack Subgraph Nodes')
 
+    // Record state before unpacking for proper undo support
+    this.beforeChange()
+
+    try {
+      this._unpackSubgraphImpl(subgraphNode, options)
+    } finally {
+      // Mark state change complete for proper undo support
+      this.afterChange()
+    }
+  }
+
+  private _unpackSubgraphImpl(
+    subgraphNode: SubgraphNode,
+    options?: { skipMissingNodes?: boolean }
+  ) {
     const skipMissingNodes = options?.skipMissingNodes ?? false
 
-    this.beforeChange()
     //NOTE: Create bounds can not be called on positionables directly as the subgraph is not being displayed and boundingRect is not initialized.
     //NOTE: NODE_TITLE_HEIGHT is explicitly excluded here
     const positionables = [
@@ -1777,16 +1949,20 @@ export class LGraph
       node.id = this.last_node_id
       n_info.id = this.last_node_id
 
-      this.add(node, true)
-      node.configure(n_info)
-      node.pos[0] += offsetX
-      node.pos[1] += offsetY
-      for (const input of node.inputs) {
+      // Strip links from serialized data before configure to prevent
+      // onConnectionsChange from resolving subgraph-internal link IDs
+      // against the parent graph's link map (which may contain unrelated
+      // links with the same numeric IDs).
+      for (const input of n_info.inputs ?? []) {
         input.link = null
       }
-      for (const output of node.outputs) {
+      for (const output of n_info.outputs ?? []) {
         output.links = []
       }
+
+      this.add(node, true)
+      node.configure(n_info)
+      node.setPos(node.pos[0] + offsetX, node.pos[1] + offsetY)
       toSelect.push(node)
     }
     const groups = structuredClone(
@@ -1891,9 +2067,19 @@ export class LGraph
       })
     }
     this.remove(subgraphNode)
-    this.subgraphs.delete(subgraphNode.subgraph.id)
+
+    // Deduplicate links by (oid, oslot, tid, tslot) to prevent repeated
+    // disconnect/reconnect cycles on widget inputs that can shift slot indices.
+    const seenLinks = new Set<string>()
+    const dedupedNewLinks = newLinks.filter((link) => {
+      const key = `${link.oid}:${link.oslot}:${link.tid}:${link.tslot}`
+      if (seenLinks.has(key)) return false
+      seenLinks.add(key)
+      return true
+    })
+
     const linkIdMap = new Map<LinkId, LinkId[]>()
-    for (const newLink of newLinks) {
+    for (const newLink of dedupedNewLinks) {
       let created: LLink | null | undefined
       if (newLink.oid == SUBGRAPH_INPUT_ID) {
         if (!(this instanceof Subgraph)) {
@@ -1951,7 +2137,7 @@ export class LGraph
       toSelect.push(migratedReroute)
     }
     //iterate over newly created links to update reroute parentIds
-    for (const newLink of newLinks) {
+    for (const newLink of dedupedNewLinks) {
       const linkInstance = this.links.get(newLink.id)
       if (!linkInstance) {
         continue
@@ -1964,33 +2150,50 @@ export class LGraph
         while (parentId) {
           instance.parentId = parentId
           instance = this.reroutes.get(parentId)
-          if (!instance) throw new Error('Broken Id link when unpacking')
+          if (!instance) {
+            console.error('Broken Id link when unpacking')
+            break
+          }
           if (instance.linkIds.has(linkInstance.id))
             throw new Error('Infinite parentId loop')
           instance.linkIds.add(linkInstance.id)
           parentId = instance.parentId
         }
       }
+      if (!instance) continue
       parentId = newLink.iparent
       while (parentId) {
         const migratedId = rerouteIdMap.get(parentId)
-        if (!migratedId) throw new Error('Broken Id link when unpacking')
+        if (!migratedId) {
+          console.error('Broken Id link when unpacking')
+          break
+        }
         instance.parentId = migratedId
         instance = this.reroutes.get(migratedId)
-        if (!instance) throw new Error('Broken Id link when unpacking')
+        if (!instance) {
+          console.error('Broken Id link when unpacking')
+          break
+        }
         if (instance.linkIds.has(linkInstance.id))
           throw new Error('Infinite parentId loop')
         instance.linkIds.add(linkInstance.id)
         const oldReroute = subgraphNode.subgraph.reroutes.get(parentId)
-        if (!oldReroute) throw new Error('Broken Id link when unpacking')
+        if (!oldReroute) {
+          console.error('Broken Id link when unpacking')
+          break
+        }
         parentId = oldReroute.parentId
       }
+      if (!instance) break
       if (!newLink.externalFirst) {
         parentId = newLink.eparent
         while (parentId) {
           instance.parentId = parentId
           instance = this.reroutes.get(parentId)
-          if (!instance) throw new Error('Broken Id link when unpacking')
+          if (!instance) {
+            console.error('Broken Id link when unpacking')
+            break
+          }
           if (instance.linkIds.has(linkInstance.id))
             throw new Error('Infinite parentId loop')
           instance.linkIds.add(linkInstance.id)
@@ -2006,7 +2209,6 @@ export class LGraph
     }
 
     this.canvasAction((c) => c.selectItems(toSelect))
-    this.afterChange()
   }
 
   /**
@@ -2080,8 +2282,16 @@ export class LGraph
     }
   }
 
+  /**
+   * Custom JSON serialization to prevent circular reference errors.
+   * Called automatically by JSON.stringify().
+   */
+  toJSON(): ISerialisedGraph {
+    return this.serialize()
+  }
+
   /** @returns The drag and scale state of the first attached canvas, otherwise `undefined`. */
-  #getDragAndScale(): DragAndScaleState | undefined {
+  private _getDragAndScale(): DragAndScaleState | undefined {
     const ds = this.list_of_graphcanvas?.at(0)?.ds
     if (ds) return { scale: ds.scale, offset: ds.offset }
   }
@@ -2121,7 +2331,7 @@ export class LGraph
 
     // Save scale and offset
     const extra = { ...this.extra }
-    if (LiteGraph.saveViewportWithGraph) extra.ds = this.#getDragAndScale()
+    if (LiteGraph.saveViewportWithGraph) extra.ds = this._getDragAndScale()
     if (!extra.ds) delete extra.ds
 
     const data: ReturnType<typeof this.asSerialisable> = {
@@ -2143,7 +2353,6 @@ export class LGraph
       const usedSubgraphs = [...this._subgraphs.values()]
         .filter((subgraph) => usedSubgraphIds.has(subgraph.id))
         .map((x) => x.asSerialisable())
-
       if (usedSubgraphs.length > 0) {
         data.definitions = { subgraphs: usedSubgraphs }
       }
@@ -2224,15 +2433,19 @@ export class LGraph
       } else {
         // New schema - one version so far, no check required.
 
-        // State
+        // State - use max to prevent ID collisions across root and subgraphs
         if (data.state) {
           const { lastGroupId, lastLinkId, lastNodeId, lastRerouteId } =
             data.state
           const { state } = this
-          if (lastGroupId != null) state.lastGroupId = lastGroupId
-          if (lastLinkId != null) state.lastLinkId = lastLinkId
-          if (lastNodeId != null) state.lastNodeId = lastNodeId
-          if (lastRerouteId != null) state.lastRerouteId = lastRerouteId
+          if (lastGroupId != null)
+            state.lastGroupId = Math.max(state.lastGroupId, lastGroupId)
+          if (lastLinkId != null)
+            state.lastLinkId = Math.max(state.lastLinkId, lastLinkId)
+          if (lastNodeId != null)
+            state.lastNodeId = Math.max(state.lastNodeId, lastNodeId)
+          if (lastRerouteId != null)
+            state.lastRerouteId = Math.max(state.lastRerouteId, lastRerouteId)
         }
 
         // Links
@@ -2263,11 +2476,39 @@ export class LGraph
         this[i] = data[i]
       }
 
-      // Subgraph definitions
+      // Subgraph definitions — deduplicate node IDs before configuring.
+      // deduplicateSubgraphNodeIds clones internally to avoid mutating
+      // the caller's data (e.g. reactive Pinia state).
       const subgraphs = data.definitions?.subgraphs
+      let effectiveNodesData = nodesData
       if (subgraphs) {
-        for (const subgraph of subgraphs) this.createSubgraph(subgraph)
-        for (const subgraph of subgraphs)
+        const reservedNodeIds = new Set<number>()
+        for (const node of this._nodes) {
+          if (typeof node.id === 'number') reservedNodeIds.add(node.id)
+        }
+        for (const sg of this.subgraphs.values()) {
+          for (const node of sg.nodes) {
+            if (typeof node.id === 'number') reservedNodeIds.add(node.id)
+          }
+        }
+        for (const n of nodesData ?? []) {
+          if (typeof n.id === 'number') reservedNodeIds.add(n.id)
+        }
+
+        const deduplicated = this.isRootGraph
+          ? deduplicateSubgraphNodeIds(
+              subgraphs,
+              reservedNodeIds,
+              this.state,
+              nodesData
+            )
+          : undefined
+
+        const finalSubgraphs = deduplicated?.subgraphs ?? subgraphs
+        effectiveNodesData = deduplicated?.rootNodes ?? nodesData
+
+        for (const subgraph of finalSubgraphs) this.createSubgraph(subgraph)
+        for (const subgraph of finalSubgraphs)
           this.subgraphs.get(subgraph.id)?.configure(subgraph)
       }
 
@@ -2276,8 +2517,8 @@ export class LGraph
 
       // create nodes
       this._nodes = []
-      if (nodesData) {
-        for (const n_info of nodesData) {
+      if (effectiveNodesData) {
+        for (const n_info of effectiveNodesData) {
           // stored info
           let node = LiteGraph.createNode(String(n_info.type), n_info.title)
           if (!node) {
@@ -2311,8 +2552,8 @@ export class LGraph
           const floatingLink = LLink.create(linkData)
           this.addFloatingLink(floatingLink)
 
-          if (floatingLink.id > this.#lastFloatingLinkId)
-            this.#lastFloatingLinkId = floatingLink.id
+          if (floatingLink.id > this._lastFloatingLinkId)
+            this._lastFloatingLinkId = floatingLink.id
         }
       }
 
@@ -2363,13 +2604,57 @@ export class LGraph
     }
   }
 
-  #canvas?: LGraphCanvas
+  /**
+   * Ensures all node IDs are globally unique across the root graph and all
+   * subgraphs. Reassigns any colliding IDs found in subgraphs, preserving
+   * root graph IDs as canonical. Updates link references (`origin_id`,
+   * `target_id`) within the affected graph to match the new node IDs.
+   */
+  ensureGlobalIdUniqueness(reservedNodeIds?: Iterable<number>): void {
+    const { state } = this
+
+    const allGraphs: LGraph[] = [this, ...this._subgraphs.values()]
+
+    const usedNodeIds = new Set<number>(reservedNodeIds)
+    for (const graph of allGraphs) {
+      const remappedIds = new Map<NodeId, NodeId>()
+
+      for (const node of graph._nodes) {
+        if (typeof node.id !== 'number') continue
+
+        if (usedNodeIds.has(node.id)) {
+          const oldId = node.id
+          while (usedNodeIds.has(++state.lastNodeId));
+          const newId = state.lastNodeId
+          delete graph._nodes_by_id[oldId]
+          node.id = newId
+          graph._nodes_by_id[newId] = node
+          usedNodeIds.add(newId)
+          remappedIds.set(oldId, newId)
+          console.warn(
+            `LiteGraph: duplicate node ID ${oldId} reassigned to ${newId} in graph ${graph.id}`
+          )
+        } else {
+          usedNodeIds.add(node.id as number)
+          if ((node.id as number) > state.lastNodeId)
+            state.lastNodeId = node.id as number
+        }
+      }
+
+      if (remappedIds.size > 0) {
+        patchLinkNodeIds(graph._links, remappedIds)
+        patchLinkNodeIds(graph.floatingLinksInternal, remappedIds)
+      }
+    }
+  }
+
+  private _canvas?: LGraphCanvas
   get primaryCanvas(): LGraphCanvas | undefined {
-    return this.rootGraph.#canvas
+    return this.rootGraph._canvas
   }
 
   set primaryCanvas(canvas: LGraphCanvas) {
-    this.rootGraph.#canvas = canvas
+    this.rootGraph._canvas = canvas
   }
 
   load(url: string | Blob | URL | File, callback: () => void) {
@@ -2427,6 +2712,8 @@ export class Subgraph
 
   /** The display name of the subgraph. */
   name: string = 'Unnamed Subgraph'
+  /** Optional description shown as tooltip when hovering over the subgraph node. */
+  description?: string
 
   readonly inputNode = new SubgraphInputNode(this)
   readonly outputNode = new SubgraphOutputNode(this)
@@ -2438,9 +2725,17 @@ export class Subgraph
   /** A list of node widgets displayed in the parent graph, on the subgraph object. */
   readonly widgets: ExposedWidget[] = []
 
-  #rootGraph: LGraph
+  private _rootGraph: LGraph
   override get rootGraph(): LGraph {
-    return this.#rootGraph
+    return this._rootGraph
+  }
+
+  override get state(): LGraphState {
+    return this._rootGraph.state
+  }
+
+  override set state(_value: LGraphState) {
+    // No-op: subgraphs share the root graph's state.
   }
 
   constructor(rootGraph: LGraph, data: ExportedSubgraph) {
@@ -2448,11 +2743,11 @@ export class Subgraph
 
     super()
 
-    this.#rootGraph = rootGraph
+    this._rootGraph = rootGraph
 
     const cloned = structuredClone(data)
     this._configureBase(cloned)
-    this.#configureSubgraph(cloned)
+    this._configureSubgraph(cloned)
   }
 
   getIoNodeOnPos(
@@ -2464,14 +2759,15 @@ export class Subgraph
     if (outputNode.containsPoint([x, y])) return outputNode
   }
 
-  #configureSubgraph(
+  private _configureSubgraph(
     data:
       | (ISerialisedGraph & ExportedSubgraph)
       | (SerialisableGraph & ExportedSubgraph)
   ): void {
-    const { name, inputs, outputs, widgets } = data
+    const { name, description, inputs, outputs, widgets } = data
 
     this.name = name
+    this.description = description
     if (inputs) {
       this.inputs.length = 0
       for (const input of inputs) {
@@ -2497,6 +2793,7 @@ export class Subgraph
 
     this.inputNode.configure(data.inputNode)
     this.outputNode.configure(data.outputNode)
+    for (const node of this.nodes) node.updateComputedDisabled()
   }
 
   override configure(
@@ -2507,7 +2804,7 @@ export class Subgraph
   ): boolean | undefined {
     const r = super.configure(data, keep_old)
 
-    this.#configureSubgraph(data)
+    this._configureSubgraph(data)
     return r
   }
 
@@ -2517,6 +2814,10 @@ export class Subgraph
   }
 
   addInput(name: string, type: string): SubgraphInput {
+    if (name === null || type === null) {
+      throw new Error('Name and type are required for subgraph input')
+    }
+
     this.events.dispatch('adding-input', { name, type })
 
     const input = new SubgraphInput(
@@ -2535,6 +2836,10 @@ export class Subgraph
   }
 
   addOutput(name: string, type: string): SubgraphOutput {
+    if (name === null || type === null) {
+      throw new Error('Name and type are required for subgraph output')
+    }
+
     this.events.dispatch('adding-output', { name, type })
 
     const output = new SubgraphOutput(
@@ -2673,6 +2978,7 @@ export class Subgraph
       revision: this.revision,
       config: this.config,
       name: this.name,
+      ...(this.description && { description: this.description }),
       inputNode: this.inputNode.asSerialisable(),
       outputNode: this.outputNode.asSerialisable(),
       inputs: this.inputs.map((x) => x.asSerialisable()),
@@ -2688,3 +2994,16 @@ export class Subgraph
     }
   }
 }
+
+function patchLinkNodeIds(
+  links: Map<LinkId, LLink>,
+  remappedIds: Map<NodeId, NodeId>
+): void {
+  for (const link of links.values()) {
+    const newOrigin = remappedIds.get(link.origin_id)
+    if (newOrigin !== undefined) link.origin_id = newOrigin
+
+    const newTarget = remappedIds.get(link.target_id)
+    if (newTarget !== undefined) link.target_id = newTarget
+  }
+}
diff --git a/src/lib/litegraph/src/LGraphBadge.ts b/src/lib/litegraph/src/LGraphBadge.ts
index 76f916fec7..6fad0a09c0 100644
--- a/src/lib/litegraph/src/LGraphBadge.ts
+++ b/src/lib/litegraph/src/LGraphBadge.ts
@@ -1,3 +1,4 @@
+import type { ReadOnlyRect } from '@/lib/litegraph/src/interfaces'
 import { LGraphIcon } from './LGraphIcon'
 import type { LGraphIconOptions } from './LGraphIcon'
 
@@ -15,6 +16,7 @@ export interface LGraphBadgeOptions {
   height?: number
   cornerRadius?: number
   iconOptions?: LGraphIconOptions
+  onClick?: (e: MouseEvent) => void
   xOffset?: number
   yOffset?: number
 }
@@ -28,9 +30,15 @@ export class LGraphBadge {
   height: number
   cornerRadius: number
   icon?: LGraphIcon
+  onClick?: (e: MouseEvent) => void
   xOffset: number
   yOffset: number
 
+  readonly _boundingRect: [number, number, number, number] = [0, 0, 0, 0]
+  get boundingRect(): ReadOnlyRect {
+    return this._boundingRect
+  }
+
   constructor({
     text,
     fgColor = 'white',
@@ -40,6 +48,7 @@ export class LGraphBadge {
     height = 20,
     cornerRadius = 5,
     iconOptions,
+    onClick,
     xOffset = 0,
     yOffset = 0
   }: LGraphBadgeOptions) {
@@ -53,6 +62,7 @@ export class LGraphBadge {
     if (iconOptions) {
       this.icon = new LGraphIcon(iconOptions)
     }
+    this.onClick = onClick
     this.xOffset = xOffset
     this.yOffset = yOffset
   }
@@ -91,6 +101,8 @@ export class LGraphBadge {
     const badgeWidth = this.getWidth(ctx)
     const badgeX = 0
 
+    this._boundingRect.splice(0, 4, x, y, badgeWidth, this.height)
+
     // Draw badge background
     ctx.fillStyle = this.bgColor
     ctx.beginPath()
diff --git a/tests-ui/tests/litegraph/core/LGraphButton.test.ts b/src/lib/litegraph/src/LGraphButton.test.ts
similarity index 88%
rename from tests-ui/tests/litegraph/core/LGraphButton.test.ts
rename to src/lib/litegraph/src/LGraphButton.test.ts
index 18830d8a47..7490a2d0a3 100644
--- a/tests-ui/tests/litegraph/core/LGraphButton.test.ts
+++ b/src/lib/litegraph/src/LGraphButton.test.ts
@@ -1,21 +1,18 @@
 import { describe, expect, it, vi } from 'vitest'
 
-import { LGraphButton } from '@/lib/litegraph/src/litegraph'
-import { Rectangle } from '@/lib/litegraph/src/litegraph'
+import { LGraphButton, Rectangle } from '@/lib/litegraph/src/litegraph'
 
 describe('LGraphButton', () => {
   describe('Constructor', () => {
     it('should create a button with default options', () => {
-      // @ts-expect-error TODO: Fix after merge - LGraphButton constructor type issues
-      const button = new LGraphButton({})
+      const button = new LGraphButton({ text: '' })
       expect(button).toBeInstanceOf(LGraphButton)
       expect(button.name).toBeUndefined()
       expect(button._last_area).toBeInstanceOf(Rectangle)
     })
 
     it('should create a button with custom name', () => {
-      // @ts-expect-error TODO: Fix after merge - LGraphButton constructor type issues
-      const button = new LGraphButton({ name: 'test_button' })
+      const button = new LGraphButton({ text: '', name: 'test_button' })
       expect(button.name).toBe('test_button')
     })
 
@@ -39,7 +36,7 @@ describe('LGraphButton', () => {
       const button = new LGraphButton({ text: '' }) // Empty text makes it invisible
       const ctx = {
         measureText: vi.fn().mockReturnValue({ width: 100 })
-      } as unknown as CanvasRenderingContext2D
+      } as Partial<CanvasRenderingContext2D> as CanvasRenderingContext2D
 
       const superDrawSpy = vi.spyOn(
         Object.getPrototypeOf(Object.getPrototypeOf(button)),
@@ -69,7 +66,7 @@ describe('LGraphButton', () => {
         font: '',
         fillStyle: '',
         globalAlpha: 1
-      } as unknown as CanvasRenderingContext2D
+      } as Partial<CanvasRenderingContext2D> as CanvasRenderingContext2D
 
       const mockGetWidth = vi.fn().mockReturnValue(80)
       button.getWidth = mockGetWidth
@@ -101,7 +98,7 @@ describe('LGraphButton', () => {
         font: '',
         fillStyle: '',
         globalAlpha: 1
-      } as unknown as CanvasRenderingContext2D
+      } as Partial<CanvasRenderingContext2D> as CanvasRenderingContext2D
 
       const mockGetWidth = vi.fn().mockReturnValue(50)
       button.getWidth = mockGetWidth
@@ -159,9 +156,8 @@ describe('LGraphButton', () => {
       const button = new LGraphButton({
         text: '→',
         fontSize: 20,
-        // @ts-expect-error TODO: Fix after merge - color property not defined in type
-        color: '#FFFFFF',
-        backgroundColor: '#333333',
+        fgColor: '#FFFFFF',
+        bgColor: '#333333',
         xOffset: -10,
         yOffset: 5
       })
@@ -176,7 +172,7 @@ describe('LGraphButton', () => {
         font: '',
         fillStyle: '',
         globalAlpha: 1
-      } as unknown as CanvasRenderingContext2D
+      } as Partial<CanvasRenderingContext2D> as CanvasRenderingContext2D
 
       // Draw the button
       button.draw(ctx, 100, 50)
diff --git a/src/lib/litegraph/src/LGraphCanvas.clipboard.test.ts b/src/lib/litegraph/src/LGraphCanvas.clipboard.test.ts
new file mode 100644
index 0000000000..5a5db26a17
--- /dev/null
+++ b/src/lib/litegraph/src/LGraphCanvas.clipboard.test.ts
@@ -0,0 +1,102 @@
+import { describe, expect, it } from 'vitest'
+
+import { LGraph, LGraphNode, createUuidv4 } from '@/lib/litegraph/src/litegraph'
+import { remapClipboardSubgraphNodeIds } from '@/lib/litegraph/src/LGraphCanvas'
+import type {
+  ClipboardItems,
+  ExportedSubgraph,
+  ISerialisedNode
+} from '@/lib/litegraph/src/types/serialisation'
+
+function createSerialisedNode(
+  id: number,
+  type: string,
+  proxyWidgets?: Array<[string, string]>
+): ISerialisedNode {
+  return {
+    id,
+    type,
+    pos: [0, 0],
+    size: [140, 80],
+    flags: {},
+    order: 0,
+    mode: 0,
+    inputs: [],
+    outputs: [],
+    properties: proxyWidgets ? { proxyWidgets } : {}
+  }
+}
+
+describe('remapClipboardSubgraphNodeIds', () => {
+  it('remaps pasted subgraph interior IDs and proxyWidgets references', () => {
+    const rootGraph = new LGraph()
+    const existingNode = new LGraphNode('existing')
+    existingNode.id = 1
+    rootGraph.add(existingNode)
+
+    const subgraphId = createUuidv4()
+    const pastedSubgraph: ExportedSubgraph = {
+      id: subgraphId,
+      version: 1,
+      revision: 0,
+      state: {
+        lastNodeId: 0,
+        lastLinkId: 0,
+        lastGroupId: 0,
+        lastRerouteId: 0
+      },
+      config: {},
+      name: 'Pasted Subgraph',
+      inputNode: {
+        id: -10,
+        bounding: [0, 0, 10, 10]
+      },
+      outputNode: {
+        id: -20,
+        bounding: [0, 0, 10, 10]
+      },
+      inputs: [],
+      outputs: [],
+      widgets: [],
+      nodes: [createSerialisedNode(1, 'test/node')],
+      links: [
+        {
+          id: 1,
+          type: '*',
+          origin_id: 1,
+          origin_slot: 0,
+          target_id: 1,
+          target_slot: 0
+        }
+      ],
+      groups: []
+    }
+
+    const parsed: ClipboardItems = {
+      nodes: [createSerialisedNode(99, subgraphId, [['1', 'seed']])],
+      groups: [],
+      reroutes: [],
+      links: [],
+      subgraphs: [pastedSubgraph]
+    }
+
+    remapClipboardSubgraphNodeIds(parsed, rootGraph)
+
+    const remappedSubgraph = parsed.subgraphs?.[0]
+    expect(remappedSubgraph).toBeDefined()
+
+    const remappedLink = remappedSubgraph?.links?.[0]
+    expect(remappedLink).toBeDefined()
+
+    const remappedInteriorId = remappedSubgraph?.nodes?.[0]?.id
+    expect(remappedInteriorId).not.toBe(1)
+    expect(remappedLink?.origin_id).toBe(remappedInteriorId)
+    expect(remappedLink?.target_id).toBe(remappedInteriorId)
+
+    const remappedNode = parsed.nodes?.[0]
+    expect(remappedNode).toBeDefined()
+    expect(remappedNode?.properties?.proxyWidgets).toStrictEqual([
+      [String(remappedInteriorId), 'seed']
+    ])
+  })
+})
diff --git a/src/lib/litegraph/src/LGraphCanvas.slotHitDetection.test.ts b/src/lib/litegraph/src/LGraphCanvas.slotHitDetection.test.ts
new file mode 100644
index 0000000000..c43f9bf560
--- /dev/null
+++ b/src/lib/litegraph/src/LGraphCanvas.slotHitDetection.test.ts
@@ -0,0 +1,212 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import {
+  LGraph,
+  LGraphCanvas,
+  LGraphNode,
+  LiteGraph
+} from '@/lib/litegraph/src/litegraph'
+import { layoutStore } from '@/renderer/core/layout/store/layoutStore'
+
+vi.mock('@/renderer/core/layout/store/layoutStore', () => ({
+  layoutStore: {
+    querySlotAtPoint: vi.fn(),
+    queryRerouteAtPoint: vi.fn(),
+    getNodeLayoutRef: vi.fn(() => ({ value: null })),
+    getSlotLayout: vi.fn(),
+    setSource: vi.fn(),
+    batchUpdateNodeBounds: vi.fn()
+  }
+}))
+
+describe('LGraphCanvas slot hit detection', () => {
+  let graph: LGraph
+  let canvas: LGraphCanvas
+  let node: LGraphNode
+  let canvasElement: HTMLCanvasElement
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+
+    canvasElement = document.createElement('canvas')
+    canvasElement.width = 800
+    canvasElement.height = 600
+
+    const ctx = {
+      save: vi.fn(),
+      restore: vi.fn(),
+      translate: vi.fn(),
+      scale: vi.fn(),
+      fillRect: vi.fn(),
+      strokeRect: vi.fn(),
+      fillText: vi.fn(),
+      measureText: vi.fn().mockReturnValue({ width: 50 }),
+      beginPath: vi.fn(),
+      moveTo: vi.fn(),
+      lineTo: vi.fn(),
+      stroke: vi.fn(),
+      fill: vi.fn(),
+      closePath: vi.fn(),
+      arc: vi.fn(),
+      rect: vi.fn(),
+      clip: vi.fn(),
+      clearRect: vi.fn(),
+      setTransform: vi.fn(),
+      roundRect: vi.fn(),
+      getTransform: vi
+        .fn()
+        .mockReturnValue({ a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }),
+      font: '',
+      fillStyle: '',
+      strokeStyle: '',
+      lineWidth: 1,
+      globalAlpha: 1,
+      textAlign: 'left' as CanvasTextAlign,
+      textBaseline: 'alphabetic' as CanvasTextBaseline
+    } as Partial<CanvasRenderingContext2D> as CanvasRenderingContext2D
+
+    canvasElement.getContext = vi.fn().mockReturnValue(ctx)
+    canvasElement.getBoundingClientRect = vi.fn().mockReturnValue({
+      left: 0,
+      top: 0,
+      width: 800,
+      height: 600
+    })
+
+    graph = new LGraph()
+    canvas = new LGraphCanvas(canvasElement, graph, {
+      skip_render: true
+    })
+
+    // Create a test node with an output slot
+    node = new LGraphNode('Test Node')
+    node.pos = [100, 100]
+    node.size = [150, 80]
+    node.addOutput('output', 'number')
+    graph.add(node)
+
+    // Enable Vue nodes mode for the test
+    LiteGraph.vueNodesMode = true
+  })
+
+  afterEach(() => {
+    LiteGraph.vueNodesMode = false
+  })
+
+  describe('processMouseDown slot fallback in Vue nodes mode', () => {
+    it('should query layoutStore.querySlotAtPoint when clicking outside node bounds', () => {
+      // Click position outside node bounds (node is at 100,100 with size 150x80)
+      // So node covers x: 100-250, y: 100-180
+      // Click at x=255 is outside the right edge
+      const clickX = 255
+      const clickY = 120
+
+      // Verify the click is outside the node bounds
+      expect(node.isPointInside(clickX, clickY)).toBe(false)
+      expect(graph.getNodeOnPos(clickX, clickY)).toBeNull()
+
+      // Mock the slot query to return our node's slot
+      vi.mocked(layoutStore.querySlotAtPoint).mockReturnValue({
+        nodeId: String(node.id),
+        index: 0,
+        type: 'output',
+        position: { x: 252, y: 120 },
+        bounds: { x: 246, y: 110, width: 20, height: 20 }
+      })
+
+      // Call processMouseDown - this should trigger the slot fallback
+      canvas.processMouseDown(
+        new MouseEvent('pointerdown', {
+          button: 1, // Middle button
+          clientX: clickX,
+          clientY: clickY
+        })
+      )
+
+      // The fix should query the layout store when no node is found at click position
+      expect(layoutStore.querySlotAtPoint).toHaveBeenCalledWith({
+        x: clickX,
+        y: clickY
+      })
+    })
+
+    it('should NOT query layoutStore when node is found directly at click position', () => {
+      // Initialize node's bounding rect
+      node.updateArea()
+
+      // Populate visible_nodes (normally done during render)
+      canvas.visible_nodes = [node]
+
+      // Click inside the node bounds
+      const clickX = 150
+      const clickY = 140
+
+      // Verify the click is inside the node bounds
+      expect(node.isPointInside(clickX, clickY)).toBe(true)
+      expect(graph.getNodeOnPos(clickX, clickY)).toBe(node)
+
+      // Call processMouseDown
+      canvas.processMouseDown(
+        new MouseEvent('pointerdown', {
+          button: 1,
+          clientX: clickX,
+          clientY: clickY
+        })
+      )
+
+      // Should NOT query the layout store since node was found directly
+      expect(layoutStore.querySlotAtPoint).not.toHaveBeenCalled()
+    })
+
+    it('should NOT query layoutStore when not in Vue nodes mode', () => {
+      LiteGraph.vueNodesMode = false
+
+      const clickX = 255
+      const clickY = 120
+
+      // Call processMouseDown
+      canvas.processMouseDown(
+        new MouseEvent('pointerdown', {
+          button: 1,
+          clientX: clickX,
+          clientY: clickY
+        })
+      )
+
+      // Should NOT query the layout store in non-Vue mode
+      expect(layoutStore.querySlotAtPoint).not.toHaveBeenCalled()
+    })
+
+    it('should find node via slot query for input slots extending beyond left edge', () => {
+      node.addInput('input', 'number')
+
+      // Click position left of node (node starts at x=100)
+      const clickX = 95
+      const clickY = 140
+
+      // Verify outside bounds
+      expect(node.isPointInside(clickX, clickY)).toBe(false)
+
+      vi.mocked(layoutStore.querySlotAtPoint).mockReturnValue({
+        nodeId: String(node.id),
+        index: 0,
+        type: 'input',
+        position: { x: 98, y: 140 },
+        bounds: { x: 88, y: 130, width: 20, height: 20 }
+      })
+
+      canvas.processMouseDown(
+        new MouseEvent('pointerdown', {
+          button: 1,
+          clientX: clickX,
+          clientY: clickY
+        })
+      )
+
+      expect(layoutStore.querySlotAtPoint).toHaveBeenCalledWith({
+        x: clickX,
+        y: clickY
+      })
+    })
+  })
+})
diff --git a/tests-ui/tests/litegraph/core/LGraphCanvas.titleButtons.test.ts b/src/lib/litegraph/src/LGraphCanvas.titleButtons.test.ts
similarity index 77%
rename from tests-ui/tests/litegraph/core/LGraphCanvas.titleButtons.test.ts
rename to src/lib/litegraph/src/LGraphCanvas.titleButtons.test.ts
index f02fe005e1..c444f0a942 100644
--- a/tests-ui/tests/litegraph/core/LGraphCanvas.titleButtons.test.ts
+++ b/src/lib/litegraph/src/LGraphCanvas.titleButtons.test.ts
@@ -1,7 +1,11 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-import { LGraphCanvas } from '@/lib/litegraph/src/litegraph'
-import { LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph'
+import {
+  LGraph,
+  LGraphCanvas,
+  LGraphNode,
+  LiteGraph
+} from '@/lib/litegraph/src/litegraph'
 
 describe('LGraphCanvas Title Button Rendering', () => {
   let canvas: LGraphCanvas
@@ -39,12 +43,12 @@ describe('LGraphCanvas Title Button Rendering', () => {
       globalAlpha: 1,
       textAlign: 'left' as CanvasTextAlign,
       textBaseline: 'alphabetic' as CanvasTextBaseline
-    } as unknown as CanvasRenderingContext2D
+    } as Partial<CanvasRenderingContext2D> as CanvasRenderingContext2D
 
     canvasElement.getContext = vi.fn().mockReturnValue(ctx)
 
-    // @ts-expect-error TODO: Fix after merge - LGraphCanvas constructor type issues
-    canvas = new LGraphCanvas(canvasElement, null, {
+    const graph = new LGraph()
+    canvas = new LGraphCanvas(canvasElement, graph, {
       skip_render: true,
       skip_events: true
     })
@@ -53,18 +57,9 @@ describe('LGraphCanvas Title Button Rendering', () => {
     node.pos = [100, 200]
     node.size = [200, 100]
 
-    // Mock required methods
     node.drawTitleBarBackground = vi.fn()
-    // @ts-expect-error Property 'drawTitleBarText' does not exist on type 'LGraphNode'
-    node.drawTitleBarText = vi.fn()
     node.drawBadges = vi.fn()
-    // @ts-expect-error TODO: Fix after merge - drawToggles not defined in type
-    node.drawToggles = vi.fn()
-    // @ts-expect-error TODO: Fix after merge - drawNodeShape not defined in type
-    node.drawNodeShape = vi.fn()
     node.drawSlots = vi.fn()
-    // @ts-expect-error TODO: Fix after merge - drawContent not defined in type
-    node.drawContent = vi.fn()
     node.drawWidgets = vi.fn()
     node.drawCollapsedSlots = vi.fn()
     node.drawTitleBox = vi.fn()
@@ -72,24 +67,31 @@ describe('LGraphCanvas Title Button Rendering', () => {
     node.drawProgressBar = vi.fn()
     node._setConcreteSlots = vi.fn()
     node.arrange = vi.fn()
-    // @ts-expect-error TODO: Fix after merge - isSelectable not defined in type
-    node.isSelectable = vi.fn().mockReturnValue(true)
+
+    const nodeWithMocks = node as LGraphNode & {
+      drawTitleBarText: ReturnType<typeof vi.fn>
+      drawToggles: ReturnType<typeof vi.fn>
+      drawNodeShape: ReturnType<typeof vi.fn>
+      drawContent: ReturnType<typeof vi.fn>
+      isSelectable: ReturnType<typeof vi.fn>
+    }
+    nodeWithMocks.drawTitleBarText = vi.fn()
+    nodeWithMocks.drawToggles = vi.fn()
+    nodeWithMocks.drawNodeShape = vi.fn()
+    nodeWithMocks.drawContent = vi.fn()
+    nodeWithMocks.isSelectable = vi.fn().mockReturnValue(true)
   })
 
   describe('drawNode title button rendering', () => {
     it('should render visible title buttons', () => {
       const button1 = node.addTitleButton({
         name: 'button1',
-        text: 'A',
-        // @ts-expect-error TODO: Fix after merge - visible property not in LGraphButtonOptions
-        visible: true
+        text: 'A'
       })
 
       const button2 = node.addTitleButton({
         name: 'button2',
-        text: 'B',
-        // @ts-expect-error TODO: Fix after merge - visible property not in LGraphButtonOptions
-        visible: true
+        text: 'B'
       })
 
       // Mock button methods
@@ -124,9 +126,7 @@ describe('LGraphCanvas Title Button Rendering', () => {
     it('should skip invisible title buttons', () => {
       const visibleButton = node.addTitleButton({
         name: 'visible',
-        text: 'V',
-        // @ts-expect-error TODO: Fix after merge - visible property not in LGraphButtonOptions
-        visible: true
+        text: 'V'
       })
 
       const invisibleButton = node.addTitleButton({
@@ -168,9 +168,7 @@ describe('LGraphCanvas Title Button Rendering', () => {
       for (let i = 0; i < 3; i++) {
         const button = node.addTitleButton({
           name: `button${i}`,
-          text: String(i),
-          // @ts-expect-error TODO: Fix after merge - visible property not in LGraphButtonOptions
-          visible: true
+          text: String(i)
         })
         button.getWidth = vi.fn().mockReturnValue(15) // All same width for simplicity
         const spy = vi.spyOn(button, 'draw')
@@ -193,18 +191,12 @@ describe('LGraphCanvas Title Button Rendering', () => {
     it('should render buttons in low quality mode', () => {
       const button = node.addTitleButton({
         name: 'test',
-        text: 'T',
-        // @ts-expect-error TODO: Fix after merge - visible property not in LGraphButtonOptions
-        visible: true
+        text: 'T'
       })
 
       button.getWidth = vi.fn().mockReturnValue(20)
       const drawSpy = vi.spyOn(button, 'draw')
 
-      // Set low quality rendering
-      // @ts-expect-error TODO: Fix after merge - lowQualityRenderingRequired not defined in type
-      canvas.lowQualityRenderingRequired = true
-
       canvas.drawNode(node, ctx)
 
       // Buttons should still be rendered in low quality mode
@@ -216,16 +208,12 @@ describe('LGraphCanvas Title Button Rendering', () => {
     it('should handle buttons with different widths', () => {
       const smallButton = node.addTitleButton({
         name: 'small',
-        text: 'S',
-        // @ts-expect-error TODO: Fix after merge - visible property not in LGraphButtonOptions
-        visible: true
+        text: 'S'
       })
 
       const largeButton = node.addTitleButton({
         name: 'large',
-        text: 'LARGE',
-        // @ts-expect-error TODO: Fix after merge - visible property not in LGraphButtonOptions
-        visible: true
+        text: 'LARGE'
       })
 
       smallButton.getWidth = vi.fn().mockReturnValue(15)
@@ -253,9 +241,7 @@ describe('LGraphCanvas Title Button Rendering', () => {
 
       const button = node.addTitleButton({
         name: 'test',
-        text: 'X',
-        // @ts-expect-error TODO: Fix after merge - visible property not in LGraphButtonOptions
-        visible: true
+        text: 'X'
       })
 
       button.getWidth = vi.fn().mockReturnValue(20)
diff --git a/src/lib/litegraph/src/LGraphCanvas.ts b/src/lib/litegraph/src/LGraphCanvas.ts
index 7792260a4e..5974e12934 100644
--- a/src/lib/litegraph/src/LGraphCanvas.ts
+++ b/src/lib/litegraph/src/LGraphCanvas.ts
@@ -1,16 +1,18 @@
 import { toString } from 'es-toolkit/compat'
+import { toValue } from 'vue'
 
 import { PREFIX, SEPARATOR } from '@/constants/groupNodeConstants'
+import { MovingInputLink } from '@/lib/litegraph/src/canvas/MovingInputLink'
 import { LitegraphLinkAdapter } from '@/renderer/core/canvas/litegraph/litegraphLinkAdapter'
 import type { LinkRenderContext } from '@/renderer/core/canvas/litegraph/litegraphLinkAdapter'
 import { getSlotPosition } from '@/renderer/core/canvas/litegraph/slotCalculations'
-import { useLayoutMutations } from '@/renderer/core/layout/operations/layoutMutations'
 import { layoutStore } from '@/renderer/core/layout/store/layoutStore'
 import { LayoutSource } from '@/renderer/core/layout/types'
-import { removeNodeTitleHeight } from '@/renderer/core/layout/utils/nodeSizeUtil'
+import { forEachNode } from '@/utils/graphTraversalUtil'
 
 import { CanvasPointer } from './CanvasPointer'
 import type { ContextMenu } from './ContextMenu'
+import { createCursorCache } from './cursorCache'
 import { DragAndScale } from './DragAndScale'
 import type { AnimationOptions } from './DragAndScale'
 import type { LGraph } from './LGraph'
@@ -52,6 +54,11 @@ import type {
   LinkSegment,
   NewNodePosition,
   NullableProperties,
+  Panel,
+  PanelButton,
+  PanelWidget,
+  PanelWidgetCallback,
+  PanelWidgetOptions,
   Point,
   Positionable,
   ReadOnlyRect,
@@ -94,7 +101,7 @@ import type {
   SubgraphIO
 } from './types/serialisation'
 import type { NeverNever, PickNevers } from './types/utility'
-import type { IBaseWidget } from './types/widgets'
+import type { IBaseWidget, TWidgetValue } from './types/widgets'
 import { alignNodes, distributeNodes, getBoundaryNodes } from './utils/arrange'
 import { findFirstNode, getAllNestedItems } from './utils/collections'
 import { resolveConnectingLinkColor } from './utils/linkColors'
@@ -196,6 +203,9 @@ interface LGraphCanvasState {
    * Downstream consumers may reset to false once actioned.
    */
   selectionChanged: boolean
+
+  /** ID of node currently in ghost placement mode (semi-transparent, following cursor). */
+  ghostNodeId: NodeId | null
 }
 
 /**
@@ -224,12 +234,21 @@ interface IPasteFromClipboardOptions {
 }
 
 interface ICreatePanelOptions {
-  closable?: any
-  window?: any
+  closable?: boolean
+  window?: Window
   onOpen?: () => void
   onClose?: () => void
-  width?: any
-  height?: any
+  width?: number | string
+  height?: number | string
+}
+
+interface SlotTypeDefaultNodeOpts {
+  node?: string
+  title?: string
+  properties?: Record<string, NodeProperty>
+  inputs?: [string, string][]
+  outputs?: [string, string][]
+  json?: Parameters<LGraphNode['configure']>[0]
 }
 
 const cursors = {
@@ -297,20 +316,21 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     readOnly: false,
     hoveringOver: CanvasItem.Nothing,
     shouldSetCursor: true,
-    selectionChanged: false
+    selectionChanged: false,
+    ghostNodeId: null
   }
 
-  #subgraph?: Subgraph
+  private _subgraph?: Subgraph
   get subgraph(): Subgraph | undefined {
-    return this.#subgraph
+    return this._subgraph
   }
 
   set subgraph(value: Subgraph | undefined) {
-    if (value !== this.#subgraph) {
-      this.#subgraph = value
+    if (value !== this._subgraph) {
+      this._subgraph = value
       if (value)
         this.dispatch('litegraph:set-graph', {
-          oldGraph: this.#subgraph,
+          oldGraph: this._subgraph,
           newGraph: value
         })
     }
@@ -345,7 +365,9 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     this.canvas.dispatchEvent(new CustomEvent(type, { detail }))
   }
 
-  #updateCursorStyle() {
+  private _setCursor!: ReturnType<typeof createCursorCache>
+
+  private _updateCursorStyle() {
     if (!this.state.shouldSetCursor) return
 
     const crosshairItems =
@@ -367,7 +389,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
       cursor = 'grab'
     }
 
-    this.canvas.style.cursor = cursor
+    this._setCursor(cursor)
   }
 
   // Whether the canvas was previously being dragged prior to pressing space key.
@@ -382,7 +404,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
 
   set read_only(value: boolean) {
     this.state.readOnly = value
-    this.#updateCursorStyle()
+    this._updateCursorStyle()
   }
 
   get isDragging(): boolean {
@@ -399,7 +421,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
 
   set hoveringOver(value: CanvasItem) {
     this.state.hoveringOver = value
-    this.#updateCursorStyle()
+    this._updateCursorStyle()
   }
 
   /** @deprecated Replace all references with {@link pointer}.{@link CanvasPointer.isDown isDown}. */
@@ -419,7 +441,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
 
   set dragging_canvas(value: boolean) {
     this.state.draggingCanvas = value
-    this.#updateCursorStyle()
+    this._updateCursorStyle()
   }
 
   /**
@@ -434,16 +456,16 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     return `normal ${LiteGraph.NODE_SUBTEXT_SIZE}px ${LiteGraph.NODE_FONT}`
   }
 
-  #maximumFrameGap = 0
+  private _maximumFrameGap = 0
   /** Maximum frames per second to render. 0: unlimited. Default: 0 */
   public get maximumFps() {
-    return this.#maximumFrameGap > Number.EPSILON
-      ? this.#maximumFrameGap / 1000
+    return this._maximumFrameGap > Number.EPSILON
+      ? this._maximumFrameGap / 1000
       : 0
   }
 
   public set maximumFps(value) {
-    this.#maximumFrameGap = value > Number.EPSILON ? 1000 / value : 0
+    this._maximumFrameGap = value > Number.EPSILON ? 1000 / value : 0
   }
 
   /**
@@ -495,10 +517,10 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
   }
 
   options: {
-    skip_events?: any
-    viewport?: any
-    skip_render?: any
-    autoresize?: any
+    skip_events?: boolean
+    viewport?: Rect
+    skip_render?: boolean
+    autoresize?: boolean
   }
 
   background_image: string
@@ -584,13 +606,27 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
   /** @deprecated LEGACY: REMOVE THIS, USE {@link graph_mouse} INSTEAD */
   canvas_mouse: Point
   /** to personalize the search box */
-  onSearchBox?: (helper: Element, str: string, canvas: LGraphCanvas) => any
-  onSearchBoxSelection?: (name: any, event: any, canvas: LGraphCanvas) => void
+  onSearchBox?: (
+    helper: HTMLDivElement,
+    str: string,
+    canvas: LGraphCanvas
+  ) => string[] | undefined
+  onSearchBoxSelection?: (
+    name: string,
+    event: MouseEvent,
+    canvas: LGraphCanvas
+  ) => void
   onMouse?: (e: CanvasPointerEvent) => boolean
   /** to render background objects (behind nodes and connections) in the canvas affected by transform */
-  onDrawBackground?: (ctx: CanvasRenderingContext2D, visible_area: any) => void
+  onDrawBackground?: (
+    ctx: CanvasRenderingContext2D,
+    visible_area: Rectangle
+  ) => void
   /** to render foreground objects (above nodes and connections) in the canvas affected by transform */
-  onDrawForeground?: (arg0: CanvasRenderingContext2D, arg1: any) => void
+  onDrawForeground?: (
+    ctx: CanvasRenderingContext2D,
+    visible_area: Rectangle
+  ) => void
   connections_width: number
   /** The current node being drawn by {@link drawNode}.  This should NOT be used to determine the currently selected node.  See {@link selectedItems} */
   current_node: LGraphNode | null
@@ -630,12 +666,12 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
    * The IDs of the nodes that are currently visible on the canvas. More
    * performant than {@link visible_nodes} for visibility checks.
    */
-  #visible_node_ids: Set<NodeId> = new Set()
+  private _visible_node_ids: Set<NodeId> = new Set()
   node_over?: LGraphNode
   node_capturing_input?: LGraphNode | null
   highlighted_links: Dictionary<boolean> = {}
 
-  #visibleReroutes: Set<Reroute> = new Set()
+  private _visibleReroutes: Set<Reroute> = new Set()
 
   dirty_canvas: boolean = true
   dirty_bgcanvas: boolean = true
@@ -654,6 +690,8 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
 
   canvas: HTMLCanvasElement & ICustomEventTarget<LGraphCanvasEventMap>
   bgcanvas: HTMLCanvasElement
+  overlayCanvas: HTMLCanvasElement | null = null
+  overlayCtx: CanvasRenderingContext2D | null = null
   ctx: CanvasRenderingContext2D
   _events_binded?: boolean
   _mousedown_callback?(e: PointerEvent): void
@@ -679,9 +717,9 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
   _highlight_input?: INodeInputSlot
   // TODO: Check if panels are used
   /** @deprecated Panels */
-  node_panel?: any
+  node_panel?: Panel
   /** @deprecated Panels */
-  options_panel?: any
+  options_panel?: Panel
   _bg_img?: HTMLImageElement
   _pattern?: CanvasPattern
   _pattern_img?: HTMLImageElement
@@ -695,9 +733,9 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
   NODEPANEL_IS_OPEN?: boolean
 
   /** Once per frame check of snap to grid value.  @todo Update on change. */
-  #snapToGrid?: number
+  private _snapToGrid?: number
   /** Set on keydown, keyup. @todo */
-  #shiftDown: boolean = false
+  private _shiftDown: boolean = false
 
   /** Link rendering adapter for litegraph-to-canvas integration */
   linkRenderer: LitegraphLinkAdapter | null = null
@@ -705,7 +743,11 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
   /** If true, enable drag zoom. Ctrl+Shift+Drag Up/Down: zoom canvas. */
   dragZoomEnabled: boolean = false
   /** The start position of the drag zoom and original read-only state. */
-  #dragZoomStart: { pos: Point; scale: number; readOnly: boolean } | null = null
+  private _dragZoomStart: {
+    pos: Point
+    scale: number
+    readOnly: boolean
+  } | null = null
 
   /** If true, enable live selection during drag. Nodes are selected/deselected in real-time. */
   liveSelection: boolean = false
@@ -780,7 +822,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     }
 
     this.linkConnector.events.addEventListener('link-created', () =>
-      this.#dirty()
+      this._dirty()
     )
 
     // @deprecated Workaround: Keep until connecting_links is removed.
@@ -825,7 +867,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
           if ('shiftKey' in e && e.shiftKey) {
             if (this.allow_searchbox) {
               this.showSearchBox(
-                e as unknown as MouseEvent,
+                e as MouseEvent,
                 linkReleaseContext as IShowSearchOptions
               )
             }
@@ -931,7 +973,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     this.connecting_links = null
 
     // to constraint render area to a portion of the canvas
-    this.viewport = options.viewport || null
+    this.viewport = options.viewport
 
     // link canvas and graph
     this.graph = graph
@@ -963,16 +1005,14 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
       this.startRendering()
     }
 
-    this.autoresize = options.autoresize
+    this.autoresize = options.autoresize ?? false
 
     this.updateLowQualityThreshold()
   }
 
   static onGroupAdd(
-    // @ts-expect-error - unused parameter
-    info: unknown,
-    // @ts-expect-error - unused parameter
-    entry: unknown,
+    _info: unknown,
+    _entry: unknown,
     mouse_event: MouseEvent
   ): void {
     const canvas = LGraphCanvas.active_canvas
@@ -1020,10 +1060,8 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
   }
 
   static onNodeAlign(
-    // @ts-expect-error - unused parameter
-    value: IContextMenuValue,
-    // @ts-expect-error - unused parameter
-    options: IContextMenuOptions,
+    _value: IContextMenuValue,
+    _options: IContextMenuOptions,
     event: MouseEvent,
     prev_menu: ContextMenu<string>,
     node: LGraphNode
@@ -1046,10 +1084,8 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
   }
 
   static onGroupAlign(
-    // @ts-expect-error - unused parameter
-    value: IContextMenuValue,
-    // @ts-expect-error - unused parameter
-    options: IContextMenuOptions,
+    _value: IContextMenuValue,
+    _options: IContextMenuOptions,
     event: MouseEvent,
     prev_menu: ContextMenu<string>
   ): void {
@@ -1070,10 +1106,8 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
   }
 
   static createDistributeMenu(
-    // @ts-expect-error - unused parameter
-    value: IContextMenuValue,
-    // @ts-expect-error - unused parameter
-    options: IContextMenuOptions,
+    _value: IContextMenuValue,
+    _options: IContextMenuOptions,
     event: MouseEvent,
     prev_menu: ContextMenu<string>
   ): void {
@@ -1095,16 +1129,13 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
   }
 
   static onMenuAdd(
-    // @ts-expect-error - unused parameter
-    value: unknown,
-    // @ts-expect-error - unused parameter
-    options: unknown,
+    _value: unknown,
+    _options: unknown,
     e: MouseEvent,
     prev_menu?: ContextMenu<string>,
     callback?: (node: LGraphNode | null) => void
   ): boolean | undefined {
     const canvas = LGraphCanvas.active_canvas
-    const ref_window = canvas.getCanvasWindow()
     const { graph } = canvas
     if (!graph) return
 
@@ -1155,14 +1186,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
             value: category_path,
             content: name,
             has_submenu: true,
-            callback: function (
-              value,
-              // @ts-expect-error - unused parameter
-              event,
-              // @ts-expect-error - unused parameter
-              mouseEvent,
-              contextMenu
-            ) {
+            callback: function (value, _event, _mouseEvent, contextMenu) {
               inner_onMenuAdded(value.value, contextMenu)
             }
           })
@@ -1181,14 +1205,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
           value: node.type,
           content: node.title,
           has_submenu: false,
-          callback: function (
-            value,
-            // @ts-expect-error - unused parameter
-            event,
-            // @ts-expect-error - unused parameter
-            mouseEvent,
-            contextMenu
-          ) {
+          callback: function (value, _event, _mouseEvent, contextMenu) {
             if (!canvas.graph) throw new NullGraphError()
 
             const first_event = contextMenu.getFirstEvent()
@@ -1213,12 +1230,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
         entries.push(entry)
       }
 
-      new LiteGraph.ContextMenu(
-        entries,
-        { event: e, parentMenu: prev_menu },
-        // @ts-expect-error - extra parameter
-        ref_window
-      )
+      new LiteGraph.ContextMenu(entries, { event: e, parentMenu: prev_menu })
     }
   }
 
@@ -1227,8 +1239,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
 
   /** @param _options Parameter is never used */
   static showMenuNodeOptionalOutputs(
-    // @ts-expect-error - unused parameter
-    v: unknown,
+    _v: unknown,
     /** Unused - immediately overwritten */
     _options: INodeOutputSlot[],
     e: MouseEvent,
@@ -1266,11 +1277,13 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
 
     function inner_clicked(
       this: ContextMenuDivElement<INodeSlotContextItem>,
-      v: IContextMenuValue<INodeSlotContextItem>,
-      e: any,
-      prev: any
+      v?: string | IContextMenuValue<INodeSlotContextItem>,
+      _options?: unknown,
+      e?: MouseEvent,
+      prev?: ContextMenu<INodeSlotContextItem>
     ) {
       if (!node) return
+      if (!v || typeof v === 'string') return
 
       // TODO: This is a static method, so the below "that" appears broken.
       if (v.callback) void v.callback.call(this, node, v, e, prev)
@@ -1312,8 +1325,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
   /** @param value Parameter is never used */
   static onShowMenuNodeProperties(
     value: NodeProperty | undefined,
-    // @ts-expect-error - unused parameter
-    options: unknown,
+    _options: unknown,
     e: MouseEvent,
     prev_menu: ContextMenu<string>,
     node: LGraphNode
@@ -1321,7 +1333,6 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     if (!node || !node.properties) return
 
     const canvas = LGraphCanvas.active_canvas
-    const ref_window = canvas.getCanvasWindow()
 
     const entries: IContextMenuValue<string>[] = []
     for (const i in node.properties) {
@@ -1344,21 +1355,18 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
       return
     }
 
-    new LiteGraph.ContextMenu<string>(
-      entries,
-      {
-        event: e,
-        callback: inner_clicked,
-        parentMenu: prev_menu,
-        allow_html: true,
-        node
-      },
-      // @ts-expect-error Unused
-      ref_window
-    )
+    new LiteGraph.ContextMenu<string>(entries, {
+      event: e,
+      callback: inner_clicked,
+      parentMenu: prev_menu,
+      node
+    })
 
-    function inner_clicked(this: ContextMenuDivElement, v: { value: any }) {
-      if (!node) return
+    function inner_clicked(
+      this: ContextMenuDivElement,
+      v?: string | IContextMenuValue<string>
+    ) {
+      if (!node || typeof v === 'string' || !v?.value) return
 
       const rect = this.getBoundingClientRect()
       canvas.showEditPropertyValue(node, v.value, {
@@ -1377,14 +1385,10 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
   }
 
   static onMenuResizeNode(
-    // @ts-expect-error - unused parameter
-    value: IContextMenuValue,
-    // @ts-expect-error - unused parameter
-    options: IContextMenuOptions,
-    // @ts-expect-error - unused parameter
-    e: MouseEvent,
-    // @ts-expect-error - unused parameter
-    menu: ContextMenu,
+    _value: IContextMenuValue,
+    _options: IContextMenuOptions,
+    _e: MouseEvent,
+    _menu: ContextMenu,
     node: LGraphNode
   ): void {
     if (!node) return
@@ -1411,11 +1415,9 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
   // TODO refactor :: this is used fot title but not for properties!
   static onShowPropertyEditor(
     item: { property: keyof LGraphNode; type: string },
-    // @ts-expect-error - unused parameter
-    options: IContextMenuOptions<string>,
+    _options: IContextMenuOptions<string>,
     e: MouseEvent,
-    // @ts-expect-error - unused parameter
-    menu: ContextMenu<string>,
+    _menu: ContextMenu<string>,
     node: LGraphNode
   ): void {
     const property = item.property || 'title'
@@ -1485,11 +1487,10 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
 
     input.focus()
 
-    let dialogCloseTimer: number
+    let dialogCloseTimer: ReturnType<typeof setTimeout> | undefined
     dialog.addEventListener('mouseleave', function () {
       if (LiteGraph.dialog_close_on_mouse_leave) {
         if (!dialog.is_modified && LiteGraph.dialog_close_on_mouse_leave) {
-          // @ts-expect-error - setTimeout type
           dialogCloseTimer = setTimeout(
             dialog.close,
             LiteGraph.dialog_close_on_mouse_leave_delay
@@ -1544,14 +1545,10 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
   }
 
   static onMenuNodeCollapse(
-    // @ts-expect-error - unused parameter
-    value: IContextMenuValue,
-    // @ts-expect-error - unused parameter
-    options: IContextMenuOptions,
-    // @ts-expect-error - unused parameter
-    e: MouseEvent,
-    // @ts-expect-error - unused parameter
-    menu: ContextMenu,
+    _value: IContextMenuValue,
+    _options: IContextMenuOptions,
+    _e: MouseEvent,
+    _menu: ContextMenu,
     node: LGraphNode
   ): void {
     if (!node.graph) throw new NullGraphError()
@@ -1578,14 +1575,10 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
   }
 
   static onMenuToggleAdvanced(
-    // @ts-expect-error - unused parameter
-    value: IContextMenuValue,
-    // @ts-expect-error - unused parameter
-    options: IContextMenuOptions,
-    // @ts-expect-error - unused parameter
-    e: MouseEvent,
-    // @ts-expect-error - unused parameter
-    menu: ContextMenu,
+    _value: IContextMenuValue,
+    _options: IContextMenuOptions,
+    _e: MouseEvent,
+    _menu: ContextMenu,
     node: LGraphNode
   ): void {
     if (!node.graph) throw new NullGraphError()
@@ -1610,10 +1603,8 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
   }
 
   static onMenuNodeMode(
-    // @ts-expect-error - unused parameter
-    value: IContextMenuValue,
-    // @ts-expect-error - unused parameter
-    options: IContextMenuOptions,
+    _value: IContextMenuValue,
+    _options: IContextMenuOptions,
     e: MouseEvent,
     menu: ContextMenu,
     node: LGraphNode
@@ -1657,8 +1648,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
   /** @param value Parameter is never used */
   static onMenuNodeColors(
     value: IContextMenuValue<string | null>,
-    // @ts-expect-error - unused parameter
-    options: IContextMenuOptions,
+    _options: IContextMenuOptions,
     e: MouseEvent,
     menu: ContextMenu<string | null>,
     node: LGraphNode
@@ -1719,10 +1709,8 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
   }
 
   static onMenuNodeShapes(
-    // @ts-expect-error - unused parameter
-    value: IContextMenuValue<(typeof LiteGraph.VALID_SHAPES)[number]>,
-    // @ts-expect-error - unused parameter
-    options: IContextMenuOptions<(typeof LiteGraph.VALID_SHAPES)[number]>,
+    _value: IContextMenuValue<(typeof LiteGraph.VALID_SHAPES)[number]>,
+    _options: IContextMenuOptions<(typeof LiteGraph.VALID_SHAPES)[number]>,
     e: MouseEvent,
     menu?: ContextMenu<(typeof LiteGraph.VALID_SHAPES)[number]>,
     node?: LGraphNode
@@ -1832,7 +1820,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
 
     this.dragging_canvas = false
 
-    this.#dirty()
+    this._dirty()
     this.dirty_area = null
 
     this.node_in_panel = null
@@ -1860,7 +1848,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     this.linkRenderer = new LitegraphLinkAdapter(false)
 
     this.dispatch('litegraph:set-graph', { newGraph, oldGraph: graph })
-    this.#dirty()
+    this._dirty()
   }
 
   openSubgraph(subgraph: Subgraph, fromNode: SubgraphNode): void {
@@ -1897,7 +1885,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
    * @returns The canvas element
    * @throws If {@link canvas} is an element ID that does not belong to a valid HTML canvas element
    */
-  #validateCanvas(
+  private _validateCanvas(
     canvas: string | HTMLCanvasElement
   ): HTMLCanvasElement & { data?: LGraphCanvas } {
     if (typeof canvas === 'string') {
@@ -1916,7 +1904,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
    * @param skip_events If true, events on the previous canvas will not be removed.  Has no effect on the first invocation.
    */
   setCanvas(canvas: string | HTMLCanvasElement, skip_events?: boolean) {
-    const element = this.#validateCanvas(canvas)
+    const element = this._validateCanvas(canvas)
     if (element === this.canvas) return
     // maybe detach events from old_canvas
     if (!element && this.canvas && !skip_events) this.unbindEvents()
@@ -1926,10 +1914,16 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     this.pointer.element = element
 
     if (!element) return
+    this._setCursor = createCursorCache(element)
 
     // TODO: classList.add
     element.className += ' lgraphcanvas'
-    element.data = this
+    Object.defineProperty(element, 'data', {
+      value: this,
+      writable: true,
+      configurable: true,
+      enumerable: false
+    })
 
     // Background canvas: To render objects behind nodes (background, links, groups)
     this.bgcanvas = document.createElement('canvas')
@@ -2050,12 +2044,12 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
   }
 
   /** Marks the entire canvas as dirty. */
-  #dirty(): void {
+  private _dirty(): void {
     this.dirty_canvas = true
     this.dirty_bgcanvas = true
   }
 
-  #linkConnectorDrop(): void {
+  private _linkConnectorDrop(): void {
     const { graph, linkConnector, pointer } = this
     if (!graph) throw new NullGraphError()
 
@@ -2094,10 +2088,10 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
 
       const window = this.getCanvasWindow()
       if (this.is_rendering) {
-        if (this.#maximumFrameGap > 0) {
+        if (this._maximumFrameGap > 0) {
           // Manual FPS limit
           const gap =
-            this.#maximumFrameGap - (LiteGraph.getTime() - this.last_draw_time)
+            this._maximumFrameGap - (LiteGraph.getTime() - this.last_draw_time)
           setTimeout(renderFrame.bind(this), Math.max(1, gap))
         } else {
           // FPS limited by refresh rate
@@ -2178,6 +2172,14 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
   }
 
   processMouseDown(e: MouseEvent): void {
+    if (this.state.ghostNodeId != null) {
+      if (e.button === 0) this.finalizeGhostPlacement(false)
+      if (e.button === 2) this.finalizeGhostPlacement(true)
+      e.stopPropagation()
+      e.preventDefault()
+      return
+    }
+
     if (
       this.dragZoomEnabled &&
       e.ctrlKey &&
@@ -2185,7 +2187,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
       !e.altKey &&
       e.buttons
     ) {
-      this.#dragZoomStart = {
+      this._dragZoomStart = {
         pos: [e.x, e.y],
         scale: this.ds.scale,
         readOnly: this.read_only
@@ -2212,9 +2214,21 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
 
     if (!is_inside) return
 
-    const node =
+    let node =
       graph.getNodeOnPos(e.canvasX, e.canvasY, this.visible_nodes) ?? undefined
 
+    // In Vue nodes mode, slots extend beyond node bounds due to CSS transforms.
+    // If no node was found, check if the click is on a slot and use its owning node.
+    if (!node && LiteGraph.vueNodesMode) {
+      const slotLayout = layoutStore.querySlotAtPoint({
+        x: e.canvasX,
+        y: e.canvasY
+      })
+      if (slotLayout) {
+        node = graph.getNodeById(slotLayout.nodeId) ?? undefined
+      }
+    }
+
     this.mouse[0] = x
     this.mouse[1] = y
     this.graph_mouse[0] = e.canvasX
@@ -2232,9 +2246,9 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
 
     // left button mouse / single finger
     if (e.button === 0 && !pointer.isDouble) {
-      this.#processPrimaryButton(e, node)
+      this._processPrimaryButton(e, node)
     } else if (e.button === 1) {
-      this.#processMiddleButton(e, node)
+      this._processMiddleButton(e, node)
     } else if (
       (e.button === 2 || pointer.isDouble) &&
       this.allow_interaction &&
@@ -2270,7 +2284,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
             reroute = graph.getRerouteOnPos(
               e.canvasX,
               e.canvasY,
-              this.#visibleReroutes
+              this._visibleReroutes
             )
           }
           if (reroute) {
@@ -2326,18 +2340,24 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
    * @param y The y coordinate in canvas space
    * @returns The positionable item or undefined
    */
-  #getPositionableOnPos(x: number, y: number): Positionable | undefined {
+  private _getPositionableOnPos(
+    x: number,
+    y: number
+  ): Positionable | undefined {
     const ioNode = this.subgraph?.getIoNodeOnPos(x, y)
     if (ioNode) return ioNode
 
-    for (const reroute of this.#visibleReroutes) {
+    for (const reroute of this._visibleReroutes) {
       if (reroute.containsPoint([x, y])) return reroute
     }
 
     return this.graph?.getGroupTitlebarOnPos(x, y)
   }
 
-  #processPrimaryButton(e: CanvasPointerEvent, node: LGraphNode | undefined) {
+  private _processPrimaryButton(
+    e: CanvasPointerEvent,
+    node: LGraphNode | undefined
+  ) {
     const { pointer, graph, linkConnector, subgraph } = this
     if (!graph) throw new NullGraphError()
 
@@ -2353,7 +2373,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
       !e.altKey &&
       LiteGraph.leftMouseClickBehavior === 'panning'
     ) {
-      this.#setupNodeSelectionDrag(e, pointer, node)
+      this._setupNodeSelectionDrag(e, pointer, node)
 
       return
     }
@@ -2379,21 +2399,20 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
       const cloned = items?.created[0] as LGraphNode | undefined
       if (!cloned) return
 
-      cloned.pos[0] += 5
-      cloned.pos[1] += 5
+      cloned.setPos(cloned.pos[0] + 5, cloned.pos[1] + 5)
 
       if (this.allow_dragnodes) {
         pointer.onDragStart = (pointer) => {
-          this.#startDraggingItems(cloned, pointer)
+          this._startDraggingItems(cloned, pointer)
         }
-        pointer.onDragEnd = (e) => this.#processDraggedItems(e)
+        pointer.onDragEnd = (e) => this._processDraggedItems(e)
       }
       return
     }
 
     // Node clicked
     if (node && (this.allow_interaction || node.flags.allow_interaction)) {
-      this.#processNodeClick(e, ctrlOrMeta, node)
+      this._processNodeClick(e, ctrlOrMeta, node)
     } else {
       // Subgraph IO nodes
       if (subgraph) {
@@ -2411,8 +2430,8 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
           ioNode.onPointerDown(e, pointer, linkConnector)
           pointer.onClick ??= () => canvas.processSelect(ioNode, e)
           pointer.onDragStart ??= () =>
-            canvas.#startDraggingItems(ioNode, pointer, true)
-          pointer.onDragEnd ??= (eUp) => canvas.#processDraggedItems(eUp)
+            canvas._startDraggingItems(ioNode, pointer, true)
+          pointer.onDragEnd ??= (eUp) => canvas._processDraggedItems(eUp)
           return true
         }
       }
@@ -2428,7 +2447,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
         }
 
         // Fallback to checking visible reroutes directly
-        for (const reroute of this.#visibleReroutes) {
+        for (const reroute of this._visibleReroutes) {
           const overReroute =
             foundReroute === reroute || reroute.containsPoint([x, y])
           if (!reroute.isSlotHovered && !overReroute) continue
@@ -2437,19 +2456,19 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
             pointer.onClick = () => this.processSelect(reroute, e)
             if (!e.shiftKey) {
               pointer.onDragStart = (pointer) =>
-                this.#startDraggingItems(reroute, pointer, true)
-              pointer.onDragEnd = (e) => this.#processDraggedItems(e)
+                this._startDraggingItems(reroute, pointer, true)
+              pointer.onDragEnd = (e) => this._processDraggedItems(e)
             }
           }
 
           if (reroute.isOutputHovered || (overReroute && e.shiftKey)) {
             linkConnector.dragFromReroute(graph, reroute)
-            this.#linkConnectorDrop()
+            this._linkConnectorDrop()
           }
 
           if (reroute.isInputHovered) {
             linkConnector.dragFromRerouteToOutput(graph, reroute)
-            this.#linkConnectorDrop()
+            this._linkConnectorDrop()
           }
 
           reroute.hideSlots()
@@ -2494,14 +2513,14 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
 
           if (e.shiftKey && !e.altKey) {
             linkConnector.dragFromLinkSegment(graph, linkSegment)
-            this.#linkConnectorDrop()
+            this._linkConnectorDrop()
 
             return
           } else if (e.altKey && !e.shiftKey) {
             const newReroute = graph.createReroute([x, y], linkSegment)
             pointer.onDragStart = (pointer) =>
-              this.#startDraggingItems(newReroute, pointer)
-            pointer.onDragEnd = (e) => this.#processDraggedItems(e)
+              this._startDraggingItems(newReroute, pointer)
+            pointer.onDragEnd = (e) => this._processDraggedItems(e)
             return
           }
         } else if (
@@ -2543,7 +2562,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
               eMove.canvasY - group.pos[1] - offsetY
             ]
             // Unless snapping.
-            if (this.#snapToGrid) snapPoint(pos, this.#snapToGrid)
+            if (this._snapToGrid) snapPoint(pos, this._snapToGrid)
 
             const resized = group.resize(pos[0], pos[1])
             if (resized) this.dirty_bgcanvas = true
@@ -2566,9 +2585,9 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
             pointer.onClick = () => this.processSelect(group, e)
             pointer.onDragStart = (pointer) => {
               group.recomputeInsideNodes()
-              this.#startDraggingItems(group, pointer, true)
+              this._startDraggingItems(group, pointer, true)
             }
-            pointer.onDragEnd = (e) => this.#processDraggedItems(e)
+            pointer.onDragEnd = (e) => this._processDraggedItems(e)
           }
         }
 
@@ -2606,12 +2625,12 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
         pointer.finally = () => (this.dragging_canvas = false)
         this.dragging_canvas = true
       } else {
-        this.#setupNodeSelectionDrag(e, pointer)
+        this._setupNodeSelectionDrag(e, pointer)
       }
     }
   }
 
-  #setupNodeSelectionDrag(
+  private _setupNodeSelectionDrag(
     e: CanvasPointerEvent,
     pointer: CanvasPointer,
     node?: LGraphNode | undefined
@@ -2626,7 +2645,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     pointer.onClick = (eUp) => {
       // Click, not drag
       const clickedItem =
-        node ?? this.#getPositionableOnPos(eUp.canvasX, eUp.canvasY)
+        node ?? this._getPositionableOnPos(eUp.canvasX, eUp.canvasY)
       this.processSelect(clickedItem, eUp)
     }
     pointer.onDragStart = () => (this.dragging_rectangle = dragRect)
@@ -2641,7 +2660,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     } else {
       // Classic mode: select only when drag ends
       pointer.onDragEnd = (upEvent) =>
-        this.#handleMultiSelect(upEvent, dragRect)
+        this._handleMultiSelect(upEvent, dragRect)
     }
 
     pointer.finally = () => (this.dragging_rectangle = null)
@@ -2653,7 +2672,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
    * @param ctrlOrMeta Ctrl or meta key is pressed
    * @param node The node to process a click event for
    */
-  #processNodeClick(
+  private _processNodeClick(
     e: CanvasPointerEvent,
     ctrlOrMeta: boolean,
     node: LGraphNode
@@ -2709,13 +2728,13 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
             // Drag multiple output links
             if (e.shiftKey && hasRelevantOutputLinks(output, graph)) {
               linkConnector.moveOutputLink(graph, output)
-              this.#linkConnectorDrop()
+              this._linkConnectorDrop()
               return
             }
 
             // New output link
             linkConnector.dragNewFromOutput(graph, node, output)
-            this.#linkConnectorDrop()
+            this._linkConnectorDrop()
 
             if (LiteGraph.shift_click_do_break_link_from) {
               if (e.shiftKey) {
@@ -2768,7 +2787,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
               linkConnector.dragNewFromInput(graph, node, input)
             }
 
-            this.#linkConnectorDrop()
+            this._linkConnectorDrop()
             this.dirty_bgcanvas = true
 
             return
@@ -2826,6 +2845,12 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
           }
         }
       }
+      for (const badge of node.badges.map(toValue).filter((b) => b.onClick)) {
+        if (isInRect(pos[0], pos[1], badge.boundingRect)) {
+          pointer.onClick = badge.onClick
+          return
+        }
+      }
 
       // Mousedown callback - can block drag
       if (node.onMouseDown?.(e, pos, this)) {
@@ -2892,7 +2917,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
             }
 
             // Apply snapping to position changes
-            if (this.#snapToGrid) {
+            if (this._snapToGrid) {
               if (
                 resizeDirection.includes('N') ||
                 resizeDirection.includes('W')
@@ -2900,7 +2925,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
                 const originalX = newBounds.x
                 const originalY = newBounds.y
 
-                snapPoint(newBounds.pos, this.#snapToGrid)
+                snapPoint(newBounds.pos, this._snapToGrid)
 
                 // Adjust size to compensate for snapped position
                 if (resizeDirection.includes('N')) {
@@ -2911,7 +2936,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
                 }
               }
 
-              snapPoint(newBounds.size, this.#snapToGrid)
+              snapPoint(newBounds.size, this._snapToGrid)
             }
 
             // Apply snapping to size changes
@@ -2936,11 +2961,11 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
             node.pos = newBounds.pos
             node.setSize(newBounds.size)
 
-            this.#dirty()
+            this._dirty()
           }
 
           pointer.onDragEnd = () => {
-            this.#dirty()
+            this._dirty()
             graph.afterChange(node)
           }
           pointer.finally = () => {
@@ -2949,15 +2974,15 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
           }
 
           // Set appropriate cursor for resize direction
-          this.canvas.style.cursor = cursors[resizeDirection]
+          this._setCursor(cursors[resizeDirection])
           return
         }
       }
 
       // Drag node
       pointer.onDragStart = (pointer) =>
-        this.#startDraggingItems(node, pointer, true)
-      pointer.onDragEnd = (e) => this.#processDraggedItems(e)
+        this._startDraggingItems(node, pointer, true)
+      pointer.onDragEnd = (e) => this._processDraggedItems(e)
     }
 
     this.dirty_canvas = true
@@ -3026,7 +3051,10 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
    * @param e The pointerdown event
    * @param node The node to process a click event for
    */
-  #processMiddleButton(e: CanvasPointerEvent, node: LGraphNode | undefined) {
+  private _processMiddleButton(
+    e: CanvasPointerEvent,
+    node: LGraphNode | undefined
+  ) {
     const { pointer } = this
 
     if (
@@ -3123,14 +3151,14 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     }
   }
 
-  #processDragZoom(e: PointerEvent): void {
+  private _processDragZoom(e: PointerEvent): void {
     // stop canvas zoom action
     if (!e.buttons) {
-      this.#finishDragZoom()
+      this._finishDragZoom()
       return
     }
 
-    const start = this.#dragZoomStart
+    const start = this._dragZoomStart
     if (!start) throw new TypeError('Drag-zoom state object was null')
     if (!this.graph) throw new NullGraphError()
 
@@ -3144,10 +3172,10 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     this.graph.change()
   }
 
-  #finishDragZoom(): void {
-    const start = this.#dragZoomStart
+  private _finishDragZoom(): void {
+    const start = this._dragZoomStart
     if (!start) return
-    this.#dragZoomStart = null
+    this._dragZoomStart = null
     this.read_only = start.readOnly
   }
 
@@ -3159,9 +3187,9 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
       this.dragZoomEnabled &&
       e.ctrlKey &&
       e.shiftKey &&
-      this.#dragZoomStart
+      this._dragZoomStart
     ) {
-      this.#processDragZoom(e)
+      this._processDragZoom(e)
       return
     }
 
@@ -3212,7 +3240,9 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     }
 
     // get node over
-    const node = graph.getNodeOnPos(x, y, this.visible_nodes)
+    const node = LiteGraph.vueNodesMode
+      ? null
+      : graph.getNodeOnPos(x, y, this.visible_nodes)
 
     const dragRect = this.dragging_rectangle
     if (dragRect) {
@@ -3226,7 +3256,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     } else if (this.dragging_canvas) {
       this.ds.offset[0] += delta[0] / this.ds.scale
       this.ds.offset[1] += delta[1] / this.ds.scale
-      this.#dirty()
+      this._dirty()
     } else if (
       (this.allow_interaction || node?.flags.allow_interaction) &&
       !this.read_only
@@ -3274,7 +3304,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
           this.node_over = node
           this.dirty_canvas = true
 
-          for (const reroute of this.#visibleReroutes) {
+          for (const reroute of this._visibleReroutes) {
             reroute.hideSlots()
             this.dirty_bgcanvas = true
           }
@@ -3398,10 +3428,10 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
         }
       } else {
         // Reroutes
-        underPointer = this.#updateReroutes(underPointer)
+        underPointer = this._updateReroutes(underPointer)
 
         // Not over a node
-        const segment = this.#getLinkCentreOnPos(e)
+        const segment = this._getLinkCentreOnPos(e)
         if (this.over_link_center !== segment) {
           underPointer |= CanvasItem.Link
           this.over_link_center = segment
@@ -3451,7 +3481,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
           }
         }
 
-        this.#dirty()
+        this._dirty()
       }
     }
 
@@ -3465,14 +3495,14 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
    * Updates the hover / snap state of all visible reroutes.
    * @returns The original value of {@link underPointer}, with any found reroute items added.
    */
-  #updateReroutes(underPointer: CanvasItem): CanvasItem {
+  private _updateReroutes(underPointer: CanvasItem): CanvasItem {
     const { graph, pointer, linkConnector } = this
     if (!graph) throw new NullGraphError()
 
     // Update reroute hover state
     if (!pointer.isDown) {
       let anyChanges = false
-      for (const reroute of this.#visibleReroutes) {
+      for (const reroute of this._visibleReroutes) {
         anyChanges ||= reroute.updateVisibility(this.graph_mouse)
 
         if (reroute.isSlotHovered) underPointer |= CanvasItem.RerouteSlot
@@ -3480,7 +3510,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
       if (anyChanges) this.dirty_bgcanvas = true
     } else if (linkConnector.isConnecting) {
       // Highlight the reroute that the mouse is over
-      for (const reroute of this.#visibleReroutes) {
+      for (const reroute of this._visibleReroutes) {
         if (reroute.containsPoint(this.graph_mouse)) {
           if (linkConnector.isRerouteValidDrop(reroute)) {
             linkConnector.overReroute = reroute
@@ -3505,7 +3535,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
    * @param pointer The pointer event that initiated the drag, e.g. pointerdown
    * @param sticky If `true`, the item is added to the selection - see {@link processSelect}
    */
-  #startDraggingItems(
+  private _startDraggingItems(
     item: Positionable,
     pointer: CanvasPointer,
     sticky = false
@@ -3527,7 +3557,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
    * Handles shared clean up and placement after items have been dragged.
    * @param e The event that completed the drag, e.g. pointerup, pointermove
    */
-  #processDraggedItems(e: CanvasPointerEvent): void {
+  private _processDraggedItems(e: CanvasPointerEvent): void {
     const { graph } = this
     if (e.shiftKey || LiteGraph.alwaysSnapToGrid)
       graph?.snapToGrid(this.selectedItems)
@@ -3539,6 +3569,74 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     this.onNodeMoved?.(findFirstNode(this.selectedItems))
   }
 
+  /**
+   * Starts ghost placement mode for a node.
+   * The node will be semi-transparent and follow the cursor until the user
+   * clicks to place it, or presses Escape/right-clicks to cancel.
+   * @param node The node to place
+   * @param dragEvent Optional mouse event for positioning under cursor
+   */
+  startGhostPlacement(node: LGraphNode, dragEvent?: MouseEvent): void {
+    this.emitBeforeChange()
+    this.graph?.beforeChange()
+
+    if (dragEvent) {
+      this.adjustMouseEvent(dragEvent)
+      const e = dragEvent as CanvasPointerEvent
+      node.setPos(e.canvasX - node.size[0] / 2, e.canvasY + 10)
+      // Update last_mouse to prevent jump on first drag move
+      this.last_mouse = [e.clientX, e.clientY]
+    } else {
+      node.setPos(
+        this.graph_mouse[0] - node.size[0] / 2,
+        this.graph_mouse[1] + 10
+      )
+    }
+
+    this.state.ghostNodeId = node.id
+
+    this.deselectAll()
+    this.select(node)
+    this.isDragging = true
+  }
+
+  /**
+   * Finalizes ghost placement mode.
+   * @param cancelled If true, the node is removed; otherwise it's placed
+   */
+  finalizeGhostPlacement(cancelled: boolean): void {
+    const nodeId = this.state.ghostNodeId
+    if (nodeId == null) return
+
+    this.state.ghostNodeId = null
+    this.isDragging = false
+
+    const node = this.graph?.getNodeById(nodeId)
+    if (!node) return
+
+    if (cancelled) {
+      this.deselect(node)
+      this.graph?.remove(node)
+    } else {
+      delete node.flags.ghost
+      this.graph?.trigger('node:property:changed', {
+        nodeId: node.id,
+        property: 'flags.ghost',
+        oldValue: true,
+        newValue: false
+      })
+
+      this.state.selectionChanged = true
+      this.onSelectionChange?.(this.selected_nodes)
+    }
+
+    this.dirty_canvas = true
+    this.dirty_bgcanvas = true
+
+    this.graph?.afterChange()
+    this.emitAfterChange()
+  }
+
   /**
    * Called when a mouse up event has to be processed
    */
@@ -3549,7 +3647,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     const { graph, pointer } = this
     if (!graph) return
 
-    this.#finishDragZoom()
+    this._finishDragZoom()
 
     LGraphCanvas.active_canvas = this
 
@@ -3596,13 +3694,16 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
         this.node_over?.onMouseUp?.(
           e,
           [x - this.node_over.pos[0], y - this.node_over.pos[1]],
-          // @ts-expect-error - extra parameter
           this
         )
-        this.node_capturing_input?.onMouseUp?.(e, [
-          x - this.node_capturing_input.pos[0],
-          y - this.node_capturing_input.pos[1]
-        ])
+        this.node_capturing_input?.onMouseUp?.(
+          e,
+          [
+            x - this.node_capturing_input.pos[0],
+            y - this.node_capturing_input.pos[1]
+          ],
+          this
+        )
       }
     } else if (e.button === 1) {
       // middle button
@@ -3690,22 +3791,26 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     return
   }
 
-  #noItemsSelected(): void {
-    const event = new CustomEvent('litegraph:no-items-selected', {
-      bubbles: true
-    })
-    this.canvas.dispatchEvent(event)
-  }
-
   /**
    * process a key event
    */
   processKey(e: KeyboardEvent): void {
-    this.#shiftDown = e.shiftKey
+    this._shiftDown = e.shiftKey
 
     const { graph } = this
     if (!graph) return
 
+    // Cancel ghost placement
+    if (
+      (e.key === 'Escape' || e.key === 'Delete' || e.key === 'Backspace') &&
+      this.state.ghostNodeId != null
+    ) {
+      this.finalizeGhostPlacement(true)
+      e.stopPropagation()
+      e.preventDefault()
+      return
+    }
+
     let block_default = false
     // @ts-expect-error EventTarget.localName is not in standard types
     if (e.target.localName == 'input') return
@@ -3730,31 +3835,6 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
         this.node_panel?.close()
         this.options_panel?.close()
         if (this.node_panel || this.options_panel) block_default = true
-      } else if (e.keyCode === 65 && e.ctrlKey) {
-        // select all Control A
-        this.selectItems()
-        block_default = true
-      } else if (e.keyCode === 67 && (e.metaKey || e.ctrlKey) && !e.shiftKey) {
-        // copy
-        if (this.selected_nodes) {
-          this.copyToClipboard()
-          block_default = true
-        }
-      } else if (e.keyCode === 86 && (e.metaKey || e.ctrlKey)) {
-        // paste
-        this.pasteFromClipboard({ connectInputs: e.shiftKey })
-      } else if (e.key === 'Delete' || e.key === 'Backspace') {
-        // delete or backspace
-        // @ts-expect-error EventTarget.localName is not in standard types
-        if (e.target.localName != 'input' && e.target.localName != 'textarea') {
-          if (this.selectedItems.size === 0) {
-            this.#noItemsSelected()
-            return
-          }
-
-          this.deleteSelected()
-          block_default = true
-        }
       }
 
       // TODO
@@ -3957,6 +4037,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     for (const nodeInfo of allNodeInfo)
       if (nodeInfo.type in subgraphIdMap)
         nodeInfo.type = subgraphIdMap[nodeInfo.type]
+    remapClipboardSubgraphNodeIds(parsed, graph.rootGraph)
 
     // Subgraphs
     for (const info of parsed.subgraphs) {
@@ -3987,8 +4068,8 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
       nodes.set(info.id, node)
       info.id = -1
 
-      node.configure(info)
       graph.add(node)
+      node.configure(info)
 
       created.push(node)
     }
@@ -4050,36 +4131,37 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
       }
     }
 
-    // Adjust positions
+    // Adjust positions - use move/setPos to ensure layout store is updated
+    const dx = position[0] - offsetX
+    const dy = position[1] - offsetY
     for (const item of created) {
-      item.pos[0] += position[0] - offsetX
-      item.pos[1] += position[1] - offsetY
+      if (item instanceof LGraphNode) {
+        item.setPos(item.pos[0] + dx, item.pos[1] + dy)
+      } else if (item instanceof Reroute) {
+        item.move(dx, dy)
+      }
     }
 
     // TODO: Report failures, i.e. `failedNodes`
 
     const newPositions = created
       .filter((item): item is LGraphNode => item instanceof LGraphNode)
-      .map((node) => {
-        const fullHeight = node.size?.[1] ?? 200
-        const layoutHeight = LiteGraph.vueNodesMode
-          ? removeNodeTitleHeight(fullHeight)
-          : fullHeight
-        return {
-          nodeId: String(node.id),
-          bounds: {
-            x: node.pos[0],
-            y: node.pos[1],
-            width: node.size?.[0] ?? 100,
-            height: layoutHeight
-          }
+      .map((node) => ({
+        nodeId: String(node.id),
+        bounds: {
+          x: node.pos[0],
+          y: node.pos[1],
+          width: node.size?.[0] ?? 100,
+          height: node.size?.[1] ?? 200
         }
-      })
+      }))
 
     if (newPositions.length) layoutStore.setSource(LayoutSource.Canvas)
     layoutStore.batchUpdateNodeBounds(newPositions)
 
     this.selectItems(created)
+    forEachNode(graph, (n) => n.onGraphConfigured?.())
+    forEachNode(graph, (n) => n.onAfterGraphConfigured?.())
 
     graph.afterChange()
     this.emitAfterChange()
@@ -4108,7 +4190,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
    * @param dragRect The drag rectangle to normalize (modified in place)
    * @returns The normalized rectangle
    */
-  #normalizeDragRect(dragRect: Rect): Rect {
+  private _normalizeDragRect(dragRect: Rect): Rect {
     const w = Math.abs(dragRect[2])
     const h = Math.abs(dragRect[3])
     if (dragRect[2] < 0) dragRect[0] -= w
@@ -4123,7 +4205,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
    * @param rect The rectangle to check against
    * @returns Set of positionable items that overlap with the rectangle
    */
-  #getItemsInRect(rect: Rect): Set<Positionable> {
+  private _getItemsInRect(rect: Rect): Set<Positionable> {
     const { graph, subgraph } = this
     if (!graph) throw new NullGraphError()
 
@@ -4177,9 +4259,9 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
       dragRect[2],
       dragRect[3]
     ]
-    this.#normalizeDragRect(normalizedRect)
+    this._normalizeDragRect(normalizedRect)
 
-    const itemsInRect = this.#getItemsInRect(normalizedRect)
+    const itemsInRect = this._getItemsInRect(normalizedRect)
 
     const desired = new Set<Positionable>()
     if (e.shiftKey && !e.altKey) {
@@ -4226,16 +4308,16 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
    * @param e The pointer up event
    * @param dragRect The drag rectangle
    */
-  #handleMultiSelect(e: CanvasPointerEvent, dragRect: Rect): void {
+  private _handleMultiSelect(e: CanvasPointerEvent, dragRect: Rect): void {
     const normalizedRect: Rect = [
       dragRect[0],
       dragRect[1],
       dragRect[2],
       dragRect[3]
     ]
-    this.#normalizeDragRect(normalizedRect)
+    this._normalizeDragRect(normalizedRect)
 
-    const itemsInRect = this.#getItemsInRect(normalizedRect)
+    const itemsInRect = this._getItemsInRect(normalizedRect)
     const { selectedItems } = this
 
     if (e.shiftKey) {
@@ -4301,6 +4383,12 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     item.selected = true
     this.selectedItems.add(item)
     this.state.selectionChanged = true
+
+    if (item instanceof LGraphGroup) {
+      item.recomputeInsideNodes()
+      return
+    }
+
     if (!(item instanceof LGraphNode)) return
 
     // Node-specific handling
@@ -4593,15 +4681,14 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
    */
   setZoom(value: number, zooming_center: Point) {
     this.ds.changeScale(value, zooming_center)
-    this.#dirty()
+    this._dirty()
   }
 
   /**
    * converts a coordinate from graph coordinates to canvas2D coordinates
    */
-  convertOffsetToCanvas(pos: Point, out: Point): Point {
-    // @ts-expect-error Unused param
-    return this.ds.convertOffsetToCanvas(pos, out)
+  convertOffsetToCanvas(pos: Point, _out?: Point): Point {
+    return this.ds.convertOffsetToCanvas(pos)
   }
 
   /**
@@ -4677,7 +4764,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
    * @returns `true` if the node is visible, otherwise `false`
    */
   isNodeVisible(node: LGraphNode): boolean {
-    return this.#visible_node_ids.has(node.id)
+    return this._visible_node_ids.has(node.id)
   }
 
   /**
@@ -4698,7 +4785,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     if (this.dirty_canvas || force_canvas) {
       this.computeVisibleNodes(undefined, this.visible_nodes)
       // Update visible node IDs
-      this.#visible_node_ids = new Set(
+      this._visible_node_ids = new Set(
         this.visible_nodes.map((node) => node.id)
       )
 
@@ -4732,7 +4819,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
   drawFrontCanvas(): void {
     this.dirty_canvas = false
 
-    const { ctx, canvas, graph, linkConnector } = this
+    const { ctx, canvas, graph } = this
 
     // @ts-expect-error start2D method not in standard CanvasRenderingContext2D
     if (ctx.start2D && !this.viewport) {
@@ -4752,8 +4839,8 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     }
 
     // TODO: Set snapping value when changed instead of once per frame
-    this.#snapToGrid =
-      this.#shiftDown || LiteGraph.alwaysSnapToGrid
+    this._snapToGrid =
+      this._shiftDown || LiteGraph.alwaysSnapToGrid
         ? this.graph?.getSnapToGridSize()
         : undefined
 
@@ -4795,7 +4882,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
       // draw nodes
       const { visible_nodes } = this
       const drawSnapGuides =
-        this.#snapToGrid &&
+        this._snapToGrid &&
         (this.isDragging || layoutStore.isDraggingVueNodes.value)
 
       for (const node of visible_nodes) {
@@ -4832,78 +4919,14 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
         this.drawConnections(ctx)
       }
 
-      if (linkConnector.isConnecting) {
-        // current connection (the one being dragged by the mouse)
-        const { renderLinks } = linkConnector
-        const highlightPos = this.#getHighlightPosition()
-        ctx.lineWidth = this.connections_width
-
-        for (const renderLink of renderLinks) {
-          const {
-            fromSlot,
-            fromPos: pos,
-            fromDirection,
-            dragDirection
-          } = renderLink
-          const connShape = fromSlot.shape
-          const connType = fromSlot.type
-
-          const colour = resolveConnectingLinkColor(connType)
-
-          // the connection being dragged by the mouse
-          if (this.linkRenderer) {
-            this.linkRenderer.renderDraggingLink(
-              ctx,
-              pos,
-              highlightPos,
-              colour,
-              fromDirection,
-              dragDirection,
-              {
-                ...this.buildLinkRenderContext(),
-                linkMarkerShape: LinkMarkerShape.None
-              }
-            )
-          }
-
-          ctx.fillStyle = colour
-          ctx.beginPath()
-          if (connType === LiteGraph.EVENT || connShape === RenderShape.BOX) {
-            ctx.rect(pos[0] - 6 + 0.5, pos[1] - 5 + 0.5, 14, 10)
-            ctx.rect(
-              highlightPos[0] - 6 + 0.5,
-              highlightPos[1] - 5 + 0.5,
-              14,
-              10
-            )
-          } else if (connShape === RenderShape.ARROW) {
-            ctx.moveTo(pos[0] + 8, pos[1] + 0.5)
-            ctx.lineTo(pos[0] - 4, pos[1] + 6 + 0.5)
-            ctx.lineTo(pos[0] - 4, pos[1] - 6 + 0.5)
-            ctx.closePath()
-          } else {
-            ctx.arc(pos[0], pos[1], 4, 0, Math.PI * 2)
-            ctx.arc(highlightPos[0], highlightPos[1], 4, 0, Math.PI * 2)
-          }
-          ctx.fill()
-        }
-
-        // Gradient half-border over target node
-        this.#renderSnapHighlight(ctx, highlightPos)
-      }
-
-      // on top of link center
-      if (
-        !this.isDragging &&
-        this.over_link_center &&
-        this.render_link_tooltip
-      ) {
-        this.drawLinkTooltip(ctx, this.over_link_center)
+      if (!LiteGraph.vueNodesMode || !this.overlayCtx) {
+        this._drawConnectingLinks(ctx)
       } else {
-        this.onDrawLinkTooltip?.(ctx, null)
+        this._drawOverlayLinks()
       }
 
-      // custom info
+      this._drawLinkTooltip(ctx)
+
       this.onDrawForeground?.(ctx, this.visible_area)
 
       ctx.restore()
@@ -4914,9 +4937,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     if (area) ctx.restore()
   }
 
-  /** @returns If the pointer is over a link centre marker, the link segment it belongs to.  Otherwise, `undefined`.  */
-  #getLinkCentreOnPos(e: CanvasPointerEvent): LinkSegment | undefined {
-    // Skip hit detection if center markers are disabled
+  private _getLinkCentreOnPos(e: CanvasPointerEvent): LinkSegment | undefined {
     if (this.linkMarkerShape === LinkMarkerShape.None) {
       return undefined
     }
@@ -4933,8 +4954,93 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     }
   }
 
+  private _drawConnectingLinks(ctx: CanvasRenderingContext2D): void {
+    const { linkConnector } = this
+    if (!linkConnector.isConnecting) return
+
+    const { renderLinks } = linkConnector
+    const highlightPos = this._getHighlightPosition()
+    ctx.lineWidth = this.connections_width
+
+    for (const renderLink of renderLinks) {
+      const {
+        fromSlot,
+        fromPos: pos,
+        fromDirection,
+        dragDirection
+      } = renderLink
+      const connShape = fromSlot.shape
+      const connType = fromSlot.type
+
+      const colour = resolveConnectingLinkColor(connType)
+
+      if (this.linkRenderer) {
+        this.linkRenderer.renderDraggingLink(
+          ctx,
+          pos,
+          highlightPos,
+          colour,
+          fromDirection,
+          dragDirection,
+          {
+            ...this.buildLinkRenderContext(),
+            linkMarkerShape: LinkMarkerShape.None
+          }
+        )
+      }
+      if (renderLink instanceof MovingInputLink) this.setDirty(false, true)
+
+      ctx.fillStyle = colour
+      ctx.beginPath()
+      if (connType === LiteGraph.EVENT || connShape === RenderShape.BOX) {
+        ctx.rect(pos[0] - 6 + 0.5, pos[1] - 5 + 0.5, 14, 10)
+        ctx.rect(highlightPos[0] - 6 + 0.5, highlightPos[1] - 5 + 0.5, 14, 10)
+      } else if (connShape === RenderShape.ARROW) {
+        ctx.moveTo(pos[0] + 8, pos[1] + 0.5)
+        ctx.lineTo(pos[0] - 4, pos[1] + 6 + 0.5)
+        ctx.lineTo(pos[0] - 4, pos[1] - 6 + 0.5)
+        ctx.closePath()
+      } else {
+        ctx.arc(pos[0], pos[1], 4, 0, Math.PI * 2)
+        ctx.arc(highlightPos[0], highlightPos[1], 4, 0, Math.PI * 2)
+      }
+      ctx.fill()
+    }
+
+    this._renderSnapHighlight(ctx, highlightPos)
+  }
+
+  private _drawLinkTooltip(ctx: CanvasRenderingContext2D): void {
+    if (!this.isDragging && this.over_link_center && this.render_link_tooltip) {
+      this.drawLinkTooltip(ctx, this.over_link_center)
+    } else {
+      this.onDrawLinkTooltip?.(ctx, null)
+    }
+  }
+
+  private _drawOverlayLinks(): void {
+    const octx = this.overlayCtx
+    const overlayCanvas = this.overlayCanvas
+    if (!octx || !overlayCanvas) return
+
+    octx.clearRect(0, 0, overlayCanvas.width, overlayCanvas.height)
+
+    if (!this.linkConnector.isConnecting) return
+
+    octx.save()
+
+    const scale = overlayCanvas.width / (overlayCanvas.clientWidth || 1)
+    octx.setTransform(scale, 0, 0, scale, 0, 0)
+
+    this.ds.toCanvasContext(octx)
+
+    this._drawConnectingLinks(octx)
+
+    octx.restore()
+  }
+
   /** Get the target snap / highlight point in graph space */
-  #getHighlightPosition(): Readonly<Point> {
+  private _getHighlightPosition(): Readonly<Point> {
     return LiteGraph.snaps_for_comfy
       ? (this.linkConnector.state.snapLinksPos ??
           this._highlight_pos ??
@@ -4947,7 +5053,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
    * Partial border over target node and a highlight over the slot itself.
    * @param ctx Canvas 2D context
    */
-  #renderSnapHighlight(
+  private _renderSnapHighlight(
     ctx: CanvasRenderingContext2D,
     highlightPos: Readonly<Point>
   ): void {
@@ -5598,7 +5704,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     // Normalise boundingRect to pos to snap
     snapGuide[0] += offsetX
     snapGuide[1] += offsetY
-    if (this.#snapToGrid) snapPoint(snapGuide, this.#snapToGrid)
+    if (this._snapToGrid) snapPoint(snapGuide, this._snapToGrid)
     snapGuide[0] -= offsetX
     snapGuide[1] -= offsetY
 
@@ -5627,6 +5733,12 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     this.renderedPaths.clear()
     if (this.links_render_mode === LinkRenderType.HIDDEN_LINK) return
 
+    // Skip link rendering while waiting for slot positions to sync after reconfigure
+    if (LiteGraph.vueNodesMode && layoutStore.pendingSlotSync) {
+      this._visibleReroutes.clear()
+      return
+    }
+
     const { graph, subgraph } = this
     if (!graph) throw new NullGraphError()
 
@@ -5678,7 +5790,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
         const output = start_node.outputs[outputId]
         if (!output) continue
 
-        this.#renderAllLinkSegments(
+        this._renderAllLinkSegments(
           ctx,
           link,
           startPos,
@@ -5707,7 +5819,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
             ? getSlotPosition(inputNode, link.target_slot, true)
             : inputNode.getInputPos(link.target_slot)
 
-          this.#renderAllLinkSegments(
+          this._renderAllLinkSegments(
             ctx,
             link,
             output.pos,
@@ -5734,7 +5846,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
           ? getSlotPosition(outputNode, link.origin_slot, false)
           : outputNode.getOutputPos(link.origin_slot)
 
-        this.#renderAllLinkSegments(
+        this._renderAllLinkSegments(
           ctx,
           link,
           startPos,
@@ -5748,10 +5860,10 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     }
 
     if (graph.floatingLinks.size > 0) {
-      this.#renderFloatingLinks(ctx, graph, visibleReroutes, now)
+      this._renderFloatingLinks(ctx, graph, visibleReroutes, now)
     }
 
-    const rerouteSet = this.#visibleReroutes
+    const rerouteSet = this._visibleReroutes
     rerouteSet.clear()
 
     // Render reroutes, ordered by number of non-floating links
@@ -5760,7 +5872,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
       rerouteSet.add(reroute)
 
       if (
-        this.#snapToGrid &&
+        this._snapToGrid &&
         this.isDragging &&
         this.selectedItems.has(reroute)
       ) {
@@ -5771,10 +5883,17 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
       // Never draw slots when the pointer is down
       if (!this.pointer.isDown) reroute.drawSlots(ctx)
     }
+
+    const highlightPos = this._getHighlightPosition()
+    this.linkConnector.renderLinks
+      .filter((rl) => rl instanceof MovingInputLink)
+      .forEach((rl) => rl.drawConnectionCircle(ctx, highlightPos))
+
     ctx.globalAlpha = 1
   }
 
   private getNodeModeAlpha(node: LGraphNode) {
+    if (node.flags.ghost) return 0.3
     return node.mode === LGraphEventMode.BYPASS
       ? 0.2
       : node.mode === LGraphEventMode.NEVER
@@ -5782,7 +5901,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
         : this.editor_alpha
   }
 
-  #renderFloatingLinks(
+  private _renderFloatingLinks(
     ctx: CanvasRenderingContext2D,
     graph: LGraph,
     visibleReroutes: Reroute[],
@@ -5811,7 +5930,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
         const endDirection = node.inputs[link.target_slot]?.dir
 
         firstReroute._dragging = true
-        this.#renderAllLinkSegments(
+        this._renderAllLinkSegments(
           ctx,
           link,
           startPos,
@@ -5833,7 +5952,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
         const startDirection = node.outputs[link.origin_slot]?.dir
 
         link._dragging = true
-        this.#renderAllLinkSegments(
+        this._renderAllLinkSegments(
           ctx,
           link,
           startPos,
@@ -5849,7 +5968,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     ctx.globalAlpha = globalAlpha
   }
 
-  #renderAllLinkSegments(
+  private _renderAllLinkSegments(
     ctx: CanvasRenderingContext2D,
     link: LLink,
     startPos: Point,
@@ -6144,11 +6263,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
   /**
    * draws every group area in the background
    */
-  drawGroups(
-    // @ts-expect-error - unused parameter
-    canvas: HTMLCanvasElement,
-    ctx: CanvasRenderingContext2D
-  ): void {
+  drawGroups(_canvas: HTMLCanvasElement, ctx: CanvasRenderingContext2D): void {
     if (!this.graph) return
 
     const groups = this.graph._groups
@@ -6156,7 +6271,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     ctx.save()
     ctx.globalAlpha = 0.5 * this.editor_alpha
     const drawSnapGuides =
-      this.#snapToGrid &&
+      this._snapToGrid &&
       (this.isDragging || layoutStore.isDraggingVueNodes.value)
 
     for (const group of groups) {
@@ -6242,8 +6357,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     function inner_clicked(
       this: LGraphCanvas,
       v: string,
-      // @ts-expect-error - unused parameter
-      options: unknown,
+      _options: unknown,
       e: MouseEvent
     ) {
       if (!graph) throw new NullGraphError()
@@ -6268,7 +6382,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
                 options
               )
             ) {
-              node.pos[0] -= node.size[0] * 0.5
+              node.setPos(node.pos[0] - node.size[0] * 0.5, node.pos[1])
             }
           })
           break
@@ -6399,8 +6513,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
       ? LiteGraph.slot_types_default_out
       : LiteGraph.slot_types_default_in
     if (slotTypesDefault?.[fromSlotType]) {
-      // TODO: Remove "any" kludge
-      let nodeNewType: any = false
+      let nodeNewType: string | Record<string, unknown> | false = false
       if (typeof slotTypesDefault[fromSlotType] == 'object') {
         for (const typeX in slotTypesDefault[fromSlotType]) {
           if (
@@ -6418,11 +6531,13 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
         nodeNewType = slotTypesDefault[fromSlotType]
       }
       if (nodeNewType) {
-        // TODO: Remove "any" kludge
-        let nodeNewOpts: any = false
-        if (typeof nodeNewType == 'object' && nodeNewType.node) {
-          nodeNewOpts = nodeNewType
-          nodeNewType = nodeNewType.node
+        let nodeNewOpts: SlotTypeDefaultNodeOpts | undefined
+        let nodeTypeStr: string
+        if (typeof nodeNewType == 'object') {
+          nodeNewOpts = nodeNewType as SlotTypeDefaultNodeOpts
+          nodeTypeStr = nodeNewOpts.node ?? ''
+        } else {
+          nodeTypeStr = nodeNewType
         }
 
         // that.graph.beforeChange();
@@ -6430,8 +6545,8 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
         const ySizeFix = opts.posSizeFix[1] * LiteGraph.NODE_SLOT_HEIGHT
         const nodeX = opts.position[0] + opts.posAdd[0] + xSizeFix
         const nodeY = opts.position[1] + opts.posAdd[1] + ySizeFix
-        const pos = [nodeX, nodeY]
-        const newNode = LiteGraph.createNode(nodeNewType, nodeNewOpts.title, {
+        const pos: [number, number] = [nodeX, nodeY]
+        const newNode = LiteGraph.createNode(nodeTypeStr, nodeNewOpts?.title, {
           pos
         })
         if (newNode) {
@@ -6444,20 +6559,14 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
             }
             if (nodeNewOpts.inputs) {
               newNode.inputs = []
-              for (const i in nodeNewOpts.inputs) {
-                newNode.addOutput(
-                  nodeNewOpts.inputs[i][0],
-                  nodeNewOpts.inputs[i][1]
-                )
+              for (const input of nodeNewOpts.inputs) {
+                newNode.addInput(input[0], input[1])
               }
             }
             if (nodeNewOpts.outputs) {
               newNode.outputs = []
-              for (const i in nodeNewOpts.outputs) {
-                newNode.addOutput(
-                  nodeNewOpts.outputs[i][0],
-                  nodeNewOpts.outputs[i][1]
-                )
+              for (const output of nodeNewOpts.outputs) {
+                newNode.addOutput(output[0], output[1])
               }
             }
             if (nodeNewOpts.json) {
@@ -6529,7 +6638,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
       },
       optPass || {}
     )
-    const dirty = () => this.#dirty()
+    const dirty = () => this._dirty()
 
     const that = this
     const { graph } = this
@@ -6727,8 +6836,8 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
   // refactor: there are different dialogs, some uses createDialog some dont
   prompt(
     title: string,
-    value: any,
-    callback: (arg0: any) => void,
+    value: string | number,
+    callback: (value: string) => void,
     event: CanvasPointerEvent,
     multiline?: boolean
   ): HTMLDivElement {
@@ -6762,13 +6871,12 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
 
     if (this.ds.scale > 1) dialog.style.transform = `scale(${this.ds.scale})`
 
-    let dialogCloseTimer: number
+    let dialogCloseTimer: ReturnType<typeof setTimeout> | undefined
     let prevent_timeout = 0
     LiteGraph.pointerListenerAdd(dialog, 'leave', function () {
       if (prevent_timeout) return
       if (LiteGraph.dialog_close_on_mouse_leave) {
         if (!dialog.is_modified && LiteGraph.dialog_close_on_mouse_leave) {
-          // @ts-expect-error - setTimeout type
           dialogCloseTimer = setTimeout(
             dialog.close,
             LiteGraph.dialog_close_on_mouse_leave_delay
@@ -6806,7 +6914,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
       dialog.querySelector('.value')
     if (!value_element) throw new TypeError('value_element was null')
 
-    value_element.value = value
+    value_element.value = String(value)
     value_element.select()
 
     const input = value_element
@@ -6955,9 +7063,8 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
 
     // hide on mouse leave
     if (options.hide_on_mouse_leave) {
-      // FIXME: Remove "any" kludge
-      let prevent_timeout: any = false
-      let timeout_close: number | null = null
+      let prevent_timeout = 0
+      let timeout_close: ReturnType<typeof setTimeout> | null = null
       LiteGraph.pointerListenerAdd(dialog, 'enter', function () {
         if (timeout_close) {
           clearTimeout(timeout_close)
@@ -6969,7 +7076,6 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
 
         const hideDelay = options.hide_on_mouse_leave
         const delay = typeof hideDelay === 'number' ? hideDelay : 500
-        // @ts-expect-error - setTimeout type
         timeout_close = setTimeout(dialog.close, delay)
       })
       // if filtering, check focus changed to comboboxes and prevent closing
@@ -7005,7 +7111,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     that.search_box = dialog
 
     let first: string | null = null
-    let timeout: number | null = null
+    let timeout: ReturnType<typeof setTimeout> | null = null
     let selected: ChildNode | null = null
 
     const maybeInput = dialog.querySelector('input')
@@ -7039,7 +7145,6 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
           if (timeout) {
             clearInterval(timeout)
           }
-          // @ts-expect-error - setTimeout type
           timeout = setTimeout(refreshHelper, 10)
           return
         }
@@ -7152,8 +7257,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
 
           // join node after inserting
           if (options.node_from) {
-            // FIXME: any
-            let iS: any = false
+            let iS: number | false = false
             switch (typeof options.slot_from) {
               case 'string':
                 iS = options.node_from.findOutputSlot(options.slot_from)
@@ -7179,8 +7283,8 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
                 // try with first if no name set
                 iS = 0
             }
-            if (options.node_from.outputs[iS] !== undefined) {
-              if (iS !== false && iS > -1) {
+            if (iS !== false && options.node_from.outputs[iS] !== undefined) {
+              if (iS > -1) {
                 if (node == null)
                   throw new TypeError(
                     'options.slot_from was null when showing search box'
@@ -7197,8 +7301,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
             }
           }
           if (options.node_to) {
-            // FIXME: any
-            let iS: any = false
+            let iS: number | false = false
             switch (typeof options.slot_from) {
               case 'string':
                 iS = options.node_to.findInputSlot(options.slot_from)
@@ -7224,8 +7327,8 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
                 // try with first if no name set
                 iS = 0
             }
-            if (options.node_to.inputs[iS] !== undefined) {
-              if (iS !== false && iS > -1) {
+            if (iS !== false && options.node_to.inputs[iS] !== undefined) {
+              if (iS > -1) {
                 if (node == null)
                   throw new TypeError(
                     'options.slot_from was null when showing search box'
@@ -7288,13 +7391,16 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
 
         const filter = graphcanvas.filter || graphcanvas.graph.filter
 
-        // FIXME: any
         // filter by type preprocess
-        let sIn: any = false
-        let sOut: any = false
+        let sIn: HTMLSelectElement | null = null
+        let sOut: HTMLSelectElement | null = null
         if (options.do_type_filter && that.search_box) {
-          sIn = that.search_box.querySelector('.slot_in_type_filter')
-          sOut = that.search_box.querySelector('.slot_out_type_filter')
+          sIn = that.search_box.querySelector<HTMLSelectElement>(
+            '.slot_in_type_filter'
+          )
+          sOut = that.search_box.querySelector<HTMLSelectElement>(
+            '.slot_out_type_filter'
+          )
         }
 
         const keys = Object.keys(LiteGraph.registered_node_types)
@@ -7312,11 +7418,9 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
         // add general type if filtering
         if (
           options.show_general_after_typefiltered &&
-          (sIn.value || sOut.value)
+          (sIn?.value || sOut?.value)
         ) {
-          // FIXME: Undeclared variable again
-          // @ts-expect-error Variable declared without type annotation
-          filtered_extra = []
+          const filtered_extra: string[] = []
           for (const i in LiteGraph.registered_node_types) {
             if (
               inner_test_filter(i, {
@@ -7324,11 +7428,9 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
                 outTypeOverride: sOut && sOut.value ? '*' : false
               })
             ) {
-              // @ts-expect-error Variable declared without type annotation
               filtered_extra.push(i)
             }
           }
-          // @ts-expect-error Variable declared without type annotation
           for (const extraItem of filtered_extra) {
             addResult(extraItem, 'generic_type')
             if (
@@ -7341,18 +7443,15 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
 
         // check il filtering gave no results
         if (
-          (sIn.value || sOut.value) &&
+          (sIn?.value || sOut?.value) &&
           helper.childNodes.length == 0 &&
           options.show_general_if_none_on_typefilter
         ) {
-          // @ts-expect-error Variable declared without type annotation
-          filtered_extra = []
+          const filtered_extra: string[] = []
           for (const i in LiteGraph.registered_node_types) {
             if (inner_test_filter(i, { skipFilter: true }))
-              // @ts-expect-error Variable declared without type annotation
               filtered_extra.push(i)
           }
-          // @ts-expect-error Variable declared without type annotation
           for (const extraItem of filtered_extra) {
             addResult(extraItem, 'not_in_filter')
             if (
@@ -7392,8 +7491,10 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
           if (options.do_type_filter && !opts.skipFilter) {
             const sType = type
 
-            let sV =
-              opts.inTypeOverride !== false ? opts.inTypeOverride : sIn.value
+            let sV: string | undefined =
+              typeof opts.inTypeOverride === 'string'
+                ? opts.inTypeOverride
+                : sIn?.value
             // type is stored
             if (sIn && sV && LiteGraph.registered_slot_in_types[sV]?.nodes) {
               const doesInc =
@@ -7401,8 +7502,9 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
               if (doesInc === false) return false
             }
 
-            sV = sOut.value
-            if (opts.outTypeOverride !== false) sV = opts.outTypeOverride
+            sV = sOut?.value
+            if (typeof opts.outTypeOverride === 'string')
+              sV = opts.outTypeOverride
             // type is stored
             if (sOut && sV && LiteGraph.registered_slot_out_types[sV]?.nodes) {
               const doesInc =
@@ -7545,7 +7647,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     function inner() {
       setValue(input?.value)
     }
-    const dirty = () => this.#dirty()
+    const dirty = () => this._dirty()
 
     function setValue(value: string | number | undefined) {
       if (
@@ -7647,13 +7749,12 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
       }
     }
 
-    let dialogCloseTimer: number
+    let dialogCloseTimer: ReturnType<typeof setTimeout> | undefined
     let prevent_timeout = 0
     dialog.addEventListener('mouseleave', function () {
       if (prevent_timeout) return
 
       if (!dialog.is_modified && LiteGraph.dialog_close_on_mouse_leave) {
-        // @ts-expect-error - setTimeout type
         dialogCloseTimer = setTimeout(
           dialog.close,
           LiteGraph.dialog_close_on_mouse_leave_delay
@@ -7684,16 +7785,14 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     return dialog
   }
 
-  createPanel(title: string, options: ICreatePanelOptions) {
+  createPanel(title: string, options: ICreatePanelOptions): Panel {
     options = options || {}
 
-    const ref_window = options.window || window
-    // TODO: any kludge
-    const root: any = document.createElement('div')
+    const root = document.createElement('div') as Panel
     root.className = 'litegraph dialog'
     root.innerHTML =
       "<div class='dialog-header'><span class='dialog-title'></span></div><div class='dialog-content'></div><div style='display:none;' class='dialog-alt-content'></div><div class='dialog-footer'></div>"
-    root.header = root.querySelector('.dialog-header')
+    root.header = root.querySelector('.dialog-header')!
 
     if (options.width)
       root.style.width =
@@ -7710,11 +7809,11 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
       })
       root.header.append(close)
     }
-    root.title_element = root.querySelector('.dialog-title')
+    root.title_element = root.querySelector('.dialog-title')!
     root.title_element.textContent = title
-    root.content = root.querySelector('.dialog-content')
-    root.alt_content = root.querySelector('.dialog-alt-content')
-    root.footer = root.querySelector('.dialog-footer')
+    root.content = root.querySelector('.dialog-content')!
+    root.alt_content = root.querySelector('.dialog-alt-content')!
+    root.footer = root.querySelector('.dialog-footer')!
     root.footer.style.marginTop = '-96px'
 
     root.close = function () {
@@ -7724,7 +7823,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     }
 
     // function to swap panel content
-    root.toggleAltContent = function (force: unknown) {
+    root.toggleAltContent = function (force?: boolean) {
       let vTo: string
       let vAlt: string
       if (force !== undefined) {
@@ -7738,7 +7837,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
       root.content.style.display = vAlt
     }
 
-    root.toggleFooterVisibility = function (force: unknown) {
+    root.toggleFooterVisibility = function (force?: boolean) {
       let vTo: string
       if (force !== undefined) {
         vTo = force ? 'block' : 'none'
@@ -7752,7 +7851,11 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
       this.content.innerHTML = ''
     }
 
-    root.addHTML = function (code: string, classname: string, on_footer: any) {
+    root.addHTML = function (
+      code: string,
+      classname?: string,
+      on_footer?: boolean
+    ) {
       const elem = document.createElement('div')
       if (classname) elem.className = classname
       elem.innerHTML = code
@@ -7761,9 +7864,12 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
       return elem
     }
 
-    root.addButton = function (name: any, callback: any, options: any) {
-      // TODO: any kludge
-      const elem: any = document.createElement('button')
+    root.addButton = function (
+      name: string,
+      callback: () => void,
+      options?: unknown
+    ): PanelButton {
+      const elem = document.createElement('button') as PanelButton
       elem.textContent = name
       elem.options = options
       elem.classList.add('btn')
@@ -7780,20 +7886,18 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
 
     root.addWidget = function (
       type: string,
-      name: any,
-      value: unknown,
-      options: { label?: any; type?: any; values?: any; callback?: any },
-      callback: (arg0: any, arg1: any, arg2: any) => void
-    ) {
+      name: string,
+      value: TWidgetValue,
+      options?: PanelWidgetOptions,
+      callback?: PanelWidgetCallback
+    ): PanelWidget {
       options = options || {}
       let str_value = String(value)
       type = type.toLowerCase()
       if (type == 'number' && typeof value === 'number')
         str_value = value.toFixed(3)
 
-      // FIXME: any kludge
-      const elem: HTMLDivElement & { options?: unknown; value?: unknown } =
-        document.createElement('div')
+      const elem: PanelWidget = document.createElement('div') as PanelWidget
       elem.className = 'property'
       elem.innerHTML =
         "<span class='property_name'></span><span class='property_value'></span>"
@@ -7801,7 +7905,6 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
       if (!nameSpan) throw new TypeError('Property name element was null.')
 
       nameSpan.textContent = options.label || name
-      // TODO: any kludge
       const value_element: HTMLSpanElement | null =
         elem.querySelector('.property_value')
       if (!value_element) throw new TypeError('Property name element was null.')
@@ -7813,7 +7916,8 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
 
       if (type == 'code') {
         elem.addEventListener('click', function () {
-          root.inner_showCodePad(this.dataset['property'])
+          const property = this.dataset['property']
+          if (property) root.inner_showCodePad?.(property)
         })
       } else if (type == 'boolean') {
         elem.classList.add('boolean')
@@ -7856,33 +7960,27 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
         value_element.textContent = str_value ?? ''
 
         value_element.addEventListener('click', function (event) {
-          const values = options.values || []
+          const values = options?.values || []
           const propname = this.parentElement?.dataset['property']
-          const inner_clicked = (v: string | null) => {
-            // node.setProperty(propname,v);
-            // graphcanvas.dirty_canvas = true;
-            this.textContent = v
+          const inner_clicked = (v?: string) => {
+            this.textContent = v ?? null
             innerChange(propname, v)
             return false
           }
-          new LiteGraph.ContextMenu(
-            values,
-            {
-              event,
-              className: 'dark',
-              callback: inner_clicked
-            },
-            // @ts-expect-error ref_window parameter unused in ContextMenu constructor
-            ref_window
-          )
+          new LiteGraph.ContextMenu(values, {
+            event,
+            className: 'dark',
+            callback: inner_clicked
+          })
         })
       }
 
       root.content.append(elem)
 
-      function innerChange(name: string | undefined, value: unknown) {
-        options.callback?.(name, value, options)
-        callback?.(name, value, options)
+      function innerChange(name: string | undefined, value: TWidgetValue) {
+        const opts = options || {}
+        opts.callback?.(name, value, opts)
+        callback?.(name, value, opts)
       }
 
       return elem
@@ -7911,7 +8009,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
       },
       onClose: () => {
         this.NODEPANEL_IS_OPEN = false
-        this.node_panel = null
+        this.node_panel = undefined
       }
     })
     this.node_panel = panel
@@ -7932,11 +8030,9 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
 
       panel.addHTML('<h3>Properties</h3>')
 
-      const fUpdate = (
-        name: string,
-        value: string | number | boolean | object | undefined
-      ) => {
+      const fUpdate: PanelWidgetCallback = (name, value) => {
         if (!this.graph) throw new NullGraphError()
+        if (!name) return
         this.graph.beforeChange(node)
         switch (name) {
           case 'Title':
@@ -8040,7 +8136,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
 
       panel.alt_content.innerHTML = "<textarea class='code'></textarea>"
       const textarea: HTMLTextAreaElement =
-        panel.alt_content.querySelector('textarea')
+        panel.alt_content.querySelector('textarea')!
       const fDoneWith = function () {
         panel.toggleAltContent(false)
         panel.toggleFooterVisibility(true)
@@ -8194,14 +8290,10 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
         {
           content: 'Properties Panel',
           callback: function (
-            // @ts-expect-error - unused parameter
-            item: any,
-            // @ts-expect-error - unused parameter
-            options: any,
-            // @ts-expect-error - unused parameter
-            e: any,
-            // @ts-expect-error - unused parameter
-            menu: any,
+            _item: Positionable,
+            _options: IContextMenuOptions | undefined,
+            _e: MouseEvent | undefined,
+            _menu: ContextMenu<unknown> | undefined,
             node: LGraphNode
           ) {
             LGraphCanvas.active_canvas.showShowNodePanel(node)
@@ -8230,7 +8322,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
           callback: LGraphCanvas.onMenuNodeCollapse
         })
       }
-      if (node.widgets?.some((w) => w.advanced)) {
+      if (node.hasAdvancedWidgets()) {
         options.push({
           content: node.showAdvanced ? 'Hide Advanced' : 'Show Advanced',
           callback: LGraphCanvas.onMenuToggleAdvanced
@@ -8312,9 +8404,6 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     node: LGraphNode | undefined,
     event: CanvasPointerEvent
   ): void {
-    const canvas = LGraphCanvas.active_canvas
-    const ref_window = canvas.getCanvasWindow()
-
     // TODO: Remove type kludge
     let menu_info: (IContextMenuValue | string | null)[]
     const options: IContextMenuOptions = {
@@ -8392,7 +8481,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
           reroute = this.graph.getRerouteOnPos(
             event.canvasX,
             event.canvasY,
-            this.#visibleReroutes
+            this._visibleReroutes
           )
         }
         if (reroute) {
@@ -8428,8 +8517,7 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     // show menu
     if (!menu_info) return
 
-    // @ts-expect-error Remove param ref_window - unused
-    new LiteGraph.ContextMenu(menu_info, options, ref_window)
+    new LiteGraph.ContextMenu(menu_info, options)
 
     const createDialog = (options: IDialogOptions) =>
       this.createDialog(
@@ -8582,27 +8670,14 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
    * Apply batched node position updates
    */
   private applyNodePositionUpdates(
-    nodesToMove: Array<{ node: LGraphNode; newPos: { x: number; y: number } }>,
-    mutations: ReturnType<typeof useLayoutMutations>
+    nodesToMove: Array<{ node: LGraphNode; newPos: { x: number; y: number } }>
   ): void {
     for (const { node, newPos } of nodesToMove) {
-      // Update LiteGraph position first so next drag uses correct base position
-      node.pos[0] = newPos.x
-      node.pos[1] = newPos.y
-      // Then update layout store which will update Vue nodes
-      mutations.moveNode(node.id, newPos)
+      // setPos automatically syncs to layout store
+      node.setPos(newPos.x, newPos.y)
     }
   }
 
-  /**
-   * Initialize layout mutations with Canvas source
-   */
-  private initLayoutMutations(): ReturnType<typeof useLayoutMutations> {
-    const mutations = useLayoutMutations()
-    mutations.setSource(LayoutSource.Canvas)
-    return mutations
-  }
-
   /**
    * Collect all nodes that are children of groups in the selection
    */
@@ -8650,7 +8725,6 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     deltaX: number,
     deltaY: number
   ) {
-    const mutations = this.initLayoutMutations()
     const nodesInMovingGroups = this.collectNodesInGroups(allItems)
     const nodesToMove: NewNodePosition[] = []
 
@@ -8676,11 +8750,135 @@ export class LGraphCanvas implements CustomEventDispatcher<LGraphCanvasEventMap>
     }
 
     // Now apply all the node moves at once
-    this.applyNodePositionUpdates(nodesToMove, mutations)
+    this.applyNodePositionUpdates(nodesToMove)
   }
 
   repositionNodesVueMode(nodesToReposition: NewNodePosition[]) {
-    const mutations = this.initLayoutMutations()
-    this.applyNodePositionUpdates(nodesToReposition, mutations)
+    this.applyNodePositionUpdates(nodesToReposition)
+  }
+
+  /**
+   * Custom JSON serialization to prevent circular reference errors.
+   * LGraphCanvas should not be serialized directly - serialize the graph instead.
+   */
+  toJSON(): { ds: { scale: number; offset: [number, number] } } {
+    return {
+      ds: {
+        scale: this.ds.scale,
+        offset: [...this.ds.offset] as [number, number]
+      }
+    }
+  }
+}
+
+function patchLinkNodeIds(
+  links: { origin_id: NodeId; target_id: NodeId }[] | undefined,
+  remappedIds: Map<NodeId, NodeId>
+) {
+  if (!links?.length) return
+
+  for (const link of links) {
+    const newOriginId = remappedIds.get(link.origin_id)
+    if (newOriginId !== undefined) link.origin_id = newOriginId
+
+    const newTargetId = remappedIds.get(link.target_id)
+    if (newTargetId !== undefined) link.target_id = newTargetId
+  }
+}
+
+function remapNodeId(
+  nodeId: string,
+  remappedIds: Map<NodeId, NodeId>
+): NodeId | undefined {
+  const directMatch = remappedIds.get(nodeId)
+  if (directMatch !== undefined) return directMatch
+  if (!/^-?\d+$/.test(nodeId)) return undefined
+
+  const numericId = Number(nodeId)
+  if (!Number.isSafeInteger(numericId)) return undefined
+
+  return remappedIds.get(numericId)
+}
+
+function remapProxyWidgets(
+  info: ISerialisedNode,
+  remappedIds: Map<NodeId, NodeId> | undefined
+) {
+  if (!remappedIds || remappedIds.size === 0) return
+
+  const proxyWidgets = info.properties?.proxyWidgets
+  if (!Array.isArray(proxyWidgets)) return
+
+  for (const entry of proxyWidgets) {
+    if (!Array.isArray(entry)) continue
+
+    const [nodeId] = entry
+    if (typeof nodeId !== 'string' || nodeId === '-1') continue
+
+    const remappedNodeId = remapNodeId(nodeId, remappedIds)
+    if (remappedNodeId !== undefined) entry[0] = String(remappedNodeId)
+  }
+}
+
+/**
+ * Remaps pasted subgraph interior node IDs that would collide with existing
+ * node IDs in the root graph. Also patches subgraph link node IDs and
+ * SubgraphNode `properties.proxyWidgets` references so promoted widget
+ * associations stay aligned with remapped interior IDs.
+ */
+export function remapClipboardSubgraphNodeIds(
+  parsed: ClipboardItems,
+  rootGraph: LGraph
+): void {
+  const usedNodeIds = new Set<number>()
+  forEachNode(rootGraph, (node) => {
+    if (typeof node.id !== 'number') return
+    usedNodeIds.add(node.id)
+    if (rootGraph.state.lastNodeId < node.id)
+      rootGraph.state.lastNodeId = node.id
+  })
+
+  function nextUniqueNodeId() {
+    while (usedNodeIds.has(++rootGraph.state.lastNodeId));
+    const nextId = rootGraph.state.lastNodeId
+    usedNodeIds.add(nextId)
+    return nextId
+  }
+
+  const subgraphNodeIdMap = new Map<UUID, Map<NodeId, NodeId>>()
+  for (const subgraphInfo of parsed.subgraphs ?? []) {
+    const remappedIds = new Map<NodeId, NodeId>()
+    const interiorNodes = subgraphInfo.nodes ?? []
+
+    for (const nodeInfo of interiorNodes) {
+      if (typeof nodeInfo.id !== 'number') continue
+
+      if (usedNodeIds.has(nodeInfo.id)) {
+        const oldId = nodeInfo.id
+        const newId = nextUniqueNodeId()
+        remappedIds.set(oldId, newId)
+        nodeInfo.id = newId
+        continue
+      }
+
+      usedNodeIds.add(nodeInfo.id)
+      if (rootGraph.state.lastNodeId < nodeInfo.id)
+        rootGraph.state.lastNodeId = nodeInfo.id
+    }
+
+    if (remappedIds.size > 0) {
+      patchLinkNodeIds(subgraphInfo.links, remappedIds)
+      subgraphNodeIdMap.set(subgraphInfo.id, remappedIds)
+    }
+  }
+
+  const allNodeInfo: ISerialisedNode[] = [
+    parsed.nodes ? [parsed.nodes] : [],
+    parsed.subgraphs ? parsed.subgraphs.map((s) => s.nodes ?? []) : []
+  ].flat(2)
+
+  for (const nodeInfo of allNodeInfo) {
+    if (typeof nodeInfo.type !== 'string') continue
+    remapProxyWidgets(nodeInfo, subgraphNodeIdMap.get(nodeInfo.type))
   }
 }
diff --git a/src/lib/litegraph/src/LGraphGroup.test.ts b/src/lib/litegraph/src/LGraphGroup.test.ts
new file mode 100644
index 0000000000..64b437b6a5
--- /dev/null
+++ b/src/lib/litegraph/src/LGraphGroup.test.ts
@@ -0,0 +1,80 @@
+import { describe, expect } from 'vitest'
+
+import { LGraph, LGraphGroup } from '@/lib/litegraph/src/litegraph'
+
+import { test } from './__fixtures__/testExtensions'
+
+describe('LGraphGroup', () => {
+  test('serializes to the existing format', () => {
+    const link = new LGraphGroup('title', 929)
+    expect(link.serialize()).toMatchSnapshot('Basic')
+  })
+
+  describe('recomputeInsideNodes', () => {
+    test('uses visited set to avoid redundant computation', () => {
+      const graph = new LGraph()
+
+      // Create 4 nested groups: outer -> mid1 -> mid2 -> inner
+      const outer = new LGraphGroup('outer')
+      outer.pos = [0, 0]
+      outer.size = [400, 400]
+      graph.add(outer)
+
+      const mid1 = new LGraphGroup('mid1')
+      mid1.pos = [10, 10]
+      mid1.size = [300, 300]
+      graph.add(mid1)
+
+      const mid2 = new LGraphGroup('mid2')
+      mid2.pos = [20, 20]
+      mid2.size = [200, 200]
+      graph.add(mid2)
+
+      const inner = new LGraphGroup('inner')
+      inner.pos = [30, 30]
+      inner.size = [100, 100]
+      graph.add(inner)
+
+      // Track the visited set to verify each group is only fully processed once
+      const visited = new Set<number>()
+      outer.recomputeInsideNodes(100, visited)
+
+      // All nested groups should be in the visited set
+      expect(visited.has(outer.id)).toBe(true)
+      expect(visited.has(mid1.id)).toBe(true)
+      expect(visited.has(mid2.id)).toBe(true)
+      expect(visited.has(inner.id)).toBe(true)
+      expect(visited.size).toBe(4)
+
+      // Verify children relationships are correct
+      expect(outer.children.has(mid1)).toBe(true)
+      expect(outer.children.has(mid2)).toBe(true)
+      expect(outer.children.has(inner)).toBe(true)
+      expect(mid1.children.has(mid2)).toBe(true)
+      expect(mid1.children.has(inner)).toBe(true)
+      expect(mid2.children.has(inner)).toBe(true)
+    })
+
+    test('respects maxDepth limit', () => {
+      const graph = new LGraph()
+
+      const outer = new LGraphGroup('outer')
+      outer.pos = [0, 0]
+      outer.size = [300, 300]
+      graph.add(outer)
+
+      const inner = new LGraphGroup('inner')
+      inner.pos = [10, 10]
+      inner.size = [100, 100]
+      graph.add(inner)
+
+      // With maxDepth=1, inner group is added as child but not processed
+      outer.recomputeInsideNodes(1)
+
+      // outer should have inner as a child
+      expect(outer.children.has(inner)).toBe(true)
+      // inner should not have computed its own children (it was never processed)
+      expect(inner.children.size).toBe(0)
+    })
+  })
+})
diff --git a/src/lib/litegraph/src/LGraphGroup.ts b/src/lib/litegraph/src/LGraphGroup.ts
index 9e14cf277c..9fcd4985f9 100644
--- a/src/lib/litegraph/src/LGraphGroup.ts
+++ b/src/lib/litegraph/src/LGraphGroup.ts
@@ -18,6 +18,7 @@ import {
   containsCentre,
   containsRect,
   createBounds,
+  isInRect,
   isInRectangle,
   isPointInRect,
   snapPoint
@@ -241,8 +242,21 @@ export class LGraphGroup implements Positionable, IPinnable, IColorable {
     return this.pinned ? false : snapPoint(this.pos, snapTo)
   }
 
-  recomputeInsideNodes(): void {
+  /**
+   * Recomputes which items (nodes, reroutes, nested groups) are inside this group.
+   * Recursively processes nested groups to ensure their children are also computed.
+   * @param maxDepth Maximum recursion depth for nested groups. Use 1 to skip nested group computation.
+   * @param visited Set of already visited group IDs to prevent redundant computation.
+   */
+  recomputeInsideNodes(
+    maxDepth: number = 100,
+    visited: Set<number> = new Set()
+  ): void {
     if (!this.graph) throw new NullGraphError()
+    if (maxDepth <= 0 || visited.has(this.id)) return
+
+    visited.add(this.id)
+
     const { nodes, reroutes, groups } = this.graph
     const children = this._children
     this._nodes.length = 0
@@ -261,10 +275,16 @@ export class LGraphGroup implements Positionable, IPinnable, IColorable {
       if (isPointInRect(reroute.pos, this._bounding)) children.add(reroute)
     }
 
-    // Move groups we wholly contain
+    // Move groups we wholly contain and recursively compute their children
+    const containedGroups: LGraphGroup[] = []
     for (const group of groups) {
-      if (containsRect(this._bounding, group._bounding)) children.add(group)
+      if (group !== this && containsRect(this._bounding, group._bounding)) {
+        children.add(group)
+        containedGroups.push(group)
+      }
     }
+    for (const group of containedGroups)
+      group.recomputeInsideNodes(maxDepth - 1, visited)
 
     groups.sort((a, b) => {
       if (a === this) {
@@ -351,6 +371,8 @@ export class LGraphGroup implements Positionable, IPinnable, IColorable {
     )
   }
 
-  isPointInside = LGraphNode.prototype.isPointInside
+  isPointInside(x: number, y: number): boolean {
+    return isInRect(x, y, this.boundingRect)
+  }
   setDirtyCanvas = LGraphNode.prototype.setDirtyCanvas
 }
diff --git a/tests-ui/tests/litegraph/core/LGraphNode.resize.test.ts b/src/lib/litegraph/src/LGraphNode.resize.test.ts
similarity index 98%
rename from tests-ui/tests/litegraph/core/LGraphNode.resize.test.ts
rename to src/lib/litegraph/src/LGraphNode.resize.test.ts
index eb967fcabe..b3f971eed7 100644
--- a/tests-ui/tests/litegraph/core/LGraphNode.resize.test.ts
+++ b/src/lib/litegraph/src/LGraphNode.resize.test.ts
@@ -2,7 +2,7 @@ import { beforeEach, describe, expect } from 'vitest'
 
 import { LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph'
 
-import { test } from './fixtures/testExtensions'
+import { test } from './__fixtures__/testExtensions'
 
 describe('LGraphNode resize functionality', () => {
   let node: LGraphNode
diff --git a/tests-ui/tests/litegraph/core/LGraphNode.test.ts b/src/lib/litegraph/src/LGraphNode.test.ts
similarity index 93%
rename from tests-ui/tests/litegraph/core/LGraphNode.test.ts
rename to src/lib/litegraph/src/LGraphNode.test.ts
index a08a228f20..6ee5049a1c 100644
--- a/tests-ui/tests/litegraph/core/LGraphNode.test.ts
+++ b/src/lib/litegraph/src/LGraphNode.test.ts
@@ -1,3 +1,5 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { afterEach, beforeEach, describe, expect, vi } from 'vitest'
 
 import type {
@@ -13,7 +15,12 @@ import {
   NodeOutputSlot
 } from '@/lib/litegraph/src/litegraph'
 
-import { test } from './fixtures/testExtensions'
+import { test } from './__fixtures__/testExtensions'
+import { createMockLGraphNodeWithArrayBoundingRect } from '@/utils/__tests__/litegraphTestUtils'
+
+interface NodeConstructorWithSlotOffset {
+  slot_start_y?: number
+}
 
 function getMockISerialisedNode(
   data: Partial<ISerialisedNode>
@@ -37,8 +44,9 @@ describe('LGraphNode', () => {
   let origLiteGraph: typeof LiteGraph
 
   beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
     origLiteGraph = Object.assign({}, LiteGraph)
-    // @ts-expect-error TODO: Fix after merge - Classes property not in type
+    // @ts-expect-error Intended: Force remove an otherwise readonly non-optional property
     delete origLiteGraph.Classes
 
     Object.assign(LiteGraph, {
@@ -132,6 +140,13 @@ describe('LGraphNode', () => {
     expect(node.id).toEqual(1)
     expect(node.outputs.length).toEqual(1)
   })
+  test('should not allow configuring id to -1', () => {
+    const graph = new LGraph()
+    const node = new LGraphNode('TestNode')
+    graph.add(node)
+    node.configure(getMockISerialisedNode({ id: -1 }))
+    expect(node.id).not.toBe(-1)
+  })
 
   describe('Disconnect I/O Slots', () => {
     test('should disconnect input correctly', () => {
@@ -297,16 +312,10 @@ describe('LGraphNode', () => {
 
   describe('getInputPos and getOutputPos', () => {
     test('should handle collapsed nodes correctly', () => {
-      const node = new LGraphNode('TestNode') as unknown as Omit<
-        LGraphNode,
-        'boundingRect'
-      > & { boundingRect: Float64Array }
+      const node = createMockLGraphNodeWithArrayBoundingRect('TestNode')
       node.pos = [100, 100]
       node.size = [100, 100]
-      node.boundingRect[0] = 100
-      node.boundingRect[1] = 100
-      node.boundingRect[2] = 100
-      node.boundingRect[3] = 100
+      node.updateArea()
       node.configure(
         getMockISerialisedNode({
           id: 1,
@@ -366,16 +375,10 @@ describe('LGraphNode', () => {
     })
 
     test('should detect input slots correctly', () => {
-      const node = new LGraphNode('TestNode') as unknown as Omit<
-        LGraphNode,
-        'boundingRect'
-      > & { boundingRect: Float64Array }
+      const node = createMockLGraphNodeWithArrayBoundingRect('TestNode')
       node.pos = [100, 100]
       node.size = [100, 100]
-      node.boundingRect[0] = 100
-      node.boundingRect[1] = 100
-      node.boundingRect[2] = 200
-      node.boundingRect[3] = 200
+      node.updateArea()
       node.configure(
         getMockISerialisedNode({
           id: 1,
@@ -398,16 +401,10 @@ describe('LGraphNode', () => {
     })
 
     test('should detect output slots correctly', () => {
-      const node = new LGraphNode('TestNode') as unknown as Omit<
-        LGraphNode,
-        'boundingRect'
-      > & { boundingRect: Float64Array }
+      const node = createMockLGraphNodeWithArrayBoundingRect('TestNode')
       node.pos = [100, 100]
       node.size = [100, 100]
-      node.boundingRect[0] = 100
-      node.boundingRect[1] = 100
-      node.boundingRect[2] = 200
-      node.boundingRect[3] = 200
+      node.updateArea()
       node.configure(
         getMockISerialisedNode({
           id: 1,
@@ -431,16 +428,10 @@ describe('LGraphNode', () => {
     })
 
     test('should prioritize input slots over output slots', () => {
-      const node = new LGraphNode('TestNode') as unknown as Omit<
-        LGraphNode,
-        'boundingRect'
-      > & { boundingRect: Float64Array }
+      const node = createMockLGraphNodeWithArrayBoundingRect('TestNode')
       node.pos = [100, 100]
       node.size = [100, 100]
-      node.boundingRect[0] = 100
-      node.boundingRect[1] = 100
-      node.boundingRect[2] = 200
-      node.boundingRect[3] = 200
+      node.updateArea()
       node.configure(
         getMockISerialisedNode({
           id: 1,
@@ -632,7 +623,8 @@ describe('LGraphNode', () => {
       }
       node.inputs = [inputSlot, inputSlot2]
       const slotIndex = 0
-      const nodeOffsetY = (node.constructor as any).slot_start_y || 0
+      const nodeOffsetY =
+        (node.constructor as NodeConstructorWithSlotOffset).slot_start_y || 0
       const expectedY =
         200 + (slotIndex + 0.7) * LiteGraph.NODE_SLOT_HEIGHT + nodeOffsetY
       const expectedX = 100 + LiteGraph.NODE_SLOT_HEIGHT * 0.5
@@ -644,7 +636,7 @@ describe('LGraphNode', () => {
     })
 
     test('should return default vertical position including slot_start_y when defined', () => {
-      ;(node.constructor as any).slot_start_y = 25
+      ;(node.constructor as NodeConstructorWithSlotOffset).slot_start_y = 25
       node.flags.collapsed = false
       node.inputs = [inputSlot]
       const slotIndex = 0
@@ -653,7 +645,7 @@ describe('LGraphNode', () => {
         200 + (slotIndex + 0.7) * LiteGraph.NODE_SLOT_HEIGHT + nodeOffsetY
       const expectedX = 100 + LiteGraph.NODE_SLOT_HEIGHT * 0.5
       expect(node.getInputSlotPos(inputSlot)).toEqual([expectedX, expectedY])
-      delete (node.constructor as any).slot_start_y
+      delete (node.constructor as NodeConstructorWithSlotOffset).slot_start_y
     })
     test('should not overwrite onMouseDown prototype', () => {
       expect(Object.prototype.hasOwnProperty.call(node, 'onMouseDown')).toEqual(
diff --git a/tests-ui/tests/litegraph/core/LGraphNode.titleButtons.test.ts b/src/lib/litegraph/src/LGraphNode.titleButtons.test.ts
similarity index 89%
rename from tests-ui/tests/litegraph/core/LGraphNode.titleButtons.test.ts
rename to src/lib/litegraph/src/LGraphNode.titleButtons.test.ts
index 6599d6562a..f2fa8c1837 100644
--- a/tests-ui/tests/litegraph/core/LGraphNode.titleButtons.test.ts
+++ b/src/lib/litegraph/src/LGraphNode.titleButtons.test.ts
@@ -1,8 +1,7 @@
 import { describe, expect, it, vi } from 'vitest'
 
-import { LGraphButton } from '@/lib/litegraph/src/litegraph'
 import type { LGraphCanvas } from '@/lib/litegraph/src/litegraph'
-import { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import { LGraphButton, LGraphNode } from '@/lib/litegraph/src/litegraph'
 
 describe('LGraphNode Title Buttons', () => {
   describe('addTitleButton', () => {
@@ -36,11 +35,10 @@ describe('LGraphNode Title Buttons', () => {
       expect(node.title_buttons[2]).toBe(button3)
     })
 
-    it('should create buttons with default options', () => {
+    it('should create buttons with minimal options', () => {
       const node = new LGraphNode('Test Node')
 
-      // @ts-expect-error TODO: Fix after merge - addTitleButton type issues
-      const button = node.addTitleButton({})
+      const button = node.addTitleButton({ text: '' })
 
       expect(button).toBeInstanceOf(LGraphButton)
       expect(button.name).toBeUndefined()
@@ -56,9 +54,7 @@ describe('LGraphNode Title Buttons', () => {
 
       const button = node.addTitleButton({
         name: 'close_button',
-        text: 'X',
-        // @ts-expect-error TODO: Fix after merge - visible property not defined in type
-        visible: true
+        text: 'X'
       })
 
       // Mock button methods
@@ -69,7 +65,7 @@ describe('LGraphNode Title Buttons', () => {
       const canvas = {
         ctx: {} as CanvasRenderingContext2D,
         dispatch: vi.fn()
-      } as unknown as LGraphCanvas
+      } as Partial<LGraphCanvas> as LGraphCanvas
 
       // Mock the node's onTitleButtonClick method to verify it gets called
       const onTitleButtonClickSpy = vi.spyOn(node, 'onTitleButtonClick')
@@ -113,9 +109,7 @@ describe('LGraphNode Title Buttons', () => {
 
       const button = node.addTitleButton({
         name: 'test_button',
-        text: 'T',
-        // @ts-expect-error TODO: Fix after merge - visible property not defined in type
-        visible: true
+        text: 'T'
       })
 
       button.getWidth = vi.fn().mockReturnValue(20)
@@ -125,7 +119,7 @@ describe('LGraphNode Title Buttons', () => {
       const canvas = {
         ctx: {} as CanvasRenderingContext2D,
         dispatch: vi.fn()
-      } as unknown as LGraphCanvas
+      } as Partial<LGraphCanvas> as LGraphCanvas
 
       // Calculate node-relative position
       const clickPosRelativeToNode: [number, number] = [
@@ -165,16 +159,12 @@ describe('LGraphNode Title Buttons', () => {
 
       const button1 = node.addTitleButton({
         name: 'button1',
-        text: 'A',
-        // @ts-expect-error TODO: Fix after merge - visible property not defined in type
-        visible: true
+        text: 'A'
       })
 
       const button2 = node.addTitleButton({
         name: 'button2',
-        text: 'B',
-        // @ts-expect-error TODO: Fix after merge - visible property not defined in type
-        visible: true
+        text: 'B'
       })
 
       // Mock button methods
@@ -187,7 +177,7 @@ describe('LGraphNode Title Buttons', () => {
       const canvas = {
         ctx: {} as CanvasRenderingContext2D,
         dispatch: vi.fn()
-      } as unknown as LGraphCanvas
+      } as Partial<LGraphCanvas> as LGraphCanvas
 
       // Mock the node's onTitleButtonClick method
       const onTitleButtonClickSpy = vi.spyOn(node, 'onTitleButtonClick')
@@ -252,7 +242,7 @@ describe('LGraphNode Title Buttons', () => {
       const canvas = {
         ctx: {} as CanvasRenderingContext2D,
         dispatch: vi.fn()
-      } as unknown as LGraphCanvas
+      } as Partial<LGraphCanvas> as LGraphCanvas
 
       // Mock the node's onTitleButtonClick method
       const onTitleButtonClickSpy = vi.spyOn(node, 'onTitleButtonClick')
@@ -298,12 +288,11 @@ describe('LGraphNode Title Buttons', () => {
   describe('onTitleButtonClick', () => {
     it('should dispatch litegraph:node-title-button-clicked event', () => {
       const node = new LGraphNode('Test Node')
-      // @ts-expect-error TODO: Fix after merge - LGraphButton constructor type issues
-      const button = new LGraphButton({ name: 'test_button' })
+      const button = new LGraphButton({ name: 'test_button', text: 'X' })
 
       const canvas = {
         dispatch: vi.fn()
-      } as unknown as LGraphCanvas
+      } as Partial<LGraphCanvas> as LGraphCanvas
 
       node.onTitleButtonClick(button, canvas)
 
diff --git a/src/lib/litegraph/src/LGraphNode.ts b/src/lib/litegraph/src/LGraphNode.ts
index 036bc56607..99eb1c14d5 100644
--- a/src/lib/litegraph/src/LGraphNode.ts
+++ b/src/lib/litegraph/src/LGraphNode.ts
@@ -1,8 +1,8 @@
+import { toValue } from 'vue'
+
 import { LGraphNodeProperties } from '@/lib/litegraph/src/LGraphNodeProperties'
 import {
-  calculateInputSlotPos,
   calculateInputSlotPosFromSlot,
-  calculateOutputSlotPos,
   getSlotPosition
 } from '@/renderer/core/canvas/litegraph/slotCalculations'
 import type { SlotPositionContext } from '@/renderer/core/canvas/litegraph/slotCalculations'
@@ -10,7 +10,11 @@ import { useLayoutMutations } from '@/renderer/core/layout/operations/layoutMuta
 import { LayoutSource } from '@/renderer/core/layout/types'
 import { adjustColor } from '@/utils/colorUtil'
 import type { ColorAdjustOptions } from '@/utils/colorUtil'
-import { commonType, toClass } from '@/lib/litegraph/src/utils/type'
+import {
+  commonType,
+  isNodeBindable,
+  toClass
+} from '@/lib/litegraph/src/utils/type'
 
 import { SUBGRAPH_OUTPUT_ID } from '@/lib/litegraph/src/constants'
 import type { DragAndScale } from './DragAndScale'
@@ -41,6 +45,7 @@ import type {
   INodeSlotContextItem,
   IPinnable,
   ISlotType,
+  Panel,
   Point,
   Positionable,
   ReadOnlyRect,
@@ -96,9 +101,12 @@ export type NodeId = number | string
 export type NodeProperty = string | number | boolean | object
 
 interface INodePropertyInfo {
-  name: string
+  name?: string
   type?: string
-  default_value: NodeProperty | undefined
+  default_value?: NodeProperty
+  widget?: string
+  label?: string
+  values?: TWidgetValue[]
 }
 
 interface IMouseOverData {
@@ -231,6 +239,14 @@ export class LGraphNode
   static description?: string
   static filter?: string
   static skip_list?: boolean
+  static nodeData?: {
+    dev_only?: boolean
+    deprecated?: boolean
+    experimental?: boolean
+    output_node?: boolean
+    api_node?: boolean
+    name?: string
+  }
 
   static resizeHandleSize = 15
   static resizeEdgeSize = 5
@@ -261,8 +277,8 @@ export class LGraphNode
   inputs: INodeInputSlot[] = []
   outputs: INodeOutputSlot[] = []
 
-  #concreteInputs: NodeInputSlot[] = []
-  #concreteOutputs: NodeOutputSlot[] = []
+  private _concreteInputs: NodeInputSlot[] = []
+  private _concreteOutputs: NodeOutputSlot[] = []
 
   properties: Dictionary<NodeProperty | undefined> = {}
   properties_info: INodePropertyInfo[] = []
@@ -381,6 +397,10 @@ export class LGraphNode
   action_call?: string
   execute_triggered?: number
   action_triggered?: number
+  /**
+   * @deprecated This property is unsupported and will be removed in a future release.
+   * Use `widgets_start_y` or a custom `arrange()` override instead.
+   */
   widgets_up?: boolean
   widgets_start_y?: number
   lostFocusAt?: number
@@ -426,24 +446,24 @@ export class LGraphNode
   }
 
   /** @inheritdoc {@link renderArea} */
-  #renderArea = new Rectangle()
+  private _renderArea = new Rectangle()
   /**
    * Rect describing the node area, including shadows and any protrusions.
    * Determines if the node is visible.  Calculated once at the start of every frame.
    */
   get renderArea(): ReadOnlyRect {
-    return this.#renderArea
+    return this._renderArea
   }
 
   /** @inheritdoc {@link boundingRect} */
-  #boundingRect: Rectangle = new Rectangle()
+  private _boundingRect: Rectangle = new Rectangle()
   /**
    * Cached node position & area as `x, y, width, height`.  Includes changes made by {@link onBounding}, if present.
    *
    * Determines the node hitbox and other rendering effects.  Calculated once at the start of every frame.
    */
   get boundingRect(): ReadOnlyRectangle {
-    return this.#boundingRect
+    return this._boundingRect
   }
 
   /** The offset from {@link pos} to the top-left of {@link boundingRect}. */
@@ -470,6 +490,17 @@ export class LGraphNode
 
     this._pos[0] = value[0]
     this._pos[1] = value[1]
+
+    const mutations = useLayoutMutations()
+    mutations.setSource(LayoutSource.Canvas)
+    mutations.moveNode(String(this.id), { x: value[0], y: value[1] })
+  }
+
+  /**
+   * Set the node position to an absolute location.
+   */
+  setPos(x: number, y: number): void {
+    this.pos = [x, y]
   }
 
   public get size() {
@@ -481,6 +512,13 @@ export class LGraphNode
 
     this._size[0] = value[0]
     this._size[1] = value[1]
+
+    const mutations = useLayoutMutations()
+    mutations.setSource(LayoutSource.Canvas)
+    mutations.resizeNode(String(this.id), {
+      width: value[0],
+      height: value[1]
+    })
   }
 
   /**
@@ -579,11 +617,11 @@ export class LGraphNode
   onInputAdded?(this: LGraphNode, input: INodeInputSlot): void
   onOutputAdded?(this: LGraphNode, output: INodeOutputSlot): void
   onConfigure?(this: LGraphNode, serialisedNode: ISerialisedNode): void
-  onSerialize?(this: LGraphNode, serialised: ISerialisedNode): any
+  onSerialize?(this: LGraphNode, serialised: ISerialisedNode): void
   onExecute?(
     this: LGraphNode,
     param?: unknown,
-    options?: { action_call?: any }
+    options?: { action_call?: string }
   ): void
   onAction?(
     this: LGraphNode,
@@ -606,8 +644,8 @@ export class LGraphNode
     target_slot: number,
     requested_slot?: number | string
   ): number | false | null
-  onShowCustomPanelInfo?(this: LGraphNode, panel: any): void
-  onAddPropertyToPanel?(this: LGraphNode, pName: string, panel: any): boolean
+  onShowCustomPanelInfo?(this: LGraphNode, panel: Panel): void
+  onAddPropertyToPanel?(this: LGraphNode, pName: string, panel: Panel): boolean
   onWidgetChanged?(
     this: LGraphNode,
     name: string,
@@ -655,10 +693,10 @@ export class LGraphNode
   onDropData?(
     this: LGraphNode,
     data: string | ArrayBuffer,
-    filename: any,
-    file: any
+    filename: string,
+    file: File
   ): void
-  onDropFile?(this: LGraphNode, file: any): void
+  onDropFile?(this: LGraphNode, file: File): void
   onInputClick?(this: LGraphNode, index: number, e: CanvasPointerEvent): void
   onInputDblClick?(this: LGraphNode, index: number, e: CanvasPointerEvent): void
   onOutputClick?(this: LGraphNode, index: number, e: CanvasPointerEvent): void
@@ -667,8 +705,7 @@ export class LGraphNode
     index: number,
     e: CanvasPointerEvent
   ): void
-  // TODO: Return type
-  onGetPropertyInfo?(this: LGraphNode, property: string): any
+  onGetPropertyInfo?(this: LGraphNode, property: string): INodePropertyInfo
   onNodeOutputAdd?(this: LGraphNode, value: unknown): void
   onNodeInputAdd?(this: LGraphNode, value: unknown): void
   onMenuNodeInputs?(
@@ -679,7 +716,12 @@ export class LGraphNode
     this: LGraphNode,
     entries: (IContextMenuValue<INodeSlotContextItem> | null)[]
   ): (IContextMenuValue<INodeSlotContextItem> | null)[]
-  onMouseUp?(this: LGraphNode, e: CanvasPointerEvent, pos: Point): void
+  onMouseUp?(
+    this: LGraphNode,
+    e: CanvasPointerEvent,
+    pos: Point,
+    canvas: LGraphCanvas
+  ): void
   onMouseEnter?(this: LGraphNode, e: CanvasPointerEvent): void
   /** Blocks drag if return value is truthy. @param pos Offset from {@link LGraphNode.pos}. */
   onMouseDown?(
@@ -725,7 +767,7 @@ export class LGraphNode
     title_height: number,
     size: Size,
     scale: number,
-    fgcolor: any
+    fgcolor: string
   ): void
   onRemoved?(this: LGraphNode): void
   onMouseMove?(
@@ -737,7 +779,9 @@ export class LGraphNode
   onPropertyChange?(this: LGraphNode): void
   updateOutputData?(this: LGraphNode, origin_slot: number): void
 
-  #getErrorStrokeStyle(this: LGraphNode): IDrawBoundingOptions | undefined {
+  private _getErrorStrokeStyle(
+    this: LGraphNode
+  ): IDrawBoundingOptions | undefined {
     if (this.has_errors) {
       return {
         padding: 12,
@@ -747,7 +791,9 @@ export class LGraphNode
     }
   }
 
-  #getSelectedStrokeStyle(this: LGraphNode): IDrawBoundingOptions | undefined {
+  private _getSelectedStrokeStyle(
+    this: LGraphNode
+  ): IDrawBoundingOptions | undefined {
     if (this.selected) {
       return {
         padding: this.has_errors ? 20 : undefined
@@ -762,8 +808,8 @@ export class LGraphNode
     this.size = [LiteGraph.NODE_WIDTH, 60]
     this.pos = [10, 10]
     this.strokeStyles = {
-      error: this.#getErrorStrokeStyle,
-      selected: this.#getSelectedStrokeStyle
+      error: this._getErrorStrokeStyle,
+      selected: this._getSelectedStrokeStyle
     }
     // Initialize property manager with tracked properties
     this.changeTracker = new LGraphNodeProperties(this)
@@ -779,6 +825,7 @@ export class LGraphNode
     if (this.graph) {
       this.graph._version++
     }
+    if (info.id === -1) info.id = this.id
     for (const j in info) {
       if (j == 'properties') {
         // i don't want to clone properties, I want to reuse the old container
@@ -872,6 +919,14 @@ export class LGraphNode
     // Sync the state of this.resizable.
     if (this.pinned) this.resizable = false
 
+    if (this.widgets_up) {
+      console.warn(
+        `[LiteGraph] Node type "${this.type}" uses deprecated property "widgets_up". ` +
+          'This property is unsupported and will be removed. ' +
+          'Use "widgets_start_y" or a custom arrange() override instead.'
+      )
+    }
+
     this.onConfigure?.(info)
   }
 
@@ -910,8 +965,12 @@ export class LGraphNode
       o.widgets_values = []
       for (const [i, widget] of widgets.entries()) {
         if (widget.serialize === false) continue
-        // @ts-expect-error #595 No-null
-        o.widgets_values[i] = widget ? widget.value : null
+        const val = widget?.value
+        // Ensure object values are plain (not reactive proxies) for structuredClone compatibility.
+        o.widgets_values[i] =
+          val != null && typeof val === 'object'
+            ? JSON.parse(JSON.stringify(val))
+            : (val ?? null)
       }
     }
 
@@ -1296,7 +1355,7 @@ export class LGraphNode
     return trigS
   }
 
-  onAfterExecuteNode(param: unknown, options?: { action_call?: any }) {
+  onAfterExecuteNode(param: unknown, options?: { action_call?: string }) {
     const trigS = this.findOutputSlot('onExecuted')
     if (trigS != -1) {
       this.triggerSlot(trigS, param, null, options)
@@ -1334,7 +1393,7 @@ export class LGraphNode
   /**
    * Triggers the node code execution, place a boolean/counter to mark the node as being executed
    */
-  doExecute(param?: unknown, options?: { action_call?: any }): void {
+  doExecute(param?: unknown, options?: { action_call?: string }): void {
     options = options || {}
     if (this.onExecute) {
       // enable this to give the event an ID
@@ -1400,7 +1459,7 @@ export class LGraphNode
   trigger(
     action: string,
     param: unknown,
-    options: { action_call?: any }
+    options: { action_call?: string }
   ): void {
     const { outputs } = this
     if (!outputs || !outputs.length) {
@@ -1430,7 +1489,7 @@ export class LGraphNode
     slot: number,
     param: unknown,
     link_id: number | null,
-    options?: { action_call?: any }
+    options?: { action_call?: string }
   ): void {
     options = options || {}
     if (!this.outputs) return
@@ -1924,6 +1983,14 @@ export class LGraphNode
     this.widgets ||= []
     const widget = toConcreteWidget(custom_widget, this, false) ?? custom_widget
     this.widgets.push(widget)
+
+    // Only register with store if node has a valid ID (is already in a graph).
+    // If the node isn't in a graph yet (id === -1), registration happens
+    // when the node is added via LGraph.add() -> node.onAdded.
+    if (this.id !== -1 && isNodeBindable(widget)) {
+      widget.setNodeId(this.id)
+    }
+
     return widget
   }
 
@@ -1987,8 +2054,7 @@ export class LGraphNode
       return
     }
 
-    this.pos[0] += deltaX
-    this.pos[1] += deltaY
+    this.pos = [this._pos[0] + deltaX, this._pos[1] + deltaY]
   }
 
   /**
@@ -2050,11 +2116,11 @@ export class LGraphNode
    * Called automatically at the start of every frame.
    */
   updateArea(ctx?: CanvasRenderingContext2D): void {
-    const bounds = this.#boundingRect
+    const bounds = this._boundingRect
     this.measure(bounds, ctx)
     this.onBounding?.(bounds)
 
-    const renderArea = this.#renderArea
+    const renderArea = this._renderArea
     renderArea.set(bounds)
     // 4 offset for collapsed node connection points
     renderArea[0] -= 4
@@ -2069,7 +2135,13 @@ export class LGraphNode
    * checks if a point is inside the shape of a node
    */
   isPointInside(x: number, y: number): boolean {
-    return isInRect(x, y, this.boundingRect)
+    if (isInRect(x, y, this.boundingRect)) return true
+
+    for (const badge of this.badges.map(toValue).filter((b) => b.onClick)) {
+      if (isInRect(x - this.pos[0], y - this.pos[1], badge.boundingRect))
+        return true
+    }
+    return false
   }
 
   /**
@@ -2270,7 +2342,7 @@ export class LGraphNode
     optsIn?: FindFreeSlotOptions & { returnObj?: TReturn }
   ): INodeInputSlot | -1
   findInputSlotFree(optsIn?: FindFreeSlotOptions) {
-    return this.#findFreeSlot(this.inputs, optsIn)
+    return this._findFreeSlot(this.inputs, optsIn)
   }
 
   /**
@@ -2285,14 +2357,14 @@ export class LGraphNode
     optsIn?: FindFreeSlotOptions & { returnObj?: TReturn }
   ): INodeOutputSlot | -1
   findOutputSlotFree(optsIn?: FindFreeSlotOptions) {
-    return this.#findFreeSlot(this.outputs, optsIn)
+    return this._findFreeSlot(this.outputs, optsIn)
   }
 
   /**
    * Finds the next free slot
    * @param slots The slots to search, i.e. this.inputs or this.outputs
    */
-  #findFreeSlot<TSlot extends INodeInputSlot | INodeOutputSlot>(
+  private _findFreeSlot<TSlot extends INodeInputSlot | INodeOutputSlot>(
     slots: TSlot[],
     options?: FindFreeSlotOptions
   ): TSlot | number {
@@ -2334,7 +2406,7 @@ export class LGraphNode
     preferFreeSlot?: boolean,
     doNotUseOccupied?: boolean
   ) {
-    return this.#findSlotByType(
+    return this._findSlotByType(
       this.inputs,
       type,
       returnObj,
@@ -2364,7 +2436,7 @@ export class LGraphNode
     preferFreeSlot?: boolean,
     doNotUseOccupied?: boolean
   ) {
-    return this.#findSlotByType(
+    return this._findSlotByType(
       this.outputs,
       type,
       returnObj,
@@ -2410,14 +2482,14 @@ export class LGraphNode
     doNotUseOccupied?: boolean
   ): number | INodeOutputSlot | INodeInputSlot {
     return input
-      ? this.#findSlotByType(
+      ? this._findSlotByType(
           this.inputs,
           type,
           returnObj,
           preferFreeSlot,
           doNotUseOccupied
         )
-      : this.#findSlotByType(
+      : this._findSlotByType(
           this.outputs,
           type,
           returnObj,
@@ -2438,7 +2510,7 @@ export class LGraphNode
    * @see {findInputSlotByType}
    * @returns If a match is found, the slot if returnObj is true, otherwise the index.  If no matches are found, -1
    */
-  #findSlotByType<TSlot extends INodeInputSlot | INodeOutputSlot>(
+  private _findSlotByType<TSlot extends INodeInputSlot | INodeOutputSlot>(
     slots: TSlot[],
     type: ISlotType,
     returnObj?: boolean,
@@ -2769,8 +2841,7 @@ export class LGraphNode
         !LiteGraph.allow_multi_output_for_events
       ) {
         graph.beforeChange()
-        // @ts-expect-error Unused param
-        this.disconnectOutput(slot, false, { doProcessChange: false })
+        this.disconnectOutput(slot)
       }
     }
 
@@ -3288,8 +3359,8 @@ export class LGraphNode
     // default vertical slots
     const offset = LiteGraph.NODE_SLOT_HEIGHT * 0.5
     const slotIndex = is_input
-      ? this.#defaultVerticalInputs.indexOf(this.inputs[slot_number])
-      : this.#defaultVerticalOutputs.indexOf(this.outputs[slot_number])
+      ? this._defaultVerticalInputs.indexOf(this.inputs[slot_number])
+      : this._defaultVerticalOutputs.indexOf(this.outputs[slot_number])
 
     out[0] = is_input ? nodeX + offset : nodeX + this.size[0] + 1 - offset
     out[1] =
@@ -3302,7 +3373,7 @@ export class LGraphNode
   /**
    * @internal The inputs that are not positioned with absolute coordinates.
    */
-  get #defaultVerticalInputs() {
+  private get _defaultVerticalInputs() {
     return this.inputs.filter(
       (slot) => !slot.pos && !(this.widgets?.length && isWidgetInputSlot(slot))
     )
@@ -3311,7 +3382,7 @@ export class LGraphNode
   /**
    * @internal The outputs that are not positioned with absolute coordinates.
    */
-  get #defaultVerticalOutputs() {
+  private get _defaultVerticalOutputs() {
     return this.outputs.filter((slot: INodeOutputSlot) => !slot.pos)
   }
 
@@ -3319,7 +3390,7 @@ export class LGraphNode
    * Get the context needed for slot position calculations
    * @internal
    */
-  #getSlotPositionContext(): SlotPositionContext {
+  private _getSlotPositionContext(): SlotPositionContext {
     return {
       nodeX: this.pos[0],
       nodeY: this.pos[1],
@@ -3342,7 +3413,7 @@ export class LGraphNode
    * @returns Position of the input slot
    */
   getInputPos(slot: number): Point {
-    return calculateInputSlotPos(this.#getSlotPositionContext(), slot)
+    return getSlotPosition(this, slot, true)
   }
 
   /**
@@ -3351,7 +3422,7 @@ export class LGraphNode
    * @returns Position of the centre of the input slot in graph co-ordinates.
    */
   getInputSlotPos(input: INodeInputSlot): Point {
-    return calculateInputSlotPosFromSlot(this.#getSlotPositionContext(), input)
+    return calculateInputSlotPosFromSlot(this._getSlotPositionContext(), input)
   }
 
   /**
@@ -3362,10 +3433,7 @@ export class LGraphNode
    * @returns Position of the output slot
    */
   getOutputPos(outputSlotIndex: number): Point {
-    return calculateOutputSlotPos(
-      this.#getSlotPositionContext(),
-      outputSlotIndex
-    )
+    return getSlotPosition(this, outputSlotIndex, false)
   }
 
   /**
@@ -3464,7 +3532,7 @@ export class LGraphNode
    * Toggles advanced mode of the node, showing advanced widgets
    */
   toggleAdvanced() {
-    if (!this.widgets?.some((w) => w.advanced)) return
+    if (!this.hasAdvancedWidgets()) return
     if (!this.graph) throw new NullGraphError()
     this.graph._version++
     this.showAdvanced = !this.showAdvanced
@@ -3842,6 +3910,21 @@ export class LGraphNode
     return !isHidden
   }
 
+  /**
+   * Returns all widgets that should participate in layout calculations.
+   * Filters out hidden widgets only (not collapsed/advanced).
+   */
+  getLayoutWidgets(): IBaseWidget[] {
+    return this.widgets?.filter((w) => !w.hidden) ?? []
+  }
+
+  /**
+   * Returns `true` if the node has any advanced widgets.
+   */
+  hasAdvancedWidgets(): boolean {
+    return this.widgets?.some((w) => w.advanced) ?? false
+  }
+
   updateComputedDisabled() {
     if (!this.widgets) return
     for (const widget of this.widgets)
@@ -3897,13 +3980,13 @@ export class LGraphNode
    */
   drawCollapsedSlots(ctx: CanvasRenderingContext2D): void {
     // Render the first connected slot only.
-    for (const slot of this.#concreteInputs) {
+    for (const slot of this._concreteInputs) {
       if (slot.link != null) {
         slot.drawCollapsed(ctx)
         break
       }
     }
-    for (const slot of this.#concreteOutputs) {
+    for (const slot of this._concreteOutputs) {
       if (slot.links?.length) {
         slot.drawCollapsed(ctx)
         break
@@ -3915,7 +3998,7 @@ export class LGraphNode
     return [...this.inputs, ...this.outputs]
   }
 
-  #measureSlot(
+  private _measureSlot(
     slot: NodeInputSlot | NodeOutputSlot,
     slotIndex: number,
     isInput: boolean
@@ -3932,27 +4015,27 @@ export class LGraphNode
     slot.boundingRect[3] = LiteGraph.NODE_SLOT_HEIGHT
   }
 
-  #measureSlots(): ReadOnlyRect | null {
+  private _measureSlots(): ReadOnlyRect | null {
     const slots: (NodeInputSlot | NodeOutputSlot)[] = []
 
-    for (const [slotIndex, slot] of this.#concreteInputs.entries()) {
+    for (const [slotIndex, slot] of this._concreteInputs.entries()) {
       // Unrecognized nodes (Nodes with error) has inputs but no widgets. Treat
       // converted inputs as normal inputs.
       /** Widget input slots are handled in {@link layoutWidgetInputSlots} */
       if (this.widgets?.length && isWidgetInputSlot(slot)) continue
 
-      this.#measureSlot(slot, slotIndex, true)
+      this._measureSlot(slot, slotIndex, true)
       slots.push(slot)
     }
-    for (const [slotIndex, slot] of this.#concreteOutputs.entries()) {
-      this.#measureSlot(slot, slotIndex, false)
+    for (const [slotIndex, slot] of this._concreteOutputs.entries()) {
+      this._measureSlot(slot, slotIndex, false)
       slots.push(slot)
     }
 
     return slots.length ? createBounds(slots, 0) : null
   }
 
-  #getMouseOverSlot(slot: INodeSlot): INodeSlot | null {
+  private _getMouseOverSlot(slot: INodeSlot): INodeSlot | null {
     const isInput = isINodeInputSlot(slot)
     const mouseOverId = this.mouseOver?.[isInput ? 'inputId' : 'outputId'] ?? -1
     if (mouseOverId === -1) {
@@ -3961,11 +4044,11 @@ export class LGraphNode
     return isInput ? this.inputs[mouseOverId] : this.outputs[mouseOverId]
   }
 
-  #isMouseOverSlot(slot: INodeSlot): boolean {
-    return this.#getMouseOverSlot(slot) === slot
+  private _isMouseOverSlot(slot: INodeSlot): boolean {
+    return this._getMouseOverSlot(slot) === slot
   }
 
-  #isMouseOverWidget(widget: IBaseWidget | undefined): boolean {
+  private _isMouseOverWidget(widget: IBaseWidget | undefined): boolean {
     if (!widget) return false
     return this.mouseOver?.overWidget === widget
   }
@@ -3997,9 +4080,9 @@ export class LGraphNode
     ctx: CanvasRenderingContext2D,
     { fromSlot, colorContext, editorAlpha, lowQuality }: DrawSlotsOptions
   ) {
-    for (const slot of [...this.#concreteInputs, ...this.#concreteOutputs]) {
+    for (const slot of [...this._concreteInputs, ...this._concreteOutputs]) {
       const isValidTarget = fromSlot && slot.isValidTarget(fromSlot)
-      const isMouseOverSlot = this.#isMouseOverSlot(slot)
+      const isMouseOverSlot = this._isMouseOverSlot(slot)
 
       // change opacity of incompatible slots when dragging a connection
       const isValid = !fromSlot || isValidTarget
@@ -4014,7 +4097,7 @@ export class LGraphNode
         isMouseOverSlot ||
         isValidTarget ||
         !slot.isWidgetInputSlot ||
-        this.#isMouseOverWidget(this.getWidgetFromSlot(slot)) ||
+        this._isMouseOverWidget(this.getWidgetFromSlot(slot)) ||
         slot.isConnected ||
         slot.alwaysVisible
       ) {
@@ -4035,7 +4118,7 @@ export class LGraphNode
    * -  {@link IBaseWidget.y}
    * @param widgetStartY The y-coordinate of the first widget
    */
-  #arrangeWidgets(widgetStartY: number): void {
+  private _arrangeWidgets(widgetStartY: number): void {
     if (!this.widgets || !this.widgets.length) return
 
     const bodyHeight = this.bodyHeight
@@ -4052,7 +4135,7 @@ export class LGraphNode
       w: IBaseWidget
     }[] = []
 
-    const visibleWidgets = this.widgets.filter((w) => !w.hidden)
+    const visibleWidgets = this.getLayoutWidgets()
 
     for (const w of visibleWidgets) {
       if (w.computeSize) {
@@ -4104,7 +4187,12 @@ export class LGraphNode
     // Ref: https://github.com/Comfy-Org/ComfyUI_frontend/issues/2652
     // TODO: Move the layout logic before drawing of the node shape, so we don't
     // need to trigger extra round of rendering.
-    if (y > bodyHeight) {
+    // In Vue mode, the DOM is the source of truth for node sizing — the
+    // ResizeObserver feeds measurements back to the layout store.  Allowing
+    // LiteGraph to also call setSize() here creates an infinite feedback loop
+    // (LG grows node → CSS min-height increases → textarea fills extra space →
+    // ResizeObserver reports larger size → LG grows node again).
+    if (!LiteGraph.vueNodesMode && y > bodyHeight) {
       this.setSize([this.size[0], y])
       this.graph.setDirtyCanvas(false, true)
     }
@@ -4113,7 +4201,7 @@ export class LGraphNode
   /**
    * Arranges the layout of the node's widget input slots.
    */
-  #arrangeWidgetInputSlots(): void {
+  private _arrangeWidgetInputSlots(): void {
     if (!this.widgets) return
 
     const slotByWidgetName = new Map<
@@ -4135,10 +4223,10 @@ export class LGraphNode
         const slot = slotByWidgetName.get(widget.name)
         if (!slot) continue
 
-        const actualSlot = this.#concreteInputs[slot.index]
+        const actualSlot = this._concreteInputs[slot.index]
         const offset = LiteGraph.NODE_SLOT_HEIGHT * 0.5
         actualSlot.pos = [offset, widget.y + offset]
-        this.#measureSlot(actualSlot, slot.index, true)
+        this._measureSlot(actualSlot, slot.index, true)
       }
     } else {
       // For Vue positioning, just measure the slots without setting pos
@@ -4146,7 +4234,7 @@ export class LGraphNode
         const slot = slotByWidgetName.get(widget.name)
         if (!slot) continue
 
-        this.#measureSlot(this.#concreteInputs[slot.index], slot.index, true)
+        this._measureSlot(this._concreteInputs[slot.index], slot.index, true)
       }
     }
   }
@@ -4159,10 +4247,10 @@ export class LGraphNode
    * have been removed from the ecosystem.
    */
   _setConcreteSlots(): void {
-    this.#concreteInputs = this.inputs.map((slot) =>
+    this._concreteInputs = this.inputs.map((slot) =>
       toClass(NodeInputSlot, slot, this)
     )
-    this.#concreteOutputs = this.outputs.map((slot) =>
+    this._concreteOutputs = this.outputs.map((slot) =>
       toClass(NodeOutputSlot, slot, this)
     )
   }
@@ -4171,12 +4259,12 @@ export class LGraphNode
    * Arranges node elements in preparation for rendering (slots & widgets).
    */
   arrange(): void {
-    const slotsBounds = this.#measureSlots()
+    const slotsBounds = this._measureSlots()
     const widgetStartY = slotsBounds
       ? slotsBounds[1] + slotsBounds[3] - this.pos[1]
       : 0
-    this.#arrangeWidgets(widgetStartY)
-    this.#arrangeWidgetInputSlots()
+    this._arrangeWidgets(widgetStartY)
+    this._arrangeWidgetInputSlots()
   }
 
   /**
diff --git a/tests-ui/tests/litegraph/core/LGraphNode.widgetOrder.test.ts b/src/lib/litegraph/src/LGraphNode.widgetOrder.test.ts
similarity index 97%
rename from tests-ui/tests/litegraph/core/LGraphNode.widgetOrder.test.ts
rename to src/lib/litegraph/src/LGraphNode.widgetOrder.test.ts
index 21f7a7cd8b..4e7b8f44ef 100644
--- a/tests-ui/tests/litegraph/core/LGraphNode.widgetOrder.test.ts
+++ b/src/lib/litegraph/src/LGraphNode.widgetOrder.test.ts
@@ -1,3 +1,5 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it } from 'vitest'
 
 import { LGraphNode } from '@/lib/litegraph/src/litegraph'
@@ -8,6 +10,7 @@ describe('LGraphNode widget ordering', () => {
   let node: LGraphNode
 
   beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
     node = new LGraphNode('TestNode')
   })
 
diff --git a/tests-ui/tests/litegraph/core/LGraphNodeProperties.test.ts b/src/lib/litegraph/src/LGraphNodeProperties.test.ts
similarity index 92%
rename from tests-ui/tests/litegraph/core/LGraphNodeProperties.test.ts
rename to src/lib/litegraph/src/LGraphNodeProperties.test.ts
index aca6fe391e..1c523945cc 100644
--- a/tests-ui/tests/litegraph/core/LGraphNodeProperties.test.ts
+++ b/src/lib/litegraph/src/LGraphNodeProperties.test.ts
@@ -1,22 +1,25 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { beforeEach, describe, expect, it } from 'vitest'
 
 import { LGraphNodeProperties } from '@/lib/litegraph/src/LGraphNodeProperties'
+import type { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph'
+import {
+  createMockLGraph,
+  createMockLGraphNode
+} from '@/utils/__tests__/litegraphTestUtils'
 
 describe('LGraphNodeProperties', () => {
-  let mockNode: any
-  let mockGraph: any
+  let mockNode: LGraphNode
+  let mockGraph: LGraph
 
   beforeEach(() => {
-    mockGraph = {
-      trigger: vi.fn()
-    }
+    mockGraph = createMockLGraph()
 
-    mockNode = {
+    mockNode = createMockLGraphNode({
       id: 123,
       title: 'Test Node',
       flags: {},
       graph: mockGraph
-    }
+    })
   })
 
   describe('property tracking', () => {
diff --git a/src/lib/litegraph/src/LGraphNodeProperties.ts b/src/lib/litegraph/src/LGraphNodeProperties.ts
index 6e635e2281..b3aa18d41d 100644
--- a/src/lib/litegraph/src/LGraphNodeProperties.ts
+++ b/src/lib/litegraph/src/LGraphNodeProperties.ts
@@ -1,5 +1,9 @@
 import type { LGraphNode } from './LGraphNode'
 
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null
+}
+
 /**
  * Default properties to track
  */
@@ -9,9 +13,10 @@ const DEFAULT_TRACKED_PROPERTIES: string[] = [
   'flags.pinned',
   'mode',
   'color',
-  'bgcolor'
+  'bgcolor',
+  'shape',
+  'showAdvanced'
 ]
-
 /**
  * Manages node properties with optional change tracking and instrumentation.
  */
@@ -20,42 +25,62 @@ export class LGraphNodeProperties {
   node: LGraphNode
 
   /** Set of property paths that have been instrumented */
-  #instrumentedPaths = new Set<string>()
+  private _instrumentedPaths = new Set<string>()
 
   constructor(node: LGraphNode) {
     this.node = node
 
-    this.#setupInstrumentation()
+    this._setupInstrumentation()
   }
 
   /**
    * Sets up property instrumentation for all tracked properties
    */
-  #setupInstrumentation(): void {
+  private _setupInstrumentation(): void {
     for (const path of DEFAULT_TRACKED_PROPERTIES) {
-      this.#instrumentProperty(path)
+      this._instrumentProperty(path)
+    }
+  }
+
+  private _resolveTargetObject(parts: string[]): {
+    targetObject: Record<string, unknown>
+    propertyName: string
+  } {
+    // LGraphNode supports dynamic property access at runtime
+    let targetObject: Record<string, unknown> = this.node as unknown as Record<
+      string,
+      unknown
+    >
+
+    if (parts.length === 1) {
+      return { targetObject, propertyName: parts[0] }
+    }
+
+    for (let i = 0; i < parts.length - 1; i++) {
+      const key = parts[i]
+      const next = targetObject[key]
+      if (isRecord(next)) {
+        targetObject = next
+      }
+    }
+
+    return {
+      targetObject,
+      propertyName: parts[parts.length - 1]
     }
   }
 
   /**
    * Instruments a single property to track changes
    */
-  #instrumentProperty(path: string): void {
+  private _instrumentProperty(path: string): void {
     const parts = path.split('.')
 
     if (parts.length > 1) {
-      this.#ensureNestedPath(path)
+      this._ensureNestedPath(path)
     }
 
-    let targetObject: any = this.node
-    let propertyName = parts[0]
-
-    if (parts.length > 1) {
-      for (let i = 0; i < parts.length - 1; i++) {
-        targetObject = targetObject[parts[i]]
-      }
-      propertyName = parts.at(-1)!
-    }
+    const { targetObject, propertyName } = this._resolveTargetObject(parts)
 
     const hasProperty = Object.prototype.hasOwnProperty.call(
       targetObject,
@@ -64,14 +89,14 @@ export class LGraphNodeProperties {
     const currentValue = targetObject[propertyName]
 
     if (!hasProperty) {
-      let value: any = undefined
+      let value: unknown = undefined
 
       Object.defineProperty(targetObject, propertyName, {
         get: () => value,
-        set: (newValue: any) => {
+        set: (newValue: unknown) => {
           const oldValue = value
           value = newValue
-          this.#emitPropertyChange(path, oldValue, newValue)
+          this._emitPropertyChange(path, oldValue, newValue)
 
           // Update enumerable: true for non-undefined values, false for undefined
           const shouldBeEnumerable = newValue !== undefined
@@ -96,28 +121,35 @@ export class LGraphNodeProperties {
       Object.defineProperty(
         targetObject,
         propertyName,
-        this.#createInstrumentedDescriptor(path, currentValue)
+        this._createInstrumentedDescriptor(path, currentValue)
       )
     }
 
-    this.#instrumentedPaths.add(path)
+    this._instrumentedPaths.add(path)
   }
 
   /**
    * Creates a property descriptor that emits change events
    */
-  #createInstrumentedDescriptor(
+  private _createInstrumentedDescriptor(
     propertyPath: string,
-    initialValue: any
+    initialValue: unknown
   ): PropertyDescriptor {
-    let value = initialValue
+    return this._createInstrumentedDescriptorTyped(propertyPath, initialValue)
+  }
+
+  private _createInstrumentedDescriptorTyped<TValue>(
+    propertyPath: string,
+    initialValue: TValue
+  ): PropertyDescriptor {
+    let value: TValue = initialValue
 
     return {
       get: () => value,
-      set: (newValue: any) => {
+      set: (newValue: TValue) => {
         const oldValue = value
         value = newValue
-        this.#emitPropertyChange(propertyPath, oldValue, newValue)
+        this._emitPropertyChange(propertyPath, oldValue, newValue)
       },
       enumerable: true,
       configurable: true
@@ -127,10 +159,18 @@ export class LGraphNodeProperties {
   /**
    * Emits a property change event if the node is connected to a graph
    */
-  #emitPropertyChange(
+  private _emitPropertyChange(
     propertyPath: string,
-    oldValue: any,
-    newValue: any
+    oldValue: unknown,
+    newValue: unknown
+  ): void {
+    this._emitPropertyChangeTyped(propertyPath, oldValue, newValue)
+  }
+
+  private _emitPropertyChangeTyped<TValue>(
+    propertyPath: string,
+    oldValue: TValue,
+    newValue: TValue
   ): void {
     this.node.graph?.trigger('node:property:changed', {
       nodeId: this.node.id,
@@ -143,9 +183,13 @@ export class LGraphNodeProperties {
   /**
    * Ensures parent objects exist for nested properties
    */
-  #ensureNestedPath(path: string): void {
+  private _ensureNestedPath(path: string): void {
     const parts = path.split('.')
-    let current: any = this.node
+    // LGraphNode supports dynamic property access at runtime
+    let current: Record<string, unknown> = this.node as unknown as Record<
+      string,
+      unknown
+    >
 
     // Create all parent objects except the last property
     for (let i = 0; i < parts.length - 1; i++) {
@@ -153,7 +197,10 @@ export class LGraphNodeProperties {
       if (!current[part]) {
         current[part] = {}
       }
-      current = current[part]
+      const next = current[part]
+      if (isRecord(next)) {
+        current = next
+      }
     }
   }
 
@@ -161,7 +208,7 @@ export class LGraphNodeProperties {
    * Checks if a property is being tracked
    */
   isTracked(path: string): boolean {
-    return this.#instrumentedPaths.has(path)
+    return this._instrumentedPaths.has(path)
   }
 
   /**
@@ -175,7 +222,7 @@ export class LGraphNodeProperties {
    * Custom toJSON method for JSON.stringify
    * Returns undefined to exclude from serialization since we only use defaults
    */
-  toJSON(): any {
+  toJSON(): undefined {
     return undefined
   }
 }
diff --git a/tests-ui/tests/litegraph/core/LLink.test.ts b/src/lib/litegraph/src/LLink.test.ts
similarity index 89%
rename from tests-ui/tests/litegraph/core/LLink.test.ts
rename to src/lib/litegraph/src/LLink.test.ts
index a1cdfbea00..fc3f5918b9 100644
--- a/tests-ui/tests/litegraph/core/LLink.test.ts
+++ b/src/lib/litegraph/src/LLink.test.ts
@@ -2,7 +2,7 @@ import { describe, expect } from 'vitest'
 
 import { LLink } from '@/lib/litegraph/src/litegraph'
 
-import { test } from './fixtures/testExtensions'
+import { test } from './__fixtures__/testExtensions'
 
 describe('LLink', () => {
   test('matches previous snapshot', () => {
diff --git a/src/lib/litegraph/src/LLink.ts b/src/lib/litegraph/src/LLink.ts
index 6ca8832a17..0e5dd98b3a 100644
--- a/src/lib/litegraph/src/LLink.ts
+++ b/src/lib/litegraph/src/LLink.ts
@@ -119,14 +119,14 @@ export class LLink implements LinkSegment, Serialisable<SerialisableLLink> {
   /** @inheritdoc */
   _dragging?: boolean
 
-  #color?: CanvasColour | null
+  private _color?: CanvasColour | null
   /** Custom colour for this link only */
   public get color(): CanvasColour | null | undefined {
-    return this.#color
+    return this._color
   }
 
   public set color(value: CanvasColour) {
-    this.#color = value === '' ? null : value
+    this._color = value === '' ? null : value
   }
 
   public get isFloatingOutput(): boolean {
diff --git a/src/lib/litegraph/src/LiteGraphGlobal.ts b/src/lib/litegraph/src/LiteGraphGlobal.ts
index c48814235e..476f1b287c 100644
--- a/src/lib/litegraph/src/LiteGraphGlobal.ts
+++ b/src/lib/litegraph/src/LiteGraphGlobal.ts
@@ -10,7 +10,13 @@ import { Reroute } from './Reroute'
 import { InputIndicators } from './canvas/InputIndicators'
 import { LabelPosition, SlotDirection, SlotShape, SlotType } from './draw'
 import { Rectangle } from './infrastructure/Rectangle'
-import type { Dictionary, ISlotType, Rect, WhenNullish } from './interfaces'
+import type {
+  CreateNodeOptions,
+  Dictionary,
+  ISlotType,
+  Rect,
+  WhenNullish
+} from './interfaces'
 import { distance, isInsideRectangle, overlapBounding } from './measure'
 import { SubgraphIONodeBase } from './subgraph/SubgraphIONodeBase'
 import { SubgraphSlot } from './subgraph/SubgraphSlotBase'
@@ -67,7 +73,7 @@ export class LiteGraphGlobal {
   DEFAULT_SHADOW_COLOR = 'rgba(0,0,0,0.5)'
 
   DEFAULT_GROUP_FONT = 24
-  DEFAULT_GROUP_FONT_SIZE?: any
+  DEFAULT_GROUP_FONT_SIZE = 24
   GROUP_FONT = 'Inter'
 
   WIDGET_BGCOLOR = '#222'
@@ -525,7 +531,7 @@ export class LiteGraphGlobal {
   createNode(
     type: string,
     title?: string,
-    options?: Dictionary<unknown>
+    options?: CreateNodeOptions
   ): LGraphNode | null {
     const base_class = this.registered_node_types[type]
     if (!base_class) {
@@ -561,10 +567,7 @@ export class LiteGraphGlobal {
 
     // extra options
     if (options) {
-      for (const i in options) {
-        // @ts-expect-error #577 Requires interface
-        node[i] = options[i]
-      }
+      Object.assign(node, options)
     }
 
     // callback
@@ -716,7 +719,7 @@ export class LiteGraphGlobal {
   }
 
   // used to create nodes from wrapping functions
-  getParameterNames(func: (...args: any) => any): string[] {
+  getParameterNames(func: (...args: unknown[]) => unknown): string[] {
     return String(func)
       .replaceAll(/\/\/.*$/gm, '') // strip single-line comments
       .replaceAll(/\s+/g, '') // strip white space
@@ -971,7 +974,10 @@ export class LiteGraphGlobal {
     }
   }
 
-  extendClass(target: any, origin: any): void {
+  extendClass(
+    target: Record<string, unknown> & { prototype?: object },
+    origin: Record<string, unknown> & { prototype?: object }
+  ): void {
     for (const i in origin) {
       // copy class properties
       // eslint-disable-next-line no-prototype-builtins
@@ -979,33 +985,24 @@ export class LiteGraphGlobal {
       target[i] = origin[i]
     }
 
-    if (origin.prototype) {
+    if (origin.prototype && target.prototype) {
+      const originProto = origin.prototype as Record<string, unknown>
+      const targetProto = target.prototype as Record<string, unknown>
+
       // copy prototype properties
-      for (const i in origin.prototype) {
+      for (const i in originProto) {
         // only enumerable
         // eslint-disable-next-line no-prototype-builtins
-        if (!origin.prototype.hasOwnProperty(i)) continue
+        if (!originProto.hasOwnProperty(i)) continue
 
         // avoid overwriting existing ones
         // eslint-disable-next-line no-prototype-builtins
-        if (target.prototype.hasOwnProperty(i)) continue
+        if (targetProto.hasOwnProperty(i)) continue
 
-        // copy getters
-        if (origin.prototype.__lookupGetter__(i)) {
-          target.prototype.__defineGetter__(
-            i,
-            origin.prototype.__lookupGetter__(i)
-          )
-        } else {
-          target.prototype[i] = origin.prototype[i]
-        }
-
-        // and setters
-        if (origin.prototype.__lookupSetter__(i)) {
-          target.prototype.__defineSetter__(
-            i,
-            origin.prototype.__lookupSetter__(i)
-          )
+        // Use Object.getOwnPropertyDescriptor to copy getters/setters properly
+        const descriptor = Object.getOwnPropertyDescriptor(originProto, i)
+        if (descriptor) {
+          Object.defineProperty(targetProto, i, descriptor)
         }
       }
     }
diff --git a/src/lib/litegraph/src/MapProxyHandler.ts b/src/lib/litegraph/src/MapProxyHandler.ts
index ee27da8dee..3b8aa5cfc1 100644
--- a/src/lib/litegraph/src/MapProxyHandler.ts
+++ b/src/lib/litegraph/src/MapProxyHandler.ts
@@ -30,7 +30,7 @@ export class MapProxyHandler<V> implements ProxyHandler<
     return [...target.keys()].map(String)
   }
 
-  get(target: Map<number | string, V>, p: string | symbol): any {
+  get(target: Map<number | string, V>, p: string | symbol): V | undefined {
     // Workaround does not support link IDs of "values", "entries", "constructor", etc.
     if (p in target) return Reflect.get(target, p, target)
     if (typeof p === 'symbol') return
@@ -42,7 +42,7 @@ export class MapProxyHandler<V> implements ProxyHandler<
   set(
     target: Map<number | string, V>,
     p: string | symbol,
-    newValue: any
+    newValue: V
   ): boolean {
     if (typeof p === 'symbol') return false
 
@@ -55,7 +55,7 @@ export class MapProxyHandler<V> implements ProxyHandler<
     return target.delete(p as number | string)
   }
 
-  static bindAllMethods(map: Map<any, any>): void {
+  static bindAllMethods(map: Map<unknown, unknown>): void {
     map.clear = map.clear.bind(map)
     map.delete = map.delete.bind(map)
     map.forEach = map.forEach.bind(map)
diff --git a/tests-ui/tests/litegraph/core/fixtures/assets/floatingBranch.json b/src/lib/litegraph/src/__fixtures__/assets/floatingBranch.json
similarity index 100%
rename from tests-ui/tests/litegraph/core/fixtures/assets/floatingBranch.json
rename to src/lib/litegraph/src/__fixtures__/assets/floatingBranch.json
diff --git a/tests-ui/tests/litegraph/core/fixtures/assets/floatingLink.json b/src/lib/litegraph/src/__fixtures__/assets/floatingLink.json
similarity index 100%
rename from tests-ui/tests/litegraph/core/fixtures/assets/floatingLink.json
rename to src/lib/litegraph/src/__fixtures__/assets/floatingLink.json
diff --git a/tests-ui/tests/litegraph/core/fixtures/assets/linkedNodes.json b/src/lib/litegraph/src/__fixtures__/assets/linkedNodes.json
similarity index 70%
rename from tests-ui/tests/litegraph/core/fixtures/assets/linkedNodes.json
rename to src/lib/litegraph/src/__fixtures__/assets/linkedNodes.json
index 5eed02368b..181aa6bd61 100644
--- a/tests-ui/tests/litegraph/core/fixtures/assets/linkedNodes.json
+++ b/src/lib/litegraph/src/__fixtures__/assets/linkedNodes.json
@@ -7,14 +7,8 @@
     {
       "id": 2,
       "type": "VAEDecode",
-      "pos": [
-        63.44815444946289,
-        178.71633911132812
-      ],
-      "size": [
-        210,
-        46
-      ],
+      "pos": [63.44815444946289, 178.71633911132812],
+      "size": [210, 46],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -34,9 +28,7 @@
         {
           "name": "IMAGE",
           "type": "IMAGE",
-          "links": [
-            2
-          ]
+          "links": [2]
         }
       ],
       "properties": {
@@ -47,14 +39,8 @@
     {
       "id": 3,
       "type": "SaveImage",
-      "pos": [
-        419.36920166015625,
-        179.71388244628906
-      ],
-      "size": [
-        226.3714141845703,
-        58
-      ],
+      "pos": [419.36920166015625, 179.71388244628906],
+      "size": [226.3714141845703, 58],
       "flags": {},
       "order": 1,
       "mode": 0,
@@ -67,21 +53,10 @@
       ],
       "outputs": [],
       "properties": {},
-      "widgets_values": [
-        "ComfyUI"
-      ]
+      "widgets_values": ["ComfyUI"]
     }
   ],
-  "links": [
-    [
-      2,
-      2,
-      0,
-      3,
-      0,
-      "IMAGE"
-    ]
-  ],
+  "links": [[2, 2, 0, 3, 0, "IMAGE"]],
   "groups": [],
   "config": {},
   "extra": {
@@ -93,4 +68,4 @@
     ]
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/src/lib/litegraph/src/__fixtures__/assets/reroutesComplex.json b/src/lib/litegraph/src/__fixtures__/assets/reroutesComplex.json
new file mode 100644
index 0000000000..c164fcc4bd
--- /dev/null
+++ b/src/lib/litegraph/src/__fixtures__/assets/reroutesComplex.json
@@ -0,0 +1,275 @@
+{
+  "id": "e5ffd5e1-1c01-45ac-90dd-b7d83a206b0f",
+  "revision": 0,
+  "last_node_id": 9,
+  "last_link_id": 12,
+  "nodes": [
+    {
+      "id": 3,
+      "type": "InvertMask",
+      "pos": [390, 270],
+      "size": [140, 26],
+      "flags": {},
+      "order": 8,
+      "mode": 0,
+      "inputs": [
+        { "localized_name": "mask", "name": "mask", "type": "MASK", "link": 3 }
+      ],
+      "outputs": [
+        {
+          "localized_name": "MASK",
+          "name": "MASK",
+          "type": "MASK",
+          "links": null
+        }
+      ],
+      "properties": { "Node name for S&R": "InvertMask" },
+      "widgets_values": []
+    },
+    {
+      "id": 7,
+      "type": "InvertMask",
+      "pos": [390, 560],
+      "size": [140, 26],
+      "flags": {},
+      "order": 4,
+      "mode": 0,
+      "inputs": [
+        { "localized_name": "mask", "name": "mask", "type": "MASK", "link": 10 }
+      ],
+      "outputs": [
+        {
+          "localized_name": "MASK",
+          "name": "MASK",
+          "type": "MASK",
+          "links": null
+        }
+      ],
+      "properties": { "Node name for S&R": "InvertMask" },
+      "widgets_values": []
+    },
+    {
+      "id": 8,
+      "type": "InvertMask",
+      "pos": [390, 640],
+      "size": [140, 26],
+      "flags": {},
+      "order": 3,
+      "mode": 0,
+      "inputs": [
+        { "localized_name": "mask", "name": "mask", "type": "MASK", "link": 9 }
+      ],
+      "outputs": [
+        {
+          "localized_name": "MASK",
+          "name": "MASK",
+          "type": "MASK",
+          "links": null
+        }
+      ],
+      "properties": { "Node name for S&R": "InvertMask" },
+      "widgets_values": []
+    },
+    {
+      "id": 5,
+      "type": "InvertMask",
+      "pos": [390, 480],
+      "size": [140, 26],
+      "flags": { "collapsed": false },
+      "order": 5,
+      "mode": 0,
+      "inputs": [
+        { "localized_name": "mask", "name": "mask", "type": "MASK", "link": 11 }
+      ],
+      "outputs": [
+        {
+          "localized_name": "MASK",
+          "name": "MASK",
+          "type": "MASK",
+          "links": null
+        }
+      ],
+      "properties": { "Node name for S&R": "InvertMask" },
+      "widgets_values": []
+    },
+    {
+      "id": 6,
+      "type": "InvertMask",
+      "pos": [390, 400],
+      "size": [140, 26],
+      "flags": {},
+      "order": 6,
+      "mode": 0,
+      "inputs": [
+        { "localized_name": "mask", "name": "mask", "type": "MASK", "link": 12 }
+      ],
+      "outputs": [
+        {
+          "localized_name": "MASK",
+          "name": "MASK",
+          "type": "MASK",
+          "links": null
+        }
+      ],
+      "properties": { "Node name for S&R": "InvertMask" },
+      "widgets_values": []
+    },
+    {
+      "id": 4,
+      "type": "InvertMask",
+      "pos": [50, 640],
+      "size": [140, 26],
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "inputs": [
+        {
+          "localized_name": "mask",
+          "name": "mask",
+          "type": "MASK",
+          "link": null
+        }
+      ],
+      "outputs": [
+        {
+          "localized_name": "MASK",
+          "name": "MASK",
+          "type": "MASK",
+          "links": [9, 10, 11, 12]
+        }
+      ],
+      "properties": { "Node name for S&R": "InvertMask" },
+      "widgets_values": []
+    },
+    {
+      "id": 2,
+      "type": "InvertMask",
+      "pos": [390, 180],
+      "size": [140, 26],
+      "flags": {},
+      "order": 7,
+      "mode": 0,
+      "inputs": [
+        { "localized_name": "mask", "name": "mask", "type": "MASK", "link": 2 }
+      ],
+      "outputs": [
+        {
+          "localized_name": "MASK",
+          "name": "MASK",
+          "type": "MASK",
+          "links": null
+        }
+      ],
+      "properties": { "Node name for S&R": "InvertMask" },
+      "widgets_values": []
+    },
+    {
+      "id": 1,
+      "type": "InvertMask",
+      "pos": [50, 170],
+      "size": [140, 26],
+      "flags": {},
+      "order": 2,
+      "mode": 0,
+      "inputs": [
+        {
+          "localized_name": "mask",
+          "name": "mask",
+          "type": "MASK",
+          "link": null
+        }
+      ],
+      "outputs": [
+        {
+          "localized_name": "MASK",
+          "name": "MASK",
+          "type": "MASK",
+          "links": [2, 3]
+        }
+      ],
+      "properties": { "Node name for S&R": "InvertMask" },
+      "widgets_values": []
+    },
+    {
+      "id": 9,
+      "type": "InvertMask",
+      "pos": [50, 410],
+      "size": [140, 26],
+      "flags": {},
+      "order": 1,
+      "mode": 0,
+      "inputs": [
+        {
+          "localized_name": "mask",
+          "name": "mask",
+          "type": "MASK",
+          "link": null
+        }
+      ],
+      "outputs": [
+        {
+          "localized_name": "MASK",
+          "name": "MASK",
+          "type": "MASK",
+          "links": []
+        }
+      ],
+      "properties": { "Node name for S&R": "InvertMask" },
+      "widgets_values": []
+    }
+  ],
+  "links": [
+    [2, 1, 0, 2, 0, "MASK"],
+    [3, 1, 0, 3, 0, "MASK"],
+    [9, 4, 0, 8, 0, "MASK"],
+    [10, 4, 0, 7, 0, "MASK"],
+    [11, 4, 0, 5, 0, "MASK"],
+    [12, 4, 0, 6, 0, "MASK"]
+  ],
+  "floatingLinks": [
+    {
+      "id": 6,
+      "origin_id": 1,
+      "origin_slot": 0,
+      "target_id": -1,
+      "target_slot": -1,
+      "type": "MASK",
+      "parentId": 1
+    }
+  ],
+  "groups": [],
+  "config": {},
+  "extra": {
+    "ds": { "scale": 1, "offset": [0, 0] },
+    "linkExtensions": [
+      { "id": 2, "parentId": 3 },
+      { "id": 3, "parentId": 3 },
+      { "id": 9, "parentId": 12 },
+      { "id": 10, "parentId": 15 },
+      { "id": 11, "parentId": 7 },
+      { "id": 12, "parentId": 7 }
+    ],
+    "reroutes": [
+      {
+        "id": 1,
+        "parentId": 2,
+        "pos": [340, 160],
+        "linkIds": [],
+        "floating": { "slotType": "output" }
+      },
+      { "id": 2, "parentId": 4, "pos": [290, 190], "linkIds": [2, 3] },
+      { "id": 3, "parentId": 2, "pos": [350, 220], "linkIds": [2, 3] },
+      { "id": 4, "pos": [250, 190], "linkIds": [2, 3] },
+      { "id": 6, "parentId": 8, "pos": [300, 450], "linkIds": [11, 12] },
+      { "id": 7, "parentId": 6, "pos": [350, 450], "linkIds": [11, 12] },
+      { "id": 8, "parentId": 13, "pos": [250, 450], "linkIds": [11, 12] },
+      { "id": 10, "pos": [250, 650], "linkIds": [9, 10, 11, 12] },
+      { "id": 11, "parentId": 10, "pos": [300, 650], "linkIds": [9] },
+      { "id": 12, "parentId": 11, "pos": [350, 650], "linkIds": [9] },
+      { "id": 13, "parentId": 10, "pos": [250, 570], "linkIds": [10, 11, 12] },
+      { "id": 14, "parentId": 13, "pos": [300, 570], "linkIds": [10] },
+      { "id": 15, "parentId": 14, "pos": [350, 570], "linkIds": [10] }
+    ]
+  },
+  "version": 0.4
+}
diff --git a/tests-ui/tests/litegraph/core/fixtures/assets/testGraphs.ts b/src/lib/litegraph/src/__fixtures__/assets/testGraphs.ts
similarity index 81%
rename from tests-ui/tests/litegraph/core/fixtures/assets/testGraphs.ts
rename to src/lib/litegraph/src/__fixtures__/assets/testGraphs.ts
index ffed09e6b5..03a3a12605 100644
--- a/tests-ui/tests/litegraph/core/fixtures/assets/testGraphs.ts
+++ b/src/lib/litegraph/src/__fixtures__/assets/testGraphs.ts
@@ -1,5 +1,6 @@
 import type {
   ISerialisedGraph,
+  ISerialisedNode,
   SerialisableGraph
 } from '@/lib/litegraph/src/litegraph'
 
@@ -19,12 +20,7 @@ export const oldSchemaGraph: ISerialisedGraph = {
       title: 'A group to test with'
     }
   ],
-  nodes: [
-    // @ts-expect-error TODO: Fix after merge - missing required properties for test
-    {
-      id: 1
-    }
-  ],
+  nodes: [{ id: 1 } as Partial<ISerialisedNode> as ISerialisedNode],
   links: []
 }
 
@@ -65,11 +61,7 @@ export const basicSerialisableGraph: SerialisableGraph = {
     }
   ],
   nodes: [
-    // @ts-expect-error TODO: Fix after merge - missing required properties for test
-    {
-      id: 1,
-      type: 'mustBeSet'
-    }
+    { id: 1, type: 'mustBeSet' } as Partial<ISerialisedNode> as ISerialisedNode
   ],
   links: []
 }
diff --git a/src/lib/litegraph/src/__fixtures__/duplicateSubgraphNodeIds.ts b/src/lib/litegraph/src/__fixtures__/duplicateSubgraphNodeIds.ts
new file mode 100644
index 0000000000..3641e952ae
--- /dev/null
+++ b/src/lib/litegraph/src/__fixtures__/duplicateSubgraphNodeIds.ts
@@ -0,0 +1,163 @@
+import type { SerialisableGraph } from '@/lib/litegraph/src/types/serialisation'
+
+/**
+ * Workflow with two subgraph definitions whose internal nodes share
+ * identical IDs [3, 8, 37]. Reproduces the widget-state collision bug
+ * where copied subgraphs overwrote each other's widget store entries.
+ *
+ * SubgraphA (node 102): widgets reference node 3, link 3→8
+ * SubgraphB (node 103): widgets reference node 8, link 3→37
+ */
+export const duplicateSubgraphNodeIds = {
+  id: 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa',
+  version: 1,
+  revision: 0,
+  state: {
+    lastNodeId: 100,
+    lastLinkId: 10,
+    lastGroupId: 0,
+    lastRerouteId: 0
+  },
+  nodes: [
+    {
+      id: 102,
+      type: '11111111-1111-4111-8111-111111111111',
+      pos: [0, 0],
+      size: [200, 100],
+      flags: {},
+      order: 0,
+      mode: 0,
+      properties: { proxyWidgets: [['3', 'seed']] }
+    },
+    {
+      id: 103,
+      type: '22222222-2222-4222-8222-222222222222',
+      pos: [300, 0],
+      size: [200, 100],
+      flags: {},
+      order: 1,
+      mode: 0,
+      properties: { proxyWidgets: [['8', 'prompt']] }
+    }
+  ],
+  definitions: {
+    subgraphs: [
+      {
+        id: '11111111-1111-4111-8111-111111111111',
+        version: 1,
+        revision: 0,
+        state: {
+          lastNodeId: 0,
+          lastLinkId: 0,
+          lastGroupId: 0,
+          lastRerouteId: 0
+        },
+        name: 'SubgraphA',
+        config: {},
+        inputNode: { id: -10, bounding: [10, 100, 150, 126] },
+        outputNode: { id: -20, bounding: [400, 100, 140, 126] },
+        inputs: [],
+        outputs: [],
+        widgets: [{ id: 3, name: 'seed' }],
+        nodes: [
+          {
+            id: 3,
+            type: 'dummy',
+            pos: [0, 0],
+            size: [100, 50],
+            flags: {},
+            order: 0,
+            mode: 0
+          },
+          {
+            id: 8,
+            type: 'dummy',
+            pos: [0, 0],
+            size: [100, 50],
+            flags: {},
+            order: 1,
+            mode: 0
+          },
+          {
+            id: 37,
+            type: 'dummy',
+            pos: [0, 0],
+            size: [100, 50],
+            flags: {},
+            order: 2,
+            mode: 0
+          }
+        ],
+        links: [
+          {
+            id: 1,
+            origin_id: 3,
+            origin_slot: 0,
+            target_id: 8,
+            target_slot: 0,
+            type: 'number'
+          }
+        ],
+        groups: []
+      },
+      {
+        id: '22222222-2222-4222-8222-222222222222',
+        version: 1,
+        revision: 0,
+        state: {
+          lastNodeId: 0,
+          lastLinkId: 0,
+          lastGroupId: 0,
+          lastRerouteId: 0
+        },
+        name: 'SubgraphB',
+        config: {},
+        inputNode: { id: -10, bounding: [10, 100, 150, 126] },
+        outputNode: { id: -20, bounding: [400, 100, 140, 126] },
+        inputs: [],
+        outputs: [],
+        widgets: [{ id: 8, name: 'prompt' }],
+        nodes: [
+          {
+            id: 3,
+            type: 'dummy',
+            pos: [0, 0],
+            size: [100, 50],
+            flags: {},
+            order: 0,
+            mode: 0
+          },
+          {
+            id: 8,
+            type: 'dummy',
+            pos: [0, 0],
+            size: [100, 50],
+            flags: {},
+            order: 1,
+            mode: 0
+          },
+          {
+            id: 37,
+            type: 'dummy',
+            pos: [0, 0],
+            size: [100, 50],
+            flags: {},
+            order: 2,
+            mode: 0
+          }
+        ],
+        links: [
+          {
+            id: 2,
+            origin_id: 3,
+            origin_slot: 0,
+            target_id: 37,
+            target_slot: 0,
+            type: 'string'
+          }
+        ],
+        groups: []
+      }
+    ]
+  }
+} as const satisfies SerialisableGraph
diff --git a/src/lib/litegraph/src/__fixtures__/nestedSubgraphProxyWidgets.ts b/src/lib/litegraph/src/__fixtures__/nestedSubgraphProxyWidgets.ts
new file mode 100644
index 0000000000..b71962880d
--- /dev/null
+++ b/src/lib/litegraph/src/__fixtures__/nestedSubgraphProxyWidgets.ts
@@ -0,0 +1,177 @@
+import type { SerialisableGraph } from '@/lib/litegraph/src/types/serialisation'
+
+/**
+ * Workflow where SubgraphA contains a nested SubgraphNode referencing
+ * SubgraphB. Both subgraph definitions share internal node IDs [3, 8, 37].
+ *
+ * The nested SubgraphNode (id 50, inside SubgraphA) has proxyWidgets
+ * pointing at SubgraphB's node 8. After deduplication remaps SubgraphB's
+ * nodes, the nested proxyWidgets must also be patched.
+ *
+ * SubgraphA (node 102): widgets reference node 3, link 3→8,
+ *   contains nested SubgraphNode(50) → SubgraphB with proxyWidget ['8']
+ * SubgraphB (node 103): widgets reference node 8, link 3→37
+ */
+export const nestedSubgraphProxyWidgets = {
+  id: 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb',
+  version: 1,
+  revision: 0,
+  state: {
+    lastNodeId: 100,
+    lastLinkId: 10,
+    lastGroupId: 0,
+    lastRerouteId: 0
+  },
+  nodes: [
+    {
+      id: 102,
+      type: '11111111-1111-4111-8111-111111111111',
+      pos: [0, 0],
+      size: [200, 100],
+      flags: {},
+      order: 0,
+      mode: 0,
+      properties: { proxyWidgets: [['3', 'seed']] }
+    },
+    {
+      id: 103,
+      type: '22222222-2222-4222-8222-222222222222',
+      pos: [300, 0],
+      size: [200, 100],
+      flags: {},
+      order: 1,
+      mode: 0,
+      properties: { proxyWidgets: [['8', 'prompt']] }
+    }
+  ],
+  definitions: {
+    subgraphs: [
+      {
+        id: '11111111-1111-4111-8111-111111111111',
+        version: 1,
+        revision: 0,
+        state: {
+          lastNodeId: 0,
+          lastLinkId: 0,
+          lastGroupId: 0,
+          lastRerouteId: 0
+        },
+        name: 'SubgraphA',
+        config: {},
+        inputNode: { id: -10, bounding: [10, 100, 150, 126] },
+        outputNode: { id: -20, bounding: [400, 100, 140, 126] },
+        inputs: [],
+        outputs: [],
+        widgets: [{ id: 3, name: 'seed' }],
+        nodes: [
+          {
+            id: 3,
+            type: 'dummy',
+            pos: [0, 0],
+            size: [100, 50],
+            flags: {},
+            order: 0,
+            mode: 0
+          },
+          {
+            id: 8,
+            type: 'dummy',
+            pos: [0, 0],
+            size: [100, 50],
+            flags: {},
+            order: 1,
+            mode: 0
+          },
+          {
+            id: 37,
+            type: 'dummy',
+            pos: [0, 0],
+            size: [100, 50],
+            flags: {},
+            order: 2,
+            mode: 0
+          },
+          {
+            id: 50,
+            type: '22222222-2222-4222-8222-222222222222',
+            pos: [200, 0],
+            size: [100, 50],
+            flags: {},
+            order: 3,
+            mode: 0,
+            properties: { proxyWidgets: [['8', 'prompt']] }
+          }
+        ],
+        links: [
+          {
+            id: 1,
+            origin_id: 3,
+            origin_slot: 0,
+            target_id: 8,
+            target_slot: 0,
+            type: 'number'
+          }
+        ],
+        groups: []
+      },
+      {
+        id: '22222222-2222-4222-8222-222222222222',
+        version: 1,
+        revision: 0,
+        state: {
+          lastNodeId: 0,
+          lastLinkId: 0,
+          lastGroupId: 0,
+          lastRerouteId: 0
+        },
+        name: 'SubgraphB',
+        config: {},
+        inputNode: { id: -10, bounding: [10, 100, 150, 126] },
+        outputNode: { id: -20, bounding: [400, 100, 140, 126] },
+        inputs: [],
+        outputs: [],
+        widgets: [{ id: 8, name: 'prompt' }],
+        nodes: [
+          {
+            id: 3,
+            type: 'dummy',
+            pos: [0, 0],
+            size: [100, 50],
+            flags: {},
+            order: 0,
+            mode: 0
+          },
+          {
+            id: 8,
+            type: 'dummy',
+            pos: [0, 0],
+            size: [100, 50],
+            flags: {},
+            order: 1,
+            mode: 0
+          },
+          {
+            id: 37,
+            type: 'dummy',
+            pos: [0, 0],
+            size: [100, 50],
+            flags: {},
+            order: 2,
+            mode: 0
+          }
+        ],
+        links: [
+          {
+            id: 2,
+            origin_id: 3,
+            origin_slot: 0,
+            target_id: 37,
+            target_slot: 0,
+            type: 'string'
+          }
+        ],
+        groups: []
+      }
+    ]
+  }
+} as const satisfies SerialisableGraph
diff --git a/src/lib/litegraph/src/__fixtures__/nodeIdSpaceExhausted.ts b/src/lib/litegraph/src/__fixtures__/nodeIdSpaceExhausted.ts
new file mode 100644
index 0000000000..ba0008e887
--- /dev/null
+++ b/src/lib/litegraph/src/__fixtures__/nodeIdSpaceExhausted.ts
@@ -0,0 +1,172 @@
+import type { SerialisableGraph } from '@/lib/litegraph/src/types/serialisation'
+
+/**
+ * Workflow where lastNodeId is near the MAX_NODE_ID ceiling (100_000_000)
+ * and root node 100_000_000 reserves the only remaining candidate ID.
+ *
+ * Both subgraph definitions share node IDs [3, 8, 37]. When SubgraphB's
+ * duplicates need remapping, candidate 100_000_000 is already reserved,
+ * so the next candidate (100_000_001) exceeds MAX_NODE_ID and must throw.
+ */
+export const nodeIdSpaceExhausted = {
+  id: 'cccccccc-cccc-4ccc-8ccc-cccccccccccc',
+  version: 1,
+  revision: 0,
+  state: {
+    lastNodeId: 99_999_999,
+    lastLinkId: 10,
+    lastGroupId: 0,
+    lastRerouteId: 0
+  },
+  nodes: [
+    {
+      id: 102,
+      type: '11111111-1111-4111-8111-111111111111',
+      pos: [0, 0],
+      size: [200, 100],
+      flags: {},
+      order: 0,
+      mode: 0,
+      properties: { proxyWidgets: [['3', 'seed']] }
+    },
+    {
+      id: 103,
+      type: '22222222-2222-4222-8222-222222222222',
+      pos: [300, 0],
+      size: [200, 100],
+      flags: {},
+      order: 1,
+      mode: 0,
+      properties: { proxyWidgets: [['8', 'prompt']] }
+    },
+    {
+      id: 100_000_000,
+      type: 'dummy',
+      pos: [600, 0],
+      size: [100, 50],
+      flags: {},
+      order: 2,
+      mode: 0
+    }
+  ],
+  definitions: {
+    subgraphs: [
+      {
+        id: '11111111-1111-4111-8111-111111111111',
+        version: 1,
+        revision: 0,
+        state: {
+          lastNodeId: 0,
+          lastLinkId: 0,
+          lastGroupId: 0,
+          lastRerouteId: 0
+        },
+        name: 'SubgraphA',
+        config: {},
+        inputNode: { id: -10, bounding: [10, 100, 150, 126] },
+        outputNode: { id: -20, bounding: [400, 100, 140, 126] },
+        inputs: [],
+        outputs: [],
+        widgets: [{ id: 3, name: 'seed' }],
+        nodes: [
+          {
+            id: 3,
+            type: 'dummy',
+            pos: [0, 0],
+            size: [100, 50],
+            flags: {},
+            order: 0,
+            mode: 0
+          },
+          {
+            id: 8,
+            type: 'dummy',
+            pos: [0, 0],
+            size: [100, 50],
+            flags: {},
+            order: 1,
+            mode: 0
+          },
+          {
+            id: 37,
+            type: 'dummy',
+            pos: [0, 0],
+            size: [100, 50],
+            flags: {},
+            order: 2,
+            mode: 0
+          }
+        ],
+        links: [
+          {
+            id: 1,
+            origin_id: 3,
+            origin_slot: 0,
+            target_id: 8,
+            target_slot: 0,
+            type: 'number'
+          }
+        ],
+        groups: []
+      },
+      {
+        id: '22222222-2222-4222-8222-222222222222',
+        version: 1,
+        revision: 0,
+        state: {
+          lastNodeId: 0,
+          lastLinkId: 0,
+          lastGroupId: 0,
+          lastRerouteId: 0
+        },
+        name: 'SubgraphB',
+        config: {},
+        inputNode: { id: -10, bounding: [10, 100, 150, 126] },
+        outputNode: { id: -20, bounding: [400, 100, 140, 126] },
+        inputs: [],
+        outputs: [],
+        widgets: [{ id: 8, name: 'prompt' }],
+        nodes: [
+          {
+            id: 3,
+            type: 'dummy',
+            pos: [0, 0],
+            size: [100, 50],
+            flags: {},
+            order: 0,
+            mode: 0
+          },
+          {
+            id: 8,
+            type: 'dummy',
+            pos: [0, 0],
+            size: [100, 50],
+            flags: {},
+            order: 1,
+            mode: 0
+          },
+          {
+            id: 37,
+            type: 'dummy',
+            pos: [0, 0],
+            size: [100, 50],
+            flags: {},
+            order: 2,
+            mode: 0
+          }
+        ],
+        links: [
+          {
+            id: 2,
+            origin_id: 3,
+            origin_slot: 0,
+            target_id: 37,
+            target_slot: 0,
+            type: 'string'
+          }
+        ],
+        groups: []
+      }
+    ]
+  }
+} as const satisfies SerialisableGraph
diff --git a/tests-ui/tests/litegraph/core/fixtures/testExtensions.ts b/src/lib/litegraph/src/__fixtures__/testExtensions.ts
similarity index 93%
rename from tests-ui/tests/litegraph/core/fixtures/testExtensions.ts
rename to src/lib/litegraph/src/__fixtures__/testExtensions.ts
index 300b238145..6aff554388 100644
--- a/tests-ui/tests/litegraph/core/fixtures/testExtensions.ts
+++ b/src/lib/litegraph/src/__fixtures__/testExtensions.ts
@@ -1,3 +1,4 @@
+// oxlint-disable no-empty-pattern
 import { test as baseTest } from 'vitest'
 
 import { LGraph } from '@/lib/litegraph/src/LGraph'
@@ -33,7 +34,6 @@ interface DirtyFixtures {
 }
 
 export const test = baseTest.extend<LitegraphFixtures>({
-  // eslint-disable-next-line no-empty-pattern
   minimalGraph: async ({}, use) => {
     // Before each test function
     const serialisable = structuredClone(minimalSerialisableGraph)
@@ -48,7 +48,7 @@ export const test = baseTest.extend<LitegraphFixtures>({
     floatingLink as unknown as ISerialisedGraph
   ),
   linkedNodesGraph: structuredClone(linkedNodes as unknown as ISerialisedGraph),
-  // eslint-disable-next-line no-empty-pattern
+
   floatingBranchGraph: async ({}, use) => {
     const cloned = structuredClone(
       floatingBranch as unknown as ISerialisedGraph
@@ -56,7 +56,7 @@ export const test = baseTest.extend<LitegraphFixtures>({
     const graph = new LGraph(cloned)
     await use(graph)
   },
-  // eslint-disable-next-line no-empty-pattern
+
   reroutesComplexGraph: async ({}, use) => {
     const cloned = structuredClone(
       reroutesComplex as unknown as ISerialisedGraph
@@ -68,7 +68,6 @@ export const test = baseTest.extend<LitegraphFixtures>({
 
 /** Test that use {@link DirtyFixtures}. One test per file. */
 export const dirtyTest = test.extend<DirtyFixtures>({
-  // eslint-disable-next-line no-empty-pattern
   basicSerialisableGraph: async ({}, use) => {
     if (!basicSerialisableGraph.nodes) throw new Error('Invalid test object')
 
diff --git a/src/lib/litegraph/src/__fixtures__/uniqueSubgraphNodeIds.ts b/src/lib/litegraph/src/__fixtures__/uniqueSubgraphNodeIds.ts
new file mode 100644
index 0000000000..549f1f7ab4
--- /dev/null
+++ b/src/lib/litegraph/src/__fixtures__/uniqueSubgraphNodeIds.ts
@@ -0,0 +1,163 @@
+import type { SerialisableGraph } from '@/lib/litegraph/src/types/serialisation'
+
+/**
+ * Workflow with two subgraph definitions whose internal nodes already
+ * have unique IDs. Deduplication should be a no-op — all IDs, links,
+ * widgets, and proxyWidgets pass through unchanged.
+ *
+ * SubgraphA (node 102): nodes [10, 11, 12], link 10→11, widget ref 10
+ * SubgraphB (node 103): nodes [20, 21, 22], link 20→22, widget ref 21
+ */
+export const uniqueSubgraphNodeIds = {
+  id: 'dddddddd-dddd-4ddd-8ddd-dddddddddddd',
+  version: 1,
+  revision: 0,
+  state: {
+    lastNodeId: 100,
+    lastLinkId: 10,
+    lastGroupId: 0,
+    lastRerouteId: 0
+  },
+  nodes: [
+    {
+      id: 102,
+      type: '11111111-1111-4111-8111-111111111111',
+      pos: [0, 0],
+      size: [200, 100],
+      flags: {},
+      order: 0,
+      mode: 0,
+      properties: { proxyWidgets: [['10', 'seed']] }
+    },
+    {
+      id: 103,
+      type: '22222222-2222-4222-8222-222222222222',
+      pos: [300, 0],
+      size: [200, 100],
+      flags: {},
+      order: 1,
+      mode: 0,
+      properties: { proxyWidgets: [['21', 'prompt']] }
+    }
+  ],
+  definitions: {
+    subgraphs: [
+      {
+        id: '11111111-1111-4111-8111-111111111111',
+        version: 1,
+        revision: 0,
+        state: {
+          lastNodeId: 0,
+          lastLinkId: 0,
+          lastGroupId: 0,
+          lastRerouteId: 0
+        },
+        name: 'SubgraphA',
+        config: {},
+        inputNode: { id: -10, bounding: [10, 100, 150, 126] },
+        outputNode: { id: -20, bounding: [400, 100, 140, 126] },
+        inputs: [],
+        outputs: [],
+        widgets: [{ id: 10, name: 'seed' }],
+        nodes: [
+          {
+            id: 10,
+            type: 'dummy',
+            pos: [0, 0],
+            size: [100, 50],
+            flags: {},
+            order: 0,
+            mode: 0
+          },
+          {
+            id: 11,
+            type: 'dummy',
+            pos: [0, 0],
+            size: [100, 50],
+            flags: {},
+            order: 1,
+            mode: 0
+          },
+          {
+            id: 12,
+            type: 'dummy',
+            pos: [0, 0],
+            size: [100, 50],
+            flags: {},
+            order: 2,
+            mode: 0
+          }
+        ],
+        links: [
+          {
+            id: 1,
+            origin_id: 10,
+            origin_slot: 0,
+            target_id: 11,
+            target_slot: 0,
+            type: 'number'
+          }
+        ],
+        groups: []
+      },
+      {
+        id: '22222222-2222-4222-8222-222222222222',
+        version: 1,
+        revision: 0,
+        state: {
+          lastNodeId: 0,
+          lastLinkId: 0,
+          lastGroupId: 0,
+          lastRerouteId: 0
+        },
+        name: 'SubgraphB',
+        config: {},
+        inputNode: { id: -10, bounding: [10, 100, 150, 126] },
+        outputNode: { id: -20, bounding: [400, 100, 140, 126] },
+        inputs: [],
+        outputs: [],
+        widgets: [{ id: 21, name: 'prompt' }],
+        nodes: [
+          {
+            id: 20,
+            type: 'dummy',
+            pos: [0, 0],
+            size: [100, 50],
+            flags: {},
+            order: 0,
+            mode: 0
+          },
+          {
+            id: 21,
+            type: 'dummy',
+            pos: [0, 0],
+            size: [100, 50],
+            flags: {},
+            order: 1,
+            mode: 0
+          },
+          {
+            id: 22,
+            type: 'dummy',
+            pos: [0, 0],
+            size: [100, 50],
+            flags: {},
+            order: 2,
+            mode: 0
+          }
+        ],
+        links: [
+          {
+            id: 2,
+            origin_id: 20,
+            origin_slot: 0,
+            target_id: 22,
+            target_slot: 0,
+            type: 'string'
+          }
+        ],
+        groups: []
+      }
+    ]
+  }
+} as const satisfies SerialisableGraph
diff --git a/src/lib/litegraph/src/__snapshots__/LGraph.test.ts.snap b/src/lib/litegraph/src/__snapshots__/LGraph.test.ts.snap
new file mode 100644
index 0000000000..a159fd1b9e
--- /dev/null
+++ b/src/lib/litegraph/src/__snapshots__/LGraph.test.ts.snap
@@ -0,0 +1,43 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`LGraph > supports schema v0.4 graphs > oldSchemaGraph 1`] = `
+{
+  "config": {},
+  "definitions": undefined,
+  "extra": {
+    "reroutes": undefined,
+  },
+  "floatingLinks": undefined,
+  "groups": [
+    {
+      "bounding": [
+        20,
+        20,
+        1,
+        3,
+      ],
+      "color": "#6029aa",
+      "flags": {},
+      "font_size": 14,
+      "id": 123,
+      "title": "A group to test with",
+    },
+  ],
+  "id": "b4e984f1-b421-4d24-b8b4-ff895793af13",
+  "last_link_id": 0,
+  "last_node_id": 1,
+  "links": [],
+  "nodes": [
+    {
+      "id": 1,
+      "mode": 0,
+      "pos": [
+        10,
+        10,
+      ],
+    },
+  ],
+  "revision": 0,
+  "version": 0.4,
+}
+`;
diff --git a/tests-ui/tests/litegraph/core/__snapshots__/LGraphGroup.test.ts.snap b/src/lib/litegraph/src/__snapshots__/LGraphGroup.test.ts.snap
similarity index 100%
rename from tests-ui/tests/litegraph/core/__snapshots__/LGraphGroup.test.ts.snap
rename to src/lib/litegraph/src/__snapshots__/LGraphGroup.test.ts.snap
diff --git a/tests-ui/tests/litegraph/core/__snapshots__/LLink.test.ts.snap b/src/lib/litegraph/src/__snapshots__/LLink.test.ts.snap
similarity index 100%
rename from tests-ui/tests/litegraph/core/__snapshots__/LLink.test.ts.snap
rename to src/lib/litegraph/src/__snapshots__/LLink.test.ts.snap
diff --git a/tests-ui/tests/litegraph/core/__snapshots__/litegraph.test.ts.snap b/src/lib/litegraph/src/__snapshots__/litegraph.test.ts.snap
similarity index 99%
rename from tests-ui/tests/litegraph/core/__snapshots__/litegraph.test.ts.snap
rename to src/lib/litegraph/src/__snapshots__/litegraph.test.ts.snap
index 1cd27ced11..6bdd6b6788 100644
--- a/tests-ui/tests/litegraph/core/__snapshots__/litegraph.test.ts.snap
+++ b/src/lib/litegraph/src/__snapshots__/litegraph.test.ts.snap
@@ -22,7 +22,7 @@ LiteGraphGlobal {
   "CurveEditor": [Function],
   "DEFAULT_FONT": "Inter",
   "DEFAULT_GROUP_FONT": 24,
-  "DEFAULT_GROUP_FONT_SIZE": undefined,
+  "DEFAULT_GROUP_FONT_SIZE": 24,
   "DEFAULT_POSITION": [
     100,
     100,
diff --git a/src/lib/litegraph/src/canvas/InputIndicators.ts b/src/lib/litegraph/src/canvas/InputIndicators.ts
index ad98cb533e..63579057bb 100644
--- a/src/lib/litegraph/src/canvas/InputIndicators.ts
+++ b/src/lib/litegraph/src/canvas/InputIndicators.ts
@@ -51,11 +51,11 @@ export class InputIndicators implements Disposable {
     const element = canvas.canvas
     const options = { capture: true, signal } satisfies AddEventListenerOptions
 
-    element.addEventListener('pointerdown', this.#onPointerDownOrMove, options)
-    element.addEventListener('pointermove', this.#onPointerDownOrMove, options)
-    element.addEventListener('pointerup', this.#onPointerUp, options)
-    element.addEventListener('keydown', this.#onKeyDownOrUp, options)
-    document.addEventListener('keyup', this.#onKeyDownOrUp, options)
+    element.addEventListener('pointerdown', this._onPointerDownOrMove, options)
+    element.addEventListener('pointermove', this._onPointerDownOrMove, options)
+    element.addEventListener('pointerup', this._onPointerUp, options)
+    element.addEventListener('keydown', this._onKeyDownOrUp, options)
+    document.addEventListener('keyup', this._onKeyDownOrUp, options)
 
     const origDrawFrontCanvas = canvas.drawFrontCanvas.bind(canvas)
     signal.addEventListener('abort', () => {
@@ -68,7 +68,7 @@ export class InputIndicators implements Disposable {
     }
   }
 
-  #onPointerDownOrMove = this.onPointerDownOrMove.bind(this)
+  private _onPointerDownOrMove = this.onPointerDownOrMove.bind(this)
   onPointerDownOrMove(e: MouseEvent): void {
     this.mouse0Down = (e.buttons & 1) === 1
     this.mouse1Down = (e.buttons & 4) === 4
@@ -80,14 +80,14 @@ export class InputIndicators implements Disposable {
     this.canvas.setDirty(true)
   }
 
-  #onPointerUp = this.onPointerUp.bind(this)
+  private _onPointerUp = this.onPointerUp.bind(this)
   onPointerUp(): void {
     this.mouse0Down = false
     this.mouse1Down = false
     this.mouse2Down = false
   }
 
-  #onKeyDownOrUp = this.onKeyDownOrUp.bind(this)
+  private _onKeyDownOrUp = this.onKeyDownOrUp.bind(this)
   onKeyDownOrUp(e: KeyboardEvent): void {
     this.ctrlDown = e.ctrlKey
     this.altDown = e.altKey
diff --git a/tests-ui/tests/litegraph/core/LinkConnector.test.ts b/src/lib/litegraph/src/canvas/LinkConnector.core.test.ts
similarity index 96%
rename from tests-ui/tests/litegraph/core/LinkConnector.test.ts
rename to src/lib/litegraph/src/canvas/LinkConnector.core.test.ts
index 486ee4f78a..4b1d29cca3 100644
--- a/tests-ui/tests/litegraph/core/LinkConnector.test.ts
+++ b/src/lib/litegraph/src/canvas/LinkConnector.core.test.ts
@@ -1,3 +1,4 @@
+// oxlint-disable no-empty-pattern
 import { test as baseTest, describe, expect, vi } from 'vitest'
 
 import type {
@@ -16,6 +17,10 @@ import {
   LinkDirection
 } from '@/lib/litegraph/src/litegraph'
 import type { ConnectingLink } from '@/lib/litegraph/src/interfaces'
+import {
+  createMockNodeInputSlot,
+  createMockNodeOutputSlot
+} from '@/utils/__tests__/litegraphTestUtils'
 
 interface TestContext {
   network: LinkNetwork & { add(node: LGraphNode): void }
@@ -135,7 +140,7 @@ describe('LinkConnector', () => {
       connector.state.connectingTo = 'input'
 
       expect(() => {
-        connector.moveInputLink(network, { link: 1 } as any)
+        connector.moveInputLink(network, createMockNodeInputSlot({ link: 1 }))
       }).toThrow('Already dragging links.')
     })
   })
@@ -173,7 +178,10 @@ describe('LinkConnector', () => {
       connector.state.connectingTo = 'output'
 
       expect(() => {
-        connector.moveOutputLink(network, { links: [1] } as any)
+        connector.moveOutputLink(
+          network,
+          createMockNodeOutputSlot({ links: [1] })
+        )
       }).toThrow('Already dragging links.')
     })
   })
diff --git a/tests-ui/tests/litegraph/core/LinkConnector.integration.test.ts b/src/lib/litegraph/src/canvas/LinkConnector.integration.test.ts
similarity index 94%
rename from tests-ui/tests/litegraph/core/LinkConnector.integration.test.ts
rename to src/lib/litegraph/src/canvas/LinkConnector.integration.test.ts
index e026ba0970..6717093450 100644
--- a/tests-ui/tests/litegraph/core/LinkConnector.integration.test.ts
+++ b/src/lib/litegraph/src/canvas/LinkConnector.integration.test.ts
@@ -1,3 +1,4 @@
+// oxlint-disable no-empty-pattern
 // TODO: Fix these tests after migration
 import { afterEach, describe, expect, vi } from 'vitest'
 
@@ -9,8 +10,12 @@ import type {
 } from '@/lib/litegraph/src/litegraph'
 import { LGraphNode, LLink, LinkConnector } from '@/lib/litegraph/src/litegraph'
 
-import { test as baseTest } from './fixtures/testExtensions'
+import { test as baseTest } from '../__fixtures__/testExtensions'
 import type { ConnectingLink } from '@/lib/litegraph/src/interfaces'
+import {
+  createMockCanvasPointerEvent,
+  createMockCanvasRenderingContext2D
+} from '@/utils/__tests__/litegraphTestUtils'
 
 interface TestContext {
   graph: LGraph
@@ -34,9 +39,9 @@ const test = baseTest.extend<TestContext>({
   },
 
   graph: async ({ reroutesComplexGraph }, use) => {
-    const ctx = vi.fn(() => ({ measureText: vi.fn(() => ({ width: 10 })) }))
+    const mockCtx = createMockCanvasRenderingContext2D()
     for (const node of reroutesComplexGraph.nodes) {
-      node.updateArea(ctx() as unknown as CanvasRenderingContext2D)
+      node.updateArea(mockCtx)
     }
     await use(reroutesComplexGraph)
   },
@@ -185,10 +190,10 @@ const test = baseTest.extend<TestContext>({
 })
 
 function mockedNodeTitleDropEvent(node: LGraphNode): CanvasPointerEvent {
-  return {
-    canvasX: node.pos[0] + node.size[0] / 2,
-    canvasY: node.pos[1] + 16
-  } as any
+  return createMockCanvasPointerEvent(
+    node.pos[0] + node.size[0] / 2,
+    node.pos[1] + 16
+  )
 }
 
 function mockedInputDropEvent(
@@ -196,10 +201,7 @@ function mockedInputDropEvent(
   slot: number
 ): CanvasPointerEvent {
   const pos = node.getInputPos(slot)
-  return {
-    canvasX: pos[0],
-    canvasY: pos[1]
-  } as any
+  return createMockCanvasPointerEvent(pos[0], pos[1])
 }
 
 function mockedOutputDropEvent(
@@ -207,10 +209,7 @@ function mockedOutputDropEvent(
   slot: number
 ): CanvasPointerEvent {
   const pos = node.getOutputPos(slot)
-  return {
-    canvasX: pos[0],
-    canvasY: pos[1]
-  } as any
+  return createMockCanvasPointerEvent(pos[0], pos[1])
 }
 
 describe('LinkConnector Integration', () => {
@@ -238,7 +237,7 @@ describe('LinkConnector Integration', () => {
 
       const canvasX = disconnectedNode.pos[0] + disconnectedNode.size[0] / 2
       const canvasY = disconnectedNode.pos[1] + 16
-      const dropEvent = { canvasX, canvasY } as any
+      const dropEvent = createMockCanvasPointerEvent(canvasX, canvasY)
 
       // Drop links, ensure reset has not been run
       connector.dropLinks(graph, dropEvent)
@@ -280,7 +279,7 @@ describe('LinkConnector Integration', () => {
 
       const canvasX = disconnectedNode.pos[0] + disconnectedNode.size[0] / 2
       const canvasY = disconnectedNode.pos[1] + 16
-      const dropEvent = { canvasX, canvasY } as any
+      const dropEvent = createMockCanvasPointerEvent(canvasX, canvasY)
 
       connector.dropLinks(graph, dropEvent)
       connector.reset()
@@ -421,7 +420,7 @@ describe('LinkConnector Integration', () => {
 
       const canvasX = disconnectedNode.pos[0] + disconnectedNode.size[0] / 2
       const canvasY = disconnectedNode.pos[1] + 16
-      const dropEvent = { canvasX, canvasY } as any
+      const dropEvent = createMockCanvasPointerEvent(canvasX, canvasY)
 
       connector.dropLinks(graph, dropEvent)
       connector.reset()
@@ -472,9 +471,10 @@ describe('LinkConnector Integration', () => {
       expect(floatingLink).toBeInstanceOf(LLink)
       const floatingReroute = LLink.getReroutes(graph, floatingLink)[0]
 
-      const canvasX = floatingReroute.pos[0]
-      const canvasY = floatingReroute.pos[1]
-      const dropEvent = { canvasX, canvasY } as any
+      const dropEvent = createMockCanvasPointerEvent(
+        floatingReroute.pos[0],
+        floatingReroute.pos[1]
+      )
 
       connector.dropLinks(graph, dropEvent)
       connector.reset()
@@ -553,7 +553,10 @@ describe('LinkConnector Integration', () => {
       const manyOutputsNode = graph.getNodeById(4)!
       const canvasX = floatingReroute.pos[0]
       const canvasY = floatingReroute.pos[1]
-      const floatingRerouteEvent = { canvasX, canvasY } as any
+      const floatingRerouteEvent = createMockCanvasPointerEvent(
+        canvasX,
+        canvasY
+      )
 
       connector.moveOutputLink(graph, manyOutputsNode.outputs[0])
       connector.dropLinks(graph, floatingRerouteEvent)
@@ -578,7 +581,7 @@ describe('LinkConnector Integration', () => {
 
       const canvasX = reroute7.pos[0]
       const canvasY = reroute7.pos[1]
-      const reroute7Event = { canvasX, canvasY } as any
+      const reroute7Event = createMockCanvasPointerEvent(canvasX, canvasY)
 
       const toSortedRerouteChain = (linkIds: number[]) =>
         linkIds
@@ -697,7 +700,7 @@ describe('LinkConnector Integration', () => {
       const canvasY = disconnectedNode.pos[1]
 
       connector.dragFromReroute(graph, floatingReroute)
-      connector.dropLinks(graph, { canvasX, canvasY } as any)
+      connector.dropLinks(graph, createMockCanvasPointerEvent(canvasX, canvasY))
       connector.reset()
 
       expect(graph.floatingLinks.size).toBe(0)
@@ -715,7 +718,7 @@ describe('LinkConnector Integration', () => {
       const canvasY = reroute8.pos[1]
 
       connector.dragFromReroute(graph, floatingReroute)
-      connector.dropLinks(graph, { canvasX, canvasY } as any)
+      connector.dropLinks(graph, createMockCanvasPointerEvent(canvasX, canvasY))
       connector.reset()
 
       expect(graph.floatingLinks.size).toBe(0)
@@ -800,10 +803,10 @@ describe('LinkConnector Integration', () => {
     connector.moveOutputLink(graph, floatingOutNode.outputs[0])
 
     const manyOutputsNode = graph.getNodeById(4)!
-    const dropEvent = {
-      canvasX: manyOutputsNode.pos[0],
-      canvasY: manyOutputsNode.pos[1]
-    } as any
+    const dropEvent = createMockCanvasPointerEvent(
+      manyOutputsNode.pos[0],
+      manyOutputsNode.pos[1]
+    )
     connector.dropLinks(graph, dropEvent)
     connector.reset()
 
@@ -817,9 +820,11 @@ describe('LinkConnector Integration', () => {
     connector.moveOutputLink(graph, manyOutputsNode.outputs[0])
 
     const disconnectedNode = graph.getNodeById(9)!
-    dropEvent.canvasX = disconnectedNode.pos[0]
-    dropEvent.canvasY = disconnectedNode.pos[1]
-    connector.dropLinks(graph, dropEvent)
+    const dropEvent2 = createMockCanvasPointerEvent(
+      disconnectedNode.pos[0],
+      disconnectedNode.pos[1]
+    )
+    connector.dropLinks(graph, dropEvent2)
     connector.reset()
 
     const newOutput = disconnectedNode.outputs[0]
@@ -950,10 +955,10 @@ describe('LinkConnector Integration', () => {
 
       const targetReroute = graph.reroutes.get(targetRerouteId)!
       const nextLinkIds = getNextLinkIds(targetReroute.linkIds)
-      const dropEvent = {
-        canvasX: targetReroute.pos[0],
-        canvasY: targetReroute.pos[1]
-      } as any
+      const dropEvent = createMockCanvasPointerEvent(
+        targetReroute.pos[0],
+        targetReroute.pos[1]
+      )
 
       connector.dragNewFromOutput(
         graph,
@@ -1077,6 +1082,7 @@ describe('LinkConnector Integration', () => {
       const originalParentChain = LLink.getReroutes(graph, toReroute)
 
       const sortAndJoin = (numbers: Iterable<number>) =>
+        // oxlint-disable-next-line require-array-sort-compare
         [...numbers].sort().join(',')
       const hasIdenticalLinks = (a: Reroute, b: Reroute) =>
         sortAndJoin(a.linkIds) === sortAndJoin(b.linkIds) &&
@@ -1092,10 +1098,10 @@ describe('LinkConnector Integration', () => {
 
       connector.dragFromReroute(graph, fromReroute)
 
-      const dropEvent = {
-        canvasX: toReroute.pos[0],
-        canvasY: toReroute.pos[1]
-      } as any
+      const dropEvent = createMockCanvasPointerEvent(
+        toReroute.pos[0],
+        toReroute.pos[1]
+      )
       connector.dropLinks(graph, dropEvent)
       connector.reset()
 
@@ -1165,10 +1171,10 @@ describe('LinkConnector Integration', () => {
       const fromReroute = graph.reroutes.get(from)!
       const toReroute = graph.reroutes.get(to)!
 
-      const dropEvent = {
-        canvasX: toReroute.pos[0],
-        canvasY: toReroute.pos[1]
-      } as any
+      const dropEvent = createMockCanvasPointerEvent(
+        toReroute.pos[0],
+        toReroute.pos[1]
+      )
 
       connector.dragFromReroute(graph, fromReroute)
       connector.dropLinks(graph, dropEvent)
@@ -1202,10 +1208,10 @@ describe('LinkConnector Integration', () => {
       const node = graph.getNodeById(nodeId)!
       const input = node.inputs[0]
       const reroute = graph.getReroute(rerouteId)!
-      const dropEvent = {
-        canvasX: reroute.pos[0],
-        canvasY: reroute.pos[1]
-      } as any
+      const dropEvent = createMockCanvasPointerEvent(
+        reroute.pos[0],
+        reroute.pos[1]
+      )
 
       connector.dragNewFromInput(graph, node, input)
       connector.dropLinks(graph, dropEvent)
@@ -1232,7 +1238,7 @@ describe('LinkConnector Integration', () => {
 
       const node = graph.getNodeById(nodeId)!
       const reroute = graph.getReroute(rerouteId)!
-      const dropEvent = { canvasX: node.pos[0], canvasY: node.pos[1] } as any
+      const dropEvent = createMockCanvasPointerEvent(node.pos[0], node.pos[1])
 
       connector.dragFromReroute(graph, reroute)
       connector.dropLinks(graph, dropEvent)
@@ -1260,10 +1266,10 @@ describe('LinkConnector Integration', () => {
       const node = graph.getNodeById(nodeId)!
       const reroute = graph.getReroute(rerouteId)!
       const inputPos = node.getInputPos(0)
-      const dropOnInputEvent = {
-        canvasX: inputPos[0],
-        canvasY: inputPos[1]
-      } as any
+      const dropOnInputEvent = createMockCanvasPointerEvent(
+        inputPos[0],
+        inputPos[1]
+      )
 
       connector.dragFromReroute(graph, reroute)
       connector.dropLinks(graph, dropOnInputEvent)
diff --git a/tests-ui/tests/litegraph/canvas/LinkConnector.test.ts b/src/lib/litegraph/src/canvas/LinkConnector.test.ts
similarity index 76%
rename from tests-ui/tests/litegraph/canvas/LinkConnector.test.ts
rename to src/lib/litegraph/src/canvas/LinkConnector.test.ts
index 29786bdf15..9ec8e3dfbc 100644
--- a/tests-ui/tests/litegraph/canvas/LinkConnector.test.ts
+++ b/src/lib/litegraph/src/canvas/LinkConnector.test.ts
@@ -1,23 +1,46 @@
 // TODO: Fix these tests after migration
 import { beforeEach, describe, expect, test, vi } from 'vitest'
 
-import type { INodeInputSlot, LGraphNode } from '@/lib/litegraph/src/litegraph'
-// We don't strictly need RenderLink interface import for the mock
 import { LinkConnector } from '@/lib/litegraph/src/litegraph'
+import {
+  createMockCanvasPointerEvent,
+  createMockLGraphNode,
+  createMockLinkNetwork,
+  createMockNodeInputSlot,
+  createMockNodeOutputSlot
+} from '@/utils/__tests__/litegraphTestUtils'
 
 // Mocks
 const mockSetConnectingLinks = vi.fn()
 
+type RenderLinkItem = LinkConnector['renderLinks'][number]
+
 // Mock a structure that has the needed method
-function mockRenderLinkImpl(canConnect: boolean) {
-  return {
-    canConnectToInput: vi.fn().mockReturnValue(canConnect)
-    // Add other properties if they become necessary for tests
+function mockRenderLinkImpl(canConnect: boolean): RenderLinkItem {
+  const partial: Partial<RenderLinkItem> = {
+    toType: 'output',
+    fromPos: [0, 0],
+    fromSlotIndex: 0,
+    fromDirection: 0,
+    network: createMockLinkNetwork(),
+    node: createMockLGraphNode(),
+    fromSlot: createMockNodeOutputSlot(),
+    dragDirection: 0,
+    canConnectToInput: vi.fn().mockReturnValue(canConnect),
+    canConnectToOutput: vi.fn().mockReturnValue(false),
+    canConnectToReroute: vi.fn().mockReturnValue(false),
+    connectToInput: vi.fn(),
+    connectToOutput: vi.fn(),
+    connectToSubgraphInput: vi.fn(),
+    connectToRerouteOutput: vi.fn(),
+    connectToSubgraphOutput: vi.fn(),
+    connectToRerouteInput: vi.fn()
   }
+  return partial as RenderLinkItem
 }
 
-const mockNode = {} as LGraphNode
-const mockInput = {} as INodeInputSlot
+const mockNode = createMockLGraphNode()
+const mockInput = createMockNodeInputSlot()
 
 describe.skip('LinkConnector', () => {
   let connector: LinkConnector
@@ -37,8 +60,7 @@ describe.skip('LinkConnector', () => {
     test('should return true if at least one render link can connect', () => {
       const link1 = mockRenderLinkImpl(false)
       const link2 = mockRenderLinkImpl(true)
-      // Cast to any to satisfy the push requirement, as we only need the canConnectToInput method
-      connector.renderLinks.push(link1 as any, link2 as any)
+      connector.renderLinks.push(link1, link2)
       expect(connector.isInputValidDrop(mockNode, mockInput)).toBe(true)
       expect(link1.canConnectToInput).toHaveBeenCalledWith(mockNode, mockInput)
       expect(link2.canConnectToInput).toHaveBeenCalledWith(mockNode, mockInput)
@@ -47,7 +69,7 @@ describe.skip('LinkConnector', () => {
     test('should return false if no render links can connect', () => {
       const link1 = mockRenderLinkImpl(false)
       const link2 = mockRenderLinkImpl(false)
-      connector.renderLinks.push(link1 as any, link2 as any)
+      connector.renderLinks.push(link1, link2)
       expect(connector.isInputValidDrop(mockNode, mockInput)).toBe(false)
       expect(link1.canConnectToInput).toHaveBeenCalledWith(mockNode, mockInput)
       expect(link2.canConnectToInput).toHaveBeenCalledWith(mockNode, mockInput)
@@ -57,7 +79,7 @@ describe.skip('LinkConnector', () => {
       const link1 = mockRenderLinkImpl(false)
       const link2 = mockRenderLinkImpl(true) // This one can connect
       const link3 = mockRenderLinkImpl(false)
-      connector.renderLinks.push(link1 as any, link2 as any, link3 as any)
+      connector.renderLinks.push(link1, link2, link3)
 
       expect(connector.isInputValidDrop(mockNode, mockInput)).toBe(true)
 
@@ -88,7 +110,10 @@ describe.skip('LinkConnector', () => {
 
     test('should call the listener when the event is dispatched before reset', () => {
       const listener = vi.fn()
-      const eventData = { renderLinks: [], event: {} as any } // Mock event data
+      const eventData = {
+        renderLinks: [],
+        event: createMockCanvasPointerEvent(0, 0)
+      }
       connector.listenUntilReset('before-drop-links', listener)
 
       connector.events.dispatch('before-drop-links', eventData)
@@ -120,7 +145,10 @@ describe.skip('LinkConnector', () => {
 
     test('should not call the listener after reset is dispatched', () => {
       const listener = vi.fn()
-      const eventData = { renderLinks: [], event: {} as any }
+      const eventData = {
+        renderLinks: [],
+        event: createMockCanvasPointerEvent(0, 0)
+      }
       connector.listenUntilReset('before-drop-links', listener)
 
       // Dispatch reset first
diff --git a/src/lib/litegraph/src/canvas/LinkConnector.ts b/src/lib/litegraph/src/canvas/LinkConnector.ts
index 1e4068d1b3..73d57e40d6 100644
--- a/src/lib/litegraph/src/canvas/LinkConnector.ts
+++ b/src/lib/litegraph/src/canvas/LinkConnector.ts
@@ -1,3 +1,5 @@
+import { remove } from 'es-toolkit'
+
 import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
 import { LLink } from '@/lib/litegraph/src/LLink'
 import type { Reroute } from '@/lib/litegraph/src/Reroute'
@@ -13,7 +15,8 @@ import type {
   INodeOutputSlot,
   ItemLocator,
   LinkNetwork,
-  LinkSegment
+  LinkSegment,
+  Point
 } from '@/lib/litegraph/src/interfaces'
 import { EmptySubgraphInput } from '@/lib/litegraph/src/subgraph/EmptySubgraphInput'
 import { EmptySubgraphOutput } from '@/lib/litegraph/src/subgraph/EmptySubgraphOutput'
@@ -115,10 +118,10 @@ export class LinkConnector {
   /** The reroute beneath the pointer, if it is a valid connection target. */
   overReroute?: Reroute
 
-  readonly #setConnectingLinks: (value: ConnectingLink[]) => void
+  private readonly _setConnectingLinks: (value: ConnectingLink[]) => void
 
   constructor(setConnectingLinks: (value: ConnectingLink[]) => void) {
-    this.#setConnectingLinks = setConnectingLinks
+    this._setConnectingLinks = setConnectingLinks
   }
 
   get isConnecting() {
@@ -130,7 +133,11 @@ export class LinkConnector {
   }
 
   /** Drag an existing link to a different input. */
-  moveInputLink(network: LinkNetwork, input: INodeInputSlot): void {
+  moveInputLink(
+    network: LinkNetwork,
+    input: INodeInputSlot,
+    opts?: { startPoint?: Point }
+  ): void {
     if (this.isConnecting) throw new Error('Already dragging links.')
 
     const { state, inputLinks, renderLinks } = this
@@ -221,7 +228,13 @@ export class LinkConnector {
         // Regular node links
         try {
           const reroute = network.getReroute(link.parentId)
-          const renderLink = new MovingInputLink(network, link, reroute)
+          const renderLink = new MovingInputLink(
+            network,
+            link,
+            reroute,
+            undefined,
+            opts?.startPoint
+          )
 
           const mayContinue = this.events.dispatch(
             'before-move-input',
@@ -253,7 +266,7 @@ export class LinkConnector {
     state.connectingTo = 'input'
     state.draggingExistingLinks = true
 
-    this.#setLegacyLinks(false)
+    this._setLegacyLinks(false)
   }
 
   /** Drag all links from an output to a new output. */
@@ -364,7 +377,7 @@ export class LinkConnector {
     state.multi = true
     state.connectingTo = 'output'
 
-    this.#setLegacyLinks(true)
+    this._setLegacyLinks(true)
   }
 
   /**
@@ -387,7 +400,7 @@ export class LinkConnector {
 
     state.connectingTo = 'input'
 
-    this.#setLegacyLinks(false)
+    this._setLegacyLinks(false)
   }
 
   /**
@@ -410,7 +423,7 @@ export class LinkConnector {
 
     state.connectingTo = 'output'
 
-    this.#setLegacyLinks(true)
+    this._setLegacyLinks(true)
   }
 
   dragNewFromSubgraphInput(
@@ -431,7 +444,7 @@ export class LinkConnector {
 
     this.state.connectingTo = 'input'
 
-    this.#setLegacyLinks(false)
+    this._setLegacyLinks(false)
   }
 
   dragNewFromSubgraphOutput(
@@ -452,7 +465,7 @@ export class LinkConnector {
 
     this.state.connectingTo = 'output'
 
-    this.#setLegacyLinks(true)
+    this._setLegacyLinks(true)
   }
 
   /**
@@ -489,7 +502,7 @@ export class LinkConnector {
 
       this.state.connectingTo = 'input'
 
-      this.#setLegacyLinks(false)
+      this._setLegacyLinks(false)
       return
     }
 
@@ -516,7 +529,7 @@ export class LinkConnector {
 
     this.state.connectingTo = 'input'
 
-    this.#setLegacyLinks(false)
+    this._setLegacyLinks(false)
   }
 
   /**
@@ -553,7 +566,7 @@ export class LinkConnector {
 
       this.state.connectingTo = 'output'
 
-      this.#setLegacyLinks(false)
+      this._setLegacyLinks(false)
       return
     }
 
@@ -581,7 +594,7 @@ export class LinkConnector {
 
     this.state.connectingTo = 'output'
 
-    this.#setLegacyLinks(true)
+    this._setLegacyLinks(true)
   }
 
   dragFromLinkSegment(network: LinkNetwork, linkSegment: LinkSegment): void {
@@ -603,7 +616,7 @@ export class LinkConnector {
 
     state.connectingTo = 'input'
 
-    this.#setLegacyLinks(false)
+    this._setLegacyLinks(false)
   }
 
   /**
@@ -754,7 +767,7 @@ export class LinkConnector {
       const output = node.getOutputOnPos([canvasX, canvasY])
 
       if (output) {
-        this.#dropOnOutput(node, output)
+        this._dropOnOutput(node, output)
       } else {
         this.connectToNode(node, event)
       }
@@ -765,7 +778,7 @@ export class LinkConnector {
 
       // Input slot
       if (inputOrSocket) {
-        this.#dropOnInput(node, inputOrSocket)
+        this._dropOnInput(node, inputOrSocket)
       } else {
         // Node background / title
         this.connectToNode(node, event)
@@ -860,6 +873,11 @@ export class LinkConnector {
   }
 
   dropOnNothing(event: CanvasPointerEvent): void {
+    remove(
+      this.renderLinks,
+      (link) => link instanceof MovingInputLink && link.disconnectOnDrop
+    ).forEach((link) => (link as MovingLinkBase).disconnect())
+    if (this.renderLinks.length === 0) return
     // For external event only.
     const mayContinue = this.events.dispatch('dropped-on-canvas', event)
     if (mayContinue === false) return
@@ -911,7 +929,7 @@ export class LinkConnector {
         return
       }
 
-      this.#dropOnOutput(node, output)
+      this._dropOnOutput(node, output)
     } else if (connectingTo === 'input') {
       // Dropping new input link
       const input = node.findInputByType(firstLink.fromSlot.type)?.slot
@@ -922,11 +940,11 @@ export class LinkConnector {
         return
       }
 
-      this.#dropOnInput(node, input)
+      this._dropOnInput(node, input)
     }
   }
 
-  #dropOnInput(node: LGraphNode, input: INodeInputSlot): void {
+  private _dropOnInput(node: LGraphNode, input: INodeInputSlot): void {
     for (const link of this.renderLinks) {
       if (!link.canConnectToInput(node, input)) continue
 
@@ -934,7 +952,7 @@ export class LinkConnector {
     }
   }
 
-  #dropOnOutput(node: LGraphNode, output: INodeOutputSlot): void {
+  private _dropOnOutput(node: LGraphNode, output: INodeOutputSlot): void {
     for (const link of this.renderLinks) {
       if (!link.canConnectToOutput(node, output)) {
         if (
@@ -1014,7 +1032,7 @@ export class LinkConnector {
   }
 
   /** Sets connecting_links, used by some extensions still. */
-  #setLegacyLinks(fromSlotIsInput: boolean): void {
+  private _setLegacyLinks(fromSlotIsInput: boolean): void {
     const links = this.renderLinks.map((link) => {
       const input = fromSlotIsInput ? (link.fromSlot as INodeInputSlot) : null
       const output = fromSlotIsInput ? null : (link.fromSlot as INodeOutputSlot)
@@ -1033,7 +1051,7 @@ export class LinkConnector {
         afterRerouteId
       } satisfies ConnectingLink
     })
-    this.#setConnectingLinks(links)
+    this._setConnectingLinks(links)
   }
 
   /**
diff --git a/tests-ui/tests/litegraph/canvas/LinkConnectorSubgraphInputValidation.test.ts b/src/lib/litegraph/src/canvas/LinkConnectorSubgraphInputValidation.test.ts
similarity index 88%
rename from tests-ui/tests/litegraph/canvas/LinkConnectorSubgraphInputValidation.test.ts
rename to src/lib/litegraph/src/canvas/LinkConnectorSubgraphInputValidation.test.ts
index 072a0fb4c3..931bc1e427 100644
--- a/tests-ui/tests/litegraph/canvas/LinkConnectorSubgraphInputValidation.test.ts
+++ b/src/lib/litegraph/src/canvas/LinkConnectorSubgraphInputValidation.test.ts
@@ -9,10 +9,20 @@ import {
   LLink
 } from '@/lib/litegraph/src/litegraph'
 import { ToInputFromIoNodeLink } from '@/lib/litegraph/src/canvas/ToInputFromIoNodeLink'
-import type { NodeInputSlot } from '@/lib/litegraph/src/litegraph'
+import type {
+  CanvasPointerEvent,
+  NodeInputSlot
+} from '@/lib/litegraph/src/litegraph'
 import { LinkDirection } from '@/lib/litegraph/src/types/globalEnums'
 
-import { createTestSubgraph } from '../subgraph/fixtures/subgraphHelpers'
+import { createTestSubgraph } from '../subgraph/__fixtures__/subgraphHelpers'
+import {
+  createMockCanvasPointerEvent,
+  createMockNodeInputSlot
+} from '@/utils/__tests__/litegraphTestUtils'
+
+type MockPointerEvent = CanvasPointerEvent
+type MockRenderLink = ToOutputRenderLink
 
 describe('LinkConnector SubgraphInput connection validation', () => {
   let connector: LinkConnector
@@ -63,6 +73,28 @@ describe('LinkConnector SubgraphInput connection validation', () => {
       expect(toTargetNode.onConnectionsChange).toHaveBeenCalledTimes(1)
       expect(fromTargetNode.onConnectionsChange).toHaveBeenCalledTimes(1)
     })
+    it('should allow reconnection to same target', () => {
+      const subgraph = createTestSubgraph({
+        inputs: [{ name: 'number_input', type: 'number' }]
+      })
+
+      const node = new LGraphNode('TargetNode')
+      node.addInput('number_in', 'number')
+      subgraph.add(node)
+
+      const link = subgraph.inputNode.slots[0].connect(node.inputs[0], node)
+
+      const renderLink = new ToInputFromIoNodeLink(
+        subgraph,
+        subgraph.inputNode,
+        subgraph.inputNode.slots[0],
+        undefined,
+        LinkDirection.CENTER,
+        link
+      )
+      renderLink.connectToInput(node, node.inputs[0], connector.events)
+      expect(node.inputs[0].link).not.toBeNull()
+    })
   })
 
   describe('MovingOutputLink validation', () => {
@@ -206,10 +238,7 @@ describe('LinkConnector SubgraphInput connection validation', () => {
       connector.state.connectingTo = 'output'
 
       // Create mock event
-      const mockEvent = {
-        canvasX: 100,
-        canvasY: 100
-      } as any
+      const mockEvent: MockPointerEvent = createMockCanvasPointerEvent(100, 100)
 
       // Mock the getSlotInPosition to return the subgraph input
       const mockGetSlotInPosition = vi.fn().mockReturnValue(subgraph.inputs[0])
@@ -256,10 +285,7 @@ describe('LinkConnector SubgraphInput connection validation', () => {
       connector.state.connectingTo = 'output'
 
       // Create mock event
-      const mockEvent = {
-        canvasX: 100,
-        canvasY: 100
-      } as any
+      const mockEvent: MockPointerEvent = createMockCanvasPointerEvent(100, 100)
 
       // Mock the getSlotInPosition to return the subgraph input
       const mockGetSlotInPosition = vi.fn().mockReturnValue(subgraph.inputs[0])
@@ -342,12 +368,12 @@ describe('LinkConnector SubgraphInput connection validation', () => {
       })
 
       // Create a mock render link without the method
-      const mockLink = {
-        fromSlot: { type: 'number' }
+      const mockLink: Partial<MockRenderLink> = {
+        fromSlot: createMockNodeInputSlot({ type: 'number' })
         // No canConnectToSubgraphInput method
-      } as any
+      }
 
-      connector.renderLinks.push(mockLink)
+      connector.renderLinks.push(mockLink as MockRenderLink)
 
       const subgraphInput = subgraph.inputs[0]
 
diff --git a/src/lib/litegraph/src/canvas/MovingInputLink.ts b/src/lib/litegraph/src/canvas/MovingInputLink.ts
index fb094222cf..3e8ddce585 100644
--- a/src/lib/litegraph/src/canvas/MovingInputLink.ts
+++ b/src/lib/litegraph/src/canvas/MovingInputLink.ts
@@ -1,4 +1,5 @@
 import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
+import { LiteGraph } from '@/lib/litegraph/src/litegraph'
 import type { LLink } from '@/lib/litegraph/src/LLink'
 import type { Reroute } from '@/lib/litegraph/src/Reroute'
 import type { CustomEventTarget } from '@/lib/litegraph/src/infrastructure/CustomEventTarget'
@@ -24,12 +25,15 @@ export class MovingInputLink extends MovingLinkBase {
   readonly fromPos: Point
   readonly fromDirection: LinkDirection
   readonly fromSlotIndex: number
+  disconnectOnDrop: boolean
+  readonly disconnectOrigin: Point
 
   constructor(
     network: LinkNetwork,
     link: LLink,
     fromReroute?: Reroute,
-    dragDirection: LinkDirection = LinkDirection.CENTER
+    dragDirection: LinkDirection = LinkDirection.CENTER,
+    startPoint?: Point
   ) {
     super(network, link, 'input', fromReroute, dragDirection)
 
@@ -38,6 +42,8 @@ export class MovingInputLink extends MovingLinkBase {
     this.fromPos = fromReroute?.pos ?? this.outputPos
     this.fromDirection = LinkDirection.NONE
     this.fromSlotIndex = this.outputIndex
+    this.disconnectOnDrop = true
+    this.disconnectOrigin = startPoint ?? this.inputPos
   }
 
   canConnectToInput(
@@ -130,4 +136,23 @@ export class MovingInputLink extends MovingLinkBase {
   disconnect(): boolean {
     return this.inputNode.disconnectInput(this.inputIndex, true)
   }
+
+  drawConnectionCircle(ctx: CanvasRenderingContext2D, to: Readonly<Point>) {
+    if (!this.disconnectOnDrop) return
+
+    const [originX, originY] = this.disconnectOrigin
+    const radius = 35
+    const distSquared = (originX - to[0]) ** 2 + (originY - to[1]) ** 2
+
+    ctx.save()
+    ctx.strokeStyle = LiteGraph.WIDGET_OUTLINE_COLOR
+    ctx.lineWidth = 2
+    ctx.beginPath()
+    ctx.moveTo(originX + radius, originY)
+    ctx.arc(originX, originY, radius, 0, Math.PI * 2)
+    ctx.stroke()
+    ctx.restore()
+
+    this.disconnectOnDrop = distSquared < radius ** 2
+  }
 }
diff --git a/src/lib/litegraph/src/canvas/ToInputFromIoNodeLink.ts b/src/lib/litegraph/src/canvas/ToInputFromIoNodeLink.ts
index 073c777f1f..7e5880212b 100644
--- a/src/lib/litegraph/src/canvas/ToInputFromIoNodeLink.ts
+++ b/src/lib/litegraph/src/canvas/ToInputFromIoNodeLink.ts
@@ -58,6 +58,12 @@ export class ToInputFromIoNodeLink implements RenderLink {
     events: CustomEventTarget<LinkConnectorEventMap>
   ) {
     const { fromSlot, fromReroute, existingLink } = this
+    if (
+      existingLink &&
+      node.id === existingLink.target_id &&
+      node.inputs[existingLink.target_slot] === input
+    )
+      return
 
     const newLink = fromSlot.connect(input, node, fromReroute?.id)
 
diff --git a/src/lib/litegraph/src/canvas/ToOutputRenderLink.test.ts b/src/lib/litegraph/src/canvas/ToOutputRenderLink.test.ts
new file mode 100644
index 0000000000..7c9706ee6f
--- /dev/null
+++ b/src/lib/litegraph/src/canvas/ToOutputRenderLink.test.ts
@@ -0,0 +1,110 @@
+import { describe, expect, it, vi } from 'vitest'
+
+import {
+  LinkDirection,
+  ToOutputRenderLink
+} from '@/lib/litegraph/src/litegraph'
+import type { CustomEventTarget } from '@/lib/litegraph/src/infrastructure/CustomEventTarget'
+import type { LinkConnectorEventMap } from '@/lib/litegraph/src/infrastructure/LinkConnectorEventMap'
+import {
+  createMockLGraphNode,
+  createMockLinkNetwork,
+  createMockNodeInputSlot,
+  createMockNodeOutputSlot
+} from '@/utils/__tests__/litegraphTestUtils'
+
+describe('ToOutputRenderLink', () => {
+  describe('connectToOutput', () => {
+    it('should return early if inputNode is null', () => {
+      // Setup
+      const mockNetwork = createMockLinkNetwork()
+      const mockFromSlot = createMockNodeInputSlot()
+      const mockNode = createMockLGraphNode({
+        inputs: [mockFromSlot],
+        getInputPos: vi.fn().mockReturnValue([0, 0])
+      })
+
+      const renderLink = new ToOutputRenderLink(
+        mockNetwork,
+        mockNode,
+        mockFromSlot,
+        undefined,
+        LinkDirection.CENTER
+      )
+
+      // Override the node property to simulate null case
+      Object.defineProperty(renderLink, 'node', {
+        value: null
+      })
+
+      const mockTargetNode = createMockLGraphNode({
+        connectSlots: vi.fn()
+      })
+      const mockEvents: Partial<CustomEventTarget<LinkConnectorEventMap>> = {
+        addEventListener: vi.fn(),
+        removeEventListener: vi.fn(),
+        dispatchEvent: vi.fn(),
+        dispatch: vi.fn()
+      }
+
+      // Act
+      renderLink.connectToOutput(
+        mockTargetNode,
+        createMockNodeOutputSlot(),
+        mockEvents as CustomEventTarget<LinkConnectorEventMap>
+      )
+
+      // Assert
+      expect(mockTargetNode.connectSlots).not.toHaveBeenCalled()
+      expect(mockEvents.dispatch).not.toHaveBeenCalled()
+    })
+
+    it('should create connection and dispatch event when inputNode exists', () => {
+      // Setup
+      const mockNetwork = createMockLinkNetwork()
+      const mockFromSlot = createMockNodeInputSlot()
+      const mockNode = createMockLGraphNode({
+        inputs: [mockFromSlot],
+        getInputPos: vi.fn().mockReturnValue([0, 0])
+      })
+
+      const renderLink = new ToOutputRenderLink(
+        mockNetwork,
+        mockNode,
+        mockFromSlot,
+        undefined,
+        LinkDirection.CENTER
+      )
+
+      const mockNewLink = { id: 'new-link' }
+      const mockTargetNode = createMockLGraphNode({
+        connectSlots: vi.fn().mockReturnValue(mockNewLink)
+      })
+      const mockEvents: Partial<CustomEventTarget<LinkConnectorEventMap>> = {
+        addEventListener: vi.fn(),
+        removeEventListener: vi.fn(),
+        dispatchEvent: vi.fn(),
+        dispatch: vi.fn()
+      }
+
+      // Act
+      renderLink.connectToOutput(
+        mockTargetNode,
+        createMockNodeOutputSlot(),
+        mockEvents as CustomEventTarget<LinkConnectorEventMap>
+      )
+
+      // Assert
+      expect(mockTargetNode.connectSlots).toHaveBeenCalledWith(
+        expect.anything(),
+        mockNode,
+        mockFromSlot,
+        undefined
+      )
+      expect(mockEvents.dispatch).toHaveBeenCalledWith(
+        'link-created',
+        mockNewLink
+      )
+    })
+  })
+})
diff --git a/tests-ui/tests/litegraph/core/contextMenuCompat.test.ts b/src/lib/litegraph/src/contextMenuCompat.test.ts
similarity index 87%
rename from tests-ui/tests/litegraph/core/contextMenuCompat.test.ts
rename to src/lib/litegraph/src/contextMenuCompat.test.ts
index fc4c7d156b..e8afeca9be 100644
--- a/tests-ui/tests/litegraph/core/contextMenuCompat.test.ts
+++ b/src/lib/litegraph/src/contextMenuCompat.test.ts
@@ -3,6 +3,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { legacyMenuCompat } from '@/lib/litegraph/src/contextMenuCompat'
 import type { IContextMenuValue } from '@/lib/litegraph/src/litegraph'
 import { LGraphCanvas } from '@/lib/litegraph/src/litegraph'
+import { createMockCanvas } from '@/utils/__tests__/litegraphTestUtils'
 
 describe('contextMenuCompat', () => {
   let originalGetCanvasMenuOptions: typeof LGraphCanvas.prototype.getCanvasMenuOptions
@@ -13,11 +14,11 @@ describe('contextMenuCompat', () => {
     originalGetCanvasMenuOptions = LGraphCanvas.prototype.getCanvasMenuOptions
 
     // Create mock canvas
-    mockCanvas = {
+    mockCanvas = createMockCanvas({
       constructor: {
         prototype: LGraphCanvas.prototype
-      }
-    } as unknown as LGraphCanvas
+      } as typeof LGraphCanvas
+    } as Partial<LGraphCanvas>)
 
     // Clear console warnings
     vi.spyOn(console, 'warn').mockImplementation(() => {})
@@ -54,11 +55,12 @@ describe('contextMenuCompat', () => {
 
       // Simulate extension monkey-patching
       const original = LGraphCanvas.prototype.getCanvasMenuOptions
-      LGraphCanvas.prototype.getCanvasMenuOptions = function (...args: any[]) {
-        const items = (original as any).apply(this, args)
-        items.push({ content: 'Custom Item', callback: () => {} })
-        return items
-      }
+      LGraphCanvas.prototype.getCanvasMenuOptions =
+        function (): (IContextMenuValue | null)[] {
+          const items = original.call(this)
+          items.push({ content: 'Custom Item', callback: () => {} })
+          return items
+        }
 
       // Should have logged a warning with extension name
       expect(warnSpy).toHaveBeenCalledWith(
@@ -83,8 +85,10 @@ describe('contextMenuCompat', () => {
       legacyMenuCompat.install(LGraphCanvas.prototype, methodName)
       legacyMenuCompat.setCurrentExtension('test.extension')
 
-      const patchFunction = function (this: LGraphCanvas, ...args: any[]) {
-        const items = (originalGetCanvasMenuOptions as any).apply(this, args)
+      const patchFunction = function (
+        this: LGraphCanvas
+      ): (IContextMenuValue | null)[] {
+        const items = originalGetCanvasMenuOptions.call(this)
         items.push({ content: 'Custom', callback: () => {} })
         return items
       }
@@ -191,6 +195,42 @@ describe('contextMenuCompat', () => {
         expect.any(Error)
       )
     })
+
+    it('should handle multiple items with undefined content correctly', () => {
+      // Setup base method with items that have undefined content
+      LGraphCanvas.prototype.getCanvasMenuOptions = function () {
+        return [
+          { content: undefined, title: 'Separator 1' },
+          { content: undefined, title: 'Separator 2' },
+          { content: 'Item 1', callback: () => {} }
+        ]
+      }
+
+      legacyMenuCompat.install(LGraphCanvas.prototype, 'getCanvasMenuOptions')
+
+      // Monkey-patch to add an item with undefined content
+      const original = LGraphCanvas.prototype.getCanvasMenuOptions
+      LGraphCanvas.prototype.getCanvasMenuOptions =
+        function (): (IContextMenuValue | null)[] {
+          const items = original.apply(this)
+          items.push({ content: undefined, title: 'Separator 3' })
+          return items
+        }
+
+      // Extract legacy items
+      const legacyItems = legacyMenuCompat.extractLegacyItems(
+        'getCanvasMenuOptions',
+        mockCanvas
+      )
+
+      // Should extract only the newly added item with undefined content
+      // (not collapse with existing undefined content items)
+      expect(legacyItems).toHaveLength(1)
+      expect(legacyItems[0]).toMatchObject({
+        content: undefined,
+        title: 'Separator 3'
+      })
+    })
   })
 
   describe('integration', () => {
diff --git a/src/lib/litegraph/src/contextMenuCompat.ts b/src/lib/litegraph/src/contextMenuCompat.ts
index 38865bf206..ae48aec70e 100644
--- a/src/lib/litegraph/src/contextMenuCompat.ts
+++ b/src/lib/litegraph/src/contextMenuCompat.ts
@@ -81,6 +81,7 @@ class LegacyMenuCompat {
         return currentImpl
       },
       set: (newImpl: LGraphCanvas[K]) => {
+        if (!newImpl) return
         const fnKey = `${methodName as string}:${newImpl.toString().slice(0, 100)}`
         if (!this.hasWarned.has(fnKey) && this.currentExtension) {
           this.hasWarned.add(fnKey)
@@ -151,19 +152,51 @@ class LegacyMenuCompat {
       const patchedItems = methodToCall.apply(context, args) as
         | (IContextMenuValue | null)[]
         | undefined
-      if (!patchedItems) return []
+      if (!patchedItems) {
+        return []
+      }
+      // Use content-based diff to detect additions (not reference-based)
+      // Create composite keys from multiple properties to handle undefined content
+      const createItemKey = (item: IContextMenuValue): string => {
+        const parts = [
+          item.content ?? '',
+          item.title ?? '',
+          item.className ?? '',
+          item.property ?? '',
+          item.type ?? ''
+        ]
+        return parts.join('|')
+      }
 
-      // Use set-based diff to detect additions by reference
-      const originalSet = new Set<IContextMenuValue | null>(originalItems)
-      const addedItems = patchedItems.filter((item) => !originalSet.has(item))
+      const originalKeys = new Set(
+        originalItems
+          .filter(
+            (item): item is IContextMenuValue =>
+              item !== null && typeof item === 'object' && 'content' in item
+          )
+          .map(createItemKey)
+      )
+      const addedItems = patchedItems.filter((item) => {
+        if (item === null) return false
+        if (typeof item !== 'object' || !('content' in item)) return false
+        return !originalKeys.has(createItemKey(item))
+      })
 
       // Warn if items were removed (patched has fewer original items than expected)
-      const retainedOriginalCount = patchedItems.filter((item) =>
-        originalSet.has(item)
+      const patchedKeys = new Set(
+        patchedItems
+          .filter(
+            (item): item is IContextMenuValue =>
+              item !== null && typeof item === 'object' && 'content' in item
+          )
+          .map(createItemKey)
+      )
+      const removedCount = [...originalKeys].filter(
+        (key) => !patchedKeys.has(key)
       ).length
-      if (retainedOriginalCount < originalItems.length) {
+      if (removedCount > 0) {
         console.warn(
-          `[Context Menu Compat] Monkey patch for ${methodName} removed ${originalItems.length - retainedOriginalCount} original menu item(s). ` +
+          `[Context Menu Compat] Monkey patch for ${methodName} removed ${removedCount} original menu item(s). ` +
             `This may cause unexpected behavior.`
         )
       }
diff --git a/src/lib/litegraph/src/cursorCache.test.ts b/src/lib/litegraph/src/cursorCache.test.ts
new file mode 100644
index 0000000000..c73f97c603
--- /dev/null
+++ b/src/lib/litegraph/src/cursorCache.test.ts
@@ -0,0 +1,59 @@
+import { describe, expect, it, vi } from 'vitest'
+
+import { createCursorCache } from './cursorCache'
+
+function createMockElement() {
+  let cursorValue = ''
+  const setter = vi.fn((value: string) => {
+    cursorValue = value
+  })
+
+  const element = document.createElement('div')
+  Object.defineProperty(element.style, 'cursor', {
+    get: () => cursorValue,
+    set: setter
+  })
+
+  return { element, setter }
+}
+
+describe('createCursorCache', () => {
+  it('should only write to DOM when cursor value changes', () => {
+    const { element, setter } = createMockElement()
+    const setCursor = createCursorCache(element)
+
+    setCursor('crosshair')
+    setCursor('crosshair')
+    setCursor('crosshair')
+
+    expect(setter).toHaveBeenCalledTimes(1)
+    expect(setter).toHaveBeenCalledWith('crosshair')
+  })
+
+  it('should write to DOM when cursor value differs', () => {
+    const { element, setter } = createMockElement()
+    const setCursor = createCursorCache(element)
+
+    setCursor('default')
+    setCursor('crosshair')
+    setCursor('grabbing')
+
+    expect(setter).toHaveBeenCalledTimes(3)
+    expect(setter).toHaveBeenNthCalledWith(1, 'default')
+    expect(setter).toHaveBeenNthCalledWith(2, 'crosshair')
+    expect(setter).toHaveBeenNthCalledWith(3, 'grabbing')
+  })
+
+  it('should skip repeated values interspersed with changes', () => {
+    const { element, setter } = createMockElement()
+    const setCursor = createCursorCache(element)
+
+    setCursor('default')
+    setCursor('default')
+    setCursor('grab')
+    setCursor('grab')
+    setCursor('default')
+
+    expect(setter).toHaveBeenCalledTimes(3)
+  })
+})
diff --git a/src/lib/litegraph/src/cursorCache.ts b/src/lib/litegraph/src/cursorCache.ts
new file mode 100644
index 0000000000..36bc4ecfde
--- /dev/null
+++ b/src/lib/litegraph/src/cursorCache.ts
@@ -0,0 +1,8 @@
+export function createCursorCache(element: HTMLElement) {
+  let lastCursor = ''
+  return function setCursor(cursor: string) {
+    if (cursor === lastCursor) return
+    lastCursor = cursor
+    element.style.cursor = cursor
+  }
+}
diff --git a/src/lib/litegraph/src/infrastructure/ConstrainedSize.ts b/src/lib/litegraph/src/infrastructure/ConstrainedSize.ts
index f0890fab97..2f3a223092 100644
--- a/src/lib/litegraph/src/infrastructure/ConstrainedSize.ts
+++ b/src/lib/litegraph/src/infrastructure/ConstrainedSize.ts
@@ -10,10 +10,10 @@ import type { ReadOnlyRect, Size } from '@/lib/litegraph/src/interfaces'
  * - Width and height are then updated, clamped to min/max values
  */
 export class ConstrainedSize {
-  #width: number = 0
-  #height: number = 0
-  #desiredWidth: number = 0
-  #desiredHeight: number = 0
+  private _width: number = 0
+  private _height: number = 0
+  private _desiredWidth: number = 0
+  private _desiredHeight: number = 0
 
   minWidth: number = 0
   minHeight: number = 0
@@ -21,29 +21,29 @@ export class ConstrainedSize {
   maxHeight: number = Infinity
 
   get width() {
-    return this.#width
+    return this._width
   }
 
   get height() {
-    return this.#height
+    return this._height
   }
 
   get desiredWidth() {
-    return this.#desiredWidth
+    return this._desiredWidth
   }
 
   set desiredWidth(value: number) {
-    this.#desiredWidth = value
-    this.#width = clamp(value, this.minWidth, this.maxWidth)
+    this._desiredWidth = value
+    this._width = clamp(value, this.minWidth, this.maxWidth)
   }
 
   get desiredHeight() {
-    return this.#desiredHeight
+    return this._desiredHeight
   }
 
   set desiredHeight(value: number) {
-    this.#desiredHeight = value
-    this.#height = clamp(value, this.minHeight, this.maxHeight)
+    this._desiredHeight = value
+    this._height = clamp(value, this.minHeight, this.maxHeight)
   }
 
   constructor(width: number, height: number) {
@@ -70,6 +70,6 @@ export class ConstrainedSize {
   }
 
   toSize(): Size {
-    return [this.#width, this.#height]
+    return [this._width, this._height]
   }
 }
diff --git a/src/lib/litegraph/src/infrastructure/CustomEventTarget.ts b/src/lib/litegraph/src/infrastructure/CustomEventTarget.ts
index 2c7f93f33a..a2230b6418 100644
--- a/src/lib/litegraph/src/infrastructure/CustomEventTarget.ts
+++ b/src/lib/litegraph/src/infrastructure/CustomEventTarget.ts
@@ -2,7 +2,7 @@ import type { NeverNever, PickNevers } from '@/lib/litegraph/src/types/utility'
 
 type EventListeners<T> = {
   readonly [K in keyof T]:
-    | ((this: EventTarget, ev: CustomEvent<T[K]>) => any)
+    | ((this: EventTarget, ev: CustomEvent<T[K]>) => unknown)
     | EventListenerObject
     | null
 }
diff --git a/tests-ui/tests/litegraph/infrastructure/Rectangle.resize.test.ts b/src/lib/litegraph/src/infrastructure/Rectangle.resize.test.ts
similarity index 100%
rename from tests-ui/tests/litegraph/infrastructure/Rectangle.resize.test.ts
rename to src/lib/litegraph/src/infrastructure/Rectangle.resize.test.ts
diff --git a/tests-ui/tests/litegraph/infrastructure/Rectangle.test.ts b/src/lib/litegraph/src/infrastructure/Rectangle.test.ts
similarity index 98%
rename from tests-ui/tests/litegraph/infrastructure/Rectangle.test.ts
rename to src/lib/litegraph/src/infrastructure/Rectangle.test.ts
index b89545845f..cb4245e265 100644
--- a/tests-ui/tests/litegraph/infrastructure/Rectangle.test.ts
+++ b/src/lib/litegraph/src/infrastructure/Rectangle.test.ts
@@ -1,3 +1,4 @@
+// oxlint-disable no-empty-pattern
 import { test as baseTest, describe, expect, vi } from 'vitest'
 
 import { Rectangle } from '@/lib/litegraph/src/litegraph'
@@ -6,7 +7,6 @@ import type { Point, Size } from '@/lib/litegraph/src/litegraph'
 // TODO: If there's a common test context, use it here
 // For now, we'll define a simple context for Rectangle tests
 const test = baseTest.extend<{ rect: Rectangle }>({
-  // eslint-disable-next-line no-empty-pattern
   rect: async ({}, use) => {
     await use(new Rectangle())
   }
@@ -510,7 +510,7 @@ describe('Rectangle', () => {
         lineWidth: 1,
         beginPath: vi.fn(),
         strokeRect: vi.fn()
-      } as unknown as CanvasRenderingContext2D
+      } as Partial<CanvasRenderingContext2D> as CanvasRenderingContext2D
 
       rect._drawDebug(mockCtx, 'blue')
 
@@ -533,7 +533,7 @@ describe('Rectangle', () => {
         lineWidth: 1,
         beginPath: vi.fn(),
         strokeRect: vi.fn()
-      } as unknown as CanvasRenderingContext2D
+      } as Partial<CanvasRenderingContext2D> as CanvasRenderingContext2D
       rect._drawDebug(mockCtx)
       // Check if strokeStyle was "red" at the time of strokeRect
       // This requires a more complex mock or observing calls.
diff --git a/src/lib/litegraph/src/infrastructure/Rectangle.ts b/src/lib/litegraph/src/infrastructure/Rectangle.ts
index 3c70369f18..6751b84aed 100644
--- a/src/lib/litegraph/src/infrastructure/Rectangle.ts
+++ b/src/lib/litegraph/src/infrastructure/Rectangle.ts
@@ -19,8 +19,8 @@ import { isInRectangle } from '@/lib/litegraph/src/measure'
  * - {@link size}: The size of the rectangle.
  */
 export class Rectangle extends Float64Array {
-  #pos: Float64Array<ArrayBuffer> | undefined
-  #size: Float64Array<ArrayBuffer> | undefined
+  private _pos: Float64Array<ArrayBuffer> | undefined
+  private _size: Float64Array<ArrayBuffer> | undefined
 
   constructor(
     x: number = 0,
@@ -78,8 +78,8 @@ export class Rectangle extends Float64Array {
    * Updating the values of the returned object will update this rectangle.
    */
   get pos(): Point {
-    this.#pos ??= this.subarray(0, 2)
-    return this.#pos! as unknown as Point
+    this._pos ??= this.subarray(0, 2)
+    return this._pos! as unknown as Point
   }
 
   set pos(value: Readonly<Point>) {
@@ -93,8 +93,8 @@ export class Rectangle extends Float64Array {
    * Updating the values of the returned object will update this rectangle.
    */
   get size(): Size {
-    this.#size ??= this.subarray(2, 4)
-    return this.#size! as unknown as Size
+    this._size ??= this.subarray(2, 4)
+    return this._size! as unknown as Size
   }
 
   set size(value: Readonly<Size>) {
diff --git a/src/lib/litegraph/src/infrastructure/SubgraphInputEventMap.ts b/src/lib/litegraph/src/infrastructure/SubgraphInputEventMap.ts
index 2a5927558e..97bf654215 100644
--- a/src/lib/litegraph/src/infrastructure/SubgraphInputEventMap.ts
+++ b/src/lib/litegraph/src/infrastructure/SubgraphInputEventMap.ts
@@ -1,3 +1,4 @@
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
 import type { INodeInputSlot } from '@/lib/litegraph/src/litegraph'
 import type { SubgraphInput } from '@/lib/litegraph/src/subgraph/SubgraphInput'
 import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
@@ -8,6 +9,7 @@ export interface SubgraphInputEventMap extends LGraphEventMap {
   'input-connected': {
     input: INodeInputSlot
     widget: IBaseWidget
+    node: LGraphNode
   }
 
   'input-disconnected': {
diff --git a/src/lib/litegraph/src/interfaces.ts b/src/lib/litegraph/src/interfaces.ts
index 67f1c3def8..b0bbc884fc 100644
--- a/src/lib/litegraph/src/interfaces.ts
+++ b/src/lib/litegraph/src/interfaces.ts
@@ -1,14 +1,19 @@
 import type { Rectangle } from '@/lib/litegraph/src/infrastructure/Rectangle'
 import type { CanvasPointerEvent } from '@/lib/litegraph/src/types/events'
+import type { TWidgetValue } from '@/lib/litegraph/src/types/widgets'
 
 import type { ContextMenu } from './ContextMenu'
-import type { LGraphNode, NodeId } from './LGraphNode'
+import type { LGraphNode, NodeId, NodeProperty } from './LGraphNode'
 import type { LLink, LinkId } from './LLink'
 import type { Reroute, RerouteId } from './Reroute'
 import type { SubgraphInput } from './subgraph/SubgraphInput'
 import type { SubgraphInputNode } from './subgraph/SubgraphInputNode'
 import type { SubgraphOutputNode } from './subgraph/SubgraphOutputNode'
-import type { LinkDirection, RenderShape } from './types/globalEnums'
+import type {
+  LGraphEventMode,
+  LinkDirection,
+  RenderShape
+} from './types/globalEnums'
 import type { IBaseWidget } from './types/widgets'
 
 export type Dictionary<T> = { [key: string]: T }
@@ -47,6 +52,11 @@ export type SharedIntersection<T1, T2> = {
 
 export type CanvasColour = string | CanvasGradient | CanvasPattern
 
+export interface ColorStop {
+  readonly offset: number
+  readonly color: readonly [r: number, g: number, b: number]
+}
+
 /**
  * Any object that has a {@link boundingRect}.
  */
@@ -253,7 +263,10 @@ type KeysOfType<T, Match> = Exclude<
 >
 
 /** The names of all (optional) methods and functions in T */
-export type MethodNames<T> = KeysOfType<T, ((...args: any) => any) | undefined>
+export type MethodNames<T> = KeysOfType<
+  T,
+  ((...args: unknown[]) => unknown) | undefined
+>
 export interface NewNodePosition {
   node: LGraphNode
   newPos: {
@@ -328,6 +341,8 @@ export interface INodeFlags {
   collapsed?: boolean
   /** Configuration setting for {@link LGraphNode.connectInputToOutput} */
   keepAllLinksOnBypass?: boolean
+  /** Node is in ghost placement mode (semi-transparent, following cursor) */
+  ghost?: boolean
 }
 
 /**
@@ -338,6 +353,7 @@ export interface INodeFlags {
  */
 export interface IWidgetLocator {
   name: string
+  type?: string
 }
 
 export interface INodeInputSlot extends INodeSlot {
@@ -361,6 +377,22 @@ export interface INodeOutputSlot extends INodeSlot {
   slot_index?: number
 }
 
+/** Options for {@link LiteGraphGlobal.createNode}. Shallow-copied onto the new node. */
+export interface CreateNodeOptions {
+  pos?: Point
+  size?: Size
+  properties?: Dictionary<NodeProperty | undefined>
+  flags?: Partial<INodeFlags>
+  mode?: LGraphEventMode
+  color?: string
+  bgcolor?: string
+  boxcolor?: string
+  title?: string
+  shape?: RenderShape
+  inputs?: Partial<INodeInputSlot>[]
+  outputs?: Partial<INodeOutputSlot>[]
+}
+
 /** Links */
 export interface ConnectingLink extends IInputOrOutput {
   node: LGraphNode
@@ -457,28 +489,6 @@ export interface ISubgraphInput extends INodeInputSlot {
   _subgraphSlot: SubgraphInput
 }
 
-/**
- * Shorthand for {@link Parameters} of optional callbacks.
- * @example
- * ```ts
- * const { onClick } = CustomClass.prototype
- * CustomClass.prototype.onClick = function (...args: CallbackParams<typeof onClick>) {
- *   const r = onClick?.apply(this, args)
- *   // ...
- *   return r
- * }
- * ```
- */
-export type CallbackParams<T extends ((...args: any) => any) | undefined> =
-  Parameters<Exclude<T, undefined>>
-
-/**
- * Shorthand for {@link ReturnType} of optional callbacks.
- * @see {@link CallbackParams}
- */
-export type CallbackReturn<T extends ((...args: any) => any) | undefined> =
-  ReturnType<Exclude<T, undefined>>
-
 /**
  * An object that can be hovered over.
  */
@@ -492,3 +502,68 @@ export interface Hoverable extends HasBoundingRect {
   onPointerEnter?(e?: CanvasPointerEvent): void
   onPointerLeave?(e?: CanvasPointerEvent): void
 }
+
+/**
+ * Callback for panel widget value changes.
+ */
+export type PanelWidgetCallback = (
+  name: string | undefined,
+  value: TWidgetValue,
+  options: PanelWidgetOptions
+) => void
+
+/**
+ * Options for panel widgets.
+ */
+export interface PanelWidgetOptions {
+  label?: string
+  type?: string
+  widget?: string
+  values?: Array<string | IContextMenuValue<unknown, unknown, unknown> | null>
+  callback?: PanelWidgetCallback
+}
+
+/**
+ * A button element with optional options property.
+ */
+export interface PanelButton extends HTMLButtonElement {
+  options?: unknown
+}
+
+/**
+ * A widget element with options and value properties.
+ */
+export interface PanelWidget extends HTMLDivElement {
+  options?: PanelWidgetOptions
+  value?: TWidgetValue
+}
+
+/**
+ * A dialog panel created by LGraphCanvas.createPanel().
+ * Extends HTMLDivElement with additional properties and methods for panel management.
+ */
+export interface Panel extends HTMLDivElement {
+  header: HTMLElement
+  title_element: HTMLSpanElement
+  content: HTMLDivElement
+  alt_content: HTMLDivElement
+  footer: HTMLDivElement
+  node?: LGraphNode
+  onOpen?: () => void
+  onClose?: () => void
+  close(): void
+  toggleAltContent(force?: boolean): void
+  toggleFooterVisibility(force?: boolean): void
+  clear(): void
+  addHTML(code: string, classname?: string, on_footer?: boolean): HTMLDivElement
+  addButton(name: string, callback: () => void, options?: unknown): PanelButton
+  addSeparator(): void
+  addWidget(
+    type: string,
+    name: string,
+    value: TWidgetValue,
+    options?: PanelWidgetOptions,
+    callback?: PanelWidgetCallback
+  ): PanelWidget
+  inner_showCodePad?(property: string): void
+}
diff --git a/src/lib/litegraph/src/litegraph.test.ts b/src/lib/litegraph/src/litegraph.test.ts
new file mode 100644
index 0000000000..19645a682f
--- /dev/null
+++ b/src/lib/litegraph/src/litegraph.test.ts
@@ -0,0 +1,38 @@
+import { clamp } from 'es-toolkit/compat'
+import { describe, expect } from 'vitest'
+
+import {
+  LiteGraphGlobal,
+  LGraphCanvas,
+  LiteGraph,
+  LGraph
+} from '@/lib/litegraph/src/litegraph'
+
+import { LGraph as DirectLGraph } from '@/lib/litegraph/src/LGraph'
+
+import { test } from './__fixtures__/testExtensions'
+
+describe('Litegraph module', () => {
+  test('contains a global export', ({ expect }) => {
+    expect(LiteGraph).toBeInstanceOf(LiteGraphGlobal)
+    expect(LiteGraph.LGraphCanvas).toBe(LGraphCanvas)
+  })
+
+  test('has the same structure', ({ expect }) => {
+    const lgGlobal = new LiteGraphGlobal()
+    expect(lgGlobal).toMatchSnapshot('minLGraph')
+  })
+
+  test('clamps values', () => {
+    expect(clamp(-1.124, 13, 24)).toStrictEqual(13)
+    expect(clamp(Infinity, 18, 29)).toStrictEqual(29)
+  })
+})
+
+describe('Import order dependency', () => {
+  test('Imports reference the same types', ({ expect }) => {
+    // Both imports should reference the same LGraph class
+    expect(LiteGraph.LGraph).toBe(DirectLGraph)
+    expect(LiteGraph.LGraph).toBe(LGraph)
+  })
+})
diff --git a/src/lib/litegraph/src/litegraph.ts b/src/lib/litegraph/src/litegraph.ts
index b15109d5cf..eed401055d 100644
--- a/src/lib/litegraph/src/litegraph.ts
+++ b/src/lib/litegraph/src/litegraph.ts
@@ -62,7 +62,7 @@ export interface LGraphNodeConstructor<T extends LGraphNode = LGraphNode> {
   size?: Size
   min_height?: number
   slot_start_y?: number
-  widgets_info?: any
+  widgets_info?: Record<string, unknown>
   collapsable?: boolean
   color?: string
   bgcolor?: string
@@ -91,6 +91,7 @@ export { RecursionError } from './infrastructure/RecursionError'
 export type {
   CanvasColour,
   ColorOption,
+  CreateNodeOptions,
   IContextMenuOptions,
   IContextMenuValue,
   INodeInputSlot,
@@ -104,8 +105,11 @@ export type {
 } from './interfaces'
 export {
   LGraph,
+  type GroupNodeConfigEntry,
+  type GroupNodeWorkflowData,
   type LGraphTriggerAction,
-  type LGraphTriggerParam
+  type LGraphTriggerParam,
+  type GraphAddOptions
 } from './LGraph'
 export type { LGraphTriggerEvent } from './types/graphTriggers'
 export { BadgePosition, LGraphBadge } from './LGraphBadge'
@@ -141,14 +145,20 @@ export { isColorable } from './utils/type'
 export { createUuidv4 } from './utils/uuid'
 export type { UUID } from './utils/uuid'
 export { truncateText } from './utils/textUtils'
-export { getWidgetStep } from './utils/widget'
+export {
+  evaluateInput,
+  getWidgetStep,
+  resolveNodeRootGraphId
+} from './utils/widget'
 export { distributeSpace, type SpaceRequest } from './utils/spaceDistribution'
 
 export { BaseWidget } from './widgets/BaseWidget'
 
 export { LegacyWidget } from './widgets/LegacyWidget'
 
-export { isComboWidget, isAssetWidget } from './widgets/widgetMap'
+export { isComboWidget } from './widgets/widgetMap'
+/** @knipIgnoreUnusedButUsedByCustomNodes */
+export { isAssetWidget } from './widgets/widgetMap'
 // Additional test-specific exports
 export { LGraphButton } from './LGraphButton'
 export { MovingOutputLink } from './canvas/MovingOutputLink'
diff --git a/tests-ui/tests/litegraph/core/measure.test.ts b/src/lib/litegraph/src/measure.test.ts
similarity index 100%
rename from tests-ui/tests/litegraph/core/measure.test.ts
rename to src/lib/litegraph/src/measure.test.ts
diff --git a/src/lib/litegraph/src/node/NodeInputSlot.ts b/src/lib/litegraph/src/node/NodeInputSlot.ts
index 6f8dc352c0..60aa4ebf42 100644
--- a/src/lib/litegraph/src/node/NodeInputSlot.ts
+++ b/src/lib/litegraph/src/node/NodeInputSlot.ts
@@ -23,15 +23,15 @@ export class NodeInputSlot extends NodeSlot implements INodeInputSlot {
     return !!this.widget
   }
 
-  #widget: WeakRef<IBaseWidget> | undefined
+  private _widgetRef: WeakRef<IBaseWidget> | undefined
 
   /** Internal use only; API is not finalised and may change at any time. */
   get _widget(): IBaseWidget | undefined {
-    return this.#widget?.deref()
+    return this._widgetRef?.deref()
   }
 
   set _widget(widget: IBaseWidget | undefined) {
-    this.#widget = widget ? new WeakRef(widget) : undefined
+    this._widgetRef = widget ? new WeakRef(widget) : undefined
   }
 
   get collapsedPos(): Readonly<Point> {
@@ -79,4 +79,12 @@ export class NodeInputSlot extends NodeSlot implements INodeInputSlot {
 
     ctx.textAlign = textAlign
   }
+
+  override toJSON(): INodeInputSlot {
+    return {
+      ...super.toJSON(),
+      link: this.link,
+      widget: this.widget
+    }
+  }
 }
diff --git a/src/lib/litegraph/src/node/NodeOutputSlot.ts b/src/lib/litegraph/src/node/NodeOutputSlot.ts
index 68d6c23339..d0775274a5 100644
--- a/src/lib/litegraph/src/node/NodeOutputSlot.ts
+++ b/src/lib/litegraph/src/node/NodeOutputSlot.ts
@@ -15,8 +15,6 @@ import type { SubgraphOutput } from '@/lib/litegraph/src/subgraph/SubgraphOutput
 import { isSubgraphOutput } from '@/lib/litegraph/src/subgraph/subgraphUtils'
 
 export class NodeOutputSlot extends NodeSlot implements INodeOutputSlot {
-  #node: LGraphNode
-
   links: LinkId[] | null
   _data?: unknown
   slot_index?: number
@@ -27,7 +25,7 @@ export class NodeOutputSlot extends NodeSlot implements INodeOutputSlot {
 
   get collapsedPos(): Readonly<Point> {
     return [
-      this.#node._collapsed_width ?? LiteGraph.NODE_COLLAPSED_WIDTH,
+      this._node._collapsed_width ?? LiteGraph.NODE_COLLAPSED_WIDTH,
       LiteGraph.NODE_TITLE_HEIGHT * -0.5
     ]
   }
@@ -40,7 +38,6 @@ export class NodeOutputSlot extends NodeSlot implements INodeOutputSlot {
     this.links = slot.links
     this._data = slot._data
     this.slot_index = slot.slot_index
-    this.#node = node
   }
 
   override isValidTarget(
@@ -78,4 +75,12 @@ export class NodeOutputSlot extends NodeSlot implements INodeOutputSlot {
     ctx.textAlign = textAlign
     ctx.strokeStyle = strokeStyle
   }
+
+  override toJSON(): INodeOutputSlot {
+    return {
+      ...super.toJSON(),
+      links: this.links,
+      slot_index: this.slot_index
+    }
+  }
 }
diff --git a/tests-ui/tests/litegraph/core/NodeSlot.test.ts b/src/lib/litegraph/src/node/NodeSlot.test.ts
similarity index 71%
rename from tests-ui/tests/litegraph/core/NodeSlot.test.ts
rename to src/lib/litegraph/src/node/NodeSlot.test.ts
index 15215cbf0f..6971736fc0 100644
--- a/tests-ui/tests/litegraph/core/NodeSlot.test.ts
+++ b/src/lib/litegraph/src/node/NodeSlot.test.ts
@@ -8,16 +8,19 @@ import {
   inputAsSerialisable,
   outputAsSerialisable
 } from '@/lib/litegraph/src/litegraph'
+import type { ReadOnlyRect } from '@/lib/litegraph/src/interfaces'
+
+const boundingRect: ReadOnlyRect = [0, 0, 10, 10]
 
 describe('NodeSlot', () => {
   describe('inputAsSerialisable', () => {
     it('removes _data from serialized slot', () => {
-      // @ts-expect-error Missing boundingRect property for test
       const slot: INodeOutputSlot = {
         _data: 'test data',
         name: 'test-id',
         type: 'STRING',
-        links: []
+        links: [],
+        boundingRect
       }
       // @ts-expect-error Argument type mismatch for test
       const serialized = outputAsSerialisable(slot)
@@ -25,20 +28,14 @@ describe('NodeSlot', () => {
     })
 
     it('removes pos from widget input slots', () => {
+      // Minimal slot for serialization test - boundingRect is calculated at runtime, not serialized
       const widgetInputSlot: INodeInputSlot = {
         name: 'test-id',
         pos: [10, 20],
         type: 'STRING',
         link: null,
-        widget: {
-          name: 'test-widget',
-          // @ts-expect-error TODO: Fix after merge - type property not in IWidgetLocator
-          type: 'combo',
-          value: 'test-value-1',
-          options: {
-            values: ['test-value-1', 'test-value-2']
-          }
-        }
+        widget: { name: 'test-widget', type: 'combo' },
+        boundingRect
       }
 
       const serialized = inputAsSerialisable(widgetInputSlot)
@@ -46,30 +43,27 @@ describe('NodeSlot', () => {
     })
 
     it('preserves pos for non-widget input slots', () => {
-      // @ts-expect-error TODO: Fix after merge - missing boundingRect property for test
       const normalSlot: INodeInputSlot = {
         name: 'test-id',
         type: 'STRING',
         pos: [10, 20],
-        link: null
+        link: null,
+        boundingRect
       }
       const serialized = inputAsSerialisable(normalSlot)
       expect(serialized).toHaveProperty('pos')
     })
 
     it('preserves only widget name during serialization', () => {
+      // Extra widget properties simulate real data that should be stripped during serialization
       const widgetInputSlot: INodeInputSlot = {
         name: 'test-id',
         type: 'STRING',
         link: null,
+        boundingRect,
         widget: {
           name: 'test-widget',
-          // @ts-expect-error TODO: Fix after merge - type property not in IWidgetLocator
-          type: 'combo',
-          value: 'test-value-1',
-          options: {
-            values: ['test-value-1', 'test-value-2']
-          }
+          type: 'combo'
         }
       }
 
diff --git a/src/lib/litegraph/src/node/NodeSlot.ts b/src/lib/litegraph/src/node/NodeSlot.ts
index 4e17069b28..86329660a4 100644
--- a/src/lib/litegraph/src/node/NodeSlot.ts
+++ b/src/lib/litegraph/src/node/NodeSlot.ts
@@ -30,14 +30,14 @@ export interface IDrawOptions {
   highlight?: boolean
 }
 
-const ROTATION_OFFSET = -Math.PI / 2
+const ROTATION_OFFSET = -Math.PI
 
 /** Shared base class for {@link LGraphNode} input and output slots. */
 export abstract class NodeSlot extends SlotBase implements INodeSlot {
   pos?: Point
 
   /** The offset from the parent node to the centre point of this slot. */
-  get #centreOffset(): Readonly<Point> {
+  private get _centreOffset(): Readonly<Point> {
     const nodePos = this.node.pos
     const { boundingRect } = this
 
@@ -55,9 +55,9 @@ export abstract class NodeSlot extends SlotBase implements INodeSlot {
   /** The center point of this slot when the node is collapsed. */
   abstract get collapsedPos(): Readonly<Point>
 
-  #node: LGraphNode
+  protected _node: LGraphNode
   get node(): LGraphNode {
-    return this.#node
+    return this._node
   }
 
   get highlightColor(): CanvasColour {
@@ -89,7 +89,7 @@ export abstract class NodeSlot extends SlotBase implements INodeSlot {
     super(name, type, rectangle)
 
     Object.assign(this, rest)
-    this.#node = node
+    this._node = node
   }
 
   /**
@@ -126,7 +126,7 @@ export abstract class NodeSlot extends SlotBase implements INodeSlot {
       ? this.highlightColor
       : LiteGraph.NODE_TEXT_COLOR
 
-    const pos = this.#centreOffset
+    const pos = this._centreOffset
     const slot_type = this.type
     const slot_shape = (
       slot_type === SlotType.Array ? SlotShape.Grid : this.shape
@@ -260,6 +260,25 @@ export abstract class NodeSlot extends SlotBase implements INodeSlot {
     ctx.lineWidth = originalLineWidth
   }
 
+  /**
+   * Custom JSON serialization to prevent circular reference errors.
+   * Returns only serializable slot properties without the node back-reference.
+   */
+  toJSON(): INodeSlot {
+    return {
+      name: this.name,
+      type: this.type,
+      label: this.label,
+      color_on: this.color_on,
+      color_off: this.color_off,
+      shape: this.shape,
+      dir: this.dir,
+      localized_name: this.localized_name,
+      pos: this.pos,
+      boundingRect: [...this.boundingRect] as [number, number, number, number]
+    }
+  }
+
   drawCollapsed(ctx: CanvasRenderingContext2D) {
     const [x, y] = this.collapsedPos
 
diff --git a/src/lib/litegraph/src/serialization.test.ts b/src/lib/litegraph/src/serialization.test.ts
new file mode 100644
index 0000000000..c2f6f23e9a
--- /dev/null
+++ b/src/lib/litegraph/src/serialization.test.ts
@@ -0,0 +1,131 @@
+import { describe, expect, it } from 'vitest'
+
+import { LGraph, LGraphNode, LiteGraph } from './litegraph'
+import type { NodeInputSlot } from './node/NodeInputSlot'
+import type { NodeOutputSlot } from './node/NodeOutputSlot'
+
+class TestNode extends LGraphNode {
+  static override title = 'TestNode'
+  constructor() {
+    super('TestNode')
+  }
+}
+
+LiteGraph.registerNodeType('test/TestNode', TestNode)
+
+describe('Serialization - Circular Reference Prevention', () => {
+  describe('LGraph.toJSON()', () => {
+    it('should serialize without circular reference errors', () => {
+      const graph = new LGraph()
+
+      expect(() => JSON.stringify(graph)).not.toThrow()
+    })
+
+    it('should return serialize() output from toJSON()', () => {
+      const graph = new LGraph()
+      const serialized = graph.serialize()
+      const jsonOutput = graph.toJSON()
+
+      expect(jsonOutput).toEqual(serialized)
+    })
+
+    it('should not include list_of_graphcanvas in JSON output', () => {
+      const graph = new LGraph()
+      const json = JSON.stringify(graph)
+      const parsed = JSON.parse(json)
+
+      expect(parsed.list_of_graphcanvas).toBeUndefined()
+    })
+  })
+
+  describe('NodeSlot.toJSON()', () => {
+    it('NodeInputSlot should serialize without circular reference errors', () => {
+      const graph = new LGraph()
+      const node = LiteGraph.createNode('test/TestNode')!
+      graph.add(node)
+      node.addInput('test_input', 'TEST')
+
+      const inputSlot = node.inputs[0]
+
+      expect(() => JSON.stringify(inputSlot)).not.toThrow()
+    })
+
+    it('NodeOutputSlot should serialize without circular reference errors', () => {
+      const graph = new LGraph()
+      const node = LiteGraph.createNode('test/TestNode')!
+      graph.add(node)
+      node.addOutput('test_output', 'TEST')
+
+      const outputSlot = node.outputs[0]
+
+      expect(() => JSON.stringify(outputSlot)).not.toThrow()
+    })
+
+    it('NodeInputSlot.toJSON() should not include _node reference', () => {
+      const graph = new LGraph()
+      const node = LiteGraph.createNode('test/TestNode')!
+      graph.add(node)
+      node.addInput('test_input', 'TEST')
+
+      const inputSlot = node.inputs[0] as NodeInputSlot
+      const json = inputSlot.toJSON()
+
+      expect('_node' in json).toBe(false)
+      expect('node' in json).toBe(false)
+      expect(json.name).toBe('test_input')
+      expect(json.type).toBe('TEST')
+    })
+
+    it('NodeOutputSlot.toJSON() should not include _node reference', () => {
+      const graph = new LGraph()
+      const node = LiteGraph.createNode('test/TestNode')!
+      graph.add(node)
+      node.addOutput('test_output', 'TEST')
+
+      const outputSlot = node.outputs[0] as NodeOutputSlot
+      const json = outputSlot.toJSON()
+
+      expect('_node' in json).toBe(false)
+      expect('node' in json).toBe(false)
+      expect(json.name).toBe('test_output')
+      expect(json.type).toBe('TEST')
+    })
+  })
+
+  describe('Full graph with nodes - no circular references', () => {
+    it('should serialize a graph with connected nodes', () => {
+      const graph = new LGraph()
+
+      const node1 = LiteGraph.createNode('test/TestNode')!
+      const node2 = LiteGraph.createNode('test/TestNode')!
+      graph.add(node1)
+      graph.add(node2)
+
+      node1.addOutput('out', 'TEST')
+      node2.addInput('in', 'TEST')
+
+      node1.connect(0, node2, 0)
+
+      expect(() => JSON.stringify(graph)).not.toThrow()
+    })
+
+    it('should serialize graph.serialize() output without errors', () => {
+      const graph = new LGraph()
+
+      const node1 = LiteGraph.createNode('test/TestNode')!
+      const node2 = LiteGraph.createNode('test/TestNode')!
+      graph.add(node1)
+      graph.add(node2)
+
+      node1.addOutput('out', 'TEST')
+      node2.addInput('in', 'TEST')
+
+      node1.connect(0, node2, 0)
+
+      const serialized = graph.serialize()
+
+      expect(() => JSON.stringify(serialized)).not.toThrow()
+      expect(() => JSON.parse(JSON.stringify(serialized))).not.toThrow()
+    })
+  })
+})
diff --git a/tests-ui/tests/litegraph/subgraph/ExecutableNodeDTO.test.ts b/src/lib/litegraph/src/subgraph/ExecutableNodeDTO.test.ts
similarity index 97%
rename from tests-ui/tests/litegraph/subgraph/ExecutableNodeDTO.test.ts
rename to src/lib/litegraph/src/subgraph/ExecutableNodeDTO.test.ts
index 4418d94223..c475bb3aa9 100644
--- a/tests-ui/tests/litegraph/subgraph/ExecutableNodeDTO.test.ts
+++ b/src/lib/litegraph/src/subgraph/ExecutableNodeDTO.test.ts
@@ -1,14 +1,17 @@
 // TODO: Fix these tests after migration
 import { describe, expect, it, vi } from 'vitest'
 
-import { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph'
-import { ExecutableNodeDTO } from '@/lib/litegraph/src/litegraph'
+import {
+  LGraph,
+  LGraphNode,
+  ExecutableNodeDTO
+} from '@/lib/litegraph/src/litegraph'
 
 import {
   createNestedSubgraphs,
   createTestSubgraph,
   createTestSubgraphNode
-} from './fixtures/subgraphHelpers'
+} from './__fixtures__/subgraphHelpers'
 
 describe.skip('ExecutableNodeDTO Creation', () => {
   it('should create DTO from regular node', () => {
@@ -83,10 +86,8 @@ describe.skip('ExecutableNodeDTO Creation', () => {
 
     expect(dto.applyToGraph).toBeDefined()
 
-    // Test that wrapper calls original method
     const args = ['arg1', 'arg2']
-    // @ts-expect-error TODO: Fix after merge - applyToGraph expects different arguments
-    dto.applyToGraph!(args[0], args[1])
+    ;(dto.applyToGraph as (...args: unknown[]) => void)(args[0], args[1])
 
     expect(mockApplyToGraph).toHaveBeenCalledWith(args[0], args[1])
   })
diff --git a/src/lib/litegraph/src/subgraph/ExecutableNodeDTO.ts b/src/lib/litegraph/src/subgraph/ExecutableNodeDTO.ts
index 9e9454a817..bb93d0e698 100644
--- a/src/lib/litegraph/src/subgraph/ExecutableNodeDTO.ts
+++ b/src/lib/litegraph/src/subgraph/ExecutableNodeDTO.ts
@@ -4,11 +4,7 @@ import { InvalidLinkError } from '@/lib/litegraph/src/infrastructure/InvalidLink
 import { NullGraphError } from '@/lib/litegraph/src/infrastructure/NullGraphError'
 import { RecursionError } from '@/lib/litegraph/src/infrastructure/RecursionError'
 import { SlotIndexError } from '@/lib/litegraph/src/infrastructure/SlotIndexError'
-import type {
-  CallbackParams,
-  CallbackReturn,
-  ISlotType
-} from '@/lib/litegraph/src/interfaces'
+import type { ISlotType } from '@/lib/litegraph/src/interfaces'
 import { LGraphEventMode, LiteGraph } from '@/lib/litegraph/src/litegraph'
 
 import type { Subgraph } from './Subgraph'
@@ -45,8 +41,8 @@ type ResolvedInput = {
  */
 export class ExecutableNodeDTO implements ExecutableLGraphNode {
   applyToGraph?(
-    ...args: CallbackParams<typeof this.node.applyToGraph>
-  ): CallbackReturn<typeof this.node.applyToGraph>
+    ...args: Parameters<NonNullable<typeof this.node.applyToGraph>>
+  ): ReturnType<NonNullable<typeof this.node.applyToGraph>>
 
   /** The graph that this node is a part of. */
   readonly graph: LGraph | Subgraph
@@ -54,7 +50,7 @@ export class ExecutableNodeDTO implements ExecutableLGraphNode {
   inputs: { linkId: number | null; name: string; type: ISlotType }[]
 
   /** Backing field for {@link id}. */
-  #id: ExecutionId
+  private _id: ExecutionId
 
   /**
    * The path to the actual node through subgraph instances, represented as a list of all subgraph node IDs (instances),
@@ -66,7 +62,7 @@ export class ExecutableNodeDTO implements ExecutableLGraphNode {
    * - `3` is the node ID of the actual node in the subgraph definition
    */
   get id() {
-    return this.#id
+    return this._id
   }
 
   get type() {
@@ -110,7 +106,7 @@ export class ExecutableNodeDTO implements ExecutableLGraphNode {
     if (!node.graph) throw new NullGraphError()
 
     // Set the internal ID of the DTO
-    this.#id = [...this.subgraphNodePath, this.node.id].join(':')
+    this._id = [...this.subgraphNodePath, this.node.id].join(':')
     this.graph = node.graph
     this.inputs = this.node.inputs.map((x) => ({
       linkId: x.link,
@@ -198,6 +194,10 @@ export class ExecutableNodeDTO implements ExecutableLGraphNode {
         }
       }
 
+      if (!subgraphNode.graph)
+        throw new NullGraphError(
+          `SubgraphNode ${subgraphNode.id} has no graph during input resolution`
+        )
       const outerLink = subgraphNode.graph.getLink(linkId)
       if (!outerLink)
         throw new InvalidLinkError(
@@ -269,7 +269,7 @@ export class ExecutableNodeDTO implements ExecutableLGraphNode {
     // Upstreamed: Bypass nodes are bypassed using the first input with matching type
     if (this.mode === LGraphEventMode.BYPASS) {
       // Bypass nodes by finding first input with matching type
-      const matchingIndex = this.#getBypassSlotIndex(slot, type)
+      const matchingIndex = this._getBypassSlotIndex(slot, type)
 
       // No input types match - bypass not possible
       if (matchingIndex === -1) {
@@ -285,7 +285,7 @@ export class ExecutableNodeDTO implements ExecutableLGraphNode {
 
     const { node } = this
     if (node.isSubgraphNode())
-      return this.#resolveSubgraphOutput(slot, type, visited)
+      return this._resolveSubgraphOutput(slot, type, visited)
 
     if (node.isVirtualNode) {
       const virtualLink = this.node.getInputLink(slot)
@@ -325,7 +325,7 @@ export class ExecutableNodeDTO implements ExecutableLGraphNode {
    * @param type The type of the final target input (so type list matches are accurate)
    * @returns The index of the input slot on this node, otherwise `-1`.
    */
-  #getBypassSlotIndex(slot: number, type: ISlotType) {
+  private _getBypassSlotIndex(slot: number, type: ISlotType) {
     const { inputs } = this
     const oppositeInput = inputs[slot]
     const outputType = this.node.outputs[slot].type
@@ -362,7 +362,7 @@ export class ExecutableNodeDTO implements ExecutableLGraphNode {
    * @param visited A set of unique IDs to guard against infinite recursion. See {@link resolveInput}.
    * @returns A DTO for the node, and the origin ID / slot index of the output.
    */
-  #resolveSubgraphOutput(
+  private _resolveSubgraphOutput(
     slot: number,
     type: ISlotType,
     visited: Set<string>
diff --git a/src/lib/litegraph/src/subgraph/PromotedWidgetViewManager.test.ts b/src/lib/litegraph/src/subgraph/PromotedWidgetViewManager.test.ts
new file mode 100644
index 0000000000..3e2902d95b
--- /dev/null
+++ b/src/lib/litegraph/src/subgraph/PromotedWidgetViewManager.test.ts
@@ -0,0 +1,128 @@
+import { describe, expect, test } from 'vitest'
+
+import { PromotedWidgetViewManager } from '@/lib/litegraph/src/subgraph/PromotedWidgetViewManager'
+
+type TestPromotionEntry = {
+  interiorNodeId: string
+  widgetName: string
+  viewKey?: string
+}
+
+function makeView(entry: TestPromotionEntry) {
+  const baseKey = `${entry.interiorNodeId}:${entry.widgetName}`
+
+  return {
+    key: entry.viewKey ? `${baseKey}:${entry.viewKey}` : baseKey
+  }
+}
+
+describe('PromotedWidgetViewManager', () => {
+  test('returns memoized array when entries reference is unchanged', () => {
+    const manager = new PromotedWidgetViewManager<{ key: string }>()
+    const entries = [{ interiorNodeId: '1', widgetName: 'widgetA' }]
+
+    const first = manager.reconcile(entries, makeView)
+    const second = manager.reconcile(entries, makeView)
+
+    expect(second).toBe(first)
+    expect(second[0]).toBe(first[0])
+  })
+
+  test('preserves view identity while reflecting order changes', () => {
+    const manager = new PromotedWidgetViewManager<{ key: string }>()
+
+    const firstPass = manager.reconcile(
+      [
+        { interiorNodeId: '1', widgetName: 'widgetA' },
+        { interiorNodeId: '1', widgetName: 'widgetB' }
+      ],
+      makeView
+    )
+
+    const reordered = manager.reconcile(
+      [
+        { interiorNodeId: '1', widgetName: 'widgetB' },
+        { interiorNodeId: '1', widgetName: 'widgetA' }
+      ],
+      makeView
+    )
+
+    expect(reordered[0]).toBe(firstPass[1])
+    expect(reordered[1]).toBe(firstPass[0])
+  })
+
+  test('deduplicates by first occurrence and clears stale cache entries', () => {
+    const manager = new PromotedWidgetViewManager<{ key: string }>()
+
+    const first = manager.reconcile(
+      [
+        { interiorNodeId: '1', widgetName: 'widgetA' },
+        { interiorNodeId: '1', widgetName: 'widgetB' },
+        { interiorNodeId: '1', widgetName: 'widgetA' }
+      ],
+      makeView
+    )
+    expect(first.map((view) => view.key)).toStrictEqual([
+      '1:widgetA',
+      '1:widgetB'
+    ])
+
+    manager.reconcile(
+      [{ interiorNodeId: '1', widgetName: 'widgetB' }],
+      makeView
+    )
+
+    const restored = manager.reconcile(
+      [
+        { interiorNodeId: '1', widgetName: 'widgetB' },
+        { interiorNodeId: '1', widgetName: 'widgetA' }
+      ],
+      makeView
+    )
+
+    expect(restored[0]).toBe(first[1])
+    expect(restored[1]).not.toBe(first[0])
+  })
+
+  test('keeps distinct views for same source widget when viewKeys differ', () => {
+    const manager = new PromotedWidgetViewManager<{ key: string }>()
+
+    const views = manager.reconcile(
+      [
+        { interiorNodeId: '1', widgetName: 'widgetA', viewKey: 'slotA' },
+        { interiorNodeId: '1', widgetName: 'widgetA', viewKey: 'slotB' }
+      ],
+      makeView
+    )
+
+    expect(views).toHaveLength(2)
+    expect(views[0]).not.toBe(views[1])
+    expect(views[0].key).toBe('1:widgetA:slotA')
+    expect(views[1].key).toBe('1:widgetA:slotB')
+  })
+
+  test('removeByViewKey removes only the targeted keyed view', () => {
+    const manager = new PromotedWidgetViewManager<{ key: string }>()
+
+    const firstPass = manager.reconcile(
+      [
+        { interiorNodeId: '1', widgetName: 'widgetA', viewKey: 'slotA' },
+        { interiorNodeId: '1', widgetName: 'widgetA', viewKey: 'slotB' }
+      ],
+      makeView
+    )
+
+    manager.removeByViewKey('1', 'widgetA', 'slotA')
+
+    const secondPass = manager.reconcile(
+      [
+        { interiorNodeId: '1', widgetName: 'widgetA', viewKey: 'slotA' },
+        { interiorNodeId: '1', widgetName: 'widgetA', viewKey: 'slotB' }
+      ],
+      makeView
+    )
+
+    expect(secondPass[0]).not.toBe(firstPass[0])
+    expect(secondPass[1]).toBe(firstPass[1])
+  })
+})
diff --git a/src/lib/litegraph/src/subgraph/PromotedWidgetViewManager.ts b/src/lib/litegraph/src/subgraph/PromotedWidgetViewManager.ts
new file mode 100644
index 0000000000..d8e7ebe3f3
--- /dev/null
+++ b/src/lib/litegraph/src/subgraph/PromotedWidgetViewManager.ts
@@ -0,0 +1,120 @@
+type PromotionEntry = {
+  interiorNodeId: string
+  widgetName: string
+  viewKey?: string
+}
+
+type CreateView<TView> = (entry: PromotionEntry) => TView
+
+/**
+ * Reconciles promoted widget entries to stable view instances.
+ *
+ * Keeps object identity stable by key while preserving the current
+ * promotion order and deduplicating duplicate entries by first occurrence.
+ */
+export class PromotedWidgetViewManager<TView> {
+  private viewCache = new Map<string, TView>()
+  private cachedViews: TView[] | null = null
+  private cachedEntryKeys: string[] | null = null
+
+  reconcile(
+    entries: readonly PromotionEntry[],
+    createView: CreateView<TView>
+  ): TView[] {
+    const entryKeys = entries.map((entry) =>
+      this.makeKey(entry.interiorNodeId, entry.widgetName, entry.viewKey)
+    )
+
+    if (this.cachedViews && this.areEntryKeysEqual(entryKeys))
+      return this.cachedViews
+
+    const views: TView[] = []
+    const seenKeys = new Set<string>()
+
+    for (const entry of entries) {
+      const key = this.makeKey(
+        entry.interiorNodeId,
+        entry.widgetName,
+        entry.viewKey
+      )
+      if (seenKeys.has(key)) continue
+      seenKeys.add(key)
+
+      const existing = this.viewCache.get(key)
+      if (existing) {
+        views.push(existing)
+        continue
+      }
+
+      const nextView = createView(entry)
+      this.viewCache.set(key, nextView)
+      views.push(nextView)
+    }
+
+    for (const key of this.viewCache.keys()) {
+      if (!seenKeys.has(key)) this.viewCache.delete(key)
+    }
+
+    this.cachedViews = views
+    this.cachedEntryKeys = entryKeys
+    return views
+  }
+
+  getOrCreate(
+    interiorNodeId: string,
+    widgetName: string,
+    createView: () => TView,
+    viewKey?: string
+  ): TView {
+    const key = this.makeKey(interiorNodeId, widgetName, viewKey)
+    const cached = this.viewCache.get(key)
+    if (cached) return cached
+
+    const view = createView()
+    this.viewCache.set(key, view)
+    return view
+  }
+
+  remove(interiorNodeId: string, widgetName: string): void {
+    this.viewCache.delete(this.makeKey(interiorNodeId, widgetName))
+    this.invalidateMemoizedList()
+  }
+
+  removeByViewKey(
+    interiorNodeId: string,
+    widgetName: string,
+    viewKey: string
+  ): void {
+    this.viewCache.delete(this.makeKey(interiorNodeId, widgetName, viewKey))
+    this.invalidateMemoizedList()
+  }
+
+  clear(): void {
+    this.viewCache.clear()
+    this.invalidateMemoizedList()
+  }
+
+  invalidateMemoizedList(): void {
+    this.cachedViews = null
+    this.cachedEntryKeys = null
+  }
+
+  private areEntryKeysEqual(entryKeys: string[]): boolean {
+    if (!this.cachedEntryKeys) return false
+    if (this.cachedEntryKeys.length !== entryKeys.length) return false
+
+    for (let index = 0; index < entryKeys.length; index += 1) {
+      if (this.cachedEntryKeys[index] !== entryKeys[index]) return false
+    }
+    return true
+  }
+
+  private makeKey(
+    interiorNodeId: string,
+    widgetName: string,
+    viewKey?: string
+  ): string {
+    const baseKey = `${interiorNodeId}:${widgetName}`
+    return viewKey ? `${baseKey}:${viewKey}` : baseKey
+  }
+}
diff --git a/tests-ui/tests/litegraph/subgraph/Subgraph.test.ts b/src/lib/litegraph/src/subgraph/Subgraph.test.ts
similarity index 92%
rename from tests-ui/tests/litegraph/subgraph/Subgraph.test.ts
rename to src/lib/litegraph/src/subgraph/Subgraph.test.ts
index 773bcca006..ecd939654b 100644
--- a/tests-ui/tests/litegraph/subgraph/Subgraph.test.ts
+++ b/src/lib/litegraph/src/subgraph/Subgraph.test.ts
@@ -8,16 +8,19 @@
  */
 import { describe, expect, it } from 'vitest'
 
-import { RecursionError } from '@/lib/litegraph/src/litegraph'
-import { LGraph, Subgraph } from '@/lib/litegraph/src/litegraph'
-import { createUuidv4 } from '@/lib/litegraph/src/litegraph'
+import {
+  createUuidv4,
+  RecursionError,
+  LGraph,
+  Subgraph
+} from '@/lib/litegraph/src/litegraph'
 
-import { subgraphTest } from './fixtures/subgraphFixtures'
+import { subgraphTest } from './__fixtures__/subgraphFixtures'
 import {
   assertSubgraphStructure,
   createTestSubgraph,
   createTestSubgraphData
-} from './fixtures/subgraphHelpers'
+} from './__fixtures__/subgraphHelpers'
 
 describe.skip('Subgraph Construction', () => {
   it('should create a subgraph with minimal data', () => {
@@ -182,14 +185,10 @@ describe.skip('Subgraph Serialization', () => {
 
       expect(serialized.inputs).toHaveLength(1)
       expect(serialized.outputs).toHaveLength(1)
-      // @ts-expect-error TODO: Fix after merge - serialized.inputs possibly undefined
-      expect(serialized.inputs[0].name).toBe('input')
-      // @ts-expect-error TODO: Fix after merge - serialized.inputs possibly undefined
-      expect(serialized.inputs[0].type).toBe('number')
-      // @ts-expect-error TODO: Fix after merge - serialized.outputs possibly undefined
-      expect(serialized.outputs[0].name).toBe('output')
-      // @ts-expect-error TODO: Fix after merge - serialized.outputs possibly undefined
-      expect(serialized.outputs[0].type).toBe('number')
+      expect(serialized.inputs![0].name).toBe('input')
+      expect(serialized.inputs![0].type).toBe('number')
+      expect(serialized.outputs![0].name).toBe('output')
+      expect(serialized.outputs![0].type).toBe('number')
     }
   )
 
diff --git a/tests-ui/tests/litegraph/subgraph/SubgraphConversion.test.ts b/src/lib/litegraph/src/subgraph/SubgraphConversion.test.ts
similarity index 95%
rename from tests-ui/tests/litegraph/subgraph/SubgraphConversion.test.ts
rename to src/lib/litegraph/src/subgraph/SubgraphConversion.test.ts
index f978710ae1..cfa540a34d 100644
--- a/tests-ui/tests/litegraph/subgraph/SubgraphConversion.test.ts
+++ b/src/lib/litegraph/src/subgraph/SubgraphConversion.test.ts
@@ -1,18 +1,17 @@
 // TODO: Fix these tests after migration
 import { assert, describe, expect, it } from 'vitest'
 
-import type { LGraph } from '@/lib/litegraph/src/litegraph'
 import {
-  type ISlotType,
   LGraphGroup,
   LGraphNode,
   LiteGraph
 } from '@/lib/litegraph/src/litegraph'
+import type { LGraph, ISlotType } from '@/lib/litegraph/src/litegraph'
 
 import {
   createTestSubgraph,
   createTestSubgraphNode
-} from './fixtures/subgraphHelpers'
+} from './__fixtures__/subgraphHelpers'
 
 function createNode(
   graph: LGraph,
@@ -46,7 +45,7 @@ describe.skip('SubgraphConversion', () => {
     it('Should keep interior nodes and links', () => {
       const subgraph = createTestSubgraph()
       const subgraphNode = createTestSubgraphNode(subgraph)
-      const graph = subgraphNode.graph
+      const graph = subgraphNode.graph!
       graph.add(subgraphNode)
 
       const node1 = createNode(subgraph, [], ['number'])
@@ -64,7 +63,7 @@ describe.skip('SubgraphConversion', () => {
         outputs: [{ name: 'value', type: 'number' }]
       })
       const subgraphNode = createTestSubgraphNode(subgraph)
-      const graph = subgraphNode.graph
+      const graph = subgraphNode.graph!
       graph.add(subgraphNode)
 
       const innerNode1 = createNode(subgraph, [], ['number'])
@@ -87,7 +86,7 @@ describe.skip('SubgraphConversion', () => {
         outputs: [{ name: 'value', type: 'number' }]
       })
       const subgraphNode = createTestSubgraphNode(subgraph)
-      const graph = subgraphNode.graph
+      const graph = subgraphNode.graph!
       graph.add(subgraphNode)
 
       const inner = createNode(subgraph, [], ['number'])
@@ -118,7 +117,7 @@ describe.skip('SubgraphConversion', () => {
         ]
       })
       const subgraphNode = createTestSubgraphNode(subgraph)
-      const graph = subgraphNode.graph
+      const graph = subgraphNode.graph!
       graph.add(subgraphNode)
 
       const inner = createNode(subgraph, [], ['number', 'number'])
@@ -160,7 +159,7 @@ describe.skip('SubgraphConversion', () => {
         ]
       })
       const subgraphNode = createTestSubgraphNode(subgraph)
-      const graph = subgraphNode.graph
+      const graph = subgraphNode.graph!
       graph.add(subgraphNode)
 
       const inner1 = createNode(subgraph, ['number', 'number'])
diff --git a/tests-ui/tests/litegraph/subgraph/SubgraphEdgeCases.test.ts b/src/lib/litegraph/src/subgraph/SubgraphEdgeCases.test.ts
similarity index 88%
rename from tests-ui/tests/litegraph/subgraph/SubgraphEdgeCases.test.ts
rename to src/lib/litegraph/src/subgraph/SubgraphEdgeCases.test.ts
index 8734575b18..5a5ba1745f 100644
--- a/tests-ui/tests/litegraph/subgraph/SubgraphEdgeCases.test.ts
+++ b/src/lib/litegraph/src/subgraph/SubgraphEdgeCases.test.ts
@@ -13,7 +13,7 @@ import {
   createNestedSubgraphs,
   createTestSubgraph,
   createTestSubgraphNode
-} from './fixtures/subgraphHelpers'
+} from './__fixtures__/subgraphHelpers'
 
 describe.skip('SubgraphEdgeCases - Recursion Detection', () => {
   it('should handle circular subgraph references without crashing', () => {
@@ -83,7 +83,9 @@ describe.skip('SubgraphEdgeCases - Invalid States', () => {
       name: 'fake',
       type: 'number',
       disconnect: () => {}
-    } as any
+    } as Partial<Parameters<typeof subgraph.removeInput>[0]> as Parameters<
+      typeof subgraph.removeInput
+    >[0]
 
     // Should throw appropriate error for non-existent input
     expect(() => {
@@ -97,41 +99,43 @@ describe.skip('SubgraphEdgeCases - Invalid States', () => {
       name: 'fake',
       type: 'number',
       disconnect: () => {}
-    } as any
+    } as Partial<Parameters<typeof subgraph.removeOutput>[0]> as Parameters<
+      typeof subgraph.removeOutput
+    >[0]
 
     expect(() => {
       subgraph.removeOutput(fakeOutput)
     }).toThrow(/Output not found/) // Expected error
   })
 
-  it('should handle null/undefined input names', () => {
+  it('should throw error for null/undefined input names', () => {
     const subgraph = createTestSubgraph()
 
-    // ISSUE: Current implementation allows null/undefined names which may cause runtime errors
-    // TODO: Consider adding validation to prevent null/undefined names
-    // This test documents the current permissive behavior
-    expect(() => {
-      subgraph.addInput(null as any, 'number')
-    }).not.toThrow() // Current behavior: allows null
+    const nullString: string = null!
+    const undefinedString: string = undefined!
 
     expect(() => {
-      subgraph.addInput(undefined as any, 'number')
-    }).not.toThrow() // Current behavior: allows undefined
+      subgraph.addInput(nullString, 'number')
+    }).toThrow()
+
+    expect(() => {
+      subgraph.addInput(undefinedString, 'number')
+    }).toThrow()
   })
 
   it('should handle null/undefined output names', () => {
     const subgraph = createTestSubgraph()
 
-    // ISSUE: Current implementation allows null/undefined names which may cause runtime errors
-    // TODO: Consider adding validation to prevent null/undefined names
-    // This test documents the current permissive behavior
-    expect(() => {
-      subgraph.addOutput(null as any, 'number')
-    }).not.toThrow() // Current behavior: allows null
+    const nullString: string = null!
+    const undefinedString: string = undefined!
 
     expect(() => {
-      subgraph.addOutput(undefined as any, 'number')
-    }).not.toThrow() // Current behavior: allows undefined
+      subgraph.addOutput(nullString, 'number')
+    }).toThrow()
+
+    expect(() => {
+      subgraph.addOutput(undefinedString, 'number')
+    }).toThrow()
   })
 
   it('should handle empty string names', () => {
@@ -151,14 +155,16 @@ describe.skip('SubgraphEdgeCases - Invalid States', () => {
   it('should handle undefined types gracefully', () => {
     const subgraph = createTestSubgraph()
 
-    // Undefined type should not crash but may have default behavior
+    const undefinedString: string = undefined!
+
+    // Undefined type should throw error
     expect(() => {
-      subgraph.addInput('test', undefined as any)
-    }).not.toThrow()
+      subgraph.addInput('test', undefinedString)
+    }).toThrow()
 
     expect(() => {
-      subgraph.addOutput('test', undefined as any)
-    }).not.toThrow()
+      subgraph.addOutput('test', undefinedString)
+    }).toThrow()
   })
 
   it('should handle duplicate slot names', () => {
@@ -350,8 +356,7 @@ describe.skip('SubgraphEdgeCases - Performance and Scale', () => {
     const subgraphNode = createTestSubgraphNode(subgraph)
 
     // Simulate concurrent operations
-    // @ts-expect-error TODO: Fix after merge - operations implicitly has any[] type
-    const operations = []
+    const operations: Array<() => void> = []
     for (let i = 0; i < 20; i++) {
       operations.push(
         () => {
@@ -371,7 +376,6 @@ describe.skip('SubgraphEdgeCases - Performance and Scale', () => {
 
     // Execute all operations - should not crash
     expect(() => {
-      // @ts-expect-error TODO: Fix after merge - operations implicitly has any[] type
       for (const op of operations) op()
     }).not.toThrow()
   })
diff --git a/tests-ui/tests/litegraph/subgraph/SubgraphEvents.test.ts b/src/lib/litegraph/src/subgraph/SubgraphEvents.test.ts
similarity index 96%
rename from tests-ui/tests/litegraph/subgraph/SubgraphEvents.test.ts
rename to src/lib/litegraph/src/subgraph/SubgraphEvents.test.ts
index abff4fa7ab..ce4fe45c89 100644
--- a/tests-ui/tests/litegraph/subgraph/SubgraphEvents.test.ts
+++ b/src/lib/litegraph/src/subgraph/SubgraphEvents.test.ts
@@ -1,8 +1,8 @@
 // TODO: Fix these tests after migration
 import { describe, expect, vi } from 'vitest'
 
-import { subgraphTest } from './fixtures/subgraphFixtures'
-import { verifyEventSequence } from './fixtures/subgraphHelpers'
+import { subgraphTest } from './__fixtures__/subgraphFixtures'
+import { verifyEventSequence } from './__fixtures__/subgraphHelpers'
 
 describe.skip('SubgraphEvents - Event Payload Verification', () => {
   subgraphTest(
@@ -22,7 +22,6 @@ describe.skip('SubgraphEvents - Event Payload Verification', () => {
         })
       })
 
-      // @ts-expect-error TODO: Fix after merge - detail is of type unknown
       expect(addedEvents[0].detail.input).toBe(input)
     }
   )
@@ -44,7 +43,6 @@ describe.skip('SubgraphEvents - Event Payload Verification', () => {
         })
       })
 
-      // @ts-expect-error TODO: Fix after merge - detail is of type unknown
       expect(addedEvents[0].detail.output).toBe(output)
     }
   )
@@ -71,7 +69,6 @@ describe.skip('SubgraphEvents - Event Payload Verification', () => {
         index: 0
       })
 
-      // @ts-expect-error TODO: Fix after merge - detail is of type unknown
       expect(removingEvents[0].detail.input).toBe(input)
     }
   )
@@ -98,7 +95,6 @@ describe.skip('SubgraphEvents - Event Payload Verification', () => {
         index: 0
       })
 
-      // @ts-expect-error TODO: Fix after merge - detail is of type unknown
       expect(removingEvents[0].detail.output).toBe(output)
     }
   )
@@ -126,7 +122,6 @@ describe.skip('SubgraphEvents - Event Payload Verification', () => {
         newName: 'new_name'
       })
 
-      // @ts-expect-error TODO: Fix after merge - detail is of type unknown
       expect(renamingEvents[0].detail.input).toBe(input)
 
       // Verify the label was updated after the event (renameInput sets label, not name)
@@ -160,7 +155,6 @@ describe.skip('SubgraphEvents - Event Payload Verification', () => {
         newName: 'new_name'
       })
 
-      // @ts-expect-error TODO: Fix after merge - detail is of type unknown
       expect(renamingEvents[0].detail.output).toBe(output)
 
       // Verify the label was updated after the event
diff --git a/tests-ui/tests/litegraph/subgraph/SubgraphIO.test.ts b/src/lib/litegraph/src/subgraph/SubgraphIO.test.ts
similarity index 93%
rename from tests-ui/tests/litegraph/subgraph/SubgraphIO.test.ts
rename to src/lib/litegraph/src/subgraph/SubgraphIO.test.ts
index 25f2ecd104..04c6757b6a 100644
--- a/tests-ui/tests/litegraph/subgraph/SubgraphIO.test.ts
+++ b/src/lib/litegraph/src/subgraph/SubgraphIO.test.ts
@@ -5,11 +5,11 @@ import { LGraphNode } from '@/lib/litegraph/src/litegraph'
 import { ToInputFromIoNodeLink } from '@/lib/litegraph/src/canvas/ToInputFromIoNodeLink'
 import { LinkDirection } from '@/lib/litegraph/src//types/globalEnums'
 
-import { subgraphTest } from './fixtures/subgraphFixtures'
+import { subgraphTest } from './__fixtures__/subgraphFixtures'
 import {
   createTestSubgraph,
   createTestSubgraphNode
-} from './fixtures/subgraphHelpers'
+} from './__fixtures__/subgraphHelpers'
 
 describe('SubgraphIO - Input Slot Dual-Nature Behavior', () => {
   subgraphTest(
@@ -28,8 +28,7 @@ describe('SubgraphIO - Input Slot Dual-Nature Behavior', () => {
       }).not.toThrow()
 
       expect(
-        // @ts-expect-error TODO: Fix after merge - link can be null
-        externalNode.outputs[0].links?.includes(subgraphNode.inputs[0].link)
+        externalNode.outputs[0].links?.includes(subgraphNode.inputs[0].link!)
       ).toBe(true)
       expect(subgraphNode.inputs[0].link).not.toBe(null)
     }
@@ -47,10 +46,8 @@ describe('SubgraphIO - Input Slot Dual-Nature Behavior', () => {
       expect(simpleSubgraph.inputs.length).toBe(initialInputCount + 1)
 
       // The empty slot should be configurable
-      const emptyInput = simpleSubgraph.inputs.at(-1)
-      // @ts-expect-error TODO: Fix after merge - emptyInput possibly undefined
+      const emptyInput = simpleSubgraph.inputs.at(-1)!
       expect(emptyInput.name).toBe('')
-      // @ts-expect-error TODO: Fix after merge - emptyInput possibly undefined
       expect(emptyInput.type).toBe('*')
     }
   )
@@ -149,8 +146,7 @@ describe('SubgraphIO - Output Slot Dual-Nature Behavior', () => {
       }).not.toThrow()
 
       expect(
-        // @ts-expect-error TODO: Fix after merge - link can be null
-        subgraphNode.outputs[0].links?.includes(externalNode.inputs[0].link)
+        subgraphNode.outputs[0].links?.includes(externalNode.inputs[0].link!)
       ).toBe(true)
       expect(externalNode.inputs[0].link).not.toBe(null)
     }
@@ -168,10 +164,8 @@ describe('SubgraphIO - Output Slot Dual-Nature Behavior', () => {
       expect(simpleSubgraph.outputs.length).toBe(initialOutputCount + 1)
 
       // The empty slot should be configurable
-      const emptyOutput = simpleSubgraph.outputs.at(-1)
-      // @ts-expect-error TODO: Fix after merge - emptyOutput possibly undefined
+      const emptyOutput = simpleSubgraph.outputs.at(-1)!
       expect(emptyOutput.name).toBe('')
-      // @ts-expect-error TODO: Fix after merge - emptyOutput possibly undefined
       expect(emptyOutput.type).toBe('*')
     }
   )
@@ -454,15 +448,11 @@ describe('SubgraphIO - Empty Slot Connection', () => {
 
       // 3. A link should be established inside the subgraph
       expect(internalNode.inputs[0].link).not.toBe(null)
-      const link = subgraph.links.get(internalNode.inputs[0].link!)
+      const link = subgraph.links.get(internalNode.inputs[0].link!)!
       expect(link).toBeDefined()
-      // @ts-expect-error TODO: Fix after merge - link possibly undefined
       expect(link.target_id).toBe(internalNode.id)
-      // @ts-expect-error TODO: Fix after merge - link possibly undefined
       expect(link.target_slot).toBe(0)
-      // @ts-expect-error TODO: Fix after merge - link possibly undefined
       expect(link.origin_id).toBe(subgraph.inputNode.id)
-      // @ts-expect-error TODO: Fix after merge - link possibly undefined
       expect(link.origin_slot).toBe(1) // Should be the second slot
     }
   )
diff --git a/src/lib/litegraph/src/subgraph/SubgraphIONodeBase.ts b/src/lib/litegraph/src/subgraph/SubgraphIONodeBase.ts
index 045cb2de16..9c9690a8f0 100644
--- a/src/lib/litegraph/src/subgraph/SubgraphIONodeBase.ts
+++ b/src/lib/litegraph/src/subgraph/SubgraphIONodeBase.ts
@@ -38,12 +38,12 @@ export abstract class SubgraphIONodeBase<
   static minWidth = 100
   static roundedRadius = 10
 
-  readonly #boundingRect: Rectangle = new Rectangle()
+  private readonly _boundingRect: Rectangle = new Rectangle()
 
   abstract readonly id: NodeId
 
   get boundingRect(): Rectangle {
-    return this.#boundingRect
+    return this._boundingRect
   }
 
   selected: boolean = false
@@ -181,7 +181,7 @@ export abstract class SubgraphIONodeBase<
   ): void {
     // Only allow renaming non-empty slots
     if (slot !== this.emptySlot) {
-      this.#promptForSlotRename(slot, event)
+      this._promptForSlotRename(slot, event)
     }
   }
 
@@ -191,14 +191,14 @@ export abstract class SubgraphIONodeBase<
    * @param event The event that triggered the context menu.
    */
   protected showSlotContextMenu(slot: TSlot, event: CanvasPointerEvent): void {
-    const options: (IContextMenuValue | null)[] = this.#getSlotMenuOptions(slot)
+    const options: (IContextMenuValue | null)[] = this._getSlotMenuOptions(slot)
     if (!(options.length > 0)) return
 
     new LiteGraph.ContextMenu(options, {
-      event: event as any,
+      event,
       title: slot.name || 'Subgraph Output',
       callback: (item: IContextMenuValue) => {
-        this.#onSlotMenuAction(item, slot, event)
+        this._onSlotMenuAction(item, slot, event)
       }
     })
   }
@@ -208,7 +208,7 @@ export abstract class SubgraphIONodeBase<
    * @param slot The slot to get the context menu options for.
    * @returns The context menu options.
    */
-  #getSlotMenuOptions(slot: TSlot): (IContextMenuValue | null)[] {
+  private _getSlotMenuOptions(slot: TSlot): (IContextMenuValue | null)[] {
     const options: (IContextMenuValue | null)[] = []
 
     // Disconnect option if slot has connections
@@ -239,7 +239,7 @@ export abstract class SubgraphIONodeBase<
    * @param slot The slot
    * @param event The event that triggered the context menu.
    */
-  #onSlotMenuAction(
+  private _onSlotMenuAction(
     selectedItem: IContextMenuValue,
     slot: TSlot,
     event: CanvasPointerEvent
@@ -260,7 +260,7 @@ export abstract class SubgraphIONodeBase<
       // Rename the slot
       case 'rename':
         if (slot !== this.emptySlot) {
-          this.#promptForSlotRename(slot, event)
+          this._promptForSlotRename(slot, event)
         }
         break
     }
@@ -273,7 +273,7 @@ export abstract class SubgraphIONodeBase<
    * @param slot The slot to rename.
    * @param event The event that triggered the rename.
    */
-  #promptForSlotRename(slot: TSlot, event: CanvasPointerEvent): void {
+  private _promptForSlotRename(slot: TSlot, event: CanvasPointerEvent): void {
     this.subgraph.canvasAction((c) =>
       c.prompt(
         'Slot name',
@@ -362,7 +362,7 @@ export abstract class SubgraphIONodeBase<
   }
 
   configure(data: ExportedSubgraphIONode): void {
-    this.#boundingRect.set(data.bounding)
+    this._boundingRect.set(data.bounding)
     this.pinned = data.pinned ?? false
   }
 
diff --git a/src/lib/litegraph/src/subgraph/SubgraphInput.ts b/src/lib/litegraph/src/subgraph/SubgraphInput.ts
index 9391155130..ee3d0f96d1 100644
--- a/src/lib/litegraph/src/subgraph/SubgraphInput.ts
+++ b/src/lib/litegraph/src/subgraph/SubgraphInput.ts
@@ -35,14 +35,14 @@ export class SubgraphInput extends SubgraphSlot {
   events = new CustomEventTarget<SubgraphInputEventMap>()
 
   /** The linked widget that this slot is connected to. */
-  #widgetRef?: WeakRef<IBaseWidget>
+  private _widgetRef?: WeakRef<IBaseWidget>
 
   get _widget() {
-    return this.#widgetRef?.deref()
+    return this._widgetRef?.deref()
   }
 
   set _widget(widget) {
-    this.#widgetRef = widget ? new WeakRef(widget) : undefined
+    this._widgetRef = widget ? new WeakRef(widget) : undefined
   }
 
   override connect(
@@ -87,10 +87,13 @@ export class SubgraphInput extends SubgraphSlot {
         return
       }
 
-      this._widget ??= inputWidget
+      // Keep the widget reference in sync with the active upstream widget.
+      // Stale references can appear across nested promotion rebinds.
+      this._widget = inputWidget
       this.events.dispatch('input-connected', {
         input: slot,
-        widget: inputWidget
+        widget: inputWidget,
+        node
       })
     }
 
@@ -187,7 +190,7 @@ export class SubgraphInput extends SubgraphSlot {
    * @returns `true` if the connection is valid, otherwise `false`.
    */
   matchesWidget(otherWidget: IBaseWidget): boolean {
-    const widget = this.#widgetRef?.deref()
+    const widget = this._widgetRef?.deref()
     if (!widget) return true
 
     if (
@@ -207,6 +210,8 @@ export class SubgraphInput extends SubgraphSlot {
   override disconnect(): void {
     super.disconnect()
 
+    this._widget = undefined
+
     this.events.dispatch('input-disconnected', { input: this })
   }
 
diff --git a/tests-ui/tests/litegraph/subgraph/SubgraphMemory.test.ts b/src/lib/litegraph/src/subgraph/SubgraphMemory.test.ts
similarity index 88%
rename from tests-ui/tests/litegraph/subgraph/SubgraphMemory.test.ts
rename to src/lib/litegraph/src/subgraph/SubgraphMemory.test.ts
index 5e6770d1e0..92699283e9 100644
--- a/tests-ui/tests/litegraph/subgraph/SubgraphMemory.test.ts
+++ b/src/lib/litegraph/src/subgraph/SubgraphMemory.test.ts
@@ -2,12 +2,19 @@
 import { describe, expect, it, vi } from 'vitest'
 
 import { LGraph } from '@/lib/litegraph/src/litegraph'
+import type { IWidget } from '@/lib/litegraph/src/types/widgets'
 
-import { subgraphTest } from './fixtures/subgraphFixtures'
+import { subgraphTest } from './__fixtures__/subgraphFixtures'
 import {
   createTestSubgraph,
   createTestSubgraphNode
-} from './fixtures/subgraphHelpers'
+} from './__fixtures__/subgraphHelpers'
+
+type InputWithWidget = {
+  _widget?: IWidget | { type: string; value: unknown; name: string }
+  _connection?: { id: number; type: string }
+  _listenerController?: AbortController
+}
 
 describe.skip('SubgraphNode Memory Management', () => {
   describe.skip('Event Listener Cleanup', () => {
@@ -72,10 +79,10 @@ describe.skip('SubgraphNode Memory Management', () => {
           size: [200, 100],
           inputs: [],
           outputs: [],
-          // @ts-expect-error TODO: Fix after merge - properties not in ExportedSubgraphInstance
           properties: {},
           flags: {},
-          mode: 0
+          mode: 0,
+          order: 0
         })
       }
 
@@ -93,12 +100,13 @@ describe.skip('SubgraphNode Memory Management', () => {
       })
       const subgraphNode = createTestSubgraphNode(subgraph)
 
-      // Simulate widget promotion scenario
       const input = subgraphNode.inputs[0]
       const mockWidget = {
         type: 'number',
         name: 'promoted_widget',
         value: 123,
+        options: {},
+        y: 0,
         draw: vi.fn(),
         mouse: vi.fn(),
         computeSize: vi.fn(),
@@ -107,21 +115,16 @@ describe.skip('SubgraphNode Memory Management', () => {
           name: 'promoted_widget',
           value: 123
         })
-      }
+      } as Partial<IWidget> as IWidget
 
-      // Simulate widget promotion
-      // @ts-expect-error TODO: Fix after merge - mockWidget type mismatch
       input._widget = mockWidget
       input.widget = { name: 'promoted_widget' }
-      // @ts-expect-error TODO: Fix after merge - mockWidget type mismatch
       subgraphNode.widgets.push(mockWidget)
 
       expect(input._widget).toBe(mockWidget)
       expect(input.widget).toBeDefined()
       expect(subgraphNode.widgets).toContain(mockWidget)
 
-      // Remove widget (this should clean up references)
-      // @ts-expect-error TODO: Fix after merge - mockWidget type mismatch
       subgraphNode.removeWidget(mockWidget)
 
       // Widget should be removed from array
@@ -146,10 +149,10 @@ describe.skip('SubgraphNode Memory Management', () => {
           size: [200, 100],
           inputs: [],
           outputs: [],
-          // @ts-expect-error TODO: Fix after merge - properties not in ExportedSubgraphInstance
           properties: {},
           flags: {},
-          mode: 0
+          mode: 0,
+          order: 0
         })
       }
 
@@ -311,14 +314,14 @@ describe.skip('SubgraphMemory - Widget Reference Management', () => {
 
       // Set widget reference
       if (input && '_widget' in input) {
-        ;(input as any)._widget = mockWidget
-        expect((input as any)._widget).toBe(mockWidget)
+        ;(input as InputWithWidget)._widget = mockWidget
+        expect((input as InputWithWidget)._widget).toBe(mockWidget)
       }
 
       // Clear widget reference
       if (input && '_widget' in input) {
-        ;(input as any)._widget = undefined
-        expect((input as any)._widget).toBeUndefined()
+        ;(input as InputWithWidget)._widget = undefined
+        expect((input as InputWithWidget)._widget).toBeUndefined()
       }
     }
   )
@@ -328,17 +331,26 @@ describe.skip('SubgraphMemory - Widget Reference Management', () => {
 
     const initialWidgetCount = subgraphNode.widgets?.length || 0
 
-    // Add mock widgets
-    const widget1 = { type: 'number', value: 1, name: 'widget1' }
-    const widget2 = { type: 'string', value: 'test', name: 'widget2' }
+    const widget1 = {
+      type: 'number',
+      value: 1,
+      name: 'widget1',
+      options: {},
+      y: 0
+    } as Partial<IWidget> as IWidget
+    const widget2 = {
+      type: 'string',
+      value: 'test',
+      name: 'widget2',
+      options: {},
+      y: 0
+    } as Partial<IWidget> as IWidget
 
     if (subgraphNode.widgets) {
-      // @ts-expect-error TODO: Fix after merge - widget type mismatch
       subgraphNode.widgets.push(widget1, widget2)
       expect(subgraphNode.widgets.length).toBe(initialWidgetCount + 2)
     }
 
-    // Remove widgets
     if (subgraphNode.widgets) {
       subgraphNode.widgets.length = initialWidgetCount
       expect(subgraphNode.widgets.length).toBe(initialWidgetCount)
@@ -354,30 +366,34 @@ describe.skip('SubgraphMemory - Widget Reference Management', () => {
 
       // Set up references that should be cleaned up
       const mockReferences = {
-        widget: { type: 'number', value: 42 },
+        widget: { type: 'number', value: 42, name: 'mock_widget' },
         connection: { id: 1, type: 'number' },
         listener: vi.fn()
       }
 
       // Set references
       if (input) {
-        ;(input as any)._widget = mockReferences.widget
-        ;(input as any)._connection = mockReferences.connection
+        ;(input as InputWithWidget)._widget = mockReferences.widget
+        ;(input as InputWithWidget)._connection = mockReferences.connection
       }
       if (output) {
-        ;(input as any)._connection = mockReferences.connection
+        ;(input as InputWithWidget)._connection = mockReferences.connection
       }
 
       // Verify references are set
-      expect((input as any)?._widget).toBe(mockReferences.widget)
-      expect((input as any)?._connection).toBe(mockReferences.connection)
+      expect((input as InputWithWidget)?._widget).toBe(mockReferences.widget)
+      expect((input as InputWithWidget)?._connection).toBe(
+        mockReferences.connection
+      )
 
       // Simulate proper cleanup (what onRemoved should do)
       subgraphNode.onRemoved()
 
       // Input-specific listeners should be cleaned up (this works)
       if (input && '_listenerController' in input) {
-        expect((input as any)._listenerController?.signal.aborted).toBe(true)
+        expect(
+          (input as InputWithWidget)._listenerController?.signal.aborted
+        ).toBe(true)
       }
     }
   )
diff --git a/tests-ui/tests/litegraph/subgraph/SubgraphNode.test.ts b/src/lib/litegraph/src/subgraph/SubgraphNode.test.ts
similarity index 96%
rename from tests-ui/tests/litegraph/subgraph/SubgraphNode.test.ts
rename to src/lib/litegraph/src/subgraph/SubgraphNode.test.ts
index 40ad062c63..d37bf070f3 100644
--- a/tests-ui/tests/litegraph/subgraph/SubgraphNode.test.ts
+++ b/src/lib/litegraph/src/subgraph/SubgraphNode.test.ts
@@ -7,13 +7,15 @@
  */
 import { describe, expect, it, vi } from 'vitest'
 
+import type { SubgraphNode } from '@/lib/litegraph/src/litegraph'
 import { LGraph, Subgraph } from '@/lib/litegraph/src/litegraph'
+import type { SubgraphInput } from '@/lib/litegraph/src/subgraph/SubgraphInput'
 
-import { subgraphTest } from './fixtures/subgraphFixtures'
+import { subgraphTest } from './__fixtures__/subgraphFixtures'
 import {
   createTestSubgraph,
   createTestSubgraphNode
-} from './fixtures/subgraphHelpers'
+} from './__fixtures__/subgraphHelpers'
 
 describe.skip('SubgraphNode Construction', () => {
   it('should create a SubgraphNode from a subgraph definition', () => {
@@ -52,11 +54,23 @@ describe.skip('SubgraphNode Construction', () => {
   it('should maintain reference to root graph', () => {
     const subgraph = createTestSubgraph()
     const subgraphNode = createTestSubgraphNode(subgraph)
-    const parentGraph = subgraphNode.graph
+    const parentGraph = subgraphNode.graph!
 
     expect(subgraphNode.rootGraph).toBe(parentGraph.rootGraph)
   })
 
+  it('should throw NullGraphError when accessing rootGraph after removal', () => {
+    const subgraph = createTestSubgraph()
+    const subgraphNode = createTestSubgraphNode(subgraph)
+    const parentGraph = subgraphNode.graph!
+    parentGraph.add(subgraphNode)
+
+    parentGraph.remove(subgraphNode)
+
+    expect(() => subgraphNode.rootGraph).toThrow()
+    expect(subgraphNode.graph).toBeNull()
+  })
+
   subgraphTest(
     'should synchronize slots with subgraph definition',
     ({ subgraphWithNode }) => {
@@ -210,10 +224,10 @@ describe.skip('SubgraphNode Lifecycle', () => {
       size: [180, 100],
       inputs: [],
       outputs: [],
-      // @ts-expect-error TODO: Fix after merge - properties not in ExportedSubgraphInstance
       properties: {},
       flags: {},
-      mode: 0
+      mode: 0,
+      order: 0
     })
 
     // Should reflect updated subgraph structure
@@ -530,7 +544,7 @@ describe.skip('SubgraphNode Cleanup', () => {
 
     // Now trigger an event - only node1 should respond
     subgraph.events.dispatch('input-added', {
-      input: { name: 'test', type: 'number', id: 'test-id' } as any
+      input: { name: 'test', type: 'number', id: 'test-id' } as SubgraphInput
     })
 
     // Only node1 should have added an input
@@ -542,8 +556,6 @@ describe.skip('SubgraphNode Cleanup', () => {
     const rootGraph = new LGraph()
     const subgraph = createTestSubgraph()
 
-    // Add and remove nodes multiple times
-    // @ts-expect-error TODO: Fix after merge - SubgraphNode should be Subgraph
     const removedNodes: SubgraphNode[] = []
     for (let i = 0; i < 3; i++) {
       const node = createTestSubgraphNode(subgraph)
@@ -559,7 +571,7 @@ describe.skip('SubgraphNode Cleanup', () => {
 
     // Trigger an event - no nodes should respond
     subgraph.events.dispatch('input-added', {
-      input: { name: 'test', type: 'number', id: 'test-id' } as any
+      input: { name: 'test', type: 'number', id: 'test-id' } as SubgraphInput
     })
 
     // Without cleanup: all 3 removed nodes would have added an input
diff --git a/tests-ui/tests/litegraph/subgraph/SubgraphNode.titleButton.test.ts b/src/lib/litegraph/src/subgraph/SubgraphNode.titleButton.test.ts
similarity index 86%
rename from tests-ui/tests/litegraph/subgraph/SubgraphNode.titleButton.test.ts
rename to src/lib/litegraph/src/subgraph/SubgraphNode.titleButton.test.ts
index 9bc64802c8..feb6b1d50c 100644
--- a/tests-ui/tests/litegraph/subgraph/SubgraphNode.titleButton.test.ts
+++ b/src/lib/litegraph/src/subgraph/SubgraphNode.titleButton.test.ts
@@ -3,11 +3,17 @@ import { describe, expect, it, vi } from 'vitest'
 
 import { LGraphButton } from '@/lib/litegraph/src/litegraph'
 import type { LGraphCanvas } from '@/lib/litegraph/src/litegraph'
+import type { CanvasPointerEvent } from '@/lib/litegraph/src/types/events'
 
 import {
   createTestSubgraph,
   createTestSubgraphNode
-} from './fixtures/subgraphHelpers'
+} from './__fixtures__/subgraphHelpers'
+
+interface MockPointerEvent {
+  canvasX: number
+  canvasY: number
+}
 
 describe.skip('SubgraphNode Title Button', () => {
   describe.skip('Constructor', () => {
@@ -58,7 +64,7 @@ describe.skip('SubgraphNode Title Button', () => {
       const canvas = {
         openSubgraph: vi.fn(),
         dispatch: vi.fn()
-      } as unknown as LGraphCanvas
+      } as Partial<LGraphCanvas> as LGraphCanvas
 
       subgraphNode.onTitleButtonClick(enterButton, canvas)
 
@@ -78,7 +84,7 @@ describe.skip('SubgraphNode Title Button', () => {
       const canvas = {
         openSubgraph: vi.fn(),
         dispatch: vi.fn()
-      } as unknown as LGraphCanvas
+      } as Partial<LGraphCanvas> as LGraphCanvas
 
       subgraphNode.onTitleButtonClick(customButton, canvas)
 
@@ -119,16 +125,16 @@ describe.skip('SubgraphNode Title Button', () => {
       const canvas = {
         ctx: {
           measureText: vi.fn().mockReturnValue({ width: 25 })
-        } as unknown as CanvasRenderingContext2D,
+        } as Partial<CanvasRenderingContext2D> as CanvasRenderingContext2D,
         openSubgraph: vi.fn(),
         dispatch: vi.fn()
-      } as unknown as LGraphCanvas
+      } as Partial<LGraphCanvas> as LGraphCanvas
 
       // Simulate click on the enter button
-      const event = {
+      const event: MockPointerEvent = {
         canvasX: 275, // Near right edge where button should be
         canvasY: 80 // In title area
-      } as any
+      }
 
       // Calculate node-relative position
       const clickPosRelativeToNode: [number, number] = [
@@ -138,7 +144,7 @@ describe.skip('SubgraphNode Title Button', () => {
 
       // @ts-expect-error onMouseDown possibly undefined
       const handled = subgraphNode.onMouseDown(
-        event,
+        event as Partial<CanvasPointerEvent> as CanvasPointerEvent,
         clickPosRelativeToNode,
         canvas
       )
@@ -156,16 +162,16 @@ describe.skip('SubgraphNode Title Button', () => {
       const canvas = {
         ctx: {
           measureText: vi.fn().mockReturnValue({ width: 25 })
-        } as unknown as CanvasRenderingContext2D,
+        } as Partial<CanvasRenderingContext2D> as CanvasRenderingContext2D,
         openSubgraph: vi.fn(),
         dispatch: vi.fn()
-      } as unknown as LGraphCanvas
+      } as Partial<LGraphCanvas> as LGraphCanvas
 
       // Click in the body of the node, not on button
-      const event = {
+      const event: MockPointerEvent = {
         canvasX: 200, // Middle of node
         canvasY: 150 // Body area
-      } as any
+      }
 
       // Calculate node-relative position
       const clickPosRelativeToNode: [number, number] = [
@@ -173,9 +179,8 @@ describe.skip('SubgraphNode Title Button', () => {
         150 - subgraphNode.pos[1] // 150 - 100 = 50
       ]
 
-      // @ts-expect-error onMouseDown possibly undefined
-      const handled = subgraphNode.onMouseDown(
-        event,
+      const handled = subgraphNode.onMouseDown!(
+        event as Partial<CanvasPointerEvent> as CanvasPointerEvent,
         clickPosRelativeToNode,
         canvas
       )
@@ -204,25 +209,24 @@ describe.skip('SubgraphNode Title Button', () => {
       const canvas = {
         ctx: {
           measureText: vi.fn().mockReturnValue({ width: 25 })
-        } as unknown as CanvasRenderingContext2D,
+        } as Partial<CanvasRenderingContext2D> as CanvasRenderingContext2D,
         openSubgraph: vi.fn(),
         dispatch: vi.fn()
-      } as unknown as LGraphCanvas
+      } as Partial<LGraphCanvas> as LGraphCanvas
 
       // Try to click on where the button would be
-      const event = {
+      const event: MockPointerEvent = {
         canvasX: 275,
         canvasY: 80
-      } as any
+      }
 
       const clickPosRelativeToNode: [number, number] = [
         275 - subgraphNode.pos[0], // 175
         80 - subgraphNode.pos[1] // -20
       ]
 
-      // @ts-expect-error onMouseDown possibly undefined
-      const handled = subgraphNode.onMouseDown(
-        event,
+      const handled = subgraphNode.onMouseDown!(
+        event as Partial<CanvasPointerEvent> as CanvasPointerEvent,
         clickPosRelativeToNode,
         canvas
       )
diff --git a/src/lib/litegraph/src/subgraph/SubgraphNode.ts b/src/lib/litegraph/src/subgraph/SubgraphNode.ts
index 43f59b5166..5f2066b024 100644
--- a/src/lib/litegraph/src/subgraph/SubgraphNode.ts
+++ b/src/lib/litegraph/src/subgraph/SubgraphNode.ts
@@ -5,6 +5,7 @@ import { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
 import type { DrawTitleBoxOptions } from '@/lib/litegraph/src/LGraphNode'
 import { LLink } from '@/lib/litegraph/src/LLink'
 import type { ResolvedConnection } from '@/lib/litegraph/src/LLink'
+import { NullGraphError } from '@/lib/litegraph/src/infrastructure/NullGraphError'
 import { RecursionError } from '@/lib/litegraph/src/infrastructure/RecursionError'
 import type {
   ISubgraphInput,
@@ -28,16 +29,35 @@ import type {
 } from '@/lib/litegraph/src/types/serialisation'
 import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
 import type { UUID } from '@/lib/litegraph/src/utils/uuid'
-import { toConcreteWidget } from '@/lib/litegraph/src/widgets/widgetMap'
+import {
+  createPromotedWidgetView,
+  isPromotedWidgetView
+} from '@/core/graph/subgraph/promotedWidgetView'
+import type { PromotedWidgetView } from '@/core/graph/subgraph/promotedWidgetView'
+import { resolveSubgraphInputTarget } from '@/core/graph/subgraph/resolveSubgraphInputTarget'
+import { parseProxyWidgets } from '@/core/schemas/promotionSchema'
+import { useDomWidgetStore } from '@/stores/domWidgetStore'
+import { usePromotionStore } from '@/stores/promotionStore'
 
 import { ExecutableNodeDTO } from './ExecutableNodeDTO'
 import type { ExecutableLGraphNode, ExecutionId } from './ExecutableNodeDTO'
+import { PromotedWidgetViewManager } from './PromotedWidgetViewManager'
 import type { SubgraphInput } from './SubgraphInput'
+import { createBitmapCache } from './svgBitmapCache'
 
 const workflowSvg = new Image()
 workflowSvg.src =
   "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' width='16' height='16'%3E%3Csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 16 16'%3E%3Cpath stroke='white' stroke-linecap='round' stroke-width='1.3' d='M9.18613 3.09999H6.81377M9.18613 12.9H7.55288c-3.08678 0-5.35171-2.99581-4.60305-6.08843l.3054-1.26158M14.7486 2.1721l-.5931 2.45c-.132.54533-.6065.92789-1.1508.92789h-2.2993c-.77173 0-1.33797-.74895-1.1508-1.5221l.5931-2.45c.132-.54533.6065-.9279 1.1508-.9279h2.2993c.7717 0 1.3379.74896 1.1508 1.52211Zm-8.3033 0-.59309 2.45c-.13201.54533-.60646.92789-1.15076.92789H2.4021c-.7717 0-1.33793-.74895-1.15077-1.5221l.59309-2.45c.13201-.54533.60647-.9279 1.15077-.9279h2.29935c.77169 0 1.33792.74896 1.15076 1.52211Zm8.3033 9.8-.5931 2.45c-.132.5453-.6065.9279-1.1508.9279h-2.2993c-.77173 0-1.33797-.749-1.1508-1.5221l.5931-2.45c.132-.5453.6065-.9279 1.1508-.9279h2.2993c.7717 0 1.3379.7489 1.1508 1.5221Z'/%3E%3C/svg%3E %3C/svg%3E"
 
+type LinkedPromotionEntry = {
+  inputName: string
+  interiorNodeId: string
+  widgetName: string
+}
+// Pre-rasterize the SVG to a bitmap canvas to avoid Firefox re-processing
+// the SVG's internal stylesheet on every ctx.drawImage() call per frame.
+const workflowBitmapCache = createBitmapCache(workflowSvg, 32)
+
 /**
  * An instance of a {@link Subgraph}, displayed as a node on the containing (parent) graph.
  */
@@ -46,8 +66,11 @@ export class SubgraphNode extends LGraphNode implements BaseLGraph {
 
   override readonly type: UUID
   override readonly isVirtualNode = true as const
+  override graph: GraphOrSubgraph | null
 
   get rootGraph(): LGraph {
+    if (!this.graph)
+      throw new NullGraphError(`SubgraphNode ${this.id} has no graph`)
     return this.graph.rootGraph
   }
 
@@ -59,41 +82,319 @@ export class SubgraphNode extends LGraphNode implements BaseLGraph {
     return true
   }
 
-  override widgets: IBaseWidget[] = []
+  private _promotedViewManager =
+    new PromotedWidgetViewManager<PromotedWidgetView>()
+  /**
+   * Promotions buffered before this node is attached to a graph (`id === -1`).
+   * They are flushed in `_flushPendingPromotions()` from `_setWidget()` and
+   * `onAdded()`, so construction-time promotions require normal add-to-graph
+   * lifecycle to persist.
+   */
+  private _pendingPromotions: Array<{
+    interiorNodeId: string
+    widgetName: string
+  }> = []
+
+  // Declared as accessor via Object.defineProperty in constructor.
+  // TypeScript doesn't allow overriding a property with get/set syntax,
+  // so we use declare + defineProperty instead.
+  declare widgets: IBaseWidget[]
+
+  private _resolveLinkedPromotionByInputName(
+    inputName: string
+  ): { interiorNodeId: string; widgetName: string } | undefined {
+    const resolvedTarget = resolveSubgraphInputTarget(this, inputName)
+    if (!resolvedTarget) return undefined
+
+    return {
+      interiorNodeId: resolvedTarget.nodeId,
+      widgetName: resolvedTarget.widgetName
+    }
+  }
+
+  private _getLinkedPromotionEntries(): LinkedPromotionEntry[] {
+    const linkedEntries: LinkedPromotionEntry[] = []
+
+    // TODO(pr9282): Optimization target. This path runs on widgets getter reads
+    // and resolves each input link chain eagerly.
+    for (const input of this.inputs) {
+      const resolved = this._resolveLinkedPromotionByInputName(input.name)
+      if (!resolved) continue
+
+      linkedEntries.push({ inputName: input.name, ...resolved })
+    }
+
+    const seenEntryKeys = new Set<string>()
+    const deduplicatedEntries = linkedEntries.filter((entry) => {
+      const entryKey = this._makePromotionViewKey(
+        entry.inputName,
+        entry.interiorNodeId,
+        entry.widgetName
+      )
+      if (seenEntryKeys.has(entryKey)) return false
+
+      seenEntryKeys.add(entryKey)
+      return true
+    })
+
+    return deduplicatedEntries
+  }
+
+  private _getPromotedViews(): PromotedWidgetView[] {
+    const store = usePromotionStore()
+    const entries = store.getPromotionsRef(this.rootGraph.id, this.id)
+    const linkedEntries = this._getLinkedPromotionEntries()
+    const { displayNameByViewKey, reconcileEntries } =
+      this._buildPromotionReconcileState(entries, linkedEntries)
+
+    return this._promotedViewManager.reconcile(reconcileEntries, (entry) =>
+      createPromotedWidgetView(
+        this,
+        entry.interiorNodeId,
+        entry.widgetName,
+        entry.viewKey ? displayNameByViewKey.get(entry.viewKey) : undefined
+      )
+    )
+  }
+
+  private _syncPromotions(): void {
+    if (this.id === -1) return
+
+    const store = usePromotionStore()
+    const entries = store.getPromotionsRef(this.rootGraph.id, this.id)
+    const linkedEntries = this._getLinkedPromotionEntries()
+    const { mergedEntries, shouldPersistLinkedOnly } =
+      this._buildPromotionPersistenceState(entries, linkedEntries)
+    if (!shouldPersistLinkedOnly) return
+
+    const hasChanged =
+      mergedEntries.length !== entries.length ||
+      mergedEntries.some(
+        (entry, index) =>
+          entry.interiorNodeId !== entries[index]?.interiorNodeId ||
+          entry.widgetName !== entries[index]?.widgetName
+      )
+    if (!hasChanged) return
+
+    store.setPromotions(this.rootGraph.id, this.id, mergedEntries)
+  }
+
+  private _buildPromotionReconcileState(
+    entries: Array<{ interiorNodeId: string; widgetName: string }>,
+    linkedEntries: LinkedPromotionEntry[]
+  ): {
+    displayNameByViewKey: Map<string, string>
+    reconcileEntries: Array<{
+      interiorNodeId: string
+      widgetName: string
+      viewKey?: string
+    }>
+  } {
+    const { fallbackStoredEntries } = this._collectLinkedAndFallbackEntries(
+      entries,
+      linkedEntries
+    )
+    const linkedReconcileEntries =
+      this._buildLinkedReconcileEntries(linkedEntries)
+    const shouldPersistLinkedOnly = this._shouldPersistLinkedOnly(linkedEntries)
+
+    return {
+      displayNameByViewKey: this._buildDisplayNameByViewKey(linkedEntries),
+      reconcileEntries: shouldPersistLinkedOnly
+        ? linkedReconcileEntries
+        : [...linkedReconcileEntries, ...fallbackStoredEntries]
+    }
+  }
+
+  private _buildPromotionPersistenceState(
+    entries: Array<{ interiorNodeId: string; widgetName: string }>,
+    linkedEntries: LinkedPromotionEntry[]
+  ): {
+    mergedEntries: Array<{ interiorNodeId: string; widgetName: string }>
+    shouldPersistLinkedOnly: boolean
+  } {
+    const { linkedPromotionEntries, fallbackStoredEntries } =
+      this._collectLinkedAndFallbackEntries(entries, linkedEntries)
+    const shouldPersistLinkedOnly = this._shouldPersistLinkedOnly(linkedEntries)
+
+    return {
+      mergedEntries: shouldPersistLinkedOnly
+        ? linkedPromotionEntries
+        : [...linkedPromotionEntries, ...fallbackStoredEntries],
+      shouldPersistLinkedOnly
+    }
+  }
+
+  private _collectLinkedAndFallbackEntries(
+    entries: Array<{ interiorNodeId: string; widgetName: string }>,
+    linkedEntries: LinkedPromotionEntry[]
+  ): {
+    linkedPromotionEntries: Array<{
+      interiorNodeId: string
+      widgetName: string
+    }>
+    fallbackStoredEntries: Array<{ interiorNodeId: string; widgetName: string }>
+  } {
+    const linkedPromotionEntries = this._toPromotionEntries(linkedEntries)
+    const fallbackStoredEntries = this._getFallbackStoredEntries(
+      entries,
+      linkedPromotionEntries
+    )
+
+    return {
+      linkedPromotionEntries,
+      fallbackStoredEntries
+    }
+  }
+
+  private _shouldPersistLinkedOnly(
+    linkedEntries: LinkedPromotionEntry[]
+  ): boolean {
+    return this.inputs.length > 0 && linkedEntries.length === this.inputs.length
+  }
+
+  private _toPromotionEntries(
+    linkedEntries: LinkedPromotionEntry[]
+  ): Array<{ interiorNodeId: string; widgetName: string }> {
+    return linkedEntries.map(({ interiorNodeId, widgetName }) => ({
+      interiorNodeId,
+      widgetName
+    }))
+  }
+
+  private _getFallbackStoredEntries(
+    entries: Array<{ interiorNodeId: string; widgetName: string }>,
+    linkedPromotionEntries: Array<{
+      interiorNodeId: string
+      widgetName: string
+    }>
+  ): Array<{ interiorNodeId: string; widgetName: string }> {
+    const linkedKeys = new Set(
+      linkedPromotionEntries.map((entry) =>
+        this._makePromotionEntryKey(entry.interiorNodeId, entry.widgetName)
+      )
+    )
+    return entries.filter(
+      (entry) =>
+        !linkedKeys.has(
+          this._makePromotionEntryKey(entry.interiorNodeId, entry.widgetName)
+        )
+    )
+  }
+
+  private _buildLinkedReconcileEntries(
+    linkedEntries: LinkedPromotionEntry[]
+  ): Array<{ interiorNodeId: string; widgetName: string; viewKey: string }> {
+    return linkedEntries.map(({ inputName, interiorNodeId, widgetName }) => ({
+      interiorNodeId,
+      widgetName,
+      viewKey: this._makePromotionViewKey(inputName, interiorNodeId, widgetName)
+    }))
+  }
+
+  private _buildDisplayNameByViewKey(
+    linkedEntries: LinkedPromotionEntry[]
+  ): Map<string, string> {
+    return new Map(
+      linkedEntries.map((entry) => [
+        this._makePromotionViewKey(
+          entry.inputName,
+          entry.interiorNodeId,
+          entry.widgetName
+        ),
+        entry.inputName
+      ])
+    )
+  }
+
+  private _makePromotionEntryKey(
+    interiorNodeId: string,
+    widgetName: string
+  ): string {
+    return `${interiorNodeId}:${widgetName}`
+  }
+
+  private _makePromotionViewKey(
+    inputName: string,
+    interiorNodeId: string,
+    widgetName: string
+  ): string {
+    return `${inputName}:${interiorNodeId}:${widgetName}`
+  }
+
+  private _resolveLegacyEntry(
+    widgetName: string
+  ): [string, string] | undefined {
+    // Legacy -1 entries use the slot name as the widget name.
+    // Find the input with that name, then trace to the connected interior widget.
+    const input = this.inputs.find((i) => i.name === widgetName)
+    if (!input?._widget) return undefined
+
+    const widget = input._widget
+    if (isPromotedWidgetView(widget)) {
+      return [widget.sourceNodeId, widget.sourceWidgetName]
+    }
+
+    // Fallback: find via subgraph input slot connection
+    const resolvedTarget = resolveSubgraphInputTarget(this, widgetName)
+    if (!resolvedTarget) return undefined
+
+    return [resolvedTarget.nodeId, resolvedTarget.widgetName]
+  }
 
   /** Manages lifecycle of all subgraph event listeners */
-  #eventAbortController = new AbortController()
+  private _eventAbortController = new AbortController()
 
   constructor(
     /** The (sub)graph that contains this subgraph instance. */
-    override readonly graph: GraphOrSubgraph,
+    graph: GraphOrSubgraph,
     /** The definition of this subgraph; how its nodes are configured, etc. */
     readonly subgraph: Subgraph,
     instanceData: ExportedSubgraphInstance
   ) {
     super(subgraph.name, subgraph.id)
+    this.graph = graph
+
+    // Synthetic widgets getter — SubgraphNodes have no native widgets.
+    Object.defineProperty(this, 'widgets', {
+      get: () => this._getPromotedViews(),
+      set: () => {
+        if (import.meta.env.DEV)
+          console.warn(
+            'Cannot manually set widgets on SubgraphNode; use the promotion system.'
+          )
+      },
+      configurable: true,
+      enumerable: true
+    })
 
     // Update this node when the subgraph input / output slots are changed
     const subgraphEvents = this.subgraph.events
-    const { signal } = this.#eventAbortController
+    const { signal } = this._eventAbortController
 
     subgraphEvents.addEventListener(
       'input-added',
       (e) => {
         const subgraphInput = e.detail.input
         const { name, type } = subgraphInput
-        const existingInput = this.inputs.find((i) => i.name == name)
+        const existingInput = this.inputs.find((i) => i.name === name)
         if (existingInput) {
           const linkId = subgraphInput.linkIds[0]
           const { inputNode, input } = subgraph.links[linkId].resolve(subgraph)
-          const widget = inputNode?.widgets?.find?.((w) => w.name == name)
-          if (widget)
-            this.#setWidget(subgraphInput, existingInput, widget, input?.widget)
+          const widget = inputNode?.widgets?.find?.((w) => w.name === name)
+          if (widget && inputNode)
+            this._setWidget(
+              subgraphInput,
+              existingInput,
+              widget,
+              input?.widget,
+              inputNode
+            )
           return
         }
         const input = this.addInput(name, type)
 
-        this.#addSubgraphInputListeners(subgraphInput, input)
+        this._addSubgraphInputListeners(subgraphInput, input)
       },
       { signal }
     )
@@ -105,6 +406,7 @@ export class SubgraphNode extends LGraphNode implements BaseLGraph {
         if (widget) this.ensureWidgetRemoved(widget)
 
         this.removeInput(e.detail.index)
+        this._syncPromotions()
         this.setDirtyCanvas(true, true)
       },
       { signal }
@@ -178,7 +480,7 @@ export class SubgraphNode extends LGraphNode implements BaseLGraph {
     }
   }
 
-  #addSubgraphInputListeners(
+  private _addSubgraphInputListeners(
     subgraphInput: SubgraphInput,
     input: INodeInputSlot & Partial<ISubgraphInput>
   ) {
@@ -194,13 +496,37 @@ export class SubgraphNode extends LGraphNode implements BaseLGraph {
     subgraphInput.events.addEventListener(
       'input-connected',
       (e) => {
-        if (input._widget) return
-
         const widget = subgraphInput._widget
         if (!widget) return
 
+        // If this widget is already promoted, demote it first
+        // so it transitions cleanly to being linked via SubgraphInput.
+        const nodeId = String(e.detail.node.id)
+        if (
+          usePromotionStore().isPromoted(
+            this.rootGraph.id,
+            this.id,
+            nodeId,
+            widget.name
+          )
+        ) {
+          usePromotionStore().demote(
+            this.rootGraph.id,
+            this.id,
+            nodeId,
+            widget.name
+          )
+        }
+
         const widgetLocator = e.detail.input.widget
-        this.#setWidget(subgraphInput, input, widget, widgetLocator)
+        this._setWidget(
+          subgraphInput,
+          input,
+          widget,
+          widgetLocator,
+          e.detail.node
+        )
+        this._syncPromotions()
       },
       { signal }
     )
@@ -212,11 +538,12 @@ export class SubgraphNode extends LGraphNode implements BaseLGraph {
         const connectedWidgets = subgraphInput.getConnectedWidgets()
         if (connectedWidgets.length > 0) return
 
-        this.removeWidgetByName(input.name)
+        if (input._widget) this.ensureWidgetRemoved(input._widget)
 
         delete input.pos
         delete input.widget
         input._widget = undefined
+        this._syncPromotions()
       },
       { signal }
     )
@@ -270,8 +597,42 @@ export class SubgraphNode extends LGraphNode implements BaseLGraph {
   }
 
   override _internalConfigureAfterSlots() {
-    // Reset widgets
-    this.widgets.length = 0
+    // Ensure proxyWidgets is initialized so it serializes
+    this.properties.proxyWidgets ??= []
+
+    // Clear view cache — forces re-creation on next getter access.
+    // Do NOT clear properties.proxyWidgets — it was already populated
+    // from serialized data by super.configure(info) before this runs.
+    this._promotedViewManager.clear()
+
+    // Hydrate the store from serialized properties.proxyWidgets
+    const raw = parseProxyWidgets(this.properties.proxyWidgets)
+    const store = usePromotionStore()
+    const entries = raw
+      .map(([nodeId, widgetName]) => {
+        if (nodeId === '-1') {
+          const resolved = this._resolveLegacyEntry(widgetName)
+          if (resolved)
+            return { interiorNodeId: resolved[0], widgetName: resolved[1] }
+          if (import.meta.env.DEV) {
+            console.warn(
+              `[SubgraphNode] Failed to resolve legacy -1 entry for widget "${widgetName}"`
+            )
+          }
+          return null
+        }
+        return { interiorNodeId: nodeId, widgetName }
+      })
+      .filter((e): e is NonNullable<typeof e> => e !== null)
+    store.setPromotions(this.rootGraph.id, this.id, entries)
+
+    // Write back resolved entries so legacy -1 format doesn't persist
+    if (raw.some(([id]) => id === '-1')) {
+      this.properties.proxyWidgets = entries.map((e) => [
+        e.interiorNodeId,
+        e.widgetName
+      ])
+    }
 
     // Check all inputs for connected widgets
     for (const input of this.inputs) {
@@ -287,7 +648,7 @@ export class SubgraphNode extends LGraphNode implements BaseLGraph {
         continue
       }
 
-      this.#addSubgraphInputListeners(subgraphInput, input)
+      this._addSubgraphInputListeners(subgraphInput, input)
 
       // Find the first widget that this slot is connected to
       for (const linkId of subgraphInput.linkIds) {
@@ -317,75 +678,79 @@ export class SubgraphNode extends LGraphNode implements BaseLGraph {
         const widget = inputNode.getWidgetFromSlot(targetInput)
         if (!widget) continue
 
-        this.#setWidget(subgraphInput, input, widget, targetInput.widget)
+        this._setWidget(
+          subgraphInput,
+          input,
+          widget,
+          targetInput.widget,
+          inputNode
+        )
         break
       }
     }
+
+    this._syncPromotions()
   }
 
-  #setWidget(
+  private _setWidget(
     subgraphInput: Readonly<SubgraphInput>,
     input: INodeInputSlot,
-    widget: Readonly<IBaseWidget>,
-    inputWidget: IWidgetLocator | undefined
+    interiorWidget: Readonly<IBaseWidget>,
+    inputWidget: IWidgetLocator | undefined,
+    interiorNode: LGraphNode
   ) {
-    // Use the first matching widget
-    const promotedWidget = toConcreteWidget(widget, this).createCopyForNode(
-      this
-    )
+    this._flushPendingPromotions()
 
-    Object.assign(promotedWidget, {
-      get name() {
-        return subgraphInput.name
-      },
-      set name(value) {
-        console.warn(
-          'Promoted widget: setting name is not allowed',
-          this,
-          value
-        )
-      },
-      get localized_name() {
-        return subgraphInput.localized_name
-      },
-      set localized_name(value) {
-        console.warn(
-          'Promoted widget: setting localized_name is not allowed',
-          this,
-          value
-        )
-      },
-      get label() {
-        return subgraphInput.label
-      },
-      set label(value) {
-        console.warn(
-          'Promoted widget: setting label is not allowed',
-          this,
-          value
-        )
-      },
-      get tooltip() {
-        // Preserve the original widget's tooltip for promoted widgets
-        return widget.tooltip
-      },
-      set tooltip(value) {
-        console.warn(
-          'Promoted widget: setting tooltip is not allowed',
-          this,
-          value
+    const nodeId = String(interiorNode.id)
+    const widgetName = interiorWidget.name
+
+    const previousView = input._widget
+
+    if (
+      previousView &&
+      isPromotedWidgetView(previousView) &&
+      (previousView.sourceNodeId !== nodeId ||
+        previousView.sourceWidgetName !== widgetName)
+    ) {
+      usePromotionStore().demote(
+        this.rootGraph.id,
+        this.id,
+        previousView.sourceNodeId,
+        previousView.sourceWidgetName
+      )
+      this._removePromotedView(previousView)
+    }
+
+    if (this.id === -1) {
+      if (
+        !this._pendingPromotions.some(
+          (entry) =>
+            entry.interiorNodeId === nodeId && entry.widgetName === widgetName
         )
+      ) {
+        this._pendingPromotions.push({
+          interiorNodeId: nodeId,
+          widgetName
+        })
       }
-    })
+    } else {
+      // Add to promotion store
+      usePromotionStore().promote(
+        this.rootGraph.id,
+        this.id,
+        nodeId,
+        widgetName
+      )
+    }
 
-    const widgetCount = this.inputs.filter((i) => i.widget).length
-    this.widgets.splice(widgetCount, 0, promotedWidget)
-
-    // Dispatch widget-promoted event
-    this.subgraph.events.dispatch('widget-promoted', {
-      widget: promotedWidget,
-      subgraphNode: this
-    })
+    // Create/retrieve the view from cache
+    const view = this._promotedViewManager.getOrCreate(
+      nodeId,
+      widgetName,
+      () =>
+        createPromotedWidgetView(this, nodeId, widgetName, subgraphInput.name),
+      this._makePromotionViewKey(subgraphInput.name, nodeId, widgetName)
+    )
 
     // NOTE: This code creates linked chains of prototypes for passing across
     // multiple levels of subgraphs. As part of this, it intentionally avoids
@@ -394,7 +759,33 @@ export class SubgraphNode extends LGraphNode implements BaseLGraph {
     input.widget.name = subgraphInput.name
     if (inputWidget) Object.setPrototypeOf(input.widget, inputWidget)
 
-    input._widget = promotedWidget
+    input._widget = view
+
+    // Dispatch widget-promoted event
+    this.subgraph.events.dispatch('widget-promoted', {
+      widget: view,
+      subgraphNode: this
+    })
+  }
+
+  private _flushPendingPromotions() {
+    if (this.id === -1 || this._pendingPromotions.length === 0) return
+
+    for (const entry of this._pendingPromotions) {
+      usePromotionStore().promote(
+        this.rootGraph.id,
+        this.id,
+        entry.interiorNodeId,
+        entry.widgetName
+      )
+    }
+
+    this._pendingPromotions = []
+  }
+
+  override onAdded(_graph: LGraph): void {
+    this._flushPendingPromotions()
+    this._syncPromotions()
   }
 
   /**
@@ -492,7 +883,7 @@ export class SubgraphNode extends LGraphNode implements BaseLGraph {
     const subgraphInstanceIdPath = [...subgraphNodePath, this.id]
 
     // Store the subgraph node DTO
-    const parentSubgraphNode = this.graph.rootGraph
+    const parentSubgraphNode = this.rootGraph
       .resolveSubgraphIdPath(subgraphNodePath)
       .at(-1)
     const subgraphNodeDto = new ExecutableNodeDTO(
@@ -526,40 +917,87 @@ export class SubgraphNode extends LGraphNode implements BaseLGraph {
     return nodes
   }
 
+  /** Clear the DOM position override for a promoted view's interior widget. */
+  private _clearDomOverrideForView(view: PromotedWidgetView): void {
+    const node = this.subgraph.getNodeById(view.sourceNodeId)
+    if (!node) return
+    const interiorWidget = node.widgets?.find(
+      (w: IBaseWidget) => w.name === view.sourceWidgetName
+    )
+    if (
+      interiorWidget &&
+      'id' in interiorWidget &&
+      ('element' in interiorWidget || 'component' in interiorWidget)
+    ) {
+      useDomWidgetStore().clearPositionOverride(String(interiorWidget.id))
+    }
+  }
+
+  private _removePromotedView(view: PromotedWidgetView): void {
+    this._promotedViewManager.remove(view.sourceNodeId, view.sourceWidgetName)
+    // Reconciled views can also be keyed by inputName-scoped view keys.
+    // Remove both key shapes to avoid stale cache entries across promote/rebind flows.
+    this._promotedViewManager.removeByViewKey(
+      view.sourceNodeId,
+      view.sourceWidgetName,
+      this._makePromotionViewKey(
+        view.name,
+        view.sourceNodeId,
+        view.sourceWidgetName
+      )
+    )
+  }
+
+  override removeWidget(widget: IBaseWidget): void {
+    this.ensureWidgetRemoved(widget)
+  }
+
   override removeWidgetByName(name: string): void {
     const widget = this.widgets.find((w) => w.name === name)
-    if (widget) {
-      this.subgraph.events.dispatch('widget-demoted', {
-        widget,
-        subgraphNode: this
-      })
-    }
-    super.removeWidgetByName(name)
+    if (widget) this.ensureWidgetRemoved(widget)
   }
 
   override ensureWidgetRemoved(widget: IBaseWidget): void {
-    if (this.widgets.includes(widget)) {
-      this.subgraph.events.dispatch('widget-demoted', {
-        widget,
-        subgraphNode: this
-      })
+    if (isPromotedWidgetView(widget)) {
+      this._clearDomOverrideForView(widget)
+      usePromotionStore().demote(
+        this.rootGraph.id,
+        this.id,
+        widget.sourceNodeId,
+        widget.sourceWidgetName
+      )
+      this._removePromotedView(widget)
     }
-    super.ensureWidgetRemoved(widget)
+    for (const input of this.inputs) {
+      if (input._widget === widget) {
+        input._widget = undefined
+        input.widget = undefined
+      }
+    }
+    this.subgraph.events.dispatch('widget-demoted', {
+      widget,
+      subgraphNode: this
+    })
+
+    this._syncPromotions()
   }
 
   override onRemoved(): void {
-    // Clean up all subgraph event listeners
-    this.#eventAbortController.abort()
+    this._eventAbortController.abort()
 
-    // Clean up all promoted widgets
     for (const widget of this.widgets) {
-      if ('isProxyWidget' in widget && widget.isProxyWidget) continue
+      if (isPromotedWidgetView(widget)) {
+        this._clearDomOverrideForView(widget)
+      }
       this.subgraph.events.dispatch('widget-demoted', {
         widget,
         subgraphNode: this
       })
     }
 
+    usePromotionStore().setPromotions(this.rootGraph.id, this.id, [])
+    this._promotedViewManager.clear()
+
     for (const input of this.inputs) {
       if (
         input._listenerController &&
@@ -590,7 +1028,13 @@ export class SubgraphNode extends LGraphNode implements BaseLGraph {
     if (!low_quality) {
       ctx.translate(25, 23)
       ctx.scale(-1.5, 1.5)
-      ctx.drawImage(workflowSvg, 0, -title_height, box_size, box_size)
+      ctx.drawImage(
+        workflowBitmapCache.get(),
+        0,
+        -title_height,
+        box_size,
+        box_size
+      )
     }
     ctx.restore()
   }
@@ -601,36 +1045,36 @@ export class SubgraphNode extends LGraphNode implements BaseLGraph {
    * This ensures nested subgraph widget values are preserved when saving.
    */
   override serialize(): ISerialisedNode {
-    // Sync widget values to subgraph definition before serialization
-    for (let i = 0; i < this.widgets.length; i++) {
-      const widget = this.widgets[i]
-      const input = this.inputs.find((inp) => inp.name === widget.name)
+    // Sync widget values to subgraph definition before serialization.
+    // Only sync for inputs that are linked to a promoted widget via _widget.
+    for (const input of this.inputs) {
+      if (!input._widget) continue
 
-      if (input) {
-        const subgraphInput = this.subgraph.inputNode.slots.find(
-          (slot) => slot.name === input.name
-        )
+      const subgraphInput = this.subgraph.inputNode.slots.find(
+        (slot) => slot.name === input.name
+      )
+      if (!subgraphInput) continue
 
-        if (subgraphInput) {
-          // Find all widgets connected to this subgraph input
-          const connectedWidgets = subgraphInput.getConnectedWidgets()
-
-          // Update the value of all connected widgets
-          for (const connectedWidget of connectedWidgets) {
-            connectedWidget.value = widget.value
-          }
-        }
+      const connectedWidgets = subgraphInput.getConnectedWidgets()
+      for (const connectedWidget of connectedWidgets) {
+        connectedWidget.value = input._widget.value
       }
     }
 
-    // Call parent serialize method
+    // Write promotion store state back to properties for serialization
+    const entries = usePromotionStore().getPromotions(
+      this.rootGraph.id,
+      this.id
+    )
+    this.properties.proxyWidgets = entries.map((e) => [
+      e.interiorNodeId,
+      e.widgetName
+    ])
+
     return super.serialize()
   }
   override clone() {
     const clone = super.clone()
-    // force reasign so domWidgets reset ownership
-
-    this.properties.proxyWidgets = this.properties.proxyWidgets
 
     //TODO: Consider deep cloning subgraphs here.
     //It's the safest place to prevent creation of linked subgraphs
diff --git a/tests-ui/tests/litegraph/subgraph/SubgraphSerialization.test.ts b/src/lib/litegraph/src/subgraph/SubgraphSerialization.test.ts
similarity index 99%
rename from tests-ui/tests/litegraph/subgraph/SubgraphSerialization.test.ts
rename to src/lib/litegraph/src/subgraph/SubgraphSerialization.test.ts
index 35e113b0ef..c2546bf12e 100644
--- a/tests-ui/tests/litegraph/subgraph/SubgraphSerialization.test.ts
+++ b/src/lib/litegraph/src/subgraph/SubgraphSerialization.test.ts
@@ -12,7 +12,7 @@ import { LGraph, Subgraph } from '@/lib/litegraph/src/litegraph'
 import {
   createTestSubgraph,
   createTestSubgraphNode
-} from './fixtures/subgraphHelpers'
+} from './__fixtures__/subgraphHelpers'
 
 describe.skip('SubgraphSerialization - Basic Serialization', () => {
   it('should save and load simple subgraphs', () => {
@@ -76,7 +76,6 @@ describe.skip('SubgraphSerialization - Basic Serialization', () => {
     // Verify core properties
     expect(restored.id).toBe(original.id)
     expect(restored.name).toBe(original.name)
-    // @ts-expect-error description property not in type definition
     expect(restored.description).toBe(original.description)
 
     // Verify I/O structure
diff --git a/src/lib/litegraph/src/subgraph/SubgraphSlotBase.ts b/src/lib/litegraph/src/subgraph/SubgraphSlotBase.ts
index 7c717eaa4b..4f66d1e148 100644
--- a/src/lib/litegraph/src/subgraph/SubgraphSlotBase.ts
+++ b/src/lib/litegraph/src/subgraph/SubgraphSlotBase.ts
@@ -46,7 +46,7 @@ export abstract class SubgraphSlot
     return LiteGraph.NODE_SLOT_HEIGHT
   }
 
-  readonly #pos: Point = [0, 0]
+  private readonly _pos: Point = [0, 0]
 
   readonly measurement: ConstrainedSize = new ConstrainedSize(
     SubgraphSlot.defaultHeight,
@@ -67,14 +67,14 @@ export abstract class SubgraphSlot
   )
 
   override get pos() {
-    return this.#pos
+    return this._pos
   }
 
   override set pos(value) {
     if (!value || value.length < 2) return
 
-    this.#pos[0] = value[0]
-    this.#pos[1] = value[1]
+    this._pos[0] = value[0]
+    this._pos[1] = value[1]
   }
 
   /** Whether this slot is connected to another slot. */
diff --git a/tests-ui/tests/litegraph/subgraph/SubgraphSlotConnections.test.ts b/src/lib/litegraph/src/subgraph/SubgraphSlotConnections.test.ts
similarity index 96%
rename from tests-ui/tests/litegraph/subgraph/SubgraphSlotConnections.test.ts
rename to src/lib/litegraph/src/subgraph/SubgraphSlotConnections.test.ts
index 0c10b782a7..515c0ac22e 100644
--- a/tests-ui/tests/litegraph/subgraph/SubgraphSlotConnections.test.ts
+++ b/src/lib/litegraph/src/subgraph/SubgraphSlotConnections.test.ts
@@ -1,21 +1,24 @@
 // TODO: Fix these tests after migration
 import { describe, expect, it, vi } from 'vitest'
 
-import { LinkConnector } from '@/lib/litegraph/src/litegraph'
-import { ToInputFromIoNodeLink } from '@/lib/litegraph/src/litegraph'
-import { SUBGRAPH_INPUT_ID } from '@/lib/litegraph/src/litegraph'
-import { LGraphNode, type LinkNetwork } from '@/lib/litegraph/src/litegraph'
-import type { NodeInputSlot } from '@/lib/litegraph/src/litegraph'
-import type { NodeOutputSlot } from '@/lib/litegraph/src/litegraph'
 import {
+  SUBGRAPH_INPUT_ID,
+  LinkConnector,
+  ToInputFromIoNodeLink,
+  LGraphNode,
   isSubgraphInput,
   isSubgraphOutput
 } from '@/lib/litegraph/src/litegraph'
+import type {
+  LinkNetwork,
+  NodeInputSlot,
+  NodeOutputSlot
+} from '@/lib/litegraph/src/litegraph'
 
 import {
   createTestSubgraph,
   createTestSubgraphNode
-} from './fixtures/subgraphHelpers'
+} from './__fixtures__/subgraphHelpers'
 
 describe.skip('Subgraph slot connections', () => {
   describe.skip('SubgraphInput connections', () => {
diff --git a/tests-ui/tests/litegraph/subgraph/SubgraphSlotVisualFeedback.test.ts b/src/lib/litegraph/src/subgraph/SubgraphSlotVisualFeedback.test.ts
similarity index 83%
rename from tests-ui/tests/litegraph/subgraph/SubgraphSlotVisualFeedback.test.ts
rename to src/lib/litegraph/src/subgraph/SubgraphSlotVisualFeedback.test.ts
index 0ed819a4fa..9a85ddb185 100644
--- a/tests-ui/tests/litegraph/subgraph/SubgraphSlotVisualFeedback.test.ts
+++ b/src/lib/litegraph/src/subgraph/SubgraphSlotVisualFeedback.test.ts
@@ -1,13 +1,21 @@
 // TODO: Fix these tests after migration
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
+import type { DefaultConnectionColors } from '@/lib/litegraph/src/interfaces'
 import { LGraphNode } from '@/lib/litegraph/src/litegraph'
 
-import { createTestSubgraph } from './fixtures/subgraphHelpers'
+import { createTestSubgraph } from './__fixtures__/subgraphHelpers'
+
+interface MockColorContext {
+  defaultInputColor: string
+  defaultOutputColor: string
+  getConnectedColor: ReturnType<typeof vi.fn>
+  getDisconnectedColor: ReturnType<typeof vi.fn>
+}
 
 describe.skip('SubgraphSlot visual feedback', () => {
   let mockCtx: CanvasRenderingContext2D
-  let mockColorContext: any
+  let mockColorContext: MockColorContext
   let globalAlphaValues: number[]
 
   beforeEach(() => {
@@ -34,7 +42,8 @@ describe.skip('SubgraphSlot visual feedback', () => {
       rect: vi.fn(),
       fillText: vi.fn()
     }
-    mockCtx = mockContext as unknown as CanvasRenderingContext2D
+    mockCtx =
+      mockContext as Partial<CanvasRenderingContext2D> as CanvasRenderingContext2D
 
     // Create a mock color context
     mockColorContext = {
@@ -42,7 +51,7 @@ describe.skip('SubgraphSlot visual feedback', () => {
       defaultOutputColor: '#00FF00',
       getConnectedColor: vi.fn().mockReturnValue('#0000FF'),
       getDisconnectedColor: vi.fn().mockReturnValue('#AAAAAA')
-    }
+    } as Partial<MockColorContext> as MockColorContext
   })
 
   it('should render SubgraphInput slots with full opacity when dragging from compatible slot', () => {
@@ -60,7 +69,8 @@ describe.skip('SubgraphSlot visual feedback', () => {
     // Draw the slot with a compatible fromSlot
     subgraphInput.draw({
       ctx: mockCtx,
-      colorContext: mockColorContext,
+      colorContext:
+        mockColorContext as Partial<DefaultConnectionColors> as DefaultConnectionColors,
       fromSlot: nodeInput,
       editorAlpha: 1
     })
@@ -80,7 +90,8 @@ describe.skip('SubgraphSlot visual feedback', () => {
     // Draw subgraphInput2 while dragging from subgraphInput1 (incompatible - both are outputs inside subgraph)
     subgraphInput2.draw({
       ctx: mockCtx,
-      colorContext: mockColorContext,
+      colorContext:
+        mockColorContext as Partial<DefaultConnectionColors> as DefaultConnectionColors,
       fromSlot: subgraphInput1,
       editorAlpha: 1
     })
@@ -105,7 +116,8 @@ describe.skip('SubgraphSlot visual feedback', () => {
     // Draw the slot with a compatible fromSlot
     subgraphOutput.draw({
       ctx: mockCtx,
-      colorContext: mockColorContext,
+      colorContext:
+        mockColorContext as Partial<DefaultConnectionColors> as DefaultConnectionColors,
       fromSlot: nodeOutput,
       editorAlpha: 1
     })
@@ -125,7 +137,8 @@ describe.skip('SubgraphSlot visual feedback', () => {
     // Draw subgraphOutput2 while dragging from subgraphOutput1 (incompatible - both are inputs inside subgraph)
     subgraphOutput2.draw({
       ctx: mockCtx,
-      colorContext: mockColorContext,
+      colorContext:
+        mockColorContext as Partial<DefaultConnectionColors> as DefaultConnectionColors,
       fromSlot: subgraphOutput1,
       editorAlpha: 1
     })
@@ -170,7 +183,8 @@ describe.skip('SubgraphSlot visual feedback', () => {
     // Draw the SubgraphOutput slot while dragging from a node output with incompatible type
     subgraphOutput.draw({
       ctx: mockCtx,
-      colorContext: mockColorContext,
+      colorContext:
+        mockColorContext as Partial<DefaultConnectionColors> as DefaultConnectionColors,
       fromSlot: nodeStringOutput,
       editorAlpha: 1
     })
diff --git a/tests-ui/tests/litegraph/subgraph/SubgraphWidgetPromotion.test.ts b/src/lib/litegraph/src/subgraph/SubgraphWidgetPromotion.test.ts
similarity index 95%
rename from tests-ui/tests/litegraph/subgraph/SubgraphWidgetPromotion.test.ts
rename to src/lib/litegraph/src/subgraph/SubgraphWidgetPromotion.test.ts
index 36793829d4..1d609fe017 100644
--- a/tests-ui/tests/litegraph/subgraph/SubgraphWidgetPromotion.test.ts
+++ b/src/lib/litegraph/src/subgraph/SubgraphWidgetPromotion.test.ts
@@ -1,22 +1,24 @@
 // TODO: Fix these tests after migration
 import { describe, expect, it } from 'vitest'
 
-import type { ISlotType, Subgraph } from '@/lib/litegraph/src/litegraph'
-import { LGraphNode } from '@/lib/litegraph/src/litegraph'
-import type { TWidgetType } from '@/lib/litegraph/src/litegraph'
-import { BaseWidget } from '@/lib/litegraph/src/litegraph'
+import type {
+  ISlotType,
+  Subgraph,
+  TWidgetType
+} from '@/lib/litegraph/src/litegraph'
+import { BaseWidget, LGraphNode } from '@/lib/litegraph/src/litegraph'
 
 import {
   createEventCapture,
   createTestSubgraph,
   createTestSubgraphNode
-} from './fixtures/subgraphHelpers'
+} from './__fixtures__/subgraphHelpers'
 
 // Helper to create a node with a widget
 function createNodeWithWidget(
   title: string,
   widgetType: TWidgetType = 'number',
-  widgetValue: any = 42,
+  widgetValue: unknown = 42,
   slotType: ISlotType = 'number',
   tooltip?: string
 ) {
@@ -132,9 +134,7 @@ describe.skip('SubgraphWidgetPromotion', () => {
       // Check event was fired
       const promotedEvents = eventCapture.getEventsByType('widget-promoted')
       expect(promotedEvents).toHaveLength(1)
-      // @ts-expect-error Object is of type 'unknown'
       expect(promotedEvents[0].detail.widget).toBeDefined()
-      // @ts-expect-error Object is of type 'unknown'
       expect(promotedEvents[0].detail.subgraphNode).toBe(subgraphNode)
 
       eventCapture.cleanup()
@@ -159,9 +159,7 @@ describe.skip('SubgraphWidgetPromotion', () => {
       // Check event was fired
       const demotedEvents = eventCapture.getEventsByType('widget-demoted')
       expect(demotedEvents).toHaveLength(1)
-      // @ts-expect-error Object is of type 'unknown'
       expect(demotedEvents[0].detail.widget).toBeDefined()
-      // @ts-expect-error Object is of type 'unknown'
       expect(demotedEvents[0].detail.subgraphNode).toBe(subgraphNode)
 
       // Widget should be removed
diff --git a/tests-ui/tests/litegraph/subgraph/fixtures/README.md b/src/lib/litegraph/src/subgraph/__fixtures__/README.md
similarity index 80%
rename from tests-ui/tests/litegraph/subgraph/fixtures/README.md
rename to src/lib/litegraph/src/subgraph/__fixtures__/README.md
index 86d2e9e19d..dd46549108 100644
--- a/tests-ui/tests/litegraph/subgraph/fixtures/README.md
+++ b/src/lib/litegraph/src/subgraph/__fixtures__/README.md
@@ -5,6 +5,7 @@ This directory contains the testing infrastructure for LiteGraph's subgraph func
 ## What is a Subgraph?
 
 A subgraph in LiteGraph is a graph-within-a-graph that can be reused as a single node. It has:
+
 - Input slots that map to an internal input node
 - Output slots that map to an internal output node
 - Internal nodes and connections
@@ -14,23 +15,26 @@ A subgraph in LiteGraph is a graph-within-a-graph that can be reused as a single
 
 ```typescript
 // Import what you need
-import { createTestSubgraph, assertSubgraphStructure } from "./fixtures/subgraphHelpers"
-import { subgraphTest } from "./fixtures/subgraphFixtures"
+import {
+  createTestSubgraph,
+  assertSubgraphStructure
+} from './__fixtures__/subgraphHelpers'
+import { subgraphTest } from './__fixtures__/subgraphFixtures'
 
 // Option 1: Create a subgraph manually
-it("should do something", () => {
+it('should do something', () => {
   const subgraph = createTestSubgraph({
-    name: "My Test Subgraph",
+    name: 'My Test Subgraph',
     inputCount: 2,
     outputCount: 1
   })
-  
+
   // Test your functionality
   expect(subgraph.inputs).toHaveLength(2)
 })
 
 // Option 2: Use pre-configured fixtures
-subgraphTest("should handle events", ({ simpleSubgraph, eventCapture }) => {
+subgraphTest('should handle events', ({ simpleSubgraph, eventCapture }) => {
   // simpleSubgraph comes pre-configured with 1 input, 1 output, and 2 nodes
   expect(simpleSubgraph.inputs).toHaveLength(1)
   // Your test logic here
@@ -42,16 +46,19 @@ subgraphTest("should handle events", ({ simpleSubgraph, eventCapture }) => {
 ### `subgraphHelpers.ts` - Core Helper Functions
 
 **Main Factory Functions:**
+
 - `createTestSubgraph(options?)` - Creates a fully configured Subgraph instance with root graph
 - `createTestSubgraphNode(subgraph, options?)` - Creates a SubgraphNode (instance of a subgraph)
 - `createNestedSubgraphs(options?)` - Creates nested subgraph hierarchies for testing deep structures
 
 **Assertion & Validation:**
+
 - `assertSubgraphStructure(subgraph, expected)` - Validates subgraph has expected inputs/outputs/nodes
 - `verifyEventSequence(events, expectedSequence)` - Ensures events fired in correct order
 - `logSubgraphStructure(subgraph, label?)` - Debug helper to print subgraph structure
 
 **Test Data & Events:**
+
 - `createTestSubgraphData(overrides?)` - Creates raw ExportedSubgraph data for serialization tests
 - `createComplexSubgraphData(nodeCount?)` - Generates complex subgraph with internal connections
 - `createEventCapture(eventTarget, eventTypes)` - Sets up event monitoring with automatic cleanup
@@ -61,6 +68,7 @@ subgraphTest("should handle events", ({ simpleSubgraph, eventCapture }) => {
 Pre-configured test scenarios that automatically set up and tear down:
 
 **Basic Fixtures (`subgraphTest`):**
+
 - `emptySubgraph` - Minimal subgraph with no inputs/outputs/nodes
 - `simpleSubgraph` - 1 input ("input": number), 1 output ("output": number), 2 internal nodes
 - `complexSubgraph` - 3 inputs (data, control, text), 2 outputs (result, status), 5 nodes
@@ -69,11 +77,13 @@ Pre-configured test scenarios that automatically set up and tear down:
 - `eventCapture` - Subgraph with event monitoring for all I/O events
 
 **Edge Case Fixtures (`edgeCaseTest`):**
+
 - `circularSubgraph` - Two subgraphs set up for circular reference testing
 - `deeplyNestedSubgraph` - 50 levels deep for performance/limit testing
 - `maxIOSubgraph` - 20 inputs and 20 outputs for stress testing
 
 ### `testSubgraphs.json` - Sample Test Data
+
 Pre-defined subgraph configurations for consistent testing across different scenarios.
 
 **Note on Static UUIDs**: The hardcoded UUIDs in this file (e.g., "simple-subgraph-uuid", "complex-subgraph-uuid") are intentionally static to ensure test reproducibility and snapshot testing compatibility.
@@ -83,25 +93,28 @@ Pre-defined subgraph configurations for consistent testing across different scen
 ### Basic Test Creation
 
 ```typescript
-import { describe, expect, it } from "vitest"
-import { createTestSubgraph, assertSubgraphStructure } from "./fixtures/subgraphHelpers"
+import { describe, expect, it } from 'vitest'
+import {
+  createTestSubgraph,
+  assertSubgraphStructure
+} from './fixtures/subgraphHelpers'
 
-describe("My Subgraph Feature", () => {
-  it("should work correctly", () => {
+describe('My Subgraph Feature', () => {
+  it('should work correctly', () => {
     const subgraph = createTestSubgraph({
-      name: "My Test",
+      name: 'My Test',
       inputCount: 2,
       outputCount: 1,
       nodeCount: 3
     })
-    
+
     assertSubgraphStructure(subgraph, {
       inputCount: 2,
       outputCount: 1,
       nodeCount: 3,
-      name: "My Test"
+      name: 'My Test'
     })
-    
+
     // Your specific test logic...
   })
 })
@@ -110,13 +123,13 @@ describe("My Subgraph Feature", () => {
 ### Using Fixtures
 
 ```typescript
-import { subgraphTest } from "./fixtures/subgraphFixtures"
+import { subgraphTest } from './fixtures/subgraphFixtures'
 
-subgraphTest("should handle events", ({ eventCapture }) => {
+subgraphTest('should handle events', ({ eventCapture }) => {
   const { subgraph, capture } = eventCapture
-  
-  subgraph.addInput("test", "number")
-  
+
+  subgraph.addInput('test', 'number')
+
   expect(capture.events).toHaveLength(2) // adding-input, input-added
 })
 ```
@@ -124,16 +137,22 @@ subgraphTest("should handle events", ({ eventCapture }) => {
 ### Event Testing
 
 ```typescript
-import { createEventCapture, verifyEventSequence } from "./fixtures/subgraphHelpers"
+import {
+  createEventCapture,
+  verifyEventSequence
+} from './fixtures/subgraphHelpers'
 
-it("should fire events in correct order", () => {
+it('should fire events in correct order', () => {
   const subgraph = createTestSubgraph()
-  const capture = createEventCapture(subgraph.events, ["adding-input", "input-added"])
-  
-  subgraph.addInput("test", "number")
-  
-  verifyEventSequence(capture.events, ["adding-input", "input-added"])
-  
+  const capture = createEventCapture(subgraph.events, [
+    'adding-input',
+    'input-added'
+  ])
+
+  subgraph.addInput('test', 'number')
+
+  verifyEventSequence(capture.events, ['adding-input', 'input-added'])
+
   capture.cleanup() // Important: clean up listeners
 })
 ```
@@ -141,14 +160,14 @@ it("should fire events in correct order", () => {
 ### Nested Structure Testing
 
 ```typescript
-import { createNestedSubgraphs } from "./fixtures/subgraphHelpers"
+import { createNestedSubgraphs } from './fixtures/subgraphHelpers'
 
-it("should handle deep nesting", () => {
+it('should handle deep nesting', () => {
   const nested = createNestedSubgraphs({
     depth: 5,
     nodesPerLevel: 2
   })
-  
+
   expect(nested.subgraphs).toHaveLength(5)
   expect(nested.leafSubgraph.nodes).toHaveLength(2)
 })
@@ -159,19 +178,19 @@ it("should handle deep nesting", () => {
 ### Testing SubgraphNode Instances
 
 ```typescript
-it("should create and configure a SubgraphNode", () => {
+it('should create and configure a SubgraphNode', () => {
   // First create the subgraph definition
   const subgraph = createTestSubgraph({
-    inputs: [{ name: "value", type: "number" }],
-    outputs: [{ name: "result", type: "number" }]
+    inputs: [{ name: 'value', type: 'number' }],
+    outputs: [{ name: 'result', type: 'number' }]
   })
-  
+
   // Then create an instance of it
   const subgraphNode = createTestSubgraphNode(subgraph, {
     pos: [100, 200],
     size: [180, 100]
   })
-  
+
   // The SubgraphNode will have matching slots
   expect(subgraphNode.inputs).toHaveLength(1)
   expect(subgraphNode.outputs).toHaveLength(1)
@@ -182,9 +201,9 @@ it("should create and configure a SubgraphNode", () => {
 ### Complete Test with Parent Graph
 
 ```typescript
-subgraphTest("should work in a parent graph", ({ subgraphWithNode }) => {
+subgraphTest('should work in a parent graph', ({ subgraphWithNode }) => {
   const { subgraph, subgraphNode, parentGraph } = subgraphWithNode
-  
+
   // Everything is pre-configured and connected
   expect(parentGraph.nodes).toContain(subgraphNode)
   expect(subgraphNode.graph).toBe(parentGraph)
@@ -195,18 +214,21 @@ subgraphTest("should work in a parent graph", ({ subgraphWithNode }) => {
 ## Configuration Options
 
 ### `createTestSubgraph(options)`
+
 ```typescript
 interface TestSubgraphOptions {
-  id?: UUID                    // Custom UUID
-  name?: string               // Custom name
-  nodeCount?: number          // Number of internal nodes
-  inputCount?: number         // Number of inputs (uses generic types)
-  outputCount?: number        // Number of outputs (uses generic types)
-  inputs?: Array<{           // Specific input definitions
+  id?: UUID // Custom UUID
+  name?: string // Custom name
+  nodeCount?: number // Number of internal nodes
+  inputCount?: number // Number of inputs (uses generic types)
+  outputCount?: number // Number of outputs (uses generic types)
+  inputs?: Array<{
+    // Specific input definitions
     name: string
     type: ISlotType
   }>
-  outputs?: Array<{          // Specific output definitions
+  outputs?: Array<{
+    // Specific output definitions
     name: string
     type: ISlotType
   }>
@@ -216,11 +238,12 @@ interface TestSubgraphOptions {
 **Note**: Cannot specify both `inputs` array and `inputCount` (or `outputs` array and `outputCount`) - the function will throw an error with details.
 
 ### `createNestedSubgraphs(options)`
+
 ```typescript
 interface NestedSubgraphOptions {
-  depth?: number              // Nesting depth (default: 2)
-  nodesPerLevel?: number      // Nodes per subgraph (default: 2)
-  inputsPerSubgraph?: number  // Inputs per subgraph (default: 1)
+  depth?: number // Nesting depth (default: 2)
+  nodesPerLevel?: number // Nodes per subgraph (default: 2)
+  inputsPerSubgraph?: number // Inputs per subgraph (default: 1)
   outputsPerSubgraph?: number // Outputs per subgraph (default: 1)
 }
 ```
@@ -228,11 +251,13 @@ interface NestedSubgraphOptions {
 ## Important Architecture Notes
 
 ### Subgraph vs SubgraphNode
+
 - **Subgraph**: The definition/template (like a class definition)
 - **SubgraphNode**: An instance of a subgraph placed in a graph (like a class instance)
 - One Subgraph can have many SubgraphNode instances
 
 ### Special Node IDs
+
 - Input node always has ID `-10` (SUBGRAPH_INPUT_ID)
 - Output node always has ID `-20` (SUBGRAPH_OUTPUT_ID)
 - These are virtual nodes that exist in every subgraph
@@ -240,39 +265,43 @@ interface NestedSubgraphOptions {
 ### Common Pitfalls
 
 1. **Array vs Index**: The `inputs` and `outputs` arrays don't have an `index` property on items. Use `indexOf()`:
+
    ```typescript
    // ❌ Wrong
    expect(input.index).toBe(0)
-   
+
    // ✅ Correct
    expect(subgraph.inputs.indexOf(input)).toBe(0)
    ```
 
 2. **Graph vs Subgraph Property**: SubgraphInputNode/OutputNode have `subgraph`, not `graph`:
+
    ```typescript
    // ❌ Wrong
    expect(inputNode.graph).toBe(subgraph)
-   
+
    // ✅ Correct
    expect(inputNode.subgraph).toBe(subgraph)
    ```
 
 3. **Event Detail Structure**: Events have specific detail structures:
+
    ```typescript
    // Input events
    "adding-input": { name: string, type: string }
    "input-added": { input: SubgraphInput, index: number }
-   
-   // Output events  
+
+   // Output events
    "adding-output": { name: string, type: string }
    "output-added": { output: SubgraphOutput, index: number }
    ```
 
 4. **Links are stored in a Map**: Use `.size` not `.length`:
+
    ```typescript
    // ❌ Wrong
    expect(subgraph.links.length).toBe(1)
-   
+
    // ✅ Correct
    expect(subgraph.links.size).toBe(1)
    ```
diff --git a/tests-ui/tests/litegraph/subgraph/fixtures/subgraphFixtures.ts b/src/lib/litegraph/src/subgraph/__fixtures__/subgraphFixtures.ts
similarity index 69%
rename from tests-ui/tests/litegraph/subgraph/fixtures/subgraphFixtures.ts
rename to src/lib/litegraph/src/subgraph/__fixtures__/subgraphFixtures.ts
index 02134868c2..d5e8b418b0 100644
--- a/tests-ui/tests/litegraph/subgraph/fixtures/subgraphFixtures.ts
+++ b/src/lib/litegraph/src/subgraph/__fixtures__/subgraphFixtures.ts
@@ -1,3 +1,4 @@
+// oxlint-disable no-empty-pattern
 /**
  * Vitest Fixtures for Subgraph Testing
  *
@@ -5,17 +6,32 @@
  * in their test files. Each fixture provides a clean, pre-configured subgraph
  * setup for different testing scenarios.
  */
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+
 import type { Subgraph } from '@/lib/litegraph/src/litegraph'
 import { LGraph } from '@/lib/litegraph/src/litegraph'
+import type { SubgraphEventMap } from '@/lib/litegraph/src/infrastructure/SubgraphEventMap'
 import type { SubgraphNode } from '@/lib/litegraph/src/subgraph/SubgraphNode'
 
-import { test } from '../../core/fixtures/testExtensions'
+import { test as baseTest } from '../../__fixtures__/testExtensions'
+
+const test = baseTest.extend({
+  pinia: [
+    async ({}, use) => {
+      setActivePinia(createTestingPinia({ stubActions: false }))
+      await use(undefined)
+    },
+    { auto: true }
+  ]
+})
 import {
   createEventCapture,
   createNestedSubgraphs,
   createTestSubgraph,
   createTestSubgraphNode
 } from './subgraphHelpers'
+import type { EventCapture } from './subgraphHelpers'
 
 interface SubgraphFixtures {
   /** A minimal subgraph with no inputs, outputs, or nodes */
@@ -40,7 +56,7 @@ interface SubgraphFixtures {
   /** Event capture system for testing subgraph events */
   eventCapture: {
     subgraph: Subgraph
-    capture: ReturnType<typeof createEventCapture>
+    capture: EventCapture<SubgraphEventMap>
   }
 }
 
@@ -58,9 +74,7 @@ interface SubgraphFixtures {
  * ```
  */
 export const subgraphTest = test.extend<SubgraphFixtures>({
-  // @ts-expect-error TODO: Fix after merge - fixture use parameter type
-  // eslint-disable-next-line no-empty-pattern
-  emptySubgraph: async ({}, use: (value: unknown) => Promise<void>) => {
+  emptySubgraph: async ({}, use) => {
     const subgraph = createTestSubgraph({
       name: 'Empty Test Subgraph',
       inputCount: 0,
@@ -71,9 +85,7 @@ export const subgraphTest = test.extend<SubgraphFixtures>({
     await use(subgraph)
   },
 
-  // @ts-expect-error TODO: Fix after merge - fixture use parameter type
-  // eslint-disable-next-line no-empty-pattern
-  simpleSubgraph: async ({}, use: (value: unknown) => Promise<void>) => {
+  simpleSubgraph: async ({}, use) => {
     const subgraph = createTestSubgraph({
       name: 'Simple Test Subgraph',
       inputs: [{ name: 'input', type: 'number' }],
@@ -84,9 +96,7 @@ export const subgraphTest = test.extend<SubgraphFixtures>({
     await use(subgraph)
   },
 
-  // @ts-expect-error TODO: Fix after merge - fixture use parameter type
-  // eslint-disable-next-line no-empty-pattern
-  complexSubgraph: async ({}, use: (value: unknown) => Promise<void>) => {
+  complexSubgraph: async ({}, use) => {
     const subgraph = createTestSubgraph({
       name: 'Complex Test Subgraph',
       inputs: [
@@ -104,9 +114,7 @@ export const subgraphTest = test.extend<SubgraphFixtures>({
     await use(subgraph)
   },
 
-  // @ts-expect-error TODO: Fix after merge - fixture use parameter type
-  // eslint-disable-next-line no-empty-pattern
-  nestedSubgraph: async ({}, use: (value: unknown) => Promise<void>) => {
+  nestedSubgraph: async ({}, use) => {
     const nested = createNestedSubgraphs({
       depth: 3,
       nodesPerLevel: 2,
@@ -117,10 +125,7 @@ export const subgraphTest = test.extend<SubgraphFixtures>({
     await use(nested)
   },
 
-  // @ts-expect-error TODO: Fix after merge - fixture use parameter type
-  // eslint-disable-next-line no-empty-pattern
-  subgraphWithNode: async ({}, use: (value: unknown) => Promise<void>) => {
-    // Create the subgraph definition
+  subgraphWithNode: async ({}, use) => {
     const subgraph = createTestSubgraph({
       name: 'Subgraph With Node',
       inputs: [{ name: 'input', type: '*' }],
@@ -128,14 +133,12 @@ export const subgraphTest = test.extend<SubgraphFixtures>({
       nodeCount: 1
     })
 
-    // Create the parent graph and subgraph node instance
     const parentGraph = new LGraph()
     const subgraphNode = createTestSubgraphNode(subgraph, {
       pos: [200, 200],
       size: [180, 80]
     })
 
-    // Add the subgraph node to the parent graph
     parentGraph.add(subgraphNode)
 
     await use({
@@ -145,15 +148,12 @@ export const subgraphTest = test.extend<SubgraphFixtures>({
     })
   },
 
-  // @ts-expect-error TODO: Fix after merge - fixture use parameter type
-  // eslint-disable-next-line no-empty-pattern
-  eventCapture: async ({}, use: (value: unknown) => Promise<void>) => {
+  eventCapture: async ({}, use) => {
     const subgraph = createTestSubgraph({
       name: 'Event Test Subgraph'
     })
 
-    // Set up event capture for all subgraph events
-    const capture = createEventCapture(subgraph.events, [
+    const capture = createEventCapture<SubgraphEventMap>(subgraph.events, [
       'adding-input',
       'input-added',
       'removing-input',
@@ -166,7 +166,6 @@ export const subgraphTest = test.extend<SubgraphFixtures>({
 
     await use({ subgraph, capture })
 
-    // Cleanup event listeners
     capture.cleanup()
   }
 })
diff --git a/tests-ui/tests/litegraph/subgraph/fixtures/subgraphHelpers.ts b/src/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers.ts
similarity index 86%
rename from tests-ui/tests/litegraph/subgraph/fixtures/subgraphHelpers.ts
rename to src/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers.ts
index 736f979d34..5672dc6852 100644
--- a/tests-ui/tests/litegraph/subgraph/fixtures/subgraphHelpers.ts
+++ b/src/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers.ts
@@ -55,6 +55,16 @@ interface CapturedEvent<T = unknown> {
   timestamp: number
 }
 
+/** Return type for createEventCapture with typed getEventsByType */
+export interface EventCapture<TEventMap extends object> {
+  events: CapturedEvent<TEventMap[keyof TEventMap]>[]
+  clear: () => void
+  cleanup: () => void
+  getEventsByType: <K extends keyof TEventMap & string>(
+    type: K
+  ) => CapturedEvent<TEventMap[K]>[]
+}
+
 /**
  * Creates a test subgraph with specified inputs, outputs, and nodes.
  * This is the primary function for creating subgraphs in tests.
@@ -91,34 +101,35 @@ export function createTestSubgraph(
   }
   const rootGraph = new LGraph()
 
-  // Create the base subgraph data
   const subgraphData: ExportedSubgraph = {
-    // Basic graph properties
     version: 1,
+    revision: 0,
+    state: {
+      lastNodeId: 0,
+      lastLinkId: 0,
+      lastGroupId: 0,
+      lastRerouteId: 0
+    },
     nodes: [],
-    // @ts-expect-error TODO: Fix after merge - links type mismatch
-    links: {},
+    links: [],
     groups: [],
     config: {},
     definitions: { subgraphs: [] },
 
-    // Subgraph-specific properties
     id: options.id || createUuidv4(),
     name: options.name || 'Test Subgraph',
 
-    // IO Nodes (required for subgraph functionality)
     inputNode: {
-      id: -10, // SUBGRAPH_INPUT_ID
-      bounding: [10, 100, 150, 126], // [x, y, width, height]
+      id: -10,
+      bounding: [10, 100, 150, 126],
       pinned: false
     },
     outputNode: {
-      id: -20, // SUBGRAPH_OUTPUT_ID
-      bounding: [400, 100, 140, 126], // [x, y, width, height]
+      id: -20,
+      bounding: [400, 100, 140, 126],
       pinned: false
     },
 
-    // IO definitions - will be populated by addInput/addOutput calls
     inputs: [],
     outputs: [],
     widgets: []
@@ -127,11 +138,9 @@ export function createTestSubgraph(
   // Create the subgraph
   const subgraph = new Subgraph(rootGraph, subgraphData)
 
-  // Add requested inputs
   if (options.inputs) {
     for (const input of options.inputs) {
-      // @ts-expect-error TODO: Fix after merge - addInput parameter types
-      subgraph.addInput(input.name, input.type)
+      subgraph.addInput(input.name, String(input.type))
     }
   } else if (options.inputCount) {
     for (let i = 0; i < options.inputCount; i++) {
@@ -139,11 +148,9 @@ export function createTestSubgraph(
     }
   }
 
-  // Add requested outputs
   if (options.outputs) {
     for (const output of options.outputs) {
-      // @ts-expect-error TODO: Fix after merge - addOutput parameter types
-      subgraph.addOutput(output.name, output.type)
+      subgraph.addOutput(output.name, String(output.type))
     }
   } else if (options.outputCount) {
     for (let i = 0; i < options.outputCount; i++) {
@@ -193,10 +200,10 @@ export function createTestSubgraphNode(
     size: options.size || [200, 100],
     inputs: [],
     outputs: [],
-    // @ts-expect-error TODO: Fix after merge - properties type mismatch
     properties: {},
     flags: {},
-    mode: 0
+    mode: 0,
+    order: 0
   }
 
   return new SubgraphNode(parentGraph, subgraph, instanceData)
@@ -237,18 +244,11 @@ export function createNestedSubgraphs(options: NestedSubgraphOptions = {}) {
 
     subgraphs.push(subgraph)
 
-    // Create instance in parent
     const subgraphNode = createTestSubgraphNode(subgraph, {
       pos: [100 + level * 200, 100]
     })
 
-    if (currentParent instanceof LGraph) {
-      currentParent.add(subgraphNode)
-    } else {
-      // @ts-expect-error TODO: Fix after merge - add method parameter types
-      currentParent.add(subgraphNode)
-    }
-
+    currentParent.add(subgraphNode)
     subgraphNodes.push(subgraphNode)
 
     // Next level will be nested inside this subgraph
@@ -353,9 +353,15 @@ export function createTestSubgraphData(
 ): ExportedSubgraph {
   return {
     version: 1,
+    revision: 0,
+    state: {
+      lastNodeId: 0,
+      lastLinkId: 0,
+      lastGroupId: 0,
+      lastRerouteId: 0
+    },
     nodes: [],
-    // @ts-expect-error TODO: Fix after merge - links type mismatch
-    links: {},
+    links: [],
     groups: [],
     config: {},
     definitions: { subgraphs: [] },
@@ -386,13 +392,13 @@ export function createTestSubgraphData(
  * Creates an event capture system for testing event sequences.
  * @param eventTarget The event target to monitor
  * @param eventTypes Array of event types to capture
- * @returns Object with captured events and helper methods
+ * @returns Object with captured events and typed getEventsByType method
  */
-export function createEventCapture<T = unknown>(
+export function createEventCapture<TEventMap extends object = object>(
   eventTarget: EventTarget,
-  eventTypes: string[]
-) {
-  const capturedEvents: CapturedEvent<T>[] = []
+  eventTypes: Array<keyof TEventMap & string>
+): EventCapture<TEventMap> {
+  const capturedEvents: CapturedEvent<TEventMap[keyof TEventMap]>[] = []
   const listeners: Array<() => void> = []
 
   // Set up listeners for each event type
@@ -400,7 +406,7 @@ export function createEventCapture<T = unknown>(
     const listener = (event: Event) => {
       capturedEvents.push({
         type: eventType,
-        detail: (event as CustomEvent<T>).detail,
+        detail: (event as CustomEvent<TEventMap[typeof eventType]>).detail,
         timestamp: Date.now()
       })
     }
@@ -418,7 +424,9 @@ export function createEventCapture<T = unknown>(
       // Remove all event listeners to prevent memory leaks
       for (const cleanup of listeners) cleanup()
     },
-    getEventsByType: (type: string) =>
-      capturedEvents.filter((e) => e.type === type)
+    getEventsByType: <K extends keyof TEventMap & string>(type: K) =>
+      capturedEvents.filter((e) => e.type === type) as CapturedEvent<
+        TEventMap[K]
+      >[]
   }
 }
diff --git a/tests-ui/tests/litegraph/subgraph/fixtures/testSubgraphs.json b/src/lib/litegraph/src/subgraph/__fixtures__/testSubgraphs.json
similarity index 92%
rename from tests-ui/tests/litegraph/subgraph/fixtures/testSubgraphs.json
rename to src/lib/litegraph/src/subgraph/__fixtures__/testSubgraphs.json
index afce66a3bd..35d511a212 100644
--- a/tests-ui/tests/litegraph/subgraph/fixtures/testSubgraphs.json
+++ b/src/lib/litegraph/src/subgraph/__fixtures__/testSubgraphs.json
@@ -11,9 +11,7 @@
           { "name": "a", "type": "number", "link": null },
           { "name": "b", "type": "number", "link": null }
         ],
-        "outputs": [
-          { "name": "result", "type": "number", "links": [] }
-        ],
+        "outputs": [{ "name": "result", "type": "number", "links": [] }],
         "properties": { "operation": "add" },
         "flags": {},
         "mode": 0
@@ -23,10 +21,10 @@
     "groups": [],
     "config": {},
     "definitions": { "subgraphs": [] },
-    
+
     "id": "simple-subgraph-uuid",
     "name": "Simple Math Subgraph",
-    
+
     "inputNode": {
       "id": -10,
       "type": "subgraph/input",
@@ -49,7 +47,7 @@
       "flags": {},
       "mode": 0
     },
-    
+
     "inputs": [
       {
         "name": "input_a",
@@ -57,7 +55,7 @@
         "pos": [0, 0]
       },
       {
-        "name": "input_b", 
+        "name": "input_b",
         "type": "number",
         "pos": [0, 1]
       }
@@ -84,9 +82,7 @@
           { "name": "a", "type": "number", "link": null },
           { "name": "b", "type": "number", "link": null }
         ],
-        "outputs": [
-          { "name": "result", "type": "number", "links": [1] }
-        ],
+        "outputs": [{ "name": "result", "type": "number", "links": [1] }],
         "properties": {},
         "flags": {},
         "mode": 0
@@ -100,9 +96,7 @@
           { "name": "a", "type": "number", "link": 1 },
           { "name": "b", "type": "number", "link": null }
         ],
-        "outputs": [
-          { "name": "result", "type": "number", "links": [2] }
-        ],
+        "outputs": [{ "name": "result", "type": "number", "links": [2] }],
         "properties": {},
         "flags": {},
         "mode": 0
@@ -116,9 +110,7 @@
           { "name": "a", "type": "number", "link": null },
           { "name": "b", "type": "number", "link": null }
         ],
-        "outputs": [
-          { "name": "result", "type": "boolean", "links": [] }
-        ],
+        "outputs": [{ "name": "result", "type": "boolean", "links": [] }],
         "properties": { "operation": "greater_than" },
         "flags": {},
         "mode": 0
@@ -132,9 +124,7 @@
           { "name": "a", "type": "string", "link": null },
           { "name": "b", "type": "string", "link": null }
         ],
-        "outputs": [
-          { "name": "result", "type": "string", "links": [] }
-        ],
+        "outputs": [{ "name": "result", "type": "string", "links": [] }],
         "properties": {},
         "flags": {},
         "mode": 0
@@ -161,10 +151,10 @@
     "groups": [],
     "config": {},
     "definitions": { "subgraphs": [] },
-    
+
     "id": "complex-subgraph-uuid",
     "name": "Complex Processing Subgraph",
-    
+
     "inputNode": {
       "id": -10,
       "type": "subgraph/input",
@@ -187,7 +177,7 @@
       "flags": {},
       "mode": 0
     },
-    
+
     "inputs": [
       {
         "name": "number1",
@@ -236,7 +226,7 @@
     "links": {},
     "groups": [],
     "config": {},
-    "definitions": { 
+    "definitions": {
       "subgraphs": [
         {
           "version": 1,
@@ -247,9 +237,7 @@
               "pos": [200, 100],
               "size": [100, 40],
               "inputs": [],
-              "outputs": [
-                { "name": "value", "type": "number", "links": [] }
-              ],
+              "outputs": [{ "name": "value", "type": "number", "links": [] }],
               "properties": { "value": 42 },
               "flags": {},
               "mode": 0
@@ -259,10 +247,10 @@
           "groups": [],
           "config": {},
           "definitions": { "subgraphs": [] },
-          
+
           "id": "nested-level2-uuid",
           "name": "Level 2 Subgraph",
-          
+
           "inputNode": {
             "id": -10,
             "type": "subgraph/input",
@@ -285,7 +273,7 @@
             "flags": {},
             "mode": 0
           },
-          
+
           "inputs": [],
           "outputs": [
             {
@@ -298,10 +286,10 @@
         }
       ]
     },
-    
+
     "id": "nested-level1-uuid",
     "name": "Level 1 Subgraph",
-    
+
     "inputNode": {
       "id": -10,
       "type": "subgraph/input",
@@ -324,7 +312,7 @@
       "flags": {},
       "mode": 0
     },
-    
+
     "inputs": [
       {
         "name": "external_input",
@@ -349,10 +337,10 @@
     "groups": [],
     "config": {},
     "definitions": { "subgraphs": [] },
-    
+
     "id": "empty-subgraph-uuid",
     "name": "Empty Subgraph",
-    
+
     "inputNode": {
       "id": -10,
       "type": "subgraph/input",
@@ -375,7 +363,7 @@
       "flags": {},
       "mode": 0
     },
-    
+
     "inputs": [],
     "outputs": [],
     "widgets": []
@@ -388,10 +376,10 @@
     "groups": [],
     "config": {},
     "definitions": { "subgraphs": [] },
-    
+
     "id": "max-io-subgraph-uuid",
     "name": "Max I/O Subgraph",
-    
+
     "inputNode": {
       "id": -10,
       "type": "subgraph/input",
@@ -414,7 +402,7 @@
       "flags": {},
       "mode": 0
     },
-    
+
     "inputs": [
       { "name": "input_0", "type": "number", "pos": [0, 0] },
       { "name": "input_1", "type": "string", "pos": [0, 1] },
@@ -441,4 +429,4 @@
     ],
     "widgets": []
   }
-}
\ No newline at end of file
+}
diff --git a/tests-ui/tests/litegraph/subgraph/subgraphUtils.test.ts b/src/lib/litegraph/src/subgraph/subgraphUtils.test.ts
similarity index 94%
rename from tests-ui/tests/litegraph/subgraph/subgraphUtils.test.ts
rename to src/lib/litegraph/src/subgraph/subgraphUtils.test.ts
index c1cea490f0..60b1ae0797 100644
--- a/tests-ui/tests/litegraph/subgraph/subgraphUtils.test.ts
+++ b/src/lib/litegraph/src/subgraph/subgraphUtils.test.ts
@@ -1,8 +1,8 @@
 // TODO: Fix these tests after migration
 import { describe, expect, it } from 'vitest'
 
-import { LGraph } from '@/lib/litegraph/src/litegraph'
 import {
+  LGraph,
   findUsedSubgraphIds,
   getDirectSubgraphIds
 } from '@/lib/litegraph/src/litegraph'
@@ -11,7 +11,7 @@ import type { UUID } from '@/lib/litegraph/src/litegraph'
 import {
   createTestSubgraph,
   createTestSubgraphNode
-} from './fixtures/subgraphHelpers'
+} from './__fixtures__/subgraphHelpers'
 
 describe.skip('subgraphUtils', () => {
   describe.skip('getDirectSubgraphIds', () => {
@@ -68,7 +68,7 @@ describe.skip('subgraphUtils', () => {
   describe.skip('findUsedSubgraphIds', () => {
     it('should handle graph with no subgraphs', () => {
       const graph = new LGraph()
-      const registry = new Map<UUID, any>()
+      const registry = new Map<UUID, LGraph>()
 
       const result = findUsedSubgraphIds(graph, registry)
       expect(result.size).toBe(0)
@@ -87,7 +87,7 @@ describe.skip('subgraphUtils', () => {
       const node2 = createTestSubgraphNode(subgraph2)
       subgraph1.add(node2)
 
-      const registry = new Map<UUID, any>([
+      const registry = new Map<UUID, LGraph>([
         [subgraph1.id, subgraph1],
         [subgraph2.id, subgraph2]
       ])
@@ -115,7 +115,7 @@ describe.skip('subgraphUtils', () => {
       const node3 = createTestSubgraphNode(subgraph1, { id: 3 })
       subgraph2.add(node3)
 
-      const registry = new Map<UUID, any>([
+      const registry = new Map<UUID, LGraph>([
         [subgraph1.id, subgraph1],
         [subgraph2.id, subgraph2]
       ])
@@ -139,7 +139,7 @@ describe.skip('subgraphUtils', () => {
       rootGraph.add(node2)
 
       // Only register subgraph1
-      const registry = new Map<UUID, any>([[subgraph1.id, subgraph1]])
+      const registry = new Map<UUID, LGraph>([[subgraph1.id, subgraph1]])
 
       const result = findUsedSubgraphIds(rootGraph, registry)
       expect(result.size).toBe(2)
diff --git a/src/lib/litegraph/src/subgraph/subgraphUtils.ts b/src/lib/litegraph/src/subgraph/subgraphUtils.ts
index 38f74efaad..518869503d 100644
--- a/src/lib/litegraph/src/subgraph/subgraphUtils.ts
+++ b/src/lib/litegraph/src/subgraph/subgraphUtils.ts
@@ -4,6 +4,7 @@ import { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
 import { LLink } from '@/lib/litegraph/src/LLink'
 import type { ResolvedConnection } from '@/lib/litegraph/src/LLink'
 import { Reroute } from '@/lib/litegraph/src/Reroute'
+import type { RerouteId } from '@/lib/litegraph/src/Reroute'
 import {
   SUBGRAPH_INPUT_ID,
   SUBGRAPH_OUTPUT_ID
@@ -259,10 +260,29 @@ export function groupResolvedByOutput(
 
   return groupedByOutput
 }
+function mapReroutes(
+  link: SerialisableLLink,
+  reroutes: Map<RerouteId, Reroute>
+) {
+  let child: SerialisableLLink | Reroute = link
+  let nextReroute =
+    child.parentId === undefined ? undefined : reroutes.get(child.parentId)
+
+  while (child.parentId !== undefined && nextReroute) {
+    child = nextReroute
+    nextReroute =
+      child.parentId === undefined ? undefined : reroutes.get(child.parentId)
+  }
+
+  const lastId = child.parentId
+  child.parentId = undefined
+  return lastId
+}
 
 export function mapSubgraphInputsAndLinks(
   resolvedInputLinks: ResolvedConnection[],
-  links: SerialisableLLink[]
+  links: SerialisableLLink[],
+  reroutes: Map<RerouteId, Reroute>
 ): SubgraphIO[] {
   // Group matching links
   const groupedByOutput = groupResolvedByOutput(resolvedInputLinks)
@@ -279,8 +299,10 @@ export function mapSubgraphInputsAndLinks(
       if (!input) continue
 
       const linkData = link.asSerialisable()
+      link.parentId = mapReroutes(link, reroutes)
       linkData.origin_id = SUBGRAPH_INPUT_ID
       linkData.origin_slot = inputs.length
+
       links.push(linkData)
       inputLinks.push(linkData)
     }
@@ -340,7 +362,8 @@ export function mapSubgraphInputsAndLinks(
  */
 export function mapSubgraphOutputsAndLinks(
   resolvedOutputLinks: ResolvedConnection[],
-  links: SerialisableLLink[]
+  links: SerialisableLLink[],
+  reroutes: Map<RerouteId, Reroute>
 ): SubgraphIO[] {
   // Group matching links
   const groupedByOutput = groupResolvedByOutput(resolvedOutputLinks)
@@ -355,10 +378,11 @@ export function mapSubgraphOutputsAndLinks(
       const { link, output } = resolved
       if (!output) continue
 
-      // Link
       const linkData = link.asSerialisable()
+      linkData.parentId = mapReroutes(link, reroutes)
       linkData.target_id = SUBGRAPH_OUTPUT_ID
       linkData.target_slot = outputs.length
+
       links.push(linkData)
       outputLinks.push(linkData)
     }
diff --git a/src/lib/litegraph/src/subgraph/svgBitmapCache.test.ts b/src/lib/litegraph/src/subgraph/svgBitmapCache.test.ts
new file mode 100644
index 0000000000..15a28f5aa7
--- /dev/null
+++ b/src/lib/litegraph/src/subgraph/svgBitmapCache.test.ts
@@ -0,0 +1,93 @@
+import { describe, expect, it, vi } from 'vitest'
+
+import { createBitmapCache } from './svgBitmapCache'
+
+function mockSvg(
+  overrides: Partial<{ complete: boolean; naturalWidth: number }> = {}
+) {
+  const img = new Image()
+  Object.defineProperty(img, 'complete', {
+    value: overrides.complete ?? true
+  })
+  Object.defineProperty(img, 'naturalWidth', {
+    value: overrides.naturalWidth ?? 16
+  })
+  return img
+}
+
+describe('createBitmapCache', () => {
+  const BITMAP_SIZE = 16
+  function mockGetContext(returnValue: CanvasRenderingContext2D | null) {
+    return vi
+      .spyOn(HTMLCanvasElement.prototype, 'getContext')
+      .mockImplementation(
+        (() => returnValue) as typeof HTMLCanvasElement.prototype.getContext
+      )
+  }
+
+  const stubContext = {
+    drawImage: vi.fn()
+  } as unknown as CanvasRenderingContext2D
+
+  it('returns the SVG when image is not yet complete', () => {
+    const svg = mockSvg({ complete: false, naturalWidth: 0 })
+    const cache = createBitmapCache(svg, BITMAP_SIZE)
+
+    expect(cache.get()).toBe(svg)
+  })
+
+  it('returns the SVG when naturalWidth is 0', () => {
+    const svg = mockSvg({ complete: true, naturalWidth: 0 })
+    const cache = createBitmapCache(svg, BITMAP_SIZE)
+
+    expect(cache.get()).toBe(svg)
+  })
+
+  it('creates a bitmap canvas once the SVG is loaded', () => {
+    const svg = mockSvg()
+    const cache = createBitmapCache(svg, BITMAP_SIZE)
+    mockGetContext(stubContext)
+
+    const result = cache.get()
+
+    expect(result).toBeInstanceOf(HTMLCanvasElement)
+    expect((result as HTMLCanvasElement).width).toBe(BITMAP_SIZE)
+    expect((result as HTMLCanvasElement).height).toBe(BITMAP_SIZE)
+    vi.restoreAllMocks()
+  })
+
+  it('returns the cached bitmap on subsequent calls', () => {
+    const svg = mockSvg()
+    const cache = createBitmapCache(svg, BITMAP_SIZE)
+    mockGetContext(stubContext)
+
+    const first = cache.get()
+    const second = cache.get()
+
+    expect(first).toBe(second)
+    vi.restoreAllMocks()
+  })
+
+  it('does not re-create the canvas on subsequent calls', () => {
+    const svg = mockSvg()
+    const cache = createBitmapCache(svg, BITMAP_SIZE)
+    mockGetContext(stubContext)
+    const createElementSpy = vi.spyOn(document, 'createElement')
+
+    cache.get()
+    const callCount = createElementSpy.mock.calls.length
+    cache.get()
+
+    expect(createElementSpy).toHaveBeenCalledTimes(callCount)
+    vi.restoreAllMocks()
+  })
+
+  it('falls back to SVG when canvas context is unavailable', () => {
+    const svg = mockSvg()
+    const cache = createBitmapCache(svg, BITMAP_SIZE)
+    mockGetContext(null)
+
+    expect(cache.get()).toBe(svg)
+    vi.restoreAllMocks()
+  })
+})
diff --git a/src/lib/litegraph/src/subgraph/svgBitmapCache.ts b/src/lib/litegraph/src/subgraph/svgBitmapCache.ts
new file mode 100644
index 0000000000..69d4eb070c
--- /dev/null
+++ b/src/lib/litegraph/src/subgraph/svgBitmapCache.ts
@@ -0,0 +1,24 @@
+export function createBitmapCache(svg: HTMLImageElement, bitmapSize: number) {
+  let bitmap: HTMLCanvasElement | null = null
+
+  return {
+    get(): HTMLCanvasElement | HTMLImageElement {
+      if (bitmap) return bitmap
+      if (!svg.complete || svg.naturalWidth === 0) return svg
+
+      const canvas = document.createElement('canvas')
+      canvas.width = bitmapSize
+      canvas.height = bitmapSize
+      const ctx = canvas.getContext('2d')
+      if (!ctx) return svg
+
+      try {
+        ctx.drawImage(svg, 0, 0, bitmapSize, bitmapSize)
+      } catch {
+        return svg
+      }
+      bitmap = canvas
+      return bitmap
+    }
+  }
+}
diff --git a/src/lib/litegraph/src/types/serialisation.ts b/src/lib/litegraph/src/types/serialisation.ts
index 8a31e56528..ad7b76b84f 100644
--- a/src/lib/litegraph/src/types/serialisation.ts
+++ b/src/lib/litegraph/src/types/serialisation.ts
@@ -111,6 +111,8 @@ export interface ExportedSubgraphInstance extends NodeSubgraphSharedProps {
    * @see {@link ExportedSubgraph.subgraphs}
    */
   type: UUID
+  /** Custom properties for this subgraph instance */
+  properties?: Dictionary<NodeProperty | undefined>
 }
 
 /**
@@ -135,6 +137,10 @@ export interface ISerialisedGraph extends BaseExportedGraph {
 export interface ExportedSubgraph extends SerialisableGraph {
   /** The display name of the subgraph. */
   name: string
+  /** Optional category for organizing subgraph blueprints in the node library. */
+  category?: string
+  /** Optional description shown as tooltip when hovering over the subgraph node. */
+  description?: string
   inputNode: ExportedSubgraphIONode
   outputNode: ExportedSubgraphIONode
   /** Ordered list of inputs to the subgraph itself. Similar to a reroute, with the input side in the graph, and the output side in the subgraph. */
diff --git a/src/lib/litegraph/src/types/widgets.ts b/src/lib/litegraph/src/types/widgets.ts
index 1cfb323d8f..30172b2df9 100644
--- a/src/lib/litegraph/src/types/widgets.ts
+++ b/src/lib/litegraph/src/types/widgets.ts
@@ -1,8 +1,26 @@
-import type { CanvasColour, Point, RequiredProps, Size } from '../interfaces'
-import type { CanvasPointer, LGraphCanvas, LGraphNode } from '../litegraph'
+import type { Bounds } from '@/renderer/core/layout/types'
+import type { CurvePoint } from '@/components/curve/types'
+
+import type {
+  CanvasColour,
+  ColorStop,
+  Point,
+  RequiredProps,
+  Size
+} from '../interfaces'
+import type {
+  CanvasPointer,
+  LGraphCanvas,
+  LGraphNode,
+  NodeId
+} from '../litegraph'
 import type { CanvasPointerEvent } from './events'
 
-export interface IWidgetOptions<TValues = unknown[]> {
+export interface NodeBindable {
+  setNodeId(nodeId: NodeId): void
+}
+
+export interface IWidgetOptions<TValues = unknown> {
   on?: string
   off?: string
   max?: number
@@ -27,12 +45,35 @@ export interface IWidgetOptions<TValues = unknown[]> {
   socketless?: boolean
   /** If `true`, the widget will not be rendered by the Vue renderer. */
   canvasOnly?: boolean
+  /** Used as a temporary override for determining the asset type in vue mode*/
+  nodeType?: string
+
+  /**
+   * Whether the widget value should be included in the API prompt sent to
+   * the backend for execution. Checked by {@link executionUtil} when
+   * building the prompt payload.
+   *
+   * This is distinct from {@link IBaseWidget.serialize}, which controls
+   * whether the value is persisted in the workflow JSON file.
+   *
+   * @default true
+   * @see IBaseWidget.serialize — workflow persistence
+   */
+  serialize?: boolean
 
   values?: TValues
   /** Optional function to format values for display (e.g., hash → human-readable name) */
   getOptionLabel?: (value?: string | null) => string
   callback?: IWidget['callback']
   iconClass?: string
+
+  // Vue widget options
+  disabled?: boolean
+  useGrouping?: boolean
+  placeholder?: string
+  showThumbnails?: boolean
+  showItemNavigators?: boolean
+  hidden?: boolean
 }
 
 interface IWidgetSliderOptions extends IWidgetOptions<number[]> {
@@ -43,6 +84,13 @@ interface IWidgetSliderOptions extends IWidgetOptions<number[]> {
   marker_color?: CanvasColour
 }
 
+export interface IWidgetGradientSliderOptions extends IWidgetOptions<number[]> {
+  min: number
+  max: number
+  step2: number
+  gradient_stops?: ColorStop[]
+}
+
 interface IWidgetKnobOptions extends IWidgetOptions<number[]> {
   min: number
   max: number
@@ -52,6 +100,10 @@ interface IWidgetKnobOptions extends IWidgetOptions<number[]> {
   gradient_stops?: string
 }
 
+export interface IWidgetAssetOptions extends IWidgetOptions {
+  openModal: (widget: IBaseWidget) => void
+}
+
 /**
  * A widget for a node.
  * All types are based on IBaseWidget - additions can be made there or directly on individual types.
@@ -68,6 +120,7 @@ export type IWidget =
   | IStringComboWidget
   | ICustomWidget
   | ISliderWidget
+  | IGradientSliderWidget
   | IButtonWidget
   | IKnobWidget
   | IFileUploadWidget
@@ -82,6 +135,10 @@ export type IWidget =
   | ISelectButtonWidget
   | ITextareaWidget
   | IAssetWidget
+  | IImageCropWidget
+  | IBoundingBoxWidget
+  | ICurveWidget
+  | IPainterWidget
 
 export interface IBooleanWidget extends IBaseWidget<boolean, 'toggle'> {
   type: 'toggle'
@@ -104,6 +161,15 @@ export interface ISliderWidget extends IBaseWidget<
   marker?: number
 }
 
+export interface IGradientSliderWidget extends IBaseWidget<
+  number,
+  'gradientslider',
+  IWidgetGradientSliderOptions
+> {
+  type: 'gradientslider'
+  value: number
+}
+
 export interface IKnobWidget extends IBaseWidget<
   number,
   'knob',
@@ -247,12 +313,34 @@ export interface ITextareaWidget extends IBaseWidget<string, 'textarea'> {
 export interface IAssetWidget extends IBaseWidget<
   string,
   'asset',
-  IWidgetOptions<string[]>
+  IWidgetAssetOptions
 > {
   type: 'asset'
   value: string
 }
 
+/** Image crop widget for cropping image */
+export interface IImageCropWidget extends IBaseWidget<Bounds, 'imagecrop'> {
+  type: 'imagecrop'
+  value: Bounds
+}
+
+/** Bounding box widget for defining regions with numeric inputs */
+export interface IBoundingBoxWidget extends IBaseWidget<Bounds, 'boundingbox'> {
+  type: 'boundingbox'
+  value: Bounds
+}
+
+export interface ICurveWidget extends IBaseWidget<CurvePoint[], 'curve'> {
+  type: 'curve'
+  value: CurvePoint[]
+}
+
+export interface IPainterWidget extends IBaseWidget<string, 'painter'> {
+  type: 'painter'
+  value: string
+}
+
 /**
  * Valid widget types.  TS cannot provide easily extensible type safety for this at present.
  * Override linkedWidgets[]
@@ -271,7 +359,7 @@ export type TWidgetValue = IWidget['value']
 export interface IBaseWidget<
   TValue = boolean | number | string | object | undefined,
   TType extends string = string,
-  TOptions extends IWidgetOptions<unknown> = IWidgetOptions<unknown>
+  TOptions extends IWidgetOptions = IWidgetOptions
 > {
   [symbol: symbol]: boolean
 
@@ -284,11 +372,17 @@ export interface IBaseWidget<
   /** Widget type (see {@link TWidgetType}) */
   type: TType
   value?: TValue
-  vueTrack?: () => void
 
   /**
-   * Whether the widget value should be serialized on node serialization.
+   * Whether the widget value is persisted in the workflow JSON
+   * (`widgets_values`). Checked by {@link LGraphNode.serialize} and
+   * {@link LGraphNode.configure}.
+   *
+   * This is distinct from {@link IWidgetOptions.serialize}, which controls
+   * whether the value is included in the API prompt sent for execution.
+   *
    * @default true
+   * @see IWidgetOptions.serialize — API prompt inclusion
    */
   serialize?: boolean
 
@@ -329,19 +423,11 @@ export interface IBaseWidget<
 
   hidden?: boolean
   advanced?: boolean
-  /**
-   * This property is automatically computed on graph change
-   * and should not be changed.
-   * Promoted widgets have a colored border
-   * @see /core/graph/subgraph/proxyWidget.registerProxyWidgets
-   */
-  promoted?: boolean
-
   tooltip?: string
 
   // TODO: Confirm this format
   callback?(
-    value: any,
+    value: unknown,
     canvas?: LGraphCanvas,
     node?: LGraphNode,
     pos?: Point,
diff --git a/src/lib/litegraph/src/utils/arrange.ts b/src/lib/litegraph/src/utils/arrange.ts
index 9a7e7ab8c5..7408fa3a68 100644
--- a/src/lib/litegraph/src/utils/arrange.ts
+++ b/src/lib/litegraph/src/utils/arrange.ts
@@ -138,8 +138,7 @@ export function alignNodes(
   })
 
   for (const { node, newPos } of nodePositions) {
-    node.pos[0] = newPos.x
-    node.pos[1] = newPos.y
+    node.setPos(newPos.x, newPos.y)
   }
   return nodePositions
 }
diff --git a/src/lib/litegraph/src/utils/mathParser.test.ts b/src/lib/litegraph/src/utils/mathParser.test.ts
new file mode 100644
index 0000000000..377c71d85c
--- /dev/null
+++ b/src/lib/litegraph/src/utils/mathParser.test.ts
@@ -0,0 +1,121 @@
+import { describe, expect, test } from 'vitest'
+
+import { evaluateMathExpression } from '@/lib/litegraph/src/utils/mathParser'
+
+describe('evaluateMathExpression', () => {
+  test.each([
+    ['2+3', 5],
+    ['10-4', 6],
+    ['3*7', 21],
+    ['15/3', 5]
+  ])('basic arithmetic: %s = %d', (input, expected) => {
+    expect(evaluateMathExpression(input)).toBe(expected)
+  })
+
+  test.each([
+    ['2+3*4', 14],
+    ['(2+3)*4', 20],
+    ['10-2*3', 4],
+    ['10/2+3', 8]
+  ])('operator precedence: %s = %d', (input, expected) => {
+    expect(evaluateMathExpression(input)).toBe(expected)
+  })
+
+  test.each([
+    ['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) => {
+    expect(evaluateMathExpression(input)).toBe(expected)
+  })
+
+  test.each([
+    [' 2 + 3 ', 5],
+    ['  10  -  4  ', 6],
+    [' ( 2 + 3 ) * 4 ', 20]
+  ])('whitespace handling: "%s" = %d', (input, expected) => {
+    expect(evaluateMathExpression(input)).toBe(expected)
+  })
+
+  test.each([
+    ['((2+3))', 5],
+    ['(1+(2*(3+4)))', 15],
+    ['((1+2)*(3+4))', 21]
+  ])('nested parentheses: %s = %d', (input, expected) => {
+    expect(evaluateMathExpression(input)).toBe(expected)
+  })
+
+  test.each([
+    ['-5', -5],
+    ['-(3+2)', -5],
+    ['--5', 5],
+    ['+5', 5],
+    ['-3*2', -6],
+    ['2*-3', -6],
+    ['1+-2', -1],
+    ['2--3', 5],
+    ['-2*-3', 6],
+    ['-(2+3)*-(4+5)', 45]
+  ])('unary operators: %s = %d', (input, expected) => {
+    expect(evaluateMathExpression(input)).toBe(expected)
+  })
+
+  test.each([
+    ['2 /2+3 * 4.75- -6', 21.25],
+    ['2 / (2 + 3) * 4.33 - -6', 7.732],
+    ['12* 123/-(-5 + 2)', 492],
+    ['((80 - (19)))', 61],
+    ['(1 - 2) + -(-(-(-4)))', 3],
+    ['1 - -(-(-(-4)))', -3],
+    ['12* 123/(-5 + 2)', -492],
+    ['12 * -123', -1476],
+    ['((2.33 / (2.9+3.5)*4) - -6)', 7.45625],
+    ['123.45*(678.90 / (-2.5+ 11.5)-(80 -19) *33.25) / 20 + 11', -12042.760875],
+    [
+      '(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) => {
+    expect(evaluateMathExpression(input)).toBeCloseTo(expected as number)
+  })
+
+  test.each(['', 'abc', '2+', '(2+3', '2+3)', '()', '*3', '2 3', '.', '123..'])(
+    'invalid input returns undefined: "%s"',
+    (input) => {
+      expect(evaluateMathExpression(input)).toBeUndefined()
+    }
+  )
+
+  test('division by zero returns Infinity', () => {
+    expect(evaluateMathExpression('1/0')).toBe(Infinity)
+  })
+
+  test('0/0 returns NaN', () => {
+    expect(evaluateMathExpression('0/0')).toBeNaN()
+  })
+
+  test.each([
+    ['10%3', 1],
+    ['10%3+1', 2],
+    ['7%2', 1]
+  ])('modulo: %s = %d', (input, expected) => {
+    expect(evaluateMathExpression(input)).toBe(expected)
+  })
+
+  test('negative zero is normalized to positive zero', () => {
+    expect(Object.is(evaluateMathExpression('-0'), 0)).toBe(true)
+  })
+
+  test('deeply nested parentheses exceeding depth limit returns undefined', () => {
+    const input = '('.repeat(201) + '1' + ')'.repeat(201)
+    expect(evaluateMathExpression(input)).toBeUndefined()
+  })
+
+  test('parentheses within depth limit evaluate correctly', () => {
+    const input = '('.repeat(200) + '1' + ')'.repeat(200)
+    expect(evaluateMathExpression(input)).toBe(1)
+  })
+})
diff --git a/src/lib/litegraph/src/utils/mathParser.ts b/src/lib/litegraph/src/utils/mathParser.ts
new file mode 100644
index 0000000000..0e88702959
--- /dev/null
+++ b/src/lib/litegraph/src/utils/mathParser.ts
@@ -0,0 +1,116 @@
+type Token = { type: 'number'; value: number } | { type: 'op'; value: string }
+
+function tokenize(input: string): Token[] | undefined {
+  const tokens: Token[] = []
+  const re = /(\d+(?:\.\d*)?|\.\d+)|([+\-*/%()])/g
+  let lastIndex = 0
+
+  for (const match of input.matchAll(re)) {
+    const gap = input.slice(lastIndex, match.index)
+    if (gap.trim()) return undefined
+    lastIndex = match.index + match[0].length
+
+    if (match[1]) tokens.push({ type: 'number', value: parseFloat(match[1]) })
+    else tokens.push({ type: 'op', value: match[2] })
+  }
+
+  if (input.slice(lastIndex).trim()) return undefined
+  return tokens
+}
+
+/**
+ * Evaluates a basic arithmetic expression string containing
+ * `+`, `-`, `*`, `/`, `%`, parentheses, and decimal numbers.
+ * Returns `undefined` for empty or malformed input.
+ */
+export function evaluateMathExpression(input: string): number | undefined {
+  const tokenized = tokenize(input)
+  if (!tokenized || tokenized.length === 0) return undefined
+
+  const tokens: Token[] = tokenized
+  let pos = 0
+  let depth = 0
+  const MAX_DEPTH = 200
+
+  function peek(): Token | undefined {
+    return tokens[pos]
+  }
+
+  function consume(): Token {
+    return tokens[pos++]
+  }
+
+  function primary(): number | undefined {
+    const t = peek()
+    if (!t) return undefined
+
+    if (t.type === 'number') {
+      consume()
+      return t.value
+    }
+
+    if (t.type === 'op' && t.value === '(') {
+      if (++depth > MAX_DEPTH) return undefined
+      consume()
+      const result = expr()
+      if (result === undefined) return undefined
+      const closing = peek()
+      if (!closing || closing.type !== 'op' || closing.value !== ')') {
+        return undefined
+      }
+      consume()
+      depth--
+      return result
+    }
+
+    return undefined
+  }
+
+  function unary(): number | undefined {
+    const t = peek()
+    if (t?.type === 'op' && (t.value === '+' || t.value === '-')) {
+      consume()
+      const operand = unary()
+      if (operand === undefined) return undefined
+      return t.value === '-' ? -operand : operand
+    }
+    return primary()
+  }
+
+  function factor(): number | undefined {
+    let left = unary()
+    if (left === undefined) return undefined
+
+    while (
+      peek()?.type === 'op' &&
+      (peek()!.value === '*' || peek()!.value === '/' || peek()!.value === '%')
+    ) {
+      const op = consume().value
+      const right = unary()
+      if (right === undefined) return undefined
+      left =
+        op === '*' ? left * right : op === '/' ? left / right : left % right
+    }
+    return left
+  }
+
+  function expr(): number | undefined {
+    let left = factor()
+    if (left === undefined) return undefined
+
+    while (
+      peek()?.type === 'op' &&
+      (peek()!.value === '+' || peek()!.value === '-')
+    ) {
+      const op = consume().value
+      const right = factor()
+      if (right === undefined) return undefined
+      left = op === '+' ? left + right : left - right
+    }
+    return left
+  }
+
+  const result = expr()
+  if (result === undefined || pos !== tokens.length) return undefined
+  return result === 0 ? 0 : result
+}
diff --git a/tests-ui/tests/litegraph/utils/spaceDistribution.test.ts b/src/lib/litegraph/src/utils/spaceDistribution.test.ts
similarity index 90%
rename from tests-ui/tests/litegraph/utils/spaceDistribution.test.ts
rename to src/lib/litegraph/src/utils/spaceDistribution.test.ts
index 4d029762ff..254c13da67 100644
--- a/tests-ui/tests/litegraph/utils/spaceDistribution.test.ts
+++ b/src/lib/litegraph/src/utils/spaceDistribution.test.ts
@@ -1,9 +1,7 @@
 import { describe, expect, it } from 'vitest'
 
-import {
-  type SpaceRequest,
-  distributeSpace
-} from '@/lib/litegraph/src/litegraph'
+import { distributeSpace } from '@/lib/litegraph/src/litegraph'
+import type { SpaceRequest } from '@/lib/litegraph/src/litegraph'
 
 describe('distributeSpace', () => {
   it('should distribute space according to minimum sizes when space is limited', () => {
diff --git a/src/lib/litegraph/src/utils/subgraphDeduplication.ts b/src/lib/litegraph/src/utils/subgraphDeduplication.ts
new file mode 100644
index 0000000000..fef48112f8
--- /dev/null
+++ b/src/lib/litegraph/src/utils/subgraphDeduplication.ts
@@ -0,0 +1,164 @@
+import type { LGraphState } from '../LGraph'
+import type { NodeId } from '../LGraphNode'
+import type {
+  ExportedSubgraph,
+  ExposedWidget,
+  ISerialisedNode,
+  SerialisableLLink
+} from '../types/serialisation'
+
+const MAX_NODE_ID = 100_000_000
+
+interface DeduplicationResult {
+  subgraphs: ExportedSubgraph[]
+  rootNodes: ISerialisedNode[] | undefined
+}
+
+/**
+ * Pre-deduplicates node IDs across serialized subgraph definitions before
+ * they are configured. This prevents widget store key collisions when
+ * multiple subgraph copies contain nodes with the same IDs.
+ *
+ * Also patches proxyWidgets in root-level nodes that reference the
+ * remapped inner node IDs.
+ *
+ * Returns deep clones of the inputs — the originals are never mutated.
+ *
+ * @param subgraphs - Serialized subgraph definitions to deduplicate
+ * @param reservedNodeIds - Node IDs already in use by root-level nodes
+ * @param state - Graph state containing the `lastNodeId` counter (mutated)
+ * @param rootNodes - Optional root-level nodes with proxyWidgets to patch
+ */
+export function deduplicateSubgraphNodeIds(
+  subgraphs: ExportedSubgraph[],
+  reservedNodeIds: Set<number>,
+  state: LGraphState,
+  rootNodes?: ISerialisedNode[]
+): DeduplicationResult {
+  const clonedSubgraphs = structuredClone(subgraphs)
+  const clonedRootNodes = rootNodes ? structuredClone(rootNodes) : undefined
+
+  const usedNodeIds = new Set(reservedNodeIds)
+  const subgraphIdSet = new Set(clonedSubgraphs.map((sg) => sg.id))
+  const remapBySubgraph = new Map<string, Map<NodeId, NodeId>>()
+
+  for (const subgraph of clonedSubgraphs) {
+    const remappedIds = remapNodeIds(subgraph.nodes ?? [], usedNodeIds, state)
+
+    if (remappedIds.size === 0) continue
+    remapBySubgraph.set(subgraph.id, remappedIds)
+
+    patchSerialisedLinks(subgraph.links ?? [], remappedIds)
+    patchPromotedWidgets(subgraph.widgets ?? [], remappedIds)
+  }
+
+  for (const subgraph of clonedSubgraphs) {
+    patchProxyWidgets(subgraph.nodes ?? [], subgraphIdSet, remapBySubgraph)
+  }
+
+  if (clonedRootNodes) {
+    patchProxyWidgets(clonedRootNodes, subgraphIdSet, remapBySubgraph)
+  }
+
+  return { subgraphs: clonedSubgraphs, rootNodes: clonedRootNodes }
+}
+
+/**
+ * Remaps duplicate node IDs to unique values, updating `usedNodeIds`
+ * and `state.lastNodeId` as new IDs are allocated.
+ *
+ * @returns A map of old ID → new ID for nodes that were remapped.
+ */
+function remapNodeIds(
+  nodes: ISerialisedNode[],
+  usedNodeIds: Set<number>,
+  state: LGraphState
+): Map<NodeId, NodeId> {
+  const remappedIds = new Map<NodeId, NodeId>()
+
+  for (const node of nodes) {
+    const id = node.id
+    if (typeof id !== 'number') continue
+
+    if (usedNodeIds.has(id)) {
+      const newId = findNextAvailableId(usedNodeIds, state)
+      remappedIds.set(id, newId)
+      node.id = newId
+      usedNodeIds.add(newId as number)
+      console.warn(
+        `LiteGraph: duplicate subgraph node ID ${id} remapped to ${newId}`
+      )
+    } else {
+      usedNodeIds.add(id)
+      if (id > state.lastNodeId) state.lastNodeId = id
+    }
+  }
+
+  return remappedIds
+}
+
+/**
+ * Finds the next unused node ID by incrementing `state.lastNodeId`.
+ * Throws if the ID space is exhausted.
+ */
+function findNextAvailableId(
+  usedNodeIds: Set<number>,
+  state: LGraphState
+): NodeId {
+  while (true) {
+    const nextId = state.lastNodeId + 1
+    if (nextId > MAX_NODE_ID) {
+      throw new Error('Node ID space exhausted')
+    }
+    state.lastNodeId = nextId
+    if (!usedNodeIds.has(nextId)) return nextId as NodeId
+  }
+}
+
+/** Patches origin_id / target_id in serialized links. */
+function patchSerialisedLinks(
+  links: SerialisableLLink[],
+  remappedIds: Map<NodeId, NodeId>
+): void {
+  for (const link of links) {
+    const newOrigin = remappedIds.get(link.origin_id)
+    if (newOrigin !== undefined) link.origin_id = newOrigin
+
+    const newTarget = remappedIds.get(link.target_id)
+    if (newTarget !== undefined) link.target_id = newTarget
+  }
+}
+
+/** Patches promoted widget node references. */
+function patchPromotedWidgets(
+  widgets: ExposedWidget[],
+  remappedIds: Map<NodeId, NodeId>
+): void {
+  for (const widget of widgets) {
+    const newId = remappedIds.get(widget.id)
+    if (newId !== undefined) widget.id = newId
+  }
+}
+
+/** Patches proxyWidgets in root-level SubgraphNode instances. */
+function patchProxyWidgets(
+  rootNodes: ISerialisedNode[],
+  subgraphIdSet: Set<string>,
+  remapBySubgraph: Map<string, Map<NodeId, NodeId>>
+): void {
+  for (const node of rootNodes) {
+    if (!subgraphIdSet.has(node.type)) continue
+    const remappedIds = remapBySubgraph.get(node.type)
+    if (!remappedIds) continue
+
+    const proxyWidgets = node.properties?.proxyWidgets
+    if (!Array.isArray(proxyWidgets)) continue
+
+    for (const entry of proxyWidgets) {
+      if (!Array.isArray(entry)) continue
+      const oldId = Number(entry[0]) as NodeId
+      const newId = remappedIds.get(oldId)
+      if (newId !== undefined) entry[0] = String(newId)
+    }
+  }
+}
diff --git a/tests-ui/tests/litegraph/utils/textUtils.test.ts b/src/lib/litegraph/src/utils/textUtils.test.ts
similarity index 90%
rename from tests-ui/tests/litegraph/utils/textUtils.test.ts
rename to src/lib/litegraph/src/utils/textUtils.test.ts
index 8ca101f610..4d2bbbca0b 100644
--- a/tests-ui/tests/litegraph/utils/textUtils.test.ts
+++ b/src/lib/litegraph/src/utils/textUtils.test.ts
@@ -1,3 +1,4 @@
+import type { Mock } from 'vitest'
 import { describe, expect, it, vi } from 'vitest'
 
 import { truncateText } from '@/lib/litegraph/src/litegraph'
@@ -5,8 +6,13 @@ import { truncateText } from '@/lib/litegraph/src/litegraph'
 describe('truncateText', () => {
   const createMockContext = (charWidth: number = 10) => {
     return {
-      measureText: vi.fn((text: string) => ({ width: text.length * charWidth }))
-    } as unknown as CanvasRenderingContext2D
+      measureText: vi.fn(
+        (text: string) =>
+          ({
+            width: text.length * charWidth
+          }) as TextMetrics
+      )
+    } as Partial<CanvasRenderingContext2D> as CanvasRenderingContext2D
   }
 
   it('should return original text if it fits within maxWidth', () => {
@@ -57,7 +63,7 @@ describe('truncateText', () => {
     // Verify binary search efficiency - should not measure every possible substring
     // Binary search for 100 chars should take around log2(100) ≈ 7 iterations
     // Plus a few extra calls for measuring the full text and ellipsis
-    const callCount = (ctx.measureText as any).mock.calls.length
+    const callCount = (ctx.measureText as Mock).mock.calls.length
     expect(callCount).toBeLessThan(20)
     expect(callCount).toBeGreaterThan(5)
   })
diff --git a/src/lib/litegraph/src/utils/type.ts b/src/lib/litegraph/src/utils/type.ts
index 84891fb7f5..cc7b99f593 100644
--- a/src/lib/litegraph/src/utils/type.ts
+++ b/src/lib/litegraph/src/utils/type.ts
@@ -1,6 +1,7 @@
 import { without } from 'es-toolkit'
 
 import type { IColorable, ISlotType } from '@/lib/litegraph/src/interfaces'
+import type { NodeBindable } from '@/lib/litegraph/src/types/widgets'
 
 /**
  * Converts a plain object to a class instance if it is not already an instance of the class.
@@ -29,6 +30,15 @@ export function isColorable(obj: unknown): obj is IColorable {
   )
 }
 
+export function isNodeBindable(widget: unknown): widget is NodeBindable {
+  return (
+    typeof widget === 'object' &&
+    widget !== null &&
+    'setNodeId' in widget &&
+    typeof widget.setNodeId === 'function'
+  )
+}
+
 export function commonType(...types: ISlotType[]): ISlotType | undefined {
   if (!isStrings(types)) return undefined
 
diff --git a/src/lib/litegraph/src/utils/widget.test.ts b/src/lib/litegraph/src/utils/widget.test.ts
new file mode 100644
index 0000000000..6eb9707dd2
--- /dev/null
+++ b/src/lib/litegraph/src/utils/widget.test.ts
@@ -0,0 +1,127 @@
+import { describe, expect, test } from 'vitest'
+
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
+import type { IWidgetOptions } from '@/lib/litegraph/src/litegraph'
+import {
+  evaluateInput,
+  getWidgetStep,
+  resolveNodeRootGraphId
+} from '@/lib/litegraph/src/litegraph'
+
+describe('getWidgetStep', () => {
+  test('should return step2 when available', () => {
+    const options: IWidgetOptions<unknown> = {
+      step2: 0.5,
+      step: 20
+    }
+
+    expect(getWidgetStep(options)).toBe(0.5)
+  })
+
+  test('should calculate from step when step2 is not available', () => {
+    const options: IWidgetOptions<unknown> = {
+      step: 20
+    }
+
+    expect(getWidgetStep(options)).toBe(2) // 20 * 0.1 = 2
+  })
+
+  test('should use default step value of 10 when neither step2 nor step is provided', () => {
+    const options: IWidgetOptions<unknown> = {}
+
+    expect(getWidgetStep(options)).toBe(1) // 10 * 0.1 = 1
+  })
+  // Zero value is not allowed for step, fallback to 1.
+  test('should handle zero values correctly', () => {
+    const optionsWithZeroStep2: IWidgetOptions<unknown> = {
+      step2: 0,
+      step: 20
+    }
+
+    expect(getWidgetStep(optionsWithZeroStep2)).toBe(2)
+
+    const optionsWithZeroStep: IWidgetOptions<unknown> = {
+      step: 0
+    }
+
+    expect(getWidgetStep(optionsWithZeroStep)).toBe(1)
+  })
+})
+
+type GraphIdNode = Pick<LGraphNode, 'graph'>
+
+describe('resolveNodeRootGraphId', () => {
+  test('returns node rootGraph id when node belongs to a graph', () => {
+    const node = {
+      graph: {
+        rootGraph: {
+          id: 'subgraph-root-id'
+        }
+      }
+    } as GraphIdNode
+
+    expect(resolveNodeRootGraphId(node)).toBe('subgraph-root-id')
+  })
+
+  test('returns fallback graph id when node graph is missing', () => {
+    const node = {
+      graph: null
+    } as GraphIdNode
+
+    expect(resolveNodeRootGraphId(node, 'app-root-id')).toBe('app-root-id')
+  })
+})
+
+describe('evaluateInput', () => {
+  test.each([
+    ['42', 42],
+    ['3.14', 3.14],
+    ['-7', -7],
+    ['0', 0]
+  ])('plain number: "%s" = %d', (input, expected) => {
+    expect(evaluateInput(input)).toBe(expected)
+  })
+
+  test.each([
+    ['2+3', 5],
+    ['(4+2)*3', 18],
+    ['3.14*2', 6.28],
+    ['10/2+3', 8]
+  ])('expression: "%s" = %d', (input, expected) => {
+    expect(evaluateInput(input)).toBe(expected)
+  })
+
+  test('empty string returns 0 (Number("") === 0)', () => {
+    expect(evaluateInput('')).toBe(0)
+  })
+
+  test.each(['abc', 'hello world'])(
+    'invalid input returns undefined: "%s"',
+    (input) => {
+      expect(evaluateInput(input)).toBeUndefined()
+    }
+  )
+
+  test('division by zero returns undefined', () => {
+    expect(evaluateInput('1/0')).toBeUndefined()
+  })
+
+  test('0/0 returns undefined (NaN is filtered)', () => {
+    expect(evaluateInput('0/0')).toBeUndefined()
+  })
+
+  test('scientific notation via Number() fallback', () => {
+    expect(evaluateInput('1e5')).toBe(100000)
+  })
+
+  test('hex notation via Number() fallback', () => {
+    expect(evaluateInput('0xff')).toBe(255)
+  })
+
+  test.each(['Infinity', '-Infinity'])(
+    '"%s" returns undefined (non-finite rejected)',
+    (input) => {
+      expect(evaluateInput(input)).toBeUndefined()
+    }
+  )
+})
diff --git a/src/lib/litegraph/src/utils/widget.ts b/src/lib/litegraph/src/utils/widget.ts
index e5d7369013..7f0051c79f 100644
--- a/src/lib/litegraph/src/utils/widget.ts
+++ b/src/lib/litegraph/src/utils/widget.ts
@@ -1,4 +1,8 @@
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
 import type { IWidgetOptions } from '@/lib/litegraph/src/types/widgets'
+import type { UUID } from '@/lib/litegraph/src/utils/uuid'
+
+import { evaluateMathExpression } from '@/lib/litegraph/src/utils/mathParser'
 
 /**
  * The step value for numeric widgets.
@@ -8,3 +12,28 @@ import type { IWidgetOptions } from '@/lib/litegraph/src/types/widgets'
 export function getWidgetStep(options: IWidgetOptions<unknown>): number {
   return options.step2 || (options.step || 10) * 0.1
 }
+
+export function evaluateInput(input: string): number | undefined {
+  const result = evaluateMathExpression(input)
+  if (result !== undefined) {
+    if (!isFinite(result)) return undefined
+    return result
+  }
+  const newValue = Number(input)
+  if (!isFinite(newValue)) return undefined
+  return newValue
+}
+
+export function resolveNodeRootGraphId(
+  node: Pick<LGraphNode, 'graph'>
+): UUID | undefined
+export function resolveNodeRootGraphId(
+  node: Pick<LGraphNode, 'graph'>,
+  fallbackGraphId: UUID
+): UUID
+export function resolveNodeRootGraphId(
+  node: Pick<LGraphNode, 'graph'>,
+  fallbackGraphId?: UUID
+): UUID | undefined {
+  return node.graph?.rootGraph.id ?? fallbackGraphId
+}
diff --git a/src/lib/litegraph/src/widgets/AssetWidget.ts b/src/lib/litegraph/src/widgets/AssetWidget.ts
index bc60a76b4e..7491d880ed 100644
--- a/src/lib/litegraph/src/widgets/AssetWidget.ts
+++ b/src/lib/litegraph/src/widgets/AssetWidget.ts
@@ -36,12 +36,13 @@ export class AssetWidget
 
   override drawWidget(
     ctx: CanvasRenderingContext2D,
-    { width, showText = true }: DrawWidgetOptions
+    options: DrawWidgetOptions
   ) {
+    const { width, showText = true } = options
     // Store original context attributes
     const { fillStyle, strokeStyle, textAlign } = ctx
 
-    this.drawWidgetShape(ctx, { width, showText })
+    this.drawWidgetShape(ctx, options)
 
     if (showText) {
       this.drawTruncatingText({ ctx, width, leftPadding: 0, rightPadding: 0 })
@@ -53,6 +54,6 @@ export class AssetWidget
 
   override onClick() {
     //Open Modal
-    this.callback?.(this.value)
+    this.options.openModal(this)
   }
 }
diff --git a/src/lib/litegraph/src/widgets/BaseWidget.test.ts b/src/lib/litegraph/src/widgets/BaseWidget.test.ts
new file mode 100644
index 0000000000..0f72dc5e26
--- /dev/null
+++ b/src/lib/litegraph/src/widgets/BaseWidget.test.ts
@@ -0,0 +1,217 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it } from 'vitest'
+
+import { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type { INumericWidget } from '@/lib/litegraph/src/types/widgets'
+import { NumberWidget } from '@/lib/litegraph/src/widgets/NumberWidget'
+import { useWidgetValueStore } from '@/stores/widgetValueStore'
+
+function createTestWidget(
+  node: LGraphNode,
+  overrides: Partial<INumericWidget> = {}
+): NumberWidget {
+  return new NumberWidget(
+    {
+      type: 'number',
+      name: 'testWidget',
+      value: 42,
+      options: { min: 0, max: 100 },
+      y: 0,
+      ...overrides
+    },
+    node
+  )
+}
+
+describe('BaseWidget store integration', () => {
+  let graph: LGraph
+  let node: LGraphNode
+  let store: ReturnType<typeof useWidgetValueStore>
+
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    store = useWidgetValueStore()
+    graph = new LGraph()
+    node = new LGraphNode('TestNode')
+    node.id = 1
+    graph.add(node)
+  })
+
+  describe('metadata properties before registration', () => {
+    it('uses internal values when not registered', () => {
+      const widget = createTestWidget(node, {
+        label: 'My Label',
+        hidden: true,
+        disabled: true,
+        advanced: true
+      })
+
+      expect(widget.label).toBe('My Label')
+      expect(widget.hidden).toBe(true)
+      expect(widget.disabled).toBe(true)
+      expect(widget.advanced).toBe(true)
+    })
+
+    it('allows setting properties without store', () => {
+      const widget = createTestWidget(node)
+
+      widget.label = 'New Label'
+      widget.hidden = true
+      widget.disabled = true
+      widget.advanced = true
+
+      expect(widget.label).toBe('New Label')
+      expect(widget.hidden).toBe(true)
+      expect(widget.disabled).toBe(true)
+      expect(widget.advanced).toBe(true)
+    })
+  })
+
+  describe('metadata properties after registration', () => {
+    it('reads from store when registered', () => {
+      const widget = createTestWidget(node, {
+        name: 'storeWidget',
+        label: 'Store Label',
+        hidden: true,
+        disabled: true,
+        advanced: true
+      })
+      widget.setNodeId(1)
+
+      expect(widget.label).toBe('Store Label')
+      expect(widget.hidden).toBe(true)
+      expect(widget.disabled).toBe(true)
+      expect(widget.advanced).toBe(true)
+    })
+
+    it('writes to store when registered', () => {
+      const widget = createTestWidget(node, { name: 'writeWidget' })
+      widget.setNodeId(1)
+
+      widget.label = 'Updated Label'
+      widget.hidden = true
+      widget.disabled = true
+      widget.advanced = true
+
+      const state = store.getWidget(graph.id, 1, 'writeWidget')
+      expect(state?.label).toBe('Updated Label')
+      expect(state?.disabled).toBe(true)
+
+      expect(widget.hidden).toBe(true)
+      expect(widget.advanced).toBe(true)
+    })
+
+    it('syncs value with store', () => {
+      const widget = createTestWidget(node, { name: 'valueWidget', value: 42 })
+      widget.setNodeId(1)
+
+      widget.value = 99
+      expect(store.getWidget(graph.id, 1, 'valueWidget')?.value).toBe(99)
+
+      const state = store.getWidget(graph.id, 1, 'valueWidget')!
+      state.value = 55
+      expect(widget.value).toBe(55)
+    })
+  })
+
+  describe('automatic registration via setNodeId', () => {
+    it('registers widget with all metadata', () => {
+      const widget = createTestWidget(node, {
+        name: 'autoRegWidget',
+        value: 100,
+        label: 'Auto Label',
+        hidden: true,
+        disabled: true,
+        advanced: true
+      })
+      widget.setNodeId(1)
+
+      const state = store.getWidget(graph.id, 1, 'autoRegWidget')
+      expect(state).toBeDefined()
+      expect(state?.nodeId).toBe(1)
+      expect(state?.name).toBe('autoRegWidget')
+      expect(state?.type).toBe('number')
+      expect(state?.value).toBe(100)
+      expect(state?.label).toBe('Auto Label')
+      expect(state?.disabled).toBe(true)
+      expect(state?.options).toEqual({ min: 0, max: 100 })
+
+      expect(widget.hidden).toBe(true)
+      expect(widget.advanced).toBe(true)
+    })
+
+    it('registers widget with default metadata values', () => {
+      const widget = createTestWidget(node, { name: 'defaultsWidget' })
+      widget.setNodeId(1)
+
+      const state = store.getWidget(graph.id, 1, 'defaultsWidget')
+      expect(state).toBeDefined()
+      expect(state?.disabled).toBe(false)
+      expect(state?.label).toBeUndefined()
+
+      expect(widget.hidden).toBeUndefined()
+      expect(widget.advanced).toBeUndefined()
+    })
+
+    it('registers widget value accessible via getWidget', () => {
+      const widget = createTestWidget(node, { name: 'valuesWidget', value: 77 })
+      widget.setNodeId(1)
+
+      expect(store.getWidget(graph.id, 1, 'valuesWidget')?.value).toBe(77)
+    })
+  })
+
+  describe('DOM widget value registration', () => {
+    it('registers value from getter when value property is overridden', () => {
+      const defaultValue = 'You are an expert image-generation engine.'
+      const widget = createTestWidget(node, {
+        name: 'system_prompt',
+        value: undefined as unknown as number
+      })
+
+      // Simulate what addDOMWidget does: override value with getter/setter
+      // that falls back to a default (like inputEl.value for textarea widgets)
+      Object.defineProperty(widget, 'value', {
+        get() {
+          const graphId = widget.node.graph?.rootGraph.id
+          if (!graphId) return defaultValue
+          const state = store.getWidget(graphId, node.id, 'system_prompt')
+          return (state?.value as string) ?? defaultValue
+        },
+        set(v: string) {
+          const graphId = widget.node.graph?.rootGraph.id
+          if (!graphId) return
+          const state = store.getWidget(graphId, node.id, 'system_prompt')
+          if (state) state.value = v
+        }
+      })
+
+      widget.setNodeId(node.id)
+
+      const state = store.getWidget(graph.id, node.id, 'system_prompt')
+      expect(state?.value).toBe(defaultValue)
+    })
+  })
+
+  describe('fallback behavior', () => {
+    it('uses internal value before registration', () => {
+      const widget = createTestWidget(node, {
+        name: 'fallbackWidget',
+        label: 'Internal'
+      })
+      // Widget not yet registered - should use internal value
+      expect(widget.label).toBe('Internal')
+    })
+
+    it('handles undefined values correctly', () => {
+      const widget = createTestWidget(node)
+      widget.setNodeId(1)
+
+      widget.disabled = undefined
+
+      const state = store.getWidget(graph.id, 1, 'testWidget')
+      expect(state?.disabled).toBe(false)
+    })
+  })
+})
diff --git a/src/lib/litegraph/src/widgets/BaseWidget.ts b/src/lib/litegraph/src/widgets/BaseWidget.ts
index 3ed2ffb12e..b8138af707 100644
--- a/src/lib/litegraph/src/widgets/BaseWidget.ts
+++ b/src/lib/litegraph/src/widgets/BaseWidget.ts
@@ -1,6 +1,8 @@
+import { t } from '@/i18n'
 import { drawTextInArea } from '@/lib/litegraph/src/draw'
 import { Rectangle } from '@/lib/litegraph/src/infrastructure/Rectangle'
 import type { Point } from '@/lib/litegraph/src/interfaces'
+import type { NodeId } from '@/lib/litegraph/src/LGraphNode'
 import type {
   CanvasPointer,
   LGraphCanvas,
@@ -9,13 +11,24 @@ import type {
 } from '@/lib/litegraph/src/litegraph'
 import { LiteGraph } from '@/lib/litegraph/src/litegraph'
 import type { CanvasPointerEvent } from '@/lib/litegraph/src/types/events'
-import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+import type {
+  IBaseWidget,
+  NodeBindable,
+  TWidgetType
+} from '@/lib/litegraph/src/types/widgets'
+import { usePromotionStore } from '@/stores/promotionStore'
+import type { WidgetState } from '@/stores/widgetValueStore'
+import { useWidgetValueStore } from '@/stores/widgetValueStore'
 
 export interface DrawWidgetOptions {
   /** The width of the node where this widget will be displayed. */
   width: number
   /** Synonym for "low quality". */
   showText?: boolean
+  /** When true, suppresses the promoted outline color (e.g. for projected copies on SubgraphNode). */
+  suppressPromotedOutline?: boolean
+  /** Transient image source for preview widgets rendered on behalf of another node (e.g. subgraph promotion). */
+  previewImages?: HTMLImageElement[]
 }
 
 interface DrawTruncatingTextOptions extends DrawWidgetOptions {
@@ -33,9 +46,9 @@ export interface WidgetEventOptions {
   canvas: LGraphCanvas
 }
 
-export abstract class BaseWidget<
-  TWidget extends IBaseWidget = IBaseWidget
-> implements IBaseWidget {
+export abstract class BaseWidget<TWidget extends IBaseWidget = IBaseWidget>
+  implements IBaseWidget, NodeBindable
+{
   /** From node edge to widget edge */
   static margin = 15
   /** From widget edge to tip of arrow button */
@@ -56,29 +69,45 @@ export abstract class BaseWidget<
     maxWidth?: number
   }
 
-  #node: LGraphNode
+  private _node: LGraphNode
   /** The node that this widget belongs to. */
   get node() {
-    return this.#node
+    return this._node
   }
 
   linkedWidgets?: IBaseWidget[]
   name: string
   options: TWidget['options']
-  label?: string
   type: TWidget['type']
   y: number = 0
   last_y?: number
   width?: number
-  disabled?: boolean
   computedDisabled?: boolean
+  tooltip?: string
+
+  private _state: Omit<WidgetState, 'nodeId'> &
+    Partial<Pick<WidgetState, 'nodeId'>>
+
+  get label(): string | undefined {
+    return this._state.label
+  }
+  set label(value: string | undefined) {
+    this._state.label = value
+  }
+
   hidden?: boolean
   advanced?: boolean
-  promoted?: boolean
-  tooltip?: string
+
+  get disabled(): boolean | undefined {
+    return this._state.disabled
+  }
+  set disabled(value: boolean | undefined) {
+    this._state.disabled = value ?? false
+  }
+
   element?: HTMLElement
   callback?(
-    value: any,
+    value: TWidget['value'],
     canvas?: LGraphCanvas,
     node?: LGraphNode,
     pos?: Point,
@@ -96,20 +125,36 @@ export abstract class BaseWidget<
     canvas: LGraphCanvas
   ): boolean
 
-  #value?: TWidget['value']
   get value(): TWidget['value'] {
-    return this.#value
+    return this._state.value as TWidget['value']
+  }
+  set value(value: TWidget['value']) {
+    this._state.value = value
   }
 
-  set value(value: TWidget['value']) {
-    this.#value = value
+  /**
+   * Associates this widget with a node ID and registers it in the WidgetValueStore.
+   * Once set, value reads/writes will be delegated to the store.
+   */
+  setNodeId(nodeId: NodeId): void {
+    const graphId = this.node.graph?.rootGraph.id
+    if (!graphId) return
+
+    this._state = useWidgetValueStore().registerWidget(graphId, {
+      ...this._state,
+      // BaseWidget: this.value getter returns this._state.value. So value: this.value === value: this._state.value.
+      // BaseDOMWidgetImpl: this.value getter returns options.getValue?.() ?? ''. Resolves the correct initial value instead of undefined.
+      // I.e., calls overriden getter -> options.getValue() -> correct value (https://github.com/Comfy-Org/ComfyUI_frontend/issues/9194).
+      value: this.value,
+      nodeId
+    })
   }
 
   constructor(widget: TWidget & { node: LGraphNode })
   constructor(widget: TWidget, node: LGraphNode)
   constructor(widget: TWidget & { node: LGraphNode }, node?: LGraphNode) {
     // Private fields
-    this.#node = node ?? widget.node
+    this._node = node ?? widget.node
 
     // The set and get functions for DOM widget values are hacked on to the options object;
     // attempting to set value before options will throw.
@@ -140,20 +185,47 @@ export abstract class BaseWidget<
       displayValue,
       // @ts-expect-error Prevent naming conflicts with custom nodes.
       labelBaseline,
-      promoted,
+      label,
+      disabled,
+      value,
+      linkedWidgets,
       ...safeValues
     } = widget
 
     Object.assign(this, safeValues)
+
+    this._state = {
+      name: this.name,
+      type: this.type as TWidgetType,
+      value,
+      label,
+      disabled: disabled ?? false,
+      serialize: this.serialize,
+      options: this.options
+    }
   }
 
-  get outline_color() {
-    if (this.promoted) return LiteGraph.WIDGET_PROMOTED_OUTLINE_COLOR
+  getOutlineColor(suppressPromotedOutline = false) {
+    const graphId = this.node.graph?.rootGraph.id
+    if (
+      graphId &&
+      !suppressPromotedOutline &&
+      usePromotionStore().isPromotedByAny(
+        graphId,
+        String(this.node.id),
+        this.name
+      )
+    )
+      return LiteGraph.WIDGET_PROMOTED_OUTLINE_COLOR
     return this.advanced
       ? LiteGraph.WIDGET_ADVANCED_OUTLINE_COLOR
       : LiteGraph.WIDGET_OUTLINE_COLOR
   }
 
+  get outline_color() {
+    return this.getOutlineColor()
+  }
+
   get background_color() {
     return LiteGraph.WIDGET_BGCOLOR
   }
@@ -208,13 +280,13 @@ export abstract class BaseWidget<
    */
   protected drawWidgetShape(
     ctx: CanvasRenderingContext2D,
-    { width, showText }: DrawWidgetOptions
+    { width, showText, suppressPromotedOutline }: DrawWidgetOptions
   ): void {
     const { height, y } = this
     const { margin } = BaseWidget
 
     ctx.textAlign = 'left'
-    ctx.strokeStyle = this.outline_color
+    ctx.strokeStyle = this.getOutlineColor(suppressPromotedOutline)
     ctx.fillStyle = this.background_color
     ctx.beginPath()
 
@@ -227,6 +299,41 @@ export abstract class BaseWidget<
     if (showText && !this.computedDisabled) ctx.stroke()
   }
 
+  /**
+   * Draws a placeholder for widgets that only have a Vue implementation.
+   * @param ctx The canvas context
+   * @param options The options for drawing the widget
+   * @param label The label to display (e.g., "ImageCrop", "BoundingBox")
+   */
+  protected drawVueOnlyWarning(
+    ctx: CanvasRenderingContext2D,
+    { width, suppressPromotedOutline }: DrawWidgetOptions,
+    label: string
+  ): void {
+    const { y, height } = this
+
+    ctx.save()
+
+    ctx.fillStyle = this.background_color
+    ctx.fillRect(15, y, width - 30, height)
+
+    ctx.strokeStyle = this.getOutlineColor(suppressPromotedOutline)
+    ctx.strokeRect(15, y, width - 30, height)
+
+    ctx.fillStyle = this.text_color
+    ctx.font = '11px monospace'
+    ctx.textAlign = 'center'
+    ctx.textBaseline = 'middle'
+
+    ctx.fillText(
+      `${label}: ${t('widgets.node2only')}`,
+      width / 2,
+      y + height / 2
+    )
+
+    ctx.restore()
+  }
+
   /**
    * A shared routine for drawing a label and value as text, truncated
    * if they exceed the available width.
diff --git a/src/lib/litegraph/src/widgets/BooleanWidget.ts b/src/lib/litegraph/src/widgets/BooleanWidget.ts
index 9ffd02abc9..0b0c5d31e1 100644
--- a/src/lib/litegraph/src/widgets/BooleanWidget.ts
+++ b/src/lib/litegraph/src/widgets/BooleanWidget.ts
@@ -11,12 +11,13 @@ export class BooleanWidget
 
   override drawWidget(
     ctx: CanvasRenderingContext2D,
-    { width, showText = true }: DrawWidgetOptions
+    options: DrawWidgetOptions
   ) {
+    const { width, showText = true } = options
     const { height, y } = this
     const { margin } = BaseWidget
 
-    this.drawWidgetShape(ctx, { width, showText })
+    this.drawWidgetShape(ctx, options)
 
     ctx.fillStyle = this.value ? '#89A' : '#333'
     ctx.beginPath()
diff --git a/src/lib/litegraph/src/widgets/BoundingBoxWidget.ts b/src/lib/litegraph/src/widgets/BoundingBoxWidget.ts
new file mode 100644
index 0000000000..d571f744f2
--- /dev/null
+++ b/src/lib/litegraph/src/widgets/BoundingBoxWidget.ts
@@ -0,0 +1,22 @@
+import type { IBoundingBoxWidget } from '../types/widgets'
+import { BaseWidget } from './BaseWidget'
+import type { DrawWidgetOptions, WidgetEventOptions } from './BaseWidget'
+
+/**
+ * Widget for defining bounding box regions.
+ * This widget only has a Vue implementation.
+ */
+export class BoundingBoxWidget
+  extends BaseWidget<IBoundingBoxWidget>
+  implements IBoundingBoxWidget
+{
+  override type = 'boundingbox' as const
+
+  drawWidget(ctx: CanvasRenderingContext2D, options: DrawWidgetOptions): void {
+    this.drawVueOnlyWarning(ctx, options, 'BoundingBox')
+  }
+
+  onClick(_options: WidgetEventOptions): void {
+    // This widget only has a Vue implementation
+  }
+}
diff --git a/src/lib/litegraph/src/widgets/ButtonWidget.ts b/src/lib/litegraph/src/widgets/ButtonWidget.ts
index 38bc74bc74..fe9659c231 100644
--- a/src/lib/litegraph/src/widgets/ButtonWidget.ts
+++ b/src/lib/litegraph/src/widgets/ButtonWidget.ts
@@ -23,7 +23,7 @@ export class ButtonWidget
    */
   override drawWidget(
     ctx: CanvasRenderingContext2D,
-    { width, showText = true }: DrawWidgetOptions
+    { width, showText = true, suppressPromotedOutline }: DrawWidgetOptions
   ) {
     // Store original context attributes
     const { fillStyle, strokeStyle, textAlign } = ctx
@@ -41,7 +41,7 @@ export class ButtonWidget
 
     // Draw button outline if not disabled
     if (showText && !this.computedDisabled) {
-      ctx.strokeStyle = this.outline_color
+      ctx.strokeStyle = this.getOutlineColor(suppressPromotedOutline)
       ctx.strokeRect(margin, y, width - margin * 2, height)
     }
 
@@ -65,7 +65,7 @@ export class ButtonWidget
     this.clicked = true
     canvas.setDirty(true)
 
-    // Call the callback with widget instance and other context
-    this.callback?.(this, canvas, node, pos, e)
+    // Call the callback with widget value
+    this.callback?.(this.value, canvas, node, pos, e)
   }
 }
diff --git a/src/lib/litegraph/src/widgets/ChartWidget.ts b/src/lib/litegraph/src/widgets/ChartWidget.ts
index 440ca4f08e..94be0183a5 100644
--- a/src/lib/litegraph/src/widgets/ChartWidget.ts
+++ b/src/lib/litegraph/src/widgets/ChartWidget.ts
@@ -1,3 +1,5 @@
+import { t } from '@/i18n'
+
 import type { IChartWidget } from '../types/widgets'
 import { BaseWidget } from './BaseWidget'
 import type { DrawWidgetOptions, WidgetEventOptions } from './BaseWidget'
@@ -21,7 +23,7 @@ export class ChartWidget
     ctx.fillStyle = this.background_color
     ctx.fillRect(15, y, width - 30, height)
 
-    ctx.strokeStyle = this.outline_color
+    ctx.strokeStyle = this.getOutlineColor(options.suppressPromotedOutline)
     ctx.strokeRect(15, y, width - 30, height)
 
     ctx.fillStyle = this.text_color
@@ -29,7 +31,7 @@ export class ChartWidget
     ctx.textAlign = 'center'
     ctx.textBaseline = 'middle'
 
-    const text = 'Chart: Vue-only'
+    const text = `Chart: ${t('widgets.node2only')}`
     ctx.fillText(text, width / 2, y + height / 2)
 
     Object.assign(ctx, {
diff --git a/src/lib/litegraph/src/widgets/ColorWidget.test.ts b/src/lib/litegraph/src/widgets/ColorWidget.test.ts
new file mode 100644
index 0000000000..f06d059a01
--- /dev/null
+++ b/src/lib/litegraph/src/widgets/ColorWidget.test.ts
@@ -0,0 +1,261 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { LGraphCanvas } from '@/lib/litegraph/src/LGraphCanvas'
+import type { LGraphNode as LGraphNodeType } from '@/lib/litegraph/src/litegraph'
+import type { CanvasPointerEvent } from '@/lib/litegraph/src/types/events'
+import type { IColorWidget } from '@/lib/litegraph/src/types/widgets'
+import type { ColorWidget as ColorWidgetType } from '@/lib/litegraph/src/widgets/ColorWidget'
+
+type LGraphCanvasType = InstanceType<typeof LGraphCanvas>
+
+function createMockWidgetConfig(
+  overrides: Partial<IColorWidget> = {}
+): IColorWidget {
+  return {
+    type: 'color',
+    name: 'test_color',
+    value: '#ff0000',
+    options: {},
+    y: 0,
+    ...overrides
+  }
+}
+
+function createMockCanvas(): LGraphCanvasType {
+  return {
+    setDirty: vi.fn()
+  } as Partial<LGraphCanvasType> as LGraphCanvasType
+}
+
+function createMockEvent(clientX = 100, clientY = 200): CanvasPointerEvent {
+  return { clientX, clientY } as CanvasPointerEvent
+}
+
+describe('ColorWidget', () => {
+  let node: LGraphNodeType
+  let widget: ColorWidgetType
+  let mockCanvas: LGraphCanvasType
+  let mockEvent: CanvasPointerEvent
+  let ColorWidget: typeof ColorWidgetType
+  let LGraphNode: typeof LGraphNodeType
+
+  beforeEach(async () => {
+    vi.clearAllMocks()
+    vi.useFakeTimers()
+    // Reset modules to get fresh globalColorInput state
+    vi.resetModules()
+
+    const litegraph = await import('@/lib/litegraph/src/litegraph')
+    LGraphNode = litegraph.LGraphNode
+
+    const colorWidgetModule =
+      await import('@/lib/litegraph/src/widgets/ColorWidget')
+    ColorWidget = colorWidgetModule.ColorWidget
+
+    node = new LGraphNode('TestNode')
+    mockCanvas = createMockCanvas()
+    mockEvent = createMockEvent()
+  })
+
+  afterEach(() => {
+    vi.useRealTimers()
+    document
+      .querySelectorAll('input[type="color"]')
+      .forEach((el) => el.remove())
+  })
+
+  describe('onClick', () => {
+    it('should create a color input and append it to document body', () => {
+      widget = new ColorWidget(createMockWidgetConfig(), node)
+
+      widget.onClick({ e: mockEvent, node, canvas: mockCanvas })
+
+      const input = document.querySelector(
+        'input[type="color"]'
+      ) as HTMLInputElement
+      expect(input).toBeTruthy()
+      expect(input.parentElement).toBe(document.body)
+    })
+
+    it('should set input value from widget value', () => {
+      widget = new ColorWidget(
+        createMockWidgetConfig({ value: '#00ff00' }),
+        node
+      )
+
+      widget.onClick({ e: mockEvent, node, canvas: mockCanvas })
+
+      const input = document.querySelector(
+        'input[type="color"]'
+      ) as HTMLInputElement
+      expect(input.value).toBe('#00ff00')
+    })
+
+    it('should default to #000000 when widget value is empty', () => {
+      widget = new ColorWidget(createMockWidgetConfig({ value: '' }), node)
+
+      widget.onClick({ e: mockEvent, node, canvas: mockCanvas })
+
+      const input = document.querySelector(
+        'input[type="color"]'
+      ) as HTMLInputElement
+      expect(input.value).toBe('#000000')
+    })
+
+    it('should position input at click coordinates', () => {
+      widget = new ColorWidget(createMockWidgetConfig(), node)
+      const event = createMockEvent(150, 250)
+
+      widget.onClick({ e: event, node, canvas: mockCanvas })
+
+      const input = document.querySelector(
+        'input[type="color"]'
+      ) as HTMLInputElement
+      expect(input.style.left).toBe('150px')
+      expect(input.style.top).toBe('250px')
+    })
+
+    it('should click the input on next animation frame', () => {
+      widget = new ColorWidget(createMockWidgetConfig(), node)
+
+      widget.onClick({ e: mockEvent, node, canvas: mockCanvas })
+
+      const input = document.querySelector(
+        'input[type="color"]'
+      ) as HTMLInputElement
+      const clickSpy = vi.spyOn(input, 'click')
+
+      expect(clickSpy).not.toHaveBeenCalled()
+      vi.runAllTimers()
+      expect(clickSpy).toHaveBeenCalled()
+    })
+
+    it('should reuse the same input element on subsequent clicks', () => {
+      widget = new ColorWidget(createMockWidgetConfig(), node)
+
+      widget.onClick({ e: mockEvent, node, canvas: mockCanvas })
+      const firstInput = document.querySelector('input[type="color"]')
+
+      widget.onClick({ e: mockEvent, node, canvas: mockCanvas })
+      const secondInput = document.querySelector('input[type="color"]')
+
+      expect(firstInput).toBe(secondInput)
+      expect(document.querySelectorAll('input[type="color"]').length).toBe(1)
+    })
+
+    it('should update input value when clicking with different widget values', () => {
+      const widget1 = new ColorWidget(
+        createMockWidgetConfig({ value: '#ff0000' }),
+        node
+      )
+      const widget2 = new ColorWidget(
+        createMockWidgetConfig({ value: '#0000ff' }),
+        node
+      )
+
+      widget1.onClick({ e: mockEvent, node, canvas: mockCanvas })
+      const input = document.querySelector(
+        'input[type="color"]'
+      ) as HTMLInputElement
+      expect(input.value).toBe('#ff0000')
+
+      widget2.onClick({ e: mockEvent, node, canvas: mockCanvas })
+      expect(input.value).toBe('#0000ff')
+    })
+  })
+
+  describe('onChange', () => {
+    it('should call setValue when color input changes', () => {
+      widget = new ColorWidget(
+        createMockWidgetConfig({ value: '#ff0000' }),
+        node
+      )
+      const setValueSpy = vi.spyOn(widget, 'setValue')
+
+      widget.onClick({ e: mockEvent, node, canvas: mockCanvas })
+
+      const input = document.querySelector(
+        'input[type="color"]'
+      ) as HTMLInputElement
+      input.value = '#00ff00'
+      input.dispatchEvent(new Event('change'))
+
+      expect(setValueSpy).toHaveBeenCalledWith('#00ff00', {
+        e: mockEvent,
+        node,
+        canvas: mockCanvas
+      })
+    })
+
+    it('should call canvas.setDirty after value change', () => {
+      widget = new ColorWidget(createMockWidgetConfig(), node)
+
+      widget.onClick({ e: mockEvent, node, canvas: mockCanvas })
+
+      const input = document.querySelector(
+        'input[type="color"]'
+      ) as HTMLInputElement
+      input.value = '#00ff00'
+      input.dispatchEvent(new Event('change'))
+
+      expect(mockCanvas.setDirty).toHaveBeenCalledWith(true)
+    })
+
+    it('should remove change listener after firing once', () => {
+      widget = new ColorWidget(createMockWidgetConfig(), node)
+      const setValueSpy = vi.spyOn(widget, 'setValue')
+
+      widget.onClick({ e: mockEvent, node, canvas: mockCanvas })
+
+      const input = document.querySelector(
+        'input[type="color"]'
+      ) as HTMLInputElement
+
+      input.value = '#00ff00'
+      input.dispatchEvent(new Event('change'))
+      input.value = '#0000ff'
+      input.dispatchEvent(new Event('change'))
+
+      // Should only be called once despite two change events
+      expect(setValueSpy).toHaveBeenCalledTimes(1)
+      expect(setValueSpy).toHaveBeenCalledWith('#00ff00', expect.any(Object))
+    })
+
+    it('should register new change listener on subsequent onClick', () => {
+      widget = new ColorWidget(createMockWidgetConfig(), node)
+      const setValueSpy = vi.spyOn(widget, 'setValue')
+
+      // First click and change
+      widget.onClick({ e: mockEvent, node, canvas: mockCanvas })
+      const input = document.querySelector(
+        'input[type="color"]'
+      ) as HTMLInputElement
+      input.value = '#00ff00'
+      input.dispatchEvent(new Event('change'))
+
+      // Second click and change
+      widget.onClick({ e: mockEvent, node, canvas: mockCanvas })
+      input.value = '#0000ff'
+      input.dispatchEvent(new Event('change'))
+
+      expect(setValueSpy).toHaveBeenCalledTimes(2)
+      expect(setValueSpy).toHaveBeenNthCalledWith(
+        1,
+        '#00ff00',
+        expect.any(Object)
+      )
+      expect(setValueSpy).toHaveBeenNthCalledWith(
+        2,
+        '#0000ff',
+        expect.any(Object)
+      )
+    })
+  })
+
+  describe('type', () => {
+    it('should have type "color"', () => {
+      widget = new ColorWidget(createMockWidgetConfig(), node)
+      expect(widget.type).toBe('color')
+    })
+  })
+})
diff --git a/src/lib/litegraph/src/widgets/ColorWidget.ts b/src/lib/litegraph/src/widgets/ColorWidget.ts
index a0b0b34961..7752706fac 100644
--- a/src/lib/litegraph/src/widgets/ColorWidget.ts
+++ b/src/lib/litegraph/src/widgets/ColorWidget.ts
@@ -1,10 +1,26 @@
 import type { IColorWidget } from '../types/widgets'
-import { BaseWidget } from './BaseWidget'
 import type { DrawWidgetOptions, WidgetEventOptions } from './BaseWidget'
+import { BaseWidget } from './BaseWidget'
+
+// Have one color input to prevent leaking instances
+// Browsers don't seem to fire any events when the color picker is cancelled
+let colorInput: HTMLInputElement | null = null
+
+function getColorInput(): HTMLInputElement {
+  if (!colorInput) {
+    colorInput = document.createElement('input')
+    colorInput.type = 'color'
+    colorInput.style.position = 'absolute'
+    colorInput.style.opacity = '0'
+    colorInput.style.pointerEvents = 'none'
+    colorInput.style.zIndex = '-999'
+    document.body.appendChild(colorInput)
+  }
+  return colorInput
+}
 
 /**
- * Widget for displaying a color picker
- * This is a widget that only has a Vue widgets implementation
+ * Widget for displaying a color picker using native HTML color input
  */
 export class ColorWidget
   extends BaseWidget<IColorWidget>
@@ -13,35 +29,59 @@ export class ColorWidget
   override type = 'color' as const
 
   drawWidget(ctx: CanvasRenderingContext2D, options: DrawWidgetOptions): void {
+    const { fillStyle, strokeStyle, textAlign } = ctx
+
+    this.drawWidgetShape(ctx, options)
+
     const { width } = options
-    const { y, height } = this
+    const { height, y } = this
+    const { margin } = BaseWidget
 
-    const { fillStyle, strokeStyle, textAlign, textBaseline, font } = ctx
+    const swatchWidth = 40
+    const swatchHeight = height - 6
+    const swatchRadius = swatchHeight / 2
+    const rightPadding = 10
 
-    ctx.fillStyle = this.background_color
-    ctx.fillRect(15, y, width - 30, height)
+    // Swatch fixed on the right
+    const swatchX = width - margin - rightPadding - swatchWidth
+    const swatchY = y + 3
 
-    ctx.strokeStyle = this.outline_color
-    ctx.strokeRect(15, y, width - 30, height)
+    // Draw color swatch as rounded pill
+    ctx.beginPath()
+    ctx.roundRect(swatchX, swatchY, swatchWidth, swatchHeight, swatchRadius)
+    ctx.fillStyle = this.value || '#000000'
+    ctx.fill()
 
+    // Draw label on the left
+    ctx.fillStyle = this.secondary_text_color
+    ctx.textAlign = 'left'
+    ctx.fillText(this.displayName, margin * 2 + 5, y + height * 0.7)
+
+    // Draw hex value to the left of swatch
     ctx.fillStyle = this.text_color
-    ctx.font = '11px monospace'
-    ctx.textAlign = 'center'
-    ctx.textBaseline = 'middle'
+    ctx.textAlign = 'right'
+    ctx.fillText(this.value || '#000000', swatchX - 8, y + height * 0.7)
 
-    const text = 'Color: Vue-only'
-    ctx.fillText(text, width / 2, y + height / 2)
-
-    Object.assign(ctx, {
-      fillStyle,
-      strokeStyle,
-      textAlign,
-      textBaseline,
-      font
-    })
+    Object.assign(ctx, { textAlign, strokeStyle, fillStyle })
   }
 
-  onClick(_options: WidgetEventOptions): void {
-    // This is a widget that only has a Vue widgets implementation
+  onClick({ e, node, canvas }: WidgetEventOptions): void {
+    const input = getColorInput()
+    input.value = this.value || '#000000'
+    input.style.left = `${e.clientX}px`
+    input.style.top = `${e.clientY}px`
+
+    input.addEventListener(
+      'change',
+      () => {
+        this.setValue(input.value, { e, node, canvas })
+        canvas.setDirty(true)
+      },
+      { once: true }
+    )
+
+    // Wait for next frame else Chrome doesn't render the color picker at the mouse
+    // Firefox always opens it in top left of window on Windows
+    requestAnimationFrame(() => input.click())
   }
 }
diff --git a/tests-ui/tests/lib/litegraph/src/widgets/ComboWidget.test.ts b/src/lib/litegraph/src/widgets/ComboWidget.test.ts
similarity index 94%
rename from tests-ui/tests/lib/litegraph/src/widgets/ComboWidget.test.ts
rename to src/lib/litegraph/src/widgets/ComboWidget.test.ts
index c8291ff0ad..e58a61cc8b 100644
--- a/tests-ui/tests/lib/litegraph/src/widgets/ComboWidget.test.ts
+++ b/src/lib/litegraph/src/widgets/ComboWidget.test.ts
@@ -1,13 +1,14 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
+import type * as LGraphCanvasModule from '@/lib/litegraph/src/LGraphCanvas'
 import { LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph'
 import type { CanvasPointerEvent } from '@/lib/litegraph/src/types/events'
 import type { IComboWidget } from '@/lib/litegraph/src/types/widgets'
 import { ComboWidget } from '@/lib/litegraph/src/widgets/ComboWidget'
 
-const { LGraphCanvas } = await vi.importActual<
-  typeof import('@/lib/litegraph/src/LGraphCanvas')
->('@/lib/litegraph/src/LGraphCanvas')
+const { LGraphCanvas } = await vi.importActual<typeof LGraphCanvasModule>(
+  '@/lib/litegraph/src/LGraphCanvas'
+)
 type LGraphCanvasType = InstanceType<typeof LGraphCanvas>
 
 interface MockWidgetConfig extends Omit<IComboWidget, 'options'> {
@@ -388,8 +389,9 @@ describe('ComboWidget', () => {
       node.size = [200, 30]
 
       const mockContextMenu = vi.fn()
-      LiteGraph.ContextMenu =
-        mockContextMenu as unknown as typeof LiteGraph.ContextMenu
+      LiteGraph.ContextMenu = mockContextMenu as Partial<
+        typeof LiteGraph.ContextMenu
+      > as typeof LiteGraph.ContextMenu
 
       widget.onClick({ e: mockEvent, node, canvas: mockCanvas })
 
@@ -425,8 +427,9 @@ describe('ComboWidget', () => {
       node.size = [200, 30]
 
       const mockContextMenu = vi.fn()
-      LiteGraph.ContextMenu =
-        mockContextMenu as unknown as typeof LiteGraph.ContextMenu
+      LiteGraph.ContextMenu = mockContextMenu as Partial<
+        typeof LiteGraph.ContextMenu
+      > as typeof LiteGraph.ContextMenu
 
       widget.onClick({ e: mockEvent, node, canvas: mockCanvas })
 
@@ -462,7 +465,9 @@ describe('ComboWidget', () => {
         .mockImplementation(function (_values, options) {
           capturedCallback = options.callback
         })
-      LiteGraph.ContextMenu = mockContextMenu
+      LiteGraph.ContextMenu = mockContextMenu as Partial<
+        typeof LiteGraph.ContextMenu
+      > as typeof LiteGraph.ContextMenu
 
       const setValueSpy = vi.spyOn(widget, 'setValue')
       widget.onClick({ e: mockEvent, node, canvas: mockCanvas })
@@ -504,7 +509,9 @@ describe('ComboWidget', () => {
         .mockImplementation(function (_values, options) {
           capturedCallback = options.callback
         })
-      LiteGraph.ContextMenu = mockContextMenu
+      LiteGraph.ContextMenu = mockContextMenu as Partial<
+        typeof LiteGraph.ContextMenu
+      > as typeof LiteGraph.ContextMenu
 
       const setValueSpy = vi.spyOn(widget, 'setValue')
       widget.onClick({ e: mockEvent, node, canvas: mockCanvas })
@@ -535,8 +542,9 @@ describe('ComboWidget', () => {
       node.size = [200, 30]
 
       const mockContextMenu = vi.fn()
-      LiteGraph.ContextMenu =
-        mockContextMenu as unknown as typeof LiteGraph.ContextMenu
+      LiteGraph.ContextMenu = mockContextMenu as Partial<
+        typeof LiteGraph.ContextMenu
+      > as typeof LiteGraph.ContextMenu
 
       widget.onClick({ e: mockEvent, node, canvas: mockCanvas })
 
@@ -569,8 +577,9 @@ describe('ComboWidget', () => {
       node.size = [200, 30]
 
       const mockContextMenu = vi.fn()
-      LiteGraph.ContextMenu =
-        mockContextMenu as unknown as typeof LiteGraph.ContextMenu
+      LiteGraph.ContextMenu = mockContextMenu as Partial<
+        typeof LiteGraph.ContextMenu
+      > as typeof LiteGraph.ContextMenu
 
       widget.onClick({ e: mockEvent, node, canvas: mockCanvas })
 
@@ -765,8 +774,9 @@ describe('ComboWidget', () => {
           .mockImplementation(function () {
             this.addItem = mockAddItem
           })
-        LiteGraph.ContextMenu = mockContextMenu
-
+        LiteGraph.ContextMenu = mockContextMenu as Partial<
+          typeof LiteGraph.ContextMenu
+        > as typeof LiteGraph.ContextMenu
         widget.onClick({ e: mockEvent, node, canvas: mockCanvas })
 
         // Should show formatted labels in dropdown
@@ -828,7 +838,9 @@ describe('ComboWidget', () => {
             capturedCallback = options.callback
             this.addItem = mockAddItem
           })
-        LiteGraph.ContextMenu = mockContextMenu
+        LiteGraph.ContextMenu = mockContextMenu as Partial<
+          typeof LiteGraph.ContextMenu
+        > as typeof LiteGraph.ContextMenu
 
         const setValueSpy = vi.spyOn(widget, 'setValue')
         widget.onClick({ e: mockEvent, node, canvas: mockCanvas })
@@ -881,7 +893,9 @@ describe('ComboWidget', () => {
             capturedCallback = options.callback
             this.addItem = mockAddItem
           })
-        LiteGraph.ContextMenu = mockContextMenu
+        LiteGraph.ContextMenu = mockContextMenu as Partial<
+          typeof LiteGraph.ContextMenu
+        > as typeof LiteGraph.ContextMenu
 
         widget.onClick({ e: mockEvent, node, canvas: mockCanvas })
 
@@ -959,7 +973,9 @@ describe('ComboWidget', () => {
           .mockImplementation(function () {
             this.addItem = mockAddItem
           })
-        LiteGraph.ContextMenu = mockContextMenu
+        LiteGraph.ContextMenu = mockContextMenu as Partial<
+          typeof LiteGraph.ContextMenu
+        > as typeof LiteGraph.ContextMenu
 
         widget.onClick({ e: mockEvent, node, canvas: mockCanvas })
 
@@ -1006,7 +1022,9 @@ describe('ComboWidget', () => {
         node.size = [200, 30]
 
         const mockContextMenu = vi.fn<typeof LiteGraph.ContextMenu>()
-        LiteGraph.ContextMenu = mockContextMenu
+        LiteGraph.ContextMenu = mockContextMenu as Partial<
+          typeof LiteGraph.ContextMenu
+        > as typeof LiteGraph.ContextMenu
 
         widget.onClick({ e: mockEvent, node, canvas: mockCanvas })
 
@@ -1044,7 +1062,8 @@ describe('ComboWidget', () => {
         createMockWidgetConfig({
           name: 'mode',
           value: 'test',
-          options: { values: null as any }
+          // @ts-expect-error - Testing with intentionally invalid null value
+          options: { values: null }
         }),
         node
       )
diff --git a/src/lib/litegraph/src/widgets/ComboWidget.ts b/src/lib/litegraph/src/widgets/ComboWidget.ts
index 2be4074994..38d52b31ec 100644
--- a/src/lib/litegraph/src/widgets/ComboWidget.ts
+++ b/src/lib/litegraph/src/widgets/ComboWidget.ts
@@ -35,11 +35,10 @@ export class ComboWidget
   override get _displayValue() {
     if (this.computedDisabled) return ''
 
-    if (this.options.getOptionLabel) {
+    const getOptionLabel = this.options.getOptionLabel
+    if (getOptionLabel) {
       try {
-        return this.options.getOptionLabel(
-          this.value ? String(this.value) : null
-        )
+        return getOptionLabel(this.value ? String(this.value) : null)
       } catch (e) {
         console.error('Failed to map value:', e)
         return this.value ? String(this.value) : ''
@@ -155,9 +154,12 @@ export class ComboWidget
       }
       const menu = new LiteGraph.ContextMenu([], menuOptions)
 
+      const getOptionLabel = this.options.getOptionLabel
       for (const value of values_list) {
         try {
-          const label = this.options.getOptionLabel(String(value))
+          const label = getOptionLabel
+            ? getOptionLabel(String(value))
+            : String(value)
           menu.addItem(label, value, menuOptions)
         } catch (err) {
           console.error('Failed to map value:', err)
diff --git a/src/lib/litegraph/src/widgets/CurveWidget.ts b/src/lib/litegraph/src/widgets/CurveWidget.ts
new file mode 100644
index 0000000000..2879ae0918
--- /dev/null
+++ b/src/lib/litegraph/src/widgets/CurveWidget.ts
@@ -0,0 +1,16 @@
+import type { ICurveWidget } from '../types/widgets'
+import { BaseWidget } from './BaseWidget'
+import type { DrawWidgetOptions, WidgetEventOptions } from './BaseWidget'
+
+export class CurveWidget
+  extends BaseWidget<ICurveWidget>
+  implements ICurveWidget
+{
+  override type = 'curve' as const
+
+  drawWidget(ctx: CanvasRenderingContext2D, options: DrawWidgetOptions): void {
+    this.drawVueOnlyWarning(ctx, options, 'Curve')
+  }
+
+  onClick(_options: WidgetEventOptions): void {}
+}
diff --git a/src/lib/litegraph/src/widgets/DisconnectedWidget.ts b/src/lib/litegraph/src/widgets/DisconnectedWidget.ts
deleted file mode 100644
index 0bf62290cd..0000000000
--- a/src/lib/litegraph/src/widgets/DisconnectedWidget.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
-import type { IButtonWidget } from '@/lib/litegraph/src/types/widgets'
-
-import { BaseWidget } from './BaseWidget'
-import type { DrawWidgetOptions } from './BaseWidget'
-
-class DisconnectedWidget extends BaseWidget<IButtonWidget> {
-  constructor(widget: IButtonWidget) {
-    super(widget, new LGraphNode('DisconnectedPlaceholder'))
-    this.disabled = true
-  }
-
-  override drawWidget(
-    ctx: CanvasRenderingContext2D,
-    { width, showText = true }: DrawWidgetOptions
-  ) {
-    ctx.save()
-    this.drawWidgetShape(ctx, { width, showText })
-    if (showText) {
-      this.drawTruncatingText({ ctx, width, leftPadding: 0, rightPadding: 0 })
-    }
-    ctx.restore()
-  }
-
-  override onClick() {}
-
-  override get _displayValue() {
-    return 'Disconnected'
-  }
-}
-const conf: IButtonWidget = {
-  type: 'button',
-  value: undefined,
-  name: 'Disconnected',
-  options: {},
-  y: 0,
-  clicked: false
-}
-export const disconnectedWidget = new DisconnectedWidget(conf)
diff --git a/src/lib/litegraph/src/widgets/FileUploadWidget.ts b/src/lib/litegraph/src/widgets/FileUploadWidget.ts
index f73de53f2b..f9d41c3d84 100644
--- a/src/lib/litegraph/src/widgets/FileUploadWidget.ts
+++ b/src/lib/litegraph/src/widgets/FileUploadWidget.ts
@@ -1,3 +1,5 @@
+import { t } from '@/i18n'
+
 import type { IFileUploadWidget } from '../types/widgets'
 import { BaseWidget } from './BaseWidget'
 import type { DrawWidgetOptions, WidgetEventOptions } from './BaseWidget'
@@ -21,7 +23,7 @@ export class FileUploadWidget
     ctx.fillStyle = this.background_color
     ctx.fillRect(15, y, width - 30, height)
 
-    ctx.strokeStyle = this.outline_color
+    ctx.strokeStyle = this.getOutlineColor(options.suppressPromotedOutline)
     ctx.strokeRect(15, y, width - 30, height)
 
     ctx.fillStyle = this.text_color
@@ -29,7 +31,7 @@ export class FileUploadWidget
     ctx.textAlign = 'center'
     ctx.textBaseline = 'middle'
 
-    const text = 'Fileupload: Vue-only'
+    const text = `Fileupload: ${t('widgets.node2only')}`
     ctx.fillText(text, width / 2, y + height / 2)
 
     Object.assign(ctx, {
diff --git a/src/lib/litegraph/src/widgets/GalleriaWidget.ts b/src/lib/litegraph/src/widgets/GalleriaWidget.ts
index 75770b2bb9..5c596ff978 100644
--- a/src/lib/litegraph/src/widgets/GalleriaWidget.ts
+++ b/src/lib/litegraph/src/widgets/GalleriaWidget.ts
@@ -1,3 +1,5 @@
+import { t } from '@/i18n'
+
 import type { IGalleriaWidget } from '../types/widgets'
 import { BaseWidget } from './BaseWidget'
 import type { DrawWidgetOptions, WidgetEventOptions } from './BaseWidget'
@@ -21,7 +23,7 @@ export class GalleriaWidget
     ctx.fillStyle = this.background_color
     ctx.fillRect(15, y, width - 30, height)
 
-    ctx.strokeStyle = this.outline_color
+    ctx.strokeStyle = this.getOutlineColor(options.suppressPromotedOutline)
     ctx.strokeRect(15, y, width - 30, height)
 
     ctx.fillStyle = this.text_color
@@ -29,7 +31,7 @@ export class GalleriaWidget
     ctx.textAlign = 'center'
     ctx.textBaseline = 'middle'
 
-    const text = 'Galleria: Vue-only'
+    const text = `Galleria: ${t('widgets.node2only')}`
     ctx.fillText(text, width / 2, y + height / 2)
 
     Object.assign(ctx, {
diff --git a/src/lib/litegraph/src/widgets/GradientSliderWidget.ts b/src/lib/litegraph/src/widgets/GradientSliderWidget.ts
new file mode 100644
index 0000000000..9d766329a1
--- /dev/null
+++ b/src/lib/litegraph/src/widgets/GradientSliderWidget.ts
@@ -0,0 +1,85 @@
+import { clamp } from 'es-toolkit/compat'
+
+import type { IGradientSliderWidget } from '@/lib/litegraph/src/types/widgets'
+
+import { BaseWidget } from './BaseWidget'
+import type { DrawWidgetOptions, WidgetEventOptions } from './BaseWidget'
+
+export class GradientSliderWidget
+  extends BaseWidget<IGradientSliderWidget>
+  implements IGradientSliderWidget
+{
+  override type = 'gradientslider' as const
+
+  override drawWidget(
+    ctx: CanvasRenderingContext2D,
+    { width, showText = true }: DrawWidgetOptions
+  ) {
+    ctx.save()
+
+    const { height, y } = this
+    const { margin } = BaseWidget
+
+    ctx.fillStyle = this.background_color
+    ctx.fillRect(margin, y, width - margin * 2, height)
+
+    const range = this.options.max - this.options.min
+    let nvalue = (this.value - this.options.min) / range
+    nvalue = clamp(nvalue, 0, 1)
+
+    ctx.fillStyle = '#678'
+    ctx.fillRect(margin, y, nvalue * (width - margin * 2), height)
+
+    if (showText && !this.computedDisabled) {
+      ctx.strokeStyle = this.outline_color
+      ctx.strokeRect(margin, y, width - margin * 2, height)
+    }
+
+    if (showText) {
+      ctx.textAlign = 'center'
+      ctx.fillStyle = this.text_color
+      const fixedValue = Number(this.value).toFixed(this.options.precision ?? 3)
+      ctx.fillText(
+        `${this.label || this.name}  ${fixedValue}`,
+        width * 0.5,
+        y + height * 0.7
+      )
+    }
+
+    ctx.restore()
+  }
+
+  override onClick(options: WidgetEventOptions) {
+    if (this.options.read_only) return
+
+    const { e, node } = options
+    const width = this.width || node.size[0]
+    const x = e.canvasX - node.pos[0]
+
+    const { margin } = BaseWidget
+    const slideFactor = clamp((x - margin) / (width - margin * 2), 0, 1)
+    const newValue =
+      this.options.min + (this.options.max - this.options.min) * slideFactor
+
+    if (newValue !== this.value) {
+      this.setValue(newValue, options)
+    }
+  }
+
+  override onDrag(options: WidgetEventOptions) {
+    if (this.options.read_only) return false
+
+    const { e, node } = options
+    const width = this.width || node.size[0]
+    const x = e.canvasX - node.pos[0]
+
+    const { margin } = BaseWidget
+    const slideFactor = clamp((x - margin) / (width - margin * 2), 0, 1)
+    const newValue =
+      this.options.min + (this.options.max - this.options.min) * slideFactor
+
+    if (newValue !== this.value) {
+      this.setValue(newValue, options)
+    }
+  }
+}
diff --git a/src/lib/litegraph/src/widgets/ImageCompareWidget.ts b/src/lib/litegraph/src/widgets/ImageCompareWidget.ts
index 3f593e0ee4..435ed6b388 100644
--- a/src/lib/litegraph/src/widgets/ImageCompareWidget.ts
+++ b/src/lib/litegraph/src/widgets/ImageCompareWidget.ts
@@ -1,3 +1,5 @@
+import { t } from '@/i18n'
+
 import type { IImageCompareWidget } from '../types/widgets'
 import { BaseWidget } from './BaseWidget'
 import type { DrawWidgetOptions, WidgetEventOptions } from './BaseWidget'
@@ -21,7 +23,7 @@ export class ImageCompareWidget
     ctx.fillStyle = this.background_color
     ctx.fillRect(15, y, width - 30, height)
 
-    ctx.strokeStyle = this.outline_color
+    ctx.strokeStyle = this.getOutlineColor(options.suppressPromotedOutline)
     ctx.strokeRect(15, y, width - 30, height)
 
     ctx.fillStyle = this.text_color
@@ -29,7 +31,7 @@ export class ImageCompareWidget
     ctx.textAlign = 'center'
     ctx.textBaseline = 'middle'
 
-    const text = 'ImageCompare: Vue-only'
+    const text = `ImageCompare: ${t('widgets.node2only')}`
     ctx.fillText(text, width / 2, y + height / 2)
 
     Object.assign(ctx, {
diff --git a/src/lib/litegraph/src/widgets/ImageCropWidget.ts b/src/lib/litegraph/src/widgets/ImageCropWidget.ts
new file mode 100644
index 0000000000..a81cd580c6
--- /dev/null
+++ b/src/lib/litegraph/src/widgets/ImageCropWidget.ts
@@ -0,0 +1,22 @@
+import type { IImageCropWidget } from '../types/widgets'
+import { BaseWidget } from './BaseWidget'
+import type { DrawWidgetOptions, WidgetEventOptions } from './BaseWidget'
+
+/**
+ * Widget for displaying an image crop preview.
+ * This widget only has a Vue implementation.
+ */
+export class ImageCropWidget
+  extends BaseWidget<IImageCropWidget>
+  implements IImageCropWidget
+{
+  override type = 'imagecrop' as const
+
+  drawWidget(ctx: CanvasRenderingContext2D, options: DrawWidgetOptions): void {
+    this.drawVueOnlyWarning(ctx, options, 'ImageCrop')
+  }
+
+  onClick(_options: WidgetEventOptions): void {
+    // This widget only has a Vue implementation
+  }
+}
diff --git a/src/lib/litegraph/src/widgets/KnobWidget.ts b/src/lib/litegraph/src/widgets/KnobWidget.ts
index 29985bf00b..600d802f12 100644
--- a/src/lib/litegraph/src/widgets/KnobWidget.ts
+++ b/src/lib/litegraph/src/widgets/KnobWidget.ts
@@ -33,7 +33,7 @@ export class KnobWidget extends BaseWidget<IKnobWidget> implements IKnobWidget {
 
   drawWidget(
     ctx: CanvasRenderingContext2D,
-    { width, showText = true }: DrawWidgetOptions
+    { width, showText = true, suppressPromotedOutline }: DrawWidgetOptions
   ): void {
     // Store original context attributes
     const { fillStyle, strokeStyle, textAlign } = ctx
@@ -145,10 +145,10 @@ export class KnobWidget extends BaseWidget<IKnobWidget> implements IKnobWidget {
 
     // Draw outline if not disabled
     if (showText && !this.computedDisabled) {
-      ctx.strokeStyle = this.outline_color
+      ctx.strokeStyle = this.getOutlineColor(suppressPromotedOutline)
       // Draw value
       ctx.beginPath()
-      ctx.strokeStyle = this.outline_color
+      ctx.strokeStyle = this.getOutlineColor(suppressPromotedOutline)
       ctx.arc(
         arc_center.x,
         arc_center.y,
diff --git a/src/lib/litegraph/src/widgets/MarkdownWidget.ts b/src/lib/litegraph/src/widgets/MarkdownWidget.ts
index 6ca6512fec..5d742fc3be 100644
--- a/src/lib/litegraph/src/widgets/MarkdownWidget.ts
+++ b/src/lib/litegraph/src/widgets/MarkdownWidget.ts
@@ -1,3 +1,5 @@
+import { t } from '@/i18n'
+
 import type { IMarkdownWidget } from '../types/widgets'
 import { BaseWidget } from './BaseWidget'
 import type { DrawWidgetOptions, WidgetEventOptions } from './BaseWidget'
@@ -21,7 +23,7 @@ export class MarkdownWidget
     ctx.fillStyle = this.background_color
     ctx.fillRect(15, y, width - 30, height)
 
-    ctx.strokeStyle = this.outline_color
+    ctx.strokeStyle = this.getOutlineColor(options.suppressPromotedOutline)
     ctx.strokeRect(15, y, width - 30, height)
 
     ctx.fillStyle = this.text_color
@@ -29,7 +31,7 @@ export class MarkdownWidget
     ctx.textAlign = 'center'
     ctx.textBaseline = 'middle'
 
-    const text = 'Markdown: Vue-only'
+    const text = `Markdown: ${t('widgets.node2only')}`
     ctx.fillText(text, width / 2, y + height / 2)
 
     Object.assign(ctx, {
diff --git a/src/lib/litegraph/src/widgets/MultiSelectWidget.ts b/src/lib/litegraph/src/widgets/MultiSelectWidget.ts
index 5535820f3b..ace3a71acc 100644
--- a/src/lib/litegraph/src/widgets/MultiSelectWidget.ts
+++ b/src/lib/litegraph/src/widgets/MultiSelectWidget.ts
@@ -1,3 +1,5 @@
+import { t } from '@/i18n'
+
 import type { IMultiSelectWidget } from '../types/widgets'
 import { BaseWidget } from './BaseWidget'
 import type { DrawWidgetOptions, WidgetEventOptions } from './BaseWidget'
@@ -21,7 +23,7 @@ export class MultiSelectWidget
     ctx.fillStyle = this.background_color
     ctx.fillRect(15, y, width - 30, height)
 
-    ctx.strokeStyle = this.outline_color
+    ctx.strokeStyle = this.getOutlineColor(options.suppressPromotedOutline)
     ctx.strokeRect(15, y, width - 30, height)
 
     ctx.fillStyle = this.text_color
@@ -29,7 +31,7 @@ export class MultiSelectWidget
     ctx.textAlign = 'center'
     ctx.textBaseline = 'middle'
 
-    const text = 'MultiSelect: Vue-only'
+    const text = `MultiSelect: ${t('widgets.node2only')}`
     ctx.fillText(text, width / 2, y + height / 2)
 
     Object.assign(ctx, {
diff --git a/src/lib/litegraph/src/widgets/NumberWidget.ts b/src/lib/litegraph/src/widgets/NumberWidget.ts
index 294bbb0b00..c142d8b4db 100644
--- a/src/lib/litegraph/src/widgets/NumberWidget.ts
+++ b/src/lib/litegraph/src/widgets/NumberWidget.ts
@@ -1,5 +1,5 @@
 import type { INumericWidget } from '@/lib/litegraph/src/types/widgets'
-import { getWidgetStep } from '@/lib/litegraph/src/utils/widget'
+import { evaluateInput, getWidgetStep } from '@/lib/litegraph/src/utils/widget'
 
 import { BaseSteppedWidget } from './BaseSteppedWidget'
 import type { WidgetEventOptions } from './BaseWidget'
@@ -68,19 +68,8 @@ export class NumberWidget
       'Value',
       this.value,
       (v: string) => {
-        // Check if v is a valid equation or a number
-        if (/^[\d\s()*+/-]+|\d+\.\d+$/.test(v)) {
-          // Solve the equation if possible
-          try {
-            v = eval(v)
-          } catch {
-            // Ignore eval errors
-          }
-        }
-        const newValue = Number(v)
-        if (!isNaN(newValue)) {
-          this.setValue(newValue, { e, node, canvas })
-        }
+        const parsed = evaluateInput(v)
+        if (parsed !== undefined) this.setValue(parsed, { e, node, canvas })
       },
       e
     )
diff --git a/src/lib/litegraph/src/widgets/PainterWidget.ts b/src/lib/litegraph/src/widgets/PainterWidget.ts
new file mode 100644
index 0000000000..65e97ec162
--- /dev/null
+++ b/src/lib/litegraph/src/widgets/PainterWidget.ts
@@ -0,0 +1,22 @@
+import type { IPainterWidget } from '../types/widgets'
+import { BaseWidget } from './BaseWidget'
+import type { DrawWidgetOptions, WidgetEventOptions } from './BaseWidget'
+
+/**
+ * Widget for the Painter node canvas drawing tool.
+ * This is a widget that only has a Vue widgets implementation.
+ */
+export class PainterWidget
+  extends BaseWidget<IPainterWidget>
+  implements IPainterWidget
+{
+  override type = 'painter' as const
+
+  drawWidget(ctx: CanvasRenderingContext2D, options: DrawWidgetOptions): void {
+    this.drawVueOnlyWarning(ctx, options, 'Painter')
+  }
+
+  onClick(_options: WidgetEventOptions): void {
+    // This is a widget that only has a Vue widgets implementation
+  }
+}
diff --git a/src/lib/litegraph/src/widgets/SelectButtonWidget.ts b/src/lib/litegraph/src/widgets/SelectButtonWidget.ts
index 463efe0896..4fff959017 100644
--- a/src/lib/litegraph/src/widgets/SelectButtonWidget.ts
+++ b/src/lib/litegraph/src/widgets/SelectButtonWidget.ts
@@ -1,3 +1,5 @@
+import { t } from '@/i18n'
+
 import type { ISelectButtonWidget } from '../types/widgets'
 import { BaseWidget } from './BaseWidget'
 import type { DrawWidgetOptions, WidgetEventOptions } from './BaseWidget'
@@ -21,7 +23,7 @@ export class SelectButtonWidget
     ctx.fillStyle = this.background_color
     ctx.fillRect(15, y, width - 30, height)
 
-    ctx.strokeStyle = this.outline_color
+    ctx.strokeStyle = this.getOutlineColor(options.suppressPromotedOutline)
     ctx.strokeRect(15, y, width - 30, height)
 
     ctx.fillStyle = this.text_color
@@ -29,7 +31,7 @@ export class SelectButtonWidget
     ctx.textAlign = 'center'
     ctx.textBaseline = 'middle'
 
-    const text = 'SelectButton: Vue-only'
+    const text = `SelectButton: ${t('widgets.node2only')}`
     ctx.fillText(text, width / 2, y + height / 2)
 
     Object.assign(ctx, {
diff --git a/src/lib/litegraph/src/widgets/SliderWidget.ts b/src/lib/litegraph/src/widgets/SliderWidget.ts
index 221837d0e3..434743ac47 100644
--- a/src/lib/litegraph/src/widgets/SliderWidget.ts
+++ b/src/lib/litegraph/src/widgets/SliderWidget.ts
@@ -20,7 +20,7 @@ export class SliderWidget
    */
   override drawWidget(
     ctx: CanvasRenderingContext2D,
-    { width, showText = true }: DrawWidgetOptions
+    { width, showText = true, suppressPromotedOutline }: DrawWidgetOptions
   ) {
     // Store original context attributes
     const { fillStyle, strokeStyle, textAlign } = ctx
@@ -43,7 +43,7 @@ export class SliderWidget
 
     // Draw outline if not disabled
     if (showText && !this.computedDisabled) {
-      ctx.strokeStyle = this.outline_color
+      ctx.strokeStyle = this.getOutlineColor(suppressPromotedOutline)
       ctx.strokeRect(margin, y, width - margin * 2, height)
     }
 
diff --git a/src/lib/litegraph/src/widgets/TextWidget.ts b/src/lib/litegraph/src/widgets/TextWidget.ts
index b485ca6f58..7d4046b83e 100644
--- a/src/lib/litegraph/src/widgets/TextWidget.ts
+++ b/src/lib/litegraph/src/widgets/TextWidget.ts
@@ -21,12 +21,13 @@ export class TextWidget
    */
   override drawWidget(
     ctx: CanvasRenderingContext2D,
-    { width, showText = true }: DrawWidgetOptions
+    options: DrawWidgetOptions
   ) {
+    const { width, showText = true } = options
     // Store original context attributes
     const { fillStyle, strokeStyle, textAlign } = ctx
 
-    this.drawWidgetShape(ctx, { width, showText })
+    this.drawWidgetShape(ctx, options)
 
     if (showText) {
       this.drawTruncatingText({ ctx, width, leftPadding: 0, rightPadding: 0 })
diff --git a/src/lib/litegraph/src/widgets/TextareaWidget.ts b/src/lib/litegraph/src/widgets/TextareaWidget.ts
index e93ee1c7e7..c6b83e13fd 100644
--- a/src/lib/litegraph/src/widgets/TextareaWidget.ts
+++ b/src/lib/litegraph/src/widgets/TextareaWidget.ts
@@ -3,8 +3,8 @@ import { BaseWidget } from './BaseWidget'
 import type { DrawWidgetOptions, WidgetEventOptions } from './BaseWidget'
 
 /**
- * Widget for multi-line text input
- * This is a widget that only has a Vue widgets implementation
+ * Widget for multi-line text input.
+ * This widget only has a Vue implementation.
  */
 export class TextareaWidget
   extends BaseWidget<ITextareaWidget>
@@ -13,35 +13,10 @@ export class TextareaWidget
   override type = 'textarea' as const
 
   drawWidget(ctx: CanvasRenderingContext2D, options: DrawWidgetOptions): void {
-    const { width } = options
-    const { y, height } = this
-
-    const { fillStyle, strokeStyle, textAlign, textBaseline, font } = ctx
-
-    ctx.fillStyle = this.background_color
-    ctx.fillRect(15, y, width - 30, height)
-
-    ctx.strokeStyle = this.outline_color
-    ctx.strokeRect(15, y, width - 30, height)
-
-    ctx.fillStyle = this.text_color
-    ctx.font = '11px monospace'
-    ctx.textAlign = 'center'
-    ctx.textBaseline = 'middle'
-
-    const text = 'Textarea: Vue-only'
-    ctx.fillText(text, width / 2, y + height / 2)
-
-    Object.assign(ctx, {
-      fillStyle,
-      strokeStyle,
-      textAlign,
-      textBaseline,
-      font
-    })
+    this.drawVueOnlyWarning(ctx, options, 'Textarea')
   }
 
   onClick(_options: WidgetEventOptions): void {
-    // This is a widget that only has a Vue widgets implementation
+    // This widget only has a Vue implementation
   }
 }
diff --git a/src/lib/litegraph/src/widgets/TreeSelectWidget.ts b/src/lib/litegraph/src/widgets/TreeSelectWidget.ts
index 23ad440a33..78586cb6ff 100644
--- a/src/lib/litegraph/src/widgets/TreeSelectWidget.ts
+++ b/src/lib/litegraph/src/widgets/TreeSelectWidget.ts
@@ -3,8 +3,8 @@ import { BaseWidget } from './BaseWidget'
 import type { DrawWidgetOptions, WidgetEventOptions } from './BaseWidget'
 
 /**
- * Widget for hierarchical tree selection
- * This is a widget that only has a Vue widgets implementation
+ * Widget for hierarchical tree selection.
+ * This widget only has a Vue implementation.
  */
 export class TreeSelectWidget
   extends BaseWidget<ITreeSelectWidget>
@@ -13,35 +13,10 @@ export class TreeSelectWidget
   override type = 'treeselect' as const
 
   drawWidget(ctx: CanvasRenderingContext2D, options: DrawWidgetOptions): void {
-    const { width } = options
-    const { y, height } = this
-
-    const { fillStyle, strokeStyle, textAlign, textBaseline, font } = ctx
-
-    ctx.fillStyle = this.background_color
-    ctx.fillRect(15, y, width - 30, height)
-
-    ctx.strokeStyle = this.outline_color
-    ctx.strokeRect(15, y, width - 30, height)
-
-    ctx.fillStyle = this.text_color
-    ctx.font = '11px monospace'
-    ctx.textAlign = 'center'
-    ctx.textBaseline = 'middle'
-
-    const text = 'TreeSelect: Vue-only'
-    ctx.fillText(text, width / 2, y + height / 2)
-
-    Object.assign(ctx, {
-      fillStyle,
-      strokeStyle,
-      textAlign,
-      textBaseline,
-      font
-    })
+    this.drawVueOnlyWarning(ctx, options, 'TreeSelect')
   }
 
   onClick(_options: WidgetEventOptions): void {
-    // This is a widget that only has a Vue widgets implementation
+    // This widget only has a Vue implementation
   }
 }
diff --git a/src/lib/litegraph/src/widgets/widgetMap.ts b/src/lib/litegraph/src/widgets/widgetMap.ts
index 0e6a34fe51..cdd24308d3 100644
--- a/src/lib/litegraph/src/widgets/widgetMap.ts
+++ b/src/lib/litegraph/src/widgets/widgetMap.ts
@@ -11,13 +11,18 @@ import { toClass } from '@/lib/litegraph/src/utils/type'
 import { AssetWidget } from './AssetWidget'
 import { BaseWidget } from './BaseWidget'
 import { BooleanWidget } from './BooleanWidget'
+import { BoundingBoxWidget } from './BoundingBoxWidget'
 import { ButtonWidget } from './ButtonWidget'
 import { ChartWidget } from './ChartWidget'
 import { ColorWidget } from './ColorWidget'
 import { ComboWidget } from './ComboWidget'
+import { CurveWidget } from './CurveWidget'
 import { FileUploadWidget } from './FileUploadWidget'
 import { GalleriaWidget } from './GalleriaWidget'
+import { GradientSliderWidget } from './GradientSliderWidget'
 import { ImageCompareWidget } from './ImageCompareWidget'
+import { PainterWidget } from './PainterWidget'
+import { ImageCropWidget } from './ImageCropWidget'
 import { KnobWidget } from './KnobWidget'
 import { LegacyWidget } from './LegacyWidget'
 import { MarkdownWidget } from './MarkdownWidget'
@@ -33,6 +38,7 @@ export type WidgetTypeMap = {
   button: ButtonWidget
   toggle: BooleanWidget
   slider: SliderWidget
+  gradientslider: GradientSliderWidget
   knob: KnobWidget
   combo: ComboWidget
   number: NumberWidget
@@ -50,6 +56,10 @@ export type WidgetTypeMap = {
   selectbutton: SelectButtonWidget
   textarea: TextareaWidget
   asset: AssetWidget
+  imagecrop: ImageCropWidget
+  boundingbox: BoundingBoxWidget
+  curve: CurveWidget
+  painter: PainterWidget
   [key: string]: BaseWidget
 }
 
@@ -88,6 +98,8 @@ export function toConcreteWidget<TWidget extends IWidget | IBaseWidget>(
       return toClass(BooleanWidget, narrowedWidget, node)
     case 'slider':
       return toClass(SliderWidget, narrowedWidget, node)
+    case 'gradientslider':
+      return toClass(GradientSliderWidget, narrowedWidget, node)
     case 'knob':
       return toClass(KnobWidget, narrowedWidget, node)
     case 'combo':
@@ -120,6 +132,14 @@ export function toConcreteWidget<TWidget extends IWidget | IBaseWidget>(
       return toClass(TextareaWidget, narrowedWidget, node)
     case 'asset':
       return toClass(AssetWidget, narrowedWidget, node)
+    case 'imagecrop':
+      return toClass(ImageCropWidget, narrowedWidget, node)
+    case 'boundingbox':
+      return toClass(BoundingBoxWidget, narrowedWidget, node)
+    case 'curve':
+      return toClass(CurveWidget, narrowedWidget, node)
+    case 'painter':
+      return toClass(PainterWidget, narrowedWidget, node)
     default: {
       if (wrapLegacyWidgets) return toClass(LegacyWidget, widget, node)
     }
@@ -133,7 +153,10 @@ export function isComboWidget(widget: IBaseWidget): widget is IComboWidget {
   return widget.type === 'combo'
 }
 
-/** Type guard: Narrow **from {@link IBaseWidget}** to {@link IAssetWidget}. */
+/**
+ * Type guard: Narrow **from {@link IBaseWidget}** to {@link IAssetWidget}.
+ * @knipIgnoreUnusedButUsedByCustomNodes
+ */
 export function isAssetWidget(widget: IBaseWidget): widget is IAssetWidget {
   return widget.type === 'asset'
 }
diff --git a/src/locales/CONTRIBUTING.md b/src/locales/CONTRIBUTING.md
index 3e05c10bce..1df16aa2d6 100644
--- a/src/locales/CONTRIBUTING.md
+++ b/src/locales/CONTRIBUTING.md
@@ -10,6 +10,7 @@
 ## Technical Process (Confirmed Working)
 
 ### Prerequisites
+
 - Node.js installed
 - Git/GitHub knowledge
 - OpenAI API key (optional - CI will handle translations)
@@ -19,6 +20,7 @@
 **Time required: ~10 minutes**
 
 #### 1.1 Update `.i18nrc.cjs`
+
 Add your language code to the `outputLocales` array:
 
 ```javascript
@@ -30,10 +32,11 @@ module.exports = defineConfig({
   'mask' is in the context of image processing.
   Note: For Traditional Chinese (Taiwan), use Taiwan-specific terminology and traditional characters.
   `
-});
+})
 ```
 
 #### 1.2 Update `src/constants/coreSettings.ts`
+
 Add your language to the dropdown options:
 
 ```typescript
@@ -56,6 +59,7 @@ Add your language to the dropdown options:
 ```
 
 #### 1.3 Update `src/i18n.ts`
+
 Add imports for your new language files:
 
 ```typescript
@@ -69,7 +73,7 @@ import zhTWSettings from './locales/zh-TW/settings.json'
 const messages = {
   en: buildLocale(en, enNodes, enCommands, enSettings),
   zh: buildLocale(zh, zhNodes, zhCommands, zhSettings),
-  'zh-TW': buildLocale(zhTW, zhTWNodes, zhTWCommands, zhTWSettings), // Add this line
+  'zh-TW': buildLocale(zhTW, zhTWNodes, zhTWCommands, zhTWSettings) // Add this line
   // ... other languages
 }
 ```
@@ -77,12 +81,14 @@ const messages = {
 ### Step 2: Generate Translation Files
 
 #### Option A: Local Generation (Optional)
+
 ```bash
 # Only if you have OpenAI API key configured
 pnpm locale
 ```
 
 #### Option B: Let CI Handle It (Recommended)
+
 - Create your PR with the configuration changes above
 - **Important**: Translation files will be generated during release PRs, not feature PRs
 - Empty JSON files are fine - they'll be populated during the next release workflow
@@ -96,6 +102,7 @@ pnpm dev        # Start development server
 ```
 
 **Testing checklist:**
+
 - [ ] Language appears in ComfyUI Settings > Locale dropdown
 - [ ] Can select the new language without errors
 - [ ] Partial translations display correctly
@@ -111,27 +118,32 @@ pnpm dev        # Start development server
 
 ## What Happens in CI
 
-Our automated translation workflow now runs on release PRs (version-bump-* branches) to improve development performance:
+Our automated translation workflow now runs on release PRs (version-bump-\* branches) to improve development performance:
 
 ### For Feature PRs (Regular Development)
+
 - **No automatic translations** - faster reviews and fewer conflicts
 - **English-only development** - new strings show in English until release
 - **Focus on functionality** - reviewers see only your actual changes
 
-### For Release PRs (version-bump-* branches)
+### For Release PRs (version-bump-\* branches)
+
 1. **Collects strings**: Scans the UI for translatable text
-2. **Updates English files**: Ensures all strings are captured  
+2. **Updates English files**: Ensures all strings are captured
 3. **Generates translations**: Uses OpenAI API to translate to all configured languages
 4. **Commits back**: Automatically updates the release PR with complete translations
 
 ### Manual Translation Updates
+
 If urgent translation updates are needed outside of releases, maintainers can:
+
 - Trigger the "Update Locales" workflow manually from GitHub Actions
 - The workflow supports manual dispatch for emergency translation updates
 
 ## File Structure
 
 Each language has 4 translation files:
+
 - `main.json` - Main UI text (~2000+ entries)
 - `commands.json` - Command descriptions (~200+ entries)
 - `settings.json` - Settings panel (~400+ entries)
@@ -147,20 +159,25 @@ Each language has 4 translation files:
 ## Common Issues & Solutions
 
 ### Issue: TypeScript errors on imports
+
 **Solution**: Ensure your language code matches exactly in all three files
 
 ### Issue: Empty translation files
+
 **Solution**: This is normal - CI will populate them when you create a PR
 
 ### Issue: Language not appearing in dropdown
+
 **Solution**: Check that the language code in `coreSettings.ts` matches your other files exactly
 
 ### Issue: Rate limits during local translation
+
 **Solution**: This is expected - let CI handle the translation generation
 
 ## Regional Variants
 
 For regional variants (like zh-TW for Taiwan), use:
+
 - **Language-region codes**: `zh-TW`, `pt-BR`, `en-US`
 - **Specific terminology**: Add region-specific context to the reference string
 - **Native display names**: Use the local language name in the dropdown
@@ -175,6 +192,7 @@ For regional variants (like zh-TW for Taiwan), use:
 ## Becoming a Language Maintainer
 
 After your language is added:
+
 1. **Get added to CODEOWNERS** for your language files
 2. **Review future PRs** affecting your language
 3. **Coordinate with other native speakers** for quality improvements
@@ -182,4 +200,4 @@ After your language is added:
 
 ---
 
-*This process was tested and confirmed working with Traditional Chinese (Taiwan) addition.*
\ No newline at end of file
+_This process was tested and confirmed working with Traditional Chinese (Taiwan) addition._
diff --git a/src/locales/README.md b/src/locales/README.md
index 047eed5656..786fc0ae95 100644
--- a/src/locales/README.md
+++ b/src/locales/README.md
@@ -18,14 +18,17 @@ Our project supports multiple languages using `vue-i18n`. This allows users arou
 Want to add a new language to ComfyUI? See our detailed [Contributing Guide](./CONTRIBUTING.md) with step-by-step instructions and confirmed working process.
 
 ### Quick Start
+
 1. Open an issue or reach out on Discord to request a new language
 2. Follow the [technical process](./CONTRIBUTING.md#technical-process-confirmed-working) or ask for help
 3. Our CI will automatically generate translations using OpenAI
 4. Become a maintainer for your language
 
 ### File Structure
+
 Each language has 4 translation files in `src/locales/[language-code]/`:
+
 - `main.json` - Main UI text
-- `commands.json` - Command descriptions  
+- `commands.json` - Command descriptions
 - `settings.json` - Settings panel
 - `nodeDefs.json` - Node definitions
diff --git a/src/locales/ar/commands.json b/src/locales/ar/commands.json
index 79e3e9ebaa..004d47ae28 100644
--- a/src/locales/ar/commands.json
+++ b/src/locales/ar/commands.json
@@ -1,6 +1,42 @@
 {
+  "Comfy-Desktop_CheckForUpdates": {
+    "label": "التحقق من التحديثات"
+  },
+  "Comfy-Desktop_Folders_OpenCustomNodesFolder": {
+    "label": "فتح مجلد العقد المخصصة"
+  },
+  "Comfy-Desktop_Folders_OpenInputsFolder": {
+    "label": "فتح مجلد المدخلات"
+  },
+  "Comfy-Desktop_Folders_OpenLogsFolder": {
+    "label": "فتح مجلد السجلات"
+  },
+  "Comfy-Desktop_Folders_OpenModelConfig": {
+    "label": "فتح extra_model_paths.yaml"
+  },
+  "Comfy-Desktop_Folders_OpenModelsFolder": {
+    "label": "فتح مجلد النماذج"
+  },
+  "Comfy-Desktop_Folders_OpenOutputsFolder": {
+    "label": "فتح مجلد المخرجات"
+  },
+  "Comfy-Desktop_OpenDevTools": {
+    "label": "فتح أدوات المطور"
+  },
+  "Comfy-Desktop_OpenUserGuide": {
+    "label": "دليل مستخدم سطح المكتب"
+  },
+  "Comfy-Desktop_Quit": {
+    "label": "خروج"
+  },
+  "Comfy-Desktop_Reinstall": {
+    "label": "إعادة التثبيت"
+  },
+  "Comfy-Desktop_Restart": {
+    "label": "إعادة التشغيل"
+  },
   "Comfy_3DViewer_Open3DViewer": {
-    "label": "فتح عارض ثلاثي الأبعاد (بيتا) للعقدة المحددة"
+    "label": "افتح عارض ثلاثي الأبعاد (تجريبي) للعقدة المحددة"
   },
   "Comfy_BrowseModelAssets": {
     "label": "تجريبي: تصفح أصول النماذج"
@@ -8,6 +44,9 @@
   "Comfy_BrowseTemplates": {
     "label": "تصفح القوالب"
   },
+  "Comfy_Canvas_CopySelected": {
+    "label": "نسخ"
+  },
   "Comfy_Canvas_DeleteSelectedItems": {
     "label": "حذف العناصر المحددة"
   },
@@ -29,12 +68,18 @@
   "Comfy_Canvas_MoveSelectedNodes_Up": {
     "label": "تحريك العقد المحددة للأعلى"
   },
+  "Comfy_Canvas_PasteFromClipboard": {
+    "label": "لصق"
+  },
   "Comfy_Canvas_ResetView": {
     "label": "إعادة تعيين العرض"
   },
   "Comfy_Canvas_Resize": {
     "label": "تغيير حجم العقد المحددة"
   },
+  "Comfy_Canvas_SelectAll": {
+    "label": "تحديد الكل"
+  },
   "Comfy_Canvas_ToggleLinkVisibility": {
     "label": "تبديل رؤية الروابط في اللوحة"
   },
@@ -155,18 +200,30 @@
   "Comfy_Manager_ShowUpdateAvailablePacks": {
     "label": "التحقق من تحديثات العقد المخصصة"
   },
-  "Comfy_Manager_ToggleManagerProgressDialog": {
-    "label": "تبديل شريط تقدم مدير العقد المخصصة"
-  },
   "Comfy_MaskEditor_BrushSize_Decrease": {
     "label": "تقليل حجم الفرشاة في محرر القناع"
   },
   "Comfy_MaskEditor_BrushSize_Increase": {
     "label": "زيادة حجم الفرشاة في محرر القناع"
   },
+  "Comfy_MaskEditor_ColorPicker": {
+    "label": "فتح منتقي الألوان في محرر القناع"
+  },
+  "Comfy_MaskEditor_Mirror_Horizontal": {
+    "label": "انعكاس أفقي في محرر القناع"
+  },
+  "Comfy_MaskEditor_Mirror_Vertical": {
+    "label": "انعكاس عمودي في محرر القناع"
+  },
   "Comfy_MaskEditor_OpenMaskEditor": {
     "label": "فتح محرر القناع للعقدة المحددة"
   },
+  "Comfy_MaskEditor_Rotate_Left": {
+    "label": "تدوير لليسار في محرر القناع"
+  },
+  "Comfy_MaskEditor_Rotate_Right": {
+    "label": "تدوير لليمين في محرر القناع"
+  },
   "Comfy_Memory_UnloadModels": {
     "label": "تفريغ النماذج"
   },
@@ -197,12 +254,18 @@
   "Comfy_QueueSelectedOutputNodes": {
     "label": "إدراج عقد الإخراج المحددة في قائمة الانتظار"
   },
+  "Comfy_Queue_ToggleOverlay": {
+    "label": "تبديل سجل المهام"
+  },
   "Comfy_Redo": {
     "label": "إعادة"
   },
   "Comfy_RefreshNodeDefinitions": {
     "label": "تحديث تعريفات العقد"
   },
+  "Comfy_RenameWorkflow": {
+    "label": "إعادة تسمية سير العمل"
+  },
   "Comfy_SaveWorkflow": {
     "label": "حفظ سير العمل"
   },
@@ -212,6 +275,12 @@
   "Comfy_ShowSettingsDialog": {
     "label": "عرض نافذة الإعدادات"
   },
+  "Comfy_Subgraph_SetDescription": {
+    "label": "تعيين وصف الرسم البياني الفرعي"
+  },
+  "Comfy_Subgraph_SetSearchAliases": {
+    "label": "تعيين الأسماء المستعارة للبحث في الرسم البياني الفرعي"
+  },
   "Comfy_ToggleAssetAPI": {
     "label": "تجريبي: تمكين AssetAPI"
   },
@@ -221,6 +290,12 @@
   "Comfy_ToggleHelpCenter": {
     "label": "مركز المساعدة"
   },
+  "Comfy_ToggleLinear": {
+    "label": "تبديل الوضع الخطي"
+  },
+  "Comfy_ToggleQPOV2": {
+    "label": "تبديل لوحة قائمة الانتظار V2"
+  },
   "Comfy_ToggleTheme": {
     "label": "تبديل النمط (فاتح/داكن)"
   },
@@ -269,6 +344,10 @@
   "Workspace_ToggleFocusMode": {
     "label": "تبديل وضع التركيز"
   },
+  "Workspace_ToggleSidebarTab_apps": {
+    "label": "تبديل الشريط الجانبي للتطبيقات",
+    "tooltip": "التطبيقات"
+  },
   "Workspace_ToggleSidebarTab_assets": {
     "label": "تبديل الشريط الجانبي للأصول",
     "tooltip": "الأصول"
diff --git a/src/locales/ar/main.json b/src/locales/ar/main.json
index 42c60facd5..cae46116a1 100644
--- a/src/locales/ar/main.json
+++ b/src/locales/ar/main.json
@@ -1,6 +1,8 @@
 {
   "actionbar": {
-    "dockToTop": "إلصق بالأعلى"
+    "dockToTop": "إلصق بالأعلى",
+    "feedback": "ملاحظات",
+    "feedbackTooltip": "إرسال ملاحظات"
   },
   "apiNodesCostBreakdown": {
     "costPerRun": "التكلفة لكل تشغيل",
@@ -14,26 +16,175 @@
   "assetBrowser": {
     "allCategory": "جميع {category}",
     "allModels": "جميع النماذج",
+    "apiKeyHint": "تستورد نماذج خاصة أو محمية؟ {link}.",
+    "apiKeyHintLink": "أضف مفاتيح API الخاصة بك في الإعدادات",
     "ariaLabel": {
       "assetCard": "{name} - أصل {type}",
       "loadingAsset": "جاري تحميل الأصل"
     },
+    "assetCollection": "مجموعة الأصول",
     "assets": "الأصول",
+    "baseModel": "النموذج الأساسي",
     "baseModels": "النماذج الأساسية",
     "browseAssets": "تصفح الأصول",
+    "byType": "حسب النوع",
+    "checkpoints": "نقاط التحقق",
+    "civitaiLinkExample": "{example} {link}",
+    "civitaiLinkExampleStrong": "مثال:",
+    "civitaiLinkExampleUrl": "https://civitai.com/models/10706/luisap-z-image-and-qwen-pixel-art-refiner?modelVersionId=2225295",
+    "civitaiLinkLabel": "رابط {download} نموذج Civitai",
+    "civitaiLinkLabelDownload": "تنزيل",
+    "civitaiLinkPlaceholder": "الصق الرابط هنا",
+    "confirmModelDetails": "تأكيد تفاصيل النموذج",
     "connectionError": "يرجى التحقق من اتصالك والمحاولة مرة أخرى",
+    "deletion": {
+      "body": "سيتم حذف هذا النموذج نهائيًا من مكتبتك.",
+      "complete": "تم حذف {assetName}.",
+      "failed": "تعذر حذف {assetName}.",
+      "header": "حذف هذا النموذج؟",
+      "inProgress": "جاري حذف {assetName}..."
+    },
+    "download": {
+      "complete": "اكتمل التنزيل",
+      "failed": "فشل التنزيل",
+      "inProgress": "جاري تنزيل {assetName}..."
+    },
+    "emptyImported": {
+      "canImport": "لا توجد نماذج مستوردة بعد. انقر على \"استيراد نموذج\" لإضافة نموذجك الخاص.",
+      "restricted": "النماذج الشخصية متاحة فقط لمستوى Creator وما فوق."
+    },
+    "errorAccessForbidden": "تم رفض الوصول إلى هذا المورد.",
+    "errorConnectionRefused": "تعذر الاتصال بالمصدر. يرجى المحاولة لاحقًا.",
+    "errorDownloadCancelled": "تم إلغاء التنزيل.",
+    "errorFileTooLarge": "الملف يتجاوز الحد الأقصى المسموح به للحجم",
+    "errorFormatNotAllowed": "يسمح فقط بصيغة SafeTensor",
+    "errorHttpError": "حدث خطأ أثناء جلب البيانات الوصفية.",
+    "errorInternalError": "حدث خطأ غير متوقع. يرجى المحاولة مرة أخرى.",
+    "errorInvalidHost": "تعذر حل اسم مضيف عنوان URL للمصدر.",
+    "errorInvalidUrl": "يرجى إدخال عنوان URL.",
+    "errorInvalidUrlFormat": "تنسيق عنوان URL غير صالح. يرجى التحقق والمحاولة مرة أخرى.",
+    "errorMetadataFetchFailed": "فشل في جلب معلومات الملف من المصدر.",
+    "errorModelTypeNotSupported": "نوع النموذج هذا غير مدعوم",
+    "errorNetworkError": "حدث خطأ في الشبكة. يرجى التحقق من الاتصال والمحاولة مرة أخرى.",
+    "errorNetworkTimeout": "انتهت مهلة الطلب. يرجى المحاولة مرة أخرى.",
+    "errorRateLimited": "عدد كبير جدًا من الطلبات. يرجى المحاولة بعد بضع دقائق.",
+    "errorRequestCancelled": "تم إلغاء الطلب.",
+    "errorResourceNotFound": "لم يتم العثور على الملف. يرجى التحقق من عنوان URL والمحاولة مرة أخرى.",
+    "errorServiceUnavailable": "الخدمة غير متوفرة مؤقتًا. يرجى المحاولة لاحقًا.",
+    "errorSourceServerError": "الخادم المصدر يواجه مشاكل. يرجى المحاولة لاحقًا.",
+    "errorUnauthorized": "يرجى تسجيل الدخول للمتابعة.",
+    "errorUnauthorizedSource": "هذا المورد يتطلب المصادقة. يرجى إضافة رمز API الخاص بك في الإعدادات.",
+    "errorUnknown": "حدث خطأ غير متوقع",
+    "errorUnsafePickleScan": "اكتشف CivitAI رمزًا غير آمن محتملًا في هذا الملف",
+    "errorUnsafeVirusScan": "اكتشف CivitAI برمجيات خبيثة أو محتوى مشبوه في هذا الملف",
+    "errorUnsupportedSource": "هذا العنوان غير مدعوم. فقط عناوين Hugging Face وCivitai مسموحة.",
+    "errorUploadFailed": "فشل في استيراد الأصل. يرجى المحاولة مرة أخرى.",
+    "errorUserTokenAccessDenied": "رمز API الخاص بك لا يملك صلاحية الوصول إلى هذا المورد. يرجى التحقق من أذونات الرمز.",
+    "errorUserTokenInvalid": "رمز API المخزن غير صالح أو منتهي الصلاحية. يرجى تحديث الرمز في الإعدادات.",
     "failedToCreateNode": "فشل إنشاء العقدة. يرجى المحاولة مرة أخرى أو التحقق من وحدة التحكم للحصول على التفاصيل.",
     "fileFormats": "تنسيقات الملفات",
+    "fileName": "اسم الملف",
+    "fileSize": "حجم الملف",
+    "filterBy": "تصفية حسب",
+    "findInLibrary": "ابحث عنه في قسم {type} من مكتبة النماذج.",
+    "finish": "إنهاء",
+    "genericLinkPlaceholder": "الصق الرابط هنا",
+    "importAnother": "استيراد آخر",
+    "imported": "مستوردة",
+    "invalidAsset": "عنصر غير صالح",
+    "invalidAssetDetail": "تعذر التحقق من صحة العنصر المحدد. يرجى المحاولة مرة أخرى.",
+    "invalidFilename": "اسم ملف غير صالح",
+    "invalidFilenameDetail": "تعذر تحديد اسم ملف العنصر. يرجى المحاولة مرة أخرى.",
+    "jobId": "معرّف المهمة",
     "loadingModels": "جارٍ تحميل {type}...",
+    "maxFileSize": "الحد الأقصى لحجم الملف: {size}",
+    "maxFileSizeValue": "1 جيجابايت",
+    "media": {
+      "audioPlaceholder": "صوت",
+      "threeDModelPlaceholder": "نموذج ثلاثي الأبعاد"
+    },
+    "modelAssociatedWithLink": "النموذج المرتبط بالرابط الذي قدمته:",
+    "modelInfo": {
+      "addBaseModel": "أضف نموذجًا أساسيًا...",
+      "addTag": "أضف وسمًا...",
+      "additionalTags": "وسوم إضافية",
+      "baseModelUnknown": "النموذج الأساسي غير معروف",
+      "basicInfo": "معلومات أساسية",
+      "compatibleBaseModels": "نماذج أساسية متوافقة",
+      "description": "الوصف",
+      "descriptionNotSet": "لم يتم تعيين وصف",
+      "descriptionPlaceholder": "أضف وصفًا لهذا النموذج...",
+      "displayName": "اسم العرض",
+      "editDisplayName": "تعديل اسم العرض",
+      "fileName": "اسم الملف",
+      "modelDescription": "وصف النموذج",
+      "modelTagging": "تصنيف النموذج",
+      "modelType": "نوع النموذج",
+      "noAdditionalTags": "لا توجد وسوم إضافية",
+      "selectModelPrompt": "اختر نموذجًا لعرض معلوماته",
+      "selectModelType": "اختر نوع النموذج...",
+      "source": "المصدر",
+      "title": "معلومات النموذج",
+      "triggerPhrases": "عبارات التفعيل",
+      "viewOnSource": "عرض على {source}"
+    },
+    "modelName": "اسم النموذج",
+    "modelNamePlaceholder": "أدخل اسمًا لهذا النموذج",
+    "modelTypeSelectorLabel": "ما نوع هذا النموذج؟",
+    "modelTypeSelectorPlaceholder": "اختر نوع النموذج",
+    "modelUploaded": "تم استيراد النموذج بنجاح.",
     "noAssetsFound": "لم يتم العثور على أصول",
     "noModelsInFolder": "لا توجد {type} متاحة في هذا المجلد",
+    "noResultsCanImport": "حاول تعديل البحث أو عوامل التصفية.\nيمكنك أيضًا إضافة النماذج باستخدام زر \"استيراد\" أعلاه.",
+    "noValidSourceDetected": "لم يتم اكتشاف مصدر استيراد صالح",
+    "notSureLeaveAsIs": "لست متأكدًا؟ فقط اتركه كما هو",
+    "onlyCivitaiUrlsSupported": "يتم دعم روابط Civitai فقط",
+    "ownership": "الملكية",
+    "ownershipAll": "الكل",
+    "ownershipMyModels": "نماذجي",
+    "ownershipPublicModels": "نماذج عامة",
+    "processingModel": "بدأ التنزيل",
+    "processingModelDescription": "يمكنك إغلاق هذه النافذة. سيستمر التنزيل في الخلفية.",
+    "providerCivitai": "Civitai",
+    "providerHuggingFace": "Hugging Face",
+    "rename": {
+      "failed": "تعذر إعادة تسمية الأصل."
+    },
+    "selectFrameworks": "اختر الأطر",
+    "selectModelType": "اختر نوع النموذج",
+    "selectProjects": "اختر المشاريع",
     "sortAZ": "أ-ي",
     "sortBy": "ترتيب حسب",
+    "sortDefault": "الافتراضي",
     "sortPopular": "الأكثر شعبية",
     "sortRecent": "الأحدث",
     "sortZA": "ي-أ",
+    "sortingType": "نوع الفرز",
+    "tags": "الوسوم",
+    "tagsHelp": "افصل بين الوسوم بفواصل",
+    "tagsPlaceholder": "مثال: نماذج، نقطة تحقق",
     "tryAdjustingFilters": "حاول تعديل البحث أو المرشحات",
-    "unknown": "غير معروف"
+    "unknown": "غير معروف",
+    "unsupportedUrlSource": "يتم دعم الروابط فقط من {sources}",
+    "upgradeFeatureDescription": "هذه الميزة متاحة فقط في خطط Creator أو Pro.",
+    "upgradeToUnlockFeature": "قم بالترقية لفتح هذه الميزة",
+    "upload": "استيراد",
+    "uploadFailed": "فشل الاستيراد",
+    "uploadModel": "استيراد",
+    "uploadModelDescription1": "الصق رابط تنزيل نموذج Civitai لإضافته إلى مكتبتك.",
+    "uploadModelDescription1Generic": "الصق رابط تنزيل النموذج لإضافته إلى مكتبتك.",
+    "uploadModelDescription2": "يتم دعم الروابط فقط من {link} في الوقت الحالي",
+    "uploadModelDescription2Generic": "يتم دعم الروابط فقط من المزودين التاليين:",
+    "uploadModelDescription2Link": "https://civitai.com/models",
+    "uploadModelDescription3": "الحد الأقصى لحجم الملف: {size}",
+    "uploadModelFailedToRetrieveMetadata": "فشل في جلب البيانات الوصفية. يرجى التحقق من الرابط والمحاولة مرة أخرى.",
+    "uploadModelFromCivitai": "استيراد نموذج من Civitai",
+    "uploadModelGeneric": "استيراد نموذج",
+    "uploadModelHelpFooterText": "تحتاج مساعدة في العثور على الروابط؟ انقر على أحد المزودين أدناه لمشاهدة فيديو تعليمي.",
+    "uploadModelHelpVideo": "فيديو مساعدة استيراد النموذج",
+    "uploadModelHowDoIFindThis": "كيف أجد هذا؟",
+    "uploadSuccess": "تم استيراد النموذج بنجاح!",
+    "uploadingModel": "جاري استيراد النموذج..."
   },
   "auth": {
     "apiKey": {
@@ -55,13 +206,7 @@
       "whitelistInfo": "حول المواقع غير المدرجة في القائمة البيضاء"
     },
     "deleteAccount": {
-      "cancel": "إلغاء",
-      "confirm": "حذف الحساب",
-      "confirmMessage": "هل أنت متأكد أنك تريد حذف حسابك؟ لا يمكن التراجع عن هذا الإجراء وسيتم حذف جميع بياناتك نهائيًا.",
-      "confirmTitle": "حذف الحساب",
-      "deleteAccount": "حذف الحساب",
-      "success": "تم حذف الحساب",
-      "successDetail": "تم حذف حسابك بنجاح."
+      "contactSupport": "لحذف حسابك، يرجى التواصل مع {email}"
     },
     "errors": {
       "auth/cancelled-popup-request": "تم إلغاء تسجيل الدخول. يرجى المحاولة مرة أخرى.",
@@ -80,6 +225,7 @@
     "login": {
       "andText": "و",
       "backToLogin": "العودة إلى تسجيل الدخول",
+      "backToSocialLogin": "سجّل باستخدام Google أو Github بدلاً من ذلك",
       "confirmPasswordLabel": "تأكيد كلمة المرور",
       "confirmPasswordPlaceholder": "أدخل نفس كلمة المرور مرة أخرى",
       "didntReceiveEmail": "لم تستلم البريد الإلكتروني؟ اتصل بنا على",
@@ -88,6 +234,9 @@
       "failed": "فشل تسجيل الدخول",
       "forgotPassword": "هل نسيت كلمة المرور؟",
       "forgotPasswordError": "فشل في إرسال بريد إعادة تعيين كلمة المرور",
+      "freeTierBadge": "مؤهل للخطة المجانية",
+      "freeTierDescription": "سجّل باستخدام Google للحصول على {credits} رصيد مجاني كل شهر. لا حاجة لبطاقة.",
+      "freeTierDescriptionGeneric": "سجّل باستخدام Google للحصول على رصيد مجاني كل شهر. لا حاجة لبطاقة.",
       "insecureContextWarning": "هذا الاتصال غير آمن (HTTP) - قد يتم اعتراض بيانات اعتمادك من قبل المهاجمين إذا تابعت تسجيل الدخول.",
       "loginButton": "تسجيل الدخول",
       "loginWithGithub": "تسجيل الدخول باستخدام Github",
@@ -106,11 +255,13 @@
       "sendResetLink": "إرسال رابط إعادة التعيين",
       "signInOrSignUp": "تسجيل الدخول / إنشاء حساب",
       "signUp": "إنشاء حساب",
+      "signUpFreeTierPromo": "جديد هنا؟ {signUp} باستخدام Google للحصول على {credits} رصيد مجاني كل شهر.",
       "success": "تم تسجيل الدخول بنجاح",
       "termsLink": "شروط الاستخدام",
       "termsText": "بالنقر على \"التالي\" أو \"إنشاء حساب\"، فإنك توافق على",
       "title": "تسجيل الدخول إلى حسابك",
       "useApiKey": "مفتاح API الخاص بـ Comfy",
+      "useEmailInstead": "استخدم البريد الإلكتروني بدلاً من ذلك",
       "userAvatar": "صورة المستخدم"
     },
     "loginButton": {
@@ -130,11 +281,14 @@
     "signOut": {
       "signOut": "تسجيل الخروج",
       "success": "تم تسجيل الخروج بنجاح",
-      "successDetail": "لقد تم تسجيل خروجك من حسابك."
+      "successDetail": "لقد تم تسجيل خروجك من حسابك.",
+      "unsavedChangesMessage": "لديك تغييرات غير محفوظة ستفقد عند تسجيل الخروج. هل ترغب في المتابعة؟",
+      "unsavedChangesTitle": "تغييرات غير محفوظة"
     },
     "signup": {
       "alreadyHaveAccount": "هل لديك حساب بالفعل؟",
       "emailLabel": "البريد الإلكتروني",
+      "emailNotEligibleForFreeTier": "التسجيل بالبريد الإلكتروني غير مؤهل للخطة المجانية.",
       "emailPlaceholder": "أدخل بريدك الإلكتروني",
       "passwordLabel": "كلمة المرور",
       "passwordPlaceholder": "أدخل كلمة مرور جديدة",
@@ -147,12 +301,68 @@
       "title": "إنشاء حساب"
     }
   },
+  "batch": {
+    "index": "{current} / {total}"
+  },
+  "billingOperation": {
+    "subscriptionFailed": "فشل تحديث الاشتراك",
+    "subscriptionProcessing": "جارٍ معالجة الدفع — يتم إعداد مساحة العمل...",
+    "subscriptionSuccess": "تم تحديث الاشتراك بنجاح",
+    "subscriptionTimeout": "انتهت مهلة التحقق من الاشتراك",
+    "topupFailed": "فشل شحن الرصيد",
+    "topupProcessing": "جارٍ معالجة الدفع — يتم إضافة الرصيد...",
+    "topupSuccess": "تمت إضافة الرصيد بنجاح",
+    "topupTimeout": "انتهت مهلة التحقق من شحن الرصيد"
+  },
+  "boundingBox": {
+    "height": "الارتفاع",
+    "width": "العرض",
+    "x": "س",
+    "y": "ص"
+  },
   "breadcrumbsMenu": {
     "clearWorkflow": "مسح سير العمل",
     "deleteBlueprint": "حذف المخطط",
     "deleteWorkflow": "حذف سير العمل",
     "duplicate": "تكرار",
-    "enterNewName": "أدخل اسمًا جديدًا"
+    "enterAppMode": "الدخول إلى وضع التطبيق",
+    "enterBuilderMode": "دخول وضع بناء التطبيق",
+    "enterNewName": "أدخل اسمًا جديدًا",
+    "exitAppMode": "الخروج من وضع التطبيق",
+    "missingNodesWarning": "يحتوي سير العمل على عقد غير مدعومة (مظللة باللون الأحمر).",
+    "workflowActions": "إجراءات سير العمل"
+  },
+  "builderMenu": {
+    "exitAppBuilder": "الخروج من مُنشئ التطبيق"
+  },
+  "builderToolbar": {
+    "app": "تطبيق",
+    "appDescription": "يفتح كتطبيق بشكل افتراضي",
+    "arrange": "معاينة",
+    "arrangeDescription": "مراجعة تخطيط التطبيق",
+    "connectOutput": "توصيل مخرج",
+    "connectOutputBody1": "يجب توصيل مخرج واحد على الأقل قبل حفظ التطبيق.",
+    "connectOutputBody2": "انتقل إلى خطوة 'تحديد' وانقر على عقد المخرجات لإضافتها هنا.",
+    "defaultModeAppliedAppBody": "سيفتح سير العمل هذا في وضع التطبيق بشكل افتراضي من الآن فصاعدًا.",
+    "defaultModeAppliedAppPrompt": "هل ترغب في عرضه الآن؟",
+    "defaultModeAppliedGraphBody": "سيفتح سير العمل هذا كـمخطط عقد بشكل افتراضي من الآن فصاعدًا.",
+    "defaultModeAppliedGraphPrompt": "هل ترغب في عرض التطبيق مع ذلك؟",
+    "defaultModeAppliedTitle": "تم التعيين بنجاح",
+    "defaultView": "تعيين العرض الافتراضي",
+    "defaultViewDescription": "اختر كيفية الفتح",
+    "defaultViewLabel": "افتراضيًا، سيتم فتح سير العمل هذا كـ:",
+    "defaultViewTitle": "تعيين العرض الافتراضي لهذا سير العمل",
+    "emptyWorkflowPrompt": "هل ترغب في البدء بقالب؟",
+    "emptyWorkflowTitle": "لا يحتوي سير العمل هذا على أي عقد",
+    "inputs": "المدخلات",
+    "inputsDescription": "اختر المدخلات",
+    "label": "منشئ التطبيقات",
+    "nodeGraph": "رسم العقد",
+    "nodeGraphDescription": "يفتح كرسم عقد بشكل افتراضي",
+    "outputs": "المخرجات",
+    "outputsDescription": "اختر المخرجات",
+    "switchToOutputs": "الانتقال إلى المخرجات",
+    "viewApp": "عرض التطبيق"
   },
   "clipboard": {
     "errorMessage": "فشل النسخ إلى الحافظة",
@@ -206,6 +416,7 @@
     },
     "retry": "حاول مرة أخرى",
     "retrying": "إعادة المحاولة...",
+    "skipToCloudApp": "تخطي إلى تطبيق السحابة",
     "start": {
       "desc": "لا حاجة لإعداد مسبق. يعمل على أي جهاز.",
       "download": "تنزيل ComfyUI",
@@ -339,6 +550,8 @@
     "Edit Subgraph Widgets": "تعديل عناصر الرسم البياني الفرعي",
     "Expand": "توسيع",
     "Expand Node": "توسيع العقدة",
+    "Extensions": "الإضافات",
+    "FavoriteWidget": "إضافة إلى المفضلة",
     "Horizontal": "أفقي",
     "Inputs": "المدخلات",
     "Left": "يسار",
@@ -358,6 +571,7 @@
     "Remove": "إزالة",
     "Remove Bypass": "إزالة التجاوز",
     "Rename": "إعادة تسمية",
+    "RenameWidget": "إعادة تسمية الأداة",
     "Resize": "تغيير الحجم",
     "Right": "يمين",
     "Run Branch": "تشغيل الفرع",
@@ -368,6 +582,7 @@
     "Shapes": "الأشكال",
     "Title": "العنوان",
     "Top": "أعلى",
+    "UnfavoriteWidget": "إزالة من المفضلة",
     "Unpack Subgraph": "فك الرسم البياني الفرعي",
     "Unpin": "إلغاء التثبيت",
     "Vertical": "عمودي",
@@ -381,6 +596,7 @@
     "additionalInfo": "معلومات إضافية",
     "apiPricing": "أسعار API",
     "credits": "الرصيد",
+    "creditsAvailable": "الرصيد المتاح",
     "details": "التفاصيل",
     "eventType": "نوع الحدث",
     "faqs": "الأسئلة المتكررة",
@@ -389,15 +605,47 @@
     "messageSupport": "مراسلة الدعم",
     "model": "النموذج",
     "purchaseCredits": "شراء رصيد",
+    "refreshes": "يتم التحديث في {date}",
     "time": "الوقت",
     "topUp": {
+      "addMoreCredits": "إضافة المزيد من الرصيد",
+      "addMoreCreditsToRun": "أضف المزيد من الرصيد للتشغيل",
+      "amountToPayLabel": "المبلغ المطلوب دفعه بالدولار",
+      "buy": "شراء",
+      "buyCredits": "المتابعة للدفع",
       "buyNow": "اشترِ الآن",
+      "contactUs": "اتصل بنا",
+      "creditsDescription": "يتم استخدام الرصيد لتشغيل سير العمل أو عقد الشركاء.",
+      "creditsPerDollar": "أرصدة لكل دولار",
+      "creditsToReceiveLabel": "الأرصدة المستلمة",
+      "howManyCredits": "كم رصيد ترغب في إضافته؟",
       "insufficientMessage": "ليس لديك رصيد كافٍ لتشغيل هذا الإجراء.",
       "insufficientTitle": "رصيد غير كافٍ",
+      "insufficientWorkflowMessage": "ليس لديك رصيد كافٍ لتشغيل هذا سير العمل.",
+      "maxAllowed": "الحد الأقصى {credits} أرصدة.",
       "maxAmount": "(الحد الأقصى 1000 دولار أمريكي)",
+      "maximumAmount": "الحد الأقصى ${amount}.",
+      "minRequired": "الحد الأدنى {credits} أرصدة",
+      "minimumPurchase": "الحد الأدنى ${amount} ({credits} أرصدة)",
+      "needMore": "تحتاج المزيد؟",
+      "purchaseError": "فشل الشراء",
+      "purchaseErrorDetail": "فشل شراء الرصيد: {error}",
+      "purchaseSuccess": "تمت إضافة الرصيد بنجاح!",
       "quickPurchase": "شراء سريع",
       "seeDetails": "عرض التفاصيل",
-      "topUp": "شحن الرصيد"
+      "selectAmount": "اختر المبلغ",
+      "templateNote": "*تم الإنشاء باستخدام قالب Wan Fun Control",
+      "topUp": "شحن الرصيد",
+      "unknownError": "حدث خطأ غير معروف",
+      "usdAmount": "${amount} دولار أمريكي",
+      "videosEstimate": "~{count} فيديو",
+      "viewPricing": "عرض تفاصيل التسعير",
+      "youGet": "أرصدة",
+      "youPay": "المبلغ (دولار أمريكي)"
+    },
+    "unified": {
+      "message": "تم توحيد الرصيد",
+      "tooltip": "لقد قمنا بتوحيد المدفوعات عبر Comfy. كل شيء يعمل الآن على رصيد Comfy:\n- عقد الشركاء (كانت تُسمى سابقًا عقد API)\n- سير العمل السحابي\n\nتم تحويل رصيد عقد الشركاء الحالي إلى رصيد."
     },
     "yourCreditBalance": "رصيدك الحالي"
   },
@@ -408,13 +656,26 @@
     "AUDIO_ENCODER_OUTPUT": "مخرجات مُشَفِّر الصوت",
     "AUDIO_RECORD": "تسجيل صوتي",
     "BOOLEAN": "منطقي",
+    "BOUNDING_BOX": "مربع التحديد",
     "CAMERA_CONTROL": "تحكم الكاميرا",
     "CLIP": "CLIP",
     "CLIP_VISION": "رؤية CLIP",
     "CLIP_VISION_OUTPUT": "خرج رؤية CLIP",
+    "COLOR": "لون",
     "COMBO": "تركيب",
+    "COMFY_AUTOGROW_V3": "COMFY_AUTOGROW_V3",
+    "COMFY_DYNAMICCOMBO_V3": "COMFY_DYNAMICCOMBO_V3",
+    "COMFY_MATCHTYPE_V3": "COMFY_MATCHTYPE_V3",
     "CONDITIONING": "تكييف",
     "CONTROL_NET": "ControlNet",
+    "ELEVENLABS_VOICE": "ELEVENLABS_VOICE",
+    "FILE_3D": "ملف ثلاثي الأبعاد",
+    "FILE_3D_FBX": "ملف FBX ثلاثي الأبعاد",
+    "FILE_3D_GLB": "ملف GLB ثلاثي الأبعاد",
+    "FILE_3D_GLTF": "ملف GLTF ثلاثي الأبعاد",
+    "FILE_3D_OBJ": "ملف OBJ ثلاثي الأبعاد",
+    "FILE_3D_STL": "ملف STL ثلاثي الأبعاد",
+    "FILE_3D_USDZ": "ملف USDZ ثلاثي الأبعاد",
     "FLOAT": "رقم عشري",
     "FLOATS": "أرقام عشرية",
     "GEMINI_INPUT_FILES": "ملفات إدخال جيميني",
@@ -423,9 +684,11 @@
     "HOOKS": "معالجات",
     "HOOK_KEYFRAMES": "مفاتيح المعالجات",
     "IMAGE": "صورة",
+    "IMAGECOMPARE": "مقارنة الصور",
     "INT": "عدد صحيح",
     "LATENT": "كامِن",
     "LATENT_OPERATION": "عملية كامنة",
+    "LATENT_UPSCALE_MODEL": "نموذج تكبير latent",
     "LOAD3D_CAMERA": "كاميرا ثلاثية الأبعاد",
     "LOAD_3D": "تحميل ثلاثي الأبعاد",
     "LORA_MODEL": "نموذج لورا",
@@ -434,6 +697,8 @@
     "LUMA_REF": "مرجع Luma",
     "MASK": "قناع",
     "MESH": "شبكة",
+    "MESHY_RIGGED_TASK_ID": "MESHY_RIGGED_TASK_ID",
+    "MESHY_TASK_ID": "MESHY_TASK_ID",
     "MODEL": "نموذج",
     "MODEL_PATCH": "ترقيع النموذج",
     "MODEL_TASK_ID": "معرّف مهمة النموذج",
@@ -442,6 +707,7 @@
     "OPENAI_INPUT_FILES": "ملفات إدخال أوبن إيه آي",
     "PHOTOMAKER": "صانع الصور",
     "PIXVERSE_TEMPLATE": "قالب PixVerse",
+    "POSE_KEYPOINT": "نقطة مفتاحية للوضعية",
     "RECRAFT_COLOR": "لون Recraft",
     "RECRAFT_CONTROLS": "عناصر تحكم Recraft",
     "RECRAFT_V3_STYLE": "نمط Recraft V3",
@@ -453,6 +719,7 @@
     "STYLE_MODEL": "نموذج النمط",
     "SVG": "SVG",
     "TIMESTEPS_RANGE": "نطاق خطوات الزمن",
+    "TRACKS": "مسارات",
     "UPSCALE_MODEL": "نموذج التكبير",
     "VAE": "VAE",
     "VIDEO": "فيديو",
@@ -511,24 +778,84 @@
     "noStackTrace": "لا توجد تتبع للمكدس متاحة",
     "promptExecutionError": "فشل تنفيذ الطلب"
   },
+  "errorOverlay": {
+    "errorCount": "{count} أخطاء | {count} خطأ | {count} أخطاء",
+    "seeErrors": "عرض الأخطاء"
+  },
+  "essentials": {
+    "batchImage": "معالجة صور دفعة واحدة",
+    "canny": "كانّي",
+    "cannyToImage": "تحويل كانّي إلى صورة",
+    "cannyToVideo": "تحويل كانّي إلى فيديو",
+    "cropImage": "قص الصورة",
+    "depthToImage": "تحويل العمق إلى صورة",
+    "depthToVideo": "تحويل العمق إلى فيديو",
+    "extractFrame": "استخراج إطار",
+    "imageCompare": "مقارنة الصور",
+    "imageTo3DModel": "تحويل الصورة إلى نموذج ثلاثي الأبعاد",
+    "imageToImage": "تحويل صورة إلى صورة",
+    "imageToVideo": "تحويل صورة إلى فيديو",
+    "inpaintImage": "ترميم الصورة",
+    "invert": "عكس",
+    "lipsync": "مزامنة الشفاه",
+    "load3DModel": "تحميل نموذج ثلاثي الأبعاد",
+    "loadAudio": "تحميل صوت",
+    "loadImage": "تحميل صورة",
+    "loadStyleLora": "تحميل نمط (LoRA)",
+    "loadVideo": "تحميل فيديو",
+    "musicGeneration": "توليد موسيقى",
+    "outpaintImage": "توسيع الصورة",
+    "poseToImage": "تحويل وضعية إلى صورة",
+    "poseToVideo": "تحويل وضعية إلى فيديو",
+    "removeBackground": "إزالة الخلفية",
+    "resizeImage": "تغيير حجم الصورة",
+    "rotate": "تدوير",
+    "save3DModel": "حفظ نموذج ثلاثي الأبعاد",
+    "saveAudio": "حفظ صوت",
+    "saveImage": "حفظ صورة",
+    "saveVideo": "حفظ فيديو",
+    "text": "نص",
+    "textGenerationLLM": "توليد نص (LLM)",
+    "textTo3DModel": "تحويل النص إلى نموذج ثلاثي الأبعاد",
+    "textToImage": "تحويل نص إلى صورة",
+    "textToVideo": "تحويل نص إلى فيديو"
+  },
+  "exportToast": {
+    "allExportsCompleted": "اكتملت جميع عمليات التصدير",
+    "downloadExport": "تحميل التصدير",
+    "downloadFailed": "فشل تحميل \"{name}\"",
+    "exportCompleted": "تحميل ZIP جاهز",
+    "exportError": "فشل التصدير",
+    "exportFailed": "{count} فشل في التصدير | {count} فشل في التصدير | {count} عمليات تصدير فشلت",
+    "exportFailedSingle": "فشل إنشاء تصدير ZIP",
+    "exportStarted": "يتم تجهيز تحميل ZIP...",
+    "exportingAssets": "جاري تصدير العناصر",
+    "noExportsInQueue": "لا يوجد {filter} عمليات تصدير في قائمة الانتظار",
+    "preparingExport": "جاري تجهيز التصدير...",
+    "retryDownload": "إعادة محاولة التحميل"
+  },
   "g": {
     "1x": "1x",
     "2x": "2x",
     "about": "حول",
     "add": "إضافة",
+    "addNode": "إضافة عقدة...",
     "addNodeFilterCondition": "إضافة شرط لتصفية العقد",
     "all": "الكل",
     "amount": "الكمية",
     "apply": "تطبيق",
     "architecture": "الهندسة المعمارية",
+    "asset": "{count} أصل | {count} أصل | {count} أصول",
     "audioFailedToLoad": "فشل تحميل الصوت",
     "audioProgress": "تقدم الصوت",
     "author": "المؤلف",
     "back": "رجوع",
+    "batchRename": "إعادة تسمية جماعية",
     "beta": "نسخة تجريبية",
     "bookmark": "حفظ في المكتبة",
     "calculatingDimensions": "جارٍ حساب الأبعاد",
     "cancel": "إلغاء",
+    "cancelled": "أُلغي",
     "capture": "التقاط",
     "category": "الفئة",
     "chart": "مخطط",
@@ -538,6 +865,8 @@
     "clearAll": "مسح الكل",
     "clearFilters": "مسح الفلاتر",
     "close": "إغلاق",
+    "closeDialog": "إغلاق الحوار",
+    "collapseAll": "طي الكل",
     "color": "اللون",
     "comfy": "Comfy",
     "comfyOrgLogoAlt": "شعار ComfyOrg",
@@ -546,6 +875,7 @@
     "commandProhibited": "الأمر {command} محظور. يرجى التواصل مع المسؤول لمزيد من المعلومات.",
     "community": "المجتمع",
     "completed": "اكتمل",
+    "completedWithCheckmark": "اكتمل ✓",
     "confirm": "تأكيد",
     "confirmed": "تم التأكيد",
     "content": "محتوى",
@@ -554,48 +884,73 @@
     "control_before_generate": "التحكم قبل التوليد",
     "copied": "تم النسخ",
     "copy": "نسخ",
+    "copyAll": "نسخ الكل",
     "copyJobId": "نسخ معرف المهمة",
     "copyToClipboard": "نسخ إلى الحافظة",
     "copyURL": "نسخ الرابط",
+    "core": "النواة",
     "currentUser": "المستخدم الحالي",
+    "custom": "مخصص",
     "customBackground": "خلفية مخصصة",
     "customize": "تخصيص",
     "customizeFolder": "تخصيص المجلد",
+    "decrement": "إنقاص",
     "defaultBanner": "لافتة افتراضية",
     "delete": "حذف",
     "deleteAudioFile": "حذف ملف الصوت",
     "deleteImage": "حذف الصورة",
     "deprecated": "مهمل",
     "description": "الوصف",
+    "devOnly": "للمطورين فقط",
     "devices": "الأجهزة",
     "disableAll": "تعطيل الكل",
+    "disableSelected": "تعطيل المحدد",
+    "disableThirdParty": "تعطيل الطرف الثالث",
     "disabling": "جارٍ التعطيل",
+    "disconnectedFromBackend": "تم قطع الاتصال بالخادم الخلفي. يرجى التحقق مما إذا كان الخادم يعمل.",
     "dismiss": "تجاهل",
     "download": "تنزيل",
+    "downloadAudio": "تنزيل الصوت",
     "downloadImage": "تنزيل الصورة",
     "downloadVideo": "تنزيل الفيديو",
+    "downloadWithSize": "تنزيل ({size})",
+    "downloading": "جارٍ التحميل",
     "dropYourFileOr": "أسقط ملفك أو",
     "duplicate": "تكرار",
     "edit": "تعديل",
     "editImage": "تحرير الصورة",
     "editOrMaskImage": "تعديل أو إخفاء الصورة",
+    "emDash": "—",
     "empty": "فارغ",
     "enableAll": "تمكين الكل",
     "enableOrDisablePack": "تفعيل أو تعطيل الحزمة",
+    "enableSelected": "تفعيل المحدد",
     "enabled": "ممكّن",
     "enabling": "جارٍ التمكين",
+    "enter": "إدخال",
+    "enterBaseName": "أدخل الاسم الأساسي",
+    "enterNewName": "أدخل الاسم الجديد",
+    "enterNewNamePrompt": "أدخل اسمًا جديدًا:",
+    "enterSubgraph": "دخول الرسم البياني الفرعي",
     "error": "خطأ",
     "errorLoadingImage": "حدث خطأ أثناء تحميل الصورة",
     "errorLoadingVideo": "حدث خطأ أثناء تحميل الفيديو",
+    "essentials": "الأساسيات",
+    "expandAll": "توسيع الكل",
     "experimental": "تجريبي",
     "export": "تصدير",
     "extensionName": "اسم الامتداد",
+    "extensions": "الملحقات",
+    "failed": "فشل",
     "failedToCopyJobId": "فشل نسخ معرف المهمة",
     "failedToDownloadImage": "فشل في تنزيل الصورة",
     "failedToDownloadVideo": "فشل في تنزيل الفيديو",
+    "favorites": "المفضلة",
     "feedback": "ملاحظات",
     "file": "ملف",
     "filter": "تصفية",
+    "filterBy": "تصفية حسب:",
+    "filterByType": "تصفية حسب {type}...",
     "findIssues": "العثور على مشاكل",
     "frameNodes": "تأطير العقد",
     "frontendNewer": "إصدار الواجهة الأمامية {frontendVersion} قد لا يكون متوافقاً مع الإصدار الخلفي {backendVersion}.",
@@ -605,23 +960,32 @@
     "goToNode": "الانتقال إلى العقدة",
     "graphNavigation": "التنقل في الرسم البياني",
     "halfSpeed": "0.5x",
+    "hideLeftPanel": "إخفاء اللوحة اليسرى",
+    "hideRightPanel": "إخفاء اللوحة اليمنى",
     "icon": "أيقونة",
+    "imageDoesNotExist": "الصورة غير موجودة",
     "imageFailedToLoad": "فشل تحميل الصورة",
     "imagePreview": "معاينة الصورة - استخدم مفاتيح الأسهم للتنقل بين الصور",
     "imageUrl": "رابط الصورة",
     "import": "استيراد",
     "inProgress": "جارٍ التنفيذ",
+    "inSubgraph": "في الرسم البياني الفرعي '{name}'",
+    "increment": "زيادة",
     "info": "معلومات العقدة",
+    "input": "إدخال",
     "insert": "إدراج",
     "install": "تثبيت",
     "installed": "مثبت",
     "installing": "جارٍ التثبيت",
     "interrupted": "تمت المقاطعة",
     "itemSelected": "تم تحديد عنصر واحد",
+    "itemsCopiedToClipboard": "تم نسخ العناصر إلى الحافظة",
     "itemsSelected": "تم تحديد {selectedCount} عناصر",
+    "job": "مهمة",
     "jobIdCopied": "تم نسخ معرف المهمة إلى الحافظة",
     "keybinding": "اختصار لوحة المفاتيح",
     "keybindingAlreadyExists": "الاختصار موجود بالفعل في",
+    "keybindings": "اختصارات لوحة المفاتيح",
     "learnMore": "اعرف المزيد",
     "listening": "جاري الاستماع...",
     "liveSamplingPreview": "معاينة أخذ العينات المباشرة",
@@ -632,18 +996,24 @@
     "login": "تسجيل الدخول",
     "logoAlt": "شعار ComfyUI",
     "logs": "السجلات",
+    "manageExtensions": "إدارة الإضافات",
     "markdown": "ماركداون",
     "micPermissionDenied": "تم رفض إذن الميكروفون",
     "migrate": "ترحيل",
     "missing": "مفقود",
+    "more": "المزيد",
     "moreOptions": "خيارات إضافية",
     "moreWorkflows": "المزيد من سير العمل",
+    "mostRelevant": "الأكثر صلة",
     "multiSelectDropdown": "قائمة منسدلة متعددة الاختيار",
     "name": "الاسم",
     "newFolder": "مجلد جديد",
     "next": "التالي",
+    "nightly": "NIGHTLY",
     "no": "لا",
     "noAudioRecorded": "لم يتم تسجيل أي صوت",
+    "noItems": "لا توجد عناصر",
+    "noResults": "لا توجد نتائج",
     "noResultsFound": "لم يتم العثور على نتائج",
     "noTasksFound": "لم يتم العثور على مهام",
     "noTasksFoundMessage": "لا توجد مهام في قائمة الانتظار.",
@@ -654,26 +1024,49 @@
     "nodeSlotsError": "خطأ في فتحات العقدة",
     "nodeWidgetsError": "خطأ في عناصر واجهة العقدة",
     "nodes": "العُقَد",
+    "nodesCount": "{count} عقدة | {count} عقدة | {count} عقدة",
     "nodesRunning": "العُقَد قيد التشغيل",
     "none": "لا شيء",
+    "nothingToCopy": "لا يوجد ما يمكن نسخه",
+    "nothingToDelete": "لا يوجد ما يمكن حذفه",
+    "nothingToDuplicate": "لا يوجد ما يمكن نسخه",
+    "nothingToRename": "لا يوجد ما يمكن إعادة تسميته",
     "ok": "موافق",
     "openManager": "فتح المدير",
     "openNewIssue": "فتح مشكلة جديدة",
+    "or": "أو",
+    "output": "إخراج",
     "overwrite": "الكتابة فوق",
+    "partner": "شريك",
+    "playPause": "تشغيل/إيقاف مؤقت",
     "playRecording": "تشغيل التسجيل",
     "playbackSpeed": "سرعة التشغيل",
     "playing": "جاري التشغيل",
     "pressKeysForNewBinding": "اضغط على المفاتيح لربط جديد",
     "preview": "معاينة",
+    "profile": "الملف الشخصي",
     "progressCountOf": "من",
+    "queued": "في قائمة الانتظار",
     "ready": "جاهز",
+    "recents": "الأخيرة",
     "reconnected": "تم الاتصال من جديد",
     "reconnecting": "إعادة الاتصال",
     "refresh": "تحديث",
     "refreshNode": "تحديث العقدة",
+    "relativeTime": {
+      "daysAgo": "منذ {count} يوم",
+      "hoursAgo": "منذ {count} ساعة",
+      "minutesAgo": "منذ {count} دقيقة",
+      "monthsAgo": "منذ {count} شهر",
+      "now": "الآن",
+      "weeksAgo": "منذ {count} أسبوع",
+      "yearsAgo": "منذ {count} سنة"
+    },
     "releaseTitle": "إصدار {package} {version}",
     "reloadToApplyChanges": "أعد التحميل لتطبيق التغييرات",
+    "remove": "إزالة",
     "removeImage": "إزالة الصورة",
+    "removeTag": "إزالة الوسم",
     "removeVideo": "إزالة الفيديو",
     "rename": "إعادة تسمية",
     "reportIssue": "إرسال تقرير",
@@ -688,21 +1081,32 @@
     "resizeFromTopRight": "تغيير الحجم من الزاوية اليمنى العلوية",
     "restart": "إعادة التشغيل",
     "resultsCount": "تم العثور على {count} نتيجة",
+    "running": "يعمل",
     "save": "حفظ",
     "saving": "جارٍ الحفظ",
+    "scrollLeft": "التمرير لليسار",
+    "scrollRight": "التمرير لليمين",
     "search": "بحث",
     "searchExtensions": "بحث في الامتدادات",
     "searchFailedMessage": "لم نتمكن من العثور على أي إعدادات تطابق بحثك. حاول تعديل كلمات البحث.",
     "searchKeybindings": "بحث في اختصارات المفاتيح",
     "searchModels": "بحث في النماذج",
     "searchNodes": "بحث في العقد",
+    "searchPlaceholder": "بحث...",
     "searchSettings": "بحث في الإعدادات",
     "searchWorkflows": "بحث في سير العمل",
     "seeTutorial": "شاهد الدليل",
+    "selectItemsToCopy": "حدد العناصر للنسخ",
+    "selectItemsToDelete": "حدد العناصر للحذف",
+    "selectItemsToDuplicate": "حدد العناصر لعمل نسخة",
+    "selectItemsToRename": "حدد العناصر لإعادة التسمية",
     "selectedFile": "الملف المحدد",
     "setAsBackground": "تعيين كخلفية",
     "settings": "الإعدادات",
+    "shortcutSuffix": " ({shortcut})",
+    "showLeftPanel": "إظهار اللوحة اليسرى",
     "showReport": "عرض التقرير",
+    "showRightPanel": "إظهار اللوحة اليمنى",
     "singleSelectDropdown": "قائمة منسدلة اختيار واحد",
     "sort": "فرز",
     "source": "المصدر",
@@ -710,19 +1114,24 @@
     "status": "الحالة",
     "stopPlayback": "إيقاف التشغيل",
     "stopRecording": "إيقاف التسجيل",
+    "submit": "إرسال",
     "success": "نجاح",
     "systemInfo": "معلومات النظام",
     "terminal": "الطرفية",
     "title": "العنوان",
     "triggerPhrase": "عبارة التشغيل",
     "unknownError": "خطأ غير معروف",
+    "unknownFile": "ملف غير معروف",
+    "untitled": "بدون عنوان",
     "update": "تحديث",
     "updateAvailable": "تحديث متاح",
     "updateFrontend": "تحديث الواجهة الأمامية",
     "updated": "تم التحديث",
     "updating": "جارٍ التحديث",
     "upload": "رفع",
+    "uploadAlreadyInProgress": "الرفع جارٍ بالفعل",
     "usageHint": "تلميح الاستخدام",
+    "use": "استخدم",
     "user": "المستخدم",
     "versionMismatchWarning": "تحذير توافق الإصدارات",
     "versionMismatchWarningMessage": "{warning}: {detail} زر https://docs.comfy.org/installation/update_comfyui#common-update-issues للحصول على تعليمات التحديث.",
@@ -730,11 +1139,10 @@
     "videoPreview": "معاينة الفيديو - استخدم مفاتيح الأسهم للتنقل بين الفيديوهات",
     "viewImageOfTotal": "عرض الصورة {index} من {total}",
     "viewVideoOfTotal": "عرض الفيديو {index} من {total}",
-    "vitePreloadErrorMessage": "تم إصدار نسخة جديدة من التطبيق. هل ترغب في إعادة التحميل؟\nإذا لم تفعل، قد لا تعمل بعض أجزاء التطبيق كما هو متوقع.\nيمكنك رفض وحفظ تقدمك قبل إعادة التحميل.",
-    "vitePreloadErrorTitle": "إصدار جديد متاح",
     "volume": "مستوى الصوت",
     "warning": "تحذير",
-    "workflow": "سير العمل"
+    "workflow": "سير العمل",
+    "you": "أنت"
   },
   "graphCanvasMenu": {
     "fitView": "ملائمة العرض",
@@ -756,11 +1164,17 @@
     "create": "إنشاء عقدة مجموعة",
     "enterName": "أدخل الاسم"
   },
+  "help": {
+    "helpCenterMenu": "قائمة مركز المساعدة",
+    "recentReleases": "الإصدارات الأخيرة"
+  },
   "helpCenter": {
     "clickToLearnMore": "اضغط لتعرف المزيد →",
     "desktopUserGuide": "دليل مستخدم سطح المكتب",
     "docs": "الوثائق",
+    "feedback": "إرسال ملاحظات",
     "github": "GitHub",
+    "help": "المساعدة والدعم",
     "loadingReleases": "جارٍ تحميل الإصدارات...",
     "managerExtension": "المدير الموسع",
     "more": "المزيد...",
@@ -769,6 +1183,12 @@
     "recentReleases": "الإصدارات الحديثة",
     "reinstall": "إعادة التثبيت",
     "updateAvailable": "تحديث",
+    "updateComfyUI": "تحديث ComfyUI",
+    "updateComfyUIFailed": "فشل تحديث ComfyUI. يرجى المحاولة مرة أخرى.",
+    "updateComfyUIStarted": "بدأ التحديث",
+    "updateComfyUIStartedDetail": "تمت إضافة تحديث ComfyUI إلى قائمة الانتظار. يرجى الانتظار...",
+    "updateComfyUISuccess": "اكتمل التحديث",
+    "updateComfyUISuccessDetail": "تم تحديث ComfyUI. جارٍ إعادة التشغيل...",
     "whatsNew": "ما الجديد؟"
   },
   "icon": {
@@ -782,6 +1202,24 @@
     "inbox": "الوارد",
     "star": "نجمة"
   },
+  "imageCompare": {
+    "batchLabelA": "أ: ",
+    "batchLabelB": "ب: ",
+    "noImages": "لا توجد صور للمقارنة"
+  },
+  "imageCrop": {
+    "cropPreviewAlt": "معاينة الاقتصاص",
+    "custom": "مخصص",
+    "loading": "جارٍ التحميل...",
+    "lockRatio": "تثبيت النسبة",
+    "noInputImage": "لا توجد صورة إدخال متصلة",
+    "ratio": "النسبة",
+    "unlockRatio": "إلغاء تثبيت النسبة"
+  },
+  "importFailed": {
+    "copyError": "خطأ في النسخ",
+    "title": "فشل الاستيراد"
+  },
   "install": {
     "appDataLocationTooltip": "دليل بيانات تطبيق ComfyUI. يحتوي على:\n- السجلات\n- إعدادات الخادم",
     "appPathLocationTooltip": "دليل أصول تطبيق ComfyUI. يحتوي على كود وأصول ComfyUI",
@@ -795,6 +1233,8 @@
     "failedToSelectDirectory": "فشل في اختيار الدليل",
     "gpu": "وحدة معالجة الرسومات (GPU)",
     "gpuPicker": {
+      "amdDescription": "استخدم بطاقة AMD GPU الخاصة بك مع تسريع ROCm™ لأفضل أداء.",
+      "amdSubtitle": "AMD ROCm™",
       "appleMetalDescription": "يستفيد من وحدة معالجة الرسومات في جهاز Mac الخاص بك لسرعة أكبر وتجربة أفضل بشكل عام",
       "cpuDescription": "استخدم وضع المعالج لضمان التوافق عندما لا تتوفر تسريع GPU",
       "cpuSubtitle": "وضع المعالج",
@@ -821,6 +1261,8 @@
       "selectGpuDescription": "اختر نوع وحدة معالجة الرسومات التي تملكها"
     },
     "helpImprove": "يرجى المساعدة في تحسين ComfyUI",
+    "insideAppInstallDir": "هذا المجلد داخل حزمة تطبيق ComfyUI Desktop وسيتم حذفه أثناء التحديثات. اختر مجلدًا خارج مجلد التثبيت، مثل Documents/ComfyUI.",
+    "insideUpdaterCache": "هذا المجلد داخل ذاكرة التخزين المؤقت لمحدث ComfyUI، والتي يتم مسحها في كل تحديث. اختر موقعًا مختلفًا لبياناتك.",
     "installLocation": "موقع التثبيت",
     "installLocationDescription": "اختر الدليل الخاص ببيانات مستخدم ComfyUI. سيتم تثبيت بيئة بايثون في الموقع المحدد.",
     "installLocationTooltip": "دليل بيانات مستخدم ComfyUI. يحتوي على:\n- بيئة بايثون\n- النماذج\n- العقد المخصصة\n",
@@ -895,6 +1337,66 @@
   "issueReport": {
     "helpFix": "المساعدة في الإصلاح"
   },
+  "linearMode": {
+    "appModeToolbar": {
+      "appBuilder": "منشئ التطبيقات",
+      "apps": "التطبيقات",
+      "appsEmptyMessage": "سيتم عرض التطبيقات المحفوظة هنا.\nانقر أدناه لبناء تطبيقك الأول.",
+      "enterAppMode": "الدخول إلى وضع التطبيق"
+    },
+    "arrange": {
+      "atLeastOne": "عقدة واحدة على الأقل",
+      "connectAtLeastOne": "قم بتوصيل {atLeastOne} عقدة مخرجات حتى يتمكن المستخدمون من رؤية النتائج بعد التشغيل.",
+      "noOutputs": "لم تتم إضافة أي مخرجات بعد",
+      "outputExamples": "أمثلة: 'حفظ صورة' أو 'حفظ فيديو'",
+      "outputs": "المخرجات",
+      "resultsLabel": "سيتم عرض النتائج الناتجة من عقدة/عقد المخرجات المحددة هنا بعد تشغيل هذا التطبيق",
+      "switchToOutputs": "انتقل إلى خطوة 'المخرجات' وانقر على عقد المخرجات لإضافتها هنا.",
+      "switchToOutputsButton": "الانتقال إلى المخرجات"
+    },
+    "backToWorkflow": "العودة إلى سير العمل",
+    "beta": "وضع التطبيق تجريبي - أرسل ملاحظاتك",
+    "builder": {
+      "exit": "خروج من البناء",
+      "exitConfirmMessage": "لديك تغييرات غير محفوظة ستفقد\nهل تريد الخروج بدون حفظ؟",
+      "exitConfirmTitle": "الخروج من بناء التطبيق؟",
+      "inputsDesc": "سيتفاعل المستخدمون مع هذه المدخلات ويعدلونها لإنشاء النتائج.",
+      "inputsExample": "أمثلة: \"تحميل صورة\"، \"موجه نصي\"، \"خطوات\"",
+      "noInputs": "لم تتم إضافة أي مدخلات بعد",
+      "noOutputs": "لم تتم إضافة أي عقد إخراج بعد",
+      "outputsDesc": "وصل عقدة إخراج واحدة على الأقل حتى يتمكن المستخدمون من رؤية النتائج بعد التشغيل.",
+      "outputsExample": "أمثلة: \"حفظ صورة\" أو \"حفظ فيديو\"",
+      "promptAddInputs": "انقر على معلمات العقدة لإضافتها هنا كمدخلات",
+      "promptAddOutputs": "انقر على عقد الإخراج لإضافتها هنا. هذه ستكون النتائج المُولدة.",
+      "title": "وضع بناء التطبيق",
+      "unknownWidget": "عنصر الواجهة غير مرئي"
+    },
+    "downloadAll": "تنزيل الكل",
+    "dragAndDropImage": "اسحب وأسقط صورة",
+    "emptyWorkflowExplanation": "سير العمل الخاص بك فارغ. تحتاج إلى بعض العقد أولاً لبدء بناء التطبيق.",
+    "enterNodeGraph": "دخول مخطط العقد",
+    "giveFeedback": "إعطاء ملاحظات",
+    "graphMode": "وضع الرسم البياني",
+    "linearMode": "وضع التطبيق",
+    "loadTemplate": "تحميل قالب",
+    "mobileControls": "تعديل وتشغيل",
+    "queue": {
+      "clear": "مسح قائمة الانتظار",
+      "clickToClear": "انقر لمسح قائمة الانتظار"
+    },
+    "rerun": "تشغيل مجدد",
+    "reuseParameters": "إعادة استخدام المعلمات",
+    "runCount": "عدد مرات التشغيل:",
+    "viewJob": "عرض المهمة",
+    "welcome": {
+      "buildApp": "إنشاء تطبيق",
+      "controls": "تظهر المخرجات في الأسفل، وعناصر التحكم على اليمين. كل شيء آخر يبقى بعيدًا.",
+      "getStarted": "انقر على {runButton} للبدء.",
+      "message": "عرض مبسط يخفي رسم العقد حتى تتمكن من التركيز على الإنشاء.",
+      "sharing": "المشاركة سهلة: أنشئ سير العمل الخاص بك، افتح وضع التطبيق، انقر بزر الماوس الأيمن على علامة التبويب، ثم صدّر. عندما يفتح الآخرون ملفك، سيتم تشغيله مباشرة في هذا العرض النظيف. يمكنك مشاركة سير عمل قوي كأداة بسيطة دون الحاجة لفهم مخططات العقد.",
+      "title": "مرحبًا بك في وضع التطبيق"
+    }
+  },
   "load3d": {
     "applyingTexture": "جارٍ تطبيق الخامة...",
     "backgroundColor": "لون الخلفية",
@@ -921,20 +1423,24 @@
       "lineart": "الرسم الخطي",
       "normal": "عادي",
       "original": "أصلي",
+      "pointCloud": "سحابة نقطية",
       "wireframe": "إطار سلكي"
     },
     "model": "النموذج",
     "openIn3DViewer": "افتح في عارض ثلاثي الأبعاد",
+    "panoramaMode": "وضع البانوراما",
     "previewOutput": "معاينة المخرج",
     "reloadingModel": "جاري إعادة تحميل النموذج...",
     "removeBackgroundImage": "إزالة صورة الخلفية",
     "resizeNodeMatchOutput": "تغيير حجم العقدة لتتناسب مع المخرج",
     "scene": "المشهد",
     "showGrid": "عرض الشبكة",
+    "showSkeleton": "إظهار الهيكل العظمي",
     "startRecording": "بدء التسجيل",
     "stopRecording": "إيقاف التسجيل",
     "switchCamera": "تبديل الكاميرا",
     "switchingMaterialMode": "جارٍ تبديل وضع المادة...",
+    "tiledMode": "وضع التجانب",
     "unsupportedFileType": "نوع الملف غير مدعوم (يدعم .gltf و .glb و .obj و .fbx و .stl)",
     "upDirection": "اتجاه الأعلى",
     "upDirections": {
@@ -955,6 +1461,11 @@
       "title": "عارض ثلاثي الأبعاد (بيتا)"
     }
   },
+  "loadWorkflowWarning": {
+    "coreNodesFromVersion": "العقد الأساسية من الإصدار {version}:",
+    "outdatedVersion": "تم إنشاء سير العمل هذا باستخدام إصدار أحدث من ComfyUI ({version}). قد لا تعمل بعض العقد بشكل صحيح.",
+    "outdatedVersionGeneric": "تم إنشاء سير العمل هذا باستخدام إصدار أحدث من ComfyUI. قد لا تعمل بعض العقد بشكل صحيح."
+  },
   "maintenance": {
     "None": "لا شيء",
     "OK": "حسنًا",
@@ -973,11 +1484,21 @@
     "showManual": "عرض مهام الصيانة",
     "status": "الحالة",
     "terminalDefaultMessage": "عند تشغيل أمر استكشاف الأخطاء، سيتم عرض أي مخرجات هنا.",
-    "title": "الصيانة"
+    "title": "الصيانة",
+    "unsafeMigration": {
+      "action": "استخدم مهمة الصيانة \"المسار الأساسي\" أدناه لنقل ComfyUI إلى موقع آمن.",
+      "appInstallDir": "مسارك الأساسي داخل حزمة تطبيق ComfyUI Desktop. قد يتم حذف هذا المجلد أو الكتابة فوقه أثناء التحديثات. اختر دليلاً خارج مجلد التثبيت، مثل Documents/ComfyUI.",
+      "generic": "مسار ComfyUI الأساسي الحالي في موقع قد يتم حذفه أو تعديله أثناء التحديثات. لتجنب فقدان البيانات، انقله إلى مجلد آمن.",
+      "oneDrive": "مسارك الأساسي على OneDrive، مما قد يسبب مشاكل في المزامنة وفقدان البيانات عن طريق الخطأ. اختر مجلدًا محليًا غير مُدار بواسطة OneDrive.",
+      "title": "تم اكتشاف موقع تثبيت غير آمن",
+      "updaterCache": "مسارك الأساسي داخل ذاكرة التخزين المؤقت لمحدث ComfyUI، والتي يتم مسحها في كل تحديث. اختر موقعًا مختلفًا لبياناتك."
+    }
   },
   "manager": {
+    "actions": "الإجراءات",
     "allMissingNodesInstalled": "تم تثبيت جميع العقد المفقودة بنجاح",
     "applyChanges": "تطبيق التغييرات",
+    "basicInfo": "معلومات أساسية",
     "changingVersion": "تغيير الإصدار من {from} إلى {to}",
     "clickToFinishSetup": "انقر",
     "conflicts": {
@@ -1013,6 +1534,28 @@
     "disabledNodesWontUpdate": "العقد المعطلة لن يتم تحديثها",
     "discoverCommunityContent": "استكشف حزم العقد والامتدادات والمزيد من إبداعات المجتمع...",
     "downloads": "التنزيلات",
+    "emptyState": {
+      "allInstalled": {
+        "message": "لم تقم بتثبيت أي إضافات بعد.",
+        "title": "لا توجد إضافات مثبتة"
+      },
+      "conflicting": {
+        "message": "جميع إضافاتك متوافقة.",
+        "title": "لا توجد تعارضات"
+      },
+      "missing": {
+        "message": "جميع العقد المطلوبة مثبتة.",
+        "title": "لا توجد عقد مفقودة"
+      },
+      "updateAvailable": {
+        "message": "جميع إضافاتك محدّثة.",
+        "title": "كل شيء محدّث"
+      },
+      "workflow": {
+        "message": "هذا سير العمل لا يستخدم أي عقدة إضافة.",
+        "title": "لا توجد إضافات في سير العمل"
+      }
+    },
     "enablePackToChangeVersion": "فعّل هذه الحزمة لتغيير الإصدارات",
     "errorConnecting": "خطأ في الاتصال بسجل عقد Comfy.",
     "extensionsSuccessfullyInstalled": "تم تثبيت الإضافات بنجاح وهي جاهزة للاستخدام!",
@@ -1034,25 +1577,42 @@
     "installingDependencies": "جاري تثبيت التبعيات...",
     "lastUpdated": "آخر تحديث",
     "latestVersion": "الأحدث",
+    "legacyManagerSearchTip": "هل تبحث عن ComfyUI-Manager؟ يمكنك تفعيل واجهة المدير القديمة عن طريق تشغيل ComfyUI مع الخيار --enable-manager-legacy-ui.",
     "legacyManagerUI": "استخدام الواجهة القديمة",
     "legacyManagerUIDescription": "لاستخدام واجهة مدير الإصدارات القديمة، ابدأ ComfyUI مع --enable-manager-legacy-ui",
     "legacyMenuNotAvailable": "قائمة مدير الإصدارات القديمة غير متوفرة، سيتم التبديل إلى القائمة الجديدة.",
     "license": "الرخصة",
     "loadingVersions": "جاري تحميل الإصدارات...",
     "mixedSelectionMessage": "لا يمكن تنفيذ إجراء جماعي على تحديد مختلط",
+    "nav": {
+      "allExtensions": "جميع الإضافات",
+      "allInWorkflow": "الكل في: {workflowName}",
+      "allInstalled": "جميع المثبتة",
+      "conflicting": "تعارض",
+      "inWorkflowSection": "في سير العمل",
+      "installedSection": "المثبتة",
+      "missingNodes": "عقد مفقودة",
+      "notInstalled": "غير مثبت",
+      "updatesAvailable": "تحديثات متوفرة"
+    },
     "nightlyVersion": "ليلي",
     "noDescription": "لا يوجد وصف متاح",
     "noNodesFound": "لم يتم العثور على عقد",
     "noNodesFoundDescription": "لم يمكن تحليل عقد الحزمة، أو أن الحزمة هي امتداد للواجهة فقط ولا تحتوي على أي عقد.",
     "noResultsFound": "لم يتم العثور على نتائج مطابقة لبحثك.",
     "nodePack": "حزمة العقد",
+    "nodePackInfo": "معلومات حزمة العقد",
     "notAvailable": "غير متوفر",
+    "packInstall": {
+      "nodeIdRequired": "معرّف العقدة مطلوب للتثبيت"
+    },
     "packsSelected": "الحزم المحددة",
     "repository": "المستودع",
     "restartToApplyChanges": "لـتطبيق التغييرات، يرجى إعادة تشغيل ComfyUI",
     "restartingBackend": "جاري إعادة تشغيل الخلفية لتطبيق التغييرات...",
     "searchPlaceholder": "بحث",
     "selectVersion": "اختر الإصدار",
+    "selected": "المحدد",
     "sort": {
       "created": "الأحدث",
       "downloads": "الأكثر شيوعاً",
@@ -1074,6 +1634,8 @@
     "totalNodes": "إجمالي العقد",
     "tryAgainLater": "يرجى المحاولة مرة أخرى لاحقاً.",
     "tryDifferentSearch": "يرجى تجربة استعلام بحث مختلف.",
+    "tryUpdate": "محاولة التحديث",
+    "tryUpdateTooltip": "اسحب آخر التغييرات من المستودع. قد تحتوي الإصدارات الليلية على تحديثات لا يمكن اكتشافها تلقائيًا.",
     "uninstall": "إلغاء التثبيت",
     "uninstallSelected": "إلغاء تثبيت المحدد",
     "uninstalling": "جاري إلغاء التثبيت",
@@ -1084,31 +1646,111 @@
     "version": "الإصدار"
   },
   "maskEditor": {
+    "activateLayer": "تفعيل الطبقة",
+    "applyToWholeImage": "تطبيق على الصورة كاملة",
+    "baseImageLayer": "طبقة الصورة الأساسية",
+    "baseLayerPreview": "معاينة الطبقة الأساسية",
+    "black": "أسود",
+    "brushSettings": "إعدادات الفرشاة",
+    "brushShape": "شكل الفرشاة",
+    "clear": "مسح",
+    "clickToResetZoom": "انقر لإعادة تعيين التكبير",
+    "colorSelectSettings": "إعدادات اختيار اللون",
+    "colorSelector": "منتقي اللون",
+    "fillOpacity": "شفافية التعبئة",
+    "hardness": "الصلابة",
+    "imageLayer": "طبقة الصورة",
+    "invert": "عكس",
+    "layers": "الطبقات",
+    "livePreview": "معاينة مباشرة",
+    "maskBlendingOptions": "خيارات دمج القناع",
+    "maskLayer": "طبقة القناع",
+    "maskOpacity": "شفافية القناع",
+    "maskTolerance": "تسامح القناع",
+    "method": "طريقة",
+    "mirrorHorizontal": "انعكاس أفقي",
+    "mirrorVertical": "انعكاس عمودي",
+    "negative": "سلبي",
+    "opacity": "الشفافية",
+    "paintBucketSettings": "إعدادات دلو الطلاء",
+    "paintLayer": "طبقة الطلاء",
+    "redo": "إعادة",
+    "resetToDefault": "إعادة إلى الافتراضي",
+    "rotateLeft": "تدوير لليسار",
+    "rotateRight": "تدوير لليمين",
+    "selectionOpacity": "شفافية التحديد",
+    "smoothingPrecision": "دقة التنعيم",
+    "stepSize": "حجم الخطوة",
+    "stopAtMask": "توقف عند القناع",
+    "thickness": "السُمك",
+    "title": "محرر القناع",
+    "tolerance": "التسامح",
+    "undo": "تراجع",
+    "white": "أبيض"
   },
   "mediaAsset": {
+    "actions": {
+      "copyJobId": "نسخ معرف المهمة",
+      "delete": "حذف",
+      "download": "تنزيل",
+      "exportWorkflow": "تصدير سير العمل",
+      "insertAsNodeInWorkflow": "إدراج كعقدة في سير العمل",
+      "inspect": "تفقد الأصل",
+      "more": "خيارات أخرى",
+      "moreOptions": "خيارات أخرى",
+      "openWorkflow": "فتح كسير عمل في علامة تبويب جديدة",
+      "seeMoreOutputs": "عرض المزيد من النتائج",
+      "zoom": "تكبير"
+    },
     "assetDeletedSuccessfully": "تم حذف الأصل بنجاح",
     "deleteAssetDescription": "سيتم إزالة هذا الأصل بشكل دائم.",
     "deleteAssetTitle": "حذف هذا الأصل؟",
     "deleteSelectedDescription": "سيتم إزالة {count} أصل(أصول) بشكل دائم.",
     "deleteSelectedTitle": "حذف الأصول المحددة؟",
     "deletingImportedFilesCloudOnly": "حذف الملفات المستوردة مدعوم فقط في النسخة السحابية",
+    "failedToCreateNode": "فشل في إنشاء العقدة",
     "failedToDeleteAsset": "فشل في حذف الأصل",
+    "failedToExportWorkflow": "فشل في تصدير سير العمل",
     "jobIdToast": {
       "copied": "تم النسخ",
       "error": "خطأ",
       "jobIdCopied": "تم نسخ معرف المهمة إلى الحافظة",
       "jobIdCopyFailed": "فشل في نسخ معرف المهمة"
     },
+    "noJobIdFound": "لم يتم العثور على معرف مهمة لهذا الأصل",
+    "noWorkflowDataFound": "لا توجد بيانات سير عمل في هذا الأصل",
+    "nodeAddedToWorkflow": "تمت إضافة عقدة {nodeType} إلى سير العمل",
+    "nodeTypeNotFound": "نوع العقدة {nodeType} غير موجود",
     "selection": {
       "assetsDeletedSuccessfully": "تم حذف {count} أصل(أصول) بنجاح",
       "deleteSelected": "حذف",
+      "deleteSelectedAll": "حذف الكل",
       "deselectAll": "إلغاء تحديد الكل",
       "downloadSelected": "تحميل",
+      "downloadSelectedAll": "تحميل الكل",
       "downloadStarted": "جاري تحميل {count} ملف(ملفات)...",
       "downloadsStarted": "بدأ تنزيل {count} ملف(ملفات)",
+      "exportStarted": "يتم تجهيز تصدير ZIP لـ {count} ملف | يتم تجهيز تصدير ZIP لـ {count} ملفات",
+      "exportWorkflowAll": "تصدير جميع سير العمل",
+      "failedToAddNodes": "فشل في إضافة العقد إلى سير العمل",
       "failedToDeleteAssets": "فشل في حذف الأصول المحددة",
-      "selectedCount": "الأصول المحددة: {count}"
-    }
+      "insertAllAssetsAsNodes": "إدراج جميع الأصول كعقد",
+      "multipleSelectedAssets": "تم تحديد عدة ملفات",
+      "noWorkflowsFound": "لم يتم العثور على بيانات سير العمل في الأصول المحددة",
+      "noWorkflowsToExport": "لم يتم العثور على بيانات سير العمل للتصدير",
+      "nodesAddedToWorkflow": "تمت إضافة {count} عقدة إلى سير العمل",
+      "openWorkflowAll": "فتح جميع سير العمل",
+      "partialAddNodesSuccess": "تمت إضافة {succeeded} بنجاح، وفشل {failed}",
+      "partialDeleteSuccess": "{succeeded} تم حذفها بنجاح، {failed} فشلت",
+      "partialWorkflowsExported": "تم تصدير {succeeded} بنجاح، وفشل {failed}",
+      "partialWorkflowsOpened": "تم فتح {succeeded} سير عمل، وفشل {failed}",
+      "selectedCount": "الأصول المحددة: {count}",
+      "workflowsExported": "تم تصدير {count} سير عمل بنجاح",
+      "workflowsOpened": "تم فتح {count} سير عمل في علامات تبويب جديدة"
+    },
+    "unsupportedFileType": "نوع الملف غير مدعوم لعقدة التحميل",
+    "workflowExportedSuccessfully": "تم تصدير سير العمل بنجاح",
+    "workflowOpenedInNewTab": "تم فتح سير العمل في علامة تبويب جديدة"
   },
   "menu": {
     "autoQueue": "الانتظار التلقائي",
@@ -1116,11 +1758,14 @@
     "batchCountTooltip": "عدد المرات التي يجب فيها وضع توليد سير العمل في قائمة الانتظار",
     "clear": "مسح سير العمل",
     "clipspace": "فتح Clipspace",
+    "customNodesManager": "مدير العقد المخصصة",
     "dark": "داكن",
     "disabled": "معطل",
     "disabledTooltip": "لن يتم وضع سير العمل في قائمة الانتظار تلقائيًا",
     "execute": "تنفيذ",
+    "fullscreen": "ملء الشاشة",
     "help": "مساعدة",
+    "helpAndFeedback": "المساعدة والتعليقات",
     "hideMenu": "إخفاء القائمة",
     "instant": "فوري",
     "instantTooltip": "سيتم وضع سير العمل في قائمة الانتظار فور انتهاء التوليد",
@@ -1134,9 +1779,12 @@
     "resetView": "إعادة تعيين عرض اللوحة",
     "run": "تشغيل",
     "runWorkflow": "تشغيل سير العمل (Shift للانتظار في البداية)",
+    "runWorkflowDisabled": "يحتوي سير العمل على عقد غير مدعومة (مظللة باللون الأحمر). يرجى إزالتها لتشغيل سير العمل.",
     "runWorkflowFront": "تشغيل سير العمل (انتظار في البداية)",
     "settings": "الإعدادات",
     "showMenu": "عرض القائمة",
+    "stopRunInstant": "إيقاف التشغيل (فوري)",
+    "stopRunInstantTooltip": "إيقاف التشغيل",
     "theme": "المظهر",
     "toggleBottomPanel": "تبديل اللوحة السفلية"
   },
@@ -1149,6 +1797,7 @@
     "Canvas Performance": "أداء اللوحة",
     "Canvas Toggle Lock": "تبديل قفل اللوحة",
     "Check for Custom Node Updates": "التحقق من تحديثات العقد المخصصة",
+    "Check for Updates": "التحقق من التحديثات",
     "Clear Pending Tasks": "مسح المهام المعلقة",
     "Clear Workflow": "مسح سير العمل",
     "Clipspace": "مساحة القص",
@@ -1161,16 +1810,19 @@
     "Contact Support": "الاتصال بالدعم",
     "Convert Selection to Subgraph": "تحويل التحديد إلى رسم فرعي",
     "Convert selected nodes to group node": "تحويل العقد المحددة إلى عقدة مجموعة",
+    "Copy": "نسخ",
     "Custom Nodes (Legacy)": "العقد المخصصة (قديم)",
     "Custom Nodes Manager": "مدير العقد المخصصة",
     "Decrease Brush Size in MaskEditor": "تقليل حجم الفرشاة في محرر القناع",
     "Delete Selected Items": "حذف العناصر المحددة",
+    "Desktop User Guide": "دليل المستخدم لسطح المكتب",
     "Duplicate Current Workflow": "نسخ سير العمل الحالي",
     "Edit": "تحرير",
     "Edit Subgraph Widgets": "تحرير عناصر واجهة المستخدم للرسم البياني الفرعي",
     "Exit Subgraph": "الخروج من الرسم الفرعي",
     "Experimental: Browse Model Assets": "تجريبي: استعراض أصول النماذج",
     "Experimental: Enable AssetAPI": "تجريبي: تمكين AssetAPI",
+    "Experimental: Enable Nodes 2_0": "تجريبي: تفعيل Nodes 2.0",
     "Export": "تصدير",
     "Export (API)": "تصدير (API)",
     "File": "ملف",
@@ -1182,12 +1834,15 @@
     "Increase Brush Size in MaskEditor": "زيادة حجم الفرشاة في محرر القناع",
     "Install Missing Custom Nodes": "تثبيت العقد المخصصة المفقودة",
     "Interrupt": "إيقاف مؤقت",
+    "Job History": "سجل المهام",
     "Load Default Workflow": "تحميل سير العمل الافتراضي",
     "Lock Canvas": "قفل اللوحة",
     "Manage group nodes": "إدارة عقد المجموعة",
     "Manager": "المدير",
     "Manager Menu (Legacy)": "قائمة المدير (قديم)",
     "Minimap": "خريطة مصغرة",
+    "Mirror Horizontal in MaskEditor": "انعكاس أفقي في محرر القناع",
+    "Mirror Vertical in MaskEditor": "انعكاس عمودي في محرر القناع",
     "Model Library": "مكتبة النماذج",
     "Move Selected Nodes Down": "تحريك العقد المحددة للأسفل",
     "Move Selected Nodes Left": "تحريك العقد المحددة لليسار",
@@ -1199,9 +1854,18 @@
     "Node Library": "مكتبة العقد",
     "Node Links": "روابط العقد",
     "Open": "فتح",
-    "Open 3D Viewer (Beta) for Selected Node": "فتح عارض ثلاثي الأبعاد (بيتا) للعقدة المحددة",
+    "Open 3D Viewer (Beta) for Selected Node": "فتح عارض ثلاثي الأبعاد (تجريبي) للعقدة المحددة",
+    "Open Color Picker in MaskEditor": "فتح منتقي الألوان في محرر القناع",
+    "Open Custom Nodes Folder": "فتح مجلد العقد المخصصة",
+    "Open DevTools": "فتح أدوات المطور",
+    "Open Inputs Folder": "فتح مجلد المدخلات",
+    "Open Logs Folder": "فتح مجلد السجلات",
     "Open Mask Editor for Selected Node": "فتح محرر القناع للعقدة المحددة",
+    "Open Models Folder": "فتح مجلد النماذج",
+    "Open Outputs Folder": "فتح مجلد المخرجات",
     "Open Sign In Dialog": "فتح نافذة تسجيل الدخول",
+    "Open extra_model_paths_yaml": "فتح ملف extra_model_paths.yaml",
+    "Paste": "لصق",
     "Pin/Unpin Selected Items": "تثبيت/إلغاء تثبيت العناصر المحددة",
     "Pin/Unpin Selected Nodes": "تثبيت/إلغاء تثبيت العقد المحددة",
     "Previous Opened Workflow": "سير العمل السابق المفتوح",
@@ -1209,24 +1873,34 @@
     "Queue Prompt": "قائمة انتظار التعليمات",
     "Queue Prompt (Front)": "قائمة انتظار التعليمات (أمامي)",
     "Queue Selected Output Nodes": "قائمة انتظار عقد المخرجات المحددة",
+    "Quit": "خروج",
     "Redo": "إعادة",
     "Refresh Node Definitions": "تحديث تعريفات العقد",
+    "Reinstall": "إعادة التثبيت",
+    "Rename": "إعادة التسمية",
     "Reset View": "إعادة تعيين العرض",
     "Resize Selected Nodes": "تغيير حجم العقد المحددة",
+    "Restart": "إعادة التشغيل",
+    "Rotate Left in MaskEditor": "تدوير لليسار في محرر القناع",
+    "Rotate Right in MaskEditor": "تدوير لليمين في محرر القناع",
     "Save": "حفظ",
     "Save As": "حفظ باسم",
+    "Select All": "تحديد الكل",
+    "Set Subgraph Description": "تعيين وصف المخطط الفرعي",
+    "Set Subgraph Search Aliases": "تعيين الأسماء المستعارة للبحث في المخطط الفرعي",
     "Show Keybindings Dialog": "عرض مربع حوار اختصارات لوحة المفاتيح",
     "Show Model Selector (Dev)": "إظهار منتقي النماذج (للمطورين)",
     "Show Settings Dialog": "عرض نافذة الإعدادات",
     "Sign Out": "تسجيل خروج",
+    "Toggle App Mode": "تبديل وضع التطبيق",
     "Toggle Essential Bottom Panel": "تبديل لوحة العناصر الأساسية السفلية",
     "Toggle Logs Bottom Panel": "تبديل لوحة السجلات السفلية",
+    "Toggle Queue Panel V2": "تبديل لوحة قائمة الانتظار V2",
     "Toggle Search Box": "تبديل مربع البحث",
     "Toggle Terminal Bottom Panel": "تبديل لوحة الطرفية السفلية",
     "Toggle Theme (Dark/Light)": "تبديل السمة (داكن/فاتح)",
     "Toggle View Controls Bottom Panel": "تبديل لوحة عناصر التحكم في العرض السفلية",
     "Toggle promotion of hovered widget": "تبديل ترقية عنصر واجهة المستخدم المحدد",
-    "Toggle the Custom Nodes Manager Progress Bar": "تبديل شريط تقدم مدير العقد المخصصة",
     "Undo": "تراجع",
     "Ungroup selected group nodes": "فك تجميع عقد المجموعة المحددة",
     "Unload Models": "إلغاء تحميل النماذج",
@@ -1237,7 +1911,8 @@
     "Workflows": "سير العمل",
     "Zoom In": "تكبير",
     "Zoom Out": "تصغير",
-    "Zoom to fit": "تكبير لتناسب"
+    "Zoom to fit": "تكبير لتناسب",
+    "linearMode_appModeToolbar_apps": "linearMode.appModeToolbar.apps"
   },
   "minimap": {
     "nodeColors": "ألوان العقد",
@@ -1247,20 +1922,66 @@
     "showLinks": "إظهار الروابط"
   },
   "missingModelsDialog": {
+    "acceptTerms": "قبول الشروط",
+    "customModelsInstruction": "ستحتاج إلى العثور عليها وتنزيلها يدويًا. ابحث عنها عبر الإنترنت (جرّب Civitai أو Hugging Face) أو تواصل مع مزود سير العمل الأصلي.",
+    "customModelsWarning": "بعض هذه النماذج مخصصة ولا نتعرف عليها.",
+    "description": "يتطلب سير العمل هذا نماذج لم تقم بتنزيلها بعد.",
     "doNotAskAgain": "عدم العرض مرة أخرى",
-    "missingModels": "نماذج مفقودة",
-    "missingModelsMessage": "عند تحميل الرسم البياني، لم يتم العثور على النماذج التالية"
+    "downloadAll": "تنزيل الكل",
+    "downloadAvailable": "التنزيل متاح",
+    "footerDescription": "قم بتنزيل هذه النماذج وضعها في المجلد الصحيح.\nالعُقد التي تفتقد إلى النماذج مميزة باللون الأحمر على اللوحة.",
+    "gotIt": "حسنًا، فهمت",
+    "reEnableInSettings": "إعادة التفعيل في {link}",
+    "reEnableInSettingsLink": "الإعدادات",
+    "title": "هذا سير العمل يفتقد إلى النماذج",
+    "totalSize": "إجمالي حجم التنزيل:"
+  },
+  "missingNodes": {
+    "cloud": {
+      "description": "يستخدم سير العمل هذا عقد مخصصة غير مدعومة في إصدار السحابة بعد.",
+      "gotIt": "حسنًا، فهمت",
+      "learnMore": "اعرف المزيد",
+      "priorityMessage": "لقد قمنا تلقائيًا بوضع علامة على هذه العقد حتى نعطيها أولوية للإضافة.",
+      "replacementInstruction": "في الوقت الحالي، استبدل هذه العقد (المظللة باللون الأحمر على اللوحة) بعقد مدعومة إذا أمكن، أو جرب سير عمل مختلف.",
+      "title": "هذه العقد غير متوفرة على Comfy Cloud بعد"
+    },
+    "oss": {
+      "description": "يستخدم سير العمل هذا عقد مخصصة لم تقم بتثبيتها بعد.",
+      "replacementInstruction": "قم بتثبيت هذه العقد لتشغيل سير العمل، أو استبدلها ببدائل مثبتة. العقد المفقودة مظللة باللون الأحمر على اللوحة.",
+      "title": "سير العمل هذا يحتوي على عقد مفقودة"
+    }
+  },
+  "nightly": {
+    "badge": {
+      "label": "إصدار معاينة",
+      "tooltip": "أنت تستخدم إصدارًا ليليًا من ComfyUI. يرجى استخدام زر الملاحظات لمشاركة آرائك حول هذه الميزات."
+    }
+  },
+  "nightlySurvey": {
+    "accept": "بكل سرور، سأساعد!",
+    "description": "لقد استخدمت هذه الميزة. هل يمكنك تخصيص لحظة لمشاركة ملاحظاتك؟",
+    "dontAskAgain": "لا تسأل مرة أخرى",
+    "loadError": "فشل في تحميل الاستبيان. يرجى المحاولة لاحقًا.",
+    "notNow": "ليس الآن",
+    "title": "ساعدنا في التحسين"
   },
   "nodeCategories": {
+    "": "",
     "3d": "ثلاثي الأبعاد",
     "3d_models": "نماذج ثلاثية الأبعاد",
     "BFL": "BFL",
+    "Bria": "Bria",
     "ByteDance": "بايت دانس",
+    "ElevenLabs": "ElevenLabs",
     "Gemini": "جيميني",
+    "Grok": "Grok",
+    "HitPaw": "HitPaw",
     "Ideogram": "إيديوغرام",
     "Kling": "Kling",
     "LTXV": "LTXV",
     "Luma": "Luma",
+    "Magnific": "Magnific",
+    "Meshy": "Meshy",
     "MiniMax": "MiniMax",
     "Moonvalley Marey": "مون فالي ماري",
     "OpenAI": "OpenAI",
@@ -1270,10 +1991,13 @@
     "Runway": "رن واي",
     "Sora": "سورا",
     "Stability AI": "Stability AI",
+    "Tencent": "Tencent",
+    "Topaz": "Topaz",
     "Tripo": "تريبو",
     "Veo": "Veo",
     "Vidu": "فيدو",
     "Wan": "وان",
+    "WaveSpeed": "WaveSpeed",
     "_for_testing": "_للاختبار",
     "advanced": "متقدم",
     "animation": "الرسوم المتحركة",
@@ -1294,6 +2018,7 @@
     "controlnet": "كونترول نت",
     "create": "إنشاء",
     "custom_sampling": "تجميع مخصص",
+    "dataset": "مجموعة بيانات",
     "debug": "تصحيح",
     "deprecated": "مهمل",
     "edit_models": "تحرير النماذج",
@@ -1305,8 +2030,10 @@
     "image": "صورة",
     "inpaint": "التلوين الداخلي",
     "instructpix2pix": "instructpix2pix",
+    "kandinsky5": "kandinsky5",
     "latent": "كامِن",
     "loaders": "التحميلات",
+    "logic": "منطق",
     "lotus": "lotus",
     "ltxv": "ltxv",
     "mask": "قناع",
@@ -1328,11 +2055,13 @@
     "scheduling": "الجدولة",
     "sd": "sd",
     "sd3": "sd3",
+    "shader": "shader",
     "sigmas": "سيجمات",
     "stable_cascade": "سلسلة ثابتة",
     "string": "سلسلة نصية",
     "style_model": "نموذج النمط",
     "text": "نص",
+    "textgen": "textgen",
     "training": "تدريب",
     "transform": "تحويل",
     "unet": "unet",
@@ -1340,7 +2069,25 @@
     "upscaling": "تكبير",
     "utils": "أدوات مساعدة",
     "video": "فيديو",
-    "video_models": "نماذج الفيديو"
+    "video_models": "نماذج الفيديو",
+    "zimage": "zimage"
+  },
+  "nodeErrors": {
+    "content": "خطأ في محتوى العقدة",
+    "header": "خطأ في رأس العقدة",
+    "render": "خطأ في عرض العقدة",
+    "slots": "خطأ في فتحات العقدة",
+    "widgets": "خطأ في عناصر العقدة"
+  },
+  "nodeFilters": {
+    "hideDeprecated": "إخفاء العقد المهملة",
+    "hideDeprecatedDescription": "يخفي العقد التي تم تعليمها كمهملة ما لم يتم تفعيلها صراحة",
+    "hideDevOnly": "إخفاء عقد المطور فقط",
+    "hideDevOnlyDescription": "يخفي العقد المخصصة للمطورين فقط ما لم يتم تفعيل وضع المطور",
+    "hideExperimental": "إخفاء العقد التجريبية",
+    "hideExperimentalDescription": "يخفي العقد التي تم تعليمها كتجريبية ما لم يتم تفعيلها صراحة",
+    "hideSubgraph": "إخفاء عقد الرسم البياني الفرعي",
+    "hideSubgraphDescription": "يخفي مؤقتًا عقد الرسم البياني الفرعي من مكتبة العقد والبحث"
   },
   "nodeHelpPage": {
     "documentationPage": "صفحة التوثيق",
@@ -1350,6 +2097,32 @@
     "outputs": "المُخرجات",
     "type": "النوع"
   },
+  "nodeReplacement": {
+    "compatibleAlternatives": "بدائل متوافقة",
+    "installMissingNodes": "تثبيت العقد المفقودة",
+    "installationRequired": "التثبيت مطلوب",
+    "instructionMessage": "يجب عليك تثبيت هذه العقد أو استبدالها ببدائل مثبتة لتشغيل سير العمل. العقد المفقودة مميزة باللون {red} على اللوحة. بعض العقد لا يمكن استبدالها ويجب تثبيتها عبر مدير العقد.",
+    "notReplaceable": "التثبيت مطلوب",
+    "openNodeManager": "فتح مدير العقد",
+    "quickFixAvailable": "إصلاح سريع متاح",
+    "redHighlight": "أحمر",
+    "replaceAll": "استبدال الكل",
+    "replaceAllWarning": "سيتم استبدال جميع العقد المتاحة في هذه المجموعة.",
+    "replaceFailed": "فشل في استبدال العقد",
+    "replaceNode": "استبدال العقدة",
+    "replaceSelected": "استبدال المحدد ({count})",
+    "replaceWarning": "سيؤدي هذا إلى تعديل سير العمل بشكل دائم. احفظ نسخة أولاً إذا لم تكن متأكدًا.",
+    "replaceable": "قابل للاستبدال",
+    "replaced": "تم الاستبدال",
+    "replacedAllNodes": "تم استبدال {count} نوع/أنواع من العقد",
+    "replacedNode": "تم استبدال العقدة: {nodeType}",
+    "selectAll": "تحديد الكل",
+    "skipForNow": "تخطي الآن",
+    "swapNodesGuide": "يمكن استبدال العقد التالية تلقائيًا ببدائل متوافقة.",
+    "swapNodesTitle": "تبديل العقد",
+    "unknownNode": "غير معروف",
+    "willBeReplacedBy": "سيتم استبدال هذه العقدة بـ:"
+  },
   "nodeTemplates": {
     "enterName": "أدخل الاسم",
     "saveAsTemplate": "حفظ كقالب"
@@ -1357,6 +2130,7 @@
   "notSupported": {
     "continue": "المتابعة",
     "continueTooltip": "أنا متأكد أن جهازي مدعوم",
+    "illustrationAlt": "رسم توضيحي لفتاة حزينة",
     "learnMore": "اعرف المزيد",
     "message": "الأجهزة المدعومة فقط هي:",
     "reportIssue": "أبلغ عن مشكلة",
@@ -1366,12 +2140,222 @@
     },
     "title": "جهازك غير مدعوم"
   },
+  "painter": {
+    "background": "الخلفية",
+    "brush": "فرشاة",
+    "clear": "مسح",
+    "color": "منتقي اللون",
+    "eraser": "ممحاة",
+    "hardness": "الصلابة",
+    "height": "الارتفاع",
+    "size": "حجم المؤشر",
+    "tool": "أداة",
+    "uploadError": "فشل في رفع صورة الرسام: {status} - {statusText}",
+    "width": "العرض"
+  },
+  "progressToast": {
+    "allDownloadsCompleted": "اكتملت جميع التنزيلات",
+    "downloadingModel": "جاري تنزيل النموذج...",
+    "downloadsFailed": "{count} فشل في التنزيل | {count} فشل في التنزيل | {count} فشل في التنزيل",
+    "failed": "فشل",
+    "filter": {
+      "all": "الكل",
+      "completed": "مكتمل",
+      "failed": "فشل"
+    },
+    "finished": "انتهى",
+    "importingModels": "جاري استيراد النماذج",
+    "noImportsInQueue": "لا يوجد {filter} في قائمة الانتظار",
+    "pending": "قيد الانتظار",
+    "progressCount": "{completed} من {total}"
+  },
+  "queue": {
+    "completedIn": "انتهى في {duration}",
+    "inQueue": "في قائمة الانتظار...",
+    "initializingAlmostReady": "جاري التهيئة - قريباً جاهز",
+    "jobAddedToQueue": "تمت إضافة المهمة إلى قائمة الانتظار",
+    "jobDetails": {
+      "computeHoursUsed": "ساعات الحوسبة المستخدمة",
+      "errorMessage": "رسالة الخطأ",
+      "estimatedFinishIn": "من المتوقع أن ينتهي خلال",
+      "estimatedStartIn": "من المتوقع أن يبدأ خلال",
+      "eta": {
+        "minutes": "~{count} دقيقة | ~{count} دقائق",
+        "minutesRange": "~{lo}-{hi} دقيقة",
+        "seconds": "~{count} ثانية | ~{count} ثوانٍ",
+        "secondsRange": "~{lo}-{hi} ثانية"
+      },
+      "failedAfter": "فشل بعد",
+      "generatedOn": "تم التوليد في",
+      "header": "تفاصيل المهمة",
+      "jobId": "معرف المهمة",
+      "queuePosition": "موضع في قائمة الانتظار",
+      "queuePositionValue": "~{count} مهمة قبلك | ~{count} مهام قبلك",
+      "queuedAt": "تمت إضافتها في",
+      "report": "إبلاغ",
+      "timeElapsed": "الوقت المنقضي",
+      "totalGenerationTime": "إجمالي وقت التوليد",
+      "workflow": "مسار العمل"
+    },
+    "jobHistory": "سجل المهام",
+    "jobList": {
+      "sortComputeHoursUsed": "ساعات الحوسبة المستخدمة (الأكثر أولاً)",
+      "sortMostRecent": "الأحدث",
+      "sortTotalGenerationTime": "إجمالي وقت التوليد (الأطول أولاً)",
+      "undated": "بدون تاريخ"
+    },
+    "jobMenu": {
+      "addToCurrentWorkflow": "إضافة إلى مسار العمل الحالي",
+      "cancelJob": "إلغاء المهمة",
+      "copyErrorMessage": "نسخ رسالة الخطأ",
+      "copyJobId": "نسخ معرف المهمة",
+      "delete": "حذف",
+      "deleteAsset": "حذف الأصل",
+      "download": "تنزيل",
+      "exportWorkflow": "تصدير مسار العمل",
+      "inspectAsset": "فحص الأصل",
+      "openAsWorkflowNewTab": "فتح كمسار عمل في تبويب جديد",
+      "openWorkflowNewTab": "فتح مسار العمل في تبويب جديد",
+      "removeJob": "إزالة المهمة",
+      "reportError": "الإبلاغ عن خطأ"
+    },
+    "jobQueueing": "جارٍ إضافة العمل إلى قائمة الانتظار",
+    "toggleJobHistory": "تبديل سجل المهام"
+  },
   "releaseToast": {
+    "description": "اطلع على أحدث التحسينات والميزات في هذا التحديث.",
     "newVersionAvailable": "الإصدار الجديد متوفر!",
     "skip": "تخطي",
     "update": "تحديث",
     "whatsNew": "ما الجديد؟"
   },
+  "rightSidePanel": {
+    "addFavorite": "إضافة إلى المفضلة",
+    "advancedInputs": "مدخلات متقدمة",
+    "bypass": "تجاوز",
+    "color": "لون العقدة",
+    "enterSubgraph": "دخول الرسم الفرعي",
+    "errorHelp": "للمزيد من المساعدة، {github} أو {support}",
+    "errorHelpGithub": "إرسال مشكلة على GitHub",
+    "errorHelpSupport": "تواصل مع الدعم الفني",
+    "errors": "الأخطاء",
+    "executionErrorOccurred": "حدث خطأ أثناء التنفيذ. تحقق من علامة تبويب الأخطاء لمزيد من التفاصيل.",
+    "fallbackGroupTitle": "مجموعة",
+    "fallbackNodeTitle": "عقدة",
+    "favorites": "المدخلات المفضلة",
+    "favoritesNone": "لا توجد مدخلات مفضلة",
+    "favoritesNoneDesc": "ستظهر المدخلات التي تضعها في المفضلة هنا",
+    "favoritesNoneHint": "في علامة تبويب المعلمات، انقر على {moreIcon} بجانب أي إدخال لإضافته هنا",
+    "favoritesNoneTooltip": "قم بوضع نجمة على الأدوات للوصول السريع إليها دون اختيار العقد",
+    "globalSettings": {
+      "canvas": "اللوحة",
+      "connectionLinks": "روابط الاتصال",
+      "gridSpacing": "تباعد الشبكة",
+      "linkShape": "شكل الرابط",
+      "nodes": "العقد",
+      "nodes2": "العقد 2.0",
+      "searchPlaceholder": "بحث في الإعدادات السريعة...",
+      "showAdvanced": "إظهار المعلمات المتقدمة",
+      "showAdvancedTooltip": "هذا إعداد مهم، عند تفعيله، يعرض جميع المعلمات المتقدمة للعقد",
+      "showConnectedLinks": "إظهار الروابط المتصلة",
+      "showInfoBadges": "إظهار شارات المعلومات",
+      "showToolbox": "إظهار صندوق الأدوات عند التحديد",
+      "snapNodesToGrid": "محاذاة العقد مع الشبكة",
+      "title": "الإعدادات العامة",
+      "viewAllSettings": "عرض جميع الإعدادات"
+    },
+    "groupSettings": "إعدادات المجموعة",
+    "groups": "المجموعات",
+    "hideAdvancedInputsButton": "إخفاء المدخلات المتقدمة",
+    "hideInput": "إخفاء المدخل",
+    "info": "معلومات",
+    "inputs": "المدخلات",
+    "inputsNone": "لا توجد مدخلات",
+    "inputsNoneTooltip": "العقدة ليس لديها مدخلات",
+    "locateNode": "تحديد موقع العقدة على اللوحة",
+    "missingNodePacks": {
+      "applyChanges": "تطبيق التغييرات",
+      "cloudMessage": "يتطلب سير العمل هذا عقدًا مخصصة غير متوفرة بعد على Comfy Cloud.",
+      "collapse": "طي",
+      "expand": "توسيع",
+      "installAll": "تثبيت الكل",
+      "installNodePack": "تثبيت حزمة العقد",
+      "installed": "تم التثبيت",
+      "installing": "جارٍ التثبيت...",
+      "ossManagerDisabledHint": "لتثبيت العقد المفقودة، قم أولاً بتشغيل {pipCmd} في بيئة بايثون الخاصة بك لتثبيت مدير العقد، ثم أعد تشغيل ComfyUI مع العلم {flag}.",
+      "ossMessage": "يستخدم سير العمل هذا عقدًا مخصصة لم تقم بتثبيتها بعد.",
+      "searchInManager": "البحث في مدير العقد",
+      "title": "حزم العقد المفقودة",
+      "unknownPack": "حزمة غير معروفة",
+      "unsupportedTitle": "حزم العقد غير المدعومة",
+      "viewInManager": "عرض في المدير"
+    },
+    "mute": "كتم",
+    "noErrors": "لا توجد أخطاء",
+    "noSelection": "حدد عقدة لعرض خصائصها ومعلوماتها.",
+    "nodeState": "حالة العقدة",
+    "nodes": "العقد",
+    "nodesNoneDesc": "لا توجد عقد",
+    "noneSearchDesc": "لا توجد عناصر مطابقة لبحثك",
+    "normal": "عادي",
+    "parameters": "المعلمات",
+    "pinned": "مثبت",
+    "promptErrors": {
+      "no_prompt": {
+        "desc": "بيانات سير العمل المرسلة إلى الخادم فارغة. قد يكون هذا خطأ غير متوقع في النظام."
+      },
+      "prompt_no_outputs": {
+        "desc": "سير العمل لا يحتوي على أي عقدة إخراج (مثل حفظ الصورة، معاينة الصورة) لإنتاج نتيجة."
+      },
+      "server_error_cloud": {
+        "desc": "واجه الخادم خطأ غير متوقع. يرجى المحاولة لاحقاً."
+      },
+      "server_error_local": {
+        "desc": "واجه الخادم خطأ غير متوقع. يرجى مراجعة سجلات الخادم."
+      }
+    },
+    "properties": "الخصائص",
+    "removeFavorite": "إزالة من المفضلة",
+    "resetAllParameters": "إعادة تعيين جميع المعلمات",
+    "resetToDefault": "إعادة التعيين إلى الافتراضي",
+    "seeError": "عرض الخطأ",
+    "settings": "الإعدادات",
+    "showAdvancedInputsButton": "إظهار المدخلات المتقدمة",
+    "showInput": "إظهار المدخل",
+    "title": "لا توجد عقد محددة | عقدة واحدة محددة | {count} عقد محددة",
+    "togglePanel": "تبديل لوحة الخصائص",
+    "workflowOverview": "نظرة عامة على سير العمل"
+  },
+  "secrets": {
+    "addSecret": "إضافة سر",
+    "createdAt": "تم الإنشاء في {date}",
+    "deleteConfirmMessage": "هل أنت متأكد أنك تريد حذف \"{name}\"؟ لا يمكن التراجع عن هذا الإجراء.",
+    "deleteConfirmTitle": "حذف السر",
+    "description": "يتم تشفير الأسرار وتُستخدم للبيانات الحساسة مثل مفاتيح API.",
+    "descriptionUsage": "قم بتخزين رموزك هنا لتمكين تنزيل النماذج الخاصة والمحمية من المزودين المدعومين.",
+    "editSecret": "تعديل السر",
+    "errors": {
+      "duplicateName": "يوجد سر بهذا الاسم بالفعل",
+      "duplicateProvider": "يوجد سر لهذا المزود بالفعل",
+      "nameRequired": "الاسم مطلوب",
+      "nameTooLong": "يجب ألا يزيد الاسم عن ٢٥٥ حرفًا",
+      "providerRequired": "المزود مطلوب",
+      "secretValueRequired": "قيمة السر مطلوبة"
+    },
+    "lastUsed": "آخر استخدام في {date}",
+    "modelProviders": "مزودو النماذج",
+    "name": "الاسم",
+    "namePlaceholder": "مثال: مفتاح API الخاص بي",
+    "noSecrets": "لا توجد أسرار مخزنة. أضف أول مفتاح API للبدء.",
+    "provider": "المزود",
+    "providerHint": "اختياري. اختيار مزود يتيح استخدام الرمز تلقائيًا.",
+    "secretValue": "قيمة السر",
+    "secretValueHint": "سيتم تشفير هذه القيمة ولا يمكن عرضها مرة أخرى.",
+    "secretValueHintEdit": "اترك الحقل فارغًا للاحتفاظ بالقيمة الحالية.",
+    "secretValuePlaceholder": "أدخل مفتاح API الخاص بك",
+    "secretValuePlaceholderEdit": "أدخل قيمة جديدة للتغيير",
+    "title": "مفاتيح API والأسرار"
+  },
   "selectionToolbox": {
     "Bypass Group Nodes": "تجاوز عقد المجموعة",
     "Set Group Nodes to Always": "تعيين عقد المجموعة إلى دائمًا",
@@ -1384,6 +2368,8 @@
   "serverConfig": {
     "modifiedConfigs": "لقد قمت بتعديل إعدادات الخادم التالية. يرجى إعادة التشغيل لتطبيق التغييرات.",
     "restart": "إعادة التشغيل",
+    "restartRequiredToastDetail": "أعد تشغيل التطبيق لتطبيق تغييرات إعدادات الخادم.",
+    "restartRequiredToastSummary": "إعادة التشغيل مطلوبة",
     "revertChanges": "التراجع عن التغييرات"
   },
   "serverConfigCategories": {
@@ -1452,6 +2438,10 @@
     "enable-cors-header": {
       "name": "تمكين ترويسة CORS: استخدم \"*\" لجميع النطاقات أو حدد نطاقًا"
     },
+    "enable-manager-legacy-ui": {
+      "name": "استخدام واجهة مدير قديمة",
+      "tooltip": "يستخدم واجهة ComfyUI-Manager القديمة بدلاً من الواجهة الجديدة."
+    },
     "fast": {
       "name": "تمكين بعض التحسينات غير المختبرة والتي قد تؤثر على الجودة."
     },
@@ -1553,6 +2543,8 @@
     "CustomColorPalettes": "لوحات ألوان مخصصة",
     "DevMode": "وضع المطور",
     "EditTokenWeight": "تعديل وزن الرمز",
+    "Error System": "نظام الأخطاء",
+    "Execution": "التنفيذ",
     "Extension": "الإضافة",
     "General": "عام",
     "Graph": "الرسم البياني",
@@ -1568,10 +2560,14 @@
     "Menu": "القائمة",
     "ModelLibrary": "مكتبة النماذج",
     "Node": "العقدة",
+    "Node Library": "مكتبة العقد",
     "Node Search Box": "مربع بحث العقد",
     "Node Widget": "أداة العقدة",
     "NodeLibrary": "مكتبة العقد",
+    "Nodes 2_0": "Nodes 2.0",
     "Notification Preferences": "تفضيلات الإشعارات",
+    "Other": "أخرى",
+    "PLY": "PLY",
     "PlanCredits": "الخطة والاعتمادات",
     "Pointer": "المؤشر",
     "Queue": "قائمة الانتظار",
@@ -1579,6 +2575,7 @@
     "Reroute": "إعادة التوجيه",
     "RerouteBeta": "إعادة توجيه بيتا",
     "Scene": "المشهد",
+    "Secrets": "الأسرار",
     "Server": "الخادم",
     "Server-Config": "إعدادات الخادم",
     "Settings": "الإعدادات",
@@ -1590,7 +2587,8 @@
     "Vue Nodes": "عقد Vue",
     "VueNodes": "عقد Vue",
     "Window": "النافذة",
-    "Workflow": "سير العمل"
+    "Workflow": "سير العمل",
+    "Workspace": "مساحة العمل"
   },
   "shape": {
     "CARD": "بطاقة",
@@ -1616,11 +2614,18 @@
     "viewControls": "عناصر تحكم العرض"
   },
   "sideToolbar": {
+    "activeJobStatus": "المهمة النشطة: {status}",
     "assets": "الأصول",
     "backToAssets": "العودة إلى جميع الأصول",
     "browseTemplates": "تصفح القوالب المثال",
     "downloads": "التنزيلات",
+    "folderView": {
+      "errorDetail": "تعذر استرجاع المخرجات لهذه المهمة. يرجى المحاولة مرة أخرى.",
+      "errorSummary": "فشل في تحميل المخرجات"
+    },
+    "generatedAssetsHeader": "الأصول المُولدة",
     "helpCenter": "مركز المساعدة",
+    "importedAssetsHeader": "الأصول المستوردة",
     "labels": {
       "assets": "الأصول",
       "console": "وحدة التحكم",
@@ -1643,6 +2648,17 @@
     "noImportedFiles": "لم يتم العثور على ملفات مستوردة",
     "nodeLibrary": "مكتبة العقد",
     "nodeLibraryTab": {
+      "allNodes": "جميع العقد",
+      "blueprints": "المخططات",
+      "custom": "مخصص",
+      "essentials": "الأساسيات",
+      "filter": "تصفية",
+      "filterOptions": {
+        "blueprints": "المخططات",
+        "comfyNodes": "عُقد Comfy",
+        "extensions": "الإضافات",
+        "partnerNodes": "عُقد الشركاء"
+      },
       "groupBy": "التجميع حسب",
       "groupStrategies": {
         "category": "الفئة",
@@ -1652,7 +2668,20 @@
         "source": "المصدر",
         "sourceDesc": "التجميع حسب نوع المصدر (أساسي، مخصص، API)"
       },
+      "noBookmarkedNodes": "لا توجد مفضلات بعد",
       "resetView": "إعادة تعيين العرض إلى الافتراضي",
+      "sections": {
+        "bookmarked": "المفضلة",
+        "comfyBlueprints": "مخططات Comfy",
+        "comfyNodes": "عُقد Comfy",
+        "extensions": "الإضافات",
+        "favoriteNode": "العقدة المفضلة",
+        "favorites": "المفضلة",
+        "myBlueprints": "مخططاتي",
+        "partnerNodes": "عُقد الشركاء",
+        "subgraphBlueprints": "مخططات الرسم الفرعي",
+        "unfavoriteNode": "إزالة العقدة من المفضلة"
+      },
       "sortBy": {
         "alphabetical": "أبجدي",
         "alphabeticalDesc": "الفرز أبجدياً داخل المجموعات",
@@ -1661,8 +2690,62 @@
       },
       "sortMode": "طريقة الفرز"
     },
+    "nodes": "العقد",
     "openWorkflow": "فتح سير العمل من نظام الملفات المحلي",
     "queue": "قائمة الانتظار",
+    "queueProgressOverlay": {
+      "activeJobs": "{count} مهمة نشطة | {count} مهام نشطة",
+      "activeJobsShort": "{count} نشط | {count} نشط",
+      "activeJobsSuffix": "مهام نشطة",
+      "cancelJobTooltip": "إلغاء المهمة",
+      "clearAllJobsTooltip": "إلغاء جميع المهام الجارية",
+      "clearHistory": "مسح سجل قائمة الانتظار",
+      "clearHistoryDialogAssetsNote": "لن يتم حذف الأصول التي تم إنشاؤها بواسطة هذه المهام ويمكنك دائمًا عرضها من لوحة الأصول.",
+      "clearHistoryDialogDescription": "سيتم حذف جميع المهام المنتهية أو الفاشلة أدناه من لوحة قائمة المهام.",
+      "clearHistoryDialogTitle": "مسح سجل قائمة المهام؟",
+      "clearHistoryMenuAssetsNote": "لن يتم حذف الوسائط.",
+      "clearQueueTooltip": "مسح القائمة",
+      "clearQueued": "مسح قائمة الانتظار",
+      "colonPercent": ": {percent}",
+      "currentNode": "العقدة الحالية:",
+      "dockedJobHistory": "سجل المهام المثبت",
+      "expandCollapsedQueue": "توسيع قائمة المهام",
+      "filterAllWorkflows": "جميع سير العمل",
+      "filterBy": "تصفية حسب",
+      "filterCurrentWorkflow": "سير العمل الحالي",
+      "filterJobs": "تصفية المهام",
+      "inlineTotalLabel": "الإجمالي",
+      "interruptAll": "إيقاف جميع المهام الجارية",
+      "jobCompleted": "اكتمل العمل",
+      "jobFailed": "فشل العمل",
+      "jobQueue": "قائمة المهام",
+      "jobsAddedToQueue": "{count} مهمة أُضيفت إلى قائمة الانتظار | {count} مهام أُضيفت إلى قائمة الانتظار",
+      "jobsCompleted": "{count} مهمة مكتملة | {count} مهام مكتملة",
+      "jobsFailed": "{count} مهمة فشلت | {count} مهام فشلت",
+      "moreOptions": "خيارات إضافية",
+      "noActiveJobs": "لا توجد مهام نشطة",
+      "preview": "معاينة",
+      "queuedJobsLabel": "{count} في الانتظار",
+      "queuedSuffix": "في الانتظار",
+      "running": "قيد التشغيل",
+      "runningJobsLabel": "{count} قيد التشغيل",
+      "runningQueuedSummary": "{running} قيد التشغيل، {queued} في الانتظار",
+      "searchJobs": "بحث...",
+      "showAssets": "عرض الأصول",
+      "showAssetsPanel": "عرض لوحة الأصول",
+      "showRunProgressBar": "عرض شريط تقدم التشغيل",
+      "sortBy": "ترتيب حسب",
+      "sortJobs": "ترتيب المهام",
+      "stubClipTextEncode": "CLIP ترميز النص:",
+      "title": "تقدم قائمة الانتظار",
+      "total": "الإجمالي: {percent}",
+      "viewAllJobs": "عرض جميع المهام",
+      "viewGrid": "عرض الشبكة",
+      "viewJobHistory": "عرض سجل المهام",
+      "viewList": "عرض القائمة"
+    },
+    "searchAssets": "بحث في الأصول",
+    "sidebar": "الشريط الجانبي",
     "templates": "القوالب",
     "themeToggle": "تبديل المظهر",
     "workflowTab": {
@@ -1686,60 +2769,208 @@
   },
   "subgraphStore": {
     "blueprintName": "اسم المخطط الفرعي",
+    "blueprintNamePrompt": "اسم المخطط الفرعي:",
+    "cannotDeleteGlobal": "لا يمكن حذف المخططات المثبتة",
     "confirmDelete": "سيؤدي هذا الإجراء إلى إزالة المخطط نهائيًا من مكتبتك",
     "confirmDeleteTitle": "حذف المخطط؟",
+    "disconnected": "غير متصل",
+    "enterDescription": "أدخل وصفًا",
+    "enterSearchAliases": "أدخل الأسماء المستعارة للبحث (مفصولة بفواصل)",
     "hidden": "معاملات مخفية / متداخلة",
     "hideAll": "إخفاء الكل",
+    "linked": "(مرتبط)",
     "loadFailure": "فشل تحميل مخططات الرسم البياني الفرعي",
     "overwriteBlueprint": "سيؤدي الحفظ إلى استبدال المخطط الحالي بالتغييرات الخاصة بك",
     "overwriteBlueprintTitle": "استبدال المخطط الحالي؟",
     "promoteOutsideSubgraph": "لا يمكن ترقية عنصر واجهة المستخدم عند عدم وجوده في الرسم البياني الفرعي",
+    "promoteWidget": "ترقية الأداة: {name}",
     "publish": "نشر الرسم البياني الفرعي",
     "publishSuccess": "تم الحفظ في مكتبة العقد",
     "publishSuccessMessage": "يمكنك العثور على مخطط الرسم البياني الفرعي الخاص بك في مكتبة العقد ضمن \"مخططات الرسم البياني الفرعي\"",
     "saveBlueprint": "احفظ المخطط الفرعي في المكتبة",
+    "searchAliases": "بحث عن الأسماء المستعارة",
     "showAll": "إظهار الكل",
     "showRecommended": "إظهار العناصر الموصى بها",
-    "shown": "معروض على العقدة"
+    "shown": "معروض على العقدة",
+    "unpromoteWidget": "إلغاء ترقية الأداة: {name}"
   },
   "subscription": {
     "addApiCredits": "إضافة رصيد API",
     "addCredits": "إضافة رصيد",
+    "addCreditsLabel": "أضف المزيد من الرصيد في أي وقت",
     "benefits": {
       "benefit1": "رصيد شهري للعقد الشريكة - تجديد عند الحاجة",
-      "benefit2": "حتى 30 دقيقة وقت تشغيل لكل مهمة"
+      "benefit1FreeTier": "رصيد شهري أكثر، مع إمكانية الشحن في أي وقت",
+      "benefit2": "حتى 30 دقيقة وقت تشغيل لكل مهمة",
+      "benefit3": "استخدم نماذجك الخاصة (Creator & Pro)"
     },
     "beta": "نسخة تجريبية",
+    "billedMonthly": "يتم الفوترة شهريًا",
+    "billedYearly": "{total} يتم الفوترة سنويًا",
+    "billingComingSoon": {
+      "message": "سيتم إطلاق الفوترة الجماعية قريباً. ستتمكن من الاشتراك في خطة لمساحة العمل الخاصة بك مع تسعير لكل مستخدم. ترقبوا التحديثات.",
+      "title": "قريباً"
+    },
+    "cancelDialog": {
+      "confirmCancel": "تأكيد إلغاء الاشتراك",
+      "description": "سيستمر وصولك حتى {date}. لن يتم خصم أي رسوم أخرى منك، وسيتم الاحتفاظ بمساحة العمل والرصيد الخاص بك. يمكنك إعادة الاشتراك في أي وقت.",
+      "endOfBillingPeriod": "نهاية فترة الفوترة",
+      "failed": "فشل إلغاء الاشتراك",
+      "keepSubscription": "الاحتفاظ بالاشتراك",
+      "title": "إلغاء الاشتراك"
+    },
+    "cancelSubscription": "إلغاء الاشتراك",
+    "cancelSuccess": "تم إلغاء الاشتراك بنجاح",
+    "canceled": "تم الإلغاء",
+    "canceledCard": {
+      "description": "لن يتم خصم أي رسوم أخرى منك. ستبقى ميزاتك نشطة حتى {date}.",
+      "title": "تم إلغاء اشتراكك"
+    },
+    "changeTo": "تغيير إلى {plan}",
+    "chooseBestPlanWorkspace": "اختر أفضل خطة لمساحة العمل الخاصة بك",
     "comfyCloud": "Comfy Cloud",
+    "comfyCloudLogo": "شعار Comfy Cloud",
+    "contactOwnerToSubscribe": "يرجى التواصل مع مالك مساحة العمل للاشتراك",
+    "contactUs": "تواصل معنا",
+    "creditsRemainingThisMonth": "الرصيد المتبقي لهذا الشهر",
+    "creditsRemainingThisYear": "الرصيد المتبقي لهذا العام",
+    "creditsYouveAdded": "الرصيد الذي أضفته",
+    "currentPlan": "الخطة الحالية",
+    "customLoRAsLabel": "استيراد LoRAs الخاصة بك",
+    "description": "اختر الخطة الأنسب لك",
+    "descriptionWorkspace": "اختر أفضل خطة لمساحة العمل الخاصة بك",
     "expiresDate": "ينتهي في {date}",
+    "freeTier": {
+      "description": "تشمل خطتك المجانية {credits} رصيد شهري لتجربة Comfy Cloud.",
+      "descriptionGeneric": "تشمل خطتك المجانية رصيدًا شهريًا لتجربة Comfy Cloud.",
+      "nextRefresh": "سيتم تجديد رصيدك في {date}.",
+      "outOfCredits": {
+        "subtitle": "اشترك لفتح الشحن والمزيد",
+        "title": "لقد نفد رصيدك المجاني"
+      },
+      "subscribeCta": "اشترك للمزيد",
+      "title": "أنت على الخطة المجانية",
+      "topUpBlocked": {
+        "title": "افتح الشحن والمزيد"
+      },
+      "upgradeCta": "عرض الخطط"
+    },
+    "gpuLabel": "RTX 6000 Pro (ذاكرة 96GB VRAM)",
+    "haveQuestions": "هل لديك أسئلة أو ترغب في معرفة المزيد عن المؤسسات؟",
     "invoiceHistory": "سجل الفواتير",
     "learnMore": "معرفة المزيد",
+    "managePayment": "إدارة الدفع",
+    "managePlan": "إدارة الخطة",
     "manageSubscription": "إدارة الاشتراك",
+    "maxDuration": {
+      "creator": "30 دقيقة",
+      "founder": "30 دقيقة",
+      "free": "٣٠ دقيقة",
+      "pro": "ساعة واحدة",
+      "standard": "30 دقيقة"
+    },
+    "maxDurationLabel": "الحد الأقصى لمدة تشغيل كل سير عمل",
+    "maxMembersLabel": "الحد الأقصى للأعضاء",
+    "member": "عضو",
+    "memberCount": "{count} عضو | {count} أعضاء",
+    "membersLabel": "حتى {count} عضو",
     "messageSupport": "مراسلة الدعم",
+    "monthly": "شهري",
     "monthlyBonusDescription": "مكافأة الرصيد الشهرية",
+    "monthlyCreditsInfo": "يتم تحديث هذا الرصيد شهريًا ولا ينتقل للشهر التالي",
+    "monthlyCreditsLabel": "الرصيد الشهري",
+    "monthlyCreditsPerMemberLabel": "الرصيد الشهري / عضو",
     "monthlyCreditsRollover": "سيتم ترحيل هذا الرصيد إلى الشهر التالي",
+    "mostPopular": "الأكثر شيوعًا",
     "nextBillingCycle": "دورة الفوترة التالية",
+    "nextMonthInvoice": "فاتورة الشهر القادم",
     "partnerNodesBalance": "رصيد \"عُقَد الشريك\"",
     "partnerNodesCredits": "رصيد العقد الشريكة",
     "partnerNodesDescription": "لتشغيل النماذج التجارية/المملوكة",
     "perMonth": "دولار أمريكي / شهر",
+    "plansAndPricing": "الخطط والأسعار",
     "prepaidCreditsInfo": "رصيد تم شراؤه بشكل منفصل ولا ينتهي صلاحيته",
     "prepaidDescription": "رصيد مسبق الدفع",
+    "preview": {
+      "addCreditCard": "إضافة بطاقة ائتمان",
+      "backToAllPlans": "العودة إلى جميع الخطط",
+      "confirm": "تأكيد",
+      "confirmPayment": "تأكيد الدفع",
+      "confirmPlanChange": "تأكيد تغيير الخطة",
+      "eachMonthCreditsRefill": "يتم إعادة تعبئة الرصيد كل شهر إلى",
+      "ends": "ينتهي في {date}",
+      "hideFeatures": "إخفاء الميزات",
+      "nextPaymentDue": "الدفع القادم مستحق في {date}. يمكنك الإلغاء في أي وقت.",
+      "perMember": "/ عضو",
+      "privacyPolicy": "سياسة الخصوصية",
+      "proratedCharge": "رسوم نسبية لخطة {plan}",
+      "proratedRefund": "استرداد نسبي لخطة {plan}",
+      "showMoreFeatures": "عرض المزيد من الميزات",
+      "starting": "يبدأ في {date}",
+      "startingToday": "يبدأ اليوم",
+      "terms": "الشروط",
+      "termsAgreement": "بالمتابعة، أنت توافق على {terms} و{privacy} الخاصة بـ Comfy Org.",
+      "totalDueToday": "الإجمالي المستحق اليوم"
+    },
     "renewsDate": "تجديد في {date}",
     "required": {
+      "pollingFailed": "فشل تفعيل الاشتراك",
+      "pollingSuccess": "تم تفعيل الاشتراك بنجاح!",
+      "pollingTimeout": "انتهت مهلة انتظار الاشتراك. يرجى التحديث والمحاولة مرة أخرى.",
       "subscribe": "اشتراك",
       "title": "الاشتراك في",
       "waitingForSubscription": "أكمل اشتراكك في علامة التبويب الجديدة. سنكتشف تلقائيًا عند الانتهاء!"
     },
+    "resubscribe": "إعادة الاشتراك",
+    "resubscribeSuccess": "تمت إعادة تفعيل الاشتراك بنجاح",
+    "resubscribeTo": "إعادة الاشتراك في {plan}",
+    "subscribeForMore": "ترقية",
     "subscribeNow": "اشترك الآن",
+    "subscribeTo": "اشترك في {plan}",
     "subscribeToComfyCloud": "الاشتراك في Comfy Cloud",
     "subscribeToRun": "اشتراك",
     "subscribeToRunFull": "الاشتراك للتشغيل",
+    "subscriptionRequiredMessage": "الاشتراك مطلوب للأعضاء لتشغيل سير العمل على السحابة",
+    "tierNameYearly": "{name} سنوي",
+    "tiers": {
+      "creator": {
+        "name": "المُبدع"
+      },
+      "founder": {
+        "name": "إصدار المؤسس"
+      },
+      "free": {
+        "name": "مجاني"
+      },
+      "pro": {
+        "name": "احترافي"
+      },
+      "standard": {
+        "name": "قياسي"
+      }
+    },
     "title": "الاشتراك",
     "titleUnsubscribed": "اشترك في Comfy Cloud",
     "totalCredits": "إجمالي الرصيد",
+    "upgrade": "ترقية",
+    "upgradePlan": "ترقية الخطة",
+    "upgradeTo": "الترقية إلى {plan}",
+    "upgradeToAddCredits": "قم بالترقية لإضافة أرصدة",
+    "usdPerMonth": "دولار أمريكي / شهريًا",
+    "usdPerMonthPerMember": "دولار أمريكي / شهر / عضو",
+    "videoEstimateExplanation": "هذه التقديرات مبنية على قالب Wan 2.2 لتحويل الصورة إلى فيديو باستخدام الإعدادات الافتراضية (5 ثوانٍ، 640x640، 16 إطار/ثانية، 4 خطوات أخذ عينات).",
+    "videoEstimateHelp": "مزيد من التفاصيل حول هذا القالب",
+    "videoEstimateLabel": "العدد التقريبي لمقاطع الفيديو 5 ثوانٍ التي يتم إنشاؤها باستخدام قالب Wan 2.2 لتحويل الصورة إلى فيديو",
+    "videoEstimateTryTemplate": "جرّب هذا القالب",
+    "videoTemplateBasedCredits": "مقاطع الفيديو التي تم إنشاؤها باستخدام Wan 2.2 لتحويل الصورة إلى فيديو",
+    "viewEnterprise": "عرض المؤسسات",
     "viewMoreDetails": "عرض المزيد من التفاصيل",
+    "viewMoreDetailsPlans": "عرض المزيد من التفاصيل حول الخطط والأسعار",
     "viewUsageHistory": "عرض سجل الاستخدام",
+    "workspaceNotSubscribed": "هذه مساحة العمل ليست مشتركة",
+    "yearly": "سنوي",
+    "yearlyCreditsLabel": "إجمالي الرصيد السنوي",
+    "yearlyDiscount": "خصم 20%",
     "yourPlanIncludes": "خطتك تشمل:"
   },
   "tabMenu": {
@@ -1751,8 +2982,14 @@
     "duplicateTab": "تكرار التبويب",
     "removeFromBookmarks": "إزالة من العلامات"
   },
+  "templateWidgets": {
+    "sort": {
+      "searchPlaceholder": "بحث..."
+    }
+  },
   "templateWorkflows": {
     "activeFilters": "المرشحات:",
+    "allTemplates": "جميع القوالب",
     "categories": "الفئات",
     "category": {
       "3D": "ثلاثي الأبعاد",
@@ -1779,6 +3016,7 @@
     "error": {
       "templateNotFound": "النموذج \"{templateName}\" غير موجود"
     },
+    "licenseFilter": "الرخصة",
     "loading": "جارٍ تحميل القوالب...",
     "loadingMore": "تحميل المزيد من القوالب...",
     "modelFilter": "مرشح النماذج",
@@ -1795,14 +3033,19 @@
       "default": "الافتراضي",
       "modelSizeLowToHigh": "حجم النموذج (من الأقل إلى الأعلى)",
       "newest": "الأحدث",
+      "popular": "الأكثر شيوعًا",
       "recommended": "موصى به",
       "searchPlaceholder": "بحث...",
       "vramLowToHigh": "استخدام VRAM (من الأقل إلى الأعلى)"
     },
     "sorting": "ترتيب حسب",
     "title": "ابدأ باستخدام قالب",
+    "useCaseFilter": "المهام",
     "useCasesSelected": "{count} حالات استخدام"
   },
+  "templates": {
+    "logoProviderSeparator": " و "
+  },
   "toastMessages": {
     "cannotCreateSubgraph": "لا يمكن إنشاء مخطط فرعي",
     "couldNotDetermineFileType": "تعذر تحديد نوع الملف",
@@ -1810,6 +3053,7 @@
     "emptyCanvas": "لوحة فارغة",
     "errorCopyImage": "خطأ في نسخ الصورة: {error}",
     "errorLoadingModel": "خطأ في تحميل النموذج",
+    "errorOpenImage": "حدث خطأ أثناء فتح الصورة: {error}",
     "errorSaveSetting": "خطأ في حفظ الإعداد {id}: {err}",
     "exportSuccess": "تم تصدير النموذج بنجاح كـ {format}",
     "failedExecutionPathResolution": "تعذر حل المسار إلى العُقَد المحددة",
@@ -1829,9 +3073,23 @@
     "failedToLoadModel": "فشل في تحميل النموذج ثلاثي الأبعاد",
     "failedToPurchaseCredits": "فشل في شراء الرصيد: {error}",
     "failedToQueue": "فشل في الإضافة إلى قائمة الانتظار",
+    "failedToSaveDraft": "فشل في حفظ مسودة سير العمل",
+    "failedToToggleCamera": "فشل في تبديل الكاميرا",
+    "failedToToggleGrid": "فشل في تبديل الشبكة",
+    "failedToUpdateBackgroundColor": "فشل في تحديث لون الخلفية",
+    "failedToUpdateBackgroundImage": "فشل في تحديث صورة الخلفية",
+    "failedToUpdateBackgroundRenderMode": "فشل في تحديث وضع عرض الخلفية إلى {mode}",
+    "failedToUpdateEdgeThreshold": "فشل في تحديث عتبة الحافة",
+    "failedToUpdateFOV": "فشل في تحديث مجال الرؤية",
+    "failedToUpdateLightIntensity": "فشل في تحديث شدة الإضاءة",
+    "failedToUpdateMaterialMode": "فشل في تحديث وضع المادة",
+    "failedToUpdateUpDirection": "فشل في تحديث اتجاه الأعلى",
+    "failedToUploadBackgroundImage": "فشل في رفع صورة الخلفية",
     "fileLoadError": "غير قادر على إيجاد سير العمل في {fileName}",
+    "fileTooLarge": "الملف كبير جدًا ({size} ميجابايت). الحد الأقصى المدعوم هو {maxSize} ميجابايت",
     "fileUploadFailed": "فشل رفع الملف",
     "interrupted": "تم إيقاف التنفيذ",
+    "legacyMaskEditorDeprecated": "محرر القناع القديم لم يعد مدعوماً وسيتم إزالته قريباً.",
     "migrateToLitegraphReroute": "سيتم إزالة عقد إعادة التوجيه في الإصدارات المستقبلية. انقر للترحيل إلى إعادة التوجيه الأصلية في Litegraph.",
     "modelLoadedSuccessfully": "تم تحميل النموذج ثلاثي الأبعاد بنجاح",
     "no3dScene": "لا يوجد مشهد ثلاثي الأبعاد لتطبيق الخامة",
@@ -1858,12 +3116,14 @@
     "selectUser": "اختر مستخدم"
   },
   "userSettings": {
+    "accountSettings": "إعدادات الحساب",
     "email": "البريد الإلكتروني",
     "name": "الاسم",
     "notSet": "غير محدد",
     "provider": "مزود تسجيل الدخول",
     "title": "إعدادات المستخدم",
-    "updatePassword": "تحديث كلمة المرور"
+    "updatePassword": "تحديث كلمة المرور",
+    "workspaceSettings": "إعدادات مساحة العمل"
   },
   "validation": {
     "descriptionRequired": "الوصف مطلوب",
@@ -1892,35 +3152,230 @@
     "updateFrontend": "تحديث الواجهة الأمامية"
   },
   "vueNodesBanner": {
+    "desc": "– سير عمل أكثر مرونة، أدوات جديدة قوية، مصمم للتوسعة",
+    "title": "تقديم Nodes 2.0",
     "tryItOut": "جربه"
   },
   "vueNodesMigration": {
     "button": "فتح الإعدادات",
     "message": "هل تفضل تصميم العُقد الكلاسيكي؟"
   },
+  "vueNodesMigrationMainMenu": {
+    "message": "يمكنك العودة إلى Nodes 2.0 في أي وقت من القائمة الرئيسية."
+  },
+  "vueNodesSlot": {
+    "iterative": "(تكراري)"
+  },
   "welcome": {
     "getStarted": "ابدأ الآن",
     "title": "مرحباً بك في ComfyUI"
   },
   "whatsNewPopup": {
+    "later": "لاحقًا",
     "learnMore": "اعرف المزيد",
     "noReleaseNotes": "لا توجد ملاحظات إصدار متاحة."
   },
+  "widgetFileUpload": {
+    "browseFiles": "تصفح الملفات",
+    "dropPrompt": "أسقط ملفك أو"
+  },
   "widgets": {
+    "boolean": {
+      "false": "خطأ",
+      "true": "صحيح"
+    },
+    "node2only": "فقط Node 2.0",
     "selectModel": "اختر نموذج",
     "uploadSelect": {
+      "maxSelectionReached": "تم الوصول إلى الحد الأقصى للاختيار",
       "placeholder": "اختر...",
       "placeholderAudio": "اختر صوت...",
       "placeholderImage": "اختر صورة...",
+      "placeholderMesh": "اختر شبكة...",
       "placeholderModel": "اختر نموذج...",
       "placeholderUnknown": "اختر وسائط...",
       "placeholderVideo": "اختر فيديو..."
+    },
+    "valueControl": {
+      "decrement": "إنقاص القيمة",
+      "decrementDesc": "يطرح 1 من القيمة أو يختار الخيار السابق",
+      "editSettings": "تعديل إعدادات التحكم",
+      "fixed": "قيمة ثابتة",
+      "fixedDesc": "يترك القيمة بدون تغيير",
+      "header": {
+        "after": "بعد",
+        "before": "قبل",
+        "postfix": "تشغيل سير العمل:",
+        "prefix": "تحديث القيمة تلقائيًا"
+      },
+      "increment": "زيادة القيمة",
+      "incrementDesc": "يضيف 1 إلى القيمة أو يختار الخيار التالي",
+      "linkToGlobal": "ربط بـ",
+      "linkToGlobalDesc": "قيمة فريدة مرتبطة بإعداد التحكم في القيمة العامة",
+      "linkToGlobalSeed": "القيمة العامة",
+      "randomize": "توليد قيمة عشوائية",
+      "randomizeDesc": "يتم خلط القيمة عشوائيًا بعد كل توليد"
     }
   },
   "workflowService": {
     "enterFilename": "أدخل اسم الملف",
+    "enterFilenamePrompt": "أدخل اسم الملف:",
     "exportWorkflow": "تصدير سير العمل",
-    "saveWorkflow": "حفظ سير العمل"
+    "saveWorkflow": "حفظ سير العمل",
+    "savedAsApp": "تم التحويل إلى سير عمل تطبيق",
+    "savedAsWorkflow": "تم التحويل إلى سير عمل مخطط العقد فقط"
+  },
+  "workspace": {
+    "addedToWorkspace": "تمت إضافتك إلى {workspaceName}",
+    "inviteAccepted": "تم قبول الدعوة",
+    "inviteFailed": "فشل في قبول الدعوة",
+    "unsavedChanges": {
+      "message": "لديك تغييرات غير محفوظة. هل تريد تجاهلها والانتقال إلى مساحة عمل أخرى؟",
+      "title": "تغييرات غير محفوظة"
+    },
+    "viewWorkspace": "عرض مساحة العمل"
+  },
+  "workspaceAuth": {
+    "errors": {
+      "accessDenied": "ليس لديك صلاحية الوصول إلى هذه مساحة العمل",
+      "invalidFirebaseToken": "فشل التحقق من الهوية. يرجى محاولة تسجيل الدخول مرة أخرى.",
+      "notAuthenticated": "يجب تسجيل الدخول للوصول إلى مساحات العمل",
+      "tokenExchangeFailed": "فشل التحقق من مساحة العمل: {error}",
+      "workspaceNotFound": "لم يتم العثور على مساحة العمل"
+    }
+  },
+  "workspacePanel": {
+    "createWorkspaceDialog": {
+      "create": "إنشاء",
+      "message": "تتيح مساحات العمل للأعضاء مشاركة رصيد واحد. ستصبح المالك بعد الإنشاء.",
+      "nameLabel": "اسم مساحة العمل*",
+      "namePlaceholder": "أدخل اسم مساحة العمل",
+      "title": "إنشاء مساحة عمل جديدة"
+    },
+    "dashboard": {
+      "placeholder": "إعدادات مساحة عمل لوحة التحكم"
+    },
+    "deleteDialog": {
+      "message": "سيتم فقدان أي أرصدة غير مستخدمة أو أصول غير محفوظة. لا يمكن التراجع عن هذا الإجراء.",
+      "messageWithName": "حذف \"{name}\"؟ سيتم فقدان أي أرصدة غير مستخدمة أو أصول غير محفوظة. لا يمكن التراجع عن هذا الإجراء.",
+      "title": "حذف هذه المساحة؟"
+    },
+    "editWorkspaceDialog": {
+      "nameLabel": "اسم مساحة العمل",
+      "save": "حفظ",
+      "title": "تعديل تفاصيل مساحة العمل"
+    },
+    "invite": "دعوة",
+    "inviteLimitReached": "لقد وصلت إلى الحد الأقصى وهو ٥٠ عضواً",
+    "inviteMember": "دعوة عضو",
+    "inviteMemberDialog": {
+      "createLink": "إنشاء الرابط",
+      "linkCopied": "تم النسخ",
+      "linkCopyFailed": "فشل في نسخ الرابط",
+      "linkStep": {
+        "copyLink": "نسخ الرابط",
+        "done": "تم",
+        "message": "تأكد من أن حسابه يستخدم هذا البريد الإلكتروني.",
+        "title": "أرسل هذا الرابط إلى الشخص"
+      },
+      "message": "أنشئ رابط دعوة قابل للمشاركة لإرساله إلى شخص ما",
+      "placeholder": "أدخل بريد الشخص الإلكتروني",
+      "title": "دعوة شخص إلى هذه المساحة"
+    },
+    "inviteUpsellDialog": {
+      "messageNotSubscribed": "لإضافة أعضاء فريق إلى مساحة العمل هذه، تحتاج إلى خطة Creator أو أعلى. خطة Standard تدعم مقعدًا واحدًا فقط (المالك).",
+      "messageSingleSeat": "خطة Standard تتضمن مقعدًا واحدًا فقط لمالك مساحة العمل. لدعوة أعضاء إضافيين، قم بالترقية إلى خطة Creator أو أعلى لتفعيل المقاعد المتعددة.",
+      "titleNotSubscribed": "الاشتراك مطلوب لدعوة الأعضاء",
+      "titleSingleSeat": "خطتك الحالية تدعم مقعدًا واحدًا فقط",
+      "upgradeToCreator": "الترقية إلى Creator",
+      "viewPlans": "عرض الخطط"
+    },
+    "leaveDialog": {
+      "leave": "مغادرة",
+      "message": "لن تتمكن من الانضمام مرة أخرى إلا إذا تواصلت مع مالك مساحة العمل.",
+      "title": "مغادرة هذه المساحة؟"
+    },
+    "members": {
+      "actions": {
+        "copyLink": "نسخ رابط الدعوة",
+        "removeMember": "إزالة العضو",
+        "revokeInvite": "إلغاء الدعوة"
+      },
+      "columns": {
+        "expiryDate": "تاريخ الانتهاء",
+        "inviteDate": "تاريخ الدعوة",
+        "joinDate": "تاريخ الانضمام"
+      },
+      "createNewWorkspace": "أنشئ واحدة جديدة.",
+      "membersCount": "{count}/٥٠ عضواً",
+      "noInvites": "لا توجد دعوات معلقة",
+      "noMembers": "لا يوجد أعضاء",
+      "pendingInvitesCount": "{count} دعوة معلقة | {count} دعوات معلقة",
+      "personalWorkspaceMessage": "لا يمكنك دعوة أعضاء آخرين إلى مساحة العمل الشخصية حالياً. لإضافة أعضاء إلى مساحة عمل،",
+      "tabs": {
+        "active": "نشط",
+        "pendingCount": "معلق ({count})"
+      },
+      "upsellBannerSubscribe": "اشترك في خطة Creator أو أعلى لدعوة أعضاء الفريق إلى مساحة العمل هذه.",
+      "upsellBannerUpgrade": "قم بالترقية إلى خطة Creator أو أعلى لدعوة أعضاء فريق إضافيين.",
+      "viewPlans": "عرض الخطط"
+    },
+    "menu": {
+      "deleteWorkspace": "حذف مساحة العمل",
+      "deleteWorkspaceDisabledTooltip": "يرجى إلغاء الاشتراك النشط لمساحة العمل أولاً",
+      "editWorkspace": "تعديل تفاصيل مساحة العمل",
+      "leaveWorkspace": "مغادرة مساحة العمل"
+    },
+    "removeMemberDialog": {
+      "error": "فشل في إزالة العضو",
+      "message": "سيتم إزالة هذا العضو من مساحة العمل الخاصة بك. لن يتم استرداد الأرصدة التي استخدمها.",
+      "remove": "إزالة العضو",
+      "success": "تمت إزالة العضو",
+      "title": "إزالة هذا العضو؟"
+    },
+    "revokeInviteDialog": {
+      "message": "لن يتمكن هذا العضو من الانضمام إلى مساحة العمل الخاصة بك بعد الآن. سيتم إبطال رابط الدعوة الخاص به.",
+      "revoke": "إلغاء الدعوة",
+      "title": "إلغاء دعوة هذا الشخص؟"
+    },
+    "tabs": {
+      "dashboard": "لوحة التحكم",
+      "membersCount": "الأعضاء ({count})",
+      "planCredits": "الخطة والأرصدة"
+    },
+    "toast": {
+      "failedToCreateWorkspace": "فشل في إنشاء مساحة العمل",
+      "failedToDeleteWorkspace": "فشل في حذف مساحة العمل",
+      "failedToFetchWorkspaces": "فشل في تحميل مساحات العمل",
+      "failedToLeaveWorkspace": "فشل في مغادرة مساحة العمل",
+      "failedToUpdateWorkspace": "فشل في تحديث مساحة العمل",
+      "workspaceCreated": {
+        "message": "اشترك في خطة، وادعُ زملاءك، وابدأ التعاون.",
+        "subscribe": "اشترك",
+        "title": "تم إنشاء مساحة العمل"
+      },
+      "workspaceDeleted": {
+        "message": "تم حذف مساحة العمل نهائياً.",
+        "title": "تم حذف مساحة العمل"
+      },
+      "workspaceLeft": {
+        "message": "لقد غادرت مساحة العمل.",
+        "title": "تمت مغادرة مساحة العمل"
+      },
+      "workspaceUpdated": {
+        "message": "تم حفظ تفاصيل مساحة العمل.",
+        "title": "تم تحديث مساحة العمل"
+      }
+    }
+  },
+  "workspaceSwitcher": {
+    "createWorkspace": "إنشاء مساحة عمل جديدة",
+    "maxWorkspacesReached": "يمكنك امتلاك ١٠ مساحات عمل فقط. احذف واحدة لإنشاء مساحة جديدة.",
+    "personal": "شخصي",
+    "roleMember": "عضو",
+    "roleOwner": "المالك",
+    "subscribe": "اشترك",
+    "switchWorkspace": "تبديل مساحة العمل"
   },
   "zoomControls": {
     "hideMinimap": "إخفاء الخريطة المصغرة",
diff --git a/src/locales/ar/nodeDefs.json b/src/locales/ar/nodeDefs.json
index 06e0df1397..7fb78692e0 100644
--- a/src/locales/ar/nodeDefs.json
+++ b/src/locales/ar/nodeDefs.json
@@ -39,6 +39,87 @@
       "sigmas": {
         "name": "سيغما"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "AddTextPrefix": {
+    "display_name": "إضافة بادئة نصية",
+    "inputs": {
+      "prefix": {
+        "name": "البادئة",
+        "tooltip": "البادئة التي ستتم إضافتها."
+      },
+      "texts": {
+        "name": "النصوص",
+        "tooltip": "النص المراد معالجته."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "النصوص",
+        "tooltip": "النصوص المعالجة"
+      }
+    }
+  },
+  "AddTextSuffix": {
+    "display_name": "إضافة لاحقة نصية",
+    "inputs": {
+      "suffix": {
+        "name": "اللاحقة",
+        "tooltip": "اللاحقة التي ستتم إضافتها."
+      },
+      "texts": {
+        "name": "النصوص",
+        "tooltip": "النص المراد معالجته."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "النصوص",
+        "tooltip": "النصوص المعالجة"
+      }
+    }
+  },
+  "AdjustBrightness": {
+    "display_name": "ضبط السطوع",
+    "inputs": {
+      "factor": {
+        "name": "عامل السطوع",
+        "tooltip": "عامل السطوع. 1.0 = بدون تغيير، <1.0 = أغمق، >1.0 = أكثر سطوعًا."
+      },
+      "images": {
+        "name": "الصور",
+        "tooltip": "الصورة المراد معالجتها."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "الصور",
+        "tooltip": "الصور المعالجة"
+      }
+    }
+  },
+  "AdjustContrast": {
+    "display_name": "ضبط التباين",
+    "inputs": {
+      "factor": {
+        "name": "عامل التباين",
+        "tooltip": "عامل التباين. 1.0 = بدون تغيير، <1.0 = تباين أقل، >1.0 = تباين أكثر."
+      },
+      "images": {
+        "name": "الصور",
+        "tooltip": "الصورة المراد معالجتها."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "الصور",
+        "tooltip": "الصور المعالجة"
+      }
     }
   },
   "AlignYourStepsScheduler": {
@@ -70,6 +151,11 @@
         "name": "مستوى الصوت",
         "tooltip": "ضبط مستوى الصوت بالديسيبل (dB). 0 = لا تغيير، +6 = مضاعفة، -6 = النصف، إلخ"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "AudioConcat": {
@@ -86,6 +172,11 @@
         "name": "الاتجاه",
         "tooltip": "ما إذا كان سيتم إلحاق الصوت2 بعد أو قبل الصوت1."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "AudioEncoderEncode": {
@@ -117,6 +208,47 @@
       }
     }
   },
+  "AudioEqualizer3Band": {
+    "display_name": "موازن الصوت (٣ نطاقات)",
+    "inputs": {
+      "audio": {
+        "name": "الصوت"
+      },
+      "high_freq": {
+        "name": "تردد الحدة",
+        "tooltip": "تردد القطع للنطاق العالي"
+      },
+      "high_gain_dB": {
+        "name": "تعزيز الحدة (ديسيبل)",
+        "tooltip": "التحكم في مستوى الترددات العالية (الحدة)"
+      },
+      "low_freq": {
+        "name": "تردد الجهير",
+        "tooltip": "تردد القطع للنطاق المنخفض"
+      },
+      "low_gain_dB": {
+        "name": "تعزيز الجهير (ديسيبل)",
+        "tooltip": "التحكم في مستوى الترددات المنخفضة (الجهير)"
+      },
+      "mid_freq": {
+        "name": "تردد الوسطى",
+        "tooltip": "تردد المركز للنطاق المتوسط"
+      },
+      "mid_gain_dB": {
+        "name": "تعزيز الوسطى (ديسيبل)",
+        "tooltip": "التحكم في مستوى الترددات المتوسطة"
+      },
+      "mid_q": {
+        "name": "عامل Q للوسطى",
+        "tooltip": "معامل Q (عرض النطاق) للترددات المتوسطة"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "AudioMerge": {
     "description": "دمج مسارين صوتيين عن طريق تراكب موجاتهما.",
     "display_name": "دمج الصوت",
@@ -131,6 +263,11 @@
         "name": "طريقة الدمج",
         "tooltip": "الطريقة المستخدمة لدمج الموجات الصوتية."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "BasicGuider": {
@@ -142,6 +279,11 @@
       "model": {
         "name": "النموذج"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "BasicScheduler": {
@@ -159,6 +301,50 @@
       "steps": {
         "name": "الخطوات"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchImagesNode": {
+    "display_name": "تجميع الصور",
+    "inputs": {
+      "images": {
+        "name": "الصور"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchLatentsNode": {
+    "display_name": "تجميع الكامنات",
+    "inputs": {
+      "latents": {
+        "name": "الكامنات"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchMasksNode": {
+    "display_name": "تجميع الأقنعة",
+    "inputs": {
+      "masks": {
+        "name": "الأقنعة"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "BetaSamplingScheduler": {
@@ -176,6 +362,114 @@
       "steps": {
         "name": "الخطوات"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BriaImageEditNode": {
+    "description": "حرر الصور باستخدام أحدث نموذج من Bria",
+    "display_name": "تحرير صورة Bria",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "guidance_scale": {
+        "name": "مقياس التوجيه",
+        "tooltip": "القيمة الأعلى تجعل الصورة تتبع التوجيه بشكل أدق."
+      },
+      "image": {
+        "name": "الصورة"
+      },
+      "mask": {
+        "name": "القناع",
+        "tooltip": "إذا لم يتم تحديده، سيتم تطبيق التحرير على الصورة بالكامل."
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "moderation": {
+        "name": "الإشراف",
+        "tooltip": "إعدادات الإشراف"
+      },
+      "negative_prompt": {
+        "name": "توجيه سلبي"
+      },
+      "prompt": {
+        "name": "التوجيه",
+        "tooltip": "تعليمات لتحرير الصورة"
+      },
+      "seed": {
+        "name": "البذرة"
+      },
+      "steps": {
+        "name": "الخطوات"
+      },
+      "structured_prompt": {
+        "name": "توجيه منظم",
+        "tooltip": "سلسلة نصية تحتوي على توجيه التحرير المنظم بصيغة JSON. استخدم هذا بدلاً من التوجيه المعتاد للتحكم الدقيق والبرمجي."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "توجيه منظم",
+        "tooltip": null
+      }
+    }
+  },
+  "BriaRemoveImageBackground": {
+    "description": "إزالة الخلفية من صورة باستخدام Bria RMBG 2.0.",
+    "display_name": "Bria إزالة خلفية الصورة",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "image": {
+        "name": "صورة"
+      },
+      "moderation": {
+        "name": "الإشراف",
+        "tooltip": "إعدادات الإشراف"
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "تتحكم البذرة فيما إذا كان يجب إعادة تشغيل العقدة؛ النتائج غير حتمية بغض النظر عن البذرة."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BriaRemoveVideoBackground": {
+    "description": "إزالة الخلفية من فيديو باستخدام Bria.",
+    "display_name": "Bria إزالة خلفية الفيديو",
+    "inputs": {
+      "background_color": {
+        "name": "لون الخلفية",
+        "tooltip": "لون الخلفية للفيديو الناتج."
+      },
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "تتحكم البذرة فيما إذا كان يجب إعادة تشغيل العقدة؛ النتائج غير حتمية بغض النظر عن البذرة."
+      },
+      "video": {
+        "name": "فيديو"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ByteDanceFirstLastFrameNode": {
@@ -201,6 +495,10 @@
         "name": "الإطار_الأول",
         "tooltip": "الإطار الأول الذي سيتم استخدامه للفيديو."
       },
+      "generate_audio": {
+        "name": "توليد الصوت",
+        "tooltip": "يتم تجاهل هذا المعامل لجميع النماذج باستثناء seedance-1-5-pro."
+      },
       "last_frame": {
         "name": "الإطار_الأخير",
         "tooltip": "الإطار الأخير الذي سيتم استخدامه للفيديو."
@@ -231,43 +529,6 @@
       }
     }
   },
-  "ByteDanceImageEditNode": {
-    "description": "تحرير الصور باستخدام نماذج ByteDance عبر واجهة برمجة التطبيقات بناءً على المطالبة النصية",
-    "display_name": "تحرير الصور من ByteDance",
-    "inputs": {
-      "control_after_generate": {
-        "name": "التحكم بعد التوليد"
-      },
-      "guidance_scale": {
-        "name": "مقياس التوجيه",
-        "tooltip": "القيمة الأعلى تجعل الصورة تتبع النص الموجه بشكل أكبر"
-      },
-      "image": {
-        "name": "الصورة",
-        "tooltip": "الصورة الأساسية للتحرير"
-      },
-      "model": {
-        "name": "النموذج"
-      },
-      "prompt": {
-        "name": "المطالبة النصية",
-        "tooltip": "تعليمات لتحرير الصورة"
-      },
-      "seed": {
-        "name": "البذرة",
-        "tooltip": "البذرة المستخدمة في التوليد"
-      },
-      "watermark": {
-        "name": "علامة مائية",
-        "tooltip": "ما إذا كان سيتم إضافة علامة مائية \"تم إنشاؤها بالذكاء الاصطناعي\" إلى الصورة"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
   "ByteDanceImageNode": {
     "description": "إنشاء الصور باستخدام نماذج ByteDance عبر API استنادًا إلى النص الموجه",
     "display_name": "صورة ByteDance",
@@ -377,6 +638,10 @@
         "name": "duration",
         "tooltip": "مدة الفيديو الناتج بالثواني."
       },
+      "generate_audio": {
+        "name": "توليد الصوت",
+        "tooltip": "يتم تجاهل هذا المعامل لجميع النماذج باستثناء seedance-1-5-pro."
+      },
       "image": {
         "name": "image",
         "tooltip": "الإطار الأول الذي سيتم استخدامه للفيديو."
@@ -431,8 +696,7 @@
         "tooltip": "الحد الأقصى لعدد الصور التي سيتم توليدها عندما يكون sequential_image_generation='auto'. إجمالي الصور (المدخلة + المولدة) لا يمكن أن يتجاوز 15."
       },
       "model": {
-        "name": "model",
-        "tooltip": "اسم النموذج"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
@@ -484,6 +748,10 @@
         "name": "المدة",
         "tooltip": "مدة الفيديو الناتج بالثواني."
       },
+      "generate_audio": {
+        "name": "توليد الصوت",
+        "tooltip": "يتم تجاهل هذا المعامل لجميع النماذج باستثناء seedance-1-5-pro."
+      },
       "model": {
         "name": "النموذج"
       },
@@ -525,6 +793,11 @@
       "positive": {
         "name": "إيجابي"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "CFGNorm": {
@@ -763,6 +1036,25 @@
       }
     }
   },
+  "CLIPTextEncodeKandinsky5": {
+    "display_name": "CLIPTextEncodeKandinsky5",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "clip_l": {
+        "name": "clip_l"
+      },
+      "qwen25_7b": {
+        "name": "qwen25_7b"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "CLIPTextEncodeLumina2": {
     "description": "يقوم بترميز أمر النظام وأمر المستخدم باستخدام نموذج CLIP إلى تمثيل مضمَّن يمكن استخدامه لتوجيه نموذج الانتشار نحو إنشاء صور محددة.",
     "display_name": "ترميز نص CLIP لـ Lumina2",
@@ -953,6 +1245,29 @@
       }
     }
   },
+  "CenterCropImages": {
+    "display_name": "قص الصور من المنتصف",
+    "inputs": {
+      "height": {
+        "name": "الارتفاع",
+        "tooltip": "ارتفاع القص."
+      },
+      "images": {
+        "name": "الصور",
+        "tooltip": "الصورة المراد معالجتها."
+      },
+      "width": {
+        "name": "العرض",
+        "tooltip": "عرض القص."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "الصور",
+        "tooltip": "الصور المعالجة"
+      }
+    }
+  },
   "CheckpointLoader": {
     "display_name": "تحميل نقطة التحقق مع الإعدادات (متوقف)",
     "inputs": {
@@ -1032,6 +1347,21 @@
       }
     }
   },
+  "ColorToRGBInt": {
+    "description": "تحويل لون إلى قيمة عددية لنظام RGB.",
+    "display_name": "تحويل اللون إلى قيمة RGB عددية",
+    "inputs": {
+      "color": {
+        "name": "اللون"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "قيمة RGB عددية",
+        "tooltip": null
+      }
+    }
+  },
   "CombineHooks2": {
     "display_name": "دمج الخطافات [2]",
     "inputs": {
@@ -1089,6 +1419,26 @@
       }
     }
   },
+  "ComfySwitchNode": {
+    "display_name": "مفتاح التحويل",
+    "inputs": {
+      "on_false": {
+        "name": "عند التعطيل"
+      },
+      "on_true": {
+        "name": "عند التفعيل"
+      },
+      "switch": {
+        "name": "مفتاح التحويل"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "المخرجات",
+        "tooltip": null
+      }
+    }
+  },
   "ConditioningAverage": {
     "display_name": "متوسط التهيئة",
     "inputs": {
@@ -1323,10 +1673,12 @@
     },
     "outputs": {
       "0": {
-        "name": "إيجابي"
+        "name": "إيجابي",
+        "tooltip": null
       },
       "1": {
-        "name": "سلبي"
+        "name": "سلبي",
+        "tooltip": null
       }
     }
   },
@@ -1385,6 +1737,10 @@
         "name": "dim",
         "tooltip": "البعد المراد تطبيق نوافذ السياق عليه."
       },
+      "freenoise": {
+        "name": "ضجيج حر",
+        "tooltip": "ما إذا كان سيتم تطبيق خلط ضجيج FreeNoise، يحسن دمج النوافذ."
+      },
       "fuse_method": {
         "name": "fuse_method",
         "tooltip": "الطريقة المستخدمة لدمج نوافذ السياق."
@@ -1745,6 +2101,20 @@
       }
     }
   },
+  "CreateList": {
+    "display_name": "إنشاء قائمة",
+    "inputs": {
+      "inputs": {
+        "name": "المدخلات"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "قائمة",
+        "tooltip": null
+      }
+    }
+  },
   "CreateVideo": {
     "description": "إنشاء فيديو من الصور.",
     "display_name": "إنشاء فيديو",
@@ -1767,6 +2137,35 @@
       }
     }
   },
+  "CropByBBoxes": {
+    "description": "قص وتغيير حجم المناطق من دفعة الصور المدخلة بناءً على مربعات التحديد المقدمة.",
+    "display_name": "CropByBBoxes",
+    "inputs": {
+      "bboxes": {
+        "name": "مربعات التحديد"
+      },
+      "image": {
+        "name": "الصورة"
+      },
+      "output_height": {
+        "name": "ارتفاع الناتج",
+        "tooltip": "الارتفاع الذي يتم تغيير حجم كل قص إليه."
+      },
+      "output_width": {
+        "name": "عرض الناتج",
+        "tooltip": "العرض الذي يتم تغيير حجم كل قص إليه."
+      },
+      "padding": {
+        "name": "هامش إضافي",
+        "tooltip": "هامش إضافي بالبكسل يُضاف على كل جانب من مربع التحديد قبل القص."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "جميع القصاصات مكدسة في دفعة صور واحدة."
+      }
+    }
+  },
   "CropMask": {
     "display_name": "قص القناع",
     "inputs": {
@@ -1785,6 +2184,30 @@
       "y": {
         "name": "ص"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CustomCombo": {
+    "display_name": "توليفة مخصصة",
+    "inputs": {
+      "choice": {
+        "name": "اختيار"
+      },
+      "index": {},
+      "option1": {}
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "الفهرس",
+        "tooltip": null
+      }
     }
   },
   "DiffControlNetLoader": {
@@ -1823,7 +2246,12 @@
     }
   },
   "DisableNoise": {
-    "display_name": "تعطيل الضجيج"
+    "display_name": "تعطيل الضجيج",
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
   },
   "DualCFGGuider": {
     "display_name": "موجّه CFG مزدوج",
@@ -1849,6 +2277,11 @@
       "style": {
         "name": "النمط"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "DualCLIPLoader": {
@@ -1900,6 +2333,321 @@
       }
     }
   },
+  "ElevenLabsAudioIsolation": {
+    "description": "إزالة الضوضاء الخلفية من الصوت، مع عزل الأصوات أو الكلام.",
+    "display_name": "عزل الصوت من ElevenLabs",
+    "inputs": {
+      "audio": {
+        "name": "الصوت",
+        "tooltip": "الصوت المراد معالجته لإزالة الضوضاء الخلفية."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsInstantVoiceClone": {
+    "description": "إنشاء صوت مستنسخ من عينات صوتية. قدم من ١ إلى ٨ تسجيلات صوتية للصوت المراد استنساخه.",
+    "display_name": "استنساخ الصوت الفوري من ElevenLabs",
+    "inputs": {
+      "files": {
+        "name": "الملفات",
+        "tooltip": "تسجيلات صوتية لاستنساخ الصوت."
+      },
+      "remove_background_noise": {
+        "name": "إزالة الضوضاء الخلفية",
+        "tooltip": "إزالة الضوضاء الخلفية من العينات الصوتية باستخدام عزل الصوت."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "الصوت",
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsSpeechToSpeech": {
+    "description": "تحويل الكلام من صوت إلى آخر مع الحفاظ على المحتوى الأصلي والعاطفة.",
+    "display_name": "تحويل الكلام إلى كلام من ElevenLabs",
+    "inputs": {
+      "audio": {
+        "name": "الصوت",
+        "tooltip": "الصوت المصدر المراد تحويله."
+      },
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "model": {
+        "name": "النموذج",
+        "tooltip": "النموذج المستخدم لتحويل الكلام إلى كلام."
+      },
+      "model_similarity_boost": {
+        "name": "تعزيز التشابه"
+      },
+      "model_speed": {
+        "name": "السرعة"
+      },
+      "model_style": {
+        "name": "النمط"
+      },
+      "model_use_speaker_boost": {
+        "name": "استخدام تعزيز المتحدث"
+      },
+      "output_format": {
+        "name": "صيغة الإخراج",
+        "tooltip": "صيغة إخراج الصوت."
+      },
+      "remove_background_noise": {
+        "name": "إزالة الضوضاء الخلفية",
+        "tooltip": "إزالة الضوضاء الخلفية من الصوت المدخل باستخدام عزل الصوت."
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "بذرة لضمان إمكانية إعادة الإنتاج."
+      },
+      "stability": {
+        "name": "الثبات",
+        "tooltip": "ثبات الصوت. القيم المنخفضة تعطي نطاقًا عاطفيًا أوسع، والقيم الأعلى تنتج كلامًا أكثر اتساقًا ولكن قد يكون رتيبًا."
+      },
+      "voice": {
+        "name": "الصوت",
+        "tooltip": "الصوت المستهدف للتحويل. يمكن الربط من محدد الصوت أو استنساخ الصوت الفوري."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsSpeechToText": {
+    "description": "تحويل الصوت إلى نص. يدعم الكشف التلقائي عن اللغة، تمييز المتحدثين، ووضع علامات على أحداث الصوت.",
+    "display_name": "ElevenLabs تحويل الكلام إلى نص",
+    "inputs": {
+      "audio": {
+        "name": "الصوت",
+        "tooltip": "الصوت المراد تحويله إلى نص."
+      },
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "language_code": {
+        "name": "رمز اللغة",
+        "tooltip": "رمز اللغة وفق معيار ISO-639-1 أو ISO-639-3 (مثال: 'en'، 'es'، 'fra'). اتركه فارغًا للكشف التلقائي."
+      },
+      "model": {
+        "name": "النموذج",
+        "tooltip": "النموذج المستخدم للتحويل."
+      },
+      "model_diarization_threshold": {
+        "name": "عتبة تمييز المتحدثين"
+      },
+      "model_diarize": {
+        "name": "تمييز المتحدثين"
+      },
+      "model_tag_audio_events": {
+        "name": "وضع علامات على أحداث الصوت"
+      },
+      "model_temperature": {
+        "name": "درجة الحرارة"
+      },
+      "model_timestamps_granularity": {
+        "name": "دقة الطوابع الزمنية"
+      },
+      "num_speakers": {
+        "name": "عدد المتحدثين",
+        "tooltip": "الحد الأقصى لعدد المتحدثين المتوقعين. ضع 0 للكشف التلقائي."
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "بذرة لإعادة الإنتاج (لا يضمن الحتمية)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "النص",
+        "tooltip": null
+      },
+      "1": {
+        "name": "رمز اللغة",
+        "tooltip": null
+      },
+      "2": {
+        "name": "كلمات بصيغة JSON",
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToDialogue": {
+    "description": "توليد حوار متعدد المتحدثين من نص. كل جزء من الحوار له نص وصوت خاص به.",
+    "display_name": "ElevenLabs تحويل النص إلى حوار",
+    "inputs": {
+      "apply_text_normalization": {
+        "name": "تطبيق تنسيق النص",
+        "tooltip": "وضع تنسيق النص. 'auto' يترك القرار للنظام، 'on' يطبق التنسيق دائمًا، 'off' يتجاهله."
+      },
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "inputs": {
+        "name": "عدد الحوارات",
+        "tooltip": "عدد أجزاء الحوار."
+      },
+      "inputs_text1": {
+        "name": "النص ١"
+      },
+      "language_code": {
+        "name": "رمز اللغة",
+        "tooltip": "رمز اللغة وفق معيار ISO-639-1 أو ISO-639-3 (مثال: 'en'، 'es'، 'fra'). اتركه فارغًا للكشف التلقائي."
+      },
+      "model": {
+        "name": "النموذج",
+        "tooltip": "النموذج المستخدم لتوليد الحوار."
+      },
+      "output_format": {
+        "name": "صيغة الإخراج",
+        "tooltip": "صيغة إخراج الصوت."
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "بذرة لإعادة الإنتاج."
+      },
+      "stability": {
+        "name": "الثبات",
+        "tooltip": "ثبات الصوت. القيم الأقل تعطي نطاقًا عاطفيًا أوسع، القيم الأعلى تنتج صوتًا أكثر اتساقًا ولكن قد يكون رتيبًا."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToSoundEffects": {
+    "description": "توليد مؤثرات صوتية من أوصاف نصية.",
+    "display_name": "ElevenLabs تحويل النص إلى مؤثرات صوتية",
+    "inputs": {
+      "model": {
+        "name": "النموذج",
+        "tooltip": "النموذج المستخدم لتوليد المؤثر الصوتي."
+      },
+      "model_duration": {
+        "name": "المدة"
+      },
+      "model_loop": {
+        "name": "تكرار"
+      },
+      "model_prompt_influence": {
+        "name": "تأثير الوصف"
+      },
+      "output_format": {
+        "name": "صيغة الإخراج",
+        "tooltip": "صيغة إخراج الصوت."
+      },
+      "text": {
+        "name": "النص",
+        "tooltip": "الوصف النصي للمؤثر الصوتي المراد توليده."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToSpeech": {
+    "description": "تحويل النص إلى كلام.",
+    "display_name": "ElevenLabs تحويل النص إلى كلام",
+    "inputs": {
+      "apply_text_normalization": {
+        "name": "تطبيق تنسيق النص",
+        "tooltip": "وضع تنسيق النص. 'تلقائي' يترك القرار للنظام، 'تشغيل' يطبق التنسيق دائمًا، 'إيقاف' يتخطى التنسيق."
+      },
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "language_code": {
+        "name": "رمز اللغة",
+        "tooltip": "رمز اللغة حسب ISO-639-1 أو ISO-639-3 (مثال: 'en'، 'es'، 'fra'). اتركه فارغًا للكشف التلقائي."
+      },
+      "model": {
+        "name": "النموذج",
+        "tooltip": "النموذج المستخدم لتحويل النص إلى كلام."
+      },
+      "model_similarity_boost": {
+        "name": "تعزيز التشابه"
+      },
+      "model_speed": {
+        "name": "السرعة"
+      },
+      "model_style": {
+        "name": "النمط"
+      },
+      "model_use_speaker_boost": {
+        "name": "استخدام تعزيز المتحدث"
+      },
+      "output_format": {
+        "name": "صيغة الإخراج",
+        "tooltip": "صيغة إخراج الصوت."
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "بذرة لضمان إمكانية إعادة الإنتاج (لا يوجد ضمان للحتمية)."
+      },
+      "stability": {
+        "name": "الثبات",
+        "tooltip": "ثبات الصوت. القيم المنخفضة تعطي نطاقًا عاطفيًا أوسع، والقيم الأعلى تنتج صوتًا أكثر اتساقًا ولكن قد يكون رتيبًا."
+      },
+      "text": {
+        "name": "النص",
+        "tooltip": "النص المراد تحويله إلى كلام."
+      },
+      "voice": {
+        "name": "الصوت",
+        "tooltip": "الصوت المستخدم في توليد الكلام. يمكن الربط من محدد الصوت أو استنساخ الصوت الفوري."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsVoiceSelector": {
+    "description": "اختيار صوت محدد مسبقًا من ElevenLabs لتوليد الكلام.",
+    "display_name": "ElevenLabs محدد الصوت",
+    "inputs": {
+      "voice": {
+        "name": "الصوت",
+        "tooltip": "اختر صوتًا من أصوات ElevenLabs المحددة مسبقًا."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "الصوت",
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyAceStep1_5LatentAudio": {
+    "display_name": "Empty Ace Step 1.5 Latent Audio",
+    "inputs": {
+      "batch_size": {
+        "name": "حجم الدفعة",
+        "tooltip": "عدد صور latent في الدفعة."
+      },
+      "seconds": {
+        "name": "ثواني"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyAceStepLatentAudio": {
     "display_name": "خطوة الصوت الكامن الفارغ",
     "inputs": {
@@ -1932,6 +2680,11 @@
         "name": "معدل العينات",
         "tooltip": "معدل العينات لمقطع الصوت الفارغ."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "EmptyChromaRadianceLatentImage": {
@@ -1975,6 +2728,25 @@
       }
     }
   },
+  "EmptyFlux2LatentImage": {
+    "display_name": "صورة كامنة فارغة من Flux 2",
+    "inputs": {
+      "batch_size": {
+        "name": "حجم الدفعة"
+      },
+      "height": {
+        "name": "الارتفاع"
+      },
+      "width": {
+        "name": "العرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyHunyuanImageLatent": {
     "display_name": "EmptyHunyuanImageLatent",
     "inputs": {
@@ -2016,6 +2788,28 @@
       }
     }
   },
+  "EmptyHunyuanVideo15Latent": {
+    "display_name": "فيديو Hunyuan 1.5 كامن فارغ",
+    "inputs": {
+      "batch_size": {
+        "name": "حجم الدفعة"
+      },
+      "height": {
+        "name": "الارتفاع"
+      },
+      "length": {
+        "name": "الطول"
+      },
+      "width": {
+        "name": "العرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyImage": {
     "display_name": "صورة فارغة",
     "inputs": {
@@ -2065,6 +2859,11 @@
       "seconds": {
         "name": "الثواني"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "EmptyLatentHunyuan3Dv2": {
@@ -2077,6 +2876,11 @@
       "resolution": {
         "name": "الدقة"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "EmptyLatentImage": {
@@ -2124,6 +2928,28 @@
       }
     }
   },
+  "EmptyQwenImageLayeredLatentImage": {
+    "display_name": "صورة Qwen الطبقية الكامنة الفارغة",
+    "inputs": {
+      "batch_size": {
+        "name": "حجم الدفعة"
+      },
+      "height": {
+        "name": "الارتفاع"
+      },
+      "layers": {
+        "name": "الطبقات"
+      },
+      "width": {
+        "name": "العرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptySD3LatentImage": {
     "display_name": "صورة SD3 كامنة فارغة",
     "inputs": {
@@ -2171,6 +2997,11 @@
       "steps": {
         "name": "الخطوات"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ExtendIntermediateSigmas": {
@@ -2191,6 +3022,11 @@
       "steps": {
         "name": "الخطوات"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FeatherMask": {
@@ -2211,6 +3047,11 @@
       "top": {
         "name": "الأعلى"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FlipSigmas": {
@@ -2219,6 +3060,102 @@
       "sigmas": {
         "name": "قيم_السيغما"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Flux2MaxImageNode": {
+    "description": "ينشئ الصور بشكل متزامن بناءً على النص والوَضوح.",
+    "display_name": "Flux.2 [max] صورة",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد الإنشاء"
+      },
+      "height": {
+        "name": "الارتفاع"
+      },
+      "images": {
+        "name": "الصور",
+        "tooltip": "حتى 9 صور يمكن استخدامها كمراجع."
+      },
+      "prompt": {
+        "name": "النص",
+        "tooltip": "النص المستخدم لإنشاء أو تعديل الصورة"
+      },
+      "prompt_upsampling": {
+        "name": "رفع دقة النص",
+        "tooltip": "هل يتم رفع دقة النص؟ إذا كان نشطًا، سيتم تعديل النص تلقائيًا لإنتاج صور أكثر إبداعًا."
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "البذرة العشوائية المستخدمة لإنشاء الضوضاء."
+      },
+      "width": {
+        "name": "العرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Flux2ProImageNode": {
+    "description": "ينشئ الصور بشكل متزامن بناءً على النص والوَضوح.",
+    "display_name": "Flux.2 [pro] صورة",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد الإنشاء"
+      },
+      "height": {
+        "name": "الارتفاع"
+      },
+      "images": {
+        "name": "الصور",
+        "tooltip": "حتى 9 صور يمكن استخدامها كمراجع."
+      },
+      "prompt": {
+        "name": "النص",
+        "tooltip": "النص المستخدم لإنشاء أو تعديل الصورة"
+      },
+      "prompt_upsampling": {
+        "name": "رفع دقة النص",
+        "tooltip": "هل يتم رفع دقة النص؟ إذا كان نشطًا، سيتم تعديل النص تلقائيًا لإنتاج صور أكثر إبداعًا."
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "البذرة العشوائية المستخدمة لإنشاء الضوضاء."
+      },
+      "width": {
+        "name": "العرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Flux2Scheduler": {
+    "display_name": "Flux2Scheduler",
+    "inputs": {
+      "height": {
+        "name": "الارتفاع"
+      },
+      "steps": {
+        "name": "الخطوات"
+      },
+      "width": {
+        "name": "العرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FluxDisableGuidance": {
@@ -2541,6 +3478,11 @@
       "s2": {
         "name": "s2"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FreeU_V2": {
@@ -2561,6 +3503,11 @@
       "s2": {
         "name": "s2"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "GITSScheduler": {
@@ -2619,6 +3566,102 @@
       }
     }
   },
+  "GLSLShader": {
+    "description": "تطبيق مظللات GLSL ES على الصور. المتغير u_resolution (vec2) متوفر دائماً.",
+    "display_name": "مظلل GLSL",
+    "inputs": {
+      "floats": {
+        "name": "floats",
+        "tooltip": "القيم العشرية متوفرة كـ u_float0-4 في كود المظلل"
+      },
+      "fragment_shader": {
+        "name": "fragment_shader",
+        "tooltip": "كود مصدر مظلل القطعة (GLSL ES 3.00 / WebGL 2.0 متوافق)"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "الصور متوفرة كـ u_image0-4 (sampler2D) في كود المظلل"
+      },
+      "ints": {
+        "name": "ints",
+        "tooltip": "القيم الصحيحة متوفرة كـ u_int0-4 في كود المظلل"
+      },
+      "size_mode": {
+        "name": "size_mode",
+        "tooltip": "حجم الإخراج: 'from_input' يستخدم أبعاد أول صورة مدخلة، 'custom' يسمح بتحديد الحجم يدوياً"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "IMAGE0",
+        "tooltip": "متوفر عبر layout(location = 0) out vec4 fragColor0 في كود المظلل"
+      },
+      "1": {
+        "name": "IMAGE1",
+        "tooltip": "متوفر عبر layout(location = 1) out vec4 fragColor1 في كود المظلل"
+      },
+      "2": {
+        "name": "IMAGE2",
+        "tooltip": "متوفر عبر layout(location = 2) out vec4 fragColor2 في كود المظلل"
+      },
+      "3": {
+        "name": "IMAGE3",
+        "tooltip": "متوفر عبر layout(location = 3) out vec4 fragColor3 في كود المظلل"
+      }
+    }
+  },
+  "GeminiImage2Node": {
+    "description": "توليد أو تعديل الصور بشكل متزامن عبر Google Vertex API.",
+    "display_name": "Nano Banana Pro (Google Gemini Image)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "إذا تم تعيينها إلى 'auto'، ستطابق نسبة أبعاد الصورة المدخلة؛ إذا لم يتم توفير صورة، يتم عادةً توليد صورة مربعة بنسبة 16:9."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "files": {
+        "name": "files",
+        "tooltip": "ملف (ملفات) اختيارية لاستخدامها كسياق للنموذج. يقبل مدخلات من عقدة Gemini Generate Content Input Files."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "صورة (صور) مرجعية اختيارية. لإضافة عدة صور، استخدم عقدة Batch Images (حتى 14 صورة)."
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "وصف نصي للصورة المراد توليدها أو التعديلات المطلوب تطبيقها. أضف أي قيود أو أنماط أو تفاصيل يجب على النموذج اتباعها."
+      },
+      "resolution": {
+        "name": "resolution",
+        "tooltip": "دقة الإخراج المستهدفة. بالنسبة لـ 2K/4K يتم استخدام أداة التكبير الأصلية لـ Gemini."
+      },
+      "response_modalities": {
+        "name": "response_modalities",
+        "tooltip": "اختر 'IMAGE' لإخراج صورة فقط، أو 'IMAGE+TEXT' لإرجاع كل من الصورة المولدة واستجابة نصية."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "عند تثبيت قيمة البذرة، يحاول النموذج تقديم نفس الاستجابة للطلبات المتكررة. لا يتم ضمان إخراج حتمي. أيضًا، تغيير النموذج أو إعدادات المعلمات مثل درجة الحرارة قد يؤدي إلى اختلافات في الاستجابة حتى عند استخدام نفس قيمة البذرة. بشكل افتراضي، يتم استخدام قيمة بذرة عشوائية."
+      },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "تعليمات أساسية تحدد سلوك الذكاء الاصطناعي."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "GeminiImageNode": {
     "description": "تحرير الصور بشكل متزامن عبر واجهة برمجة تطبيقات Google.",
     "display_name": "صورة Google Gemini",
@@ -2646,9 +3689,17 @@
         "name": "النص الموجه",
         "tooltip": "النص الموجه للتوليد"
       },
+      "response_modalities": {
+        "name": "response_modalities",
+        "tooltip": "اختر 'IMAGE' لإخراج صورة فقط، أو 'IMAGE+TEXT' لإرجاع كل من الصورة المولدة واستجابة نصية."
+      },
       "seed": {
         "name": "البذرة",
         "tooltip": "عند تثبيت البذرة على قيمة محددة، يبذل النموذج قصارى جهده لتقديم نفس الاستجابة للطلبات المتكررة. لا يتم ضمان الإخراج الحتمي. أيضًا، تغيير النموذج أو إعدادات المعاملات، مثل درجة الحرارة، يمكن أن يسبب اختلافات في الاستجابة حتى عند استخدام نفس قيمة البذرة. افتراضيًا، يتم استخدام قيمة بذرة عشوائية."
+      },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "تعليمات أساسية تحدد سلوك الذكاء الاصطناعي."
       }
     },
     "outputs": {
@@ -2679,6 +3730,60 @@
       }
     }
   },
+  "GeminiNanoBanana2": {
+    "description": "إنشاء أو تعديل الصور بشكل متزامن عبر Google Vertex API.",
+    "display_name": "Nano Banana 2",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "إذا تم تعيينها إلى 'auto'، سيتم مطابقة نسبة العرض إلى الارتفاع لصورتك المدخلة؛ إذا لم يتم توفير صورة، يتم عادةً إنشاء صورة مربعة بنسبة 16:9."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "files": {
+        "name": "files",
+        "tooltip": "ملف (ملفات) اختيارية لاستخدامها كسياق للنموذج. يقبل المدخلات من عقدة Gemini Generate Content Input Files."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "صورة (صور) مرجعية اختيارية. لإضافة عدة صور، استخدم عقدة Batch Images (حتى ١٤ صورة)."
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "وصف نصي للصورة المراد إنشاؤها أو التعديلات المطلوب تطبيقها. أدرج أي قيود أو أنماط أو تفاصيل يجب على النموذج اتباعها."
+      },
+      "resolution": {
+        "name": "resolution",
+        "tooltip": "دقة الإخراج المستهدفة. بالنسبة لـ 2K/4K يتم استخدام أداة التكبير الأصلية لـ Gemini."
+      },
+      "response_modalities": {
+        "name": "response_modalities"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "عند تثبيت قيمة seed على رقم محدد، يحاول النموذج تقديم نفس الاستجابة للطلبات المتكررة قدر الإمكان. لا يمكن ضمان نتائج حتمية. كما أن تغيير النموذج أو إعدادات المعلمات مثل درجة العشوائية قد يؤدي إلى اختلاف النتائج حتى مع نفس قيمة seed. بشكل افتراضي، يتم استخدام قيمة seed عشوائية."
+      },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "تعليمات أساسية تحدد سلوك الذكاء الاصطناعي."
+      },
+      "thinking_level": {
+        "name": "thinking_level"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "GeminiNode": {
     "description": "إنشاء استجابات نصية باستخدام نموذج الذكاء الاصطناعي Gemini من Google. يمكنك تقديم أنواع متعددة من المدخلات (نص، صور، صوت، فيديو) كسياق لإنشاء استجابات أكثر صلة ومعنى.",
     "display_name": "Google Gemini",
@@ -2710,6 +3815,10 @@
         "name": "بذرة",
         "tooltip": "عند تثبيت البذرة على قيمة محددة، يبذل النموذج قصارى جهده لتقديم نفس الاستجابة للطلبات المتكررة. لا يتم ضمان الإخراج الحتمي. أيضًا، تغيير النموذج أو إعدادات المعاملات، مثل درجة الحرارة، يمكن أن يسبب اختلافات في الاستجابة حتى عند استخدام نفس قيمة البذرة. افتراضيًا، تُستخدم قيمة بذرة عشوائية."
       },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "تعليمات أساسية تحدد سلوك الذكاء الاصطناعي."
+      },
       "video": {
         "name": "فيديو",
         "tooltip": "فيديو اختياري لاستخدامه كسياق للنموذج."
@@ -2721,6 +3830,72 @@
       }
     }
   },
+  "GenerateTracks": {
+    "display_name": "توليد المسارات",
+    "inputs": {
+      "bezier": {
+        "name": "منحنى بيزيه",
+        "tooltip": "تفعيل مسار منحنى بيزيه باستخدام نقطة المنتصف كنقطة تحكم."
+      },
+      "end_x": {
+        "name": "إحداثي X للنهاية",
+        "tooltip": "إحداثي X مُطَبَّع (0-1) لموضع النهاية."
+      },
+      "end_y": {
+        "name": "إحداثي Y للنهاية",
+        "tooltip": "إحداثي Y مُطَبَّع (0-1) لموضع النهاية."
+      },
+      "height": {
+        "name": "الارتفاع"
+      },
+      "interpolation": {
+        "name": "الاستيفاء",
+        "tooltip": "يتحكم في توقيت/سرعة الحركة على طول المسار."
+      },
+      "mid_x": {
+        "name": "إحداثي X للمنتصف",
+        "tooltip": "نقطة تحكم X مُطَبَّعة لمنحنى بيزيه. تُستخدم فقط عند تفعيل 'منحنى بيزيه'."
+      },
+      "mid_y": {
+        "name": "إحداثي Y للمنتصف",
+        "tooltip": "نقطة تحكم Y مُطَبَّعة لمنحنى بيزيه. تُستخدم فقط عند تفعيل 'منحنى بيزيه'."
+      },
+      "num_frames": {
+        "name": "عدد الإطارات"
+      },
+      "num_tracks": {
+        "name": "عدد المسارات"
+      },
+      "start_x": {
+        "name": "إحداثي X للبداية",
+        "tooltip": "إحداثي X مُطَبَّع (0-1) لموضع البداية."
+      },
+      "start_y": {
+        "name": "إحداثي Y للبداية",
+        "tooltip": "إحداثي Y مُطَبَّع (0-1) لموضع البداية."
+      },
+      "track_mask": {
+        "name": "قناع المسار",
+        "tooltip": "قناع اختياري لتحديد الإطارات المرئية."
+      },
+      "track_spread": {
+        "name": "توزيع المسارات",
+        "tooltip": "المسافة المُطَبَّعة بين المسارات. يتم توزيع المسارات بشكل عمودي على اتجاه الحركة."
+      },
+      "width": {
+        "name": "العرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "طول المسار",
+        "tooltip": null
+      }
+    }
+  },
   "GetImageSize": {
     "description": "يعرض عرض وارتفاع الصورة، ويمررها دون تغيير.",
     "display_name": "الحصول على حجم الصورة",
@@ -2731,13 +3906,16 @@
     },
     "outputs": {
       "0": {
-        "name": "العرض"
+        "name": "العرض",
+        "tooltip": null
       },
       "1": {
-        "name": "الارتفاع"
+        "name": "الارتفاع",
+        "tooltip": null
       },
       "2": {
-        "name": "حجم الدُفعة"
+        "name": "حجم الدفعة",
+        "tooltip": null
       }
     }
   },
@@ -2765,6 +3943,149 @@
       }
     }
   },
+  "GrokImageEditNode": {
+    "description": "تعديل صورة موجودة بناءً على مطالبة نصية",
+    "display_name": "تعديل صورة Grok",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبة العرض إلى الارتفاع",
+        "tooltip": "مسموح فقط عند توصيل عدة صور بمدخل الصورة."
+      },
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "image": {
+        "name": "الصورة"
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "number_of_images": {
+        "name": "عدد الصور",
+        "tooltip": "عدد الصور المعدلة التي سيتم توليدها"
+      },
+      "prompt": {
+        "name": "المطالبة",
+        "tooltip": "المطالبة النصية المستخدمة لتوليد الصورة"
+      },
+      "resolution": {
+        "name": "الدقة"
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "البذرة لتحديد ما إذا كان يجب إعادة تشغيل العقدة؛ النتائج الفعلية غير حتمية بغض النظر عن البذرة."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokImageNode": {
+    "description": "توليد صور باستخدام Grok بناءً على مطالبة نصية",
+    "display_name": "صورة Grok",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبة العرض إلى الارتفاع"
+      },
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "number_of_images": {
+        "name": "عدد الصور",
+        "tooltip": "عدد الصور التي سيتم توليدها"
+      },
+      "prompt": {
+        "name": "المطالبة",
+        "tooltip": "المطالبة النصية المستخدمة لتوليد الصورة"
+      },
+      "resolution": {
+        "name": "الدقة"
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "البذرة لتحديد ما إذا كان يجب إعادة تشغيل العقدة؛ النتائج الفعلية غير حتمية بغض النظر عن البذرة."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokVideoEditNode": {
+    "description": "تعديل فيديو موجود بناءً على مطالبة نصية.",
+    "display_name": "تعديل فيديو Grok",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "prompt": {
+        "name": "المطالبة",
+        "tooltip": "وصف نصي للفيديو المطلوب."
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "البذرة لتحديد ما إذا كان يجب إعادة تشغيل العقدة؛ النتائج الفعلية غير حتمية بغض النظر عن البذرة."
+      },
+      "video": {
+        "name": "الفيديو",
+        "tooltip": "المدة القصوى المدعومة هي ٨٫٧ ثوانٍ وحجم الملف ٥٠ ميجابايت."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokVideoNode": {
+    "description": "توليد فيديو من مطالبة أو صورة",
+    "display_name": "فيديو Grok",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبة العرض إلى الارتفاع",
+        "tooltip": "نسبة العرض إلى الارتفاع للفيديو الناتج."
+      },
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "duration": {
+        "name": "المدة",
+        "tooltip": "مدة الفيديو الناتج بالثواني."
+      },
+      "image": {
+        "name": "الصورة"
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "prompt": {
+        "name": "المطالبة",
+        "tooltip": "وصف نصي للفيديو المطلوب."
+      },
+      "resolution": {
+        "name": "الدقة",
+        "tooltip": "دقة الفيديو الناتج."
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "البذرة لتحديد ما إذا كان يجب إعادة تشغيل العقدة؛ النتائج الفعلية غير حتمية بغض النظر عن البذرة."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "GrowMask": {
     "display_name": "توسيع القناع",
     "inputs": {
@@ -2777,6 +4098,55 @@
       "tapered_corners": {
         "name": "زوايا_منحدرة"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HitPawGeneralImageEnhance": {
+    "description": "تكبير الصور منخفضة الدقة إلى دقة فائقة، إزالة الشوائب والضوضاء. الحد الأقصى للإخراج: ٣٢ ميغابيكسل.",
+    "display_name": "تحسين الصورة العام من HitPaw",
+    "inputs": {
+      "auto_downscale": {
+        "name": "تصغير تلقائي",
+        "tooltip": "تصغير الصورة المدخلة تلقائياً إذا تجاوز الإخراج الحد المسموح."
+      },
+      "image": {
+        "name": "الصورة"
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "upscale_factor": {
+        "name": "عامل التكبير"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HitPawVideoEnhance": {
+    "description": "تكبير مقاطع الفيديو منخفضة الدقة إلى دقة عالية، إزالة الشوائب والضوضاء. الأسعار لكل ثانية من الفيديو.",
+    "display_name": "تحسين الفيديو العام من HitPaw",
+    "inputs": {
+      "model": {
+        "name": "النموذج"
+      },
+      "model_resolution": {
+        "name": "الدقة"
+      },
+      "video": {
+        "name": "الفيديو"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "Hunyuan3Dv2Conditioning": {
@@ -2788,10 +4158,12 @@
     },
     "outputs": {
       "0": {
-        "name": "إيجابي"
+        "name": "positive",
+        "tooltip": null
       },
       "1": {
-        "name": "سلبي"
+        "name": "negative",
+        "tooltip": null
       }
     }
   },
@@ -2813,10 +4185,12 @@
     },
     "outputs": {
       "0": {
-        "name": "إيجابي"
+        "name": "positive",
+        "tooltip": null
       },
       "1": {
-        "name": "سلبي"
+        "name": "negative",
+        "tooltip": null
       }
     }
   },
@@ -2890,6 +4264,120 @@
       }
     }
   },
+  "HunyuanVideo15ImageToVideo": {
+    "display_name": "HunyuanVideo15ImageToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "حجم الدفعة"
+      },
+      "clip_vision_output": {
+        "name": "مخرج clip للرؤية"
+      },
+      "height": {
+        "name": "الارتفاع"
+      },
+      "length": {
+        "name": "الطول"
+      },
+      "negative": {
+        "name": "سلبي"
+      },
+      "positive": {
+        "name": "إيجابي"
+      },
+      "start_image": {
+        "name": "صورة البداية"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "العرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "إيجابي",
+        "tooltip": null
+      },
+      "1": {
+        "name": "سلبي",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "HunyuanVideo15LatentUpscaleWithModel": {
+    "display_name": "Hunyuan Video 15 تكبير latent بالنموذج",
+    "inputs": {
+      "crop": {
+        "name": "اقتصاص"
+      },
+      "height": {
+        "name": "الارتفاع"
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "samples": {
+        "name": "العينات"
+      },
+      "upscale_method": {
+        "name": "طريقة التكبير"
+      },
+      "width": {
+        "name": "العرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HunyuanVideo15SuperResolution": {
+    "display_name": "HunyuanVideo15SuperResolution",
+    "inputs": {
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "latent": {
+        "name": "كامِن"
+      },
+      "negative": {
+        "name": "سلبي"
+      },
+      "noise_augmentation": {
+        "name": "تعزيز الضوضاء"
+      },
+      "positive": {
+        "name": "إيجابي"
+      },
+      "start_image": {
+        "name": "صورة البداية"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "إيجابي",
+        "tooltip": null
+      },
+      "1": {
+        "name": "سلبي",
+        "tooltip": null
+      },
+      "2": {
+        "name": "كامِن",
+        "tooltip": null
+      }
+    }
+  },
   "HyperTile": {
     "display_name": "HyperTile",
     "inputs": {
@@ -3094,6 +4582,11 @@
       "strength": {
         "name": "القوة"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageBatch": {
@@ -3157,6 +4650,26 @@
       "image": {
         "name": "الصورة"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageCompare": {
+    "description": "يقارن صورتين جنبًا إلى جنب باستخدام شريط تمرير.",
+    "display_name": "مقارنة الصور",
+    "inputs": {
+      "compare_view": {
+        "name": "عرض المقارنة"
+      },
+      "image_a": {
+        "name": "الصورة أ"
+      },
+      "image_b": {
+        "name": "الصورة ب"
+      }
     }
   },
   "ImageCompositeMasked": {
@@ -3180,6 +4693,11 @@
       "y": {
         "name": "إحداثي Y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageCrop": {
@@ -3200,6 +4718,50 @@
       "y": {
         "name": "إحداثي Y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageCropV2": {
+    "display_name": "قص الصورة",
+    "inputs": {
+      "crop_region": {
+        "name": "منطقة القص"
+      },
+      "height": {},
+      "image": {
+        "name": "الصورة"
+      },
+      "width": {},
+      "x": {},
+      "y": {}
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageDeduplication": {
+    "display_name": "إزالة تكرار الصور",
+    "inputs": {
+      "images": {
+        "name": "الصور",
+        "tooltip": "قائمة الصور للمعالجة."
+      },
+      "similarity_threshold": {
+        "name": "عتبة التشابه",
+        "tooltip": "عتبة التشابه (0-1). كلما زادت القيمة زاد التشابه. الصور التي تتجاوز هذه العتبة تعتبر مكررة."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "الصور",
+        "tooltip": "الصور المعالجة"
+      }
     }
   },
   "ImageFlip": {
@@ -3211,6 +4773,11 @@
       "image": {
         "name": "صورة"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageFromBatch": {
@@ -3225,6 +4792,42 @@
       "length": {
         "name": "الطول"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageGrid": {
+    "display_name": "شبكة الصور",
+    "inputs": {
+      "cell_height": {
+        "name": "ارتفاع الخلية",
+        "tooltip": "ارتفاع كل خلية في الشبكة."
+      },
+      "cell_width": {
+        "name": "عرض الخلية",
+        "tooltip": "عرض كل خلية في الشبكة."
+      },
+      "columns": {
+        "name": "الأعمدة",
+        "tooltip": "عدد الأعمدة في الشبكة."
+      },
+      "images": {
+        "name": "الصور",
+        "tooltip": "قائمة الصور للمعالجة."
+      },
+      "padding": {
+        "name": "المسافة الفاصلة",
+        "tooltip": "المسافة بين الصور."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "الصور",
+        "tooltip": "الصور المعالجة"
+      }
     }
   },
   "ImageInvert": {
@@ -3235,6 +4838,28 @@
       }
     }
   },
+  "ImageMergeTileList": {
+    "display_name": "دمج قائمة القطع إلى صورة",
+    "inputs": {
+      "final_height": {
+        "name": "final_height"
+      },
+      "final_width": {
+        "name": "final_width"
+      },
+      "image_list": {
+        "name": "image_list"
+      },
+      "overlap": {
+        "name": "overlap"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ImageOnlyCheckpointLoader": {
     "display_name": "محمل نقطة تحقق الصور فقط (نموذج img2vid)",
     "inputs": {
@@ -3333,6 +4958,11 @@
       "rotation": {
         "name": "الدوران"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageScale": {
@@ -3381,6 +5011,11 @@
       "upscale_method": {
         "name": "طريقة_التكبير"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageScaleToTotalPixels": {
@@ -3392,6 +5027,9 @@
       "megapixels": {
         "name": "الميغابكسل"
       },
+      "resolution_steps": {
+        "name": "خطوات الدقة"
+      },
       "upscale_method": {
         "name": "طريقة التكبير"
       }
@@ -3446,6 +5084,11 @@
       "spacing_width": {
         "name": "عرض_التباعد"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageToMask": {
@@ -3457,6 +5100,11 @@
       "image": {
         "name": "الصورة"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageUpscaleWithModel": {
@@ -3566,6 +5214,29 @@
       "mask": {
         "name": "قناع"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "JoinAudioChannels": {
+    "description": "يضم القناتين الصوتيتين الأحادية (اليمنى واليسرى) في صوت ستيريو.",
+    "display_name": "دمج قنوات الصوت",
+    "inputs": {
+      "audio_left": {
+        "name": "الصوت الأيسر"
+      },
+      "audio_right": {
+        "name": "الصوت الأيمن"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "الصوت",
+        "tooltip": null
+      }
     }
   },
   "JoinImageWithAlpha": {
@@ -3691,6 +5362,58 @@
       "sampler_name": {
         "name": "sampler_name"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Kandinsky5ImageToVideo": {
+    "display_name": "Kandinsky5ImageToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "حجم الدفعة"
+      },
+      "height": {
+        "name": "الارتفاع"
+      },
+      "length": {
+        "name": "الطول"
+      },
+      "negative": {
+        "name": "سلبي"
+      },
+      "positive": {
+        "name": "إيجابي"
+      },
+      "start_image": {
+        "name": "صورة البداية"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "العرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "إيجابي",
+        "tooltip": null
+      },
+      "1": {
+        "name": "سلبي",
+        "tooltip": null
+      },
+      "2": {
+        "name": "كامِن",
+        "tooltip": "كامِن فيديو فارغ"
+      },
+      "3": {
+        "name": "كامِن_مشروط",
+        "tooltip": "صور بداية مشفرة ونظيفة، تُستخدم لاستبدال البداية الضوضائية لمخرجات كامِن النموذج"
+      }
     }
   },
   "KarrasScheduler": {
@@ -3708,6 +5431,44 @@
       "steps": {
         "name": "خطوات"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingAvatarNode": {
+    "description": "إنشاء مقاطع فيديو رقمية بأسلوب البث المباشر لإنسان رقمي من صورة واحدة وملف صوتي.",
+    "display_name": "Kling Avatar 2.0",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "image": {
+        "name": "صورة",
+        "tooltip": "صورة مرجعية للأفاتار. يجب ألا يقل العرض والارتفاع عن ٣٠٠ بكسل. يجب أن تكون نسبة الأبعاد بين ١:٢.٥ و٢.٥:١."
+      },
+      "mode": {
+        "name": "الوضع"
+      },
+      "prompt": {
+        "name": "موجه",
+        "tooltip": "موجه اختياري لتحديد حركات الأفاتار، المشاعر، وحركات الكاميرا."
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "تتحكم البذرة فيما إذا كان يجب إعادة تشغيل العقدة؛ النتائج غير حتمية بغض النظر عن البذرة."
+      },
+      "sound_file": {
+        "name": "ملف صوتي",
+        "tooltip": "إدخال صوتي. يجب أن تتراوح المدة بين ٢ و٣٠٠ ثانية."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "KlingCameraControlI2VNode": {
@@ -3862,6 +5623,46 @@
       }
     }
   },
+  "KlingFirstLastFrameNode": {
+    "description": "إنشاء مقاطع فيديو باستخدام Kling V3 من خلال الإطارين الأول والأخير.",
+    "display_name": "Kling 3.0 الإطار الأول والأخير إلى فيديو",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "duration": {
+        "name": "المدة"
+      },
+      "end_frame": {
+        "name": "الإطار الأخير"
+      },
+      "first_frame": {
+        "name": "الإطار الأول"
+      },
+      "generate_audio": {
+        "name": "توليد الصوت"
+      },
+      "model": {
+        "name": "النموذج",
+        "tooltip": "إعدادات النموذج والتوليد."
+      },
+      "model_resolution": {
+        "name": "الدقة"
+      },
+      "prompt": {
+        "name": "الوصف"
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "البذرة تتحكم في ما إذا كان يجب إعادة تشغيل العقدة؛ النتائج غير حتمية بغض النظر عن البذرة."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingImage2VideoNode": {
     "display_name": "كليغ صورة إلى فيديو",
     "inputs": {
@@ -3914,6 +5715,9 @@
       "aspect_ratio": {
         "name": "نسبة العرض إلى الارتفاع"
       },
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
       "human_fidelity": {
         "name": "تشابه الموضوع",
         "tooltip": "تشابه المرجع للموضوع البشري"
@@ -3942,6 +5746,39 @@
       "prompt": {
         "name": "نص التوجيه الإيجابي",
         "tooltip": "نص التوجيه الإيجابي"
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "البذرة تتحكم في ما إذا كان يجب إعادة تشغيل العقدة؛ النتائج غير حتمية بغض النظر عن البذرة."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingImageToVideoWithAudio": {
+    "display_name": "تحويل صورة Kling (الإطار الأول) إلى فيديو مع صوت",
+    "inputs": {
+      "duration": {
+        "name": "المدة"
+      },
+      "generate_audio": {
+        "name": "توليد صوت"
+      },
+      "mode": {
+        "name": "الوضع"
+      },
+      "model_name": {
+        "name": "اسم النموذج"
+      },
+      "prompt": {
+        "name": "الموجه",
+        "tooltip": "موجه نصي إيجابي."
+      },
+      "start_frame": {
+        "name": "الإطار الأول"
       }
     },
     "outputs": {
@@ -4011,6 +5848,299 @@
       }
     }
   },
+  "KlingMotionControl": {
+    "display_name": "تحكم حركة Kling",
+    "inputs": {
+      "character_orientation": {
+        "name": "اتجاه الشخصية",
+        "tooltip": "يتحكم في مصدر اتجاه/توجه الشخصية.\nفيديو: الحركات، التعابير، تحركات الكاميرا، والاتجاه يتبع فيديو الحركة المرجعي (تفاصيل أخرى عبر الموجه).\nصورة: الحركات والتعابير تتبع فيديو الحركة المرجعي، لكن اتجاه الشخصية يطابق الصورة المرجعية (الكاميرا/تفاصيل أخرى عبر الموجه)."
+      },
+      "keep_original_sound": {
+        "name": "الاحتفاظ بالصوت الأصلي"
+      },
+      "mode": {
+        "name": "الوضع"
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "prompt": {
+        "name": "الموجه"
+      },
+      "reference_image": {
+        "name": "صورة مرجعية"
+      },
+      "reference_video": {
+        "name": "فيديو مرجعي",
+        "tooltip": "فيديو مرجعي للحركة يُستخدم لتحريك/تعبير الشخصية.\nحدود المدة تعتمد على اتجاه الشخصية:\n - صورة: ٣–١٠ ثوانٍ (حد أقصى ١٠ ثوانٍ)\n - فيديو: ٣–٣٠ ثانية (حد أقصى ٣٠ ثانية)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProEditVideoNode": {
+    "description": "حرر فيديو موجود باستخدام أحدث نموذج من Kling.",
+    "display_name": "تحرير فيديو Kling Omni (احترافي)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "keep_original_sound": {
+        "name": "الاحتفاظ بالصوت الأصلي"
+      },
+      "model_name": {
+        "name": "اسم النموذج"
+      },
+      "prompt": {
+        "name": "الموجه",
+        "tooltip": "موجه نصي يصف محتوى الفيديو. يمكن أن يتضمن أوصافًا إيجابية وسلبية."
+      },
+      "reference_images": {
+        "name": "صور مرجعية",
+        "tooltip": "حتى ٤ صور مرجعية إضافية."
+      },
+      "resolution": {
+        "name": "الدقة"
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "البذرة تتحكم في ما إذا كان يجب إعادة تشغيل العقدة؛ النتائج غير حتمية بغض النظر عن البذرة."
+      },
+      "video": {
+        "name": "فيديو",
+        "tooltip": "الفيديو للتحرير. سيكون طول الفيديو الناتج هو نفسه."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProFirstLastFrameNode": {
+    "description": "استخدم إطار بداية، وإطار نهاية اختياري، أو صور مرجعية مع أحدث نموذج من Kling.",
+    "display_name": "Kling Omni من الإطار الأول إلى الأخير إلى فيديو (احترافي)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "end_frame": {
+        "name": "end_frame",
+        "tooltip": "إطار نهاية اختياري للفيديو. لا يمكن استخدامه مع 'reference_images' في نفس الوقت."
+      },
+      "first_frame": {
+        "name": "first_frame"
+      },
+      "generate_audio": {
+        "name": "توليد الصوت",
+        "tooltip": "توليد صوت للفيديو. مدعوم فقط لـ kling-v3-omni."
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "وصف نصي لمحتوى الفيديو. يمكن أن يتضمن أوصافًا إيجابية وسلبية."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "حتى 6 صور مرجعية إضافية."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "البذرة تتحكم في ما إذا كان يجب إعادة تشغيل العقدة؛ النتائج غير حتمية بغض النظر عن البذرة."
+      },
+      "storyboards": {
+        "name": "لوحات القصة",
+        "tooltip": "إنشاء سلسلة من مقاطع الفيديو مع أوصاف ومدد فردية. مدعوم فقط لـ kling-v3-omni."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProImageNode": {
+    "description": "أنشئ أو عدّل الصور باستخدام أحدث نموذج من Kling.",
+    "display_name": "Kling Omni صورة (احترافي)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "وصف نصي لمحتوى الصورة. يمكن أن يتضمن أوصافًا إيجابية وسلبية."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "حتى 10 صور مرجعية إضافية."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "البذرة تتحكم في ما إذا كان يجب إعادة تشغيل العقدة؛ النتائج غير حتمية بغض النظر عن البذرة."
+      },
+      "series_amount": {
+        "name": "عدد السلاسل",
+        "tooltip": "إنشاء سلسلة من الصور. غير مدعوم لـ kling-image-o1."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProImageToVideoNode": {
+    "description": "استخدم حتى 7 صور مرجعية لإنشاء فيديو باستخدام أحدث نموذج من Kling.",
+    "display_name": "Kling Omni من صورة إلى فيديو (احترافي)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "generate_audio": {
+        "name": "توليد الصوت",
+        "tooltip": "توليد صوت للفيديو. مدعوم فقط لـ kling-v3-omni."
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "وصف نصي لمحتوى الفيديو. يمكن أن يتضمن أوصافًا إيجابية وسلبية."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "حتى 7 صور مرجعية."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "البذرة تتحكم في ما إذا كان يجب إعادة تشغيل العقدة؛ النتائج غير حتمية بغض النظر عن البذرة."
+      },
+      "storyboards": {
+        "name": "لوحات القصة",
+        "tooltip": "إنشاء سلسلة من مقاطع الفيديو مع أوصاف ومدد فردية. مدعوم فقط لـ kling-v3-omni."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProTextToVideoNode": {
+    "description": "استخدم أوامر نصية لإنشاء فيديوهات باستخدام أحدث نموذج من Kling.",
+    "display_name": "Kling Omni من نص إلى فيديو (احترافي)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "generate_audio": {
+        "name": "توليد الصوت"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "وصف نصي لمحتوى الفيديو. يمكن أن يتضمن أوصافًا إيجابية وسلبية."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "البذرة تتحكم في ما إذا كان يجب إعادة تشغيل العقدة؛ النتائج غير حتمية بغض النظر عن البذرة."
+      },
+      "storyboards": {
+        "name": "لوحات القصة",
+        "tooltip": "إنشاء سلسلة من مقاطع الفيديو مع أوصاف ومدد فردية. يتم تجاهلها لنموذج o1."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProVideoToVideoNode": {
+    "description": "استخدم فيديو وما يصل إلى 4 صور مرجعية لإنشاء فيديو باستخدام أحدث نموذج Kling.",
+    "display_name": "Kling Omni فيديو إلى فيديو (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "keep_original_sound": {
+        "name": "keep_original_sound"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "وصف نصي لمحتوى الفيديو. يمكن أن يتضمن أوصافًا إيجابية وسلبية."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "حتى 4 صور مرجعية إضافية."
+      },
+      "reference_video": {
+        "name": "reference_video",
+        "tooltip": "فيديو للاستخدام كمرجع."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "تتحكم البذرة فيما إذا كان يجب إعادة تشغيل العقدة؛ النتائج غير حتمية بغض النظر عن البذرة."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingSingleImageVideoEffectNode": {
     "description": "تحقيق تأثيرات خاصة مختلفة عند توليد فيديو بناءً على مشهد التأثير.",
     "display_name": "تأثيرات فيديو كليغ",
@@ -4125,6 +6255,35 @@
       }
     }
   },
+  "KlingTextToVideoWithAudio": {
+    "display_name": "Kling تحويل النص إلى فيديو مع صوت",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "generate_audio": {
+        "name": "generate_audio"
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "وصف نصي إيجابي."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingVideoExtendNode": {
     "description": "عقدة تمديد الفيديو من كليينج. تمديد الفيديوهات المصنوعة بواسطة عقد كليينج الأخرى. يتم إنشاء video_id باستخدام عقد كليينج الأخرى.",
     "display_name": "كليينج تمديد الفيديو",
@@ -4159,6 +6318,54 @@
       }
     }
   },
+  "KlingVideoNode": {
+    "description": "إنشاء مقاطع فيديو باستخدام Kling V3. يدعم التحويل من نص إلى فيديو ومن صورة إلى فيديو مع إمكانية استخدام لوحة قصة متعددة التعليمات وخيار توليد الصوت.",
+    "display_name": "Kling 3.0 فيديو",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "generate_audio": {
+        "name": "توليد الصوت"
+      },
+      "model": {
+        "name": "النموذج",
+        "tooltip": "إعدادات النموذج والتوليد."
+      },
+      "model_aspect_ratio": {
+        "name": "نسبة العرض إلى الارتفاع"
+      },
+      "model_resolution": {
+        "name": "الدقة"
+      },
+      "multi_shot": {
+        "name": "متعدد اللقطات",
+        "tooltip": "إنشاء سلسلة من مقاطع الفيديو مع تعليمات ومدة زمنية منفصلة لكل مقطع."
+      },
+      "multi_shot_duration": {
+        "name": "المدة"
+      },
+      "multi_shot_negative_prompt": {
+        "name": "تعليمة سلبية"
+      },
+      "multi_shot_prompt": {
+        "name": "تعليمة"
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "تتحكم البذرة فيما إذا كان يجب إعادة تشغيل العقدة؛ النتائج غير حتمية بغض النظر عن البذرة."
+      },
+      "start_frame": {
+        "name": "الإطار الابتدائي",
+        "tooltip": "صورة الإطار الابتدائي (اختياري). عند التوصيل، يتحول إلى وضع صورة إلى فيديو."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingVirtualTryOnNode": {
     "description": "عقدة تجربة الملابس الافتراضية من كليينج. أدخل صورة إنسان وصورة ملابس لتجربة الملابس على الإنسان.",
     "display_name": "كليينج تجربة الملابس الافتراضية",
@@ -4179,6 +6386,26 @@
       }
     }
   },
+  "LTXAVTextEncoderLoader": {
+    "description": "[الوصفات]\n\nltxav: gemma 3 12B",
+    "display_name": "محمل مشفر نصوص LTXV الصوتي",
+    "inputs": {
+      "ckpt_name": {
+        "name": "ckpt_name"
+      },
+      "device": {
+        "name": "device"
+      },
+      "text_encoder": {
+        "name": "text_encoder"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LTXVAddGuide": {
     "display_name": "إضافة دليل LTXV",
     "inputs": {
@@ -4221,6 +6448,76 @@
       }
     }
   },
+  "LTXVAudioVAEDecode": {
+    "display_name": "فك تشفير LTXV Audio VAE",
+    "inputs": {
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "نموذج Audio VAE المستخدم لفك تشفير الفضاء الكامن."
+      },
+      "samples": {
+        "name": "samples",
+        "tooltip": "الفضاء الكامن المراد فك تشفيره."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Audio",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAEEncode": {
+    "display_name": "ترميز LTXV Audio VAE",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "الصوت المراد ترميزه."
+      },
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "نموذج Audio VAE المستخدم للترميز."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Audio Latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAELoader": {
+    "display_name": "محمل LTXV Audio VAE",
+    "inputs": {
+      "ckpt_name": {
+        "name": "ckpt_name",
+        "tooltip": "نقطة تحقق Audio VAE للتحميل."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Audio VAE",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVConcatAVLatent": {
+    "display_name": "LTXVConcatAVLatent",
+    "inputs": {
+      "audio_latent": {
+        "name": "audio_latent"
+      },
+      "video_latent": {
+        "name": "video_latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
   "LTXVConditioning": {
     "display_name": "تهيئة LTXV",
     "inputs": {
@@ -4273,6 +6570,33 @@
       }
     }
   },
+  "LTXVEmptyLatentAudio": {
+    "display_name": "LTXV Empty Latent Audio",
+    "inputs": {
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "نموذج Audio VAE المستخدم للحصول على الإعدادات."
+      },
+      "batch_size": {
+        "name": "batch_size",
+        "tooltip": "عدد عينات الصوت الكامن في الدفعة."
+      },
+      "frame_rate": {
+        "name": "frame_rate",
+        "tooltip": "عدد الإطارات في الثانية."
+      },
+      "frames_number": {
+        "name": "frames_number",
+        "tooltip": "عدد الإطارات."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Latent",
+        "tooltip": null
+      }
+    }
+  },
   "LTXVImgToVideo": {
     "display_name": "LTXV صورة إلى فيديو",
     "inputs": {
@@ -4319,6 +6643,47 @@
       }
     }
   },
+  "LTXVImgToVideoInplace": {
+    "display_name": "LTXVImgToVideoInplace",
+    "inputs": {
+      "bypass": {
+        "name": "تجاوز",
+        "tooltip": "تجاوز التكييف."
+      },
+      "image": {
+        "name": "صورة"
+      },
+      "latent": {
+        "name": "كامنة"
+      },
+      "strength": {
+        "name": "القوة"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "كامنة",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVLatentUpsampler": {
+    "display_name": "LTXVLatentUpsampler",
+    "inputs": {
+      "samples": {
+        "name": "عينات"
+      },
+      "upscale_model": {
+        "name": "نموذج التكبير"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
   "LTXVPreprocess": {
     "display_name": "LTXV المعالجة المسبقة",
     "inputs": {
@@ -4367,6 +6732,25 @@
       }
     }
   },
+  "LTXVSeparateAVLatent": {
+    "description": "LTXV فصل الكامنة الصوتية والمرئية",
+    "display_name": "LTXVSeparateAVLatent",
+    "inputs": {
+      "av_latent": {
+        "name": "كامنة صوتية ومرئية"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "كامنة الفيديو",
+        "tooltip": null
+      },
+      "1": {
+        "name": "كامنة الصوت",
+        "tooltip": null
+      }
+    }
+  },
   "LaplaceScheduler": {
     "display_name": "جدول لاپلاس",
     "inputs": {
@@ -4385,6 +6769,11 @@
       "steps": {
         "name": "الخطوات"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "LatentAdd": {
@@ -4522,6 +6911,11 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "LatentConcat": {
@@ -4585,6 +6979,25 @@
       }
     }
   },
+  "LatentCutToBatch": {
+    "display_name": "LatentCutToBatch",
+    "inputs": {
+      "dim": {
+        "name": "dim"
+      },
+      "samples": {
+        "name": "samples"
+      },
+      "slice_size": {
+        "name": "slice_size"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LatentFlip": {
     "display_name": "قلب الكامن",
     "inputs": {
@@ -4738,6 +7151,19 @@
       }
     }
   },
+  "LatentUpscaleModelLoader": {
+    "display_name": "تحميل نموذج تكبير latent",
+    "inputs": {
+      "model_name": {
+        "name": "model_name"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LazyCache": {
     "description": "نسخة محلية الصنع من EasyCache - نسخة 'أسهل' من EasyCache للتنفيذ. تعمل بشكل عام أسوأ من EasyCache، ولكن أفضل في بعض الحالات النادرة ومتوافقة عالميًا مع كل شيء في ComfyUI.",
     "display_name": "ذاكرة_التخزين_المؤقت_الكسولة",
@@ -4772,8 +7198,7 @@
   "Load3D": {
     "display_name": "تحميل ثلاثي الأبعاد",
     "inputs": {
-      "clear": {
-      },
+      "clear": "مسح",
       "height": {
         "name": "الارتفاع"
       },
@@ -4783,30 +7208,40 @@
       "model_file": {
         "name": "ملف النموذج"
       },
-      "upload 3d model": {
-      },
+      "upload 3d model": "رفع نموذج ثلاثي الأبعاد",
+      "upload extra resources": "رفع موارد إضافية",
       "width": {
         "name": "العرض"
       }
     },
     "outputs": {
       "0": {
-        "name": "صورة"
+        "name": "image",
+        "tooltip": null
       },
       "1": {
-        "name": "قناع"
+        "name": "mask",
+        "tooltip": null
       },
       "2": {
-        "name": "مسار الشبكة"
+        "name": "mesh_path",
+        "tooltip": null
       },
       "3": {
-        "name": "المعتاد"
+        "name": "normal",
+        "tooltip": null
       },
       "4": {
-        "name": "الخطوط"
+        "name": "camera_info",
+        "tooltip": null
       },
       "5": {
-        "name": "معلومات الكاميرا"
+        "name": "recording_video",
+        "tooltip": null
+      },
+      "6": {
+        "name": "model_3d",
+        "tooltip": null
       }
     }
   },
@@ -4822,6 +7257,11 @@
       "upload": {
         "name": "اختر ملف للتحميل"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "LoadImage": {
@@ -4835,6 +7275,21 @@
       }
     }
   },
+  "LoadImageDataSetFromFolder": {
+    "display_name": "تحميل مجموعة بيانات الصور من مجلد",
+    "inputs": {
+      "folder": {
+        "name": "folder",
+        "tooltip": "المجلد الذي سيتم تحميل الصور منه."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "قائمة الصور المحملة"
+      }
+    }
+  },
   "LoadImageMask": {
     "display_name": "تحميل صورة (كقناع)",
     "inputs": {
@@ -4853,16 +7308,35 @@
     "description": "تحميل صورة من مجلد المخرجات. عند الضغط على زر التحديث، سيقوم العقدة بتحديث قائمة الصور واختيار أول صورة تلقائياً لتسهيل التكرار.",
     "display_name": "تحميل صورة (من المخرجات)",
     "inputs": {
+      "Auto-refresh after generation": {},
       "image": {
         "name": "صورة"
       },
-      "refresh": {
-      },
+      "refresh": {},
       "upload": {
         "name": "اختر ملف للتحميل"
       }
     }
   },
+  "LoadImageTextDataSetFromFolder": {
+    "display_name": "تحميل مجموعة بيانات الصور والنصوص من مجلد",
+    "inputs": {
+      "folder": {
+        "name": "folder",
+        "tooltip": "المجلد الذي سيتم تحميل الصور منه."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "قائمة الصور المحملة"
+      },
+      "1": {
+        "name": "texts",
+        "tooltip": "قائمة التسميات التوضيحية للنص"
+      }
+    }
+  },
   "LoadLatent": {
     "display_name": "تحميل كامن",
     "inputs": {
@@ -4871,6 +7345,25 @@
       }
     }
   },
+  "LoadTrainingDataset": {
+    "display_name": "تحميل مجموعة بيانات التدريب",
+    "inputs": {
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "اسم المجلد الذي يحتوي على مجموعة البيانات المحفوظة (داخل دليل الإخراج)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latents",
+        "tooltip": "قائمة قواميس الفضاء الكامن"
+      },
+      "1": {
+        "name": "conditioning",
+        "tooltip": "قائمة قوائم التكييف"
+      }
+    }
+  },
   "LoadVideo": {
     "display_name": "تحميل فيديو",
     "inputs": {
@@ -4921,6 +7414,60 @@
       }
     }
   },
+  "LoraLoaderBypass": {
+    "description": "تطبيق LoRA في وضع التجاوز. على عكس LoRA العادي، لا يقوم هذا بتعديل أوزان النموذج - بل يحقن حساب LoRA أثناء التمرير الأمامي. مفيد في سيناريوهات التدريب.",
+    "display_name": "تحميل LoRA (تجاوز) (لأغراض التصحيح)",
+    "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "نموذج CLIP الذي سيتم تطبيق LoRA عليه."
+      },
+      "lora_name": {
+        "name": "اسم LoRA",
+        "tooltip": "اسم LoRA."
+      },
+      "model": {
+        "name": "النموذج",
+        "tooltip": "نموذج الانتشار الذي سيتم تطبيق LoRA عليه."
+      },
+      "strength_clip": {
+        "name": "قوة التعديل على CLIP",
+        "tooltip": "مدى قوة تعديل نموذج CLIP. يمكن أن تكون هذه القيمة سالبة."
+      },
+      "strength_model": {
+        "name": "قوة التعديل على النموذج",
+        "tooltip": "مدى قوة تعديل نموذج الانتشار. يمكن أن تكون هذه القيمة سالبة."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "نموذج الانتشار المعدل."
+      },
+      "1": {
+        "tooltip": "نموذج CLIP المعدل."
+      }
+    }
+  },
+  "LoraLoaderBypassModelOnly": {
+    "description": "تطبيق LoRA في وضع التجاوز. على عكس LoRA العادي، لا يقوم هذا بتعديل أوزان النموذج - بل يحقن حساب LoRA أثناء التمرير الأمامي. مفيد في سيناريوهات التدريب.",
+    "display_name": "تحميل LoRA (تجاوز، النموذج فقط) (لأغراض التصحيح)",
+    "inputs": {
+      "lora_name": {
+        "name": "اسم LoRA"
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "strength_model": {
+        "name": "قوة التعديل على النموذج"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "نموذج الانتشار المعدل."
+      }
+    }
+  },
   "LoraLoaderModelOnly": {
     "description": "يُستخدم LoRA لتعديل نماذج الانتشار و CLIP، وتغيير طريقة إزالة الضجيج من الكامن مثل تطبيق الأنماط. يمكن ربط عدة عقد LoRA معاً.",
     "display_name": "تحميل LoRA (نموذج فقط)",
@@ -4944,6 +7491,10 @@
   "LoraModelLoader": {
     "display_name": "تحميل نموذج LoRA",
     "inputs": {
+      "bypass": {
+        "name": "تجاوز",
+        "tooltip": "عند التفعيل، يتم تطبيق LoRA في وضع التجاوز دون تعديل أوزان النموذج الأساسي. مفيد أثناء التدريب وعند تفريغ أوزان النموذج."
+      },
       "lora": {
         "name": "lora",
         "tooltip": "نموذج LoRA لتطبيقه على نموذج الانتشار."
@@ -4959,6 +7510,7 @@
     },
     "outputs": {
       "0": {
+        "name": "model",
         "tooltip": "نموذج الانتشار المعدل."
       }
     }
@@ -4992,10 +7544,12 @@
     "display_name": "رسم بياني للخسارة",
     "inputs": {
       "filename_prefix": {
-        "name": "بادئة_اسم_الملف"
+        "name": "بادئة_اسم_الملف",
+        "tooltip": "بادئة اسم ملف صورة رسم الخسارة المحفوظة."
       },
       "loss": {
-        "name": "خسارة"
+        "name": "خسارة",
+        "tooltip": "خريطة الخسارة من عقدة التدريب."
       }
     }
   },
@@ -5286,6 +7840,208 @@
       }
     }
   },
+  "MagnificImageRelightNode": {
+    "description": "إعادة إضاءة صورة مع تعديلات الإضاءة وخيار نقل الإضاءة من مرجع.",
+    "display_name": "إعادة إضاءة الصورة Magnific",
+    "inputs": {
+      "advanced_settings": {
+        "name": "إعدادات متقدمة",
+        "tooltip": "خيارات ضبط دقيق للتحكم المتقدم في الإضاءة."
+      },
+      "change_background": {
+        "name": "تغيير الخلفية",
+        "tooltip": "يعدل الخلفية بناءً على التوجيه/المرجع."
+      },
+      "image": {
+        "name": "الصورة",
+        "tooltip": "الصورة التي سيتم إعادة إضاءتها."
+      },
+      "interpolate_from_original": {
+        "name": "التقريب من الأصل",
+        "tooltip": "يقيّد حرية التوليد لمطابقة الأصل بشكل أكبر."
+      },
+      "light_transfer_strength": {
+        "name": "شدة نقل الإضاءة",
+        "tooltip": "شدة تطبيق نقل الإضاءة."
+      },
+      "preserve_details": {
+        "name": "الحفاظ على التفاصيل",
+        "tooltip": "يحافظ على النسيج والتفاصيل الدقيقة من الأصل."
+      },
+      "prompt": {
+        "name": "التوجيه",
+        "tooltip": "إرشادات وصفية للإضاءة. يدعم تدوين التأكيد (١-١.٤)."
+      },
+      "reference_image": {
+        "name": "صورة مرجعية",
+        "tooltip": "صورة مرجعية اختيارية لنقل الإضاءة منها."
+      },
+      "style": {
+        "name": "النمط",
+        "tooltip": "تفضيل النتيجة الأسلوبية."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageSkinEnhancerNode": {
+    "description": "تحسين البشرة للصور الشخصية مع أوضاع معالجة متعددة.",
+    "display_name": "محسّن البشرة للصورة Magnific",
+    "inputs": {
+      "image": {
+        "name": "الصورة",
+        "tooltip": "صورة البورتريه التي سيتم تحسينها."
+      },
+      "mode": {
+        "name": "الوضع",
+        "tooltip": "وضع المعالجة: إبداعي للتعزيز الفني، واقعي للحفاظ على المظهر الأصلي، مرن للتحسين المستهدف."
+      },
+      "sharpen": {
+        "name": "حدة التوضيح",
+        "tooltip": "مستوى شدة التوضيح."
+      },
+      "smart_grain": {
+        "name": "الحبيبات الذكية",
+        "tooltip": "مستوى شدة الحبيبات الذكية."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageStyleTransferNode": {
+    "description": "نقل النمط من صورة مرجعية إلى صورتك المدخلة.",
+    "display_name": "نقل نمط الصورة Magnific",
+    "inputs": {
+      "engine": {
+        "name": "engine",
+        "tooltip": "اختيار محرك المعالجة."
+      },
+      "fixed_generation": {
+        "name": "fixed_generation",
+        "tooltip": "عند التعطيل، توقع أن تقدم كل عملية توليد درجة من العشوائية، مما يؤدي إلى نتائج أكثر تنوعًا."
+      },
+      "flavor": {
+        "name": "flavor",
+        "tooltip": "نوع نقل النمط."
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "الصورة التي سيتم تطبيق نقل النمط عليها."
+      },
+      "portrait_mode": {
+        "name": "portrait_mode",
+        "tooltip": "تفعيل وضع البورتريه لتحسينات الوجه."
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "reference_image": {
+        "name": "reference_image",
+        "tooltip": "الصورة المرجعية لاستخلاص النمط منها."
+      },
+      "structure_strength": {
+        "name": "structure_strength",
+        "tooltip": "يحافظ على بنية الصورة الأصلية."
+      },
+      "style_strength": {
+        "name": "style_strength",
+        "tooltip": "نسبة قوة النمط."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageUpscalerCreativeNode": {
+    "description": "تحسين وتجميل موجه بالنص وتكبير ٢×/٤×/٨×/١٦×. الحد الأقصى للإخراج: ٢٥٫٣ ميغابيكسل.",
+    "display_name": "تكبير الصور Magnific (إبداعي)",
+    "inputs": {
+      "auto_downscale": {
+        "name": "تصغير تلقائي",
+        "tooltip": "تصغير الصورة تلقائيًا إذا تجاوز الإخراج الحد الأقصى للبكسل."
+      },
+      "creativity": {
+        "name": "الإبداع"
+      },
+      "engine": {
+        "name": "المحرك"
+      },
+      "fractality": {
+        "name": "التفصيلية",
+        "tooltip": "قوة النص التوجيهي والتعقيد لكل بكسل مربع."
+      },
+      "hdr": {
+        "name": "النطاق الديناميكي العالي (HDR)",
+        "tooltip": "مستوى الوضوح والتفاصيل."
+      },
+      "image": {
+        "name": "صورة"
+      },
+      "optimized_for": {
+        "name": "محسّن لـ"
+      },
+      "prompt": {
+        "name": "النص التوجيهي"
+      },
+      "resemblance": {
+        "name": "التشابه",
+        "tooltip": "مستوى التشابه مع الصورة الأصلية."
+      },
+      "scale_factor": {
+        "name": "عامل التكبير"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageUpscalerPreciseV2Node": {
+    "description": "تكبير عالي الدقة مع تحكم دقيق في الحدة، الحبيبات، والتفاصيل. الحد الأقصى للإخراج: ١٠٠٦٠×١٠٠٦٠ بكسل.",
+    "display_name": "تكبير الصور Magnific (دقيق V2)",
+    "inputs": {
+      "auto_downscale": {
+        "name": "تصغير تلقائي",
+        "tooltip": "تصغير الصورة تلقائيًا إذا تجاوز الإخراج الحد الأقصى للدقة."
+      },
+      "flavor": {
+        "name": "النمط",
+        "tooltip": "أسلوب المعالجة: sublime للاستخدام العام، photo للصور الفوتوغرافية، photo_denoiser للصور الضوضائية."
+      },
+      "image": {
+        "name": "صورة"
+      },
+      "scale_factor": {
+        "name": "عامل التكبير"
+      },
+      "sharpen": {
+        "name": "الحدة",
+        "tooltip": "شدة وضوح الصورة. القيم الأعلى تزيد من وضوح الحواف والوضوح العام."
+      },
+      "smart_grain": {
+        "name": "تحسين الحبيبات الذكي",
+        "tooltip": "تعزيز ذكي للحبيبات/الملمس لمنع الصورة من أن تبدو ناعمة أو اصطناعية بشكل مفرط."
+      },
+      "ultra_detail": {
+        "name": "تفاصيل فائقة",
+        "tooltip": "التحكم في التفاصيل الدقيقة، والملمس، والتفاصيل الصغيرة المضافة أثناء التكبير."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "Mahiro": {
     "description": "تعديل التوجيه للتركيز أكثر على 'اتجاه' النص الإيجابي بدلاً من الفرق بين النص السلبي.",
     "display_name": "ماهيرو لطيفة جداً وتستحق دالة توجيه أفضل!! (。・ω・。)",
@@ -5301,6 +8057,50 @@
       }
     }
   },
+  "MakeTrainingDataset": {
+    "display_name": "إنشاء مجموعة بيانات تدريبية",
+    "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "نموذج CLIP لترميز النص إلى التكييف."
+      },
+      "images": {
+        "name": "صور",
+        "tooltip": "قائمة الصور للترميز."
+      },
+      "texts": {
+        "name": "نصوص",
+        "tooltip": "قائمة التسميات التوضيحية للنص. يمكن أن تكون بطول n (مطابقة للصور)، أو 1 (مكررة للجميع)، أو محذوفة (يتم استخدام سلسلة فارغة)."
+      },
+      "vae": {
+        "name": "vae",
+        "tooltip": "نموذج VAE لترميز الصور إلى الكامنات."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "كامنات",
+        "tooltip": "قائمة القواميس الكامنة"
+      },
+      "1": {
+        "name": "تكييف",
+        "tooltip": "قائمة قوائم التكييف"
+      }
+    }
+  },
+  "ManualSigmas": {
+    "display_name": "ManualSigmas",
+    "inputs": {
+      "sigmas": {
+        "name": "سيغما"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "MaskComposite": {
     "display_name": "تركيب القناع",
     "inputs": {
@@ -5319,6 +8119,11 @@
       "y": {
         "name": "ص"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "MaskPreview": {
@@ -5336,6 +8141,371 @@
       "mask": {
         "name": "قناع"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MergeImageLists": {
+    "display_name": "دمج قوائم الصور",
+    "inputs": {
+      "images": {
+        "name": "صور",
+        "tooltip": "قائمة الصور للمعالجة."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "صور",
+        "tooltip": "الصور المعالجة"
+      }
+    }
+  },
+  "MergeTextLists": {
+    "display_name": "دمج قوائم النصوص",
+    "inputs": {
+      "texts": {
+        "name": "نصوص",
+        "tooltip": "قائمة النصوص للمعالجة."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "نصوص",
+        "tooltip": "النصوص المعالجة"
+      }
+    }
+  },
+  "MeshyAnimateModelNode": {
+    "description": "تطبيق حركة أنيميشن محددة على شخصية تم تجهيزها مسبقًا.",
+    "display_name": "Meshy: تحريك النموذج",
+    "inputs": {
+      "action_id": {
+        "name": "action_id",
+        "tooltip": "قم بزيارة https://docs.meshy.ai/en/api/animation-library للاطلاع على قائمة القيم المتاحة."
+      },
+      "rig_task_id": {
+        "name": "rig_task_id"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyImageToModelNode": {
+    "display_name": "Meshy: من صورة إلى نموذج",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "حدد وضعية النموذج الناتج."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "تتحكم البذرة فيما إذا كان يجب إعادة تشغيل العقدة؛ النتائج غير حتمية بغض النظر عن البذرة."
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "عند التعيين إلى false، يتم إرجاع شبكة مثلثية غير معالجة."
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      },
+      "should_texture": {
+        "name": "should_texture",
+        "tooltip": "يحدد ما إذا كان سيتم توليد الخامات. إذا تم تعيينه إلى false، يتم تخطي مرحلة الخامات وإرجاع شبكة بدون خامات."
+      },
+      "should_texture_enable_pbr": {
+        "name": "enable_pbr"
+      },
+      "should_texture_texture_prompt": {
+        "name": "texture_prompt"
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyMultiImageToModelNode": {
+    "display_name": "Meshy: من صور متعددة إلى نموذج",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "images": {
+        "name": "images"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "حدد وضعية النموذج الناتج."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "تتحكم البذرة فيما إذا كان يجب إعادة تشغيل العقدة؛ النتائج غير حتمية بغض النظر عن البذرة."
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "عند التعيين إلى false، يتم إرجاع شبكة مثلثية غير معالجة."
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      },
+      "should_texture": {
+        "name": "should_texture",
+        "tooltip": "يحدد ما إذا كان سيتم توليد الخامات. إذا تم تعيينه إلى false، يتم تخطي مرحلة الخامات وإرجاع شبكة بدون خامات."
+      },
+      "should_texture_enable_pbr": {
+        "name": "enable_pbr"
+      },
+      "should_texture_texture_prompt": {
+        "name": "texture_prompt"
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyRefineNode": {
+    "description": "تحسين نموذج أولي تم إنشاؤه مسبقًا.",
+    "display_name": "Meshy: تحسين النموذج الأولي",
+    "inputs": {
+      "enable_pbr": {
+        "name": "enable_pbr",
+        "tooltip": "توليد خرائط PBR (معدنية، خشونة، عادية) بالإضافة إلى اللون الأساسي. ملاحظة: يجب ضبط هذا الخيار على 'غير مفعل' عند استخدام نمط Sculpture، حيث أن نمط Sculpture يولد مجموعته الخاصة من خرائط PBR."
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "model": {
+        "name": "model"
+      },
+      "texture_image": {
+        "name": "texture_image",
+        "tooltip": "يمكن استخدام أحد الخيارين فقط: 'texture_image' أو 'texture_prompt' في نفس الوقت."
+      },
+      "texture_prompt": {
+        "name": "texture_prompt",
+        "tooltip": "أدخل نصًا لتوجيه عملية الإكساء. الحد الأقصى ٦٠٠ حرف. لا يمكن استخدامه مع 'texture_image' في نفس الوقت."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyRigModelNode": {
+    "description": "يوفر شخصية مجهزة بالحركة بصيغ قياسية. التجهيز التلقائي غير مناسب حاليًا للنماذج غير المكسوة، أو الأصول غير البشرية، أو الأصول البشرية ذات البنية غير الواضحة للأطراف والجسم.",
+    "display_name": "Meshy: تجهيز النموذج بالحركة",
+    "inputs": {
+      "height_meters": {
+        "name": "height_meters",
+        "tooltip": "الارتفاع التقريبي لنموذج الشخصية بالمتر. يساعد ذلك في دقة القياس والتجهيز."
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "texture_image": {
+        "name": "texture_image",
+        "tooltip": "صورة الإكساء الأساسية (UV-unwrapped) للنموذج."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "rig_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyTextToModelNode": {
+    "display_name": "Meshy: تحويل النص إلى نموذج",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "حدد وضعية النموذج المُنتج."
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "الرقم العشوائي (seed) يتحكم في ما إذا كان يجب إعادة تشغيل العقدة؛ النتائج غير حتمية بغض النظر عن قيمة seed."
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "عند ضبطه على 'غير مفعل'، يتم إرجاع شبكة مثلثية غير معالجة."
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      },
+      "style": {
+        "name": "style"
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "ملف النموذج",
+        "tooltip": null
+      },
+      "1": {
+        "name": "معرّف مهمة meshy",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyTextureNode": {
+    "display_name": "Meshy: نموذج النسيج",
+    "inputs": {
+      "enable_original_uv": {
+        "name": "تفعيل UV الأصلي",
+        "tooltip": "استخدم UV الأصلي للنموذج بدلاً من إنشاء UV جديد. عند التفعيل، يحتفظ Meshy بالخامات الأصلية من النموذج المرفوع. إذا لم يكن لدى النموذج UV أصلي، قد لا تكون جودة الناتج جيدة."
+      },
+      "image_style": {
+        "name": "نمط الصورة",
+        "tooltip": "صورة ثنائية الأبعاد لتوجيه عملية النسيج. لا يمكن استخدامها مع 'text_style_prompt' في نفس الوقت."
+      },
+      "meshy_task_id": {
+        "name": "معرّف مهمة Meshy"
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "pbr": {
+        "name": "PBR"
+      },
+      "text_style_prompt": {
+        "name": "وصف نمط النسيج بالنص",
+        "tooltip": "صف نمط النسيج المطلوب للكائن باستخدام النص. الحد الأقصى ٦٠٠ حرف. لا يمكن استخدامه مع 'image_style' في نفس الوقت."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "ملف النموذج",
+        "tooltip": null
+      },
+      "1": {
+        "name": "معرّف مهمة meshy",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
     }
   },
   "MinimaxHailuoVideoNode": {
@@ -7779,6 +10949,78 @@
       }
     }
   },
+  "NAGuidance": {
+    "description": "يطبق توجيه الانتباه المعياري على النماذج، مما يتيح استخدام المطالبات السلبية على النماذج المقطرة/schnell.",
+    "display_name": "توجيه الانتباه المعياري",
+    "inputs": {
+      "model": {
+        "name": "النموذج",
+        "tooltip": "النموذج الذي سيتم تطبيق NAG عليه."
+      },
+      "nag_alpha": {
+        "name": "معامل المزج",
+        "tooltip": "معامل المزج للانتباه المعياري. القيمة 1.0 تعني استبدال كامل، 0.0 تعني عدم وجود تأثير."
+      },
+      "nag_scale": {
+        "name": "عامل مقياس التوجيه",
+        "tooltip": "عامل مقياس التوجيه. القيم الأعلى تدفع أبعد عن المطالبة السلبية."
+      },
+      "nag_tau": {
+        "name": "nag_tau"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "النموذج المعدل مع تفعيل NAG."
+      }
+    }
+  },
+  "NormalizeImages": {
+    "display_name": "تطبيع الصور",
+    "inputs": {
+      "images": {
+        "name": "صور",
+        "tooltip": "الصورة للمعالجة."
+      },
+      "mean": {
+        "name": "المتوسط",
+        "tooltip": "قيمة المتوسط للتطبيع."
+      },
+      "std": {
+        "name": "الانحراف المعياري",
+        "tooltip": "الانحراف المعياري للتطبيع."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "صور",
+        "tooltip": "الصور المعالجة"
+      }
+    }
+  },
+  "NormalizeVideoLatentStart": {
+    "description": "يقوم بتطبيع الإطارات الأولية من latent الفيديو لمطابقة المتوسط والانحراف المعياري لإطارات مرجعية لاحقة. يساعد في تقليل الفروقات بين الإطارات الأولى وباقي الفيديو.",
+    "display_name": "NormalizeVideoLatentStart",
+    "inputs": {
+      "latent": {
+        "name": "latent"
+      },
+      "reference_frame_count": {
+        "name": "reference_frame_count",
+        "tooltip": "عدد إطارات latent بعد الإطارات الأولى لاستخدامها كمرجع"
+      },
+      "start_frame_count": {
+        "name": "start_frame_count",
+        "tooltip": "عدد إطارات latent المطلوب تطبيعها، محسوبة من البداية"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
   "OpenAIChatConfig": {
     "description": "يسمح بتحديد خيارات التكوين المتقدمة لعقد الدردشة الخاصة بـ OpenAI.",
     "display_name": "خيارات OpenAI ChatGPT المتقدمة",
@@ -7928,6 +11170,9 @@
         "name": "القناع",
         "tooltip": "قناع اختياري للرسم الداخلي (سيتم استبدال المناطق البيضاء)"
       },
+      "model": {
+        "name": "model"
+      },
       "n": {
         "name": "عدد الصور",
         "tooltip": "كم عدد الصور التي يتم إنشاؤها"
@@ -8440,6 +11685,11 @@
       "steps": {
         "name": "الخطوات"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "PorterDuffImageComposite": {
@@ -8473,21 +11723,30 @@
   "Preview3D": {
     "display_name": "معاينة ثلاثية الأبعاد",
     "inputs": {
+      "bg_image": {
+        "name": "bg_image"
+      },
       "camera_info": {
         "name": "معلومات الكاميرا"
       },
       "image": {
-        "name": "الصورة"
+        "name": "صورة"
       },
       "model_file": {
-        "name": "ملف النموذج"
+        "name": "ملف النموذج",
+        "tooltip": "ملف النموذج ثلاثي الأبعاد أو مسار الملف"
       }
     }
   },
   "PreviewAny": {
     "display_name": "معاينة أي",
     "inputs": {
-      "preview": {
+      "previewMode": {},
+      "preview_markdown": {
+        "name": "معاينة"
+      },
+      "preview_text": {
+        "name": "معاينة"
       },
       "source": {
         "name": "المصدر"
@@ -8527,6 +11786,28 @@
       }
     }
   },
+  "PrimitiveBoundingBox": {
+    "display_name": "مربع التحديد",
+    "inputs": {
+      "height": {
+        "name": "الارتفاع"
+      },
+      "width": {
+        "name": "العرض"
+      },
+      "x": {
+        "name": "س"
+      },
+      "y": {
+        "name": "ص"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "PrimitiveFloat": {
     "display_name": "عائم",
     "inputs": {
@@ -8628,6 +11909,36 @@
       }
     }
   },
+  "RandomCropImages": {
+    "display_name": "قص عشوائي للصور",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "height": {
+        "name": "height",
+        "tooltip": "ارتفاع القص."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "الصورة للمعالجة."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "بذرة عشوائية."
+      },
+      "width": {
+        "name": "width",
+        "tooltip": "عرض القص."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "الصور المعالجة"
+      }
+    }
+  },
   "RandomNoise": {
     "display_name": "ضجيج عشوائية",
     "inputs": {
@@ -8637,6 +11948,11 @@
       "noise_seed": {
         "name": "بذرة الضجيج"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "RebatchImages": {
@@ -8677,6 +11993,11 @@
       "audio": {
         "name": "الصوت"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "RecraftColorRGB": {
@@ -8724,6 +12045,25 @@
       }
     }
   },
+  "RecraftCreateStyleNode": {
+    "description": "أنشئ نمطًا مخصصًا من صور مرجعية. قم برفع ١ إلى ٥ صور لاستخدامها كمرجع للنمط. الحجم الإجمالي لجميع الصور محدود بـ ٥ ميجابايت.",
+    "display_name": "إنشاء نمط مخصص Recraft",
+    "inputs": {
+      "images": {
+        "name": "الصور"
+      },
+      "style": {
+        "name": "النمط",
+        "tooltip": "النمط الأساسي للصور المُولدة."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "معرّف النمط",
+        "tooltip": null
+      }
+    }
+  },
   "RecraftCreativeUpscaleNode": {
     "description": "تكبير الصورة بشكل متزامن.\nيعزز صورة نقطية معينة باستخدام أداة 'التكبير الإبداعي'، مع التركيز على تحسين التفاصيل الصغيرة والوجوه.",
     "display_name": "تكبير إبداعي لإعادة الصياغة",
@@ -9031,6 +12371,88 @@
       }
     }
   },
+  "RecraftV4TextToImageNode": {
+    "description": "ينتج صورًا باستخدام نماذج Recraft V4 أو V4 Pro.",
+    "display_name": "Recraft V4 تحويل النص إلى صورة",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "model": {
+        "name": "النموذج",
+        "tooltip": "النموذج المستخدم في التوليد."
+      },
+      "model_size": {
+        "name": "الحجم"
+      },
+      "n": {
+        "name": "عدد الصور",
+        "tooltip": "عدد الصور المراد إنشاؤها."
+      },
+      "negative_prompt": {
+        "name": "المطالبة السلبية",
+        "tooltip": "وصف نصي اختياري للعناصر غير المرغوب فيها في الصورة."
+      },
+      "prompt": {
+        "name": "المطالبة",
+        "tooltip": "المطالبة لإنشاء الصورة. الحد الأقصى ١٠٬٠٠٠ حرف."
+      },
+      "recraft_controls": {
+        "name": "عناصر تحكم Recraft",
+        "tooltip": "عناصر تحكم إضافية اختيارية في التوليد عبر عقدة عناصر تحكم Recraft."
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "بذرة لتحديد ما إذا كان يجب إعادة تشغيل العقدة؛ النتائج الفعلية غير حتمية بغض النظر عن البذرة."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftV4TextToVectorNode": {
+    "description": "ينتج SVG باستخدام نماذج Recraft V4 أو V4 Pro.",
+    "display_name": "Recraft V4 تحويل النص إلى متجه",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "model": {
+        "name": "النموذج",
+        "tooltip": "النموذج المستخدم في التوليد."
+      },
+      "model_size": {
+        "name": "الحجم"
+      },
+      "n": {
+        "name": "عدد الصور",
+        "tooltip": "عدد الصور المراد إنشاؤها."
+      },
+      "negative_prompt": {
+        "name": "المطالبة السلبية",
+        "tooltip": "وصف نصي اختياري للعناصر غير المرغوب فيها في الصورة."
+      },
+      "prompt": {
+        "name": "المطالبة",
+        "tooltip": "المطالبة لإنشاء الصورة. الحد الأقصى ١٠٬٠٠٠ حرف."
+      },
+      "recraft_controls": {
+        "name": "عناصر تحكم Recraft",
+        "tooltip": "عناصر تحكم إضافية اختيارية في التوليد عبر عقدة عناصر تحكم Recraft."
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "بذرة لتحديد ما إذا كان يجب إعادة تشغيل العقدة؛ النتائج الفعلية غير حتمية بغض النظر عن البذرة."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RecraftVectorizeImageNode": {
     "description": "ينشئ SVG بشكل متزامن من صورة إدخال.",
     "display_name": "إعادة صياغة تحويل الصورة إلى متجه",
@@ -9062,6 +12484,23 @@
       }
     }
   },
+  "ReferenceTimbreAudio": {
+    "description": "تحدد هذه العقدة الصوت المرجعي للـ timbre (لـ ace step 1.5)",
+    "display_name": "ReferenceTimbreAudio",
+    "inputs": {
+      "conditioning": {
+        "name": "تهيئة"
+      },
+      "latent": {
+        "name": "latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RegexExtract": {
     "display_name": "استخراج التعبير النمطي",
     "inputs": {
@@ -9181,6 +12620,11 @@
       "image": {
         "name": "الصورة"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "RepeatLatentBatch": {
@@ -9194,6 +12638,51 @@
       }
     }
   },
+  "ReplaceText": {
+    "display_name": "استبدال النص",
+    "inputs": {
+      "find": {
+        "name": "بحث",
+        "tooltip": "النص المطلوب إيجاده."
+      },
+      "replace": {
+        "name": "استبدال",
+        "tooltip": "النص الذي سيتم الاستبدال به."
+      },
+      "texts": {
+        "name": "النصوص",
+        "tooltip": "النصوص للمعالجة."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "النصوص",
+        "tooltip": "النصوص المعالجة"
+      }
+    }
+  },
+  "ReplaceVideoLatentFrames": {
+    "display_name": "استبدال إطارات latent للفيديو",
+    "inputs": {
+      "destination": {
+        "name": "الوجهة",
+        "tooltip": "latent الوجهة حيث سيتم استبدال الإطارات."
+      },
+      "index": {
+        "name": "الفهرس",
+        "tooltip": "فهرس إطار latent الابتدائي في latent الوجهة حيث سيتم وضع إطارات latent المصدر. القيم السالبة تعني العد من النهاية."
+      },
+      "source": {
+        "name": "المصدر",
+        "tooltip": "latent المصدر الذي يوفر الإطارات لإدراجها في latent الوجهة. إذا لم يتم توفيره، سيتم إرجاع latent الوجهة بدون تغيير."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RescaleCFG": {
     "display_name": "إعادة تحجيم CFG",
     "inputs": {
@@ -9223,6 +12712,128 @@
       "target_width": {
         "name": "العرض_الهدف"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ResizeImageMaskNode": {
+    "description": "تغيير حجم صورة أو قناع باستخدام طرق تحجيم مختلفة.",
+    "display_name": "تغيير حجم الصورة/القناع",
+    "inputs": {
+      "input": {
+        "name": "الإدخال"
+      },
+      "resize_type": {
+        "name": "نوع تغيير الحجم",
+        "tooltip": "اختر طريقة تغيير الحجم: حسب الأبعاد الدقيقة، عامل التحجيم، مطابقة صورة أخرى، إلخ."
+      },
+      "resize_type_crop": {
+        "name": "قص"
+      },
+      "resize_type_height": {
+        "name": "الارتفاع"
+      },
+      "resize_type_width": {
+        "name": "العرض"
+      },
+      "scale_method": {
+        "name": "طريقة التحجيم",
+        "tooltip": "خوارزمية الاستيفاء. 'area' هي الأفضل لتصغير الحجم، و'lanczos' لتكبير الحجم، و'nearest-exact' لفن البكسل."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "بحجم معدل",
+        "tooltip": null
+      }
+    }
+  },
+  "ResizeImagesByLongerEdge": {
+    "display_name": "تغيير حجم الصور حسب الحافة الأطول",
+    "inputs": {
+      "images": {
+        "name": "images",
+        "tooltip": "الصورة المراد معالجتها."
+      },
+      "longer_edge": {
+        "name": "longer_edge",
+        "tooltip": "الطول المستهدف للحافة الأطول."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "الصور المعالجة"
+      }
+    }
+  },
+  "ResizeImagesByShorterEdge": {
+    "display_name": "تغيير حجم الصور حسب الحافة الأقصر",
+    "inputs": {
+      "images": {
+        "name": "images",
+        "tooltip": "الصورة المراد معالجتها."
+      },
+      "shorter_edge": {
+        "name": "shorter_edge",
+        "tooltip": "الطول المستهدف للحافة الأقصر."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "الصور المعالجة"
+      }
+    }
+  },
+  "ResolutionBucket": {
+    "display_name": "تجميع الدقة",
+    "inputs": {
+      "conditioning": {
+        "name": "conditioning",
+        "tooltip": "قائمة قوائم conditioning (يجب أن تطابق طول latents)."
+      },
+      "latents": {
+        "name": "latents",
+        "tooltip": "قائمة قواميس latent للتجميع حسب الدقة."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latents",
+        "tooltip": "قائمة قواميس latent المجمعة، واحدة لكل تجميع دقة."
+      },
+      "1": {
+        "name": "conditioning",
+        "tooltip": "قائمة قوائم conditioning، واحدة لكل تجميع دقة."
+      }
+    }
+  },
+  "ResolutionSelector": {
+    "description": "احسب العرض والارتفاع من نسبة العرض إلى الارتفاع والهدف بالميغابكسل. مفيد لتعيين أبعاد صورة Latent فارغة.",
+    "display_name": "محدد الدقة",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبة العرض إلى الارتفاع",
+        "tooltip": "نسبة العرض إلى الارتفاع للأبعاد الناتجة."
+      },
+      "megapixels": {
+        "name": "الميغابكسل",
+        "tooltip": "إجمالي الميغابكسل المستهدف. ١.٠ ميغابكسل ≈ ١٠٢٤×١٠٢٤ للبُعد المربع."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "العرض",
+        "tooltip": "العرض المحسوب بالبكسل (مضاعف للعدد ٨)."
+      },
+      "1": {
+        "name": "الارتفاع",
+        "tooltip": "الارتفاع المحسوب بالبكسل (مضاعف للعدد ٨)."
+      }
     }
   },
   "Rodin3D_Detail": {
@@ -9244,7 +12855,11 @@
     },
     "outputs": {
       "0": {
-        "name": "مسار_النموذج_ثلاثي_الأبعاد",
+        "name": "مسار النموذج ثلاثي الأبعاد",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -9273,6 +12888,10 @@
       "0": {
         "name": "مسار النموذج ثلاثي الأبعاد",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9297,6 +12916,10 @@
       "0": {
         "name": "مسار النموذج ثلاثي الأبعاد",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9315,6 +12938,10 @@
       "0": {
         "name": "مسار النموذج ثلاثي الأبعاد",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9339,6 +12966,10 @@
       "0": {
         "name": "مسار النموذج ثلاثي الأبعاد",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9464,6 +13095,90 @@
       }
     }
   },
+  "SDPoseDrawKeypoints": {
+    "display_name": "SDPoseDrawKeypoints",
+    "inputs": {
+      "draw_body": {
+        "name": "رسم الجسم"
+      },
+      "draw_face": {
+        "name": "رسم الوجه"
+      },
+      "draw_feet": {
+        "name": "رسم القدمين"
+      },
+      "draw_hands": {
+        "name": "رسم اليدين"
+      },
+      "face_point_size": {
+        "name": "حجم نقطة الوجه"
+      },
+      "keypoints": {
+        "name": "النقاط الرئيسية"
+      },
+      "score_threshold": {
+        "name": "عتبة الدرجات"
+      },
+      "stick_width": {
+        "name": "عرض الخط"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SDPoseFaceBBoxes": {
+    "display_name": "SDPoseFaceBBoxes",
+    "inputs": {
+      "force_square": {
+        "name": "إجبار الشكل المربع",
+        "tooltip": "توسيع المحور الأقصر لمربع التحديد بحيث تكون منطقة القص دائماً مربعة."
+      },
+      "keypoints": {
+        "name": "النقاط الرئيسية"
+      },
+      "scale": {
+        "name": "المقياس",
+        "tooltip": "معامل ضرب لمساحة مربع التحديد حول كل وجه مكتشف."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مربعات التحديد",
+        "tooltip": "مربعات تحديد الوجه لكل إطار، متوافقة مع مدخل مربعات التحديد في SDPoseKeypointExtractor."
+      }
+    }
+  },
+  "SDPoseKeypointExtractor": {
+    "description": "استخراج النقاط الرئيسية للوضعية من الصور باستخدام نموذج SDPose: https://huggingface.co/Comfy-Org/SDPose/tree/main/checkpoints",
+    "display_name": "SDPoseKeypointExtractor",
+    "inputs": {
+      "batch_size": {
+        "name": "حجم الدفعة"
+      },
+      "bboxes": {
+        "name": "مربعات التحديد",
+        "tooltip": "مربعات التحديد الاختيارية للحصول على كشف أدق. مطلوبة لاكتشاف عدة أشخاص."
+      },
+      "image": {
+        "name": "الصورة"
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "النقاط الرئيسية",
+        "tooltip": "النقاط الرئيسية بتنسيق OpenPose (عرض اللوحة، ارتفاع اللوحة، الأشخاص)"
+      }
+    }
+  },
   "SDTurboScheduler": {
     "display_name": "جدول SD Turbo",
     "inputs": {
@@ -9476,6 +13191,11 @@
       "steps": {
         "name": "الخطوات"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SD_4XUpscale_Conditioning": {
@@ -9631,10 +13351,12 @@
     },
     "outputs": {
       "0": {
-        "name": "المخرج"
+        "name": "الناتج",
+        "tooltip": null
       },
       "1": {
-        "name": "المخرج المنقح"
+        "name": "الناتج بعد إزالة التشويش",
+        "tooltip": null
       }
     }
   },
@@ -9659,10 +13381,12 @@
     },
     "outputs": {
       "0": {
-        "name": "المخرج"
+        "name": "الناتج",
+        "tooltip": null
       },
       "1": {
-        "name": "المخرج المنقح"
+        "name": "الناتج بعد إزالة التشويش",
+        "tooltip": null
       }
     }
   },
@@ -9699,6 +13423,11 @@
       "s_noise": {
         "name": "ضجيج s"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_2M_SDE": {
@@ -9716,6 +13445,11 @@
       "solver_type": {
         "name": "نوع المُحلل"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_2S_Ancestral": {
@@ -9727,6 +13461,11 @@
       "s_noise": {
         "name": "ضجيج s"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_3M_SDE": {
@@ -9741,6 +13480,11 @@
       "s_noise": {
         "name": "ضجيج s"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_SDE": {
@@ -9758,6 +13502,11 @@
       "s_noise": {
         "name": "ضجيج s"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerER_SDE": {
@@ -9776,6 +13525,11 @@
       "solver_type": {
         "name": "نوع الحل"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerEulerAncestral": {
@@ -9787,6 +13541,11 @@
       "s_noise": {
         "name": "ضجيج s"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerEulerAncestralCFGPP": {
@@ -9798,6 +13557,11 @@
       "s_noise": {
         "name": "ضجيج s"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerEulerCFGpp": {
@@ -9838,6 +13602,11 @@
       "order": {
         "name": "الترتيب"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerSASolver": {
@@ -9870,6 +13639,37 @@
       "use_pece": {
         "name": "استخدام PECE"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerSEEDS2": {
+    "description": "يمكن لعقدة السامبلر هذه تمثيل عدة سامبلرات:\n\nseeds_2\n- الإعداد الافتراضي\n\nexp_heun_2_x0\n- solver_type=phi_2, r=1.0, eta=0.0\n\nexp_heun_2_x0_sde\n- solver_type=phi_2, r=1.0, eta=1.0, s_noise=1.0",
+    "display_name": "SamplerSEEDS2",
+    "inputs": {
+      "eta": {
+        "name": "eta",
+        "tooltip": "قوة العشوائية"
+      },
+      "r": {
+        "name": "r",
+        "tooltip": "حجم الخطوة النسبية للمرحلة المتوسطة (عقدة c2)"
+      },
+      "s_noise": {
+        "name": "s_noise",
+        "tooltip": "معامل ضوضاء SDE"
+      },
+      "solver_type": {
+        "name": "solver_type"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplingPercentToSigma": {
@@ -9888,7 +13688,8 @@
     },
     "outputs": {
       "0": {
-        "name": "قيمة سيجما"
+        "name": "قيمة سيغما",
+        "tooltip": null
       }
     }
   },
@@ -9987,10 +13788,11 @@
         "name": "بادئة اسم الملف"
       },
       "image": {
-        "name": "الصورة"
+        "name": "صورة"
       },
       "mesh": {
-        "name": "الشبكة"
+        "name": "الشبكة",
+        "tooltip": "شبكة أو ملف GLB للحفظ"
       }
     }
   },
@@ -10008,6 +13810,44 @@
       }
     }
   },
+  "SaveImageDataSetToFolder": {
+    "display_name": "حفظ مجموعة بيانات الصور في مجلد",
+    "inputs": {
+      "filename_prefix": {
+        "name": "filename_prefix",
+        "tooltip": "بادئة أسماء ملفات الصور المحفوظة."
+      },
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "اسم المجلد لحفظ الصور بداخله (داخل دليل الإخراج)."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "قائمة الصور المراد حفظها."
+      }
+    }
+  },
+  "SaveImageTextDataSetToFolder": {
+    "display_name": "حفظ مجموعة بيانات الصور والنصوص في مجلد",
+    "inputs": {
+      "filename_prefix": {
+        "name": "filename_prefix",
+        "tooltip": "بادئة أسماء ملفات الصور المحفوظة."
+      },
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "اسم المجلد لحفظ الصور بداخله (داخل دليل الإخراج)."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "قائمة الصور المراد حفظها."
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "قائمة التسميات التوضيحية النصية المراد حفظها."
+      }
+    }
+  },
   "SaveImageWebsocket": {
     "display_name": "حفظ صورة عبر Websocket",
     "inputs": {
@@ -10027,6 +13867,23 @@
       }
     }
   },
+  "SaveLoRA": {
+    "display_name": "حفظ أوزان LoRA",
+    "inputs": {
+      "lora": {
+        "name": "lora",
+        "tooltip": "نموذج LoRA المراد حفظه. لا تستخدم النموذج مع طبقات LoRA."
+      },
+      "prefix": {
+        "name": "prefix",
+        "tooltip": "البادئة المستخدمة لملف LoRA المحفوظ."
+      },
+      "steps": {
+        "name": "steps",
+        "tooltip": "اختياري: عدد الخطوات التي تم تدريب LoRA عليها، تُستخدم لتسمية الملف المحفوظ."
+      }
+    }
+  },
   "SaveSVGNode": {
     "description": "حفظ ملفات SVG على القرص.",
     "display_name": "عقدة حفظ SVG",
@@ -10040,6 +13897,27 @@
       }
     }
   },
+  "SaveTrainingDataset": {
+    "display_name": "حفظ مجموعة بيانات التدريب",
+    "inputs": {
+      "conditioning": {
+        "name": "conditioning",
+        "tooltip": "قائمة قوائم التكييف من MakeTrainingDataset."
+      },
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "اسم المجلد لحفظ مجموعة البيانات (داخل دليل الإخراج)."
+      },
+      "latents": {
+        "name": "latents",
+        "tooltip": "قائمة القيم الكامنة من MakeTrainingDataset."
+      },
+      "shard_size": {
+        "name": "shard_size",
+        "tooltip": "عدد العينات في كل ملف جزء."
+      }
+    }
+  },
   "SaveVideo": {
     "description": "يحفظ الصور المدخلة في مجلد مخرجات ComfyUI الخاص بك.",
     "display_name": "حفظ الفيديو",
@@ -10160,6 +14038,11 @@
       "sigmas": {
         "name": "Sigmas"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SetHookKeyframes": {
@@ -10200,6 +14083,58 @@
       }
     }
   },
+  "ShuffleDataset": {
+    "display_name": "تبديل ترتيب مجموعة بيانات الصور",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "قائمة الصور لمعالجتها."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "بذرة عشوائية."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "الصور المعالجة"
+      }
+    }
+  },
+  "ShuffleImageTextDataset": {
+    "display_name": "تبديل ترتيب مجموعة بيانات الصور والنصوص",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "قائمة الصور لتبديل ترتيبها."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "بذرة عشوائية."
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "قائمة النصوص لتبديل ترتيبها."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "الصور بعد تبديل الترتيب"
+      },
+      "1": {
+        "name": "texts",
+        "tooltip": "النصوص بعد تبديل الترتيب"
+      }
+    }
+  },
   "SkipLayerGuidanceDiT": {
     "description": "نسخة عامة من عقدة SkipLayerGuidance يمكن استخدامها مع كل نموذج DiT.",
     "display_name": "توجيه تخطي الطبقة DiT",
@@ -10296,6 +14231,11 @@
       "width": {
         "name": "العرض"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SplitAudioChannels": {
@@ -10308,10 +14248,35 @@
     },
     "outputs": {
       "0": {
-        "name": "يسار"
+        "name": "يسار",
+        "tooltip": null
       },
       "1": {
-        "name": "يمين"
+        "name": "يمين",
+        "tooltip": null
+      }
+    }
+  },
+  "SplitImageToTileList": {
+    "description": "يقوم بتقسيم صورة إلى قائمة دفعات من القطع مع تداخل محدد.",
+    "display_name": "تجزئة الصورة إلى قائمة قطع",
+    "inputs": {
+      "image": {
+        "name": "image"
+      },
+      "overlap": {
+        "name": "overlap"
+      },
+      "tile_height": {
+        "name": "tile_height"
+      },
+      "tile_width": {
+        "name": "tile_width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
       }
     }
   },
@@ -10343,10 +14308,12 @@
     },
     "outputs": {
       "0": {
-        "name": "Sigmas عالية"
+        "name": "سيغما عالية",
+        "tooltip": null
       },
       "1": {
-        "name": "Sigmas منخفضة"
+        "name": "سيغما منخفضة",
+        "tooltip": null
       }
     }
   },
@@ -10362,10 +14329,12 @@
     },
     "outputs": {
       "0": {
-        "name": "Sigmas عالية"
+        "name": "سيغما عالية",
+        "tooltip": null
       },
       "1": {
-        "name": "Sigmas منخفضة"
+        "name": "سيغما منخفضة",
+        "tooltip": null
       }
     }
   },
@@ -10969,6 +14938,21 @@
       }
     }
   },
+  "StripWhitespace": {
+    "display_name": "إزالة الفراغات",
+    "inputs": {
+      "texts": {
+        "name": "النصوص",
+        "tooltip": "النص المراد معالجته."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "النصوص",
+        "tooltip": "النصوص المعالجة"
+      }
+    }
+  },
   "StyleModelApply": {
     "display_name": "تطبيق نموذج النمط",
     "inputs": {
@@ -11054,6 +15038,123 @@
       }
     }
   },
+  "Tencent3DPartNode": {
+    "description": "تنفيذ التعرف على المكونات وتوليدها تلقائيًا بناءً على هيكل النموذج.",
+    "display_name": "Hunyuan3D: جزء ثلاثي الأبعاد",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "model_3d": {
+        "name": "نموذج_ثلاثي_الأبعاد",
+        "tooltip": "نموذج ثلاثي الأبعاد بصيغة FBX. يجب أن يحتوي النموذج على أقل من ٣٠٠٠٠ وجه."
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "تتحكم البذرة فيما إذا كان يجب إعادة تشغيل العقدة؛ النتائج غير حتمية بغض النظر عن البذرة."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "TencentImageToModelNode": {
+    "display_name": "Hunyuan3D: من صورة إلى نموذج (احترافي)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "face_count": {
+        "name": "عدد الأوجه"
+      },
+      "generate_type": {
+        "name": "نوع التوليد"
+      },
+      "generate_type_pbr": {
+        "name": "PBR"
+      },
+      "image": {
+        "name": "الصورة"
+      },
+      "image_back": {
+        "name": "الصورة الخلفية"
+      },
+      "image_left": {
+        "name": "الصورة اليسرى"
+      },
+      "image_right": {
+        "name": "الصورة اليمنى"
+      },
+      "model": {
+        "name": "النموذج",
+        "tooltip": "خيار LowPoly غير متوفر لنموذج `3.1`."
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "البذرة تتحكم فيما إذا كان يجب إعادة تشغيل العقدة؛ النتائج غير حتمية بغض النظر عن البذرة."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "ملف النموذج",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "OBJ",
+        "tooltip": null
+      }
+    }
+  },
+  "TencentTextToModelNode": {
+    "display_name": "Hunyuan3D: من نص إلى نموذج (احترافي)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "face_count": {
+        "name": "عدد الأوجه"
+      },
+      "generate_type": {
+        "name": "نوع التوليد"
+      },
+      "generate_type_pbr": {
+        "name": "PBR"
+      },
+      "model": {
+        "name": "النموذج",
+        "tooltip": "خيار LowPoly غير متوفر لنموذج `3.1`."
+      },
+      "prompt": {
+        "name": "الموجه",
+        "tooltip": "يدعم حتى ١٠٢٤ حرفاً."
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "البذرة تتحكم فيما إذا كان يجب إعادة تشغيل العقدة؛ النتائج غير حتمية بغض النظر عن البذرة."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "ملف النموذج",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "OBJ",
+        "tooltip": null
+      }
+    }
+  },
   "TextEncodeAceStepAudio": {
     "display_name": "TextEncodeAceStepAudio",
     "inputs": {
@@ -11076,6 +15177,65 @@
       }
     }
   },
+  "TextEncodeAceStepAudio1_5": {
+    "display_name": "TextEncodeAceStepAudio1.5",
+    "inputs": {
+      "bpm": {
+        "name": "الإيقاع (BPM)"
+      },
+      "cfg_scale": {
+        "name": "cfg_scale"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "duration": {
+        "name": "المدة"
+      },
+      "generate_audio_codes": {
+        "name": "توليد رموز الصوت",
+        "tooltip": "تفعيل نموذج اللغة الكبير (LLM) الذي يولد رموز الصوت. قد يكون بطيئًا لكنه سيزيد من جودة الصوت الناتج. قم بإيقاف هذا الخيار إذا كنت تقدم مرجعًا صوتيًا للنموذج."
+      },
+      "keyscale": {
+        "name": "المقام الموسيقي"
+      },
+      "language": {
+        "name": "اللغة"
+      },
+      "lyrics": {
+        "name": "كلمات الأغنية"
+      },
+      "min_p": {
+        "name": "الحد الأدنى p"
+      },
+      "seed": {
+        "name": "البذرة"
+      },
+      "tags": {
+        "name": "الوسوم"
+      },
+      "temperature": {
+        "name": "درجة الحرارة"
+      },
+      "timesignature": {
+        "name": "توقيع الإيقاع"
+      },
+      "top_k": {
+        "name": "top_k"
+      },
+      "top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TextEncodeHunyuanVideo_ImageToVideo": {
     "display_name": "ترميز النص لفيديو Hunyuan - من صورة إلى فيديو",
     "inputs": {
@@ -11149,6 +15309,158 @@
       }
     }
   },
+  "TextEncodeZImageOmni": {
+    "display_name": "TextEncodeZImageOmni",
+    "inputs": {
+      "auto_resize_images": {
+        "name": "تغيير حجم الصور تلقائياً"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "image1": {
+        "name": "الصورة ١"
+      },
+      "image2": {
+        "name": "الصورة ٢"
+      },
+      "image3": {
+        "name": "الصورة ٣"
+      },
+      "image_encoder": {
+        "name": "مُرمّز الصورة"
+      },
+      "prompt": {
+        "name": "التوجيه"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TextGenerate": {
+    "display_name": "توليد نص",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image": {
+        "name": "صورة"
+      },
+      "max_length": {
+        "name": "الحد الأقصى للطول"
+      },
+      "prompt": {
+        "name": "الموجه"
+      },
+      "sampling_mode": {
+        "name": "وضع العينة"
+      },
+      "sampling_mode_min_p": {
+        "name": "أقل قيمة p"
+      },
+      "sampling_mode_repetition_penalty": {
+        "name": "عقوبة التكرار"
+      },
+      "sampling_mode_seed": {
+        "name": "البذرة"
+      },
+      "sampling_mode_temperature": {
+        "name": "درجة الحرارة"
+      },
+      "sampling_mode_top_k": {
+        "name": "أعلى k"
+      },
+      "sampling_mode_top_p": {
+        "name": "أعلى p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "النص المولّد",
+        "tooltip": null
+      }
+    }
+  },
+  "TextGenerateLTX2Prompt": {
+    "display_name": "TextGenerateLTX2Prompt",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image": {
+        "name": "الصورة"
+      },
+      "max_length": {
+        "name": "الحد الأقصى للطول"
+      },
+      "prompt": {
+        "name": "المطالبة"
+      },
+      "sampling_mode": {
+        "name": "وضع العينة"
+      },
+      "sampling_mode_min_p": {
+        "name": "أدنى قيمة p"
+      },
+      "sampling_mode_repetition_penalty": {
+        "name": "عقوبة التكرار"
+      },
+      "sampling_mode_seed": {
+        "name": "البذرة"
+      },
+      "sampling_mode_temperature": {
+        "name": "درجة الحرارة"
+      },
+      "sampling_mode_top_k": {
+        "name": "أعلى k"
+      },
+      "sampling_mode_top_p": {
+        "name": "أعلى p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "النص المُولّد",
+        "tooltip": null
+      }
+    }
+  },
+  "TextToLowercase": {
+    "display_name": "تحويل النص إلى أحرف صغيرة",
+    "inputs": {
+      "texts": {
+        "name": "النصوص",
+        "tooltip": "النص المراد معالجته."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "النصوص",
+        "tooltip": "النصوص المعالجة"
+      }
+    }
+  },
+  "TextToUppercase": {
+    "display_name": "تحويل النص إلى أحرف كبيرة",
+    "inputs": {
+      "texts": {
+        "name": "النصوص",
+        "tooltip": "النص المراد معالجته."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "النصوص",
+        "tooltip": "النصوص المعالجة"
+      }
+    }
+  },
   "ThresholdMask": {
     "display_name": "قناع العتبة",
     "inputs": {
@@ -11158,6 +15470,11 @@
       "value": {
         "name": "القيمة"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "TomePatchModel": {
@@ -11176,6 +15493,118 @@
       }
     }
   },
+  "TopazImageEnhance": {
+    "description": "تكبير وتحسين الصور بمعايير الصناعة.",
+    "display_name": "تحسين الصورة بواسطة Topaz",
+    "inputs": {
+      "color_preservation": {
+        "name": "حفظ الألوان",
+        "tooltip": "الحفاظ على الألوان الأصلية."
+      },
+      "creativity": {
+        "name": "الإبداع"
+      },
+      "crop_to_fill": {
+        "name": "قص لملء",
+        "tooltip": "بشكل افتراضي، يتم وضع الصورة في إطار عند اختلاف نسبة العرض إلى الارتفاع. فعّل هذا الخيار لقص الصورة لتملأ أبعاد الإخراج."
+      },
+      "face_enhancement": {
+        "name": "تحسين الوجه",
+        "tooltip": "تحسين الوجوه (إن وجدت) أثناء المعالجة."
+      },
+      "face_enhancement_creativity": {
+        "name": "إبداعية تحسين الوجه",
+        "tooltip": "تحديد مستوى الإبداع في تحسين الوجه."
+      },
+      "face_enhancement_strength": {
+        "name": "قوة تحسين الوجه",
+        "tooltip": "التحكم في مدى وضوح الوجوه المحسنة مقارنة بالخلفية."
+      },
+      "face_preservation": {
+        "name": "حفظ الوجه",
+        "tooltip": "الحفاظ على هوية الوجوه في الصورة."
+      },
+      "image": {
+        "name": "الصورة"
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "output_height": {
+        "name": "ارتفاع الإخراج",
+        "tooltip": "القيمة صفر تعني الإخراج بنفس ارتفاع الصورة الأصلية أو عرض الإخراج."
+      },
+      "output_width": {
+        "name": "عرض الإخراج",
+        "tooltip": "القيمة صفر تعني الحساب تلقائياً (عادةً سيكون الحجم الأصلي أو ارتفاع الإخراج إذا تم تحديده)."
+      },
+      "prompt": {
+        "name": "الموجه",
+        "tooltip": "موجه نصي اختياري لإرشاد التكبير الإبداعي."
+      },
+      "subject_detection": {
+        "name": "اكتشاف الموضوع"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TopazVideoEnhance": {
+    "description": "أعد إحياء الفيديو بتقنية التكبير والاستعادة القوية.",
+    "display_name": "Topaz Video Enhance",
+    "inputs": {
+      "dynamic_compression_level": {
+        "name": "مستوى الضغط الديناميكي",
+        "tooltip": "مستوى CQP."
+      },
+      "interpolation_duplicate": {
+        "name": "إزالة الإطارات المكررة",
+        "tooltip": "تحليل الفيديو المدخل للبحث عن الإطارات المكررة وإزالتها."
+      },
+      "interpolation_duplicate_threshold": {
+        "name": "حساسية اكتشاف التكرار",
+        "tooltip": "حساسية اكتشاف الإطارات المكررة."
+      },
+      "interpolation_enabled": {
+        "name": "تمكين التداخل"
+      },
+      "interpolation_frame_rate": {
+        "name": "معدل الإطارات",
+        "tooltip": "معدل الإطارات للإخراج."
+      },
+      "interpolation_model": {
+        "name": "نموذج التداخل"
+      },
+      "interpolation_slowmo": {
+        "name": "عامل الحركة البطيئة",
+        "tooltip": "عامل الحركة البطيئة المطبق على الفيديو المدخل. على سبيل المثال، 2 يجعل الإخراج أبطأ مرتين ويضاعف المدة."
+      },
+      "upscaler_creativity": {
+        "name": "مستوى الإبداع",
+        "tooltip": "مستوى الإبداع (ينطبق فقط على Starlight (Astra) Creative)."
+      },
+      "upscaler_enabled": {
+        "name": "تمكين التكبير"
+      },
+      "upscaler_model": {
+        "name": "نموذج التكبير"
+      },
+      "upscaler_resolution": {
+        "name": "دقة التكبير"
+      },
+      "video": {
+        "name": "فيديو"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TorchCompileModel": {
     "display_name": "نموذج TorchCompile",
     "inputs": {
@@ -11203,6 +15632,18 @@
         "name": "حجم الدُفعة",
         "tooltip": "حجم الدُفعة المستخدم في التدريب."
       },
+      "bucket_mode": {
+        "name": "وضع الدلو",
+        "tooltip": "تمكين وضع دلو الدقة. عند التمكين، يتوقع وجود بيانات كامنة مجمعة مسبقًا من عقدة ResolutionBucket."
+      },
+      "bypass_mode": {
+        "name": "bypass_mode",
+        "tooltip": "تفعيل وضع التجاوز أثناء التدريب. عند التفعيل، يتم تطبيق المحولات عبر forward hooks بدلاً من تعديل الأوزان. مفيد للنماذج المحوّلة حيث لا يمكن تعديل الأوزان مباشرة."
+      },
+      "checkpoint_depth": {
+        "name": "عمق نقطة الحفظ",
+        "tooltip": "مستوى العمق لتسجيل نقاط التحقق من التدرج."
+      },
       "control_after_generate": {
         "name": "التحكم بعد التوليد"
       },
@@ -11238,6 +15679,10 @@
         "name": "نموذج",
         "tooltip": "النموذج الذي سيتم تدريب LoRA عليه."
       },
+      "offloading": {
+        "name": "تفريغ",
+        "tooltip": "مستوى العمق لتسجيل نقاط التحقق من التدرج."
+      },
       "optimizer": {
         "name": "المحسن",
         "tooltip": "المحسن المستخدم في التدريب."
@@ -11265,16 +15710,16 @@
     },
     "outputs": {
       "0": {
-        "name": "النموذج مع LoRA"
+        "name": "lora",
+        "tooltip": "نموذج مع LoRA مطبق"
       },
       "1": {
-        "name": "LoRA"
+        "name": "خريطة الخسارة",
+        "tooltip": "أوزان LoRA"
       },
       "2": {
-        "name": "الخسارة"
-      },
-      "3": {
-        "name": "الخطوات"
+        "name": "الخطوات",
+        "tooltip": "سجل الخسارة"
       }
     }
   },
@@ -11293,6 +15738,11 @@
         "name": "فهرس البداية",
         "tooltip": "وقت البداية بالثواني، يمكن أن يكون سالبًا للعد من النهاية (يدعم أجزاء الثانية)."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "TrimVideoLatent": {
@@ -11334,23 +15784,62 @@
   "TripoConversionNode": {
     "display_name": "Tripo: تحويل النموذج",
     "inputs": {
+      "animate_in_place": {
+        "name": "تحريك في المكان"
+      },
+      "bake": {
+        "name": "خبز"
+      },
+      "export_orientation": {
+        "name": "تصدير الاتجاه"
+      },
+      "export_vertex_colors": {
+        "name": "تصدير ألوان الرؤوس"
+      },
       "face_limit": {
         "name": "حد الوجه"
       },
+      "fbx_preset": {
+        "name": "إعداد FBX"
+      },
+      "flatten_bottom": {
+        "name": "تسوية القاع"
+      },
+      "flatten_bottom_threshold": {
+        "name": "عتبة تسوية القاع"
+      },
+      "force_symmetry": {
+        "name": "فرض التماثل"
+      },
       "format": {
         "name": "التنسيق"
       },
       "original_model_task_id": {
         "name": "original_model_task_id"
       },
+      "pack_uv": {
+        "name": "تجميع UV"
+      },
+      "part_names": {
+        "name": "أسماء الأجزاء"
+      },
+      "pivot_to_center_bottom": {
+        "name": "محور إلى مركز القاع"
+      },
       "quad": {
         "name": "رباعي"
       },
+      "scale_factor": {
+        "name": "عامل المقياس"
+      },
       "texture_format": {
         "name": "تنسيق النسيج"
       },
       "texture_size": {
         "name": "حجم النسيج"
+      },
+      "with_animation": {
+        "name": "مع الحركة"
       }
     }
   },
@@ -11360,6 +15849,9 @@
       "face_limit": {
         "name": "حد الوجه"
       },
+      "geometry_quality": {
+        "name": "جودة الهندسة"
+      },
       "image": {
         "name": "الصورة"
       },
@@ -11401,7 +15893,11 @@
         "tooltip": null
       },
       "1": {
-        "name": "model task_id",
+        "name": "معرّف مهمة النموذج",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11412,6 +15908,9 @@
       "face_limit": {
         "name": "حد_الوجه"
       },
+      "geometry_quality": {
+        "name": "جودة الهندسة"
+      },
       "image": {
         "name": "الصورة"
       },
@@ -11455,11 +15954,15 @@
     },
     "outputs": {
       "0": {
-        "name": "ملف_النموذج",
+        "name": "ملف النموذج",
         "tooltip": null
       },
       "1": {
-        "name": "معرف_مهمة_النموذج",
+        "name": "معرّف مهمة النموذج",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11475,11 +15978,15 @@
     },
     "outputs": {
       "0": {
-        "name": "ملف_النموذج",
+        "name": "ملف النموذج",
         "tooltip": null
       },
       "1": {
-        "name": "معرف_مهمة_النموذج",
+        "name": "معرّف مهمة النموذج",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11496,11 +16003,15 @@
     },
     "outputs": {
       "0": {
-        "name": "ملف_النموذج",
+        "name": "ملف النموذج",
         "tooltip": null
       },
       "1": {
-        "name": "معرف_مهمة_إعادة_التوجيه",
+        "name": "معرّف مهمة إعادة الاستهداف",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11514,11 +16025,15 @@
     },
     "outputs": {
       "0": {
-        "name": "ملف_النموذج",
+        "name": "ملف النموذج",
         "tooltip": null
       },
       "1": {
-        "name": "معرف_مهمة_التجهيز",
+        "name": "معرّف مهمة التجهيز",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11529,6 +16044,9 @@
       "face_limit": {
         "name": "حد_الوجه"
       },
+      "geometry_quality": {
+        "name": "جودة الهندسة"
+      },
       "image_seed": {
         "name": "بذرة_الصورة"
       },
@@ -11565,11 +16083,15 @@
     },
     "outputs": {
       "0": {
-        "name": "ملف_النموذج",
+        "name": "ملف النموذج",
         "tooltip": null
       },
       "1": {
-        "name": "معرف_مهمة_النموذج",
+        "name": "معرّف مهمة النموذج",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11598,12 +16120,35 @@
     },
     "outputs": {
       "0": {
-        "name": "ملف_النموذج",
+        "name": "ملف النموذج",
         "tooltip": null
       },
       "1": {
-        "name": "معرف_مهمة_النموذج",
+        "name": "معرّف مهمة النموذج",
         "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "TruncateText": {
+    "display_name": "اقتطاع النص",
+    "inputs": {
+      "max_length": {
+        "name": "الحد الأقصى للطول",
+        "tooltip": "الحد الأقصى لطول النص."
+      },
+      "texts": {
+        "name": "النصوص",
+        "tooltip": "النص المراد معالجته."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "النصوص",
+        "tooltip": "النصوص المعالجة"
       }
     }
   },
@@ -11748,6 +16293,33 @@
       "vae": {
         "name": "vae"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VAEDecodeAudioTiled": {
+    "display_name": "فك ترميز الصوت بواسطة VAE (مجزأ)",
+    "inputs": {
+      "overlap": {
+        "name": "تداخل"
+      },
+      "samples": {
+        "name": "عينات"
+      },
+      "tile_size": {
+        "name": "حجم التجزئة"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VAEDecodeHunyuan3D": {
@@ -11765,6 +16337,11 @@
       "vae": {
         "name": "vae"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VAEDecodeTiled": {
@@ -11812,6 +16389,11 @@
       "vae": {
         "name": "vae"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VAEEncodeForInpaint": {
@@ -11890,6 +16472,63 @@
       "steps": {
         "name": "الخطوات"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Veo3FirstLastFrameNode": {
+    "description": "إنشاء فيديو باستخدام الوصف النصي والإطارين الأول والأخير.",
+    "display_name": "Google Veo 3 من الإطار الأول والأخير إلى الفيديو",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبة العرض إلى الارتفاع",
+        "tooltip": "نسبة العرض إلى الارتفاع للفيديو الناتج"
+      },
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "duration": {
+        "name": "المدة",
+        "tooltip": "مدة الفيديو الناتج بالثواني"
+      },
+      "first_frame": {
+        "name": "الإطار الأول",
+        "tooltip": "إطار البداية"
+      },
+      "generate_audio": {
+        "name": "توليد الصوت",
+        "tooltip": "توليد صوت للفيديو."
+      },
+      "last_frame": {
+        "name": "الإطار الأخير",
+        "tooltip": "إطار النهاية"
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "negative_prompt": {
+        "name": "الوصف السلبي",
+        "tooltip": "وصف نصي سلبي لتوجيه ما يجب تجنبه في الفيديو"
+      },
+      "prompt": {
+        "name": "الوصف النصي",
+        "tooltip": "وصف نصي للفيديو"
+      },
+      "resolution": {
+        "name": "الدقة"
+      },
+      "seed": {
+        "name": "البذرة",
+        "tooltip": "بذرة لتوليد الفيديو"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "Veo3VideoGenerationNode": {
@@ -11996,6 +16635,31 @@
       }
     }
   },
+  "Video Slice": {
+    "display_name": "تقطيع الفيديو",
+    "inputs": {
+      "duration": {
+        "name": "المدة",
+        "tooltip": "المدة بالثواني، أو 0 لمدة غير محدودة"
+      },
+      "start_time": {
+        "name": "وقت البدء",
+        "tooltip": "وقت البدء بالثواني"
+      },
+      "strict_duration": {
+        "name": "مدة صارمة",
+        "tooltip": "إذا كانت القيمة صحيحة، سيتم رفع خطأ عند عدم إمكانية تحقيق المدة المحددة."
+      },
+      "video": {
+        "name": "الفيديو"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "VideoLinearCFGGuidance": {
     "display_name": "توجيه VideoLinearCFG",
     "inputs": {
@@ -12018,6 +16682,319 @@
       }
     }
   },
+  "Vidu2ImageToVideoNode": {
+    "description": "إنشاء فيديو من صورة ونص اختياري.",
+    "display_name": "توليد فيديو من صورة Vidu2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "duration": {
+        "name": "المدة"
+      },
+      "image": {
+        "name": "الصورة",
+        "tooltip": "صورة تُستخدم كإطار بداية للفيديو المُنتج."
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "movement_amplitude": {
+        "name": "سعة الحركة",
+        "tooltip": "سعة حركة العناصر داخل الإطار."
+      },
+      "prompt": {
+        "name": "النص التوجيهي",
+        "tooltip": "نص اختياري لتوليد الفيديو (بحد أقصى 2000 حرف)."
+      },
+      "resolution": {
+        "name": "الدقة"
+      },
+      "seed": {
+        "name": "البذرة"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2ReferenceVideoNode": {
+    "description": "إنشاء فيديو من عدة صور مرجعية ونص توجيهي.",
+    "display_name": "توليد فيديو من مراجع Vidu2",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبة العرض إلى الارتفاع"
+      },
+      "audio": {
+        "name": "الصوت",
+        "tooltip": "عند التفعيل، سيحتوي الفيديو على كلام وموسيقى خلفية مولدة بناءً على النص التوجيهي."
+      },
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "duration": {
+        "name": "المدة"
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "movement_amplitude": {
+        "name": "سعة الحركة",
+        "tooltip": "سعة حركة العناصر داخل الإطار."
+      },
+      "prompt": {
+        "name": "النص التوجيهي",
+        "tooltip": "عند التفعيل، سيحتوي الفيديو على كلام وموسيقى خلفية مولدة بناءً على النص التوجيهي."
+      },
+      "resolution": {
+        "name": "الدقة"
+      },
+      "seed": {
+        "name": "البذرة"
+      },
+      "subjects": {
+        "name": "الموضوعات",
+        "tooltip": "لكل موضوع، قدم حتى 3 صور مرجعية (بحد أقصى 7 صور لجميع الموضوعات). استخدمها في النص التوجيهي عبر @subject{subject_id}."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2StartEndToVideoNode": {
+    "description": "إنشاء فيديو من إطار بداية، إطار نهاية، وموجه نصي.",
+    "display_name": "توليد فيديو من إطار البداية/النهاية باستخدام Vidu2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "duration": {
+        "name": "المدة"
+      },
+      "end_frame": {
+        "name": "إطار النهاية"
+      },
+      "first_frame": {
+        "name": "إطار البداية"
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "movement_amplitude": {
+        "name": "سعة الحركة",
+        "tooltip": "سعة حركة العناصر داخل الإطار."
+      },
+      "prompt": {
+        "name": "الموجه",
+        "tooltip": "وصف الموجه (بحد أقصى 2000 حرف)."
+      },
+      "resolution": {
+        "name": "الدقة"
+      },
+      "seed": {
+        "name": "البذرة"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2TextToVideoNode": {
+    "description": "إنشاء فيديو من موجه نصي",
+    "display_name": "توليد فيديو من نص باستخدام Vidu2",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبة العرض إلى الارتفاع"
+      },
+      "background_music": {
+        "name": "موسيقى خلفية",
+        "tooltip": "هل تريد إضافة موسيقى خلفية للفيديو المُنتج."
+      },
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "duration": {
+        "name": "المدة"
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "prompt": {
+        "name": "الموجه",
+        "tooltip": "وصف نصي لتوليد الفيديو، بحد أقصى 2000 حرف."
+      },
+      "resolution": {
+        "name": "الدقة"
+      },
+      "seed": {
+        "name": "البذرة"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3ImageToVideoNode": {
+    "description": "إنشاء فيديو من صورة ونص اختياري.",
+    "display_name": "توليد فيديو من صورة Vidu Q3",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "image": {
+        "name": "الصورة",
+        "tooltip": "صورة تُستخدم كإطار بداية للفيديو المُنتج."
+      },
+      "model": {
+        "name": "النموذج",
+        "tooltip": "النموذج المستخدم لتوليد الفيديو."
+      },
+      "model_audio": {
+        "name": "الصوت"
+      },
+      "model_duration": {
+        "name": "المدة"
+      },
+      "model_resolution": {
+        "name": "الدقة"
+      },
+      "prompt": {
+        "name": "النص",
+        "tooltip": "نص اختياري لتوليد الفيديو (بحد أقصى ٢٠٠٠ حرف)."
+      },
+      "seed": {
+        "name": "البذرة"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3StartEndToVideoNode": {
+    "description": "إنشاء فيديو من إطار بداية، إطار نهاية، ونص توجيهي.",
+    "display_name": "توليد فيديو من إطار البداية/النهاية باستخدام Vidu Q3",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "end_frame": {
+        "name": "إطار النهاية"
+      },
+      "first_frame": {
+        "name": "إطار البداية"
+      },
+      "model": {
+        "name": "النموذج",
+        "tooltip": "النموذج المستخدم لتوليد الفيديو."
+      },
+      "model_audio": {
+        "name": "الصوت"
+      },
+      "model_duration": {
+        "name": "المدة"
+      },
+      "model_resolution": {
+        "name": "الدقة"
+      },
+      "prompt": {
+        "name": "النص التوجيهي",
+        "tooltip": "وصف النص التوجيهي (بحد أقصى ٢٠٠٠ حرف)."
+      },
+      "seed": {
+        "name": "البذرة"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3TextToVideoNode": {
+    "description": "إنشاء فيديو من نص.",
+    "display_name": "توليد فيديو من نص Vidu Q3",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "model": {
+        "name": "النموذج",
+        "tooltip": "النموذج المستخدم لتوليد الفيديو."
+      },
+      "model_aspect_ratio": {
+        "name": "نسبة العرض إلى الارتفاع"
+      },
+      "model_audio": {
+        "name": "الصوت"
+      },
+      "model_duration": {
+        "name": "المدة"
+      },
+      "model_resolution": {
+        "name": "الدقة"
+      },
+      "prompt": {
+        "name": "النص",
+        "tooltip": "وصف نصي لتوليد الفيديو، بحد أقصى ٢٠٠٠ حرف."
+      },
+      "seed": {
+        "name": "البذرة"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ViduExtendVideoNode": {
+    "description": "تمديد فيديو موجود بإضافة إطارات جديدة.",
+    "display_name": "تمديد فيديو Vidu",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "end_frame": {
+        "name": "الإطار النهائي"
+      },
+      "model": {
+        "name": "النموذج",
+        "tooltip": "النموذج المستخدم لتمديد الفيديو."
+      },
+      "model_duration": {
+        "name": "المدة"
+      },
+      "model_resolution": {
+        "name": "الدقة"
+      },
+      "prompt": {
+        "name": "النص",
+        "tooltip": "نص اختياري للفيديو الممدد (بحد أقصى ٢٠٠٠ حرف)."
+      },
+      "seed": {
+        "name": "البذرة"
+      },
+      "video": {
+        "name": "الفيديو",
+        "tooltip": "الفيديو المصدر للتمديد."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ViduImageToVideoNode": {
     "description": "إنشاء فيديو من صورة ونص اختياري",
     "display_name": "إنشاء الفيديو من الصورة باستخدام Vidu",
@@ -12060,6 +17037,49 @@
       }
     }
   },
+  "ViduMultiFrameVideoNode": {
+    "description": "إنشاء فيديو بانتقالات بين إطارات رئيسية متعددة.",
+    "display_name": "توليد فيديو متعدد الإطارات Vidu",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "frames": {
+        "name": "الإطارات",
+        "tooltip": "عدد انتقالات الإطارات الرئيسية (٢-٩)."
+      },
+      "frames_duration1": {
+        "name": "المدة١"
+      },
+      "frames_duration2": {
+        "name": "المدة٢"
+      },
+      "frames_prompt1": {
+        "name": "النص١"
+      },
+      "frames_prompt2": {
+        "name": "النص٢"
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "resolution": {
+        "name": "الدقة"
+      },
+      "seed": {
+        "name": "البذرة"
+      },
+      "start_image": {
+        "name": "الصورة الابتدائية",
+        "tooltip": "صورة الإطار الأول. يجب أن تكون نسبة العرض إلى الارتفاع بين ١:٤ و٤:١."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ViduReferenceVideoNode": {
     "description": "توليد فيديو من صور متعددة وموجه نصي",
     "display_name": "مرجع Vidu لتوليد الفيديو",
@@ -12206,6 +17226,11 @@
       "voxel": {
         "name": "فوكسل"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VoxelToMeshBasic": {
@@ -12217,6 +17242,11 @@
       "voxel": {
         "name": "فوكسل"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "Wan22FunControlToVideo": {
@@ -12496,6 +17526,10 @@
         "name": "خطوة السياق",
         "tooltip": "خطوة نافذة السياق؛ تنطبق فقط على الجداول المنتظمة."
       },
+      "freenoise": {
+        "name": "freenoise",
+        "tooltip": "ما إذا كان سيتم تطبيق خلط ضوضاء FreeNoise، يحسن دمج النوافذ."
+      },
       "fuse_method": {
         "name": "طريقة الدمج",
         "tooltip": "الطريقة المستخدمة لدمج نوافذ السياق."
@@ -12836,6 +17870,10 @@
         "name": "البذرة",
         "tooltip": "البذرة المستخدمة في التوليد."
       },
+      "shot_type": {
+        "name": "نوع اللقطة",
+        "tooltip": "يحدد نوع اللقطة للفيديو الناتج، أي ما إذا كان الفيديو لقطة واحدة متواصلة أو لقطات متعددة مع انتقالات. هذا الخيار يعمل فقط عند تفعيل prompt_extend."
+      },
       "watermark": {
         "name": "علامة مائية",
         "tooltip": "ما إذا كان سيتم إضافة علامة مائية \"تم إنشاؤها بالذكاء الاصطناعي\" على النتيجة."
@@ -12847,6 +17885,196 @@
       }
     }
   },
+  "WanInfiniteTalkToVideo": {
+    "display_name": "WanInfiniteTalkToVideo",
+    "inputs": {
+      "audio_encoder_output_1": {
+        "name": "مخرجات ترميز الصوت ١"
+      },
+      "audio_scale": {
+        "name": "مقياس الصوت"
+      },
+      "clip_vision_output": {
+        "name": "مخرجات clip للرؤية"
+      },
+      "height": {
+        "name": "الارتفاع"
+      },
+      "length": {
+        "name": "الطول"
+      },
+      "mode": {
+        "name": "الوضع"
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "model_patch": {
+        "name": "تصحيح النموذج"
+      },
+      "motion_frame_count": {
+        "name": "عدد إطارات الحركة",
+        "tooltip": "عدد الإطارات السابقة المستخدمة كسياق للحركة."
+      },
+      "negative": {
+        "name": "سلبي"
+      },
+      "positive": {
+        "name": "إيجابي"
+      },
+      "previous_frames": {
+        "name": "الإطارات السابقة"
+      },
+      "start_image": {
+        "name": "صورة البداية"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "العرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "النموذج",
+        "tooltip": null
+      },
+      "1": {
+        "name": "إيجابي",
+        "tooltip": null
+      },
+      "2": {
+        "name": "سلبي",
+        "tooltip": null
+      },
+      "3": {
+        "name": "الفضاء الكامن",
+        "tooltip": null
+      },
+      "4": {
+        "name": "قص الصورة",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveConcatTrack": {
+    "display_name": "WanMoveConcatTrack",
+    "inputs": {
+      "tracks_1": {
+        "name": "المسارات_1"
+      },
+      "tracks_2": {
+        "name": "المسارات_2"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveTrackToVideo": {
+    "display_name": "WanMoveTrackToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "حجم الدفعة"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "الارتفاع"
+      },
+      "length": {
+        "name": "الطول"
+      },
+      "negative": {
+        "name": "سلبي"
+      },
+      "positive": {
+        "name": "إيجابي"
+      },
+      "start_image": {
+        "name": "صورة البداية"
+      },
+      "strength": {
+        "name": "القوة",
+        "tooltip": "قوة تكييف المسار."
+      },
+      "tracks": {
+        "name": "المسارات"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "العرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "إيجابي",
+        "tooltip": null
+      },
+      "1": {
+        "name": "سلبي",
+        "tooltip": null
+      },
+      "2": {
+        "name": "كامنة",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveTracksFromCoords": {
+    "display_name": "WanMoveTracksFromCoords",
+    "inputs": {
+      "track_coords": {
+        "name": "إحداثيات المسار"
+      },
+      "track_mask": {
+        "name": "قناع المسار"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "طول المسار",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveVisualizeTracks": {
+    "display_name": "WanMoveVisualizeTracks",
+    "inputs": {
+      "circle_size": {
+        "name": "حجم الدائرة"
+      },
+      "images": {
+        "name": "الصور"
+      },
+      "line_resolution": {
+        "name": "دقة الخط"
+      },
+      "line_width": {
+        "name": "عرض الخط"
+      },
+      "opacity": {
+        "name": "الشفافية"
+      },
+      "tracks": {
+        "name": "المسارات"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "WanPhantomSubjectToVideo": {
     "display_name": "وان فانتوم موضوع إلى فيديو",
     "inputs": {
@@ -12894,6 +18122,113 @@
       }
     }
   },
+  "WanReferenceVideoApi": {
+    "description": "استخدم الشخصية والصوت من مقاطع الفيديو المدخلة، مع الجمع مع التعليمات، لإنشاء فيديو جديد يحافظ على اتساق الشخصية.",
+    "display_name": "Wan Reference to Video",
+    "inputs": {
+      "control_after_generate": {
+        "name": "التحكم بعد التوليد"
+      },
+      "duration": {
+        "name": "المدة"
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "negative_prompt": {
+        "name": "تعليمات سلبية",
+        "tooltip": "تعليمات سلبية تصف ما يجب تجنبه."
+      },
+      "prompt": {
+        "name": "التعليمات",
+        "tooltip": "تعليمات تصف العناصر والميزات البصرية. يدعم الإنجليزية والصينية. استخدم معرفات مثل `character1` و `character2` للإشارة إلى الشخصيات المرجعية."
+      },
+      "reference_videos": {
+        "name": "مقاطع الفيديو المرجعية"
+      },
+      "seed": {
+        "name": "البذرة"
+      },
+      "shot_type": {
+        "name": "نوع اللقطة",
+        "tooltip": "يحدد نوع اللقطة للفيديو الناتج، أي ما إذا كان الفيديو لقطة واحدة متواصلة أو عدة لقطات مع انتقالات."
+      },
+      "size": {
+        "name": "الحجم"
+      },
+      "watermark": {
+        "name": "علامة مائية",
+        "tooltip": "ما إذا كان سيتم إضافة علامة مائية تم إنشاؤها بالذكاء الاصطناعي إلى النتيجة."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanSCAILToVideo": {
+    "display_name": "WanSCAILToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "حجم الدفعة"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "الارتفاع"
+      },
+      "length": {
+        "name": "الطول"
+      },
+      "negative": {
+        "name": "سلبي"
+      },
+      "pose_end": {
+        "name": "نهاية الوضعية",
+        "tooltip": "خطوة النهاية لاستخدام تكييف الوضعية."
+      },
+      "pose_start": {
+        "name": "بدء الوضعية",
+        "tooltip": "خطوة البدء لاستخدام تكييف الوضعية."
+      },
+      "pose_strength": {
+        "name": "قوة الوضعية",
+        "tooltip": "قوة الفضاء الكامن للوضعية."
+      },
+      "pose_video": {
+        "name": "فيديو الوضعية",
+        "tooltip": "الفيديو المستخدم لتكييف الوضعية. سيتم تقليل دقته إلى نصف دقة الفيديو الرئيسي."
+      },
+      "positive": {
+        "name": "إيجابي"
+      },
+      "reference_image": {
+        "name": "صورة مرجعية"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "العرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "إيجابي",
+        "tooltip": null
+      },
+      "1": {
+        "name": "سلبي",
+        "tooltip": null
+      },
+      "2": {
+        "name": "كامن",
+        "tooltip": "فضاء كامن فارغ بحجم التوليد."
+      }
+    }
+  },
   "WanSoundImageToVideo": {
     "display_name": "WanSoundImageToVideo",
     "inputs": {
@@ -13072,6 +18407,10 @@
         "name": "بذرة",
         "tooltip": "البذرة المستخدمة في التوليد."
       },
+      "shot_type": {
+        "name": "نوع اللقطة",
+        "tooltip": "يحدد نوع اللقطة للفيديو الناتج، أي ما إذا كان الفيديو لقطة واحدة متواصلة أو عدة لقطات مع انتقالات. هذا الخيار يعمل فقط عند تفعيل prompt_extend."
+      },
       "size": {
         "name": "الحجم"
       },
@@ -13197,6 +18536,43 @@
       }
     }
   },
+  "WavespeedFlashVSRNode": {
+    "description": "مُرقّي فيديو سريع وعالي الجودة يعزز الدقة ويعيد الوضوح للمقاطع منخفضة الدقة أو الضبابية.",
+    "display_name": "ترقية فيديو FlashVSR",
+    "inputs": {
+      "target_resolution": {
+        "name": "الدقة المستهدفة"
+      },
+      "video": {
+        "name": "الفيديو"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WavespeedImageUpscaleNode": {
+    "description": "عزز دقة وجودة الصورة، وارفع الصور إلى دقة 4K أو 8K للحصول على نتائج حادة ومفصلة.",
+    "display_name": "ترقية صورة WaveSpeed",
+    "inputs": {
+      "image": {
+        "name": "الصورة"
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "target_resolution": {
+        "name": "الدقة المستهدفة"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "WebcamCapture": {
     "display_name": "التقاط كاميرا ويب",
     "inputs": {
@@ -13209,13 +18585,38 @@
       "image": {
         "name": "صورة"
       },
-      "waiting for camera___": {
-      },
+      "waiting for camera___": {},
       "width": {
         "name": "العرض"
       }
     }
   },
+  "ZImageFunControlnet": {
+    "display_name": "ZImageFunControlnet",
+    "inputs": {
+      "image": {
+        "name": "الصورة"
+      },
+      "inpaint_image": {
+        "name": "صورة التلوين"
+      },
+      "mask": {
+        "name": "القناع"
+      },
+      "model": {
+        "name": "النموذج"
+      },
+      "model_patch": {
+        "name": "تصحيح النموذج"
+      },
+      "strength": {
+        "name": "القوة"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
   "unCLIPCheckpointLoader": {
     "display_name": "محمل نقطة فحص unCLIP",
     "inputs": {
@@ -13240,5 +18641,19 @@
         "name": "القوة"
       }
     }
+  },
+  "wanBlockSwap": {
+    "description": "NOP",
+    "display_name": "wanBlockSwap",
+    "inputs": {
+      "model": {
+        "name": "النموذج"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
   }
 }
diff --git a/src/locales/ar/settings.json b/src/locales/ar/settings.json
index d5e4704e5b..273e4ac0ef 100644
--- a/src/locales/ar/settings.json
+++ b/src/locales/ar/settings.json
@@ -52,7 +52,8 @@
     }
   },
   "Comfy_Canvas_SelectionToolbox": {
-    "name": "عرض صندوق أدوات التحديد"
+    "name": "عرض صندوق أدوات التحديد",
+    "tooltip": "عرض شريط أدوات عائم عند تحديد العقد، لتوفير وصول سريع إلى الإجراءات الشائعة."
   },
   "Comfy_ConfirmClear": {
     "name": "طلب التأكيد عند مسح سير العمل"
@@ -79,6 +80,17 @@
   "Comfy_EnableWorkflowViewRestore": {
     "name": "حفظ واستعادة موقع اللوحة ومستوى التكبير في سير العمل"
   },
+  "Comfy_Execution_PreviewMethod": {
+    "name": "طريقة المعاينة الحية",
+    "options": {
+      "auto": "تلقائي",
+      "default": "default",
+      "latent2rgb": "latent2rgb",
+      "none": "بدون",
+      "taesd": "taesd"
+    },
+    "tooltip": "طريقة المعاينة الحية أثناء توليد الصورة. \"default\" تستخدم إعداد الخادم CLI."
+  },
   "Comfy_FloatRoundingPrecision": {
     "name": "عدد أرقام التقريب العشرية لأدوات التحكم العائمة [0 = تلقائي]",
     "tooltip": "(يتطلب إعادة تحميل الصفحة)"
@@ -92,6 +104,10 @@
   "Comfy_Graph_CtrlShiftZoom": {
     "name": "تمكين اختصار التكبير السريع (Ctrl + Shift + سحب)"
   },
+  "Comfy_Graph_DeduplicateSubgraphNodeIds": {
+    "name": "إزالة التكرار من معرفات العقد الفرعية",
+    "tooltip": "إعادة تعيين معرفات العقد المكررة تلقائيًا في العقد الفرعية عند تحميل سير العمل."
+  },
   "Comfy_Graph_LinkMarkers": {
     "name": "علامات منتصف الروابط",
     "options": {
@@ -100,6 +116,10 @@
       "None": "لا شيء"
     }
   },
+  "Comfy_Graph_LiveSelection": {
+    "name": "تحديد مباشر",
+    "tooltip": "عند التفعيل، يتم تحديد/إلغاء تحديد العقد في الوقت الفعلي أثناء سحب مستطيل التحديد، كما في أدوات التصميم الأخرى."
+  },
   "Comfy_Graph_ZoomSpeed": {
     "name": "سرعة تكبير اللوحة"
   },
@@ -132,43 +152,53 @@
       "Linear": "خطي",
       "Spline": "منحنى",
       "Straight": "مستقيم"
-    }
+    },
+    "tooltip": "يتحكم في مظهر ووضوح الروابط بين العقد على اللوحة."
   },
   "Comfy_Load3D_3DViewerEnable": {
-    "name": "تمكين عارض ثلاثي الأبعاد (تجريبي)",
-    "tooltip": "تمكين عارض ثلاثي الأبعاد (تجريبي) للعقد المحددة. تتيح هذه الميزة عرض النماذج ثلاثية الأبعاد والتفاعل معها مباشرة داخل العارض ثلاثي الأبعاد بحجمه الكامل."
+    "name": "تفعيل عارض ثلاثي الأبعاد (تجريبي)",
+    "tooltip": "يُمكّن عارض ثلاثي الأبعاد (تجريبي) للعُقد المحددة. تتيح لك هذه الميزة عرض النماذج ثلاثية الأبعاد والتفاعل معها مباشرةً ضمن العارض ثلاثي الأبعاد بالحجم الكامل."
   },
   "Comfy_Load3D_BackgroundColor": {
     "name": "لون الخلفية الابتدائي",
-    "tooltip": "يحدد لون الخلفية الافتراضي للمشهد ثلاثي الأبعاد. يمكن تعديل هذا اللون لكل عنصر ثلاثي الأبعاد بعد الإنشاء."
+    "tooltip": "يتحكم في لون الخلفية الافتراضي لمشهد ثلاثي الأبعاد. يحدد هذا الإعداد مظهر الخلفية عند إنشاء عنصر واجهة ثلاثي الأبعاد جديد، ويمكن تعديله لكل عنصر بعد الإنشاء."
   },
   "Comfy_Load3D_CameraType": {
     "name": "نوع الكاميرا الابتدائي",
     "options": {
-      "orthographic": "متعامد",
+      "orthographic": "متعامدة",
       "perspective": "منظور"
     },
-    "tooltip": "يحدد ما إذا كانت الكاميرا منظور أو متعامدة بشكل افتراضي عند إنشاء عنصر ثلاثي الأبعاد جديد. يمكن تعديل هذا الإعداد لكل عنصر بعد الإنشاء."
+    "tooltip": "يتحكم في ما إذا كانت الكاميرا افتراضيًا منظورًا أو متعامدة عند إنشاء عنصر واجهة ثلاثي الأبعاد جديد. يمكن تغيير هذا الإعداد لكل عنصر بعد الإنشاء."
   },
   "Comfy_Load3D_LightAdjustmentIncrement": {
-    "name": "زيادة تعديل الضوء",
-    "tooltip": "يتحكم في حجم الخطوة عند تعديل شدة الإضاءة في المشاهد ثلاثية الأبعاد. قيمة أصغر تسمح بتحكم أدق، وأكبر قيمة تعطي تغييرات أكثر وضوحًا."
+    "name": "مقدار تعديل الإضاءة",
+    "tooltip": "يتحكم في مقدار التغيير عند ضبط شدة الإضاءة في المشاهد ثلاثية الأبعاد. قيمة أصغر تتيح تحكمًا أدق في الإضاءة، بينما قيمة أكبر تؤدي إلى تغييرات أكثر وضوحًا في كل تعديل."
   },
   "Comfy_Load3D_LightIntensity": {
     "name": "شدة الإضاءة الابتدائية",
-    "tooltip": "يحدد مستوى سطوع الإضاءة الافتراضي في المشهد ثلاثي الأبعاد. يمكن تعديله لكل عنصر بعد الإنشاء."
+    "tooltip": "يحدد مستوى سطوع الإضاءة الافتراضي في المشهد ثلاثي الأبعاد. تحدد هذه القيمة مدى قوة إضاءة الأجسام عند إنشاء عنصر واجهة ثلاثي الأبعاد جديد، ويمكن تعديلها لكل عنصر بعد الإنشاء."
   },
   "Comfy_Load3D_LightIntensityMaximum": {
-    "name": "أقصى شدة إضاءة",
-    "tooltip": "يحدد الحد الأقصى المسموح به لشدة الإضاءة في المشاهد ثلاثية الأبعاد."
+    "name": "الحد الأقصى لشدة الإضاءة",
+    "tooltip": "يحدد الحد الأقصى المسموح به لقيمة شدة الإضاءة في المشاهد ثلاثية الأبعاد. يحدد هذا الحد الأعلى للسطوع الذي يمكن ضبطه عند تعديل الإضاءة في أي عنصر واجهة ثلاثي الأبعاد."
   },
   "Comfy_Load3D_LightIntensityMinimum": {
-    "name": "أدنى شدة إضاءة",
-    "tooltip": "يحدد الحد الأدنى المسموح به لشدة الإضاءة في المشاهد ثلاثية الأبعاد."
+    "name": "الحد الأدنى لشدة الإضاءة",
+    "tooltip": "يحدد الحد الأدنى المسموح به لقيمة شدة الإضاءة في المشاهد ثلاثية الأبعاد. يحدد هذا الحد الأدنى للسطوع الذي يمكن ضبطه عند تعديل الإضاءة في أي عنصر واجهة ثلاثي الأبعاد."
+  },
+  "Comfy_Load3D_PLYEngine": {
+    "name": "محرك PLY",
+    "options": {
+      "fastply": "fastply",
+      "sparkjs": "sparkjs",
+      "threejs": "threejs"
+    },
+    "tooltip": "اختر المحرك لتحميل ملفات PLY. \"threejs\" يستخدم محمل Three.js PLY الأصلي (الأفضل لملفات الشبكة). \"fastply\" يستخدم محملًا محسنًا لملفات PLY السحابية النقطية بنسق ASCII. \"sparkjs\" يستخدم Spark.js لملفات PLY الخاصة بتقنية Gaussian Splatting ثلاثية الأبعاد."
   },
   "Comfy_Load3D_ShowGrid": {
-    "name": "رؤية الشبكة الابتدائية",
-    "tooltip": "يتحكم في ظهور الشبكة بشكل افتراضي عند إنشاء عنصر ثلاثي الأبعاد جديد."
+    "name": "إظهار الشبكة افتراضيًا",
+    "tooltip": "يتحكم في ما إذا كانت الشبكة مرئية افتراضيًا عند إنشاء عنصر واجهة ثلاثي الأبعاد جديد. يمكن تغيير هذا الإعداد لكل عنصر بعد الإنشاء."
   },
   "Comfy_Locale": {
     "name": "اللغة"
@@ -218,11 +248,20 @@
   "Comfy_NodeBadge_ShowApiPricing": {
     "name": "عرض شارة تسعير عقدة API"
   },
+  "Comfy_NodeLibrary_NewDesign": {
+    "name": "تصميم مكتبة العقد الجديد",
+    "tooltip": "تفعيل الشريط الجانبي المعاد تصميمه لمكتبة العقد مع علامات تبويب (الأساسية، الكل، المخصصة)، بحث محسّن، ومعاينات عند التمرير."
+  },
+  "Comfy_NodeReplacement_Enabled": {
+    "name": "تفعيل الاستبدال التلقائي للعقد",
+    "tooltip": "عند التفعيل، يمكن استبدال العقد المفقودة تلقائيًا بنظيراتها الأحدث إذا كان هناك مخطط استبدال متوفر."
+  },
   "Comfy_NodeSearchBoxImpl": {
     "name": "تنفيذ مربع بحث العقدة",
     "options": {
       "default": "افتراضي",
-      "litegraph (legacy)": "لايت جراف (قديم)"
+      "litegraph (legacy)": "لايت جراف (قديم)",
+      "v1 (legacy)": "الإصدار 1 (قديم)"
     }
   },
   "Comfy_NodeSearchBoxImpl_NodePreview": {
@@ -248,6 +287,10 @@
   "Comfy_Node_AllowImageSizeDraw": {
     "name": "عرض العرض × الارتفاع تحت معاينة الصورة"
   },
+  "Comfy_Node_AlwaysShowAdvancedWidgets": {
+    "name": "عرض الأدوات المتقدمة دائمًا في جميع العقد",
+    "tooltip": "عند التفعيل، ستظهر الأدوات المتقدمة دائمًا في جميع العقد دون الحاجة لتوسيعها بشكل فردي."
+  },
   "Comfy_Node_AutoSnapLinkToSlot": {
     "name": "التثبيت التلقائي للرابط إلى فتحة العقدة",
     "tooltip": "عند سحب رابط فوق عقدة، يتم تثبيت الرابط تلقائيًا على فتحة إدخال صالحة في العقدة"
@@ -308,6 +351,14 @@
     "name": "حجم تاريخ قائمة الانتظار",
     "tooltip": "العدد الأقصى للمهام المعروضة في تاريخ قائمة الانتظار."
   },
+  "Comfy_Queue_QPOV2": {
+    "name": "استخدم قائمة انتظار المهام الموحدة في لوحة الأصول الجانبية",
+    "tooltip": "يستبدل لوحة قائمة انتظار المهام العائمة بقائمة انتظار مهام مكافئة مدمجة في لوحة الأصول الجانبية. يمكنك تعطيل هذا الخيار للعودة إلى تخطيط اللوحة العائمة."
+  },
+  "Comfy_RightSidePanel_ShowErrorsTab": {
+    "name": "عرض تب الأخطاء في اللوحة الجانبية",
+    "tooltip": "عند التفعيل، سيتم عرض تب الأخطاء في اللوحة الجانبية اليمنى لعرض أخطاء تنفيذ سير العمل بسرعة."
+  },
   "Comfy_Sidebar_Location": {
     "name": "موقع الشريط الجانبي",
     "options": {
@@ -345,6 +396,14 @@
   "Comfy_TreeExplorer_ItemPadding": {
     "name": "حشو عناصر مستعرض الشجرة"
   },
+  "Comfy_UI_TabBarLayout": {
+    "name": "تخطيط شريط التبويبات",
+    "options": {
+      "Default": "افتراضي",
+      "Integrated": "مُدمج"
+    },
+    "tooltip": "يتحكم في تخطيط شريط التبويبات. \"مُدمج\" ينقل عناصر المساعدة والتحكمات الخاصة بالمستخدم إلى منطقة شريط التبويبات."
+  },
   "Comfy_UseNewMenu": {
     "name": "استخدام القائمة الجديدة",
     "options": {
@@ -434,6 +493,7 @@
     "tooltip": "إزاحة نقطة تحكم بيزير من نقطة مركز إعادة التوجيه"
   },
   "pysssss_SnapToGrid": {
-    "name": "الالتصاق بالشبكة دائمًا"
+    "name": "الالتصاق بالشبكة دائمًا",
+    "tooltip": "عند التفعيل، ستتم محاذاة العقد تلقائيًا إلى الشبكة عند تحريكها أو تغيير حجمها."
   }
 }
diff --git a/src/locales/en/commands.json b/src/locales/en/commands.json
index 2fe85e1c4b..5b00f92f97 100644
--- a/src/locales/en/commands.json
+++ b/src/locales/en/commands.json
@@ -44,6 +44,9 @@
   "Comfy_BrowseTemplates": {
     "label": "Browse Templates"
   },
+  "Comfy_Canvas_CopySelected": {
+    "label": "Copy"
+  },
   "Comfy_Canvas_DeleteSelectedItems": {
     "label": "Delete Selected Items"
   },
@@ -65,12 +68,18 @@
   "Comfy_Canvas_MoveSelectedNodes_Up": {
     "label": "Move Selected Nodes Up"
   },
+  "Comfy_Canvas_PasteFromClipboard": {
+    "label": "Paste"
+  },
   "Comfy_Canvas_ResetView": {
     "label": "Reset View"
   },
   "Comfy_Canvas_Resize": {
     "label": "Resize Selected Nodes"
   },
+  "Comfy_Canvas_SelectAll": {
+    "label": "Select All"
+  },
   "Comfy_Canvas_ToggleLinkVisibility": {
     "label": "Canvas Toggle Link Visibility"
   },
@@ -191,9 +200,6 @@
   "Comfy_Manager_ShowUpdateAvailablePacks": {
     "label": "Check for Custom Node Updates"
   },
-  "Comfy_Manager_ToggleManagerProgressDialog": {
-    "label": "Toggle the Custom Nodes Manager Progress Bar"
-  },
   "Comfy_MaskEditor_BrushSize_Decrease": {
     "label": "Decrease Brush Size in MaskEditor"
   },
@@ -203,9 +209,21 @@
   "Comfy_MaskEditor_ColorPicker": {
     "label": "Open Color Picker in MaskEditor"
   },
+  "Comfy_MaskEditor_Mirror_Horizontal": {
+    "label": "Mirror Horizontal in MaskEditor"
+  },
+  "Comfy_MaskEditor_Mirror_Vertical": {
+    "label": "Mirror Vertical in MaskEditor"
+  },
   "Comfy_MaskEditor_OpenMaskEditor": {
     "label": "Open Mask Editor for Selected Node"
   },
+  "Comfy_MaskEditor_Rotate_Left": {
+    "label": "Rotate Left in MaskEditor"
+  },
+  "Comfy_MaskEditor_Rotate_Right": {
+    "label": "Rotate Right in MaskEditor"
+  },
   "Comfy_Memory_UnloadModels": {
     "label": "Unload Models"
   },
@@ -227,6 +245,9 @@
   "Comfy_PublishSubgraph": {
     "label": "Publish Subgraph"
   },
+  "Comfy_Queue_ToggleOverlay": {
+    "label": "Toggle Job History"
+  },
   "Comfy_QueuePrompt": {
     "label": "Queue Prompt"
   },
@@ -242,6 +263,9 @@
   "Comfy_RefreshNodeDefinitions": {
     "label": "Refresh Node Definitions"
   },
+  "Comfy_RenameWorkflow": {
+    "label": "Rename Workflow"
+  },
   "Comfy_SaveWorkflow": {
     "label": "Save Workflow"
   },
@@ -251,6 +275,12 @@
   "Comfy_ShowSettingsDialog": {
     "label": "Show Settings Dialog"
   },
+  "Comfy_Subgraph_SetDescription": {
+    "label": "Set Subgraph Description"
+  },
+  "Comfy_Subgraph_SetSearchAliases": {
+    "label": "Set Subgraph Search Aliases"
+  },
   "Comfy_ToggleAssetAPI": {
     "label": "Experimental: Enable AssetAPI"
   },
@@ -261,7 +291,10 @@
     "label": "Help Center"
   },
   "Comfy_ToggleLinear": {
-    "label": "toggle linear mode"
+    "label": "Toggle App Mode"
+  },
+  "Comfy_ToggleQPOV2": {
+    "label": "Toggle Queue Panel V2"
   },
   "Comfy_ToggleTheme": {
     "label": "Toggle Theme (Dark/Light)"
@@ -311,6 +344,10 @@
   "Workspace_ToggleFocusMode": {
     "label": "Toggle Focus Mode"
   },
+  "Workspace_ToggleSidebarTab_apps": {
+    "label": "Toggle Apps Sidebar",
+    "tooltip": "Apps"
+  },
   "Workspace_ToggleSidebarTab_assets": {
     "label": "Toggle Assets Sidebar",
     "tooltip": "Assets"
@@ -327,4 +364,4 @@
     "label": "Toggle Workflows Sidebar",
     "tooltip": "Workflows"
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/en/main.json b/src/locales/en/main.json
index 5c5b4ab97f..2b03a4b91e 100644
--- a/src/locales/en/main.json
+++ b/src/locales/en/main.json
@@ -1,6 +1,8 @@
 {
   "g": {
+    "shortcutSuffix": " ({shortcut})",
     "user": "User",
+    "you": "You",
     "currentUser": "Current user",
     "empty": "Empty",
     "noWorkflowsFound": "No workflows found.",
@@ -8,12 +10,17 @@
     "download": "Download",
     "downloadImage": "Download image",
     "downloadVideo": "Download video",
+    "downloadAudio": "Download audio",
     "editOrMaskImage": "Edit or mask image",
     "editImage": "Edit image",
+    "decrement": "Decrement",
     "deleteImage": "Delete image",
     "deleteAudioFile": "Delete audio file",
+    "increment": "Increment",
     "removeImage": "Remove image",
     "removeVideo": "Remove video",
+    "removeTag": "Remove tag",
+    "remove": "Remove",
     "chart": "Chart",
     "chartLowercase": "chart",
     "file": "file",
@@ -40,8 +47,6 @@
     "comfy": "Comfy",
     "refresh": "Refresh",
     "refreshNode": "Refresh Node",
-    "vitePreloadErrorTitle": "New Version Available",
-    "vitePreloadErrorMessage": "A new version of the app has been released. Would you like to reload?\nIf not, some parts of the app might not work as expected.\nFeel free to decline and save your progress before reloading.",
     "terminal": "Terminal",
     "logs": "Logs",
     "videoFailedToLoad": "Video failed to load",
@@ -64,6 +69,9 @@
     "icon": "Icon",
     "color": "Color",
     "error": "Error",
+    "enter": "Enter",
+    "enterSubgraph": "Enter Subgraph",
+    "inSubgraph": "in subgraph '{name}'",
     "resizeFromBottomRight": "Resize from bottom-right corner",
     "resizeFromTopRight": "Resize from top-right corner",
     "resizeFromBottomLeft": "Resize from bottom-left corner",
@@ -85,11 +93,15 @@
     "reportIssueTooltip": "Submit the error report to Comfy Org",
     "reportSent": "Report Submitted",
     "copyToClipboard": "Copy to Clipboard",
+    "copyAll": "Copy All",
     "openNewIssue": "Open New Issue",
     "showReport": "Show Report",
     "imageFailedToLoad": "Image failed to load",
+    "imageDoesNotExist": "Image does not exist",
+    "unknownFile": "Unknown file",
     "reconnecting": "Reconnecting",
     "reconnected": "Reconnected",
+    "disconnectedFromBackend": "Disconnected from backend. Check if the server is running.",
     "delete": "Delete",
     "rename": "Rename",
     "save": "Save",
@@ -97,11 +109,17 @@
     "no": "No",
     "cancel": "Cancel",
     "close": "Close",
+    "closeDialog": "Close dialog",
+    "showLeftPanel": "Show left panel",
+    "hideLeftPanel": "Hide left panel",
+    "showRightPanel": "Show right panel",
+    "hideRightPanel": "Hide right panel",
     "or": "or",
     "pressKeysForNewBinding": "Press keys for new binding",
     "defaultBanner": "default banner",
     "enableOrDisablePack": "Enable or disable pack",
     "openManager": "Open Manager",
+    "manageExtensions": "Manage extensions",
     "graphNavigation": "Graph navigation",
     "dropYourFileOr": "Drop your file or",
     "back": "Back",
@@ -113,6 +131,7 @@
     "customize": "Customize",
     "experimental": "BETA",
     "deprecated": "DEPR",
+    "devOnly": "DEV",
     "loadWorkflow": "Load Workflow",
     "goToNode": "Go to Node",
     "setAsBackground": "Set as Background",
@@ -127,7 +146,8 @@
     "searchKeybindings": "Search Keybindings",
     "searchExtensions": "Search Extensions",
     "search": "Search",
-    "searchPlaceholder": "Search...",
+    "searchPlaceholder": "Search {subject}...",
+    "downloadWithSize": "Download ({size})",
     "noResultsFound": "No Results Found",
     "noResults": "No Results",
     "searchFailedMessage": "We couldn't find any settings matching your search. Try adjusting your search terms.",
@@ -143,6 +163,8 @@
     "custom": "Custom",
     "command": "Command",
     "keybinding": "Keybinding",
+    "keybindings": "Keybindings",
+    "extensions": "Extensions",
     "upload": "Upload",
     "export": "Export",
     "workflow": "Workflow",
@@ -153,8 +175,18 @@
     "control_after_generate": "control after generate",
     "control_before_generate": "control before generate",
     "choose_file_to_upload": "choose file to upload",
+    "uploadAlreadyInProgress": "Upload already in progress",
     "capture": "capture",
     "nodes": "Nodes",
+    "nodesCount": "{count} node | {count} nodes",
+    "addNode": "Add a node...",
+    "filterBy": "Filter by:",
+    "filterByType": "Filter by {type}...",
+    "mostRelevant": "Most relevant",
+    "favorites": "Favorites",
+    "essentials": "Essentials",
+    "input": "Input",
+    "output": "Output",
     "community": "Community",
     "all": "All",
     "versionMismatchWarning": "Version Compatibility Warning",
@@ -175,18 +207,22 @@
     "source": "Source",
     "filter": "Filter",
     "apply": "Apply",
+    "use": "Use",
     "enabled": "Enabled",
     "installed": "Installed",
     "restart": "Restart",
     "missing": "Missing",
     "inProgress": "In progress",
     "completed": "Completed",
+    "completedWithCheckmark": "Completed ✓",
+    "downloading": "Downloading",
     "interrupted": "Interrupted",
     "queued": "Queued",
     "running": "Running",
     "failed": "Failed",
     "cancelled": "Cancelled",
     "job": "Job",
+    "asset": "{count} asset | {count} assets",
     "untitled": "Untitled",
     "emDash": "—",
     "enabling": "Enabling {id}",
@@ -242,6 +278,7 @@
     "batchRename": "Batch rename",
     "enterBaseName": "Enter base name",
     "enterNewName": "Enter new name",
+    "enterNewNamePrompt": "Enter new name:",
     "selectItemsToRename": "Select items to rename",
     "nothingToRename": "Nothing to rename",
     "moreWorkflows": "More workflows",
@@ -264,14 +301,24 @@
     "1x": "1x",
     "2x": "2x",
     "beta": "BETA",
+    "nightly": "NIGHTLY",
     "profile": "Profile",
-    "noItems": "No items"
+    "noItems": "No items",
+    "recents": "Recents",
+    "partner": "Partner",
+    "collapseAll": "Collapse all",
+    "expandAll": "Expand all"
   },
   "manager": {
-    "title": "Custom Nodes Manager",
+    "title": "Nodes Manager",
+    "nodePackInfo": "Node Pack Info",
+    "basicInfo": "Basic Info",
+    "actions": "Actions",
+    "selected": "Selected",
     "legacyMenuNotAvailable": "Legacy manager menu is not available, defaulting to the new manager menu.",
     "legacyManagerUI": "Use Legacy UI",
     "legacyManagerUIDescription": "To use the legacy Manager UI, start ComfyUI with --enable-manager-legacy-ui",
+    "legacyManagerSearchTip": "Looking for ComfyUI-Manager? You can enable the legacy manager UI by starting ComfyUI with the --enable-manager-legacy-ui flag.",
     "failed": "Failed",
     "failedToInstall": "Failed to Install",
     "installError": "Install Error",
@@ -282,6 +329,17 @@
     "changingVersion": "Changing version from {from} to {to}",
     "dependencies": "Dependencies",
     "inWorkflow": "In Workflow",
+    "nav": {
+      "allExtensions": "All Extensions",
+      "notInstalled": "Not Installed",
+      "installedSection": "INSTALLED",
+      "allInstalled": "All installed",
+      "updatesAvailable": "Updates Available",
+      "conflicting": "Conflicting",
+      "inWorkflowSection": "IN WORKFLOW",
+      "allInWorkflow": "All in: {workflowName}",
+      "missingNodes": "Missing Nodes"
+    },
     "infoPanelEmpty": "Click an item to see the info",
     "applyChanges": "Apply Changes",
     "restartToApplyChanges": "To apply changes, please restart ComfyUI",
@@ -314,6 +372,28 @@
     "errorConnecting": "Error connecting to the Comfy Node Registry.",
     "noResultsFound": "No results found matching your search.",
     "tryDifferentSearch": "Please try a different search query.",
+    "emptyState": {
+      "allInstalled": {
+        "title": "No Extensions Installed",
+        "message": "You haven't installed any extensions yet."
+      },
+      "updateAvailable": {
+        "title": "All Up to Date",
+        "message": "All your extensions are up to date."
+      },
+      "conflicting": {
+        "title": "No Conflicts Detected",
+        "message": "All your extensions are compatible."
+      },
+      "workflow": {
+        "title": "No Extensions in Workflow",
+        "message": "This workflow doesn't use any extension nodes."
+      },
+      "missing": {
+        "title": "No Missing Nodes",
+        "message": "All required nodes are installed."
+      }
+    },
     "tryAgainLater": "Please try again later.",
     "gettingInfo": "Getting info...",
     "nodePack": "Node Pack",
@@ -375,8 +455,15 @@
         "import_failed": "Import Failed"
       },
       "warningTooltip": "This package may have compatibility issues with your current environment"
+    },
+    "packInstall": {
+      "nodeIdRequired": "Node ID is required for installation"
     }
   },
+  "importFailed": {
+    "title": "Import Failed",
+    "copyError": "Copy Error"
+  },
   "issueReport": {
     "helpFix": "Help Fix This"
   },
@@ -428,6 +515,8 @@
     "Save Image": "Save Image",
     "Rename": "Rename",
     "RenameWidget": "Rename Widget",
+    "FavoriteWidget": "Favorite Widget",
+    "UnfavoriteWidget": "Unfavorite Widget",
     "Copy": "Copy",
     "Duplicate": "Duplicate",
     "Paste": "Paste",
@@ -658,6 +747,7 @@
     "logout": "Logout",
     "queue": "Queue",
     "nodeLibrary": "Node Library",
+    "nodes": "Nodes",
     "workflows": "Workflows",
     "templates": "Templates",
     "assets": "Assets",
@@ -670,9 +760,15 @@
       "filterImage": "Image",
       "filterVideo": "Video",
       "filterAudio": "Audio",
-      "filter3D": "3D"
+      "filter3D": "3D",
+      "filterText": "Text",
+      "viewSettings": "View settings"
     },
     "backToAssets": "Back to all assets",
+    "folderView": {
+      "errorSummary": "Failed to load outputs",
+      "errorDetail": "Could not retrieve outputs for this job. Please try again."
+    },
     "searchAssets": "Search Assets",
     "labels": {
       "queue": "Queue",
@@ -689,11 +785,25 @@
     "noFilesFound": "No files found",
     "noImportedFiles": "No imported files found",
     "noGeneratedFiles": "No generated files found",
+    "generatedAssetsHeader": "Generated assets",
+    "importedAssetsHeader": "Imported assets",
+    "activeJobStatus": "Active job: {status}",
     "noFilesFoundMessage": "Upload files or generate content to see them here",
     "browseTemplates": "Browse example templates",
     "openWorkflow": "Open workflow in local file system",
     "newBlankWorkflow": "Create a new blank workflow",
     "nodeLibraryTab": {
+      "essentials": "Essentials",
+      "allNodes": "All",
+      "blueprints": "Blueprints",
+      "custom": "Custom",
+      "filter": "Filter",
+      "filterOptions": {
+        "blueprints": "Blueprints",
+        "partnerNodes": "Partner Nodes",
+        "comfyNodes": "Comfy Nodes",
+        "extensions": "Extensions"
+      },
       "groupBy": "Group By",
       "sortMode": "Sort Mode",
       "resetView": "Reset View to Default",
@@ -706,11 +816,24 @@
         "sourceDesc": "Group by source type (Core, Custom, API)"
       },
       "sortBy": {
-        "original": "Original",
+        "original": "Categorized",
         "originalDesc": "Keep original order",
-        "alphabetical": "Alphabetical",
+        "alphabetical": "A-Z",
         "alphabeticalDesc": "Sort alphabetically within groups"
-      }
+      },
+      "sections": {
+        "favorites": "Favorites",
+        "favoriteNode": "Favorite Node",
+        "unfavoriteNode": "Unfavorite Node",
+        "bookmarked": "Bookmarked",
+        "subgraphBlueprints": "Subgraph Blueprints",
+        "myBlueprints": "My Blueprints",
+        "comfyBlueprints": "Comfy Blueprints",
+        "partnerNodes": "Partner Nodes",
+        "comfyNodes": "Comfy Nodes",
+        "extensions": "Extensions"
+      },
+      "noBookmarkedNodes": "No favorites yet"
     },
     "modelLibrary": "Model Library",
     "downloads": "Downloads",
@@ -718,8 +841,11 @@
       "title": "Queue Progress",
       "total": "Total: {percent}",
       "colonPercent": ": {percent}",
+      "inlineTotalLabel": "Total",
       "currentNode": "Current node:",
       "viewAllJobs": "View all jobs",
+      "viewList": "List view",
+      "viewGrid": "Grid view",
       "running": "running",
       "preview": "Preview",
       "interruptAll": "Interrupt all running jobs",
@@ -728,23 +854,36 @@
       "showAssetsPanel": "Show assets panel",
       "queuedSuffix": "queued",
       "clearQueued": "Clear queued",
-      "clearHistory": "Clear job queue history",
+      "clearHistory": "Clear job history",
+      "dockedJobHistory": "Docked Job History",
+      "showRunProgressBar": "Show run progress bar",
+      "clearHistoryMenuAssetsNote": "Media assets won't be deleted.",
       "filterJobs": "Filter jobs",
       "filterBy": "Filter by",
       "filterAllWorkflows": "All workflows",
       "filterCurrentWorkflow": "Current workflow",
+      "searchJobs": "Search...",
       "sortJobs": "Sort jobs",
       "sortBy": "Sort by",
+      "activeJobs": "{count} active job | {count} active jobs",
+      "activeJobsShort": "{count} active | {count} active",
       "activeJobsSuffix": "active jobs",
+      "runningJobsLabel": "{count} running",
+      "queuedJobsLabel": "{count} queued",
+      "runningQueuedSummary": "{running}, {queued}",
       "jobQueue": "Job Queue",
       "expandCollapsedQueue": "Expand job queue",
-      "viewJobHistory": "View job history",
+      "viewJobHistory": "View active jobs (right-click to clear queue)",
       "noActiveJobs": "No active jobs",
       "stubClipTextEncode": "CLIP Text Encode:",
+      "jobCompleted": "Job completed",
+      "jobFailed": "Job failed",
       "jobsCompleted": "{count} job completed | {count} jobs completed",
       "jobsFailed": "{count} job failed | {count} jobs failed",
+      "jobsAddedToQueue": "{count} job added to queue | {count} jobs added to queue",
       "cancelJobTooltip": "Cancel job",
       "clearQueueTooltip": "Clear queue",
+      "clearAllJobsTooltip": "Cancel all running jobs",
       "clearHistoryDialogTitle": "Clear your job queue history?",
       "clearHistoryDialogDescription": "All the finished or failed jobs below will be removed from this Job queue panel.",
       "clearHistoryDialogAssetsNote": "Assets generated by these jobs won’t be deleted and can always be viewed from the assets panel."
@@ -813,6 +952,8 @@
     "runWorkflowFront": "Run workflow (Queue at front)",
     "runWorkflowDisabled": "Workflow contains unsupported nodes (highlighted red). Remove these to run the workflow.",
     "run": "Run",
+    "stopRunInstant": "Stop Run (Instant)",
+    "stopRunInstantTooltip": "Stop running",
     "execute": "Execute",
     "interrupt": "Cancel current run",
     "refresh": "Refresh node definitions",
@@ -823,11 +964,13 @@
     "theme": "Theme",
     "dark": "Dark",
     "light": "Light",
-    "manageExtensions": "Manage Extensions",
+    "manageExtensions": "Extensions",
     "customNodesManager": "Custom Nodes Manager",
     "settings": "Settings",
     "help": "Help",
-    "queue": "Queue Panel"
+    "helpAndFeedback": "Help & Feedback",
+    "queue": "Queue Panel",
+    "fullscreen": "Fullscreen"
   },
   "tabMenu": {
     "duplicateTab": "Duplicate Tab",
@@ -873,7 +1016,7 @@
     "noResultsHint": "Try adjusting your search or filters",
     "allTemplates": "All Templates",
     "modelFilter": "Model Filter",
-    "useCaseFilter": "Use Case",
+    "useCaseFilter": "Tasks",
     "licenseFilter": "License",
     "modelsSelected": "{count} Models",
     "useCasesSelected": "{count} Use Cases",
@@ -882,6 +1025,7 @@
     "resultsCount": "Showing {count} of {total} templates",
     "sort": {
       "recommended": "Recommended",
+      "popular": "Popular",
       "alphabetical": "A → Z",
       "newest": "Newest",
       "searchPlaceholder": "Search...",
@@ -898,6 +1042,9 @@
       "searchPlaceholder": "Search..."
     }
   },
+  "templates": {
+    "logoProviderSeparator": " & "
+  },
   "graphCanvasMenu": {
     "zoomIn": "Zoom In",
     "zoomOut": "Zoom Out",
@@ -931,7 +1078,10 @@
   "workflowService": {
     "exportWorkflow": "Export Workflow",
     "enterFilename": "Enter the filename",
-    "saveWorkflow": "Save workflow"
+    "enterFilenamePrompt": "Enter the filename:",
+    "saveWorkflow": "Save workflow",
+    "savedAsApp": "Converted to app workflow",
+    "savedAsWorkflow": "Converted to node graph only workflow"
   },
   "subgraphStore": {
     "confirmDeleteTitle": "Delete blueprint?",
@@ -940,6 +1090,7 @@
     "overwriteBlueprintTitle": "Overwrite existing blueprint?",
     "overwriteBlueprint": "Saving will overwrite the current blueprint with your changes",
     "blueprintName": "Subgraph name",
+    "blueprintNamePrompt": "Subgraph name:",
     "promoteOutsideSubgraph": "Can't promote widget when not in subgraph",
     "publish": "Publish Subgraph",
     "publishSuccess": "Saved to Nodes Library",
@@ -949,7 +1100,15 @@
     "showAll": "Show all",
     "hidden": "Hidden / nested parameters",
     "hideAll": "Hide all",
-    "showRecommended": "Show recommended widgets"
+    "showRecommended": "Show recommended widgets",
+    "cannotDeleteGlobal": "Cannot delete installed blueprints",
+    "enterDescription": "Enter a description",
+    "searchAliases": "Search Aliases",
+    "enterSearchAliases": "Enter search aliases (comma separated)",
+    "disconnected": "Disconnected",
+    "linked": "(Linked)",
+    "promoteWidget": "Promote Widget: {name}",
+    "unpromoteWidget": "Un-Promote Widget: {name}"
   },
   "electronFileDownload": {
     "inProgress": "In Progress",
@@ -965,6 +1124,10 @@
     "clear": "Clear",
     "undo": "Undo",
     "redo": "Redo",
+    "rotateLeft": "Rotate Left",
+    "rotateRight": "Rotate Right",
+    "mirrorHorizontal": "Mirror Horizontal",
+    "mirrorVertical": "Mirror Vertical",
     "clickToResetZoom": "Click to reset zoom",
     "brushSettings": "Brush Settings",
     "brushShape": "Brush Shape",
@@ -1012,7 +1175,7 @@
     "theme": "Theme",
     "dark": "Dark",
     "light": "Light",
-    "manageExtensions": "Manage Extensions",
+    "manageExtensions": "Extensions",
     "settings": "Settings",
     "help": "Help",
     "queue": "Queue Panel"
@@ -1020,7 +1183,8 @@
   "queue": {
     "initializingAlmostReady": "Initializing - Almost ready",
     "inQueue": "In queue...",
-    "jobAddedToQueue": "Job added to queue",
+    "jobAddedToQueue": "Job queued",
+    "jobQueueing": "Job queuing",
     "completedIn": "Finished in {duration}",
     "jobMenu": {
       "openAsWorkflowNewTab": "Open as workflow in new tab",
@@ -1089,6 +1253,7 @@
     "Open 3D Viewer (Beta) for Selected Node": "Open 3D Viewer (Beta) for Selected Node",
     "Experimental: Browse Model Assets": "Experimental: Browse Model Assets",
     "Browse Templates": "Browse Templates",
+    "Copy": "Copy",
     "Delete Selected Items": "Delete Selected Items",
     "Zoom to fit": "Zoom to fit",
     "Lock Canvas": "Lock Canvas",
@@ -1096,8 +1261,11 @@
     "Move Selected Nodes Left": "Move Selected Nodes Left",
     "Move Selected Nodes Right": "Move Selected Nodes Right",
     "Move Selected Nodes Up": "Move Selected Nodes Up",
+    "Paste": "Paste",
+    "Paste with Connect": "Paste with Connect",
     "Reset View": "Reset View",
     "Resize Selected Nodes": "Resize Selected Nodes",
+    "Select All": "Select All",
     "Node Links": "Node Links",
     "Canvas Toggle Lock": "Canvas Toggle Lock",
     "Minimap": "Minimap",
@@ -1138,11 +1306,14 @@
     "Manager Menu (Legacy)": "Manager Menu (Legacy)",
     "Install Missing Custom Nodes": "Install Missing Custom Nodes",
     "Check for Custom Node Updates": "Check for Custom Node Updates",
-    "Toggle the Custom Nodes Manager Progress Bar": "Toggle the Custom Nodes Manager Progress Bar",
     "Decrease Brush Size in MaskEditor": "Decrease Brush Size in MaskEditor",
     "Increase Brush Size in MaskEditor": "Increase Brush Size in MaskEditor",
     "Open Color Picker in MaskEditor": "Open Color Picker in MaskEditor",
+    "Mirror Horizontal in MaskEditor": "Mirror Horizontal in MaskEditor",
+    "Mirror Vertical in MaskEditor": "Mirror Vertical in MaskEditor",
     "Open Mask Editor for Selected Node": "Open Mask Editor for Selected Node",
+    "Rotate Left in MaskEditor": "Rotate Left in MaskEditor",
+    "Rotate Right in MaskEditor": "Rotate Right in MaskEditor",
     "Unload Models": "Unload Models",
     "Unload Models and Execution Cache": "Unload Models and Execution Cache",
     "New": "New",
@@ -1150,18 +1321,23 @@
     "Manager": "Manager",
     "Open": "Open",
     "Publish": "Publish",
+    "Job History": "Job History",
     "Queue Prompt": "Queue Prompt",
     "Queue Prompt (Front)": "Queue Prompt (Front)",
     "Queue Selected Output Nodes": "Queue Selected Output Nodes",
     "Redo": "Redo",
     "Refresh Node Definitions": "Refresh Node Definitions",
+    "Rename": "Rename",
     "Save": "Save",
     "Save As": "Save As",
     "Show Settings Dialog": "Show Settings Dialog",
+    "Set Subgraph Description": "Set Subgraph Description",
+    "Set Subgraph Search Aliases": "Set Subgraph Search Aliases",
     "Experimental: Enable AssetAPI": "Experimental: Enable AssetAPI",
     "Canvas Performance": "Canvas Performance",
     "Help Center": "Help Center",
-    "toggle linear mode": "toggle linear mode",
+    "Toggle App Mode": "Toggle App Mode",
+    "Toggle Queue Panel V2": "Toggle Queue Panel V2",
     "Toggle Theme (Dark/Light)": "Toggle Theme (Dark/Light)",
     "Undo": "Undo",
     "Open Sign In Dialog": "Open Sign In Dialog",
@@ -1178,6 +1354,7 @@
     "Toggle Essential Bottom Panel": "Toggle Essential Bottom Panel",
     "Toggle View Controls Bottom Panel": "Toggle View Controls Bottom Panel",
     "Focus Mode": "Focus Mode",
+    "linearMode_appModeToolbar_apps": "linearMode.appModeToolbar.apps",
     "Assets": "Assets",
     "Model Library": "Model Library",
     "Node Library": "Node Library",
@@ -1247,7 +1424,12 @@
     "VueNodes": "Nodes 2.0",
     "Nodes 2_0": "Nodes 2.0",
     "Execution": "Execution",
-    "PLY": "PLY"
+    "PLY": "PLY",
+    "Workspace": "Workspace",
+    "Error System": "Error System",
+    "Other": "Other",
+    "Secrets": "Secrets",
+    "Node Library": "Node Library"
   },
   "serverConfigItems": {
     "listen": {
@@ -1398,6 +1580,7 @@
     "latent": "latent",
     "mask": "mask",
     "api node": "api node",
+    "Bria": "Bria",
     "video": "video",
     "ByteDance": "ByteDance",
     "preprocessors": "preprocessors",
@@ -1423,6 +1606,7 @@
     "deprecated": "deprecated",
     "debug": "debug",
     "model": "model",
+    "ElevenLabs": "ElevenLabs",
     "3d": "3d",
     "ltxv": "ltxv",
     "qwen": "qwen",
@@ -1433,6 +1617,9 @@
     "Gemini": "Gemini",
     "video_models": "video_models",
     "gligen": "gligen",
+    "shader": "shader",
+    "Grok": "Grok",
+    "HitPaw": "HitPaw",
     "sd": "sd",
     "Ideogram": "Ideogram",
     "postprocessing": "postprocessing",
@@ -1448,6 +1635,8 @@
     "lotus": "lotus",
     "LTXV": "LTXV",
     "Luma": "Luma",
+    "Magnific": "Magnific",
+    "Meshy": "Meshy",
     "MiniMax": "MiniMax",
     "model_specific": "model_specific",
     "Moonvalley Marey": "Moonvalley Marey",
@@ -1470,13 +1659,16 @@
     "stable_cascade": "stable_cascade",
     "3d_models": "3d_models",
     "style_model": "style_model",
+    "Tencent": "Tencent",
+    "textgen": "textgen",
+    "": "",
     "Topaz": "Topaz",
     "Tripo": "Tripo",
     "Veo": "Veo",
     "Vidu": "Vidu",
-    "": "",
     "camera": "camera",
     "Wan": "Wan",
+    "WaveSpeed": "WaveSpeed",
     "zimage": "zimage"
   },
   "dataTypes": {
@@ -1486,16 +1678,26 @@
     "AUDIO_ENCODER_OUTPUT": "AUDIO_ENCODER_OUTPUT",
     "AUDIO_RECORD": "AUDIO_RECORD",
     "BOOLEAN": "BOOLEAN",
+    "BOUNDING_BOX": "BOUNDING_BOX",
     "CAMERA_CONTROL": "CAMERA_CONTROL",
     "CLIP": "CLIP",
     "CLIP_VISION": "CLIP_VISION",
     "CLIP_VISION_OUTPUT": "CLIP_VISION_OUTPUT",
+    "COLOR": "COLOR",
     "COMBO": "COMBO",
     "COMFY_AUTOGROW_V3": "COMFY_AUTOGROW_V3",
     "COMFY_DYNAMICCOMBO_V3": "COMFY_DYNAMICCOMBO_V3",
     "COMFY_MATCHTYPE_V3": "COMFY_MATCHTYPE_V3",
     "CONDITIONING": "CONDITIONING",
     "CONTROL_NET": "CONTROL_NET",
+    "ELEVENLABS_VOICE": "ELEVENLABS_VOICE",
+    "FILE_3D": "FILE_3D",
+    "FILE_3D_FBX": "FILE_3D_FBX",
+    "FILE_3D_GLB": "FILE_3D_GLB",
+    "FILE_3D_GLTF": "FILE_3D_GLTF",
+    "FILE_3D_OBJ": "FILE_3D_OBJ",
+    "FILE_3D_STL": "FILE_3D_STL",
+    "FILE_3D_USDZ": "FILE_3D_USDZ",
     "FLOAT": "FLOAT",
     "FLOATS": "FLOATS",
     "GEMINI_INPUT_FILES": "GEMINI_INPUT_FILES",
@@ -1504,6 +1706,7 @@
     "HOOK_KEYFRAMES": "HOOK_KEYFRAMES",
     "HOOKS": "HOOKS",
     "IMAGE": "IMAGE",
+    "IMAGECOMPARE": "IMAGECOMPARE",
     "INT": "INT",
     "LATENT": "LATENT",
     "LATENT_OPERATION": "LATENT_OPERATION",
@@ -1516,6 +1719,8 @@
     "LUMA_REF": "LUMA_REF",
     "MASK": "MASK",
     "MESH": "MESH",
+    "MESHY_RIGGED_TASK_ID": "MESHY_RIGGED_TASK_ID",
+    "MESHY_TASK_ID": "MESHY_TASK_ID",
     "MODEL": "MODEL",
     "MODEL_PATCH": "MODEL_PATCH",
     "MODEL_TASK_ID": "MODEL_TASK_ID",
@@ -1524,6 +1729,7 @@
     "OPENAI_INPUT_FILES": "OPENAI_INPUT_FILES",
     "PHOTOMAKER": "PHOTOMAKER",
     "PIXVERSE_TEMPLATE": "PIXVERSE_TEMPLATE",
+    "POSE_KEYPOINT": "POSE_KEYPOINT",
     "RECRAFT_COLOR": "RECRAFT_COLOR",
     "RECRAFT_CONTROLS": "RECRAFT_CONTROLS",
     "RECRAFT_V3_STYLE": "RECRAFT_V3_STYLE",
@@ -1573,8 +1779,18 @@
   },
   "missingModelsDialog": {
     "doNotAskAgain": "Don't show this again",
-    "missingModels": "Missing Models",
-    "missingModelsMessage": "When loading the graph, the following models were not found"
+    "reEnableInSettings": "Re-enable in {link}",
+    "reEnableInSettingsLink": "Settings",
+    "title": "This workflow is missing models",
+    "description": "This workflow requires models you haven't downloaded yet.",
+    "totalSize": "Total download size:",
+    "downloadAll": "Download all",
+    "downloadAvailable": "Download available",
+    "gotIt": "Ok, got it",
+    "footerDescription": "Download and place these models in the correct folder.\nNodes with missing models are highlighted red on the canvas.",
+    "customModelsWarning": "Some of these are custom models that we don't recognize.",
+    "customModelsInstruction": "You'll need to find and download them manually. Search for them online (try Civitai or HuggingFace) or contact the original workflow provider.",
+    "acceptTerms": "Accept terms"
   },
   "versionMismatchWarning": {
     "title": "Version Compatibility Warning",
@@ -1620,7 +1836,12 @@
     "errorNotSupported": "Clipboard API not supported in your browser"
   },
   "imageCompare": {
-    "noImages": "No images to compare"
+    "noImages": "No images to compare",
+    "batchLabelA": "A:",
+    "batchLabelB": "B:"
+  },
+  "batch": {
+    "index": "{current} / {total}"
   },
   "load3d": {
     "switchCamera": "Switch Camera",
@@ -1636,6 +1857,7 @@
     "loadingModel": "Loading 3D Model...",
     "upDirection": "Up Direction",
     "materialMode": "Material Mode",
+    "showSkeleton": "Show Skeleton",
     "scene": "Scene",
     "model": "Model",
     "camera": "Camera",
@@ -1682,13 +1904,42 @@
     },
     "openIn3DViewer": "Open in 3D Viewer",
     "dropToLoad": "Drop 3D model to load",
-    "unsupportedFileType": "Unsupported file type (supports .gltf, .glb, .obj, .fbx, .stl)",
+    "unsupportedFileType": "Unsupported file type (supports .gltf, .glb, .obj, .fbx, .stl, .ply, .spz, .splat, .ksplat)",
     "uploadingModel": "Uploading 3D model..."
   },
+  "imageCrop": {
+    "loading": "Loading...",
+    "noInputImage": "No input image connected",
+    "cropPreviewAlt": "Crop preview",
+    "ratio": "Ratio",
+    "lockRatio": "Lock aspect ratio",
+    "unlockRatio": "Unlock aspect ratio",
+    "custom": "Custom"
+  },
+  "painter": {
+    "tool": "Tool",
+    "brush": "Brush",
+    "eraser": "Eraser",
+    "size": "Cursor Size",
+    "color": "Color Picker",
+    "hardness": "Hardness",
+    "width": "Width",
+    "height": "Height",
+    "background": "Background",
+    "clear": "Clear",
+    "uploadError": "Failed to upload painter image: {status} - {statusText}"
+  },
+  "boundingBox": {
+    "x": "X",
+    "y": "Y",
+    "width": "Width",
+    "height": "Height"
+  },
   "toastMessages": {
     "nothingToQueue": "Nothing to queue",
     "pleaseSelectOutputNodes": "Please select output nodes",
     "failedToQueue": "Failed to queue",
+    "failedToSaveDraft": "Failed to save workflow draft",
     "failedExecutionPathResolution": "Could not resolve path to selected nodes",
     "no3dScene": "No 3D scene to apply texture",
     "failedToApplyTexture": "Failed to apply texture",
@@ -1712,6 +1963,7 @@
     "nodeDefinitionsUpdated": "Node definitions updated",
     "errorSaveSetting": "Error saving setting {id}: {err}",
     "errorCopyImage": "Error copying image: {error}",
+    "errorOpenImage": "Error opening image: {error}",
     "noTemplatesToExport": "No templates to export",
     "failedToFetchLogs": "Failed to fetch server logs",
     "migrateToLitegraphReroute": "Reroute nodes will be removed in future versions. Click to migrate to litegraph-native reroute.",
@@ -1781,6 +2033,7 @@
       "newUser": "New here?",
       "userAvatar": "User Avatar",
       "signUp": "Sign up",
+      "signUpFreeTierPromo": "New here? {signUp} with Google to get {credits} free credits every month.",
       "emailLabel": "Email",
       "emailPlaceholder": "Enter your email",
       "passwordLabel": "Password",
@@ -1805,7 +2058,12 @@
       "failed": "Login failed",
       "insecureContextWarning": "This connection is insecure (HTTP) - your credentials may be intercepted by attackers if you proceed to login.",
       "questionsContactPrefix": "Questions? Contact us at",
-      "noAssociatedUser": "There is no Comfy user associated with the provided API key"
+      "noAssociatedUser": "There is no Comfy user associated with the provided API key",
+      "useEmailInstead": "Use email instead",
+      "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"
     },
     "signup": {
       "title": "Create an account",
@@ -1819,12 +2077,15 @@
       "signUpWithGoogle": "Sign up with Google",
       "signUpWithGithub": "Sign up with Github",
       "regionRestrictionChina": "In accordance with local regulatory requirements, our services are temporarily unavailable to users located in China.",
-      "personalDataConsentLabel": "I agree to the processing of my personal data."
+      "personalDataConsentLabel": "I agree to the processing of my personal data.",
+      "emailNotEligibleForFreeTier": "Email sign-up is not eligible for Free Tier."
     },
     "signOut": {
       "signOut": "Log Out",
       "success": "Signed out successfully",
-      "successDetail": "You have been signed out of your account."
+      "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?"
     },
     "passwordUpdate": {
       "success": "Password Updated",
@@ -1845,13 +2106,7 @@
       "auth/cancelled-popup-request": "Sign-in was cancelled. Please try again."
     },
     "deleteAccount": {
-      "deleteAccount": "Delete Account",
-      "confirmTitle": "Delete Account",
-      "confirmMessage": "Are you sure you want to delete your account? This action cannot be undone and will permanently remove all your data.",
-      "confirm": "Delete Account",
-      "cancel": "Cancel",
-      "success": "Account Deleted",
-      "successDetail": "Your account has been successfully deleted."
+      "contactSupport": "To delete your account, please contact {email}"
     },
     "reauthRequired": {
       "title": "Re-authentication Required",
@@ -1906,12 +2161,28 @@
       "insufficientWorkflowMessage": "You don't have enough credits to run this workflow.",
       "creditsDescription": "Credits are used to run workflows or partner nodes.",
       "howManyCredits": "How many credits would you like to add?",
+      "usdAmount": "${amount}",
       "videosEstimate": "~{count} videos*",
-      "templateNote": "*Generated with Wan Fun Control template",
+      "templateNote": "*Generated with Wan 2.2 Image-to-Video template",
       "buy": "Buy",
+      "purchaseSuccess": "Credits added successfully!",
       "purchaseError": "Purchase Failed",
       "purchaseErrorDetail": "Failed to purchase credits: {error}",
-      "unknownError": "An unknown error occurred"
+      "unknownError": "An unknown error occurred",
+      "viewPricing": "View pricing details",
+      "youPay": "Amount (USD)",
+      "youGet": "Credits",
+      "buyCredits": "Continue to payment",
+      "minimumPurchase": "${amount} minimum ({credits} credits)",
+      "maximumAmount": "${amount} max.",
+      "minRequired": "{credits} credits minimum",
+      "maxAllowed": "{credits} credits maximum.",
+      "creditsPerDollar": "credits per dollar",
+      "amountToPayLabel": "Amount to pay in dollars",
+      "creditsToReceiveLabel": "Credits to receive",
+      "selectAmount": "Select amount",
+      "needMore": "Need more?",
+      "contactUs": "Contact us"
     },
     "creditsAvailable": "Credits available",
     "refreshes": "Refreshes {date}",
@@ -1927,17 +2198,49 @@
       "tooltip": "We've unified payments across Comfy. Everything now runs on Comfy Credits:\n- Partner Nodes (formerly API nodes)\n- Cloud workflows\n\nYour existing Partner node balance has been converted into credits."
     }
   },
+  "billingOperation": {
+    "subscriptionProcessing": "Processing payment — setting up your workspace...",
+    "subscriptionSuccess": "Subscription updated successfully",
+    "subscriptionFailed": "Subscription update failed",
+    "subscriptionTimeout": "Subscription verification timed out",
+    "topupProcessing": "Processing payment — adding credits...",
+    "topupSuccess": "Credits added successfully",
+    "topupFailed": "Top-up failed",
+    "topupTimeout": "Top-up verification timed out"
+  },
   "subscription": {
+    "chooseBestPlanWorkspace": "Choose the best plan for your workspace",
     "title": "Subscription",
     "titleUnsubscribed": "Subscribe to Comfy Cloud",
     "comfyCloud": "Comfy Cloud",
     "comfyCloudLogo": "Comfy Cloud Logo",
     "beta": "BETA",
     "perMonth": "/ month",
+    "member": "member",
     "usdPerMonth": "USD / mo",
+    "usdPerMonthPerMember": "USD / mo / member",
     "renewsDate": "Renews {date}",
     "expiresDate": "Expires {date}",
     "manageSubscription": "Manage subscription",
+    "managePayment": "Manage Payment",
+    "cancelSubscription": "Cancel Subscription",
+    "canceled": "Canceled",
+    "resubscribe": "Resubscribe",
+    "resubscribeTo": "Resubscribe to {plan}",
+    "resubscribeSuccess": "Subscription reactivated successfully",
+    "canceledCard": {
+      "title": "Your subscription has been canceled",
+      "description": "You won't be charged again. Your features remain active until {date}."
+    },
+    "cancelSuccess": "Subscription cancelled successfully",
+    "cancelDialog": {
+      "title": "Cancel subscription",
+      "description": "Your access continues until {date}. You won't be charged again, and your workspace and credits will be preserved. You can resubscribe anytime.",
+      "endOfBillingPeriod": "end of billing period",
+      "keepSubscription": "Keep subscription",
+      "confirmCancel": "Cancel subscription",
+      "failed": "Failed to cancel subscription"
+    },
     "partnerNodesBalance": "\"Partner Nodes\" Credit Balance",
     "partnerNodesDescription": "For running commercial/proprietary models",
     "totalCredits": "Total credits",
@@ -1948,9 +2251,9 @@
     "monthlyBonusDescription": "Monthly credit bonus",
     "prepaidDescription": "Pre-paid credits",
     "prepaidCreditsInfo": "Pre-paid credits expire after 1 year from purchase date.",
-    "creditsRemainingThisMonth": "Credits remaining this month",
-    "creditsRemainingThisYear": "Credits remaining this year",
-    "creditsYouveAdded": "Credits you've added",
+    "creditsRemainingThisMonth": "Included (Refills {date})",
+    "creditsRemainingThisYear": "Included (Refills {date})",
+    "creditsYouveAdded": "Additional",
     "monthlyCreditsInfo": "These credits refresh monthly and don't roll over",
     "viewMoreDetailsPlans": "View more details about plans & pricing",
     "nextBillingCycle": "next billing cycle",
@@ -1965,11 +2268,16 @@
     "messageSupport": "Message support",
     "invoiceHistory": "Invoice history",
     "benefits": {
-      "benefit1": "$10 in monthly credits for Partner Nodes — top up when needed",
-      "benefit2": "Up to 30 min runtime per job"
+      "benefit1": "Monthly credits for Partner Nodes — top up when needed",
+      "benefit1FreeTier": "More monthly credits, top up anytime",
+      "benefit2": "Up to 1 hour runtime per job on Pro",
+      "benefit3": "Bring your own models (Creator & Pro)"
     },
     "yearlyDiscount": "20% DISCOUNT",
     "tiers": {
+      "free": {
+        "name": "Free"
+      },
       "founder": {
         "name": "Founder's Edition"
       },
@@ -1986,16 +2294,40 @@
     "required": {
       "title": "Subscribe to",
       "waitingForSubscription": "Complete your subscription in the new tab. We'll automatically detect when you're done!",
-      "subscribe": "Subscribe"
+      "subscribe": "Subscribe",
+      "pollingSuccess": "Subscription activated successfully!",
+      "pollingFailed": "Subscription activation failed",
+      "pollingTimeout": "Timed out waiting for subscription. Please refresh and try again."
     },
     "subscribeToRun": "Subscribe",
     "subscribeToRunFull": "Subscribe to Run",
+    "subscribeForMore": "Upgrade",
+    "upgradeToAddCredits": "Upgrade to add credits",
     "subscribeNow": "Subscribe Now",
     "subscribeToComfyCloud": "Subscribe to Comfy Cloud",
+    "workspaceNotSubscribed": "This workspace is not on a subscription",
+    "subscriptionRequiredMessage": "A subscription is required for members to run workflows on Cloud and invite members",
+    "contactOwnerToSubscribe": "Contact the workspace owner to subscribe",
     "description": "Choose the best plan for you",
+    "descriptionWorkspace": "Choose the best plan for your workspace",
     "haveQuestions": "Have questions or wondering about enterprise?",
     "contactUs": "Contact us",
     "viewEnterprise": "View enterprise",
+    "freeTier": {
+      "title": "You're on the Free plan",
+      "description": "Your free plan includes {credits} credits each month to try Comfy Cloud.",
+      "descriptionGeneric": "Your free plan includes a monthly credit allowance to try Comfy Cloud.",
+      "nextRefresh": "Your credits refresh on {date}.",
+      "subscribeCta": "Subscribe for more",
+      "outOfCredits": {
+        "title": "You're out of free credits",
+        "subtitle": "Subscribe to unlock top-ups and more"
+      },
+      "topUpBlocked": {
+        "title": "Unlock top-ups and more"
+      },
+      "upgradeCta": "View plans"
+    },
     "partnerNodesCredits": "Partner nodes pricing",
     "plansAndPricing": "Plans & pricing",
     "managePlan": "Manage plan",
@@ -2004,34 +2336,200 @@
     "currentPlan": "Current Plan",
     "subscribeTo": "Subscribe to {plan}",
     "monthlyCreditsLabel": "Monthly credits",
+    "monthlyCreditsPerMemberLabel": "Monthly credits / member",
+    "maxMembersLabel": "Max. members",
     "yearlyCreditsLabel": "Total yearly credits",
-    "maxDurationLabel": "Max duration of each workflow run",
+    "membersLabel": "Up to {count} members",
+    "nextMonthInvoice": "Next month invoice",
+    "memberCount": "{count} member | {count} members",
+    "maxDurationLabel": "Max run duration",
     "gpuLabel": "RTX 6000 Pro (96GB VRAM)",
     "addCreditsLabel": "Add more credits whenever",
     "customLoRAsLabel": "Import your own LoRAs",
-    "videoEstimateLabel": "Number of 5s videos generated with Wan Fun Control template",
-    "videoEstimateHelp": "What is this?",
-    "videoEstimateExplanation": "These estimates are based on the Wan Fun Control template for 5-second videos.",
-    "videoEstimateTryTemplate": "Try the Wan Fun Control template →",
+    "videoEstimateLabel": "Approx. amount of 5s videos generated with Wan 2.2 Image-to-Video template",
+    "videoEstimateHelp": "More details on this template",
+    "videoEstimateExplanation": "These estimates are based on the Wan 2.2 Image-to-Video template using default settings (5 sec, 16fps, 640x640, 4-step sampling).",
+    "videoEstimateTryTemplate": "Try this template",
+    "videoTemplateBasedCredits": "Videos generated with Wan 2.2 Image to Video",
     "upgradePlan": "Upgrade Plan",
     "upgradeTo": "Upgrade to {plan}",
     "changeTo": "Change to {plan}",
     "maxDuration": {
+      "free": "30 min",
       "standard": "30 min",
       "creator": "30 min",
       "pro": "1 hr",
       "founder": "30 min"
+    },
+    "billingComingSoon": {
+      "title": "Coming Soon",
+      "message": "Team billing is coming soon. You'll be able to subscribe to a plan for your workspace with per-seat pricing. Stay tuned for updates."
+    },
+    "preview": {
+      "confirmPayment": "Confirm your payment",
+      "confirmPlanChange": "Confirm your plan change",
+      "startingToday": "Starting today",
+      "starting": "Starting {date}",
+      "ends": "Ends {date}",
+      "eachMonthCreditsRefill": "Each month credits refill to",
+      "perMember": "/ member",
+      "showMoreFeatures": "Show more features",
+      "hideFeatures": "Hide features",
+      "proratedRefund": "Prorated refund for {plan}",
+      "proratedCharge": "Prorated charge for {plan}",
+      "totalDueToday": "Total due today",
+      "nextPaymentDue": "Next payment due {date}. Cancel anytime.",
+      "termsAgreement": "By continuing, you agree to Comfy Org's {terms} and {privacy}.",
+      "terms": "Terms",
+      "privacyPolicy": "Privacy Policy",
+      "addCreditCard": "Add credit card",
+      "confirm": "Confirm",
+      "backToAllPlans": "Back to all plans"
     }
   },
   "userSettings": {
     "title": "My Account Settings",
     "accountSettings": "Account settings",
+    "workspaceSettings": "Workspace settings",
     "name": "Name",
     "email": "Email",
     "provider": "Sign-in Provider",
     "notSet": "Not set",
     "updatePassword": "Update Password"
   },
+  "workspacePanel": {
+    "invite": "Invite",
+    "inviteMember": "Invite member",
+    "inviteLimitReached": "You've reached the maximum of 50 members",
+    "tabs": {
+      "dashboard": "Dashboard",
+      "planCredits": "Plan & Credits",
+      "membersCount": "Members ({count})"
+    },
+    "dashboard": {
+      "placeholder": "Dashboard workspace settings"
+    },
+    "members": {
+      "membersCount": "{count}/{maxSeats} Members",
+      "pendingInvitesCount": "{count} pending invite | {count} pending invites",
+      "tabs": {
+        "active": "Active",
+        "pendingCount": "Pending ({count})"
+      },
+      "columns": {
+        "inviteDate": "Invite date",
+        "expiryDate": "Expiry date",
+        "joinDate": "Join date"
+      },
+      "actions": {
+        "copyLink": "Copy invite link",
+        "revokeInvite": "Revoke invite",
+        "removeMember": "Remove member"
+      },
+      "upsellBannerSubscribe": "Subscribe to the Creator plan or above to invite team members to this workspace.",
+      "upsellBannerUpgrade": "Upgrade to the Creator plan or above to invite additional team members.",
+      "viewPlans": "View plans",
+      "noInvites": "No pending invites",
+      "noMembers": "No members",
+      "personalWorkspaceMessage": "You can't invite other members to your personal workspace right now. To add members to a workspace,",
+      "createNewWorkspace": "create a new one."
+    },
+    "menu": {
+      "editWorkspace": "Edit workspace details",
+      "leaveWorkspace": "Leave Workspace",
+      "deleteWorkspace": "Delete Workspace",
+      "deleteWorkspaceDisabledTooltip": "Cancel your workspace's active subscription first"
+    },
+    "editWorkspaceDialog": {
+      "title": "Edit workspace details",
+      "nameLabel": "Workspace name",
+      "save": "Save"
+    },
+    "leaveDialog": {
+      "title": "Leave this workspace?",
+      "message": "You won't be able to join again unless you contact the workspace owner.",
+      "leave": "Leave"
+    },
+    "deleteDialog": {
+      "title": "Delete this workspace?",
+      "message": "Any unused credits or unsaved assets will be lost. This action cannot be undone.",
+      "messageWithName": "Delete \"{name}\"? Any unused credits or unsaved assets will be lost. This action cannot be undone."
+    },
+    "removeMemberDialog": {
+      "title": "Remove this member?",
+      "message": "This member will be removed from your workspace. Credits they've used will not be refunded.",
+      "remove": "Remove member",
+      "success": "Member removed",
+      "error": "Failed to remove member"
+    },
+    "revokeInviteDialog": {
+      "title": "Uninvite this person?",
+      "message": "This member won't be able to join your workspace anymore. Their invite link will be invalidated.",
+      "revoke": "Uninvite"
+    },
+    "inviteUpsellDialog": {
+      "titleNotSubscribed": "A subscription is required to invite members",
+      "titleSingleSeat": "Your current plan supports a single seat",
+      "messageNotSubscribed": "To add team members to this workspace, you need a Creator plan or above. The Standard plan supports only a single seat (the owner).",
+      "messageSingleSeat": "The Standard plan includes one seat for the workspace owner. To invite additional members, upgrade to the Creator plan or above to unlock multiple seats.",
+      "viewPlans": "View Plans",
+      "upgradeToCreator": "Upgrade to Creator"
+    },
+    "inviteMemberDialog": {
+      "title": "Invite a person to this workspace",
+      "message": "Create a shareable invite link to send to someone",
+      "placeholder": "Enter the person's email",
+      "createLink": "Create link",
+      "linkStep": {
+        "title": "Send this link to the person",
+        "message": "Make sure their account uses this email.",
+        "copyLink": "Copy Link",
+        "done": "Done"
+      },
+      "linkCopied": "Copied",
+      "linkCopyFailed": "Failed to copy link"
+    },
+    "createWorkspaceDialog": {
+      "title": "Create a new workspace",
+      "message": "Workspaces let members share a single credits pool. You'll become the owner after creating this.",
+      "nameLabel": "Workspace name*",
+      "namePlaceholder": "Enter workspace name",
+      "create": "Create"
+    },
+    "toast": {
+      "workspaceCreated": {
+        "title": "Workspace created",
+        "message": "Subscribe to a plan, invite teammates, and start collaborating.",
+        "subscribe": "Subscribe"
+      },
+      "workspaceUpdated": {
+        "title": "Workspace updated",
+        "message": "Workspace details have been saved."
+      },
+      "workspaceDeleted": {
+        "title": "Workspace deleted",
+        "message": "The workspace has been permanently deleted."
+      },
+      "workspaceLeft": {
+        "title": "Left workspace",
+        "message": "You have left the workspace."
+      },
+      "failedToUpdateWorkspace": "Failed to update workspace",
+      "failedToCreateWorkspace": "Failed to create workspace",
+      "failedToDeleteWorkspace": "Failed to delete workspace",
+      "failedToLeaveWorkspace": "Failed to leave workspace",
+      "failedToFetchWorkspaces": "Failed to load workspaces"
+    }
+  },
+  "workspaceSwitcher": {
+    "switchWorkspace": "Switch workspace",
+    "subscribe": "Subscribe",
+    "personal": "Personal",
+    "roleOwner": "Owner",
+    "roleMember": "Member",
+    "createWorkspace": "Create new workspace",
+    "maxWorkspacesReached": "You can only own 10 workspaces. Delete one to create a new one."
+  },
   "selectionToolbox": {
     "executeButton": {
       "tooltip": "Execute to selected output nodes (Highlighted with orange border)",
@@ -2042,14 +2540,21 @@
     "Set Group Nodes to Always": "Set Group Nodes to Always"
   },
   "widgets": {
+    "boolean": {
+      "true": "true",
+      "false": "false"
+    },
+    "node2only": "Node 2.0 only",
     "selectModel": "Select model",
     "uploadSelect": {
       "placeholder": "Select...",
       "placeholderImage": "Select image...",
       "placeholderAudio": "Select audio...",
       "placeholderVideo": "Select video...",
+      "placeholderMesh": "Select mesh...",
       "placeholderModel": "Select model...",
-      "placeholderUnknown": "Select media..."
+      "placeholderUnknown": "Select media...",
+      "maxSelectionReached": "Maximum selection limit reached"
     },
     "valueControl": {
       "header": {
@@ -2091,11 +2596,19 @@
   },
   "breadcrumbsMenu": {
     "duplicate": "Duplicate",
+    "enterAppMode": "Enter app mode",
+    "exitAppMode": "Exit app mode",
+    "enterBuilderMode": "App builder",
+    "workflowActions": "Workflow actions",
     "clearWorkflow": "Clear Workflow",
     "deleteWorkflow": "Delete Workflow",
     "deleteBlueprint": "Delete Blueprint",
     "enterNewName": "Enter new name",
-    "missingNodesWarning": "Workflow contains unsupported nodes (highlighted red)."
+    "missingNodesWarning": "Workflow contains unsupported nodes (highlighted red).",
+    "graph": "Graph",
+    "app": "App",
+    "enterNodeGraph": "Enter node graph",
+    "share": "Share"
   },
   "shortcuts": {
     "shortcuts": "Shortcuts",
@@ -2119,7 +2632,16 @@
     "renderBypassState": "Render Bypass State",
     "renderErrorState": "Render Error State"
   },
+  "nightlySurvey": {
+    "title": "Help Us Improve",
+    "description": "You've been using this feature. Would you take a moment to share your feedback?",
+    "accept": "Sure, I'll help!",
+    "notNow": "Not Now",
+    "dontAskAgain": "Don't Ask Again",
+    "loadError": "Failed to load survey. Please try again later."
+  },
   "cloudOnboarding": {
+    "skipToCloudApp": "Skip to the cloud app",
     "survey": {
       "title": "Cloud Survey",
       "placeholder": "Survey questions placeholder",
@@ -2244,8 +2766,16 @@
   "assetBrowser": {
     "allCategory": "All {category}",
     "allModels": "All Models",
+    "byType": "By type",
+    "emptyImported": {
+      "canImport": "No imported models yet. Click \"Import\" to add your own.",
+      "restricted": "Personal models are only available at Creator tier and above."
+    },
+    "noResultsCanImport": "Try adjusting your search or filters.\nYou can also add models using the \"Import\" button above.",
+    "imported": "Imported",
     "assetCollection": "Asset collection",
     "assets": "Assets",
+    "baseModel": "Base model",
     "baseModels": "Base models",
     "browseAssets": "Browse Assets",
     "checkpoints": "Checkpoints",
@@ -2257,13 +2787,38 @@
     "civitaiLinkPlaceholder": "Paste link here",
     "confirmModelDetails": "Confirm Model Details",
     "connectionError": "Please check your connection and try again",
+    "errorAccessForbidden": "Access to this resource is forbidden.",
+    "errorConnectionRefused": "Unable to connect to the source. Please try again later.",
+    "errorDownloadCancelled": "Download was cancelled.",
     "errorFileTooLarge": "File exceeds the maximum allowed size limit",
     "errorFormatNotAllowed": "Only SafeTensor format is allowed",
+    "errorHttpError": "An error occurred while fetching metadata.",
+    "errorInternalError": "An unexpected error occurred. Please try again.",
+    "errorInvalidHost": "The source URL hostname could not be resolved.",
+    "errorInvalidUrl": "Please provide a URL.",
+    "errorInvalidUrlFormat": "The URL format is invalid. Please check and try again.",
+    "errorMetadataFetchFailed": "Failed to fetch file information from the source.",
     "errorModelTypeNotSupported": "This model type is not supported",
+    "errorNetworkError": "A network error occurred. Please check your connection and try again.",
+    "errorNetworkTimeout": "Request timed out. Please try again.",
+    "errorRateLimited": "Too many requests. Please try again in a few minutes.",
+    "errorRequestCancelled": "Request was cancelled.",
+    "errorResourceNotFound": "The file was not found. Please check the URL and try again.",
+    "errorServiceUnavailable": "Service temporarily unavailable. Please try again later.",
+    "errorSourceServerError": "The source server is experiencing issues. Please try again later.",
+    "errorUnauthorized": "Please sign in to continue.",
+    "errorUnauthorizedSource": "This resource requires authentication. Please add your API token in settings.",
     "errorUnknown": "An unexpected error occurred",
     "errorUnsafePickleScan": "CivitAI detected potentially unsafe code in this file",
     "errorUnsafeVirusScan": "CivitAI detected malware or suspicious content in this file",
+    "errorUnsupportedSource": "This URL is not supported. Only Hugging Face and Civitai URLs are allowed.",
     "errorUploadFailed": "Failed to import asset. Please try again.",
+    "errorUserTokenAccessDenied": "Your API token does not have access to this resource. Please check your token permissions.",
+    "errorUserTokenInvalid": "Your stored API token is invalid or expired. Please update your token in settings.",
+    "invalidAsset": "Invalid Asset",
+    "invalidAssetDetail": "The selected asset could not be validated. Please try again.",
+    "invalidFilename": "Invalid Filename",
+    "invalidFilenameDetail": "The asset filename could not be determined. Please try again.",
     "failedToCreateNode": "Failed to create node. Please try again or check console for details.",
     "fileFormats": "File formats",
     "fileName": "File Name",
@@ -2271,6 +2826,7 @@
     "filterBy": "Filter by",
     "findInLibrary": "Find it in the {type} section of the models library.",
     "finish": "Finish",
+    "importAnother": "Import Another",
     "genericLinkPlaceholder": "Paste link here",
     "jobId": "Job ID",
     "loadingModels": "Loading {type}...",
@@ -2285,18 +2841,21 @@
     "noAssetsFound": "No assets found",
     "noModelsInFolder": "No {type} available in this folder",
     "notSureLeaveAsIs": "Not sure? Just leave this as is",
+    "noValidSourceDetected": "No valid import source detected",
     "onlyCivitaiUrlsSupported": "Only Civitai URLs are supported",
     "ownership": "Ownership",
     "ownershipAll": "All",
     "ownershipMyModels": "My models",
     "ownershipPublicModels": "Public models",
+    "processingModel": "Download started",
+    "processingModelDescription": "You can close this dialog. The download will continue in the background.",
     "providerCivitai": "Civitai",
     "providerHuggingFace": "Hugging Face",
-    "noValidSourceDetected": "No valid import source detected",
     "selectFrameworks": "Select Frameworks",
     "selectModelType": "Select model type",
     "selectProjects": "Select Projects",
     "sortAZ": "A-Z",
+    "sortDefault": "Default",
     "sortBy": "Sort by",
     "sortingType": "Sorting Type",
     "sortPopular": "Popular",
@@ -2307,18 +2866,20 @@
     "tagsPlaceholder": "e.g., models, checkpoint",
     "tryAdjustingFilters": "Try adjusting your search or filters",
     "unknown": "Unknown",
-    "unsupportedUrlSource": "Only URLs from {sources} are supported",
+    "unsupportedUrlSource": "This URL is not supported. Use a direct model link from {sources}. See the how-to videos below for help.",
     "upgradeFeatureDescription": "This feature is only available with Creator or Pro plans.",
     "upgradeToUnlockFeature": "Upgrade to unlock this feature",
     "upload": "Import",
     "uploadFailed": "Import failed",
+    "apiKeyHint": "Importing private or gated models? {link}.",
+    "apiKeyHintLink": "Add your API keys in Settings",
     "uploadingModel": "Importing model...",
     "uploadModel": "Import",
     "uploadModelDescription1": "Paste a Civitai model download link to add it to your library.",
     "uploadModelDescription1Generic": "Paste a model download link to add it to your library.",
     "uploadModelDescription2": "Only links from {link} are supported at the moment",
-    "uploadModelDescription2Link": "https://civitai.com/models",
     "uploadModelDescription2Generic": "Only URLs from the following providers are supported:",
+    "uploadModelDescription2Link": "https://civitai.com/models",
     "uploadModelDescription3": "Max file size: {size}",
     "uploadModelFailedToRetrieveMetadata": "Failed to retrieve metadata. Please check the link and try again.",
     "uploadModelFromCivitai": "Import a model from Civitai",
@@ -2331,6 +2892,30 @@
       "assetCard": "{name} - {type} asset",
       "loadingAsset": "Loading asset"
     },
+    "modelInfo": {
+      "title": "Model Info",
+      "selectModelPrompt": "Select a model to see its information",
+      "basicInfo": "Basic Info",
+      "displayName": "Display Name",
+      "editDisplayName": "Edit display name",
+      "fileName": "File Name",
+      "source": "Source",
+      "viewOnSource": "View on {source}",
+      "modelTagging": "Model Tagging",
+      "modelType": "Model Type",
+      "selectModelType": "Select model type...",
+      "compatibleBaseModels": "Compatible Base Models",
+      "addBaseModel": "Add base model...",
+      "baseModelUnknown": "Base model unknown",
+      "additionalTags": "Additional Tags",
+      "addTag": "Add tag...",
+      "noAdditionalTags": "No additional tags",
+      "modelDescription": "Model Description",
+      "triggerPhrases": "Trigger Phrases",
+      "description": "Description",
+      "descriptionNotSet": "No description set",
+      "descriptionPlaceholder": "Add a description for this model..."
+    },
     "media": {
       "threeDModelPlaceholder": "3D Model",
       "audioPlaceholder": "Audio"
@@ -2342,6 +2927,11 @@
       "complete": "{assetName} has been deleted.",
       "failed": "{assetName} could not be deleted."
     },
+    "download": {
+      "complete": "Download complete",
+      "failed": "Download failed",
+      "inProgress": "Downloading {assetName}..."
+    },
     "rename": {
       "failed": "Could not rename asset."
     }
@@ -2357,8 +2947,10 @@
     "actions": {
       "inspect": "Inspect asset",
       "more": "More options",
+      "zoom": "Zoom in",
+      "moreOptions": "More options",
       "seeMoreOutputs": "See more outputs",
-      "addToWorkflow": "Add to current workflow",
+      "insertAsNodeInWorkflow": "Insert as node in workflow",
       "download": "Download",
       "openWorkflow": "Open as workflow in new tab",
       "exportWorkflow": "Export workflow",
@@ -2373,14 +2965,30 @@
     },
     "selection": {
       "selectedCount": "Assets Selected: {count}",
+      "multipleSelectedAssets": "Multiple assets selected",
       "deselectAll": "Deselect all",
       "downloadSelected": "Download",
+      "downloadSelectedAll": "Download all",
       "deleteSelected": "Delete",
-      "downloadStarted": "Downloading {count} files...",
-      "downloadsStarted": "Started downloading {count} file(s)",
-      "assetsDeletedSuccessfully": "{count} asset(s) deleted successfully",
+      "deleteSelectedAll": "Delete all",
+      "insertAllAssetsAsNodes": "Insert all assets as nodes",
+      "openWorkflowAll": "Open all workflows",
+      "exportWorkflowAll": "Export all workflows",
+      "downloadStarted": "Downloading {count} file... | Downloading {count} files...",
+      "downloadsStarted": "Started downloading {count} file | Started downloading {count} files",
+      "exportStarted": "Preparing ZIP export for {count} file | Preparing ZIP export for {count} files",
+      "assetsDeletedSuccessfully": "{count} asset deleted successfully | {count} assets deleted successfully",
       "failedToDeleteAssets": "Failed to delete selected assets",
-      "partialDeleteSuccess": "{succeeded} deleted successfully, {failed} failed"
+      "partialDeleteSuccess": "{succeeded} deleted successfully, {failed} failed",
+      "nodesAddedToWorkflow": "{count} node(s) added to workflow",
+      "failedToAddNodes": "Failed to add nodes to workflow",
+      "partialAddNodesSuccess": "{succeeded} added successfully, {failed} failed",
+      "workflowsOpened": "{count} workflow(s) opened in new tabs",
+      "noWorkflowsFound": "No workflow data found in selected assets",
+      "partialWorkflowsOpened": "{succeeded} workflow(s) opened, {failed} failed",
+      "workflowsExported": "{count} workflow(s) exported successfully",
+      "noWorkflowsToExport": "No workflow data found to export",
+      "partialWorkflowsExported": "{succeeded} exported successfully, {failed} failed"
     },
     "noJobIdFound": "No job ID found for this asset",
     "unsupportedFileType": "Unsupported file type for loader node",
@@ -2395,7 +3003,131 @@
   "actionbar": {
     "dockToTop": "Dock to top",
     "feedback": "Feedback",
-    "feedbackTooltip": "Feedback"
+    "feedbackTooltip": "Feedback",
+    "share": "Share",
+    "shareTooltip": "Share workflow"
+  },
+  "shareWorkflow": {
+    "shareLinkTab": "Share",
+    "publishToHubTab": "Publish",
+    "loadingTitle": "Share workflow",
+    "unsavedTitle": "Save workflow first",
+    "unsavedDescription": "You must save your workflow before sharing. Save it now to continue.",
+    "saveButton": "Save workflow",
+    "saving": "Saving...",
+    "workflowNameLabel": "Workflow name",
+    "createLinkTitle": "Share workflow",
+    "createLinkDescription": "When you create a link for your workflow, you will share these media items along with your workflow",
+    "privateAssetsDescription": "Your workflow contains private models and/or media files",
+    "createLinkButton": "Create a link",
+    "creatingLink": "Creating a link...",
+    "successTitle": "Workflow successfully published!",
+    "successDescription": "Anyone with this link can view and use this workflow. If you make changes to this workflow, you can republish to update the shared version.",
+    "hasChangesTitle": "Share workflow",
+    "hasChangesDescription": "You have made changes since this workflow was last published.",
+    "updateLinkButton": "Update link",
+    "updatingLink": "Updating link...",
+    "publishedOn": "Published on {date}",
+    "copyLink": "Copy",
+    "linkCopied": "Copied!",
+    "shareUrlLabel": "Share URL",
+    "loadFailed": "Failed to load shared workflow",
+    "saveFailedTitle": "Save failed",
+    "saveFailedDescription": "Failed to save workflow. Please try again.",
+    "mediaLabel": "{count} Media File | {count} Media Files",
+    "modelsLabel": "{count} Model | {count} Models",
+    "checkingAssets": "Checking media visibility…",
+    "acknowledgeCheckbox": "I understand these media items will be published and made public",
+    "inLibrary": "In library",
+    "comfyHubTitle": "Upload to ComfyHub",
+    "comfyHubDescription": "ComfyHub is ComfyUI's official community hub.\nYour workflow will have a public page viewable by all.",
+    "comfyHubButton": "Upload to ComfyHub"
+  },
+  "openSharedWorkflow": {
+    "dialogTitle": "Open shared workflow",
+    "author": "Author:",
+    "copyDescription": "Opening the workflow will create a new copy in your workspace",
+    "nonPublicAssetsWarningLine1": "This workflow comes with non-public assets.",
+    "nonPublicAssetsWarningLine2": "These will be imported to your library when you open the workflow",
+    "copyAssetsAndOpen": "Import assets & open workflow",
+    "openWorkflow": "Open workflow",
+    "openWithoutImporting": "Open without importing",
+    "importFailed": "Failed to import workflow assets",
+    "loadError": "Could not load this shared workflow. Please try again later."
+  },
+  "comfyHubPublish": {
+    "title": "Publish to ComfyHub",
+    "stepDescribe": "Describe your workflow",
+    "stepExamples": "Add output examples",
+    "stepFinish": "Finish publishing",
+    "workflowName": "Workflow name",
+    "workflowNamePlaceholder": "Tip: enter a descriptive name that's easy to search",
+    "workflowDescription": "Workflow description",
+    "workflowDescriptionPlaceholder": "What makes your workflow exciting and special? Be specific so people know what to expect.",
+    "workflowType": "Workflow type",
+    "workflowTypePlaceholder": "Select the type",
+    "workflowTypeImageGeneration": "Image generation",
+    "workflowTypeVideoGeneration": "Video generation",
+    "workflowTypeUpscaling": "Upscaling",
+    "workflowTypeEditing": "Editing",
+    "tags": "Tags",
+    "tagsDescription": "Select tags so people can find your workflow faster",
+    "tagsPlaceholder": "Enter tags that match your workflow to help people find it e.g #nanobanana, #anime or #faceswap",
+    "selectAThumbnail": "Select a thumbnail",
+    "showMoreTags": "Show more...",
+    "showLessTags": "Show less...",
+    "suggestedTags": "Suggested tags",
+    "thumbnailImage": "Image",
+    "thumbnailVideo": "Video",
+    "thumbnailImageComparison": "Image comparison",
+    "uploadThumbnail": "Upload an image",
+    "uploadVideo": "Upload a video",
+    "uploadComparison": "Upload before and after",
+    "thumbnailPreview": "Thumbnail preview",
+    "uploadPromptClickToBrowse": "Click to browse or",
+    "uploadPromptDropImage": "drop an image here",
+    "uploadPromptDropVideo": "drop a video here",
+    "uploadComparisonBeforePrompt": "Before",
+    "uploadComparisonAfterPrompt": "After",
+    "uploadThumbnailHint": "1:1 preferred, 1080p max",
+    "back": "Back",
+    "next": "Next",
+    "publishButton": "Publish to ComfyHub",
+    "examplesDescription": "Add up to {total} additional sample images",
+    "uploadAnImage": "Click to browse or drag an image",
+    "uploadExampleImage": "Upload example image",
+    "exampleImage": "Example image {index}",
+    "videoPreview": "Video thumbnail preview",
+    "maxExamples": "You can select up to {max} examples",
+    "createProfileToPublish": "Create a profile to publish to ComfyHub",
+    "createProfileCta": "Create a profile"
+  },
+  "comfyHubProfile": {
+    "checkingAccess": "Checking your publishing access...",
+    "profileCreationNav": "Profile creation",
+    "introTitle": "Publish to the ComfyHub",
+    "introDescription": "Publish your workflows, build your portfolio and get discovered by millions of users",
+    "introSubtitle": "To share your workflow on ComfyHub, let's first create your profile.",
+    "createProfileButton": "Create my profile",
+    "startPublishingButton": "Start publishing",
+    "modalTitle": "Create your profile on ComfyHub",
+    "createProfileTitle": "Create your Comfy Hub profile",
+    "uploadCover": "+ Upload a cover",
+    "uploadProfilePicture": "+ Upload a profile picture",
+    "chooseProfilePicture": "Choose a profile picture",
+    "nameLabel": "Your name",
+    "namePlaceholder": "Enter your name here",
+    "usernameLabel": "Your username (required)",
+    "usernamePlaceholder": "@",
+    "descriptionLabel": "Your description",
+    "descriptionPlaceholder": "Tell the community about yourself...",
+    "createProfile": "Create profile",
+    "creatingProfile": "Creating profile...",
+    "successTitle": "Looking good, {'@'}{username}!",
+    "successProfileUrl": "Your profile page is live at",
+    "successProfileLink": "comfy.com/p/{username}",
+    "successDescription": "You can now upload your workflow to your creator page",
+    "uploadWorkflowButton": "Upload my workflow"
   },
   "desktopDialogs": {
     "": {
@@ -2406,6 +3138,9 @@
       }
     }
   },
+  "vueNodesSlot": {
+    "iterative": "(Iterative)"
+  },
   "vueNodesBanner": {
     "title": "Introducing Nodes 2.0",
     "desc": "– More flexible workflows, powerful new widgets, built for extensibility",
@@ -2419,8 +3154,66 @@
     "message": "Switch back to Nodes 2.0 anytime from the main menu."
   },
   "linearMode": {
-    "share": "Share",
-    "openWorkflow": "Open Workflow"
+    "linearMode": "App Mode",
+    "beta": "App mode in beta",
+    "giveFeedback": "Give feedback",
+    "graphMode": "Graph Mode",
+    "dragAndDropImage": "Click to browse or drag an image",
+    "mobileControls": "Edit & Run",
+    "runCount": "Number of runs",
+    "rerun": "Rerun",
+    "reuseParameters": "Reuse Parameters",
+    "downloadAll": "Download {count} assets from this run",
+    "viewJob": "View Job",
+    "enterNodeGraph": "Enter node graph",
+    "emptyWorkflowExplanation": "Your workflow is empty. You need some nodes first to start building an app.",
+    "backToWorkflow": "Back to workflow",
+    "loadTemplate": "Load a template",
+    "cancelThisRun": "Cancel this run",
+    "welcome": {
+      "title": "App Mode",
+      "message": "A simplified view that hides the node graph so you can focus on creating.",
+      "controls": "Your outputs appear at the bottom, your controls are on the right. Everything else stays out of the way.",
+      "sharing": "Share your workflow as a simple tool anyone can use. Export it from the tab menu and when others open it, they'll see App Mode. No node graph knowledge needed.",
+      "getStarted": "Click {runButton} to get started.",
+      "buildApp": "Build app"
+    },
+    "appModeToolbar": {
+      "appBuilder": "App builder",
+      "apps": "Apps",
+      "appsEmptyMessage": "Saved apps will show up here.",
+      "appsEmptyMessageAction": "Click below to build your first app.",
+      "enterAppMode": "Enter app mode"
+    },
+    "arrange": {
+      "noOutputs": "No outputs added yet",
+      "switchToOutputs": "Switch to the 'Output' step and click on output nodes to add them here.",
+      "connectAtLeastOne": "Connect {atLeastOne} output node so users can see results after running.",
+      "atLeastOne": "at least one",
+      "outputExamples": "Examples: 'Save Image' or 'Save Video'",
+      "switchToOutputsButton": "Switch to Outputs",
+      "outputs": "Outputs",
+      "resultsLabel": "Results generated from the selected output node(s) will be shown here after running this app"
+    },
+    "builder": {
+      "title": "App builder mode",
+      "exit": "Exit builder",
+      "exitConfirmTitle": "Exit app builder?",
+      "exitConfirmMessage": "You have unsaved changes that will be lost\nExit without saving?",
+      "promptAddInputs": "Click on node parameters to add them here as inputs",
+      "noInputs": "No inputs added yet",
+      "inputsDesc": "Users will interact and adjust these to generate their outputs.",
+      "inputsExample": "Examples: “Load image”, “Text prompt”, “Steps”",
+      "promptAddOutputs": "Click on output nodes to add them here. These will be the generated results.",
+      "noOutputs": "No output nodes added yet",
+      "outputsDesc": "Connect at least one output node so users can see results after running.",
+      "outputsExample": "Examples: “Save Image” or “Save Video”",
+      "unknownWidget": "Widget not visible"
+    },
+    "queue": {
+      "clickToClear": "Click to clear queue",
+      "clear": "Clear queue"
+    }
   },
   "missingNodes": {
     "cloud": {
@@ -2437,11 +3230,39 @@
       "replacementInstruction": "Install these nodes to run this workflow, or replace them with installed alternatives. Missing nodes are highlighted in red on the canvas."
     }
   },
+  "nodeReplacement": {
+    "quickFixAvailable": "Quick Fix Available",
+    "installationRequired": "Installation Required",
+    "compatibleAlternatives": "Compatible Alternatives",
+    "replaceable": "Replaceable",
+    "replaced": "Replaced",
+    "notReplaceable": "Install Required",
+    "selectAll": "Select All",
+    "replaceSelected": "Replace Selected ({count})",
+    "replacedNode": "Replaced node: {nodeType}",
+    "replacedAllNodes": "Replaced {count} node type(s)",
+    "replaceFailed": "Failed to replace nodes",
+    "instructionMessage": "You must install these nodes or replace them with installed alternatives to run the workflow. Missing nodes are highlighted in {red} on the canvas. Some nodes cannot be swapped and must be installed via Node Manager.",
+    "redHighlight": "red",
+    "openNodeManager": "Open Node Manager",
+    "skipForNow": "Skip for Now",
+    "installMissingNodes": "Install Missing Nodes",
+    "replaceWarning": "This will permanently modify the workflow. Save a copy first if unsure.",
+    "swapNodesGuide": "The following nodes can be automatically replaced with compatible alternatives.",
+    "willBeReplacedBy": "This node will be replaced by:",
+    "replaceNode": "Replace Node",
+    "replaceAll": "Replace All",
+    "unknownNode": "Unknown",
+    "replaceAllWarning": "Replaces all available nodes in this group.",
+    "swapNodesTitle": "Swap Nodes"
+  },
   "rightSidePanel": {
     "togglePanel": "Toggle properties panel",
     "noSelection": "Select a node to see its properties and info.",
-    "title": "No node(s) selected | 1 node selected | {count} nodes selected",
+    "workflowOverview": "Workflow Overview",
+    "title": "No item(s) selected | 1 item selected | {count} items selected",
     "parameters": "Parameters",
+    "nodes": "Nodes",
     "info": "Info",
     "color": "Node color",
     "pinned": "Pinned",
@@ -2451,12 +3272,259 @@
     "inputs": "INPUTS",
     "inputsNone": "NO INPUTS",
     "inputsNoneTooltip": "Node has no inputs",
+    "advancedInputs": "ADVANCED INPUTS",
+    "showAdvancedInputsButton": "Show advanced inputs",
     "properties": "Properties",
     "nodeState": "Node state",
-    "settings": "Settings"
+    "settings": "Settings",
+    "addFavorite": "Favorite",
+    "removeFavorite": "Unfavorite",
+    "hideInput": "Hide input",
+    "showInput": "Show input",
+    "locateNode": "Locate node on canvas",
+    "favorites": "FAVORITED INPUTS",
+    "favoritesNone": "NO FAVORITED INPUTS",
+    "favoritesNoneTooltip": "Star widgets to quickly access them without selecting nodes",
+    "globalSettings": {
+      "title": "Global Settings",
+      "searchPlaceholder": "Search quick settings...",
+      "nodes": "NODES",
+      "canvas": "CANVAS",
+      "connectionLinks": "CONNECTION LINKS",
+      "showAdvanced": "Show advanced parameters",
+      "showAdvancedTooltip": "This is an important setting that when set to TRUE, reveals all advanced parameters for nodes",
+      "showInfoBadges": "Show info badges",
+      "showToolbox": "Show toolbox on selection",
+      "nodes2": "Nodes 2.0",
+      "gridSpacing": "Grid spacing",
+      "snapNodesToGrid": "Snap nodes to grid",
+      "linkShape": "Link shape",
+      "showConnectedLinks": "Show connected links",
+      "viewAllSettings": "View all settings"
+    },
+    "groupSettings": "Group Settings",
+    "groups": "Groups",
+    "favoritesNoneDesc": "Inputs you favorite will show up here",
+    "favoritesNoneHint": "In the Parameters tab, click {moreIcon} on any input to add it here",
+    "noneSearchDesc": "No items match your search",
+    "nodesNoneDesc": "NO NODES",
+    "fallbackGroupTitle": "Group",
+    "fallbackNodeTitle": "Node",
+    "hideAdvancedInputsButton": "Hide advanced inputs",
+    "errors": "Errors",
+    "noErrors": "No errors",
+    "executionErrorOccurred": "An error occurred during execution. Check the Errors tab for details.",
+    "enterSubgraph": "Enter subgraph",
+    "seeError": "See Error",
+    "promptErrors": {
+      "prompt_no_outputs": {
+        "desc": "The workflow does not contain any output nodes (e.g. Save Image, Preview Image) to produce a result."
+      },
+      "no_prompt": {
+        "desc": "The workflow data sent to the server is empty. This may be an unexpected system error."
+      },
+      "server_error_local": {
+        "desc": "The server encountered an unexpected error. Please check the server logs."
+      },
+      "server_error_cloud": {
+        "desc": "The server encountered an unexpected error. Please try again later."
+      }
+    },
+    "errorHelp": "For more help, {github} or {support}",
+    "errorHelpGithub": "submit a GitHub issue",
+    "errorHelpSupport": "contact our support",
+    "resetToDefault": "Reset to default",
+    "resetAllParameters": "Reset all parameters",
+    "missingNodePacks": {
+      "title": "Missing Node Packs",
+      "unsupportedTitle": "Unsupported Node Packs",
+      "cloudMessage": "This workflow requires custom nodes not yet available on Comfy Cloud.",
+      "ossMessage": "This workflow uses custom nodes you haven't installed yet.",
+      "ossManagerDisabledHint": "To install missing nodes, first run {pipCmd} in your Python environment to install Node Manager, then restart ComfyUI with the {flag} flag.",
+      "installAll": "Install All",
+      "installNodePack": "Install node pack",
+      "unknownPack": "Unknown pack",
+      "installing": "Installing...",
+      "installed": "Installed",
+      "applyChanges": "Apply Changes",
+      "searchInManager": "Search in Node Manager",
+      "viewInManager": "View in Manager",
+      "collapse": "Collapse",
+      "expand": "Expand"
+    }
+  },
+  "errorOverlay": {
+    "errorCount": "{count} ERROR | {count} ERRORS",
+    "seeErrors": "See Errors"
   },
   "help": {
     "recentReleases": "Recent releases",
     "helpCenterMenu": "Help Center Menu"
+  },
+  "progressToast": {
+    "importingModels": "Importing Models",
+    "downloadingModel": "Downloading model...",
+    "downloadsFailed": "{count} download failed | {count} downloads failed",
+    "allDownloadsCompleted": "All downloads completed",
+    "noImportsInQueue": "No {filter} in queue",
+    "failed": "Failed",
+    "finished": "Finished",
+    "pending": "Pending",
+    "progressCount": "{completed} of {total}",
+    "filter": {
+      "all": "All",
+      "completed": "Completed",
+      "failed": "Failed"
+    }
+  },
+  "exportToast": {
+    "exportingAssets": "Exporting Assets",
+    "preparingExport": "Preparing export...",
+    "exportError": "Export failed",
+    "exportFailed": "{count} export failed | {count} exports failed",
+    "allExportsCompleted": "All exports completed",
+    "noExportsInQueue": "No {filter} exports in queue",
+    "exportStarted": "Preparing ZIP download...",
+    "exportCompleted": "ZIP download ready",
+    "exportFailedSingle": "Failed to create ZIP export",
+    "downloadExport": "Download export",
+    "downloadFailed": "Failed to download \"{name}\"",
+    "retryDownload": "Retry download"
+  },
+  "workspace": {
+    "unsavedChanges": {
+      "title": "Unsaved Changes",
+      "message": "You have unsaved changes. Do you want to discard them and switch workspaces?"
+    },
+    "inviteAccepted": "Invite Accepted",
+    "addedToWorkspace": "You have been added to:",
+    "inviteFailed": "Failed to Accept Invite",
+    "viewWorkspace": "View workspace"
+  },
+  "workspaceAuth": {
+    "errors": {
+      "notAuthenticated": "You must be logged in to access workspaces",
+      "invalidFirebaseToken": "Authentication failed. Please try logging in again.",
+      "accessDenied": "You do not have access to this workspace",
+      "workspaceNotFound": "Workspace not found",
+      "tokenExchangeFailed": "Failed to authenticate with workspace: {error}"
+    }
+  },
+  "nightly": {
+    "badge": {
+      "label": "Preview Version",
+      "tooltip": "You are using a nightly version of ComfyUI. Please use the feedback button to share your thoughts about these features."
+    }
+  },
+  "nodeFilters": {
+    "hideDeprecated": "Hide Deprecated Nodes",
+    "hideDeprecatedDescription": "Hides nodes marked as deprecated unless explicitly enabled",
+    "hideExperimental": "Hide Experimental Nodes",
+    "hideExperimentalDescription": "Hides nodes marked as experimental unless explicitly enabled",
+    "hideDevOnly": "Hide Dev-Only Nodes",
+    "hideDevOnlyDescription": "Hides nodes marked as dev-only unless dev mode is enabled",
+    "hideSubgraph": "Hide Subgraph Nodes",
+    "hideSubgraphDescription": "Temporarily hides subgraph nodes from node library and search"
+  },
+  "secrets": {
+    "title": "API Keys & Secrets",
+    "description": "Secrets are encrypted and used for sensitive data like API keys.",
+    "descriptionUsage": "Store your tokens here to enable downloading private and gated models from supported providers.",
+    "modelProviders": "Model Providers",
+    "addSecret": "Add Secret",
+    "editSecret": "Edit Secret",
+    "noSecrets": "No secrets stored. Add your first API key to get started.",
+    "name": "Name",
+    "namePlaceholder": "e.g., My API Key",
+    "provider": "Provider",
+    "providerHint": "Optional. Selecting a provider enables automatic token usage.",
+    "secretValue": "Secret Value",
+    "secretValuePlaceholder": "Enter your API key",
+    "secretValuePlaceholderEdit": "Enter new value to change",
+    "secretValueHint": "This value will be encrypted and cannot be viewed again.",
+    "secretValueHintEdit": "Leave blank to keep the current value.",
+    "createdAt": "Created {date}",
+    "lastUsed": "Last used {date}",
+    "deleteConfirmTitle": "Delete Secret",
+    "deleteConfirmMessage": "Are you sure you want to delete \"{name}\"? This action cannot be undone.",
+    "errors": {
+      "nameRequired": "Name is required",
+      "nameTooLong": "Name must be 255 characters or less",
+      "providerRequired": "Provider is required",
+      "secretValueRequired": "Secret value is required",
+      "duplicateName": "A secret with this name already exists",
+      "duplicateProvider": "A secret for this provider already exists"
+    }
+  },
+  "essentials": {
+    "loadImage": "Load Image",
+    "saveImage": "Save Image",
+    "loadVideo": "Load Video",
+    "saveVideo": "Save Video",
+    "load3DModel": "Load 3D model",
+    "save3DModel": "Save 3D Model",
+    "text": "Text",
+    "batchImage": "Batch Image",
+    "cropImage": "Crop Image",
+    "resizeImage": "Resize Image",
+    "rotate": "Rotate",
+    "invert": "Invert",
+    "canny": "Canny",
+    "removeBackground": "Remove Background",
+    "imageCompare": "Image compare",
+    "extractFrame": "Extract frame",
+    "loadStyleLora": "Load style (LoRA)",
+    "lipsync": "Lipsync",
+    "textGenerationLLM": "Text generation (LLM)",
+    "textTo3DModel": "Text to 3D model",
+    "imageTo3DModel": "Image to 3D Model",
+    "musicGeneration": "Music generation",
+    "loadAudio": "Load Audio",
+    "saveAudio": "Save Audio",
+    "inpaintImage": "Inpaint image",
+    "outpaintImage": "Outpaint image",
+    "imageToImage": "Image to image",
+    "textToImage": "Text to image",
+    "poseToImage": "Pose to image",
+    "cannyToImage": "Canny to image",
+    "depthToImage": "Depth to image",
+    "textToVideo": "Text to video",
+    "imageToVideo": "Image to video",
+    "poseToVideo": "Pose to video",
+    "cannyToVideo": "Canny to video",
+    "depthToVideo": "Depth to video"
+  },
+  "builderToolbar": {
+    "label": "App Builder",
+    "inputs": "Inputs",
+    "outputs": "Outputs",
+    "inputsDescription": "Choose inputs",
+    "outputsDescription": "Choose outputs",
+    "arrange": "Preview",
+    "arrangeDescription": "Review app layout",
+    "defaultView": "Set a default view",
+    "defaultViewDescription": "Choose how this opens",
+    "connectOutput": "Connect an output",
+    "connectOutputBody1": "Your app needs at least one output to be connected before it can be saved.",
+    "connectOutputBody2": "Switch to the 'Output' step and click on output nodes to add them here.",
+    "switchToOutputs": "Switch to Outputs",
+    "defaultViewTitle": "Set the default view for this workflow",
+    "defaultViewLabel": "By default, this workflow will open as:",
+    "app": "App",
+    "appDescription": "Opens as an app by default",
+    "nodeGraph": "Node graph",
+    "nodeGraphDescription": "Opens as node graph by default",
+    "defaultModeAppliedTitle": "Successfully set",
+    "defaultModeAppliedAppBody": "This workflow will open in App Mode by default from now on.",
+    "defaultModeAppliedAppPrompt": "Would you like to view it now?",
+    "defaultModeAppliedGraphBody": "This workflow will open as a node graph by default from now on.",
+    "defaultModeAppliedGraphPrompt": "Would you like to view the app still?",
+    "viewApp": "View app",
+    "emptyWorkflowTitle": "This workflow has no nodes",
+    "emptyWorkflowPrompt": "Do you want to start with a template?"
+  },
+  "builderMenu": {
+    "enterAppMode": "Enter app mode",
+    "exitAppBuilder": "Exit app builder"
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/en/nodeDefs.json b/src/locales/en/nodeDefs.json
index 6e098793a7..1fabb425ad 100644
--- a/src/locales/en/nodeDefs.json
+++ b/src/locales/en/nodeDefs.json
@@ -208,6 +208,47 @@
       }
     }
   },
+  "AudioEqualizer3Band": {
+    "display_name": "Audio Equalizer (3-Band)",
+    "inputs": {
+      "audio": {
+        "name": "audio"
+      },
+      "low_gain_dB": {
+        "name": "low_gain_dB",
+        "tooltip": "Gain for Low frequencies (Bass)"
+      },
+      "low_freq": {
+        "name": "low_freq",
+        "tooltip": "Cutoff frequency for Low shelf"
+      },
+      "mid_gain_dB": {
+        "name": "mid_gain_dB",
+        "tooltip": "Gain for Mid frequencies"
+      },
+      "mid_freq": {
+        "name": "mid_freq",
+        "tooltip": "Center frequency for Mids"
+      },
+      "mid_q": {
+        "name": "mid_q",
+        "tooltip": "Q factor (bandwidth) for Mids"
+      },
+      "high_gain_dB": {
+        "name": "high_gain_dB",
+        "tooltip": "Gain for High frequencies (Treble)"
+      },
+      "high_freq": {
+        "name": "high_freq",
+        "tooltip": "Cutoff frequency for High shelf"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "AudioMerge": {
     "display_name": "Audio Merge",
     "description": "Combine two audio tracks by overlaying their waveforms.",
@@ -328,6 +369,109 @@
       }
     }
   },
+  "BriaImageEditNode": {
+    "display_name": "Bria FIBO Image Edit",
+    "description": "Edit images using Bria latest model",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "image": {
+        "name": "image"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Instruction to edit image"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt"
+      },
+      "structured_prompt": {
+        "name": "structured_prompt",
+        "tooltip": "A string containing the structured edit prompt in JSON format. Use this instead of usual prompt for precise, programmatic control."
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "guidance_scale": {
+        "name": "guidance_scale",
+        "tooltip": "Higher value makes the image follow the prompt more closely."
+      },
+      "steps": {
+        "name": "steps"
+      },
+      "moderation": {
+        "name": "moderation",
+        "tooltip": "Moderation settings"
+      },
+      "mask": {
+        "name": "mask",
+        "tooltip": "If omitted, the edit applies to the entire image."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "structured_prompt",
+        "tooltip": null
+      }
+    }
+  },
+  "BriaRemoveImageBackground": {
+    "display_name": "Bria Remove Image Background",
+    "description": "Remove the background from an image using Bria RMBG 2.0.",
+    "inputs": {
+      "image": {
+        "name": "image"
+      },
+      "moderation": {
+        "name": "moderation",
+        "tooltip": "Moderation settings"
+      },
+      "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"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BriaRemoveVideoBackground": {
+    "display_name": "Bria Remove Video Background",
+    "description": "Remove the background from a video using Bria. ",
+    "inputs": {
+      "video": {
+        "name": "video"
+      },
+      "background_color": {
+        "name": "background_color",
+        "tooltip": "Background color for the output video."
+      },
+      "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"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ByteDanceFirstLastFrameNode": {
     "display_name": "ByteDance First-Last-Frame to Video",
     "description": "Generate video using prompt and first and last frames.",
@@ -371,42 +515,9 @@
         "name": "watermark",
         "tooltip": "Whether to add an \"AI generated\" watermark to the video."
       },
-      "control_after_generate": {
-        "name": "control after generate"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "ByteDanceImageEditNode": {
-    "display_name": "ByteDance Image Edit",
-    "description": "Edit images using ByteDance models via api based on prompt",
-    "inputs": {
-      "model": {
-        "name": "model"
-      },
-      "image": {
-        "name": "image",
-        "tooltip": "The base image to edit"
-      },
-      "prompt": {
-        "name": "prompt",
-        "tooltip": "Instruction to edit image"
-      },
-      "seed": {
-        "name": "seed",
-        "tooltip": "Seed to use for generation"
-      },
-      "guidance_scale": {
-        "name": "guidance_scale",
-        "tooltip": "Higher value makes the image follow the prompt more closely"
-      },
-      "watermark": {
-        "name": "watermark",
-        "tooltip": "Whether to add an \"AI generated\" watermark to the image"
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "This parameter is ignored for any model except seedance-1-5-pro."
       },
       "control_after_generate": {
         "name": "control after generate"
@@ -547,6 +658,10 @@
         "name": "watermark",
         "tooltip": "Whether to add an \"AI generated\" watermark to the video."
       },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "This parameter is ignored for any model except seedance-1-5-pro."
+      },
       "control_after_generate": {
         "name": "control after generate"
       }
@@ -558,12 +673,11 @@
     }
   },
   "ByteDanceSeedreamNode": {
-    "display_name": "ByteDance Seedream 4.5",
+    "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": {
       "model": {
-        "name": "model",
-        "tooltip": "Model name"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
@@ -575,7 +689,7 @@
       },
       "image": {
         "name": "image",
-        "tooltip": "Input image(s) for image-to-image generation. List of 1-10 images for single or multi-reference generation."
+        "tooltip": "Input image(s) for image-to-image generation. Reference image(s) for single or multi-reference generation."
       },
       "width": {
         "name": "width",
@@ -650,6 +764,10 @@
         "name": "watermark",
         "tooltip": "Whether to add an \"AI generated\" watermark to the video."
       },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "This parameter is ignored for any model except seedance-1-5-pro."
+      },
       "control_after_generate": {
         "name": "control after generate"
       }
@@ -1229,6 +1347,21 @@
       }
     }
   },
+  "ColorToRGBInt": {
+    "display_name": "Color to RGB Int",
+    "description": "Convert a color to a RGB integer value.",
+    "inputs": {
+      "color": {
+        "name": "color"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "rgb_int",
+        "tooltip": null
+      }
+    }
+  },
   "CombineHooks2": {
     "display_name": "Combine Hooks [2]",
     "inputs": {
@@ -1968,6 +2101,20 @@
       }
     }
   },
+  "CreateList": {
+    "display_name": "Create List",
+    "inputs": {
+      "inputs": {
+        "name": "inputs"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "list",
+        "tooltip": null
+      }
+    }
+  },
   "CreateVideo": {
     "display_name": "Create Video",
     "description": "Create a video from images.",
@@ -1990,6 +2137,35 @@
       }
     }
   },
+  "CropByBBoxes": {
+    "display_name": "CropByBBoxes",
+    "description": "Crop and resize regions from the input image batch based on provided bounding boxes.",
+    "inputs": {
+      "image": {
+        "name": "image"
+      },
+      "bboxes": {
+        "name": "bboxes"
+      },
+      "output_width": {
+        "name": "output_width",
+        "tooltip": "Width each crop is resized to."
+      },
+      "output_height": {
+        "name": "output_height",
+        "tooltip": "Height each crop is resized to."
+      },
+      "padding": {
+        "name": "padding",
+        "tooltip": "Extra padding in pixels added on each side of the bbox before cropping."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "All crops stacked into a single image batch."
+      }
+    }
+  },
   "CropMask": {
     "display_name": "CropMask",
     "inputs": {
@@ -2021,11 +2197,16 @@
       "choice": {
         "name": "choice"
       },
-      "option0": {}
+      "index": {},
+      "option1": {}
     },
     "outputs": {
       "0": {
         "tooltip": null
+      },
+      "1": {
+        "name": "INDEX",
+        "tooltip": null
       }
     }
   },
@@ -2152,8 +2333,323 @@
       }
     }
   },
+  "ElevenLabsAudioIsolation": {
+    "display_name": "ElevenLabs Voice Isolation",
+    "description": "Remove background noise from audio, isolating vocals or speech.",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "Audio to process for background noise removal."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsInstantVoiceClone": {
+    "display_name": "ElevenLabs Instant Voice Clone",
+    "description": "Create a cloned voice from audio samples. Provide 1-8 audio recordings of the voice to clone.",
+    "inputs": {
+      "files": {
+        "name": "files",
+        "tooltip": "Audio recordings for voice cloning."
+      },
+      "remove_background_noise": {
+        "name": "remove_background_noise",
+        "tooltip": "Remove background noise from voice samples using audio isolation."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "voice",
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsSpeechToSpeech": {
+    "display_name": "ElevenLabs Speech to Speech",
+    "description": "Transform speech from one voice to another while preserving the original content and emotion.",
+    "inputs": {
+      "voice": {
+        "name": "voice",
+        "tooltip": "Target voice for the transformation. Connect from Voice Selector or Instant Voice Clone."
+      },
+      "audio": {
+        "name": "audio",
+        "tooltip": "Source audio to transform."
+      },
+      "stability": {
+        "name": "stability",
+        "tooltip": "Voice stability. Lower values give broader emotional range, higher values produce more consistent but potentially monotonous speech."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Model to use for speech-to-speech transformation."
+      },
+      "output_format": {
+        "name": "output_format",
+        "tooltip": "Audio output format."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed for reproducibility."
+      },
+      "remove_background_noise": {
+        "name": "remove_background_noise",
+        "tooltip": "Remove background noise from input audio using audio isolation."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model_similarity_boost": {
+        "name": "similarity_boost"
+      },
+      "model_speed": {
+        "name": "speed"
+      },
+      "model_style": {
+        "name": "style"
+      },
+      "model_use_speaker_boost": {
+        "name": "use_speaker_boost"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsSpeechToText": {
+    "display_name": "ElevenLabs Speech to Text",
+    "description": "Transcribe audio to text. Supports automatic language detection, speaker diarization, and audio event tagging.",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "Audio to transcribe."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Model to use for transcription."
+      },
+      "language_code": {
+        "name": "language_code",
+        "tooltip": "ISO-639-1 or ISO-639-3 language code (e.g., 'en', 'es', 'fra'). Leave empty for automatic detection."
+      },
+      "num_speakers": {
+        "name": "num_speakers",
+        "tooltip": "Maximum number of speakers to predict. Set to 0 for automatic detection."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed for reproducibility (determinism not guaranteed)."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model_diarization_threshold": {
+        "name": "diarization_threshold"
+      },
+      "model_diarize": {
+        "name": "diarize"
+      },
+      "model_tag_audio_events": {
+        "name": "tag_audio_events"
+      },
+      "model_temperature": {
+        "name": "temperature"
+      },
+      "model_timestamps_granularity": {
+        "name": "timestamps_granularity"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "text",
+        "tooltip": null
+      },
+      "1": {
+        "name": "language_code",
+        "tooltip": null
+      },
+      "2": {
+        "name": "words_json",
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToDialogue": {
+    "display_name": "ElevenLabs Text to Dialogue",
+    "description": "Generate multi-speaker dialogue from text. Each dialogue entry has its own text and voice.",
+    "inputs": {
+      "stability": {
+        "name": "stability",
+        "tooltip": "Voice stability. Lower values give broader emotional range, higher values produce more consistent but potentially monotonous speech."
+      },
+      "apply_text_normalization": {
+        "name": "apply_text_normalization",
+        "tooltip": "Text normalization mode. 'auto' lets the system decide, 'on' always applies normalization, 'off' skips it."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Model to use for dialogue generation."
+      },
+      "inputs": {
+        "name": "inputs",
+        "tooltip": "Number of dialogue entries."
+      },
+      "language_code": {
+        "name": "language_code",
+        "tooltip": "ISO-639-1 or ISO-639-3 language code (e.g., 'en', 'es', 'fra'). Leave empty for automatic detection."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed for reproducibility."
+      },
+      "output_format": {
+        "name": "output_format",
+        "tooltip": "Audio output format."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "inputs_text1": {
+        "name": "text1"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToSoundEffects": {
+    "display_name": "ElevenLabs Text to Sound Effects",
+    "description": "Generate sound effects from text descriptions.",
+    "inputs": {
+      "text": {
+        "name": "text",
+        "tooltip": "Text description of the sound effect to generate."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Model to use for sound effect generation."
+      },
+      "output_format": {
+        "name": "output_format",
+        "tooltip": "Audio output format."
+      },
+      "model_duration": {
+        "name": "duration"
+      },
+      "model_loop": {
+        "name": "loop"
+      },
+      "model_prompt_influence": {
+        "name": "prompt_influence"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToSpeech": {
+    "display_name": "ElevenLabs Text to Speech",
+    "description": "Convert text to speech.",
+    "inputs": {
+      "voice": {
+        "name": "voice",
+        "tooltip": "Voice to use for speech synthesis. Connect from Voice Selector or Instant Voice Clone."
+      },
+      "text": {
+        "name": "text",
+        "tooltip": "The text to convert to speech."
+      },
+      "stability": {
+        "name": "stability",
+        "tooltip": "Voice stability. Lower values give broader emotional range, higher values produce more consistent but potentially monotonous speech."
+      },
+      "apply_text_normalization": {
+        "name": "apply_text_normalization",
+        "tooltip": "Text normalization mode. 'auto' lets the system decide, 'on' always applies normalization, 'off' skips it."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Model to use for text-to-speech."
+      },
+      "language_code": {
+        "name": "language_code",
+        "tooltip": "ISO-639-1 or ISO-639-3 language code (e.g., 'en', 'es', 'fra'). Leave empty for automatic detection."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed for reproducibility (determinism not guaranteed)."
+      },
+      "output_format": {
+        "name": "output_format",
+        "tooltip": "Audio output format."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model_similarity_boost": {
+        "name": "similarity_boost"
+      },
+      "model_speed": {
+        "name": "speed"
+      },
+      "model_style": {
+        "name": "style"
+      },
+      "model_use_speaker_boost": {
+        "name": "use_speaker_boost"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsVoiceSelector": {
+    "display_name": "ElevenLabs Voice Selector",
+    "description": "Select a predefined ElevenLabs voice for text-to-speech generation.",
+    "inputs": {
+      "voice": {
+        "name": "voice",
+        "tooltip": "Choose a voice from the predefined ElevenLabs voices."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "voice",
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyAceStep1_5LatentAudio": {
+    "display_name": "Empty Ace Step 1.5 Latent Audio",
+    "inputs": {
+      "seconds": {
+        "name": "seconds"
+      },
+      "batch_size": {
+        "name": "batch_size",
+        "tooltip": "The number of latent images in the batch."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyAceStepLatentAudio": {
-    "display_name": "EmptyAceStepLatentAudio",
+    "display_name": "Empty Ace Step 1.0 Latent Audio",
     "inputs": {
       "seconds": {
         "name": "seconds"
@@ -3134,6 +3630,60 @@
       }
     }
   },
+  "GeminiNanoBanana2": {
+    "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."
+      },
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "If set to 'auto', matches your input image's aspect ratio; if no image is provided, a 16:9 square is usually generated."
+      },
+      "resolution": {
+        "name": "resolution",
+        "tooltip": "Target output resolution. For 2K/4K the native Gemini upscaler is used."
+      },
+      "response_modalities": {
+        "name": "response_modalities"
+      },
+      "thinking_level": {
+        "name": "thinking_level"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Optional reference image(s). To include multiple images, use the Batch Images node (up to 14)."
+      },
+      "files": {
+        "name": "files",
+        "tooltip": "Optional file(s) to use as context for the model. Accepts inputs from the Gemini Generate Content Input Files node."
+      },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "Foundational instructions that dictate an AI's behavior."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "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.",
@@ -3349,6 +3899,193 @@
       }
     }
   },
+  "GLSLShader": {
+    "display_name": "GLSL Shader",
+    "description": "Apply GLSL ES fragment shaders to images. u_resolution (vec2) is always available.",
+    "inputs": {
+      "fragment_shader": {
+        "name": "fragment_shader",
+        "tooltip": "GLSL fragment shader source code (GLSL ES 3.00 / WebGL 2.0 compatible)"
+      },
+      "size_mode": {
+        "name": "size_mode",
+        "tooltip": "Output size: 'from_input' uses first input image dimensions, 'custom' allows manual size"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Images are available as u_image0-4 (sampler2D) in the shader code"
+      },
+      "floats": {
+        "name": "floats",
+        "tooltip": "Floats are available as u_float0-4 in the shader code"
+      },
+      "ints": {
+        "name": "ints",
+        "tooltip": "Ints are available as u_int0-4 in the shader code"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "IMAGE0",
+        "tooltip": "Available via layout(location = 0) out vec4 fragColor0 in the shader code"
+      },
+      "1": {
+        "name": "IMAGE1",
+        "tooltip": "Available via layout(location = 1) out vec4 fragColor1 in the shader code"
+      },
+      "2": {
+        "name": "IMAGE2",
+        "tooltip": "Available via layout(location = 2) out vec4 fragColor2 in the shader code"
+      },
+      "3": {
+        "name": "IMAGE3",
+        "tooltip": "Available via layout(location = 3) out vec4 fragColor3 in the shader code"
+      }
+    }
+  },
+  "GrokImageEditNode": {
+    "display_name": "Grok Image Edit",
+    "description": "Modify an existing image based on a text prompt",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "image": {
+        "name": "image"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "The text prompt used to generate the image"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "number_of_images": {
+        "name": "number_of_images",
+        "tooltip": "Number of edited images to generate"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed to determine if node should re-run; actual results are nondeterministic regardless of seed."
+      },
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "Only allowed when multiple images are connected to the image input."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokImageNode": {
+    "display_name": "Grok Image",
+    "description": "Generate images using Grok based on a text prompt",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "The text prompt used to generate the image"
+      },
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "number_of_images": {
+        "name": "number_of_images",
+        "tooltip": "Number of images to generate"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed to determine if node should re-run; actual results are nondeterministic regardless of seed."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokVideoEditNode": {
+    "display_name": "Grok Video Edit",
+    "description": "Edit an existing video based on a text prompt.",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Text description of the desired video."
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "Maximum supported duration is 8.7 seconds and 50MB file size."
+      },
+      "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"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokVideoNode": {
+    "display_name": "Grok Video",
+    "description": "Generate video from a prompt or an image",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Text description of the desired video."
+      },
+      "resolution": {
+        "name": "resolution",
+        "tooltip": "The resolution of the output video."
+      },
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "The aspect ratio of the output video."
+      },
+      "duration": {
+        "name": "duration",
+        "tooltip": "The duration of the output video in seconds."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed to determine if node should re-run; actual results are nondeterministic regardless of seed."
+      },
+      "image": {
+        "name": "image"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "GrowMask": {
     "display_name": "Grow Mask",
     "inputs": {
@@ -3368,6 +4105,50 @@
       }
     }
   },
+  "HitPawGeneralImageEnhance": {
+    "display_name": "HitPaw General Image Enhance",
+    "description": "Upscale low-resolution images to super-resolution, eliminate artifacts and noise. Maximum output: 32 megapixels.",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "image": {
+        "name": "image"
+      },
+      "upscale_factor": {
+        "name": "upscale_factor"
+      },
+      "auto_downscale": {
+        "name": "auto_downscale",
+        "tooltip": "Automatically downscale input image if output would exceed the limit."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HitPawVideoEnhance": {
+    "display_name": "HitPaw Video Enhance",
+    "description": "Upscale low-resolution videos to high resolution, eliminate artifacts and noise. Prices shown are per second of video.",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "video": {
+        "name": "video"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "Hunyuan3Dv2Conditioning": {
     "display_name": "Hunyuan3Dv2Conditioning",
     "inputs": {
@@ -3820,7 +4601,7 @@
     }
   },
   "ImageBlend": {
-    "display_name": "ImageBlend",
+    "display_name": "Image Blend",
     "inputs": {
       "image1": {
         "name": "image1"
@@ -3842,7 +4623,7 @@
     }
   },
   "ImageBlur": {
-    "display_name": "ImageBlur",
+    "display_name": "Image Blur",
     "inputs": {
       "image": {
         "name": "image"
@@ -3876,6 +4657,21 @@
       }
     }
   },
+  "ImageCompare": {
+    "display_name": "Image Compare",
+    "description": "Compares two images side by side with a slider.",
+    "inputs": {
+      "compare_view": {
+        "name": "compare_view"
+      },
+      "image_a": {
+        "name": "image_a"
+      },
+      "image_b": {
+        "name": "image_b"
+      }
+    }
+  },
   "ImageCompositeMasked": {
     "display_name": "ImageCompositeMasked",
     "inputs": {
@@ -3905,7 +4701,7 @@
     }
   },
   "ImageCrop": {
-    "display_name": "Image Crop",
+    "display_name": "Image Crop (Deprecated)",
     "inputs": {
       "image": {
         "name": "image"
@@ -3929,6 +4725,26 @@
       }
     }
   },
+  "ImageCropV2": {
+    "display_name": "Image Crop",
+    "inputs": {
+      "image": {
+        "name": "image"
+      },
+      "crop_region": {
+        "name": "crop_region"
+      },
+      "height": {},
+      "width": {},
+      "x": {},
+      "y": {}
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ImageDeduplication": {
     "display_name": "Image Deduplication",
     "inputs": {
@@ -4022,6 +4838,28 @@
       }
     }
   },
+  "ImageMergeTileList": {
+    "display_name": "Merge List of Tiles to Image",
+    "inputs": {
+      "image_list": {
+        "name": "image_list"
+      },
+      "final_width": {
+        "name": "final_width"
+      },
+      "final_height": {
+        "name": "final_height"
+      },
+      "overlap": {
+        "name": "overlap"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ImageOnlyCheckpointLoader": {
     "display_name": "Image Only Checkpoint Loader (img2vid model)",
     "inputs": {
@@ -4112,7 +4950,7 @@
     }
   },
   "ImageRotate": {
-    "display_name": "ImageRotate",
+    "display_name": "Image Rotate",
     "inputs": {
       "image": {
         "name": "image"
@@ -4383,6 +5221,24 @@
       }
     }
   },
+  "JoinAudioChannels": {
+    "display_name": "Join Audio Channels",
+    "description": "Joins left and right mono audio channels into a stereo audio.",
+    "inputs": {
+      "audio_left": {
+        "name": "audio_left"
+      },
+      "audio_right": {
+        "name": "audio_right"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "audio",
+        "tooltip": null
+      }
+    }
+  },
   "JoinImageWithAlpha": {
     "display_name": "Join Image with Alpha",
     "inputs": {
@@ -4468,6 +5324,39 @@
       }
     }
   },
+  "KlingAvatarNode": {
+    "display_name": "Kling Avatar 2.0",
+    "description": "Generate broadcast-style digital human videos from a single photo and an audio file.",
+    "inputs": {
+      "image": {
+        "name": "image",
+        "tooltip": "Avatar reference image. Width and height must be at least 300px. Aspect ratio must be between 1:2.5 and 2.5:1."
+      },
+      "sound_file": {
+        "name": "sound_file",
+        "tooltip": "Audio input. Must be between 2 and 300 seconds in duration."
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed controls whether the node should re-run; results are non-deterministic regardless of seed."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Optional prompt to define avatar actions, emotions, and camera movements."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingCameraControlI2VNode": {
     "display_name": "Kling Image to Video (Camera Control)",
     "description": "Transform still images into cinematic videos with professional camera movements that simulate real-world cinematography. Control virtual camera actions including zoom, rotation, pan, tilt, and first-person view, while maintaining focus on your original image.",
@@ -4620,6 +5509,46 @@
       }
     }
   },
+  "KlingFirstLastFrameNode": {
+    "display_name": "Kling 3.0 First-Last-Frame to Video",
+    "description": "Generate videos with Kling V3 using first and last frames.",
+    "inputs": {
+      "prompt": {
+        "name": "prompt"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "first_frame": {
+        "name": "first_frame"
+      },
+      "end_frame": {
+        "name": "end_frame"
+      },
+      "generate_audio": {
+        "name": "generate_audio"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Model and generation settings."
+      },
+      "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_resolution": {
+        "name": "resolution"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingImage2VideoNode": {
     "display_name": "Kling Image(First Frame) to Video",
     "inputs": {
@@ -4666,7 +5595,7 @@
     }
   },
   "KlingImageGenerationNode": {
-    "display_name": "Kling Image Generation",
+    "display_name": "Kling 3.0 Image",
     "description": "Kling Image Generation Node. Generate an image from a text prompt with an optional reference image.",
     "inputs": {
       "prompt": {
@@ -4700,6 +5629,13 @@
       },
       "image": {
         "name": "image"
+      },
+      "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"
       }
     },
     "outputs": {
@@ -4709,7 +5645,7 @@
     }
   },
   "KlingImageToVideoWithAudio": {
-    "display_name": "Kling Image(First Frame) to Video with Audio",
+    "display_name": "Kling 2.6 Image(First Frame) to Video with Audio",
     "inputs": {
       "model_name": {
         "name": "model_name"
@@ -4820,6 +5756,9 @@
       },
       "mode": {
         "name": "mode"
+      },
+      "model": {
+        "name": "model"
       }
     },
     "outputs": {
@@ -4829,7 +5768,7 @@
     }
   },
   "KlingOmniProEditVideoNode": {
-    "display_name": "Kling Omni Edit Video (Pro)",
+    "display_name": "Kling 3.0 Omni Edit Video",
     "description": "Edit an existing video with the latest model from Kling.",
     "inputs": {
       "model_name": {
@@ -4852,6 +5791,13 @@
       },
       "resolution": {
         "name": "resolution"
+      },
+      "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"
       }
     },
     "outputs": {
@@ -4861,7 +5807,7 @@
     }
   },
   "KlingOmniProFirstLastFrameNode": {
-    "display_name": "Kling Omni First-Last-Frame to Video (Pro)",
+    "display_name": "Kling 3.0 Omni First-Last-Frame to Video",
     "description": "Use a start frame, an optional end frame, or reference images with the latest Kling model.",
     "inputs": {
       "model_name": {
@@ -4869,7 +5815,7 @@
       },
       "prompt": {
         "name": "prompt",
-        "tooltip": "A text prompt describing the video content. This can include both positive and negative descriptions."
+        "tooltip": "A text prompt describing the video content. This can include both positive and negative descriptions. Ignored when storyboards are enabled."
       },
       "duration": {
         "name": "duration"
@@ -4879,7 +5825,7 @@
       },
       "end_frame": {
         "name": "end_frame",
-        "tooltip": "An optional end frame for the video. This cannot be used simultaneously with 'reference_images'."
+        "tooltip": "An optional end frame for the video. This cannot be used simultaneously with 'reference_images'. Does not work with storyboards."
       },
       "reference_images": {
         "name": "reference_images",
@@ -4887,6 +5833,21 @@
       },
       "resolution": {
         "name": "resolution"
+      },
+      "storyboards": {
+        "name": "storyboards",
+        "tooltip": "Generate a series of video segments with individual prompts and durations. Only supported for kling-v3-omni."
+      },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "Generate audio for the video. Only supported for kling-v3-omni."
+      },
+      "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"
       }
     },
     "outputs": {
@@ -4896,7 +5857,7 @@
     }
   },
   "KlingOmniProImageNode": {
-    "display_name": "Kling Omni Image (Pro)",
+    "display_name": "Kling 3.0 Omni Image",
     "description": "Create or edit images with the latest model from Kling.",
     "inputs": {
       "model_name": {
@@ -4912,9 +5873,20 @@
       "aspect_ratio": {
         "name": "aspect_ratio"
       },
+      "series_amount": {
+        "name": "series_amount",
+        "tooltip": "Generate a series of images. Not supported for kling-image-o1."
+      },
       "reference_images": {
         "name": "reference_images",
         "tooltip": "Up to 10 additional reference images."
+      },
+      "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"
       }
     },
     "outputs": {
@@ -4924,7 +5896,7 @@
     }
   },
   "KlingOmniProImageToVideoNode": {
-    "display_name": "Kling Omni Image to Video (Pro)",
+    "display_name": "Kling 3.0 Omni Image to Video",
     "description": "Use up to 7 reference images to generate a video with the latest Kling model.",
     "inputs": {
       "model_name": {
@@ -4932,7 +5904,7 @@
       },
       "prompt": {
         "name": "prompt",
-        "tooltip": "A text prompt describing the video content. This can include both positive and negative descriptions."
+        "tooltip": "A text prompt describing the video content. This can include both positive and negative descriptions. Ignored when storyboards are enabled."
       },
       "aspect_ratio": {
         "name": "aspect_ratio"
@@ -4946,6 +5918,21 @@
       },
       "resolution": {
         "name": "resolution"
+      },
+      "storyboards": {
+        "name": "storyboards",
+        "tooltip": "Generate a series of video segments with individual prompts and durations. Only supported for kling-v3-omni."
+      },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "Generate audio for the video. Only supported for kling-v3-omni."
+      },
+      "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"
       }
     },
     "outputs": {
@@ -4955,7 +5942,7 @@
     }
   },
   "KlingOmniProTextToVideoNode": {
-    "display_name": "Kling Omni Text to Video (Pro)",
+    "display_name": "Kling 3.0 Omni Text to Video",
     "description": "Use text prompts to generate videos with the latest Kling model.",
     "inputs": {
       "model_name": {
@@ -4963,7 +5950,7 @@
       },
       "prompt": {
         "name": "prompt",
-        "tooltip": "A text prompt describing the video content. This can include both positive and negative descriptions."
+        "tooltip": "A text prompt describing the video content. This can include both positive and negative descriptions. Ignored when storyboards are enabled."
       },
       "aspect_ratio": {
         "name": "aspect_ratio"
@@ -4973,6 +5960,20 @@
       },
       "resolution": {
         "name": "resolution"
+      },
+      "storyboards": {
+        "name": "storyboards",
+        "tooltip": "Generate a series of video segments with individual prompts and durations. Ignored for o1 model."
+      },
+      "generate_audio": {
+        "name": "generate_audio"
+      },
+      "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"
       }
     },
     "outputs": {
@@ -4982,7 +5983,7 @@
     }
   },
   "KlingOmniProVideoToVideoNode": {
-    "display_name": "Kling Omni Video to Video (Pro)",
+    "display_name": "Kling 3.0 Omni Video to Video",
     "description": "Use a video and up to 4 reference images to generate a video with the latest Kling model.",
     "inputs": {
       "model_name": {
@@ -5011,6 +6012,13 @@
       },
       "resolution": {
         "name": "resolution"
+      },
+      "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"
       }
     },
     "outputs": {
@@ -5134,7 +6142,7 @@
     }
   },
   "KlingTextToVideoWithAudio": {
-    "display_name": "Kling Text to Video with Audio",
+    "display_name": "Kling 2.6 Text to Video with Audio",
     "inputs": {
       "model_name": {
         "name": "model_name"
@@ -5196,6 +6204,54 @@
       }
     }
   },
+  "KlingVideoNode": {
+    "display_name": "Kling 3.0 Video",
+    "description": "Generate videos with Kling V3. Supports text-to-video and image-to-video with optional storyboard multi-prompt and audio generation.",
+    "inputs": {
+      "multi_shot": {
+        "name": "multi_shot",
+        "tooltip": "Generate a series of video segments with individual prompts and durations."
+      },
+      "generate_audio": {
+        "name": "generate_audio"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Model and generation settings."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed controls whether the node should re-run; results are non-deterministic regardless of seed."
+      },
+      "start_frame": {
+        "name": "start_frame",
+        "tooltip": "Optional start frame image. When connected, switches to image-to-video mode."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model_aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      },
+      "multi_shot_duration": {
+        "name": "duration"
+      },
+      "multi_shot_negative_prompt": {
+        "name": "negative_prompt"
+      },
+      "multi_shot_prompt": {
+        "name": "prompt"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingVirtualTryOnNode": {
     "display_name": "Kling Virtual Try On",
     "description": "Kling Virtual Try On Node. Input a human image and a cloth image to try on the cloth on the human. You can merge multiple clothing item pictures into one image with a white background.",
@@ -5817,6 +6873,10 @@
       "5": {
         "name": "recording_video",
         "tooltip": null
+      },
+      "6": {
+        "name": "model_3d",
+        "tooltip": null
       }
     }
   },
@@ -5956,7 +7016,7 @@
     }
   },
   "LoraLoader": {
-    "display_name": "Load LoRA",
+    "display_name": "Load LoRA (Model and CLIP)",
     "description": "LoRAs are used to modify diffusion and CLIP models, altering the way in which latents are denoised such as applying styles. Multiple LoRA nodes can be linked together.",
     "inputs": {
       "model": {
@@ -5989,8 +7049,62 @@
       }
     }
   },
+  "LoraLoaderBypass": {
+    "display_name": "Load LoRA (Bypass) (For debugging)",
+    "description": "Apply LoRA in bypass mode. Unlike regular LoRA, this doesn't modify model weights - instead it injects the LoRA computation during forward pass. Useful for training scenarios.",
+    "inputs": {
+      "model": {
+        "name": "model",
+        "tooltip": "The diffusion model the LoRA will be applied to."
+      },
+      "clip": {
+        "name": "clip",
+        "tooltip": "The CLIP model the LoRA will be applied to."
+      },
+      "lora_name": {
+        "name": "lora_name",
+        "tooltip": "The name of the LoRA."
+      },
+      "strength_model": {
+        "name": "strength_model",
+        "tooltip": "How strongly to modify the diffusion model. This value can be negative."
+      },
+      "strength_clip": {
+        "name": "strength_clip",
+        "tooltip": "How strongly to modify the CLIP model. This value can be negative."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "The modified diffusion model."
+      },
+      "1": {
+        "tooltip": "The modified CLIP model."
+      }
+    }
+  },
+  "LoraLoaderBypassModelOnly": {
+    "display_name": "Load LoRA (Bypass, Model Only) (for debugging)",
+    "description": "Apply LoRA in bypass mode. Unlike regular LoRA, this doesn't modify model weights - instead it injects the LoRA computation during forward pass. Useful for training scenarios.",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "lora_name": {
+        "name": "lora_name"
+      },
+      "strength_model": {
+        "name": "strength_model"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "The modified diffusion model."
+      }
+    }
+  },
   "LoraLoaderModelOnly": {
-    "display_name": "LoraLoaderModelOnly",
+    "display_name": "Load LoRA",
     "description": "LoRAs are used to modify diffusion and CLIP models, altering the way in which latents are denoised such as applying styles. Multiple LoRA nodes can be linked together.",
     "inputs": {
       "model": {
@@ -6023,6 +7137,10 @@
       "strength_model": {
         "name": "strength_model",
         "tooltip": "How strongly to modify the diffusion model. This value can be negative."
+      },
+      "bypass": {
+        "name": "bypass",
+        "tooltip": "When enabled, applies LoRA in bypass mode without modifying base model weights. Useful for training and when model weights are offloaded."
       }
     },
     "outputs": {
@@ -6079,6 +7197,26 @@
       }
     }
   },
+  "LTXAVTextEncoderLoader": {
+    "display_name": "LTXV Audio Text Encoder Loader",
+    "description": "[Recipes]\n\nltxav: gemma 3 12B",
+    "inputs": {
+      "text_encoder": {
+        "name": "text_encoder"
+      },
+      "ckpt_name": {
+        "name": "ckpt_name"
+      },
+      "device": {
+        "name": "device"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LTXVAddGuide": {
     "display_name": "LTXVAddGuide",
     "inputs": {
@@ -6185,6 +7323,76 @@
       }
     }
   },
+  "LTXVAudioVAEDecode": {
+    "display_name": "LTXV Audio VAE Decode",
+    "inputs": {
+      "samples": {
+        "name": "samples",
+        "tooltip": "The latent to be decoded."
+      },
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "The Audio VAE model used for decoding the latent."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Audio",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAEEncode": {
+    "display_name": "LTXV Audio VAE Encode",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "The audio to be encoded."
+      },
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "The Audio VAE model to use for encoding."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Audio Latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAELoader": {
+    "display_name": "LTXV Audio VAE Loader",
+    "inputs": {
+      "ckpt_name": {
+        "name": "ckpt_name",
+        "tooltip": "Audio VAE checkpoint to load."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Audio VAE",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVConcatAVLatent": {
+    "display_name": "LTXVConcatAVLatent",
+    "inputs": {
+      "video_latent": {
+        "name": "video_latent"
+      },
+      "audio_latent": {
+        "name": "audio_latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
   "LTXVConditioning": {
     "display_name": "LTXVConditioning",
     "inputs": {
@@ -6237,6 +7445,33 @@
       }
     }
   },
+  "LTXVEmptyLatentAudio": {
+    "display_name": "LTXV Empty Latent Audio",
+    "inputs": {
+      "frames_number": {
+        "name": "frames_number",
+        "tooltip": "Number of frames."
+      },
+      "frame_rate": {
+        "name": "frame_rate",
+        "tooltip": "Number of frames per second."
+      },
+      "batch_size": {
+        "name": "batch_size",
+        "tooltip": "The number of latent audio samples in the batch."
+      },
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "The Audio VAE model to get configuration from."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Latent",
+        "tooltip": null
+      }
+    }
+  },
   "LTXVImgToVideo": {
     "display_name": "LTXVImgToVideo",
     "inputs": {
@@ -6283,6 +7518,47 @@
       }
     }
   },
+  "LTXVImgToVideoInplace": {
+    "display_name": "LTXVImgToVideoInplace",
+    "inputs": {
+      "vae": {
+        "name": "vae"
+      },
+      "image": {
+        "name": "image"
+      },
+      "latent": {
+        "name": "latent"
+      },
+      "strength": {
+        "name": "strength"
+      },
+      "bypass": {
+        "name": "bypass",
+        "tooltip": "Bypass the conditioning."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVLatentUpsampler": {
+    "display_name": "LTXVLatentUpsampler",
+    "inputs": {
+      "samples": {
+        "name": "samples"
+      },
+      "upscale_model": {
+        "name": "upscale_model"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
   "LTXVPreprocess": {
     "display_name": "LTXVPreprocess",
     "inputs": {
@@ -6331,6 +7607,25 @@
       }
     }
   },
+  "LTXVSeparateAVLatent": {
+    "display_name": "LTXVSeparateAVLatent",
+    "description": "LTXV Separate AV Latent",
+    "inputs": {
+      "av_latent": {
+        "name": "av_latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "video_latent",
+        "tooltip": null
+      },
+      "1": {
+        "name": "audio_latent",
+        "tooltip": null
+      }
+    }
+  },
   "LumaConceptsNode": {
     "display_name": "Luma Concepts",
     "description": "Camera Concepts for use with Luma Text to Video and Luma Image to Video nodes.",
@@ -6545,8 +7840,210 @@
       }
     }
   },
+  "MagnificImageRelightNode": {
+    "display_name": "Magnific Image Relight",
+    "description": "Relight an image with lighting adjustments and optional reference-based light transfer.",
+    "inputs": {
+      "image": {
+        "name": "image",
+        "tooltip": "The image to relight."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Descriptive guidance for lighting. Supports emphasis notation (1-1.4)."
+      },
+      "light_transfer_strength": {
+        "name": "light_transfer_strength",
+        "tooltip": "Intensity of light transfer application."
+      },
+      "style": {
+        "name": "style",
+        "tooltip": "Stylistic output preference."
+      },
+      "interpolate_from_original": {
+        "name": "interpolate_from_original",
+        "tooltip": "Restricts generation freedom to match original more closely."
+      },
+      "change_background": {
+        "name": "change_background",
+        "tooltip": "Modifies background based on prompt/reference."
+      },
+      "preserve_details": {
+        "name": "preserve_details",
+        "tooltip": "Maintains texture and fine details from original."
+      },
+      "advanced_settings": {
+        "name": "advanced_settings",
+        "tooltip": "Fine-tuning options for advanced lighting control."
+      },
+      "reference_image": {
+        "name": "reference_image",
+        "tooltip": "Optional reference image to transfer lighting from."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageSkinEnhancerNode": {
+    "display_name": "Magnific Image Skin Enhancer",
+    "description": "Skin enhancement for portraits with multiple processing modes.",
+    "inputs": {
+      "image": {
+        "name": "image",
+        "tooltip": "The portrait image to enhance."
+      },
+      "sharpen": {
+        "name": "sharpen",
+        "tooltip": "Sharpening intensity level."
+      },
+      "smart_grain": {
+        "name": "smart_grain",
+        "tooltip": "Smart grain intensity level."
+      },
+      "mode": {
+        "name": "mode",
+        "tooltip": "Processing mode: creative for artistic enhancement, faithful for preserving original appearance, flexible for targeted optimization."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageStyleTransferNode": {
+    "display_name": "Magnific Image Style Transfer",
+    "description": "Transfer the style from a reference image to your input image.",
+    "inputs": {
+      "image": {
+        "name": "image",
+        "tooltip": "The image to apply style transfer to."
+      },
+      "reference_image": {
+        "name": "reference_image",
+        "tooltip": "The reference image to extract style from."
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "style_strength": {
+        "name": "style_strength",
+        "tooltip": "Percentage of style strength."
+      },
+      "structure_strength": {
+        "name": "structure_strength",
+        "tooltip": "Maintains the structure of the original image."
+      },
+      "flavor": {
+        "name": "flavor",
+        "tooltip": "Style transfer flavor."
+      },
+      "engine": {
+        "name": "engine",
+        "tooltip": "Processing engine selection."
+      },
+      "portrait_mode": {
+        "name": "portrait_mode",
+        "tooltip": "Enable portrait mode for facial enhancements."
+      },
+      "fixed_generation": {
+        "name": "fixed_generation",
+        "tooltip": "When disabled, expect each generation to introduce a degree of randomness, leading to more diverse outcomes."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageUpscalerCreativeNode": {
+    "display_name": "Magnific Image Upscale (Creative)",
+    "description": "Prompt‑guided enhancement, stylization, and 2x/4x/8x/16x upscaling. Maximum output: 25.3 megapixels.",
+    "inputs": {
+      "image": {
+        "name": "image"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "scale_factor": {
+        "name": "scale_factor"
+      },
+      "optimized_for": {
+        "name": "optimized_for"
+      },
+      "creativity": {
+        "name": "creativity"
+      },
+      "hdr": {
+        "name": "hdr",
+        "tooltip": "The level of definition and detail."
+      },
+      "resemblance": {
+        "name": "resemblance",
+        "tooltip": "The level of resemblance to the original image."
+      },
+      "fractality": {
+        "name": "fractality",
+        "tooltip": "The strength of the prompt and intricacy per square pixel."
+      },
+      "engine": {
+        "name": "engine"
+      },
+      "auto_downscale": {
+        "name": "auto_downscale",
+        "tooltip": "Automatically downscale input image if output would exceed maximum pixel limit."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageUpscalerPreciseV2Node": {
+    "display_name": "Magnific Image Upscale (Precise V2)",
+    "description": "High-fidelity upscaling with fine control over sharpness, grain, and detail. Maximum output: 10060×10060 pixels.",
+    "inputs": {
+      "image": {
+        "name": "image"
+      },
+      "scale_factor": {
+        "name": "scale_factor"
+      },
+      "flavor": {
+        "name": "flavor",
+        "tooltip": "Processing style: sublime for general use, photo for photographs, photo_denoiser for noisy photos."
+      },
+      "sharpen": {
+        "name": "sharpen",
+        "tooltip": "Image sharpness intensity. Higher values increase edge definition and clarity."
+      },
+      "smart_grain": {
+        "name": "smart_grain",
+        "tooltip": "Intelligent grain/texture enhancement to prevent the image from looking too smooth or artificial."
+      },
+      "ultra_detail": {
+        "name": "ultra_detail",
+        "tooltip": "Controls fine detail, textures, and micro-details added during upscaling."
+      },
+      "auto_downscale": {
+        "name": "auto_downscale",
+        "tooltip": "Automatically downscale input image if output would exceed maximum resolution."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "Mahiro": {
-    "display_name": "Mahiro CFG",
+    "display_name": "Positive-Biased Guidance",
     "description": "Modify the guidance to scale more on the 'direction' of the positive prompt rather than the difference between the negative prompt.",
     "inputs": {
       "model": {
@@ -6681,6 +8178,336 @@
       }
     }
   },
+  "MeshyAnimateModelNode": {
+    "display_name": "Meshy: Animate Model",
+    "description": "Apply a specific animation action to a previously rigged character.",
+    "inputs": {
+      "rig_task_id": {
+        "name": "rig_task_id"
+      },
+      "action_id": {
+        "name": "action_id",
+        "tooltip": "Visit https://docs.meshy.ai/en/api/animation-library for a list of available values."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyImageToModelNode": {
+    "display_name": "Meshy: Image to Model",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "image": {
+        "name": "image"
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "When set to false, returns an unprocessed triangular mesh."
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      },
+      "should_texture": {
+        "name": "should_texture",
+        "tooltip": "Determines whether textures are generated. Setting it to false skips the texture phase and returns a mesh without textures."
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "Specify the pose mode for the generated model."
+      },
+      "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"
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      },
+      "should_texture_enable_pbr": {
+        "name": "enable_pbr"
+      },
+      "should_texture_texture_prompt": {
+        "name": "texture_prompt"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyMultiImageToModelNode": {
+    "display_name": "Meshy: Multi-Image to Model",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "images": {
+        "name": "images"
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "When set to false, returns an unprocessed triangular mesh."
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      },
+      "should_texture": {
+        "name": "should_texture",
+        "tooltip": "Determines whether textures are generated. Setting it to false skips the texture phase and returns a mesh without textures."
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "Specify the pose mode for the generated model."
+      },
+      "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"
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      },
+      "should_texture_enable_pbr": {
+        "name": "enable_pbr"
+      },
+      "should_texture_texture_prompt": {
+        "name": "texture_prompt"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyRefineNode": {
+    "display_name": "Meshy: Refine Draft Model",
+    "description": "Refine a previously created draft model.",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "enable_pbr": {
+        "name": "enable_pbr",
+        "tooltip": "Generate PBR Maps (metallic, roughness, normal) in addition to the base color. Note: this should be set to false when using Sculpture style, as Sculpture style generates its own set of PBR maps."
+      },
+      "texture_prompt": {
+        "name": "texture_prompt",
+        "tooltip": "Provide a text prompt to guide the texturing process. Maximum 600 characters. Cannot be used at the same time as 'texture_image'."
+      },
+      "texture_image": {
+        "name": "texture_image",
+        "tooltip": "Only one of 'texture_image' or 'texture_prompt' may be used at the same time."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyRigModelNode": {
+    "display_name": "Meshy: Rig Model",
+    "description": "Provides a rigged character in standard formats. Auto-rigging is currently not suitable for untextured meshes, non-humanoid assets, or humanoid assets with unclear limb and body structure.",
+    "inputs": {
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "height_meters": {
+        "name": "height_meters",
+        "tooltip": "The approximate height of the character model in meters. This aids in scaling and rigging accuracy."
+      },
+      "texture_image": {
+        "name": "texture_image",
+        "tooltip": "The model's UV-unwrapped base color texture image."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "rig_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyTextToModelNode": {
+    "display_name": "Meshy: Text to Model",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "style": {
+        "name": "style"
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "When set to false, returns an unprocessed triangular mesh."
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "Specify the pose mode for the generated model."
+      },
+      "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"
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyTextureNode": {
+    "display_name": "Meshy: Texture Model",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "enable_original_uv": {
+        "name": "enable_original_uv",
+        "tooltip": "Use the original UV of the model instead of generating new UVs. When enabled, Meshy preserves existing textures from the uploaded model. If the model has no original UV, the quality of the output might not be as good."
+      },
+      "pbr": {
+        "name": "pbr"
+      },
+      "text_style_prompt": {
+        "name": "text_style_prompt",
+        "tooltip": "Describe your desired texture style of the object using text. Maximum 600 characters.Maximum 600 characters. Cannot be used at the same time as 'image_style'."
+      },
+      "image_style": {
+        "name": "image_style",
+        "tooltip": "A 2d image to guide the texturing process. Can not be used at the same time with 'text_style_prompt'."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
   "MinimaxHailuoVideoNode": {
     "display_name": "MiniMax Hailuo Video",
     "description": "Generates videos from prompt, with optional start frame using the new MiniMax Hailuo-02 model.",
@@ -9122,6 +10949,32 @@
       }
     }
   },
+  "NAGuidance": {
+    "display_name": "Normalized Attention Guidance",
+    "description": "Applies Normalized Attention Guidance to models, enabling negative prompts on distilled/schnell models.",
+    "inputs": {
+      "model": {
+        "name": "model",
+        "tooltip": "The model to apply NAG to."
+      },
+      "nag_scale": {
+        "name": "nag_scale",
+        "tooltip": "The guidance scale factor. Higher values push further from the negative prompt."
+      },
+      "nag_alpha": {
+        "name": "nag_alpha",
+        "tooltip": "Blending factor for the normalized attention. 1.0 is full replacement, 0.0 is no effect."
+      },
+      "nag_tau": {
+        "name": "nag_tau"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "The patched model with NAG enabled."
+      }
+    }
+  },
   "NormalizeImages": {
     "display_name": "Normalize Images",
     "inputs": {
@@ -9299,8 +11152,8 @@
     }
   },
   "OpenAIGPTImage1": {
-    "display_name": "OpenAI GPT Image 1",
-    "description": "Generates images synchronously via OpenAI's GPT Image 1 endpoint.",
+    "display_name": "OpenAI GPT Image 1.5",
+    "description": "Generates images synchronously via OpenAI's GPT Image endpoint.",
     "inputs": {
       "prompt": {
         "name": "prompt",
@@ -9871,7 +11724,8 @@
     "display_name": "Preview 3D & Animation",
     "inputs": {
       "model_file": {
-        "name": "model_file"
+        "name": "model_file",
+        "tooltip": "3D model file or path string"
       },
       "camera_info": {
         "name": "camera_info"
@@ -9890,7 +11744,12 @@
       "source": {
         "name": "source"
       },
-      "preview": {},
+      "preview_markdown": {
+        "name": "Preview"
+      },
+      "preview_text": {
+        "name": "Preview"
+      },
       "previewMode": {}
     }
   },
@@ -9927,6 +11786,28 @@
       }
     }
   },
+  "PrimitiveBoundingBox": {
+    "display_name": "Bounding Box",
+    "inputs": {
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      },
+      "width": {
+        "name": "width"
+      },
+      "height": {
+        "name": "height"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "PrimitiveFloat": {
     "display_name": "Float",
     "inputs": {
@@ -10164,6 +12045,25 @@
       }
     }
   },
+  "RecraftCreateStyleNode": {
+    "display_name": "Recraft Create Style",
+    "description": "Create a custom style from reference images. Upload 1-5 images to use as style references. Total size of all images is limited to 5 MB.",
+    "inputs": {
+      "style": {
+        "name": "style",
+        "tooltip": "The base style of the generated images."
+      },
+      "images": {
+        "name": "images"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "style_id",
+        "tooltip": null
+      }
+    }
+  },
   "RecraftCreativeUpscaleNode": {
     "display_name": "Recraft Creative Upscale Image",
     "description": "Upscale image synchronously.\nEnhances a given raster image using ‘creative upscale’ tool, boosting resolution with a focus on refining small details and faces.",
@@ -10345,7 +12245,7 @@
   },
   "RecraftStyleV3InfiniteStyleLibrary": {
     "display_name": "Recraft Style - Infinite Style Library",
-    "description": "Select style based on preexisting UUID from Recraft's Infinite Style Library.",
+    "description": "Choose style based on preexisting UUID from Recraft's Infinite Style Library.",
     "inputs": {
       "style_id": {
         "name": "style_id",
@@ -10471,6 +12371,88 @@
       }
     }
   },
+  "RecraftV4TextToImageNode": {
+    "display_name": "Recraft V4 Text to Image",
+    "description": "Generates images using Recraft V4 or V4 Pro models.",
+    "inputs": {
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt for the image generation. Maximum 10,000 characters."
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "An optional text description of undesired elements on an image."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "The model to use for generation."
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "The number of images to generate."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed to determine if node should re-run; actual results are nondeterministic regardless of seed."
+      },
+      "recraft_controls": {
+        "name": "recraft_controls",
+        "tooltip": "Optional additional controls over the generation via the Recraft Controls node."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model_size": {
+        "name": "size"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftV4TextToVectorNode": {
+    "display_name": "Recraft V4 Text to Vector",
+    "description": "Generates SVG using Recraft V4 or V4 Pro models.",
+    "inputs": {
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt for the image generation. Maximum 10,000 characters."
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "An optional text description of undesired elements on an image."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "The model to use for generation."
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "The number of images to generate."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed to determine if node should re-run; actual results are nondeterministic regardless of seed."
+      },
+      "recraft_controls": {
+        "name": "recraft_controls",
+        "tooltip": "Optional additional controls over the generation via the Recraft Controls node."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model_size": {
+        "name": "size"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RecraftVectorizeImageNode": {
     "display_name": "Recraft Vectorize Image",
     "description": "Generates SVG synchronously from an input image.",
@@ -10502,6 +12484,23 @@
       }
     }
   },
+  "ReferenceTimbreAudio": {
+    "display_name": "Reference Audio",
+    "description": "This node sets the reference audio for ace step 1.5",
+    "inputs": {
+      "conditioning": {
+        "name": "conditioning"
+      },
+      "latent": {
+        "name": "latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RegexExtract": {
     "display_name": "Regex Extract",
     "inputs": {
@@ -10722,18 +12721,27 @@
   },
   "ResizeImageMaskNode": {
     "display_name": "Resize Image/Mask",
+    "description": "Resize an image or mask using various scaling methods.",
     "inputs": {
       "input": {
         "name": "input"
       },
       "resize_type": {
-        "name": "resize_type"
+        "name": "resize_type",
+        "tooltip": "Select how to resize: by exact dimensions, scale factor, matching another image, etc."
       },
       "scale_method": {
-        "name": "scale_method"
+        "name": "scale_method",
+        "tooltip": "Interpolation algorithm. 'area' is best for downscaling, 'lanczos' for upscaling, 'nearest-exact' for pixel art."
       },
-      "resize_type_multiplier": {
-        "name": "multiplier"
+      "resize_type_crop": {
+        "name": "crop"
+      },
+      "resize_type_height": {
+        "name": "height"
+      },
+      "resize_type_width": {
+        "name": "width"
       }
     },
     "outputs": {
@@ -10804,6 +12812,30 @@
       }
     }
   },
+  "ResolutionSelector": {
+    "display_name": "Resolution Selector",
+    "description": "Calculate width and height from aspect ratio and megapixel target. Useful for setting up Empty Latent Image dimensions.",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "The aspect ratio for the output dimensions."
+      },
+      "megapixels": {
+        "name": "megapixels",
+        "tooltip": "Target total megapixels. 1.0 MP ≈ 1024×1024 for square."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "width",
+        "tooltip": "Calculated width in pixels (multiple of 8)."
+      },
+      "1": {
+        "name": "height",
+        "tooltip": "Calculated height in pixels (multiple of 8)."
+      }
+    }
+  },
   "Rodin3D_Detail": {
     "display_name": "Rodin 3D Generate - Detail Generate",
     "description": "Generate 3D Assets using Rodin API",
@@ -10825,6 +12857,10 @@
       "0": {
         "name": "3D Model Path",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -10852,6 +12888,10 @@
       "0": {
         "name": "3D Model Path",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -10876,6 +12916,10 @@
       "0": {
         "name": "3D Model Path",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -10894,6 +12938,10 @@
       "0": {
         "name": "3D Model Path",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -10918,6 +12966,10 @@
       "0": {
         "name": "3D Model Path",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -11510,10 +13562,11 @@
     }
   },
   "SaveGLB": {
-    "display_name": "SaveGLB",
+    "display_name": "Save 3D Model",
     "inputs": {
       "mesh": {
-        "name": "mesh"
+        "name": "mesh",
+        "tooltip": "Mesh or 3D file to save"
       },
       "filename_prefix": {
         "name": "filename_prefix"
@@ -11754,6 +13807,90 @@
       }
     }
   },
+  "SDPoseDrawKeypoints": {
+    "display_name": "SDPoseDrawKeypoints",
+    "inputs": {
+      "keypoints": {
+        "name": "keypoints"
+      },
+      "draw_body": {
+        "name": "draw_body"
+      },
+      "draw_hands": {
+        "name": "draw_hands"
+      },
+      "draw_face": {
+        "name": "draw_face"
+      },
+      "draw_feet": {
+        "name": "draw_feet"
+      },
+      "stick_width": {
+        "name": "stick_width"
+      },
+      "face_point_size": {
+        "name": "face_point_size"
+      },
+      "score_threshold": {
+        "name": "score_threshold"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SDPoseFaceBBoxes": {
+    "display_name": "SDPoseFaceBBoxes",
+    "inputs": {
+      "keypoints": {
+        "name": "keypoints"
+      },
+      "scale": {
+        "name": "scale",
+        "tooltip": "Multiplier for the bounding box area around each detected face."
+      },
+      "force_square": {
+        "name": "force_square",
+        "tooltip": "Expand the shorter bbox axis so the crop region is always square."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "bboxes",
+        "tooltip": "Face bounding boxes per frame, compatible with SDPoseKeypointExtractor bboxes input."
+      }
+    }
+  },
+  "SDPoseKeypointExtractor": {
+    "display_name": "SDPoseKeypointExtractor",
+    "description": "Extract pose keypoints from images using the SDPose model: https://huggingface.co/Comfy-Org/SDPose/tree/main/checkpoints",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "image": {
+        "name": "image"
+      },
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "bboxes": {
+        "name": "bboxes",
+        "tooltip": "Optional bounding boxes for more accurate detections. Required for multi-person detection."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "keypoints",
+        "tooltip": "Keypoints in OpenPose frame format (canvas_width, canvas_height, people)"
+      }
+    }
+  },
   "SDTurboScheduler": {
     "display_name": "SDTurboScheduler",
     "inputs": {
@@ -12037,6 +14174,29 @@
       }
     }
   },
+  "SplitImageToTileList": {
+    "display_name": "Split Image into List of Tiles",
+    "description": "Splits an image into a batched list of tiles with a specified overlap.",
+    "inputs": {
+      "image": {
+        "name": "image"
+      },
+      "tile_width": {
+        "name": "tile_width"
+      },
+      "tile_height": {
+        "name": "tile_height"
+      },
+      "overlap": {
+        "name": "overlap"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "SplitImageWithAlpha": {
     "display_name": "Split Image with Alpha",
     "inputs": {
@@ -12878,6 +15038,123 @@
       }
     }
   },
+  "Tencent3DPartNode": {
+    "display_name": "Hunyuan3D: 3D Part",
+    "description": "Automatically perform component identification and generation based on the model structure.",
+    "inputs": {
+      "model_3d": {
+        "name": "model_3d",
+        "tooltip": "3D model in FBX format. Model should have less than 30000 faces."
+      },
+      "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"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "TencentImageToModelNode": {
+    "display_name": "Hunyuan3D: Image(s) to Model",
+    "inputs": {
+      "model": {
+        "name": "model",
+        "tooltip": "The LowPoly option is unavailable for the `3.1` model."
+      },
+      "image": {
+        "name": "image"
+      },
+      "face_count": {
+        "name": "face_count"
+      },
+      "generate_type": {
+        "name": "generate_type"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed controls whether the node should re-run; results are non-deterministic regardless of seed."
+      },
+      "image_left": {
+        "name": "image_left"
+      },
+      "image_right": {
+        "name": "image_right"
+      },
+      "image_back": {
+        "name": "image_back"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "generate_type_pbr": {
+        "name": "pbr"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "OBJ",
+        "tooltip": null
+      }
+    }
+  },
+  "TencentTextToModelNode": {
+    "display_name": "Hunyuan3D: Text to Model",
+    "inputs": {
+      "model": {
+        "name": "model",
+        "tooltip": "The LowPoly option is unavailable for the `3.1` model."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Supports up to 1024 characters."
+      },
+      "face_count": {
+        "name": "face_count"
+      },
+      "generate_type": {
+        "name": "generate_type"
+      },
+      "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"
+      },
+      "generate_type_pbr": {
+        "name": "pbr"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "OBJ",
+        "tooltip": null
+      }
+    }
+  },
   "TextEncodeAceStepAudio": {
     "display_name": "TextEncodeAceStepAudio",
     "inputs": {
@@ -12900,6 +15177,65 @@
       }
     }
   },
+  "TextEncodeAceStepAudio1_5": {
+    "display_name": "TextEncodeAceStepAudio1.5",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "tags": {
+        "name": "tags"
+      },
+      "lyrics": {
+        "name": "lyrics"
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "bpm": {
+        "name": "bpm"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "timesignature": {
+        "name": "timesignature"
+      },
+      "language": {
+        "name": "language"
+      },
+      "keyscale": {
+        "name": "keyscale"
+      },
+      "generate_audio_codes": {
+        "name": "generate_audio_codes",
+        "tooltip": "Enable the LLM that generates audio codes. This can be slow but will increase the quality of the generated audio. Turn this off if you are giving the model an audio reference."
+      },
+      "cfg_scale": {
+        "name": "cfg_scale"
+      },
+      "temperature": {
+        "name": "temperature"
+      },
+      "top_p": {
+        "name": "top_p"
+      },
+      "top_k": {
+        "name": "top_k"
+      },
+      "min_p": {
+        "name": "min_p"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TextEncodeHunyuanVideo_ImageToVideo": {
     "display_name": "TextEncodeHunyuanVideo_ImageToVideo",
     "inputs": {
@@ -12973,6 +15309,128 @@
       }
     }
   },
+  "TextEncodeZImageOmni": {
+    "display_name": "TextEncodeZImageOmni",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "auto_resize_images": {
+        "name": "auto_resize_images"
+      },
+      "image_encoder": {
+        "name": "image_encoder"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "image1": {
+        "name": "image1"
+      },
+      "image2": {
+        "name": "image2"
+      },
+      "image3": {
+        "name": "image3"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TextGenerate": {
+    "display_name": "TextGenerate",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "max_length": {
+        "name": "max_length"
+      },
+      "sampling_mode": {
+        "name": "sampling_mode"
+      },
+      "image": {
+        "name": "image"
+      },
+      "sampling_mode_min_p": {
+        "name": "min_p"
+      },
+      "sampling_mode_repetition_penalty": {
+        "name": "repetition_penalty"
+      },
+      "sampling_mode_seed": {
+        "name": "seed"
+      },
+      "sampling_mode_temperature": {
+        "name": "temperature"
+      },
+      "sampling_mode_top_k": {
+        "name": "top_k"
+      },
+      "sampling_mode_top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "generated_text",
+        "tooltip": null
+      }
+    }
+  },
+  "TextGenerateLTX2Prompt": {
+    "display_name": "TextGenerateLTX2Prompt",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "max_length": {
+        "name": "max_length"
+      },
+      "sampling_mode": {
+        "name": "sampling_mode"
+      },
+      "image": {
+        "name": "image"
+      },
+      "sampling_mode_min_p": {
+        "name": "min_p"
+      },
+      "sampling_mode_repetition_penalty": {
+        "name": "repetition_penalty"
+      },
+      "sampling_mode_seed": {
+        "name": "seed"
+      },
+      "sampling_mode_temperature": {
+        "name": "temperature"
+      },
+      "sampling_mode_top_k": {
+        "name": "top_k"
+      },
+      "sampling_mode_top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "generated_text",
+        "tooltip": null
+      }
+    }
+  },
   "TextToLowercase": {
     "display_name": "Text to Lowercase",
     "inputs": {
@@ -13226,6 +15684,14 @@
         "name": "gradient_checkpointing",
         "tooltip": "Use gradient checkpointing for training."
       },
+      "checkpoint_depth": {
+        "name": "checkpoint_depth",
+        "tooltip": "Depth level for gradient checkpointing."
+      },
+      "offloading": {
+        "name": "offloading",
+        "tooltip": "Offload the Model to RAM. Requires Bypass Mode."
+      },
       "existing_lora": {
         "name": "existing_lora",
         "tooltip": "The existing LoRA to append to. Set to None for new LoRA."
@@ -13234,24 +15700,24 @@
         "name": "bucket_mode",
         "tooltip": "Enable resolution bucket mode. When enabled, expects pre-bucketed latents from ResolutionBucket node."
       },
+      "bypass_mode": {
+        "name": "bypass_mode",
+        "tooltip": "Enable bypass mode for training. When enabled, adapters are applied via forward hooks instead of weight modification. Useful for quantized models where weights cannot be directly modified."
+      },
       "control_after_generate": {
         "name": "control after generate"
       }
     },
     "outputs": {
       "0": {
-        "name": "model",
-        "tooltip": "Model with LoRA applied"
-      },
-      "1": {
         "name": "lora",
         "tooltip": "LoRA weights"
       },
-      "2": {
+      "1": {
         "name": "loss_map",
         "tooltip": "Loss history"
       },
-      "3": {
+      "2": {
         "name": "steps",
         "tooltip": "Total training steps"
       }
@@ -13429,6 +15895,10 @@
       "1": {
         "name": "model task_id",
         "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -13490,6 +15960,10 @@
       "1": {
         "name": "model task_id",
         "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -13510,6 +15984,10 @@
       "1": {
         "name": "model task_id",
         "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -13531,6 +16009,10 @@
       "1": {
         "name": "retarget task_id",
         "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -13549,6 +16031,10 @@
       "1": {
         "name": "rig task_id",
         "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -13603,6 +16089,10 @@
       "1": {
         "name": "model task_id",
         "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -13636,6 +16126,10 @@
       "1": {
         "name": "model task_id",
         "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -13831,6 +16325,28 @@
       }
     }
   },
+  "VAEDecodeAudioTiled": {
+    "display_name": "VAE Decode Audio (Tiled)",
+    "inputs": {
+      "samples": {
+        "name": "samples"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "tile_size": {
+        "name": "tile_size"
+      },
+      "overlap": {
+        "name": "overlap"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "VAEDecodeHunyuan3D": {
     "display_name": "VAEDecodeHunyuan3D",
     "inputs": {
@@ -14122,6 +16638,31 @@
       }
     }
   },
+  "Video Slice": {
+    "display_name": "Video Slice",
+    "inputs": {
+      "video": {
+        "name": "video"
+      },
+      "start_time": {
+        "name": "start_time",
+        "tooltip": "Start time in seconds"
+      },
+      "duration": {
+        "name": "duration",
+        "tooltip": "Duration in seconds, or 0 for unlimited duration"
+      },
+      "strict_duration": {
+        "name": "strict_duration",
+        "tooltip": "If True, when the specified duration is not possible, an error will be raised."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "VideoLinearCFGGuidance": {
     "display_name": "VideoLinearCFGGuidance",
     "inputs": {
@@ -14144,6 +16685,319 @@
       }
     }
   },
+  "Vidu2ImageToVideoNode": {
+    "display_name": "Vidu2 Image-to-Video Generation",
+    "description": "Generate a video from an image and an optional prompt.",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "An image to be used as the start frame of the generated video."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "An optional text prompt for video generation (max 2000 characters)."
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "movement_amplitude": {
+        "name": "movement_amplitude",
+        "tooltip": "The movement amplitude of objects in the frame."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2ReferenceVideoNode": {
+    "display_name": "Vidu2 Reference-to-Video Generation",
+    "description": "Generate a video from multiple reference images and a prompt.",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "subjects": {
+        "name": "subjects",
+        "tooltip": "For each subject, provide up to 3 reference images (7 images total across all subjects). Reference them in prompts via @subject{subject_id}."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "When enabled, the video will include generated speech and background music based on the prompt."
+      },
+      "audio": {
+        "name": "audio",
+        "tooltip": "When enabled video will contain generated speech and background music based on the prompt."
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "movement_amplitude": {
+        "name": "movement_amplitude",
+        "tooltip": "The movement amplitude of objects in the frame."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2StartEndToVideoNode": {
+    "display_name": "Vidu2 Start/End Frame-to-Video Generation",
+    "description": "Generate a video from a start frame, an end frame, and a prompt.",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "first_frame": {
+        "name": "first_frame"
+      },
+      "end_frame": {
+        "name": "end_frame"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt description (max 2000 characters)."
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "movement_amplitude": {
+        "name": "movement_amplitude",
+        "tooltip": "The movement amplitude of objects in the frame."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2TextToVideoNode": {
+    "display_name": "Vidu2 Text-to-Video Generation",
+    "description": "Generate video from a text prompt",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "A textual description for video generation, with a maximum length of 2000 characters."
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "background_music": {
+        "name": "background_music",
+        "tooltip": "Whether to add background music to the generated video."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3ImageToVideoNode": {
+    "display_name": "Vidu Q3 Image-to-Video Generation",
+    "description": "Generate a video from an image and an optional prompt.",
+    "inputs": {
+      "model": {
+        "name": "model",
+        "tooltip": "Model to use for video generation."
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "An image to be used as the start frame of the generated video."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "An optional text prompt for video generation (max 2000 characters)."
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model_audio": {
+        "name": "audio"
+      },
+      "model_duration": {
+        "name": "duration"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3StartEndToVideoNode": {
+    "display_name": "Vidu Q3 Start/End Frame-to-Video Generation",
+    "description": "Generate a video from a start frame, an end frame, and a prompt.",
+    "inputs": {
+      "model": {
+        "name": "model",
+        "tooltip": "Model to use for video generation."
+      },
+      "first_frame": {
+        "name": "first_frame"
+      },
+      "end_frame": {
+        "name": "end_frame"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt description (max 2000 characters)."
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model_audio": {
+        "name": "audio"
+      },
+      "model_duration": {
+        "name": "duration"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3TextToVideoNode": {
+    "display_name": "Vidu Q3 Text-to-Video Generation",
+    "description": "Generate video from a text prompt.",
+    "inputs": {
+      "model": {
+        "name": "model",
+        "tooltip": "Model to use for video generation."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "A textual description for video generation, with a maximum length of 2000 characters."
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model_aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "model_audio": {
+        "name": "audio"
+      },
+      "model_duration": {
+        "name": "duration"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ViduExtendVideoNode": {
+    "display_name": "Vidu Video Extension",
+    "description": "Extend an existing video by generating additional frames.",
+    "inputs": {
+      "model": {
+        "name": "model",
+        "tooltip": "Model to use for video extension."
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "The source video to extend."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "An optional text prompt for the extended video (max 2000 characters)."
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "end_frame": {
+        "name": "end_frame"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model_duration": {
+        "name": "duration"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ViduImageToVideoNode": {
     "display_name": "Vidu Image To Video Generation",
     "description": "Generate video from image and optional prompt",
@@ -14186,9 +17040,52 @@
       }
     }
   },
+  "ViduMultiFrameVideoNode": {
+    "display_name": "Vidu Multi-Frame Video Generation",
+    "description": "Generate a video with multiple keyframe transitions.",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "start_image": {
+        "name": "start_image",
+        "tooltip": "The starting frame image. Aspect ratio must be between 1:4 and 4:1."
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "frames": {
+        "name": "frames",
+        "tooltip": "Number of keyframe transitions (2-9)."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "frames_duration1": {
+        "name": "duration1"
+      },
+      "frames_duration2": {
+        "name": "duration2"
+      },
+      "frames_prompt1": {
+        "name": "prompt1"
+      },
+      "frames_prompt2": {
+        "name": "prompt2"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ViduReferenceVideoNode": {
     "display_name": "Vidu Reference To Video Generation",
-    "description": "Generate video from multiple images and prompt",
+    "description": "Generate video from multiple images and a prompt",
     "inputs": {
       "model": {
         "name": "model",
@@ -14280,7 +17177,7 @@
   },
   "ViduTextToVideoNode": {
     "display_name": "Vidu Text To Video Generation",
-    "description": "Generate video from text prompt",
+    "description": "Generate video from a text prompt",
     "inputs": {
       "model": {
         "name": "model",
@@ -15027,6 +17924,79 @@
       }
     }
   },
+  "WanInfiniteTalkToVideo": {
+    "display_name": "WanInfiniteTalkToVideo",
+    "inputs": {
+      "mode": {
+        "name": "mode"
+      },
+      "model": {
+        "name": "model"
+      },
+      "model_patch": {
+        "name": "model_patch"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "width"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length"
+      },
+      "audio_encoder_output_1": {
+        "name": "audio_encoder_output_1"
+      },
+      "motion_frame_count": {
+        "name": "motion_frame_count",
+        "tooltip": "Number of previous frames to use as motion context."
+      },
+      "audio_scale": {
+        "name": "audio_scale"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "start_image": {
+        "name": "start_image"
+      },
+      "previous_frames": {
+        "name": "previous_frames"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model",
+        "tooltip": null
+      },
+      "1": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "2": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "3": {
+        "name": "latent",
+        "tooltip": null
+      },
+      "4": {
+        "name": "trim_image",
+        "tooltip": null
+      }
+    }
+  },
   "WanMoveConcatTrack": {
     "display_name": "WanMoveConcatTrack",
     "inputs": {
@@ -15191,6 +18161,113 @@
       }
     }
   },
+  "WanReferenceVideoApi": {
+    "display_name": "Wan Reference to Video",
+    "description": "Use the character and voice from input videos, combined with a prompt, to generate a new video that maintains character consistency.",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt describing the elements and visual features. Supports English and Chinese. Use identifiers such as `character1` and `character2` to refer to the reference characters."
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Negative prompt describing what to avoid."
+      },
+      "reference_videos": {
+        "name": "reference_videos"
+      },
+      "size": {
+        "name": "size"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "shot_type": {
+        "name": "shot_type",
+        "tooltip": "Specifies the shot type for the generated video, that is, whether the video is a single continuous shot or multiple shots with cuts."
+      },
+      "watermark": {
+        "name": "watermark",
+        "tooltip": "Whether to add an AI-generated watermark to the result."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanSCAILToVideo": {
+    "display_name": "WanSCAILToVideo",
+    "inputs": {
+      "positive": {
+        "name": "positive"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "width"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length"
+      },
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "pose_strength": {
+        "name": "pose_strength",
+        "tooltip": "Strength of the pose latent."
+      },
+      "pose_start": {
+        "name": "pose_start",
+        "tooltip": "Start step to use pose conditioning."
+      },
+      "pose_end": {
+        "name": "pose_end",
+        "tooltip": "End step to use pose conditioning."
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "reference_image": {
+        "name": "reference_image"
+      },
+      "pose_video": {
+        "name": "pose_video",
+        "tooltip": "Video used for pose conditioning. Will be downscaled to half the resolution of the main video."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": "Empty latent of the generation size."
+      }
+    }
+  },
   "WanSoundImageToVideo": {
     "display_name": "WanSoundImageToVideo",
     "inputs": {
@@ -15498,6 +18575,43 @@
       }
     }
   },
+  "WavespeedFlashVSRNode": {
+    "display_name": "FlashVSR Video Upscale",
+    "description": "Fast, high-quality video upscaler that boosts resolution and restores clarity for low-resolution or blurry footage.",
+    "inputs": {
+      "video": {
+        "name": "video"
+      },
+      "target_resolution": {
+        "name": "target_resolution"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WavespeedImageUpscaleNode": {
+    "display_name": "WaveSpeed Image Upscale",
+    "description": "Boost image resolution and quality, upscaling photos to 4K or 8K for sharp, detailed results.",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "image": {
+        "name": "image"
+      },
+      "target_resolution": {
+        "name": "target_resolution"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "WebcamCapture": {
     "display_name": "Webcam Capture",
     "inputs": {
@@ -15542,4 +18656,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/en/settings.json b/src/locales/en/settings.json
index 77044d99f5..1de5b57ed2 100644
--- a/src/locales/en/settings.json
+++ b/src/locales/en/settings.json
@@ -52,7 +52,8 @@
     }
   },
   "Comfy_Canvas_SelectionToolbox": {
-    "name": "Show selection toolbox"
+    "name": "Show selection toolbox",
+    "tooltip": "Display a floating toolbar when nodes are selected, providing quick access to common actions."
   },
   "Comfy_ConfirmClear": {
     "name": "Require confirmation when clearing workflow"
@@ -103,6 +104,10 @@
   "Comfy_Graph_CtrlShiftZoom": {
     "name": "Enable fast-zoom shortcut (Ctrl + Shift + Drag)"
   },
+  "Comfy_Graph_DeduplicateSubgraphNodeIds": {
+    "name": "Deduplicate subgraph node IDs",
+    "tooltip": "Automatically reassign duplicate node IDs in subgraphs when loading a workflow."
+  },
   "Comfy_Graph_LinkMarkers": {
     "name": "Link midpoint markers",
     "options": {
@@ -142,6 +147,7 @@
   },
   "Comfy_LinkRenderMode": {
     "name": "Link Render Mode",
+    "tooltip": "Controls the appearance and visibility of connection links between nodes on the canvas.",
     "options": {
       "Straight": "Straight",
       "Linear": "Linear",
@@ -220,6 +226,10 @@
   "Comfy_Node_AllowImageSizeDraw": {
     "name": "Show width × height below the image preview"
   },
+  "Comfy_Node_AlwaysShowAdvancedWidgets": {
+    "name": "Always show advanced widgets on all nodes",
+    "tooltip": "When enabled, advanced widgets are always visible on all nodes without needing to expand them individually."
+  },
   "Comfy_Node_AutoSnapLinkToSlot": {
     "name": "Auto snap link to node slot",
     "tooltip": "When dragging a link over a node, the link automatically snap to a viable input slot on the node"
@@ -274,10 +284,19 @@
   "Comfy_NodeBadge_ShowApiPricing": {
     "name": "Show API node pricing badge"
   },
+  "Comfy_NodeLibrary_NewDesign": {
+    "name": "New Node Library Design",
+    "tooltip": "Enable the redesigned node library sidebar with tabs (Essential, All, Custom), improved search, and hover previews."
+  },
+  "Comfy_NodeReplacement_Enabled": {
+    "name": "Enable node replacement suggestions",
+    "tooltip": "When enabled, missing nodes with known replacements will be shown as replaceable in the missing nodes dialog, allowing you to review and apply replacements."
+  },
   "Comfy_NodeSearchBoxImpl": {
     "name": "Node search box implementation",
     "options": {
       "default": "default",
+      "v1 (legacy)": "v1 (legacy)",
       "litegraph (legacy)": "litegraph (legacy)"
     }
   },
@@ -287,15 +306,15 @@
   },
   "Comfy_NodeSearchBoxImpl_ShowCategory": {
     "name": "Show node category in search results",
-    "tooltip": "Only applies to the default implementation"
+    "tooltip": "Only applies to v1 (legacy)"
   },
   "Comfy_NodeSearchBoxImpl_ShowIdName": {
     "name": "Show node id name in search results",
-    "tooltip": "Only applies to the default implementation"
+    "tooltip": "Does not apply to litegraph (legacy)"
   },
   "Comfy_NodeSearchBoxImpl_ShowNodeFrequency": {
     "name": "Show node frequency in search results",
-    "tooltip": "Only applies to the default implementation"
+    "tooltip": "Only applies to v1 (legacy)"
   },
   "Comfy_NodeSuggestions_number": {
     "name": "Number of nodes suggestions",
@@ -328,10 +347,18 @@
     "name": "Queue history size",
     "tooltip": "The maximum number of tasks that show in the queue history."
   },
+  "Comfy_Queue_QPOV2": {
+    "name": "Use the unified job queue in the Assets side panel",
+    "tooltip": "Replaces the floating job queue panel with an equivalent job queue embedded in the Assets side panel. You can disable this to return to the floating panel layout."
+  },
   "Comfy_QueueButton_BatchCountLimit": {
     "name": "Batch count limit",
     "tooltip": "The maximum number of tasks added to the queue at one button click"
   },
+  "Comfy_RightSidePanel_ShowErrorsTab": {
+    "name": "Show errors tab in side panel",
+    "tooltip": "When enabled, an errors tab is displayed in the right side panel to show workflow execution errors at a glance."
+  },
   "Comfy_Sidebar_Location": {
     "name": "Sidebar location",
     "options": {
@@ -369,6 +396,14 @@
   "Comfy_TreeExplorer_ItemPadding": {
     "name": "Tree explorer item padding"
   },
+  "Comfy_UI_TabBarLayout": {
+    "name": "Tab Bar Layout",
+    "tooltip": "Controls the layout of the tab bar. \"Integrated\" moves Help and User controls into the tab bar area.",
+    "options": {
+      "Default": "Default",
+      "Integrated": "Integrated"
+    }
+  },
   "Comfy_UseNewMenu": {
     "name": "Use new menu",
     "tooltip": "Enable the redesigned top menu bar.",
@@ -458,6 +493,7 @@
     "tooltip": "The bezier control point offset from the reroute centre point"
   },
   "pysssss_SnapToGrid": {
-    "name": "Always snap to grid"
+    "name": "Always snap to grid",
+    "tooltip": "When enabled, nodes will automatically align to the grid when moved or resized."
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/es/commands.json b/src/locales/es/commands.json
index ebd076a403..f73d041465 100644
--- a/src/locales/es/commands.json
+++ b/src/locales/es/commands.json
@@ -1,4 +1,40 @@
 {
+  "Comfy-Desktop_CheckForUpdates": {
+    "label": "Buscar actualizaciones"
+  },
+  "Comfy-Desktop_Folders_OpenCustomNodesFolder": {
+    "label": "Abrir carpeta de nodos personalizados"
+  },
+  "Comfy-Desktop_Folders_OpenInputsFolder": {
+    "label": "Abrir carpeta de entradas"
+  },
+  "Comfy-Desktop_Folders_OpenLogsFolder": {
+    "label": "Abrir carpeta de registros"
+  },
+  "Comfy-Desktop_Folders_OpenModelConfig": {
+    "label": "Abrir extra_model_paths.yaml"
+  },
+  "Comfy-Desktop_Folders_OpenModelsFolder": {
+    "label": "Abrir carpeta de modelos"
+  },
+  "Comfy-Desktop_Folders_OpenOutputsFolder": {
+    "label": "Abrir carpeta de salidas"
+  },
+  "Comfy-Desktop_OpenDevTools": {
+    "label": "Abrir herramientas de desarrollo"
+  },
+  "Comfy-Desktop_OpenUserGuide": {
+    "label": "Guía de usuario de escritorio"
+  },
+  "Comfy-Desktop_Quit": {
+    "label": "Salir"
+  },
+  "Comfy-Desktop_Reinstall": {
+    "label": "Reinstalar"
+  },
+  "Comfy-Desktop_Restart": {
+    "label": "Reiniciar"
+  },
   "Comfy_3DViewer_Open3DViewer": {
     "label": "Abrir visor 3D (Beta) para el nodo seleccionado"
   },
@@ -8,6 +44,9 @@
   "Comfy_BrowseTemplates": {
     "label": "Explorar plantillas"
   },
+  "Comfy_Canvas_CopySelected": {
+    "label": "Copiar"
+  },
   "Comfy_Canvas_DeleteSelectedItems": {
     "label": "Eliminar elementos seleccionados"
   },
@@ -29,12 +68,18 @@
   "Comfy_Canvas_MoveSelectedNodes_Up": {
     "label": "Mover nodos seleccionados hacia arriba"
   },
+  "Comfy_Canvas_PasteFromClipboard": {
+    "label": "Pegar"
+  },
   "Comfy_Canvas_ResetView": {
     "label": "Restablecer vista"
   },
   "Comfy_Canvas_Resize": {
     "label": "Redimensionar Nodos Seleccionados"
   },
+  "Comfy_Canvas_SelectAll": {
+    "label": "Seleccionar todo"
+  },
   "Comfy_Canvas_ToggleLinkVisibility": {
     "label": "Alternar visibilidad de enlace en lienzo"
   },
@@ -155,18 +200,30 @@
   "Comfy_Manager_ShowUpdateAvailablePacks": {
     "label": "Buscar actualizaciones"
   },
-  "Comfy_Manager_ToggleManagerProgressDialog": {
-    "label": "Alternar diálogo de progreso del administrador"
-  },
   "Comfy_MaskEditor_BrushSize_Decrease": {
     "label": "Disminuir tamaño del pincel en MaskEditor"
   },
   "Comfy_MaskEditor_BrushSize_Increase": {
     "label": "Aumentar tamaño del pincel en MaskEditor"
   },
+  "Comfy_MaskEditor_ColorPicker": {
+    "label": "Abrir selector de color en MaskEditor"
+  },
+  "Comfy_MaskEditor_Mirror_Horizontal": {
+    "label": "Espejar horizontalmente en MaskEditor"
+  },
+  "Comfy_MaskEditor_Mirror_Vertical": {
+    "label": "Espejar verticalmente en MaskEditor"
+  },
   "Comfy_MaskEditor_OpenMaskEditor": {
     "label": "Abrir editor de máscara para el nodo seleccionado"
   },
+  "Comfy_MaskEditor_Rotate_Left": {
+    "label": "Girar a la izquierda en MaskEditor"
+  },
+  "Comfy_MaskEditor_Rotate_Right": {
+    "label": "Girar a la derecha en MaskEditor"
+  },
   "Comfy_Memory_UnloadModels": {
     "label": "Descargar modelos"
   },
@@ -197,12 +254,18 @@
   "Comfy_QueueSelectedOutputNodes": {
     "label": "Encolar nodos de salida seleccionados"
   },
+  "Comfy_Queue_ToggleOverlay": {
+    "label": "Alternar historial de trabajos"
+  },
   "Comfy_Redo": {
     "label": "Rehacer"
   },
   "Comfy_RefreshNodeDefinitions": {
     "label": "Actualizar Definiciones de Nodo"
   },
+  "Comfy_RenameWorkflow": {
+    "label": "Renombrar flujo de trabajo"
+  },
   "Comfy_SaveWorkflow": {
     "label": "Guardar Flujo de Trabajo"
   },
@@ -212,6 +275,12 @@
   "Comfy_ShowSettingsDialog": {
     "label": "Mostrar Diálogo de Configuraciones"
   },
+  "Comfy_Subgraph_SetDescription": {
+    "label": "Establecer descripción del subgrafo"
+  },
+  "Comfy_Subgraph_SetSearchAliases": {
+    "label": "Establecer alias de búsqueda del subgrafo"
+  },
   "Comfy_ToggleAssetAPI": {
     "label": "Experimental: Habilitar AssetAPI"
   },
@@ -221,6 +290,12 @@
   "Comfy_ToggleHelpCenter": {
     "label": "Centro de ayuda"
   },
+  "Comfy_ToggleLinear": {
+    "label": "alternar modo lineal"
+  },
+  "Comfy_ToggleQPOV2": {
+    "label": "Alternar Panel de Cola V2"
+  },
   "Comfy_ToggleTheme": {
     "label": "Cambiar Tema (Oscuro/Claro)"
   },
@@ -252,10 +327,10 @@
     "label": "Alternar Panel Inferior"
   },
   "Workspace_ToggleBottomPanelTab_command-terminal": {
-    "label": "Alternar Panel Inferior de Terminal"
+    "label": "Mostrar/ocultar panel inferior de terminal"
   },
   "Workspace_ToggleBottomPanelTab_logs-terminal": {
-    "label": "Alternar Panel Inferior de Registros"
+    "label": "Mostrar/ocultar panel inferior de registros"
   },
   "Workspace_ToggleBottomPanelTab_shortcuts-essentials": {
     "label": "Alternar panel inferior esencial"
@@ -269,6 +344,10 @@
   "Workspace_ToggleFocusMode": {
     "label": "Alternar Modo de Enfoque"
   },
+  "Workspace_ToggleSidebarTab_apps": {
+    "label": "Alternar barra lateral de aplicaciones",
+    "tooltip": "Aplicaciones"
+  },
   "Workspace_ToggleSidebarTab_assets": {
     "label": "Alternar barra lateral de recursos",
     "tooltip": "Recursos"
diff --git a/src/locales/es/main.json b/src/locales/es/main.json
index 8ef2594e46..34c21eaa9f 100644
--- a/src/locales/es/main.json
+++ b/src/locales/es/main.json
@@ -1,6 +1,8 @@
 {
   "actionbar": {
-    "dockToTop": "Acoplar en la parte superior"
+    "dockToTop": "Acoplar en la parte superior",
+    "feedback": "Comentarios",
+    "feedbackTooltip": "Comentarios"
   },
   "apiNodesCostBreakdown": {
     "costPerRun": "Costo por ejecución",
@@ -14,26 +16,175 @@
   "assetBrowser": {
     "allCategory": "Todo {category}",
     "allModels": "Todos los modelos",
+    "apiKeyHint": "¿Importas modelos privados o restringidos? {link}.",
+    "apiKeyHintLink": "Agrega tus claves de API en Configuración",
     "ariaLabel": {
       "assetCard": "Recurso {name} - {type}",
       "loadingAsset": "Cargando recurso"
     },
+    "assetCollection": "Colección de activos",
     "assets": "Recursos",
+    "baseModel": "Modelo base",
     "baseModels": "Modelos base",
     "browseAssets": "Explorar recursos",
+    "byType": "Por tipo",
+    "checkpoints": "Checkpoints",
+    "civitaiLinkExample": "{example} {link}",
+    "civitaiLinkExampleStrong": "Ejemplo:",
+    "civitaiLinkExampleUrl": "https://civitai.com/models/10706/luisap-z-image-and-qwen-pixel-art-refiner?modelVersionId=2225295",
+    "civitaiLinkLabel": "Enlace de {download} del modelo de Civitai",
+    "civitaiLinkLabelDownload": "descarga",
+    "civitaiLinkPlaceholder": "Pega el enlace aquí",
+    "confirmModelDetails": "Confirmar detalles del modelo",
     "connectionError": "Por favor, revisa tu conexión e inténtalo de nuevo",
+    "deletion": {
+      "body": "Este modelo se eliminará permanentemente de tu biblioteca.",
+      "complete": "{assetName} ha sido eliminado.",
+      "failed": "No se pudo eliminar {assetName}.",
+      "header": "¿Eliminar este modelo?",
+      "inProgress": "Eliminando {assetName}..."
+    },
+    "download": {
+      "complete": "Descarga completa",
+      "failed": "La descarga falló",
+      "inProgress": "Descargando {assetName}..."
+    },
+    "emptyImported": {
+      "canImport": "Aún no hay modelos importados. Haz clic en \"Importar modelo\" para añadir el tuyo.",
+      "restricted": "Los modelos personales solo están disponibles en el nivel Creador o superior."
+    },
+    "errorAccessForbidden": "Acceso prohibido a este recurso.",
+    "errorConnectionRefused": "No se puede conectar a la fuente. Por favor, inténtalo de nuevo más tarde.",
+    "errorDownloadCancelled": "La descarga fue cancelada.",
+    "errorFileTooLarge": "El archivo excede el tamaño máximo permitido",
+    "errorFormatNotAllowed": "Solo se permite el formato SafeTensor",
+    "errorHttpError": "Ocurrió un error al obtener los metadatos.",
+    "errorInternalError": "Ocurrió un error inesperado. Por favor, inténtalo de nuevo.",
+    "errorInvalidHost": "No se pudo resolver el nombre de host de la URL de origen.",
+    "errorInvalidUrl": "Por favor, proporciona una URL.",
+    "errorInvalidUrlFormat": "El formato de la URL no es válido. Por favor, revisa e inténtalo de nuevo.",
+    "errorMetadataFetchFailed": "No se pudo obtener la información del archivo desde la fuente.",
+    "errorModelTypeNotSupported": "Este tipo de modelo no es compatible",
+    "errorNetworkError": "Ocurrió un error de red. Por favor, revisa tu conexión e inténtalo de nuevo.",
+    "errorNetworkTimeout": "La solicitud ha expirado. Por favor, inténtalo de nuevo.",
+    "errorRateLimited": "Demasiadas solicitudes. Por favor, inténtalo de nuevo en unos minutos.",
+    "errorRequestCancelled": "La solicitud fue cancelada.",
+    "errorResourceNotFound": "No se encontró el archivo. Por favor, revisa la URL e inténtalo de nuevo.",
+    "errorServiceUnavailable": "Servicio temporalmente no disponible. Por favor, inténtalo de nuevo más tarde.",
+    "errorSourceServerError": "El servidor de origen está experimentando problemas. Por favor, inténtalo de nuevo más tarde.",
+    "errorUnauthorized": "Por favor, inicia sesión para continuar.",
+    "errorUnauthorizedSource": "Este recurso requiere autenticación. Añade tu token de API en la configuración.",
+    "errorUnknown": "Ocurrió un error inesperado",
+    "errorUnsafePickleScan": "CivitAI detectó código potencialmente inseguro en este archivo",
+    "errorUnsafeVirusScan": "CivitAI detectó malware o contenido sospechoso en este archivo",
+    "errorUnsupportedSource": "Esta URL no es compatible. Solo se permiten URLs de Hugging Face y Civitai.",
+    "errorUploadFailed": "No se pudo importar el activo. Por favor, inténtalo de nuevo.",
+    "errorUserTokenAccessDenied": "Tu token de API no tiene acceso a este recurso. Por favor, revisa los permisos de tu token.",
+    "errorUserTokenInvalid": "Tu token de API almacenado no es válido o ha expirado. Por favor, actualiza tu token en la configuración.",
     "failedToCreateNode": "No se pudo crear el nodo. Inténtalo de nuevo o revisa la consola para más detalles.",
     "fileFormats": "Formatos de archivo",
+    "fileName": "Nombre del archivo",
+    "fileSize": "Tamaño del archivo",
+    "filterBy": "Filtrar por",
+    "findInLibrary": "Encuéntralo en la sección {type} de la biblioteca de modelos.",
+    "finish": "Finalizar",
+    "genericLinkPlaceholder": "Pega el enlace aquí",
+    "importAnother": "Importar otro",
+    "imported": "Importado",
+    "invalidAsset": "Recurso no válido",
+    "invalidAssetDetail": "No se pudo validar el recurso seleccionado. Por favor, inténtalo de nuevo.",
+    "invalidFilename": "Nombre de archivo no válido",
+    "invalidFilenameDetail": "No se pudo determinar el nombre de archivo del recurso. Por favor, inténtalo de nuevo.",
+    "jobId": "ID de tarea",
     "loadingModels": "Cargando {type}...",
+    "maxFileSize": "Tamaño máximo de archivo: {size}",
+    "maxFileSizeValue": "1 GB",
+    "media": {
+      "audioPlaceholder": "Audio",
+      "threeDModelPlaceholder": "Modelo 3D"
+    },
+    "modelAssociatedWithLink": "El modelo asociado con el enlace que proporcionaste:",
+    "modelInfo": {
+      "addBaseModel": "Agregar modelo base...",
+      "addTag": "Agregar etiqueta...",
+      "additionalTags": "Etiquetas adicionales",
+      "baseModelUnknown": "Modelo base desconocido",
+      "basicInfo": "Información básica",
+      "compatibleBaseModels": "Modelos base compatibles",
+      "description": "Descripción",
+      "descriptionNotSet": "Sin descripción",
+      "descriptionPlaceholder": "Agrega una descripción para este modelo...",
+      "displayName": "Nombre para mostrar",
+      "editDisplayName": "Editar nombre para mostrar",
+      "fileName": "Nombre de archivo",
+      "modelDescription": "Descripción del modelo",
+      "modelTagging": "Etiquetado del modelo",
+      "modelType": "Tipo de modelo",
+      "noAdditionalTags": "Sin etiquetas adicionales",
+      "selectModelPrompt": "Selecciona un modelo para ver su información",
+      "selectModelType": "Selecciona el tipo de modelo...",
+      "source": "Fuente",
+      "title": "Información del modelo",
+      "triggerPhrases": "Frases de activación",
+      "viewOnSource": "Ver en {source}"
+    },
+    "modelName": "Nombre del modelo",
+    "modelNamePlaceholder": "Introduce un nombre para este modelo",
+    "modelTypeSelectorLabel": "¿Qué tipo de modelo es este?",
+    "modelTypeSelectorPlaceholder": "Selecciona el tipo de modelo",
+    "modelUploaded": "Modelo importado correctamente.",
     "noAssetsFound": "No se encontraron recursos",
     "noModelsInFolder": "No hay {type} disponibles en esta carpeta",
+    "noResultsCanImport": "Intenta ajustar tu búsqueda o filtros.\nTambién puedes añadir modelos usando el botón \"Importar\" de arriba.",
+    "noValidSourceDetected": "No se detectó una fuente de importación válida",
+    "notSureLeaveAsIs": "¿No estás seguro? Déjalo como está",
+    "onlyCivitaiUrlsSupported": "Solo se admiten URLs de Civitai",
+    "ownership": "Propiedad",
+    "ownershipAll": "Todos",
+    "ownershipMyModels": "Mis modelos",
+    "ownershipPublicModels": "Modelos públicos",
+    "processingModel": "Descarga iniciada",
+    "processingModelDescription": "Puedes cerrar este diálogo. La descarga continuará en segundo plano.",
+    "providerCivitai": "Civitai",
+    "providerHuggingFace": "Hugging Face",
+    "rename": {
+      "failed": "No se pudo renombrar el activo."
+    },
+    "selectFrameworks": "Seleccionar frameworks",
+    "selectModelType": "Seleccionar tipo de modelo",
+    "selectProjects": "Seleccionar proyectos",
     "sortAZ": "A-Z",
     "sortBy": "Ordenar por",
+    "sortDefault": "Predeterminado",
     "sortPopular": "Popular",
     "sortRecent": "Reciente",
     "sortZA": "Z-A",
+    "sortingType": "Tipo de ordenación",
+    "tags": "Etiquetas",
+    "tagsHelp": "Separa las etiquetas con comas",
+    "tagsPlaceholder": "ej., modelos, checkpoint",
     "tryAdjustingFilters": "Intenta ajustar tu búsqueda o filtros",
-    "unknown": "Desconocido"
+    "unknown": "Desconocido",
+    "unsupportedUrlSource": "Solo se admiten URLs de {sources}",
+    "upgradeFeatureDescription": "Esta función solo está disponible con los planes Creator o Pro.",
+    "upgradeToUnlockFeature": "Actualiza para desbloquear esta función",
+    "upload": "Importar",
+    "uploadFailed": "La importación falló",
+    "uploadModel": "Importar",
+    "uploadModelDescription1": "Pega un enlace de descarga de modelo de Civitai para añadirlo a tu biblioteca.",
+    "uploadModelDescription1Generic": "Pega un enlace de descarga de modelo para añadirlo a tu biblioteca.",
+    "uploadModelDescription2": "Solo se admiten enlaces de {link} por el momento",
+    "uploadModelDescription2Generic": "Solo se admiten URLs de los siguientes proveedores:",
+    "uploadModelDescription2Link": "https://civitai.com/models",
+    "uploadModelDescription3": "Tamaño máximo de archivo: {size}",
+    "uploadModelFailedToRetrieveMetadata": "No se pudo obtener la metadata. Por favor, revisa el enlace e inténtalo de nuevo.",
+    "uploadModelFromCivitai": "Importar un modelo de Civitai",
+    "uploadModelGeneric": "Importar un modelo",
+    "uploadModelHelpFooterText": "¿Necesitas ayuda para encontrar las URLs? Haz clic en un proveedor abajo para ver un video tutorial.",
+    "uploadModelHelpVideo": "Video de ayuda para importar modelos",
+    "uploadModelHowDoIFindThis": "¿Cómo encuentro esto?",
+    "uploadSuccess": "¡Modelo importado con éxito!",
+    "uploadingModel": "Importando modelo..."
   },
   "auth": {
     "apiKey": {
@@ -55,13 +206,7 @@
       "whitelistInfo": "Acerca de los sitios no incluidos en la lista blanca"
     },
     "deleteAccount": {
-      "cancel": "Cancelar",
-      "confirm": "Eliminar cuenta",
-      "confirmMessage": "¿Estás seguro de que deseas eliminar tu cuenta? Esta acción no se puede deshacer y eliminará permanentemente todos tus datos.",
-      "confirmTitle": "Eliminar cuenta",
-      "deleteAccount": "Eliminar cuenta",
-      "success": "Cuenta eliminada",
-      "successDetail": "Tu cuenta ha sido eliminada exitosamente."
+      "contactSupport": "Para eliminar tu cuenta, por favor contacta a {email}"
     },
     "errors": {
       "auth/cancelled-popup-request": "El inicio de sesión fue cancelado. Por favor, inténtalo de nuevo.",
@@ -80,6 +225,7 @@
     "login": {
       "andText": "y",
       "backToLogin": "Volver al inicio de sesión",
+      "backToSocialLogin": "Regístrate con Google o Github en su lugar",
       "confirmPasswordLabel": "Confirmar contraseña",
       "confirmPasswordPlaceholder": "Ingresa la misma contraseña nuevamente",
       "didntReceiveEmail": "¿No recibiste el correo? Contáctanos en",
@@ -88,6 +234,9 @@
       "failed": "Inicio de sesión fallido",
       "forgotPassword": "¿Olvidaste tu contraseña?",
       "forgotPasswordError": "No se pudo enviar el correo electrónico para restablecer la contraseña",
+      "freeTierBadge": "Elegible para el plan gratuito",
+      "freeTierDescription": "Regístrate con Google para obtener {credits} créditos gratis cada mes. No se necesita tarjeta.",
+      "freeTierDescriptionGeneric": "Regístrate con Google para obtener créditos gratis cada mes. No se necesita tarjeta.",
       "insecureContextWarning": "Esta conexión no es segura (HTTP): tus credenciales pueden ser interceptadas por atacantes si continúas con el inicio de sesión.",
       "loginButton": "Iniciar sesión",
       "loginWithGithub": "Iniciar sesión con Github",
@@ -106,11 +255,13 @@
       "sendResetLink": "Enviar enlace de restablecimiento",
       "signInOrSignUp": "Iniciar sesión / Registrarse",
       "signUp": "Regístrate",
+      "signUpFreeTierPromo": "¿Nuevo aquí? {signUp} con Google para obtener {credits} créditos gratis cada mes.",
       "success": "Inicio de sesión exitoso",
       "termsLink": "Términos de uso",
       "termsText": "Al hacer clic en \"Siguiente\" o \"Registrarse\", aceptas nuestros",
       "title": "Inicia sesión en tu cuenta",
       "useApiKey": "Clave API de Comfy",
+      "useEmailInstead": "Usar correo electrónico en su lugar",
       "userAvatar": "Avatar de usuario"
     },
     "loginButton": {
@@ -130,11 +281,14 @@
     "signOut": {
       "signOut": "Cerrar sesión",
       "success": "Sesión cerrada correctamente",
-      "successDetail": "Has cerrado sesión en tu cuenta."
+      "successDetail": "Has cerrado sesión en tu cuenta.",
+      "unsavedChangesMessage": "Tienes cambios no guardados que se perderán al cerrar sesión. ¿Quieres continuar?",
+      "unsavedChangesTitle": "Cambios no guardados"
     },
     "signup": {
       "alreadyHaveAccount": "¿Ya tienes una cuenta?",
       "emailLabel": "Correo electrónico",
+      "emailNotEligibleForFreeTier": "El registro por correo electrónico no es elegible para el plan gratuito.",
       "emailPlaceholder": "Ingresa tu correo electrónico",
       "passwordLabel": "Contraseña",
       "passwordPlaceholder": "Ingresa una nueva contraseña",
@@ -147,12 +301,68 @@
       "title": "Crea una cuenta"
     }
   },
+  "batch": {
+    "index": "{current} / {total}"
+  },
+  "billingOperation": {
+    "subscriptionFailed": "Error al actualizar la suscripción",
+    "subscriptionProcessing": "Procesando pago — configurando tu espacio de trabajo...",
+    "subscriptionSuccess": "Suscripción actualizada correctamente",
+    "subscriptionTimeout": "Tiempo de espera agotado al verificar la suscripción",
+    "topupFailed": "Error al recargar créditos",
+    "topupProcessing": "Procesando pago — añadiendo créditos...",
+    "topupSuccess": "Créditos añadidos correctamente",
+    "topupTimeout": "Tiempo de espera agotado al verificar la recarga"
+  },
+  "boundingBox": {
+    "height": "Alto",
+    "width": "Ancho",
+    "x": "X",
+    "y": "Y"
+  },
   "breadcrumbsMenu": {
     "clearWorkflow": "Limpiar flujo de trabajo",
     "deleteBlueprint": "Eliminar Plano",
     "deleteWorkflow": "Eliminar flujo de trabajo",
     "duplicate": "Duplicar",
-    "enterNewName": "Ingrese un nuevo nombre"
+    "enterAppMode": "Entrar en modo aplicación",
+    "enterBuilderMode": "Entrar al constructor de aplicaciones",
+    "enterNewName": "Ingrese un nuevo nombre",
+    "exitAppMode": "Salir del modo aplicación",
+    "missingNodesWarning": "El flujo de trabajo contiene nodos no compatibles (resaltados en rojo).",
+    "workflowActions": "Acciones del flujo de trabajo"
+  },
+  "builderMenu": {
+    "exitAppBuilder": "Salir del constructor de aplicaciones"
+  },
+  "builderToolbar": {
+    "app": "Aplicación",
+    "appDescription": "Se abre como una aplicación por defecto",
+    "arrange": "Vista previa",
+    "arrangeDescription": "Revisar el diseño de la aplicación",
+    "connectOutput": "Conectar una salida",
+    "connectOutputBody1": "Tu aplicación necesita al menos una salida conectada antes de poder guardarse.",
+    "connectOutputBody2": "Cambia al paso 'Seleccionar' y haz clic en los nodos de salida para agregarlos aquí.",
+    "defaultModeAppliedAppBody": "Este flujo de trabajo se abrirá en Modo de Aplicación por defecto a partir de ahora.",
+    "defaultModeAppliedAppPrompt": "¿Te gustaría verlo ahora?",
+    "defaultModeAppliedGraphBody": "Este flujo de trabajo se abrirá como un grafo de nodos por defecto a partir de ahora.",
+    "defaultModeAppliedGraphPrompt": "¿Aún quieres ver la aplicación?",
+    "defaultModeAppliedTitle": "Configurado correctamente",
+    "defaultView": "Establecer vista predeterminada",
+    "defaultViewDescription": "Elige cómo se abre esto",
+    "defaultViewLabel": "Por defecto, este flujo de trabajo se abrirá como:",
+    "defaultViewTitle": "Establecer la vista predeterminada para este flujo de trabajo",
+    "emptyWorkflowPrompt": "¿Quieres empezar con una plantilla?",
+    "emptyWorkflowTitle": "Este flujo de trabajo no tiene nodos",
+    "inputs": "Entradas",
+    "inputsDescription": "Elige entradas",
+    "label": "Constructor de aplicaciones",
+    "nodeGraph": "Grafo de nodos",
+    "nodeGraphDescription": "Se abre como grafo de nodos por defecto",
+    "outputs": "Salidas",
+    "outputsDescription": "Elige salidas",
+    "switchToOutputs": "Cambiar a Salidas",
+    "viewApp": "Ver aplicación"
   },
   "clipboard": {
     "errorMessage": "Error al copiar al portapapeles",
@@ -206,6 +416,7 @@
     },
     "retry": "Intentar de nuevo",
     "retrying": "Reintentando...",
+    "skipToCloudApp": "Saltar a la aplicación en la nube",
     "start": {
       "desc": "Cero configuración requerida. Funciona en cualquier dispositivo.",
       "download": "Descargar ComfyUI",
@@ -339,6 +550,8 @@
     "Edit Subgraph Widgets": "Editar Widgets de Subgrafo",
     "Expand": "Expandir",
     "Expand Node": "Expandir Nodo",
+    "Extensions": "Extensiones",
+    "FavoriteWidget": "Marcar widget como favorito",
     "Horizontal": "Horizontal",
     "Inputs": "Entradas",
     "Left": "Izquierda",
@@ -358,6 +571,7 @@
     "Remove": "Eliminar",
     "Remove Bypass": "Eliminar Bypass",
     "Rename": "Renombrar",
+    "RenameWidget": "Renombrar widget",
     "Resize": "Redimensionar",
     "Right": "Derecha",
     "Run Branch": "Ejecutar Rama",
@@ -368,6 +582,7 @@
     "Shapes": "Formas",
     "Title": "Título",
     "Top": "Arriba",
+    "UnfavoriteWidget": "Quitar widget de favoritos",
     "Unpack Subgraph": "Desempaquetar Subgrafo",
     "Unpin": "Desanclar",
     "Vertical": "Vertical",
@@ -381,6 +596,7 @@
     "additionalInfo": "Información adicional",
     "apiPricing": "Precios de la API",
     "credits": "Créditos",
+    "creditsAvailable": "Créditos disponibles",
     "details": "Detalles",
     "eventType": "Tipo de evento",
     "faqs": "Preguntas frecuentes",
@@ -389,15 +605,47 @@
     "messageSupport": "Contactar soporte",
     "model": "Modelo",
     "purchaseCredits": "Comprar créditos",
+    "refreshes": "Se actualiza el {date}",
     "time": "Hora",
     "topUp": {
+      "addMoreCredits": "Agregar más créditos",
+      "addMoreCreditsToRun": "Agrega más créditos para ejecutar",
+      "amountToPayLabel": "Cantidad a pagar en dólares",
+      "buy": "Comprar",
+      "buyCredits": "Continuar al pago",
       "buyNow": "Comprar ahora",
+      "contactUs": "Contáctanos",
+      "creditsDescription": "Los créditos se utilizan para ejecutar flujos de trabajo o nodos de socios.",
+      "creditsPerDollar": "créditos por dólar",
+      "creditsToReceiveLabel": "Créditos a recibir",
+      "howManyCredits": "¿Cuántos créditos te gustaría agregar?",
       "insufficientMessage": "No tienes suficientes créditos para ejecutar este flujo de trabajo.",
       "insufficientTitle": "Créditos insuficientes",
+      "insufficientWorkflowMessage": "No tienes suficientes créditos para ejecutar este flujo de trabajo.",
+      "maxAllowed": "Máximo {credits} créditos.",
       "maxAmount": "(Máx. $1,000 USD)",
+      "maximumAmount": "Máximo ${amount}.",
+      "minRequired": "Mínimo {credits} créditos",
+      "minimumPurchase": "Mínimo ${amount} ({credits} créditos)",
+      "needMore": "¿Necesitas más?",
+      "purchaseError": "Compra fallida",
+      "purchaseErrorDetail": "No se pudo comprar créditos: {error}",
+      "purchaseSuccess": "¡Créditos añadidos correctamente!",
       "quickPurchase": "Compra rápida",
       "seeDetails": "Ver detalles",
-      "topUp": "Recargar"
+      "selectAmount": "Seleccionar cantidad",
+      "templateNote": "*Generado con la plantilla Wan Fun Control",
+      "topUp": "Recargar",
+      "unknownError": "Ocurrió un error desconocido",
+      "usdAmount": "${amount}",
+      "videosEstimate": "~{count} videos",
+      "viewPricing": "Ver detalles de precios",
+      "youGet": "Créditos",
+      "youPay": "Cantidad (USD)"
+    },
+    "unified": {
+      "message": "Los créditos han sido unificados",
+      "tooltip": "Hemos unificado los pagos en Comfy. Ahora todo funciona con Comfy Credits:\n- Nodos de socios (antes nodos API)\n- Flujos de trabajo en la nube\n\nTu saldo existente de nodos de socios se ha convertido en créditos."
     },
     "yourCreditBalance": "Tu saldo de créditos"
   },
@@ -408,13 +656,26 @@
     "AUDIO_ENCODER_OUTPUT": "SALIDA_CODIFICADOR_AUDIO",
     "AUDIO_RECORD": "GRABACIÓN_AUDIO",
     "BOOLEAN": "BOOLEANO",
+    "BOUNDING_BOX": "CUADRO DELIMITADOR",
     "CAMERA_CONTROL": "CONTROL DE CÁMARA",
     "CLIP": "CLIP",
     "CLIP_VISION": "CLIP_VISION",
     "CLIP_VISION_OUTPUT": "SALIDA_CLIP_VISION",
+    "COLOR": "COLOR",
     "COMBO": "COMBO",
+    "COMFY_AUTOGROW_V3": "COMFY_AUTOGROW_V3",
+    "COMFY_DYNAMICCOMBO_V3": "COMFY_DYNAMICCOMBO_V3",
+    "COMFY_MATCHTYPE_V3": "COMFY_MATCHTYPE_V3",
     "CONDITIONING": "ACONDICIONAMIENTO",
     "CONTROL_NET": "RED_DE_CONTROL",
+    "ELEVENLABS_VOICE": "ELEVENLABS_VOICE",
+    "FILE_3D": "ARCHIVO_3D",
+    "FILE_3D_FBX": "ARCHIVO_3D_FBX",
+    "FILE_3D_GLB": "ARCHIVO_3D_GLB",
+    "FILE_3D_GLTF": "ARCHIVO_3D_GLTF",
+    "FILE_3D_OBJ": "ARCHIVO_3D_OBJ",
+    "FILE_3D_STL": "ARCHIVO_3D_STL",
+    "FILE_3D_USDZ": "ARCHIVO_3D_USDZ",
     "FLOAT": "FLOTANTE",
     "FLOATS": "FLOTANTES",
     "GEMINI_INPUT_FILES": "ARCHIVOS_ENTRADA_GEMINI",
@@ -423,9 +684,11 @@
     "HOOKS": "GANCHOS",
     "HOOK_KEYFRAMES": "GANCHO_FOTOGRAMAS_CLAVE",
     "IMAGE": "IMAGEN",
+    "IMAGECOMPARE": "COMPARARIMÁGENES",
     "INT": "ENTERO",
     "LATENT": "LATENTE",
     "LATENT_OPERATION": "OPERACIÓN_LATENTE",
+    "LATENT_UPSCALE_MODEL": "LATENT_UPSCALE_MODEL",
     "LOAD3D_CAMERA": "CARGAR CÁMARA 3D",
     "LOAD_3D": "CARGAR_3D",
     "LORA_MODEL": "MODELO_LORA",
@@ -434,6 +697,8 @@
     "LUMA_REF": "REFERENCIA LUMA",
     "MASK": "MASK",
     "MESH": "MALLA",
+    "MESHY_RIGGED_TASK_ID": "MESHY_RIGGED_TASK_ID",
+    "MESHY_TASK_ID": "MESHY_TASK_ID",
     "MODEL": "MODELO",
     "MODEL_PATCH": "PARCHE_MODELO",
     "MODEL_TASK_ID": "ID_TAREA_MODELO",
@@ -442,6 +707,7 @@
     "OPENAI_INPUT_FILES": "ARCHIVOS_ENTRADA_OPENAI",
     "PHOTOMAKER": "PHOTOMAKER",
     "PIXVERSE_TEMPLATE": "PLANTILLA PIXVERSE",
+    "POSE_KEYPOINT": "POSE_KEYPOINT",
     "RECRAFT_COLOR": "COLOR RECRAFT",
     "RECRAFT_CONTROLS": "CONTROLES RECRAFT",
     "RECRAFT_V3_STYLE": "ESTILO RECRAFT V3",
@@ -453,6 +719,7 @@
     "STYLE_MODEL": "MODELO_DE_ESTILO",
     "SVG": "SVG",
     "TIMESTEPS_RANGE": "RANGO_DE_PASOS_DE_TIEMPO",
+    "TRACKS": "PISTAS",
     "UPSCALE_MODEL": "MODELO_DE_ESCALADO",
     "VAE": "VAE",
     "VIDEO": "VÍDEO",
@@ -511,24 +778,84 @@
     "noStackTrace": "No hay seguimiento de pila disponible",
     "promptExecutionError": "La ejecución del prompt falló"
   },
+  "errorOverlay": {
+    "errorCount": "{count} ERRORES | {count} ERROR | {count} ERRORES",
+    "seeErrors": "Ver errores"
+  },
+  "essentials": {
+    "batchImage": "Procesar imágenes por lotes",
+    "canny": "Canny",
+    "cannyToImage": "Canny a imagen",
+    "cannyToVideo": "Canny a video",
+    "cropImage": "Recortar imagen",
+    "depthToImage": "Profundidad a imagen",
+    "depthToVideo": "Profundidad a video",
+    "extractFrame": "Extraer fotograma",
+    "imageCompare": "Comparar imágenes",
+    "imageTo3DModel": "Imagen a modelo 3D",
+    "imageToImage": "Imagen a imagen",
+    "imageToVideo": "Imagen a video",
+    "inpaintImage": "Rellenar imagen",
+    "invert": "Invertir",
+    "lipsync": "Lipsync",
+    "load3DModel": "Cargar modelo 3D",
+    "loadAudio": "Cargar audio",
+    "loadImage": "Cargar imagen",
+    "loadStyleLora": "Cargar estilo (LoRA)",
+    "loadVideo": "Cargar video",
+    "musicGeneration": "Generación de música",
+    "outpaintImage": "Expandir imagen",
+    "poseToImage": "Pose a imagen",
+    "poseToVideo": "Pose a video",
+    "removeBackground": "Eliminar fondo",
+    "resizeImage": "Redimensionar imagen",
+    "rotate": "Rotar",
+    "save3DModel": "Guardar modelo 3D",
+    "saveAudio": "Guardar audio",
+    "saveImage": "Guardar imagen",
+    "saveVideo": "Guardar video",
+    "text": "Texto",
+    "textGenerationLLM": "Generación de texto (LLM)",
+    "textTo3DModel": "Texto a modelo 3D",
+    "textToImage": "Texto a imagen",
+    "textToVideo": "Texto a video"
+  },
+  "exportToast": {
+    "allExportsCompleted": "Todas las exportaciones completadas",
+    "downloadExport": "Descargar exportación",
+    "downloadFailed": "No se pudo descargar \"{name}\"",
+    "exportCompleted": "Descarga ZIP lista",
+    "exportError": "Error en la exportación",
+    "exportFailed": "{count} exportación fallida | {count} exportación fallida | {count} exportaciones fallidas",
+    "exportFailedSingle": "No se pudo crear la exportación ZIP",
+    "exportStarted": "Preparando descarga ZIP...",
+    "exportingAssets": "Exportando recursos",
+    "noExportsInQueue": "No hay exportaciones de {filter} en la cola",
+    "preparingExport": "Preparando exportación...",
+    "retryDownload": "Reintentar descarga"
+  },
   "g": {
     "1x": "1x",
     "2x": "2x",
     "about": "Acerca de",
     "add": "Añadir",
+    "addNode": "Agregar un nodo...",
     "addNodeFilterCondition": "Agregar condición de filtro de nodo",
     "all": "Todo",
     "amount": "Cantidad",
     "apply": "Aplicar",
     "architecture": "Arquitectura",
+    "asset": "{count} recursos | {count} recurso | {count} recursos",
     "audioFailedToLoad": "No se pudo cargar el audio",
     "audioProgress": "Progreso de audio",
     "author": "Autor",
     "back": "Atrás",
+    "batchRename": "Renombrar en lote",
     "beta": "BETA",
     "bookmark": "Guardar en Biblioteca",
     "calculatingDimensions": "Calculando dimensiones",
     "cancel": "Cancelar",
+    "cancelled": "Cancelado",
     "capture": "captura",
     "category": "Categoría",
     "chart": "Gráfico",
@@ -538,6 +865,8 @@
     "clearAll": "Borrar todo",
     "clearFilters": "Borrar filtros",
     "close": "Cerrar",
+    "closeDialog": "Cerrar diálogo",
+    "collapseAll": "Colapsar todo",
     "color": "Color",
     "comfy": "Comfy",
     "comfyOrgLogoAlt": "Logo de ComfyOrg",
@@ -546,6 +875,7 @@
     "commandProhibited": "El comando {command} está prohibido. Contacta a un administrador para más información.",
     "community": "Comunidad",
     "completed": "Completado",
+    "completedWithCheckmark": "Completado ✓",
     "confirm": "Confirmar",
     "confirmed": "Confirmado",
     "content": "contenido",
@@ -554,48 +884,73 @@
     "control_before_generate": "control antes de generar",
     "copied": "Copiado",
     "copy": "Copiar",
+    "copyAll": "Copiar todo",
     "copyJobId": "Copiar ID de trabajo",
     "copyToClipboard": "Copiar al portapapeles",
     "copyURL": "Copiar URL",
+    "core": "Núcleo",
     "currentUser": "Usuario actual",
+    "custom": "Personalizado",
     "customBackground": "Fondo personalizado",
     "customize": "Personalizar",
     "customizeFolder": "Personalizar carpeta",
+    "decrement": "Disminuir",
     "defaultBanner": "banner predeterminado",
     "delete": "Eliminar",
     "deleteAudioFile": "Eliminar archivo de audio",
     "deleteImage": "Eliminar imagen",
     "deprecated": "DEPR",
     "description": "Descripción",
+    "devOnly": "DEV",
     "devices": "Dispositivos",
     "disableAll": "Deshabilitar todo",
+    "disableSelected": "Deshabilitar seleccionados",
+    "disableThirdParty": "Deshabilitar terceros",
     "disabling": "Deshabilitando",
+    "disconnectedFromBackend": "Desconectado del backend. Verifica si el servidor está en funcionamiento.",
     "dismiss": "Descartar",
     "download": "Descargar",
+    "downloadAudio": "Descargar audio",
     "downloadImage": "Descargar imagen",
     "downloadVideo": "Descargar video",
+    "downloadWithSize": "Descargar ({size})",
+    "downloading": "Descargando",
     "dropYourFileOr": "Suelta tu archivo o",
     "duplicate": "Duplicar",
     "edit": "Editar",
     "editImage": "Editar imagen",
     "editOrMaskImage": "Editar o enmascarar imagen",
+    "emDash": "—",
     "empty": "Vacío",
     "enableAll": "Habilitar todo",
     "enableOrDisablePack": "Activar o desactivar paquete",
+    "enableSelected": "Habilitar seleccionados",
     "enabled": "Habilitado",
     "enabling": "Habilitando",
+    "enter": "Entrar",
+    "enterBaseName": "Introduce el nombre base",
+    "enterNewName": "Introduce el nuevo nombre",
+    "enterNewNamePrompt": "Introduce un nuevo nombre:",
+    "enterSubgraph": "Entrar en subgrafo",
     "error": "Error",
     "errorLoadingImage": "Error al cargar imagen",
     "errorLoadingVideo": "Error al cargar video",
+    "essentials": "Esenciales",
+    "expandAll": "Expandir todo",
     "experimental": "BETA",
     "export": "Exportar",
     "extensionName": "Nombre de la extensión",
+    "extensions": "Extensiones",
+    "failed": "Fallido",
     "failedToCopyJobId": "Error al copiar el ID de trabajo",
     "failedToDownloadImage": "Falló la descarga de imagen",
     "failedToDownloadVideo": "Falló la descarga de video",
+    "favorites": "Favoritos",
     "feedback": "Retroalimentación",
     "file": "archivo",
     "filter": "Filtrar",
+    "filterBy": "Filtrar por:",
+    "filterByType": "Filtrar por {type}...",
     "findIssues": "Encontrar problemas",
     "frameNodes": "Enmarcar Nodos",
     "frontendNewer": "La versión del frontend {frontendVersion} puede no ser compatible con la versión del backend {backendVersion}.",
@@ -605,23 +960,32 @@
     "goToNode": "Ir al nodo",
     "graphNavigation": "Navegación de gráficos",
     "halfSpeed": "0.5x",
+    "hideLeftPanel": "Ocultar panel izquierdo",
+    "hideRightPanel": "Ocultar panel derecho",
     "icon": "Icono",
+    "imageDoesNotExist": "La imagen no existe",
     "imageFailedToLoad": "Falló la carga de la imagen",
     "imagePreview": "Vista previa de imagen - Usa las teclas de flecha para navegar entre imágenes",
     "imageUrl": "URL de la imagen",
     "import": "Importar",
     "inProgress": "En progreso",
+    "inSubgraph": "en subgrafo '{name}'",
+    "increment": "Incrementar",
     "info": "Información del Nodo",
+    "input": "Entrada",
     "insert": "Insertar",
     "install": "Instalar",
     "installed": "Instalado",
     "installing": "Instalando",
     "interrupted": "Interrumpido",
     "itemSelected": "{selectedCount} elemento seleccionado",
+    "itemsCopiedToClipboard": "Elementos copiados al portapapeles",
     "itemsSelected": "{selectedCount} elementos seleccionados",
+    "job": "Tarea",
     "jobIdCopied": "ID de trabajo copiado al portapapeles",
     "keybinding": "Combinación de teclas",
     "keybindingAlreadyExists": "La combinación de teclas ya existe en",
+    "keybindings": "Atajos de teclado",
     "learnMore": "Aprende más",
     "listening": "Escuchando...",
     "liveSamplingPreview": "Vista previa de muestreo en vivo",
@@ -632,18 +996,24 @@
     "login": "Iniciar sesión",
     "logoAlt": "Logo de ComfyUI",
     "logs": "Registros",
+    "manageExtensions": "Gestionar extensiones",
     "markdown": "markdown",
     "micPermissionDenied": "Permiso de micrófono denegado",
     "migrate": "Migrar",
     "missing": "Faltante",
+    "more": "Más",
     "moreOptions": "Más Opciones",
     "moreWorkflows": "Más flujos de trabajo",
+    "mostRelevant": "Más relevante",
     "multiSelectDropdown": "Menú desplegable de selección múltiple",
     "name": "Nombre",
     "newFolder": "Nueva carpeta",
     "next": "Siguiente",
+    "nightly": "NIGHTLY",
     "no": "No",
     "noAudioRecorded": "No se grabó audio",
+    "noItems": "Sin elementos",
+    "noResults": "Sin resultados",
     "noResultsFound": "No se encontraron resultados",
     "noTasksFound": "No se encontraron tareas",
     "noTasksFoundMessage": "No hay tareas en la cola.",
@@ -654,26 +1024,49 @@
     "nodeSlotsError": "Error de Ranuras del Nodo",
     "nodeWidgetsError": "Error de Widgets del Nodo",
     "nodes": "Nodos",
+    "nodesCount": "{count} nodos | {count} nodo | {count} nodos",
     "nodesRunning": "nodos en ejecución",
     "none": "Ninguno",
+    "nothingToCopy": "Nada para copiar",
+    "nothingToDelete": "Nada para eliminar",
+    "nothingToDuplicate": "Nada para duplicar",
+    "nothingToRename": "Nada para renombrar",
     "ok": "OK",
     "openManager": "Abrir administrador",
     "openNewIssue": "Abrir nuevo problema",
+    "or": "o",
+    "output": "Salida",
     "overwrite": "Sobrescribir",
+    "partner": "Socio",
+    "playPause": "Reproducir/Pausar",
     "playRecording": "Reproducir grabación",
     "playbackSpeed": "Velocidad de reproducción",
     "playing": "Reproduciendo",
     "pressKeysForNewBinding": "Presiona teclas para nueva asignación",
     "preview": "VISTA PREVIA",
+    "profile": "Perfil",
     "progressCountOf": "de",
+    "queued": "En cola",
     "ready": "Listo",
+    "recents": "Recientes",
     "reconnected": "Reconectado",
     "reconnecting": "Reconectando",
     "refresh": "Actualizar",
     "refreshNode": "Actualizar Nodo",
+    "relativeTime": {
+      "daysAgo": "hace {count}d",
+      "hoursAgo": "hace {count}h",
+      "minutesAgo": "hace {count}min",
+      "monthsAgo": "hace {count}m",
+      "now": "ahora",
+      "weeksAgo": "hace {count}s",
+      "yearsAgo": "hace {count}a"
+    },
     "releaseTitle": "Lanzamiento de {package} {version}",
     "reloadToApplyChanges": "Recargar para aplicar cambios",
+    "remove": "Eliminar",
     "removeImage": "Eliminar imagen",
+    "removeTag": "Eliminar etiqueta",
     "removeVideo": "Eliminar video",
     "rename": "Renombrar",
     "reportIssue": "Enviar informe",
@@ -688,21 +1081,32 @@
     "resizeFromTopRight": "Redimensionar desde la esquina superior derecha",
     "restart": "Reiniciar",
     "resultsCount": "Encontrados {count} resultados",
+    "running": "En ejecución",
     "save": "Guardar",
     "saving": "Guardando",
+    "scrollLeft": "Desplazar a la izquierda",
+    "scrollRight": "Desplazar a la derecha",
     "search": "Buscar",
     "searchExtensions": "Buscar extensiones",
     "searchFailedMessage": "No pudimos encontrar ninguna configuración que coincida con tu búsqueda. Intenta ajustar tus términos de búsqueda.",
     "searchKeybindings": "Buscar combinaciones de teclas",
     "searchModels": "Buscar modelos",
     "searchNodes": "Buscar nodos",
+    "searchPlaceholder": "Buscar...",
     "searchSettings": "Buscar configuraciones",
     "searchWorkflows": "Buscar flujos de trabajo",
     "seeTutorial": "Ver un tutorial",
+    "selectItemsToCopy": "Selecciona elementos para copiar",
+    "selectItemsToDelete": "Selecciona elementos para eliminar",
+    "selectItemsToDuplicate": "Selecciona elementos para duplicar",
+    "selectItemsToRename": "Selecciona elementos para renombrar",
     "selectedFile": "Archivo seleccionado",
     "setAsBackground": "Establecer como fondo",
     "settings": "Configuraciones",
+    "shortcutSuffix": " ({shortcut})",
+    "showLeftPanel": "Mostrar panel izquierdo",
     "showReport": "Mostrar informe",
+    "showRightPanel": "Mostrar panel derecho",
     "singleSelectDropdown": "Menú desplegable de selección única",
     "sort": "Ordenar",
     "source": "Fuente",
@@ -710,19 +1114,24 @@
     "status": "Estado",
     "stopPlayback": "Detener reproducción",
     "stopRecording": "Detener grabación",
+    "submit": "Enviar",
     "success": "Éxito",
     "systemInfo": "Información del sistema",
     "terminal": "Terminal",
     "title": "Título",
     "triggerPhrase": "Frase de activación",
     "unknownError": "Error desconocido",
+    "unknownFile": "Archivo desconocido",
+    "untitled": "Sin título",
     "update": "Actualizar",
     "updateAvailable": "Actualización Disponible",
     "updateFrontend": "Actualizar frontend",
     "updated": "Actualizado",
     "updating": "Actualizando",
     "upload": "Subir",
+    "uploadAlreadyInProgress": "La carga ya está en curso",
     "usageHint": "Sugerencia de uso",
+    "use": "Usar",
     "user": "Usuario",
     "versionMismatchWarning": "Advertencia de compatibilidad de versión",
     "versionMismatchWarningMessage": "{warning}: {detail} Visita https://docs.comfy.org/installation/update_comfyui#common-update-issues para obtener instrucciones de actualización.",
@@ -730,11 +1139,10 @@
     "videoPreview": "Vista previa de video - Usa las teclas de flecha para navegar entre videos",
     "viewImageOfTotal": "Ver imagen {index} de {total}",
     "viewVideoOfTotal": "Ver video {index} de {total}",
-    "vitePreloadErrorMessage": "Se ha lanzado una nueva versión de la aplicación. ¿Deseas recargar?\nSi no lo haces, algunas partes de la aplicación podrían no funcionar correctamente.\nPuedes rechazar y guardar tu progreso antes de recargar.",
-    "vitePreloadErrorTitle": "Nueva versión disponible",
     "volume": "Volumen",
     "warning": "Advertencia",
-    "workflow": "Flujo de trabajo"
+    "workflow": "Flujo de trabajo",
+    "you": "Tú"
   },
   "graphCanvasMenu": {
     "fitView": "Ajustar vista",
@@ -756,11 +1164,17 @@
     "create": "Crear nodo de grupo",
     "enterName": "Introduzca el nombre"
   },
+  "help": {
+    "helpCenterMenu": "Menú del Centro de Ayuda",
+    "recentReleases": "Lanzamientos recientes"
+  },
   "helpCenter": {
     "clickToLearnMore": "Haz clic para saber más →",
     "desktopUserGuide": "Guía de usuario de escritorio",
     "docs": "Documentación",
+    "feedback": "Enviar comentarios",
     "github": "Github",
+    "help": "Ayuda y soporte",
     "loadingReleases": "Cargando versiones...",
     "managerExtension": "Extensión del Administrador",
     "more": "Más...",
@@ -769,6 +1183,12 @@
     "recentReleases": "Lanzamientos recientes",
     "reinstall": "Reinstalar",
     "updateAvailable": "Actualizar",
+    "updateComfyUI": "Actualizar ComfyUI",
+    "updateComfyUIFailed": "No se pudo actualizar ComfyUI. Por favor, inténtelo de nuevo.",
+    "updateComfyUIStarted": "Actualización iniciada",
+    "updateComfyUIStartedDetail": "La actualización de ComfyUI ha sido puesta en cola. Por favor, espere...",
+    "updateComfyUISuccess": "Actualización completa",
+    "updateComfyUISuccessDetail": "ComfyUI ha sido actualizado. Reiniciando...",
     "whatsNew": "¿Qué hay de nuevo?"
   },
   "icon": {
@@ -782,6 +1202,24 @@
     "inbox": "Bandeja de entrada",
     "star": "Estrella"
   },
+  "imageCompare": {
+    "batchLabelA": "A:",
+    "batchLabelB": "B:",
+    "noImages": "No hay imágenes para comparar"
+  },
+  "imageCrop": {
+    "cropPreviewAlt": "Vista previa del recorte",
+    "custom": "Personalizado",
+    "loading": "Cargando...",
+    "lockRatio": "Bloquear relación de aspecto",
+    "noInputImage": "No hay imagen de entrada conectada",
+    "ratio": "Relación",
+    "unlockRatio": "Desbloquear relación de aspecto"
+  },
+  "importFailed": {
+    "copyError": "Error al copiar",
+    "title": "Error de importación"
+  },
   "install": {
     "appDataLocationTooltip": "Directorio de datos de la aplicación ComfyUI. Almacena:\n- Registros\n- Configuraciones del servidor",
     "appPathLocationTooltip": "Directorio de activos de la aplicación ComfyUI. Almacena el código y los activos de ComfyUI",
@@ -795,6 +1233,8 @@
     "failedToSelectDirectory": "Falló al seleccionar el directorio",
     "gpu": "GPU",
     "gpuPicker": {
+      "amdDescription": "Utiliza tu GPU AMD con aceleración ROCm™ para el mejor rendimiento.",
+      "amdSubtitle": "AMD ROCm™",
       "appleMetalDescription": "Aprovecha la GPU de tu Mac para mayor velocidad y una mejor experiencia general",
       "cpuDescription": "Usa el modo CPU para compatibilidad cuando la aceleración GPU no esté disponible",
       "cpuSubtitle": "Modo CPU",
@@ -821,6 +1261,8 @@
       "selectGpuDescription": "Selecciona el tipo de GPU que tienes"
     },
     "helpImprove": "Por favor ayuda a mejorar ComfyUI",
+    "insideAppInstallDir": "Esta carpeta está dentro del paquete de la aplicación ComfyUI Desktop y se eliminará durante las actualizaciones. Elige un directorio fuera de la carpeta de instalación, como Documentos/ComfyUI.",
+    "insideUpdaterCache": "Esta carpeta está dentro de la caché de actualización de ComfyUI, que se borra en cada actualización. Selecciona una ubicación diferente para tus datos.",
     "installLocation": "Ubicación de Instalación",
     "installLocationDescription": "Selecciona el directorio para los datos de usuario de ComfyUI. Un entorno de python será instalado en la ubicación seleccionada.",
     "installLocationTooltip": "Directorio de datos de usuario de ComfyUI. Almacena:\n- Entorno Python\n- Modelos\n- Nodos personalizados\n",
@@ -895,6 +1337,66 @@
   "issueReport": {
     "helpFix": "Ayuda a Solucionar Esto"
   },
+  "linearMode": {
+    "appModeToolbar": {
+      "appBuilder": "Constructor de aplicaciones",
+      "apps": "Aplicaciones",
+      "appsEmptyMessage": "Las aplicaciones guardadas aparecerán aquí.\nHaz clic abajo para crear tu primera aplicación.",
+      "enterAppMode": "Entrar en modo de aplicación"
+    },
+    "arrange": {
+      "atLeastOne": "al menos uno",
+      "connectAtLeastOne": "Conecta {atLeastOne} nodo de salida para que los usuarios puedan ver los resultados después de ejecutar.",
+      "noOutputs": "Aún no se han añadido salidas",
+      "outputExamples": "Ejemplos: 'Guardar imagen' o 'Guardar video'",
+      "outputs": "Salidas",
+      "resultsLabel": "Los resultados generados por el/los nodo(s) de salida seleccionados se mostrarán aquí después de ejecutar esta aplicación",
+      "switchToOutputs": "Cambia al paso 'Salida' y haz clic en los nodos de salida para agregarlos aquí.",
+      "switchToOutputsButton": "Cambiar a Salidas"
+    },
+    "backToWorkflow": "Volver al flujo de trabajo",
+    "beta": "Modo App Beta - Enviar comentarios",
+    "builder": {
+      "exit": "Salir del constructor",
+      "exitConfirmMessage": "Tienes cambios sin guardar que se perderán\n¿Salir sin guardar?",
+      "exitConfirmTitle": "¿Salir del constructor de aplicaciones?",
+      "inputsDesc": "Los usuarios interactuarán y ajustarán estos para generar sus resultados.",
+      "inputsExample": "Ejemplos: “Cargar imagen”, “Prompt de texto”, “Pasos”",
+      "noInputs": "Aún no se han agregado entradas",
+      "noOutputs": "Aún no se han agregado nodos de salida",
+      "outputsDesc": "Conecta al menos un nodo de salida para que los usuarios vean los resultados después de ejecutar.",
+      "outputsExample": "Ejemplos: “Guardar imagen” o “Guardar video”",
+      "promptAddInputs": "Haz clic en los parámetros del nodo para agregarlos aquí como entradas",
+      "promptAddOutputs": "Haz clic en los nodos de salida para agregarlos aquí. Estos serán los resultados generados.",
+      "title": "Modo constructor de aplicaciones",
+      "unknownWidget": "Widget no visible"
+    },
+    "downloadAll": "Descargar todo",
+    "dragAndDropImage": "Arrastra y suelta una imagen",
+    "emptyWorkflowExplanation": "Tu flujo de trabajo está vacío. Necesitas algunos nodos primero para empezar a construir una aplicación.",
+    "enterNodeGraph": "Entrar al grafo de nodos",
+    "giveFeedback": "Enviar comentarios",
+    "graphMode": "Modo gráfico",
+    "linearMode": "Modo App",
+    "loadTemplate": "Cargar una plantilla",
+    "mobileControls": "Editar y ejecutar",
+    "queue": {
+      "clear": "Limpiar cola",
+      "clickToClear": "Haz clic para limpiar la cola"
+    },
+    "rerun": "Volver a ejecutar",
+    "reuseParameters": "Reutilizar parámetros",
+    "runCount": "Número de ejecuciones:",
+    "viewJob": "Ver tarea",
+    "welcome": {
+      "buildApp": "Crear aplicación",
+      "controls": "Tus resultados aparecen abajo, tus controles están a la derecha. Todo lo demás se mantiene fuera del camino.",
+      "getStarted": "Haz clic en {runButton} para comenzar.",
+      "message": "Una vista simplificada que oculta el grafo de nodos para que puedas concentrarte en crear.",
+      "sharing": "Compartir es fácil: crea tu flujo de trabajo, abre el Modo App, haz clic derecho en la pestaña y exporta. Cuando otros abran tu archivo, se lanzará directamente en esta vista limpia. Puedes compartir flujos de trabajo potentes como herramientas simples sin que nadie tenga que entender grafos de nodos.",
+      "title": "Bienvenido al Modo App"
+    }
+  },
   "load3d": {
     "applyingTexture": "Aplicando textura...",
     "backgroundColor": "Color de fondo",
@@ -921,20 +1423,24 @@
       "lineart": "Arte lineal",
       "normal": "Normal",
       "original": "Original",
+      "pointCloud": "Nube de puntos",
       "wireframe": "Malla"
     },
     "model": "Modelo",
     "openIn3DViewer": "Abrir en Visor 3D",
+    "panoramaMode": "Panorama",
     "previewOutput": "Vista previa de salida",
     "reloadingModel": "Recargando modelo...",
     "removeBackgroundImage": "Eliminar imagen de fondo",
     "resizeNodeMatchOutput": "Redimensionar nodo para coincidir con la salida",
     "scene": "Escena",
     "showGrid": "Mostrar cuadrícula",
+    "showSkeleton": "Mostrar esqueleto",
     "startRecording": "Iniciar grabación",
     "stopRecording": "Detener grabación",
     "switchCamera": "Cambiar cámara",
     "switchingMaterialMode": "Cambiando modo de material...",
+    "tiledMode": "Mosaico",
     "unsupportedFileType": "Tipo de archivo no compatible (admite .gltf, .glb, .obj, .fbx, .stl)",
     "upDirection": "Dirección hacia arriba",
     "upDirections": {
@@ -955,6 +1461,11 @@
       "title": "Visor 3D (Beta)"
     }
   },
+  "loadWorkflowWarning": {
+    "coreNodesFromVersion": "Nodos principales de la versión {version}:",
+    "outdatedVersion": "Este flujo de trabajo fue creado con una versión más reciente de ComfyUI ({version}). Es posible que algunos nodos no funcionen correctamente.",
+    "outdatedVersionGeneric": "Este flujo de trabajo fue creado con una versión más reciente de ComfyUI. Es posible que algunos nodos no funcionen correctamente."
+  },
   "maintenance": {
     "None": "Ninguno",
     "OK": "OK",
@@ -973,11 +1484,21 @@
     "showManual": "Mostrar tareas de mantenimiento",
     "status": "Estado",
     "terminalDefaultMessage": "Cuando ejecutes un comando de solución de problemas, cualquier salida se mostrará aquí.",
-    "title": "Mantenimiento"
+    "title": "Mantenimiento",
+    "unsafeMigration": {
+      "action": "Utilice la tarea de mantenimiento \"Ruta base\" a continuación para mover ComfyUI a una ubicación segura.",
+      "appInstallDir": "Su ruta base está dentro del paquete de la aplicación ComfyUI Desktop. Esta carpeta puede ser eliminada o sobrescrita durante las actualizaciones. Elija un directorio fuera de la carpeta de instalación, como Documentos/ComfyUI.",
+      "generic": "La ruta base actual de ComfyUI está en una ubicación que puede ser eliminada o modificada durante las actualizaciones. Para evitar la pérdida de datos, muévala a una carpeta segura.",
+      "oneDrive": "Su ruta base está en OneDrive, lo que puede causar problemas de sincronización y pérdida accidental de datos. Elija una carpeta local que no esté gestionada por OneDrive.",
+      "title": "Ubicación de instalación no segura detectada",
+      "updaterCache": "Su ruta base está dentro de la caché del actualizador de ComfyUI, que se borra en cada actualización. Elija una ubicación diferente para sus datos."
+    }
   },
   "manager": {
+    "actions": "Acciones",
     "allMissingNodesInstalled": "Todos los nodos faltantes se han instalado exitosamente",
     "applyChanges": "Aplicar Cambios",
+    "basicInfo": "Información básica",
     "changingVersion": "Cambiando versión de {from} a {to}",
     "clickToFinishSetup": "Haz clic",
     "conflicts": {
@@ -1013,6 +1534,28 @@
     "disabledNodesWontUpdate": "Los nodos deshabilitados no se actualizarán",
     "discoverCommunityContent": "Descubre paquetes de nodos, extensiones y más creados por la comunidad...",
     "downloads": "Descargas",
+    "emptyState": {
+      "allInstalled": {
+        "message": "Aún no has instalado ninguna extensión.",
+        "title": "No hay extensiones instaladas"
+      },
+      "conflicting": {
+        "message": "Todas tus extensiones son compatibles.",
+        "title": "No se detectaron conflictos"
+      },
+      "missing": {
+        "message": "Todos los nodos requeridos están instalados.",
+        "title": "No hay nodos faltantes"
+      },
+      "updateAvailable": {
+        "message": "Todas tus extensiones están actualizadas.",
+        "title": "Todo actualizado"
+      },
+      "workflow": {
+        "message": "Este flujo de trabajo no utiliza ningún nodo de extensión.",
+        "title": "Sin extensiones en el flujo de trabajo"
+      }
+    },
     "enablePackToChangeVersion": "Habilita este paquete para cambiar versiones",
     "errorConnecting": "Error al conectar con el Registro de Nodos Comfy.",
     "extensionsSuccessfullyInstalled": "¡Extensión(es) instalada(s) exitosamente y lista(s) para usar!",
@@ -1034,25 +1577,42 @@
     "installingDependencies": "Instalando dependencias...",
     "lastUpdated": "Última Actualización",
     "latestVersion": "Última",
+    "legacyManagerSearchTip": "¿Buscas ComfyUI-Manager? Puedes habilitar la interfaz de administrador heredada iniciando ComfyUI con el parámetro --enable-manager-legacy-ui.",
     "legacyManagerUI": "Usar UI antigua",
     "legacyManagerUIDescription": "Para usar la UI antigua del Manager, inicia ComfyUI con --enable-manager-legacy-ui",
     "legacyMenuNotAvailable": "El menú del administrador antiguo no está disponible en esta versión de ComfyUI. Por favor, utiliza el nuevo menú del administrador en su lugar.",
     "license": "Licencia",
     "loadingVersions": "Cargando versiones...",
     "mixedSelectionMessage": "No se puede realizar acción masiva en selección mixta",
+    "nav": {
+      "allExtensions": "Todas las extensiones",
+      "allInWorkflow": "Todo en: {workflowName}",
+      "allInstalled": "Todo instalado",
+      "conflicting": "En conflicto",
+      "inWorkflowSection": "EN EL FLUJO DE TRABAJO",
+      "installedSection": "INSTALADO",
+      "missingNodes": "Nodos faltantes",
+      "notInstalled": "No instalado",
+      "updatesAvailable": "Actualizaciones disponibles"
+    },
     "nightlyVersion": "Nocturna",
     "noDescription": "No hay descripción disponible",
     "noNodesFound": "No se encontraron nodos",
     "noNodesFoundDescription": "Los nodos del paquete no se pudieron analizar, o el paquete es solo una extensión de frontend y no tiene ningún nodo.",
     "noResultsFound": "No se encontraron resultados que coincidan con tu búsqueda.",
     "nodePack": "Paquete de Nodos",
+    "nodePackInfo": "Información del paquete de nodos",
     "notAvailable": "No Disponible",
+    "packInstall": {
+      "nodeIdRequired": "Se requiere el ID del nodo para la instalación"
+    },
     "packsSelected": "Paquetes Seleccionados",
     "repository": "Repositorio",
     "restartToApplyChanges": "Para aplicar los cambios, por favor reinicia ComfyUI",
     "restartingBackend": "Reiniciando backend para aplicar cambios...",
     "searchPlaceholder": "Buscar",
     "selectVersion": "Seleccionar Versión",
+    "selected": "Seleccionado",
     "sort": {
       "created": "Más reciente",
       "downloads": "Más Popular",
@@ -1074,6 +1634,8 @@
     "totalNodes": "Total de Nodos",
     "tryAgainLater": "Por favor intenta de nuevo más tarde.",
     "tryDifferentSearch": "Por favor intenta con una consulta de búsqueda diferente.",
+    "tryUpdate": "Intentar actualizar",
+    "tryUpdateTooltip": "Obtén los últimos cambios del repositorio. Las versiones nocturnas pueden tener actualizaciones que no se detectan automáticamente.",
     "uninstall": "Desinstalar",
     "uninstallSelected": "Desinstalar Seleccionado",
     "uninstalling": "Desinstalando",
@@ -1084,31 +1646,111 @@
     "version": "Versión"
   },
   "maskEditor": {
+    "activateLayer": "Activar capa",
+    "applyToWholeImage": "Aplicar a toda la imagen",
+    "baseImageLayer": "Capa de imagen base",
+    "baseLayerPreview": "Vista previa de la capa base",
+    "black": "Negro",
+    "brushSettings": "Configuración del pincel",
+    "brushShape": "Forma del pincel",
+    "clear": "Limpiar",
+    "clickToResetZoom": "Haz clic para restablecer el zoom",
+    "colorSelectSettings": "Configuración de selección de color",
+    "colorSelector": "Selector de color",
+    "fillOpacity": "Opacidad de relleno",
+    "hardness": "Dureza",
+    "imageLayer": "Capa de imagen",
+    "invert": "Invertir",
+    "layers": "Capas",
+    "livePreview": "Vista previa en vivo",
+    "maskBlendingOptions": "Opciones de fusión de máscara",
+    "maskLayer": "Capa de máscara",
+    "maskOpacity": "Opacidad de máscara",
+    "maskTolerance": "Tolerancia de máscara",
+    "method": "Método",
+    "mirrorHorizontal": "Espejar horizontalmente",
+    "mirrorVertical": "Espejar verticalmente",
+    "negative": "Negativo",
+    "opacity": "Opacidad",
+    "paintBucketSettings": "Configuración del bote de pintura",
+    "paintLayer": "Capa de pintura",
+    "redo": "Rehacer",
+    "resetToDefault": "Restablecer a valores predeterminados",
+    "rotateLeft": "Girar a la izquierda",
+    "rotateRight": "Girar a la derecha",
+    "selectionOpacity": "Opacidad de selección",
+    "smoothingPrecision": "Precisión de suavizado",
+    "stepSize": "Tamaño del paso",
+    "stopAtMask": "Detener en la máscara",
+    "thickness": "Grosor",
+    "title": "Editor de máscara",
+    "tolerance": "Tolerancia",
+    "undo": "Deshacer",
+    "white": "Blanco"
   },
   "mediaAsset": {
+    "actions": {
+      "copyJobId": "Copiar ID de trabajo",
+      "delete": "Eliminar",
+      "download": "Descargar",
+      "exportWorkflow": "Exportar flujo de trabajo",
+      "insertAsNodeInWorkflow": "Insertar como nodo en el flujo de trabajo",
+      "inspect": "Inspeccionar recurso",
+      "more": "Más opciones",
+      "moreOptions": "Más opciones",
+      "openWorkflow": "Abrir como flujo de trabajo en una nueva pestaña",
+      "seeMoreOutputs": "Ver más resultados",
+      "zoom": "Acercar"
+    },
     "assetDeletedSuccessfully": "Recurso eliminado exitosamente",
     "deleteAssetDescription": "Este recurso será eliminado permanentemente.",
     "deleteAssetTitle": "¿Eliminar este recurso?",
     "deleteSelectedDescription": "{count} recurso(s) será(n) eliminado(s) permanentemente.",
     "deleteSelectedTitle": "¿Eliminar los recursos seleccionados?",
     "deletingImportedFilesCloudOnly": "La eliminación de archivos importados solo es compatible en la versión cloud",
+    "failedToCreateNode": "No se pudo crear el nodo",
     "failedToDeleteAsset": "Error al eliminar el recurso",
+    "failedToExportWorkflow": "No se pudo exportar el flujo de trabajo",
     "jobIdToast": {
       "copied": "Copiado",
       "error": "Error",
       "jobIdCopied": "ID de trabajo copiado al portapapeles",
       "jobIdCopyFailed": "Error al copiar el ID de trabajo"
     },
+    "noJobIdFound": "No se encontró ID de trabajo para este recurso",
+    "noWorkflowDataFound": "No se encontraron datos de flujo de trabajo en este recurso",
+    "nodeAddedToWorkflow": "Nodo {nodeType} agregado al flujo de trabajo",
+    "nodeTypeNotFound": "Tipo de nodo {nodeType} no encontrado",
     "selection": {
       "assetsDeletedSuccessfully": "{count} recurso(s) eliminado(s) exitosamente",
       "deleteSelected": "Eliminar",
+      "deleteSelectedAll": "Eliminar todo",
       "deselectAll": "Deseleccionar todo",
       "downloadSelected": "Descargar",
+      "downloadSelectedAll": "Descargar todo",
       "downloadStarted": "Descargando {count} archivos...",
       "downloadsStarted": "Se inició la descarga de {count} archivo(s)",
+      "exportStarted": "Preparando exportación ZIP para {count} archivo | Preparando exportación ZIP para {count} archivos",
+      "exportWorkflowAll": "Exportar todos los flujos de trabajo",
+      "failedToAddNodes": "No se pudieron añadir nodos al flujo de trabajo",
       "failedToDeleteAssets": "Error al eliminar los recursos seleccionados",
-      "selectedCount": "Recursos seleccionados: {count}"
-    }
+      "insertAllAssetsAsNodes": "Insertar todos los recursos como nodos",
+      "multipleSelectedAssets": "Varios recursos seleccionados",
+      "noWorkflowsFound": "No se encontraron datos de flujo de trabajo en los recursos seleccionados",
+      "noWorkflowsToExport": "No se encontraron datos de flujo de trabajo para exportar",
+      "nodesAddedToWorkflow": "{count} nodo(s) añadido(s) al flujo de trabajo",
+      "openWorkflowAll": "Abrir todos los flujos de trabajo",
+      "partialAddNodesSuccess": "{succeeded} añadido(s) correctamente, {failed} fallido(s)",
+      "partialDeleteSuccess": "{succeeded} eliminados correctamente, {failed} fallidos",
+      "partialWorkflowsExported": "{succeeded} exportado(s) correctamente, {failed} fallido(s)",
+      "partialWorkflowsOpened": "{succeeded} flujo(s) de trabajo abierto(s), {failed} fallido(s)",
+      "selectedCount": "Recursos seleccionados: {count}",
+      "workflowsExported": "{count} flujo(s) de trabajo exportado(s) correctamente",
+      "workflowsOpened": "{count} flujo(s) de trabajo abierto(s) en nuevas pestañas"
+    },
+    "unsupportedFileType": "Tipo de archivo no compatible para el nodo de carga",
+    "workflowExportedSuccessfully": "Flujo de trabajo exportado correctamente",
+    "workflowOpenedInNewTab": "Flujo de trabajo abierto en una nueva pestaña"
   },
   "menu": {
     "autoQueue": "Cola automática",
@@ -1116,11 +1758,14 @@
     "batchCountTooltip": "El número de veces que la generación del flujo de trabajo debe ser encolada",
     "clear": "Limpiar flujo de trabajo",
     "clipspace": "Abrir Clipspace",
+    "customNodesManager": "Gestor de nodos personalizados",
     "dark": "Oscuro",
     "disabled": "Deshabilitado",
     "disabledTooltip": "El flujo de trabajo no se encolará automáticamente",
     "execute": "Ejecutar",
+    "fullscreen": "Pantalla completa",
     "help": "Ayuda",
+    "helpAndFeedback": "Ayuda y comentarios",
     "hideMenu": "Ocultar menú",
     "instant": "Instantáneo",
     "instantTooltip": "El flujo de trabajo se encolará instantáneamente después de que finalice una generación",
@@ -1134,9 +1779,12 @@
     "resetView": "Restablecer vista del lienzo",
     "run": "Ejecutar",
     "runWorkflow": "Ejecutar flujo de trabajo (Shift para encolar al frente)",
+    "runWorkflowDisabled": "El flujo de trabajo contiene nodos no compatibles (resaltados en rojo). Elimínelos para ejecutar el flujo de trabajo.",
     "runWorkflowFront": "Ejecutar flujo de trabajo (Encolar al frente)",
     "settings": "Configuración",
     "showMenu": "Mostrar menú",
+    "stopRunInstant": "Detener ejecución (instantáneo)",
+    "stopRunInstantTooltip": "Detener ejecución",
     "theme": "Tema",
     "toggleBottomPanel": "Alternar panel inferior"
   },
@@ -1149,6 +1797,7 @@
     "Canvas Performance": "Rendimiento del Lienzo",
     "Canvas Toggle Lock": "Alternar bloqueo en lienzo",
     "Check for Custom Node Updates": "Buscar actualizaciones de nodos personalizados",
+    "Check for Updates": "Buscar actualizaciones",
     "Clear Pending Tasks": "Borrar tareas pendientes",
     "Clear Workflow": "Borrar flujo de trabajo",
     "Clipspace": "Espacio de clip",
@@ -1161,16 +1810,19 @@
     "Contact Support": "Contactar soporte",
     "Convert Selection to Subgraph": "Convertir selección en subgrafo",
     "Convert selected nodes to group node": "Convertir nodos seleccionados en nodo de grupo",
+    "Copy": "Copiar",
     "Custom Nodes (Legacy)": "Nodos personalizados (heredado)",
     "Custom Nodes Manager": "Administrador de Nodos Personalizados",
     "Decrease Brush Size in MaskEditor": "Disminuir tamaño del pincel en MaskEditor",
     "Delete Selected Items": "Eliminar elementos seleccionados",
+    "Desktop User Guide": "Guía de usuario de escritorio",
     "Duplicate Current Workflow": "Duplicar flujo de trabajo actual",
     "Edit": "Editar",
     "Edit Subgraph Widgets": "Editar widgets de subgrafo",
     "Exit Subgraph": "Salir de Subgrafo",
     "Experimental: Browse Model Assets": "Experimental: Explorar recursos de modelos",
     "Experimental: Enable AssetAPI": "Experimental: Habilitar AssetAPI",
+    "Experimental: Enable Nodes 2_0": "Experimental: Activar Nodes 2.0",
     "Export": "Exportar",
     "Export (API)": "Exportar (API)",
     "File": "Archivo",
@@ -1182,12 +1834,15 @@
     "Increase Brush Size in MaskEditor": "Aumentar tamaño del pincel en MaskEditor",
     "Install Missing Custom Nodes": "Instalar nodos personalizados faltantes",
     "Interrupt": "Interrumpir",
+    "Job History": "Historial de trabajos",
     "Load Default Workflow": "Cargar flujo de trabajo predeterminado",
     "Lock Canvas": "Bloquear Lienzo",
     "Manage group nodes": "Gestionar nodos de grupo",
     "Manager": "Administrador",
     "Manager Menu (Legacy)": "Menú de gestión (heredado)",
     "Minimap": "Minimapa",
+    "Mirror Horizontal in MaskEditor": "Espejar horizontalmente en el editor de máscaras",
+    "Mirror Vertical in MaskEditor": "Espejar verticalmente en el editor de máscaras",
     "Model Library": "Biblioteca de Modelos",
     "Move Selected Nodes Down": "Mover nodos seleccionados hacia abajo",
     "Move Selected Nodes Left": "Mover nodos seleccionados hacia la izquierda",
@@ -1199,9 +1854,18 @@
     "Node Library": "Biblioteca de Nodos",
     "Node Links": "Enlaces de nodos",
     "Open": "Abrir",
-    "Open 3D Viewer (Beta) for Selected Node": "Abrir Visor 3D (Beta) para Nodo Seleccionado",
+    "Open 3D Viewer (Beta) for Selected Node": "Abrir visor 3D (Beta) para el nodo seleccionado",
+    "Open Color Picker in MaskEditor": "Abrir selector de color en MaskEditor",
+    "Open Custom Nodes Folder": "Abrir carpeta de nodos personalizados",
+    "Open DevTools": "Abrir herramientas de desarrollo",
+    "Open Inputs Folder": "Abrir carpeta de entradas",
+    "Open Logs Folder": "Abrir carpeta de registros",
     "Open Mask Editor for Selected Node": "Abrir el editor de mask para el nodo seleccionado",
+    "Open Models Folder": "Abrir carpeta de modelos",
+    "Open Outputs Folder": "Abrir carpeta de salidas",
     "Open Sign In Dialog": "Abrir diálogo de inicio de sesión",
+    "Open extra_model_paths_yaml": "Abrir extra_model_paths.yaml",
+    "Paste": "Pegar",
     "Pin/Unpin Selected Items": "Anclar/Desanclar elementos seleccionados",
     "Pin/Unpin Selected Nodes": "Anclar/Desanclar nodos seleccionados",
     "Previous Opened Workflow": "Flujo de trabajo abierto anterior",
@@ -1209,24 +1873,34 @@
     "Queue Prompt": "Indicador de cola",
     "Queue Prompt (Front)": "Indicador de cola (Frente)",
     "Queue Selected Output Nodes": "Encolar nodos de salida seleccionados",
+    "Quit": "Salir",
     "Redo": "Rehacer",
     "Refresh Node Definitions": "Actualizar definiciones de nodo",
+    "Reinstall": "Reinstalar",
+    "Rename": "Renombrar",
     "Reset View": "Restablecer vista",
     "Resize Selected Nodes": "Redimensionar Nodos Seleccionados",
+    "Restart": "Reiniciar",
+    "Rotate Left in MaskEditor": "Girar a la izquierda en el editor de máscaras",
+    "Rotate Right in MaskEditor": "Girar a la derecha en el editor de máscaras",
     "Save": "Guardar",
     "Save As": "Guardar como",
+    "Select All": "Seleccionar todo",
+    "Set Subgraph Description": "Establecer descripción del subgrafo",
+    "Set Subgraph Search Aliases": "Establecer alias de búsqueda del subgrafo",
     "Show Keybindings Dialog": "Mostrar diálogo de combinaciones de teclas",
     "Show Model Selector (Dev)": "Mostrar selector de modelo (Desarrollo)",
     "Show Settings Dialog": "Mostrar diálogo de configuración",
     "Sign Out": "Cerrar sesión",
+    "Toggle App Mode": "Alternar modo App",
     "Toggle Essential Bottom Panel": "Alternar panel inferior esencial",
-    "Toggle Logs Bottom Panel": "Alternar panel inferior de registros",
+    "Toggle Logs Bottom Panel": "Mostrar/ocultar panel inferior de registros",
+    "Toggle Queue Panel V2": "Alternar panel de cola V2",
     "Toggle Search Box": "Alternar caja de búsqueda",
-    "Toggle Terminal Bottom Panel": "Alternar panel inferior de terminal",
+    "Toggle Terminal Bottom Panel": "Mostrar/ocultar panel inferior de terminal",
     "Toggle Theme (Dark/Light)": "Alternar tema (Oscuro/Claro)",
     "Toggle View Controls Bottom Panel": "Alternar panel inferior de controles de vista",
     "Toggle promotion of hovered widget": "Alternar promoción del widget sobre el que se pasa el cursor",
-    "Toggle the Custom Nodes Manager Progress Bar": "Alternar la Barra de Progreso del Administrador de Nodos Personalizados",
     "Undo": "Deshacer",
     "Ungroup selected group nodes": "Desagrupar nodos de grupo seleccionados",
     "Unload Models": "Descargar modelos",
@@ -1237,7 +1911,8 @@
     "Workflows": "Flujos de trabajo",
     "Zoom In": "Acercar",
     "Zoom Out": "Alejar",
-    "Zoom to fit": "Ajustar al tamaño"
+    "Zoom to fit": "Ajustar al tamaño",
+    "linearMode_appModeToolbar_apps": "linearMode.appModeToolbar.apps"
   },
   "minimap": {
     "nodeColors": "Colores de nodos",
@@ -1247,20 +1922,66 @@
     "showLinks": "Mostrar enlaces"
   },
   "missingModelsDialog": {
+    "acceptTerms": "Aceptar términos",
+    "customModelsInstruction": "Tendrás que encontrarlos y descargarlos manualmente. Búscalos en línea (prueba Civitai o Hugging Face) o contacta al proveedor original del flujo de trabajo.",
+    "customModelsWarning": "Algunos de estos son modelos personalizados que no reconocemos.",
+    "description": "Este flujo de trabajo requiere modelos que aún no has descargado.",
     "doNotAskAgain": "No mostrar esto de nuevo",
-    "missingModels": "Modelos faltantes",
-    "missingModelsMessage": "Al cargar el gráfico, no se encontraron los siguientes modelos"
+    "downloadAll": "Descargar todo",
+    "downloadAvailable": "Descargar disponibles",
+    "footerDescription": "Descarga y coloca estos modelos en la carpeta correcta.\nLos nodos con modelos faltantes están resaltados en rojo en el lienzo.",
+    "gotIt": "Entendido",
+    "reEnableInSettings": "Vuelve a habilitar en {link}",
+    "reEnableInSettingsLink": "Configuración",
+    "title": "Faltan modelos en este flujo de trabajo",
+    "totalSize": "Tamaño total de descarga:"
+  },
+  "missingNodes": {
+    "cloud": {
+      "description": "Este flujo de trabajo utiliza nodos personalizados que aún no son compatibles con la versión Cloud.",
+      "gotIt": "Entendido",
+      "learnMore": "Saber más",
+      "priorityMessage": "Hemos marcado automáticamente estos nodos para priorizar su incorporación.",
+      "replacementInstruction": "Mientras tanto, reemplaza estos nodos (resaltados en rojo en el lienzo) por otros compatibles si es posible, o prueba con otro flujo de trabajo.",
+      "title": "Estos nodos aún no están disponibles en Comfy Cloud"
+    },
+    "oss": {
+      "description": "Este flujo de trabajo utiliza nodos personalizados que aún no has instalado.",
+      "replacementInstruction": "Instala estos nodos para ejecutar este flujo de trabajo, o reemplázalos por alternativas ya instaladas. Los nodos faltantes están resaltados en rojo en el lienzo.",
+      "title": "Este flujo de trabajo tiene nodos faltantes"
+    }
+  },
+  "nightly": {
+    "badge": {
+      "label": "Versión preliminar",
+      "tooltip": "Estás usando una versión nightly de ComfyUI. Por favor, utiliza el botón de comentarios para compartir tus opiniones sobre estas funciones."
+    }
+  },
+  "nightlySurvey": {
+    "accept": "¡Claro, ayudaré!",
+    "description": "Has estado usando esta función. ¿Te tomarías un momento para compartir tus comentarios?",
+    "dontAskAgain": "No preguntar de nuevo",
+    "loadError": "No se pudo cargar la encuesta. Por favor, inténtalo de nuevo más tarde.",
+    "notNow": "Ahora no",
+    "title": "Ayúdanos a mejorar"
   },
   "nodeCategories": {
+    "": "",
     "3d": "3d",
     "3d_models": "modelos_3d",
     "BFL": "BFL",
+    "Bria": "Bria",
     "ByteDance": "ByteDance",
+    "ElevenLabs": "ElevenLabs",
     "Gemini": "Gemini",
+    "Grok": "Grok",
+    "HitPaw": "HitPaw",
     "Ideogram": "Ideogram",
     "Kling": "Kling",
     "LTXV": "LTXV",
     "Luma": "Luma",
+    "Magnific": "Magnific",
+    "Meshy": "Meshy",
     "MiniMax": "MiniMax",
     "Moonvalley Marey": "Moonvalley Marey",
     "OpenAI": "OpenAI",
@@ -1270,10 +1991,13 @@
     "Runway": "Runway",
     "Sora": "Sora",
     "Stability AI": "Stability AI",
+    "Tencent": "Tencent",
+    "Topaz": "Topaz",
     "Tripo": "Tripo",
     "Veo": "Veo",
     "Vidu": "Vidu",
     "Wan": "Wan",
+    "WaveSpeed": "WaveSpeed",
     "_for_testing": "_para_pruebas",
     "advanced": "avanzado",
     "animation": "animación",
@@ -1294,6 +2018,7 @@
     "controlnet": "controlnet",
     "create": "crear",
     "custom_sampling": "muestreo_personalizado",
+    "dataset": "conjunto de datos",
     "debug": "depurar",
     "deprecated": "obsoleto",
     "edit_models": "editar_modelos",
@@ -1305,8 +2030,10 @@
     "image": "imagen",
     "inpaint": "pintar",
     "instructpix2pix": "instruirpix2pix",
+    "kandinsky5": "kandinsky5",
     "latent": "latent",
     "loaders": "cargadores",
+    "logic": "lógica",
     "lotus": "lotus",
     "ltxv": "ltxv",
     "mask": "mask",
@@ -1328,11 +2055,13 @@
     "scheduling": "programación",
     "sd": "sd",
     "sd3": "sd3",
+    "shader": "shader",
     "sigmas": "sigmas",
     "stable_cascade": "stable_cascade",
     "string": "cadena",
     "style_model": "modelo_de_estilo",
     "text": "texto",
+    "textgen": "textgen",
     "training": "entrenamiento",
     "transform": "transformar",
     "unet": "unet",
@@ -1340,7 +2069,25 @@
     "upscaling": "escalado",
     "utils": "utilidades",
     "video": "video",
-    "video_models": "modelos_de_video"
+    "video_models": "modelos_de_video",
+    "zimage": "zimage"
+  },
+  "nodeErrors": {
+    "content": "Error de contenido del nodo",
+    "header": "Error de encabezado del nodo",
+    "render": "Error de renderizado del nodo",
+    "slots": "Error de ranuras del nodo",
+    "widgets": "Error de widgets del nodo"
+  },
+  "nodeFilters": {
+    "hideDeprecated": "Ocultar nodos obsoletos",
+    "hideDeprecatedDescription": "Oculta los nodos marcados como obsoletos a menos que se habiliten explícitamente",
+    "hideDevOnly": "Ocultar nodos solo para desarrolladores",
+    "hideDevOnlyDescription": "Oculta los nodos marcados como solo para desarrolladores a menos que el modo desarrollador esté habilitado",
+    "hideExperimental": "Ocultar nodos experimentales",
+    "hideExperimentalDescription": "Oculta los nodos marcados como experimentales a menos que se habiliten explícitamente",
+    "hideSubgraph": "Ocultar nodos de subgráfica",
+    "hideSubgraphDescription": "Oculta temporalmente los nodos de subgráfica de la biblioteca de nodos y la búsqueda"
   },
   "nodeHelpPage": {
     "documentationPage": "página de documentación",
@@ -1350,6 +2097,32 @@
     "outputs": "Salidas",
     "type": "Tipo"
   },
+  "nodeReplacement": {
+    "compatibleAlternatives": "Alternativas compatibles",
+    "installMissingNodes": "Instalar nodos faltantes",
+    "installationRequired": "Instalación requerida",
+    "instructionMessage": "Debes instalar estos nodos o reemplazarlos por alternativas instaladas para ejecutar el flujo de trabajo. Los nodos faltantes están resaltados en {red} en el lienzo. Algunos nodos no se pueden intercambiar y deben instalarse mediante el Administrador de Nodos.",
+    "notReplaceable": "Instalación requerida",
+    "openNodeManager": "Abrir Administrador de Nodos",
+    "quickFixAvailable": "Solución rápida disponible",
+    "redHighlight": "rojo",
+    "replaceAll": "Reemplazar todo",
+    "replaceAllWarning": "Reemplaza todos los nodos disponibles en este grupo.",
+    "replaceFailed": "Error al reemplazar nodos",
+    "replaceNode": "Reemplazar nodo",
+    "replaceSelected": "Reemplazar seleccionados ({count})",
+    "replaceWarning": "Esto modificará permanentemente el flujo de trabajo. Guarda una copia primero si no estás seguro.",
+    "replaceable": "Reemplazable",
+    "replaced": "Reemplazado",
+    "replacedAllNodes": "Reemplazados {count} tipo(s) de nodo",
+    "replacedNode": "Nodo reemplazado: {nodeType}",
+    "selectAll": "Seleccionar todo",
+    "skipForNow": "Omitir por ahora",
+    "swapNodesGuide": "Los siguientes nodos pueden ser reemplazados automáticamente por alternativas compatibles.",
+    "swapNodesTitle": "Intercambiar nodos",
+    "unknownNode": "Desconocido",
+    "willBeReplacedBy": "Este nodo será reemplazado por:"
+  },
   "nodeTemplates": {
     "enterName": "Introduzca el nombre",
     "saveAsTemplate": "Guardar como plantilla"
@@ -1357,6 +2130,7 @@
   "notSupported": {
     "continue": "Continuar",
     "continueTooltip": "Estoy seguro de que mi dispositivo es compatible",
+    "illustrationAlt": "Ilustración de chica triste",
     "learnMore": "Aprender más",
     "message": "Solo los siguientes dispositivos son compatibles:",
     "reportIssue": "Reportar problema",
@@ -1366,12 +2140,222 @@
     },
     "title": "Tu dispositivo no es compatible"
   },
+  "painter": {
+    "background": "Fondo",
+    "brush": "Pincel",
+    "clear": "Limpiar",
+    "color": "Selector de color",
+    "eraser": "Borrador",
+    "hardness": "Dureza",
+    "height": "Alto",
+    "size": "Tamaño del cursor",
+    "tool": "Herramienta",
+    "uploadError": "Error al cargar la imagen del pintor: {status} - {statusText}",
+    "width": "Ancho"
+  },
+  "progressToast": {
+    "allDownloadsCompleted": "Todas las descargas completadas",
+    "downloadingModel": "Descargando modelo...",
+    "downloadsFailed": "{count} descargas fallidas | {count} descarga fallida | {count} descargas fallidas",
+    "failed": "Fallido",
+    "filter": {
+      "all": "Todo",
+      "completed": "Completado",
+      "failed": "Fallido"
+    },
+    "finished": "Finalizado",
+    "importingModels": "Importando modelos",
+    "noImportsInQueue": "No hay {filter} en la cola",
+    "pending": "Pendiente",
+    "progressCount": "{completed} de {total}"
+  },
+  "queue": {
+    "completedIn": "Finalizado en {duration}",
+    "inQueue": "En cola...",
+    "initializingAlmostReady": "Inicializando - Casi listo",
+    "jobAddedToQueue": "Trabajo añadido a la cola",
+    "jobDetails": {
+      "computeHoursUsed": "Horas de cómputo usadas",
+      "errorMessage": "Mensaje de error",
+      "estimatedFinishIn": "Finalización estimada en",
+      "estimatedStartIn": "Inicio estimado en",
+      "eta": {
+        "minutes": "~{count} minuto | ~{count} minutos",
+        "minutesRange": "~{lo}-{hi} minutos",
+        "seconds": "~{count} segundo | ~{count} segundos",
+        "secondsRange": "~{lo}-{hi} segundos"
+      },
+      "failedAfter": "Falló después de",
+      "generatedOn": "Generado en",
+      "header": "Detalles del trabajo",
+      "jobId": "ID de trabajo",
+      "queuePosition": "Posición en la cola",
+      "queuePositionValue": "~{count} trabajo antes que el tuyo | ~{count} trabajos antes que el tuyo",
+      "queuedAt": "En cola a las",
+      "report": "Reportar",
+      "timeElapsed": "Tiempo transcurrido",
+      "totalGenerationTime": "Tiempo total de generación",
+      "workflow": "Flujo de trabajo"
+    },
+    "jobHistory": "Historial de trabajos",
+    "jobList": {
+      "sortComputeHoursUsed": "Horas de cómputo usadas (primero el mayor)",
+      "sortMostRecent": "Más reciente",
+      "sortTotalGenerationTime": "Tiempo total de generación (primero el más largo)",
+      "undated": "Sin fecha"
+    },
+    "jobMenu": {
+      "addToCurrentWorkflow": "Agregar al flujo de trabajo actual",
+      "cancelJob": "Cancelar trabajo",
+      "copyErrorMessage": "Copiar mensaje de error",
+      "copyJobId": "Copiar ID de trabajo",
+      "delete": "Eliminar",
+      "deleteAsset": "Eliminar recurso",
+      "download": "Descargar",
+      "exportWorkflow": "Exportar flujo de trabajo",
+      "inspectAsset": "Inspeccionar recurso",
+      "openAsWorkflowNewTab": "Abrir como flujo de trabajo en nueva pestaña",
+      "openWorkflowNewTab": "Abrir flujo de trabajo en nueva pestaña",
+      "removeJob": "Quitar trabajo",
+      "reportError": "Reportar error"
+    },
+    "jobQueueing": "Encolando trabajo",
+    "toggleJobHistory": "Alternar historial de trabajos"
+  },
   "releaseToast": {
+    "description": "Descubre las últimas mejoras y funciones en esta actualización.",
     "newVersionAvailable": "¡Nueva versión disponible!",
     "skip": "Omitir",
     "update": "Actualizar",
     "whatsNew": "¿Qué hay de nuevo?"
   },
+  "rightSidePanel": {
+    "addFavorite": "Favorito",
+    "advancedInputs": "ENTRADAS AVANZADAS",
+    "bypass": "Omitir",
+    "color": "Color del nodo",
+    "enterSubgraph": "Entrar en subgrafo",
+    "errorHelp": "Para más ayuda, {github} o {support}",
+    "errorHelpGithub": "envía un issue en GitHub",
+    "errorHelpSupport": "contacta con nuestro soporte",
+    "errors": "Errores",
+    "executionErrorOccurred": "Ocurrió un error durante la ejecución. Consulta la pestaña de Errores para más detalles.",
+    "fallbackGroupTitle": "Grupo",
+    "fallbackNodeTitle": "Nodo",
+    "favorites": "ENTRADAS FAVORITAS",
+    "favoritesNone": "SIN ENTRADAS FAVORITAS",
+    "favoritesNoneDesc": "Las entradas que marques como favoritas aparecerán aquí",
+    "favoritesNoneHint": "En la pestaña Parámetros, haz clic en {moreIcon} en cualquier entrada para añadirla aquí",
+    "favoritesNoneTooltip": "Marca widgets con estrella para acceder rápidamente sin seleccionar nodos",
+    "globalSettings": {
+      "canvas": "LIENZO",
+      "connectionLinks": "ENLACES DE CONEXIÓN",
+      "gridSpacing": "Espaciado de la cuadrícula",
+      "linkShape": "Forma del enlace",
+      "nodes": "NODOS",
+      "nodes2": "Nodos 2.0",
+      "searchPlaceholder": "Buscar configuración rápida...",
+      "showAdvanced": "Mostrar parámetros avanzados",
+      "showAdvancedTooltip": "Esta es una configuración importante que, al activarse, muestra todos los parámetros avanzados de los nodos",
+      "showConnectedLinks": "Mostrar enlaces conectados",
+      "showInfoBadges": "Mostrar insignias de información",
+      "showToolbox": "Mostrar caja de herramientas al seleccionar",
+      "snapNodesToGrid": "Ajustar nodos a la cuadrícula",
+      "title": "Configuración global",
+      "viewAllSettings": "Ver toda la configuración"
+    },
+    "groupSettings": "Configuración de grupo",
+    "groups": "Grupos",
+    "hideAdvancedInputsButton": "Ocultar entradas avanzadas",
+    "hideInput": "Ocultar entrada",
+    "info": "Información",
+    "inputs": "ENTRADAS",
+    "inputsNone": "SIN ENTRADAS",
+    "inputsNoneTooltip": "El nodo no tiene entradas",
+    "locateNode": "Localizar nodo en el lienzo",
+    "missingNodePacks": {
+      "applyChanges": "Aplicar cambios",
+      "cloudMessage": "Este flujo de trabajo requiere nodos personalizados que aún no están disponibles en Comfy Cloud.",
+      "collapse": "Colapsar",
+      "expand": "Expandir",
+      "installAll": "Instalar todo",
+      "installNodePack": "Instalar paquete de nodos",
+      "installed": "Instalado",
+      "installing": "Instalando...",
+      "ossManagerDisabledHint": "Para instalar los nodos que faltan, primero ejecuta {pipCmd} en tu entorno de Python para instalar Node Manager, luego reinicia ComfyUI con la bandera {flag}.",
+      "ossMessage": "Este flujo de trabajo utiliza nodos personalizados que aún no has instalado.",
+      "searchInManager": "Buscar en el Gestor de Nodos",
+      "title": "Paquetes de nodos faltantes",
+      "unknownPack": "Paquete desconocido",
+      "unsupportedTitle": "Paquetes de nodos no compatibles",
+      "viewInManager": "Ver en el Gestor"
+    },
+    "mute": "Silenciar",
+    "noErrors": "Sin errores",
+    "noSelection": "Selecciona un nodo para ver sus propiedades e información.",
+    "nodeState": "Estado del nodo",
+    "nodes": "Nodos",
+    "nodesNoneDesc": "SIN NODOS",
+    "noneSearchDesc": "Ningún elemento coincide con tu búsqueda",
+    "normal": "Normal",
+    "parameters": "Parámetros",
+    "pinned": "Fijado",
+    "promptErrors": {
+      "no_prompt": {
+        "desc": "Los datos del flujo de trabajo enviados al servidor están vacíos. Esto puede ser un error inesperado del sistema."
+      },
+      "prompt_no_outputs": {
+        "desc": "El flujo de trabajo no contiene ningún nodo de salida (por ejemplo, Guardar imagen, Vista previa de imagen) para producir un resultado."
+      },
+      "server_error_cloud": {
+        "desc": "El servidor encontró un error inesperado. Por favor, inténtalo de nuevo más tarde."
+      },
+      "server_error_local": {
+        "desc": "El servidor encontró un error inesperado. Por favor, revisa los registros del servidor."
+      }
+    },
+    "properties": "Propiedades",
+    "removeFavorite": "Quitar de favoritos",
+    "resetAllParameters": "Restablecer todos los parámetros",
+    "resetToDefault": "Restablecer a los valores predeterminados",
+    "seeError": "Ver error",
+    "settings": "Configuración",
+    "showAdvancedInputsButton": "Mostrar entradas avanzadas",
+    "showInput": "Mostrar entrada",
+    "title": "Ningún nodo seleccionado | 1 nodo seleccionado | {count} nodos seleccionados",
+    "togglePanel": "Mostrar/ocultar panel de propiedades",
+    "workflowOverview": "Resumen del flujo de trabajo"
+  },
+  "secrets": {
+    "addSecret": "Agregar secreto",
+    "createdAt": "Creado el {date}",
+    "deleteConfirmMessage": "¿Estás seguro de que deseas eliminar \"{name}\"? Esta acción no se puede deshacer.",
+    "deleteConfirmTitle": "Eliminar secreto",
+    "description": "Los secretos están cifrados y se utilizan para datos sensibles como claves API.",
+    "descriptionUsage": "Guarda tus tokens aquí para habilitar la descarga de modelos privados y restringidos de proveedores compatibles.",
+    "editSecret": "Editar secreto",
+    "errors": {
+      "duplicateName": "Ya existe un secreto con este nombre",
+      "duplicateProvider": "Ya existe un secreto para este proveedor",
+      "nameRequired": "El nombre es obligatorio",
+      "nameTooLong": "El nombre debe tener 255 caracteres o menos",
+      "providerRequired": "El proveedor es obligatorio",
+      "secretValueRequired": "El valor secreto es obligatorio"
+    },
+    "lastUsed": "Último uso el {date}",
+    "modelProviders": "Proveedores de modelos",
+    "name": "Nombre",
+    "namePlaceholder": "p. ej., Mi clave API",
+    "noSecrets": "No hay secretos guardados. Agrega tu primera clave API para comenzar.",
+    "provider": "Proveedor",
+    "providerHint": "Opcional. Seleccionar un proveedor habilita el uso automático del token.",
+    "secretValue": "Valor secreto",
+    "secretValueHint": "Este valor será cifrado y no podrá ser visto nuevamente.",
+    "secretValueHintEdit": "Déjalo en blanco para mantener el valor actual.",
+    "secretValuePlaceholder": "Introduce tu clave API",
+    "secretValuePlaceholderEdit": "Introduce un nuevo valor para cambiarlo",
+    "title": "Claves API y Secretos"
+  },
   "selectionToolbox": {
     "Bypass Group Nodes": "Omitir nodos de grupo",
     "Set Group Nodes to Always": "Establecer nodos de grupo en Siempre",
@@ -1384,6 +2368,8 @@
   "serverConfig": {
     "modifiedConfigs": "Has modificado las siguientes configuraciones del servidor. Reinicia para aplicar los cambios.",
     "restart": "Reiniciar",
+    "restartRequiredToastDetail": "Reinicia la aplicación para aplicar los cambios de configuración del servidor.",
+    "restartRequiredToastSummary": "Reinicio requerido",
     "revertChanges": "Revertir cambios"
   },
   "serverConfigCategories": {
@@ -1452,6 +2438,10 @@
     "enable-cors-header": {
       "name": "Habilitar encabezado CORS: Use \"*\" para todos los orígenes o especifique el dominio"
     },
+    "enable-manager-legacy-ui": {
+      "name": "Usar interfaz de usuario Manager heredada",
+      "tooltip": "Utiliza la interfaz de usuario heredada de ComfyUI-Manager en lugar de la nueva interfaz."
+    },
     "fast": {
       "name": "Habilitar algunas optimizaciones no probadas y potencialmente deteriorantes de la calidad."
     },
@@ -1553,6 +2543,8 @@
     "CustomColorPalettes": "Paletas de Colores Personalizadas",
     "DevMode": "Modo de Desarrollo",
     "EditTokenWeight": "Editar Peso del Token",
+    "Error System": "Sistema de errores",
+    "Execution": "Ejecución",
     "Extension": "Extensión",
     "General": "General",
     "Graph": "Gráfico",
@@ -1568,10 +2560,14 @@
     "Menu": "Menú",
     "ModelLibrary": "Biblioteca de Modelos",
     "Node": "Nodo",
+    "Node Library": "Biblioteca de nodos",
     "Node Search Box": "Caja de Búsqueda de Nodo",
     "Node Widget": "Widget de Nodo",
     "NodeLibrary": "Biblioteca de Nodos",
+    "Nodes 2_0": "Nodes 2.0",
     "Notification Preferences": "Preferencias de notificación",
+    "Other": "Otros",
+    "PLY": "PLY",
     "PlanCredits": "Plan y créditos",
     "Pointer": "Puntero",
     "Queue": "Cola",
@@ -1579,6 +2575,7 @@
     "Reroute": "Reenrutar",
     "RerouteBeta": "Reroute Beta",
     "Scene": "Escena",
+    "Secrets": "Credenciales",
     "Server": "Servidor",
     "Server-Config": "Configuración del Servidor",
     "Settings": "Configuraciones",
@@ -1590,7 +2587,8 @@
     "Vue Nodes": "Nodos Vue",
     "VueNodes": "Nodos Vue",
     "Window": "Ventana",
-    "Workflow": "Flujo de Trabajo"
+    "Workflow": "Flujo de Trabajo",
+    "Workspace": "Espacio de trabajo"
   },
   "shape": {
     "CARD": "Card",
@@ -1616,11 +2614,18 @@
     "viewControls": "Controles de vista"
   },
   "sideToolbar": {
+    "activeJobStatus": "Trabajo activo: {status}",
     "assets": "Recursos",
     "backToAssets": "Volver a todos los recursos",
     "browseTemplates": "Explorar plantillas de ejemplo",
     "downloads": "Descargas",
+    "folderView": {
+      "errorDetail": "No se pudieron recuperar las salidas para este trabajo. Por favor, inténtalo de nuevo.",
+      "errorSummary": "No se pudieron cargar las salidas"
+    },
+    "generatedAssetsHeader": "Recursos generados",
     "helpCenter": "Centro de ayuda",
+    "importedAssetsHeader": "Recursos importados",
     "labels": {
       "assets": "Recursos",
       "console": "Consola",
@@ -1643,6 +2648,17 @@
     "noImportedFiles": "No se encontraron archivos importados",
     "nodeLibrary": "Biblioteca de nodos",
     "nodeLibraryTab": {
+      "allNodes": "Todos los nodos",
+      "blueprints": "Planos",
+      "custom": "Personalizado",
+      "essentials": "Esenciales",
+      "filter": "Filtrar",
+      "filterOptions": {
+        "blueprints": "Planos",
+        "comfyNodes": "Nodos Comfy",
+        "extensions": "Extensiones",
+        "partnerNodes": "Nodos de socios"
+      },
       "groupBy": "Agrupar por",
       "groupStrategies": {
         "category": "Categoría",
@@ -1652,7 +2668,20 @@
         "source": "Fuente",
         "sourceDesc": "Agrupar por tipo de fuente (Core, Custom, API)"
       },
+      "noBookmarkedNodes": "Aún no hay favoritos",
       "resetView": "Restablecer vista a la predeterminada",
+      "sections": {
+        "bookmarked": "Favoritos",
+        "comfyBlueprints": "Planos Comfy",
+        "comfyNodes": "Nodos Comfy",
+        "extensions": "Extensiones",
+        "favoriteNode": "Nodo favorito",
+        "favorites": "Favoritos",
+        "myBlueprints": "Mis planos",
+        "partnerNodes": "Nodos de socios",
+        "subgraphBlueprints": "Planos de subgráficos",
+        "unfavoriteNode": "Quitar de favoritos"
+      },
       "sortBy": {
         "alphabetical": "Alfabético",
         "alphabeticalDesc": "Ordenar alfabéticamente dentro de los grupos",
@@ -1661,8 +2690,62 @@
       },
       "sortMode": "Modo de ordenación"
     },
+    "nodes": "Nodos",
     "openWorkflow": "Abrir flujo de trabajo en el sistema de archivos local",
     "queue": "Cola",
+    "queueProgressOverlay": {
+      "activeJobs": "{count} trabajo activo | {count} trabajos activos",
+      "activeJobsShort": "{count} activo(s) | {count} activo(s)",
+      "activeJobsSuffix": "trabajos activos",
+      "cancelJobTooltip": "Cancelar trabajo",
+      "clearAllJobsTooltip": "Cancelar todos los trabajos en ejecución",
+      "clearHistory": "Limpiar historial de la cola de trabajos",
+      "clearHistoryDialogAssetsNote": "Los recursos generados por estos trabajos no se eliminarán y siempre podrán verse desde el panel de recursos.",
+      "clearHistoryDialogDescription": "Todos los trabajos finalizados o fallidos a continuación serán eliminados de este panel de cola de trabajos.",
+      "clearHistoryDialogTitle": "¿Limpiar el historial de la cola de trabajos?",
+      "clearHistoryMenuAssetsNote": "Los archivos multimedia no se eliminarán.",
+      "clearQueueTooltip": "Limpiar cola",
+      "clearQueued": "Limpiar en cola",
+      "colonPercent": ": {percent}",
+      "currentNode": "Nodo actual:",
+      "dockedJobHistory": "Historial de trabajos acoplado",
+      "expandCollapsedQueue": "Expandir cola de trabajos",
+      "filterAllWorkflows": "Todos los flujos de trabajo",
+      "filterBy": "Filtrar por",
+      "filterCurrentWorkflow": "Flujo de trabajo actual",
+      "filterJobs": "Filtrar trabajos",
+      "inlineTotalLabel": "Total",
+      "interruptAll": "Interrumpir todos los trabajos en ejecución",
+      "jobCompleted": "Trabajo completado",
+      "jobFailed": "Trabajo fallido",
+      "jobQueue": "Cola de trabajos",
+      "jobsAddedToQueue": "{count} trabajo añadido a la cola | {count} trabajos añadidos a la cola",
+      "jobsCompleted": "{count} trabajo completado | {count} trabajos completados",
+      "jobsFailed": "{count} trabajo fallido | {count} trabajos fallidos",
+      "moreOptions": "Más opciones",
+      "noActiveJobs": "No hay trabajos activos",
+      "preview": "Vista previa",
+      "queuedJobsLabel": "{count} en cola",
+      "queuedSuffix": "en cola",
+      "running": "en ejecución",
+      "runningJobsLabel": "{count} en ejecución",
+      "runningQueuedSummary": "{running}, {queued}",
+      "searchJobs": "Buscar...",
+      "showAssets": "Mostrar recursos",
+      "showAssetsPanel": "Mostrar panel de recursos",
+      "showRunProgressBar": "Mostrar barra de progreso de ejecución",
+      "sortBy": "Ordenar por",
+      "sortJobs": "Ordenar trabajos",
+      "stubClipTextEncode": "CLIP Text Encode:",
+      "title": "Progreso de la cola",
+      "total": "Total: {percent}",
+      "viewAllJobs": "Ver todos los trabajos",
+      "viewGrid": "Vista de cuadrícula",
+      "viewJobHistory": "Ver historial de trabajos",
+      "viewList": "Vista de lista"
+    },
+    "searchAssets": "Buscar recursos",
+    "sidebar": "Barra lateral",
     "templates": "Plantillas",
     "themeToggle": "Cambiar tema",
     "workflowTab": {
@@ -1686,60 +2769,208 @@
   },
   "subgraphStore": {
     "blueprintName": "Nombre del subgrafo",
+    "blueprintNamePrompt": "Nombre del subgrafo:",
+    "cannotDeleteGlobal": "No se pueden eliminar los blueprints instalados",
     "confirmDelete": "Esta acción eliminará permanentemente el subgrafo de tu biblioteca",
     "confirmDeleteTitle": "¿Eliminar subgrafo?",
+    "disconnected": "Desconectado",
+    "enterDescription": "Introduce una descripción",
+    "enterSearchAliases": "Introduce alias de búsqueda (separados por comas)",
     "hidden": "Parámetros ocultos/anidados",
     "hideAll": "Ocultar todo",
+    "linked": "(Vinculado)",
     "loadFailure": "No se pudieron cargar los subgrafos",
     "overwriteBlueprint": "Guardar sobrescribirá el subgrafo actual con tus cambios",
     "overwriteBlueprintTitle": "¿Sobrescribir subgrafo existente?",
     "promoteOutsideSubgraph": "No se puede promocionar widget cuando no está en subgrafo",
+    "promoteWidget": "Promocionar widget: {name}",
     "publish": "Publicar subgrafo",
     "publishSuccess": "Guardado en la biblioteca de nodos",
     "publishSuccessMessage": "Puedes encontrar tu subgrafo en la biblioteca de nodos bajo \"Subgraph Blueprints\"",
     "saveBlueprint": "Guardar subgrafo en la biblioteca",
+    "searchAliases": "Buscar alias",
     "showAll": "Mostrar todo",
     "showRecommended": "Mostrar widgets recomendados",
-    "shown": "Mostrado en el nodo"
+    "shown": "Mostrado en el nodo",
+    "unpromoteWidget": "Dejar de promocionar widget: {name}"
   },
   "subscription": {
     "addApiCredits": "Agregar créditos de API",
     "addCredits": "Agregar créditos",
+    "addCreditsLabel": "Agrega más créditos cuando quieras",
     "benefits": {
       "benefit1": "Créditos mensuales para Nodos de Socio — recarga cuando sea necesario",
-      "benefit2": "Hasta 30 min de tiempo de ejecución por trabajo"
+      "benefit1FreeTier": "Más créditos mensuales, recarga en cualquier momento",
+      "benefit2": "Hasta 30 min de tiempo de ejecución por trabajo",
+      "benefit3": "Usa tus propios modelos (Creator & Pro)"
     },
     "beta": "BETA",
+    "billedMonthly": "Facturado mensualmente",
+    "billedYearly": "{total} facturado anualmente",
+    "billingComingSoon": {
+      "message": "La facturación para equipos estará disponible pronto. Podrás suscribirte a un plan para tu espacio de trabajo con precios por usuario. Mantente atento para más actualizaciones.",
+      "title": "Próximamente"
+    },
+    "cancelDialog": {
+      "confirmCancel": "Cancelar suscripción",
+      "description": "Tu acceso continúa hasta {date}. No se te cobrará de nuevo, y tu espacio de trabajo y créditos se conservarán. Puedes volver a suscribirte en cualquier momento.",
+      "endOfBillingPeriod": "fin del periodo de facturación",
+      "failed": "Error al cancelar la suscripción",
+      "keepSubscription": "Mantener suscripción",
+      "title": "Cancelar suscripción"
+    },
+    "cancelSubscription": "Cancelar suscripción",
+    "cancelSuccess": "Suscripción cancelada correctamente",
+    "canceled": "Cancelada",
+    "canceledCard": {
+      "description": "No se te cobrará de nuevo. Tus funciones seguirán activas hasta {date}.",
+      "title": "Tu suscripción ha sido cancelada"
+    },
+    "changeTo": "Cambiar a {plan}",
+    "chooseBestPlanWorkspace": "Elige el mejor plan para tu espacio de trabajo",
     "comfyCloud": "Comfy Cloud",
+    "comfyCloudLogo": "Logo de Comfy Cloud",
+    "contactOwnerToSubscribe": "Contacta al propietario del espacio de trabajo para suscribirte",
+    "contactUs": "Contáctanos",
+    "creditsRemainingThisMonth": "Créditos restantes este mes",
+    "creditsRemainingThisYear": "Créditos restantes este año",
+    "creditsYouveAdded": "Créditos que has agregado",
+    "currentPlan": "Plan actual",
+    "customLoRAsLabel": "Importa tus propios LoRAs",
+    "description": "Elige el mejor plan para ti",
+    "descriptionWorkspace": "Elige el mejor plan para tu espacio de trabajo",
     "expiresDate": "Caduca el {date}",
+    "freeTier": {
+      "description": "Tu plan gratuito incluye {credits} créditos cada mes para probar Comfy Cloud.",
+      "descriptionGeneric": "Tu plan gratuito incluye una asignación mensual de créditos para probar Comfy Cloud.",
+      "nextRefresh": "Tus créditos se renovarán el {date}.",
+      "outOfCredits": {
+        "subtitle": "Suscríbete para desbloquear recargas y más",
+        "title": "Te has quedado sin créditos gratuitos"
+      },
+      "subscribeCta": "Suscríbete para más",
+      "title": "Estás en el plan gratuito",
+      "topUpBlocked": {
+        "title": "Desbloquea recargas y más"
+      },
+      "upgradeCta": "Ver planes"
+    },
+    "gpuLabel": "RTX 6000 Pro (96GB VRAM)",
+    "haveQuestions": "¿Tienes preguntas o buscas soluciones empresariales?",
     "invoiceHistory": "Historial de facturas",
     "learnMore": "Más información",
+    "managePayment": "Gestionar pago",
+    "managePlan": "Gestionar plan",
     "manageSubscription": "Gestionar suscripción",
+    "maxDuration": {
+      "creator": "30 min",
+      "founder": "30 min",
+      "free": "30 min",
+      "pro": "1 h",
+      "standard": "30 min"
+    },
+    "maxDurationLabel": "Duración máxima de cada ejecución de flujo de trabajo",
+    "maxMembersLabel": "Máx. miembros",
+    "member": "miembro",
+    "memberCount": "{count} miembro | {count} miembros",
+    "membersLabel": "Hasta {count} miembros",
     "messageSupport": "Contactar con soporte",
+    "monthly": "Mensual",
     "monthlyBonusDescription": "Bono de créditos mensual",
+    "monthlyCreditsInfo": "Estos créditos se renuevan mensualmente y no se acumulan",
+    "monthlyCreditsLabel": "Créditos mensuales",
+    "monthlyCreditsPerMemberLabel": "Créditos mensuales / miembro",
     "monthlyCreditsRollover": "Estos créditos se transferirán al próximo mes",
+    "mostPopular": "Más popular",
     "nextBillingCycle": "próximo ciclo de facturación",
+    "nextMonthInvoice": "Factura del próximo mes",
     "partnerNodesBalance": "Saldo de créditos de \"Nodos de Partners\"",
     "partnerNodesCredits": "Créditos de Nodos de Socio",
     "partnerNodesDescription": "Para ejecutar modelos comerciales/propietarios",
     "perMonth": "USD / mes",
+    "plansAndPricing": "Planes y precios",
     "prepaidCreditsInfo": "Créditos comprados por separado que no expiran",
     "prepaidDescription": "Créditos prepagados",
+    "preview": {
+      "addCreditCard": "Agregar tarjeta de crédito",
+      "backToAllPlans": "Volver a todos los planes",
+      "confirm": "Confirmar",
+      "confirmPayment": "Confirma tu pago",
+      "confirmPlanChange": "Confirma el cambio de plan",
+      "eachMonthCreditsRefill": "Cada mes los créditos se recargan a",
+      "ends": "Finaliza el {date}",
+      "hideFeatures": "Ocultar funciones",
+      "nextPaymentDue": "Próximo pago el {date}. Cancela en cualquier momento.",
+      "perMember": "/ miembro",
+      "privacyPolicy": "Política de privacidad",
+      "proratedCharge": "Cargo prorrateado por {plan}",
+      "proratedRefund": "Reembolso prorrateado por {plan}",
+      "showMoreFeatures": "Mostrar más funciones",
+      "starting": "Comienza el {date}",
+      "startingToday": "Comienza hoy",
+      "terms": "Términos",
+      "termsAgreement": "Al continuar, aceptas los {terms} y la {privacy} de Comfy Org.",
+      "totalDueToday": "Total a pagar hoy"
+    },
     "renewsDate": "Se renueva el {date}",
     "required": {
+      "pollingFailed": "Error al activar la suscripción",
+      "pollingSuccess": "¡Suscripción activada correctamente!",
+      "pollingTimeout": "Tiempo de espera agotado para la suscripción. Por favor, actualiza e inténtalo de nuevo.",
       "subscribe": "Suscribirse",
       "title": "Suscribirse a",
       "waitingForSubscription": "Completa tu suscripción en la nueva pestaña. ¡Detectaremos automáticamente cuando hayas terminado!"
     },
+    "resubscribe": "Volver a suscribirse",
+    "resubscribeSuccess": "¡Suscripción reactivada correctamente!",
+    "resubscribeTo": "Volver a suscribirse a {plan}",
+    "subscribeForMore": "Mejorar",
     "subscribeNow": "Suscribirse Ahora",
+    "subscribeTo": "Suscribirse a {plan}",
     "subscribeToComfyCloud": "Suscribirse a Comfy Cloud",
     "subscribeToRun": "Suscribirse",
     "subscribeToRunFull": "Suscribirse a Ejecutar",
+    "subscriptionRequiredMessage": "Se requiere una suscripción para que los miembros ejecuten flujos de trabajo en la nube",
+    "tierNameYearly": "{name} Anual",
+    "tiers": {
+      "creator": {
+        "name": "Creador"
+      },
+      "founder": {
+        "name": "Edición Fundador"
+      },
+      "free": {
+        "name": "Gratis"
+      },
+      "pro": {
+        "name": "Pro"
+      },
+      "standard": {
+        "name": "Estándar"
+      }
+    },
     "title": "Suscripción",
     "titleUnsubscribed": "Suscríbete a Comfy Cloud",
     "totalCredits": "Créditos totales",
+    "upgrade": "MEJORAR",
+    "upgradePlan": "Mejorar plan",
+    "upgradeTo": "Mejorar a {plan}",
+    "upgradeToAddCredits": "Mejorar para añadir créditos",
+    "usdPerMonth": "USD / mes",
+    "usdPerMonthPerMember": "USD / mes / miembro",
+    "videoEstimateExplanation": "Estas estimaciones se basan en la plantilla Wan 2.2 Imagen a Video usando la configuración predeterminada (5 segundos, 640x640, 16fps, muestreo de 4 pasos).",
+    "videoEstimateHelp": "Más detalles sobre esta plantilla",
+    "videoEstimateLabel": "Cantidad aprox. de videos de 5s generados con la plantilla Wan 2.2 Imagen a Video",
+    "videoEstimateTryTemplate": "Probar esta plantilla",
+    "videoTemplateBasedCredits": "Videos generados con Wan 2.2 Imagen a Video",
+    "viewEnterprise": "Ver empresa",
     "viewMoreDetails": "Ver más detalles",
+    "viewMoreDetailsPlans": "Ver más detalles sobre planes y precios",
     "viewUsageHistory": "Ver historial de uso",
+    "workspaceNotSubscribed": "Este espacio de trabajo no tiene una suscripción",
+    "yearly": "Anual",
+    "yearlyCreditsLabel": "Total de créditos anuales",
+    "yearlyDiscount": "20% DESCUENTO",
     "yourPlanIncludes": "Tu plan incluye:"
   },
   "tabMenu": {
@@ -1751,8 +2982,14 @@
     "duplicateTab": "Duplicar pestaña",
     "removeFromBookmarks": "Eliminar de marcadores"
   },
+  "templateWidgets": {
+    "sort": {
+      "searchPlaceholder": "Buscar..."
+    }
+  },
   "templateWorkflows": {
     "activeFilters": "Filtros:",
+    "allTemplates": "Todas las plantillas",
     "categories": "Categorías",
     "category": {
       "3D": "3D",
@@ -1779,6 +3016,7 @@
     "error": {
       "templateNotFound": "Plantilla \"{templateName}\" no encontrada"
     },
+    "licenseFilter": "Licencia",
     "loading": "Cargando plantillas...",
     "loadingMore": "Cargando más plantillas...",
     "modelFilter": "Filtro de modelo",
@@ -1795,14 +3033,19 @@
       "default": "Predeterminado",
       "modelSizeLowToHigh": "Tamaño del modelo (de bajo a alto)",
       "newest": "Más reciente",
+      "popular": "Popular",
       "recommended": "Recomendado",
       "searchPlaceholder": "Buscar...",
       "vramLowToHigh": "Uso de VRAM (de bajo a alto)"
     },
     "sorting": "Ordenar por",
     "title": "Comienza con una Plantilla",
+    "useCaseFilter": "Tareas",
     "useCasesSelected": "{count} casos de uso"
   },
+  "templates": {
+    "logoProviderSeparator": " y "
+  },
   "toastMessages": {
     "cannotCreateSubgraph": "No se puede crear el subgrafo",
     "couldNotDetermineFileType": "No se pudo determinar el tipo de archivo",
@@ -1810,6 +3053,7 @@
     "emptyCanvas": "Lienzo vacío",
     "errorCopyImage": "Error al copiar la imagen: {error}",
     "errorLoadingModel": "Error al cargar el modelo",
+    "errorOpenImage": "Error al abrir la imagen: {error}",
     "errorSaveSetting": "Error al guardar la configuración {id}: {err}",
     "exportSuccess": "Modelo exportado exitosamente como {format}",
     "failedExecutionPathResolution": "No se pudo resolver la ruta a los nodos seleccionados",
@@ -1829,9 +3073,23 @@
     "failedToLoadModel": "Error al cargar el modelo 3D",
     "failedToPurchaseCredits": "No se pudo comprar créditos: {error}",
     "failedToQueue": "Error al encolar",
+    "failedToSaveDraft": "No se pudo guardar el borrador del flujo de trabajo",
+    "failedToToggleCamera": "No se pudo alternar la cámara",
+    "failedToToggleGrid": "No se pudo alternar la cuadrícula",
+    "failedToUpdateBackgroundColor": "No se pudo actualizar el color de fondo",
+    "failedToUpdateBackgroundImage": "No se pudo actualizar la imagen de fondo",
+    "failedToUpdateBackgroundRenderMode": "No se pudo actualizar el modo de renderizado de fondo a {mode}",
+    "failedToUpdateEdgeThreshold": "No se pudo actualizar el umbral de borde",
+    "failedToUpdateFOV": "No se pudo actualizar el campo de visión",
+    "failedToUpdateLightIntensity": "No se pudo actualizar la intensidad de la luz",
+    "failedToUpdateMaterialMode": "No se pudo actualizar el modo de material",
+    "failedToUpdateUpDirection": "No se pudo actualizar la dirección superior",
+    "failedToUploadBackgroundImage": "No se pudo subir la imagen de fondo",
     "fileLoadError": "No se puede encontrar el flujo de trabajo en {fileName}",
+    "fileTooLarge": "Archivo demasiado grande ({size} MB). El tamaño máximo soportado es {maxSize} MB",
     "fileUploadFailed": "Error al subir el archivo",
     "interrupted": "La ejecución ha sido interrumpida",
+    "legacyMaskEditorDeprecated": "El editor de máscaras heredado está obsoleto y se eliminará pronto.",
     "migrateToLitegraphReroute": "Los nodos de reroute se eliminarán en futuras versiones. Haz clic para migrar a reroute nativo de litegraph.",
     "modelLoadedSuccessfully": "Modelo 3D cargado exitosamente",
     "no3dScene": "No hay escena 3D para aplicar textura",
@@ -1858,12 +3116,14 @@
     "selectUser": "Selecciona un usuario"
   },
   "userSettings": {
+    "accountSettings": "Configuración de la cuenta",
     "email": "Correo electrónico",
     "name": "Nombre",
     "notSet": "No establecido",
     "provider": "Método de inicio de sesión",
     "title": "Configuración de usuario",
-    "updatePassword": "Actualizar contraseña"
+    "updatePassword": "Actualizar contraseña",
+    "workspaceSettings": "Configuración del espacio de trabajo"
   },
   "validation": {
     "descriptionRequired": "Descripción es requerida",
@@ -1892,35 +3152,230 @@
     "updateFrontend": "Actualizar frontend"
   },
   "vueNodesBanner": {
+    "desc": "– Flujos de trabajo más flexibles, nuevos widgets potentes, diseñado para la extensibilidad",
+    "title": "Presentamos Nodes 2.0",
     "tryItOut": "Pruébalo"
   },
   "vueNodesMigration": {
     "button": "Abrir Configuración",
     "message": "¿Prefieres el diseño clásico de nodos?"
   },
+  "vueNodesMigrationMainMenu": {
+    "message": "Cambia a Nodes 2.0 en cualquier momento desde el menú principal."
+  },
+  "vueNodesSlot": {
+    "iterative": "(Iterativo)"
+  },
   "welcome": {
     "getStarted": "Empezar",
     "title": "Bienvenido a ComfyUI"
   },
   "whatsNewPopup": {
+    "later": "Más tarde",
     "learnMore": "Aprende más",
     "noReleaseNotes": "No hay notas de la versión disponibles."
   },
+  "widgetFileUpload": {
+    "browseFiles": "Buscar archivos",
+    "dropPrompt": "Suelta tu archivo o"
+  },
   "widgets": {
+    "boolean": {
+      "false": "falso",
+      "true": "verdadero"
+    },
+    "node2only": "Solo Node 2.0",
     "selectModel": "Seleccionar modelo",
     "uploadSelect": {
+      "maxSelectionReached": "Se alcanzó el límite máximo de selección",
       "placeholder": "Seleccionar...",
       "placeholderAudio": "Seleccionar audio...",
       "placeholderImage": "Seleccionar imagen...",
+      "placeholderMesh": "Seleccionar malla...",
       "placeholderModel": "Seleccionar modelo...",
       "placeholderUnknown": "Seleccionar medio...",
       "placeholderVideo": "Seleccionar video..."
+    },
+    "valueControl": {
+      "decrement": "Disminuir valor",
+      "decrementDesc": "Resta 1 al valor o selecciona la opción anterior",
+      "editSettings": "Editar configuración de control",
+      "fixed": "Valor fijo",
+      "fixedDesc": "Deja el valor sin cambios",
+      "header": {
+        "after": "DESPUÉS",
+        "before": "ANTES",
+        "postfix": "de ejecutar el flujo de trabajo:",
+        "prefix": "Actualizar automáticamente el valor"
+      },
+      "increment": "Incrementar valor",
+      "incrementDesc": "Suma 1 al valor o selecciona la siguiente opción",
+      "linkToGlobal": "Vincular a",
+      "linkToGlobalDesc": "Valor único vinculado a la configuración de control del Valor Global",
+      "linkToGlobalSeed": "Valor Global",
+      "randomize": "Aleatorizar valor",
+      "randomizeDesc": "Mezcla el valor aleatoriamente después de cada generación"
     }
   },
   "workflowService": {
     "enterFilename": "Introduzca el nombre del archivo",
+    "enterFilenamePrompt": "Introduce el nombre del archivo:",
     "exportWorkflow": "Exportar flujo de trabajo",
-    "saveWorkflow": "Guardar flujo de trabajo"
+    "saveWorkflow": "Guardar flujo de trabajo",
+    "savedAsApp": "Convertido a flujo de trabajo de aplicación",
+    "savedAsWorkflow": "Convertido a flujo de trabajo solo de grafo de nodos"
+  },
+  "workspace": {
+    "addedToWorkspace": "Has sido añadido a {workspaceName}",
+    "inviteAccepted": "Invitación aceptada",
+    "inviteFailed": "No se pudo aceptar la invitación",
+    "unsavedChanges": {
+      "message": "Tienes cambios no guardados. ¿Quieres descartarlos y cambiar de espacio de trabajo?",
+      "title": "Cambios no guardados"
+    },
+    "viewWorkspace": "Ver espacio de trabajo"
+  },
+  "workspaceAuth": {
+    "errors": {
+      "accessDenied": "No tienes acceso a este espacio de trabajo",
+      "invalidFirebaseToken": "La autenticación ha fallado. Por favor, intenta iniciar sesión de nuevo.",
+      "notAuthenticated": "Debes iniciar sesión para acceder a los espacios de trabajo",
+      "tokenExchangeFailed": "No se pudo autenticar con el espacio de trabajo: {error}",
+      "workspaceNotFound": "Espacio de trabajo no encontrado"
+    }
+  },
+  "workspacePanel": {
+    "createWorkspaceDialog": {
+      "create": "Crear",
+      "message": "Los espacios de trabajo permiten a los miembros compartir un único fondo de créditos. Te convertirás en el propietario después de crearlo.",
+      "nameLabel": "Nombre del espacio de trabajo*",
+      "namePlaceholder": "Introduce el nombre del espacio de trabajo",
+      "title": "Crear un nuevo espacio de trabajo"
+    },
+    "dashboard": {
+      "placeholder": "Configuración del panel del espacio de trabajo"
+    },
+    "deleteDialog": {
+      "message": "Cualquier crédito no utilizado o recurso no guardado se perderá. Esta acción no se puede deshacer.",
+      "messageWithName": "¿Eliminar \"{name}\"? Cualquier crédito no utilizado o recurso no guardado se perderá. Esta acción no se puede deshacer.",
+      "title": "¿Eliminar este espacio de trabajo?"
+    },
+    "editWorkspaceDialog": {
+      "nameLabel": "Nombre del espacio de trabajo",
+      "save": "Guardar",
+      "title": "Editar detalles del espacio de trabajo"
+    },
+    "invite": "Invitar",
+    "inviteLimitReached": "Has alcanzado el máximo de 50 miembros",
+    "inviteMember": "Invitar miembro",
+    "inviteMemberDialog": {
+      "createLink": "Crear enlace",
+      "linkCopied": "Copiado",
+      "linkCopyFailed": "No se pudo copiar el enlace",
+      "linkStep": {
+        "copyLink": "Copiar enlace",
+        "done": "Listo",
+        "message": "Asegúrate de que su cuenta use este correo electrónico.",
+        "title": "Envía este enlace a la persona"
+      },
+      "message": "Crea un enlace de invitación para compartir y envíalo a alguien",
+      "placeholder": "Introduce el correo electrónico de la persona",
+      "title": "Invitar a una persona a este espacio de trabajo"
+    },
+    "inviteUpsellDialog": {
+      "messageNotSubscribed": "Para agregar miembros del equipo a este espacio de trabajo, necesitas un plan Creator o superior. El plan Standard solo admite un usuario (el propietario).",
+      "messageSingleSeat": "El plan Standard incluye un asiento para el propietario del espacio de trabajo. Para invitar a miembros adicionales, actualiza al plan Creator o superior para desbloquear múltiples asientos.",
+      "titleNotSubscribed": "Se requiere una suscripción para invitar miembros",
+      "titleSingleSeat": "Tu plan actual admite un solo usuario",
+      "upgradeToCreator": "Actualizar a Creator",
+      "viewPlans": "Ver planes"
+    },
+    "leaveDialog": {
+      "leave": "Abandonar",
+      "message": "No podrás unirte de nuevo a menos que contactes al propietario del espacio de trabajo.",
+      "title": "¿Abandonar este espacio de trabajo?"
+    },
+    "members": {
+      "actions": {
+        "copyLink": "Copiar enlace de invitación",
+        "removeMember": "Eliminar miembro",
+        "revokeInvite": "Revocar invitación"
+      },
+      "columns": {
+        "expiryDate": "Fecha de vencimiento",
+        "inviteDate": "Fecha de invitación",
+        "joinDate": "Fecha de ingreso"
+      },
+      "createNewWorkspace": "crea uno nuevo.",
+      "membersCount": "{count}/50 Miembros",
+      "noInvites": "No hay invitaciones pendientes",
+      "noMembers": "No hay miembros",
+      "pendingInvitesCount": "{count} invitación pendiente | {count} invitaciones pendientes",
+      "personalWorkspaceMessage": "No puedes invitar a otros miembros a tu espacio de trabajo personal en este momento. Para agregar miembros a un espacio de trabajo,",
+      "tabs": {
+        "active": "Activo",
+        "pendingCount": "Pendientes ({count})"
+      },
+      "upsellBannerSubscribe": "Suscríbete al plan Creator o superior para invitar a miembros del equipo a este espacio de trabajo.",
+      "upsellBannerUpgrade": "Actualiza al plan Creator o superior para invitar a miembros adicionales al equipo.",
+      "viewPlans": "Ver planes"
+    },
+    "menu": {
+      "deleteWorkspace": "Eliminar espacio de trabajo",
+      "deleteWorkspaceDisabledTooltip": "Primero cancela la suscripción activa de tu espacio de trabajo",
+      "editWorkspace": "Editar detalles del espacio de trabajo",
+      "leaveWorkspace": "Abandonar espacio de trabajo"
+    },
+    "removeMemberDialog": {
+      "error": "No se pudo eliminar al miembro",
+      "message": "Este miembro será eliminado de tu espacio de trabajo. Los créditos que haya utilizado no serán reembolsados.",
+      "remove": "Eliminar miembro",
+      "success": "Miembro eliminado",
+      "title": "¿Eliminar a este miembro?"
+    },
+    "revokeInviteDialog": {
+      "message": "Este miembro ya no podrá unirse a tu espacio de trabajo. Su enlace de invitación será invalidado.",
+      "revoke": "Desinvitar",
+      "title": "¿Desinvitar a esta persona?"
+    },
+    "tabs": {
+      "dashboard": "Panel",
+      "membersCount": "Miembros ({count})",
+      "planCredits": "Plan y créditos"
+    },
+    "toast": {
+      "failedToCreateWorkspace": "No se pudo crear el espacio de trabajo",
+      "failedToDeleteWorkspace": "No se pudo eliminar el espacio de trabajo",
+      "failedToFetchWorkspaces": "No se pudieron cargar los espacios de trabajo",
+      "failedToLeaveWorkspace": "No se pudo abandonar el espacio de trabajo",
+      "failedToUpdateWorkspace": "No se pudo actualizar el espacio de trabajo",
+      "workspaceCreated": {
+        "message": "Suscríbete a un plan, invita a compañeros y comienza a colaborar.",
+        "subscribe": "Suscribirse",
+        "title": "Espacio de trabajo creado"
+      },
+      "workspaceDeleted": {
+        "message": "El espacio de trabajo ha sido eliminado permanentemente.",
+        "title": "Espacio de trabajo eliminado"
+      },
+      "workspaceLeft": {
+        "message": "Has salido del espacio de trabajo.",
+        "title": "Saliste del espacio de trabajo"
+      },
+      "workspaceUpdated": {
+        "message": "Los detalles del espacio de trabajo se han guardado.",
+        "title": "Espacio de trabajo actualizado"
+      }
+    }
+  },
+  "workspaceSwitcher": {
+    "createWorkspace": "Crear nuevo espacio de trabajo",
+    "maxWorkspacesReached": "Solo puedes ser propietario de 10 espacios de trabajo. Elimina uno para crear uno nuevo.",
+    "personal": "Personal",
+    "roleMember": "Miembro",
+    "roleOwner": "Propietario",
+    "subscribe": "Suscribirse",
+    "switchWorkspace": "Cambiar espacio de trabajo"
   },
   "zoomControls": {
     "hideMinimap": "Ocultar minimapa",
diff --git a/src/locales/es/nodeDefs.json b/src/locales/es/nodeDefs.json
index a40c35aee6..096b37c587 100644
--- a/src/locales/es/nodeDefs.json
+++ b/src/locales/es/nodeDefs.json
@@ -39,6 +39,87 @@
       "sigmas": {
         "name": "sigmas"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "AddTextPrefix": {
+    "display_name": "Agregar prefijo de texto",
+    "inputs": {
+      "prefix": {
+        "name": "prefijo",
+        "tooltip": "Prefijo para agregar."
+      },
+      "texts": {
+        "name": "textos",
+        "tooltip": "Texto a procesar."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "textos",
+        "tooltip": "Textos procesados"
+      }
+    }
+  },
+  "AddTextSuffix": {
+    "display_name": "Agregar sufijo de texto",
+    "inputs": {
+      "suffix": {
+        "name": "sufijo",
+        "tooltip": "Sufijo para agregar."
+      },
+      "texts": {
+        "name": "textos",
+        "tooltip": "Texto a procesar."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "textos",
+        "tooltip": "Textos procesados"
+      }
+    }
+  },
+  "AdjustBrightness": {
+    "display_name": "Ajustar brillo",
+    "inputs": {
+      "factor": {
+        "name": "factor",
+        "tooltip": "Factor de brillo. 1.0 = sin cambio, <1.0 = más oscuro, >1.0 = más brillante."
+      },
+      "images": {
+        "name": "imágenes",
+        "tooltip": "Imagen a procesar."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "imágenes",
+        "tooltip": "Imágenes procesadas"
+      }
+    }
+  },
+  "AdjustContrast": {
+    "display_name": "Ajustar contraste",
+    "inputs": {
+      "factor": {
+        "name": "factor",
+        "tooltip": "Factor de contraste. 1.0 = sin cambio, <1.0 = menos contraste, >1.0 = más contraste."
+      },
+      "images": {
+        "name": "imágenes",
+        "tooltip": "Imagen a procesar."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "imágenes",
+        "tooltip": "Imágenes procesadas"
+      }
     }
   },
   "AlignYourStepsScheduler": {
@@ -70,6 +151,11 @@
         "name": "volumen",
         "tooltip": "Ajuste de volumen en decibelios (dB). 0 = sin cambios, +6 = doble, -6 = mitad, etc."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "AudioConcat": {
@@ -86,6 +172,11 @@
         "name": "dirección",
         "tooltip": "Si agregar audio2 después o antes de audio1."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "AudioEncoderEncode": {
@@ -117,6 +208,47 @@
       }
     }
   },
+  "AudioEqualizer3Band": {
+    "display_name": "Ecualizador de Audio (3 Bandas)",
+    "inputs": {
+      "audio": {
+        "name": "audio"
+      },
+      "high_freq": {
+        "name": "high_freq",
+        "tooltip": "Frecuencia de corte para el estante alto"
+      },
+      "high_gain_dB": {
+        "name": "high_gain_dB",
+        "tooltip": "Ganancia para frecuencias altas (Agudos)"
+      },
+      "low_freq": {
+        "name": "low_freq",
+        "tooltip": "Frecuencia de corte para el estante bajo"
+      },
+      "low_gain_dB": {
+        "name": "low_gain_dB",
+        "tooltip": "Ganancia para frecuencias bajas (Bajo)"
+      },
+      "mid_freq": {
+        "name": "mid_freq",
+        "tooltip": "Frecuencia central para medios"
+      },
+      "mid_gain_dB": {
+        "name": "mid_gain_dB",
+        "tooltip": "Ganancia para frecuencias medias"
+      },
+      "mid_q": {
+        "name": "mid_q",
+        "tooltip": "Factor Q (ancho de banda) para medios"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "AudioMerge": {
     "description": "Combina dos pistas de audio superponiendo sus formas de onda.",
     "display_name": "Combinar Audio",
@@ -131,6 +263,11 @@
         "name": "método_combinación",
         "tooltip": "El método utilizado para combinar las formas de onda de audio."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "BasicGuider": {
@@ -142,6 +279,11 @@
       "model": {
         "name": "modelo"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "BasicScheduler": {
@@ -159,6 +301,50 @@
       "steps": {
         "name": "pasos"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchImagesNode": {
+    "display_name": "Procesar imágenes por lotes",
+    "inputs": {
+      "images": {
+        "name": "imágenes"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchLatentsNode": {
+    "display_name": "Procesar latents por lotes",
+    "inputs": {
+      "latents": {
+        "name": "latents"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchMasksNode": {
+    "display_name": "Procesar máscaras por lotes",
+    "inputs": {
+      "masks": {
+        "name": "máscaras"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "BetaSamplingScheduler": {
@@ -176,6 +362,114 @@
       "steps": {
         "name": "pasos"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BriaImageEditNode": {
+    "description": "Edita imágenes usando el modelo más reciente de Bria",
+    "display_name": "Edición de Imagen Bria",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control después de generar"
+      },
+      "guidance_scale": {
+        "name": "escala_de_guía",
+        "tooltip": "Un valor más alto hace que la imagen siga la instrucción más de cerca."
+      },
+      "image": {
+        "name": "imagen"
+      },
+      "mask": {
+        "name": "máscara",
+        "tooltip": "Si se omite, la edición se aplica a toda la imagen."
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "moderation": {
+        "name": "moderación",
+        "tooltip": "Configuración de moderación"
+      },
+      "negative_prompt": {
+        "name": "instrucción_negativa"
+      },
+      "prompt": {
+        "name": "instrucción",
+        "tooltip": "Instrucción para editar la imagen"
+      },
+      "seed": {
+        "name": "semilla"
+      },
+      "steps": {
+        "name": "pasos"
+      },
+      "structured_prompt": {
+        "name": "instrucción_estructurada",
+        "tooltip": "Una cadena que contiene la instrucción de edición estructurada en formato JSON. Usa esto en lugar de la instrucción habitual para un control preciso y programático."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "instrucción_estructurada",
+        "tooltip": null
+      }
+    }
+  },
+  "BriaRemoveImageBackground": {
+    "description": "Quita el fondo de una imagen usando Bria RMBG 2.0.",
+    "display_name": "Bria Quitar Fondo de Imagen",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "image": {
+        "name": "imagen"
+      },
+      "moderation": {
+        "name": "moderación",
+        "tooltip": "Configuración de moderación"
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "La semilla controla si el nodo debe ejecutarse de nuevo; los resultados son no deterministas independientemente de la semilla."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BriaRemoveVideoBackground": {
+    "description": "Quita el fondo de un video usando Bria.",
+    "display_name": "Bria Quitar Fondo de Video",
+    "inputs": {
+      "background_color": {
+        "name": "color de fondo",
+        "tooltip": "Color de fondo para el video de salida."
+      },
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "La semilla controla si el nodo debe ejecutarse de nuevo; los resultados son no deterministas independientemente de la semilla."
+      },
+      "video": {
+        "name": "video"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ByteDanceFirstLastFrameNode": {
@@ -201,6 +495,10 @@
         "name": "primer_fotograma",
         "tooltip": "Primer fotograma que se utilizará para el video."
       },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "Este parámetro se ignora para cualquier modelo excepto seedance-1-5-pro."
+      },
       "last_frame": {
         "name": "último_fotograma",
         "tooltip": "Último fotograma que se utilizará para el video."
@@ -231,43 +529,6 @@
       }
     }
   },
-  "ByteDanceImageEditNode": {
-    "description": "Editar imágenes usando modelos ByteDance a través de API basado en prompt",
-    "display_name": "Edición de Imágenes ByteDance",
-    "inputs": {
-      "control_after_generate": {
-        "name": "controlar después de generar"
-      },
-      "guidance_scale": {
-        "name": "escala_de_guía",
-        "tooltip": "Un valor más alto hace que la imagen siga más de cerca el prompt"
-      },
-      "image": {
-        "name": "imagen",
-        "tooltip": "La imagen base para editar"
-      },
-      "model": {
-        "name": "modelo"
-      },
-      "prompt": {
-        "name": "prompt",
-        "tooltip": "Instrucción para editar la imagen"
-      },
-      "seed": {
-        "name": "semilla",
-        "tooltip": "Semilla a utilizar para la generación"
-      },
-      "watermark": {
-        "name": "marca_de_agua",
-        "tooltip": "Si se debe añadir una marca de agua \"Generado por IA\" a la imagen"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
   "ByteDanceImageNode": {
     "description": "Generar imágenes usando modelos ByteDance a través de API basado en prompt",
     "display_name": "Imagen ByteDance",
@@ -377,6 +638,10 @@
         "name": "duración",
         "tooltip": "La duración del video de salida en segundos."
       },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "Este parámetro se ignora para cualquier modelo excepto seedance-1-5-pro."
+      },
       "image": {
         "name": "imagen",
         "tooltip": "Primer fotograma a usar para el video."
@@ -431,8 +696,7 @@
         "tooltip": "Número máximo de imágenes a generar cuando generación_secuencial_de_imágenes='automático'. El total de imágenes (entrada + generadas) no puede exceder 15."
       },
       "model": {
-        "name": "modelo",
-        "tooltip": "Nombre del modelo"
+        "name": "modelo"
       },
       "prompt": {
         "name": "prompt",
@@ -484,6 +748,10 @@
         "name": "duración",
         "tooltip": "La duración del video de salida en segundos."
       },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "Este parámetro se ignora para cualquier modelo excepto seedance-1-5-pro."
+      },
       "model": {
         "name": "modelo"
       },
@@ -525,6 +793,11 @@
       "positive": {
         "name": "positivo"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "CFGNorm": {
@@ -763,6 +1036,25 @@
       }
     }
   },
+  "CLIPTextEncodeKandinsky5": {
+    "display_name": "CLIPTextEncodeKandinsky5",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "clip_l": {
+        "name": "clip_l"
+      },
+      "qwen25_7b": {
+        "name": "qwen25_7b"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "CLIPTextEncodeLumina2": {
     "description": "Codifica un mensaje del sistema y un mensaje del usuario utilizando un modelo CLIP en un embedding que se puede usar para guiar el modelo de difusión hacia la generación de imágenes específicas.",
     "display_name": "CLIP Text Encode para Lumina2",
@@ -953,6 +1245,29 @@
       }
     }
   },
+  "CenterCropImages": {
+    "display_name": "Recorte central de imágenes",
+    "inputs": {
+      "height": {
+        "name": "alto",
+        "tooltip": "Alto del recorte."
+      },
+      "images": {
+        "name": "imágenes",
+        "tooltip": "Imagen a procesar."
+      },
+      "width": {
+        "name": "ancho",
+        "tooltip": "Ancho del recorte."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "imágenes",
+        "tooltip": "Imágenes procesadas"
+      }
+    }
+  },
   "CheckpointLoader": {
     "display_name": "Cargar Punto de Control Con Configuración (OBSOLETO)",
     "inputs": {
@@ -1032,6 +1347,21 @@
       }
     }
   },
+  "ColorToRGBInt": {
+    "description": "Convierte un color a un valor entero RGB.",
+    "display_name": "Color a RGB Int",
+    "inputs": {
+      "color": {
+        "name": "color"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "rgb_int",
+        "tooltip": null
+      }
+    }
+  },
   "CombineHooks2": {
     "display_name": "Combinar Hooks [2]",
     "inputs": {
@@ -1089,6 +1419,26 @@
       }
     }
   },
+  "ComfySwitchNode": {
+    "display_name": "Interruptor",
+    "inputs": {
+      "on_false": {
+        "name": "en_falso"
+      },
+      "on_true": {
+        "name": "en_verdadero"
+      },
+      "switch": {
+        "name": "interruptor"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "salida",
+        "tooltip": null
+      }
+    }
+  },
   "ConditioningAverage": {
     "display_name": "Promedio de Acondicionamiento",
     "inputs": {
@@ -1323,10 +1673,12 @@
     },
     "outputs": {
       "0": {
-        "name": "positivo"
+        "name": "positivo",
+        "tooltip": null
       },
       "1": {
-        "name": "negativo"
+        "name": "negativo",
+        "tooltip": null
       }
     }
   },
@@ -1385,6 +1737,10 @@
         "name": "dimensión",
         "tooltip": "La dimensión a la que aplicar las ventanas de contexto."
       },
+      "freenoise": {
+        "name": "ruido_libre",
+        "tooltip": "Si se aplica el barajado de ruido FreeNoise, mejora la mezcla de ventanas."
+      },
       "fuse_method": {
         "name": "método_de_fusión",
         "tooltip": "El método a utilizar para fusionar las ventanas de contexto."
@@ -1745,6 +2101,20 @@
       }
     }
   },
+  "CreateList": {
+    "display_name": "Crear lista",
+    "inputs": {
+      "inputs": {
+        "name": "entradas"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "lista",
+        "tooltip": null
+      }
+    }
+  },
   "CreateVideo": {
     "description": "Crea un video a partir de imágenes.",
     "display_name": "Crear video",
@@ -1767,6 +2137,35 @@
       }
     }
   },
+  "CropByBBoxes": {
+    "description": "Recorta y redimensiona regiones del lote de imágenes de entrada según las cajas delimitadoras proporcionadas.",
+    "display_name": "CropByBBoxes",
+    "inputs": {
+      "bboxes": {
+        "name": "cajas delimitadoras"
+      },
+      "image": {
+        "name": "imagen"
+      },
+      "output_height": {
+        "name": "alto de salida",
+        "tooltip": "Alto al que se redimensiona cada recorte."
+      },
+      "output_width": {
+        "name": "ancho de salida",
+        "tooltip": "Ancho al que se redimensiona cada recorte."
+      },
+      "padding": {
+        "name": "relleno",
+        "tooltip": "Relleno extra en píxeles añadido a cada lado de la caja antes de recortar."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "Todos los recortes apilados en un solo lote de imágenes."
+      }
+    }
+  },
   "CropMask": {
     "display_name": "CropMask",
     "inputs": {
@@ -1785,6 +2184,30 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CustomCombo": {
+    "display_name": "Combinación personalizada",
+    "inputs": {
+      "choice": {
+        "name": "elección"
+      },
+      "index": {},
+      "option1": {}
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "ÍNDICE",
+        "tooltip": null
+      }
     }
   },
   "DiffControlNetLoader": {
@@ -1823,7 +2246,12 @@
     }
   },
   "DisableNoise": {
-    "display_name": "DesactivarRuido"
+    "display_name": "DesactivarRuido",
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
   },
   "DualCFGGuider": {
     "display_name": "Guía Dual CFG",
@@ -1849,6 +2277,11 @@
       "style": {
         "name": "estilo"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "DualCLIPLoader": {
@@ -1900,6 +2333,321 @@
       }
     }
   },
+  "ElevenLabsAudioIsolation": {
+    "description": "Elimina el ruido de fondo del audio, aislando las voces o el habla.",
+    "display_name": "ElevenLabs Aislamiento de Voz",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "Audio a procesar para eliminar el ruido de fondo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsInstantVoiceClone": {
+    "description": "Crea una voz clonada a partir de muestras de audio. Proporcione de 1 a 8 grabaciones de la voz a clonar.",
+    "display_name": "ElevenLabs Clonación Instantánea de Voz",
+    "inputs": {
+      "files": {
+        "name": "archivos",
+        "tooltip": "Grabaciones de audio para la clonación de voz."
+      },
+      "remove_background_noise": {
+        "name": "eliminar_ruido_de_fondo",
+        "tooltip": "Elimina el ruido de fondo de las muestras de voz usando aislamiento de audio."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "voz",
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsSpeechToSpeech": {
+    "description": "Transforma el habla de una voz a otra manteniendo el contenido y la emoción originales.",
+    "display_name": "ElevenLabs Conversión de Voz a Voz",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "Audio de origen a transformar."
+      },
+      "control_after_generate": {
+        "name": "control después de generar"
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Modelo a utilizar para la transformación de voz a voz."
+      },
+      "model_similarity_boost": {
+        "name": "aumento_de_similitud"
+      },
+      "model_speed": {
+        "name": "velocidad"
+      },
+      "model_style": {
+        "name": "estilo"
+      },
+      "model_use_speaker_boost": {
+        "name": "usar_aumento_de_altavoz"
+      },
+      "output_format": {
+        "name": "formato_de_salida",
+        "tooltip": "Formato de salida de audio."
+      },
+      "remove_background_noise": {
+        "name": "eliminar_ruido_de_fondo",
+        "tooltip": "Elimina el ruido de fondo del audio de entrada usando aislamiento de audio."
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "Semilla para reproducibilidad."
+      },
+      "stability": {
+        "name": "estabilidad",
+        "tooltip": "Estabilidad de la voz. Valores bajos ofrecen mayor rango emocional, valores altos producen un habla más consistente pero potencialmente monótona."
+      },
+      "voice": {
+        "name": "voz",
+        "tooltip": "Voz objetivo para la transformación. Conectar desde el Selector de Voz o Clonación Instantánea de Voz."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsSpeechToText": {
+    "description": "Transcribe audio a texto. Soporta detección automática de idioma, diarización de hablantes y etiquetado de eventos de audio.",
+    "display_name": "ElevenLabs Voz a Texto",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "Audio para transcribir."
+      },
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "language_code": {
+        "name": "código_de_idioma",
+        "tooltip": "Código de idioma ISO-639-1 o ISO-639-3 (ej., 'en', 'es', 'fra'). Déjelo vacío para detección automática."
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Modelo a utilizar para la transcripción."
+      },
+      "model_diarization_threshold": {
+        "name": "umbral_de_diarización"
+      },
+      "model_diarize": {
+        "name": "diarizar"
+      },
+      "model_tag_audio_events": {
+        "name": "etiquetar_eventos_de_audio"
+      },
+      "model_temperature": {
+        "name": "temperatura"
+      },
+      "model_timestamps_granularity": {
+        "name": "granularidad_de_marcadores_de_tiempo"
+      },
+      "num_speakers": {
+        "name": "número_de_hablantes",
+        "tooltip": "Número máximo de hablantes a predecir. Establezca en 0 para detección automática."
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "Semilla para reproducibilidad (no se garantiza determinismo)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "texto",
+        "tooltip": null
+      },
+      "1": {
+        "name": "código_de_idioma",
+        "tooltip": null
+      },
+      "2": {
+        "name": "palabras_json",
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToDialogue": {
+    "description": "Genera diálogo de varios hablantes a partir de texto. Cada entrada de diálogo tiene su propio texto y voz.",
+    "display_name": "ElevenLabs Texto a Diálogo",
+    "inputs": {
+      "apply_text_normalization": {
+        "name": "aplicar_normalización_de_texto",
+        "tooltip": "Modo de normalización de texto. 'auto' deja que el sistema decida, 'on' siempre aplica normalización, 'off' la omite."
+      },
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "inputs": {
+        "name": "entradas",
+        "tooltip": "Número de entradas de diálogo."
+      },
+      "inputs_text1": {
+        "name": "texto1"
+      },
+      "language_code": {
+        "name": "código_de_idioma",
+        "tooltip": "Código de idioma ISO-639-1 o ISO-639-3 (ej., 'en', 'es', 'fra'). Déjelo vacío para detección automática."
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Modelo a utilizar para la generación de diálogo."
+      },
+      "output_format": {
+        "name": "formato_de_salida",
+        "tooltip": "Formato de salida de audio."
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "Semilla para reproducibilidad."
+      },
+      "stability": {
+        "name": "estabilidad",
+        "tooltip": "Estabilidad de la voz. Valores bajos dan mayor rango emocional, valores altos producen un habla más consistente pero potencialmente monótona."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToSoundEffects": {
+    "description": "Genera efectos de sonido a partir de descripciones de texto.",
+    "display_name": "ElevenLabs Texto a Efectos de Sonido",
+    "inputs": {
+      "model": {
+        "name": "modelo",
+        "tooltip": "Modelo a utilizar para la generación de efectos de sonido."
+      },
+      "model_duration": {
+        "name": "duración"
+      },
+      "model_loop": {
+        "name": "bucle"
+      },
+      "model_prompt_influence": {
+        "name": "influencia_del_prompt"
+      },
+      "output_format": {
+        "name": "formato_de_salida",
+        "tooltip": "Formato de salida de audio."
+      },
+      "text": {
+        "name": "texto",
+        "tooltip": "Descripción en texto del efecto de sonido a generar."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToSpeech": {
+    "description": "Convierte texto en voz.",
+    "display_name": "ElevenLabs Texto a Voz",
+    "inputs": {
+      "apply_text_normalization": {
+        "name": "aplicar_normalización_de_texto",
+        "tooltip": "Modo de normalización de texto. 'auto' permite que el sistema decida, 'on' siempre aplica la normalización, 'off' la omite."
+      },
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "language_code": {
+        "name": "código_de_idioma",
+        "tooltip": "Código de idioma ISO-639-1 o ISO-639-3 (por ejemplo, 'en', 'es', 'fra'). Dejar vacío para detección automática."
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Modelo a utilizar para texto a voz."
+      },
+      "model_similarity_boost": {
+        "name": "impulso_de_similitud"
+      },
+      "model_speed": {
+        "name": "velocidad"
+      },
+      "model_style": {
+        "name": "estilo"
+      },
+      "model_use_speaker_boost": {
+        "name": "usar_impulso_de_altavoz"
+      },
+      "output_format": {
+        "name": "formato_de_salida",
+        "tooltip": "Formato de salida de audio."
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "Semilla para reproducibilidad (no se garantiza el determinismo)."
+      },
+      "stability": {
+        "name": "estabilidad",
+        "tooltip": "Estabilidad de la voz. Valores bajos ofrecen un rango emocional más amplio, valores altos producen una voz más consistente pero potencialmente monótona."
+      },
+      "text": {
+        "name": "texto",
+        "tooltip": "El texto a convertir en voz."
+      },
+      "voice": {
+        "name": "voz",
+        "tooltip": "Voz a utilizar para la síntesis de voz. Conectar desde el Selector de Voz o Instant Voice Clone."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsVoiceSelector": {
+    "description": "Selecciona una voz predefinida de ElevenLabs para la generación de texto a voz.",
+    "display_name": "Selector de Voz de ElevenLabs",
+    "inputs": {
+      "voice": {
+        "name": "voz",
+        "tooltip": "Elige una voz de las voces predefinidas de ElevenLabs."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "voz",
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyAceStep1_5LatentAudio": {
+    "display_name": "Empty Ace Step 1.5 Latent Audio",
+    "inputs": {
+      "batch_size": {
+        "name": "tamaño de lote",
+        "tooltip": "El número de imágenes latentes en el lote."
+      },
+      "seconds": {
+        "name": "segundos"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyAceStepLatentAudio": {
     "display_name": "EmptyAceStepLatentAudio",
     "inputs": {
@@ -1932,6 +2680,11 @@
         "name": "tasa_de_muestreo",
         "tooltip": "Tasa de muestreo del clip de audio vacío."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "EmptyChromaRadianceLatentImage": {
@@ -1975,6 +2728,25 @@
       }
     }
   },
+  "EmptyFlux2LatentImage": {
+    "display_name": "Empty Flux 2 Latent",
+    "inputs": {
+      "batch_size": {
+        "name": "tamaño_lote"
+      },
+      "height": {
+        "name": "alto"
+      },
+      "width": {
+        "name": "ancho"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyHunyuanImageLatent": {
     "display_name": "ImagenLatenteHunyuanVacía",
     "inputs": {
@@ -2016,6 +2788,28 @@
       }
     }
   },
+  "EmptyHunyuanVideo15Latent": {
+    "display_name": "Empty HunyuanVideo 1.5 Latent",
+    "inputs": {
+      "batch_size": {
+        "name": "tamaño_lote"
+      },
+      "height": {
+        "name": "alto"
+      },
+      "length": {
+        "name": "longitud"
+      },
+      "width": {
+        "name": "ancho"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyImage": {
     "display_name": "EmptyImage",
     "inputs": {
@@ -2065,6 +2859,11 @@
       "seconds": {
         "name": "segundos"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "EmptyLatentHunyuan3Dv2": {
@@ -2077,6 +2876,11 @@
       "resolution": {
         "name": "resolución"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "EmptyLatentImage": {
@@ -2124,6 +2928,28 @@
       }
     }
   },
+  "EmptyQwenImageLayeredLatentImage": {
+    "display_name": "Empty Qwen Image Layered Latent",
+    "inputs": {
+      "batch_size": {
+        "name": "tamaño_lote"
+      },
+      "height": {
+        "name": "alto"
+      },
+      "layers": {
+        "name": "capas"
+      },
+      "width": {
+        "name": "ancho"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptySD3LatentImage": {
     "display_name": "EmptySD3LatentImage",
     "inputs": {
@@ -2171,6 +2997,11 @@
       "steps": {
         "name": "pasos"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ExtendIntermediateSigmas": {
@@ -2191,6 +3022,11 @@
       "steps": {
         "name": "pasos"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FeatherMask": {
@@ -2211,6 +3047,11 @@
       "top": {
         "name": "arriba"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FlipSigmas": {
@@ -2219,6 +3060,102 @@
       "sigmas": {
         "name": "sigmas"
       }
+    },
+    "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",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control después de generar"
+      },
+      "height": {
+        "name": "alto"
+      },
+      "images": {
+        "name": "imágenes",
+        "tooltip": "Hasta 9 imágenes que se pueden usar como referencia."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para la generación o edición de la imagen"
+      },
+      "prompt_upsampling": {
+        "name": "aumento_prompt",
+        "tooltip": "Indica si se realiza aumento de prompt. Si está activo, modifica automáticamente el prompt para una generación más creativa."
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "La semilla aleatoria utilizada para crear el ruido."
+      },
+      "width": {
+        "name": "ancho"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Flux2ProImageNode": {
+    "description": "Genera imágenes de forma sincrónica según el prompt y la resolución.",
+    "display_name": "Flux.2 [pro] Imagen",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control después de generar"
+      },
+      "height": {
+        "name": "alto"
+      },
+      "images": {
+        "name": "imágenes",
+        "tooltip": "Hasta 9 imágenes que se pueden usar como referencia."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para la generación o edición de la imagen"
+      },
+      "prompt_upsampling": {
+        "name": "aumento_prompt",
+        "tooltip": "Indica si se realiza aumento de prompt. Si está activo, modifica automáticamente el prompt para una generación más creativa."
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "La semilla aleatoria utilizada para crear el ruido."
+      },
+      "width": {
+        "name": "ancho"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Flux2Scheduler": {
+    "display_name": "Flux2Scheduler",
+    "inputs": {
+      "height": {
+        "name": "alto"
+      },
+      "steps": {
+        "name": "pasos"
+      },
+      "width": {
+        "name": "ancho"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FluxDisableGuidance": {
@@ -2541,6 +3478,11 @@
       "s2": {
         "name": "s2"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FreeU_V2": {
@@ -2561,6 +3503,11 @@
       "s2": {
         "name": "s2"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "GITSScheduler": {
@@ -2619,6 +3566,102 @@
       }
     }
   },
+  "GLSLShader": {
+    "description": "Aplica shaders de fragmento GLSL ES a imágenes. u_resolution (vec2) siempre está disponible.",
+    "display_name": "Shader GLSL",
+    "inputs": {
+      "floats": {
+        "name": "floats",
+        "tooltip": "Los floats están disponibles como u_float0-4 en el código del shader"
+      },
+      "fragment_shader": {
+        "name": "fragment_shader",
+        "tooltip": "Código fuente del shader de fragmento GLSL (compatible con GLSL ES 3.00 / WebGL 2.0)"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Las imágenes están disponibles como u_image0-4 (sampler2D) en el código del shader"
+      },
+      "ints": {
+        "name": "ints",
+        "tooltip": "Los ints están disponibles como u_int0-4 en el código del shader"
+      },
+      "size_mode": {
+        "name": "size_mode",
+        "tooltip": "Tamaño de salida: 'from_input' usa las dimensiones de la primera imagen de entrada, 'custom' permite tamaño manual"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "IMAGE0",
+        "tooltip": "Disponible mediante layout(location = 0) out vec4 fragColor0 en el código del shader"
+      },
+      "1": {
+        "name": "IMAGE1",
+        "tooltip": "Disponible mediante layout(location = 1) out vec4 fragColor1 en el código del shader"
+      },
+      "2": {
+        "name": "IMAGE2",
+        "tooltip": "Disponible mediante layout(location = 2) out vec4 fragColor2 en el código del shader"
+      },
+      "3": {
+        "name": "IMAGE3",
+        "tooltip": "Disponible mediante layout(location = 3) out vec4 fragColor3 en el código del shader"
+      }
+    }
+  },
+  "GeminiImage2Node": {
+    "description": "Genera o edita imágenes de forma sincrónica a través de la API de Google Vertex.",
+    "display_name": "Nano Banana Pro (Google Gemini Image)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "Si se establece en 'auto', coincide con la relación de aspecto de tu imagen de entrada; si no se proporciona imagen, normalmente se genera un cuadrado 16:9."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "files": {
+        "name": "files",
+        "tooltip": "Archivo(s) opcional(es) para usar como contexto para el modelo. Acepta entradas del nodo Gemini Generate Content Input Files."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Imagen(es) de referencia opcional(es). Para incluir varias imágenes, utiliza el nodo Batch Images (hasta 14)."
+      },
+      "model": {
+        "name": "model"
+      },
+      "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."
+      },
+      "resolution": {
+        "name": "resolution",
+        "tooltip": "Resolución de salida objetivo. Para 2K/4K se utiliza el escalador nativo de Gemini."
+      },
+      "response_modalities": {
+        "name": "response_modalities",
+        "tooltip": "Elige 'IMAGE' para solo imagen, o 'IMAGE+TEXT' para devolver tanto la imagen generada como una respuesta de texto."
+      },
+      "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
+      }
+    }
+  },
   "GeminiImageNode": {
     "description": "Editar imágenes sincrónicamente mediante la API de Google.",
     "display_name": "Imagen de Google Gemini",
@@ -2646,9 +3689,17 @@
         "name": "prompt",
         "tooltip": "Prompt de texto para la generación"
       },
+      "response_modalities": {
+        "name": "response_modalities",
+        "tooltip": "Elige 'IMAGE' para solo imagen, o 'IMAGE+TEXT' para devolver tanto la imagen generada como una respuesta de texto."
+      },
       "seed": {
         "name": "semilla",
         "tooltip": "Cuando la semilla se fija a un valor específico, el modelo hace el mejor esfuerzo para proporcionar la misma respuesta para solicitudes repetidas. No se garantiza una salida determinista. Además, cambiar el modelo o la configuración de parámetros, como la temperatura, puede causar variaciones en la respuesta incluso cuando se utiliza el mismo valor de semilla. Por defecto, se utiliza un valor de semilla aleatorio."
+      },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "Instrucciones fundamentales que dictan el comportamiento de la IA."
       }
     },
     "outputs": {
@@ -2679,6 +3730,60 @@
       }
     }
   },
+  "GeminiNanoBanana2": {
+    "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": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "Si se establece en 'auto', coincide con la relación de aspecto de tu imagen de entrada; si no se proporciona imagen, normalmente se genera un cuadrado 16:9."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "files": {
+        "name": "files",
+        "tooltip": "Archivo(s) opcional(es) para usar como contexto para el modelo. Acepta entradas del nodo Gemini Generate Content Input Files."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Imagen(es) de referencia opcional(es). Para incluir varias imágenes, utiliza el nodo Batch Images (hasta 14)."
+      },
+      "model": {
+        "name": "model"
+      },
+      "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."
+      },
+      "resolution": {
+        "name": "resolution",
+        "tooltip": "Resolución de salida objetivo. Para 2K/4K se utiliza el escalador nativo de Gemini."
+      },
+      "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 un valor de semilla aleatorio."
+      },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "Instrucciones fundamentales que dictan el comportamiento de la IA."
+      },
+      "thinking_level": {
+        "name": "thinking_level"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "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",
@@ -2710,6 +3815,10 @@
         "name": "semilla",
         "tooltip": "Cuando la semilla se fija a un valor específico, el modelo hace el mejor esfuerzo para proporcionar la misma respuesta para solicitudes repetidas. No se garantiza una salida determinista. Además, cambiar el modelo o la configuración de parámetros, como la temperatura, puede causar variaciones en la respuesta incluso cuando se utiliza el mismo valor de semilla. Por defecto, se utiliza un valor de semilla aleatorio."
       },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "Instrucciones fundamentales que dictan el comportamiento de la IA."
+      },
       "video": {
         "name": "video",
         "tooltip": "Video opcional para usar como contexto para el modelo."
@@ -2721,6 +3830,72 @@
       }
     }
   },
+  "GenerateTracks": {
+    "display_name": "GenerateTracks",
+    "inputs": {
+      "bezier": {
+        "name": "bezier",
+        "tooltip": "Habilitar trayectoria de curva Bezier usando el punto medio como punto de control."
+      },
+      "end_x": {
+        "name": "fin_x",
+        "tooltip": "Coordenada X normalizada (0-1) para la posición final."
+      },
+      "end_y": {
+        "name": "fin_y",
+        "tooltip": "Coordenada Y normalizada (0-1) para la posición final."
+      },
+      "height": {
+        "name": "alto"
+      },
+      "interpolation": {
+        "name": "interpolación",
+        "tooltip": "Controla el tiempo/velocidad del movimiento a lo largo de la trayectoria."
+      },
+      "mid_x": {
+        "name": "medio_x",
+        "tooltip": "Punto de control X normalizado para la curva Bezier. Solo se usa cuando 'bezier' está habilitado."
+      },
+      "mid_y": {
+        "name": "medio_y",
+        "tooltip": "Punto de control Y normalizado para la curva Bezier. Solo se usa cuando 'bezier' está habilitado."
+      },
+      "num_frames": {
+        "name": "número_de_frames"
+      },
+      "num_tracks": {
+        "name": "número_de_rutas"
+      },
+      "start_x": {
+        "name": "inicio_x",
+        "tooltip": "Coordenada X normalizada (0-1) para la posición inicial."
+      },
+      "start_y": {
+        "name": "inicio_y",
+        "tooltip": "Coordenada Y normalizada (0-1) para la posición inicial."
+      },
+      "track_mask": {
+        "name": "máscara_de_ruta",
+        "tooltip": "Máscara opcional para indicar los frames visibles."
+      },
+      "track_spread": {
+        "name": "separación_de_rutas",
+        "tooltip": "Distancia normalizada entre rutas. Las rutas se distribuyen perpendicularmente a la dirección del movimiento."
+      },
+      "width": {
+        "name": "ancho"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "longitud_de_ruta",
+        "tooltip": null
+      }
+    }
+  },
   "GetImageSize": {
     "description": "Devuelve el ancho y alto de la imagen, y la pasa sin cambios.",
     "display_name": "Obtener Tamaño de Imagen",
@@ -2731,13 +3906,16 @@
     },
     "outputs": {
       "0": {
-        "name": "ancho"
+        "name": "ancho",
+        "tooltip": null
       },
       "1": {
-        "name": "alto"
+        "name": "alto",
+        "tooltip": null
       },
       "2": {
-        "name": "tamaño_lote"
+        "name": "tamaño_de_lote",
+        "tooltip": null
       }
     }
   },
@@ -2765,6 +3943,149 @@
       }
     }
   },
+  "GrokImageEditNode": {
+    "description": "Modifica una imagen existente según una indicación de texto",
+    "display_name": "Edición de imagen Grok",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "relación de aspecto",
+        "tooltip": "Solo permitido cuando varias imágenes están conectadas a la entrada de imagen."
+      },
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "image": {
+        "name": "imagen"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "number_of_images": {
+        "name": "número de imágenes",
+        "tooltip": "Cantidad de imágenes editadas a generar"
+      },
+      "prompt": {
+        "name": "indicación",
+        "tooltip": "La indicación de texto utilizada para generar la imagen"
+      },
+      "resolution": {
+        "name": "resolución"
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "Semilla para determinar si el nodo debe ejecutarse de nuevo; 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",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "relación de aspecto"
+      },
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "number_of_images": {
+        "name": "número de imágenes",
+        "tooltip": "Cantidad de imágenes a generar"
+      },
+      "prompt": {
+        "name": "indicación",
+        "tooltip": "La indicación de texto utilizada para generar la imagen"
+      },
+      "resolution": {
+        "name": "resolución"
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "Semilla para determinar si el nodo debe ejecutarse de nuevo; los resultados reales son no deterministas independientemente de la semilla."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokVideoEditNode": {
+    "description": "Edita un video existente según una indicación de texto.",
+    "display_name": "Edición de video Grok",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "prompt": {
+        "name": "indicación",
+        "tooltip": "Descripción en texto del video deseado."
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "Semilla para determinar si el nodo debe ejecutarse de nuevo; los resultados reales son no deterministas independientemente de la semilla."
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "La duración máxima admitida es de 8,7 segundos y el tamaño máximo de archivo es de 50MB."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokVideoNode": {
+    "description": "Genera video a partir de una indicación o una imagen",
+    "display_name": "Video Grok",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "relación de aspecto",
+        "tooltip": "La relación de aspecto del video de salida."
+      },
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "duration": {
+        "name": "duración",
+        "tooltip": "La duración del video de salida en segundos."
+      },
+      "image": {
+        "name": "imagen"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "prompt": {
+        "name": "indicación",
+        "tooltip": "Descripción en texto del video deseado."
+      },
+      "resolution": {
+        "name": "resolución",
+        "tooltip": "La resolución del video de salida."
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "Semilla para determinar si el nodo debe ejecutarse de nuevo; los resultados reales son no deterministas independientemente de la semilla."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "GrowMask": {
     "display_name": "GrowMask",
     "inputs": {
@@ -2777,6 +4098,55 @@
       "tapered_corners": {
         "name": "esquinas_afiladas"
       }
+    },
+    "outputs": {
+      "0": {
+        "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",
+    "inputs": {
+      "auto_downscale": {
+        "name": "reducción automática",
+        "tooltip": "Reduce automáticamente la imagen de entrada si la salida supera el límite."
+      },
+      "image": {
+        "name": "imagen"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "upscale_factor": {
+        "name": "factor de escalado"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HitPawVideoEnhance": {
+    "description": "Aumenta la resolución de videos de baja calidad a alta resolución, elimina artefactos y ruido. Los precios mostrados son por segundo de video.",
+    "display_name": "HitPaw Video Enhance",
+    "inputs": {
+      "model": {
+        "name": "modelo"
+      },
+      "model_resolution": {
+        "name": "resolución"
+      },
+      "video": {
+        "name": "video"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "Hunyuan3Dv2Conditioning": {
@@ -2788,10 +4158,12 @@
     },
     "outputs": {
       "0": {
-        "name": "positivo"
+        "name": "positive",
+        "tooltip": null
       },
       "1": {
-        "name": "negativo"
+        "name": "negative",
+        "tooltip": null
       }
     }
   },
@@ -2813,10 +4185,12 @@
     },
     "outputs": {
       "0": {
-        "name": "positivo"
+        "name": "positive",
+        "tooltip": null
       },
       "1": {
-        "name": "negativo"
+        "name": "negative",
+        "tooltip": null
       }
     }
   },
@@ -2890,6 +4264,120 @@
       }
     }
   },
+  "HunyuanVideo15ImageToVideo": {
+    "display_name": "HunyuanVideo15ImageToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "tamaño_de_lote"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "alto"
+      },
+      "length": {
+        "name": "longitud"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "start_image": {
+        "name": "imagen_inicial"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "ancho"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latente",
+        "tooltip": null
+      }
+    }
+  },
+  "HunyuanVideo15LatentUpscaleWithModel": {
+    "display_name": "Hunyuan Video 15 Latent Upscale With Model",
+    "inputs": {
+      "crop": {
+        "name": "recorte"
+      },
+      "height": {
+        "name": "alto"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "samples": {
+        "name": "muestras"
+      },
+      "upscale_method": {
+        "name": "método_de_escalado"
+      },
+      "width": {
+        "name": "ancho"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HunyuanVideo15SuperResolution": {
+    "display_name": "HunyuanVideo15SuperResolution",
+    "inputs": {
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "latent": {
+        "name": "latente"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "noise_augmentation": {
+        "name": "aumento_de_ruido"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "start_image": {
+        "name": "imagen_inicial"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latente",
+        "tooltip": null
+      }
+    }
+  },
   "HyperTile": {
     "display_name": "HyperTile",
     "inputs": {
@@ -3094,6 +4582,11 @@
       "strength": {
         "name": "intensidad"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageBatch": {
@@ -3157,6 +4650,26 @@
       "image": {
         "name": "imagen"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageCompare": {
+    "description": "Compara dos imágenes una al lado de la otra con un control deslizante.",
+    "display_name": "Comparar Imágenes",
+    "inputs": {
+      "compare_view": {
+        "name": "vista_comparar"
+      },
+      "image_a": {
+        "name": "imagen_a"
+      },
+      "image_b": {
+        "name": "imagen_b"
+      }
     }
   },
   "ImageCompositeMasked": {
@@ -3180,6 +4693,11 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageCrop": {
@@ -3200,6 +4718,50 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageCropV2": {
+    "display_name": "Recorte de Imagen",
+    "inputs": {
+      "crop_region": {
+        "name": "crop_region"
+      },
+      "height": {},
+      "image": {
+        "name": "image"
+      },
+      "width": {},
+      "x": {},
+      "y": {}
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageDeduplication": {
+    "display_name": "Eliminación de Imágenes Duplicadas",
+    "inputs": {
+      "images": {
+        "name": "imágenes",
+        "tooltip": "Lista de imágenes a procesar."
+      },
+      "similarity_threshold": {
+        "name": "umbral_de_similitud",
+        "tooltip": "Umbral de similitud (0-1). Un valor más alto significa mayor similitud. Las imágenes por encima de este umbral se consideran duplicadas."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "imágenes",
+        "tooltip": "Imágenes procesadas"
+      }
     }
   },
   "ImageFlip": {
@@ -3211,6 +4773,11 @@
       "image": {
         "name": "imagen"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageFromBatch": {
@@ -3225,6 +4792,42 @@
       "length": {
         "name": "longitud"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageGrid": {
+    "display_name": "Cuadrícula de Imágenes",
+    "inputs": {
+      "cell_height": {
+        "name": "alto_de_celda",
+        "tooltip": "Altura de cada celda en la cuadrícula."
+      },
+      "cell_width": {
+        "name": "ancho_de_celda",
+        "tooltip": "Ancho de cada celda en la cuadrícula."
+      },
+      "columns": {
+        "name": "columnas",
+        "tooltip": "Número de columnas en la cuadrícula."
+      },
+      "images": {
+        "name": "imágenes",
+        "tooltip": "Lista de imágenes a procesar."
+      },
+      "padding": {
+        "name": "espaciado",
+        "tooltip": "Espaciado entre imágenes."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "imágenes",
+        "tooltip": "Imágenes procesadas"
+      }
     }
   },
   "ImageInvert": {
@@ -3235,6 +4838,28 @@
       }
     }
   },
+  "ImageMergeTileList": {
+    "display_name": "Unir lista de mosaicos en imagen",
+    "inputs": {
+      "final_height": {
+        "name": "final_height"
+      },
+      "final_width": {
+        "name": "final_width"
+      },
+      "image_list": {
+        "name": "image_list"
+      },
+      "overlap": {
+        "name": "overlap"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ImageOnlyCheckpointLoader": {
     "display_name": "Cargador de Puntos de Control Solo de Imagen (modelo img2vid)",
     "inputs": {
@@ -3333,6 +4958,11 @@
       "rotation": {
         "name": "rotación"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageScale": {
@@ -3381,6 +5011,11 @@
       "upscale_method": {
         "name": "método_de_escalado"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageScaleToTotalPixels": {
@@ -3392,6 +5027,9 @@
       "megapixels": {
         "name": "megapixeles"
       },
+      "resolution_steps": {
+        "name": "pasos_de_resolución"
+      },
       "upscale_method": {
         "name": "metodo_ampliacion"
       }
@@ -3446,6 +5084,11 @@
       "spacing_width": {
         "name": "ancho_espaciado"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageToMask": {
@@ -3457,6 +5100,11 @@
       "image": {
         "name": "imagen"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageUpscaleWithModel": {
@@ -3566,6 +5214,29 @@
       "mask": {
         "name": "máscara"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "JoinAudioChannels": {
+    "description": "Une los canales de audio mono izquierdo y derecho en un audio estéreo.",
+    "display_name": "Unir Canales de Audio",
+    "inputs": {
+      "audio_left": {
+        "name": "audio_izquierdo"
+      },
+      "audio_right": {
+        "name": "audio_derecho"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "audio",
+        "tooltip": null
+      }
     }
   },
   "JoinImageWithAlpha": {
@@ -3691,6 +5362,58 @@
       "sampler_name": {
         "name": "nombre_del_muestreador"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Kandinsky5ImageToVideo": {
+    "display_name": "Kandinsky5ImageToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "tamaño_lote"
+      },
+      "height": {
+        "name": "alto"
+      },
+      "length": {
+        "name": "duración"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "start_image": {
+        "name": "imagen_inicial"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "ancho"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latente",
+        "tooltip": "Latente de video vacío"
+      },
+      "3": {
+        "name": "latente_cond",
+        "tooltip": "Imágenes iniciales codificadas limpias, usadas para reemplazar el inicio ruidoso de los latentes de salida del modelo"
+      }
     }
   },
   "KarrasScheduler": {
@@ -3708,6 +5431,44 @@
       "steps": {
         "name": "pasos"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingAvatarNode": {
+    "description": "Genera videos de humanos digitales de estilo broadcast a partir de una sola foto y un archivo de audio.",
+    "display_name": "Kling Avatar 2.0",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "image": {
+        "name": "imagen",
+        "tooltip": "Imagen de referencia del avatar. El ancho y la altura deben ser de al menos 300 px. La relación de aspecto debe estar entre 1:2.5 y 2.5:1."
+      },
+      "mode": {
+        "name": "modo"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt opcional para definir acciones, emociones y movimientos de cámara del avatar."
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "La semilla controla si el nodo debe ejecutarse de nuevo; los resultados son no deterministas independientemente de la semilla."
+      },
+      "sound_file": {
+        "name": "archivo_de_audio",
+        "tooltip": "Entrada de audio. Debe tener una duración entre 2 y 300 segundos."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "KlingCameraControlI2VNode": {
@@ -3862,6 +5623,46 @@
       }
     }
   },
+  "KlingFirstLastFrameNode": {
+    "description": "Genera videos con Kling V3 usando el primer y último fotograma.",
+    "display_name": "Kling 3.0 Primer-Último Fotograma a Video",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "duration": {
+        "name": "duración"
+      },
+      "end_frame": {
+        "name": "último_fotograma"
+      },
+      "first_frame": {
+        "name": "primer_fotograma"
+      },
+      "generate_audio": {
+        "name": "generar_audio"
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Configuración del modelo y generación."
+      },
+      "model_resolution": {
+        "name": "resolución"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "La semilla controla si el nodo debe ejecutarse de nuevo; los resultados son no deterministas independientemente de la semilla."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingImage2VideoNode": {
     "display_name": "Kling Imagen a Video",
     "inputs": {
@@ -3914,6 +5715,9 @@
       "aspect_ratio": {
         "name": "aspect_ratio"
       },
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
       "human_fidelity": {
         "name": "human_fidelity",
         "tooltip": "Similitud de referencia del sujeto"
@@ -3942,6 +5746,39 @@
       "prompt": {
         "name": "prompt",
         "tooltip": "Prompt de texto positivo"
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "La semilla controla si el nodo debe ejecutarse de nuevo; los resultados son no deterministas independientemente de la semilla."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingImageToVideoWithAudio": {
+    "display_name": "Kling Imagen (Primer fotograma) a Video con Audio",
+    "inputs": {
+      "duration": {
+        "name": "duración"
+      },
+      "generate_audio": {
+        "name": "generar_audio"
+      },
+      "mode": {
+        "name": "modo"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt de texto positivo."
+      },
+      "start_frame": {
+        "name": "fotograma_inicial"
       }
     },
     "outputs": {
@@ -4011,6 +5848,299 @@
       }
     }
   },
+  "KlingMotionControl": {
+    "display_name": "Kling Control de Movimiento",
+    "inputs": {
+      "character_orientation": {
+        "name": "orientación_personaje",
+        "tooltip": "Controla de dónde proviene la orientación/posición del personaje.\nvideo: movimientos, expresiones, movimientos de cámara y orientación siguen el video de referencia de movimiento (otros detalles vía prompt).\nimagen: los movimientos y expresiones siguen el video de referencia de movimiento, pero la orientación del personaje coincide con la imagen de referencia (cámara/otros detalles vía prompt)."
+      },
+      "keep_original_sound": {
+        "name": "mantener_sonido_original"
+      },
+      "mode": {
+        "name": "modo"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "reference_image": {
+        "name": "imagen_referencia"
+      },
+      "reference_video": {
+        "name": "video_referencia",
+        "tooltip": "Video de referencia de movimiento usado para guiar el movimiento/expresión.\nLos límites de duración dependen de character_orientation:\n - imagen: 3–10s (máx 10s)\n - video: 3–30s (máx 30s)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProEditVideoNode": {
+    "description": "Edita un video existente con el modelo más reciente de Kling.",
+    "display_name": "Kling Omni Editar Video (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "keep_original_sound": {
+        "name": "mantener_sonido_original"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Un prompt de texto que describe el contenido del video. Puede incluir descripciones positivas y negativas."
+      },
+      "reference_images": {
+        "name": "imágenes_referencia",
+        "tooltip": "Hasta 4 imágenes de referencia adicionales."
+      },
+      "resolution": {
+        "name": "resolución"
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "La semilla controla si el nodo debe ejecutarse de nuevo; los resultados son no deterministas independientemente de la semilla."
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "Video para editar. La longitud del video de salida será la misma."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProFirstLastFrameNode": {
+    "description": "Utiliza un fotograma inicial, un fotograma final opcional o imágenes de referencia con el último modelo de Kling.",
+    "display_name": "Kling Omni Primer-Último-Frame a Video (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "end_frame": {
+        "name": "end_frame",
+        "tooltip": "Un fotograma final opcional para el video. No se puede usar simultáneamente con 'reference_images'."
+      },
+      "first_frame": {
+        "name": "first_frame"
+      },
+      "generate_audio": {
+        "name": "generar_audio",
+        "tooltip": "Genera audio para el video. Solo compatible con kling-v3-omni."
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Un prompt de texto que describe el contenido del video. Puede incluir descripciones tanto positivas como negativas."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "Hasta 6 imágenes de referencia adicionales."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "La semilla controla si el nodo debe ejecutarse de nuevo; los resultados son no deterministas independientemente de la semilla."
+      },
+      "storyboards": {
+        "name": "storyboards",
+        "tooltip": "Genera una serie de segmentos de video con prompts y duraciones individuales. Solo compatible con kling-v3-omni."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProImageNode": {
+    "description": "Crea o edita imágenes con el último modelo de Kling.",
+    "display_name": "Kling Omni Imagen (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Un prompt de texto que describe el contenido de la imagen. Puede incluir descripciones tanto positivas como negativas."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "Hasta 10 imágenes de referencia adicionales."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "La semilla controla si el nodo debe ejecutarse de nuevo; los resultados son no deterministas independientemente de la semilla."
+      },
+      "series_amount": {
+        "name": "cantidad_de_series",
+        "tooltip": "Genera una serie de imágenes. No compatible con kling-image-o1."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProImageToVideoNode": {
+    "description": "Utiliza hasta 7 imágenes de referencia para generar un video con el último modelo de Kling.",
+    "display_name": "Kling Omni Imagen a Video (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "generate_audio": {
+        "name": "generar_audio",
+        "tooltip": "Genera audio para el video. Solo compatible con kling-v3-omni."
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Un prompt de texto que describe el contenido del video. Puede incluir descripciones tanto positivas como negativas."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "Hasta 7 imágenes de referencia."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "La semilla controla si el nodo debe ejecutarse de nuevo; los resultados son no deterministas independientemente de la semilla."
+      },
+      "storyboards": {
+        "name": "storyboards",
+        "tooltip": "Genera una serie de segmentos de video con prompts y duraciones individuales. Solo compatible con kling-v3-omni."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProTextToVideoNode": {
+    "description": "Utiliza prompts de texto para generar videos con el último modelo de Kling.",
+    "display_name": "Kling Omni Texto a Video (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "generate_audio": {
+        "name": "generar_audio"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Un prompt de texto que describe el contenido del video. Puede incluir descripciones tanto positivas como negativas."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "La semilla controla si el nodo debe ejecutarse de nuevo; los resultados son no deterministas independientemente de la semilla."
+      },
+      "storyboards": {
+        "name": "storyboards",
+        "tooltip": "Genera una serie de segmentos de video con prompts y duraciones individuales. Ignorado para el modelo o1."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProVideoToVideoNode": {
+    "description": "Utiliza un video y hasta 4 imágenes de referencia para generar un video con el modelo Kling más reciente.",
+    "display_name": "Kling Omni Video a Video (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "keep_original_sound": {
+        "name": "keep_original_sound"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Un prompt de texto que describe el contenido del video. Puede incluir descripciones tanto positivas como negativas."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "Hasta 4 imágenes de referencia adicionales."
+      },
+      "reference_video": {
+        "name": "reference_video",
+        "tooltip": "Video a usar como referencia."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "La semilla controla si el nodo debe volver a ejecutarse; los resultados son no deterministas independientemente de la semilla."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingSingleImageVideoEffectNode": {
     "description": "Logra diferentes efectos especiales al generar un video basado en el effect_scene.",
     "display_name": "Efectos de Video Kling",
@@ -4125,6 +6255,35 @@
       }
     }
   },
+  "KlingTextToVideoWithAudio": {
+    "display_name": "Kling Texto a Video con Audio",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "generate_audio": {
+        "name": "generate_audio"
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt de texto positivo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingVideoExtendNode": {
     "description": "Nodo Kling Video Extend. Extiende videos creados por otros nodos Kling. El video_id se crea utilizando otros nodos Kling.",
     "display_name": "Kling Video Extend",
@@ -4159,6 +6318,54 @@
       }
     }
   },
+  "KlingVideoNode": {
+    "description": "Genera videos con Kling V3. Soporta texto a video e imagen a video con opción de storyboard multiprompt y generación de audio.",
+    "display_name": "Kling 3.0 Video",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "generate_audio": {
+        "name": "generar audio"
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Configuración del modelo y generación."
+      },
+      "model_aspect_ratio": {
+        "name": "relación de aspecto"
+      },
+      "model_resolution": {
+        "name": "resolución"
+      },
+      "multi_shot": {
+        "name": "multi_shot",
+        "tooltip": "Genera una serie de segmentos de video con indicaciones y duraciones individuales."
+      },
+      "multi_shot_duration": {
+        "name": "duración"
+      },
+      "multi_shot_negative_prompt": {
+        "name": "indicaciones negativas"
+      },
+      "multi_shot_prompt": {
+        "name": "indicaciones"
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "La semilla controla si el nodo debe volver a ejecutarse; los resultados son no deterministas independientemente de la semilla."
+      },
+      "start_frame": {
+        "name": "fotograma inicial",
+        "tooltip": "Imagen de fotograma inicial opcional. Al conectarse, cambia al modo imagen a video."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingVirtualTryOnNode": {
     "description": "Nodo Kling Virtual Try On. Ingresa una imagen de una persona y una imagen de una prenda para probar la prenda en la persona.",
     "display_name": "Kling Virtual Try On",
@@ -4179,6 +6386,26 @@
       }
     }
   },
+  "LTXAVTextEncoderLoader": {
+    "description": "[Recetas]\n\nltxav: gemma 3 12B",
+    "display_name": "Cargador de codificador de texto LTXV Audio",
+    "inputs": {
+      "ckpt_name": {
+        "name": "ckpt_name"
+      },
+      "device": {
+        "name": "device"
+      },
+      "text_encoder": {
+        "name": "text_encoder"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LTXVAddGuide": {
     "display_name": "LTXVAddGuide",
     "inputs": {
@@ -4221,6 +6448,76 @@
       }
     }
   },
+  "LTXVAudioVAEDecode": {
+    "display_name": "Decodificar LTXV Audio VAE",
+    "inputs": {
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "El modelo Audio VAE utilizado para decodificar el latente."
+      },
+      "samples": {
+        "name": "samples",
+        "tooltip": "El latente que se va a decodificar."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Audio",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAEEncode": {
+    "display_name": "Codificar LTXV Audio VAE",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "El audio que se va a codificar."
+      },
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "El modelo Audio VAE a utilizar para la codificación."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Audio Latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAELoader": {
+    "display_name": "Cargador de LTXV Audio VAE",
+    "inputs": {
+      "ckpt_name": {
+        "name": "ckpt_name",
+        "tooltip": "Punto de control de Audio VAE a cargar."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Audio VAE",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVConcatAVLatent": {
+    "display_name": "LTXVConcatAVLatent",
+    "inputs": {
+      "audio_latent": {
+        "name": "audio_latent"
+      },
+      "video_latent": {
+        "name": "video_latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
   "LTXVConditioning": {
     "display_name": "LTXVConditioning",
     "inputs": {
@@ -4273,6 +6570,33 @@
       }
     }
   },
+  "LTXVEmptyLatentAudio": {
+    "display_name": "LTXV Audio Latente Vacío",
+    "inputs": {
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "El modelo Audio VAE del que obtener la configuración."
+      },
+      "batch_size": {
+        "name": "batch_size",
+        "tooltip": "El número de muestras de audio latente en el lote."
+      },
+      "frame_rate": {
+        "name": "frame_rate",
+        "tooltip": "Número de fotogramas por segundo."
+      },
+      "frames_number": {
+        "name": "frames_number",
+        "tooltip": "Número de fotogramas."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Latent",
+        "tooltip": null
+      }
+    }
+  },
   "LTXVImgToVideo": {
     "display_name": "LTXVImgToVideo",
     "inputs": {
@@ -4319,6 +6643,47 @@
       }
     }
   },
+  "LTXVImgToVideoInplace": {
+    "display_name": "LTXVImgToVideoInplace",
+    "inputs": {
+      "bypass": {
+        "name": "omitir",
+        "tooltip": "Omitir el acondicionamiento."
+      },
+      "image": {
+        "name": "imagen"
+      },
+      "latent": {
+        "name": "latente"
+      },
+      "strength": {
+        "name": "fuerza"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latente",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVLatentUpsampler": {
+    "display_name": "LTXVLatentUpsampler",
+    "inputs": {
+      "samples": {
+        "name": "muestras"
+      },
+      "upscale_model": {
+        "name": "modelo_de_escalado"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
   "LTXVPreprocess": {
     "display_name": "LTXVPreprocesar",
     "inputs": {
@@ -4367,6 +6732,25 @@
       }
     }
   },
+  "LTXVSeparateAVLatent": {
+    "description": "LTXV Separar AV Latente",
+    "display_name": "LTXVSeparateAVLatent",
+    "inputs": {
+      "av_latent": {
+        "name": "av_latente"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latente_video",
+        "tooltip": null
+      },
+      "1": {
+        "name": "latente_audio",
+        "tooltip": null
+      }
+    }
+  },
   "LaplaceScheduler": {
     "display_name": "LaplaceScheduler",
     "inputs": {
@@ -4385,6 +6769,11 @@
       "steps": {
         "name": "pasos"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "LatentAdd": {
@@ -4522,6 +6911,11 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "LatentConcat": {
@@ -4585,6 +6979,25 @@
       }
     }
   },
+  "LatentCutToBatch": {
+    "display_name": "LatentCutToBatch",
+    "inputs": {
+      "dim": {
+        "name": "dim"
+      },
+      "samples": {
+        "name": "samples"
+      },
+      "slice_size": {
+        "name": "slice_size"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LatentFlip": {
     "display_name": "Voltear Latente",
     "inputs": {
@@ -4738,6 +7151,19 @@
       }
     }
   },
+  "LatentUpscaleModelLoader": {
+    "display_name": "Cargar modelo de escalado Latent",
+    "inputs": {
+      "model_name": {
+        "name": "model_name"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LazyCache": {
     "description": "Una versión casera de EasyCache - versión 'más fácil' de EasyCache para implementar. En general funciona peor que EasyCache, pero mejor en algunos casos raros Y compatibilidad universal con todo en ComfyUI.",
     "display_name": "CachéPerezoso",
@@ -4772,8 +7198,7 @@
   "Load3D": {
     "display_name": "Cargar 3D",
     "inputs": {
-      "clear": {
-      },
+      "clear": {},
       "height": {
         "name": "alto"
       },
@@ -4783,30 +7208,40 @@
       "model_file": {
         "name": "archivo_modelo"
       },
-      "upload 3d model": {
-      },
+      "upload 3d model": {},
+      "upload extra resources": {},
       "width": {
         "name": "ancho"
       }
     },
     "outputs": {
       "0": {
-        "name": "imagen"
+        "name": "imagen",
+        "tooltip": null
       },
       "1": {
-        "name": "mask"
+        "name": "mask",
+        "tooltip": null
       },
       "2": {
-        "name": "ruta_malla"
+        "name": "mesh_path",
+        "tooltip": null
       },
       "3": {
-        "name": "normal"
+        "name": "normal",
+        "tooltip": null
       },
       "4": {
-        "name": "lineart"
+        "name": "camera_info",
+        "tooltip": null
       },
       "5": {
-        "name": "info_cámara"
+        "name": "recording_video",
+        "tooltip": null
+      },
+      "6": {
+        "name": "model_3d",
+        "tooltip": null
       }
     }
   },
@@ -4822,6 +7257,11 @@
       "upload": {
         "name": "elige archivo para subir"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "LoadImage": {
@@ -4835,6 +7275,21 @@
       }
     }
   },
+  "LoadImageDataSetFromFolder": {
+    "display_name": "Cargar conjunto de imágenes desde carpeta",
+    "inputs": {
+      "folder": {
+        "name": "folder",
+        "tooltip": "La carpeta desde la que cargar las imágenes."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Lista de imágenes cargadas"
+      }
+    }
+  },
   "LoadImageMask": {
     "display_name": "Cargar Imagen (como Máscara)",
     "inputs": {
@@ -4853,16 +7308,35 @@
     "description": "Carga una imagen desde la carpeta de salida. Cuando se hace clic en el botón de actualizar, el nodo actualizará la lista de imágenes y seleccionará automáticamente la primera imagen, permitiendo una fácil iteración.",
     "display_name": "Cargar Imagen (desde Salidas)",
     "inputs": {
+      "Auto-refresh after generation": {},
       "image": {
         "name": "imagen"
       },
-      "refresh": {
-      },
+      "refresh": {},
       "upload": {
         "name": "elige archivo para subir"
       }
     }
   },
+  "LoadImageTextDataSetFromFolder": {
+    "display_name": "Cargar conjunto de imágenes y texto desde carpeta",
+    "inputs": {
+      "folder": {
+        "name": "folder",
+        "tooltip": "La carpeta desde la que cargar las imágenes."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Lista de imágenes cargadas"
+      },
+      "1": {
+        "name": "texts",
+        "tooltip": "Lista de subtítulos de texto"
+      }
+    }
+  },
   "LoadLatent": {
     "display_name": "CargarLatente",
     "inputs": {
@@ -4871,6 +7345,25 @@
       }
     }
   },
+  "LoadTrainingDataset": {
+    "display_name": "Cargar conjunto de datos de entrenamiento",
+    "inputs": {
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "Nombre de la carpeta que contiene el conjunto de datos guardado (dentro del directorio de salida)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latents",
+        "tooltip": "Lista de diccionarios de latentes"
+      },
+      "1": {
+        "name": "conditioning",
+        "tooltip": "Lista de listas de condicionamiento"
+      }
+    }
+  },
   "LoadVideo": {
     "display_name": "Cargar video",
     "inputs": {
@@ -4921,6 +7414,60 @@
       }
     }
   },
+  "LoraLoaderBypass": {
+    "description": "Aplica LoRA en modo bypass. A diferencia de LoRA regular, esto no modifica los pesos del modelo, sino que inyecta el cálculo de LoRA durante la pasada hacia adelante. Útil para escenarios de entrenamiento.",
+    "display_name": "Cargar LoRA (Bypass) (Para depuración)",
+    "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "El modelo CLIP al que se aplicará LoRA."
+      },
+      "lora_name": {
+        "name": "lora_name",
+        "tooltip": "El nombre de la LoRA."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "El modelo de difusión al que se aplicará LoRA."
+      },
+      "strength_clip": {
+        "name": "strength_clip",
+        "tooltip": "Qué tanto modificar el modelo CLIP. Este valor puede ser negativo."
+      },
+      "strength_model": {
+        "name": "strength_model",
+        "tooltip": "Qué tanto modificar el modelo de difusión. Este valor puede ser negativo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "El modelo de difusión modificado."
+      },
+      "1": {
+        "tooltip": "El modelo CLIP modificado."
+      }
+    }
+  },
+  "LoraLoaderBypassModelOnly": {
+    "description": "Aplica LoRA en modo bypass. A diferencia de LoRA regular, esto no modifica los pesos del modelo, sino que inyecta el cálculo de LoRA durante la pasada hacia adelante. Útil para escenarios de entrenamiento.",
+    "display_name": "Cargar LoRA (Bypass, Solo Modelo) (para depuración)",
+    "inputs": {
+      "lora_name": {
+        "name": "lora_name"
+      },
+      "model": {
+        "name": "model"
+      },
+      "strength_model": {
+        "name": "strength_model"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "El modelo de difusión modificado."
+      }
+    }
+  },
   "LoraLoaderModelOnly": {
     "description": "Las LoRAs se utilizan para modificar los modelos de difusión y CLIP, alterando la forma en que se desruidan los latentes, como la aplicación de estilos. Se pueden vincular varios nodos de LoRA.",
     "display_name": "CargadorLoRAModeloSolo",
@@ -4944,6 +7491,10 @@
   "LoraModelLoader": {
     "display_name": "Cargar Modelo LoRA",
     "inputs": {
+      "bypass": {
+        "name": "bypass",
+        "tooltip": "Cuando está activado, aplica LoRA en modo bypass sin modificar los pesos del modelo base. Útil para entrenamiento y cuando los pesos del modelo se descargan."
+      },
       "lora": {
         "name": "lora",
         "tooltip": "El modelo LoRA a aplicar al modelo de difusión."
@@ -4959,6 +7510,7 @@
     },
     "outputs": {
       "0": {
+        "name": "model",
         "tooltip": "El modelo de difusión modificado."
       }
     }
@@ -4992,10 +7544,12 @@
     "display_name": "Graficar Pérdida",
     "inputs": {
       "filename_prefix": {
-        "name": "prefijo_nombre_archivo"
+        "name": "prefijo_nombre_archivo",
+        "tooltip": "Prefijo para la imagen del gráfico de pérdida guardada."
       },
       "loss": {
-        "name": "pérdida"
+        "name": "pérdida",
+        "tooltip": "Mapa de pérdida del nodo de entrenamiento."
       }
     }
   },
@@ -5286,6 +7840,208 @@
       }
     }
   },
+  "MagnificImageRelightNode": {
+    "description": "Ilumina una imagen con ajustes de luz y transferencia de luz basada en referencia opcional.",
+    "display_name": "Magnific Relight de Imagen",
+    "inputs": {
+      "advanced_settings": {
+        "name": "advanced_settings",
+        "tooltip": "Opciones de ajuste fino para control avanzado de la iluminación."
+      },
+      "change_background": {
+        "name": "change_background",
+        "tooltip": "Modifica el fondo según el prompt o la referencia."
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "La imagen a iluminar."
+      },
+      "interpolate_from_original": {
+        "name": "interpolate_from_original",
+        "tooltip": "Restringe la libertad de generación para que coincida más con el original."
+      },
+      "light_transfer_strength": {
+        "name": "light_transfer_strength",
+        "tooltip": "Intensidad de la aplicación de transferencia de luz."
+      },
+      "preserve_details": {
+        "name": "preserve_details",
+        "tooltip": "Mantiene la textura y los detalles finos del original."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Guía descriptiva para la iluminación. Soporta notación de énfasis (1-1.4)."
+      },
+      "reference_image": {
+        "name": "reference_image",
+        "tooltip": "Imagen de referencia opcional de la cual transferir la iluminación."
+      },
+      "style": {
+        "name": "style",
+        "tooltip": "Preferencia de estilo de salida."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageSkinEnhancerNode": {
+    "description": "Mejora de piel para retratos con múltiples modos de procesamiento.",
+    "display_name": "Magnific Mejorador de Piel en Imagen",
+    "inputs": {
+      "image": {
+        "name": "image",
+        "tooltip": "La imagen de retrato a mejorar."
+      },
+      "mode": {
+        "name": "mode",
+        "tooltip": "Modo de procesamiento: creativo para mejora artística, fiel para preservar la apariencia original, flexible para optimización dirigida."
+      },
+      "sharpen": {
+        "name": "sharpen",
+        "tooltip": "Nivel de intensidad de enfoque."
+      },
+      "smart_grain": {
+        "name": "smart_grain",
+        "tooltip": "Nivel de intensidad de grano inteligente."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageStyleTransferNode": {
+    "description": "Transfiere el estilo de una imagen de referencia a tu imagen de entrada.",
+    "display_name": "Transferencia de Estilo de Imagen Magnific",
+    "inputs": {
+      "engine": {
+        "name": "engine",
+        "tooltip": "Selección del motor de procesamiento."
+      },
+      "fixed_generation": {
+        "name": "fixed_generation",
+        "tooltip": "Si está desactivado, cada generación introducirá cierto grado de aleatoriedad, lo que dará lugar a resultados más diversos."
+      },
+      "flavor": {
+        "name": "flavor",
+        "tooltip": "Tipo de transferencia de estilo."
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "La imagen a la que se aplicará la transferencia de estilo."
+      },
+      "portrait_mode": {
+        "name": "portrait_mode",
+        "tooltip": "Activa el modo retrato para mejoras faciales."
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "reference_image": {
+        "name": "reference_image",
+        "tooltip": "La imagen de referencia de la que se extraerá el estilo."
+      },
+      "structure_strength": {
+        "name": "structure_strength",
+        "tooltip": "Mantiene la estructura de la imagen original."
+      },
+      "style_strength": {
+        "name": "style_strength",
+        "tooltip": "Porcentaje de intensidad del estilo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageUpscalerCreativeNode": {
+    "description": "Mejora guiada por prompt, estilización y aumento de escala 2x/4x/8x/16x. Salida máxima: 25,3 megapíxeles.",
+    "display_name": "Magnific Image Upscale (Creativo)",
+    "inputs": {
+      "auto_downscale": {
+        "name": "reducción_automática",
+        "tooltip": "Reducir automáticamente la imagen de entrada si la salida supera el límite máximo de píxeles."
+      },
+      "creativity": {
+        "name": "creatividad"
+      },
+      "engine": {
+        "name": "motor"
+      },
+      "fractality": {
+        "name": "fractalidad",
+        "tooltip": "La fuerza del prompt y la complejidad por píxel cuadrado."
+      },
+      "hdr": {
+        "name": "hdr",
+        "tooltip": "El nivel de definición y detalle."
+      },
+      "image": {
+        "name": "imagen"
+      },
+      "optimized_for": {
+        "name": "optimizado_para"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "resemblance": {
+        "name": "semejanza",
+        "tooltip": "El nivel de semejanza con la imagen original."
+      },
+      "scale_factor": {
+        "name": "factor_de_escala"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageUpscalerPreciseV2Node": {
+    "description": "Aumento de escala de alta fidelidad con control fino sobre nitidez, grano y detalle. Salida máxima: 10060×10060 píxeles.",
+    "display_name": "Magnific Image Upscale (Preciso V2)",
+    "inputs": {
+      "auto_downscale": {
+        "name": "reducción_automática",
+        "tooltip": "Reducir automáticamente la imagen de entrada si la salida supera la resolución máxima."
+      },
+      "flavor": {
+        "name": "estilo",
+        "tooltip": "Estilo de procesamiento: sublime para uso general, photo para fotografías, photo_denoiser para fotos con ruido."
+      },
+      "image": {
+        "name": "imagen"
+      },
+      "scale_factor": {
+        "name": "factor_de_escala"
+      },
+      "sharpen": {
+        "name": "nitidez",
+        "tooltip": "Intensidad de la nitidez de la imagen. Valores más altos aumentan la definición de los bordes y la claridad."
+      },
+      "smart_grain": {
+        "name": "grano_inteligente",
+        "tooltip": "Mejora inteligente del grano/textura para evitar que la imagen se vea demasiado suave o artificial."
+      },
+      "ultra_detail": {
+        "name": "ultra_detalle",
+        "tooltip": "Controla los detalles finos, texturas y microdetalles añadidos durante el aumento de escala."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "Mahiro": {
     "description": "Modifica la guía para escalar más en la 'dirección' del indicador positivo en lugar de la diferencia entre el indicador negativo.",
     "display_name": "¡Mahiro es tan linda que merece una mejor función de guía!! (。・ω・。)",
@@ -5301,6 +8057,50 @@
       }
     }
   },
+  "MakeTrainingDataset": {
+    "display_name": "Crear Conjunto de Datos de Entrenamiento",
+    "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "Modelo CLIP para codificar texto a acondicionamiento."
+      },
+      "images": {
+        "name": "imágenes",
+        "tooltip": "Lista de imágenes para codificar."
+      },
+      "texts": {
+        "name": "textos",
+        "tooltip": "Lista de subtítulos de texto. Puede ser de longitud n (coincidiendo con imágenes), 1 (repetido para todos), o omitido (usa cadena vacía)."
+      },
+      "vae": {
+        "name": "vae",
+        "tooltip": "Modelo VAE para codificar imágenes a latentes."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latentes",
+        "tooltip": "Lista de diccionarios latentes"
+      },
+      "1": {
+        "name": "acondicionamiento",
+        "tooltip": "Lista de listas de acondicionamiento"
+      }
+    }
+  },
+  "ManualSigmas": {
+    "display_name": "ManualSigmas",
+    "inputs": {
+      "sigmas": {
+        "name": "sigmas"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "MaskComposite": {
     "display_name": "Composición de Máscara",
     "inputs": {
@@ -5319,6 +8119,11 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "MaskPreview": {
@@ -5336,6 +8141,371 @@
       "mask": {
         "name": "máscara"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MergeImageLists": {
+    "display_name": "Unir Listas de Imágenes",
+    "inputs": {
+      "images": {
+        "name": "imágenes",
+        "tooltip": "Lista de imágenes a procesar."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "imágenes",
+        "tooltip": "Imágenes procesadas"
+      }
+    }
+  },
+  "MergeTextLists": {
+    "display_name": "Unir Listas de Textos",
+    "inputs": {
+      "texts": {
+        "name": "textos",
+        "tooltip": "Lista de textos a procesar."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "textos",
+        "tooltip": "Textos procesados"
+      }
+    }
+  },
+  "MeshyAnimateModelNode": {
+    "description": "Aplica una acción de animación específica a un personaje previamente riggeado.",
+    "display_name": "Meshy: Animar Modelo",
+    "inputs": {
+      "action_id": {
+        "name": "action_id",
+        "tooltip": "Visita https://docs.meshy.ai/en/api/animation-library para ver una lista de valores disponibles."
+      },
+      "rig_task_id": {
+        "name": "rig_task_id"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyImageToModelNode": {
+    "display_name": "Meshy: Imagen a Modelo",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "image": {
+        "name": "imagen"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "pose_mode": {
+        "name": "modo de pose",
+        "tooltip": "Especifica el modo de pose para el modelo generado."
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "La semilla controla si el nodo debe volver a ejecutarse; los resultados son no deterministas independientemente de la semilla."
+      },
+      "should_remesh": {
+        "name": "remallar",
+        "tooltip": "Si se establece en falso, devuelve una malla triangular sin procesar."
+      },
+      "should_remesh_target_polycount": {
+        "name": "recuento de polígonos objetivo"
+      },
+      "should_remesh_topology": {
+        "name": "topología"
+      },
+      "should_texture": {
+        "name": "texturizar",
+        "tooltip": "Determina si se generan texturas. Si se establece en falso, se omite la fase de texturizado y se devuelve una malla sin texturas."
+      },
+      "should_texture_enable_pbr": {
+        "name": "habilitar PBR"
+      },
+      "should_texture_texture_prompt": {
+        "name": "prompt de textura"
+      },
+      "symmetry_mode": {
+        "name": "modo de simetría"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyMultiImageToModelNode": {
+    "display_name": "Meshy: Multi-Imagen a Modelo",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "images": {
+        "name": "imágenes"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "pose_mode": {
+        "name": "modo de pose",
+        "tooltip": "Especifica el modo de pose para el modelo generado."
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "La semilla controla si el nodo debe volver a ejecutarse; los resultados son no deterministas independientemente de la semilla."
+      },
+      "should_remesh": {
+        "name": "remallar",
+        "tooltip": "Si se establece en falso, devuelve una malla triangular sin procesar."
+      },
+      "should_remesh_target_polycount": {
+        "name": "recuento de polígonos objetivo"
+      },
+      "should_remesh_topology": {
+        "name": "topología"
+      },
+      "should_texture": {
+        "name": "texturizar",
+        "tooltip": "Determina si se generan texturas. Si se establece en falso, se omite la fase de texturizado y se devuelve una malla sin texturas."
+      },
+      "should_texture_enable_pbr": {
+        "name": "habilitar PBR"
+      },
+      "should_texture_texture_prompt": {
+        "name": "prompt de textura"
+      },
+      "symmetry_mode": {
+        "name": "modo de simetría"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyRefineNode": {
+    "description": "Refina un modelo borrador previamente creado.",
+    "display_name": "Meshy: Refinar Modelo Borrador",
+    "inputs": {
+      "enable_pbr": {
+        "name": "habilitar_pbr",
+        "tooltip": "Generar mapas PBR (metálico, rugosidad, normal) además del color base. Nota: esto debe estar en falso al usar el estilo Sculpture, ya que el estilo Sculpture genera su propio conjunto de mapas PBR."
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "texture_image": {
+        "name": "imagen_de_textura",
+        "tooltip": "Solo se puede usar uno de 'texture_image' o 'texture_prompt' al mismo tiempo."
+      },
+      "texture_prompt": {
+        "name": "texto_de_textura",
+        "tooltip": "Proporcione un texto para guiar el proceso de texturizado. Máximo 600 caracteres. No se puede usar al mismo tiempo que 'texture_image'."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyRigModelNode": {
+    "description": "Proporciona un personaje riggeado en formatos estándar. El auto-rigging actualmente no es adecuado para mallas sin textura, activos no humanoides o activos humanoides con estructura de extremidades y cuerpo poco clara.",
+    "display_name": "Meshy: Riggear Modelo",
+    "inputs": {
+      "height_meters": {
+        "name": "altura_metros",
+        "tooltip": "La altura aproximada del modelo de personaje en metros. Esto ayuda a la precisión de la escala y el rigging."
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "texture_image": {
+        "name": "imagen_de_textura",
+        "tooltip": "Imagen de textura de color base UV-desplegada del modelo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "rig_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyTextToModelNode": {
+    "display_name": "Meshy: Texto a Modelo",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "pose_mode": {
+        "name": "modo_pose",
+        "tooltip": "Especifique el modo de pose para el modelo generado."
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "La semilla controla si el nodo debe volver a ejecutarse; los resultados no son deterministas independientemente de la semilla."
+      },
+      "should_remesh": {
+        "name": "debe_remallar",
+        "tooltip": "Si está en falso, devuelve una malla triangular sin procesar."
+      },
+      "should_remesh_target_polycount": {
+        "name": "poligonaje_objetivo"
+      },
+      "should_remesh_topology": {
+        "name": "topología"
+      },
+      "style": {
+        "name": "estilo"
+      },
+      "symmetry_mode": {
+        "name": "modo_simetría"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "archivo_modelo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyTextureNode": {
+    "display_name": "Meshy: Modelo de Textura",
+    "inputs": {
+      "enable_original_uv": {
+        "name": "habilitar_uv_original",
+        "tooltip": "Usa el UV original del modelo en lugar de generar nuevos UVs. Cuando está activado, Meshy conserva las texturas existentes del modelo cargado. Si el modelo no tiene UV original, la calidad del resultado podría no ser tan buena."
+      },
+      "image_style": {
+        "name": "estilo_imagen",
+        "tooltip": "Una imagen 2D para guiar el proceso de texturizado. No se puede usar al mismo tiempo que 'text_style_prompt'."
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "pbr": {
+        "name": "pbr"
+      },
+      "text_style_prompt": {
+        "name": "estilo_texto",
+        "tooltip": "Describe el estilo de textura deseado para el objeto usando texto. Máximo 600 caracteres. No se puede usar al mismo tiempo que 'image_style'."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "archivo_modelo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
     }
   },
   "MinimaxHailuoVideoNode": {
@@ -7779,6 +10949,78 @@
       }
     }
   },
+  "NAGuidance": {
+    "description": "Aplica la Guía de Atención Normalizada a los modelos, permitiendo prompts negativos en modelos distilled/schnell.",
+    "display_name": "Guía de Atención Normalizada",
+    "inputs": {
+      "model": {
+        "name": "modelo",
+        "tooltip": "El modelo al que se aplicará NAG."
+      },
+      "nag_alpha": {
+        "name": "nag_alpha",
+        "tooltip": "Factor de mezcla para la atención normalizada. 1.0 es reemplazo total, 0.0 sin efecto."
+      },
+      "nag_scale": {
+        "name": "escala_nag",
+        "tooltip": "El factor de escala de la guía. Valores más altos alejan más del prompt negativo."
+      },
+      "nag_tau": {
+        "name": "nag_tau"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "El modelo modificado con NAG habilitado."
+      }
+    }
+  },
+  "NormalizeImages": {
+    "display_name": "Normalizar Imágenes",
+    "inputs": {
+      "images": {
+        "name": "imágenes",
+        "tooltip": "Imagen a procesar."
+      },
+      "mean": {
+        "name": "media",
+        "tooltip": "Valor medio para la normalización."
+      },
+      "std": {
+        "name": "desviación estándar",
+        "tooltip": "Desviación estándar para la normalización."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "imágenes",
+        "tooltip": "Imágenes procesadas"
+      }
+    }
+  },
+  "NormalizeVideoLatentStart": {
+    "description": "Normaliza los fotogramas iniciales de un video latent para que coincidan con la media y la desviación estándar de los fotogramas de referencia posteriores. Ayuda a reducir las diferencias entre los primeros fotogramas y el resto del video.",
+    "display_name": "NormalizeVideoLatentStart",
+    "inputs": {
+      "latent": {
+        "name": "latent"
+      },
+      "reference_frame_count": {
+        "name": "reference_frame_count",
+        "tooltip": "Número de fotogramas latent después de los iniciales que se usarán como referencia"
+      },
+      "start_frame_count": {
+        "name": "start_frame_count",
+        "tooltip": "Número de fotogramas latent a normalizar, contados desde el inicio"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
   "OpenAIChatConfig": {
     "description": "Permite especificar opciones de configuración avanzada para los Nodos de Chat de OpenAI.",
     "display_name": "Opciones Avanzadas de OpenAI ChatGPT",
@@ -7928,6 +11170,9 @@
         "name": "mask",
         "tooltip": "Máscara opcional para inpainting (las áreas blancas serán reemplazadas)"
       },
+      "model": {
+        "name": "model"
+      },
       "n": {
         "name": "n",
         "tooltip": "Cuántas imágenes generar"
@@ -8440,6 +11685,11 @@
       "steps": {
         "name": "pasos"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "PorterDuffImageComposite": {
@@ -8473,6 +11723,9 @@
   "Preview3D": {
     "display_name": "Vista previa 3D",
     "inputs": {
+      "bg_image": {
+        "name": "bg_image"
+      },
       "camera_info": {
         "name": "camera_info"
       },
@@ -8480,14 +11733,20 @@
         "name": "imagen"
       },
       "model_file": {
-        "name": "archivo_modelo"
+        "name": "archivo_modelo",
+        "tooltip": "Archivo de modelo 3D o ruta del archivo"
       }
     }
   },
   "PreviewAny": {
     "display_name": "Vista previa de cualquier",
     "inputs": {
-      "preview": {
+      "previewMode": {},
+      "preview_markdown": {
+        "name": "Vista previa"
+      },
+      "preview_text": {
+        "name": "Vista previa"
       },
       "source": {
         "name": "fuente"
@@ -8527,6 +11786,28 @@
       }
     }
   },
+  "PrimitiveBoundingBox": {
+    "display_name": "Caja Delimitadora",
+    "inputs": {
+      "height": {
+        "name": "height"
+      },
+      "width": {
+        "name": "width"
+      },
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "PrimitiveFloat": {
     "display_name": "Flotante",
     "inputs": {
@@ -8628,6 +11909,36 @@
       }
     }
   },
+  "RandomCropImages": {
+    "display_name": "Recorte Aleatorio de Imágenes",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "height": {
+        "name": "height",
+        "tooltip": "Alto del recorte."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Imagen a procesar."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Semilla aleatoria."
+      },
+      "width": {
+        "name": "width",
+        "tooltip": "Ancho del recorte."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Imágenes procesadas"
+      }
+    }
+  },
   "RandomNoise": {
     "display_name": "Ruido aleatorio",
     "inputs": {
@@ -8637,6 +11948,11 @@
       "noise_seed": {
         "name": "semilla_ruido"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "RebatchImages": {
@@ -8677,6 +11993,11 @@
       "audio": {
         "name": "audio"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "RecraftColorRGB": {
@@ -8724,6 +12045,25 @@
       }
     }
   },
+  "RecraftCreateStyleNode": {
+    "description": "Crea un estilo personalizado a partir de imágenes de referencia. Sube de 1 a 5 imágenes para usar como referencias de estilo. El tamaño total de todas las imágenes está limitado a 5 MB.",
+    "display_name": "Recraft Crear Estilo",
+    "inputs": {
+      "images": {
+        "name": "imágenes"
+      },
+      "style": {
+        "name": "estilo",
+        "tooltip": "El estilo base de las imágenes generadas."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "id_estilo",
+        "tooltip": null
+      }
+    }
+  },
   "RecraftCreativeUpscaleNode": {
     "description": "Aumenta la imagen de forma sincrónica.\nMejora una imagen ráster dada utilizando la herramienta de ‘creative upscale’, aumentando la resolución con un enfoque en refinar pequeños detalles y rostros.",
     "display_name": "Recraft Creative Upscale Image",
@@ -9031,6 +12371,88 @@
       }
     }
   },
+  "RecraftV4TextToImageNode": {
+    "description": "Genera imágenes usando los modelos Recraft V4 o V4 Pro.",
+    "display_name": "Recraft V4 Texto a Imagen",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "El modelo a utilizar para la generación."
+      },
+      "model_size": {
+        "name": "tamaño"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "El número de imágenes a generar."
+      },
+      "negative_prompt": {
+        "name": "prompt_negativo",
+        "tooltip": "Una descripción opcional en texto de los elementos no deseados en una imagen."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para la generación de la imagen. Máximo 10,000 caracteres."
+      },
+      "recraft_controls": {
+        "name": "recraft_controls",
+        "tooltip": "Controles adicionales opcionales sobre la generación a través del nodo Recraft Controls."
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "Semilla para determinar si el nodo debe volver a ejecutarse; los resultados reales no son deterministas independientemente de la semilla."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftV4TextToVectorNode": {
+    "description": "Genera SVG usando los modelos Recraft V4 o V4 Pro.",
+    "display_name": "Recraft V4 Texto a Vector",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "El modelo a utilizar para la generación."
+      },
+      "model_size": {
+        "name": "tamaño"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "El número de imágenes a generar."
+      },
+      "negative_prompt": {
+        "name": "prompt_negativo",
+        "tooltip": "Una descripción opcional en texto de los elementos no deseados en una imagen."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para la generación de la imagen. Máximo 10,000 caracteres."
+      },
+      "recraft_controls": {
+        "name": "recraft_controls",
+        "tooltip": "Controles adicionales opcionales sobre la generación a través del nodo Recraft Controls."
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "Semilla para determinar si el nodo debe volver a ejecutarse; los resultados reales no son deterministas independientemente de la semilla."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RecraftVectorizeImageNode": {
     "description": "Genera SVG de forma sincrónica a partir de una imagen de entrada.",
     "display_name": "Recraft Vectorizar Imagen",
@@ -9062,6 +12484,23 @@
       }
     }
   },
+  "ReferenceTimbreAudio": {
+    "description": "Este nodo establece el audio de referencia para el timbre (para ace step 1.5)",
+    "display_name": "ReferenceTimbreAudio",
+    "inputs": {
+      "conditioning": {
+        "name": "condicionamiento"
+      },
+      "latent": {
+        "name": "latente"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RegexExtract": {
     "display_name": "Extracción Regex",
     "inputs": {
@@ -9181,6 +12620,11 @@
       "image": {
         "name": "imagen"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "RepeatLatentBatch": {
@@ -9194,6 +12638,51 @@
       }
     }
   },
+  "ReplaceText": {
+    "display_name": "Reemplazar Texto",
+    "inputs": {
+      "find": {
+        "name": "find",
+        "tooltip": "Texto a buscar."
+      },
+      "replace": {
+        "name": "replace",
+        "tooltip": "Texto con el que reemplazar."
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "Texto a procesar."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "texts",
+        "tooltip": "Textos procesados"
+      }
+    }
+  },
+  "ReplaceVideoLatentFrames": {
+    "display_name": "ReplaceVideoLatentFrames",
+    "inputs": {
+      "destination": {
+        "name": "destination",
+        "tooltip": "El latent de destino donde se reemplazarán los fotogramas."
+      },
+      "index": {
+        "name": "index",
+        "tooltip": "El índice del fotograma latent inicial en el latent de destino donde se colocarán los fotogramas del latent de origen. Los valores negativos cuentan desde el final."
+      },
+      "source": {
+        "name": "source",
+        "tooltip": "El latent de origen que proporciona los fotogramas para insertar en el latent de destino. Si no se proporciona, el latent de destino se devuelve sin cambios."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RescaleCFG": {
     "display_name": "ReescalarCFG",
     "inputs": {
@@ -9223,6 +12712,128 @@
       "target_width": {
         "name": "ancho_objetivo"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ResizeImageMaskNode": {
+    "description": "Redimensiona una imagen o máscara utilizando varios métodos de escalado.",
+    "display_name": "Redimensionar Imagen/Máscara",
+    "inputs": {
+      "input": {
+        "name": "input"
+      },
+      "resize_type": {
+        "name": "resize_type",
+        "tooltip": "Selecciona cómo redimensionar: por dimensiones exactas, factor de escala, igualando otra imagen, etc."
+      },
+      "resize_type_crop": {
+        "name": "recortar"
+      },
+      "resize_type_height": {
+        "name": "altura"
+      },
+      "resize_type_width": {
+        "name": "anchura"
+      },
+      "scale_method": {
+        "name": "scale_method",
+        "tooltip": "Algoritmo de interpolación. 'area' es mejor para reducir tamaño, 'lanczos' para aumentar tamaño, 'nearest-exact' para pixel art."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "resized",
+        "tooltip": null
+      }
+    }
+  },
+  "ResizeImagesByLongerEdge": {
+    "display_name": "Redimensionar imágenes por el borde más largo",
+    "inputs": {
+      "images": {
+        "name": "imágenes",
+        "tooltip": "Imagen a procesar."
+      },
+      "longer_edge": {
+        "name": "borde_más_largo",
+        "tooltip": "Longitud objetivo para el borde más largo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "imágenes",
+        "tooltip": "Imágenes procesadas"
+      }
+    }
+  },
+  "ResizeImagesByShorterEdge": {
+    "display_name": "Redimensionar imágenes por el borde más corto",
+    "inputs": {
+      "images": {
+        "name": "imágenes",
+        "tooltip": "Imagen a procesar."
+      },
+      "shorter_edge": {
+        "name": "borde_más_corto",
+        "tooltip": "Longitud objetivo para el borde más corto."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "imágenes",
+        "tooltip": "Imágenes procesadas"
+      }
+    }
+  },
+  "ResolutionBucket": {
+    "display_name": "Agrupación por resolución",
+    "inputs": {
+      "conditioning": {
+        "name": "condicionamiento",
+        "tooltip": "Lista de listas de condicionamiento (debe coincidir con la longitud de latentes)."
+      },
+      "latents": {
+        "name": "latentes",
+        "tooltip": "Lista de diccionarios de latent para agrupar por resolución."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latentes",
+        "tooltip": "Lista de diccionarios de latent agrupados, uno por cada grupo de resolución."
+      },
+      "1": {
+        "name": "condicionamiento",
+        "tooltip": "Lista de listas de condición, una por cada grupo de resolución."
+      }
+    }
+  },
+  "ResolutionSelector": {
+    "description": "Calcula el ancho y la altura a partir de la relación de aspecto y el objetivo de megapíxeles. Útil para configurar las dimensiones de una Imagen Latent Vacía.",
+    "display_name": "Selector de Resolución",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "relación_de_aspecto",
+        "tooltip": "La relación de aspecto para las dimensiones de salida."
+      },
+      "megapixels": {
+        "name": "megapíxeles",
+        "tooltip": "Total de megapíxeles objetivo. 1.0 MP ≈ 1024×1024 para cuadrado."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "ancho",
+        "tooltip": "Ancho calculado en píxeles (múltiplo de 8)."
+      },
+      "1": {
+        "name": "alto",
+        "tooltip": "Altura calculada en píxeles (múltiplo de 8)."
+      }
     }
   },
   "Rodin3D_Detail": {
@@ -9244,7 +12855,11 @@
     },
     "outputs": {
       "0": {
-        "name": "Ruta Modelo 3D",
+        "name": "Ruta del modelo 3D",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -9271,7 +12886,11 @@
     },
     "outputs": {
       "0": {
-        "name": "Ruta Modelo 3D",
+        "name": "Ruta del modelo 3D",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -9295,7 +12914,11 @@
     },
     "outputs": {
       "0": {
-        "name": "Ruta Modelo 3D",
+        "name": "Ruta del modelo 3D",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -9315,6 +12938,10 @@
       "0": {
         "name": "Ruta del modelo 3D",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9339,6 +12966,10 @@
       "0": {
         "name": "Ruta del modelo 3D",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9464,6 +13095,90 @@
       }
     }
   },
+  "SDPoseDrawKeypoints": {
+    "display_name": "SDPoseDrawKeypoints",
+    "inputs": {
+      "draw_body": {
+        "name": "dibujar cuerpo"
+      },
+      "draw_face": {
+        "name": "dibujar rostro"
+      },
+      "draw_feet": {
+        "name": "dibujar pies"
+      },
+      "draw_hands": {
+        "name": "dibujar manos"
+      },
+      "face_point_size": {
+        "name": "tamaño de punto facial"
+      },
+      "keypoints": {
+        "name": "puntos clave"
+      },
+      "score_threshold": {
+        "name": "umbral de puntuación"
+      },
+      "stick_width": {
+        "name": "ancho de línea"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SDPoseFaceBBoxes": {
+    "display_name": "SDPoseFaceBBoxes",
+    "inputs": {
+      "force_square": {
+        "name": "forzar cuadrado",
+        "tooltip": "Expande el eje más corto de la caja para que la región recortada sea siempre cuadrada."
+      },
+      "keypoints": {
+        "name": "puntos clave"
+      },
+      "scale": {
+        "name": "escala",
+        "tooltip": "Multiplicador para el área de la caja delimitadora alrededor de cada rostro detectado."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "cajas delimitadoras",
+        "tooltip": "Cajas delimitadoras de rostro por fotograma, compatibles con la entrada de cajas delimitadoras de SDPoseKeypointExtractor."
+      }
+    }
+  },
+  "SDPoseKeypointExtractor": {
+    "description": "Extrae puntos clave de pose de imágenes usando el modelo SDPose: https://huggingface.co/Comfy-Org/SDPose/tree/main/checkpoints",
+    "display_name": "SDPoseKeypointExtractor",
+    "inputs": {
+      "batch_size": {
+        "name": "tamaño de lote"
+      },
+      "bboxes": {
+        "name": "cajas delimitadoras",
+        "tooltip": "Cajas delimitadoras opcionales para detecciones más precisas. Requerido para la detección de múltiples personas."
+      },
+      "image": {
+        "name": "imagen"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "puntos clave",
+        "tooltip": "Puntos clave en formato de marco OpenPose (ancho_lienzo, alto_lienzo, personas)"
+      }
+    }
+  },
   "SDTurboScheduler": {
     "display_name": "SDTurboScheduler",
     "inputs": {
@@ -9476,6 +13191,11 @@
       "steps": {
         "name": "pasos"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SD_4XUpscale_Conditioning": {
@@ -9631,10 +13351,12 @@
     },
     "outputs": {
       "0": {
-        "name": "salida"
+        "name": "salida",
+        "tooltip": null
       },
       "1": {
-        "name": "salida_denoisada"
+        "name": "salida_sin_ruido",
+        "tooltip": null
       }
     }
   },
@@ -9659,10 +13381,12 @@
     },
     "outputs": {
       "0": {
-        "name": "salida"
+        "name": "salida",
+        "tooltip": null
       },
       "1": {
-        "name": "salida_denoised"
+        "name": "salida_sin_ruido",
+        "tooltip": null
       }
     }
   },
@@ -9699,6 +13423,11 @@
       "s_noise": {
         "name": "s_ruido"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_2M_SDE": {
@@ -9716,6 +13445,11 @@
       "solver_type": {
         "name": "tipo_resolvedor"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_2S_Ancestral": {
@@ -9727,6 +13461,11 @@
       "s_noise": {
         "name": "s_ruido"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_3M_SDE": {
@@ -9741,6 +13480,11 @@
       "s_noise": {
         "name": "s_ruido"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_SDE": {
@@ -9758,6 +13502,11 @@
       "s_noise": {
         "name": "s_ruido"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerER_SDE": {
@@ -9776,6 +13525,11 @@
       "solver_type": {
         "name": "tipo_solucionador"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerEulerAncestral": {
@@ -9787,6 +13541,11 @@
       "s_noise": {
         "name": "s_ruido"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerEulerAncestralCFGPP": {
@@ -9798,6 +13557,11 @@
       "s_noise": {
         "name": "s_ruido"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerEulerCFGpp": {
@@ -9838,6 +13602,11 @@
       "order": {
         "name": "orden"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerSASolver": {
@@ -9870,6 +13639,37 @@
       "use_pece": {
         "name": "usar_pece"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerSEEDS2": {
+    "description": "Este nodo de muestreador puede representar múltiples muestreadores:\n\nseeds_2\n- configuración predeterminada\n\nexp_heun_2_x0\n- solver_type=phi_2, r=1.0, eta=0.0\n\nexp_heun_2_x0_sde\n- solver_type=phi_2, r=1.0, eta=1.0, s_noise=1.0",
+    "display_name": "SamplerSEEDS2",
+    "inputs": {
+      "eta": {
+        "name": "eta",
+        "tooltip": "Intensidad estocástica"
+      },
+      "r": {
+        "name": "r",
+        "tooltip": "Tamaño de paso relativo para la etapa intermedia (nodo c2)"
+      },
+      "s_noise": {
+        "name": "s_noise",
+        "tooltip": "Multiplicador de ruido SDE"
+      },
+      "solver_type": {
+        "name": "solver_type"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplingPercentToSigma": {
@@ -9888,7 +13688,8 @@
     },
     "outputs": {
       "0": {
-        "name": "valor_sigma"
+        "name": "valor_sigma",
+        "tooltip": null
       }
     }
   },
@@ -9990,7 +13791,8 @@
         "name": "imagen"
       },
       "mesh": {
-        "name": "malla"
+        "name": "malla",
+        "tooltip": "Malla o archivo GLB para guardar"
       }
     }
   },
@@ -10008,6 +13810,44 @@
       }
     }
   },
+  "SaveImageDataSetToFolder": {
+    "display_name": "Guardar conjunto de imágenes en carpeta",
+    "inputs": {
+      "filename_prefix": {
+        "name": "filename_prefix",
+        "tooltip": "Prefijo para los nombres de archivo de las imágenes guardadas."
+      },
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "Nombre de la carpeta donde guardar las imágenes (dentro del directorio de salida)."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Lista de imágenes para guardar."
+      }
+    }
+  },
+  "SaveImageTextDataSetToFolder": {
+    "display_name": "Guardar conjunto de imágenes y textos en carpeta",
+    "inputs": {
+      "filename_prefix": {
+        "name": "filename_prefix",
+        "tooltip": "Prefijo para los nombres de archivo de las imágenes guardadas."
+      },
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "Nombre de la carpeta donde guardar las imágenes (dentro del directorio de salida)."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Lista de imágenes para guardar."
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "Lista de textos para guardar."
+      }
+    }
+  },
   "SaveImageWebsocket": {
     "display_name": "GuardarImagenWebsocket",
     "inputs": {
@@ -10027,6 +13867,23 @@
       }
     }
   },
+  "SaveLoRA": {
+    "display_name": "Guardar pesos de LoRA",
+    "inputs": {
+      "lora": {
+        "name": "lora",
+        "tooltip": "El modelo LoRA para guardar. No utilices el modelo con capas LoRA."
+      },
+      "prefix": {
+        "name": "prefix",
+        "tooltip": "El prefijo a usar para el archivo LoRA guardado."
+      },
+      "steps": {
+        "name": "steps",
+        "tooltip": "Opcional: Número de pasos para los que se ha entrenado LoRA, usado para nombrar el archivo guardado."
+      }
+    }
+  },
   "SaveSVGNode": {
     "description": "Guardar archivos SVG en disco.",
     "display_name": "NodoGuardarSVG",
@@ -10040,6 +13897,27 @@
       }
     }
   },
+  "SaveTrainingDataset": {
+    "display_name": "Guardar conjunto de datos de entrenamiento",
+    "inputs": {
+      "conditioning": {
+        "name": "conditioning",
+        "tooltip": "Lista de listas de conditioning de MakeTrainingDataset."
+      },
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "Nombre de la carpeta donde guardar el conjunto de datos (dentro del directorio de salida)."
+      },
+      "latents": {
+        "name": "latents",
+        "tooltip": "Lista de diccionarios de latent de MakeTrainingDataset."
+      },
+      "shard_size": {
+        "name": "shard_size",
+        "tooltip": "Número de muestras por archivo fragmentado."
+      }
+    }
+  },
   "SaveVideo": {
     "description": "Guarda las imágenes de entrada en tu directorio de salida de ComfyUI.",
     "display_name": "Guardar video",
@@ -10160,6 +14038,11 @@
       "sigmas": {
         "name": "sigmas"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SetHookKeyframes": {
@@ -10200,6 +14083,58 @@
       }
     }
   },
+  "ShuffleDataset": {
+    "display_name": "Barajar conjunto de imágenes",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Lista de imágenes a procesar."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Semilla aleatoria."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Imágenes procesadas"
+      }
+    }
+  },
+  "ShuffleImageTextDataset": {
+    "display_name": "Barajar conjunto de imágenes y textos",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Lista de imágenes a barajar."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Semilla aleatoria."
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "Lista de textos a barajar."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Imágenes barajadas"
+      },
+      "1": {
+        "name": "texts",
+        "tooltip": "Textos barajados"
+      }
+    }
+  },
   "SkipLayerGuidanceDiT": {
     "description": "Versión genérica del nodo de Orientación de Capa de Salto que se puede usar en cada modelo DiT.",
     "display_name": "Orientación de Capa de Salto DiT",
@@ -10296,6 +14231,11 @@
       "width": {
         "name": "ancho"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SplitAudioChannels": {
@@ -10308,10 +14248,35 @@
     },
     "outputs": {
       "0": {
-        "name": "izquierdo"
+        "name": "izquierdo",
+        "tooltip": null
       },
       "1": {
-        "name": "derecho"
+        "name": "derecho",
+        "tooltip": null
+      }
+    }
+  },
+  "SplitImageToTileList": {
+    "description": "Divide una imagen en una lista agrupada de mosaicos con una superposición especificada.",
+    "display_name": "Dividir imagen en lista de mosaicos",
+    "inputs": {
+      "image": {
+        "name": "image"
+      },
+      "overlap": {
+        "name": "overlap"
+      },
+      "tile_height": {
+        "name": "tile_height"
+      },
+      "tile_width": {
+        "name": "tile_width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
       }
     }
   },
@@ -10343,10 +14308,12 @@
     },
     "outputs": {
       "0": {
-        "name": "sigmas_altas"
+        "name": "sigmas_altos",
+        "tooltip": null
       },
       "1": {
-        "name": "sigmas_bajas"
+        "name": "sigmas_bajos",
+        "tooltip": null
       }
     }
   },
@@ -10362,10 +14329,12 @@
     },
     "outputs": {
       "0": {
-        "name": "high_sigmas"
+        "name": "sigmas_altos",
+        "tooltip": null
       },
       "1": {
-        "name": "low_sigmas"
+        "name": "sigmas_bajos",
+        "tooltip": null
       }
     }
   },
@@ -10969,6 +14938,21 @@
       }
     }
   },
+  "StripWhitespace": {
+    "display_name": "Eliminar espacios en blanco",
+    "inputs": {
+      "texts": {
+        "name": "textos",
+        "tooltip": "Texto a procesar."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "textos",
+        "tooltip": "Textos procesados"
+      }
+    }
+  },
   "StyleModelApply": {
     "display_name": "Aplicar Modelo de Estilo",
     "inputs": {
@@ -11054,6 +15038,123 @@
       }
     }
   },
+  "Tencent3DPartNode": {
+    "description": "Realiza automáticamente la identificación y generación de componentes según la estructura del modelo.",
+    "display_name": "Hunyuan3D: Parte 3D",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "model_3d": {
+        "name": "modelo_3d",
+        "tooltip": "Modelo 3D en formato FBX. El modelo debe tener menos de 30,000 caras."
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "La semilla controla si el nodo debe volver a ejecutarse; los resultados son no deterministas independientemente de la semilla."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "TencentImageToModelNode": {
+    "display_name": "Hunyuan3D: Imagen(es) a Modelo (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar_tras_generar"
+      },
+      "face_count": {
+        "name": "número_de_caras"
+      },
+      "generate_type": {
+        "name": "tipo_de_generación"
+      },
+      "generate_type_pbr": {
+        "name": "pbr"
+      },
+      "image": {
+        "name": "imagen"
+      },
+      "image_back": {
+        "name": "imagen_trasera"
+      },
+      "image_left": {
+        "name": "imagen_izquierda"
+      },
+      "image_right": {
+        "name": "imagen_derecha"
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "La opción LowPoly no está disponible para el modelo `3.1`."
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "La semilla controla si el nodo debe volver a ejecutarse; los resultados son no deterministas independientemente de la semilla."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "archivo_modelo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "OBJ",
+        "tooltip": null
+      }
+    }
+  },
+  "TencentTextToModelNode": {
+    "display_name": "Hunyuan3D: Texto a Modelo (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar_tras_generar"
+      },
+      "face_count": {
+        "name": "número_de_caras"
+      },
+      "generate_type": {
+        "name": "tipo_de_generación"
+      },
+      "generate_type_pbr": {
+        "name": "pbr"
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "La opción LowPoly no está disponible para el modelo `3.1`."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Admite hasta 1024 caracteres."
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "La semilla controla si el nodo debe volver a ejecutarse; los resultados son no deterministas independientemente de la semilla."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "archivo_modelo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "OBJ",
+        "tooltip": null
+      }
+    }
+  },
   "TextEncodeAceStepAudio": {
     "display_name": "TextEncodeAceStepAudio",
     "inputs": {
@@ -11076,6 +15177,65 @@
       }
     }
   },
+  "TextEncodeAceStepAudio1_5": {
+    "display_name": "TextEncodeAceStepAudio1.5",
+    "inputs": {
+      "bpm": {
+        "name": "bpm"
+      },
+      "cfg_scale": {
+        "name": "cfg_scale"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "duration": {
+        "name": "duración"
+      },
+      "generate_audio_codes": {
+        "name": "generar_códigos_de_audio",
+        "tooltip": "Activa el LLM que genera códigos de audio. Esto puede ser lento, pero aumentará la calidad del audio generado. Desactívalo si proporcionas una referencia de audio al modelo."
+      },
+      "keyscale": {
+        "name": "escala tonal"
+      },
+      "language": {
+        "name": "idioma"
+      },
+      "lyrics": {
+        "name": "letra"
+      },
+      "min_p": {
+        "name": "min_p"
+      },
+      "seed": {
+        "name": "semilla"
+      },
+      "tags": {
+        "name": "etiquetas"
+      },
+      "temperature": {
+        "name": "temperatura"
+      },
+      "timesignature": {
+        "name": "compás"
+      },
+      "top_k": {
+        "name": "top_k"
+      },
+      "top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TextEncodeHunyuanVideo_ImageToVideo": {
     "display_name": "TextEncodeHunyuanVideo_ImagenAVideo",
     "inputs": {
@@ -11149,6 +15309,158 @@
       }
     }
   },
+  "TextEncodeZImageOmni": {
+    "display_name": "TextEncodeZImageOmni",
+    "inputs": {
+      "auto_resize_images": {
+        "name": "auto_redimensionar_imágenes"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "image1": {
+        "name": "imagen1"
+      },
+      "image2": {
+        "name": "imagen2"
+      },
+      "image3": {
+        "name": "imagen3"
+      },
+      "image_encoder": {
+        "name": "codificador_de_imagen"
+      },
+      "prompt": {
+        "name": "instrucción"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TextGenerate": {
+    "display_name": "TextGenerate",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image": {
+        "name": "imagen"
+      },
+      "max_length": {
+        "name": "longitud_máxima"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "sampling_mode": {
+        "name": "modo_de_muestreo"
+      },
+      "sampling_mode_min_p": {
+        "name": "min_p"
+      },
+      "sampling_mode_repetition_penalty": {
+        "name": "penalización_por_repetición"
+      },
+      "sampling_mode_seed": {
+        "name": "semilla"
+      },
+      "sampling_mode_temperature": {
+        "name": "temperatura"
+      },
+      "sampling_mode_top_k": {
+        "name": "top_k"
+      },
+      "sampling_mode_top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "texto_generado",
+        "tooltip": null
+      }
+    }
+  },
+  "TextGenerateLTX2Prompt": {
+    "display_name": "TextGenerateLTX2Prompt",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image": {
+        "name": "imagen"
+      },
+      "max_length": {
+        "name": "longitud_máxima"
+      },
+      "prompt": {
+        "name": "mensaje"
+      },
+      "sampling_mode": {
+        "name": "modo_de_muestreo"
+      },
+      "sampling_mode_min_p": {
+        "name": "min_p"
+      },
+      "sampling_mode_repetition_penalty": {
+        "name": "penalización_por_repetición"
+      },
+      "sampling_mode_seed": {
+        "name": "semilla"
+      },
+      "sampling_mode_temperature": {
+        "name": "temperatura"
+      },
+      "sampling_mode_top_k": {
+        "name": "top_k"
+      },
+      "sampling_mode_top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "texto_generado",
+        "tooltip": null
+      }
+    }
+  },
+  "TextToLowercase": {
+    "display_name": "Convertir texto a minúsculas",
+    "inputs": {
+      "texts": {
+        "name": "textos",
+        "tooltip": "Texto a procesar."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "textos",
+        "tooltip": "Textos procesados"
+      }
+    }
+  },
+  "TextToUppercase": {
+    "display_name": "Convertir texto a mayúsculas",
+    "inputs": {
+      "texts": {
+        "name": "textos",
+        "tooltip": "Texto a procesar."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "textos",
+        "tooltip": "Textos procesados"
+      }
+    }
+  },
   "ThresholdMask": {
     "display_name": "Máscara de Umbral",
     "inputs": {
@@ -11158,6 +15470,11 @@
       "value": {
         "name": "valor"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "TomePatchModel": {
@@ -11176,6 +15493,118 @@
       }
     }
   },
+  "TopazImageEnhance": {
+    "description": "Mejora y ampliación de imágenes de nivel industrial.",
+    "display_name": "Mejorar imagen con Topaz",
+    "inputs": {
+      "color_preservation": {
+        "name": "preservación_de_color",
+        "tooltip": "Preservar los colores originales."
+      },
+      "creativity": {
+        "name": "creatividad"
+      },
+      "crop_to_fill": {
+        "name": "recortar_para_ajustar",
+        "tooltip": "Por defecto, la imagen se muestra con bandas negras si la relación de aspecto de salida es diferente. Activa para recortar la imagen y llenar las dimensiones de salida."
+      },
+      "face_enhancement": {
+        "name": "mejora_de_rostros",
+        "tooltip": "Mejorar rostros (si están presentes) durante el procesamiento."
+      },
+      "face_enhancement_creativity": {
+        "name": "creatividad_mejora_rostros",
+        "tooltip": "Establece el nivel de creatividad para la mejora de rostros."
+      },
+      "face_enhancement_strength": {
+        "name": "intensidad_mejora_rostros",
+        "tooltip": "Controla cuán nítidos son los rostros mejorados en relación con el fondo."
+      },
+      "face_preservation": {
+        "name": "preservación_de_rostros",
+        "tooltip": "Preservar la identidad facial de los sujetos."
+      },
+      "image": {
+        "name": "imagen"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "output_height": {
+        "name": "alto_de_salida",
+        "tooltip": "Un valor de cero significa que se usará la misma altura que la original o el ancho de salida."
+      },
+      "output_width": {
+        "name": "ancho_de_salida",
+        "tooltip": "Un valor de cero significa calcular automáticamente (normalmente será el tamaño original o la altura de salida si se especifica)."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt de texto opcional para orientación creativa en la ampliación."
+      },
+      "subject_detection": {
+        "name": "detección_de_sujetos"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TopazVideoEnhance": {
+    "description": "Da nueva vida a tus videos con potentes tecnologías de escalado y recuperación.",
+    "display_name": "Topaz Video Enhance",
+    "inputs": {
+      "dynamic_compression_level": {
+        "name": "dynamic_compression_level",
+        "tooltip": "Nivel CQP."
+      },
+      "interpolation_duplicate": {
+        "name": "interpolation_duplicate",
+        "tooltip": "Analiza la entrada para detectar fotogramas duplicados y los elimina."
+      },
+      "interpolation_duplicate_threshold": {
+        "name": "interpolation_duplicate_threshold",
+        "tooltip": "Sensibilidad de detección para fotogramas duplicados."
+      },
+      "interpolation_enabled": {
+        "name": "interpolation_enabled"
+      },
+      "interpolation_frame_rate": {
+        "name": "interpolation_frame_rate",
+        "tooltip": "Tasa de fotogramas de salida."
+      },
+      "interpolation_model": {
+        "name": "interpolation_model"
+      },
+      "interpolation_slowmo": {
+        "name": "interpolation_slowmo",
+        "tooltip": "Factor de cámara lenta aplicado al video de entrada. Por ejemplo, 2 hace que la salida sea el doble de lenta y duplica la duración."
+      },
+      "upscaler_creativity": {
+        "name": "upscaler_creativity",
+        "tooltip": "Nivel de creatividad (solo se aplica a Starlight (Astra) Creative)."
+      },
+      "upscaler_enabled": {
+        "name": "upscaler_enabled"
+      },
+      "upscaler_model": {
+        "name": "upscaler_model"
+      },
+      "upscaler_resolution": {
+        "name": "upscaler_resolution"
+      },
+      "video": {
+        "name": "video"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TorchCompileModel": {
     "display_name": "Modelo de Compilación Torch",
     "inputs": {
@@ -11203,6 +15632,18 @@
         "name": "tamaño_lote",
         "tooltip": "El tamaño de lote a utilizar para el entrenamiento."
       },
+      "bucket_mode": {
+        "name": "bucket_mode",
+        "tooltip": "Habilita el modo de resolución por grupos. Cuando está habilitado, espera latentes preagrupados del nodo ResolutionBucket."
+      },
+      "bypass_mode": {
+        "name": "bypass_mode",
+        "tooltip": "Activa el modo bypass para el entrenamiento. Cuando está activado, los adaptadores se aplican mediante hooks directos en vez de modificar los pesos. Útil para modelos cuantizados donde los pesos no pueden modificarse directamente."
+      },
+      "checkpoint_depth": {
+        "name": "checkpoint_depth",
+        "tooltip": "Nivel de profundidad para el checkpointing de gradientes."
+      },
       "control_after_generate": {
         "name": "controlar después de generar"
       },
@@ -11238,6 +15679,10 @@
         "name": "modelo",
         "tooltip": "El modelo sobre el cual entrenar el LoRA."
       },
+      "offloading": {
+        "name": "offloading",
+        "tooltip": "Nivel de profundidad para el checkpointing de gradientes."
+      },
       "optimizer": {
         "name": "optimizador",
         "tooltip": "El optimizador a utilizar para el entrenamiento."
@@ -11265,16 +15710,16 @@
     },
     "outputs": {
       "0": {
-        "name": "modelo_con_lora"
+        "name": "lora",
+        "tooltip": "Modelo con LoRA aplicado"
       },
       "1": {
-        "name": "lora"
+        "name": "mapa_de_pérdida",
+        "tooltip": "Pesos de LoRA"
       },
       "2": {
-        "name": "pérdida"
-      },
-      "3": {
-        "name": "pasos"
+        "name": "pasos",
+        "tooltip": "Historial de pérdida"
       }
     }
   },
@@ -11293,6 +15738,11 @@
         "name": "índice_inicio",
         "tooltip": "Tiempo de inicio en segundos, puede ser negativo para contar desde el final (admite subsegundos)."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "TrimVideoLatent": {
@@ -11334,23 +15784,62 @@
   "TripoConversionNode": {
     "display_name": "Tripo: Convertir modelo",
     "inputs": {
+      "animate_in_place": {
+        "name": "animate_in_place"
+      },
+      "bake": {
+        "name": "bake"
+      },
+      "export_orientation": {
+        "name": "export_orientation"
+      },
+      "export_vertex_colors": {
+        "name": "export_vertex_colors"
+      },
       "face_limit": {
         "name": "límite_caras"
       },
+      "fbx_preset": {
+        "name": "fbx_preset"
+      },
+      "flatten_bottom": {
+        "name": "flatten_bottom"
+      },
+      "flatten_bottom_threshold": {
+        "name": "flatten_bottom_threshold"
+      },
+      "force_symmetry": {
+        "name": "force_symmetry"
+      },
       "format": {
         "name": "formato"
       },
       "original_model_task_id": {
         "name": "id_tarea_modelo_original"
       },
+      "pack_uv": {
+        "name": "pack_uv"
+      },
+      "part_names": {
+        "name": "part_names"
+      },
+      "pivot_to_center_bottom": {
+        "name": "pivot_to_center_bottom"
+      },
       "quad": {
         "name": "cuadrangular"
       },
+      "scale_factor": {
+        "name": "scale_factor"
+      },
       "texture_format": {
         "name": "formato_textura"
       },
       "texture_size": {
         "name": "tamaño_textura"
+      },
+      "with_animation": {
+        "name": "with_animation"
       }
     }
   },
@@ -11360,6 +15849,9 @@
       "face_limit": {
         "name": "límite_de_caras"
       },
+      "geometry_quality": {
+        "name": "geometry_quality"
+      },
       "image": {
         "name": "imagen"
       },
@@ -11401,7 +15893,11 @@
         "tooltip": null
       },
       "1": {
-        "name": "ID_de_tarea_del_modelo",
+        "name": "id_de_tarea_de_modelo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11412,6 +15908,9 @@
       "face_limit": {
         "name": "límite_de_caras"
       },
+      "geometry_quality": {
+        "name": "geometry_quality"
+      },
       "image": {
         "name": "imagen"
       },
@@ -11459,7 +15958,11 @@
         "tooltip": null
       },
       "1": {
-        "name": "ID_de_tarea_del_modelo",
+        "name": "id_de_tarea_de_modelo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11479,7 +15982,11 @@
         "tooltip": null
       },
       "1": {
-        "name": "ID_de_tarea_del_modelo",
+        "name": "id_de_tarea_de_modelo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11496,11 +16003,15 @@
     },
     "outputs": {
       "0": {
-        "name": "archivo_de_modelo",
+        "name": "id_de_tarea_de_reorientación",
         "tooltip": null
       },
       "1": {
-        "name": "ID_de_tarea_de_redireccionamiento",
+        "name": "reasignar task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11518,7 +16029,11 @@
         "tooltip": null
       },
       "1": {
-        "name": "ID_de_tarea_de_rig",
+        "name": "id_de_tarea_de_rig",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11529,6 +16044,9 @@
       "face_limit": {
         "name": "límite_de_caras"
       },
+      "geometry_quality": {
+        "name": "geometry_quality"
+      },
       "image_seed": {
         "name": "semilla_de_imagen"
       },
@@ -11565,11 +16083,15 @@
     },
     "outputs": {
       "0": {
-        "name": "archivo_del_modelo",
+        "name": "archivo_de_modelo",
         "tooltip": null
       },
       "1": {
-        "name": "tarea_del_modelo",
+        "name": "id_de_tarea_de_modelo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11598,12 +16120,35 @@
     },
     "outputs": {
       "0": {
-        "name": "archivo_del_modelo",
+        "name": "archivo_de_modelo",
         "tooltip": null
       },
       "1": {
-        "name": "tarea_del_modelo",
+        "name": "id_de_tarea_de_modelo",
         "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "TruncateText": {
+    "display_name": "Truncar texto",
+    "inputs": {
+      "max_length": {
+        "name": "max_length",
+        "tooltip": "Longitud máxima del texto."
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "Texto a procesar."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "texts",
+        "tooltip": "Textos procesados"
       }
     }
   },
@@ -11748,6 +16293,33 @@
       "vae": {
         "name": "vae"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VAEDecodeAudioTiled": {
+    "display_name": "VAE Decodificar audio (en mosaico)",
+    "inputs": {
+      "overlap": {
+        "name": "superposición"
+      },
+      "samples": {
+        "name": "muestras"
+      },
+      "tile_size": {
+        "name": "tamaño_de_mosaico"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VAEDecodeHunyuan3D": {
@@ -11765,6 +16337,11 @@
       "vae": {
         "name": "vae"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VAEDecodeTiled": {
@@ -11812,6 +16389,11 @@
       "vae": {
         "name": "vae"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VAEEncodeForInpaint": {
@@ -11890,6 +16472,63 @@
       "steps": {
         "name": "pasos"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Veo3FirstLastFrameNode": {
+    "description": "Genera un video usando un prompt y los fotogramas inicial y final.",
+    "display_name": "Google Veo 3 Primer-Último Fotograma a Video",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "relación de aspecto",
+        "tooltip": "Relación de aspecto del video de salida"
+      },
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "duration": {
+        "name": "duración",
+        "tooltip": "Duración del video de salida en segundos"
+      },
+      "first_frame": {
+        "name": "primer_fotograma",
+        "tooltip": "Fotograma inicial"
+      },
+      "generate_audio": {
+        "name": "generar_audio",
+        "tooltip": "Generar audio para el video."
+      },
+      "last_frame": {
+        "name": "último_fotograma",
+        "tooltip": "Fotograma final"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Prompt negativo para guiar lo que se debe evitar en el video"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Descripción de texto del video"
+      },
+      "resolution": {
+        "name": "resolución"
+      },
+      "seed": {
+        "name": "semilla",
+        "tooltip": "Semilla para la generación del video"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "Veo3VideoGenerationNode": {
@@ -11996,6 +16635,31 @@
       }
     }
   },
+  "Video Slice": {
+    "display_name": "Corte de Video",
+    "inputs": {
+      "duration": {
+        "name": "duración",
+        "tooltip": "Duración en segundos, o 0 para duración ilimitada"
+      },
+      "start_time": {
+        "name": "hora de inicio",
+        "tooltip": "Hora de inicio en segundos"
+      },
+      "strict_duration": {
+        "name": "duración estricta",
+        "tooltip": "Si es Verdadero, cuando la duración especificada no sea posible, se generará un error."
+      },
+      "video": {
+        "name": "video"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "VideoLinearCFGGuidance": {
     "display_name": "OrientaciónLinealCFGVideo",
     "inputs": {
@@ -12018,6 +16682,319 @@
       }
     }
   },
+  "Vidu2ImageToVideoNode": {
+    "description": "Genera un video a partir de una imagen y un prompt opcional.",
+    "display_name": "Vidu2 Generación de Imagen a Video",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "duration": {
+        "name": "duración"
+      },
+      "image": {
+        "name": "imagen",
+        "tooltip": "Una imagen que se usará como el primer fotograma del video generado."
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "movement_amplitude": {
+        "name": "amplitud_de_movimiento",
+        "tooltip": "La amplitud de movimiento de los objetos en el fotograma."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Un prompt de texto opcional para la generación de video (máx. 2000 caracteres)."
+      },
+      "resolution": {
+        "name": "resolución"
+      },
+      "seed": {
+        "name": "semilla"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2ReferenceVideoNode": {
+    "description": "Genera un video a partir de múltiples imágenes de referencia y un prompt.",
+    "display_name": "Vidu2 Generación de Video con Referencias",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "relación_de_aspecto"
+      },
+      "audio": {
+        "name": "audio",
+        "tooltip": "Si está habilitado, el video contendrá voz generada y música de fondo basada en el prompt."
+      },
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "duration": {
+        "name": "duración"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "movement_amplitude": {
+        "name": "amplitud_de_movimiento",
+        "tooltip": "La amplitud de movimiento de los objetos en el fotograma."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Si está habilitado, el video incluirá voz generada y música de fondo basada en el prompt."
+      },
+      "resolution": {
+        "name": "resolución"
+      },
+      "seed": {
+        "name": "semilla"
+      },
+      "subjects": {
+        "name": "sujetos",
+        "tooltip": "Para cada sujeto, proporciona hasta 3 imágenes de referencia (7 imágenes en total entre todos los sujetos). Haz referencia a ellos en los prompts usando @subject{subject_id}."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2StartEndToVideoNode": {
+    "description": "Genera un video a partir de un fotograma inicial, un fotograma final y un prompt.",
+    "display_name": "Generación de video de Vidu2 desde fotogramas inicial/final",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "duration": {
+        "name": "duración"
+      },
+      "end_frame": {
+        "name": "fotograma_final"
+      },
+      "first_frame": {
+        "name": "fotograma_inicial"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "movement_amplitude": {
+        "name": "amplitud_de_movimiento",
+        "tooltip": "La amplitud de movimiento de los objetos en el fotograma."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Descripción del prompt (máximo 2000 caracteres)."
+      },
+      "resolution": {
+        "name": "resolución"
+      },
+      "seed": {
+        "name": "semilla"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2TextToVideoNode": {
+    "description": "Genera un video a partir de un prompt de texto",
+    "display_name": "Generación de video de Vidu2 desde texto",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "relación_de_aspecto"
+      },
+      "background_music": {
+        "name": "música_de_fondo",
+        "tooltip": "Indica si se añade música de fondo al video generado."
+      },
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "duration": {
+        "name": "duración"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Una descripción textual para la generación de video, con una longitud máxima de 2000 caracteres."
+      },
+      "resolution": {
+        "name": "resolución"
+      },
+      "seed": {
+        "name": "semilla"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3ImageToVideoNode": {
+    "description": "Genera un video a partir de una imagen y un prompt opcional.",
+    "display_name": "Generación de video de imagen a video Vidu Q3",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "image": {
+        "name": "imagen",
+        "tooltip": "Una imagen que se usará como el primer fotograma del video generado."
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Modelo a utilizar para la generación de video."
+      },
+      "model_audio": {
+        "name": "audio"
+      },
+      "model_duration": {
+        "name": "duración"
+      },
+      "model_resolution": {
+        "name": "resolución"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Un prompt de texto opcional para la generación de video (máx. 2000 caracteres)."
+      },
+      "seed": {
+        "name": "semilla"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3StartEndToVideoNode": {
+    "description": "Genera un video a partir de un fotograma inicial, un fotograma final y un prompt.",
+    "display_name": "Generación de video de inicio/fin de Vidu Q3",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control después de generar"
+      },
+      "end_frame": {
+        "name": "fotograma final"
+      },
+      "first_frame": {
+        "name": "fotograma inicial"
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Modelo a utilizar para la generación de video."
+      },
+      "model_audio": {
+        "name": "audio"
+      },
+      "model_duration": {
+        "name": "duración"
+      },
+      "model_resolution": {
+        "name": "resolución"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Descripción del prompt (máximo 2000 caracteres)."
+      },
+      "seed": {
+        "name": "semilla"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3TextToVideoNode": {
+    "description": "Genera un video a partir de un prompt de texto.",
+    "display_name": "Generación de video de texto a video Vidu Q3",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Modelo a utilizar para la generación de video."
+      },
+      "model_aspect_ratio": {
+        "name": "relación_de_aspecto"
+      },
+      "model_audio": {
+        "name": "audio"
+      },
+      "model_duration": {
+        "name": "duración"
+      },
+      "model_resolution": {
+        "name": "resolución"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Una descripción textual para la generación de video, con una longitud máxima de 2000 caracteres."
+      },
+      "seed": {
+        "name": "semilla"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ViduExtendVideoNode": {
+    "description": "Extiende un video existente generando fotogramas adicionales.",
+    "display_name": "Extensión de video Vidu",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "end_frame": {
+        "name": "fotograma_final"
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Modelo a utilizar para la extensión de video."
+      },
+      "model_duration": {
+        "name": "duración"
+      },
+      "model_resolution": {
+        "name": "resolución"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Un prompt de texto opcional para el video extendido (máx. 2000 caracteres)."
+      },
+      "seed": {
+        "name": "semilla"
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "El video fuente a extender."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ViduImageToVideoNode": {
     "description": "Generar video a partir de imagen y texto opcional",
     "display_name": "Generación de Video a partir de Imagen Vidu",
@@ -12060,6 +17037,49 @@
       }
     }
   },
+  "ViduMultiFrameVideoNode": {
+    "description": "Genera un video con múltiples transiciones de fotogramas clave.",
+    "display_name": "Generación de video multifotograma Vidu",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "frames": {
+        "name": "fotogramas",
+        "tooltip": "Número de transiciones de fotogramas clave (2-9)."
+      },
+      "frames_duration1": {
+        "name": "duración1"
+      },
+      "frames_duration2": {
+        "name": "duración2"
+      },
+      "frames_prompt1": {
+        "name": "prompt1"
+      },
+      "frames_prompt2": {
+        "name": "prompt2"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "resolution": {
+        "name": "resolución"
+      },
+      "seed": {
+        "name": "semilla"
+      },
+      "start_image": {
+        "name": "imagen_inicial",
+        "tooltip": "La imagen del fotograma inicial. La relación de aspecto debe estar entre 1:4 y 4:1."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ViduReferenceVideoNode": {
     "description": "Generar video a partir de múltiples imágenes y texto",
     "display_name": "Generación de Video a partir de Referencia Vidu",
@@ -12206,6 +17226,11 @@
       "voxel": {
         "name": "voxel"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VoxelToMeshBasic": {
@@ -12217,6 +17242,11 @@
       "voxel": {
         "name": "voxel"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "Wan22FunControlToVideo": {
@@ -12496,6 +17526,10 @@
         "name": "context_stride",
         "tooltip": "El paso de la ventana de contexto; solo aplicable a programaciones uniformes."
       },
+      "freenoise": {
+        "name": "freenoise",
+        "tooltip": "Si se aplica el barajado de ruido FreeNoise, mejora la mezcla de ventanas."
+      },
       "fuse_method": {
         "name": "fuse_method",
         "tooltip": "El método a utilizar para fusionar las ventanas de contexto."
@@ -12836,6 +17870,10 @@
         "name": "semilla",
         "tooltip": "Semilla a utilizar para la generación."
       },
+      "shot_type": {
+        "name": "tipo_de_toma",
+        "tooltip": "Especifica el tipo de toma para el video generado, es decir, si el video es una sola toma continua o varias tomas con cortes. Este parámetro solo tiene efecto cuando prompt_extend es True."
+      },
       "watermark": {
         "name": "marca_agua",
         "tooltip": "Si se debe agregar una marca de agua \"Generado por IA\" al resultado."
@@ -12847,6 +17885,196 @@
       }
     }
   },
+  "WanInfiniteTalkToVideo": {
+    "display_name": "WanInfiniteTalkToVideo",
+    "inputs": {
+      "audio_encoder_output_1": {
+        "name": "salida codificador de audio 1"
+      },
+      "audio_scale": {
+        "name": "escala de audio"
+      },
+      "clip_vision_output": {
+        "name": "salida de clip visión"
+      },
+      "height": {
+        "name": "alto"
+      },
+      "length": {
+        "name": "longitud"
+      },
+      "mode": {
+        "name": "modo"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "model_patch": {
+        "name": "parche de modelo"
+      },
+      "motion_frame_count": {
+        "name": "número de fotogramas de movimiento",
+        "tooltip": "Número de fotogramas anteriores a usar como contexto de movimiento."
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "previous_frames": {
+        "name": "fotogramas anteriores"
+      },
+      "start_image": {
+        "name": "imagen inicial"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "ancho"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "modelo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "3": {
+        "name": "latente",
+        "tooltip": null
+      },
+      "4": {
+        "name": "imagen recortada",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveConcatTrack": {
+    "display_name": "WanMoveConcatTrack",
+    "inputs": {
+      "tracks_1": {
+        "name": "pistas_1"
+      },
+      "tracks_2": {
+        "name": "pistas_2"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveTrackToVideo": {
+    "display_name": "WanMoveTrackToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "tamaño_lote"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "alto"
+      },
+      "length": {
+        "name": "longitud"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "start_image": {
+        "name": "imagen_inicial"
+      },
+      "strength": {
+        "name": "fuerza",
+        "tooltip": "Fuerza del acondicionamiento de la pista."
+      },
+      "tracks": {
+        "name": "pistas"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "ancho"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latente",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveTracksFromCoords": {
+    "display_name": "WanMoveTracksFromCoords",
+    "inputs": {
+      "track_coords": {
+        "name": "coordenadas_de_pista"
+      },
+      "track_mask": {
+        "name": "máscara_de_pista"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "longitud_de_pista",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveVisualizeTracks": {
+    "display_name": "WanMoveVisualizeTracks",
+    "inputs": {
+      "circle_size": {
+        "name": "tamaño_círculo"
+      },
+      "images": {
+        "name": "imágenes"
+      },
+      "line_resolution": {
+        "name": "resolución_de_línea"
+      },
+      "line_width": {
+        "name": "ancho_de_línea"
+      },
+      "opacity": {
+        "name": "opacidad"
+      },
+      "tracks": {
+        "name": "pistas"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "WanPhantomSubjectToVideo": {
     "display_name": "WanPhantomSubjectToVideo",
     "inputs": {
@@ -12894,6 +18122,113 @@
       }
     }
   },
+  "WanReferenceVideoApi": {
+    "description": "Utiliza el personaje y la voz de los videos de entrada, combinados con un prompt, para generar un nuevo video que mantenga la coherencia del personaje.",
+    "display_name": "Wan Reference to Video",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar después de generar"
+      },
+      "duration": {
+        "name": "duración"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "negative_prompt": {
+        "name": "prompt_negativo",
+        "tooltip": "Prompt negativo que describe lo que se debe evitar."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt que describe los elementos y características visuales. Soporta inglés y chino. Usa identificadores como `character1` y `character2` para referirse a los personajes de referencia."
+      },
+      "reference_videos": {
+        "name": "videos_de_referencia"
+      },
+      "seed": {
+        "name": "semilla"
+      },
+      "shot_type": {
+        "name": "tipo_de_toma",
+        "tooltip": "Especifica el tipo de toma para el video generado, es decir, si el video es una sola toma continua o varias tomas con cortes."
+      },
+      "size": {
+        "name": "tamaño"
+      },
+      "watermark": {
+        "name": "marca_de_agua",
+        "tooltip": "Indica si se debe añadir una marca de agua generada por IA al resultado."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanSCAILToVideo": {
+    "display_name": "WanSCAILToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "tamaño_lote"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "alto"
+      },
+      "length": {
+        "name": "longitud"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "pose_end": {
+        "name": "fin_pose",
+        "tooltip": "Paso final para usar el condicionamiento de pose."
+      },
+      "pose_start": {
+        "name": "inicio_pose",
+        "tooltip": "Paso inicial para usar el condicionamiento de pose."
+      },
+      "pose_strength": {
+        "name": "fuerza_pose",
+        "tooltip": "Fuerza del espacio latente de la pose."
+      },
+      "pose_video": {
+        "name": "video_pose",
+        "tooltip": "Video usado para el condicionamiento de pose. Se reducirá a la mitad de la resolución del video principal."
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "reference_image": {
+        "name": "imagen_referencia"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "ancho"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latente",
+        "tooltip": "Espacio latente vacío del tamaño de la generación."
+      }
+    }
+  },
   "WanSoundImageToVideo": {
     "display_name": "WanSoundImageToVideo",
     "inputs": {
@@ -13072,6 +18407,10 @@
         "name": "semilla",
         "tooltip": "Semilla a utilizar para la generación."
       },
+      "shot_type": {
+        "name": "tipo_de_toma",
+        "tooltip": "Especifica el tipo de toma para el video generado, es decir, si el video es una sola toma continua o varias tomas con cortes. Este parámetro solo tiene efecto cuando prompt_extend es True."
+      },
       "size": {
         "name": "tamaño"
       },
@@ -13197,6 +18536,43 @@
       }
     }
   },
+  "WavespeedFlashVSRNode": {
+    "description": "Escalador de video rápido y de alta calidad que aumenta la resolución y restaura la claridad de videos de baja resolución o borrosos.",
+    "display_name": "FlashVSR Escalado de Video",
+    "inputs": {
+      "target_resolution": {
+        "name": "resolución_objetivo"
+      },
+      "video": {
+        "name": "video"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WavespeedImageUpscaleNode": {
+    "description": "Aumenta la resolución y calidad de la imagen, escalando fotos a 4K u 8K para obtener resultados nítidos y detallados.",
+    "display_name": "WaveSpeed Escalado de Imagen",
+    "inputs": {
+      "image": {
+        "name": "imagen"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "target_resolution": {
+        "name": "resolución_objetivo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "WebcamCapture": {
     "display_name": "Captura de Webcam",
     "inputs": {
@@ -13209,13 +18585,38 @@
       "image": {
         "name": "imagen"
       },
-      "waiting for camera___": {
-      },
+      "waiting for camera___": {},
       "width": {
         "name": "ancho"
       }
     }
   },
+  "ZImageFunControlnet": {
+    "display_name": "ZImageFunControlnet",
+    "inputs": {
+      "image": {
+        "name": "imagen"
+      },
+      "inpaint_image": {
+        "name": "imagen_relleno"
+      },
+      "mask": {
+        "name": "máscara"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "model_patch": {
+        "name": "parche_de_modelo"
+      },
+      "strength": {
+        "name": "fuerza"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
   "unCLIPCheckpointLoader": {
     "display_name": "Cargador de Puntos de Control unCLIP",
     "inputs": {
@@ -13240,5 +18641,19 @@
         "name": "fuerza"
       }
     }
+  },
+  "wanBlockSwap": {
+    "description": "NOP",
+    "display_name": "wanBlockSwap",
+    "inputs": {
+      "model": {
+        "name": "modelo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
   }
 }
diff --git a/src/locales/es/settings.json b/src/locales/es/settings.json
index 0718932fbe..4798abd7ea 100644
--- a/src/locales/es/settings.json
+++ b/src/locales/es/settings.json
@@ -52,7 +52,8 @@
     }
   },
   "Comfy_Canvas_SelectionToolbox": {
-    "name": "Mostrar caja de herramientas de selección"
+    "name": "Mostrar caja de herramientas de selección",
+    "tooltip": "Muestra una barra de herramientas flotante cuando se seleccionan nodos, proporcionando acceso rápido a acciones comunes."
   },
   "Comfy_ConfirmClear": {
     "name": "Requerir confirmación al borrar el flujo de trabajo"
@@ -79,6 +80,17 @@
   "Comfy_EnableWorkflowViewRestore": {
     "name": "Guardar y restaurar la posición del lienzo y el nivel de zoom en los flujos de trabajo"
   },
+  "Comfy_Execution_PreviewMethod": {
+    "name": "Método de vista previa en vivo",
+    "options": {
+      "auto": "auto",
+      "default": "default",
+      "latent2rgb": "latent2rgb",
+      "none": "ninguno",
+      "taesd": "taesd"
+    },
+    "tooltip": "Método de vista previa en vivo durante la generación de imágenes. \"default\" utiliza la configuración CLI del servidor."
+  },
   "Comfy_FloatRoundingPrecision": {
     "name": "Decimales de redondeo del widget flotante [0 = automático].",
     "tooltip": "(requiere recargar la página)"
@@ -92,6 +104,10 @@
   "Comfy_Graph_CtrlShiftZoom": {
     "name": "Habilitar atajo de zoom rápido (Ctrl + Shift + Arrastrar)"
   },
+  "Comfy_Graph_DeduplicateSubgraphNodeIds": {
+    "name": "Eliminar duplicados de IDs de nodos en subgráficos",
+    "tooltip": "Reasigna automáticamente los IDs de nodos duplicados en subgráficos al cargar un flujo de trabajo."
+  },
   "Comfy_Graph_LinkMarkers": {
     "name": "Marcadores de punto medio de enlace",
     "options": {
@@ -100,6 +116,10 @@
       "None": "Ninguno"
     }
   },
+  "Comfy_Graph_LiveSelection": {
+    "name": "Selección en vivo",
+    "tooltip": "Cuando está activado, los nodos se seleccionan/deseleccionan en tiempo real mientras arrastras el rectángulo de selección, similar a otras herramientas de diseño."
+  },
   "Comfy_Graph_ZoomSpeed": {
     "name": "Velocidad de zoom del lienzo"
   },
@@ -132,7 +152,8 @@
       "Linear": "Lineal",
       "Spline": "Spline",
       "Straight": "Recto"
-    }
+    },
+    "tooltip": "Controla la apariencia y visibilidad de los enlaces de conexión entre nodos en el lienzo."
   },
   "Comfy_Load3D_3DViewerEnable": {
     "name": "Habilitar visor 3D (Beta)",
@@ -143,32 +164,41 @@
     "tooltip": "Controla el color de fondo predeterminado de la escena 3D. Esta configuración determina la apariencia del fondo cuando se crea un nuevo widget 3D, pero puede ajustarse individualmente para cada widget después de su creación."
   },
   "Comfy_Load3D_CameraType": {
-    "name": "Tipo de Cámara",
+    "name": "Tipo de cámara inicial",
     "options": {
       "orthographic": "ortográfica",
       "perspective": "perspectiva"
     },
-    "tooltip": "Controla si la cámara es perspectiva u ortográfica por defecto cuando se crea un nuevo widget 3D. Este valor predeterminado aún puede ser alternado individualmente para cada widget después de su creación."
+    "tooltip": "Controla si la cámara es perspectiva u ortográfica por defecto cuando se crea un nuevo widget 3D. Este valor predeterminado aún puede cambiarse individualmente para cada widget después de su creación."
   },
   "Comfy_Load3D_LightAdjustmentIncrement": {
     "name": "Incremento de ajuste de luz",
-    "tooltip": "Controla el tamaño del incremento al ajustar la intensidad de la luz en escenas 3D. Un valor de paso más pequeño permite un control más preciso sobre los ajustes de iluminación, mientras que un valor más grande resulta en cambios más notorios por cada ajuste."
+    "tooltip": "Controla el tamaño del incremento al ajustar la intensidad de la luz en escenas 3D. Un valor de paso menor permite un control más preciso de los ajustes de iluminación, mientras que un valor mayor resulta en cambios más notorios por ajuste."
   },
   "Comfy_Load3D_LightIntensity": {
-    "name": "Intensidad Inicial de la Luz",
-    "tooltip": "Establece el nivel de brillo predeterminado de la iluminación en la escena 3D. Este valor determina cuán intensamente las luces iluminan los objetos cuando se crea un nuevo widget 3D, pero puede ajustarse individualmente para cada widget después de la creación."
+    "name": "Intensidad de luz inicial",
+    "tooltip": "Establece el nivel de brillo predeterminado de la iluminación en la escena 3D. Este valor determina cuán intensamente las luces iluminan los objetos cuando se crea un nuevo widget 3D, pero puede ajustarse individualmente para cada widget después de su creación."
   },
   "Comfy_Load3D_LightIntensityMaximum": {
-    "name": "Intensidad Máxima de Luz",
-    "tooltip": "Establece el valor máximo permitido de intensidad de luz para escenas 3D. Esto define el límite superior de brillo que se puede ajustar al modificar la iluminación en cualquier widget 3D."
+    "name": "Intensidad máxima de luz",
+    "tooltip": "Establece el valor máximo permitido de intensidad de luz para escenas 3D. Esto define el límite superior de brillo que se puede establecer al ajustar la iluminación en cualquier widget 3D."
   },
   "Comfy_Load3D_LightIntensityMinimum": {
-    "name": "Intensidad de luz mínima",
-    "tooltip": "Establece el valor mínimo permitido de intensidad de luz para escenas 3D. Esto define el límite inferior de brillo que se puede ajustar al modificar la iluminación en cualquier widget 3D."
+    "name": "Intensidad mínima de luz",
+    "tooltip": "Establece el valor mínimo permitido de intensidad de luz para escenas 3D. Esto define el límite inferior de brillo que se puede establecer al ajustar la iluminación en cualquier widget 3D."
+  },
+  "Comfy_Load3D_PLYEngine": {
+    "name": "Motor PLY",
+    "options": {
+      "fastply": "fastply",
+      "sparkjs": "sparkjs",
+      "threejs": "threejs"
+    },
+    "tooltip": "Selecciona el motor para cargar archivos PLY. \"threejs\" utiliza el cargador nativo Three.js PLYLoader (mejor para archivos PLY de malla). \"fastply\" utiliza un cargador optimizado para archivos PLY de nube de puntos ASCII. \"sparkjs\" utiliza Spark.js para archivos PLY de Gaussian Splatting 3D."
   },
   "Comfy_Load3D_ShowGrid": {
-    "name": "Mostrar Cuadrícula",
-    "tooltip": "Cambiar para mostrar cuadrícula por defecto"
+    "name": "Visibilidad inicial de la cuadrícula",
+    "tooltip": "Controla si la cuadrícula es visible por defecto cuando se crea un nuevo widget 3D. Este valor predeterminado aún puede cambiarse individualmente para cada widget después de su creación."
   },
   "Comfy_Locale": {
     "name": "Idioma"
@@ -218,11 +248,20 @@
   "Comfy_NodeBadge_ShowApiPricing": {
     "name": "Mostrar insignia de precios de nodo API"
   },
+  "Comfy_NodeLibrary_NewDesign": {
+    "name": "Nuevo diseño de la biblioteca de nodos",
+    "tooltip": "Activa la barra lateral rediseñada de la biblioteca de nodos con pestañas (Esencial, Todo, Personalizado), búsqueda mejorada y vistas previas al pasar el cursor."
+  },
+  "Comfy_NodeReplacement_Enabled": {
+    "name": "Habilitar reemplazo automático de nodos",
+    "tooltip": "Cuando está habilitado, los nodos faltantes pueden ser reemplazados automáticamente por sus equivalentes más nuevos si existe un mapeo de reemplazo."
+  },
   "Comfy_NodeSearchBoxImpl": {
     "name": "Implementación de la caja de búsqueda de nodos",
     "options": {
       "default": "predeterminado",
-      "litegraph (legacy)": "litegraph (legado)"
+      "litegraph (legacy)": "litegraph (legado)",
+      "v1 (legacy)": "v1 (heredado)"
     }
   },
   "Comfy_NodeSearchBoxImpl_NodePreview": {
@@ -248,6 +287,10 @@
   "Comfy_Node_AllowImageSizeDraw": {
     "name": "Mostrar ancho × altura debajo de la vista previa de la imagen"
   },
+  "Comfy_Node_AlwaysShowAdvancedWidgets": {
+    "name": "Mostrar siempre los widgets avanzados en todos los nodos",
+    "tooltip": "Cuando está activado, los widgets avanzados siempre son visibles en todos los nodos sin necesidad de expandirlos individualmente."
+  },
   "Comfy_Node_AutoSnapLinkToSlot": {
     "name": "Enlace de ajuste automático a la ranura del nodo",
     "tooltip": "Al arrastrar un enlace sobre un nodo, el enlace se ajustará automáticamente a una ranura de entrada viable en el nodo"
@@ -308,6 +351,14 @@
     "name": "Tamaño del historial de la cola",
     "tooltip": "El número máximo de tareas que se muestran en el historial de la cola."
   },
+  "Comfy_Queue_QPOV2": {
+    "name": "Usar la cola de trabajos unificada en el panel lateral de Activos",
+    "tooltip": "Reemplaza el panel flotante de la cola de trabajos por una cola de trabajos equivalente integrada en el panel lateral de Activos. Puedes desactivar esto para volver al diseño del panel flotante."
+  },
+  "Comfy_RightSidePanel_ShowErrorsTab": {
+    "name": "Mostrar pestaña de errores en el panel lateral",
+    "tooltip": "Cuando está activado, se muestra una pestaña de errores en el panel lateral derecho para ver de un vistazo los errores de ejecución del flujo de trabajo."
+  },
   "Comfy_Sidebar_Location": {
     "name": "Ubicación de la barra lateral",
     "options": {
@@ -345,6 +396,14 @@
   "Comfy_TreeExplorer_ItemPadding": {
     "name": "Relleno del elemento del explorador de árboles"
   },
+  "Comfy_UI_TabBarLayout": {
+    "name": "Diseño de barra de pestañas",
+    "options": {
+      "Default": "Predeterminado",
+      "Integrated": "Integrado"
+    },
+    "tooltip": "Controla el diseño de la barra de pestañas. \"Integrado\" mueve los controles de Ayuda y Usuario al área de la barra de pestañas."
+  },
   "Comfy_UseNewMenu": {
     "name": "Usar nuevo menú",
     "options": {
@@ -434,6 +493,7 @@
     "tooltip": "El punto de control bezier desplazado desde el punto central de reenrutamiento"
   },
   "pysssss_SnapToGrid": {
-    "name": "Siempre ajustar a la cuadrícula"
+    "name": "Siempre ajustar a la cuadrícula",
+    "tooltip": "Cuando está activado, los nodos se alinearán automáticamente a la cuadrícula al moverlos o cambiar su tamaño."
   }
 }
diff --git a/src/locales/fa/commands.json b/src/locales/fa/commands.json
new file mode 100644
index 0000000000..c7bb7a1e27
--- /dev/null
+++ b/src/locales/fa/commands.json
@@ -0,0 +1,367 @@
+{
+  "Comfy-Desktop_CheckForUpdates": {
+    "label": "بررسی به‌روزرسانی‌ها"
+  },
+  "Comfy-Desktop_Folders_OpenCustomNodesFolder": {
+    "label": "باز کردن پوشه Custom Nodes"
+  },
+  "Comfy-Desktop_Folders_OpenInputsFolder": {
+    "label": "باز کردن پوشه Inputs"
+  },
+  "Comfy-Desktop_Folders_OpenLogsFolder": {
+    "label": "باز کردن پوشه Logs"
+  },
+  "Comfy-Desktop_Folders_OpenModelConfig": {
+    "label": "باز کردن extra_model_paths.yaml"
+  },
+  "Comfy-Desktop_Folders_OpenModelsFolder": {
+    "label": "باز کردن پوشه Models"
+  },
+  "Comfy-Desktop_Folders_OpenOutputsFolder": {
+    "label": "باز کردن پوشه Outputs"
+  },
+  "Comfy-Desktop_OpenDevTools": {
+    "label": "باز کردن DevTools"
+  },
+  "Comfy-Desktop_OpenUserGuide": {
+    "label": "راهنمای کاربر دسکتاپ"
+  },
+  "Comfy-Desktop_Quit": {
+    "label": "خروج"
+  },
+  "Comfy-Desktop_Reinstall": {
+    "label": "نصب مجدد"
+  },
+  "Comfy-Desktop_Restart": {
+    "label": "راه‌اندازی مجدد"
+  },
+  "Comfy_3DViewer_Open3DViewer": {
+    "label": "نمایشگر سه‌بعدی (بتا) را برای نود انتخاب‌شده باز کنید"
+  },
+  "Comfy_BrowseModelAssets": {
+    "label": "آزمایشی: مرور Model Assets"
+  },
+  "Comfy_BrowseTemplates": {
+    "label": "مرور قالب‌ها"
+  },
+  "Comfy_Canvas_CopySelected": {
+    "label": "کپی"
+  },
+  "Comfy_Canvas_DeleteSelectedItems": {
+    "label": "حذف آیتم‌های انتخاب‌شده"
+  },
+  "Comfy_Canvas_FitView": {
+    "label": "تنظیم نما بر اساس nodeهای انتخاب‌شده"
+  },
+  "Comfy_Canvas_Lock": {
+    "label": "قفل کردن بوم"
+  },
+  "Comfy_Canvas_MoveSelectedNodes_Down": {
+    "label": "انتقال nodeهای انتخاب‌شده به پایین"
+  },
+  "Comfy_Canvas_MoveSelectedNodes_Left": {
+    "label": "انتقال nodeهای انتخاب‌شده به چپ"
+  },
+  "Comfy_Canvas_MoveSelectedNodes_Right": {
+    "label": "انتقال nodeهای انتخاب‌شده به راست"
+  },
+  "Comfy_Canvas_MoveSelectedNodes_Up": {
+    "label": "انتقال nodeهای انتخاب‌شده به بالا"
+  },
+  "Comfy_Canvas_PasteFromClipboard": {
+    "label": "چسباندن"
+  },
+  "Comfy_Canvas_ResetView": {
+    "label": "بازنشانی نما"
+  },
+  "Comfy_Canvas_Resize": {
+    "label": "تغییر اندازه nodeهای انتخاب‌شده"
+  },
+  "Comfy_Canvas_SelectAll": {
+    "label": "انتخاب همه"
+  },
+  "Comfy_Canvas_ToggleLinkVisibility": {
+    "label": "نمایش/مخفی‌سازی لینک‌ها در بوم"
+  },
+  "Comfy_Canvas_ToggleLock": {
+    "label": "قفل/باز کردن قفل بوم"
+  },
+  "Comfy_Canvas_ToggleMinimap": {
+    "label": "نمایش/مخفی‌سازی نقشه کوچک بوم"
+  },
+  "Comfy_Canvas_ToggleSelectedNodes_Bypass": {
+    "label": "فعال/غیرفعال کردن bypass برای nodeهای انتخاب‌شده"
+  },
+  "Comfy_Canvas_ToggleSelectedNodes_Collapse": {
+    "label": "جمع/باز کردن nodeهای انتخاب‌شده"
+  },
+  "Comfy_Canvas_ToggleSelectedNodes_Mute": {
+    "label": "بی‌صدا/فعال کردن nodeهای انتخاب‌شده"
+  },
+  "Comfy_Canvas_ToggleSelectedNodes_Pin": {
+    "label": "سنجاق/برداشتن سنجاق nodeهای انتخاب‌شده"
+  },
+  "Comfy_Canvas_ToggleSelected_Pin": {
+    "label": "سنجاق/برداشتن سنجاق آیتم‌های انتخاب‌شده"
+  },
+  "Comfy_Canvas_Unlock": {
+    "label": "باز کردن قفل بوم"
+  },
+  "Comfy_Canvas_ZoomIn": {
+    "label": "بزرگ‌نمایی"
+  },
+  "Comfy_Canvas_ZoomOut": {
+    "label": "کوچک‌نمایی"
+  },
+  "Comfy_ClearPendingTasks": {
+    "label": "پاک‌سازی وظایف در انتظار"
+  },
+  "Comfy_ClearWorkflow": {
+    "label": "پاک‌سازی workflow"
+  },
+  "Comfy_ContactSupport": {
+    "label": "تماس با پشتیبانی"
+  },
+  "Comfy_Dev_ShowModelSelector": {
+    "label": "نمایش Model Selector (توسعه‌دهنده)"
+  },
+  "Comfy_DuplicateWorkflow": {
+    "label": "تکثیر workflow فعلی"
+  },
+  "Comfy_ExportWorkflow": {
+    "label": "خروجی گرفتن از workflow"
+  },
+  "Comfy_ExportWorkflowAPI": {
+    "label": "خروجی گرفتن از workflow (فرمت API)"
+  },
+  "Comfy_Graph_ConvertToSubgraph": {
+    "label": "تبدیل انتخاب به subgraph"
+  },
+  "Comfy_Graph_EditSubgraphWidgets": {
+    "label": "ویرایش ابزارک‌های subgraph"
+  },
+  "Comfy_Graph_ExitSubgraph": {
+    "label": "خروج از subgraph"
+  },
+  "Comfy_Graph_FitGroupToContents": {
+    "label": "تنظیم گروه بر اساس محتوا"
+  },
+  "Comfy_Graph_GroupSelectedNodes": {
+    "label": "گروه‌بندی نودهای انتخاب‌شده"
+  },
+  "Comfy_Graph_ToggleWidgetPromotion": {
+    "label": "تغییر وضعیت ارتقاء ویجت در حال اشاره"
+  },
+  "Comfy_Graph_UnpackSubgraph": {
+    "label": "بازکردن زیرگراف انتخاب‌شده"
+  },
+  "Comfy_GroupNode_ConvertSelectedNodesToGroupNode": {
+    "label": "تبدیل نودهای انتخاب‌شده به گروه نود"
+  },
+  "Comfy_GroupNode_ManageGroupNodes": {
+    "label": "مدیریت گروه نودها"
+  },
+  "Comfy_GroupNode_UngroupSelectedGroupNodes": {
+    "label": "خارج کردن گروه نودهای انتخاب‌شده از گروه"
+  },
+  "Comfy_Help_AboutComfyUI": {
+    "label": "درباره ComfyUI"
+  },
+  "Comfy_Help_OpenComfyOrgDiscord": {
+    "label": "بازکردن دیسکورد Comfy-Org"
+  },
+  "Comfy_Help_OpenComfyUIDocs": {
+    "label": "بازکردن مستندات ComfyUI"
+  },
+  "Comfy_Help_OpenComfyUIForum": {
+    "label": "بازکردن انجمن ComfyUI"
+  },
+  "Comfy_Help_OpenComfyUIIssues": {
+    "label": "بازکردن مشکلات ComfyUI"
+  },
+  "Comfy_Interrupt": {
+    "label": "توقف"
+  },
+  "Comfy_LoadDefaultWorkflow": {
+    "label": "بارگذاری ورک‌فلو پیش‌فرض"
+  },
+  "Comfy_Manager_CustomNodesManager_ShowCustomNodesMenu": {
+    "label": "مدیریت نودهای سفارشی"
+  },
+  "Comfy_Manager_CustomNodesManager_ShowLegacyCustomNodesMenu": {
+    "label": "نودهای سفارشی (قدیمی)"
+  },
+  "Comfy_Manager_ShowLegacyManagerMenu": {
+    "label": "منوی مدیریت (قدیمی)"
+  },
+  "Comfy_Manager_ShowMissingPacks": {
+    "label": "نصب نودهای سفارشی گمشده"
+  },
+  "Comfy_Manager_ShowUpdateAvailablePacks": {
+    "label": "بررسی به‌روزرسانی نودهای سفارشی"
+  },
+  "Comfy_MaskEditor_BrushSize_Decrease": {
+    "label": "کاهش اندازه قلم‌مو در MaskEditor"
+  },
+  "Comfy_MaskEditor_BrushSize_Increase": {
+    "label": "افزایش اندازه قلم‌مو در MaskEditor"
+  },
+  "Comfy_MaskEditor_ColorPicker": {
+    "label": "بازکردن انتخابگر رنگ در MaskEditor"
+  },
+  "Comfy_MaskEditor_Mirror_Horizontal": {
+    "label": "آینه افقی در MaskEditor"
+  },
+  "Comfy_MaskEditor_Mirror_Vertical": {
+    "label": "آینه عمودی در MaskEditor"
+  },
+  "Comfy_MaskEditor_OpenMaskEditor": {
+    "label": "بازکردن ویرایشگر ماسک برای نود انتخاب‌شده"
+  },
+  "Comfy_MaskEditor_Rotate_Left": {
+    "label": "چرخش به چپ در MaskEditor"
+  },
+  "Comfy_MaskEditor_Rotate_Right": {
+    "label": "چرخش به راست در MaskEditor"
+  },
+  "Comfy_Memory_UnloadModels": {
+    "label": "خارج کردن مدل‌ها از حافظه"
+  },
+  "Comfy_Memory_UnloadModelsAndExecutionCache": {
+    "label": "خارج کردن مدل‌ها و کش اجرا از حافظه"
+  },
+  "Comfy_NewBlankWorkflow": {
+    "label": "ورک‌فلو جدید خالی"
+  },
+  "Comfy_OpenClipspace": {
+    "label": "Clipspace"
+  },
+  "Comfy_OpenManagerDialog": {
+    "label": "مدیریت"
+  },
+  "Comfy_OpenWorkflow": {
+    "label": "بازکردن ورک‌فلو"
+  },
+  "Comfy_PublishSubgraph": {
+    "label": "انتشار زیرگراف"
+  },
+  "Comfy_QueuePrompt": {
+    "label": "صف‌بندی پرامپت"
+  },
+  "Comfy_QueuePromptFront": {
+    "label": "صف‌بندی پرامپت (ابتدا)"
+  },
+  "Comfy_QueueSelectedOutputNodes": {
+    "label": "صف‌بندی نودهای خروجی انتخاب‌شده"
+  },
+  "Comfy_Queue_ToggleOverlay": {
+    "label": "تغییر وضعیت تاریخچه وظایف"
+  },
+  "Comfy_Redo": {
+    "label": "انجام مجدد"
+  },
+  "Comfy_RefreshNodeDefinitions": {
+    "label": "به‌روزرسانی تعاریف نود"
+  },
+  "Comfy_RenameWorkflow": {
+    "label": "تغییر نام Workflow"
+  },
+  "Comfy_SaveWorkflow": {
+    "label": "ذخیره ورک‌فلو"
+  },
+  "Comfy_SaveWorkflowAs": {
+    "label": "ذخیره ورک‌فلو با نام جدید"
+  },
+  "Comfy_ShowSettingsDialog": {
+    "label": "نمایش پنجره تنظیمات"
+  },
+  "Comfy_Subgraph_SetDescription": {
+    "label": "تنظیم توضیحات زیرگراف"
+  },
+  "Comfy_Subgraph_SetSearchAliases": {
+    "label": "تنظیم نام‌های جایگزین جستجوی زیرگراف"
+  },
+  "Comfy_ToggleAssetAPI": {
+    "label": "آزمایشی: فعال‌سازی AssetAPI"
+  },
+  "Comfy_ToggleCanvasInfo": {
+    "label": "عملکرد بوم"
+  },
+  "Comfy_ToggleHelpCenter": {
+    "label": "مرکز راهنما"
+  },
+  "Comfy_ToggleLinear": {
+    "label": "تغییر حالت خطی"
+  },
+  "Comfy_ToggleQPOV2": {
+    "label": "تغییر پنل صف V2"
+  },
+  "Comfy_ToggleTheme": {
+    "label": "تغییر تم (تاریک/روشن)"
+  },
+  "Comfy_Undo": {
+    "label": "واگردانی"
+  },
+  "Comfy_User_OpenSignInDialog": {
+    "label": "باز کردن پنجره ورود"
+  },
+  "Comfy_User_SignOut": {
+    "label": "خروج از حساب"
+  },
+  "Experimental_ToggleVueNodes": {
+    "label": "آزمایشی: فعال‌سازی Nodes 2.0"
+  },
+  "Workspace_CloseWorkflow": {
+    "label": "بستن گردش‌کار جاری"
+  },
+  "Workspace_NextOpenedWorkflow": {
+    "label": "گردش‌کار باز بعدی"
+  },
+  "Workspace_PreviousOpenedWorkflow": {
+    "label": "گردش‌کار باز قبلی"
+  },
+  "Workspace_SearchBox_Toggle": {
+    "label": "تغییر جعبه جستجو"
+  },
+  "Workspace_ToggleBottomPanel": {
+    "label": "تغییر پنل پایین"
+  },
+  "Workspace_ToggleBottomPanelTab_command-terminal": {
+    "label": "نمایش/مخفی‌کردن پنل پایینی ترمینال"
+  },
+  "Workspace_ToggleBottomPanelTab_logs-terminal": {
+    "label": "نمایش/مخفی‌کردن پنل پایینی گزارش‌ها"
+  },
+  "Workspace_ToggleBottomPanelTab_shortcuts-essentials": {
+    "label": "تغییر پنل ضروریات پایین"
+  },
+  "Workspace_ToggleBottomPanelTab_shortcuts-view-controls": {
+    "label": "تغییر پنل کنترل‌های نمای پایین"
+  },
+  "Workspace_ToggleBottomPanel_Shortcuts": {
+    "label": "نمایش پنجره کلیدهای میانبر"
+  },
+  "Workspace_ToggleFocusMode": {
+    "label": "تغییر حالت تمرکز"
+  },
+  "Workspace_ToggleSidebarTab_apps": {
+    "label": "نمایش/پنهان کردن نوار کناری اپلیکیشن‌ها",
+    "tooltip": "اپلیکیشن‌ها"
+  },
+  "Workspace_ToggleSidebarTab_assets": {
+    "label": "تغییر نوار کناری دارایی‌ها",
+    "tooltip": "دارایی‌ها"
+  },
+  "Workspace_ToggleSidebarTab_model-library": {
+    "label": "تغییر نوار کناری کتابخانه مدل",
+    "tooltip": "کتابخانه مدل"
+  },
+  "Workspace_ToggleSidebarTab_node-library": {
+    "label": "تغییر نوار کناری کتابخانه node",
+    "tooltip": "کتابخانه node"
+  },
+  "Workspace_ToggleSidebarTab_workflows": {
+    "label": "تغییر نوار کناری گردش‌کارها",
+    "tooltip": "گردش‌کارها"
+  }
+}
diff --git a/src/locales/fa/main.json b/src/locales/fa/main.json
new file mode 100644
index 0000000000..c5e9a2ed51
--- /dev/null
+++ b/src/locales/fa/main.json
@@ -0,0 +1,3398 @@
+{
+  "actionbar": {
+    "dockToTop": "چسباندن به بالا",
+    "feedback": "بازخورد",
+    "feedbackTooltip": "بازخورد"
+  },
+  "apiNodesCostBreakdown": {
+    "costPerRun": "هزینه هر اجرا",
+    "title": "API Node(ها)",
+    "totalCost": "هزینه کل"
+  },
+  "apiNodesSignInDialog": {
+    "message": "این workflow شامل API Node است که برای اجرا نیاز به ورود به حساب کاربری دارد.",
+    "title": "ورود برای استفاده از API Nodeها لازم است"
+  },
+  "assetBrowser": {
+    "allCategory": "همه {category}",
+    "allModels": "همه مدل‌ها",
+    "apiKeyHint": "مدل‌های خصوصی یا محدود وارد می‌کنید؟ {link}.",
+    "apiKeyHintLink": "کلیدهای API خود را در تنظیمات اضافه کنید",
+    "ariaLabel": {
+      "assetCard": "{name} - دارایی {type}",
+      "loadingAsset": "در حال بارگذاری دارایی"
+    },
+    "assetCollection": "مجموعه دارایی‌ها",
+    "assets": "دارایی‌ها",
+    "baseModel": "مدل پایه",
+    "baseModels": "مدل‌های پایه",
+    "browseAssets": "مرور دارایی‌ها",
+    "byType": "بر اساس نوع",
+    "checkpoints": "چک‌پوینت‌ها",
+    "civitaiLinkExample": "{example} {link}",
+    "civitaiLinkExampleStrong": "مثال:",
+    "civitaiLinkExampleUrl": "https://civitai.com/models/10706/luisap-z-image-and-qwen-pixel-art-refiner?modelVersionId=2225295",
+    "civitaiLinkLabel": "لینک {download} مدل Civitai",
+    "civitaiLinkLabelDownload": "دانلود",
+    "civitaiLinkPlaceholder": "لینک را اینجا وارد کنید",
+    "confirmModelDetails": "تأیید جزئیات مدل",
+    "connectionError": "لطفاً اتصال خود را بررسی کرده و دوباره تلاش کنید",
+    "deletion": {
+      "body": "این مدل به طور دائمی از کتابخانه شما حذف خواهد شد.",
+      "complete": "{assetName} حذف شد.",
+      "failed": "امکان حذف {assetName} وجود ندارد.",
+      "header": "حذف این مدل؟",
+      "inProgress": "در حال حذف {assetName}..."
+    },
+    "download": {
+      "complete": "دانلود کامل شد",
+      "failed": "دانلود ناموفق بود",
+      "inProgress": "در حال دانلود {assetName}..."
+    },
+    "emptyImported": {
+      "canImport": "هنوز مدلی وارد نشده است. برای افزودن مدل خود، روی «وارد کردن مدل» کلیک کنید.",
+      "restricted": "مدل‌های شخصی فقط برای سطح Creator و بالاتر در دسترس هستند."
+    },
+    "errorAccessForbidden": "دسترسی به این منبع مجاز نیست.",
+    "errorConnectionRefused": "اتصال به منبع برقرار نشد. لطفاً بعداً دوباره تلاش کنید.",
+    "errorDownloadCancelled": "دانلود لغو شد.",
+    "errorFileTooLarge": "فایل از حداکثر اندازه مجاز بزرگ‌تر است",
+    "errorFormatNotAllowed": "فقط فرمت SafeTensor مجاز است",
+    "errorHttpError": "هنگام دریافت اطلاعات خطایی رخ داد.",
+    "errorInternalError": "یک خطای غیرمنتظره رخ داد. لطفاً دوباره تلاش کنید.",
+    "errorInvalidHost": "نام میزبان URL منبع قابل شناسایی نیست.",
+    "errorInvalidUrl": "لطفاً یک URL وارد کنید.",
+    "errorInvalidUrlFormat": "فرمت URL نامعتبر است. لطفاً بررسی و دوباره تلاش کنید.",
+    "errorMetadataFetchFailed": "دریافت اطلاعات فایل از منبع با شکست مواجه شد.",
+    "errorModelTypeNotSupported": "این نوع مدل پشتیبانی نمی‌شود",
+    "errorNetworkError": "یک خطای شبکه رخ داد. لطفاً اتصال خود را بررسی و دوباره تلاش کنید.",
+    "errorNetworkTimeout": "درخواست زمان‌بر شد. لطفاً دوباره تلاش کنید.",
+    "errorRateLimited": "درخواست‌های بیش از حد. لطفاً چند دقیقه دیگر دوباره تلاش کنید.",
+    "errorRequestCancelled": "درخواست لغو شد.",
+    "errorResourceNotFound": "فایل پیدا نشد. لطفاً URL را بررسی و دوباره تلاش کنید.",
+    "errorServiceUnavailable": "سرویس موقتاً در دسترس نیست. لطفاً بعداً دوباره تلاش کنید.",
+    "errorSourceServerError": "سرور منبع با مشکل مواجه است. لطفاً بعداً دوباره تلاش کنید.",
+    "errorUnauthorized": "لطفاً برای ادامه وارد شوید.",
+    "errorUnauthorizedSource": "این منبع نیاز به احراز هویت دارد. لطفاً توکن API خود را در تنظیمات وارد کنید.",
+    "errorUnknown": "خطای غیرمنتظره‌ای رخ داد",
+    "errorUnsafePickleScan": "CivitAI کد بالقوه ناامن را در این فایل شناسایی کرد",
+    "errorUnsafeVirusScan": "CivitAI بدافزار یا محتوای مشکوک را در این فایل شناسایی کرد",
+    "errorUnsupportedSource": "این URL پشتیبانی نمی‌شود. فقط URLهای Hugging Face و Civitai مجاز هستند.",
+    "errorUploadFailed": "وارد کردن دارایی ناموفق بود. لطفاً دوباره تلاش کنید.",
+    "errorUserTokenAccessDenied": "توکن API شما به این منبع دسترسی ندارد. لطفاً مجوزهای توکن خود را بررسی کنید.",
+    "errorUserTokenInvalid": "توکن API ذخیره‌شده شما نامعتبر یا منقضی شده است. لطفاً توکن خود را در تنظیمات به‌روزرسانی کنید.",
+    "failedToCreateNode": "ایجاد node ناموفق بود. لطفاً دوباره تلاش کنید یا کنسول را بررسی کنید.",
+    "fileFormats": "فرمت‌های فایل",
+    "fileName": "نام فایل",
+    "fileSize": "اندازه فایل",
+    "filterBy": "فیلتر بر اساس",
+    "findInLibrary": "در بخش {type} کتابخانه مدل‌ها پیدا کنید.",
+    "finish": "پایان",
+    "genericLinkPlaceholder": "لینک را اینجا وارد کنید",
+    "importAnother": "وارد کردن مورد دیگر",
+    "imported": "وارد شده",
+    "invalidAsset": "دارایی نامعتبر",
+    "invalidAssetDetail": "دارایی انتخاب‌شده قابل اعتبارسنجی نیست. لطفاً دوباره تلاش کنید.",
+    "invalidFilename": "نام فایل نامعتبر",
+    "invalidFilenameDetail": "نام فایل دارایی قابل شناسایی نیست. لطفاً دوباره تلاش کنید.",
+    "jobId": "شناسه کار: {jobId}",
+    "loadingModels": "در حال بارگذاری {type}...",
+    "maxFileSize": "حداکثر اندازه فایل: {size}",
+    "maxFileSizeValue": "۱ گیگابایت",
+    "media": {
+      "audioPlaceholder": "صوت",
+      "threeDModelPlaceholder": "مدل سه‌بعدی"
+    },
+    "modelAssociatedWithLink": "مدل مرتبط با لینکی که وارد کردید:",
+    "modelInfo": {
+      "addBaseModel": "افزودن مدل پایه...",
+      "addTag": "افزودن برچسب...",
+      "additionalTags": "برچسب‌های اضافی",
+      "baseModelUnknown": "مدل پایه نامشخص",
+      "basicInfo": "اطلاعات پایه",
+      "compatibleBaseModels": "مدل‌های پایه سازگار",
+      "description": "توضیحات",
+      "descriptionNotSet": "توضیحی تنظیم نشده است",
+      "descriptionPlaceholder": "یک توضیح برای این مدل اضافه کنید...",
+      "displayName": "نام نمایشی",
+      "editDisplayName": "ویرایش نام نمایشی",
+      "fileName": "نام فایل",
+      "modelDescription": "توضیحات مدل",
+      "modelTagging": "برچسب‌گذاری مدل",
+      "modelType": "نوع مدل",
+      "noAdditionalTags": "برچسب اضافی وجود ندارد",
+      "selectModelPrompt": "یک مدل را برای مشاهده اطلاعات آن انتخاب کنید",
+      "selectModelType": "انتخاب نوع مدل...",
+      "source": "منبع",
+      "title": "اطلاعات مدل",
+      "triggerPhrases": "عبارات فعال‌ساز",
+      "viewOnSource": "مشاهده در {source}"
+    },
+    "modelName": "نام مدل",
+    "modelNamePlaceholder": "یک نام برای این مدل وارد کنید",
+    "modelTypeSelectorLabel": "نوع مدل چیست؟",
+    "modelTypeSelectorPlaceholder": "نوع مدل را انتخاب کنید",
+    "modelUploaded": "مدل با موفقیت وارد شد.",
+    "noAssetsFound": "هیچ دارایی‌ای یافت نشد",
+    "noModelsInFolder": "هیچ {type} در این پوشه موجود نیست",
+    "noResultsCanImport": "جستجو یا فیلترهای خود را تغییر دهید.\nهمچنین می‌توانید مدل‌ها را با استفاده از دکمه «وارد کردن» در بالا اضافه کنید.",
+    "noValidSourceDetected": "هیچ منبع واردات معتبری شناسایی نشد",
+    "notSureLeaveAsIs": "مطمئن نیستید؟ همین را باقی بگذارید",
+    "onlyCivitaiUrlsSupported": "فقط URLهای Civitai پشتیبانی می‌شوند",
+    "ownership": "مالکیت",
+    "ownershipAll": "همه",
+    "ownershipMyModels": "مدل‌های من",
+    "ownershipPublicModels": "مدل‌های عمومی",
+    "processingModel": "دانلود آغاز شد",
+    "processingModelDescription": "می‌توانید این پنجره را ببندید. دانلود در پس‌زمینه ادامه خواهد داشت.",
+    "providerCivitai": "Civitai",
+    "providerHuggingFace": "Hugging Face",
+    "rename": {
+      "failed": "امکان تغییر نام دارایی وجود ندارد."
+    },
+    "selectFrameworks": "فریم‌ورک‌ها را انتخاب کنید",
+    "selectModelType": "نوع مدل را انتخاب کنید",
+    "selectProjects": "پروژه‌ها را انتخاب کنید",
+    "sortAZ": "الف-ی",
+    "sortBy": "مرتب‌سازی بر اساس",
+    "sortDefault": "پیش‌فرض",
+    "sortPopular": "محبوب",
+    "sortRecent": "جدیدترین",
+    "sortZA": "ی-الف",
+    "sortingType": "نوع مرتب‌سازی",
+    "tags": "برچسب‌ها",
+    "tagsHelp": "برچسب‌ها را با ویرگول جدا کنید",
+    "tagsPlaceholder": "مثلاً: models, checkpoint",
+    "tryAdjustingFilters": "جستجو یا فیلترهای خود را تغییر دهید",
+    "unknown": "نامشخص",
+    "unsupportedUrlSource": "فقط URLهای {sources} پشتیبانی می‌شوند",
+    "upgradeFeatureDescription": "این قابلیت فقط با پلن Creator یا Pro فعال است.",
+    "upgradeToUnlockFeature": "برای فعال‌سازی این قابلیت ارتقا دهید",
+    "upload": "وارد کردن",
+    "uploadFailed": "وارد کردن ناموفق بود",
+    "uploadModel": "وارد کردن",
+    "uploadModelDescription1": "لینک دانلود مدل Civitai را وارد کنید تا به کتابخانه شما افزوده شود.",
+    "uploadModelDescription1Generic": "لینک دانلود مدل را وارد کنید تا به کتابخانه شما افزوده شود.",
+    "uploadModelDescription2": "در حال حاضر فقط لینک‌های {link} پشتیبانی می‌شوند",
+    "uploadModelDescription2Generic": "در حال حاضر فقط URLهای ارائه‌دهندگان زیر پشتیبانی می‌شوند:",
+    "uploadModelDescription2Link": "https://civitai.com/models",
+    "uploadModelDescription3": "حداکثر اندازه فایل: {size}",
+    "uploadModelFailedToRetrieveMetadata": "دریافت متادیتا ناموفق بود. لطفاً لینک را بررسی و دوباره تلاش کنید.",
+    "uploadModelFromCivitai": "وارد کردن مدل از Civitai",
+    "uploadModelGeneric": "وارد کردن مدل",
+    "uploadModelHelpFooterText": "برای یافتن URLها نیاز به راهنما دارید؟ روی یکی از ارائه‌دهندگان زیر کلیک کنید تا ویدئوی آموزشی را ببینید.",
+    "uploadModelHelpVideo": "ویدئوی راهنمای وارد کردن مدل",
+    "uploadModelHowDoIFindThis": "چطور این را پیدا کنم؟",
+    "uploadSuccess": "مدل با موفقیت وارد شد!",
+    "uploadingModel": "در حال وارد کردن مدل..."
+  },
+  "auth": {
+    "apiKey": {
+      "cleared": "کلید API پاک شد",
+      "clearedDetail": "کلید API شما با موفقیت پاک شد",
+      "description": "برای فعال‌سازی API Nodeها از کلید Comfy API خود استفاده کنید",
+      "error": "کلید API نامعتبر است",
+      "generateKey": "از اینجا دریافت کنید",
+      "helpText": "نیاز به کلید API دارید؟",
+      "invalid": "کلید API نامعتبر است",
+      "invalidDetail": "لطفاً یک کلید API معتبر وارد کنید",
+      "label": "کلید API",
+      "placeholder": "کلید API خود را وارد کنید",
+      "storageFailed": "ذخیره‌سازی کلید API ناموفق بود",
+      "storageFailedDetail": "لطفاً دوباره تلاش کنید.",
+      "stored": "کلید API ذخیره شد",
+      "storedDetail": "کلید API شما با موفقیت ذخیره شد",
+      "title": "کلید API",
+      "whitelistInfo": "درباره سایت‌های غیرمجاز"
+    },
+    "deleteAccount": {
+      "contactSupport": "برای حذف حساب کاربری خود، لطفاً با {email} تماس بگیرید."
+    },
+    "errors": {
+      "auth/cancelled-popup-request": "ورود لغو شد. لطفاً دوباره تلاش کنید.",
+      "auth/email-already-in-use": "حسابی با این ایمیل قبلاً وجود دارد. لطفاً وارد شوید.",
+      "auth/invalid-credential": "اطلاعات ورود نامعتبر است. لطفاً ایمیل و رمز عبور خود را بررسی کنید.",
+      "auth/invalid-email": "لطفاً یک آدرس ایمیل معتبر وارد کنید.",
+      "auth/network-request-failed": "خطای شبکه. لطفاً اتصال خود را بررسی کرده و دوباره تلاش کنید.",
+      "auth/operation-not-allowed": "این روش ورود در حال حاضر پشتیبانی نمی‌شود.",
+      "auth/popup-closed-by-user": "ورود لغو شد. لطفاً دوباره تلاش کنید.",
+      "auth/too-many-requests": "تعداد دفعات تلاش برای ورود بیش از حد مجاز است. لطفاً کمی صبر کنید و دوباره تلاش کنید.",
+      "auth/user-disabled": "این حساب غیرفعال شده است. لطفاً با پشتیبانی تماس بگیرید.",
+      "auth/user-not-found": "حسابی با این ایمیل یافت نشد. مایل به ایجاد حساب جدید هستید؟",
+      "auth/weak-password": "رمز عبور خیلی ضعیف است. لطفاً از رمز عبور قوی‌تر با حداقل ۶ کاراکتر استفاده کنید.",
+      "auth/wrong-password": "رمز عبور وارد شده نادرست است. لطفاً دوباره تلاش کنید."
+    },
+    "login": {
+      "andText": "و",
+      "backToLogin": "بازگشت به ورود",
+      "backToSocialLogin": "ثبت‌نام با Google یا Github",
+      "confirmPasswordLabel": "تأیید رمز عبور",
+      "confirmPasswordPlaceholder": "رمز عبور را مجدداً وارد کنید",
+      "didntReceiveEmail": "ایمیلی دریافت نکردید؟ با ما تماس بگیرید:",
+      "emailLabel": "ایمیل",
+      "emailPlaceholder": "ایمیل خود را وارد کنید",
+      "failed": "ورود ناموفق بود",
+      "forgotPassword": "رمز عبور را فراموش کرده‌اید؟",
+      "forgotPasswordError": "ارسال ایمیل بازیابی رمز عبور ناموفق بود",
+      "freeTierBadge": "واجد شرایط طرح رایگان",
+      "freeTierDescription": "با ثبت‌نام از طریق Google هر ماه {credits} اعتبار رایگان دریافت کنید. نیاز به کارت نیست.",
+      "freeTierDescriptionGeneric": "با ثبت‌نام از طریق Google هر ماه اعتبار رایگان دریافت کنید. نیاز به کارت نیست.",
+      "insecureContextWarning": "این اتصال ناامن است (HTTP) - در صورت ادامه ورود، اطلاعات شما ممکن است توسط مهاجمان رهگیری شود.",
+      "loginButton": "ورود",
+      "loginWithGithub": "ورود با Github",
+      "loginWithGoogle": "ورود با Google",
+      "newUser": "جدید هستید؟",
+      "noAssociatedUser": "هیچ کاربری از Comfy با کلید API ارائه‌شده مرتبط نیست",
+      "orContinueWith": "یا ادامه با",
+      "passwordLabel": "رمز عبور",
+      "passwordPlaceholder": "رمز عبور خود را وارد کنید",
+      "passwordResetError": "ارسال ایمیل بازیابی رمز عبور ناموفق بود. لطفاً دوباره تلاش کنید.",
+      "passwordResetInstructions": "ایمیل خود را وارد کنید تا لینک بازیابی رمز عبور برای شما ارسال شود.",
+      "passwordResetSent": "ایمیل بازیابی رمز عبور ارسال شد",
+      "passwordResetSentDetail": "لطفاً ایمیل خود را برای دریافت لینک بازیابی رمز عبور بررسی کنید.",
+      "privacyLink": "سیاست حفظ حریم خصوصی",
+      "questionsContactPrefix": "سؤالی دارید؟ با ما تماس بگیرید:",
+      "sendResetLink": "ارسال لینک بازیابی",
+      "signInOrSignUp": "ورود / ثبت‌نام",
+      "signUp": "ثبت‌نام",
+      "signUpFreeTierPromo": "جدید هستید؟ با {signUp} از طریق Google هر ماه {credits} اعتبار رایگان دریافت کنید.",
+      "success": "ورود موفقیت‌آمیز بود",
+      "termsLink": "شرایط استفاده",
+      "termsText": "با کلیک بر روی «بعدی» یا «ثبت‌نام»، شما با",
+      "title": "ورود به حساب کاربری",
+      "useApiKey": "کلید Comfy API",
+      "useEmailInstead": "استفاده از ایمیل به جای آن",
+      "userAvatar": "آواتار کاربر"
+    },
+    "loginButton": {
+      "tooltipHelp": "برای استفاده از «API Nodeها» وارد شوید",
+      "tooltipLearnMore": "بیشتر بدانید..."
+    },
+    "passwordUpdate": {
+      "success": "رمز عبور به‌روزرسانی شد",
+      "successDetail": "رمز عبور شما با موفقیت به‌روزرسانی شد"
+    },
+    "reauthRequired": {
+      "cancel": "انصراف",
+      "confirm": "ورود مجدد",
+      "message": "به دلایل امنیتی، این عملیات نیاز به ورود مجدد دارد. آیا مایل به ادامه هستید؟",
+      "title": "احراز هویت مجدد لازم است"
+    },
+    "signOut": {
+      "signOut": "خروج",
+      "success": "خروج با موفقیت انجام شد",
+      "successDetail": "شما با موفقیت از حساب کاربری خود خارج شدید.",
+      "unsavedChangesMessage": "شما تغییرات ذخیره‌نشده‌ای دارید که با خروج از حساب از بین خواهند رفت. آیا مایل به ادامه هستید؟",
+      "unsavedChangesTitle": "تغییرات ذخیره‌نشده"
+    },
+    "signup": {
+      "alreadyHaveAccount": "قبلاً حساب کاربری دارید؟",
+      "emailLabel": "ایمیل",
+      "emailNotEligibleForFreeTier": "ثبت‌نام با ایمیل شامل طرح رایگان نمی‌شود.",
+      "emailPlaceholder": "ایمیل خود را وارد کنید",
+      "passwordLabel": "رمز عبور",
+      "passwordPlaceholder": "رمز عبور جدید را وارد کنید",
+      "personalDataConsentLabel": "با پردازش داده‌های شخصی خود موافقم.",
+      "regionRestrictionChina": "مطابق با الزامات قانونی محلی، خدمات ما به طور موقت برای کاربران ساکن چین در دسترس نیست.",
+      "signIn": "ورود",
+      "signUpButton": "ثبت‌نام",
+      "signUpWithGithub": "ثبت‌نام با Github",
+      "signUpWithGoogle": "ثبت‌نام با Google",
+      "title": "ایجاد حساب کاربری"
+    }
+  },
+  "batch": {
+    "index": "{current} / {total}"
+  },
+  "billingOperation": {
+    "subscriptionFailed": "به‌روزرسانی اشتراک ناموفق بود",
+    "subscriptionProcessing": "در حال پردازش پرداخت — در حال راه‌اندازی فضای کاری...",
+    "subscriptionSuccess": "اشتراک با موفقیت به‌روزرسانی شد",
+    "subscriptionTimeout": "تأیید اشتراک زمان‌بر شد",
+    "topupFailed": "افزایش اعتبار ناموفق بود",
+    "topupProcessing": "در حال پردازش پرداخت — در حال افزودن اعتبار...",
+    "topupSuccess": "اعتبار با موفقیت افزوده شد",
+    "topupTimeout": "تأیید افزایش اعتبار زمان‌بر شد"
+  },
+  "boundingBox": {
+    "height": "ارتفاع",
+    "width": "عرض",
+    "x": "ایکس",
+    "y": "وای"
+  },
+  "breadcrumbsMenu": {
+    "clearWorkflow": "پاک‌سازی workflow",
+    "deleteBlueprint": "حذف blueprint",
+    "deleteWorkflow": "حذف workflow",
+    "duplicate": "تکرار",
+    "enterAppMode": "ورود به حالت اپلیکیشن",
+    "enterBuilderMode": "ورود به حالت سازنده اپلیکیشن",
+    "enterNewName": "نام جدید را وارد کنید",
+    "exitAppMode": "خروج از حالت اپلیکیشن",
+    "missingNodesWarning": "workflow شامل نودهای پشتیبانی‌نشده است (با رنگ قرمز مشخص شده‌اند).",
+    "workflowActions": "عملیات گردش‌کار"
+  },
+  "builderMenu": {
+    "exitAppBuilder": "خروج از سازنده برنامه"
+  },
+  "builderToolbar": {
+    "app": "اپلیکیشن",
+    "appDescription": "به طور پیش‌فرض به صورت اپلیکیشن باز می‌شود",
+    "arrange": "پیش‌نمایش",
+    "arrangeDescription": "بررسی چیدمان اپلیکیشن",
+    "connectOutput": "اتصال خروجی",
+    "connectOutputBody1": "اپلیکیشن شما باید حداقل یک خروجی متصل داشته باشد تا بتوان آن را ذخیره کرد.",
+    "connectOutputBody2": "به مرحله «انتخاب» بروید و روی nodeهای خروجی کلیک کنید تا اینجا اضافه شوند.",
+    "defaultModeAppliedAppBody": "این ورک‌فلو از این پس به طور پیش‌فرض در حالت اپلیکیشن باز خواهد شد.",
+    "defaultModeAppliedAppPrompt": "آیا مایل هستید اکنون آن را مشاهده کنید؟",
+    "defaultModeAppliedGraphBody": "این ورک‌فلو از این پس به طور پیش‌فرض به صورت گراف node باز خواهد شد.",
+    "defaultModeAppliedGraphPrompt": "آیا همچنان مایل به مشاهده اپلیکیشن هستید؟",
+    "defaultModeAppliedTitle": "با موفقیت تنظیم شد",
+    "defaultView": "تنظیم نمای پیش‌فرض",
+    "defaultViewDescription": "انتخاب نحوه باز شدن",
+    "defaultViewLabel": "به طور پیش‌فرض، این گردش‌کار به صورت زیر باز می‌شود:",
+    "defaultViewTitle": "تنظیم نمای پیش‌فرض برای این گردش‌کار",
+    "emptyWorkflowPrompt": "آیا می‌خواهید با یک قالب شروع کنید؟",
+    "emptyWorkflowTitle": "این ورک‌فلو هیچ node ندارد",
+    "inputs": "ورودی‌ها",
+    "inputsDescription": "انتخاب ورودی‌ها",
+    "label": "سازنده اپلیکیشن",
+    "nodeGraph": "گراف node",
+    "nodeGraphDescription": "به طور پیش‌فرض به صورت گراف node باز می‌شود",
+    "outputs": "خروجی‌ها",
+    "outputsDescription": "انتخاب خروجی‌ها",
+    "switchToOutputs": "رفتن به خروجی‌ها",
+    "viewApp": "مشاهده اپلیکیشن"
+  },
+  "clipboard": {
+    "errorMessage": "کپی به کلیپ‌بورد ناموفق بود",
+    "errorNotSupported": "Clipboard API در مرورگر شما پشتیبانی نمی‌شود",
+    "successMessage": "در کلیپ‌بورد کپی شد"
+  },
+  "cloudFooter_needHelp": "نیاز به کمک دارید؟",
+  "cloudForgotPassword_backToLogin": "بازگشت به ورود",
+  "cloudForgotPassword_didntReceiveEmail": "ایمیلی دریافت نکردید؟",
+  "cloudForgotPassword_emailLabel": "ایمیل",
+  "cloudForgotPassword_emailPlaceholder": "ایمیل خود را وارد کنید",
+  "cloudForgotPassword_emailRequired": "وارد کردن ایمیل الزامی است",
+  "cloudForgotPassword_instructions": "آدرس ایمیل خود را وارد کنید تا لینکی برای بازنشانی رمز عبور برای شما ارسال کنیم.",
+  "cloudForgotPassword_passwordResetError": "ارسال ایمیل بازنشانی رمز عبور ناموفق بود",
+  "cloudForgotPassword_passwordResetSent": "لینک بازنشانی رمز عبور ارسال شد",
+  "cloudForgotPassword_sendResetLink": "ارسال لینک بازنشانی",
+  "cloudForgotPassword_title": "فراموشی رمز عبور",
+  "cloudOnboarding": {
+    "authTimeout": {
+      "causes": [
+        "فایروال یا پراکسی سازمانی که سرویس‌های احراز هویت را مسدود می‌کند",
+        "محدودیت‌های VPN یا شبکه",
+        "افزونه‌های مرورگر که در درخواست‌ها اختلال ایجاد می‌کنند",
+        "محدودیت‌های منطقه‌ای شبکه",
+        "استفاده از مرورگر یا شبکه دیگر را امتحان کنید"
+      ],
+      "helpText": "نیاز به راهنمایی دارید؟ تماس با",
+      "message": "در اتصال به ComfyUI Cloud با مشکل مواجه شدیم. این مشکل ممکن است به دلیل کندی اتصال یا اختلال موقت سرویس باشد.",
+      "restart": "خروج و تلاش مجدد",
+      "supportLink": "پشتیبانی",
+      "technicalDetails": "جزئیات فنی",
+      "title": "اتصال بیش از حد طول کشید",
+      "troubleshooting": "دلایل رایج:"
+    },
+    "checkingStatus": "در حال بررسی وضعیت حساب شما...",
+    "forgotPassword": {
+      "backToLogin": "بازگشت به ورود",
+      "didntReceiveEmail": "ایمیلی دریافت نکردید؟ با ما تماس بگیرید:",
+      "emailLabel": "ایمیل",
+      "emailPlaceholder": "ایمیل خود را وارد کنید",
+      "emailRequired": "وارد کردن ایمیل الزامی است",
+      "instructions": "آدرس ایمیل خود را وارد کنید تا لینک بازنشانی رمز عبور برای شما ارسال شود.",
+      "passwordResetError": "ارسال ایمیل بازنشانی رمز عبور ناموفق بود. لطفاً دوباره تلاش کنید.",
+      "passwordResetSent": "ایمیل بازنشانی رمز عبور ارسال شد",
+      "sendResetLink": "ارسال لینک بازنشانی",
+      "title": "فراموشی رمز عبور"
+    },
+    "privateBeta": {
+      "desc": "برای پیوستن به لیست انتظار وارد شوید. زمانی که نوبت شما شد به شما اطلاع خواهیم داد. قبلاً اطلاع داده شده‌اید؟ وارد شوید و از Cloud استفاده کنید.",
+      "title": "کلود در حال حاضر در نسخه بتای خصوصی است"
+    },
+    "retry": "تلاش دوباره",
+    "retrying": "در حال تلاش مجدد...",
+    "skipToCloudApp": "رفتن به برنامه ابری",
+    "start": {
+      "desc": "بدون نیاز به تنظیمات اولیه. روی هر دستگاهی کار می‌کند.",
+      "download": "دانلود ComfyUI",
+      "explain": "چندین خروجی را به طور همزمان تولید کنید. گردش‌کارها را به راحتی به اشتراک بگذارید.",
+      "learnAboutButton": "درباره Cloud بیشتر بدانید",
+      "title": "در چند ثانیه شروع به خلق کنید",
+      "wantToRun": "می‌خواهید ComfyUI را به صورت محلی اجرا کنید؟"
+    },
+    "survey": {
+      "options": {
+        "familiarity": {
+          "advanced": "کاربر پیشرفته (جریان‌کارهای سفارشی)",
+          "basics": "آشنایی با مبانی",
+          "expert": "کاربر خبره (به دیگران کمک می‌کنم)",
+          "new": "جدید در ComfyUI (تا کنون استفاده نکرده‌ام)",
+          "starting": "تازه شروع کرده‌ام (در حال دنبال کردن آموزش‌ها)"
+        },
+        "industry": {
+          "architecture": "معماری",
+          "education": "آموزش",
+          "film_tv_animation": "فیلم، تلویزیون و انیمیشن",
+          "fine_art": "هنرهای زیبا و تصویرسازی",
+          "gaming": "بازی‌سازی",
+          "marketing": "بازاریابی و تبلیغات",
+          "other": "سایر",
+          "otherPlaceholder": "لطفاً مشخص کنید",
+          "product_design": "طراحی محصول و گرافیک",
+          "software": "نرم‌افزار و فناوری"
+        },
+        "making": {
+          "3d": "دارایی‌های سه‌بعدی",
+          "audio": "صدا / موسیقی",
+          "custom_nodes": "nodeها و workflowهای سفارشی",
+          "images": "تصاویر",
+          "video": "ویدیو و انیمیشن"
+        },
+        "purpose": {
+          "client": "کار برای مشتری (فریلنس)",
+          "community": "مشارکت در جامعه (nodeها، workflowها و غیره)",
+          "inhouse": "محل کار خودم (درون‌سازمانی)",
+          "personal": "پروژه‌های شخصی / سرگرمی",
+          "research": "پژوهش دانشگاهی"
+        }
+      },
+      "placeholder": "جای‌نگهدار سوالات نظرسنجی",
+      "questions": {
+        "familiarity": "تا چه حد با ComfyUI آشنایی دارید؟",
+        "industry": "صنعت اصلی شما چیست؟",
+        "making": "قصد دارید چه چیزی بسازید؟",
+        "purpose": "هدف اصلی شما از استفاده از ComfyUI چیست؟"
+      },
+      "steps": {
+        "familiarity": "تا چه حد با ComfyUI آشنایی دارید؟",
+        "industry": "صنعت اصلی شما چیست؟",
+        "making": "قصد دارید چه چیزی بسازید؟",
+        "purpose": "هدف اصلی شما از استفاده از ComfyUI چیست؟"
+      },
+      "title": "نظرسنجی ابری"
+    }
+  },
+  "cloudPrivateBeta_desc": "برای پیوستن به لیست انتظار وارد شوید. زمانی که نوبت شما شد به شما اطلاع خواهیم داد. قبلاً اطلاع‌رسانی شده‌اید؟ وارد شوید و استفاده از کلود را آغاز کنید.",
+  "cloudPrivateBeta_title": "کلود در حال حاضر در نسخه بتای خصوصی است",
+  "cloudSorryContactSupport_title": "متاسفیم، با پشتیبانی تماس بگیرید",
+  "cloudStart_desc": "بدون نیاز به تنظیمات. روی هر دستگاهی کار می‌کند.",
+  "cloudStart_download": "دانلود ComfyUI",
+  "cloudStart_explain": "چندین خروجی را همزمان تولید کنید. workflowها را به راحتی به اشتراک بگذارید.",
+  "cloudStart_learnAboutButton": "درباره Cloud بیشتر بدانید",
+  "cloudStart_title": "در چند ثانیه شروع به خلق کنید",
+  "cloudStart_wantToRun": "مایلید ComfyUI را به صورت محلی اجرا کنید؟",
+  "cloudSurvey_steps_familiarity": "تا چه اندازه با ComfyUI آشنایی دارید؟",
+  "cloudSurvey_steps_industry": "صنعت اصلی شما چیست؟",
+  "cloudSurvey_steps_making": "برنامه دارید چه چیزی بسازید؟",
+  "cloudSurvey_steps_purpose": "عمدتاً قصد دارید از ComfyUI برای چه کاری استفاده کنید؟",
+  "cloudWaitlist_contactLink": "اینجا",
+  "cloudWaitlist_questionsText": "سؤالی دارید؟ با ما تماس بگیرید",
+  "color": {
+    "black": "مشکی",
+    "blue": "آبی",
+    "brown": "قهوه‌ای",
+    "custom": "سفارشی",
+    "cyan": "فیروزه‌ای",
+    "default": "پیش‌فرض",
+    "green": "سبز",
+    "noColor": "بدون رنگ",
+    "pale_blue": "آبی کم‌رنگ",
+    "pink": "صورتی",
+    "purple": "بنفش",
+    "red": "قرمز",
+    "yellow": "زرد"
+  },
+  "commands": {
+    "clear": "پاک‌سازی workflow",
+    "clipspace": "باز کردن Clipspace",
+    "dark": "تاریک",
+    "execute": "اجرا",
+    "help": "راهنما",
+    "interrupt": "لغو اجرای فعلی",
+    "light": "روشن",
+    "manageExtensions": "مدیریت افزونه‌ها",
+    "queue": "پنل صف",
+    "refresh": "به‌روزرسانی تعاریف node",
+    "resetView": "بازنشانی نمای canvas",
+    "run": "اجرا",
+    "runWorkflow": "اجرای workflow",
+    "runWorkflowFront": "اجرای workflow (صف در ابتدا)",
+    "settings": "تنظیمات",
+    "theme": "پوسته",
+    "toggleBottomPanel": "نمایش/مخفی‌سازی پنل پایین"
+  },
+  "contextMenu": {
+    "Add Group": "افزودن گروه",
+    "Add Group For Selected Nodes": "افزودن گروه برای Nodeهای انتخاب‌شده",
+    "Add Node": "افزودن Node",
+    "Add Subgraph to Library": "افزودن Subgraph به کتابخانه",
+    "Adjust Size": "تنظیم اندازه",
+    "Align Selected To": "تراز کردن انتخاب‌شده با",
+    "Bottom": "پایین",
+    "Bypass": "عبور",
+    "Clone": "شبیه‌سازی",
+    "Collapse": "جمع کردن",
+    "Color": "رنگ",
+    "Colors": "رنگ‌ها",
+    "Convert to Group Node": "تبدیل به Group Node",
+    "Convert to Subgraph": "تبدیل به Subgraph",
+    "Copy": "کپی",
+    "Copy (Clipspace)": "کپی (Clipspace)",
+    "Copy Image": "کپی تصویر",
+    "Delete": "حذف",
+    "Distribute Nodes": "توزیع Nodeها",
+    "Duplicate": "تکرار",
+    "Edit Subgraph Widgets": "ویرایش ویجت‌های Subgraph",
+    "Expand": "باز کردن",
+    "Expand Node": "بزرگ‌نمایی Node",
+    "Extensions": "افزونه‌ها",
+    "FavoriteWidget": "افزودن به علاقه‌مندی‌ها",
+    "Horizontal": "افقی",
+    "Inputs": "ورودی‌ها",
+    "Left": "چپ",
+    "Manage": "مدیریت",
+    "Manage Group Nodes": "مدیریت Group Nodeها",
+    "Minimize Node": "کوچک‌سازی Node",
+    "Mode": "حالت",
+    "Node Info": "اطلاعات Node",
+    "Node Templates": "قالب‌های Node",
+    "Open Image": "باز کردن تصویر",
+    "Open in Mask Editor": "باز کردن در Mask Editor",
+    "Outputs": "خروجی‌ها",
+    "Paste": "چسباندن",
+    "Pin": "سنجاق کردن",
+    "Properties": "ویژگی‌ها",
+    "Properties Panel": "پنل ویژگی‌ها",
+    "Remove": "حذف",
+    "Remove Bypass": "حذف عبور",
+    "Rename": "تغییر نام",
+    "RenameWidget": "تغییر نام ویجت",
+    "Resize": "تغییر اندازه",
+    "Right": "راست",
+    "Run Branch": "اجرای شاخه",
+    "Save Image": "ذخیره تصویر",
+    "Save Selected as Template": "ذخیره انتخاب‌شده به عنوان قالب",
+    "Search": "جستجو",
+    "Shape": "شکل",
+    "Shapes": "اشکال",
+    "Title": "عنوان",
+    "Top": "بالا",
+    "UnfavoriteWidget": "حذف از علاقه‌مندی‌ها",
+    "Unpack Subgraph": "باز کردن Subgraph",
+    "Unpin": "برداشتن سنجاق",
+    "Vertical": "عمودی",
+    "deprecated": "منسوخ",
+    "new": "جدید"
+  },
+  "credits": {
+    "accountInitialized": "حساب کاربری فعال شد",
+    "activity": "فعالیت",
+    "added": "افزوده شد",
+    "additionalInfo": "اطلاعات تکمیلی",
+    "apiPricing": "قیمت‌گذاری API",
+    "credits": "اعتبار",
+    "creditsAvailable": "اعتبار موجود",
+    "details": "جزئیات",
+    "eventType": "نوع رویداد",
+    "faqs": "سؤالات متداول",
+    "invoiceHistory": "تاریخچه فاکتورها",
+    "lastUpdated": "آخرین به‌روزرسانی",
+    "messageSupport": "پشتیبانی پیامکی",
+    "model": "مدل",
+    "purchaseCredits": "خرید اعتبار",
+    "refreshes": "به‌روزرسانی {date}",
+    "time": "زمان",
+    "topUp": {
+      "addMoreCredits": "افزودن اعتبار بیشتر",
+      "addMoreCreditsToRun": "برای اجرا اعتبار بیشتری اضافه کنید",
+      "amountToPayLabel": "مبلغ پرداختی به دلار",
+      "buy": "خرید",
+      "buyCredits": "ادامه به پرداخت",
+      "buyNow": "هم‌اکنون خرید کنید",
+      "contactUs": "با ما تماس بگیرید",
+      "creditsDescription": "اعتبارها برای اجرای workflow یا nodeهای شریک استفاده می‌شوند.",
+      "creditsPerDollar": "اعتبار به ازای هر دلار",
+      "creditsToReceiveLabel": "اعتبار دریافتی",
+      "howManyCredits": "چه تعداد اعتبار می‌خواهید اضافه کنید؟",
+      "insufficientMessage": "شما اعتبار کافی برای اجرای این workflow ندارید.",
+      "insufficientTitle": "اعتبار کافی نیست",
+      "insufficientWorkflowMessage": "شما اعتبار کافی برای اجرای این workflow ندارید.",
+      "maxAllowed": "حداکثر {credits} اعتبار.",
+      "maxAmount": "(حداکثر ۱٬۰۰۰ دلار آمریکا)",
+      "maximumAmount": "حداکثر {amount}",
+      "minRequired": "حداقل {credits} اعتبار",
+      "minimumPurchase": "حداقل {amount} ({credits} اعتبار)",
+      "needMore": "بیشتر نیاز دارید؟",
+      "purchaseError": "خرید ناموفق بود",
+      "purchaseErrorDetail": "خرید اعتبار ناموفق بود: {error}",
+      "purchaseSuccess": "اعتبار با موفقیت افزوده شد!",
+      "quickPurchase": "خرید سریع",
+      "seeDetails": "مشاهده جزئیات",
+      "selectAmount": "انتخاب مبلغ",
+      "templateNote": "*تولید شده با قالب Wan Fun Control",
+      "topUp": "افزایش اعتبار",
+      "unknownError": "خطای ناشناخته رخ داد",
+      "usdAmount": "{amount} دلار",
+      "videosEstimate": "~{count} ویدیو*",
+      "viewPricing": "مشاهده جزئیات قیمت‌گذاری",
+      "youGet": "اعتبار",
+      "youPay": "مبلغ (دلار آمریکا)"
+    },
+    "unified": {
+      "message": "اعتبارها یکپارچه شدند",
+      "tooltip": "پرداخت‌ها در Comfy یکپارچه شده‌اند. اکنون همه چیز با اعتبار Comfy انجام می‌شود:\n- nodeهای شریک (قبلاً nodeهای API)\n- workflowهای ابری\n\nموجودی nodeهای شریک شما به اعتبار تبدیل شده است."
+    },
+    "yourCreditBalance": "موجودی اعتبار شما"
+  },
+  "dataTypes": {
+    "*": "*",
+    "AUDIO": "صوت",
+    "AUDIO_ENCODER": "رمزگذار صوت",
+    "AUDIO_ENCODER_OUTPUT": "خروجی رمزگذار صوت",
+    "AUDIO_RECORD": "ضبط صوت",
+    "BOOLEAN": "بولی",
+    "BOUNDING_BOX": "BOUNDING_BOX",
+    "CAMERA_CONTROL": "کنترل دوربین",
+    "CLIP": "clip",
+    "CLIP_VISION": "بینایی clip",
+    "CLIP_VISION_OUTPUT": "خروجی بینایی clip",
+    "COLOR": "رنگ",
+    "COMBO": "ترکیبی",
+    "COMFY_AUTOGROW_V3": "Comfy AutoGrow V3",
+    "COMFY_DYNAMICCOMBO_V3": "Comfy DynamicCombo V3",
+    "COMFY_MATCHTYPE_V3": "Comfy MatchType V3",
+    "CONDITIONING": "شرط‌گذاری",
+    "CONTROL_NET": "controlnet",
+    "ELEVENLABS_VOICE": "ELEVENLABS_VOICE",
+    "FILE_3D": "FILE_3D",
+    "FILE_3D_FBX": "FILE_3D_FBX",
+    "FILE_3D_GLB": "FILE_3D_GLB",
+    "FILE_3D_GLTF": "FILE_3D_GLTF",
+    "FILE_3D_OBJ": "FILE_3D_OBJ",
+    "FILE_3D_STL": "FILE_3D_STL",
+    "FILE_3D_USDZ": "FILE_3D_USDZ",
+    "FLOAT": "عدد اعشاری",
+    "FLOATS": "اعداد اعشاری",
+    "GEMINI_INPUT_FILES": "فایل‌های ورودی Gemini",
+    "GLIGEN": "GLIGEN",
+    "GUIDER": "راهنما",
+    "HOOKS": "hookها",
+    "HOOK_KEYFRAMES": "کلیدفریم‌های hook",
+    "IMAGE": "تصویر",
+    "IMAGECOMPARE": "مقایسه تصویر",
+    "INT": "عدد صحیح",
+    "LATENT": "latent",
+    "LATENT_OPERATION": "عملیات latent",
+    "LATENT_UPSCALE_MODEL": "مدل بزرگ‌نمایی latent",
+    "LOAD3D_CAMERA": "دوربین بارگذاری سه‌بعدی",
+    "LOAD_3D": "بارگذاری سه‌بعدی",
+    "LORA_MODEL": "مدل lora",
+    "LOSS_MAP": "نقشه خطا",
+    "LUMA_CONCEPTS": "مفاهیم Luma",
+    "LUMA_REF": "مرجع Luma",
+    "MASK": "ماسک",
+    "MESH": "مش",
+    "MESHY_RIGGED_TASK_ID": "MESHY_RIGGED_TASK_ID",
+    "MESHY_TASK_ID": "MESHY_TASK_ID",
+    "MODEL": "مدل",
+    "MODEL_PATCH": "وصله مدل",
+    "MODEL_TASK_ID": "شناسه وظیفه مدل",
+    "NOISE": "نویز",
+    "OPENAI_CHAT_CONFIG": "پیکربندی گفتگوی OpenAI",
+    "OPENAI_INPUT_FILES": "فایل‌های ورودی OpenAI",
+    "PHOTOMAKER": "photomaker",
+    "PIXVERSE_TEMPLATE": "قالب Pixverse",
+    "POSE_KEYPOINT": "POSE_KEYPOINT",
+    "RECRAFT_COLOR": "رنگ Recraft",
+    "RECRAFT_CONTROLS": "کنترل‌های Recraft",
+    "RECRAFT_V3_STYLE": "سبک Recraft V3",
+    "RETARGET_TASK_ID": "شناسه وظیفه Retarget",
+    "RIG_TASK_ID": "شناسه وظیفه Rig",
+    "SAMPLER": "نمونه‌گیر",
+    "SIGMAS": "سیگماها",
+    "STRING": "رشته",
+    "STYLE_MODEL": "مدل سبک",
+    "SVG": "SVG",
+    "TIMESTEPS_RANGE": "بازه گام‌های زمانی",
+    "TRACKS": "ترک‌ها",
+    "UPSCALE_MODEL": "مدل بزرگ‌نمایی",
+    "VAE": "vae",
+    "VIDEO": "ویدیو",
+    "VOXEL": "وُکسل",
+    "WAN_CAMERA_EMBEDDING": "جاسازی دوربین WAN",
+    "WEBCAM": "وب‌کم"
+  },
+  "desktopDialogs": {
+    "": {
+      "buttons": {
+        "Close": "بستن"
+      },
+      "message": "شناسه گفت‌وگوی نامعتبری ارائه شده است.",
+      "title": "گفت‌وگوی نامعتبر"
+    }
+  },
+  "desktopMenu": {
+    "confirmQuit": "جریان‌های کاری ذخیره‌نشده باز هستند؛ هرگونه تغییر ذخیره‌نشده از بین خواهد رفت. آیا می‌خواهید بدون توجه به این موضوع خارج شوید؟",
+    "confirmReinstall": "این کار فایل extra_models_config.yaml شما را پاک می‌کند\nو نصب را دوباره آغاز می‌کند.\n\nآیا مطمئن هستید؟",
+    "quit": "خروج",
+    "reinstall": "نصب مجدد"
+  },
+  "desktopStart": {
+    "initialising": "در حال راه‌اندازی..."
+  },
+  "desktopUpdate": {
+    "description": "ComfyUI Desktop در حال نصب وابستگی‌های جدید است. این فرایند ممکن است چند دقیقه طول بکشد.",
+    "errorCheckingUpdate": "خطا در بررسی به‌روزرسانی‌ها",
+    "errorInstallingUpdate": "خطا در نصب به‌روزرسانی",
+    "noUpdateFound": "هیچ به‌روزرسانی یافت نشد",
+    "terminalDefaultMessage": "هر خروجی کنسول از به‌روزرسانی در اینجا نمایش داده می‌شود.",
+    "title": "در حال به‌روزرسانی ComfyUI Desktop",
+    "updateAvailableMessage": "یک به‌روزرسانی موجود است. آیا می‌خواهید اکنون راه‌اندازی مجدد و به‌روزرسانی کنید؟",
+    "updateFoundTitle": "به‌روزرسانی یافت شد (نسخه {version})"
+  },
+  "downloadGit": {
+    "gitWebsite": "دانلود git",
+    "instructions": "لطفاً آخرین نسخه مناسب با سیستم‌عامل خود را دانلود و نصب کنید. دکمه دانلود git در زیر، صفحه دانلود سایت git-scm.com را باز می‌کند.",
+    "message": "امکان یافتن git وجود ندارد. یک نسخه فعال از git برای عملکرد عادی مورد نیاز است.",
+    "skip": "رد کردن",
+    "title": "دانلود git",
+    "warning": "اگر مطمئن هستید که به نصب git نیازی ندارید یا اشتباهی رخ داده است، می‌توانید روی رد کردن کلیک کنید تا این بررسی نادیده گرفته شود. اجرای ComfyUI بدون نسخه فعال git در حال حاضر پشتیبانی نمی‌شود."
+  },
+  "electronFileDownload": {
+    "cancel": "لغو دانلود",
+    "cancelled": "لغو شد",
+    "inProgress": "در حال انجام",
+    "pause": "توقف دانلود",
+    "paused": "متوقف شده",
+    "resume": "ادامه دانلود"
+  },
+  "errorDialog": {
+    "defaultTitle": "خطایی رخ داد",
+    "extensionFileHint": "این ممکن است به دلیل اسکریپت زیر باشد",
+    "loadWorkflowTitle": "بارگذاری به دلیل خطا در بارگذاری مجدد داده‌های workflow متوقف شد",
+    "noStackTrace": "هیچ stacktraceی موجود نیست",
+    "promptExecutionError": "اجرای prompt با شکست مواجه شد"
+  },
+  "errorOverlay": {
+    "errorCount": "{count} خطا",
+    "seeErrors": "مشاهده خطاها"
+  },
+  "essentials": {
+    "batchImage": "پردازش دسته‌ای تصویر",
+    "canny": "لبه‌یابی Canny",
+    "cannyToImage": "تبدیل Canny به تصویر",
+    "cannyToVideo": "تبدیل Canny به ویدیو",
+    "cropImage": "برش تصویر",
+    "depthToImage": "تبدیل عمق به تصویر",
+    "depthToVideo": "تبدیل عمق به ویدیو",
+    "extractFrame": "استخراج فریم",
+    "imageCompare": "مقایسه تصویر",
+    "imageTo3DModel": "تبدیل تصویر به مدل سه‌بعدی",
+    "imageToImage": "تبدیل تصویر به تصویر",
+    "imageToVideo": "تبدیل تصویر به ویدیو",
+    "inpaintImage": "بازسازی تصویر (Inpaint)",
+    "invert": "معکوس",
+    "lipsync": "همگام‌سازی لب",
+    "load3DModel": "بارگذاری مدل سه‌بعدی",
+    "loadAudio": "بارگذاری صوت",
+    "loadImage": "بارگذاری تصویر",
+    "loadStyleLora": "بارگذاری سبک (LoRA)",
+    "loadVideo": "بارگذاری ویدیو",
+    "musicGeneration": "تولید موسیقی",
+    "outpaintImage": "گسترش تصویر (Outpaint)",
+    "poseToImage": "تبدیل ژست به تصویر",
+    "poseToVideo": "تبدیل ژست به ویدیو",
+    "removeBackground": "حذف پس‌زمینه",
+    "resizeImage": "تغییر اندازه تصویر",
+    "rotate": "چرخش",
+    "save3DModel": "ذخیره مدل سه‌بعدی",
+    "saveAudio": "ذخیره صوت",
+    "saveImage": "ذخیره تصویر",
+    "saveVideo": "ذخیره ویدیو",
+    "text": "متن",
+    "textGenerationLLM": "تولید متن (LLM)",
+    "textTo3DModel": "تبدیل متن به مدل سه‌بعدی",
+    "textToImage": "تبدیل متن به تصویر",
+    "textToVideo": "تبدیل متن به ویدیو"
+  },
+  "exportToast": {
+    "allExportsCompleted": "همه خروجی‌ها تکمیل شد",
+    "downloadExport": "دانلود خروجی",
+    "downloadFailed": "دانلود \"{name}\" ناموفق بود",
+    "exportCompleted": "دانلود ZIP آماده است",
+    "exportError": "خروجی‌گیری ناموفق بود",
+    "exportFailed": "{count} خروجی ناموفق بود",
+    "exportFailedSingle": "ایجاد خروجی ZIP ناموفق بود",
+    "exportStarted": "در حال آماده‌سازی دانلود ZIP...",
+    "exportingAssets": "در حال خروجی گرفتن دارایی‌ها",
+    "noExportsInQueue": "هیچ خروجی {filter} در صف نیست",
+    "preparingExport": "در حال آماده‌سازی خروجی...",
+    "retryDownload": "تلاش مجدد برای دانلود"
+  },
+  "g": {
+    "1x": "۱x",
+    "2x": "۲x",
+    "about": "درباره",
+    "add": "افزودن",
+    "addNode": "افزودن node...",
+    "addNodeFilterCondition": "افزودن شرط فیلتر node",
+    "all": "همه",
+    "amount": "مقدار",
+    "apply": "اعمال",
+    "architecture": "معماری",
+    "asset": "{count} دارایی | {count} دارایی | {count} دارایی",
+    "audioFailedToLoad": "بارگذاری صوت ناموفق بود",
+    "audioProgress": "پیشرفت صوت",
+    "author": "نویسنده",
+    "back": "بازگشت",
+    "batchRename": "تغییر نام گروهی",
+    "beta": "آزمایشی",
+    "bookmark": "ذخیره در کتابخانه",
+    "calculatingDimensions": "در حال محاسبه ابعاد",
+    "cancel": "لغو",
+    "cancelled": "لغو شده",
+    "capture": "گرفتن",
+    "category": "دسته‌بندی",
+    "chart": "نمودار",
+    "chartLowercase": "نمودار",
+    "choose_file_to_upload": "انتخاب فایل برای بارگذاری",
+    "clear": "پاک‌سازی",
+    "clearAll": "پاک‌سازی همه",
+    "clearFilters": "پاک‌سازی فیلترها",
+    "close": "بستن",
+    "closeDialog": "بستن پنجره",
+    "collapseAll": "بستن همه",
+    "color": "رنگ",
+    "comfy": "Comfy",
+    "comfyOrgLogoAlt": "لوگوی ComfyOrg",
+    "comingSoon": "به‌زودی",
+    "command": "دستور",
+    "commandProhibited": "دستور {command} مجاز نیست. برای اطلاعات بیشتر با مدیر تماس بگیرید.",
+    "community": "انجمن",
+    "completed": "تکمیل شده",
+    "completedWithCheckmark": "تکمیل شد ✓",
+    "confirm": "تأیید",
+    "confirmed": "تأیید شد",
+    "content": "محتوا",
+    "continue": "ادامه",
+    "control_after_generate": "کنترل پس از تولید",
+    "control_before_generate": "کنترل پیش از تولید",
+    "copied": "کپی شد",
+    "copy": "کپی",
+    "copyAll": "کپی همه",
+    "copyJobId": "کپی شناسه وظیفه",
+    "copyToClipboard": "کپی در کلیپ‌بورد",
+    "copyURL": "کپی آدرس",
+    "core": "هسته",
+    "currentUser": "کاربر فعلی",
+    "custom": "سفارشی",
+    "customBackground": "پس‌زمینه سفارشی",
+    "customize": "سفارشی‌سازی",
+    "customizeFolder": "سفارشی‌سازی پوشه",
+    "decrement": "کاهش",
+    "defaultBanner": "بنر پیش‌فرض",
+    "delete": "حذف",
+    "deleteAudioFile": "حذف فایل صوتی",
+    "deleteImage": "حذف تصویر",
+    "deprecated": "منسوخ",
+    "description": "توضیحات",
+    "devOnly": "فقط برای توسعه‌دهندگان",
+    "devices": "دستگاه‌ها",
+    "disableAll": "غیرفعال‌سازی همه",
+    "disableSelected": "غیرفعال‌سازی انتخاب‌شده‌ها",
+    "disableThirdParty": "غیرفعال‌سازی شخص ثالث",
+    "disabling": "در حال غیرفعال‌سازی {id}",
+    "disconnectedFromBackend": "ارتباط با بک‌اند قطع شد. لطفاً بررسی کنید که سرور در حال اجرا باشد.",
+    "dismiss": "رد کردن",
+    "download": "دانلود",
+    "downloadAudio": "دانلود صوت",
+    "downloadImage": "دانلود تصویر",
+    "downloadVideo": "دانلود ویدیو",
+    "downloadWithSize": "دانلود ({size})",
+    "downloading": "در حال دانلود",
+    "dropYourFileOr": "فایل خود را رها کنید یا",
+    "duplicate": "تکراری",
+    "edit": "ویرایش",
+    "editImage": "ویرایش تصویر",
+    "editOrMaskImage": "ویرایش یا mask تصویر",
+    "emDash": "—",
+    "empty": "خالی",
+    "enableAll": "فعال‌سازی همه",
+    "enableOrDisablePack": "فعال یا غیرفعال کردن بسته",
+    "enableSelected": "فعال‌سازی انتخاب‌شده‌ها",
+    "enabled": "فعال",
+    "enabling": "در حال فعال‌سازی {id}",
+    "enter": "ورود",
+    "enterBaseName": "نام پایه را وارد کنید",
+    "enterNewName": "نام جدید را وارد کنید",
+    "enterNewNamePrompt": "نام جدید را وارد کنید:",
+    "enterSubgraph": "ورود به زیرگراف",
+    "error": "خطا",
+    "errorLoadingImage": "خطا در بارگذاری تصویر",
+    "errorLoadingVideo": "خطا در بارگذاری ویدیو",
+    "essentials": "ضروریات",
+    "expandAll": "باز کردن همه",
+    "experimental": "آزمایشی",
+    "export": "خروجی گرفتن",
+    "extensionName": "نام افزونه",
+    "extensions": "افزونه‌ها",
+    "failed": "ناموفق",
+    "failedToCopyJobId": "کپی شناسه وظیفه ناموفق بود",
+    "failedToDownloadImage": "دانلود تصویر ناموفق بود",
+    "failedToDownloadVideo": "دانلود ویدیو ناموفق بود",
+    "favorites": "علاقه‌مندی‌ها",
+    "feedback": "بازخورد",
+    "file": "فایل",
+    "filter": "فیلتر",
+    "filterBy": "فیلتر بر اساس:",
+    "filterByType": "فیلتر بر اساس {type}...",
+    "findIssues": "یافتن مشکلات",
+    "frameNodes": "قاب‌بندی nodeها",
+    "frontendNewer": "نسخه فرانت‌اند {frontendVersion} ممکن است با نسخه بک‌اند {backendVersion} ناسازگار باشد.",
+    "frontendOutdated": "نسخه فرانت‌اند {frontendVersion} قدیمی است. بک‌اند به نسخه {requiredVersion} یا بالاتر نیاز دارد.",
+    "galleryImage": "تصویر گالری",
+    "galleryThumbnail": "تصویر بندانگشتی گالری",
+    "goToNode": "رفتن به node",
+    "graphNavigation": "ناوبری گراف",
+    "halfSpeed": "۰.۵x",
+    "hideLeftPanel": "پنهان کردن پنل چپ",
+    "hideRightPanel": "پنهان کردن پنل راست",
+    "icon": "آیکون",
+    "imageDoesNotExist": "تصویر وجود ندارد",
+    "imageFailedToLoad": "بارگذاری تصویر ناموفق بود",
+    "imagePreview": "پیش‌نمایش تصویر - برای جابجایی بین تصاویر از کلیدهای جهت‌دار استفاده کنید",
+    "imageUrl": "آدرس تصویر",
+    "import": "وارد کردن",
+    "inProgress": "در حال انجام",
+    "inSubgraph": "در زیرگراف «{name}»",
+    "increment": "افزایش",
+    "info": "اطلاعات node",
+    "input": "ورودی",
+    "insert": "درج",
+    "install": "نصب",
+    "installed": "نصب شده",
+    "installing": "در حال نصب",
+    "interrupted": "متوقف شده",
+    "itemSelected": "{selectedCount} مورد انتخاب شد",
+    "itemsCopiedToClipboard": "موارد در کلیپ‌بورد کپی شدند",
+    "itemsSelected": "{selectedCount} مورد انتخاب شدند",
+    "job": "وظیفه",
+    "jobIdCopied": "شناسه وظیفه در کلیپ‌بورد کپی شد",
+    "keybinding": "کلید میانبر",
+    "keybindingAlreadyExists": "کلید میانبر قبلاً وجود دارد در",
+    "keybindings": "کلیدهای میانبر",
+    "learnMore": "اطلاعات بیشتر",
+    "listening": "در حال گوش دادن...",
+    "liveSamplingPreview": "پیش‌نمایش زنده نمونه‌گیری",
+    "loadAllFolders": "بارگذاری همه پوشه‌ها",
+    "loadWorkflow": "بارگذاری workflow",
+    "loading": "در حال بارگذاری",
+    "loadingPanel": "در حال بارگذاری پنل {panel}...",
+    "login": "ورود",
+    "logoAlt": "لوگوی ComfyUI",
+    "logs": "گزارش‌ها",
+    "manageExtensions": "مدیریت افزونه‌ها",
+    "markdown": "markdown",
+    "micPermissionDenied": "دسترسی میکروفون رد شد",
+    "migrate": "مهاجرت",
+    "missing": "ناقص",
+    "more": "بیشتر",
+    "moreOptions": "گزینه‌های بیشتر",
+    "moreWorkflows": "workflowهای بیشتر",
+    "mostRelevant": "مرتبط‌ترین",
+    "multiSelectDropdown": "لیست کشویی چندانتخابی",
+    "name": "نام",
+    "newFolder": "پوشه جدید",
+    "next": "بعدی",
+    "nightly": "نسخه شبانه",
+    "no": "خیر",
+    "noAudioRecorded": "هیچ صدایی ضبط نشد",
+    "noItems": "هیچ موردی وجود ندارد",
+    "noResults": "بدون نتیجه",
+    "noResultsFound": "نتیجه‌ای یافت نشد",
+    "noTasksFound": "هیچ وظیفه‌ای یافت نشد",
+    "noTasksFoundMessage": "هیچ وظیفه‌ای در صف وجود ندارد.",
+    "noWorkflowsFound": "هیچ workflowی یافت نشد.",
+    "nodeContentError": "خطا در محتوای node",
+    "nodeHeaderError": "خطا در سربرگ node",
+    "nodeRenderError": "خطا در رندر node",
+    "nodeSlotsError": "خطا در slotهای node",
+    "nodeWidgetsError": "خطا در ابزارک‌های node",
+    "nodes": "nodeها",
+    "nodesCount": "{count} نود | {count} نود | {count} نود",
+    "nodesRunning": "nodeها در حال اجرا هستند",
+    "none": "هیچ‌کدام",
+    "nothingToCopy": "موردی برای کپی وجود ندارد",
+    "nothingToDelete": "موردی برای حذف وجود ندارد",
+    "nothingToDuplicate": "موردی برای تکرار وجود ندارد",
+    "nothingToRename": "موردی برای تغییر نام وجود ندارد",
+    "ok": "تأیید",
+    "openManager": "باز کردن مدیریت",
+    "openNewIssue": "ایجاد گزارش جدید",
+    "or": "یا",
+    "output": "خروجی",
+    "overwrite": "جایگزینی",
+    "partner": "همکار",
+    "playPause": "پخش/توقف",
+    "playRecording": "پخش ضبط",
+    "playbackSpeed": "سرعت پخش",
+    "playing": "در حال پخش",
+    "pressKeysForNewBinding": "کلیدهای میانبر جدید را فشار دهید",
+    "preview": "پیش‌نمایش",
+    "profile": "پروفایل",
+    "progressCountOf": "از",
+    "queued": "در صف",
+    "ready": "آماده",
+    "recents": "اخیراً",
+    "reconnected": "اتصال مجدد برقرار شد",
+    "reconnecting": "در حال اتصال مجدد",
+    "refresh": "بازنشانی",
+    "refreshNode": "بازنشانی node",
+    "relativeTime": {
+      "daysAgo": "{count} روز پیش",
+      "hoursAgo": "{count} ساعت پیش",
+      "minutesAgo": "{count} دقیقه پیش",
+      "monthsAgo": "{count} ماه پیش",
+      "now": "اکنون",
+      "weeksAgo": "{count} هفته پیش",
+      "yearsAgo": "{count} سال پیش"
+    },
+    "releaseTitle": "انتشار {package} نسخه {version}",
+    "reloadToApplyChanges": "برای اعمال تغییرات بارگذاری مجدد کنید",
+    "remove": "حذف",
+    "removeImage": "حذف تصویر",
+    "removeTag": "حذف برچسب",
+    "removeVideo": "حذف ویدیو",
+    "rename": "تغییر نام",
+    "reportIssue": "ارسال گزارش",
+    "reportIssueTooltip": "گزارش خطا را به Comfy Org ارسال کنید",
+    "reportSent": "گزارش ارسال شد",
+    "reset": "بازنشانی",
+    "resetAll": "بازنشانی همه",
+    "resetAllKeybindingsTooltip": "بازنشانی همه کلیدهای میانبر به حالت پیش‌فرض",
+    "resizeFromBottomLeft": "تغییر اندازه از گوشه پایین-چپ",
+    "resizeFromBottomRight": "تغییر اندازه از گوشه پایین-راست",
+    "resizeFromTopLeft": "تغییر اندازه از گوشه بالا-چپ",
+    "resizeFromTopRight": "تغییر اندازه از گوشه بالا-راست",
+    "restart": "راه‌اندازی مجدد",
+    "resultsCount": "{count} نتیجه یافت شد",
+    "running": "در حال اجرا",
+    "save": "ذخیره",
+    "saving": "در حال ذخیره",
+    "scrollLeft": "اسکرول به چپ",
+    "scrollRight": "اسکرول به راست",
+    "search": "جستجو",
+    "searchExtensions": "جستجوی افزونه‌ها",
+    "searchFailedMessage": "تنظیماتی مطابق با جستجوی شما یافت نشد. لطفاً عبارت جستجو را تغییر دهید.",
+    "searchKeybindings": "جستجوی کلیدهای میانبر",
+    "searchModels": "جستجوی مدل‌ها",
+    "searchNodes": "جستجوی nodeها",
+    "searchPlaceholder": "جستجو...",
+    "searchSettings": "جستجوی تنظیمات",
+    "searchWorkflows": "جستجوی workflowها",
+    "seeTutorial": "مشاهده آموزش",
+    "selectItemsToCopy": "مواردی برای کپی انتخاب کنید",
+    "selectItemsToDelete": "مواردی برای حذف انتخاب کنید",
+    "selectItemsToDuplicate": "مواردی برای تکرار انتخاب کنید",
+    "selectItemsToRename": "مواردی برای تغییر نام انتخاب کنید",
+    "selectedFile": "فایل انتخاب‌شده",
+    "setAsBackground": "تنظیم به عنوان پس‌زمینه",
+    "settings": "تنظیمات",
+    "shortcutSuffix": " ({shortcut})",
+    "showLeftPanel": "نمایش پنل چپ",
+    "showReport": "نمایش گزارش",
+    "showRightPanel": "نمایش پنل راست",
+    "singleSelectDropdown": "لیست کشویی تک‌انتخابی",
+    "sort": "مرتب‌سازی",
+    "source": "منبع",
+    "startRecording": "شروع ضبط",
+    "status": "وضعیت",
+    "stopPlayback": "توقف پخش",
+    "stopRecording": "پایان ضبط",
+    "submit": "ارسال",
+    "success": "موفقیت‌آمیز",
+    "systemInfo": "اطلاعات سیستم",
+    "terminal": "ترمینال",
+    "title": "عنوان",
+    "triggerPhrase": "عبارت trigger",
+    "unknownError": "خطای ناشناخته",
+    "unknownFile": "فایل ناشناخته",
+    "untitled": "بدون عنوان",
+    "update": "به‌روزرسانی",
+    "updateAvailable": "به‌روزرسانی موجود است",
+    "updateFrontend": "به‌روزرسانی فرانت‌اند",
+    "updated": "به‌روزرسانی شد",
+    "updating": "در حال به‌روزرسانی {id}",
+    "upload": "بارگذاری",
+    "uploadAlreadyInProgress": "بارگذاری در حال انجام است",
+    "usageHint": "راهنمای استفاده",
+    "use": "استفاده",
+    "user": "کاربر",
+    "versionMismatchWarning": "هشدار ناسازگاری نسخه",
+    "versionMismatchWarningMessage": "{warning}: {detail} برای راهنمای به‌روزرسانی به https://docs.comfy.org/installation/update_comfyui#common-update-issues مراجعه کنید.",
+    "videoFailedToLoad": "بارگذاری ویدیو ناموفق بود",
+    "videoPreview": "پیش‌نمایش ویدیو - برای جابجایی بین ویدیوها از کلیدهای جهت‌دار استفاده کنید",
+    "viewImageOfTotal": "مشاهده تصویر {index} از {total}",
+    "viewVideoOfTotal": "مشاهده ویدیو {index} از {total}",
+    "volume": "حجم صدا",
+    "warning": "هشدار",
+    "workflow": "workflow",
+    "you": "شما"
+  },
+  "graphCanvasMenu": {
+    "fitView": "تطبیق با نما",
+    "focusMode": "حالت تمرکز",
+    "hand": "دست",
+    "hideLinks": "مخفی‌سازی پیوندها",
+    "panMode": "حالت جابجایی",
+    "resetView": "بازنشانی نما",
+    "select": "انتخاب",
+    "selectMode": "حالت انتخاب",
+    "showLinks": "نمایش پیوندها",
+    "toggleLinkVisibility": "تغییر نمایش پیوندها",
+    "toggleMinimap": "نمایش/مخفی‌سازی نقشه کوچک",
+    "zoomIn": "بزرگ‌نمایی",
+    "zoomOptions": "گزینه‌های بزرگ‌نمایی",
+    "zoomOut": "کوچک‌نمایی"
+  },
+  "groupNode": {
+    "create": "ایجاد گره گروهی",
+    "enterName": "نام را وارد کنید"
+  },
+  "help": {
+    "helpCenterMenu": "منوی مرکز راهنما",
+    "recentReleases": "انتشارهای اخیر"
+  },
+  "helpCenter": {
+    "clickToLearnMore": "برای اطلاعات بیشتر کلیک کنید →",
+    "desktopUserGuide": "راهنمای کاربر دسکتاپ",
+    "docs": "مستندات",
+    "feedback": "ارسال بازخورد",
+    "github": "گیت‌هاب",
+    "help": "راهنما و پشتیبانی",
+    "loadingReleases": "در حال بارگذاری نسخه‌ها...",
+    "managerExtension": "افزونه مدیریت",
+    "more": "بیشتر...",
+    "noRecentReleases": "نسخه جدیدی وجود ندارد",
+    "openDevTools": "باز کردن ابزار توسعه‌دهنده",
+    "recentReleases": "نسخه‌های اخیر",
+    "reinstall": "نصب مجدد",
+    "updateAvailable": "به‌روزرسانی",
+    "updateComfyUI": "به‌روزرسانی ComfyUI",
+    "updateComfyUIFailed": "به‌روزرسانی ComfyUI ناموفق بود. لطفاً دوباره تلاش کنید.",
+    "updateComfyUIStarted": "به‌روزرسانی آغاز شد",
+    "updateComfyUIStartedDetail": "به‌روزرسانی ComfyUI در صف قرار گرفت. لطفاً منتظر بمانید...",
+    "updateComfyUISuccess": "به‌روزرسانی کامل شد",
+    "updateComfyUISuccessDetail": "ComfyUI به‌روزرسانی شد. در حال راه‌اندازی مجدد...",
+    "whatsNew": "چه خبر جدیدی است؟"
+  },
+  "icon": {
+    "bookmark": "نشانک",
+    "box": "جعبه",
+    "briefcase": "کیف اداری",
+    "exclamation-triangle": "هشدار",
+    "file": "فایل",
+    "folder": "پوشه",
+    "heart": "قلب",
+    "inbox": "صندوق ورودی",
+    "star": "ستاره"
+  },
+  "imageCompare": {
+    "batchLabelA": "A:",
+    "batchLabelB": "B:",
+    "noImages": "تصویری برای مقایسه وجود ندارد"
+  },
+  "imageCrop": {
+    "cropPreviewAlt": "پیش‌نمایش برش",
+    "custom": "سفارشی",
+    "loading": "در حال بارگذاری...",
+    "lockRatio": "قفل نسبت تصویر",
+    "noInputImage": "هیچ تصویر ورودی متصل نیست",
+    "ratio": "نسبت",
+    "unlockRatio": "باز کردن قفل نسبت تصویر"
+  },
+  "importFailed": {
+    "copyError": "خطا در کپی",
+    "title": "وارد کردن ناموفق بود"
+  },
+  "install": {
+    "appDataLocationTooltip": "پوشه داده‌های برنامه ComfyUI. شامل:\n- لاگ‌ها\n- تنظیمات سرور",
+    "appPathLocationTooltip": "پوشه دارایی‌های برنامه ComfyUI. شامل کد و دارایی‌های ComfyUI",
+    "cannotWrite": "امکان نوشتن در مسیر انتخاب‌شده وجود ندارد",
+    "chooseInstallationLocation": "انتخاب محل نصب",
+    "customNodes": "nodeهای سفارشی",
+    "customNodesDescription": "نصب مجدد nodeهای سفارشی از نصب‌های قبلی ComfyUI.",
+    "desktopAppSettings": "تنظیمات برنامه دسکتاپ",
+    "desktopAppSettingsDescription": "نحوه عملکرد ComfyUI روی دسکتاپ خود را پیکربندی کنید. می‌توانید این تنظیمات را بعداً تغییر دهید.",
+    "desktopSettings": "تنظیمات دسکتاپ",
+    "failedToSelectDirectory": "انتخاب پوشه ناموفق بود",
+    "gpu": "GPU",
+    "gpuPicker": {
+      "amdDescription": "از GPU ای‌ام‌دی خود با شتاب ROCm™ برای بهترین عملکرد استفاده کنید.",
+      "amdSubtitle": "AMD ROCm™",
+      "appleMetalDescription": "از GPU مک شما برای سرعت بیشتر و تجربه بهتر استفاده می‌کند.",
+      "cpuDescription": "حالت CPU برای سازگاری زمانی که شتاب GPU در دسترس نیست.",
+      "cpuSubtitle": "حالت CPU",
+      "manualDescription": "پیکربندی ComfyUI به صورت دستی برای تنظیمات پیشرفته یا سخت‌افزارهای پشتیبانی‌نشده",
+      "manualSubtitle": "پیکربندی دستی",
+      "nvidiaDescription": "از GPU انویدیا خود با شتاب CUDA برای بهترین عملکرد استفاده کنید.",
+      "nvidiaSubtitle": "NVIDIA CUDA",
+      "recommended": "توصیه‌شده",
+      "title": "انتخاب پیکربندی سخت‌افزاری"
+    },
+    "gpuSelection": {
+      "cpuMode": "حالت CPU",
+      "cpuModeDescription": "حالت CPU فقط برای توسعه‌دهندگان و موارد خاص نادر است.",
+      "cpuModeDescription2": "اگر کاملاً مطمئن نیستید که به این حالت نیاز دارید، این گزینه را نادیده بگیرید و GPU خود را انتخاب کنید.",
+      "customComfyNeedsPython": "ComfyUI تا زمانی که پایتون نصب نشود کار نخواهد کرد",
+      "customInstallRequirements": "نصب تمام پیش‌نیازها و وابستگی‌ها (مثلاً torch سفارشی)",
+      "customManualVenv": "پیکربندی دستی venv پایتون",
+      "customMayNotWork": "این حالت کاملاً پشتیبانی‌نشده است و ممکن است به‌درستی کار نکند",
+      "customSkipsPython": "این گزینه نصب معمول پایتون را رد می‌کند.",
+      "enableCpuMode": "فعال‌سازی حالت CPU",
+      "mpsDescription": "Apple Metal Performance Shaders با نسخه nightly از pytorch پشتیبانی می‌شود.",
+      "nvidiaDescription": "دستگاه‌های NVIDIA به طور مستقیم با نسخه‌های CUDA از pytorch پشتیبانی می‌شوند.",
+      "selectGpu": "انتخاب GPU",
+      "selectGpuDescription": "نوع GPU خود را انتخاب کنید"
+    },
+    "helpImprove": "لطفاً به بهبود ComfyUI کمک کنید",
+    "insideAppInstallDir": "این پوشه داخل بسته برنامه دسکتاپ ComfyUI قرار دارد و هنگام به‌روزرسانی حذف خواهد شد. پوشه‌ای خارج از پوشه نصب مانند Documents/ComfyUI انتخاب کنید.",
+    "insideUpdaterCache": "این پوشه داخل کش به‌روزرسانی‌کننده ComfyUI است که در هر به‌روزرسانی پاک می‌شود. محل دیگری را برای داده‌های خود انتخاب کنید.",
+    "installLocation": "محل نصب",
+    "installLocationDescription": "پوشه‌ای را برای داده‌های کاربری ComfyUI انتخاب کنید. محیط پایتون در محل انتخاب‌شده نصب خواهد شد.",
+    "installLocationTooltip": "پوشه داده‌های کاربری ComfyUI. شامل:\n- محیط پایتون\n- مدل‌ها\n- nodeهای سفارشی\n",
+    "insufficientFreeSpace": "فضای کافی وجود ندارد - حداقل فضای آزاد",
+    "isOneDrive": "OneDrive پشتیبانی نمی‌شود. لطفاً ComfyUI را در محل دیگری نصب کنید.",
+    "locationPicker": {
+      "chooseDownloadServers": "انتخاب دستی سرورهای دانلود",
+      "downloadServersDescription": "سرورهای آینه‌ای خاصی را برای دانلود Python، بسته‌های PyPI و PyTorch بر اساس موقعیت مکانی خود انتخاب کنید.",
+      "migrateDescription": "مدل‌ها، nodeهای سفارشی و تنظیمات خود را از نصب قبلی ComfyUI کپی یا لینک کنید.",
+      "migrateFromExisting": "انتقال از نصب موجود",
+      "migrationPathPlaceholder": "انتخاب نصب موجود ComfyUI (اختیاری)",
+      "pathPlaceholder": "/Users/username/Documents/ComfyUI",
+      "subtitle": "یک پوشه برای فایل‌های ComfyUI انتخاب کنید. پایتون نیز به طور خودکار در آنجا نصب خواهد شد.",
+      "title": "انتخاب محل نصب ComfyUI"
+    },
+    "manualConfiguration": {
+      "createVenv": "باید یک محیط مجازی (virtual environment) در مسیر زیر ایجاد کنید",
+      "requirements": "پیش‌نیازها",
+      "restartWhenFinished": "پس از اتمام پیکربندی محیط مجازی، لطفاً ComfyUI را مجدداً راه‌اندازی کنید.",
+      "title": "پیکربندی دستی",
+      "virtualEnvironmentPath": "مسیر محیط مجازی"
+    },
+    "metricsDisabled": "جمع‌آوری داده غیرفعال است",
+    "metricsEnabled": "جمع‌آوری داده فعال است",
+    "migrateFromExistingInstallation": "انتقال از نصب موجود",
+    "migration": "انتقال",
+    "migrationOptional": "انتقال اختیاری است. اگر نصب قبلی ندارید، می‌توانید این مرحله را رد کنید.",
+    "migrationSourcePathDescription": "اگر نصب قبلی ComfyUI دارید، می‌توانیم فایل‌های کاربری و مدل‌های شما را به نصب جدید کپی یا لینک کنیم. نصب قبلی شما تحت تأثیر قرار نخواهد گرفت.",
+    "moreInfo": "برای اطلاعات بیشتر، لطفاً",
+    "nonDefaultDrive": "لطفاً ComfyUI را روی درایو سیستم خود نصب کنید (مثلاً C:\\). درایوهایی با فایل‌سیستم متفاوت ممکن است مشکلات غیرقابل پیش‌بینی ایجاد کنند. مدل‌ها و سایر فایل‌ها را می‌توانید پس از نصب در درایوهای دیگر ذخیره کنید.",
+    "parentMissing": "مسیر وجود ندارد - ابتدا پوشه والد را ایجاد کنید",
+    "pathExists": "پوشه از قبل وجود دارد - لطفاً مطمئن شوید که از تمام داده‌ها نسخه پشتیبان تهیه کرده‌اید",
+    "pathValidationFailed": "اعتبارسنجی مسیر ناموفق بود",
+    "privacyPolicy": "سیاست حفظ حریم خصوصی",
+    "selectItemsToMigrate": "انتخاب موارد برای انتقال",
+    "settings": {
+      "allowMetrics": "جمع‌آوری داده‌های استفاده",
+      "allowMetricsDescription": "با ارسال داده‌های ناشناس استفاده، به بهبود ComfyUI کمک کنید. هیچ اطلاعات شخصی یا محتوای workflow جمع‌آوری نمی‌شود.",
+      "autoUpdate": "به‌روزرسانی خودکار",
+      "autoUpdateDescription": "به‌روزرسانی‌ها را به‌صورت خودکار دانلود کنید. قبل از نصب به‌روزرسانی‌ها به شما اطلاع داده خواهد شد.",
+      "checkingMirrors": "در حال بررسی دسترسی شبکه به آینه‌های پایتون...",
+      "dataCollectionDialog": {
+        "collect": {
+          "errorReports": "پیام خطا و stack trace",
+          "systemInfo": "سخت‌افزار، نوع سیستم‌عامل و نسخه برنامه",
+          "userJourneyEvents": "رویدادهای مسیر کاربر"
+        },
+        "doNotCollect": {
+          "customNodeConfigurations": "تنظیمات nodeهای سفارشی",
+          "fileSystemInformation": "اطلاعات فایل‌سیستم",
+          "personalInformation": "اطلاعات شخصی",
+          "workflowContents": "محتوای workflow"
+        },
+        "title": "درباره جمع‌آوری داده‌ها",
+        "viewFullPolicy": "مشاهده سیاست کامل",
+        "whatWeCollect": "چه چیزی جمع‌آوری می‌کنیم:",
+        "whatWeDoNotCollect": "چه چیزی جمع‌آوری نمی‌کنیم:"
+      },
+      "errorUpdatingConsent": "خطا در به‌روزرسانی رضایت",
+      "errorUpdatingConsentDetail": "به‌روزرسانی تنظیمات رضایت جمع‌آوری داده‌ها ناموفق بود",
+      "learnMoreAboutData": "اطلاعات بیشتر درباره جمع‌آوری داده‌ها",
+      "mirrorSettings": "تنظیمات آینه",
+      "mirrorsReachable": "دسترسی شبکه به آینه‌های پایتون مناسب است",
+      "mirrorsUnreachable": "دسترسی شبکه به برخی آینه‌های پایتون مناسب نیست",
+      "pypiMirrorPlaceholder": "آدرس آینه PyPI را وارد کنید",
+      "pythonMirrorPlaceholder": "آدرس آینه Python را وارد کنید"
+    },
+    "systemLocations": "محل‌های سیستمی",
+    "unhandledError": "خطای ناشناخته",
+    "updateConsent": "قبلاً با گزارش خطاها موافقت کرده‌اید. اکنون رویدادهای مبتنی بر رخداد برای شناسایی باگ‌ها و بهبود برنامه جمع‌آوری می‌شود. هیچ اطلاعات شناسایی شخصی جمع‌آوری نمی‌شود."
+  },
+  "issueReport": {
+    "helpFix": "کمک به رفع این مشکل"
+  },
+  "linearMode": {
+    "appModeToolbar": {
+      "appBuilder": "سازنده اپلیکیشن",
+      "apps": "اپلیکیشن‌ها",
+      "appsEmptyMessage": "اپلیکیشن‌های ذخیره‌شده اینجا نمایش داده می‌شوند.\nبرای ساخت اولین اپلیکیشن خود، روی دکمه زیر کلیک کنید.",
+      "enterAppMode": "ورود به حالت اپلیکیشن"
+    },
+    "arrange": {
+      "atLeastOne": "یک",
+      "connectAtLeastOne": "حداقل {atLeastOne} node خروجی را متصل کنید تا کاربران پس از اجرا نتایج را مشاهده کنند.",
+      "noOutputs": "هنوز هیچ خروجی اضافه نشده است",
+      "outputExamples": "مثال‌ها: «ذخیره تصویر» یا «ذخیره ویدیو»",
+      "outputs": "خروجی‌ها",
+      "resultsLabel": "نتایج تولیدشده از node(های) خروجی انتخاب‌شده پس از اجرای این اپلیکیشن اینجا نمایش داده می‌شوند.",
+      "switchToOutputs": "به مرحله «خروجی» بروید و روی نودهای خروجی کلیک کنید تا اینجا اضافه شوند.",
+      "switchToOutputsButton": "رفتن به خروجی‌ها"
+    },
+    "backToWorkflow": "بازگشت به جریان کاری",
+    "beta": "حالت برنامه بتا - ارسال بازخورد",
+    "builder": {
+      "exit": "خروج از حالت ساخت",
+      "exitConfirmMessage": "تغییرات ذخیره‌نشده شما از بین خواهد رفت\nخروج بدون ذخیره؟",
+      "exitConfirmTitle": "خروج از حالت ساخت اپلیکیشن؟",
+      "inputsDesc": "کاربران می‌توانند این موارد را تنظیم کنند تا خروجی مورد نظر خود را تولید نمایند.",
+      "inputsExample": "مثال‌ها: «بارگذاری تصویر»، «متن راهنما»، «تعداد مراحل»",
+      "noInputs": "هنوز ورودی‌ای اضافه نشده است",
+      "noOutputs": "هنوز گره خروجی اضافه نشده است",
+      "outputsDesc": "حداقل یک گره خروجی متصل کنید تا کاربران پس از اجرا نتایج را مشاهده کنند.",
+      "outputsExample": "مثال‌ها: «ذخیره تصویر» یا «ذخیره ویدیو»",
+      "promptAddInputs": "برای افزودن پارامترها به عنوان ورودی، روی پارامترهای گره کلیک کنید",
+      "promptAddOutputs": "برای افزودن خروجی، روی گره‌های خروجی کلیک کنید. این‌ها نتایج تولیدشده خواهند بود.",
+      "title": "حالت ساخت اپلیکیشن",
+      "unknownWidget": "ویجت قابل مشاهده نیست"
+    },
+    "downloadAll": "دانلود همه",
+    "dragAndDropImage": "تصویر را بکشید و رها کنید",
+    "emptyWorkflowExplanation": "جریان کاری شما خالی است. ابتدا باید چند node اضافه کنید تا بتوانید یک برنامه بسازید.",
+    "enterNodeGraph": "ورود به گراف node",
+    "giveFeedback": "ارسال بازخورد",
+    "graphMode": "حالت گراف",
+    "linearMode": "حالت برنامه",
+    "loadTemplate": "بارگذاری قالب",
+    "mobileControls": "ویرایش و اجرا",
+    "queue": {
+      "clear": "پاک‌سازی صف",
+      "clickToClear": "برای پاک‌سازی صف کلیک کنید"
+    },
+    "rerun": "اجرای مجدد",
+    "reuseParameters": "استفاده مجدد از پارامترها",
+    "runCount": "تعداد اجرا: ",
+    "viewJob": "مشاهده وظیفه",
+    "welcome": {
+      "buildApp": "ساخت اپلیکیشن",
+      "controls": "خروجی‌های شما در پایین نمایش داده می‌شوند و کنترل‌ها در سمت راست قرار دارند. سایر موارد خارج از دید باقی می‌مانند.",
+      "getStarted": "برای شروع روی {runButton} کلیک کنید.",
+      "message": "نمای ساده‌شده‌ای که گراف node را مخفی می‌کند تا بتوانید بر خلق تمرکز کنید.",
+      "sharing": "اشتراک‌گذاری آسان است: workflow خود را بسازید، حالت App را باز کنید، روی تب راست‌کلیک کنید و خروجی بگیرید. وقتی دیگران فایل شما را باز می‌کنند، مستقیماً وارد این نمای ساده می‌شوند. می‌توانید workflowهای قدرتمند را به ابزارهای ساده تبدیل و به اشتراک بگذارید بدون اینکه کسی نیاز به درک گراف node داشته باشد.",
+      "title": "به حالت App خوش آمدید"
+    }
+  },
+  "load3d": {
+    "applyingTexture": "در حال اعمال تکسچر...",
+    "backgroundColor": "رنگ پس‌زمینه",
+    "camera": "دوربین",
+    "cameraType": {
+      "orthographic": "اورتوگرافیک",
+      "perspective": "پرسپکتیو"
+    },
+    "clearRecording": "پاک کردن ضبط",
+    "dropToLoad": "مدل سه‌بعدی را برای بارگذاری رها کنید",
+    "edgeThreshold": "آستانه لبه",
+    "export": "خروجی گرفتن",
+    "exportModel": "خروجی گرفتن مدل",
+    "exportRecording": "خروجی گرفتن ضبط",
+    "exportingModel": "در حال خروجی گرفتن مدل...",
+    "fov": "زاویه دید (FOV)",
+    "light": "نور",
+    "lightIntensity": "شدت نور",
+    "loadingBackgroundImage": "در حال بارگذاری تصویر پس‌زمینه",
+    "loadingModel": "در حال بارگذاری مدل سه‌بعدی...",
+    "materialMode": "حالت متریال",
+    "materialModes": {
+      "depth": "عمق",
+      "lineart": "خطی",
+      "normal": "عادی",
+      "original": "اصلی",
+      "pointCloud": "ابر نقاط",
+      "wireframe": "سیمی"
+    },
+    "model": "مدل",
+    "openIn3DViewer": "باز کردن در نمایشگر سه‌بعدی",
+    "panoramaMode": "حالت پانوراما",
+    "previewOutput": "پیش‌نمایش خروجی",
+    "reloadingModel": "در حال بارگذاری مجدد مدل...",
+    "removeBackgroundImage": "حذف تصویر پس‌زمینه",
+    "resizeNodeMatchOutput": "تغییر اندازه node مطابق خروجی",
+    "scene": "صحنه",
+    "showGrid": "نمایش شبکه",
+    "showSkeleton": "نمایش اسکلت",
+    "startRecording": "شروع ضبط",
+    "stopRecording": "توقف ضبط",
+    "switchCamera": "تغییر دوربین",
+    "switchingMaterialMode": "در حال تغییر حالت متریال...",
+    "tiledMode": "حالت کاشی‌کاری",
+    "unsupportedFileType": "نوع فایل پشتیبانی نمی‌شود (فقط .gltf، .glb، .obj، .fbx، .stl پشتیبانی می‌شود)",
+    "upDirection": "جهت بالا",
+    "upDirections": {
+      "original": "اصلی"
+    },
+    "uploadBackgroundImage": "بارگذاری تصویر پس‌زمینه",
+    "uploadTexture": "بارگذاری تکسچر",
+    "uploadingModel": "در حال بارگذاری مدل سه‌بعدی...",
+    "viewer": {
+      "apply": "اعمال",
+      "cameraSettings": "تنظیمات دوربین",
+      "cameraType": "نوع دوربین",
+      "cancel": "لغو",
+      "exportSettings": "تنظیمات خروجی",
+      "lightSettings": "تنظیمات نور",
+      "modelSettings": "تنظیمات مدل",
+      "sceneSettings": "تنظیمات صحنه",
+      "title": "نمایشگر سه‌بعدی (بتا)"
+    }
+  },
+  "loadWorkflowWarning": {
+    "coreNodesFromVersion": "nodeهای اصلی از نسخه {version}:",
+    "outdatedVersion": "این workflow با نسخه جدیدتری از ComfyUI ({version}) ایجاد شده است. برخی nodeها ممکن است به درستی کار نکنند.",
+    "outdatedVersionGeneric": "این workflow با نسخه جدیدتری از ComfyUI ایجاد شده است. برخی nodeها ممکن است به درستی کار نکنند."
+  },
+  "maintenance": {
+    "None": "هیچ‌کدام",
+    "OK": "مناسب",
+    "Skipped": "رد شده",
+    "allOk": "هیچ مشکلی شناسایی نشد.",
+    "confirmTitle": "آیا مطمئن هستید؟",
+    "consoleLogs": "لاگ‌های کنسول",
+    "detected": "شناسایی شد",
+    "error": {
+      "cannotContinue": "امکان ادامه وجود ندارد - هنوز خطاهایی باقی مانده است",
+      "defaultDescription": "هنگام اجرای وظیفه نگهداری خطایی رخ داد.",
+      "taskFailed": "اجرای وظیفه با شکست مواجه شد.",
+      "toastTitle": "خطا در وظیفه"
+    },
+    "refreshing": "در حال به‌روزرسانی",
+    "showManual": "نمایش وظایف نگهداری",
+    "status": "وضعیت",
+    "terminalDefaultMessage": "هنگام اجرای دستور عیب‌یابی، هر خروجی در اینجا نمایش داده می‌شود.",
+    "title": "نگهداری",
+    "unsafeMigration": {
+      "action": "از وظیفه نگهداری «Base path» در زیر برای انتقال ComfyUI به محل امن استفاده کنید.",
+      "appInstallDir": "مسیر پایه شما داخل بسته نرم‌افزاری برنامه ComfyUI Desktop قرار دارد. این پوشه ممکن است هنگام به‌روزرسانی حذف یا بازنویسی شود. پوشه‌ای خارج از محل نصب مانند Documents/ComfyUI را انتخاب کنید.",
+      "generic": "مسیر فعلی ComfyUI شما در مکانی قرار دارد که ممکن است هنگام به‌روزرسانی حذف یا تغییر کند. برای جلوگیری از از دست رفتن داده‌ها، آن را به پوشه‌ای امن منتقل کنید.",
+      "oneDrive": "مسیر پایه شما روی OneDrive قرار دارد که می‌تواند باعث مشکلات همگام‌سازی و از دست رفتن تصادفی داده‌ها شود. پوشه‌ای محلی که توسط OneDrive مدیریت نمی‌شود انتخاب کنید.",
+      "title": "محل نصب ناامن شناسایی شد",
+      "updaterCache": "مسیر پایه شما داخل کش به‌روزرسانی‌کننده ComfyUI قرار دارد که در هر به‌روزرسانی پاک می‌شود. محل دیگری را برای داده‌های خود انتخاب کنید."
+    }
+  },
+  "manager": {
+    "actions": "اقدامات",
+    "allMissingNodesInstalled": "همه نودهای مفقود با موفقیت نصب شدند",
+    "applyChanges": "اعمال تغییرات",
+    "basicInfo": "اطلاعات پایه",
+    "changingVersion": "تغییر نسخه از {from} به {to}",
+    "clickToFinishSetup": "کلیک کنید",
+    "conflicts": {
+      "conflictInfoTitle": "چرا این اتفاق می‌افتد؟",
+      "conflictMessages": {
+        "accelerator": "GPU/شتاب‌دهنده پشتیبانی نمی‌شود (موجود: {current}، مورد نیاز: {required})",
+        "banned": "این بسته به دلایل امنیتی مسدود شده است",
+        "comfyui_version": "عدم تطابق نسخه ComfyUI (فعلی: {current}، مورد نیاز: {required})",
+        "frontend_version": "عدم تطابق نسخه فرانت‌اند (فعلی: {current}، مورد نیاز: {required})",
+        "generic": "مشکل سازگاری (فعلی: {current}، مورد نیاز: {required})",
+        "import_failed": "وارد کردن ناموفق بود",
+        "os": "سیستم عامل پشتیبانی نمی‌شود (فعلی: {current}، مورد نیاز: {required})",
+        "pending": "بررسی امنیتی در انتظار است - امکان تأیید سازگاری وجود ندارد"
+      },
+      "conflicts": "تضادها",
+      "description": "تضادهایی بین برخی از افزونه‌های شما و نسخه جدید ComfyUI شناسایی شده است. با به‌روزرسانی، ممکن است workflowهایی که به این افزونه‌ها وابسته‌اند دچار مشکل شوند.",
+      "enableAnyway": "فعال‌سازی به هر حال",
+      "extensionAtRisk": "افزونه در معرض خطر",
+      "importFailedExtensions": "افزونه‌های وارد نشده",
+      "info": "در صورت ادامه به‌روزرسانی، افزونه‌های دارای تضاد به طور خودکار غیرفعال خواهند شد. شما می‌توانید هر زمان آن‌ها را در مدیریت ComfyUI بررسی و مدیریت کنید.",
+      "installAnyway": "نصب به هر حال",
+      "title": "مشکلات بسته نود شناسایی شد!",
+      "understood": "متوجه شدم",
+      "warningBanner": {
+        "button": "اطلاعات بیشتر...",
+        "message": "این افزونه‌ها به نسخه‌هایی از بسته‌های سیستمی نیاز دارند که با تنظیمات فعلی شما متفاوت است. نصب آن‌ها ممکن است وابستگی‌های اصلی را بازنویسی کرده و بر سایر افزونه‌ها یا workflowها تأثیر بگذارد.",
+        "title": "برخی افزونه‌ها به دلیل ناسازگاری با تنظیمات فعلی شما غیرفعال شده‌اند"
+      },
+      "warningTooltip": "این بسته ممکن است با محیط فعلی شما ناسازگار باشد"
+    },
+    "createdBy": "سازنده",
+    "dependencies": "وابستگی‌ها",
+    "disabledNodesWontUpdate": "نودهای غیرفعال به‌روزرسانی نخواهند شد",
+    "discoverCommunityContent": "بسته‌های نود، افزونه‌ها و محتوای ساخته‌شده توسط جامعه را کشف کنید...",
+    "downloads": "دانلودها",
+    "emptyState": {
+      "allInstalled": {
+        "message": "شما هنوز هیچ افزونه‌ای نصب نکرده‌اید.",
+        "title": "افزونه‌ای نصب نشده است"
+      },
+      "conflicting": {
+        "message": "تمام افزونه‌های شما سازگار هستند.",
+        "title": "تعارضی شناسایی نشد"
+      },
+      "missing": {
+        "message": "تمام nodeهای مورد نیاز نصب شده‌اند.",
+        "title": "node گمشده‌ای وجود ندارد"
+      },
+      "updateAvailable": {
+        "message": "تمام افزونه‌های شما به‌روز هستند.",
+        "title": "همه به‌روز هستند"
+      },
+      "workflow": {
+        "message": "این گردش‌کار از هیچ node افزونه‌ای استفاده نمی‌کند.",
+        "title": "افزونه‌ای در گردش‌کار وجود ندارد"
+      }
+    },
+    "enablePackToChangeVersion": "برای تغییر نسخه، این بسته را فعال کنید",
+    "errorConnecting": "خطا در اتصال به رجیستری نود Comfy.",
+    "extensionsSuccessfullyInstalled": "افزونه(ها) با موفقیت نصب شدند و آماده استفاده هستند!",
+    "failed": "ناموفق",
+    "failedToInstall": "نصب ناموفق بود",
+    "filter": {
+      "disabled": "غیرفعال",
+      "enabled": "فعال",
+      "nodePack": "بسته نود"
+    },
+    "gettingInfo": "در حال دریافت اطلاعات...",
+    "importFailedGenericError": "وارد کردن بسته ناموفق بود. برای جزئیات بیشتر کنسول را بررسی کنید.",
+    "inWorkflow": "در workflow",
+    "infoPanelEmpty": "برای مشاهده اطلاعات، یک مورد را انتخاب کنید",
+    "installAllMissingNodes": "نصب همه",
+    "installError": "خطا در نصب",
+    "installSelected": "نصب انتخاب‌شده‌ها",
+    "installationQueue": "صف نصب",
+    "installingDependencies": "در حال نصب وابستگی‌ها...",
+    "lastUpdated": "آخرین به‌روزرسانی",
+    "latestVersion": "آخرین نسخه",
+    "legacyManagerSearchTip": "دنبال ComfyUI-Manager هستید؟ می‌توانید رابط کاربری مدیر قدیمی را با اجرای ComfyUI و استفاده از پرچم --enable-manager-legacy-ui فعال کنید.",
+    "legacyManagerUI": "استفاده از رابط کاربری قدیمی",
+    "legacyManagerUIDescription": "برای استفاده از رابط کاربری قدیمی مدیریت، ComfyUI را با --enable-manager-legacy-ui اجرا کنید.",
+    "legacyMenuNotAvailable": "منوی مدیریت قدیمی در دسترس نیست، به منوی جدید مدیریت منتقل می‌شود.",
+    "license": "مجوز",
+    "loadingVersions": "در حال بارگذاری نسخه‌ها...",
+    "mixedSelectionMessage": "امکان انجام عملیات گروهی روی انتخاب ترکیبی وجود ندارد",
+    "nav": {
+      "allExtensions": "همه افزونه‌ها",
+      "allInWorkflow": "همه در: {workflowName}",
+      "allInstalled": "همه نصب شده‌ها",
+      "conflicting": "دارای تداخل",
+      "inWorkflowSection": "در Workflow",
+      "installedSection": "نصب شده",
+      "missingNodes": "Nodeهای مفقود",
+      "notInstalled": "نصب نشده",
+      "updatesAvailable": "به‌روزرسانی‌های موجود"
+    },
+    "nightlyVersion": "نسخه nightly",
+    "noDescription": "توضیحی موجود نیست",
+    "noNodesFound": "نودی یافت نشد",
+    "noNodesFoundDescription": "نودهای این بسته قابل تجزیه نبودند یا این بسته فقط یک افزونه فرانت‌اند است و نودی ندارد.",
+    "noResultsFound": "نتیجه‌ای مطابق با جستجوی شما یافت نشد.",
+    "nodePack": "بسته نود",
+    "nodePackInfo": "اطلاعات Node Pack",
+    "notAvailable": "در دسترس نیست",
+    "packInstall": {
+      "nodeIdRequired": "شناسه node برای نصب الزامی است"
+    },
+    "packsSelected": "بسته انتخاب شد",
+    "repository": "مخزن",
+    "restartToApplyChanges": "برای اعمال تغییرات، لطفاً ComfyUI را مجدداً راه‌اندازی کنید",
+    "restartingBackend": "در حال راه‌اندازی مجدد backend برای اعمال تغییرات...",
+    "searchPlaceholder": "جستجو",
+    "selectVersion": "انتخاب نسخه",
+    "selected": "انتخاب شده",
+    "sort": {
+      "created": "جدیدترین",
+      "downloads": "محبوب‌ترین",
+      "publisher": "ناشر",
+      "updated": "به‌روزرسانی اخیر"
+    },
+    "status": {
+      "active": "فعال",
+      "banned": "مسدودشده",
+      "conflicting": "دارای تضاد",
+      "deleted": "حذف‌شده",
+      "flagged": "علامت‌گذاری‌شده",
+      "importFailed": "خطا در نصب",
+      "pending": "در انتظار",
+      "unknown": "نامشخص"
+    },
+    "title": "مدیریت نودهای سفارشی",
+    "toFinishSetup": "برای تکمیل راه‌اندازی",
+    "totalNodes": "تعداد کل نودها",
+    "tryAgainLater": "لطفاً بعداً دوباره تلاش کنید.",
+    "tryDifferentSearch": "لطفاً عبارت جستجوی دیگری را امتحان کنید.",
+    "tryUpdate": "تلاش برای به‌روزرسانی",
+    "tryUpdateTooltip": "آخرین تغییرات را از مخزن دریافت کنید. نسخه‌های nightly ممکن است به‌روزرسانی‌هایی داشته باشند که به طور خودکار شناسایی نمی‌شوند.",
+    "uninstall": "حذف نصب",
+    "uninstallSelected": "حذف نصب انتخاب‌شده‌ها",
+    "uninstalling": "در حال حذف نصب {id}",
+    "update": "به‌روزرسانی",
+    "updateAll": "به‌روزرسانی همه",
+    "updateSelected": "به‌روزرسانی انتخاب‌شده‌ها",
+    "updatingAllPacks": "در حال به‌روزرسانی همه بسته‌ها",
+    "version": "نسخه"
+  },
+  "maskEditor": {
+    "activateLayer": "فعال‌سازی لایه",
+    "applyToWholeImage": "اعمال به کل تصویر",
+    "baseImageLayer": "لایه تصویر پایه",
+    "baseLayerPreview": "پیش‌نمایش لایه پایه",
+    "black": "سیاه",
+    "brushSettings": "تنظیمات قلم‌مو",
+    "brushShape": "شکل قلم‌مو",
+    "clear": "پاک‌سازی",
+    "clickToResetZoom": "برای بازنشانی بزرگنمایی کلیک کنید",
+    "colorSelectSettings": "تنظیمات انتخاب رنگ",
+    "colorSelector": "انتخاب رنگ",
+    "fillOpacity": "شفافیت پرکردن",
+    "hardness": "سختی",
+    "imageLayer": "لایه تصویر",
+    "invert": "معکوس",
+    "layers": "لایه‌ها",
+    "livePreview": "پیش‌نمایش زنده",
+    "maskBlendingOptions": "گزینه‌های ترکیب ماسک",
+    "maskLayer": "لایه ماسک",
+    "maskOpacity": "شفافیت ماسک",
+    "maskTolerance": "تلورانس ماسک",
+    "method": "روش",
+    "mirrorHorizontal": "آینه افقی",
+    "mirrorVertical": "آینه عمودی",
+    "negative": "نگاتیو",
+    "opacity": "شفافیت",
+    "paintBucketSettings": "تنظیمات سطل رنگ",
+    "paintLayer": "لایه نقاشی",
+    "redo": "بازانجام",
+    "resetToDefault": "بازنشانی به پیش‌فرض",
+    "rotateLeft": "چرخش به چپ",
+    "rotateRight": "چرخش به راست",
+    "selectionOpacity": "شفافیت انتخاب",
+    "smoothingPrecision": "دقت هموارسازی",
+    "stepSize": "اندازه گام",
+    "stopAtMask": "توقف در ماسک",
+    "thickness": "ضخامت",
+    "title": "ویرایشگر ماسک",
+    "tolerance": "تلورانس",
+    "undo": "واگرد",
+    "white": "سفید"
+  },
+  "mediaAsset": {
+    "actions": {
+      "copyJobId": "کپی شناسه job",
+      "delete": "حذف",
+      "download": "دانلود",
+      "exportWorkflow": "خروجی گرفتن از workflow",
+      "insertAsNodeInWorkflow": "افزودن به عنوان node در workflow",
+      "inspect": "بررسی دارایی",
+      "more": "گزینه‌های بیشتر",
+      "moreOptions": "گزینه‌های بیشتر",
+      "openWorkflow": "باز کردن به عنوان workflow در تب جدید",
+      "seeMoreOutputs": "مشاهده خروجی‌های بیشتر",
+      "zoom": "بزرگ‌نمایی"
+    },
+    "assetDeletedSuccessfully": "دارایی با موفقیت حذف شد",
+    "deleteAssetDescription": "این دارایی به طور دائمی حذف خواهد شد.",
+    "deleteAssetTitle": "حذف این دارایی؟",
+    "deleteSelectedDescription": "{count} دارایی به طور دائمی حذف خواهد شد.",
+    "deleteSelectedTitle": "حذف دارایی‌های انتخاب‌شده؟",
+    "deletingImportedFilesCloudOnly": "حذف فایل‌های واردشده فقط در نسخه ابری پشتیبانی می‌شود",
+    "failedToCreateNode": "ایجاد node ناموفق بود",
+    "failedToDeleteAsset": "حذف دارایی ناموفق بود",
+    "failedToExportWorkflow": "خروجی گرفتن از workflow ناموفق بود",
+    "jobIdToast": {
+      "copied": "کپی شد",
+      "error": "خطا",
+      "jobIdCopied": "شناسه job با موفقیت کپی شد",
+      "jobIdCopyFailed": "کپی شناسه job ناموفق بود"
+    },
+    "noJobIdFound": "شناسه job برای این دارایی یافت نشد",
+    "noWorkflowDataFound": "داده‌ای از workflow در این دارایی یافت نشد",
+    "nodeAddedToWorkflow": "node از نوع {nodeType} به workflow افزوده شد",
+    "nodeTypeNotFound": "نوع node {nodeType} یافت نشد",
+    "selection": {
+      "assetsDeletedSuccessfully": "{count} دارایی با موفقیت حذف شد",
+      "deleteSelected": "حذف",
+      "deleteSelectedAll": "حذف همه",
+      "deselectAll": "لغو انتخاب همه",
+      "downloadSelected": "دانلود",
+      "downloadSelectedAll": "دانلود همه",
+      "downloadStarted": "در حال دانلود {count} فایل...",
+      "downloadsStarted": "دانلود {count} فایل آغاز شد",
+      "exportStarted": "در حال آماده‌سازی خروجی ZIP برای {count} فایل",
+      "exportWorkflowAll": "خروجی گرفتن از همه workflowها",
+      "failedToAddNodes": "افزودن nodeها به workflow ناموفق بود",
+      "failedToDeleteAssets": "حذف دارایی‌های انتخاب‌شده ناموفق بود",
+      "insertAllAssetsAsNodes": "افزودن همه دارایی‌ها به عنوان node",
+      "multipleSelectedAssets": "چندین دارایی انتخاب شده‌اند",
+      "noWorkflowsFound": "هیچ داده‌ای از workflow در دارایی‌های انتخاب‌شده یافت نشد",
+      "noWorkflowsToExport": "هیچ داده‌ای برای خروجی گرفتن از workflow یافت نشد",
+      "nodesAddedToWorkflow": "{count} node به workflow افزوده شد",
+      "openWorkflowAll": "باز کردن همه workflowها",
+      "partialAddNodesSuccess": "{succeeded} با موفقیت افزوده شد، {failed} ناموفق",
+      "partialDeleteSuccess": "{succeeded} با موفقیت حذف شد، {failed} ناموفق بود",
+      "partialWorkflowsExported": "{succeeded} با موفقیت خروجی گرفته شد، {failed} ناموفق",
+      "partialWorkflowsOpened": "{succeeded} workflow باز شد، {failed} ناموفق",
+      "selectedCount": "دارایی‌های انتخاب‌شده: {count}",
+      "workflowsExported": "{count} workflow با موفقیت خروجی گرفته شد",
+      "workflowsOpened": "{count} workflow در تب جدید باز شد"
+    },
+    "unsupportedFileType": "نوع فایل پشتیبانی نمی‌شود برای node بارگذار",
+    "workflowExportedSuccessfully": "workflow با موفقیت خروجی گرفته شد",
+    "workflowOpenedInNewTab": "workflow در تب جدید باز شد"
+  },
+  "menu": {
+    "autoQueue": "صف خودکار",
+    "batchCount": "تعداد دسته",
+    "batchCountTooltip": "تعداد دفعاتی که تولید workflow باید در صف قرار گیرد",
+    "clear": "پاک‌سازی workflow",
+    "clipspace": "باز کردن Clipspace",
+    "customNodesManager": "مدیریت nodeهای سفارشی",
+    "dark": "تاریک",
+    "disabled": "غیرفعال",
+    "disabledTooltip": "workflow به صورت خودکار در صف قرار نمی‌گیرد",
+    "execute": "اجرا",
+    "fullscreen": "تمام‌صفحه",
+    "help": "راهنما",
+    "helpAndFeedback": "راهنما و بازخورد",
+    "hideMenu": "مخفی کردن منو",
+    "instant": "فوری",
+    "instantTooltip": "workflow بلافاصله پس از پایان تولید در صف قرار می‌گیرد",
+    "interrupt": "لغو اجرای فعلی",
+    "light": "روشن",
+    "manageExtensions": "مدیریت افزونه‌ها",
+    "onChange": "در صورت تغییر",
+    "onChangeTooltip": "workflow پس از هر تغییر در صف قرار می‌گیرد",
+    "queue": "پنل صف",
+    "refresh": "به‌روزرسانی تعاریف node",
+    "resetView": "بازنشانی نمای بوم",
+    "run": "اجرا",
+    "runWorkflow": "اجرای workflow (Shift برای صف در ابتدا)",
+    "runWorkflowDisabled": "workflow شامل nodeهای پشتیبانی‌نشده است (با رنگ قرمز مشخص شده‌اند). برای اجرا، این موارد را حذف کنید.",
+    "runWorkflowFront": "اجرای workflow (صف در ابتدا)",
+    "settings": "تنظیمات",
+    "showMenu": "نمایش منو",
+    "stopRunInstant": "توقف اجرا (فوری)",
+    "stopRunInstantTooltip": "توقف اجرا",
+    "theme": "پوسته",
+    "toggleBottomPanel": "نمایش/مخفی‌سازی پنل پایین"
+  },
+  "menuLabels": {
+    "About ComfyUI": "درباره ComfyUI",
+    "Assets": "دارایی‌ها",
+    "Bottom Panel": "پنل پایین",
+    "Browse Templates": "مرور قالب‌ها",
+    "Bypass/Unbypass Selected Nodes": "فعال/غیرفعال کردن عبور Nodeهای انتخاب‌شده",
+    "Canvas Performance": "عملکرد بوم",
+    "Canvas Toggle Lock": "تغییر وضعیت قفل بوم",
+    "Check for Custom Node Updates": "بررسی به‌روزرسانی Custom Nodeها",
+    "Check for Updates": "بررسی به‌روزرسانی‌ها",
+    "Clear Pending Tasks": "پاک‌سازی وظایف در انتظار",
+    "Clear Workflow": "پاک‌سازی Workflow",
+    "Clipspace": "Clipspace",
+    "Close Current Workflow": "بستن Workflow فعلی",
+    "Collapse/Expand Selected Nodes": "جمع/باز کردن Nodeهای انتخاب‌شده",
+    "Comfy-Org Discord": "Comfy-Org Discord",
+    "ComfyUI Docs": "مستندات ComfyUI",
+    "ComfyUI Forum": "انجمن ComfyUI",
+    "ComfyUI Issues": "مشکلات ComfyUI",
+    "Contact Support": "تماس با پشتیبانی",
+    "Convert Selection to Subgraph": "تبدیل انتخاب به Subgraph",
+    "Convert selected nodes to group node": "تبدیل Nodeهای انتخاب‌شده به group node",
+    "Copy": "کپی",
+    "Custom Nodes (Legacy)": "Custom Nodes (قدیمی)",
+    "Custom Nodes Manager": "مدیر Custom Nodes",
+    "Decrease Brush Size in MaskEditor": "کاهش اندازه قلم‌مو در MaskEditor",
+    "Delete Selected Items": "حذف موارد انتخاب‌شده",
+    "Desktop User Guide": "راهنمای کاربر دسکتاپ",
+    "Duplicate Current Workflow": "تکثیر Workflow فعلی",
+    "Edit": "ویرایش",
+    "Edit Subgraph Widgets": "ویرایش ابزارک‌های Subgraph",
+    "Exit Subgraph": "خروج از Subgraph",
+    "Experimental: Browse Model Assets": "آزمایشی: مرور دارایی‌های مدل",
+    "Experimental: Enable AssetAPI": "آزمایشی: فعال‌سازی AssetAPI",
+    "Experimental: Enable Nodes 2_0": "آزمایشی: فعال‌سازی Nodes 2.0",
+    "Export": "خروجی گرفتن",
+    "Export (API)": "خروجی گرفتن (API)",
+    "File": "فایل",
+    "Fit Group To Contents": "تطبیق گروه با محتوا",
+    "Focus Mode": "حالت تمرکز",
+    "Group Selected Nodes": "گروه‌بندی Nodeهای انتخاب‌شده",
+    "Help": "راهنما",
+    "Help Center": "مرکز راهنما",
+    "Increase Brush Size in MaskEditor": "افزایش اندازه قلم‌مو در MaskEditor",
+    "Install Missing Custom Nodes": "نصب Custom Nodeهای گمشده",
+    "Interrupt": "توقف",
+    "Job History": "تاریخچه وظایف",
+    "Load Default Workflow": "بارگذاری Workflow پیش‌فرض",
+    "Lock Canvas": "قفل کردن بوم",
+    "Manage group nodes": "مدیریت group nodeها",
+    "Manager": "مدیر",
+    "Manager Menu (Legacy)": "منوی مدیر (قدیمی)",
+    "Minimap": "نقشه کوچک",
+    "Mirror Horizontal in MaskEditor": "آینه افقی در MaskEditor",
+    "Mirror Vertical in MaskEditor": "آینه عمودی در MaskEditor",
+    "Model Library": "کتابخانه مدل",
+    "Move Selected Nodes Down": "انتقال Nodeهای انتخاب‌شده به پایین",
+    "Move Selected Nodes Left": "انتقال Nodeهای انتخاب‌شده به چپ",
+    "Move Selected Nodes Right": "انتقال Nodeهای انتخاب‌شده به راست",
+    "Move Selected Nodes Up": "انتقال Nodeهای انتخاب‌شده به بالا",
+    "Mute/Unmute Selected Nodes": "بی‌صدا/فعال کردن صدای Nodeهای انتخاب‌شده",
+    "New": "جدید",
+    "Next Opened Workflow": "Workflow بعدی بازشده",
+    "Node Library": "کتابخانه Node",
+    "Node Links": "پیوندهای Node",
+    "Open": "باز کردن",
+    "Open 3D Viewer (Beta) for Selected Node": "باز کردن نمایشگر سه‌بعدی (بتا) برای نود انتخاب‌شده",
+    "Open Color Picker in MaskEditor": "باز کردن انتخاب‌گر رنگ در MaskEditor",
+    "Open Custom Nodes Folder": "باز کردن پوشه Custom Nodes",
+    "Open DevTools": "باز کردن DevTools",
+    "Open Inputs Folder": "باز کردن پوشه Inputs",
+    "Open Logs Folder": "باز کردن پوشه Logs",
+    "Open Mask Editor for Selected Node": "باز کردن Mask Editor برای Node انتخاب‌شده",
+    "Open Models Folder": "باز کردن پوشه Models",
+    "Open Outputs Folder": "باز کردن پوشه Outputs",
+    "Open Sign In Dialog": "باز کردن پنجره ورود",
+    "Open extra_model_paths_yaml": "باز کردن extra_model_paths.yaml",
+    "Paste": "چسباندن",
+    "Pin/Unpin Selected Items": "سنجاق/برداشتن سنجاق موارد انتخاب‌شده",
+    "Pin/Unpin Selected Nodes": "سنجاق/برداشتن سنجاق Nodeهای انتخاب‌شده",
+    "Previous Opened Workflow": "Workflow قبلی بازشده",
+    "Publish": "انتشار",
+    "Queue Prompt": "افزودن به صف",
+    "Queue Prompt (Front)": "افزودن به ابتدای صف",
+    "Queue Selected Output Nodes": "افزودن Nodeهای خروجی انتخاب‌شده به صف",
+    "Quit": "خروج",
+    "Redo": "انجام مجدد",
+    "Refresh Node Definitions": "به‌روزرسانی تعاریف Node",
+    "Reinstall": "نصب مجدد",
+    "Rename": "تغییر نام",
+    "Reset View": "بازنشانی نما",
+    "Resize Selected Nodes": "تغییر اندازه Nodeهای انتخاب‌شده",
+    "Restart": "راه‌اندازی مجدد",
+    "Rotate Left in MaskEditor": "چرخش به چپ در MaskEditor",
+    "Rotate Right in MaskEditor": "چرخش به راست در MaskEditor",
+    "Save": "ذخیره",
+    "Save As": "ذخیره به عنوان",
+    "Select All": "انتخاب همه",
+    "Set Subgraph Description": "تنظیم توضیح زیرگراف",
+    "Set Subgraph Search Aliases": "تنظیم نام‌های مستعار جستجوی زیرگراف",
+    "Show Keybindings Dialog": "نمایش پنجره کلیدهای میانبر",
+    "Show Model Selector (Dev)": "نمایش انتخاب‌گر مدل (توسعه‌دهنده)",
+    "Show Settings Dialog": "نمایش پنجره تنظیمات",
+    "Sign Out": "خروج از حساب",
+    "Toggle App Mode": "تغییر حالت برنامه",
+    "Toggle Essential Bottom Panel": "تغییر وضعیت پنل ضروری پایین",
+    "Toggle Logs Bottom Panel": "نمایش/مخفی کردن پنل پایینی گزارش‌ها",
+    "Toggle Queue Panel V2": "تغییر وضعیت پنل صف V2",
+    "Toggle Search Box": "تغییر وضعیت جعبه جستجو",
+    "Toggle Terminal Bottom Panel": "نمایش/مخفی کردن پنل پایینی ترمینال",
+    "Toggle Theme (Dark/Light)": "تغییر وضعیت تم (تاریک/روشن)",
+    "Toggle View Controls Bottom Panel": "تغییر وضعیت کنترل‌های نمای پایین",
+    "Toggle promotion of hovered widget": "تغییر وضعیت ارتقاء ابزارک زیر نشانگر",
+    "Undo": "واگرد",
+    "Ungroup selected group nodes": "خارج کردن group nodeهای انتخاب‌شده از گروه",
+    "Unload Models": "خارج کردن مدل‌ها",
+    "Unload Models and Execution Cache": "خارج کردن مدل‌ها و حافظه اجرای موقت",
+    "Unlock Canvas": "باز کردن قفل بوم",
+    "Unpack the selected Subgraph": "باز کردن Subgraph انتخاب‌شده",
+    "View": "نمایش",
+    "Workflows": "Workflowها",
+    "Zoom In": "بزرگ‌نمایی",
+    "Zoom Out": "کوچک‌نمایی",
+    "Zoom to fit": "بزرگ‌نمایی برای تطبیق",
+    "linearMode_appModeToolbar_apps": "linearMode.appModeToolbar.apps"
+  },
+  "minimap": {
+    "nodeColors": "رنگ‌های نود",
+    "renderBypassState": "نمایش وضعیت عبور",
+    "renderErrorState": "نمایش وضعیت خطا",
+    "showGroups": "نمایش قاب‌ها/گروه‌ها",
+    "showLinks": "نمایش پیوندها"
+  },
+  "missingModelsDialog": {
+    "acceptTerms": "پذیرش شرایط",
+    "customModelsInstruction": "باید این مدل‌ها را به صورت دستی پیدا و دانلود کنید. آن‌ها را به صورت آنلاین جستجو کنید (Civitai یا Hugging Face را امتحان کنید) یا با ارائه‌دهنده اصلی گردش‌کار تماس بگیرید.",
+    "customModelsWarning": "برخی از این مدل‌ها سفارشی هستند و ما آن‌ها را نمی‌شناسیم.",
+    "description": "این گردش‌کار به مدل‌هایی نیاز دارد که هنوز آن‌ها را دانلود نکرده‌اید.",
+    "doNotAskAgain": "دیگر نمایش داده نشود",
+    "downloadAll": "دانلود همه",
+    "downloadAvailable": "دانلود موجود",
+    "footerDescription": "این مدل‌ها را دانلود کرده و در پوشه صحیح قرار دهید.\nگره‌هایی که مدل آن‌ها موجود نیست، روی بوم به رنگ قرمز نمایش داده می‌شوند.",
+    "gotIt": "متوجه شدم",
+    "reEnableInSettings": "فعال‌سازی مجدد در {link}",
+    "reEnableInSettingsLink": "تنظیمات",
+    "title": "این گردش‌کار فاقد مدل‌ها است",
+    "totalSize": "حجم کل دانلود:"
+  },
+  "missingNodes": {
+    "cloud": {
+      "description": "این workflow از nodeهای سفارشی استفاده می‌کند که هنوز در نسخه ابری پشتیبانی نمی‌شوند.",
+      "gotIt": "متوجه شدم",
+      "learnMore": "اطلاعات بیشتر",
+      "priorityMessage": "ما این nodeها را به طور خودکار علامت‌گذاری کردیم تا اولویت اضافه شدن آن‌ها را افزایش دهیم.",
+      "replacementInstruction": "در این مدت، در صورت امکان این nodeها (که روی canvas با رنگ قرمز مشخص شده‌اند) را با nodeهای پشتیبانی‌شده جایگزین کنید یا workflow دیگری را امتحان کنید.",
+      "title": "این nodeها هنوز در Comfy Cloud در دسترس نیستند"
+    },
+    "oss": {
+      "description": "این workflow از nodeهای سفارشی استفاده می‌کند که هنوز نصب نکرده‌اید.",
+      "replacementInstruction": "برای اجرای این workflow این nodeها را نصب کنید یا آن‌ها را با گزینه‌های نصب‌شده جایگزین نمایید. nodeهای مفقود روی canvas با رنگ قرمز مشخص شده‌اند.",
+      "title": "این workflow دارای nodeهای مفقود است"
+    }
+  },
+  "nightly": {
+    "badge": {
+      "label": "نسخه پیش‌نمایش",
+      "tooltip": "شما در حال استفاده از نسخه شبانه ComfyUI هستید. لطفاً با استفاده از دکمه بازخورد، نظرات خود را درباره این قابلیت‌ها به اشتراک بگذارید."
+    }
+  },
+  "nightlySurvey": {
+    "accept": "بله، کمک می‌کنم!",
+    "description": "شما از این قابلیت استفاده کرده‌اید. آیا مایل هستید بازخورد خود را با ما به اشتراک بگذارید؟",
+    "dontAskAgain": "دیگر نمایش نده",
+    "loadError": "بارگذاری نظرسنجی ناموفق بود. لطفاً بعداً دوباره تلاش کنید.",
+    "notNow": "فعلاً نه",
+    "title": "به ما در بهبود کمک کنید"
+  },
+  "nodeCategories": {
+    "": "",
+    "3d": "سه‌بعدی",
+    "3d_models": "مدل‌های سه‌بعدی",
+    "BFL": "BFL",
+    "Bria": "Bria",
+    "ByteDance": "ByteDance",
+    "ElevenLabs": "ElevenLabs",
+    "Gemini": "Gemini",
+    "Grok": "Grok",
+    "HitPaw": "HitPaw",
+    "Ideogram": "Ideogram",
+    "Kling": "Kling",
+    "LTXV": "LTXV",
+    "Luma": "Luma",
+    "Magnific": "Magnific",
+    "Meshy": "Meshy",
+    "MiniMax": "MiniMax",
+    "Moonvalley Marey": "Moonvalley Marey",
+    "OpenAI": "OpenAI",
+    "PixVerse": "PixVerse",
+    "Recraft": "Recraft",
+    "Rodin": "Rodin",
+    "Runway": "Runway",
+    "Sora": "Sora",
+    "Stability AI": "Stability AI",
+    "Tencent": "Tencent",
+    "Topaz": "Topaz",
+    "Tripo": "Tripo",
+    "Veo": "Veo",
+    "Vidu": "Vidu",
+    "Wan": "Wan",
+    "WaveSpeed": "WaveSpeed",
+    "_for_testing": "_for_testing",
+    "advanced": "پیشرفته",
+    "animation": "انیمیشن",
+    "api": "API",
+    "api node": "گره API",
+    "attention_experiments": "آزمایش‌های توجه",
+    "audio": "صدا",
+    "batch": "دسته‌ای",
+    "camera": "دوربین",
+    "chroma_radiance": "درخشندگی رنگی",
+    "clip": "clip",
+    "combine": "ترکیب",
+    "compositing": "ترکیب‌بندی",
+    "cond pair": "جفت شرط",
+    "cond single": "شرط تکی",
+    "conditioning": "شرط‌گذاری",
+    "context": "زمینه",
+    "controlnet": "controlnet",
+    "create": "ایجاد",
+    "custom_sampling": "نمونه‌گیری سفارشی",
+    "dataset": "داده‌نما",
+    "debug": "اشکال‌زدایی",
+    "deprecated": "منسوخ",
+    "edit_models": "ویرایش مدل‌ها",
+    "flux": "flux",
+    "gligen": "gligen",
+    "guidance": "راهنمایی",
+    "guiders": "راهنماها",
+    "hooks": "هوک‌ها",
+    "image": "تصویر",
+    "inpaint": "بازسازی",
+    "instructpix2pix": "instructpix2pix",
+    "kandinsky5": "kandinsky5",
+    "latent": "لاتنت",
+    "loaders": "بارگذارها",
+    "logic": "منطق",
+    "lotus": "lotus",
+    "ltxv": "ltxv",
+    "mask": "ماسک",
+    "model": "مدل",
+    "model_merging": "ادغام مدل",
+    "model_patches": "وصله‌های مدل",
+    "model_specific": "ویژه مدل",
+    "noise": "نویز",
+    "operations": "عملیات",
+    "photomaker": "photomaker",
+    "postprocessing": "پس‌پردازش",
+    "preprocessors": "پیش‌پردازنده‌ها",
+    "primitive": "ابتدایی",
+    "qwen": "qwen",
+    "samplers": "نمونه‌گیرها",
+    "sampling": "نمونه‌گیری",
+    "save": "ذخیره",
+    "schedulers": "زمان‌بندی‌ها",
+    "scheduling": "زمان‌بندی",
+    "sd": "sd",
+    "sd3": "sd3",
+    "shader": "shader",
+    "sigmas": "سیگماها",
+    "stable_cascade": "stable cascade",
+    "string": "رشته",
+    "style_model": "مدل سبک",
+    "text": "متن",
+    "textgen": "textgen",
+    "training": "آموزش",
+    "transform": "تبدیل",
+    "unet": "unet",
+    "upscale_diffusion": "پراکندگی افزایش وضوح",
+    "upscaling": "افزایش وضوح",
+    "utils": "ابزارها",
+    "video": "ویدیو",
+    "video_models": "مدل‌های ویدیو",
+    "zimage": "zimage"
+  },
+  "nodeErrors": {
+    "content": "خطای محتوای node",
+    "header": "خطای هدر node",
+    "render": "خطای رندر node",
+    "slots": "خطای slotهای node",
+    "widgets": "خطای widgetهای node"
+  },
+  "nodeFilters": {
+    "hideDeprecated": "مخفی کردن nodeهای منسوخ",
+    "hideDeprecatedDescription": "nodeهایی که به عنوان منسوخ علامت‌گذاری شده‌اند را مگر در صورت فعال‌سازی صریح، مخفی می‌کند.",
+    "hideDevOnly": "مخفی کردن nodeهای مخصوص توسعه‌دهنده",
+    "hideDevOnlyDescription": "nodeهایی که فقط مخصوص توسعه‌دهنده هستند را مگر در صورت فعال بودن حالت توسعه، مخفی می‌کند.",
+    "hideExperimental": "مخفی کردن nodeهای آزمایشی",
+    "hideExperimentalDescription": "nodeهایی که به عنوان آزمایشی علامت‌گذاری شده‌اند را مگر در صورت فعال‌سازی صریح، مخفی می‌کند.",
+    "hideSubgraph": "مخفی کردن nodeهای زیرگراف",
+    "hideSubgraphDescription": "به طور موقت nodeهای زیرگراف را از کتابخانه node و جستجو مخفی می‌کند."
+  },
+  "nodeHelpPage": {
+    "documentationPage": "صفحه مستندات",
+    "inputs": "ورودی‌ها",
+    "loadError": "بارگذاری راهنما ناموفق بود: {error}",
+    "moreHelp": "برای راهنمایی بیشتر، مراجعه کنید به",
+    "outputs": "خروجی‌ها",
+    "type": "نوع"
+  },
+  "nodeReplacement": {
+    "compatibleAlternatives": "گزینه‌های سازگار",
+    "installMissingNodes": "نصب نودهای مفقود",
+    "installationRequired": "نصب مورد نیاز است",
+    "instructionMessage": "برای اجرای workflow باید این نودها را نصب یا با گزینه‌های نصب‌شده جایگزین کنید. نودهای مفقود با رنگ {red} روی بوم مشخص شده‌اند. برخی نودها قابل تعویض نیستند و باید از طریق Node Manager نصب شوند.",
+    "notReplaceable": "نیاز به نصب",
+    "openNodeManager": "باز کردن Node Manager",
+    "quickFixAvailable": "رفع سریع در دسترس است",
+    "redHighlight": "قرمز",
+    "replaceAll": "جایگزینی همه",
+    "replaceAllWarning": "همه گره‌های موجود در این گروه جایگزین خواهند شد.",
+    "replaceFailed": "جایگزینی نودها ناموفق بود",
+    "replaceNode": "جایگزینی گره",
+    "replaceSelected": "جایگزینی انتخاب‌شده‌ها ({count})",
+    "replaceWarning": "این کار workflow را به طور دائمی تغییر می‌دهد. اگر مطمئن نیستید، ابتدا یک نسخه ذخیره کنید.",
+    "replaceable": "قابل جایگزینی",
+    "replaced": "جایگزین شد",
+    "replacedAllNodes": "{count} نوع نود جایگزین شد",
+    "replacedNode": "نود جایگزین شد: {nodeType}",
+    "selectAll": "انتخاب همه",
+    "skipForNow": "فعلاً رد شود",
+    "swapNodesGuide": "گره‌های زیر می‌توانند به‌صورت خودکار با گزینه‌های سازگار جایگزین شوند.",
+    "swapNodesTitle": "جایگزینی گره‌ها",
+    "unknownNode": "ناشناخته",
+    "willBeReplacedBy": "این گره جایگزین خواهد شد با:"
+  },
+  "nodeTemplates": {
+    "enterName": "نام را وارد کنید",
+    "saveAsTemplate": "ذخیره به عنوان قالب"
+  },
+  "notSupported": {
+    "continue": "ادامه",
+    "continueTooltip": "مطمئنم دستگاه من پشتیبانی می‌شود",
+    "illustrationAlt": "تصویر دختر ناراحت",
+    "learnMore": "اطلاعات بیشتر",
+    "message": "فقط دستگاه‌های زیر پشتیبانی می‌شوند:",
+    "reportIssue": "گزارش مشکل",
+    "supportedDevices": {
+      "macos": "MacOS (‏M۱ یا جدیدتر)",
+      "windows": "Windows (کارت گرافیک Nvidia با پشتیبانی CUDA)"
+    },
+    "title": "دستگاه شما پشتیبانی نمی‌شود"
+  },
+  "painter": {
+    "background": "پس‌زمینه",
+    "brush": "براش",
+    "clear": "پاک‌سازی",
+    "color": "انتخاب رنگ",
+    "eraser": "پاک‌کن",
+    "hardness": "سختی",
+    "height": "ارتفاع",
+    "size": "اندازه نشانگر",
+    "tool": "ابزار",
+    "uploadError": "بارگذاری تصویر painter ناموفق بود: {status} - {statusText}",
+    "width": "عرض"
+  },
+  "progressToast": {
+    "allDownloadsCompleted": "همه دانلودها تکمیل شدند",
+    "downloadingModel": "در حال دانلود مدل...",
+    "downloadsFailed": "{count} دانلود ناموفق بود | {count} دانلود ناموفق بود | {count} دانلود ناموفق بودند",
+    "failed": "ناموفق",
+    "filter": {
+      "all": "همه",
+      "completed": "تکمیل شده",
+      "failed": "ناموفق"
+    },
+    "finished": "پایان یافته",
+    "importingModels": "در حال وارد کردن مدل‌ها",
+    "noImportsInQueue": "هیچ {filter} در صف نیست",
+    "pending": "در انتظار",
+    "progressCount": "{completed} از {total}"
+  },
+  "queue": {
+    "completedIn": "پایان یافته در {duration}",
+    "inQueue": "در صف...",
+    "initializingAlmostReady": "در حال راه‌اندازی - تقریباً آماده",
+    "jobAddedToQueue": "کار به صف اضافه شد",
+    "jobDetails": {
+      "computeHoursUsed": "ساعت محاسباتی مصرف‌شده",
+      "errorMessage": "پیام خطا",
+      "estimatedFinishIn": "برآورد پایان در",
+      "estimatedStartIn": "برآورد شروع در",
+      "eta": {
+        "minutes": "~{count} دقیقه | ~{count} دقیقه",
+        "minutesRange": "~{lo}-{hi} دقیقه",
+        "seconds": "~{count} ثانیه | ~{count} ثانیه",
+        "secondsRange": "~{lo}-{hi} ثانیه"
+      },
+      "failedAfter": "ناموفق پس از",
+      "generatedOn": "تولید شده در",
+      "header": "جزئیات کار",
+      "jobId": "شناسه کار",
+      "queuePosition": "موقعیت در صف",
+      "queuePositionValue": "~{count} کار جلوتر از شما | ~{count} کار جلوتر از شما",
+      "queuedAt": "در صف قرار گرفته در",
+      "report": "گزارش",
+      "timeElapsed": "زمان سپری‌شده",
+      "totalGenerationTime": "مجموع زمان تولید",
+      "workflow": "workflow"
+    },
+    "jobHistory": "تاریخچه کارها",
+    "jobList": {
+      "sortComputeHoursUsed": "ساعت محاسباتی مصرف‌شده (بیشترین ابتدا)",
+      "sortMostRecent": "جدیدترین",
+      "sortTotalGenerationTime": "مجموع زمان تولید (بیشترین ابتدا)",
+      "undated": "بدون تاریخ"
+    },
+    "jobMenu": {
+      "addToCurrentWorkflow": "افزودن به workflow فعلی",
+      "cancelJob": "لغو کار",
+      "copyErrorMessage": "کپی پیام خطا",
+      "copyJobId": "کپی شناسه کار",
+      "delete": "حذف",
+      "deleteAsset": "حذف دارایی",
+      "download": "دانلود",
+      "exportWorkflow": "خروجی گرفتن از workflow",
+      "inspectAsset": "بررسی دارایی",
+      "openAsWorkflowNewTab": "باز کردن به عنوان workflow در تب جدید",
+      "openWorkflowNewTab": "باز کردن workflow در تب جدید",
+      "removeJob": "حذف کار",
+      "reportError": "گزارش خطا"
+    },
+    "jobQueueing": "در حال صف‌بندی کار",
+    "toggleJobHistory": "نمایش/مخفی‌سازی تاریخچه کارها"
+  },
+  "releaseToast": {
+    "description": "آخرین بهبودها و قابلیت‌های این به‌روزرسانی را مشاهده کنید.",
+    "newVersionAvailable": "به‌روزرسانی جدید منتشر شد!",
+    "skip": "رد کردن",
+    "update": "به‌روزرسانی",
+    "whatsNew": "مشاهده تغییرات جدید"
+  },
+  "rightSidePanel": {
+    "addFavorite": "افزودن به علاقه‌مندی‌ها",
+    "advancedInputs": "ورودی‌های پیشرفته",
+    "bypass": "عبور",
+    "color": "رنگ نود",
+    "enterSubgraph": "ورود به زیرگراف",
+    "errorHelp": "برای دریافت کمک بیشتر، {github} یا {support}",
+    "errorHelpGithub": "ثبت یک issue در GitHub",
+    "errorHelpSupport": "تماس با پشتیبانی ما",
+    "errors": "خطاها",
+    "executionErrorOccurred": "خطایی در حین اجرا رخ داد. برای جزئیات به تب خطاها مراجعه کنید.",
+    "fallbackGroupTitle": "گروه",
+    "fallbackNodeTitle": "node",
+    "favorites": "ورودی‌های علاقه‌مندی",
+    "favoritesNone": "هیچ ورودی علاقه‌مندی وجود ندارد",
+    "favoritesNoneDesc": "ورودی‌هایی که به علاقه‌مندی‌ها اضافه کنید اینجا نمایش داده می‌شوند",
+    "favoritesNoneHint": "در تب پارامترها، روی {moreIcon} هر ورودی کلیک کنید تا اینجا اضافه شود",
+    "favoritesNoneTooltip": "برای دسترسی سریع، ویجت‌ها را ستاره‌دار کنید تا بدون انتخاب nodeها به آن‌ها دسترسی داشته باشید",
+    "globalSettings": {
+      "canvas": "canvas",
+      "connectionLinks": "اتصالات",
+      "gridSpacing": "فاصله شبکه",
+      "linkShape": "شکل اتصال",
+      "nodes": "nodeها",
+      "nodes2": "nodeها ۲.۰",
+      "searchPlaceholder": "جستجوی تنظیمات سریع...",
+      "showAdvanced": "نمایش پارامترهای پیشرفته",
+      "showAdvancedTooltip": "این یک تنظیم مهم است که در صورت فعال بودن، همه پارامترهای پیشرفته nodeها را نمایش می‌دهد",
+      "showConnectedLinks": "نمایش اتصالات متصل",
+      "showInfoBadges": "نمایش نشان‌های اطلاعاتی",
+      "showToolbox": "نمایش جعبه ابزار هنگام انتخاب",
+      "snapNodesToGrid": "چسباندن nodeها به شبکه",
+      "title": "تنظیمات کلی",
+      "viewAllSettings": "مشاهده همه تنظیمات"
+    },
+    "groupSettings": "تنظیمات گروه",
+    "groups": "گروه‌ها",
+    "hideAdvancedInputsButton": "مخفی کردن ورودی‌های پیشرفته",
+    "hideInput": "مخفی کردن ورودی",
+    "info": "اطلاعات",
+    "inputs": "ورودی‌ها",
+    "inputsNone": "بدون ورودی",
+    "inputsNoneTooltip": "این نود ورودی ندارد",
+    "locateNode": "یافتن node در canvas",
+    "missingNodePacks": {
+      "applyChanges": "اعمال تغییرات",
+      "cloudMessage": "این workflow به nodeهای سفارشی نیاز دارد که هنوز در Comfy Cloud موجود نیستند.",
+      "collapse": "جمع کردن",
+      "expand": "باز کردن",
+      "installAll": "نصب همه",
+      "installNodePack": "نصب پک node",
+      "installed": "نصب شد",
+      "installing": "در حال نصب...",
+      "ossManagerDisabledHint": "برای نصب nodeهای مورد نیاز، ابتدا دستور {pipCmd} را در محیط پایتون خود اجرا کنید تا Node Manager نصب شود، سپس ComfyUI را با پرچم {flag} مجدداً راه‌اندازی کنید.",
+      "ossMessage": "این workflow از nodeهای سفارشی استفاده می‌کند که هنوز نصب نکرده‌اید.",
+      "searchInManager": "جستجو در Node Manager",
+      "title": "پک‌های node مفقود",
+      "unknownPack": "پک ناشناخته",
+      "unsupportedTitle": "پک‌های node پشتیبانی‌نشده",
+      "viewInManager": "مشاهده در Manager"
+    },
+    "mute": "بی‌صدا",
+    "noErrors": "بدون خطا",
+    "noSelection": "یک نود را انتخاب کنید تا ویژگی‌ها و اطلاعات آن نمایش داده شود.",
+    "nodeState": "وضعیت نود",
+    "nodes": "nodeها",
+    "nodesNoneDesc": "هیچ nodeی وجود ندارد",
+    "noneSearchDesc": "هیچ موردی با جستجوی شما مطابقت ندارد",
+    "normal": "عادی",
+    "parameters": "پارامترها",
+    "pinned": "سنجاق شده",
+    "promptErrors": {
+      "no_prompt": {
+        "desc": "داده‌های گردش‌کار ارسال‌شده به سرور خالی است. این ممکن است یک خطای غیرمنتظره سیستمی باشد."
+      },
+      "prompt_no_outputs": {
+        "desc": "گردش‌کار هیچ نود خروجی (مانند Save Image یا Preview Image) برای تولید نتیجه ندارد."
+      },
+      "server_error_cloud": {
+        "desc": "سرور با خطای غیرمنتظره‌ای مواجه شد. لطفاً بعداً دوباره تلاش کنید."
+      },
+      "server_error_local": {
+        "desc": "سرور با خطای غیرمنتظره‌ای مواجه شد. لطفاً لاگ‌های سرور را بررسی کنید."
+      }
+    },
+    "properties": "ویژگی‌ها",
+    "removeFavorite": "حذف از علاقه‌مندی‌ها",
+    "resetAllParameters": "بازنشانی همه پارامترها",
+    "resetToDefault": "بازنشانی به پیش‌فرض",
+    "seeError": "مشاهده خطا",
+    "settings": "تنظیمات",
+    "showAdvancedInputsButton": "نمایش ورودی‌های پیشرفته",
+    "showInput": "نمایش ورودی",
+    "title": "هیچ نودی انتخاب نشده است | ۱ نود انتخاب شده است | {count} نود انتخاب شده‌اند",
+    "togglePanel": "نمایش/پنهان کردن پنل ویژگی‌ها",
+    "workflowOverview": "نمای کلی workflow"
+  },
+  "secrets": {
+    "addSecret": "افزودن کلید محرمانه",
+    "createdAt": "ایجاد شده در {date}",
+    "deleteConfirmMessage": "آیا مطمئن هستید که می‌خواهید «{name}» را حذف کنید؟ این عملیات قابل بازگشت نیست.",
+    "deleteConfirmTitle": "حذف کلید محرمانه",
+    "description": "اسرار به صورت رمزگذاری‌شده ذخیره می‌شوند و برای داده‌های حساس مانند کلیدهای API استفاده می‌شوند.",
+    "descriptionUsage": "توکن‌های خود را اینجا ذخیره کنید تا دانلود مدل‌های خصوصی و محدود از ارائه‌دهندگان پشتیبانی‌شده فعال شود.",
+    "editSecret": "ویرایش کلید محرمانه",
+    "errors": {
+      "duplicateName": "کلیدی با این نام قبلاً وجود دارد",
+      "duplicateProvider": "کلیدی برای این ارائه‌دهنده قبلاً وجود دارد",
+      "nameRequired": "وارد کردن نام الزامی است",
+      "nameTooLong": "نام باید حداکثر ۲۵۵ کاراکتر باشد",
+      "providerRequired": "وارد کردن ارائه‌دهنده الزامی است",
+      "secretValueRequired": "وارد کردن مقدار کلید محرمانه الزامی است"
+    },
+    "lastUsed": "آخرین استفاده {date}",
+    "modelProviders": "ارائه‌دهندگان مدل",
+    "name": "نام",
+    "namePlaceholder": "مثلاً، کلید API من",
+    "noSecrets": "هیچ کلید محرمانه‌ای ذخیره نشده است. اولین کلید API خود را برای شروع اضافه کنید.",
+    "provider": "ارائه‌دهنده",
+    "providerHint": "اختیاری. انتخاب ارائه‌دهنده باعث فعال‌سازی استفاده خودکار از توکن می‌شود.",
+    "secretValue": "مقدار کلید محرمانه",
+    "secretValueHint": "این مقدار رمزگذاری می‌شود و دیگر قابل مشاهده نخواهد بود.",
+    "secretValueHintEdit": "برای حفظ مقدار فعلی، این قسمت را خالی بگذارید.",
+    "secretValuePlaceholder": "کلید API خود را وارد کنید",
+    "secretValuePlaceholderEdit": "برای تغییر مقدار جدید را وارد کنید",
+    "title": "کلیدها و اسرار API"
+  },
+  "selectionToolbox": {
+    "Bypass Group Nodes": "عبور از نودهای گروه",
+    "Set Group Nodes to Always": "تنظیم نودهای گروه روی همیشه",
+    "Set Group Nodes to Never": "تنظیم نودهای گروه روی هرگز",
+    "executeButton": {
+      "disabledTooltip": "هیچ نود خروجی انتخاب نشده است",
+      "tooltip": "اجرا برای نودهای خروجی انتخاب‌شده (با کادر نارنجی مشخص شده‌اند)"
+    }
+  },
+  "serverConfig": {
+    "modifiedConfigs": "شما تنظیمات سرور زیر را تغییر داده‌اید. برای اعمال تغییرات، برنامه را مجدداً راه‌اندازی کنید.",
+    "restart": "راه‌اندازی مجدد",
+    "restartRequiredToastDetail": "برای اعمال تغییرات تنظیمات سرور، برنامه را مجدداً راه‌اندازی کنید.",
+    "restartRequiredToastSummary": "نیاز به راه‌اندازی مجدد",
+    "revertChanges": "بازگرداندن تغییرات"
+  },
+  "serverConfigCategories": {
+    "Attention": "Attention",
+    "CUDA": "CUDA",
+    "Cache": "کش",
+    "Directories": "پوشه‌ها",
+    "General": "عمومی",
+    "Inference": "استنتاج",
+    "Memory": "حافظه",
+    "Network": "شبکه",
+    "Preview": "پیش‌نمایش"
+  },
+  "serverConfigItems": {
+    "cache-classic": {
+      "name": "استفاده از سیستم کش کلاسیک"
+    },
+    "cache-lru": {
+      "name": "استفاده از کش LRU با حداکثر N نتیجه node کش شده.",
+      "tooltip": "ممکن است از RAM/VRAM بیشتری استفاده شود."
+    },
+    "cpu-vae": {
+      "name": "اجرای VAE روی CPU"
+    },
+    "cross-attention-method": {
+      "name": "روش cross attention"
+    },
+    "cuda-device": {
+      "name": "اندیس دستگاه CUDA برای استفاده"
+    },
+    "cuda-malloc": {
+      "name": "استفاده از CUDA malloc برای تخصیص حافظه"
+    },
+    "default-hashing-function": {
+      "name": "تابع هش پیش‌فرض برای فایل‌های مدل"
+    },
+    "deterministic": {
+      "name": "استفاده از الگوریتم‌های قطعی کندتر در pytorch در صورت امکان.",
+      "tooltip": "توجه داشته باشید که این ممکن است در همه موارد تصاویر را قطعی نکند."
+    },
+    "directml": {
+      "name": "اندیس دستگاه DirectML"
+    },
+    "disable-all-custom-nodes": {
+      "name": "غیرفعال‌سازی بارگذاری همه nodeهای سفارشی."
+    },
+    "disable-ipex-optimize": {
+      "name": "غیرفعال‌سازی بهینه‌سازی IPEX"
+    },
+    "disable-metadata": {
+      "name": "غیرفعال‌سازی ذخیره متادیتای prompt در فایل‌ها."
+    },
+    "disable-smart-memory": {
+      "name": "غیرفعال‌سازی مدیریت هوشمند حافظه",
+      "tooltip": "ComfyUI را مجبور می‌کند به طور تهاجمی به RAM معمولی منتقل کند به جای نگه داشتن مدل‌ها در VRAM در صورت امکان."
+    },
+    "disable-xformers": {
+      "name": "غیرفعال‌سازی بهینه‌سازی xFormers"
+    },
+    "dont-print-server": {
+      "name": "عدم چاپ خروجی سرور در کنسول."
+    },
+    "dont-upcast-attention": {
+      "name": "جلوگیری از upcast در attention"
+    },
+    "enable-cors-header": {
+      "name": "فعال‌سازی هدر CORS: برای همه مبداها از \"*\" استفاده کنید یا دامنه را مشخص نمایید"
+    },
+    "enable-manager-legacy-ui": {
+      "name": "استفاده از رابط کاربری قدیمی Manager",
+      "tooltip": "از رابط کاربری قدیمی ComfyUI-Manager به جای رابط کاربری جدید استفاده می‌کند."
+    },
+    "fast": {
+      "name": "فعال‌سازی برخی بهینه‌سازی‌های آزمایش‌نشده و احتمالاً کاهش‌دهنده کیفیت."
+    },
+    "force-channels-last": {
+      "name": "اجبار فرمت حافظه channels-last"
+    },
+    "force-upcast-attention": {
+      "name": "اجبار upcast در attention"
+    },
+    "global-precision": {
+      "name": "دقت ممیز شناور سراسری",
+      "tooltip": "دقت ممیز شناور سراسری"
+    },
+    "input-directory": {
+      "name": "پوشه ورودی"
+    },
+    "listen": {
+      "name": "میزبان: آدرس IP برای گوش دادن"
+    },
+    "log-level": {
+      "name": "سطح جزئیات لاگ"
+    },
+    "max-upload-size": {
+      "name": "حداکثر اندازه بارگذاری (مگابایت)"
+    },
+    "output-directory": {
+      "name": "پوشه خروجی"
+    },
+    "port": {
+      "name": "پورت: شماره پورت برای گوش دادن"
+    },
+    "preview-method": {
+      "name": "روش استفاده شده برای پیش‌نمایش latent"
+    },
+    "preview-size": {
+      "name": "اندازه تصاویر پیش‌نمایش"
+    },
+    "reserve-vram": {
+      "name": "VRAM رزرو شده (گیگابایت)",
+      "tooltip": "مقدار VRAM به گیگابایت که می‌خواهید برای سیستم‌عامل/نرم‌افزارهای دیگر رزرو کنید را تعیین نمایید. به طور پیش‌فرض مقداری بسته به سیستم‌عامل رزرو می‌شود."
+    },
+    "text-encoder-precision": {
+      "name": "دقت Text Encoder",
+      "tooltip": "دقت Text Encoder"
+    },
+    "tls-certfile": {
+      "name": "فایل گواهی TLS: مسیر فایل گواهی TLS برای HTTPS"
+    },
+    "tls-keyfile": {
+      "name": "فایل کلید TLS: مسیر فایل کلید TLS برای HTTPS"
+    },
+    "unet-precision": {
+      "name": "دقت UNET",
+      "tooltip": "دقت UNET"
+    },
+    "vae-precision": {
+      "name": "دقت VAE",
+      "tooltip": "دقت VAE"
+    },
+    "vram-management": {
+      "name": "حالت مدیریت VRAM"
+    }
+  },
+  "serverStart": {
+    "copyAllTooltip": "کپی همه",
+    "copySelectionTooltip": "کپی انتخاب",
+    "errorMessage": "امکان راه‌اندازی ComfyUI Desktop وجود ندارد",
+    "installation": {
+      "title": "در حال نصب ComfyUI"
+    },
+    "openLogs": "باز کردن گزارش‌ها",
+    "process": {
+      "error": "امکان راه‌اندازی ComfyUI Desktop وجود ندارد",
+      "initial-state": "در حال بارگذاری...",
+      "python-setup": "در حال آماده‌سازی محیط Python...",
+      "ready": "در حال بارگذاری رابط کاربری",
+      "starting-server": "در حال راه‌اندازی سرور ComfyUI..."
+    },
+    "reportIssue": "گزارش مشکل",
+    "showTerminal": "نمایش ترمینال",
+    "title": "در حال شروع ComfyUI",
+    "troubleshoot": "عیب‌یابی"
+  },
+  "settingsCategories": {
+    "3D": "سه‌بعدی",
+    "3DViewer": "نمایشگر سه‌بعدی",
+    "API Nodes": "Nodeهای API",
+    "About": "درباره",
+    "Appearance": "ظاهر",
+    "BrushAdjustment": "تنظیم قلم‌مو",
+    "Camera": "دوربین",
+    "Canvas": "بوم",
+    "Canvas Navigation": "ناوبری بوم",
+    "ColorPalette": "پالت رنگ",
+    "Comfy": "Comfy",
+    "Comfy-Desktop": "Comfy-Desktop",
+    "ContextMenu": "منوی زمینه",
+    "Credits": "اعتبارات",
+    "CustomColorPalettes": "پالت‌های رنگ سفارشی",
+    "DevMode": "حالت توسعه‌دهنده",
+    "EditTokenWeight": "ویرایش وزن توکن",
+    "Error System": "سیستم خطا",
+    "Execution": "اجرا",
+    "Extension": "افزونه",
+    "General": "عمومی",
+    "Graph": "گراف",
+    "Group": "گروه",
+    "Keybinding": "کلیدهای میانبر",
+    "Light": "نور",
+    "Link": "پیوند",
+    "LinkRelease": "رهاسازی پیوند",
+    "LiteGraph": "Lite Graph",
+    "Load 3D": "بارگذاری ۳بعدی و انیمیشن",
+    "Locale": "زبان",
+    "Mask Editor": "ویرایشگر Mask",
+    "Menu": "منو",
+    "ModelLibrary": "کتابخانه مدل",
+    "Node": "Node",
+    "Node Library": "کتابخانه گره",
+    "Node Search Box": "جعبه جستجوی Node",
+    "Node Widget": "ویجت Node",
+    "NodeLibrary": "کتابخانه Node",
+    "Nodes 2_0": "Nodes 2.0",
+    "Notification Preferences": "تنظیمات اعلان",
+    "Other": "سایر",
+    "PLY": "PLY",
+    "PlanCredits": "طرح و اعتبارات",
+    "Pointer": "اشاره‌گر",
+    "Queue": "صف",
+    "QueueButton": "دکمه صف",
+    "Reroute": "مسیر مجدد",
+    "RerouteBeta": "مسیر مجدد (بتا)",
+    "Scene": "صحنه",
+    "Secrets": "اسرار",
+    "Server": "سرور",
+    "Server-Config": "پیکربندی سرور",
+    "Settings": "تنظیمات",
+    "Sidebar": "نوار کناری",
+    "Tree Explorer": "کاوشگر درختی",
+    "UV": "UV",
+    "User": "کاربر",
+    "Validation": "اعتبارسنجی",
+    "Vue Nodes": "Nodes 2.0",
+    "VueNodes": "Nodes 2.0",
+    "Window": "پنجره",
+    "Workflow": "Workflow",
+    "Workspace": "محیط کاری"
+  },
+  "shape": {
+    "CARD": "کارت",
+    "arrow": "پیکان",
+    "box": "جعبه",
+    "circle": "دایره",
+    "default": "پیش‌فرض",
+    "round": "گرد"
+  },
+  "shortcuts": {
+    "essentials": "ضروری",
+    "keyboardShortcuts": "میانبرهای صفحه‌کلید",
+    "manageShortcuts": "مدیریت میانبرها",
+    "noKeybinding": "بدون کلید میانبر",
+    "shortcuts": "میانبرها",
+    "subcategories": {
+      "node": "node",
+      "panelControls": "کنترل‌های پنل",
+      "queue": "صف",
+      "view": "نمایش",
+      "workflow": "workflow"
+    },
+    "viewControls": "کنترل‌های نمایش"
+  },
+  "sideToolbar": {
+    "activeJobStatus": "وضعیت کار فعال: {status}",
+    "assets": "دارایی‌ها",
+    "backToAssets": "بازگشت به همه دارایی‌ها",
+    "browseTemplates": "مرور قالب‌های نمونه",
+    "downloads": "دانلودها",
+    "folderView": {
+      "errorDetail": "امکان دریافت خروجی‌ها برای این job وجود ندارد. لطفاً دوباره تلاش کنید.",
+      "errorSummary": "بارگذاری خروجی‌ها ناموفق بود"
+    },
+    "generatedAssetsHeader": "دارایی‌های تولیدشده",
+    "helpCenter": "مرکز راهنما",
+    "importedAssetsHeader": "دارایی‌های واردشده",
+    "labels": {
+      "assets": "دارایی‌ها",
+      "console": "کنسول",
+      "generated": "تولیدشده",
+      "imported": "واردشده",
+      "menu": "منو",
+      "models": "مدل‌ها",
+      "nodes": "Nodeها",
+      "queue": "صف",
+      "templates": "قالب‌ها",
+      "workflows": "Workflowها"
+    },
+    "logout": "خروج",
+    "mediaAssets": {
+      "filter3D": "سه‌بعدی",
+      "filterAudio": "صوت",
+      "filterImage": "تصویر",
+      "filterText": "متن",
+      "filterVideo": "ویدیو",
+      "sortFastestFirst": "زمان تولید (کمترین ابتدا)",
+      "sortLongestFirst": "زمان تولید (بیشترین ابتدا)",
+      "sortNewestFirst": "جدیدترین ابتدا",
+      "sortOldestFirst": "قدیمی‌ترین ابتدا",
+      "title": "دارایی‌های رسانه‌ای",
+      "viewSettings": "نمایش تنظیمات"
+    },
+    "modelLibrary": "کتابخانه مدل",
+    "newBlankWorkflow": "ایجاد Workflow جدید خالی",
+    "noFilesFound": "فایلی یافت نشد",
+    "noFilesFoundMessage": "برای مشاهده فایل‌ها، فایل بارگذاری یا محتوا تولید کنید",
+    "noGeneratedFiles": "فایل تولیدشده‌ای یافت نشد",
+    "noImportedFiles": "فایل واردشده‌ای یافت نشد",
+    "nodeLibrary": "کتابخانه Node",
+    "nodeLibraryTab": {
+      "allNodes": "همه nodeها",
+      "blueprints": "بلوپرینت‌ها",
+      "custom": "سفارشی",
+      "essentials": "ضروریات",
+      "filter": "فیلتر",
+      "filterOptions": {
+        "blueprints": "بلوپرینت‌ها",
+        "comfyNodes": "گره‌های Comfy",
+        "extensions": "افزونه‌ها",
+        "partnerNodes": "گره‌های همکار"
+      },
+      "groupBy": "گروه‌بندی بر اساس",
+      "groupStrategies": {
+        "category": "دسته‌بندی",
+        "categoryDesc": "گروه‌بندی بر اساس دسته Node",
+        "module": "ماژول",
+        "moduleDesc": "گروه‌بندی بر اساس منبع ماژول",
+        "source": "منبع",
+        "sourceDesc": "گروه‌بندی بر اساس نوع منبع (Core، Custom، API)"
+      },
+      "noBookmarkedNodes": "هنوز مورد علاقه‌ای وجود ندارد",
+      "resetView": "بازنشانی نمای پیش‌فرض",
+      "sections": {
+        "bookmarked": "نشان‌شده‌ها",
+        "comfyBlueprints": "بلوپرینت‌های Comfy",
+        "comfyNodes": "گره‌های Comfy",
+        "extensions": "افزونه‌ها",
+        "favoriteNode": "گره مورد علاقه",
+        "favorites": "علاقه‌مندی‌ها",
+        "myBlueprints": "بلوپرینت‌های من",
+        "partnerNodes": "گره‌های همکار",
+        "subgraphBlueprints": "بلوپرینت‌های زیرگراف",
+        "unfavoriteNode": "حذف از علاقه‌مندی‌ها"
+      },
+      "sortBy": {
+        "alphabetical": "حروف الفبا",
+        "alphabeticalDesc": "مرتب‌سازی الفبایی درون گروه‌ها",
+        "original": "اصلی",
+        "originalDesc": "حفظ ترتیب اصلی"
+      },
+      "sortMode": "حالت مرتب‌سازی"
+    },
+    "nodes": "nodeها",
+    "openWorkflow": "باز کردن Workflow در سیستم فایل محلی",
+    "queue": "صف",
+    "queueProgressOverlay": {
+      "activeJobs": "{count} کار فعال",
+      "activeJobsShort": "{count} فعال | {count} فعال",
+      "activeJobsSuffix": "کار فعال",
+      "cancelJobTooltip": "لغو کار",
+      "clearAllJobsTooltip": "لغو همه jobهای در حال اجرا",
+      "clearHistory": "پاک‌سازی تاریخچه صف کار",
+      "clearHistoryDialogAssetsNote": "دارایی‌های تولیدشده توسط این کارها حذف نمی‌شوند و همیشه از پنل دارایی‌ها قابل مشاهده هستند.",
+      "clearHistoryDialogDescription": "همه کارهای تمام‌شده یا ناموفق زیر از این پنل صف کار حذف خواهند شد.",
+      "clearHistoryDialogTitle": "تاریخچه صف کار را پاک کنید؟",
+      "clearHistoryMenuAssetsNote": "دارایی‌های رسانه‌ای حذف نخواهند شد.",
+      "clearQueueTooltip": "پاک‌سازی صف",
+      "clearQueued": "پاک‌سازی صف",
+      "colonPercent": ": {percent}",
+      "currentNode": "Node فعلی:",
+      "dockedJobHistory": "تاریخچه کارهای متصل",
+      "expandCollapsedQueue": "گسترش صف کار",
+      "filterAllWorkflows": "همه Workflowها",
+      "filterBy": "فیلتر بر اساس",
+      "filterCurrentWorkflow": "Workflow فعلی",
+      "filterJobs": "فیلتر کارها",
+      "inlineTotalLabel": "کل",
+      "interruptAll": "توقف همه کارهای در حال اجرا",
+      "jobCompleted": "کار با موفقیت انجام شد",
+      "jobFailed": "کار ناموفق بود",
+      "jobQueue": "صف کار",
+      "jobsAddedToQueue": "{count} کار به صف افزوده شد | {count} کار به صف افزوده شدند",
+      "jobsCompleted": "{count} کار تکمیل شد",
+      "jobsFailed": "{count} کار ناموفق بود",
+      "moreOptions": "گزینه‌های بیشتر",
+      "noActiveJobs": "کار فعالی وجود ندارد",
+      "preview": "پیش‌نمایش",
+      "queuedJobsLabel": "{count} در صف",
+      "queuedSuffix": "در صف",
+      "running": "در حال اجرا",
+      "runningJobsLabel": "{count} در حال اجرا",
+      "runningQueuedSummary": "{running}، {queued}",
+      "searchJobs": "جستجو...",
+      "showAssets": "نمایش دارایی‌ها",
+      "showAssetsPanel": "نمایش پنل دارایی‌ها",
+      "showRunProgressBar": "نمایش نوار پیشرفت اجرا",
+      "sortBy": "مرتب‌سازی بر اساس",
+      "sortJobs": "مرتب‌سازی کارها",
+      "stubClipTextEncode": "CLIP Text Encode:",
+      "title": "پیشرفت صف",
+      "total": "مجموع: {percent}",
+      "viewAllJobs": "مشاهده همه کارها",
+      "viewGrid": "نمای جدولی",
+      "viewJobHistory": "مشاهده تاریخچه کار",
+      "viewList": "نمای لیستی"
+    },
+    "searchAssets": "جستجوی دارایی‌ها",
+    "sidebar": "نوار کناری",
+    "templates": "قالب‌ها",
+    "themeToggle": "تغییر تم",
+    "workflowTab": {
+      "confirmDelete": "آیا مطمئن هستید که می‌خواهید این Workflow را حذف کنید؟",
+      "confirmDeleteTitle": "حذف Workflow؟",
+      "confirmOverwrite": "فایل زیر از قبل وجود دارد. آیا مایل به جایگزینی آن هستید؟",
+      "confirmOverwriteTitle": "جایگزینی فایل موجود؟",
+      "deleteFailed": "تلاش برای حذف Workflow ناموفق بود.",
+      "deleteFailedTitle": "حذف ناموفق بود",
+      "deleted": "Workflow حذف شد",
+      "dirtyClose": "فایل‌های زیر تغییر کرده‌اند. آیا مایل به ذخیره آن‌ها قبل از بستن هستید؟",
+      "dirtyCloseHint": "برای بستن بدون پیام، Shift را نگه دارید",
+      "dirtyCloseTitle": "ذخیره تغییرات؟",
+      "workflowTreeType": {
+        "bookmarks": "نشانک‌ها",
+        "browse": "مرور",
+        "open": "باز"
+      }
+    },
+    "workflows": "Workflowها"
+  },
+  "subgraphStore": {
+    "blueprintName": "نام زیرگراف",
+    "blueprintNamePrompt": "نام Subgraph:",
+    "cannotDeleteGlobal": "امکان حذف blueprints نصب‌شده وجود ندارد",
+    "confirmDelete": "این عمل باعث حذف دائمی بلوپرینت از کتابخانه شما می‌شود",
+    "confirmDeleteTitle": "حذف بلوپرینت؟",
+    "disconnected": "قطع ارتباط",
+    "enterDescription": "توضیحی وارد کنید",
+    "enterSearchAliases": "نام‌های مستعار جستجو را وارد کنید (با ویرگول جدا کنید)",
+    "hidden": "پارامترهای مخفی / تو در تو",
+    "hideAll": "مخفی‌سازی همه",
+    "linked": "(متصل)",
+    "loadFailure": "بارگذاری بلوپرینت‌های زیرگراف ناموفق بود",
+    "overwriteBlueprint": "ذخیره باعث جایگزینی بلوپرینت فعلی با تغییرات شما می‌شود",
+    "overwriteBlueprintTitle": "جایگزینی بلوپرینت موجود؟",
+    "promoteOutsideSubgraph": "امکان ارتقاء ویجت خارج از زیرگراف وجود ندارد",
+    "promoteWidget": "ارتقاء ویجت: {name}",
+    "publish": "انتشار زیرگراف",
+    "publishSuccess": "در کتابخانه گره‌ها ذخیره شد",
+    "publishSuccessMessage": "می‌توانید بلوپرینت زیرگراف خود را در کتابخانه گره‌ها در بخش \"بلوپرینت‌های زیرگراف\" پیدا کنید",
+    "saveBlueprint": "ذخیره زیرگراف در کتابخانه",
+    "searchAliases": "جستجوی نام‌های مستعار",
+    "showAll": "نمایش همه",
+    "showRecommended": "نمایش ویجت‌های پیشنهادی",
+    "shown": "نمایش روی گره",
+    "unpromoteWidget": "لغو ارتقاء ویجت: {name}"
+  },
+  "subscription": {
+    "addApiCredits": "افزودن اعتبار API",
+    "addCredits": "افزودن اعتبار",
+    "addCreditsLabel": "هر زمان اعتبار بیشتری اضافه کنید",
+    "benefits": {
+      "benefit1": "۱۰ دلار اعتبار ماهانه برای Partner Nodes — در صورت نیاز شارژ کنید",
+      "benefit1FreeTier": "اعتبار ماهانه بیشتر، شارژ مجدد در هر زمان",
+      "benefit2": "تا ۳۰ دقیقه زمان اجرا برای هر کار",
+      "benefit3": "امکان استفاده از مدل‌های شخصی (Creator و Pro)"
+    },
+    "beta": "بتا",
+    "billedMonthly": "صورتحساب ماهانه",
+    "billedYearly": "{total} صورتحساب سالانه",
+    "billingComingSoon": {
+      "message": "صورت‌حساب تیمی به‌زودی ارائه می‌شود. به‌زودی می‌توانید برای فضای کاری خود با قیمت هر نفر اشتراک تهیه کنید. برای به‌روزرسانی‌ها همراه ما باشید.",
+      "title": "به‌زودی"
+    },
+    "cancelDialog": {
+      "confirmCancel": "لغو اشتراک",
+      "description": "دسترسی شما تا تاریخ {date} ادامه دارد. دیگر هزینه‌ای دریافت نمی‌شود و فضای کاری و اعتبار شما حفظ خواهد شد. هر زمان می‌توانید دوباره اشتراک تهیه کنید.",
+      "endOfBillingPeriod": "پایان دوره صورتحساب",
+      "failed": "لغو اشتراک ناموفق بود",
+      "keepSubscription": "حفظ اشتراک",
+      "title": "لغو اشتراک"
+    },
+    "cancelSubscription": "لغو اشتراک",
+    "cancelSuccess": "اشتراک با موفقیت لغو شد",
+    "canceled": "لغو شد",
+    "canceledCard": {
+      "description": "دیگر هزینه‌ای از شما دریافت نمی‌شود. امکانات شما تا تاریخ {date} فعال خواهد بود.",
+      "title": "اشتراک شما لغو شده است"
+    },
+    "changeTo": "تغییر به {plan}",
+    "chooseBestPlanWorkspace": "بهترین طرح را برای فضای کاری خود انتخاب کنید",
+    "comfyCloud": "Comfy Cloud",
+    "comfyCloudLogo": "لوگوی Comfy Cloud",
+    "contactOwnerToSubscribe": "برای فعال‌سازی اشتراک با مالک محیط کاری تماس بگیرید",
+    "contactUs": "تماس با ما",
+    "creditsRemainingThisMonth": "شامل شده (شارژ مجدد {date})",
+    "creditsRemainingThisYear": "شامل شده (شارژ مجدد {date})",
+    "creditsYouveAdded": "اضافه شده",
+    "currentPlan": "طرح فعلی",
+    "customLoRAsLabel": "LoRAهای خود را وارد کنید",
+    "description": "بهترین طرح را برای خود انتخاب کنید",
+    "descriptionWorkspace": "بهترین طرح را برای فضای کاری خود انتخاب کنید",
+    "expiresDate": "انقضا در {date}",
+    "freeTier": {
+      "description": "طرح رایگان شما شامل {credits} اعتبار در هر ماه برای استفاده از Comfy Cloud است.",
+      "descriptionGeneric": "طرح رایگان شما شامل اعتبار ماهانه برای استفاده از Comfy Cloud است.",
+      "nextRefresh": "اعتبار شما در تاریخ {date} به‌روزرسانی می‌شود.",
+      "outOfCredits": {
+        "subtitle": "با اشتراک، امکان شارژ مجدد و امکانات بیشتر را فعال کنید",
+        "title": "اعتبار رایگان شما تمام شده است"
+      },
+      "subscribeCta": "اشتراک برای اعتبار بیشتر",
+      "title": "شما در طرح رایگان هستید",
+      "topUpBlocked": {
+        "title": "امکان شارژ مجدد و امکانات بیشتر را فعال کنید"
+      },
+      "upgradeCta": "مشاهده طرح‌ها"
+    },
+    "gpuLabel": "RTX 6000 Pro (۹۶ گیگابایت VRAM)",
+    "haveQuestions": "سوالی دارید یا به دنبال راهکار سازمانی هستید؟",
+    "invoiceHistory": "تاریخچه فاکتورها",
+    "learnMore": "اطلاعات بیشتر",
+    "managePayment": "مدیریت پرداخت",
+    "managePlan": "مدیریت طرح",
+    "manageSubscription": "مدیریت اشتراک",
+    "maxDuration": {
+      "creator": "۳۰ دقیقه",
+      "founder": "۳۰ دقیقه",
+      "free": "۳۰ دقیقه",
+      "pro": "۱ ساعت",
+      "standard": "۳۰ دقیقه"
+    },
+    "maxDurationLabel": "حداکثر مدت اجرا",
+    "maxMembersLabel": "حداکثر اعضا",
+    "member": "عضو",
+    "memberCount": "{count} عضو",
+    "membersLabel": "تا {count} عضو",
+    "messageSupport": "پیام به پشتیبانی",
+    "monthly": "ماهانه",
+    "monthlyBonusDescription": "پاداش ماهانه اعتبار",
+    "monthlyCreditsInfo": "این اعتبارها هر ماه شارژ می‌شوند و منتقل نمی‌شوند",
+    "monthlyCreditsLabel": "اعتبار ماهانه",
+    "monthlyCreditsPerMemberLabel": "اعتبار ماهانه / هر عضو",
+    "monthlyCreditsRollover": "این اعتبارها به ماه بعد منتقل می‌شوند",
+    "mostPopular": "محبوب‌ترین",
+    "nextBillingCycle": "چرخه صورتحساب بعدی",
+    "nextMonthInvoice": "صورتحساب ماه آینده",
+    "partnerNodesBalance": "اعتبار «Partner Nodes»",
+    "partnerNodesCredits": "قیمت‌گذاری Partner Nodes",
+    "partnerNodesDescription": "برای اجرای مدل‌های تجاری/اختصاصی",
+    "perMonth": "/ ماه",
+    "plansAndPricing": "طرح‌ها و قیمت‌ها",
+    "prepaidCreditsInfo": "اعتبارهای پیش‌پرداخت تا یک سال پس از تاریخ خرید منقضی می‌شوند.",
+    "prepaidDescription": "اعتبارهای پیش‌پرداخت",
+    "preview": {
+      "addCreditCard": "افزودن کارت اعتباری",
+      "backToAllPlans": "بازگشت به همه طرح‌ها",
+      "confirm": "تأیید",
+      "confirmPayment": "تأیید پرداخت",
+      "confirmPlanChange": "تأیید تغییر طرح",
+      "eachMonthCreditsRefill": "هر ماه اعتبار به این مقدار بازنشانی می‌شود",
+      "ends": "پایان در {date}",
+      "hideFeatures": "مخفی کردن امکانات",
+      "nextPaymentDue": "پرداخت بعدی در {date}. هر زمان می‌توانید لغو کنید.",
+      "perMember": "/ هر عضو",
+      "privacyPolicy": "سیاست حفظ حریم خصوصی",
+      "proratedCharge": "هزینه متناسب برای {plan}",
+      "proratedRefund": "بازپرداخت متناسب برای {plan}",
+      "showMoreFeatures": "نمایش امکانات بیشتر",
+      "starting": "شروع از {date}",
+      "startingToday": "شروع از امروز",
+      "terms": "شرایط",
+      "termsAgreement": "با ادامه، شما با {terms} و {privacy} Comfy Org موافقت می‌کنید.",
+      "totalDueToday": "مبلغ قابل پرداخت امروز"
+    },
+    "renewsDate": "تمدید در {date}",
+    "required": {
+      "pollingFailed": "فعال‌سازی اشتراک ناموفق بود",
+      "pollingSuccess": "اشتراک با موفقیت فعال شد!",
+      "pollingTimeout": "زمان انتظار برای فعال‌سازی اشتراک به پایان رسید. لطفاً صفحه را تازه‌سازی و دوباره تلاش کنید.",
+      "subscribe": "اشتراک",
+      "title": "اشتراک در",
+      "waitingForSubscription": "اشتراک خود را در تب جدید تکمیل کنید. ما به صورت خودکار اتمام را تشخیص می‌دهیم!"
+    },
+    "resubscribe": "تمدید اشتراک",
+    "resubscribeSuccess": "اشتراک با موفقیت فعال شد",
+    "resubscribeTo": "تمدید اشتراک {plan}",
+    "subscribeForMore": "ارتقاء",
+    "subscribeNow": "هم‌اکنون اشتراک بگیرید",
+    "subscribeTo": "اشتراک در {plan}",
+    "subscribeToComfyCloud": "اشتراک در Comfy Cloud",
+    "subscribeToRun": "اشتراک",
+    "subscribeToRunFull": "اشتراک برای اجرا",
+    "subscriptionRequiredMessage": "برای اجرای workflowها در Cloud، اشتراک لازم است.",
+    "tierNameYearly": "{name} سالانه",
+    "tiers": {
+      "creator": {
+        "name": "خالق"
+      },
+      "founder": {
+        "name": "نسخه بنیان‌گذاران"
+      },
+      "free": {
+        "name": "رایگان"
+      },
+      "pro": {
+        "name": "حرفه‌ای"
+      },
+      "standard": {
+        "name": "استاندارد"
+      }
+    },
+    "title": "اشتراک",
+    "titleUnsubscribed": "اشتراک در Comfy Cloud",
+    "totalCredits": "کل اعتبارها",
+    "upgrade": "ارتقا",
+    "upgradePlan": "ارتقا طرح",
+    "upgradeTo": "ارتقا به {plan}",
+    "upgradeToAddCredits": "برای افزودن اعتبار ارتقاء دهید",
+    "usdPerMonth": "دلار آمریکا / ماه",
+    "usdPerMonthPerMember": "دلار آمریکا / ماه / هر عضو",
+    "videoEstimateExplanation": "این تخمین‌ها بر اساس قالب Wan 2.2 Image-to-Video با تنظیمات پیش‌فرض (۵ ثانیه، ۶۴۰×۶۴۰، ۱۶ فریم بر ثانیه، ۴ مرحله نمونه‌گیری) است.",
+    "videoEstimateHelp": "جزئیات بیشتر درباره این قالب",
+    "videoEstimateLabel": "تخمین تعداد ویدیوهای ۵ ثانیه‌ای تولید شده با قالب Wan 2.2 Image-to-Video",
+    "videoEstimateTryTemplate": "امتحان این قالب",
+    "videoTemplateBasedCredits": "ویدیوهای تولید شده با Wan 2.2 Image to Video",
+    "viewEnterprise": "مشاهده راهکار سازمانی",
+    "viewMoreDetails": "مشاهده جزئیات بیشتر",
+    "viewMoreDetailsPlans": "مشاهده جزئیات بیشتر درباره طرح‌ها و قیمت‌ها",
+    "viewUsageHistory": "مشاهده تاریخچه استفاده",
+    "workspaceNotSubscribed": "این محیط کاری اشتراک فعال ندارد",
+    "yearly": "سالانه",
+    "yearlyCreditsLabel": "کل اعتبار سالانه",
+    "yearlyDiscount": "٪۲۰ تخفیف",
+    "yourPlanIncludes": "طرح شما شامل:"
+  },
+  "tabMenu": {
+    "addToBookmarks": "افزودن به نشانک‌ها",
+    "closeOtherTabs": "بستن سایر تب‌ها",
+    "closeTab": "بستن تب",
+    "closeTabsToLeft": "بستن تب‌های سمت چپ",
+    "closeTabsToRight": "بستن تب‌های سمت راست",
+    "duplicateTab": "ایجاد تب مشابه",
+    "removeFromBookmarks": "حذف از نشانک‌ها"
+  },
+  "templateWidgets": {
+    "sort": {
+      "searchPlaceholder": "جستجو..."
+    }
+  },
+  "templateWorkflows": {
+    "activeFilters": "فیلترها:",
+    "allTemplates": "همه قالب‌ها",
+    "categories": "دسته‌بندی‌ها",
+    "category": {
+      "3D": "سه‌بعدی",
+      "All": "همه قالب‌ها",
+      "Area Composition": "ترکیب ناحیه",
+      "Audio": "صوت",
+      "Basics": "مبانی",
+      "ComfyUI Examples": "نمونه‌های ComfyUI",
+      "ControlNet": "ControlNet",
+      "Custom Nodes": "گره‌های سفارشی",
+      "Extensions": "افزونه‌ها",
+      "Flux": "Flux",
+      "Generation Type": "نوع تولید",
+      "GettingStarted": "شروع کار",
+      "Image": "تصویر",
+      "Image API": "رابط برنامه‌نویسی تصویر",
+      "LLM API": "رابط برنامه‌نویسی LLM",
+      "LLMs": "LLMs",
+      "Partner Nodes": "گره‌های همکار",
+      "Upscaling": "افزایش کیفیت",
+      "Video": "ویدیو",
+      "Video API": "رابط برنامه‌نویسی ویدیو"
+    },
+    "error": {
+      "templateNotFound": "قالب \"{templateName}\" یافت نشد"
+    },
+    "licenseFilter": "مجوز",
+    "loading": "در حال بارگذاری قالب‌ها...",
+    "loadingMore": "در حال بارگذاری قالب‌های بیشتر...",
+    "modelFilter": "فیلتر مدل",
+    "modelsSelected": "{count} مدل",
+    "noResults": "قالبی یافت نشد",
+    "noResultsHint": "لطفاً جستجو یا فیلترهای خود را تغییر دهید",
+    "resetFilters": "پاک‌کردن فیلترها",
+    "resultsCount": "نمایش {count} از {total} قالب",
+    "runsOnFilter": "اجرا روی",
+    "runsOnSelected": "{count} اجرا روی",
+    "searchPlaceholder": "جستجوی قالب‌ها...",
+    "sort": {
+      "alphabetical": "الف → ی",
+      "default": "پیش‌فرض",
+      "modelSizeLowToHigh": "اندازه مدل (کوچک به بزرگ)",
+      "newest": "جدیدترین",
+      "popular": "محبوب",
+      "recommended": "پیشنهادی",
+      "searchPlaceholder": "جستجو...",
+      "vramLowToHigh": "مصرف VRAM (کم به زیاد)"
+    },
+    "sorting": "مرتب‌سازی بر اساس",
+    "title": "شروع با یک قالب",
+    "useCaseFilter": "وظایف",
+    "useCasesSelected": "{count} وظیفه"
+  },
+  "templates": {
+    "logoProviderSeparator": " و "
+  },
+  "toastMessages": {
+    "cannotCreateSubgraph": "امکان ایجاد subgraph وجود ندارد",
+    "couldNotDetermineFileType": "نوع فایل قابل شناسایی نیست",
+    "dropFileError": "امکان پردازش آیتم انداخته‌شده وجود ندارد: {error}",
+    "emptyCanvas": "بوم خالی است",
+    "errorCopyImage": "خطا در کپی تصویر: {error}",
+    "errorLoadingModel": "خطا در بارگذاری مدل",
+    "errorOpenImage": "خطا در باز کردن تصویر: {error}",
+    "errorSaveSetting": "خطا در ذخیره تنظیمات {id}: {err}",
+    "exportSuccess": "مدل با موفقیت با فرمت {format} صادر شد",
+    "failedExecutionPathResolution": "مسیر اجرای nodeهای انتخاب‌شده قابل شناسایی نیست",
+    "failedToAccessBillingPortal": "دسترسی به پورتال صورتحساب انجام نشد: {error}",
+    "failedToApplyTexture": "اعمال بافت با خطا مواجه شد",
+    "failedToConvertToSubgraph": "تبدیل آیتم‌ها به subgraph انجام نشد",
+    "failedToCreateCustomer": "ایجاد مشتری انجام نشد: {error}",
+    "failedToDownloadFile": "دانلود فایل انجام نشد",
+    "failedToExportModel": "صادرات مدل با فرمت {format} انجام نشد",
+    "failedToFetchBalance": "دریافت موجودی انجام نشد: {error}",
+    "failedToFetchLogs": "دریافت گزارش‌های سرور انجام نشد",
+    "failedToFetchSubscription": "دریافت وضعیت اشتراک انجام نشد: {error}",
+    "failedToInitializeLoad3dViewer": "راه‌اندازی نمایشگر سه‌بعدی انجام نشد",
+    "failedToInitiateCreditPurchase": "آغاز خرید اعتبار انجام نشد: {error}",
+    "failedToInitiateSubscription": "آغاز اشتراک انجام نشد: {error}",
+    "failedToLoadBackgroundImage": "بارگذاری تصویر پس‌زمینه انجام نشد",
+    "failedToLoadModel": "بارگذاری مدل سه‌بعدی انجام نشد",
+    "failedToPurchaseCredits": "خرید اعتبار انجام نشد: {error}",
+    "failedToQueue": "صف‌بندی انجام نشد",
+    "failedToSaveDraft": "ذخیره پیش‌نویس workflow ناموفق بود",
+    "failedToToggleCamera": "تغییر وضعیت دوربین انجام نشد",
+    "failedToToggleGrid": "تغییر وضعیت شبکه انجام نشد",
+    "failedToUpdateBackgroundColor": "به‌روزرسانی رنگ پس‌زمینه انجام نشد",
+    "failedToUpdateBackgroundImage": "به‌روزرسانی تصویر پس‌زمینه انجام نشد",
+    "failedToUpdateBackgroundRenderMode": "به‌روزرسانی حالت رندر پس‌زمینه به {mode} انجام نشد",
+    "failedToUpdateEdgeThreshold": "به‌روزرسانی آستانه لبه انجام نشد",
+    "failedToUpdateFOV": "به‌روزرسانی زاویه دید انجام نشد",
+    "failedToUpdateLightIntensity": "به‌روزرسانی شدت نور انجام نشد",
+    "failedToUpdateMaterialMode": "به‌روزرسانی حالت متریال انجام نشد",
+    "failedToUpdateUpDirection": "به‌روزرسانی جهت بالا انجام نشد",
+    "failedToUploadBackgroundImage": "بارگذاری تصویر پس‌زمینه انجام نشد",
+    "fileLoadError": "جریان کاری در {fileName} یافت نشد",
+    "fileTooLarge": "فایل بیش از حد بزرگ است ({size} مگابایت). حداکثر اندازه مجاز {maxSize} مگابایت است",
+    "fileUploadFailed": "بارگذاری فایل انجام نشد",
+    "interrupted": "اجرا متوقف شد",
+    "legacyMaskEditorDeprecated": "ویرایشگر mask قدیمی منسوخ شده و به‌زودی حذف خواهد شد.",
+    "migrateToLitegraphReroute": "nodeهای reroute در نسخه‌های آینده حذف خواهند شد. برای مهاجرت به reroute بومی litegraph کلیک کنید.",
+    "modelLoadedSuccessfully": "مدل سه‌بعدی با موفقیت بارگذاری شد",
+    "no3dScene": "صحنه سه‌بعدی برای اعمال بافت وجود ندارد",
+    "no3dSceneToExport": "صحنه سه‌بعدی برای صادرات وجود ندارد",
+    "noTemplatesToExport": "قالبی برای صادرات وجود ندارد",
+    "nodeDefinitionsUpdated": "تعاریف node به‌روزرسانی شد",
+    "nothingSelected": "موردی انتخاب نشده است",
+    "nothingToGroup": "موردی برای گروه‌بندی وجود ندارد",
+    "nothingToQueue": "موردی برای صف‌بندی وجود ندارد",
+    "pendingTasksDeleted": "وظایف در انتظار حذف شدند",
+    "pleaseSelectNodesToGroup": "لطفاً nodeها (یا گروه‌های دیگر) را برای ایجاد گروه انتخاب کنید",
+    "pleaseSelectOutputNodes": "لطفاً nodeهای خروجی را انتخاب کنید",
+    "unableToGetModelFilePath": "امکان دریافت مسیر فایل مدل وجود ندارد",
+    "unauthorizedDomain": "دامنه شما ({domain}) مجاز به استفاده از این سرویس نیست. لطفاً برای افزودن دامنه خود به لیست سفید با {email} تماس بگیرید.",
+    "updateRequested": "درخواست به‌روزرسانی ثبت شد",
+    "useApiKeyTip": "نکته: به ورود عادی دسترسی ندارید؟ از گزینه Comfy API Key استفاده کنید.",
+    "userNotAuthenticated": "کاربر احراز هویت نشده است"
+  },
+  "userSelect": {
+    "enterUsername": "نام کاربری را وارد کنید",
+    "existingUser": "کاربر موجود",
+    "newUser": "کاربر جدید",
+    "next": "بعدی",
+    "selectUser": "انتخاب کاربر"
+  },
+  "userSettings": {
+    "accountSettings": "تنظیمات حساب کاربری",
+    "email": "ایمیل",
+    "name": "نام",
+    "notSet": "تنظیم نشده",
+    "provider": "ارائه‌دهنده ورود",
+    "title": "تنظیمات حساب کاربری من",
+    "updatePassword": "به‌روزرسانی گذرواژه",
+    "workspaceSettings": "تنظیمات محیط کاری"
+  },
+  "validation": {
+    "descriptionRequired": "توضیحات الزامی است",
+    "invalidEmail": "آدرس ایمیل نامعتبر است",
+    "length": "باید {length} کاراکتر باشد",
+    "maxLength": "نباید بیش از {length} کاراکتر باشد",
+    "minLength": "باید حداقل {length} کاراکتر باشد",
+    "password": {
+      "lowercase": "باید حداقل یک حرف کوچک داشته باشد",
+      "match": "گذرواژه‌ها باید یکسان باشند",
+      "minLength": "باید بین ۸ تا ۳۲ کاراکتر باشد",
+      "number": "باید حداقل یک عدد داشته باشد",
+      "requirements": "الزامات گذرواژه",
+      "special": "باید حداقل یک کاراکتر ویژه داشته باشد",
+      "uppercase": "باید حداقل یک حرف بزرگ داشته باشد"
+    },
+    "personalDataConsentRequired": "شما باید با پردازش داده‌های شخصی خود موافقت کنید.",
+    "prefix": "باید با {prefix} شروع شود",
+    "required": "ضروری"
+  },
+  "versionMismatchWarning": {
+    "dismiss": "رد کردن",
+    "frontendNewer": "نسخه رابط کاربری {frontendVersion} ممکن است با نسخه پشتی {backendVersion} سازگار نباشد.",
+    "frontendOutdated": "نسخه رابط کاربری {frontendVersion} قدیمی است. نسخه پشتی نیاز به نسخه {requiredVersion} یا بالاتر دارد.",
+    "title": "هشدار ناسازگاری نسخه",
+    "updateFrontend": "به‌روزرسانی رابط کاربری"
+  },
+  "vueNodesBanner": {
+    "desc": "– workflowهای منعطف‌تر، ابزارک‌های قدرتمند جدید، ساخته‌شده برای توسعه‌پذیری",
+    "title": "معرفی Nodes 2.0",
+    "tryItOut": "امتحان کنید"
+  },
+  "vueNodesMigration": {
+    "button": "بازگشت",
+    "message": "طراحی قدیمی را ترجیح می‌دهید؟"
+  },
+  "vueNodesMigrationMainMenu": {
+    "message": "در هر زمان می‌توانید از منوی اصلی به Nodes 2.0 بازگردید."
+  },
+  "vueNodesSlot": {
+    "iterative": "(تکراری)"
+  },
+  "welcome": {
+    "getStarted": "شروع کنید",
+    "title": "به ComfyUI خوش آمدید"
+  },
+  "whatsNewPopup": {
+    "later": "بعداً",
+    "learnMore": "بیشتر بدانید",
+    "noReleaseNotes": "یادداشت نسخه‌ای موجود نیست."
+  },
+  "widgetFileUpload": {
+    "browseFiles": "انتخاب فایل‌ها",
+    "dropPrompt": "فایل خود را رها کنید یا"
+  },
+  "widgets": {
+    "boolean": {
+      "false": "نادرست",
+      "true": "درست"
+    },
+    "node2only": "فقط Node 2.0",
+    "selectModel": "انتخاب مدل",
+    "uploadSelect": {
+      "maxSelectionReached": "حداکثر تعداد انتخاب مجاز رسید",
+      "placeholder": "انتخاب...",
+      "placeholderAudio": "انتخاب صوت...",
+      "placeholderImage": "انتخاب تصویر...",
+      "placeholderMesh": "مش را انتخاب کنید...",
+      "placeholderModel": "انتخاب مدل...",
+      "placeholderUnknown": "انتخاب رسانه...",
+      "placeholderVideo": "انتخاب ویدیو..."
+    },
+    "valueControl": {
+      "decrement": "کاهش مقدار",
+      "decrementDesc": "عدد ۱ از مقدار کم می‌کند یا گزینه قبلی را انتخاب می‌کند",
+      "editSettings": "ویرایش تنظیمات کنترل",
+      "fixed": "مقدار ثابت",
+      "fixedDesc": "مقدار را بدون تغییر باقی می‌گذارد",
+      "header": {
+        "after": "پس از",
+        "before": "پیش از",
+        "postfix": "اجرای workflow:",
+        "prefix": "به‌روزرسانی خودکار مقدار"
+      },
+      "increment": "افزایش مقدار",
+      "incrementDesc": "عدد ۱ به مقدار اضافه می‌کند یا گزینه بعدی را انتخاب می‌کند",
+      "linkToGlobal": "پیوند به",
+      "linkToGlobalDesc": "مقدار یکتا که به تنظیم کنترل مقدار سراسری متصل است",
+      "linkToGlobalSeed": "مقدار سراسری",
+      "randomize": "تصادفی‌سازی مقدار",
+      "randomizeDesc": "مقدار را پس از هر تولید به صورت تصادفی تغییر می‌دهد"
+    }
+  },
+  "workflowService": {
+    "enterFilename": "نام فایل را وارد کنید",
+    "enterFilenamePrompt": "نام فایل را وارد کنید:",
+    "exportWorkflow": "خروجی گرفتن از workflow",
+    "saveWorkflow": "ذخیره workflow",
+    "savedAsApp": "به گردش‌کار اپلیکیشن تبدیل شد",
+    "savedAsWorkflow": "به گردش‌کار فقط گراف node تبدیل شد"
+  },
+  "workspace": {
+    "addedToWorkspace": "شما به {workspaceName} اضافه شدید",
+    "inviteAccepted": "دعوت پذیرفته شد",
+    "inviteFailed": "پذیرش دعوت ناموفق بود",
+    "unsavedChanges": {
+      "message": "شما تغییرات ذخیره‌نشده دارید. آیا می‌خواهید آن‌ها را رها کرده و فضای کاری را تغییر دهید؟",
+      "title": "تغییرات ذخیره‌نشده"
+    },
+    "viewWorkspace": "مشاهده workspace"
+  },
+  "workspaceAuth": {
+    "errors": {
+      "accessDenied": "شما به این فضای کاری دسترسی ندارید.",
+      "invalidFirebaseToken": "احراز هویت ناموفق بود. لطفاً دوباره وارد شوید.",
+      "notAuthenticated": "برای دسترسی به فضاهای کاری باید وارد شوید.",
+      "tokenExchangeFailed": "احراز هویت با فضای کاری ناموفق بود: {error}",
+      "workspaceNotFound": "فضای کاری پیدا نشد."
+    }
+  },
+  "workspacePanel": {
+    "createWorkspaceDialog": {
+      "create": "ایجاد",
+      "message": "محیط‌های کاری به اعضا اجازه می‌دهند از یک اعتبار مشترک استفاده کنند. پس از ایجاد، شما مالک خواهید بود.",
+      "nameLabel": "نام محیط کاری*",
+      "namePlaceholder": "نام محیط کاری را وارد کنید",
+      "title": "ایجاد محیط کاری جدید"
+    },
+    "dashboard": {
+      "placeholder": "تنظیمات داشبورد فضای کاری"
+    },
+    "deleteDialog": {
+      "message": "هرگونه اعتبار یا دارایی ذخیره‌نشده از بین خواهد رفت. این عملیات قابل بازگشت نیست.",
+      "messageWithName": "حذف «{name}»؟ هرگونه اعتبار یا دارایی ذخیره‌نشده از بین خواهد رفت. این عملیات قابل بازگشت نیست.",
+      "title": "حذف این محیط کاری؟"
+    },
+    "editWorkspaceDialog": {
+      "nameLabel": "نام محیط کاری",
+      "save": "ذخیره",
+      "title": "ویرایش جزئیات محیط کاری"
+    },
+    "invite": "دعوت",
+    "inviteLimitReached": "شما به حداکثر تعداد ۵۰ عضو رسیده‌اید",
+    "inviteMember": "دعوت عضو",
+    "inviteMemberDialog": {
+      "createLink": "ایجاد لینک",
+      "linkCopied": "کپی شد",
+      "linkCopyFailed": "کپی لینک ناموفق بود",
+      "linkStep": {
+        "copyLink": "کپی لینک",
+        "done": "انجام شد",
+        "message": "اطمینان حاصل کنید که حساب کاربری او از این ایمیل استفاده می‌کند.",
+        "title": "این لینک را برای شخص ارسال کنید"
+      },
+      "message": "یک لینک دعوت قابل اشتراک‌گذاری برای ارسال به شخص ایجاد کنید",
+      "placeholder": "ایمیل شخص را وارد کنید",
+      "title": "دعوت یک نفر به این فضای کاری"
+    },
+    "inviteUpsellDialog": {
+      "messageNotSubscribed": "برای افزودن اعضای تیم به این workspace، به پلن Creator یا بالاتر نیاز دارید. پلن Standard فقط یک نفر (مالک) را پشتیبانی می‌کند.",
+      "messageSingleSeat": "پلن Standard فقط یک صندلی برای مالک workspace دارد. برای دعوت اعضای بیشتر، به پلن Creator یا بالاتر ارتقا دهید تا امکان افزودن چندین نفر فعال شود.",
+      "titleNotSubscribed": "برای دعوت اعضا نیاز به اشتراک دارید",
+      "titleSingleSeat": "پلن فعلی شما فقط یک نفر را پشتیبانی می‌کند",
+      "upgradeToCreator": "ارتقا به Creator",
+      "viewPlans": "مشاهده پلن‌ها"
+    },
+    "leaveDialog": {
+      "leave": "خروج",
+      "message": "تا زمانی که با مالک محیط کاری تماس نگیرید، امکان پیوستن مجدد نخواهید داشت.",
+      "title": "خروج از این محیط کاری؟"
+    },
+    "members": {
+      "actions": {
+        "copyLink": "کپی لینک دعوت",
+        "removeMember": "حذف عضو",
+        "revokeInvite": "لغو دعوت"
+      },
+      "columns": {
+        "expiryDate": "تاریخ انقضا",
+        "inviteDate": "تاریخ دعوت",
+        "joinDate": "تاریخ پیوستن"
+      },
+      "createNewWorkspace": "یک فضای کاری جدید ایجاد کنید.",
+      "membersCount": "{count}/۵۰ عضو",
+      "noInvites": "هیچ دعوت‌نامه‌ای در انتظار نیست",
+      "noMembers": "هیچ عضوی وجود ندارد",
+      "pendingInvitesCount": "{count} دعوت‌نامه در انتظار | {count} دعوت‌نامه در انتظار",
+      "personalWorkspaceMessage": "در حال حاضر نمی‌توانید اعضای دیگری به فضای کاری شخصی خود دعوت کنید. برای افزودن اعضا به یک فضای کاری،",
+      "tabs": {
+        "active": "فعال",
+        "pendingCount": "در انتظار ({count})"
+      },
+      "upsellBannerSubscribe": "برای دعوت اعضای تیم به این workspace، به پلن Creator یا بالاتر اشتراک تهیه کنید.",
+      "upsellBannerUpgrade": "برای دعوت اعضای بیشتر به این workspace، به پلن Creator یا بالاتر ارتقا دهید.",
+      "viewPlans": "مشاهده پلن‌ها"
+    },
+    "menu": {
+      "deleteWorkspace": "حذف محیط کاری",
+      "deleteWorkspaceDisabledTooltip": "ابتدا اشتراک فعال محیط کاری خود را لغو کنید",
+      "editWorkspace": "ویرایش جزئیات محیط کاری",
+      "leaveWorkspace": "خروج از محیط کاری"
+    },
+    "removeMemberDialog": {
+      "error": "حذف عضو ناموفق بود",
+      "message": "این عضو از فضای کاری شما حذف خواهد شد. اعتباراتی که استفاده کرده‌اند بازگردانده نخواهد شد.",
+      "remove": "حذف عضو",
+      "success": "عضو حذف شد",
+      "title": "این عضو حذف شود؟"
+    },
+    "revokeInviteDialog": {
+      "message": "این عضو دیگر نمی‌تواند به فضای کاری شما بپیوندد. لینک دعوت او نامعتبر خواهد شد.",
+      "revoke": "لغو دعوت",
+      "title": "دعوت این شخص لغو شود؟"
+    },
+    "tabs": {
+      "dashboard": "داشبورد",
+      "membersCount": "اعضا ({count})",
+      "planCredits": "پلن و اعتبارها"
+    },
+    "toast": {
+      "failedToCreateWorkspace": "ایجاد محیط کاری ناموفق بود",
+      "failedToDeleteWorkspace": "حذف محیط کاری ناموفق بود",
+      "failedToFetchWorkspaces": "بارگذاری فضاهای کاری ناموفق بود",
+      "failedToLeaveWorkspace": "خروج از محیط کاری ناموفق بود",
+      "failedToUpdateWorkspace": "به‌روزرسانی محیط کاری ناموفق بود",
+      "workspaceCreated": {
+        "message": "برای یک طرح اشتراک ثبت‌نام کنید، هم‌تیمی‌ها را دعوت کنید و همکاری را آغاز نمایید.",
+        "subscribe": "اشتراک",
+        "title": "فضای کاری ایجاد شد"
+      },
+      "workspaceDeleted": {
+        "message": "فضای کاری به طور دائمی حذف شد.",
+        "title": "فضای کاری حذف شد"
+      },
+      "workspaceLeft": {
+        "message": "شما فضای کاری را ترک کردید.",
+        "title": "ترک فضای کاری"
+      },
+      "workspaceUpdated": {
+        "message": "جزئیات محیط کاری ذخیره شد.",
+        "title": "محیط کاری به‌روزرسانی شد"
+      }
+    }
+  },
+  "workspaceSwitcher": {
+    "createWorkspace": "ایجاد محیط کاری جدید",
+    "maxWorkspacesReached": "شما فقط می‌توانید مالک ۱۰ محیط کاری باشید. برای ایجاد محیط کاری جدید، یکی را حذف کنید.",
+    "personal": "شخصی",
+    "roleMember": "عضو",
+    "roleOwner": "مالک",
+    "subscribe": "اشتراک",
+    "switchWorkspace": "تغییر محیط کاری"
+  },
+  "zoomControls": {
+    "hideMinimap": "مخفی‌سازی نقشه کوچک",
+    "label": "کنترل‌های بزرگ‌نمایی",
+    "showMinimap": "نمایش نقشه کوچک",
+    "zoomToFit": "بزرگ‌نمایی متناسب"
+  }
+}
diff --git a/src/locales/fa/nodeDefs.json b/src/locales/fa/nodeDefs.json
new file mode 100644
index 0000000000..f0536fd938
--- /dev/null
+++ b/src/locales/fa/nodeDefs.json
@@ -0,0 +1,18659 @@
+{
+  "APG": {
+    "display_name": "راهنمایی تطبیقی تصویری",
+    "inputs": {
+      "eta": {
+        "name": "اتا",
+        "tooltip": "مقیاس بردار راهنمایی موازی را کنترل می‌کند. رفتار پیش‌فرض CFG در مقدار ۱."
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "momentum": {
+        "name": "مومنتوم",
+        "tooltip": "میانگین‌گیری متحرک راهنمایی در طول انتشار را کنترل می‌کند، در مقدار ۰ غیرفعال است."
+      },
+      "norm_threshold": {
+        "name": "آستانه نرمال‌سازی",
+        "tooltip": "بردار راهنمایی را به این مقدار نرمال‌سازی می‌کند، نرمال‌سازی در مقدار ۰ غیرفعال است."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "AddNoise": {
+    "display_name": "AddNoise",
+    "inputs": {
+      "latent_image": {
+        "name": "تصویر latent"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "noise": {
+        "name": "نویز"
+      },
+      "sigmas": {
+        "name": "سیگماها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "AddTextPrefix": {
+    "display_name": "افزودن پیشوند به متن",
+    "inputs": {
+      "prefix": {
+        "name": "پیشوند",
+        "tooltip": "پیشوندی که باید افزوده شود."
+      },
+      "texts": {
+        "name": "متن‌ها",
+        "tooltip": "متنی که باید پردازش شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "متن‌ها",
+        "tooltip": "متن‌های پردازش‌شده"
+      }
+    }
+  },
+  "AddTextSuffix": {
+    "display_name": "افزودن پسوند به متن",
+    "inputs": {
+      "suffix": {
+        "name": "پسوند",
+        "tooltip": "پسوندی که باید افزوده شود."
+      },
+      "texts": {
+        "name": "متن‌ها",
+        "tooltip": "متنی که باید پردازش شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "متن‌ها",
+        "tooltip": "متن‌های پردازش‌شده"
+      }
+    }
+  },
+  "AdjustBrightness": {
+    "display_name": "تنظیم روشنایی",
+    "inputs": {
+      "factor": {
+        "name": "ضریب",
+        "tooltip": "ضریب روشنایی. ۱.۰ = بدون تغییر، کمتر از ۱.۰ = تیره‌تر، بیشتر از ۱.۰ = روشن‌تر."
+      },
+      "images": {
+        "name": "تصاویر",
+        "tooltip": "تصویری که باید پردازش شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "تصاویر",
+        "tooltip": "تصاویر پردازش‌شده"
+      }
+    }
+  },
+  "AdjustContrast": {
+    "display_name": "تنظیم کنتراست",
+    "inputs": {
+      "factor": {
+        "name": "ضریب",
+        "tooltip": "ضریب کنتراست. ۱.۰ = بدون تغییر، کمتر از ۱.۰ = کنتراست کمتر، بیشتر از ۱.۰ = کنتراست بیشتر."
+      },
+      "images": {
+        "name": "تصاویر",
+        "tooltip": "تصویری که باید پردازش شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "تصاویر",
+        "tooltip": "تصاویر پردازش‌شده"
+      }
+    }
+  },
+  "AlignYourStepsScheduler": {
+    "display_name": "AlignYourStepsScheduler",
+    "inputs": {
+      "denoise": {
+        "name": "کاهش نویز"
+      },
+      "model_type": {
+        "name": "نوع مدل"
+      },
+      "steps": {
+        "name": "گام‌ها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "AudioAdjustVolume": {
+    "display_name": "تنظیم حجم صدا",
+    "inputs": {
+      "audio": {
+        "name": "صدا"
+      },
+      "volume": {
+        "name": "حجم صدا",
+        "tooltip": "تنظیم حجم صدا بر حسب دسی‌بل (dB). ۰ = بدون تغییر، +۶ = دو برابر، -۶ = نصف و غیره"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "AudioConcat": {
+    "description": "صداهای audio1 و audio2 را در جهت مشخص‌شده به هم متصل می‌کند.",
+    "display_name": "Audio Concat",
+    "inputs": {
+      "audio1": {
+        "name": "audio1"
+      },
+      "audio2": {
+        "name": "audio2"
+      },
+      "direction": {
+        "name": "جهت",
+        "tooltip": "آیا audio2 بعد یا قبل از audio1 اضافه شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "AudioEncoderEncode": {
+    "display_name": "AudioEncoderEncode",
+    "inputs": {
+      "audio": {
+        "name": "audio"
+      },
+      "audio_encoder": {
+        "name": "audio_encoder"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "AudioEncoderLoader": {
+    "display_name": "AudioEncoderLoader",
+    "inputs": {
+      "audio_encoder_name": {
+        "name": "audio_encoder_name"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "AudioEqualizer3Band": {
+    "display_name": "اکولایزر صوتی (۳-باند)",
+    "inputs": {
+      "audio": {
+        "name": "audio"
+      },
+      "high_freq": {
+        "name": "high_freq",
+        "tooltip": "فرکانس قطع برای شلف بالا"
+      },
+      "high_gain_dB": {
+        "name": "high_gain_dB",
+        "tooltip": "افزایش برای فرکانس‌های بالا (تریبل)"
+      },
+      "low_freq": {
+        "name": "low_freq",
+        "tooltip": "فرکانس قطع برای شلف پایین"
+      },
+      "low_gain_dB": {
+        "name": "low_gain_dB",
+        "tooltip": "افزایش برای فرکانس‌های پایین (بیس)"
+      },
+      "mid_freq": {
+        "name": "mid_freq",
+        "tooltip": "فرکانس مرکزی برای میانی"
+      },
+      "mid_gain_dB": {
+        "name": "mid_gain_dB",
+        "tooltip": "افزایش برای فرکانس‌های میانی"
+      },
+      "mid_q": {
+        "name": "mid_q",
+        "tooltip": "ضریب Q (پهنای باند) برای میانی"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "AudioMerge": {
+    "description": "دو ترک صوتی را با هم ترکیب می‌کند و موج‌های صوتی آن‌ها را روی هم قرار می‌دهد.",
+    "display_name": "Audio Merge",
+    "inputs": {
+      "audio1": {
+        "name": "audio1"
+      },
+      "audio2": {
+        "name": "audio2"
+      },
+      "merge_method": {
+        "name": "روش ترکیب",
+        "tooltip": "روشی که برای ترکیب موج‌های صوتی استفاده می‌شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BasicGuider": {
+    "display_name": "BasicGuider",
+    "inputs": {
+      "conditioning": {
+        "name": "شرط‌گذاری"
+      },
+      "model": {
+        "name": "مدل"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BasicScheduler": {
+    "display_name": "BasicScheduler",
+    "inputs": {
+      "denoise": {
+        "name": "کاهش نویز"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "scheduler": {
+        "name": "زمان‌بندی"
+      },
+      "steps": {
+        "name": "گام‌ها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchImagesNode": {
+    "display_name": "Batch Images",
+    "inputs": {
+      "images": {
+        "name": "تصاویر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchLatentsNode": {
+    "display_name": "Batch Latents",
+    "inputs": {
+      "latents": {
+        "name": "latents"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchMasksNode": {
+    "display_name": "Batch Masks",
+    "inputs": {
+      "masks": {
+        "name": "ماسک‌ها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BetaSamplingScheduler": {
+    "display_name": "BetaSamplingScheduler",
+    "inputs": {
+      "alpha": {
+        "name": "آلفا"
+      },
+      "beta": {
+        "name": "بتا"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "steps": {
+        "name": "گام‌ها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BriaImageEditNode": {
+    "description": "ویرایش تصاویر با استفاده از جدیدترین مدل Bria",
+    "display_name": "ویرایش تصویر Bria",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "guidance_scale": {
+        "name": "مقیاس راهنما",
+        "tooltip": "مقدار بالاتر باعث می‌شود تصویر بیشتر از پرامپت پیروی کند."
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "mask": {
+        "name": "ماسک",
+        "tooltip": "در صورت عدم انتخاب، ویرایش بر کل تصویر اعمال می‌شود."
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "moderation": {
+        "name": "تنظیمات نظارت",
+        "tooltip": "تنظیمات نظارت"
+      },
+      "negative_prompt": {
+        "name": "پرامپت منفی"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "دستورالعمل برای ویرایش تصویر"
+      },
+      "seed": {
+        "name": "بذر"
+      },
+      "steps": {
+        "name": "گام‌ها"
+      },
+      "structured_prompt": {
+        "name": "پرامپت ساختاریافته",
+        "tooltip": "یک رشته شامل پرامپت ویرایش ساختاریافته در قالب JSON. برای کنترل دقیق و برنامه‌نویسی شده، به جای پرامپت معمولی از این گزینه استفاده کنید."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "پرامپت ساختاریافته",
+        "tooltip": null
+      }
+    }
+  },
+  "BriaRemoveImageBackground": {
+    "description": "حذف پس‌زمینه از یک تصویر با استفاده از Bria RMBG ۲.۰.",
+    "display_name": "حذف پس‌زمینه تصویر Bria",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "moderation": {
+        "name": "مدیریت محتوا",
+        "tooltip": "تنظیمات مدیریت محتوا"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed تعیین می‌کند که node باید دوباره اجرا شود یا خیر؛ نتایج صرف‌نظر از seed غیرقطعی هستند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BriaRemoveVideoBackground": {
+    "description": "حذف پس‌زمینه از یک ویدیو با استفاده از Bria.",
+    "display_name": "حذف پس‌زمینه ویدیو Bria",
+    "inputs": {
+      "background_color": {
+        "name": "رنگ پس‌زمینه",
+        "tooltip": "رنگ پس‌زمینه برای ویدیوی خروجی."
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed تعیین می‌کند که node باید دوباره اجرا شود یا خیر؛ نتایج صرف‌نظر از seed غیرقطعی هستند."
+      },
+      "video": {
+        "name": "ویدیو"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ByteDanceFirstLastFrameNode": {
+    "description": "تولید ویدیو با استفاده از پرامپت و اولین و آخرین فریم.",
+    "display_name": "تبدیل اولین و آخرین فریم به ویدیو ByteDance",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبت تصویر",
+        "tooltip": "نسبت تصویر ویدیوی خروجی."
+      },
+      "camera_fixed": {
+        "name": "ثابت بودن دوربین",
+        "tooltip": "مشخص می‌کند که آیا دوربین ثابت باشد یا خیر. پلتفرم یک دستور برای ثابت کردن دوربین به پرامپت شما اضافه می‌کند، اما تضمینی برای نتیجه نهایی وجود ندارد."
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان",
+        "tooltip": "مدت زمان ویدیوی خروجی بر حسب ثانیه."
+      },
+      "first_frame": {
+        "name": "اولین فریم",
+        "tooltip": "اولین فریم مورد استفاده برای ویدیو."
+      },
+      "generate_audio": {
+        "name": "تولید صدا",
+        "tooltip": "این پارامتر فقط برای مدل seedance-1-5-pro معتبر است و برای سایر مدل‌ها نادیده گرفته می‌شود."
+      },
+      "last_frame": {
+        "name": "آخرین فریم",
+        "tooltip": "آخرین فریم مورد استفاده برای ویدیو."
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "متن پرامپت مورد استفاده برای تولید ویدیو."
+      },
+      "resolution": {
+        "name": "وضوح تصویر",
+        "tooltip": "وضوح تصویر ویدیوی خروجی."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed مورد استفاده برای تولید."
+      },
+      "watermark": {
+        "name": "واترمارک",
+        "tooltip": "آیا واترمارک «تولید شده توسط هوش مصنوعی» به ویدیو اضافه شود یا خیر."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ByteDanceImageNode": {
+    "description": "تولید تصویر با استفاده از مدل‌های ByteDance از طریق API بر اساس پرامپت",
+    "display_name": "تصویر ByteDance",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "guidance_scale": {
+        "name": "guidance_scale",
+        "tooltip": "مقدار بالاتر باعث می‌شود تصویر بیشتر از پرامپت پیروی کند"
+      },
+      "height": {
+        "name": "ارتفاع",
+        "tooltip": "ارتفاع سفارشی برای تصویر. این مقدار فقط زمانی اعمال می‌شود که «پیش‌تنظیم اندازه» روی «سفارشی» باشد."
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "متن پرامپت مورد استفاده برای تولید تصویر"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed مورد استفاده برای تولید"
+      },
+      "size_preset": {
+        "name": "پیش‌تنظیم اندازه",
+        "tooltip": "یک اندازه پیشنهادی انتخاب کنید. برای استفاده از عرض و ارتفاع سفارشی، گزینه سفارشی را انتخاب کنید."
+      },
+      "watermark": {
+        "name": "واترمارک",
+        "tooltip": "آیا واترمارک «تولید شده توسط هوش مصنوعی» به تصویر اضافه شود یا خیر"
+      },
+      "width": {
+        "name": "عرض",
+        "tooltip": "عرض سفارشی برای تصویر. این مقدار فقط زمانی اعمال می‌شود که «پیش‌تنظیم اندازه» روی «سفارشی» باشد."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ByteDanceImageReferenceNode": {
+    "description": "تولید ویدیو با استفاده از پرامپت و تصاویر مرجع.",
+    "display_name": "تبدیل تصاویر مرجع ByteDance به ویدیو",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبت تصویر",
+        "tooltip": "نسبت تصویر ویدیوی خروجی."
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان",
+        "tooltip": "مدت زمان ویدیوی خروجی بر حسب ثانیه."
+      },
+      "images": {
+        "name": "تصاویر",
+        "tooltip": "یک تا چهار تصویر."
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "متن پرامپت برای تولید ویدیو استفاده می‌شود."
+      },
+      "resolution": {
+        "name": "رزولوشن",
+        "tooltip": "رزولوشن ویدیوی خروجی."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed مورد استفاده برای تولید."
+      },
+      "watermark": {
+        "name": "واترمارک",
+        "tooltip": "آیا واترمارک «تولید شده توسط هوش مصنوعی» به ویدیو اضافه شود؟"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ByteDanceImageToVideoNode": {
+    "description": "تولید ویدیو با استفاده از مدل‌های ByteDance از طریق API بر اساس تصویر و پرامپت",
+    "display_name": "تبدیل تصویر به ویدیو ByteDance",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبت تصویر",
+        "tooltip": "نسبت تصویر ویدیوی خروجی."
+      },
+      "camera_fixed": {
+        "name": "ثابت بودن دوربین",
+        "tooltip": "مشخص می‌کند که آیا دوربین ثابت باشد. پلتفرم یک دستور برای ثابت نگه داشتن دوربین به پرامپت شما اضافه می‌کند، اما تضمینی برای نتیجه نهایی وجود ندارد."
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان",
+        "tooltip": "مدت زمان ویدیوی خروجی بر حسب ثانیه."
+      },
+      "generate_audio": {
+        "name": "تولید صدا",
+        "tooltip": "این پارامتر فقط برای مدل seedance-1-5-pro معتبر است و برای سایر مدل‌ها نادیده گرفته می‌شود."
+      },
+      "image": {
+        "name": "تصویر",
+        "tooltip": "اولین فریم مورد استفاده برای ویدیو."
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "متن پرامپت برای تولید ویدیو استفاده می‌شود."
+      },
+      "resolution": {
+        "name": "رزولوشن",
+        "tooltip": "رزولوشن ویدیوی خروجی."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed مورد استفاده برای تولید."
+      },
+      "watermark": {
+        "name": "واترمارک",
+        "tooltip": "آیا واترمارک «تولید شده توسط هوش مصنوعی» به ویدیو اضافه شود؟"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ByteDanceSeedreamNode": {
+    "description": "تولید یکپارچه تصویر از متن و ویرایش دقیق جمله‌ای تا وضوح ۴K.",
+    "display_name": "ByteDance Seedream ۴.۵",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "fail_on_partial": {
+        "name": "توقف در صورت ناقص بودن",
+        "tooltip": "در صورت فعال بودن، اگر هر یک از تصاویر درخواستی موجود نباشد یا خطا رخ دهد، اجرا متوقف می‌شود."
+      },
+      "height": {
+        "name": "ارتفاع",
+        "tooltip": "ارتفاع سفارشی برای تصویر. این مقدار فقط زمانی اعمال می‌شود که «پیش‌تنظیم اندازه» روی «سفارشی» باشد."
+      },
+      "image": {
+        "name": "تصویر",
+        "tooltip": "تصویر(ها)ی ورودی برای تولید تصویر از تصویر. فهرستی از ۱ تا ۱۰ تصویر برای تولید تک یا چند مرجع."
+      },
+      "max_images": {
+        "name": "حداکثر تصاویر",
+        "tooltip": "حداکثر تعداد تصاویری که هنگام فعال بودن تولید ترتیبی تصویر (auto) تولید می‌شود. مجموع تصاویر (ورودی + تولید شده) نباید از ۱۵ بیشتر باشد."
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت متنی برای ایجاد یا ویرایش تصویر."
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر مورد استفاده برای تولید."
+      },
+      "sequential_image_generation": {
+        "name": "تولید ترتیبی تصویر",
+        "tooltip": "حالت گروهی تولید تصویر. «غیرفعال» یک تصویر تولید می‌کند. «خودکار» به مدل اجازه می‌دهد تصمیم بگیرد که چند تصویر مرتبط (مثلاً صحنه‌های داستان، واریاسیون شخصیت) تولید کند."
+      },
+      "size_preset": {
+        "name": "پیش‌تنظیم اندازه",
+        "tooltip": "یک اندازه پیشنهادی انتخاب کنید. برای استفاده از عرض و ارتفاع سفارشی، گزینه سفارشی را انتخاب کنید."
+      },
+      "watermark": {
+        "name": "واترمارک",
+        "tooltip": "آیا واترمارک «تولید شده توسط هوش مصنوعی» به تصویر اضافه شود یا خیر."
+      },
+      "width": {
+        "name": "عرض",
+        "tooltip": "عرض سفارشی برای تصویر. این مقدار فقط زمانی اعمال می‌شود که «پیش‌تنظیم اندازه» روی «سفارشی» باشد."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ByteDanceTextToVideoNode": {
+    "description": "تولید ویدیو با استفاده از مدل‌های ByteDance از طریق API بر اساس پرامپت",
+    "display_name": "تبدیل متن به ویدیو ByteDance",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبت تصویر",
+        "tooltip": "نسبت تصویر ویدیوی خروجی."
+      },
+      "camera_fixed": {
+        "name": "ثابت بودن دوربین",
+        "tooltip": "مشخص می‌کند که آیا دوربین ثابت باشد یا خیر. پلتفرم یک دستور برای ثابت کردن دوربین به پرامپت شما اضافه می‌کند، اما تضمینی برای نتیجه نهایی وجود ندارد."
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان",
+        "tooltip": "مدت زمان ویدیوی خروجی بر حسب ثانیه."
+      },
+      "generate_audio": {
+        "name": "تولید صدا",
+        "tooltip": "این پارامتر فقط برای مدل seedance-1-5-pro معتبر است و برای سایر مدل‌ها نادیده گرفته می‌شود."
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت متنی مورد استفاده برای تولید ویدیو."
+      },
+      "resolution": {
+        "name": "وضوح",
+        "tooltip": "وضوح ویدیوی خروجی."
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر مورد استفاده برای تولید."
+      },
+      "watermark": {
+        "name": "واترمارک",
+        "tooltip": "آیا واترمارک «تولید شده توسط هوش مصنوعی» به ویدیو اضافه شود یا خیر."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CFGGuider": {
+    "display_name": "CFGGuider",
+    "inputs": {
+      "cfg": {
+        "name": "cfg"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CFGNorm": {
+    "display_name": "CFGNorm",
+    "inputs": {
+      "model": {
+        "name": "مدل"
+      },
+      "strength": {
+        "name": "شدت"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مدل_اصلاح‌شده",
+        "tooltip": null
+      }
+    }
+  },
+  "CFGZeroStar": {
+    "display_name": "CFGZeroStar",
+    "inputs": {
+      "model": {
+        "name": "مدل"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مدل_اصلاح‌شده",
+        "tooltip": null
+      }
+    }
+  },
+  "CLIPAttentionMultiply": {
+    "display_name": "CLIPAttentionMultiply",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "k": {
+        "name": "k"
+      },
+      "out": {
+        "name": "out"
+      },
+      "q": {
+        "name": "q"
+      },
+      "v": {
+        "name": "v"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "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: old t5 xxl\nlumina2: gemma 2 2B\nwan: umt5 xxl\n hidream: llama-3.1 (توصیه می‌شود) یا t5\nomnigen2: qwen vl 2.5 3B",
+    "display_name": "بارگذاری CLIP",
+    "inputs": {
+      "clip_name": {
+        "name": "clip_name"
+      },
+      "device": {
+        "name": "device"
+      },
+      "type": {
+        "name": "type"
+      }
+    }
+  },
+  "CLIPMergeAdd": {
+    "display_name": "CLIPMergeAdd",
+    "inputs": {
+      "clip1": {
+        "name": "clip1"
+      },
+      "clip2": {
+        "name": "clip2"
+      }
+    }
+  },
+  "CLIPMergeSimple": {
+    "display_name": "CLIPMergeSimple",
+    "inputs": {
+      "clip1": {
+        "name": "clip1"
+      },
+      "clip2": {
+        "name": "clip2"
+      },
+      "ratio": {
+        "name": "ratio"
+      }
+    }
+  },
+  "CLIPMergeSubtract": {
+    "display_name": "CLIPMergeSubtract",
+    "inputs": {
+      "clip1": {
+        "name": "clip1"
+      },
+      "clip2": {
+        "name": "clip2"
+      },
+      "multiplier": {
+        "name": "multiplier"
+      }
+    }
+  },
+  "CLIPSave": {
+    "display_name": "ذخیره CLIP",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "filename_prefix": {
+        "name": "filename_prefix"
+      }
+    }
+  },
+  "CLIPSetLastLayer": {
+    "display_name": "تنظیم آخرین لایه CLIP",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "stop_at_clip_layer": {
+        "name": "stop_at_clip_layer"
+      }
+    }
+  },
+  "CLIPTextEncode": {
+    "description": "یک پرامپت متنی را با استفاده از مدل CLIP به یک بردار تعبیه‌شده تبدیل می‌کند که می‌تواند برای هدایت مدل diffusion جهت تولید تصاویر خاص استفاده شود.",
+    "display_name": "رمزگذاری متن CLIP (پرامپت)",
+    "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "مدل CLIP مورد استفاده برای رمزگذاری متن."
+      },
+      "text": {
+        "name": "متن",
+        "tooltip": "متنی که باید رمزگذاری شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "یک conditioning شامل متن تعبیه‌شده برای هدایت مدل diffusion."
+      }
+    }
+  },
+  "CLIPTextEncodeControlnet": {
+    "display_name": "CLIPTextEncodeControlnet",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "conditioning": {
+        "name": "conditioning"
+      },
+      "text": {
+        "name": "متن"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CLIPTextEncodeFlux": {
+    "display_name": "CLIPTextEncodeFlux",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "clip_l": {
+        "name": "clip_l"
+      },
+      "guidance": {
+        "name": "راهنما"
+      },
+      "t5xxl": {
+        "name": "t5xxl"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CLIPTextEncodeHiDream": {
+    "display_name": "CLIPTextEncodeHiDream",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "clip_g": {
+        "name": "clip_g"
+      },
+      "clip_l": {
+        "name": "clip_l"
+      },
+      "llama": {
+        "name": "llama"
+      },
+      "t5xxl": {
+        "name": "t5xxl"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CLIPTextEncodeHunyuanDiT": {
+    "display_name": "CLIPTextEncodeHunyuanDiT",
+    "inputs": {
+      "bert": {
+        "name": "bert"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "mt5xl": {
+        "name": "mt5xl"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CLIPTextEncodeKandinsky5": {
+    "display_name": "CLIPTextEncodeKandinsky5",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "clip_l": {
+        "name": "clip_l"
+      },
+      "qwen25_7b": {
+        "name": "qwen25_7b"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CLIPTextEncodeLumina2": {
+    "description": "یک پرامپت سیستمی و یک پرامپت کاربر را با استفاده از مدل CLIP به یک بردار تعبیه‌شده تبدیل می‌کند که می‌تواند برای هدایت مدل diffusion جهت تولید تصاویر خاص استفاده شود.",
+    "display_name": "رمزگذاری متن CLIP برای Lumina2",
+    "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "مدل CLIP مورد استفاده برای رمزگذاری متن."
+      },
+      "system_prompt": {
+        "name": "پرامپت سیستمی",
+        "tooltip": "Lumina2 دو نوع پرامپت سیستمی ارائه می‌دهد: Superior: شما یک دستیار هستید که برای تولید تصاویر برتر با بالاترین میزان تطابق متن و تصویر بر اساس پرامپت‌های متنی یا پرامپت‌های کاربر طراحی شده‌اید. Alignment: شما یک دستیار هستید که برای تولید تصاویر باکیفیت با بالاترین میزان تطابق متن و تصویر بر اساس پرامپت‌های متنی طراحی شده‌اید."
+      },
+      "user_prompt": {
+        "name": "پرامپت کاربر",
+        "tooltip": "متنی که باید رمزگذاری شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "یک conditioning شامل متن تعبیه‌شده برای هدایت مدل diffusion."
+      }
+    }
+  },
+  "CLIPTextEncodePixArtAlpha": {
+    "description": "متن را رمزگذاری می‌کند و شرط وضوح تصویر را برای PixArt Alpha تنظیم می‌نماید. برای PixArt Sigma اعمال نمی‌شود.",
+    "display_name": "CLIPTextEncodePixArtAlpha",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "text": {
+        "name": "متن"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CLIPTextEncodeSD3": {
+    "display_name": "CLIPTextEncodeSD3",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "clip_g": {
+        "name": "clip_g"
+      },
+      "clip_l": {
+        "name": "clip_l"
+      },
+      "empty_padding": {
+        "name": "فاصله خالی"
+      },
+      "t5xxl": {
+        "name": "t5xxl"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CLIPTextEncodeSDXL": {
+    "display_name": "CLIPTextEncodeSDXL",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "crop_h": {
+        "name": "برش_ارتفاع"
+      },
+      "crop_w": {
+        "name": "برش_عرض"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "target_height": {
+        "name": "ارتفاع هدف"
+      },
+      "target_width": {
+        "name": "عرض هدف"
+      },
+      "text_g": {
+        "name": "متن_g"
+      },
+      "text_l": {
+        "name": "متن_l"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CLIPTextEncodeSDXLRefiner": {
+    "display_name": "CLIPTextEncodeSDXLRefiner",
+    "inputs": {
+      "ascore": {
+        "name": "امتیاز"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "text": {
+        "name": "متن"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CLIPVisionEncode": {
+    "display_name": "رمزگذاری CLIP Vision",
+    "inputs": {
+      "clip_vision": {
+        "name": "clip_vision"
+      },
+      "crop": {
+        "name": "برش"
+      },
+      "image": {
+        "name": "تصویر"
+      }
+    }
+  },
+  "CLIPVisionLoader": {
+    "display_name": "بارگذاری CLIP Vision",
+    "inputs": {
+      "clip_name": {
+        "name": "نام clip"
+      }
+    }
+  },
+  "Canny": {
+    "display_name": "Canny",
+    "inputs": {
+      "high_threshold": {
+        "name": "آستانه بالا"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "low_threshold": {
+        "name": "آستانه پایین"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CaseConverter": {
+    "display_name": "تبدیل حروف",
+    "inputs": {
+      "mode": {
+        "name": "حالت"
+      },
+      "string": {
+        "name": "رشته"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CenterCropImages": {
+    "display_name": "برش مرکزی تصاویر",
+    "inputs": {
+      "height": {
+        "name": "ارتفاع",
+        "tooltip": "ارتفاع برش."
+      },
+      "images": {
+        "name": "تصاویر",
+        "tooltip": "تصویر برای پردازش."
+      },
+      "width": {
+        "name": "عرض",
+        "tooltip": "عرض برش."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "تصاویر",
+        "tooltip": "تصاویر پردازش‌شده"
+      }
+    }
+  },
+  "CheckpointLoader": {
+    "display_name": "بارگذاری چک‌پوینت با تنظیمات (منسوخ‌شده)",
+    "inputs": {
+      "ckpt_name": {
+        "name": "نام چک‌پوینت"
+      },
+      "config_name": {
+        "name": "نام تنظیمات"
+      }
+    }
+  },
+  "CheckpointLoaderSimple": {
+    "description": "یک چک‌پوینت مدل diffusion را بارگذاری می‌کند. مدل‌های diffusion برای حذف نویز از latentها استفاده می‌شوند.",
+    "display_name": "بارگذاری چک‌پوینت",
+    "inputs": {
+      "ckpt_name": {
+        "name": "نام چک‌پوینت",
+        "tooltip": "نام چک‌پوینت (مدل) برای بارگذاری."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "مدل مورد استفاده برای حذف نویز از latentها."
+      },
+      "1": {
+        "tooltip": "مدل CLIP مورد استفاده برای رمزگذاری دستورات متنی."
+      },
+      "2": {
+        "tooltip": "مدل VAE مورد استفاده برای رمزگذاری و رمزگشایی تصاویر به و از فضای latent."
+      }
+    }
+  },
+  "CheckpointSave": {
+    "display_name": "ذخیره چک‌پوینت",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "filename_prefix": {
+        "name": "پیشوند نام فایل"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
+  "ChromaRadianceOptions": {
+    "description": "امکان تنظیم گزینه‌های پیشرفته برای مدل Chroma Radiance را فراهم می‌کند.",
+    "display_name": "ChromaRadianceOptions",
+    "inputs": {
+      "end_sigma": {
+        "name": "end_sigma",
+        "tooltip": "آخرین سیگما که این گزینه‌ها اعمال می‌شوند."
+      },
+      "model": {
+        "name": "model"
+      },
+      "nerf_tile_size": {
+        "name": "nerf_tile_size",
+        "tooltip": "امکان تغییر اندازه tile پیش‌فرض NeRF را فراهم می‌کند. مقدار ‎-۱‎ به معنی استفاده از مقدار پیش‌فرض (۳۲) است. مقدار ۰ به معنی استفاده از حالت بدون tile است (ممکن است به حافظه VRAM زیادی نیاز داشته باشد)."
+      },
+      "preserve_wrapper": {
+        "name": "preserve_wrapper",
+        "tooltip": "در صورت فعال بودن، به یک wrapper تابع مدل موجود ارجاع داده می‌شود اگر وجود داشته باشد. معمولاً بهتر است این گزینه فعال باقی بماند."
+      },
+      "start_sigma": {
+        "name": "start_sigma",
+        "tooltip": "اولین سیگما که این گزینه‌ها اعمال می‌شوند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ColorToRGBInt": {
+    "description": "تبدیل یک رنگ به مقدار صحیح RGB.",
+    "display_name": "تبدیل رنگ به مقدار صحیح RGB",
+    "inputs": {
+      "color": {
+        "name": "رنگ"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مقدار صحیح RGB",
+        "tooltip": null
+      }
+    }
+  },
+  "CombineHooks2": {
+    "display_name": "ترکیب هوک‌ها [۲]",
+    "inputs": {
+      "hooks_A": {
+        "name": "هوک_A"
+      },
+      "hooks_B": {
+        "name": "هوک_B"
+      }
+    }
+  },
+  "CombineHooks4": {
+    "display_name": "ترکیب هوک‌ها [۴]",
+    "inputs": {
+      "hooks_A": {
+        "name": "هوک_A"
+      },
+      "hooks_B": {
+        "name": "هوک_B"
+      },
+      "hooks_C": {
+        "name": "هوک_C"
+      },
+      "hooks_D": {
+        "name": "هوک_D"
+      }
+    }
+  },
+  "CombineHooks8": {
+    "display_name": "ترکیب قلاب‌ها [۸]",
+    "inputs": {
+      "hooks_A": {
+        "name": "hooks_A"
+      },
+      "hooks_B": {
+        "name": "hooks_B"
+      },
+      "hooks_C": {
+        "name": "hooks_C"
+      },
+      "hooks_D": {
+        "name": "hooks_D"
+      },
+      "hooks_E": {
+        "name": "hooks_E"
+      },
+      "hooks_F": {
+        "name": "hooks_F"
+      },
+      "hooks_G": {
+        "name": "hooks_G"
+      },
+      "hooks_H": {
+        "name": "hooks_H"
+      }
+    }
+  },
+  "ComfySwitchNode": {
+    "display_name": "سوئیچ",
+    "inputs": {
+      "on_false": {
+        "name": "در حالت نادرست"
+      },
+      "on_true": {
+        "name": "در حالت درست"
+      },
+      "switch": {
+        "name": "سوئیچ"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "خروجی",
+        "tooltip": null
+      }
+    }
+  },
+  "ConditioningAverage": {
+    "display_name": "میانگین شرطی‌سازی",
+    "inputs": {
+      "conditioning_from": {
+        "name": "شرطی‌سازی مبدا"
+      },
+      "conditioning_to": {
+        "name": "شرطی‌سازی مقصد"
+      },
+      "conditioning_to_strength": {
+        "name": "قدرت شرطی‌سازی مقصد"
+      }
+    }
+  },
+  "ConditioningCombine": {
+    "display_name": "شرطی‌سازی (ترکیب)",
+    "inputs": {
+      "conditioning_1": {
+        "name": "شرطی‌سازی ۱"
+      },
+      "conditioning_2": {
+        "name": "شرطی‌سازی ۲"
+      }
+    }
+  },
+  "ConditioningConcat": {
+    "display_name": "شرطی‌سازی (ادغام)",
+    "inputs": {
+      "conditioning_from": {
+        "name": "شرطی‌سازی مبدا"
+      },
+      "conditioning_to": {
+        "name": "شرطی‌سازی مقصد"
+      }
+    }
+  },
+  "ConditioningSetArea": {
+    "display_name": "شرطی‌سازی (تنظیم ناحیه)",
+    "inputs": {
+      "conditioning": {
+        "name": "شرطی‌سازی"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "strength": {
+        "name": "قدرت"
+      },
+      "width": {
+        "name": "عرض"
+      },
+      "x": {
+        "name": "محور X"
+      },
+      "y": {
+        "name": "محور Y"
+      }
+    }
+  },
+  "ConditioningSetAreaPercentage": {
+    "display_name": "شرطی‌سازی (تنظیم ناحیه با درصد)",
+    "inputs": {
+      "conditioning": {
+        "name": "شرطی‌سازی"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "strength": {
+        "name": "قدرت"
+      },
+      "width": {
+        "name": "عرض"
+      },
+      "x": {
+        "name": "محور X"
+      },
+      "y": {
+        "name": "محور Y"
+      }
+    }
+  },
+  "ConditioningSetAreaPercentageVideo": {
+    "display_name": "شرطی‌سازی (تنظیم ناحیه با درصد برای ویدیو)",
+    "inputs": {
+      "conditioning": {
+        "name": "شرطی‌سازی"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "strength": {
+        "name": "قدرت"
+      },
+      "temporal": {
+        "name": "زمانی"
+      },
+      "width": {
+        "name": "عرض"
+      },
+      "x": {
+        "name": "محور X"
+      },
+      "y": {
+        "name": "محور Y"
+      },
+      "z": {
+        "name": "محور Z"
+      }
+    }
+  },
+  "ConditioningSetAreaStrength": {
+    "display_name": "شرطی‌سازی (تنظیم قدرت ناحیه)",
+    "inputs": {
+      "conditioning": {
+        "name": "شرطی‌سازی"
+      },
+      "strength": {
+        "name": "قدرت"
+      }
+    }
+  },
+  "ConditioningSetDefaultCombine": {
+    "display_name": "شرطی‌سازی (ترکیب پیش‌فرض)",
+    "inputs": {
+      "cond": {
+        "name": "شرط"
+      },
+      "cond_DEFAULT": {
+        "name": "شرط پیش‌فرض"
+      },
+      "hooks": {
+        "name": "قلاب‌ها"
+      }
+    }
+  },
+  "ConditioningSetMask": {
+    "display_name": "شرط‌گذاری (تنظیم ماسک)",
+    "inputs": {
+      "conditioning": {
+        "name": "شرط‌گذاری"
+      },
+      "mask": {
+        "name": "ماسک"
+      },
+      "set_cond_area": {
+        "name": "تنظیم ناحیه شرط"
+      },
+      "strength": {
+        "name": "شدت"
+      }
+    }
+  },
+  "ConditioningSetProperties": {
+    "display_name": "ویژگی‌های مجموعه شرط",
+    "inputs": {
+      "cond_NEW": {
+        "name": "شرط_NEW"
+      },
+      "hooks": {
+        "name": "هوک‌ها"
+      },
+      "mask": {
+        "name": "ماسک"
+      },
+      "set_cond_area": {
+        "name": "تنظیم ناحیه شرط"
+      },
+      "strength": {
+        "name": "شدت"
+      },
+      "timesteps": {
+        "name": "گام‌های زمانی"
+      }
+    }
+  },
+  "ConditioningSetPropertiesAndCombine": {
+    "display_name": "ترکیب ویژگی‌های مجموعه شرط",
+    "inputs": {
+      "cond": {
+        "name": "شرط"
+      },
+      "cond_NEW": {
+        "name": "شرط_NEW"
+      },
+      "hooks": {
+        "name": "هوک‌ها"
+      },
+      "mask": {
+        "name": "ماسک"
+      },
+      "set_cond_area": {
+        "name": "تنظیم ناحیه شرط"
+      },
+      "strength": {
+        "name": "شدت"
+      },
+      "timesteps": {
+        "name": "گام‌های زمانی"
+      }
+    }
+  },
+  "ConditioningSetTimestepRange": {
+    "display_name": "محدوده گام زمانی شرط‌گذاری",
+    "inputs": {
+      "conditioning": {
+        "name": "شرط‌گذاری"
+      },
+      "end": {
+        "name": "پایان"
+      },
+      "start": {
+        "name": "شروع"
+      }
+    }
+  },
+  "ConditioningStableAudio": {
+    "display_name": "شرط‌گذاری Stable Audio",
+    "inputs": {
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "seconds_start": {
+        "name": "ثانیه شروع"
+      },
+      "seconds_total": {
+        "name": "کل ثانیه"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      }
+    }
+  },
+  "ConditioningTimestepsRange": {
+    "display_name": "محدوده گام‌های زمانی",
+    "inputs": {
+      "end_percent": {
+        "name": "درصد پایان"
+      },
+      "start_percent": {
+        "name": "درصد شروع"
+      }
+    },
+    "outputs": {
+      "1": {
+        "name": "قبل از محدوده"
+      },
+      "2": {
+        "name": "بعد از محدوده"
+      }
+    }
+  },
+  "ConditioningZeroOut": {
+    "display_name": "صفر کردن شرط‌گذاری",
+    "inputs": {
+      "conditioning": {
+        "name": "شرط‌گذاری"
+      }
+    }
+  },
+  "ContextWindowsManual": {
+    "description": "تنظیم دستی پنجره‌های زمینه.",
+    "display_name": "پنجره‌های زمینه (دستی)",
+    "inputs": {
+      "closed_loop": {
+        "name": "حلقه بسته",
+        "tooltip": "آیا حلقه پنجره زمینه بسته شود؛ فقط برای برنامه‌ریزی حلقه‌ای قابل استفاده است."
+      },
+      "context_length": {
+        "name": "طول پنجره زمینه",
+        "tooltip": "طول پنجره زمینه."
+      },
+      "context_overlap": {
+        "name": "همپوشانی پنجره زمینه",
+        "tooltip": "میزان همپوشانی پنجره زمینه."
+      },
+      "context_schedule": {
+        "name": "برنامه‌ریزی پنجره زمینه",
+        "tooltip": "گام‌بندی پنجره زمینه."
+      },
+      "context_stride": {
+        "name": "گام پنجره زمینه",
+        "tooltip": "گام پنجره زمینه؛ فقط برای برنامه‌ریزی یکنواخت قابل استفاده است."
+      },
+      "dim": {
+        "name": "بُعد",
+        "tooltip": "بُعدی که پنجره‌های زمینه بر آن اعمال می‌شود."
+      },
+      "freenoise": {
+        "name": "FreeNoise",
+        "tooltip": "آیا نویز FreeNoise اعمال شود؛ باعث بهبود ترکیب پنجره‌ها می‌شود."
+      },
+      "fuse_method": {
+        "name": "روش ادغام",
+        "tooltip": "روشی که برای ادغام پنجره‌های زمینه استفاده می‌شود."
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "مدلی که پنجره‌های زمینه هنگام نمونه‌گیری بر آن اعمال می‌شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "مدل با پنجره‌های زمینه اعمال‌شده هنگام نمونه‌گیری."
+      }
+    }
+  },
+  "ControlNetApply": {
+    "display_name": "اعمال ControlNet (قدیمی)",
+    "inputs": {
+      "conditioning": {
+        "name": "شرط‌گذاری"
+      },
+      "control_net": {
+        "name": "control_net"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "strength": {
+        "name": "شدت"
+      }
+    }
+  },
+  "ControlNetApplyAdvanced": {
+    "display_name": "اعمال ControlNet",
+    "inputs": {
+      "control_net": {
+        "name": "control_net"
+      },
+      "end_percent": {
+        "name": "درصد پایان"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "start_percent": {
+        "name": "درصد شروع"
+      },
+      "strength": {
+        "name": "شدت"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت"
+      },
+      "1": {
+        "name": "منفی"
+      }
+    }
+  },
+  "ControlNetApplySD3": {
+    "display_name": "اعمال ControlNet با VAE",
+    "inputs": {
+      "control_net": {
+        "name": "control_net"
+      },
+      "end_percent": {
+        "name": "درصد پایان"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "start_percent": {
+        "name": "درصد شروع"
+      },
+      "strength": {
+        "name": "شدت"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      }
+    }
+  },
+  "ControlNetInpaintingAliMamaApply": {
+    "display_name": "ControlNetInpaintingAliMamaApply",
+    "inputs": {
+      "control_net": {
+        "name": "control_net"
+      },
+      "end_percent": {
+        "name": "درصد پایان"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "mask": {
+        "name": "ماسک"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "start_percent": {
+        "name": "درصد شروع"
+      },
+      "strength": {
+        "name": "قدرت"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      }
+    }
+  },
+  "ControlNetLoader": {
+    "display_name": "بارگذاری مدل ControlNet",
+    "inputs": {
+      "control_net_name": {
+        "name": "نام control_net"
+      }
+    }
+  },
+  "CosmosImageToVideoLatent": {
+    "display_name": "CosmosImageToVideoLatent",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "end_image": {
+        "name": "تصویر پایان"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "start_image": {
+        "name": "تصویر شروع"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CosmosPredict2ImageToVideoLatent": {
+    "display_name": "CosmosPredict2ImageToVideoLatent",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "end_image": {
+        "name": "تصویر پایان"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "start_image": {
+        "name": "تصویر شروع"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CreateHookKeyframe": {
+    "display_name": "ایجاد Keyframe قلاب",
+    "inputs": {
+      "prev_hook_kf": {
+        "name": "Keyframe قلاب قبلی"
+      },
+      "start_percent": {
+        "name": "درصد شروع"
+      },
+      "strength_mult": {
+        "name": "ضریب قدرت"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "HOOK_KF"
+      }
+    }
+  },
+  "CreateHookKeyframesFromFloats": {
+    "display_name": "ایجاد Keyframe قلاب از اعداد اعشاری",
+    "inputs": {
+      "end_percent": {
+        "name": "درصد پایان"
+      },
+      "floats_strength": {
+        "name": "قدرت اعشاری"
+      },
+      "prev_hook_kf": {
+        "name": "Keyframe قلاب قبلی"
+      },
+      "print_keyframes": {
+        "name": "چاپ Keyframeها"
+      },
+      "start_percent": {
+        "name": "درصد شروع"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "HOOK_KF"
+      }
+    }
+  },
+  "CreateHookKeyframesInterpolated": {
+    "display_name": "ایجاد Keyframe های Hook با میان‌یابی",
+    "inputs": {
+      "end_percent": {
+        "name": "درصد پایان"
+      },
+      "interpolation": {
+        "name": "میان‌یابی"
+      },
+      "keyframes_count": {
+        "name": "تعداد keyframe"
+      },
+      "prev_hook_kf": {
+        "name": "keyframe قبلی hook"
+      },
+      "print_keyframes": {
+        "name": "نمایش keyframeها"
+      },
+      "start_percent": {
+        "name": "درصد شروع"
+      },
+      "strength_end": {
+        "name": "قدرت پایان"
+      },
+      "strength_start": {
+        "name": "قدرت شروع"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "HOOK_KF"
+      }
+    }
+  },
+  "CreateHookLora": {
+    "display_name": "ایجاد Hook LoRA",
+    "inputs": {
+      "lora_name": {
+        "name": "نام LoRA"
+      },
+      "prev_hooks": {
+        "name": "hookهای قبلی"
+      },
+      "strength_clip": {
+        "name": "قدرت clip"
+      },
+      "strength_model": {
+        "name": "قدرت مدل"
+      }
+    }
+  },
+  "CreateHookLoraModelOnly": {
+    "display_name": "ایجاد Hook LoRA (فقط مدل)",
+    "inputs": {
+      "lora_name": {
+        "name": "نام LoRA"
+      },
+      "prev_hooks": {
+        "name": "hookهای قبلی"
+      },
+      "strength_model": {
+        "name": "قدرت مدل"
+      }
+    }
+  },
+  "CreateHookModelAsLora": {
+    "display_name": "ایجاد Hook مدل به عنوان LoRA",
+    "inputs": {
+      "ckpt_name": {
+        "name": "نام checkpoint"
+      },
+      "prev_hooks": {
+        "name": "hookهای قبلی"
+      },
+      "strength_clip": {
+        "name": "قدرت clip"
+      },
+      "strength_model": {
+        "name": "قدرت مدل"
+      }
+    }
+  },
+  "CreateHookModelAsLoraModelOnly": {
+    "display_name": "ایجاد Hook مدل به عنوان LoRA (فقط مدل)",
+    "inputs": {
+      "ckpt_name": {
+        "name": "نام checkpoint"
+      },
+      "prev_hooks": {
+        "name": "hookهای قبلی"
+      },
+      "strength_model": {
+        "name": "قدرت مدل"
+      }
+    }
+  },
+  "CreateList": {
+    "display_name": "ایجاد لیست",
+    "inputs": {
+      "inputs": {
+        "name": "ورودی‌ها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "لیست",
+        "tooltip": null
+      }
+    }
+  },
+  "CreateVideo": {
+    "description": "ایجاد ویدیو از تصاویر.",
+    "display_name": "ایجاد ویدیو",
+    "inputs": {
+      "audio": {
+        "name": "صدا",
+        "tooltip": "صدایی که به ویدیو اضافه می‌شود."
+      },
+      "fps": {
+        "name": "فریم بر ثانیه"
+      },
+      "images": {
+        "name": "تصاویر",
+        "tooltip": "تصاویری که ویدیو از آن‌ها ساخته می‌شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CropByBBoxes": {
+    "description": "برش و تغییر اندازه نواحی از دسته تصویر ورودی بر اساس جعبه‌های مرزی ارائه‌شده.",
+    "display_name": "CropByBBoxes",
+    "inputs": {
+      "bboxes": {
+        "name": "جعبه‌های مرزی"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "output_height": {
+        "name": "ارتفاع خروجی",
+        "tooltip": "ارتفاعی که هر برش به آن تغییر اندازه داده می‌شود."
+      },
+      "output_width": {
+        "name": "عرض خروجی",
+        "tooltip": "عرضی که هر برش به آن تغییر اندازه داده می‌شود."
+      },
+      "padding": {
+        "name": "حاشیه",
+        "tooltip": "حاشیه اضافی (بر حسب پیکسل) که به هر طرف جعبه مرزی قبل از برش اضافه می‌شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "تمام برش‌ها به صورت یک دسته تصویر واحد جمع‌آوری شده‌اند."
+      }
+    }
+  },
+  "CropMask": {
+    "display_name": "برش Mask",
+    "inputs": {
+      "height": {
+        "name": "ارتفاع"
+      },
+      "mask": {
+        "name": "mask"
+      },
+      "width": {
+        "name": "عرض"
+      },
+      "x": {
+        "name": "محور x"
+      },
+      "y": {
+        "name": "محور y"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CustomCombo": {
+    "display_name": "ترکیب سفارشی",
+    "inputs": {
+      "choice": {
+        "name": "انتخاب"
+      },
+      "index": {},
+      "option1": {}
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "INDEX",
+        "tooltip": null
+      }
+    }
+  },
+  "DiffControlNetLoader": {
+    "display_name": "بارگذاری مدل ControlNet (diff)",
+    "inputs": {
+      "control_net_name": {
+        "name": "نام ControlNet"
+      },
+      "model": {
+        "name": "مدل"
+      }
+    }
+  },
+  "DifferentialDiffusion": {
+    "display_name": "دیفرانسیل دیفیوژن",
+    "inputs": {
+      "model": {
+        "name": "مدل"
+      },
+      "strength": {
+        "name": "شدت"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "DiffusersLoader": {
+    "display_name": "بارگذار Diffusers",
+    "inputs": {
+      "model_path": {
+        "name": "مسیر مدل"
+      }
+    }
+  },
+  "DisableNoise": {
+    "display_name": "غیرفعال‌سازی نویز",
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "DualCFGGuider": {
+    "display_name": "راهنمای DualCFG",
+    "inputs": {
+      "cfg_cond2_negative": {
+        "name": "cfg_cond2 منفی"
+      },
+      "cfg_conds": {
+        "name": "شرایط cfg"
+      },
+      "cond1": {
+        "name": "شرط ۱"
+      },
+      "cond2": {
+        "name": "شرط ۲"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "style": {
+        "name": "استایل"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "DualCLIPLoader": {
+    "description": "[دستورالعمل‌ها]\n\nsdxl: clip-l، clip-g\nsd3: clip-l، clip-g / clip-l، t5 / clip-g، t5\nflux: clip-l، t5\nhidream: حداقل یکی از t5 یا llama، توصیه می‌شود t5 و llama\nhunyuan_image: qwen2.5vl ۷b و byt5 small\nnewbie: gemma-۳-۴b-it، jina clip v2",
+    "display_name": "بارگذار DualCLIP",
+    "inputs": {
+      "clip_name1": {
+        "name": "نام clip ۱"
+      },
+      "clip_name2": {
+        "name": "نام clip ۲"
+      },
+      "device": {
+        "name": "دستگاه"
+      },
+      "type": {
+        "name": "نوع"
+      }
+    }
+  },
+  "EasyCache": {
+    "description": "پیاده‌سازی بومی EasyCache.",
+    "display_name": "ایزی‌کش",
+    "inputs": {
+      "end_percent": {
+        "name": "درصد پایان",
+        "tooltip": "مرحله نمونه‌گیری نسبی برای پایان استفاده از EasyCache."
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "مدلی که EasyCache به آن اضافه می‌شود."
+      },
+      "reuse_threshold": {
+        "name": "آستانه استفاده مجدد",
+        "tooltip": "آستانه برای استفاده مجدد از مراحل کش شده."
+      },
+      "start_percent": {
+        "name": "درصد شروع",
+        "tooltip": "مرحله نمونه‌گیری نسبی برای شروع استفاده از EasyCache."
+      },
+      "verbose": {
+        "name": "گزارش‌گیری کامل",
+        "tooltip": "آیا اطلاعات کامل ثبت شود یا خیر."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "مدل با EasyCache."
+      }
+    }
+  },
+  "ElevenLabsAudioIsolation": {
+    "description": "حذف نویز پس‌زمینه از صدا و ایزوله‌کردن گفتار یا آواز.",
+    "display_name": "ایزوله‌سازی صدای ElevenLabs",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "صدایی که باید نویز پس‌زمینه از آن حذف شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsInstantVoiceClone": {
+    "description": "ایجاد یک صدای شبیه‌سازی‌شده از نمونه‌های صوتی. بین ۱ تا ۸ نمونه صدای مورد نظر را ارائه دهید.",
+    "display_name": "شبیه‌سازی فوری صدا ElevenLabs",
+    "inputs": {
+      "files": {
+        "name": "files",
+        "tooltip": "نمونه‌های صوتی برای شبیه‌سازی صدا."
+      },
+      "remove_background_noise": {
+        "name": "remove_background_noise",
+        "tooltip": "حذف نویز پس‌زمینه از نمونه‌های صوتی با استفاده از ایزوله‌سازی صدا."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "voice",
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsSpeechToSpeech": {
+    "description": "تبدیل گفتار از یک صدا به صدای دیگر با حفظ محتوای اصلی و احساسات.",
+    "display_name": "تبدیل گفتار به گفتار ElevenLabs",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "صدای منبع برای تبدیل."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "مدل مورد استفاده برای تبدیل گفتار به گفتار."
+      },
+      "model_similarity_boost": {
+        "name": "similarity_boost"
+      },
+      "model_speed": {
+        "name": "speed"
+      },
+      "model_style": {
+        "name": "style"
+      },
+      "model_use_speaker_boost": {
+        "name": "use_speaker_boost"
+      },
+      "output_format": {
+        "name": "output_format",
+        "tooltip": "فرمت خروجی صدا."
+      },
+      "remove_background_noise": {
+        "name": "remove_background_noise",
+        "tooltip": "حذف نویز پس‌زمینه از صدای ورودی با استفاده از ایزوله‌سازی صدا."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "بذر برای تکرارپذیری."
+      },
+      "stability": {
+        "name": "stability",
+        "tooltip": "پایداری صدا. مقادیر کمتر دامنه احساسی بیشتری ایجاد می‌کند، مقادیر بالاتر صدایی یکنواخت‌تر اما احتمالاً یکنواخت و بدون تنوع تولید می‌کند."
+      },
+      "voice": {
+        "name": "voice",
+        "tooltip": "صدای هدف برای تبدیل. از Voice Selector یا Instant Voice Clone متصل کنید."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsSpeechToText": {
+    "description": "تبدیل صوت به متن. پشتیبانی از شناسایی خودکار زبان، تشخیص گوینده و برچسب‌گذاری رویدادهای صوتی.",
+    "display_name": "تبدیل گفتار به متن ElevenLabs",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "فایل صوتی برای تبدیل به متن."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "language_code": {
+        "name": "language_code",
+        "tooltip": "کد زبان بر اساس ISO-639-1 یا ISO-639-3 (مثلاً 'en'، 'es'، 'fra'). برای شناسایی خودکار خالی بگذارید."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "مدل مورد استفاده برای تبدیل گفتار به متن."
+      },
+      "model_diarization_threshold": {
+        "name": "diarization_threshold"
+      },
+      "model_diarize": {
+        "name": "diarize"
+      },
+      "model_tag_audio_events": {
+        "name": "tag_audio_events"
+      },
+      "model_temperature": {
+        "name": "temperature"
+      },
+      "model_timestamps_granularity": {
+        "name": "timestamps_granularity"
+      },
+      "num_speakers": {
+        "name": "num_speakers",
+        "tooltip": "حداکثر تعداد گویندگان برای پیش‌بینی. برای شناسایی خودکار روی ۰ تنظیم کنید."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "مقدار seed برای بازتولیدپذیری (تضمین قطعی بودن وجود ندارد)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "text",
+        "tooltip": null
+      },
+      "1": {
+        "name": "language_code",
+        "tooltip": null
+      },
+      "2": {
+        "name": "words_json",
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToDialogue": {
+    "description": "تولید دیالوگ چند گوینده از متن. هر ورودی دیالوگ متن و صدای مخصوص به خود را دارد.",
+    "display_name": "تبدیل متن به دیالوگ ElevenLabs",
+    "inputs": {
+      "apply_text_normalization": {
+        "name": "apply_text_normalization",
+        "tooltip": "حالت نرمال‌سازی متن. 'auto' تصمیم را به سیستم می‌سپارد، 'on' همیشه نرمال‌سازی را اعمال می‌کند، 'off' آن را نادیده می‌گیرد."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "inputs": {
+        "name": "inputs",
+        "tooltip": "تعداد ورودی‌های دیالوگ."
+      },
+      "inputs_text1": {
+        "name": "text1"
+      },
+      "language_code": {
+        "name": "language_code",
+        "tooltip": "کد زبان بر اساس ISO-639-1 یا ISO-639-3 (مثلاً 'en'، 'es'، 'fra'). برای شناسایی خودکار خالی بگذارید."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "مدل مورد استفاده برای تولید دیالوگ."
+      },
+      "output_format": {
+        "name": "output_format",
+        "tooltip": "فرمت خروجی صوتی."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "مقدار seed برای بازتولیدپذیری."
+      },
+      "stability": {
+        "name": "stability",
+        "tooltip": "پایداری صدا. مقادیر کمتر دامنه احساسی بیشتری ایجاد می‌کند، مقادیر بالاتر صدای یکنواخت‌تر اما با ثبات بیشتر تولید می‌کند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToSoundEffects": {
+    "description": "تولید افکت صوتی از توضیحات متنی.",
+    "display_name": "تبدیل متن به افکت صوتی ElevenLabs",
+    "inputs": {
+      "model": {
+        "name": "model",
+        "tooltip": "مدل مورد استفاده برای تولید افکت صوتی."
+      },
+      "model_duration": {
+        "name": "duration"
+      },
+      "model_loop": {
+        "name": "loop"
+      },
+      "model_prompt_influence": {
+        "name": "prompt_influence"
+      },
+      "output_format": {
+        "name": "output_format",
+        "tooltip": "فرمت خروجی صوتی."
+      },
+      "text": {
+        "name": "text",
+        "tooltip": "توضیح متنی افکت صوتی مورد نظر برای تولید."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToSpeech": {
+    "description": "تبدیل متن به گفتار.",
+    "display_name": "تبدیل متن به گفتار ElevenLabs",
+    "inputs": {
+      "apply_text_normalization": {
+        "name": "apply_text_normalization",
+        "tooltip": "حالت نرمال‌سازی متن. 'auto' اجازه می‌دهد سیستم تصمیم بگیرد، 'on' همیشه نرمال‌سازی را اعمال می‌کند، 'off' آن را نادیده می‌گیرد."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "language_code": {
+        "name": "language_code",
+        "tooltip": "کد زبان ISO-639-1 یا ISO-639-3 (مثلاً 'en'، 'es'، 'fra'). برای تشخیص خودکار خالی بگذارید."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "مدلی که برای تبدیل متن به گفتار استفاده می‌شود."
+      },
+      "model_similarity_boost": {
+        "name": "similarity_boost"
+      },
+      "model_speed": {
+        "name": "speed"
+      },
+      "model_style": {
+        "name": "style"
+      },
+      "model_use_speaker_boost": {
+        "name": "use_speaker_boost"
+      },
+      "output_format": {
+        "name": "output_format",
+        "tooltip": "فرمت خروجی صوتی."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "بذر برای بازتولیدپذیری (تعیین‌پذیری تضمین نمی‌شود)."
+      },
+      "stability": {
+        "name": "stability",
+        "tooltip": "پایداری صدا. مقادیر کمتر دامنه احساسی بیشتری ایجاد می‌کند، مقادیر بالاتر صدایی یکنواخت‌تر اما احتمالاً یکنواخت‌تر تولید می‌کند."
+      },
+      "text": {
+        "name": "text",
+        "tooltip": "متنی که باید به گفتار تبدیل شود."
+      },
+      "voice": {
+        "name": "voice",
+        "tooltip": "صدایی که برای سنتز گفتار استفاده می‌شود. از Voice Selector یا Instant Voice Clone متصل کنید."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsVoiceSelector": {
+    "description": "انتخاب یک صدای از پیش تعریف‌شده ElevenLabs برای تولید گفتار از متن.",
+    "display_name": "انتخاب صدای ElevenLabs",
+    "inputs": {
+      "voice": {
+        "name": "voice",
+        "tooltip": "یک صدا از صداهای از پیش تعریف‌شده ElevenLabs انتخاب کنید."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "voice",
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyAceStep1_5LatentAudio": {
+    "display_name": "Empty Ace Step 1.5 Latent Audio",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته",
+        "tooltip": "تعداد تصاویر latent در هر دسته."
+      },
+      "seconds": {
+        "name": "ثانیه"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyAceStepLatentAudio": {
+    "display_name": "EmptyAceStepLatentAudio",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه بچ",
+        "tooltip": "تعداد تصاویر latent در هر بچ."
+      },
+      "seconds": {
+        "name": "ثانیه"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyAudio": {
+    "display_name": "صدای خالی",
+    "inputs": {
+      "channels": {
+        "name": "کانال‌ها",
+        "tooltip": "تعداد کانال‌های صوتی (۱ برای مونو، ۲ برای استریو)."
+      },
+      "duration": {
+        "name": "مدت زمان",
+        "tooltip": "مدت زمان کلیپ صوتی خالی بر حسب ثانیه"
+      },
+      "sample_rate": {
+        "name": "نرخ نمونه‌برداری",
+        "tooltip": "نرخ نمونه‌برداری کلیپ صوتی خالی."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyChromaRadianceLatentImage": {
+    "display_name": "تصویر نهفته ChromaRadiance خالی",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyCosmosLatentVideo": {
+    "display_name": "ویدیوی نهفته Cosmos خالی",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyFlux2LatentImage": {
+    "display_name": "تصویر نهفته Flux 2 خالی",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyHunyuanImageLatent": {
+    "display_name": "تصویر نهفته Hunyuan خالی",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyHunyuanLatentVideo": {
+    "display_name": "ویدیوی نهفته Hunyuan ۱.۰ خالی",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyHunyuanVideo15Latent": {
+    "display_name": "ویدیوی نهفته Hunyuan ۱.۵ خالی",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyImage": {
+    "display_name": "تصویر خالی",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "color": {
+        "name": "رنگ"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    }
+  },
+  "EmptyLTXVLatentVideo": {
+    "display_name": "ویدیوی نهفته خالی LTXV",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyLatentAudio": {
+    "display_name": "صدای نهفته خالی",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته",
+        "tooltip": "تعداد تصاویر نهفته در دسته."
+      },
+      "seconds": {
+        "name": "ثانیه"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyLatentHunyuan3Dv2": {
+    "display_name": "نهفته Hunyuan 3D v2 خالی",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته",
+        "tooltip": "تعداد تصاویر نهفته در دسته."
+      },
+      "resolution": {
+        "name": "وضوح"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyLatentImage": {
+    "description": "یک دسته جدید از تصاویر نهفته خالی برای حذف نویز از طریق نمونه‌گیری ایجاد کنید.",
+    "display_name": "تصویر نهفته خالی",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته",
+        "tooltip": "تعداد تصاویر نهفته در هر دسته."
+      },
+      "height": {
+        "name": "ارتفاع",
+        "tooltip": "ارتفاع تصاویر نهفته بر حسب پیکسل."
+      },
+      "width": {
+        "name": "عرض",
+        "tooltip": "عرض تصاویر نهفته بر حسب پیکسل."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "دسته تصاویر نهفته خالی."
+      }
+    }
+  },
+  "EmptyMochiLatentVideo": {
+    "display_name": "ویدیوی نهفته خالی Mochi",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyQwenImageLayeredLatentImage": {
+    "display_name": "تصویر نهفته لایه‌ای Qwen خالی",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "layers": {
+        "name": "لایه‌ها"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptySD3LatentImage": {
+    "display_name": "تصویر نهفته خالی SD3",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Epsilon Scaling": {
+    "display_name": "مقیاس‌دهی اپسیلون",
+    "inputs": {
+      "model": {
+        "name": "مدل"
+      },
+      "scaling_factor": {
+        "name": "ضریب مقیاس‌دهی"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ExponentialScheduler": {
+    "display_name": "زمان‌بندی نمایی",
+    "inputs": {
+      "sigma_max": {
+        "name": "سیگما بیشینه"
+      },
+      "sigma_min": {
+        "name": "سیگما کمینه"
+      },
+      "steps": {
+        "name": "گام‌ها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ExtendIntermediateSigmas": {
+    "display_name": "گسترش سیگماهای میانی",
+    "inputs": {
+      "end_at_sigma": {
+        "name": "پایان در سیگما"
+      },
+      "sigmas": {
+        "name": "سیگماها"
+      },
+      "spacing": {
+        "name": "فاصله"
+      },
+      "start_at_sigma": {
+        "name": "شروع از سیگما"
+      },
+      "steps": {
+        "name": "گام‌ها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FeatherMask": {
+    "display_name": "FeatherMask",
+    "inputs": {
+      "bottom": {
+        "name": "پایین"
+      },
+      "left": {
+        "name": "چپ"
+      },
+      "mask": {
+        "name": "ماسک"
+      },
+      "right": {
+        "name": "راست"
+      },
+      "top": {
+        "name": "بالا"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FlipSigmas": {
+    "display_name": "FlipSigmas",
+    "inputs": {
+      "sigmas": {
+        "name": "سیگماها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Flux2MaxImageNode": {
+    "description": "تولید تصویر به صورت همزمان بر اساس پرامپت و وضوح تصویر.",
+    "display_name": "Flux.2 [max] Image",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "images": {
+        "name": "تصاویر",
+        "tooltip": "حداکثر ۹ تصویر به عنوان مرجع قابل استفاده است."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت برای تولید یا ویرایش تصویر"
+      },
+      "prompt_upsampling": {
+        "name": "افزایش وضوح پرامپت",
+        "tooltip": "آیا افزایش وضوح پرامپت انجام شود یا خیر. در صورت فعال بودن، پرامپت به طور خودکار برای تولید خلاقانه‌تر تغییر می‌کند."
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر تصادفی برای ایجاد نویز."
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Flux2ProImageNode": {
+    "description": "تولید تصویر به صورت همزمان بر اساس پرامپت و وضوح تصویر.",
+    "display_name": "Flux.2 [pro] Image",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "images": {
+        "name": "تصاویر",
+        "tooltip": "حداکثر ۹ تصویر به عنوان مرجع قابل استفاده است."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت برای تولید یا ویرایش تصویر"
+      },
+      "prompt_upsampling": {
+        "name": "افزایش وضوح پرامپت",
+        "tooltip": "آیا افزایش وضوح پرامپت انجام شود یا خیر. در صورت فعال بودن، پرامپت به طور خودکار برای تولید خلاقانه‌تر تغییر می‌کند."
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر تصادفی برای ایجاد نویز."
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Flux2Scheduler": {
+    "display_name": "Flux2Scheduler",
+    "inputs": {
+      "height": {
+        "name": "ارتفاع"
+      },
+      "steps": {
+        "name": "گام‌ها"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FluxDisableGuidance": {
+    "description": "این نود راهنمایی را به طور کامل در Flux و مدل‌های مشابه Flux غیرفعال می‌کند.",
+    "display_name": "FluxDisableGuidance",
+    "inputs": {
+      "conditioning": {
+        "name": "شرایط"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FluxGuidance": {
+    "display_name": "FluxGuidance",
+    "inputs": {
+      "conditioning": {
+        "name": "شرایط"
+      },
+      "guidance": {
+        "name": "راهنمایی"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FluxKontextImageScale": {
+    "description": "این نود تصویر را به اندازه‌ای تغییر می‌دهد که برای flux kontext بهینه‌تر باشد.",
+    "display_name": "FluxKontextImageScale",
+    "inputs": {
+      "image": {
+        "name": "تصویر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FluxKontextMaxImageNode": {
+    "description": "ویرایش تصاویر با استفاده از Flux.1 Kontext [pro] از طریق API بر اساس پرامپت و نسبت تصویر.",
+    "display_name": "Flux.1 Kontext [max] Image",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبت تصویر",
+        "tooltip": "نسبت تصویر؛ باید بین ۱:۴ تا ۴:۱ باشد."
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "guidance": {
+        "name": "راهنمایی",
+        "tooltip": "قدرت راهنمایی برای فرایند تولید تصویر"
+      },
+      "input_image": {
+        "name": "تصویر ورودی"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت برای تولید تصویر - مشخص کنید چه چیزی و چگونه ویرایش شود."
+      },
+      "prompt_upsampling": {
+        "name": "افزایش وضوح پرامپت",
+        "tooltip": "آیا افزایش وضوح روی پرامپت انجام شود یا خیر. در صورت فعال بودن، پرامپت به طور خودکار برای تولید خلاقانه‌تر تغییر می‌کند، اما نتایج غیرقطعی خواهند بود (همان بذر دقیقاً همان نتیجه را تولید نمی‌کند)."
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر تصادفی مورد استفاده برای ایجاد نویز."
+      },
+      "steps": {
+        "name": "گام‌ها",
+        "tooltip": "تعداد گام‌ها برای فرایند تولید تصویر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FluxKontextMultiReferenceLatentMethod": {
+    "display_name": "روش مرجع مدل ویرایش",
+    "inputs": {
+      "conditioning": {
+        "name": "شرط‌گذاری"
+      },
+      "reference_latents_method": {
+        "name": "روش latent مرجع"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FluxKontextProImageNode": {
+    "description": "ویرایش تصاویر با استفاده از Flux.1 Kontext [pro] از طریق API بر اساس پرامپت و نسبت تصویر.",
+    "display_name": "Flux.1 Kontext [pro] Image",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبت تصویر",
+        "tooltip": "نسبت تصویر؛ باید بین ۱:۴ تا ۴:۱ باشد."
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "guidance": {
+        "name": "راهنمایی",
+        "tooltip": "قدرت راهنمایی برای فرایند تولید تصویر"
+      },
+      "input_image": {
+        "name": "تصویر ورودی"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت برای تولید تصویر - مشخص کنید چه چیزی و چگونه ویرایش شود."
+      },
+      "prompt_upsampling": {
+        "name": "افزایش وضوح پرامپت",
+        "tooltip": "آیا افزایش وضوح روی پرامپت انجام شود یا خیر. در صورت فعال بودن، پرامپت به طور خودکار برای تولید خلاقانه‌تر تغییر می‌کند، اما نتایج غیرقطعی خواهند بود (همان بذر دقیقاً همان نتیجه را تولید نمی‌کند)."
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر تصادفی مورد استفاده برای ایجاد نویز."
+      },
+      "steps": {
+        "name": "گام‌ها",
+        "tooltip": "تعداد گام‌ها برای فرایند تولید تصویر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FluxProExpandNode": {
+    "description": "تصویر را بر اساس پرامپت گسترش می‌دهد.",
+    "display_name": "Flux.1 گسترش تصویر",
+    "inputs": {
+      "bottom": {
+        "name": "پایین",
+        "tooltip": "تعداد پیکسل‌هایی که باید به پایین تصویر افزوده شود"
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "guidance": {
+        "name": "قدرت راهنمایی",
+        "tooltip": "قدرت راهنمایی برای فرآیند تولید تصویر"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "left": {
+        "name": "چپ",
+        "tooltip": "تعداد پیکسل‌هایی که باید به سمت چپ تصویر افزوده شود"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت برای تولید تصویر"
+      },
+      "prompt_upsampling": {
+        "name": "افزایش وضوح پرامپت",
+        "tooltip": "آیا افزایش وضوح روی پرامپت انجام شود یا خیر. در صورت فعال بودن، پرامپت به طور خودکار برای تولید خلاقانه‌تر تغییر می‌کند، اما نتایج غیرقطعی خواهند بود (یک بذر یکسان دقیقاً همان نتیجه را تولید نمی‌کند)."
+      },
+      "right": {
+        "name": "راست",
+        "tooltip": "تعداد پیکسل‌هایی که باید به سمت راست تصویر افزوده شود"
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر تصادفی مورد استفاده برای ایجاد نویز."
+      },
+      "steps": {
+        "name": "تعداد مراحل",
+        "tooltip": "تعداد مراحل برای فرآیند تولید تصویر"
+      },
+      "top": {
+        "name": "بالا",
+        "tooltip": "تعداد پیکسل‌هایی که باید به بالای تصویر افزوده شود"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FluxProFillNode": {
+    "description": "تصویر را بر اساس ماسک و پرامپت بازسازی می‌کند.",
+    "display_name": "Flux.1 پر کردن تصویر",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "guidance": {
+        "name": "قدرت راهنمایی",
+        "tooltip": "قدرت راهنمایی برای فرآیند تولید تصویر"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "mask": {
+        "name": "ماسک"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت برای تولید تصویر"
+      },
+      "prompt_upsampling": {
+        "name": "افزایش وضوح پرامپت",
+        "tooltip": "آیا افزایش وضوح روی پرامپت انجام شود یا خیر. در صورت فعال بودن، پرامپت به طور خودکار برای تولید خلاقانه‌تر تغییر می‌کند، اما نتایج غیرقطعی خواهند بود (یک بذر یکسان دقیقاً همان نتیجه را تولید نمی‌کند)."
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر تصادفی مورد استفاده برای ایجاد نویز."
+      },
+      "steps": {
+        "name": "تعداد مراحل",
+        "tooltip": "تعداد مراحل برای فرآیند تولید تصویر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FluxProUltraImageNode": {
+    "description": "تولید تصویر با استفاده از Flux Pro ۱.۱ Ultra از طریق API بر اساس پرامپت و وضوح تصویر.",
+    "display_name": "Flux ۱.۱ [pro] Ultra Image",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبت تصویر",
+        "tooltip": "نسبت تصویر؛ باید بین ۱:۴ تا ۴:۱ باشد."
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "image_prompt": {
+        "name": "پرامپت تصویری"
+      },
+      "image_prompt_strength": {
+        "name": "قدرت پرامپت تصویری",
+        "tooltip": "ترکیب بین پرامپت و پرامپت تصویری."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت برای تولید تصویر"
+      },
+      "prompt_upsampling": {
+        "name": "افزایش وضوح پرامپت",
+        "tooltip": "آیا افزایش وضوح روی پرامپت انجام شود یا خیر. اگر فعال باشد، پرامپت به طور خودکار برای تولید خلاقانه‌تر تغییر می‌کند، اما نتایج غیرقطعی خواهند بود (یک seed یکسان دقیقاً همان نتیجه را تولید نمی‌کند)."
+      },
+      "raw": {
+        "name": "خام",
+        "tooltip": "در صورت فعال بودن، تصاویر با پردازش کمتر و ظاهر طبیعی‌تر تولید می‌شوند."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed تصادفی مورد استفاده برای ایجاد نویز."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FreSca": {
+    "description": "اعمال مقیاس‌دهی وابسته به فرکانس بر راهنمایی",
+    "display_name": "FreSca",
+    "inputs": {
+      "freq_cutoff": {
+        "name": "آستانه فرکانس",
+        "tooltip": "تعداد اندیس‌های فرکانسی اطراف مرکز که به عنوان فرکانس پایین در نظر گرفته می‌شوند"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "scale_high": {
+        "name": "ضریب مقیاس بالا",
+        "tooltip": "ضریب مقیاس برای اجزای با فرکانس بالا"
+      },
+      "scale_low": {
+        "name": "ضریب مقیاس پایین",
+        "tooltip": "ضریب مقیاس برای اجزای با فرکانس پایین"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FreeU": {
+    "display_name": "FreeU",
+    "inputs": {
+      "b1": {
+        "name": "b1"
+      },
+      "b2": {
+        "name": "b2"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "s1": {
+        "name": "s1"
+      },
+      "s2": {
+        "name": "s2"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FreeU_V2": {
+    "display_name": "FreeU_V2",
+    "inputs": {
+      "b1": {
+        "name": "b1"
+      },
+      "b2": {
+        "name": "b2"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "s1": {
+        "name": "s1"
+      },
+      "s2": {
+        "name": "s2"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GITSScheduler": {
+    "display_name": "برنامه‌ریز GITS",
+    "inputs": {
+      "coeff": {
+        "name": "ضریب"
+      },
+      "denoise": {
+        "name": "کاهش نویز"
+      },
+      "steps": {
+        "name": "گام‌ها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GLIGENLoader": {
+    "display_name": "بارگذار GLIGEN",
+    "inputs": {
+      "gligen_name": {
+        "name": "نام GLIGEN"
+      }
+    }
+  },
+  "GLIGENTextBoxApply": {
+    "display_name": "GLIGENTextBoxApply",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "conditioning_to": {
+        "name": "شرط‌دهی به"
+      },
+      "gligen_textbox_model": {
+        "name": "مدل GLIGEN Textbox"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "text": {
+        "name": "متن"
+      },
+      "width": {
+        "name": "عرض"
+      },
+      "x": {
+        "name": "محور افقی (x)"
+      },
+      "y": {
+        "name": "محور عمودی (y)"
+      }
+    }
+  },
+  "GLSLShader": {
+    "description": "اعمال شیدرهای fragment GLSL ES به تصاویر. u_resolution (vec2) همیشه در دسترس است.",
+    "display_name": "GLSL Shader",
+    "inputs": {
+      "floats": {
+        "name": "floats",
+        "tooltip": "اعداد اعشاری به صورت u_float0-4 در کد شیدر در دسترس هستند"
+      },
+      "fragment_shader": {
+        "name": "fragment_shader",
+        "tooltip": "کد منبع شیدر fragment GLSL (سازگار با GLSL ES 3.00 / WebGL 2.0)"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "تصاویر به صورت u_image0-4 (sampler2D) در کد شیدر در دسترس هستند"
+      },
+      "ints": {
+        "name": "ints",
+        "tooltip": "اعداد صحیح به صورت u_int0-4 در کد شیدر در دسترس هستند"
+      },
+      "size_mode": {
+        "name": "size_mode",
+        "tooltip": "اندازه خروجی: 'from_input' ابعاد اولین تصویر ورودی را استفاده می‌کند، 'custom' اجازه تعیین دستی اندازه را می‌دهد"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "IMAGE0",
+        "tooltip": "از طریق layout(location = 0) out vec4 fragColor0 در کد شیدر در دسترس است"
+      },
+      "1": {
+        "name": "IMAGE1",
+        "tooltip": "از طریق layout(location = 1) out vec4 fragColor1 در کد شیدر در دسترس است"
+      },
+      "2": {
+        "name": "IMAGE2",
+        "tooltip": "از طریق layout(location = 2) out vec4 fragColor2 در کد شیدر در دسترس است"
+      },
+      "3": {
+        "name": "IMAGE3",
+        "tooltip": "از طریق layout(location = 3) out vec4 fragColor3 در کد شیدر در دسترس است"
+      }
+    }
+  },
+  "GeminiImage2Node": {
+    "description": "تولید یا ویرایش تصاویر به صورت همزمان از طریق Google Vertex API.",
+    "display_name": "Nano Banana Pro (Google Gemini Image)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "اگر روی 'auto' تنظیم شود، نسبت تصویر ورودی شما را تطبیق می‌دهد؛ اگر تصویری ارائه نشود، معمولاً یک تصویر مربعی با نسبت ۱۶:۹ تولید می‌شود."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "files": {
+        "name": "files",
+        "tooltip": "فایل(های) اختیاری برای استفاده به عنوان زمینه برای مدل. ورودی‌ها را از node Gemini Generate Content Input Files می‌پذیرد."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "تصویر(های) مرجع اختیاری. برای افزودن چند تصویر، از node Batch Images استفاده کنید (تا ۱۴ تصویر)."
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "متن راهنما برای توصیف تصویری که باید تولید شود یا ویرایش‌هایی که باید اعمال گردد. هرگونه محدودیت، سبک یا جزئیاتی که مدل باید رعایت کند را وارد کنید."
+      },
+      "resolution": {
+        "name": "resolution",
+        "tooltip": "وضوح خروجی مورد نظر. برای 2K/4K از upscaler بومی Gemini استفاده می‌شود."
+      },
+      "response_modalities": {
+        "name": "response_modalities",
+        "tooltip": "برای خروجی فقط تصویر، 'IMAGE' را انتخاب کنید یا برای دریافت هر دو تصویر تولید شده و پاسخ متنی، 'IMAGE+TEXT' را انتخاب نمایید."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "زمانی که مقدار seed به یک مقدار مشخص تنظیم شود، مدل تلاش می‌کند تا پاسخ مشابهی برای درخواست‌های تکراری ارائه دهد. خروجی قطعی تضمین نمی‌شود. همچنین، تغییر مدل یا تنظیمات پارامترها مانند دما (temperature) می‌تواند باعث تغییر در پاسخ حتی با همان مقدار seed شود. به طور پیش‌فرض، مقدار seed به صورت تصادفی انتخاب می‌شود."
+      },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "دستورالعمل‌های پایه‌ای که رفتار هوش مصنوعی را تعیین می‌کند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
+  "GeminiImageNode": {
+    "description": "ویرایش تصاویر به صورت همزمان از طریق Google API.",
+    "display_name": "Nano Banana (Google Gemini Image)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "به طور پیش‌فرض اندازه تصویر خروجی را با تصویر ورودی شما تطبیق می‌دهد، یا در غیر این صورت تصاویر مربعی ۱:۱ تولید می‌کند."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "files": {
+        "name": "files",
+        "tooltip": "فایل(های) اختیاری برای استفاده به عنوان زمینه برای مدل. ورودی‌ها را از node Gemini Generate Content Input Files می‌پذیرد."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "تصویر(های) اختیاری برای استفاده به عنوان زمینه برای مدل. برای افزودن چند تصویر می‌توانید از node Batch Images استفاده کنید."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "مدل Gemini مورد استفاده برای تولید پاسخ‌ها."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "متن راهنما برای تولید"
+      },
+      "response_modalities": {
+        "name": "response_modalities",
+        "tooltip": "برای خروجی فقط تصویر، 'IMAGE' را انتخاب کنید یا برای دریافت هر دو تصویر تولید شده و پاسخ متنی، 'IMAGE+TEXT' را انتخاب نمایید."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "زمانی که مقدار seed به یک مقدار مشخص تنظیم شود، مدل تلاش می‌کند تا پاسخ مشابهی برای درخواست‌های تکراری ارائه دهد. خروجی قطعی تضمین نمی‌شود. همچنین، تغییر مدل یا تنظیمات پارامترها مانند دما (temperature) می‌تواند باعث تغییر در پاسخ حتی با همان مقدار seed شود. به طور پیش‌فرض، مقدار seed به صورت تصادفی انتخاب می‌شود."
+      },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "دستورالعمل‌های پایه‌ای که رفتار هوش مصنوعی را تعیین می‌کند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
+  "GeminiInputFiles": {
+    "description": "فایل‌های ورودی را بارگذاری و آماده می‌کند تا به عنوان ورودی برای نودهای Gemini LLM استفاده شوند. این فایل‌ها هنگام تولید پاسخ توسط مدل Gemini خوانده می‌شوند. محتوای فایل متنی در محدودیت توکن محاسبه می‌شود. 🛈 نکته: می‌توانید این نود را با سایر نودهای فایل ورودی Gemini زنجیره کنید.",
+    "display_name": "فایل‌های ورودی Gemini",
+    "inputs": {
+      "GEMINI_INPUT_FILES": {
+        "name": "GEMINI_INPUT_FILES",
+        "tooltip": "یک یا چند فایل اضافی اختیاری برای گروه‌بندی با فایلی که از این نود بارگذاری شده است. امکان زنجیره‌سازی فایل‌های ورودی را فراهم می‌کند تا یک پیام بتواند شامل چندین فایل ورودی باشد."
+      },
+      "file": {
+        "name": "فایل",
+        "tooltip": "فایل‌های ورودی برای افزودن به زمینه مدل. در حال حاضر فقط فایل‌های متنی (.txt) و PDF (.pdf) پذیرفته می‌شوند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GeminiNanoBanana2": {
+    "description": "تولید یا ویرایش تصاویر به صورت همزمان از طریق Google Vertex API.",
+    "display_name": "Nano Banana ۲",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبت تصویر",
+        "tooltip": "اگر روی 'auto' تنظیم شود، با نسبت تصویر ورودی شما مطابقت دارد؛ اگر تصویری ارائه نشود، معمولاً یک مربع با نسبت ۱۶:۹ تولید می‌شود."
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "files": {
+        "name": "فایل‌ها",
+        "tooltip": "فایل(های) اختیاری برای استفاده به عنوان زمینه برای مدل. ورودی‌ها را از node Gemini Generate Content Input Files می‌پذیرد."
+      },
+      "images": {
+        "name": "تصاویر",
+        "tooltip": "تصویر(های) مرجع اختیاری. برای افزودن چند تصویر، از node Batch Images استفاده کنید (تا ۱۴ تصویر)."
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "توضیح متنی درباره تصویری که باید تولید شود یا ویرایش‌هایی که باید اعمال گردد. هرگونه محدودیت، سبک یا جزئیاتی که مدل باید رعایت کند را وارد کنید."
+      },
+      "resolution": {
+        "name": "وضوح تصویر",
+        "tooltip": "وضوح خروجی هدف. برای ۲K/۴K از upscaler بومی Gemini استفاده می‌شود."
+      },
+      "response_modalities": {
+        "name": "حالت‌های پاسخ"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "زمانی که مقدار seed ثابت باشد، مدل تلاش می‌کند تا پاسخ مشابهی برای درخواست‌های تکراری ارائه دهد. خروجی قطعی تضمین نمی‌شود. همچنین، تغییر مدل یا تنظیمات پارامترها مانند دما (temperature) می‌تواند باعث تغییر در پاسخ حتی با همان مقدار seed شود. به طور پیش‌فرض، مقدار seed به صورت تصادفی انتخاب می‌شود."
+      },
+      "system_prompt": {
+        "name": "پرامپت سیستمی",
+        "tooltip": "دستورالعمل‌های پایه‌ای که رفتار هوش مصنوعی را تعیین می‌کند."
+      },
+      "thinking_level": {
+        "name": "سطح تفکر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
+  "GeminiNode": {
+    "description": "تولید پاسخ متنی با مدل هوش مصنوعی Gemini گوگل. می‌توانید انواع مختلفی از ورودی‌ها (متن، تصویر، صوت، ویدئو) را به عنوان زمینه برای تولید پاسخ‌های مرتبط‌تر و معنادارتر ارائه دهید.",
+    "display_name": "Google Gemini",
+    "inputs": {
+      "audio": {
+        "name": "صوت",
+        "tooltip": "صوت اختیاری برای استفاده به عنوان زمینه مدل."
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "files": {
+        "name": "فایل‌ها",
+        "tooltip": "فایل(های) اختیاری برای استفاده به عنوان زمینه مدل. ورودی را از نود Gemini Generate Content Input Files می‌پذیرد."
+      },
+      "images": {
+        "name": "تصاویر",
+        "tooltip": "تصاویر اختیاری برای استفاده به عنوان زمینه مدل. برای افزودن چندین تصویر می‌توانید از نود Batch Images استفاده کنید."
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "مدل Gemini مورد استفاده برای تولید پاسخ‌ها."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "ورودی‌های متنی به مدل برای تولید پاسخ. می‌توانید دستورالعمل‌های دقیق، پرسش‌ها یا زمینه مورد نظر را برای مدل وارد کنید."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "زمانی که مقدار seed ثابت باشد، مدل تلاش می‌کند تا برای درخواست‌های تکراری پاسخ یکسانی ارائه دهد. خروجی قطعی تضمین نمی‌شود. همچنین تغییر مدل یا تنظیمات پارامترها مانند دما می‌تواند باعث تغییر پاسخ حتی با همان مقدار seed شود. به طور پیش‌فرض، مقدار seed به صورت تصادفی انتخاب می‌شود."
+      },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "دستورالعمل‌های پایه‌ای که رفتار هوش مصنوعی را تعیین می‌کند."
+      },
+      "video": {
+        "name": "ویدئو",
+        "tooltip": "ویدئوی اختیاری برای استفاده به عنوان زمینه مدل."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GenerateTracks": {
+    "display_name": "تولید مسیرها",
+    "inputs": {
+      "bezier": {
+        "name": "Bezier",
+        "tooltip": "فعال‌سازی مسیر منحنی Bezier با استفاده از نقطه میانی به عنوان نقطه کنترل."
+      },
+      "end_x": {
+        "name": "مختصات X پایان",
+        "tooltip": "مختصات X نرمال‌شده (۰-۱) برای موقعیت پایان."
+      },
+      "end_y": {
+        "name": "مختصات Y پایان",
+        "tooltip": "مختصات Y نرمال‌شده (۰-۱) برای موقعیت پایان."
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "interpolation": {
+        "name": "درون‌یابی",
+        "tooltip": "کنترل زمان‌بندی/سرعت حرکت در طول مسیر."
+      },
+      "mid_x": {
+        "name": "کنترل X میانی",
+        "tooltip": "نقطه کنترل X نرمال‌شده برای منحنی Bezier. فقط زمانی استفاده می‌شود که 'bezier' فعال باشد."
+      },
+      "mid_y": {
+        "name": "کنترل Y میانی",
+        "tooltip": "نقطه کنترل Y نرمال‌شده برای منحنی Bezier. فقط زمانی استفاده می‌شود که 'bezier' فعال باشد."
+      },
+      "num_frames": {
+        "name": "تعداد فریم‌ها"
+      },
+      "num_tracks": {
+        "name": "تعداد مسیرها"
+      },
+      "start_x": {
+        "name": "مختصات X شروع",
+        "tooltip": "مختصات X نرمال‌شده (۰-۱) برای موقعیت شروع."
+      },
+      "start_y": {
+        "name": "مختصات Y شروع",
+        "tooltip": "مختصات Y نرمال‌شده (۰-۱) برای موقعیت شروع."
+      },
+      "track_mask": {
+        "name": "ماسک مسیر",
+        "tooltip": "ماسک اختیاری برای نمایش فریم‌های قابل مشاهده."
+      },
+      "track_spread": {
+        "name": "فاصله مسیرها",
+        "tooltip": "فاصله نرمال‌شده بین مسیرها. مسیرها عمود بر جهت حرکت پخش می‌شوند."
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "طول مسیر",
+        "tooltip": null
+      }
+    }
+  },
+  "GetImageSize": {
+    "description": "عرض و ارتفاع تصویر را بازمی‌گرداند و تصویر را بدون تغییر عبور می‌دهد.",
+    "display_name": "دریافت ابعاد تصویر",
+    "inputs": {
+      "image": {
+        "name": "تصویر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "عرض",
+        "tooltip": null
+      },
+      "1": {
+        "name": "ارتفاع",
+        "tooltip": null
+      },
+      "2": {
+        "name": "اندازه دسته",
+        "tooltip": null
+      }
+    }
+  },
+  "GetVideoComponents": {
+    "description": "تمام اجزای ویدیو را استخراج می‌کند: فریم‌ها، صدا و نرخ فریم.",
+    "display_name": "استخراج اجزای ویدیو",
+    "inputs": {
+      "video": {
+        "name": "ویدیو",
+        "tooltip": "ویدیویی که اجزا از آن استخراج می‌شوند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "تصاویر",
+        "tooltip": null
+      },
+      "1": {
+        "name": "صدا",
+        "tooltip": null
+      },
+      "2": {
+        "name": "نرخ فریم",
+        "tooltip": null
+      }
+    }
+  },
+  "GrokImageEditNode": {
+    "description": "ویرایش یک تصویر موجود بر اساس یک متن راهنما",
+    "display_name": "ویرایش تصویر Grok",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبت تصویر",
+        "tooltip": "فقط زمانی مجاز است که چندین تصویر به ورودی تصویر متصل باشند."
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "number_of_images": {
+        "name": "تعداد تصاویر",
+        "tooltip": "تعداد تصاویر ویرایش‌شده برای تولید"
+      },
+      "prompt": {
+        "name": "راهنما",
+        "tooltip": "متن راهنما برای تولید تصویر استفاده می‌شود"
+      },
+      "resolution": {
+        "name": "وضوح"
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر برای تعیین اینکه node باید دوباره اجرا شود؛ نتایج واقعی صرف‌نظر از بذر غیرقطعی هستند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokImageNode": {
+    "description": "تولید تصویر با استفاده از Grok بر اساس یک متن راهنما",
+    "display_name": "تصویر Grok",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبت ابعاد"
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "number_of_images": {
+        "name": "تعداد تصاویر",
+        "tooltip": "تعداد تصاویر برای تولید"
+      },
+      "prompt": {
+        "name": "راهنما",
+        "tooltip": "متن راهنما برای تولید تصویر استفاده می‌شود"
+      },
+      "resolution": {
+        "name": "وضوح"
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر برای تعیین اینکه node باید دوباره اجرا شود؛ نتایج واقعی صرف‌نظر از بذر غیرقطعی هستند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokVideoEditNode": {
+    "description": "ویرایش یک ویدیوی موجود بر اساس یک متن راهنما.",
+    "display_name": "ویرایش ویدیو Grok",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "prompt": {
+        "name": "راهنما",
+        "tooltip": "توضیح متنی از ویدیوی مورد نظر."
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر برای تعیین اینکه node باید دوباره اجرا شود؛ نتایج واقعی صرف‌نظر از بذر غیرقطعی هستند."
+      },
+      "video": {
+        "name": "ویدیو",
+        "tooltip": "حداکثر مدت زمان پشتیبانی‌شده ۸.۷ ثانیه و حجم فایل ۵۰ مگابایت است."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokVideoNode": {
+    "description": "تولید ویدیو از یک راهنما یا تصویر",
+    "display_name": "ویدیو Grok",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبت ابعاد",
+        "tooltip": "نسبت ابعاد ویدیوی خروجی."
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان",
+        "tooltip": "مدت زمان ویدیوی خروجی بر حسب ثانیه."
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "prompt": {
+        "name": "راهنما",
+        "tooltip": "توضیح متنی از ویدیوی مورد نظر."
+      },
+      "resolution": {
+        "name": "وضوح",
+        "tooltip": "وضوح ویدیوی خروجی."
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر برای تعیین اینکه node باید دوباره اجرا شود؛ نتایج واقعی صرف‌نظر از بذر غیرقطعی هستند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrowMask": {
+    "display_name": "گسترش ماسک",
+    "inputs": {
+      "expand": {
+        "name": "گسترش"
+      },
+      "mask": {
+        "name": "ماسک"
+      },
+      "tapered_corners": {
+        "name": "گوشه‌های نرم"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HitPawGeneralImageEnhance": {
+    "description": "ارتقاء تصاویر با وضوح پایین به وضوح بسیار بالا، حذف نویز و آرتیفکت‌ها. حداکثر خروجی: ۳۲ مگاپیکسل.",
+    "display_name": "افزایش کیفیت تصویر عمومی HitPaw",
+    "inputs": {
+      "auto_downscale": {
+        "name": "کاهش خودکار مقیاس",
+        "tooltip": "در صورت تجاوز خروجی از حد مجاز، تصویر ورودی به طور خودکار کوچک می‌شود."
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "upscale_factor": {
+        "name": "ضریب بزرگ‌نمایی"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HitPawVideoEnhance": {
+    "description": "ارتقاء ویدیوهای با وضوح پایین به وضوح بالا، حذف نویز و آرتیفکت‌ها. قیمت‌ها به ازای هر ثانیه ویدیو محاسبه می‌شود.",
+    "display_name": "افزایش کیفیت ویدیو HitPaw",
+    "inputs": {
+      "model": {
+        "name": "مدل"
+      },
+      "model_resolution": {
+        "name": "وضوح"
+      },
+      "video": {
+        "name": "ویدیو"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Hunyuan3Dv2Conditioning": {
+    "display_name": "Hunyuan3Dv2Conditioning",
+    "inputs": {
+      "clip_vision_output": {
+        "name": "خروجی بینایی clip"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      }
+    }
+  },
+  "Hunyuan3Dv2ConditioningMultiView": {
+    "display_name": "Hunyuan3Dv2ConditioningMultiView",
+    "inputs": {
+      "back": {
+        "name": "پشت"
+      },
+      "front": {
+        "name": "جلو"
+      },
+      "left": {
+        "name": "چپ"
+      },
+      "right": {
+        "name": "راست"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      }
+    }
+  },
+  "HunyuanImageToVideo": {
+    "display_name": "HunyuanImageToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "guidance_type": {
+        "name": "نوع راهنما"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "start_image": {
+        "name": "تصویر شروع"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "HunyuanRefinerLatent": {
+    "display_name": "HunyuanRefinerLatent",
+    "inputs": {
+      "latent": {
+        "name": "latent"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "noise_augmentation": {
+        "name": "افزایش نویز"
+      },
+      "positive": {
+        "name": "مثبت"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "HunyuanVideo15ImageToVideo": {
+    "display_name": "HunyuanVideo15ImageToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "clip_vision_output": {
+        "name": "خروجی clip vision"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "start_image": {
+        "name": "تصویر شروع"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "HunyuanVideo15LatentUpscaleWithModel": {
+    "display_name": "بزرگ‌نمایی Latent ویدیو ۱۵ با مدل",
+    "inputs": {
+      "crop": {
+        "name": "برش"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "samples": {
+        "name": "نمونه‌ها"
+      },
+      "upscale_method": {
+        "name": "روش بزرگ‌نمایی"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HunyuanVideo15SuperResolution": {
+    "display_name": "HunyuanVideo15SuperResolution",
+    "inputs": {
+      "clip_vision_output": {
+        "name": "خروجی clip vision"
+      },
+      "latent": {
+        "name": "latent"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "noise_augmentation": {
+        "name": "افزایش نویز"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "start_image": {
+        "name": "تصویر شروع"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "HyperTile": {
+    "display_name": "HyperTile",
+    "inputs": {
+      "max_depth": {
+        "name": "حداکثر عمق"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "scale_depth": {
+        "name": "مقیاس عمق"
+      },
+      "swap_size": {
+        "name": "اندازه تعویض"
+      },
+      "tile_size": {
+        "name": "اندازه کاشی"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HypernetworkLoader": {
+    "display_name": "بارگذاری Hypernetwork",
+    "inputs": {
+      "hypernetwork_name": {
+        "name": "نام hypernetwork"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "strength": {
+        "name": "شدت"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "IdeogramV1": {
+    "description": "تولید تصویر با استفاده از مدل Ideogram V1.",
+    "display_name": "Ideogram V1",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "نسبت ابعاد برای تولید تصویر."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "magic_prompt_option": {
+        "name": "magic_prompt_option",
+        "tooltip": "تعیین اینکه آیا MagicPrompt در تولید استفاده شود یا خیر"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "توضیح مواردی که باید از تصویر حذف شوند"
+      },
+      "num_images": {
+        "name": "num_images"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "دستور متنی برای تولید تصویر"
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "turbo": {
+        "name": "turbo",
+        "tooltip": "آیا از حالت توربو استفاده شود (تولید سریع‌تر، احتمالاً با کیفیت پایین‌تر)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "IdeogramV2": {
+    "description": "تولید تصویر با استفاده از مدل Ideogram V2.",
+    "display_name": "Ideogram V2",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "نسبت ابعاد برای تولید تصویر. اگر وضوح روی AUTO تنظیم نشده باشد، نادیده گرفته می‌شود."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "magic_prompt_option": {
+        "name": "magic_prompt_option",
+        "tooltip": "تعیین اینکه آیا MagicPrompt در تولید استفاده شود یا خیر"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "توضیح مواردی که باید از تصویر حذف شوند"
+      },
+      "num_images": {
+        "name": "num_images"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "دستور متنی برای تولید تصویر"
+      },
+      "resolution": {
+        "name": "resolution",
+        "tooltip": "وضوح تصویر برای تولید. اگر روی AUTO تنظیم نشده باشد، این مقدار نسبت ابعاد را نادیده می‌گیرد."
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "style_type": {
+        "name": "style_type",
+        "tooltip": "نوع سبک برای تولید (فقط V2)"
+      },
+      "turbo": {
+        "name": "turbo",
+        "tooltip": "آیا از حالت توربو استفاده شود (تولید سریع‌تر، احتمالاً با کیفیت پایین‌تر)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "IdeogramV3": {
+    "description": "تولید تصویر با استفاده از مدل Ideogram V3. پشتیبانی از تولید تصویر معمولی بر اساس پرامپت متنی و ویرایش تصویر با ماسک.",
+    "display_name": "Ideogram V3",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبت ابعاد",
+        "tooltip": "نسبت ابعاد برای تولید تصویر. اگر وضوح روی خودکار نباشد، نادیده گرفته می‌شود."
+      },
+      "character_image": {
+        "name": "تصویر کاراکتر",
+        "tooltip": "تصویری برای استفاده به عنوان مرجع کاراکتر."
+      },
+      "character_mask": {
+        "name": "ماسک کاراکتر",
+        "tooltip": "ماسک اختیاری برای تصویر مرجع کاراکتر."
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "image": {
+        "name": "تصویر",
+        "tooltip": "تصویر مرجع اختیاری برای ویرایش تصویر."
+      },
+      "magic_prompt_option": {
+        "name": "گزینه MagicPrompt",
+        "tooltip": "تعیین می‌کند که آیا MagicPrompt در تولید استفاده شود یا خیر"
+      },
+      "mask": {
+        "name": "ماسک",
+        "tooltip": "ماسک اختیاری برای inpainting (ناحیه‌های سفید جایگزین می‌شوند)"
+      },
+      "num_images": {
+        "name": "تعداد تصاویر"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت برای تولید یا ویرایش تصویر"
+      },
+      "rendering_speed": {
+        "name": "سرعت رندر",
+        "tooltip": "کنترل تعادل بین سرعت تولید و کیفیت"
+      },
+      "resolution": {
+        "name": "وضوح",
+        "tooltip": "وضوح تصویر تولیدی. اگر روی خودکار نباشد، نسبت ابعاد را نادیده می‌گیرد."
+      },
+      "seed": {
+        "name": "بذر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageAddNoise": {
+    "display_name": "افزودن نویز به تصویر",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر تصادفی برای ایجاد نویز."
+      },
+      "strength": {
+        "name": "شدت"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageBatch": {
+    "display_name": "پردازش دسته‌ای تصاویر",
+    "inputs": {
+      "image1": {
+        "name": "تصویر ۱"
+      },
+      "image2": {
+        "name": "تصویر ۲"
+      }
+    }
+  },
+  "ImageBlend": {
+    "display_name": "ترکیب تصاویر",
+    "inputs": {
+      "blend_factor": {
+        "name": "ضریب ترکیب"
+      },
+      "blend_mode": {
+        "name": "حالت ترکیب"
+      },
+      "image1": {
+        "name": "تصویر ۱"
+      },
+      "image2": {
+        "name": "تصویر ۲"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageBlur": {
+    "display_name": "تار کردن تصویر",
+    "inputs": {
+      "blur_radius": {
+        "name": "شعاع تاری"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "sigma": {
+        "name": "سیگما"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageColorToMask": {
+    "display_name": "تبدیل رنگ به ماسک",
+    "inputs": {
+      "color": {
+        "name": "رنگ"
+      },
+      "image": {
+        "name": "تصویر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageCompare": {
+    "description": "دو تصویر را به صورت کنار هم با اسلایدر مقایسه می‌کند.",
+    "display_name": "مقایسه تصویر",
+    "inputs": {
+      "compare_view": {
+        "name": "نمای مقایسه"
+      },
+      "image_a": {
+        "name": "تصویر A"
+      },
+      "image_b": {
+        "name": "تصویر B"
+      }
+    }
+  },
+  "ImageCompositeMasked": {
+    "display_name": "ترکیب تصویر با ماسک",
+    "inputs": {
+      "destination": {
+        "name": "مقصد"
+      },
+      "mask": {
+        "name": "ماسک"
+      },
+      "resize_source": {
+        "name": "تغییر اندازه مبدأ"
+      },
+      "source": {
+        "name": "مبدأ"
+      },
+      "x": {
+        "name": "مختصات افقی (x)"
+      },
+      "y": {
+        "name": "مختصات عمودی (y)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageCrop": {
+    "display_name": "برش تصویر",
+    "inputs": {
+      "height": {
+        "name": "ارتفاع"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "width": {
+        "name": "عرض"
+      },
+      "x": {
+        "name": "مختصات افقی (x)"
+      },
+      "y": {
+        "name": "مختصات عمودی (y)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageCropV2": {
+    "display_name": "برش تصویر",
+    "inputs": {
+      "crop_region": {
+        "name": "crop_region"
+      },
+      "height": {},
+      "image": {
+        "name": "image"
+      },
+      "width": {},
+      "x": {},
+      "y": {}
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageDeduplication": {
+    "display_name": "حذف تصاویر تکراری",
+    "inputs": {
+      "images": {
+        "name": "تصاویر",
+        "tooltip": "فهرست تصاویر برای پردازش."
+      },
+      "similarity_threshold": {
+        "name": "آستانه شباهت",
+        "tooltip": "آستانه شباهت (۰-۱). مقدار بالاتر به معنای شباهت بیشتر است. تصاویری که بالاتر از این آستانه باشند تکراری در نظر گرفته می‌شوند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "تصاویر",
+        "tooltip": "تصاویر پردازش‌شده"
+      }
+    }
+  },
+  "ImageFlip": {
+    "display_name": "وارونه‌سازی تصویر",
+    "inputs": {
+      "flip_method": {
+        "name": "روش وارونه‌سازی"
+      },
+      "image": {
+        "name": "تصویر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageFromBatch": {
+    "display_name": "تصویر از دسته",
+    "inputs": {
+      "batch_index": {
+        "name": "اندیس دسته"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "length": {
+        "name": "تعداد"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageGrid": {
+    "display_name": "شبکه تصاویر",
+    "inputs": {
+      "cell_height": {
+        "name": "ارتفاع سلول",
+        "tooltip": "ارتفاع هر سلول در شبکه."
+      },
+      "cell_width": {
+        "name": "عرض سلول",
+        "tooltip": "عرض هر سلول در شبکه."
+      },
+      "columns": {
+        "name": "ستون‌ها",
+        "tooltip": "تعداد ستون‌ها در شبکه."
+      },
+      "images": {
+        "name": "تصاویر",
+        "tooltip": "فهرست تصاویر برای پردازش."
+      },
+      "padding": {
+        "name": "فاصله",
+        "tooltip": "فاصله بین تصاویر."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "تصاویر",
+        "tooltip": "تصاویر پردازش‌شده"
+      }
+    }
+  },
+  "ImageInvert": {
+    "display_name": "معکوس‌سازی تصویر",
+    "inputs": {
+      "image": {
+        "name": "تصویر"
+      }
+    }
+  },
+  "ImageMergeTileList": {
+    "display_name": "ادغام فهرست کاشی‌ها به تصویر",
+    "inputs": {
+      "final_height": {
+        "name": "final_height"
+      },
+      "final_width": {
+        "name": "final_width"
+      },
+      "image_list": {
+        "name": "image_list"
+      },
+      "overlap": {
+        "name": "overlap"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageOnlyCheckpointLoader": {
+    "display_name": "بارگذاری Checkpoint فقط تصویر (مدل img2vid)",
+    "inputs": {
+      "ckpt_name": {
+        "name": "نام Checkpoint"
+      }
+    }
+  },
+  "ImageOnlyCheckpointSave": {
+    "display_name": "ذخیره Checkpoint فقط تصویر",
+    "inputs": {
+      "clip_vision": {
+        "name": "clip_vision"
+      },
+      "filename_prefix": {
+        "name": "پیشوند نام فایل"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
+  "ImagePadForOutpaint": {
+    "display_name": "افزودن حاشیه به تصویر برای Outpainting",
+    "inputs": {
+      "bottom": {
+        "name": "پایین"
+      },
+      "feathering": {
+        "name": "محو کردن لبه‌ها"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "left": {
+        "name": "چپ"
+      },
+      "right": {
+        "name": "راست"
+      },
+      "top": {
+        "name": "بالا"
+      }
+    }
+  },
+  "ImageQuantize": {
+    "display_name": "ImageQuantize",
+    "inputs": {
+      "colors": {
+        "name": "تعداد رنگ‌ها"
+      },
+      "dither": {
+        "name": "Dither"
+      },
+      "image": {
+        "name": "تصویر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageRGBToYUV": {
+    "display_name": "تبدیل تصویر RGB به YUV",
+    "inputs": {
+      "image": {
+        "name": "تصویر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Y",
+        "tooltip": null
+      },
+      "1": {
+        "name": "U",
+        "tooltip": null
+      },
+      "2": {
+        "name": "V",
+        "tooltip": null
+      }
+    }
+  },
+  "ImageRotate": {
+    "display_name": "چرخش تصویر",
+    "inputs": {
+      "image": {
+        "name": "تصویر"
+      },
+      "rotation": {
+        "name": "زاویه چرخش"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageScale": {
+    "display_name": "بزرگ‌نمایی تصویر",
+    "inputs": {
+      "crop": {
+        "name": "برش"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "upscale_method": {
+        "name": "روش بزرگ‌نمایی"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    }
+  },
+  "ImageScaleBy": {
+    "display_name": "بزرگ‌نمایی تصویر بر اساس ضریب",
+    "inputs": {
+      "image": {
+        "name": "تصویر"
+      },
+      "scale_by": {
+        "name": "ضریب بزرگ‌نمایی"
+      },
+      "upscale_method": {
+        "name": "روش بزرگ‌نمایی"
+      }
+    }
+  },
+  "ImageScaleToMaxDimension": {
+    "display_name": "تغییر اندازه تصویر به بیشترین بُعد",
+    "inputs": {
+      "image": {
+        "name": "تصویر"
+      },
+      "largest_size": {
+        "name": "بیشترین اندازه"
+      },
+      "upscale_method": {
+        "name": "روش بزرگ‌نمایی"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageScaleToTotalPixels": {
+    "display_name": "تغییر اندازه تصویر بر اساس تعداد کل پیکسل‌ها",
+    "inputs": {
+      "image": {
+        "name": "تصویر"
+      },
+      "megapixels": {
+        "name": "مگاپیکسل"
+      },
+      "resolution_steps": {
+        "name": "گام‌های وضوح"
+      },
+      "upscale_method": {
+        "name": "روش بزرگ‌نمایی"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageSharpen": {
+    "display_name": "شارپ‌سازی تصویر",
+    "inputs": {
+      "alpha": {
+        "name": "آلفا"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "sharpen_radius": {
+        "name": "شعاع شارپ‌سازی"
+      },
+      "sigma": {
+        "name": "سیگما"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageStitch": {
+    "description": "تصویر image2 را در جهت مشخص‌شده به image1 متصل می‌کند.\nاگر image2 ارائه نشود، image1 بدون تغییر بازگردانده می‌شود.\nامکان افزودن فاصله اختیاری بین تصاویر وجود دارد.",
+    "display_name": "اتصال تصاویر",
+    "inputs": {
+      "direction": {
+        "name": "جهت"
+      },
+      "image1": {
+        "name": "image1"
+      },
+      "image2": {
+        "name": "image2"
+      },
+      "match_image_size": {
+        "name": "همسان‌سازی اندازه تصویر"
+      },
+      "spacing_color": {
+        "name": "رنگ فاصله"
+      },
+      "spacing_width": {
+        "name": "عرض فاصله"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageToMask": {
+    "display_name": "تبدیل تصویر به ماسک",
+    "inputs": {
+      "channel": {
+        "name": "کانال"
+      },
+      "image": {
+        "name": "تصویر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageUpscaleWithModel": {
+    "display_name": "بزرگ‌نمایی تصویر (با مدل)",
+    "inputs": {
+      "image": {
+        "name": "تصویر"
+      },
+      "upscale_model": {
+        "name": "مدل بزرگ‌نمایی"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageYUVToRGB": {
+    "display_name": "تبدیل YUV تصویر به RGB",
+    "inputs": {
+      "U": {
+        "name": "U"
+      },
+      "V": {
+        "name": "V"
+      },
+      "Y": {
+        "name": "Y"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "InpaintModelConditioning": {
+    "display_name": "شرط‌گذاری مدل Inpaint",
+    "inputs": {
+      "mask": {
+        "name": "ماسک"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "noise_mask": {
+        "name": "ماسک نویز",
+        "tooltip": "یک ماسک نویز به latent اضافه می‌کند تا نمونه‌گیری فقط درون ماسک انجام شود. ممکن است نتایج را بهبود دهد یا کاملاً خراب کند، بسته به مدل."
+      },
+      "pixels": {
+        "name": "پیکسل‌ها"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت"
+      },
+      "1": {
+        "name": "منفی"
+      },
+      "2": {
+        "name": "latent"
+      }
+    }
+  },
+  "InstructPixToPixConditioning": {
+    "display_name": "شرط‌گذاری InstructPixToPix",
+    "inputs": {
+      "negative": {
+        "name": "منفی"
+      },
+      "pixels": {
+        "name": "پیکسل‌ها"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "InvertMask": {
+    "display_name": "وارونه‌سازی ماسک",
+    "inputs": {
+      "mask": {
+        "name": "ماسک"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "JoinAudioChannels": {
+    "description": "کانال‌های صوتی مونو چپ و راست را به یک صدای استریو ادغام می‌کند.",
+    "display_name": "ادغام کانال‌های صوتی",
+    "inputs": {
+      "audio_left": {
+        "name": "صدای چپ"
+      },
+      "audio_right": {
+        "name": "صدای راست"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "صدا",
+        "tooltip": null
+      }
+    }
+  },
+  "JoinImageWithAlpha": {
+    "display_name": "ترکیب تصویر با Alpha",
+    "inputs": {
+      "alpha": {
+        "name": "آلفا"
+      },
+      "image": {
+        "name": "تصویر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KSampler": {
+    "description": "با استفاده از مدل ارائه‌شده و شرط‌های مثبت و منفی، تصویر نهفته را از نویز پاک‌سازی می‌کند.",
+    "display_name": "KSampler",
+    "inputs": {
+      "cfg": {
+        "name": "cfg",
+        "tooltip": "مقیاس Classifier-Free Guidance تعادل بین خلاقیت و پایبندی به دستور را برقرار می‌کند. مقادیر بالاتر باعث می‌شود تصویر بیشتر با دستور مطابقت داشته باشد، اما مقادیر بیش از حد بالا می‌تواند کیفیت را کاهش دهد."
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "denoise": {
+        "name": "میزان پاک‌سازی نویز",
+        "tooltip": "مقدار پاک‌سازی نویز اعمال‌شده؛ مقادیر کمتر ساختار تصویر اولیه را حفظ می‌کند و امکان نمونه‌گیری تصویر به تصویر را فراهم می‌سازد."
+      },
+      "latent_image": {
+        "name": "تصویر نهفته",
+        "tooltip": "تصویر نهفته‌ای که باید پاک‌سازی نویز شود."
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "مدلی که برای پاک‌سازی نویز تصویر نهفته ورودی استفاده می‌شود."
+      },
+      "negative": {
+        "name": "شرط منفی",
+        "tooltip": "شرطی که ویژگی‌هایی را که نمی‌خواهید در تصویر وجود داشته باشد توصیف می‌کند."
+      },
+      "positive": {
+        "name": "شرط مثبت",
+        "tooltip": "شرطی که ویژگی‌هایی را که می‌خواهید در تصویر وجود داشته باشد توصیف می‌کند."
+      },
+      "sampler_name": {
+        "name": "sampler_name",
+        "tooltip": "الگوریتمی که هنگام نمونه‌گیری استفاده می‌شود و می‌تواند بر کیفیت، سرعت و سبک خروجی تولیدشده تأثیر بگذارد."
+      },
+      "scheduler": {
+        "name": "زمان‌بند",
+        "tooltip": "زمان‌بند کنترل می‌کند که چگونه نویز به تدریج حذف شود تا تصویر شکل بگیرد."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "بذر تصادفی که برای ایجاد نویز استفاده می‌شود."
+      },
+      "steps": {
+        "name": "گام‌ها",
+        "tooltip": "تعداد گام‌های استفاده‌شده در فرآیند پاک‌سازی نویز."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "تصویر نهفته پاک‌سازی‌شده."
+      }
+    }
+  },
+  "KSamplerAdvanced": {
+    "display_name": "KSampler (پیشرفته)",
+    "inputs": {
+      "add_noise": {
+        "name": "افزودن نویز"
+      },
+      "cfg": {
+        "name": "cfg"
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "end_at_step": {
+        "name": "پایان در گام"
+      },
+      "latent_image": {
+        "name": "تصویر نهفته"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "negative": {
+        "name": "شرط منفی"
+      },
+      "noise_seed": {
+        "name": "بذر نویز"
+      },
+      "positive": {
+        "name": "شرط مثبت"
+      },
+      "return_with_leftover_noise": {
+        "name": "بازگشت با نویز باقی‌مانده"
+      },
+      "sampler_name": {
+        "name": "sampler_name"
+      },
+      "scheduler": {
+        "name": "زمان‌بند"
+      },
+      "start_at_step": {
+        "name": "شروع از گام"
+      },
+      "steps": {
+        "name": "گام‌ها"
+      }
+    }
+  },
+  "KSamplerSelect": {
+    "display_name": "KSamplerSelect",
+    "inputs": {
+      "sampler_name": {
+        "name": "sampler_name"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Kandinsky5ImageToVideo": {
+    "display_name": "Kandinsky5ImageToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "start_image": {
+        "name": "تصویر شروع"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": "ویدیوی خالی latent"
+      },
+      "3": {
+        "name": "cond_latent",
+        "tooltip": "تصاویر شروع رمزگذاری‌شده و پاک، برای جایگزینی شروع نویزی خروجی مدل latent استفاده می‌شود"
+      }
+    }
+  },
+  "KarrasScheduler": {
+    "display_name": "KarrasScheduler",
+    "inputs": {
+      "rho": {
+        "name": "rho"
+      },
+      "sigma_max": {
+        "name": "حداکثر سیگما"
+      },
+      "sigma_min": {
+        "name": "حداقل سیگما"
+      },
+      "steps": {
+        "name": "گام‌ها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingAvatarNode": {
+    "description": "تولید ویدئوهای دیجیتال انسان به سبک پخش زنده از یک عکس و یک فایل صوتی.",
+    "display_name": "Kling Avatar 2.0",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "تصویر مرجع آواتار. عرض و ارتفاع باید حداقل ۳۰۰ پیکسل باشد. نسبت ابعاد باید بین ۱:۲.۵ و ۲.۵:۱ باشد."
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "پرومپت اختیاری برای تعریف حرکات، احساسات و حرکات دوربین آواتار."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed تعیین می‌کند که آیا node باید دوباره اجرا شود؛ نتایج صرف‌نظر از seed غیرقطعی هستند."
+      },
+      "sound_file": {
+        "name": "sound_file",
+        "tooltip": "ورودی صوتی. مدت زمان باید بین ۲ تا ۳۰۰ ثانیه باشد."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingCameraControlI2VNode": {
+    "description": "تبدیل تصاویر ثابت به ویدیوهای سینمایی با حرکات حرفه‌ای دوربین که شبیه‌ساز فیلم‌برداری واقعی است. کنترل حرکات مجازی دوربین شامل زوم، چرخش، پن، تیلت و نمای اول شخص، در حالی که تمرکز بر تصویر اصلی شما حفظ می‌شود.",
+    "display_name": "تبدیل تصویر به ویدیو Kling (کنترل دوربین)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبت تصویر"
+      },
+      "camera_control": {
+        "name": "کنترل دوربین",
+        "tooltip": "می‌تواند با استفاده از node کنترل دوربین Kling ساخته شود. حرکات و حرکت دوربین را در طول تولید ویدیو کنترل می‌کند."
+      },
+      "cfg_scale": {
+        "name": "cfg_scale"
+      },
+      "negative_prompt": {
+        "name": "پرامپت منفی",
+        "tooltip": "پرامپت متنی منفی"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت متنی مثبت"
+      },
+      "start_frame": {
+        "name": "فریم شروع",
+        "tooltip": "تصویر مرجع - آدرس URL یا رشته Base64 رمزگذاری‌شده، نباید بیش از ۱۰ مگابایت باشد، وضوح کمتر از ۳۰۰×۳۰۰ پیکسل نباشد، نسبت تصویر بین ۱:۲.۵ تا ۲.۵:۱. Base64 نباید شامل پیشوند data:image باشد."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "شناسه ویدیو",
+        "tooltip": null
+      },
+      "2": {
+        "name": "مدت زمان",
+        "tooltip": null
+      }
+    }
+  },
+  "KlingCameraControlT2VNode": {
+    "description": "تبدیل متن به ویدیوهای سینمایی با حرکات حرفه‌ای دوربین که شبیه‌سازی فیلم‌برداری واقعی را انجام می‌دهد. کنترل حرکات مجازی دوربین شامل زوم، چرخش، پن، تیلت و نمای اول شخص، در حالی که تمرکز بر متن اصلی حفظ می‌شود.",
+    "display_name": "Kling تبدیل متن به ویدیو (کنترل دوربین)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "camera_control": {
+        "name": "camera_control",
+        "tooltip": "می‌تواند با استفاده از node کنترل دوربین Kling ایجاد شود. حرکت و کنترل دوربین در طول تولید ویدیو را مدیریت می‌کند."
+      },
+      "cfg_scale": {
+        "name": "cfg_scale"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "پرامپت متنی منفی"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "پرامپت متنی مثبت"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "video_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "duration",
+        "tooltip": null
+      }
+    }
+  },
+  "KlingCameraControls": {
+    "description": "امکان تعیین گزینه‌های پیکربندی برای کنترل‌های دوربین Kling و افکت‌های کنترل حرکت را فراهم می‌کند.",
+    "display_name": "کنترل‌های دوربین Kling",
+    "inputs": {
+      "camera_control_type": {
+        "name": "camera_control_type"
+      },
+      "horizontal_movement": {
+        "name": "horizontal_movement",
+        "tooltip": "حرکت دوربین در محور افقی (محور x) را کنترل می‌کند. مقدار منفی به معنای حرکت به چپ و مقدار مثبت به معنای حرکت به راست است."
+      },
+      "pan": {
+        "name": "pan",
+        "tooltip": "چرخش دوربین در صفحه عمودی (محور x) را کنترل می‌کند. مقدار منفی به معنای چرخش به پایین و مقدار مثبت به معنای چرخش به بالا است."
+      },
+      "roll": {
+        "name": "roll",
+        "tooltip": "میزان چرخش دوربین در محور z را کنترل می‌کند. مقدار منفی به معنای چرخش پادساعتگرد و مقدار مثبت به معنای چرخش ساعتگرد است."
+      },
+      "tilt": {
+        "name": "tilt",
+        "tooltip": "چرخش دوربین در صفحه افقی (محور y) را کنترل می‌کند. مقدار منفی به معنای چرخش به چپ و مقدار مثبت به معنای چرخش به راست است."
+      },
+      "vertical_movement": {
+        "name": "vertical_movement",
+        "tooltip": "حرکت دوربین در محور عمودی (محور y) را کنترل می‌کند. مقدار منفی به معنای حرکت به پایین و مقدار مثبت به معنای حرکت به بالا است."
+      },
+      "zoom": {
+        "name": "zoom",
+        "tooltip": "تغییر فاصله کانونی دوربین را کنترل می‌کند. مقدار منفی به معنای زاویه دید باریک‌تر و مقدار مثبت به معنای زاویه دید بازتر است."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "camera_control",
+        "tooltip": null
+      }
+    }
+  },
+  "KlingDualCharacterVideoEffectNode": {
+    "description": "هنگام تولید ویدیو بر اساس effect_scene افکت‌های ویژه مختلفی را اعمال کنید. تصویر اول در سمت چپ و تصویر دوم در سمت راست ترکیب قرار می‌گیرد.",
+    "display_name": "افکت‌های ویدیویی دو کاراکتر Kling",
+    "inputs": {
+      "duration": {
+        "name": "duration"
+      },
+      "effect_scene": {
+        "name": "effect_scene"
+      },
+      "image_left": {
+        "name": "image_left",
+        "tooltip": "تصویر سمت چپ"
+      },
+      "image_right": {
+        "name": "image_right",
+        "tooltip": "تصویر سمت راست"
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "model_name": {
+        "name": "model_name"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "duration",
+        "tooltip": null
+      }
+    }
+  },
+  "KlingFirstLastFrameNode": {
+    "description": "تولید ویدیو با Kling V3 با استفاده از اولین و آخرین فریم.",
+    "display_name": "Kling 3.0 تبدیل اولین و آخرین فریم به ویدیو",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان"
+      },
+      "end_frame": {
+        "name": "آخرین فریم"
+      },
+      "first_frame": {
+        "name": "اولین فریم"
+      },
+      "generate_audio": {
+        "name": "تولید صدا"
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "تنظیمات مدل و تولید."
+      },
+      "model_resolution": {
+        "name": "رزولوشن"
+      },
+      "prompt": {
+        "name": "پرامپت"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed تعیین می‌کند که node باید دوباره اجرا شود یا خیر؛ نتایج حتی با seed یکسان غیرقطعی هستند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingImage2VideoNode": {
+    "display_name": "تبدیل تصویر Kling (فریم اول) به ویدیو",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "cfg_scale": {
+        "name": "cfg_scale"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "پرامپت متنی منفی"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "پرامپت متنی مثبت"
+      },
+      "start_frame": {
+        "name": "start_frame",
+        "tooltip": "تصویر مرجع برای تولید ویدیو استفاده می‌شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "video_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "duration",
+        "tooltip": null
+      }
+    }
+  },
+  "KlingImageGenerationNode": {
+    "description": "نود تولید تصویر Kling. تولید تصویر از یک پرامپت متنی با امکان استفاده از تصویر مرجع.",
+    "display_name": "تولید تصویر Kling",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "human_fidelity": {
+        "name": "human_fidelity",
+        "tooltip": "شباهت مرجع سوژه"
+      },
+      "image": {
+        "name": "image"
+      },
+      "image_fidelity": {
+        "name": "image_fidelity",
+        "tooltip": "شدت مرجع برای تصاویر بارگذاری‌شده توسط کاربر"
+      },
+      "image_type": {
+        "name": "image_type"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "تعداد تصاویر تولیدشده"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "پرامپت متنی منفی"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "پرامپت متنی مثبت"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed تعیین می‌کند که node باید دوباره اجرا شود یا خیر؛ نتایج حتی با seed یکسان غیرقطعی هستند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingImageToVideoWithAudio": {
+    "display_name": "تبدیل تصویر Kling (فریم اول) به ویدیو همراه با صدا",
+    "inputs": {
+      "duration": {
+        "name": "duration"
+      },
+      "generate_audio": {
+        "name": "generate_audio"
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "پرامپت متنی مثبت."
+      },
+      "start_frame": {
+        "name": "start_frame"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingLipSyncAudioToVideoNode": {
+    "description": "نود همگام‌سازی لب Kling. حرکات دهان در یک فایل ویدیویی را با محتوای صوتی یک فایل صوتی هماهنگ می‌کند. هنگام استفاده، اطمینان حاصل کنید که صدا دارای وکال واضح و ویدیو دارای چهره مشخص باشد. حجم فایل صوتی نباید بیشتر از ۵ مگابایت باشد. حجم فایل ویدیویی نباید بیشتر از ۱۰۰ مگابایت باشد، ارتفاع/عرض بین ۷۲۰ تا ۱۹۲۰ پیکسل و مدت زمان بین ۲ تا ۱۰ ثانیه باشد.",
+    "display_name": "همگام‌سازی لب Kling ویدیو با صدا",
+    "inputs": {
+      "audio": {
+        "name": "audio"
+      },
+      "video": {
+        "name": "video"
+      },
+      "voice_language": {
+        "name": "voice_language"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "video_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "duration",
+        "tooltip": null
+      }
+    }
+  },
+  "KlingLipSyncTextToVideoNode": {
+    "description": "گره همگام‌سازی لب Kling از متن به ویدیو. حرکات دهان در یک فایل ویدیویی را با یک متن همگام می‌کند. حجم فایل ویدیو نباید بیش از ۱۰۰ مگابایت باشد، ارتفاع/عرض باید بین ۷۲۰ تا ۱۹۲۰ پیکسل باشد و مدت زمان آن باید بین ۲ تا ۱۰ ثانیه باشد.",
+    "display_name": "همگام‌سازی لب Kling با ویدیو و متن",
+    "inputs": {
+      "text": {
+        "name": "متن",
+        "tooltip": "محتوای متنی برای تولید ویدیوی همگام‌سازی لب. هنگام انتخاب حالت text2video الزامی است. حداکثر طول ۱۲۰ کاراکتر."
+      },
+      "video": {
+        "name": "ویدیو"
+      },
+      "voice": {
+        "name": "صدا"
+      },
+      "voice_speed": {
+        "name": "سرعت صدا",
+        "tooltip": "سرعت گفتار. بازه معتبر: ۰.۸ تا ۲.۰، با دقت تا یک رقم اعشار."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "شناسه ویدیو",
+        "tooltip": null
+      },
+      "2": {
+        "name": "مدت زمان",
+        "tooltip": null
+      }
+    }
+  },
+  "KlingMotionControl": {
+    "display_name": "کنترل حرکت Kling",
+    "inputs": {
+      "character_orientation": {
+        "name": "جهت‌گیری شخصیت",
+        "tooltip": "تعیین می‌کند جهت/زاویه شخصیت از کجا گرفته شود.\nvideo: حرکات، حالات چهره، حرکات دوربین و جهت‌گیری مطابق ویدیوی مرجع حرکت (سایر جزئیات از طریق پرامپت).\nimage: حرکات و حالات چهره همچنان از ویدیوی مرجع حرکت پیروی می‌کنند، اما جهت‌گیری شخصیت مطابق تصویر مرجع است (دوربین/سایر جزئیات از طریق پرامپت)."
+      },
+      "keep_original_sound": {
+        "name": "حفظ صدای اصلی"
+      },
+      "mode": {
+        "name": "حالت"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "prompt": {
+        "name": "پرامپت"
+      },
+      "reference_image": {
+        "name": "تصویر مرجع"
+      },
+      "reference_video": {
+        "name": "ویدیوی مرجع",
+        "tooltip": "ویدیوی مرجع حرکت برای هدایت حرکات/بیان چهره.\nمحدودیت مدت زمان بسته به character_orientation:\n - تصویر: ۳ تا ۱۰ ثانیه (حداکثر ۱۰ ثانیه)\n - ویدیو: ۳ تا ۳۰ ثانیه (حداکثر ۳۰ ثانیه)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProEditVideoNode": {
+    "description": "ویرایش یک ویدیوی موجود با جدیدترین مدل Kling.",
+    "display_name": "ویرایش ویدیوی Omni Kling (حرفه‌ای)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "keep_original_sound": {
+        "name": "حفظ صدای اصلی"
+      },
+      "model_name": {
+        "name": "نام مدل"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "یک پرامپت متنی برای توصیف محتوای ویدیو. می‌تواند شامل توصیفات مثبت و منفی باشد."
+      },
+      "reference_images": {
+        "name": "تصاویر مرجع",
+        "tooltip": "حداکثر ۴ تصویر مرجع اضافی."
+      },
+      "resolution": {
+        "name": "وضوح"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed تعیین می‌کند که node باید دوباره اجرا شود یا خیر؛ نتایج حتی با seed یکسان غیرقطعی هستند."
+      },
+      "video": {
+        "name": "ویدیو",
+        "tooltip": "ویدیو برای ویرایش. طول ویدیوی خروجی همانند ورودی خواهد بود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProFirstLastFrameNode": {
+    "description": "استفاده از یک فریم شروع، یک فریم پایانی اختیاری یا تصاویر مرجع با جدیدترین مدل Kling.",
+    "display_name": "Kling Omni تبدیل اولین-آخرین فریم به ویدیو (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "end_frame": {
+        "name": "end_frame",
+        "tooltip": "یک فریم پایانی اختیاری برای ویدیو. این گزینه نمی‌تواند همزمان با 'reference_images' استفاده شود."
+      },
+      "first_frame": {
+        "name": "first_frame"
+      },
+      "generate_audio": {
+        "name": "تولید صدا",
+        "tooltip": "تولید صدا برای ویدیو. فقط برای kling-v3-omni پشتیبانی می‌شود."
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "یک پرامپت متنی برای توصیف محتوای ویدیو. این می‌تواند شامل توصیفات مثبت و منفی باشد."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "حداکثر ۶ تصویر مرجع اضافی."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed تعیین می‌کند که node باید دوباره اجرا شود یا خیر؛ نتایج حتی با seed یکسان غیرقطعی هستند."
+      },
+      "storyboards": {
+        "name": "استوری‌بوردها",
+        "tooltip": "تولید مجموعه‌ای از بخش‌های ویدیویی با پرامپت و مدت زمان جداگانه. فقط برای kling-v3-omni پشتیبانی می‌شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProImageNode": {
+    "description": "ایجاد یا ویرایش تصاویر با جدیدترین مدل Kling.",
+    "display_name": "Kling Omni تصویر (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "یک پرامپت متنی برای توصیف محتوای تصویر. این می‌تواند شامل توصیفات مثبت و منفی باشد."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "حداکثر ۱۰ تصویر مرجع اضافی."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed تعیین می‌کند که node باید دوباره اجرا شود یا خیر؛ نتایج حتی با seed یکسان غیرقطعی هستند."
+      },
+      "series_amount": {
+        "name": "تعداد سری",
+        "tooltip": "تولید مجموعه‌ای از تصاویر. برای kling-image-o1 پشتیبانی نمی‌شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProImageToVideoNode": {
+    "description": "استفاده از حداکثر ۷ تصویر مرجع برای تولید ویدیو با جدیدترین مدل Kling.",
+    "display_name": "Kling Omni تبدیل تصویر به ویدیو (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "generate_audio": {
+        "name": "تولید صدا",
+        "tooltip": "تولید صدا برای ویدیو. فقط برای kling-v3-omni پشتیبانی می‌شود."
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "یک پرامپت متنی برای توصیف محتوای ویدیو. این می‌تواند شامل توصیفات مثبت و منفی باشد."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "حداکثر ۷ تصویر مرجع."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed تعیین می‌کند که node باید دوباره اجرا شود یا خیر؛ نتایج حتی با seed یکسان غیرقطعی هستند."
+      },
+      "storyboards": {
+        "name": "استوری‌بوردها",
+        "tooltip": "تولید مجموعه‌ای از بخش‌های ویدیویی با پرامپت و مدت زمان جداگانه. فقط برای kling-v3-omni پشتیبانی می‌شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProTextToVideoNode": {
+    "description": "استفاده از پرامپت‌های متنی برای تولید ویدیو با جدیدترین مدل Kling.",
+    "display_name": "Kling Omni تبدیل متن به ویدیو (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "generate_audio": {
+        "name": "تولید صدا"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "یک پرامپت متنی برای توصیف محتوای ویدیو. این می‌تواند شامل توصیفات مثبت و منفی باشد."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed تعیین می‌کند که node باید دوباره اجرا شود یا خیر؛ نتایج حتی با seed یکسان غیرقطعی هستند."
+      },
+      "storyboards": {
+        "name": "استوری‌بوردها",
+        "tooltip": "تولید مجموعه‌ای از بخش‌های ویدیویی با پرامپت و مدت زمان جداگانه. برای مدل o1 نادیده گرفته می‌شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProVideoToVideoNode": {
+    "description": "با استفاده از یک ویدیو و حداکثر ۴ تصویر مرجع، یک ویدیو با مدل جدید Kling تولید کنید.",
+    "display_name": "Kling Omni Video به Video (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "keep_original_sound": {
+        "name": "keep_original_sound"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "یک پرامپت متنی برای توصیف محتوای ویدیو. این می‌تواند شامل توصیفات مثبت و منفی باشد."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "حداکثر ۴ تصویر مرجع اضافی."
+      },
+      "reference_video": {
+        "name": "reference_video",
+        "tooltip": "ویدیوی مرجع برای استفاده."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed تعیین می‌کند که آیا node باید دوباره اجرا شود؛ نتایج صرف‌نظر از seed غیرقطعی هستند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingSingleImageVideoEffectNode": {
+    "description": "هنگام تولید ویدیو بر اساس effect_scene، افکت‌های ویژه مختلفی را اعمال کنید.",
+    "display_name": "افکت‌های ویدیویی Kling",
+    "inputs": {
+      "duration": {
+        "name": "duration"
+      },
+      "effect_scene": {
+        "name": "effect_scene"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "تصویر مرجع. آدرس URL یا رشته Base64 (بدون پیشوند data:image). حجم فایل نباید از ۱۰ مگابایت بیشتر باشد، وضوح کمتر از ۳۰۰×۳۰۰ پیکسل نباشد، نسبت تصویر بین ۱:۲.۵ تا ۲.۵:۱ باشد."
+      },
+      "model_name": {
+        "name": "model_name"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "video_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "duration",
+        "tooltip": null
+      }
+    }
+  },
+  "KlingStartEndFrameNode": {
+    "description": "یک توالی ویدیویی تولید کنید که بین تصاویر شروع و پایان ارائه‌شده شما انتقال ایجاد می‌کند. این نود تمام فریم‌های میانی را ایجاد کرده و یک تبدیل نرم از اولین فریم به آخرین فریم ارائه می‌دهد.",
+    "display_name": "Kling شروع-پایان فریم به ویدیو",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "cfg_scale": {
+        "name": "cfg_scale"
+      },
+      "end_frame": {
+        "name": "end_frame",
+        "tooltip": "تصویر مرجع - کنترل فریم پایانی. آدرس URL یا رشته Base64، نباید از ۱۰ مگابایت بیشتر باشد، وضوح کمتر از ۳۰۰×۳۰۰ پیکسل نباشد. Base64 نباید شامل پیشوند data:image باشد."
+      },
+      "mode": {
+        "name": "mode",
+        "tooltip": "پیکربندی مورد استفاده برای تولید ویدیو با فرمت: mode / duration / model_name."
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "پرامپت متنی منفی"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "پرامپت متنی مثبت"
+      },
+      "start_frame": {
+        "name": "start_frame",
+        "tooltip": "تصویر مرجع - آدرس URL یا رشته Base64، نباید از ۱۰ مگابایت بیشتر باشد، وضوح کمتر از ۳۰۰×۳۰۰ پیکسل نباشد، نسبت تصویر بین ۱:۲.۵ تا ۲.۵:۱ باشد. Base64 نباید شامل پیشوند data:image باشد."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "video_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "duration",
+        "tooltip": null
+      }
+    }
+  },
+  "KlingTextToVideoNode": {
+    "description": "گره Kling تبدیل متن به ویدیو",
+    "display_name": "Kling تبدیل متن به ویدیو",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "cfg_scale": {
+        "name": "cfg_scale"
+      },
+      "mode": {
+        "name": "mode",
+        "tooltip": "پیکربندی مورد استفاده برای تولید ویدیو به فرمت: mode / duration / model_name."
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "پرامپت متنی منفی"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "پرامپت متنی مثبت"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "video_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "duration",
+        "tooltip": null
+      }
+    }
+  },
+  "KlingTextToVideoWithAudio": {
+    "display_name": "Kling تبدیل متن به ویدیو با صدا",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "generate_audio": {
+        "name": "generate_audio"
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "پرامپت متنی مثبت."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingVideoExtendNode": {
+    "description": "گره Kling گسترش ویدیو. ویدیوهای ساخته‌شده توسط سایر گره‌های Kling را گسترش دهید. video_id توسط سایر گره‌های Kling ایجاد می‌شود.",
+    "display_name": "Kling گسترش ویدیو",
+    "inputs": {
+      "cfg_scale": {
+        "name": "cfg_scale"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "پرامپت متنی منفی برای اجتناب از عناصر ناخواسته در ویدیوی گسترش‌یافته"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "پرامپت متنی مثبت برای راهنمایی گسترش ویدیو"
+      },
+      "video_id": {
+        "name": "video_id",
+        "tooltip": "شناسه ویدیویی که باید گسترش یابد. از ویدیوهای تولیدشده توسط تبدیل متن به ویدیو، تصویر به ویدیو و عملیات گسترش ویدیوی قبلی پشتیبانی می‌کند. پس از گسترش، مدت زمان کل نباید از ۳ دقیقه بیشتر شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "video_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "duration",
+        "tooltip": null
+      }
+    }
+  },
+  "KlingVideoNode": {
+    "description": "تولید ویدیو با Kling V3. پشتیبانی از تبدیل متن به ویدیو و تصویر به ویدیو با امکان استفاده از استوری‌بورد چندپرومپتی و تولید صوت اختیاری.",
+    "display_name": "Kling 3.0 ویدیو",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "generate_audio": {
+        "name": "تولید صوت"
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "تنظیمات مدل و تولید."
+      },
+      "model_aspect_ratio": {
+        "name": "نسبت تصویر"
+      },
+      "model_resolution": {
+        "name": "رزولوشن"
+      },
+      "multi_shot": {
+        "name": "چند شات",
+        "tooltip": "تولید مجموعه‌ای از بخش‌های ویدیویی با پرومپت‌ها و مدت زمان‌های جداگانه."
+      },
+      "multi_shot_duration": {
+        "name": "مدت زمان"
+      },
+      "multi_shot_negative_prompt": {
+        "name": "پرومپت منفی"
+      },
+      "multi_shot_prompt": {
+        "name": "پرومپت"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed تعیین می‌کند که آیا node باید دوباره اجرا شود؛ نتایج صرف‌نظر از seed غیرقطعی هستند."
+      },
+      "start_frame": {
+        "name": "فریم شروع",
+        "tooltip": "تصویر فریم شروع اختیاری. در صورت اتصال، به حالت تصویر به ویدیو تغییر می‌کند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingVirtualTryOnNode": {
+    "description": "گره Kling پرو لباس مجازی. یک تصویر انسان و یک تصویر لباس وارد کنید تا لباس را روی انسان امتحان کنید. می‌توانید چندین تصویر لباس را در یک تصویر با پس‌زمینه سفید ادغام کنید.",
+    "display_name": "Kling پرو لباس مجازی",
+    "inputs": {
+      "cloth_image": {
+        "name": "cloth_image"
+      },
+      "human_image": {
+        "name": "human_image"
+      },
+      "model_name": {
+        "name": "model_name"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LTXAVTextEncoderLoader": {
+    "description": "[دستورالعمل‌ها]\n\nltxav: gemma ۳ ۱۲B",
+    "display_name": "بارگذاری رمزگذار متنی LTXV Audio",
+    "inputs": {
+      "ckpt_name": {
+        "name": "نام checkpoint"
+      },
+      "device": {
+        "name": "دستگاه"
+      },
+      "text_encoder": {
+        "name": "رمزگذار متنی"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAddGuide": {
+    "display_name": "LTXVAddGuide",
+    "inputs": {
+      "frame_idx": {
+        "name": "اندیس فریم",
+        "tooltip": "اندیس فریم برای شروع شرط‌گذاری. برای تصاویر تک‌فریم یا ویدیوهای ۱ تا ۸ فریم، هر مقدار frame_idx قابل قبول است. برای ویدیوهای ۹ فریم به بالا، frame_idx باید بر ۸ بخش‌پذیر باشد، در غیر این صورت به نزدیک‌ترین مضرب ۸ گرد می‌شود. مقادیر منفی از انتهای ویدیو شمرده می‌شوند."
+      },
+      "image": {
+        "name": "تصویر",
+        "tooltip": "تصویر یا ویدیو برای شرط‌گذاری latent ویدیو. باید شامل ۸*n+۱ فریم باشد. اگر ویدیو این تعداد فریم نداشته باشد، به نزدیک‌ترین ۸*n+۱ فریم برش داده می‌شود."
+      },
+      "latent": {
+        "name": "latent"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "strength": {
+        "name": "شدت"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAEDecode": {
+    "display_name": "LTXV رمزگشایی Audio VAE",
+    "inputs": {
+      "audio_vae": {
+        "name": "Audio VAE",
+        "tooltip": "مدل Audio VAE مورد استفاده برای رمزگشایی لاتنت."
+      },
+      "samples": {
+        "name": "نمونه‌ها",
+        "tooltip": "لاتنت برای رمزگشایی."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "صدا",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAEEncode": {
+    "display_name": "LTXV کدگذاری Audio VAE",
+    "inputs": {
+      "audio": {
+        "name": "صدا",
+        "tooltip": "صدایی که باید کدگذاری شود."
+      },
+      "audio_vae": {
+        "name": "Audio VAE",
+        "tooltip": "مدل Audio VAE برای کدگذاری."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "لاتنت صدا",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAELoader": {
+    "display_name": "LTXV بارگذاری Audio VAE",
+    "inputs": {
+      "ckpt_name": {
+        "name": "نام چک‌پوینت",
+        "tooltip": "چک‌پوینت Audio VAE برای بارگذاری."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Audio VAE",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVConcatAVLatent": {
+    "display_name": "LTXVConcatAVLatent",
+    "inputs": {
+      "audio_latent": {
+        "name": "لاتنت صدا"
+      },
+      "video_latent": {
+        "name": "لاتنت ویدیو"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "لاتنت",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVConditioning": {
+    "display_name": "LTXVConditioning",
+    "inputs": {
+      "frame_rate": {
+        "name": "نرخ فریم"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVCropGuides": {
+    "display_name": "LTXVCropGuides",
+    "inputs": {
+      "latent": {
+        "name": "لاتنت"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "لاتنت",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVEmptyLatentAudio": {
+    "display_name": "LTXV Empty Latent Audio",
+    "inputs": {
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "مدل Audio VAE برای دریافت پیکربندی."
+      },
+      "batch_size": {
+        "name": "batch_size",
+        "tooltip": "تعداد نمونه‌های latent audio در هر دسته."
+      },
+      "frame_rate": {
+        "name": "frame_rate",
+        "tooltip": "تعداد فریم در هر ثانیه."
+      },
+      "frames_number": {
+        "name": "frames_number",
+        "tooltip": "تعداد فریم‌ها."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVImgToVideo": {
+    "display_name": "LTXVImgToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "image": {
+        "name": "image"
+      },
+      "length": {
+        "name": "length"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "strength": {
+        "name": "strength"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVImgToVideoInplace": {
+    "display_name": "LTXVImgToVideoInplace",
+    "inputs": {
+      "bypass": {
+        "name": "bypass",
+        "tooltip": "عبور از شرط‌گذاری."
+      },
+      "image": {
+        "name": "image"
+      },
+      "latent": {
+        "name": "latent"
+      },
+      "strength": {
+        "name": "strength"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVLatentUpsampler": {
+    "display_name": "LTXVLatentUpsampler",
+    "inputs": {
+      "samples": {
+        "name": "samples"
+      },
+      "upscale_model": {
+        "name": "upscale_model"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
+  "LTXVPreprocess": {
+    "display_name": "LTXVPreprocess",
+    "inputs": {
+      "image": {
+        "name": "image"
+      },
+      "img_compression": {
+        "name": "img_compression",
+        "tooltip": "میزان فشرده‌سازی اعمال‌شده روی تصویر."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "output_image",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVScheduler": {
+    "display_name": "LTXVScheduler",
+    "inputs": {
+      "base_shift": {
+        "name": "base_shift"
+      },
+      "latent": {
+        "name": "latent"
+      },
+      "max_shift": {
+        "name": "max_shift"
+      },
+      "steps": {
+        "name": "steps"
+      },
+      "stretch": {
+        "name": "stretch",
+        "tooltip": "کشیدن سیگماها به بازه [terminal, ۱]."
+      },
+      "terminal": {
+        "name": "terminal",
+        "tooltip": "مقدار نهایی سیگماها پس از کشیدن."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVSeparateAVLatent": {
+    "description": "جداکننده AV Latent در LTXV",
+    "display_name": "LTXVSeparateAVLatent",
+    "inputs": {
+      "av_latent": {
+        "name": "av_latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "video_latent",
+        "tooltip": null
+      },
+      "1": {
+        "name": "audio_latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LaplaceScheduler": {
+    "display_name": "LaplaceScheduler",
+    "inputs": {
+      "beta": {
+        "name": "بتا"
+      },
+      "mu": {
+        "name": "مو"
+      },
+      "sigma_max": {
+        "name": "سیگما بیشینه"
+      },
+      "sigma_min": {
+        "name": "سیگما کمینه"
+      },
+      "steps": {
+        "name": "گام‌ها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentAdd": {
+    "display_name": "LatentAdd",
+    "inputs": {
+      "samples1": {
+        "name": "نمونه ۱"
+      },
+      "samples2": {
+        "name": "نمونه ۲"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentApplyOperation": {
+    "display_name": "LatentApplyOperation",
+    "inputs": {
+      "operation": {
+        "name": "عملیات"
+      },
+      "samples": {
+        "name": "نمونه‌ها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentApplyOperationCFG": {
+    "display_name": "LatentApplyOperationCFG",
+    "inputs": {
+      "model": {
+        "name": "مدل"
+      },
+      "operation": {
+        "name": "عملیات"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentBatch": {
+    "display_name": "LatentBatch",
+    "inputs": {
+      "samples1": {
+        "name": "نمونه‌ها۱"
+      },
+      "samples2": {
+        "name": "نمونه‌ها۲"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentBatchSeedBehavior": {
+    "display_name": "LatentBatchSeedBehavior",
+    "inputs": {
+      "samples": {
+        "name": "نمونه‌ها"
+      },
+      "seed_behavior": {
+        "name": "رفتار seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentBlend": {
+    "display_name": "Latent Blend",
+    "inputs": {
+      "blend_factor": {
+        "name": "ضریب ترکیب"
+      },
+      "samples1": {
+        "name": "نمونه‌ها۱"
+      },
+      "samples2": {
+        "name": "نمونه‌ها۲"
+      }
+    }
+  },
+  "LatentComposite": {
+    "display_name": "Latent Composite",
+    "inputs": {
+      "feather": {
+        "name": "پرکنندگی"
+      },
+      "samples_from": {
+        "name": "نمونه‌های مبدا"
+      },
+      "samples_to": {
+        "name": "نمونه‌های مقصد"
+      },
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      }
+    }
+  },
+  "LatentCompositeMasked": {
+    "display_name": "LatentCompositeMasked",
+    "inputs": {
+      "destination": {
+        "name": "مقصد"
+      },
+      "mask": {
+        "name": "ماسک"
+      },
+      "resize_source": {
+        "name": "تغییر اندازه مبدا"
+      },
+      "source": {
+        "name": "مبدا"
+      },
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentConcat": {
+    "display_name": "LatentConcat",
+    "inputs": {
+      "dim": {
+        "name": "بُعد"
+      },
+      "samples1": {
+        "name": "نمونه‌ها۱"
+      },
+      "samples2": {
+        "name": "نمونه‌ها۲"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentCrop": {
+    "display_name": "Crop Latent",
+    "inputs": {
+      "height": {
+        "name": "ارتفاع"
+      },
+      "samples": {
+        "name": "نمونه‌ها"
+      },
+      "width": {
+        "name": "عرض"
+      },
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      }
+    }
+  },
+  "LatentCut": {
+    "display_name": "LatentCut",
+    "inputs": {
+      "amount": {
+        "name": "مقدار"
+      },
+      "dim": {
+        "name": "بُعد"
+      },
+      "index": {
+        "name": "ایندکس"
+      },
+      "samples": {
+        "name": "نمونه‌ها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentCutToBatch": {
+    "display_name": "برش Latent به دسته",
+    "inputs": {
+      "dim": {
+        "name": "بُعد"
+      },
+      "samples": {
+        "name": "نمونه‌ها"
+      },
+      "slice_size": {
+        "name": "اندازه برش"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentFlip": {
+    "display_name": "وارونه‌سازی Latent",
+    "inputs": {
+      "flip_method": {
+        "name": "روش وارونه‌سازی"
+      },
+      "samples": {
+        "name": "نمونه‌ها"
+      }
+    }
+  },
+  "LatentFromBatch": {
+    "display_name": "Latent از دسته",
+    "inputs": {
+      "batch_index": {
+        "name": "شاخص دسته"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "samples": {
+        "name": "نمونه‌ها"
+      }
+    }
+  },
+  "LatentInterpolate": {
+    "display_name": "درون‌یابی Latent",
+    "inputs": {
+      "ratio": {
+        "name": "نسبت"
+      },
+      "samples1": {
+        "name": "نمونه‌ها ۱"
+      },
+      "samples2": {
+        "name": "نمونه‌ها ۲"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentMultiply": {
+    "display_name": "ضرب Latent",
+    "inputs": {
+      "multiplier": {
+        "name": "ضریب"
+      },
+      "samples": {
+        "name": "نمونه‌ها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentOperationSharpen": {
+    "display_name": "تیز کردن Latent",
+    "inputs": {
+      "alpha": {
+        "name": "آلفا"
+      },
+      "sharpen_radius": {
+        "name": "شعاع تیز کردن"
+      },
+      "sigma": {
+        "name": "سیگما"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentOperationTonemapReinhard": {
+    "display_name": "تنظیم تون Reinhard برای Latent",
+    "inputs": {
+      "multiplier": {
+        "name": "ضریب"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentRotate": {
+    "display_name": "چرخش Latent",
+    "inputs": {
+      "rotation": {
+        "name": "زاویه چرخش"
+      },
+      "samples": {
+        "name": "نمونه‌ها"
+      }
+    }
+  },
+  "LatentSubtract": {
+    "display_name": "تفریق Latent",
+    "inputs": {
+      "samples1": {
+        "name": "نمونه‌ها ۱"
+      },
+      "samples2": {
+        "name": "نمونه‌ها ۲"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentUpscale": {
+    "display_name": "بزرگ‌نمایی Latent",
+    "inputs": {
+      "crop": {
+        "name": "برش"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "samples": {
+        "name": "نمونه‌ها"
+      },
+      "upscale_method": {
+        "name": "روش بزرگ‌نمایی"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    }
+  },
+  "LatentUpscaleBy": {
+    "display_name": "بزرگ‌نمایی Latent بر اساس",
+    "inputs": {
+      "samples": {
+        "name": "نمونه‌ها"
+      },
+      "scale_by": {
+        "name": "مقیاس"
+      },
+      "upscale_method": {
+        "name": "روش بزرگ‌نمایی"
+      }
+    }
+  },
+  "LatentUpscaleModelLoader": {
+    "display_name": "بارگذاری مدل بزرگ‌نمایی Latent",
+    "inputs": {
+      "model_name": {
+        "name": "نام مدل"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LazyCache": {
+    "description": "نسخه خانگی EasyCache - نسخه‌ای حتی «ساده‌تر» از EasyCache برای پیاده‌سازی. به طور کلی عملکرد ضعیف‌تری نسبت به EasyCache دارد، اما در برخی موارد نادر بهتر عمل می‌کند و با همه چیز در ComfyUI سازگاری کامل دارد.",
+    "display_name": "LazyCache",
+    "inputs": {
+      "end_percent": {
+        "name": "درصد پایان",
+        "tooltip": "مرحله نمونه‌گیری نسبی برای پایان استفاده از LazyCache."
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "مدلی که قرار است LazyCache به آن افزوده شود."
+      },
+      "reuse_threshold": {
+        "name": "آستانه استفاده مجدد",
+        "tooltip": "آستانه‌ای برای استفاده مجدد از مراحل کش شده."
+      },
+      "start_percent": {
+        "name": "درصد شروع",
+        "tooltip": "مرحله نمونه‌گیری نسبی برای شروع استفاده از LazyCache."
+      },
+      "verbose": {
+        "name": "گزارش‌گیری کامل",
+        "tooltip": "آیا اطلاعات کامل ثبت شود یا خیر."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "مدل با LazyCache."
+      }
+    }
+  },
+  "Load3D": {
+    "display_name": "بارگذاری ۳بعدی و انیمیشن",
+    "inputs": {
+      "clear": {},
+      "height": {
+        "name": "ارتفاع"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "model_file": {
+        "name": "فایل مدل"
+      },
+      "upload 3d model": {},
+      "upload extra resources": {},
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "تصویر",
+        "tooltip": null
+      },
+      "1": {
+        "name": "ماسک",
+        "tooltip": null
+      },
+      "2": {
+        "name": "مسیر مش",
+        "tooltip": null
+      },
+      "3": {
+        "name": "نرمال",
+        "tooltip": null
+      },
+      "4": {
+        "name": "اطلاعات دوربین",
+        "tooltip": null
+      },
+      "5": {
+        "name": "ویدئوی ضبط‌شده",
+        "tooltip": null
+      },
+      "6": {
+        "name": "مدل_۳بعدی",
+        "tooltip": null
+      }
+    }
+  },
+  "LoadAudio": {
+    "display_name": "بارگذاری صوت",
+    "inputs": {
+      "audio": {
+        "name": "صوت"
+      },
+      "audioUI": {
+        "name": "رابط صوتی"
+      },
+      "upload": {
+        "name": "انتخاب فایل برای بارگذاری"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LoadImage": {
+    "display_name": "بارگذاری تصویر",
+    "inputs": {
+      "image": {
+        "name": "تصویر"
+      },
+      "upload": {
+        "name": "انتخاب فایل برای بارگذاری"
+      }
+    }
+  },
+  "LoadImageDataSetFromFolder": {
+    "display_name": "بارگذاری مجموعه تصاویر از پوشه",
+    "inputs": {
+      "folder": {
+        "name": "پوشه",
+        "tooltip": "پوشه‌ای که تصاویر از آن بارگذاری می‌شوند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "تصاویر",
+        "tooltip": "فهرست تصاویر بارگذاری‌شده"
+      }
+    }
+  },
+  "LoadImageMask": {
+    "display_name": "بارگذاری تصویر (به عنوان ماسک)",
+    "inputs": {
+      "channel": {
+        "name": "کانال"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "upload": {
+        "name": "انتخاب فایل برای بارگذاری"
+      }
+    }
+  },
+  "LoadImageOutput": {
+    "description": "بارگذاری یک تصویر از پوشه خروجی. با کلیک روی دکمه تازه‌سازی، فهرست تصاویر به‌روزرسانی شده و اولین تصویر به طور خودکار انتخاب می‌شود تا تکرار آسان‌تر شود.",
+    "display_name": "بارگذاری تصویر (از خروجی‌ها)",
+    "inputs": {
+      "Auto-refresh after generation": {},
+      "image": {
+        "name": "تصویر"
+      },
+      "refresh": {},
+      "upload": {
+        "name": "انتخاب فایل برای بارگذاری"
+      }
+    }
+  },
+  "LoadImageTextDataSetFromFolder": {
+    "display_name": "بارگذاری مجموعه داده تصویر و متن از پوشه",
+    "inputs": {
+      "folder": {
+        "name": "پوشه",
+        "tooltip": "پوشه‌ای که تصاویر از آن بارگذاری می‌شوند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "تصاویر",
+        "tooltip": "فهرست تصاویر بارگذاری‌شده"
+      },
+      "1": {
+        "name": "متون",
+        "tooltip": "فهرست کپشن‌های متنی"
+      }
+    }
+  },
+  "LoadLatent": {
+    "display_name": "LoadLatent",
+    "inputs": {
+      "latent": {
+        "name": "latent"
+      }
+    }
+  },
+  "LoadTrainingDataset": {
+    "display_name": "بارگذاری مجموعه داده آموزشی",
+    "inputs": {
+      "folder_name": {
+        "name": "نام پوشه",
+        "tooltip": "نام پوشه‌ای که مجموعه داده ذخیره‌شده را شامل می‌شود (درون پوشه خروجی)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latents",
+        "tooltip": "فهرست دیکشنری‌های latent"
+      },
+      "1": {
+        "name": "شرایط‌دهی",
+        "tooltip": "فهرست لیست‌های شرایط‌دهی"
+      }
+    }
+  },
+  "LoadVideo": {
+    "display_name": "بارگذاری ویدیو",
+    "inputs": {
+      "file": {
+        "name": "فایل"
+      },
+      "upload": {
+        "name": "انتخاب فایل برای بارگذاری"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LoraLoader": {
+    "description": "LoRAها برای تغییر مدل‌های diffusion و CLIP استفاده می‌شوند و نحوه حذف نویز از latents را تغییر می‌دهند، مانند اعمال سبک‌ها. چندین node LoRA می‌توانند به هم متصل شوند.",
+    "display_name": "بارگذاری LoRA",
+    "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "مدل CLIP که LoRA روی آن اعمال می‌شود."
+      },
+      "lora_name": {
+        "name": "lora_name",
+        "tooltip": "نام LoRA."
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "مدل diffusion که LoRA روی آن اعمال می‌شود."
+      },
+      "strength_clip": {
+        "name": "قدرت_clip",
+        "tooltip": "میزان تغییر مدل CLIP. این مقدار می‌تواند منفی باشد."
+      },
+      "strength_model": {
+        "name": "قدرت_مدل",
+        "tooltip": "میزان تغییر مدل diffusion. این مقدار می‌تواند منفی باشد."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "مدل diffusion تغییر یافته."
+      },
+      "1": {
+        "tooltip": "مدل CLIP تغییر یافته."
+      }
+    }
+  },
+  "LoraLoaderBypass": {
+    "description": "اعمال LoRA در حالت bypass. برخلاف LoRA معمولی، این روش وزن‌های مدل را تغییر نمی‌دهد بلکه محاسبات LoRA را در طول عبور رو به جلو تزریق می‌کند. مناسب برای سناریوهای آموزش.",
+    "display_name": "بارگذاری LoRA (حالت Bypass) (برای اشکال‌زدایی)",
+    "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "مدل CLIP که LoRA بر روی آن اعمال می‌شود."
+      },
+      "lora_name": {
+        "name": "lora_name",
+        "tooltip": "نام LoRA."
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "مدل diffusion که LoRA بر روی آن اعمال می‌شود."
+      },
+      "strength_clip": {
+        "name": "قدرت_clip",
+        "tooltip": "میزان شدت تغییر مدل CLIP. این مقدار می‌تواند منفی باشد."
+      },
+      "strength_model": {
+        "name": "قدرت_مدل",
+        "tooltip": "میزان شدت تغییر مدل diffusion. این مقدار می‌تواند منفی باشد."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "مدل diffusion تغییر یافته."
+      },
+      "1": {
+        "tooltip": "مدل CLIP تغییر یافته."
+      }
+    }
+  },
+  "LoraLoaderBypassModelOnly": {
+    "description": "اعمال LoRA در حالت bypass. برخلاف LoRA معمولی، این روش وزن‌های مدل را تغییر نمی‌دهد بلکه محاسبات LoRA را در طول عبور رو به جلو تزریق می‌کند. مناسب برای سناریوهای آموزش.",
+    "display_name": "بارگذاری LoRA (حالت Bypass، فقط مدل) (برای اشکال‌زدایی)",
+    "inputs": {
+      "lora_name": {
+        "name": "lora_name"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "strength_model": {
+        "name": "قدرت_مدل"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "مدل diffusion تغییر یافته."
+      }
+    }
+  },
+  "LoraLoaderModelOnly": {
+    "description": "LoRAها برای تغییر مدل‌های diffusion و CLIP استفاده می‌شوند و نحوه حذف نویز از latents را تغییر می‌دهند، مانند اعمال سبک‌ها. چندین node LoRA می‌توانند به هم متصل شوند.",
+    "display_name": "LoraLoaderModelOnly",
+    "inputs": {
+      "lora_name": {
+        "name": "lora_name"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "strength_model": {
+        "name": "قدرت_مدل"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "مدل diffusion تغییر یافته."
+      }
+    }
+  },
+  "LoraModelLoader": {
+    "display_name": "بارگذاری مدل LoRA",
+    "inputs": {
+      "bypass": {
+        "name": "bypass",
+        "tooltip": "زمانی که فعال باشد، LoRA را در حالت bypass بدون تغییر وزن‌های مدل پایه اعمال می‌کند. این گزینه برای آموزش و زمانی که وزن‌های مدل offload شده‌اند مفید است."
+      },
+      "lora": {
+        "name": "lora",
+        "tooltip": "مدل LoRA که باید روی مدل diffusion اعمال شود."
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "مدل diffusion که LoRA روی آن اعمال می‌شود."
+      },
+      "strength_model": {
+        "name": "قدرت_مدل",
+        "tooltip": "میزان تغییر مدل diffusion. این مقدار می‌تواند منفی باشد."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مدل",
+        "tooltip": "مدل diffusion تغییر یافته."
+      }
+    }
+  },
+  "LoraSave": {
+    "display_name": "استخراج و ذخیره Lora",
+    "inputs": {
+      "bias_diff": {
+        "name": "تفاوت بایاس"
+      },
+      "filename_prefix": {
+        "name": "پیشوند نام فایل"
+      },
+      "lora_type": {
+        "name": "نوع lora"
+      },
+      "model_diff": {
+        "name": "تفاوت مدل",
+        "tooltip": "خروجی ModelSubtract که باید به lora تبدیل شود."
+      },
+      "rank": {
+        "name": "رتبه"
+      },
+      "text_encoder_diff": {
+        "name": "تفاوت رمزگذار متنی",
+        "tooltip": "خروجی CLIPSubtract که باید به lora تبدیل شود."
+      }
+    }
+  },
+  "LossGraphNode": {
+    "display_name": "نمایش نمودار Loss",
+    "inputs": {
+      "filename_prefix": {
+        "name": "پیشوند نام فایل",
+        "tooltip": "پیشوند برای تصویر نمودار loss ذخیره‌شده."
+      },
+      "loss": {
+        "name": "مقدار loss",
+        "tooltip": "نقشه loss از node آموزش."
+      }
+    }
+  },
+  "LotusConditioning": {
+    "display_name": "LotusConditioning",
+    "outputs": {
+      "0": {
+        "name": "شرط‌گذاری",
+        "tooltip": null
+      }
+    }
+  },
+  "LtxvApiImageToVideo": {
+    "description": "ویدیوهای حرفه‌ای با مدت و وضوح قابل تنظیم بر اساس تصویر شروع.",
+    "display_name": "تبدیل تصویر به ویدیو LTXV",
+    "inputs": {
+      "duration": {
+        "name": "مدت"
+      },
+      "fps": {
+        "name": "فریم بر ثانیه"
+      },
+      "generate_audio": {
+        "name": "تولید صدا",
+        "tooltip": "در صورت فعال بودن، ویدیوی تولیدشده شامل صدای تولیدشده توسط هوش مصنوعی متناسب با صحنه خواهد بود."
+      },
+      "image": {
+        "name": "تصویر",
+        "tooltip": "اولین فریم مورد استفاده برای ویدیو."
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "prompt": {
+        "name": "پرامپت"
+      },
+      "resolution": {
+        "name": "وضوح"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LtxvApiTextToVideo": {
+    "description": "ویدیوهای حرفه‌ای با مدت زمان و وضوح قابل تنظیم.",
+    "display_name": "LTXV تبدیل متن به ویدیو",
+    "inputs": {
+      "duration": {
+        "name": "مدت زمان"
+      },
+      "fps": {
+        "name": "فریم بر ثانیه"
+      },
+      "generate_audio": {
+        "name": "تولید صدا",
+        "tooltip": "در صورت فعال بودن، ویدیوی تولید شده شامل صدای تولید شده توسط هوش مصنوعی متناسب با صحنه خواهد بود."
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "prompt": {
+        "name": "پرامپت"
+      },
+      "resolution": {
+        "name": "وضوح"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LumaConceptsNode": {
+    "description": "مفاهیم دوربین برای استفاده با گره‌های Luma Text to Video و Luma Image to Video.",
+    "display_name": "مفاهیم Luma",
+    "inputs": {
+      "concept1": {
+        "name": "concept1"
+      },
+      "concept2": {
+        "name": "concept2"
+      },
+      "concept3": {
+        "name": "concept3"
+      },
+      "concept4": {
+        "name": "concept4"
+      },
+      "luma_concepts": {
+        "name": "luma_concepts",
+        "tooltip": "مفاهیم دوربین اختیاری برای افزودن به موارد انتخاب‌شده در اینجا."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "luma_concepts",
+        "tooltip": null
+      }
+    }
+  },
+  "LumaImageModifyNode": {
+    "description": "تغییر تصاویر به صورت همزمان بر اساس پرامپت و نسبت تصویر.",
+    "display_name": "Luma Image to Image",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "image"
+      },
+      "image_weight": {
+        "name": "image_weight",
+        "tooltip": "وزن تصویر؛ هرچه به ۱.۰ نزدیک‌تر باشد، تصویر کمتر تغییر می‌کند."
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "پرامپت برای تولید تصویر"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "بذر برای تعیین اجرای مجدد گره؛ نتایج واقعی صرف‌نظر از بذر غیرقطعی هستند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LumaImageNode": {
+    "description": "تولید تصاویر به صورت همزمان بر اساس پرامپت و نسبت تصویر.",
+    "display_name": "Luma Text to Image",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "character_image": {
+        "name": "character_image",
+        "tooltip": "تصاویر مرجع شخصیت؛ می‌تواند یک دسته از چند تصویر باشد، تا ۴ تصویر می‌تواند در نظر گرفته شود."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image_luma_ref": {
+        "name": "image_luma_ref",
+        "tooltip": "اتصال گره مرجع Luma برای تأثیرگذاری بر تولید با تصاویر ورودی؛ تا ۴ تصویر می‌تواند در نظر گرفته شود."
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "پرامپت برای تولید تصویر"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "بذر برای تعیین اجرای مجدد گره؛ نتایج واقعی صرف‌نظر از بذر غیرقطعی هستند."
+      },
+      "style_image": {
+        "name": "style_image",
+        "tooltip": "تصویر مرجع سبک؛ فقط ۱ تصویر استفاده خواهد شد."
+      },
+      "style_image_weight": {
+        "name": "style_image_weight",
+        "tooltip": "وزن تصویر سبک. اگر style_image ارائه نشود، نادیده گرفته می‌شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LumaImageToVideoNode": {
+    "description": "ویدیوها را به صورت همزمان بر اساس پرامپت، تصاویر ورودی و اندازه خروجی تولید می‌کند.",
+    "display_name": "تبدیل تصویر به ویدیو لاما",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان"
+      },
+      "first_image": {
+        "name": "اولین تصویر",
+        "tooltip": "اولین فریم ویدیوی تولید شده."
+      },
+      "last_image": {
+        "name": "آخرین تصویر",
+        "tooltip": "آخرین فریم ویدیوی تولید شده."
+      },
+      "loop": {
+        "name": "حلقه"
+      },
+      "luma_concepts": {
+        "name": "مفاهیم لاما",
+        "tooltip": "مفاهیم دوربین اختیاری برای تعیین حرکت دوربین از طریق node مفاهیم لاما."
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت برای تولید ویدیو"
+      },
+      "resolution": {
+        "name": "وضوح"
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر برای تعیین اینکه آیا node باید دوباره اجرا شود؛ نتایج واقعی صرف‌نظر از بذر غیرقطعی هستند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LumaReferenceNode": {
+    "description": "یک تصویر و وزن را برای استفاده در node تولید تصویر لاما نگه می‌دارد.",
+    "display_name": "مرجع لاما",
+    "inputs": {
+      "image": {
+        "name": "تصویر",
+        "tooltip": "تصویری که به عنوان مرجع استفاده می‌شود."
+      },
+      "luma_ref": {
+        "name": "مرجع لاما"
+      },
+      "weight": {
+        "name": "وزن",
+        "tooltip": "وزن مرجع تصویر."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مرجع لاما",
+        "tooltip": null
+      }
+    }
+  },
+  "LumaVideoNode": {
+    "description": "ویدیوها را به صورت همزمان بر اساس پرامپت و اندازه خروجی تولید می‌کند.",
+    "display_name": "تبدیل متن به ویدیو لاما",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبت تصویر"
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان"
+      },
+      "loop": {
+        "name": "حلقه"
+      },
+      "luma_concepts": {
+        "name": "مفاهیم لاما",
+        "tooltip": "مفاهیم دوربین اختیاری برای تعیین حرکت دوربین از طریق node مفاهیم لاما."
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت برای تولید ویدیو"
+      },
+      "resolution": {
+        "name": "وضوح"
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر برای تعیین اینکه آیا node باید دوباره اجرا شود؛ نتایج واقعی صرف‌نظر از بذر غیرقطعی هستند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageRelightNode": {
+    "description": "بازنورپردازی تصویر با تنظیمات نور و انتقال نور مبتنی بر مرجع (اختیاری).",
+    "display_name": "بازنورپردازی تصویر Magnific",
+    "inputs": {
+      "advanced_settings": {
+        "name": "تنظیمات_پیشرفته",
+        "tooltip": "گزینه‌های تنظیم دقیق برای کنترل پیشرفته نورپردازی."
+      },
+      "change_background": {
+        "name": "تغییر_پس‌زمینه",
+        "tooltip": "پس‌زمینه را بر اساس پرامپت/مرجع تغییر می‌دهد."
+      },
+      "image": {
+        "name": "تصویر",
+        "tooltip": "تصویری که قرار است بازنورپردازی شود."
+      },
+      "interpolate_from_original": {
+        "name": "درون‌یابی_از_مبدأ",
+        "tooltip": "آزادی تولید را محدود می‌کند تا با تصویر اصلی بیشتر مطابقت داشته باشد."
+      },
+      "light_transfer_strength": {
+        "name": "شدت_انتقال_نور",
+        "tooltip": "شدت اعمال انتقال نور."
+      },
+      "preserve_details": {
+        "name": "حفظ_جزئیات",
+        "tooltip": "بافت و جزئیات ریز تصویر اصلی را حفظ می‌کند."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "راهنمای توصیفی برای نورپردازی. از نشانه‌گذاری تأکید (۱-۱.۴) پشتیبانی می‌کند."
+      },
+      "reference_image": {
+        "name": "تصویر_مرجع",
+        "tooltip": "تصویر مرجع اختیاری برای انتقال نور از آن."
+      },
+      "style": {
+        "name": "سبک",
+        "tooltip": "ترجیح خروجی از نظر سبک."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageSkinEnhancerNode": {
+    "description": "بهبود پوست برای پرتره‌ها با حالت‌های پردازشی مختلف.",
+    "display_name": "بهبود پوست تصویر Magnific",
+    "inputs": {
+      "image": {
+        "name": "تصویر",
+        "tooltip": "تصویر پرتره‌ای که باید بهبود یابد."
+      },
+      "mode": {
+        "name": "حالت",
+        "tooltip": "حالت پردازش: creative برای بهبود هنری، faithful برای حفظ ظاهر اصلی، flexible برای بهینه‌سازی هدفمند."
+      },
+      "sharpen": {
+        "name": "شارپ‌سازی",
+        "tooltip": "سطح شدت شارپ‌سازی."
+      },
+      "smart_grain": {
+        "name": "دانه‌بندی_هوشمند",
+        "tooltip": "سطح شدت دانه‌بندی هوشمند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageStyleTransferNode": {
+    "description": "سبک را از یک تصویر مرجع به تصویر ورودی خود منتقل کنید.",
+    "display_name": "انتقال سبک تصویر Magnific",
+    "inputs": {
+      "engine": {
+        "name": "engine",
+        "tooltip": "انتخاب موتور پردازش."
+      },
+      "fixed_generation": {
+        "name": "fixed_generation",
+        "tooltip": "در صورت غیرفعال بودن، هر بار تولید تصویر مقداری تصادفی بودن به همراه دارد که منجر به نتایج متنوع‌تر می‌شود."
+      },
+      "flavor": {
+        "name": "flavor",
+        "tooltip": "نوع انتقال سبک."
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "تصویری که قرار است انتقال سبک روی آن اعمال شود."
+      },
+      "portrait_mode": {
+        "name": "portrait_mode",
+        "tooltip": "فعال‌سازی حالت پرتره برای بهبود چهره."
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "reference_image": {
+        "name": "reference_image",
+        "tooltip": "تصویر مرجعی که سبک از آن استخراج می‌شود."
+      },
+      "structure_strength": {
+        "name": "structure_strength",
+        "tooltip": "ساختار تصویر اصلی را حفظ می‌کند."
+      },
+      "style_strength": {
+        "name": "style_strength",
+        "tooltip": "درصد قدرت سبک."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageUpscalerCreativeNode": {
+    "description": "افزایش کیفیت هدایت‌شده با پرامپت، استایل‌دهی و بزرگ‌نمایی ۲x/۴x/۸x/۱۶x. حداکثر خروجی: ۲۵.۳ مگاپیکسل.",
+    "display_name": "بزرگ‌نمایی تصویر Magnific (خلاقانه)",
+    "inputs": {
+      "auto_downscale": {
+        "name": "کاهش خودکار ابعاد",
+        "tooltip": "در صورت تجاوز خروجی از حداکثر تعداد پیکسل، تصویر ورودی به طور خودکار کوچک می‌شود."
+      },
+      "creativity": {
+        "name": "خلاقیت"
+      },
+      "engine": {
+        "name": "موتور"
+      },
+      "fractality": {
+        "name": "فرکتالیتی",
+        "tooltip": "قدرت پرامپت و پیچیدگی در هر پیکسل مربع."
+      },
+      "hdr": {
+        "name": "HDR",
+        "tooltip": "سطح وضوح و جزئیات."
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "optimized_for": {
+        "name": "بهینه‌سازی برای"
+      },
+      "prompt": {
+        "name": "پرامپت"
+      },
+      "resemblance": {
+        "name": "شباهت",
+        "tooltip": "میزان شباهت به تصویر اصلی."
+      },
+      "scale_factor": {
+        "name": "ضریب بزرگ‌نمایی"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageUpscalerPreciseV2Node": {
+    "description": "بزرگ‌نمایی با وفاداری بالا و کنترل دقیق بر وضوح، دانه‌بندی و جزئیات. حداکثر خروجی: ۱۰۰۶۰×۱۰۰۶۰ پیکسل.",
+    "display_name": "بزرگ‌نمایی تصویر Magnific (دقیق V2)",
+    "inputs": {
+      "auto_downscale": {
+        "name": "کاهش خودکار ابعاد",
+        "tooltip": "در صورت تجاوز خروجی از حداکثر وضوح، تصویر ورودی به طور خودکار کوچک می‌شود."
+      },
+      "flavor": {
+        "name": "سبک پردازش",
+        "tooltip": "سبک پردازش: sublime برای استفاده عمومی، photo برای عکس‌ها، photo_denoiser برای عکس‌های نویزی."
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "scale_factor": {
+        "name": "ضریب بزرگ‌نمایی"
+      },
+      "sharpen": {
+        "name": "وضوح",
+        "tooltip": "شدت وضوح تصویر. مقادیر بالاتر باعث افزایش تعریف لبه‌ها و شفافیت می‌شود."
+      },
+      "smart_grain": {
+        "name": "افزایش هوشمند دانه‌بندی",
+        "tooltip": "افزایش هوشمند دانه‌بندی/بافت برای جلوگیری از بیش از حد صاف یا مصنوعی شدن تصویر."
+      },
+      "ultra_detail": {
+        "name": "جزئیات فوق‌العاده",
+        "tooltip": "کنترل جزئیات ریز، بافت‌ها و میکروجزئیات افزوده شده هنگام بزرگ‌نمایی."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Mahiro": {
+    "description": "راهنمایی را به گونه‌ای تغییر می‌دهد که بیشتر بر «جهت» پرامپت مثبت تمرکز کند تا تفاوت بین پرامپت منفی.",
+    "display_name": "Mahiro CFG",
+    "inputs": {
+      "model": {
+        "name": "مدل"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مدل اصلاح‌شده",
+        "tooltip": null
+      }
+    }
+  },
+  "MakeTrainingDataset": {
+    "display_name": "ایجاد دیتاست آموزش",
+    "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "مدل CLIP برای کدگذاری متن به conditioning."
+      },
+      "images": {
+        "name": "تصاویر",
+        "tooltip": "فهرست تصاویر برای کدگذاری."
+      },
+      "texts": {
+        "name": "متون",
+        "tooltip": "فهرست کپشن‌های متنی. می‌تواند به طول n (مطابق با تصاویر)، ۱ (تکرار برای همه)، یا حذف شده (استفاده از رشته خالی) باشد."
+      },
+      "vae": {
+        "name": "vae",
+        "tooltip": "مدل VAE برای کدگذاری تصاویر به فضای latent."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latents",
+        "tooltip": "فهرست دیکشنری‌های latent"
+      },
+      "1": {
+        "name": "conditioning",
+        "tooltip": "فهرست لیست‌های conditioning"
+      }
+    }
+  },
+  "ManualSigmas": {
+    "display_name": "ManualSigmas",
+    "inputs": {
+      "sigmas": {
+        "name": "سیگماها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MaskComposite": {
+    "display_name": "ترکیب ماسک",
+    "inputs": {
+      "destination": {
+        "name": "مقصد"
+      },
+      "operation": {
+        "name": "عملیات"
+      },
+      "source": {
+        "name": "مبدأ"
+      },
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MaskPreview": {
+    "description": "تصاویر ورودی را در پوشه خروجی ComfyUI شما ذخیره می‌کند.",
+    "display_name": "پیش‌نمایش ماسک",
+    "inputs": {
+      "mask": {
+        "name": "ماسک"
+      }
+    }
+  },
+  "MaskToImage": {
+    "display_name": "تبدیل ماسک به تصویر",
+    "inputs": {
+      "mask": {
+        "name": "ماسک"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MergeImageLists": {
+    "display_name": "ادغام فهرست تصاویر",
+    "inputs": {
+      "images": {
+        "name": "تصاویر",
+        "tooltip": "فهرست تصاویر برای پردازش."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "تصاویر",
+        "tooltip": "تصاویر پردازش‌شده"
+      }
+    }
+  },
+  "MergeTextLists": {
+    "display_name": "ادغام فهرست متون",
+    "inputs": {
+      "texts": {
+        "name": "متون",
+        "tooltip": "فهرست متون برای پردازش."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "متون",
+        "tooltip": "متون پردازش‌شده"
+      }
+    }
+  },
+  "MeshyAnimateModelNode": {
+    "description": "یک اکشن انیمیشن خاص را به کاراکتری که قبلاً ریگ شده است اعمال کنید.",
+    "display_name": "Meshy: متحرک‌سازی مدل",
+    "inputs": {
+      "action_id": {
+        "name": "action_id",
+        "tooltip": "برای مشاهده لیست مقادیر موجود به https://docs.meshy.ai/en/api/animation-library مراجعه کنید."
+      },
+      "rig_task_id": {
+        "name": "rig_task_id"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "فایل مدل",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyImageToModelNode": {
+    "display_name": "Meshy: تصویر به مدل",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "حالت pose برای مدل تولیدشده را مشخص کنید."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed کنترل می‌کند که node دوباره اجرا شود یا نه؛ نتایج صرف‌نظر از مقدار seed غیرقطعی هستند."
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "اگر روی false تنظیم شود، یک مش مثلثی پردازش‌نشده بازمی‌گرداند."
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      },
+      "should_texture": {
+        "name": "should_texture",
+        "tooltip": "تعیین می‌کند که آیا تکسچر تولید شود یا خیر. اگر روی false تنظیم شود، مرحله تکسچر رد شده و مش بدون تکسچر بازمی‌گردد."
+      },
+      "should_texture_enable_pbr": {
+        "name": "enable_pbr"
+      },
+      "should_texture_texture_prompt": {
+        "name": "texture_prompt"
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "فایل مدل",
+        "tooltip": null
+      },
+      "1": {
+        "name": "شناسه وظیفه meshy",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyMultiImageToModelNode": {
+    "display_name": "Meshy: چند تصویر به مدل",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "images": {
+        "name": "images"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "حالت pose برای مدل تولیدشده را مشخص کنید."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed کنترل می‌کند که node دوباره اجرا شود یا نه؛ نتایج صرف‌نظر از مقدار seed غیرقطعی هستند."
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "اگر روی false تنظیم شود، یک مش مثلثی پردازش‌نشده بازمی‌گرداند."
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      },
+      "should_texture": {
+        "name": "should_texture",
+        "tooltip": "تعیین می‌کند که آیا تکسچر تولید شود یا خیر. اگر روی false تنظیم شود، مرحله تکسچر رد شده و مش بدون تکسچر بازمی‌گردد."
+      },
+      "should_texture_enable_pbr": {
+        "name": "enable_pbr"
+      },
+      "should_texture_texture_prompt": {
+        "name": "texture_prompt"
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "فایل مدل",
+        "tooltip": null
+      },
+      "1": {
+        "name": "شناسه وظیفه meshy",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyRefineNode": {
+    "description": "یک مدل پیش‌نویس ایجادشده قبلی را بهبود دهید.",
+    "display_name": "Meshy: بهبود مدل پیش‌نویس",
+    "inputs": {
+      "enable_pbr": {
+        "name": "enable_pbr",
+        "tooltip": "تولید نقشه‌های PBR (فلزی، زبری، نرمال) علاوه بر رنگ پایه. توجه: هنگام استفاده از سبک Sculpture، این گزینه باید غیرفعال باشد، زیرا سبک Sculpture نقشه‌های PBR مخصوص خود را تولید می‌کند."
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "model": {
+        "name": "model"
+      },
+      "texture_image": {
+        "name": "texture_image",
+        "tooltip": "فقط یکی از 'texture_image' یا 'texture_prompt' را می‌توان همزمان استفاده کرد."
+      },
+      "texture_prompt": {
+        "name": "texture_prompt",
+        "tooltip": "یک متن راهنما برای هدایت فرایند بافت‌دهی وارد کنید. حداکثر ۶۰۰ کاراکتر. نمی‌توان همزمان با 'texture_image' استفاده کرد."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "فایل مدل",
+        "tooltip": null
+      },
+      "1": {
+        "name": "شناسه وظیفه meshy",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyRigModelNode": {
+    "description": "یک کاراکتر ریگ‌شده در فرمت‌های استاندارد ارائه می‌دهد. ریگ خودکار در حال حاضر برای مش‌های بدون بافت، دارایی‌های غیرانسان‌نما یا دارایی‌های انسان‌نمایی که ساختار اندام و بدن آن‌ها نامشخص است، مناسب نیست.",
+    "display_name": "Meshy: ریگ مدل",
+    "inputs": {
+      "height_meters": {
+        "name": "height_meters",
+        "tooltip": "ارتفاع تقریبی مدل کاراکتر به متر. این مقدار به دقت مقیاس‌بندی و ریگ کمک می‌کند."
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "texture_image": {
+        "name": "texture_image",
+        "tooltip": "تصویر بافت رنگ پایه مدل با UV باز شده."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "فایل مدل",
+        "tooltip": null
+      },
+      "1": {
+        "name": "شناسه وظیفه rig",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyTextToModelNode": {
+    "display_name": "Meshy: متن به مدل",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "حالت ژست برای مدل تولیدشده را مشخص کنید."
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed کنترل می‌کند که node دوباره اجرا شود یا نه؛ نتایج صرف‌نظر از seed غیرقطعی هستند."
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "در صورت غیرفعال بودن، یک مش مثلثی پردازش‌نشده بازمی‌گرداند."
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      },
+      "style": {
+        "name": "style"
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "فایل مدل",
+        "tooltip": null
+      },
+      "1": {
+        "name": "شناسه وظیفه meshy",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyTextureNode": {
+    "display_name": "Meshy: مدل بافت",
+    "inputs": {
+      "enable_original_uv": {
+        "name": "فعال‌سازی UV اصلی",
+        "tooltip": "استفاده از UV اصلی مدل به جای تولید UV جدید. در صورت فعال بودن، Meshy بافت‌های موجود مدل بارگذاری‌شده را حفظ می‌کند. اگر مدل UV اصلی نداشته باشد، کیفیت خروجی ممکن است به خوبی نباشد."
+      },
+      "image_style": {
+        "name": "سبک تصویر",
+        "tooltip": "یک تصویر دوبعدی برای راهنمایی فرآیند بافت‌دهی. نمی‌توان همزمان با 'text_style_prompt' استفاده کرد."
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "pbr": {
+        "name": "PBR"
+      },
+      "text_style_prompt": {
+        "name": "توضیح سبک بافت متنی",
+        "tooltip": "سبک بافت مورد نظر شیء را با استفاده از متن توصیف کنید. حداکثر ۶۰۰ کاراکتر. نمی‌توان همزمان با 'image_style' استفاده کرد."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "فایل مدل",
+        "tooltip": null
+      },
+      "1": {
+        "name": "شناسه وظیفه meshy",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MinimaxHailuoVideoNode": {
+    "description": "تولید ویدئو از طریق پرامپت، با امکان استفاده از فریم ابتدایی با مدل جدید MiniMax Hailuo-02.",
+    "display_name": "ویدئوی MiniMax Hailuo",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان",
+        "tooltip": "طول ویدئوی خروجی بر حسب ثانیه."
+      },
+      "first_frame_image": {
+        "name": "تصویر فریم اول",
+        "tooltip": "تصویر اختیاری برای استفاده به عنوان فریم اول ویدئو."
+      },
+      "prompt_optimizer": {
+        "name": "بهینه‌ساز پرامپت",
+        "tooltip": "بهینه‌سازی پرامپت برای بهبود کیفیت تولید در صورت نیاز."
+      },
+      "prompt_text": {
+        "name": "متن پرامپت",
+        "tooltip": "متن راهنما برای تولید ویدئو."
+      },
+      "resolution": {
+        "name": "وضوح تصویر",
+        "tooltip": "ابعاد نمایش ویدئو. ۱۰۸۰p معادل ۱۹۲۰x۱۰۸۰، ۷۶۸p معادل ۱۳۶۶x۷۶۸ است."
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر تصادفی برای ایجاد نویز."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MinimaxImageToVideoNode": {
+    "description": "ویدیوها را به صورت همزمان بر اساس یک تصویر و متن راهنما و پارامترهای اختیاری تولید می‌کند.",
+    "display_name": "MiniMax تبدیل تصویر به ویدیو",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "image": {
+        "name": "تصویر",
+        "tooltip": "تصویری که به عنوان اولین فریم تولید ویدیو استفاده می‌شود"
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "مدلی که برای تولید ویدیو استفاده می‌شود"
+      },
+      "prompt_text": {
+        "name": "متن راهنما",
+        "tooltip": "متن راهنما برای هدایت تولید ویدیو"
+      },
+      "seed": {
+        "name": "بذر تصادفی",
+        "tooltip": "بذر تصادفی که برای ایجاد نویز استفاده می‌شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MinimaxTextToVideoNode": {
+    "description": "ویدیوها را به صورت همزمان بر اساس یک متن راهنما و پارامترهای اختیاری تولید می‌کند.",
+    "display_name": "MiniMax تبدیل متن به ویدیو",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "مدلی که برای تولید ویدیو استفاده می‌شود"
+      },
+      "prompt_text": {
+        "name": "متن راهنما",
+        "tooltip": "متن راهنما برای هدایت تولید ویدیو"
+      },
+      "seed": {
+        "name": "بذر تصادفی",
+        "tooltip": "بذر تصادفی که برای ایجاد نویز استفاده می‌شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ModelComputeDtype": {
+    "display_name": "ModelComputeDtype",
+    "inputs": {
+      "dtype": {
+        "name": "نوع داده"
+      },
+      "model": {
+        "name": "مدل"
+      }
+    }
+  },
+  "ModelMergeAdd": {
+    "display_name": "ModelMergeAdd",
+    "inputs": {
+      "model1": {
+        "name": "مدل۱"
+      },
+      "model2": {
+        "name": "مدل۲"
+      }
+    }
+  },
+  "ModelMergeAuraflow": {
+    "display_name": "ModelMergeAuraflow",
+    "inputs": {
+      "cond_seq_linear_": {
+        "name": "cond_seq_linear."
+      },
+      "double_layers_0_": {
+        "name": "double_layers.۰."
+      },
+      "double_layers_1_": {
+        "name": "double_layers.۱."
+      },
+      "double_layers_2_": {
+        "name": "double_layers.۲."
+      },
+      "double_layers_3_": {
+        "name": "double_layers.۳."
+      },
+      "final_linear_": {
+        "name": "final_linear."
+      },
+      "init_x_linear_": {
+        "name": "init_x_linear."
+      },
+      "modF_": {
+        "name": "modF."
+      },
+      "model1": {
+        "name": "مدل۱"
+      },
+      "model2": {
+        "name": "مدل۲"
+      },
+      "positional_encoding": {
+        "name": "کدگذاری موقعیتی"
+      },
+      "register_tokens": {
+        "name": "ثبت توکن‌ها"
+      },
+      "single_layers_0_": {
+        "name": "single_layers.۰."
+      },
+      "single_layers_10_": {
+        "name": "single_layers.۱۰."
+      },
+      "single_layers_11_": {
+        "name": "single_layers.۱۱."
+      },
+      "single_layers_12_": {
+        "name": "single_layers.۱۲."
+      },
+      "single_layers_13_": {
+        "name": "single_layers.۱۳."
+      },
+      "single_layers_14_": {
+        "name": "single_layers.۱۴."
+      },
+      "single_layers_15_": {
+        "name": "single_layers.۱۵."
+      },
+      "single_layers_16_": {
+        "name": "single_layers.۱۶."
+      },
+      "single_layers_17_": {
+        "name": "single_layers.۱۷."
+      },
+      "single_layers_18_": {
+        "name": "single_layers.۱۸."
+      },
+      "single_layers_19_": {
+        "name": "single_layers.۱۹."
+      },
+      "single_layers_1_": {
+        "name": "single_layers.۱."
+      },
+      "single_layers_20_": {
+        "name": "single_layers.۲۰."
+      },
+      "single_layers_21_": {
+        "name": "single_layers.۲۱."
+      },
+      "single_layers_22_": {
+        "name": "single_layers.۲۲."
+      },
+      "single_layers_23_": {
+        "name": "single_layers.۲۳."
+      },
+      "single_layers_24_": {
+        "name": "single_layers.۲۴."
+      },
+      "single_layers_25_": {
+        "name": "single_layers.۲۵."
+      },
+      "single_layers_26_": {
+        "name": "single_layers.۲۶."
+      },
+      "single_layers_27_": {
+        "name": "single_layers.۲۷."
+      },
+      "single_layers_28_": {
+        "name": "single_layers.۲۸."
+      },
+      "single_layers_29_": {
+        "name": "single_layers.۲۹."
+      },
+      "single_layers_2_": {
+        "name": "single_layers.۲."
+      },
+      "single_layers_30_": {
+        "name": "single_layers.۳۰."
+      },
+      "single_layers_31_": {
+        "name": "single_layers.۳۱."
+      },
+      "single_layers_3_": {
+        "name": "single_layers.۳."
+      },
+      "single_layers_4_": {
+        "name": "single_layers.۴."
+      },
+      "single_layers_5_": {
+        "name": "single_layers.۵."
+      },
+      "single_layers_6_": {
+        "name": "single_layers.۶."
+      },
+      "single_layers_7_": {
+        "name": "single_layers.۷."
+      },
+      "single_layers_8_": {
+        "name": "single_layers.۸."
+      },
+      "single_layers_9_": {
+        "name": "single_layers.۹."
+      },
+      "t_embedder_": {
+        "name": "t_embedder."
+      }
+    }
+  },
+  "ModelMergeBlocks": {
+    "display_name": "ModelMergeBlocks",
+    "inputs": {
+      "input": {
+        "name": "ورودی"
+      },
+      "middle": {
+        "name": "میانی"
+      },
+      "model1": {
+        "name": "مدل۱"
+      },
+      "model2": {
+        "name": "مدل۲"
+      },
+      "out": {
+        "name": "خروجی"
+      }
+    }
+  },
+  "ModelMergeCosmos14B": {
+    "display_name": "ModelMergeCosmos14B",
+    "inputs": {
+      "affline_norm_": {
+        "name": "affline_norm."
+      },
+      "blocks_block0_": {
+        "name": "بلوک ۰."
+      },
+      "blocks_block10_": {
+        "name": "بلوک ۱۰."
+      },
+      "blocks_block11_": {
+        "name": "بلوک ۱۱."
+      },
+      "blocks_block12_": {
+        "name": "بلوک ۱۲."
+      },
+      "blocks_block13_": {
+        "name": "بلوک ۱۳."
+      },
+      "blocks_block14_": {
+        "name": "بلوک ۱۴."
+      },
+      "blocks_block15_": {
+        "name": "بلوک ۱۵."
+      },
+      "blocks_block16_": {
+        "name": "بلوک ۱۶."
+      },
+      "blocks_block17_": {
+        "name": "بلوک ۱۷."
+      },
+      "blocks_block18_": {
+        "name": "بلوک ۱۸."
+      },
+      "blocks_block19_": {
+        "name": "بلوک ۱۹."
+      },
+      "blocks_block1_": {
+        "name": "بلوک ۱."
+      },
+      "blocks_block20_": {
+        "name": "بلوک ۲۰."
+      },
+      "blocks_block21_": {
+        "name": "بلوک ۲۱."
+      },
+      "blocks_block22_": {
+        "name": "بلوک ۲۲."
+      },
+      "blocks_block23_": {
+        "name": "بلوک ۲۳."
+      },
+      "blocks_block24_": {
+        "name": "بلوک ۲۴."
+      },
+      "blocks_block25_": {
+        "name": "بلوک ۲۵."
+      },
+      "blocks_block26_": {
+        "name": "بلوک ۲۶."
+      },
+      "blocks_block27_": {
+        "name": "بلوک ۲۷."
+      },
+      "blocks_block28_": {
+        "name": "بلوک ۲۸."
+      },
+      "blocks_block29_": {
+        "name": "بلوک ۲۹."
+      },
+      "blocks_block2_": {
+        "name": "بلوک ۲."
+      },
+      "blocks_block30_": {
+        "name": "بلوک ۳۰."
+      },
+      "blocks_block31_": {
+        "name": "بلوک ۳۱."
+      },
+      "blocks_block32_": {
+        "name": "بلوک ۳۲."
+      },
+      "blocks_block33_": {
+        "name": "بلوک ۳۳."
+      },
+      "blocks_block34_": {
+        "name": "بلوک ۳۴."
+      },
+      "blocks_block35_": {
+        "name": "بلوک ۳۵."
+      },
+      "blocks_block3_": {
+        "name": "بلوک ۳."
+      },
+      "blocks_block4_": {
+        "name": "بلوک ۴."
+      },
+      "blocks_block5_": {
+        "name": "بلوک ۵."
+      },
+      "blocks_block6_": {
+        "name": "بلوک ۶."
+      },
+      "blocks_block7_": {
+        "name": "بلوک ۷."
+      },
+      "blocks_block8_": {
+        "name": "بلوک ۸."
+      },
+      "blocks_block9_": {
+        "name": "بلوک ۹."
+      },
+      "extra_pos_embedder_": {
+        "name": "extra_pos_embedder."
+      },
+      "final_layer_": {
+        "name": "لایه نهایی."
+      },
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "pos_embedder_": {
+        "name": "pos_embedder."
+      },
+      "t_embedder_": {
+        "name": "t_embedder."
+      },
+      "x_embedder_": {
+        "name": "x_embedder."
+      }
+    }
+  },
+  "ModelMergeCosmos7B": {
+    "display_name": "ModelMergeCosmos7B",
+    "inputs": {
+      "affline_norm_": {
+        "name": "affline_norm."
+      },
+      "blocks_block0_": {
+        "name": "بلوک ۰."
+      },
+      "blocks_block10_": {
+        "name": "بلوک ۱۰."
+      },
+      "blocks_block11_": {
+        "name": "بلوک ۱۱."
+      },
+      "blocks_block12_": {
+        "name": "بلوک ۱۲."
+      },
+      "blocks_block13_": {
+        "name": "بلوک ۱۳."
+      },
+      "blocks_block14_": {
+        "name": "بلوک ۱۴."
+      },
+      "blocks_block15_": {
+        "name": "بلوک ۱۵."
+      },
+      "blocks_block16_": {
+        "name": "بلوک ۱۶."
+      },
+      "blocks_block17_": {
+        "name": "بلوک ۱۷."
+      },
+      "blocks_block18_": {
+        "name": "بلوک ۱۸."
+      },
+      "blocks_block19_": {
+        "name": "بلوک ۱۹."
+      },
+      "blocks_block1_": {
+        "name": "بلوک ۱."
+      },
+      "blocks_block20_": {
+        "name": "بلوک ۲۰."
+      },
+      "blocks_block21_": {
+        "name": "بلوک ۲۱."
+      },
+      "blocks_block22_": {
+        "name": "بلوک ۲۲."
+      },
+      "blocks_block23_": {
+        "name": "بلوک ۲۳."
+      },
+      "blocks_block24_": {
+        "name": "بلوک ۲۴."
+      },
+      "blocks_block25_": {
+        "name": "بلوک ۲۵."
+      },
+      "blocks_block26_": {
+        "name": "بلوک ۲۶."
+      },
+      "blocks_block27_": {
+        "name": "بلوک ۲۷."
+      },
+      "blocks_block2_": {
+        "name": "بلوک ۲."
+      },
+      "blocks_block3_": {
+        "name": "بلوک ۳."
+      },
+      "blocks_block4_": {
+        "name": "بلوک ۴."
+      },
+      "blocks_block5_": {
+        "name": "بلوک ۵."
+      },
+      "blocks_block6_": {
+        "name": "بلوک ۶."
+      },
+      "blocks_block7_": {
+        "name": "بلوک ۷."
+      },
+      "blocks_block8_": {
+        "name": "بلوک ۸."
+      },
+      "blocks_block9_": {
+        "name": "بلوک ۹."
+      },
+      "extra_pos_embedder_": {
+        "name": "extra_pos_embedder."
+      },
+      "final_layer_": {
+        "name": "لایه نهایی."
+      },
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "pos_embedder_": {
+        "name": "pos_embedder."
+      },
+      "t_embedder_": {
+        "name": "t_embedder."
+      },
+      "x_embedder_": {
+        "name": "x_embedder."
+      }
+    }
+  },
+  "ModelMergeCosmosPredict2_14B": {
+    "display_name": "ModelMergeCosmosPredict2_14B",
+    "inputs": {
+      "blocks_0_": {
+        "name": "blocks.۰."
+      },
+      "blocks_10_": {
+        "name": "blocks.۱۰."
+      },
+      "blocks_11_": {
+        "name": "blocks.۱۱."
+      },
+      "blocks_12_": {
+        "name": "blocks.۱۲."
+      },
+      "blocks_13_": {
+        "name": "blocks.۱۳."
+      },
+      "blocks_14_": {
+        "name": "blocks.۱۴."
+      },
+      "blocks_15_": {
+        "name": "blocks.۱۵."
+      },
+      "blocks_16_": {
+        "name": "blocks.۱۶."
+      },
+      "blocks_17_": {
+        "name": "blocks.۱۷."
+      },
+      "blocks_18_": {
+        "name": "blocks.۱۸."
+      },
+      "blocks_19_": {
+        "name": "blocks.۱۹."
+      },
+      "blocks_1_": {
+        "name": "blocks.۱."
+      },
+      "blocks_20_": {
+        "name": "blocks.۲۰."
+      },
+      "blocks_21_": {
+        "name": "blocks.۲۱."
+      },
+      "blocks_22_": {
+        "name": "blocks.۲۲."
+      },
+      "blocks_23_": {
+        "name": "blocks.۲۳."
+      },
+      "blocks_24_": {
+        "name": "blocks.۲۴."
+      },
+      "blocks_25_": {
+        "name": "blocks.۲۵."
+      },
+      "blocks_26_": {
+        "name": "blocks.۲۶."
+      },
+      "blocks_27_": {
+        "name": "blocks.۲۷."
+      },
+      "blocks_28_": {
+        "name": "blocks.۲۸."
+      },
+      "blocks_29_": {
+        "name": "blocks.۲۹."
+      },
+      "blocks_2_": {
+        "name": "blocks.۲."
+      },
+      "blocks_30_": {
+        "name": "blocks.۳۰."
+      },
+      "blocks_31_": {
+        "name": "blocks.۳۱."
+      },
+      "blocks_32_": {
+        "name": "blocks.۳۲."
+      },
+      "blocks_33_": {
+        "name": "blocks.۳۳."
+      },
+      "blocks_34_": {
+        "name": "blocks.۳۴."
+      },
+      "blocks_35_": {
+        "name": "blocks.۳۵."
+      },
+      "blocks_3_": {
+        "name": "blocks.۳."
+      },
+      "blocks_4_": {
+        "name": "blocks.۴."
+      },
+      "blocks_5_": {
+        "name": "blocks.۵."
+      },
+      "blocks_6_": {
+        "name": "blocks.۶."
+      },
+      "blocks_7_": {
+        "name": "blocks.۷."
+      },
+      "blocks_8_": {
+        "name": "blocks.۸."
+      },
+      "blocks_9_": {
+        "name": "blocks.۹."
+      },
+      "final_layer_": {
+        "name": "final_layer."
+      },
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "pos_embedder_": {
+        "name": "pos_embedder."
+      },
+      "t_embedder_": {
+        "name": "t_embedder."
+      },
+      "t_embedding_norm_": {
+        "name": "t_embedding_norm."
+      },
+      "x_embedder_": {
+        "name": "x_embedder."
+      }
+    }
+  },
+  "ModelMergeCosmosPredict2_2B": {
+    "display_name": "ModelMergeCosmosPredict2_2B",
+    "inputs": {
+      "blocks_0_": {
+        "name": "blocks.۰."
+      },
+      "blocks_10_": {
+        "name": "blocks.۱۰."
+      },
+      "blocks_11_": {
+        "name": "blocks.۱۱."
+      },
+      "blocks_12_": {
+        "name": "blocks.۱۲."
+      },
+      "blocks_13_": {
+        "name": "blocks.۱۳."
+      },
+      "blocks_14_": {
+        "name": "blocks.۱۴."
+      },
+      "blocks_15_": {
+        "name": "blocks.۱۵."
+      },
+      "blocks_16_": {
+        "name": "blocks.۱۶."
+      },
+      "blocks_17_": {
+        "name": "blocks.۱۷."
+      },
+      "blocks_18_": {
+        "name": "blocks.۱۸."
+      },
+      "blocks_19_": {
+        "name": "blocks.۱۹."
+      },
+      "blocks_1_": {
+        "name": "blocks.۱."
+      },
+      "blocks_20_": {
+        "name": "blocks.۲۰."
+      },
+      "blocks_21_": {
+        "name": "blocks.۲۱."
+      },
+      "blocks_22_": {
+        "name": "blocks.۲۲."
+      },
+      "blocks_23_": {
+        "name": "blocks.۲۳."
+      },
+      "blocks_24_": {
+        "name": "blocks.۲۴."
+      },
+      "blocks_25_": {
+        "name": "blocks.۲۵."
+      },
+      "blocks_26_": {
+        "name": "blocks.۲۶."
+      },
+      "blocks_27_": {
+        "name": "blocks.۲۷."
+      },
+      "blocks_2_": {
+        "name": "blocks.۲."
+      },
+      "blocks_3_": {
+        "name": "blocks.۳."
+      },
+      "blocks_4_": {
+        "name": "blocks.۴."
+      },
+      "blocks_5_": {
+        "name": "blocks.۵."
+      },
+      "blocks_6_": {
+        "name": "blocks.۶."
+      },
+      "blocks_7_": {
+        "name": "blocks.۷."
+      },
+      "blocks_8_": {
+        "name": "blocks.۸."
+      },
+      "blocks_9_": {
+        "name": "blocks.۹."
+      },
+      "final_layer_": {
+        "name": "final_layer."
+      },
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "pos_embedder_": {
+        "name": "pos_embedder."
+      },
+      "t_embedder_": {
+        "name": "t_embedder."
+      },
+      "t_embedding_norm_": {
+        "name": "t_embedding_norm."
+      },
+      "x_embedder_": {
+        "name": "x_embedder."
+      }
+    }
+  },
+  "ModelMergeFlux1": {
+    "display_name": "ModelMergeFlux1",
+    "inputs": {
+      "double_blocks_0_": {
+        "name": "بلوک دوتایی ۰"
+      },
+      "double_blocks_10_": {
+        "name": "بلوک دوتایی ۱۰"
+      },
+      "double_blocks_11_": {
+        "name": "بلوک دوتایی ۱۱"
+      },
+      "double_blocks_12_": {
+        "name": "بلوک دوتایی ۱۲"
+      },
+      "double_blocks_13_": {
+        "name": "بلوک دوتایی ۱۳"
+      },
+      "double_blocks_14_": {
+        "name": "بلوک دوتایی ۱۴"
+      },
+      "double_blocks_15_": {
+        "name": "بلوک دوتایی ۱۵"
+      },
+      "double_blocks_16_": {
+        "name": "بلوک دوتایی ۱۶"
+      },
+      "double_blocks_17_": {
+        "name": "بلوک دوتایی ۱۷"
+      },
+      "double_blocks_18_": {
+        "name": "بلوک دوتایی ۱۸"
+      },
+      "double_blocks_1_": {
+        "name": "بلوک دوتایی ۱"
+      },
+      "double_blocks_2_": {
+        "name": "بلوک دوتایی ۲"
+      },
+      "double_blocks_3_": {
+        "name": "بلوک دوتایی ۳"
+      },
+      "double_blocks_4_": {
+        "name": "بلوک دوتایی ۴"
+      },
+      "double_blocks_5_": {
+        "name": "بلوک دوتایی ۵"
+      },
+      "double_blocks_6_": {
+        "name": "بلوک دوتایی ۶"
+      },
+      "double_blocks_7_": {
+        "name": "بلوک دوتایی ۷"
+      },
+      "double_blocks_8_": {
+        "name": "بلوک دوتایی ۸"
+      },
+      "double_blocks_9_": {
+        "name": "بلوک دوتایی ۹"
+      },
+      "final_layer_": {
+        "name": "لایه نهایی"
+      },
+      "guidance_in": {
+        "name": "ورودی راهنما"
+      },
+      "img_in_": {
+        "name": "ورودی تصویر"
+      },
+      "model1": {
+        "name": "مدل۱"
+      },
+      "model2": {
+        "name": "مدل۲"
+      },
+      "single_blocks_0_": {
+        "name": "بلوک تکی ۰"
+      },
+      "single_blocks_10_": {
+        "name": "بلوک تکی ۱۰"
+      },
+      "single_blocks_11_": {
+        "name": "بلوک تکی ۱۱"
+      },
+      "single_blocks_12_": {
+        "name": "بلوک تکی ۱۲"
+      },
+      "single_blocks_13_": {
+        "name": "بلوک تکی ۱۳"
+      },
+      "single_blocks_14_": {
+        "name": "بلوک تکی ۱۴"
+      },
+      "single_blocks_15_": {
+        "name": "بلوک تکی ۱۵"
+      },
+      "single_blocks_16_": {
+        "name": "بلوک تکی ۱۶"
+      },
+      "single_blocks_17_": {
+        "name": "بلوک تکی ۱۷"
+      },
+      "single_blocks_18_": {
+        "name": "بلوک تکی ۱۸"
+      },
+      "single_blocks_19_": {
+        "name": "بلوک تکی ۱۹"
+      },
+      "single_blocks_1_": {
+        "name": "بلوک تکی ۱"
+      },
+      "single_blocks_20_": {
+        "name": "بلوک تکی ۲۰"
+      },
+      "single_blocks_21_": {
+        "name": "بلوک تکی ۲۱"
+      },
+      "single_blocks_22_": {
+        "name": "بلوک تکی ۲۲"
+      },
+      "single_blocks_23_": {
+        "name": "بلوک تکی ۲۳"
+      },
+      "single_blocks_24_": {
+        "name": "بلوک تکی ۲۴"
+      },
+      "single_blocks_25_": {
+        "name": "بلوک تکی ۲۵"
+      },
+      "single_blocks_26_": {
+        "name": "بلوک تکی ۲۶"
+      },
+      "single_blocks_27_": {
+        "name": "بلوک تکی ۲۷"
+      },
+      "single_blocks_28_": {
+        "name": "بلوک تکی ۲۸"
+      },
+      "single_blocks_29_": {
+        "name": "بلوک تکی ۲۹"
+      },
+      "single_blocks_2_": {
+        "name": "بلوک تکی ۲"
+      },
+      "single_blocks_30_": {
+        "name": "بلوک تکی ۳۰"
+      },
+      "single_blocks_31_": {
+        "name": "بلوک تکی ۳۱"
+      },
+      "single_blocks_32_": {
+        "name": "بلوک تکی ۳۲"
+      },
+      "single_blocks_33_": {
+        "name": "بلوک تکی ۳۳"
+      },
+      "single_blocks_34_": {
+        "name": "بلوک تکی ۳۴"
+      },
+      "single_blocks_35_": {
+        "name": "بلوک تکی ۳۵"
+      },
+      "single_blocks_36_": {
+        "name": "بلوک تکی ۳۶"
+      },
+      "single_blocks_37_": {
+        "name": "بلوک تکی ۳۷"
+      },
+      "single_blocks_3_": {
+        "name": "بلوک تکی ۳"
+      },
+      "single_blocks_4_": {
+        "name": "بلوک تکی ۴"
+      },
+      "single_blocks_5_": {
+        "name": "بلوک تکی ۵"
+      },
+      "single_blocks_6_": {
+        "name": "بلوک تکی ۶"
+      },
+      "single_blocks_7_": {
+        "name": "بلوک تکی ۷"
+      },
+      "single_blocks_8_": {
+        "name": "بلوک تکی ۸"
+      },
+      "single_blocks_9_": {
+        "name": "بلوک تکی ۹"
+      },
+      "time_in_": {
+        "name": "ورودی زمان"
+      },
+      "txt_in_": {
+        "name": "ورودی متن"
+      },
+      "vector_in_": {
+        "name": "ورودی بردار"
+      }
+    }
+  },
+  "ModelMergeLTXV": {
+    "display_name": "ModelMergeLTXV",
+    "inputs": {
+      "adaln_single_": {
+        "name": "adaln_single."
+      },
+      "caption_projection_": {
+        "name": "caption_projection."
+      },
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "patchify_proj_": {
+        "name": "patchify_proj."
+      },
+      "proj_out_": {
+        "name": "proj_out."
+      },
+      "scale_shift_table": {
+        "name": "scale_shift_table"
+      },
+      "transformer_blocks_0_": {
+        "name": "transformer_blocks.۰."
+      },
+      "transformer_blocks_10_": {
+        "name": "transformer_blocks.۱۰."
+      },
+      "transformer_blocks_11_": {
+        "name": "transformer_blocks.۱۱."
+      },
+      "transformer_blocks_12_": {
+        "name": "transformer_blocks.۱۲."
+      },
+      "transformer_blocks_13_": {
+        "name": "transformer_blocks.۱۳."
+      },
+      "transformer_blocks_14_": {
+        "name": "transformer_blocks.۱۴."
+      },
+      "transformer_blocks_15_": {
+        "name": "transformer_blocks.۱۵."
+      },
+      "transformer_blocks_16_": {
+        "name": "transformer_blocks.۱۶."
+      },
+      "transformer_blocks_17_": {
+        "name": "transformer_blocks.۱۷."
+      },
+      "transformer_blocks_18_": {
+        "name": "transformer_blocks.۱۸."
+      },
+      "transformer_blocks_19_": {
+        "name": "transformer_blocks.۱۹."
+      },
+      "transformer_blocks_1_": {
+        "name": "transformer_blocks.۱."
+      },
+      "transformer_blocks_20_": {
+        "name": "transformer_blocks.۲۰."
+      },
+      "transformer_blocks_21_": {
+        "name": "transformer_blocks.۲۱."
+      },
+      "transformer_blocks_22_": {
+        "name": "transformer_blocks.۲۲."
+      },
+      "transformer_blocks_23_": {
+        "name": "transformer_blocks.۲۳."
+      },
+      "transformer_blocks_24_": {
+        "name": "transformer_blocks.۲۴."
+      },
+      "transformer_blocks_25_": {
+        "name": "transformer_blocks.۲۵."
+      },
+      "transformer_blocks_26_": {
+        "name": "transformer_blocks.۲۶."
+      },
+      "transformer_blocks_27_": {
+        "name": "transformer_blocks.۲۷."
+      },
+      "transformer_blocks_2_": {
+        "name": "transformer_blocks.۲."
+      },
+      "transformer_blocks_3_": {
+        "name": "transformer_blocks.۳."
+      },
+      "transformer_blocks_4_": {
+        "name": "transformer_blocks.۴."
+      },
+      "transformer_blocks_5_": {
+        "name": "transformer_blocks.۵."
+      },
+      "transformer_blocks_6_": {
+        "name": "transformer_blocks.۶."
+      },
+      "transformer_blocks_7_": {
+        "name": "transformer_blocks.۷."
+      },
+      "transformer_blocks_8_": {
+        "name": "transformer_blocks.۸."
+      },
+      "transformer_blocks_9_": {
+        "name": "transformer_blocks.۹."
+      }
+    }
+  },
+  "ModelMergeMochiPreview": {
+    "display_name": "ModelMergeMochiPreview",
+    "inputs": {
+      "blocks_0_": {
+        "name": "blocks.۰."
+      },
+      "blocks_10_": {
+        "name": "blocks.۱۰."
+      },
+      "blocks_11_": {
+        "name": "blocks.۱۱."
+      },
+      "blocks_12_": {
+        "name": "blocks.۱۲."
+      },
+      "blocks_13_": {
+        "name": "blocks.۱۳."
+      },
+      "blocks_14_": {
+        "name": "blocks.۱۴."
+      },
+      "blocks_15_": {
+        "name": "blocks.۱۵."
+      },
+      "blocks_16_": {
+        "name": "blocks.۱۶."
+      },
+      "blocks_17_": {
+        "name": "blocks.۱۷."
+      },
+      "blocks_18_": {
+        "name": "blocks.۱۸."
+      },
+      "blocks_19_": {
+        "name": "blocks.۱۹."
+      },
+      "blocks_1_": {
+        "name": "blocks.۱."
+      },
+      "blocks_20_": {
+        "name": "blocks.۲۰."
+      },
+      "blocks_21_": {
+        "name": "blocks.۲۱."
+      },
+      "blocks_22_": {
+        "name": "blocks.۲۲."
+      },
+      "blocks_23_": {
+        "name": "blocks.۲۳."
+      },
+      "blocks_24_": {
+        "name": "blocks.۲۴."
+      },
+      "blocks_25_": {
+        "name": "blocks.۲۵."
+      },
+      "blocks_26_": {
+        "name": "blocks.۲۶."
+      },
+      "blocks_27_": {
+        "name": "blocks.۲۷."
+      },
+      "blocks_28_": {
+        "name": "blocks.۲۸."
+      },
+      "blocks_29_": {
+        "name": "blocks.۲۹."
+      },
+      "blocks_2_": {
+        "name": "blocks.۲."
+      },
+      "blocks_30_": {
+        "name": "blocks.۳۰."
+      },
+      "blocks_31_": {
+        "name": "blocks.۳۱."
+      },
+      "blocks_32_": {
+        "name": "blocks.۳۲."
+      },
+      "blocks_33_": {
+        "name": "blocks.۳۳."
+      },
+      "blocks_34_": {
+        "name": "blocks.۳۴."
+      },
+      "blocks_35_": {
+        "name": "blocks.۳۵."
+      },
+      "blocks_36_": {
+        "name": "blocks.۳۶."
+      },
+      "blocks_37_": {
+        "name": "blocks.۳۷."
+      },
+      "blocks_38_": {
+        "name": "blocks.۳۸."
+      },
+      "blocks_39_": {
+        "name": "blocks.۳۹."
+      },
+      "blocks_3_": {
+        "name": "blocks.۳."
+      },
+      "blocks_40_": {
+        "name": "blocks.۴۰."
+      },
+      "blocks_41_": {
+        "name": "blocks.۴۱."
+      },
+      "blocks_42_": {
+        "name": "blocks.۴۲."
+      },
+      "blocks_43_": {
+        "name": "blocks.۴۳."
+      },
+      "blocks_44_": {
+        "name": "blocks.۴۴."
+      },
+      "blocks_45_": {
+        "name": "blocks.۴۵."
+      },
+      "blocks_46_": {
+        "name": "blocks.۴۶."
+      },
+      "blocks_47_": {
+        "name": "blocks.۴۷."
+      },
+      "blocks_4_": {
+        "name": "blocks.۴."
+      },
+      "blocks_5_": {
+        "name": "blocks.۵."
+      },
+      "blocks_6_": {
+        "name": "blocks.۶."
+      },
+      "blocks_7_": {
+        "name": "blocks.۷."
+      },
+      "blocks_8_": {
+        "name": "blocks.۸."
+      },
+      "blocks_9_": {
+        "name": "blocks.۹."
+      },
+      "final_layer_": {
+        "name": "final_layer."
+      },
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "pos_frequencies_": {
+        "name": "pos_frequencies."
+      },
+      "t5_y_embedder_": {
+        "name": "t5_y_embedder."
+      },
+      "t5_yproj_": {
+        "name": "t5_yproj."
+      },
+      "t_embedder_": {
+        "name": "t_embedder."
+      }
+    }
+  },
+  "ModelMergeQwenImage": {
+    "display_name": "ModelMergeQwenImage",
+    "inputs": {
+      "img_in_": {
+        "name": "img_in."
+      },
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "pos_embeds_": {
+        "name": "pos_embeds."
+      },
+      "proj_out_": {
+        "name": "proj_out."
+      },
+      "time_text_embed_": {
+        "name": "time_text_embed."
+      },
+      "transformer_blocks_0_": {
+        "name": "transformer_blocks.۰."
+      },
+      "transformer_blocks_10_": {
+        "name": "transformer_blocks.۱۰."
+      },
+      "transformer_blocks_11_": {
+        "name": "transformer_blocks.۱۱."
+      },
+      "transformer_blocks_12_": {
+        "name": "transformer_blocks.۱۲."
+      },
+      "transformer_blocks_13_": {
+        "name": "transformer_blocks.۱۳."
+      },
+      "transformer_blocks_14_": {
+        "name": "transformer_blocks.۱۴."
+      },
+      "transformer_blocks_15_": {
+        "name": "transformer_blocks.۱۵."
+      },
+      "transformer_blocks_16_": {
+        "name": "transformer_blocks.۱۶."
+      },
+      "transformer_blocks_17_": {
+        "name": "transformer_blocks.۱۷."
+      },
+      "transformer_blocks_18_": {
+        "name": "transformer_blocks.۱۸."
+      },
+      "transformer_blocks_19_": {
+        "name": "transformer_blocks.۱۹."
+      },
+      "transformer_blocks_1_": {
+        "name": "transformer_blocks.۱."
+      },
+      "transformer_blocks_20_": {
+        "name": "transformer_blocks.۲۰."
+      },
+      "transformer_blocks_21_": {
+        "name": "transformer_blocks.۲۱."
+      },
+      "transformer_blocks_22_": {
+        "name": "transformer_blocks.۲۲."
+      },
+      "transformer_blocks_23_": {
+        "name": "transformer_blocks.۲۳."
+      },
+      "transformer_blocks_24_": {
+        "name": "transformer_blocks.۲۴."
+      },
+      "transformer_blocks_25_": {
+        "name": "transformer_blocks.۲۵."
+      },
+      "transformer_blocks_26_": {
+        "name": "transformer_blocks.۲۶."
+      },
+      "transformer_blocks_27_": {
+        "name": "transformer_blocks.۲۷."
+      },
+      "transformer_blocks_28_": {
+        "name": "transformer_blocks.۲۸."
+      },
+      "transformer_blocks_29_": {
+        "name": "transformer_blocks.۲۹."
+      },
+      "transformer_blocks_2_": {
+        "name": "transformer_blocks.۲."
+      },
+      "transformer_blocks_30_": {
+        "name": "transformer_blocks.۳۰."
+      },
+      "transformer_blocks_31_": {
+        "name": "transformer_blocks.۳۱."
+      },
+      "transformer_blocks_32_": {
+        "name": "transformer_blocks.۳۲."
+      },
+      "transformer_blocks_33_": {
+        "name": "transformer_blocks.۳۳."
+      },
+      "transformer_blocks_34_": {
+        "name": "transformer_blocks.۳۴."
+      },
+      "transformer_blocks_35_": {
+        "name": "transformer_blocks.۳۵."
+      },
+      "transformer_blocks_36_": {
+        "name": "transformer_blocks.۳۶."
+      },
+      "transformer_blocks_37_": {
+        "name": "transformer_blocks.۳۷."
+      },
+      "transformer_blocks_38_": {
+        "name": "transformer_blocks.۳۸."
+      },
+      "transformer_blocks_39_": {
+        "name": "transformer_blocks.۳۹."
+      },
+      "transformer_blocks_3_": {
+        "name": "transformer_blocks.۳."
+      },
+      "transformer_blocks_40_": {
+        "name": "transformer_blocks.۴۰."
+      },
+      "transformer_blocks_41_": {
+        "name": "transformer_blocks.۴۱."
+      },
+      "transformer_blocks_42_": {
+        "name": "transformer_blocks.۴۲."
+      },
+      "transformer_blocks_43_": {
+        "name": "transformer_blocks.۴۳."
+      },
+      "transformer_blocks_44_": {
+        "name": "transformer_blocks.۴۴."
+      },
+      "transformer_blocks_45_": {
+        "name": "transformer_blocks.۴۵."
+      },
+      "transformer_blocks_46_": {
+        "name": "transformer_blocks.۴۶."
+      },
+      "transformer_blocks_47_": {
+        "name": "transformer_blocks.۴۷."
+      },
+      "transformer_blocks_48_": {
+        "name": "transformer_blocks.۴۸."
+      },
+      "transformer_blocks_49_": {
+        "name": "transformer_blocks.۴۹."
+      },
+      "transformer_blocks_4_": {
+        "name": "transformer_blocks.۴."
+      },
+      "transformer_blocks_50_": {
+        "name": "transformer_blocks.۵۰."
+      },
+      "transformer_blocks_51_": {
+        "name": "transformer_blocks.۵۱."
+      },
+      "transformer_blocks_52_": {
+        "name": "transformer_blocks.۵۲."
+      },
+      "transformer_blocks_53_": {
+        "name": "transformer_blocks.۵۳."
+      },
+      "transformer_blocks_54_": {
+        "name": "transformer_blocks.۵۴."
+      },
+      "transformer_blocks_55_": {
+        "name": "transformer_blocks.۵۵."
+      },
+      "transformer_blocks_56_": {
+        "name": "transformer_blocks.۵۶."
+      },
+      "transformer_blocks_57_": {
+        "name": "transformer_blocks.۵۷."
+      },
+      "transformer_blocks_58_": {
+        "name": "transformer_blocks.۵۸."
+      },
+      "transformer_blocks_59_": {
+        "name": "transformer_blocks.۵۹."
+      },
+      "transformer_blocks_5_": {
+        "name": "transformer_blocks.۵."
+      },
+      "transformer_blocks_6_": {
+        "name": "transformer_blocks.۶."
+      },
+      "transformer_blocks_7_": {
+        "name": "transformer_blocks.۷."
+      },
+      "transformer_blocks_8_": {
+        "name": "transformer_blocks.۸."
+      },
+      "transformer_blocks_9_": {
+        "name": "transformer_blocks.۹."
+      },
+      "txt_in_": {
+        "name": "txt_in."
+      },
+      "txt_norm_": {
+        "name": "txt_norm."
+      }
+    }
+  },
+  "ModelMergeSD1": {
+    "display_name": "ModelMergeSD1",
+    "inputs": {
+      "input_blocks_0_": {
+        "name": "ورودی بلوک‌ها.۰."
+      },
+      "input_blocks_10_": {
+        "name": "ورودی بلوک‌ها.۱۰."
+      },
+      "input_blocks_11_": {
+        "name": "ورودی بلوک‌ها.۱۱."
+      },
+      "input_blocks_1_": {
+        "name": "ورودی بلوک‌ها.۱."
+      },
+      "input_blocks_2_": {
+        "name": "ورودی بلوک‌ها.۲."
+      },
+      "input_blocks_3_": {
+        "name": "ورودی بلوک‌ها.۳."
+      },
+      "input_blocks_4_": {
+        "name": "ورودی بلوک‌ها.۴."
+      },
+      "input_blocks_5_": {
+        "name": "ورودی بلوک‌ها.۵."
+      },
+      "input_blocks_6_": {
+        "name": "ورودی بلوک‌ها.۶."
+      },
+      "input_blocks_7_": {
+        "name": "ورودی بلوک‌ها.۷."
+      },
+      "input_blocks_8_": {
+        "name": "ورودی بلوک‌ها.۸."
+      },
+      "input_blocks_9_": {
+        "name": "ورودی بلوک‌ها.۹."
+      },
+      "label_emb_": {
+        "name": "label_emb."
+      },
+      "middle_block_0_": {
+        "name": "بلوک میانی.۰."
+      },
+      "middle_block_1_": {
+        "name": "بلوک میانی.۱."
+      },
+      "middle_block_2_": {
+        "name": "بلوک میانی.۲."
+      },
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "out_": {
+        "name": "خروجی."
+      },
+      "output_blocks_0_": {
+        "name": "خروجی بلوک‌ها.۰."
+      },
+      "output_blocks_10_": {
+        "name": "خروجی بلوک‌ها.۱۰."
+      },
+      "output_blocks_11_": {
+        "name": "خروجی بلوک‌ها.۱۱."
+      },
+      "output_blocks_1_": {
+        "name": "خروجی بلوک‌ها.۱."
+      },
+      "output_blocks_2_": {
+        "name": "خروجی بلوک‌ها.۲."
+      },
+      "output_blocks_3_": {
+        "name": "خروجی بلوک‌ها.۳."
+      },
+      "output_blocks_4_": {
+        "name": "خروجی بلوک‌ها.۴."
+      },
+      "output_blocks_5_": {
+        "name": "خروجی بلوک‌ها.۵."
+      },
+      "output_blocks_6_": {
+        "name": "خروجی بلوک‌ها.۶."
+      },
+      "output_blocks_7_": {
+        "name": "خروجی بلوک‌ها.۷."
+      },
+      "output_blocks_8_": {
+        "name": "خروجی بلوک‌ها.۸."
+      },
+      "output_blocks_9_": {
+        "name": "خروجی بلوک‌ها.۹."
+      },
+      "time_embed_": {
+        "name": "time_embed."
+      }
+    }
+  },
+  "ModelMergeSD2": {
+    "display_name": "ModelMergeSD2",
+    "inputs": {
+      "input_blocks_0_": {
+        "name": "بلوک‌های ورودی ۰."
+      },
+      "input_blocks_10_": {
+        "name": "بلوک‌های ورودی ۱۰."
+      },
+      "input_blocks_11_": {
+        "name": "بلوک‌های ورودی ۱۱."
+      },
+      "input_blocks_1_": {
+        "name": "بلوک‌های ورودی ۱."
+      },
+      "input_blocks_2_": {
+        "name": "بلوک‌های ورودی ۲."
+      },
+      "input_blocks_3_": {
+        "name": "بلوک‌های ورودی ۳."
+      },
+      "input_blocks_4_": {
+        "name": "بلوک‌های ورودی ۴."
+      },
+      "input_blocks_5_": {
+        "name": "بلوک‌های ورودی ۵."
+      },
+      "input_blocks_6_": {
+        "name": "بلوک‌های ورودی ۶."
+      },
+      "input_blocks_7_": {
+        "name": "بلوک‌های ورودی ۷."
+      },
+      "input_blocks_8_": {
+        "name": "بلوک‌های ورودی ۸."
+      },
+      "input_blocks_9_": {
+        "name": "بلوک‌های ورودی ۹."
+      },
+      "label_emb_": {
+        "name": "label_emb."
+      },
+      "middle_block_0_": {
+        "name": "بلوک میانی ۰."
+      },
+      "middle_block_1_": {
+        "name": "بلوک میانی ۱."
+      },
+      "middle_block_2_": {
+        "name": "بلوک میانی ۲."
+      },
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "out_": {
+        "name": "خروجی."
+      },
+      "output_blocks_0_": {
+        "name": "بلوک‌های خروجی ۰."
+      },
+      "output_blocks_10_": {
+        "name": "بلوک‌های خروجی ۱۰."
+      },
+      "output_blocks_11_": {
+        "name": "بلوک‌های خروجی ۱۱."
+      },
+      "output_blocks_1_": {
+        "name": "بلوک‌های خروجی ۱."
+      },
+      "output_blocks_2_": {
+        "name": "بلوک‌های خروجی ۲."
+      },
+      "output_blocks_3_": {
+        "name": "بلوک‌های خروجی ۳."
+      },
+      "output_blocks_4_": {
+        "name": "بلوک‌های خروجی ۴."
+      },
+      "output_blocks_5_": {
+        "name": "بلوک‌های خروجی ۵."
+      },
+      "output_blocks_6_": {
+        "name": "بلوک‌های خروجی ۶."
+      },
+      "output_blocks_7_": {
+        "name": "بلوک‌های خروجی ۷."
+      },
+      "output_blocks_8_": {
+        "name": "بلوک‌های خروجی ۸."
+      },
+      "output_blocks_9_": {
+        "name": "بلوک‌های خروجی ۹."
+      },
+      "time_embed_": {
+        "name": "time_embed."
+      }
+    }
+  },
+  "ModelMergeSD35_Large": {
+    "display_name": "ModelMergeSD35_Large",
+    "inputs": {
+      "context_embedder_": {
+        "name": "context_embedder."
+      },
+      "final_layer_": {
+        "name": "final_layer."
+      },
+      "joint_blocks_0_": {
+        "name": "joint_blocks.۰."
+      },
+      "joint_blocks_10_": {
+        "name": "joint_blocks.۱۰."
+      },
+      "joint_blocks_11_": {
+        "name": "joint_blocks.۱۱."
+      },
+      "joint_blocks_12_": {
+        "name": "joint_blocks.۱۲."
+      },
+      "joint_blocks_13_": {
+        "name": "joint_blocks.۱۳."
+      },
+      "joint_blocks_14_": {
+        "name": "joint_blocks.۱۴."
+      },
+      "joint_blocks_15_": {
+        "name": "joint_blocks.۱۵."
+      },
+      "joint_blocks_16_": {
+        "name": "joint_blocks.۱۶."
+      },
+      "joint_blocks_17_": {
+        "name": "joint_blocks.۱۷."
+      },
+      "joint_blocks_18_": {
+        "name": "joint_blocks.۱۸."
+      },
+      "joint_blocks_19_": {
+        "name": "joint_blocks.۱۹."
+      },
+      "joint_blocks_1_": {
+        "name": "joint_blocks.۱."
+      },
+      "joint_blocks_20_": {
+        "name": "joint_blocks.۲۰."
+      },
+      "joint_blocks_21_": {
+        "name": "joint_blocks.۲۱."
+      },
+      "joint_blocks_22_": {
+        "name": "joint_blocks.۲۲."
+      },
+      "joint_blocks_23_": {
+        "name": "joint_blocks.۲۳."
+      },
+      "joint_blocks_24_": {
+        "name": "joint_blocks.۲۴."
+      },
+      "joint_blocks_25_": {
+        "name": "joint_blocks.۲۵."
+      },
+      "joint_blocks_26_": {
+        "name": "joint_blocks.۲۶."
+      },
+      "joint_blocks_27_": {
+        "name": "joint_blocks.۲۷."
+      },
+      "joint_blocks_28_": {
+        "name": "joint_blocks.۲۸."
+      },
+      "joint_blocks_29_": {
+        "name": "joint_blocks.۲۹."
+      },
+      "joint_blocks_2_": {
+        "name": "joint_blocks.۲."
+      },
+      "joint_blocks_30_": {
+        "name": "joint_blocks.۳۰."
+      },
+      "joint_blocks_31_": {
+        "name": "joint_blocks.۳۱."
+      },
+      "joint_blocks_32_": {
+        "name": "joint_blocks.۳۲."
+      },
+      "joint_blocks_33_": {
+        "name": "joint_blocks.۳۳."
+      },
+      "joint_blocks_34_": {
+        "name": "joint_blocks.۳۴."
+      },
+      "joint_blocks_35_": {
+        "name": "joint_blocks.۳۵."
+      },
+      "joint_blocks_36_": {
+        "name": "joint_blocks.۳۶."
+      },
+      "joint_blocks_37_": {
+        "name": "joint_blocks.۳۷."
+      },
+      "joint_blocks_3_": {
+        "name": "joint_blocks.۳."
+      },
+      "joint_blocks_4_": {
+        "name": "joint_blocks.۴."
+      },
+      "joint_blocks_5_": {
+        "name": "joint_blocks.۵."
+      },
+      "joint_blocks_6_": {
+        "name": "joint_blocks.۶."
+      },
+      "joint_blocks_7_": {
+        "name": "joint_blocks.۷."
+      },
+      "joint_blocks_8_": {
+        "name": "joint_blocks.۸."
+      },
+      "joint_blocks_9_": {
+        "name": "joint_blocks.۹."
+      },
+      "model1": {
+        "name": "مدل۱"
+      },
+      "model2": {
+        "name": "مدل۲"
+      },
+      "pos_embed_": {
+        "name": "pos_embed."
+      },
+      "t_embedder_": {
+        "name": "t_embedder."
+      },
+      "x_embedder_": {
+        "name": "x_embedder."
+      },
+      "y_embedder_": {
+        "name": "y_embedder."
+      }
+    }
+  },
+  "ModelMergeSD3_2B": {
+    "display_name": "ModelMergeSD3_2B",
+    "inputs": {
+      "context_embedder_": {
+        "name": "context_embedder."
+      },
+      "final_layer_": {
+        "name": "final_layer."
+      },
+      "joint_blocks_0_": {
+        "name": "joint_blocks.۰."
+      },
+      "joint_blocks_10_": {
+        "name": "joint_blocks.۱۰."
+      },
+      "joint_blocks_11_": {
+        "name": "joint_blocks.۱۱."
+      },
+      "joint_blocks_12_": {
+        "name": "joint_blocks.۱۲."
+      },
+      "joint_blocks_13_": {
+        "name": "joint_blocks.۱۳."
+      },
+      "joint_blocks_14_": {
+        "name": "joint_blocks.۱۴."
+      },
+      "joint_blocks_15_": {
+        "name": "joint_blocks.۱۵."
+      },
+      "joint_blocks_16_": {
+        "name": "joint_blocks.۱۶."
+      },
+      "joint_blocks_17_": {
+        "name": "joint_blocks.۱۷."
+      },
+      "joint_blocks_18_": {
+        "name": "joint_blocks.۱۸."
+      },
+      "joint_blocks_19_": {
+        "name": "joint_blocks.۱۹."
+      },
+      "joint_blocks_1_": {
+        "name": "joint_blocks.۱."
+      },
+      "joint_blocks_20_": {
+        "name": "joint_blocks.۲۰."
+      },
+      "joint_blocks_21_": {
+        "name": "joint_blocks.۲۱."
+      },
+      "joint_blocks_22_": {
+        "name": "joint_blocks.۲۲."
+      },
+      "joint_blocks_23_": {
+        "name": "joint_blocks.۲۳."
+      },
+      "joint_blocks_2_": {
+        "name": "joint_blocks.۲."
+      },
+      "joint_blocks_3_": {
+        "name": "joint_blocks.۳."
+      },
+      "joint_blocks_4_": {
+        "name": "joint_blocks.۴."
+      },
+      "joint_blocks_5_": {
+        "name": "joint_blocks.۵."
+      },
+      "joint_blocks_6_": {
+        "name": "joint_blocks.۶."
+      },
+      "joint_blocks_7_": {
+        "name": "joint_blocks.۷."
+      },
+      "joint_blocks_8_": {
+        "name": "joint_blocks.۸."
+      },
+      "joint_blocks_9_": {
+        "name": "joint_blocks.۹."
+      },
+      "model1": {
+        "name": "مدل۱"
+      },
+      "model2": {
+        "name": "مدل۲"
+      },
+      "pos_embed_": {
+        "name": "pos_embed."
+      },
+      "t_embedder_": {
+        "name": "t_embedder."
+      },
+      "x_embedder_": {
+        "name": "x_embedder."
+      },
+      "y_embedder_": {
+        "name": "y_embedder."
+      }
+    }
+  },
+  "ModelMergeSDXL": {
+    "display_name": "ModelMergeSDXL",
+    "inputs": {
+      "input_blocks_0": {
+        "name": "input_blocks.۰"
+      },
+      "input_blocks_1": {
+        "name": "input_blocks.۱"
+      },
+      "input_blocks_2": {
+        "name": "input_blocks.۲"
+      },
+      "input_blocks_3": {
+        "name": "input_blocks.۳"
+      },
+      "input_blocks_4": {
+        "name": "input_blocks.۴"
+      },
+      "input_blocks_5": {
+        "name": "input_blocks.۵"
+      },
+      "input_blocks_6": {
+        "name": "input_blocks.۶"
+      },
+      "input_blocks_7": {
+        "name": "input_blocks.۷"
+      },
+      "input_blocks_8": {
+        "name": "input_blocks.۸"
+      },
+      "label_emb_": {
+        "name": "label_emb."
+      },
+      "middle_block_0": {
+        "name": "middle_block.۰"
+      },
+      "middle_block_1": {
+        "name": "middle_block.۱"
+      },
+      "middle_block_2": {
+        "name": "middle_block.۲"
+      },
+      "model1": {
+        "name": "مدل۱"
+      },
+      "model2": {
+        "name": "مدل۲"
+      },
+      "out_": {
+        "name": "out."
+      },
+      "output_blocks_0": {
+        "name": "output_blocks.۰"
+      },
+      "output_blocks_1": {
+        "name": "output_blocks.۱"
+      },
+      "output_blocks_2": {
+        "name": "output_blocks.۲"
+      },
+      "output_blocks_3": {
+        "name": "output_blocks.۳"
+      },
+      "output_blocks_4": {
+        "name": "output_blocks.۴"
+      },
+      "output_blocks_5": {
+        "name": "output_blocks.۵"
+      },
+      "output_blocks_6": {
+        "name": "output_blocks.۶"
+      },
+      "output_blocks_7": {
+        "name": "output_blocks.۷"
+      },
+      "output_blocks_8": {
+        "name": "output_blocks.۸"
+      },
+      "time_embed_": {
+        "name": "time_embed."
+      }
+    }
+  },
+  "ModelMergeSimple": {
+    "display_name": "ModelMergeSimple",
+    "inputs": {
+      "model1": {
+        "name": "مدل۱"
+      },
+      "model2": {
+        "name": "مدل۲"
+      },
+      "ratio": {
+        "name": "نسبت"
+      }
+    }
+  },
+  "ModelMergeSubtract": {
+    "display_name": "ModelMergeSubtract",
+    "inputs": {
+      "model1": {
+        "name": "مدل۱"
+      },
+      "model2": {
+        "name": "مدل۲"
+      },
+      "multiplier": {
+        "name": "ضریب"
+      }
+    }
+  },
+  "ModelMergeWAN2_1": {
+    "description": "مدل ۱.۳B دارای ۳۰ بلاک است، مدل ۱۴B دارای ۴۰ بلاک است. مدل تصویر به ویدیو دارای img_emb اضافی است.",
+    "display_name": "ModelMergeWAN2_1",
+    "inputs": {
+      "blocks_0_": {
+        "name": "blocks.0."
+      },
+      "blocks_10_": {
+        "name": "blocks.10."
+      },
+      "blocks_11_": {
+        "name": "blocks.11."
+      },
+      "blocks_12_": {
+        "name": "blocks.12."
+      },
+      "blocks_13_": {
+        "name": "blocks.13."
+      },
+      "blocks_14_": {
+        "name": "blocks.14."
+      },
+      "blocks_15_": {
+        "name": "blocks.15."
+      },
+      "blocks_16_": {
+        "name": "blocks.16."
+      },
+      "blocks_17_": {
+        "name": "blocks.17."
+      },
+      "blocks_18_": {
+        "name": "blocks.18."
+      },
+      "blocks_19_": {
+        "name": "blocks.19."
+      },
+      "blocks_1_": {
+        "name": "blocks.1."
+      },
+      "blocks_20_": {
+        "name": "blocks.20."
+      },
+      "blocks_21_": {
+        "name": "blocks.21."
+      },
+      "blocks_22_": {
+        "name": "blocks.22."
+      },
+      "blocks_23_": {
+        "name": "blocks.23."
+      },
+      "blocks_24_": {
+        "name": "blocks.24."
+      },
+      "blocks_25_": {
+        "name": "blocks.25."
+      },
+      "blocks_26_": {
+        "name": "blocks.26."
+      },
+      "blocks_27_": {
+        "name": "blocks.27."
+      },
+      "blocks_28_": {
+        "name": "blocks.28."
+      },
+      "blocks_29_": {
+        "name": "blocks.29."
+      },
+      "blocks_2_": {
+        "name": "blocks.2."
+      },
+      "blocks_30_": {
+        "name": "blocks.30."
+      },
+      "blocks_31_": {
+        "name": "blocks.31."
+      },
+      "blocks_32_": {
+        "name": "blocks.32."
+      },
+      "blocks_33_": {
+        "name": "blocks.33."
+      },
+      "blocks_34_": {
+        "name": "blocks.34."
+      },
+      "blocks_35_": {
+        "name": "blocks.35."
+      },
+      "blocks_36_": {
+        "name": "blocks.36."
+      },
+      "blocks_37_": {
+        "name": "blocks.37."
+      },
+      "blocks_38_": {
+        "name": "blocks.38."
+      },
+      "blocks_39_": {
+        "name": "blocks.39."
+      },
+      "blocks_3_": {
+        "name": "blocks.3."
+      },
+      "blocks_4_": {
+        "name": "blocks.4."
+      },
+      "blocks_5_": {
+        "name": "blocks.5."
+      },
+      "blocks_6_": {
+        "name": "blocks.6."
+      },
+      "blocks_7_": {
+        "name": "blocks.7."
+      },
+      "blocks_8_": {
+        "name": "blocks.8."
+      },
+      "blocks_9_": {
+        "name": "blocks.9."
+      },
+      "head_": {
+        "name": "head."
+      },
+      "img_emb_": {
+        "name": "img_emb."
+      },
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "patch_embedding_": {
+        "name": "patch_embedding."
+      },
+      "text_embedding_": {
+        "name": "text_embedding."
+      },
+      "time_embedding_": {
+        "name": "time_embedding."
+      },
+      "time_projection_": {
+        "name": "time_projection."
+      }
+    }
+  },
+  "ModelPatchLoader": {
+    "display_name": "ModelPatchLoader",
+    "inputs": {
+      "name": {
+        "name": "نام"
+      }
+    }
+  },
+  "ModelSamplingAuraFlow": {
+    "display_name": "ModelSamplingAuraFlow",
+    "inputs": {
+      "model": {
+        "name": "مدل"
+      },
+      "shift": {
+        "name": "شیفت"
+      }
+    }
+  },
+  "ModelSamplingContinuousEDM": {
+    "display_name": "ModelSamplingContinuousEDM",
+    "inputs": {
+      "model": {
+        "name": "مدل"
+      },
+      "sampling": {
+        "name": "نمونه‌برداری"
+      },
+      "sigma_max": {
+        "name": "سیگما بیشینه"
+      },
+      "sigma_min": {
+        "name": "سیگما کمینه"
+      }
+    }
+  },
+  "ModelSamplingContinuousV": {
+    "display_name": "ModelSamplingContinuousV",
+    "inputs": {
+      "model": {
+        "name": "مدل"
+      },
+      "sampling": {
+        "name": "نمونه‌برداری"
+      },
+      "sigma_max": {
+        "name": "سیگما بیشینه"
+      },
+      "sigma_min": {
+        "name": "سیگما کمینه"
+      }
+    }
+  },
+  "ModelSamplingDiscrete": {
+    "display_name": "ModelSamplingDiscrete",
+    "inputs": {
+      "model": {
+        "name": "مدل"
+      },
+      "sampling": {
+        "name": "نمونه‌برداری"
+      },
+      "zsnr": {
+        "name": "zsnr"
+      }
+    }
+  },
+  "ModelSamplingFlux": {
+    "display_name": "ModelSamplingFlux",
+    "inputs": {
+      "base_shift": {
+        "name": "شیفت پایه"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "max_shift": {
+        "name": "بیشینه شیفت"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    }
+  },
+  "ModelSamplingLTXV": {
+    "display_name": "ModelSamplingLTXV",
+    "inputs": {
+      "base_shift": {
+        "name": "شیفت پایه"
+      },
+      "latent": {
+        "name": "latent"
+      },
+      "max_shift": {
+        "name": "بیشینه شیفت"
+      },
+      "model": {
+        "name": "مدل"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ModelSamplingSD3": {
+    "display_name": "ModelSamplingSD3",
+    "inputs": {
+      "model": {
+        "name": "مدل"
+      },
+      "shift": {
+        "name": "شیفت"
+      }
+    }
+  },
+  "ModelSamplingStableCascade": {
+    "display_name": "ModelSamplingStableCascade",
+    "inputs": {
+      "model": {
+        "name": "مدل"
+      },
+      "shift": {
+        "name": "شیفت"
+      }
+    }
+  },
+  "ModelSave": {
+    "display_name": "ModelSave",
+    "inputs": {
+      "filename_prefix": {
+        "name": "پیشوند نام فایل"
+      },
+      "model": {
+        "name": "مدل"
+      }
+    }
+  },
+  "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": {
+      "image": {
+        "name": "image"
+      },
+      "kernel_size": {
+        "name": "kernel_size"
+      },
+      "operation": {
+        "name": "operation"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "NAGuidance": {
+    "description": "راهنمای توجه نرمال‌سازی‌شده را به مدل‌ها اعمال می‌کند و امکان استفاده از پرامپت منفی را در مدل‌های distilled/schnell فراهم می‌سازد.",
+    "display_name": "راهنمای توجه نرمال‌سازی‌شده",
+    "inputs": {
+      "model": {
+        "name": "مدل",
+        "tooltip": "مدلی که NAG بر روی آن اعمال می‌شود."
+      },
+      "nag_alpha": {
+        "name": "ضریب ترکیب",
+        "tooltip": "ضریب ترکیب برای توجه نرمال‌سازی‌شده. مقدار ۱.۰ به معنای جایگزینی کامل و ۰.۰ بدون تأثیر است."
+      },
+      "nag_scale": {
+        "name": "مقیاس راهنما",
+        "tooltip": "ضریب مقیاس راهنما. مقادیر بالاتر فاصله بیشتری از پرامپت منفی ایجاد می‌کند."
+      },
+      "nag_tau": {
+        "name": "تاو"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "مدل اصلاح‌شده با فعال‌سازی NAG."
+      }
+    }
+  },
+  "NormalizeImages": {
+    "display_name": "نرمال‌سازی تصاویر",
+    "inputs": {
+      "images": {
+        "name": "images",
+        "tooltip": "تصویر برای پردازش."
+      },
+      "mean": {
+        "name": "mean",
+        "tooltip": "مقدار میانگین برای نرمال‌سازی."
+      },
+      "std": {
+        "name": "std",
+        "tooltip": "انحراف معیار برای نرمال‌سازی."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "تصاویر پردازش‌شده"
+      }
+    }
+  },
+  "NormalizeVideoLatentStart": {
+    "description": "فریم‌های ابتدایی یک latent ویدیویی را نرمال‌سازی می‌کند تا میانگین و انحراف معیار آن‌ها با فریم‌های مرجع بعدی مطابقت داشته باشد. به کاهش تفاوت بین فریم‌های ابتدایی و سایر فریم‌های ویدیو کمک می‌کند.",
+    "display_name": "نرمال‌سازی شروع نهفته ویدیو",
+    "inputs": {
+      "latent": {
+        "name": "latent"
+      },
+      "reference_frame_count": {
+        "name": "reference_frame_count",
+        "tooltip": "تعداد فریم‌های نهفته پس از فریم‌های ابتدایی که به عنوان مرجع استفاده می‌شوند"
+      },
+      "start_frame_count": {
+        "name": "start_frame_count",
+        "tooltip": "تعداد فریم‌های نهفته برای نرمال‌سازی (از ابتدا شمارش می‌شود)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "OpenAIChatConfig": {
+    "description": "امکان تعیین گزینه‌های پیکربندی پیشرفته برای OpenAI Chat Nodeها را فراهم می‌کند.",
+    "display_name": "تنظیمات پیشرفته OpenAI ChatGPT",
+    "inputs": {
+      "instructions": {
+        "name": "instructions",
+        "tooltip": "دستورالعمل‌هایی برای مدل درباره نحوه تولید پاسخ"
+      },
+      "max_output_tokens": {
+        "name": "max_output_tokens",
+        "tooltip": "حد بالایی برای تعداد توکن‌هایی که می‌توانند برای یک پاسخ تولید شوند، شامل توکن‌های خروجی قابل مشاهده"
+      },
+      "truncation": {
+        "name": "truncation",
+        "tooltip": "استراتژی کوتاه‌سازی برای پاسخ مدل. auto: اگر زمینه این پاسخ و پاسخ‌های قبلی از اندازه پنجره زمینه مدل بیشتر شود، مدل پاسخ را با حذف آیتم‌های ورودی در میانه گفتگو کوتاه می‌کند تا در پنجره زمینه جا بگیرد. disabled: اگر پاسخ مدل از اندازه پنجره زمینه مدل بیشتر شود، درخواست با خطای ۴۰۰ شکست می‌خورد."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "OpenAIChatNode": {
+    "description": "تولید پاسخ متنی از یک مدل OpenAI.",
+    "display_name": "OpenAI ChatGPT",
+    "inputs": {
+      "advanced_options": {
+        "name": "advanced_options",
+        "tooltip": "پیکربندی اختیاری برای مدل. ورودی‌ها را از node OpenAI Chat Advanced Options می‌پذیرد."
+      },
+      "files": {
+        "name": "files",
+        "tooltip": "فایل(ها)ی اختیاری برای استفاده به عنوان زمینه مدل. ورودی‌ها را از node OpenAI Chat Input Files می‌پذیرد."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "تصویر(ها)ی اختیاری برای استفاده به عنوان زمینه مدل. برای افزودن چند تصویر می‌توانید از node Batch Images استفاده کنید."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "مدلی که برای تولید پاسخ استفاده می‌شود"
+      },
+      "persist_context": {
+        "name": "persist_context",
+        "tooltip": "این پارامتر منسوخ شده و اثری ندارد."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "ورودی متنی به مدل، برای تولید پاسخ استفاده می‌شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "OpenAIDalle2": {
+    "description": "تولید تصویر به صورت همزمان از طریق نقطه پایانی DALL·E 2 شرکت OpenAI.",
+    "display_name": "OpenAI DALL·E 2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "تصویر مرجع اختیاری برای ویرایش تصویر."
+      },
+      "mask": {
+        "name": "mask",
+        "tooltip": "ماسک اختیاری برای inpainting (ناحیه‌های سفید جایگزین خواهند شد)"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "تعداد تصاویری که باید تولید شود"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "پرامپت متنی برای DALL·E"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "هنوز در backend پیاده‌سازی نشده است"
+      },
+      "size": {
+        "name": "size",
+        "tooltip": "اندازه تصویر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "OpenAIDalle3": {
+    "description": "تولید تصویر به صورت همزمان از طریق نقطه پایانی DALL·E 3 شرکت OpenAI.",
+    "display_name": "OpenAI DALL·E 3",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "متن راهنما برای DALL·E"
+      },
+      "quality": {
+        "name": "quality",
+        "tooltip": "کیفیت تصویر"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "هنوز در backend پیاده‌سازی نشده است"
+      },
+      "size": {
+        "name": "size",
+        "tooltip": "اندازه تصویر"
+      },
+      "style": {
+        "name": "style",
+        "tooltip": "گزینه Vivid مدل را به سمت تولید تصاویر فوق‌واقعی و دراماتیک سوق می‌دهد. گزینه Natural باعث تولید تصاویر طبیعی‌تر و کمتر فوق‌واقعی می‌شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "OpenAIGPTImage1": {
+    "description": "تولید تصویر به صورت همزمان از طریق نقطه پایانی GPT Image 1 شرکت OpenAI.",
+    "display_name": "OpenAI GPT Image 1",
+    "inputs": {
+      "background": {
+        "name": "background",
+        "tooltip": "بازگرداندن تصویر با یا بدون پس‌زمینه"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "تصویر مرجع اختیاری برای ویرایش تصویر."
+      },
+      "mask": {
+        "name": "mask",
+        "tooltip": "ماسک اختیاری برای inpainting (ناحیه‌های سفید جایگزین خواهند شد)"
+      },
+      "model": {
+        "name": "model"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "تعداد تصاویری که باید تولید شود"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "متن راهنما برای تصویر GPT"
+      },
+      "quality": {
+        "name": "quality",
+        "tooltip": "کیفیت تصویر، بر هزینه و زمان تولید تأثیر می‌گذارد."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "هنوز در backend پیاده‌سازی نشده است"
+      },
+      "size": {
+        "name": "size",
+        "tooltip": "اندازه تصویر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "OpenAIInputFiles": {
+    "description": "بارگذاری و آماده‌سازی فایل‌های ورودی (متن، PDF و غیره) برای استفاده به عنوان ورودی در Node چت OpenAI. این فایل‌ها هنگام تولید پاسخ توسط مدل OpenAI خوانده می‌شوند. 🛈 نکته: می‌توان این node را با سایر nodeهای فایل ورودی OpenAI زنجیره کرد.",
+    "display_name": "فایل‌های ورودی OpenAI ChatGPT",
+    "inputs": {
+      "OPENAI_INPUT_FILES": {
+        "name": "OPENAI_INPUT_FILES",
+        "tooltip": "فایل(های) اضافی اختیاری برای دسته‌بندی با فایل بارگذاری‌شده از این node. امکان زنجیره‌سازی فایل‌های ورودی را فراهم می‌کند تا یک پیام بتواند شامل چندین فایل ورودی باشد."
+      },
+      "file": {
+        "name": "file",
+        "tooltip": "فایل‌های ورودی برای استفاده به عنوان زمینه برای مدل. در حال حاضر فقط فایل‌های متنی (.txt) و PDF (.pdf) پذیرفته می‌شوند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "OpenAIVideoSora2": {
+    "description": "تولید ویدیو و صوت توسط OpenAI.",
+    "display_name": "OpenAI Sora - ویدیو",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "متن راهنما؛ در صورت وجود تصویر ورودی می‌تواند خالی باشد."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed برای تعیین اینکه node باید مجدداً اجرا شود یا خیر؛ نتایج واقعی صرف‌نظر از seed غیرقطعی هستند."
+      },
+      "size": {
+        "name": "size"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "OptimalStepsScheduler": {
+    "display_name": "OptimalStepsScheduler",
+    "inputs": {
+      "denoise": {
+        "name": "کاهش نویز"
+      },
+      "model_type": {
+        "name": "model_type"
+      },
+      "steps": {
+        "name": "گام‌ها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PairConditioningCombine": {
+    "display_name": "ترکیب جفت شرطی",
+    "inputs": {
+      "negative_A": {
+        "name": "منفی_A"
+      },
+      "negative_B": {
+        "name": "منفی_B"
+      },
+      "positive_A": {
+        "name": "مثبت_A"
+      },
+      "positive_B": {
+        "name": "مثبت_B"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت"
+      },
+      "1": {
+        "name": "منفی"
+      }
+    }
+  },
+  "PairConditioningSetDefaultCombine": {
+    "display_name": "تنظیم پیش‌فرض ترکیب جفت شرطی",
+    "inputs": {
+      "hooks": {
+        "name": "hooks"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "negative_DEFAULT": {
+        "name": "منفی_پیش‌فرض"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "positive_DEFAULT": {
+        "name": "مثبت_پیش‌فرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت"
+      },
+      "1": {
+        "name": "منفی"
+      }
+    }
+  },
+  "PairConditioningSetProperties": {
+    "display_name": "تنظیم ویژگی‌های جفت شرطی",
+    "inputs": {
+      "hooks": {
+        "name": "hooks"
+      },
+      "mask": {
+        "name": "ماسک"
+      },
+      "negative_NEW": {
+        "name": "منفی_جدید"
+      },
+      "positive_NEW": {
+        "name": "مثبت_جدید"
+      },
+      "set_cond_area": {
+        "name": "تعیین ناحیه شرطی"
+      },
+      "strength": {
+        "name": "شدت"
+      },
+      "timesteps": {
+        "name": "گام‌های زمانی"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت"
+      },
+      "1": {
+        "name": "منفی"
+      }
+    }
+  },
+  "PairConditioningSetPropertiesAndCombine": {
+    "display_name": "تنظیم ویژگی و ترکیب جفت شرطی",
+    "inputs": {
+      "hooks": {
+        "name": "hooks"
+      },
+      "mask": {
+        "name": "ماسک"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "negative_NEW": {
+        "name": "منفی_جدید"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "positive_NEW": {
+        "name": "مثبت_جدید"
+      },
+      "set_cond_area": {
+        "name": "تعیین ناحیه شرطی"
+      },
+      "strength": {
+        "name": "شدت"
+      },
+      "timesteps": {
+        "name": "گام‌های زمانی"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت"
+      },
+      "1": {
+        "name": "منفی"
+      }
+    }
+  },
+  "PatchModelAddDownscale": {
+    "display_name": "PatchModelAddDownscale (Kohya Deep Shrink)",
+    "inputs": {
+      "block_number": {
+        "name": "شماره بلاک"
+      },
+      "downscale_after_skip": {
+        "name": "کاهش ابعاد پس از پرش"
+      },
+      "downscale_factor": {
+        "name": "ضریب کاهش ابعاد"
+      },
+      "downscale_method": {
+        "name": "روش کاهش ابعاد"
+      },
+      "end_percent": {
+        "name": "درصد پایان"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "start_percent": {
+        "name": "درصد شروع"
+      },
+      "upscale_method": {
+        "name": "روش افزایش ابعاد"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PerpNeg": {
+    "display_name": "Perp-Neg (منسوخ شده توسط PerpNegGuider)",
+    "inputs": {
+      "empty_conditioning": {
+        "name": "شرط‌گذاری خالی"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "neg_scale": {
+        "name": "مقیاس منفی"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PerpNegGuider": {
+    "display_name": "PerpNegGuider",
+    "inputs": {
+      "cfg": {
+        "name": "cfg"
+      },
+      "empty_conditioning": {
+        "name": "شرط‌گذاری خالی"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "neg_scale": {
+        "name": "مقیاس منفی"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PerturbedAttentionGuidance": {
+    "display_name": "PerturbedAttentionGuidance",
+    "inputs": {
+      "model": {
+        "name": "مدل"
+      },
+      "scale": {
+        "name": "مقیاس"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PhotoMakerEncode": {
+    "display_name": "PhotoMakerEncode",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "photomaker": {
+        "name": "photomaker"
+      },
+      "text": {
+        "name": "متن"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PhotoMakerLoader": {
+    "display_name": "PhotoMakerLoader",
+    "inputs": {
+      "photomaker_model_name": {
+        "name": "نام مدل photomaker"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PixverseImageToVideoNode": {
+    "description": "تولید ویدیو بر اساس پرامپت و اندازه خروجی.",
+    "display_name": "تبدیل تصویر به ویدیو PixVerse",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration_seconds": {
+        "name": "مدت (ثانیه)"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "motion_mode": {
+        "name": "حالت حرکت"
+      },
+      "negative_prompt": {
+        "name": "پرامپت منفی",
+        "tooltip": "توضیح متنی اختیاری برای عناصر نامطلوب در تصویر."
+      },
+      "pixverse_template": {
+        "name": "قالب PixVerse",
+        "tooltip": "قالب اختیاری برای تأثیرگذاری بر سبک تولید، ایجاد شده توسط نود PixVerse Template."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت برای تولید ویدیو"
+      },
+      "quality": {
+        "name": "کیفیت"
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر برای تولید ویدیو."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PixverseTemplateNode": {
+    "display_name": "قالب PixVerse",
+    "inputs": {
+      "template": {
+        "name": "قالب"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "قالب PixVerse",
+        "tooltip": null
+      }
+    }
+  },
+  "PixverseTextToVideoNode": {
+    "description": "تولید ویدیو بر اساس پرامپت و اندازه خروجی.",
+    "display_name": "تبدیل متن به ویدیو PixVerse",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبت تصویر"
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration_seconds": {
+        "name": "مدت زمان (ثانیه)"
+      },
+      "motion_mode": {
+        "name": "حالت حرکت"
+      },
+      "negative_prompt": {
+        "name": "پرامپت منفی",
+        "tooltip": "توضیح متنی اختیاری برای عناصر ناخواسته در تصویر."
+      },
+      "pixverse_template": {
+        "name": "قالب PixVerse",
+        "tooltip": "قالب اختیاری برای تأثیرگذاری بر سبک تولید، ایجاد شده توسط node قالب PixVerse."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت برای تولید ویدیو"
+      },
+      "quality": {
+        "name": "کیفیت"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed برای تولید ویدیو."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PixverseTransitionVideoNode": {
+    "description": "تولید ویدیو بر اساس پرامپت و اندازه خروجی.",
+    "display_name": "ویدیوی انتقالی PixVerse",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration_seconds": {
+        "name": "مدت زمان (ثانیه)"
+      },
+      "first_frame": {
+        "name": "فریم اول"
+      },
+      "last_frame": {
+        "name": "فریم آخر"
+      },
+      "motion_mode": {
+        "name": "حالت حرکت"
+      },
+      "negative_prompt": {
+        "name": "پرامپت منفی",
+        "tooltip": "توضیح متنی اختیاری برای عناصر ناخواسته در تصویر."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت برای تولید ویدیو"
+      },
+      "quality": {
+        "name": "کیفیت"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed برای تولید ویدیو."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PolyexponentialScheduler": {
+    "display_name": "PolyexponentialScheduler",
+    "inputs": {
+      "rho": {
+        "name": "رو"
+      },
+      "sigma_max": {
+        "name": "سیگما ماکس"
+      },
+      "sigma_min": {
+        "name": "سیگما مین"
+      },
+      "steps": {
+        "name": "گام‌ها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PorterDuffImageComposite": {
+    "display_name": "ترکیب تصویر Porter-Duff",
+    "inputs": {
+      "destination": {
+        "name": "مقصد"
+      },
+      "destination_alpha": {
+        "name": "آلفای مقصد"
+      },
+      "mode": {
+        "name": "حالت"
+      },
+      "source": {
+        "name": "سورس"
+      },
+      "source_alpha": {
+        "name": "آلفای سورس"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
+  "Preview3D": {
+    "display_name": "پیش‌نمایش سه‌بعدی و انیمیشن",
+    "inputs": {
+      "bg_image": {
+        "name": "تصویر پس‌زمینه"
+      },
+      "camera_info": {
+        "name": "اطلاعات دوربین"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "model_file": {
+        "name": "فایل مدل",
+        "tooltip": "فایل مدل سه‌بعدی یا مسیر فایل"
+      }
+    }
+  },
+  "PreviewAny": {
+    "display_name": "پیش‌نمایش به صورت متن",
+    "inputs": {
+      "previewMode": {},
+      "preview_markdown": {
+        "name": "پیش‌نمایش"
+      },
+      "preview_text": {
+        "name": "پیش‌نمایش"
+      },
+      "source": {
+        "name": "سورس"
+      }
+    }
+  },
+  "PreviewAudio": {
+    "display_name": "پیش‌نمایش صوت",
+    "inputs": {
+      "audio": {
+        "name": "صوت"
+      },
+      "audioUI": {
+        "name": "رابط کاربری صوت"
+      }
+    }
+  },
+  "PreviewImage": {
+    "description": "تصاویر ورودی را در پوشه خروجی ComfyUI شما ذخیره می‌کند.",
+    "display_name": "پیش‌نمایش تصویر",
+    "inputs": {
+      "images": {
+        "name": "تصاویر"
+      }
+    }
+  },
+  "PrimitiveBoolean": {
+    "display_name": "بولین",
+    "inputs": {
+      "value": {
+        "name": "مقدار"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PrimitiveBoundingBox": {
+    "display_name": "جعبه مرزی",
+    "inputs": {
+      "height": {
+        "name": "height"
+      },
+      "width": {
+        "name": "width"
+      },
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PrimitiveFloat": {
+    "display_name": "عدد اعشاری",
+    "inputs": {
+      "value": {
+        "name": "مقدار"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PrimitiveInt": {
+    "display_name": "عدد صحیح",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "value": {
+        "name": "مقدار"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PrimitiveString": {
+    "display_name": "رشته",
+    "inputs": {
+      "value": {
+        "name": "مقدار"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PrimitiveStringMultiline": {
+    "display_name": "رشته (چند خطی)",
+    "inputs": {
+      "value": {
+        "name": "مقدار"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "QuadrupleCLIPLoader": {
+    "description": "[دستورالعمل‌ها]\n\nhidream: long clip-l, long clip-g, t5xxl, llama_8b_3.1_instruct",
+    "display_name": "QuadrupleCLIPLoader",
+    "inputs": {
+      "clip_name1": {
+        "name": "clip_name1"
+      },
+      "clip_name2": {
+        "name": "clip_name2"
+      },
+      "clip_name3": {
+        "name": "clip_name3"
+      },
+      "clip_name4": {
+        "name": "clip_name4"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "QwenImageDiffsynthControlnet": {
+    "display_name": "QwenImageDiffsynthControlnet",
+    "inputs": {
+      "image": {
+        "name": "تصویر"
+      },
+      "mask": {
+        "name": "ماسک"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "model_patch": {
+        "name": "patch مدل"
+      },
+      "strength": {
+        "name": "شدت"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
+  "RandomCropImages": {
+    "display_name": "برش تصادفی تصاویر",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "height": {
+        "name": "ارتفاع",
+        "tooltip": "ارتفاع برش."
+      },
+      "images": {
+        "name": "تصاویر",
+        "tooltip": "تصویر برای پردازش."
+      },
+      "seed": {
+        "name": "بذر تصادفی",
+        "tooltip": "بذر تصادفی."
+      },
+      "width": {
+        "name": "عرض",
+        "tooltip": "عرض برش."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "تصاویر",
+        "tooltip": "تصاویر پردازش‌شده"
+      }
+    }
+  },
+  "RandomNoise": {
+    "display_name": "نویز تصادفی",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "noise_seed": {
+        "name": "بذر نویز"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RebatchImages": {
+    "display_name": "دسته‌بندی مجدد تصاویر",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "images": {
+        "name": "تصاویر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RebatchLatents": {
+    "display_name": "تغییر دسته‌بندی latentها",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "latents": {
+        "name": "latentها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecordAudio": {
+    "display_name": "ضبط صدا",
+    "inputs": {
+      "audio": {
+        "name": "صدا"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftColorRGB": {
+    "description": "ایجاد رنگ Recraft با انتخاب مقادیر مشخص RGB.",
+    "display_name": "ایجاد رنگ Recraft با RGB",
+    "inputs": {
+      "b": {
+        "name": "b",
+        "tooltip": "مقدار آبی رنگ."
+      },
+      "g": {
+        "name": "g",
+        "tooltip": "مقدار سبز رنگ."
+      },
+      "r": {
+        "name": "r",
+        "tooltip": "مقدار قرمز رنگ."
+      },
+      "recraft_color": {
+        "name": "رنگ Recraft"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "رنگ Recraft",
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftControls": {
+    "description": "ایجاد کنترل‌های Recraft برای سفارشی‌سازی تولید Recraft.",
+    "display_name": "کنترل‌های Recraft",
+    "inputs": {
+      "background_color": {
+        "name": "رنگ پس‌زمینه"
+      },
+      "colors": {
+        "name": "رنگ‌ها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "کنترل‌های Recraft",
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftCreateStyleNode": {
+    "description": "ایجاد یک استایل سفارشی از تصاویر مرجع. ۱ تا ۵ تصویر را برای استفاده به عنوان مرجع استایل بارگذاری کنید. مجموع حجم تمام تصاویر حداکثر ۵ مگابایت است.",
+    "display_name": "ایجاد استایل سفارشی Recraft",
+    "inputs": {
+      "images": {
+        "name": "تصاویر"
+      },
+      "style": {
+        "name": "استایل",
+        "tooltip": "استایل پایه تصاویر تولید شده."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "شناسه استایل",
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftCreativeUpscaleNode": {
+    "description": "بزرگ‌نمایی تصویر به صورت همزمان.\nیک تصویر شطرنجی را با ابزار «بزرگ‌نمایی خلاقانه» بهبود می‌بخشد و وضوح را با تمرکز بر جزئیات کوچک و چهره‌ها افزایش می‌دهد.",
+    "display_name": "بزرگ‌نمایی خلاقانه تصویر Recraft",
+    "inputs": {
+      "image": {
+        "name": "تصویر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftCrispUpscaleNode": {
+    "description": "بزرگ‌نمایی تصویر به صورت همزمان.\nیک تصویر شطرنجی را با ابزار «بزرگ‌نمایی شفاف» بهبود می‌بخشد، وضوح تصویر را افزایش داده و تصویر را شفاف‌تر و تمیزتر می‌کند.",
+    "display_name": "بزرگ‌نمایی شفاف تصویر Recraft",
+    "inputs": {
+      "image": {
+        "name": "تصویر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftImageInpaintingNode": {
+    "description": "تغییر تصویر بر اساس پرامپت و ماسک.",
+    "display_name": "بازسازی تصویر Recraft",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "mask": {
+        "name": "ماسک"
+      },
+      "n": {
+        "name": "تعداد",
+        "tooltip": "تعداد تصاویر برای تولید."
+      },
+      "negative_prompt": {
+        "name": "پرامپت منفی",
+        "tooltip": "توضیح متنی اختیاری از عناصر نامطلوب در تصویر."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت برای تولید تصویر."
+      },
+      "recraft_style": {
+        "name": "سبک Recraft"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed برای تعیین اینکه node باید دوباره اجرا شود؛ نتایج واقعی صرف‌نظر از seed غیرقطعی هستند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftImageToImageNode": {
+    "description": "تغییر تصویر بر اساس پرامپت و میزان قدرت.",
+    "display_name": "تبدیل تصویر به تصویر Recraft",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "n": {
+        "name": "تعداد",
+        "tooltip": "تعداد تصاویری که باید تولید شوند."
+      },
+      "negative_prompt": {
+        "name": "پرامپت منفی",
+        "tooltip": "توضیح متنی اختیاری برای عناصر نامطلوب در تصویر."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت برای تولید تصویر."
+      },
+      "recraft_controls": {
+        "name": "کنترل‌های Recraft",
+        "tooltip": "کنترل‌های اضافی اختیاری برای تولید از طریق node کنترل‌های Recraft."
+      },
+      "recraft_style": {
+        "name": "سبک Recraft"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed برای تعیین اینکه آیا node باید دوباره اجرا شود؛ نتایج واقعی صرف‌نظر از seed غیرقطعی هستند."
+      },
+      "strength": {
+        "name": "قدرت",
+        "tooltip": "تفاوت با تصویر اصلی را مشخص می‌کند و باید در بازه [۰، ۱] باشد؛ ۰ به معنای تقریباً یکسان و ۱ به معنای شباهت بسیار کم است."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftRemoveBackgroundNode": {
+    "description": "حذف پس‌زمینه از تصویر و بازگرداندن تصویر پردازش‌شده و ماسک.",
+    "display_name": "حذف پس‌زمینه Recraft",
+    "inputs": {
+      "image": {
+        "name": "تصویر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftReplaceBackgroundNode": {
+    "description": "جایگزینی پس‌زمینه تصویر بر اساس پرامپت ارائه‌شده.",
+    "display_name": "جایگزینی پس‌زمینه Recraft",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "n": {
+        "name": "تعداد",
+        "tooltip": "تعداد تصاویری که باید تولید شوند."
+      },
+      "negative_prompt": {
+        "name": "پرامپت منفی",
+        "tooltip": "توضیح متنی اختیاری برای عناصر نامطلوب در تصویر."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت برای تولید تصویر."
+      },
+      "recraft_style": {
+        "name": "سبک Recraft"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed برای تعیین اینکه آیا node باید دوباره اجرا شود؛ نتایج واقعی صرف‌نظر از seed غیرقطعی هستند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftStyleV3DigitalIllustration": {
+    "description": "انتخاب سبک realistic_image و زیرسبک اختیاری.",
+    "display_name": "سبک Recraft - تصویرسازی دیجیتال",
+    "inputs": {
+      "substyle": {
+        "name": "زیرسبک"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "سبک Recraft",
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftStyleV3InfiniteStyleLibrary": {
+    "description": "انتخاب سبک بر اساس UUID موجود از کتابخانه بی‌نهایت سبک Recraft.",
+    "display_name": "سبک Recraft - کتابخانه بی‌نهایت سبک",
+    "inputs": {
+      "style_id": {
+        "name": "شناسه سبک",
+        "tooltip": "UUID سبک از کتابخانه بی‌نهایت سبک."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "سبک Recraft",
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftStyleV3LogoRaster": {
+    "description": "انتخاب سبک realistic_image و زیرسبک اختیاری.",
+    "display_name": "سبک Recraft - رستر لوگو",
+    "inputs": {
+      "substyle": {
+        "name": "زیرسبک"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "سبک Recraft",
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftStyleV3RealisticImage": {
+    "description": "انتخاب سبک realistic_image و زیرسبک اختیاری.",
+    "display_name": "سبک Recraft - تصویر واقع‌گرایانه",
+    "inputs": {
+      "substyle": {
+        "name": "زیرسبک"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "recraft_style",
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftTextToImageNode": {
+    "description": "تولید تصاویر به صورت همزمان بر اساس پرامپت و وضوح تصویر.",
+    "display_name": "تبدیل متن به تصویر Recraft",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "n": {
+        "name": "تعداد",
+        "tooltip": "تعداد تصاویر برای تولید."
+      },
+      "negative_prompt": {
+        "name": "پرامپت منفی",
+        "tooltip": "توضیح متنی اختیاری از عناصر نامطلوب در تصویر."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت برای تولید تصویر."
+      },
+      "recraft_controls": {
+        "name": "recraft_controls",
+        "tooltip": "کنترل‌های اختیاری بیشتر بر تولید از طریق node کنترل Recraft."
+      },
+      "recraft_style": {
+        "name": "recraft_style"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed برای تعیین اینکه node باید دوباره اجرا شود؛ نتایج واقعی صرف‌نظر از seed غیرقطعی هستند."
+      },
+      "size": {
+        "name": "اندازه",
+        "tooltip": "اندازه تصویر تولید شده."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftTextToVectorNode": {
+    "description": "تولید SVG به صورت همزمان بر اساس پرامپت و وضوح تصویر.",
+    "display_name": "تبدیل متن به وکتور Recraft",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "n": {
+        "name": "تعداد",
+        "tooltip": "تعداد تصاویر برای تولید."
+      },
+      "negative_prompt": {
+        "name": "پرامپت منفی",
+        "tooltip": "توضیح متنی اختیاری از عناصر نامطلوب در تصویر."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت برای تولید تصویر."
+      },
+      "recraft_controls": {
+        "name": "recraft_controls",
+        "tooltip": "کنترل‌های اختیاری بیشتر بر تولید از طریق node کنترل Recraft."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed برای تعیین اینکه node باید دوباره اجرا شود؛ نتایج واقعی صرف‌نظر از seed غیرقطعی هستند."
+      },
+      "size": {
+        "name": "اندازه",
+        "tooltip": "اندازه تصویر تولید شده."
+      },
+      "substyle": {
+        "name": "زیرسبک"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftV4TextToImageNode": {
+    "description": "تولید تصویر با استفاده از مدل‌های Recraft V4 یا V4 Pro.",
+    "display_name": "تبدیل متن به تصویر Recraft V4",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "مدل مورد استفاده برای تولید."
+      },
+      "model_size": {
+        "name": "اندازه"
+      },
+      "n": {
+        "name": "تعداد",
+        "tooltip": "تعداد تصاویر تولیدی."
+      },
+      "negative_prompt": {
+        "name": "پرامپت منفی",
+        "tooltip": "توضیح متنی اختیاری برای عناصر نامطلوب در تصویر."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت برای تولید تصویر. حداکثر ۱۰٬۰۰۰ کاراکتر."
+      },
+      "recraft_controls": {
+        "name": "کنترل‌های Recraft",
+        "tooltip": "کنترل‌های اختیاری بیشتر بر تولید از طریق node کنترل‌های Recraft."
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر برای تعیین اجرای مجدد node؛ نتایج واقعی صرف‌نظر از بذر غیرقطعی هستند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftV4TextToVectorNode": {
+    "description": "تولید SVG با استفاده از مدل‌های Recraft V4 یا V4 Pro.",
+    "display_name": "تبدیل متن به وکتور Recraft V4",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "مدل مورد استفاده برای تولید."
+      },
+      "model_size": {
+        "name": "اندازه"
+      },
+      "n": {
+        "name": "تعداد",
+        "tooltip": "تعداد تصاویر تولیدی."
+      },
+      "negative_prompt": {
+        "name": "پرامپت منفی",
+        "tooltip": "توضیح متنی اختیاری برای عناصر نامطلوب در تصویر."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت برای تولید تصویر. حداکثر ۱۰٬۰۰۰ کاراکتر."
+      },
+      "recraft_controls": {
+        "name": "کنترل‌های Recraft",
+        "tooltip": "کنترل‌های اختیاری بیشتر بر تولید از طریق node کنترل‌های Recraft."
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر برای تعیین اجرای مجدد node؛ نتایج واقعی صرف‌نظر از بذر غیرقطعی هستند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftVectorizeImageNode": {
+    "description": "تولید SVG به صورت همزمان از یک تصویر ورودی.",
+    "display_name": "وکتورسازی تصویر Recraft",
+    "inputs": {
+      "image": {
+        "name": "تصویر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ReferenceLatent": {
+    "description": "این node فضای نهفته راهنما را برای مدل ویرایش تنظیم می‌کند. اگر مدل پشتیبانی کند، می‌توانید چندین مورد را برای تنظیم چند تصویر مرجع زنجیره کنید.",
+    "display_name": "ReferenceLatent",
+    "inputs": {
+      "conditioning": {
+        "name": "شرط‌گذاری"
+      },
+      "latent": {
+        "name": "latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ReferenceTimbreAudio": {
+    "description": "این نود صدای مرجع برای timbre را تنظیم می‌کند (برای ace step 1.5)",
+    "display_name": "ReferenceTimbreAudio",
+    "inputs": {
+      "conditioning": {
+        "name": "شرایط‌دهی"
+      },
+      "latent": {
+        "name": "latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RegexExtract": {
+    "display_name": "استخراج با Regex",
+    "inputs": {
+      "case_insensitive": {
+        "name": "بدون حساسیت به حروف"
+      },
+      "dotall": {
+        "name": "dotall"
+      },
+      "group_index": {
+        "name": "شماره گروه"
+      },
+      "mode": {
+        "name": "حالت"
+      },
+      "multiline": {
+        "name": "چندخطی"
+      },
+      "regex_pattern": {
+        "name": "الگوی regex"
+      },
+      "string": {
+        "name": "رشته"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RegexMatch": {
+    "display_name": "تطبیق با Regex",
+    "inputs": {
+      "case_insensitive": {
+        "name": "بدون حساسیت به حروف"
+      },
+      "dotall": {
+        "name": "dotall"
+      },
+      "multiline": {
+        "name": "چندخطی"
+      },
+      "regex_pattern": {
+        "name": "الگوی regex"
+      },
+      "string": {
+        "name": "رشته"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "تطبیق‌ها",
+        "tooltip": null
+      }
+    }
+  },
+  "RegexReplace": {
+    "description": "یافتن و جایگزینی متن با استفاده از الگوهای regex.",
+    "display_name": "جایگزینی با Regex",
+    "inputs": {
+      "case_insensitive": {
+        "name": "بدون حساسیت به حروف"
+      },
+      "count": {
+        "name": "تعداد",
+        "tooltip": "حداکثر تعداد جایگزینی. مقدار ۰ برای جایگزینی همه موارد (پیش‌فرض). مقدار ۱ فقط اولین تطبیق، ۲ برای دو تطبیق اول و غیره."
+      },
+      "dotall": {
+        "name": "dotall",
+        "tooltip": "در صورت فعال بودن، کاراکتر نقطه (.) هر کاراکتری از جمله کاراکترهای خط جدید را تطبیق می‌دهد. در غیر این صورت، نقطه فقط کاراکترهای غیر از خط جدید را تطبیق می‌دهد."
+      },
+      "multiline": {
+        "name": "چندخطی"
+      },
+      "regex_pattern": {
+        "name": "الگوی regex"
+      },
+      "replace": {
+        "name": "جایگزین"
+      },
+      "string": {
+        "name": "رشته"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RenormCFG": {
+    "display_name": "RenormCFG",
+    "inputs": {
+      "cfg_trunc": {
+        "name": "cfg_trunc"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "renorm_cfg": {
+        "name": "renorm_cfg"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RepeatImageBatch": {
+    "display_name": "تکرار دسته تصویر",
+    "inputs": {
+      "amount": {
+        "name": "تعداد"
+      },
+      "image": {
+        "name": "تصویر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RepeatLatentBatch": {
+    "display_name": "تکرار دسته latent",
+    "inputs": {
+      "amount": {
+        "name": "تعداد"
+      },
+      "samples": {
+        "name": "نمونه‌ها"
+      }
+    }
+  },
+  "ReplaceText": {
+    "display_name": "جایگزینی متن",
+    "inputs": {
+      "find": {
+        "name": "یافتن",
+        "tooltip": "متنی که باید پیدا شود."
+      },
+      "replace": {
+        "name": "جایگزین",
+        "tooltip": "متنی که باید جایگزین شود."
+      },
+      "texts": {
+        "name": "متن‌ها",
+        "tooltip": "متنی که باید پردازش شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "متن‌های پردازش‌شده",
+        "tooltip": "متن‌های پردازش‌شده"
+      }
+    }
+  },
+  "ReplaceVideoLatentFrames": {
+    "display_name": "جایگزینی فریم‌های نهفته ویدیو",
+    "inputs": {
+      "destination": {
+        "name": "مقصد",
+        "tooltip": "فضای نهفته مقصد که فریم‌ها در آن جایگزین خواهند شد."
+      },
+      "index": {
+        "name": "اندیس",
+        "tooltip": "اندیس فریم نهفته شروع در فضای نهفته مقصد که فریم‌های فضای نهفته منبع در آن قرار می‌گیرند. مقادیر منفی از انتها شمارش می‌شوند."
+      },
+      "source": {
+        "name": "منبع",
+        "tooltip": "فضای نهفته منبع که فریم‌ها را برای درج در فضای نهفته مقصد فراهم می‌کند. اگر ارائه نشود، فضای نهفته مقصد بدون تغییر بازگردانده می‌شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RescaleCFG": {
+    "display_name": "مقیاس‌دهی CFG",
+    "inputs": {
+      "model": {
+        "name": "مدل"
+      },
+      "multiplier": {
+        "name": "ضریب"
+      }
+    }
+  },
+  "ResizeAndPadImage": {
+    "display_name": "تغییر اندازه و افزودن پد به تصویر",
+    "inputs": {
+      "image": {
+        "name": "تصویر"
+      },
+      "interpolation": {
+        "name": "درون‌یابی"
+      },
+      "padding_color": {
+        "name": "رنگ پد"
+      },
+      "target_height": {
+        "name": "ارتفاع هدف"
+      },
+      "target_width": {
+        "name": "عرض هدف"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ResizeImageMaskNode": {
+    "description": "تغییر اندازه تصویر یا mask با استفاده از روش‌های مختلف مقیاس‌گذاری.",
+    "display_name": "تغییر اندازه تصویر/ماسک",
+    "inputs": {
+      "input": {
+        "name": "ورودی"
+      },
+      "resize_type": {
+        "name": "نوع تغییر اندازه",
+        "tooltip": "نحوه تغییر اندازه را انتخاب کنید: بر اساس ابعاد دقیق، ضریب مقیاس، تطبیق با تصویر دیگر و غیره."
+      },
+      "resize_type_crop": {
+        "name": "برش"
+      },
+      "resize_type_height": {
+        "name": "ارتفاع"
+      },
+      "resize_type_width": {
+        "name": "عرض"
+      },
+      "scale_method": {
+        "name": "روش مقیاس‌دهی",
+        "tooltip": "الگوریتم درون‌یابی. 'area' برای کاهش اندازه بهترین است، 'lanczos' برای افزایش اندازه، و 'nearest-exact' برای هنر پیکسلی مناسب است."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "تغییر اندازه داده شده",
+        "tooltip": null
+      }
+    }
+  },
+  "ResizeImagesByLongerEdge": {
+    "display_name": "تغییر اندازه تصاویر بر اساس ضلع بلندتر",
+    "inputs": {
+      "images": {
+        "name": "تصاویر",
+        "tooltip": "تصویر برای پردازش."
+      },
+      "longer_edge": {
+        "name": "ضلع بلندتر",
+        "tooltip": "طول هدف برای ضلع بلندتر."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "تصاویر",
+        "tooltip": "تصاویر پردازش شده"
+      }
+    }
+  },
+  "ResizeImagesByShorterEdge": {
+    "display_name": "تغییر اندازه تصاویر بر اساس ضلع کوتاه‌تر",
+    "inputs": {
+      "images": {
+        "name": "تصاویر",
+        "tooltip": "تصویر برای پردازش."
+      },
+      "shorter_edge": {
+        "name": "ضلع کوتاه‌تر",
+        "tooltip": "طول هدف برای ضلع کوتاه‌تر."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "تصاویر",
+        "tooltip": "تصاویر پردازش شده"
+      }
+    }
+  },
+  "ResolutionBucket": {
+    "display_name": "دسته‌بندی بر اساس وضوح",
+    "inputs": {
+      "conditioning": {
+        "name": "شرایط‌دهی",
+        "tooltip": "لیست لیست‌های شرایط‌دهی (باید با طول فضاهای نهفته برابر باشد)."
+      },
+      "latents": {
+        "name": "فضاهای نهفته",
+        "tooltip": "لیست دیکشنری‌های نهفته برای دسته‌بندی بر اساس وضوح."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "فضاهای نهفته",
+        "tooltip": "لیست دیکشنری‌های نهفته دسته‌بندی شده، یکی برای هر دسته وضوح."
+      },
+      "1": {
+        "name": "شرایط‌دهی",
+        "tooltip": "لیست لیست‌های شرایط‌دهی، یکی برای هر دسته وضوح."
+      }
+    }
+  },
+  "ResolutionSelector": {
+    "description": "محاسبه عرض و ارتفاع بر اساس نسبت تصویر و هدف مگاپیکسل. مناسب برای تعیین ابعاد تصویر نهفته خالی.",
+    "display_name": "انتخابگر وضوح",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبت تصویر",
+        "tooltip": "نسبت تصویر برای ابعاد خروجی."
+      },
+      "megapixels": {
+        "name": "مگاپیکسل",
+        "tooltip": "هدف مجموع مگاپیکسل‌ها. ۱٫۰ مگاپیکسل ≈ ۱۰۲۴×۱۰۲۴ برای تصویر مربع."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "عرض",
+        "tooltip": "عرض محاسبه‌شده بر حسب پیکسل (مضربی از ۸)."
+      },
+      "1": {
+        "name": "ارتفاع",
+        "tooltip": "ارتفاع محاسبه‌شده بر حسب پیکسل (مضربی از ۸)."
+      }
+    }
+  },
+  "Rodin3D_Detail": {
+    "description": "تولید دارایی‌های سه‌بعدی با استفاده از Rodin API",
+    "display_name": "Rodin 3D Generate - تولید جزئیات",
+    "inputs": {
+      "Images": {
+        "name": "تصاویر"
+      },
+      "Material_Type": {
+        "name": "نوع متریال"
+      },
+      "Polygon_count": {
+        "name": "تعداد پلی‌گان"
+      },
+      "Seed": {
+        "name": "Seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مسیر مدل سه‌بعدی",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "Rodin3D_Gen2": {
+    "description": "تولید دارایی‌های سه‌بعدی با استفاده از Rodin API",
+    "display_name": "Rodin 3D Generate - تولید Gen-2",
+    "inputs": {
+      "Images": {
+        "name": "تصاویر"
+      },
+      "Material_Type": {
+        "name": "نوع متریال"
+      },
+      "Polygon_count": {
+        "name": "تعداد پلی‌گان"
+      },
+      "Seed": {
+        "name": "Seed"
+      },
+      "TAPose": {
+        "name": "TAPose"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مسیر مدل سه‌بعدی",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "Rodin3D_Regular": {
+    "description": "تولید دارایی‌های سه‌بعدی با استفاده از Rodin API",
+    "display_name": "Rodin 3D Generate - تولید معمولی",
+    "inputs": {
+      "Images": {
+        "name": "تصاویر"
+      },
+      "Material_Type": {
+        "name": "نوع متریال"
+      },
+      "Polygon_count": {
+        "name": "تعداد پلی‌گان"
+      },
+      "Seed": {
+        "name": "Seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مسیر مدل سه‌بعدی",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "Rodin3D_Sketch": {
+    "description": "تولید دارایی‌های سه‌بعدی با استفاده از Rodin API",
+    "display_name": "Rodin 3D Generate - تولید اسکچ",
+    "inputs": {
+      "Images": {
+        "name": "تصاویر"
+      },
+      "Seed": {
+        "name": "Seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مسیر مدل سه‌بعدی",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "Rodin3D_Smooth": {
+    "description": "تولید دارایی‌های سه‌بعدی با استفاده از Rodin API",
+    "display_name": "Rodin 3D Generate - تولید صاف",
+    "inputs": {
+      "Images": {
+        "name": "تصاویر"
+      },
+      "Material_Type": {
+        "name": "نوع متریال"
+      },
+      "Polygon_count": {
+        "name": "تعداد پلی‌گان"
+      },
+      "Seed": {
+        "name": "Seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مسیر مدل سه‌بعدی",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "RunwayFirstLastFrameNode": {
+    "description": "اولین و آخرین فریم کلیدی را بارگذاری کنید، یک پرامپت بنویسید و ویدیو تولید کنید. انتقال‌های پیچیده‌تر، مانند زمانی که فریم آخر کاملاً با فریم اول متفاوت است، ممکن است از مدت زمان طولانی‌تر ۱۰ ثانیه‌ای بهره‌مند شوند. این کار به تولید اجازه می‌دهد تا زمان بیشتری برای انتقال روان بین دو ورودی داشته باشد. پیش از شروع، این نکات کلیدی را مرور کنید تا مطمئن شوید انتخاب‌های ورودی شما باعث موفقیت تولید خواهد شد: https://help.runwayml.com/hc/en-us/articles/34170748696595-Creating-with-Keyframes-on-Gen-3.",
+    "display_name": "Runway تبدیل اولین و آخرین فریم به ویدیو",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان"
+      },
+      "end_frame": {
+        "name": "فریم پایان",
+        "tooltip": "فریم پایان برای استفاده در ویدیو. فقط برای gen3a_turbo پشتیبانی می‌شود."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت متنی برای تولید"
+      },
+      "ratio": {
+        "name": "نسبت تصویر"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed تصادفی برای تولید"
+      },
+      "start_frame": {
+        "name": "فریم شروع",
+        "tooltip": "فریم شروع برای استفاده در ویدیو"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RunwayImageToVideoNodeGen3a": {
+    "description": "تولید ویدیو از یک فریم شروع با استفاده از مدل Gen3a Turbo. پیش از شروع، این نکات کلیدی را مرور کنید تا مطمئن شوید انتخاب‌های ورودی شما باعث موفقیت تولید خواهد شد: https://help.runwayml.com/hc/en-us/articles/33927968552339-Creating-with-Act-One-on-Gen-3-Alpha-and-Turbo.",
+    "display_name": "Runway تبدیل تصویر به ویدیو (Gen3a Turbo)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت متنی برای تولید"
+      },
+      "ratio": {
+        "name": "نسبت تصویر"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed تصادفی برای تولید"
+      },
+      "start_frame": {
+        "name": "فریم شروع",
+        "tooltip": "فریم شروع برای استفاده در ویدیو"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RunwayImageToVideoNodeGen4": {
+    "description": "تولید ویدیو از یک فریم شروع با استفاده از مدل Gen4 Turbo. پیش از شروع، این نکات کلیدی را مرور کنید تا مطمئن شوید انتخاب‌های ورودی شما باعث موفقیت تولید خواهد شد: https://help.runwayml.com/hc/en-us/articles/37327109429011-Creating-with-Gen-4-Video.",
+    "display_name": "Runway تبدیل تصویر به ویدیو (Gen4 Turbo)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت متنی برای تولید"
+      },
+      "ratio": {
+        "name": "نسبت تصویر"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed تصادفی برای تولید"
+      },
+      "start_frame": {
+        "name": "فریم شروع",
+        "tooltip": "فریم شروع برای استفاده در ویدیو"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RunwayTextToImageNode": {
+    "description": "تولید تصویر از یک متن ورودی با استفاده از مدل Gen 4 سرویس Runway. همچنین می‌توانید یک تصویر مرجع برای راهنمایی تولید وارد کنید.",
+    "display_name": "تبدیل متن به تصویر Runway",
+    "inputs": {
+      "prompt": {
+        "name": "متن ورودی",
+        "tooltip": "متن راهنما برای تولید تصویر"
+      },
+      "ratio": {
+        "name": "نسبت تصویر"
+      },
+      "reference_image": {
+        "name": "تصویر مرجع",
+        "tooltip": "تصویر مرجع اختیاری برای راهنمایی تولید"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SDPoseDrawKeypoints": {
+    "display_name": "SDPoseDrawKeypoints",
+    "inputs": {
+      "draw_body": {
+        "name": "ترسیم بدن"
+      },
+      "draw_face": {
+        "name": "ترسیم صورت"
+      },
+      "draw_feet": {
+        "name": "ترسیم پاها"
+      },
+      "draw_hands": {
+        "name": "ترسیم دست‌ها"
+      },
+      "face_point_size": {
+        "name": "اندازه نقطه صورت"
+      },
+      "keypoints": {
+        "name": "نقاط کلیدی"
+      },
+      "score_threshold": {
+        "name": "آستانه امتیاز"
+      },
+      "stick_width": {
+        "name": "ضخامت خط"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SDPoseFaceBBoxes": {
+    "display_name": "SDPoseFaceBBoxes",
+    "inputs": {
+      "force_square": {
+        "name": "اجبار به مربع بودن",
+        "tooltip": "محور کوتاه‌تر جعبه مرزی را گسترش می‌دهد تا ناحیه برش همیشه مربع باشد."
+      },
+      "keypoints": {
+        "name": "نقاط کلیدی"
+      },
+      "scale": {
+        "name": "مقیاس",
+        "tooltip": "ضریب بزرگنمایی برای ناحیه جعبه مرزی اطراف هر صورت شناسایی‌شده."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "جعبه‌های مرزی",
+        "tooltip": "جعبه‌های مرزی صورت برای هر فریم، سازگار با ورودی bboxes در SDPoseKeypointExtractor."
+      }
+    }
+  },
+  "SDPoseKeypointExtractor": {
+    "description": "استخراج نقاط کلیدی ژست از تصاویر با استفاده از مدل SDPose: https://huggingface.co/Comfy-Org/SDPose/tree/main/checkpoints",
+    "display_name": "SDPoseKeypointExtractor",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "bboxes": {
+        "name": "جعبه‌های مرزی",
+        "tooltip": "جعبه‌های مرزی اختیاری برای تشخیص دقیق‌تر. برای تشخیص چند نفره الزامی است."
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "نقاط کلیدی",
+        "tooltip": "نقاط کلیدی در قالب قاب OpenPose (عرض بوم، ارتفاع بوم، افراد)"
+      }
+    }
+  },
+  "SDTurboScheduler": {
+    "display_name": "زمان‌بندی SDTurbo",
+    "inputs": {
+      "denoise": {
+        "name": "کاهش نویز"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "steps": {
+        "name": "گام‌ها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SD_4XUpscale_Conditioning": {
+    "display_name": "شرایط بزرگ‌نمایی ۴ برابر SD",
+    "inputs": {
+      "images": {
+        "name": "تصاویر"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "noise_augmentation": {
+        "name": "افزایش نویز"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "scale_ratio": {
+        "name": "نسبت مقیاس"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "SV3D_Conditioning": {
+    "display_name": "شرط‌گذاری SV3D",
+    "inputs": {
+      "clip_vision": {
+        "name": "clip vision"
+      },
+      "elevation": {
+        "name": "ارتفاع زاویه"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "init_image": {
+        "name": "تصویر اولیه"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "video_frames": {
+        "name": "فریم‌های ویدیو"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "SVD_img2vid_Conditioning": {
+    "display_name": "شرط‌گذاری SVD_img2vid",
+    "inputs": {
+      "augmentation_level": {
+        "name": "سطح افزایش داده"
+      },
+      "clip_vision": {
+        "name": "clip vision"
+      },
+      "fps": {
+        "name": "فریم بر ثانیه"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "init_image": {
+        "name": "تصویر اولیه"
+      },
+      "motion_bucket_id": {
+        "name": "شناسه motion bucket"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "video_frames": {
+        "name": "فریم‌های ویدیو"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت"
+      },
+      "1": {
+        "name": "منفی"
+      },
+      "2": {
+        "name": "latent"
+      }
+    }
+  },
+  "SamplerCustom": {
+    "display_name": "SamplerCustom",
+    "inputs": {
+      "add_noise": {
+        "name": "افزودن نویز"
+      },
+      "cfg": {
+        "name": "cfg"
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "latent_image": {
+        "name": "تصویر latent"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "noise_seed": {
+        "name": "بذر نویز"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "sampler": {
+        "name": "نمونه‌گیر"
+      },
+      "sigmas": {
+        "name": "سیگماها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "خروجی",
+        "tooltip": null
+      },
+      "1": {
+        "name": "خروجی بدون نویز",
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerCustomAdvanced": {
+    "display_name": "SamplerCustomAdvanced",
+    "inputs": {
+      "guider": {
+        "name": "راهنما"
+      },
+      "latent_image": {
+        "name": "تصویر latent"
+      },
+      "noise": {
+        "name": "نویز"
+      },
+      "sampler": {
+        "name": "نمونه‌گیر"
+      },
+      "sigmas": {
+        "name": "سیگماها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "خروجی",
+        "tooltip": null
+      },
+      "1": {
+        "name": "خروجی بدون نویز",
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerDPMAdaptative": {
+    "display_name": "SamplerDPMAdaptative",
+    "inputs": {
+      "accept_safety": {
+        "name": "تأیید ایمنی"
+      },
+      "atol": {
+        "name": "atol"
+      },
+      "dcoeff": {
+        "name": "dcoeff"
+      },
+      "eta": {
+        "name": "eta"
+      },
+      "h_init": {
+        "name": "h_init"
+      },
+      "icoeff": {
+        "name": "icoeff"
+      },
+      "order": {
+        "name": "ترتیب"
+      },
+      "pcoeff": {
+        "name": "pcoeff"
+      },
+      "rtol": {
+        "name": "rtol"
+      },
+      "s_noise": {
+        "name": "s_noise"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerDPMPP_2M_SDE": {
+    "display_name": "SamplerDPMPP_2M_SDE",
+    "inputs": {
+      "eta": {
+        "name": "eta"
+      },
+      "noise_device": {
+        "name": "دستگاه نویز"
+      },
+      "s_noise": {
+        "name": "s_noise"
+      },
+      "solver_type": {
+        "name": "نوع حل‌گر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerDPMPP_2S_Ancestral": {
+    "display_name": "SamplerDPMPP_2S_Ancestral",
+    "inputs": {
+      "eta": {
+        "name": "eta"
+      },
+      "s_noise": {
+        "name": "s_noise"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerDPMPP_3M_SDE": {
+    "display_name": "SamplerDPMPP_3M_SDE",
+    "inputs": {
+      "eta": {
+        "name": "اتا"
+      },
+      "noise_device": {
+        "name": "noise_device"
+      },
+      "s_noise": {
+        "name": "s_noise"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerDPMPP_SDE": {
+    "display_name": "SamplerDPMPP_SDE",
+    "inputs": {
+      "eta": {
+        "name": "اتا"
+      },
+      "noise_device": {
+        "name": "noise_device"
+      },
+      "r": {
+        "name": "r"
+      },
+      "s_noise": {
+        "name": "s_noise"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerER_SDE": {
+    "display_name": "SamplerER_SDE",
+    "inputs": {
+      "eta": {
+        "name": "اتا",
+        "tooltip": "قدرت تصادفی معادله دیفرانسیل تصادفی معکوس زمان.\nوقتی اتا=۰ باشد، به معادله دیفرانسیل معمولی قطعی تبدیل می‌شود. این تنظیم برای نوع حل‌کننده ER-SDE اعمال نمی‌شود."
+      },
+      "max_stage": {
+        "name": "بیشترین مرحله"
+      },
+      "s_noise": {
+        "name": "s_noise"
+      },
+      "solver_type": {
+        "name": "نوع حل‌کننده"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerEulerAncestral": {
+    "display_name": "SamplerEulerAncestral",
+    "inputs": {
+      "eta": {
+        "name": "اتا"
+      },
+      "s_noise": {
+        "name": "s_noise"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerEulerAncestralCFGPP": {
+    "display_name": "SamplerEulerAncestralCFG++",
+    "inputs": {
+      "eta": {
+        "name": "اتا"
+      },
+      "s_noise": {
+        "name": "s_noise"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerEulerCFGpp": {
+    "display_name": "SamplerEulerCFG++",
+    "inputs": {
+      "version": {
+        "name": "نسخه"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerLCMUpscale": {
+    "display_name": "SamplerLCMUpscale",
+    "inputs": {
+      "scale_ratio": {
+        "name": "نسبت بزرگ‌نمایی"
+      },
+      "scale_steps": {
+        "name": "گام‌های بزرگ‌نمایی"
+      },
+      "upscale_method": {
+        "name": "روش بزرگ‌نمایی"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerLMS": {
+    "display_name": "SamplerLMS",
+    "inputs": {
+      "order": {
+        "name": "ترتیب"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerSASolver": {
+    "display_name": "SamplerSASolver",
+    "inputs": {
+      "corrector_order": {
+        "name": "ترتیب تصحیح‌کننده"
+      },
+      "eta": {
+        "name": "اتا"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "predictor_order": {
+        "name": "ترتیب پیش‌بینی‌کننده"
+      },
+      "s_noise": {
+        "name": "s_noise"
+      },
+      "sde_end_percent": {
+        "name": "درصد پایان SDE"
+      },
+      "sde_start_percent": {
+        "name": "درصد شروع SDE"
+      },
+      "simple_order_2": {
+        "name": "ترتیب ساده ۲"
+      },
+      "use_pece": {
+        "name": "استفاده از PECE"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerSEEDS2": {
+    "description": "این نود نمونه‌بردار می‌تواند چندین نمونه‌بردار را نمایش دهد:\n\nseeds_2\n- تنظیمات پیش‌فرض\n\nexp_heun_2_x0\n- solver_type=phi_2، r=۱.۰، eta=۰.۰\n\nexp_heun_2_x0_sde\n- solver_type=phi_2، r=۱.۰، eta=۱.۰، s_noise=۱.۰",
+    "display_name": "SamplerSEEDS2",
+    "inputs": {
+      "eta": {
+        "name": "eta",
+        "tooltip": "قدرت تصادفی"
+      },
+      "r": {
+        "name": "r",
+        "tooltip": "اندازه گام نسبی برای مرحله میانی (گره c2)"
+      },
+      "s_noise": {
+        "name": "s_noise",
+        "tooltip": "ضریب نویز SDE"
+      },
+      "solver_type": {
+        "name": "solver_type"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplingPercentToSigma": {
+    "display_name": "SamplingPercentToSigma",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "return_actual_sigma": {
+        "name": "return_actual_sigma",
+        "tooltip": "مقدار واقعی سیگما را به جای مقداری که برای بررسی بازه استفاده می‌شود بازگرداند.\nاین فقط بر نتایج در ۰.۰ و ۱.۰ تأثیر می‌گذارد."
+      },
+      "sampling_percent": {
+        "name": "sampling_percent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "sigma_value",
+        "tooltip": null
+      }
+    }
+  },
+  "SaveAnimatedPNG": {
+    "display_name": "ذخیره PNG متحرک",
+    "inputs": {
+      "compress_level": {
+        "name": "compress_level"
+      },
+      "filename_prefix": {
+        "name": "filename_prefix"
+      },
+      "fps": {
+        "name": "fps"
+      },
+      "images": {
+        "name": "images"
+      }
+    }
+  },
+  "SaveAnimatedWEBP": {
+    "display_name": "ذخیره WEBP متحرک",
+    "inputs": {
+      "filename_prefix": {
+        "name": "filename_prefix"
+      },
+      "fps": {
+        "name": "fps"
+      },
+      "images": {
+        "name": "images"
+      },
+      "lossless": {
+        "name": "lossless"
+      },
+      "method": {
+        "name": "method"
+      },
+      "quality": {
+        "name": "quality"
+      }
+    }
+  },
+  "SaveAudio": {
+    "display_name": "ذخیره صدا (FLAC)",
+    "inputs": {
+      "audio": {
+        "name": "audio"
+      },
+      "audioUI": {
+        "name": "audioUI"
+      },
+      "filename_prefix": {
+        "name": "filename_prefix"
+      }
+    }
+  },
+  "SaveAudioMP3": {
+    "display_name": "ذخیره صدا (MP3)",
+    "inputs": {
+      "audio": {
+        "name": "audio"
+      },
+      "audioUI": {
+        "name": "audioUI"
+      },
+      "filename_prefix": {
+        "name": "filename_prefix"
+      },
+      "quality": {
+        "name": "quality"
+      }
+    }
+  },
+  "SaveAudioOpus": {
+    "display_name": "ذخیره صدا (Opus)",
+    "inputs": {
+      "audio": {
+        "name": "audio"
+      },
+      "audioUI": {
+        "name": "audioUI"
+      },
+      "filename_prefix": {
+        "name": "filename_prefix"
+      },
+      "quality": {
+        "name": "quality"
+      }
+    }
+  },
+  "SaveGLB": {
+    "display_name": "ذخیره GLB",
+    "inputs": {
+      "filename_prefix": {
+        "name": "filename_prefix"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "mesh": {
+        "name": "mesh",
+        "tooltip": "مش یا فایل GLB برای ذخیره"
+      }
+    }
+  },
+  "SaveImage": {
+    "description": "تصاویر ورودی را در پوشه خروجی ComfyUI شما ذخیره می‌کند.",
+    "display_name": "ذخیره تصویر",
+    "inputs": {
+      "filename_prefix": {
+        "name": "پیشوند نام فایل",
+        "tooltip": "پیشوند فایل ذخیره‌شونده. این می‌تواند شامل اطلاعات قالب‌بندی مانند ‎%date:yyyy-MM-dd%‎ یا ‎%Empty Latent Image.width%‎ برای درج مقادیر از nodeها باشد."
+      },
+      "images": {
+        "name": "تصاویر",
+        "tooltip": "تصاویری که باید ذخیره شوند."
+      }
+    }
+  },
+  "SaveImageDataSetToFolder": {
+    "display_name": "ذخیره مجموعه تصاویر در پوشه",
+    "inputs": {
+      "filename_prefix": {
+        "name": "پیشوند نام فایل تصویر",
+        "tooltip": "پیشوند برای نام فایل‌های ذخیره‌شده تصویر."
+      },
+      "folder_name": {
+        "name": "نام پوشه",
+        "tooltip": "نام پوشه‌ای که تصاویر در آن ذخیره می‌شوند (درون پوشه خروجی)."
+      },
+      "images": {
+        "name": "تصاویر",
+        "tooltip": "فهرست تصاویر برای ذخیره."
+      }
+    }
+  },
+  "SaveImageTextDataSetToFolder": {
+    "display_name": "ذخیره مجموعه تصویر و متن در پوشه",
+    "inputs": {
+      "filename_prefix": {
+        "name": "پیشوند نام فایل تصویر",
+        "tooltip": "پیشوند برای نام فایل‌های ذخیره‌شده تصویر."
+      },
+      "folder_name": {
+        "name": "نام پوشه",
+        "tooltip": "نام پوشه‌ای که تصاویر در آن ذخیره می‌شوند (درون پوشه خروجی)."
+      },
+      "images": {
+        "name": "تصاویر",
+        "tooltip": "فهرست تصاویر برای ذخیره."
+      },
+      "texts": {
+        "name": "متون",
+        "tooltip": "فهرست کپشن‌های متنی برای ذخیره."
+      }
+    }
+  },
+  "SaveImageWebsocket": {
+    "display_name": "SaveImageWebsocket",
+    "inputs": {
+      "images": {
+        "name": "تصاویر"
+      }
+    }
+  },
+  "SaveLatent": {
+    "display_name": "ذخیره Latent",
+    "inputs": {
+      "filename_prefix": {
+        "name": "پیشوند نام فایل"
+      },
+      "samples": {
+        "name": "نمونه‌ها"
+      }
+    }
+  },
+  "SaveLoRA": {
+    "display_name": "ذخیره وزن‌های LoRA",
+    "inputs": {
+      "lora": {
+        "name": "LoRA",
+        "tooltip": "مدل LoRA برای ذخیره. از مدل با لایه‌های LoRA استفاده نکنید."
+      },
+      "prefix": {
+        "name": "پیشوند",
+        "tooltip": "پیشوند مورد استفاده برای فایل ذخیره‌شده LoRA."
+      },
+      "steps": {
+        "name": "گام‌ها",
+        "tooltip": "اختیاری: تعداد گام‌هایی که LoRA آموزش دیده است، برای نام‌گذاری فایل ذخیره‌شده استفاده می‌شود."
+      }
+    }
+  },
+  "SaveSVGNode": {
+    "description": "فایل‌های SVG را روی دیسک ذخیره کنید.",
+    "display_name": "ذخیره SVG Node",
+    "inputs": {
+      "filename_prefix": {
+        "name": "پیشوند نام فایل",
+        "tooltip": "پیشوند فایل ذخیره‌شونده. این می‌تواند شامل اطلاعات قالب‌بندی مانند ‎%date:yyyy-MM-dd%‎ یا ‎%Empty Latent Image.width%‎ برای درج مقادیر از nodeها باشد."
+      },
+      "svg": {
+        "name": "SVG"
+      }
+    }
+  },
+  "SaveTrainingDataset": {
+    "display_name": "ذخیره مجموعه داده آموزشی",
+    "inputs": {
+      "conditioning": {
+        "name": "شرایط‌دهی",
+        "tooltip": "فهرست لیست‌های conditioning از MakeTrainingDataset."
+      },
+      "folder_name": {
+        "name": "نام پوشه",
+        "tooltip": "نام پوشه برای ذخیره مجموعه داده (درون پوشه خروجی)."
+      },
+      "latents": {
+        "name": "latents",
+        "tooltip": "فهرست دیکشنری‌های latent از MakeTrainingDataset."
+      },
+      "shard_size": {
+        "name": "اندازه shard",
+        "tooltip": "تعداد نمونه‌ها در هر فایل shard."
+      }
+    }
+  },
+  "SaveVideo": {
+    "description": "تصاویر ورودی را در پوشه خروجی ComfyUI شما ذخیره می‌کند.",
+    "display_name": "ذخیره ویدیو",
+    "inputs": {
+      "codec": {
+        "name": "کدک",
+        "tooltip": "کدک مورد استفاده برای ویدیو."
+      },
+      "filename_prefix": {
+        "name": "پیشوند نام فایل",
+        "tooltip": "پیشوند فایل برای ذخیره. این می‌تواند شامل اطلاعات قالب‌بندی مانند ‎%date:yyyy-MM-dd%‎ یا ‎%Empty Latent Image.width%‎ برای درج مقادیر از nodeها باشد."
+      },
+      "format": {
+        "name": "فرمت",
+        "tooltip": "فرمت ذخیره‌سازی ویدیو."
+      },
+      "video": {
+        "name": "ویدیو",
+        "tooltip": "ویدیویی که باید ذخیره شود."
+      }
+    }
+  },
+  "SaveWEBM": {
+    "display_name": "ذخیره WEBM",
+    "inputs": {
+      "codec": {
+        "name": "کدک"
+      },
+      "crf": {
+        "name": "CRF",
+        "tooltip": "CRF بالاتر به معنای کیفیت پایین‌تر و حجم فایل کمتر است، CRF پایین‌تر به معنای کیفیت بالاتر و حجم فایل بیشتر است."
+      },
+      "filename_prefix": {
+        "name": "پیشوند نام فایل"
+      },
+      "fps": {
+        "name": "فریم بر ثانیه"
+      },
+      "images": {
+        "name": "تصاویر"
+      }
+    }
+  },
+  "ScaleROPE": {
+    "description": "مقیاس و جابجایی ROPE مدل را تنظیم می‌کند.",
+    "display_name": "مقیاس‌بندی ROPE",
+    "inputs": {
+      "model": {
+        "name": "مدل"
+      },
+      "scale_t": {
+        "name": "مقیاس T"
+      },
+      "scale_x": {
+        "name": "مقیاس X"
+      },
+      "scale_y": {
+        "name": "مقیاس Y"
+      },
+      "shift_t": {
+        "name": "جابجایی T"
+      },
+      "shift_x": {
+        "name": "جابجایی X"
+      },
+      "shift_y": {
+        "name": "جابجایی Y"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SelfAttentionGuidance": {
+    "display_name": "راهنمایی Self-Attention",
+    "inputs": {
+      "blur_sigma": {
+        "name": "سیگمای تاری"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "scale": {
+        "name": "مقیاس"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SetClipHooks": {
+    "display_name": "تنظیم Hookهای CLIP",
+    "inputs": {
+      "apply_to_conds": {
+        "name": "اعمال به شرایط"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "hooks": {
+        "name": "hookها"
+      },
+      "schedule_clip": {
+        "name": "زمان‌بندی clip"
+      }
+    }
+  },
+  "SetFirstSigma": {
+    "display_name": "تنظیم سیگما اول",
+    "inputs": {
+      "sigma": {
+        "name": "سیگما"
+      },
+      "sigmas": {
+        "name": "سیگماها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SetHookKeyframes": {
+    "display_name": "تنظیم کلیدفریم‌های Hook",
+    "inputs": {
+      "hook_kf": {
+        "name": "کلیدفریم هوک"
+      },
+      "hooks": {
+        "name": "هوک‌ها"
+      }
+    }
+  },
+  "SetLatentNoiseMask": {
+    "display_name": "تنظیم ماسک نویز latent",
+    "inputs": {
+      "mask": {
+        "name": "ماسک"
+      },
+      "samples": {
+        "name": "نمونه‌ها"
+      }
+    }
+  },
+  "SetUnionControlNetType": {
+    "display_name": "تنظیم نوع Union ControlNet",
+    "inputs": {
+      "control_net": {
+        "name": "control_net"
+      },
+      "type": {
+        "name": "نوع"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ShuffleDataset": {
+    "display_name": "درهم‌ریختن دیتاست تصویر",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "images": {
+        "name": "تصاویر",
+        "tooltip": "فهرست تصاویر برای پردازش."
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر تصادفی."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "تصاویر",
+        "tooltip": "تصاویر پردازش‌شده"
+      }
+    }
+  },
+  "ShuffleImageTextDataset": {
+    "display_name": "درهم‌ریختن دیتاست تصویر-متن",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "images": {
+        "name": "تصاویر",
+        "tooltip": "فهرست تصاویر برای درهم‌ریختن."
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر تصادفی."
+      },
+      "texts": {
+        "name": "متن‌ها",
+        "tooltip": "فهرست متن‌ها برای درهم‌ریختن."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "تصاویر",
+        "tooltip": "تصاویر درهم‌ریخته"
+      },
+      "1": {
+        "name": "متن‌ها",
+        "tooltip": "متن‌های درهم‌ریخته"
+      }
+    }
+  },
+  "SkipLayerGuidanceDiT": {
+    "description": "نسخه عمومی نود SkipLayerGuidance که می‌تواند روی هر مدل DiT استفاده شود.",
+    "display_name": "SkipLayerGuidanceDiT",
+    "inputs": {
+      "double_layers": {
+        "name": "لایه‌های دوگانه"
+      },
+      "end_percent": {
+        "name": "درصد پایان"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "rescaling_scale": {
+        "name": "مقیاس بازتنظیم"
+      },
+      "scale": {
+        "name": "مقیاس"
+      },
+      "single_layers": {
+        "name": "لایه‌های تکی"
+      },
+      "start_percent": {
+        "name": "درصد شروع"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SkipLayerGuidanceDiTSimple": {
+    "description": "نسخه ساده نود SkipLayerGuidanceDiT که فقط عبور uncond را تغییر می‌دهد.",
+    "display_name": "SkipLayerGuidanceDiTSimple",
+    "inputs": {
+      "double_layers": {
+        "name": "لایه‌های دوگانه"
+      },
+      "end_percent": {
+        "name": "درصد پایان"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "single_layers": {
+        "name": "لایه‌های تکی"
+      },
+      "start_percent": {
+        "name": "درصد شروع"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SkipLayerGuidanceSD3": {
+    "description": "نسخه عمومی گره SkipLayerGuidance که می‌تواند برای هر مدل DiT استفاده شود.",
+    "display_name": "SkipLayerGuidanceSD3",
+    "inputs": {
+      "end_percent": {
+        "name": "درصد پایان"
+      },
+      "layers": {
+        "name": "لایه‌ها"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "scale": {
+        "name": "مقیاس"
+      },
+      "start_percent": {
+        "name": "درصد شروع"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SolidMask": {
+    "display_name": "SolidMask",
+    "inputs": {
+      "height": {
+        "name": "ارتفاع"
+      },
+      "value": {
+        "name": "مقدار"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SplitAudioChannels": {
+    "description": "صدا را به کانال‌های چپ و راست جدا می‌کند.",
+    "display_name": "تقسیم کانال‌های صوتی",
+    "inputs": {
+      "audio": {
+        "name": "صدا"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "چپ",
+        "tooltip": null
+      },
+      "1": {
+        "name": "راست",
+        "tooltip": null
+      }
+    }
+  },
+  "SplitImageToTileList": {
+    "description": "یک تصویر را به فهرستی دسته‌ای از کاشی‌ها با همپوشانی مشخص تقسیم می‌کند.",
+    "display_name": "تقسیم تصویر به فهرست کاشی‌ها",
+    "inputs": {
+      "image": {
+        "name": "image"
+      },
+      "overlap": {
+        "name": "overlap"
+      },
+      "tile_height": {
+        "name": "tile_height"
+      },
+      "tile_width": {
+        "name": "tile_width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SplitImageWithAlpha": {
+    "display_name": "تقسیم تصویر با آلفا",
+    "inputs": {
+      "image": {
+        "name": "تصویر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
+  "SplitSigmas": {
+    "display_name": "SplitSigmas",
+    "inputs": {
+      "sigmas": {
+        "name": "سیگماها"
+      },
+      "step": {
+        "name": "گام"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "سیگماهای بالا",
+        "tooltip": null
+      },
+      "1": {
+        "name": "سیگماهای پایین",
+        "tooltip": null
+      }
+    }
+  },
+  "SplitSigmasDenoise": {
+    "display_name": "SplitSigmasDenoise",
+    "inputs": {
+      "denoise": {
+        "name": "کاهش نویز"
+      },
+      "sigmas": {
+        "name": "سیگماها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "سیگماهای بالا",
+        "tooltip": null
+      },
+      "1": {
+        "name": "سیگماهای پایین",
+        "tooltip": null
+      }
+    }
+  },
+  "StabilityAudioInpaint": {
+    "description": "بخشی از نمونه صوتی موجود را با استفاده از دستور متنی تغییر می‌دهد.",
+    "display_name": "تکمیل صوتی Stability AI",
+    "inputs": {
+      "audio": {
+        "name": "صدا",
+        "tooltip": "صدا باید بین ۶ تا ۱۹۰ ثانیه باشد."
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان",
+        "tooltip": "مدت زمان تولید شده به ثانیه را کنترل می‌کند."
+      },
+      "mask_end": {
+        "name": "پایان ماسک"
+      },
+      "mask_start": {
+        "name": "شروع ماسک"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "prompt": {
+        "name": "دستور"
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر تصادفی مورد استفاده برای تولید."
+      },
+      "steps": {
+        "name": "گام‌ها",
+        "tooltip": "تعداد مراحل نمونه‌برداری را کنترل می‌کند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StabilityAudioToAudio": {
+    "description": "نمونه‌های صوتی موجود را با استفاده از دستورهای متنی به ترکیب‌های جدید و باکیفیت تبدیل می‌کند.",
+    "display_name": "Stability AI Audio To Audio",
+    "inputs": {
+      "audio": {
+        "name": "صوت",
+        "tooltip": "فایل صوتی باید بین ۶ تا ۱۹۰ ثانیه باشد."
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان",
+        "tooltip": "مدت زمان (بر حسب ثانیه) صوت تولید شده را کنترل می‌کند."
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "prompt": {
+        "name": "پرامپت"
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر تصادفی مورد استفاده برای تولید."
+      },
+      "steps": {
+        "name": "گام‌ها",
+        "tooltip": "تعداد گام‌های نمونه‌برداری را کنترل می‌کند."
+      },
+      "strength": {
+        "name": "شدت",
+        "tooltip": "این پارامتر میزان تأثیر پارامتر صوت را بر صوت تولید شده کنترل می‌کند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StabilityStableImageSD_3_5Node": {
+    "description": "تصاویر را به صورت همزمان بر اساس پرامپت و وضوح تصویر تولید می‌کند.",
+    "display_name": "Stability AI Stable Diffusion 3.5 Image",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبت تصویر",
+        "tooltip": "نسبت تصویر تولید شده."
+      },
+      "cfg_scale": {
+        "name": "مقیاس cfg",
+        "tooltip": "میزان پایبندی فرآیند diffusion به متن پرامپت (مقادیر بالاتر تصویر را به پرامپت نزدیک‌تر نگه می‌دارد)"
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "image_denoise": {
+        "name": "کاهش نویز تصویر",
+        "tooltip": "کاهش نویز تصویر ورودی؛ مقدار ۰.۰ تصویری مشابه ورودی ایجاد می‌کند و مقدار ۱.۰ به منزله عدم وجود تصویر ورودی است."
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "negative_prompt": {
+        "name": "پرامپت منفی",
+        "tooltip": "کلمات کلیدی برای مواردی که نمی‌خواهید در تصویر خروجی مشاهده شوند. این یک ویژگی پیشرفته است."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "آنچه می‌خواهید در تصویر خروجی مشاهده کنید. یک پرامپت قوی و توصیفی که عناصر، رنگ‌ها و موضوعات را به وضوح تعریف کند، نتایج بهتری به همراه خواهد داشت."
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر تصادفی مورد استفاده برای ایجاد نویز."
+      },
+      "style_preset": {
+        "name": "پیش‌تنظیم سبک",
+        "tooltip": "سبک دلخواه (اختیاری) برای تصویر تولید شده."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StabilityStableImageUltraNode": {
+    "description": "تولید تصویر به صورت همزمان بر اساس پرامپت و وضوح تصویر.",
+    "display_name": "Stability AI Stable Image Ultra",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبت تصویر",
+        "tooltip": "نسبت تصویر تولید شده."
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "image_denoise": {
+        "name": "کاهش نویز تصویر",
+        "tooltip": "کاهش نویز تصویر ورودی؛ مقدار ۰.۰ تصویری مشابه ورودی ایجاد می‌کند و مقدار ۱.۰ به منزله عدم وجود تصویر ورودی است."
+      },
+      "negative_prompt": {
+        "name": "پرامپت منفی",
+        "tooltip": "توضیحی کوتاه درباره آنچه نمی‌خواهید در تصویر خروجی مشاهده کنید. این یک ویژگی پیشرفته است."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "آنچه می‌خواهید در تصویر خروجی مشاهده کنید. یک پرامپت قوی و توصیفی که عناصر، رنگ‌ها و موضوعات را به وضوح مشخص کند، نتایج بهتری به همراه خواهد داشت. برای کنترل وزن یک واژه از فرمت `(واژه:وزن)` استفاده کنید، که در آن `واژه` همان واژه مورد نظر و `وزن` مقداری بین ۰ تا ۱ است. برای مثال: `آسمان (آبی:۰.۳) و (سبز:۰.۸)` نشان‌دهنده آسمانی است که هم آبی و هم سبز است، اما سبز بیشتر از آبی است."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed تصادفی مورد استفاده برای ایجاد نویز."
+      },
+      "style_preset": {
+        "name": "پیش‌تنظیم سبک",
+        "tooltip": "سبک دلخواه (اختیاری) برای تصویر تولید شده."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StabilityTextToAudio": {
+    "description": "تولید موسیقی و افکت صوتی با کیفیت بالا از توضیحات متنی.",
+    "display_name": "Stability AI Text To Audio",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان",
+        "tooltip": "مدت زمان (بر حسب ثانیه) صدای تولید شده را کنترل می‌کند."
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "prompt": {
+        "name": "پرامپت"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed تصادفی مورد استفاده برای تولید."
+      },
+      "steps": {
+        "name": "گام‌ها",
+        "tooltip": "تعداد گام‌های نمونه‌برداری را کنترل می‌کند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StabilityUpscaleConservativeNode": {
+    "description": "بزرگ‌نمایی تصویر با کمترین تغییرات تا وضوح 4K.",
+    "display_name": "Stability AI Upscale Conservative",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "creativity": {
+        "name": "خلاقیت",
+        "tooltip": "احتمال ایجاد جزئیات اضافی که به شدت توسط تصویر اولیه تعیین نشده‌اند را کنترل می‌کند."
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "negative_prompt": {
+        "name": "پرامپت منفی",
+        "tooltip": "کلمات کلیدی برای آنچه نمی‌خواهید در تصویر خروجی مشاهده کنید. این یک ویژگی پیشرفته است."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "آنچه می‌خواهید در تصویر خروجی مشاهده کنید. یک پرامپت قوی و توصیفی که عناصر، رنگ‌ها و موضوعات را به وضوح مشخص کند، نتایج بهتری به همراه خواهد داشت."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed تصادفی مورد استفاده برای ایجاد نویز."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StabilityUpscaleCreativeNode": {
+    "description": "بزرگ‌نمایی تصویر با کمترین تغییرات تا وضوح ۴K.",
+    "display_name": "Stability AI Upscale Creative",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "creativity": {
+        "name": "خلاقیت",
+        "tooltip": "احتمال ایجاد جزئیات اضافی که به تصویر اولیه وابسته نیستند را کنترل می‌کند."
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "negative_prompt": {
+        "name": "پرامپت منفی",
+        "tooltip": "کلمات کلیدی برای مواردی که نمی‌خواهید در تصویر خروجی مشاهده شوند. این یک ویژگی پیشرفته است."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "آنچه می‌خواهید در تصویر خروجی مشاهده کنید. یک پرامپت قوی و توصیفی که عناصر، رنگ‌ها و موضوعات را به‌وضوح تعریف کند، نتایج بهتری به همراه خواهد داشت."
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر تصادفی مورد استفاده برای ایجاد نویز."
+      },
+      "style_preset": {
+        "name": "پیش‌تنظیم سبک",
+        "tooltip": "سبک دلخواه (اختیاری) برای تصویر تولیدشده."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StabilityUpscaleFastNode": {
+    "description": "بزرگ‌نمایی سریع تصویر از طریق API استبیلیتی تا ۴ برابر اندازه اصلی؛ مناسب برای بزرگ‌نمایی تصاویر کم‌کیفیت یا فشرده‌شده.",
+    "display_name": "Stability AI Upscale Fast",
+    "inputs": {
+      "image": {
+        "name": "تصویر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StableCascade_EmptyLatentImage": {
+    "display_name": "StableCascade_EmptyLatentImage",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه بچ"
+      },
+      "compression": {
+        "name": "فشرده‌سازی"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "stage_c",
+        "tooltip": null
+      },
+      "1": {
+        "name": "stage_b",
+        "tooltip": null
+      }
+    }
+  },
+  "StableCascade_StageB_Conditioning": {
+    "display_name": "StableCascade_StageB_Conditioning",
+    "inputs": {
+      "conditioning": {
+        "name": "شرط‌گذاری"
+      },
+      "stage_c": {
+        "name": "stage_c"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StableCascade_StageC_VAEEncode": {
+    "display_name": "StableCascade_StageC_VAEEncode",
+    "inputs": {
+      "compression": {
+        "name": "فشرده‌سازی"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "stage_c",
+        "tooltip": null
+      },
+      "1": {
+        "name": "stage_b",
+        "tooltip": null
+      }
+    }
+  },
+  "StableCascade_SuperResolutionControlnet": {
+    "display_name": "StableCascade_SuperResolutionControlnet",
+    "inputs": {
+      "image": {
+        "name": "تصویر"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "controlnet_input",
+        "tooltip": null
+      },
+      "1": {
+        "name": "stage_c",
+        "tooltip": null
+      },
+      "2": {
+        "name": "stage_b",
+        "tooltip": null
+      }
+    }
+  },
+  "StableZero123_Conditioning": {
+    "display_name": "StableZero123_Conditioning",
+    "inputs": {
+      "azimuth": {
+        "name": "زاویه سمت"
+      },
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "clip_vision": {
+        "name": "clip_vision"
+      },
+      "elevation": {
+        "name": "زاویه ارتفاع"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "init_image": {
+        "name": "تصویر اولیه"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "StableZero123_Conditioning_Batched": {
+    "display_name": "StableZero123_Conditioning_Batched",
+    "inputs": {
+      "azimuth": {
+        "name": "زاویه سمت"
+      },
+      "azimuth_batch_increment": {
+        "name": "افزایش دسته‌ای سمت"
+      },
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "clip_vision": {
+        "name": "clip_vision"
+      },
+      "elevation": {
+        "name": "زاویه ارتفاع"
+      },
+      "elevation_batch_increment": {
+        "name": "افزایش دسته‌ای ارتفاع"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "init_image": {
+        "name": "تصویر اولیه"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "StringCompare": {
+    "display_name": "مقایسه",
+    "inputs": {
+      "case_sensitive": {
+        "name": "حساس به حروف بزرگ و کوچک"
+      },
+      "mode": {
+        "name": "حالت"
+      },
+      "string_a": {
+        "name": "رشته الف"
+      },
+      "string_b": {
+        "name": "رشته ب"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StringConcatenate": {
+    "display_name": "ادغام",
+    "inputs": {
+      "delimiter": {
+        "name": "جداکننده"
+      },
+      "string_a": {
+        "name": "رشته الف"
+      },
+      "string_b": {
+        "name": "رشته ب"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StringContains": {
+    "display_name": "شامل بودن",
+    "inputs": {
+      "case_sensitive": {
+        "name": "حساس به حروف بزرگ و کوچک"
+      },
+      "string": {
+        "name": "رشته"
+      },
+      "substring": {
+        "name": "زیررشته"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "شامل",
+        "tooltip": null
+      }
+    }
+  },
+  "StringLength": {
+    "display_name": "طول",
+    "inputs": {
+      "string": {
+        "name": "رشته"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "طول",
+        "tooltip": null
+      }
+    }
+  },
+  "StringReplace": {
+    "display_name": "جایگزینی",
+    "inputs": {
+      "find": {
+        "name": "یافتن"
+      },
+      "replace": {
+        "name": "جایگزین"
+      },
+      "string": {
+        "name": "رشته"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StringSubstring": {
+    "display_name": "زیررشته",
+    "inputs": {
+      "end": {
+        "name": "پایان"
+      },
+      "start": {
+        "name": "شروع"
+      },
+      "string": {
+        "name": "رشته"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StringTrim": {
+    "display_name": "حذف فاصله",
+    "inputs": {
+      "mode": {
+        "name": "حالت"
+      },
+      "string": {
+        "name": "رشته"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StripWhitespace": {
+    "display_name": "حذف فاصله‌های اضافی",
+    "inputs": {
+      "texts": {
+        "name": "متن‌ها",
+        "tooltip": "متنی که باید پردازش شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "متن‌های پردازش‌شده",
+        "tooltip": "متن‌های پردازش‌شده"
+      }
+    }
+  },
+  "StyleModelApply": {
+    "display_name": "اعمال مدل سبک",
+    "inputs": {
+      "clip_vision_output": {
+        "name": "خروجی clip vision"
+      },
+      "conditioning": {
+        "name": "شرط‌گذاری"
+      },
+      "strength": {
+        "name": "شدت"
+      },
+      "strength_type": {
+        "name": "نوع شدت"
+      },
+      "style_model": {
+        "name": "مدل سبک"
+      }
+    }
+  },
+  "StyleModelLoader": {
+    "display_name": "بارگذاری مدل سبک",
+    "inputs": {
+      "style_model_name": {
+        "name": "نام مدل سبک"
+      }
+    }
+  },
+  "T5TokenizerOptions": {
+    "display_name": "گزینه‌های T5Tokenizer",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "min_length": {
+        "name": "حداقل طول"
+      },
+      "min_padding": {
+        "name": "حداقل padding"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TCFG": {
+    "description": "TCFG – کاهنده مماسی CFG (۲۵۰۳.۱۸۱۳۷)\n\nبهبود کیفیت با هم‌تراز کردن uncond (منفی) با cond (مثبت).",
+    "display_name": "کاهنده مماسی CFG",
+    "inputs": {
+      "model": {
+        "name": "مدل"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مدل اصلاح‌شده",
+        "tooltip": null
+      }
+    }
+  },
+  "TemporalScoreRescaling": {
+    "description": "[عملکرد پس از CFG]\nTSR - بازمقیاس‌دهی امتیاز زمانی (۲۵۱۰.۰۱۱۸۴)\n\nبازمقیاس‌دهی امتیاز یا نویز مدل برای هدایت تنوع نمونه‌گیری.\n",
+    "display_name": "TSR - بازمقیاس‌دهی امتیاز زمانی",
+    "inputs": {
+      "model": {
+        "name": "مدل"
+      },
+      "tsr_k": {
+        "name": "tsr_k",
+        "tooltip": "قدرت بازمقیاس‌دهی را کنترل می‌کند.\nمقدار کمتر k نتایج دقیق‌تری تولید می‌کند؛ مقدار بالاتر k نتایج نرم‌تری در تولید تصویر ایجاد می‌کند. مقدار k = ۱ بازمقیاس‌دهی را غیرفعال می‌کند."
+      },
+      "tsr_sigma": {
+        "name": "tsr_sigma",
+        "tooltip": "کنترل می‌کند که بازمقیاس‌دهی از چه زمانی اعمال شود.\nمقادیر بزرگ‌تر، زودتر اثر می‌گذارند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مدل اصلاح‌شده",
+        "tooltip": null
+      }
+    }
+  },
+  "Tencent3DPartNode": {
+    "description": "شناسایی و تولید خودکار اجزا بر اساس ساختار مدل را انجام می‌دهد.",
+    "display_name": "Hunyuan3D: بخش سه‌بعدی",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "model_3d": {
+        "name": "مدل سه‌بعدی",
+        "tooltip": "مدل سه‌بعدی با فرمت FBX. مدل باید کمتر از ۳۰۰۰۰ وجه داشته باشد."
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر تعیین می‌کند که آیا node باید دوباره اجرا شود؛ نتایج صرف‌نظر از بذر، غیرقطعی هستند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "TencentImageToModelNode": {
+    "display_name": "Hunyuan3D: تبدیل تصویر(ها) به مدل (پیشرفته)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "face_count": {
+        "name": "تعداد وجه‌ها"
+      },
+      "generate_type": {
+        "name": "نوع تولید"
+      },
+      "generate_type_pbr": {
+        "name": "pbr"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "image_back": {
+        "name": "تصویر پشت"
+      },
+      "image_left": {
+        "name": "تصویر چپ"
+      },
+      "image_right": {
+        "name": "تصویر راست"
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "گزینه LowPoly برای مدل `۳.۱` در دسترس نیست."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed تعیین می‌کند که node باید دوباره اجرا شود یا خیر؛ نتایج صرف‌نظر از seed غیرقطعی هستند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "فایل مدل",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "OBJ",
+        "tooltip": null
+      }
+    }
+  },
+  "TencentTextToModelNode": {
+    "display_name": "Hunyuan3D: تبدیل متن به مدل (پیشرفته)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "face_count": {
+        "name": "تعداد وجه‌ها"
+      },
+      "generate_type": {
+        "name": "نوع تولید"
+      },
+      "generate_type_pbr": {
+        "name": "pbr"
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "گزینه LowPoly برای مدل `۳.۱` در دسترس نیست."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "حداکثر تا ۱۰۲۴ کاراکتر پشتیبانی می‌شود."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed تعیین می‌کند که node باید دوباره اجرا شود یا خیر؛ نتایج صرف‌نظر از seed غیرقطعی هستند."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "فایل مدل",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "OBJ",
+        "tooltip": null
+      }
+    }
+  },
+  "TextEncodeAceStepAudio": {
+    "display_name": "TextEncodeAceStepAudio",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "lyrics": {
+        "name": "متن ترانه"
+      },
+      "lyrics_strength": {
+        "name": "قدرت متن ترانه"
+      },
+      "tags": {
+        "name": "برچسب‌ها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TextEncodeAceStepAudio1_5": {
+    "display_name": "TextEncodeAceStepAudio1.5",
+    "inputs": {
+      "bpm": {
+        "name": "ضرب در دقیقه (BPM)"
+      },
+      "cfg_scale": {
+        "name": "cfg_scale"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان"
+      },
+      "generate_audio_codes": {
+        "name": "تولید کدهای صوتی",
+        "tooltip": "فعال‌سازی LLM برای تولید کدهای صوتی. این کار ممکن است کند باشد اما کیفیت صدای تولیدشده را افزایش می‌دهد. اگر به مدل یک مرجع صوتی می‌دهید، این گزینه را غیرفعال کنید."
+      },
+      "keyscale": {
+        "name": "گام"
+      },
+      "language": {
+        "name": "زبان"
+      },
+      "lyrics": {
+        "name": "متن ترانه"
+      },
+      "min_p": {
+        "name": "حداقل p"
+      },
+      "seed": {
+        "name": "بذر"
+      },
+      "tags": {
+        "name": "برچسب‌ها"
+      },
+      "temperature": {
+        "name": "temperature"
+      },
+      "timesignature": {
+        "name": "امضای زمانی"
+      },
+      "top_k": {
+        "name": "top_k"
+      },
+      "top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TextEncodeHunyuanVideo_ImageToVideo": {
+    "display_name": "TextEncodeHunyuanVideo_ImageToVideo",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "clip_vision_output": {
+        "name": "خروجی بینایی clip"
+      },
+      "image_interleave": {
+        "name": "درهم‌تنیدگی تصویر",
+        "tooltip": "میزان تأثیر تصویر در مقابل پرامپت متنی. عدد بالاتر یعنی تأثیر بیشتر پرامپت متنی."
+      },
+      "prompt": {
+        "name": "پرامپت"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TextEncodeQwenImageEdit": {
+    "display_name": "TextEncodeQwenImageEdit",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "prompt": {
+        "name": "پرامپت"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TextEncodeQwenImageEditPlus": {
+    "display_name": "TextEncodeQwenImageEditPlus",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image1": {
+        "name": "تصویر ۱"
+      },
+      "image2": {
+        "name": "تصویر ۲"
+      },
+      "image3": {
+        "name": "تصویر ۳"
+      },
+      "prompt": {
+        "name": "پرامپت"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TextEncodeZImageOmni": {
+    "display_name": "TextEncodeZImageOmni",
+    "inputs": {
+      "auto_resize_images": {
+        "name": "تغییر اندازه خودکار تصاویر"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "image1": {
+        "name": "تصویر ۱"
+      },
+      "image2": {
+        "name": "تصویر ۲"
+      },
+      "image3": {
+        "name": "تصویر ۳"
+      },
+      "image_encoder": {
+        "name": "رمزگذار تصویر"
+      },
+      "prompt": {
+        "name": "پرامپت"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TextGenerate": {
+    "display_name": "تولید متن",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "max_length": {
+        "name": "حداکثر طول"
+      },
+      "prompt": {
+        "name": "پرامپت"
+      },
+      "sampling_mode": {
+        "name": "حالت نمونه‌گیری"
+      },
+      "sampling_mode_min_p": {
+        "name": "حداقل p"
+      },
+      "sampling_mode_repetition_penalty": {
+        "name": "جریمه تکرار"
+      },
+      "sampling_mode_seed": {
+        "name": "بذر"
+      },
+      "sampling_mode_temperature": {
+        "name": "دمای نمونه‌گیری"
+      },
+      "sampling_mode_top_k": {
+        "name": "top_k"
+      },
+      "sampling_mode_top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "متن تولید شده",
+        "tooltip": null
+      }
+    }
+  },
+  "TextGenerateLTX2Prompt": {
+    "display_name": "تولید متن LTX2Prompt",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "max_length": {
+        "name": "حداکثر طول"
+      },
+      "prompt": {
+        "name": "پرامپت"
+      },
+      "sampling_mode": {
+        "name": "حالت نمونه‌گیری"
+      },
+      "sampling_mode_min_p": {
+        "name": "حداقل p"
+      },
+      "sampling_mode_repetition_penalty": {
+        "name": "جریمه تکرار"
+      },
+      "sampling_mode_seed": {
+        "name": "بذر"
+      },
+      "sampling_mode_temperature": {
+        "name": "دمای نمونه‌گیری"
+      },
+      "sampling_mode_top_k": {
+        "name": "top_k"
+      },
+      "sampling_mode_top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "متن تولید شده",
+        "tooltip": null
+      }
+    }
+  },
+  "TextToLowercase": {
+    "display_name": "تبدیل متن به حروف کوچک",
+    "inputs": {
+      "texts": {
+        "name": "متن‌ها",
+        "tooltip": "متنی که باید پردازش شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "متن‌های پردازش‌شده",
+        "tooltip": "متن‌های پردازش‌شده"
+      }
+    }
+  },
+  "TextToUppercase": {
+    "display_name": "تبدیل متن به حروف بزرگ",
+    "inputs": {
+      "texts": {
+        "name": "متن‌ها",
+        "tooltip": "متنی که باید پردازش شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "متن‌های پردازش‌شده",
+        "tooltip": "متن‌های پردازش‌شده"
+      }
+    }
+  },
+  "ThresholdMask": {
+    "display_name": "ThresholdMask",
+    "inputs": {
+      "mask": {
+        "name": "ماسک"
+      },
+      "value": {
+        "name": "مقدار"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TomePatchModel": {
+    "display_name": "TomePatchModel",
+    "inputs": {
+      "model": {
+        "name": "مدل"
+      },
+      "ratio": {
+        "name": "نسبت"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TopazImageEnhance": {
+    "description": "استاندارد صنعتی برای بزرگ‌نمایی و بهبود تصویر.",
+    "display_name": "افزایش کیفیت تصویر Topaz",
+    "inputs": {
+      "color_preservation": {
+        "name": "حفظ رنگ",
+        "tooltip": "رنگ‌های اصلی را حفظ می‌کند."
+      },
+      "creativity": {
+        "name": "خلاقیت"
+      },
+      "crop_to_fill": {
+        "name": "برش برای پر کردن",
+        "tooltip": "به طور پیش‌فرض، اگر نسبت تصویر خروجی متفاوت باشد، تصویر letterbox می‌شود. برای برش تصویر و پر کردن ابعاد خروجی فعال کنید."
+      },
+      "face_enhancement": {
+        "name": "بهبود چهره",
+        "tooltip": "در صورت وجود، چهره‌ها را هنگام پردازش بهبود می‌بخشد."
+      },
+      "face_enhancement_creativity": {
+        "name": "خلاقیت در بهبود چهره",
+        "tooltip": "سطح خلاقیت برای بهبود چهره را تعیین کنید."
+      },
+      "face_enhancement_strength": {
+        "name": "قدرت بهبود چهره",
+        "tooltip": "کنترل میزان وضوح چهره‌های بهبود یافته نسبت به پس‌زمینه."
+      },
+      "face_preservation": {
+        "name": "حفظ چهره",
+        "tooltip": "هویت چهره سوژه‌ها را حفظ می‌کند."
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "output_height": {
+        "name": "ارتفاع خروجی",
+        "tooltip": "مقدار صفر به معنی خروجی با همان ارتفاع اصلی یا عرض خروجی است."
+      },
+      "output_width": {
+        "name": "عرض خروجی",
+        "tooltip": "مقدار صفر به معنی محاسبه خودکار است (معمولاً اندازه اصلی یا ارتفاع خروجی در صورت تعیین)."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپت متنی اختیاری برای راهنمایی خلاقانه در بزرگ‌نمایی."
+      },
+      "subject_detection": {
+        "name": "شناسایی سوژه"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TopazVideoEnhance": {
+    "description": "با استفاده از فناوری قدرتمند بزرگ‌نمایی و بازیابی، به ویدیو جان تازه‌ای ببخشید.",
+    "display_name": "Topaz Video Enhance",
+    "inputs": {
+      "dynamic_compression_level": {
+        "name": "سطح فشرده‌سازی پویا",
+        "tooltip": "سطح CQP."
+      },
+      "interpolation_duplicate": {
+        "name": "حذف فریم‌های تکراری",
+        "tooltip": "ورودی را برای فریم‌های تکراری تحلیل و آن‌ها را حذف می‌کند."
+      },
+      "interpolation_duplicate_threshold": {
+        "name": "حساسیت تشخیص فریم تکراری",
+        "tooltip": "حساسیت تشخیص برای فریم‌های تکراری."
+      },
+      "interpolation_enabled": {
+        "name": "فعال‌سازی درون‌یابی"
+      },
+      "interpolation_frame_rate": {
+        "name": "نرخ فریم خروجی",
+        "tooltip": "نرخ فریم خروجی."
+      },
+      "interpolation_model": {
+        "name": "مدل درون‌یابی"
+      },
+      "interpolation_slowmo": {
+        "name": "ضریب حرکت آهسته",
+        "tooltip": "ضریب حرکت آهسته که به ویدیوی ورودی اعمال می‌شود. برای مثال، ۲ باعث می‌شود خروجی دو برابر آهسته‌تر و مدت زمان دو برابر شود."
+      },
+      "upscaler_creativity": {
+        "name": "سطح خلاقیت",
+        "tooltip": "سطح خلاقیت (فقط برای Starlight (Astra) Creative اعمال می‌شود)."
+      },
+      "upscaler_enabled": {
+        "name": "فعال‌سازی بزرگ‌نمایی"
+      },
+      "upscaler_model": {
+        "name": "مدل بزرگ‌نمایی"
+      },
+      "upscaler_resolution": {
+        "name": "وضوح بزرگ‌نمایی"
+      },
+      "video": {
+        "name": "ویدیو"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TorchCompileModel": {
+    "display_name": "TorchCompileModel",
+    "inputs": {
+      "backend": {
+        "name": "بک‌اند"
+      },
+      "model": {
+        "name": "مدل"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TrainLoraNode": {
+    "display_name": "آموزش LoRA",
+    "inputs": {
+      "algorithm": {
+        "name": "الگوریتم",
+        "tooltip": "الگوریتم مورد استفاده برای آموزش."
+      },
+      "batch_size": {
+        "name": "اندازه بچ",
+        "tooltip": "اندازه بچ مورد استفاده برای آموزش."
+      },
+      "bucket_mode": {
+        "name": "حالت سطل‌بندی رزولوشن",
+        "tooltip": "فعال‌سازی حالت سطل‌بندی رزولوشن. در صورت فعال بودن، انتظار می‌رود لاتنت‌های پیش‌سطل‌بندی شده از node ResolutionBucket دریافت شود."
+      },
+      "bypass_mode": {
+        "name": "bypass_mode",
+        "tooltip": "فعال‌سازی حالت bypass برای آموزش. در این حالت، آداپتورها از طریق forward hookها به جای تغییر وزن‌ها اعمال می‌شوند. این روش برای مدل‌های quantized که امکان تغییر مستقیم وزن‌ها وجود ندارد، مفید است."
+      },
+      "checkpoint_depth": {
+        "name": "checkpoint_depth",
+        "tooltip": "سطح عمق برای gradient checkpointing."
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "existing_lora": {
+        "name": "LoRA موجود",
+        "tooltip": "LoRA موجود برای افزودن. برای ایجاد LoRA جدید مقدار None را قرار دهید."
+      },
+      "grad_accumulation_steps": {
+        "name": "تعداد مراحل انباشت گرادیان",
+        "tooltip": "تعداد مراحل انباشت گرادیان برای آموزش."
+      },
+      "gradient_checkpointing": {
+        "name": "ذخیره‌سازی گرادیان",
+        "tooltip": "استفاده از ذخیره‌سازی گرادیان برای آموزش."
+      },
+      "latents": {
+        "name": "لاتنت‌ها",
+        "tooltip": "لاتنت‌هایی که برای آموزش استفاده می‌شوند و به عنوان دیتاست/ورودی مدل عمل می‌کنند."
+      },
+      "learning_rate": {
+        "name": "نرخ یادگیری",
+        "tooltip": "نرخ یادگیری مورد استفاده برای آموزش."
+      },
+      "lora_dtype": {
+        "name": "نوع داده LoRA",
+        "tooltip": "نوع داده مورد استفاده برای LoRA."
+      },
+      "loss_function": {
+        "name": "تابع خطا",
+        "tooltip": "تابع خطا مورد استفاده برای آموزش."
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "مدلی که LoRA روی آن آموزش داده می‌شود."
+      },
+      "offloading": {
+        "name": "offloading",
+        "tooltip": "سطح عمق برای gradient checkpointing."
+      },
+      "optimizer": {
+        "name": "بهینه‌ساز",
+        "tooltip": "بهینه‌سازی که برای آموزش استفاده می‌شود."
+      },
+      "positive": {
+        "name": "شرط مثبت",
+        "tooltip": "شرط مثبت مورد استفاده برای آموزش."
+      },
+      "rank": {
+        "name": "رتبه",
+        "tooltip": "رتبه لایه‌های LoRA."
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر مورد استفاده برای آموزش (در تولیدکننده برای مقداردهی اولیه وزن‌های LoRA و نمونه‌گیری نویز استفاده می‌شود)"
+      },
+      "steps": {
+        "name": "تعداد مراحل",
+        "tooltip": "تعداد مراحل آموزش LoRA."
+      },
+      "training_dtype": {
+        "name": "نوع داده آموزش",
+        "tooltip": "نوع داده مورد استفاده برای آموزش."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مدل",
+        "tooltip": "مدل با LoRA اعمال شده"
+      },
+      "1": {
+        "name": "وزن‌های LoRA",
+        "tooltip": "وزن‌های LoRA"
+      },
+      "2": {
+        "name": "نقشه خطا",
+        "tooltip": "تاریخچه خطا"
+      }
+    }
+  },
+  "TrimAudioDuration": {
+    "description": "برش تانسور صوت به بازه زمانی انتخاب شده.",
+    "display_name": "برش مدت زمان صوت",
+    "inputs": {
+      "audio": {
+        "name": "صوت"
+      },
+      "duration": {
+        "name": "مدت زمان",
+        "tooltip": "مدت زمان بر حسب ثانیه"
+      },
+      "start_index": {
+        "name": "زمان شروع",
+        "tooltip": "زمان شروع بر حسب ثانیه، می‌تواند منفی باشد تا از انتها شمارش شود (پشتیبانی از زیرثانیه)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TrimVideoLatent": {
+    "display_name": "برش لاتنت ویدیو",
+    "inputs": {
+      "samples": {
+        "name": "نمونه‌ها"
+      },
+      "trim_amount": {
+        "name": "مقدار برش"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TripleCLIPLoader": {
+    "description": "[دستورالعمل‌ها]\n\nsd3: clip-l، clip-g، t5",
+    "display_name": "TripleCLIPLoader",
+    "inputs": {
+      "clip_name1": {
+        "name": "clip_name1"
+      },
+      "clip_name2": {
+        "name": "clip_name2"
+      },
+      "clip_name3": {
+        "name": "clip_name3"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TripoConversionNode": {
+    "display_name": "Tripo: تبدیل مدل",
+    "inputs": {
+      "animate_in_place": {
+        "name": "انیمیشن در محل"
+      },
+      "bake": {
+        "name": "بِیک"
+      },
+      "export_orientation": {
+        "name": "خروجی جهت"
+      },
+      "export_vertex_colors": {
+        "name": "خروجی رنگ رأس‌ها"
+      },
+      "face_limit": {
+        "name": "محدودیت چهره"
+      },
+      "fbx_preset": {
+        "name": "پیش‌تنظیم FBX"
+      },
+      "flatten_bottom": {
+        "name": "تخت کردن پایین"
+      },
+      "flatten_bottom_threshold": {
+        "name": "آستانه تخت کردن پایین"
+      },
+      "force_symmetry": {
+        "name": "اجبار تقارن"
+      },
+      "format": {
+        "name": "فرمت"
+      },
+      "original_model_task_id": {
+        "name": "original_model_task_id"
+      },
+      "pack_uv": {
+        "name": "بسته‌بندی UV"
+      },
+      "part_names": {
+        "name": "نام بخش‌ها"
+      },
+      "pivot_to_center_bottom": {
+        "name": "محور به مرکز پایین"
+      },
+      "quad": {
+        "name": "quad"
+      },
+      "scale_factor": {
+        "name": "ضریب مقیاس"
+      },
+      "texture_format": {
+        "name": "فرمت تکسچر"
+      },
+      "texture_size": {
+        "name": "اندازه تکسچر"
+      },
+      "with_animation": {
+        "name": "با انیمیشن"
+      }
+    }
+  },
+  "TripoImageToModelNode": {
+    "display_name": "Tripo: تصویر به مدل",
+    "inputs": {
+      "face_limit": {
+        "name": "محدودیت چهره"
+      },
+      "geometry_quality": {
+        "name": "کیفیت هندسه"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "model_seed": {
+        "name": "بذر مدل"
+      },
+      "model_version": {
+        "name": "نسخه مدل",
+        "tooltip": "نسخه مدل مورد استفاده برای تولید"
+      },
+      "orientation": {
+        "name": "جهت"
+      },
+      "pbr": {
+        "name": "PBR"
+      },
+      "quad": {
+        "name": "quad"
+      },
+      "style": {
+        "name": "سبک"
+      },
+      "texture": {
+        "name": "تکسچر"
+      },
+      "texture_alignment": {
+        "name": "تراز تکسچر"
+      },
+      "texture_quality": {
+        "name": "کیفیت تکسچر"
+      },
+      "texture_seed": {
+        "name": "بذر تکسچر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "فایل مدل",
+        "tooltip": null
+      },
+      "1": {
+        "name": "شناسه وظیفه مدل",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "TripoMultiviewToModelNode": {
+    "display_name": "Tripo: چندنما به مدل",
+    "inputs": {
+      "face_limit": {
+        "name": "محدودیت وجه"
+      },
+      "geometry_quality": {
+        "name": "کیفیت هندسه"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "image_back": {
+        "name": "تصویر پشت"
+      },
+      "image_left": {
+        "name": "تصویر چپ"
+      },
+      "image_right": {
+        "name": "تصویر راست"
+      },
+      "model_seed": {
+        "name": "بذر مدل"
+      },
+      "model_version": {
+        "name": "نسخه مدل",
+        "tooltip": "نسخه مدل مورد استفاده برای تولید"
+      },
+      "orientation": {
+        "name": "جهت"
+      },
+      "pbr": {
+        "name": "PBR"
+      },
+      "quad": {
+        "name": "چهارضلعی"
+      },
+      "texture": {
+        "name": "تکسچر"
+      },
+      "texture_alignment": {
+        "name": "تراز تکسچر"
+      },
+      "texture_quality": {
+        "name": "کیفیت تکسچر"
+      },
+      "texture_seed": {
+        "name": "بذر تکسچر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "فایل مدل",
+        "tooltip": null
+      },
+      "1": {
+        "name": "شناسه وظیفه مدل",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "TripoRefineNode": {
+    "description": "بهبود یک مدل پیش‌نویس که فقط توسط مدل‌های Tripo نسخه ۱.۴ ایجاد شده است.",
+    "display_name": "Tripo: بهبود مدل پیش‌نویس",
+    "inputs": {
+      "model_task_id": {
+        "name": "شناسه وظیفه مدل",
+        "tooltip": "باید یک مدل Tripo نسخه ۱.۴ باشد"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "فایل مدل",
+        "tooltip": null
+      },
+      "1": {
+        "name": "شناسه وظیفه مدل",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "TripoRetargetNode": {
+    "display_name": "Tripo: هدف‌گذاری مجدد مدل ریگ‌شده",
+    "inputs": {
+      "animation": {
+        "name": "انیمیشن"
+      },
+      "original_model_task_id": {
+        "name": "شناسه وظیفه مدل اصلی"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "فایل مدل",
+        "tooltip": null
+      },
+      "1": {
+        "name": "شناسه وظیفه ری‌تارگت",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "TripoRigNode": {
+    "display_name": "Tripo: ریگ مدل",
+    "inputs": {
+      "original_model_task_id": {
+        "name": "شناسه وظیفه مدل اصلی"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "فایل مدل",
+        "tooltip": null
+      },
+      "1": {
+        "name": "شناسه وظیفه ریگ",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "TripoTextToModelNode": {
+    "display_name": "Tripo: متن به مدل",
+    "inputs": {
+      "face_limit": {
+        "name": "محدودیت وجه"
+      },
+      "geometry_quality": {
+        "name": "کیفیت هندسه"
+      },
+      "image_seed": {
+        "name": "بذر تصویر"
+      },
+      "model_seed": {
+        "name": "بذر مدل"
+      },
+      "model_version": {
+        "name": "نسخه مدل"
+      },
+      "negative_prompt": {
+        "name": "پرامپت منفی"
+      },
+      "pbr": {
+        "name": "PBR"
+      },
+      "prompt": {
+        "name": "پرامپت"
+      },
+      "quad": {
+        "name": "چهارضلعی"
+      },
+      "style": {
+        "name": "استایل"
+      },
+      "texture": {
+        "name": "تکسچر"
+      },
+      "texture_quality": {
+        "name": "کیفیت تکسچر"
+      },
+      "texture_seed": {
+        "name": "بذر تکسچر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "فایل مدل",
+        "tooltip": null
+      },
+      "1": {
+        "name": "شناسه وظیفه مدل",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "TripoTextureNode": {
+    "display_name": "Tripo: مدل بافت",
+    "inputs": {
+      "model_task_id": {
+        "name": "شناسه وظیفه مدل"
+      },
+      "pbr": {
+        "name": "PBR"
+      },
+      "texture": {
+        "name": "بافت"
+      },
+      "texture_alignment": {
+        "name": "تراز بافت"
+      },
+      "texture_quality": {
+        "name": "کیفیت بافت"
+      },
+      "texture_seed": {
+        "name": "بذر بافت"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "فایل مدل",
+        "tooltip": null
+      },
+      "1": {
+        "name": "شناسه وظیفه مدل",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "TruncateText": {
+    "display_name": "کوتاه‌سازی متن",
+    "inputs": {
+      "max_length": {
+        "name": "حداکثر طول",
+        "tooltip": "حداکثر طول متن."
+      },
+      "texts": {
+        "name": "متن‌ها",
+        "tooltip": "متنی که باید پردازش شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "متن‌های پردازش‌شده",
+        "tooltip": "متن‌های پردازش‌شده"
+      }
+    }
+  },
+  "UNETLoader": {
+    "display_name": "بارگذاری مدل Diffusion",
+    "inputs": {
+      "unet_name": {
+        "name": "نام UNet"
+      },
+      "weight_dtype": {
+        "name": "نوع داده وزن"
+      }
+    }
+  },
+  "UNetCrossAttentionMultiply": {
+    "display_name": "ضرب توجه متقاطع UNet",
+    "inputs": {
+      "k": {
+        "name": "k"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "out": {
+        "name": "خروجی"
+      },
+      "q": {
+        "name": "q"
+      },
+      "v": {
+        "name": "v"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "UNetSelfAttentionMultiply": {
+    "display_name": "ضرب توجه به خود UNet",
+    "inputs": {
+      "k": {
+        "name": "k"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "out": {
+        "name": "خروجی"
+      },
+      "q": {
+        "name": "q"
+      },
+      "v": {
+        "name": "v"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "UNetTemporalAttentionMultiply": {
+    "display_name": "ضرب توجه زمانی UNet",
+    "inputs": {
+      "cross_structural": {
+        "name": "ساختاری متقاطع"
+      },
+      "cross_temporal": {
+        "name": "زمانی متقاطع"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "self_structural": {
+        "name": "ساختاری خود"
+      },
+      "self_temporal": {
+        "name": "زمانی خود"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "USOStyleReference": {
+    "display_name": "USOStyleReference",
+    "inputs": {
+      "clip_vision_output": {
+        "name": "خروجی clip vision"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "model_patch": {
+        "name": "patch مدل"
+      }
+    }
+  },
+  "UpscaleModelLoader": {
+    "display_name": "بارگذاری مدل بزرگ‌نمایی",
+    "inputs": {
+      "model_name": {
+        "name": "نام مدل"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VAEDecode": {
+    "description": "تصاویر latent را به تصاویر پیکسلی بازمی‌گرداند.",
+    "display_name": "رمزگشایی VAE",
+    "inputs": {
+      "samples": {
+        "name": "نمونه‌ها",
+        "tooltip": "latent برای رمزگشایی."
+      },
+      "vae": {
+        "name": "vae",
+        "tooltip": "مدل VAE مورد استفاده برای رمزگشایی latent."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "تصویر رمزگشایی‌شده."
+      }
+    }
+  },
+  "VAEDecodeAudio": {
+    "display_name": "رمزگشایی VAE صوتی",
+    "inputs": {
+      "samples": {
+        "name": "نمونه‌ها"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VAEDecodeAudioTiled": {
+    "display_name": "رمزگشایی VAE صوتی (کاشی‌بندی‌شده)",
+    "inputs": {
+      "overlap": {
+        "name": "همپوشانی"
+      },
+      "samples": {
+        "name": "نمونه‌ها"
+      },
+      "tile_size": {
+        "name": "اندازه کاشی"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VAEDecodeHunyuan3D": {
+    "display_name": "VAEDecodeHunyuan3D",
+    "inputs": {
+      "num_chunks": {
+        "name": "تعداد بخش‌ها"
+      },
+      "octree_resolution": {
+        "name": "وضوح octree"
+      },
+      "samples": {
+        "name": "نمونه‌ها"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VAEDecodeTiled": {
+    "display_name": "رمزگشایی VAE (کاشی‌بندی‌شده)",
+    "inputs": {
+      "overlap": {
+        "name": "همپوشانی"
+      },
+      "samples": {
+        "name": "نمونه‌ها"
+      },
+      "temporal_overlap": {
+        "name": "همپوشانی زمانی",
+        "tooltip": "فقط برای VAE ویدیویی: تعداد فریم‌هایی که همپوشانی دارند."
+      },
+      "temporal_size": {
+        "name": "اندازه زمانی",
+        "tooltip": "فقط برای VAE ویدیویی: تعداد فریم‌هایی که همزمان رمزگشایی می‌شوند."
+      },
+      "tile_size": {
+        "name": "اندازه کاشی"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
+  "VAEEncode": {
+    "display_name": "کدگذاری VAE",
+    "inputs": {
+      "pixels": {
+        "name": "پیکسل‌ها"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
+  "VAEEncodeAudio": {
+    "display_name": "کدگذاری VAE صوتی",
+    "inputs": {
+      "audio": {
+        "name": "صوت"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VAEEncodeForInpaint": {
+    "display_name": "کدگذاری VAE (برای inpainting)",
+    "inputs": {
+      "grow_mask_by": {
+        "name": "افزایش ماسک به اندازه"
+      },
+      "mask": {
+        "name": "ماسک"
+      },
+      "pixels": {
+        "name": "پیکسل‌ها"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
+  "VAEEncodeTiled": {
+    "display_name": "کدگذاری VAE (کاشی‌بندی‌شده)",
+    "inputs": {
+      "overlap": {
+        "name": "همپوشانی"
+      },
+      "pixels": {
+        "name": "پیکسل‌ها"
+      },
+      "temporal_overlap": {
+        "name": "همپوشانی زمانی",
+        "tooltip": "فقط برای VAE ویدیویی: تعداد فریم‌هایی که همپوشانی دارند."
+      },
+      "temporal_size": {
+        "name": "اندازه زمانی",
+        "tooltip": "فقط برای VAE ویدیویی: تعداد فریم‌هایی که همزمان کدگذاری می‌شوند."
+      },
+      "tile_size": {
+        "name": "اندازه کاشی"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
+  "VAELoader": {
+    "display_name": "بارگذاری VAE",
+    "inputs": {
+      "vae_name": {
+        "name": "vae_name"
+      }
+    }
+  },
+  "VAESave": {
+    "display_name": "ذخیره VAE",
+    "inputs": {
+      "filename_prefix": {
+        "name": "پیشوند نام فایل"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
+  "VPScheduler": {
+    "display_name": "VPScheduler",
+    "inputs": {
+      "beta_d": {
+        "name": "بتا d"
+      },
+      "beta_min": {
+        "name": "حداقل بتا"
+      },
+      "eps_s": {
+        "name": "اپسیلون s"
+      },
+      "steps": {
+        "name": "گام‌ها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Veo3FirstLastFrameNode": {
+    "description": "تولید ویدیو با استفاده از پرامپت و اولین و آخرین فریم.",
+    "display_name": "Google Veo 3 تبدیل اولین و آخرین فریم به ویدیو",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبت تصویر",
+        "tooltip": "نسبت تصویر ویدیوی خروجی"
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان",
+        "tooltip": "مدت زمان ویدیوی خروجی به ثانیه"
+      },
+      "first_frame": {
+        "name": "اولین فریم",
+        "tooltip": "فریم شروع"
+      },
+      "generate_audio": {
+        "name": "تولید صدا",
+        "tooltip": "تولید صدا برای ویدیو."
+      },
+      "last_frame": {
+        "name": "آخرین فریم",
+        "tooltip": "فریم پایان"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "negative_prompt": {
+        "name": "پرامپت منفی",
+        "tooltip": "پرامپت متنی منفی برای راهنمایی جهت اجتناب از موارد خاص در ویدیو"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "توضیح متنی ویدیو"
+      },
+      "resolution": {
+        "name": "رزولوشن"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed برای تولید ویدیو"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Veo3VideoGenerationNode": {
+    "description": "تولید ویدیو از پرامپت متنی با استفاده از API گوگل Veo 3",
+    "display_name": "تولید ویدیو Google Veo 3",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبت تصویر",
+        "tooltip": "نسبت تصویر ویدیوی خروجی"
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration_seconds": {
+        "name": "مدت زمان (ثانیه)",
+        "tooltip": "مدت زمان ویدیوی خروجی به ثانیه (Veo 3 فقط از ۸ ثانیه پشتیبانی می‌کند)"
+      },
+      "enhance_prompt": {
+        "name": "enhance_prompt",
+        "tooltip": "این پارامتر منسوخ شده و نادیده گرفته می‌شود."
+      },
+      "generate_audio": {
+        "name": "تولید صدا",
+        "tooltip": "تولید صدا برای ویدیو. توسط تمام مدل‌های Veo 3 پشتیبانی می‌شود."
+      },
+      "image": {
+        "name": "تصویر",
+        "tooltip": "تصویر مرجع اختیاری برای راهنمایی تولید ویدیو"
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "مدل Veo 3 برای تولید ویدیو"
+      },
+      "negative_prompt": {
+        "name": "پرامپت منفی",
+        "tooltip": "پرامپت متنی منفی برای راهنمایی جهت اجتناب از موارد خاص در ویدیو"
+      },
+      "person_generation": {
+        "name": "تولید افراد",
+        "tooltip": "آیا تولید افراد در ویدیو مجاز باشد"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "توضیح متنی ویدیو"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "seed برای تولید ویدیو (۰ برای تصادفی)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VeoVideoGenerationNode": {
+    "description": "تولید ویدیو از طریق متن با استفاده از API گوگل Veo ۲",
+    "display_name": "تولید ویدیو با Google Veo 2",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "نسبت تصویر ویدیوی خروجی"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration_seconds": {
+        "name": "duration_seconds",
+        "tooltip": "مدت زمان ویدیوی خروجی بر حسب ثانیه"
+      },
+      "enhance_prompt": {
+        "name": "enhance_prompt",
+        "tooltip": "آیا توضیح متنی با کمک هوش مصنوعی بهبود یابد"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "تصویر مرجع اختیاری برای راهنمایی تولید ویدیو"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "مدل Veo ۲ برای تولید ویدیو"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "راهنمای متنی منفی برای تعیین مواردی که باید در ویدیو اجتناب شود"
+      },
+      "person_generation": {
+        "name": "person_generation",
+        "tooltip": "آیا تولید افراد در ویدیو مجاز باشد"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "توضیح متنی برای ویدیو"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed برای تولید ویدیو (۰ برای تصادفی)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Video Slice": {
+    "display_name": "برش ویدیو",
+    "inputs": {
+      "duration": {
+        "name": "مدت زمان",
+        "tooltip": "مدت زمان بر حسب ثانیه، یا ۰ برای مدت نامحدود"
+      },
+      "start_time": {
+        "name": "زمان شروع",
+        "tooltip": "زمان شروع بر حسب ثانیه"
+      },
+      "strict_duration": {
+        "name": "مدت زمان دقیق",
+        "tooltip": "اگر True باشد، در صورت عدم امکان مدت زمان مشخص شده، خطا نمایش داده می‌شود."
+      },
+      "video": {
+        "name": "ویدیو"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VideoLinearCFGGuidance": {
+    "display_name": "VideoLinearCFGGuidance",
+    "inputs": {
+      "min_cfg": {
+        "name": "min_cfg"
+      },
+      "model": {
+        "name": "model"
+      }
+    }
+  },
+  "VideoTriangleCFGGuidance": {
+    "display_name": "VideoTriangleCFGGuidance",
+    "inputs": {
+      "min_cfg": {
+        "name": "min_cfg"
+      },
+      "model": {
+        "name": "model"
+      }
+    }
+  },
+  "Vidu2ImageToVideoNode": {
+    "description": "تولید ویدیو از یک تصویر و توضیح متنی اختیاری.",
+    "display_name": "تولید ویدیو از تصویر با Vidu2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "تصویری که به عنوان فریم ابتدایی ویدیوی تولیدی استفاده می‌شود."
+      },
+      "model": {
+        "name": "model"
+      },
+      "movement_amplitude": {
+        "name": "movement_amplitude",
+        "tooltip": "دامنه حرکت اشیاء در فریم."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "توضیح متنی اختیاری برای تولید ویدیو (حداکثر ۲۰۰۰ کاراکتر)."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2ReferenceVideoNode": {
+    "description": "تولید ویدیو از چند تصویر مرجع و یک پرامپت.",
+    "display_name": "تولید ویدیو از تصاویر مرجع Vidu2",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبت تصویر"
+      },
+      "audio": {
+        "name": "صدا",
+        "tooltip": "در صورت فعال بودن، ویدیو شامل گفتار تولیدشده و موسیقی پس‌زمینه بر اساس پرامپت خواهد بود."
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "movement_amplitude": {
+        "name": "دامنه حرکت",
+        "tooltip": "دامنه حرکت اشیاء در قاب."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "در صورت فعال بودن، ویدیو شامل گفتار تولیدشده و موسیقی پس‌زمینه بر اساس پرامپت خواهد بود."
+      },
+      "resolution": {
+        "name": "رزولوشن"
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "subjects": {
+        "name": "subjects",
+        "tooltip": "برای هر subject، تا ۳ تصویر مرجع ارائه دهید (در مجموع ۷ تصویر برای همه subjects). در پرامپت‌ها با @subject{subject_id} به آن‌ها ارجاع دهید."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2StartEndToVideoNode": {
+    "description": "تولید ویدیو از یک فریم شروع، یک فریم پایان و یک پرامپت.",
+    "display_name": "تولید ویدیو از فریم شروع/پایان Vidu2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان"
+      },
+      "end_frame": {
+        "name": "فریم پایان"
+      },
+      "first_frame": {
+        "name": "فریم شروع"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "movement_amplitude": {
+        "name": "دامنه حرکت",
+        "tooltip": "دامنه حرکت اشیاء در قاب."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "توضیح پرامپت (حداکثر ۲۰۰۰ کاراکتر)."
+      },
+      "resolution": {
+        "name": "رزولوشن"
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2TextToVideoNode": {
+    "description": "تولید ویدیو از یک پرامپت متنی",
+    "display_name": "تولید ویدیو از متن Vidu2",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبت تصویر"
+      },
+      "background_music": {
+        "name": "موسیقی پس‌زمینه",
+        "tooltip": "آیا موسیقی پس‌زمینه به ویدیوی تولیدشده اضافه شود یا خیر."
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "توضیح متنی برای تولید ویدیو، با حداکثر طول ۲۰۰۰ کاراکتر."
+      },
+      "resolution": {
+        "name": "رزولوشن"
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3ImageToVideoNode": {
+    "description": "تولید یک ویدیو از یک تصویر و یک پرامپت اختیاری.",
+    "display_name": "تولید ویدیو از تصویر Vidu Q3",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "image": {
+        "name": "تصویر",
+        "tooltip": "تصویری که به عنوان فریم ابتدایی ویدیوی تولیدشده استفاده می‌شود."
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "مدلی که برای تولید ویدیو استفاده می‌شود."
+      },
+      "model_audio": {
+        "name": "صدا"
+      },
+      "model_duration": {
+        "name": "مدت زمان"
+      },
+      "model_resolution": {
+        "name": "رزولوشن"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "یک پرامپت متنی اختیاری برای تولید ویدیو (حداکثر ۲۰۰۰ کاراکتر)."
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3StartEndToVideoNode": {
+    "description": "تولید یک ویدیو از یک فریم آغازین، یک فریم پایانی و یک پرامپت.",
+    "display_name": "تولید ویدیو از فریم آغازین/پایانی Vidu Q3",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "end_frame": {
+        "name": "فریم پایانی"
+      },
+      "first_frame": {
+        "name": "فریم آغازین"
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "مدلی که برای تولید ویدیو استفاده می‌شود."
+      },
+      "model_audio": {
+        "name": "صدا"
+      },
+      "model_duration": {
+        "name": "مدت زمان"
+      },
+      "model_resolution": {
+        "name": "وضوح"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "توضیح پرامپت (حداکثر ۲۰۰۰ کاراکتر)."
+      },
+      "seed": {
+        "name": "بذر"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3TextToVideoNode": {
+    "description": "تولید ویدیو از یک پرامپت متنی.",
+    "display_name": "تولید ویدیو از متن Vidu Q3",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "مدلی که برای تولید ویدیو استفاده می‌شود."
+      },
+      "model_aspect_ratio": {
+        "name": "نسبت تصویر"
+      },
+      "model_audio": {
+        "name": "صدا"
+      },
+      "model_duration": {
+        "name": "مدت زمان"
+      },
+      "model_resolution": {
+        "name": "رزولوشن"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "توضیح متنی برای تولید ویدیو، با حداکثر طول ۲۰۰۰ کاراکتر."
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ViduExtendVideoNode": {
+    "description": "افزایش طول یک ویدیوی موجود با تولید فریم‌های اضافی.",
+    "display_name": "افزایش طول ویدیو Vidu",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "end_frame": {
+        "name": "فریم پایانی"
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "مدلی که برای افزایش طول ویدیو استفاده می‌شود."
+      },
+      "model_duration": {
+        "name": "مدت زمان"
+      },
+      "model_resolution": {
+        "name": "رزولوشن"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "یک پرامپت متنی اختیاری برای ویدیوی افزایش‌یافته (حداکثر ۲۰۰۰ کاراکتر)."
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "video": {
+        "name": "ویدیو",
+        "tooltip": "ویدیوی منبع برای افزایش طول."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ViduImageToVideoNode": {
+    "description": "تولید ویدیو از یک تصویر و متن اختیاری",
+    "display_name": "تولید ویدیو از تصویر با Vidu",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان",
+        "tooltip": "مدت زمان ویدیوی خروجی بر حسب ثانیه"
+      },
+      "image": {
+        "name": "تصویر",
+        "tooltip": "تصویری که به عنوان فریم ابتدایی ویدیو تولیدی استفاده می‌شود"
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "نام مدل"
+      },
+      "movement_amplitude": {
+        "name": "دامنه حرکت",
+        "tooltip": "دامنه حرکت اشیاء در فریم"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "توضیح متنی برای تولید ویدیو"
+      },
+      "resolution": {
+        "name": "رزولوشن",
+        "tooltip": "مقادیر پشتیبانی‌شده ممکن است بسته به مدل و مدت زمان متفاوت باشد"
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر برای تولید ویدیو (۰ برای تصادفی)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ViduMultiFrameVideoNode": {
+    "description": "تولید ویدیو با چندین انتقال کلیدی بین فریم‌ها.",
+    "display_name": "تولید ویدیو چندفریمی Vidu",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "frames": {
+        "name": "فریم‌ها",
+        "tooltip": "تعداد انتقال‌های کلیدی بین فریم‌ها (۲ تا ۹)."
+      },
+      "frames_duration1": {
+        "name": "مدت زمان ۱"
+      },
+      "frames_duration2": {
+        "name": "مدت زمان ۲"
+      },
+      "frames_prompt1": {
+        "name": "پرامپت ۱"
+      },
+      "frames_prompt2": {
+        "name": "پرامپت ۲"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "resolution": {
+        "name": "رزولوشن"
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "start_image": {
+        "name": "تصویر شروع",
+        "tooltip": "تصویر فریم ابتدایی. نسبت تصویر باید بین ۱:۴ تا ۴:۱ باشد."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ViduReferenceVideoNode": {
+    "description": "تولید ویدیو از چند تصویر و یک پرامپت",
+    "display_name": "تولید ویدیو از تصاویر مرجع با Vidu",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبت تصویر",
+        "tooltip": "نسبت تصویر ویدیوی خروجی"
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان",
+        "tooltip": "مدت زمان ویدیوی خروجی بر حسب ثانیه"
+      },
+      "images": {
+        "name": "تصاویر",
+        "tooltip": "تصاویر مرجع برای تولید ویدیویی با سوژه‌های یکسان (حداکثر ۷ تصویر)."
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "نام مدل"
+      },
+      "movement_amplitude": {
+        "name": "دامنه حرکت",
+        "tooltip": "دامنه حرکت اشیاء در فریم"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "توضیح متنی برای تولید ویدیو"
+      },
+      "resolution": {
+        "name": "رزولوشن",
+        "tooltip": "مقادیر پشتیبانی‌شده ممکن است بسته به مدل و مدت زمان متفاوت باشد"
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر برای تولید ویدیو (۰ برای تصادفی)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ViduStartEndToVideoNode": {
+    "description": "تولید ویدیو از فریم شروع و پایان و یک پرامپت",
+    "display_name": "تولید ویدیو از فریم ابتدایی و انتهایی با Vidu",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان",
+        "tooltip": "مدت زمان ویدیوی خروجی بر حسب ثانیه"
+      },
+      "end_frame": {
+        "name": "فریم پایان",
+        "tooltip": "فریم انتهایی"
+      },
+      "first_frame": {
+        "name": "فریم شروع",
+        "tooltip": "فریم ابتدایی"
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "نام مدل"
+      },
+      "movement_amplitude": {
+        "name": "دامنه حرکت",
+        "tooltip": "دامنه حرکت اشیاء در فریم"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "توضیح متنی برای تولید ویدیو"
+      },
+      "resolution": {
+        "name": "رزولوشن",
+        "tooltip": "مقادیر پشتیبانی‌شده ممکن است بسته به مدل و مدت زمان متفاوت باشد"
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر برای تولید ویدیو (۰ برای تصادفی)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ViduTextToVideoNode": {
+    "description": "تولید ویدیو از یک متن ورودی",
+    "display_name": "تولید ویدیو از متن Vidu",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "نسبت تصویر",
+        "tooltip": "نسبت تصویر ویدیوی خروجی"
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان",
+        "tooltip": "مدت زمان ویدیوی خروجی به ثانیه"
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "نام مدل"
+      },
+      "movement_amplitude": {
+        "name": "دامنه حرکت",
+        "tooltip": "دامنه حرکت اشیاء در قاب"
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "توضیح متنی برای تولید ویدیو"
+      },
+      "resolution": {
+        "name": "رزولوشن",
+        "tooltip": "مقادیر پشتیبانی شده ممکن است بسته به مدل و مدت زمان متفاوت باشد"
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذر برای تولید ویدیو (۰ برای تصادفی)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VoxelToMesh": {
+    "display_name": "VoxelToMesh",
+    "inputs": {
+      "algorithm": {
+        "name": "الگوریتم"
+      },
+      "threshold": {
+        "name": "آستانه"
+      },
+      "voxel": {
+        "name": "voxel"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VoxelToMeshBasic": {
+    "display_name": "VoxelToMeshBasic",
+    "inputs": {
+      "threshold": {
+        "name": "آستانه"
+      },
+      "voxel": {
+        "name": "voxel"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Wan22FunControlToVideo": {
+    "display_name": "Wan22FunControlToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه بچ"
+      },
+      "control_video": {
+        "name": "ویدیوی کنترل"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "ref_image": {
+        "name": "تصویر مرجع"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "Wan22ImageToVideoLatent": {
+    "display_name": "Wan22ImageToVideoLatent",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه بچ"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "start_image": {
+        "name": "تصویر شروع"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanAnimateToVideo": {
+    "display_name": "WanAnimateToVideo",
+    "inputs": {
+      "background_video": {
+        "name": "ویدیوی پس‌زمینه"
+      },
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "character_mask": {
+        "name": "ماسک کاراکتر"
+      },
+      "clip_vision_output": {
+        "name": "خروجی clip vision"
+      },
+      "continue_motion": {
+        "name": "ادامه حرکت"
+      },
+      "continue_motion_max_frames": {
+        "name": "حداکثر فریم‌های ادامه حرکت"
+      },
+      "face_video": {
+        "name": "ویدیوی چهره"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "pose_video": {
+        "name": "ویدیوی ژست"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "reference_image": {
+        "name": "تصویر مرجع"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "video_frame_offset": {
+        "name": "افست فریم ویدیو",
+        "tooltip": "مقدار فریم‌هایی که باید در تمام ویدیوهای ورودی جست‌وجو شود. برای تولید ویدیوهای طولانی‌تر به صورت قطعه‌ای استفاده می‌شود. برای گسترش یک ویدیو، به خروجی video_frame_offset گره قبلی متصل کنید."
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      },
+      "3": {
+        "name": "trim_latent",
+        "tooltip": null
+      },
+      "4": {
+        "name": "برش تصویر",
+        "tooltip": null
+      },
+      "5": {
+        "name": "افست فریم ویدیو",
+        "tooltip": null
+      }
+    }
+  },
+  "WanCameraEmbedding": {
+    "display_name": "WanCameraEmbedding",
+    "inputs": {
+      "camera_pose": {
+        "name": "وضعیت دوربین"
+      },
+      "cx": {
+        "name": "cx"
+      },
+      "cy": {
+        "name": "cy"
+      },
+      "fx": {
+        "name": "fx"
+      },
+      "fy": {
+        "name": "fy"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "speed": {
+        "name": "سرعت"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "بردار دوربین",
+        "tooltip": null
+      },
+      "1": {
+        "name": "عرض",
+        "tooltip": null
+      },
+      "2": {
+        "name": "ارتفاع",
+        "tooltip": null
+      },
+      "3": {
+        "name": "طول",
+        "tooltip": null
+      }
+    }
+  },
+  "WanCameraImageToVideo": {
+    "display_name": "WanCameraImageToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "camera_conditions": {
+        "name": "شرایط دوربین"
+      },
+      "clip_vision_output": {
+        "name": "خروجی clip vision"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "start_image": {
+        "name": "تصویر شروع"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "WanContextWindowsManual": {
+    "description": "تنظیم دستی پنجره‌های زمینه برای مدل‌های مشابه WAN (بعد=۲).",
+    "display_name": "پنجره‌های زمینه WAN (دستی)",
+    "inputs": {
+      "closed_loop": {
+        "name": "حلقه بسته",
+        "tooltip": "آیا حلقه پنجره زمینه بسته شود؛ فقط برای زمان‌بندی حلقه‌ای قابل استفاده است."
+      },
+      "context_length": {
+        "name": "طول پنجره زمینه",
+        "tooltip": "طول پنجره زمینه."
+      },
+      "context_overlap": {
+        "name": "همپوشانی پنجره زمینه",
+        "tooltip": "میزان همپوشانی پنجره زمینه."
+      },
+      "context_schedule": {
+        "name": "زمان‌بندی پنجره زمینه",
+        "tooltip": "گام پنجره زمینه."
+      },
+      "context_stride": {
+        "name": "گام پنجره زمینه",
+        "tooltip": "گام پنجره زمینه؛ فقط برای زمان‌بندی یکنواخت قابل استفاده است."
+      },
+      "freenoise": {
+        "name": "freenoise",
+        "tooltip": "آیا از شافل نویز FreeNoise استفاده شود؛ باعث بهبود ترکیب پنجره‌ها می‌شود."
+      },
+      "fuse_method": {
+        "name": "روش ادغام",
+        "tooltip": "روشی که برای ادغام پنجره‌های زمینه استفاده می‌شود."
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "مدلی که پنجره‌های زمینه روی آن در هنگام نمونه‌گیری اعمال می‌شود."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "مدل با پنجره‌های زمینه اعمال‌شده در هنگام نمونه‌گیری."
+      }
+    }
+  },
+  "WanFirstLastFrameToVideo": {
+    "display_name": "WanFirstLastFrameToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "clip_vision_end_image": {
+        "name": "تصویر پایان clip vision"
+      },
+      "clip_vision_start_image": {
+        "name": "تصویر شروع clip vision"
+      },
+      "end_image": {
+        "name": "تصویر پایان"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "start_image": {
+        "name": "تصویر شروع"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "WanFunControlToVideo": {
+    "display_name": "WanFunControlToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "clip_vision_output": {
+        "name": "خروجی clip vision"
+      },
+      "control_video": {
+        "name": "ویدئوی کنترل"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "start_image": {
+        "name": "تصویر شروع"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "WanFunInpaintToVideo": {
+    "display_name": "WanFunInpaintToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "clip_vision_output": {
+        "name": "خروجی clip vision"
+      },
+      "end_image": {
+        "name": "تصویر پایان"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "start_image": {
+        "name": "تصویر شروع"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "WanHuMoImageToVideo": {
+    "display_name": "WanHuMoImageToVideo",
+    "inputs": {
+      "audio_encoder_output": {
+        "name": "خروجی رمزگذار صوتی"
+      },
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "ref_image": {
+        "name": "تصویر مرجع"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "WanImageToImageApi": {
+    "description": "یک تصویر را از یک یا دو تصویر ورودی و یک پرامپت متنی تولید می‌کند. تصویر خروجی در حال حاضر با وضوح ثابت ۱.۶ مگاپیکسل است و نسبت ابعاد آن با تصویر(های) ورودی مطابقت دارد.",
+    "display_name": "وان تصویر به تصویر",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "image": {
+        "name": "تصویر",
+        "tooltip": "ویرایش تک‌تصویر یا ترکیب چند تصویر. حداکثر ۲ تصویر."
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "مدلی که باید استفاده شود."
+      },
+      "negative_prompt": {
+        "name": "پرامپت منفی",
+        "tooltip": "پرامپت منفی که مواردی را که باید اجتناب شود توصیف می‌کند."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپتی که عناصر و ویژگی‌های بصری را توصیف می‌کند. از زبان انگلیسی و چینی پشتیبانی می‌کند."
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذری که برای تولید استفاده می‌شود."
+      },
+      "watermark": {
+        "name": "واترمارک",
+        "tooltip": "آیا واترمارک تولیدشده توسط هوش مصنوعی به نتیجه اضافه شود یا خیر."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanImageToVideo": {
+    "display_name": "وان تصویر به ویدیو",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه بچ"
+      },
+      "clip_vision_output": {
+        "name": "خروجی clip vision"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "start_image": {
+        "name": "تصویر شروع"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "WanImageToVideoApi": {
+    "description": "یک ویدیو را از اولین فریم و یک پرامپت متنی تولید می‌کند.",
+    "display_name": "وان تصویر به ویدیو",
+    "inputs": {
+      "audio": {
+        "name": "صدا",
+        "tooltip": "صدا باید دارای صدای واضح و بلند باشد و نویز اضافی یا موسیقی پس‌زمینه نداشته باشد."
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان",
+        "tooltip": "مدت زمان ۱۵ فقط برای مدل WAN2.6 در دسترس است."
+      },
+      "generate_audio": {
+        "name": "تولید صدا",
+        "tooltip": "اگر ورودی صوتی ارائه نشود، صدا به صورت خودکار تولید می‌شود."
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "مدلی که باید استفاده شود."
+      },
+      "negative_prompt": {
+        "name": "پرامپت منفی",
+        "tooltip": "پرامپت منفی که مواردی را که باید اجتناب شود توصیف می‌کند."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپتی که عناصر و ویژگی‌های بصری را توصیف می‌کند. از زبان انگلیسی و چینی پشتیبانی می‌کند."
+      },
+      "prompt_extend": {
+        "name": "گسترش پرامپت",
+        "tooltip": "آیا پرامپت با کمک هوش مصنوعی تقویت شود یا خیر."
+      },
+      "resolution": {
+        "name": "وضوح"
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذری که برای تولید استفاده می‌شود."
+      },
+      "shot_type": {
+        "name": "نوع برداشت",
+        "tooltip": "نوع برداشت برای ویدیوی تولیدشده را مشخص می‌کند؛ یعنی ویدیو یک برداشت پیوسته باشد یا چند برداشت با برش. این پارامتر فقط زمانی اعمال می‌شود که گسترش پرامپت فعال باشد."
+      },
+      "watermark": {
+        "name": "واترمارک",
+        "tooltip": "آیا واترمارک تولیدشده توسط هوش مصنوعی به نتیجه اضافه شود یا خیر."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanInfiniteTalkToVideo": {
+    "display_name": "WanInfiniteTalkToVideo",
+    "inputs": {
+      "audio_encoder_output_1": {
+        "name": "خروجی رمزگذار صوتی ۱"
+      },
+      "audio_scale": {
+        "name": "مقیاس صوتی"
+      },
+      "clip_vision_output": {
+        "name": "خروجی بینایی clip"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "mode": {
+        "name": "حالت"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "model_patch": {
+        "name": "patch مدل"
+      },
+      "motion_frame_count": {
+        "name": "تعداد فریم‌های حرکتی",
+        "tooltip": "تعداد فریم‌های قبلی که به عنوان زمینه حرکت استفاده می‌شود."
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "previous_frames": {
+        "name": "فریم‌های قبلی"
+      },
+      "start_image": {
+        "name": "تصویر شروع"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مدل",
+        "tooltip": null
+      },
+      "1": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "2": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "3": {
+        "name": "latent",
+        "tooltip": null
+      },
+      "4": {
+        "name": "تصویر برش‌خورده",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveConcatTrack": {
+    "display_name": "WanMoveConcatTrack",
+    "inputs": {
+      "tracks_1": {
+        "name": "tracks_1"
+      },
+      "tracks_2": {
+        "name": "tracks_2"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveTrackToVideo": {
+    "display_name": "WanMoveTrackToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه بچ"
+      },
+      "clip_vision_output": {
+        "name": "خروجی clip vision"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "start_image": {
+        "name": "تصویر شروع"
+      },
+      "strength": {
+        "name": "شدت",
+        "tooltip": "شدت شرط‌گذاری ترک."
+      },
+      "tracks": {
+        "name": "ترک‌ها"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveTracksFromCoords": {
+    "display_name": "WanMoveTracksFromCoords",
+    "inputs": {
+      "track_coords": {
+        "name": "track_coords"
+      },
+      "track_mask": {
+        "name": "track_mask"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "track_length",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveVisualizeTracks": {
+    "display_name": "WanMoveVisualizeTracks",
+    "inputs": {
+      "circle_size": {
+        "name": "اندازه دایره"
+      },
+      "images": {
+        "name": "تصاویر"
+      },
+      "line_resolution": {
+        "name": "وضوح خط"
+      },
+      "line_width": {
+        "name": "ضخامت خط"
+      },
+      "opacity": {
+        "name": "شفافیت"
+      },
+      "tracks": {
+        "name": "ترک‌ها"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanPhantomSubjectToVideo": {
+    "display_name": "WanPhantomSubjectToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه بچ"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "images": {
+        "name": "تصاویر"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "متن منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "متن تصویر منفی",
+        "tooltip": null
+      },
+      "3": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "WanReferenceVideoApi": {
+    "description": "از شخصیت و صدای ویدیوهای ورودی به همراه یک پرامپت برای تولید ویدیوی جدیدی استفاده کنید که ثبات شخصیت را حفظ می‌کند.",
+    "display_name": "وان رفرنس به ویدیو",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "negative_prompt": {
+        "name": "پرامپت منفی",
+        "tooltip": "پرامپت منفی برای توصیف مواردی که باید از آن‌ها اجتناب شود."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپتی که عناصر و ویژگی‌های بصری را توصیف می‌کند. از زبان انگلیسی و چینی پشتیبانی می‌شود. برای اشاره به شخصیت‌های مرجع از شناسه‌هایی مانند `character1` و `character2` استفاده کنید."
+      },
+      "reference_videos": {
+        "name": "ویدیوهای مرجع"
+      },
+      "seed": {
+        "name": "بذر"
+      },
+      "shot_type": {
+        "name": "نوع برداشت",
+        "tooltip": "نوع برداشت برای ویدیوی تولید شده را مشخص می‌کند، یعنی اینکه ویدیو یک برداشت پیوسته باشد یا شامل چند برداشت با برش."
+      },
+      "size": {
+        "name": "اندازه"
+      },
+      "watermark": {
+        "name": "واترمارک",
+        "tooltip": "آیا یک واترمارک تولیدشده توسط هوش مصنوعی به نتیجه اضافه شود یا خیر."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanSCAILToVideo": {
+    "display_name": "WanSCAILToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه دسته"
+      },
+      "clip_vision_output": {
+        "name": "خروجی clip vision"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "pose_end": {
+        "name": "پایان pose",
+        "tooltip": "گام پایان برای استفاده از pose conditioning."
+      },
+      "pose_start": {
+        "name": "شروع pose",
+        "tooltip": "گام شروع برای استفاده از pose conditioning."
+      },
+      "pose_strength": {
+        "name": "قدرت pose",
+        "tooltip": "قدرت pose در latent."
+      },
+      "pose_video": {
+        "name": "ویدئوی pose",
+        "tooltip": "ویدئو برای pose conditioning استفاده می‌شود. به نصف وضوح ویدئوی اصلی کاهش داده می‌شود."
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "reference_image": {
+        "name": "تصویر مرجع"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": "latent خالی با اندازه تولید."
+      }
+    }
+  },
+  "WanSoundImageToVideo": {
+    "display_name": "وان‌ساند ایمیج تو ویدیو",
+    "inputs": {
+      "audio_encoder_output": {
+        "name": "خروجی انکودر صوتی"
+      },
+      "batch_size": {
+        "name": "اندازه بچ"
+      },
+      "control_video": {
+        "name": "کنترل ویدیو"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "ref_image": {
+        "name": "تصویر مرجع"
+      },
+      "ref_motion": {
+        "name": "حرکت مرجع"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "WanSoundImageToVideoExtend": {
+    "display_name": "وان‌ساند ایمیج تو ویدیو اکستند",
+    "inputs": {
+      "audio_encoder_output": {
+        "name": "خروجی انکودر صوتی"
+      },
+      "control_video": {
+        "name": "کنترل ویدیو"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "ref_image": {
+        "name": "تصویر مرجع"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "video_latent": {
+        "name": "ویدیو latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "WanTextToImageApi": {
+    "description": "تولید تصویر بر اساس یک پرامپت متنی.",
+    "display_name": "وان تبدیل متن به تصویر",
+    "inputs": {
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "مدلی که باید استفاده شود."
+      },
+      "negative_prompt": {
+        "name": "پرامپت منفی",
+        "tooltip": "پرامپت منفی که مواردی را که باید اجتناب شود توصیف می‌کند."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپتی که عناصر و ویژگی‌های بصری را توصیف می‌کند. از زبان انگلیسی و چینی پشتیبانی می‌کند."
+      },
+      "prompt_extend": {
+        "name": "افزایش پرامپت",
+        "tooltip": "آیا پرامپت با کمک هوش مصنوعی بهبود یابد یا خیر."
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذری که برای تولید استفاده می‌شود."
+      },
+      "watermark": {
+        "name": "واترمارک",
+        "tooltip": "آیا واترمارک تولیدشده توسط هوش مصنوعی به نتیجه اضافه شود یا خیر."
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanTextToVideoApi": {
+    "description": "تولید ویدیو بر اساس یک پرامپت متنی.",
+    "display_name": "وان تبدیل متن به ویدیو",
+    "inputs": {
+      "audio": {
+        "name": "صدا",
+        "tooltip": "صدا باید دارای گفتار واضح و بلند باشد و نویز اضافی یا موسیقی پس‌زمینه نداشته باشد."
+      },
+      "control_after_generate": {
+        "name": "کنترل پس از تولید"
+      },
+      "duration": {
+        "name": "مدت زمان",
+        "tooltip": "مدت زمان ۱۵ ثانیه فقط برای مدل Wan 2.6 در دسترس است."
+      },
+      "generate_audio": {
+        "name": "تولید صدا",
+        "tooltip": "در صورت عدم ارائه ورودی صوتی، صدا به صورت خودکار تولید می‌شود."
+      },
+      "model": {
+        "name": "مدل",
+        "tooltip": "مدلی که باید استفاده شود."
+      },
+      "negative_prompt": {
+        "name": "پرامپت منفی",
+        "tooltip": "پرامپت منفی که مواردی را که باید اجتناب شود توصیف می‌کند."
+      },
+      "prompt": {
+        "name": "پرامپت",
+        "tooltip": "پرامپتی که عناصر و ویژگی‌های بصری را توصیف می‌کند. از زبان انگلیسی و چینی پشتیبانی می‌کند."
+      },
+      "prompt_extend": {
+        "name": "افزایش پرامپت",
+        "tooltip": "آیا پرامپت با کمک هوش مصنوعی بهبود یابد یا خیر."
+      },
+      "seed": {
+        "name": "بذر",
+        "tooltip": "بذری که برای تولید استفاده می‌شود."
+      },
+      "shot_type": {
+        "name": "نوع برداشت",
+        "tooltip": "نوع برداشت برای ویدیوی تولیدشده را مشخص می‌کند؛ یعنی ویدیو یک برداشت پیوسته باشد یا چند برداشت با برش. این پارامتر فقط زمانی اعمال می‌شود که افزایش پرامپت فعال باشد."
+      },
+      "size": {
+        "name": "اندازه"
+      },
+      "watermark": {
+        "name": "واترمارک",
+        "tooltip": "آیا واترمارک تولیدشده توسط هوش مصنوعی به نتیجه اضافه شود یا خیر."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanTrackToVideo": {
+    "display_name": "WanTrackToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه بچ"
+      },
+      "clip_vision_output": {
+        "name": "خروجی clip vision"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "start_image": {
+        "name": "تصویر شروع"
+      },
+      "temperature": {
+        "name": "دمای تصادفی‌سازی"
+      },
+      "topk": {
+        "name": "topk"
+      },
+      "tracks": {
+        "name": "ترک‌ها"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "WanVaceToVideo": {
+    "display_name": "WanVaceToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "اندازه بچ"
+      },
+      "control_masks": {
+        "name": "ماسک‌های کنترل"
+      },
+      "control_video": {
+        "name": "ویدئوی کنترل"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "length": {
+        "name": "طول"
+      },
+      "negative": {
+        "name": "منفی"
+      },
+      "positive": {
+        "name": "مثبت"
+      },
+      "reference_image": {
+        "name": "تصویر مرجع"
+      },
+      "strength": {
+        "name": "شدت"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "عرض"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "مثبت",
+        "tooltip": null
+      },
+      "1": {
+        "name": "منفی",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      },
+      "3": {
+        "name": "trim_latent",
+        "tooltip": null
+      }
+    }
+  },
+  "WavespeedFlashVSRNode": {
+    "description": "افزایش‌دهنده سریع و با کیفیت ویدیو که وضوح را افزایش داده و شفافیت را برای ویدیوهای کم‌کیفیت یا تار بازمی‌گرداند.",
+    "display_name": "افزایش کیفیت ویدیو FlashVSR",
+    "inputs": {
+      "target_resolution": {
+        "name": "وضوح هدف"
+      },
+      "video": {
+        "name": "ویدیو"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WavespeedImageUpscaleNode": {
+    "description": "افزایش وضوح و کیفیت تصویر، ارتقاء عکس‌ها به ۴K یا ۸K برای نتایج شفاف و با جزئیات.",
+    "display_name": "افزایش کیفیت تصویر WaveSpeed",
+    "inputs": {
+      "image": {
+        "name": "تصویر"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "target_resolution": {
+        "name": "وضوح هدف"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WebcamCapture": {
+    "display_name": "دریافت از وب‌کم",
+    "inputs": {
+      "capture_on_queue": {
+        "name": "دریافت هنگام صف"
+      },
+      "height": {
+        "name": "ارتفاع"
+      },
+      "image": {
+        "name": "تصویر"
+      },
+      "waiting for camera___": {},
+      "width": {
+        "name": "عرض"
+      }
+    }
+  },
+  "ZImageFunControlnet": {
+    "display_name": "ZImageFunControlnet",
+    "inputs": {
+      "image": {
+        "name": "تصویر"
+      },
+      "inpaint_image": {
+        "name": "تصویر inpaint"
+      },
+      "mask": {
+        "name": "ماسک"
+      },
+      "model": {
+        "name": "مدل"
+      },
+      "model_patch": {
+        "name": "patch مدل"
+      },
+      "strength": {
+        "name": "شدت"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
+  "unCLIPCheckpointLoader": {
+    "display_name": "unCLIPCheckpointLoader",
+    "inputs": {
+      "ckpt_name": {
+        "name": "نام Checkpoint"
+      }
+    }
+  },
+  "unCLIPConditioning": {
+    "display_name": "unCLIPConditioning",
+    "inputs": {
+      "clip_vision_output": {
+        "name": "خروجی بینایی clip"
+      },
+      "conditioning": {
+        "name": "شرط‌گذاری"
+      },
+      "noise_augmentation": {
+        "name": "افزایش نویز"
+      },
+      "strength": {
+        "name": "شدت"
+      }
+    }
+  },
+  "wanBlockSwap": {
+    "description": "NOP",
+    "display_name": "wanBlockSwap",
+    "inputs": {
+      "model": {
+        "name": "مدل"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  }
+}
diff --git a/src/locales/fa/settings.json b/src/locales/fa/settings.json
new file mode 100644
index 0000000000..4764d4a70f
--- /dev/null
+++ b/src/locales/fa/settings.json
@@ -0,0 +1,499 @@
+{
+  "Comfy-Desktop_AutoUpdate": {
+    "name": "بررسی خودکار برای به‌روزرسانی‌ها"
+  },
+  "Comfy-Desktop_SendStatistics": {
+    "name": "ارسال آمار استفاده ناشناس"
+  },
+  "Comfy-Desktop_UV_PypiInstallMirror": {
+    "name": "آینه نصب Pypi",
+    "tooltip": "آینه پیش‌فرض برای نصب pip"
+  },
+  "Comfy-Desktop_UV_PythonInstallMirror": {
+    "name": "آینه نصب Python",
+    "tooltip": "نصب‌های مدیریت‌شده Python از پروژه Astral python-build-standalone دانلود می‌شوند. این متغیر می‌تواند به یک آدرس آینه تنظیم شود تا منبع متفاوتی برای نصب‌های Python استفاده شود. آدرس ارائه‌شده جایگزین https://github.com/astral-sh/python-build-standalone/releases/download در مثال زیر خواهد شد: https://github.com/astral-sh/python-build-standalone/releases/download/20240713/cpython-3.12.4%2B20240713-aarch64-apple-darwin-install_only.tar.gz. توزیع‌ها را می‌توان با استفاده از طرح آدرس file:// از یک پوشه محلی خواند."
+  },
+  "Comfy-Desktop_UV_TorchInstallMirror": {
+    "name": "آینه نصب Torch",
+    "tooltip": "آینه pip برای نصب pytorch"
+  },
+  "Comfy-Desktop_WindowStyle": {
+    "name": "سبک پنجره",
+    "options": {
+      "custom": "سفارشی",
+      "default": "پیش‌فرض"
+    },
+    "tooltip": "سفارشی: نوار عنوان سیستم با منوی بالای ComfyUI جایگزین می‌شود"
+  },
+  "Comfy_Canvas_BackgroundImage": {
+    "name": "تصویر پس‌زمینه بوم",
+    "tooltip": "آدرس تصویر برای پس‌زمینه بوم. می‌توانید روی یک تصویر در پانل خروجی راست‌کلیک کرده و «تنظیم به عنوان پس‌زمینه» را انتخاب کنید یا تصویر دلخواه خود را با دکمه بارگذاری، بارگذاری نمایید."
+  },
+  "Comfy_Canvas_LeftMouseClickBehavior": {
+    "name": "رفتار کلیک چپ ماوس",
+    "options": {
+      "Panning": "جابجایی",
+      "Select": "انتخاب"
+    }
+  },
+  "Comfy_Canvas_MouseWheelScroll": {
+    "name": "اسکرول چرخ ماوس",
+    "options": {
+      "Panning": "جابجایی",
+      "Zoom in/out": "بزرگ‌نمایی/کوچک‌نمایی"
+    }
+  },
+  "Comfy_Canvas_NavigationMode": {
+    "name": "حالت ناوبری",
+    "options": {
+      "Custom": "سفارشی",
+      "Drag Navigation": "ناوبری با کشیدن",
+      "Standard (New)": "استاندارد (جدید)"
+    }
+  },
+  "Comfy_Canvas_SelectionToolbox": {
+    "name": "نمایش جعبه ابزار انتخاب",
+    "tooltip": "نمایش یک نوار ابزار شناور هنگام انتخاب nodeها، برای دسترسی سریع به اقدامات متداول."
+  },
+  "Comfy_ConfirmClear": {
+    "name": "نیاز به تأیید هنگام پاک‌سازی workflow"
+  },
+  "Comfy_DOMClippingEnabled": {
+    "name": "فعال‌سازی برش عناصر DOM (فعال‌سازی ممکن است عملکرد را کاهش دهد)"
+  },
+  "Comfy_DevMode": {
+    "name": "فعال‌سازی گزینه‌های حالت توسعه (ذخیره API و غیره)"
+  },
+  "Comfy_DisableFloatRounding": {
+    "name": "غیرفعال‌سازی گرد کردن پیش‌فرض اعداد اعشاری.",
+    "tooltip": "(نیاز به بارگذاری مجدد صفحه) امکان غیرفعال‌سازی گرد کردن زمانی که توسط node در backend تنظیم شده باشد وجود ندارد."
+  },
+  "Comfy_DisableSliders": {
+    "name": "غیرفعال‌سازی اسلایدرهای ابزارک node"
+  },
+  "Comfy_EditAttention_Delta": {
+    "name": "دقت Ctrl+بالا/پایین"
+  },
+  "Comfy_EnableTooltips": {
+    "name": "فعال‌سازی راهنماها"
+  },
+  "Comfy_EnableWorkflowViewRestore": {
+    "name": "ذخیره و بازیابی موقعیت و سطح بزرگ‌نمایی بوم در workflowها"
+  },
+  "Comfy_Execution_PreviewMethod": {
+    "name": "روش پیش‌نمایش زنده",
+    "options": {
+      "auto": "خودکار",
+      "default": "پیش‌فرض",
+      "latent2rgb": "latent2rgb",
+      "none": "هیچ‌کدام",
+      "taesd": "taesd"
+    },
+    "tooltip": "روش پیش‌نمایش زنده هنگام تولید تصویر. «پیش‌فرض» از تنظیم CLI سرور استفاده می‌کند."
+  },
+  "Comfy_FloatRoundingPrecision": {
+    "name": "تعداد ارقام اعشاری گرد کردن ابزارک اعشاری [۰ = خودکار].",
+    "tooltip": "(نیاز به بارگذاری مجدد صفحه)"
+  },
+  "Comfy_Graph_CanvasInfo": {
+    "name": "نمایش اطلاعات بوم در گوشه پایین سمت چپ (fps و غیره)"
+  },
+  "Comfy_Graph_CanvasMenu": {
+    "name": "نمایش منوی بوم گراف"
+  },
+  "Comfy_Graph_CtrlShiftZoom": {
+    "name": "فعال‌سازی میانبر بزرگ‌نمایی سریع (Ctrl + Shift + کشیدن)"
+  },
+  "Comfy_Graph_DeduplicateSubgraphNodeIds": {
+    "name": "حذف شناسه‌های تکراری node در زیرگراف",
+    "tooltip": "شناسه‌های تکراری node در زیرگراف‌ها هنگام بارگذاری workflow به‌صورت خودکار دوباره اختصاص داده می‌شوند."
+  },
+  "Comfy_Graph_LinkMarkers": {
+    "name": "نشانگرهای میانه‌ی پیوند",
+    "options": {
+      "Arrow": "پیکان",
+      "Circle": "دایره",
+      "None": "هیچ‌کدام"
+    }
+  },
+  "Comfy_Graph_LiveSelection": {
+    "name": "انتخاب زنده",
+    "tooltip": "در صورت فعال بودن، nodeها به صورت آنی هنگام کشیدن مستطیل انتخاب، انتخاب یا لغو انتخاب می‌شوند؛ مشابه سایر ابزارهای طراحی."
+  },
+  "Comfy_Graph_ZoomSpeed": {
+    "name": "سرعت بزرگ‌نمایی بوم"
+  },
+  "Comfy_GroupSelectedNodes_Padding": {
+    "name": "فاصله داخلی nodeهای انتخاب‌شده در گروه"
+  },
+  "Comfy_Group_DoubleClickTitleToEdit": {
+    "name": "دوبار کلیک روی عنوان گروه برای ویرایش"
+  },
+  "Comfy_LinkRelease_Action": {
+    "name": "عملکرد هنگام رها کردن پیوند (بدون کلید ترکیبی)",
+    "options": {
+      "context menu": "منوی زمینه",
+      "no action": "بدون عمل",
+      "search box": "جعبه جستجو"
+    }
+  },
+  "Comfy_LinkRelease_ActionShift": {
+    "name": "عملکرد هنگام رها کردن پیوند (کلید Shift)",
+    "options": {
+      "context menu": "منوی زمینه",
+      "no action": "بدون عمل",
+      "search box": "جعبه جستجو"
+    }
+  },
+  "Comfy_LinkRenderMode": {
+    "name": "حالت نمایش پیوند",
+    "options": {
+      "Hidden": "مخفی",
+      "Linear": "خطی",
+      "Spline": "اسپلاین",
+      "Straight": "مستقیم"
+    },
+    "tooltip": "ظاهر و نمایش پیوندهای ارتباطی بین nodeها روی canvas را کنترل می‌کند."
+  },
+  "Comfy_Load3D_3DViewerEnable": {
+    "name": "فعال‌سازی نمایشگر سه‌بعدی (بتا)",
+    "tooltip": "نمایشگر سه‌بعدی (بتا) را برای nodeهای انتخاب‌شده فعال می‌کند. این قابلیت به شما امکان می‌دهد مدل‌های سه‌بعدی را مستقیماً در نمایشگر سه‌بعدی با اندازه کامل مشاهده و با آن‌ها تعامل داشته باشید."
+  },
+  "Comfy_Load3D_BackgroundColor": {
+    "name": "رنگ پس‌زمینه اولیه",
+    "tooltip": "رنگ پیش‌فرض پس‌زمینه صحنه سه‌بعدی را کنترل می‌کند. این تنظیم ظاهر پس‌زمینه را هنگام ایجاد یک ابزارک سه‌بعدی جدید تعیین می‌کند، اما پس از ایجاد، می‌توان آن را برای هر ابزارک به صورت جداگانه تغییر داد."
+  },
+  "Comfy_Load3D_CameraType": {
+    "name": "نوع دوربین اولیه",
+    "options": {
+      "orthographic": "orthographic",
+      "perspective": "perspective"
+    },
+    "tooltip": "تعیین می‌کند که دوربین به صورت پیش‌فرض هنگام ایجاد یک ابزارک سه‌بعدی جدید، perspective یا orthographic باشد. این پیش‌فرض را می‌توان برای هر ابزارک به صورت جداگانه تغییر داد."
+  },
+  "Comfy_Load3D_LightAdjustmentIncrement": {
+    "name": "گام تنظیم نور",
+    "tooltip": "اندازه گام هنگام تنظیم شدت نور در صحنه‌های سه‌بعدی را کنترل می‌کند. مقدار گام کوچکتر امکان کنترل دقیق‌تر نور را فراهم می‌کند، در حالی که مقدار بزرگ‌تر باعث تغییرات محسوس‌تر در هر تنظیم می‌شود."
+  },
+  "Comfy_Load3D_LightIntensity": {
+    "name": "شدت نور اولیه",
+    "tooltip": "سطح روشنایی پیش‌فرض نور در صحنه سه‌بعدی را تعیین می‌کند. این مقدار مشخص می‌کند که نورها هنگام ایجاد یک ابزارک سه‌بعدی جدید با چه شدتی به اشیاء تابیده می‌شوند، اما می‌توان آن را برای هر ابزارک به صورت جداگانه تغییر داد."
+  },
+  "Comfy_Load3D_LightIntensityMaximum": {
+    "name": "حداکثر شدت نور",
+    "tooltip": "حداکثر مقدار مجاز شدت نور برای صحنه‌های سه‌بعدی را تعیین می‌کند. این مقدار، بالاترین حد روشنایی را هنگام تنظیم نور در هر ابزارک سه‌بعدی مشخص می‌کند."
+  },
+  "Comfy_Load3D_LightIntensityMinimum": {
+    "name": "حداقل شدت نور",
+    "tooltip": "حداقل مقدار مجاز شدت نور برای صحنه‌های سه‌بعدی را تعیین می‌کند. این مقدار، پایین‌ترین حد روشنایی را هنگام تنظیم نور در هر ابزارک سه‌بعدی مشخص می‌کند."
+  },
+  "Comfy_Load3D_PLYEngine": {
+    "name": "موتور PLY",
+    "options": {
+      "fastply": "fastply",
+      "sparkjs": "sparkjs",
+      "threejs": "threejs"
+    },
+    "tooltip": "موتور بارگذاری فایل‌های PLY را انتخاب کنید. «threejs» از PLYLoader بومی Three.js استفاده می‌کند (مناسب برای فایل‌های مش PLY). «fastply» از یک بارگذار بهینه‌شده برای فایل‌های point cloud PLY به صورت ASCII استفاده می‌کند. «sparkjs» از Spark.js برای فایل‌های 3D Gaussian Splatting PLY استفاده می‌کند."
+  },
+  "Comfy_Load3D_ShowGrid": {
+    "name": "نمایش اولیه شبکه",
+    "tooltip": "تعیین می‌کند که شبکه (Grid) به صورت پیش‌فرض هنگام ایجاد یک ابزارک سه‌بعدی جدید قابل مشاهده باشد یا خیر. این پیش‌فرض را می‌توان برای هر ابزارک به صورت جداگانه تغییر داد."
+  },
+  "Comfy_Locale": {
+    "name": "زبان"
+  },
+  "Comfy_MaskEditor_BrushAdjustmentSpeed": {
+    "name": "ضریب سرعت تنظیم قلم‌مو",
+    "tooltip": "کنترل می‌کند که اندازه و سختی قلم‌مو هنگام تنظیم با چه سرعتی تغییر کند. مقادیر بالاتر به معنای تغییرات سریع‌تر است."
+  },
+  "Comfy_MaskEditor_UseDominantAxis": {
+    "name": "قفل تنظیم قلم‌مو به محور غالب",
+    "tooltip": "در صورت فعال بودن، تنظیمات قلم‌مو فقط اندازه یا سختی را بر اساس جهتی که بیشتر حرکت می‌کنید تغییر می‌دهد."
+  },
+  "Comfy_ModelLibrary_AutoLoadAll": {
+    "name": "بارگذاری خودکار همه پوشه‌های مدل",
+    "tooltip": "اگر فعال باشد، همه پوشه‌ها به محض باز کردن کتابخانه مدل بارگذاری می‌شوند (این کار ممکن است باعث تأخیر در بارگذاری شود). اگر غیرفعال باشد، پوشه‌های مدل در سطح ریشه فقط پس از کلیک شما بارگذاری می‌شوند."
+  },
+  "Comfy_ModelLibrary_NameFormat": {
+    "name": "نمایش نام در نمای درختی کتابخانه مدل",
+    "options": {
+      "filename": "filename",
+      "title": "title"
+    },
+    "tooltip": "گزینه «filename» را انتخاب کنید تا نمای ساده‌ای از نام فایل خام (بدون مسیر یا پسوند \".safetensors\") در لیست مدل نمایش داده شود. گزینه «title» عنوان متادیتای قابل تنظیم مدل را نمایش می‌دهد."
+  },
+  "Comfy_NodeBadge_NodeIdBadgeMode": {
+    "name": "حالت نشان شناسه نود",
+    "options": {
+      "None": "هیچ‌کدام",
+      "Show all": "نمایش همه"
+    }
+  },
+  "Comfy_NodeBadge_NodeLifeCycleBadgeMode": {
+    "name": "حالت نشان چرخه عمر نود",
+    "options": {
+      "None": "هیچ‌کدام",
+      "Show all": "نمایش همه"
+    }
+  },
+  "Comfy_NodeBadge_NodeSourceBadgeMode": {
+    "name": "حالت نشان منبع نود",
+    "options": {
+      "Hide built-in": "مخفی کردن داخلی‌ها",
+      "None": "هیچ‌کدام",
+      "Show all": "نمایش همه"
+    }
+  },
+  "Comfy_NodeBadge_ShowApiPricing": {
+    "name": "نمایش نشان قیمت‌گذاری API نود"
+  },
+  "Comfy_NodeLibrary_NewDesign": {
+    "name": "طراحی جدید کتابخانه Node",
+    "tooltip": "فعال‌سازی نوار کناری بازطراحی‌شده کتابخانه node با تب‌های (ضروری، همه، سفارشی)، جستجوی بهبود یافته و پیش‌نمایش هنگام قرار گرفتن نشانگر ماوس."
+  },
+  "Comfy_NodeReplacement_Enabled": {
+    "name": "فعال‌سازی جایگزینی خودکار node",
+    "tooltip": "در صورت فعال بودن، nodeهای مفقود می‌توانند به‌طور خودکار با معادل‌های جدیدتر خود جایگزین شوند اگر نگاشت جایگزینی وجود داشته باشد."
+  },
+  "Comfy_NodeSearchBoxImpl": {
+    "name": "پیاده‌سازی جعبه جستجوی نود",
+    "options": {
+      "default": "پیش‌فرض",
+      "litegraph (legacy)": "litegraph (قدیمی)",
+      "v1 (legacy)": "v۱ (قدیمی)"
+    }
+  },
+  "Comfy_NodeSearchBoxImpl_NodePreview": {
+    "name": "پیش‌نمایش نود",
+    "tooltip": "فقط برای پیاده‌سازی پیش‌فرض اعمال می‌شود"
+  },
+  "Comfy_NodeSearchBoxImpl_ShowCategory": {
+    "name": "نمایش دسته‌بندی نود در نتایج جستجو",
+    "tooltip": "فقط برای پیاده‌سازی پیش‌فرض اعمال می‌شود"
+  },
+  "Comfy_NodeSearchBoxImpl_ShowIdName": {
+    "name": "نمایش نام شناسه نود در نتایج جستجو",
+    "tooltip": "فقط برای پیاده‌سازی پیش‌فرض اعمال می‌شود"
+  },
+  "Comfy_NodeSearchBoxImpl_ShowNodeFrequency": {
+    "name": "نمایش فراوانی نود در نتایج جستجو",
+    "tooltip": "فقط برای پیاده‌سازی پیش‌فرض اعمال می‌شود"
+  },
+  "Comfy_NodeSuggestions_number": {
+    "name": "تعداد پیشنهادهای node",
+    "tooltip": "فقط برای جعبه جستجوی litegraph/منوی زمینه"
+  },
+  "Comfy_Node_AllowImageSizeDraw": {
+    "name": "نمایش عرض × ارتفاع زیر پیش‌نمایش تصویر"
+  },
+  "Comfy_Node_AlwaysShowAdvancedWidgets": {
+    "name": "نمایش همیشگی ابزارهای پیشرفته در همه نودها",
+    "tooltip": "در صورت فعال بودن، ابزارهای پیشرفته همیشه در همه نودها قابل مشاهده هستند و نیازی به باز کردن جداگانه آن‌ها نیست."
+  },
+  "Comfy_Node_AutoSnapLinkToSlot": {
+    "name": "اتصال خودکار لینک به اسلات نود",
+    "tooltip": "هنگام کشیدن یک لینک روی نود، لینک به طور خودکار به ورودی مناسب روی نود متصل می‌شود."
+  },
+  "Comfy_Node_BypassAllLinksOnDelete": {
+    "name": "حفظ همه لینک‌ها هنگام حذف نود",
+    "tooltip": "هنگام حذف یک نود، تلاش می‌شود همه ورودی‌ها و خروجی‌های آن مجدداً به هم متصل شوند (با عبور از نود حذف‌شده)."
+  },
+  "Comfy_Node_DoubleClickTitleToEdit": {
+    "name": "ویرایش عنوان نود با دوبار کلیک"
+  },
+  "Comfy_Node_MiddleClickRerouteNode": {
+    "name": "ایجاد نود Reroute با کلیک وسط"
+  },
+  "Comfy_Node_Opacity": {
+    "name": "شفافیت نود"
+  },
+  "Comfy_Node_ShowDeprecated": {
+    "name": "نمایش نودهای منسوخ در جستجو",
+    "tooltip": "نودهای منسوخ به طور پیش‌فرض در رابط کاربری پنهان هستند، اما در workflowهای موجود که از آن‌ها استفاده می‌کنند، همچنان فعال خواهند بود."
+  },
+  "Comfy_Node_ShowExperimental": {
+    "name": "نمایش نودهای آزمایشی در جستجو",
+    "tooltip": "نودهای آزمایشی در رابط کاربری به این صورت علامت‌گذاری می‌شوند و ممکن است در نسخه‌های آینده تغییرات اساسی یا حذف شوند. در workflowهای تولیدی با احتیاط استفاده شود."
+  },
+  "Comfy_Node_SnapHighlightsNode": {
+    "name": "برجسته‌سازی نود هنگام اتصال لینک",
+    "tooltip": "هنگام کشیدن یک لینک روی نود با ورودی مناسب، نود برجسته می‌شود."
+  },
+  "Comfy_Notification_ShowVersionUpdates": {
+    "name": "نمایش به‌روزرسانی نسخه‌ها",
+    "tooltip": "نمایش به‌روزرسانی‌ها برای مدل‌های جدید و ویژگی‌های اصلی جدید."
+  },
+  "Comfy_Pointer_ClickBufferTime": {
+    "name": "تاخیر حرکت اشاره‌گر پس از کلیک",
+    "tooltip": "پس از فشردن دکمه اشاره‌گر، این بیشترین زمان (بر حسب میلی‌ثانیه) است که حرکت اشاره‌گر می‌تواند نادیده گرفته شود.\n\nبه جلوگیری از جابجایی ناخواسته اشیاء هنگام حرکت اشاره‌گر در حین کلیک کمک می‌کند."
+  },
+  "Comfy_Pointer_ClickDrift": {
+    "name": "میزان جابجایی اشاره‌گر هنگام کلیک (حداکثر فاصله)",
+    "tooltip": "اگر اشاره‌گر بیش از این فاصله در هنگام نگه داشتن دکمه حرکت کند، به عنوان کشیدن (drag) در نظر گرفته می‌شود نه کلیک.\n\nبه جلوگیری از جابجایی ناخواسته اشیاء هنگام حرکت اشاره‌گر در حین کلیک کمک می‌کند."
+  },
+  "Comfy_Pointer_DoubleClickTime": {
+    "name": "بازه زمانی دوبار کلیک (حداکثر)",
+    "tooltip": "حداکثر زمان به میلی‌ثانیه بین دو کلیک برای ثبت دوبار کلیک. افزایش این مقدار ممکن است در صورتی که دوبار کلیک گاهی ثبت نمی‌شود، کمک کند."
+  },
+  "Comfy_PreviewFormat": {
+    "name": "فرمت تصویر پیش‌نمایش",
+    "tooltip": "هنگام نمایش پیش‌نمایش در ابزارک تصویر، آن را به یک تصویر سبک مانند webp، jpeg، webp;50 و غیره تبدیل می‌کند."
+  },
+  "Comfy_PromptFilename": {
+    "name": "درخواست نام فایل هنگام ذخیره workflow"
+  },
+  "Comfy_QueueButton_BatchCountLimit": {
+    "name": "محدودیت تعداد batch",
+    "tooltip": "حداکثر تعداد taskهایی که با یک کلیک به صف اضافه می‌شوند"
+  },
+  "Comfy_Queue_MaxHistoryItems": {
+    "name": "اندازه تاریخچه صف",
+    "tooltip": "حداکثر تعداد taskهایی که در تاریخچه صف نمایش داده می‌شوند."
+  },
+  "Comfy_Queue_QPOV2": {
+    "name": "استفاده از صف کار یکپارچه در پنل کناری دارایی‌ها",
+    "tooltip": "پنل شناور صف کار را با صف کاری معادل که در پنل کناری دارایی‌ها قرار دارد جایگزین می‌کند. می‌توانید این گزینه را غیرفعال کنید تا به چیدمان پنل شناور بازگردید."
+  },
+  "Comfy_RightSidePanel_ShowErrorsTab": {
+    "name": "نمایش زبانه خطاها در پنل کناری",
+    "tooltip": "در صورت فعال بودن، زبانه‌ای برای نمایش خطاهای اجرای workflow در پنل سمت راست نمایش داده می‌شود تا بتوانید خطاها را به‌صورت یکجا مشاهده کنید."
+  },
+  "Comfy_Sidebar_Location": {
+    "name": "محل نوار کناری",
+    "options": {
+      "left": "چپ",
+      "right": "راست"
+    }
+  },
+  "Comfy_Sidebar_Size": {
+    "name": "اندازه نوار کناری",
+    "options": {
+      "normal": "معمولی",
+      "small": "کوچک"
+    }
+  },
+  "Comfy_Sidebar_Style": {
+    "name": "سبک نوار کناری",
+    "options": {
+      "connected": "متصل",
+      "floating": "شناور"
+    }
+  },
+  "Comfy_Sidebar_UnifiedWidth": {
+    "name": "عرض یکپارچه نوار کناری"
+  },
+  "Comfy_SnapToGrid_GridSize": {
+    "name": "اندازه شبکه برای چسباندن به شبکه",
+    "tooltip": "هنگام کشیدن و تغییر اندازه nodeها با نگه داشتن shift، آن‌ها به شبکه تراز می‌شوند. این گزینه اندازه آن شبکه را کنترل می‌کند."
+  },
+  "Comfy_TextareaWidget_FontSize": {
+    "name": "اندازه فونت ابزارک textarea"
+  },
+  "Comfy_TextareaWidget_Spellcheck": {
+    "name": "بررسی املای ابزارک textarea"
+  },
+  "Comfy_TreeExplorer_ItemPadding": {
+    "name": "فاصله داخلی آیتم‌های مرورگر درختی"
+  },
+  "Comfy_UI_TabBarLayout": {
+    "name": "چیدمان نوار تب",
+    "options": {
+      "Default": "پیش‌فرض",
+      "Integrated": "یکپارچه"
+    },
+    "tooltip": "چیدمان نوار تب را کنترل می‌کند. «یکپارچه» کنترل‌های راهنما و کاربر را به ناحیه نوار تب منتقل می‌کند."
+  },
+  "Comfy_UseNewMenu": {
+    "name": "استفاده از منوی جدید",
+    "options": {
+      "Disabled": "غیرفعال",
+      "Top": "بالا"
+    },
+    "tooltip": "فعال‌سازی نوار منوی بازطراحی‌شده بالا."
+  },
+  "Comfy_Validation_Workflows": {
+    "name": "اعتبارسنجی workflowها"
+  },
+  "Comfy_VueNodes_AutoScaleLayout": {
+    "name": "مقیاس‌بندی خودکار چیدمان (Nodes 2.0)",
+    "tooltip": "موقعیت nodeها را هنگام تغییر به رندر Nodes 2.0 به طور خودکار مقیاس‌بندی می‌کند تا از هم‌پوشانی جلوگیری شود"
+  },
+  "Comfy_VueNodes_Enabled": {
+    "name": "طراحی مدرن node (Nodes 2.0)",
+    "tooltip": "مدرن: رندر مبتنی بر DOM با تعامل‌پذیری بیشتر، ویژگی‌های بومی مرورگر و طراحی بصری به‌روز. کلاسیک: رندر سنتی مبتنی بر canvas."
+  },
+  "Comfy_WidgetControlMode": {
+    "name": "حالت کنترل ابزارک",
+    "options": {
+      "after": "بعد",
+      "before": "قبل"
+    },
+    "tooltip": "زمان به‌روزرسانی مقادیر ابزارک (تصادفی/افزایش/کاهش) را کنترل می‌کند؛ یا قبل از قرار گرفتن prompt در صف یا بعد از آن."
+  },
+  "Comfy_Window_UnloadConfirmation": {
+    "name": "نمایش تأیید هنگام بستن پنجره"
+  },
+  "Comfy_Workflow_AutoSave": {
+    "name": "ذخیره‌سازی خودکار",
+    "options": {
+      "after delay": "پس از تأخیر",
+      "off": "خاموش"
+    }
+  },
+  "Comfy_Workflow_AutoSaveDelay": {
+    "name": "تأخیر ذخیره‌سازی خودکار (میلی‌ثانیه)",
+    "tooltip": "فقط زمانی اعمال می‌شود که ذخیره‌سازی خودکار روی «پس از تأخیر» تنظیم شده باشد."
+  },
+  "Comfy_Workflow_ConfirmDelete": {
+    "name": "نمایش تأیید هنگام حذف ورک‌فلو"
+  },
+  "Comfy_Workflow_Persist": {
+    "name": "حفظ وضعیت ورک‌فلو و بازیابی هنگام بارگذاری (مجدد) صفحه"
+  },
+  "Comfy_Workflow_ShowMissingModelsWarning": {
+    "name": "نمایش هشدار مدل‌های مفقود"
+  },
+  "Comfy_Workflow_ShowMissingNodesWarning": {
+    "name": "نمایش هشدار نودهای مفقود"
+  },
+  "Comfy_Workflow_SortNodeIdOnSave": {
+    "name": "مرتب‌سازی شناسه نودها هنگام ذخیره ورک‌فلو"
+  },
+  "Comfy_Workflow_WarnBlueprintOverwrite": {
+    "name": "نیاز به تأیید برای بازنویسی بلوپرینت ساب‌گراف موجود"
+  },
+  "Comfy_Workflow_WorkflowTabsPosition": {
+    "name": "موقعیت ورک‌فلوهای باز شده",
+    "options": {
+      "Sidebar": "نوار کناری",
+      "Topbar": "نوار بالا"
+    }
+  },
+  "LiteGraph_Canvas_MaximumFps": {
+    "name": "حداکثر فریم بر ثانیه",
+    "tooltip": "حداکثر تعداد فریم در ثانیه که بوم مجاز به رندر است. مصرف GPU را با هزینه کاهش روانی محدود می‌کند. اگر ۰ باشد، نرخ تازه‌سازی صفحه نمایش استفاده می‌شود. پیش‌فرض: ۰"
+  },
+  "LiteGraph_Canvas_MinFontSizeForLOD": {
+    "name": "آستانه اندازه فونت برای سطح جزئیات نود هنگام زوم",
+    "tooltip": "کنترل می‌کند که نودها چه زمانی به رندر LOD با کیفیت پایین‌تر تغییر کنند. از اندازه فونت بر حسب پیکسل برای تعیین زمان تغییر استفاده می‌کند. برای غیرفعال کردن روی ۰ تنظیم کنید. مقادیر ۱ تا ۲۴ آستانه حداقل اندازه فونت برای LOD را تعیین می‌کنند - مقادیر بالاتر (۲۴ پیکسل) = تغییر سریع‌تر به رندر ساده هنگام زوم به بیرون، مقادیر پایین‌تر (۱ پیکسل) = حفظ کیفیت کامل نود برای مدت طولانی‌تر."
+  },
+  "LiteGraph_ContextMenu_Scaling": {
+    "name": "مقیاس‌بندی منوهای ترکیبی نود هنگام زوم"
+  },
+  "LiteGraph_Node_DefaultPadding": {
+    "name": "همیشه کوچک‌سازی نودهای جدید",
+    "tooltip": "تغییر اندازه نودها به کوچک‌ترین اندازه ممکن هنگام ایجاد. اگر غیرفعال باشد، نود جدید کمی عریض‌تر خواهد بود تا مقادیر ویجت نمایش داده شود."
+  },
+  "LiteGraph_Node_TooltipDelay": {
+    "name": "تأخیر نمایش راهنما"
+  },
+  "LiteGraph_Reroute_SplineOffset": {
+    "name": "افست اسپلاین مسیر مجدد",
+    "tooltip": "افست نقطه کنترل بزیه از نقطه مرکزی مسیر مجدد"
+  },
+  "pysssss_SnapToGrid": {
+    "name": "همیشه چسباندن به شبکه",
+    "tooltip": "در صورت فعال بودن، nodeها هنگام جابجایی یا تغییر اندازه به طور خودکار با شبکه تراز می‌شوند."
+  }
+}
diff --git a/src/locales/fr/commands.json b/src/locales/fr/commands.json
index 6c9711abab..a8bfd096ab 100644
--- a/src/locales/fr/commands.json
+++ b/src/locales/fr/commands.json
@@ -1,4 +1,40 @@
 {
+  "Comfy-Desktop_CheckForUpdates": {
+    "label": "Vérifier les mises à jour"
+  },
+  "Comfy-Desktop_Folders_OpenCustomNodesFolder": {
+    "label": "Ouvrir le dossier des Custom Nodes"
+  },
+  "Comfy-Desktop_Folders_OpenInputsFolder": {
+    "label": "Ouvrir le dossier des entrées"
+  },
+  "Comfy-Desktop_Folders_OpenLogsFolder": {
+    "label": "Ouvrir le dossier des journaux"
+  },
+  "Comfy-Desktop_Folders_OpenModelConfig": {
+    "label": "Ouvrir extra_model_paths.yaml"
+  },
+  "Comfy-Desktop_Folders_OpenModelsFolder": {
+    "label": "Ouvrir le dossier des modèles"
+  },
+  "Comfy-Desktop_Folders_OpenOutputsFolder": {
+    "label": "Ouvrir le dossier des sorties"
+  },
+  "Comfy-Desktop_OpenDevTools": {
+    "label": "Ouvrir les outils de développement"
+  },
+  "Comfy-Desktop_OpenUserGuide": {
+    "label": "Guide d'utilisation du bureau"
+  },
+  "Comfy-Desktop_Quit": {
+    "label": "Quitter"
+  },
+  "Comfy-Desktop_Reinstall": {
+    "label": "Réinstaller"
+  },
+  "Comfy-Desktop_Restart": {
+    "label": "Redémarrer"
+  },
   "Comfy_3DViewer_Open3DViewer": {
     "label": "Ouvrir le visualiseur 3D (bêta) pour le nœud sélectionné"
   },
@@ -8,6 +44,9 @@
   "Comfy_BrowseTemplates": {
     "label": "Parcourir les modèles"
   },
+  "Comfy_Canvas_CopySelected": {
+    "label": "Copier"
+  },
   "Comfy_Canvas_DeleteSelectedItems": {
     "label": "Supprimer les éléments sélectionnés"
   },
@@ -29,12 +68,18 @@
   "Comfy_Canvas_MoveSelectedNodes_Up": {
     "label": "Déplacer les nœuds sélectionnés vers le haut"
   },
+  "Comfy_Canvas_PasteFromClipboard": {
+    "label": "Coller"
+  },
   "Comfy_Canvas_ResetView": {
     "label": "Réinitialiser la vue"
   },
   "Comfy_Canvas_Resize": {
     "label": "Redimensionner les nœuds sélectionnés"
   },
+  "Comfy_Canvas_SelectAll": {
+    "label": "Tout sélectionner"
+  },
   "Comfy_Canvas_ToggleLinkVisibility": {
     "label": "Basculer la visibilité du lien sur le canevas"
   },
@@ -155,18 +200,30 @@
   "Comfy_Manager_ShowUpdateAvailablePacks": {
     "label": "Vérifier les mises à jour"
   },
-  "Comfy_Manager_ToggleManagerProgressDialog": {
-    "label": "Basculer la boîte de dialogue de progression"
-  },
   "Comfy_MaskEditor_BrushSize_Decrease": {
     "label": "Réduire la taille du pinceau dans MaskEditor"
   },
   "Comfy_MaskEditor_BrushSize_Increase": {
     "label": "Augmenter la taille du pinceau dans MaskEditor"
   },
+  "Comfy_MaskEditor_ColorPicker": {
+    "label": "Ouvrir le sélecteur de couleur dans MaskEditor"
+  },
+  "Comfy_MaskEditor_Mirror_Horizontal": {
+    "label": "Miroir horizontal dans MaskEditor"
+  },
+  "Comfy_MaskEditor_Mirror_Vertical": {
+    "label": "Miroir vertical dans MaskEditor"
+  },
   "Comfy_MaskEditor_OpenMaskEditor": {
     "label": "Ouvrir l'éditeur de masque pour le nœud sélectionné"
   },
+  "Comfy_MaskEditor_Rotate_Left": {
+    "label": "Rotation à gauche dans MaskEditor"
+  },
+  "Comfy_MaskEditor_Rotate_Right": {
+    "label": "Rotation à droite dans MaskEditor"
+  },
   "Comfy_Memory_UnloadModels": {
     "label": "Décharger les modèles"
   },
@@ -197,12 +254,18 @@
   "Comfy_QueueSelectedOutputNodes": {
     "label": "Mettre en file d’attente les nœuds de sortie sélectionnés"
   },
+  "Comfy_Queue_ToggleOverlay": {
+    "label": "Afficher/masquer l'historique des tâches"
+  },
   "Comfy_Redo": {
     "label": "Refaire"
   },
   "Comfy_RefreshNodeDefinitions": {
     "label": "Actualiser les définitions de nœud"
   },
+  "Comfy_RenameWorkflow": {
+    "label": "Renommer le workflow"
+  },
   "Comfy_SaveWorkflow": {
     "label": "Enregistrer le flux de travail"
   },
@@ -212,6 +275,12 @@
   "Comfy_ShowSettingsDialog": {
     "label": "Afficher la boîte de dialogue des paramètres"
   },
+  "Comfy_Subgraph_SetDescription": {
+    "label": "Définir la description du sous-graphe"
+  },
+  "Comfy_Subgraph_SetSearchAliases": {
+    "label": "Définir les alias de recherche du sous-graphe"
+  },
   "Comfy_ToggleAssetAPI": {
     "label": "Expérimental : Activer AssetAPI"
   },
@@ -221,6 +290,12 @@
   "Comfy_ToggleHelpCenter": {
     "label": "Centre d'aide"
   },
+  "Comfy_ToggleLinear": {
+    "label": "basculer en mode linéaire"
+  },
+  "Comfy_ToggleQPOV2": {
+    "label": "Basculer vers Queue Panel V2"
+  },
   "Comfy_ToggleTheme": {
     "label": "Changer de thème (Sombre/Clair)"
   },
@@ -252,10 +327,10 @@
     "label": "Basculer le panneau inférieur"
   },
   "Workspace_ToggleBottomPanelTab_command-terminal": {
-    "label": "Basculer le panneau inférieur du terminal"
+    "label": "Afficher/Masquer le panneau inférieur du terminal"
   },
   "Workspace_ToggleBottomPanelTab_logs-terminal": {
-    "label": "Basculer le panneau inférieur des journaux"
+    "label": "Afficher/Masquer le panneau inférieur des journaux"
   },
   "Workspace_ToggleBottomPanelTab_shortcuts-essentials": {
     "label": "Afficher/Masquer le panneau inférieur essentiel"
@@ -269,6 +344,10 @@
   "Workspace_ToggleFocusMode": {
     "label": "Basculer le mode focus"
   },
+  "Workspace_ToggleSidebarTab_apps": {
+    "label": "Basculer la barre latérale des applications",
+    "tooltip": "Applications"
+  },
   "Workspace_ToggleSidebarTab_assets": {
     "label": "Afficher/Masquer la barre latérale des ressources",
     "tooltip": "Ressources"
diff --git a/src/locales/fr/main.json b/src/locales/fr/main.json
index b255b4f63b..e30308254a 100644
--- a/src/locales/fr/main.json
+++ b/src/locales/fr/main.json
@@ -1,6 +1,8 @@
 {
   "actionbar": {
-    "dockToTop": "Ancrer en haut"
+    "dockToTop": "Ancrer en haut",
+    "feedback": "Retour",
+    "feedbackTooltip": "Retour"
   },
   "apiNodesCostBreakdown": {
     "costPerRun": "Coût par exécution",
@@ -14,26 +16,175 @@
   "assetBrowser": {
     "allCategory": "Tous les {category}",
     "allModels": "Tous les modèles",
+    "apiKeyHint": "Vous importez des modèles privés ou restreints ? {link}.",
+    "apiKeyHintLink": "Ajoutez vos clés API dans les Paramètres",
     "ariaLabel": {
       "assetCard": "Ressource {name} - {type}",
       "loadingAsset": "Chargement de la ressource"
     },
+    "assetCollection": "Collection d'actifs",
     "assets": "Ressources",
+    "baseModel": "Modèle de base",
     "baseModels": "Modèles de base",
     "browseAssets": "Parcourir les ressources",
+    "byType": "Par type",
+    "checkpoints": "Checkpoints",
+    "civitaiLinkExample": "{example} {link}",
+    "civitaiLinkExampleStrong": "Exemple :",
+    "civitaiLinkExampleUrl": "https://civitai.com/models/10706/luisap-z-image-and-qwen-pixel-art-refiner?modelVersionId=2225295",
+    "civitaiLinkLabel": "Lien {download} du modèle Civitai",
+    "civitaiLinkLabelDownload": "télécharger",
+    "civitaiLinkPlaceholder": "Collez le lien ici",
+    "confirmModelDetails": "Confirmer les détails du modèle",
     "connectionError": "Veuillez vérifier votre connexion et réessayer",
+    "deletion": {
+      "body": "Ce modèle sera définitivement supprimé de votre bibliothèque.",
+      "complete": "{assetName} a été supprimé.",
+      "failed": "{assetName} n'a pas pu être supprimé.",
+      "header": "Supprimer ce modèle ?",
+      "inProgress": "Suppression de {assetName}..."
+    },
+    "download": {
+      "complete": "Téléchargement terminé",
+      "failed": "Échec du téléchargement",
+      "inProgress": "Téléchargement de {assetName}..."
+    },
+    "emptyImported": {
+      "canImport": "Aucun modèle importé pour le moment. Cliquez sur « Importer un modèle » pour ajouter le vôtre.",
+      "restricted": "Les modèles personnels sont disponibles uniquement à partir du niveau Creator."
+    },
+    "errorAccessForbidden": "L'accès à cette ressource est interdit.",
+    "errorConnectionRefused": "Impossible de se connecter à la source. Veuillez réessayer plus tard.",
+    "errorDownloadCancelled": "Le téléchargement a été annulé.",
+    "errorFileTooLarge": "Le fichier dépasse la taille maximale autorisée",
+    "errorFormatNotAllowed": "Seul le format SafeTensor est autorisé",
+    "errorHttpError": "Une erreur est survenue lors de la récupération des métadonnées.",
+    "errorInternalError": "Une erreur inattendue est survenue. Veuillez réessayer.",
+    "errorInvalidHost": "Le nom d’hôte de l’URL source n’a pas pu être résolu.",
+    "errorInvalidUrl": "Veuillez fournir une URL.",
+    "errorInvalidUrlFormat": "Le format de l’URL est invalide. Veuillez vérifier et réessayer.",
+    "errorMetadataFetchFailed": "Impossible de récupérer les informations du fichier depuis la source.",
+    "errorModelTypeNotSupported": "Ce type de modèle n'est pas pris en charge",
+    "errorNetworkError": "Une erreur réseau est survenue. Veuillez vérifier votre connexion et réessayer.",
+    "errorNetworkTimeout": "La requête a expiré. Veuillez réessayer.",
+    "errorRateLimited": "Trop de requêtes. Veuillez réessayer dans quelques minutes.",
+    "errorRequestCancelled": "La requête a été annulée.",
+    "errorResourceNotFound": "Le fichier est introuvable. Veuillez vérifier l’URL et réessayer.",
+    "errorServiceUnavailable": "Service temporairement indisponible. Veuillez réessayer plus tard.",
+    "errorSourceServerError": "Le serveur source rencontre des problèmes. Veuillez réessayer plus tard.",
+    "errorUnauthorized": "Veuillez vous connecter pour continuer.",
+    "errorUnauthorizedSource": "Cette ressource nécessite une authentification. Veuillez ajouter votre jeton API dans les paramètres.",
+    "errorUnknown": "Une erreur inattendue s'est produite",
+    "errorUnsafePickleScan": "CivitAI a détecté un code potentiellement dangereux dans ce fichier",
+    "errorUnsafeVirusScan": "CivitAI a détecté un logiciel malveillant ou un contenu suspect dans ce fichier",
+    "errorUnsupportedSource": "Cette URL n’est pas prise en charge. Seules les URLs Hugging Face et Civitai sont autorisées.",
+    "errorUploadFailed": "Échec de l'importation de l'actif. Veuillez réessayer.",
+    "errorUserTokenAccessDenied": "Votre jeton API n’a pas accès à cette ressource. Veuillez vérifier les autorisations de votre jeton.",
+    "errorUserTokenInvalid": "Votre jeton API enregistré est invalide ou expiré. Veuillez le mettre à jour dans les paramètres.",
     "failedToCreateNode": "Échec de la création du nœud. Veuillez réessayer ou consulter la console pour plus de détails.",
     "fileFormats": "Formats de fichier",
+    "fileName": "Nom du fichier",
+    "fileSize": "Taille du fichier",
+    "filterBy": "Filtrer par",
+    "findInLibrary": "Trouvez-le dans la section {type} de la bibliothèque de modèles.",
+    "finish": "Terminer",
+    "genericLinkPlaceholder": "Collez le lien ici",
+    "importAnother": "Importer un autre",
+    "imported": "Importé",
+    "invalidAsset": "Ressource invalide",
+    "invalidAssetDetail": "La ressource sélectionnée n’a pas pu être validée. Veuillez réessayer.",
+    "invalidFilename": "Nom de fichier invalide",
+    "invalidFilenameDetail": "Le nom de fichier de la ressource n’a pas pu être déterminé. Veuillez réessayer.",
+    "jobId": "ID de tâche",
     "loadingModels": "Chargement de {type}...",
+    "maxFileSize": "Taille maximale du fichier : {size}",
+    "maxFileSizeValue": "1 Go",
+    "media": {
+      "audioPlaceholder": "Audio",
+      "threeDModelPlaceholder": "Modèle 3D"
+    },
+    "modelAssociatedWithLink": "Le modèle associé au lien que vous avez fourni :",
+    "modelInfo": {
+      "addBaseModel": "Ajouter un modèle de base...",
+      "addTag": "Ajouter un tag...",
+      "additionalTags": "Tags supplémentaires",
+      "baseModelUnknown": "Modèle de base inconnu",
+      "basicInfo": "Informations de base",
+      "compatibleBaseModels": "Modèles de base compatibles",
+      "description": "Description",
+      "descriptionNotSet": "Aucune description définie",
+      "descriptionPlaceholder": "Ajoutez une description pour ce modèle...",
+      "displayName": "Nom d'affichage",
+      "editDisplayName": "Modifier le nom affiché",
+      "fileName": "Nom du fichier",
+      "modelDescription": "Description du modèle",
+      "modelTagging": "Étiquetage du modèle",
+      "modelType": "Type de modèle",
+      "noAdditionalTags": "Aucun tag supplémentaire",
+      "selectModelPrompt": "Sélectionnez un modèle pour voir ses informations",
+      "selectModelType": "Sélectionner le type de modèle...",
+      "source": "Source",
+      "title": "Infos du modèle",
+      "triggerPhrases": "Phrases déclencheuses",
+      "viewOnSource": "Voir sur {source}"
+    },
+    "modelName": "Nom du modèle",
+    "modelNamePlaceholder": "Entrez un nom pour ce modèle",
+    "modelTypeSelectorLabel": "Quel type de modèle est-ce ?",
+    "modelTypeSelectorPlaceholder": "Sélectionnez le type de modèle",
+    "modelUploaded": "Modèle importé avec succès.",
     "noAssetsFound": "Aucune ressource trouvée",
     "noModelsInFolder": "Aucun {type} disponible dans ce dossier",
+    "noResultsCanImport": "Essayez d’ajuster votre recherche ou vos filtres.\nVous pouvez également ajouter des modèles en utilisant le bouton « Importer » ci-dessus.",
+    "noValidSourceDetected": "Aucune source d'importation valide détectée",
+    "notSureLeaveAsIs": "Vous n'êtes pas sûr ? Laissez tel quel",
+    "onlyCivitaiUrlsSupported": "Seules les URL Civitai sont prises en charge",
+    "ownership": "Propriété",
+    "ownershipAll": "Tous",
+    "ownershipMyModels": "Mes modèles",
+    "ownershipPublicModels": "Modèles publics",
+    "processingModel": "Téléchargement démarré",
+    "processingModelDescription": "Vous pouvez fermer cette fenêtre. Le téléchargement continuera en arrière-plan.",
+    "providerCivitai": "Civitai",
+    "providerHuggingFace": "Hugging Face",
+    "rename": {
+      "failed": "Impossible de renommer l'actif."
+    },
+    "selectFrameworks": "Sélectionner les frameworks",
+    "selectModelType": "Sélectionner le type de modèle",
+    "selectProjects": "Sélectionner les projets",
     "sortAZ": "A-Z",
     "sortBy": "Trier par",
+    "sortDefault": "Par défaut",
     "sortPopular": "Populaire",
     "sortRecent": "Récent",
     "sortZA": "Z-A",
+    "sortingType": "Type de tri",
+    "tags": "Tags",
+    "tagsHelp": "Séparez les tags par des virgules",
+    "tagsPlaceholder": "ex. : modèles, checkpoint",
     "tryAdjustingFilters": "Essayez d'ajuster votre recherche ou vos filtres",
-    "unknown": "Inconnu"
+    "unknown": "Inconnu",
+    "unsupportedUrlSource": "Seules les URL provenant de {sources} sont prises en charge",
+    "upgradeFeatureDescription": "Cette fonctionnalité est disponible uniquement avec les abonnements Creator ou Pro.",
+    "upgradeToUnlockFeature": "Passez à la version supérieure pour débloquer cette fonctionnalité",
+    "upload": "Importer",
+    "uploadFailed": "Échec de l'importation",
+    "uploadModel": "Importer",
+    "uploadModelDescription1": "Collez un lien de téléchargement de modèle Civitai pour l'ajouter à votre bibliothèque.",
+    "uploadModelDescription1Generic": "Collez un lien de téléchargement de modèle pour l'ajouter à votre bibliothèque.",
+    "uploadModelDescription2": "Seuls les liens provenant de {link} sont actuellement pris en charge",
+    "uploadModelDescription2Generic": "Seules les URL des fournisseurs suivants sont prises en charge :",
+    "uploadModelDescription2Link": "https://civitai.com/models",
+    "uploadModelDescription3": "Taille maximale du fichier : {size}",
+    "uploadModelFailedToRetrieveMetadata": "Impossible de récupérer les métadonnées. Veuillez vérifier le lien et réessayer.",
+    "uploadModelFromCivitai": "Importer un modèle depuis Civitai",
+    "uploadModelGeneric": "Importer un modèle",
+    "uploadModelHelpFooterText": "Besoin d'aide pour trouver les URL ? Cliquez sur un fournisseur ci-dessous pour voir une vidéo explicative.",
+    "uploadModelHelpVideo": "Vidéo d'aide à l'importation de modèle",
+    "uploadModelHowDoIFindThis": "Comment trouver ceci ?",
+    "uploadSuccess": "Modèle importé avec succès !",
+    "uploadingModel": "Importation du modèle..."
   },
   "auth": {
     "apiKey": {
@@ -55,13 +206,7 @@
       "whitelistInfo": "À propos des sites non autorisés"
     },
     "deleteAccount": {
-      "cancel": "Annuler",
-      "confirm": "Supprimer le compte",
-      "confirmMessage": "Êtes-vous sûr de vouloir supprimer votre compte ? Cette action est irréversible et supprimera définitivement toutes vos données.",
-      "confirmTitle": "Supprimer le compte",
-      "deleteAccount": "Supprimer le compte",
-      "success": "Compte supprimé",
-      "successDetail": "Votre compte a été supprimé avec succès."
+      "contactSupport": "Pour supprimer votre compte, veuillez contacter {email}"
     },
     "errors": {
       "auth/cancelled-popup-request": "La connexion a été annulée. Veuillez réessayer.",
@@ -80,6 +225,7 @@
     "login": {
       "andText": "et",
       "backToLogin": "Retour à la connexion",
+      "backToSocialLogin": "Inscrivez-vous avec Google ou Github à la place",
       "confirmPasswordLabel": "Confirmer le mot de passe",
       "confirmPasswordPlaceholder": "Entrez à nouveau le même mot de passe",
       "didntReceiveEmail": "Vous n'avez pas reçu d'e-mail ? Contactez-nous à",
@@ -88,6 +234,9 @@
       "failed": "Échec de la connexion",
       "forgotPassword": "Mot de passe oublié?",
       "forgotPasswordError": "Échec de l'envoi de l'e-mail de réinitialisation du mot de passe",
+      "freeTierBadge": "Éligible à l’offre gratuite",
+      "freeTierDescription": "Inscrivez-vous avec Google pour obtenir {credits} crédits gratuits chaque mois. Aucune carte requise.",
+      "freeTierDescriptionGeneric": "Inscrivez-vous avec Google pour obtenir des crédits gratuits chaque mois. Aucune carte requise.",
       "insecureContextWarning": "Cette connexion n'est pas sécurisée (HTTP) - vos identifiants pourraient être interceptés par des attaquants si vous continuez à vous connecter.",
       "loginButton": "Se connecter",
       "loginWithGithub": "Se connecter avec Github",
@@ -106,11 +255,13 @@
       "sendResetLink": "Envoyer le lien de réinitialisation",
       "signInOrSignUp": "Se connecter / S’inscrire",
       "signUp": "S'inscrire",
+      "signUpFreeTierPromo": "Nouveau ici ? {signUp} avec Google pour obtenir {credits} crédits gratuits chaque mois.",
       "success": "Connexion réussie",
       "termsLink": "Conditions d'utilisation",
       "termsText": "En cliquant sur \"Suivant\" ou \"S'inscrire\", vous acceptez nos",
       "title": "Connectez-vous à votre compte",
       "useApiKey": "Clé API Comfy",
+      "useEmailInstead": "Utiliser l’e-mail à la place",
       "userAvatar": "Avatar utilisateur"
     },
     "loginButton": {
@@ -130,11 +281,14 @@
     "signOut": {
       "signOut": "Se déconnecter",
       "success": "Déconnexion réussie",
-      "successDetail": "Vous avez été déconnecté de votre compte."
+      "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 ?",
+      "unsavedChangesTitle": "Modifications non enregistrées"
     },
     "signup": {
       "alreadyHaveAccount": "Vous avez déjà un compte?",
       "emailLabel": "Email",
+      "emailNotEligibleForFreeTier": "L’inscription par e-mail n’est pas éligible à l’offre gratuite.",
       "emailPlaceholder": "Entrez votre email",
       "passwordLabel": "Mot de passe",
       "passwordPlaceholder": "Entrez un nouveau mot de passe",
@@ -147,12 +301,68 @@
       "title": "Créer un compte"
     }
   },
+  "batch": {
+    "index": "{current} / {total}"
+  },
+  "billingOperation": {
+    "subscriptionFailed": "Échec de la mise à jour de l'abonnement",
+    "subscriptionProcessing": "Traitement du paiement — configuration de votre espace de travail...",
+    "subscriptionSuccess": "Abonnement mis à jour avec succès",
+    "subscriptionTimeout": "Le délai de vérification de l'abonnement a expiré",
+    "topupFailed": "Échec de la recharge",
+    "topupProcessing": "Traitement du paiement — ajout de crédits...",
+    "topupSuccess": "Crédits ajoutés avec succès",
+    "topupTimeout": "Le délai de vérification de la recharge a expiré"
+  },
+  "boundingBox": {
+    "height": "Hauteur",
+    "width": "Largeur",
+    "x": "X",
+    "y": "Y"
+  },
   "breadcrumbsMenu": {
     "clearWorkflow": "Effacer le workflow",
     "deleteBlueprint": "Supprimer le plan",
     "deleteWorkflow": "Supprimer le workflow",
     "duplicate": "Dupliquer",
-    "enterNewName": "Entrez un nouveau nom"
+    "enterAppMode": "Entrer en mode application",
+    "enterBuilderMode": "Entrer dans le mode constructeur d'application",
+    "enterNewName": "Entrez un nouveau nom",
+    "exitAppMode": "Quitter le mode application",
+    "missingNodesWarning": "Le workflow contient des nœuds non pris en charge (surlignés en rouge).",
+    "workflowActions": "Actions du workflow"
+  },
+  "builderMenu": {
+    "exitAppBuilder": "Quitter le constructeur d'application"
+  },
+  "builderToolbar": {
+    "app": "Application",
+    "appDescription": "S'ouvre par défaut en tant qu'application",
+    "arrange": "Aperçu",
+    "arrangeDescription": "Vérifier la disposition de l'application",
+    "connectOutput": "Connecter une sortie",
+    "connectOutputBody1": "Votre application doit avoir au moins une sortie connectée avant de pouvoir être enregistrée.",
+    "connectOutputBody2": "Passez à l'étape « Sélectionner » et cliquez sur les nœuds de sortie pour les ajouter ici.",
+    "defaultModeAppliedAppBody": "Ce workflow s’ouvrira désormais par défaut en mode Application.",
+    "defaultModeAppliedAppPrompt": "Voulez-vous le voir maintenant ?",
+    "defaultModeAppliedGraphBody": "Ce workflow s’ouvrira désormais par défaut sous forme de graphe de nœuds.",
+    "defaultModeAppliedGraphPrompt": "Voulez-vous tout de même voir l’application ?",
+    "defaultModeAppliedTitle": "Défini avec succès",
+    "defaultView": "Définir une vue par défaut",
+    "defaultViewDescription": "Choisissez comment cela s'ouvre",
+    "defaultViewLabel": "Par défaut, ce workflow s'ouvrira comme :",
+    "defaultViewTitle": "Définir la vue par défaut pour ce workflow",
+    "emptyWorkflowPrompt": "Voulez-vous commencer avec un modèle ?",
+    "emptyWorkflowTitle": "Ce workflow ne contient aucun nœud",
+    "inputs": "Entrées",
+    "inputsDescription": "Choisissez les entrées",
+    "label": "Créateur d'applications",
+    "nodeGraph": "Graphe de nœuds",
+    "nodeGraphDescription": "S'ouvre par défaut en tant que graphe de nœuds",
+    "outputs": "Sorties",
+    "outputsDescription": "Choisissez les sorties",
+    "switchToOutputs": "Passer aux sorties",
+    "viewApp": "Voir l’application"
   },
   "clipboard": {
     "errorMessage": "Échec de la copie dans le presse-papiers",
@@ -206,6 +416,7 @@
     },
     "retry": "Réessayer",
     "retrying": "Nouvelle tentative...",
+    "skipToCloudApp": "Passer à l'application cloud",
     "start": {
       "desc": "Aucune configuration requise. Fonctionne sur tous les appareils.",
       "download": "Télécharger ComfyUI",
@@ -339,6 +550,8 @@
     "Edit Subgraph Widgets": "Modifier les widgets du sous-graphe",
     "Expand": "Développer",
     "Expand Node": "Développer le nœud",
+    "Extensions": "Extensions",
+    "FavoriteWidget": "Ajouter aux favoris",
     "Horizontal": "Horizontal",
     "Inputs": "Entrées",
     "Left": "Gauche",
@@ -358,6 +571,7 @@
     "Remove": "Supprimer",
     "Remove Bypass": "Supprimer le contournement",
     "Rename": "Renommer",
+    "RenameWidget": "Renommer le widget",
     "Resize": "Redimensionner",
     "Right": "Droite",
     "Run Branch": "Exécuter la branche",
@@ -368,6 +582,7 @@
     "Shapes": "Formes",
     "Title": "Titre",
     "Top": "Haut",
+    "UnfavoriteWidget": "Retirer des favoris",
     "Unpack Subgraph": "Décompresser le sous-graphe",
     "Unpin": "Désépingler",
     "Vertical": "Vertical",
@@ -381,6 +596,7 @@
     "additionalInfo": "Informations supplémentaires",
     "apiPricing": "Tarification de l’API",
     "credits": "Crédits",
+    "creditsAvailable": "Crédits disponibles",
     "details": "Détails",
     "eventType": "Type d'événement",
     "faqs": "FAQ",
@@ -389,15 +605,47 @@
     "messageSupport": "Contacter le support",
     "model": "Modèle",
     "purchaseCredits": "Acheter des crédits",
+    "refreshes": "Rafraîchit le {date}",
     "time": "Heure",
     "topUp": {
+      "addMoreCredits": "Ajouter des crédits",
+      "addMoreCreditsToRun": "Ajouter des crédits pour exécuter",
+      "amountToPayLabel": "Montant à payer en dollars",
+      "buy": "Acheter",
+      "buyCredits": "Continuer vers le paiement",
       "buyNow": "Acheter maintenant",
+      "contactUs": "Contactez-nous",
+      "creditsDescription": "Les crédits sont utilisés pour exécuter des workflows ou des nœuds partenaires.",
+      "creditsPerDollar": "crédits par dollar",
+      "creditsToReceiveLabel": "Crédits à recevoir",
+      "howManyCredits": "Combien de crédits souhaitez-vous ajouter ?",
       "insufficientMessage": "Vous n'avez pas assez de crédits pour exécuter ce workflow.",
       "insufficientTitle": "Crédits insuffisants",
+      "insufficientWorkflowMessage": "Vous n'avez pas assez de crédits pour exécuter ce workflow.",
+      "maxAllowed": "Maximum {credits} crédits.",
       "maxAmount": "(Max. 1 000 $ US)",
+      "maximumAmount": "Maximum ${amount}.",
+      "minRequired": "Minimum {credits} crédits",
+      "minimumPurchase": "Achat minimum de ${amount} ({credits} crédits)",
+      "needMore": "Besoin de plus ?",
+      "purchaseError": "Échec de l'achat",
+      "purchaseErrorDetail": "Échec de l'achat de crédits : {error}",
+      "purchaseSuccess": "Crédits ajoutés avec succès !",
       "quickPurchase": "Achat rapide",
       "seeDetails": "Voir les détails",
-      "topUp": "Recharger"
+      "selectAmount": "Sélectionner le montant",
+      "templateNote": "*Généré avec le modèle Wan Fun Control",
+      "topUp": "Recharger",
+      "unknownError": "Une erreur inconnue est survenue",
+      "usdAmount": "${amount}",
+      "videosEstimate": "~{count} vidéos",
+      "viewPricing": "Voir les détails des tarifs",
+      "youGet": "Crédits",
+      "youPay": "Montant (USD)"
+    },
+    "unified": {
+      "message": "Les crédits ont été unifiés",
+      "tooltip": "Nous avons unifié les paiements sur Comfy. Tout fonctionne désormais avec les Comfy Credits :\n- Nœuds partenaires (anciennement nœuds API)\n- Workflows cloud\n\nVotre solde de nœuds partenaires a été converti en crédits."
     },
     "yourCreditBalance": "Votre solde de crédits"
   },
@@ -408,13 +656,26 @@
     "AUDIO_ENCODER_OUTPUT": "SORTIE_ENCODEUR_AUDIO",
     "AUDIO_RECORD": "ENREGISTREMENT_AUDIO",
     "BOOLEAN": "BOOLEAN",
+    "BOUNDING_BOX": "BOÎTE ENGLOBANTE",
     "CAMERA_CONTROL": "Contrôle de la caméra",
     "CLIP": "CLIP",
     "CLIP_VISION": "CLIP_VISION",
     "CLIP_VISION_OUTPUT": "SORTIE_CLIP_VISION",
+    "COLOR": "COULEUR",
     "COMBO": "COMBO",
+    "COMFY_AUTOGROW_V3": "COMFY_AUTOGROW_V3",
+    "COMFY_DYNAMICCOMBO_V3": "COMFY_DYNAMICCOMBO_V3",
+    "COMFY_MATCHTYPE_V3": "COMFY_MATCHTYPE_V3",
     "CONDITIONING": "CONDITIONNEMENT",
     "CONTROL_NET": "RESEAU_DE_CONTROLE",
+    "ELEVENLABS_VOICE": "ELEVENLABS_VOICE",
+    "FILE_3D": "FICHIER_3D",
+    "FILE_3D_FBX": "FICHIER_3D_FBX",
+    "FILE_3D_GLB": "FICHIER_3D_GLB",
+    "FILE_3D_GLTF": "FICHIER_3D_GLTF",
+    "FILE_3D_OBJ": "FICHIER_3D_OBJ",
+    "FILE_3D_STL": "FICHIER_3D_STL",
+    "FILE_3D_USDZ": "FICHIER_3D_USDZ",
     "FLOAT": "FLOTTANT",
     "FLOATS": "FLOTTANTS",
     "GEMINI_INPUT_FILES": "FICHIERS_ENTRÉE_GEMINI",
@@ -423,9 +684,11 @@
     "HOOKS": "CROCHETS",
     "HOOK_KEYFRAMES": "CLEFS_DE_CROCHET",
     "IMAGE": "IMAGE",
+    "IMAGECOMPARE": "COMPARAISON_IMAGE",
     "INT": "ENTIER",
     "LATENT": "LATENT",
     "LATENT_OPERATION": "OPERATION_LATENTE",
+    "LATENT_UPSCALE_MODEL": "LATENT_UPSCALE_MODEL",
     "LOAD3D_CAMERA": "Charger la caméra 3D",
     "LOAD_3D": "CHARGER_3D",
     "LORA_MODEL": "MODÈLE_LORA",
@@ -434,6 +697,8 @@
     "LUMA_REF": "Référence Luma",
     "MASK": "MASQUE",
     "MESH": "MAILLAGE",
+    "MESHY_RIGGED_TASK_ID": "MESHY_RIGGED_TASK_ID",
+    "MESHY_TASK_ID": "MESHY_TASK_ID",
     "MODEL": "MODÈLE",
     "MODEL_PATCH": "PATCH_MODÈLE",
     "MODEL_TASK_ID": "ID_TÂCHE_MODÈLE",
@@ -442,6 +707,7 @@
     "OPENAI_INPUT_FILES": "FICHIERS_ENTRÉE_OPENAI",
     "PHOTOMAKER": "PHOTOMAKER",
     "PIXVERSE_TEMPLATE": "Modèle Pixverse",
+    "POSE_KEYPOINT": "POINT CLÉ DE POSE",
     "RECRAFT_COLOR": "Couleur Recraft",
     "RECRAFT_CONTROLS": "Contrôles Recraft",
     "RECRAFT_V3_STYLE": "Style Recraft V3",
@@ -453,6 +719,7 @@
     "STYLE_MODEL": "MODÈLE_DE_STYLE",
     "SVG": "SVG",
     "TIMESTEPS_RANGE": "PLAGE_DES_ÉTAPES_TEMPORELLES",
+    "TRACKS": "PISTES",
     "UPSCALE_MODEL": "MODÈLE_DE_MISE_À_L'ÉCHELLE",
     "VAE": "VAE",
     "VIDEO": "Vidéo",
@@ -511,24 +778,84 @@
     "noStackTrace": "Aucune trace de pile disponible",
     "promptExecutionError": "L'exécution de l'invite a échoué"
   },
+  "errorOverlay": {
+    "errorCount": "{count} ERREURS | {count} ERREUR | {count} ERREURS",
+    "seeErrors": "Voir les erreurs"
+  },
+  "essentials": {
+    "batchImage": "Traitement par lot d'images",
+    "canny": "Canny",
+    "cannyToImage": "Canny vers image",
+    "cannyToVideo": "Canny vers vidéo",
+    "cropImage": "Rogner l'image",
+    "depthToImage": "Profondeur vers image",
+    "depthToVideo": "Profondeur vers vidéo",
+    "extractFrame": "Extraire une image",
+    "imageCompare": "Comparer les images",
+    "imageTo3DModel": "Image vers modèle 3D",
+    "imageToImage": "Image vers image",
+    "imageToVideo": "Image vers vidéo",
+    "inpaintImage": "Inpainting d'image",
+    "invert": "Inverser",
+    "lipsync": "Synchronisation labiale",
+    "load3DModel": "Charger un modèle 3D",
+    "loadAudio": "Charger un audio",
+    "loadImage": "Charger une image",
+    "loadStyleLora": "Charger un style (LoRA)",
+    "loadVideo": "Charger une vidéo",
+    "musicGeneration": "Génération de musique",
+    "outpaintImage": "Outpainting d'image",
+    "poseToImage": "Pose vers image",
+    "poseToVideo": "Pose vers vidéo",
+    "removeBackground": "Supprimer l'arrière-plan",
+    "resizeImage": "Redimensionner l'image",
+    "rotate": "Faire pivoter",
+    "save3DModel": "Enregistrer le modèle 3D",
+    "saveAudio": "Enregistrer l'audio",
+    "saveImage": "Enregistrer l'image",
+    "saveVideo": "Enregistrer la vidéo",
+    "text": "Texte",
+    "textGenerationLLM": "Génération de texte (LLM)",
+    "textTo3DModel": "Texte vers modèle 3D",
+    "textToImage": "Texte vers image",
+    "textToVideo": "Texte vers vidéo"
+  },
+  "exportToast": {
+    "allExportsCompleted": "Toutes les exportations sont terminées",
+    "downloadExport": "Télécharger l’export",
+    "downloadFailed": "Échec du téléchargement de « {name} »",
+    "exportCompleted": "Téléchargement ZIP prêt",
+    "exportError": "Échec de l’exportation",
+    "exportFailed": "{count} exportation échouée | {count} exportation échouée | {count} exportations échouées",
+    "exportFailedSingle": "Échec de la création de l’export ZIP",
+    "exportStarted": "Préparation du téléchargement ZIP...",
+    "exportingAssets": "Exportation des ressources",
+    "noExportsInQueue": "Aucune exportation {filter} en file d’attente",
+    "preparingExport": "Préparation de l’export...",
+    "retryDownload": "Réessayer le téléchargement"
+  },
   "g": {
     "1x": "1x",
     "2x": "2x",
     "about": "À propos",
     "add": "Ajouter",
+    "addNode": "Ajouter un nœud...",
     "addNodeFilterCondition": "Ajouter une condition de filtre de nœud",
     "all": "Tout",
     "amount": "Quantité",
     "apply": "Appliquer",
     "architecture": "Architecture",
+    "asset": "{count} ressources | {count} ressource | {count} ressources",
     "audioFailedToLoad": "Échec du chargement de l'audio",
     "audioProgress": "Progression audio",
     "author": "Auteur",
     "back": "Retour",
+    "batchRename": "Renommer en lot",
     "beta": "BÊTA",
     "bookmark": "Enregistrer dans la bibliothèque",
     "calculatingDimensions": "Calcul des dimensions",
     "cancel": "Annuler",
+    "cancelled": "Annulé",
     "capture": "capture",
     "category": "Catégorie",
     "chart": "Graphique",
@@ -538,6 +865,8 @@
     "clearAll": "Tout effacer",
     "clearFilters": "Effacer les filtres",
     "close": "Fermer",
+    "closeDialog": "Fermer la boîte de dialogue",
+    "collapseAll": "Tout réduire",
     "color": "Couleur",
     "comfy": "Comfy",
     "comfyOrgLogoAlt": "Logo ComfyOrg",
@@ -546,6 +875,7 @@
     "commandProhibited": "La commande {command} est interdite. Contactez un administrateur pour plus d'informations.",
     "community": "Communauté",
     "completed": "Terminé",
+    "completedWithCheckmark": "Terminé ✓",
     "confirm": "Confirmer",
     "confirmed": "Confirmé",
     "content": "contenu",
@@ -554,48 +884,73 @@
     "control_before_generate": "contrôle avant génération",
     "copied": "Copié",
     "copy": "Copier",
+    "copyAll": "Tout copier",
     "copyJobId": "Copier l'ID du travail",
     "copyToClipboard": "Copier dans le presse-papiers",
     "copyURL": "Copier l’URL",
+    "core": "Noyau",
     "currentUser": "Utilisateur actuel",
+    "custom": "Personnalisé",
     "customBackground": "Arrière-plan personnalisé",
     "customize": "Personnaliser",
     "customizeFolder": "Personnaliser le dossier",
+    "decrement": "Diminuer",
     "defaultBanner": "bannière par défaut",
     "delete": "Supprimer",
     "deleteAudioFile": "Supprimer le fichier audio",
     "deleteImage": "Supprimer l'image",
     "deprecated": "DEPR",
     "description": "Description",
+    "devOnly": "DEV",
     "devices": "Appareils",
     "disableAll": "Désactiver tout",
+    "disableSelected": "Désactiver la sélection",
+    "disableThirdParty": "Désactiver les tiers",
     "disabling": "Désactivation",
+    "disconnectedFromBackend": "Déconnecté du backend. Vérifiez si le serveur est en cours d’exécution.",
     "dismiss": "Fermer",
     "download": "Télécharger",
+    "downloadAudio": "Télécharger l'audio",
     "downloadImage": "Télécharger l'image",
     "downloadVideo": "Télécharger la vidéo",
+    "downloadWithSize": "Télécharger ({size})",
+    "downloading": "Téléchargement",
     "dropYourFileOr": "Déposez votre fichier ou",
     "duplicate": "Dupliquer",
     "edit": "Modifier",
     "editImage": "Modifier l'image",
     "editOrMaskImage": "Modifier ou masquer l'image",
+    "emDash": "—",
     "empty": "Vide",
     "enableAll": "Activer tout",
     "enableOrDisablePack": "Activer ou désactiver le pack",
+    "enableSelected": "Activer la sélection",
     "enabled": "Activé",
     "enabling": "Activation",
+    "enter": "Entrer",
+    "enterBaseName": "Entrez le nom de base",
+    "enterNewName": "Entrez le nouveau nom",
+    "enterNewNamePrompt": "Entrez le nouveau nom :",
+    "enterSubgraph": "Entrer dans le sous-graphe",
     "error": "Erreur",
     "errorLoadingImage": "Erreur lors du chargement de l'image",
     "errorLoadingVideo": "Erreur lors du chargement de la vidéo",
+    "essentials": "Essentiels",
+    "expandAll": "Tout développer",
     "experimental": "BETA",
     "export": "Exportation",
     "extensionName": "Nom de l'extension",
+    "extensions": "Extensions",
+    "failed": "Échec",
     "failedToCopyJobId": "Échec de la copie de l'ID du travail",
     "failedToDownloadImage": "Échec du téléchargement de l'image",
     "failedToDownloadVideo": "Échec du téléchargement de la vidéo",
+    "favorites": "Favoris",
     "feedback": "Commentaires",
     "file": "fichier",
     "filter": "Filtrer",
+    "filterBy": "Filtrer par :",
+    "filterByType": "Filtrer par {type}...",
     "findIssues": "Trouver des problèmes",
     "frameNodes": "Encadrer les nœuds",
     "frontendNewer": "La version du frontend {frontendVersion} peut ne pas être compatible avec la version du backend {backendVersion}.",
@@ -605,23 +960,32 @@
     "goToNode": "Aller au nœud",
     "graphNavigation": "Navigation dans le graphe",
     "halfSpeed": "0.5x",
+    "hideLeftPanel": "Masquer le panneau de gauche",
+    "hideRightPanel": "Masquer le panneau de droite",
     "icon": "Icône",
+    "imageDoesNotExist": "L’image n’existe pas",
     "imageFailedToLoad": "Échec du chargement de l'image",
     "imagePreview": "Aperçu de l'image - Utilisez les flèches pour naviguer entre les images",
     "imageUrl": "URL de l'image",
     "import": "Importer",
     "inProgress": "En cours",
+    "inSubgraph": "dans le sous-graphe « {name} »",
+    "increment": "Augmenter",
     "info": "Informations du nœud",
+    "input": "Entrée",
     "insert": "Insérer",
     "install": "Installer",
     "installed": "Installé",
     "installing": "Installation",
     "interrupted": "Interrompu",
     "itemSelected": "{selectedCount} élément sélectionné",
+    "itemsCopiedToClipboard": "Éléments copiés dans le presse-papiers",
     "itemsSelected": "{selectedCount} éléments sélectionnés",
+    "job": "Tâche",
     "jobIdCopied": "ID du travail copié dans le presse-papiers",
     "keybinding": "Raccourci clavier",
     "keybindingAlreadyExists": "Le raccourci clavier existe déjà",
+    "keybindings": "Raccourcis clavier",
     "learnMore": "En savoir plus",
     "listening": "Écoute en cours...",
     "liveSamplingPreview": "Aperçu en temps réel",
@@ -632,18 +996,24 @@
     "login": "Connexion",
     "logoAlt": "Logo ComfyUI",
     "logs": "Journaux",
+    "manageExtensions": "Gérer les extensions",
     "markdown": "markdown",
     "micPermissionDenied": "Permission du microphone refusée",
     "migrate": "Migrer",
     "missing": "Manquant",
+    "more": "Plus",
     "moreOptions": "Plus d'options",
     "moreWorkflows": "Plus de workflows",
+    "mostRelevant": "Les plus pertinents",
     "multiSelectDropdown": "Menu déroulant à sélection multiple",
     "name": "Nom",
     "newFolder": "Nouveau dossier",
     "next": "Suivant",
+    "nightly": "NIGHTLY",
     "no": "Non",
     "noAudioRecorded": "Aucun audio enregistré",
+    "noItems": "Aucun élément",
+    "noResults": "Aucun résultat",
     "noResultsFound": "Aucun résultat trouvé",
     "noTasksFound": "Aucune tâche trouvée",
     "noTasksFoundMessage": "Il n'y a pas de tâches dans la file d'attente.",
@@ -654,26 +1024,49 @@
     "nodeSlotsError": "Erreur d'emplacements du nœud",
     "nodeWidgetsError": "Erreur de widgets du nœud",
     "nodes": "Nœuds",
+    "nodesCount": "{count} nœuds | {count} nœud | {count} nœuds",
     "nodesRunning": "nœuds en cours d’exécution",
     "none": "Aucun",
+    "nothingToCopy": "Rien à copier",
+    "nothingToDelete": "Rien à supprimer",
+    "nothingToDuplicate": "Rien à dupliquer",
+    "nothingToRename": "Rien à renommer",
     "ok": "OK",
     "openManager": "Ouvrir le gestionnaire",
     "openNewIssue": "Ouvrir un nouveau problème",
+    "or": "ou",
+    "output": "Sortie",
     "overwrite": "Écraser",
+    "partner": "Partenaire",
+    "playPause": "Lecture/Pause",
     "playRecording": "Lire l'enregistrement",
     "playbackSpeed": "Vitesse de lecture",
     "playing": "Lecture en cours",
     "pressKeysForNewBinding": "Appuyez sur les touches pour une nouvelle liaison",
     "preview": "APERÇU",
+    "profile": "Profil",
     "progressCountOf": "sur",
+    "queued": "En file d’attente",
     "ready": "Prêt",
+    "recents": "Récents",
     "reconnected": "Reconnecté",
     "reconnecting": "Reconnexion",
     "refresh": "Rafraîchir",
     "refreshNode": "Actualiser le nœud",
+    "relativeTime": {
+      "daysAgo": "il y a {count}j",
+      "hoursAgo": "il y a {count}h",
+      "minutesAgo": "il y a {count}min",
+      "monthsAgo": "il y a {count}mo",
+      "now": "maintenant",
+      "weeksAgo": "il y a {count}s",
+      "yearsAgo": "il y a {count}a"
+    },
     "releaseTitle": "Publication de {package} {version}",
     "reloadToApplyChanges": "Recharger pour appliquer les modifications",
+    "remove": "Supprimer",
     "removeImage": "Supprimer l'image",
+    "removeTag": "Supprimer le tag",
     "removeVideo": "Supprimer la vidéo",
     "rename": "Renommer",
     "reportIssue": "Envoyer le rapport",
@@ -688,21 +1081,32 @@
     "resizeFromTopRight": "Redimensionner depuis le coin supérieur droit",
     "restart": "Redémarrer",
     "resultsCount": "{count} Résultats Trouvés",
+    "running": "En cours",
     "save": "Enregistrer",
     "saving": "Enregistrement",
+    "scrollLeft": "Faire défiler à gauche",
+    "scrollRight": "Faire défiler à droite",
     "search": "Rechercher",
     "searchExtensions": "Rechercher des extensions",
     "searchFailedMessage": "Nous n'avons trouvé aucun paramètre correspondant à votre recherche. Essayez d'ajuster vos termes de recherche.",
     "searchKeybindings": "Rechercher des raccourcis clavier",
     "searchModels": "Rechercher des modèles",
     "searchNodes": "Rechercher des nœuds",
+    "searchPlaceholder": "Rechercher...",
     "searchSettings": "Rechercher des paramètres",
     "searchWorkflows": "Rechercher des flux de travail",
     "seeTutorial": "Voir un tutoriel",
+    "selectItemsToCopy": "Sélectionnez les éléments à copier",
+    "selectItemsToDelete": "Sélectionnez les éléments à supprimer",
+    "selectItemsToDuplicate": "Sélectionnez les éléments à dupliquer",
+    "selectItemsToRename": "Sélectionnez les éléments à renommer",
     "selectedFile": "Fichier sélectionné",
     "setAsBackground": "Définir comme arrière-plan",
     "settings": "Paramètres",
+    "shortcutSuffix": " ({shortcut})",
+    "showLeftPanel": "Afficher le panneau de gauche",
     "showReport": "Afficher le rapport",
+    "showRightPanel": "Afficher le panneau de droite",
     "singleSelectDropdown": "Menu déroulant à sélection unique",
     "sort": "Trier",
     "source": "Source",
@@ -710,19 +1114,24 @@
     "status": "Statut",
     "stopPlayback": "Arrêter la lecture",
     "stopRecording": "Arrêter l’enregistrement",
+    "submit": "Soumettre",
     "success": "Succès",
     "systemInfo": "Informations système",
     "terminal": "Terminal",
     "title": "Titre",
     "triggerPhrase": "Phrase déclencheuse",
     "unknownError": "Erreur inconnue",
+    "unknownFile": "Fichier inconnu",
+    "untitled": "Sans titre",
     "update": "Mettre à jour",
     "updateAvailable": "Mise à jour disponible",
     "updateFrontend": "Mettre à jour le frontend",
     "updated": "Mis à jour",
     "updating": "Mise à jour",
     "upload": "Téléverser",
+    "uploadAlreadyInProgress": "Téléversement déjà en cours",
     "usageHint": "Conseil d'utilisation",
+    "use": "Utiliser",
     "user": "Utilisateur",
     "versionMismatchWarning": "Avertissement de compatibilité de version",
     "versionMismatchWarningMessage": "{warning} : {detail} Consultez https://docs.comfy.org/installation/update_comfyui#common-update-issues pour les instructions de mise à jour.",
@@ -730,11 +1139,10 @@
     "videoPreview": "Aperçu de la vidéo - Utilisez les flèches pour naviguer entre les vidéos",
     "viewImageOfTotal": "Voir l'image {index} sur {total}",
     "viewVideoOfTotal": "Voir la vidéo {index} sur {total}",
-    "vitePreloadErrorMessage": "Une nouvelle version de l'application a été publiée. Souhaitez-vous recharger ?\nSi vous refusez, certaines parties de l'application pourraient ne pas fonctionner correctement.\nN'hésitez pas à refuser et à sauvegarder votre progression avant de recharger.",
-    "vitePreloadErrorTitle": "Nouvelle version disponible",
     "volume": "Volume",
     "warning": "Avertissement",
-    "workflow": "Flux de travail"
+    "workflow": "Flux de travail",
+    "you": "Vous"
   },
   "graphCanvasMenu": {
     "fitView": "Adapter la vue",
@@ -756,11 +1164,17 @@
     "create": "Créer un nœud de groupe",
     "enterName": "Entrer le nom"
   },
+  "help": {
+    "helpCenterMenu": "Menu du centre d’aide",
+    "recentReleases": "Dernières versions"
+  },
   "helpCenter": {
     "clickToLearnMore": "Cliquez pour en savoir plus →",
     "desktopUserGuide": "Guide utilisateur de bureau",
     "docs": "Docs",
+    "feedback": "Donner un avis",
     "github": "Github",
+    "help": "Aide & Support",
     "loadingReleases": "Chargement des versions...",
     "managerExtension": "Manager Extension",
     "more": "Plus...",
@@ -769,6 +1183,12 @@
     "recentReleases": "Versions récentes",
     "reinstall": "Réinstaller",
     "updateAvailable": "Mise à jour",
+    "updateComfyUI": "Mettre à jour ComfyUI",
+    "updateComfyUIFailed": "Échec de la mise à jour de ComfyUI. Veuillez réessayer.",
+    "updateComfyUIStarted": "Mise à jour commencée",
+    "updateComfyUIStartedDetail": "La mise à jour de ComfyUI a été ajoutée à la file d’attente. Veuillez patienter...",
+    "updateComfyUISuccess": "Mise à jour terminée",
+    "updateComfyUISuccessDetail": "ComfyUI a été mis à jour. Redémarrage en cours...",
     "whatsNew": "Quoi de neuf ?"
   },
   "icon": {
@@ -782,6 +1202,24 @@
     "inbox": "Boîte de réception",
     "star": "Étoile"
   },
+  "imageCompare": {
+    "batchLabelA": "A :",
+    "batchLabelB": "B :",
+    "noImages": "Aucune image à comparer"
+  },
+  "imageCrop": {
+    "cropPreviewAlt": "Aperçu du recadrage",
+    "custom": "Personnalisé",
+    "loading": "Chargement...",
+    "lockRatio": "Verrouiller le ratio",
+    "noInputImage": "Aucune image d'entrée connectée",
+    "ratio": "Ratio",
+    "unlockRatio": "Déverrouiller le ratio"
+  },
+  "importFailed": {
+    "copyError": "Erreur de copie",
+    "title": "Échec de l’importation"
+  },
   "install": {
     "appDataLocationTooltip": "Répertoire des données de l'application ComfyUI. Stocke :\n- Logs\n- Configurations du serveur",
     "appPathLocationTooltip": "Répertoire des ressources de l'application ComfyUI. Stocke le code et les ressources de ComfyUI",
@@ -795,6 +1233,8 @@
     "failedToSelectDirectory": "Échec de la sélection du répertoire",
     "gpu": "GPU",
     "gpuPicker": {
+      "amdDescription": "Utilisez votre GPU AMD avec l’accélération ROCm™ pour des performances optimales.",
+      "amdSubtitle": "AMD ROCm™",
       "appleMetalDescription": "Exploite le GPU de votre Mac pour une vitesse plus rapide et une meilleure expérience globale",
       "cpuDescription": "Utilisez le mode CPU pour la compatibilité lorsque l'accélération GPU n'est pas disponible",
       "cpuSubtitle": "Mode CPU",
@@ -821,6 +1261,8 @@
       "selectGpuDescription": "Sélectionnez le type de GPU que vous avez"
     },
     "helpImprove": "Veuillez aider à améliorer ComfyUI",
+    "insideAppInstallDir": "Ce dossier se trouve dans le bundle de l’application ComfyUI Desktop et sera supprimé lors des mises à jour. Choisissez un répertoire en dehors du dossier d’installation, comme Documents/ComfyUI.",
+    "insideUpdaterCache": "Ce dossier se trouve dans le cache de mise à jour de ComfyUI, qui est effacé à chaque mise à jour. Sélectionnez un autre emplacement pour vos données.",
     "installLocation": "Emplacement d'installation",
     "installLocationDescription": "Sélectionnez le répertoire pour les données utilisateur de ComfyUI. Un environnement python sera installé à l'emplacement sélectionné. Veuillez vous assurer que le disque sélectionné a suffisamment d'espace (~15GB) restant.",
     "installLocationTooltip": "Répertoire des données utilisateur de ComfyUI. Stocke :\n- Environnement Python\n- Modèles\n- Nœuds personnalisés\n",
@@ -895,6 +1337,66 @@
   "issueReport": {
     "helpFix": "Aidez à résoudre cela"
   },
+  "linearMode": {
+    "appModeToolbar": {
+      "appBuilder": "Créateur d'applications",
+      "apps": "Applications",
+      "appsEmptyMessage": "Les applications enregistrées apparaîtront ici.\nCliquez ci-dessous pour créer votre première application.",
+      "enterAppMode": "Entrer en mode application"
+    },
+    "arrange": {
+      "atLeastOne": "au moins un",
+      "connectAtLeastOne": "Connectez {atLeastOne} nœud de sortie pour que les utilisateurs puissent voir les résultats après l'exécution.",
+      "noOutputs": "Aucune sortie ajoutée pour le moment",
+      "outputExamples": "Exemples : « Enregistrer l'image » ou « Enregistrer la vidéo »",
+      "outputs": "Sorties",
+      "resultsLabel": "Les résultats générés à partir du ou des nœuds de sortie sélectionnés seront affichés ici après l'exécution de cette application",
+      "switchToOutputs": "Passez à l'étape « Sortie » et cliquez sur les nœuds de sortie pour les ajouter ici.",
+      "switchToOutputsButton": "Passer aux sorties"
+    },
+    "backToWorkflow": "Retour au workflow",
+    "beta": "Mode App Bêta - Donnez votre avis",
+    "builder": {
+      "exit": "Quitter le mode créateur",
+      "exitConfirmMessage": "Vous avez des modifications non enregistrées qui seront perdues\nQuitter sans enregistrer ?",
+      "exitConfirmTitle": "Quitter le créateur d’application ?",
+      "inputsDesc": "Les utilisateurs interagiront avec ces paramètres pour générer leurs résultats.",
+      "inputsExample": "Exemples : « Charger une image », « Prompt texte », « Étapes »",
+      "noInputs": "Aucune entrée ajoutée pour le moment",
+      "noOutputs": "Aucun nœud de sortie ajouté pour le moment",
+      "outputsDesc": "Connectez au moins un nœud de sortie pour que les utilisateurs voient les résultats après l’exécution.",
+      "outputsExample": "Exemples : « Enregistrer l’image » ou « Enregistrer la vidéo »",
+      "promptAddInputs": "Cliquez sur les paramètres du nœud pour les ajouter ici comme entrées",
+      "promptAddOutputs": "Cliquez sur les nœuds de sortie pour les ajouter ici. Ce seront les résultats générés.",
+      "title": "Mode créateur d’application",
+      "unknownWidget": "Widget non visible"
+    },
+    "downloadAll": "Tout télécharger",
+    "dragAndDropImage": "Glissez-déposez une image",
+    "emptyWorkflowExplanation": "Votre workflow est vide. Vous devez d'abord ajouter des nodes pour commencer à créer une application.",
+    "enterNodeGraph": "Entrer dans le graphique de nœuds",
+    "giveFeedback": "Donner un avis",
+    "graphMode": "Mode graphique",
+    "linearMode": "Mode App",
+    "loadTemplate": "Charger un modèle",
+    "mobileControls": "Éditer & Exécuter",
+    "queue": {
+      "clear": "Vider la file d'attente",
+      "clickToClear": "Cliquez pour vider la file d'attente"
+    },
+    "rerun": "Relancer",
+    "reuseParameters": "Réutiliser les paramètres",
+    "runCount": "Nombre d’exécutions :",
+    "viewJob": "Voir la tâche",
+    "welcome": {
+      "buildApp": "Créer une application",
+      "controls": "Vos sorties apparaissent en bas, vos contrôles sont à droite. Tout le reste reste à l'écart.",
+      "getStarted": "Cliquez sur {runButton} pour commencer.",
+      "message": "Une vue simplifiée qui masque le graphe de nœuds pour vous permettre de vous concentrer sur la création.",
+      "sharing": "Le partage est facile : créez votre workflow, ouvrez le mode App, faites un clic droit sur l’onglet et exportez. Quand d’autres ouvrent votre fichier, il s’ouvre directement dans cette vue épurée. Vous pouvez partager des workflows puissants comme des outils simples, sans que personne n’ait besoin de comprendre les graphes de nœuds.",
+      "title": "Bienvenue en mode App"
+    }
+  },
   "load3d": {
     "applyingTexture": "Application de la texture...",
     "backgroundColor": "Couleur de fond",
@@ -921,20 +1423,24 @@
       "lineart": "Lineart",
       "normal": "Normal",
       "original": "Original",
+      "pointCloud": "Nuage de points",
       "wireframe": "Fil de fer"
     },
     "model": "Modèle",
     "openIn3DViewer": "Ouvrir dans le visualiseur 3D",
+    "panoramaMode": "Panorama",
     "previewOutput": "Aperçu de la sortie",
     "reloadingModel": "Rechargement du modèle...",
     "removeBackgroundImage": "Supprimer l'image de fond",
     "resizeNodeMatchOutput": "Redimensionner le nœud pour correspondre à la sortie",
     "scene": "Scène",
     "showGrid": "Afficher la grille",
+    "showSkeleton": "Afficher le squelette",
     "startRecording": "Démarrer l'enregistrement",
     "stopRecording": "Arrêter l'enregistrement",
     "switchCamera": "Changer de caméra",
     "switchingMaterialMode": "Changement de mode de matériau...",
+    "tiledMode": "Mosaïque",
     "unsupportedFileType": "Type de fichier non pris en charge (supporte .gltf, .glb, .obj, .fbx, .stl)",
     "upDirection": "Direction Haut",
     "upDirections": {
@@ -955,6 +1461,11 @@
       "title": "Visualiseur 3D (Bêta)"
     }
   },
+  "loadWorkflowWarning": {
+    "coreNodesFromVersion": "Nœuds principaux de la version {version} :",
+    "outdatedVersion": "Ce workflow a été créé avec une version plus récente de ComfyUI ({version}). Certains nœuds peuvent ne pas fonctionner correctement.",
+    "outdatedVersionGeneric": "Ce workflow a été créé avec une version plus récente de ComfyUI. Certains nœuds peuvent ne pas fonctionner correctement."
+  },
   "maintenance": {
     "None": "Aucun",
     "OK": "OK",
@@ -973,11 +1484,21 @@
     "showManual": "Afficher les tâches de maintenance",
     "status": "Statut",
     "terminalDefaultMessage": "Lorsque vous exécutez une commande de dépannage, toute sortie sera affichée ici.",
-    "title": "Maintenance"
+    "title": "Maintenance",
+    "unsafeMigration": {
+      "action": "Utilisez la tâche de maintenance « Chemin de base » ci-dessous pour déplacer ComfyUI vers un emplacement sécurisé.",
+      "appInstallDir": "Votre chemin de base se trouve dans le bundle de l’application ComfyUI Desktop. Ce dossier peut être supprimé ou écrasé lors des mises à jour. Choisissez un répertoire en dehors du dossier d’installation, comme Documents/ComfyUI.",
+      "generic": "Votre chemin de base ComfyUI actuel se trouve dans un emplacement qui peut être supprimé ou modifié lors des mises à jour. Pour éviter toute perte de données, déplacez-le dans un dossier sécurisé.",
+      "oneDrive": "Votre chemin de base se trouve sur OneDrive, ce qui peut entraîner des problèmes de synchronisation et une perte accidentelle de données. Choisissez un dossier local qui n’est pas géré par OneDrive.",
+      "title": "Emplacement d’installation non sécurisé détecté",
+      "updaterCache": "Votre chemin de base se trouve dans le cache de mise à jour de ComfyUI, qui est effacé à chaque mise à jour. Choisissez un autre emplacement pour vos données."
+    }
   },
   "manager": {
+    "actions": "Actions",
     "allMissingNodesInstalled": "Tous les nœuds manquants ont été installés avec succès",
     "applyChanges": "Appliquer les modifications",
+    "basicInfo": "Informations de base",
     "changingVersion": "Changement de version de {from} à {to}",
     "clickToFinishSetup": "Cliquez",
     "conflicts": {
@@ -1013,6 +1534,28 @@
     "disabledNodesWontUpdate": "Les nœuds désactivés ne seront pas mis à jour",
     "discoverCommunityContent": "Découvrez les packs de nœuds, extensions et plus encore créés par la communauté...",
     "downloads": "Téléchargements",
+    "emptyState": {
+      "allInstalled": {
+        "message": "Vous n'avez pas encore installé d'extensions.",
+        "title": "Aucune extension installée"
+      },
+      "conflicting": {
+        "message": "Toutes vos extensions sont compatibles.",
+        "title": "Aucun conflit détecté"
+      },
+      "missing": {
+        "message": "Tous les nœuds requis sont installés.",
+        "title": "Aucun nœud manquant"
+      },
+      "updateAvailable": {
+        "message": "Toutes vos extensions sont à jour.",
+        "title": "Tout est à jour"
+      },
+      "workflow": {
+        "message": "Ce workflow n'utilise aucun nœud d'extension.",
+        "title": "Aucune extension dans le workflow"
+      }
+    },
     "enablePackToChangeVersion": "Activez ce pack pour changer de version",
     "errorConnecting": "Erreur de connexion au registre de nœuds Comfy.",
     "extensionsSuccessfullyInstalled": "Extension(s) installée(s) avec succès et prête(s) à l'emploi !",
@@ -1034,25 +1577,42 @@
     "installingDependencies": "Installation des dépendances...",
     "lastUpdated": "Dernière mise à jour",
     "latestVersion": "Dernière",
+    "legacyManagerSearchTip": "Vous cherchez ComfyUI-Manager ? Vous pouvez activer l’interface du gestionnaire hérité en lançant ComfyUI avec le paramètre --enable-manager-legacy-ui.",
     "legacyManagerUI": "Utiliser l'interface utilisateur héritée",
     "legacyManagerUIDescription": "Pour utiliser l'interface utilisateur de gestion héritée, démarrez ComfyUI avec --enable-manager-legacy-ui",
     "legacyMenuNotAvailable": "Le menu du gestionnaire de l'ancienne version n'est pas disponible dans cette version de ComfyUI. Veuillez utiliser le nouveau menu du gestionnaire à la place.",
     "license": "Licence",
     "loadingVersions": "Chargement des versions...",
     "mixedSelectionMessage": "Impossible d'effectuer une action groupée sur une sélection mixte",
+    "nav": {
+      "allExtensions": "Toutes les extensions",
+      "allInWorkflow": "Tout dans : {workflowName}",
+      "allInstalled": "Tout installé",
+      "conflicting": "En conflit",
+      "inWorkflowSection": "DANS LE FLUX DE TRAVAIL",
+      "installedSection": "INSTALLÉ",
+      "missingNodes": "Nœuds manquants",
+      "notInstalled": "Non installé",
+      "updatesAvailable": "Mises à jour disponibles"
+    },
     "nightlyVersion": "Nocturne",
     "noDescription": "Aucune description disponible",
     "noNodesFound": "Aucun nœud trouvé",
     "noNodesFoundDescription": "Les nœuds du pack n'ont pas pu être analysés, ou le pack est une extension frontend uniquement et n'a pas de nœuds.",
     "noResultsFound": "Aucun résultat trouvé correspondant à votre recherche.",
     "nodePack": "Pack de Nœuds",
+    "nodePackInfo": "Informations sur le pack de nœuds",
     "notAvailable": "Non disponible",
+    "packInstall": {
+      "nodeIdRequired": "L'identifiant du nœud est requis pour l'installation"
+    },
     "packsSelected": "Packs sélectionnés",
     "repository": "Référentiel",
     "restartToApplyChanges": "Pour appliquer les modifications, veuillez redémarrer ComfyUI",
     "restartingBackend": "Redémarrage du backend pour appliquer les modifications...",
     "searchPlaceholder": "Recherche",
     "selectVersion": "Sélectionner la version",
+    "selected": "Sélectionné",
     "sort": {
       "created": "Le plus récent",
       "downloads": "Le plus populaire",
@@ -1074,6 +1634,8 @@
     "totalNodes": "Total de Nœuds",
     "tryAgainLater": "Veuillez réessayer plus tard.",
     "tryDifferentSearch": "Veuillez essayer une autre requête de recherche.",
+    "tryUpdate": "Essayer de mettre à jour",
+    "tryUpdateTooltip": "Récupérer les dernières modifications du dépôt. Les versions nightly peuvent avoir des mises à jour qui ne sont pas détectées automatiquement.",
     "uninstall": "Désinstaller",
     "uninstallSelected": "Désinstaller sélectionné",
     "uninstalling": "Désinstallation",
@@ -1084,31 +1646,111 @@
     "version": "Version"
   },
   "maskEditor": {
+    "activateLayer": "Activer le calque",
+    "applyToWholeImage": "Appliquer à toute l'image",
+    "baseImageLayer": "Calque d'image de base",
+    "baseLayerPreview": "Aperçu du calque de base",
+    "black": "Noir",
+    "brushSettings": "Paramètres du pinceau",
+    "brushShape": "Forme du pinceau",
+    "clear": "Effacer",
+    "clickToResetZoom": "Cliquez pour réinitialiser le zoom",
+    "colorSelectSettings": "Paramètres de sélection de couleur",
+    "colorSelector": "Sélecteur de couleur",
+    "fillOpacity": "Opacité de remplissage",
+    "hardness": "Dureté",
+    "imageLayer": "Calque d'image",
+    "invert": "Inverser",
+    "layers": "Calques",
+    "livePreview": "Aperçu en direct",
+    "maskBlendingOptions": "Options de fusion du masque",
+    "maskLayer": "Calque de masque",
+    "maskOpacity": "Opacité du masque",
+    "maskTolerance": "Tolérance du masque",
+    "method": "Méthode",
+    "mirrorHorizontal": "Miroir horizontal",
+    "mirrorVertical": "Miroir vertical",
+    "negative": "Négatif",
+    "opacity": "Opacité",
+    "paintBucketSettings": "Paramètres du pot de peinture",
+    "paintLayer": "Calque de peinture",
+    "redo": "Rétablir",
+    "resetToDefault": "Réinitialiser par défaut",
+    "rotateLeft": "Tourner à gauche",
+    "rotateRight": "Tourner à droite",
+    "selectionOpacity": "Opacité de la sélection",
+    "smoothingPrecision": "Précision du lissage",
+    "stepSize": "Taille de pas",
+    "stopAtMask": "Arrêter au masque",
+    "thickness": "Épaisseur",
+    "title": "Éditeur de masque",
+    "tolerance": "Tolérance",
+    "undo": "Annuler",
+    "white": "Blanc"
   },
   "mediaAsset": {
+    "actions": {
+      "copyJobId": "Copier l’ID de tâche",
+      "delete": "Supprimer",
+      "download": "Télécharger",
+      "exportWorkflow": "Exporter le flux de travail",
+      "insertAsNodeInWorkflow": "Insérer comme nœud dans le workflow",
+      "inspect": "Inspecter l’actif",
+      "more": "Plus d’options",
+      "moreOptions": "Plus d’options",
+      "openWorkflow": "Ouvrir comme flux de travail dans un nouvel onglet",
+      "seeMoreOutputs": "Voir plus de sorties",
+      "zoom": "Zoomer"
+    },
     "assetDeletedSuccessfully": "Élément supprimé avec succès",
     "deleteAssetDescription": "Cet élément sera définitivement supprimé.",
     "deleteAssetTitle": "Supprimer cet élément ?",
     "deleteSelectedDescription": "{count} élément(s) sera(ont) définitivement supprimé(s).",
     "deleteSelectedTitle": "Supprimer les éléments sélectionnés ?",
     "deletingImportedFilesCloudOnly": "La suppression des fichiers importés n'est prise en charge que dans la version cloud",
+    "failedToCreateNode": "Échec de la création du nœud",
     "failedToDeleteAsset": "Échec de la suppression de l'élément",
+    "failedToExportWorkflow": "Échec de l’exportation du flux de travail",
     "jobIdToast": {
       "copied": "Copié",
       "error": "Erreur",
       "jobIdCopied": "ID de tâche copié dans le presse-papiers",
       "jobIdCopyFailed": "Échec de la copie de l'ID de tâche"
     },
+    "noJobIdFound": "Aucun ID de tâche trouvé pour cet actif",
+    "noWorkflowDataFound": "Aucune donnée de flux de travail trouvée dans cet actif",
+    "nodeAddedToWorkflow": "Nœud {nodeType} ajouté au flux de travail",
+    "nodeTypeNotFound": "Type de nœud {nodeType} introuvable",
     "selection": {
       "assetsDeletedSuccessfully": "{count} élément(s) supprimé(s) avec succès",
       "deleteSelected": "Supprimer",
+      "deleteSelectedAll": "Tout supprimer",
       "deselectAll": "Tout désélectionner",
       "downloadSelected": "Télécharger",
+      "downloadSelectedAll": "Tout télécharger",
       "downloadStarted": "Téléchargement de {count} fichier(s)...",
       "downloadsStarted": "Début du téléchargement de {count} fichier(s)",
+      "exportStarted": "Préparation de l’export ZIP pour {count} fichier | Préparation de l’export ZIP pour {count} fichiers",
+      "exportWorkflowAll": "Exporter tous les workflows",
+      "failedToAddNodes": "Échec de l’ajout des nœuds au workflow",
       "failedToDeleteAssets": "Échec de la suppression des éléments sélectionnés",
-      "selectedCount": "Éléments sélectionnés : {count}"
-    }
+      "insertAllAssetsAsNodes": "Insérer toutes les ressources comme nœuds",
+      "multipleSelectedAssets": "Plusieurs ressources sélectionnées",
+      "noWorkflowsFound": "Aucune donnée de workflow trouvée dans les ressources sélectionnées",
+      "noWorkflowsToExport": "Aucune donnée de workflow à exporter",
+      "nodesAddedToWorkflow": "{count} nœud(s) ajouté(s) au workflow",
+      "openWorkflowAll": "Ouvrir tous les workflows",
+      "partialAddNodesSuccess": "{succeeded} ajouté(s) avec succès, {failed} échec(s)",
+      "partialDeleteSuccess": "{succeeded} supprimé(s) avec succès, {failed} échec(s)",
+      "partialWorkflowsExported": "{succeeded} exporté(s) avec succès, {failed} échec(s)",
+      "partialWorkflowsOpened": "{succeeded} workflow(s) ouvert(s), {failed} échec(s)",
+      "selectedCount": "Éléments sélectionnés : {count}",
+      "workflowsExported": "{count} workflow(s) exporté(s) avec succès",
+      "workflowsOpened": "{count} workflow(s) ouvert(s) dans de nouveaux onglets"
+    },
+    "unsupportedFileType": "Type de fichier non pris en charge pour le nœud de chargement",
+    "workflowExportedSuccessfully": "Flux de travail exporté avec succès",
+    "workflowOpenedInNewTab": "Flux de travail ouvert dans un nouvel onglet"
   },
   "menu": {
     "autoQueue": "File d'attente automatique",
@@ -1116,11 +1758,14 @@
     "batchCountTooltip": "Le nombre de fois que la génération du flux de travail doit être mise en file d'attente",
     "clear": "Effacer le flux de travail",
     "clipspace": "Ouvrir Clipspace",
+    "customNodesManager": "Gestionnaire de nœuds personnalisés",
     "dark": "Sombre",
     "disabled": "Désactivé",
     "disabledTooltip": "Le flux de travail ne sera pas mis en file d'attente automatiquement",
     "execute": "Exécuter",
+    "fullscreen": "Plein écran",
     "help": "Aide",
+    "helpAndFeedback": "Aide et commentaires",
     "hideMenu": "Masquer le menu",
     "instant": "Instantané",
     "instantTooltip": "Le flux de travail sera mis en file d'attente immédiatement après la fin d'une génération",
@@ -1134,9 +1779,12 @@
     "resetView": "Réinitialiser la vue du canevas",
     "run": "Exécuter",
     "runWorkflow": "Exécuter le workflow (Maj pour mettre en file d'attente en premier)",
+    "runWorkflowDisabled": "Le workflow contient des nœuds non pris en charge (en rouge). Supprimez-les pour exécuter le workflow.",
     "runWorkflowFront": "Exécuter le workflow (Mettre en file d'attente en premier)",
     "settings": "Paramètres",
     "showMenu": "Afficher le menu",
+    "stopRunInstant": "Arrêter l'exécution (immédiat)",
+    "stopRunInstantTooltip": "Arrêter l'exécution",
     "theme": "Thème",
     "toggleBottomPanel": "Basculer le panneau inférieur"
   },
@@ -1149,6 +1797,7 @@
     "Canvas Performance": "Performances du canevas",
     "Canvas Toggle Lock": "Basculer le verrouillage de la toile",
     "Check for Custom Node Updates": "Vérifier les mises à jour des nœuds personnalisés",
+    "Check for Updates": "Vérifier les mises à jour",
     "Clear Pending Tasks": "Effacer les tâches en attente",
     "Clear Workflow": "Effacer le flux de travail",
     "Clipspace": "Espace de clip",
@@ -1161,16 +1810,19 @@
     "Contact Support": "Contacter le support",
     "Convert Selection to Subgraph": "Convertir la sélection en sous-graphe",
     "Convert selected nodes to group node": "Convertir les nœuds sélectionnés en nœud de groupe",
+    "Copy": "Copier",
     "Custom Nodes (Legacy)": "Nœuds personnalisés (héritage)",
     "Custom Nodes Manager": "Gestionnaire de Nœuds Personnalisés",
     "Decrease Brush Size in MaskEditor": "Réduire la taille du pinceau dans MaskEditor",
     "Delete Selected Items": "Supprimer les éléments sélectionnés",
+    "Desktop User Guide": "Guide utilisateur du bureau",
     "Duplicate Current Workflow": "Dupliquer le flux de travail actuel",
     "Edit": "Éditer",
     "Edit Subgraph Widgets": "Modifier les widgets de sous-graphe",
     "Exit Subgraph": "Quitter le sous-graphe",
     "Experimental: Browse Model Assets": "Expérimental : Parcourir les ressources de modèles",
     "Experimental: Enable AssetAPI": "Expérimental : Activer AssetAPI",
+    "Experimental: Enable Nodes 2_0": "Expérimental : Activer Nodes 2.0",
     "Export": "Exporter",
     "Export (API)": "Exporter (API)",
     "File": "Fichier",
@@ -1182,12 +1834,15 @@
     "Increase Brush Size in MaskEditor": "Augmenter la taille du pinceau dans MaskEditor",
     "Install Missing Custom Nodes": "Installer les nœuds personnalisés manquants",
     "Interrupt": "Interrompre",
+    "Job History": "Historique des tâches",
     "Load Default Workflow": "Charger le flux de travail par défaut",
     "Lock Canvas": "Verrouiller le canevas",
     "Manage group nodes": "Gérer les nœuds de groupe",
     "Manager": "Gestionnaire",
     "Manager Menu (Legacy)": "Menu du gestionnaire (héritage)",
     "Minimap": "Mini-carte",
+    "Mirror Horizontal in MaskEditor": "Miroir horizontal dans l'éditeur de masque",
+    "Mirror Vertical in MaskEditor": "Miroir vertical dans l'éditeur de masque",
     "Model Library": "Bibliothèque de modèles",
     "Move Selected Nodes Down": "Déplacer les nœuds sélectionnés vers le bas",
     "Move Selected Nodes Left": "Déplacer les nœuds sélectionnés vers la gauche",
@@ -1199,9 +1854,18 @@
     "Node Library": "Bibliothèque de nœuds",
     "Node Links": "Liens de nœuds",
     "Open": "Ouvrir",
-    "Open 3D Viewer (Beta) for Selected Node": "Ouvrir le visualiseur 3D (Bêta) pour le nœud sélectionné",
+    "Open 3D Viewer (Beta) for Selected Node": "Ouvrir le visualiseur 3D (bêta) pour le nœud sélectionné",
+    "Open Color Picker in MaskEditor": "Ouvrir le sélecteur de couleur dans MaskEditor",
+    "Open Custom Nodes Folder": "Ouvrir le dossier des nœuds personnalisés",
+    "Open DevTools": "Ouvrir les outils de développement",
+    "Open Inputs Folder": "Ouvrir le dossier des entrées",
+    "Open Logs Folder": "Ouvrir le dossier des journaux",
     "Open Mask Editor for Selected Node": "Ouvrir l’éditeur de mask pour le nœud sélectionné",
+    "Open Models Folder": "Ouvrir le dossier des modèles",
+    "Open Outputs Folder": "Ouvrir le dossier des sorties",
     "Open Sign In Dialog": "Ouvrir la boîte de dialogue de connexion",
+    "Open extra_model_paths_yaml": "Ouvrir extra_model_paths.yaml",
+    "Paste": "Coller",
     "Pin/Unpin Selected Items": "Épingler/Désépingler les éléments sélectionnés",
     "Pin/Unpin Selected Nodes": "Épingler/Désépingler les nœuds sélectionnés",
     "Previous Opened Workflow": "Flux de travail ouvert précédent",
@@ -1209,24 +1873,34 @@
     "Queue Prompt": "Invite de file d'attente",
     "Queue Prompt (Front)": "Invite de file d'attente (Front)",
     "Queue Selected Output Nodes": "Mettre en file d’attente les nœuds de sortie sélectionnés",
+    "Quit": "Quitter",
     "Redo": "Refaire",
     "Refresh Node Definitions": "Actualiser les définitions de nœud",
+    "Reinstall": "Réinstaller",
+    "Rename": "Renommer",
     "Reset View": "Réinitialiser la vue",
     "Resize Selected Nodes": "Redimensionner les nœuds sélectionnés",
+    "Restart": "Redémarrer",
+    "Rotate Left in MaskEditor": "Tourner à gauche dans l'éditeur de masque",
+    "Rotate Right in MaskEditor": "Tourner à droite dans l'éditeur de masque",
     "Save": "Enregistrer",
     "Save As": "Enregistrer sous",
+    "Select All": "Tout sélectionner",
+    "Set Subgraph Description": "Définir la description du sous-graphe",
+    "Set Subgraph Search Aliases": "Définir les alias de recherche du sous-graphe",
     "Show Keybindings Dialog": "Afficher la boîte de dialogue des raccourcis clavier",
     "Show Model Selector (Dev)": "Afficher le sélecteur de modèle (Dev)",
     "Show Settings Dialog": "Afficher la boîte de dialogue des paramètres",
     "Sign Out": "Se déconnecter",
+    "Toggle App Mode": "Basculer en mode App",
     "Toggle Essential Bottom Panel": "Basculer le panneau inférieur essentiel",
-    "Toggle Logs Bottom Panel": "Basculer le panneau inférieur des journaux",
+    "Toggle Logs Bottom Panel": "Afficher/Masquer le panneau des journaux en bas",
+    "Toggle Queue Panel V2": "Basculer le panneau de file d’attente V2",
     "Toggle Search Box": "Basculer la boîte de recherche",
-    "Toggle Terminal Bottom Panel": "Basculer le panneau inférieur du terminal",
+    "Toggle Terminal Bottom Panel": "Afficher/Masquer le panneau terminal en bas",
     "Toggle Theme (Dark/Light)": "Basculer le thème (Sombre/Clair)",
     "Toggle View Controls Bottom Panel": "Basculer le panneau inférieur des contrôles d’affichage",
     "Toggle promotion of hovered widget": "Basculer la promotion du widget survolé",
-    "Toggle the Custom Nodes Manager Progress Bar": "Basculer la barre de progression du gestionnaire de nœuds personnalisés",
     "Undo": "Annuler",
     "Ungroup selected group nodes": "Dégrouper les nœuds de groupe sélectionnés",
     "Unload Models": "Décharger les modèles",
@@ -1237,7 +1911,8 @@
     "Workflows": "Flux de travail",
     "Zoom In": "Zoom avant",
     "Zoom Out": "Zoom arrière",
-    "Zoom to fit": "Ajuster à l'écran"
+    "Zoom to fit": "Ajuster à l'écran",
+    "linearMode_appModeToolbar_apps": "linearMode.appModeToolbar.apps"
   },
   "minimap": {
     "nodeColors": "Couleurs des nœuds",
@@ -1247,20 +1922,66 @@
     "showLinks": "Afficher les liens"
   },
   "missingModelsDialog": {
+    "acceptTerms": "Accepter les conditions",
+    "customModelsInstruction": "Vous devrez les trouver et les télécharger manuellement. Cherchez-les en ligne (essayez Civitai ou Hugging Face) ou contactez le créateur du workflow d'origine.",
+    "customModelsWarning": "Certains de ces modèles sont personnalisés et nous ne les reconnaissons pas.",
+    "description": "Ce workflow nécessite des modèles que vous n'avez pas encore téléchargés.",
     "doNotAskAgain": "Ne plus afficher ce message",
-    "missingModels": "Modèles manquants",
-    "missingModelsMessage": "Lors du chargement du graphique, les modèles suivants n'ont pas été trouvés"
+    "downloadAll": "Tout télécharger",
+    "downloadAvailable": "Téléchargement disponible",
+    "footerDescription": "Téléchargez et placez ces modèles dans le dossier approprié.\nLes nœuds avec des modèles manquants sont surlignés en rouge sur le canevas.",
+    "gotIt": "Ok, compris",
+    "reEnableInSettings": "Réactiver dans {link}",
+    "reEnableInSettingsLink": "Paramètres",
+    "title": "Ce workflow est incomplet : modèles manquants",
+    "totalSize": "Taille totale du téléchargement :"
+  },
+  "missingNodes": {
+    "cloud": {
+      "description": "Ce flux de travail utilise des nœuds personnalisés qui ne sont pas encore pris en charge dans la version Cloud.",
+      "gotIt": "Ok, compris",
+      "learnMore": "En savoir plus",
+      "priorityMessage": "Nous avons automatiquement signalé ces nœuds afin de prioriser leur ajout.",
+      "replacementInstruction": "En attendant, remplacez ces nœuds (surlignés en rouge sur le canevas) par des nœuds pris en charge si possible, ou essayez un autre flux de travail.",
+      "title": "Ces nœuds ne sont pas encore disponibles sur Comfy Cloud"
+    },
+    "oss": {
+      "description": "Ce flux de travail utilise des nœuds personnalisés que vous n’avez pas encore installés.",
+      "replacementInstruction": "Installez ces nœuds pour exécuter ce flux de travail, ou remplacez-les par des alternatives installées. Les nœuds manquants sont surlignés en rouge sur le canevas.",
+      "title": "Ce flux de travail a des nœuds manquants"
+    }
+  },
+  "nightly": {
+    "badge": {
+      "label": "Version de prévisualisation",
+      "tooltip": "Vous utilisez une version nightly de ComfyUI. Veuillez utiliser le bouton de retour pour partager vos impressions sur ces fonctionnalités."
+    }
+  },
+  "nightlySurvey": {
+    "accept": "Oui, je veux aider !",
+    "description": "Vous avez utilisé cette fonctionnalité. Pourriez-vous prendre un moment pour partager votre avis ?",
+    "dontAskAgain": "Ne plus demander",
+    "loadError": "Échec du chargement du sondage. Veuillez réessayer plus tard.",
+    "notNow": "Pas maintenant",
+    "title": "Aidez-nous à nous améliorer"
   },
   "nodeCategories": {
+    "": "",
     "3d": "3d",
     "3d_models": "modèles_3d",
     "BFL": "BFL",
+    "Bria": "Bria",
     "ByteDance": "ByteDance",
+    "ElevenLabs": "ElevenLabs",
     "Gemini": "Gemini",
+    "Grok": "Grok",
+    "HitPaw": "HitPaw",
     "Ideogram": "Ideogram",
     "Kling": "Kling",
     "LTXV": "LTXV",
     "Luma": "Luma",
+    "Magnific": "Magnific",
+    "Meshy": "Meshy",
     "MiniMax": "MiniMax",
     "Moonvalley Marey": "Moonvalley Marey",
     "OpenAI": "OpenAI",
@@ -1270,10 +1991,13 @@
     "Runway": "Runway",
     "Sora": "Sora",
     "Stability AI": "Stability AI",
+    "Tencent": "Tencent",
+    "Topaz": "Topaz",
     "Tripo": "Tripo",
     "Veo": "Veo",
     "Vidu": "Vidu",
     "Wan": "Wan",
+    "WaveSpeed": "WaveSpeed",
     "_for_testing": "_pour_test",
     "advanced": "avancé",
     "animation": "animation",
@@ -1294,6 +2018,7 @@
     "controlnet": "controlnet",
     "create": "créer",
     "custom_sampling": "échantillonnage_personnalisé",
+    "dataset": "jeu de données",
     "debug": "débogage",
     "deprecated": "déprécié",
     "edit_models": "edit_models",
@@ -1305,8 +2030,10 @@
     "image": "image",
     "inpaint": "inpaint",
     "instructpix2pix": "instructpix2pix",
+    "kandinsky5": "kandinsky5",
     "latent": "latent",
     "loaders": "chargeurs",
+    "logic": "logique",
     "lotus": "lotus",
     "ltxv": "ltxv",
     "mask": "masque",
@@ -1328,11 +2055,13 @@
     "scheduling": "planification",
     "sd": "sd",
     "sd3": "sd3",
+    "shader": "shader",
     "sigmas": "sigmas",
     "stable_cascade": "stable_cascade",
     "string": "chaîne",
     "style_model": "modèle_de_style",
     "text": "texte",
+    "textgen": "textgen",
     "training": "entraînement",
     "transform": "transformer",
     "unet": "unet",
@@ -1340,7 +2069,25 @@
     "upscaling": "mise_à_l'échelle",
     "utils": "utilitaires",
     "video": "vidéo",
-    "video_models": "modèles_vidéo"
+    "video_models": "modèles_vidéo",
+    "zimage": "zimage"
+  },
+  "nodeErrors": {
+    "content": "Erreur de contenu du nœud",
+    "header": "Erreur d'en-tête du nœud",
+    "render": "Erreur de rendu du nœud",
+    "slots": "Erreur de slots du nœud",
+    "widgets": "Erreur de widgets du nœud"
+  },
+  "nodeFilters": {
+    "hideDeprecated": "Masquer les nœuds obsolètes",
+    "hideDeprecatedDescription": "Masque les nœuds marqués comme obsolètes sauf si explicitement activés",
+    "hideDevOnly": "Masquer les nœuds développeur uniquement",
+    "hideDevOnlyDescription": "Masque les nœuds réservés au développement sauf si le mode développeur est activé",
+    "hideExperimental": "Masquer les nœuds expérimentaux",
+    "hideExperimentalDescription": "Masque les nœuds marqués comme expérimentaux sauf si explicitement activés",
+    "hideSubgraph": "Masquer les nœuds de sous-graphe",
+    "hideSubgraphDescription": "Masque temporairement les nœuds de sous-graphe de la bibliothèque de nœuds et de la recherche"
   },
   "nodeHelpPage": {
     "documentationPage": "page de documentation",
@@ -1350,6 +2097,32 @@
     "outputs": "Sorties",
     "type": "Type"
   },
+  "nodeReplacement": {
+    "compatibleAlternatives": "Alternatives compatibles",
+    "installMissingNodes": "Installer les nœuds manquants",
+    "installationRequired": "Installation requise",
+    "instructionMessage": "Vous devez installer ces nœuds ou les remplacer par des alternatives installées pour exécuter le workflow. Les nœuds manquants sont surlignés en {red} sur le canevas. Certains nœuds ne peuvent pas être remplacés et doivent être installés via le Gestionnaire de nœuds.",
+    "notReplaceable": "Installation requise",
+    "openNodeManager": "Ouvrir le Gestionnaire de nœuds",
+    "quickFixAvailable": "Correction rapide disponible",
+    "redHighlight": "rouge",
+    "replaceAll": "Tout remplacer",
+    "replaceAllWarning": "Remplace tous les nœuds disponibles dans ce groupe.",
+    "replaceFailed": "Échec du remplacement des nœuds",
+    "replaceNode": "Remplacer le nœud",
+    "replaceSelected": "Remplacer la sélection ({count})",
+    "replaceWarning": "Cela modifiera définitivement le workflow. Sauvegardez une copie si vous n’êtes pas sûr.",
+    "replaceable": "Remplaçable",
+    "replaced": "Remplacé",
+    "replacedAllNodes": "{count} type(s) de nœud remplacé(s)",
+    "replacedNode": "Nœud remplacé : {nodeType}",
+    "selectAll": "Tout sélectionner",
+    "skipForNow": "Ignorer pour l’instant",
+    "swapNodesGuide": "Les nœuds suivants peuvent être automatiquement remplacés par des alternatives compatibles.",
+    "swapNodesTitle": "Échanger les nœuds",
+    "unknownNode": "Inconnu",
+    "willBeReplacedBy": "Ce nœud sera remplacé par :"
+  },
   "nodeTemplates": {
     "enterName": "Entrez le nom",
     "saveAsTemplate": "Enregistrer comme modèle"
@@ -1357,6 +2130,7 @@
   "notSupported": {
     "continue": "Continuer",
     "continueTooltip": "Je suis sûr que mon appareil est pris en charge",
+    "illustrationAlt": "Illustration d’une fille triste",
     "learnMore": "En savoir plus",
     "message": "Seuls les appareils suivants sont pris en charge :",
     "reportIssue": "Signaler un problème",
@@ -1366,12 +2140,222 @@
     },
     "title": "Votre appareil n'est pas pris en charge"
   },
+  "painter": {
+    "background": "Arrière-plan",
+    "brush": "Pinceau",
+    "clear": "Effacer",
+    "color": "Sélecteur de couleur",
+    "eraser": "Gomme",
+    "hardness": "Dureté",
+    "height": "Hauteur",
+    "size": "Taille du curseur",
+    "tool": "Outil",
+    "uploadError": "Échec du téléversement de l'image du peintre : {status} - {statusText}",
+    "width": "Largeur"
+  },
+  "progressToast": {
+    "allDownloadsCompleted": "Tous les téléchargements sont terminés",
+    "downloadingModel": "Téléchargement du modèle...",
+    "downloadsFailed": "{count} téléchargements échoués | {count} téléchargement échoué | {count} téléchargements échoués",
+    "failed": "Échec",
+    "filter": {
+      "all": "Tous",
+      "completed": "Terminés",
+      "failed": "Échoués"
+    },
+    "finished": "Terminé",
+    "importingModels": "Importation des modèles",
+    "noImportsInQueue": "Aucun {filter} dans la file d’attente",
+    "pending": "En attente",
+    "progressCount": "{completed} sur {total}"
+  },
+  "queue": {
+    "completedIn": "Terminé en {duration}",
+    "inQueue": "En file d'attente...",
+    "initializingAlmostReady": "Initialisation - Presque prêt",
+    "jobAddedToQueue": "Tâche ajoutée à la file d'attente",
+    "jobDetails": {
+      "computeHoursUsed": "Heures de calcul utilisées",
+      "errorMessage": "Message d'erreur",
+      "estimatedFinishIn": "Fin estimée dans",
+      "estimatedStartIn": "Début estimé dans",
+      "eta": {
+        "minutes": "~{count} minute | ~{count} minutes",
+        "minutesRange": "~{lo}-{hi} minutes",
+        "seconds": "~{count} seconde | ~{count} secondes",
+        "secondsRange": "~{lo}-{hi} secondes"
+      },
+      "failedAfter": "Échec après",
+      "generatedOn": "Généré le",
+      "header": "Détails de la tâche",
+      "jobId": "ID de la tâche",
+      "queuePosition": "Position dans la file",
+      "queuePositionValue": "~{count} tâche devant la vôtre | ~{count} tâches devant la vôtre",
+      "queuedAt": "Mis en file à",
+      "report": "Signaler",
+      "timeElapsed": "Temps écoulé",
+      "totalGenerationTime": "Temps total de génération",
+      "workflow": "Workflow"
+    },
+    "jobHistory": "Historique des tâches",
+    "jobList": {
+      "sortComputeHoursUsed": "Heures de calcul utilisées (le plus en premier)",
+      "sortMostRecent": "Le plus récent",
+      "sortTotalGenerationTime": "Temps total de génération (le plus long en premier)",
+      "undated": "Sans date"
+    },
+    "jobMenu": {
+      "addToCurrentWorkflow": "Ajouter au workflow actuel",
+      "cancelJob": "Annuler la tâche",
+      "copyErrorMessage": "Copier le message d'erreur",
+      "copyJobId": "Copier l'ID de la tâche",
+      "delete": "Supprimer",
+      "deleteAsset": "Supprimer l'élément",
+      "download": "Télécharger",
+      "exportWorkflow": "Exporter le workflow",
+      "inspectAsset": "Inspecter l'élément",
+      "openAsWorkflowNewTab": "Ouvrir comme workflow dans un nouvel onglet",
+      "openWorkflowNewTab": "Ouvrir le workflow dans un nouvel onglet",
+      "removeJob": "Retirer la tâche",
+      "reportError": "Signaler une erreur"
+    },
+    "jobQueueing": "Mise en file d’attente de la tâche",
+    "toggleJobHistory": "Afficher/Masquer l'historique des tâches"
+  },
   "releaseToast": {
+    "description": "Découvrez les dernières améliorations et fonctionnalités de cette mise à jour.",
     "newVersionAvailable": "Nouvelle version disponible !",
     "skip": "Ignorer",
     "update": "Mettre à jour",
     "whatsNew": "Quoi de neuf ?"
   },
+  "rightSidePanel": {
+    "addFavorite": "Favori",
+    "advancedInputs": "ENTRÉES AVANCÉES",
+    "bypass": "Contourner",
+    "color": "Couleur du nœud",
+    "enterSubgraph": "Entrer dans le sous-graphe",
+    "errorHelp": "Pour plus d'aide, {github} ou {support}",
+    "errorHelpGithub": "soumettre un ticket GitHub",
+    "errorHelpSupport": "contacter notre support",
+    "errors": "Erreurs",
+    "executionErrorOccurred": "Une erreur est survenue lors de l’exécution. Consultez l’onglet Erreurs pour plus de détails.",
+    "fallbackGroupTitle": "Groupe",
+    "fallbackNodeTitle": "Nœud",
+    "favorites": "ENTRÉES FAVORITES",
+    "favoritesNone": "AUCUNE ENTRÉE FAVORITE",
+    "favoritesNoneDesc": "Les entrées que vous ajoutez en favori apparaîtront ici",
+    "favoritesNoneHint": "Dans l’onglet Paramètres, cliquez sur {moreIcon} à côté de n’importe quelle entrée pour l’ajouter ici",
+    "favoritesNoneTooltip": "Étoilez les widgets pour y accéder rapidement sans sélectionner de nœud",
+    "globalSettings": {
+      "canvas": "CANEVA",
+      "connectionLinks": "LIENS DE CONNEXION",
+      "gridSpacing": "Espacement de la grille",
+      "linkShape": "Forme du lien",
+      "nodes": "NŒUDS",
+      "nodes2": "Nœuds 2.0",
+      "searchPlaceholder": "Rechercher dans les paramètres rapides...",
+      "showAdvanced": "Afficher les paramètres avancés",
+      "showAdvancedTooltip": "Ceci est un paramètre important qui, lorsqu’il est activé, affiche tous les paramètres avancés des nœuds",
+      "showConnectedLinks": "Afficher les liens connectés",
+      "showInfoBadges": "Afficher les badges d’information",
+      "showToolbox": "Afficher la boîte à outils à la sélection",
+      "snapNodesToGrid": "Aligner les nœuds sur la grille",
+      "title": "Paramètres globaux",
+      "viewAllSettings": "Voir tous les paramètres"
+    },
+    "groupSettings": "Paramètres du groupe",
+    "groups": "Groupes",
+    "hideAdvancedInputsButton": "Masquer les entrées avancées",
+    "hideInput": "Masquer l’entrée",
+    "info": "Infos",
+    "inputs": "ENTRÉES",
+    "inputsNone": "AUCUNE ENTRÉE",
+    "inputsNoneTooltip": "Le nœud n’a pas d’entrées",
+    "locateNode": "Localiser le nœud sur le canevas",
+    "missingNodePacks": {
+      "applyChanges": "Appliquer les modifications",
+      "cloudMessage": "Ce workflow nécessite des nœuds personnalisés qui ne sont pas encore disponibles sur Comfy Cloud.",
+      "collapse": "Réduire",
+      "expand": "Développer",
+      "installAll": "Tout installer",
+      "installNodePack": "Installer le pack de nœuds",
+      "installed": "Installé",
+      "installing": "Installation en cours...",
+      "ossManagerDisabledHint": "Pour installer les nodes manquants, exécutez d'abord {pipCmd} dans votre environnement Python pour installer le Node Manager, puis redémarrez ComfyUI avec le paramètre {flag}.",
+      "ossMessage": "Ce workflow utilise des nœuds personnalisés que vous n'avez pas encore installés.",
+      "searchInManager": "Rechercher dans le gestionnaire de nœuds",
+      "title": "Packs de nœuds manquants",
+      "unknownPack": "Pack inconnu",
+      "unsupportedTitle": "Packs de nœuds non pris en charge",
+      "viewInManager": "Voir dans le gestionnaire"
+    },
+    "mute": "Muet",
+    "noErrors": "Aucune erreur",
+    "noSelection": "Sélectionnez un nœud pour voir ses propriétés et informations.",
+    "nodeState": "État du nœud",
+    "nodes": "Nœuds",
+    "nodesNoneDesc": "AUCUN NŒUD",
+    "noneSearchDesc": "Aucun élément ne correspond à votre recherche",
+    "normal": "Normal",
+    "parameters": "Paramètres",
+    "pinned": "Épinglé",
+    "promptErrors": {
+      "no_prompt": {
+        "desc": "Les données du flux de travail envoyées au serveur sont vides. Il peut s'agir d'une erreur système inattendue."
+      },
+      "prompt_no_outputs": {
+        "desc": "Le flux de travail ne contient aucun nœud de sortie (par exemple, Enregistrer l'image, Prévisualiser l'image) pour produire un résultat."
+      },
+      "server_error_cloud": {
+        "desc": "Le serveur a rencontré une erreur inattendue. Veuillez réessayer plus tard."
+      },
+      "server_error_local": {
+        "desc": "Le serveur a rencontré une erreur inattendue. Veuillez consulter les journaux du serveur."
+      }
+    },
+    "properties": "Propriétés",
+    "removeFavorite": "Retirer des favoris",
+    "resetAllParameters": "Réinitialiser tous les paramètres",
+    "resetToDefault": "Réinitialiser par défaut",
+    "seeError": "Voir l'erreur",
+    "settings": "Paramètres",
+    "showAdvancedInputsButton": "Afficher les entrées avancées",
+    "showInput": "Afficher l’entrée",
+    "title": "Aucun nœud sélectionné | 1 nœud sélectionné | {count} nœuds sélectionnés",
+    "togglePanel": "Afficher/masquer le panneau des propriétés",
+    "workflowOverview": "Aperçu du workflow"
+  },
+  "secrets": {
+    "addSecret": "Ajouter un secret",
+    "createdAt": "Créé le {date}",
+    "deleteConfirmMessage": "Êtes-vous sûr de vouloir supprimer « {name} » ? Cette action est irréversible.",
+    "deleteConfirmTitle": "Supprimer le secret",
+    "description": "Les secrets sont chiffrés et utilisés pour les données sensibles comme les clés API.",
+    "descriptionUsage": "Stockez vos jetons ici pour permettre le téléchargement de modèles privés et restreints depuis les fournisseurs pris en charge.",
+    "editSecret": "Modifier le secret",
+    "errors": {
+      "duplicateName": "Un secret avec ce nom existe déjà",
+      "duplicateProvider": "Un secret pour ce fournisseur existe déjà",
+      "nameRequired": "Le nom est requis",
+      "nameTooLong": "Le nom doit comporter 255 caractères ou moins",
+      "providerRequired": "Le fournisseur est requis",
+      "secretValueRequired": "La valeur du secret est requise"
+    },
+    "lastUsed": "Dernière utilisation le {date}",
+    "modelProviders": "Fournisseurs de modèles",
+    "name": "Nom",
+    "namePlaceholder": "ex. : Ma clé API",
+    "noSecrets": "Aucun secret enregistré. Ajoutez votre première clé API pour commencer.",
+    "provider": "Fournisseur",
+    "providerHint": "Optionnel. Sélectionner un fournisseur permet l’utilisation automatique du jeton.",
+    "secretValue": "Valeur du secret",
+    "secretValueHint": "Cette valeur sera chiffrée et ne pourra plus être consultée.",
+    "secretValueHintEdit": "Laissez vide pour conserver la valeur actuelle.",
+    "secretValuePlaceholder": "Saisissez votre clé API",
+    "secretValuePlaceholderEdit": "Saisissez une nouvelle valeur pour modifier",
+    "title": "Clés API et secrets"
+  },
   "selectionToolbox": {
     "Bypass Group Nodes": "Contourner les nœuds de groupe",
     "Set Group Nodes to Always": "Définir les nœuds de groupe sur Toujours",
@@ -1384,6 +2368,8 @@
   "serverConfig": {
     "modifiedConfigs": "Vous avez modifié les configurations suivantes du serveur. Redémarrez pour appliquer les modifications.",
     "restart": "Redémarrer",
+    "restartRequiredToastDetail": "Redémarrez l’application pour appliquer les modifications de configuration du serveur.",
+    "restartRequiredToastSummary": "Redémarrage requis",
     "revertChanges": "Annuler les modifications"
   },
   "serverConfigCategories": {
@@ -1452,6 +2438,10 @@
     "enable-cors-header": {
       "name": "Activer l'en-tête CORS: Utilisez \"*\" pour toutes les origines ou spécifiez le domaine"
     },
+    "enable-manager-legacy-ui": {
+      "name": "Utiliser l’interface Manager héritée",
+      "tooltip": "Utilise l’ancienne interface ComfyUI-Manager au lieu de la nouvelle interface."
+    },
     "fast": {
       "name": "Activer certaines optimisations non testées et potentiellement dégradantes pour la qualité."
     },
@@ -1553,6 +2543,8 @@
     "CustomColorPalettes": "Palettes de Couleurs Personnalisées",
     "DevMode": "Mode Développeur",
     "EditTokenWeight": "Modifier le Poids du Jeton",
+    "Error System": "Système d'erreurs",
+    "Execution": "Exécution",
     "Extension": "Extension",
     "General": "Général",
     "Graph": "Graphique",
@@ -1568,10 +2560,14 @@
     "Menu": "Menu",
     "ModelLibrary": "Bibliothèque de Modèles",
     "Node": "Nœud",
+    "Node Library": "Bibliothèque de nœuds",
     "Node Search Box": "Boîte de Recherche de Nœud",
     "Node Widget": "Widget de Nœud",
     "NodeLibrary": "Bibliothèque de Nœuds",
+    "Nodes 2_0": "Nodes 2.0",
     "Notification Preferences": "Préférences de notification",
+    "Other": "Autre",
+    "PLY": "PLY",
     "PlanCredits": "Forfait et crédits",
     "Pointer": "Pointeur",
     "Queue": "File d'Attente",
@@ -1579,6 +2575,7 @@
     "Reroute": "Réacheminement",
     "RerouteBeta": "Reroute Beta",
     "Scene": "Scène",
+    "Secrets": "Secrets",
     "Server": "Serveur",
     "Server-Config": "Config-Serveur",
     "Settings": "Paramètres",
@@ -1590,7 +2587,8 @@
     "Vue Nodes": "Nœuds Vue",
     "VueNodes": "Nœuds Vue",
     "Window": "Fenêtre",
-    "Workflow": "Flux de Travail"
+    "Workflow": "Flux de Travail",
+    "Workspace": "Espace de travail"
   },
   "shape": {
     "CARD": "Carte",
@@ -1616,11 +2614,18 @@
     "viewControls": "Contrôles d'affichage"
   },
   "sideToolbar": {
+    "activeJobStatus": "Tâche active : {status}",
     "assets": "Ressources",
     "backToAssets": "Retour à toutes les ressources",
     "browseTemplates": "Parcourir les modèles d'exemple",
     "downloads": "Téléchargements",
+    "folderView": {
+      "errorDetail": "Impossible de récupérer les sorties pour ce travail. Veuillez réessayer.",
+      "errorSummary": "Échec du chargement des sorties"
+    },
+    "generatedAssetsHeader": "Ressources générées",
     "helpCenter": "Centre d'aide",
+    "importedAssetsHeader": "Ressources importées",
     "labels": {
       "assets": "Ressources",
       "console": "Console",
@@ -1643,6 +2648,17 @@
     "noImportedFiles": "Aucun fichier importé trouvé",
     "nodeLibrary": "Bibliothèque de nœuds",
     "nodeLibraryTab": {
+      "allNodes": "Tous les nœuds",
+      "blueprints": "Plans",
+      "custom": "Personnalisé",
+      "essentials": "Essentiels",
+      "filter": "Filtrer",
+      "filterOptions": {
+        "blueprints": "Plans",
+        "comfyNodes": "Nœuds Comfy",
+        "extensions": "Extensions",
+        "partnerNodes": "Nœuds partenaires"
+      },
       "groupBy": "Grouper par",
       "groupStrategies": {
         "category": "Catégorie",
@@ -1652,7 +2668,20 @@
         "source": "Source",
         "sourceDesc": "Grouper par type de source (Core, Custom, API)"
       },
+      "noBookmarkedNodes": "Aucun favori pour le moment",
       "resetView": "Réinitialiser la vue par défaut",
+      "sections": {
+        "bookmarked": "Favoris",
+        "comfyBlueprints": "Plans Comfy",
+        "comfyNodes": "Nœuds Comfy",
+        "extensions": "Extensions",
+        "favoriteNode": "Nœud favori",
+        "favorites": "Favoris",
+        "myBlueprints": "Mes plans",
+        "partnerNodes": "Nœuds partenaires",
+        "subgraphBlueprints": "Plans de sous-graphe",
+        "unfavoriteNode": "Retirer des favoris"
+      },
       "sortBy": {
         "alphabetical": "Alphabétique",
         "alphabeticalDesc": "Trier alphabétiquement dans les groupes",
@@ -1661,8 +2690,62 @@
       },
       "sortMode": "Mode de tri"
     },
+    "nodes": "Nœuds",
     "openWorkflow": "Ouvrir le flux de travail dans le système de fichiers local",
     "queue": "File d'attente",
+    "queueProgressOverlay": {
+      "activeJobs": "{count} travail actif | {count} travaux actifs",
+      "activeJobsShort": "{count} actif(s) | {count} actif(s)",
+      "activeJobsSuffix": "travaux actifs",
+      "cancelJobTooltip": "Annuler le travail",
+      "clearAllJobsTooltip": "Annuler tous les travaux en cours",
+      "clearHistory": "Effacer l’historique de la file d’attente",
+      "clearHistoryDialogAssetsNote": "Les ressources générées par ces travaux ne seront pas supprimées et resteront accessibles depuis le panneau des ressources.",
+      "clearHistoryDialogDescription": "Tous les travaux terminés ou échoués ci-dessous seront supprimés de ce panneau de file d’attente.",
+      "clearHistoryDialogTitle": "Effacer l’historique de la file d’attente ?",
+      "clearHistoryMenuAssetsNote": "Les ressources média ne seront pas supprimées.",
+      "clearQueueTooltip": "Vider la file d’attente",
+      "clearQueued": "Vider la file d’attente",
+      "colonPercent": ": {percent}",
+      "currentNode": "Nœud actuel :",
+      "dockedJobHistory": "Historique des tâches ancré",
+      "expandCollapsedQueue": "Développer la file d’attente",
+      "filterAllWorkflows": "Tous les workflows",
+      "filterBy": "Filtrer par",
+      "filterCurrentWorkflow": "Workflow actuel",
+      "filterJobs": "Filtrer les travaux",
+      "inlineTotalLabel": "Total",
+      "interruptAll": "Interrompre tous les travaux en cours",
+      "jobCompleted": "Tâche terminée",
+      "jobFailed": "Échec de la tâche",
+      "jobQueue": "File d’attente des travaux",
+      "jobsAddedToQueue": "{count} tâche ajoutée à la file d’attente | {count} tâches ajoutées à la file d’attente",
+      "jobsCompleted": "{count} travail terminé | {count} travaux terminés",
+      "jobsFailed": "{count} travail échoué | {count} travaux échoués",
+      "moreOptions": "Plus d’options",
+      "noActiveJobs": "Aucun travail actif",
+      "preview": "Aperçu",
+      "queuedJobsLabel": "{count} en file d’attente",
+      "queuedSuffix": "en file d’attente",
+      "running": "en cours",
+      "runningJobsLabel": "{count} en cours",
+      "runningQueuedSummary": "{running} en cours, {queued} en file",
+      "searchJobs": "Rechercher...",
+      "showAssets": "Afficher les ressources",
+      "showAssetsPanel": "Afficher le panneau des ressources",
+      "showRunProgressBar": "Afficher la barre de progression d'exécution",
+      "sortBy": "Trier par",
+      "sortJobs": "Trier les travaux",
+      "stubClipTextEncode": "CLIP Text Encode :",
+      "title": "Progression de la file d’attente",
+      "total": "Total : {percent}",
+      "viewAllJobs": "Voir tous les travaux",
+      "viewGrid": "Vue en grille",
+      "viewJobHistory": "Voir l’historique des travaux",
+      "viewList": "Vue en liste"
+    },
+    "searchAssets": "Rechercher des ressources",
+    "sidebar": "Barre latérale",
     "templates": "Modèles",
     "themeToggle": "Basculer le thème",
     "workflowTab": {
@@ -1686,60 +2769,208 @@
   },
   "subgraphStore": {
     "blueprintName": "Nom du sous-graphe",
+    "blueprintNamePrompt": "Nom du sous-graphe :",
+    "cannotDeleteGlobal": "Impossible de supprimer les blueprints installés",
     "confirmDelete": "Cette action supprimera définitivement le plan de votre bibliothèque",
     "confirmDeleteTitle": "Supprimer le plan ?",
+    "disconnected": "Déconnecté",
+    "enterDescription": "Saisissez une description",
+    "enterSearchAliases": "Saisissez des alias de recherche (séparés par des virgules)",
     "hidden": "Paramètres cachés / imbriqués",
     "hideAll": "Tout masquer",
+    "linked": "(Lié)",
     "loadFailure": "Échec du chargement des plans de sous-graphes",
     "overwriteBlueprint": "L'enregistrement écrasera le plan actuel avec vos modifications",
     "overwriteBlueprintTitle": "Écraser le plan existant ?",
     "promoteOutsideSubgraph": "Impossible de promouvoir le widget en dehors d'un sous-graphe",
+    "promoteWidget": "Promouvoir le widget : {name}",
     "publish": "Publier le sous-graphe",
     "publishSuccess": "Enregistré dans la bibliothèque de nœuds",
     "publishSuccessMessage": "Vous pouvez trouver votre plan de sous-graphe dans la bibliothèque de nœuds sous \"Plans de sous-graphes\"",
     "saveBlueprint": "Enregistrer le sous-graphe dans la bibliothèque",
+    "searchAliases": "Rechercher des alias",
     "showAll": "Tout afficher",
     "showRecommended": "Afficher les widgets recommandés",
-    "shown": "Affiché sur le nœud"
+    "shown": "Affiché sur le nœud",
+    "unpromoteWidget": "Rétrograder le widget : {name}"
   },
   "subscription": {
     "addApiCredits": "Ajouter des crédits API",
     "addCredits": "Ajouter des crédits",
+    "addCreditsLabel": "Ajoutez des crédits à tout moment",
     "benefits": {
       "benefit1": "Crédits mensuels pour les Nœuds Partenaires — rechargez si nécessaire",
-      "benefit2": "Jusqu'à 30 min d'exécution par tâche"
+      "benefit1FreeTier": "Plus de crédits mensuels, recharge à tout moment",
+      "benefit2": "Jusqu'à 30 min d'exécution par tâche",
+      "benefit3": "Utilisez vos propres modèles (Creator & Pro)"
     },
     "beta": "BÊTA",
+    "billedMonthly": "Facturé mensuellement",
+    "billedYearly": "{total} facturé annuellement",
+    "billingComingSoon": {
+      "message": "La facturation d'équipe arrive bientôt. Vous pourrez souscrire à un abonnement pour votre espace de travail avec un tarif par utilisateur. Restez à l'écoute pour les mises à jour.",
+      "title": "Bientôt disponible"
+    },
+    "cancelDialog": {
+      "confirmCancel": "Annuler l'abonnement",
+      "description": "Votre accès continue jusqu'au {date}. Vous ne serez plus facturé, et votre espace de travail ainsi que vos crédits seront conservés. Vous pouvez vous réabonner à tout moment.",
+      "endOfBillingPeriod": "fin de la période de facturation",
+      "failed": "Échec de l'annulation de l'abonnement",
+      "keepSubscription": "Conserver l'abonnement",
+      "title": "Annuler l'abonnement"
+    },
+    "cancelSubscription": "Annuler l’abonnement",
+    "cancelSuccess": "Abonnement annulé avec succès",
+    "canceled": "Annulé",
+    "canceledCard": {
+      "description": "Vous ne serez plus facturé. Vos fonctionnalités restent actives jusqu'au {date}.",
+      "title": "Votre abonnement a été annulé"
+    },
+    "changeTo": "Changer pour {plan}",
+    "chooseBestPlanWorkspace": "Choisissez la meilleure offre pour votre espace de travail",
     "comfyCloud": "Comfy Cloud",
+    "comfyCloudLogo": "Logo Comfy Cloud",
+    "contactOwnerToSubscribe": "Contactez le propriétaire de l’espace de travail pour vous abonner",
+    "contactUs": "Contactez-nous",
+    "creditsRemainingThisMonth": "Crédits restants ce mois-ci",
+    "creditsRemainingThisYear": "Crédits restants cette année",
+    "creditsYouveAdded": "Crédits ajoutés",
+    "currentPlan": "Forfait actuel",
+    "customLoRAsLabel": "Importer vos propres LoRAs",
+    "description": "Choisissez le forfait qui vous convient",
+    "descriptionWorkspace": "Choisissez la meilleure offre pour votre espace de travail",
     "expiresDate": "Expire le {date}",
+    "freeTier": {
+      "description": "Votre plan gratuit inclut {credits} crédits chaque mois pour essayer Comfy Cloud.",
+      "descriptionGeneric": "Votre plan gratuit inclut une allocation mensuelle de crédits pour essayer Comfy Cloud.",
+      "nextRefresh": "Vos crédits seront renouvelés le {date}.",
+      "outOfCredits": {
+        "subtitle": "Abonnez-vous pour débloquer les recharges et plus encore",
+        "title": "Vous n’avez plus de crédits gratuits"
+      },
+      "subscribeCta": "Abonnez-vous pour plus",
+      "title": "Vous êtes sur le plan Gratuit",
+      "topUpBlocked": {
+        "title": "Débloquez les recharges et plus encore"
+      },
+      "upgradeCta": "Voir les offres"
+    },
+    "gpuLabel": "RTX 6000 Pro (96GB VRAM)",
+    "haveQuestions": "Des questions ou besoin d'une offre entreprise ?",
     "invoiceHistory": "Historique des factures",
     "learnMore": "En savoir plus",
+    "managePayment": "Gérer le paiement",
+    "managePlan": "Gérer le forfait",
     "manageSubscription": "Gérer l'abonnement",
+    "maxDuration": {
+      "creator": "30 min",
+      "founder": "30 min",
+      "free": "30 min",
+      "pro": "1 h",
+      "standard": "30 min"
+    },
+    "maxDurationLabel": "Durée maximale de chaque exécution de workflow",
+    "maxMembersLabel": "Nombre max. de membres",
+    "member": "membre",
+    "memberCount": "{count} membre | {count} membres",
+    "membersLabel": "Jusqu'à {count} membres",
     "messageSupport": "Contacter le support",
+    "monthly": "Mensuel",
     "monthlyBonusDescription": "Bonus de crédits mensuel",
+    "monthlyCreditsInfo": "Ces crédits se renouvellent chaque mois et ne sont pas reportés",
+    "monthlyCreditsLabel": "Crédits mensuels",
+    "monthlyCreditsPerMemberLabel": "Crédits mensuels / membre",
     "monthlyCreditsRollover": "Ces crédits seront reportés au mois suivant",
+    "mostPopular": "Le plus populaire",
     "nextBillingCycle": "prochain cycle de facturation",
+    "nextMonthInvoice": "Facture du mois prochain",
     "partnerNodesBalance": "Solde de crédits \"Nœuds Partenaires\"",
     "partnerNodesCredits": "Crédits Nœuds Partenaires",
     "partnerNodesDescription": "Pour exécuter des modèles commerciaux/propriétaires",
     "perMonth": "USD / mois",
+    "plansAndPricing": "Forfaits & tarifs",
     "prepaidCreditsInfo": "Crédits achetés séparément qui n'expirent pas",
     "prepaidDescription": "Crédits prépayés",
+    "preview": {
+      "addCreditCard": "Ajouter une carte bancaire",
+      "backToAllPlans": "Retour à toutes les offres",
+      "confirm": "Confirmer",
+      "confirmPayment": "Confirmer votre paiement",
+      "confirmPlanChange": "Confirmer le changement d'offre",
+      "eachMonthCreditsRefill": "Chaque mois, les crédits sont réinitialisés à",
+      "ends": "Se termine le {date}",
+      "hideFeatures": "Masquer les fonctionnalités",
+      "nextPaymentDue": "Prochain paiement dû le {date}. Annulez à tout moment.",
+      "perMember": "/ membre",
+      "privacyPolicy": "Politique de confidentialité",
+      "proratedCharge": "Facturation au prorata pour {plan}",
+      "proratedRefund": "Remboursement au prorata pour {plan}",
+      "showMoreFeatures": "Afficher plus de fonctionnalités",
+      "starting": "À partir du {date}",
+      "startingToday": "À partir d'aujourd'hui",
+      "terms": "Conditions",
+      "termsAgreement": "En continuant, vous acceptez les {terms} et la {privacy} de Comfy Org.",
+      "totalDueToday": "Total dû aujourd'hui"
+    },
     "renewsDate": "Renouvellement le {date}",
     "required": {
+      "pollingFailed": "Échec de l'activation de l'abonnement",
+      "pollingSuccess": "Abonnement activé avec succès !",
+      "pollingTimeout": "Délai d'attente de l'abonnement dépassé. Veuillez actualiser et réessayer.",
       "subscribe": "S'abonner",
       "title": "S'abonner à",
       "waitingForSubscription": "Complétez votre abonnement dans le nouvel onglet. Nous détecterons automatiquement quand vous aurez terminé !"
     },
+    "resubscribe": "Se réabonner",
+    "resubscribeSuccess": "Abonnement réactivé avec succès",
+    "resubscribeTo": "Se réabonner à {plan}",
+    "subscribeForMore": "Mettre à niveau",
     "subscribeNow": "S'abonner maintenant",
+    "subscribeTo": "S'abonner à {plan}",
     "subscribeToComfyCloud": "S'abonner à Comfy Cloud",
     "subscribeToRun": "S'abonner",
     "subscribeToRunFull": "S'abonner pour exécuter",
+    "subscriptionRequiredMessage": "Un abonnement est requis pour que les membres puissent exécuter des workflows sur le Cloud",
+    "tierNameYearly": "{name} Annuel",
+    "tiers": {
+      "creator": {
+        "name": "Créateur"
+      },
+      "founder": {
+        "name": "Édition Fondateur"
+      },
+      "free": {
+        "name": "Gratuit"
+      },
+      "pro": {
+        "name": "Pro"
+      },
+      "standard": {
+        "name": "Standard"
+      }
+    },
     "title": "Abonnement",
     "titleUnsubscribed": "Abonnez-vous à Comfy Cloud",
     "totalCredits": "Total des crédits",
+    "upgrade": "AMÉLIORER",
+    "upgradePlan": "Améliorer le forfait",
+    "upgradeTo": "Passer à {plan}",
+    "upgradeToAddCredits": "Mettre à niveau pour ajouter des crédits",
+    "usdPerMonth": "USD / mois",
+    "usdPerMonthPerMember": "USD / mois / membre",
+    "videoEstimateExplanation": "Ces estimations sont basées sur le modèle Wan 2.2 Image-to-Video avec les paramètres par défaut (5 secondes, 640x640, 16fps, échantillonnage en 4 étapes).",
+    "videoEstimateHelp": "Plus de détails sur ce modèle",
+    "videoEstimateLabel": "Nombre approx. de vidéos de 5s générées avec le modèle Wan 2.2 Image-to-Video",
+    "videoEstimateTryTemplate": "Essayer ce modèle",
+    "videoTemplateBasedCredits": "Vidéos générées avec Wan 2.2 Image to Video",
+    "viewEnterprise": "Voir l'offre entreprise",
     "viewMoreDetails": "Voir plus de détails",
+    "viewMoreDetailsPlans": "Voir plus de détails sur les forfaits et tarifs",
     "viewUsageHistory": "Voir l'historique d'utilisation",
+    "workspaceNotSubscribed": "Cet espace de travail n’a pas d’abonnement",
+    "yearly": "Annuel",
+    "yearlyCreditsLabel": "Crédits annuels totaux",
+    "yearlyDiscount": "20% DE RÉDUCTION",
     "yourPlanIncludes": "Votre forfait comprend :"
   },
   "tabMenu": {
@@ -1751,8 +2982,14 @@
     "duplicateTab": "Dupliquer l'onglet",
     "removeFromBookmarks": "Retirer des Favoris"
   },
+  "templateWidgets": {
+    "sort": {
+      "searchPlaceholder": "Rechercher..."
+    }
+  },
   "templateWorkflows": {
     "activeFilters": "Filtres :",
+    "allTemplates": "Tous les modèles",
     "categories": "Catégories",
     "category": {
       "3D": "3D",
@@ -1779,6 +3016,7 @@
     "error": {
       "templateNotFound": "Modèle \"{templateName}\" introuvable"
     },
+    "licenseFilter": "Licence",
     "loading": "Chargement des modèles...",
     "loadingMore": "Chargement de plus de modèles...",
     "modelFilter": "Filtre de modèle",
@@ -1795,14 +3033,19 @@
       "default": "Par défaut",
       "modelSizeLowToHigh": "Taille du modèle (faible à élevée)",
       "newest": "Plus récent",
+      "popular": "Populaire",
       "recommended": "Recommandé",
       "searchPlaceholder": "Rechercher...",
       "vramLowToHigh": "Utilisation VRAM (faible à élevée)"
     },
     "sorting": "Trier par",
     "title": "Commencez avec un modèle",
+    "useCaseFilter": "Tâches",
     "useCasesSelected": "{count} Cas d'usage"
   },
+  "templates": {
+    "logoProviderSeparator": " & "
+  },
   "toastMessages": {
     "cannotCreateSubgraph": "Impossible de créer le sous-graphe",
     "couldNotDetermineFileType": "Impossible de déterminer le type de fichier",
@@ -1810,6 +3053,7 @@
     "emptyCanvas": "Toile vide",
     "errorCopyImage": "Erreur lors de la copie de l'image: {error}",
     "errorLoadingModel": "Erreur lors du chargement du modèle",
+    "errorOpenImage": "Erreur lors de l'ouverture de l'image : {error}",
     "errorSaveSetting": "Erreur lors de l'enregistrement du paramètre {id}: {err}",
     "exportSuccess": "Modèle exporté avec succès au format {format}",
     "failedExecutionPathResolution": "Impossible de résoudre le chemin vers les nœuds sélectionnés",
@@ -1829,9 +3073,23 @@
     "failedToLoadModel": "Échec du chargement du modèle 3D",
     "failedToPurchaseCredits": "Échec de l'achat de crédits : {error}",
     "failedToQueue": "Échec de la mise en file d'attente",
+    "failedToSaveDraft": "Échec de l’enregistrement du brouillon du flux de travail",
+    "failedToToggleCamera": "Échec de l’activation/désactivation de la caméra",
+    "failedToToggleGrid": "Échec de l’activation/désactivation de la grille",
+    "failedToUpdateBackgroundColor": "Échec de la mise à jour de la couleur d’arrière-plan",
+    "failedToUpdateBackgroundImage": "Échec de la mise à jour de l’image d’arrière-plan",
+    "failedToUpdateBackgroundRenderMode": "Échec de la mise à jour du mode de rendu d’arrière-plan vers {mode}",
+    "failedToUpdateEdgeThreshold": "Échec de la mise à jour du seuil de contour",
+    "failedToUpdateFOV": "Échec de la mise à jour du champ de vision",
+    "failedToUpdateLightIntensity": "Échec de la mise à jour de l’intensité lumineuse",
+    "failedToUpdateMaterialMode": "Échec de la mise à jour du mode matériau",
+    "failedToUpdateUpDirection": "Échec de la mise à jour de la direction vers le haut",
+    "failedToUploadBackgroundImage": "Échec du téléchargement de l’image d’arrière-plan",
     "fileLoadError": "Impossible de trouver le flux de travail dans {fileName}",
+    "fileTooLarge": "Fichier trop volumineux ({size} Mo). La taille maximale prise en charge est de {maxSize} Mo",
     "fileUploadFailed": "Échec du téléchargement du fichier",
     "interrupted": "L'exécution a été interrompue",
+    "legacyMaskEditorDeprecated": "L’éditeur de masque hérité est obsolète et sera bientôt supprimé.",
     "migrateToLitegraphReroute": "Les nœuds de reroute seront supprimés dans les futures versions. Cliquez pour migrer vers le reroute natif de litegraph.",
     "modelLoadedSuccessfully": "Modèle 3D chargé avec succès",
     "no3dScene": "Aucune scène 3D pour appliquer la texture",
@@ -1858,12 +3116,14 @@
     "selectUser": "Sélectionnez un utilisateur"
   },
   "userSettings": {
+    "accountSettings": "Paramètres du compte",
     "email": "E-mail",
     "name": "Nom",
     "notSet": "Non défini",
     "provider": "Méthode de connexion",
     "title": "Paramètres utilisateur",
-    "updatePassword": "Mettre à jour le mot de passe"
+    "updatePassword": "Mettre à jour le mot de passe",
+    "workspaceSettings": "Paramètres de l’espace de travail"
   },
   "validation": {
     "descriptionRequired": "La description est requise",
@@ -1892,35 +3152,230 @@
     "updateFrontend": "Mettre à jour le frontend"
   },
   "vueNodesBanner": {
+    "desc": "– Flux de travail plus flexibles, nouveaux widgets puissants, conçu pour l’extensibilité",
+    "title": "Présentation de Nodes 2.0",
     "tryItOut": "Essayer"
   },
   "vueNodesMigration": {
     "button": "Ouvrir les paramètres",
     "message": "Préférez-vous le design classique des nœuds ?"
   },
+  "vueNodesMigrationMainMenu": {
+    "message": "Revenez à Nodes 2.0 à tout moment depuis le menu principal."
+  },
+  "vueNodesSlot": {
+    "iterative": "(Itératif)"
+  },
   "welcome": {
     "getStarted": "Commencer",
     "title": "Bienvenue sur ComfyUI"
   },
   "whatsNewPopup": {
+    "later": "Plus tard",
     "learnMore": "En savoir plus",
     "noReleaseNotes": "Aucune note de version disponible."
   },
+  "widgetFileUpload": {
+    "browseFiles": "Parcourir les fichiers",
+    "dropPrompt": "Déposez votre fichier ou"
+  },
   "widgets": {
+    "boolean": {
+      "false": "faux",
+      "true": "vrai"
+    },
+    "node2only": "Node 2.0 uniquement",
     "selectModel": "Sélectionner un modèle",
     "uploadSelect": {
+      "maxSelectionReached": "Limite maximale de sélection atteinte",
       "placeholder": "Sélectionner...",
       "placeholderAudio": "Sélectionner un audio...",
       "placeholderImage": "Sélectionner une image...",
+      "placeholderMesh": "Sélectionner un mesh...",
       "placeholderModel": "Sélectionner un modèle...",
       "placeholderUnknown": "Sélectionner un média...",
       "placeholderVideo": "Sélectionner une vidéo..."
+    },
+    "valueControl": {
+      "decrement": "Décrémenter la valeur",
+      "decrementDesc": "Soustrait 1 de la valeur ou sélectionne l'option précédente",
+      "editSettings": "Modifier les paramètres de contrôle",
+      "fixed": "Valeur fixe",
+      "fixedDesc": "Laisse la valeur inchangée",
+      "header": {
+        "after": "APRÈS",
+        "before": "AVANT",
+        "postfix": "l'exécution du workflow :",
+        "prefix": "Mettre à jour automatiquement la valeur"
+      },
+      "increment": "Incrémenter la valeur",
+      "incrementDesc": "Ajoute 1 à la valeur ou sélectionne l'option suivante",
+      "linkToGlobal": "Lier à",
+      "linkToGlobalDesc": "Valeur unique liée au paramètre de contrôle de la Valeur globale",
+      "linkToGlobalSeed": "Valeur globale",
+      "randomize": "Valeur aléatoire",
+      "randomizeDesc": "Mélange la valeur aléatoirement après chaque génération"
     }
   },
   "workflowService": {
     "enterFilename": "Entrez le nom du fichier",
+    "enterFilenamePrompt": "Entrez le nom du fichier :",
     "exportWorkflow": "Exporter le flux de travail",
-    "saveWorkflow": "Enregistrer le flux de travail"
+    "saveWorkflow": "Enregistrer le flux de travail",
+    "savedAsApp": "Converti en workflow d'application",
+    "savedAsWorkflow": "Converti en workflow graphique de nœuds uniquement"
+  },
+  "workspace": {
+    "addedToWorkspace": "Vous avez été ajouté à {workspaceName}",
+    "inviteAccepted": "Invitation acceptée",
+    "inviteFailed": "Échec de l'acceptation de l'invitation",
+    "unsavedChanges": {
+      "message": "Vous avez des modifications non enregistrées. Voulez-vous les abandonner et changer d’espace de travail ?",
+      "title": "Modifications non enregistrées"
+    },
+    "viewWorkspace": "Voir l’espace de travail"
+  },
+  "workspaceAuth": {
+    "errors": {
+      "accessDenied": "Vous n’avez pas accès à cet espace de travail",
+      "invalidFirebaseToken": "Échec de l’authentification. Veuillez vous reconnecter.",
+      "notAuthenticated": "Vous devez être connecté pour accéder aux espaces de travail",
+      "tokenExchangeFailed": "Échec de l’authentification avec l’espace de travail : {error}",
+      "workspaceNotFound": "Espace de travail introuvable"
+    }
+  },
+  "workspacePanel": {
+    "createWorkspaceDialog": {
+      "create": "Créer",
+      "message": "Les espaces de travail permettent aux membres de partager un même pool de crédits. Vous deviendrez le propriétaire après la création.",
+      "nameLabel": "Nom de l’espace de travail*",
+      "namePlaceholder": "Saisissez le nom de l’espace de travail",
+      "title": "Créer un nouvel espace de travail"
+    },
+    "dashboard": {
+      "placeholder": "Paramètres de l'espace de travail du tableau de bord"
+    },
+    "deleteDialog": {
+      "message": "Tout crédit inutilisé ou ressource non enregistrée sera perdu. Cette action est irréversible.",
+      "messageWithName": "Supprimer « {name} » ? Tout crédit inutilisé ou ressource non enregistrée sera perdu. Cette action est irréversible.",
+      "title": "Supprimer cet espace de travail ?"
+    },
+    "editWorkspaceDialog": {
+      "nameLabel": "Nom de l’espace de travail",
+      "save": "Enregistrer",
+      "title": "Modifier les détails de l’espace de travail"
+    },
+    "invite": "Inviter",
+    "inviteLimitReached": "Vous avez atteint le maximum de 50 membres",
+    "inviteMember": "Inviter un membre",
+    "inviteMemberDialog": {
+      "createLink": "Créer le lien",
+      "linkCopied": "Copié",
+      "linkCopyFailed": "Échec de la copie du lien",
+      "linkStep": {
+        "copyLink": "Copier le lien",
+        "done": "Terminé",
+        "message": "Assurez-vous que son compte utilise cet email.",
+        "title": "Envoyez ce lien à la personne"
+      },
+      "message": "Créez un lien d'invitation partageable à envoyer à quelqu'un",
+      "placeholder": "Entrez l'email de la personne",
+      "title": "Inviter une personne dans cet espace de travail"
+    },
+    "inviteUpsellDialog": {
+      "messageNotSubscribed": "Pour ajouter des membres à cet espace de travail, vous devez disposer d’un forfait Creator ou supérieur. Le forfait Standard ne prend en charge qu’un seul utilisateur (le propriétaire).",
+      "messageSingleSeat": "Le forfait Standard inclut une place pour le propriétaire de l’espace de travail. Pour inviter d’autres membres, passez au forfait Creator ou supérieur pour débloquer plusieurs places.",
+      "titleNotSubscribed": "Un abonnement est requis pour inviter des membres",
+      "titleSingleSeat": "Votre forfait actuel ne prend en charge qu’un seul utilisateur",
+      "upgradeToCreator": "Passer au forfait Creator",
+      "viewPlans": "Voir les forfaits"
+    },
+    "leaveDialog": {
+      "leave": "Quitter",
+      "message": "Vous ne pourrez pas le rejoindre à nouveau sans contacter le propriétaire de l’espace de travail.",
+      "title": "Quitter cet espace de travail ?"
+    },
+    "members": {
+      "actions": {
+        "copyLink": "Copier le lien d'invitation",
+        "removeMember": "Retirer le membre",
+        "revokeInvite": "Révoquer l'invitation"
+      },
+      "columns": {
+        "expiryDate": "Date d'expiration",
+        "inviteDate": "Date d'invitation",
+        "joinDate": "Date d'adhésion"
+      },
+      "createNewWorkspace": "créez-en un nouveau.",
+      "membersCount": "{count}/50 membres",
+      "noInvites": "Aucune invitation en attente",
+      "noMembers": "Aucun membre",
+      "pendingInvitesCount": "{count} invitation en attente | {count} invitations en attente",
+      "personalWorkspaceMessage": "Vous ne pouvez pas inviter d'autres membres dans votre espace de travail personnel pour le moment. Pour ajouter des membres à un espace de travail,",
+      "tabs": {
+        "active": "Actif",
+        "pendingCount": "En attente ({count})"
+      },
+      "upsellBannerSubscribe": "Abonnez-vous au forfait Creator ou supérieur pour inviter des membres à cet espace de travail.",
+      "upsellBannerUpgrade": "Passez au forfait Creator ou supérieur pour inviter des membres supplémentaires à cet espace de travail.",
+      "viewPlans": "Voir les forfaits"
+    },
+    "menu": {
+      "deleteWorkspace": "Supprimer l’espace de travail",
+      "deleteWorkspaceDisabledTooltip": "Annulez d’abord l’abonnement actif de votre espace de travail",
+      "editWorkspace": "Modifier les détails de l’espace de travail",
+      "leaveWorkspace": "Quitter l’espace de travail"
+    },
+    "removeMemberDialog": {
+      "error": "Échec du retrait du membre",
+      "message": "Ce membre sera retiré de votre espace de travail. Les crédits qu'il a utilisés ne seront pas remboursés.",
+      "remove": "Retirer le membre",
+      "success": "Membre retiré",
+      "title": "Retirer ce membre ?"
+    },
+    "revokeInviteDialog": {
+      "message": "Cette personne ne pourra plus rejoindre votre espace de travail. Son lien d'invitation sera invalidé.",
+      "revoke": "Annuler l'invitation",
+      "title": "Annuler l'invitation de cette personne ?"
+    },
+    "tabs": {
+      "dashboard": "Tableau de bord",
+      "membersCount": "Membres ({count})",
+      "planCredits": "Forfait & Crédits"
+    },
+    "toast": {
+      "failedToCreateWorkspace": "Échec de la création de l’espace de travail",
+      "failedToDeleteWorkspace": "Échec de la suppression de l’espace de travail",
+      "failedToFetchWorkspaces": "Échec du chargement des espaces de travail",
+      "failedToLeaveWorkspace": "Échec de la sortie de l’espace de travail",
+      "failedToUpdateWorkspace": "Échec de la mise à jour de l’espace de travail",
+      "workspaceCreated": {
+        "message": "Abonnez-vous à un plan, invitez des coéquipiers et commencez à collaborer.",
+        "subscribe": "S'abonner",
+        "title": "Espace de travail créé"
+      },
+      "workspaceDeleted": {
+        "message": "L'espace de travail a été définitivement supprimé.",
+        "title": "Espace de travail supprimé"
+      },
+      "workspaceLeft": {
+        "message": "Vous avez quitté l'espace de travail.",
+        "title": "Espace de travail quitté"
+      },
+      "workspaceUpdated": {
+        "message": "Les détails de l’espace de travail ont été enregistrés.",
+        "title": "Espace de travail mis à jour"
+      }
+    }
+  },
+  "workspaceSwitcher": {
+    "createWorkspace": "Créer un nouvel espace de travail",
+    "maxWorkspacesReached": "Vous ne pouvez posséder que 10 espaces de travail. Supprimez-en un pour en créer un nouveau.",
+    "personal": "Personnel",
+    "roleMember": "Membre",
+    "roleOwner": "Propriétaire",
+    "subscribe": "S’abonner",
+    "switchWorkspace": "Changer d’espace de travail"
   },
   "zoomControls": {
     "hideMinimap": "Masquer la mini-carte",
diff --git a/src/locales/fr/nodeDefs.json b/src/locales/fr/nodeDefs.json
index c41c4e10a5..3959a61b40 100644
--- a/src/locales/fr/nodeDefs.json
+++ b/src/locales/fr/nodeDefs.json
@@ -39,6 +39,87 @@
       "sigmas": {
         "name": "sigmas"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "AddTextPrefix": {
+    "display_name": "Ajouter un préfixe au texte",
+    "inputs": {
+      "prefix": {
+        "name": "préfixe",
+        "tooltip": "Préfixe à ajouter."
+      },
+      "texts": {
+        "name": "textes",
+        "tooltip": "Texte à traiter."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "textes",
+        "tooltip": "Textes traités"
+      }
+    }
+  },
+  "AddTextSuffix": {
+    "display_name": "Ajouter un suffixe au texte",
+    "inputs": {
+      "suffix": {
+        "name": "suffixe",
+        "tooltip": "Suffixe à ajouter."
+      },
+      "texts": {
+        "name": "textes",
+        "tooltip": "Texte à traiter."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "textes",
+        "tooltip": "Textes traités"
+      }
+    }
+  },
+  "AdjustBrightness": {
+    "display_name": "Ajuster la luminosité",
+    "inputs": {
+      "factor": {
+        "name": "facteur",
+        "tooltip": "Facteur de luminosité. 1.0 = aucun changement, <1.0 = plus sombre, >1.0 = plus clair."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Image à traiter."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Images traitées"
+      }
+    }
+  },
+  "AdjustContrast": {
+    "display_name": "Ajuster le contraste",
+    "inputs": {
+      "factor": {
+        "name": "facteur",
+        "tooltip": "Facteur de contraste. 1.0 = aucun changement, <1.0 = moins de contraste, >1.0 = plus de contraste."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Image à traiter."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Images traitées"
+      }
     }
   },
   "AlignYourStepsScheduler": {
@@ -70,6 +151,11 @@
         "name": "volume",
         "tooltip": "Ajustement du volume en décibels (dB). 0 = pas de changement, +6 = double, -6 = moitié, etc."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "AudioConcat": {
@@ -86,6 +172,11 @@
         "name": "direction",
         "tooltip": "Indique s'il faut ajouter audio2 après ou avant audio1."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "AudioEncoderEncode": {
@@ -117,6 +208,47 @@
       }
     }
   },
+  "AudioEqualizer3Band": {
+    "display_name": "Égaliseur audio (3 bandes)",
+    "inputs": {
+      "audio": {
+        "name": "audio"
+      },
+      "high_freq": {
+        "name": "high_freq",
+        "tooltip": "Fréquence de coupure pour l'étagère haute"
+      },
+      "high_gain_dB": {
+        "name": "high_gain_dB",
+        "tooltip": "Gain pour les hautes fréquences (aigus)"
+      },
+      "low_freq": {
+        "name": "low_freq",
+        "tooltip": "Fréquence de coupure pour l'étagère basse"
+      },
+      "low_gain_dB": {
+        "name": "low_gain_dB",
+        "tooltip": "Gain pour les basses fréquences (basses)"
+      },
+      "mid_freq": {
+        "name": "mid_freq",
+        "tooltip": "Fréquence centrale pour les médiums"
+      },
+      "mid_gain_dB": {
+        "name": "mid_gain_dB",
+        "tooltip": "Gain pour les fréquences moyennes"
+      },
+      "mid_q": {
+        "name": "mid_q",
+        "tooltip": "Facteur Q (bande passante) pour les médiums"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "AudioMerge": {
     "description": "Combine deux pistes audio en superposant leurs formes d'onde.",
     "display_name": "Fusion Audio",
@@ -131,6 +263,11 @@
         "name": "méthode_fusion",
         "tooltip": "La méthode utilisée pour combiner les formes d'onde audio."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "BasicGuider": {
@@ -142,6 +279,11 @@
       "model": {
         "name": "modèle"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "BasicScheduler": {
@@ -159,6 +301,50 @@
       "steps": {
         "name": "étapes"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchImagesNode": {
+    "display_name": "Images par lot",
+    "inputs": {
+      "images": {
+        "name": "images"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchLatentsNode": {
+    "display_name": "Latents par lot",
+    "inputs": {
+      "latents": {
+        "name": "latents"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchMasksNode": {
+    "display_name": "Masques par lot",
+    "inputs": {
+      "masks": {
+        "name": "masques"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "BetaSamplingScheduler": {
@@ -176,6 +362,114 @@
       "steps": {
         "name": "étapes"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BriaImageEditNode": {
+    "description": "Modifiez des images en utilisant le dernier modèle Bria",
+    "display_name": "Bria Image Edit",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "guidance_scale": {
+        "name": "échelle de guidage",
+        "tooltip": "Une valeur plus élevée fait suivre l'image à l'invite de façon plus précise."
+      },
+      "image": {
+        "name": "image"
+      },
+      "mask": {
+        "name": "masque",
+        "tooltip": "Si omis, la modification s'applique à l'image entière."
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "moderation": {
+        "name": "modération",
+        "tooltip": "Paramètres de modération"
+      },
+      "negative_prompt": {
+        "name": "invite négative"
+      },
+      "prompt": {
+        "name": "invite",
+        "tooltip": "Instruction pour modifier l'image"
+      },
+      "seed": {
+        "name": "graine"
+      },
+      "steps": {
+        "name": "étapes"
+      },
+      "structured_prompt": {
+        "name": "invite structurée",
+        "tooltip": "Une chaîne contenant l'invite d'édition structurée au format JSON. Utilisez ceci à la place de l'invite habituelle pour un contrôle précis et programmatique."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "invite structurée",
+        "tooltip": null
+      }
+    }
+  },
+  "BriaRemoveImageBackground": {
+    "description": "Supprimez l’arrière-plan d’une image avec Bria RMBG 2.0.",
+    "display_name": "Bria Remove Image Background",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "image": {
+        "name": "image"
+      },
+      "moderation": {
+        "name": "modération",
+        "tooltip": "Paramètres de modération"
+      },
+      "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
+      }
+    }
+  },
+  "BriaRemoveVideoBackground": {
+    "description": "Supprimez l’arrière-plan d’une vidéo avec Bria.",
+    "display_name": "Bria Remove Video Background",
+    "inputs": {
+      "background_color": {
+        "name": "couleur d’arrière-plan",
+        "tooltip": "Couleur d’arrière-plan pour la vidéo de sortie."
+      },
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "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."
+      },
+      "video": {
+        "name": "vidéo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ByteDanceFirstLastFrameNode": {
@@ -201,6 +495,10 @@
         "name": "première_image",
         "tooltip": "Première image à utiliser pour la vidéo."
       },
+      "generate_audio": {
+        "name": "générer_audio",
+        "tooltip": "Ce paramètre est ignoré pour tout modèle sauf seedance-1-5-pro."
+      },
       "last_frame": {
         "name": "dernière_image",
         "tooltip": "Dernière image à utiliser pour la vidéo."
@@ -231,43 +529,6 @@
       }
     }
   },
-  "ByteDanceImageEditNode": {
-    "description": "Modifier des images en utilisant les modèles ByteDance via l'API basée sur le prompt",
-    "display_name": "Édition d'image ByteDance",
-    "inputs": {
-      "control_after_generate": {
-        "name": "control after generate"
-      },
-      "guidance_scale": {
-        "name": "guidance_scale",
-        "tooltip": "Une valeur plus élevée fait que l'image suit plus fidèlement le prompt"
-      },
-      "image": {
-        "name": "image",
-        "tooltip": "L'image de base à modifier"
-      },
-      "model": {
-        "name": "model"
-      },
-      "prompt": {
-        "name": "prompt",
-        "tooltip": "Instruction pour modifier l'image"
-      },
-      "seed": {
-        "name": "seed",
-        "tooltip": "Graine à utiliser pour la génération."
-      },
-      "watermark": {
-        "name": "watermark",
-        "tooltip": "Indique s'il faut ajouter un filigrane \"Généré par IA\" à l'image"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
   "ByteDanceImageNode": {
     "description": "Générer des images en utilisant les modèles ByteDance via l'API basée sur le prompt",
     "display_name": "Image ByteDance",
@@ -377,6 +638,10 @@
         "name": "durée",
         "tooltip": "La durée de la vidéo en sortie en secondes."
       },
+      "generate_audio": {
+        "name": "générer_audio",
+        "tooltip": "Ce paramètre est ignoré pour tout modèle sauf seedance-1-5-pro."
+      },
       "image": {
         "name": "image",
         "tooltip": "Première image à utiliser pour la vidéo."
@@ -431,8 +696,7 @@
         "tooltip": "Nombre maximum d'images à générer lorsque sequential_image_generation='auto'. Le nombre total d'images (entrée + générées) ne peut pas dépasser 15."
       },
       "model": {
-        "name": "model",
-        "tooltip": "Nom du modèle"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
@@ -484,6 +748,10 @@
         "name": "duration",
         "tooltip": "La durée de la vidéo de sortie en secondes."
       },
+      "generate_audio": {
+        "name": "générer_audio",
+        "tooltip": "Ce paramètre est ignoré pour tout modèle sauf seedance-1-5-pro."
+      },
       "model": {
         "name": "model"
       },
@@ -525,6 +793,11 @@
       "positive": {
         "name": "positive"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "CFGNorm": {
@@ -763,6 +1036,25 @@
       }
     }
   },
+  "CLIPTextEncodeKandinsky5": {
+    "display_name": "CLIPTextEncodeKandinsky5",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "clip_l": {
+        "name": "clip_l"
+      },
+      "qwen25_7b": {
+        "name": "qwen25_7b"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "CLIPTextEncodeLumina2": {
     "description": "Encode une invite système et une invite utilisateur à l'aide d'un modèle CLIP en une intégration qui peut être utilisée pour guider le modèle de diffusion vers la génération d'images spécifiques.",
     "display_name": "CLIP Text Encode pour Lumina2",
@@ -953,6 +1245,29 @@
       }
     }
   },
+  "CenterCropImages": {
+    "display_name": "Rogner les images au centre",
+    "inputs": {
+      "height": {
+        "name": "hauteur",
+        "tooltip": "Hauteur du rognage."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Image à traiter."
+      },
+      "width": {
+        "name": "largeur",
+        "tooltip": "Largeur du rognage."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Images traitées"
+      }
+    }
+  },
   "CheckpointLoader": {
     "display_name": "Charger Point de Contrôle Avec Config (OBSOLÈTE)",
     "inputs": {
@@ -1032,6 +1347,21 @@
       }
     }
   },
+  "ColorToRGBInt": {
+    "description": "Convertir une couleur en une valeur entière RGB.",
+    "display_name": "Couleur vers RGB Int",
+    "inputs": {
+      "color": {
+        "name": "couleur"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "rgb_int",
+        "tooltip": null
+      }
+    }
+  },
   "CombineHooks2": {
     "display_name": "Combiner Hooks [2]",
     "inputs": {
@@ -1089,6 +1419,26 @@
       }
     }
   },
+  "ComfySwitchNode": {
+    "display_name": "Commutateur",
+    "inputs": {
+      "on_false": {
+        "name": "faux"
+      },
+      "on_true": {
+        "name": "vrai"
+      },
+      "switch": {
+        "name": "interrupteur"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "sortie",
+        "tooltip": null
+      }
+    }
+  },
   "ConditioningAverage": {
     "display_name": "Moyenne de Conditionnement",
     "inputs": {
@@ -1323,10 +1673,12 @@
     },
     "outputs": {
       "0": {
-        "name": "positive"
+        "name": "positif",
+        "tooltip": null
       },
       "1": {
-        "name": "négative"
+        "name": "négatif",
+        "tooltip": null
       }
     }
   },
@@ -1385,6 +1737,10 @@
         "name": "dimension",
         "tooltip": "La dimension à laquelle appliquer les fenêtres de contexte."
       },
+      "freenoise": {
+        "name": "bruit_libre",
+        "tooltip": "Indique s'il faut appliquer le mélange de bruit FreeNoise, améliore la fusion des fenêtres."
+      },
       "fuse_method": {
         "name": "méthode_fusion",
         "tooltip": "La méthode à utiliser pour fusionner les fenêtres de contexte."
@@ -1745,6 +2101,20 @@
       }
     }
   },
+  "CreateList": {
+    "display_name": "Créer une liste",
+    "inputs": {
+      "inputs": {
+        "name": "entrées"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "liste",
+        "tooltip": null
+      }
+    }
+  },
   "CreateVideo": {
     "description": "Créer une vidéo à partir d’images.",
     "display_name": "Créer une vidéo",
@@ -1767,6 +2137,35 @@
       }
     }
   },
+  "CropByBBoxes": {
+    "description": "Rogner et redimensionner des régions du lot d’images d’entrée selon les boîtes englobantes fournies.",
+    "display_name": "CropByBBoxes",
+    "inputs": {
+      "bboxes": {
+        "name": "bboxes"
+      },
+      "image": {
+        "name": "image"
+      },
+      "output_height": {
+        "name": "output_height",
+        "tooltip": "Hauteur à laquelle chaque découpe est redimensionnée."
+      },
+      "output_width": {
+        "name": "output_width",
+        "tooltip": "Largeur à laquelle chaque découpe est redimensionnée."
+      },
+      "padding": {
+        "name": "padding",
+        "tooltip": "Marge supplémentaire en pixels ajoutée de chaque côté de la boîte avant le rognage."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "Toutes les découpes empilées dans un seul lot d’images."
+      }
+    }
+  },
   "CropMask": {
     "display_name": "CropMask",
     "inputs": {
@@ -1785,6 +2184,30 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CustomCombo": {
+    "display_name": "Combo personnalisé",
+    "inputs": {
+      "choice": {
+        "name": "choix"
+      },
+      "index": {},
+      "option1": {}
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "INDEX",
+        "tooltip": null
+      }
     }
   },
   "DiffControlNetLoader": {
@@ -1823,7 +2246,12 @@
     }
   },
   "DisableNoise": {
-    "display_name": "DésactiverBruit"
+    "display_name": "DésactiverBruit",
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
   },
   "DualCFGGuider": {
     "display_name": "GuideurDualCFG",
@@ -1849,6 +2277,11 @@
       "style": {
         "name": "style"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "DualCLIPLoader": {
@@ -1900,6 +2333,321 @@
       }
     }
   },
+  "ElevenLabsAudioIsolation": {
+    "description": "Supprimez le bruit de fond de l'audio, en isolant les voix ou la parole.",
+    "display_name": "ElevenLabs Isolation de Voix",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "Audio à traiter pour la suppression du bruit de fond."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsInstantVoiceClone": {
+    "description": "Créez une voix clonée à partir d'échantillons audio. Fournissez 1 à 8 enregistrements audio de la voix à cloner.",
+    "display_name": "ElevenLabs Clonage Instantané de Voix",
+    "inputs": {
+      "files": {
+        "name": "fichiers",
+        "tooltip": "Enregistrements audio pour le clonage de voix."
+      },
+      "remove_background_noise": {
+        "name": "supprimer_bruit_de_fond",
+        "tooltip": "Supprimez le bruit de fond des échantillons de voix à l'aide de l'isolation audio."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "voix",
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsSpeechToSpeech": {
+    "description": "Transformez la parole d'une voix à une autre tout en préservant le contenu et l'émotion d'origine.",
+    "display_name": "ElevenLabs Conversion de Voix à Voix",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "Audio source à transformer."
+      },
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "model": {
+        "name": "modèle",
+        "tooltip": "Modèle à utiliser pour la transformation voix-à-voix."
+      },
+      "model_similarity_boost": {
+        "name": "augmentation_similarité"
+      },
+      "model_speed": {
+        "name": "vitesse"
+      },
+      "model_style": {
+        "name": "style"
+      },
+      "model_use_speaker_boost": {
+        "name": "utiliser_augmentation_parleur"
+      },
+      "output_format": {
+        "name": "format_de_sortie",
+        "tooltip": "Format de sortie audio."
+      },
+      "remove_background_noise": {
+        "name": "supprimer_bruit_de_fond",
+        "tooltip": "Supprimez le bruit de fond de l'audio d'entrée à l'aide de l'isolation audio."
+      },
+      "seed": {
+        "name": "graine",
+        "tooltip": "Graine pour la reproductibilité."
+      },
+      "stability": {
+        "name": "stabilité",
+        "tooltip": "Stabilité de la voix. Des valeurs plus faibles donnent une gamme émotionnelle plus large, des valeurs plus élevées produisent une parole plus cohérente mais potentiellement monotone."
+      },
+      "voice": {
+        "name": "voix",
+        "tooltip": "Voix cible pour la transformation. Connectez depuis le Sélecteur de Voix ou le Clonage Instantané de Voix."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsSpeechToText": {
+    "description": "Transcrivez l’audio en texte. Prend en charge la détection automatique de la langue, la diarisation des locuteurs et l’étiquetage des événements audio.",
+    "display_name": "ElevenLabs Speech to Text",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "Audio à transcrire."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "language_code": {
+        "name": "language_code",
+        "tooltip": "Code de langue ISO-639-1 ou ISO-639-3 (ex. : 'en', 'es', 'fra'). Laisser vide pour une détection automatique."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Modèle à utiliser pour la transcription."
+      },
+      "model_diarization_threshold": {
+        "name": "diarization_threshold"
+      },
+      "model_diarize": {
+        "name": "diarize"
+      },
+      "model_tag_audio_events": {
+        "name": "tag_audio_events"
+      },
+      "model_temperature": {
+        "name": "temperature"
+      },
+      "model_timestamps_granularity": {
+        "name": "timestamps_granularity"
+      },
+      "num_speakers": {
+        "name": "num_speakers",
+        "tooltip": "Nombre maximal de locuteurs à prédire. Mettre à 0 pour une détection automatique."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Graine pour la reproductibilité (déterminisme non garanti)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "text",
+        "tooltip": null
+      },
+      "1": {
+        "name": "language_code",
+        "tooltip": null
+      },
+      "2": {
+        "name": "words_json",
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToDialogue": {
+    "description": "Générez un dialogue multi-locuteurs à partir d’un texte. Chaque entrée de dialogue possède son propre texte et sa propre voix.",
+    "display_name": "ElevenLabs Text to Dialogue",
+    "inputs": {
+      "apply_text_normalization": {
+        "name": "apply_text_normalization",
+        "tooltip": "Mode de normalisation du texte. 'auto' laisse le système décider, 'on' applique toujours la normalisation, 'off' la désactive."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "inputs": {
+        "name": "inputs",
+        "tooltip": "Nombre d’entrées de dialogue."
+      },
+      "inputs_text1": {
+        "name": "text1"
+      },
+      "language_code": {
+        "name": "language_code",
+        "tooltip": "Code de langue ISO-639-1 ou ISO-639-3 (ex. : 'en', 'es', 'fra'). Laisser vide pour une détection automatique."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Modèle à utiliser pour la génération du dialogue."
+      },
+      "output_format": {
+        "name": "output_format",
+        "tooltip": "Format de sortie audio."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Graine pour la reproductibilité."
+      },
+      "stability": {
+        "name": "stability",
+        "tooltip": "Stabilité de la voix. Des valeurs plus faibles donnent une gamme émotionnelle plus large, des valeurs plus élevées produisent une voix plus cohérente mais potentiellement monotone."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToSoundEffects": {
+    "description": "Générez des effets sonores à partir de descriptions textuelles.",
+    "display_name": "ElevenLabs Text to Sound Effects",
+    "inputs": {
+      "model": {
+        "name": "model",
+        "tooltip": "Modèle à utiliser pour la génération de l’effet sonore."
+      },
+      "model_duration": {
+        "name": "duration"
+      },
+      "model_loop": {
+        "name": "loop"
+      },
+      "model_prompt_influence": {
+        "name": "prompt_influence"
+      },
+      "output_format": {
+        "name": "output_format",
+        "tooltip": "Format de sortie audio."
+      },
+      "text": {
+        "name": "text",
+        "tooltip": "Description textuelle de l’effet sonore à générer."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToSpeech": {
+    "description": "Convertir du texte en parole.",
+    "display_name": "ElevenLabs Text to Speech",
+    "inputs": {
+      "apply_text_normalization": {
+        "name": "appliquer la normalisation du texte",
+        "tooltip": "Mode de normalisation du texte. 'auto' laisse le système décider, 'on' applique toujours la normalisation, 'off' la désactive."
+      },
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "language_code": {
+        "name": "code langue",
+        "tooltip": "Code langue ISO-639-1 ou ISO-639-3 (ex : 'en', 'es', 'fra'). Laisser vide pour une détection automatique."
+      },
+      "model": {
+        "name": "modèle",
+        "tooltip": "Modèle à utiliser pour la synthèse texte-parole."
+      },
+      "model_similarity_boost": {
+        "name": "augmentation de similarité"
+      },
+      "model_speed": {
+        "name": "vitesse"
+      },
+      "model_style": {
+        "name": "style"
+      },
+      "model_use_speaker_boost": {
+        "name": "utiliser le speaker boost"
+      },
+      "output_format": {
+        "name": "format de sortie",
+        "tooltip": "Format de sortie audio."
+      },
+      "seed": {
+        "name": "graine",
+        "tooltip": "Graine pour la reproductibilité (déterminisme non garanti)."
+      },
+      "stability": {
+        "name": "stabilité",
+        "tooltip": "Stabilité de la voix. Des valeurs plus faibles offrent une gamme émotionnelle plus large, des valeurs plus élevées produisent une voix plus cohérente mais potentiellement monotone."
+      },
+      "text": {
+        "name": "texte",
+        "tooltip": "Le texte à convertir en parole."
+      },
+      "voice": {
+        "name": "voix",
+        "tooltip": "Voix à utiliser pour la synthèse vocale. Connectez depuis Voice Selector ou Instant Voice Clone."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsVoiceSelector": {
+    "description": "Sélectionnez une voix prédéfinie ElevenLabs pour la génération texte-parole.",
+    "display_name": "Sélecteur de voix ElevenLabs",
+    "inputs": {
+      "voice": {
+        "name": "voix",
+        "tooltip": "Choisissez une voix parmi les voix prédéfinies ElevenLabs."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "voix",
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyAceStep1_5LatentAudio": {
+    "display_name": "Empty Ace Step 1.5 Latent Audio",
+    "inputs": {
+      "batch_size": {
+        "name": "taille_du_lot",
+        "tooltip": "Le nombre d’images latentes dans le lot."
+      },
+      "seconds": {
+        "name": "secondes"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyAceStepLatentAudio": {
     "display_name": "EmptyAceStepLatentAudio",
     "inputs": {
@@ -1932,6 +2680,11 @@
         "name": "fréquence_d'échantillonnage",
         "tooltip": "Fréquence d'échantillonnage du clip audio vide."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "EmptyChromaRadianceLatentImage": {
@@ -1975,6 +2728,25 @@
       }
     }
   },
+  "EmptyFlux2LatentImage": {
+    "display_name": "Flux vide vers latent",
+    "inputs": {
+      "batch_size": {
+        "name": "taille_lot"
+      },
+      "height": {
+        "name": "hauteur"
+      },
+      "width": {
+        "name": "largeur"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyHunyuanImageLatent": {
     "display_name": "EmptyHunyuanImageLatent",
     "inputs": {
@@ -2016,6 +2788,28 @@
       }
     }
   },
+  "EmptyHunyuanVideo15Latent": {
+    "display_name": "HunyuanVideo 1.5 latent vide",
+    "inputs": {
+      "batch_size": {
+        "name": "taille_lot"
+      },
+      "height": {
+        "name": "hauteur"
+      },
+      "length": {
+        "name": "longueur"
+      },
+      "width": {
+        "name": "largeur"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyImage": {
     "display_name": "ImageVide",
     "inputs": {
@@ -2065,6 +2859,11 @@
       "seconds": {
         "name": "secondes"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "EmptyLatentHunyuan3Dv2": {
@@ -2077,6 +2876,11 @@
       "resolution": {
         "name": "résolution"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "EmptyLatentImage": {
@@ -2124,6 +2928,28 @@
       }
     }
   },
+  "EmptyQwenImageLayeredLatentImage": {
+    "display_name": "Qwen Image Layered latent vide",
+    "inputs": {
+      "batch_size": {
+        "name": "taille_lot"
+      },
+      "height": {
+        "name": "hauteur"
+      },
+      "layers": {
+        "name": "couches"
+      },
+      "width": {
+        "name": "largeur"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptySD3LatentImage": {
     "display_name": "EmptySD3LatentImage",
     "inputs": {
@@ -2171,6 +2997,11 @@
       "steps": {
         "name": "étapes"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ExtendIntermediateSigmas": {
@@ -2191,6 +3022,11 @@
       "steps": {
         "name": "étapes"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FeatherMask": {
@@ -2211,6 +3047,11 @@
       "top": {
         "name": "haut"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FlipSigmas": {
@@ -2219,6 +3060,102 @@
       "sigmas": {
         "name": "sigmas"
       }
+    },
+    "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",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "height": {
+        "name": "hauteur"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Jusqu’à 9 images à utiliser comme références."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Invite pour la génération ou l’édition d’image"
+      },
+      "prompt_upsampling": {
+        "name": "suréchantillonnage de l'invite",
+        "tooltip": "Indique s’il faut effectuer un suréchantillonnage sur l’invite. Si activé, modifie automatiquement l’invite pour une génération plus créative."
+      },
+      "seed": {
+        "name": "graine",
+        "tooltip": "La graine aléatoire utilisée pour créer le bruit."
+      },
+      "width": {
+        "name": "largeur"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Flux2ProImageNode": {
+    "description": "Génère des images de manière synchrone à partir d'une invite et d'une résolution.",
+    "display_name": "Flux.2 [pro] Image",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "height": {
+        "name": "hauteur"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Jusqu’à 9 images à utiliser comme références."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Invite pour la génération ou l’édition d’image"
+      },
+      "prompt_upsampling": {
+        "name": "suréchantillonnage de l'invite",
+        "tooltip": "Indique s’il faut effectuer un suréchantillonnage sur l’invite. Si activé, modifie automatiquement l’invite pour une génération plus créative."
+      },
+      "seed": {
+        "name": "graine",
+        "tooltip": "La graine aléatoire utilisée pour créer le bruit."
+      },
+      "width": {
+        "name": "largeur"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Flux2Scheduler": {
+    "display_name": "Flux2Scheduler",
+    "inputs": {
+      "height": {
+        "name": "hauteur"
+      },
+      "steps": {
+        "name": "étapes"
+      },
+      "width": {
+        "name": "largeur"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FluxDisableGuidance": {
@@ -2541,6 +3478,11 @@
       "s2": {
         "name": "s2"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FreeU_V2": {
@@ -2561,6 +3503,11 @@
       "s2": {
         "name": "s2"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "GITSScheduler": {
@@ -2619,6 +3566,102 @@
       }
     }
   },
+  "GLSLShader": {
+    "description": "Appliquez des shaders de fragments GLSL ES aux images. u_resolution (vec2) est toujours disponible.",
+    "display_name": "Shader GLSL",
+    "inputs": {
+      "floats": {
+        "name": "floats",
+        "tooltip": "Les flottants sont disponibles sous u_float0-4 dans le code du shader"
+      },
+      "fragment_shader": {
+        "name": "fragment_shader",
+        "tooltip": "Code source du shader de fragment GLSL (compatible GLSL ES 3.00 / WebGL 2.0)"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Les images sont disponibles sous u_image0-4 (sampler2D) dans le code du shader"
+      },
+      "ints": {
+        "name": "ints",
+        "tooltip": "Les entiers sont disponibles sous u_int0-4 dans le code du shader"
+      },
+      "size_mode": {
+        "name": "size_mode",
+        "tooltip": "Taille de sortie : 'from_input' utilise les dimensions de la première image d'entrée, 'custom' permet de définir la taille manuellement"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "IMAGE0",
+        "tooltip": "Disponible via layout(location = 0) out vec4 fragColor0 dans le code du shader"
+      },
+      "1": {
+        "name": "IMAGE1",
+        "tooltip": "Disponible via layout(location = 1) out vec4 fragColor1 dans le code du shader"
+      },
+      "2": {
+        "name": "IMAGE2",
+        "tooltip": "Disponible via layout(location = 2) out vec4 fragColor2 dans le code du shader"
+      },
+      "3": {
+        "name": "IMAGE3",
+        "tooltip": "Disponible via layout(location = 3) out vec4 fragColor3 dans le code du shader"
+      }
+    }
+  },
+  "GeminiImage2Node": {
+    "description": "Générez ou modifiez des images de manière synchrone via l'API Google Vertex.",
+    "display_name": "Nano Banana Pro (Google Gemini Image)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "Si défini sur 'auto', correspond au format d'image de votre entrée ; si aucune image n'est fournie, un carré 16:9 est généralement généré."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "files": {
+        "name": "files",
+        "tooltip": "Fichier(s) optionnel(s) à utiliser comme contexte pour le modèle. Accepte les entrées du nœud Gemini Generate Content Input Files."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Image(s) de référence optionnelle(s). Pour inclure plusieurs images, utilisez le nœud Batch Images (jusqu'à 14)."
+      },
+      "model": {
+        "name": "model"
+      },
+      "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 suivre."
+      },
+      "resolution": {
+        "name": "resolution",
+        "tooltip": "Résolution de sortie cible. Pour 2K/4K, l'upscaler natif Gemini est utilisé."
+      },
+      "response_modalities": {
+        "name": "response_modalities",
+        "tooltip": "Choisissez 'IMAGE' pour une sortie image uniquement, ou 'IMAGE+TEXT' pour retourner à la fois l'image générée et une réponse textuelle."
+      },
+      "seed": {
+        "name": "seed",
+        "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 graine aléatoire est utilisée."
+      },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "Instructions fondamentales qui dictent le comportement de l'IA."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "GeminiImageNode": {
     "description": "Modifier les images de manière synchrone via l'API Google.",
     "display_name": "Image Google Gemini",
@@ -2646,9 +3689,17 @@
         "name": "prompt",
         "tooltip": "Prompt texte pour la génération"
       },
+      "response_modalities": {
+        "name": "response_modalities",
+        "tooltip": "Choisissez 'IMAGE' pour une sortie image uniquement, ou 'IMAGE+TEXT' pour retourner à la fois l'image générée et une réponse textuelle."
+      },
       "seed": {
         "name": "graine",
         "tooltip": "Lorsque la graine est fixée à une valeur spécifique, le modèle fait de son mieux pour fournir la même réponse pour des requêtes répétées. La sortie déterministe n'est pas garantie. De plus, changer le modèle ou les paramètres, comme la température, peut entraîner des variations dans la réponse même en utilisant la même valeur de graine. Par défaut, une valeur de graine aléatoire est utilisée."
+      },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "Instructions fondamentales qui dictent le comportement de l'IA."
       }
     },
     "outputs": {
@@ -2679,6 +3730,60 @@
       }
     }
   },
+  "GeminiNanoBanana2": {
+    "description": "Générez ou modifiez des images de manière synchrone via l’API Google Vertex.",
+    "display_name": "Nano Banana 2",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "rapport d’aspect",
+        "tooltip": "Si défini sur « auto », correspond au rapport d’aspect de votre image d’entrée ; si aucune image n’est fournie, un carré 16:9 est généralement généré."
+      },
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "files": {
+        "name": "fichiers",
+        "tooltip": "Fichier(s) optionnel(s) à utiliser comme contexte pour le modèle. Accepte les entrées du nœud Gemini Generate Content Input Files."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Image(s) de référence optionnelle(s). Pour inclure plusieurs images, utilisez le nœud Batch Images (jusqu’à 14)."
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "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."
+      },
+      "resolution": {
+        "name": "résolution",
+        "tooltip": "Résolution de sortie cible. Pour le 2K/4K, l’upscaler natif Gemini est utilisé."
+      },
+      "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 graine aléatoire est utilisée."
+      },
+      "system_prompt": {
+        "name": "invite système",
+        "tooltip": "Instructions fondamentales qui dictent le comportement de l’IA."
+      },
+      "thinking_level": {
+        "name": "niveau de réflexion"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "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",
@@ -2710,6 +3815,10 @@
         "name": "graine",
         "tooltip": "Lorsque la graine est fixée à une valeur spécifique, le modèle fait de son mieux pour fournir la même réponse pour des requêtes répétées. La sortie déterministe n'est pas garantie. De plus, changer le modèle ou les paramètres, comme la température, peut entraîner des variations dans la réponse même en utilisant la même valeur de graine. Par défaut, une valeur de graine aléatoire est utilisée."
       },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "Instructions fondamentales qui dictent le comportement de l'IA."
+      },
       "video": {
         "name": "vidéo",
         "tooltip": "Vidéo optionnelle à utiliser comme contexte pour le modèle."
@@ -2721,6 +3830,72 @@
       }
     }
   },
+  "GenerateTracks": {
+    "display_name": "GenerateTracks",
+    "inputs": {
+      "bezier": {
+        "name": "bezier",
+        "tooltip": "Activer le chemin en courbe de Bézier en utilisant le point central comme point de contrôle."
+      },
+      "end_x": {
+        "name": "fin_x",
+        "tooltip": "Coordonnée X normalisée (0-1) pour la position d'arrivée."
+      },
+      "end_y": {
+        "name": "fin_y",
+        "tooltip": "Coordonnée Y normalisée (0-1) pour la position d'arrivée."
+      },
+      "height": {
+        "name": "hauteur"
+      },
+      "interpolation": {
+        "name": "interpolation",
+        "tooltip": "Contrôle le timing/la vitesse du mouvement le long du chemin."
+      },
+      "mid_x": {
+        "name": "milieu_x",
+        "tooltip": "Point de contrôle X normalisé pour la courbe de Bézier. Utilisé uniquement lorsque 'bezier' est activé."
+      },
+      "mid_y": {
+        "name": "milieu_y",
+        "tooltip": "Point de contrôle Y normalisé pour la courbe de Bézier. Utilisé uniquement lorsque 'bezier' est activé."
+      },
+      "num_frames": {
+        "name": "nombre_d_images"
+      },
+      "num_tracks": {
+        "name": "nombre_de_pistes"
+      },
+      "start_x": {
+        "name": "départ_x",
+        "tooltip": "Coordonnée X normalisée (0-1) pour la position de départ."
+      },
+      "start_y": {
+        "name": "départ_y",
+        "tooltip": "Coordonnée Y normalisée (0-1) pour la position de départ."
+      },
+      "track_mask": {
+        "name": "masque_de_piste",
+        "tooltip": "Masque optionnel pour indiquer les images visibles."
+      },
+      "track_spread": {
+        "name": "écartement_des_pistes",
+        "tooltip": "Distance normalisée entre les pistes. Les pistes sont réparties perpendiculairement à la direction du mouvement."
+      },
+      "width": {
+        "name": "largeur"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "longueur_de_piste",
+        "tooltip": null
+      }
+    }
+  },
   "GetImageSize": {
     "description": "Retourne la largeur et la hauteur de l'image, et la transmet inchangée.",
     "display_name": "Obtenir la taille de l'image",
@@ -2731,13 +3906,16 @@
     },
     "outputs": {
       "0": {
-        "name": "largeur"
+        "name": "largeur",
+        "tooltip": null
       },
       "1": {
-        "name": "hauteur"
+        "name": "hauteur",
+        "tooltip": null
       },
       "2": {
-        "name": "taille_du_lot"
+        "name": "taille du lot",
+        "tooltip": null
       }
     }
   },
@@ -2765,6 +3943,149 @@
       }
     }
   },
+  "GrokImageEditNode": {
+    "description": "Modifiez une image existante à partir d'une invite textuelle",
+    "display_name": "Grok Image Edit",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "rapport d'aspect",
+        "tooltip": "Autorisé uniquement lorsque plusieurs images sont connectées à l'entrée image."
+      },
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "number_of_images": {
+        "name": "nombre d'images",
+        "tooltip": "Nombre d'images modifiées à générer"
+      },
+      "prompt": {
+        "name": "invite",
+        "tooltip": "L'invite textuelle utilisée pour générer l'image"
+      },
+      "resolution": {
+        "name": "résolution"
+      },
+      "seed": {
+        "name": "graine",
+        "tooltip": "Graine pour déterminer si le nœud doit être relancé ; les résultats réels sont non déterministes, quelle 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",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "rapport d'aspect"
+      },
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "number_of_images": {
+        "name": "nombre d'images",
+        "tooltip": "Nombre d'images à générer"
+      },
+      "prompt": {
+        "name": "invite",
+        "tooltip": "L'invite textuelle utilisée pour générer l'image"
+      },
+      "resolution": {
+        "name": "résolution"
+      },
+      "seed": {
+        "name": "graine",
+        "tooltip": "Graine pour déterminer si le nœud doit être relancé ; les résultats réels sont non déterministes, quelle que soit la graine."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokVideoEditNode": {
+    "description": "Modifiez une vidéo existante à partir d'une invite textuelle.",
+    "display_name": "Grok Video Edit",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "prompt": {
+        "name": "invite",
+        "tooltip": "Description textuelle de la vidéo souhaitée."
+      },
+      "seed": {
+        "name": "graine",
+        "tooltip": "Graine pour déterminer si le nœud doit être relancé ; les résultats réels sont non déterministes, quelle que soit la graine."
+      },
+      "video": {
+        "name": "vidéo",
+        "tooltip": "La durée maximale prise en charge est de 8,7 secondes et la taille du fichier de 50 Mo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokVideoNode": {
+    "description": "Générez une vidéo à partir d'une invite ou d'une image",
+    "display_name": "Grok Video",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "rapport d'aspect",
+        "tooltip": "Le rapport d'aspect de la vidéo générée."
+      },
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "duration": {
+        "name": "durée",
+        "tooltip": "La durée de la vidéo générée en secondes."
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "prompt": {
+        "name": "invite",
+        "tooltip": "Description textuelle de la vidéo souhaitée."
+      },
+      "resolution": {
+        "name": "résolution",
+        "tooltip": "La résolution de la vidéo générée."
+      },
+      "seed": {
+        "name": "graine",
+        "tooltip": "Graine pour déterminer si le nœud doit être relancé ; les résultats réels sont non déterministes, quelle que soit la graine."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "GrowMask": {
     "display_name": "GrowMask",
     "inputs": {
@@ -2777,6 +4098,55 @@
       "tapered_corners": {
         "name": "coins_évasés"
       }
+    },
+    "outputs": {
+      "0": {
+        "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",
+    "inputs": {
+      "auto_downscale": {
+        "name": "réduction_automatique",
+        "tooltip": "Réduit automatiquement l’image d’entrée si la sortie dépasse la limite."
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "upscale_factor": {
+        "name": "facteur_d’agrandissement"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HitPawVideoEnhance": {
+    "description": "Agrandissez les vidéos basse résolution en haute résolution, éliminez les artefacts et le bruit. Les prix affichés sont par seconde de vidéo.",
+    "display_name": "HitPaw Amélioration Vidéo",
+    "inputs": {
+      "model": {
+        "name": "modèle"
+      },
+      "model_resolution": {
+        "name": "résolution"
+      },
+      "video": {
+        "name": "vidéo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "Hunyuan3Dv2Conditioning": {
@@ -2788,10 +4158,12 @@
     },
     "outputs": {
       "0": {
-        "name": "positif"
+        "name": "positive",
+        "tooltip": null
       },
       "1": {
-        "name": "négatif"
+        "name": "negative",
+        "tooltip": null
       }
     }
   },
@@ -2813,10 +4185,12 @@
     },
     "outputs": {
       "0": {
-        "name": "positif"
+        "name": "positive",
+        "tooltip": null
       },
       "1": {
-        "name": "négatif"
+        "name": "negative",
+        "tooltip": null
       }
     }
   },
@@ -2890,6 +4264,120 @@
       }
     }
   },
+  "HunyuanVideo15ImageToVideo": {
+    "display_name": "HunyuanVideo15ImageToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "taille_du_lot"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "hauteur"
+      },
+      "length": {
+        "name": "longueur"
+      },
+      "negative": {
+        "name": "négatif"
+      },
+      "positive": {
+        "name": "positif"
+      },
+      "start_image": {
+        "name": "image_de_départ"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largeur"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positif",
+        "tooltip": null
+      },
+      "1": {
+        "name": "négatif",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "HunyuanVideo15LatentUpscaleWithModel": {
+    "display_name": "Hunyuan Video 15 Latent Upscale With Model",
+    "inputs": {
+      "crop": {
+        "name": "rogner"
+      },
+      "height": {
+        "name": "hauteur"
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "samples": {
+        "name": "échantillons"
+      },
+      "upscale_method": {
+        "name": "méthode_d_agrandissement"
+      },
+      "width": {
+        "name": "largeur"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HunyuanVideo15SuperResolution": {
+    "display_name": "HunyuanVideo15SuperResolution",
+    "inputs": {
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "latent": {
+        "name": "latent"
+      },
+      "negative": {
+        "name": "négatif"
+      },
+      "noise_augmentation": {
+        "name": "augmentation_du_bruit"
+      },
+      "positive": {
+        "name": "positif"
+      },
+      "start_image": {
+        "name": "image_de_départ"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positif",
+        "tooltip": null
+      },
+      "1": {
+        "name": "négatif",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
   "HyperTile": {
     "display_name": "HyperTile",
     "inputs": {
@@ -3094,6 +4582,11 @@
       "strength": {
         "name": "intensité"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageBatch": {
@@ -3157,6 +4650,26 @@
       "image": {
         "name": "image"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageCompare": {
+    "description": "Compare deux images côte à côte avec un curseur.",
+    "display_name": "Comparaison d’images",
+    "inputs": {
+      "compare_view": {
+        "name": "vue de comparaison"
+      },
+      "image_a": {
+        "name": "image A"
+      },
+      "image_b": {
+        "name": "image B"
+      }
     }
   },
   "ImageCompositeMasked": {
@@ -3180,6 +4693,11 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageCrop": {
@@ -3200,6 +4718,50 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageCropV2": {
+    "display_name": "Rogner l'image",
+    "inputs": {
+      "crop_region": {
+        "name": "crop_region"
+      },
+      "height": {},
+      "image": {
+        "name": "image"
+      },
+      "width": {},
+      "x": {},
+      "y": {}
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageDeduplication": {
+    "display_name": "Déduplication d'image",
+    "inputs": {
+      "images": {
+        "name": "images",
+        "tooltip": "Liste des images à traiter."
+      },
+      "similarity_threshold": {
+        "name": "seuil_de_similarité",
+        "tooltip": "Seuil de similarité (0-1). Plus la valeur est élevée, plus les images sont similaires. Les images au-dessus de ce seuil sont considérées comme des doublons."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Images traitées"
+      }
     }
   },
   "ImageFlip": {
@@ -3211,6 +4773,11 @@
       "image": {
         "name": "image"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageFromBatch": {
@@ -3225,6 +4792,42 @@
       "length": {
         "name": "longueur"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageGrid": {
+    "display_name": "Grille d'images",
+    "inputs": {
+      "cell_height": {
+        "name": "hauteur_de_cellule",
+        "tooltip": "Hauteur de chaque cellule dans la grille."
+      },
+      "cell_width": {
+        "name": "largeur_de_cellule",
+        "tooltip": "Largeur de chaque cellule dans la grille."
+      },
+      "columns": {
+        "name": "colonnes",
+        "tooltip": "Nombre de colonnes dans la grille."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Liste des images à traiter."
+      },
+      "padding": {
+        "name": "marge",
+        "tooltip": "Marge entre les images."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Images traitées"
+      }
     }
   },
   "ImageInvert": {
@@ -3235,6 +4838,28 @@
       }
     }
   },
+  "ImageMergeTileList": {
+    "display_name": "Fusionner une liste de tuiles en image",
+    "inputs": {
+      "final_height": {
+        "name": "hauteur_finale"
+      },
+      "final_width": {
+        "name": "largeur_finale"
+      },
+      "image_list": {
+        "name": "liste_d'images"
+      },
+      "overlap": {
+        "name": "chevauchement"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ImageOnlyCheckpointLoader": {
     "display_name": "Chargeur de points de contrôle uniquement pour image (modèle img2vid)",
     "inputs": {
@@ -3333,6 +4958,11 @@
       "rotation": {
         "name": "rotation"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageScale": {
@@ -3381,6 +5011,11 @@
       "upscale_method": {
         "name": "méthode_d'agrandissement"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageScaleToTotalPixels": {
@@ -3392,6 +5027,9 @@
       "megapixels": {
         "name": "mégapixels"
       },
+      "resolution_steps": {
+        "name": "étapes_de_résolution"
+      },
       "upscale_method": {
         "name": "méthode_d'agrandissement"
       }
@@ -3446,6 +5084,11 @@
       "spacing_width": {
         "name": "espacement_largeur"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageToMask": {
@@ -3457,6 +5100,11 @@
       "image": {
         "name": "image"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageUpscaleWithModel": {
@@ -3566,6 +5214,29 @@
       "mask": {
         "name": "masque"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "JoinAudioChannels": {
+    "description": "Fusionne les canaux audio mono gauche et droit en un audio stéréo.",
+    "display_name": "Fusionner les canaux audio",
+    "inputs": {
+      "audio_left": {
+        "name": "audio gauche"
+      },
+      "audio_right": {
+        "name": "audio droit"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "audio",
+        "tooltip": null
+      }
     }
   },
   "JoinImageWithAlpha": {
@@ -3691,6 +5362,58 @@
       "sampler_name": {
         "name": "sampler_name"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Kandinsky5ImageToVideo": {
+    "display_name": "Kandinsky5ImageToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "taille_du_lot"
+      },
+      "height": {
+        "name": "hauteur"
+      },
+      "length": {
+        "name": "longueur"
+      },
+      "negative": {
+        "name": "négatif"
+      },
+      "positive": {
+        "name": "positif"
+      },
+      "start_image": {
+        "name": "image_de_départ"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largeur"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positif",
+        "tooltip": null
+      },
+      "1": {
+        "name": "négatif",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": "Latent vidéo vide"
+      },
+      "3": {
+        "name": "cond_latent",
+        "tooltip": "Images de départ encodées propres, utilisées pour remplacer le début bruité des latents de sortie du modèle"
+      }
     }
   },
   "KarrasScheduler": {
@@ -3708,6 +5431,44 @@
       "steps": {
         "name": "étapes"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingAvatarNode": {
+    "description": "Générez des vidéos de type diffusion de personnages numériques à partir d'une seule photo et d'un fichier audio.",
+    "display_name": "Kling Avatar 2.0",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "Image de référence de l'avatar. La largeur et la hauteur doivent être d'au moins 300 px. Le rapport d'aspect doit être compris entre 1:2,5 et 2,5:1."
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Invite optionnelle pour définir les actions, émotions et mouvements de caméra de l'avatar."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Le seed contrôle si le nœud doit être relancé ; les résultats restent non déterministes quel que soit le seed."
+      },
+      "sound_file": {
+        "name": "sound_file",
+        "tooltip": "Entrée audio. Doit durer entre 2 et 300 secondes."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "KlingCameraControlI2VNode": {
@@ -3862,6 +5623,46 @@
       }
     }
   },
+  "KlingFirstLastFrameNode": {
+    "description": "Générez des vidéos avec Kling V3 en utilisant la première et la dernière image.",
+    "display_name": "Kling 3.0 Première-Dernière-Image en Vidéo",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "duration": {
+        "name": "durée"
+      },
+      "end_frame": {
+        "name": "dernière image"
+      },
+      "first_frame": {
+        "name": "première image"
+      },
+      "generate_audio": {
+        "name": "générer l'audio"
+      },
+      "model": {
+        "name": "modèle",
+        "tooltip": "Paramètres du modèle et de la génération."
+      },
+      "model_resolution": {
+        "name": "résolution"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Le seed contrôle si le nœud doit être relancé ; les résultats sont non déterministes quel que soit le seed."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingImage2VideoNode": {
     "display_name": "Kling Image to Video",
     "inputs": {
@@ -3914,6 +5715,9 @@
       "aspect_ratio": {
         "name": "aspect_ratio"
       },
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
       "human_fidelity": {
         "name": "human_fidelity",
         "tooltip": "Similarité de référence du sujet"
@@ -3942,6 +5746,39 @@
       "prompt": {
         "name": "prompt",
         "tooltip": "Invite textuelle positive"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Le seed contrôle si le nœud doit être relancé ; les résultats sont non déterministes quel que soit le seed."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingImageToVideoWithAudio": {
+    "display_name": "Kling Image (première image) vers vidéo avec audio",
+    "inputs": {
+      "duration": {
+        "name": "durée"
+      },
+      "generate_audio": {
+        "name": "générer_audio"
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "invite",
+        "tooltip": "Invite textuelle positive."
+      },
+      "start_frame": {
+        "name": "image_de_départ"
       }
     },
     "outputs": {
@@ -4011,6 +5848,299 @@
       }
     }
   },
+  "KlingMotionControl": {
+    "display_name": "Kling Contrôle du Mouvement",
+    "inputs": {
+      "character_orientation": {
+        "name": "orientation_du_personnage",
+        "tooltip": "Contrôle l'origine de l'orientation/position du personnage.\nvidéo : les mouvements, expressions, mouvements de caméra et orientation suivent la vidéo de référence de mouvement (autres détails via l'invite).\nimage : les mouvements et expressions suivent toujours la vidéo de référence de mouvement, mais l'orientation du personnage correspond à l'image de référence (caméra/autres détails via l'invite)."
+      },
+      "keep_original_sound": {
+        "name": "garder_son_original"
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "prompt": {
+        "name": "invite"
+      },
+      "reference_image": {
+        "name": "image_de_référence"
+      },
+      "reference_video": {
+        "name": "vidéo_de_référence",
+        "tooltip": "Vidéo de référence de mouvement utilisée pour piloter le mouvement/l'expression.\nLes limites de durée dépendent de l'orientation_du_personnage :\n - image : 3–10s (max 10s)\n - vidéo : 3–30s (max 30s)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProEditVideoNode": {
+    "description": "Éditez une vidéo existante avec le dernier modèle de Kling.",
+    "display_name": "Kling Omni Édition Vidéo (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "keep_original_sound": {
+        "name": "garder_son_original"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "invite",
+        "tooltip": "Une invite textuelle décrivant le contenu de la vidéo. Cela peut inclure des descriptions positives et négatives."
+      },
+      "reference_images": {
+        "name": "images_de_référence",
+        "tooltip": "Jusqu'à 4 images de référence supplémentaires."
+      },
+      "resolution": {
+        "name": "résolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Le seed contrôle si le nœud doit être relancé ; les résultats sont non déterministes quel que soit le seed."
+      },
+      "video": {
+        "name": "vidéo",
+        "tooltip": "Vidéo à éditer. La longueur de la vidéo de sortie sera la même."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProFirstLastFrameNode": {
+    "description": "Utilisez une image de départ, une image de fin optionnelle ou des images de référence avec le dernier modèle Kling.",
+    "display_name": "Kling Omni Première-Dernière-Image vers Vidéo (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "end_frame": {
+        "name": "end_frame",
+        "tooltip": "Une image de fin optionnelle pour la vidéo. Cela ne peut pas être utilisé en même temps que 'reference_images'."
+      },
+      "first_frame": {
+        "name": "first_frame"
+      },
+      "generate_audio": {
+        "name": "générer l'audio",
+        "tooltip": "Générer l'audio pour la vidéo. Pris en charge uniquement pour kling-v3-omni."
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Une invite textuelle décrivant le contenu de la vidéo. Cela peut inclure des descriptions positives et négatives."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "Jusqu'à 6 images de référence supplémentaires."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Le seed contrôle si le nœud doit être relancé ; les résultats sont non déterministes quel que soit le seed."
+      },
+      "storyboards": {
+        "name": "storyboards",
+        "tooltip": "Générez une série de segments vidéo avec des prompts et des durées individuelles. Pris en charge uniquement pour kling-v3-omni."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProImageNode": {
+    "description": "Créez ou modifiez des images avec le dernier modèle de Kling.",
+    "display_name": "Kling Omni Image (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Une invite textuelle décrivant le contenu de l'image. Cela peut inclure des descriptions positives et négatives."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "Jusqu'à 10 images de référence supplémentaires."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Le seed contrôle si le nœud doit être relancé ; les résultats sont non déterministes quel que soit le seed."
+      },
+      "series_amount": {
+        "name": "nombre de séries",
+        "tooltip": "Générez une série d'images. Non pris en charge pour kling-image-o1."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProImageToVideoNode": {
+    "description": "Utilisez jusqu'à 7 images de référence pour générer une vidéo avec le dernier modèle Kling.",
+    "display_name": "Kling Omni Image vers Vidéo (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "generate_audio": {
+        "name": "générer l'audio",
+        "tooltip": "Générer l'audio pour la vidéo. Pris en charge uniquement pour kling-v3-omni."
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Une invite textuelle décrivant le contenu de la vidéo. Cela peut inclure des descriptions positives et négatives."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "Jusqu'à 7 images de référence."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Le seed contrôle si le nœud doit être relancé ; les résultats sont non déterministes quel que soit le seed."
+      },
+      "storyboards": {
+        "name": "storyboards",
+        "tooltip": "Générez une série de segments vidéo avec des prompts et des durées individuelles. Pris en charge uniquement pour kling-v3-omni."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProTextToVideoNode": {
+    "description": "Utilisez des invites textuelles pour générer des vidéos avec le dernier modèle Kling.",
+    "display_name": "Kling Omni Texte vers Vidéo (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "generate_audio": {
+        "name": "générer l'audio"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Une invite textuelle décrivant le contenu de la vidéo. Cela peut inclure des descriptions positives et négatives."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Le seed contrôle si le nœud doit être relancé ; les résultats sont non déterministes quel que soit le seed."
+      },
+      "storyboards": {
+        "name": "storyboards",
+        "tooltip": "Générez une série de segments vidéo avec des prompts et des durées individuelles. Ignoré pour le modèle o1."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProVideoToVideoNode": {
+    "description": "Utilisez une vidéo et jusqu'à 4 images de référence pour générer une vidéo avec le dernier modèle Kling.",
+    "display_name": "Kling Omni Vidéo à Vidéo (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "keep_original_sound": {
+        "name": "keep_original_sound"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Une invite textuelle décrivant le contenu de la vidéo. Cela peut inclure des descriptions positives et négatives."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "Jusqu'à 4 images de référence supplémentaires."
+      },
+      "reference_video": {
+        "name": "reference_video",
+        "tooltip": "Vidéo à utiliser comme référence."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Le seed contrôle si le nœud doit être relancé ; les résultats sont non déterministes quel que soit le seed."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingSingleImageVideoEffectNode": {
     "description": "Obtenez différents effets spéciaux lors de la génération d'une vidéo selon le effect_scene.",
     "display_name": "Effets vidéo Kling",
@@ -4125,6 +6255,35 @@
       }
     }
   },
+  "KlingTextToVideoWithAudio": {
+    "display_name": "Kling Texte en Vidéo avec Audio",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "generate_audio": {
+        "name": "generate_audio"
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Invite textuelle positive."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingVideoExtendNode": {
     "description": "Nœud Kling Video Extend. Étend les vidéos créées par d'autres nœuds Kling. Le video_id est créé en utilisant d'autres nœuds Kling.",
     "display_name": "Kling Video Extend",
@@ -4159,6 +6318,54 @@
       }
     }
   },
+  "KlingVideoNode": {
+    "description": "Générez des vidéos avec Kling V3. Prend en charge le texte-vers-vidéo et l’image-vers-vidéo avec storyboard multi-invite optionnel et génération audio.",
+    "display_name": "Kling 3.0 Vidéo",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "generate_audio": {
+        "name": "générer audio"
+      },
+      "model": {
+        "name": "modèle",
+        "tooltip": "Paramètres du modèle et de la génération."
+      },
+      "model_aspect_ratio": {
+        "name": "ratio d’aspect"
+      },
+      "model_resolution": {
+        "name": "résolution"
+      },
+      "multi_shot": {
+        "name": "multi_shot",
+        "tooltip": "Générez une série de segments vidéo avec des invites et des durées individuelles."
+      },
+      "multi_shot_duration": {
+        "name": "durée"
+      },
+      "multi_shot_negative_prompt": {
+        "name": "invite_négative"
+      },
+      "multi_shot_prompt": {
+        "name": "invite"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Le seed contrôle si le nœud doit être relancé ; les résultats sont non déterministes quel que soit le seed."
+      },
+      "start_frame": {
+        "name": "image de départ",
+        "tooltip": "Image de départ optionnelle. Lorsqu’elle est connectée, passe en mode image-vers-vidéo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingVirtualTryOnNode": {
     "description": "Nœud Kling Virtual Try On. Importez une image humaine et une image de vêtement pour essayer le vêtement sur la personne.",
     "display_name": "Kling Virtual Try On",
@@ -4179,6 +6386,26 @@
       }
     }
   },
+  "LTXAVTextEncoderLoader": {
+    "description": "[Recettes]\n\nltxav : gemma 3 12B",
+    "display_name": "Chargeur d'encodeur texte audio LTXV",
+    "inputs": {
+      "ckpt_name": {
+        "name": "ckpt_name"
+      },
+      "device": {
+        "name": "device"
+      },
+      "text_encoder": {
+        "name": "text_encoder"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LTXVAddGuide": {
     "display_name": "LTXVAddGuide",
     "inputs": {
@@ -4221,6 +6448,76 @@
       }
     }
   },
+  "LTXVAudioVAEDecode": {
+    "display_name": "Décodage Audio VAE LTXV",
+    "inputs": {
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "Le modèle Audio VAE utilisé pour décoder le latent."
+      },
+      "samples": {
+        "name": "samples",
+        "tooltip": "Le latent à décoder."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Audio",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAEEncode": {
+    "display_name": "Encodage Audio VAE LTXV",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "L'audio à encoder."
+      },
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "Le modèle Audio VAE à utiliser pour l'encodage."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Audio Latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAELoader": {
+    "display_name": "Chargeur Audio VAE LTXV",
+    "inputs": {
+      "ckpt_name": {
+        "name": "ckpt_name",
+        "tooltip": "Point de contrôle Audio VAE à charger."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Audio VAE",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVConcatAVLatent": {
+    "display_name": "Concaténation AV Latent LTXV",
+    "inputs": {
+      "audio_latent": {
+        "name": "audio_latent"
+      },
+      "video_latent": {
+        "name": "video_latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
   "LTXVConditioning": {
     "display_name": "LTXVConditioning",
     "inputs": {
@@ -4273,6 +6570,33 @@
       }
     }
   },
+  "LTXVEmptyLatentAudio": {
+    "display_name": "Audio latent vide LTXV",
+    "inputs": {
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "Le modèle Audio VAE dont obtenir la configuration."
+      },
+      "batch_size": {
+        "name": "batch_size",
+        "tooltip": "Le nombre d'échantillons audio latents dans le lot."
+      },
+      "frame_rate": {
+        "name": "frame_rate",
+        "tooltip": "Nombre d'images par seconde."
+      },
+      "frames_number": {
+        "name": "frames_number",
+        "tooltip": "Nombre d'images."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Latent",
+        "tooltip": null
+      }
+    }
+  },
   "LTXVImgToVideo": {
     "display_name": "LTXVImgToVideo",
     "inputs": {
@@ -4319,6 +6643,47 @@
       }
     }
   },
+  "LTXVImgToVideoInplace": {
+    "display_name": "LTXVImgToVideoInplace",
+    "inputs": {
+      "bypass": {
+        "name": "contournement",
+        "tooltip": "Ignorer le conditionnement."
+      },
+      "image": {
+        "name": "image"
+      },
+      "latent": {
+        "name": "latent"
+      },
+      "strength": {
+        "name": "force"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVLatentUpsampler": {
+    "display_name": "LTXVLatentUpsampler",
+    "inputs": {
+      "samples": {
+        "name": "échantillons"
+      },
+      "upscale_model": {
+        "name": "modèle_d’agrandissement"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
   "LTXVPreprocess": {
     "display_name": "LTXVPreprocess",
     "inputs": {
@@ -4367,6 +6732,25 @@
       }
     }
   },
+  "LTXVSeparateAVLatent": {
+    "description": "LTXV Séparer AV Latent",
+    "display_name": "LTXVSeparateAVLatent",
+    "inputs": {
+      "av_latent": {
+        "name": "av_latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent_vidéo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "latent_audio",
+        "tooltip": null
+      }
+    }
+  },
   "LaplaceScheduler": {
     "display_name": "LaplaceScheduler",
     "inputs": {
@@ -4385,6 +6769,11 @@
       "steps": {
         "name": "steps"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "LatentAdd": {
@@ -4522,6 +6911,11 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "LatentConcat": {
@@ -4585,6 +6979,25 @@
       }
     }
   },
+  "LatentCutToBatch": {
+    "display_name": "LatentCutToBatch",
+    "inputs": {
+      "dim": {
+        "name": "dim"
+      },
+      "samples": {
+        "name": "samples"
+      },
+      "slice_size": {
+        "name": "slice_size"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LatentFlip": {
     "display_name": "Retourner Latent",
     "inputs": {
@@ -4738,6 +7151,19 @@
       }
     }
   },
+  "LatentUpscaleModelLoader": {
+    "display_name": "Charger le Modèle d'Agrandissement Latent",
+    "inputs": {
+      "model_name": {
+        "name": "model_name"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LazyCache": {
     "description": "Une version maison d'EasyCache - une version encore 'plus facile' d'EasyCache à implémenter. Fonctionne globalement moins bien qu'EasyCache, mais mieux dans certains cas rares ET une compatibilité universelle avec tout dans ComfyUI.",
     "display_name": "CacheParesseux",
@@ -4772,8 +7198,7 @@
   "Load3D": {
     "display_name": "Charger 3D",
     "inputs": {
-      "clear": {
-      },
+      "clear": {},
       "height": {
         "name": "hauteur"
       },
@@ -4783,30 +7208,40 @@
       "model_file": {
         "name": "fichier_modèle"
       },
-      "upload 3d model": {
-      },
+      "upload 3d model": {},
+      "upload extra resources": {},
       "width": {
         "name": "largeur"
       }
     },
     "outputs": {
       "0": {
-        "name": "image"
+        "name": "image",
+        "tooltip": null
       },
       "1": {
-        "name": "masque"
+        "name": "mask",
+        "tooltip": null
       },
       "2": {
-        "name": "chemin_maillage"
+        "name": "mesh_path",
+        "tooltip": null
       },
       "3": {
-        "name": "normale"
+        "name": "normal",
+        "tooltip": null
       },
       "4": {
-        "name": "lineart"
+        "name": "camera_info",
+        "tooltip": null
       },
       "5": {
-        "name": "info_caméra"
+        "name": "recording_video",
+        "tooltip": null
+      },
+      "6": {
+        "name": "model_3d",
+        "tooltip": null
       }
     }
   },
@@ -4822,6 +7257,11 @@
       "upload": {
         "name": "choisissez le fichier à télécharger"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "LoadImage": {
@@ -4835,6 +7275,21 @@
       }
     }
   },
+  "LoadImageDataSetFromFolder": {
+    "display_name": "Charger un Jeu de Données d'Images depuis un Dossier",
+    "inputs": {
+      "folder": {
+        "name": "folder",
+        "tooltip": "Le dossier depuis lequel charger les images."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Liste des images chargées"
+      }
+    }
+  },
   "LoadImageMask": {
     "display_name": "Charger Image (comme Masque)",
     "inputs": {
@@ -4853,16 +7308,35 @@
     "description": "Chargez une image à partir du dossier de sortie. Lorsque le bouton de rafraîchissement est cliqué, le nœud mettra à jour la liste des images et sélectionnera automatiquement la première image, permettant une itération facile.",
     "display_name": "Charger l'image (à partir des sorties)",
     "inputs": {
+      "Auto-refresh after generation": {},
       "image": {
         "name": "image"
       },
-      "refresh": {
-      },
+      "refresh": {},
       "upload": {
         "name": "choisissez le fichier à télécharger"
       }
     }
   },
+  "LoadImageTextDataSetFromFolder": {
+    "display_name": "Charger un Jeu de Données Images et Textes depuis un Dossier",
+    "inputs": {
+      "folder": {
+        "name": "folder",
+        "tooltip": "Le dossier depuis lequel charger les images."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Liste des images chargées"
+      },
+      "1": {
+        "name": "texts",
+        "tooltip": "Liste des légendes textuelles"
+      }
+    }
+  },
   "LoadLatent": {
     "display_name": "ChargerLatent",
     "inputs": {
@@ -4871,6 +7345,25 @@
       }
     }
   },
+  "LoadTrainingDataset": {
+    "display_name": "Charger le jeu de données d'entraînement",
+    "inputs": {
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "Nom du dossier contenant le jeu de données sauvegardé (dans le répertoire de sortie)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latents",
+        "tooltip": "Liste de dictionnaires latents"
+      },
+      "1": {
+        "name": "conditioning",
+        "tooltip": "Liste de listes de conditionnement"
+      }
+    }
+  },
   "LoadVideo": {
     "display_name": "Charger une vidéo",
     "inputs": {
@@ -4921,6 +7414,60 @@
       }
     }
   },
+  "LoraLoaderBypass": {
+    "description": "Appliquer LoRA en mode bypass. Contrairement à LoRA classique, cela ne modifie pas les poids du modèle - à la place, le calcul LoRA est injecté lors du passage avant. Utile pour les scénarios d'entraînement.",
+    "display_name": "Charger LoRA (Bypass) (Pour le débogage)",
+    "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "Le modèle CLIP auquel le LoRA sera appliqué."
+      },
+      "lora_name": {
+        "name": "lora_name",
+        "tooltip": "Le nom du LoRA."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Le modèle de diffusion auquel le LoRA sera appliqué."
+      },
+      "strength_clip": {
+        "name": "strength_clip",
+        "tooltip": "Intensité de modification du modèle CLIP. Cette valeur peut être négative."
+      },
+      "strength_model": {
+        "name": "strength_model",
+        "tooltip": "Intensité de modification du modèle de diffusion. Cette valeur peut être négative."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "Le modèle de diffusion modifié."
+      },
+      "1": {
+        "tooltip": "Le modèle CLIP modifié."
+      }
+    }
+  },
+  "LoraLoaderBypassModelOnly": {
+    "description": "Appliquer LoRA en mode bypass. Contrairement à LoRA classique, cela ne modifie pas les poids du modèle - à la place, le calcul LoRA est injecté lors du passage avant. Utile pour les scénarios d'entraînement.",
+    "display_name": "Charger LoRA (Bypass, Modèle Seulement) (pour le débogage)",
+    "inputs": {
+      "lora_name": {
+        "name": "lora_name"
+      },
+      "model": {
+        "name": "model"
+      },
+      "strength_model": {
+        "name": "strength_model"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "Le modèle de diffusion modifié."
+      }
+    }
+  },
   "LoraLoaderModelOnly": {
     "description": "Les LoRAs sont utilisés pour modifier les modèles de diffusion et CLIP, modifiant la manière dont les latents sont débruités comme l'application de styles. Plusieurs nœuds LoRA peuvent être liés ensemble.",
     "display_name": "LoraLoaderModelOnly",
@@ -4944,6 +7491,10 @@
   "LoraModelLoader": {
     "display_name": "Charger le modèle LoRA",
     "inputs": {
+      "bypass": {
+        "name": "bypass",
+        "tooltip": "Lorsqu'il est activé, applique LoRA en mode bypass sans modifier les poids du modèle de base. Utile pour l'entraînement et lorsque les poids du modèle sont déchargés."
+      },
       "lora": {
         "name": "lora",
         "tooltip": "Le modèle LoRA à appliquer au modèle de diffusion."
@@ -4959,6 +7510,7 @@
     },
     "outputs": {
       "0": {
+        "name": "model",
         "tooltip": "Le modèle de diffusion modifié."
       }
     }
@@ -4992,10 +7544,12 @@
     "display_name": "Tracer le graphique de perte",
     "inputs": {
       "filename_prefix": {
-        "name": "préfixe_nom_fichier"
+        "name": "préfixe_nom_fichier",
+        "tooltip": "Préfixe pour l'image du graphique de perte sauvegardée."
       },
       "loss": {
-        "name": "perte"
+        "name": "perte",
+        "tooltip": "Carte de perte provenant du nœud d'entraînement."
       }
     }
   },
@@ -5286,6 +7840,208 @@
       }
     }
   },
+  "MagnificImageRelightNode": {
+    "description": "Reluminez une image avec des ajustements de lumière et un transfert de lumière basé sur une référence en option.",
+    "display_name": "Magnific Relumination d’Image",
+    "inputs": {
+      "advanced_settings": {
+        "name": "advanced_settings",
+        "tooltip": "Options de réglage fin pour un contrôle avancé de l’éclairage."
+      },
+      "change_background": {
+        "name": "change_background",
+        "tooltip": "Modifie l’arrière-plan selon le prompt/la référence."
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "L’image à reluminer."
+      },
+      "interpolate_from_original": {
+        "name": "interpolate_from_original",
+        "tooltip": "Restreint la liberté de génération pour correspondre davantage à l’original."
+      },
+      "light_transfer_strength": {
+        "name": "light_transfer_strength",
+        "tooltip": "Intensité de l’application du transfert de lumière."
+      },
+      "preserve_details": {
+        "name": "preserve_details",
+        "tooltip": "Préserve la texture et les détails fins de l’original."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Instructions descriptives pour l’éclairage. Prend en charge la notation d’emphase (1-1.4)."
+      },
+      "reference_image": {
+        "name": "reference_image",
+        "tooltip": "Image de référence optionnelle pour transférer la lumière."
+      },
+      "style": {
+        "name": "style",
+        "tooltip": "Préférence stylistique de sortie."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageSkinEnhancerNode": {
+    "description": "Amélioration de la peau pour les portraits avec plusieurs modes de traitement.",
+    "display_name": "Magnific Améliorateur de Peau d’Image",
+    "inputs": {
+      "image": {
+        "name": "image",
+        "tooltip": "Le portrait à améliorer."
+      },
+      "mode": {
+        "name": "mode",
+        "tooltip": "Mode de traitement : créatif pour une amélioration artistique, fidèle pour préserver l’apparence originale, flexible pour une optimisation ciblée."
+      },
+      "sharpen": {
+        "name": "sharpen",
+        "tooltip": "Niveau d’intensité de la netteté."
+      },
+      "smart_grain": {
+        "name": "smart_grain",
+        "tooltip": "Niveau d’intensité du grain intelligent."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageStyleTransferNode": {
+    "description": "Transférez le style d'une image de référence vers votre image d'entrée.",
+    "display_name": "Transfert de style d'image Magnific",
+    "inputs": {
+      "engine": {
+        "name": "engine",
+        "tooltip": "Sélection du moteur de traitement."
+      },
+      "fixed_generation": {
+        "name": "fixed_generation",
+        "tooltip": "Lorsque désactivé, chaque génération introduit un certain degré d'aléatoire, produisant des résultats plus variés."
+      },
+      "flavor": {
+        "name": "flavor",
+        "tooltip": "Type de transfert de style."
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "L'image à laquelle appliquer le transfert de style."
+      },
+      "portrait_mode": {
+        "name": "portrait_mode",
+        "tooltip": "Activer le mode portrait pour les améliorations du visage."
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "reference_image": {
+        "name": "reference_image",
+        "tooltip": "L'image de référence dont extraire le style."
+      },
+      "structure_strength": {
+        "name": "structure_strength",
+        "tooltip": "Préserve la structure de l'image originale."
+      },
+      "style_strength": {
+        "name": "style_strength",
+        "tooltip": "Pourcentage d'intensité du style."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageUpscalerCreativeNode": {
+    "description": "Amélioration guidée par prompt, stylisation et agrandissement 2x/4x/8x/16x. Sortie maximale : 25,3 mégapixels.",
+    "display_name": "Magnific Image Upscale (Creative)",
+    "inputs": {
+      "auto_downscale": {
+        "name": "réduction automatique",
+        "tooltip": "Réduit automatiquement l’image d’entrée si la sortie dépasse la limite maximale de pixels."
+      },
+      "creativity": {
+        "name": "créativité"
+      },
+      "engine": {
+        "name": "moteur"
+      },
+      "fractality": {
+        "name": "fractalité",
+        "tooltip": "La force du prompt et la complexité par pixel carré."
+      },
+      "hdr": {
+        "name": "hdr",
+        "tooltip": "Le niveau de définition et de détail."
+      },
+      "image": {
+        "name": "image"
+      },
+      "optimized_for": {
+        "name": "optimisé pour"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "resemblance": {
+        "name": "ressemblance",
+        "tooltip": "Le niveau de ressemblance avec l’image originale."
+      },
+      "scale_factor": {
+        "name": "facteur d’agrandissement"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageUpscalerPreciseV2Node": {
+    "description": "Agrandissement haute fidélité avec contrôle précis de la netteté, du grain et des détails. Sortie maximale : 10060×10060 pixels.",
+    "display_name": "Magnific Image Upscale (Precise V2)",
+    "inputs": {
+      "auto_downscale": {
+        "name": "réduction automatique",
+        "tooltip": "Réduit automatiquement l’image d’entrée si la sortie dépasse la résolution maximale."
+      },
+      "flavor": {
+        "name": "style",
+        "tooltip": "Style de traitement : sublime pour un usage général, photo pour les photographies, photo_denoiser pour les photos bruitées."
+      },
+      "image": {
+        "name": "image"
+      },
+      "scale_factor": {
+        "name": "facteur d’agrandissement"
+      },
+      "sharpen": {
+        "name": "netteté",
+        "tooltip": "Intensité de la netteté de l’image. Des valeurs plus élevées augmentent la définition des contours et la clarté."
+      },
+      "smart_grain": {
+        "name": "grain intelligent",
+        "tooltip": "Amélioration intelligente du grain/de la texture pour éviter que l’image ne paraisse trop lisse ou artificielle."
+      },
+      "ultra_detail": {
+        "name": "ultra-détail",
+        "tooltip": "Contrôle les détails fins, les textures et les micro-détails ajoutés lors de l’agrandissement."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "Mahiro": {
     "description": "Modifiez le guidage pour qu'il se concentre davantage sur la 'direction' de l'invite positive plutôt que sur la différence avec l'invite négative.",
     "display_name": "Mahiro est si mignonne qu'elle mérite une meilleure fonction de guidage!! (。・ω・。)",
@@ -5301,6 +8057,50 @@
       }
     }
   },
+  "MakeTrainingDataset": {
+    "display_name": "Créer un jeu de données d’entraînement",
+    "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "Modèle CLIP pour encoder le texte en conditionnement."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Liste d’images à encoder."
+      },
+      "texts": {
+        "name": "textes",
+        "tooltip": "Liste de légendes textuelles. Peut être de longueur n (correspondant aux images), 1 (répété pour tous), ou omis (utilise une chaîne vide)."
+      },
+      "vae": {
+        "name": "vae",
+        "tooltip": "Modèle VAE pour encoder les images en latents."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latents",
+        "tooltip": "Liste de dictionnaires latents"
+      },
+      "1": {
+        "name": "conditionnement",
+        "tooltip": "Liste de listes de conditionnement"
+      }
+    }
+  },
+  "ManualSigmas": {
+    "display_name": "Sigmas manuels",
+    "inputs": {
+      "sigmas": {
+        "name": "sigmas"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "MaskComposite": {
     "display_name": "MaskComposite",
     "inputs": {
@@ -5319,6 +8119,11 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "MaskPreview": {
@@ -5336,6 +8141,371 @@
       "mask": {
         "name": "masque"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MergeImageLists": {
+    "display_name": "Fusionner les listes d’images",
+    "inputs": {
+      "images": {
+        "name": "images",
+        "tooltip": "Liste d’images à traiter."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Images traitées"
+      }
+    }
+  },
+  "MergeTextLists": {
+    "display_name": "Fusionner les listes de textes",
+    "inputs": {
+      "texts": {
+        "name": "textes",
+        "tooltip": "Liste de textes à traiter."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "textes",
+        "tooltip": "Textes traités"
+      }
+    }
+  },
+  "MeshyAnimateModelNode": {
+    "description": "Appliquez une action d’animation spécifique à un personnage déjà riggé.",
+    "display_name": "Meshy : Animer le modèle",
+    "inputs": {
+      "action_id": {
+        "name": "action_id",
+        "tooltip": "Visitez https://docs.meshy.ai/en/api/animation-library pour la liste des valeurs disponibles."
+      },
+      "rig_task_id": {
+        "name": "rig_task_id"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyImageToModelNode": {
+    "display_name": "Meshy : Image vers modèle",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "Spécifiez le mode de pose pour le modèle généré."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Le seed contrôle si le nœud doit être relancé ; les résultats restent non déterministes quel que soit le seed."
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "Si défini sur faux, retourne un maillage triangulaire non traité."
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      },
+      "should_texture": {
+        "name": "should_texture",
+        "tooltip": "Détermine si des textures sont générées. Si défini sur faux, la phase de texturage est ignorée et un maillage sans textures est retourné."
+      },
+      "should_texture_enable_pbr": {
+        "name": "enable_pbr"
+      },
+      "should_texture_texture_prompt": {
+        "name": "texture_prompt"
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyMultiImageToModelNode": {
+    "display_name": "Meshy : Multi-image vers modèle",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "images": {
+        "name": "images"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "Spécifiez le mode de pose pour le modèle généré."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Le seed contrôle si le nœud doit être relancé ; les résultats restent non déterministes quel que soit le seed."
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "Si défini sur faux, retourne un maillage triangulaire non traité."
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      },
+      "should_texture": {
+        "name": "should_texture",
+        "tooltip": "Détermine si des textures sont générées. Si défini sur faux, la phase de texturage est ignorée et un maillage sans textures est retourné."
+      },
+      "should_texture_enable_pbr": {
+        "name": "enable_pbr"
+      },
+      "should_texture_texture_prompt": {
+        "name": "texture_prompt"
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyRefineNode": {
+    "description": "Affinez un modèle brouillon précédemment créé.",
+    "display_name": "Meshy : Affiner le modèle brouillon",
+    "inputs": {
+      "enable_pbr": {
+        "name": "activer_pbr",
+        "tooltip": "Générer des cartes PBR (métallique, rugosité, normale) en plus de la couleur de base. Remarque : cela doit être désactivé lors de l’utilisation du style Sculpture, car le style Sculpture génère ses propres cartes PBR."
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "texture_image": {
+        "name": "image_texture",
+        "tooltip": "Seul l’un de 'texture_image' ou 'texture_prompt' peut être utilisé à la fois."
+      },
+      "texture_prompt": {
+        "name": "invite_texture",
+        "tooltip": "Fournissez une invite textuelle pour guider le processus de texturage. Maximum 600 caractères. Ne peut pas être utilisé en même temps que 'texture_image'."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyRigModelNode": {
+    "description": "Fournit un personnage riggé dans des formats standards. L’auto-rigging n’est actuellement pas adapté aux maillages non texturés, aux assets non humanoïdes ou aux assets humanoïdes avec une structure de membres et de corps peu claire.",
+    "display_name": "Meshy : Rig du modèle",
+    "inputs": {
+      "height_meters": {
+        "name": "hauteur_mètres",
+        "tooltip": "La hauteur approximative du modèle de personnage en mètres. Cela aide à l’échelle et à la précision du rigging."
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "texture_image": {
+        "name": "image_texture",
+        "tooltip": "L’image de texture couleur de base UV-dépliée du modèle."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "rig_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyTextToModelNode": {
+    "display_name": "Meshy : Texte vers modèle",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "pose_mode": {
+        "name": "mode_pose",
+        "tooltip": "Spécifiez le mode de pose pour le modèle généré."
+      },
+      "prompt": {
+        "name": "invite"
+      },
+      "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."
+      },
+      "should_remesh": {
+        "name": "doit_remesher",
+        "tooltip": "Si désactivé, retourne un maillage triangulaire non traité."
+      },
+      "should_remesh_target_polycount": {
+        "name": "cible_polygones"
+      },
+      "should_remesh_topology": {
+        "name": "topologie"
+      },
+      "style": {
+        "name": "style"
+      },
+      "symmetry_mode": {
+        "name": "mode_symétrie"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "fichier_modèle",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyTextureNode": {
+    "display_name": "Meshy : Modèle de texture",
+    "inputs": {
+      "enable_original_uv": {
+        "name": "activer_uv_original",
+        "tooltip": "Utiliser l’UV original du modèle au lieu de générer de nouveaux UV. Lorsque cette option est activée, Meshy préserve les textures existantes du modèle importé. Si le modèle ne possède pas d’UV original, la qualité du résultat peut être moins bonne."
+      },
+      "image_style": {
+        "name": "style_image",
+        "tooltip": "Une image 2D pour guider le processus de texturisation. Ne peut pas être utilisée en même temps que « text_style_prompt »."
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "pbr": {
+        "name": "pbr"
+      },
+      "text_style_prompt": {
+        "name": "invite_style_texte",
+        "tooltip": "Décrivez le style de texture souhaité pour l’objet en utilisant du texte. 600 caractères maximum. Ne peut pas être utilisé en même temps que « image_style »."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "fichier_modèle",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
     }
   },
   "MinimaxHailuoVideoNode": {
@@ -7779,6 +10949,78 @@
       }
     }
   },
+  "NAGuidance": {
+    "description": "Applique le Guidage d’Attention Normalisée aux modèles, permettant l’utilisation de prompts négatifs sur les modèles distilled/schnell.",
+    "display_name": "Guidage d’Attention Normalisée",
+    "inputs": {
+      "model": {
+        "name": "modèle",
+        "tooltip": "Le modèle auquel appliquer NAG."
+      },
+      "nag_alpha": {
+        "name": "alpha_nag",
+        "tooltip": "Facteur de fusion pour l’attention normalisée. 1,0 correspond à un remplacement total, 0,0 à aucun effet."
+      },
+      "nag_scale": {
+        "name": "facteur_nag",
+        "tooltip": "Le facteur d’échelle du guidage. Des valeurs plus élevées éloignent davantage du prompt négatif."
+      },
+      "nag_tau": {
+        "name": "tau_nag"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "Le modèle modifié avec NAG activé."
+      }
+    }
+  },
+  "NormalizeImages": {
+    "display_name": "Normaliser les images",
+    "inputs": {
+      "images": {
+        "name": "images",
+        "tooltip": "Image à traiter."
+      },
+      "mean": {
+        "name": "moyenne",
+        "tooltip": "Valeur moyenne pour la normalisation."
+      },
+      "std": {
+        "name": "écart_type",
+        "tooltip": "Écart type pour la normalisation."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Images traitées"
+      }
+    }
+  },
+  "NormalizeVideoLatentStart": {
+    "description": "Normalise les images initiales d’un latent vidéo pour faire correspondre leur moyenne et leur écart type à ceux des images de référence suivantes. Permet de réduire les différences entre les premières images et le reste de la vidéo.",
+    "display_name": "NormalizeVideoLatentStart",
+    "inputs": {
+      "latent": {
+        "name": "latent"
+      },
+      "reference_frame_count": {
+        "name": "reference_frame_count",
+        "tooltip": "Nombre d’images latentes après les images de départ à utiliser comme référence"
+      },
+      "start_frame_count": {
+        "name": "start_frame_count",
+        "tooltip": "Nombre d’images latentes à normaliser, à partir du début"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
   "OpenAIChatConfig": {
     "description": "Permet de spécifier des options de configuration avancées pour les nœuds de chat OpenAI.",
     "display_name": "Options avancées OpenAI ChatGPT",
@@ -7928,6 +11170,9 @@
         "name": "mask",
         "tooltip": "Masque optionnel pour l'inpainting (les zones blanches seront remplacées)"
       },
+      "model": {
+        "name": "model"
+      },
       "n": {
         "name": "n",
         "tooltip": "Combien d'images générer"
@@ -8440,6 +11685,11 @@
       "steps": {
         "name": "étapes"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "PorterDuffImageComposite": {
@@ -8473,6 +11723,9 @@
   "Preview3D": {
     "display_name": "Aperçu 3D",
     "inputs": {
+      "bg_image": {
+        "name": "bg_image"
+      },
       "camera_info": {
         "name": "informations_de_camera"
       },
@@ -8480,14 +11733,20 @@
         "name": "image"
       },
       "model_file": {
-        "name": "fichier_modèle"
+        "name": "fichier_modèle",
+        "tooltip": "Fichier modèle 3D ou chemin d’accès"
       }
     }
   },
   "PreviewAny": {
     "display_name": "Aperçu de n'importe quel",
     "inputs": {
-      "preview": {
+      "previewMode": {},
+      "preview_markdown": {
+        "name": "Aperçu"
+      },
+      "preview_text": {
+        "name": "Aperçu"
       },
       "source": {
         "name": "source"
@@ -8527,6 +11786,28 @@
       }
     }
   },
+  "PrimitiveBoundingBox": {
+    "display_name": "Boîte englobante",
+    "inputs": {
+      "height": {
+        "name": "height"
+      },
+      "width": {
+        "name": "width"
+      },
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "PrimitiveFloat": {
     "display_name": "Flottant",
     "inputs": {
@@ -8628,6 +11909,36 @@
       }
     }
   },
+  "RandomCropImages": {
+    "display_name": "Rogner aléatoirement des images",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "height": {
+        "name": "height",
+        "tooltip": "Hauteur du rognage."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Image à traiter."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Graine aléatoire."
+      },
+      "width": {
+        "name": "width",
+        "tooltip": "Largeur du rognage."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Images traitées"
+      }
+    }
+  },
   "RandomNoise": {
     "display_name": "BruitAléatoire",
     "inputs": {
@@ -8637,6 +11948,11 @@
       "noise_seed": {
         "name": "graine_de_bruit"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "RebatchImages": {
@@ -8677,6 +11993,11 @@
       "audio": {
         "name": "audio"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "RecraftColorRGB": {
@@ -8724,6 +12045,25 @@
       }
     }
   },
+  "RecraftCreateStyleNode": {
+    "description": "Créez un style personnalisé à partir d’images de référence. Téléchargez 1 à 5 images à utiliser comme références de style. La taille totale de toutes les images est limitée à 5 Mo.",
+    "display_name": "Créer un style Recraft",
+    "inputs": {
+      "images": {
+        "name": "images"
+      },
+      "style": {
+        "name": "style",
+        "tooltip": "Le style de base des images générées."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "style_id",
+        "tooltip": null
+      }
+    }
+  },
   "RecraftCreativeUpscaleNode": {
     "description": "Agrandit l'image de manière synchrone.\nAméliore une image matricielle donnée à l'aide de l'outil « creative upscale », augmentant la résolution avec un accent sur l'affinement des petits détails et des visages.",
     "display_name": "Recraft Creative Upscale Image",
@@ -9031,6 +12371,88 @@
       }
     }
   },
+  "RecraftV4TextToImageNode": {
+    "description": "Génère des images à l’aide des modèles Recraft V4 ou V4 Pro.",
+    "display_name": "Recraft V4 Texte vers Image",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "model": {
+        "name": "modèle",
+        "tooltip": "Le modèle à utiliser pour la génération."
+      },
+      "model_size": {
+        "name": "taille"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "Nombre d’images à générer."
+      },
+      "negative_prompt": {
+        "name": "prompt_négatif",
+        "tooltip": "Description textuelle optionnelle des éléments indésirables sur une image."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt pour la génération d’image. Maximum 10 000 caractères."
+      },
+      "recraft_controls": {
+        "name": "recraft_controls",
+        "tooltip": "Contrôles supplémentaires optionnels sur la génération via le nœud Recraft Controls."
+      },
+      "seed": {
+        "name": "graine",
+        "tooltip": "Graine pour déterminer si le nœud doit être relancé ; les résultats réels restent non déterministes quel que soit la graine."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftV4TextToVectorNode": {
+    "description": "Génère des SVG à l’aide des modèles Recraft V4 ou V4 Pro.",
+    "display_name": "Recraft V4 Texte vers Vectoriel",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "model": {
+        "name": "modèle",
+        "tooltip": "Le modèle à utiliser pour la génération."
+      },
+      "model_size": {
+        "name": "taille"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "Nombre d’images à générer."
+      },
+      "negative_prompt": {
+        "name": "prompt_négatif",
+        "tooltip": "Description textuelle optionnelle des éléments indésirables sur une image."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt pour la génération d’image. Maximum 10 000 caractères."
+      },
+      "recraft_controls": {
+        "name": "recraft_controls",
+        "tooltip": "Contrôles supplémentaires optionnels sur la génération via le nœud Recraft Controls."
+      },
+      "seed": {
+        "name": "graine",
+        "tooltip": "Graine pour déterminer si le nœud doit être relancé ; les résultats réels restent non déterministes quel que soit la graine."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RecraftVectorizeImageNode": {
     "description": "Génère un SVG de manière synchrone à partir d'une image d'entrée.",
     "display_name": "Vectoriser une image avec Recraft",
@@ -9062,6 +12484,23 @@
       }
     }
   },
+  "ReferenceTimbreAudio": {
+    "description": "Ce nœud définit l’audio de référence pour le timbre (pour ace step 1.5)",
+    "display_name": "ReferenceTimbreAudio",
+    "inputs": {
+      "conditioning": {
+        "name": "conditionnement"
+      },
+      "latent": {
+        "name": "latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RegexExtract": {
     "display_name": "Extraire par Regex",
     "inputs": {
@@ -9181,6 +12620,11 @@
       "image": {
         "name": "image"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "RepeatLatentBatch": {
@@ -9194,6 +12638,51 @@
       }
     }
   },
+  "ReplaceText": {
+    "display_name": "Remplacer le texte",
+    "inputs": {
+      "find": {
+        "name": "find",
+        "tooltip": "Texte à rechercher."
+      },
+      "replace": {
+        "name": "replace",
+        "tooltip": "Texte de remplacement."
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "Texte à traiter."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "texts",
+        "tooltip": "Textes traités"
+      }
+    }
+  },
+  "ReplaceVideoLatentFrames": {
+    "display_name": "Remplacer les images latentes vidéo",
+    "inputs": {
+      "destination": {
+        "name": "destination",
+        "tooltip": "Le latent de destination où les images seront remplacées."
+      },
+      "index": {
+        "name": "index",
+        "tooltip": "L’index de la première image latente dans le latent de destination où les images du latent source seront placées. Les valeurs négatives comptent à partir de la fin."
+      },
+      "source": {
+        "name": "source",
+        "tooltip": "Le latent source fournissant les images à insérer dans le latent de destination. Si non fourni, le latent de destination est retourné inchangé."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RescaleCFG": {
     "display_name": "RescaleCFG",
     "inputs": {
@@ -9223,6 +12712,128 @@
       "target_width": {
         "name": "largeur_cible"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ResizeImageMaskNode": {
+    "description": "Redimensionner une image ou un mask en utilisant différentes méthodes de mise à l'échelle.",
+    "display_name": "Redimensionner image/masque",
+    "inputs": {
+      "input": {
+        "name": "input"
+      },
+      "resize_type": {
+        "name": "resize_type",
+        "tooltip": "Sélectionnez la méthode de redimensionnement : par dimensions exactes, facteur d'échelle, correspondance avec une autre image, etc."
+      },
+      "resize_type_crop": {
+        "name": "rogner"
+      },
+      "resize_type_height": {
+        "name": "hauteur"
+      },
+      "resize_type_width": {
+        "name": "largeur"
+      },
+      "scale_method": {
+        "name": "scale_method",
+        "tooltip": "Algorithme d'interpolation. 'area' est optimal pour la réduction, 'lanczos' pour l'agrandissement, 'nearest-exact' pour le pixel art."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "resized",
+        "tooltip": null
+      }
+    }
+  },
+  "ResizeImagesByLongerEdge": {
+    "display_name": "Redimensionner les images par le bord le plus long",
+    "inputs": {
+      "images": {
+        "name": "images",
+        "tooltip": "Image à traiter."
+      },
+      "longer_edge": {
+        "name": "longer_edge",
+        "tooltip": "Longueur cible pour le bord le plus long."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Images traitées"
+      }
+    }
+  },
+  "ResizeImagesByShorterEdge": {
+    "display_name": "Redimensionner les images par le bord le plus court",
+    "inputs": {
+      "images": {
+        "name": "images",
+        "tooltip": "Image à traiter."
+      },
+      "shorter_edge": {
+        "name": "shorter_edge",
+        "tooltip": "Longueur cible pour le bord le plus court."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Images traitées"
+      }
+    }
+  },
+  "ResolutionBucket": {
+    "display_name": "Regroupement par résolution",
+    "inputs": {
+      "conditioning": {
+        "name": "conditioning",
+        "tooltip": "Liste de listes de conditionnement (doit correspondre à la longueur des latents)."
+      },
+      "latents": {
+        "name": "latents",
+        "tooltip": "Liste de dictionnaires de latent à regrouper par résolution."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latents",
+        "tooltip": "Liste de dictionnaires de latent groupés, un par regroupement de résolution."
+      },
+      "1": {
+        "name": "conditioning",
+        "tooltip": "Liste de listes de conditions, une par regroupement de résolution."
+      }
+    }
+  },
+  "ResolutionSelector": {
+    "description": "Calcule la largeur et la hauteur à partir du ratio d'aspect et de la cible en mégapixels. Utile pour définir les dimensions d'une image latente vide.",
+    "display_name": "Sélecteur de résolution",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "ratio d'aspect",
+        "tooltip": "Le ratio d'aspect pour les dimensions de sortie."
+      },
+      "megapixels": {
+        "name": "mégapixels",
+        "tooltip": "Nombre total de mégapixels visé. 1,0 MP ≈ 1024×1024 pour un carré."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "largeur",
+        "tooltip": "Largeur calculée en pixels (multiple de 8)."
+      },
+      "1": {
+        "name": "hauteur",
+        "tooltip": "Hauteur calculée en pixels (multiple de 8)."
+      }
     }
   },
   "Rodin3D_Detail": {
@@ -9244,7 +12855,11 @@
     },
     "outputs": {
       "0": {
-        "name": "Chemin Modèle 3D",
+        "name": "Chemin du modèle 3D",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -9271,7 +12886,11 @@
     },
     "outputs": {
       "0": {
-        "name": "Chemin Modèle 3D",
+        "name": "Chemin du modèle 3D",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -9295,7 +12914,11 @@
     },
     "outputs": {
       "0": {
-        "name": "Chemin Modèle 3D",
+        "name": "Chemin du modèle 3D",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -9313,7 +12936,11 @@
     },
     "outputs": {
       "0": {
-        "name": "Chemin Modèle 3D",
+        "name": "Chemin du modèle 3D",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -9339,6 +12966,10 @@
       "0": {
         "name": "Chemin du modèle 3D",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9464,6 +13095,90 @@
       }
     }
   },
+  "SDPoseDrawKeypoints": {
+    "display_name": "SDPoseDrawKeypoints",
+    "inputs": {
+      "draw_body": {
+        "name": "draw_body"
+      },
+      "draw_face": {
+        "name": "draw_face"
+      },
+      "draw_feet": {
+        "name": "draw_feet"
+      },
+      "draw_hands": {
+        "name": "draw_hands"
+      },
+      "face_point_size": {
+        "name": "face_point_size"
+      },
+      "keypoints": {
+        "name": "keypoints"
+      },
+      "score_threshold": {
+        "name": "score_threshold"
+      },
+      "stick_width": {
+        "name": "stick_width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SDPoseFaceBBoxes": {
+    "display_name": "SDPoseFaceBBoxes",
+    "inputs": {
+      "force_square": {
+        "name": "force_square",
+        "tooltip": "Agrandir l’axe le plus court de la boîte pour que la région découpée soit toujours carrée."
+      },
+      "keypoints": {
+        "name": "keypoints"
+      },
+      "scale": {
+        "name": "scale",
+        "tooltip": "Multiplicateur pour la zone de la boîte englobante autour de chaque visage détecté."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "bboxes",
+        "tooltip": "Boîtes englobantes des visages par image, compatibles avec l’entrée bboxes de SDPoseKeypointExtractor."
+      }
+    }
+  },
+  "SDPoseKeypointExtractor": {
+    "description": "Extraire les points clés de pose à partir d’images en utilisant le modèle SDPose : https://huggingface.co/Comfy-Org/SDPose/tree/main/checkpoints",
+    "display_name": "SDPoseKeypointExtractor",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "bboxes": {
+        "name": "bboxes",
+        "tooltip": "Boîtes englobantes optionnelles pour des détections plus précises. Requis pour la détection multi-personnes."
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "keypoints",
+        "tooltip": "Points clés au format OpenPose (canvas_width, canvas_height, people)"
+      }
+    }
+  },
   "SDTurboScheduler": {
     "display_name": "SDTurboScheduler",
     "inputs": {
@@ -9476,6 +13191,11 @@
       "steps": {
         "name": "étapes"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SD_4XUpscale_Conditioning": {
@@ -9631,10 +13351,12 @@
     },
     "outputs": {
       "0": {
-        "name": "sortie"
+        "name": "sortie",
+        "tooltip": null
       },
       "1": {
-        "name": "sortie_débruitée"
+        "name": "sortie_débruitée",
+        "tooltip": null
       }
     }
   },
@@ -9659,10 +13381,12 @@
     },
     "outputs": {
       "0": {
-        "name": "sortie"
+        "name": "sortie",
+        "tooltip": null
       },
       "1": {
-        "name": "sortie_débruitée"
+        "name": "sortie_débruitée",
+        "tooltip": null
       }
     }
   },
@@ -9699,6 +13423,11 @@
       "s_noise": {
         "name": "s_bruit"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_2M_SDE": {
@@ -9716,6 +13445,11 @@
       "solver_type": {
         "name": "type_solveur"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_2S_Ancestral": {
@@ -9727,6 +13461,11 @@
       "s_noise": {
         "name": "s_bruit"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_3M_SDE": {
@@ -9741,6 +13480,11 @@
       "s_noise": {
         "name": "s_bruit"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_SDE": {
@@ -9758,6 +13502,11 @@
       "s_noise": {
         "name": "s_bruit"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerER_SDE": {
@@ -9776,6 +13525,11 @@
       "solver_type": {
         "name": "type_solveur"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerEulerAncestral": {
@@ -9787,6 +13541,11 @@
       "s_noise": {
         "name": "s_bruit"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerEulerAncestralCFGPP": {
@@ -9798,6 +13557,11 @@
       "s_noise": {
         "name": "s_bruit"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerEulerCFGpp": {
@@ -9838,6 +13602,11 @@
       "order": {
         "name": "ordre"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerSASolver": {
@@ -9870,6 +13639,37 @@
       "use_pece": {
         "name": "utiliser_pece"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerSEEDS2": {
+    "description": "Ce nœud d'échantillonnage peut représenter plusieurs échantillonneurs :\n\nseeds_2\n- paramètre par défaut\n\nexp_heun_2_x0\n- solver_type=phi_2, r=1.0, eta=0.0\n\nexp_heun_2_x0_sde\n- solver_type=phi_2, r=1.0, eta=1.0, s_noise=1.0",
+    "display_name": "SamplerSEEDS2",
+    "inputs": {
+      "eta": {
+        "name": "eta",
+        "tooltip": "Intensité stochastique"
+      },
+      "r": {
+        "name": "r",
+        "tooltip": "Taille relative de l'étape pour l'étape intermédiaire (nœud c2)"
+      },
+      "s_noise": {
+        "name": "s_noise",
+        "tooltip": "Multiplicateur de bruit SDE"
+      },
+      "solver_type": {
+        "name": "solver_type"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplingPercentToSigma": {
@@ -9888,7 +13688,8 @@
     },
     "outputs": {
       "0": {
-        "name": "valeur_sigma"
+        "name": "valeur_sigma",
+        "tooltip": null
       }
     }
   },
@@ -9990,7 +13791,8 @@
         "name": "image"
       },
       "mesh": {
-        "name": "maillage"
+        "name": "maillage",
+        "tooltip": "Maillage ou fichier GLB à enregistrer"
       }
     }
   },
@@ -10008,6 +13810,44 @@
       }
     }
   },
+  "SaveImageDataSetToFolder": {
+    "display_name": "Enregistrer l'ensemble d'images dans un dossier",
+    "inputs": {
+      "filename_prefix": {
+        "name": "filename_prefix",
+        "tooltip": "Préfixe pour les noms de fichiers des images enregistrées."
+      },
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "Nom du dossier dans lequel enregistrer les images (dans le répertoire de sortie)."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Liste des images à enregistrer."
+      }
+    }
+  },
+  "SaveImageTextDataSetToFolder": {
+    "display_name": "Enregistrer l'ensemble d'images et de textes dans un dossier",
+    "inputs": {
+      "filename_prefix": {
+        "name": "filename_prefix",
+        "tooltip": "Préfixe pour les noms de fichiers des images enregistrées."
+      },
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "Nom du dossier dans lequel enregistrer les images (dans le répertoire de sortie)."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Liste des images à enregistrer."
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "Liste des légendes textuelles à enregistrer."
+      }
+    }
+  },
   "SaveImageWebsocket": {
     "display_name": "EnregistrerImageWebsocket",
     "inputs": {
@@ -10027,6 +13867,23 @@
       }
     }
   },
+  "SaveLoRA": {
+    "display_name": "Enregistrer les poids LoRA",
+    "inputs": {
+      "lora": {
+        "name": "lora",
+        "tooltip": "Le modèle LoRA à enregistrer. N'utilisez pas le modèle avec des couches LoRA."
+      },
+      "prefix": {
+        "name": "prefix",
+        "tooltip": "Le préfixe à utiliser pour le fichier LoRA enregistré."
+      },
+      "steps": {
+        "name": "steps",
+        "tooltip": "Optionnel : Le nombre d'étapes pour lesquelles LoRA a été entraîné, utilisé pour nommer le fichier enregistré."
+      }
+    }
+  },
   "SaveSVGNode": {
     "description": "Enregistrer les fichiers SVG sur le disque.",
     "display_name": "NoeudEnregistrerSVG",
@@ -10040,6 +13897,27 @@
       }
     }
   },
+  "SaveTrainingDataset": {
+    "display_name": "Enregistrer l'ensemble d'entraînement",
+    "inputs": {
+      "conditioning": {
+        "name": "conditioning",
+        "tooltip": "Liste de listes de conditionnement provenant de MakeTrainingDataset."
+      },
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "Nom du dossier dans lequel enregistrer l'ensemble de données (dans le répertoire de sortie)."
+      },
+      "latents": {
+        "name": "latents",
+        "tooltip": "Liste de dictionnaires latents provenant de MakeTrainingDataset."
+      },
+      "shard_size": {
+        "name": "shard_size",
+        "tooltip": "Nombre d'échantillons par fichier fragment."
+      }
+    }
+  },
   "SaveVideo": {
     "description": "Enregistre les images d'entrée dans votre répertoire de sortie ComfyUI.",
     "display_name": "Enregistrer la vidéo",
@@ -10160,6 +14038,11 @@
       "sigmas": {
         "name": "sigmas"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SetHookKeyframes": {
@@ -10200,6 +14083,58 @@
       }
     }
   },
+  "ShuffleDataset": {
+    "display_name": "Mélanger l'ensemble d'images",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Liste des images à traiter."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Graine aléatoire."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Images traitées"
+      }
+    }
+  },
+  "ShuffleImageTextDataset": {
+    "display_name": "Mélanger l'ensemble image-texte",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Liste des images à mélanger."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Graine aléatoire."
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "Liste des textes à mélanger."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Images mélangées"
+      },
+      "1": {
+        "name": "texts",
+        "tooltip": "Textes mélangés"
+      }
+    }
+  },
   "SkipLayerGuidanceDiT": {
     "description": "Version générique du nœud SkipLayerGuidance qui peut être utilisée sur chaque modèle DiT.",
     "display_name": "SkipLayerGuidanceDiT",
@@ -10296,6 +14231,11 @@
       "width": {
         "name": "largeur"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SplitAudioChannels": {
@@ -10308,10 +14248,35 @@
     },
     "outputs": {
       "0": {
-        "name": "gauche"
+        "name": "gauche",
+        "tooltip": null
       },
       "1": {
-        "name": "droite"
+        "name": "droite",
+        "tooltip": null
+      }
+    }
+  },
+  "SplitImageToTileList": {
+    "description": "Divise une image en une liste groupée de tuiles avec un chevauchement spécifié.",
+    "display_name": "Diviser l'image en liste de tuiles",
+    "inputs": {
+      "image": {
+        "name": "image"
+      },
+      "overlap": {
+        "name": "chevauchement"
+      },
+      "tile_height": {
+        "name": "hauteur_tuile"
+      },
+      "tile_width": {
+        "name": "largeur_tuile"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
       }
     }
   },
@@ -10343,10 +14308,12 @@
     },
     "outputs": {
       "0": {
-        "name": "high_sigmas"
+        "name": "sigmas_hauts",
+        "tooltip": null
       },
       "1": {
-        "name": "low_sigmas"
+        "name": "sigmas_bas",
+        "tooltip": null
       }
     }
   },
@@ -10362,10 +14329,12 @@
     },
     "outputs": {
       "0": {
-        "name": "high_sigmas"
+        "name": "sigmas_hauts",
+        "tooltip": null
       },
       "1": {
-        "name": "low_sigmas"
+        "name": "sigmas_bas",
+        "tooltip": null
       }
     }
   },
@@ -10969,6 +14938,21 @@
       }
     }
   },
+  "StripWhitespace": {
+    "display_name": "Supprimer les espaces",
+    "inputs": {
+      "texts": {
+        "name": "textes",
+        "tooltip": "Texte à traiter."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "textes",
+        "tooltip": "Textes traités"
+      }
+    }
+  },
   "StyleModelApply": {
     "display_name": "Appliquer le modèle de style",
     "inputs": {
@@ -11054,6 +15038,123 @@
       }
     }
   },
+  "Tencent3DPartNode": {
+    "description": "Identifie et génère automatiquement des composants en fonction de la structure du modèle.",
+    "display_name": "Hunyuan3D : Partie 3D",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôler après génération"
+      },
+      "model_3d": {
+        "name": "modèle_3d",
+        "tooltip": "Modèle 3D au format FBX. Le modèle doit comporter moins de 30 000 faces."
+      },
+      "seed": {
+        "name": "graine",
+        "tooltip": "La graine contrôle si le nœud doit être relancé ; les résultats restent non déterministes quel que soit la graine."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "TencentImageToModelNode": {
+    "display_name": "Hunyuan3D : Image(s) vers Modèle (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "face_count": {
+        "name": "nombre de faces"
+      },
+      "generate_type": {
+        "name": "type de génération"
+      },
+      "generate_type_pbr": {
+        "name": "pbr"
+      },
+      "image": {
+        "name": "image"
+      },
+      "image_back": {
+        "name": "image arrière"
+      },
+      "image_left": {
+        "name": "image gauche"
+      },
+      "image_right": {
+        "name": "image droite"
+      },
+      "model": {
+        "name": "modèle",
+        "tooltip": "L’option LowPoly n’est pas disponible pour le modèle `3.1`."
+      },
+      "seed": {
+        "name": "graine",
+        "tooltip": "La graine contrôle si le nœud doit être relancé ; les résultats restent non déterministes quelle que soit la graine."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "fichier_modèle",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "OBJ",
+        "tooltip": null
+      }
+    }
+  },
+  "TencentTextToModelNode": {
+    "display_name": "Hunyuan3D : Texte vers Modèle (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "face_count": {
+        "name": "nombre de faces"
+      },
+      "generate_type": {
+        "name": "type de génération"
+      },
+      "generate_type_pbr": {
+        "name": "pbr"
+      },
+      "model": {
+        "name": "modèle",
+        "tooltip": "L’option LowPoly n’est pas disponible pour le modèle `3.1`."
+      },
+      "prompt": {
+        "name": "invite",
+        "tooltip": "Jusqu’à 1024 caractères pris en charge."
+      },
+      "seed": {
+        "name": "graine",
+        "tooltip": "La graine contrôle si le nœud doit être relancé ; les résultats restent non déterministes quelle que soit la graine."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "fichier_modèle",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "OBJ",
+        "tooltip": null
+      }
+    }
+  },
   "TextEncodeAceStepAudio": {
     "display_name": "TextEncodeAceStepAudio",
     "inputs": {
@@ -11076,6 +15177,65 @@
       }
     }
   },
+  "TextEncodeAceStepAudio1_5": {
+    "display_name": "TextEncodeAceStepAudio1.5",
+    "inputs": {
+      "bpm": {
+        "name": "bpm"
+      },
+      "cfg_scale": {
+        "name": "cfg_scale"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "duration": {
+        "name": "durée"
+      },
+      "generate_audio_codes": {
+        "name": "générer des codes audio",
+        "tooltip": "Activez le LLM qui génère des codes audio. Cela peut être lent mais augmentera la qualité de l’audio généré. Désactivez cette option si vous fournissez une référence audio au modèle."
+      },
+      "keyscale": {
+        "name": "tonalité"
+      },
+      "language": {
+        "name": "langue"
+      },
+      "lyrics": {
+        "name": "paroles"
+      },
+      "min_p": {
+        "name": "min_p"
+      },
+      "seed": {
+        "name": "graine"
+      },
+      "tags": {
+        "name": "tags"
+      },
+      "temperature": {
+        "name": "température"
+      },
+      "timesignature": {
+        "name": "signature rythmique"
+      },
+      "top_k": {
+        "name": "top_k"
+      },
+      "top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TextEncodeHunyuanVideo_ImageToVideo": {
     "display_name": "TextEncodeHunyuanVideo_ImageToVideo",
     "inputs": {
@@ -11149,6 +15309,158 @@
       }
     }
   },
+  "TextEncodeZImageOmni": {
+    "display_name": "TextEncodeZImageOmni",
+    "inputs": {
+      "auto_resize_images": {
+        "name": "redimensionnement automatique des images"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "image1": {
+        "name": "image1"
+      },
+      "image2": {
+        "name": "image2"
+      },
+      "image3": {
+        "name": "image3"
+      },
+      "image_encoder": {
+        "name": "encodeur d'image"
+      },
+      "prompt": {
+        "name": "invite"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TextGenerate": {
+    "display_name": "TextGenerate",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image": {
+        "name": "image"
+      },
+      "max_length": {
+        "name": "longueur_max"
+      },
+      "prompt": {
+        "name": "invite"
+      },
+      "sampling_mode": {
+        "name": "mode_d'échantillonnage"
+      },
+      "sampling_mode_min_p": {
+        "name": "min_p"
+      },
+      "sampling_mode_repetition_penalty": {
+        "name": "pénalité_de_répétition"
+      },
+      "sampling_mode_seed": {
+        "name": "graine"
+      },
+      "sampling_mode_temperature": {
+        "name": "température"
+      },
+      "sampling_mode_top_k": {
+        "name": "top_k"
+      },
+      "sampling_mode_top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "texte_généré",
+        "tooltip": null
+      }
+    }
+  },
+  "TextGenerateLTX2Prompt": {
+    "display_name": "TextGenerateLTX2Prompt",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image": {
+        "name": "image"
+      },
+      "max_length": {
+        "name": "longueur_maximale"
+      },
+      "prompt": {
+        "name": "invite"
+      },
+      "sampling_mode": {
+        "name": "mode_d'échantillonnage"
+      },
+      "sampling_mode_min_p": {
+        "name": "min_p"
+      },
+      "sampling_mode_repetition_penalty": {
+        "name": "pénalité_de_répétition"
+      },
+      "sampling_mode_seed": {
+        "name": "graine"
+      },
+      "sampling_mode_temperature": {
+        "name": "température"
+      },
+      "sampling_mode_top_k": {
+        "name": "top_k"
+      },
+      "sampling_mode_top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "texte_généré",
+        "tooltip": null
+      }
+    }
+  },
+  "TextToLowercase": {
+    "display_name": "Texte en minuscules",
+    "inputs": {
+      "texts": {
+        "name": "textes",
+        "tooltip": "Texte à traiter."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "textes",
+        "tooltip": "Textes traités"
+      }
+    }
+  },
+  "TextToUppercase": {
+    "display_name": "Texte en majuscules",
+    "inputs": {
+      "texts": {
+        "name": "textes",
+        "tooltip": "Texte à traiter."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "textes",
+        "tooltip": "Textes traités"
+      }
+    }
+  },
   "ThresholdMask": {
     "display_name": "SeuilMasque",
     "inputs": {
@@ -11158,6 +15470,11 @@
       "value": {
         "name": "valeur"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "TomePatchModel": {
@@ -11176,6 +15493,118 @@
       }
     }
   },
+  "TopazImageEnhance": {
+    "description": "Agrandissement et amélioration d'image de référence dans l'industrie.",
+    "display_name": "Topaz Amélioration d'image",
+    "inputs": {
+      "color_preservation": {
+        "name": "préservation des couleurs",
+        "tooltip": "Préserver les couleurs d'origine."
+      },
+      "creativity": {
+        "name": "créativité"
+      },
+      "crop_to_fill": {
+        "name": "rogner pour remplir",
+        "tooltip": "Par défaut, l'image est encadrée si le format de sortie diffère. Activez pour rogner l'image afin de remplir les dimensions de sortie."
+      },
+      "face_enhancement": {
+        "name": "amélioration du visage",
+        "tooltip": "Améliorer les visages (si présents) lors du traitement."
+      },
+      "face_enhancement_creativity": {
+        "name": "créativité de l'amélioration du visage",
+        "tooltip": "Définir le niveau de créativité pour l'amélioration du visage."
+      },
+      "face_enhancement_strength": {
+        "name": "intensité de l'amélioration du visage",
+        "tooltip": "Contrôle la netteté des visages améliorés par rapport à l'arrière-plan."
+      },
+      "face_preservation": {
+        "name": "préservation du visage",
+        "tooltip": "Préserver l'identité faciale des sujets."
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "output_height": {
+        "name": "hauteur de sortie",
+        "tooltip": "Une valeur de zéro signifie conserver la hauteur d'origine ou la largeur de sortie."
+      },
+      "output_width": {
+        "name": "largeur de sortie",
+        "tooltip": "Une valeur de zéro signifie calcul automatique (généralement la taille d'origine ou la hauteur de sortie si spécifiée)."
+      },
+      "prompt": {
+        "name": "invite",
+        "tooltip": "Invite textuelle optionnelle pour guider l'agrandissement créatif."
+      },
+      "subject_detection": {
+        "name": "détection du sujet"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TopazVideoEnhance": {
+    "description": "Redonnez vie à vos vidéos grâce à une technologie puissante d’upscaling et de restauration.",
+    "display_name": "Topaz Video Enhance",
+    "inputs": {
+      "dynamic_compression_level": {
+        "name": "dynamic_compression_level",
+        "tooltip": "Niveau CQP."
+      },
+      "interpolation_duplicate": {
+        "name": "interpolation_duplicate",
+        "tooltip": "Analyse la vidéo d’entrée pour détecter et supprimer les images dupliquées."
+      },
+      "interpolation_duplicate_threshold": {
+        "name": "interpolation_duplicate_threshold",
+        "tooltip": "Sensibilité de détection des images dupliquées."
+      },
+      "interpolation_enabled": {
+        "name": "interpolation_enabled"
+      },
+      "interpolation_frame_rate": {
+        "name": "interpolation_frame_rate",
+        "tooltip": "Fréquence d’images de sortie."
+      },
+      "interpolation_model": {
+        "name": "interpolation_model"
+      },
+      "interpolation_slowmo": {
+        "name": "interpolation_slowmo",
+        "tooltip": "Facteur de ralenti appliqué à la vidéo d’entrée. Par exemple, 2 rend la sortie deux fois plus lente et double la durée."
+      },
+      "upscaler_creativity": {
+        "name": "upscaler_creativity",
+        "tooltip": "Niveau de créativité (s’applique uniquement à Starlight (Astra) Creative)."
+      },
+      "upscaler_enabled": {
+        "name": "upscaler_enabled"
+      },
+      "upscaler_model": {
+        "name": "upscaler_model"
+      },
+      "upscaler_resolution": {
+        "name": "upscaler_resolution"
+      },
+      "video": {
+        "name": "vidéo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TorchCompileModel": {
     "display_name": "ModèleCompilationTorch",
     "inputs": {
@@ -11203,6 +15632,18 @@
         "name": "taille_du_lot",
         "tooltip": "La taille du lot à utiliser pour l'entraînement."
       },
+      "bucket_mode": {
+        "name": "bucket_mode",
+        "tooltip": "Activer le mode de résolution par compartiments. Lorsqu’il est activé, attend des latents pré-triés depuis le nœud ResolutionBucket."
+      },
+      "bypass_mode": {
+        "name": "bypass_mode",
+        "tooltip": "Activer le mode bypass pour l'entraînement. Lorsqu'il est activé, les adaptateurs sont appliqués via des hooks forward au lieu de la modification des poids. Utile pour les modèles quantifiés dont les poids ne peuvent pas être modifiés directement."
+      },
+      "checkpoint_depth": {
+        "name": "checkpoint_depth",
+        "tooltip": "Niveau de profondeur pour le gradient checkpointing."
+      },
       "control_after_generate": {
         "name": "contrôle après génération"
       },
@@ -11238,6 +15679,10 @@
         "name": "modèle",
         "tooltip": "Le modèle sur lequel entraîner le LoRA."
       },
+      "offloading": {
+        "name": "offloading",
+        "tooltip": "Niveau de profondeur pour le gradient checkpointing."
+      },
       "optimizer": {
         "name": "optimiseur",
         "tooltip": "L'optimiseur à utiliser pour l'entraînement."
@@ -11265,16 +15710,16 @@
     },
     "outputs": {
       "0": {
-        "name": "modèle_avec_lora"
+        "name": "lora",
+        "tooltip": "Modèle avec LoRA appliqué"
       },
       "1": {
-        "name": "lora"
+        "name": "carte_de_perte",
+        "tooltip": "Poids LoRA"
       },
       "2": {
-        "name": "perte"
-      },
-      "3": {
-        "name": "étapes"
+        "name": "étapes",
+        "tooltip": "Historique de la perte"
       }
     }
   },
@@ -11293,6 +15738,11 @@
         "name": "index_début",
         "tooltip": "Heure de début en secondes, peut être négative pour compter depuis la fin (prend en charge les sous-secondes)."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "TrimVideoLatent": {
@@ -11334,23 +15784,62 @@
   "TripoConversionNode": {
     "display_name": "Tripo : Convertir le modèle",
     "inputs": {
+      "animate_in_place": {
+        "name": "animate_in_place"
+      },
+      "bake": {
+        "name": "bake"
+      },
+      "export_orientation": {
+        "name": "export_orientation"
+      },
+      "export_vertex_colors": {
+        "name": "export_vertex_colors"
+      },
       "face_limit": {
         "name": "limite_faces"
       },
+      "fbx_preset": {
+        "name": "fbx_preset"
+      },
+      "flatten_bottom": {
+        "name": "flatten_bottom"
+      },
+      "flatten_bottom_threshold": {
+        "name": "flatten_bottom_threshold"
+      },
+      "force_symmetry": {
+        "name": "force_symmetry"
+      },
       "format": {
         "name": "format"
       },
       "original_model_task_id": {
         "name": "id_tâche_modèle_original"
       },
+      "pack_uv": {
+        "name": "pack_uv"
+      },
+      "part_names": {
+        "name": "part_names"
+      },
+      "pivot_to_center_bottom": {
+        "name": "pivot_to_center_bottom"
+      },
       "quad": {
         "name": "quad"
       },
+      "scale_factor": {
+        "name": "scale_factor"
+      },
       "texture_format": {
         "name": "format_texture"
       },
       "texture_size": {
         "name": "taille_texture"
+      },
+      "with_animation": {
+        "name": "with_animation"
       }
     }
   },
@@ -11360,6 +15849,9 @@
       "face_limit": {
         "name": "limite_faces"
       },
+      "geometry_quality": {
+        "name": "geometry_quality"
+      },
       "image": {
         "name": "image"
       },
@@ -11401,7 +15893,11 @@
         "tooltip": null
       },
       "1": {
-        "name": "id_tâche_modèle",
+        "name": "modèle task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11412,6 +15908,9 @@
       "face_limit": {
         "name": "limite_visage"
       },
+      "geometry_quality": {
+        "name": "geometry_quality"
+      },
       "image": {
         "name": "image"
       },
@@ -11459,7 +15958,11 @@
         "tooltip": null
       },
       "1": {
-        "name": "ID_tâche_modèle",
+        "name": "modèle task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11479,7 +15982,11 @@
         "tooltip": null
       },
       "1": {
-        "name": "ID_tâche_modèle",
+        "name": "modèle task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11496,11 +16003,15 @@
     },
     "outputs": {
       "0": {
-        "name": "fichier_modèle",
+        "name": "retarget task_id",
         "tooltip": null
       },
       "1": {
-        "name": "ID_tâche_redirection",
+        "name": "retarget task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11518,7 +16029,11 @@
         "tooltip": null
       },
       "1": {
-        "name": "ID_tâche_squelettage",
+        "name": "rig task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11529,6 +16044,9 @@
       "face_limit": {
         "name": "limite_visage"
       },
+      "geometry_quality": {
+        "name": "geometry_quality"
+      },
       "image_seed": {
         "name": "graine_image"
       },
@@ -11569,7 +16087,11 @@
         "tooltip": null
       },
       "1": {
-        "name": "modèle id_tâche",
+        "name": "modèle task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11602,8 +16124,31 @@
         "tooltip": null
       },
       "1": {
-        "name": "modèle id_tâche",
+        "name": "modèle task_id",
         "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "TruncateText": {
+    "display_name": "Tronquer le texte",
+    "inputs": {
+      "max_length": {
+        "name": "longueur_maximale",
+        "tooltip": "Longueur maximale du texte."
+      },
+      "texts": {
+        "name": "textes",
+        "tooltip": "Texte à traiter."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "textes",
+        "tooltip": "Textes traités"
       }
     }
   },
@@ -11748,6 +16293,33 @@
       "vae": {
         "name": "vae"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VAEDecodeAudioTiled": {
+    "display_name": "Décoder Audio VAE (par tuiles)",
+    "inputs": {
+      "overlap": {
+        "name": "chevauchement"
+      },
+      "samples": {
+        "name": "échantillons"
+      },
+      "tile_size": {
+        "name": "taille de tuile"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VAEDecodeHunyuan3D": {
@@ -11765,6 +16337,11 @@
       "vae": {
         "name": "vae"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VAEDecodeTiled": {
@@ -11812,6 +16389,11 @@
       "vae": {
         "name": "vae"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VAEEncodeForInpaint": {
@@ -11890,6 +16472,63 @@
       "steps": {
         "name": "étapes"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Veo3FirstLastFrameNode": {
+    "description": "Générer une vidéo à l'aide d'un prompt et des images de début et de fin.",
+    "display_name": "Google Veo 3 Première-Dernière-Image vers Vidéo",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "rapport d'aspect",
+        "tooltip": "Rapport d'aspect de la vidéo générée"
+      },
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "duration": {
+        "name": "durée",
+        "tooltip": "Durée de la vidéo générée en secondes"
+      },
+      "first_frame": {
+        "name": "première image",
+        "tooltip": "Image de début"
+      },
+      "generate_audio": {
+        "name": "générer audio",
+        "tooltip": "Générer l'audio pour la vidéo."
+      },
+      "last_frame": {
+        "name": "dernière image",
+        "tooltip": "Image de fin"
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Prompt négatif pour guider ce qu'il faut éviter dans la vidéo"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Description textuelle de la vidéo"
+      },
+      "resolution": {
+        "name": "résolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed pour la génération de la vidéo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "Veo3VideoGenerationNode": {
@@ -11996,6 +16635,31 @@
       }
     }
   },
+  "Video Slice": {
+    "display_name": "Découpage Vidéo",
+    "inputs": {
+      "duration": {
+        "name": "durée",
+        "tooltip": "Durée en secondes, ou 0 pour une durée illimitée"
+      },
+      "start_time": {
+        "name": "heure_de_début",
+        "tooltip": "Heure de début en secondes"
+      },
+      "strict_duration": {
+        "name": "durée_stricte",
+        "tooltip": "Si vrai, lorsqu’il n’est pas possible de respecter la durée spécifiée, une erreur sera générée."
+      },
+      "video": {
+        "name": "vidéo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "VideoLinearCFGGuidance": {
     "display_name": "Guidance VideoLinearCFG",
     "inputs": {
@@ -12018,6 +16682,319 @@
       }
     }
   },
+  "Vidu2ImageToVideoNode": {
+    "description": "Génère une vidéo à partir d’une image et d’une invite optionnelle.",
+    "display_name": "Génération d’image vers vidéo Vidu2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "duration": {
+        "name": "durée"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "Une image à utiliser comme première image de la vidéo générée."
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "movement_amplitude": {
+        "name": "amplitude du mouvement",
+        "tooltip": "L’amplitude du mouvement des objets dans l’image."
+      },
+      "prompt": {
+        "name": "invite",
+        "tooltip": "Une invite textuelle optionnelle pour la génération vidéo (max 2000 caractères)."
+      },
+      "resolution": {
+        "name": "résolution"
+      },
+      "seed": {
+        "name": "graine"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2ReferenceVideoNode": {
+    "description": "Génère une vidéo à partir de plusieurs images de référence et d’une invite.",
+    "display_name": "Génération de vidéo à partir de références Vidu2",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "rapport d’aspect"
+      },
+      "audio": {
+        "name": "audio",
+        "tooltip": "Si activé, la vidéo contiendra une voix générée et une musique de fond basée sur l’invite."
+      },
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "duration": {
+        "name": "durée"
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "movement_amplitude": {
+        "name": "amplitude du mouvement",
+        "tooltip": "L’amplitude du mouvement des objets dans l’image."
+      },
+      "prompt": {
+        "name": "invite",
+        "tooltip": "Si activé, la vidéo inclura une voix générée et une musique de fond basée sur l’invite."
+      },
+      "resolution": {
+        "name": "résolution"
+      },
+      "seed": {
+        "name": "graine"
+      },
+      "subjects": {
+        "name": "sujets",
+        "tooltip": "Pour chaque sujet, fournissez jusqu’à 3 images de référence (7 images au total pour tous les sujets). Référencez-les dans les invites via @subject{subject_id}."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2StartEndToVideoNode": {
+    "description": "Générez une vidéo à partir d'une image de départ, d'une image de fin et d'une invite.",
+    "display_name": "Génération vidéo Vidu2 à partir d'une image de début/fin",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "duration": {
+        "name": "durée"
+      },
+      "end_frame": {
+        "name": "image de fin"
+      },
+      "first_frame": {
+        "name": "image de début"
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "movement_amplitude": {
+        "name": "amplitude du mouvement",
+        "tooltip": "L'amplitude du mouvement des objets dans l'image."
+      },
+      "prompt": {
+        "name": "invite",
+        "tooltip": "Description de l'invite (2000 caractères maximum)."
+      },
+      "resolution": {
+        "name": "résolution"
+      },
+      "seed": {
+        "name": "graine"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2TextToVideoNode": {
+    "description": "Générez une vidéo à partir d'une invite textuelle",
+    "display_name": "Génération vidéo Vidu2 à partir d'un texte",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "rapport d'aspect"
+      },
+      "background_music": {
+        "name": "musique de fond",
+        "tooltip": "Ajouter ou non une musique de fond à la vidéo générée."
+      },
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "duration": {
+        "name": "durée"
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "prompt": {
+        "name": "invite",
+        "tooltip": "Une description textuelle pour la génération vidéo, longueur maximale de 2000 caractères."
+      },
+      "resolution": {
+        "name": "résolution"
+      },
+      "seed": {
+        "name": "graine"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3ImageToVideoNode": {
+    "description": "Générez une vidéo à partir d’une image et d’une invite optionnelle.",
+    "display_name": "Génération d’image en vidéo Vidu Q3",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "Une image à utiliser comme première image de la vidéo générée."
+      },
+      "model": {
+        "name": "modèle",
+        "tooltip": "Modèle à utiliser pour la génération de vidéo."
+      },
+      "model_audio": {
+        "name": "audio"
+      },
+      "model_duration": {
+        "name": "durée"
+      },
+      "model_resolution": {
+        "name": "résolution"
+      },
+      "prompt": {
+        "name": "invite",
+        "tooltip": "Une invite textuelle optionnelle pour la génération de vidéo (max. 2000 caractères)."
+      },
+      "seed": {
+        "name": "graine"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3StartEndToVideoNode": {
+    "description": "Générez une vidéo à partir d'une image de début, d'une image de fin et d'une invite.",
+    "display_name": "Génération vidéo Vidu Q3 à partir d'une image de début/fin",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "end_frame": {
+        "name": "image de fin"
+      },
+      "first_frame": {
+        "name": "image de début"
+      },
+      "model": {
+        "name": "modèle",
+        "tooltip": "Modèle à utiliser pour la génération vidéo."
+      },
+      "model_audio": {
+        "name": "audio"
+      },
+      "model_duration": {
+        "name": "durée"
+      },
+      "model_resolution": {
+        "name": "résolution"
+      },
+      "prompt": {
+        "name": "invite",
+        "tooltip": "Description de l'invite (2000 caractères max)."
+      },
+      "seed": {
+        "name": "graine"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3TextToVideoNode": {
+    "description": "Générez une vidéo à partir d’une invite textuelle.",
+    "display_name": "Génération de vidéo à partir de texte Vidu Q3",
+    "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 de vidéo."
+      },
+      "model_aspect_ratio": {
+        "name": "rapport d’aspect"
+      },
+      "model_audio": {
+        "name": "audio"
+      },
+      "model_duration": {
+        "name": "durée"
+      },
+      "model_resolution": {
+        "name": "résolution"
+      },
+      "prompt": {
+        "name": "invite",
+        "tooltip": "Description textuelle pour la génération de vidéo, longueur maximale de 2000 caractères."
+      },
+      "seed": {
+        "name": "graine"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ViduExtendVideoNode": {
+    "description": "Prolongez une vidéo existante en générant des images supplémentaires.",
+    "display_name": "Extension de vidéo Vidu",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "end_frame": {
+        "name": "image_finale"
+      },
+      "model": {
+        "name": "modèle",
+        "tooltip": "Modèle à utiliser pour l’extension de la vidéo."
+      },
+      "model_duration": {
+        "name": "durée"
+      },
+      "model_resolution": {
+        "name": "résolution"
+      },
+      "prompt": {
+        "name": "invite",
+        "tooltip": "Une invite textuelle optionnelle pour la vidéo étendue (max. 2000 caractères)."
+      },
+      "seed": {
+        "name": "graine"
+      },
+      "video": {
+        "name": "vidéo",
+        "tooltip": "La vidéo source à prolonger."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ViduImageToVideoNode": {
     "description": "Générer une vidéo à partir d'une image et d'un éventuel prompt",
     "display_name": "Génération vidéo Vidu à partir d'image",
@@ -12060,6 +17037,49 @@
       }
     }
   },
+  "ViduMultiFrameVideoNode": {
+    "description": "Générez une vidéo avec plusieurs transitions d’images clés.",
+    "display_name": "Génération de vidéo multi-images Vidu",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle après génération"
+      },
+      "frames": {
+        "name": "images",
+        "tooltip": "Nombre de transitions d’images clés (2-9)."
+      },
+      "frames_duration1": {
+        "name": "durée1"
+      },
+      "frames_duration2": {
+        "name": "durée2"
+      },
+      "frames_prompt1": {
+        "name": "invite1"
+      },
+      "frames_prompt2": {
+        "name": "invite2"
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "resolution": {
+        "name": "résolution"
+      },
+      "seed": {
+        "name": "graine"
+      },
+      "start_image": {
+        "name": "image_de_départ",
+        "tooltip": "L’image de départ. Le rapport d’aspect doit être compris entre 1:4 et 4:1."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ViduReferenceVideoNode": {
     "description": "Générer une vidéo à partir de plusieurs images et d'un prompt",
     "display_name": "Génération vidéo Vidu à partir de référence",
@@ -12206,6 +17226,11 @@
       "voxel": {
         "name": "voxel"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VoxelToMeshBasic": {
@@ -12217,6 +17242,11 @@
       "voxel": {
         "name": "voxel"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "Wan22FunControlToVideo": {
@@ -12496,6 +17526,10 @@
         "name": "pas de contexte",
         "tooltip": "La progression de la fenêtre contextuelle ; applicable uniquement aux échéanciers uniformes."
       },
+      "freenoise": {
+        "name": "freenoise",
+        "tooltip": "Appliquer ou non le mélange de bruit FreeNoise, améliore la fusion des fenêtres."
+      },
       "fuse_method": {
         "name": "méthode_de_fusion",
         "tooltip": "La méthode à utiliser pour fusionner les fenêtres contextuelles."
@@ -12836,6 +17870,10 @@
         "name": "graine",
         "tooltip": "Graine à utiliser pour la génération."
       },
+      "shot_type": {
+        "name": "type de plan",
+        "tooltip": "Spécifie le type de plan pour la vidéo générée, c'est-à-dire si la vidéo est un plan continu unique ou plusieurs plans avec coupures. Ce paramètre n'est effectif que lorsque prompt_extend est True."
+      },
       "watermark": {
         "name": "filigrane",
         "tooltip": "S'il faut ajouter un filigrane \"Généré par IA\" au résultat."
@@ -12847,6 +17885,196 @@
       }
     }
   },
+  "WanInfiniteTalkToVideo": {
+    "display_name": "WanInfiniteTalkToVideo",
+    "inputs": {
+      "audio_encoder_output_1": {
+        "name": "sortie encodeur audio 1"
+      },
+      "audio_scale": {
+        "name": "échelle audio"
+      },
+      "clip_vision_output": {
+        "name": "sortie vision clip"
+      },
+      "height": {
+        "name": "hauteur"
+      },
+      "length": {
+        "name": "longueur"
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "model_patch": {
+        "name": "correctif du modèle"
+      },
+      "motion_frame_count": {
+        "name": "nombre d’images de mouvement",
+        "tooltip": "Nombre d’images précédentes à utiliser comme contexte de mouvement."
+      },
+      "negative": {
+        "name": "négatif"
+      },
+      "positive": {
+        "name": "positif"
+      },
+      "previous_frames": {
+        "name": "images précédentes"
+      },
+      "start_image": {
+        "name": "image de départ"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largeur"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "modèle",
+        "tooltip": null
+      },
+      "1": {
+        "name": "positif",
+        "tooltip": null
+      },
+      "2": {
+        "name": "négatif",
+        "tooltip": null
+      },
+      "3": {
+        "name": "latent",
+        "tooltip": null
+      },
+      "4": {
+        "name": "image rognée",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveConcatTrack": {
+    "display_name": "WanMoveConcatTrack",
+    "inputs": {
+      "tracks_1": {
+        "name": "pistes_1"
+      },
+      "tracks_2": {
+        "name": "pistes_2"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveTrackToVideo": {
+    "display_name": "WanMoveTrackToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "taille_du_lot"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "hauteur"
+      },
+      "length": {
+        "name": "longueur"
+      },
+      "negative": {
+        "name": "négatif"
+      },
+      "positive": {
+        "name": "positif"
+      },
+      "start_image": {
+        "name": "image_de_départ"
+      },
+      "strength": {
+        "name": "force",
+        "tooltip": "Intensité du conditionnement de la piste."
+      },
+      "tracks": {
+        "name": "pistes"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largeur"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positif",
+        "tooltip": null
+      },
+      "1": {
+        "name": "négatif",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveTracksFromCoords": {
+    "display_name": "WanMoveTracksFromCoords",
+    "inputs": {
+      "track_coords": {
+        "name": "coordonnées_piste"
+      },
+      "track_mask": {
+        "name": "masque_piste"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "longueur_piste",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveVisualizeTracks": {
+    "display_name": "WanMoveVisualizeTracks",
+    "inputs": {
+      "circle_size": {
+        "name": "taille_du_cercle"
+      },
+      "images": {
+        "name": "images"
+      },
+      "line_resolution": {
+        "name": "résolution_de_ligne"
+      },
+      "line_width": {
+        "name": "largeur_de_ligne"
+      },
+      "opacity": {
+        "name": "opacité"
+      },
+      "tracks": {
+        "name": "pistes"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "WanPhantomSubjectToVideo": {
     "display_name": "WanPhantomSubjectToVideo",
     "inputs": {
@@ -12894,6 +18122,113 @@
       }
     }
   },
+  "WanReferenceVideoApi": {
+    "description": "Utilisez le personnage et la voix des vidéos d'entrée, combinés à une invite, pour générer une nouvelle vidéo qui maintient la cohérence du personnage.",
+    "display_name": "Wan Reference to Video",
+    "inputs": {
+      "control_after_generate": {
+        "name": "contrôle_après_génération"
+      },
+      "duration": {
+        "name": "durée"
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "negative_prompt": {
+        "name": "invite_négative",
+        "tooltip": "Invite négative décrivant ce qu'il faut éviter."
+      },
+      "prompt": {
+        "name": "invite",
+        "tooltip": "Invite décrivant les éléments et les caractéristiques visuelles. Prend en charge l'anglais et le chinois. Utilisez des identifiants tels que `character1` et `character2` pour faire référence aux personnages de référence."
+      },
+      "reference_videos": {
+        "name": "vidéos_de_référence"
+      },
+      "seed": {
+        "name": "graine"
+      },
+      "shot_type": {
+        "name": "type_de_plan",
+        "tooltip": "Spécifie le type de plan pour la vidéo générée, c'est-à-dire si la vidéo est un plan continu unique ou plusieurs plans avec coupures."
+      },
+      "size": {
+        "name": "taille"
+      },
+      "watermark": {
+        "name": "filigrane",
+        "tooltip": "Indique s'il faut ajouter un filigrane généré par l'IA au résultat."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanSCAILToVideo": {
+    "display_name": "WanSCAILToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "taille_du_lot"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "hauteur"
+      },
+      "length": {
+        "name": "longueur"
+      },
+      "negative": {
+        "name": "négatif"
+      },
+      "pose_end": {
+        "name": "fin_de_pose",
+        "tooltip": "Étape de fin pour utiliser le conditionnement de pose."
+      },
+      "pose_start": {
+        "name": "début_de_pose",
+        "tooltip": "Étape de début pour utiliser le conditionnement de pose."
+      },
+      "pose_strength": {
+        "name": "force_de_pose",
+        "tooltip": "Force du latent de pose."
+      },
+      "pose_video": {
+        "name": "vidéo_de_pose",
+        "tooltip": "Vidéo utilisée pour le conditionnement de pose. Sera réduite à la moitié de la résolution de la vidéo principale."
+      },
+      "positive": {
+        "name": "positif"
+      },
+      "reference_image": {
+        "name": "image_de_référence"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largeur"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positif",
+        "tooltip": null
+      },
+      "1": {
+        "name": "négatif",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": "Latent vide de la taille de génération."
+      }
+    }
+  },
   "WanSoundImageToVideo": {
     "display_name": "WanSoundImageToVideo",
     "inputs": {
@@ -13072,6 +18407,10 @@
         "name": "seed",
         "tooltip": "Graine à utiliser pour la génération."
       },
+      "shot_type": {
+        "name": "type_de_plan",
+        "tooltip": "Spécifie le type de plan pour la vidéo générée, c'est-à-dire si la vidéo est un plan continu unique ou plusieurs plans avec coupures. Ce paramètre prend effet uniquement lorsque prompt_extend est True."
+      },
       "size": {
         "name": "taille"
       },
@@ -13197,6 +18536,43 @@
       }
     }
   },
+  "WavespeedFlashVSRNode": {
+    "description": "Upscaler vidéo rapide et de haute qualité qui augmente la résolution et restaure la clarté des séquences basse résolution ou floues.",
+    "display_name": "FlashVSR Upscale Vidéo",
+    "inputs": {
+      "target_resolution": {
+        "name": "résolution cible"
+      },
+      "video": {
+        "name": "vidéo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WavespeedImageUpscaleNode": {
+    "description": "Augmentez la résolution et la qualité de l'image, en upscalant les photos en 4K ou 8K pour des résultats nets et détaillés.",
+    "display_name": "WaveSpeed Upscale Image",
+    "inputs": {
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "target_resolution": {
+        "name": "résolution cible"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "WebcamCapture": {
     "display_name": "Capture Webcam",
     "inputs": {
@@ -13209,13 +18585,38 @@
       "image": {
         "name": "image"
       },
-      "waiting for camera___": {
-      },
+      "waiting for camera___": {},
       "width": {
         "name": "largeur"
       }
     }
   },
+  "ZImageFunControlnet": {
+    "display_name": "ZImageFunControlnet",
+    "inputs": {
+      "image": {
+        "name": "image"
+      },
+      "inpaint_image": {
+        "name": "image_de_repeinture"
+      },
+      "mask": {
+        "name": "mask"
+      },
+      "model": {
+        "name": "modèle"
+      },
+      "model_patch": {
+        "name": "modèle_patch"
+      },
+      "strength": {
+        "name": "force"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
   "unCLIPCheckpointLoader": {
     "display_name": "ChargeurPointContrôleunCLIP",
     "inputs": {
@@ -13240,5 +18641,19 @@
         "name": "force"
       }
     }
+  },
+  "wanBlockSwap": {
+    "description": "NOP",
+    "display_name": "wanBlockSwap",
+    "inputs": {
+      "model": {
+        "name": "modèle"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
   }
 }
diff --git a/src/locales/fr/settings.json b/src/locales/fr/settings.json
index aaa9734730..2e8a394a34 100644
--- a/src/locales/fr/settings.json
+++ b/src/locales/fr/settings.json
@@ -52,7 +52,8 @@
     }
   },
   "Comfy_Canvas_SelectionToolbox": {
-    "name": "Afficher la boîte à outils de sélection"
+    "name": "Afficher la boîte à outils de sélection",
+    "tooltip": "Affiche une barre d’outils flottante lorsque des nœuds sont sélectionnés, offrant un accès rapide aux actions courantes."
   },
   "Comfy_ConfirmClear": {
     "name": "Demander une confirmation lors de l'effacement du flux de travail"
@@ -79,6 +80,17 @@
   "Comfy_EnableWorkflowViewRestore": {
     "name": "Sauvegarder et restaurer la position et le niveau de zoom du canevas dans les flux de travail"
   },
+  "Comfy_Execution_PreviewMethod": {
+    "name": "Méthode d’aperçu en direct",
+    "options": {
+      "auto": "auto",
+      "default": "default",
+      "latent2rgb": "latent2rgb",
+      "none": "aucun",
+      "taesd": "taesd"
+    },
+    "tooltip": "Méthode d’aperçu en direct pendant la génération d’image. « default » utilise le paramètre CLI du serveur."
+  },
   "Comfy_FloatRoundingPrecision": {
     "name": "Nombre de décimales pour l'arrondi du widget flottant [0 = auto].",
     "tooltip": "(nécessite le rechargement de la page)"
@@ -92,6 +104,10 @@
   "Comfy_Graph_CtrlShiftZoom": {
     "name": "Activer le raccourci de zoom rapide (Ctrl + Shift + Glisser)"
   },
+  "Comfy_Graph_DeduplicateSubgraphNodeIds": {
+    "name": "Dédupliquer les identifiants de nœuds de sous-graphe",
+    "tooltip": "Réattribue automatiquement les identifiants de nœuds dupliqués dans les sous-graphes lors du chargement d’un flux de travail."
+  },
   "Comfy_Graph_LinkMarkers": {
     "name": "Marqueurs de point médian du lien",
     "options": {
@@ -100,6 +116,10 @@
       "None": "Aucun"
     }
   },
+  "Comfy_Graph_LiveSelection": {
+    "name": "Sélection en direct",
+    "tooltip": "Lorsqu’elle est activée, les nœuds sont sélectionnés/désélectionnés en temps réel pendant que vous faites glisser le rectangle de sélection, comme dans d’autres outils de conception."
+  },
   "Comfy_Graph_ZoomSpeed": {
     "name": "Vitesse de zoom du canevas"
   },
@@ -132,7 +152,8 @@
       "Linear": "Linéaire",
       "Spline": "Spline",
       "Straight": "Droit"
-    }
+    },
+    "tooltip": "Contrôle l’apparence et la visibilité des liens de connexion entre les nœuds sur le canevas."
   },
   "Comfy_Load3D_3DViewerEnable": {
     "name": "Activer le visualiseur 3D (Bêta)",
@@ -140,35 +161,44 @@
   },
   "Comfy_Load3D_BackgroundColor": {
     "name": "Couleur de fond initiale",
-    "tooltip": "Contrôle la couleur de fond par défaut de la scène 3D. Ce paramètre détermine l'apparence du fond lors de la création d'un nouveau widget 3D, mais peut être ajusté individuellement pour chaque widget après la création."
+    "tooltip": "Contrôle la couleur de fond par défaut de la scène 3D. Ce paramètre détermine l’apparence du fond lors de la création d’un nouveau widget 3D, mais peut être ajusté individuellement pour chaque widget après la création."
   },
   "Comfy_Load3D_CameraType": {
-    "name": "Type de Caméra",
+    "name": "Type de caméra initial",
     "options": {
       "orthographic": "orthographique",
       "perspective": "perspective"
     },
-    "tooltip": "Contrôle si la caméra est en perspective ou orthographique par défaut lorsqu'un nouveau widget 3D est créé. Ce défaut peut toujours être basculé individuellement pour chaque widget après sa création."
+    "tooltip": "Définit si la caméra est en perspective ou orthographique par défaut lors de la création d’un nouveau widget 3D. Ce paramètre peut toujours être modifié individuellement pour chaque widget après la création."
   },
   "Comfy_Load3D_LightAdjustmentIncrement": {
-    "name": "Incrément d'ajustement de la lumière",
-    "tooltip": "Contrôle la taille de l'incrément lors de l'ajustement de l'intensité lumineuse dans les scènes 3D. Une valeur de pas plus petite permet un contrôle plus précis des ajustements de lumière, tandis qu'une valeur plus grande entraîne des changements plus visibles à chaque ajustement."
+    "name": "Incrément d’ajustement de la lumière",
+    "tooltip": "Contrôle la taille de l’incrément lors de l’ajustement de l’intensité lumineuse dans les scènes 3D. Une valeur de pas plus petite permet un réglage plus précis de la lumière, tandis qu’une valeur plus grande entraîne des changements plus marqués à chaque ajustement."
   },
   "Comfy_Load3D_LightIntensity": {
     "name": "Intensité lumineuse initiale",
-    "tooltip": "Définit le niveau de luminosité par défaut de l’éclairage dans la scène 3D. Cette valeur détermine l’intensité avec laquelle les lumières illuminent les objets lors de la création d’un nouveau widget 3D, mais peut être ajustée individuellement pour chaque widget après la création."
+    "tooltip": "Définit le niveau de luminosité par défaut de l’éclairage dans la scène 3D. Cette valeur détermine l’intensité avec laquelle les lumières éclairent les objets lors de la création d’un nouveau widget 3D, mais peut être ajustée individuellement pour chaque widget après la création."
   },
   "Comfy_Load3D_LightIntensityMaximum": {
     "name": "Intensité lumineuse maximale",
-    "tooltip": "Définit la valeur maximale autorisée pour l’intensité lumineuse dans les scènes 3D. Cela fixe la limite supérieure de luminosité pouvant être réglée lors de l’ajustement de l’éclairage dans tout widget 3D."
+    "tooltip": "Définit la valeur maximale autorisée pour l’intensité lumineuse dans les scènes 3D. Cela définit la limite supérieure de luminosité pouvant être appliquée lors de l’ajustement de l’éclairage dans n’importe quel widget 3D."
   },
   "Comfy_Load3D_LightIntensityMinimum": {
     "name": "Intensité lumineuse minimale",
-    "tooltip": "Définit la valeur minimale autorisée de l’intensité lumineuse pour les scènes 3D. Cela définit la limite inférieure de luminosité pouvant être réglée lors de l’ajustement de l’éclairage dans tout widget 3D."
+    "tooltip": "Définit la valeur minimale autorisée pour l’intensité lumineuse dans les scènes 3D. Cela définit la limite inférieure de luminosité pouvant être appliquée lors de l’ajustement de l’éclairage dans n’importe quel widget 3D."
+  },
+  "Comfy_Load3D_PLYEngine": {
+    "name": "Moteur PLY",
+    "options": {
+      "fastply": "fastply",
+      "sparkjs": "sparkjs",
+      "threejs": "threejs"
+    },
+    "tooltip": "Sélectionnez le moteur pour charger les fichiers PLY. « threejs » utilise le PLYLoader natif de Three.js (idéal pour les fichiers PLY de maillage). « fastply » utilise un chargeur optimisé pour les fichiers PLY de nuages de points ASCII. « sparkjs » utilise Spark.js pour les fichiers PLY de Gaussian Splatting 3D."
   },
   "Comfy_Load3D_ShowGrid": {
-    "name": "Afficher la Grille",
-    "tooltip": "Basculer pour afficher la grille par défaut"
+    "name": "Visibilité initiale de la grille",
+    "tooltip": "Contrôle si la grille est visible par défaut lors de la création d’un nouveau widget 3D. Ce paramètre peut toujours être modifié individuellement pour chaque widget après la création."
   },
   "Comfy_Locale": {
     "name": "Langue"
@@ -218,11 +248,20 @@
   "Comfy_NodeBadge_ShowApiPricing": {
     "name": "Afficher l’insigne de tarification API du nœud"
   },
+  "Comfy_NodeLibrary_NewDesign": {
+    "name": "Nouveau design de la bibliothèque de nœuds",
+    "tooltip": "Activez la nouvelle barre latérale de la bibliothèque de nœuds avec des onglets (Essentiel, Tous, Personnalisé), une recherche améliorée et des aperçus au survol."
+  },
+  "Comfy_NodeReplacement_Enabled": {
+    "name": "Activer le remplacement automatique des nœuds",
+    "tooltip": "Lorsqu'activé, les nœuds manquants peuvent être automatiquement remplacés par leurs équivalents plus récents si une correspondance de remplacement existe."
+  },
   "Comfy_NodeSearchBoxImpl": {
     "name": "Implémentation de la boîte de recherche de nœud",
     "options": {
       "default": "par défaut",
-      "litegraph (legacy)": "litegraph (héritage)"
+      "litegraph (legacy)": "litegraph (héritage)",
+      "v1 (legacy)": "v1 (héritage)"
     }
   },
   "Comfy_NodeSearchBoxImpl_NodePreview": {
@@ -248,6 +287,10 @@
   "Comfy_Node_AllowImageSizeDraw": {
     "name": "Afficher la largeur × la hauteur sous l'aperçu de l'image"
   },
+  "Comfy_Node_AlwaysShowAdvancedWidgets": {
+    "name": "Toujours afficher les widgets avancés sur tous les nœuds",
+    "tooltip": "Lorsque cette option est activée, les widgets avancés sont toujours visibles sur tous les nœuds sans avoir besoin de les développer individuellement."
+  },
   "Comfy_Node_AutoSnapLinkToSlot": {
     "name": "Lien d'ancrage automatique à l'emplacement du nœud",
     "tooltip": "Lorsque vous faites glisser un lien sur un nœud, le lien se fixe automatiquement à une fente d'entrée viable sur le nœud"
@@ -308,6 +351,14 @@
     "name": "Taille de l'historique de la file d'attente",
     "tooltip": "Le nombre maximum de tâches qui s'affichent dans l'historique de la file d'attente."
   },
+  "Comfy_Queue_QPOV2": {
+    "name": "Utiliser la file d’attente unifiée dans le panneau latéral des ressources",
+    "tooltip": "Remplace le panneau flottant de la file d’attente des tâches par une file d’attente équivalente intégrée dans le panneau latéral des ressources. Vous pouvez désactiver cette option pour revenir à la disposition du panneau flottant."
+  },
+  "Comfy_RightSidePanel_ShowErrorsTab": {
+    "name": "Afficher l’onglet des erreurs dans le panneau latéral",
+    "tooltip": "Lorsque cette option est activée, un onglet des erreurs s’affiche dans le panneau latéral droit pour visualiser rapidement les erreurs d’exécution du workflow."
+  },
   "Comfy_Sidebar_Location": {
     "name": "Emplacement de la barre latérale",
     "options": {
@@ -345,6 +396,14 @@
   "Comfy_TreeExplorer_ItemPadding": {
     "name": "Espacement des éléments de l'explorateur d'arborescence"
   },
+  "Comfy_UI_TabBarLayout": {
+    "name": "Disposition de la barre d’onglets",
+    "options": {
+      "Default": "Par défaut",
+      "Integrated": "Intégrée"
+    },
+    "tooltip": "Contrôle la disposition de la barre d’onglets. « Intégrée » déplace les contrôles Aide et Utilisateur dans la zone de la barre d’onglets."
+  },
   "Comfy_UseNewMenu": {
     "name": "Utiliser le nouveau menu",
     "options": {
@@ -434,6 +493,7 @@
     "tooltip": "Le point de contrôle de Bézier est décalé par rapport au point central de réacheminement"
   },
   "pysssss_SnapToGrid": {
-    "name": "Toujours aligner sur la grille"
+    "name": "Toujours aligner sur la grille",
+    "tooltip": "Lorsque cette option est activée, les nœuds s’alignent automatiquement sur la grille lors de leur déplacement ou redimensionnement."
   }
 }
diff --git a/src/locales/ja/commands.json b/src/locales/ja/commands.json
index 243b2d9442..5204e7bc7e 100644
--- a/src/locales/ja/commands.json
+++ b/src/locales/ja/commands.json
@@ -1,4 +1,40 @@
 {
+  "Comfy-Desktop_CheckForUpdates": {
+    "label": "アップデートを確認"
+  },
+  "Comfy-Desktop_Folders_OpenCustomNodesFolder": {
+    "label": "カスタムノードフォルダーを開く"
+  },
+  "Comfy-Desktop_Folders_OpenInputsFolder": {
+    "label": "入力フォルダーを開く"
+  },
+  "Comfy-Desktop_Folders_OpenLogsFolder": {
+    "label": "ログフォルダーを開く"
+  },
+  "Comfy-Desktop_Folders_OpenModelConfig": {
+    "label": "extra_model_paths.yaml を開く"
+  },
+  "Comfy-Desktop_Folders_OpenModelsFolder": {
+    "label": "モデルフォルダーを開く"
+  },
+  "Comfy-Desktop_Folders_OpenOutputsFolder": {
+    "label": "出力フォルダーを開く"
+  },
+  "Comfy-Desktop_OpenDevTools": {
+    "label": "開発者ツールを開く"
+  },
+  "Comfy-Desktop_OpenUserGuide": {
+    "label": "デスクトップユーザーガイド"
+  },
+  "Comfy-Desktop_Quit": {
+    "label": "終了"
+  },
+  "Comfy-Desktop_Reinstall": {
+    "label": "再インストール"
+  },
+  "Comfy-Desktop_Restart": {
+    "label": "再起動"
+  },
   "Comfy_3DViewer_Open3DViewer": {
     "label": "選択したノードの3Dビューアー（ベータ）を開く"
   },
@@ -8,6 +44,9 @@
   "Comfy_BrowseTemplates": {
     "label": "テンプレートを参照"
   },
+  "Comfy_Canvas_CopySelected": {
+    "label": "コピー"
+  },
   "Comfy_Canvas_DeleteSelectedItems": {
     "label": "選択したアイテムを削除"
   },
@@ -29,12 +68,18 @@
   "Comfy_Canvas_MoveSelectedNodes_Up": {
     "label": "選択したノードを上に移動"
   },
+  "Comfy_Canvas_PasteFromClipboard": {
+    "label": "貼り付け"
+  },
   "Comfy_Canvas_ResetView": {
     "label": "ビューをリセット"
   },
   "Comfy_Canvas_Resize": {
     "label": "選択したノードのサイズ変更"
   },
+  "Comfy_Canvas_SelectAll": {
+    "label": "すべて選択"
+  },
   "Comfy_Canvas_ToggleLinkVisibility": {
     "label": "キャンバスのリンク表示を切り替える"
   },
@@ -155,18 +200,30 @@
   "Comfy_Manager_ShowUpdateAvailablePacks": {
     "label": "更新を確認"
   },
-  "Comfy_Manager_ToggleManagerProgressDialog": {
-    "label": "プログレスダイアログの切り替え"
-  },
   "Comfy_MaskEditor_BrushSize_Decrease": {
     "label": "マスクエディタでブラシサイズを縮小"
   },
   "Comfy_MaskEditor_BrushSize_Increase": {
     "label": "マスクエディタでブラシサイズを大きくする"
   },
+  "Comfy_MaskEditor_ColorPicker": {
+    "label": "MaskEditorでカラーピッカーを開く"
+  },
+  "Comfy_MaskEditor_Mirror_Horizontal": {
+    "label": "マスクエディタで左右反転"
+  },
+  "Comfy_MaskEditor_Mirror_Vertical": {
+    "label": "マスクエディタで上下反転"
+  },
   "Comfy_MaskEditor_OpenMaskEditor": {
     "label": "選択したノードのマスクエディタを開く"
   },
+  "Comfy_MaskEditor_Rotate_Left": {
+    "label": "マスクエディタで左回転"
+  },
+  "Comfy_MaskEditor_Rotate_Right": {
+    "label": "マスクエディタで右回転"
+  },
   "Comfy_Memory_UnloadModels": {
     "label": "モデルのアンロード"
   },
@@ -197,12 +254,18 @@
   "Comfy_QueueSelectedOutputNodes": {
     "label": "選択した出力ノードをキューに追加"
   },
+  "Comfy_Queue_ToggleOverlay": {
+    "label": "ジョブ履歴を切り替え"
+  },
   "Comfy_Redo": {
     "label": "やり直す"
   },
   "Comfy_RefreshNodeDefinitions": {
     "label": "ノード定義を更新"
   },
+  "Comfy_RenameWorkflow": {
+    "label": "ワークフローの名前を変更"
+  },
   "Comfy_SaveWorkflow": {
     "label": "ワークフローを保存する"
   },
@@ -212,6 +275,12 @@
   "Comfy_ShowSettingsDialog": {
     "label": "設定ダイアログを表示"
   },
+  "Comfy_Subgraph_SetDescription": {
+    "label": "サブグラフの説明を設定"
+  },
+  "Comfy_Subgraph_SetSearchAliases": {
+    "label": "サブグラフの検索エイリアスを設定"
+  },
   "Comfy_ToggleAssetAPI": {
     "label": "実験的: AssetAPIを有効化"
   },
@@ -221,6 +290,12 @@
   "Comfy_ToggleHelpCenter": {
     "label": "ヘルプセンター"
   },
+  "Comfy_ToggleLinear": {
+    "label": "リニアモードを切り替え"
+  },
+  "Comfy_ToggleQPOV2": {
+    "label": "Queue Panel V2 を切り替え"
+  },
   "Comfy_ToggleTheme": {
     "label": "テーマの切り替え（ダーク/ライト）"
   },
@@ -252,10 +327,10 @@
     "label": "パネル下部の切り替え"
   },
   "Workspace_ToggleBottomPanelTab_command-terminal": {
-    "label": "ターミナルパネル下部の切り替え"
+    "label": "ターミナル下部パネルを切り替え"
   },
   "Workspace_ToggleBottomPanelTab_logs-terminal": {
-    "label": "ログパネル下部の切り替え"
+    "label": "ログ下部パネルを切り替え"
   },
   "Workspace_ToggleBottomPanelTab_shortcuts-essentials": {
     "label": "必須な下部パネルを切り替え"
@@ -269,6 +344,10 @@
   "Workspace_ToggleFocusMode": {
     "label": "フォーカスモードの切り替え"
   },
+  "Workspace_ToggleSidebarTab_apps": {
+    "label": "アプリサイドバーを切り替え",
+    "tooltip": "アプリ"
+  },
   "Workspace_ToggleSidebarTab_assets": {
     "label": "アセットサイドバーの表示切り替え",
     "tooltip": "アセット"
diff --git a/src/locales/ja/main.json b/src/locales/ja/main.json
index 4e326369bc..77bdb1dd66 100644
--- a/src/locales/ja/main.json
+++ b/src/locales/ja/main.json
@@ -1,6 +1,8 @@
 {
   "actionbar": {
-    "dockToTop": "上部にドッキング"
+    "dockToTop": "上部にドッキング",
+    "feedback": "フィードバック",
+    "feedbackTooltip": "フィードバック"
   },
   "apiNodesCostBreakdown": {
     "costPerRun": "実行あたりのコスト",
@@ -14,26 +16,175 @@
   "assetBrowser": {
     "allCategory": "すべての{category}",
     "allModels": "すべてのモデル",
+    "apiKeyHint": "プライベートまたは制限付きモデルをインポートしますか？{link}。",
+    "apiKeyHintLink": "設定でAPIキーを追加",
     "ariaLabel": {
       "assetCard": "{name} - {type} アセット",
       "loadingAsset": "アセットを読み込み中"
     },
+    "assetCollection": "アセットコレクション",
     "assets": "アセット",
+    "baseModel": "ベースモデル",
     "baseModels": "ベースモデル",
     "browseAssets": "アセットを閲覧",
+    "byType": "タイプ別",
+    "checkpoints": "チェックポイント",
+    "civitaiLinkExample": "{example} {link}",
+    "civitaiLinkExampleStrong": "例：",
+    "civitaiLinkExampleUrl": "https://civitai.com/models/10706/luisap-z-image-and-qwen-pixel-art-refiner?modelVersionId=2225295",
+    "civitaiLinkLabel": "Civitaiモデル{download}リンク",
+    "civitaiLinkLabelDownload": "ダウンロード",
+    "civitaiLinkPlaceholder": "ここにリンクを貼り付けてください",
+    "confirmModelDetails": "モデル詳細を確認",
     "connectionError": "接続を確認して再試行してください",
+    "deletion": {
+      "body": "このモデルはライブラリから完全に削除されます。",
+      "complete": "{assetName}が削除されました。",
+      "failed": "{assetName}を削除できませんでした。",
+      "header": "このモデルを削除しますか？",
+      "inProgress": "{assetName}を削除中..."
+    },
+    "download": {
+      "complete": "ダウンロード完了",
+      "failed": "ダウンロードに失敗しました",
+      "inProgress": "{assetName}をダウンロード中..."
+    },
+    "emptyImported": {
+      "canImport": "まだインポートされたモデルはありません。「モデルをインポート」をクリックして追加してください。",
+      "restricted": "パーソナルモデルはCreator以上のプランでのみ利用可能です。"
+    },
+    "errorAccessForbidden": "このリソースへのアクセスは許可されていません。",
+    "errorConnectionRefused": "ソースに接続できません。後でもう一度お試しください。",
+    "errorDownloadCancelled": "ダウンロードがキャンセルされました。",
+    "errorFileTooLarge": "ファイルが許可された最大サイズを超えています",
+    "errorFormatNotAllowed": "SafeTensor形式のみ許可されています",
+    "errorHttpError": "メタデータの取得中にエラーが発生しました。",
+    "errorInternalError": "予期しないエラーが発生しました。もう一度お試しください。",
+    "errorInvalidHost": "ソースURLのホスト名を解決できませんでした。",
+    "errorInvalidUrl": "URLを入力してください。",
+    "errorInvalidUrlFormat": "URLの形式が無効です。ご確認の上、再度お試しください。",
+    "errorMetadataFetchFailed": "ソースからファイル情報の取得に失敗しました。",
+    "errorModelTypeNotSupported": "このモデルタイプはサポートされていません",
+    "errorNetworkError": "ネットワークエラーが発生しました。接続を確認して再度お試しください。",
+    "errorNetworkTimeout": "リクエストがタイムアウトしました。もう一度お試しください。",
+    "errorRateLimited": "リクエストが多すぎます。数分後に再度お試しください。",
+    "errorRequestCancelled": "リクエストがキャンセルされました。",
+    "errorResourceNotFound": "ファイルが見つかりません。URLを確認して再度お試しください。",
+    "errorServiceUnavailable": "サービスは一時的に利用できません。後でもう一度お試しください。",
+    "errorSourceServerError": "ソースサーバーに問題が発生しています。後でもう一度お試しください。",
+    "errorUnauthorized": "続行するにはサインインしてください。",
+    "errorUnauthorizedSource": "このリソースには認証が必要です。設定でAPIトークンを追加してください。",
+    "errorUnknown": "予期しないエラーが発生しました",
+    "errorUnsafePickleScan": "CivitAIがこのファイルに潜在的な危険なコードを検出しました",
+    "errorUnsafeVirusScan": "CivitAIがこのファイルにマルウェアまたは疑わしい内容を検出しました",
+    "errorUnsupportedSource": "このURLはサポートされていません。Hugging FaceとCivitaiのURLのみ使用できます。",
+    "errorUploadFailed": "アセットのインポートに失敗しました。もう一度お試しください。",
+    "errorUserTokenAccessDenied": "お使いのAPIトークンにはこのリソースへのアクセス権がありません。トークンの権限を確認してください。",
+    "errorUserTokenInvalid": "保存されているAPIトークンが無効または期限切れです。設定でトークンを更新してください。",
     "failedToCreateNode": "ノードの作成に失敗しました。再試行するか、詳細はコンソールをご確認ください。",
     "fileFormats": "ファイル形式",
+    "fileName": "ファイル名",
+    "fileSize": "ファイルサイズ",
+    "filterBy": "フィルター",
+    "findInLibrary": "モデルライブラリの{type}セクションで見つけることができます。",
+    "finish": "完了",
+    "genericLinkPlaceholder": "ここにリンクを貼り付けてください",
+    "importAnother": "別のファイルをインポート",
+    "imported": "インポート済み",
+    "invalidAsset": "無効なアセット",
+    "invalidAssetDetail": "選択したアセットを検証できませんでした。もう一度お試しください。",
+    "invalidFilename": "無効なファイル名",
+    "invalidFilenameDetail": "アセットのファイル名を特定できませんでした。もう一度お試しください。",
+    "jobId": "ジョブID",
     "loadingModels": "{type}を読み込み中...",
+    "maxFileSize": "最大ファイルサイズ：{size}",
+    "maxFileSizeValue": "1 GB",
+    "media": {
+      "audioPlaceholder": "オーディオ",
+      "threeDModelPlaceholder": "3Dモデル"
+    },
+    "modelAssociatedWithLink": "ご提供いただいたリンクに関連付けられているモデル：",
+    "modelInfo": {
+      "addBaseModel": "ベースモデルを追加...",
+      "addTag": "タグを追加...",
+      "additionalTags": "追加タグ",
+      "baseModelUnknown": "ベースモデル不明",
+      "basicInfo": "基本情報",
+      "compatibleBaseModels": "互換性のあるベースモデル",
+      "description": "説明",
+      "descriptionNotSet": "説明が設定されていません",
+      "descriptionPlaceholder": "このモデルの説明を追加...",
+      "displayName": "表示名",
+      "editDisplayName": "表示名を編集",
+      "fileName": "ファイル名",
+      "modelDescription": "モデル説明",
+      "modelTagging": "モデルタグ付け",
+      "modelType": "モデルタイプ",
+      "noAdditionalTags": "追加タグなし",
+      "selectModelPrompt": "モデルを選択して情報を表示してください",
+      "selectModelType": "モデルタイプを選択...",
+      "source": "ソース",
+      "title": "モデル情報",
+      "triggerPhrases": "トリガーフレーズ",
+      "viewOnSource": "{source} で表示"
+    },
+    "modelName": "モデル名",
+    "modelNamePlaceholder": "このモデルの名前を入力してください",
+    "modelTypeSelectorLabel": "モデルの種類は何ですか？",
+    "modelTypeSelectorPlaceholder": "モデルタイプを選択",
+    "modelUploaded": "モデルが正常にインポートされました。",
     "noAssetsFound": "アセットが見つかりません",
     "noModelsInFolder": "このフォルダには{type}がありません",
+    "noResultsCanImport": "検索やフィルターを調整してみてください。\nまた、上の「インポート」ボタンからモデルを追加することもできます。",
+    "noValidSourceDetected": "有効なインポート元が検出されませんでした",
+    "notSureLeaveAsIs": "分からない場合はそのままにしてください",
+    "onlyCivitaiUrlsSupported": "CivitaiのURLのみサポートされています",
+    "ownership": "所有権",
+    "ownershipAll": "すべて",
+    "ownershipMyModels": "自分のモデル",
+    "ownershipPublicModels": "公開モデル",
+    "processingModel": "ダウンロード開始",
+    "processingModelDescription": "このダイアログを閉じてもダウンロードはバックグラウンドで続行されます。",
+    "providerCivitai": "Civitai",
+    "providerHuggingFace": "Hugging Face",
+    "rename": {
+      "failed": "アセットの名前を変更できませんでした。"
+    },
+    "selectFrameworks": "フレームワークを選択",
+    "selectModelType": "モデルタイプを選択",
+    "selectProjects": "プロジェクトを選択",
     "sortAZ": "A-Z",
     "sortBy": "並び替え",
+    "sortDefault": "デフォルト",
     "sortPopular": "人気",
     "sortRecent": "最新",
     "sortZA": "Z-A",
+    "sortingType": "並び替えタイプ",
+    "tags": "タグ",
+    "tagsHelp": "タグはカンマで区切ってください",
+    "tagsPlaceholder": "例：models, checkpoint",
     "tryAdjustingFilters": "検索やフィルターを調整してみてください",
-    "unknown": "不明"
+    "unknown": "不明",
+    "unsupportedUrlSource": "{sources}からのURLのみサポートされています",
+    "upgradeFeatureDescription": "この機能はCreatorまたはProプランでのみご利用いただけます。",
+    "upgradeToUnlockFeature": "アップグレードしてこの機能を利用する",
+    "upload": "インポート",
+    "uploadFailed": "インポートに失敗しました",
+    "uploadModel": "インポート",
+    "uploadModelDescription1": "Civitaiモデルのダウンロードリンクを貼り付けてライブラリに追加してください。",
+    "uploadModelDescription1Generic": "モデルのダウンロードリンクを貼り付けてライブラリに追加してください。",
+    "uploadModelDescription2": "現在サポートされているのは{link}からのリンクのみです",
+    "uploadModelDescription2Generic": "現在サポートされているプロバイダーのURLのみ利用可能です：",
+    "uploadModelDescription2Link": "https://civitai.com/models",
+    "uploadModelDescription3": "最大ファイルサイズ：{size}",
+    "uploadModelFailedToRetrieveMetadata": "メタデータの取得に失敗しました。リンクを確認して再度お試しください。",
+    "uploadModelFromCivitai": "Civitaiからモデルをインポート",
+    "uploadModelGeneric": "モデルをインポート",
+    "uploadModelHelpFooterText": "URLの探し方が分からない場合は、下記のプロバイダーをクリックして説明動画をご覧ください。",
+    "uploadModelHelpVideo": "モデルアップロードヘルプ動画",
+    "uploadModelHowDoIFindThis": "どこで見つけられますか？",
+    "uploadSuccess": "モデルが正常にインポートされました！",
+    "uploadingModel": "モデルをインポート中..."
   },
   "auth": {
     "apiKey": {
@@ -55,13 +206,7 @@
       "whitelistInfo": "ホワイトリストに登録されていないサイトについて"
     },
     "deleteAccount": {
-      "cancel": "キャンセル",
-      "confirm": "アカウントを削除",
-      "confirmMessage": "本当にアカウントを削除しますか？この操作は元に戻せず、すべてのデータが完全に削除されます。",
-      "confirmTitle": "アカウントを削除",
-      "deleteAccount": "アカウントを削除",
-      "success": "アカウントが削除されました",
-      "successDetail": "アカウントは正常に削除されました。"
+      "contactSupport": "アカウントを削除するには、{email} までご連絡ください"
     },
     "errors": {
       "auth/cancelled-popup-request": "サインインがキャンセルされました。もう一度お試しください。",
@@ -80,6 +225,7 @@
     "login": {
       "andText": "および",
       "backToLogin": "ログインに戻る",
+      "backToSocialLogin": "GoogleまたはGithubでサインアップする",
       "confirmPasswordLabel": "パスワードの確認",
       "confirmPasswordPlaceholder": "もう一度同じパスワードを入力してください",
       "didntReceiveEmail": "メールが届きませんか？こちらまでご連絡ください：",
@@ -88,6 +234,9 @@
       "failed": "ログイン失敗",
       "forgotPassword": "パスワードを忘れましたか？",
       "forgotPasswordError": "パスワードリセット用メールの送信に失敗しました",
+      "freeTierBadge": "無料プラン対象",
+      "freeTierDescription": "Googleでサインアップすると、毎月{credits}の無料クレジットがもらえます。クレジットカード不要。",
+      "freeTierDescriptionGeneric": "Googleでサインアップすると、毎月無料クレジットがもらえます。クレジットカード不要。",
       "insecureContextWarning": "この接続は安全ではありません（HTTP）- このままログインを続けると、認証情報が攻撃者に傍受される可能性があります。",
       "loginButton": "ログイン",
       "loginWithGithub": "Githubでログイン",
@@ -106,11 +255,13 @@
       "sendResetLink": "リセットリンクを送信",
       "signInOrSignUp": "サインイン / サインアップ",
       "signUp": "サインアップ",
+      "signUpFreeTierPromo": "初めての方はこちら。Googleで{signUp}して、毎月{credits}の無料クレジットを獲得しましょう。",
       "success": "ログイン成功",
       "termsLink": "利用規約",
       "termsText": "「次へ」または「サインアップ」をクリックすると、私たちの",
       "title": "アカウントにログインする",
       "useApiKey": "Comfy APIキー",
+      "useEmailInstead": "メールアドレスを使用する",
       "userAvatar": "ユーザーアバター"
     },
     "loginButton": {
@@ -130,11 +281,14 @@
     "signOut": {
       "signOut": "ログアウト",
       "success": "正常にサインアウトしました",
-      "successDetail": "アカウントからサインアウトしました。"
+      "successDetail": "アカウントからサインアウトしました。",
+      "unsavedChangesMessage": "サインアウトすると未保存の変更が失われます。続行しますか？",
+      "unsavedChangesTitle": "未保存の変更"
     },
     "signup": {
       "alreadyHaveAccount": "すでにアカウントをお持ちですか？",
       "emailLabel": "メール",
+      "emailNotEligibleForFreeTier": "メールでのサインアップは無料プランの対象外です。",
       "emailPlaceholder": "メールアドレスを入力してください",
       "passwordLabel": "パスワード",
       "passwordPlaceholder": "新しいパスワードを入力してください",
@@ -147,12 +301,68 @@
       "title": "アカウントを作成する"
     }
   },
+  "batch": {
+    "index": "{current} / {total}"
+  },
+  "billingOperation": {
+    "subscriptionFailed": "サブスクリプションの更新に失敗しました",
+    "subscriptionProcessing": "お支払い処理中 — ワークスペースを設定しています…",
+    "subscriptionSuccess": "サブスクリプションが正常に更新されました",
+    "subscriptionTimeout": "サブスクリプションの確認がタイムアウトしました",
+    "topupFailed": "チャージに失敗しました",
+    "topupProcessing": "お支払い処理中 — クレジットを追加しています…",
+    "topupSuccess": "クレジットが正常に追加されました",
+    "topupTimeout": "チャージの確認がタイムアウトしました"
+  },
+  "boundingBox": {
+    "height": "高さ",
+    "width": "幅",
+    "x": "X",
+    "y": "Y"
+  },
   "breadcrumbsMenu": {
     "clearWorkflow": "ワークフローをクリア",
     "deleteBlueprint": "ブループリントを削除",
     "deleteWorkflow": "ワークフローを削除",
     "duplicate": "複製",
-    "enterNewName": "新しい名前を入力"
+    "enterAppMode": "アプリモードに入る",
+    "enterBuilderMode": "アプリビルダーに入る",
+    "enterNewName": "新しい名前を入力",
+    "exitAppMode": "アプリモードを終了",
+    "missingNodesWarning": "ワークフローに未対応のノードが含まれています（赤でハイライト）。",
+    "workflowActions": "ワークフロー操作"
+  },
+  "builderMenu": {
+    "exitAppBuilder": "アプリビルダーを終了"
+  },
+  "builderToolbar": {
+    "app": "アプリ",
+    "appDescription": "デフォルトでアプリとして開きます",
+    "arrange": "プレビュー",
+    "arrangeDescription": "アプリのレイアウトを確認",
+    "connectOutput": "出力を接続",
+    "connectOutputBody1": "アプリを保存するには、少なくとも1つの出力を接続する必要があります。",
+    "connectOutputBody2": "「選択」ステップに切り替えて、出力ノードをクリックしてここに追加してください。",
+    "defaultModeAppliedAppBody": "このワークフローは今後デフォルトでアプリモードで開きます。",
+    "defaultModeAppliedAppPrompt": "今すぐ表示しますか？",
+    "defaultModeAppliedGraphBody": "このワークフローは今後デフォルトでノードグラフとして開きます。",
+    "defaultModeAppliedGraphPrompt": "アプリを引き続き表示しますか？",
+    "defaultModeAppliedTitle": "正常に設定されました",
+    "defaultView": "デフォルトビューを設定",
+    "defaultViewDescription": "開き方を選択してください",
+    "defaultViewLabel": "デフォルトでは、このワークフローは次のように開きます：",
+    "defaultViewTitle": "このワークフローのデフォルトビューを設定",
+    "emptyWorkflowPrompt": "テンプレートから始めますか？",
+    "emptyWorkflowTitle": "このワークフローにはノードがありません",
+    "inputs": "入力",
+    "inputsDescription": "入力を選択",
+    "label": "アプリビルダー",
+    "nodeGraph": "ノードグラフ",
+    "nodeGraphDescription": "デフォルトでノードグラフとして開きます",
+    "outputs": "出力",
+    "outputsDescription": "出力を選択",
+    "switchToOutputs": "出力に切り替え",
+    "viewApp": "アプリを表示"
   },
   "clipboard": {
     "errorMessage": "クリップボードへのコピーに失敗しました",
@@ -206,6 +416,7 @@
     },
     "retry": "再試行",
     "retrying": "再試行中...",
+    "skipToCloudApp": "クラウドアプリへスキップ",
     "start": {
       "desc": "セットアップ不要。あらゆるデバイスで動作します。",
       "download": "ComfyUIをダウンロード",
@@ -339,6 +550,8 @@
     "Edit Subgraph Widgets": "サブグラフウィジェットを編集",
     "Expand": "展開",
     "Expand Node": "ノードを展開",
+    "Extensions": "拡張機能",
+    "FavoriteWidget": "ウィジェットをお気に入りに追加",
     "Horizontal": "水平",
     "Inputs": "入力",
     "Left": "左",
@@ -358,6 +571,7 @@
     "Remove": "削除",
     "Remove Bypass": "バイパスを解除",
     "Rename": "名前を変更",
+    "RenameWidget": "ウィジェット名を変更",
     "Resize": "リサイズ",
     "Right": "右",
     "Run Branch": "ブランチを実行",
@@ -368,6 +582,7 @@
     "Shapes": "形",
     "Title": "タイトル",
     "Top": "上",
+    "UnfavoriteWidget": "ウィジェットのお気に入りを解除",
     "Unpack Subgraph": "サブグラフを展開",
     "Unpin": "ピンを解除",
     "Vertical": "垂直",
@@ -381,6 +596,7 @@
     "additionalInfo": "追加情報",
     "apiPricing": "API料金",
     "credits": "クレジット",
+    "creditsAvailable": "利用可能なクレジット",
     "details": "詳細",
     "eventType": "イベントタイプ",
     "faqs": "よくある質問",
@@ -389,15 +605,47 @@
     "messageSupport": "サポートにメッセージ",
     "model": "モデル",
     "purchaseCredits": "クレジットを購入",
+    "refreshes": "{date}にリフレッシュ",
     "time": "時間",
     "topUp": {
+      "addMoreCredits": "クレジットを追加",
+      "addMoreCreditsToRun": "実行するためにクレジットを追加",
+      "amountToPayLabel": "支払う金額（ドル）",
+      "buy": "購入",
+      "buyCredits": "支払いに進む",
       "buyNow": "今すぐ購入",
+      "contactUs": "お問い合わせ",
+      "creditsDescription": "クレジットはワークフローやパートナーノードの実行に使用されます。",
+      "creditsPerDollar": "1ドルあたりのクレジット数",
+      "creditsToReceiveLabel": "受け取るクレジット数",
+      "howManyCredits": "いくつクレジットを追加しますか？",
       "insufficientMessage": "このワークフローを実行するのに十分なクレジットがありません。",
       "insufficientTitle": "クレジット不足",
+      "insufficientWorkflowMessage": "このワークフローを実行するためのクレジットが足りません。",
+      "maxAllowed": "最大{credits}クレジットまで。",
       "maxAmount": "（最大 $1,000 USD）",
+      "maximumAmount": "最大：${amount}",
+      "minRequired": "最低{credits}クレジット",
+      "minimumPurchase": "最低購入額：${amount}（{credits}クレジット）",
+      "needMore": "さらに必要ですか？",
+      "purchaseError": "購入に失敗しました",
+      "purchaseErrorDetail": "クレジットの購入に失敗しました: {error}",
+      "purchaseSuccess": "クレジットが正常に追加されました！",
       "quickPurchase": "クイック購入",
       "seeDetails": "詳細を見る",
-      "topUp": "チャージ"
+      "selectAmount": "金額を選択",
+      "templateNote": "*Wan Fun Control テンプレートで生成",
+      "topUp": "チャージ",
+      "unknownError": "不明なエラーが発生しました",
+      "usdAmount": "${amount}",
+      "videosEstimate": "約{count}本の動画",
+      "viewPricing": "料金詳細を見る",
+      "youGet": "クレジット",
+      "youPay": "支払金額（USD）"
+    },
+    "unified": {
+      "message": "クレジットが統合されました",
+      "tooltip": "Comfy全体で支払いが統一されました。すべてComfyクレジットで動作します：\n- パートナーノード（旧APIノード）\n- クラウドワークフロー\n\n既存のパートナーノード残高はクレジットに変換されました。"
     },
     "yourCreditBalance": "あなたのクレジット残高"
   },
@@ -408,13 +656,26 @@
     "AUDIO_ENCODER_OUTPUT": "オーディオエンコーダ出力",
     "AUDIO_RECORD": "オーディオ録音",
     "BOOLEAN": "ブール",
+    "BOUNDING_BOX": "バウンディングボックス",
     "CAMERA_CONTROL": "カメラコントロール",
     "CLIP": "CLIP",
     "CLIP_VISION": "CLIP_VISION",
     "CLIP_VISION_OUTPUT": "CLIP_VISION_OUTPUT",
+    "COLOR": "カラー",
     "COMBO": "コンボ",
+    "COMFY_AUTOGROW_V3": "COMFY_AUTOGROW_V3",
+    "COMFY_DYNAMICCOMBO_V3": "COMFY_DYNAMICCOMBO_V3",
+    "COMFY_MATCHTYPE_V3": "COMFY_MATCHTYPE_V3",
     "CONDITIONING": "条件付け",
     "CONTROL_NET": "コントロールネット",
+    "ELEVENLABS_VOICE": "ELEVENLABS_VOICE",
+    "FILE_3D": "FILE_3D",
+    "FILE_3D_FBX": "FILE_3D_FBX",
+    "FILE_3D_GLB": "FILE_3D_GLB",
+    "FILE_3D_GLTF": "FILE_3D_GLTF",
+    "FILE_3D_OBJ": "FILE_3D_OBJ",
+    "FILE_3D_STL": "FILE_3D_STL",
+    "FILE_3D_USDZ": "FILE_3D_USDZ",
     "FLOAT": "浮動小数点",
     "FLOATS": "浮動小数点数",
     "GEMINI_INPUT_FILES": "GEMINI入力ファイル",
@@ -423,9 +684,11 @@
     "HOOKS": "フック",
     "HOOK_KEYFRAMES": "フックキーフレーム",
     "IMAGE": "画像",
+    "IMAGECOMPARE": "画像比較",
     "INT": "整数",
     "LATENT": "潜在",
     "LATENT_OPERATION": "潜在操作",
+    "LATENT_UPSCALE_MODEL": "LATENT_UPSCALE_MODEL",
     "LOAD3D_CAMERA": "3Dカメラの読み込み",
     "LOAD_3D": "3Dをロード",
     "LORA_MODEL": "LoRAモデル",
@@ -434,6 +697,8 @@
     "LUMA_REF": "Luma参照",
     "MASK": "マスク",
     "MESH": "メッシュ",
+    "MESHY_RIGGED_TASK_ID": "MESHY_RIGGED_TASK_ID",
+    "MESHY_TASK_ID": "MESHY_TASK_ID",
     "MODEL": "モデル",
     "MODEL_PATCH": "モデルパッチ",
     "MODEL_TASK_ID": "モデルタスクID",
@@ -442,6 +707,7 @@
     "OPENAI_INPUT_FILES": "OpenAI入力ファイル",
     "PHOTOMAKER": "PHOTOMAKER",
     "PIXVERSE_TEMPLATE": "Pixverseテンプレート",
+    "POSE_KEYPOINT": "POSE_KEYPOINT",
     "RECRAFT_COLOR": "Recraftカラー",
     "RECRAFT_CONTROLS": "Recraftコントロール",
     "RECRAFT_V3_STYLE": "Recraft V3スタイル",
@@ -453,6 +719,7 @@
     "STYLE_MODEL": "スタイルモデル",
     "SVG": "SVG",
     "TIMESTEPS_RANGE": "タイムステップの範囲",
+    "TRACKS": "TRACKS",
     "UPSCALE_MODEL": "アップスケールモデル",
     "VAE": "VAE",
     "VIDEO": "ビデオ",
@@ -511,24 +778,84 @@
     "noStackTrace": "スタックトレースは利用できません",
     "promptExecutionError": "プロンプトの実行に失敗しました"
   },
+  "errorOverlay": {
+    "errorCount": "{count} 件のエラー",
+    "seeErrors": "エラーを表示"
+  },
+  "essentials": {
+    "batchImage": "バッチ画像処理",
+    "canny": "Canny",
+    "cannyToImage": "Cannyから画像へ",
+    "cannyToVideo": "Cannyから動画へ",
+    "cropImage": "画像を切り抜く",
+    "depthToImage": "深度から画像へ",
+    "depthToVideo": "深度から動画へ",
+    "extractFrame": "フレームを抽出",
+    "imageCompare": "画像比較",
+    "imageTo3DModel": "画像から3Dモデル",
+    "imageToImage": "画像から画像へ",
+    "imageToVideo": "画像から動画へ",
+    "inpaintImage": "画像のインペイント",
+    "invert": "反転",
+    "lipsync": "リップシンク",
+    "load3DModel": "3Dモデルを読み込む",
+    "loadAudio": "音声を読み込む",
+    "loadImage": "画像を読み込む",
+    "loadStyleLora": "スタイルを読み込む（LoRA）",
+    "loadVideo": "動画を読み込む",
+    "musicGeneration": "音楽生成",
+    "outpaintImage": "画像のアウトペイント",
+    "poseToImage": "ポーズから画像へ",
+    "poseToVideo": "ポーズから動画へ",
+    "removeBackground": "背景を削除",
+    "resizeImage": "画像のサイズ変更",
+    "rotate": "回転",
+    "save3DModel": "3Dモデルを保存",
+    "saveAudio": "音声を保存",
+    "saveImage": "画像を保存",
+    "saveVideo": "動画を保存",
+    "text": "テキスト",
+    "textGenerationLLM": "テキスト生成（LLM）",
+    "textTo3DModel": "テキストから3Dモデル",
+    "textToImage": "テキストから画像へ",
+    "textToVideo": "テキストから動画へ"
+  },
+  "exportToast": {
+    "allExportsCompleted": "すべてのエクスポートが完了しました",
+    "downloadExport": "エクスポートをダウンロード",
+    "downloadFailed": "「{name}」のダウンロードに失敗しました",
+    "exportCompleted": "ZIPダウンロードの準備ができました",
+    "exportError": "エクスポートに失敗しました",
+    "exportFailed": "{count} 件のエクスポートに失敗しました",
+    "exportFailedSingle": "ZIPエクスポートの作成に失敗しました",
+    "exportStarted": "ZIPダウンロードを準備中...",
+    "exportingAssets": "アセットをエクスポート中",
+    "noExportsInQueue": "キューに{filter}エクスポートはありません",
+    "preparingExport": "エクスポートを準備中...",
+    "retryDownload": "ダウンロードを再試行"
+  },
   "g": {
     "1x": "1倍速",
     "2x": "2倍速",
     "about": "情報",
     "add": "追加",
+    "addNode": "ノードを追加...",
     "addNodeFilterCondition": "ノードフィルター条件を追加",
     "all": "すべて",
     "amount": "量",
     "apply": "適用する",
     "architecture": "アーキテクチャ",
+    "asset": "{count} 個のアセット | {count} 個のアセット | {count} 個のアセット",
     "audioFailedToLoad": "オーディオの読み込みに失敗しました",
     "audioProgress": "オーディオの進捗",
     "author": "作者",
     "back": "戻る",
+    "batchRename": "一括リネーム",
     "beta": "ベータ版",
     "bookmark": "ライブラリに保存",
     "calculatingDimensions": "寸法を計算中",
     "cancel": "キャンセル",
+    "cancelled": "キャンセル済み",
     "capture": "キャプチャ",
     "category": "カテゴリ",
     "chart": "チャート",
@@ -538,6 +865,8 @@
     "clearAll": "すべてクリア",
     "clearFilters": "フィルターをクリア",
     "close": "閉じる",
+    "closeDialog": "ダイアログを閉じる",
+    "collapseAll": "すべて折りたたむ",
     "color": "色",
     "comfy": "Comfy",
     "comfyOrgLogoAlt": "ComfyOrgロゴ",
@@ -546,6 +875,7 @@
     "commandProhibited": "コマンド {command} は禁止されています。詳細は管理者にお問い合わせください。",
     "community": "コミュニティ",
     "completed": "完了",
+    "completedWithCheckmark": "完了 ✓",
     "confirm": "確認",
     "confirmed": "確認済み",
     "content": "コンテンツ",
@@ -554,48 +884,73 @@
     "control_before_generate": "生成前の制御",
     "copied": "コピーしました",
     "copy": "コピー",
+    "copyAll": "すべてコピー",
     "copyJobId": "ジョブIDをコピー",
     "copyToClipboard": "クリップボードにコピー",
     "copyURL": "URLをコピー",
+    "core": "コア",
     "currentUser": "現在のユーザー",
+    "custom": "カスタム",
     "customBackground": "カスタム背景",
     "customize": "カスタマイズ",
     "customizeFolder": "フォルダーをカスタマイズ",
+    "decrement": "減少",
     "defaultBanner": "デフォルトバナー",
     "delete": "削除",
     "deleteAudioFile": "オーディオファイルを削除",
     "deleteImage": "画像を削除",
     "deprecated": "非推奨",
     "description": "説明",
+    "devOnly": "DEV",
     "devices": "デバイス",
     "disableAll": "すべて無効にする",
+    "disableSelected": "選択したものを無効化",
+    "disableThirdParty": "サードパーティを無効化",
     "disabling": "無効化",
+    "disconnectedFromBackend": "バックエンドから切断されました。サーバーが稼働しているか確認してください。",
     "dismiss": "閉じる",
     "download": "ダウンロード",
+    "downloadAudio": "オーディオをダウンロード",
     "downloadImage": "画像をダウンロード",
     "downloadVideo": "ビデオをダウンロード",
+    "downloadWithSize": "ダウンロード（{size}）",
+    "downloading": "ダウンロード中",
     "dropYourFileOr": "ファイルをドロップするか",
     "duplicate": "複製",
     "edit": "編集",
     "editImage": "画像を編集",
     "editOrMaskImage": "画像を編集またはマスク",
+    "emDash": "—",
     "empty": "空",
     "enableAll": "すべて有効にする",
     "enableOrDisablePack": "パックを有効/無効にする",
+    "enableSelected": "選択したものを有効化",
     "enabled": "有効",
     "enabling": "有効化",
+    "enter": "入力",
+    "enterBaseName": "ベース名を入力",
+    "enterNewName": "新しい名前を入力",
+    "enterNewNamePrompt": "新しい名前を入力してください：",
+    "enterSubgraph": "サブグラフに入る",
     "error": "エラー",
     "errorLoadingImage": "画像の読み込みエラー",
     "errorLoadingVideo": "ビデオの読み込みエラー",
+    "essentials": "必須",
+    "expandAll": "すべて展開",
     "experimental": "ベータ",
     "export": "エクスポート",
     "extensionName": "拡張機能名",
+    "extensions": "拡張機能",
+    "failed": "失敗",
     "failedToCopyJobId": "ジョブIDのコピーに失敗しました",
     "failedToDownloadImage": "画像のダウンロードに失敗しました",
     "failedToDownloadVideo": "ビデオのダウンロードに失敗しました",
+    "favorites": "お気に入り",
     "feedback": "フィードバック",
     "file": "ファイル",
     "filter": "フィルタ",
+    "filterBy": "フィルター:",
+    "filterByType": "{type}でフィルター...",
     "findIssues": "問題を見つける",
     "frameNodes": "ノードをフレーム化",
     "frontendNewer": "フロントエンドのバージョン {frontendVersion} はバックエンドのバージョン {backendVersion} と互換性がない可能性があります。",
@@ -605,23 +960,32 @@
     "goToNode": "ノードに移動",
     "graphNavigation": "グラフナビゲーション",
     "halfSpeed": "0.5倍速",
+    "hideLeftPanel": "左パネルを非表示",
+    "hideRightPanel": "右パネルを非表示",
     "icon": "アイコン",
+    "imageDoesNotExist": "画像が存在しません",
     "imageFailedToLoad": "画像の読み込みに失敗しました",
     "imagePreview": "画像プレビュー - 矢印キーで画像を切り替え",
     "imageUrl": "画像URL",
     "import": "インポート",
     "inProgress": "進行中",
+    "inSubgraph": "サブグラフ「{name}」内",
+    "increment": "増加",
     "info": "ノード情報",
+    "input": "入力",
     "insert": "挿入",
     "install": "インストール",
     "installed": "インストール済み",
     "installing": "インストール中",
     "interrupted": "中断されました",
     "itemSelected": "{selectedCount}件選択済み",
+    "itemsCopiedToClipboard": "項目をクリップボードにコピーしました",
     "itemsSelected": "{selectedCount}件選択済み",
+    "job": "ジョブ",
     "jobIdCopied": "ジョブIDがクリップボードにコピーされました",
     "keybinding": "キーバインディング",
     "keybindingAlreadyExists": "このキー割り当てはすでに存在します",
+    "keybindings": "キーバインド",
     "learnMore": "詳細を学ぶ",
     "listening": "リスニング中...",
     "liveSamplingPreview": "ライブサンプリングプレビュー",
@@ -632,18 +996,24 @@
     "login": "ログイン",
     "logoAlt": "ComfyUIロゴ",
     "logs": "ログ",
+    "manageExtensions": "拡張機能の管理",
     "markdown": "マークダウン",
     "micPermissionDenied": "マイクの許可が拒否されました",
     "migrate": "移行する",
     "missing": "不足している",
+    "more": "もっと見る",
     "moreOptions": "その他のオプション",
     "moreWorkflows": "さらに多くのワークフロー",
+    "mostRelevant": "最も関連性の高い",
     "multiSelectDropdown": "複数選択ドロップダウン",
     "name": "名前",
     "newFolder": "新しいフォルダー",
     "next": "次へ",
+    "nightly": "NIGHTLY",
     "no": "いいえ",
     "noAudioRecorded": "音声が録音されていません",
+    "noItems": "項目がありません",
+    "noResults": "結果なし",
     "noResultsFound": "結果が見つかりません",
     "noTasksFound": "タスクが見つかりません",
     "noTasksFoundMessage": "キューにタスクがありません。",
@@ -654,26 +1024,49 @@
     "nodeSlotsError": "ノードスロットエラー",
     "nodeWidgetsError": "ノードウィジェットエラー",
     "nodes": "ノード",
+    "nodesCount": "{count} ノード | {count} ノード | {count} ノード",
     "nodesRunning": "ノードが実行中",
     "none": "なし",
+    "nothingToCopy": "コピーするものがありません",
+    "nothingToDelete": "削除するものがありません",
+    "nothingToDuplicate": "複製するものがありません",
+    "nothingToRename": "リネームするものがありません",
     "ok": "OK",
     "openManager": "マネージャーを開く",
     "openNewIssue": "新しい問題を開く",
+    "or": "または",
+    "output": "出力",
     "overwrite": "上書き",
+    "partner": "パートナー",
+    "playPause": "再生/一時停止",
     "playRecording": "録音を再生",
     "playbackSpeed": "再生速度",
     "playing": "再生中",
     "pressKeysForNewBinding": "新しいバインドのキーを押してください",
     "preview": "プレビュー",
+    "profile": "プロフィール",
     "progressCountOf": "の",
+    "queued": "キュー中",
     "ready": "準備完了",
+    "recents": "最近使用",
     "reconnected": "再接続されました",
     "reconnecting": "再接続中",
     "refresh": "更新",
     "refreshNode": "ノードを更新",
+    "relativeTime": {
+      "daysAgo": "{count}日前",
+      "hoursAgo": "{count}時間前",
+      "minutesAgo": "{count}分前",
+      "monthsAgo": "{count}か月前",
+      "now": "今",
+      "weeksAgo": "{count}週間前",
+      "yearsAgo": "{count}年前"
+    },
     "releaseTitle": "{package} {version} リリース",
     "reloadToApplyChanges": "変更を適用するには再読み込みしてください",
+    "remove": "削除",
     "removeImage": "画像を削除",
+    "removeTag": "タグを削除",
     "removeVideo": "ビデオを削除",
     "rename": "名前を変更",
     "reportIssue": "報告する",
@@ -688,21 +1081,32 @@
     "resizeFromTopRight": "右上隅からリサイズ",
     "restart": "再起動",
     "resultsCount": "{count}件の結果が見つかりました",
+    "running": "実行中",
     "save": "保存",
     "saving": "保存中",
+    "scrollLeft": "左にスクロール",
+    "scrollRight": "右にスクロール",
     "search": "検索",
     "searchExtensions": "拡張機能を検索",
     "searchFailedMessage": "検索に一致する設定が見つかりませんでした。検索キーワードを調整してみてください。",
     "searchKeybindings": "キーバインディングを検索",
     "searchModels": "モデルを検索",
     "searchNodes": "ノードを検索",
+    "searchPlaceholder": "検索...",
     "searchSettings": "設定を検索",
     "searchWorkflows": "ワークフローを検索",
     "seeTutorial": "チュートリアルを見る",
+    "selectItemsToCopy": "コピーする項目を選択",
+    "selectItemsToDelete": "削除する項目を選択",
+    "selectItemsToDuplicate": "複製する項目を選択",
+    "selectItemsToRename": "リネームする項目を選択",
     "selectedFile": "選択されたファイル",
     "setAsBackground": "背景として設定",
     "settings": "設定",
+    "shortcutSuffix": "（{shortcut}）",
+    "showLeftPanel": "左パネルを表示",
     "showReport": "レポートを表示",
+    "showRightPanel": "右パネルを表示",
     "singleSelectDropdown": "単一選択ドロップダウン",
     "sort": "並び替え",
     "source": "ソース",
@@ -710,19 +1114,24 @@
     "status": "ステータス",
     "stopPlayback": "再生を停止",
     "stopRecording": "録音停止",
+    "submit": "送信",
     "success": "成功",
     "systemInfo": "システム情報",
     "terminal": "ターミナル",
     "title": "タイトル",
     "triggerPhrase": "トリガーフレーズ",
     "unknownError": "不明なエラー",
+    "unknownFile": "不明なファイル",
+    "untitled": "無題",
     "update": "更新",
     "updateAvailable": "更新が利用可能",
     "updateFrontend": "フロントエンドを更新",
     "updated": "更新済み",
     "updating": "更新中",
     "upload": "アップロード",
+    "uploadAlreadyInProgress": "アップロードはすでに進行中です",
     "usageHint": "使用ヒント",
+    "use": "使用",
     "user": "ユーザー",
     "versionMismatchWarning": "バージョン互換性の警告",
     "versionMismatchWarningMessage": "{warning}: {detail} 更新手順については https://docs.comfy.org/installation/update_comfyui#common-update-issues をご覧ください。",
@@ -730,11 +1139,10 @@
     "videoPreview": "ビデオプレビュー - 矢印キーでビデオを切り替え",
     "viewImageOfTotal": "画像 {index} / {total} を表示",
     "viewVideoOfTotal": "ビデオ {index} / {total} を表示",
-    "vitePreloadErrorMessage": "アプリの新しいバージョンがリリースされました。再読み込みしますか？\n再読み込みしない場合、アプリの一部が正しく動作しない可能性があります。\n再読み込み前に進行状況を保存してから拒否することもできます。",
-    "vitePreloadErrorTitle": "新しいバージョンが利用可能",
     "volume": "音量",
     "warning": "警告",
-    "workflow": "ワークフロー"
+    "workflow": "ワークフロー",
+    "you": "あなた"
   },
   "graphCanvasMenu": {
     "fitView": "ビューに合わせる",
@@ -756,11 +1164,17 @@
     "create": "グループノードを作成",
     "enterName": "名前を入力"
   },
+  "help": {
+    "helpCenterMenu": "ヘルプセンターメニュー",
+    "recentReleases": "最近のリリース"
+  },
   "helpCenter": {
     "clickToLearnMore": "詳しくはこちらをクリック →",
     "desktopUserGuide": "デスクトップユーザーガイド",
     "docs": "ドキュメント",
+    "feedback": "フィードバックを送信",
     "github": "Github",
+    "help": "ヘルプ＆サポート",
     "loadingReleases": "リリースを読み込み中...",
     "managerExtension": "Manager Extension",
     "more": "もっと見る...",
@@ -769,6 +1183,12 @@
     "recentReleases": "最近のリリース",
     "reinstall": "再インストール",
     "updateAvailable": "アップデート",
+    "updateComfyUI": "ComfyUIをアップデート",
+    "updateComfyUIFailed": "ComfyUIのアップデートに失敗しました。もう一度お試しください。",
+    "updateComfyUIStarted": "アップデート開始",
+    "updateComfyUIStartedDetail": "ComfyUIのアップデートがキューに追加されました。しばらくお待ちください…",
+    "updateComfyUISuccess": "アップデート完了",
+    "updateComfyUISuccessDetail": "ComfyUIがアップデートされました。再起動中…",
     "whatsNew": "新着情報"
   },
   "icon": {
@@ -782,6 +1202,24 @@
     "inbox": "受信トレイ",
     "star": "星"
   },
+  "imageCompare": {
+    "batchLabelA": "A：",
+    "batchLabelB": "B：",
+    "noImages": "比較する画像がありません"
+  },
+  "imageCrop": {
+    "cropPreviewAlt": "切り抜きプレビュー",
+    "custom": "カスタム",
+    "loading": "読み込み中...",
+    "lockRatio": "アスペクト比を固定",
+    "noInputImage": "入力画像が接続されていません",
+    "ratio": "比率",
+    "unlockRatio": "アスペクト比を解除"
+  },
+  "importFailed": {
+    "copyError": "コピーエラー",
+    "title": "インポート失敗"
+  },
   "install": {
     "appDataLocationTooltip": "ComfyUIのアプリデータディレクトリ。保存内容:\n- ログ\n- サーバー設定",
     "appPathLocationTooltip": "ComfyUIのアプリ資産ディレクトリ。ComfyUIのコードとアセットを保存します",
@@ -795,6 +1233,8 @@
     "failedToSelectDirectory": "ディレクトリの選択に失敗しました",
     "gpu": "GPU",
     "gpuPicker": {
+      "amdDescription": "AMD GPUをROCm™アクセラレーションで使用し、最高のパフォーマンスを実現します。",
+      "amdSubtitle": "AMD ROCm™",
       "appleMetalDescription": "MacのGPUを活用して、より高速かつ快適な体験を実現します",
       "cpuDescription": "GPUアクセラレーションが利用できない場合は互換性のためにCPUモードを使用します",
       "cpuSubtitle": "CPUモード",
@@ -821,6 +1261,8 @@
       "selectGpuDescription": "所有しているGPUのタイプを選択してください"
     },
     "helpImprove": "ComfyUIの改善にご協力ください",
+    "insideAppInstallDir": "このフォルダーはComfyUI Desktopアプリケーションバンドル内にあり、アップデート時に削除されます。インストールフォルダー外（例：Documents/ComfyUI）を選択してください。",
+    "insideUpdaterCache": "このフォルダーはComfyUIアップデーターのキャッシュ内にあり、アップデートごとに消去されます。データ用に別の場所を選択してください。",
     "installLocation": "インストール先",
     "installLocationDescription": "ComfyUIのユーザーデータを保存するディレクトリを選択してください。Python環境が選択した場所にインストールされます。選択したディスクに約15GBの空き容量が必要です。",
     "installLocationTooltip": "ComfyUIのユーザーデータディレクトリ。保存内容:\n- Python環境\n- モデル\n- カスタムノード\n",
@@ -895,6 +1337,66 @@
   "issueReport": {
     "helpFix": "これを修正するのを助ける"
   },
+  "linearMode": {
+    "appModeToolbar": {
+      "appBuilder": "アプリビルダー",
+      "apps": "アプリ",
+      "appsEmptyMessage": "保存されたアプリはここに表示されます。\n下をクリックして最初のアプリを作成しましょう。",
+      "enterAppMode": "アプリモードに入る"
+    },
+    "arrange": {
+      "atLeastOne": "少なくとも1つ",
+      "connectAtLeastOne": "ユーザーが実行後に結果を確認できるよう、{atLeastOne} 出力ノードを接続してください。",
+      "noOutputs": "まだ出力が追加されていません",
+      "outputExamples": "例：「画像を保存」や「動画を保存」",
+      "outputs": "出力",
+      "resultsLabel": "選択した出力ノードから生成された結果は、このアプリ実行後にここに表示されます",
+      "switchToOutputs": "「出力」ステップに切り替え、出力ノードをクリックしてここに追加してください。",
+      "switchToOutputsButton": "出力に切り替え"
+    },
+    "backToWorkflow": "ワークフローに戻る",
+    "beta": "アプリモード ベータ版 - フィードバックを送る",
+    "builder": {
+      "exit": "ビルダーを終了",
+      "exitConfirmMessage": "保存されていない変更は失われます。\n保存せずに終了しますか？",
+      "exitConfirmTitle": "アプリビルダーを終了しますか？",
+      "inputsDesc": "ユーザーはこれらを操作して出力を生成します。",
+      "inputsExample": "例：「画像を読み込む」「テキストプロンプト」「ステップ数」",
+      "noInputs": "まだ入力が追加されていません",
+      "noOutputs": "まだ出力ノードが追加されていません",
+      "outputsDesc": "少なくとも1つの出力ノードを接続すると、ユーザーが実行後に結果を確認できます。",
+      "outputsExample": "例：「画像を保存」「動画を保存」",
+      "promptAddInputs": "ノードのパラメータをクリックして、ここに入力として追加してください",
+      "promptAddOutputs": "出力ノードをクリックしてここに追加してください。これが生成される結果となります。",
+      "title": "アプリビルダーモード",
+      "unknownWidget": "ウィジェットが表示されていません"
+    },
+    "downloadAll": "すべてダウンロード",
+    "dragAndDropImage": "画像をドラッグ＆ドロップ",
+    "emptyWorkflowExplanation": "ワークフローが空です。アプリを作成するには、まずノードを追加してください。",
+    "enterNodeGraph": "ノードグラフに入る",
+    "giveFeedback": "フィードバックを送る",
+    "graphMode": "グラフモード",
+    "linearMode": "アプリモード",
+    "loadTemplate": "テンプレートを読み込む",
+    "mobileControls": "編集と実行",
+    "queue": {
+      "clear": "キューをクリア",
+      "clickToClear": "クリックしてキューをクリア"
+    },
+    "rerun": "再実行",
+    "reuseParameters": "パラメータを再利用",
+    "runCount": "実行回数：",
+    "viewJob": "ジョブを表示",
+    "welcome": {
+      "buildApp": "アプリを作成",
+      "controls": "出力は下部に表示され、コントロールは右側にあります。他の要素は邪魔になりません。",
+      "getStarted": "{runButton} をクリックして開始してください。",
+      "message": "ノードグラフを非表示にして、作成に集中できるシンプルなビューです。",
+      "sharing": "共有も簡単です：ワークフローを作成し、アプリモードを開き、タブを右クリックしてエクスポートします。他の人がファイルを開くと、このクリーンなビューで直接起動します。ノードグラフを理解しなくても、強力なワークフローをシンプルなツールとして共有できます。",
+      "title": "アプリモードへようこそ"
+    }
+  },
   "load3d": {
     "applyingTexture": "テクスチャを適用中...",
     "backgroundColor": "背景色",
@@ -921,20 +1423,24 @@
       "lineart": "線画",
       "normal": "ノーマル",
       "original": "オリジナル",
+      "pointCloud": "ポイントクラウド",
       "wireframe": "ワイヤーフレーム"
     },
     "model": "モデル",
     "openIn3DViewer": "3Dビューアで開く",
+    "panoramaMode": "パノラマ",
     "previewOutput": "出力のプレビュー",
     "reloadingModel": "モデルを再読み込み中...",
     "removeBackgroundImage": "背景画像を削除",
     "resizeNodeMatchOutput": "ノードを出力に合わせてリサイズ",
     "scene": "シーン",
     "showGrid": "グリッドを表示",
+    "showSkeleton": "スケルトンを表示",
     "startRecording": "録画開始",
     "stopRecording": "録画停止",
     "switchCamera": "カメラを切り替える",
     "switchingMaterialMode": "マテリアルモードの切り替え中...",
+    "tiledMode": "タイル",
     "unsupportedFileType": "サポートされていないファイル形式です（.gltf、.glb、.obj、.fbx、.stl をサポート）",
     "upDirection": "上方向",
     "upDirections": {
@@ -955,6 +1461,11 @@
       "title": "3Dビューア（ベータ）"
     }
   },
+  "loadWorkflowWarning": {
+    "coreNodesFromVersion": "バージョン{version}のコアノード:",
+    "outdatedVersion": "このワークフローは新しいバージョンのComfyUI（{version}）で作成されました。一部のノードが正しく動作しない場合があります。",
+    "outdatedVersionGeneric": "このワークフローは新しいバージョンのComfyUIで作成されました。一部のノードが正しく動作しない場合があります。"
+  },
   "maintenance": {
     "None": "なし",
     "OK": "OK",
@@ -973,11 +1484,21 @@
     "showManual": "メンテナンスタスクを表示",
     "status": "ステータス",
     "terminalDefaultMessage": "トラブルシューティングコマンドを実行すると、出力はここに表示されます。",
-    "title": "メンテナンス"
+    "title": "メンテナンス",
+    "unsafeMigration": {
+      "action": "下記の「ベースパス」メンテナンスタスクを使用して、ComfyUIを安全な場所に移動してください。",
+      "appInstallDir": "ベースパスがComfyUI Desktopアプリケーションバンドル内にあります。このフォルダーはアップデート時に削除または上書きされる可能性があります。Documents/ComfyUIなど、インストールフォルダー外のディレクトリを選択してください。",
+      "generic": "現在のComfyUIのベースパスは、アップデート時に削除または変更される可能性のある場所にあります。データ損失を防ぐため、安全なフォルダーに移動してください。",
+      "oneDrive": "ベースパスがOneDrive上にあり、同期の問題やデータ損失が発生する可能性があります。OneDriveで管理されていないローカルフォルダーを選択してください。",
+      "title": "安全でないインストール場所が検出されました",
+      "updaterCache": "ベースパスがComfyUIアップデーターキャッシュ内にあります。これは各アップデート時にクリアされます。データ用に別の場所を選択してください。"
+    }
   },
   "manager": {
+    "actions": "アクション",
     "allMissingNodesInstalled": "すべての不足しているノードが正常にインストールされました",
     "applyChanges": "変更を適用",
+    "basicInfo": "基本情報",
     "changingVersion": "バージョンを {from} から {to} に変更",
     "clickToFinishSetup": "クリック",
     "conflicts": {
@@ -1013,6 +1534,28 @@
     "disabledNodesWontUpdate": "無効なノードは更新されません",
     "discoverCommunityContent": "コミュニティが作成したノードパック、拡張機能などを探す...",
     "downloads": "ダウンロード",
+    "emptyState": {
+      "allInstalled": {
+        "message": "まだ拡張機能をインストールしていません。",
+        "title": "拡張機能がインストールされていません"
+      },
+      "conflicting": {
+        "message": "すべての拡張機能は互換性があります。",
+        "title": "競合は検出されませんでした"
+      },
+      "missing": {
+        "message": "必要なノードはすべてインストールされています。",
+        "title": "不足しているノードはありません"
+      },
+      "updateAvailable": {
+        "message": "すべての拡張機能は最新の状態です。",
+        "title": "すべて最新です"
+      },
+      "workflow": {
+        "message": "このワークフローでは拡張ノードが使用されていません。",
+        "title": "ワークフローに拡張機能がありません"
+      }
+    },
     "enablePackToChangeVersion": "このパックを有効にしてバージョンを変更してください",
     "errorConnecting": "Comfy Node Registryへの接続エラー。",
     "extensionsSuccessfullyInstalled": "拡張機能のインストールが完了し、使用可能になりました！",
@@ -1034,25 +1577,42 @@
     "installingDependencies": "依存関係をインストール中...",
     "lastUpdated": "最終更新日",
     "latestVersion": "最新",
+    "legacyManagerSearchTip": "ComfyUI-Managerをお探しですか？ComfyUIを--enable-manager-legacy-uiフラグ付きで起動すると、レガシーマネージャーUIを有効にできます。",
     "legacyManagerUI": "レガシーUIを使用する",
     "legacyManagerUIDescription": "レガシーManager UIを使用するには、--enable-manager-legacy-uiを付けてComfyUIを起動してください",
     "legacyMenuNotAvailable": "このバージョンのComfyUIでは、レガシーマネージャーメニューは利用できません。新しいマネージャーメニューを使用してください。",
     "license": "ライセンス",
     "loadingVersions": "バージョンを読み込んでいます...",
     "mixedSelectionMessage": "混在した選択では一括操作を実行できません",
+    "nav": {
+      "allExtensions": "すべての拡張機能",
+      "allInWorkflow": "{workflowName} 内のすべて",
+      "allInstalled": "すべてインストール済み",
+      "conflicting": "競合",
+      "inWorkflowSection": "ワークフロー内",
+      "installedSection": "インストール済み",
+      "missingNodes": "不足しているノード",
+      "notInstalled": "未インストール",
+      "updatesAvailable": "アップデートあり"
+    },
     "nightlyVersion": "ナイトリー",
     "noDescription": "説明はありません",
     "noNodesFound": "ノードが見つかりません",
     "noNodesFoundDescription": "パックのノードは解析できなかったか、パックがフロントエンドの拡張機能のみでノードがない可能性があります。",
     "noResultsFound": "検索に一致する結果が見つかりませんでした。",
     "nodePack": "ノードパック",
+    "nodePackInfo": "ノードパック情報",
     "notAvailable": "利用不可",
+    "packInstall": {
+      "nodeIdRequired": "インストールにはノードIDが必要です"
+    },
     "packsSelected": "選択したパック",
     "repository": "リポジトリ",
     "restartToApplyChanges": "変更を適用するには、ComfyUIを再起動してください",
     "restartingBackend": "変更を適用するためにバックエンドを再起動しています...",
     "searchPlaceholder": "検索",
     "selectVersion": "バージョンを選択",
+    "selected": "選択済み",
     "sort": {
       "created": "最新",
       "downloads": "最も人気",
@@ -1074,6 +1634,8 @@
     "totalNodes": "合計ノード数",
     "tryAgainLater": "後ほど再試行してください。",
     "tryDifferentSearch": "別の検索クエリを試してみてください。",
+    "tryUpdate": "アップデートを試す",
+    "tryUpdateTooltip": "リポジトリから最新の変更を取得します。ナイトリーバージョンでは自動検出できないアップデートがある場合があります。",
     "uninstall": "アンインストール",
     "uninstallSelected": "選択したものをアンインストール",
     "uninstalling": "アンインストール中",
@@ -1084,31 +1646,111 @@
     "version": "バージョン"
   },
   "maskEditor": {
+    "activateLayer": "レイヤーを有効化",
+    "applyToWholeImage": "画像全体に適用",
+    "baseImageLayer": "ベース画像レイヤー",
+    "baseLayerPreview": "ベースレイヤープレビュー",
+    "black": "黒",
+    "brushSettings": "ブラシ設定",
+    "brushShape": "ブラシ形状",
+    "clear": "クリア",
+    "clickToResetZoom": "クリックしてズームをリセット",
+    "colorSelectSettings": "色選択設定",
+    "colorSelector": "カラーピッカー",
+    "fillOpacity": "塗りつぶし不透明度",
+    "hardness": "硬さ",
+    "imageLayer": "画像レイヤー",
+    "invert": "反転",
+    "layers": "レイヤー",
+    "livePreview": "ライブプレビュー",
+    "maskBlendingOptions": "マスク合成オプション",
+    "maskLayer": "マスクレイヤー",
+    "maskOpacity": "マスク不透明度",
+    "maskTolerance": "マスク許容値",
+    "method": "方法",
+    "mirrorHorizontal": "左右反転",
+    "mirrorVertical": "上下反転",
+    "negative": "ネガティブ",
+    "opacity": "不透明度",
+    "paintBucketSettings": "ペイントバケツ設定",
+    "paintLayer": "ペイントレイヤー",
+    "redo": "やり直し",
+    "resetToDefault": "デフォルトにリセット",
+    "rotateLeft": "左に回転",
+    "rotateRight": "右に回転",
+    "selectionOpacity": "選択範囲の不透明度",
+    "smoothingPrecision": "スムージング精度",
+    "stepSize": "ステップサイズ",
+    "stopAtMask": "マスクで停止",
+    "thickness": "太さ",
+    "title": "マスクエディター",
+    "tolerance": "許容値",
+    "undo": "元に戻す",
+    "white": "白"
   },
   "mediaAsset": {
+    "actions": {
+      "copyJobId": "ジョブIDをコピー",
+      "delete": "削除",
+      "download": "ダウンロード",
+      "exportWorkflow": "ワークフローをエクスポート",
+      "insertAsNodeInWorkflow": "ワークフローにノードとして挿入",
+      "inspect": "アセットを確認",
+      "more": "その他のオプション",
+      "moreOptions": "その他のオプション",
+      "openWorkflow": "新しいタブでワークフローとして開く",
+      "seeMoreOutputs": "さらに出力を表示",
+      "zoom": "拡大"
+    },
     "assetDeletedSuccessfully": "アセットが正常に削除されました",
     "deleteAssetDescription": "このアセットは完全に削除されます。",
     "deleteAssetTitle": "このアセットを削除しますか？",
     "deleteSelectedDescription": "{count} 個のアセットが完全に削除されます。",
     "deleteSelectedTitle": "選択したアセットを削除しますか？",
     "deletingImportedFilesCloudOnly": "インポートしたファイルの削除はクラウド版でのみサポートされています",
+    "failedToCreateNode": "ノードの作成に失敗しました",
     "failedToDeleteAsset": "アセットの削除に失敗しました",
+    "failedToExportWorkflow": "ワークフローのエクスポートに失敗しました",
     "jobIdToast": {
       "copied": "コピーしました",
       "error": "エラー",
       "jobIdCopied": "ジョブIDをクリップボードにコピーしました",
       "jobIdCopyFailed": "ジョブIDのコピーに失敗しました"
     },
+    "noJobIdFound": "このアセットにジョブIDが見つかりません",
+    "noWorkflowDataFound": "このアセットにワークフローデータが見つかりません",
+    "nodeAddedToWorkflow": "{nodeType}ノードがワークフローに追加されました",
+    "nodeTypeNotFound": "ノードタイプ {nodeType} が見つかりません",
     "selection": {
       "assetsDeletedSuccessfully": "{count} 個のアセットが正常に削除されました",
       "deleteSelected": "削除",
+      "deleteSelectedAll": "すべて削除",
       "deselectAll": "すべて選択解除",
       "downloadSelected": "ダウンロード",
+      "downloadSelectedAll": "すべてダウンロード",
       "downloadStarted": "{count} ファイルをダウンロード中...",
       "downloadsStarted": "{count} ファイルのダウンロードを開始しました",
+      "exportStarted": "{count} 件のファイルのZIPエクスポートを準備中",
+      "exportWorkflowAll": "すべてのワークフローをエクスポート",
+      "failedToAddNodes": "ノードのワークフローへの追加に失敗しました",
       "failedToDeleteAssets": "選択したアセットの削除に失敗しました",
-      "selectedCount": "選択されたアセット: {count}"
-    }
+      "insertAllAssetsAsNodes": "すべてのアセットをノードとして挿入",
+      "multipleSelectedAssets": "複数のアセットが選択されています",
+      "noWorkflowsFound": "選択したアセットにワークフローデータが見つかりません",
+      "noWorkflowsToExport": "エクスポートするワークフローデータが見つかりません",
+      "nodesAddedToWorkflow": "{count} 個のノードがワークフローに追加されました",
+      "openWorkflowAll": "すべてのワークフローを開く",
+      "partialAddNodesSuccess": "{succeeded} 件が正常に追加され、{failed} 件が失敗しました",
+      "partialDeleteSuccess": "{succeeded}件の削除に成功、{failed}件の削除に失敗しました",
+      "partialWorkflowsExported": "{succeeded} 件が正常にエクスポートされ、{failed} 件が失敗しました",
+      "partialWorkflowsOpened": "{succeeded} 件のワークフローが開かれ、{failed} 件が失敗しました",
+      "selectedCount": "選択されたアセット: {count}",
+      "workflowsExported": "{count} 件のワークフローが正常にエクスポートされました",
+      "workflowsOpened": "{count} 件のワークフローが新しいタブで開かれました"
+    },
+    "unsupportedFileType": "ローダーノードでサポートされていないファイルタイプです",
+    "workflowExportedSuccessfully": "ワークフローのエクスポートに成功しました",
+    "workflowOpenedInNewTab": "ワークフローが新しいタブで開かれました"
   },
   "menu": {
     "autoQueue": "自動キュー",
@@ -1116,11 +1758,14 @@
     "batchCountTooltip": "ワークフロー生成回数",
     "clear": "ワークフローをクリア",
     "clipspace": "クリップスペースを開く",
+    "customNodesManager": "カスタムノードマネージャー",
     "dark": "ダーク",
     "disabled": "無効",
     "disabledTooltip": "ワークフローは自動的にキューに追加されません",
     "execute": "実行",
+    "fullscreen": "全画面表示",
     "help": "ヘルプ",
+    "helpAndFeedback": "ヘルプとフィードバック",
     "hideMenu": "メニューを隠す",
     "instant": "即時",
     "instantTooltip": "生成完了後すぐにキューに追加",
@@ -1134,9 +1779,12 @@
     "resetView": "ビューをリセット",
     "run": "実行する",
     "runWorkflow": "ワークフローを実行する (Shiftで先頭にキュー)",
+    "runWorkflowDisabled": "ワークフローに未対応のノード（赤でハイライト）が含まれています。これらを削除してワークフローを実行してください。",
     "runWorkflowFront": "ワークフローを実行する (先頭にキュー)",
     "settings": "設定",
     "showMenu": "メニューを表示",
+    "stopRunInstant": "実行を即時停止",
+    "stopRunInstantTooltip": "実行を停止",
     "theme": "テーマ",
     "toggleBottomPanel": "下部パネルを切り替え"
   },
@@ -1149,6 +1797,7 @@
     "Canvas Performance": "キャンバスのパフォーマンス",
     "Canvas Toggle Lock": "キャンバスのロックを切り替え",
     "Check for Custom Node Updates": "カスタムノードのアップデートを確認",
+    "Check for Updates": "アップデートを確認",
     "Clear Pending Tasks": "保留中のタスクをクリア",
     "Clear Workflow": "ワークフローをクリア",
     "Clipspace": "クリップスペース",
@@ -1161,16 +1810,19 @@
     "Contact Support": "サポートに連絡",
     "Convert Selection to Subgraph": "選択範囲をサブグラフに変換",
     "Convert selected nodes to group node": "選択したノードをグループノードに変換",
+    "Copy": "コピー",
     "Custom Nodes (Legacy)": "カスタムノード（レガシー）",
     "Custom Nodes Manager": "カスタムノードマネージャ",
     "Decrease Brush Size in MaskEditor": "マスクエディタでブラシサイズを小さくする",
     "Delete Selected Items": "選択したアイテムを削除",
+    "Desktop User Guide": "デスクトップユーザーガイド",
     "Duplicate Current Workflow": "現在のワークフローを複製",
     "Edit": "編集",
     "Edit Subgraph Widgets": "サブグラフウィジェットを編集",
     "Exit Subgraph": "サブグラフを終了",
     "Experimental: Browse Model Assets": "実験的: モデルアセットを閲覧",
     "Experimental: Enable AssetAPI": "実験的: AssetAPIを有効化",
+    "Experimental: Enable Nodes 2_0": "実験的: Nodes 2.0を有効化",
     "Export": "エクスポート",
     "Export (API)": "エクスポート (API)",
     "File": "ファイル",
@@ -1182,12 +1834,15 @@
     "Increase Brush Size in MaskEditor": "マスクエディタでブラシサイズを大きくする",
     "Install Missing Custom Nodes": "不足しているカスタムノードをインストール",
     "Interrupt": "中断",
+    "Job History": "ジョブ履歴",
     "Load Default Workflow": "デフォルトワークフローを読み込む",
     "Lock Canvas": "キャンバスをロック",
     "Manage group nodes": "グループノードを管理",
     "Manager": "マネージャー",
     "Manager Menu (Legacy)": "マネージャーメニュー（レガシー）",
     "Minimap": "ミニマップ",
+    "Mirror Horizontal in MaskEditor": "マスクエディタで左右反転",
+    "Mirror Vertical in MaskEditor": "マスクエディタで上下反転",
     "Model Library": "モデルライブラリ",
     "Move Selected Nodes Down": "選択したノードを下へ移動",
     "Move Selected Nodes Left": "選択したノードを左へ移動",
@@ -1199,9 +1854,18 @@
     "Node Library": "ノードライブラリ",
     "Node Links": "ノードリンク",
     "Open": "開く",
-    "Open 3D Viewer (Beta) for Selected Node": "選択したノードの3Dビューア（ベータ版）を開く",
+    "Open 3D Viewer (Beta) for Selected Node": "選択したノードの3Dビューアー（ベータ）を開く",
+    "Open Color Picker in MaskEditor": "MaskEditorでカラーピッカーを開く",
+    "Open Custom Nodes Folder": "カスタムノードフォルダーを開く",
+    "Open DevTools": "開発者ツールを開く",
+    "Open Inputs Folder": "入力フォルダーを開く",
+    "Open Logs Folder": "ログフォルダーを開く",
     "Open Mask Editor for Selected Node": "選択したノードのマスクエディタを開く",
+    "Open Models Folder": "モデルフォルダーを開く",
+    "Open Outputs Folder": "出力フォルダーを開く",
     "Open Sign In Dialog": "サインインダイアログを開く",
+    "Open extra_model_paths_yaml": "extra_model_paths.yaml を開く",
+    "Paste": "貼り付け",
     "Pin/Unpin Selected Items": "選択したアイテムのピン留め/ピン留め解除",
     "Pin/Unpin Selected Nodes": "選択したノードのピン留め/ピン留め解除",
     "Previous Opened Workflow": "前に開いたワークフロー",
@@ -1209,24 +1873,34 @@
     "Queue Prompt": "キューのプロンプト",
     "Queue Prompt (Front)": "キューのプロンプト (前面)",
     "Queue Selected Output Nodes": "選択した出力ノードをキューに追加",
+    "Quit": "終了",
     "Redo": "やり直す",
     "Refresh Node Definitions": "ノード定義を更新",
+    "Reinstall": "再インストール",
+    "Rename": "名前を変更",
     "Reset View": "ビューをリセット",
     "Resize Selected Nodes": "選択したノードのサイズ変更",
+    "Restart": "再起動",
+    "Rotate Left in MaskEditor": "マスクエディタで左に回転",
+    "Rotate Right in MaskEditor": "マスクエディタで右に回転",
     "Save": "保存",
     "Save As": "名前を付けて保存",
+    "Select All": "すべて選択",
+    "Set Subgraph Description": "サブグラフの説明を設定",
+    "Set Subgraph Search Aliases": "サブグラフの検索エイリアスを設定",
     "Show Keybindings Dialog": "キーバインドダイアログを表示",
     "Show Model Selector (Dev)": "モデルセレクターを表示（開発用）",
     "Show Settings Dialog": "設定ダイアログを表示",
     "Sign Out": "サインアウト",
+    "Toggle App Mode": "アプリモードを切り替え",
     "Toggle Essential Bottom Panel": "エッセンシャル下部パネルの切り替え",
     "Toggle Logs Bottom Panel": "ログ下部パネルの切り替え",
+    "Toggle Queue Panel V2": "キューパネルV2を切り替え",
     "Toggle Search Box": "検索ボックスの切り替え",
     "Toggle Terminal Bottom Panel": "ターミナル下部パネルの切り替え",
     "Toggle Theme (Dark/Light)": "テーマを切り替え（ダーク/ライト）",
     "Toggle View Controls Bottom Panel": "ビューコントロール下部パネルの切り替え",
     "Toggle promotion of hovered widget": "ホバー中のウィジェットの昇格を切り替え",
-    "Toggle the Custom Nodes Manager Progress Bar": "カスタムノードマネージャーの進行状況バーを切り替え",
     "Undo": "元に戻す",
     "Ungroup selected group nodes": "選択したグループノードのグループ解除",
     "Unload Models": "モデルのアンロード",
@@ -1237,7 +1911,8 @@
     "Workflows": "ワークフロー",
     "Zoom In": "ズームイン",
     "Zoom Out": "ズームアウト",
-    "Zoom to fit": "全体表示にズーム"
+    "Zoom to fit": "全体表示にズーム",
+    "linearMode_appModeToolbar_apps": "linearMode.appModeToolbar.apps"
   },
   "minimap": {
     "nodeColors": "ノードの色",
@@ -1247,20 +1922,66 @@
     "showLinks": "リンクを表示"
   },
   "missingModelsDialog": {
+    "acceptTerms": "利用規約に同意する",
+    "customModelsInstruction": "手動で探してダウンロードする必要があります。オンラインで検索するか（CivitaiやHugging Faceを試してください）、元のワークフロープロバイダーに連絡してください。",
+    "customModelsWarning": "これらの中には、認識できないカスタムモデルが含まれています。",
+    "description": "このワークフローには、まだダウンロードしていないモデルが必要です。",
     "doNotAskAgain": "再度表示しない",
-    "missingModels": "モデルが見つかりません",
-    "missingModelsMessage": "グラフを読み込む際に、次のモデルが見つかりませんでした"
+    "downloadAll": "すべてダウンロード",
+    "downloadAvailable": "ダウンロード可能",
+    "footerDescription": "これらのモデルをダウンロードし、正しいフォルダに配置してください。\n不足しているモデルがあるノードはキャンバス上で赤く表示されます。",
+    "gotIt": "了解しました",
+    "reEnableInSettings": "{link}で再有効化",
+    "reEnableInSettingsLink": "設定",
+    "title": "このワークフローにはモデルが不足しています",
+    "totalSize": "合計ダウンロードサイズ："
+  },
+  "missingNodes": {
+    "cloud": {
+      "description": "このワークフローはCloudバージョンでまだサポートされていないカスタムノードを使用しています。",
+      "gotIt": "了解",
+      "learnMore": "詳細はこちら",
+      "priorityMessage": "これらのノードは自動的にフラグ付けされ、優先的に追加されるようにしています。",
+      "replacementInstruction": "その間、これらのノード（キャンバス上で赤く表示）をサポートされているノードに置き換えるか、別のワークフローをお試しください。",
+      "title": "これらのノードはComfy Cloudではまだ利用できません"
+    },
+    "oss": {
+      "description": "このワークフローは、まだインストールされていないカスタムノードを使用しています。",
+      "replacementInstruction": "これらのノードをインストールするか、インストール済みの代替ノードに置き換えてください。不足しているノードはキャンバス上で赤く表示されます。",
+      "title": "このワークフローには不足しているノードがあります"
+    }
+  },
+  "nightly": {
+    "badge": {
+      "label": "プレビュー版",
+      "tooltip": "現在、ComfyUI のナイトリーバージョンを使用しています。これらの機能についてご意見があれば、フィードバックボタンからお知らせください。"
+    }
+  },
+  "nightlySurvey": {
+    "accept": "はい、協力します！",
+    "description": "この機能をご利用いただきありがとうございます。ご意見をお聞かせいただけますか？",
+    "dontAskAgain": "今後表示しない",
+    "loadError": "アンケートの読み込みに失敗しました。後でもう一度お試しください。",
+    "notNow": "今はしない",
+    "title": "改善にご協力ください"
   },
   "nodeCategories": {
+    "": "",
     "3d": "3d",
     "3d_models": "3Dモデル",
     "BFL": "BFL",
+    "Bria": "Bria",
     "ByteDance": "ByteDance",
+    "ElevenLabs": "ElevenLabs",
     "Gemini": "Gemini",
+    "Grok": "Grok",
+    "HitPaw": "HitPaw",
     "Ideogram": "Ideogram",
     "Kling": "Kling",
     "LTXV": "LTXV",
     "Luma": "Luma",
+    "Magnific": "Magnific",
+    "Meshy": "Meshy",
     "MiniMax": "MiniMax",
     "Moonvalley Marey": "Moonvalley Marey",
     "OpenAI": "OpenAI",
@@ -1270,10 +1991,13 @@
     "Runway": "Runway",
     "Sora": "Sora",
     "Stability AI": "Stability AI",
+    "Tencent": "Tencent",
+    "Topaz": "Topaz",
     "Tripo": "Tripo",
     "Veo": "Veo",
     "Vidu": "Vidu",
     "Wan": "Wan",
+    "WaveSpeed": "WaveSpeed",
     "_for_testing": "_テスト用",
     "advanced": "高度な機能",
     "animation": "アニメーション",
@@ -1294,6 +2018,7 @@
     "controlnet": "コントロールネット",
     "create": "作成",
     "custom_sampling": "カスタムサンプリング",
+    "dataset": "データセット",
     "debug": "デバッグ",
     "deprecated": "非推奨",
     "edit_models": "モデル編集",
@@ -1305,8 +2030,10 @@
     "image": "画像",
     "inpaint": "インペイント",
     "instructpix2pix": "インストラクションピクス2ピクス",
+    "kandinsky5": "kandinsky5",
     "latent": "潜在",
     "loaders": "ローダー",
+    "logic": "ロジック",
     "lotus": "lotus",
     "ltxv": "LTXV",
     "mask": "マスク",
@@ -1328,11 +2055,13 @@
     "scheduling": "スケジューリング",
     "sd": "sd",
     "sd3": "SD3",
+    "shader": "shader",
     "sigmas": "シグマ",
     "stable_cascade": "安定したカスケード",
     "string": "文字列",
     "style_model": "スタイルモデル",
     "text": "テキスト",
+    "textgen": "textgen",
     "training": "トレーニング",
     "transform": "変換",
     "unet": "U-Net",
@@ -1340,7 +2069,25 @@
     "upscaling": "アップスケーリング",
     "utils": "ユーティリティ",
     "video": "ビデオ",
-    "video_models": "ビデオモデル"
+    "video_models": "ビデオモデル",
+    "zimage": "zimage"
+  },
+  "nodeErrors": {
+    "content": "ノードコンテンツエラー",
+    "header": "ノードヘッダーエラー",
+    "render": "ノードレンダリングエラー",
+    "slots": "ノードスロットエラー",
+    "widgets": "ノードウィジェットエラー"
+  },
+  "nodeFilters": {
+    "hideDeprecated": "非推奨ノードを非表示",
+    "hideDeprecatedDescription": "明示的に有効化しない限り、非推奨としてマークされたノードを非表示にします",
+    "hideDevOnly": "開発者専用ノードを非表示",
+    "hideDevOnlyDescription": "開発者モードが有効でない限り、開発者専用ノードを非表示にします",
+    "hideExperimental": "実験的ノードを非表示",
+    "hideExperimentalDescription": "明示的に有効化しない限り、実験的としてマークされたノードを非表示にします",
+    "hideSubgraph": "サブグラフノードを一時的に非表示",
+    "hideSubgraphDescription": "ノードライブラリと検索からサブグラフノードを一時的に非表示にします"
   },
   "nodeHelpPage": {
     "documentationPage": "ドキュメントページ",
@@ -1350,6 +2097,32 @@
     "outputs": "出力",
     "type": "タイプ"
   },
+  "nodeReplacement": {
+    "compatibleAlternatives": "互換性のある代替案",
+    "installMissingNodes": "不足ノードをインストール",
+    "installationRequired": "インストールが必要",
+    "instructionMessage": "ワークフローを実行するには、これらのノードをインストールするか、インストール済みの代替ノードに置き換える必要があります。足りないノードはキャンバス上で{red}でハイライトされています。一部のノードは置き換えできず、Node Managerからインストールする必要があります。",
+    "notReplaceable": "インストールが必要",
+    "openNodeManager": "Node Managerを開く",
+    "quickFixAvailable": "クイック修正可能",
+    "redHighlight": "赤",
+    "replaceAll": "すべて置き換える",
+    "replaceAllWarning": "このグループ内の利用可能なすべてのノードを置き換えます。",
+    "replaceFailed": "ノードの置き換えに失敗しました",
+    "replaceNode": "ノードを置き換える",
+    "replaceSelected": "選択したものを置き換え ({count})",
+    "replaceWarning": "この操作はワークフローを永久に変更します。心配な場合は、先にコピーを保存してください。",
+    "replaceable": "置き換え可能",
+    "replaced": "置き換え済み",
+    "replacedAllNodes": "{count} 種類のノードを置き換えました",
+    "replacedNode": "置き換えたノード: {nodeType}",
+    "selectAll": "すべて選択",
+    "skipForNow": "今はスキップ",
+    "swapNodesGuide": "以下のノードは互換性のある代替品に自動的に置き換えることができます。",
+    "swapNodesTitle": "ノードの入れ替え",
+    "unknownNode": "不明",
+    "willBeReplacedBy": "このノードは次で置き換えられます："
+  },
   "nodeTemplates": {
     "enterName": "名前を入力",
     "saveAsTemplate": "テンプレートとして保存"
@@ -1357,6 +2130,7 @@
   "notSupported": {
     "continue": "続ける",
     "continueTooltip": "私のデバイスはサポートされていると確信しています",
+    "illustrationAlt": "悲しそうな女の子のイラスト",
     "learnMore": "詳細を見る",
     "message": "以下のデバイスのみサポートされています:",
     "reportIssue": "問題を報告",
@@ -1366,12 +2140,222 @@
     },
     "title": "お使いのデバイスはサポートされていません"
   },
+  "painter": {
+    "background": "背景",
+    "brush": "ブラシ",
+    "clear": "クリア",
+    "color": "カラーピッカー",
+    "eraser": "消しゴム",
+    "hardness": "硬さ",
+    "height": "高さ",
+    "size": "カーソルサイズ",
+    "tool": "ツール",
+    "uploadError": "ペインター画像のアップロードに失敗しました: {status} - {statusText}",
+    "width": "幅"
+  },
+  "progressToast": {
+    "allDownloadsCompleted": "すべてのダウンロードが完了しました",
+    "downloadingModel": "モデルをダウンロード中...",
+    "downloadsFailed": "{count}件のダウンロードに失敗 | {count}件のダウンロードに失敗 | {count}件のダウンロードに失敗",
+    "failed": "失敗",
+    "filter": {
+      "all": "すべて",
+      "completed": "完了",
+      "failed": "失敗"
+    },
+    "finished": "完了",
+    "importingModels": "モデルをインポート中",
+    "noImportsInQueue": "キューに{filter}はありません",
+    "pending": "保留中",
+    "progressCount": "{total}件中{completed}件"
+  },
+  "queue": {
+    "completedIn": "{duration}で完了",
+    "inQueue": "キューに追加中...",
+    "initializingAlmostReady": "初期化中 - まもなく準備完了",
+    "jobAddedToQueue": "ジョブがキューに追加されました",
+    "jobDetails": {
+      "computeHoursUsed": "使用計算時間",
+      "errorMessage": "エラーメッセージ",
+      "estimatedFinishIn": "終了予想時間",
+      "estimatedStartIn": "開始予想時間",
+      "eta": {
+        "minutes": "約{count}分 | 約{count}分",
+        "minutesRange": "約{lo}～{hi}分",
+        "seconds": "約{count}秒 | 約{count}秒",
+        "secondsRange": "約{lo}～{hi}秒"
+      },
+      "failedAfter": "失敗までの時間",
+      "generatedOn": "生成日時",
+      "header": "ジョブ詳細",
+      "jobId": "ジョブID",
+      "queuePosition": "キュー位置",
+      "queuePositionValue": "あなたの前に約{count}件のジョブがあります | あなたの前に約{count}件のジョブがあります",
+      "queuedAt": "キュー追加日時",
+      "report": "報告",
+      "timeElapsed": "経過時間",
+      "totalGenerationTime": "生成時間合計",
+      "workflow": "ワークフロー"
+    },
+    "jobHistory": "ジョブ履歴",
+    "jobList": {
+      "sortComputeHoursUsed": "使用計算時間（多い順）",
+      "sortMostRecent": "最新順",
+      "sortTotalGenerationTime": "生成時間合計（長い順）",
+      "undated": "日付なし"
+    },
+    "jobMenu": {
+      "addToCurrentWorkflow": "現在のワークフローに追加",
+      "cancelJob": "ジョブをキャンセル",
+      "copyErrorMessage": "エラーメッセージをコピー",
+      "copyJobId": "ジョブIDをコピー",
+      "delete": "削除",
+      "deleteAsset": "アセットを削除",
+      "download": "ダウンロード",
+      "exportWorkflow": "ワークフローをエクスポート",
+      "inspectAsset": "アセットを確認",
+      "openAsWorkflowNewTab": "ワークフローとして新しいタブで開く",
+      "openWorkflowNewTab": "ワークフローを新しいタブで開く",
+      "removeJob": "ジョブを削除",
+      "reportError": "エラーを報告"
+    },
+    "jobQueueing": "ジョブをキューに追加中",
+    "toggleJobHistory": "ジョブ履歴を切り替え"
+  },
   "releaseToast": {
+    "description": "このアップデートの最新の改善点と機能をご覧ください。",
     "newVersionAvailable": "新しいバージョンが利用可能です！",
     "skip": "スキップ",
     "update": "アップデート",
     "whatsNew": "新機能"
   },
+  "rightSidePanel": {
+    "addFavorite": "お気に入りに追加",
+    "advancedInputs": "詳細入力",
+    "bypass": "バイパス",
+    "color": "ノードカラー",
+    "enterSubgraph": "サブグラフに入る",
+    "errorHelp": "詳細なヘルプについては、{github} または {support} をご利用ください",
+    "errorHelpGithub": "GitHub イシューを提出",
+    "errorHelpSupport": "サポートに連絡",
+    "errors": "エラー",
+    "executionErrorOccurred": "実行中にエラーが発生しました。詳細はエラータブをご確認ください。",
+    "fallbackGroupTitle": "グループ",
+    "fallbackNodeTitle": "ノード",
+    "favorites": "お気に入り入力",
+    "favoritesNone": "お気に入り入力なし",
+    "favoritesNoneDesc": "お気に入りに追加した入力がここに表示されます",
+    "favoritesNoneHint": "パラメータタブで、任意の入力の{moreIcon}をクリックするとここに追加できます",
+    "favoritesNoneTooltip": "ウィジェットにスターを付けると、ノードを選択せずにすぐアクセスできます",
+    "globalSettings": {
+      "canvas": "キャンバス",
+      "connectionLinks": "接続リンク",
+      "gridSpacing": "グリッド間隔",
+      "linkShape": "リンクの形状",
+      "nodes": "ノード",
+      "nodes2": "ノード 2.0",
+      "searchPlaceholder": "クイック設定を検索...",
+      "showAdvanced": "詳細パラメータを表示",
+      "showAdvancedTooltip": "この設定をTRUEにすると、ノードのすべての詳細パラメータが表示されます",
+      "showConnectedLinks": "接続されたリンクを表示",
+      "showInfoBadges": "情報バッジを表示",
+      "showToolbox": "選択時にツールボックスを表示",
+      "snapNodesToGrid": "ノードをグリッドにスナップ",
+      "title": "グローバル設定",
+      "viewAllSettings": "すべての設定を表示"
+    },
+    "groupSettings": "グループ設定",
+    "groups": "グループ",
+    "hideAdvancedInputsButton": "詳細入力を非表示",
+    "hideInput": "入力を非表示",
+    "info": "情報",
+    "inputs": "入力",
+    "inputsNone": "入力なし",
+    "inputsNoneTooltip": "このノードには入力がありません",
+    "locateNode": "キャンバス上でノードを探す",
+    "missingNodePacks": {
+      "applyChanges": "変更を適用",
+      "cloudMessage": "このワークフローにはComfy Cloudでまだ利用できないカスタムノードが必要です。",
+      "collapse": "折りたたむ",
+      "expand": "展開",
+      "installAll": "すべてインストール",
+      "installNodePack": "ノードパックをインストール",
+      "installed": "インストール済み",
+      "installing": "インストール中...",
+      "ossManagerDisabledHint": "不足しているノードをインストールするには、まずPython環境で {pipCmd} を実行してNode Managerをインストールし、{flag} フラグを付けてComfyUIを再起動してください。",
+      "ossMessage": "このワークフローにはまだインストールしていないカスタムノードが使われています。",
+      "searchInManager": "ノードマネージャーで検索",
+      "title": "不足しているノードパック",
+      "unknownPack": "不明なパック",
+      "unsupportedTitle": "サポートされていないノードパック",
+      "viewInManager": "マネージャーで表示"
+    },
+    "mute": "ミュート",
+    "noErrors": "エラーなし",
+    "noSelection": "ノードを選択すると、そのプロパティと情報が表示されます。",
+    "nodeState": "ノードの状態",
+    "nodes": "ノード",
+    "nodesNoneDesc": "ノードなし",
+    "noneSearchDesc": "検索条件に一致する項目がありません",
+    "normal": "ノーマル",
+    "parameters": "パラメータ",
+    "pinned": "ピン留め",
+    "promptErrors": {
+      "no_prompt": {
+        "desc": "サーバーに送信されたワークフローデータが空です。これは予期しないシステムエラーの可能性があります。"
+      },
+      "prompt_no_outputs": {
+        "desc": "ワークフローに結果を生成する出力ノード（例：画像を保存、画像をプレビュー）が含まれていません。"
+      },
+      "server_error_cloud": {
+        "desc": "サーバーで予期しないエラーが発生しました。しばらくしてから再度お試しください。"
+      },
+      "server_error_local": {
+        "desc": "サーバーで予期しないエラーが発生しました。サーバーログをご確認ください。"
+      }
+    },
+    "properties": "プロパティ",
+    "removeFavorite": "お気に入りを解除",
+    "resetAllParameters": "すべてのパラメータをリセット",
+    "resetToDefault": "デフォルトにリセット",
+    "seeError": "エラーを見る",
+    "settings": "設定",
+    "showAdvancedInputsButton": "詳細入力を表示",
+    "showInput": "入力を表示",
+    "title": "ノードが選択されていません | 1件のノードが選択されています | {count}件のノードが選択されています",
+    "togglePanel": "プロパティパネルの切り替え",
+    "workflowOverview": "ワークフロー概要"
+  },
+  "secrets": {
+    "addSecret": "シークレットを追加",
+    "createdAt": "{date} に作成",
+    "deleteConfirmMessage": "「{name}」を削除してもよろしいですか？この操作は元に戻せません。",
+    "deleteConfirmTitle": "シークレットの削除",
+    "description": "シークレットは暗号化され、APIキーなどの機密データに使用されます。",
+    "descriptionUsage": "ここにトークンを保存すると、対応プロバイダーからプライベートや制限付きモデルのダウンロードが有効になります。",
+    "editSecret": "シークレットを編集",
+    "errors": {
+      "duplicateName": "この名前のシークレットはすでに存在します",
+      "duplicateProvider": "このプロバイダーのシークレットはすでに存在します",
+      "nameRequired": "名前は必須です",
+      "nameTooLong": "名前は255文字以内で入力してください",
+      "providerRequired": "プロバイダーは必須です",
+      "secretValueRequired": "シークレット値は必須です"
+    },
+    "lastUsed": "最終使用日：{date}",
+    "modelProviders": "モデルプロバイダー",
+    "name": "名前",
+    "namePlaceholder": "例：My API Key",
+    "noSecrets": "シークレットが保存されていません。最初のAPIキーを追加して始めましょう。",
+    "provider": "プロバイダー",
+    "providerHint": "任意。プロバイダーを選択するとトークンの自動利用が有効になります。",
+    "secretValue": "シークレット値",
+    "secretValueHint": "この値は暗号化され、再度表示することはできません。",
+    "secretValueHintEdit": "現在の値を保持する場合は空欄のままにしてください。",
+    "secretValuePlaceholder": "APIキーを入力してください",
+    "secretValuePlaceholderEdit": "変更する場合は新しい値を入力",
+    "title": "APIキーとシークレット"
+  },
   "selectionToolbox": {
     "Bypass Group Nodes": "グループノードをバイパス",
     "Set Group Nodes to Always": "グループノードを常に有効にする",
@@ -1384,6 +2368,8 @@
   "serverConfig": {
     "modifiedConfigs": "以下のサーバー設定を変更しました。変更を適用するには再起動してください。",
     "restart": "再起動",
+    "restartRequiredToastDetail": "サーバー設定の変更を適用するにはアプリを再起動してください。",
+    "restartRequiredToastSummary": "再起動が必要です",
     "revertChanges": "変更を元に戻す"
   },
   "serverConfigCategories": {
@@ -1452,6 +2438,10 @@
     "enable-cors-header": {
       "name": "CORSヘッダーを有効にする: \"*\"を使用してすべてのオリジンを許可するか、ドメインを指定する"
     },
+    "enable-manager-legacy-ui": {
+      "name": "レガシーManager UIを使用",
+      "tooltip": "新しいUIの代わりに従来のComfyUI-Manager UIを使用します。"
+    },
     "fast": {
       "name": "未テストの潜在的に品質を低下させる最適化を有効にする。"
     },
@@ -1553,6 +2543,8 @@
     "CustomColorPalettes": "カスタムカラーパレット",
     "DevMode": "開発モード",
     "EditTokenWeight": "トークンの重みを編集",
+    "Error System": "エラーシステム",
+    "Execution": "実行",
     "Extension": "拡張",
     "General": "一般",
     "Graph": "グラフ",
@@ -1568,10 +2560,14 @@
     "Menu": "メニュー",
     "ModelLibrary": "モデルライブラリ",
     "Node": "ノード",
+    "Node Library": "ノードライブラリ",
     "Node Search Box": "ノード検索ボックス",
     "Node Widget": "ノードウィジェット",
     "NodeLibrary": "ノードライブラリ",
+    "Nodes 2_0": "Nodes 2.0",
     "Notification Preferences": "通知設定",
+    "Other": "その他",
+    "PLY": "PLY",
     "PlanCredits": "プランとクレジット",
     "Pointer": "ポインタ",
     "Queue": "キュー",
@@ -1579,6 +2575,7 @@
     "Reroute": "リルート",
     "RerouteBeta": "ルート変更ベータ",
     "Scene": "シーン",
+    "Secrets": "シークレット",
     "Server": "サーバー",
     "Server-Config": "サーバー設定",
     "Settings": "設定",
@@ -1590,7 +2587,8 @@
     "Vue Nodes": "Vueノード",
     "VueNodes": "Vueノード",
     "Window": "ウィンドウ",
-    "Workflow": "ワークフロー"
+    "Workflow": "ワークフロー",
+    "Workspace": "ワークスペース"
   },
   "shape": {
     "CARD": "カード",
@@ -1616,11 +2614,18 @@
     "viewControls": "ビューコントロール"
   },
   "sideToolbar": {
+    "activeJobStatus": "アクティブジョブ: {status}",
     "assets": "アセット",
     "backToAssets": "すべてのアセットに戻る",
     "browseTemplates": "サンプルテンプレートを表示",
     "downloads": "ダウンロード",
+    "folderView": {
+      "errorDetail": "このジョブの出力を取得できませんでした。もう一度お試しください。",
+      "errorSummary": "出力の読み込みに失敗しました"
+    },
+    "generatedAssetsHeader": "生成されたアセット",
     "helpCenter": "ヘルプセンター",
+    "importedAssetsHeader": "インポート済みアセット",
     "labels": {
       "assets": "アセット",
       "console": "コンソール",
@@ -1643,6 +2648,17 @@
     "noImportedFiles": "インポートされたファイルが見つかりません",
     "nodeLibrary": "ノードライブラリ",
     "nodeLibraryTab": {
+      "allNodes": "すべてのノード",
+      "blueprints": "ブループリント",
+      "custom": "カスタム",
+      "essentials": "必須",
+      "filter": "フィルター",
+      "filterOptions": {
+        "blueprints": "ブループリント",
+        "comfyNodes": "Comfyノード",
+        "extensions": "拡張機能",
+        "partnerNodes": "パートナーノード"
+      },
       "groupBy": "グループ化",
       "groupStrategies": {
         "category": "カテゴリ",
@@ -1652,7 +2668,20 @@
         "source": "ソース",
         "sourceDesc": "ソースタイプ（Core、Custom、API）でグループ化"
       },
+      "noBookmarkedNodes": "お気に入りはまだありません",
       "resetView": "ビューをデフォルトにリセット",
+      "sections": {
+        "bookmarked": "ブックマーク済み",
+        "comfyBlueprints": "Comfyブループリント",
+        "comfyNodes": "Comfyノード",
+        "extensions": "拡張機能",
+        "favoriteNode": "お気に入りノード",
+        "favorites": "お気に入り",
+        "myBlueprints": "マイブループリント",
+        "partnerNodes": "パートナーノード",
+        "subgraphBlueprints": "サブグラフブループリント",
+        "unfavoriteNode": "お気に入りノードから削除"
+      },
       "sortBy": {
         "alphabetical": "アルファベット順",
         "alphabeticalDesc": "グループ内でアルファベット順に並び替え",
@@ -1661,8 +2690,62 @@
       },
       "sortMode": "並び替えモード"
     },
+    "nodes": "ノード",
     "openWorkflow": "ローカルでワークフローを開く",
     "queue": "キュー",
+    "queueProgressOverlay": {
+      "activeJobs": "{count}件のアクティブジョブ",
+      "activeJobsShort": "{count} 件のアクティブ | {count} 件のアクティブ",
+      "activeJobsSuffix": "アクティブジョブ",
+      "cancelJobTooltip": "ジョブをキャンセル",
+      "clearAllJobsTooltip": "実行中のすべてのジョブをキャンセル",
+      "clearHistory": "ジョブキュー履歴をクリア",
+      "clearHistoryDialogAssetsNote": "これらのジョブで生成されたアセットは削除されず、アセットパネルからいつでも表示できます。",
+      "clearHistoryDialogDescription": "以下の完了または失敗したジョブは、このジョブキューパネルから削除されます。",
+      "clearHistoryDialogTitle": "ジョブキュー履歴をクリアしますか？",
+      "clearHistoryMenuAssetsNote": "メディアアセットは削除されません。",
+      "clearQueueTooltip": "キューをクリア",
+      "clearQueued": "キュー済みをクリア",
+      "colonPercent": ": {percent}",
+      "currentNode": "現在のノード：",
+      "dockedJobHistory": "ドックされたジョブ履歴",
+      "expandCollapsedQueue": "ジョブキューを展開",
+      "filterAllWorkflows": "すべてのワークフロー",
+      "filterBy": "フィルター条件",
+      "filterCurrentWorkflow": "現在のワークフロー",
+      "filterJobs": "ジョブをフィルター",
+      "inlineTotalLabel": "合計",
+      "interruptAll": "すべての実行中ジョブを中断",
+      "jobCompleted": "ジョブが完了しました",
+      "jobFailed": "ジョブが失敗しました",
+      "jobQueue": "ジョブキュー",
+      "jobsAddedToQueue": "{count} 件のジョブがキューに追加されました",
+      "jobsCompleted": "{count}件のジョブが完了",
+      "jobsFailed": "{count}件のジョブが失敗",
+      "moreOptions": "その他のオプション",
+      "noActiveJobs": "アクティブなジョブはありません",
+      "preview": "プレビュー",
+      "queuedJobsLabel": "{count} キュー中",
+      "queuedSuffix": "キュー済み",
+      "running": "実行中",
+      "runningJobsLabel": "{count} 実行中",
+      "runningQueuedSummary": "{running} 実行中、{queued} キュー中",
+      "searchJobs": "検索...",
+      "showAssets": "アセットを表示",
+      "showAssetsPanel": "アセットパネルを表示",
+      "showRunProgressBar": "実行進行バーを表示",
+      "sortBy": "並べ替え条件",
+      "sortJobs": "ジョブを並べ替え",
+      "stubClipTextEncode": "CLIPテキストエンコード：",
+      "title": "キュー進行状況",
+      "total": "合計: {percent}",
+      "viewAllJobs": "すべてのジョブを見る",
+      "viewGrid": "グリッド表示",
+      "viewJobHistory": "ジョブ履歴を見る",
+      "viewList": "リスト表示"
+    },
+    "searchAssets": "アセットを検索",
+    "sidebar": "サイドバー",
     "templates": "テンプレート",
     "themeToggle": "テーマを切り替え",
     "workflowTab": {
@@ -1686,60 +2769,208 @@
   },
   "subgraphStore": {
     "blueprintName": "サブグラフ名",
+    "blueprintNamePrompt": "サブグラフ名：",
+    "cannotDeleteGlobal": "インストール済みのブループリントは削除できません",
     "confirmDelete": "この操作により、ライブラリからサブグラフが完全に削除されます",
     "confirmDeleteTitle": "サブグラフを削除しますか？",
+    "disconnected": "切断されました",
+    "enterDescription": "説明を入力してください",
+    "enterSearchAliases": "検索用エイリアスを入力（カンマ区切り）",
     "hidden": "非表示／ネストされたパラメータ",
     "hideAll": "すべて非表示",
+    "linked": "（リンク済み）",
     "loadFailure": "サブグラフの読み込みに失敗しました",
     "overwriteBlueprint": "保存すると、現在のサブグラフが変更内容で上書きされます",
     "overwriteBlueprintTitle": "既存のサブグラフを上書きしますか？",
     "promoteOutsideSubgraph": "サブグラフ内でない場合、ウィジェットを昇格できません",
+    "promoteWidget": "ウィジェットを昇格: {name}",
     "publish": "サブグラフを公開",
     "publishSuccess": "ノードライブラリに保存されました",
     "publishSuccessMessage": "サブグラフはノードライブラリの「サブグラフブループリント」で見つけることができます",
     "saveBlueprint": "サブグラフをライブラリに保存",
+    "searchAliases": "エイリアスを検索",
     "showAll": "すべて表示",
     "showRecommended": "おすすめウィジェットを表示",
-    "shown": "ノード上で表示"
+    "shown": "ノード上で表示",
+    "unpromoteWidget": "ウィジェットの昇格を解除: {name}"
   },
   "subscription": {
     "addApiCredits": "APIクレジットを追加",
     "addCredits": "クレジットを追加",
+    "addCreditsLabel": "いつでもクレジット追加可能",
     "benefits": {
       "benefit1": "パートナーノード用月間クレジット — 必要に応じて追加購入可能",
-      "benefit2": "ジョブあたり最大30分の実行時間"
+      "benefit1FreeTier": "毎月のクレジット増加、いつでもチャージ可能",
+      "benefit2": "ジョブあたり最大30分の実行時間",
+      "benefit3": "独自のモデルを利用可能（Creator & Pro）"
     },
     "beta": "ベータ版",
+    "billedMonthly": "毎月請求",
+    "billedYearly": "{total} 年間請求",
+    "billingComingSoon": {
+      "message": "チーム向けの請求機能が近日中に追加されます。ワークスペースごとに席数単位でプランに加入できるようになります。今後のアップデートをお待ちください。",
+      "title": "近日公開"
+    },
+    "cancelDialog": {
+      "confirmCancel": "サブスクリプションをキャンセル",
+      "description": "アクセスは{date}まで継続されます。今後請求されることはなく、ワークスペースとクレジットは保持されます。いつでも再購読できます。",
+      "endOfBillingPeriod": "請求期間の終了",
+      "failed": "サブスクリプションのキャンセルに失敗しました",
+      "keepSubscription": "サブスクリプションを維持する",
+      "title": "サブスクリプションのキャンセル"
+    },
+    "cancelSubscription": "サブスクリプションをキャンセル",
+    "cancelSuccess": "サブスクリプションが正常にキャンセルされました",
+    "canceled": "キャンセル済み",
+    "canceledCard": {
+      "description": "今後請求されることはありません。{date}まで機能は有効です。",
+      "title": "サブスクリプションはキャンセルされました"
+    },
+    "changeTo": "{plan}に変更",
+    "chooseBestPlanWorkspace": "ワークスペースに最適なプランを選択してください",
     "comfyCloud": "Comfy Cloud",
+    "comfyCloudLogo": "Comfy Cloud ロゴ",
+    "contactOwnerToSubscribe": "サブスクリプションのためにワークスペースのオーナーに連絡してください",
+    "contactUs": "お問い合わせ",
+    "creditsRemainingThisMonth": "今月残りのクレジット",
+    "creditsRemainingThisYear": "今年残りのクレジット",
+    "creditsYouveAdded": "追加したクレジット",
+    "currentPlan": "現在のプラン",
+    "customLoRAsLabel": "独自のLoRAをインポート",
+    "description": "あなたに最適なプランを選択してください",
+    "descriptionWorkspace": "ワークスペースに最適なプランを選択してください",
     "expiresDate": "{date} に期限切れ",
+    "freeTier": {
+      "description": "無料プランには、Comfy Cloudをお試しいただける毎月{credits}クレジットが含まれています。",
+      "descriptionGeneric": "無料プランには、Comfy Cloudをお試しいただける毎月のクレジット枠が含まれています。",
+      "nextRefresh": "クレジットは{date}にリフレッシュされます。",
+      "outOfCredits": {
+        "subtitle": "サブスクリプションでチャージや追加機能を利用しましょう",
+        "title": "無料クレジットがなくなりました"
+      },
+      "subscribeCta": "さらに詳しく",
+      "title": "無料プランをご利用中です",
+      "topUpBlocked": {
+        "title": "チャージや追加機能をアンロック"
+      },
+      "upgradeCta": "プランを見る"
+    },
+    "gpuLabel": "RTX 6000 Pro（96GB VRAM）",
+    "haveQuestions": "ご質問やエンタープライズについてのお問い合わせはこちら",
     "invoiceHistory": "請求履歴",
     "learnMore": "詳細を見る",
+    "managePayment": "支払いを管理",
+    "managePlan": "プランを管理",
     "manageSubscription": "サブスクリプションを管理",
+    "maxDuration": {
+      "creator": "30分",
+      "founder": "30分",
+      "free": "30分",
+      "pro": "1時間",
+      "standard": "30分"
+    },
+    "maxDurationLabel": "各ワークフロー実行の最大時間",
+    "maxMembersLabel": "最大メンバー数",
+    "member": "メンバー",
+    "memberCount": "{count}名のメンバー",
+    "membersLabel": "{count}名までのメンバー",
     "messageSupport": "サポートに連絡",
+    "monthly": "月額",
     "monthlyBonusDescription": "月間クレジットボーナス",
+    "monthlyCreditsInfo": "これらのクレジットは毎月リフレッシュされ、繰り越しはできません",
+    "monthlyCreditsLabel": "月間クレジット",
+    "monthlyCreditsPerMemberLabel": "月間クレジット / メンバー",
     "monthlyCreditsRollover": "これらのクレジットは翌月に繰り越されます",
+    "mostPopular": "最も人気",
     "nextBillingCycle": "次の請求サイクル",
+    "nextMonthInvoice": "翌月の請求書",
     "partnerNodesBalance": "\"パートナーノード\" クレジット残高",
     "partnerNodesCredits": "パートナーノードクレジット",
     "partnerNodesDescription": "商用/独自モデルの実行用",
     "perMonth": "USD / 月",
+    "plansAndPricing": "プランと価格",
     "prepaidCreditsInfo": "別途購入した有効期限のないクレジット",
     "prepaidDescription": "プリペイドクレジット",
+    "preview": {
+      "addCreditCard": "クレジットカードを追加",
+      "backToAllPlans": "すべてのプランに戻る",
+      "confirm": "確認",
+      "confirmPayment": "お支払いを確認",
+      "confirmPlanChange": "プラン変更を確認",
+      "eachMonthCreditsRefill": "毎月クレジットが補充されます",
+      "ends": "{date}に終了",
+      "hideFeatures": "機能を隠す",
+      "nextPaymentDue": "次回のお支払いは{date}です。いつでもキャンセルできます。",
+      "perMember": "/ メンバー",
+      "privacyPolicy": "プライバシーポリシー",
+      "proratedCharge": "{plan}の按分請求",
+      "proratedRefund": "{plan}の按分返金",
+      "showMoreFeatures": "さらに機能を表示",
+      "starting": "{date}から開始",
+      "startingToday": "本日から開始",
+      "terms": "利用規約",
+      "termsAgreement": "続行することで、Comfy Orgの{terms}および{privacy}に同意したものとみなされます。",
+      "totalDueToday": "本日のお支払い合計"
+    },
     "renewsDate": "{date} に更新",
     "required": {
+      "pollingFailed": "サブスクリプションの有効化に失敗しました",
+      "pollingSuccess": "サブスクリプションが有効化されました！",
+      "pollingTimeout": "サブスクリプションの待機がタイムアウトしました。再読み込みして再試行してください。",
       "subscribe": "購読する",
       "title": "購読する",
       "waitingForSubscription": "新しいタブで購読を完了してください。完了を自動的に検知します！"
     },
+    "resubscribe": "再購読する",
+    "resubscribeSuccess": "サブスクリプションが再開されました",
+    "resubscribeTo": "{plan}を再購読する",
+    "subscribeForMore": "アップグレード",
     "subscribeNow": "今すぐ購読",
+    "subscribeTo": "{plan}に登録",
     "subscribeToComfyCloud": "Comfy Cloudを購読",
     "subscribeToRun": "購読する",
     "subscribeToRunFull": "実行を購読",
+    "subscriptionRequiredMessage": "クラウドでワークフローを実行するにはメンバーにサブスクリプションが必要です",
+    "tierNameYearly": "{name} 年間",
+    "tiers": {
+      "creator": {
+        "name": "クリエイター"
+      },
+      "founder": {
+        "name": "ファウンダーエディション"
+      },
+      "free": {
+        "name": "無料"
+      },
+      "pro": {
+        "name": "プロ"
+      },
+      "standard": {
+        "name": "スタンダード"
+      }
+    },
     "title": "サブスクリプション",
     "titleUnsubscribed": "Comfy Cloudにサブスクライブ",
     "totalCredits": "総クレジット",
+    "upgrade": "アップグレード",
+    "upgradePlan": "プランをアップグレード",
+    "upgradeTo": "{plan}にアップグレード",
+    "upgradeToAddCredits": "クレジット追加のためアップグレード",
+    "usdPerMonth": "USD / 月",
+    "usdPerMonthPerMember": "USD / 月 / メンバー",
+    "videoEstimateExplanation": "これらの見積もりは、Wan 2.2 画像から動画テンプレートのデフォルト設定（5秒、640x640、16fps、4ステップサンプリング）に基づいています。",
+    "videoEstimateHelp": "このテンプレートの詳細",
+    "videoEstimateLabel": "Wan 2.2 画像から動画テンプレートで生成される約5秒動画数",
+    "videoEstimateTryTemplate": "このテンプレートを試す",
+    "videoTemplateBasedCredits": "Wan 2.2 画像から動画で生成された動画",
+    "viewEnterprise": "エンタープライズを見る",
     "viewMoreDetails": "詳細を表示",
+    "viewMoreDetailsPlans": "プランと価格の詳細を見る",
     "viewUsageHistory": "利用履歴を表示",
+    "workspaceNotSubscribed": "このワークスペースはサブスクリプションに加入していません",
+    "yearly": "年額",
+    "yearlyCreditsLabel": "年間合計クレジット",
+    "yearlyDiscount": "20%割引",
     "yourPlanIncludes": "ご利用プランに含まれるもの:"
   },
   "tabMenu": {
@@ -1751,8 +2982,14 @@
     "duplicateTab": "タブを複製",
     "removeFromBookmarks": "ブックマークから削除"
   },
+  "templateWidgets": {
+    "sort": {
+      "searchPlaceholder": "検索..."
+    }
+  },
   "templateWorkflows": {
     "activeFilters": "フィルター:",
+    "allTemplates": "すべてのテンプレート",
     "categories": "カテゴリ",
     "category": {
       "3D": "3D",
@@ -1779,6 +3016,7 @@
     "error": {
       "templateNotFound": "テンプレート「{templateName}」が見つかりません"
     },
+    "licenseFilter": "ライセンス",
     "loading": "テンプレートを読み込み中...",
     "loadingMore": "さらにテンプレートを読み込み中...",
     "modelFilter": "モデルフィルター",
@@ -1795,14 +3033,19 @@
       "default": "デフォルト",
       "modelSizeLowToHigh": "モデルサイズ（小さい順）",
       "newest": "新着順",
+      "popular": "人気",
       "recommended": "おすすめ",
       "searchPlaceholder": "検索...",
       "vramLowToHigh": "VRAM使用量（少ない順）"
     },
     "sorting": "並び替え",
     "title": "テンプレートを利用して開始",
+    "useCaseFilter": "タスク",
     "useCasesSelected": "{count}件のユースケース"
   },
+  "templates": {
+    "logoProviderSeparator": " ＆ "
+  },
   "toastMessages": {
     "cannotCreateSubgraph": "サブグラフを作成できません",
     "couldNotDetermineFileType": "ファイルタイプを判断できませんでした",
@@ -1810,6 +3053,7 @@
     "emptyCanvas": "キャンバスが空です",
     "errorCopyImage": "画像のコピーにエラーが発生しました: {error}",
     "errorLoadingModel": "モデルの読み込みエラー",
+    "errorOpenImage": "画像の読み込み中にエラーが発生しました: {error}",
     "errorSaveSetting": "設定{id}の保存エラー: {err}",
     "exportSuccess": "モデルを {format} として正常にエクスポートしました",
     "failedExecutionPathResolution": "選択したノードへのパスを解決できませんでした",
@@ -1829,9 +3073,23 @@
     "failedToLoadModel": "3Dモデルの読み込みに失敗しました",
     "failedToPurchaseCredits": "クレジットの購入に失敗しました: {error}",
     "failedToQueue": "キューに追加できませんでした",
+    "failedToSaveDraft": "ワークフロードラフトの保存に失敗しました",
+    "failedToToggleCamera": "カメラの切り替えに失敗しました",
+    "failedToToggleGrid": "グリッドの切り替えに失敗しました",
+    "failedToUpdateBackgroundColor": "背景色の更新に失敗しました",
+    "failedToUpdateBackgroundImage": "背景画像の更新に失敗しました",
+    "failedToUpdateBackgroundRenderMode": "背景レンダーモードを{mode}に更新できませんでした",
+    "failedToUpdateEdgeThreshold": "エッジしきい値の更新に失敗しました",
+    "failedToUpdateFOV": "視野角の更新に失敗しました",
+    "failedToUpdateLightIntensity": "光の強度の更新に失敗しました",
+    "failedToUpdateMaterialMode": "マテリアルモードの更新に失敗しました",
+    "failedToUpdateUpDirection": "上方向の更新に失敗しました",
+    "failedToUploadBackgroundImage": "背景画像のアップロードに失敗しました",
     "fileLoadError": "{fileName}でワークフローが見つかりません",
+    "fileTooLarge": "ファイルが大きすぎます（{size} MB）。サポートされている最大サイズは{maxSize} MBです",
     "fileUploadFailed": "ファイルのアップロードに失敗しました",
     "interrupted": "実行が中断されました",
+    "legacyMaskEditorDeprecated": "従来のマスクエディタは非推奨となり、まもなく削除されます。",
     "migrateToLitegraphReroute": "将来のバージョンではRerouteノードが削除されます。litegraph-native rerouteに移行するにはクリックしてください。",
     "modelLoadedSuccessfully": "3Dモデルが正常に読み込まれました",
     "no3dScene": "テクスチャを適用する3Dシーンがありません",
@@ -1858,12 +3116,14 @@
     "selectUser": "ユーザーを選択"
   },
   "userSettings": {
+    "accountSettings": "アカウント設定",
     "email": "メールアドレス",
     "name": "名前",
     "notSet": "未設定",
     "provider": "サインイン方法",
     "title": "ユーザー設定",
-    "updatePassword": "パスワードを更新"
+    "updatePassword": "パスワードを更新",
+    "workspaceSettings": "ワークスペース設定"
   },
   "validation": {
     "descriptionRequired": "説明が必要です",
@@ -1892,35 +3152,230 @@
     "updateFrontend": "フロントエンドを更新"
   },
   "vueNodesBanner": {
+    "desc": "– より柔軟なワークフロー、強力な新ウィジェット、拡張性を重視",
+    "title": "Nodes 2.0 のご紹介",
     "tryItOut": "試してみる"
   },
   "vueNodesMigration": {
     "button": "設定を開く",
     "message": "クラシックなノードデザインをお好みですか？"
   },
+  "vueNodesMigrationMainMenu": {
+    "message": "メインメニューからいつでもNodes 2.0に戻せます。"
+  },
+  "vueNodesSlot": {
+    "iterative": "（反復）"
+  },
   "welcome": {
     "getStarted": "はじめる",
     "title": "ComfyUIへようこそ"
   },
   "whatsNewPopup": {
+    "later": "後で",
     "learnMore": "詳細はこちら",
     "noReleaseNotes": "リリースノートはありません。"
   },
+  "widgetFileUpload": {
+    "browseFiles": "ファイルを選択",
+    "dropPrompt": "ファイルをドロップするか"
+  },
   "widgets": {
+    "boolean": {
+      "false": "false",
+      "true": "true"
+    },
+    "node2only": "Node 2.0専用",
     "selectModel": "モデルを選択",
     "uploadSelect": {
+      "maxSelectionReached": "選択の上限に達しました",
       "placeholder": "選択...",
       "placeholderAudio": "音声を選択...",
       "placeholderImage": "画像を選択...",
+      "placeholderMesh": "メッシュを選択...",
       "placeholderModel": "モデルを選択...",
       "placeholderUnknown": "メディアを選択...",
       "placeholderVideo": "動画を選択..."
+    },
+    "valueControl": {
+      "decrement": "値を減少",
+      "decrementDesc": "値から1を引くか、前のオプションを選択します",
+      "editSettings": "制御設定を編集",
+      "fixed": "固定値",
+      "fixedDesc": "値を変更しません",
+      "header": {
+        "after": "後",
+        "before": "前",
+        "postfix": "ワークフローの実行：",
+        "prefix": "値を自動的に更新"
+      },
+      "increment": "値を増加",
+      "incrementDesc": "値に1を加えるか、次のオプションを選択します",
+      "linkToGlobal": "リンク先",
+      "linkToGlobalDesc": "グローバル値の制御設定にリンクされたユニークな値",
+      "linkToGlobalSeed": "グローバル値",
+      "randomize": "値をランダム化",
+      "randomizeDesc": "各生成後に値をランダムにシャッフルします"
     }
   },
   "workflowService": {
     "enterFilename": "ファイル名を入力",
+    "enterFilenamePrompt": "ファイル名を入力してください：",
     "exportWorkflow": "ワークフローをエクスポート",
-    "saveWorkflow": "ワークフローを保存"
+    "saveWorkflow": "ワークフローを保存",
+    "savedAsApp": "アプリワークフローに変換されました",
+    "savedAsWorkflow": "ノードグラフのみのワークフローに変換されました"
+  },
+  "workspace": {
+    "addedToWorkspace": "{workspaceName}に追加されました",
+    "inviteAccepted": "招待を承諾しました",
+    "inviteFailed": "招待の承諾に失敗しました",
+    "unsavedChanges": {
+      "message": "未保存の変更があります。破棄してワークスペースを切り替えますか？",
+      "title": "未保存の変更"
+    },
+    "viewWorkspace": "ワークスペースを見る"
+  },
+  "workspaceAuth": {
+    "errors": {
+      "accessDenied": "このワークスペースへのアクセス権がありません",
+      "invalidFirebaseToken": "認証に失敗しました。もう一度ログインしてください。",
+      "notAuthenticated": "ワークスペースにアクセスするにはログインが必要です",
+      "tokenExchangeFailed": "ワークスペースの認証に失敗しました: {error}",
+      "workspaceNotFound": "ワークスペースが見つかりません"
+    }
+  },
+  "workspacePanel": {
+    "createWorkspaceDialog": {
+      "create": "作成",
+      "message": "ワークスペースはメンバーでクレジットプールを共有できます。作成後、あなたがオーナーになります。",
+      "nameLabel": "ワークスペース名*",
+      "namePlaceholder": "ワークスペース名を入力",
+      "title": "新しいワークスペースを作成"
+    },
+    "dashboard": {
+      "placeholder": "ダッシュボードのワークスペース設定"
+    },
+    "deleteDialog": {
+      "message": "未使用のクレジットや保存されていないアセットは失われます。この操作は元に戻せません。",
+      "messageWithName": "「{name}」を削除しますか？未使用のクレジットや保存されていないアセットは失われます。この操作は元に戻せません。",
+      "title": "このワークスペースを削除しますか？"
+    },
+    "editWorkspaceDialog": {
+      "nameLabel": "ワークスペース名",
+      "save": "保存",
+      "title": "ワークスペースの詳細を編集"
+    },
+    "invite": "招待",
+    "inviteLimitReached": "メンバーの上限50人に達しました",
+    "inviteMember": "メンバーを招待",
+    "inviteMemberDialog": {
+      "createLink": "リンクを作成",
+      "linkCopied": "コピーしました",
+      "linkCopyFailed": "コピーに失敗しました",
+      "linkStep": {
+        "copyLink": "リンクをコピー",
+        "done": "完了",
+        "message": "相手のアカウントがこのメールアドレスを使用していることを確認してください。",
+        "title": "このリンクを相手に送信してください"
+      },
+      "message": "共有可能な招待リンクを作成して送信してください",
+      "placeholder": "招待する人のメールアドレスを入力",
+      "title": "このワークスペースに人を招待"
+    },
+    "inviteUpsellDialog": {
+      "messageNotSubscribed": "このワークスペースにチームメンバーを追加するには、Creatorプラン以上が必要です。Standardプランはオーナー1名のみ対応しています。",
+      "messageSingleSeat": "Standardプランにはワークスペースオーナー1名分のシートが含まれています。追加メンバーを招待するには、Creatorプラン以上にアップグレードして複数シートを有効にしてください。",
+      "titleNotSubscribed": "メンバーを招待するにはサブスクリプションが必要です",
+      "titleSingleSeat": "現在のプランは1名のみ対応しています",
+      "upgradeToCreator": "Creatorにアップグレード",
+      "viewPlans": "プランを見る"
+    },
+    "leaveDialog": {
+      "leave": "退出",
+      "message": "ワークスペースのオーナーに連絡しない限り、再参加できません。",
+      "title": "このワークスペースを退出しますか？"
+    },
+    "members": {
+      "actions": {
+        "copyLink": "招待リンクをコピー",
+        "removeMember": "メンバーを削除",
+        "revokeInvite": "招待を取り消す"
+      },
+      "columns": {
+        "expiryDate": "有効期限",
+        "inviteDate": "招待日",
+        "joinDate": "参加日"
+      },
+      "createNewWorkspace": "新しいワークスペースを作成してください。",
+      "membersCount": "{count}/50人のメンバー",
+      "noInvites": "保留中の招待はありません",
+      "noMembers": "メンバーがいません",
+      "pendingInvitesCount": "{count}件の招待保留中",
+      "personalWorkspaceMessage": "現在、個人用ワークスペースには他のメンバーを招待できません。メンバーを追加するには、",
+      "tabs": {
+        "active": "アクティブ",
+        "pendingCount": "保留中（{count}）"
+      },
+      "upsellBannerSubscribe": "このワークスペースにチームメンバーを招待するには、Creatorプラン以上のご契約が必要です。",
+      "upsellBannerUpgrade": "追加のチームメンバーを招待するには、Creatorプラン以上にアップグレードしてください。",
+      "viewPlans": "プランを見る"
+    },
+    "menu": {
+      "deleteWorkspace": "ワークスペースを削除",
+      "deleteWorkspaceDisabledTooltip": "まずワークスペースの有効なサブスクリプションをキャンセルしてください",
+      "editWorkspace": "ワークスペースの詳細を編集",
+      "leaveWorkspace": "ワークスペースを退出"
+    },
+    "removeMemberDialog": {
+      "error": "メンバーの削除に失敗しました",
+      "message": "このメンバーはワークスペースから削除されます。使用済みのクレジットは返金されません。",
+      "remove": "メンバーを削除",
+      "success": "メンバーを削除しました",
+      "title": "このメンバーを削除しますか？"
+    },
+    "revokeInviteDialog": {
+      "message": "このメンバーは今後ワークスペースに参加できなくなります。招待リンクは無効になります。",
+      "revoke": "招待を取り消す",
+      "title": "この人の招待を取り消しますか？"
+    },
+    "tabs": {
+      "dashboard": "ダッシュボード",
+      "membersCount": "メンバー（{count}）",
+      "planCredits": "プランとクレジット"
+    },
+    "toast": {
+      "failedToCreateWorkspace": "ワークスペースの作成に失敗しました",
+      "failedToDeleteWorkspace": "ワークスペースの削除に失敗しました",
+      "failedToFetchWorkspaces": "ワークスペースの読み込みに失敗しました",
+      "failedToLeaveWorkspace": "ワークスペースの退出に失敗しました",
+      "failedToUpdateWorkspace": "ワークスペースの更新に失敗しました",
+      "workspaceCreated": {
+        "message": "プランに加入し、チームメイトを招待して、コラボレーションを始めましょう。",
+        "subscribe": "プランに加入",
+        "title": "ワークスペースを作成しました"
+      },
+      "workspaceDeleted": {
+        "message": "ワークスペースは完全に削除されました。",
+        "title": "ワークスペースを削除しました"
+      },
+      "workspaceLeft": {
+        "message": "ワークスペースから退出しました。",
+        "title": "ワークスペースから退出しました"
+      },
+      "workspaceUpdated": {
+        "message": "ワークスペースの詳細が保存されました。",
+        "title": "ワークスペースが更新されました"
+      }
+    }
+  },
+  "workspaceSwitcher": {
+    "createWorkspace": "新しいワークスペースを作成",
+    "maxWorkspacesReached": "所有できるワークスペースは10個までです。新しく作成するには1つ削除してください。",
+    "personal": "個人用",
+    "roleMember": "メンバー",
+    "roleOwner": "オーナー",
+    "subscribe": "サブスクライブ",
+    "switchWorkspace": "ワークスペースを切り替え"
   },
   "zoomControls": {
     "hideMinimap": "ミニマップを非表示",
diff --git a/src/locales/ja/nodeDefs.json b/src/locales/ja/nodeDefs.json
index eae0b85654..152c01aaec 100644
--- a/src/locales/ja/nodeDefs.json
+++ b/src/locales/ja/nodeDefs.json
@@ -39,6 +39,87 @@
       "sigmas": {
         "name": "シグマ"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "AddTextPrefix": {
+    "display_name": "テキストの接頭辞を追加",
+    "inputs": {
+      "prefix": {
+        "name": "接頭辞",
+        "tooltip": "追加する接頭辞。"
+      },
+      "texts": {
+        "name": "テキスト",
+        "tooltip": "処理するテキスト。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "テキスト",
+        "tooltip": "処理済みテキスト"
+      }
+    }
+  },
+  "AddTextSuffix": {
+    "display_name": "テキストの接尾辞を追加",
+    "inputs": {
+      "suffix": {
+        "name": "接尾辞",
+        "tooltip": "追加する接尾辞。"
+      },
+      "texts": {
+        "name": "テキスト",
+        "tooltip": "処理するテキスト。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "テキスト",
+        "tooltip": "処理済みテキスト"
+      }
+    }
+  },
+  "AdjustBrightness": {
+    "display_name": "明るさを調整",
+    "inputs": {
+      "factor": {
+        "name": "係数",
+        "tooltip": "明るさの係数。1.0 = 変更なし、<1.0 = 暗く、>1.0 = 明るく。"
+      },
+      "images": {
+        "name": "画像",
+        "tooltip": "処理する画像。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "画像",
+        "tooltip": "処理済み画像"
+      }
+    }
+  },
+  "AdjustContrast": {
+    "display_name": "コントラストを調整",
+    "inputs": {
+      "factor": {
+        "name": "係数",
+        "tooltip": "コントラストの係数。1.0 = 変更なし、<1.0 = コントラスト減少、>1.0 = コントラスト増加。"
+      },
+      "images": {
+        "name": "画像",
+        "tooltip": "処理する画像。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "画像",
+        "tooltip": "処理済み画像"
+      }
     }
   },
   "AlignYourStepsScheduler": {
@@ -70,6 +151,11 @@
         "name": "音量",
         "tooltip": "デシベル(dB)単位での音量調整。0 = 変更なし、+6 = 2倍、-6 = 半分、など"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "AudioConcat": {
@@ -86,6 +172,11 @@
         "name": "方向",
         "tooltip": "audio2をaudio1の後ろに追加するか前に追加するか。"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "AudioEncoderEncode": {
@@ -117,6 +208,47 @@
       }
     }
   },
+  "AudioEqualizer3Band": {
+    "display_name": "オーディオイコライザー（3バンド）",
+    "inputs": {
+      "audio": {
+        "name": "audio"
+      },
+      "high_freq": {
+        "name": "high_freq",
+        "tooltip": "高域シェルフのカットオフ周波数"
+      },
+      "high_gain_dB": {
+        "name": "high_gain_dB",
+        "tooltip": "高域（トレブル）のゲイン"
+      },
+      "low_freq": {
+        "name": "low_freq",
+        "tooltip": "低域シェルフのカットオフ周波数"
+      },
+      "low_gain_dB": {
+        "name": "low_gain_dB",
+        "tooltip": "低域（ベース）のゲイン"
+      },
+      "mid_freq": {
+        "name": "mid_freq",
+        "tooltip": "中域の中心周波数"
+      },
+      "mid_gain_dB": {
+        "name": "mid_gain_dB",
+        "tooltip": "中域のゲイン"
+      },
+      "mid_q": {
+        "name": "mid_q",
+        "tooltip": "中域のQファクター（帯域幅）"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "AudioMerge": {
     "description": "2つのオーディオトラックを波形を重ねて結合します。",
     "display_name": "オーディオ結合",
@@ -131,6 +263,11 @@
         "name": "結合方法",
         "tooltip": "オーディオ波形を結合するために使用する方法。"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "BasicGuider": {
@@ -142,6 +279,11 @@
       "model": {
         "name": "モデル"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "BasicScheduler": {
@@ -159,6 +301,50 @@
       "steps": {
         "name": "ステップ"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchImagesNode": {
+    "display_name": "画像をバッチ処理",
+    "inputs": {
+      "images": {
+        "name": "画像"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchLatentsNode": {
+    "display_name": "latentをバッチ処理",
+    "inputs": {
+      "latents": {
+        "name": "latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchMasksNode": {
+    "display_name": "マスクをバッチ処理",
+    "inputs": {
+      "masks": {
+        "name": "マスク"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "BetaSamplingScheduler": {
@@ -176,6 +362,114 @@
       "steps": {
         "name": "ステップ"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BriaImageEditNode": {
+    "description": "Briaの最新モデルを使って画像を編集します",
+    "display_name": "Bria画像編集",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後コントロール"
+      },
+      "guidance_scale": {
+        "name": "ガイダンススケール",
+        "tooltip": "値が高いほどプロンプトに忠実な画像になります。"
+      },
+      "image": {
+        "name": "画像"
+      },
+      "mask": {
+        "name": "マスク",
+        "tooltip": "省略した場合、編集は画像全体に適用されます。"
+      },
+      "model": {
+        "name": "model"
+      },
+      "moderation": {
+        "name": "モデレーション",
+        "tooltip": "モデレーション設定"
+      },
+      "negative_prompt": {
+        "name": "ネガティブプロンプト"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "画像編集の指示"
+      },
+      "seed": {
+        "name": "シード"
+      },
+      "steps": {
+        "name": "ステップ数"
+      },
+      "structured_prompt": {
+        "name": "構造化プロンプト",
+        "tooltip": "JSON形式の構造化編集プロンプトを含む文字列。より正確でプログラム的な制御が必要な場合は通常のプロンプトの代わりに使用してください。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "構造化プロンプト",
+        "tooltip": null
+      }
+    }
+  },
+  "BriaRemoveImageBackground": {
+    "description": "Bria RMBG 2.0 を使用して画像の背景を除去します。",
+    "display_name": "Bria 画像背景除去",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後の制御"
+      },
+      "image": {
+        "name": "画像"
+      },
+      "moderation": {
+        "name": "モデレーション",
+        "tooltip": "モデレーション設定"
+      },
+      "seed": {
+        "name": "シード",
+        "tooltip": "シードはノードを再実行するかどうかを制御します。シードに関わらず結果は非決定的です。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BriaRemoveVideoBackground": {
+    "description": "Bria を使用して動画の背景を除去します。",
+    "display_name": "Bria 動画背景除去",
+    "inputs": {
+      "background_color": {
+        "name": "背景色",
+        "tooltip": "出力動画の背景色。"
+      },
+      "control_after_generate": {
+        "name": "生成後の制御"
+      },
+      "seed": {
+        "name": "シード",
+        "tooltip": "シードはノードを再実行するかどうかを制御します。シードに関わらず結果は非決定的です。"
+      },
+      "video": {
+        "name": "動画"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ByteDanceFirstLastFrameNode": {
@@ -201,6 +495,10 @@
         "name": "最初のフレーム",
         "tooltip": "動画に使用する最初のフレーム。"
       },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "このパラメータは、seedance-1-5-pro 以外のモデルでは無視されます。"
+      },
       "last_frame": {
         "name": "最後のフレーム",
         "tooltip": "動画に使用する最後のフレーム。"
@@ -231,43 +529,6 @@
       }
     }
   },
-  "ByteDanceImageEditNode": {
-    "description": "プロンプトに基づいてAPI経由でByteDanceモデルを使用して画像を編集",
-    "display_name": "ByteDance画像編集",
-    "inputs": {
-      "control_after_generate": {
-        "name": "生成後の制御"
-      },
-      "guidance_scale": {
-        "name": "ガイダンススケール",
-        "tooltip": "値が高いほどプロンプトに忠実な画像になります"
-      },
-      "image": {
-        "name": "画像",
-        "tooltip": "編集するベース画像"
-      },
-      "model": {
-        "name": "モデル"
-      },
-      "prompt": {
-        "name": "プロンプト",
-        "tooltip": "画像編集の指示"
-      },
-      "seed": {
-        "name": "シード",
-        "tooltip": "生成に使用するシード値"
-      },
-      "watermark": {
-        "name": "透かし",
-        "tooltip": "画像に「AI生成」の透かしを追加するかどうか"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
   "ByteDanceImageNode": {
     "description": "プロンプトに基づいてAPI経由でByteDanceモデルを使用して画像を生成",
     "display_name": "ByteDance画像",
@@ -377,6 +638,10 @@
         "name": "duration",
         "tooltip": "出力動画の長さ（秒単位）。"
       },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "このパラメータは、seedance-1-5-pro 以外のモデルでは無視されます。"
+      },
       "image": {
         "name": "image",
         "tooltip": "動画の最初のフレームとして使用する画像。"
@@ -431,8 +696,7 @@
         "tooltip": "sequential_image_generation='auto'時の最大生成画像数。総画像数（入力＋生成）は15を超えることはできません。"
       },
       "model": {
-        "name": "model",
-        "tooltip": "モデル名"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
@@ -484,6 +748,10 @@
         "name": "長さ",
         "tooltip": "出力動画の長さ（秒単位）。"
       },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "このパラメータは、seedance-1-5-pro 以外のモデルでは無視されます。"
+      },
       "model": {
         "name": "モデル"
       },
@@ -525,6 +793,11 @@
       "positive": {
         "name": "ポジティブ"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "CFGNorm": {
@@ -763,6 +1036,25 @@
       }
     }
   },
+  "CLIPTextEncodeKandinsky5": {
+    "display_name": "CLIPTextEncodeKandinsky5",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "clip_l": {
+        "name": "clip_l"
+      },
+      "qwen25_7b": {
+        "name": "qwen25_7b"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "CLIPTextEncodeLumina2": {
     "description": "CLIPモデルを使用してシステムプロンプトとユーザープロンプトをエンコードし、特定の画像の生成をガイドするために使用できる埋め込みを生成します。",
     "display_name": "CLIP Text Encode for Lumina2",
@@ -953,6 +1245,29 @@
       }
     }
   },
+  "CenterCropImages": {
+    "display_name": "中央で画像を切り抜き",
+    "inputs": {
+      "height": {
+        "name": "高さ",
+        "tooltip": "切り抜き高さ。"
+      },
+      "images": {
+        "name": "画像",
+        "tooltip": "処理する画像。"
+      },
+      "width": {
+        "name": "幅",
+        "tooltip": "切り抜き幅。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "画像",
+        "tooltip": "処理済み画像"
+      }
+    }
+  },
   "CheckpointLoader": {
     "display_name": "設定でチェックポイントを読み込む（非推奨）",
     "inputs": {
@@ -1032,6 +1347,21 @@
       }
     }
   },
+  "ColorToRGBInt": {
+    "description": "カラーをRGB整数値に変換します。",
+    "display_name": "カラーをRGB整数に変換",
+    "inputs": {
+      "color": {
+        "name": "カラー"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "rgb整数値",
+        "tooltip": null
+      }
+    }
+  },
   "CombineHooks2": {
     "display_name": "フックを組み合わせる [2]",
     "inputs": {
@@ -1089,6 +1419,26 @@
       }
     }
   },
+  "ComfySwitchNode": {
+    "display_name": "スイッチ",
+    "inputs": {
+      "on_false": {
+        "name": "偽の場合"
+      },
+      "on_true": {
+        "name": "真の場合"
+      },
+      "switch": {
+        "name": "スイッチ"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "出力",
+        "tooltip": null
+      }
+    }
+  },
   "ConditioningAverage": {
     "display_name": "条件付け平均",
     "inputs": {
@@ -1323,10 +1673,12 @@
     },
     "outputs": {
       "0": {
-        "name": "ポジティブ"
+        "name": "ポジティブ",
+        "tooltip": null
       },
       "1": {
-        "name": "ネガティブ"
+        "name": "ネガティブ",
+        "tooltip": null
       }
     }
   },
@@ -1385,6 +1737,10 @@
         "name": "dim",
         "tooltip": "コンテキストウィンドウを適用する次元。"
       },
+      "freenoise": {
+        "name": "フリーノイズ",
+        "tooltip": "FreeNoiseノイズシャッフルを適用するかどうか。ウィンドウのブレンドを改善します。"
+      },
       "fuse_method": {
         "name": "fuse_method",
         "tooltip": "コンテキストウィンドウを融合するために使用する方法。"
@@ -1745,6 +2101,20 @@
       }
     }
   },
+  "CreateList": {
+    "display_name": "リストを作成",
+    "inputs": {
+      "inputs": {
+        "name": "入力"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "リスト",
+        "tooltip": null
+      }
+    }
+  },
   "CreateVideo": {
     "description": "画像から動画を作成します。",
     "display_name": "動画を作成",
@@ -1767,6 +2137,35 @@
       }
     }
   },
+  "CropByBBoxes": {
+    "description": "指定されたバウンディングボックスに基づいて、入力画像バッチから領域を切り抜きリサイズします。",
+    "display_name": "CropByBBoxes",
+    "inputs": {
+      "bboxes": {
+        "name": "バウンディングボックス"
+      },
+      "image": {
+        "name": "画像"
+      },
+      "output_height": {
+        "name": "出力高さ",
+        "tooltip": "各切り抜き画像がリサイズされる高さ。"
+      },
+      "output_width": {
+        "name": "出力幅",
+        "tooltip": "各切り抜き画像がリサイズされる幅。"
+      },
+      "padding": {
+        "name": "パディング",
+        "tooltip": "切り抜き前にバウンディングボックスの各辺に追加される余白（ピクセル単位）。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "すべての切り抜き画像が1つの画像バッチとしてまとめられます。"
+      }
+    }
+  },
   "CropMask": {
     "display_name": "マスクをトリミング",
     "inputs": {
@@ -1785,6 +2184,30 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CustomCombo": {
+    "display_name": "カスタムコンボ",
+    "inputs": {
+      "choice": {
+        "name": "選択"
+      },
+      "index": {},
+      "option1": {}
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "インデックス",
+        "tooltip": null
+      }
     }
   },
   "DiffControlNetLoader": {
@@ -1823,7 +2246,12 @@
     }
   },
   "DisableNoise": {
-    "display_name": "ノイズを無効にする"
+    "display_name": "ノイズを無効にする",
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
   },
   "DualCFGGuider": {
     "display_name": "デュアルCFGガイダー",
@@ -1849,6 +2277,11 @@
       "style": {
         "name": "style"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "DualCLIPLoader": {
@@ -1900,6 +2333,321 @@
       }
     }
   },
+  "ElevenLabsAudioIsolation": {
+    "description": "音声からバックグラウンドノイズを除去し、ボーカルやスピーチを分離します。",
+    "display_name": "ElevenLabs ボイスアイソレーション",
+    "inputs": {
+      "audio": {
+        "name": "音声",
+        "tooltip": "バックグラウンドノイズ除去のために処理する音声。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsInstantVoiceClone": {
+    "description": "音声サンプルからクローンボイスを作成します。クローンしたい声の音声録音を1～8個提供してください。",
+    "display_name": "ElevenLabs インスタントボイスクローン",
+    "inputs": {
+      "files": {
+        "name": "ファイル",
+        "tooltip": "ボイスクローン用の音声録音。"
+      },
+      "remove_background_noise": {
+        "name": "バックグラウンドノイズ除去",
+        "tooltip": "音声アイソレーションを使ってサンプルからバックグラウンドノイズを除去します。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "ボイス",
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsSpeechToSpeech": {
+    "description": "元の内容と感情を保ちながら、ある声から別の声へスピーチを変換します。",
+    "display_name": "ElevenLabs スピーチ・トゥ・スピーチ",
+    "inputs": {
+      "audio": {
+        "name": "音声",
+        "tooltip": "変換する元の音声。"
+      },
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "model": {
+        "name": "モデル",
+        "tooltip": "スピーチ・トゥ・スピーチ変換に使用するモデル。"
+      },
+      "model_similarity_boost": {
+        "name": "類似度ブースト"
+      },
+      "model_speed": {
+        "name": "スピード"
+      },
+      "model_style": {
+        "name": "スタイル"
+      },
+      "model_use_speaker_boost": {
+        "name": "スピーカーブーストを使用"
+      },
+      "output_format": {
+        "name": "出力フォーマット",
+        "tooltip": "音声の出力フォーマット。"
+      },
+      "remove_background_noise": {
+        "name": "バックグラウンドノイズ除去",
+        "tooltip": "音声アイソレーションを使って入力音声からバックグラウンドノイズを除去します。"
+      },
+      "seed": {
+        "name": "シード",
+        "tooltip": "再現性のためのシード値。"
+      },
+      "stability": {
+        "name": "安定性",
+        "tooltip": "ボイスの安定性。値が低いほど感情の幅が広がり、高いほど一貫性が増しますが単調になる可能性があります。"
+      },
+      "voice": {
+        "name": "ターゲットボイス",
+        "tooltip": "変換先の声。ボイスセレクターまたはインスタントボイスクローンから接続してください。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsSpeechToText": {
+    "description": "音声をテキストに書き起こします。自動言語検出、話者識別、音声イベントタグ付けに対応しています。",
+    "display_name": "ElevenLabs 音声からテキストへ",
+    "inputs": {
+      "audio": {
+        "name": "音声",
+        "tooltip": "書き起こす音声。"
+      },
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "language_code": {
+        "name": "言語コード",
+        "tooltip": "ISO-639-1 または ISO-639-3 言語コード（例: 'en', 'es', 'fra'）。自動検出の場合は空欄にしてください。"
+      },
+      "model": {
+        "name": "モデル",
+        "tooltip": "書き起こしに使用するモデル。"
+      },
+      "model_diarization_threshold": {
+        "name": "話者識別しきい値"
+      },
+      "model_diarize": {
+        "name": "話者識別"
+      },
+      "model_tag_audio_events": {
+        "name": "音声イベントタグ付け"
+      },
+      "model_temperature": {
+        "name": "温度"
+      },
+      "model_timestamps_granularity": {
+        "name": "タイムスタンプ粒度"
+      },
+      "num_speakers": {
+        "name": "話者数",
+        "tooltip": "予測する最大話者数。自動検出の場合は0に設定してください。"
+      },
+      "seed": {
+        "name": "シード値",
+        "tooltip": "再現性のためのシード値（決定性は保証されません）。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "テキスト",
+        "tooltip": null
+      },
+      "1": {
+        "name": "言語コード",
+        "tooltip": null
+      },
+      "2": {
+        "name": "単語JSON",
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToDialogue": {
+    "description": "テキストから複数話者の対話を生成します。各対話エントリには独自のテキストと音声があります。",
+    "display_name": "ElevenLabs テキストから対話へ",
+    "inputs": {
+      "apply_text_normalization": {
+        "name": "テキスト正規化適用",
+        "tooltip": "テキスト正規化モード。「auto」はシステムが判断、「on」は常に正規化を適用、「off」はスキップします。"
+      },
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "inputs": {
+        "name": "入力数",
+        "tooltip": "対話エントリの数。"
+      },
+      "inputs_text1": {
+        "name": "テキスト1"
+      },
+      "language_code": {
+        "name": "言語コード",
+        "tooltip": "ISO-639-1 または ISO-639-3 言語コード（例: 'en', 'es', 'fra'）。自動検出の場合は空欄にしてください。"
+      },
+      "model": {
+        "name": "モデル",
+        "tooltip": "対話生成に使用するモデル。"
+      },
+      "output_format": {
+        "name": "出力フォーマット",
+        "tooltip": "音声出力フォーマット。"
+      },
+      "seed": {
+        "name": "シード値",
+        "tooltip": "再現性のためのシード値。"
+      },
+      "stability": {
+        "name": "安定性",
+        "tooltip": "音声の安定性。値が低いほど感情の幅が広がり、値が高いほど一貫性が増しますが単調になる可能性があります。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToSoundEffects": {
+    "description": "テキスト説明から効果音を生成します。",
+    "display_name": "ElevenLabs テキストから効果音へ",
+    "inputs": {
+      "model": {
+        "name": "モデル",
+        "tooltip": "効果音生成に使用するモデル。"
+      },
+      "model_duration": {
+        "name": "長さ"
+      },
+      "model_loop": {
+        "name": "ループ"
+      },
+      "model_prompt_influence": {
+        "name": "プロンプト影響度"
+      },
+      "output_format": {
+        "name": "出力フォーマット",
+        "tooltip": "音声出力フォーマット。"
+      },
+      "text": {
+        "name": "テキスト",
+        "tooltip": "生成する効果音のテキスト説明。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToSpeech": {
+    "description": "テキストを音声に変換します。",
+    "display_name": "ElevenLabs テキスト読み上げ",
+    "inputs": {
+      "apply_text_normalization": {
+        "name": "apply_text_normalization",
+        "tooltip": "テキスト正規化モード。「auto」はシステムが自動で判断し、「on」は常に正規化を適用、「off」は正規化をスキップします。"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "language_code": {
+        "name": "language_code",
+        "tooltip": "ISO-639-1 または ISO-639-3 言語コード（例: 'en', 'es', 'fra'）。自動検出の場合は空欄にしてください。"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "テキスト読み上げに使用するモデル。"
+      },
+      "model_similarity_boost": {
+        "name": "similarity_boost"
+      },
+      "model_speed": {
+        "name": "speed"
+      },
+      "model_style": {
+        "name": "style"
+      },
+      "model_use_speaker_boost": {
+        "name": "use_speaker_boost"
+      },
+      "output_format": {
+        "name": "output_format",
+        "tooltip": "音声出力フォーマット。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "再現性のためのシード値（決定性は保証されません）。"
+      },
+      "stability": {
+        "name": "stability",
+        "tooltip": "ボイスの安定性。値が低いほど感情の幅が広がり、値が高いほど一貫性が増しますが、単調になる可能性があります。"
+      },
+      "text": {
+        "name": "text",
+        "tooltip": "音声に変換するテキスト。"
+      },
+      "voice": {
+        "name": "voice",
+        "tooltip": "音声合成に使用するボイス。Voice Selector または Instant Voice Clone から接続してください。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsVoiceSelector": {
+    "description": "テキスト読み上げ用の事前定義された ElevenLabs ボイスを選択します。",
+    "display_name": "ElevenLabs ボイスセレクター",
+    "inputs": {
+      "voice": {
+        "name": "voice",
+        "tooltip": "事前定義された ElevenLabs ボイスから選択してください。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "voice",
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyAceStep1_5LatentAudio": {
+    "display_name": "Empty Ace Step 1.5 Latent Audio",
+    "inputs": {
+      "batch_size": {
+        "name": "バッチサイズ",
+        "tooltip": "バッチ内のlatent画像の数。"
+      },
+      "seconds": {
+        "name": "秒数"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyAceStepLatentAudio": {
     "display_name": "EmptyAceStepLatentAudio",
     "inputs": {
@@ -1932,6 +2680,11 @@
         "name": "sample_rate",
         "tooltip": "空のオーディオクリップのサンプルレート。"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "EmptyChromaRadianceLatentImage": {
@@ -1975,6 +2728,25 @@
       }
     }
   },
+  "EmptyFlux2LatentImage": {
+    "display_name": "Empty Flux 2 Latent",
+    "inputs": {
+      "batch_size": {
+        "name": "バッチサイズ"
+      },
+      "height": {
+        "name": "高さ"
+      },
+      "width": {
+        "name": "幅"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyHunyuanImageLatent": {
     "display_name": "EmptyHunyuanImageLatent",
     "inputs": {
@@ -2016,6 +2788,28 @@
       }
     }
   },
+  "EmptyHunyuanVideo15Latent": {
+    "display_name": "Empty HunyuanVideo 1.5 Latent",
+    "inputs": {
+      "batch_size": {
+        "name": "バッチサイズ"
+      },
+      "height": {
+        "name": "高さ"
+      },
+      "length": {
+        "name": "長さ"
+      },
+      "width": {
+        "name": "幅"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyImage": {
     "display_name": "空の画像",
     "inputs": {
@@ -2065,6 +2859,11 @@
       "seconds": {
         "name": "秒"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "EmptyLatentHunyuan3Dv2": {
@@ -2077,6 +2876,11 @@
       "resolution": {
         "name": "解像度"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "EmptyLatentImage": {
@@ -2124,6 +2928,28 @@
       }
     }
   },
+  "EmptyQwenImageLayeredLatentImage": {
+    "display_name": "Empty Qwen Image Layered Latent",
+    "inputs": {
+      "batch_size": {
+        "name": "バッチサイズ"
+      },
+      "height": {
+        "name": "高さ"
+      },
+      "layers": {
+        "name": "レイヤー"
+      },
+      "width": {
+        "name": "幅"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptySD3LatentImage": {
     "display_name": "空のSD3潜在画像",
     "inputs": {
@@ -2171,6 +2997,11 @@
       "steps": {
         "name": "ステップ"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ExtendIntermediateSigmas": {
@@ -2191,6 +3022,11 @@
       "steps": {
         "name": "ステップ数"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FeatherMask": {
@@ -2211,6 +3047,11 @@
       "top": {
         "name": "上"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FlipSigmas": {
@@ -2219,6 +3060,102 @@
       "sigmas": {
         "name": "sigmas"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Flux2MaxImageNode": {
+    "description": "プロンプトと解像度に基づいて同期的に画像を生成します。",
+    "display_name": "Flux.2 [max] 画像",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "height": {
+        "name": "高さ"
+      },
+      "images": {
+        "name": "画像",
+        "tooltip": "参照用として最大9枚の画像を使用できます。"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "画像生成または編集のためのプロンプト"
+      },
+      "prompt_upsampling": {
+        "name": "プロンプトアップサンプリング",
+        "tooltip": "プロンプトのアップサンプリングを行うかどうか。有効にすると、より創造的な生成のためにプロンプトが自動的に修正されます。"
+      },
+      "seed": {
+        "name": "シード",
+        "tooltip": "ノイズ生成に使用されるランダムシード。"
+      },
+      "width": {
+        "name": "幅"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Flux2ProImageNode": {
+    "description": "プロンプトと解像度に基づいて同期的に画像を生成します。",
+    "display_name": "Flux.2 [pro] 画像",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "height": {
+        "name": "高さ"
+      },
+      "images": {
+        "name": "画像",
+        "tooltip": "参照用として最大9枚の画像を使用できます。"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "画像生成または編集のためのプロンプト"
+      },
+      "prompt_upsampling": {
+        "name": "プロンプトアップサンプリング",
+        "tooltip": "プロンプトのアップサンプリングを行うかどうか。有効にすると、より創造的な生成のためにプロンプトが自動的に修正されます。"
+      },
+      "seed": {
+        "name": "シード",
+        "tooltip": "ノイズ生成に使用されるランダムシード。"
+      },
+      "width": {
+        "name": "幅"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Flux2Scheduler": {
+    "display_name": "Flux2Scheduler",
+    "inputs": {
+      "height": {
+        "name": "高さ"
+      },
+      "steps": {
+        "name": "ステップ数"
+      },
+      "width": {
+        "name": "幅"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FluxDisableGuidance": {
@@ -2541,6 +3478,11 @@
       "s2": {
         "name": "s2"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FreeU_V2": {
@@ -2561,6 +3503,11 @@
       "s2": {
         "name": "s2"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "GITSScheduler": {
@@ -2619,6 +3566,102 @@
       }
     }
   },
+  "GLSLShader": {
+    "description": "GLSL ESフラグメントシェーダーを画像に適用します。u_resolution（vec2）は常に利用可能です。",
+    "display_name": "GLSLシェーダー",
+    "inputs": {
+      "floats": {
+        "name": "floats",
+        "tooltip": "floatsはシェーダーコード内でu_float0-4として利用可能"
+      },
+      "fragment_shader": {
+        "name": "fragment_shader",
+        "tooltip": "GLSLフラグメントシェーダーのソースコード（GLSL ES 3.00 / WebGL 2.0対応）"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "画像はシェーダーコード内でu_image0-4（sampler2D）として利用可能"
+      },
+      "ints": {
+        "name": "ints",
+        "tooltip": "intsはシェーダーコード内でu_int0-4として利用可能"
+      },
+      "size_mode": {
+        "name": "size_mode",
+        "tooltip": "出力サイズ：「from_input」は最初の入力画像の寸法を使用、「custom」は手動でサイズ指定"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "IMAGE0",
+        "tooltip": "シェーダーコード内でlayout(location = 0) out vec4 fragColor0として利用可能"
+      },
+      "1": {
+        "name": "IMAGE1",
+        "tooltip": "シェーダーコード内でlayout(location = 1) out vec4 fragColor1として利用可能"
+      },
+      "2": {
+        "name": "IMAGE2",
+        "tooltip": "シェーダーコード内でlayout(location = 2) out vec4 fragColor2として利用可能"
+      },
+      "3": {
+        "name": "IMAGE3",
+        "tooltip": "シェーダーコード内でlayout(location = 3) out vec4 fragColor3として利用可能"
+      }
+    }
+  },
+  "GeminiImage2Node": {
+    "description": "Google Vertex API を通じて画像を同期的に生成または編集します。",
+    "display_name": "Nano Banana Pro（Google Gemini Image）",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "アスペクト比",
+        "tooltip": "「auto」に設定すると入力画像のアスペクト比に合わせます。画像が指定されていない場合、通常は16:9の正方形が生成されます。"
+      },
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "files": {
+        "name": "ファイル",
+        "tooltip": "モデルのコンテキストとして使用するオプションのファイル。Gemini Generate Content Input Filesノードからの入力を受け付けます。"
+      },
+      "images": {
+        "name": "画像",
+        "tooltip": "オプションの参照画像。複数画像を含める場合はBatch Imagesノードを使用してください（最大14枚まで）。"
+      },
+      "model": {
+        "name": "モデル"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "生成する画像や適用する編集内容を説明するテキストプロンプト。モデルが従うべき制約、スタイル、詳細も含めてください。"
+      },
+      "resolution": {
+        "name": "解像度",
+        "tooltip": "出力の目標解像度。2K/4Kの場合はGeminiのネイティブアップスケーラーが使用されます。"
+      },
+      "response_modalities": {
+        "name": "応答モダリティ",
+        "tooltip": "「IMAGE」を選択すると画像のみ出力、「IMAGE+TEXT」を選択すると生成画像とテキスト応答の両方を返します。"
+      },
+      "seed": {
+        "name": "シード",
+        "tooltip": "シード値を特定の値に固定すると、モデルは繰り返しリクエストに対して同じ応答を提供するよう最善を尽くしますが、決定的な出力は保証されません。また、モデルやパラメータ設定（例：temperature）を変更すると、同じシード値でも応答が変化する場合があります。デフォルトではランダムなシード値が使用されます。"
+      },
+      "system_prompt": {
+        "name": "システムプロンプト",
+        "tooltip": "AIの挙動を決定する基本的な指示。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "GeminiImageNode": {
     "description": "Google API経由で画像を同期的に編集します。",
     "display_name": "Google Gemini 画像",
@@ -2646,9 +3689,17 @@
         "name": "プロンプト",
         "tooltip": "生成用のテキストプロンプト"
       },
+      "response_modalities": {
+        "name": "応答モダリティ",
+        "tooltip": "「IMAGE」を選択すると画像のみ出力、「IMAGE+TEXT」を選択すると生成画像とテキスト応答の両方を返します。"
+      },
       "seed": {
         "name": "シード",
         "tooltip": "シードが特定の値に固定されている場合、モデルは繰り返しリクエストに対して同じ応答を提供するよう最善を尽くします。決定的な出力は保証されません。また、モデルや温度などのパラメータ設定を変更すると、同じシード値を使用しても応答にばらつきが生じることがあります。デフォルトでは、ランダムなシード値が使用されます。"
+      },
+      "system_prompt": {
+        "name": "システムプロンプト",
+        "tooltip": "AIの挙動を決定する基本的な指示。"
       }
     },
     "outputs": {
@@ -2679,6 +3730,60 @@
       }
     }
   },
+  "GeminiNanoBanana2": {
+    "description": "Google Vertex API を使って画像を同期的に生成または編集します。",
+    "display_name": "Nano Banana 2",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "アスペクト比",
+        "tooltip": "「auto」に設定すると入力画像のアスペクト比に合わせます。画像が指定されていない場合は通常16:9の正方形が生成されます。"
+      },
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "files": {
+        "name": "ファイル",
+        "tooltip": "モデルのコンテキストとして使用する任意のファイル。Gemini Generate Content Input Filesノードからの入力を受け付けます。"
+      },
+      "images": {
+        "name": "画像",
+        "tooltip": "任意の参照画像。複数画像を含める場合はBatch Imagesノードを使用してください（最大14枚まで）。"
+      },
+      "model": {
+        "name": "モデル"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "生成する画像や適用する編集内容を説明するテキストプロンプトです。モデルが従うべき制約、スタイル、詳細なども含めてください。"
+      },
+      "resolution": {
+        "name": "解像度",
+        "tooltip": "出力画像の目標解像度です。2K/4Kの場合はGeminiのネイティブアップスケーラーが使用されます。"
+      },
+      "response_modalities": {
+        "name": "レスポンスモダリティ"
+      },
+      "seed": {
+        "name": "シード",
+        "tooltip": "シード値を特定の値に固定すると、モデルは繰り返しリクエストに対して同じ応答を返すよう最善を尽くしますが、完全な決定論的出力は保証されません。また、モデルやパラメータ設定（例：temperature）を変更すると、同じシード値でも応答が変化する場合があります。デフォルトではランダムなシード値が使用されます。"
+      },
+      "system_prompt": {
+        "name": "システムプロンプト",
+        "tooltip": "AIの挙動を決定する基本的な指示です。"
+      },
+      "thinking_level": {
+        "name": "思考レベル"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "GeminiNode": {
     "description": "GoogleのGemini AIモデルでテキスト応答を生成します。テキスト、画像、音声、動画など複数の種類の入力をコンテキストとして提供し、より関連性の高い意味のある応答を生成できます。",
     "display_name": "Google Gemini",
@@ -2710,6 +3815,10 @@
         "name": "シード",
         "tooltip": "シードを特定の値に固定すると、モデルは繰り返しリクエストに対して同じ応答を提供するよう最善を尽くします。確定的な出力は保証されません。また、モデルや温度などのパラメータ設定を変更すると、同じシード値を使用しても応答にばらつきが生じることがあります。デフォルトではランダムなシード値が使用されます。"
       },
+      "system_prompt": {
+        "name": "システムプロンプト",
+        "tooltip": "AIの挙動を決定する基本的な指示。"
+      },
       "video": {
         "name": "動画",
         "tooltip": "モデルのコンテキストとして使用するオプションの動画。"
@@ -2721,6 +3830,72 @@
       }
     }
   },
+  "GenerateTracks": {
+    "display_name": "GenerateTracks",
+    "inputs": {
+      "bezier": {
+        "name": "ベジエ",
+        "tooltip": "中間点を制御点としてベジエ曲線パスを有効にします。"
+      },
+      "end_x": {
+        "name": "終了X",
+        "tooltip": "終了位置の正規化されたX座標（0-1）。"
+      },
+      "end_y": {
+        "name": "終了Y",
+        "tooltip": "終了位置の正規化されたY座標（0-1）。"
+      },
+      "height": {
+        "name": "高さ"
+      },
+      "interpolation": {
+        "name": "補間",
+        "tooltip": "パスに沿った動きのタイミング／速度を制御します。"
+      },
+      "mid_x": {
+        "name": "中間X",
+        "tooltip": "ベジエ曲線の正規化されたX制御点。「bezier」が有効な場合のみ使用されます。"
+      },
+      "mid_y": {
+        "name": "中間Y",
+        "tooltip": "ベジエ曲線の正規化されたY制御点。「bezier」が有効な場合のみ使用されます。"
+      },
+      "num_frames": {
+        "name": "フレーム数"
+      },
+      "num_tracks": {
+        "name": "トラック数"
+      },
+      "start_x": {
+        "name": "開始X",
+        "tooltip": "開始位置の正規化されたX座標（0-1）。"
+      },
+      "start_y": {
+        "name": "開始Y",
+        "tooltip": "開始位置の正規化されたY座標（0-1）。"
+      },
+      "track_mask": {
+        "name": "トラックマスク",
+        "tooltip": "表示フレームを示すオプションのマスク。"
+      },
+      "track_spread": {
+        "name": "トラック間隔",
+        "tooltip": "トラック間の正規化された距離。トラックは動きの方向に対して垂直に広がります。"
+      },
+      "width": {
+        "name": "幅"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "トラック長",
+        "tooltip": null
+      }
+    }
+  },
   "GetImageSize": {
     "description": "画像の幅と高さを返し、変更せずに通過させます。",
     "display_name": "画像サイズ取得",
@@ -2731,13 +3906,16 @@
     },
     "outputs": {
       "0": {
-        "name": "幅"
+        "name": "width",
+        "tooltip": null
       },
       "1": {
-        "name": "高さ"
+        "name": "height",
+        "tooltip": null
       },
       "2": {
-        "name": "バッチサイズ"
+        "name": "batch_size",
+        "tooltip": null
       }
     }
   },
@@ -2765,6 +3943,149 @@
       }
     }
   },
+  "GrokImageEditNode": {
+    "description": "テキストプロンプトに基づいて既存の画像を編集します",
+    "display_name": "Grok画像編集",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "アスペクト比",
+        "tooltip": "複数の画像が画像入力に接続されている場合のみ使用できます。"
+      },
+      "control_after_generate": {
+        "name": "生成後の制御"
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "number_of_images": {
+        "name": "生成画像数",
+        "tooltip": "生成する編集済み画像の数"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "画像生成に使用するテキストプロンプト"
+      },
+      "resolution": {
+        "name": "解像度"
+      },
+      "seed": {
+        "name": "シード値",
+        "tooltip": "ノードを再実行するかどうかを決定するシード値。実際の結果はシード値に関係なく非決定的です。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokImageNode": {
+    "description": "テキストプロンプトに基づいてGrokで画像を生成します",
+    "display_name": "Grok画像生成",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "アスペクト比"
+      },
+      "control_after_generate": {
+        "name": "生成後の制御"
+      },
+      "model": {
+        "name": "model"
+      },
+      "number_of_images": {
+        "name": "生成画像数",
+        "tooltip": "生成する画像の数"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "画像生成に使用するテキストプロンプト"
+      },
+      "resolution": {
+        "name": "解像度"
+      },
+      "seed": {
+        "name": "シード値",
+        "tooltip": "ノードを再実行するかどうかを決定するシード値。実際の結果はシード値に関係なく非決定的です。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokVideoEditNode": {
+    "description": "テキストプロンプトに基づいて既存の動画を編集します。",
+    "display_name": "Grok動画編集",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後の制御"
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "希望する動画のテキスト説明。"
+      },
+      "seed": {
+        "name": "シード値",
+        "tooltip": "ノードを再実行するかどうかを決定するシード値。実際の結果はシード値に関係なく非決定的です。"
+      },
+      "video": {
+        "name": "動画",
+        "tooltip": "最大対応時間は8.7秒、ファイルサイズは50MBまでです。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokVideoNode": {
+    "description": "プロンプトまたは画像から動画を生成します",
+    "display_name": "Grok動画生成",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "アスペクト比",
+        "tooltip": "出力動画のアスペクト比。"
+      },
+      "control_after_generate": {
+        "name": "生成後の制御"
+      },
+      "duration": {
+        "name": "再生時間",
+        "tooltip": "出力動画の長さ（秒単位）。"
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "希望する動画のテキスト説明。"
+      },
+      "resolution": {
+        "name": "解像度",
+        "tooltip": "出力動画の解像度。"
+      },
+      "seed": {
+        "name": "シード値",
+        "tooltip": "ノードを再実行するかどうかを決定するシード値。実際の結果はシード値に関係なく非決定的です。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "GrowMask": {
     "display_name": "マスクを拡大",
     "inputs": {
@@ -2777,6 +4098,55 @@
       "tapered_corners": {
         "name": "テーパードコーナー"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HitPawGeneralImageEnhance": {
+    "description": "低解像度画像を超解像度にアップスケールし、アーティファクトやノイズを除去します。最大出力：32メガピクセル。",
+    "display_name": "HitPaw 一般画像強化",
+    "inputs": {
+      "auto_downscale": {
+        "name": "自動ダウンスケール",
+        "tooltip": "出力が制限を超える場合、入力画像を自動的にダウンスケールします。"
+      },
+      "image": {
+        "name": "画像"
+      },
+      "model": {
+        "name": "モデル"
+      },
+      "upscale_factor": {
+        "name": "アップスケール倍率"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HitPawVideoEnhance": {
+    "description": "低解像度動画を高解像度にアップスケールし、アーティファクトやノイズを除去します。表示価格は動画1秒あたりです。",
+    "display_name": "HitPaw 動画強化",
+    "inputs": {
+      "model": {
+        "name": "モデル"
+      },
+      "model_resolution": {
+        "name": "解像度"
+      },
+      "video": {
+        "name": "動画"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "Hunyuan3Dv2Conditioning": {
@@ -2788,10 +4158,12 @@
     },
     "outputs": {
       "0": {
-        "name": "ポジティブ"
+        "name": "positive",
+        "tooltip": null
       },
       "1": {
-        "name": "ネガティブ"
+        "name": "negative",
+        "tooltip": null
       }
     }
   },
@@ -2813,10 +4185,12 @@
     },
     "outputs": {
       "0": {
-        "name": "ポジティブ"
+        "name": "positive",
+        "tooltip": null
       },
       "1": {
-        "name": "ネガティブ"
+        "name": "negative",
+        "tooltip": null
       }
     }
   },
@@ -2890,6 +4264,120 @@
       }
     }
   },
+  "HunyuanVideo15ImageToVideo": {
+    "display_name": "HunyuanVideo15ImageToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "バッチサイズ"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "高さ"
+      },
+      "length": {
+        "name": "長さ"
+      },
+      "negative": {
+        "name": "ネガティブ"
+      },
+      "positive": {
+        "name": "ポジティブ"
+      },
+      "start_image": {
+        "name": "開始画像"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "幅"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "ポジティブ",
+        "tooltip": null
+      },
+      "1": {
+        "name": "ネガティブ",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "HunyuanVideo15LatentUpscaleWithModel": {
+    "display_name": "Hunyuan Video 15 Latent Upscale With Model",
+    "inputs": {
+      "crop": {
+        "name": "切り抜き"
+      },
+      "height": {
+        "name": "高さ"
+      },
+      "model": {
+        "name": "モデル"
+      },
+      "samples": {
+        "name": "サンプル"
+      },
+      "upscale_method": {
+        "name": "アップスケール方法"
+      },
+      "width": {
+        "name": "幅"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HunyuanVideo15SuperResolution": {
+    "display_name": "HunyuanVideo15SuperResolution",
+    "inputs": {
+      "clip_vision_output": {
+        "name": "clipビジョン出力"
+      },
+      "latent": {
+        "name": "潜在"
+      },
+      "negative": {
+        "name": "ネガティブ"
+      },
+      "noise_augmentation": {
+        "name": "ノイズ拡張"
+      },
+      "positive": {
+        "name": "ポジティブ"
+      },
+      "start_image": {
+        "name": "開始画像"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "ポジティブ",
+        "tooltip": null
+      },
+      "1": {
+        "name": "ネガティブ",
+        "tooltip": null
+      },
+      "2": {
+        "name": "潜在",
+        "tooltip": null
+      }
+    }
+  },
   "HyperTile": {
     "display_name": "ハイパータイル",
     "inputs": {
@@ -3094,6 +4582,11 @@
       "strength": {
         "name": "強度"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageBatch": {
@@ -3157,6 +4650,26 @@
       "image": {
         "name": "画像"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageCompare": {
+    "description": "2枚の画像をスライダーで並べて比較します。",
+    "display_name": "画像比較",
+    "inputs": {
+      "compare_view": {
+        "name": "compare_view"
+      },
+      "image_a": {
+        "name": "image_a"
+      },
+      "image_b": {
+        "name": "image_b"
+      }
     }
   },
   "ImageCompositeMasked": {
@@ -3180,6 +4693,11 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageCrop": {
@@ -3200,6 +4718,50 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageCropV2": {
+    "display_name": "画像切り抜き",
+    "inputs": {
+      "crop_region": {
+        "name": "crop_region"
+      },
+      "height": {},
+      "image": {
+        "name": "image"
+      },
+      "width": {},
+      "x": {},
+      "y": {}
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageDeduplication": {
+    "display_name": "画像の重複排除",
+    "inputs": {
+      "images": {
+        "name": "画像",
+        "tooltip": "処理する画像のリスト。"
+      },
+      "similarity_threshold": {
+        "name": "類似度しきい値",
+        "tooltip": "類似度しきい値（0-1）。値が高いほど類似しています。このしきい値を超える画像は重複とみなされます。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "画像",
+        "tooltip": "処理済み画像"
+      }
     }
   },
   "ImageFlip": {
@@ -3211,6 +4773,11 @@
       "image": {
         "name": "画像"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageFromBatch": {
@@ -3225,6 +4792,42 @@
       "length": {
         "name": "長さ"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageGrid": {
+    "display_name": "画像グリッド",
+    "inputs": {
+      "cell_height": {
+        "name": "セル高さ",
+        "tooltip": "グリッド内の各セルの高さ。"
+      },
+      "cell_width": {
+        "name": "セル幅",
+        "tooltip": "グリッド内の各セルの幅。"
+      },
+      "columns": {
+        "name": "列数",
+        "tooltip": "グリッドの列数。"
+      },
+      "images": {
+        "name": "画像",
+        "tooltip": "処理する画像のリスト。"
+      },
+      "padding": {
+        "name": "余白",
+        "tooltip": "画像間の余白。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "画像",
+        "tooltip": "処理済み画像"
+      }
     }
   },
   "ImageInvert": {
@@ -3235,6 +4838,28 @@
       }
     }
   },
+  "ImageMergeTileList": {
+    "display_name": "タイルのリストを画像に結合",
+    "inputs": {
+      "final_height": {
+        "name": "final_height"
+      },
+      "final_width": {
+        "name": "final_width"
+      },
+      "image_list": {
+        "name": "image_list"
+      },
+      "overlap": {
+        "name": "overlap"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ImageOnlyCheckpointLoader": {
     "display_name": "画像のみのチェックポイントローダー（img2vidモデル）",
     "inputs": {
@@ -3333,6 +4958,11 @@
       "rotation": {
         "name": "回転"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageScale": {
@@ -3381,6 +5011,11 @@
       "upscale_method": {
         "name": "アップスケール方法"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageScaleToTotalPixels": {
@@ -3392,6 +5027,9 @@
       "megapixels": {
         "name": "メガピクセル"
       },
+      "resolution_steps": {
+        "name": "解像度ステップ"
+      },
       "upscale_method": {
         "name": "拡大方法"
       }
@@ -3446,6 +5084,11 @@
       "spacing_width": {
         "name": "間隔の幅"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageToMask": {
@@ -3457,6 +5100,11 @@
       "image": {
         "name": "画像"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageUpscaleWithModel": {
@@ -3566,6 +5214,29 @@
       "mask": {
         "name": "マスク"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "JoinAudioChannels": {
+    "description": "左右のモノラルオーディオチャンネルをステレオオーディオに結合します。",
+    "display_name": "オーディオチャンネル結合",
+    "inputs": {
+      "audio_left": {
+        "name": "audio_left"
+      },
+      "audio_right": {
+        "name": "audio_right"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "audio",
+        "tooltip": null
+      }
     }
   },
   "JoinImageWithAlpha": {
@@ -3691,6 +5362,58 @@
       "sampler_name": {
         "name": "サンプラー名"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Kandinsky5ImageToVideo": {
+    "display_name": "Kandinsky5ImageToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "バッチサイズ"
+      },
+      "height": {
+        "name": "高さ"
+      },
+      "length": {
+        "name": "長さ"
+      },
+      "negative": {
+        "name": "ネガティブ"
+      },
+      "positive": {
+        "name": "ポジティブ"
+      },
+      "start_image": {
+        "name": "開始画像"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "幅"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "ポジティブ",
+        "tooltip": null
+      },
+      "1": {
+        "name": "ネガティブ",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": "空のビデオlatent"
+      },
+      "3": {
+        "name": "cond_latent",
+        "tooltip": "ノイズのないエンコード済み開始画像。モデル出力のlatentのノイズの多い開始部分を置き換えるために使用されます"
+      }
     }
   },
   "KarrasScheduler": {
@@ -3708,6 +5431,44 @@
       "steps": {
         "name": "ステップ"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingAvatarNode": {
+    "description": "1枚の写真と音声ファイルから、放送スタイルのデジタルヒューマン動画を生成します。",
+    "display_name": "Kling Avatar 2.0",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後に制御"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "アバターの参照画像。幅と高さは300px以上である必要があります。アスペクト比は1:2.5から2.5:1の間でなければなりません。"
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "アバターの動作、感情、カメラの動きを定義するためのオプションのプロンプトです。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "シードはノードを再実行するかどうかを制御します。シードに関係なく結果は非決定的です。"
+      },
+      "sound_file": {
+        "name": "sound_file",
+        "tooltip": "音声入力。2秒から300秒の間である必要があります。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "KlingCameraControlI2VNode": {
@@ -3862,6 +5623,46 @@
       }
     }
   },
+  "KlingFirstLastFrameNode": {
+    "description": "Kling V3 を使用して最初と最後のフレームからビデオを生成します。",
+    "display_name": "Kling 3.0 ファースト・ラストフレームからビデオ生成",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "duration": {
+        "name": "継続時間"
+      },
+      "end_frame": {
+        "name": "最後のフレーム"
+      },
+      "first_frame": {
+        "name": "最初のフレーム"
+      },
+      "generate_audio": {
+        "name": "音声を生成"
+      },
+      "model": {
+        "name": "モデル",
+        "tooltip": "モデルと生成設定。"
+      },
+      "model_resolution": {
+        "name": "解像度"
+      },
+      "prompt": {
+        "name": "プロンプト"
+      },
+      "seed": {
+        "name": "シード",
+        "tooltip": "シードはノードを再実行するかどうかを制御します。シードに関係なく結果は非決定的です。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingImage2VideoNode": {
     "display_name": "Kling 画像から動画へ",
     "inputs": {
@@ -3914,6 +5715,9 @@
       "aspect_ratio": {
         "name": "アスペクト比"
       },
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
       "human_fidelity": {
         "name": "人物忠実度",
         "tooltip": "被写体の参照類似度"
@@ -3942,6 +5746,39 @@
       "prompt": {
         "name": "プロンプト",
         "tooltip": "ポジティブテキストプロンプト"
+      },
+      "seed": {
+        "name": "シード",
+        "tooltip": "シードはノードを再実行するかどうかを制御します。シードに関係なく結果は非決定的です。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingImageToVideoWithAudio": {
+    "display_name": "Kling画像（最初のフレーム）からビデオと音声へ",
+    "inputs": {
+      "duration": {
+        "name": "継続時間"
+      },
+      "generate_audio": {
+        "name": "音声を生成"
+      },
+      "mode": {
+        "name": "モード"
+      },
+      "model_name": {
+        "name": "モデル名"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "ポジティブなテキストプロンプト。"
+      },
+      "start_frame": {
+        "name": "開始フレーム"
       }
     },
     "outputs": {
@@ -4011,6 +5848,299 @@
       }
     }
   },
+  "KlingMotionControl": {
+    "display_name": "Klingモーションコントロール",
+    "inputs": {
+      "character_orientation": {
+        "name": "キャラクターの向き",
+        "tooltip": "キャラクターの向き／オリエンテーションの参照元を制御します。\nビデオ: 動き、表情、カメラの動き、向きは参照ビデオに従います（他の詳細はプロンプトで指定）。\n画像: 動きや表情は参照ビデオに従いますが、キャラクターの向きは参照画像に合わせます（カメラや他の詳細はプロンプトで指定）。"
+      },
+      "keep_original_sound": {
+        "name": "元の音声を保持"
+      },
+      "mode": {
+        "name": "モード"
+      },
+      "model": {
+        "name": "モデル"
+      },
+      "prompt": {
+        "name": "プロンプト"
+      },
+      "reference_image": {
+        "name": "参照画像"
+      },
+      "reference_video": {
+        "name": "参照ビデオ",
+        "tooltip": "動きの参照ビデオは動きや表情を制御します。\nキャラクターの向きによる制限:\n - 画像: 3～10秒（最大10秒）\n - ビデオ: 3～30秒（最大30秒）"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProEditVideoNode": {
+    "description": "Klingの最新モデルで既存のビデオを編集します。",
+    "display_name": "Kling Omniビデオ編集（Pro）",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "keep_original_sound": {
+        "name": "元の音声を保持"
+      },
+      "model_name": {
+        "name": "モデル名"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "ビデオ内容を説明するテキストプロンプト。ポジティブ・ネガティブ両方の説明を含めることができます。"
+      },
+      "reference_images": {
+        "name": "参照画像",
+        "tooltip": "最大4枚まで追加の参照画像。"
+      },
+      "resolution": {
+        "name": "解像度"
+      },
+      "seed": {
+        "name": "シード",
+        "tooltip": "シードはノードを再実行するかどうかを制御します。シードに関係なく結果は非決定的です。"
+      },
+      "video": {
+        "name": "ビデオ",
+        "tooltip": "編集するビデオ。出力ビデオの長さは同じになります。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProFirstLastFrameNode": {
+    "description": "開始フレーム、オプションの終了フレーム、またはリファレンス画像を使用して最新のKlingモデルでビデオを生成します。",
+    "display_name": "Kling Omni ファースト・ラストフレームからビデオへ (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "duration": {
+        "name": "継続時間"
+      },
+      "end_frame": {
+        "name": "終了フレーム",
+        "tooltip": "ビデオのオプションの終了フレームです。「reference_images」と同時に使用することはできません。"
+      },
+      "first_frame": {
+        "name": "開始フレーム"
+      },
+      "generate_audio": {
+        "name": "音声を生成",
+        "tooltip": "ビデオ用の音声を生成します。kling-v3-omni のみ対応。"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "ビデオ内容を説明するテキストプロンプトです。肯定的・否定的な説明の両方を含めることができます。"
+      },
+      "reference_images": {
+        "name": "リファレンス画像",
+        "tooltip": "最大6枚までの追加リファレンス画像。"
+      },
+      "resolution": {
+        "name": "解像度"
+      },
+      "seed": {
+        "name": "シード",
+        "tooltip": "シードはノードを再実行するかどうかを制御します。シードに関係なく結果は非決定的です。"
+      },
+      "storyboards": {
+        "name": "ストーリーボード",
+        "tooltip": "個別のプロンプトと継続時間で一連のビデオセグメントを生成します。kling-v3-omni のみ対応。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProImageNode": {
+    "description": "Klingの最新モデルで画像を作成または編集します。",
+    "display_name": "Kling Omni 画像 (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "アスペクト比"
+      },
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "画像内容を説明するテキストプロンプトです。肯定的・否定的な説明の両方を含めることができます。"
+      },
+      "reference_images": {
+        "name": "リファレンス画像",
+        "tooltip": "最大10枚までの追加リファレンス画像。"
+      },
+      "resolution": {
+        "name": "解像度"
+      },
+      "seed": {
+        "name": "シード",
+        "tooltip": "シードはノードを再実行するかどうかを制御します。シードに関係なく結果は非決定的です。"
+      },
+      "series_amount": {
+        "name": "シリーズ数",
+        "tooltip": "一連の画像を生成します。kling-image-o1 では非対応。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProImageToVideoNode": {
+    "description": "最大7枚のリファレンス画像を使って最新のKlingモデルでビデオを生成します。",
+    "display_name": "Kling Omni 画像からビデオへ (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "アスペクト比"
+      },
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "duration": {
+        "name": "継続時間"
+      },
+      "generate_audio": {
+        "name": "音声を生成",
+        "tooltip": "ビデオ用の音声を生成します。kling-v3-omni のみ対応。"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "ビデオ内容を説明するテキストプロンプトです。肯定的・否定的な説明の両方を含めることができます。"
+      },
+      "reference_images": {
+        "name": "リファレンス画像",
+        "tooltip": "最大7枚までのリファレンス画像。"
+      },
+      "resolution": {
+        "name": "解像度"
+      },
+      "seed": {
+        "name": "シード",
+        "tooltip": "シードはノードを再実行するかどうかを制御します。シードに関係なく結果は非決定的です。"
+      },
+      "storyboards": {
+        "name": "ストーリーボード",
+        "tooltip": "個別のプロンプトと継続時間で一連のビデオセグメントを生成します。kling-v3-omni のみ対応。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProTextToVideoNode": {
+    "description": "テキストプロンプトを使って最新のKlingモデルでビデオを生成します。",
+    "display_name": "Kling Omni テキストからビデオへ (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "アスペクト比"
+      },
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "duration": {
+        "name": "継続時間"
+      },
+      "generate_audio": {
+        "name": "音声を生成"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "ビデオ内容を説明するテキストプロンプトです。肯定的・否定的な説明の両方を含めることができます。"
+      },
+      "resolution": {
+        "name": "解像度"
+      },
+      "seed": {
+        "name": "シード",
+        "tooltip": "シードはノードを再実行するかどうかを制御します。シードに関係なく結果は非決定的です。"
+      },
+      "storyboards": {
+        "name": "ストーリーボード",
+        "tooltip": "個別のプロンプトと継続時間で一連のビデオセグメントを生成します。o1 モデルでは無視されます。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProVideoToVideoNode": {
+    "description": "ビデオと最大4枚の参照画像を使用して、最新のKlingモデルでビデオを生成します。",
+    "display_name": "Kling Omni ビデオからビデオ (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "アスペクト比"
+      },
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "duration": {
+        "name": "長さ"
+      },
+      "keep_original_sound": {
+        "name": "元の音声を保持"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "ビデオ内容を説明するテキストプロンプト。肯定的および否定的な説明の両方を含めることができます。"
+      },
+      "reference_images": {
+        "name": "参照画像",
+        "tooltip": "追加で最大4枚の参照画像。"
+      },
+      "reference_video": {
+        "name": "参照ビデオ",
+        "tooltip": "参照として使用するビデオ。"
+      },
+      "resolution": {
+        "name": "解像度"
+      },
+      "seed": {
+        "name": "シード",
+        "tooltip": "シードはノードの再実行を制御します。シードに関係なく結果は非決定的です。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingSingleImageVideoEffectNode": {
     "description": "effect_scene に基づいてビデオを生成する際に、さまざまな特殊効果を実現します。",
     "display_name": "Kling ビデオエフェクト",
@@ -4125,6 +6255,35 @@
       }
     }
   },
+  "KlingTextToVideoWithAudio": {
+    "display_name": "Kling テキストからビデオ（音声付き）",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "アスペクト比"
+      },
+      "duration": {
+        "name": "長さ"
+      },
+      "generate_audio": {
+        "name": "音声を生成"
+      },
+      "mode": {
+        "name": "モード"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "肯定的なテキストプロンプト。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingVideoExtendNode": {
     "description": "Kling Video Extendノード。他のKlingノードで作成された動画を拡張します。video_idは他のKlingノードを使用して作成されます。",
     "display_name": "Kling Video Extend",
@@ -4159,6 +6318,54 @@
       }
     }
   },
+  "KlingVideoNode": {
+    "description": "Kling V3でビデオを生成します。テキストからビデオ、画像からビデオ、オプションでストーリーボードのマルチプロンプトやオーディオ生成に対応しています。",
+    "display_name": "Kling 3.0 ビデオ",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "generate_audio": {
+        "name": "オーディオ生成"
+      },
+      "model": {
+        "name": "モデル",
+        "tooltip": "モデルと生成設定。"
+      },
+      "model_aspect_ratio": {
+        "name": "アスペクト比"
+      },
+      "model_resolution": {
+        "name": "解像度"
+      },
+      "multi_shot": {
+        "name": "マルチショット",
+        "tooltip": "個別のプロンプトと時間で一連のビデオセグメントを生成します。"
+      },
+      "multi_shot_duration": {
+        "name": "時間"
+      },
+      "multi_shot_negative_prompt": {
+        "name": "ネガティブプロンプト"
+      },
+      "multi_shot_prompt": {
+        "name": "プロンプト"
+      },
+      "seed": {
+        "name": "シード",
+        "tooltip": "シードはノードの再実行を制御します。シードに関係なく結果は非決定的です。"
+      },
+      "start_frame": {
+        "name": "開始フレーム",
+        "tooltip": "オプションの開始フレーム画像。接続すると画像からビデオモードに切り替わります。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingVirtualTryOnNode": {
     "description": "Klingバーチャル試着ノード。人物画像と服画像を入力して、人物に服を試着させます。",
     "display_name": "Klingバーチャル試着",
@@ -4179,6 +6386,26 @@
       }
     }
   },
+  "LTXAVTextEncoderLoader": {
+    "description": "[レシピ]\n\nltxav: gemma 3 12B",
+    "display_name": "LTXV オーディオテキストエンコーダーローダー",
+    "inputs": {
+      "ckpt_name": {
+        "name": "ckpt_name"
+      },
+      "device": {
+        "name": "device"
+      },
+      "text_encoder": {
+        "name": "text_encoder"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LTXVAddGuide": {
     "display_name": "LTXVAddGuide",
     "inputs": {
@@ -4221,6 +6448,76 @@
       }
     }
   },
+  "LTXVAudioVAEDecode": {
+    "display_name": "LTXV オーディオVAEデコード",
+    "inputs": {
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "latent のデコードに使用する Audio VAE モデル。"
+      },
+      "samples": {
+        "name": "samples",
+        "tooltip": "デコードする latent。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Audio",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAEEncode": {
+    "display_name": "LTXV オーディオVAEエンコード",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "エンコードするオーディオ。"
+      },
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "エンコードに使用する Audio VAE モデル。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Audio Latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAELoader": {
+    "display_name": "LTXV オーディオVAEローダー",
+    "inputs": {
+      "ckpt_name": {
+        "name": "ckpt_name",
+        "tooltip": "読み込む Audio VAE チェックポイント。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Audio VAE",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVConcatAVLatent": {
+    "display_name": "LTXVConcatAVLatent",
+    "inputs": {
+      "audio_latent": {
+        "name": "audio_latent"
+      },
+      "video_latent": {
+        "name": "video_latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
   "LTXVConditioning": {
     "display_name": "LTXV条件付け",
     "inputs": {
@@ -4273,6 +6570,33 @@
       }
     }
   },
+  "LTXVEmptyLatentAudio": {
+    "display_name": "LTXV 空のラテントオーディオ",
+    "inputs": {
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "設定を取得するための Audio VAE モデル。"
+      },
+      "batch_size": {
+        "name": "batch_size",
+        "tooltip": "バッチ内の latent オーディオサンプル数。"
+      },
+      "frame_rate": {
+        "name": "frame_rate",
+        "tooltip": "1秒あたりのフレーム数。"
+      },
+      "frames_number": {
+        "name": "frames_number",
+        "tooltip": "フレーム数。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Latent",
+        "tooltip": null
+      }
+    }
+  },
   "LTXVImgToVideo": {
     "display_name": "LTXV画像からビデオへ",
     "inputs": {
@@ -4319,6 +6643,47 @@
       }
     }
   },
+  "LTXVImgToVideoInplace": {
+    "display_name": "LTXVImgToVideoInplace",
+    "inputs": {
+      "bypass": {
+        "name": "バイパス",
+        "tooltip": "コンディショニングをバイパスします。"
+      },
+      "image": {
+        "name": "画像"
+      },
+      "latent": {
+        "name": "latent"
+      },
+      "strength": {
+        "name": "強度"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVLatentUpsampler": {
+    "display_name": "LTXVLatentUpsampler",
+    "inputs": {
+      "samples": {
+        "name": "サンプル"
+      },
+      "upscale_model": {
+        "name": "アップスケールモデル"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
   "LTXVPreprocess": {
     "display_name": "LTXVPreprocess",
     "inputs": {
@@ -4367,6 +6732,25 @@
       }
     }
   },
+  "LTXVSeparateAVLatent": {
+    "description": "LTXV Separate AV Latent",
+    "display_name": "LTXVSeparateAVLatent",
+    "inputs": {
+      "av_latent": {
+        "name": "av_latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "ビデオlatent",
+        "tooltip": null
+      },
+      "1": {
+        "name": "オーディオlatent",
+        "tooltip": null
+      }
+    }
+  },
   "LaplaceScheduler": {
     "display_name": "ラプラススケジューラー",
     "inputs": {
@@ -4385,6 +6769,11 @@
       "steps": {
         "name": "ステップ"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "LatentAdd": {
@@ -4522,6 +6911,11 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "LatentConcat": {
@@ -4585,6 +6979,25 @@
       }
     }
   },
+  "LatentCutToBatch": {
+    "display_name": "LatentCutToBatch",
+    "inputs": {
+      "dim": {
+        "name": "次元"
+      },
+      "samples": {
+        "name": "サンプル"
+      },
+      "slice_size": {
+        "name": "スライスサイズ"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LatentFlip": {
     "display_name": "潜在反転",
     "inputs": {
@@ -4738,6 +7151,19 @@
       }
     }
   },
+  "LatentUpscaleModelLoader": {
+    "display_name": "Latent アップスケールモデルを読み込む",
+    "inputs": {
+      "model_name": {
+        "name": "model_name"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LazyCache": {
     "description": "EasyCacheの自家製バージョン - EasyCacheをさらに「簡単に」実装するバージョン。全体的にはEasyCacheより劣りますが、一部の稀なケースでは優れており、ComfyUIのすべてとの普遍的な互換性があります。",
     "display_name": "LazyCache",
@@ -4772,8 +7198,7 @@
   "Load3D": {
     "display_name": "3Dを読み込む",
     "inputs": {
-      "clear": {
-      },
+      "clear": "クリア",
       "height": {
         "name": "高さ"
       },
@@ -4783,30 +7208,40 @@
       "model_file": {
         "name": "モデルファイル"
       },
-      "upload 3d model": {
-      },
+      "upload 3d model": "3Dモデルをアップロード",
+      "upload extra resources": "追加リソースをアップロード",
       "width": {
         "name": "幅"
       }
     },
     "outputs": {
       "0": {
-        "name": "画像"
+        "name": "image",
+        "tooltip": null
       },
       "1": {
-        "name": "マスク"
+        "name": "mask",
+        "tooltip": null
       },
       "2": {
-        "name": "メッシュパス"
+        "name": "mesh_path",
+        "tooltip": null
       },
       "3": {
-        "name": "法線"
+        "name": "normal",
+        "tooltip": null
       },
       "4": {
-        "name": "線画"
+        "name": "camera_info",
+        "tooltip": null
       },
       "5": {
-        "name": "カメラ情報"
+        "name": "recording_video",
+        "tooltip": null
+      },
+      "6": {
+        "name": "model_3d",
+        "tooltip": null
       }
     }
   },
@@ -4822,6 +7257,11 @@
       "upload": {
         "name": "アップロードするファイルを選択"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "LoadImage": {
@@ -4835,6 +7275,21 @@
       }
     }
   },
+  "LoadImageDataSetFromFolder": {
+    "display_name": "フォルダから画像データセットを読み込む",
+    "inputs": {
+      "folder": {
+        "name": "フォルダ",
+        "tooltip": "画像を読み込むフォルダ。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "画像",
+        "tooltip": "読み込まれた画像のリスト"
+      }
+    }
+  },
   "LoadImageMask": {
     "display_name": "画像を読み込む（マスクとして）",
     "inputs": {
@@ -4853,16 +7308,35 @@
     "description": "出力フォルダから画像を読み込みます。更新ボタンをクリックすると、ノードは画像リストを更新し、自動的に最初の画像を選択します。これにより、簡単に反復処理が可能になります。",
     "display_name": "画像の読み込み（出力から）",
     "inputs": {
+      "Auto-refresh after generation": {},
       "image": {
         "name": "画像"
       },
-      "refresh": {
-      },
+      "refresh": {},
       "upload": {
         "name": "アップロードするファイルを選択"
       }
     }
   },
+  "LoadImageTextDataSetFromFolder": {
+    "display_name": "フォルダから画像とテキストデータセットを読み込む",
+    "inputs": {
+      "folder": {
+        "name": "フォルダ",
+        "tooltip": "画像を読み込むフォルダ。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "画像",
+        "tooltip": "読み込まれた画像のリスト"
+      },
+      "1": {
+        "name": "テキスト",
+        "tooltip": "テキストキャプションのリスト"
+      }
+    }
+  },
   "LoadLatent": {
     "display_name": "潜在を読み込む",
     "inputs": {
@@ -4871,6 +7345,25 @@
       }
     }
   },
+  "LoadTrainingDataset": {
+    "display_name": "トレーニングデータセットの読み込み",
+    "inputs": {
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "保存されたデータセットが含まれるフォルダー名（出力ディレクトリ内）。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latents",
+        "tooltip": "latent 辞書のリスト"
+      },
+      "1": {
+        "name": "conditioning",
+        "tooltip": "conditioning リストのリスト"
+      }
+    }
+  },
   "LoadVideo": {
     "display_name": "ビデオを読み込む",
     "inputs": {
@@ -4921,6 +7414,60 @@
       }
     }
   },
+  "LoraLoaderBypass": {
+    "description": "LoRAをバイパスモードで適用します。通常のLoRAとは異なり、モデルの重みを変更せず、フォワードパス中にLoRAの計算を注入します。トレーニングシナリオで便利です。",
+    "display_name": "LoRAの読み込み（バイパス）（デバッグ用）",
+    "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "LoRAを適用するCLIPモデル。"
+      },
+      "lora_name": {
+        "name": "lora_name",
+        "tooltip": "LoRAの名前。"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "LoRAを適用する拡散モデル。"
+      },
+      "strength_clip": {
+        "name": "strength_clip",
+        "tooltip": "CLIPモデルをどの程度変更するか。この値は負にもできます。"
+      },
+      "strength_model": {
+        "name": "strength_model",
+        "tooltip": "拡散モデルをどの程度変更するか。この値は負にもできます。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "変更された拡散モデル。"
+      },
+      "1": {
+        "tooltip": "変更されたCLIPモデル。"
+      }
+    }
+  },
+  "LoraLoaderBypassModelOnly": {
+    "description": "LoRAをバイパスモードで適用します。通常のLoRAとは異なり、モデルの重みを変更せず、フォワードパス中にLoRAの計算を注入します。トレーニングシナリオで便利です。",
+    "display_name": "LoRAの読み込み（バイパス、モデルのみ）（デバッグ用）",
+    "inputs": {
+      "lora_name": {
+        "name": "lora_name"
+      },
+      "model": {
+        "name": "model"
+      },
+      "strength_model": {
+        "name": "strength_model"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "変更された拡散モデル。"
+      }
+    }
+  },
   "LoraLoaderModelOnly": {
     "description": "LoRAは拡散およびCLIPモデルを修正するために使用され、潜在のノイズ除去方法を変更します。複数のLoRAノードを連結できます。",
     "display_name": "LoRAローダーモデルのみ",
@@ -4944,6 +7491,10 @@
   "LoraModelLoader": {
     "display_name": "LoRAモデルを読み込み",
     "inputs": {
+      "bypass": {
+        "name": "バイパス",
+        "tooltip": "有効にすると、LoRAをバイパスモードで適用し、ベースモデルの重みを変更しません。トレーニングやモデルの重みをオフロードする際に便利です。"
+      },
       "lora": {
         "name": "LoRA",
         "tooltip": "拡散モデルに適用するLoRAモデル。"
@@ -4959,6 +7510,7 @@
     },
     "outputs": {
       "0": {
+        "name": "model",
         "tooltip": "変更された拡散モデル。"
       }
     }
@@ -4992,10 +7544,12 @@
     "display_name": "損失グラフをプロット",
     "inputs": {
       "filename_prefix": {
-        "name": "ファイル名プレフィックス"
+        "name": "ファイル名プレフィックス",
+        "tooltip": "保存される損失グラフ画像のファイル名プレフィックス。"
       },
       "loss": {
-        "name": "損失"
+        "name": "損失",
+        "tooltip": "トレーニングノードからの損失マップ。"
       }
     }
   },
@@ -5286,6 +7840,208 @@
       }
     }
   },
+  "MagnificImageRelightNode": {
+    "description": "画像のライティングを調整し、オプションで参照画像からの光の転送も可能です。",
+    "display_name": "Magnific 画像リライティング",
+    "inputs": {
+      "advanced_settings": {
+        "name": "advanced_settings",
+        "tooltip": "高度なライティング制御のための詳細設定。"
+      },
+      "change_background": {
+        "name": "change_background",
+        "tooltip": "プロンプトや参照画像に基づいて背景を変更します。"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "リライティングする画像。"
+      },
+      "interpolate_from_original": {
+        "name": "interpolate_from_original",
+        "tooltip": "生成の自由度を制限し、元画像により近づけます。"
+      },
+      "light_transfer_strength": {
+        "name": "light_transfer_strength",
+        "tooltip": "光転送の適用強度。"
+      },
+      "preserve_details": {
+        "name": "preserve_details",
+        "tooltip": "元画像の質感や細部を維持します。"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "ライティングのための説明的なガイダンス。強調表記（1-1.4）に対応。"
+      },
+      "reference_image": {
+        "name": "reference_image",
+        "tooltip": "光を転送するためのオプションの参照画像。"
+      },
+      "style": {
+        "name": "style",
+        "tooltip": "出力のスタイル設定。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageSkinEnhancerNode": {
+    "description": "複数の処理モードによるポートレートの肌補正。",
+    "display_name": "Magnific 画像スキンエンハンサー",
+    "inputs": {
+      "image": {
+        "name": "image",
+        "tooltip": "補正するポートレート画像。"
+      },
+      "mode": {
+        "name": "mode",
+        "tooltip": "処理モード：creative（芸術的補正）、faithful（元の外観を維持）、flexible（ターゲット最適化）。"
+      },
+      "sharpen": {
+        "name": "sharpen",
+        "tooltip": "シャープネスの強度レベル。"
+      },
+      "smart_grain": {
+        "name": "smart_grain",
+        "tooltip": "スマートグレインの強度レベル。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageStyleTransferNode": {
+    "description": "参照画像からスタイルを抽出し、入力画像に転送します。",
+    "display_name": "Magnific画像スタイル転送",
+    "inputs": {
+      "engine": {
+        "name": "engine",
+        "tooltip": "処理エンジンの選択。"
+      },
+      "fixed_generation": {
+        "name": "fixed_generation",
+        "tooltip": "無効にすると、各生成でランダム性が加わり、より多様な結果が得られます。"
+      },
+      "flavor": {
+        "name": "flavor",
+        "tooltip": "スタイル転送のフレーバー。"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "スタイル転送を適用する画像。"
+      },
+      "portrait_mode": {
+        "name": "portrait_mode",
+        "tooltip": "顔の強調のためにポートレートモードを有効にします。"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "reference_image": {
+        "name": "reference_image",
+        "tooltip": "スタイルを抽出する参照画像。"
+      },
+      "structure_strength": {
+        "name": "structure_strength",
+        "tooltip": "元画像の構造を維持します。"
+      },
+      "style_strength": {
+        "name": "style_strength",
+        "tooltip": "スタイル強度のパーセンテージ。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageUpscalerCreativeNode": {
+    "description": "プロンプトによる強化、スタイライズ、2x/4x/8x/16xのアップスケーリング。最大出力：25.3メガピクセル。",
+    "display_name": "Magnific画像アップスケール（クリエイティブ）",
+    "inputs": {
+      "auto_downscale": {
+        "name": "自動ダウンスケール",
+        "tooltip": "出力が最大ピクセル数を超える場合、入力画像を自動的にダウンスケールします。"
+      },
+      "creativity": {
+        "name": "クリエイティビティ"
+      },
+      "engine": {
+        "name": "エンジン"
+      },
+      "fractality": {
+        "name": "フラクタリティ",
+        "tooltip": "プロンプトの強さとピクセルごとの複雑さ。"
+      },
+      "hdr": {
+        "name": "HDR",
+        "tooltip": "定義とディテールのレベル。"
+      },
+      "image": {
+        "name": "画像"
+      },
+      "optimized_for": {
+        "name": "最適化対象"
+      },
+      "prompt": {
+        "name": "プロンプト"
+      },
+      "resemblance": {
+        "name": "類似度",
+        "tooltip": "元画像との類似度のレベル。"
+      },
+      "scale_factor": {
+        "name": "拡大倍率"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageUpscalerPreciseV2Node": {
+    "description": "シャープネス、グレイン、ディテールを細かく制御できる高忠実度アップスケーリング。最大出力：10060×10060ピクセル。",
+    "display_name": "Magnific画像アップスケール（精密V2）",
+    "inputs": {
+      "auto_downscale": {
+        "name": "自動ダウンスケール",
+        "tooltip": "出力が最大解像度を超える場合、入力画像を自動的にダウンスケールします。"
+      },
+      "flavor": {
+        "name": "フレーバー",
+        "tooltip": "処理スタイル：sublimeは一般用途、photoは写真用、photo_denoiserはノイズの多い写真用。"
+      },
+      "image": {
+        "name": "画像"
+      },
+      "scale_factor": {
+        "name": "拡大倍率"
+      },
+      "sharpen": {
+        "name": "シャープネス",
+        "tooltip": "画像のシャープネス強度。値が高いほどエッジの定義と明瞭さが増します。"
+      },
+      "smart_grain": {
+        "name": "スマートグレイン",
+        "tooltip": "画像が滑らかすぎたり人工的に見えないようにするためのインテリジェントなグレイン／テクスチャ強調。"
+      },
+      "ultra_detail": {
+        "name": "ウルトラディテール",
+        "tooltip": "アップスケーリング時に追加される細部、テクスチャ、マイクロディテールを制御します。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "Mahiro": {
     "description": "ネガティブなプロンプトとの差ではなく、ポジティブなプロンプトの「方向」によりスケールするようにガイダンスを修正します。",
     "display_name": "Mahiroはとても可愛いので、より良いガイダンス機能が必要です!! (。・ω・。)",
@@ -5301,6 +8057,50 @@
       }
     }
   },
+  "MakeTrainingDataset": {
+    "display_name": "トレーニングデータセットを作成",
+    "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "テキストをコンディショニングにエンコードするためのCLIPモデル。"
+      },
+      "images": {
+        "name": "画像",
+        "tooltip": "エンコードする画像のリスト。"
+      },
+      "texts": {
+        "name": "テキスト",
+        "tooltip": "テキストキャプションのリスト。長さn（画像と一致）、1（全てに繰り返し）、または省略（空文字列を使用）できます。"
+      },
+      "vae": {
+        "name": "vae",
+        "tooltip": "画像をlatentにエンコードするためのVAEモデル。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latentリスト",
+        "tooltip": "latent辞書のリスト"
+      },
+      "1": {
+        "name": "コンディショニング",
+        "tooltip": "コンディショニングリストのリスト"
+      }
+    }
+  },
+  "ManualSigmas": {
+    "display_name": "マニュアルシグマ",
+    "inputs": {
+      "sigmas": {
+        "name": "シグマ"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "MaskComposite": {
     "display_name": "マスク合成",
     "inputs": {
@@ -5319,6 +8119,11 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "MaskPreview": {
@@ -5336,6 +8141,371 @@
       "mask": {
         "name": "マスク"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MergeImageLists": {
+    "display_name": "画像リストを結合",
+    "inputs": {
+      "images": {
+        "name": "画像",
+        "tooltip": "処理する画像のリスト。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "画像",
+        "tooltip": "処理済み画像"
+      }
+    }
+  },
+  "MergeTextLists": {
+    "display_name": "テキストリストを結合",
+    "inputs": {
+      "texts": {
+        "name": "テキスト",
+        "tooltip": "処理するテキストのリスト。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "テキスト",
+        "tooltip": "処理済みテキスト"
+      }
+    }
+  },
+  "MeshyAnimateModelNode": {
+    "description": "事前にリギングされたキャラクターに特定のアニメーションアクションを適用します。",
+    "display_name": "Meshy：アニメートモデル",
+    "inputs": {
+      "action_id": {
+        "name": "action_id",
+        "tooltip": "利用可能な値の一覧は https://docs.meshy.ai/en/api/animation-library をご覧ください。"
+      },
+      "rig_task_id": {
+        "name": "rig_task_id"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyImageToModelNode": {
+    "display_name": "Meshy：画像からモデルへ",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "生成されるモデルのポーズモードを指定します。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "シードはノードの再実行を制御しますが、シードに関係なく結果は非決定的です。"
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "falseに設定すると、未処理の三角メッシュが返されます。"
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      },
+      "should_texture": {
+        "name": "should_texture",
+        "tooltip": "テクスチャを生成するかどうかを決定します。falseに設定するとテクスチャ工程をスキップし、テクスチャなしのメッシュが返されます。"
+      },
+      "should_texture_enable_pbr": {
+        "name": "enable_pbr"
+      },
+      "should_texture_texture_prompt": {
+        "name": "texture_prompt"
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyMultiImageToModelNode": {
+    "display_name": "Meshy：複数画像からモデルへ",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "images": {
+        "name": "images"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "生成されるモデルのポーズモードを指定します。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "シードはノードの再実行を制御しますが、シードに関係なく結果は非決定的です。"
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "falseに設定すると、未処理の三角メッシュが返されます。"
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      },
+      "should_texture": {
+        "name": "should_texture",
+        "tooltip": "テクスチャを生成するかどうかを決定します。falseに設定するとテクスチャ工程をスキップし、テクスチャなしのメッシュが返されます。"
+      },
+      "should_texture_enable_pbr": {
+        "name": "enable_pbr"
+      },
+      "should_texture_texture_prompt": {
+        "name": "texture_prompt"
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyRefineNode": {
+    "description": "以前に作成したドラフトモデルをリファインします。",
+    "display_name": "Meshy：ドラフトモデルのリファイン",
+    "inputs": {
+      "enable_pbr": {
+        "name": "enable_pbr",
+        "tooltip": "ベースカラーに加えてPBRマップ（金属度、粗さ、法線）を生成します。注意：Sculptureスタイルを使用する場合はfalseに設定してください。Sculptureスタイルは独自のPBRマップを生成します。"
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "model": {
+        "name": "model"
+      },
+      "texture_image": {
+        "name": "texture_image",
+        "tooltip": "「texture_image」と「texture_prompt」は同時に使用できません。"
+      },
+      "texture_prompt": {
+        "name": "texture_prompt",
+        "tooltip": "テクスチャリングプロセスをガイドするテキストプロンプトを入力してください。最大600文字。「texture_image」と同時に使用することはできません。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyRigModelNode": {
+    "description": "標準フォーマットでリギング済みキャラクターを提供します。自動リギングは、テクスチャのないメッシュ、非ヒューマノイドアセット、または手足や体の構造が不明瞭なヒューマノイドアセットには適していません。",
+    "display_name": "Meshy：モデルのリギング",
+    "inputs": {
+      "height_meters": {
+        "name": "height_meters",
+        "tooltip": "キャラクターモデルのおおよその高さ（メートル単位）。スケーリングやリギングの精度向上に役立ちます。"
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "texture_image": {
+        "name": "texture_image",
+        "tooltip": "モデルのUV展開されたベースカラーテクスチャ画像です。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "rig_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyTextToModelNode": {
+    "display_name": "Meshy：テキストからモデル生成",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "生成されるモデルのポーズモードを指定します。"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "シードはノードの再実行を制御しますが、シードに関わらず結果は非決定的です。"
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "falseに設定すると、未処理の三角メッシュを返します。"
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      },
+      "style": {
+        "name": "style"
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "モデルファイル",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyTextureNode": {
+    "display_name": "Meshy：テクスチャモデル",
+    "inputs": {
+      "enable_original_uv": {
+        "name": "元のUVを使用",
+        "tooltip": "新しいUVを生成する代わりにモデルの元のUVを使用します。有効にすると、Meshyはアップロードされたモデルの既存のテクスチャを保持します。モデルに元のUVがない場合、出力の品質が低下する可能性があります。"
+      },
+      "image_style": {
+        "name": "イメージスタイル",
+        "tooltip": "テクスチャリングプロセスをガイドする2D画像です。'text_style_prompt'と同時に使用することはできません。"
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "model": {
+        "name": "モデル"
+      },
+      "pbr": {
+        "name": "PBR"
+      },
+      "text_style_prompt": {
+        "name": "テキストスタイルプロンプト",
+        "tooltip": "オブジェクトの希望するテクスチャスタイルをテキストで説明してください。最大600文字。'image_style'と同時に使用することはできません。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "モデルファイル",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
     }
   },
   "MinimaxHailuoVideoNode": {
@@ -7779,6 +10949,78 @@
       }
     }
   },
+  "NAGuidance": {
+    "description": "モデルに正規化アテンションガイダンスを適用し、distilled/schnellモデルでネガティブプロンプトを有効にします。",
+    "display_name": "正規化アテンションガイダンス",
+    "inputs": {
+      "model": {
+        "name": "model",
+        "tooltip": "NAGを適用するモデル。"
+      },
+      "nag_alpha": {
+        "name": "nag_alpha",
+        "tooltip": "正規化アテンションのブレンド係数。1.0は完全な置換、0.0は効果なし。"
+      },
+      "nag_scale": {
+        "name": "nag_scale",
+        "tooltip": "ガイダンスのスケール係数。値が高いほどネガティブプロンプトからさらに離れます。"
+      },
+      "nag_tau": {
+        "name": "nag_tau"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "NAGが有効化されたパッチ済みモデル。"
+      }
+    }
+  },
+  "NormalizeImages": {
+    "display_name": "画像を正規化",
+    "inputs": {
+      "images": {
+        "name": "画像",
+        "tooltip": "処理する画像。"
+      },
+      "mean": {
+        "name": "平均値",
+        "tooltip": "正規化のための平均値。"
+      },
+      "std": {
+        "name": "標準偏差",
+        "tooltip": "正規化のための標準偏差。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "画像",
+        "tooltip": "処理済み画像"
+      }
+    }
+  },
+  "NormalizeVideoLatentStart": {
+    "description": "ビデオのlatentの初期フレームを、後続の参照フレームの平均値と標準偏差に合わせて正規化します。開始フレームとビデオの残り部分との違いを減らすのに役立ちます。",
+    "display_name": "NormalizeVideoLatentStart",
+    "inputs": {
+      "latent": {
+        "name": "latent"
+      },
+      "reference_frame_count": {
+        "name": "reference_frame_count",
+        "tooltip": "開始フレームの後に参照として使用するlatentフレーム数"
+      },
+      "start_frame_count": {
+        "name": "start_frame_count",
+        "tooltip": "最初から正規化するlatentフレーム数"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
   "OpenAIChatConfig": {
     "description": "OpenAIチャットノードの詳細設定オプションを指定できます。",
     "display_name": "OpenAI ChatGPT 詳細オプション",
@@ -7928,6 +11170,9 @@
         "name": "マスク",
         "tooltip": "インペインティング用のオプションマスク（白い部分が置き換えられます）"
       },
+      "model": {
+        "name": "model"
+      },
       "n": {
         "name": "生成数",
         "tooltip": "生成する画像の枚数"
@@ -8440,6 +11685,11 @@
       "steps": {
         "name": "ステップ"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "PorterDuffImageComposite": {
@@ -8473,6 +11723,9 @@
   "Preview3D": {
     "display_name": "3Dプレビュー",
     "inputs": {
+      "bg_image": {
+        "name": "bg_image"
+      },
       "camera_info": {
         "name": "カメラ情報"
       },
@@ -8480,14 +11733,20 @@
         "name": "画像"
       },
       "model_file": {
-        "name": "モデルファイル"
+        "name": "モデルファイル",
+        "tooltip": "3Dモデルファイルまたはパス文字列"
       }
     }
   },
   "PreviewAny": {
     "display_name": "プレビュー任意",
     "inputs": {
-      "preview": {
+      "previewMode": {},
+      "preview_markdown": {
+        "name": "プレビュー"
+      },
+      "preview_text": {
+        "name": "プレビュー"
       },
       "source": {
         "name": "ソース"
@@ -8527,6 +11786,28 @@
       }
     }
   },
+  "PrimitiveBoundingBox": {
+    "display_name": "バウンディングボックス",
+    "inputs": {
+      "height": {
+        "name": "height"
+      },
+      "width": {
+        "name": "width"
+      },
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "PrimitiveFloat": {
     "display_name": "浮動小数点数",
     "inputs": {
@@ -8628,6 +11909,36 @@
       }
     }
   },
+  "RandomCropImages": {
+    "display_name": "ランダムクロップ画像",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "height": {
+        "name": "height",
+        "tooltip": "クロップ高さ。"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "処理する画像。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "ランダムシード。"
+      },
+      "width": {
+        "name": "width",
+        "tooltip": "クロップ幅。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "処理済み画像"
+      }
+    }
+  },
   "RandomNoise": {
     "display_name": "ランダムノイズ",
     "inputs": {
@@ -8637,6 +11948,11 @@
       "noise_seed": {
         "name": "ノイズシード"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "RebatchImages": {
@@ -8677,6 +11993,11 @@
       "audio": {
         "name": "オーディオ"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "RecraftColorRGB": {
@@ -8724,6 +12045,25 @@
       }
     }
   },
+  "RecraftCreateStyleNode": {
+    "description": "参照画像からカスタムスタイルを作成します。スタイル参照として1～5枚の画像をアップロードしてください。すべての画像の合計サイズは5MBまでです。",
+    "display_name": "Recraft スタイル作成",
+    "inputs": {
+      "images": {
+        "name": "画像"
+      },
+      "style": {
+        "name": "スタイル",
+        "tooltip": "生成される画像の基本スタイルです。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "スタイルID",
+        "tooltip": null
+      }
+    }
+  },
   "RecraftCreativeUpscaleNode": {
     "description": "画像を同期的にアップスケールします。\n「creative upscale」ツールを使用して指定されたラスタ画像を強化し、解像度を高めながら細部や顔の精細さに重点を置いて向上させます。",
     "display_name": "Recraft Creative アップスケール画像",
@@ -9031,6 +12371,88 @@
       }
     }
   },
+  "RecraftV4TextToImageNode": {
+    "description": "Recraft V4またはV4 Proモデルを使用して画像を生成します。",
+    "display_name": "Recraft V4 テキストから画像生成",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "生成に使用するモデル。"
+      },
+      "model_size": {
+        "name": "サイズ"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "生成する画像の枚数。"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "画像に含めたくない要素のテキスト説明（任意）。"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "画像生成用のプロンプト。最大10,000文字。"
+      },
+      "recraft_controls": {
+        "name": "recraft_controls",
+        "tooltip": "Recraft Controlsノードによる追加の生成コントロール（任意）。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "ノードを再実行するかどうかを決定するシード値。実際の結果はシードに関係なく非決定的です。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftV4TextToVectorNode": {
+    "description": "Recraft V4またはV4 Proモデルを使用してSVGを生成します。",
+    "display_name": "Recraft V4 テキストからベクター生成",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "生成に使用するモデル。"
+      },
+      "model_size": {
+        "name": "サイズ"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "生成する画像の枚数。"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "画像に含めたくない要素のテキスト説明（任意）。"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "画像生成用のプロンプト。最大10,000文字。"
+      },
+      "recraft_controls": {
+        "name": "recraft_controls",
+        "tooltip": "Recraft Controlsノードによる追加の生成コントロール（任意）。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "ノードを再実行するかどうかを決定するシード値。実際の結果はシードに関係なく非決定的です。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RecraftVectorizeImageNode": {
     "description": "入力画像からSVGを同期的に生成します。",
     "display_name": "Recraft ベクトル化画像",
@@ -9062,6 +12484,23 @@
       }
     }
   },
+  "ReferenceTimbreAudio": {
+    "description": "このノードは音色のリファレンスオーディオを設定します（ace step 1.5用）",
+    "display_name": "ReferenceTimbreAudio",
+    "inputs": {
+      "conditioning": {
+        "name": "コンディショニング"
+      },
+      "latent": {
+        "name": "latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RegexExtract": {
     "display_name": "正規表現抽出",
     "inputs": {
@@ -9181,6 +12620,11 @@
       "image": {
         "name": "画像"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "RepeatLatentBatch": {
@@ -9194,6 +12638,51 @@
       }
     }
   },
+  "ReplaceText": {
+    "display_name": "テキスト置換",
+    "inputs": {
+      "find": {
+        "name": "find",
+        "tooltip": "検索するテキスト。"
+      },
+      "replace": {
+        "name": "replace",
+        "tooltip": "置換後のテキスト。"
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "処理するテキスト。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "texts",
+        "tooltip": "処理済みテキスト"
+      }
+    }
+  },
+  "ReplaceVideoLatentFrames": {
+    "display_name": "ReplaceVideoLatentFrames",
+    "inputs": {
+      "destination": {
+        "name": "destination",
+        "tooltip": "フレームが置き換えられる宛先latent。"
+      },
+      "index": {
+        "name": "index",
+        "tooltip": "宛先latent内でソースlatentフレームを配置する開始フレームインデックス。負の値は末尾からカウントします。"
+      },
+      "source": {
+        "name": "source",
+        "tooltip": "宛先latentに挿入するフレームを提供するソースlatent。指定しない場合、宛先latentは変更されません。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RescaleCFG": {
     "display_name": "CFGを再スケール",
     "inputs": {
@@ -9223,6 +12712,128 @@
       "target_width": {
         "name": "ターゲット幅"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ResizeImageMaskNode": {
+    "description": "さまざまなスケーリング方法で画像またはマスクをリサイズします。",
+    "display_name": "画像/マスクのリサイズ",
+    "inputs": {
+      "input": {
+        "name": "input"
+      },
+      "resize_type": {
+        "name": "resize_type",
+        "tooltip": "リサイズ方法を選択します：正確な寸法、スケール係数、他の画像に合わせるなど。"
+      },
+      "resize_type_crop": {
+        "name": "切り抜き"
+      },
+      "resize_type_height": {
+        "name": "高さ"
+      },
+      "resize_type_width": {
+        "name": "幅"
+      },
+      "scale_method": {
+        "name": "scale_method",
+        "tooltip": "補間アルゴリズム。「area」は縮小に最適、「lanczos」は拡大に最適、「nearest-exact」はドット絵に最適です。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "resized",
+        "tooltip": null
+      }
+    }
+  },
+  "ResizeImagesByLongerEdge": {
+    "display_name": "長辺で画像をリサイズ",
+    "inputs": {
+      "images": {
+        "name": "images",
+        "tooltip": "処理する画像。"
+      },
+      "longer_edge": {
+        "name": "longer_edge",
+        "tooltip": "長辺の目標長さ。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "処理済み画像"
+      }
+    }
+  },
+  "ResizeImagesByShorterEdge": {
+    "display_name": "短辺で画像をリサイズ",
+    "inputs": {
+      "images": {
+        "name": "images",
+        "tooltip": "処理する画像。"
+      },
+      "shorter_edge": {
+        "name": "shorter_edge",
+        "tooltip": "短辺の目標長さ。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "処理済み画像"
+      }
+    }
+  },
+  "ResolutionBucket": {
+    "display_name": "解像度バケット",
+    "inputs": {
+      "conditioning": {
+        "name": "conditioning",
+        "tooltip": "conditioningリストのリスト（latentsの長さと一致する必要があります）。"
+      },
+      "latents": {
+        "name": "latents",
+        "tooltip": "解像度ごとにバケット化するlatent辞書のリスト。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latents",
+        "tooltip": "解像度バケットごとのバッチ化されたlatent辞書のリスト。"
+      },
+      "1": {
+        "name": "conditioning",
+        "tooltip": "解像度バケットごとのconditionリスト。"
+      }
+    }
+  },
+  "ResolutionSelector": {
+    "description": "アスペクト比とメガピクセルの目標値から幅と高さを計算します。Empty Latent Image の寸法設定に便利です。",
+    "display_name": "解像度セレクター",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "アスペクト比",
+        "tooltip": "出力寸法のアスペクト比です。"
+      },
+      "megapixels": {
+        "name": "メガピクセル",
+        "tooltip": "目標とする総メガピクセル数。1.0 MP ≈ 1024×1024（正方形の場合）。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "幅",
+        "tooltip": "計算された幅（ピクセル単位、8の倍数）。"
+      },
+      "1": {
+        "name": "高さ",
+        "tooltip": "計算された高さ（ピクセル単位、8の倍数）。"
+      }
     }
   },
   "Rodin3D_Detail": {
@@ -9246,6 +12857,10 @@
       "0": {
         "name": "3Dモデルパス",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9273,6 +12888,10 @@
       "0": {
         "name": "3Dモデルパス",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9297,6 +12916,10 @@
       "0": {
         "name": "3Dモデルパス",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9315,6 +12938,10 @@
       "0": {
         "name": "3Dモデルパス",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9339,6 +12966,10 @@
       "0": {
         "name": "3Dモデルパス",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9464,6 +13095,90 @@
       }
     }
   },
+  "SDPoseDrawKeypoints": {
+    "display_name": "SDPoseDrawKeypoints",
+    "inputs": {
+      "draw_body": {
+        "name": "ボディを描画"
+      },
+      "draw_face": {
+        "name": "顔を描画"
+      },
+      "draw_feet": {
+        "name": "足を描画"
+      },
+      "draw_hands": {
+        "name": "手を描画"
+      },
+      "face_point_size": {
+        "name": "顔ポイントサイズ"
+      },
+      "keypoints": {
+        "name": "キーポイント"
+      },
+      "score_threshold": {
+        "name": "スコア閾値"
+      },
+      "stick_width": {
+        "name": "スティック幅"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SDPoseFaceBBoxes": {
+    "display_name": "SDPoseFaceBBoxes",
+    "inputs": {
+      "force_square": {
+        "name": "正方形に強制",
+        "tooltip": "短い辺を拡張して、切り抜き領域が常に正方形になるようにします。"
+      },
+      "keypoints": {
+        "name": "キーポイント"
+      },
+      "scale": {
+        "name": "スケール",
+        "tooltip": "各検出された顔のバウンディングボックス領域の倍率。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "バウンディングボックス",
+        "tooltip": "各フレームごとの顔バウンディングボックス。SDPoseKeypointExtractorのbboxes入力と互換性があります。"
+      }
+    }
+  },
+  "SDPoseKeypointExtractor": {
+    "description": "SDPoseモデル（https://huggingface.co/Comfy-Org/SDPose/tree/main/checkpoints）を使用して画像からポーズキーポイントを抽出します。",
+    "display_name": "SDPoseKeypointExtractor",
+    "inputs": {
+      "batch_size": {
+        "name": "バッチサイズ"
+      },
+      "bboxes": {
+        "name": "バウンディングボックス",
+        "tooltip": "より正確な検出のためのオプションのバウンディングボックス。複数人検出時は必須です。"
+      },
+      "image": {
+        "name": "画像"
+      },
+      "model": {
+        "name": "モデル"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "キーポイント",
+        "tooltip": "OpenPoseフレーム形式（canvas_width, canvas_height, people）のキーポイント"
+      }
+    }
+  },
   "SDTurboScheduler": {
     "display_name": "SDターボスケジューラー",
     "inputs": {
@@ -9476,6 +13191,11 @@
       "steps": {
         "name": "ステップ"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SD_4XUpscale_Conditioning": {
@@ -9631,10 +13351,12 @@
     },
     "outputs": {
       "0": {
-        "name": "出力"
+        "name": "出力",
+        "tooltip": null
       },
       "1": {
-        "name": "デノイズ出力"
+        "name": "ノイズ除去出力",
+        "tooltip": null
       }
     }
   },
@@ -9659,10 +13381,12 @@
     },
     "outputs": {
       "0": {
-        "name": "出力"
+        "name": "出力",
+        "tooltip": null
       },
       "1": {
-        "name": "デノイズ出力"
+        "name": "ノイズ除去出力",
+        "tooltip": null
       }
     }
   },
@@ -9699,6 +13423,11 @@
       "s_noise": {
         "name": "s_noise"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_2M_SDE": {
@@ -9716,6 +13445,11 @@
       "solver_type": {
         "name": "ソルバータイプ"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_2S_Ancestral": {
@@ -9727,6 +13461,11 @@
       "s_noise": {
         "name": "s_noise"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_3M_SDE": {
@@ -9741,6 +13480,11 @@
       "s_noise": {
         "name": "s_noise"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_SDE": {
@@ -9758,6 +13502,11 @@
       "s_noise": {
         "name": "s_noise"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerER_SDE": {
@@ -9776,6 +13525,11 @@
       "solver_type": {
         "name": "solver_type"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerEulerAncestral": {
@@ -9787,6 +13541,11 @@
       "s_noise": {
         "name": "s_noise"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerEulerAncestralCFGPP": {
@@ -9798,6 +13557,11 @@
       "s_noise": {
         "name": "s_noise"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerEulerCFGpp": {
@@ -9838,6 +13602,11 @@
       "order": {
         "name": "順序"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerSASolver": {
@@ -9870,6 +13639,37 @@
       "use_pece": {
         "name": "use_pece"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerSEEDS2": {
+    "description": "このサンプラーノードは複数のサンプラーを表すことができます：\n\nseeds_2\n- デフォルト設定\n\nexp_heun_2_x0\n- solver_type=phi_2, r=1.0, eta=0.0\n\nexp_heun_2_x0_sde\n- solver_type=phi_2, r=1.0, eta=1.0, s_noise=1.0",
+    "display_name": "SamplerSEEDS2",
+    "inputs": {
+      "eta": {
+        "name": "eta",
+        "tooltip": "ストカスティック強度"
+      },
+      "r": {
+        "name": "r",
+        "tooltip": "中間段階の相対ステップサイズ（c2ノード）"
+      },
+      "s_noise": {
+        "name": "s_noise",
+        "tooltip": "SDEノイズ倍率"
+      },
+      "solver_type": {
+        "name": "solver_type"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplingPercentToSigma": {
@@ -9888,7 +13688,8 @@
     },
     "outputs": {
       "0": {
-        "name": "sigma_value"
+        "name": "シグマ値",
+        "tooltip": null
       }
     }
   },
@@ -9990,7 +13791,8 @@
         "name": "画像"
       },
       "mesh": {
-        "name": "メッシュ"
+        "name": "メッシュ",
+        "tooltip": "保存するメッシュまたはGLBファイル"
       }
     }
   },
@@ -10008,6 +13810,44 @@
       }
     }
   },
+  "SaveImageDataSetToFolder": {
+    "display_name": "画像データセットをフォルダに保存",
+    "inputs": {
+      "filename_prefix": {
+        "name": "filename_prefix",
+        "tooltip": "保存する画像ファイル名の接頭辞。"
+      },
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "画像を保存するフォルダ名（出力ディレクトリ内）。"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "保存する画像のリスト。"
+      }
+    }
+  },
+  "SaveImageTextDataSetToFolder": {
+    "display_name": "画像とテキストのデータセットをフォルダに保存",
+    "inputs": {
+      "filename_prefix": {
+        "name": "filename_prefix",
+        "tooltip": "保存する画像ファイル名の接頭辞。"
+      },
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "画像を保存するフォルダ名（出力ディレクトリ内）。"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "保存する画像のリスト。"
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "保存するテキストキャプションのリスト。"
+      }
+    }
+  },
   "SaveImageWebsocket": {
     "display_name": "画像を保存するWebSocket",
     "inputs": {
@@ -10027,6 +13867,23 @@
       }
     }
   },
+  "SaveLoRA": {
+    "display_name": "LoRA重みを保存",
+    "inputs": {
+      "lora": {
+        "name": "lora",
+        "tooltip": "保存するLoRAモデル。LoRAレイヤー付きのモデルは使用しないでください。"
+      },
+      "prefix": {
+        "name": "prefix",
+        "tooltip": "保存するLoRAファイルの接頭辞。"
+      },
+      "steps": {
+        "name": "steps",
+        "tooltip": "オプション：LoRAが学習されたステップ数。保存ファイル名に使用されます。"
+      }
+    }
+  },
   "SaveSVGNode": {
     "description": "SVGファイルをディスクに保存します。",
     "display_name": "SVG保存ノード",
@@ -10040,6 +13897,27 @@
       }
     }
   },
+  "SaveTrainingDataset": {
+    "display_name": "学習データセットを保存",
+    "inputs": {
+      "conditioning": {
+        "name": "conditioning",
+        "tooltip": "MakeTrainingDatasetからのconditioningリストのリスト。"
+      },
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "データセットを保存するフォルダ名（出力ディレクトリ内）。"
+      },
+      "latents": {
+        "name": "latents",
+        "tooltip": "MakeTrainingDatasetからのlatent辞書のリスト。"
+      },
+      "shard_size": {
+        "name": "shard_size",
+        "tooltip": "シャードファイルごとのサンプル数。"
+      }
+    }
+  },
   "SaveVideo": {
     "description": "入力画像をComfyUIの出力ディレクトリに保存します。",
     "display_name": "ビデオを保存",
@@ -10160,6 +14038,11 @@
       "sigmas": {
         "name": "シグマ"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SetHookKeyframes": {
@@ -10200,6 +14083,58 @@
       }
     }
   },
+  "ShuffleDataset": {
+    "display_name": "画像データセットをシャッフル",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "処理する画像のリスト。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "ランダムシード。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "処理済み画像"
+      }
+    }
+  },
+  "ShuffleImageTextDataset": {
+    "display_name": "画像・テキストデータセットをシャッフル",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "シャッフルする画像のリスト。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "ランダムシード。"
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "シャッフルするテキストのリスト。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "シャッフルされた画像"
+      },
+      "1": {
+        "name": "texts",
+        "tooltip": "シャッフルされたテキスト"
+      }
+    }
+  },
   "SkipLayerGuidanceDiT": {
     "description": "すべてのDiTモデルで使用できるSkipLayerGuidanceノードの一般的なバージョン。",
     "display_name": "SkipLayerGuidanceDiT",
@@ -10296,6 +14231,11 @@
       "width": {
         "name": "幅"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SplitAudioChannels": {
@@ -10308,10 +14248,35 @@
     },
     "outputs": {
       "0": {
-        "name": "左チャンネル"
+        "name": "左",
+        "tooltip": null
       },
       "1": {
-        "name": "右チャンネル"
+        "name": "右",
+        "tooltip": null
+      }
+    }
+  },
+  "SplitImageToTileList": {
+    "description": "指定したオーバーラップで画像をバッチ化されたタイルのリストに分割します。",
+    "display_name": "画像をタイルのリストに分割",
+    "inputs": {
+      "image": {
+        "name": "image"
+      },
+      "overlap": {
+        "name": "overlap"
+      },
+      "tile_height": {
+        "name": "tile_height"
+      },
+      "tile_width": {
+        "name": "tile_width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
       }
     }
   },
@@ -10343,10 +14308,12 @@
     },
     "outputs": {
       "0": {
-        "name": "高シグマ"
+        "name": "高シグマ",
+        "tooltip": null
       },
       "1": {
-        "name": "低シグマ"
+        "name": "低シグマ",
+        "tooltip": null
       }
     }
   },
@@ -10362,10 +14329,12 @@
     },
     "outputs": {
       "0": {
-        "name": "高シグマ"
+        "name": "高シグマ",
+        "tooltip": null
       },
       "1": {
-        "name": "低シグマ"
+        "name": "低シグマ",
+        "tooltip": null
       }
     }
   },
@@ -10969,6 +14938,21 @@
       }
     }
   },
+  "StripWhitespace": {
+    "display_name": "空白文字の削除",
+    "inputs": {
+      "texts": {
+        "name": "テキスト",
+        "tooltip": "処理するテキスト。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "テキスト",
+        "tooltip": "処理済みテキスト"
+      }
+    }
+  },
   "StyleModelApply": {
     "display_name": "スタイルモデルを適用",
     "inputs": {
@@ -11054,6 +15038,123 @@
       }
     }
   },
+  "Tencent3DPartNode": {
+    "description": "モデル構造に基づいて自動的にコンポーネントの識別と生成を行います。",
+    "display_name": "Hunyuan3D：3Dパーツ",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後の制御"
+      },
+      "model_3d": {
+        "name": "3Dモデル",
+        "tooltip": "FBX形式の3Dモデル。モデルの面数は30,000未満である必要があります。"
+      },
+      "seed": {
+        "name": "シード",
+        "tooltip": "シードはノードを再実行するかどうかを制御します。シードに関係なく結果は非決定的です。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "TencentImageToModelNode": {
+    "display_name": "Hunyuan3D: 画像からモデルへ (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "face_count": {
+        "name": "面数"
+      },
+      "generate_type": {
+        "name": "生成タイプ"
+      },
+      "generate_type_pbr": {
+        "name": "PBR"
+      },
+      "image": {
+        "name": "画像"
+      },
+      "image_back": {
+        "name": "背面画像"
+      },
+      "image_left": {
+        "name": "左画像"
+      },
+      "image_right": {
+        "name": "右画像"
+      },
+      "model": {
+        "name": "モデル",
+        "tooltip": "`3.1`モデルではLowPolyオプションは利用できません。"
+      },
+      "seed": {
+        "name": "シード",
+        "tooltip": "シードはノードの再実行を制御しますが、シードに関わらず結果は非決定的です。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "モデルファイル",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "OBJ",
+        "tooltip": null
+      }
+    }
+  },
+  "TencentTextToModelNode": {
+    "display_name": "Hunyuan3D: テキストからモデルへ (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "face_count": {
+        "name": "面数"
+      },
+      "generate_type": {
+        "name": "生成タイプ"
+      },
+      "generate_type_pbr": {
+        "name": "PBR"
+      },
+      "model": {
+        "name": "モデル",
+        "tooltip": "`3.1`モデルではLowPolyオプションは利用できません。"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "最大1024文字まで対応しています。"
+      },
+      "seed": {
+        "name": "シード",
+        "tooltip": "シードはノードの再実行を制御しますが、シードに関わらず結果は非決定的です。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "モデルファイル",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "OBJ",
+        "tooltip": null
+      }
+    }
+  },
   "TextEncodeAceStepAudio": {
     "display_name": "TextEncodeAceStepAudio",
     "inputs": {
@@ -11076,6 +15177,65 @@
       }
     }
   },
+  "TextEncodeAceStepAudio1_5": {
+    "display_name": "TextEncodeAceStepAudio1.5",
+    "inputs": {
+      "bpm": {
+        "name": "BPM"
+      },
+      "cfg_scale": {
+        "name": "cfgスケール"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "duration": {
+        "name": "長さ"
+      },
+      "generate_audio_codes": {
+        "name": "オーディオコードを生成",
+        "tooltip": "オーディオコードを生成するLLMを有効にします。これにより生成されるオーディオの品質が向上しますが、処理が遅くなる場合があります。モデルにオーディオリファレンスを与える場合はオフにしてください。"
+      },
+      "keyscale": {
+        "name": "キー"
+      },
+      "language": {
+        "name": "言語"
+      },
+      "lyrics": {
+        "name": "歌詞"
+      },
+      "min_p": {
+        "name": "最小p値"
+      },
+      "seed": {
+        "name": "シード"
+      },
+      "tags": {
+        "name": "タグ"
+      },
+      "temperature": {
+        "name": "温度"
+      },
+      "timesignature": {
+        "name": "拍子"
+      },
+      "top_k": {
+        "name": "top_k"
+      },
+      "top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TextEncodeHunyuanVideo_ImageToVideo": {
     "display_name": "TextEncodeHunyuanVideo_ImageToVideo",
     "inputs": {
@@ -11149,6 +15309,158 @@
       }
     }
   },
+  "TextEncodeZImageOmni": {
+    "display_name": "TextEncodeZImageOmni",
+    "inputs": {
+      "auto_resize_images": {
+        "name": "画像自動リサイズ"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "image1": {
+        "name": "画像1"
+      },
+      "image2": {
+        "name": "画像2"
+      },
+      "image3": {
+        "name": "画像3"
+      },
+      "image_encoder": {
+        "name": "画像エンコーダ"
+      },
+      "prompt": {
+        "name": "プロンプト"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TextGenerate": {
+    "display_name": "TextGenerate",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image": {
+        "name": "画像"
+      },
+      "max_length": {
+        "name": "最大長"
+      },
+      "prompt": {
+        "name": "プロンプト"
+      },
+      "sampling_mode": {
+        "name": "サンプリングモード"
+      },
+      "sampling_mode_min_p": {
+        "name": "最小p"
+      },
+      "sampling_mode_repetition_penalty": {
+        "name": "繰り返しペナルティ"
+      },
+      "sampling_mode_seed": {
+        "name": "シード"
+      },
+      "sampling_mode_temperature": {
+        "name": "温度"
+      },
+      "sampling_mode_top_k": {
+        "name": "top_k"
+      },
+      "sampling_mode_top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "生成テキスト",
+        "tooltip": null
+      }
+    }
+  },
+  "TextGenerateLTX2Prompt": {
+    "display_name": "TextGenerateLTX2Prompt",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image": {
+        "name": "画像"
+      },
+      "max_length": {
+        "name": "最大長"
+      },
+      "prompt": {
+        "name": "プロンプト"
+      },
+      "sampling_mode": {
+        "name": "サンプリングモード"
+      },
+      "sampling_mode_min_p": {
+        "name": "最小p"
+      },
+      "sampling_mode_repetition_penalty": {
+        "name": "繰り返しペナルティ"
+      },
+      "sampling_mode_seed": {
+        "name": "シード"
+      },
+      "sampling_mode_temperature": {
+        "name": "温度"
+      },
+      "sampling_mode_top_k": {
+        "name": "top_k"
+      },
+      "sampling_mode_top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "生成テキスト",
+        "tooltip": null
+      }
+    }
+  },
+  "TextToLowercase": {
+    "display_name": "テキストを小文字に変換",
+    "inputs": {
+      "texts": {
+        "name": "テキスト",
+        "tooltip": "処理するテキスト。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "テキスト",
+        "tooltip": "処理済みテキスト"
+      }
+    }
+  },
+  "TextToUppercase": {
+    "display_name": "テキストを大文字に変換",
+    "inputs": {
+      "texts": {
+        "name": "テキスト",
+        "tooltip": "処理するテキスト。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "テキスト",
+        "tooltip": "処理済みテキスト"
+      }
+    }
+  },
   "ThresholdMask": {
     "display_name": "しきい値マスク",
     "inputs": {
@@ -11158,6 +15470,11 @@
       "value": {
         "name": "値"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "TomePatchModel": {
@@ -11176,6 +15493,118 @@
       }
     }
   },
+  "TopazImageEnhance": {
+    "description": "業界標準のアップスケーリングと画像強化。",
+    "display_name": "Topaz画像強化",
+    "inputs": {
+      "color_preservation": {
+        "name": "色の保持",
+        "tooltip": "元の色を保持します。"
+      },
+      "creativity": {
+        "name": "クリエイティビティ"
+      },
+      "crop_to_fill": {
+        "name": "クロップしてフィル",
+        "tooltip": "デフォルトでは、出力アスペクト比が異なる場合はレターボックス化されます。有効にすると、画像をクロップして出力サイズに合わせます。"
+      },
+      "face_enhancement": {
+        "name": "顔強化",
+        "tooltip": "処理中に顔（存在する場合）を強化します。"
+      },
+      "face_enhancement_creativity": {
+        "name": "顔強化クリエイティビティ",
+        "tooltip": "顔強化の創造性レベルを設定します。"
+      },
+      "face_enhancement_strength": {
+        "name": "顔強化の強度",
+        "tooltip": "強化された顔のシャープさを背景と比較して調整します。"
+      },
+      "face_preservation": {
+        "name": "顔の保持",
+        "tooltip": "被写体の顔の特徴を保持します。"
+      },
+      "image": {
+        "name": "画像"
+      },
+      "model": {
+        "name": "モデル"
+      },
+      "output_height": {
+        "name": "出力高さ",
+        "tooltip": "0の場合は元の高さまたは出力幅と同じ高さで出力します。"
+      },
+      "output_width": {
+        "name": "出力幅",
+        "tooltip": "0の場合は自動計算（通常は元のサイズまたはoutput_heightが指定されていればそれを使用）。"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "創造的なアップスケーリングのガイダンス用のオプションテキストプロンプト。"
+      },
+      "subject_detection": {
+        "name": "被写体検出"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TopazVideoEnhance": {
+    "description": "強力なアップスケーリングと復元技術で動画に新たな命を吹き込む。",
+    "display_name": "Topaz Video Enhance",
+    "inputs": {
+      "dynamic_compression_level": {
+        "name": "動的圧縮レベル",
+        "tooltip": "CQPレベル。"
+      },
+      "interpolation_duplicate": {
+        "name": "重複フレーム除去",
+        "tooltip": "入力動画の重複フレームを解析し、削除します。"
+      },
+      "interpolation_duplicate_threshold": {
+        "name": "重複検出感度",
+        "tooltip": "重複フレームの検出感度。"
+      },
+      "interpolation_enabled": {
+        "name": "補間有効"
+      },
+      "interpolation_frame_rate": {
+        "name": "補間フレームレート",
+        "tooltip": "出力フレームレート。"
+      },
+      "interpolation_model": {
+        "name": "補間モデル"
+      },
+      "interpolation_slowmo": {
+        "name": "スローモーション補間",
+        "tooltip": "入力動画に適用されるスローモーション係数。例：2の場合、出力は2倍遅くなり、再生時間も2倍になります。"
+      },
+      "upscaler_creativity": {
+        "name": "アップスケーラー創造性",
+        "tooltip": "創造性レベル（Starlight (Astra) Creative のみ適用されます）。"
+      },
+      "upscaler_enabled": {
+        "name": "アップスケーラー有効"
+      },
+      "upscaler_model": {
+        "name": "アップスケーラーモデル"
+      },
+      "upscaler_resolution": {
+        "name": "アップスケーラー解像度"
+      },
+      "video": {
+        "name": "動画"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TorchCompileModel": {
     "display_name": "Torchコンパイルモデル",
     "inputs": {
@@ -11203,6 +15632,18 @@
         "name": "バッチサイズ",
         "tooltip": "学習に使用するバッチサイズ。"
       },
+      "bucket_mode": {
+        "name": "バケットモード",
+        "tooltip": "解像度バケットモードを有効にします。有効時は、ResolutionBucketノードから事前にバケット化されたlatentを期待します。"
+      },
+      "bypass_mode": {
+        "name": "bypass_mode",
+        "tooltip": "トレーニング用のバイパスモードを有効にします。有効にすると、アダプターは重みの変更ではなくフォワードフックで適用されます。重みを直接変更できない量子化モデルで便利です。"
+      },
+      "checkpoint_depth": {
+        "name": "チェックポイント深度",
+        "tooltip": "勾配チェックポイントの深度レベル。"
+      },
       "control_after_generate": {
         "name": "control after generate"
       },
@@ -11238,6 +15679,10 @@
         "name": "モデル",
         "tooltip": "LoRAを学習させる対象のモデル。"
       },
+      "offloading": {
+        "name": "オフロード",
+        "tooltip": "勾配チェックポイントの深度レベル。"
+      },
       "optimizer": {
         "name": "オプティマイザ",
         "tooltip": "学習に使用するオプティマイザ。"
@@ -11265,16 +15710,16 @@
     },
     "outputs": {
       "0": {
-        "name": "model_with_lora"
+        "name": "lora",
+        "tooltip": "LoRA適用済みモデル"
       },
       "1": {
-        "name": "lora"
+        "name": "損失マップ",
+        "tooltip": "LoRA重み"
       },
       "2": {
-        "name": "loss"
-      },
-      "3": {
-        "name": "steps"
+        "name": "ステップ数",
+        "tooltip": "損失履歴"
       }
     }
   },
@@ -11293,6 +15738,11 @@
         "name": "start_index",
         "tooltip": "開始時間（秒）。負の値を指定すると末尾からカウント（小数点以下対応）。"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "TrimVideoLatent": {
@@ -11334,23 +15784,62 @@
   "TripoConversionNode": {
     "display_name": "Tripo: モデル変換",
     "inputs": {
+      "animate_in_place": {
+        "name": "その場でアニメーション"
+      },
+      "bake": {
+        "name": "ベイク"
+      },
+      "export_orientation": {
+        "name": "エクスポート方向"
+      },
+      "export_vertex_colors": {
+        "name": "頂点カラーをエクスポート"
+      },
       "face_limit": {
         "name": "face_limit"
       },
+      "fbx_preset": {
+        "name": "FBXプリセット"
+      },
+      "flatten_bottom": {
+        "name": "底面を平坦化"
+      },
+      "flatten_bottom_threshold": {
+        "name": "底面平坦化しきい値"
+      },
+      "force_symmetry": {
+        "name": "対称性を強制"
+      },
       "format": {
         "name": "format"
       },
       "original_model_task_id": {
         "name": "original_model_task_id"
       },
+      "pack_uv": {
+        "name": "UVパック"
+      },
+      "part_names": {
+        "name": "パーツ名"
+      },
+      "pivot_to_center_bottom": {
+        "name": "ピボットを底面中央へ"
+      },
       "quad": {
         "name": "quad"
       },
+      "scale_factor": {
+        "name": "スケール係数"
+      },
       "texture_format": {
         "name": "texture_format"
       },
       "texture_size": {
         "name": "texture_size"
+      },
+      "with_animation": {
+        "name": "アニメーション付き"
       }
     }
   },
@@ -11360,6 +15849,9 @@
       "face_limit": {
         "name": "face_limit"
       },
+      "geometry_quality": {
+        "name": "ジオメトリ品質"
+      },
       "image": {
         "name": "image"
       },
@@ -11397,11 +15889,15 @@
     },
     "outputs": {
       "0": {
-        "name": "model_file",
+        "name": "モデルファイル",
         "tooltip": null
       },
       "1": {
-        "name": "model task_id",
+        "name": "モデルタスクID",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11412,6 +15908,9 @@
       "face_limit": {
         "name": "face_limit"
       },
+      "geometry_quality": {
+        "name": "ジオメトリ品質"
+      },
       "image": {
         "name": "image"
       },
@@ -11455,11 +15954,15 @@
     },
     "outputs": {
       "0": {
-        "name": "model_file",
+        "name": "モデルファイル",
         "tooltip": null
       },
       "1": {
-        "name": "model task_id",
+        "name": "モデルタスクID",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11475,11 +15978,15 @@
     },
     "outputs": {
       "0": {
-        "name": "model_file",
+        "name": "モデルファイル",
         "tooltip": null
       },
       "1": {
-        "name": "model task_id",
+        "name": "モデルタスクID",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11496,11 +16003,15 @@
     },
     "outputs": {
       "0": {
-        "name": "model_file",
+        "name": "リターゲットタスクID",
         "tooltip": null
       },
       "1": {
-        "name": "retarget task_id",
+        "name": "リターゲット タスクID",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11514,11 +16025,15 @@
     },
     "outputs": {
       "0": {
-        "name": "model_file",
+        "name": "モデルファイル",
         "tooltip": null
       },
       "1": {
-        "name": "rig task_id",
+        "name": "リグタスクID",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11529,6 +16044,9 @@
       "face_limit": {
         "name": "face_limit"
       },
+      "geometry_quality": {
+        "name": "ジオメトリ品質"
+      },
       "image_seed": {
         "name": "image_seed"
       },
@@ -11565,11 +16083,15 @@
     },
     "outputs": {
       "0": {
-        "name": "model_file",
+        "name": "モデルファイル",
         "tooltip": null
       },
       "1": {
-        "name": "model task_id",
+        "name": "モデルタスクID",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11602,8 +16124,31 @@
         "tooltip": null
       },
       "1": {
-        "name": "モデル タスクID",
+        "name": "モデルタスクID",
         "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "TruncateText": {
+    "display_name": "テキストを切り詰める",
+    "inputs": {
+      "max_length": {
+        "name": "最大長",
+        "tooltip": "テキストの最大長。"
+      },
+      "texts": {
+        "name": "テキスト",
+        "tooltip": "処理するテキスト。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "テキスト",
+        "tooltip": "処理済みテキスト"
       }
     }
   },
@@ -11748,6 +16293,33 @@
       "vae": {
         "name": "vae"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VAEDecodeAudioTiled": {
+    "display_name": "VAEデコードオーディオ（タイル）",
+    "inputs": {
+      "overlap": {
+        "name": "オーバーラップ"
+      },
+      "samples": {
+        "name": "サンプル"
+      },
+      "tile_size": {
+        "name": "タイルサイズ"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VAEDecodeHunyuan3D": {
@@ -11765,6 +16337,11 @@
       "vae": {
         "name": "vae"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VAEDecodeTiled": {
@@ -11812,6 +16389,11 @@
       "vae": {
         "name": "vae"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VAEEncodeForInpaint": {
@@ -11890,6 +16472,63 @@
       "steps": {
         "name": "ステップ"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Veo3FirstLastFrameNode": {
+    "description": "プロンプトと最初・最後のフレームを使って動画を生成します。",
+    "display_name": "Google Veo 3 ファースト・ラストフレームから動画生成",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "アスペクト比",
+        "tooltip": "出力動画のアスペクト比"
+      },
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "duration": {
+        "name": "長さ",
+        "tooltip": "出力動画の長さ（秒）"
+      },
+      "first_frame": {
+        "name": "最初のフレーム",
+        "tooltip": "開始フレーム"
+      },
+      "generate_audio": {
+        "name": "音声生成",
+        "tooltip": "動画用の音声を生成します。"
+      },
+      "last_frame": {
+        "name": "最後のフレーム",
+        "tooltip": "終了フレーム"
+      },
+      "model": {
+        "name": "モデル"
+      },
+      "negative_prompt": {
+        "name": "ネガティブプロンプト",
+        "tooltip": "動画で避けたい内容を指定するネガティブテキストプロンプト"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "動画のテキスト説明"
+      },
+      "resolution": {
+        "name": "解像度"
+      },
+      "seed": {
+        "name": "シード値",
+        "tooltip": "動画生成用のシード値"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "Veo3VideoGenerationNode": {
@@ -11996,6 +16635,31 @@
       }
     }
   },
+  "Video Slice": {
+    "display_name": "ビデオスライス",
+    "inputs": {
+      "duration": {
+        "name": "時間",
+        "tooltip": "時間（秒）、0の場合は無制限"
+      },
+      "start_time": {
+        "name": "開始時間",
+        "tooltip": "開始時間（秒）"
+      },
+      "strict_duration": {
+        "name": "厳密な時間",
+        "tooltip": "Trueの場合、指定した時間が不可能な場合はエラーになります。"
+      },
+      "video": {
+        "name": "ビデオ"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "VideoLinearCFGGuidance": {
     "display_name": "ビデオ線形CFGガイダンス",
     "inputs": {
@@ -12018,6 +16682,319 @@
       }
     }
   },
+  "Vidu2ImageToVideoNode": {
+    "description": "画像とオプションのプロンプトから動画を生成します。",
+    "display_name": "Vidu2 画像から動画生成",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "生成される動画の開始フレームとして使用する画像です。"
+      },
+      "model": {
+        "name": "model"
+      },
+      "movement_amplitude": {
+        "name": "movement_amplitude",
+        "tooltip": "フレーム内のオブジェクトの動きの振幅。"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "動画生成用のオプションテキストプロンプト（最大2000文字）。"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2ReferenceVideoNode": {
+    "description": "複数の参照画像とプロンプトから動画を生成します。",
+    "display_name": "Vidu2 参照画像から動画生成",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "audio": {
+        "name": "audio",
+        "tooltip": "有効にすると、プロンプトに基づいた音声とBGMが動画に含まれます。"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "model": {
+        "name": "model"
+      },
+      "movement_amplitude": {
+        "name": "movement_amplitude",
+        "tooltip": "フレーム内のオブジェクトの動きの振幅。"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "有効にすると、プロンプトに基づいた音声とBGMが動画に含まれます。"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "subjects": {
+        "name": "subjects",
+        "tooltip": "各被写体ごとに最大3枚の参照画像を指定してください（全被写体で合計7枚まで）。プロンプト内で@subject{subject_id}で参照できます。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2StartEndToVideoNode": {
+    "description": "開始フレーム、終了フレーム、およびプロンプトから動画を生成します。",
+    "display_name": "Vidu2 開始/終了フレームからの動画生成",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後に制御"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "end_frame": {
+        "name": "end_frame"
+      },
+      "first_frame": {
+        "name": "first_frame"
+      },
+      "model": {
+        "name": "model"
+      },
+      "movement_amplitude": {
+        "name": "movement_amplitude",
+        "tooltip": "フレーム内のオブジェクトの動きの振幅。"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "プロンプトの説明（最大2000文字）。"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2TextToVideoNode": {
+    "description": "テキストプロンプトから動画を生成します",
+    "display_name": "Vidu2 テキストから動画生成",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "background_music": {
+        "name": "background_music",
+        "tooltip": "生成された動画にBGMを追加するかどうか。"
+      },
+      "control_after_generate": {
+        "name": "生成後に制御"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "動画生成用のテキスト説明（最大2000文字）。"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3ImageToVideoNode": {
+    "description": "画像とオプションのプロンプトから動画を生成します。",
+    "display_name": "Vidu Q3 画像から動画生成",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "image": {
+        "name": "画像",
+        "tooltip": "生成される動画の開始フレームとして使用する画像。"
+      },
+      "model": {
+        "name": "モデル",
+        "tooltip": "動画生成に使用するモデル。"
+      },
+      "model_audio": {
+        "name": "オーディオ"
+      },
+      "model_duration": {
+        "name": "長さ"
+      },
+      "model_resolution": {
+        "name": "解像度"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "動画生成用のオプションのテキストプロンプト（最大2000文字）。"
+      },
+      "seed": {
+        "name": "シード"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3StartEndToVideoNode": {
+    "description": "開始フレーム、終了フレーム、およびプロンプトから動画を生成します。",
+    "display_name": "Vidu Q3 開始/終了フレームからの動画生成",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "end_frame": {
+        "name": "終了フレーム"
+      },
+      "first_frame": {
+        "name": "開始フレーム"
+      },
+      "model": {
+        "name": "モデル",
+        "tooltip": "動画生成に使用するモデル。"
+      },
+      "model_audio": {
+        "name": "オーディオ"
+      },
+      "model_duration": {
+        "name": "再生時間"
+      },
+      "model_resolution": {
+        "name": "解像度"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "プロンプトの説明（最大2000文字）。"
+      },
+      "seed": {
+        "name": "シード"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3TextToVideoNode": {
+    "description": "テキストプロンプトから動画を生成します。",
+    "display_name": "Vidu Q3 テキストから動画生成",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "model": {
+        "name": "モデル",
+        "tooltip": "動画生成に使用するモデル。"
+      },
+      "model_aspect_ratio": {
+        "name": "アスペクト比"
+      },
+      "model_audio": {
+        "name": "オーディオ"
+      },
+      "model_duration": {
+        "name": "長さ"
+      },
+      "model_resolution": {
+        "name": "解像度"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "動画生成用のテキスト説明（最大2000文字）。"
+      },
+      "seed": {
+        "name": "シード"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ViduExtendVideoNode": {
+    "description": "既存の動画を拡張して追加フレームを生成します。",
+    "display_name": "Vidu 動画拡張",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "end_frame": {
+        "name": "終了フレーム"
+      },
+      "model": {
+        "name": "モデル",
+        "tooltip": "動画拡張に使用するモデル。"
+      },
+      "model_duration": {
+        "name": "長さ"
+      },
+      "model_resolution": {
+        "name": "解像度"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "拡張動画用のオプションのテキストプロンプト（最大2000文字）。"
+      },
+      "seed": {
+        "name": "シード"
+      },
+      "video": {
+        "name": "動画",
+        "tooltip": "拡張する元の動画。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ViduImageToVideoNode": {
     "description": "画像とオプションのプロンプトからビデオを生成",
     "display_name": "Vidu 画像からビデオ生成",
@@ -12060,6 +17037,49 @@
       }
     }
   },
+  "ViduMultiFrameVideoNode": {
+    "description": "複数のキーフレーム遷移を持つ動画を生成します。",
+    "display_name": "Vidu マルチフレーム動画生成",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "frames": {
+        "name": "フレーム数",
+        "tooltip": "キーフレーム遷移の数（2～9）。"
+      },
+      "frames_duration1": {
+        "name": "長さ1"
+      },
+      "frames_duration2": {
+        "name": "長さ2"
+      },
+      "frames_prompt1": {
+        "name": "プロンプト1"
+      },
+      "frames_prompt2": {
+        "name": "プロンプト2"
+      },
+      "model": {
+        "name": "モデル"
+      },
+      "resolution": {
+        "name": "解像度"
+      },
+      "seed": {
+        "name": "シード"
+      },
+      "start_image": {
+        "name": "開始画像",
+        "tooltip": "開始フレーム画像。アスペクト比は1:4から4:1の間である必要があります。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ViduReferenceVideoNode": {
     "description": "複数の画像とプロンプトからビデオを生成",
     "display_name": "Vidu リファレンスからビデオ生成",
@@ -12206,6 +17226,11 @@
       "voxel": {
         "name": "voxel"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VoxelToMeshBasic": {
@@ -12217,6 +17242,11 @@
       "voxel": {
         "name": "ボクセル"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "Wan22FunControlToVideo": {
@@ -12496,6 +17526,10 @@
         "name": "コンテキストストライド",
         "tooltip": "コンテキストウィンドウのストライド。均一スケジュールにのみ適用されます。"
       },
+      "freenoise": {
+        "name": "フリーノイズ",
+        "tooltip": "FreeNoiseノイズシャッフルを適用するかどうか。ウィンドウのブレンドを改善します。"
+      },
       "fuse_method": {
         "name": "融合方法",
         "tooltip": "コンテキストウィンドウを融合するために使用する方法。"
@@ -12836,6 +17870,10 @@
         "name": "シード",
         "tooltip": "生成に使用するシード値。"
       },
+      "shot_type": {
+        "name": "ショットタイプ",
+        "tooltip": "生成される動画のショットタイプ（単一連続ショットかカットを含む複数ショットか）を指定します。このパラメータはprompt_extendがTrueの時のみ有効です。"
+      },
       "watermark": {
         "name": "透かし",
         "tooltip": "結果に「AI生成」の透かしを追加するかどうか。"
@@ -12847,6 +17885,196 @@
       }
     }
   },
+  "WanInfiniteTalkToVideo": {
+    "display_name": "WanInfiniteTalkToVideo",
+    "inputs": {
+      "audio_encoder_output_1": {
+        "name": "オーディオエンコーダ出力1"
+      },
+      "audio_scale": {
+        "name": "オーディオスケール"
+      },
+      "clip_vision_output": {
+        "name": "clipビジョン出力"
+      },
+      "height": {
+        "name": "高さ"
+      },
+      "length": {
+        "name": "長さ"
+      },
+      "mode": {
+        "name": "モード"
+      },
+      "model": {
+        "name": "モデル"
+      },
+      "model_patch": {
+        "name": "モデルパッチ"
+      },
+      "motion_frame_count": {
+        "name": "モーションフレーム数",
+        "tooltip": "動きのコンテキストとして使用する前のフレーム数。"
+      },
+      "negative": {
+        "name": "ネガティブ"
+      },
+      "positive": {
+        "name": "ポジティブ"
+      },
+      "previous_frames": {
+        "name": "前のフレーム"
+      },
+      "start_image": {
+        "name": "開始画像"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "幅"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "モデル",
+        "tooltip": null
+      },
+      "1": {
+        "name": "ポジティブ",
+        "tooltip": null
+      },
+      "2": {
+        "name": "ネガティブ",
+        "tooltip": null
+      },
+      "3": {
+        "name": "潜在",
+        "tooltip": null
+      },
+      "4": {
+        "name": "トリム画像",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveConcatTrack": {
+    "display_name": "WanMoveConcatTrack",
+    "inputs": {
+      "tracks_1": {
+        "name": "トラック1"
+      },
+      "tracks_2": {
+        "name": "トラック2"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveTrackToVideo": {
+    "display_name": "WanMoveTrackToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "バッチサイズ"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "高さ"
+      },
+      "length": {
+        "name": "長さ"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "start_image": {
+        "name": "開始画像"
+      },
+      "strength": {
+        "name": "強度",
+        "tooltip": "トラックコンディショニングの強度。"
+      },
+      "tracks": {
+        "name": "トラック"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "幅"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveTracksFromCoords": {
+    "display_name": "WanMoveTracksFromCoords",
+    "inputs": {
+      "track_coords": {
+        "name": "トラック座標"
+      },
+      "track_mask": {
+        "name": "トラックマスク"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "トラック長",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveVisualizeTracks": {
+    "display_name": "WanMoveVisualizeTracks",
+    "inputs": {
+      "circle_size": {
+        "name": "円のサイズ"
+      },
+      "images": {
+        "name": "画像"
+      },
+      "line_resolution": {
+        "name": "線の解像度"
+      },
+      "line_width": {
+        "name": "線の太さ"
+      },
+      "opacity": {
+        "name": "不透明度"
+      },
+      "tracks": {
+        "name": "トラック"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "WanPhantomSubjectToVideo": {
     "display_name": "WanPhantomSubjectToVideo",
     "inputs": {
@@ -12894,6 +18122,113 @@
       }
     }
   },
+  "WanReferenceVideoApi": {
+    "description": "入力動画のキャラクターと声を使用し、プロンプトと組み合わせてキャラクターの一貫性を保った新しい動画を生成します。",
+    "display_name": "Wan Reference to Video",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後のコントロール"
+      },
+      "duration": {
+        "name": "長さ"
+      },
+      "model": {
+        "name": "モデル"
+      },
+      "negative_prompt": {
+        "name": "ネガティブプロンプト",
+        "tooltip": "避けたい内容を説明するネガティブプロンプト。"
+      },
+      "prompt": {
+        "name": "プロンプト",
+        "tooltip": "要素やビジュアル特徴を説明するプロンプト。英語と中国語に対応。`character1`や`character2`などの識別子で参照キャラクターを指定できます。"
+      },
+      "reference_videos": {
+        "name": "参照動画"
+      },
+      "seed": {
+        "name": "シード"
+      },
+      "shot_type": {
+        "name": "ショットタイプ",
+        "tooltip": "生成される動画のショットタイプ（単一連続ショットか複数カットか）を指定します。"
+      },
+      "size": {
+        "name": "サイズ"
+      },
+      "watermark": {
+        "name": "ウォーターマーク",
+        "tooltip": "AI生成のウォーターマークを結果に追加するかどうか。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanSCAILToVideo": {
+    "display_name": "WanSCAILToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "バッチサイズ"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "高さ"
+      },
+      "length": {
+        "name": "長さ"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "pose_end": {
+        "name": "ポーズ終了ステップ",
+        "tooltip": "ポーズ条件付けを使用する終了ステップ。"
+      },
+      "pose_start": {
+        "name": "ポーズ開始ステップ",
+        "tooltip": "ポーズ条件付けを使用する開始ステップ。"
+      },
+      "pose_strength": {
+        "name": "ポーズ強度",
+        "tooltip": "ポーズのlatentの強さ。"
+      },
+      "pose_video": {
+        "name": "ポーズビデオ",
+        "tooltip": "ポーズ条件付けに使用するビデオ。メインビデオの解像度の半分にダウンサンプリングされます。"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "reference_image": {
+        "name": "参照画像"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "幅"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": "生成サイズの空のlatent。"
+      }
+    }
+  },
   "WanSoundImageToVideo": {
     "display_name": "WanSoundImageToVideo",
     "inputs": {
@@ -13072,6 +18407,10 @@
         "name": "seed",
         "tooltip": "生成に使用するシード値。"
       },
+      "shot_type": {
+        "name": "ショットタイプ",
+        "tooltip": "生成される動画のショットタイプ（単一連続ショットか複数カットか）を指定します。このパラメータはprompt_extendがTrueの時のみ有効です。"
+      },
       "size": {
         "name": "size"
       },
@@ -13197,6 +18536,43 @@
       }
     }
   },
+  "WavespeedFlashVSRNode": {
+    "description": "低解像度やぼやけた映像の解像度を向上させ、鮮明さを復元する高速・高品質なビデオアップスケーラーです。",
+    "display_name": "FlashVSRビデオ高解像度化",
+    "inputs": {
+      "target_resolution": {
+        "name": "目標解像度"
+      },
+      "video": {
+        "name": "ビデオ"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WavespeedImageUpscaleNode": {
+    "description": "画像の解像度と品質を向上させ、写真を4Kや8Kにアップスケールしてシャープで詳細な結果を得られます。",
+    "display_name": "WaveSpeed画像高解像度化",
+    "inputs": {
+      "image": {
+        "name": "画像"
+      },
+      "model": {
+        "name": "model"
+      },
+      "target_resolution": {
+        "name": "目標解像度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "WebcamCapture": {
     "display_name": "ウェブカメラキャプチャ",
     "inputs": {
@@ -13209,13 +18585,38 @@
       "image": {
         "name": "画像"
       },
-      "waiting for camera___": {
-      },
+      "waiting for camera___": {},
       "width": {
         "name": "幅"
       }
     }
   },
+  "ZImageFunControlnet": {
+    "display_name": "ZImageFunControlnet",
+    "inputs": {
+      "image": {
+        "name": "画像"
+      },
+      "inpaint_image": {
+        "name": "インペイント画像"
+      },
+      "mask": {
+        "name": "マスク"
+      },
+      "model": {
+        "name": "モデル"
+      },
+      "model_patch": {
+        "name": "モデルパッチ"
+      },
+      "strength": {
+        "name": "強度"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
   "unCLIPCheckpointLoader": {
     "display_name": "unCLIPチェックポイントローダー",
     "inputs": {
@@ -13240,5 +18641,19 @@
         "name": "強度"
       }
     }
+  },
+  "wanBlockSwap": {
+    "description": "NOP",
+    "display_name": "wanBlockSwap",
+    "inputs": {
+      "model": {
+        "name": "モデル"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
   }
 }
diff --git a/src/locales/ja/settings.json b/src/locales/ja/settings.json
index 1d1fdeb1c9..66663d896a 100644
--- a/src/locales/ja/settings.json
+++ b/src/locales/ja/settings.json
@@ -52,7 +52,8 @@
     }
   },
   "Comfy_Canvas_SelectionToolbox": {
-    "name": "選択ツールボックスを表示"
+    "name": "選択ツールボックスを表示",
+    "tooltip": "ノードが選択されているときにフローティングツールバーを表示し、よく使う操作に素早くアクセスできます。"
   },
   "Comfy_ConfirmClear": {
     "name": "ワークフローをクリアする際に確認を要求する"
@@ -79,6 +80,17 @@
   "Comfy_EnableWorkflowViewRestore": {
     "name": "ワークフロー内のキャンバスの位置とズームレベルを保存および復元する"
   },
+  "Comfy_Execution_PreviewMethod": {
+    "name": "ライブプレビューメソッド",
+    "options": {
+      "auto": "auto",
+      "default": "default",
+      "latent2rgb": "latent2rgb",
+      "none": "none",
+      "taesd": "taesd"
+    },
+    "tooltip": "画像生成中のライブプレビューメソッド。「default」はサーバーのCLI設定を使用します。"
+  },
   "Comfy_FloatRoundingPrecision": {
     "name": "浮動小数点ウィジェットの丸め小数点数 [0 = 自動]。",
     "tooltip": "(ページの再読み込みが必要)"
@@ -92,6 +104,10 @@
   "Comfy_Graph_CtrlShiftZoom": {
     "name": "ファストズームショートカットを有効にする（Ctrl + Shift + ドラッグ）"
   },
+  "Comfy_Graph_DeduplicateSubgraphNodeIds": {
+    "name": "サブグラフノードIDの重複排除",
+    "tooltip": "ワークフローを読み込む際に、サブグラフ内の重複したノードIDを自動的に再割り当てします。"
+  },
   "Comfy_Graph_LinkMarkers": {
     "name": "リンク中点マーカー",
     "options": {
@@ -100,6 +116,10 @@
       "None": "なし"
     }
   },
+  "Comfy_Graph_LiveSelection": {
+    "name": "ライブ選択",
+    "tooltip": "有効にすると、他のデザインツールのように選択範囲をドラッグする際、ノードがリアルタイムで選択／解除されます。"
+  },
   "Comfy_Graph_ZoomSpeed": {
     "name": "キャンバスズーム速度"
   },
@@ -132,43 +152,53 @@
       "Linear": "リニア",
       "Spline": "スプライン",
       "Straight": "ストレート"
-    }
+    },
+    "tooltip": "キャンバス上のノード間の接続リンクの外観と表示を制御します。"
   },
   "Comfy_Load3D_3DViewerEnable": {
     "name": "3Dビューアーを有効化（ベータ）",
-    "tooltip": "選択したノードで3Dビューアー（ベータ）を有効にします。この機能により、フルサイズの3Dビューアー内で3Dモデルを直接可視化し、操作できます。"
+    "tooltip": "選択したノードに対して3Dビューアー（ベータ）を有効にします。この機能により、フルサイズの3Dビューアー内で3Dモデルを直接可視化し、操作できます。"
   },
   "Comfy_Load3D_BackgroundColor": {
     "name": "初期背景色",
-    "tooltip": "3Dシーンのデフォルト背景色を設定します。この設定は新しい3Dウィジェット作成時の背景の見た目を決定しますが、作成後に各ウィジェットごとに個別に調整できます。"
+    "tooltip": "3Dシーンのデフォルト背景色を設定します。この設定は新しい3Dウィジェット作成時の背景の見た目を決定しますが、作成後に各ウィジェットごとに個別調整が可能です。"
   },
   "Comfy_Load3D_CameraType": {
-    "name": "カメラタイプ",
+    "name": "初期カメラタイプ",
     "options": {
-      "orthographic": "オルソグラフィック",
+      "orthographic": "直交投影",
       "perspective": "パースペクティブ"
     },
-    "tooltip": "新しい3Dウィジェットが作成されたときに、デフォルトでカメラが透視投影か平行投影かを制御します。このデフォルトは、作成後に各ウィジェットごとに個別に切り替えることができます。"
+    "tooltip": "新しい3Dウィジェット作成時に、カメラがデフォルトでパースペクティブか直交投影かを制御します。このデフォルトは作成後に各ウィジェットごとに切り替え可能です。"
   },
   "Comfy_Load3D_LightAdjustmentIncrement": {
     "name": "ライト調整増分",
-    "tooltip": "3Dシーンでライトの強度を調整する際の増分サイズを制御します。ステップ値が小さいほど、照明調整をより細かく制御でき、大きい値では1回の調整ごとにより顕著な変化が得られます。"
+    "tooltip": "3Dシーンでライトの強度を調整する際の増分サイズを制御します。小さいステップ値はより細かい調整を可能にし、大きい値は一度の調整でより大きな変化となります。"
   },
   "Comfy_Load3D_LightIntensity": {
     "name": "初期ライト強度",
-    "tooltip": "3Dシーン内の照明のデフォルトの明るさレベルを設定します。この値は新しい3Dウィジェット作成時にライトがオブジェクトをどれだけ強く照らすかを決定しますが、作成後に各ウィジェットごとに個別に調整できます。"
+    "tooltip": "3Dシーンの照明のデフォルトの明るさレベルを設定します。この値は新しい3Dウィジェット作成時にライトがどれだけ強くオブジェクトを照らすかを決定しますが、作成後に各ウィジェットごとに調整可能です。"
   },
   "Comfy_Load3D_LightIntensityMaximum": {
-    "name": "最大光度",
-    "tooltip": "3Dシーンで許可される最大光度値を設定します。これは、3Dウィジェットで照明を調整する際に設定できる明るさの上限を定義します。"
+    "name": "ライト強度の最大値",
+    "tooltip": "3Dシーンで設定可能なライト強度の最大値を設定します。これは、任意の3Dウィジェットで照明を調整する際の明るさの上限を定義します。"
   },
   "Comfy_Load3D_LightIntensityMinimum": {
-    "name": "光の強度の最小値",
-    "tooltip": "3Dシーンで許可される光の強度の最小値を設定します。これは、3Dウィジェットで照明を調整する際に設定できる明るさの下限を定義します。"
+    "name": "ライト強度の最小値",
+    "tooltip": "3Dシーンで設定可能なライト強度の最小値を設定します。これは、任意の3Dウィジェットで照明を調整する際の明るさの下限を定義します。"
+  },
+  "Comfy_Load3D_PLYEngine": {
+    "name": "PLYエンジン",
+    "options": {
+      "fastply": "fastply",
+      "sparkjs": "sparkjs",
+      "threejs": "threejs"
+    },
+    "tooltip": "PLYファイルを読み込むエンジンを選択します。「threejs」はネイティブのThree.js PLYLoaderを使用（メッシュPLYファイルに最適）。「fastply」はASCIIポイントクラウドPLYファイル用の最適化ローダーを使用。「sparkjs」は3DガウシアンスプラッティングPLYファイル用にSpark.jsを使用します。"
   },
   "Comfy_Load3D_ShowGrid": {
-    "name": "グリッドを表示",
-    "tooltip": "デフォルトでグリッドを表示するには切り替えます"
+    "name": "初期グリッド表示",
+    "tooltip": "新しい3Dウィジェット作成時にグリッドがデフォルトで表示されるかどうかを制御します。このデフォルトは作成後に各ウィジェットごとに切り替え可能です。"
   },
   "Comfy_Locale": {
     "name": "言語"
@@ -218,11 +248,20 @@
   "Comfy_NodeBadge_ShowApiPricing": {
     "name": "APIノードの料金バッジを表示"
   },
+  "Comfy_NodeLibrary_NewDesign": {
+    "name": "新しいノードライブラリデザイン",
+    "tooltip": "タブ（Essential、All、Custom）、強化された検索機能、ホバープレビューを備えた再設計されたノードライブラリサイドバーを有効にします。"
+  },
+  "Comfy_NodeReplacement_Enabled": {
+    "name": "自動ノード置換を有効にする",
+    "tooltip": "有効にすると、置換マッピングが存在する場合、欠落しているノードが自動的に新しい同等ノードに置き換えられます。"
+  },
   "Comfy_NodeSearchBoxImpl": {
     "name": "ノード検索ボックスの実装",
     "options": {
       "default": "デフォルト",
-      "litegraph (legacy)": "litegraph (レガシー)"
+      "litegraph (legacy)": "litegraph (レガシー)",
+      "v1 (legacy)": "v1（レガシー）"
     }
   },
   "Comfy_NodeSearchBoxImpl_NodePreview": {
@@ -248,6 +287,10 @@
   "Comfy_Node_AllowImageSizeDraw": {
     "name": "画像プレビューの下に幅×高さを表示する"
   },
+  "Comfy_Node_AlwaysShowAdvancedWidgets": {
+    "name": "すべてのノードで常に高度なウィジェットを表示",
+    "tooltip": "有効にすると、すべてのノードで高度なウィジェットが個別に展開しなくても常に表示されます。"
+  },
   "Comfy_Node_AutoSnapLinkToSlot": {
     "name": "ノードスロットにリンクを自動スナップ",
     "tooltip": "ノードの上にリンクをドラッグすると、リンクがノードの有効な入力スロットに自動的にスナップします"
@@ -308,6 +351,14 @@
     "name": "キュー履歴サイズ",
     "tooltip": "キュー履歴に表示されるタスクの最大数。"
   },
+  "Comfy_Queue_QPOV2": {
+    "name": "アセットサイドパネルで統一ジョブキューを使用",
+    "tooltip": "フローティングジョブキューパネルを、アセットサイドパネルに埋め込まれた同等のジョブキューに置き換えます。無効にすると、フローティングパネルのレイアウトに戻ります。"
+  },
+  "Comfy_RightSidePanel_ShowErrorsTab": {
+    "name": "サイドパネルにエラータブを表示",
+    "tooltip": "有効にすると、右側のサイドパネルにエラータブが表示され、ワークフロー実行時のエラーを一目で確認できます。"
+  },
   "Comfy_Sidebar_Location": {
     "name": "サイドバーの位置",
     "options": {
@@ -345,6 +396,14 @@
   "Comfy_TreeExplorer_ItemPadding": {
     "name": "ツリーエクスプローラーアイテムのパディング"
   },
+  "Comfy_UI_TabBarLayout": {
+    "name": "タブバーのレイアウト",
+    "options": {
+      "Default": "デフォルト",
+      "Integrated": "統合"
+    },
+    "tooltip": "タブバーのレイアウトを制御します。「統合」を選択すると、ヘルプとユーザーコントロールがタブバーエリアに移動します。"
+  },
   "Comfy_UseNewMenu": {
     "name": "新しいメニューを使用",
     "options": {
@@ -434,6 +493,7 @@
     "tooltip": "リルート中心点からのベジエ制御点のオフセット"
   },
   "pysssss_SnapToGrid": {
-    "name": "常にグリッドにスナップ"
+    "name": "常にグリッドにスナップ",
+    "tooltip": "有効にすると、ノードを移動またはサイズ変更した際に自動的にグリッドに揃えます。"
   }
 }
diff --git a/src/locales/ko/commands.json b/src/locales/ko/commands.json
index d084ece39e..c3c984303e 100644
--- a/src/locales/ko/commands.json
+++ b/src/locales/ko/commands.json
@@ -1,6 +1,42 @@
 {
+  "Comfy-Desktop_CheckForUpdates": {
+    "label": "업데이트 확인"
+  },
+  "Comfy-Desktop_Folders_OpenCustomNodesFolder": {
+    "label": "커스텀 노드 폴더 열기"
+  },
+  "Comfy-Desktop_Folders_OpenInputsFolder": {
+    "label": "입력 폴더 열기"
+  },
+  "Comfy-Desktop_Folders_OpenLogsFolder": {
+    "label": "로그 폴더 열기"
+  },
+  "Comfy-Desktop_Folders_OpenModelConfig": {
+    "label": "extra_model_paths.yaml 열기"
+  },
+  "Comfy-Desktop_Folders_OpenModelsFolder": {
+    "label": "모델 폴더 열기"
+  },
+  "Comfy-Desktop_Folders_OpenOutputsFolder": {
+    "label": "출력 폴더 열기"
+  },
+  "Comfy-Desktop_OpenDevTools": {
+    "label": "개발자 도구 열기"
+  },
+  "Comfy-Desktop_OpenUserGuide": {
+    "label": "데스크톱 사용자 가이드"
+  },
+  "Comfy-Desktop_Quit": {
+    "label": "종료"
+  },
+  "Comfy-Desktop_Reinstall": {
+    "label": "재설치"
+  },
+  "Comfy-Desktop_Restart": {
+    "label": "재시작"
+  },
   "Comfy_3DViewer_Open3DViewer": {
-    "label": "선택한 노드에 대해 3D 뷰어(베타) 열기"
+    "label": "선택한 노드의 3D 뷰어(베타) 열기"
   },
   "Comfy_BrowseModelAssets": {
     "label": "실험적: 모델 에셋 탐색"
@@ -8,6 +44,9 @@
   "Comfy_BrowseTemplates": {
     "label": "템플릿 탐색"
   },
+  "Comfy_Canvas_CopySelected": {
+    "label": "복사"
+  },
   "Comfy_Canvas_DeleteSelectedItems": {
     "label": "선택한 항목 삭제"
   },
@@ -29,12 +68,18 @@
   "Comfy_Canvas_MoveSelectedNodes_Up": {
     "label": "선택한 노드 위로 이동"
   },
+  "Comfy_Canvas_PasteFromClipboard": {
+    "label": "붙여넣기"
+  },
   "Comfy_Canvas_ResetView": {
     "label": "뷰 재설정"
   },
   "Comfy_Canvas_Resize": {
     "label": "선택된 노드 크기 조정"
   },
+  "Comfy_Canvas_SelectAll": {
+    "label": "모두 선택"
+  },
   "Comfy_Canvas_ToggleLinkVisibility": {
     "label": "캔버스 링크 가시성 토글"
   },
@@ -155,18 +200,30 @@
   "Comfy_Manager_ShowUpdateAvailablePacks": {
     "label": "업데이트 확인"
   },
-  "Comfy_Manager_ToggleManagerProgressDialog": {
-    "label": "진행 상황 대화 상자 전환"
-  },
   "Comfy_MaskEditor_BrushSize_Decrease": {
     "label": "마스크 편집기에서 브러시 크기 줄이기"
   },
   "Comfy_MaskEditor_BrushSize_Increase": {
     "label": "마스크 편집기에서 브러시 크기 늘리기"
   },
+  "Comfy_MaskEditor_ColorPicker": {
+    "label": "MaskEditor에서 색상 선택기 열기"
+  },
+  "Comfy_MaskEditor_Mirror_Horizontal": {
+    "label": "마스크 에디터에서 수평 반전"
+  },
+  "Comfy_MaskEditor_Mirror_Vertical": {
+    "label": "마스크 에디터에서 수직 반전"
+  },
   "Comfy_MaskEditor_OpenMaskEditor": {
     "label": "선택한 노드 마스크 편집기 열기"
   },
+  "Comfy_MaskEditor_Rotate_Left": {
+    "label": "마스크 에디터에서 왼쪽으로 회전"
+  },
+  "Comfy_MaskEditor_Rotate_Right": {
+    "label": "마스크 에디터에서 오른쪽으로 회전"
+  },
   "Comfy_Memory_UnloadModels": {
     "label": "모델 언로드"
   },
@@ -197,12 +254,18 @@
   "Comfy_QueueSelectedOutputNodes": {
     "label": "선택한 출력 노드 대기열에 추가"
   },
+  "Comfy_Queue_ToggleOverlay": {
+    "label": "작업 기록 토글"
+  },
   "Comfy_Redo": {
     "label": "다시 실행"
   },
   "Comfy_RefreshNodeDefinitions": {
     "label": "노드 정의 새로 고침"
   },
+  "Comfy_RenameWorkflow": {
+    "label": "워크플로우 이름 변경"
+  },
   "Comfy_SaveWorkflow": {
     "label": "워크플로 저장"
   },
@@ -212,6 +275,12 @@
   "Comfy_ShowSettingsDialog": {
     "label": "설정 대화상자 보기"
   },
+  "Comfy_Subgraph_SetDescription": {
+    "label": "서브그래프 설명 설정"
+  },
+  "Comfy_Subgraph_SetSearchAliases": {
+    "label": "서브그래프 검색 별칭 설정"
+  },
   "Comfy_ToggleAssetAPI": {
     "label": "실험적: AssetAPI 활성화"
   },
@@ -221,6 +290,12 @@
   "Comfy_ToggleHelpCenter": {
     "label": "도움말 센터"
   },
+  "Comfy_ToggleLinear": {
+    "label": "선형 모드 토글"
+  },
+  "Comfy_ToggleQPOV2": {
+    "label": "Queue Panel V2 토글"
+  },
   "Comfy_ToggleTheme": {
     "label": "밝기 테마 전환 (어두운/밝은)"
   },
@@ -252,10 +327,10 @@
     "label": "하단 패널 토글"
   },
   "Workspace_ToggleBottomPanelTab_command-terminal": {
-    "label": "터미널 하단 패널 토글"
+    "label": "터미널 하단 패널 전환"
   },
   "Workspace_ToggleBottomPanelTab_logs-terminal": {
-    "label": "로그 하단 패널 토글"
+    "label": "로그 하단 패널 전환"
   },
   "Workspace_ToggleBottomPanelTab_shortcuts-essentials": {
     "label": "필수 하단 패널 전환"
@@ -269,6 +344,10 @@
   "Workspace_ToggleFocusMode": {
     "label": "포커스 모드 토글"
   },
+  "Workspace_ToggleSidebarTab_apps": {
+    "label": "앱 사이드바 전환",
+    "tooltip": "앱"
+  },
   "Workspace_ToggleSidebarTab_assets": {
     "label": "에셋 사이드바 전환",
     "tooltip": "에셋"
diff --git a/src/locales/ko/main.json b/src/locales/ko/main.json
index 3a96c149b3..44a2b71e0e 100644
--- a/src/locales/ko/main.json
+++ b/src/locales/ko/main.json
@@ -1,6 +1,8 @@
 {
   "actionbar": {
-    "dockToTop": "상단에 도킹"
+    "dockToTop": "상단에 도킹",
+    "feedback": "피드백",
+    "feedbackTooltip": "피드백"
   },
   "apiNodesCostBreakdown": {
     "costPerRun": "실행 당 비용",
@@ -14,26 +16,175 @@
   "assetBrowser": {
     "allCategory": "모든 {category}",
     "allModels": "모든 모델",
+    "apiKeyHint": "비공개 또는 제한된 모델을 가져오시나요? {link}.",
+    "apiKeyHintLink": "설정에서 API 키를 추가하세요",
     "ariaLabel": {
       "assetCard": "{name} - {type} 에셋",
       "loadingAsset": "에셋 로드 중"
     },
+    "assetCollection": "에셋 컬렉션",
     "assets": "에셋",
+    "baseModel": "베이스 모델",
     "baseModels": "베이스 모델",
     "browseAssets": "에셋 탐색",
+    "byType": "유형별",
+    "checkpoints": "체크포인트",
+    "civitaiLinkExample": "{example} {link}",
+    "civitaiLinkExampleStrong": "예시:",
+    "civitaiLinkExampleUrl": "https://civitai.com/models/10706/luisap-z-image-and-qwen-pixel-art-refiner?modelVersionId=2225295",
+    "civitaiLinkLabel": "Civitai 모델 {download} 링크",
+    "civitaiLinkLabelDownload": "다운로드",
+    "civitaiLinkPlaceholder": "여기에 링크를 붙여넣으세요",
+    "confirmModelDetails": "모델 세부 정보 확인",
     "connectionError": "연결을 확인하고 다시 시도하세요",
+    "deletion": {
+      "body": "이 모델은 라이브러리에서 영구적으로 삭제됩니다.",
+      "complete": "{assetName}이(가) 삭제되었습니다.",
+      "failed": "{assetName}을(를) 삭제할 수 없습니다.",
+      "header": "이 모델을 삭제하시겠습니까?",
+      "inProgress": "{assetName} 삭제 중..."
+    },
+    "download": {
+      "complete": "다운로드 완료",
+      "failed": "다운로드 실패",
+      "inProgress": "{assetName} 다운로드 중..."
+    },
+    "emptyImported": {
+      "canImport": "아직 가져온 모델이 없습니다. \"모델 가져오기\"를 클릭하여 직접 추가하세요.",
+      "restricted": "개인 모델은 Creator 등급 이상에서만 사용할 수 있습니다."
+    },
+    "errorAccessForbidden": "이 리소스에 대한 접근이 금지되었습니다.",
+    "errorConnectionRefused": "소스에 연결할 수 없습니다. 나중에 다시 시도하세요.",
+    "errorDownloadCancelled": "다운로드가 취소되었습니다.",
+    "errorFileTooLarge": "파일이 허용된 최대 크기 제한을 초과했습니다",
+    "errorFormatNotAllowed": "SafeTensor 형식만 허용됩니다",
+    "errorHttpError": "메타데이터를 가져오는 중 오류가 발생했습니다.",
+    "errorInternalError": "예상치 못한 오류가 발생했습니다. 다시 시도해 주세요.",
+    "errorInvalidHost": "소스 URL의 호스트 이름을 확인할 수 없습니다.",
+    "errorInvalidUrl": "URL을 입력해 주세요.",
+    "errorInvalidUrlFormat": "URL 형식이 올바르지 않습니다. 확인 후 다시 시도해 주세요.",
+    "errorMetadataFetchFailed": "소스에서 파일 정보를 가져오지 못했습니다.",
+    "errorModelTypeNotSupported": "이 모델 유형은 지원되지 않습니다",
+    "errorNetworkError": "네트워크 오류가 발생했습니다. 연결을 확인하고 다시 시도해 주세요.",
+    "errorNetworkTimeout": "요청 시간이 초과되었습니다. 다시 시도해 주세요.",
+    "errorRateLimited": "요청이 너무 많습니다. 잠시 후 다시 시도해 주세요.",
+    "errorRequestCancelled": "요청이 취소되었습니다.",
+    "errorResourceNotFound": "파일을 찾을 수 없습니다. URL을 확인하고 다시 시도해 주세요.",
+    "errorServiceUnavailable": "서비스를 일시적으로 사용할 수 없습니다. 나중에 다시 시도해 주세요.",
+    "errorSourceServerError": "소스 서버에 문제가 발생했습니다. 나중에 다시 시도해 주세요.",
+    "errorUnauthorized": "계속하려면 로그인해 주세요.",
+    "errorUnauthorizedSource": "이 리소스는 인증이 필요합니다. 설정에서 API 토큰을 추가해 주세요.",
+    "errorUnknown": "예기치 않은 오류가 발생했습니다",
+    "errorUnsafePickleScan": "CivitAI에서 이 파일에 잠재적으로 안전하지 않은 코드를 감지했습니다",
+    "errorUnsafeVirusScan": "CivitAI에서 이 파일에 악성코드 또는 의심스러운 내용을 감지했습니다",
+    "errorUnsupportedSource": "이 URL은 지원되지 않습니다. Hugging Face와 Civitai URL만 허용됩니다.",
+    "errorUploadFailed": "에셋 가져오기에 실패했습니다. 다시 시도해 주세요.",
+    "errorUserTokenAccessDenied": "API 토큰에 이 리소스에 대한 접근 권한이 없습니다. 토큰 권한을 확인해 주세요.",
+    "errorUserTokenInvalid": "저장된 API 토큰이 유효하지 않거나 만료되었습니다. 설정에서 토큰을 업데이트해 주세요.",
     "failedToCreateNode": "노드 생성에 실패했습니다. 다시 시도하거나 콘솔에서 세부 정보를 확인하세요.",
     "fileFormats": "파일 형식",
+    "fileName": "파일 이름",
+    "fileSize": "파일 크기",
+    "filterBy": "필터 기준",
+    "findInLibrary": "모델 라이브러리의 {type} 섹션에서 찾을 수 있습니다.",
+    "finish": "완료",
+    "genericLinkPlaceholder": "여기에 링크를 붙여넣으세요",
+    "importAnother": "다른 항목 가져오기",
+    "imported": "가져온 항목",
+    "invalidAsset": "잘못된 에셋",
+    "invalidAssetDetail": "선택한 에셋을 확인할 수 없습니다. 다시 시도해 주세요.",
+    "invalidFilename": "잘못된 파일명",
+    "invalidFilenameDetail": "에셋의 파일명을 확인할 수 없습니다. 다시 시도해 주세요.",
+    "jobId": "작업 ID",
     "loadingModels": "{type} 불러오는 중...",
+    "maxFileSize": "최대 파일 크기: {size}",
+    "maxFileSizeValue": "1 GB",
+    "media": {
+      "audioPlaceholder": "오디오",
+      "threeDModelPlaceholder": "3D 모델"
+    },
+    "modelAssociatedWithLink": "제공하신 링크와 연결된 모델:",
+    "modelInfo": {
+      "addBaseModel": "베이스 모델 추가...",
+      "addTag": "태그 추가...",
+      "additionalTags": "추가 태그",
+      "baseModelUnknown": "베이스 모델 알 수 없음",
+      "basicInfo": "기본 정보",
+      "compatibleBaseModels": "호환 가능한 베이스 모델",
+      "description": "설명",
+      "descriptionNotSet": "설정된 설명 없음",
+      "descriptionPlaceholder": "이 모델에 대한 설명을 추가하세요...",
+      "displayName": "표시 이름",
+      "editDisplayName": "표시 이름 편집",
+      "fileName": "파일 이름",
+      "modelDescription": "모델 설명",
+      "modelTagging": "모델 태깅",
+      "modelType": "모델 유형",
+      "noAdditionalTags": "추가 태그 없음",
+      "selectModelPrompt": "모델을 선택하여 정보를 확인하세요",
+      "selectModelType": "모델 유형 선택...",
+      "source": "소스",
+      "title": "모델 정보",
+      "triggerPhrases": "트리거 문구",
+      "viewOnSource": "{source}에서 보기"
+    },
+    "modelName": "모델 이름",
+    "modelNamePlaceholder": "이 모델의 이름을 입력하세요",
+    "modelTypeSelectorLabel": "모델 유형은 무엇인가요?",
+    "modelTypeSelectorPlaceholder": "모델 유형 선택",
+    "modelUploaded": "모델이 성공적으로 가져와졌습니다.",
     "noAssetsFound": "에셋을 찾을 수 없습니다",
     "noModelsInFolder": "이 폴더에 사용 가능한 {type}이(가) 없습니다",
+    "noResultsCanImport": "검색어나 필터를 조정해보세요.\n또는 위의 \"가져오기\" 버튼을 사용해 모델을 추가할 수 있습니다.",
+    "noValidSourceDetected": "유효한 가져오기 소스를 감지하지 못했습니다",
+    "notSureLeaveAsIs": "잘 모르겠다면 그대로 두세요",
+    "onlyCivitaiUrlsSupported": "Civitai URL만 지원됩니다",
+    "ownership": "소유권",
+    "ownershipAll": "전체",
+    "ownershipMyModels": "내 모델",
+    "ownershipPublicModels": "공개 모델",
+    "processingModel": "다운로드 시작됨",
+    "processingModelDescription": "이 대화 상자를 닫아도 됩니다. 다운로드는 백그라운드에서 계속됩니다.",
+    "providerCivitai": "Civitai",
+    "providerHuggingFace": "Hugging Face",
+    "rename": {
+      "failed": "에셋 이름을 변경할 수 없습니다."
+    },
+    "selectFrameworks": "프레임워크 선택",
+    "selectModelType": "모델 유형 선택",
+    "selectProjects": "프로젝트 선택",
     "sortAZ": "가나다순",
     "sortBy": "정렬 기준",
+    "sortDefault": "기본값",
     "sortPopular": "인기순",
     "sortRecent": "최근",
     "sortZA": "가나다 역순",
+    "sortingType": "정렬 방식",
+    "tags": "태그",
+    "tagsHelp": "태그는 쉼표로 구분하세요",
+    "tagsPlaceholder": "예: models, checkpoint",
     "tryAdjustingFilters": "검색 또는 필터를 조정해 보세요",
-    "unknown": "알 수 없음"
+    "unknown": "알 수 없음",
+    "unsupportedUrlSource": "{sources}의 URL만 지원됩니다",
+    "upgradeFeatureDescription": "이 기능은 Creator 또는 Pro 요금제에서만 사용할 수 있습니다.",
+    "upgradeToUnlockFeature": "이 기능을 사용하려면 업그레이드하세요",
+    "upload": "가져오기",
+    "uploadFailed": "가져오기 실패",
+    "uploadModel": "가져오기",
+    "uploadModelDescription1": "Civitai 모델 다운로드 링크를 붙여넣어 라이브러리에 추가하세요.",
+    "uploadModelDescription1Generic": "모델 다운로드 링크를 붙여넣어 라이브러리에 추가하세요.",
+    "uploadModelDescription2": "현재는 {link}의 링크만 지원됩니다",
+    "uploadModelDescription2Generic": "다음 제공업체의 URL만 지원됩니다:",
+    "uploadModelDescription2Link": "https://civitai.com/models",
+    "uploadModelDescription3": "최대 파일 크기: {size}",
+    "uploadModelFailedToRetrieveMetadata": "메타데이터를 가져오지 못했습니다. 링크를 확인하고 다시 시도해 주세요.",
+    "uploadModelFromCivitai": "Civitai에서 모델 가져오기",
+    "uploadModelGeneric": "모델 가져오기",
+    "uploadModelHelpFooterText": "URL 찾는 방법이 필요하신가요? 아래 제공업체를 클릭하면 안내 영상을 볼 수 있습니다.",
+    "uploadModelHelpVideo": "모델 업로드 도움말 영상",
+    "uploadModelHowDoIFindThis": "이것을 어떻게 찾나요?",
+    "uploadSuccess": "모델이 성공적으로 가져와졌습니다!",
+    "uploadingModel": "모델 가져오는 중..."
   },
   "auth": {
     "apiKey": {
@@ -55,13 +206,7 @@
       "whitelistInfo": "비허용 사이트에 대하여"
     },
     "deleteAccount": {
-      "cancel": "취소",
-      "confirm": "계정 삭제",
-      "confirmMessage": "정말로 계정을 삭제하시겠습니까? 이 작업은 되돌릴 수 없으며 모든 데이터가 영구적으로 삭제됩니다.",
-      "confirmTitle": "계정 삭제",
-      "deleteAccount": "계정 삭제",
-      "success": "계정이 삭제되었습니다",
-      "successDetail": "계정이 성공적으로 삭제되었습니다."
+      "contactSupport": "계정을 삭제하려면 {email}으로 문의해 주세요."
     },
     "errors": {
       "auth/cancelled-popup-request": "로그인이 취소되었습니다. 다시 시도해 주세요.",
@@ -80,6 +225,7 @@
     "login": {
       "andText": "및",
       "backToLogin": "로그인으로 돌아가기",
+      "backToSocialLogin": "Google 또는 Github로 가입하기",
       "confirmPasswordLabel": "비밀번호 확인",
       "confirmPasswordPlaceholder": "동일한 비밀번호를 다시 입력하세요",
       "didntReceiveEmail": "이메일을 받지 못하셨나요? 다음으로 문의하세요:",
@@ -88,6 +234,9 @@
       "failed": "로그인 실패",
       "forgotPassword": "비밀번호를 잊으셨나요?",
       "forgotPasswordError": "비밀번호 재설정 이메일 전송에 실패했습니다",
+      "freeTierBadge": "무료 등급 가능",
+      "freeTierDescription": "Google로 가입하면 매월 {credits} 무료 크레딧을 받을 수 있습니다. 카드 필요 없음.",
+      "freeTierDescriptionGeneric": "Google로 가입하면 매월 무료 크레딧을 받을 수 있습니다. 카드 필요 없음.",
       "insecureContextWarning": "이 연결은 안전하지 않습니다(HTTP) - 로그인을 계속하면 자격 증명이 공격자에게 가로채질 수 있습니다.",
       "loginButton": "로그인",
       "loginWithGithub": "Github로 로그인",
@@ -106,11 +255,13 @@
       "sendResetLink": "재설정 링크 보내기",
       "signInOrSignUp": "로그인 / 회원가입",
       "signUp": "가입하기",
+      "signUpFreeTierPromo": "처음이신가요? Google로 {signUp} 하여 매월 {credits} 무료 크레딧을 받으세요.",
       "success": "로그인 성공",
       "termsLink": "이용 약관",
       "termsText": "\"다음\" 또는 \"가입하기\"를 클릭하면 우리의",
       "title": "계정에 로그인",
       "useApiKey": "Comfy API 키",
+      "useEmailInstead": "이메일로 계속하기",
       "userAvatar": "사용자 아바타"
     },
     "loginButton": {
@@ -130,11 +281,14 @@
     "signOut": {
       "signOut": "로그아웃",
       "success": "성공적으로 로그아웃되었습니다",
-      "successDetail": "계정에서 로그아웃되었습니다."
+      "successDetail": "계정에서 로그아웃되었습니다.",
+      "unsavedChangesMessage": "저장되지 않은 변경 사항이 있습니다. 로그아웃하면 변경 사항이 사라집니다. 계속하시겠습니까?",
+      "unsavedChangesTitle": "저장되지 않은 변경 사항"
     },
     "signup": {
       "alreadyHaveAccount": "이미 계정이 있으신가요?",
       "emailLabel": "이메일",
+      "emailNotEligibleForFreeTier": "이메일 가입은 무료 등급에 해당되지 않습니다.",
       "emailPlaceholder": "이메일을 입력하세요",
       "passwordLabel": "비밀번호",
       "passwordPlaceholder": "새 비밀번호를 입력하세요",
@@ -147,12 +301,68 @@
       "title": "계정 생성"
     }
   },
+  "batch": {
+    "index": "{current} / {total}"
+  },
+  "billingOperation": {
+    "subscriptionFailed": "구독 업데이트에 실패했습니다",
+    "subscriptionProcessing": "결제 처리 중 — 워크스페이스를 설정하는 중입니다...",
+    "subscriptionSuccess": "구독이 성공적으로 업데이트되었습니다",
+    "subscriptionTimeout": "구독 확인 시간이 초과되었습니다",
+    "topupFailed": "충전 실패",
+    "topupProcessing": "결제 처리 중 — 크레딧을 추가하는 중입니다...",
+    "topupSuccess": "크레딧이 성공적으로 추가되었습니다",
+    "topupTimeout": "충전 확인 시간이 초과되었습니다"
+  },
+  "boundingBox": {
+    "height": "높이",
+    "width": "너비",
+    "x": "X",
+    "y": "Y"
+  },
   "breadcrumbsMenu": {
     "clearWorkflow": "워크플로 내용 지우기",
     "deleteBlueprint": "블루프린트 삭제",
     "deleteWorkflow": "워크플로 삭제",
     "duplicate": "복제",
-    "enterNewName": "새 이름 입력"
+    "enterAppMode": "앱 모드로 진입",
+    "enterBuilderMode": "앱 빌더로 진입",
+    "enterNewName": "새 이름 입력",
+    "exitAppMode": "앱 모드 종료",
+    "missingNodesWarning": "워크플로우에 지원되지 않는 노드가 포함되어 있습니다(빨간색으로 표시됨).",
+    "workflowActions": "워크플로우 작업"
+  },
+  "builderMenu": {
+    "exitAppBuilder": "앱 빌더 종료"
+  },
+  "builderToolbar": {
+    "app": "앱",
+    "appDescription": "기본적으로 앱으로 열립니다",
+    "arrange": "미리보기",
+    "arrangeDescription": "앱 레이아웃 검토",
+    "connectOutput": "출력 연결",
+    "connectOutputBody1": "앱을 저장하려면 최소 한 개의 출력이 연결되어야 합니다.",
+    "connectOutputBody2": "'선택' 단계로 전환한 후 출력 노드를 클릭하여 여기에 추가하세요.",
+    "defaultModeAppliedAppBody": "이 워크플로우는 앞으로 기본적으로 앱 모드에서 열립니다.",
+    "defaultModeAppliedAppPrompt": "지금 확인하시겠습니까?",
+    "defaultModeAppliedGraphBody": "이 워크플로우는 앞으로 기본적으로 노드 그래프로 열립니다.",
+    "defaultModeAppliedGraphPrompt": "앱을 계속 보시겠습니까?",
+    "defaultModeAppliedTitle": "성공적으로 설정됨",
+    "defaultView": "기본 보기 설정",
+    "defaultViewDescription": "이 워크플로우가 어떻게 열릴지 선택하세요",
+    "defaultViewLabel": "기본적으로 이 워크플로우는 다음과 같이 열립니다:",
+    "defaultViewTitle": "이 워크플로우의 기본 보기 설정",
+    "emptyWorkflowPrompt": "템플릿으로 시작하시겠습니까?",
+    "emptyWorkflowTitle": "이 워크플로우에는 노드가 없습니다",
+    "inputs": "입력",
+    "inputsDescription": "입력 선택",
+    "label": "앱 빌더",
+    "nodeGraph": "노드 그래프",
+    "nodeGraphDescription": "기본적으로 노드 그래프로 열립니다",
+    "outputs": "출력",
+    "outputsDescription": "출력 선택",
+    "switchToOutputs": "출력으로 전환",
+    "viewApp": "앱 보기"
   },
   "clipboard": {
     "errorMessage": "클립보드에 복사하지 못했습니다",
@@ -206,6 +416,7 @@
     },
     "retry": "다시 시도",
     "retrying": "재시도 중...",
+    "skipToCloudApp": "클라우드 앱으로 건너뛰기",
     "start": {
       "desc": "설정 불필요. 모든 기기에서 작동합니다.",
       "download": "ComfyUI 다운로드",
@@ -339,6 +550,8 @@
     "Edit Subgraph Widgets": "서브그래프 위젯 편집",
     "Expand": "확장",
     "Expand Node": "노드 확장",
+    "Extensions": "확장 프로그램",
+    "FavoriteWidget": "위젯 즐겨찾기",
     "Horizontal": "수평",
     "Inputs": "입력",
     "Left": "왼쪽",
@@ -358,6 +571,7 @@
     "Remove": "제거",
     "Remove Bypass": "우회 제거",
     "Rename": "이름 변경",
+    "RenameWidget": "위젯 이름 변경",
     "Resize": "크기 조정",
     "Right": "오른쪽",
     "Run Branch": "분기 실행",
@@ -368,6 +582,7 @@
     "Shapes": "형태",
     "Title": "제목",
     "Top": "위",
+    "UnfavoriteWidget": "위젯 즐겨찾기 해제",
     "Unpack Subgraph": "서브그래프 풀기",
     "Unpin": "고정 해제",
     "Vertical": "수직",
@@ -381,6 +596,7 @@
     "additionalInfo": "추가 정보",
     "apiPricing": "API 가격",
     "credits": "크레딧",
+    "creditsAvailable": "사용 가능한 크레딧",
     "details": "세부 정보",
     "eventType": "이벤트 유형",
     "faqs": "자주 묻는 질문",
@@ -389,15 +605,47 @@
     "messageSupport": "지원 문의",
     "model": "모델",
     "purchaseCredits": "크레딧 구매",
+    "refreshes": "{date}에 새로고침",
     "time": "시간",
     "topUp": {
+      "addMoreCredits": "크레딧 추가하기",
+      "addMoreCreditsToRun": "실행을 위해 크레딧 추가하기",
+      "amountToPayLabel": "결제할 금액(달러)",
+      "buy": "구매",
+      "buyCredits": "결제 계속하기",
       "buyNow": "지금 구매",
+      "contactUs": "문의하기",
+      "creditsDescription": "크레딧은 워크플로우 또는 파트너 노드 실행에 사용됩니다.",
+      "creditsPerDollar": "달러당 크레딧",
+      "creditsToReceiveLabel": "받을 크레딧",
+      "howManyCredits": "얼마나 많은 크레딧을 추가하시겠습니까?",
       "insufficientMessage": "이 워크플로를 실행하기에 크레딧이 부족합니다.",
       "insufficientTitle": "크레딧 부족",
+      "insufficientWorkflowMessage": "이 워크플로우를 실행할 크레딧이 부족합니다.",
+      "maxAllowed": "최대 {credits} 크레딧",
       "maxAmount": "(최대 $1,000 USD)",
+      "maximumAmount": "최대 ${amount}",
+      "minRequired": "최소 {credits} 크레딧",
+      "minimumPurchase": "최소 ${amount} ({credits} 크레딧)",
+      "needMore": "더 필요하신가요?",
+      "purchaseError": "구매 실패",
+      "purchaseErrorDetail": "크레딧 구매 실패: {error}",
+      "purchaseSuccess": "크레딧이 성공적으로 추가되었습니다!",
       "quickPurchase": "빠른 구매",
       "seeDetails": "자세히 보기",
-      "topUp": "충전하기"
+      "selectAmount": "금액 선택",
+      "templateNote": "*Wan Fun Control 템플릿으로 생성됨",
+      "topUp": "충전하기",
+      "unknownError": "알 수 없는 오류가 발생했습니다",
+      "usdAmount": "${amount}",
+      "videosEstimate": "~{count}개 비디오",
+      "viewPricing": "요금 세부정보 보기",
+      "youGet": "크레딧",
+      "youPay": "결제 금액 (USD)"
+    },
+    "unified": {
+      "message": "크레딧이 통합되었습니다",
+      "tooltip": "Comfy 전반에 결제가 통합되었습니다. 이제 모든 것이 Comfy 크레딧으로 실행됩니다:\n- 파트너 노드(이전 API 노드)\n- 클라우드 워크플로우\n\n기존 파트너 노드 잔액이 크레딧으로 전환되었습니다."
     },
     "yourCreditBalance": "보유 크레딧 잔액"
   },
@@ -408,13 +656,26 @@
     "AUDIO_ENCODER_OUTPUT": "AUDIO_ENCODER_OUTPUT",
     "AUDIO_RECORD": "AUDIO_RECORD",
     "BOOLEAN": "논리값",
+    "BOUNDING_BOX": "BOUNDING_BOX",
     "CAMERA_CONTROL": "카메라 제어",
     "CLIP": "CLIP",
     "CLIP_VISION": "CLIP_VISION",
     "CLIP_VISION_OUTPUT": "CLIP_VISION 출력",
+    "COLOR": "색상",
     "COMBO": "콤보",
+    "COMFY_AUTOGROW_V3": "COMFY_AUTOGROW_V3",
+    "COMFY_DYNAMICCOMBO_V3": "COMFY_DYNAMICCOMBO_V3",
+    "COMFY_MATCHTYPE_V3": "COMFY_MATCHTYPE_V3",
     "CONDITIONING": "조건",
     "CONTROL_NET": "컨트롤넷",
+    "ELEVENLABS_VOICE": "ELEVENLABS_VOICE",
+    "FILE_3D": "FILE_3D",
+    "FILE_3D_FBX": "FILE_3D_FBX",
+    "FILE_3D_GLB": "FILE_3D_GLB",
+    "FILE_3D_GLTF": "FILE_3D_GLTF",
+    "FILE_3D_OBJ": "FILE_3D_OBJ",
+    "FILE_3D_STL": "FILE_3D_STL",
+    "FILE_3D_USDZ": "FILE_3D_USDZ",
     "FLOAT": "실수",
     "FLOATS": "실수 배열",
     "GEMINI_INPUT_FILES": "GEMINI_INPUT_FILES",
@@ -423,9 +684,11 @@
     "HOOKS": "후크",
     "HOOK_KEYFRAMES": "후크 키프레임",
     "IMAGE": "이미지",
+    "IMAGECOMPARE": "이미지 비교",
     "INT": "정수",
     "LATENT": "잠재 데이터",
     "LATENT_OPERATION": "잠재 연산",
+    "LATENT_UPSCALE_MODEL": "LATENT_UPSCALE_MODEL",
     "LOAD3D_CAMERA": "3D 카메라 불러오기",
     "LOAD_3D": "3D 로드",
     "LORA_MODEL": "LORA_MODEL",
@@ -434,6 +697,8 @@
     "LUMA_REF": "Luma 참조",
     "MASK": "마스크",
     "MESH": "메시",
+    "MESHY_RIGGED_TASK_ID": "MESHY_RIGGED_TASK_ID",
+    "MESHY_TASK_ID": "MESHY_TASK_ID",
     "MODEL": "모델",
     "MODEL_PATCH": "모델 패치",
     "MODEL_TASK_ID": "모델 작업 ID",
@@ -442,6 +707,7 @@
     "OPENAI_INPUT_FILES": "OpenAI 입력 파일",
     "PHOTOMAKER": "PHOTOMAKER",
     "PIXVERSE_TEMPLATE": "Pixverse 템플릿",
+    "POSE_KEYPOINT": "POSE_KEYPOINT",
     "RECRAFT_COLOR": "Recraft 색상",
     "RECRAFT_CONTROLS": "Recraft 컨트롤",
     "RECRAFT_V3_STYLE": "Recraft V3 스타일",
@@ -453,6 +719,7 @@
     "STYLE_MODEL": "스타일 모델",
     "SVG": "SVG",
     "TIMESTEPS_RANGE": "타임스텝 범위",
+    "TRACKS": "TRACKS",
     "UPSCALE_MODEL": "업스케일 모델",
     "VAE": "VAE",
     "VIDEO": "비디오",
@@ -511,24 +778,84 @@
     "noStackTrace": "스택 추적을 사용할 수 없습니다",
     "promptExecutionError": "프롬프트 실행 실패"
   },
+  "errorOverlay": {
+    "errorCount": "{count}개 오류",
+    "seeErrors": "오류 보기"
+  },
+  "essentials": {
+    "batchImage": "이미지 일괄 처리",
+    "canny": "Canny",
+    "cannyToImage": "Canny → 이미지",
+    "cannyToVideo": "Canny → 비디오",
+    "cropImage": "이미지 자르기",
+    "depthToImage": "깊이 → 이미지",
+    "depthToVideo": "깊이 → 비디오",
+    "extractFrame": "프레임 추출",
+    "imageCompare": "이미지 비교",
+    "imageTo3DModel": "이미지 → 3D 모델",
+    "imageToImage": "이미지 → 이미지",
+    "imageToVideo": "이미지 → 비디오",
+    "inpaintImage": "이미지 인페인팅",
+    "invert": "반전",
+    "lipsync": "립싱크",
+    "load3DModel": "3D 모델 불러오기",
+    "loadAudio": "오디오 불러오기",
+    "loadImage": "이미지 불러오기",
+    "loadStyleLora": "스타일 불러오기 (LoRA)",
+    "loadVideo": "비디오 불러오기",
+    "musicGeneration": "음악 생성",
+    "outpaintImage": "이미지 아웃페인팅",
+    "poseToImage": "포즈 → 이미지",
+    "poseToVideo": "포즈 → 비디오",
+    "removeBackground": "배경 제거",
+    "resizeImage": "이미지 크기 조정",
+    "rotate": "회전",
+    "save3DModel": "3D 모델 저장",
+    "saveAudio": "오디오 저장",
+    "saveImage": "이미지 저장",
+    "saveVideo": "비디오 저장",
+    "text": "텍스트",
+    "textGenerationLLM": "텍스트 생성 (LLM)",
+    "textTo3DModel": "텍스트 → 3D 모델",
+    "textToImage": "텍스트 → 이미지",
+    "textToVideo": "텍스트 → 비디오"
+  },
+  "exportToast": {
+    "allExportsCompleted": "모든 내보내기 완료",
+    "downloadExport": "내보내기 다운로드",
+    "downloadFailed": "\"{name}\" 다운로드 실패",
+    "exportCompleted": "ZIP 다운로드 준비 완료",
+    "exportError": "내보내기 실패",
+    "exportFailed": "{count}개 내보내기 실패",
+    "exportFailedSingle": "ZIP 내보내기 생성 실패",
+    "exportStarted": "ZIP 다운로드 준비 중...",
+    "exportingAssets": "에셋 내보내는 중",
+    "noExportsInQueue": "대기 중인 {filter} 내보내기 없음",
+    "preparingExport": "내보내기 준비 중...",
+    "retryDownload": "다운로드 재시도"
+  },
   "g": {
     "1x": "1배속",
     "2x": "2배속",
     "about": "정보",
     "add": "추가",
+    "addNode": "노드 추가...",
     "addNodeFilterCondition": "노드 필터 조건 추가",
     "all": "모두",
     "amount": "수량",
     "apply": "적용",
     "architecture": "아키텍처",
+    "asset": "{count}개 에셋 | {count}개 에셋 | {count}개 에셋",
     "audioFailedToLoad": "오디오를 불러오지 못했습니다",
     "audioProgress": "오디오 진행률",
     "author": "작성자",
     "back": "뒤로",
+    "batchRename": "일괄 이름 변경",
     "beta": "베타",
     "bookmark": "라이브러리에 저장",
     "calculatingDimensions": "크기 계산 중",
     "cancel": "취소",
+    "cancelled": "취소됨",
     "capture": "캡처",
     "category": "카테고리",
     "chart": "차트",
@@ -538,6 +865,8 @@
     "clearAll": "모두 지우기",
     "clearFilters": "필터 지우기",
     "close": "닫기",
+    "closeDialog": "대화 상자 닫기",
+    "collapseAll": "모두 접기",
     "color": "색상",
     "comfy": "Comfy",
     "comfyOrgLogoAlt": "ComfyOrg 로고",
@@ -546,6 +875,7 @@
     "commandProhibited": "{command}는 금지된 명령입니다. 자세한 정보는 관리자에게 문의하십시오.",
     "community": "커뮤니티",
     "completed": "완료됨",
+    "completedWithCheckmark": "완료됨 ✓",
     "confirm": "확인",
     "confirmed": "확인됨",
     "content": "콘텐츠",
@@ -554,48 +884,73 @@
     "control_before_generate": "생성 전 제어",
     "copied": "복사됨",
     "copy": "복사",
+    "copyAll": "모두 복사",
     "copyJobId": "작업 ID 복사",
     "copyToClipboard": "클립보드에 복사",
     "copyURL": "URL 복사",
+    "core": "코어",
     "currentUser": "현재 사용자",
+    "custom": "커스텀",
     "customBackground": "맞춤 배경",
     "customize": "사용자 정의",
     "customizeFolder": "폴더 사용자 정의",
+    "decrement": "감소",
     "defaultBanner": "기준 배너",
     "delete": "삭제",
     "deleteAudioFile": "오디오 파일 삭제",
     "deleteImage": "이미지 삭제",
     "deprecated": "사용 중단",
     "description": "설명",
+    "devOnly": "개발 전용",
     "devices": "장치",
     "disableAll": "모두 비활성화",
+    "disableSelected": "선택 항목 비활성화",
+    "disableThirdParty": "서드파티 비활성화",
     "disabling": "비활성화 중",
+    "disconnectedFromBackend": "백엔드와의 연결이 끊어졌습니다. 서버가 실행 중인지 확인하세요.",
     "dismiss": "닫기",
     "download": "다운로드",
+    "downloadAudio": "오디오 다운로드",
     "downloadImage": "이미지 다운로드",
     "downloadVideo": "비디오 다운로드",
+    "downloadWithSize": "다운로드 ({size})",
+    "downloading": "다운로드 중",
     "dropYourFileOr": "파일을 드롭하거나",
     "duplicate": "복제",
     "edit": "편집",
     "editImage": "이미지 편집",
     "editOrMaskImage": "이미지 편집 또는 마스크",
+    "emDash": "—",
     "empty": "비어 있음",
     "enableAll": "모두 활성화",
     "enableOrDisablePack": "팩 활성화 또는 비활성화",
+    "enableSelected": "선택 항목 활성화",
     "enabled": "활성화됨",
     "enabling": "활성화 중",
+    "enter": "입력",
+    "enterBaseName": "기본 이름 입력",
+    "enterNewName": "새 이름 입력",
+    "enterNewNamePrompt": "새 이름을 입력하세요:",
+    "enterSubgraph": "서브그래프 진입",
     "error": "오류",
     "errorLoadingImage": "이미지 로드 오류",
     "errorLoadingVideo": "비디오 로드 오류",
+    "essentials": "필수",
+    "expandAll": "모두 펼치기",
     "experimental": "베타",
     "export": "내보내기",
     "extensionName": "확장 이름",
+    "extensions": "확장 프로그램",
+    "failed": "실패",
     "failedToCopyJobId": "작업 ID 복사 실패",
     "failedToDownloadImage": "이미지 다운로드 실패",
     "failedToDownloadVideo": "비디오 다운로드 실패",
+    "favorites": "즐겨찾기",
     "feedback": "피드백",
     "file": "파일",
     "filter": "필터",
+    "filterBy": "필터 기준:",
+    "filterByType": "{type}별로 필터링...",
     "findIssues": "문제 찾기",
     "frameNodes": "노드 프레임",
     "frontendNewer": "프론트엔드 버전 {frontendVersion}이(가) 백엔드 버전 {backendVersion}과(와) 호환되지 않을 수 있습니다.",
@@ -605,23 +960,32 @@
     "goToNode": "노드로 이동",
     "graphNavigation": "그래프 탐색",
     "halfSpeed": "0.5배속",
+    "hideLeftPanel": "왼쪽 패널 숨기기",
+    "hideRightPanel": "오른쪽 패널 숨기기",
     "icon": "아이콘",
+    "imageDoesNotExist": "이미지가 존재하지 않습니다",
     "imageFailedToLoad": "이미지를 로드하지 못했습니다.",
     "imagePreview": "이미지 미리보기 - 화살표 키를 사용하여 이미지 간 이동",
     "imageUrl": "이미지 URL",
     "import": "가져오기",
     "inProgress": "진행 중",
+    "inSubgraph": "서브그래프 '{name}'에 있음",
+    "increment": "증가",
     "info": "노드 정보",
+    "input": "입력",
     "insert": "삽입",
     "install": "설치",
     "installed": "설치됨",
     "installing": "설치 중",
     "interrupted": "중단됨",
     "itemSelected": "{selectedCount}개 선택됨",
+    "itemsCopiedToClipboard": "항목이 클립보드에 복사되었습니다",
     "itemsSelected": "{selectedCount}개 선택됨",
+    "job": "작업",
     "jobIdCopied": "작업 ID가 클립보드에 복사됨",
     "keybinding": "키 바인딩",
     "keybindingAlreadyExists": "단축키가 이미 존재합니다",
+    "keybindings": "단축키",
     "learnMore": "더 알아보기",
     "listening": "듣는 중...",
     "liveSamplingPreview": "라이브 샘플링 미리보기",
@@ -632,18 +996,24 @@
     "login": "로그인",
     "logoAlt": "ComfyUI 로고",
     "logs": "로그",
+    "manageExtensions": "확장 프로그램 관리",
     "markdown": "마크다운",
     "micPermissionDenied": "마이크 권한이 거부되었습니다",
     "migrate": "이전(migrate)",
     "missing": "누락됨",
+    "more": "더보기",
     "moreOptions": "추가 옵션",
     "moreWorkflows": "더 많은 워크플로",
+    "mostRelevant": "가장 관련성 높은",
     "multiSelectDropdown": "다중 선택 드롭다운",
     "name": "이름",
     "newFolder": "새 폴더",
     "next": "다음",
+    "nightly": "NIGHTLY",
     "no": "아니오",
     "noAudioRecorded": "녹음된 오디오가 없습니다",
+    "noItems": "항목 없음",
+    "noResults": "결과 없음",
     "noResultsFound": "결과를 찾을 수 없습니다.",
     "noTasksFound": "작업을 찾을 수 없습니다.",
     "noTasksFoundMessage": "대기열에 작업이 없습니다.",
@@ -654,26 +1024,49 @@
     "nodeSlotsError": "노드 슬롯 오류",
     "nodeWidgetsError": "노드 위젯 오류",
     "nodes": "노드",
+    "nodesCount": "{count}개 노드 | {count}개 노드 | {count}개 노드",
     "nodesRunning": "노드 실행 중",
     "none": "없음",
+    "nothingToCopy": "복사할 항목 없음",
+    "nothingToDelete": "삭제할 항목 없음",
+    "nothingToDuplicate": "복제할 항목 없음",
+    "nothingToRename": "이름을 변경할 항목 없음",
     "ok": "확인",
     "openManager": "관리자 열기",
     "openNewIssue": "새 문제 열기",
+    "or": "또는",
+    "output": "출력",
     "overwrite": "덮어쓰기",
+    "partner": "파트너",
+    "playPause": "재생/일시정지",
     "playRecording": "녹음 재생",
     "playbackSpeed": "재생 속도",
     "playing": "재생 중",
     "pressKeysForNewBinding": "새 바인딩을 위한 키 입력",
     "preview": "미리보기",
+    "profile": "프로필",
     "progressCountOf": "중",
+    "queued": "대기 중",
     "ready": "준비됨",
+    "recents": "최근 항목",
     "reconnected": "재연결됨",
     "reconnecting": "재연결 중",
     "refresh": "새로 고침",
     "refreshNode": "노드 새로고침",
+    "relativeTime": {
+      "daysAgo": "{count}일 전",
+      "hoursAgo": "{count}시간 전",
+      "minutesAgo": "{count}분 전",
+      "monthsAgo": "{count}개월 전",
+      "now": "지금",
+      "weeksAgo": "{count}주 전",
+      "yearsAgo": "{count}년 전"
+    },
     "releaseTitle": "{package} {version} 릴리스",
     "reloadToApplyChanges": "변경 사항을 적용하려면 새로 고침하세요.",
+    "remove": "제거",
     "removeImage": "이미지 제거",
+    "removeTag": "태그 제거",
     "removeVideo": "비디오 제거",
     "rename": "이름 바꾸기",
     "reportIssue": "보고서 보내기",
@@ -688,21 +1081,32 @@
     "resizeFromTopRight": "오른쪽 위 모서리에서 크기 조정",
     "restart": "재시작",
     "resultsCount": "{count} 개의 결과를 찾았습니다",
+    "running": "실행 중",
     "save": "저장",
     "saving": "저장 중",
+    "scrollLeft": "왼쪽으로 스크롤",
+    "scrollRight": "오른쪽으로 스크롤",
     "search": "검색",
     "searchExtensions": "확장 검색",
     "searchFailedMessage": "검색어와 일치하는 설정을 찾을 수 없습니다. 검색어를 조정해 보세요.",
     "searchKeybindings": "키 바인딩 검색",
     "searchModels": "모델 검색",
     "searchNodes": "노드 검색",
+    "searchPlaceholder": "검색...",
     "searchSettings": "설정 검색",
     "searchWorkflows": "워크플로 검색",
     "seeTutorial": "튜토리얼 보기",
+    "selectItemsToCopy": "복사할 항목 선택",
+    "selectItemsToDelete": "삭제할 항목 선택",
+    "selectItemsToDuplicate": "복제할 항목 선택",
+    "selectItemsToRename": "이름을 변경할 항목 선택",
     "selectedFile": "선택된 파일",
     "setAsBackground": "배경으로 설정",
     "settings": "설정",
+    "shortcutSuffix": " ({shortcut})",
+    "showLeftPanel": "왼쪽 패널 표시",
     "showReport": "보고서 보기",
+    "showRightPanel": "오른쪽 패널 표시",
     "singleSelectDropdown": "단일 선택 드롭다운",
     "sort": "정렬",
     "source": "소스",
@@ -710,19 +1114,24 @@
     "status": "상태",
     "stopPlayback": "재생 중지",
     "stopRecording": "녹음 중지",
+    "submit": "제출",
     "success": "성공",
     "systemInfo": "시스템 정보",
     "terminal": "터미널",
     "title": "제목",
     "triggerPhrase": "트리거 문구",
     "unknownError": "알 수 없는 오류",
+    "unknownFile": "알 수 없는 파일",
+    "untitled": "제목 없음",
     "update": "업데이트",
     "updateAvailable": "업데이트 가능",
     "updateFrontend": "프론트엔드 업데이트",
     "updated": "업데이트 됨",
     "updating": "업데이트 중",
     "upload": "업로드",
+    "uploadAlreadyInProgress": "업로드가 이미 진행 중입니다",
     "usageHint": "사용 힌트",
+    "use": "사용",
     "user": "사용자",
     "versionMismatchWarning": "버전 호환성 경고",
     "versionMismatchWarningMessage": "{warning}: {detail} 업데이트 지침은 https://docs.comfy.org/installation/update_comfyui#common-update-issues 를 방문하세요.",
@@ -730,11 +1139,10 @@
     "videoPreview": "비디오 미리보기 - 화살표 키를 사용하여 비디오 간 이동",
     "viewImageOfTotal": "이미지 {index}/{total} 보기",
     "viewVideoOfTotal": "비디오 {index}/{total} 보기",
-    "vitePreloadErrorMessage": "앱의 새 버전이 출시되었습니다. 새로고침하시겠습니까?\n그렇지 않으면 앱의 일부 기능이 예상대로 작동하지 않을 수 있습니다.\n새로고침하기 전에 진행 상황을 저장하고 거부하는 것도 가능합니다.",
-    "vitePreloadErrorTitle": "새 버전 사용 가능",
     "volume": "볼륨",
     "warning": "경고",
-    "workflow": "워크플로"
+    "workflow": "워크플로",
+    "you": "당신"
   },
   "graphCanvasMenu": {
     "fitView": "보기 맞춤",
@@ -756,11 +1164,17 @@
     "create": "그룹 노드 만들기",
     "enterName": "이름 입력"
   },
+  "help": {
+    "helpCenterMenu": "도움말 센터 메뉴",
+    "recentReleases": "최근 릴리스"
+  },
   "helpCenter": {
     "clickToLearnMore": "자세히 알아보기 →",
     "desktopUserGuide": "데스크톱 사용자 가이드",
     "docs": "문서",
+    "feedback": "피드백 보내기",
     "github": "Github",
+    "help": "도움말 및 지원",
     "loadingReleases": "릴리즈 불러오는 중...",
     "managerExtension": "관리자 확장",
     "more": "더보기...",
@@ -769,6 +1183,12 @@
     "recentReleases": "최신 릴리스",
     "reinstall": "재설치",
     "updateAvailable": "업데이트",
+    "updateComfyUI": "ComfyUI 업데이트",
+    "updateComfyUIFailed": "ComfyUI 업데이트에 실패했습니다. 다시 시도해 주세요.",
+    "updateComfyUIStarted": "업데이트 시작됨",
+    "updateComfyUIStartedDetail": "ComfyUI 업데이트가 대기열에 추가되었습니다. 잠시만 기다려 주세요...",
+    "updateComfyUISuccess": "업데이트 완료",
+    "updateComfyUISuccessDetail": "ComfyUI가 업데이트되었습니다. 재시작 중...",
     "whatsNew": "새로운 소식?"
   },
   "icon": {
@@ -782,6 +1202,24 @@
     "inbox": "받은 편지함",
     "star": "별"
   },
+  "imageCompare": {
+    "batchLabelA": "A:",
+    "batchLabelB": "B:",
+    "noImages": "비교할 이미지가 없습니다"
+  },
+  "imageCrop": {
+    "cropPreviewAlt": "자르기 미리보기",
+    "custom": "사용자 지정",
+    "loading": "로딩 중...",
+    "lockRatio": "비율 고정",
+    "noInputImage": "입력 이미지가 연결되지 않았습니다",
+    "ratio": "비율",
+    "unlockRatio": "비율 해제"
+  },
+  "importFailed": {
+    "copyError": "복사 오류",
+    "title": "가져오기 실패"
+  },
   "install": {
     "appDataLocationTooltip": "ComfyUI의 앱 데이터 디렉토리. 저장소:\n- 로그\n- 서버 구성",
     "appPathLocationTooltip": "ComfyUI의 앱 에셋 디렉토리. ComfyUI 코드 및 에셋을 저장합니다.",
@@ -795,6 +1233,8 @@
     "failedToSelectDirectory": "디렉토리 선택 실패",
     "gpu": "GPU",
     "gpuPicker": {
+      "amdDescription": "최상의 성능을 위해 AMD GPU를 ROCm™ 가속과 함께 사용하세요.",
+      "amdSubtitle": "AMD ROCm™",
       "appleMetalDescription": "Mac의 GPU를 활용하여 더 빠른 속도와 더 나은 전반적인 경험을 제공합니다",
       "cpuDescription": "GPU 가속을 사용할 수 없을 때 호환성을 위해 CPU 모드를 사용하세요",
       "cpuSubtitle": "CPU 모드",
@@ -821,6 +1261,8 @@
       "selectGpuDescription": "소유한 GPU 유형을 선택하세요"
     },
     "helpImprove": "ComfyUI 개선에 도움을 주세요",
+    "insideAppInstallDir": "이 폴더는 ComfyUI Desktop 애플리케이션 번들 내부에 있으며, 업데이트 시 삭제됩니다. Documents/ComfyUI와 같은 설치 폴더 외부의 디렉터리를 선택하세요.",
+    "insideUpdaterCache": "이 폴더는 ComfyUI 업데이트 캐시 내부에 있으며, 매번 업데이트 시 삭제됩니다. 데이터 저장을 위해 다른 위치를 선택하세요.",
     "installLocation": "설치 위치",
     "installLocationDescription": "ComfyUI의 사용자 데이터 디렉토리를 선택하십시오. 선택한 위치에 Python 환경이 설치됩니다. 선택한 디스크에 충분한 공간(~15GB)이 남아 있는지 확인하십시오.",
     "installLocationTooltip": "ComfyUI의 사용자 데이터 디렉토리. 저장소:\n- Python 환경\n- 모델\n- 커스텀 노드\n",
@@ -895,6 +1337,66 @@
   "issueReport": {
     "helpFix": "이 문제 해결에 도움을 주세요"
   },
+  "linearMode": {
+    "appModeToolbar": {
+      "appBuilder": "앱 빌더",
+      "apps": "앱",
+      "appsEmptyMessage": "저장된 앱이 여기에 표시됩니다.\n아래를 클릭하여 첫 번째 앱을 만들어보세요.",
+      "enterAppMode": "앱 모드로 들어가기"
+    },
+    "arrange": {
+      "atLeastOne": "최소 한 개",
+      "connectAtLeastOne": "사용자가 실행 후 결과를 볼 수 있도록 {atLeastOne}개의 출력 노드를 연결하세요.",
+      "noOutputs": "아직 출력이 추가되지 않았습니다",
+      "outputExamples": "예시: '이미지 저장' 또는 '비디오 저장'",
+      "outputs": "출력",
+      "resultsLabel": "선택한 출력 노드에서 생성된 결과가 이곳에 표시됩니다.",
+      "switchToOutputs": "'출력' 단계로 전환한 후 출력 노드를 클릭하여 여기에 추가하세요.",
+      "switchToOutputsButton": "출력으로 전환"
+    },
+    "backToWorkflow": "워크플로우로 돌아가기",
+    "beta": "앱 모드 베타 - 피드백 보내기",
+    "builder": {
+      "exit": "빌더 종료",
+      "exitConfirmMessage": "저장되지 않은 변경사항이 사라집니다\n저장하지 않고 종료하시겠습니까?",
+      "exitConfirmTitle": "앱 빌더를 종료할까요?",
+      "inputsDesc": "사용자가 이 항목을 조정하여 결과를 생성할 수 있습니다.",
+      "inputsExample": "예시: “이미지 불러오기”, “텍스트 프롬프트”, “스텝 수”",
+      "noInputs": "아직 입력값이 추가되지 않았습니다",
+      "noOutputs": "아직 출력 노드가 추가되지 않았습니다",
+      "outputsDesc": "최소 한 개 이상의 출력 노드를 연결해야 실행 후 결과를 볼 수 있습니다.",
+      "outputsExample": "예시: “이미지 저장” 또는 “비디오 저장”",
+      "promptAddInputs": "노드 파라미터를 클릭하여 입력값으로 추가하세요",
+      "promptAddOutputs": "출력 노드를 클릭하여 여기에 추가하세요. 이들이 생성된 결과가 됩니다.",
+      "title": "앱 빌더 모드",
+      "unknownWidget": "위젯이 표시되지 않습니다"
+    },
+    "downloadAll": "모두 다운로드",
+    "dragAndDropImage": "이미지를 드래그 앤 드롭하세요",
+    "emptyWorkflowExplanation": "워크플로우가 비어 있습니다. 앱을 만들려면 먼저 노드를 추가해야 합니다.",
+    "enterNodeGraph": "노드 그래프로 진입",
+    "giveFeedback": "피드백 보내기",
+    "graphMode": "그래프 모드",
+    "linearMode": "앱 모드",
+    "loadTemplate": "템플릿 불러오기",
+    "mobileControls": "편집 및 실행",
+    "queue": {
+      "clear": "대기열 비우기",
+      "clickToClear": "클릭하여 대기열 비우기"
+    },
+    "rerun": "다시 실행",
+    "reuseParameters": "파라미터 재사용",
+    "runCount": "실행 횟수:",
+    "viewJob": "작업 보기",
+    "welcome": {
+      "buildApp": "앱 만들기",
+      "controls": "출력은 하단에, 컨트롤은 오른쪽에 표시됩니다. 나머지는 모두 숨겨집니다.",
+      "getStarted": "{runButton}을(를) 클릭하여 시작하세요.",
+      "message": "노드 그래프를 숨겨 창작에 집중할 수 있는 간소화된 보기입니다.",
+      "sharing": "공유는 간단합니다: 워크플로우를 만들고, 앱 모드를 열고, 탭을 우클릭한 후 내보내기를 선택하세요. 다른 사람이 파일을 열면 이 깔끔한 뷰로 바로 시작됩니다. 복잡한 노드 그래프를 몰라도 강력한 워크플로우를 간단한 도구로 공유할 수 있습니다.",
+      "title": "앱 모드에 오신 것을 환영합니다"
+    }
+  },
   "load3d": {
     "applyingTexture": "텍스처 적용 중...",
     "backgroundColor": "배경색",
@@ -921,20 +1423,24 @@
       "lineart": "라인아트",
       "normal": "노멀(normal)",
       "original": "원본",
+      "pointCloud": "포인트 클라우드",
       "wireframe": "와이어프레임"
     },
     "model": "모델",
     "openIn3DViewer": "3D 뷰어에서 열기",
+    "panoramaMode": "파노라마",
     "previewOutput": "출력 미리보기",
     "reloadingModel": "모델 다시 로드 중...",
     "removeBackgroundImage": "배경 이미지 제거",
     "resizeNodeMatchOutput": "노드 크기를 출력에 맞추기",
     "scene": "장면",
     "showGrid": "그리드 표시",
+    "showSkeleton": "스켈레톤 표시",
     "startRecording": "녹화 시작",
     "stopRecording": "녹화 중지",
     "switchCamera": "카메라 전환",
     "switchingMaterialMode": "재질 모드 전환 중...",
+    "tiledMode": "타일드",
     "unsupportedFileType": "지원되지 않는 파일 형식 (.gltf, .glb, .obj, .fbx, .stl 지원)",
     "upDirection": "위 방향",
     "upDirections": {
@@ -955,6 +1461,11 @@
       "title": "3D 뷰어 (베타)"
     }
   },
+  "loadWorkflowWarning": {
+    "coreNodesFromVersion": "버전 {version}의 코어 노드:",
+    "outdatedVersion": "이 워크플로우는 더 최신 버전의 ComfyUI({version})에서 생성되었습니다. 일부 노드는 제대로 작동하지 않을 수 있습니다.",
+    "outdatedVersionGeneric": "이 워크플로우는 더 최신 버전의 ComfyUI에서 생성되었습니다. 일부 노드는 제대로 작동하지 않을 수 있습니다."
+  },
   "maintenance": {
     "None": "없음",
     "OK": "확인",
@@ -973,11 +1484,21 @@
     "showManual": "유지 보수 작업 보기",
     "status": "상태",
     "terminalDefaultMessage": "문제 해결 명령을 실행하면 출력이 여기에 표시됩니다.",
-    "title": "유지 보수"
+    "title": "유지 보수",
+    "unsafeMigration": {
+      "action": "아래의 \"기본 경로\" 유지 관리 작업을 사용하여 ComfyUI를 안전한 위치로 이동하세요.",
+      "appInstallDir": "기본 경로가 ComfyUI 데스크톱 애플리케이션 번들 내부에 있습니다. 이 폴더는 업데이트 시 삭제되거나 덮어쓸 수 있습니다. Documents/ComfyUI와 같은 설치 폴더 외부의 디렉터리를 선택하세요.",
+      "generic": "현재 ComfyUI 기본 경로가 업데이트 중 삭제되거나 수정될 수 있는 위치에 있습니다. 데이터 손실을 방지하려면 안전한 폴더로 이동하세요.",
+      "oneDrive": "기본 경로가 OneDrive에 있습니다. 이는 동기화 문제 및 우발적인 데이터 손실을 일으킬 수 있습니다. OneDrive에서 관리되지 않는 로컬 폴더를 선택하세요.",
+      "title": "안전하지 않은 설치 위치 감지됨",
+      "updaterCache": "기본 경로가 ComfyUI 업데이트 캐시 내부에 있습니다. 이 폴더는 매번 업데이트 시 삭제됩니다. 데이터를 위한 다른 위치를 선택하세요."
+    }
   },
   "manager": {
+    "actions": "작업",
     "allMissingNodesInstalled": "누락된 모든 노드가 성공적으로 설치되었습니다",
     "applyChanges": "변경사항 적용",
+    "basicInfo": "기본 정보",
     "changingVersion": "{from}에서 {to}(으)로 버전 변경 중",
     "clickToFinishSetup": "클릭",
     "conflicts": {
@@ -1013,6 +1534,28 @@
     "disabledNodesWontUpdate": "비활성화된 노드는 업데이트되지 않습니다",
     "discoverCommunityContent": "커뮤니티에서 만든 노드 팩 및 확장 프로그램을 찾아보세요...",
     "downloads": "다운로드",
+    "emptyState": {
+      "allInstalled": {
+        "message": "아직 설치한 확장 프로그램이 없습니다.",
+        "title": "설치된 확장 프로그램 없음"
+      },
+      "conflicting": {
+        "message": "모든 확장 프로그램이 호환됩니다.",
+        "title": "충돌 없음"
+      },
+      "missing": {
+        "message": "필요한 모든 노드가 설치되어 있습니다.",
+        "title": "누락된 노드 없음"
+      },
+      "updateAvailable": {
+        "message": "모든 확장 프로그램이 최신 버전입니다.",
+        "title": "모두 최신 상태"
+      },
+      "workflow": {
+        "message": "이 워크플로는 확장 노드를 사용하지 않습니다.",
+        "title": "워크플로에 확장 프로그램 없음"
+      }
+    },
     "enablePackToChangeVersion": "버전을 변경하려면 이 팩을 활성화하세요",
     "errorConnecting": "Comfy Node Registry에 연결하는 중 오류가 발생했습니다.",
     "extensionsSuccessfullyInstalled": "확장이 성공적으로 설치되어 사용할 준비가 되었습니다!",
@@ -1034,25 +1577,42 @@
     "installingDependencies": "종속성 설치 중...",
     "lastUpdated": "마지막 업데이트",
     "latestVersion": "최신",
+    "legacyManagerSearchTip": "ComfyUI-Manager를 찾고 계신가요? ComfyUI를 --enable-manager-legacy-ui 플래그와 함께 시작하면 레거시 매니저 UI를 활성화할 수 있습니다.",
     "legacyManagerUI": "구버전 매니저 UI 사용",
     "legacyManagerUIDescription": "구버전 매니저 UI를 사용하려면, ComfyUI를 --enable-manager-legacy-ui로 시작하세요",
     "legacyMenuNotAvailable": "이 버전의 ComfyUI에서는 구버전 매니저 메뉴를 사용할 수 없습니다. 대신 새로운 매니저 메뉴를 사용하십시오.",
     "license": "라이선스",
     "loadingVersions": "버전 로딩 중...",
     "mixedSelectionMessage": "혼합 선택에 대해 일괄 작업을 수행할 수 없습니다",
+    "nav": {
+      "allExtensions": "모든 확장 프로그램",
+      "allInWorkflow": "모두: {workflowName}",
+      "allInstalled": "모두 설치됨",
+      "conflicting": "충돌",
+      "inWorkflowSection": "워크플로우 내",
+      "installedSection": "설치됨",
+      "missingNodes": "누락된 노드",
+      "notInstalled": "미설치",
+      "updatesAvailable": "업데이트 가능"
+    },
     "nightlyVersion": "최신 테스트 버전(nightly)",
     "noDescription": "설명이 없습니다",
     "noNodesFound": "노드를 찾을 수 없습니다",
     "noNodesFoundDescription": "팩의 노드를 파싱할 수 없거나, 팩이 프론트엔드 확장만을 가지고 있어서 노드가 없습니다.",
     "noResultsFound": "검색과 일치하는 결과가 없습니다.",
     "nodePack": "노드 팩",
+    "nodePackInfo": "노드 팩 정보",
     "notAvailable": "사용 불가",
+    "packInstall": {
+      "nodeIdRequired": "설치를 위해 노드 ID가 필요합니다"
+    },
     "packsSelected": "선택한 노드 팩",
     "repository": "저장소",
     "restartToApplyChanges": "변경 사항을 적용하려면 ComfyUI를 재시작해 주세요",
     "restartingBackend": "변경사항을 적용하기 위해 백엔드를 다시 시작하는 중...",
     "searchPlaceholder": "검색",
     "selectVersion": "버전 선택",
+    "selected": "선택됨",
     "sort": {
       "created": "최신",
       "downloads": "가장 인기 있는",
@@ -1074,6 +1634,8 @@
     "totalNodes": "총 노드",
     "tryAgainLater": "나중에 다시 시도해 주세요.",
     "tryDifferentSearch": "다른 검색어를 시도해 주세요.",
+    "tryUpdate": "업데이트 시도",
+    "tryUpdateTooltip": "저장소에서 최신 변경 사항을 가져옵니다. 나이틀리 버전은 자동으로 감지할 수 없는 업데이트가 있을 수 있습니다.",
     "uninstall": "제거",
     "uninstallSelected": "선택 항목 제거",
     "uninstalling": "제거 중",
@@ -1084,31 +1646,111 @@
     "version": "버전"
   },
   "maskEditor": {
+    "activateLayer": "레이어 활성화",
+    "applyToWholeImage": "전체 이미지에 적용",
+    "baseImageLayer": "기본 이미지 레이어",
+    "baseLayerPreview": "기본 레이어 미리보기",
+    "black": "검정",
+    "brushSettings": "브러시 설정",
+    "brushShape": "브러시 모양",
+    "clear": "지우기",
+    "clickToResetZoom": "클릭하여 확대/축소 초기화",
+    "colorSelectSettings": "색상 선택 설정",
+    "colorSelector": "색상 선택기",
+    "fillOpacity": "채우기 불투명도",
+    "hardness": "경도",
+    "imageLayer": "이미지 레이어",
+    "invert": "반전",
+    "layers": "레이어",
+    "livePreview": "실시간 미리보기",
+    "maskBlendingOptions": "마스크 혼합 옵션",
+    "maskLayer": "마스크 레이어",
+    "maskOpacity": "마스크 불투명도",
+    "maskTolerance": "마스크 허용치",
+    "method": "방법",
+    "mirrorHorizontal": "수평 반전",
+    "mirrorVertical": "수직 반전",
+    "negative": "네거티브",
+    "opacity": "불투명도",
+    "paintBucketSettings": "페인트 버킷 설정",
+    "paintLayer": "페인트 레이어",
+    "redo": "다시 실행",
+    "resetToDefault": "기본값으로 재설정",
+    "rotateLeft": "왼쪽으로 회전",
+    "rotateRight": "오른쪽으로 회전",
+    "selectionOpacity": "선택 영역 불투명도",
+    "smoothingPrecision": "부드럽기 정밀도",
+    "stepSize": "단계 크기",
+    "stopAtMask": "마스크에서 중지",
+    "thickness": "두께",
+    "title": "마스크 편집기",
+    "tolerance": "허용치",
+    "undo": "실행 취소",
+    "white": "흰색"
   },
   "mediaAsset": {
+    "actions": {
+      "copyJobId": "작업 ID 복사",
+      "delete": "삭제",
+      "download": "다운로드",
+      "exportWorkflow": "워크플로우 내보내기",
+      "insertAsNodeInWorkflow": "워크플로우에 노드로 삽입",
+      "inspect": "에셋 검사",
+      "more": "더 많은 옵션",
+      "moreOptions": "더 많은 옵션",
+      "openWorkflow": "새 탭에서 워크플로우로 열기",
+      "seeMoreOutputs": "더 많은 출력 보기",
+      "zoom": "확대"
+    },
     "assetDeletedSuccessfully": "에셋이 성공적으로 삭제되었습니다",
     "deleteAssetDescription": "이 에셋은 영구적으로 제거됩니다.",
     "deleteAssetTitle": "이 에셋을 삭제하시겠습니까?",
     "deleteSelectedDescription": "{count}개의 에셋이 영구적으로 제거됩니다.",
     "deleteSelectedTitle": "선택한 에셋을 삭제하시겠습니까?",
     "deletingImportedFilesCloudOnly": "가져온 파일 삭제는 클라우드 버전에서만 지원됩니다",
+    "failedToCreateNode": "노드 생성에 실패했습니다",
     "failedToDeleteAsset": "에셋 삭제 실패",
+    "failedToExportWorkflow": "워크플로우 내보내기에 실패했습니다",
     "jobIdToast": {
       "copied": "복사됨",
       "error": "오류",
       "jobIdCopied": "작업 ID가 클립보드에 복사되었습니다",
       "jobIdCopyFailed": "작업 ID 복사 실패"
     },
+    "noJobIdFound": "이 에셋에 대한 작업 ID를 찾을 수 없습니다",
+    "noWorkflowDataFound": "이 에셋에서 워크플로우 데이터를 찾을 수 없습니다",
+    "nodeAddedToWorkflow": "{nodeType} 노드가 워크플로우에 추가되었습니다",
+    "nodeTypeNotFound": "{nodeType} 노드 유형을 찾을 수 없습니다",
     "selection": {
       "assetsDeletedSuccessfully": "{count}개 에셋이 성공적으로 삭제되었습니다",
       "deleteSelected": "삭제",
+      "deleteSelectedAll": "전체 삭제",
       "deselectAll": "모두 선택 해제",
       "downloadSelected": "다운로드",
+      "downloadSelectedAll": "전체 다운로드",
       "downloadStarted": "{count}개 파일 다운로드 중...",
       "downloadsStarted": "{count}개 파일 다운로드 시작됨",
+      "exportStarted": "{count}개 파일의 ZIP 내보내기 준비 중",
+      "exportWorkflowAll": "모든 워크플로우 내보내기",
+      "failedToAddNodes": "노드를 워크플로우에 추가하지 못했습니다",
       "failedToDeleteAssets": "선택한 에셋 삭제 실패",
-      "selectedCount": "선택된 에셋: {count}개"
-    }
+      "insertAllAssetsAsNodes": "모든 에셋을 노드로 삽입",
+      "multipleSelectedAssets": "여러 자산이 선택됨",
+      "noWorkflowsFound": "선택한 에셋에서 워크플로우 데이터를 찾을 수 없습니다",
+      "noWorkflowsToExport": "내보낼 워크플로우 데이터를 찾을 수 없습니다",
+      "nodesAddedToWorkflow": "{count}개의 노드가 워크플로우에 추가됨",
+      "openWorkflowAll": "모든 워크플로우 열기",
+      "partialAddNodesSuccess": "{succeeded}개 성공, {failed}개 실패",
+      "partialDeleteSuccess": "{succeeded}개가 성공적으로 삭제되었고, {failed}개가 실패했습니다",
+      "partialWorkflowsExported": "{succeeded}개 성공적으로 내보내짐, {failed}개 실패",
+      "partialWorkflowsOpened": "{succeeded}개 워크플로우 열림, {failed}개 실패",
+      "selectedCount": "선택된 에셋: {count}개",
+      "workflowsExported": "{count}개의 워크플로우가 성공적으로 내보내졌습니다",
+      "workflowsOpened": "{count}개의 워크플로우가 새 탭에서 열렸습니다"
+    },
+    "unsupportedFileType": "로더 노드에서 지원하지 않는 파일 형식입니다",
+    "workflowExportedSuccessfully": "워크플로우가 성공적으로 내보내졌습니다",
+    "workflowOpenedInNewTab": "워크플로우가 새 탭에서 열렸습니다"
   },
   "menu": {
     "autoQueue": "자동 실행 대기열",
@@ -1116,11 +1758,14 @@
     "batchCountTooltip": "워크플로 작업을 실행 대기열에 반복 추가할 횟수",
     "clear": "워크플로 비우기",
     "clipspace": "클립스페이스 열기",
+    "customNodesManager": "커스텀 노드 관리자",
     "dark": "다크",
     "disabled": "비활성화됨",
     "disabledTooltip": "워크플로 작업을 자동으로 실행 대기열에 추가하지 않습니다.",
     "execute": "실행",
+    "fullscreen": "전체 화면",
     "help": "도움말",
+    "helpAndFeedback": "도움말 및 피드백",
     "hideMenu": "메뉴 숨기기",
     "instant": "즉시",
     "instantTooltip": "워크플로 실행이 완료되면 즉시 실행 대기열에 추가합니다.",
@@ -1134,9 +1779,12 @@
     "resetView": "캔버스 보기 재설정",
     "run": "실행",
     "runWorkflow": "워크플로 실행 (시프트 키와 함께 클릭시 가장 먼저 실행)",
+    "runWorkflowDisabled": "워크플로우에 지원되지 않는 노드(빨간색 강조 표시)가 포함되어 있습니다. 실행하려면 제거하세요.",
     "runWorkflowFront": "워크플로 실행 (가장 먼저 실행)",
     "settings": "설정",
     "showMenu": "메뉴 표시",
+    "stopRunInstant": "즉시 실행 중지",
+    "stopRunInstantTooltip": "실행 중지",
     "theme": "테마",
     "toggleBottomPanel": "하단 패널 전환"
   },
@@ -1149,6 +1797,7 @@
     "Canvas Performance": "캔버스 성능",
     "Canvas Toggle Lock": "캔버스 토글 잠금",
     "Check for Custom Node Updates": "커스텀 노드 업데이트 확인",
+    "Check for Updates": "업데이트 확인",
     "Clear Pending Tasks": "보류 중인 작업 제거하기",
     "Clear Workflow": "워크플로 지우기",
     "Clipspace": "클립스페이스",
@@ -1161,16 +1810,19 @@
     "Contact Support": "고객 지원 문의",
     "Convert Selection to Subgraph": "선택 영역을 서브그래프로 변환",
     "Convert selected nodes to group node": "선택한 노드를 그룹 노드로 변환",
+    "Copy": "복사",
     "Custom Nodes (Legacy)": "커스텀 노드(구버전)",
     "Custom Nodes Manager": "커스텀 노드 관리자",
     "Decrease Brush Size in MaskEditor": "마스크 편집기에서 브러시 크기 줄이기",
     "Delete Selected Items": "선택한 항목 삭제",
+    "Desktop User Guide": "데스크톱 사용자 가이드",
     "Duplicate Current Workflow": "현재 워크플로 복제",
     "Edit": "편집",
     "Edit Subgraph Widgets": "하위 그래프 위젯 편집",
     "Exit Subgraph": "서브그래프 나가기",
     "Experimental: Browse Model Assets": "실험적: 모델 에셋 탐색",
     "Experimental: Enable AssetAPI": "실험적: AssetAPI 활성화",
+    "Experimental: Enable Nodes 2_0": "실험적: Nodes 2.0 활성화",
     "Export": "내보내기",
     "Export (API)": "내보내기 (API)",
     "File": "파일",
@@ -1182,12 +1834,15 @@
     "Increase Brush Size in MaskEditor": "마스크 편집기에서 브러시 크기 늘리기",
     "Install Missing Custom Nodes": "누락된 커스텀 노드 설치",
     "Interrupt": "중단",
+    "Job History": "작업 기록",
     "Load Default Workflow": "기본 워크플로 불러오기",
     "Lock Canvas": "캔버스 잠금",
     "Manage group nodes": "그룹 노드 관리",
     "Manager": "매니저",
     "Manager Menu (Legacy)": "매니저 메뉴(구버전)",
     "Minimap": "미니맵",
+    "Mirror Horizontal in MaskEditor": "마스크 편집기에서 수평 반전",
+    "Mirror Vertical in MaskEditor": "마스크 편집기에서 수직 반전",
     "Model Library": "모델 라이브러리",
     "Move Selected Nodes Down": "선택한 노드 아래로 이동",
     "Move Selected Nodes Left": "선택한 노드 왼쪽으로 이동",
@@ -1199,9 +1854,18 @@
     "Node Library": "노드 라이브러리",
     "Node Links": "노드 링크",
     "Open": "열기",
-    "Open 3D Viewer (Beta) for Selected Node": "선택한 노드에 대한 3D 뷰어 (베타) 열기",
+    "Open 3D Viewer (Beta) for Selected Node": "선택한 노드에 대해 3D 뷰어(베타) 열기",
+    "Open Color Picker in MaskEditor": "MaskEditor에서 색상 선택기 열기",
+    "Open Custom Nodes Folder": "커스텀 노드 폴더 열기",
+    "Open DevTools": "개발자 도구 열기",
+    "Open Inputs Folder": "입력 폴더 열기",
+    "Open Logs Folder": "로그 폴더 열기",
     "Open Mask Editor for Selected Node": "선택한 노드의 마스크 에디터 열기",
+    "Open Models Folder": "모델 폴더 열기",
+    "Open Outputs Folder": "출력 폴더 열기",
     "Open Sign In Dialog": "로그인 대화 상자 열기",
+    "Open extra_model_paths_yaml": "extra_model_paths.yaml 열기",
+    "Paste": "붙여넣기",
     "Pin/Unpin Selected Items": "선택한 항목 고정/고정 해제",
     "Pin/Unpin Selected Nodes": "선택한 노드 고정/고정 해제",
     "Previous Opened Workflow": "이전 열린 워크플로",
@@ -1209,24 +1873,34 @@
     "Queue Prompt": "실행 대기열에 프롬프트 추가",
     "Queue Prompt (Front)": "실행 대기열 맨 앞에 프롬프트 추가",
     "Queue Selected Output Nodes": "선택한 출력 노드 대기열에 추가",
+    "Quit": "종료",
     "Redo": "다시 실행",
     "Refresh Node Definitions": "노드 정의 새로 고침",
+    "Reinstall": "재설치",
+    "Rename": "이름 바꾸기",
     "Reset View": "보기 초기화",
     "Resize Selected Nodes": "선택된 노드 크기 조정",
+    "Restart": "재시작",
+    "Rotate Left in MaskEditor": "마스크 편집기에서 왼쪽으로 회전",
+    "Rotate Right in MaskEditor": "마스크 편집기에서 오른쪽으로 회전",
     "Save": "저장",
     "Save As": "다른 이름으로 저장",
+    "Select All": "모두 선택",
+    "Set Subgraph Description": "서브그래프 설명 설정",
+    "Set Subgraph Search Aliases": "서브그래프 검색 별칭 설정",
     "Show Keybindings Dialog": "단축키 대화상자 표시",
     "Show Model Selector (Dev)": "모델 선택기 표시 (개발자용)",
     "Show Settings Dialog": "설정 대화상자 표시",
     "Sign Out": "로그아웃",
+    "Toggle App Mode": "앱 모드 전환",
     "Toggle Essential Bottom Panel": "필수 하단 패널 전환",
     "Toggle Logs Bottom Panel": "로그 하단 패널 전환",
+    "Toggle Queue Panel V2": "대기열 패널 V2 전환",
     "Toggle Search Box": "검색 상자 전환",
     "Toggle Terminal Bottom Panel": "터미널 하단 패널 전환",
     "Toggle Theme (Dark/Light)": "테마 전환 (어두운/밝은)",
     "Toggle View Controls Bottom Panel": "뷰 컨트롤 하단 패널 전환",
     "Toggle promotion of hovered widget": "호버된 위젯 승격 전환",
-    "Toggle the Custom Nodes Manager Progress Bar": "커스텀 노드 매니저 진행률 표시줄 전환",
     "Undo": "실행 취소",
     "Ungroup selected group nodes": "선택한 그룹 노드 그룹 해제",
     "Unload Models": "모델 언로드",
@@ -1237,7 +1911,8 @@
     "Workflows": "워크플로",
     "Zoom In": "확대",
     "Zoom Out": "축소",
-    "Zoom to fit": "화면에 맞추기"
+    "Zoom to fit": "화면에 맞추기",
+    "linearMode_appModeToolbar_apps": "linearMode.appModeToolbar.apps"
   },
   "minimap": {
     "nodeColors": "노드 색상",
@@ -1247,20 +1922,66 @@
     "showLinks": "링크 표시"
   },
   "missingModelsDialog": {
+    "acceptTerms": "약관 동의",
+    "customModelsInstruction": "직접 찾아서 수동으로 다운로드해야 합니다. 온라인에서 검색해보세요(예: Civitai 또는 Hugging Face) 또는 원래 워크플로우 제공자에게 문의하세요.",
+    "customModelsWarning": "이 중 일부는 인식되지 않는 커스텀 모델입니다.",
+    "description": "이 워크플로우에는 아직 다운로드하지 않은 모델이 필요합니다.",
     "doNotAskAgain": "다시 보지 않기",
-    "missingModels": "모델이 없습니다",
-    "missingModelsMessage": "그래프를 로드할 때 다음 모델을 찾을 수 없었습니다"
+    "downloadAll": "모두 다운로드",
+    "downloadAvailable": "다운로드 가능",
+    "footerDescription": "이 모델들을 다운로드하여 올바른 폴더에 넣으세요.\n모델이 누락된 노드는 캔버스에서 빨간색으로 표시됩니다.",
+    "gotIt": "확인",
+    "reEnableInSettings": "{link}에서 다시 활성화",
+    "reEnableInSettingsLink": "설정",
+    "title": "이 워크플로우에 모델이 누락되었습니다",
+    "totalSize": "총 다운로드 크기:"
+  },
+  "missingNodes": {
+    "cloud": {
+      "description": "이 워크플로우는 Cloud 버전에서 아직 지원되지 않는 커스텀 노드를 사용합니다.",
+      "gotIt": "확인",
+      "learnMore": "자세히 알아보기",
+      "priorityMessage": "이 노드를 자동으로 표시하여 우선적으로 추가할 수 있도록 했습니다.",
+      "replacementInstruction": "그동안에는, 가능하다면 지원되는 노드(캔버스에서 빨간색으로 강조됨)로 교체하거나 다른 워크플로우를 시도해보세요.",
+      "title": "이 노드는 아직 Comfy Cloud에서 사용할 수 없습니다"
+    },
+    "oss": {
+      "description": "이 워크플로우는 아직 설치하지 않은 커스텀 노드를 사용합니다.",
+      "replacementInstruction": "이 노드를 설치하거나, 설치된 대체 노드로 교체해야 워크플로우를 실행할 수 있습니다. 누락된 노드는 캔버스에서 빨간색으로 강조됩니다.",
+      "title": "이 워크플로우에 누락된 노드가 있습니다"
+    }
+  },
+  "nightly": {
+    "badge": {
+      "label": "미리보기 버전",
+      "tooltip": "현재 ComfyUI의 나이트리 버전을 사용 중입니다. 이 기능들에 대한 의견을 피드백 버튼을 통해 공유해 주세요."
+    }
+  },
+  "nightlySurvey": {
+    "accept": "네, 도와드릴게요!",
+    "description": "이 기능을 사용해 주셨네요. 잠시 시간을 내어 피드백을 남겨주시겠어요?",
+    "dontAskAgain": "다시 묻지 않기",
+    "loadError": "설문을 불러오지 못했습니다. 나중에 다시 시도해 주세요.",
+    "notNow": "나중에",
+    "title": "개선에 도움을 주세요"
   },
   "nodeCategories": {
+    "": "",
     "3d": "3d",
     "3d_models": "3D 모델",
     "BFL": "BFL",
+    "Bria": "Bria",
     "ByteDance": "ByteDance",
+    "ElevenLabs": "ElevenLabs",
     "Gemini": "Gemini",
+    "Grok": "Grok",
+    "HitPaw": "HitPaw",
     "Ideogram": "Ideogram",
     "Kling": "Kling",
     "LTXV": "LTXV",
     "Luma": "Luma",
+    "Magnific": "Magnific",
+    "Meshy": "Meshy",
     "MiniMax": "MiniMax",
     "Moonvalley Marey": "Moonvalley Marey",
     "OpenAI": "OpenAI",
@@ -1270,10 +1991,13 @@
     "Runway": "Runway",
     "Sora": "Sora",
     "Stability AI": "Stability AI",
+    "Tencent": "Tencent",
+    "Topaz": "Topaz",
     "Tripo": "Tripo",
     "Veo": "Veo",
     "Vidu": "Vidu",
     "Wan": "Wan",
+    "WaveSpeed": "WaveSpeed",
     "_for_testing": "_테스트용",
     "advanced": "고급",
     "animation": "애니메이션",
@@ -1294,6 +2018,7 @@
     "controlnet": "컨트롤넷",
     "create": "생성",
     "custom_sampling": "사용자 정의 샘플링",
+    "dataset": "데이터셋",
     "debug": "디버그",
     "deprecated": "지원 중단",
     "edit_models": "edit_models",
@@ -1305,8 +2030,10 @@
     "image": "이미지",
     "inpaint": "인페인팅",
     "instructpix2pix": "InstructPix2Pix",
+    "kandinsky5": "kandinsky5",
     "latent": "잠재 데이터",
     "loaders": "로더",
+    "logic": "로직",
     "lotus": "lotus",
     "ltxv": "ltxv",
     "mask": "마스크",
@@ -1328,11 +2055,13 @@
     "scheduling": "스케줄링",
     "sd": "sd",
     "sd3": "sd3",
+    "shader": "shader",
     "sigmas": "시그마",
     "stable_cascade": "Stable Cascade",
     "string": "문자열",
     "style_model": "스타일 모델",
     "text": "텍스트",
+    "textgen": "textgen",
     "training": "학습",
     "transform": "변환",
     "unet": "UNet",
@@ -1340,7 +2069,25 @@
     "upscaling": "업스케일링",
     "utils": "유틸리티",
     "video": "비디오",
-    "video_models": "비디오 모델"
+    "video_models": "비디오 모델",
+    "zimage": "zimage"
+  },
+  "nodeErrors": {
+    "content": "노드 콘텐츠 오류",
+    "header": "노드 헤더 오류",
+    "render": "노드 렌더 오류",
+    "slots": "노드 슬롯 오류",
+    "widgets": "노드 위젯 오류"
+  },
+  "nodeFilters": {
+    "hideDeprecated": "사용 중단 노드 숨기기",
+    "hideDeprecatedDescription": "명시적으로 활성화하지 않는 한 사용 중단된 노드를 숨깁니다.",
+    "hideDevOnly": "개발자 전용 노드 숨기기",
+    "hideDevOnlyDescription": "개발자 모드가 활성화되지 않은 경우 개발자 전용 노드를 숨깁니다.",
+    "hideExperimental": "실험적 노드 숨기기",
+    "hideExperimentalDescription": "명시적으로 활성화하지 않는 한 실험적 노드를 숨깁니다.",
+    "hideSubgraph": "서브그래프 노드 숨기기",
+    "hideSubgraphDescription": "노드 라이브러리와 검색에서 서브그래프 노드를 임시로 숨깁니다."
   },
   "nodeHelpPage": {
     "documentationPage": "문서 페이지",
@@ -1350,6 +2097,32 @@
     "outputs": "출력",
     "type": "유형"
   },
+  "nodeReplacement": {
+    "compatibleAlternatives": "호환 가능한 대안",
+    "installMissingNodes": "누락된 노드 설치",
+    "installationRequired": "설치 필요",
+    "instructionMessage": "워크플로를 실행하려면 이 노드를 설치하거나 설치된 대안으로 교체해야 합니다. 누락된 노드는 캔버스에서 {red}로 강조 표시됩니다. 일부 노드는 교체할 수 없으므로 Node Manager를 통해 설치해야 합니다.",
+    "notReplaceable": "설치 필요",
+    "openNodeManager": "Node Manager 열기",
+    "quickFixAvailable": "빠른 수정 가능",
+    "redHighlight": "빨간색",
+    "replaceAll": "모두 교체",
+    "replaceAllWarning": "이 그룹의 사용 가능한 모든 노드를 교체합니다.",
+    "replaceFailed": "노드 교체 실패",
+    "replaceNode": "노드 교체",
+    "replaceSelected": "선택한 항목 교체 ({count})",
+    "replaceWarning": "이 작업은 워크플로를 영구적으로 수정합니다. 확실하지 않으면 먼저 복사본을 저장하세요.",
+    "replaceable": "교체 가능",
+    "replaced": "교체됨",
+    "replacedAllNodes": "{count}개 노드 유형 교체됨",
+    "replacedNode": "교체된 노드: {nodeType}",
+    "selectAll": "전체 선택",
+    "skipForNow": "일단 건너뛰기",
+    "swapNodesGuide": "다음 노드는 호환 가능한 대체 노드로 자동 교체할 수 있습니다.",
+    "swapNodesTitle": "노드 교체",
+    "unknownNode": "알 수 없음",
+    "willBeReplacedBy": "이 노드는 다음으로 교체됩니다:"
+  },
   "nodeTemplates": {
     "enterName": "이름 입력",
     "saveAsTemplate": "템플릿으로 저장"
@@ -1357,6 +2130,7 @@
   "notSupported": {
     "continue": "계속",
     "continueTooltip": "내 장치가 지원되는 장치가 확실합니다.",
+    "illustrationAlt": "슬픈 소녀 일러스트",
     "learnMore": "자세히 알아보기",
     "message": "다음 장치만 지원됩니다:",
     "reportIssue": "이슈 보고",
@@ -1366,12 +2140,222 @@
     },
     "title": "이 장치는 지원되지 않습니다."
   },
+  "painter": {
+    "background": "배경",
+    "brush": "브러시",
+    "clear": "지우기",
+    "color": "색상 선택기",
+    "eraser": "지우개",
+    "hardness": "경도",
+    "height": "높이",
+    "size": "커서 크기",
+    "tool": "도구",
+    "uploadError": "페인터 이미지를 업로드하지 못했습니다: {status} - {statusText}",
+    "width": "너비"
+  },
+  "progressToast": {
+    "allDownloadsCompleted": "모든 다운로드가 완료되었습니다",
+    "downloadingModel": "모델 다운로드 중...",
+    "downloadsFailed": "{count}개 다운로드 실패 | {count}개 다운로드 실패 | {count}개 다운로드 실패",
+    "failed": "실패",
+    "filter": {
+      "all": "전체",
+      "completed": "완료됨",
+      "failed": "실패"
+    },
+    "finished": "완료",
+    "importingModels": "모델 가져오는 중",
+    "noImportsInQueue": "대기 중인 {filter} 없음",
+    "pending": "대기 중",
+    "progressCount": "{completed} / {total}"
+  },
+  "queue": {
+    "completedIn": "{duration} 내에 완료됨",
+    "inQueue": "대기열에 있음...",
+    "initializingAlmostReady": "초기화 중 - 거의 준비됨",
+    "jobAddedToQueue": "작업이 대기열에 추가됨",
+    "jobDetails": {
+      "computeHoursUsed": "사용한 컴퓨트 시간",
+      "errorMessage": "오류 메시지",
+      "estimatedFinishIn": "예상 완료 시간",
+      "estimatedStartIn": "예상 시작 시간",
+      "eta": {
+        "minutes": "약 {count}분 | 약 {count}분",
+        "minutesRange": "약 {lo}-{hi}분",
+        "seconds": "약 {count}초 | 약 {count}초",
+        "secondsRange": "약 {lo}-{hi}초"
+      },
+      "failedAfter": "실패 시점",
+      "generatedOn": "생성 일시",
+      "header": "작업 세부 정보",
+      "jobId": "작업 ID",
+      "queuePosition": "대기열 위치",
+      "queuePositionValue": "내 작업 앞에 약 {count}개 작업 있음 | 내 작업 앞에 약 {count}개 작업 있음",
+      "queuedAt": "대기열에 추가된 시간",
+      "report": "신고",
+      "timeElapsed": "경과 시간",
+      "totalGenerationTime": "총 생성 시간",
+      "workflow": "워크플로우"
+    },
+    "jobHistory": "작업 기록",
+    "jobList": {
+      "sortComputeHoursUsed": "사용한 컴퓨트 시간(많은 순)",
+      "sortMostRecent": "최신순",
+      "sortTotalGenerationTime": "총 생성 시간(긴 순)",
+      "undated": "날짜 없음"
+    },
+    "jobMenu": {
+      "addToCurrentWorkflow": "현재 워크플로우에 추가",
+      "cancelJob": "작업 취소",
+      "copyErrorMessage": "오류 메시지 복사",
+      "copyJobId": "작업 ID 복사",
+      "delete": "삭제",
+      "deleteAsset": "에셋 삭제",
+      "download": "다운로드",
+      "exportWorkflow": "워크플로우 내보내기",
+      "inspectAsset": "에셋 검사",
+      "openAsWorkflowNewTab": "워크플로우로 새 탭에서 열기",
+      "openWorkflowNewTab": "워크플로우 새 탭에서 열기",
+      "removeJob": "작업 제거",
+      "reportError": "오류 신고"
+    },
+    "jobQueueing": "작업 대기 중",
+    "toggleJobHistory": "작업 기록 전환"
+  },
   "releaseToast": {
+    "description": "이번 업데이트의 최신 개선 사항과 기능을 확인하세요.",
     "newVersionAvailable": "새 버전이 있습니다!",
     "skip": "건너뛰기",
     "update": "업데이트",
     "whatsNew": "새로운 기능 보기"
   },
+  "rightSidePanel": {
+    "addFavorite": "즐겨찾기",
+    "advancedInputs": "고급 입력",
+    "bypass": "우회",
+    "color": "노드 색상",
+    "enterSubgraph": "서브그래프 진입",
+    "errorHelp": "더 많은 도움이 필요하시면 {github} 또는 {support}를 이용하세요.",
+    "errorHelpGithub": "GitHub 이슈 제출",
+    "errorHelpSupport": "고객 지원팀에 문의",
+    "errors": "오류",
+    "executionErrorOccurred": "실행 중 오류가 발생했습니다. 자세한 내용은 오류 탭을 확인하세요.",
+    "fallbackGroupTitle": "그룹",
+    "fallbackNodeTitle": "노드",
+    "favorites": "즐겨찾는 입력",
+    "favoritesNone": "즐겨찾는 입력 없음",
+    "favoritesNoneDesc": "즐겨찾기한 입력이 여기에 표시됩니다",
+    "favoritesNoneHint": "파라미터 탭에서 원하는 입력의 {moreIcon}을 클릭해 여기에 추가하세요",
+    "favoritesNoneTooltip": "노드를 선택하지 않고도 빠르게 접근하려면 위젯에 별표를 표시하세요",
+    "globalSettings": {
+      "canvas": "캔버스",
+      "connectionLinks": "연결 링크",
+      "gridSpacing": "그리드 간격",
+      "linkShape": "링크 모양",
+      "nodes": "노드",
+      "nodes2": "노드 2.0",
+      "searchPlaceholder": "빠른 설정 검색...",
+      "showAdvanced": "고급 파라미터 표시",
+      "showAdvancedTooltip": "이 설정을 TRUE로 하면 노드의 모든 고급 파라미터가 표시됩니다",
+      "showConnectedLinks": "연결된 링크 표시",
+      "showInfoBadges": "정보 배지 표시",
+      "showToolbox": "선택 시 툴박스 표시",
+      "snapNodesToGrid": "노드를 그리드에 맞추기",
+      "title": "글로벌 설정",
+      "viewAllSettings": "모든 설정 보기"
+    },
+    "groupSettings": "그룹 설정",
+    "groups": "그룹",
+    "hideAdvancedInputsButton": "고급 입력 숨기기",
+    "hideInput": "입력 숨기기",
+    "info": "정보",
+    "inputs": "입력",
+    "inputsNone": "입력 없음",
+    "inputsNoneTooltip": "노드에 입력이 없습니다",
+    "locateNode": "캔버스에서 노드 찾기",
+    "missingNodePacks": {
+      "applyChanges": "변경 사항 적용",
+      "cloudMessage": "이 워크플로우에는 Comfy Cloud에서 아직 사용할 수 없는 커스텀 노드가 필요합니다.",
+      "collapse": "접기",
+      "expand": "펼치기",
+      "installAll": "모두 설치",
+      "installNodePack": "노드 팩 설치",
+      "installed": "설치됨",
+      "installing": "설치 중...",
+      "ossManagerDisabledHint": "누락된 노드를 설치하려면 먼저 Python 환경에서 {pipCmd}를 실행하여 Node Manager를 설치한 후, {flag} 플래그와 함께 ComfyUI를 다시 시작하세요.",
+      "ossMessage": "이 워크플로우에는 아직 설치하지 않은 커스텀 노드를 사용합니다.",
+      "searchInManager": "노드 매니저에서 검색",
+      "title": "누락된 노드 팩",
+      "unknownPack": "알 수 없는 팩",
+      "unsupportedTitle": "지원되지 않는 노드 팩",
+      "viewInManager": "매니저에서 보기"
+    },
+    "mute": "음소거",
+    "noErrors": "오류 없음",
+    "noSelection": "노드를 선택하면 속성과 정보를 볼 수 있습니다.",
+    "nodeState": "노드 상태",
+    "nodes": "노드",
+    "nodesNoneDesc": "노드 없음",
+    "noneSearchDesc": "검색 결과가 없습니다",
+    "normal": "일반",
+    "parameters": "파라미터",
+    "pinned": "고정됨",
+    "promptErrors": {
+      "no_prompt": {
+        "desc": "서버로 전송된 워크플로우 데이터가 비어 있습니다. 이는 예기치 않은 시스템 오류일 수 있습니다."
+      },
+      "prompt_no_outputs": {
+        "desc": "워크플로우에 결과를 생성할 출력 노드(예: 이미지 저장, 이미지 미리보기)가 포함되어 있지 않습니다."
+      },
+      "server_error_cloud": {
+        "desc": "서버에서 예기치 않은 오류가 발생했습니다. 나중에 다시 시도해 주세요."
+      },
+      "server_error_local": {
+        "desc": "서버에서 예기치 않은 오류가 발생했습니다. 서버 로그를 확인해 주세요."
+      }
+    },
+    "properties": "속성",
+    "removeFavorite": "즐겨찾기 해제",
+    "resetAllParameters": "모든 매개변수 재설정",
+    "resetToDefault": "기본값으로 재설정",
+    "seeError": "오류 보기",
+    "settings": "설정",
+    "showAdvancedInputsButton": "고급 입력 표시",
+    "showInput": "입력 표시",
+    "title": "선택된 노드 없음 | 노드 1개 선택됨 | 노드 {count}개 선택됨",
+    "togglePanel": "속성 패널 전환",
+    "workflowOverview": "워크플로우 개요"
+  },
+  "secrets": {
+    "addSecret": "시크릿 추가",
+    "createdAt": "{date}에 생성됨",
+    "deleteConfirmMessage": "\"{name}\"을(를) 삭제하시겠습니까? 이 작업은 되돌릴 수 없습니다.",
+    "deleteConfirmTitle": "시크릿 삭제",
+    "description": "시크릿은 암호화되어 API 키와 같은 민감한 데이터에 사용됩니다.",
+    "descriptionUsage": "여기에 토큰을 저장하여 지원되는 공급자에서 비공개 및 제한 모델을 다운로드할 수 있습니다.",
+    "editSecret": "시크릿 편집",
+    "errors": {
+      "duplicateName": "이 이름의 시크릿이 이미 존재합니다",
+      "duplicateProvider": "이 공급자의 시크릿이 이미 존재합니다",
+      "nameRequired": "이름은 필수 항목입니다",
+      "nameTooLong": "이름은 255자 이하여야 합니다",
+      "providerRequired": "공급자는 필수 항목입니다",
+      "secretValueRequired": "시크릿 값은 필수 항목입니다"
+    },
+    "lastUsed": "마지막 사용: {date}",
+    "modelProviders": "모델 공급자",
+    "name": "이름",
+    "namePlaceholder": "예: My API Key",
+    "noSecrets": "저장된 시크릿이 없습니다. 첫 번째 API 키를 추가하여 시작하세요.",
+    "provider": "공급자",
+    "providerHint": "선택 사항입니다. 공급자를 선택하면 토큰이 자동으로 사용됩니다.",
+    "secretValue": "시크릿 값",
+    "secretValueHint": "이 값은 암호화되며 다시 볼 수 없습니다.",
+    "secretValueHintEdit": "현재 값을 유지하려면 비워 두세요.",
+    "secretValuePlaceholder": "API 키를 입력하세요",
+    "secretValuePlaceholderEdit": "변경하려면 새 값을 입력하세요",
+    "title": "API 키 및 시크릿"
+  },
   "selectionToolbox": {
     "Bypass Group Nodes": "그룹 노드 우회",
     "Set Group Nodes to Always": "그룹 노드를 항상 실행으로 설정",
@@ -1384,6 +2368,8 @@
   "serverConfig": {
     "modifiedConfigs": "다음 서버 구성을 수정했습니다. 변경 사항을 적용하려면 다시 시작하세오.",
     "restart": "다시 시작",
+    "restartRequiredToastDetail": "서버 구성 변경 사항을 적용하려면 앱을 재시작하세요.",
+    "restartRequiredToastSummary": "재시작 필요",
     "revertChanges": "변경 사항 되돌리기"
   },
   "serverConfigCategories": {
@@ -1452,6 +2438,10 @@
     "enable-cors-header": {
       "name": "CORS 헤더 활성화: 모든 출처에 대해 \"*\" 사용 또는 도메인 지정"
     },
+    "enable-manager-legacy-ui": {
+      "name": "레거시 Manager UI 사용",
+      "tooltip": "새 UI 대신 레거시 ComfyUI-Manager UI를 사용합니다."
+    },
     "fast": {
       "name": "테스트되지 않고 품질 저하 가능성이 있는 실험적 최적화 기능을 활성화 합니다."
     },
@@ -1553,6 +2543,8 @@
     "CustomColorPalettes": "사용자 정의 색상 팔레트",
     "DevMode": "개발자 모드",
     "EditTokenWeight": "토큰 가중치 편집",
+    "Error System": "오류 시스템",
+    "Execution": "실행",
     "Extension": "확장",
     "General": "일반",
     "Graph": "그래프",
@@ -1568,10 +2560,14 @@
     "Menu": "메뉴",
     "ModelLibrary": "모델 라이브러리",
     "Node": "노드",
+    "Node Library": "노드 라이브러리",
     "Node Search Box": "노드 검색 상자",
     "Node Widget": "노드 위젯",
     "NodeLibrary": "노드 라이브러리",
+    "Nodes 2_0": "Nodes 2.0",
     "Notification Preferences": "알림 환경설정",
+    "Other": "기타",
+    "PLY": "PLY",
     "PlanCredits": "플랜 및 크레딧",
     "Pointer": "포인터",
     "Queue": "실행 대기열",
@@ -1579,6 +2575,7 @@
     "Reroute": "경유점",
     "RerouteBeta": "경유점 (베타)",
     "Scene": "장면",
+    "Secrets": "시크릿",
     "Server": "서버",
     "Server-Config": "서버 구성",
     "Settings": "설정",
@@ -1590,7 +2587,8 @@
     "Vue Nodes": "Vue 노드",
     "VueNodes": "Vue 노드",
     "Window": "창",
-    "Workflow": "워크플로"
+    "Workflow": "워크플로",
+    "Workspace": "워크스페이스"
   },
   "shape": {
     "CARD": "카드",
@@ -1616,11 +2614,18 @@
     "viewControls": "보기 컨트롤"
   },
   "sideToolbar": {
+    "activeJobStatus": "진행 중인 작업: {status}",
     "assets": "에셋",
     "backToAssets": "모든 에셋으로 돌아가기",
     "browseTemplates": "예제 템플릿 탐색",
     "downloads": "다운로드",
+    "folderView": {
+      "errorDetail": "이 작업의 출력을 가져올 수 없습니다. 다시 시도해 주세요.",
+      "errorSummary": "출력 불러오기 실패"
+    },
+    "generatedAssetsHeader": "생성된 에셋",
     "helpCenter": "도움말 센터",
+    "importedAssetsHeader": "가져온 에셋",
     "labels": {
       "assets": "에셋",
       "console": "콘솔",
@@ -1643,6 +2648,17 @@
     "noImportedFiles": "가져온 파일을 찾을 수 없음",
     "nodeLibrary": "노드 라이브러리",
     "nodeLibraryTab": {
+      "allNodes": "모든 노드",
+      "blueprints": "블루프린트",
+      "custom": "사용자 정의",
+      "essentials": "필수",
+      "filter": "필터",
+      "filterOptions": {
+        "blueprints": "블루프린트",
+        "comfyNodes": "Comfy 노드",
+        "extensions": "확장 프로그램",
+        "partnerNodes": "파트너 노드"
+      },
       "groupBy": "그룹 기준",
       "groupStrategies": {
         "category": "카테고리",
@@ -1652,7 +2668,20 @@
         "source": "소스",
         "sourceDesc": "소스 유형(Core, Custom, API)별로 그룹화"
       },
+      "noBookmarkedNodes": "아직 즐겨찾기가 없습니다",
       "resetView": "기본 보기로 재설정",
+      "sections": {
+        "bookmarked": "즐겨찾기",
+        "comfyBlueprints": "Comfy 블루프린트",
+        "comfyNodes": "Comfy 노드",
+        "extensions": "확장 프로그램",
+        "favoriteNode": "즐겨찾는 노드",
+        "favorites": "즐겨찾기",
+        "myBlueprints": "내 블루프린트",
+        "partnerNodes": "파트너 노드",
+        "subgraphBlueprints": "서브그래프 블루프린트",
+        "unfavoriteNode": "즐겨찾기 해제 노드"
+      },
       "sortBy": {
         "alphabetical": "알파벳순",
         "alphabeticalDesc": "그룹 내에서 알파벳순으로 정렬",
@@ -1661,8 +2690,62 @@
       },
       "sortMode": "정렬 방식"
     },
+    "nodes": "노드",
     "openWorkflow": "로컬 파일 시스템에서 워크플로 열기",
     "queue": "실행 대기열",
+    "queueProgressOverlay": {
+      "activeJobs": "{count}개의 활성 작업",
+      "activeJobsShort": "{count}개 활성",
+      "activeJobsSuffix": "활성 작업",
+      "cancelJobTooltip": "작업 취소",
+      "clearAllJobsTooltip": "실행 중인 모든 작업 취소",
+      "clearHistory": "작업 대기열 기록 삭제",
+      "clearHistoryDialogAssetsNote": "이 작업들로 생성된 에셋은 삭제되지 않으며, 언제든지 에셋 패널에서 볼 수 있습니다.",
+      "clearHistoryDialogDescription": "아래의 완료되었거나 실패한 모든 작업이 이 작업 대기열 패널에서 삭제됩니다.",
+      "clearHistoryDialogTitle": "작업 대기열 기록을 삭제하시겠습니까?",
+      "clearHistoryMenuAssetsNote": "미디어 에셋은 삭제되지 않습니다.",
+      "clearQueueTooltip": "대기열 비우기",
+      "clearQueued": "대기열 비우기",
+      "colonPercent": ": {percent}",
+      "currentNode": "현재 노드:",
+      "dockedJobHistory": "도킹된 작업 기록",
+      "expandCollapsedQueue": "작업 대기열 확장",
+      "filterAllWorkflows": "모든 워크플로우",
+      "filterBy": "필터 기준",
+      "filterCurrentWorkflow": "현재 워크플로우",
+      "filterJobs": "작업 필터",
+      "inlineTotalLabel": "총계",
+      "interruptAll": "모든 실행 중인 작업 중단",
+      "jobCompleted": "작업 완료됨",
+      "jobFailed": "작업 실패",
+      "jobQueue": "작업 대기열",
+      "jobsAddedToQueue": "{count}개 작업이 대기열에 추가됨 | {count}개 작업이 대기열에 추가됨",
+      "jobsCompleted": "{count}개 작업 완료",
+      "jobsFailed": "{count}개 작업 실패",
+      "moreOptions": "더 많은 옵션",
+      "noActiveJobs": "활성 작업 없음",
+      "preview": "미리보기",
+      "queuedJobsLabel": "{count}개 대기 중",
+      "queuedSuffix": "대기 중",
+      "running": "실행 중",
+      "runningJobsLabel": "{count}개 실행 중",
+      "runningQueuedSummary": "{running} 실행 중, {queued} 대기 중",
+      "searchJobs": "검색...",
+      "showAssets": "에셋 보기",
+      "showAssetsPanel": "에셋 패널 보기",
+      "showRunProgressBar": "실행 진행률 표시줄 표시",
+      "sortBy": "정렬 기준",
+      "sortJobs": "작업 정렬",
+      "stubClipTextEncode": "CLIP 텍스트 인코드:",
+      "title": "대기열 진행 상황",
+      "total": "총: {percent}",
+      "viewAllJobs": "모든 작업 보기",
+      "viewGrid": "그리드 보기",
+      "viewJobHistory": "작업 기록 보기",
+      "viewList": "리스트 보기"
+    },
+    "searchAssets": "에셋 검색",
+    "sidebar": "사이드바",
     "templates": "템플릿",
     "themeToggle": "테마 전환",
     "workflowTab": {
@@ -1686,60 +2769,208 @@
   },
   "subgraphStore": {
     "blueprintName": "서브그래프 이름",
+    "blueprintNamePrompt": "서브그래프 이름:",
+    "cannotDeleteGlobal": "설치된 블루프린트는 삭제할 수 없습니다",
     "confirmDelete": "이 작업은 라이브러리에서 블루프린트를 영구적으로 제거합니다",
     "confirmDeleteTitle": "블루프린트를 삭제하시겠습니까?",
+    "disconnected": "연결 해제됨",
+    "enterDescription": "설명을 입력하세요",
+    "enterSearchAliases": "검색 별칭을 입력하세요 (쉼표로 구분)",
     "hidden": "숨김 / 중첩 매개변수",
     "hideAll": "모두 숨김",
+    "linked": "(연결됨)",
     "loadFailure": "서브그래프 블루프린트 로드 실패",
     "overwriteBlueprint": "저장하면 현재 블루프린트가 변경사항으로 덮어쓰여집니다",
     "overwriteBlueprintTitle": "기존 블루프린트를 덮어쓰시겠습니까?",
     "promoteOutsideSubgraph": "하위 그래프가 아닐 때 위젯을 승격할 수 없음",
+    "promoteWidget": "위젯 승격: {name}",
     "publish": "서브그래프 게시",
     "publishSuccess": "노드 라이브러리에 저장됨",
     "publishSuccessMessage": "노드 라이브러리의 \"서브그래프 블루프린트\" 아래에서 서브그래프 블루프린트를 찾을 수 있습니다",
     "saveBlueprint": "서브그래프를 라이브러리에 저장",
+    "searchAliases": "별칭 검색",
     "showAll": "모두 표시",
     "showRecommended": "권장 위젯 표시",
-    "shown": "노드에 표시됨"
+    "shown": "노드에 표시됨",
+    "unpromoteWidget": "위젯 승격 해제: {name}"
   },
   "subscription": {
     "addApiCredits": "API 크레딧 추가",
     "addCredits": "크레딧 추가",
+    "addCreditsLabel": "언제든지 크레딧 추가 가능",
     "benefits": {
       "benefit1": "파트너 노드 월간 크레딧 — 필요 시 충전",
-      "benefit2": "작업당 최대 30분 실행 시간"
+      "benefit1FreeTier": "더 많은 월간 크레딧, 언제든지 충전 가능",
+      "benefit2": "작업당 최대 30분 실행 시간",
+      "benefit3": "직접 모델 가져오기(Creator & Pro)"
     },
     "beta": "베타",
+    "billedMonthly": "매월 결제",
+    "billedYearly": "{total} 연간 결제",
+    "billingComingSoon": {
+      "message": "팀 결제 기능이 곧 제공됩니다. 워크스페이스별 좌석당 요금제로 구독할 수 있습니다. 업데이트를 기대해 주세요.",
+      "title": "곧 출시 예정"
+    },
+    "cancelDialog": {
+      "confirmCancel": "구독 취소",
+      "description": "{date}까지 계속 이용할 수 있습니다. 더 이상 결제되지 않으며, 워크스페이스와 크레딧은 보존됩니다. 언제든지 다시 구독할 수 있습니다.",
+      "endOfBillingPeriod": "청구 기간 종료",
+      "failed": "구독 취소에 실패했습니다",
+      "keepSubscription": "구독 유지",
+      "title": "구독 취소"
+    },
+    "cancelSubscription": "구독 취소",
+    "cancelSuccess": "구독이 성공적으로 취소되었습니다",
+    "canceled": "취소됨",
+    "canceledCard": {
+      "description": "더 이상 결제되지 않습니다. {date}까지 기능을 계속 사용할 수 있습니다.",
+      "title": "구독이 취소되었습니다"
+    },
+    "changeTo": "{plan}로 변경",
+    "chooseBestPlanWorkspace": "워크스페이스에 가장 적합한 플랜을 선택하세요",
     "comfyCloud": "Comfy Cloud",
+    "comfyCloudLogo": "Comfy Cloud 로고",
+    "contactOwnerToSubscribe": "워크스페이스 소유자에게 구독을 요청하세요",
+    "contactUs": "문의하기",
+    "creditsRemainingThisMonth": "이번 달 남은 크레딧",
+    "creditsRemainingThisYear": "올해 남은 크레딧",
+    "creditsYouveAdded": "추가한 크레딧",
+    "currentPlan": "현재 플랜",
+    "customLoRAsLabel": "나만의 LoRA 가져오기",
+    "description": "가장 적합한 플랜을 선택하세요",
+    "descriptionWorkspace": "워크스페이스에 가장 적합한 플랜을 선택하세요",
     "expiresDate": "만료일 {date}",
+    "freeTier": {
+      "description": "무료 플랜에는 Comfy Cloud를 체험할 수 있도록 매월 {credits} 크레딧이 포함되어 있습니다.",
+      "descriptionGeneric": "무료 플랜에는 Comfy Cloud를 체험할 수 있는 월간 크레딧이 포함되어 있습니다.",
+      "nextRefresh": "크레딧은 {date}에 새로 고침됩니다.",
+      "outOfCredits": {
+        "subtitle": "충전 및 추가 혜택을 위해 구독하세요",
+        "title": "무료 크레딧이 모두 소진되었습니다"
+      },
+      "subscribeCta": "더 많은 혜택 구독하기",
+      "title": "무료 플랜을 사용 중입니다",
+      "topUpBlocked": {
+        "title": "충전 및 추가 혜택 잠금 해제"
+      },
+      "upgradeCta": "플랜 보기"
+    },
+    "gpuLabel": "RTX 6000 Pro (96GB VRAM)",
+    "haveQuestions": "질문이 있거나 엔터프라이즈가 궁금하신가요?",
     "invoiceHistory": "청구서 기록",
     "learnMore": "더 알아보기",
+    "managePayment": "결제 관리",
+    "managePlan": "플랜 관리",
     "manageSubscription": "구독 관리",
+    "maxDuration": {
+      "creator": "30분",
+      "founder": "30분",
+      "free": "30분",
+      "pro": "1시간",
+      "standard": "30분"
+    },
+    "maxDurationLabel": "각 워크플로우 실행 최대 시간",
+    "maxMembersLabel": "최대 멤버 수",
+    "member": "멤버",
+    "memberCount": "{count}명 멤버",
+    "membersLabel": "{count}명까지 멤버",
     "messageSupport": "고객 지원 문의",
+    "monthly": "월간",
     "monthlyBonusDescription": "월간 크레딧 보너스",
+    "monthlyCreditsInfo": "이 크레딧은 매월 갱신되며 이월되지 않습니다",
+    "monthlyCreditsLabel": "월간 크레딧",
+    "monthlyCreditsPerMemberLabel": "월별 크레딧 / 멤버",
     "monthlyCreditsRollover": "이 크레딧은 다음 달로 이월됩니다",
+    "mostPopular": "가장 인기 있음",
     "nextBillingCycle": "다음 결제 주기",
+    "nextMonthInvoice": "다음 달 청구서",
     "partnerNodesBalance": "\"파트너 노드\" 크레딧 잔액",
     "partnerNodesCredits": "파트너 노드 크레딧",
     "partnerNodesDescription": "상용/독점 모델 실행용",
     "perMonth": "USD / 월",
+    "plansAndPricing": "플랜 및 가격",
     "prepaidCreditsInfo": "별도 구매하여 만료되지 않는 크레딧",
     "prepaidDescription": "선불 크레딧",
+    "preview": {
+      "addCreditCard": "신용카드 추가",
+      "backToAllPlans": "모든 플랜으로 돌아가기",
+      "confirm": "확인",
+      "confirmPayment": "결제 확인",
+      "confirmPlanChange": "플랜 변경 확인",
+      "eachMonthCreditsRefill": "매월 크레딧이 다시 충전됩니다",
+      "ends": "{date}에 종료",
+      "hideFeatures": "기능 숨기기",
+      "nextPaymentDue": "다음 결제일: {date}. 언제든지 취소할 수 있습니다.",
+      "perMember": "/ 멤버",
+      "privacyPolicy": "개인정보 처리방침",
+      "proratedCharge": "{plan}에 대한 일할 청구",
+      "proratedRefund": "{plan}에 대한 일할 환불",
+      "showMoreFeatures": "더 많은 기능 보기",
+      "starting": "{date}부터 시작",
+      "startingToday": "오늘부터 시작",
+      "terms": "이용약관",
+      "termsAgreement": "계속 진행하면 Comfy Org의 {terms} 및 {privacy}에 동의하게 됩니다.",
+      "totalDueToday": "오늘 결제 금액 합계"
+    },
     "renewsDate": "{date}에 갱신됨",
     "required": {
+      "pollingFailed": "구독 활성화에 실패했습니다",
+      "pollingSuccess": "구독이 성공적으로 활성화되었습니다!",
+      "pollingTimeout": "구독 대기 시간이 초과되었습니다. 새로고침 후 다시 시도하세요.",
       "subscribe": "구독",
       "title": "구독하기",
       "waitingForSubscription": "새 탭에서 구독을 완료해주세요. 완료되면 자동으로 감지합니다!"
     },
+    "resubscribe": "다시 구독하기",
+    "resubscribeSuccess": "구독이 성공적으로 재활성화되었습니다",
+    "resubscribeTo": "{plan} 다시 구독하기",
+    "subscribeForMore": "업그레이드",
     "subscribeNow": "지금 구독하기",
+    "subscribeTo": "{plan} 구독하기",
     "subscribeToComfyCloud": "Comfy Cloud 구독",
     "subscribeToRun": "구독",
     "subscribeToRunFull": "실행 구독",
+    "subscriptionRequiredMessage": "클라우드에서 워크플로우를 실행하려면 멤버가 구독해야 합니다",
+    "tierNameYearly": "{name} 연간",
+    "tiers": {
+      "creator": {
+        "name": "Creator"
+      },
+      "founder": {
+        "name": "Founder's Edition"
+      },
+      "free": {
+        "name": "무료"
+      },
+      "pro": {
+        "name": "Pro"
+      },
+      "standard": {
+        "name": "Standard"
+      }
+    },
     "title": "구독",
     "titleUnsubscribed": "Comfy Cloud 구독하기",
     "totalCredits": "총 크레딧",
+    "upgrade": "업그레이드",
+    "upgradePlan": "플랜 업그레이드",
+    "upgradeTo": "{plan}로 업그레이드",
+    "upgradeToAddCredits": "크레딧 추가를 위해 업그레이드하세요",
+    "usdPerMonth": "USD / 월",
+    "usdPerMonthPerMember": "USD / 월 / 멤버",
+    "videoEstimateExplanation": "이 추정치는 기본 설정(5초, 640x640, 16fps, 4단계 샘플링)을 사용한 Wan 2.2 이미지-투-비디오 템플릿을 기준으로 합니다.",
+    "videoEstimateHelp": "이 템플릿에 대한 자세한 정보",
+    "videoEstimateLabel": "Wan 2.2 이미지-투-비디오 템플릿으로 생성 가능한 5초 비디오 수",
+    "videoEstimateTryTemplate": "이 템플릿 사용해보기",
+    "videoTemplateBasedCredits": "Wan 2.2 이미지-투-비디오로 생성된 비디오",
+    "viewEnterprise": "엔터프라이즈 보기",
     "viewMoreDetails": "자세히 보기",
+    "viewMoreDetailsPlans": "플랜 및 가격에 대한 자세한 정보 보기",
     "viewUsageHistory": "사용 기록 보기",
+    "workspaceNotSubscribed": "이 워크스페이스는 구독 중이 아닙니다",
+    "yearly": "연간",
+    "yearlyCreditsLabel": "연간 총 크레딧",
+    "yearlyDiscount": "20% 할인",
     "yourPlanIncludes": "귀하의 플랜 포함 사항:"
   },
   "tabMenu": {
@@ -1751,8 +2982,14 @@
     "duplicateTab": "탭 복제",
     "removeFromBookmarks": "북마크에서 제거"
   },
+  "templateWidgets": {
+    "sort": {
+      "searchPlaceholder": "검색..."
+    }
+  },
   "templateWorkflows": {
     "activeFilters": "필터:",
+    "allTemplates": "모든 템플릿",
     "categories": "카테고리",
     "category": {
       "3D": "3D",
@@ -1779,6 +3016,7 @@
     "error": {
       "templateNotFound": "템플릿 \"{templateName}\"을(를) 찾을 수 없음"
     },
+    "licenseFilter": "라이선스",
     "loading": "템플릿 불러오는 중...",
     "loadingMore": "템플릿 더 불러오는 중...",
     "modelFilter": "모델 필터",
@@ -1795,14 +3033,19 @@
       "default": "기본값",
       "modelSizeLowToHigh": "모델 크기 (낮음에서 높음 순)",
       "newest": "최신순",
+      "popular": "인기",
       "recommended": "권장",
       "searchPlaceholder": "검색...",
       "vramLowToHigh": "VRAM 사용량 (낮음에서 높음 순)"
     },
     "sorting": "정렬 기준",
     "title": "템플릿으로 시작하기",
+    "useCaseFilter": "작업",
     "useCasesSelected": "{count}개 사용 사례"
   },
+  "templates": {
+    "logoProviderSeparator": " & "
+  },
   "toastMessages": {
     "cannotCreateSubgraph": "서브그래프를 생성할 수 없습니다",
     "couldNotDetermineFileType": "파일 유형을 결정할 수 없습니다",
@@ -1810,6 +3053,7 @@
     "emptyCanvas": "빈 캔버스",
     "errorCopyImage": "이미지 복사 오류: {error}",
     "errorLoadingModel": "모델 로딩 오류",
+    "errorOpenImage": "이미지를 여는 중 오류가 발생했습니다: {error}",
     "errorSaveSetting": "설정 {id} 저장 오류: {err}",
     "exportSuccess": "모델을 {format} 형식으로 성공적으로 내보냄",
     "failedExecutionPathResolution": "선택한 노드의 경로를 확인할 수 없음",
@@ -1829,9 +3073,23 @@
     "failedToLoadModel": "3D 모델을 로드하지 못함",
     "failedToPurchaseCredits": "크레딧 구매에 실패했습니다: {error}",
     "failedToQueue": "대기열 추가 실패",
+    "failedToSaveDraft": "워크플로우 초안 저장에 실패했습니다",
+    "failedToToggleCamera": "카메라 전환 실패",
+    "failedToToggleGrid": "그리드 전환 실패",
+    "failedToUpdateBackgroundColor": "배경색 업데이트 실패",
+    "failedToUpdateBackgroundImage": "배경 이미지 업데이트 실패",
+    "failedToUpdateBackgroundRenderMode": "배경 렌더 모드를 {mode}(으)로 업데이트 실패",
+    "failedToUpdateEdgeThreshold": "에지 임계값 업데이트 실패",
+    "failedToUpdateFOV": "시야각 업데이트 실패",
+    "failedToUpdateLightIntensity": "조명 세기 업데이트 실패",
+    "failedToUpdateMaterialMode": "머티리얼 모드 업데이트 실패",
+    "failedToUpdateUpDirection": "위쪽 방향 업데이트 실패",
+    "failedToUploadBackgroundImage": "배경 이미지 업로드 실패",
     "fileLoadError": "{fileName}에서 워크플로를 찾을 수 없습니다",
+    "fileTooLarge": "파일이 너무 큽니다({size} MB). 최대 지원 크기는 {maxSize} MB입니다.",
     "fileUploadFailed": "파일 업로드에 실패했습니다",
     "interrupted": "실행이 중단되었습니다",
+    "legacyMaskEditorDeprecated": "레거시 마스크 에디터는 더 이상 지원되지 않으며 곧 제거될 예정입니다.",
     "migrateToLitegraphReroute": "향후 버전에서는 Reroute 노드가 제거됩니다. LiteGraph 에서 자체 제공하는 경유점으로 변환하려면 클릭하세요.",
     "modelLoadedSuccessfully": "3D 모델이 성공적으로 로드됨",
     "no3dScene": "텍스처를 적용할 3D 장면이 없습니다",
@@ -1858,12 +3116,14 @@
     "selectUser": "사용자 선택"
   },
   "userSettings": {
+    "accountSettings": "계정 설정",
     "email": "이메일",
     "name": "이름",
     "notSet": "설정되지 않음",
     "provider": "로그인 방법",
     "title": "사용자 설정",
-    "updatePassword": "비밀번호 업데이트"
+    "updatePassword": "비밀번호 업데이트",
+    "workspaceSettings": "워크스페이스 설정"
   },
   "validation": {
     "descriptionRequired": "설명은 필수입니다",
@@ -1892,35 +3152,230 @@
     "updateFrontend": "프론트엔드 업데이트"
   },
   "vueNodesBanner": {
+    "desc": "– 더 유연한 워크플로우, 강력한 신규 위젯, 확장성을 위해 설계됨",
+    "title": "Nodes 2.0 소개",
     "tryItOut": "사용해 보기"
   },
   "vueNodesMigration": {
     "button": "설정 열기",
     "message": "클래식 노드 디자인을 선호하시나요?"
   },
+  "vueNodesMigrationMainMenu": {
+    "message": "메인 메뉴에서 언제든지 Nodes 2.0으로 다시 전환할 수 있습니다."
+  },
+  "vueNodesSlot": {
+    "iterative": "(반복)"
+  },
   "welcome": {
     "getStarted": "시작하기",
     "title": "ComfyUI에 오신 것을 환영합니다"
   },
   "whatsNewPopup": {
+    "later": "나중에",
     "learnMore": "자세히 알아보기",
     "noReleaseNotes": "릴리스 노트가 없습니다."
   },
+  "widgetFileUpload": {
+    "browseFiles": "파일 찾아보기",
+    "dropPrompt": "파일을 끌어다 놓거나"
+  },
   "widgets": {
+    "boolean": {
+      "false": "거짓",
+      "true": "참"
+    },
+    "node2only": "Node 2.0 전용",
     "selectModel": "모델 선택",
     "uploadSelect": {
+      "maxSelectionReached": "최대 선택 한도에 도달했습니다",
       "placeholder": "선택...",
       "placeholderAudio": "오디오 선택...",
       "placeholderImage": "이미지 선택...",
+      "placeholderMesh": "메시 선택...",
       "placeholderModel": "모델 선택...",
       "placeholderUnknown": "미디어 선택...",
       "placeholderVideo": "비디오 선택..."
+    },
+    "valueControl": {
+      "decrement": "값 감소",
+      "decrementDesc": "값에서 1을 빼거나 이전 옵션을 선택합니다",
+      "editSettings": "제어 설정 편집",
+      "fixed": "고정 값",
+      "fixedDesc": "값을 변경하지 않습니다",
+      "header": {
+        "after": "이후",
+        "before": "이전",
+        "postfix": "워크플로우 실행:",
+        "prefix": "값을 자동으로 업데이트"
+      },
+      "increment": "값 증가",
+      "incrementDesc": "값에 1을 더하거나 다음 옵션을 선택합니다",
+      "linkToGlobal": "연결 대상",
+      "linkToGlobalDesc": "글로벌 값의 제어 설정에 연결된 고유 값",
+      "linkToGlobalSeed": "글로벌 값",
+      "randomize": "값 무작위화",
+      "randomizeDesc": "각 생성 후 값을 무작위로 섞습니다"
     }
   },
   "workflowService": {
     "enterFilename": "파일 이름 입력",
+    "enterFilenamePrompt": "파일 이름을 입력하세요:",
     "exportWorkflow": "워크플로 내보내기",
-    "saveWorkflow": "워크플로 저장"
+    "saveWorkflow": "워크플로 저장",
+    "savedAsApp": "앱 워크플로우로 변환됨",
+    "savedAsWorkflow": "노드 그래프 전용 워크플로우로 변환됨"
+  },
+  "workspace": {
+    "addedToWorkspace": "{workspaceName} 워크스페이스에 추가되었습니다",
+    "inviteAccepted": "초대 수락됨",
+    "inviteFailed": "초대 수락에 실패했습니다",
+    "unsavedChanges": {
+      "message": "저장되지 않은 변경 사항이 있습니다. 변경 사항을 취소하고 워크스페이스를 전환하시겠습니까?",
+      "title": "저장되지 않은 변경 사항"
+    },
+    "viewWorkspace": "워크스페이스 보기"
+  },
+  "workspaceAuth": {
+    "errors": {
+      "accessDenied": "이 워크스페이스에 접근할 수 없습니다.",
+      "invalidFirebaseToken": "인증에 실패했습니다. 다시 로그인해 주세요.",
+      "notAuthenticated": "워크스페이스에 접근하려면 로그인해야 합니다.",
+      "tokenExchangeFailed": "워크스페이스 인증에 실패했습니다: {error}",
+      "workspaceNotFound": "워크스페이스를 찾을 수 없습니다."
+    }
+  },
+  "workspacePanel": {
+    "createWorkspaceDialog": {
+      "create": "만들기",
+      "message": "워크스페이스는 멤버들이 크레딧을 공유할 수 있게 해줍니다. 생성 후 소유자가 됩니다.",
+      "nameLabel": "워크스페이스 이름*",
+      "namePlaceholder": "워크스페이스 이름 입력",
+      "title": "새 워크스페이스 만들기"
+    },
+    "dashboard": {
+      "placeholder": "대시보드 워크스페이스 설정"
+    },
+    "deleteDialog": {
+      "message": "사용하지 않은 크레딧이나 저장되지 않은 자산이 모두 삭제됩니다. 이 작업은 되돌릴 수 없습니다.",
+      "messageWithName": "\"{name}\"을(를) 삭제하시겠습니까? 사용하지 않은 크레딧이나 저장되지 않은 자산이 모두 삭제됩니다. 이 작업은 되돌릴 수 없습니다.",
+      "title": "이 워크스페이스를 삭제하시겠습니까?"
+    },
+    "editWorkspaceDialog": {
+      "nameLabel": "워크스페이스 이름",
+      "save": "저장",
+      "title": "워크스페이스 정보 수정"
+    },
+    "invite": "초대",
+    "inviteLimitReached": "최대 50명의 멤버에 도달했습니다",
+    "inviteMember": "멤버 초대",
+    "inviteMemberDialog": {
+      "createLink": "링크 생성",
+      "linkCopied": "복사됨",
+      "linkCopyFailed": "링크 복사 실패",
+      "linkStep": {
+        "copyLink": "링크 복사",
+        "done": "완료",
+        "message": "상대방 계정이 이 이메일을 사용하는지 확인하세요.",
+        "title": "이 링크를 상대방에게 보내세요"
+      },
+      "message": "공유 가능한 초대 링크를 생성하여 상대방에게 보내세요",
+      "placeholder": "이메일을 입력하세요",
+      "title": "이 워크스페이스에 사람 초대"
+    },
+    "inviteUpsellDialog": {
+      "messageNotSubscribed": "이 워크스페이스에 팀원을 추가하려면 Creator 플랜 이상이 필요합니다. Standard 플랜은 소유자 1인만 지원합니다.",
+      "messageSingleSeat": "Standard 플랜은 워크스페이스 소유자 1인 좌석만 포함합니다. 추가 멤버를 초대하려면 Creator 플랜 이상으로 업그레이드하여 다중 좌석을 이용하세요.",
+      "titleNotSubscribed": "멤버 초대를 위해 구독이 필요합니다",
+      "titleSingleSeat": "현재 플랜은 1인 좌석만 지원합니다",
+      "upgradeToCreator": "Creator로 업그레이드",
+      "viewPlans": "플랜 보기"
+    },
+    "leaveDialog": {
+      "leave": "나가기",
+      "message": "워크스페이스 소유자에게 연락하지 않으면 다시 참여할 수 없습니다.",
+      "title": "이 워크스페이스를 나가시겠습니까?"
+    },
+    "members": {
+      "actions": {
+        "copyLink": "초대 링크 복사",
+        "removeMember": "멤버 제거",
+        "revokeInvite": "초대 취소"
+      },
+      "columns": {
+        "expiryDate": "만료 날짜",
+        "inviteDate": "초대 날짜",
+        "joinDate": "가입 날짜"
+      },
+      "createNewWorkspace": "새 워크스페이스를 만드세요.",
+      "membersCount": "{count}/50 멤버",
+      "noInvites": "대기 중인 초대 없음",
+      "noMembers": "멤버 없음",
+      "pendingInvitesCount": "{count}건의 초대 대기 중 | {count}건의 초대 대기 중",
+      "personalWorkspaceMessage": "현재 개인 워크스페이스에는 다른 멤버를 초대할 수 없습니다. 멤버를 추가하려면",
+      "tabs": {
+        "active": "활성",
+        "pendingCount": "대기 중 ({count})"
+      },
+      "upsellBannerSubscribe": "이 워크스페이스에 팀원을 초대하려면 Creator 플랜 이상을 구독하세요.",
+      "upsellBannerUpgrade": "추가 팀원을 초대하려면 Creator 플랜 이상으로 업그레이드하세요.",
+      "viewPlans": "플랜 보기"
+    },
+    "menu": {
+      "deleteWorkspace": "워크스페이스 삭제",
+      "deleteWorkspaceDisabledTooltip": "먼저 워크스페이스의 활성 구독을 취소하세요",
+      "editWorkspace": "워크스페이스 정보 수정",
+      "leaveWorkspace": "워크스페이스 나가기"
+    },
+    "removeMemberDialog": {
+      "error": "멤버 제거에 실패했습니다",
+      "message": "이 멤버는 워크스페이스에서 제거됩니다. 사용한 크레딧은 환불되지 않습니다.",
+      "remove": "멤버 제거",
+      "success": "멤버가 제거되었습니다",
+      "title": "이 멤버를 제거하시겠습니까?"
+    },
+    "revokeInviteDialog": {
+      "message": "이 멤버는 더 이상 워크스페이스에 참여할 수 없습니다. 초대 링크가 무효화됩니다.",
+      "revoke": "초대 취소",
+      "title": "이 사람의 초대를 취소하시겠습니까?"
+    },
+    "tabs": {
+      "dashboard": "대시보드",
+      "membersCount": "멤버 ({count})",
+      "planCredits": "플랜 및 크레딧"
+    },
+    "toast": {
+      "failedToCreateWorkspace": "워크스페이스 생성에 실패했습니다",
+      "failedToDeleteWorkspace": "워크스페이스 삭제에 실패했습니다",
+      "failedToFetchWorkspaces": "워크스페이스 불러오기에 실패했습니다",
+      "failedToLeaveWorkspace": "워크스페이스 나가기에 실패했습니다",
+      "failedToUpdateWorkspace": "워크스페이스 업데이트에 실패했습니다",
+      "workspaceCreated": {
+        "message": "요금제 구독, 팀원 초대, 협업을 시작하세요.",
+        "subscribe": "구독하기",
+        "title": "워크스페이스 생성됨"
+      },
+      "workspaceDeleted": {
+        "message": "워크스페이스가 영구적으로 삭제되었습니다.",
+        "title": "워크스페이스 삭제됨"
+      },
+      "workspaceLeft": {
+        "message": "워크스페이스에서 나갔습니다.",
+        "title": "워크스페이스에서 나감"
+      },
+      "workspaceUpdated": {
+        "message": "워크스페이스 정보가 저장되었습니다.",
+        "title": "워크스페이스가 업데이트되었습니다"
+      }
+    }
+  },
+  "workspaceSwitcher": {
+    "createWorkspace": "새 워크스페이스 만들기",
+    "maxWorkspacesReached": "최대 10개의 워크스페이스만 소유할 수 있습니다. 새로 만들려면 하나를 삭제하세요.",
+    "personal": "개인",
+    "roleMember": "멤버",
+    "roleOwner": "소유자",
+    "subscribe": "구독하기",
+    "switchWorkspace": "워크스페이스 전환"
   },
   "zoomControls": {
     "hideMinimap": "미니맵 숨기기",
diff --git a/src/locales/ko/nodeDefs.json b/src/locales/ko/nodeDefs.json
index 7e066dcc94..efd9954acf 100644
--- a/src/locales/ko/nodeDefs.json
+++ b/src/locales/ko/nodeDefs.json
@@ -39,6 +39,87 @@
       "sigmas": {
         "name": "시그마 배열"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "AddTextPrefix": {
+    "display_name": "텍스트 접두사 추가",
+    "inputs": {
+      "prefix": {
+        "name": "prefix",
+        "tooltip": "추가할 접두사."
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "처리할 텍스트."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "texts",
+        "tooltip": "처리된 텍스트"
+      }
+    }
+  },
+  "AddTextSuffix": {
+    "display_name": "텍스트 접미사 추가",
+    "inputs": {
+      "suffix": {
+        "name": "suffix",
+        "tooltip": "추가할 접미사."
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "처리할 텍스트."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "texts",
+        "tooltip": "처리된 텍스트"
+      }
+    }
+  },
+  "AdjustBrightness": {
+    "display_name": "밝기 조정",
+    "inputs": {
+      "factor": {
+        "name": "factor",
+        "tooltip": "밝기 계수. 1.0 = 변경 없음, <1.0 = 더 어둡게, >1.0 = 더 밝게."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "처리할 이미지."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "처리된 이미지"
+      }
+    }
+  },
+  "AdjustContrast": {
+    "display_name": "명암 조정",
+    "inputs": {
+      "factor": {
+        "name": "factor",
+        "tooltip": "명암 계수. 1.0 = 변경 없음, <1.0 = 명암 감소, >1.0 = 명암 증가."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "처리할 이미지."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "처리된 이미지"
+      }
     }
   },
   "AlignYourStepsScheduler": {
@@ -70,6 +151,11 @@
         "name": "volume",
         "tooltip": "데시벨(dB) 단위의 볼륨 조절. 0 = 변경 없음, +6 = 두 배, -6 = 절반 등"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "AudioConcat": {
@@ -86,6 +172,11 @@
         "name": "direction",
         "tooltip": "audio2를 audio1 뒤에 추가할지 앞에 추가할지 여부입니다."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "AudioEncoderEncode": {
@@ -117,6 +208,47 @@
       }
     }
   },
+  "AudioEqualizer3Band": {
+    "display_name": "오디오 이퀄라이저 (3-밴드)",
+    "inputs": {
+      "audio": {
+        "name": "오디오"
+      },
+      "high_freq": {
+        "name": "고역 컷오프 주파수",
+        "tooltip": "고역 셸프의 컷오프 주파수"
+      },
+      "high_gain_dB": {
+        "name": "고역 게인 (dB)",
+        "tooltip": "고주파수 (트레블) 게인"
+      },
+      "low_freq": {
+        "name": "저역 컷오프 주파수",
+        "tooltip": "저역 셸프의 컷오프 주파수"
+      },
+      "low_gain_dB": {
+        "name": "저역 게인 (dB)",
+        "tooltip": "저주파수 (베이스) 게인"
+      },
+      "mid_freq": {
+        "name": "중역 중심 주파수",
+        "tooltip": "중역의 중심 주파수"
+      },
+      "mid_gain_dB": {
+        "name": "중역 게인 (dB)",
+        "tooltip": "중주파수 게인"
+      },
+      "mid_q": {
+        "name": "중역 Q",
+        "tooltip": "중역의 Q 팩터 (대역폭)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "AudioMerge": {
     "description": "두 오디오 트랙의 파형을 겹쳐서 결합합니다.",
     "display_name": "오디오 병합",
@@ -131,6 +263,11 @@
         "name": "merge_method",
         "tooltip": "오디오 파형을 결합하는 데 사용되는 방법입니다."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "BasicGuider": {
@@ -142,6 +279,11 @@
       "model": {
         "name": "모델"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "BasicScheduler": {
@@ -159,6 +301,50 @@
       "steps": {
         "name": "스텝 수"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchImagesNode": {
+    "display_name": "이미지 배치",
+    "inputs": {
+      "images": {
+        "name": "images"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchLatentsNode": {
+    "display_name": "latent 배치",
+    "inputs": {
+      "latents": {
+        "name": "latents"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchMasksNode": {
+    "display_name": "마스크 배치",
+    "inputs": {
+      "masks": {
+        "name": "masks"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "BetaSamplingScheduler": {
@@ -176,6 +362,114 @@
       "steps": {
         "name": "스텝 수"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BriaImageEditNode": {
+    "description": "Bria 최신 모델을 사용하여 이미지를 편집합니다",
+    "display_name": "Bria 이미지 편집",
+    "inputs": {
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "guidance_scale": {
+        "name": "가이던스 스케일",
+        "tooltip": "값이 높을수록 프롬프트를 더 엄격하게 따릅니다."
+      },
+      "image": {
+        "name": "image"
+      },
+      "mask": {
+        "name": "마스크",
+        "tooltip": "생략하면 전체 이미지에 편집이 적용됩니다."
+      },
+      "model": {
+        "name": "model"
+      },
+      "moderation": {
+        "name": "모더레이션",
+        "tooltip": "모더레이션 설정"
+      },
+      "negative_prompt": {
+        "name": "네거티브 프롬프트"
+      },
+      "prompt": {
+        "name": "프롬프트",
+        "tooltip": "이미지 편집을 위한 지시문"
+      },
+      "seed": {
+        "name": "시드"
+      },
+      "steps": {
+        "name": "스텝"
+      },
+      "structured_prompt": {
+        "name": "구조화된 프롬프트",
+        "tooltip": "JSON 형식의 구조화된 편집 프롬프트 문자열입니다. 더 정확하고 프로그래밍적으로 제어하려면 일반 프롬프트 대신 사용하세요."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "구조화된 프롬프트",
+        "tooltip": null
+      }
+    }
+  },
+  "BriaRemoveImageBackground": {
+    "description": "Bria RMBG 2.0을 사용하여 이미지에서 배경을 제거합니다.",
+    "display_name": "Bria 이미지 배경 제거",
+    "inputs": {
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "image": {
+        "name": "image"
+      },
+      "moderation": {
+        "name": "moderation",
+        "tooltip": "모더레이션 설정"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "시드는 노드가 다시 실행될지 여부를 제어합니다. 시드와 관계없이 결과는 비결정적입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BriaRemoveVideoBackground": {
+    "description": "Bria를 사용하여 비디오에서 배경을 제거합니다.",
+    "display_name": "Bria 비디오 배경 제거",
+    "inputs": {
+      "background_color": {
+        "name": "background_color",
+        "tooltip": "출력 비디오의 배경색입니다."
+      },
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "시드는 노드가 다시 실행될지 여부를 제어합니다. 시드와 관계없이 결과는 비결정적입니다."
+      },
+      "video": {
+        "name": "video"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ByteDanceFirstLastFrameNode": {
@@ -201,6 +495,10 @@
         "name": "first_frame",
         "tooltip": "비디오에 사용될 첫 번째 프레임입니다."
       },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "이 매개변수는 seedance-1-5-pro 모델을 제외한 모든 모델에서 무시됩니다."
+      },
       "last_frame": {
         "name": "last_frame",
         "tooltip": "비디오에 사용될 마지막 프레임입니다."
@@ -231,43 +529,6 @@
       }
     }
   },
-  "ByteDanceImageEditNode": {
-    "description": "프롬프트 기반으로 ByteDance 모델을 사용하여 이미지 편집",
-    "display_name": "ByteDance 이미지 편집",
-    "inputs": {
-      "control_after_generate": {
-        "name": "생성 후 제어"
-      },
-      "guidance_scale": {
-        "name": "가이던스 스케일",
-        "tooltip": "값이 높을수록 이미지가 프롬프트를 더 밀접하게 따름"
-      },
-      "image": {
-        "name": "이미지",
-        "tooltip": "편집할 기본 이미지"
-      },
-      "model": {
-        "name": "모델"
-      },
-      "prompt": {
-        "name": "프롬프트",
-        "tooltip": "이미지 편집 지시사항"
-      },
-      "seed": {
-        "name": "시드",
-        "tooltip": "생성에 사용할 시드 값"
-      },
-      "watermark": {
-        "name": "워터마크",
-        "tooltip": "이미지에 \"AI 생성\" 워터마크를 추가할지 여부"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
   "ByteDanceImageNode": {
     "description": "프롬프트 기반으로 ByteDance 모델을 사용하여 이미지 생성",
     "display_name": "ByteDance 이미지",
@@ -377,6 +638,10 @@
         "name": "지속 시간",
         "tooltip": "출력 비디오의 지속 시간(초)입니다."
       },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "이 매개변수는 seedance-1-5-pro 모델을 제외한 모든 모델에서 무시됩니다."
+      },
       "image": {
         "name": "이미지",
         "tooltip": "비디오에 사용할 첫 번째 프레임입니다."
@@ -431,8 +696,7 @@
         "tooltip": "sequential_image_generation='auto'일 때 생성할 최대 이미지 수입니다. 총 이미지 수(입력 + 생성)는 15개를 초과할 수 없습니다."
       },
       "model": {
-        "name": "모델",
-        "tooltip": "모델 이름"
+        "name": "모델"
       },
       "prompt": {
         "name": "프롬프트",
@@ -484,6 +748,10 @@
         "name": "duration",
         "tooltip": "출력 비디오의 지속 시간(초)입니다."
       },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "이 매개변수는 seedance-1-5-pro 모델을 제외한 모든 모델에서 무시됩니다."
+      },
       "model": {
         "name": "model"
       },
@@ -525,6 +793,11 @@
       "positive": {
         "name": "긍정 조건"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "CFGNorm": {
@@ -763,6 +1036,25 @@
       }
     }
   },
+  "CLIPTextEncodeKandinsky5": {
+    "display_name": "CLIPTextEncodeKandinsky5",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "clip_l": {
+        "name": "clip_l"
+      },
+      "qwen25_7b": {
+        "name": "qwen25_7b"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "CLIPTextEncodeLumina2": {
     "description": "CLIP 모델을 사용하여 시스템 프롬프트와 사용자 프롬프트를 인코딩하여 특정 이미지를 생성하는 데 사용할 수 있는 임베딩으로 변환합니다.",
     "display_name": "CLIP 텍스트 인코딩 (Lumina2)",
@@ -953,6 +1245,29 @@
       }
     }
   },
+  "CenterCropImages": {
+    "display_name": "중앙 자르기",
+    "inputs": {
+      "height": {
+        "name": "height",
+        "tooltip": "자르기 높이."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "처리할 이미지."
+      },
+      "width": {
+        "name": "width",
+        "tooltip": "자르기 너비."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "처리된 이미지"
+      }
+    }
+  },
   "CheckpointLoader": {
     "display_name": "구성으로 체크포인트 로드 (지원 중단)",
     "inputs": {
@@ -1032,6 +1347,21 @@
       }
     }
   },
+  "ColorToRGBInt": {
+    "description": "색상을 RGB 정수 값으로 변환합니다.",
+    "display_name": "색상을 RGB 정수로 변환",
+    "inputs": {
+      "color": {
+        "name": "색상"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "rgb_정수",
+        "tooltip": null
+      }
+    }
+  },
   "CombineHooks2": {
     "display_name": "후크 결합 [2]",
     "inputs": {
@@ -1089,6 +1419,26 @@
       }
     }
   },
+  "ComfySwitchNode": {
+    "display_name": "스위치",
+    "inputs": {
+      "on_false": {
+        "name": "거짓일 때"
+      },
+      "on_true": {
+        "name": "참일 때"
+      },
+      "switch": {
+        "name": "스위치"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "출력",
+        "tooltip": null
+      }
+    }
+  },
   "ConditioningAverage": {
     "display_name": "조건 (평균)",
     "inputs": {
@@ -1323,10 +1673,12 @@
     },
     "outputs": {
       "0": {
-        "name": "긍정 조건"
+        "name": "positive",
+        "tooltip": null
       },
       "1": {
-        "name": "부정 조건"
+        "name": "negative",
+        "tooltip": null
       }
     }
   },
@@ -1385,6 +1737,10 @@
         "name": "dim",
         "tooltip": "컨텍스트 윈도우를 적용할 차원입니다."
       },
+      "freenoise": {
+        "name": "프리노이즈",
+        "tooltip": "FreeNoise 노이즈 셔플을 적용할지 여부, 윈도우 블렌딩을 향상시킵니다."
+      },
       "fuse_method": {
         "name": "fuse_method",
         "tooltip": "컨텍스트 윈도우를 융합하는 데 사용할 방법입니다."
@@ -1745,6 +2101,20 @@
       }
     }
   },
+  "CreateList": {
+    "display_name": "목록 만들기",
+    "inputs": {
+      "inputs": {
+        "name": "입력값"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "목록",
+        "tooltip": null
+      }
+    }
+  },
   "CreateVideo": {
     "description": "이미지로부터 비디오를 생성합니다.",
     "display_name": "비디오 생성",
@@ -1767,6 +2137,35 @@
       }
     }
   },
+  "CropByBBoxes": {
+    "description": "제공된 바운딩 박스를 기반으로 입력 이미지 배치에서 영역을 자르고 크기를 조정합니다.",
+    "display_name": "CropByBBoxes",
+    "inputs": {
+      "bboxes": {
+        "name": "bboxes"
+      },
+      "image": {
+        "name": "image"
+      },
+      "output_height": {
+        "name": "output_height",
+        "tooltip": "각 잘라낸 이미지의 높이로 크기가 조정됩니다."
+      },
+      "output_width": {
+        "name": "output_width",
+        "tooltip": "각 잘라낸 이미지의 너비로 크기가 조정됩니다."
+      },
+      "padding": {
+        "name": "padding",
+        "tooltip": "자르기 전에 바운딩 박스의 각 면에 추가되는 픽셀 단위의 여백입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "모든 잘라낸 이미지가 하나의 이미지 배치로 쌓입니다."
+      }
+    }
+  },
   "CropMask": {
     "display_name": "마스크 자르기",
     "inputs": {
@@ -1785,6 +2184,30 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CustomCombo": {
+    "display_name": "사용자 지정 콤보",
+    "inputs": {
+      "choice": {
+        "name": "선택"
+      },
+      "index": {},
+      "option1": {}
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "INDEX",
+        "tooltip": null
+      }
     }
   },
   "DiffControlNetLoader": {
@@ -1823,7 +2246,12 @@
     }
   },
   "DisableNoise": {
-    "display_name": "노이즈 비활성화"
+    "display_name": "노이즈 비활성화",
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
   },
   "DualCFGGuider": {
     "display_name": "이중 CFG 가이드",
@@ -1849,6 +2277,11 @@
       "style": {
         "name": "style"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "DualCLIPLoader": {
@@ -1900,6 +2333,321 @@
       }
     }
   },
+  "ElevenLabsAudioIsolation": {
+    "description": "오디오에서 배경 소음을 제거하고 보컬 또는 음성을 분리합니다.",
+    "display_name": "ElevenLabs 음성 분리",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "배경 소음 제거를 위해 처리할 오디오입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsInstantVoiceClone": {
+    "description": "오디오 샘플에서 복제된 음성을 생성합니다. 복제할 음성의 오디오 녹음 파일 1~8개를 제공합니다.",
+    "display_name": "ElevenLabs 즉시 음성 복제",
+    "inputs": {
+      "files": {
+        "name": "files",
+        "tooltip": "음성 복제를 위한 오디오 녹음 파일입니다."
+      },
+      "remove_background_noise": {
+        "name": "remove_background_noise",
+        "tooltip": "오디오 분리를 사용하여 음성 샘플에서 배경 소음을 제거합니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "voice",
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsSpeechToSpeech": {
+    "description": "원본 내용과 감정을 유지하면서 한 음성에서 다른 음성으로 변환합니다.",
+    "display_name": "ElevenLabs 음성 변환",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "변환할 소스 오디오입니다."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "음성 변환에 사용할 모델입니다."
+      },
+      "model_similarity_boost": {
+        "name": "similarity_boost"
+      },
+      "model_speed": {
+        "name": "speed"
+      },
+      "model_style": {
+        "name": "style"
+      },
+      "model_use_speaker_boost": {
+        "name": "use_speaker_boost"
+      },
+      "output_format": {
+        "name": "output_format",
+        "tooltip": "오디오 출력 형식입니다."
+      },
+      "remove_background_noise": {
+        "name": "remove_background_noise",
+        "tooltip": "오디오 분리를 사용하여 입력 오디오에서 배경 소음을 제거합니다."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "재현성을 위한 시드 값입니다."
+      },
+      "stability": {
+        "name": "stability",
+        "tooltip": "음성의 안정성입니다. 값이 낮을수록 감정의 폭이 넓고, 값이 높을수록 더 일관되지만 다소 단조로운 음성이 생성됩니다."
+      },
+      "voice": {
+        "name": "voice",
+        "tooltip": "변환할 대상 음성입니다. Voice Selector 또는 Instant Voice Clone에서 연결하세요."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsSpeechToText": {
+    "description": "오디오를 텍스트로 전사합니다. 자동 언어 감지, 화자 분리, 오디오 이벤트 태깅을 지원합니다.",
+    "display_name": "ElevenLabs 음성 → 텍스트",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "전사할 오디오."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "language_code": {
+        "name": "language_code",
+        "tooltip": "ISO-639-1 또는 ISO-639-3 언어 코드(예: 'en', 'es', 'fra'). 자동 감지를 원하면 비워 두세요."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "전사에 사용할 모델."
+      },
+      "model_diarization_threshold": {
+        "name": "diarization_threshold"
+      },
+      "model_diarize": {
+        "name": "diarize"
+      },
+      "model_tag_audio_events": {
+        "name": "tag_audio_events"
+      },
+      "model_temperature": {
+        "name": "temperature"
+      },
+      "model_timestamps_granularity": {
+        "name": "timestamps_granularity"
+      },
+      "num_speakers": {
+        "name": "num_speakers",
+        "tooltip": "예측할 최대 화자 수. 자동 감지는 0으로 설정하세요."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "재현성을 위한 시드(결정적 결과는 보장되지 않음)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "text",
+        "tooltip": null
+      },
+      "1": {
+        "name": "language_code",
+        "tooltip": null
+      },
+      "2": {
+        "name": "words_json",
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToDialogue": {
+    "description": "텍스트에서 다중 화자 대화를 생성합니다. 각 대화 항목은 고유한 텍스트와 음성을 가집니다.",
+    "display_name": "ElevenLabs 텍스트 → 대화",
+    "inputs": {
+      "apply_text_normalization": {
+        "name": "apply_text_normalization",
+        "tooltip": "텍스트 정규화 모드. 'auto'는 시스템이 결정, 'on'은 항상 정규화 적용, 'off'는 정규화 생략."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "inputs": {
+        "name": "inputs",
+        "tooltip": "대화 항목 수."
+      },
+      "inputs_text1": {
+        "name": "text1"
+      },
+      "language_code": {
+        "name": "language_code",
+        "tooltip": "ISO-639-1 또는 ISO-639-3 언어 코드(예: 'en', 'es', 'fra'). 자동 감지를 원하면 비워 두세요."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "대화 생성을 위한 모델."
+      },
+      "output_format": {
+        "name": "output_format",
+        "tooltip": "오디오 출력 형식."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "재현성을 위한 시드."
+      },
+      "stability": {
+        "name": "stability",
+        "tooltip": "음성 안정성. 값이 낮을수록 감정 표현이 다양해지고, 값이 높을수록 일관성은 높지만 단조로울 수 있습니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToSoundEffects": {
+    "description": "텍스트 설명에서 효과음을 생성합니다.",
+    "display_name": "ElevenLabs 텍스트 → 효과음",
+    "inputs": {
+      "model": {
+        "name": "model",
+        "tooltip": "효과음 생성을 위한 모델."
+      },
+      "model_duration": {
+        "name": "duration"
+      },
+      "model_loop": {
+        "name": "loop"
+      },
+      "model_prompt_influence": {
+        "name": "prompt_influence"
+      },
+      "output_format": {
+        "name": "output_format",
+        "tooltip": "오디오 출력 형식."
+      },
+      "text": {
+        "name": "text",
+        "tooltip": "생성할 효과음에 대한 텍스트 설명."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToSpeech": {
+    "description": "텍스트를 음성으로 변환합니다.",
+    "display_name": "ElevenLabs 텍스트 음성 변환",
+    "inputs": {
+      "apply_text_normalization": {
+        "name": "apply_text_normalization",
+        "tooltip": "텍스트 정규화 모드입니다. 'auto'는 시스템이 자동으로 결정하고, 'on'은 항상 정규화를 적용하며, 'off'는 정규화를 건너뜁니다."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "language_code": {
+        "name": "language_code",
+        "tooltip": "ISO-639-1 또는 ISO-639-3 언어 코드(예: 'en', 'es', 'fra'). 자동 감지를 원하면 비워 두세요."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "텍스트 음성 변환에 사용할 모델입니다."
+      },
+      "model_similarity_boost": {
+        "name": "similarity_boost"
+      },
+      "model_speed": {
+        "name": "speed"
+      },
+      "model_style": {
+        "name": "style"
+      },
+      "model_use_speaker_boost": {
+        "name": "use_speaker_boost"
+      },
+      "output_format": {
+        "name": "output_format",
+        "tooltip": "오디오 출력 형식입니다."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "재현성을 위한 시드(결정적 결과는 보장되지 않음)."
+      },
+      "stability": {
+        "name": "stability",
+        "tooltip": "음성의 안정성입니다. 값이 낮을수록 감정의 폭이 넓고, 값이 높을수록 더 일관되지만 다소 단조로운 음성이 생성됩니다."
+      },
+      "text": {
+        "name": "text",
+        "tooltip": "음성으로 변환할 텍스트입니다."
+      },
+      "voice": {
+        "name": "voice",
+        "tooltip": "음성 합성에 사용할 목소리입니다. Voice Selector 또는 Instant Voice Clone에서 연결하세요."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsVoiceSelector": {
+    "description": "텍스트 음성 변환 생성을 위한 사전 정의된 ElevenLabs 음성을 선택합니다.",
+    "display_name": "ElevenLabs 음성 선택기",
+    "inputs": {
+      "voice": {
+        "name": "voice",
+        "tooltip": "사전 정의된 ElevenLabs 음성 중에서 선택하세요."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "voice",
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyAceStep1_5LatentAudio": {
+    "display_name": "Empty Ace Step 1.5 Latent Audio",
+    "inputs": {
+      "batch_size": {
+        "name": "배치 크기",
+        "tooltip": "배치 내 latent 이미지의 수입니다."
+      },
+      "seconds": {
+        "name": "초"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyAceStepLatentAudio": {
     "display_name": "EmptyAceStepLatentAudio",
     "inputs": {
@@ -1932,6 +2680,11 @@
         "name": "샘플링 레이트",
         "tooltip": "빈 오디오 클립의 샘플링 레이트입니다."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "EmptyChromaRadianceLatentImage": {
@@ -1975,6 +2728,25 @@
       }
     }
   },
+  "EmptyFlux2LatentImage": {
+    "display_name": "Empty Flux 2 Latent",
+    "inputs": {
+      "batch_size": {
+        "name": "배치 크기"
+      },
+      "height": {
+        "name": "높이"
+      },
+      "width": {
+        "name": "너비"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyHunyuanImageLatent": {
     "display_name": "빈 훈위안 이미지 잠재",
     "inputs": {
@@ -2016,6 +2788,28 @@
       }
     }
   },
+  "EmptyHunyuanVideo15Latent": {
+    "display_name": "Empty HunyuanVideo 1.5 Latent",
+    "inputs": {
+      "batch_size": {
+        "name": "배치 크기"
+      },
+      "height": {
+        "name": "높이"
+      },
+      "length": {
+        "name": "길이"
+      },
+      "width": {
+        "name": "너비"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyImage": {
     "display_name": "빈 이미지",
     "inputs": {
@@ -2065,6 +2859,11 @@
       "seconds": {
         "name": "초"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "EmptyLatentHunyuan3Dv2": {
@@ -2077,6 +2876,11 @@
       "resolution": {
         "name": "해상도"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "EmptyLatentImage": {
@@ -2124,6 +2928,28 @@
       }
     }
   },
+  "EmptyQwenImageLayeredLatentImage": {
+    "display_name": "Empty Qwen Image Layered Latent",
+    "inputs": {
+      "batch_size": {
+        "name": "배치 크기"
+      },
+      "height": {
+        "name": "높이"
+      },
+      "layers": {
+        "name": "레이어"
+      },
+      "width": {
+        "name": "너비"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptySD3LatentImage": {
     "display_name": "빈 잠재 이미지 (SD3)",
     "inputs": {
@@ -2171,6 +2997,11 @@
       "steps": {
         "name": "스텝 수"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ExtendIntermediateSigmas": {
@@ -2191,6 +3022,11 @@
       "steps": {
         "name": "스텝 수"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FeatherMask": {
@@ -2211,6 +3047,11 @@
       "top": {
         "name": "위쪽"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FlipSigmas": {
@@ -2219,6 +3060,102 @@
       "sigmas": {
         "name": "시그마 배열"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Flux2MaxImageNode": {
+    "description": "프롬프트와 해상도에 따라 이미지를 동기적으로 생성합니다.",
+    "display_name": "Flux.2 [max] 이미지",
+    "inputs": {
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "height": {
+        "name": "높이"
+      },
+      "images": {
+        "name": "이미지",
+        "tooltip": "참조용으로 최대 9개의 이미지를 사용할 수 있습니다."
+      },
+      "prompt": {
+        "name": "프롬프트",
+        "tooltip": "이미지 생성 또는 편집을 위한 프롬프트"
+      },
+      "prompt_upsampling": {
+        "name": "프롬프트 업샘플링",
+        "tooltip": "프롬프트에 업샘플링을 수행할지 여부입니다. 활성화 시, 더 창의적인 생성을 위해 프롬프트가 자동으로 수정됩니다."
+      },
+      "seed": {
+        "name": "시드",
+        "tooltip": "노이즈 생성을 위한 랜덤 시드입니다."
+      },
+      "width": {
+        "name": "너비"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Flux2ProImageNode": {
+    "description": "프롬프트와 해상도에 따라 이미지를 동기적으로 생성합니다.",
+    "display_name": "Flux.2 [pro] 이미지",
+    "inputs": {
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "height": {
+        "name": "높이"
+      },
+      "images": {
+        "name": "이미지",
+        "tooltip": "참조용으로 최대 9개의 이미지를 사용할 수 있습니다."
+      },
+      "prompt": {
+        "name": "프롬프트",
+        "tooltip": "이미지 생성 또는 편집을 위한 프롬프트"
+      },
+      "prompt_upsampling": {
+        "name": "프롬프트 업샘플링",
+        "tooltip": "프롬프트에 업샘플링을 수행할지 여부입니다. 활성화 시, 더 창의적인 생성을 위해 프롬프트가 자동으로 수정됩니다."
+      },
+      "seed": {
+        "name": "시드",
+        "tooltip": "노이즈 생성을 위한 랜덤 시드입니다."
+      },
+      "width": {
+        "name": "너비"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Flux2Scheduler": {
+    "display_name": "Flux2Scheduler",
+    "inputs": {
+      "height": {
+        "name": "높이"
+      },
+      "steps": {
+        "name": "스텝"
+      },
+      "width": {
+        "name": "너비"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FluxDisableGuidance": {
@@ -2541,6 +3478,11 @@
       "s2": {
         "name": "s2"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FreeU_V2": {
@@ -2561,6 +3503,11 @@
       "s2": {
         "name": "s2"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "GITSScheduler": {
@@ -2619,6 +3566,102 @@
       }
     }
   },
+  "GLSLShader": {
+    "description": "GLSL ES 프래그먼트 셰이더를 이미지에 적용합니다. u_resolution(vec2)은 항상 사용 가능합니다.",
+    "display_name": "GLSL 셰이더",
+    "inputs": {
+      "floats": {
+        "name": "floats",
+        "tooltip": "floats는 셰이더 코드에서 u_float0-4로 사용 가능합니다."
+      },
+      "fragment_shader": {
+        "name": "fragment_shader",
+        "tooltip": "GLSL 프래그먼트 셰이더 소스 코드(GLSL ES 3.00 / WebGL 2.0 호환)"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "이미지는 셰이더 코드에서 u_image0-4(sampler2D)로 사용 가능합니다."
+      },
+      "ints": {
+        "name": "ints",
+        "tooltip": "ints는 셰이더 코드에서 u_int0-4로 사용 가능합니다."
+      },
+      "size_mode": {
+        "name": "size_mode",
+        "tooltip": "출력 크기: 'from_input'은 첫 번째 입력 이미지의 크기를 사용하며, 'custom'은 수동 크기 설정을 허용합니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "IMAGE0",
+        "tooltip": "셰이더 코드에서 layout(location = 0) out vec4 fragColor0로 사용 가능합니다."
+      },
+      "1": {
+        "name": "IMAGE1",
+        "tooltip": "셰이더 코드에서 layout(location = 1) out vec4 fragColor1로 사용 가능합니다."
+      },
+      "2": {
+        "name": "IMAGE2",
+        "tooltip": "셰이더 코드에서 layout(location = 2) out vec4 fragColor2로 사용 가능합니다."
+      },
+      "3": {
+        "name": "IMAGE3",
+        "tooltip": "셰이더 코드에서 layout(location = 3) out vec4 fragColor3로 사용 가능합니다."
+      }
+    }
+  },
+  "GeminiImage2Node": {
+    "description": "Google Vertex API를 통해 동기적으로 이미지를 생성하거나 편집합니다.",
+    "display_name": "Nano Banana Pro (Google Gemini Image)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "종횡비",
+        "tooltip": "'auto'로 설정하면 입력 이미지의 종횡비와 일치합니다. 이미지가 없으면 일반적으로 16:9 정사각형이 생성됩니다."
+      },
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "files": {
+        "name": "파일",
+        "tooltip": "모델의 컨텍스트로 사용할 선택적 파일(들)입니다. Gemini Generate Content Input Files 노드의 입력을 허용합니다."
+      },
+      "images": {
+        "name": "이미지",
+        "tooltip": "선택적 참조 이미지(들)입니다. 여러 이미지를 포함하려면 Batch Images 노드를 사용하세요(최대 14개)."
+      },
+      "model": {
+        "name": "모델"
+      },
+      "prompt": {
+        "name": "프롬프트",
+        "tooltip": "생성할 이미지 또는 적용할 편집을 설명하는 텍스트 프롬프트입니다. 모델이 따라야 할 제약, 스타일, 세부사항을 포함하세요."
+      },
+      "resolution": {
+        "name": "해상도",
+        "tooltip": "목표 출력 해상도입니다. 2K/4K의 경우 Gemini 고유 업스케일러가 사용됩니다."
+      },
+      "response_modalities": {
+        "name": "응답 형식",
+        "tooltip": "'IMAGE'를 선택하면 이미지만 출력되고, 'IMAGE+TEXT'를 선택하면 생성된 이미지와 텍스트 응답이 모두 반환됩니다."
+      },
+      "seed": {
+        "name": "시드",
+        "tooltip": "시드를 특정 값으로 고정하면, 모델은 반복 요청에 대해 동일한 응답을 제공하려고 시도합니다. 결정적 결과는 보장되지 않습니다. 또한, 모델이나 파라미터(예: temperature)를 변경하면 같은 시드여도 결과가 달라질 수 있습니다. 기본적으로 무작위 시드가 사용됩니다."
+      },
+      "system_prompt": {
+        "name": "시스템 프롬프트",
+        "tooltip": "AI의 동작을 지시하는 기본 지침입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "GeminiImageNode": {
     "description": "Google API를 통해 이미지를 동기적으로 편집합니다.",
     "display_name": "Google Gemini 이미지",
@@ -2646,9 +3689,17 @@
         "name": "prompt",
         "tooltip": "생성을 위한 텍스트 프롬프트"
       },
+      "response_modalities": {
+        "name": "응답 형식",
+        "tooltip": "'IMAGE'를 선택하면 이미지만 출력되고, 'IMAGE+TEXT'를 선택하면 생성된 이미지와 텍스트 응답이 모두 반환됩니다."
+      },
       "seed": {
         "name": "seed",
         "tooltip": "시드가 특정 값으로 고정되면, 모델은 반복 요청에 대해 동일한 응답을 제공하기 위해 최선을 다합니다. 결정론적 출력은 보장되지 않습니다. 또한 모델이나 온도와 같은 매개변수 설정을 변경하면 동일한 시드 값을 사용하더라도 응답에 변동이 발생할 수 있습니다. 기본적으로 랜덤 시드 값이 사용됩니다."
+      },
+      "system_prompt": {
+        "name": "시스템 프롬프트",
+        "tooltip": "AI의 동작을 지시하는 기본 지침입니다."
       }
     },
     "outputs": {
@@ -2679,6 +3730,60 @@
       }
     }
   },
+  "GeminiNanoBanana2": {
+    "description": "Google Vertex API를 통해 이미지를 동기적으로 생성하거나 편집합니다.",
+    "display_name": "Nano Banana 2",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "종횡비",
+        "tooltip": "'auto'로 설정하면 입력 이미지의 종횡비와 일치합니다. 이미지가 제공되지 않으면 일반적으로 16:9 정사각형이 생성됩니다."
+      },
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "files": {
+        "name": "파일",
+        "tooltip": "모델의 컨텍스트로 사용할 선택적 파일(들)입니다. Gemini Generate Content Input Files 노드에서 입력을 받을 수 있습니다."
+      },
+      "images": {
+        "name": "이미지",
+        "tooltip": "선택적 참조 이미지(들)입니다. 여러 이미지를 포함하려면 Batch Images 노드를 사용하세요(최대 14개)."
+      },
+      "model": {
+        "name": "모델"
+      },
+      "prompt": {
+        "name": "프롬프트",
+        "tooltip": "생성할 이미지 또는 적용할 편집을 설명하는 텍스트 프롬프트입니다. 모델이 따라야 할 제약 조건, 스타일 또는 세부 정보를 포함하세요."
+      },
+      "resolution": {
+        "name": "해상도",
+        "tooltip": "목표 출력 해상도입니다. 2K/4K의 경우 Gemini 기본 업스케일러가 사용됩니다."
+      },
+      "response_modalities": {
+        "name": "응답 모달리티"
+      },
+      "seed": {
+        "name": "시드",
+        "tooltip": "시드를 특정 값으로 고정하면, 모델은 반복 요청에 대해 동일한 응답을 제공하려고 최선을 다합니다. 결정적 결과는 보장되지 않습니다. 또한, 모델이나 파라미터 설정(예: temperature)을 변경하면 동일한 시드 값을 사용해도 응답이 달라질 수 있습니다. 기본적으로 무작위 시드 값이 사용됩니다."
+      },
+      "system_prompt": {
+        "name": "시스템 프롬프트",
+        "tooltip": "AI의 동작을 지시하는 기본 지침입니다."
+      },
+      "thinking_level": {
+        "name": "사고 수준"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "GeminiNode": {
     "description": "Google의 Gemini AI 모델로 텍스트 응답을 생성합니다. 더 관련성 있고 의미 있는 응답을 생성하기 위해 컨텍스트로 여러 유형의 입력(텍스트, 이미지, 오디오, 비디오)을 제공할 수 있습니다.",
     "display_name": "Google Gemini",
@@ -2710,6 +3815,10 @@
         "name": "seed",
         "tooltip": "시드가 특정 값으로 고정되면, 모델은 반복 요청에 대해 동일한 응답을 제공하기 위해 최선을 다합니다. 결정론적 출력은 보장되지 않습니다. 또한 모델이나 온도와 같은 매개변수 설정을 변경하면 동일한 시드 값을 사용하더라도 응답에 변동이 발생할 수 있습니다. 기본적으로 랜덤 시드 값이 사용됩니다."
       },
+      "system_prompt": {
+        "name": "시스템 프롬프트",
+        "tooltip": "AI의 동작을 지시하는 기본 지침입니다."
+      },
       "video": {
         "name": "비디오",
         "tooltip": "모델의 컨텍스트로 사용할 선택적 비디오입니다."
@@ -2721,6 +3830,72 @@
       }
     }
   },
+  "GenerateTracks": {
+    "display_name": "GenerateTracks",
+    "inputs": {
+      "bezier": {
+        "name": "bezier",
+        "tooltip": "중간점을 제어점으로 사용하여 베지어 곡선 경로를 활성화합니다."
+      },
+      "end_x": {
+        "name": "end_x",
+        "tooltip": "종료 위치의 정규화된 X 좌표 (0-1)."
+      },
+      "end_y": {
+        "name": "end_y",
+        "tooltip": "종료 위치의 정규화된 Y 좌표 (0-1)."
+      },
+      "height": {
+        "name": "height"
+      },
+      "interpolation": {
+        "name": "interpolation",
+        "tooltip": "경로를 따라 움직임의 타이밍/속도를 제어합니다."
+      },
+      "mid_x": {
+        "name": "mid_x",
+        "tooltip": "베지어 곡선의 정규화된 X 제어점. 'bezier'가 활성화된 경우에만 사용됩니다."
+      },
+      "mid_y": {
+        "name": "mid_y",
+        "tooltip": "베지어 곡선의 정규화된 Y 제어점. 'bezier'가 활성화된 경우에만 사용됩니다."
+      },
+      "num_frames": {
+        "name": "num_frames"
+      },
+      "num_tracks": {
+        "name": "num_tracks"
+      },
+      "start_x": {
+        "name": "start_x",
+        "tooltip": "시작 위치의 정규화된 X 좌표 (0-1)."
+      },
+      "start_y": {
+        "name": "start_y",
+        "tooltip": "시작 위치의 정규화된 Y 좌표 (0-1)."
+      },
+      "track_mask": {
+        "name": "track_mask",
+        "tooltip": "보이는 프레임을 표시하는 선택적 mask입니다."
+      },
+      "track_spread": {
+        "name": "track_spread",
+        "tooltip": "트랙 간의 정규화된 거리. 트랙은 이동 방향에 수직으로 퍼집니다."
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "track_length",
+        "tooltip": null
+      }
+    }
+  },
   "GetImageSize": {
     "description": "이미지의 너비와 높이를 반환하고 변경 없이 전달합니다.",
     "display_name": "이미지 크기 가져오기",
@@ -2731,13 +3906,16 @@
     },
     "outputs": {
       "0": {
-        "name": "너비"
+        "name": "width",
+        "tooltip": null
       },
       "1": {
-        "name": "높이"
+        "name": "height",
+        "tooltip": null
       },
       "2": {
-        "name": "배치 크기"
+        "name": "batch_size",
+        "tooltip": null
       }
     }
   },
@@ -2765,6 +3943,149 @@
       }
     }
   },
+  "GrokImageEditNode": {
+    "description": "텍스트 프롬프트를 기반으로 기존 이미지를 수정합니다",
+    "display_name": "Grok 이미지 편집",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "종횡비",
+        "tooltip": "여러 이미지가 이미지 입력에 연결된 경우에만 허용됩니다."
+      },
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "number_of_images": {
+        "name": "이미지 개수",
+        "tooltip": "생성할 편집된 이미지의 수"
+      },
+      "prompt": {
+        "name": "프롬프트",
+        "tooltip": "이미지 생성을 위해 사용되는 텍스트 프롬프트"
+      },
+      "resolution": {
+        "name": "해상도"
+      },
+      "seed": {
+        "name": "시드",
+        "tooltip": "노드가 다시 실행되어야 하는지 결정하는 시드입니다. 실제 결과는 시드와 관계없이 비결정적입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokImageNode": {
+    "description": "텍스트 프롬프트를 기반으로 Grok을 사용해 이미지를 생성합니다",
+    "display_name": "Grok 이미지",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "종횡비"
+      },
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "model": {
+        "name": "model"
+      },
+      "number_of_images": {
+        "name": "이미지 개수",
+        "tooltip": "생성할 이미지의 수"
+      },
+      "prompt": {
+        "name": "프롬프트",
+        "tooltip": "이미지 생성을 위해 사용되는 텍스트 프롬프트"
+      },
+      "resolution": {
+        "name": "해상도"
+      },
+      "seed": {
+        "name": "시드",
+        "tooltip": "노드가 다시 실행되어야 하는지 결정하는 시드입니다. 실제 결과는 시드와 관계없이 비결정적입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokVideoEditNode": {
+    "description": "텍스트 프롬프트를 기반으로 기존 비디오를 편집합니다.",
+    "display_name": "Grok 비디오 편집",
+    "inputs": {
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "프롬프트",
+        "tooltip": "원하는 비디오에 대한 텍스트 설명입니다."
+      },
+      "seed": {
+        "name": "시드",
+        "tooltip": "노드가 다시 실행되어야 하는지 결정하는 시드입니다. 실제 결과는 시드와 관계없이 비결정적입니다."
+      },
+      "video": {
+        "name": "비디오",
+        "tooltip": "최대 지원 길이는 8.7초, 파일 크기는 50MB입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokVideoNode": {
+    "description": "프롬프트 또는 이미지를 통해 비디오를 생성합니다",
+    "display_name": "Grok 비디오",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "종횡비",
+        "tooltip": "출력 비디오의 종횡비입니다."
+      },
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "duration": {
+        "name": "길이",
+        "tooltip": "출력 비디오의 길이(초)입니다."
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "프롬프트",
+        "tooltip": "원하는 비디오에 대한 텍스트 설명입니다."
+      },
+      "resolution": {
+        "name": "해상도",
+        "tooltip": "출력 비디오의 해상도입니다."
+      },
+      "seed": {
+        "name": "시드",
+        "tooltip": "노드가 다시 실행되어야 하는지 결정하는 시드입니다. 실제 결과는 시드와 관계없이 비결정적입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "GrowMask": {
     "display_name": "마스크 확장",
     "inputs": {
@@ -2777,6 +4098,55 @@
       "tapered_corners": {
         "name": "마름모 모서리"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HitPawGeneralImageEnhance": {
+    "description": "저해상도 이미지를 초고해상도로 업스케일하고, 아티팩트와 노이즈를 제거합니다. 최대 출력: 32 메가픽셀.",
+    "display_name": "HitPaw 일반 이미지 향상",
+    "inputs": {
+      "auto_downscale": {
+        "name": "자동 다운스케일",
+        "tooltip": "출력 이미지가 제한을 초과할 경우 입력 이미지를 자동으로 다운스케일합니다."
+      },
+      "image": {
+        "name": "이미지"
+      },
+      "model": {
+        "name": "모델"
+      },
+      "upscale_factor": {
+        "name": "업스케일 배수"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HitPawVideoEnhance": {
+    "description": "저해상도 비디오를 고해상도로 업스케일하고, 아티팩트와 노이즈를 제거합니다. 가격은 비디오 1초당 기준입니다.",
+    "display_name": "HitPaw 비디오 향상",
+    "inputs": {
+      "model": {
+        "name": "모델"
+      },
+      "model_resolution": {
+        "name": "해상도"
+      },
+      "video": {
+        "name": "비디오"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "Hunyuan3Dv2Conditioning": {
@@ -2788,10 +4158,12 @@
     },
     "outputs": {
       "0": {
-        "name": "긍정 조건"
+        "name": "positive",
+        "tooltip": null
       },
       "1": {
-        "name": "부정 조건"
+        "name": "negative",
+        "tooltip": null
       }
     }
   },
@@ -2813,10 +4185,12 @@
     },
     "outputs": {
       "0": {
-        "name": "긍정 조건"
+        "name": "positive",
+        "tooltip": null
       },
       "1": {
-        "name": "부정 조건"
+        "name": "negative",
+        "tooltip": null
       }
     }
   },
@@ -2890,6 +4264,120 @@
       }
     }
   },
+  "HunyuanVideo15ImageToVideo": {
+    "display_name": "HunyuanVideo15ImageToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "start_image": {
+        "name": "start_image"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "HunyuanVideo15LatentUpscaleWithModel": {
+    "display_name": "Hunyuan Video 15 Latent Upscale With Model",
+    "inputs": {
+      "crop": {
+        "name": "crop"
+      },
+      "height": {
+        "name": "height"
+      },
+      "model": {
+        "name": "model"
+      },
+      "samples": {
+        "name": "samples"
+      },
+      "upscale_method": {
+        "name": "upscale_method"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HunyuanVideo15SuperResolution": {
+    "display_name": "HunyuanVideo15SuperResolution",
+    "inputs": {
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "latent": {
+        "name": "latent"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "noise_augmentation": {
+        "name": "노이즈 증강"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "start_image": {
+        "name": "시작 이미지"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
   "HyperTile": {
     "display_name": "하이퍼 타일",
     "inputs": {
@@ -3094,6 +4582,11 @@
       "strength": {
         "name": "강도"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageBatch": {
@@ -3157,6 +4650,26 @@
       "image": {
         "name": "이미지"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageCompare": {
+    "description": "두 이미지를 슬라이더로 나란히 비교합니다.",
+    "display_name": "이미지 비교",
+    "inputs": {
+      "compare_view": {
+        "name": "compare_view"
+      },
+      "image_a": {
+        "name": "image_a"
+      },
+      "image_b": {
+        "name": "image_b"
+      }
     }
   },
   "ImageCompositeMasked": {
@@ -3180,6 +4693,11 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageCrop": {
@@ -3200,6 +4718,50 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageCropV2": {
+    "display_name": "이미지 자르기",
+    "inputs": {
+      "crop_region": {
+        "name": "자르기 영역"
+      },
+      "height": {},
+      "image": {
+        "name": "이미지"
+      },
+      "width": {},
+      "x": {},
+      "y": {}
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageDeduplication": {
+    "display_name": "이미지 중복 제거",
+    "inputs": {
+      "images": {
+        "name": "이미지",
+        "tooltip": "처리할 이미지 목록입니다."
+      },
+      "similarity_threshold": {
+        "name": "유사도 임계값",
+        "tooltip": "유사도 임계값 (0-1). 값이 높을수록 더 유사합니다. 이 임계값을 초과하는 이미지는 중복으로 간주됩니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "이미지",
+        "tooltip": "처리된 이미지"
+      }
     }
   },
   "ImageFlip": {
@@ -3211,6 +4773,11 @@
       "image": {
         "name": "이미지"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageFromBatch": {
@@ -3225,6 +4792,42 @@
       "length": {
         "name": "길이"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageGrid": {
+    "display_name": "이미지 그리드",
+    "inputs": {
+      "cell_height": {
+        "name": "셀 높이",
+        "tooltip": "그리드 내 각 셀의 높이입니다."
+      },
+      "cell_width": {
+        "name": "셀 너비",
+        "tooltip": "그리드 내 각 셀의 너비입니다."
+      },
+      "columns": {
+        "name": "열",
+        "tooltip": "그리드의 열 개수입니다."
+      },
+      "images": {
+        "name": "이미지",
+        "tooltip": "처리할 이미지 목록입니다."
+      },
+      "padding": {
+        "name": "패딩",
+        "tooltip": "이미지 간의 간격입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "이미지",
+        "tooltip": "처리된 이미지"
+      }
     }
   },
   "ImageInvert": {
@@ -3235,6 +4838,28 @@
       }
     }
   },
+  "ImageMergeTileList": {
+    "display_name": "타일 목록을 이미지로 병합",
+    "inputs": {
+      "final_height": {
+        "name": "final_height"
+      },
+      "final_width": {
+        "name": "final_width"
+      },
+      "image_list": {
+        "name": "image_list"
+      },
+      "overlap": {
+        "name": "overlap"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ImageOnlyCheckpointLoader": {
     "display_name": "이미지 전용 체크포인트 로드 (img2vid 모델)",
     "inputs": {
@@ -3333,6 +4958,11 @@
       "rotation": {
         "name": "회전"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageScale": {
@@ -3381,6 +5011,11 @@
       "upscale_method": {
         "name": "업스케일 방법"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageScaleToTotalPixels": {
@@ -3392,6 +5027,9 @@
       "megapixels": {
         "name": "메가픽셀수"
       },
+      "resolution_steps": {
+        "name": "해상도 단계"
+      },
       "upscale_method": {
         "name": "확대 방법"
       }
@@ -3446,6 +5084,11 @@
       "spacing_width": {
         "name": "간격 너비"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageToMask": {
@@ -3457,6 +5100,11 @@
       "image": {
         "name": "이미지"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageUpscaleWithModel": {
@@ -3566,6 +5214,29 @@
       "mask": {
         "name": "마스크"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "JoinAudioChannels": {
+    "description": "좌우 모노 오디오 채널을 스테레오 오디오로 합칩니다.",
+    "display_name": "오디오 채널 합치기",
+    "inputs": {
+      "audio_left": {
+        "name": "audio_left"
+      },
+      "audio_right": {
+        "name": "audio_right"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "audio",
+        "tooltip": null
+      }
     }
   },
   "JoinImageWithAlpha": {
@@ -3691,6 +5362,58 @@
       "sampler_name": {
         "name": "샘플러 이름"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Kandinsky5ImageToVideo": {
+    "display_name": "Kandinsky5ImageToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "배치 크기"
+      },
+      "height": {
+        "name": "높이"
+      },
+      "length": {
+        "name": "길이"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "start_image": {
+        "name": "시작 이미지"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "너비"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": "비어 있는 비디오 latent"
+      },
+      "3": {
+        "name": "cond_latent",
+        "tooltip": "노이즈가 제거된 인코딩된 시작 이미지로, 모델 출력 latent의 노이즈 시작 부분을 대체하는 데 사용됩니다"
+      }
     }
   },
   "KarrasScheduler": {
@@ -3708,6 +5431,44 @@
       "steps": {
         "name": "스텝 수"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingAvatarNode": {
+    "description": "한 장의 사진과 오디오 파일로 방송 스타일의 디지털 휴먼 영상을 생성합니다.",
+    "display_name": "Kling Avatar 2.0",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "아바타 참조 이미지입니다. 너비와 높이는 최소 300px이어야 합니다. 가로세로 비율은 1:2.5에서 2.5:1 사이여야 합니다."
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "아바타의 동작, 감정, 카메라 움직임을 정의하는 선택적 프롬프트입니다."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "시드는 노드가 다시 실행될지 여부를 제어합니다. 시드와 관계없이 결과는 비결정적입니다."
+      },
+      "sound_file": {
+        "name": "sound_file",
+        "tooltip": "오디오 입력입니다. 길이는 2초에서 300초 사이여야 합니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "KlingCameraControlI2VNode": {
@@ -3862,6 +5623,46 @@
       }
     }
   },
+  "KlingFirstLastFrameNode": {
+    "description": "Kling V3를 사용하여 첫 프레임과 마지막 프레임으로 비디오를 생성합니다.",
+    "display_name": "Kling 3.0 첫-마지막 프레임에서 비디오 생성",
+    "inputs": {
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "duration": {
+        "name": "지속 시간"
+      },
+      "end_frame": {
+        "name": "마지막 프레임"
+      },
+      "first_frame": {
+        "name": "첫 프레임"
+      },
+      "generate_audio": {
+        "name": "오디오 생성"
+      },
+      "model": {
+        "name": "모델",
+        "tooltip": "모델 및 생성 설정."
+      },
+      "model_resolution": {
+        "name": "해상도"
+      },
+      "prompt": {
+        "name": "프롬프트"
+      },
+      "seed": {
+        "name": "시드",
+        "tooltip": "시드는 노드가 다시 실행될지 여부를 제어합니다. 시드와 관계없이 결과는 비결정적입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingImage2VideoNode": {
     "display_name": "Kling 비디오 생성 (이미지 → 비디오)",
     "inputs": {
@@ -3914,6 +5715,9 @@
       "aspect_ratio": {
         "name": "종횡비"
       },
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
       "human_fidelity": {
         "name": "사람 충실도",
         "tooltip": "피사체 참조 유사도"
@@ -3942,6 +5746,39 @@
       "prompt": {
         "name": "프롬프트",
         "tooltip": "이미지 생성을 위한 프롬프트"
+      },
+      "seed": {
+        "name": "시드",
+        "tooltip": "시드는 노드가 다시 실행될지 여부를 제어합니다. 시드와 관계없이 결과는 비결정적입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingImageToVideoWithAudio": {
+    "display_name": "Kling 이미지(첫 프레임) → 비디오 및 오디오",
+    "inputs": {
+      "duration": {
+        "name": "길이"
+      },
+      "generate_audio": {
+        "name": "오디오 생성"
+      },
+      "mode": {
+        "name": "모드"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "프롬프트",
+        "tooltip": "긍정적인 텍스트 프롬프트."
+      },
+      "start_frame": {
+        "name": "시작 프레임"
       }
     },
     "outputs": {
@@ -4011,6 +5848,299 @@
       }
     }
   },
+  "KlingMotionControl": {
+    "display_name": "Kling 모션 컨트롤",
+    "inputs": {
+      "character_orientation": {
+        "name": "캐릭터 방향",
+        "tooltip": "캐릭터의 시선/방향이 어디서 오는지 제어합니다.\n비디오: 움직임, 표정, 카메라 이동, 방향이 동작 참조 비디오를 따릅니다(기타 세부사항은 프롬프트로).\n이미지: 움직임과 표정은 여전히 동작 참조 비디오를 따르지만, 캐릭터 방향은 참조 이미지를 따릅니다(카메라/기타 세부사항은 프롬프트로)."
+      },
+      "keep_original_sound": {
+        "name": "원본 사운드 유지"
+      },
+      "mode": {
+        "name": "모드"
+      },
+      "model": {
+        "name": "모델"
+      },
+      "prompt": {
+        "name": "프롬프트"
+      },
+      "reference_image": {
+        "name": "참조 이미지"
+      },
+      "reference_video": {
+        "name": "참조 비디오",
+        "tooltip": "동작 참조 비디오로 움직임/표정을 제어합니다.\n길이 제한은 character_orientation에 따라 다릅니다:\n - 이미지: 3–10초 (최대 10초)\n - 비디오: 3–30초 (최대 30초)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProEditVideoNode": {
+    "description": "Kling의 최신 모델로 기존 비디오를 편집합니다.",
+    "display_name": "Kling 옴니 비디오 편집 (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "keep_original_sound": {
+        "name": "원본 사운드 유지"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "프롬프트",
+        "tooltip": "비디오 내용을 설명하는 텍스트 프롬프트입니다. 긍정적/부정적 설명 모두 포함할 수 있습니다."
+      },
+      "reference_images": {
+        "name": "참조 이미지",
+        "tooltip": "최대 4개의 추가 참조 이미지를 사용할 수 있습니다."
+      },
+      "resolution": {
+        "name": "해상도"
+      },
+      "seed": {
+        "name": "시드",
+        "tooltip": "시드는 노드가 다시 실행될지 여부를 제어합니다. 시드와 관계없이 결과는 비결정적입니다."
+      },
+      "video": {
+        "name": "비디오",
+        "tooltip": "편집할 비디오입니다. 출력 비디오 길이는 동일합니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProFirstLastFrameNode": {
+    "description": "최신 Kling 모델을 사용하여 시작 프레임, 선택적 종료 프레임 또는 참조 이미지를 사용합니다.",
+    "display_name": "Kling Omni 첫-마지막 프레임에서 비디오로 (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "duration": {
+        "name": "지속 시간"
+      },
+      "end_frame": {
+        "name": "종료 프레임",
+        "tooltip": "비디오의 선택적 종료 프레임입니다. 'reference_images'와 동시에 사용할 수 없습니다."
+      },
+      "first_frame": {
+        "name": "시작 프레임"
+      },
+      "generate_audio": {
+        "name": "오디오 생성",
+        "tooltip": "비디오용 오디오를 생성합니다. kling-v3-omni에서만 지원됩니다."
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "프롬프트",
+        "tooltip": "비디오 내용을 설명하는 텍스트 프롬프트입니다. 긍정적 및 부정적 설명을 모두 포함할 수 있습니다."
+      },
+      "reference_images": {
+        "name": "참조 이미지",
+        "tooltip": "최대 6개의 추가 참조 이미지를 사용할 수 있습니다."
+      },
+      "resolution": {
+        "name": "해상도"
+      },
+      "seed": {
+        "name": "시드",
+        "tooltip": "시드는 노드가 다시 실행될지 여부를 제어합니다. 시드와 관계없이 결과는 비결정적입니다."
+      },
+      "storyboards": {
+        "name": "스토리보드",
+        "tooltip": "각각의 프롬프트와 지속 시간으로 비디오 세그먼트 시리즈를 생성합니다. kling-v3-omni에서만 지원됩니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProImageNode": {
+    "description": "최신 Kling 모델로 이미지를 생성하거나 편집합니다.",
+    "display_name": "Kling Omni 이미지 (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "화면 비율"
+      },
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "프롬프트",
+        "tooltip": "이미지 내용을 설명하는 텍스트 프롬프트입니다. 긍정적 및 부정적 설명을 모두 포함할 수 있습니다."
+      },
+      "reference_images": {
+        "name": "참조 이미지",
+        "tooltip": "최대 10개의 추가 참조 이미지를 사용할 수 있습니다."
+      },
+      "resolution": {
+        "name": "해상도"
+      },
+      "seed": {
+        "name": "시드",
+        "tooltip": "시드는 노드가 다시 실행될지 여부를 제어합니다. 시드와 관계없이 결과는 비결정적입니다."
+      },
+      "series_amount": {
+        "name": "시리즈 개수",
+        "tooltip": "이미지 시리즈를 생성합니다. kling-image-o1에서는 지원되지 않습니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProImageToVideoNode": {
+    "description": "최신 Kling 모델로 최대 7개의 참조 이미지를 사용하여 비디오를 생성합니다.",
+    "display_name": "Kling Omni 이미지에서 비디오로 (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "화면 비율"
+      },
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "duration": {
+        "name": "지속 시간"
+      },
+      "generate_audio": {
+        "name": "오디오 생성",
+        "tooltip": "비디오용 오디오를 생성합니다. kling-v3-omni에서만 지원됩니다."
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "프롬프트",
+        "tooltip": "비디오 내용을 설명하는 텍스트 프롬프트입니다. 긍정적 및 부정적 설명을 모두 포함할 수 있습니다."
+      },
+      "reference_images": {
+        "name": "참조 이미지",
+        "tooltip": "최대 7개의 참조 이미지를 사용할 수 있습니다."
+      },
+      "resolution": {
+        "name": "해상도"
+      },
+      "seed": {
+        "name": "시드",
+        "tooltip": "시드는 노드가 다시 실행될지 여부를 제어합니다. 시드와 관계없이 결과는 비결정적입니다."
+      },
+      "storyboards": {
+        "name": "스토리보드",
+        "tooltip": "각각의 프롬프트와 지속 시간으로 비디오 세그먼트 시리즈를 생성합니다. kling-v3-omni에서만 지원됩니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProTextToVideoNode": {
+    "description": "최신 Kling 모델로 텍스트 프롬프트를 사용해 비디오를 생성합니다.",
+    "display_name": "Kling Omni 텍스트에서 비디오로 (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "화면 비율"
+      },
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "duration": {
+        "name": "지속 시간"
+      },
+      "generate_audio": {
+        "name": "오디오 생성"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "프롬프트",
+        "tooltip": "비디오 내용을 설명하는 텍스트 프롬프트입니다. 긍정적 및 부정적 설명을 모두 포함할 수 있습니다."
+      },
+      "resolution": {
+        "name": "해상도"
+      },
+      "seed": {
+        "name": "시드",
+        "tooltip": "시드는 노드가 다시 실행될지 여부를 제어합니다. 시드와 관계없이 결과는 비결정적입니다."
+      },
+      "storyboards": {
+        "name": "스토리보드",
+        "tooltip": "각각의 프롬프트와 지속 시간으로 비디오 세그먼트 시리즈를 생성합니다. o1 모델에서는 무시됩니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProVideoToVideoNode": {
+    "description": "비디오와 최대 4개의 참조 이미지를 사용하여 최신 Kling 모델로 비디오를 생성합니다.",
+    "display_name": "Kling Omni 비디오 투 비디오 (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "종횡비"
+      },
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "duration": {
+        "name": "길이"
+      },
+      "keep_original_sound": {
+        "name": "원본 사운드 유지"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "프롬프트",
+        "tooltip": "비디오 내용을 설명하는 텍스트 프롬프트입니다. 긍정적 및 부정적 설명을 모두 포함할 수 있습니다."
+      },
+      "reference_images": {
+        "name": "참조 이미지",
+        "tooltip": "최대 4개의 추가 참조 이미지."
+      },
+      "reference_video": {
+        "name": "참조 비디오",
+        "tooltip": "참조로 사용할 비디오입니다."
+      },
+      "resolution": {
+        "name": "해상도"
+      },
+      "seed": {
+        "name": "시드",
+        "tooltip": "시드는 노드가 다시 실행되어야 하는지 제어합니다. 시드와 관계없이 결과는 비결정적입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingSingleImageVideoEffectNode": {
     "description": "'효과 장면'에 따라 비디오를 생성할 때 다양한 특수 효과를 적용합니다.",
     "display_name": "Kling 비디오 효과",
@@ -4125,6 +6255,35 @@
       }
     }
   },
+  "KlingTextToVideoWithAudio": {
+    "display_name": "Kling 텍스트 투 비디오 (오디오 포함)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "종횡비"
+      },
+      "duration": {
+        "name": "길이"
+      },
+      "generate_audio": {
+        "name": "오디오 생성"
+      },
+      "mode": {
+        "name": "모드"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "프롬프트",
+        "tooltip": "긍정적인 텍스트 프롬프트."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingVideoExtendNode": {
     "description": "Kling 비디오 확장 노드입니다. 다른 Kling 노드에서 생성된 비디오를 확장합니다. video_id는 다른 Kling 노드를 사용하여 생성됩니다.",
     "display_name": "Kling 비디오 확장",
@@ -4159,6 +6318,54 @@
       }
     }
   },
+  "KlingVideoNode": {
+    "description": "Kling V3로 비디오를 생성합니다. 텍스트-투-비디오, 이미지-투-비디오, 선택적 스토리보드 멀티 프롬프트 및 오디오 생성을 지원합니다.",
+    "display_name": "Kling 3.0 비디오",
+    "inputs": {
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "generate_audio": {
+        "name": "오디오 생성"
+      },
+      "model": {
+        "name": "모델",
+        "tooltip": "모델 및 생성 설정."
+      },
+      "model_aspect_ratio": {
+        "name": "종횡비"
+      },
+      "model_resolution": {
+        "name": "해상도"
+      },
+      "multi_shot": {
+        "name": "멀티 샷",
+        "tooltip": "각각의 프롬프트와 지속 시간을 가진 비디오 세그먼트 시리즈를 생성합니다."
+      },
+      "multi_shot_duration": {
+        "name": "지속 시간"
+      },
+      "multi_shot_negative_prompt": {
+        "name": "네거티브 프롬프트"
+      },
+      "multi_shot_prompt": {
+        "name": "프롬프트"
+      },
+      "seed": {
+        "name": "시드",
+        "tooltip": "시드는 노드가 다시 실행되어야 하는지 제어합니다. 시드와 관계없이 결과는 비결정적입니다."
+      },
+      "start_frame": {
+        "name": "시작 프레임",
+        "tooltip": "선택적 시작 프레임 이미지입니다. 연결 시 이미지-투-비디오 모드로 전환됩니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingVirtualTryOnNode": {
     "description": "Kling 가상 착용 노드입니다. 인물 이미지와 의류 이미지를 입력하여 인물에게 의류를 착용시킵니다.",
     "display_name": "Kling 가상 착용",
@@ -4179,6 +6386,26 @@
       }
     }
   },
+  "LTXAVTextEncoderLoader": {
+    "description": "[Recipes]\n\nltxav: gemma 3 12B",
+    "display_name": "LTXV 오디오 텍스트 인코더 로더",
+    "inputs": {
+      "ckpt_name": {
+        "name": "ckpt_name"
+      },
+      "device": {
+        "name": "device"
+      },
+      "text_encoder": {
+        "name": "text_encoder"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LTXVAddGuide": {
     "display_name": "LTXV 가이드 추가",
     "inputs": {
@@ -4221,6 +6448,76 @@
       }
     }
   },
+  "LTXVAudioVAEDecode": {
+    "display_name": "LTXV 오디오 VAE 디코드",
+    "inputs": {
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "latent 디코딩에 사용되는 Audio VAE 모델."
+      },
+      "samples": {
+        "name": "samples",
+        "tooltip": "디코딩할 latent."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Audio",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAEEncode": {
+    "display_name": "LTXV 오디오 VAE 인코드",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "인코딩할 오디오."
+      },
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "인코딩에 사용할 Audio VAE 모델."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Audio Latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAELoader": {
+    "display_name": "LTXV 오디오 VAE 로더",
+    "inputs": {
+      "ckpt_name": {
+        "name": "ckpt_name",
+        "tooltip": "불러올 Audio VAE 체크포인트."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Audio VAE",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVConcatAVLatent": {
+    "display_name": "LTXVConcatAVLatent",
+    "inputs": {
+      "audio_latent": {
+        "name": "audio_latent"
+      },
+      "video_latent": {
+        "name": "video_latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
   "LTXVConditioning": {
     "display_name": "LTXV 조건 설정",
     "inputs": {
@@ -4273,6 +6570,33 @@
       }
     }
   },
+  "LTXVEmptyLatentAudio": {
+    "display_name": "LTXV 빈 latent 오디오",
+    "inputs": {
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "구성을 가져올 Audio VAE 모델."
+      },
+      "batch_size": {
+        "name": "batch_size",
+        "tooltip": "배치 내 latent 오디오 샘플 수."
+      },
+      "frame_rate": {
+        "name": "frame_rate",
+        "tooltip": "초당 프레임 수."
+      },
+      "frames_number": {
+        "name": "frames_number",
+        "tooltip": "프레임 수."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Latent",
+        "tooltip": null
+      }
+    }
+  },
   "LTXVImgToVideo": {
     "display_name": "LTXV 비디오 생성 (이미지 → 비디오)",
     "inputs": {
@@ -4319,6 +6643,47 @@
       }
     }
   },
+  "LTXVImgToVideoInplace": {
+    "display_name": "LTXVImgToVideoInplace",
+    "inputs": {
+      "bypass": {
+        "name": "우회",
+        "tooltip": "컨디셔닝을 우회합니다."
+      },
+      "image": {
+        "name": "이미지"
+      },
+      "latent": {
+        "name": "latent"
+      },
+      "strength": {
+        "name": "강도"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVLatentUpsampler": {
+    "display_name": "LTXVLatentUpsampler",
+    "inputs": {
+      "samples": {
+        "name": "샘플"
+      },
+      "upscale_model": {
+        "name": "업스케일 모델"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
   "LTXVPreprocess": {
     "display_name": "LTXV 전처리",
     "inputs": {
@@ -4367,6 +6732,25 @@
       }
     }
   },
+  "LTXVSeparateAVLatent": {
+    "description": "LTXV Separate AV Latent",
+    "display_name": "LTXVSeparateAVLatent",
+    "inputs": {
+      "av_latent": {
+        "name": "av_latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "video_latent",
+        "tooltip": null
+      },
+      "1": {
+        "name": "audio_latent",
+        "tooltip": null
+      }
+    }
+  },
   "LaplaceScheduler": {
     "display_name": "라플라스 스케줄러",
     "inputs": {
@@ -4385,6 +6769,11 @@
       "steps": {
         "name": "스텝 수"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "LatentAdd": {
@@ -4522,6 +6911,11 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "LatentConcat": {
@@ -4585,6 +6979,25 @@
       }
     }
   },
+  "LatentCutToBatch": {
+    "display_name": "LatentCutToBatch",
+    "inputs": {
+      "dim": {
+        "name": "차원"
+      },
+      "samples": {
+        "name": "샘플"
+      },
+      "slice_size": {
+        "name": "슬라이스 크기"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LatentFlip": {
     "display_name": "잠재 데이터 연산 (뒤집기)",
     "inputs": {
@@ -4738,6 +7151,19 @@
       }
     }
   },
+  "LatentUpscaleModelLoader": {
+    "display_name": "Latent 업스케일 모델 불러오기",
+    "inputs": {
+      "model_name": {
+        "name": "model_name"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LazyCache": {
     "description": "EasyCache의 자체 제작 버전 - 구현이 '더 쉬운' EasyCache 버전입니다. 전체적으로는 EasyCache보다 성능이 떨어지지만, 일부 드문 경우에 더 좋으며 ComfyUI의 모든 것과 완벽한 호환성을 제공합니다.",
     "display_name": "LazyCache",
@@ -4772,8 +7198,7 @@
   "Load3D": {
     "display_name": "3D 불러오기",
     "inputs": {
-      "clear": {
-      },
+      "clear": "지우기",
       "height": {
         "name": "높이"
       },
@@ -4783,30 +7208,40 @@
       "model_file": {
         "name": "모델 파일"
       },
-      "upload 3d model": {
-      },
+      "upload 3d model": "3D 모델 업로드",
+      "upload extra resources": "추가 리소스 업로드",
       "width": {
         "name": "너비"
       }
     },
     "outputs": {
       "0": {
-        "name": "이미지"
+        "name": "image",
+        "tooltip": null
       },
       "1": {
-        "name": "마스크"
+        "name": "mask",
+        "tooltip": null
       },
       "2": {
-        "name": "메시 경로"
+        "name": "mesh_path",
+        "tooltip": null
       },
       "3": {
-        "name": "노멀"
+        "name": "normal",
+        "tooltip": null
       },
       "4": {
-        "name": "라인아트"
+        "name": "camera_info",
+        "tooltip": null
       },
       "5": {
-        "name": "카메라 정보"
+        "name": "recording_video",
+        "tooltip": null
+      },
+      "6": {
+        "name": "model_3d",
+        "tooltip": null
       }
     }
   },
@@ -4822,6 +7257,11 @@
       "upload": {
         "name": "업로드할 파일 선택"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "LoadImage": {
@@ -4835,6 +7275,21 @@
       }
     }
   },
+  "LoadImageDataSetFromFolder": {
+    "display_name": "폴더에서 이미지 데이터셋 불러오기",
+    "inputs": {
+      "folder": {
+        "name": "폴더",
+        "tooltip": "이미지를 불러올 폴더입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "이미지",
+        "tooltip": "불러온 이미지 목록"
+      }
+    }
+  },
   "LoadImageMask": {
     "display_name": "마스크 이미지 로드",
     "inputs": {
@@ -4853,16 +7308,35 @@
     "description": "입력(input) 폴더 대신 출력(output) 폴더에서 이미지를 로드합니다. 새로 고침 버튼을 클릭하면 노드는 이미지 목록을 업데이트하고 자동으로 첫 번째 이미지를 선택하여 쉬운 반복을 가능하게 합니다.",
     "display_name": "이미지 로드 (출력에서)",
     "inputs": {
+      "Auto-refresh after generation": {},
       "image": {
         "name": "이미지"
       },
-      "refresh": {
-      },
+      "refresh": {},
       "upload": {
         "name": "업로드할 파일 선택"
       }
     }
   },
+  "LoadImageTextDataSetFromFolder": {
+    "display_name": "폴더에서 이미지 및 텍스트 데이터셋 불러오기",
+    "inputs": {
+      "folder": {
+        "name": "폴더",
+        "tooltip": "이미지를 불러올 폴더입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "이미지",
+        "tooltip": "불러온 이미지 목록"
+      },
+      "1": {
+        "name": "텍스트",
+        "tooltip": "텍스트 캡션 목록"
+      }
+    }
+  },
   "LoadLatent": {
     "display_name": "잠재 데이터 로드",
     "inputs": {
@@ -4871,6 +7345,25 @@
       }
     }
   },
+  "LoadTrainingDataset": {
+    "display_name": "학습 데이터셋 불러오기",
+    "inputs": {
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "저장된 데이터셋이 들어있는 폴더 이름 (output 디렉토리 내부)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latents",
+        "tooltip": "latent 딕셔너리 목록"
+      },
+      "1": {
+        "name": "conditioning",
+        "tooltip": "conditioning 리스트 목록"
+      }
+    }
+  },
   "LoadVideo": {
     "display_name": "비디오 불러오기",
     "inputs": {
@@ -4921,6 +7414,60 @@
       }
     }
   },
+  "LoraLoaderBypass": {
+    "description": "LoRA를 바이패스 모드로 적용합니다. 일반 LoRA와 달리 모델 가중치를 수정하지 않고, 순전파 과정에서 LoRA 연산을 주입합니다. 학습 시나리오에 유용합니다.",
+    "display_name": "LoRA 불러오기 (바이패스) (디버깅용)",
+    "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "LoRA가 적용될 CLIP 모델입니다."
+      },
+      "lora_name": {
+        "name": "lora_name",
+        "tooltip": "LoRA의 이름입니다."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "LoRA가 적용될 디퓨전 모델입니다."
+      },
+      "strength_clip": {
+        "name": "strength_clip",
+        "tooltip": "CLIP 모델을 얼마나 강하게 수정할지 설정합니다. 이 값은 음수도 가능합니다."
+      },
+      "strength_model": {
+        "name": "strength_model",
+        "tooltip": "디퓨전 모델을 얼마나 강하게 수정할지 설정합니다. 이 값은 음수도 가능합니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "수정된 디퓨전 모델입니다."
+      },
+      "1": {
+        "tooltip": "수정된 CLIP 모델입니다."
+      }
+    }
+  },
+  "LoraLoaderBypassModelOnly": {
+    "description": "LoRA를 바이패스 모드로 적용합니다. 일반 LoRA와 달리 모델 가중치를 수정하지 않고, 순전파 과정에서 LoRA 연산을 주입합니다. 학습 시나리오에 유용합니다.",
+    "display_name": "LoRA 불러오기 (바이패스, 모델만) (디버깅용)",
+    "inputs": {
+      "lora_name": {
+        "name": "lora_name"
+      },
+      "model": {
+        "name": "model"
+      },
+      "strength_model": {
+        "name": "strength_model"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "수정된 디퓨전 모델입니다."
+      }
+    }
+  },
   "LoraLoaderModelOnly": {
     "description": "LoRA는 확산 모델과 CLIP 모델을 부분적으로 변경해서, 잠재 데이터의 노이즈 제거 방향을 바꿉니다. 여러 LoRA 노드를 연결할 수 있습니다. (이 노드는 CLIP 모델은 로드하지 않습니다.)",
     "display_name": "LoRA 로드 (모델 전용)",
@@ -4944,6 +7491,10 @@
   "LoraModelLoader": {
     "display_name": "LoRA 모델 로드",
     "inputs": {
+      "bypass": {
+        "name": "bypass",
+        "tooltip": "활성화하면 LoRA를 바이패스 모드로 적용하여 기본 모델 가중치를 변경하지 않습니다. 학습 시나 모델 가중치 오프로딩 시 유용합니다."
+      },
       "lora": {
         "name": "LoRA",
         "tooltip": "디퓨전 모델에 적용할 LoRA 모델입니다."
@@ -4959,7 +7510,8 @@
     },
     "outputs": {
       "0": {
-        "tooltip": "수정된 디퓨전 모델입니다."
+        "name": "model",
+        "tooltip": "수정된 diffusion 모델입니다."
       }
     }
   },
@@ -4992,10 +7544,12 @@
     "display_name": "손실 그래프 그리기",
     "inputs": {
       "filename_prefix": {
-        "name": "파일명 접두사"
+        "name": "파일명 접두사",
+        "tooltip": "저장될 loss 그래프 이미지의 접두사."
       },
       "loss": {
-        "name": "손실"
+        "name": "손실",
+        "tooltip": "학습 노드에서 가져온 loss 맵."
       }
     }
   },
@@ -5286,6 +7840,208 @@
       }
     }
   },
+  "MagnificImageRelightNode": {
+    "description": "이미지의 조명을 조정하고, 선택적으로 참조 기반의 조명 전송을 적용합니다.",
+    "display_name": "Magnific 이미지 리라이트",
+    "inputs": {
+      "advanced_settings": {
+        "name": "advanced_settings",
+        "tooltip": "고급 조명 제어를 위한 세부 조정 옵션입니다."
+      },
+      "change_background": {
+        "name": "change_background",
+        "tooltip": "프롬프트/참조에 따라 배경을 수정합니다."
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "리라이트할 이미지입니다."
+      },
+      "interpolate_from_original": {
+        "name": "interpolate_from_original",
+        "tooltip": "생성의 자유도를 제한하여 원본과 더 유사하게 만듭니다."
+      },
+      "light_transfer_strength": {
+        "name": "light_transfer_strength",
+        "tooltip": "조명 전송 적용 강도입니다."
+      },
+      "preserve_details": {
+        "name": "preserve_details",
+        "tooltip": "원본의 질감과 세부 정보를 유지합니다."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "조명에 대한 설명 가이드입니다. 강조 표기법(1-1.4)을 지원합니다."
+      },
+      "reference_image": {
+        "name": "reference_image",
+        "tooltip": "조명을 전송할 선택적 참조 이미지입니다."
+      },
+      "style": {
+        "name": "style",
+        "tooltip": "스타일 출력 선호도입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageSkinEnhancerNode": {
+    "description": "여러 처리 모드를 지원하는 인물 사진 피부 보정 기능입니다.",
+    "display_name": "Magnific 이미지 피부 보정",
+    "inputs": {
+      "image": {
+        "name": "image",
+        "tooltip": "보정할 인물 사진입니다."
+      },
+      "mode": {
+        "name": "mode",
+        "tooltip": "처리 모드: 창의적(artistic) 보정, 원본 유지(faithful), 타겟 최적화(flexible) 중 선택."
+      },
+      "sharpen": {
+        "name": "sharpen",
+        "tooltip": "선명도 강도 수준입니다."
+      },
+      "smart_grain": {
+        "name": "smart_grain",
+        "tooltip": "스마트 그레인 강도 수준입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageStyleTransferNode": {
+    "description": "참조 이미지의 스타일을 입력 이미지에 전송합니다.",
+    "display_name": "Magnific 이미지 스타일 전송",
+    "inputs": {
+      "engine": {
+        "name": "engine",
+        "tooltip": "처리 엔진 선택입니다."
+      },
+      "fixed_generation": {
+        "name": "fixed_generation",
+        "tooltip": "비활성화 시, 각 생성마다 일정 수준의 무작위성이 도입되어 더 다양한 결과를 얻을 수 있습니다."
+      },
+      "flavor": {
+        "name": "flavor",
+        "tooltip": "스타일 전송의 flavor입니다."
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "스타일 전송을 적용할 이미지입니다."
+      },
+      "portrait_mode": {
+        "name": "portrait_mode",
+        "tooltip": "얼굴 개선을 위한 인물 모드를 활성화합니다."
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "reference_image": {
+        "name": "reference_image",
+        "tooltip": "스타일을 추출할 참조 이미지입니다."
+      },
+      "structure_strength": {
+        "name": "structure_strength",
+        "tooltip": "원본 이미지의 구조를 유지합니다."
+      },
+      "style_strength": {
+        "name": "style_strength",
+        "tooltip": "스타일 강도 비율입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageUpscalerCreativeNode": {
+    "description": "프롬프트 기반의 향상, 스타일화, 그리고 2x/4x/8x/16x 업스케일링. 최대 출력: 25.3 메가픽셀.",
+    "display_name": "Magnific 이미지 업스케일 (Creative)",
+    "inputs": {
+      "auto_downscale": {
+        "name": "auto_downscale",
+        "tooltip": "출력 이미지가 최대 픽셀 제한을 초과할 경우 입력 이미지를 자동으로 다운스케일합니다."
+      },
+      "creativity": {
+        "name": "creativity"
+      },
+      "engine": {
+        "name": "engine"
+      },
+      "fractality": {
+        "name": "fractality",
+        "tooltip": "프롬프트의 강도와 픽셀당 복잡성."
+      },
+      "hdr": {
+        "name": "hdr",
+        "tooltip": "정의도와 디테일의 수준."
+      },
+      "image": {
+        "name": "image"
+      },
+      "optimized_for": {
+        "name": "optimized_for"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "resemblance": {
+        "name": "resemblance",
+        "tooltip": "원본 이미지와의 유사도 수준."
+      },
+      "scale_factor": {
+        "name": "scale_factor"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageUpscalerPreciseV2Node": {
+    "description": "선명도, 그레인, 디테일을 세밀하게 제어하는 고충실도 업스케일링. 최대 출력: 10060×10060 픽셀.",
+    "display_name": "Magnific 이미지 업스케일 (Precise V2)",
+    "inputs": {
+      "auto_downscale": {
+        "name": "auto_downscale",
+        "tooltip": "출력 이미지가 최대 해상도를 초과할 경우 입력 이미지를 자동으로 다운스케일합니다."
+      },
+      "flavor": {
+        "name": "flavor",
+        "tooltip": "처리 스타일: 일반용 sublime, 사진용 photo, 노이즈 사진용 photo_denoiser."
+      },
+      "image": {
+        "name": "image"
+      },
+      "scale_factor": {
+        "name": "scale_factor"
+      },
+      "sharpen": {
+        "name": "sharpen",
+        "tooltip": "이미지 선명도 강도. 값이 높을수록 엣지 정의와 선명도가 증가합니다."
+      },
+      "smart_grain": {
+        "name": "smart_grain",
+        "tooltip": "이미지가 너무 부드럽거나 인공적으로 보이지 않도록 하는 지능형 그레인/텍스처 강화."
+      },
+      "ultra_detail": {
+        "name": "ultra_detail",
+        "tooltip": "업스케일링 중 추가되는 미세 디테일, 텍스처, 마이크로 디테일을 제어합니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "Mahiro": {
     "description": "노이즈 제거의 '방향'을 긍정 조건과 부정 조건 차에 의한 것 보다는 긍정 조건 방향으로 더 크게 작동하도록 가이더 동작을 변경합니다.",
     "display_name": "마히로",
@@ -5301,6 +8057,50 @@
       }
     }
   },
+  "MakeTrainingDataset": {
+    "display_name": "학습 데이터셋 만들기",
+    "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "텍스트를 컨디셔닝으로 인코딩하는 CLIP 모델입니다."
+      },
+      "images": {
+        "name": "이미지",
+        "tooltip": "인코딩할 이미지 목록입니다."
+      },
+      "texts": {
+        "name": "텍스트",
+        "tooltip": "텍스트 캡션 목록입니다. 이미지 개수(n)와 일치하거나, 1개(모두에 반복), 또는 생략(빈 문자열 사용)할 수 있습니다."
+      },
+      "vae": {
+        "name": "vae",
+        "tooltip": "이미지를 latent로 인코딩하는 VAE 모델입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latents",
+        "tooltip": "latent 딕셔너리 목록"
+      },
+      "1": {
+        "name": "conditioning",
+        "tooltip": "컨디셔닝 리스트 목록"
+      }
+    }
+  },
+  "ManualSigmas": {
+    "display_name": "ManualSigmas",
+    "inputs": {
+      "sigmas": {
+        "name": "시그마"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "MaskComposite": {
     "display_name": "마스크 합성",
     "inputs": {
@@ -5319,6 +8119,11 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "MaskPreview": {
@@ -5336,6 +8141,371 @@
       "mask": {
         "name": "마스크"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MergeImageLists": {
+    "display_name": "이미지 리스트 병합",
+    "inputs": {
+      "images": {
+        "name": "이미지",
+        "tooltip": "처리할 이미지 목록입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "이미지",
+        "tooltip": "처리된 이미지"
+      }
+    }
+  },
+  "MergeTextLists": {
+    "display_name": "텍스트 리스트 병합",
+    "inputs": {
+      "texts": {
+        "name": "텍스트",
+        "tooltip": "처리할 텍스트 목록입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "텍스트",
+        "tooltip": "처리된 텍스트"
+      }
+    }
+  },
+  "MeshyAnimateModelNode": {
+    "description": "이전에 리깅된 캐릭터에 특정 애니메이션 동작을 적용합니다.",
+    "display_name": "Meshy: 모델 애니메이션",
+    "inputs": {
+      "action_id": {
+        "name": "action_id",
+        "tooltip": "사용 가능한 값 목록은 https://docs.meshy.ai/en/api/animation-library 를 방문하세요."
+      },
+      "rig_task_id": {
+        "name": "rig_task_id"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyImageToModelNode": {
+    "display_name": "Meshy: 이미지 → 모델",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "생성된 모델의 포즈 모드를 지정합니다."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "시드는 노드가 다시 실행될지 여부를 제어합니다. 시드와 관계없이 결과는 비결정적입니다."
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "거짓으로 설정하면, 가공되지 않은 삼각형 메시를 반환합니다."
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      },
+      "should_texture": {
+        "name": "should_texture",
+        "tooltip": "텍스처 생성 여부를 결정합니다. 거짓으로 설정하면 텍스처 단계가 생략되고 텍스처 없는 메시가 반환됩니다."
+      },
+      "should_texture_enable_pbr": {
+        "name": "enable_pbr"
+      },
+      "should_texture_texture_prompt": {
+        "name": "texture_prompt"
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyMultiImageToModelNode": {
+    "display_name": "Meshy: 다중 이미지 → 모델",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "images": {
+        "name": "images"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "생성된 모델의 포즈 모드를 지정합니다."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "시드는 노드가 다시 실행될지 여부를 제어합니다. 시드와 관계없이 결과는 비결정적입니다."
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "거짓으로 설정하면, 가공되지 않은 삼각형 메시를 반환합니다."
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      },
+      "should_texture": {
+        "name": "should_texture",
+        "tooltip": "텍스처 생성 여부를 결정합니다. 거짓으로 설정하면 텍스처 단계가 생략되고 텍스처 없는 메시가 반환됩니다."
+      },
+      "should_texture_enable_pbr": {
+        "name": "enable_pbr"
+      },
+      "should_texture_texture_prompt": {
+        "name": "texture_prompt"
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyRefineNode": {
+    "description": "이전에 생성된 초안 모델을 다듬습니다.",
+    "display_name": "Meshy: 모델 다듬기",
+    "inputs": {
+      "enable_pbr": {
+        "name": "enable_pbr",
+        "tooltip": "기본 색상 외에 PBR 맵(금속, 거칠기, 노멀)을 생성합니다. 참고: Sculpture 스타일을 사용할 때는 Sculpture 스타일이 자체 PBR 맵을 생성하므로 false로 설정해야 합니다."
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "model": {
+        "name": "model"
+      },
+      "texture_image": {
+        "name": "texture_image",
+        "tooltip": "'texture_image' 또는 'texture_prompt' 중 하나만 동시에 사용할 수 있습니다."
+      },
+      "texture_prompt": {
+        "name": "texture_prompt",
+        "tooltip": "텍스처링 과정을 안내할 텍스트 프롬프트를 입력하세요. 최대 600자. 'texture_image'와 동시에 사용할 수 없습니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyRigModelNode": {
+    "description": "표준 포맷으로 리깅된 캐릭터를 제공합니다. 자동 리깅은 텍스처가 없는 메시, 비휴머노이드 자산, 또는 팔다리와 신체 구조가 불분명한 휴머노이드 자산에는 적합하지 않습니다.",
+    "display_name": "Meshy: 모델 리깅",
+    "inputs": {
+      "height_meters": {
+        "name": "height_meters",
+        "tooltip": "캐릭터 모델의 대략적인 높이(미터 단위)입니다. 스케일링과 리깅 정확도에 도움이 됩니다."
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "texture_image": {
+        "name": "texture_image",
+        "tooltip": "모델의 UV 언랩된 기본 색상 텍스처 이미지입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "rig_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyTextToModelNode": {
+    "display_name": "Meshy: 텍스트 → 모델",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "생성된 모델의 포즈 모드를 지정합니다."
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "시드는 노드가 다시 실행될지 여부를 제어합니다. 시드와 관계없이 결과는 비결정적입니다."
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "false로 설정하면 가공되지 않은 삼각형 메시를 반환합니다."
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      },
+      "style": {
+        "name": "style"
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "모델 파일",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyTextureNode": {
+    "display_name": "Meshy: 텍스처 모델",
+    "inputs": {
+      "enable_original_uv": {
+        "name": "원본 UV 사용",
+        "tooltip": "새로운 UV를 생성하는 대신 모델의 원본 UV를 사용합니다. 활성화하면 Meshy는 업로드된 모델의 기존 텍스처를 보존합니다. 모델에 원본 UV가 없을 경우 출력 품질이 저하될 수 있습니다."
+      },
+      "image_style": {
+        "name": "이미지 스타일",
+        "tooltip": "텍스처링 과정을 안내할 2D 이미지를 사용합니다. 'text_style_prompt'와 동시에 사용할 수 없습니다."
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pbr": {
+        "name": "pbr"
+      },
+      "text_style_prompt": {
+        "name": "텍스트 스타일 프롬프트",
+        "tooltip": "오브젝트의 원하는 텍스처 스타일을 텍스트로 설명하세요. 최대 600자까지 입력할 수 있습니다. 'image_style'과 동시에 사용할 수 없습니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "모델 파일",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
     }
   },
   "MinimaxHailuoVideoNode": {
@@ -7779,6 +10949,78 @@
       }
     }
   },
+  "NAGuidance": {
+    "description": "정규화된 어텐션 가이던스를 모델에 적용하여, distilled/schnell 모델에서 네거티브 프롬프트를 사용할 수 있게 합니다.",
+    "display_name": "정규화된 어텐션 가이던스",
+    "inputs": {
+      "model": {
+        "name": "model",
+        "tooltip": "NAG를 적용할 모델입니다."
+      },
+      "nag_alpha": {
+        "name": "nag_alpha",
+        "tooltip": "정규화된 어텐션의 블렌딩 계수입니다. 1.0은 완전 대체, 0.0은 효과 없음입니다."
+      },
+      "nag_scale": {
+        "name": "nag_scale",
+        "tooltip": "가이던스 스케일 계수입니다. 값이 높을수록 네거티브 프롬프트에서 더 멀어집니다."
+      },
+      "nag_tau": {
+        "name": "nag_tau"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "NAG가 활성화된 패치된 모델입니다."
+      }
+    }
+  },
+  "NormalizeImages": {
+    "display_name": "이미지 정규화",
+    "inputs": {
+      "images": {
+        "name": "이미지",
+        "tooltip": "처리할 이미지입니다."
+      },
+      "mean": {
+        "name": "평균값",
+        "tooltip": "정규화에 사용할 평균값입니다."
+      },
+      "std": {
+        "name": "표준편차",
+        "tooltip": "정규화에 사용할 표준편차입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "이미지",
+        "tooltip": "처리된 이미지"
+      }
+    }
+  },
+  "NormalizeVideoLatentStart": {
+    "description": "비디오 latent의 초기 프레임을 이후 참조 프레임의 평균 및 표준편차에 맞게 정규화합니다. 시작 프레임과 나머지 비디오 간의 차이를 줄이는 데 도움이 됩니다.",
+    "display_name": "NormalizeVideoLatentStart",
+    "inputs": {
+      "latent": {
+        "name": "latent"
+      },
+      "reference_frame_count": {
+        "name": "reference_frame_count",
+        "tooltip": "참조로 사용할 시작 프레임 이후의 latent 프레임 수"
+      },
+      "start_frame_count": {
+        "name": "start_frame_count",
+        "tooltip": "정규화할 latent 프레임 수(시작부터 계산)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
   "OpenAIChatConfig": {
     "description": "OpenAI 채팅 노드에 대한 고급 구성 옵션을 지정할 수 있습니다.",
     "display_name": "OpenAI ChatGPT 고급 옵션",
@@ -7928,6 +11170,9 @@
         "name": "마스크",
         "tooltip": "인페인팅을 위한 선택적 마스크 (흰색 영역이 대체됨)"
       },
+      "model": {
+        "name": "model"
+      },
       "n": {
         "name": "개수",
         "tooltip": "생성할 이미지의 수"
@@ -8440,6 +11685,11 @@
       "steps": {
         "name": "스텝 수"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "PorterDuffImageComposite": {
@@ -8473,6 +11723,9 @@
   "Preview3D": {
     "display_name": "3D 미리보기",
     "inputs": {
+      "bg_image": {
+        "name": "bg_image"
+      },
       "camera_info": {
         "name": "카메라 정보"
       },
@@ -8480,14 +11733,20 @@
         "name": "이미지"
       },
       "model_file": {
-        "name": "모델 파일"
+        "name": "모델 파일",
+        "tooltip": "3D 모델 파일 또는 경로 문자열"
       }
     }
   },
   "PreviewAny": {
     "display_name": "미리보기 아무거나",
     "inputs": {
-      "preview": {
+      "previewMode": {},
+      "preview_markdown": {
+        "name": "미리보기"
+      },
+      "preview_text": {
+        "name": "미리보기"
       },
       "source": {
         "name": "소스"
@@ -8527,6 +11786,28 @@
       }
     }
   },
+  "PrimitiveBoundingBox": {
+    "display_name": "바운딩 박스",
+    "inputs": {
+      "height": {
+        "name": "높이"
+      },
+      "width": {
+        "name": "너비"
+      },
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "PrimitiveFloat": {
     "display_name": "실수",
     "inputs": {
@@ -8628,6 +11909,36 @@
       }
     }
   },
+  "RandomCropImages": {
+    "display_name": "무작위 이미지 자르기",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "height": {
+        "name": "height",
+        "tooltip": "자르기 높이."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "처리할 이미지."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "무작위 시드."
+      },
+      "width": {
+        "name": "width",
+        "tooltip": "자르기 너비."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "처리된 이미지"
+      }
+    }
+  },
   "RandomNoise": {
     "display_name": "무작위 노이즈",
     "inputs": {
@@ -8637,6 +11948,11 @@
       "noise_seed": {
         "name": "노이즈 시드"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "RebatchImages": {
@@ -8677,6 +11993,11 @@
       "audio": {
         "name": "오디오"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "RecraftColorRGB": {
@@ -8724,6 +12045,25 @@
       }
     }
   },
+  "RecraftCreateStyleNode": {
+    "description": "참고 이미지를 사용하여 사용자 지정 스타일을 만듭니다. 스타일 참조로 사용할 이미지를 1~5개 업로드하세요. 모든 이미지의 총 용량은 5MB로 제한됩니다.",
+    "display_name": "Recraft 스타일 생성",
+    "inputs": {
+      "images": {
+        "name": "이미지"
+      },
+      "style": {
+        "name": "스타일",
+        "tooltip": "생성된 이미지의 기본 스타일입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "style_id",
+        "tooltip": null
+      }
+    }
+  },
   "RecraftCreativeUpscaleNode": {
     "description": "이미지를 동기적으로 업스케일합니다.\n‘크리에이티브 업스케일’ 도구를 사용하여 주어진 래스터 이미지를 향상시키고, 작은 디테일과 얼굴을 정교하게 개선하면서 해상도를 높입니다.",
     "display_name": "Recraft 크리에이티브 업스케일 이미지",
@@ -9031,6 +12371,88 @@
       }
     }
   },
+  "RecraftV4TextToImageNode": {
+    "description": "Recraft V4 또는 V4 Pro 모델을 사용하여 이미지를 생성합니다.",
+    "display_name": "Recraft V4 텍스트-이미지",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "생성에 사용할 모델입니다."
+      },
+      "model_size": {
+        "name": "size"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "생성할 이미지의 개수입니다."
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "이미지에서 원하지 않는 요소에 대한 선택적 텍스트 설명입니다."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "이미지 생성을 위한 프롬프트입니다. 최대 10,000자까지 입력 가능합니다."
+      },
+      "recraft_controls": {
+        "name": "recraft_controls",
+        "tooltip": "Recraft Controls 노드를 통한 추가 생성 제어(선택 사항)입니다."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "노드가 다시 실행되어야 하는지 결정하는 시드입니다. 실제 결과는 시드와 관계없이 비결정적입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftV4TextToVectorNode": {
+    "description": "Recraft V4 또는 V4 Pro 모델을 사용하여 SVG를 생성합니다.",
+    "display_name": "Recraft V4 텍스트-벡터",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "생성에 사용할 모델입니다."
+      },
+      "model_size": {
+        "name": "size"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "생성할 이미지의 개수입니다."
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "이미지에서 원하지 않는 요소에 대한 선택적 텍스트 설명입니다."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "이미지 생성을 위한 프롬프트입니다. 최대 10,000자까지 입력 가능합니다."
+      },
+      "recraft_controls": {
+        "name": "recraft_controls",
+        "tooltip": "Recraft Controls 노드를 통한 추가 생성 제어(선택 사항)입니다."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "노드가 다시 실행되어야 하는지 결정하는 시드입니다. 실제 결과는 시드와 관계없이 비결정적입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RecraftVectorizeImageNode": {
     "description": "입력 이미지로부터 SVG를 동기적으로 생성합니다.",
     "display_name": "Recraft 벡터 생성 (이미지 → 벡터)",
@@ -9062,6 +12484,23 @@
       }
     }
   },
+  "ReferenceTimbreAudio": {
+    "description": "이 노드는 timbre(ace step 1.5용) 기준 오디오를 설정합니다.",
+    "display_name": "ReferenceTimbreAudio",
+    "inputs": {
+      "conditioning": {
+        "name": "컨디셔닝"
+      },
+      "latent": {
+        "name": "latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RegexExtract": {
     "display_name": "정규식 추출",
     "inputs": {
@@ -9181,6 +12620,11 @@
       "image": {
         "name": "이미지"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "RepeatLatentBatch": {
@@ -9194,6 +12638,51 @@
       }
     }
   },
+  "ReplaceText": {
+    "display_name": "텍스트 교체",
+    "inputs": {
+      "find": {
+        "name": "find",
+        "tooltip": "찾을 텍스트."
+      },
+      "replace": {
+        "name": "replace",
+        "tooltip": "교체할 텍스트."
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "처리할 텍스트."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "texts",
+        "tooltip": "처리된 텍스트"
+      }
+    }
+  },
+  "ReplaceVideoLatentFrames": {
+    "display_name": "비디오 Latent 프레임 교체",
+    "inputs": {
+      "destination": {
+        "name": "destination",
+        "tooltip": "프레임이 교체될 대상 latent."
+      },
+      "index": {
+        "name": "index",
+        "tooltip": "소스 latent 프레임이 대상 latent에 삽입될 시작 프레임 인덱스. 음수 값은 끝에서부터 계산."
+      },
+      "source": {
+        "name": "source",
+        "tooltip": "대상 latent에 삽입할 프레임을 제공하는 소스 latent. 제공되지 않으면 대상 latent가 변경 없이 반환됩니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RescaleCFG": {
     "display_name": "CFG 리스케일",
     "inputs": {
@@ -9223,6 +12712,128 @@
       "target_width": {
         "name": "대상 너비"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ResizeImageMaskNode": {
+    "description": "여러 가지 스케일링 방법을 사용하여 이미지 또는 mask를 리사이즈합니다.",
+    "display_name": "이미지/마스크 크기 조정",
+    "inputs": {
+      "input": {
+        "name": "input"
+      },
+      "resize_type": {
+        "name": "resize_type",
+        "tooltip": "리사이즈 방법을 선택하세요: 정확한 크기, 배율, 다른 이미지와 일치 등."
+      },
+      "resize_type_crop": {
+        "name": "crop"
+      },
+      "resize_type_height": {
+        "name": "height"
+      },
+      "resize_type_width": {
+        "name": "width"
+      },
+      "scale_method": {
+        "name": "scale_method",
+        "tooltip": "보간 알고리즘입니다. 'area'는 축소에, 'lanczos'는 확대에, 'nearest-exact'는 픽셀 아트에 적합합니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "resized",
+        "tooltip": null
+      }
+    }
+  },
+  "ResizeImagesByLongerEdge": {
+    "display_name": "긴 변 기준 이미지 크기 조정",
+    "inputs": {
+      "images": {
+        "name": "images",
+        "tooltip": "처리할 이미지."
+      },
+      "longer_edge": {
+        "name": "longer_edge",
+        "tooltip": "긴 변의 목표 길이."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "처리된 이미지"
+      }
+    }
+  },
+  "ResizeImagesByShorterEdge": {
+    "display_name": "짧은 변 기준 이미지 크기 조정",
+    "inputs": {
+      "images": {
+        "name": "images",
+        "tooltip": "처리할 이미지."
+      },
+      "shorter_edge": {
+        "name": "shorter_edge",
+        "tooltip": "짧은 변의 목표 길이."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "처리된 이미지"
+      }
+    }
+  },
+  "ResolutionBucket": {
+    "display_name": "해상도 버킷",
+    "inputs": {
+      "conditioning": {
+        "name": "conditioning",
+        "tooltip": "conditioning 리스트 목록 (latents 길이와 일치해야 함)."
+      },
+      "latents": {
+        "name": "latents",
+        "tooltip": "해상도별로 버킷팅할 latent 딕셔너리 목록."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latents",
+        "tooltip": "해상도 버킷별로 배치된 latent 딕셔너리 목록."
+      },
+      "1": {
+        "name": "conditioning",
+        "tooltip": "해상도 버킷별로 조건 리스트 목록."
+      }
+    }
+  },
+  "ResolutionSelector": {
+    "description": "종횡비와 메가픽셀 목표값으로 너비와 높이를 계산합니다. Empty Latent Image의 크기를 설정할 때 유용합니다.",
+    "display_name": "해상도 선택기",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "종횡비",
+        "tooltip": "출력 크기의 종횡비입니다."
+      },
+      "megapixels": {
+        "name": "메가픽셀",
+        "tooltip": "목표 총 메가픽셀. 1.0 MP ≈ 1024×1024 (정사각형 기준)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "너비",
+        "tooltip": "계산된 픽셀 단위 너비 (8의 배수)."
+      },
+      "1": {
+        "name": "높이",
+        "tooltip": "계산된 픽셀 단위 높이 (8의 배수)."
+      }
     }
   },
   "Rodin3D_Detail": {
@@ -9246,6 +12857,10 @@
       "0": {
         "name": "3D 모델 경로",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9273,6 +12888,10 @@
       "0": {
         "name": "3D 모델 경로",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9297,6 +12916,10 @@
       "0": {
         "name": "3D 모델 경로",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9315,6 +12938,10 @@
       "0": {
         "name": "3D 모델 경로",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9339,6 +12966,10 @@
       "0": {
         "name": "3D 모델 경로",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9464,6 +13095,90 @@
       }
     }
   },
+  "SDPoseDrawKeypoints": {
+    "display_name": "SDPoseDrawKeypoints",
+    "inputs": {
+      "draw_body": {
+        "name": "draw_body"
+      },
+      "draw_face": {
+        "name": "draw_face"
+      },
+      "draw_feet": {
+        "name": "draw_feet"
+      },
+      "draw_hands": {
+        "name": "draw_hands"
+      },
+      "face_point_size": {
+        "name": "face_point_size"
+      },
+      "keypoints": {
+        "name": "keypoints"
+      },
+      "score_threshold": {
+        "name": "score_threshold"
+      },
+      "stick_width": {
+        "name": "stick_width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SDPoseFaceBBoxes": {
+    "display_name": "SDPoseFaceBBoxes",
+    "inputs": {
+      "force_square": {
+        "name": "force_square",
+        "tooltip": "자르기 영역이 항상 정사각형이 되도록 더 짧은 바운딩 박스 축을 확장합니다."
+      },
+      "keypoints": {
+        "name": "keypoints"
+      },
+      "scale": {
+        "name": "scale",
+        "tooltip": "각 감지된 얼굴 주위의 바운딩 박스 영역에 곱해지는 배수입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "bboxes",
+        "tooltip": "프레임별 얼굴 바운딩 박스이며, SDPoseKeypointExtractor의 bboxes 입력과 호환됩니다."
+      }
+    }
+  },
+  "SDPoseKeypointExtractor": {
+    "description": "SDPose 모델을 사용하여 이미지에서 포즈 키포인트를 추출합니다: https://huggingface.co/Comfy-Org/SDPose/tree/main/checkpoints",
+    "display_name": "SDPoseKeypointExtractor",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "bboxes": {
+        "name": "bboxes",
+        "tooltip": "더 정확한 감지를 위한 선택적 바운딩 박스입니다. 다중 인물 감지 시 필수입니다."
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "keypoints",
+        "tooltip": "OpenPose 프레임 형식의 키포인트 (canvas_width, canvas_height, people)"
+      }
+    }
+  },
   "SDTurboScheduler": {
     "display_name": "SD-Turbo 스케줄러",
     "inputs": {
@@ -9476,6 +13191,11 @@
       "steps": {
         "name": "스텝 수"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SD_4XUpscale_Conditioning": {
@@ -9631,10 +13351,12 @@
     },
     "outputs": {
       "0": {
-        "name": "출력"
+        "name": "출력",
+        "tooltip": null
       },
       "1": {
-        "name": "노이즈 제거된 출력"
+        "name": "디노이즈 출력",
+        "tooltip": null
       }
     }
   },
@@ -9659,10 +13381,12 @@
     },
     "outputs": {
       "0": {
-        "name": "출력"
+        "name": "출력",
+        "tooltip": null
       },
       "1": {
-        "name": "노이즈 제거된 출력"
+        "name": "디노이즈 출력",
+        "tooltip": null
       }
     }
   },
@@ -9699,6 +13423,11 @@
       "s_noise": {
         "name": "s_noise"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_2M_SDE": {
@@ -9716,6 +13445,11 @@
       "solver_type": {
         "name": "Solver 유형"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_2S_Ancestral": {
@@ -9727,6 +13461,11 @@
       "s_noise": {
         "name": "s_noise"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_3M_SDE": {
@@ -9741,6 +13480,11 @@
       "s_noise": {
         "name": "s_noise"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_SDE": {
@@ -9758,6 +13502,11 @@
       "s_noise": {
         "name": "s_noise"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerER_SDE": {
@@ -9776,6 +13525,11 @@
       "solver_type": {
         "name": "solver_type"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerEulerAncestral": {
@@ -9787,6 +13541,11 @@
       "s_noise": {
         "name": "s_noise"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerEulerAncestralCFGPP": {
@@ -9798,6 +13557,11 @@
       "s_noise": {
         "name": "s_noise"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerEulerCFGpp": {
@@ -9838,6 +13602,11 @@
       "order": {
         "name": "순서"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerSASolver": {
@@ -9870,6 +13639,37 @@
       "use_pece": {
         "name": "PECE 사용"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerSEEDS2": {
+    "description": "이 샘플러 노드는 여러 샘플러를 나타낼 수 있습니다:\n\nseeds_2\n- 기본 설정\n\nexp_heun_2_x0\n- solver_type=phi_2, r=1.0, eta=0.0\n\nexp_heun_2_x0_sde\n- solver_type=phi_2, r=1.0, eta=1.0, s_noise=1.0",
+    "display_name": "SamplerSEEDS2",
+    "inputs": {
+      "eta": {
+        "name": "eta",
+        "tooltip": "확률적 강도"
+      },
+      "r": {
+        "name": "r",
+        "tooltip": "중간 단계의 상대 스텝 크기 (c2 노드)"
+      },
+      "s_noise": {
+        "name": "s_noise",
+        "tooltip": "SDE 노이즈 배수"
+      },
+      "solver_type": {
+        "name": "solver_type"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplingPercentToSigma": {
@@ -9888,7 +13688,8 @@
     },
     "outputs": {
       "0": {
-        "name": "시그마 값"
+        "name": "시그마 값",
+        "tooltip": null
       }
     }
   },
@@ -9990,7 +13791,8 @@
         "name": "이미지"
       },
       "mesh": {
-        "name": "메시"
+        "name": "메시",
+        "tooltip": "저장할 메시 또는 GLB 파일"
       }
     }
   },
@@ -10008,6 +13810,44 @@
       }
     }
   },
+  "SaveImageDataSetToFolder": {
+    "display_name": "이미지 데이터셋을 폴더에 저장",
+    "inputs": {
+      "filename_prefix": {
+        "name": "filename_prefix",
+        "tooltip": "저장된 이미지 파일 이름의 접두사입니다."
+      },
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "이미지를 저장할 폴더 이름(출력 디렉터리 내)."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "저장할 이미지 목록입니다."
+      }
+    }
+  },
+  "SaveImageTextDataSetToFolder": {
+    "display_name": "이미지 및 텍스트 데이터셋을 폴더에 저장",
+    "inputs": {
+      "filename_prefix": {
+        "name": "filename_prefix",
+        "tooltip": "저장된 이미지 파일 이름의 접두사입니다."
+      },
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "이미지를 저장할 폴더 이름(출력 디렉터리 내)."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "저장할 이미지 목록입니다."
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "저장할 텍스트 캡션 목록입니다."
+      }
+    }
+  },
   "SaveImageWebsocket": {
     "display_name": "이미지 웹소켓 전송",
     "inputs": {
@@ -10027,6 +13867,23 @@
       }
     }
   },
+  "SaveLoRA": {
+    "display_name": "LoRA 가중치 저장",
+    "inputs": {
+      "lora": {
+        "name": "lora",
+        "tooltip": "저장할 LoRA 모델입니다. LoRA 레이어가 있는 모델은 사용하지 마세요."
+      },
+      "prefix": {
+        "name": "prefix",
+        "tooltip": "저장된 LoRA 파일에 사용할 접두사입니다."
+      },
+      "steps": {
+        "name": "steps",
+        "tooltip": "선택 사항: LoRA가 학습된 스텝 수로, 저장 파일 이름에 사용됩니다."
+      }
+    }
+  },
   "SaveSVGNode": {
     "description": "디스크에 SVG 파일 저장.",
     "display_name": "SVG 노드 저장",
@@ -10040,6 +13897,27 @@
       }
     }
   },
+  "SaveTrainingDataset": {
+    "display_name": "학습 데이터셋 저장",
+    "inputs": {
+      "conditioning": {
+        "name": "conditioning",
+        "tooltip": "MakeTrainingDataset에서 생성된 conditioning 리스트 목록입니다."
+      },
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "데이터셋을 저장할 폴더 이름(출력 디렉터리 내)."
+      },
+      "latents": {
+        "name": "latents",
+        "tooltip": "MakeTrainingDataset에서 생성된 latent 딕셔너리 목록입니다."
+      },
+      "shard_size": {
+        "name": "shard_size",
+        "tooltip": "샤드 파일당 샘플 개수입니다."
+      }
+    }
+  },
   "SaveVideo": {
     "description": "입력 이미지를 ComfyUI 출력 디렉토리에 저장합니다.",
     "display_name": "비디오 저장",
@@ -10160,6 +14038,11 @@
       "sigmas": {
         "name": "시그마 배열"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SetHookKeyframes": {
@@ -10200,6 +14083,58 @@
       }
     }
   },
+  "ShuffleDataset": {
+    "display_name": "이미지 데이터셋 섞기",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "처리할 이미지 목록입니다."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "랜덤 시드입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "처리된 이미지"
+      }
+    }
+  },
+  "ShuffleImageTextDataset": {
+    "display_name": "이미지-텍스트 데이터셋 섞기",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "섞을 이미지 목록입니다."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "랜덤 시드입니다."
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "섞을 텍스트 목록입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "섞인 이미지"
+      },
+      "1": {
+        "name": "texts",
+        "tooltip": "섞인 텍스트"
+      }
+    }
+  },
   "SkipLayerGuidanceDiT": {
     "description": "모든 DiT 모델에서 사용할 수 있는 '레이어 건너뛰기 가이던스' 노드의 범용 버전입니다.",
     "display_name": "레이어 건너뛰기 가이던스 (DiT)",
@@ -10296,6 +14231,11 @@
       "width": {
         "name": "너비"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SplitAudioChannels": {
@@ -10308,10 +14248,35 @@
     },
     "outputs": {
       "0": {
-        "name": "왼쪽"
+        "name": "왼쪽",
+        "tooltip": null
       },
       "1": {
-        "name": "오른쪽"
+        "name": "오른쪽",
+        "tooltip": null
+      }
+    }
+  },
+  "SplitImageToTileList": {
+    "description": "이미지를 지정된 오버랩으로 배치된 타일 목록으로 분할합니다.",
+    "display_name": "이미지를 타일 목록으로 분할",
+    "inputs": {
+      "image": {
+        "name": "image"
+      },
+      "overlap": {
+        "name": "overlap"
+      },
+      "tile_height": {
+        "name": "tile_height"
+      },
+      "tile_width": {
+        "name": "tile_width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
       }
     }
   },
@@ -10343,10 +14308,12 @@
     },
     "outputs": {
       "0": {
-        "name": "높은 시그마 배열"
+        "name": "하이 시그마",
+        "tooltip": null
       },
       "1": {
-        "name": "낮은 시그마 배열"
+        "name": "로우 시그마",
+        "tooltip": null
       }
     }
   },
@@ -10362,10 +14329,12 @@
     },
     "outputs": {
       "0": {
-        "name": "높은 시그마 배열"
+        "name": "하이 시그마",
+        "tooltip": null
       },
       "1": {
-        "name": "낮은 시그마 배열"
+        "name": "로우 시그마",
+        "tooltip": null
       }
     }
   },
@@ -10969,6 +14938,21 @@
       }
     }
   },
+  "StripWhitespace": {
+    "display_name": "공백 제거",
+    "inputs": {
+      "texts": {
+        "name": "texts",
+        "tooltip": "처리할 텍스트입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "texts",
+        "tooltip": "처리된 텍스트"
+      }
+    }
+  },
   "StyleModelApply": {
     "display_name": "스타일 모델 적용",
     "inputs": {
@@ -11054,6 +15038,123 @@
       }
     }
   },
+  "Tencent3DPartNode": {
+    "description": "모델 구조를 기반으로 자동으로 부품 식별 및 생성을 수행합니다.",
+    "display_name": "Hunyuan3D: 3D 파트",
+    "inputs": {
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "model_3d": {
+        "name": "model_3d",
+        "tooltip": "FBX 형식의 3D 모델입니다. 모델의 면 개수는 30,000개 미만이어야 합니다."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "시드는 노드가 다시 실행될지 여부를 제어합니다. 시드와 관계없이 결과는 비결정적입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "TencentImageToModelNode": {
+    "display_name": "Hunyuan3D: 이미지 → 모델 (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "face_count": {
+        "name": "면 개수"
+      },
+      "generate_type": {
+        "name": "생성 유형"
+      },
+      "generate_type_pbr": {
+        "name": "PBR"
+      },
+      "image": {
+        "name": "이미지"
+      },
+      "image_back": {
+        "name": "뒷면 이미지"
+      },
+      "image_left": {
+        "name": "왼쪽 이미지"
+      },
+      "image_right": {
+        "name": "오른쪽 이미지"
+      },
+      "model": {
+        "name": "모델",
+        "tooltip": "`3.1` 모델에서는 LowPoly 옵션을 사용할 수 없습니다."
+      },
+      "seed": {
+        "name": "시드",
+        "tooltip": "시드는 노드가 다시 실행될지 여부를 제어합니다. 시드와 관계없이 결과는 비결정적입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "모델 파일",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "OBJ",
+        "tooltip": null
+      }
+    }
+  },
+  "TencentTextToModelNode": {
+    "display_name": "Hunyuan3D: 텍스트 → 모델 (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "face_count": {
+        "name": "면 개수"
+      },
+      "generate_type": {
+        "name": "생성 유형"
+      },
+      "generate_type_pbr": {
+        "name": "PBR"
+      },
+      "model": {
+        "name": "모델",
+        "tooltip": "`3.1` 모델에서는 LowPoly 옵션을 사용할 수 없습니다."
+      },
+      "prompt": {
+        "name": "프롬프트",
+        "tooltip": "최대 1024자까지 지원합니다."
+      },
+      "seed": {
+        "name": "시드",
+        "tooltip": "시드는 노드가 다시 실행될지 여부를 제어합니다. 시드와 관계없이 결과는 비결정적입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "모델 파일",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "OBJ",
+        "tooltip": null
+      }
+    }
+  },
   "TextEncodeAceStepAudio": {
     "display_name": "TextEncodeAceStepAudio",
     "inputs": {
@@ -11076,6 +15177,65 @@
       }
     }
   },
+  "TextEncodeAceStepAudio1_5": {
+    "display_name": "TextEncodeAceStepAudio1.5",
+    "inputs": {
+      "bpm": {
+        "name": "BPM"
+      },
+      "cfg_scale": {
+        "name": "cfg_scale"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "duration": {
+        "name": "길이"
+      },
+      "generate_audio_codes": {
+        "name": "오디오 코드 생성",
+        "tooltip": "오디오 코드를 생성하는 LLM을 활성화합니다. 느릴 수 있지만 생성된 오디오의 품질이 향상됩니다. 모델에 오디오 참조를 제공하는 경우 이 옵션을 끄세요."
+      },
+      "keyscale": {
+        "name": "조성"
+      },
+      "language": {
+        "name": "언어"
+      },
+      "lyrics": {
+        "name": "가사"
+      },
+      "min_p": {
+        "name": "min_p"
+      },
+      "seed": {
+        "name": "시드"
+      },
+      "tags": {
+        "name": "태그"
+      },
+      "temperature": {
+        "name": "temperature"
+      },
+      "timesignature": {
+        "name": "박자"
+      },
+      "top_k": {
+        "name": "top_k"
+      },
+      "top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TextEncodeHunyuanVideo_ImageToVideo": {
     "display_name": "HunyuanVideo 텍스트 인코딩 (이미지 → 비디오)",
     "inputs": {
@@ -11149,6 +15309,158 @@
       }
     }
   },
+  "TextEncodeZImageOmni": {
+    "display_name": "TextEncodeZImageOmni",
+    "inputs": {
+      "auto_resize_images": {
+        "name": "이미지 자동 크기 조정"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "image1": {
+        "name": "이미지1"
+      },
+      "image2": {
+        "name": "이미지2"
+      },
+      "image3": {
+        "name": "이미지3"
+      },
+      "image_encoder": {
+        "name": "이미지 인코더"
+      },
+      "prompt": {
+        "name": "프롬프트"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TextGenerate": {
+    "display_name": "텍스트 생성",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image": {
+        "name": "이미지"
+      },
+      "max_length": {
+        "name": "최대 길이"
+      },
+      "prompt": {
+        "name": "프롬프트"
+      },
+      "sampling_mode": {
+        "name": "샘플링 모드"
+      },
+      "sampling_mode_min_p": {
+        "name": "최소 p"
+      },
+      "sampling_mode_repetition_penalty": {
+        "name": "반복 패널티"
+      },
+      "sampling_mode_seed": {
+        "name": "시드"
+      },
+      "sampling_mode_temperature": {
+        "name": "온도"
+      },
+      "sampling_mode_top_k": {
+        "name": "top_k"
+      },
+      "sampling_mode_top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "생성된 텍스트",
+        "tooltip": null
+      }
+    }
+  },
+  "TextGenerateLTX2Prompt": {
+    "display_name": "TextGenerateLTX2Prompt",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image": {
+        "name": "이미지"
+      },
+      "max_length": {
+        "name": "최대 길이"
+      },
+      "prompt": {
+        "name": "프롬프트"
+      },
+      "sampling_mode": {
+        "name": "샘플링 모드"
+      },
+      "sampling_mode_min_p": {
+        "name": "최소 p"
+      },
+      "sampling_mode_repetition_penalty": {
+        "name": "반복 패널티"
+      },
+      "sampling_mode_seed": {
+        "name": "시드"
+      },
+      "sampling_mode_temperature": {
+        "name": "온도"
+      },
+      "sampling_mode_top_k": {
+        "name": "top_k"
+      },
+      "sampling_mode_top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "생성된 텍스트",
+        "tooltip": null
+      }
+    }
+  },
+  "TextToLowercase": {
+    "display_name": "텍스트 소문자 변환",
+    "inputs": {
+      "texts": {
+        "name": "texts",
+        "tooltip": "처리할 텍스트입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "texts",
+        "tooltip": "처리된 텍스트"
+      }
+    }
+  },
+  "TextToUppercase": {
+    "display_name": "텍스트 대문자 변환",
+    "inputs": {
+      "texts": {
+        "name": "texts",
+        "tooltip": "처리할 텍스트입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "texts",
+        "tooltip": "처리된 텍스트"
+      }
+    }
+  },
   "ThresholdMask": {
     "display_name": "임계값 마스크",
     "inputs": {
@@ -11158,6 +15470,11 @@
       "value": {
         "name": "값"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "TomePatchModel": {
@@ -11176,6 +15493,118 @@
       }
     }
   },
+  "TopazImageEnhance": {
+    "description": "업계 표준 업스케일링 및 이미지 향상.",
+    "display_name": "Topaz 이미지 향상",
+    "inputs": {
+      "color_preservation": {
+        "name": "color_preservation",
+        "tooltip": "원본 색상을 보존합니다."
+      },
+      "creativity": {
+        "name": "creativity"
+      },
+      "crop_to_fill": {
+        "name": "crop_to_fill",
+        "tooltip": "기본적으로 출력 종횡비가 다를 때 이미지는 레터박스 처리됩니다. 출력 크기에 맞게 이미지를 자르려면 활성화하세요."
+      },
+      "face_enhancement": {
+        "name": "face_enhancement",
+        "tooltip": "처리 중 얼굴(존재 시)을 향상합니다."
+      },
+      "face_enhancement_creativity": {
+        "name": "face_enhancement_creativity",
+        "tooltip": "얼굴 향상에 대한 창의성 수준을 설정합니다."
+      },
+      "face_enhancement_strength": {
+        "name": "face_enhancement_strength",
+        "tooltip": "향상된 얼굴이 배경에 비해 얼마나 선명한지 조절합니다."
+      },
+      "face_preservation": {
+        "name": "face_preservation",
+        "tooltip": "피사체의 얼굴 정체성을 보존합니다."
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "output_height": {
+        "name": "output_height",
+        "tooltip": "0으로 설정하면 원본과 동일한 높이 또는 output_width에 맞춰 출력됩니다."
+      },
+      "output_width": {
+        "name": "output_width",
+        "tooltip": "0으로 설정하면 자동으로 계산됩니다(일반적으로 원본 크기 또는 output_height가 지정된 경우 해당 값 사용)."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "창의적인 업스케일링 가이드를 위한 선택적 텍스트 프롬프트입니다."
+      },
+      "subject_detection": {
+        "name": "subject_detection"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TopazVideoEnhance": {
+    "description": "강력한 업스케일링 및 복원 기술로 비디오에 새 생명을 불어넣으세요.",
+    "display_name": "Topaz Video Enhance",
+    "inputs": {
+      "dynamic_compression_level": {
+        "name": "dynamic_compression_level",
+        "tooltip": "CQP 레벨."
+      },
+      "interpolation_duplicate": {
+        "name": "interpolation_duplicate",
+        "tooltip": "입력에서 중복 프레임을 분석하여 제거합니다."
+      },
+      "interpolation_duplicate_threshold": {
+        "name": "interpolation_duplicate_threshold",
+        "tooltip": "중복 프레임 감지 민감도."
+      },
+      "interpolation_enabled": {
+        "name": "interpolation_enabled"
+      },
+      "interpolation_frame_rate": {
+        "name": "interpolation_frame_rate",
+        "tooltip": "출력 프레임 속도."
+      },
+      "interpolation_model": {
+        "name": "interpolation_model"
+      },
+      "interpolation_slowmo": {
+        "name": "interpolation_slowmo",
+        "tooltip": "입력 비디오에 적용되는 슬로우 모션 배수입니다. 예를 들어, 2로 설정하면 출력이 두 배 느려지고 길이도 두 배가 됩니다."
+      },
+      "upscaler_creativity": {
+        "name": "upscaler_creativity",
+        "tooltip": "창의성 수준 (Starlight (Astra) Creative에만 적용됩니다)."
+      },
+      "upscaler_enabled": {
+        "name": "upscaler_enabled"
+      },
+      "upscaler_model": {
+        "name": "upscaler_model"
+      },
+      "upscaler_resolution": {
+        "name": "upscaler_resolution"
+      },
+      "video": {
+        "name": "video"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TorchCompileModel": {
     "display_name": "모델 토치 컴파일",
     "inputs": {
@@ -11203,6 +15632,18 @@
         "name": "배치 크기",
         "tooltip": "학습에 사용할 배치 크기입니다."
       },
+      "bucket_mode": {
+        "name": "bucket_mode",
+        "tooltip": "해상도 버킷 모드를 활성화합니다. 활성화 시, ResolutionBucket 노드에서 미리 버킷 처리된 latent를 기대합니다."
+      },
+      "bypass_mode": {
+        "name": "bypass_mode",
+        "tooltip": "학습을 위한 바이패스 모드를 활성화합니다. 활성화 시, 어댑터가 가중치 수정 대신 forward hook을 통해 적용됩니다. 가중치를 직접 수정할 수 없는 양자화된 모델에 유용합니다."
+      },
+      "checkpoint_depth": {
+        "name": "checkpoint_depth",
+        "tooltip": "그래디언트 체크포인팅의 깊이 수준입니다."
+      },
       "control_after_generate": {
         "name": "생성 후 제어"
       },
@@ -11238,6 +15679,10 @@
         "name": "모델",
         "tooltip": "LoRA를 학습시킬 모델입니다."
       },
+      "offloading": {
+        "name": "offloading",
+        "tooltip": "그래디언트 체크포인팅의 깊이 수준입니다."
+      },
       "optimizer": {
         "name": "옵티마이저",
         "tooltip": "학습에 사용할 옵티마이저입니다."
@@ -11265,16 +15710,16 @@
     },
     "outputs": {
       "0": {
-        "name": "LoRA가 적용된 모델"
+        "name": "lora",
+        "tooltip": "LoRA가 적용된 모델"
       },
       "1": {
-        "name": "LoRA"
+        "name": "손실 맵",
+        "tooltip": "LoRA 가중치"
       },
       "2": {
-        "name": "손실"
-      },
-      "3": {
-        "name": "단계"
+        "name": "스텝",
+        "tooltip": "손실 기록"
       }
     }
   },
@@ -11293,6 +15738,11 @@
         "name": "시작 인덱스",
         "tooltip": "시작 시간(초), 음수일 경우 끝에서부터 계산 (소수 단위 지원)."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "TrimVideoLatent": {
@@ -11334,23 +15784,62 @@
   "TripoConversionNode": {
     "display_name": "Tripo: 모델 변환",
     "inputs": {
+      "animate_in_place": {
+        "name": "animate_in_place"
+      },
+      "bake": {
+        "name": "bake"
+      },
+      "export_orientation": {
+        "name": "export_orientation"
+      },
+      "export_vertex_colors": {
+        "name": "export_vertex_colors"
+      },
       "face_limit": {
         "name": "면 제한"
       },
+      "fbx_preset": {
+        "name": "fbx_preset"
+      },
+      "flatten_bottom": {
+        "name": "flatten_bottom"
+      },
+      "flatten_bottom_threshold": {
+        "name": "flatten_bottom_threshold"
+      },
+      "force_symmetry": {
+        "name": "force_symmetry"
+      },
       "format": {
         "name": "형식"
       },
       "original_model_task_id": {
         "name": "원본 모델 작업 ID"
       },
+      "pack_uv": {
+        "name": "pack_uv"
+      },
+      "part_names": {
+        "name": "part_names"
+      },
+      "pivot_to_center_bottom": {
+        "name": "pivot_to_center_bottom"
+      },
       "quad": {
         "name": "쿼드"
       },
+      "scale_factor": {
+        "name": "scale_factor"
+      },
       "texture_format": {
         "name": "텍스처 형식"
       },
       "texture_size": {
         "name": "텍스처 크기"
+      },
+      "with_animation": {
+        "name": "with_animation"
       }
     }
   },
@@ -11360,6 +15849,9 @@
       "face_limit": {
         "name": "얼굴 제한"
       },
+      "geometry_quality": {
+        "name": "geometry_quality"
+      },
       "image": {
         "name": "이미지"
       },
@@ -11401,7 +15893,11 @@
         "tooltip": null
       },
       "1": {
-        "name": "모델 작업 ID",
+        "name": "모델 task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11412,6 +15908,9 @@
       "face_limit": {
         "name": "얼굴 제한"
       },
+      "geometry_quality": {
+        "name": "geometry_quality"
+      },
       "image": {
         "name": "이미지"
       },
@@ -11459,7 +15958,11 @@
         "tooltip": null
       },
       "1": {
-        "name": "모델 작업 ID",
+        "name": "모델 task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11479,7 +15982,11 @@
         "tooltip": null
       },
       "1": {
-        "name": "모델 작업 ID",
+        "name": "모델 task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11500,7 +16007,11 @@
         "tooltip": null
       },
       "1": {
-        "name": "리타겟 작업 ID",
+        "name": "리타겟 task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11518,7 +16029,11 @@
         "tooltip": null
       },
       "1": {
-        "name": "리깅 작업 ID",
+        "name": "리깅 task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11529,6 +16044,9 @@
       "face_limit": {
         "name": "얼굴 제한"
       },
+      "geometry_quality": {
+        "name": "geometry_quality"
+      },
       "image_seed": {
         "name": "이미지 시드"
       },
@@ -11569,7 +16087,11 @@
         "tooltip": null
       },
       "1": {
-        "name": "모델 작업 ID",
+        "name": "모델 task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11602,8 +16124,31 @@
         "tooltip": null
       },
       "1": {
-        "name": "모델 작업 ID",
+        "name": "모델 task_id",
         "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "TruncateText": {
+    "display_name": "텍스트 자르기",
+    "inputs": {
+      "max_length": {
+        "name": "max_length",
+        "tooltip": "최대 텍스트 길이."
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "처리할 텍스트."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "texts",
+        "tooltip": "처리된 텍스트"
       }
     }
   },
@@ -11748,6 +16293,33 @@
       "vae": {
         "name": "vae"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VAEDecodeAudioTiled": {
+    "display_name": "VAE 오디오 디코드 (타일)",
+    "inputs": {
+      "overlap": {
+        "name": "오버랩"
+      },
+      "samples": {
+        "name": "샘플"
+      },
+      "tile_size": {
+        "name": "타일 크기"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VAEDecodeHunyuan3D": {
@@ -11765,6 +16337,11 @@
       "vae": {
         "name": "vae"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VAEDecodeTiled": {
@@ -11812,6 +16389,11 @@
       "vae": {
         "name": "vae"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VAEEncodeForInpaint": {
@@ -11890,6 +16472,63 @@
       "steps": {
         "name": "스텝 수"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Veo3FirstLastFrameNode": {
+    "description": "프롬프트와 첫 프레임, 마지막 프레임을 사용하여 비디오를 생성합니다.",
+    "display_name": "Google Veo 3 첫 프레임-마지막 프레임에서 비디오 생성",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "종횡비",
+        "tooltip": "출력 비디오의 종횡비"
+      },
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "duration": {
+        "name": "길이",
+        "tooltip": "출력 비디오의 길이(초)"
+      },
+      "first_frame": {
+        "name": "첫 프레임",
+        "tooltip": "시작 프레임"
+      },
+      "generate_audio": {
+        "name": "오디오 생성",
+        "tooltip": "비디오용 오디오를 생성합니다."
+      },
+      "last_frame": {
+        "name": "마지막 프레임",
+        "tooltip": "종료 프레임"
+      },
+      "model": {
+        "name": "모델"
+      },
+      "negative_prompt": {
+        "name": "네거티브 프롬프트",
+        "tooltip": "비디오에서 피하고 싶은 내용을 안내하는 네거티브 텍스트 프롬프트"
+      },
+      "prompt": {
+        "name": "프롬프트",
+        "tooltip": "비디오에 대한 텍스트 설명"
+      },
+      "resolution": {
+        "name": "해상도"
+      },
+      "seed": {
+        "name": "시드",
+        "tooltip": "비디오 생성용 시드"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "Veo3VideoGenerationNode": {
@@ -11996,6 +16635,31 @@
       }
     }
   },
+  "Video Slice": {
+    "display_name": "비디오 슬라이스",
+    "inputs": {
+      "duration": {
+        "name": "지속 시간",
+        "tooltip": "초 단위 지속 시간, 0은 무제한 지속"
+      },
+      "start_time": {
+        "name": "시작 시간",
+        "tooltip": "초 단위 시작 시간"
+      },
+      "strict_duration": {
+        "name": "엄격한 지속 시간",
+        "tooltip": "True로 설정 시, 지정한 지속 시간이 불가능하면 오류가 발생합니다."
+      },
+      "video": {
+        "name": "비디오"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "VideoLinearCFGGuidance": {
     "display_name": "비디오 선형 CFG 가이드",
     "inputs": {
@@ -12018,6 +16682,319 @@
       }
     }
   },
+  "Vidu2ImageToVideoNode": {
+    "description": "이미지와 선택적 프롬프트로부터 비디오를 생성합니다.",
+    "display_name": "Vidu2 이미지-비디오 생성",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "생성된 비디오의 시작 프레임으로 사용할 이미지입니다."
+      },
+      "model": {
+        "name": "model"
+      },
+      "movement_amplitude": {
+        "name": "movement_amplitude",
+        "tooltip": "프레임 내 객체의 움직임 진폭입니다."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "비디오 생성을 위한 선택적 텍스트 프롬프트 (최대 2000자)."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2ReferenceVideoNode": {
+    "description": "여러 참조 이미지와 프롬프트로부터 비디오를 생성합니다.",
+    "display_name": "Vidu2 참조-비디오 생성",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "audio": {
+        "name": "audio",
+        "tooltip": "활성화 시, 프롬프트를 기반으로 생성된 음성과 배경 음악이 비디오에 포함됩니다."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "model": {
+        "name": "model"
+      },
+      "movement_amplitude": {
+        "name": "movement_amplitude",
+        "tooltip": "프레임 내 객체의 움직임 진폭입니다."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "활성화 시, 프롬프트를 기반으로 생성된 음성과 배경 음악이 비디오에 포함됩니다."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "subjects": {
+        "name": "subjects",
+        "tooltip": "각 subject마다 최대 3개의 참조 이미지를 제공합니다 (전체 subject 합계 7장). 프롬프트에서 @subject{subject_id}로 참조하세요."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2StartEndToVideoNode": {
+    "description": "시작 프레임, 종료 프레임, 프롬프트로부터 비디오를 생성합니다.",
+    "display_name": "Vidu2 시작/종료 프레임-투-비디오 생성",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "end_frame": {
+        "name": "end_frame"
+      },
+      "first_frame": {
+        "name": "first_frame"
+      },
+      "model": {
+        "name": "model"
+      },
+      "movement_amplitude": {
+        "name": "movement_amplitude",
+        "tooltip": "프레임 내 객체의 움직임 진폭입니다."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "프롬프트 설명 (최대 2000자)."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2TextToVideoNode": {
+    "description": "텍스트 프롬프트로부터 비디오를 생성합니다.",
+    "display_name": "Vidu2 텍스트-투-비디오 생성",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "background_music": {
+        "name": "background_music",
+        "tooltip": "생성된 비디오에 배경 음악을 추가할지 여부입니다."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "비디오 생성을 위한 텍스트 설명 (최대 2000자)."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3ImageToVideoNode": {
+    "description": "이미지와 선택적 프롬프트로부터 비디오를 생성합니다.",
+    "display_name": "Vidu Q3 이미지-비디오 생성",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "생성된 비디오의 시작 프레임으로 사용할 이미지입니다."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "비디오 생성을 위해 사용할 모델입니다."
+      },
+      "model_audio": {
+        "name": "audio"
+      },
+      "model_duration": {
+        "name": "duration"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "비디오 생성을 위한 선택적 텍스트 프롬프트 (최대 2000자)."
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3StartEndToVideoNode": {
+    "description": "시작 프레임, 종료 프레임, 프롬프트를 사용하여 비디오를 생성합니다.",
+    "display_name": "Vidu Q3 시작/종료 프레임-투-비디오 생성",
+    "inputs": {
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "end_frame": {
+        "name": "종료 프레임"
+      },
+      "first_frame": {
+        "name": "시작 프레임"
+      },
+      "model": {
+        "name": "모델",
+        "tooltip": "비디오 생성을 위해 사용할 모델입니다."
+      },
+      "model_audio": {
+        "name": "오디오"
+      },
+      "model_duration": {
+        "name": "길이"
+      },
+      "model_resolution": {
+        "name": "해상도"
+      },
+      "prompt": {
+        "name": "프롬프트",
+        "tooltip": "프롬프트 설명 (최대 2000자)."
+      },
+      "seed": {
+        "name": "시드"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3TextToVideoNode": {
+    "description": "텍스트 프롬프트로부터 비디오를 생성합니다.",
+    "display_name": "Vidu Q3 텍스트-비디오 생성",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "비디오 생성을 위해 사용할 모델입니다."
+      },
+      "model_aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "model_audio": {
+        "name": "audio"
+      },
+      "model_duration": {
+        "name": "duration"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "비디오 생성을 위한 텍스트 설명 (최대 2000자)."
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ViduExtendVideoNode": {
+    "description": "기존 비디오에 추가 프레임을 생성하여 확장합니다.",
+    "display_name": "Vidu 비디오 확장",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "end_frame": {
+        "name": "end_frame"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "비디오 확장을 위해 사용할 모델입니다."
+      },
+      "model_duration": {
+        "name": "duration"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "확장된 비디오를 위한 선택적 텍스트 프롬프트 (최대 2000자)."
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "확장할 원본 비디오입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ViduImageToVideoNode": {
     "description": "이미지와 선택적 프롬프트로부터 비디오 생성",
     "display_name": "Vidu 이미지 비디오 생성",
@@ -12060,6 +17037,49 @@
       }
     }
   },
+  "ViduMultiFrameVideoNode": {
+    "description": "여러 키프레임 전환이 포함된 비디오를 생성합니다.",
+    "display_name": "Vidu 다중 프레임 비디오 생성",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "frames": {
+        "name": "frames",
+        "tooltip": "키프레임 전환 수 (2-9)."
+      },
+      "frames_duration1": {
+        "name": "duration1"
+      },
+      "frames_duration2": {
+        "name": "duration2"
+      },
+      "frames_prompt1": {
+        "name": "prompt1"
+      },
+      "frames_prompt2": {
+        "name": "prompt2"
+      },
+      "model": {
+        "name": "model"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "start_image": {
+        "name": "start_image",
+        "tooltip": "시작 프레임 이미지입니다. 종횡비는 1:4에서 4:1 사이여야 합니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ViduReferenceVideoNode": {
     "description": "여러 이미지와 프롬프트로부터 비디오 생성",
     "display_name": "Vidu 참조 비디오 생성",
@@ -12206,6 +17226,11 @@
       "voxel": {
         "name": "복셀"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VoxelToMeshBasic": {
@@ -12217,6 +17242,11 @@
       "voxel": {
         "name": "복셀"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "Wan22FunControlToVideo": {
@@ -12496,6 +17526,10 @@
         "name": "컨텍스트 스트라이드",
         "tooltip": "컨텍스트 창의 스트라이드입니다. 균일 스케줄에만 적용됩니다."
       },
+      "freenoise": {
+        "name": "freenoise",
+        "tooltip": "FreeNoise 노이즈 셔플을 적용할지 여부, 윈도우 블렌딩을 향상시킵니다."
+      },
       "fuse_method": {
         "name": "퓨즈 방법",
         "tooltip": "컨텍스트 창을 융합하는 데 사용할 방법입니다."
@@ -12836,6 +17870,10 @@
         "name": "시드",
         "tooltip": "생성에 사용할 시드 값입니다."
       },
+      "shot_type": {
+        "name": "샷 타입",
+        "tooltip": "생성된 비디오의 샷 타입을 지정합니다. 즉, 비디오가 단일 연속 샷인지, 컷이 있는 여러 샷인지 설정합니다. 이 파라미터는 prompt_extend가 True일 때만 적용됩니다."
+      },
       "watermark": {
         "name": "워터마크",
         "tooltip": "결과물에 \"AI 생성\" 워터마크를 추가할지 여부입니다."
@@ -12847,6 +17885,196 @@
       }
     }
   },
+  "WanInfiniteTalkToVideo": {
+    "display_name": "WanInfiniteTalkToVideo",
+    "inputs": {
+      "audio_encoder_output_1": {
+        "name": "audio_encoder_output_1"
+      },
+      "audio_scale": {
+        "name": "audio_scale"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length"
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "model": {
+        "name": "model"
+      },
+      "model_patch": {
+        "name": "model_patch"
+      },
+      "motion_frame_count": {
+        "name": "motion_frame_count",
+        "tooltip": "이전 프레임 수를 모션 컨텍스트로 사용합니다."
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "previous_frames": {
+        "name": "previous_frames"
+      },
+      "start_image": {
+        "name": "start_image"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model",
+        "tooltip": null
+      },
+      "1": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "2": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "3": {
+        "name": "latent",
+        "tooltip": null
+      },
+      "4": {
+        "name": "trim_image",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveConcatTrack": {
+    "display_name": "WanMoveConcatTrack",
+    "inputs": {
+      "tracks_1": {
+        "name": "트랙 1"
+      },
+      "tracks_2": {
+        "name": "트랙 2"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveTrackToVideo": {
+    "display_name": "WanMoveTrackToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "배치 크기"
+      },
+      "clip_vision_output": {
+        "name": "clip 비전 출력"
+      },
+      "height": {
+        "name": "높이"
+      },
+      "length": {
+        "name": "길이"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "start_image": {
+        "name": "시작 이미지"
+      },
+      "strength": {
+        "name": "강도",
+        "tooltip": "트랙 컨디셔닝의 강도입니다."
+      },
+      "tracks": {
+        "name": "트랙"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "너비"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveTracksFromCoords": {
+    "display_name": "WanMoveTracksFromCoords",
+    "inputs": {
+      "track_coords": {
+        "name": "트랙 좌표"
+      },
+      "track_mask": {
+        "name": "트랙 마스크"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "트랙 길이",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveVisualizeTracks": {
+    "display_name": "WanMoveVisualizeTracks",
+    "inputs": {
+      "circle_size": {
+        "name": "원 크기"
+      },
+      "images": {
+        "name": "이미지"
+      },
+      "line_resolution": {
+        "name": "선 해상도"
+      },
+      "line_width": {
+        "name": "선 두께"
+      },
+      "opacity": {
+        "name": "불투명도"
+      },
+      "tracks": {
+        "name": "트랙"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "WanPhantomSubjectToVideo": {
     "display_name": "WanPhantomSubjectToVideo",
     "inputs": {
@@ -12894,6 +18122,113 @@
       }
     }
   },
+  "WanReferenceVideoApi": {
+    "description": "입력 비디오의 캐릭터와 음성을 프롬프트와 결합하여 캐릭터 일관성을 유지하는 새로운 비디오를 생성합니다.",
+    "display_name": "Wan Reference to Video",
+    "inputs": {
+      "control_after_generate": {
+        "name": "생성 후 제어"
+      },
+      "duration": {
+        "name": "길이"
+      },
+      "model": {
+        "name": "모델"
+      },
+      "negative_prompt": {
+        "name": "네거티브 프롬프트",
+        "tooltip": "피해야 할 내용을 설명하는 네거티브 프롬프트입니다."
+      },
+      "prompt": {
+        "name": "프롬프트",
+        "tooltip": "요소와 시각적 특징을 설명하는 프롬프트입니다. 영어와 중국어를 지원합니다. 참조 캐릭터를 지칭할 때 `character1`, `character2`와 같은 식별자를 사용하세요."
+      },
+      "reference_videos": {
+        "name": "참조 비디오"
+      },
+      "seed": {
+        "name": "시드"
+      },
+      "shot_type": {
+        "name": "샷 타입",
+        "tooltip": "생성된 비디오의 샷 타입을 지정합니다. 즉, 비디오가 하나의 연속된 샷인지, 컷이 있는 여러 샷인지 지정합니다."
+      },
+      "size": {
+        "name": "크기"
+      },
+      "watermark": {
+        "name": "워터마크",
+        "tooltip": "결과에 AI 생성 워터마크를 추가할지 여부입니다."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanSCAILToVideo": {
+    "display_name": "WanSCAILToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "배치 크기"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "높이"
+      },
+      "length": {
+        "name": "길이"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "pose_end": {
+        "name": "포즈 종료",
+        "tooltip": "포즈 컨디셔닝을 적용할 마지막 스텝입니다."
+      },
+      "pose_start": {
+        "name": "포즈 시작",
+        "tooltip": "포즈 컨디셔닝을 적용할 시작 스텝입니다."
+      },
+      "pose_strength": {
+        "name": "포즈 강도",
+        "tooltip": "포즈 latent의 강도입니다."
+      },
+      "pose_video": {
+        "name": "포즈 비디오",
+        "tooltip": "포즈 컨디셔닝에 사용되는 비디오입니다. 메인 비디오 해상도의 절반으로 다운스케일됩니다."
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "reference_image": {
+        "name": "참조 이미지"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "너비"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": "생성 크기의 빈 latent입니다."
+      }
+    }
+  },
   "WanSoundImageToVideo": {
     "display_name": "WanSoundImageToVideo",
     "inputs": {
@@ -13072,6 +18407,10 @@
         "name": "시드",
         "tooltip": "생성에 사용할 시드 값."
       },
+      "shot_type": {
+        "name": "샷 타입",
+        "tooltip": "생성된 비디오의 샷 타입을 지정합니다. 즉, 비디오가 하나의 연속된 샷인지, 컷이 있는 여러 샷인지 지정합니다. 이 파라미터는 prompt_extend가 True일 때만 적용됩니다."
+      },
       "size": {
         "name": "크기"
       },
@@ -13197,6 +18536,43 @@
       }
     }
   },
+  "WavespeedFlashVSRNode": {
+    "description": "저해상도 또는 흐릿한 영상의 해상도를 높이고 선명도를 복원하는 빠르고 고품질의 비디오 업스케일러입니다.",
+    "display_name": "FlashVSR 비디오 업스케일",
+    "inputs": {
+      "target_resolution": {
+        "name": "목표 해상도"
+      },
+      "video": {
+        "name": "비디오"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WavespeedImageUpscaleNode": {
+    "description": "이미지 해상도와 품질을 높여 사진을 4K 또는 8K로 업스케일하여 선명하고 디테일한 결과를 제공합니다.",
+    "display_name": "WaveSpeed 이미지 업스케일",
+    "inputs": {
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "target_resolution": {
+        "name": "목표 해상도"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "WebcamCapture": {
     "display_name": "웹캠 캡처",
     "inputs": {
@@ -13209,13 +18585,38 @@
       "image": {
         "name": "이미지"
       },
-      "waiting for camera___": {
-      },
+      "waiting for camera___": {},
       "width": {
         "name": "너비"
       }
     }
   },
+  "ZImageFunControlnet": {
+    "display_name": "ZImageFunControlnet",
+    "inputs": {
+      "image": {
+        "name": "이미지"
+      },
+      "inpaint_image": {
+        "name": "인페인트 이미지"
+      },
+      "mask": {
+        "name": "mask"
+      },
+      "model": {
+        "name": "모델"
+      },
+      "model_patch": {
+        "name": "모델 패치"
+      },
+      "strength": {
+        "name": "강도"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
   "unCLIPCheckpointLoader": {
     "display_name": "unCLIP 체크포인트 로드",
     "inputs": {
@@ -13240,5 +18641,19 @@
         "name": "강도"
       }
     }
+  },
+  "wanBlockSwap": {
+    "description": "NOP",
+    "display_name": "wanBlockSwap",
+    "inputs": {
+      "model": {
+        "name": "모델"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
   }
 }
diff --git a/src/locales/ko/settings.json b/src/locales/ko/settings.json
index aed0569553..a92f65fc67 100644
--- a/src/locales/ko/settings.json
+++ b/src/locales/ko/settings.json
@@ -52,7 +52,8 @@
     }
   },
   "Comfy_Canvas_SelectionToolbox": {
-    "name": "선택 도구 상자 표시"
+    "name": "선택 도구 상자 표시",
+    "tooltip": "노드가 선택되었을 때 공통 작업에 빠르게 접근할 수 있는 플로팅 툴바를 표시합니다."
   },
   "Comfy_ConfirmClear": {
     "name": "워크플로 비우기 시 확인 요구"
@@ -79,6 +80,17 @@
   "Comfy_EnableWorkflowViewRestore": {
     "name": "워크플로에서 캔버스 위치 및 확대/축소 수준 저장 및 복원"
   },
+  "Comfy_Execution_PreviewMethod": {
+    "name": "라이브 미리보기 방식",
+    "options": {
+      "auto": "auto",
+      "default": "default",
+      "latent2rgb": "latent2rgb",
+      "none": "none",
+      "taesd": "taesd"
+    },
+    "tooltip": "이미지 생성 중 라이브 미리보기 방식입니다. \"default\"는 서버 CLI 설정을 사용합니다."
+  },
   "Comfy_FloatRoundingPrecision": {
     "name": "부동 소수점 위젯 반올림 소수 자리 수 [0 = 자동]",
     "tooltip": "(페이지 새로 고침 필요)"
@@ -92,6 +104,10 @@
   "Comfy_Graph_CtrlShiftZoom": {
     "name": "빠른 확대/축소 단축키 활성화 (Ctrl + Shift + 드래그)"
   },
+  "Comfy_Graph_DeduplicateSubgraphNodeIds": {
+    "name": "서브그래프 노드 ID 중복 제거",
+    "tooltip": "워크플로우를 불러올 때 서브그래프 내 중복된 노드 ID를 자동으로 재할당합니다."
+  },
   "Comfy_Graph_LinkMarkers": {
     "name": "링크 중간점 마커",
     "options": {
@@ -100,6 +116,10 @@
       "None": "없음"
     }
   },
+  "Comfy_Graph_LiveSelection": {
+    "name": "실시간 선택",
+    "tooltip": "활성화하면, 다른 디자인 툴처럼 선택 사각형을 드래그할 때 노드가 실시간으로 선택/해제됩니다."
+  },
   "Comfy_Graph_ZoomSpeed": {
     "name": "캔버스 확대/축소 속도"
   },
@@ -132,43 +152,53 @@
       "Linear": "선형",
       "Spline": "스플라인",
       "Straight": "직선"
-    }
+    },
+    "tooltip": "캔버스에서 노드 간 연결 링크의 모양과 표시 여부를 제어합니다."
   },
   "Comfy_Load3D_3DViewerEnable": {
     "name": "3D 뷰어 활성화 (베타)",
-    "tooltip": "선택한 노드에 대해 3D 뷰어(베타)를 활성화합니다. 이 기능을 통해 전체 크기의 3D 뷰어에서 3D 모델을 직접 시각화하고 상호작용할 수 있습니다."
+    "tooltip": "선택한 노드에 대해 3D 뷰어(베타)를 활성화합니다. 이 기능을 통해 전체 크기의 3D 뷰어 내에서 3D 모델을 시각화하고 직접 상호작용할 수 있습니다."
   },
   "Comfy_Load3D_BackgroundColor": {
     "name": "초기 배경색",
-    "tooltip": "3D 장면의 기본 배경색을 설정합니다. 이 설정은 새 3D 위젯이 생성될 때 배경의 모양을 결정하지만, 생성 후 각 위젯별로 개별적으로 조정할 수 있습니다."
+    "tooltip": "3D 장면의 기본 배경색을 설정합니다. 이 설정은 새 3D 위젯이 생성될 때의 배경 모양을 결정하지만, 생성 후 각 위젯별로 개별 조정이 가능합니다."
   },
   "Comfy_Load3D_CameraType": {
-    "name": "카메라 유형",
+    "name": "초기 카메라 타입",
     "options": {
-      "orthographic": "직교법",
-      "perspective": "원근법"
+      "orthographic": "orthographic",
+      "perspective": "perspective"
     },
-    "tooltip": "새로운 3D 위젯이 생성될 때 카메라가 기본적으로 원근법 또는 직교법을 사용하는지를 제어합니다. 이 기본값은 생성 후 각 위젯별로 개별적으로 전환할 수 있습니다."
+    "tooltip": "새 3D 위젯이 생성될 때 카메라가 기본적으로 원근(perspective) 또는 직교(orthographic)인지 제어합니다. 이 기본값은 생성 후 각 위젯별로 개별 전환이 가능합니다."
   },
   "Comfy_Load3D_LightAdjustmentIncrement": {
-    "name": "조명 조정 증가량",
-    "tooltip": "3D 장면에서 조명 강도를 조정할 때 증가하는 크기를 제어합니다. 값이 작을수록 조명을 더 세밀하게 조정할 수 있고, 값이 클수록 한 번에 더 눈에 띄는 변화가 발생합니다."
+    "name": "조명 조정 단위",
+    "tooltip": "3D 장면에서 조명 강도를 조정할 때의 증분 크기를 제어합니다. 더 작은 값은 조명 조정에 더 세밀한 제어를 제공하며, 더 큰 값은 한 번의 조정마다 더 뚜렷한 변화를 줍니다."
   },
   "Comfy_Load3D_LightIntensity": {
     "name": "초기 조명 강도",
-    "tooltip": "3D 장면에서 조명의 기본 밝기 수준을 설정합니다. 이 값은 새 3D 위젯이 생성될 때 조명이 오브젝트를 얼마나 강하게 비추는지 결정하지만, 생성 후 각 위젯별로 개별적으로 조정할 수 있습니다."
+    "tooltip": "3D 장면의 기본 조명 밝기 수준을 설정합니다. 이 값은 새 3D 위젯이 생성될 때 조명이 오브젝트를 얼마나 밝게 비추는지 결정하지만, 생성 후 각 위젯별로 개별 조정이 가능합니다."
   },
   "Comfy_Load3D_LightIntensityMaximum": {
     "name": "최대 조명 강도",
-    "tooltip": "3D 장면에서 허용되는 최대 조명 강도 값을 설정합니다. 이는 모든 3D 위젯에서 조명을 조정할 때 설정할 수 있는 밝기의 상한선을 정의합니다."
+    "tooltip": "3D 장면에서 허용되는 최대 조명 강도 값을 설정합니다. 이 값은 모든 3D 위젯에서 조명 조정 시 설정할 수 있는 밝기의 상한선을 정의합니다."
   },
   "Comfy_Load3D_LightIntensityMinimum": {
-    "name": "최소 광원 세기",
-    "tooltip": "3D 장면에서 허용되는 최소 광원 세기 값을 설정합니다. 이는 모든 3D 위젯에서 조명을 조정할 때 설정할 수 있는 밝기의 하한을 정의합니다."
+    "name": "최소 조명 강도",
+    "tooltip": "3D 장면에서 허용되는 최소 조명 강도 값을 설정합니다. 이 값은 모든 3D 위젯에서 조명 조정 시 설정할 수 있는 밝기의 하한선을 정의합니다."
+  },
+  "Comfy_Load3D_PLYEngine": {
+    "name": "PLY 엔진",
+    "options": {
+      "fastply": "fastply",
+      "sparkjs": "sparkjs",
+      "threejs": "threejs"
+    },
+    "tooltip": "PLY 파일을 불러올 엔진을 선택합니다. \"threejs\"는 네이티브 Three.js PLYLoader를 사용하며(메시 PLY 파일에 적합), \"fastply\"는 ASCII 포인트 클라우드 PLY 파일에 최적화된 로더를 사용합니다. \"sparkjs\"는 3D Gaussian Splatting PLY 파일에 Spark.js를 사용합니다."
   },
   "Comfy_Load3D_ShowGrid": {
-    "name": "그리드 표시",
-    "tooltip": "기본적으로 그리드를 표시하도록 전환"
+    "name": "초기 그리드 표시",
+    "tooltip": "새 3D 위젯이 생성될 때 그리드가 기본적으로 표시되는지 제어합니다. 이 기본값은 생성 후 각 위젯별로 개별 전환이 가능합니다."
   },
   "Comfy_Locale": {
     "name": "언어"
@@ -218,11 +248,20 @@
   "Comfy_NodeBadge_ShowApiPricing": {
     "name": "API 노드 가격 배지 표시"
   },
+  "Comfy_NodeLibrary_NewDesign": {
+    "name": "새로운 노드 라이브러리 디자인",
+    "tooltip": "탭(필수, 전체, 사용자 정의), 향상된 검색, 그리고 미리보기 기능이 추가된 새롭게 디자인된 노드 라이브러리 사이드바를 활성화합니다."
+  },
+  "Comfy_NodeReplacement_Enabled": {
+    "name": "노드 교체 제안 활성화",
+    "tooltip": "활성화하면, 교체 매핑이 존재하는 누락 노드가 교체 가능으로 표시되어 검토 후 교체할 수 있습니다."
+  },
   "Comfy_NodeSearchBoxImpl": {
     "name": "노드 검색 상자 구현",
     "options": {
       "default": "기본",
-      "litegraph (legacy)": "litegraph (구버전)"
+      "litegraph (legacy)": "litegraph (구버전)",
+      "v1 (legacy)": "v1 (legacy)"
     }
   },
   "Comfy_NodeSearchBoxImpl_NodePreview": {
@@ -248,6 +287,10 @@
   "Comfy_Node_AllowImageSizeDraw": {
     "name": "이미지 미리보기 아래에 너비 × 높이 표시"
   },
+  "Comfy_Node_AlwaysShowAdvancedWidgets": {
+    "name": "모든 노드에서 고급 위젯 항상 표시",
+    "tooltip": "이 옵션을 활성화하면, 모든 노드에서 고급 위젯이 개별적으로 확장하지 않아도 항상 표시됩니다."
+  },
   "Comfy_Node_AutoSnapLinkToSlot": {
     "name": "링크를 노드 슬롯에 자동 스냅",
     "tooltip": "링크를 노드 위로 드래그할 때 링크가 노드의 유효한 입력 슬롯에 자동으로 스냅됩니다."
@@ -308,6 +351,14 @@
     "name": "실행 큐 기록 갯수",
     "tooltip": "실행 큐 기록에 표시되는 최대 작업 수입니다."
   },
+  "Comfy_Queue_QPOV2": {
+    "name": "에셋 사이드 패널에서 통합 작업 큐 사용",
+    "tooltip": "떠다니는 작업 큐 패널을 에셋 사이드 패널에 내장된 동등한 작업 큐로 대체합니다. 이 옵션을 비활성화하면 기존의 떠다니는 패널 레이아웃으로 돌아갈 수 있습니다."
+  },
+  "Comfy_RightSidePanel_ShowErrorsTab": {
+    "name": "오류 탭을 사이드 패널에 표시",
+    "tooltip": "활성화하면 오른쪽 사이드 패널에 오류 탭이 표시되어 워크플로 실행 오류를 한눈에 확인할 수 있습니다."
+  },
   "Comfy_Sidebar_Location": {
     "name": "사이드바 위치",
     "options": {
@@ -345,6 +396,14 @@
   "Comfy_TreeExplorer_ItemPadding": {
     "name": "트리 탐색기 항목 패딩"
   },
+  "Comfy_UI_TabBarLayout": {
+    "name": "탭 바 레이아웃",
+    "options": {
+      "Default": "기본값",
+      "Integrated": "통합"
+    },
+    "tooltip": "탭 바의 레이아웃을 제어합니다. \"통합\"을 선택하면 도움말과 사용자 컨트롤이 탭 바 영역으로 이동합니다."
+  },
   "Comfy_UseNewMenu": {
     "name": "새 메뉴 사용",
     "options": {
@@ -434,6 +493,7 @@
     "tooltip": "경유점 중심에서 베지어 제어점까지의 오프셋"
   },
   "pysssss_SnapToGrid": {
-    "name": "항상 그리드에 스냅"
+    "name": "항상 그리드에 스냅",
+    "tooltip": "활성화하면 노드를 이동하거나 크기를 조정할 때 자동으로 그리드에 정렬됩니다."
   }
 }
diff --git a/src/locales/pt-BR/commands.json b/src/locales/pt-BR/commands.json
index 0967ef424b..2a237be96a 100644
--- a/src/locales/pt-BR/commands.json
+++ b/src/locales/pt-BR/commands.json
@@ -1 +1,367 @@
-{}
+{
+  "Comfy-Desktop_CheckForUpdates": {
+    "label": "Verificar atualizações"
+  },
+  "Comfy-Desktop_Folders_OpenCustomNodesFolder": {
+    "label": "Abrir pasta de nós personalizados"
+  },
+  "Comfy-Desktop_Folders_OpenInputsFolder": {
+    "label": "Abrir pasta de entradas"
+  },
+  "Comfy-Desktop_Folders_OpenLogsFolder": {
+    "label": "Abrir pasta de logs"
+  },
+  "Comfy-Desktop_Folders_OpenModelConfig": {
+    "label": "Abrir extra_model_paths.yaml"
+  },
+  "Comfy-Desktop_Folders_OpenModelsFolder": {
+    "label": "Abrir pasta de modelos"
+  },
+  "Comfy-Desktop_Folders_OpenOutputsFolder": {
+    "label": "Abrir pasta de saídas"
+  },
+  "Comfy-Desktop_OpenDevTools": {
+    "label": "Abrir ferramentas de desenvolvedor"
+  },
+  "Comfy-Desktop_OpenUserGuide": {
+    "label": "Guia do usuário para desktop"
+  },
+  "Comfy-Desktop_Quit": {
+    "label": "Sair"
+  },
+  "Comfy-Desktop_Reinstall": {
+    "label": "Reinstalar"
+  },
+  "Comfy-Desktop_Restart": {
+    "label": "Reiniciar"
+  },
+  "Comfy_3DViewer_Open3DViewer": {
+    "label": "Abrir Visualizador 3D (Beta) para o Nó Selecionado"
+  },
+  "Comfy_BrowseModelAssets": {
+    "label": "Experimental: Navegar pelos ativos de modelo"
+  },
+  "Comfy_BrowseTemplates": {
+    "label": "Navegar por modelos"
+  },
+  "Comfy_Canvas_CopySelected": {
+    "label": "Copiar"
+  },
+  "Comfy_Canvas_DeleteSelectedItems": {
+    "label": "Excluir itens selecionados"
+  },
+  "Comfy_Canvas_FitView": {
+    "label": "Ajustar visualização aos nós selecionados"
+  },
+  "Comfy_Canvas_Lock": {
+    "label": "Travar tela"
+  },
+  "Comfy_Canvas_MoveSelectedNodes_Down": {
+    "label": "Mover nós selecionados para baixo"
+  },
+  "Comfy_Canvas_MoveSelectedNodes_Left": {
+    "label": "Mover nós selecionados para a esquerda"
+  },
+  "Comfy_Canvas_MoveSelectedNodes_Right": {
+    "label": "Mover nós selecionados para a direita"
+  },
+  "Comfy_Canvas_MoveSelectedNodes_Up": {
+    "label": "Mover nós selecionados para cima"
+  },
+  "Comfy_Canvas_PasteFromClipboard": {
+    "label": "Colar"
+  },
+  "Comfy_Canvas_ResetView": {
+    "label": "Redefinir visualização"
+  },
+  "Comfy_Canvas_Resize": {
+    "label": "Redimensionar nós selecionados"
+  },
+  "Comfy_Canvas_SelectAll": {
+    "label": "Selecionar tudo"
+  },
+  "Comfy_Canvas_ToggleLinkVisibility": {
+    "label": "Alternar visibilidade dos links na tela"
+  },
+  "Comfy_Canvas_ToggleLock": {
+    "label": "Alternar trava da tela"
+  },
+  "Comfy_Canvas_ToggleMinimap": {
+    "label": "Alternar minimapa da tela"
+  },
+  "Comfy_Canvas_ToggleSelectedNodes_Bypass": {
+    "label": "Ignorar/Não ignorar nós selecionados"
+  },
+  "Comfy_Canvas_ToggleSelectedNodes_Collapse": {
+    "label": "Recolher/Expandir nós selecionados"
+  },
+  "Comfy_Canvas_ToggleSelectedNodes_Mute": {
+    "label": "Silenciar/Ativar som dos nós selecionados"
+  },
+  "Comfy_Canvas_ToggleSelectedNodes_Pin": {
+    "label": "Fixar/Desafixar nós selecionados"
+  },
+  "Comfy_Canvas_ToggleSelected_Pin": {
+    "label": "Fixar/Desafixar itens selecionados"
+  },
+  "Comfy_Canvas_Unlock": {
+    "label": "Destravar tela"
+  },
+  "Comfy_Canvas_ZoomIn": {
+    "label": "Aproximar"
+  },
+  "Comfy_Canvas_ZoomOut": {
+    "label": "Afastar"
+  },
+  "Comfy_ClearPendingTasks": {
+    "label": "Limpar tarefas pendentes"
+  },
+  "Comfy_ClearWorkflow": {
+    "label": "Limpar fluxo de trabalho"
+  },
+  "Comfy_ContactSupport": {
+    "label": "Entrar em contato com o suporte"
+  },
+  "Comfy_Dev_ShowModelSelector": {
+    "label": "Mostrar seletor de modelo (Dev)"
+  },
+  "Comfy_DuplicateWorkflow": {
+    "label": "Duplicar fluxo de trabalho atual"
+  },
+  "Comfy_ExportWorkflow": {
+    "label": "Exportar fluxo de trabalho"
+  },
+  "Comfy_ExportWorkflowAPI": {
+    "label": "Exportar fluxo de trabalho (formato API)"
+  },
+  "Comfy_Graph_ConvertToSubgraph": {
+    "label": "Converter seleção em subgrafo"
+  },
+  "Comfy_Graph_EditSubgraphWidgets": {
+    "label": "Editar widgets do subgrafo"
+  },
+  "Comfy_Graph_ExitSubgraph": {
+    "label": "Sair do subgrafo"
+  },
+  "Comfy_Graph_FitGroupToContents": {
+    "label": "Ajustar grupo ao conteúdo"
+  },
+  "Comfy_Graph_GroupSelectedNodes": {
+    "label": "Agrupar nós selecionados"
+  },
+  "Comfy_Graph_ToggleWidgetPromotion": {
+    "label": "Alternar promoção do widget sob o cursor"
+  },
+  "Comfy_Graph_UnpackSubgraph": {
+    "label": "Desempacotar o Subgrafo selecionado"
+  },
+  "Comfy_GroupNode_ConvertSelectedNodesToGroupNode": {
+    "label": "Converter nós selecionados em nó de grupo"
+  },
+  "Comfy_GroupNode_ManageGroupNodes": {
+    "label": "Gerenciar nós de grupo"
+  },
+  "Comfy_GroupNode_UngroupSelectedGroupNodes": {
+    "label": "Desagrupar nós de grupo selecionados"
+  },
+  "Comfy_Help_AboutComfyUI": {
+    "label": "Abrir Sobre o ComfyUI"
+  },
+  "Comfy_Help_OpenComfyOrgDiscord": {
+    "label": "Abrir Comfy-Org Discord"
+  },
+  "Comfy_Help_OpenComfyUIDocs": {
+    "label": "Abrir Documentação do ComfyUI"
+  },
+  "Comfy_Help_OpenComfyUIForum": {
+    "label": "Abrir Fórum do ComfyUI"
+  },
+  "Comfy_Help_OpenComfyUIIssues": {
+    "label": "Abrir Issues do ComfyUI"
+  },
+  "Comfy_Interrupt": {
+    "label": "Interromper"
+  },
+  "Comfy_LoadDefaultWorkflow": {
+    "label": "Carregar Fluxo de Trabalho Padrão"
+  },
+  "Comfy_Manager_CustomNodesManager_ShowCustomNodesMenu": {
+    "label": "Gerenciador de Nós Personalizados"
+  },
+  "Comfy_Manager_CustomNodesManager_ShowLegacyCustomNodesMenu": {
+    "label": "Nós Personalizados (Legado)"
+  },
+  "Comfy_Manager_ShowLegacyManagerMenu": {
+    "label": "Menu do Gerenciador (Legado)"
+  },
+  "Comfy_Manager_ShowMissingPacks": {
+    "label": "Instalar Nós Personalizados Ausentes"
+  },
+  "Comfy_Manager_ShowUpdateAvailablePacks": {
+    "label": "Verificar Atualizações de Nós Personalizados"
+  },
+  "Comfy_MaskEditor_BrushSize_Decrease": {
+    "label": "Diminuir tamanho do pincel no Editor de Máscara"
+  },
+  "Comfy_MaskEditor_BrushSize_Increase": {
+    "label": "Aumentar tamanho do pincel no Editor de Máscara"
+  },
+  "Comfy_MaskEditor_ColorPicker": {
+    "label": "Abrir Seletor de Cores no Editor de Máscara"
+  },
+  "Comfy_MaskEditor_Mirror_Horizontal": {
+    "label": "Espelhar horizontalmente no MaskEditor"
+  },
+  "Comfy_MaskEditor_Mirror_Vertical": {
+    "label": "Espelhar verticalmente no MaskEditor"
+  },
+  "Comfy_MaskEditor_OpenMaskEditor": {
+    "label": "Abrir Editor de Máscara para o nó selecionado"
+  },
+  "Comfy_MaskEditor_Rotate_Left": {
+    "label": "Girar para a esquerda no MaskEditor"
+  },
+  "Comfy_MaskEditor_Rotate_Right": {
+    "label": "Girar para a direita no MaskEditor"
+  },
+  "Comfy_Memory_UnloadModels": {
+    "label": "Descarregar Modelos"
+  },
+  "Comfy_Memory_UnloadModelsAndExecutionCache": {
+    "label": "Descarregar Modelos e Cache de Execução"
+  },
+  "Comfy_NewBlankWorkflow": {
+    "label": "Novo Fluxo de Trabalho em Branco"
+  },
+  "Comfy_OpenClipspace": {
+    "label": "Clipspace"
+  },
+  "Comfy_OpenManagerDialog": {
+    "label": "Gerenciador"
+  },
+  "Comfy_OpenWorkflow": {
+    "label": "Abrir Fluxo de Trabalho"
+  },
+  "Comfy_PublishSubgraph": {
+    "label": "Publicar Subgrafo"
+  },
+  "Comfy_QueuePrompt": {
+    "label": "Adicionar Prompt à Fila"
+  },
+  "Comfy_QueuePromptFront": {
+    "label": "Adicionar Prompt à Fila (Início)"
+  },
+  "Comfy_QueueSelectedOutputNodes": {
+    "label": "Adicionar Nós de Saída Selecionados à Fila"
+  },
+  "Comfy_Queue_ToggleOverlay": {
+    "label": "Alternar Histórico de Tarefas"
+  },
+  "Comfy_Redo": {
+    "label": "Refazer"
+  },
+  "Comfy_RefreshNodeDefinitions": {
+    "label": "Atualizar Definições de Nós"
+  },
+  "Comfy_RenameWorkflow": {
+    "label": "Renomear fluxo de trabalho"
+  },
+  "Comfy_SaveWorkflow": {
+    "label": "Salvar Fluxo de Trabalho"
+  },
+  "Comfy_SaveWorkflowAs": {
+    "label": "Salvar Fluxo de Trabalho Como"
+  },
+  "Comfy_ShowSettingsDialog": {
+    "label": "Mostrar Diálogo de Configurações"
+  },
+  "Comfy_Subgraph_SetDescription": {
+    "label": "Definir descrição do subgrafo"
+  },
+  "Comfy_Subgraph_SetSearchAliases": {
+    "label": "Definir aliases de pesquisa do subgrafo"
+  },
+  "Comfy_ToggleAssetAPI": {
+    "label": "Experimental: Ativar AssetAPI"
+  },
+  "Comfy_ToggleCanvasInfo": {
+    "label": "Desempenho da Tela"
+  },
+  "Comfy_ToggleHelpCenter": {
+    "label": "Central de Ajuda"
+  },
+  "Comfy_ToggleLinear": {
+    "label": "alternar modo linear"
+  },
+  "Comfy_ToggleQPOV2": {
+    "label": "Alternar Painel de Fila V2"
+  },
+  "Comfy_ToggleTheme": {
+    "label": "Alternar Tema (Escuro/Claro)"
+  },
+  "Comfy_Undo": {
+    "label": "Desfazer"
+  },
+  "Comfy_User_OpenSignInDialog": {
+    "label": "Abrir diálogo de login"
+  },
+  "Comfy_User_SignOut": {
+    "label": "Sair"
+  },
+  "Experimental_ToggleVueNodes": {
+    "label": "Experimental: Ativar Nodes 2.0"
+  },
+  "Workspace_CloseWorkflow": {
+    "label": "Fechar fluxo de trabalho atual"
+  },
+  "Workspace_NextOpenedWorkflow": {
+    "label": "Próximo fluxo de trabalho aberto"
+  },
+  "Workspace_PreviousOpenedWorkflow": {
+    "label": "Fluxo de trabalho aberto anterior"
+  },
+  "Workspace_SearchBox_Toggle": {
+    "label": "Alternar caixa de pesquisa"
+  },
+  "Workspace_ToggleBottomPanel": {
+    "label": "Alternar painel inferior"
+  },
+  "Workspace_ToggleBottomPanelTab_command-terminal": {
+    "label": "Alternar Terminal no Painel Inferior"
+  },
+  "Workspace_ToggleBottomPanelTab_logs-terminal": {
+    "label": "Alternar Logs no Painel Inferior"
+  },
+  "Workspace_ToggleBottomPanelTab_shortcuts-essentials": {
+    "label": "Alternar painel inferior essencial"
+  },
+  "Workspace_ToggleBottomPanelTab_shortcuts-view-controls": {
+    "label": "Alternar painel inferior de controles de visualização"
+  },
+  "Workspace_ToggleBottomPanel_Shortcuts": {
+    "label": "Mostrar diálogo de atalhos"
+  },
+  "Workspace_ToggleFocusMode": {
+    "label": "Alternar modo de foco"
+  },
+  "Workspace_ToggleSidebarTab_apps": {
+    "label": "Alternar Barra Lateral de Apps",
+    "tooltip": "Apps"
+  },
+  "Workspace_ToggleSidebarTab_assets": {
+    "label": "Alternar barra lateral de assets",
+    "tooltip": "Assets"
+  },
+  "Workspace_ToggleSidebarTab_model-library": {
+    "label": "Alternar barra lateral da biblioteca de modelos",
+    "tooltip": "Biblioteca de modelos"
+  },
+  "Workspace_ToggleSidebarTab_node-library": {
+    "label": "Alternar barra lateral da biblioteca de nodes",
+    "tooltip": "Biblioteca de nodes"
+  },
+  "Workspace_ToggleSidebarTab_workflows": {
+    "label": "Alternar barra lateral de fluxos de trabalho",
+    "tooltip": "Fluxos de trabalho"
+  }
+}
diff --git a/src/locales/pt-BR/main.json b/src/locales/pt-BR/main.json
index 0967ef424b..c2521f4368 100644
--- a/src/locales/pt-BR/main.json
+++ b/src/locales/pt-BR/main.json
@@ -1 +1,3398 @@
-{}
+{
+  "actionbar": {
+    "dockToTop": "Fixar no topo",
+    "feedback": "Feedback",
+    "feedbackTooltip": "Feedback"
+  },
+  "apiNodesCostBreakdown": {
+    "costPerRun": "Custo por execução",
+    "title": "Nó(s) de API",
+    "totalCost": "Custo total"
+  },
+  "apiNodesSignInDialog": {
+    "message": "Este fluxo de trabalho contém nós de API, que exigem que você esteja conectado à sua conta para executar.",
+    "title": "Login necessário para usar nós de API"
+  },
+  "assetBrowser": {
+    "allCategory": "Todas as {category}",
+    "allModels": "Todos os Modelos",
+    "apiKeyHint": "Importando modelos privados ou restritos? {link}.",
+    "apiKeyHintLink": "Adicione suas chaves de API em Configurações",
+    "ariaLabel": {
+      "assetCard": "{name} - ativo do tipo {type}",
+      "loadingAsset": "Carregando ativo"
+    },
+    "assetCollection": "Coleção de ativos",
+    "assets": "Ativos",
+    "baseModel": "Modelo base",
+    "baseModels": "Modelos base",
+    "browseAssets": "Explorar Ativos",
+    "byType": "Por tipo",
+    "checkpoints": "Checkpoints",
+    "civitaiLinkExample": "{example} {link}",
+    "civitaiLinkExampleStrong": "Exemplo:",
+    "civitaiLinkExampleUrl": "https://civitai.com/models/10706/luisap-z-image-and-qwen-pixel-art-refiner?modelVersionId=2225295",
+    "civitaiLinkLabel": "Link de {download} do modelo Civitai",
+    "civitaiLinkLabelDownload": "download",
+    "civitaiLinkPlaceholder": "Cole o link aqui",
+    "confirmModelDetails": "Confirmar detalhes do modelo",
+    "connectionError": "Por favor, verifique sua conexão e tente novamente",
+    "deletion": {
+      "body": "Este modelo será removido permanentemente da sua biblioteca.",
+      "complete": "{assetName} foi excluído.",
+      "failed": "{assetName} não pôde ser excluído.",
+      "header": "Excluir este modelo?",
+      "inProgress": "Excluindo {assetName}..."
+    },
+    "download": {
+      "complete": "Download concluído",
+      "failed": "Falha no download",
+      "inProgress": "Baixando {assetName}..."
+    },
+    "emptyImported": {
+      "canImport": "Nenhum modelo importado ainda. Clique em \"Importar Modelo\" para adicionar o seu.",
+      "restricted": "Modelos pessoais estão disponíveis apenas no nível Creator ou superior."
+    },
+    "errorAccessForbidden": "Acesso a este recurso proibido.",
+    "errorConnectionRefused": "Não foi possível conectar à fonte. Tente novamente mais tarde.",
+    "errorDownloadCancelled": "O download foi cancelado.",
+    "errorFileTooLarge": "O arquivo excede o limite máximo de tamanho permitido",
+    "errorFormatNotAllowed": "Apenas o formato SafeTensor é permitido",
+    "errorHttpError": "Ocorreu um erro ao buscar os metadados.",
+    "errorInternalError": "Ocorreu um erro inesperado. Por favor, tente novamente.",
+    "errorInvalidHost": "O nome do host da URL de origem não pôde ser resolvido.",
+    "errorInvalidUrl": "Por favor, forneça uma URL.",
+    "errorInvalidUrlFormat": "O formato da URL é inválido. Verifique e tente novamente.",
+    "errorMetadataFetchFailed": "Falha ao buscar informações do arquivo da fonte.",
+    "errorModelTypeNotSupported": "Este tipo de modelo não é suportado",
+    "errorNetworkError": "Ocorreu um erro de rede. Verifique sua conexão e tente novamente.",
+    "errorNetworkTimeout": "Tempo de solicitação esgotado. Por favor, tente novamente.",
+    "errorRateLimited": "Muitas solicitações. Tente novamente em alguns minutos.",
+    "errorRequestCancelled": "Solicitação cancelada.",
+    "errorResourceNotFound": "Arquivo não encontrado. Verifique a URL e tente novamente.",
+    "errorServiceUnavailable": "Serviço temporariamente indisponível. Tente novamente mais tarde.",
+    "errorSourceServerError": "O servidor de origem está com problemas. Tente novamente mais tarde.",
+    "errorUnauthorized": "Por favor, faça login para continuar.",
+    "errorUnauthorizedSource": "Este recurso requer autenticação. Adicione seu token de API nas configurações.",
+    "errorUnknown": "Ocorreu um erro inesperado",
+    "errorUnsafePickleScan": "O CivitAI detectou código potencialmente inseguro neste arquivo",
+    "errorUnsafeVirusScan": "O CivitAI detectou malware ou conteúdo suspeito neste arquivo",
+    "errorUnsupportedSource": "Esta URL não é suportada. Apenas URLs do Hugging Face e Civitai são permitidas.",
+    "errorUploadFailed": "Falha ao importar o ativo. Por favor, tente novamente.",
+    "errorUserTokenAccessDenied": "Seu token de API não tem acesso a este recurso. Verifique as permissões do seu token.",
+    "errorUserTokenInvalid": "Seu token de API armazenado é inválido ou expirou. Atualize seu token nas configurações.",
+    "failedToCreateNode": "Falha ao criar o nó. Por favor, tente novamente ou verifique o console para mais detalhes.",
+    "fileFormats": "Formatos de arquivo",
+    "fileName": "Nome do arquivo",
+    "fileSize": "Tamanho do arquivo",
+    "filterBy": "Filtrar por",
+    "findInLibrary": "Encontre na seção {type} da biblioteca de modelos.",
+    "finish": "Concluir",
+    "genericLinkPlaceholder": "Cole o link aqui",
+    "importAnother": "Importar outro",
+    "imported": "Importado",
+    "invalidAsset": "Ativo inválido",
+    "invalidAssetDetail": "O ativo selecionado não pôde ser validado. Por favor, tente novamente.",
+    "invalidFilename": "Nome de arquivo inválido",
+    "invalidFilenameDetail": "Não foi possível determinar o nome do arquivo do ativo. Por favor, tente novamente.",
+    "jobId": "ID do trabalho",
+    "loadingModels": "Carregando {type}...",
+    "maxFileSize": "Tamanho máximo do arquivo: {size}",
+    "maxFileSizeValue": "1 GB",
+    "media": {
+      "audioPlaceholder": "Áudio",
+      "threeDModelPlaceholder": "Modelo 3D"
+    },
+    "modelAssociatedWithLink": "O modelo associado ao link fornecido:",
+    "modelInfo": {
+      "addBaseModel": "Adicionar modelo base...",
+      "addTag": "Adicionar tag...",
+      "additionalTags": "Tags Adicionais",
+      "baseModelUnknown": "Modelo base desconhecido",
+      "basicInfo": "Informações Básicas",
+      "compatibleBaseModels": "Modelos Base Compatíveis",
+      "description": "Descrição",
+      "descriptionNotSet": "Nenhuma descrição definida",
+      "descriptionPlaceholder": "Adicione uma descrição para este modelo...",
+      "displayName": "Nome de Exibição",
+      "editDisplayName": "Editar nome de exibição",
+      "fileName": "Nome do Arquivo",
+      "modelDescription": "Descrição do Modelo",
+      "modelTagging": "Tagueamento do Modelo",
+      "modelType": "Tipo de Modelo",
+      "noAdditionalTags": "Sem tags adicionais",
+      "selectModelPrompt": "Selecione um modelo para ver suas informações",
+      "selectModelType": "Selecione o tipo de modelo...",
+      "source": "Fonte",
+      "title": "Informações do Modelo",
+      "triggerPhrases": "Frases de Ativação",
+      "viewOnSource": "Ver em {source}"
+    },
+    "modelName": "Nome do modelo",
+    "modelNamePlaceholder": "Digite um nome para este modelo",
+    "modelTypeSelectorLabel": "Qual o tipo deste modelo?",
+    "modelTypeSelectorPlaceholder": "Selecione o tipo de modelo",
+    "modelUploaded": "Modelo importado com sucesso.",
+    "noAssetsFound": "Nenhum ativo encontrado",
+    "noModelsInFolder": "Nenhum {type} disponível nesta pasta",
+    "noResultsCanImport": "Tente ajustar sua busca ou filtros.\nVocê também pode adicionar modelos usando o botão \"Importar\" acima.",
+    "noValidSourceDetected": "Nenhuma fonte de importação válida detectada",
+    "notSureLeaveAsIs": "Não tem certeza? Deixe como está",
+    "onlyCivitaiUrlsSupported": "Apenas URLs do Civitai são suportadas",
+    "ownership": "Propriedade",
+    "ownershipAll": "Todos",
+    "ownershipMyModels": "Meus modelos",
+    "ownershipPublicModels": "Modelos públicos",
+    "processingModel": "Download iniciado",
+    "processingModelDescription": "Você pode fechar este diálogo. O download continuará em segundo plano.",
+    "providerCivitai": "Civitai",
+    "providerHuggingFace": "Hugging Face",
+    "rename": {
+      "failed": "Não foi possível renomear o ativo."
+    },
+    "selectFrameworks": "Selecione Frameworks",
+    "selectModelType": "Selecione o tipo de modelo",
+    "selectProjects": "Selecione Projetos",
+    "sortAZ": "A-Z",
+    "sortBy": "Ordenar por",
+    "sortDefault": "Padrão",
+    "sortPopular": "Popular",
+    "sortRecent": "Recentes",
+    "sortZA": "Z-A",
+    "sortingType": "Tipo de ordenação",
+    "tags": "Tags",
+    "tagsHelp": "Separe as tags com vírgulas",
+    "tagsPlaceholder": "ex: modelos, checkpoint",
+    "tryAdjustingFilters": "Tente ajustar sua busca ou filtros",
+    "unknown": "Desconhecido",
+    "unsupportedUrlSource": "Apenas URLs de {sources} são suportadas",
+    "upgradeFeatureDescription": "Este recurso está disponível apenas nos planos Creator ou Pro.",
+    "upgradeToUnlockFeature": "Faça upgrade para desbloquear este recurso",
+    "upload": "Importar",
+    "uploadFailed": "Falha na importação",
+    "uploadModel": "Importar",
+    "uploadModelDescription1": "Cole um link de download de modelo do Civitai para adicioná-lo à sua biblioteca.",
+    "uploadModelDescription1Generic": "Cole um link de download de modelo para adicioná-lo à sua biblioteca.",
+    "uploadModelDescription2": "Apenas links de {link} são suportados no momento",
+    "uploadModelDescription2Generic": "Apenas URLs dos seguintes provedores são suportadas:",
+    "uploadModelDescription2Link": "https://civitai.com/models",
+    "uploadModelDescription3": "Tamanho máximo do arquivo: {size}",
+    "uploadModelFailedToRetrieveMetadata": "Falha ao recuperar os metadados. Por favor, verifique o link e tente novamente.",
+    "uploadModelFromCivitai": "Importar um modelo do Civitai",
+    "uploadModelGeneric": "Importar um modelo",
+    "uploadModelHelpFooterText": "Precisa de ajuda para encontrar os URLs? Clique em um provedor abaixo para ver um vídeo tutorial.",
+    "uploadModelHelpVideo": "Vídeo de Ajuda para Importação de Modelo",
+    "uploadModelHowDoIFindThis": "Como encontro isso?",
+    "uploadSuccess": "Modelo importado com sucesso!",
+    "uploadingModel": "Importando modelo..."
+  },
+  "auth": {
+    "apiKey": {
+      "cleared": "Chave de API removida",
+      "clearedDetail": "Sua chave de API foi removida com sucesso",
+      "description": "Use sua chave de API Comfy para habilitar os Nós de API",
+      "error": "Chave de API inválida",
+      "generateKey": "Obtenha uma aqui",
+      "helpText": "Precisa de uma chave de API?",
+      "invalid": "Chave de API inválida",
+      "invalidDetail": "Por favor, insira uma chave de API válida",
+      "label": "Chave de API",
+      "placeholder": "Digite sua chave de API",
+      "storageFailed": "Falha ao armazenar a chave de API",
+      "storageFailedDetail": "Por favor, tente novamente.",
+      "stored": "Chave de API armazenada",
+      "storedDetail": "Sua chave de API foi armazenada com sucesso",
+      "title": "Chave de API",
+      "whitelistInfo": "Sobre sites não permitidos"
+    },
+    "deleteAccount": {
+      "contactSupport": "Para excluir sua conta, entre em contato com {email}"
+    },
+    "errors": {
+      "auth/cancelled-popup-request": "Login cancelado. Por favor, tente novamente.",
+      "auth/email-already-in-use": "Já existe uma conta com este e-mail. Tente fazer login.",
+      "auth/invalid-credential": "Credenciais de login inválidas. Verifique seu e-mail e senha.",
+      "auth/invalid-email": "Por favor, insira um endereço de e-mail válido.",
+      "auth/network-request-failed": "Erro de rede. Verifique sua conexão e tente novamente.",
+      "auth/operation-not-allowed": "Este método de login não é suportado no momento.",
+      "auth/popup-closed-by-user": "Login cancelado. Por favor, tente novamente.",
+      "auth/too-many-requests": "Muitas tentativas de login. Aguarde um momento e tente novamente.",
+      "auth/user-disabled": "Esta conta foi desativada. Por favor, entre em contato com o suporte.",
+      "auth/user-not-found": "Nenhuma conta encontrada com este e-mail. Gostaria de criar uma nova conta?",
+      "auth/weak-password": "A senha é muito fraca. Use uma senha mais forte com pelo menos 6 caracteres.",
+      "auth/wrong-password": "A senha que você digitou está incorreta. Por favor, tente novamente."
+    },
+    "login": {
+      "andText": "e",
+      "backToLogin": "Voltar para login",
+      "backToSocialLogin": "Cadastre-se com Google ou Github em vez disso",
+      "confirmPasswordLabel": "Confirmar senha",
+      "confirmPasswordPlaceholder": "Digite a mesma senha novamente",
+      "didntReceiveEmail": "Não recebeu o e-mail? Entre em contato conosco em",
+      "emailLabel": "E-mail",
+      "emailPlaceholder": "Digite seu e-mail",
+      "failed": "Falha no login",
+      "forgotPassword": "Esqueceu a senha?",
+      "forgotPasswordError": "Falha ao enviar e-mail de redefinição de senha",
+      "freeTierBadge": "Elegível para o Plano Gratuito",
+      "freeTierDescription": "Cadastre-se com Google para ganhar {credits} créditos gratuitos todo mês. Não precisa de cartão.",
+      "freeTierDescriptionGeneric": "Cadastre-se com Google para ganhar créditos gratuitos todo mês. Não precisa de cartão.",
+      "insecureContextWarning": "Esta conexão é insegura (HTTP) - suas credenciais podem ser interceptadas por invasores se você continuar.",
+      "loginButton": "Entrar",
+      "loginWithGithub": "Entrar com Github",
+      "loginWithGoogle": "Entrar com Google",
+      "newUser": "Novo por aqui?",
+      "noAssociatedUser": "Não há usuário Comfy associado à chave de API fornecida",
+      "orContinueWith": "Ou continue com",
+      "passwordLabel": "Senha",
+      "passwordPlaceholder": "Digite sua senha",
+      "passwordResetError": "Falha ao enviar e-mail de redefinição de senha. Por favor, tente novamente.",
+      "passwordResetInstructions": "Digite seu endereço de e-mail e enviaremos um link para redefinir sua senha.",
+      "passwordResetSent": "E-mail de redefinição de senha enviado",
+      "passwordResetSentDetail": "Por favor, verifique seu e-mail para um link de redefinição de senha.",
+      "privacyLink": "Política de Privacidade",
+      "questionsContactPrefix": "Dúvidas? Entre em contato conosco em",
+      "sendResetLink": "Enviar link de redefinição",
+      "signInOrSignUp": "Entrar / Cadastrar-se",
+      "signUp": "Cadastrar-se",
+      "signUpFreeTierPromo": "Novo por aqui? {signUp} com Google para ganhar {credits} créditos gratuitos todo mês.",
+      "success": "Login realizado com sucesso",
+      "termsLink": "Termos de Uso",
+      "termsText": "Ao clicar em \"Próximo\" ou \"Cadastrar-se\", você concorda com nossos",
+      "title": "Faça login na sua conta",
+      "useApiKey": "Chave de API Comfy",
+      "useEmailInstead": "Usar e-mail em vez disso",
+      "userAvatar": "Avatar do usuário"
+    },
+    "loginButton": {
+      "tooltipHelp": "Faça login para poder usar os \"Nós de API\"",
+      "tooltipLearnMore": "Saiba mais..."
+    },
+    "passwordUpdate": {
+      "success": "Senha atualizada",
+      "successDetail": "Sua senha foi atualizada com sucesso"
+    },
+    "reauthRequired": {
+      "cancel": "Cancelar",
+      "confirm": "Fazer login novamente",
+      "message": "Por motivos de segurança, esta ação exige que você faça login novamente. Deseja continuar?",
+      "title": "Reautenticação necessária"
+    },
+    "signOut": {
+      "signOut": "Sair",
+      "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?",
+      "unsavedChangesTitle": "Alterações não salvas"
+    },
+    "signup": {
+      "alreadyHaveAccount": "Já tem uma conta?",
+      "emailLabel": "E-mail",
+      "emailNotEligibleForFreeTier": "Cadastro por e-mail não é elegível para o Plano Gratuito.",
+      "emailPlaceholder": "Digite seu e-mail",
+      "passwordLabel": "Senha",
+      "passwordPlaceholder": "Digite uma nova senha",
+      "personalDataConsentLabel": "Concordo com o processamento dos meus dados pessoais.",
+      "regionRestrictionChina": "De acordo com os requisitos regulatórios locais, nossos serviços estão temporariamente indisponíveis para usuários localizados na China.",
+      "signIn": "Entrar",
+      "signUpButton": "Cadastrar-se",
+      "signUpWithGithub": "Cadastrar-se com Github",
+      "signUpWithGoogle": "Cadastrar-se com Google",
+      "title": "Criar uma conta"
+    }
+  },
+  "batch": {
+    "index": "{current} / {total}"
+  },
+  "billingOperation": {
+    "subscriptionFailed": "Falha ao atualizar a assinatura",
+    "subscriptionProcessing": "Processando pagamento — configurando seu workspace...",
+    "subscriptionSuccess": "Assinatura atualizada com sucesso",
+    "subscriptionTimeout": "Tempo esgotado na verificação da assinatura",
+    "topupFailed": "Falha ao adicionar créditos",
+    "topupProcessing": "Processando pagamento — adicionando créditos...",
+    "topupSuccess": "Créditos adicionados com sucesso",
+    "topupTimeout": "Tempo esgotado na verificação da recarga"
+  },
+  "boundingBox": {
+    "height": "Altura",
+    "width": "Largura",
+    "x": "X",
+    "y": "Y"
+  },
+  "breadcrumbsMenu": {
+    "clearWorkflow": "Limpar Fluxo de Trabalho",
+    "deleteBlueprint": "Excluir Blueprint",
+    "deleteWorkflow": "Excluir Fluxo de Trabalho",
+    "duplicate": "Duplicar",
+    "enterAppMode": "Entrar no modo de aplicativo",
+    "enterBuilderMode": "Entrar no construtor de aplicativos",
+    "enterNewName": "Digite um novo nome",
+    "exitAppMode": "Sair do modo de aplicativo",
+    "missingNodesWarning": "O fluxo de trabalho contém nós não suportados (destacados em vermelho).",
+    "workflowActions": "Ações do fluxo de trabalho"
+  },
+  "builderMenu": {
+    "exitAppBuilder": "Sair do construtor de aplicativos"
+  },
+  "builderToolbar": {
+    "app": "Aplicativo",
+    "appDescription": "Abre como aplicativo por padrão",
+    "arrange": "Pré-visualizar",
+    "arrangeDescription": "Revisar layout do aplicativo",
+    "connectOutput": "Conectar uma saída",
+    "connectOutputBody1": "Seu aplicativo precisa de pelo menos uma saída conectada antes de ser salvo.",
+    "connectOutputBody2": "Altere para a etapa 'Selecionar' e clique nos nós de saída para adicioná-los aqui.",
+    "defaultModeAppliedAppBody": "Este fluxo de trabalho será aberto no Modo de Aplicativo por padrão a partir de agora.",
+    "defaultModeAppliedAppPrompt": "Gostaria de visualizá-lo agora?",
+    "defaultModeAppliedGraphBody": "Este fluxo de trabalho será aberto como um grafo de nós por padrão a partir de agora.",
+    "defaultModeAppliedGraphPrompt": "Ainda deseja visualizar o aplicativo?",
+    "defaultModeAppliedTitle": "Definido com sucesso",
+    "defaultView": "Definir visualização padrão",
+    "defaultViewDescription": "Escolha como isso será aberto",
+    "defaultViewLabel": "Por padrão, este fluxo será aberto como:",
+    "defaultViewTitle": "Definir a visualização padrão para este fluxo",
+    "emptyWorkflowPrompt": "Deseja começar com um modelo?",
+    "emptyWorkflowTitle": "Este fluxo de trabalho não possui nós",
+    "inputs": "Entradas",
+    "inputsDescription": "Escolha as entradas",
+    "label": "Construtor de aplicativos",
+    "nodeGraph": "Grafo de nós",
+    "nodeGraphDescription": "Abre como grafo de nós por padrão",
+    "outputs": "Saídas",
+    "outputsDescription": "Escolha as saídas",
+    "switchToOutputs": "Ir para Saídas",
+    "viewApp": "Visualizar aplicativo"
+  },
+  "clipboard": {
+    "errorMessage": "Falha ao copiar para a área de transferência",
+    "errorNotSupported": "API de área de transferência não suportada no seu navegador",
+    "successMessage": "Copiado para a área de transferência"
+  },
+  "cloudFooter_needHelp": "Precisa de ajuda?",
+  "cloudForgotPassword_backToLogin": "Voltar para login",
+  "cloudForgotPassword_didntReceiveEmail": "Não recebeu o e-mail?",
+  "cloudForgotPassword_emailLabel": "E-mail",
+  "cloudForgotPassword_emailPlaceholder": "Digite seu e-mail",
+  "cloudForgotPassword_emailRequired": "E-mail é obrigatório",
+  "cloudForgotPassword_instructions": "Digite seu endereço de e-mail e enviaremos um link para redefinir sua senha.",
+  "cloudForgotPassword_passwordResetError": "Falha ao enviar o e-mail de redefinição de senha",
+  "cloudForgotPassword_passwordResetSent": "Redefinição de senha enviada",
+  "cloudForgotPassword_sendResetLink": "Enviar link de redefinição",
+  "cloudForgotPassword_title": "Esqueceu a senha",
+  "cloudOnboarding": {
+    "authTimeout": {
+      "causes": [
+        "Firewall corporativo ou proxy bloqueando serviços de autenticação",
+        "Restrições de VPN ou rede",
+        "Extensões do navegador interferindo nas requisições",
+        "Limitações de rede regionais",
+        "Tente outro navegador ou rede"
+      ],
+      "helpText": "Precisa de ajuda? Contate",
+      "message": "Estamos com dificuldades para conectar ao ComfyUI Cloud. Isso pode ser devido a uma conexão lenta ou problema temporário no serviço.",
+      "restart": "Sair e tentar novamente",
+      "supportLink": "suporte",
+      "technicalDetails": "Detalhes técnicos",
+      "title": "Conexão demorando demais",
+      "troubleshooting": "Causas comuns:"
+    },
+    "checkingStatus": "Verificando o status da sua conta...",
+    "forgotPassword": {
+      "backToLogin": "Voltar para login",
+      "didntReceiveEmail": "Não recebeu o e-mail? Entre em contato conosco em",
+      "emailLabel": "E-mail",
+      "emailPlaceholder": "Digite seu e-mail",
+      "emailRequired": "E-mail é obrigatório",
+      "instructions": "Digite seu endereço de e-mail e enviaremos um link para redefinir sua senha.",
+      "passwordResetError": "Falha ao enviar o e-mail de redefinição de senha. Tente novamente.",
+      "passwordResetSent": "E-mail de redefinição de senha enviado",
+      "sendResetLink": "Enviar link de redefinição",
+      "title": "Esqueceu a senha"
+    },
+    "privateBeta": {
+      "desc": "Faça login para entrar na lista de espera. Vamos avisar quando chegar a sua vez. Já foi notificado? Faça login para começar a usar o Cloud.",
+      "title": "Cloud está atualmente em beta privado"
+    },
+    "retry": "Tentar novamente",
+    "retrying": "Tentando novamente...",
+    "skipToCloudApp": "Pular para o aplicativo na nuvem",
+    "start": {
+      "desc": "Nenhuma configuração necessária. Funciona em qualquer dispositivo.",
+      "download": "Baixar ComfyUI",
+      "explain": "Gere múltiplos resultados de uma vez. Compartilhe fluxos de trabalho com facilidade.",
+      "learnAboutButton": "Saiba mais sobre o Cloud",
+      "title": "comece a criar em segundos",
+      "wantToRun": "Prefere rodar o ComfyUI localmente?"
+    },
+    "survey": {
+      "options": {
+        "familiarity": {
+          "advanced": "Usuário avançado (fluxos de trabalho personalizados)",
+          "basics": "Confortável com o básico",
+          "expert": "Especialista (ajuda outras pessoas)",
+          "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",
+          "audio": "Áudio / música",
+          "custom_nodes": "Nós e fluxos de trabalho personalizados",
+          "images": "Imagens",
+          "video": "Vídeo e animação"
+        },
+        "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"
+        }
+      },
+      "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?"
+      },
+      "title": "Pesquisa da Nuvem"
+    }
+  },
+  "cloudPrivateBeta_desc": "Faça login para entrar na lista de espera. Vamos avisar você quando chegar a sua vez. Já foi notificado? Faça login para começar a usar o Cloud.",
+  "cloudPrivateBeta_title": "Cloud está atualmente em beta privado",
+  "cloudSorryContactSupport_title": "Desculpe, entre em contato com o suporte",
+  "cloudStart_desc": "Nenhuma configuração necessária. Funciona em qualquer dispositivo.",
+  "cloudStart_download": "Baixar ComfyUI",
+  "cloudStart_explain": "Gere múltiplos resultados de uma vez. Compartilhe fluxos de trabalho com facilidade.",
+  "cloudStart_learnAboutButton": "Saiba mais sobre a Nuvem",
+  "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?",
+  "cloudWaitlist_contactLink": "aqui",
+  "cloudWaitlist_questionsText": "Dúvidas? Entre em contato conosco",
+  "color": {
+    "black": "Preto",
+    "blue": "Azul",
+    "brown": "Marrom",
+    "custom": "Personalizado",
+    "cyan": "Ciano",
+    "default": "Padrão",
+    "green": "Verde",
+    "noColor": "Sem Cor",
+    "pale_blue": "Azul Claro",
+    "pink": "Rosa",
+    "purple": "Roxo",
+    "red": "Vermelho",
+    "yellow": "Amarelo"
+  },
+  "commands": {
+    "clear": "Limpar fluxo de trabalho",
+    "clipspace": "Abrir Clipspace",
+    "dark": "Escuro",
+    "execute": "Executar",
+    "help": "Ajuda",
+    "interrupt": "Cancelar execução atual",
+    "light": "Claro",
+    "manageExtensions": "Gerenciar extensões",
+    "queue": "Painel de fila",
+    "refresh": "Atualizar definições de nó",
+    "resetView": "Redefinir visualização da tela",
+    "run": "Executar",
+    "runWorkflow": "Executar fluxo de trabalho",
+    "runWorkflowFront": "Executar fluxo de trabalho (Fila na frente)",
+    "settings": "Configurações",
+    "theme": "Tema",
+    "toggleBottomPanel": "Alternar painel inferior"
+  },
+  "contextMenu": {
+    "Add Group": "Adicionar Grupo",
+    "Add Group For Selected Nodes": "Adicionar Grupo para Nós Selecionados",
+    "Add Node": "Adicionar Nó",
+    "Add Subgraph to Library": "Adicionar Subgrafo à Biblioteca",
+    "Adjust Size": "Ajustar Tamanho",
+    "Align Selected To": "Alinhar Selecionados a",
+    "Bottom": "Inferior",
+    "Bypass": "Ignorar",
+    "Clone": "Clonar",
+    "Collapse": "Recolher",
+    "Color": "Cor",
+    "Colors": "Cores",
+    "Convert to Group Node": "Converter para Nó de Grupo",
+    "Convert to Subgraph": "Converter para Subgrafo",
+    "Copy": "Copiar",
+    "Copy (Clipspace)": "Copiar (Clipspace)",
+    "Copy Image": "Copiar Imagem",
+    "Delete": "Excluir",
+    "Distribute Nodes": "Distribuir Nós",
+    "Duplicate": "Duplicar",
+    "Edit Subgraph Widgets": "Editar Widgets do Subgrafo",
+    "Expand": "Expandir",
+    "Expand Node": "Expandir Nó",
+    "Extensions": "Extensões",
+    "FavoriteWidget": "Favoritar Widget",
+    "Horizontal": "Horizontal",
+    "Inputs": "Entradas",
+    "Left": "Esquerda",
+    "Manage": "Gerenciar",
+    "Manage Group Nodes": "Gerenciar Nós de Grupo",
+    "Minimize Node": "Minimizar Nó",
+    "Mode": "Modo",
+    "Node Info": "Informações do Nó",
+    "Node Templates": "Modelos de Nó",
+    "Open Image": "Abrir Imagem",
+    "Open in Mask Editor": "Abrir no Editor de Máscara",
+    "Outputs": "Saídas",
+    "Paste": "Colar",
+    "Pin": "Fixar",
+    "Properties": "Propriedades",
+    "Properties Panel": "Painel de Propriedades",
+    "Remove": "Remover",
+    "Remove Bypass": "Remover Ignorar",
+    "Rename": "Renomear",
+    "RenameWidget": "Renomear Widget",
+    "Resize": "Redimensionar",
+    "Right": "Direita",
+    "Run Branch": "Executar Ramificação",
+    "Save Image": "Salvar Imagem",
+    "Save Selected as Template": "Salvar Selecionados como Modelo",
+    "Search": "Pesquisar",
+    "Shape": "Forma",
+    "Shapes": "Formas",
+    "Title": "Título",
+    "Top": "Topo",
+    "UnfavoriteWidget": "Desfavoritar Widget",
+    "Unpack Subgraph": "Desempacotar Subgrafo",
+    "Unpin": "Desafixar",
+    "Vertical": "Vertical",
+    "deprecated": "obsoleto",
+    "new": "novo"
+  },
+  "credits": {
+    "accountInitialized": "Conta inicializada",
+    "activity": "Atividade",
+    "added": "Adicionado",
+    "additionalInfo": "Informações adicionais",
+    "apiPricing": "Preços da API",
+    "credits": "Créditos",
+    "creditsAvailable": "Créditos disponíveis",
+    "details": "Detalhes",
+    "eventType": "Tipo de evento",
+    "faqs": "Perguntas frequentes",
+    "invoiceHistory": "Histórico de faturas",
+    "lastUpdated": "Última atualização",
+    "messageSupport": "Suporte por mensagem",
+    "model": "Modelo",
+    "purchaseCredits": "Comprar créditos",
+    "refreshes": "Atualiza em {date}",
+    "time": "Hora",
+    "topUp": {
+      "addMoreCredits": "Adicionar mais créditos",
+      "addMoreCreditsToRun": "Adicione mais créditos para executar",
+      "amountToPayLabel": "Valor a pagar em dólares",
+      "buy": "Comprar",
+      "buyCredits": "Continuar para o pagamento",
+      "buyNow": "Comprar agora",
+      "contactUs": "Fale conosco",
+      "creditsDescription": "Os créditos são usados para executar fluxos de trabalho ou nós parceiros.",
+      "creditsPerDollar": "créditos por dólar",
+      "creditsToReceiveLabel": "Créditos a receber",
+      "howManyCredits": "Quantos créditos você gostaria de adicionar?",
+      "insufficientMessage": "Você não tem créditos suficientes para executar este fluxo de trabalho.",
+      "insufficientTitle": "Créditos insuficientes",
+      "insufficientWorkflowMessage": "Você não tem créditos suficientes para executar este fluxo de trabalho.",
+      "maxAllowed": "Máximo de {credits} créditos.",
+      "maxAmount": "(Máx. US$ 1.000)",
+      "maximumAmount": "Máximo de ${amount}.",
+      "minRequired": "Mínimo de {credits} créditos",
+      "minimumPurchase": "Mínimo de ${amount} ({credits} créditos)",
+      "needMore": "Precisa de mais?",
+      "purchaseError": "Falha na compra",
+      "purchaseErrorDetail": "Falha ao comprar créditos: {error}",
+      "purchaseSuccess": "Créditos adicionados com sucesso!",
+      "quickPurchase": "Compra rápida",
+      "seeDetails": "Ver detalhes",
+      "selectAmount": "Selecione o valor",
+      "templateNote": "*Gerado com o template Wan Fun Control",
+      "topUp": "Adicionar créditos",
+      "unknownError": "Ocorreu um erro desconhecido",
+      "usdAmount": "${amount}",
+      "videosEstimate": "~{count} vídeos",
+      "viewPricing": "Ver detalhes de preços",
+      "youGet": "Créditos",
+      "youPay": "Valor (USD)"
+    },
+    "unified": {
+      "message": "Os créditos foram unificados",
+      "tooltip": "Unificamos os pagamentos no Comfy. Agora tudo funciona com Créditos Comfy:\n- Nós parceiros (anteriormente nós de API)\n- Fluxos de trabalho na nuvem\n\nSeu saldo existente de nós parceiros foi convertido em créditos."
+    },
+    "yourCreditBalance": "Seu saldo de créditos"
+  },
+  "dataTypes": {
+    "*": "*",
+    "AUDIO": "ÁUDIO",
+    "AUDIO_ENCODER": "CODIFICADOR DE ÁUDIO",
+    "AUDIO_ENCODER_OUTPUT": "SAÍDA DO CODIFICADOR DE ÁUDIO",
+    "AUDIO_RECORD": "GRAVAÇÃO DE ÁUDIO",
+    "BOOLEAN": "BOOLEANO",
+    "BOUNDING_BOX": "BOUNDING_BOX",
+    "CAMERA_CONTROL": "CONTROLE DE CÂMERA",
+    "CLIP": "clip",
+    "CLIP_VISION": "clip visão",
+    "CLIP_VISION_OUTPUT": "saída de clip visão",
+    "COLOR": "COR",
+    "COMBO": "COMBO",
+    "COMFY_AUTOGROW_V3": "COMFY_AUTOGROW_V3",
+    "COMFY_DYNAMICCOMBO_V3": "COMFY_DYNAMICCOMBO_V3",
+    "COMFY_MATCHTYPE_V3": "COMFY_MATCHTYPE_V3",
+    "CONDITIONING": "CONDICIONAMENTO",
+    "CONTROL_NET": "controlnet",
+    "ELEVENLABS_VOICE": "ELEVENLABS_VOICE",
+    "FILE_3D": "ARQUIVO_3D",
+    "FILE_3D_FBX": "ARQUIVO_3D_FBX",
+    "FILE_3D_GLB": "ARQUIVO_3D_GLB",
+    "FILE_3D_GLTF": "ARQUIVO_3D_GLTF",
+    "FILE_3D_OBJ": "ARQUIVO_3D_OBJ",
+    "FILE_3D_STL": "ARQUIVO_3D_STL",
+    "FILE_3D_USDZ": "ARQUIVO_3D_USDZ",
+    "FLOAT": "PONTO FLUTUANTE",
+    "FLOATS": "PONTOS FLUTUANTES",
+    "GEMINI_INPUT_FILES": "ARQUIVOS DE ENTRADA GEMINI",
+    "GLIGEN": "GLIGEN",
+    "GUIDER": "ORIENTADOR",
+    "HOOKS": "GANCHOS",
+    "HOOK_KEYFRAMES": "QUADROS-CHAVE DE GANCHO",
+    "IMAGE": "IMAGEM",
+    "IMAGECOMPARE": "COMPARAR_IMAGEM",
+    "INT": "INTEIRO",
+    "LATENT": "LATENT",
+    "LATENT_OPERATION": "OPERAÇÃO LATENT",
+    "LATENT_UPSCALE_MODEL": "MODELO DE AUMENTO DE LATENT",
+    "LOAD3D_CAMERA": "CÂMERA LOAD3D",
+    "LOAD_3D": "CARREGAR 3D",
+    "LORA_MODEL": "lora MODEL",
+    "LOSS_MAP": "MAPA DE PERDA",
+    "LUMA_CONCEPTS": "CONCEITOS LUMA",
+    "LUMA_REF": "REFERÊNCIA LUMA",
+    "MASK": "MÁSCARA",
+    "MESH": "MALHA",
+    "MESHY_RIGGED_TASK_ID": "MESHY_RIGGED_TASK_ID",
+    "MESHY_TASK_ID": "MESHY_TASK_ID",
+    "MODEL": "MODELO",
+    "MODEL_PATCH": "PATCH DE MODELO",
+    "MODEL_TASK_ID": "ID DA TAREFA DO MODELO",
+    "NOISE": "RUÍDO",
+    "OPENAI_CHAT_CONFIG": "CONFIGURAÇÃO DE CHAT OPENAI",
+    "OPENAI_INPUT_FILES": "ARQUIVOS DE ENTRADA OPENAI",
+    "PHOTOMAKER": "photomaker",
+    "PIXVERSE_TEMPLATE": "MODELO PIXVERSE",
+    "POSE_KEYPOINT": "POSE_KEYPOINT",
+    "RECRAFT_COLOR": "COR RECRAFT",
+    "RECRAFT_CONTROLS": "CONTROLES RECRAFT",
+    "RECRAFT_V3_STYLE": "ESTILO RECRAFT V3",
+    "RETARGET_TASK_ID": "ID DA TAREFA DE REDIRECIONAMENTO",
+    "RIG_TASK_ID": "ID DA TAREFA DE RIG",
+    "SAMPLER": "AMOSTRADOR",
+    "SIGMAS": "SIGMAS",
+    "STRING": "TEXTO",
+    "STYLE_MODEL": "MODELO DE ESTILO",
+    "SVG": "SVG",
+    "TIMESTEPS_RANGE": "INTERVALO DE PASSOS DE TEMPO",
+    "TRACKS": "FAIXAS",
+    "UPSCALE_MODEL": "MODELO DE AUMENTO DE RESOLUÇÃO",
+    "VAE": "vae",
+    "VIDEO": "VÍDEO",
+    "VOXEL": "VOXEL",
+    "WAN_CAMERA_EMBEDDING": "EMBEDDING DE CÂMERA WAN",
+    "WEBCAM": "WEBCAM"
+  },
+  "desktopDialogs": {
+    "": {
+      "buttons": {
+        "Close": "Fechar"
+      },
+      "message": "ID de diálogo inválido fornecido.",
+      "title": "Diálogo inválido"
+    }
+  },
+  "desktopMenu": {
+    "confirmQuit": "Existem fluxos de trabalho não salvos abertos; quaisquer alterações não salvas serão perdidas. Ignorar isso e sair?",
+    "confirmReinstall": "Isso irá limpar seu arquivo extra_models_config.yaml,\ne iniciar a instalação novamente.\n\nTem certeza?",
+    "quit": "Sair",
+    "reinstall": "Reinstalar"
+  },
+  "desktopStart": {
+    "initialising": "Inicializando..."
+  },
+  "desktopUpdate": {
+    "description": "O ComfyUI Desktop está instalando novas dependências. Isso pode levar alguns minutos.",
+    "errorCheckingUpdate": "Erro ao verificar atualizações",
+    "errorInstallingUpdate": "Erro ao instalar atualização",
+    "noUpdateFound": "Nenhuma atualização encontrada",
+    "terminalDefaultMessage": "Qualquer saída do console da atualização será exibida aqui.",
+    "title": "Atualizando ComfyUI Desktop",
+    "updateAvailableMessage": "Uma atualização está disponível. Deseja reiniciar e atualizar agora?",
+    "updateFoundTitle": "Atualização Encontrada (v{version})"
+  },
+  "downloadGit": {
+    "gitWebsite": "Baixar git",
+    "instructions": "Por favor, baixe e instale a versão mais recente para o seu sistema operacional. O botão Baixar git abaixo abrirá a página de downloads do git-scm.com.",
+    "message": "Não foi possível localizar o git. Uma cópia funcional do git é necessária para o funcionamento normal.",
+    "skip": "Pular",
+    "title": "Baixar git",
+    "warning": "Se você tem certeza de que não precisa do git instalado, ou se houve um engano, você pode clicar em Pular para ignorar esta verificação. Tentar executar o ComfyUI sem uma cópia funcional do git atualmente não é suportado."
+  },
+  "electronFileDownload": {
+    "cancel": "Cancelar download",
+    "cancelled": "Cancelado",
+    "inProgress": "Em andamento",
+    "pause": "Pausar download",
+    "paused": "Pausado",
+    "resume": "Retomar download"
+  },
+  "errorDialog": {
+    "defaultTitle": "Ocorreu um erro",
+    "extensionFileHint": "Isso pode ser devido ao seguinte script",
+    "loadWorkflowTitle": "Carregamento abortado devido a erro ao recarregar os dados do fluxo de trabalho",
+    "noStackTrace": "Nenhum stacktrace disponível",
+    "promptExecutionError": "Falha na execução do prompt"
+  },
+  "errorOverlay": {
+    "errorCount": "{count} ERROS | {count} ERRO | {count} ERROS",
+    "seeErrors": "Ver erros"
+  },
+  "essentials": {
+    "batchImage": "Imagem em lote",
+    "canny": "Canny",
+    "cannyToImage": "Canny para imagem",
+    "cannyToVideo": "Canny para vídeo",
+    "cropImage": "Cortar imagem",
+    "depthToImage": "Profundidade para imagem",
+    "depthToVideo": "Profundidade para vídeo",
+    "extractFrame": "Extrair quadro",
+    "imageCompare": "Comparar imagens",
+    "imageTo3DModel": "Imagem para modelo 3D",
+    "imageToImage": "Imagem para imagem",
+    "imageToVideo": "Imagem para vídeo",
+    "inpaintImage": "Inpaint na imagem",
+    "invert": "Inverter",
+    "lipsync": "Lipsync",
+    "load3DModel": "Carregar modelo 3D",
+    "loadAudio": "Carregar áudio",
+    "loadImage": "Carregar imagem",
+    "loadStyleLora": "Carregar estilo (LoRA)",
+    "loadVideo": "Carregar vídeo",
+    "musicGeneration": "Geração de música",
+    "outpaintImage": "Outpaint na imagem",
+    "poseToImage": "Pose para imagem",
+    "poseToVideo": "Pose para vídeo",
+    "removeBackground": "Remover fundo",
+    "resizeImage": "Redimensionar imagem",
+    "rotate": "Girar",
+    "save3DModel": "Salvar modelo 3D",
+    "saveAudio": "Salvar áudio",
+    "saveImage": "Salvar imagem",
+    "saveVideo": "Salvar vídeo",
+    "text": "Texto",
+    "textGenerationLLM": "Geração de texto (LLM)",
+    "textTo3DModel": "Texto para modelo 3D",
+    "textToImage": "Texto para imagem",
+    "textToVideo": "Texto para vídeo"
+  },
+  "exportToast": {
+    "allExportsCompleted": "Todas as exportações concluídas",
+    "downloadExport": "Baixar exportação",
+    "downloadFailed": "Falha ao baixar \"{name}\"",
+    "exportCompleted": "Download ZIP pronto",
+    "exportError": "Falha na exportação",
+    "exportFailed": "{count} exportação falhou | {count} exportação falhou | {count} exportações falharam",
+    "exportFailedSingle": "Falha ao criar exportação ZIP",
+    "exportStarted": "Preparando download ZIP...",
+    "exportingAssets": "Exportando ativos",
+    "noExportsInQueue": "Nenhuma exportação de {filter} na fila",
+    "preparingExport": "Preparando exportação...",
+    "retryDownload": "Tentar baixar novamente"
+  },
+  "g": {
+    "1x": "1x",
+    "2x": "2x",
+    "about": "Sobre",
+    "add": "Adicionar",
+    "addNode": "Adicionar um nó...",
+    "addNodeFilterCondition": "Adicionar condição de filtro de nó",
+    "all": "Todos",
+    "amount": "Quantidade",
+    "apply": "Aplicar",
+    "architecture": "Arquitetura",
+    "asset": "{count} ativos | {count} ativo | {count} ativos",
+    "audioFailedToLoad": "Falha ao carregar áudio",
+    "audioProgress": "Progresso do áudio",
+    "author": "Autor",
+    "back": "Voltar",
+    "batchRename": "Renomear em lote",
+    "beta": "BETA",
+    "bookmark": "Salvar na biblioteca",
+    "calculatingDimensions": "Calculando dimensões",
+    "cancel": "Cancelar",
+    "cancelled": "Cancelado",
+    "capture": "capturar",
+    "category": "Categoria",
+    "chart": "Gráfico",
+    "chartLowercase": "gráfico",
+    "choose_file_to_upload": "escolha o arquivo para enviar",
+    "clear": "Limpar",
+    "clearAll": "Limpar tudo",
+    "clearFilters": "Limpar filtros",
+    "close": "Fechar",
+    "closeDialog": "Fechar diálogo",
+    "collapseAll": "Recolher tudo",
+    "color": "Cor",
+    "comfy": "Comfy",
+    "comfyOrgLogoAlt": "Logo do ComfyOrg",
+    "comingSoon": "Em breve",
+    "command": "Comando",
+    "commandProhibited": "O comando {command} é proibido. Entre em contato com um administrador para mais informações.",
+    "community": "Comunidade",
+    "completed": "Concluído",
+    "completedWithCheckmark": "Concluído ✓",
+    "confirm": "Confirmar",
+    "confirmed": "Confirmado",
+    "content": "conteúdo",
+    "continue": "Continuar",
+    "control_after_generate": "controle após gerar",
+    "control_before_generate": "controle antes de gerar",
+    "copied": "Copiado",
+    "copy": "Copiar",
+    "copyAll": "Copiar tudo",
+    "copyJobId": "Copiar ID da tarefa",
+    "copyToClipboard": "Copiar para a área de transferência",
+    "copyURL": "Copiar URL",
+    "core": "Núcleo",
+    "currentUser": "Usuário atual",
+    "custom": "Personalizado",
+    "customBackground": "Plano de fundo personalizado",
+    "customize": "Personalizar",
+    "customizeFolder": "Personalizar pasta",
+    "decrement": "Diminuir",
+    "defaultBanner": "banner padrão",
+    "delete": "Excluir",
+    "deleteAudioFile": "Excluir arquivo de áudio",
+    "deleteImage": "Excluir imagem",
+    "deprecated": "OBSOLETO",
+    "description": "Descrição",
+    "devOnly": "DEV",
+    "devices": "Dispositivos",
+    "disableAll": "Desativar tudo",
+    "disableSelected": "Desativar selecionados",
+    "disableThirdParty": "Desativar terceiros",
+    "disabling": "Desativando {id}",
+    "disconnectedFromBackend": "Desconectado do backend. Verifique se o servidor está em execução.",
+    "dismiss": "Dispensar",
+    "download": "Baixar",
+    "downloadAudio": "Baixar áudio",
+    "downloadImage": "Baixar imagem",
+    "downloadVideo": "Baixar vídeo",
+    "downloadWithSize": "Baixar ({size})",
+    "downloading": "Baixando",
+    "dropYourFileOr": "Solte seu arquivo ou",
+    "duplicate": "Duplicar",
+    "edit": "Editar",
+    "editImage": "Editar imagem",
+    "editOrMaskImage": "Editar ou mascarar imagem",
+    "emDash": "—",
+    "empty": "Vazio",
+    "enableAll": "Ativar tudo",
+    "enableOrDisablePack": "Ativar ou desativar pacote",
+    "enableSelected": "Ativar selecionados",
+    "enabled": "Ativado",
+    "enabling": "Ativando {id}",
+    "enter": "Entrar",
+    "enterBaseName": "Digite o nome base",
+    "enterNewName": "Digite o novo nome",
+    "enterNewNamePrompt": "Digite o novo nome:",
+    "enterSubgraph": "Entrar no Subgrafo",
+    "error": "Erro",
+    "errorLoadingImage": "Erro ao carregar imagem",
+    "errorLoadingVideo": "Erro ao carregar vídeo",
+    "essentials": "Essenciais",
+    "expandAll": "Expandir tudo",
+    "experimental": "BETA",
+    "export": "Exportar",
+    "extensionName": "Nome da extensão",
+    "extensions": "Extensões",
+    "failed": "Falhou",
+    "failedToCopyJobId": "Falha ao copiar o ID da tarefa",
+    "failedToDownloadImage": "Falha ao baixar imagem",
+    "failedToDownloadVideo": "Falha ao baixar vídeo",
+    "favorites": "Favoritos",
+    "feedback": "Feedback",
+    "file": "arquivo",
+    "filter": "Filtrar",
+    "filterBy": "Filtrar por:",
+    "filterByType": "Filtrar por {type}...",
+    "findIssues": "Encontrar problemas",
+    "frameNodes": "Enquadrar nós",
+    "frontendNewer": "A versão do frontend {frontendVersion} pode não ser compatível com a versão do backend {backendVersion}.",
+    "frontendOutdated": "A versão do frontend {frontendVersion} está desatualizada. O backend requer {requiredVersion} ou superior.",
+    "galleryImage": "Imagem da galeria",
+    "galleryThumbnail": "Miniatura da galeria",
+    "goToNode": "Ir para o nó",
+    "graphNavigation": "Navegação no grafo",
+    "halfSpeed": "0,5x",
+    "hideLeftPanel": "Ocultar painel esquerdo",
+    "hideRightPanel": "Ocultar painel direito",
+    "icon": "Ícone",
+    "imageDoesNotExist": "Imagem não existe",
+    "imageFailedToLoad": "Falha ao carregar imagem",
+    "imagePreview": "Pré-visualização da imagem - Use as setas para navegar entre as imagens",
+    "imageUrl": "URL da imagem",
+    "import": "Importar",
+    "inProgress": "Em andamento",
+    "inSubgraph": "no subgrafo '{name}'",
+    "increment": "Aumentar",
+    "info": "Informações do nó",
+    "input": "Entrada",
+    "insert": "Inserir",
+    "install": "Instalar",
+    "installed": "Instalado",
+    "installing": "Instalando",
+    "interrupted": "Interrompido",
+    "itemSelected": "{selectedCount} item selecionado",
+    "itemsCopiedToClipboard": "Itens copiados para a área de transferência",
+    "itemsSelected": "{selectedCount} itens selecionados",
+    "job": "Tarefa",
+    "jobIdCopied": "ID da tarefa copiado para a área de transferência",
+    "keybinding": "Atalho",
+    "keybindingAlreadyExists": "Atalho já existe em",
+    "keybindings": "Atalhos de teclado",
+    "learnMore": "Saiba mais",
+    "listening": "Ouvindo...",
+    "liveSamplingPreview": "Pré-visualização de amostragem ao vivo",
+    "loadAllFolders": "Carregar todas as pastas",
+    "loadWorkflow": "Carregar fluxo de trabalho",
+    "loading": "Carregando",
+    "loadingPanel": "Carregando painel {panel}...",
+    "login": "Entrar",
+    "logoAlt": "Logo do ComfyUI",
+    "logs": "Logs",
+    "manageExtensions": "Gerenciar extensões",
+    "markdown": "markdown",
+    "micPermissionDenied": "Permissão do microfone negada",
+    "migrate": "Migrar",
+    "missing": "Faltando",
+    "more": "Mais",
+    "moreOptions": "Mais opções",
+    "moreWorkflows": "Mais fluxos de trabalho",
+    "mostRelevant": "Mais relevante",
+    "multiSelectDropdown": "Menu suspenso de seleção múltipla",
+    "name": "Nome",
+    "newFolder": "Nova pasta",
+    "next": "Próximo",
+    "nightly": "NIGHTLY",
+    "no": "Não",
+    "noAudioRecorded": "Nenhum áudio gravado",
+    "noItems": "Nenhum item",
+    "noResults": "Sem resultados",
+    "noResultsFound": "Nenhum resultado encontrado",
+    "noTasksFound": "Nenhuma tarefa encontrada",
+    "noTasksFoundMessage": "Não há tarefas na fila.",
+    "noWorkflowsFound": "Nenhum fluxo de trabalho encontrado.",
+    "nodeContentError": "Erro no conteúdo do nó",
+    "nodeHeaderError": "Erro no cabeçalho do nó",
+    "nodeRenderError": "Erro ao renderizar nó",
+    "nodeSlotsError": "Erro nos slots do nó",
+    "nodeWidgetsError": "Erro nos widgets do nó",
+    "nodes": "Nós",
+    "nodesCount": "{count} nós | {count} nó | {count} nós",
+    "nodesRunning": "nós em execução",
+    "none": "Nenhum",
+    "nothingToCopy": "Nada para copiar",
+    "nothingToDelete": "Nada para excluir",
+    "nothingToDuplicate": "Nada para duplicar",
+    "nothingToRename": "Nada para renomear",
+    "ok": "OK",
+    "openManager": "Abrir gerenciador",
+    "openNewIssue": "Abrir novo problema",
+    "or": "ou",
+    "output": "Saída",
+    "overwrite": "Sobrescrever",
+    "partner": "Parceiro",
+    "playPause": "Reproduzir/Pausar",
+    "playRecording": "Reproduzir gravação",
+    "playbackSpeed": "Velocidade de reprodução",
+    "playing": "Reproduzindo",
+    "pressKeysForNewBinding": "Pressione as teclas para novo atalho",
+    "preview": "PRÉVIA",
+    "profile": "Perfil",
+    "progressCountOf": "de",
+    "queued": "Na fila",
+    "ready": "Pronto",
+    "recents": "Recentes",
+    "reconnected": "Reconectado",
+    "reconnecting": "Reconectando",
+    "refresh": "Atualizar",
+    "refreshNode": "Atualizar nó",
+    "relativeTime": {
+      "daysAgo": "há {count}d",
+      "hoursAgo": "há {count}h",
+      "minutesAgo": "há {count}min",
+      "monthsAgo": "há {count}m",
+      "now": "agora",
+      "weeksAgo": "há {count}s",
+      "yearsAgo": "há {count}a"
+    },
+    "releaseTitle": "Lançamento {package} {version}",
+    "reloadToApplyChanges": "Recarregue para aplicar as alterações",
+    "remove": "Remover",
+    "removeImage": "Remover imagem",
+    "removeTag": "Remover tag",
+    "removeVideo": "Remover vídeo",
+    "rename": "Renomear",
+    "reportIssue": "Enviar relatório",
+    "reportIssueTooltip": "Enviar o relatório de erro para a Comfy Org",
+    "reportSent": "Relatório enviado",
+    "reset": "Redefinir",
+    "resetAll": "Redefinir tudo",
+    "resetAllKeybindingsTooltip": "Redefinir todos os atalhos para o padrão",
+    "resizeFromBottomLeft": "Redimensionar pelo canto inferior esquerdo",
+    "resizeFromBottomRight": "Redimensionar pelo canto inferior direito",
+    "resizeFromTopLeft": "Redimensionar pelo canto superior esquerdo",
+    "resizeFromTopRight": "Redimensionar pelo canto superior direito",
+    "restart": "Reiniciar",
+    "resultsCount": "{count} resultados encontrados",
+    "running": "Executando",
+    "save": "Salvar",
+    "saving": "Salvando",
+    "scrollLeft": "Rolar para a esquerda",
+    "scrollRight": "Rolar para a direita",
+    "search": "Buscar",
+    "searchExtensions": "Buscar extensões",
+    "searchFailedMessage": "Não encontramos nenhuma configuração correspondente à sua busca. Tente ajustar os termos de pesquisa.",
+    "searchKeybindings": "Buscar atalhos",
+    "searchModels": "Buscar modelos",
+    "searchNodes": "Buscar nós",
+    "searchPlaceholder": "Buscar...",
+    "searchSettings": "Buscar configurações",
+    "searchWorkflows": "Buscar fluxos de trabalho",
+    "seeTutorial": "Veja um tutorial",
+    "selectItemsToCopy": "Selecione itens para copiar",
+    "selectItemsToDelete": "Selecione itens para excluir",
+    "selectItemsToDuplicate": "Selecione itens para duplicar",
+    "selectItemsToRename": "Selecione itens para renomear",
+    "selectedFile": "Arquivo selecionado",
+    "setAsBackground": "Definir como plano de fundo",
+    "settings": "Configurações",
+    "shortcutSuffix": " ({shortcut})",
+    "showLeftPanel": "Mostrar painel esquerdo",
+    "showReport": "Mostrar relatório",
+    "showRightPanel": "Mostrar painel direito",
+    "singleSelectDropdown": "Menu suspenso de seleção única",
+    "sort": "Ordenar",
+    "source": "Fonte",
+    "startRecording": "Iniciar gravação",
+    "status": "Status",
+    "stopPlayback": "Parar reprodução",
+    "stopRecording": "Parar gravação",
+    "submit": "Enviar",
+    "success": "Sucesso",
+    "systemInfo": "Informações do sistema",
+    "terminal": "Terminal",
+    "title": "Título",
+    "triggerPhrase": "Frase de gatilho",
+    "unknownError": "Erro desconhecido",
+    "unknownFile": "Arquivo desconhecido",
+    "untitled": "Sem título",
+    "update": "Atualizar",
+    "updateAvailable": "Atualização disponível",
+    "updateFrontend": "Atualizar frontend",
+    "updated": "Atualizado",
+    "updating": "Atualizando {id}",
+    "upload": "Enviar",
+    "uploadAlreadyInProgress": "O upload já está em andamento",
+    "usageHint": "Dica de uso",
+    "use": "Usar",
+    "user": "Usuário",
+    "versionMismatchWarning": "Aviso de compatibilidade de versão",
+    "versionMismatchWarningMessage": "{warning}: {detail} Visite https://docs.comfy.org/installation/update_comfyui#common-update-issues para instruções de atualização.",
+    "videoFailedToLoad": "Falha ao carregar vídeo",
+    "videoPreview": "Pré-visualização do vídeo - Use as setas para navegar entre os vídeos",
+    "viewImageOfTotal": "Visualizar imagem {index} de {total}",
+    "viewVideoOfTotal": "Visualizar vídeo {index} de {total}",
+    "volume": "Volume",
+    "warning": "Aviso",
+    "workflow": "Fluxo de trabalho",
+    "you": "Você"
+  },
+  "graphCanvasMenu": {
+    "fitView": "Ajustar à Tela",
+    "focusMode": "Modo de Foco",
+    "hand": "Mão",
+    "hideLinks": "Ocultar Conexões",
+    "panMode": "Modo de Panorâmica",
+    "resetView": "Redefinir Visão",
+    "select": "Selecionar",
+    "selectMode": "Modo de Seleção",
+    "showLinks": "Mostrar Conexões",
+    "toggleLinkVisibility": "Alternar Visibilidade das Conexões",
+    "toggleMinimap": "Alternar Minimapa",
+    "zoomIn": "Aproximar",
+    "zoomOptions": "Opções de Zoom",
+    "zoomOut": "Afastar"
+  },
+  "groupNode": {
+    "create": "Criar nó de grupo",
+    "enterName": "Digite o nome"
+  },
+  "help": {
+    "helpCenterMenu": "Menu do Centro de Ajuda",
+    "recentReleases": "Lançamentos recentes"
+  },
+  "helpCenter": {
+    "clickToLearnMore": "Clique para saber mais →",
+    "desktopUserGuide": "Guia do Usuário Desktop",
+    "docs": "Documentação",
+    "feedback": "Enviar feedback",
+    "github": "Github",
+    "help": "Ajuda & Suporte",
+    "loadingReleases": "Carregando versões...",
+    "managerExtension": "Gerenciar Extensão",
+    "more": "Mais...",
+    "noRecentReleases": "Nenhuma versão recente",
+    "openDevTools": "Abrir Ferramentas de Desenvolvedor",
+    "recentReleases": "Versões recentes",
+    "reinstall": "Reinstalar",
+    "updateAvailable": "Atualizar",
+    "updateComfyUI": "Atualizar ComfyUI",
+    "updateComfyUIFailed": "Falha ao atualizar o ComfyUI. Por favor, tente novamente.",
+    "updateComfyUIStarted": "Atualização iniciada",
+    "updateComfyUIStartedDetail": "A atualização do ComfyUI foi adicionada à fila. Por favor, aguarde...",
+    "updateComfyUISuccess": "Atualização concluída",
+    "updateComfyUISuccessDetail": "ComfyUI foi atualizado. Reiniciando...",
+    "whatsNew": "Novidades"
+  },
+  "icon": {
+    "bookmark": "Favorito",
+    "box": "Caixa",
+    "briefcase": "Maleta",
+    "exclamation-triangle": "Aviso",
+    "file": "Arquivo",
+    "folder": "Pasta",
+    "heart": "Coração",
+    "inbox": "Caixa de Entrada",
+    "star": "Estrela"
+  },
+  "imageCompare": {
+    "batchLabelA": "A:",
+    "batchLabelB": "B:",
+    "noImages": "Nenhuma imagem para comparar"
+  },
+  "imageCrop": {
+    "cropPreviewAlt": "Pré-visualização do recorte",
+    "custom": "Personalizado",
+    "loading": "Carregando...",
+    "lockRatio": "Bloquear proporção",
+    "noInputImage": "Nenhuma imagem de entrada conectada",
+    "ratio": "Proporção",
+    "unlockRatio": "Desbloquear proporção"
+  },
+  "importFailed": {
+    "copyError": "Erro ao Copiar",
+    "title": "Falha na Importação"
+  },
+  "install": {
+    "appDataLocationTooltip": "Diretório de dados do aplicativo ComfyUI. Armazena:\n- Logs\n- Configurações do servidor",
+    "appPathLocationTooltip": "Diretório de ativos do aplicativo ComfyUI. Armazena o código e os ativos do ComfyUI",
+    "cannotWrite": "Não foi possível gravar no caminho selecionado",
+    "chooseInstallationLocation": "Escolher Local de Instalação",
+    "customNodes": "Nós Personalizados",
+    "customNodesDescription": "Reinstale nós personalizados de instalações existentes do ComfyUI.",
+    "desktopAppSettings": "Configurações do Aplicativo Desktop",
+    "desktopAppSettingsDescription": "Configure como o ComfyUI se comporta no seu desktop. Você pode alterar essas configurações depois.",
+    "desktopSettings": "Configurações do Desktop",
+    "failedToSelectDirectory": "Falha ao selecionar o diretório",
+    "gpu": "GPU",
+    "gpuPicker": {
+      "amdDescription": "Use sua GPU AMD com aceleração ROCm™ para o melhor desempenho.",
+      "amdSubtitle": "AMD ROCm™",
+      "appleMetalDescription": "Aproveita a GPU do seu Mac para maior velocidade e uma experiência geral melhor",
+      "cpuDescription": "Use o modo CPU para compatibilidade quando a aceleração por GPU não estiver disponível",
+      "cpuSubtitle": "Modo CPU",
+      "manualDescription": "Configure o ComfyUI manualmente para configurações avançadas ou hardware não suportado",
+      "manualSubtitle": "Configuração Manual",
+      "nvidiaDescription": "Use sua GPU NVIDIA com aceleração CUDA para o melhor desempenho.",
+      "nvidiaSubtitle": "NVIDIA CUDA",
+      "recommended": "RECOMENDADO",
+      "title": "Escolha sua configuração de hardware"
+    },
+    "gpuSelection": {
+      "cpuMode": "Modo CPU",
+      "cpuModeDescription": "O modo CPU é destinado apenas para desenvolvedores e casos raros.",
+      "cpuModeDescription2": "Se você não tem certeza absoluta de que precisa disso, ignore esta caixa e selecione sua GPU acima.",
+      "customComfyNeedsPython": "O ComfyUI não funcionará até que o python seja configurado",
+      "customInstallRequirements": "Instalar todos os requisitos e dependências (ex: torch customizado)",
+      "customManualVenv": "Configurar manualmente o venv do python",
+      "customMayNotWork": "Isto não é suportado e pode simplesmente não funcionar",
+      "customSkipsPython": "Esta opção pula a configuração normal do python.",
+      "enableCpuMode": "Ativar Modo CPU",
+      "mpsDescription": "Apple Metal Performance Shaders são suportados usando pytorch nightly.",
+      "nvidiaDescription": "Dispositivos NVIDIA são suportados diretamente usando builds pytorch CUDA.",
+      "selectGpu": "Selecionar GPU",
+      "selectGpuDescription": "Selecione o tipo de GPU que você possui"
+    },
+    "helpImprove": "Por favor, ajude a melhorar o ComfyUI",
+    "insideAppInstallDir": "Esta pasta está dentro do pacote do aplicativo ComfyUI Desktop e será excluída durante as atualizações. Escolha um diretório fora da pasta de instalação, como Documentos/ComfyUI.",
+    "insideUpdaterCache": "Esta pasta está dentro do cache de atualização do ComfyUI, que é limpo a cada atualização. Selecione um local diferente para seus dados.",
+    "installLocation": "Local de Instalação",
+    "installLocationDescription": "Selecione o diretório para os dados do usuário do ComfyUI. Um ambiente Python será instalado no local selecionado.",
+    "installLocationTooltip": "Diretório de dados do usuário do ComfyUI. Armazena:\n- Ambiente Python\n- Modelos\n- Nós personalizados\n",
+    "insufficientFreeSpace": "Espaço insuficiente - espaço livre mínimo",
+    "isOneDrive": "OneDrive não é suportado. Por favor, instale o ComfyUI em outro local.",
+    "locationPicker": {
+      "chooseDownloadServers": "Escolher servidores de download manualmente",
+      "downloadServersDescription": "Selecione servidores espelho específicos para baixar Python, pacotes PyPI e PyTorch de acordo com sua localização.",
+      "migrateDescription": "Copie ou vincule seus modelos, nós personalizados e configurações de uma instalação anterior do ComfyUI.",
+      "migrateFromExisting": "Migrar de uma instalação existente",
+      "migrationPathPlaceholder": "Selecione uma instalação existente do ComfyUI (opcional)",
+      "pathPlaceholder": "/Users/username/Documents/ComfyUI",
+      "subtitle": "Escolha uma pasta para os arquivos do ComfyUI. Também configuraremos o Python automaticamente lá.",
+      "title": "Escolha onde instalar o ComfyUI"
+    },
+    "manualConfiguration": {
+      "createVenv": "Você precisará criar um ambiente virtual no seguinte diretório",
+      "requirements": "Requisitos",
+      "restartWhenFinished": "Quando terminar de configurar o ambiente virtual, por favor reinicie o ComfyUI.",
+      "title": "Configuração Manual",
+      "virtualEnvironmentPath": "Caminho do ambiente virtual"
+    },
+    "metricsDisabled": "Métricas Desativadas",
+    "metricsEnabled": "Métricas Ativadas",
+    "migrateFromExistingInstallation": "Migrar de Instalação Existente",
+    "migration": "Migração",
+    "migrationOptional": "A migração é opcional. Se você não possui uma instalação existente, pode pular esta etapa.",
+    "migrationSourcePathDescription": "Se você já possui uma instalação do ComfyUI, podemos copiar/vincular seus arquivos de usuário e modelos existentes para a nova instalação. Sua instalação atual do ComfyUI não será afetada.",
+    "moreInfo": "Para mais informações, leia nossa",
+    "nonDefaultDrive": "Por favor, instale o ComfyUI na unidade do sistema (ex: C:\\). Unidades com sistemas de arquivos diferentes podem causar problemas imprevisíveis. Modelos e outros arquivos podem ser armazenados em outras unidades após a instalação.",
+    "parentMissing": "O caminho não existe - crie o diretório de nível superior primeiro",
+    "pathExists": "O diretório já existe - certifique-se de ter feito backup de todos os dados",
+    "pathValidationFailed": "Falha ao validar o caminho",
+    "privacyPolicy": "política de privacidade",
+    "selectItemsToMigrate": "Selecione Itens para Migrar",
+    "settings": {
+      "allowMetrics": "Métricas de Uso",
+      "allowMetricsDescription": "Ajude a melhorar o ComfyUI enviando métricas de uso anônimas. Nenhuma informação pessoal ou conteúdo de fluxo de trabalho será coletado.",
+      "autoUpdate": "Atualizações Automáticas",
+      "autoUpdateDescription": "Baixe atualizações automaticamente quando estiverem disponíveis. Você será notificado antes das atualizações serem instaladas.",
+      "checkingMirrors": "Verificando acesso à rede para os espelhos do python...",
+      "dataCollectionDialog": {
+        "collect": {
+          "errorReports": "Mensagem de erro e rastreamento de pilha",
+          "systemInfo": "Hardware, tipo de SO e versão do aplicativo",
+          "userJourneyEvents": "Eventos da jornada do usuário"
+        },
+        "doNotCollect": {
+          "customNodeConfigurations": "Configurações de nós personalizados",
+          "fileSystemInformation": "Informações do sistema de arquivos",
+          "personalInformation": "Informações pessoais",
+          "workflowContents": "Conteúdo do fluxo de trabalho"
+        },
+        "title": "Sobre a Coleta de Dados",
+        "viewFullPolicy": "Ver política completa",
+        "whatWeCollect": "O que coletamos:",
+        "whatWeDoNotCollect": "O que não coletamos:"
+      },
+      "errorUpdatingConsent": "Erro ao Atualizar Consentimento",
+      "errorUpdatingConsentDetail": "Falha ao atualizar as configurações de consentimento de métricas",
+      "learnMoreAboutData": "Saiba mais sobre a coleta de dados",
+      "mirrorSettings": "Configurações de Espelho",
+      "mirrorsReachable": "O acesso à rede para os espelhos do python está bom",
+      "mirrorsUnreachable": "O acesso à rede para alguns espelhos do python está ruim",
+      "pypiMirrorPlaceholder": "Insira a URL do espelho do PyPI",
+      "pythonMirrorPlaceholder": "Insira a URL do espelho do Python"
+    },
+    "systemLocations": "Locais do Sistema",
+    "unhandledError": "Erro desconhecido",
+    "updateConsent": "Você optou anteriormente por relatar falhas. Agora estamos rastreando métricas baseadas em eventos para ajudar a identificar bugs e melhorar o aplicativo. Nenhuma informação pessoal identificável é coletada."
+  },
+  "issueReport": {
+    "helpFix": "Ajude a Corrigir Isto"
+  },
+  "linearMode": {
+    "appModeToolbar": {
+      "appBuilder": "Construtor de aplicativos",
+      "apps": "Aplicativos",
+      "appsEmptyMessage": "Os aplicativos salvos aparecerão aqui.\nClique abaixo para criar seu primeiro aplicativo.",
+      "enterAppMode": "Entrar no modo de aplicativo"
+    },
+    "arrange": {
+      "atLeastOne": "pelo menos um",
+      "connectAtLeastOne": "Conecte {atLeastOne} nó de saída para que os usuários possam ver os resultados após a execução.",
+      "noOutputs": "Nenhuma saída adicionada ainda",
+      "outputExamples": "Exemplos: 'Salvar imagem' ou 'Salvar vídeo'",
+      "outputs": "Saídas",
+      "resultsLabel": "Os resultados gerados pelo(s) nó(s) de saída selecionado(s) serão exibidos aqui após a execução deste aplicativo",
+      "switchToOutputs": "Vá para a etapa 'Saída' e clique nos nós de saída para adicioná-los aqui.",
+      "switchToOutputsButton": "Ir para Saídas"
+    },
+    "backToWorkflow": "Voltar para o fluxo de trabalho",
+    "beta": "Modo App Beta - Envie seu feedback",
+    "builder": {
+      "exit": "Sair do construtor",
+      "exitConfirmMessage": "Você tem alterações não salvas que serão perdidas\nSair sem salvar?",
+      "exitConfirmTitle": "Sair do construtor de app?",
+      "inputsDesc": "Os usuários irão interagir e ajustar estes para gerar seus resultados.",
+      "inputsExample": "Exemplos: “Carregar imagem”, “Prompt de texto”, “Passos”",
+      "noInputs": "Nenhuma entrada adicionada ainda",
+      "noOutputs": "Nenhum nó de saída adicionado ainda",
+      "outputsDesc": "Conecte pelo menos um nó de saída para que os usuários vejam os resultados após executar.",
+      "outputsExample": "Exemplos: “Salvar imagem” ou “Salvar vídeo”",
+      "promptAddInputs": "Clique nos parâmetros do nó para adicioná-los aqui como entradas",
+      "promptAddOutputs": "Clique nos nós de saída para adicioná-los aqui. Estes serão os resultados gerados.",
+      "title": "Modo construtor de app",
+      "unknownWidget": "Widget não visível"
+    },
+    "downloadAll": "Baixar tudo",
+    "dragAndDropImage": "Arraste e solte uma imagem",
+    "emptyWorkflowExplanation": "Seu fluxo de trabalho está vazio. Você precisa adicionar alguns nós primeiro para começar a construir um app.",
+    "enterNodeGraph": "Entrar no grafo de nós",
+    "giveFeedback": "Enviar feedback",
+    "graphMode": "Modo Gráfico",
+    "linearMode": "Modo App",
+    "loadTemplate": "Carregar um modelo",
+    "mobileControls": "Editar e Executar",
+    "queue": {
+      "clear": "Limpar fila",
+      "clickToClear": "Clique para limpar a fila"
+    },
+    "rerun": "Executar novamente",
+    "reuseParameters": "Reutilizar parâmetros",
+    "runCount": "Número de execuções:",
+    "viewJob": "Ver tarefa",
+    "welcome": {
+      "buildApp": "Criar aplicativo",
+      "controls": "Seus resultados aparecem na parte inferior, seus controles estão à direita. Todo o resto fica fora do caminho.",
+      "getStarted": "Clique em {runButton} para começar.",
+      "message": "Uma visualização simplificada que oculta o grafo de nós para você focar na criação.",
+      "sharing": "Compartilhar é fácil: crie seu fluxo de trabalho, abra o Modo App, clique com o botão direito na aba e exporte. Quando outros abrirem seu arquivo, ele será iniciado diretamente nesta visualização limpa. Você pode compartilhar fluxos de trabalho poderosos como ferramentas simples, sem que ninguém precise entender grafos de nós.",
+      "title": "Bem-vindo ao Modo App"
+    }
+  },
+  "load3d": {
+    "applyingTexture": "Aplicando Textura...",
+    "backgroundColor": "Cor de Fundo",
+    "camera": "Câmera",
+    "cameraType": {
+      "orthographic": "Ortográfica",
+      "perspective": "Perspectiva"
+    },
+    "clearRecording": "Limpar Gravação",
+    "dropToLoad": "Arraste o modelo 3D para carregar",
+    "edgeThreshold": "Limite de Borda",
+    "export": "Exportar",
+    "exportModel": "Exportar Modelo",
+    "exportRecording": "Exportar Gravação",
+    "exportingModel": "Exportando modelo...",
+    "fov": "Campo de Visão (FOV)",
+    "light": "Luz",
+    "lightIntensity": "Intensidade da Luz",
+    "loadingBackgroundImage": "Carregando Imagem de Fundo",
+    "loadingModel": "Carregando Modelo 3D...",
+    "materialMode": "Modo de Material",
+    "materialModes": {
+      "depth": "Profundidade",
+      "lineart": "Lineart",
+      "normal": "Normal",
+      "original": "Original",
+      "pointCloud": "Nuvem de Pontos",
+      "wireframe": "Wireframe"
+    },
+    "model": "Modelo",
+    "openIn3DViewer": "Abrir no Visualizador 3D",
+    "panoramaMode": "Panorama",
+    "previewOutput": "Visualizar Saída",
+    "reloadingModel": "Recarregando modelo...",
+    "removeBackgroundImage": "Remover Imagem de Fundo",
+    "resizeNodeMatchOutput": "Redimensionar Nó para corresponder à saída",
+    "scene": "Cena",
+    "showGrid": "Mostrar Grade",
+    "showSkeleton": "Mostrar Esqueleto",
+    "startRecording": "Iniciar Gravação",
+    "stopRecording": "Parar Gravação",
+    "switchCamera": "Alternar Câmera",
+    "switchingMaterialMode": "Alternando Modo de Material...",
+    "tiledMode": "Mosaico",
+    "unsupportedFileType": "Tipo de arquivo não suportado (suporta .gltf, .glb, .obj, .fbx, .stl)",
+    "upDirection": "Direção Para Cima",
+    "upDirections": {
+      "original": "Original"
+    },
+    "uploadBackgroundImage": "Enviar Imagem de Fundo",
+    "uploadTexture": "Enviar Textura",
+    "uploadingModel": "Enviando modelo 3D...",
+    "viewer": {
+      "apply": "Aplicar",
+      "cameraSettings": "Configurações da Câmera",
+      "cameraType": "Tipo de Câmera",
+      "cancel": "Cancelar",
+      "exportSettings": "Configurações de Exportação",
+      "lightSettings": "Configurações de Luz",
+      "modelSettings": "Configurações do Modelo",
+      "sceneSettings": "Configurações da Cena",
+      "title": "Visualizador 3D (Beta)"
+    }
+  },
+  "loadWorkflowWarning": {
+    "coreNodesFromVersion": "Nós principais da versão {version}:",
+    "outdatedVersion": "Este fluxo de trabalho foi criado com uma versão mais recente do ComfyUI ({version}). Alguns nós podem não funcionar corretamente.",
+    "outdatedVersionGeneric": "Este fluxo de trabalho foi criado com uma versão mais recente do ComfyUI. Alguns nós podem não funcionar corretamente."
+  },
+  "maintenance": {
+    "None": "Nenhum",
+    "OK": "OK",
+    "Skipped": "Ignorado",
+    "allOk": "Nenhum problema foi detectado.",
+    "confirmTitle": "Tem certeza?",
+    "consoleLogs": "Logs do Console",
+    "detected": "Detectado",
+    "error": {
+      "cannotContinue": "Não é possível continuar - ainda há erros",
+      "defaultDescription": "Ocorreu um erro ao executar uma tarefa de manutenção.",
+      "taskFailed": "Falha ao executar a tarefa.",
+      "toastTitle": "Erro na tarefa"
+    },
+    "refreshing": "Atualizando",
+    "showManual": "Mostrar tarefas de manutenção",
+    "status": "Status",
+    "terminalDefaultMessage": "Ao executar um comando de solução de problemas, qualquer saída será exibida aqui.",
+    "title": "Manutenção",
+    "unsafeMigration": {
+      "action": "Use a tarefa de manutenção \"Caminho base\" abaixo para mover o ComfyUI para um local seguro.",
+      "appInstallDir": "Seu caminho base está dentro do pacote do aplicativo ComfyUI Desktop. Esta pasta pode ser excluída ou sobrescrita durante as atualizações. Escolha um diretório fora da pasta de instalação, como Documentos/ComfyUI.",
+      "generic": "Seu caminho base atual do ComfyUI está em um local que pode ser excluído ou modificado durante as atualizações. Para evitar perda de dados, mova-o para uma pasta segura.",
+      "oneDrive": "Seu caminho base está no OneDrive, o que pode causar problemas de sincronização e perda acidental de dados. Escolha uma pasta local que não seja gerenciada pelo OneDrive.",
+      "title": "Local de instalação inseguro detectado",
+      "updaterCache": "Seu caminho base está dentro do cache de atualização do ComfyUI, que é limpo a cada atualização. Escolha um local diferente para seus dados."
+    }
+  },
+  "manager": {
+    "actions": "Ações",
+    "allMissingNodesInstalled": "Todos os nodes ausentes foram instalados com sucesso",
+    "applyChanges": "Aplicar Alterações",
+    "basicInfo": "Informações Básicas",
+    "changingVersion": "Alterando versão de {from} para pt-BR",
+    "clickToFinishSetup": "Clique",
+    "conflicts": {
+      "conflictInfoTitle": "Por que isso está acontecendo?",
+      "conflictMessages": {
+        "accelerator": "GPU/Acelerador não suportado (disponível: {current}, requerido: {required})",
+        "banned": "Este pacote está banido por motivos de segurança",
+        "comfyui_version": "Versão do ComfyUI incompatível (atual: {current}, requerida: {required})",
+        "frontend_version": "Versão do frontend incompatível (atual: {current}, requerida: {required})",
+        "generic": "Problema de compatibilidade (atual: {current}, requerido: {required})",
+        "import_failed": "Falha na Importação",
+        "os": "Sistema operacional não suportado (atual: {current}, requerido: {required})",
+        "pending": "Verificação de segurança pendente - compatibilidade não pode ser verificada"
+      },
+      "conflicts": "Conflitos",
+      "description": "Detectamos conflitos entre algumas de suas extensões e a nova versão do ComfyUI. Ao atualizar, você corre o risco de quebrar workflows que dependem dessas extensões.",
+      "enableAnyway": "Ativar Mesmo Assim",
+      "extensionAtRisk": "Extensão em Risco",
+      "importFailedExtensions": "Extensões com Falha na Importação",
+      "info": "Se continuar com a atualização, as extensões conflitantes serão desativadas automaticamente. Você pode revisá-las e gerenciá-las a qualquer momento no Gerenciador do ComfyUI.",
+      "installAnyway": "Instalar Mesmo Assim",
+      "title": "Problemas com Node Pack Detectados!",
+      "understood": "Entendi",
+      "warningBanner": {
+        "button": "Saiba Mais...",
+        "message": "Essas extensões requerem versões de pacotes do sistema que diferem da sua configuração atual. Instalá-las pode sobrescrever dependências principais e afetar outras extensões ou workflows.",
+        "title": "Algumas extensões estão desativadas devido à incompatibilidade com sua configuração atual"
+      },
+      "warningTooltip": "Este pacote pode ter problemas de compatibilidade com seu ambiente atual"
+    },
+    "createdBy": "Criado por",
+    "dependencies": "Dependências",
+    "disabledNodesWontUpdate": "Nodes desativados não serão atualizados",
+    "discoverCommunityContent": "Descubra Node Packs, Extensões e mais criados pela comunidade...",
+    "downloads": "Downloads",
+    "emptyState": {
+      "allInstalled": {
+        "message": "Você ainda não instalou nenhuma extensão.",
+        "title": "Nenhuma extensão instalada"
+      },
+      "conflicting": {
+        "message": "Todas as suas extensões são compatíveis.",
+        "title": "Nenhum conflito detectado"
+      },
+      "missing": {
+        "message": "Todos os nós necessários estão instalados.",
+        "title": "Nenhum nó ausente"
+      },
+      "updateAvailable": {
+        "message": "Todas as suas extensões estão atualizadas.",
+        "title": "Tudo atualizado"
+      },
+      "workflow": {
+        "message": "Este fluxo de trabalho não utiliza nenhum nó de extensão.",
+        "title": "Nenhuma extensão no fluxo de trabalho"
+      }
+    },
+    "enablePackToChangeVersion": "Ative este pacote para alterar versões",
+    "errorConnecting": "Erro ao conectar ao Registro de Nodes do Comfy.",
+    "extensionsSuccessfullyInstalled": "Extensão(ões) instalada(s) com sucesso e pronta(s) para uso!",
+    "failed": "Falhou",
+    "failedToInstall": "Falha ao Instalar",
+    "filter": {
+      "disabled": "Desativado",
+      "enabled": "Ativado",
+      "nodePack": "Node Pack"
+    },
+    "gettingInfo": "Obtendo informações...",
+    "importFailedGenericError": "Falha ao importar o pacote. Verifique o console para mais detalhes.",
+    "inWorkflow": "No Workflow",
+    "infoPanelEmpty": "Clique em um item para ver as informações",
+    "installAllMissingNodes": "Instalar Todos",
+    "installError": "Erro de Instalação",
+    "installSelected": "Instalar Selecionados",
+    "installationQueue": "Fila de Instalação",
+    "installingDependencies": "Instalando dependências...",
+    "lastUpdated": "Última Atualização",
+    "latestVersion": "Mais Recente",
+    "legacyManagerSearchTip": "Procurando pelo ComfyUI-Manager? Você pode ativar a interface legada do gerenciador iniciando o ComfyUI com a flag --enable-manager-legacy-ui.",
+    "legacyManagerUI": "Usar UI Legada",
+    "legacyManagerUIDescription": "Para usar a UI Legada do Gerenciador, inicie o ComfyUI com --enable-manager-legacy-ui",
+    "legacyMenuNotAvailable": "O menu do gerenciador legado não está disponível, usando o novo menu do gerenciador por padrão.",
+    "license": "Licença",
+    "loadingVersions": "Carregando versões...",
+    "mixedSelectionMessage": "Não é possível realizar ação em massa em seleção mista",
+    "nav": {
+      "allExtensions": "Todas as Extensões",
+      "allInWorkflow": "Todos em: {workflowName}",
+      "allInstalled": "Todos Instalados",
+      "conflicting": "Conflitante",
+      "inWorkflowSection": "NO FLUXO DE TRABALHO",
+      "installedSection": "INSTALADO",
+      "missingNodes": "Nós Ausentes",
+      "notInstalled": "Não Instalado",
+      "updatesAvailable": "Atualizações Disponíveis"
+    },
+    "nightlyVersion": "Noturna",
+    "noDescription": "Nenhuma descrição disponível",
+    "noNodesFound": "Nenhum node encontrado",
+    "noNodesFoundDescription": "Os nodes do pacote não puderam ser analisados ou o pacote é apenas uma extensão de frontend e não possui nodes.",
+    "noResultsFound": "Nenhum resultado encontrado para sua busca.",
+    "nodePack": "Node Pack",
+    "nodePackInfo": "Informações do Pacote de Nós",
+    "notAvailable": "Não Disponível",
+    "packInstall": {
+      "nodeIdRequired": "ID do nó é obrigatório para instalação"
+    },
+    "packsSelected": "pacotes selecionados",
+    "repository": "Repositório",
+    "restartToApplyChanges": "Para aplicar as alterações, reinicie o ComfyUI",
+    "restartingBackend": "Reiniciando backend para aplicar as alterações...",
+    "searchPlaceholder": "Buscar",
+    "selectVersion": "Selecionar Versão",
+    "selected": "Selecionado",
+    "sort": {
+      "created": "Mais Novos",
+      "downloads": "Mais Populares",
+      "publisher": "Publicador",
+      "updated": "Atualizados Recentemente"
+    },
+    "status": {
+      "active": "Ativo",
+      "banned": "Banido",
+      "conflicting": "Conflitante",
+      "deleted": "Excluído",
+      "flagged": "Marcado",
+      "importFailed": "Erro de Instalação",
+      "pending": "Pendente",
+      "unknown": "Desconhecido"
+    },
+    "title": "Gerenciador de Nodes Personalizados",
+    "toFinishSetup": "para finalizar a configuração",
+    "totalNodes": "Total de Nodes",
+    "tryAgainLater": "Por favor, tente novamente mais tarde.",
+    "tryDifferentSearch": "Por favor, tente uma busca diferente.",
+    "tryUpdate": "Tentar Atualizar",
+    "tryUpdateTooltip": "Buscar as últimas alterações do repositório. Versões noturnas podem ter atualizações que não são detectadas automaticamente.",
+    "uninstall": "Desinstalar",
+    "uninstallSelected": "Desinstalar Selecionados",
+    "uninstalling": "Desinstalando {id}",
+    "update": "Atualizar",
+    "updateAll": "Atualizar Todos",
+    "updateSelected": "Atualizar Selecionados",
+    "updatingAllPacks": "Atualizando todos os pacotes",
+    "version": "Versão"
+  },
+  "maskEditor": {
+    "activateLayer": "Ativar camada",
+    "applyToWholeImage": "Aplicar à imagem inteira",
+    "baseImageLayer": "Camada de imagem base",
+    "baseLayerPreview": "Pré-visualização da camada base",
+    "black": "Preto",
+    "brushSettings": "Configurações do pincel",
+    "brushShape": "Forma do pincel",
+    "clear": "Limpar",
+    "clickToResetZoom": "Clique para redefinir o zoom",
+    "colorSelectSettings": "Configurações de seleção de cor",
+    "colorSelector": "Seletor de cor",
+    "fillOpacity": "Opacidade do preenchimento",
+    "hardness": "Dureza",
+    "imageLayer": "Camada de imagem",
+    "invert": "Inverter",
+    "layers": "Camadas",
+    "livePreview": "Pré-visualização ao vivo",
+    "maskBlendingOptions": "Opções de mesclagem da máscara",
+    "maskLayer": "Camada de máscara",
+    "maskOpacity": "Opacidade da máscara",
+    "maskTolerance": "Tolerância da máscara",
+    "method": "Método",
+    "mirrorHorizontal": "Espelhar horizontalmente",
+    "mirrorVertical": "Espelhar verticalmente",
+    "negative": "Negativo",
+    "opacity": "Opacidade",
+    "paintBucketSettings": "Configurações do balde de tinta",
+    "paintLayer": "Camada de pintura",
+    "redo": "Refazer",
+    "resetToDefault": "Restaurar padrão",
+    "rotateLeft": "Girar para a esquerda",
+    "rotateRight": "Girar para a direita",
+    "selectionOpacity": "Opacidade da seleção",
+    "smoothingPrecision": "Precisão de suavização",
+    "stepSize": "Tamanho do passo",
+    "stopAtMask": "Parar na máscara",
+    "thickness": "Espessura",
+    "title": "Editor de máscara",
+    "tolerance": "Tolerância",
+    "undo": "Desfazer",
+    "white": "Branco"
+  },
+  "mediaAsset": {
+    "actions": {
+      "copyJobId": "Copiar ID do trabalho",
+      "delete": "Excluir",
+      "download": "Baixar",
+      "exportWorkflow": "Exportar fluxo de trabalho",
+      "insertAsNodeInWorkflow": "Inserir como nó no fluxo de trabalho",
+      "inspect": "Inspecionar recurso",
+      "more": "Mais opções",
+      "moreOptions": "Mais opções",
+      "openWorkflow": "Abrir como fluxo de trabalho em nova aba",
+      "seeMoreOutputs": "Ver mais resultados",
+      "zoom": "Ampliar"
+    },
+    "assetDeletedSuccessfully": "Recurso excluído com sucesso",
+    "deleteAssetDescription": "Este recurso será removido permanentemente.",
+    "deleteAssetTitle": "Excluir este recurso?",
+    "deleteSelectedDescription": "{count} recurso(s) será(ão) removido(s) permanentemente.",
+    "deleteSelectedTitle": "Excluir recursos selecionados?",
+    "deletingImportedFilesCloudOnly": "A exclusão de arquivos importados é suportada apenas na versão em nuvem",
+    "failedToCreateNode": "Falha ao criar nó",
+    "failedToDeleteAsset": "Falha ao excluir o recurso",
+    "failedToExportWorkflow": "Falha ao exportar fluxo de trabalho",
+    "jobIdToast": {
+      "copied": "Copiado",
+      "error": "Erro",
+      "jobIdCopied": "ID do trabalho copiado para a área de transferência",
+      "jobIdCopyFailed": "Falha ao copiar o ID do trabalho"
+    },
+    "noJobIdFound": "Nenhum ID de trabalho encontrado para este recurso",
+    "noWorkflowDataFound": "Nenhum dado de fluxo de trabalho encontrado neste recurso",
+    "nodeAddedToWorkflow": "Nó {nodeType} adicionado ao fluxo de trabalho",
+    "nodeTypeNotFound": "Tipo de nó {nodeType} não encontrado",
+    "selection": {
+      "assetsDeletedSuccessfully": "{count} recurso(s) excluído(s) com sucesso",
+      "deleteSelected": "Excluir",
+      "deleteSelectedAll": "Excluir todos",
+      "deselectAll": "Desmarcar todos",
+      "downloadSelected": "Baixar",
+      "downloadSelectedAll": "Baixar todos",
+      "downloadStarted": "Baixando {count} arquivos...",
+      "downloadsStarted": "Iniciada a transferência de {count} arquivo(s)",
+      "exportStarted": "Preparando exportação ZIP para {count} arquivo | Preparando exportação ZIP para {count} arquivos",
+      "exportWorkflowAll": "Exportar todos os fluxos de trabalho",
+      "failedToAddNodes": "Falha ao adicionar nós ao fluxo de trabalho",
+      "failedToDeleteAssets": "Falha ao excluir os recursos selecionados",
+      "insertAllAssetsAsNodes": "Inserir todos os ativos como nós",
+      "multipleSelectedAssets": "Vários ativos selecionados",
+      "noWorkflowsFound": "Nenhum dado de fluxo de trabalho encontrado nos ativos selecionados",
+      "noWorkflowsToExport": "Nenhum dado de fluxo de trabalho encontrado para exportar",
+      "nodesAddedToWorkflow": "{count} nó(s) adicionado(s) ao fluxo de trabalho",
+      "openWorkflowAll": "Abrir todos os fluxos de trabalho",
+      "partialAddNodesSuccess": "{succeeded} adicionado(s) com sucesso, {failed} falharam",
+      "partialDeleteSuccess": "{succeeded} excluído(s) com sucesso, {failed} falha(s)",
+      "partialWorkflowsExported": "{succeeded} exportado(s) com sucesso, {failed} falharam",
+      "partialWorkflowsOpened": "{succeeded} fluxo(s) de trabalho aberto(s), {failed} falharam",
+      "selectedCount": "Recursos selecionados: {count}",
+      "workflowsExported": "{count} fluxo(s) de trabalho exportado(s) com sucesso",
+      "workflowsOpened": "{count} fluxo(s) de trabalho aberto(s) em novas abas"
+    },
+    "unsupportedFileType": "Tipo de arquivo não suportado para o nó de carregamento",
+    "workflowExportedSuccessfully": "Fluxo de trabalho exportado com sucesso",
+    "workflowOpenedInNewTab": "Fluxo de trabalho aberto em nova aba"
+  },
+  "menu": {
+    "autoQueue": "Fila automática",
+    "batchCount": "Quantidade de lotes",
+    "batchCountTooltip": "O número de vezes que a geração do fluxo de trabalho deve ser enfileirada",
+    "clear": "Limpar fluxo de trabalho",
+    "clipspace": "Abrir Clipspace",
+    "customNodesManager": "Gerenciador de nós personalizados",
+    "dark": "Escuro",
+    "disabled": "Desativado",
+    "disabledTooltip": "O fluxo de trabalho não será enfileirado automaticamente",
+    "execute": "Executar",
+    "fullscreen": "Tela cheia",
+    "help": "Ajuda",
+    "helpAndFeedback": "Ajuda e feedback",
+    "hideMenu": "Ocultar menu",
+    "instant": "Instantâneo",
+    "instantTooltip": "O fluxo de trabalho será enfileirado instantaneamente após uma geração terminar",
+    "interrupt": "Cancelar execução atual",
+    "light": "Claro",
+    "manageExtensions": "Gerenciar extensões",
+    "onChange": "Ao alterar",
+    "onChangeTooltip": "O fluxo de trabalho será enfileirado quando uma alteração for feita",
+    "queue": "Painel de fila",
+    "refresh": "Atualizar definições de nós",
+    "resetView": "Redefinir visualização da tela",
+    "run": "Executar",
+    "runWorkflow": "Executar fluxo de trabalho (Shift para enfileirar na frente)",
+    "runWorkflowDisabled": "O fluxo de trabalho contém nós não suportados (destacados em vermelho). Remova-os para executar o fluxo de trabalho.",
+    "runWorkflowFront": "Executar fluxo de trabalho (Enfileirar na frente)",
+    "settings": "Configurações",
+    "showMenu": "Mostrar menu",
+    "stopRunInstant": "Parar execução (Instantâneo)",
+    "stopRunInstantTooltip": "Parar execução",
+    "theme": "Tema",
+    "toggleBottomPanel": "Alternar painel inferior"
+  },
+  "menuLabels": {
+    "About ComfyUI": "Sobre o ComfyUI",
+    "Assets": "Ativos",
+    "Bottom Panel": "Painel inferior",
+    "Browse Templates": "Navegar por modelos",
+    "Bypass/Unbypass Selected Nodes": "Ignorar/Não ignorar nós selecionados",
+    "Canvas Performance": "Desempenho da tela",
+    "Canvas Toggle Lock": "Alternar trava da tela",
+    "Check for Custom Node Updates": "Verificar atualizações de nós personalizados",
+    "Check for Updates": "Verificar atualizações",
+    "Clear Pending Tasks": "Limpar tarefas pendentes",
+    "Clear Workflow": "Limpar fluxo de trabalho",
+    "Clipspace": "Clipspace",
+    "Close Current Workflow": "Fechar fluxo de trabalho atual",
+    "Collapse/Expand Selected Nodes": "Recolher/Expandir nós selecionados",
+    "Comfy-Org Discord": "Comfy-Org Discord",
+    "ComfyUI Docs": "Documentação do ComfyUI",
+    "ComfyUI Forum": "Fórum do ComfyUI",
+    "ComfyUI Issues": "Problemas do ComfyUI",
+    "Contact Support": "Contatar suporte",
+    "Convert Selection to Subgraph": "Converter seleção em subgrafo",
+    "Convert selected nodes to group node": "Converter nós selecionados em nó de grupo",
+    "Copy": "Copiar",
+    "Custom Nodes (Legacy)": "Nós personalizados (Legado)",
+    "Custom Nodes Manager": "Gerenciador de nós personalizados",
+    "Decrease Brush Size in MaskEditor": "Diminuir tamanho do pincel no MaskEditor",
+    "Delete Selected Items": "Excluir itens selecionados",
+    "Desktop User Guide": "Guia do usuário (Desktop)",
+    "Duplicate Current Workflow": "Duplicar fluxo de trabalho atual",
+    "Edit": "Editar",
+    "Edit Subgraph Widgets": "Editar widgets do subgrafo",
+    "Exit Subgraph": "Sair do subgrafo",
+    "Experimental: Browse Model Assets": "Experimental: Navegar por ativos de modelo",
+    "Experimental: Enable AssetAPI": "Experimental: Ativar AssetAPI",
+    "Experimental: Enable Nodes 2_0": "Experimental: Ativar Nodes 2.0",
+    "Export": "Exportar",
+    "Export (API)": "Exportar (API)",
+    "File": "Arquivo",
+    "Fit Group To Contents": "Ajustar grupo ao conteúdo",
+    "Focus Mode": "Modo de foco",
+    "Group Selected Nodes": "Agrupar nós selecionados",
+    "Help": "Ajuda",
+    "Help Center": "Central de ajuda",
+    "Increase Brush Size in MaskEditor": "Aumentar tamanho do pincel no MaskEditor",
+    "Install Missing Custom Nodes": "Instalar nós personalizados ausentes",
+    "Interrupt": "Interromper",
+    "Job History": "Histórico de tarefas",
+    "Load Default Workflow": "Carregar fluxo de trabalho padrão",
+    "Lock Canvas": "Travar tela",
+    "Manage group nodes": "Gerenciar nós de grupo",
+    "Manager": "Gerenciador",
+    "Manager Menu (Legacy)": "Menu do gerenciador (Legado)",
+    "Minimap": "Minimapa",
+    "Mirror Horizontal in MaskEditor": "Espelhar horizontalmente no MaskEditor",
+    "Mirror Vertical in MaskEditor": "Espelhar verticalmente no MaskEditor",
+    "Model Library": "Biblioteca de modelos",
+    "Move Selected Nodes Down": "Mover nós selecionados para baixo",
+    "Move Selected Nodes Left": "Mover nós selecionados para a esquerda",
+    "Move Selected Nodes Right": "Mover nós selecionados para a direita",
+    "Move Selected Nodes Up": "Mover nós selecionados para cima",
+    "Mute/Unmute Selected Nodes": "Silenciar/Ativar som dos nós selecionados",
+    "New": "Novo",
+    "Next Opened Workflow": "Próximo fluxo de trabalho aberto",
+    "Node Library": "Biblioteca de nós",
+    "Node Links": "Ligações de nós",
+    "Open": "Abrir",
+    "Open 3D Viewer (Beta) for Selected Node": "Abrir Visualizador 3D (Beta) para o Nó Selecionado",
+    "Open Color Picker in MaskEditor": "Abrir seletor de cores no MaskEditor",
+    "Open Custom Nodes Folder": "Abrir pasta de nós personalizados",
+    "Open DevTools": "Abrir DevTools",
+    "Open Inputs Folder": "Abrir pasta de entradas",
+    "Open Logs Folder": "Abrir pasta de logs",
+    "Open Mask Editor for Selected Node": "Abrir Mask Editor para o nó selecionado",
+    "Open Models Folder": "Abrir pasta de modelos",
+    "Open Outputs Folder": "Abrir pasta de saídas",
+    "Open Sign In Dialog": "Abrir diálogo de login",
+    "Open extra_model_paths_yaml": "Abrir extra_model_paths.yaml",
+    "Paste": "Colar",
+    "Pin/Unpin Selected Items": "Fixar/Desafixar itens selecionados",
+    "Pin/Unpin Selected Nodes": "Fixar/Desafixar nós selecionados",
+    "Previous Opened Workflow": "Fluxo de trabalho anterior aberto",
+    "Publish": "Publicar",
+    "Queue Prompt": "Adicionar à fila",
+    "Queue Prompt (Front)": "Adicionar à fila (início)",
+    "Queue Selected Output Nodes": "Adicionar nós de saída selecionados à fila",
+    "Quit": "Sair",
+    "Redo": "Refazer",
+    "Refresh Node Definitions": "Atualizar definições de nós",
+    "Reinstall": "Reinstalar",
+    "Rename": "Renomear",
+    "Reset View": "Redefinir visualização",
+    "Resize Selected Nodes": "Redimensionar nós selecionados",
+    "Restart": "Reiniciar",
+    "Rotate Left in MaskEditor": "Girar para a esquerda no MaskEditor",
+    "Rotate Right in MaskEditor": "Girar para a direita no MaskEditor",
+    "Save": "Salvar",
+    "Save As": "Salvar como",
+    "Select All": "Selecionar tudo",
+    "Set Subgraph Description": "Definir Descrição do Subgrafo",
+    "Set Subgraph Search Aliases": "Definir Apelidos de Busca do Subgrafo",
+    "Show Keybindings Dialog": "Mostrar diálogo de atalhos",
+    "Show Model Selector (Dev)": "Mostrar seletor de modelo (Dev)",
+    "Show Settings Dialog": "Mostrar diálogo de configurações",
+    "Sign Out": "Sair",
+    "Toggle App Mode": "Alternar Modo App",
+    "Toggle Essential Bottom Panel": "Alternar painel inferior essencial",
+    "Toggle Logs Bottom Panel": "Alternar Painel Inferior de Logs",
+    "Toggle Queue Panel V2": "Alternar painel de fila V2",
+    "Toggle Search Box": "Alternar caixa de pesquisa",
+    "Toggle Terminal Bottom Panel": "Alternar Painel Inferior do Terminal",
+    "Toggle Theme (Dark/Light)": "Alternar tema (Escuro/Claro)",
+    "Toggle View Controls Bottom Panel": "Alternar painel inferior de controles de visualização",
+    "Toggle promotion of hovered widget": "Alternar promoção do widget destacado",
+    "Undo": "Desfazer",
+    "Ungroup selected group nodes": "Desagrupar nós de grupo selecionados",
+    "Unload Models": "Descarregar modelos",
+    "Unload Models and Execution Cache": "Descarregar modelos e cache de execução",
+    "Unlock Canvas": "Destravar tela",
+    "Unpack the selected Subgraph": "Desempacotar o subgrafo selecionado",
+    "View": "Visualizar",
+    "Workflows": "Fluxos de trabalho",
+    "Zoom In": "Aumentar zoom",
+    "Zoom Out": "Diminuir zoom",
+    "Zoom to fit": "Ajustar zoom",
+    "linearMode_appModeToolbar_apps": "linearMode.appModeToolbar.apps"
+  },
+  "minimap": {
+    "nodeColors": "Cores dos Nós",
+    "renderBypassState": "Exibir Estado de Ignorar",
+    "renderErrorState": "Exibir Estado de Erro",
+    "showGroups": "Mostrar Quadros/Grupos",
+    "showLinks": "Mostrar Conexões"
+  },
+  "missingModelsDialog": {
+    "acceptTerms": "Aceitar termos",
+    "customModelsInstruction": "Você precisará encontrá-los e baixá-los manualmente. Procure por eles online (tente Civitai ou Hugging Face) ou entre em contato com o provedor original do fluxo de trabalho.",
+    "customModelsWarning": "Alguns desses são modelos personalizados que não reconhecemos.",
+    "description": "Este fluxo de trabalho requer modelos que você ainda não baixou.",
+    "doNotAskAgain": "Não mostrar novamente",
+    "downloadAll": "Baixar todos",
+    "downloadAvailable": "Baixar disponíveis",
+    "footerDescription": "Baixe e coloque esses modelos na pasta correta.\nNós com modelos ausentes estão destacados em vermelho no canvas.",
+    "gotIt": "Ok, entendi",
+    "reEnableInSettings": "Reativar em {link}",
+    "reEnableInSettingsLink": "Configurações",
+    "title": "Este fluxo de trabalho está sem modelos",
+    "totalSize": "Tamanho total do download:"
+  },
+  "missingNodes": {
+    "cloud": {
+      "description": "Este fluxo de trabalho utiliza nós personalizados que ainda não são suportados na versão em nuvem.",
+      "gotIt": "Ok, entendi",
+      "learnMore": "Saiba mais",
+      "priorityMessage": "Marcamos automaticamente esses nós para priorizarmos a adição deles.",
+      "replacementInstruction": "Enquanto isso, substitua esses nós (destacados em vermelho no canvas) por outros suportados, se possível, ou tente um fluxo de trabalho diferente.",
+      "title": "Esses nós ainda não estão disponíveis no Comfy Cloud"
+    },
+    "oss": {
+      "description": "Este fluxo de trabalho utiliza nós personalizados que você ainda não instalou.",
+      "replacementInstruction": "Instale esses nós para executar este fluxo de trabalho ou substitua-os por alternativas já instaladas. Nós ausentes estão destacados em vermelho no canvas.",
+      "title": "Este fluxo de trabalho possui nós ausentes"
+    }
+  },
+  "nightly": {
+    "badge": {
+      "label": "Versão de Prévia",
+      "tooltip": "Você está usando uma versão nightly do ComfyUI. Por favor, use o botão de feedback para compartilhar suas opiniões sobre esses recursos."
+    }
+  },
+  "nightlySurvey": {
+    "accept": "Claro, vou ajudar!",
+    "description": "Você tem usado este recurso. Pode dedicar um momento para compartilhar seu feedback?",
+    "dontAskAgain": "Não perguntar novamente",
+    "loadError": "Falha ao carregar a pesquisa. Por favor, tente novamente mais tarde.",
+    "notNow": "Agora não",
+    "title": "Ajude-nos a melhorar"
+  },
+  "nodeCategories": {
+    "": "",
+    "3d": "3d",
+    "3d_models": "modelos_3d",
+    "BFL": "BFL",
+    "Bria": "Bria",
+    "ByteDance": "ByteDance",
+    "ElevenLabs": "ElevenLabs",
+    "Gemini": "Gemini",
+    "Grok": "Grok",
+    "HitPaw": "HitPaw",
+    "Ideogram": "Ideogram",
+    "Kling": "Kling",
+    "LTXV": "LTXV",
+    "Luma": "Luma",
+    "Magnific": "Magnific",
+    "Meshy": "Meshy",
+    "MiniMax": "MiniMax",
+    "Moonvalley Marey": "Moonvalley Marey",
+    "OpenAI": "OpenAI",
+    "PixVerse": "PixVerse",
+    "Recraft": "Recraft",
+    "Rodin": "Rodin",
+    "Runway": "Runway",
+    "Sora": "Sora",
+    "Stability AI": "Stability AI",
+    "Tencent": "Tencent",
+    "Topaz": "Topaz",
+    "Tripo": "Tripo",
+    "Veo": "Veo",
+    "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",
+    "batch": "lote",
+    "camera": "câmera",
+    "chroma_radiance": "radiância_de_croma",
+    "clip": "clip",
+    "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",
+    "dataset": "conjunto_de_dados",
+    "debug": "depuração",
+    "deprecated": "obsoleto",
+    "edit_models": "editar_modelos",
+    "flux": "flux",
+    "gligen": "gligen",
+    "guidance": "orientação",
+    "guiders": "guias",
+    "hooks": "ganchos",
+    "image": "imagem",
+    "inpaint": "restauração",
+    "instructpix2pix": "instructpix2pix",
+    "kandinsky5": "kandinsky5",
+    "latent": "latente",
+    "loaders": "carregadores",
+    "logic": "lógica",
+    "lotus": "lotus",
+    "ltxv": "ltxv",
+    "mask": "máscara",
+    "model": "modelo",
+    "model_merging": "mesclagem_de_modelos",
+    "model_patches": "correções_de_modelo",
+    "model_specific": "específico_do_modelo",
+    "noise": "ruído",
+    "operations": "operações",
+    "photomaker": "photomaker",
+    "postprocessing": "pós-processamento",
+    "preprocessors": "pré-processadores",
+    "primitive": "primitivo",
+    "qwen": "qwen",
+    "samplers": "amostradores",
+    "sampling": "amostragem",
+    "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",
+    "text": "texto",
+    "textgen": "textgen",
+    "training": "treinamento",
+    "transform": "transformar",
+    "unet": "unet",
+    "upscale_diffusion": "difusão_de_aumento",
+    "upscaling": "aumento_de_resolução",
+    "utils": "utilitários",
+    "video": "vídeo",
+    "video_models": "modelos_de_vídeo",
+    "zimage": "zimage"
+  },
+  "nodeErrors": {
+    "content": "Erro de Conteúdo do Nó",
+    "header": "Erro de Cabeçalho do Nó",
+    "render": "Erro de Renderização do Nó",
+    "slots": "Erro de Slots do Nó",
+    "widgets": "Erro de Widgets do Nó"
+  },
+  "nodeFilters": {
+    "hideDeprecated": "Ocultar nós obsoletos",
+    "hideDeprecatedDescription": "Oculta nós marcados como obsoletos, a menos que estejam explicitamente habilitados",
+    "hideDevOnly": "Ocultar nós apenas para desenvolvedores",
+    "hideDevOnlyDescription": "Oculta nós marcados como apenas para desenvolvedores, a menos que o modo de desenvolvedor esteja ativado",
+    "hideExperimental": "Ocultar nós experimentais",
+    "hideExperimentalDescription": "Oculta nós marcados como experimentais, a menos que estejam explicitamente habilitados",
+    "hideSubgraph": "Ocultar nós de subgrafo",
+    "hideSubgraphDescription": "Oculta temporariamente nós de subgrafo da biblioteca de nós e da busca"
+  },
+  "nodeHelpPage": {
+    "documentationPage": "página de documentação",
+    "inputs": "Entradas",
+    "loadError": "Falha ao carregar ajuda: {error}",
+    "moreHelp": "Para mais ajuda, visite a",
+    "outputs": "Saídas",
+    "type": "Tipo"
+  },
+  "nodeReplacement": {
+    "compatibleAlternatives": "Alternativas Compatíveis",
+    "installMissingNodes": "Instalar Nós Ausentes",
+    "installationRequired": "Instalação Necessária",
+    "instructionMessage": "Você deve instalar esses nós ou substituí-los por alternativas já instaladas para executar o fluxo de trabalho. Nós ausentes estão destacados em {red} na tela. Alguns nós não podem ser trocados e devem ser instalados pelo Gerenciador de Nós.",
+    "notReplaceable": "Instalação Necessária",
+    "openNodeManager": "Abrir Gerenciador de Nós",
+    "quickFixAvailable": "Correção Rápida Disponível",
+    "redHighlight": "vermelho",
+    "replaceAll": "Substituir Todos",
+    "replaceAllWarning": "Substitui todos os nós disponíveis neste grupo.",
+    "replaceFailed": "Falha ao substituir nós",
+    "replaceNode": "Substituir Nó",
+    "replaceSelected": "Substituir Selecionados ({count})",
+    "replaceWarning": "Isso modificará permanentemente o fluxo de trabalho. Salve uma cópia antes se não tiver certeza.",
+    "replaceable": "Substituível",
+    "replaced": "Substituído",
+    "replacedAllNodes": "Substituídos {count} tipo(s) de nó",
+    "replacedNode": "Nó substituído: {nodeType}",
+    "selectAll": "Selecionar Tudo",
+    "skipForNow": "Pular por enquanto",
+    "swapNodesGuide": "Os seguintes nós podem ser automaticamente substituídos por alternativas compatíveis.",
+    "swapNodesTitle": "Trocar Nós",
+    "unknownNode": "Desconhecido",
+    "willBeReplacedBy": "Este nó será substituído por:"
+  },
+  "nodeTemplates": {
+    "enterName": "Digite o nome",
+    "saveAsTemplate": "Salvar como modelo"
+  },
+  "notSupported": {
+    "continue": "Continuar",
+    "continueTooltip": "Tenho certeza de que meu dispositivo é suportado",
+    "illustrationAlt": "Ilustração de garota triste",
+    "learnMore": "Saiba Mais",
+    "message": "Apenas os seguintes dispositivos são suportados:",
+    "reportIssue": "Reportar Problema",
+    "supportedDevices": {
+      "macos": "MacOS (M1 ou posterior)",
+      "windows": "Windows (GPU Nvidia com suporte a CUDA)"
+    },
+    "title": "Seu dispositivo não é suportado"
+  },
+  "painter": {
+    "background": "Fundo",
+    "brush": "Pincel",
+    "clear": "Limpar",
+    "color": "Seletor de cor",
+    "eraser": "Borracha",
+    "hardness": "Dureza",
+    "height": "Altura",
+    "size": "Tamanho do cursor",
+    "tool": "Ferramenta",
+    "uploadError": "Falha ao enviar imagem do painter: {status} - {statusText}",
+    "width": "Largura"
+  },
+  "progressToast": {
+    "allDownloadsCompleted": "Todos os downloads concluídos",
+    "downloadingModel": "Baixando modelo...",
+    "downloadsFailed": "{count} downloads falharam | {count} download falhou | {count} downloads falharam",
+    "failed": "Falhou",
+    "filter": {
+      "all": "Todos",
+      "completed": "Concluídos",
+      "failed": "Falharam"
+    },
+    "finished": "Concluído",
+    "importingModels": "Importando modelos",
+    "noImportsInQueue": "Nenhum {filter} na fila",
+    "pending": "Pendente",
+    "progressCount": "{completed} de {total}"
+  },
+  "queue": {
+    "completedIn": "Finalizado em {duration}",
+    "inQueue": "Na fila...",
+    "initializingAlmostReady": "Inicializando - Quase pronto",
+    "jobAddedToQueue": "Tarefa adicionada à fila",
+    "jobDetails": {
+      "computeHoursUsed": "Horas de computação usadas",
+      "errorMessage": "Mensagem de erro",
+      "estimatedFinishIn": "Estimado para finalizar em",
+      "estimatedStartIn": "Estimado para iniciar em",
+      "eta": {
+        "minutes": "~{count} minuto | ~{count} minutos",
+        "minutesRange": "~{lo}-{hi} minutos",
+        "seconds": "~{count} segundo | ~{count} segundos",
+        "secondsRange": "~{lo}-{hi} segundos"
+      },
+      "failedAfter": "Falhou após",
+      "generatedOn": "Gerado em",
+      "header": "Detalhes da tarefa",
+      "jobId": "ID da tarefa",
+      "queuePosition": "Posição na fila",
+      "queuePositionValue": "~{count} tarefa à frente da sua | ~{count} tarefas à frente da sua",
+      "queuedAt": "Enfileirado em",
+      "report": "Reportar",
+      "timeElapsed": "Tempo decorrido",
+      "totalGenerationTime": "Tempo total de geração",
+      "workflow": "Fluxo de trabalho"
+    },
+    "jobHistory": "Histórico de tarefas",
+    "jobList": {
+      "sortComputeHoursUsed": "Horas de computação usadas (maior primeiro)",
+      "sortMostRecent": "Mais recente",
+      "sortTotalGenerationTime": "Tempo total de geração (maior primeiro)",
+      "undated": "Sem data"
+    },
+    "jobMenu": {
+      "addToCurrentWorkflow": "Adicionar ao fluxo de trabalho atual",
+      "cancelJob": "Cancelar tarefa",
+      "copyErrorMessage": "Copiar mensagem de erro",
+      "copyJobId": "Copiar ID da tarefa",
+      "delete": "Excluir",
+      "deleteAsset": "Excluir ativo",
+      "download": "Baixar",
+      "exportWorkflow": "Exportar fluxo de trabalho",
+      "inspectAsset": "Inspecionar ativo",
+      "openAsWorkflowNewTab": "Abrir como fluxo de trabalho em nova aba",
+      "openWorkflowNewTab": "Abrir fluxo de trabalho em nova aba",
+      "removeJob": "Remover tarefa",
+      "reportError": "Reportar erro"
+    },
+    "jobQueueing": "Tarefa em fila",
+    "toggleJobHistory": "Alternar histórico de tarefas"
+  },
+  "releaseToast": {
+    "description": "Confira as últimas melhorias e recursos nesta atualização.",
+    "newVersionAvailable": "Nova atualização disponível!",
+    "skip": "Pular",
+    "update": "Atualizar",
+    "whatsNew": "Veja as novidades"
+  },
+  "rightSidePanel": {
+    "addFavorite": "Favoritar",
+    "advancedInputs": "ENTRADAS AVANÇADAS",
+    "bypass": "Ignorar",
+    "color": "Cor do nó",
+    "enterSubgraph": "Entrar no subgrafo",
+    "errorHelp": "Para mais ajuda, {github} ou {support}",
+    "errorHelpGithub": "enviar um issue no GitHub",
+    "errorHelpSupport": "contatar nosso suporte",
+    "errors": "Erros",
+    "executionErrorOccurred": "Ocorreu um erro durante a execução. Verifique a aba de Erros para mais detalhes.",
+    "fallbackGroupTitle": "Grupo",
+    "fallbackNodeTitle": "Nó",
+    "favorites": "ENTRADAS FAVORITAS",
+    "favoritesNone": "NENHUMA ENTRADA FAVORITA",
+    "favoritesNoneDesc": "Entradas que você favoritar aparecerão aqui",
+    "favoritesNoneHint": "Na aba Parâmetros, clique em {moreIcon} em qualquer entrada para adicioná-la aqui",
+    "favoritesNoneTooltip": "Marque widgets com estrela para acessá-los rapidamente sem selecionar nós",
+    "globalSettings": {
+      "canvas": "CANVAS",
+      "connectionLinks": "CONEXÕES",
+      "gridSpacing": "Espaçamento da grade",
+      "linkShape": "Formato do link",
+      "nodes": "NÓS",
+      "nodes2": "Nós 2.0",
+      "searchPlaceholder": "Buscar configurações rápidas...",
+      "showAdvanced": "Mostrar parâmetros avançados",
+      "showAdvancedTooltip": "Esta é uma configuração importante que, quando ativada, revela todos os parâmetros avançados dos nós",
+      "showConnectedLinks": "Mostrar links conectados",
+      "showInfoBadges": "Mostrar selos de informação",
+      "showToolbox": "Mostrar caixa de ferramentas ao selecionar",
+      "snapNodesToGrid": "Alinhar nós à grade",
+      "title": "Configurações Globais",
+      "viewAllSettings": "Ver todas as configurações"
+    },
+    "groupSettings": "Configurações de Grupo",
+    "groups": "Grupos",
+    "hideAdvancedInputsButton": "Ocultar entradas avançadas",
+    "hideInput": "Ocultar entrada",
+    "info": "Informações",
+    "inputs": "ENTRADAS",
+    "inputsNone": "SEM ENTRADAS",
+    "inputsNoneTooltip": "O nó não possui entradas",
+    "locateNode": "Localizar nó no canvas",
+    "missingNodePacks": {
+      "applyChanges": "Aplicar alterações",
+      "cloudMessage": "Este fluxo de trabalho requer nós personalizados que ainda não estão disponíveis no Comfy Cloud.",
+      "collapse": "Recolher",
+      "expand": "Expandir",
+      "installAll": "Instalar todos",
+      "installNodePack": "Instalar pacote de nós",
+      "installed": "Instalado",
+      "installing": "Instalando...",
+      "ossManagerDisabledHint": "Para instalar nós ausentes, primeiro execute {pipCmd} no seu ambiente Python para instalar o Node Manager e depois reinicie o ComfyUI com a flag {flag}.",
+      "ossMessage": "Este fluxo de trabalho usa nós personalizados que você ainda não instalou.",
+      "searchInManager": "Buscar no Gerenciador de Nós",
+      "title": "Pacotes de nós ausentes",
+      "unknownPack": "Pacote desconhecido",
+      "unsupportedTitle": "Pacotes de nós não suportados",
+      "viewInManager": "Ver no Gerenciador"
+    },
+    "mute": "Silenciar",
+    "noErrors": "Sem erros",
+    "noSelection": "Selecione um nó para ver suas propriedades e informações.",
+    "nodeState": "Estado do nó",
+    "nodes": "Nós",
+    "nodesNoneDesc": "NENHUM NÓ",
+    "noneSearchDesc": "Nenhum item corresponde à sua busca",
+    "normal": "Normal",
+    "parameters": "Parâmetros",
+    "pinned": "Fixado",
+    "promptErrors": {
+      "no_prompt": {
+        "desc": "Os dados do fluxo de trabalho enviados ao servidor estão vazios. Isso pode ser um erro de sistema inesperado."
+      },
+      "prompt_no_outputs": {
+        "desc": "O fluxo de trabalho não contém nenhum nó de saída (por exemplo, Salvar Imagem, Visualizar Imagem) para produzir um resultado."
+      },
+      "server_error_cloud": {
+        "desc": "O servidor encontrou um erro inesperado. Por favor, tente novamente mais tarde."
+      },
+      "server_error_local": {
+        "desc": "O servidor encontrou um erro inesperado. Por favor, verifique os logs do servidor."
+      }
+    },
+    "properties": "Propriedades",
+    "removeFavorite": "Desfavoritar",
+    "resetAllParameters": "Redefinir todos os parâmetros",
+    "resetToDefault": "Restaurar para o padrão",
+    "seeError": "Ver erro",
+    "settings": "Configurações",
+    "showAdvancedInputsButton": "Mostrar entradas avançadas",
+    "showInput": "Mostrar entrada",
+    "title": "Nenhum nó selecionado | 1 nó selecionado | {count} nós selecionados",
+    "togglePanel": "Alternar painel de propriedades",
+    "workflowOverview": "Visão geral do fluxo de trabalho"
+  },
+  "secrets": {
+    "addSecret": "Adicionar Segredo",
+    "createdAt": "Criado em {date}",
+    "deleteConfirmMessage": "Tem certeza de que deseja excluir \"{name}\"? Esta ação não pode ser desfeita.",
+    "deleteConfirmTitle": "Excluir Segredo",
+    "description": "Os segredos são criptografados e usados para dados sensíveis como chaves de API.",
+    "descriptionUsage": "Armazene seus tokens aqui para permitir o download de modelos privados e restritos de provedores compatíveis.",
+    "editSecret": "Editar Segredo",
+    "errors": {
+      "duplicateName": "Já existe um segredo com este nome",
+      "duplicateProvider": "Já existe um segredo para este provedor",
+      "nameRequired": "O nome é obrigatório",
+      "nameTooLong": "O nome deve ter no máximo 255 caracteres",
+      "providerRequired": "O provedor é obrigatório",
+      "secretValueRequired": "O valor do segredo é obrigatório"
+    },
+    "lastUsed": "Último uso em {date}",
+    "modelProviders": "Provedores de Modelos",
+    "name": "Nome",
+    "namePlaceholder": "ex.: Minha Chave de API",
+    "noSecrets": "Nenhum segredo armazenado. Adicione sua primeira chave de API para começar.",
+    "provider": "Provedor",
+    "providerHint": "Opcional. Selecionar um provedor permite o uso automático do token.",
+    "secretValue": "Valor do Segredo",
+    "secretValueHint": "Este valor será criptografado e não poderá ser visualizado novamente.",
+    "secretValueHintEdit": "Deixe em branco para manter o valor atual.",
+    "secretValuePlaceholder": "Digite sua chave de API",
+    "secretValuePlaceholderEdit": "Digite um novo valor para alterar",
+    "title": "Chaves de API & Segredos"
+  },
+  "selectionToolbox": {
+    "Bypass Group Nodes": "Ignorar Nós de Grupo",
+    "Set Group Nodes to Always": "Definir Nós de Grupo para Sempre",
+    "Set Group Nodes to Never": "Definir Nós de Grupo para Nunca",
+    "executeButton": {
+      "disabledTooltip": "Nenhum nó de saída selecionado",
+      "tooltip": "Executar para os nós de saída selecionados (destacados com borda laranja)"
+    }
+  },
+  "serverConfig": {
+    "modifiedConfigs": "Você modificou as seguintes configurações do servidor. Reinicie para aplicar as alterações.",
+    "restart": "Reiniciar",
+    "restartRequiredToastDetail": "Reinicie o aplicativo para aplicar as alterações de configuração do servidor.",
+    "restartRequiredToastSummary": "Reinicialização necessária",
+    "revertChanges": "Reverter alterações"
+  },
+  "serverConfigCategories": {
+    "Attention": "Attention",
+    "CUDA": "CUDA",
+    "Cache": "Cache",
+    "Directories": "Diretórios",
+    "General": "Geral",
+    "Inference": "Inferência",
+    "Memory": "Memória",
+    "Network": "Rede",
+    "Preview": "Pré-visualização"
+  },
+  "serverConfigItems": {
+    "cache-classic": {
+      "name": "Usar sistema de cache clássico"
+    },
+    "cache-lru": {
+      "name": "Usar cache LRU com um máximo de N resultados de nós em cache.",
+      "tooltip": "Pode usar mais RAM/VRAM."
+    },
+    "cpu-vae": {
+      "name": "Executar VAE na CPU"
+    },
+    "cross-attention-method": {
+      "name": "Método de cross attention"
+    },
+    "cuda-device": {
+      "name": "Índice do dispositivo CUDA a ser usado"
+    },
+    "cuda-malloc": {
+      "name": "Usar CUDA malloc para alocação de memória"
+    },
+    "default-hashing-function": {
+      "name": "Função de hash padrão para arquivos de modelo"
+    },
+    "deterministic": {
+      "name": "Fazer o pytorch usar algoritmos determinísticos mais lentos quando possível.",
+      "tooltip": "Observe que isso pode não tornar as imagens determinísticas em todos os casos."
+    },
+    "directml": {
+      "name": "Índice do dispositivo DirectML"
+    },
+    "disable-all-custom-nodes": {
+      "name": "Desativar carregamento de todos os nós personalizados."
+    },
+    "disable-ipex-optimize": {
+      "name": "Desativar otimização IPEX"
+    },
+    "disable-metadata": {
+      "name": "Desativar salvamento de metadados do prompt nos arquivos."
+    },
+    "disable-smart-memory": {
+      "name": "Desativar gerenciamento inteligente de memória",
+      "tooltip": "Força o ComfyUI a descarregar agressivamente para a RAM comum em vez de manter modelos na VRAM quando possível."
+    },
+    "disable-xformers": {
+      "name": "Desativar otimização xFormers"
+    },
+    "dont-print-server": {
+      "name": "Não imprimir saída do servidor no console."
+    },
+    "dont-upcast-attention": {
+      "name": "Prevenir upcast de attention"
+    },
+    "enable-cors-header": {
+      "name": "Ativar cabeçalho CORS: Use \"*\" para todas as origens ou especifique o domínio"
+    },
+    "enable-manager-legacy-ui": {
+      "name": "Usar interface Manager legada",
+      "tooltip": "Usa a interface ComfyUI-Manager legada em vez da nova interface."
+    },
+    "fast": {
+      "name": "Ativar algumas otimizações não testadas e que podem deteriorar a qualidade."
+    },
+    "force-channels-last": {
+      "name": "Forçar formato de memória channels-last"
+    },
+    "force-upcast-attention": {
+      "name": "Forçar upcast de attention"
+    },
+    "global-precision": {
+      "name": "Precisão global de ponto flutuante",
+      "tooltip": "Precisão global de ponto flutuante"
+    },
+    "input-directory": {
+      "name": "Diretório de entrada"
+    },
+    "listen": {
+      "name": "Host: O endereço IP para escutar"
+    },
+    "log-level": {
+      "name": "Nível de verbosidade do log"
+    },
+    "max-upload-size": {
+      "name": "Tamanho máximo de upload (MB)"
+    },
+    "output-directory": {
+      "name": "Diretório de saída"
+    },
+    "port": {
+      "name": "Porta: A porta para escutar"
+    },
+    "preview-method": {
+      "name": "Método usado para pré-visualizações latentes"
+    },
+    "preview-size": {
+      "name": "Tamanho das imagens de pré-visualização"
+    },
+    "reserve-vram": {
+      "name": "VRAM reservada (GB)",
+      "tooltip": "Defina a quantidade de VRAM em GB que você deseja reservar para uso do seu sistema operacional/outros softwares. Por padrão, uma quantidade é reservada dependendo do seu sistema operacional."
+    },
+    "text-encoder-precision": {
+      "name": "Precisão do codificador de texto",
+      "tooltip": "Precisão do codificador de texto"
+    },
+    "tls-certfile": {
+      "name": "Arquivo de Certificado TLS: Caminho para o arquivo de certificado TLS para HTTPS"
+    },
+    "tls-keyfile": {
+      "name": "Arquivo de Chave TLS: Caminho para o arquivo de chave TLS para HTTPS"
+    },
+    "unet-precision": {
+      "name": "Precisão do UNET",
+      "tooltip": "Precisão do UNET"
+    },
+    "vae-precision": {
+      "name": "Precisão do VAE",
+      "tooltip": "Precisão do VAE"
+    },
+    "vram-management": {
+      "name": "Modo de gerenciamento de VRAM"
+    }
+  },
+  "serverStart": {
+    "copyAllTooltip": "Copiar tudo",
+    "copySelectionTooltip": "Copiar seleção",
+    "errorMessage": "Não foi possível iniciar o ComfyUI Desktop",
+    "installation": {
+      "title": "Instalando ComfyUI"
+    },
+    "openLogs": "Abrir logs",
+    "process": {
+      "error": "Não foi possível iniciar o ComfyUI Desktop",
+      "initial-state": "Carregando...",
+      "python-setup": "Configurando ambiente Python...",
+      "ready": "Carregando interface humana",
+      "starting-server": "Iniciando servidor ComfyUI..."
+    },
+    "reportIssue": "Reportar problema",
+    "showTerminal": "Mostrar terminal",
+    "title": "Iniciando ComfyUI",
+    "troubleshoot": "Solucionar problemas"
+  },
+  "settingsCategories": {
+    "3D": "3D",
+    "3DViewer": "Visualizador 3D",
+    "API Nodes": "Nós de API",
+    "About": "Sobre",
+    "Appearance": "Aparência",
+    "BrushAdjustment": "Ajuste do Pincel",
+    "Camera": "Câmera",
+    "Canvas": "Canvas",
+    "Canvas Navigation": "Navegação no Canvas",
+    "ColorPalette": "Paleta de Cores",
+    "Comfy": "Comfy",
+    "Comfy-Desktop": "Comfy-Desktop",
+    "ContextMenu": "Menu de Contexto",
+    "Credits": "Créditos",
+    "CustomColorPalettes": "Paletas de Cores Personalizadas",
+    "DevMode": "Modo Desenvolvedor",
+    "EditTokenWeight": "Editar Peso do Token",
+    "Error System": "Sistema de Erros",
+    "Execution": "Execução",
+    "Extension": "Extensão",
+    "General": "Geral",
+    "Graph": "Grafo",
+    "Group": "Grupo",
+    "Keybinding": "Atalho de Teclado",
+    "Light": "Luz",
+    "Link": "Link",
+    "LinkRelease": "Soltar Link",
+    "LiteGraph": "Lite Graph",
+    "Load 3D": "Carregar 3D & Animação",
+    "Locale": "Idioma",
+    "Mask Editor": "Editor de Máscara",
+    "Menu": "Menu",
+    "ModelLibrary": "Biblioteca de Modelos",
+    "Node": "Nó",
+    "Node Library": "Biblioteca de nós",
+    "Node Search Box": "Caixa de Pesquisa de Nós",
+    "Node Widget": "Widget de Nó",
+    "NodeLibrary": "Biblioteca de Nós",
+    "Nodes 2_0": "Nodes 2.0",
+    "Notification Preferences": "Preferências de Notificação",
+    "Other": "Outros",
+    "PLY": "PLY",
+    "PlanCredits": "Plano & Créditos",
+    "Pointer": "Ponteiro",
+    "Queue": "Fila",
+    "QueueButton": "Botão de Fila",
+    "Reroute": "Redirecionar",
+    "RerouteBeta": "Redirecionar Beta",
+    "Scene": "Cena",
+    "Secrets": "Segredos",
+    "Server": "Servidor",
+    "Server-Config": "Configuração do Servidor",
+    "Settings": "Configurações",
+    "Sidebar": "Barra Lateral",
+    "Tree Explorer": "Explorador de Árvore",
+    "UV": "UV",
+    "User": "Usuário",
+    "Validation": "Validação",
+    "Vue Nodes": "Nodes 2.0",
+    "VueNodes": "Nodes 2.0",
+    "Window": "Janela",
+    "Workflow": "Fluxo de Trabalho",
+    "Workspace": "Espaço de trabalho"
+  },
+  "shape": {
+    "CARD": "Cartão",
+    "arrow": "Seta",
+    "box": "Caixa",
+    "circle": "Círculo",
+    "default": "Padrão",
+    "round": "Arredondado"
+  },
+  "shortcuts": {
+    "essentials": "Essencial",
+    "keyboardShortcuts": "Atalhos de Teclado",
+    "manageShortcuts": "Gerenciar Atalhos",
+    "noKeybinding": "Sem atalho",
+    "shortcuts": "Atalhos",
+    "subcategories": {
+      "node": "Nó",
+      "panelControls": "Controles do Painel",
+      "queue": "Fila",
+      "view": "Visualização",
+      "workflow": "Fluxo de Trabalho"
+    },
+    "viewControls": "Controles de Visualização"
+  },
+  "sideToolbar": {
+    "activeJobStatus": "Tarefa ativa: {status}",
+    "assets": "Ativos",
+    "backToAssets": "Voltar para todos os ativos",
+    "browseTemplates": "Explorar modelos de exemplo",
+    "downloads": "Downloads",
+    "folderView": {
+      "errorDetail": "Não foi possível recuperar as saídas para este trabalho. Por favor, tente novamente.",
+      "errorSummary": "Falha ao carregar saídas"
+    },
+    "generatedAssetsHeader": "Ativos gerados",
+    "helpCenter": "Central de Ajuda",
+    "importedAssetsHeader": "Ativos importados",
+    "labels": {
+      "assets": "Ativos",
+      "console": "Console",
+      "generated": "Gerado",
+      "imported": "Importado",
+      "menu": "Menu",
+      "models": "Modelos",
+      "nodes": "Nós",
+      "queue": "Fila",
+      "templates": "Modelos",
+      "workflows": "Workflows"
+    },
+    "logout": "Sair",
+    "mediaAssets": {
+      "filter3D": "3D",
+      "filterAudio": "Áudio",
+      "filterImage": "Imagem",
+      "filterText": "Texto",
+      "filterVideo": "Vídeo",
+      "sortFastestFirst": "Tempo de geração (menor primeiro)",
+      "sortLongestFirst": "Tempo de geração (maior primeiro)",
+      "sortNewestFirst": "Mais recentes primeiro",
+      "sortOldestFirst": "Mais antigos primeiro",
+      "title": "Ativos de Mídia",
+      "viewSettings": "Ver configurações"
+    },
+    "modelLibrary": "Biblioteca de modelos",
+    "newBlankWorkflow": "Criar um novo workflow em branco",
+    "noFilesFound": "Nenhum arquivo encontrado",
+    "noFilesFoundMessage": "Envie arquivos ou gere conteúdo para vê-los aqui",
+    "noGeneratedFiles": "Nenhum arquivo gerado encontrado",
+    "noImportedFiles": "Nenhum arquivo importado encontrado",
+    "nodeLibrary": "Biblioteca de nós",
+    "nodeLibraryTab": {
+      "allNodes": "Todos os nós",
+      "blueprints": "Blueprints",
+      "custom": "Personalizado",
+      "essentials": "Essenciais",
+      "filter": "Filtrar",
+      "filterOptions": {
+        "blueprints": "Blueprints",
+        "comfyNodes": "Nós Comfy",
+        "extensions": "Extensões",
+        "partnerNodes": "Nós de Parceiros"
+      },
+      "groupBy": "Agrupar por",
+      "groupStrategies": {
+        "category": "Categoria",
+        "categoryDesc": "Agrupar por categoria do nó",
+        "module": "Módulo",
+        "moduleDesc": "Agrupar por origem do módulo",
+        "source": "Fonte",
+        "sourceDesc": "Agrupar por tipo de fonte (Core, Custom, API)"
+      },
+      "noBookmarkedNodes": "Nenhum favorito ainda",
+      "resetView": "Restaurar visualização padrão",
+      "sections": {
+        "bookmarked": "Favoritos",
+        "comfyBlueprints": "Blueprints Comfy",
+        "comfyNodes": "Nós Comfy",
+        "extensions": "Extensões",
+        "favoriteNode": "Favoritar nó",
+        "favorites": "Favoritos",
+        "myBlueprints": "Meus Blueprints",
+        "partnerNodes": "Nós de Parceiros",
+        "subgraphBlueprints": "Blueprints de Subgrafo",
+        "unfavoriteNode": "Desfavoritar nó"
+      },
+      "sortBy": {
+        "alphabetical": "Alfabética",
+        "alphabeticalDesc": "Ordenar alfabeticamente dentro dos grupos",
+        "original": "Original",
+        "originalDesc": "Manter ordem original"
+      },
+      "sortMode": "Modo de ordenação"
+    },
+    "nodes": "Nós",
+    "openWorkflow": "Abrir workflow no sistema de arquivos local",
+    "queue": "Fila",
+    "queueProgressOverlay": {
+      "activeJobs": "{count} trabalho ativo | {count} trabalhos ativos",
+      "activeJobsShort": "{count} ativo(s) | {count} ativo(s)",
+      "activeJobsSuffix": "trabalhos ativos",
+      "cancelJobTooltip": "Cancelar trabalho",
+      "clearAllJobsTooltip": "Cancelar todos os trabalhos em execução",
+      "clearHistory": "Limpar histórico da fila de trabalhos",
+      "clearHistoryDialogAssetsNote": "Os ativos gerados por esses trabalhos não serão excluídos e sempre poderão ser visualizados no painel de ativos.",
+      "clearHistoryDialogDescription": "Todos os trabalhos finalizados ou com falha abaixo serão removidos deste painel de fila de trabalhos.",
+      "clearHistoryDialogTitle": "Limpar o histórico da fila de trabalhos?",
+      "clearHistoryMenuAssetsNote": "Os ativos de mídia não serão excluídos.",
+      "clearQueueTooltip": "Limpar fila",
+      "clearQueued": "Limpar fila",
+      "colonPercent": ": {percent}",
+      "currentNode": "Nó atual:",
+      "dockedJobHistory": "Histórico de trabalhos acoplado",
+      "expandCollapsedQueue": "Expandir fila de trabalhos",
+      "filterAllWorkflows": "Todos os workflows",
+      "filterBy": "Filtrar por",
+      "filterCurrentWorkflow": "Workflow atual",
+      "filterJobs": "Filtrar trabalhos",
+      "inlineTotalLabel": "Total",
+      "interruptAll": "Interromper todos os trabalhos em execução",
+      "jobCompleted": "Tarefa concluída",
+      "jobFailed": "Tarefa falhou",
+      "jobQueue": "Fila de trabalhos",
+      "jobsAddedToQueue": "{count} tarefa adicionada à fila | {count} tarefas adicionadas à fila",
+      "jobsCompleted": "{count} trabalho concluído | {count} trabalhos concluídos",
+      "jobsFailed": "{count} trabalho falhou | {count} trabalhos falharam",
+      "moreOptions": "Mais opções",
+      "noActiveJobs": "Nenhum trabalho ativo",
+      "preview": "Pré-visualização",
+      "queuedJobsLabel": "{count} na fila",
+      "queuedSuffix": "na fila",
+      "running": "executando",
+      "runningJobsLabel": "{count} em execução",
+      "runningQueuedSummary": "{running} em execução, {queued} na fila",
+      "searchJobs": "Pesquisar...",
+      "showAssets": "Mostrar ativos",
+      "showAssetsPanel": "Mostrar painel de ativos",
+      "showRunProgressBar": "Mostrar barra de progresso da execução",
+      "sortBy": "Ordenar por",
+      "sortJobs": "Ordenar trabalhos",
+      "stubClipTextEncode": "CLIP Text Encode:",
+      "title": "Progresso da Fila",
+      "total": "Total: {percent}",
+      "viewAllJobs": "Ver todos os trabalhos",
+      "viewGrid": "Visualização em grade",
+      "viewJobHistory": "Ver histórico de trabalhos",
+      "viewList": "Visualização em lista"
+    },
+    "searchAssets": "Buscar ativos",
+    "sidebar": "Barra lateral",
+    "templates": "Modelos",
+    "themeToggle": "Alternar tema",
+    "workflowTab": {
+      "confirmDelete": "Tem certeza de que deseja excluir este workflow?",
+      "confirmDeleteTitle": "Excluir workflow?",
+      "confirmOverwrite": "O arquivo abaixo já existe. Deseja sobrescrevê-lo?",
+      "confirmOverwriteTitle": "Sobrescrever arquivo existente?",
+      "deleteFailed": "Falha ao tentar excluir o workflow.",
+      "deleteFailedTitle": "Falha ao excluir",
+      "deleted": "Workflow excluído",
+      "dirtyClose": "Os arquivos abaixo foram alterados. Deseja salvá-los antes de fechar?",
+      "dirtyCloseHint": "Segure Shift para fechar sem perguntar",
+      "dirtyCloseTitle": "Salvar alterações?",
+      "workflowTreeType": {
+        "bookmarks": "Favoritos",
+        "browse": "Explorar",
+        "open": "Abrir"
+      }
+    },
+    "workflows": "Workflows"
+  },
+  "subgraphStore": {
+    "blueprintName": "Nome do subgrafo",
+    "blueprintNamePrompt": "Nome do subgrafo:",
+    "cannotDeleteGlobal": "Não é possível excluir blueprints instalados",
+    "confirmDelete": "Esta ação removerá permanentemente o blueprint da sua biblioteca",
+    "confirmDeleteTitle": "Excluir blueprint?",
+    "disconnected": "Desconectado",
+    "enterDescription": "Insira uma descrição",
+    "enterSearchAliases": "Insira apelidos de busca (separados por vírgula)",
+    "hidden": "Parâmetros ocultos/aninhados",
+    "hideAll": "Ocultar tudo",
+    "linked": "(Vinculado)",
+    "loadFailure": "Falha ao carregar blueprints de subgrafo",
+    "overwriteBlueprint": "Salvar irá sobrescrever o blueprint atual com suas alterações",
+    "overwriteBlueprintTitle": "Sobrescrever blueprint existente?",
+    "promoteOutsideSubgraph": "Não é possível promover o widget fora do subgrafo",
+    "promoteWidget": "Promover Widget: {name}",
+    "publish": "Publicar Subgrafo",
+    "publishSuccess": "Salvo na Biblioteca de Nós",
+    "publishSuccessMessage": "Você pode encontrar seu blueprint de subgrafo na biblioteca de nós em \"Blueprints de Subgrafo\"",
+    "saveBlueprint": "Salvar Subgrafo na Biblioteca",
+    "searchAliases": "Buscar Apelidos",
+    "showAll": "Mostrar tudo",
+    "showRecommended": "Mostrar widgets recomendados",
+    "shown": "Exibido no nó",
+    "unpromoteWidget": "Despromover Widget: {name}"
+  },
+  "subscription": {
+    "addApiCredits": "Adicionar créditos de API",
+    "addCredits": "Adicionar créditos",
+    "addCreditsLabel": "Adicione mais créditos quando quiser",
+    "benefits": {
+      "benefit1": "$10 em créditos mensais para Partner Nodes — recarregue quando necessário",
+      "benefit1FreeTier": "Mais créditos mensais, recarregue a qualquer momento",
+      "benefit2": "Até 30 min de execução por tarefa",
+      "benefit3": "Use seus próprios modelos (Creator & Pro)"
+    },
+    "beta": "BETA",
+    "billedMonthly": "Cobrado mensalmente",
+    "billedYearly": "{total} Cobrado anualmente",
+    "billingComingSoon": {
+      "message": "A cobrança para equipes estará disponível em breve. Você poderá assinar um plano para seu workspace com preço por usuário. Fique atento para novidades.",
+      "title": "Em breve"
+    },
+    "cancelDialog": {
+      "confirmCancel": "Cancelar assinatura",
+      "description": "Seu acesso continua até {date}. Você não será mais cobrado, e seu workspace e créditos serão preservados. Você pode reassinar a qualquer momento.",
+      "endOfBillingPeriod": "fim do período de cobrança",
+      "failed": "Falha ao cancelar a assinatura",
+      "keepSubscription": "Manter assinatura",
+      "title": "Cancelar assinatura"
+    },
+    "cancelSubscription": "Cancelar assinatura",
+    "cancelSuccess": "Assinatura cancelada com sucesso",
+    "canceled": "Cancelado",
+    "canceledCard": {
+      "description": "Você não será mais cobrado. Seus recursos permanecem ativos até {date}.",
+      "title": "Sua assinatura foi cancelada"
+    },
+    "changeTo": "Mudar para {plan}",
+    "chooseBestPlanWorkspace": "Escolha o melhor plano para seu workspace",
+    "comfyCloud": "Comfy Cloud",
+    "comfyCloudLogo": "Logo do Comfy Cloud",
+    "contactOwnerToSubscribe": "Entre em contato com o proprietário do espaço de trabalho para assinar",
+    "contactUs": "Fale conosco",
+    "creditsRemainingThisMonth": "Créditos restantes neste mês",
+    "creditsRemainingThisYear": "Créditos restantes neste ano",
+    "creditsYouveAdded": "Créditos que você adicionou",
+    "currentPlan": "Plano Atual",
+    "customLoRAsLabel": "Importe seus próprios LoRAs",
+    "description": "Escolha o melhor plano para você",
+    "descriptionWorkspace": "Escolha o melhor plano para seu workspace",
+    "expiresDate": "Expira em {date}",
+    "freeTier": {
+      "description": "Seu plano gratuito inclui {credits} créditos por mês para testar o Comfy Cloud.",
+      "descriptionGeneric": "Seu plano gratuito inclui uma cota mensal de créditos para testar o Comfy Cloud.",
+      "nextRefresh": "Seus créditos serão renovados em {date}.",
+      "outOfCredits": {
+        "subtitle": "Assine para liberar recargas e mais benefícios",
+        "title": "Você ficou sem créditos gratuitos"
+      },
+      "subscribeCta": "Assine para mais",
+      "title": "Você está no plano Gratuito",
+      "topUpBlocked": {
+        "title": "Desbloqueie recargas e mais benefícios"
+      },
+      "upgradeCta": "Ver planos"
+    },
+    "gpuLabel": "RTX 6000 Pro (96GB VRAM)",
+    "haveQuestions": "Tem dúvidas ou interesse em soluções empresariais?",
+    "invoiceHistory": "Histórico de faturas",
+    "learnMore": "Saiba mais",
+    "managePayment": "Gerenciar pagamento",
+    "managePlan": "Gerenciar plano",
+    "manageSubscription": "Gerenciar assinatura",
+    "maxDuration": {
+      "creator": "30 min",
+      "founder": "30 min",
+      "free": "30 min",
+      "pro": "1 h",
+      "standard": "30 min"
+    },
+    "maxDurationLabel": "Duração máxima de cada execução de workflow",
+    "maxMembersLabel": "Máx. de membros",
+    "member": "membro",
+    "memberCount": "{count} membro | {count} membros",
+    "membersLabel": "Até {count} membros",
+    "messageSupport": "Falar com o suporte",
+    "monthly": "Mensal",
+    "monthlyBonusDescription": "Bônus mensal de créditos",
+    "monthlyCreditsInfo": "Esses créditos são renovados mensalmente e não acumulam",
+    "monthlyCreditsLabel": "Créditos mensais",
+    "monthlyCreditsPerMemberLabel": "Créditos mensais / membro",
+    "monthlyCreditsRollover": "Esses créditos serão transferidos para o próximo mês",
+    "mostPopular": "Mais popular",
+    "nextBillingCycle": "próximo ciclo de cobrança",
+    "nextMonthInvoice": "Fatura do próximo mês",
+    "partnerNodesBalance": "Saldo de Créditos \"Partner Nodes\"",
+    "partnerNodesCredits": "Preços dos Partner Nodes",
+    "partnerNodesDescription": "Para executar modelos comerciais/proprietários",
+    "perMonth": "/ mês",
+    "plansAndPricing": "Planos e preços",
+    "prepaidCreditsInfo": "Créditos pré-pagos expiram após 1 ano da data de compra.",
+    "prepaidDescription": "Créditos pré-pagos",
+    "preview": {
+      "addCreditCard": "Adicionar cartão de crédito",
+      "backToAllPlans": "Voltar para todos os planos",
+      "confirm": "Confirmar",
+      "confirmPayment": "Confirme seu pagamento",
+      "confirmPlanChange": "Confirme a alteração do plano",
+      "eachMonthCreditsRefill": "A cada mês os créditos são recarregados para",
+      "ends": "Termina em {date}",
+      "hideFeatures": "Ocultar recursos",
+      "nextPaymentDue": "Próximo pagamento em {date}. Cancele a qualquer momento.",
+      "perMember": "/ membro",
+      "privacyPolicy": "Política de Privacidade",
+      "proratedCharge": "Cobrança proporcional para {plan}",
+      "proratedRefund": "Reembolso proporcional para {plan}",
+      "showMoreFeatures": "Mostrar mais recursos",
+      "starting": "Começando em {date}",
+      "startingToday": "Começando hoje",
+      "terms": "Termos",
+      "termsAgreement": "Ao continuar, você concorda com os {terms} e {privacy} da Comfy Org.",
+      "totalDueToday": "Total devido hoje"
+    },
+    "renewsDate": "Renova em {date}",
+    "required": {
+      "pollingFailed": "Falha ao ativar a assinatura",
+      "pollingSuccess": "Assinatura ativada com sucesso!",
+      "pollingTimeout": "Tempo esgotado aguardando a assinatura. Atualize e tente novamente.",
+      "subscribe": "Assinar",
+      "title": "Assinar",
+      "waitingForSubscription": "Conclua sua assinatura na nova aba. Detectaremos automaticamente quando você terminar!"
+    },
+    "resubscribe": "Reassinar",
+    "resubscribeSuccess": "Assinatura reativada com sucesso",
+    "resubscribeTo": "Reassinar {plan}",
+    "subscribeForMore": "Fazer upgrade",
+    "subscribeNow": "Assine Agora",
+    "subscribeTo": "Assinar {plan}",
+    "subscribeToComfyCloud": "Assine o Comfy Cloud",
+    "subscribeToRun": "Assinar",
+    "subscribeToRunFull": "Assine para Executar",
+    "subscriptionRequiredMessage": "Uma assinatura é necessária para que os membros executem fluxos de trabalho na Nuvem",
+    "tierNameYearly": "{name} Anual",
+    "tiers": {
+      "creator": {
+        "name": "Criador"
+      },
+      "founder": {
+        "name": "Edição do Fundador"
+      },
+      "free": {
+        "name": "Gratuito"
+      },
+      "pro": {
+        "name": "Pro"
+      },
+      "standard": {
+        "name": "Padrão"
+      }
+    },
+    "title": "Assinatura",
+    "titleUnsubscribed": "Assine o Comfy Cloud",
+    "totalCredits": "Total de créditos",
+    "upgrade": "ATUALIZAR",
+    "upgradePlan": "Atualizar Plano",
+    "upgradeTo": "Atualizar para {plan}",
+    "upgradeToAddCredits": "Faça upgrade para adicionar créditos",
+    "usdPerMonth": "USD / mês",
+    "usdPerMonthPerMember": "USD / mês / membro",
+    "videoEstimateExplanation": "Essas estimativas são baseadas no template Wan 2.2 Image-to-Video usando as configurações padrão (5 segundos, 640x640, 16fps, amostragem de 4 etapas).",
+    "videoEstimateHelp": "Mais detalhes sobre este template",
+    "videoEstimateLabel": "Quantidade aprox. de vídeos de 5s gerados com o template Wan 2.2 Image-to-Video",
+    "videoEstimateTryTemplate": "Experimente este template",
+    "videoTemplateBasedCredits": "Vídeos gerados com Wan 2.2 Image to Video",
+    "viewEnterprise": "Ver soluções empresariais",
+    "viewMoreDetails": "Ver mais detalhes",
+    "viewMoreDetailsPlans": "Veja mais detalhes sobre planos e preços",
+    "viewUsageHistory": "Ver histórico de uso",
+    "workspaceNotSubscribed": "Este espaço de trabalho não possui uma assinatura",
+    "yearly": "Anual",
+    "yearlyCreditsLabel": "Total de créditos anuais",
+    "yearlyDiscount": "20% DE DESCONTO",
+    "yourPlanIncludes": "Seu plano inclui:"
+  },
+  "tabMenu": {
+    "addToBookmarks": "Adicionar aos favoritos",
+    "closeOtherTabs": "Fechar outras abas",
+    "closeTab": "Fechar aba",
+    "closeTabsToLeft": "Fechar abas à esquerda",
+    "closeTabsToRight": "Fechar abas à direita",
+    "duplicateTab": "Duplicar aba",
+    "removeFromBookmarks": "Remover dos favoritos"
+  },
+  "templateWidgets": {
+    "sort": {
+      "searchPlaceholder": "Buscar..."
+    }
+  },
+  "templateWorkflows": {
+    "activeFilters": "Filtros:",
+    "allTemplates": "Todos os Modelos",
+    "categories": "Categorias",
+    "category": {
+      "3D": "3D",
+      "All": "Todos os Modelos",
+      "Area Composition": "Composição de Área",
+      "Audio": "Áudio",
+      "Basics": "Básico",
+      "ComfyUI Examples": "Exemplos ComfyUI",
+      "ControlNet": "ControlNet",
+      "Custom Nodes": "Nós Personalizados",
+      "Extensions": "Extensões",
+      "Flux": "Flux",
+      "Generation Type": "Tipo de Geração",
+      "GettingStarted": "Primeiros Passos",
+      "Image": "Imagem",
+      "Image API": "API de Imagem",
+      "LLM API": "API de LLM",
+      "LLMs": "LLMs",
+      "Partner Nodes": "Nós Parceiros",
+      "Upscaling": "Aprimoramento",
+      "Video": "Vídeo",
+      "Video API": "API de Vídeo"
+    },
+    "error": {
+      "templateNotFound": "Modelo \"{templateName}\" não encontrado"
+    },
+    "licenseFilter": "Licença",
+    "loading": "Carregando modelos...",
+    "loadingMore": "Carregando mais modelos...",
+    "modelFilter": "Filtro de Modelo",
+    "modelsSelected": "{count} Modelos",
+    "noResults": "Nenhum modelo encontrado",
+    "noResultsHint": "Tente ajustar sua busca ou filtros",
+    "resetFilters": "Limpar Filtros",
+    "resultsCount": "Mostrando {count} de {total} modelos",
+    "runsOnFilter": "Executa em",
+    "runsOnSelected": "{count} Execuções em",
+    "searchPlaceholder": "Buscar modelos...",
+    "sort": {
+      "alphabetical": "A → Z",
+      "default": "Padrão",
+      "modelSizeLowToHigh": "Tamanho do Modelo (Menor para Maior)",
+      "newest": "Mais Recentes",
+      "popular": "Popular",
+      "recommended": "Recomendado",
+      "searchPlaceholder": "Buscar...",
+      "vramLowToHigh": "Uso de VRAM (Menor para Maior)"
+    },
+    "sorting": "Ordenar por",
+    "title": "Comece com um Modelo",
+    "useCaseFilter": "Tarefas",
+    "useCasesSelected": "{count} Casos de Uso"
+  },
+  "templates": {
+    "logoProviderSeparator": " & "
+  },
+  "toastMessages": {
+    "cannotCreateSubgraph": "Não é possível criar subgrafo",
+    "couldNotDetermineFileType": "Não foi possível determinar o tipo de arquivo",
+    "dropFileError": "Não foi possível processar o item arrastado: {error}",
+    "emptyCanvas": "Tela vazia",
+    "errorCopyImage": "Erro ao copiar imagem: {error}",
+    "errorLoadingModel": "Erro ao carregar o modelo",
+    "errorOpenImage": "Erro ao abrir a imagem: {error}",
+    "errorSaveSetting": "Erro ao salvar configuração {id}: {err}",
+    "exportSuccess": "Modelo exportado com sucesso como {format}",
+    "failedExecutionPathResolution": "Não foi possível resolver o caminho para os nós selecionados",
+    "failedToAccessBillingPortal": "Falha ao acessar o portal de cobrança: {error}",
+    "failedToApplyTexture": "Falha ao aplicar textura",
+    "failedToConvertToSubgraph": "Falha ao converter itens para subgrafo",
+    "failedToCreateCustomer": "Falha ao criar cliente: {error}",
+    "failedToDownloadFile": "Falha ao baixar o arquivo",
+    "failedToExportModel": "Falha ao exportar o modelo como {format}",
+    "failedToFetchBalance": "Falha ao buscar saldo: {error}",
+    "failedToFetchLogs": "Falha ao buscar logs do servidor",
+    "failedToFetchSubscription": "Falha ao buscar status da assinatura: {error}",
+    "failedToInitializeLoad3dViewer": "Falha ao inicializar o Visualizador 3D",
+    "failedToInitiateCreditPurchase": "Falha ao iniciar compra de créditos: {error}",
+    "failedToInitiateSubscription": "Falha ao iniciar assinatura: {error}",
+    "failedToLoadBackgroundImage": "Falha ao carregar imagem de fundo",
+    "failedToLoadModel": "Falha ao carregar modelo 3D",
+    "failedToPurchaseCredits": "Falha ao comprar créditos: {error}",
+    "failedToQueue": "Falha ao enfileirar",
+    "failedToSaveDraft": "Falha ao salvar o rascunho do fluxo de trabalho",
+    "failedToToggleCamera": "Falha ao alternar câmera",
+    "failedToToggleGrid": "Falha ao alternar grade",
+    "failedToUpdateBackgroundColor": "Falha ao atualizar cor de fundo",
+    "failedToUpdateBackgroundImage": "Falha ao atualizar imagem de fundo",
+    "failedToUpdateBackgroundRenderMode": "Falha ao atualizar modo de renderização de fundo para {mode}",
+    "failedToUpdateEdgeThreshold": "Falha ao atualizar limite de borda",
+    "failedToUpdateFOV": "Falha ao atualizar campo de visão",
+    "failedToUpdateLightIntensity": "Falha ao atualizar intensidade da luz",
+    "failedToUpdateMaterialMode": "Falha ao atualizar modo de material",
+    "failedToUpdateUpDirection": "Falha ao atualizar direção para cima",
+    "failedToUploadBackgroundImage": "Falha ao fazer upload da imagem de fundo",
+    "fileLoadError": "Não foi possível encontrar o fluxo de trabalho em {fileName}",
+    "fileTooLarge": "Arquivo muito grande ({size} MB). O tamanho máximo suportado é {maxSize} MB",
+    "fileUploadFailed": "Falha no upload do arquivo",
+    "interrupted": "Execução interrompida",
+    "legacyMaskEditorDeprecated": "O editor de máscara legado está obsoleto e será removido em breve.",
+    "migrateToLitegraphReroute": "Nós de redirecionamento serão removidos em versões futuras. Clique para migrar para o redirecionamento nativo do litegraph.",
+    "modelLoadedSuccessfully": "Modelo 3D carregado com sucesso",
+    "no3dScene": "Nenhuma cena 3D para aplicar textura",
+    "no3dSceneToExport": "Nenhuma cena 3D para exportar",
+    "noTemplatesToExport": "Nenhum template para exportar",
+    "nodeDefinitionsUpdated": "Definições de nós atualizadas",
+    "nothingSelected": "Nada selecionado",
+    "nothingToGroup": "Nada para agrupar",
+    "nothingToQueue": "Nada para enfileirar",
+    "pendingTasksDeleted": "Tarefas pendentes excluídas",
+    "pleaseSelectNodesToGroup": "Por favor, selecione os nós (ou outros grupos) para criar um grupo",
+    "pleaseSelectOutputNodes": "Por favor, selecione os nós de saída",
+    "unableToGetModelFilePath": "Não foi possível obter o caminho do arquivo do modelo",
+    "unauthorizedDomain": "Seu domínio {domain} não está autorizado a usar este serviço. Por favor, entre em contato com {email} para adicionar seu domínio à lista de permissões.",
+    "updateRequested": "Atualização solicitada",
+    "useApiKeyTip": "Dica: Não consegue acessar o login normal? Use a opção Comfy API Key.",
+    "userNotAuthenticated": "Usuário não autenticado"
+  },
+  "userSelect": {
+    "enterUsername": "Digite um nome de usuário",
+    "existingUser": "Usuário existente",
+    "newUser": "Novo usuário",
+    "next": "Próximo",
+    "selectUser": "Selecione um usuário"
+  },
+  "userSettings": {
+    "accountSettings": "Configurações da conta",
+    "email": "E-mail",
+    "name": "Nome",
+    "notSet": "Não definido",
+    "provider": "Provedor de login",
+    "title": "Configurações da Minha Conta",
+    "updatePassword": "Atualizar senha",
+    "workspaceSettings": "Configurações do espaço de trabalho"
+  },
+  "validation": {
+    "descriptionRequired": "Descrição é obrigatória",
+    "invalidEmail": "Endereço de e-mail inválido",
+    "length": "Deve ter {length} caracteres",
+    "maxLength": "Deve ter no máximo {length} caracteres",
+    "minLength": "Deve ter pelo menos {length} caracteres",
+    "password": {
+      "lowercase": "Deve conter pelo menos uma letra minúscula",
+      "match": "As senhas devem coincidir",
+      "minLength": "Deve ter entre 8 e 32 caracteres",
+      "number": "Deve conter pelo menos um número",
+      "requirements": "Requisitos da senha",
+      "special": "Deve conter pelo menos um caractere especial",
+      "uppercase": "Deve conter pelo menos uma letra maiúscula"
+    },
+    "personalDataConsentRequired": "Você deve concordar com o processamento dos seus dados pessoais.",
+    "prefix": "Deve começar com {prefix}",
+    "required": "Obrigatório"
+  },
+  "versionMismatchWarning": {
+    "dismiss": "Dispensar",
+    "frontendNewer": "A versão do frontend {frontendVersion} pode não ser compatível com a versão do backend {backendVersion}.",
+    "frontendOutdated": "A versão do frontend {frontendVersion} está desatualizada. O backend requer a versão {requiredVersion} ou superior.",
+    "title": "Aviso de Compatibilidade de Versão",
+    "updateFrontend": "Atualizar Frontend"
+  },
+  "vueNodesBanner": {
+    "desc": "– Fluxos de trabalho mais flexíveis, novos widgets poderosos, feito para extensibilidade",
+    "title": "Apresentando Nodes 2.0",
+    "tryItOut": "Experimente"
+  },
+  "vueNodesMigration": {
+    "button": "Voltar",
+    "message": "Prefere o design antigo?"
+  },
+  "vueNodesMigrationMainMenu": {
+    "message": "Volte para Nodes 2.0 a qualquer momento pelo menu principal."
+  },
+  "vueNodesSlot": {
+    "iterative": "(Iterativo)"
+  },
+  "welcome": {
+    "getStarted": "Começar",
+    "title": "Bem-vindo ao ComfyUI"
+  },
+  "whatsNewPopup": {
+    "later": "Depois",
+    "learnMore": "Saiba mais",
+    "noReleaseNotes": "Nenhuma nota de versão disponível."
+  },
+  "widgetFileUpload": {
+    "browseFiles": "Procurar Arquivos",
+    "dropPrompt": "Solte seu arquivo ou"
+  },
+  "widgets": {
+    "boolean": {
+      "false": "falso",
+      "true": "verdadeiro"
+    },
+    "node2only": "Apenas Node 2.0",
+    "selectModel": "Selecionar modelo",
+    "uploadSelect": {
+      "maxSelectionReached": "Limite máximo de seleção atingido",
+      "placeholder": "Selecionar...",
+      "placeholderAudio": "Selecionar áudio...",
+      "placeholderImage": "Selecionar imagem...",
+      "placeholderMesh": "Selecionar malha...",
+      "placeholderModel": "Selecionar modelo...",
+      "placeholderUnknown": "Selecionar mídia...",
+      "placeholderVideo": "Selecionar vídeo..."
+    },
+    "valueControl": {
+      "decrement": "Decrementar Valor",
+      "decrementDesc": "Subtrai 1 do valor ou seleciona a opção anterior",
+      "editSettings": "Editar configurações de controle",
+      "fixed": "Valor Fixo",
+      "fixedDesc": "Mantém o valor inalterado",
+      "header": {
+        "after": "DEPOIS",
+        "before": "ANTES",
+        "postfix": "de executar o fluxo de trabalho:",
+        "prefix": "Atualizar o valor automaticamente"
+      },
+      "increment": "Incrementar Valor",
+      "incrementDesc": "Adiciona 1 ao valor ou seleciona a próxima opção",
+      "linkToGlobal": "Vincular a",
+      "linkToGlobalDesc": "Valor único vinculado à configuração de controle do Valor Global",
+      "linkToGlobalSeed": "Valor Global",
+      "randomize": "Valor Aleatório",
+      "randomizeDesc": "Embaralha o valor aleatoriamente após cada geração"
+    }
+  },
+  "workflowService": {
+    "enterFilename": "Digite o nome do arquivo",
+    "enterFilenamePrompt": "Digite o nome do arquivo:",
+    "exportWorkflow": "Exportar Fluxo de Trabalho",
+    "saveWorkflow": "Salvar fluxo de trabalho",
+    "savedAsApp": "Convertido para fluxo de aplicativo",
+    "savedAsWorkflow": "Convertido para fluxo apenas com grafo de nós"
+  },
+  "workspace": {
+    "addedToWorkspace": "Você foi adicionado ao {workspaceName}",
+    "inviteAccepted": "Convite aceito",
+    "inviteFailed": "Falha ao aceitar convite",
+    "unsavedChanges": {
+      "message": "Você tem alterações não salvas. Deseja descartá-las e trocar de espaço de trabalho?",
+      "title": "Alterações não salvas"
+    },
+    "viewWorkspace": "Ver workspace"
+  },
+  "workspaceAuth": {
+    "errors": {
+      "accessDenied": "Você não tem acesso a este espaço de trabalho",
+      "invalidFirebaseToken": "Falha na autenticação. Por favor, tente fazer login novamente.",
+      "notAuthenticated": "Você precisa estar logado para acessar os espaços de trabalho",
+      "tokenExchangeFailed": "Falha ao autenticar com o espaço de trabalho: {error}",
+      "workspaceNotFound": "Espaço de trabalho não encontrado"
+    }
+  },
+  "workspacePanel": {
+    "createWorkspaceDialog": {
+      "create": "Criar",
+      "message": "Espaços de trabalho permitem que membros compartilhem um único saldo de créditos. Você se tornará o proprietário após criar este.",
+      "nameLabel": "Nome do espaço de trabalho*",
+      "namePlaceholder": "Digite o nome do espaço de trabalho",
+      "title": "Criar um novo espaço de trabalho"
+    },
+    "dashboard": {
+      "placeholder": "Configurações do workspace do painel"
+    },
+    "deleteDialog": {
+      "message": "Quaisquer créditos não utilizados ou ativos não salvos serão perdidos. Esta ação não pode ser desfeita.",
+      "messageWithName": "Excluir \"{name}\"? Quaisquer créditos não utilizados ou ativos não salvos serão perdidos. Esta ação não pode ser desfeita.",
+      "title": "Excluir este espaço de trabalho?"
+    },
+    "editWorkspaceDialog": {
+      "nameLabel": "Nome do espaço de trabalho",
+      "save": "Salvar",
+      "title": "Editar detalhes do espaço de trabalho"
+    },
+    "invite": "Convidar",
+    "inviteLimitReached": "Você atingiu o limite máximo de 50 membros",
+    "inviteMember": "Convidar membro",
+    "inviteMemberDialog": {
+      "createLink": "Criar link",
+      "linkCopied": "Copiado",
+      "linkCopyFailed": "Falha ao copiar link",
+      "linkStep": {
+        "copyLink": "Copiar link",
+        "done": "Concluído",
+        "message": "Certifique-se de que a conta dela usa este e-mail.",
+        "title": "Envie este link para a pessoa"
+      },
+      "message": "Crie um link de convite compartilhável para enviar a alguém",
+      "placeholder": "Digite o e-mail da pessoa",
+      "title": "Convidar uma pessoa para este workspace"
+    },
+    "inviteUpsellDialog": {
+      "messageNotSubscribed": "Para adicionar membros da equipe a este workspace, você precisa do plano Creator ou superior. O plano Standard suporta apenas um usuário (o proprietário).",
+      "messageSingleSeat": "O plano Standard inclui um usuário para o proprietário do workspace. Para convidar membros adicionais, faça upgrade para o plano Creator ou superior para liberar múltiplos usuários.",
+      "titleNotSubscribed": "É necessária uma assinatura para convidar membros",
+      "titleSingleSeat": "Seu plano atual suporta apenas um usuário",
+      "upgradeToCreator": "Fazer upgrade para Creator",
+      "viewPlans": "Ver planos"
+    },
+    "leaveDialog": {
+      "leave": "Sair",
+      "message": "Você não poderá entrar novamente a menos que entre em contato com o proprietário do espaço de trabalho.",
+      "title": "Sair deste espaço de trabalho?"
+    },
+    "members": {
+      "actions": {
+        "copyLink": "Copiar link do convite",
+        "removeMember": "Remover membro",
+        "revokeInvite": "Revogar convite"
+      },
+      "columns": {
+        "expiryDate": "Data de expiração",
+        "inviteDate": "Data do convite",
+        "joinDate": "Data de entrada"
+      },
+      "createNewWorkspace": "crie um novo.",
+      "membersCount": "{count}/50 Membros",
+      "noInvites": "Nenhum convite pendente",
+      "noMembers": "Nenhum membro",
+      "pendingInvitesCount": "{count} convite pendente | {count} convites pendentes",
+      "personalWorkspaceMessage": "No momento, você não pode convidar outros membros para seu workspace pessoal. Para adicionar membros a um workspace,",
+      "tabs": {
+        "active": "Ativo",
+        "pendingCount": "Pendente ({count})"
+      },
+      "upsellBannerSubscribe": "Assine o plano Creator ou superior para convidar membros da equipe para este workspace.",
+      "upsellBannerUpgrade": "Faça upgrade para o plano Creator ou superior para convidar membros adicionais da equipe.",
+      "viewPlans": "Ver planos"
+    },
+    "menu": {
+      "deleteWorkspace": "Excluir espaço de trabalho",
+      "deleteWorkspaceDisabledTooltip": "Cancele a assinatura ativa do seu espaço de trabalho primeiro",
+      "editWorkspace": "Editar detalhes do espaço de trabalho",
+      "leaveWorkspace": "Sair do espaço de trabalho"
+    },
+    "removeMemberDialog": {
+      "error": "Falha ao remover membro",
+      "message": "Este membro será removido do seu workspace. Os créditos utilizados por ele não serão reembolsados.",
+      "remove": "Remover membro",
+      "success": "Membro removido",
+      "title": "Remover este membro?"
+    },
+    "revokeInviteDialog": {
+      "message": "Este membro não poderá mais entrar no seu workspace. O link de convite será invalidado.",
+      "revoke": "Desfazer convite",
+      "title": "Desfazer convite para esta pessoa?"
+    },
+    "tabs": {
+      "dashboard": "Painel",
+      "membersCount": "Membros ({count})",
+      "planCredits": "Plano e Créditos"
+    },
+    "toast": {
+      "failedToCreateWorkspace": "Falha ao criar o espaço de trabalho",
+      "failedToDeleteWorkspace": "Falha ao excluir o espaço de trabalho",
+      "failedToFetchWorkspaces": "Falha ao carregar workspaces",
+      "failedToLeaveWorkspace": "Falha ao sair do espaço de trabalho",
+      "failedToUpdateWorkspace": "Falha ao atualizar o espaço de trabalho",
+      "workspaceCreated": {
+        "message": "Assine um plano, convide colegas e comece a colaborar.",
+        "subscribe": "Assinar",
+        "title": "Workspace criado"
+      },
+      "workspaceDeleted": {
+        "message": "O workspace foi excluído permanentemente.",
+        "title": "Workspace excluído"
+      },
+      "workspaceLeft": {
+        "message": "Você saiu do workspace.",
+        "title": "Saiu do workspace"
+      },
+      "workspaceUpdated": {
+        "message": "Os detalhes do espaço de trabalho foram salvos.",
+        "title": "Espaço de trabalho atualizado"
+      }
+    }
+  },
+  "workspaceSwitcher": {
+    "createWorkspace": "Criar novo espaço de trabalho",
+    "maxWorkspacesReached": "Você só pode possuir 10 espaços de trabalho. Exclua um para criar um novo.",
+    "personal": "Pessoal",
+    "roleMember": "Membro",
+    "roleOwner": "Proprietário",
+    "subscribe": "Assinar",
+    "switchWorkspace": "Trocar espaço de trabalho"
+  },
+  "zoomControls": {
+    "hideMinimap": "Ocultar Minimapa",
+    "label": "Controles de Zoom",
+    "showMinimap": "Mostrar Minimapa",
+    "zoomToFit": "Ajustar ao Espaço"
+  }
+}
diff --git a/src/locales/pt-BR/nodeDefs.json b/src/locales/pt-BR/nodeDefs.json
index 0967ef424b..23096225d1 100644
--- a/src/locales/pt-BR/nodeDefs.json
+++ b/src/locales/pt-BR/nodeDefs.json
@@ -1 +1,18659 @@
-{}
+{
+  "APG": {
+    "display_name": "Orientação Projetada Adaptativa",
+    "inputs": {
+      "eta": {
+        "name": "eta",
+        "tooltip": "Controla a escala do vetor de orientação paralela. Comportamento padrão do CFG com valor 1."
+      },
+      "model": {
+        "name": "model"
+      },
+      "momentum": {
+        "name": "momento",
+        "tooltip": "Controla uma média móvel da orientação durante a difusão, desativado com valor 0."
+      },
+      "norm_threshold": {
+        "name": "limite_normalização",
+        "tooltip": "Normaliza o vetor de orientação para este valor, normalização desativada com valor 0."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "AddNoise": {
+    "display_name": "AddNoise",
+    "inputs": {
+      "latent_image": {
+        "name": "imagem_latente"
+      },
+      "model": {
+        "name": "model"
+      },
+      "noise": {
+        "name": "ruído"
+      },
+      "sigmas": {
+        "name": "sigmas"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "AddTextPrefix": {
+    "display_name": "Adicionar Prefixo de Texto",
+    "inputs": {
+      "prefix": {
+        "name": "prefixo",
+        "tooltip": "Prefixo a ser adicionado."
+      },
+      "texts": {
+        "name": "textos",
+        "tooltip": "Texto a ser processado."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "textos",
+        "tooltip": "Textos processados"
+      }
+    }
+  },
+  "AddTextSuffix": {
+    "display_name": "Adicionar Sufixo de Texto",
+    "inputs": {
+      "suffix": {
+        "name": "sufixo",
+        "tooltip": "Sufixo a ser adicionado."
+      },
+      "texts": {
+        "name": "textos",
+        "tooltip": "Texto a ser processado."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "textos",
+        "tooltip": "Textos processados"
+      }
+    }
+  },
+  "AdjustBrightness": {
+    "display_name": "Ajustar Brilho",
+    "inputs": {
+      "factor": {
+        "name": "fator",
+        "tooltip": "Fator de brilho. 1.0 = sem alteração, <1.0 = mais escuro, >1.0 = mais claro."
+      },
+      "images": {
+        "name": "imagens",
+        "tooltip": "Imagem a ser processada."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "imagens",
+        "tooltip": "Imagens processadas"
+      }
+    }
+  },
+  "AdjustContrast": {
+    "display_name": "Ajustar Contraste",
+    "inputs": {
+      "factor": {
+        "name": "fator",
+        "tooltip": "Fator de contraste. 1.0 = sem alteração, <1.0 = menos contraste, >1.0 = mais contraste."
+      },
+      "images": {
+        "name": "imagens",
+        "tooltip": "Imagem a ser processada."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "imagens",
+        "tooltip": "Imagens processadas"
+      }
+    }
+  },
+  "AlignYourStepsScheduler": {
+    "display_name": "AlignYourStepsScheduler",
+    "inputs": {
+      "denoise": {
+        "name": "reduzir_ruído"
+      },
+      "model_type": {
+        "name": "tipo_de_modelo"
+      },
+      "steps": {
+        "name": "passos"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "AudioAdjustVolume": {
+    "display_name": "Ajustar Volume do Áudio",
+    "inputs": {
+      "audio": {
+        "name": "áudio"
+      },
+      "volume": {
+        "name": "volume",
+        "tooltip": "Ajuste de volume em decibéis (dB). 0 = sem alteração, +6 = dobra, -6 = metade, etc"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "AudioConcat": {
+    "description": "Concatena o áudio1 ao áudio2 na direção especificada.",
+    "display_name": "Concatenação de Áudio",
+    "inputs": {
+      "audio1": {
+        "name": "audio1"
+      },
+      "audio2": {
+        "name": "audio2"
+      },
+      "direction": {
+        "name": "direção",
+        "tooltip": "Se o áudio2 será adicionado após ou antes do áudio1."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "AudioEncoderEncode": {
+    "display_name": "Codificar com AudioEncoder",
+    "inputs": {
+      "audio": {
+        "name": "áudio"
+      },
+      "audio_encoder": {
+        "name": "audio_encoder"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "AudioEncoderLoader": {
+    "display_name": "Carregar AudioEncoder",
+    "inputs": {
+      "audio_encoder_name": {
+        "name": "audio_encoder_name"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "AudioEqualizer3Band": {
+    "display_name": "Equalizador de Áudio (3 Bandas)",
+    "inputs": {
+      "audio": {
+        "name": "áudio"
+      },
+      "high_freq": {
+        "name": "freq_aguda",
+        "tooltip": "Frequência de corte para o filtro de agudos"
+      },
+      "high_gain_dB": {
+        "name": "ganho_agudo_dB",
+        "tooltip": "Ganho para frequências altas (Agudo)"
+      },
+      "low_freq": {
+        "name": "freq_baixa",
+        "tooltip": "Frequência de corte para o filtro de graves"
+      },
+      "low_gain_dB": {
+        "name": "ganho_baixo_dB",
+        "tooltip": "Ganho para frequências baixas (Grave)"
+      },
+      "mid_freq": {
+        "name": "freq_média",
+        "tooltip": "Frequência central para médios"
+      },
+      "mid_gain_dB": {
+        "name": "ganho_médio_dB",
+        "tooltip": "Ganho para frequências médias"
+      },
+      "mid_q": {
+        "name": "q_médio",
+        "tooltip": "Fator Q (largura de banda) para médios"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "AudioMerge": {
+    "description": "Combina duas faixas de áudio sobrepondo suas formas de onda.",
+    "display_name": "Mesclar Áudio",
+    "inputs": {
+      "audio1": {
+        "name": "audio1"
+      },
+      "audio2": {
+        "name": "audio2"
+      },
+      "merge_method": {
+        "name": "método_de_mesclagem",
+        "tooltip": "O método utilizado para combinar as formas de onda dos áudios."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BasicGuider": {
+    "display_name": "Guia Básico",
+    "inputs": {
+      "conditioning": {
+        "name": "condicionamento"
+      },
+      "model": {
+        "name": "modelo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BasicScheduler": {
+    "display_name": "Agendador Básico",
+    "inputs": {
+      "denoise": {
+        "name": "reduzir_ruído"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "scheduler": {
+        "name": "agendador"
+      },
+      "steps": {
+        "name": "etapas"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchImagesNode": {
+    "display_name": "Imagens em Lote",
+    "inputs": {
+      "images": {
+        "name": "imagens"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchLatentsNode": {
+    "display_name": "Latents em Lote",
+    "inputs": {
+      "latents": {
+        "name": "latents"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchMasksNode": {
+    "display_name": "Máscaras em Lote",
+    "inputs": {
+      "masks": {
+        "name": "máscaras"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BetaSamplingScheduler": {
+    "display_name": "Agendador de Amostragem Beta",
+    "inputs": {
+      "alpha": {
+        "name": "alfa"
+      },
+      "beta": {
+        "name": "beta"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "steps": {
+        "name": "etapas"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BriaImageEditNode": {
+    "description": "Edite imagens usando o modelo mais recente da Bria",
+    "display_name": "Bria Image Edit",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "guidance_scale": {
+        "name": "escala_de_guia",
+        "tooltip": "Um valor mais alto faz com que a imagem siga o prompt mais de perto."
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "mask": {
+        "name": "máscara",
+        "tooltip": "Se omitido, a edição será aplicada à imagem inteira."
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "moderation": {
+        "name": "moderação",
+        "tooltip": "Configurações de moderação"
+      },
+      "negative_prompt": {
+        "name": "prompt_negativo"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Instrução para editar a imagem"
+      },
+      "seed": {
+        "name": "semente"
+      },
+      "steps": {
+        "name": "passos"
+      },
+      "structured_prompt": {
+        "name": "prompt_estruturado",
+        "tooltip": "Uma string contendo o prompt de edição estruturado em formato JSON. Use isso em vez do prompt comum para controle preciso e programático."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "prompt_estruturado",
+        "tooltip": null
+      }
+    }
+  },
+  "BriaRemoveImageBackground": {
+    "description": "Remove o fundo de uma imagem usando Bria RMBG 2.0.",
+    "display_name": "Bria Remover Fundo da Imagem",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar após gerar"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "moderation": {
+        "name": "moderação",
+        "tooltip": "Configurações de moderação"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente controla se o nó deve ser executado novamente; os resultados são não determinísticos independentemente da semente."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BriaRemoveVideoBackground": {
+    "description": "Remove o fundo de um vídeo usando Bria.",
+    "display_name": "Bria Remover Fundo do Vídeo",
+    "inputs": {
+      "background_color": {
+        "name": "cor de fundo",
+        "tooltip": "Cor de fundo para o vídeo de saída."
+      },
+      "control_after_generate": {
+        "name": "controlar após gerar"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente controla se o nó deve ser executado novamente; os resultados são não determinísticos independentemente da semente."
+      },
+      "video": {
+        "name": "vídeo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ByteDanceFirstLastFrameNode": {
+    "description": "Gere vídeo usando um prompt e os quadros inicial e final.",
+    "display_name": "ByteDance Primeiro-Último-Frame para Vídeo",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "A proporção do vídeo de saída."
+      },
+      "camera_fixed": {
+        "name": "camera_fixed",
+        "tooltip": "Especifica se a câmera deve ser fixa. O aplicativo adiciona uma instrução para fixar a câmera ao seu prompt, mas não garante o efeito real."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration": {
+        "name": "duration",
+        "tooltip": "A duração do vídeo de saída em segundos."
+      },
+      "first_frame": {
+        "name": "first_frame",
+        "tooltip": "Primeiro quadro a ser usado para o vídeo."
+      },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "Este parâmetro é ignorado para qualquer modelo, exceto seedance-1-5-pro."
+      },
+      "last_frame": {
+        "name": "last_frame",
+        "tooltip": "Último quadro a ser usado para o vídeo."
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "O prompt de texto usado para gerar o vídeo."
+      },
+      "resolution": {
+        "name": "resolution",
+        "tooltip": "A resolução do vídeo de saída."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed a ser usada para a geração."
+      },
+      "watermark": {
+        "name": "watermark",
+        "tooltip": "Se deve adicionar uma marca d'água \"Gerado por IA\" ao vídeo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ByteDanceImageNode": {
+    "description": "Gere imagens usando modelos ByteDance via API com base em um prompt",
+    "display_name": "ByteDance Imagem",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "guidance_scale": {
+        "name": "guidance_scale",
+        "tooltip": "Um valor mais alto faz a imagem seguir o prompt mais de perto"
+      },
+      "height": {
+        "name": "height",
+        "tooltip": "Altura personalizada para a imagem. O valor só funciona se `size_preset` estiver definido como `Personalizado`"
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "O prompt de texto usado para gerar a imagem"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed a ser usada para a geração"
+      },
+      "size_preset": {
+        "name": "size_preset",
+        "tooltip": "Escolha um tamanho recomendado. Selecione Personalizado para usar a largura e altura abaixo"
+      },
+      "watermark": {
+        "name": "watermark",
+        "tooltip": "Se deve adicionar uma marca d'água \"Gerado por IA\" à imagem"
+      },
+      "width": {
+        "name": "width",
+        "tooltip": "Largura personalizada para a imagem. O valor só funciona se `size_preset` estiver definido como `Personalizado`"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ByteDanceImageReferenceNode": {
+    "description": "Gerar vídeo usando prompt e imagens de referência.",
+    "display_name": "Imagens de Referência ByteDance para Vídeo",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "proporção",
+        "tooltip": "A proporção do vídeo de saída."
+      },
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "duration": {
+        "name": "duração",
+        "tooltip": "A duração do vídeo de saída em segundos."
+      },
+      "images": {
+        "name": "imagens",
+        "tooltip": "De uma a quatro imagens."
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "O prompt de texto usado para gerar o vídeo."
+      },
+      "resolution": {
+        "name": "resolução",
+        "tooltip": "A resolução do vídeo de saída."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "Semente a ser usada para a geração."
+      },
+      "watermark": {
+        "name": "marca d'água",
+        "tooltip": "Se deve adicionar uma marca d'água \"Gerado por IA\" ao vídeo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ByteDanceImageToVideoNode": {
+    "description": "Gerar vídeo usando modelos ByteDance via API com base em imagem e prompt",
+    "display_name": "Imagem para Vídeo ByteDance",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "proporção",
+        "tooltip": "A proporção do vídeo de saída."
+      },
+      "camera_fixed": {
+        "name": "câmera fixa",
+        "tooltip": "Especifica se a câmera deve ser fixa. O aplicativo da plataforma adiciona uma instrução para fixar a câmera ao seu prompt, mas não garante o efeito real."
+      },
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "duration": {
+        "name": "duração",
+        "tooltip": "A duração do vídeo de saída em segundos."
+      },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "Este parâmetro é ignorado para qualquer modelo, exceto seedance-1-5-pro."
+      },
+      "image": {
+        "name": "imagem",
+        "tooltip": "Primeiro quadro a ser usado para o vídeo."
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "O prompt de texto usado para gerar o vídeo."
+      },
+      "resolution": {
+        "name": "resolução",
+        "tooltip": "A resolução do vídeo de saída."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "Semente a ser usada para a geração."
+      },
+      "watermark": {
+        "name": "marca d'água",
+        "tooltip": "Se deve adicionar uma marca d'água \"Gerado por IA\" ao vídeo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ByteDanceSeedreamNode": {
+    "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",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "fail_on_partial": {
+        "name": "fail_on_partial",
+        "tooltip": "Se ativado, aborta a execução se alguma das imagens solicitadas estiver faltando ou retornar erro."
+      },
+      "height": {
+        "name": "height",
+        "tooltip": "Altura personalizada para a imagem. O valor só funciona se `size_preset` estiver definido como `Personalizado`"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "Imagem(ns) de entrada para geração de imagem a partir de imagem. Lista de 1 a 10 imagens para geração de referência única ou múltipla."
+      },
+      "max_images": {
+        "name": "max_images",
+        "tooltip": "Número máximo de imagens a serem geradas quando sequential_image_generation='auto'. O total de imagens (entrada + geradas) não pode exceder 15."
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt de texto para criar ou editar uma imagem."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed a ser usada para geração."
+      },
+      "sequential_image_generation": {
+        "name": "sequential_image_generation",
+        "tooltip": "Modo de geração de imagens em grupo. 'desativado' gera uma única imagem. 'auto' permite que o modelo decida se deve gerar várias imagens relacionadas (ex: cenas de histórias, variações de personagens)."
+      },
+      "size_preset": {
+        "name": "size_preset",
+        "tooltip": "Escolha um tamanho recomendado. Selecione Personalizado para usar a largura e altura abaixo."
+      },
+      "watermark": {
+        "name": "watermark",
+        "tooltip": "Se deve adicionar uma marca d'água \"Gerado por IA\" à imagem."
+      },
+      "width": {
+        "name": "width",
+        "tooltip": "Largura personalizada para a imagem. O valor só funciona se `size_preset` estiver definido como `Personalizado`"
+      }
+    },
+    "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",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "A proporção do vídeo de saída."
+      },
+      "camera_fixed": {
+        "name": "camera_fixed",
+        "tooltip": "Especifica se a câmera deve ser fixa. O aplicativo adiciona uma instrução para fixar a câmera ao seu prompt, mas não garante o efeito real."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration": {
+        "name": "duration",
+        "tooltip": "A duração do vídeo de saída em segundos."
+      },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "Este parâmetro é ignorado para qualquer modelo, exceto seedance-1-5-pro."
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "O prompt de texto usado para gerar o vídeo."
+      },
+      "resolution": {
+        "name": "resolution",
+        "tooltip": "A resolução do vídeo de saída."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed a ser usada para geração."
+      },
+      "watermark": {
+        "name": "watermark",
+        "tooltip": "Se deve adicionar uma marca d'água \"Gerado por IA\" ao vídeo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CFGGuider": {
+    "display_name": "CFGGuider",
+    "inputs": {
+      "cfg": {
+        "name": "cfg"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CFGNorm": {
+    "display_name": "CFGNorm",
+    "inputs": {
+      "model": {
+        "name": "modelo"
+      },
+      "strength": {
+        "name": "força"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "modelo_patchado",
+        "tooltip": null
+      }
+    }
+  },
+  "CFGZeroStar": {
+    "display_name": "CFGZeroStar",
+    "inputs": {
+      "model": {
+        "name": "modelo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "modelo_patchado",
+        "tooltip": null
+      }
+    }
+  },
+  "CLIPAttentionMultiply": {
+    "display_name": "CLIPAttentionMultiply",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "k": {
+        "name": "k"
+      },
+      "out": {
+        "name": "out"
+      },
+      "q": {
+        "name": "q"
+      },
+      "v": {
+        "name": "v"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CLIPLoader": {
+    "description": "[Receitas]\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 (Recomendado) ou t5\nomnigen2: qwen vl 2.5 3B",
+    "display_name": "Carregar CLIP",
+    "inputs": {
+      "clip_name": {
+        "name": "clip_name"
+      },
+      "device": {
+        "name": "device"
+      },
+      "type": {
+        "name": "type"
+      }
+    }
+  },
+  "CLIPMergeAdd": {
+    "display_name": "CLIPMergeAdd",
+    "inputs": {
+      "clip1": {
+        "name": "clip1"
+      },
+      "clip2": {
+        "name": "clip2"
+      }
+    }
+  },
+  "CLIPMergeSimple": {
+    "display_name": "CLIPMergeSimple",
+    "inputs": {
+      "clip1": {
+        "name": "clip1"
+      },
+      "clip2": {
+        "name": "clip2"
+      },
+      "ratio": {
+        "name": "ratio"
+      }
+    }
+  },
+  "CLIPMergeSubtract": {
+    "display_name": "CLIPMergeSubtract",
+    "inputs": {
+      "clip1": {
+        "name": "clip1"
+      },
+      "clip2": {
+        "name": "clip2"
+      },
+      "multiplier": {
+        "name": "multiplier"
+      }
+    }
+  },
+  "CLIPSave": {
+    "display_name": "CLIPSave",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "filename_prefix": {
+        "name": "filename_prefix"
+      }
+    }
+  },
+  "CLIPSetLastLayer": {
+    "display_name": "CLIP Definir Última Camada",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "stop_at_clip_layer": {
+        "name": "stop_at_clip_layer"
+      }
+    }
+  },
+  "CLIPTextEncode": {
+    "description": "Codifica um prompt de texto usando um modelo CLIP em um embedding que pode ser usado para guiar o modelo de difusão na geração de imagens específicas.",
+    "display_name": "Codificação de Texto CLIP (Prompt)",
+    "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "O modelo CLIP usado para codificar o texto."
+      },
+      "text": {
+        "name": "texto",
+        "tooltip": "O texto a ser codificado."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "Um condicionamento contendo o texto embutido usado para guiar o modelo de difusão."
+      }
+    }
+  },
+  "CLIPTextEncodeControlnet": {
+    "display_name": "CLIPTextEncodeControlnet",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "conditioning": {
+        "name": "condicionamento"
+      },
+      "text": {
+        "name": "texto"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CLIPTextEncodeFlux": {
+    "display_name": "CLIPTextEncodeFlux",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "clip_l": {
+        "name": "clip_l"
+      },
+      "guidance": {
+        "name": "orientação"
+      },
+      "t5xxl": {
+        "name": "t5xxl"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CLIPTextEncodeHiDream": {
+    "display_name": "CLIPTextEncodeHiDream",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "clip_g": {
+        "name": "clip_g"
+      },
+      "clip_l": {
+        "name": "clip_l"
+      },
+      "llama": {
+        "name": "llama"
+      },
+      "t5xxl": {
+        "name": "t5xxl"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CLIPTextEncodeHunyuanDiT": {
+    "display_name": "CLIPTextEncodeHunyuanDiT",
+    "inputs": {
+      "bert": {
+        "name": "bert"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "mt5xl": {
+        "name": "mt5xl"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CLIPTextEncodeKandinsky5": {
+    "display_name": "CLIPTextEncodeKandinsky5",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "clip_l": {
+        "name": "clip_l"
+      },
+      "qwen25_7b": {
+        "name": "qwen25_7b"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CLIPTextEncodeLumina2": {
+    "description": "Codifica um prompt de sistema e um prompt de usuário usando um modelo CLIP em um embedding que pode ser usado para guiar o modelo de difusão na geração de imagens específicas.",
+    "display_name": "Codificação de Texto CLIP para Lumina2",
+    "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "O modelo CLIP usado para codificar o texto."
+      },
+      "system_prompt": {
+        "name": "prompt_do_sistema",
+        "tooltip": "Lumina2 fornece dois tipos de prompts de sistema: Superior: Você é um assistente projetado para gerar imagens superiores com o grau superior de alinhamento texto-imagem com base em prompts textuais ou prompts de usuário. Alinhamento: Você é um assistente projetado para gerar imagens de alta qualidade com o mais alto grau de alinhamento texto-imagem com base em prompts textuais."
+      },
+      "user_prompt": {
+        "name": "prompt_do_usuário",
+        "tooltip": "O texto a ser codificado."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "Um condicionamento contendo o texto embutido usado para guiar o modelo de difusão."
+      }
+    }
+  },
+  "CLIPTextEncodePixArtAlpha": {
+    "description": "Codifica texto e define o condicionamento de resolução para PixArt Alpha. Não se aplica ao PixArt Sigma.",
+    "display_name": "CLIPTextEncodePixArtAlpha",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "text": {
+        "name": "texto"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CLIPTextEncodeSD3": {
+    "display_name": "CLIPTextEncodeSD3",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "clip_g": {
+        "name": "clip_g"
+      },
+      "clip_l": {
+        "name": "clip_l"
+      },
+      "empty_padding": {
+        "name": "preenchimento_vazio"
+      },
+      "t5xxl": {
+        "name": "t5xxl"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CLIPTextEncodeSDXL": {
+    "display_name": "CLIPTextEncodeSDXL",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "crop_h": {
+        "name": "recorte_altura"
+      },
+      "crop_w": {
+        "name": "recorte_largura"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "target_height": {
+        "name": "altura_alvo"
+      },
+      "target_width": {
+        "name": "largura_alvo"
+      },
+      "text_g": {
+        "name": "texto_g"
+      },
+      "text_l": {
+        "name": "texto_l"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CLIPTextEncodeSDXLRefiner": {
+    "display_name": "CLIPTextEncodeSDXLRefiner",
+    "inputs": {
+      "ascore": {
+        "name": "ascore"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "text": {
+        "name": "texto"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CLIPVisionEncode": {
+    "display_name": "CLIP Vision Encode",
+    "inputs": {
+      "clip_vision": {
+        "name": "clip_vision"
+      },
+      "crop": {
+        "name": "recorte"
+      },
+      "image": {
+        "name": "imagem"
+      }
+    }
+  },
+  "CLIPVisionLoader": {
+    "display_name": "Carregar CLIP Vision",
+    "inputs": {
+      "clip_name": {
+        "name": "nome_do_clip"
+      }
+    }
+  },
+  "Canny": {
+    "display_name": "Canny",
+    "inputs": {
+      "high_threshold": {
+        "name": "high_threshold"
+      },
+      "image": {
+        "name": "image"
+      },
+      "low_threshold": {
+        "name": "low_threshold"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CaseConverter": {
+    "display_name": "Conversor de Caixa",
+    "inputs": {
+      "mode": {
+        "name": "modo"
+      },
+      "string": {
+        "name": "string"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CenterCropImages": {
+    "display_name": "Cortar Imagens ao Centro",
+    "inputs": {
+      "height": {
+        "name": "altura",
+        "tooltip": "Altura do corte."
+      },
+      "images": {
+        "name": "imagens",
+        "tooltip": "Imagem para processar."
+      },
+      "width": {
+        "name": "largura",
+        "tooltip": "Largura do corte."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "imagens",
+        "tooltip": "Imagens processadas"
+      }
+    }
+  },
+  "CheckpointLoader": {
+    "display_name": "Carregar Checkpoint com Configuração (OBSOLETO)",
+    "inputs": {
+      "ckpt_name": {
+        "name": "nome_ckpt"
+      },
+      "config_name": {
+        "name": "nome_config"
+      }
+    }
+  },
+  "CheckpointLoaderSimple": {
+    "description": "Carrega um checkpoint de modelo de difusão, modelos de difusão são usados para remover ruído dos latents.",
+    "display_name": "Carregar Checkpoint",
+    "inputs": {
+      "ckpt_name": {
+        "name": "nome_ckpt",
+        "tooltip": "O nome do checkpoint (modelo) a ser carregado."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "O modelo usado para remover ruído dos latents."
+      },
+      "1": {
+        "tooltip": "O modelo CLIP usado para codificar prompts de texto."
+      },
+      "2": {
+        "tooltip": "O modelo VAE usado para codificar e decodificar imagens para e do espaço latente."
+      }
+    }
+  },
+  "CheckpointSave": {
+    "display_name": "Salvar Checkpoint",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "filename_prefix": {
+        "name": "prefixo_nome_arquivo"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
+  "ChromaRadianceOptions": {
+    "description": "Permite definir opções avançadas para o modelo Chroma Radiance.",
+    "display_name": "ChromaRadianceOptions",
+    "inputs": {
+      "end_sigma": {
+        "name": "end_sigma",
+        "tooltip": "Último sigma em que essas opções estarão em vigor."
+      },
+      "model": {
+        "name": "model"
+      },
+      "nerf_tile_size": {
+        "name": "nerf_tile_size",
+        "tooltip": "Permite substituir o tamanho padrão do tile NeRF. -1 significa usar o padrão (32). 0 significa usar o modo sem tiles (pode exigir muita VRAM)."
+      },
+      "preserve_wrapper": {
+        "name": "preserve_wrapper",
+        "tooltip": "Quando ativado, delega para um wrapper de função de modelo existente, se houver. Geralmente deve permanecer ativado."
+      },
+      "start_sigma": {
+        "name": "start_sigma",
+        "tooltip": "Primeiro sigma em que essas opções estarão em vigor."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ColorToRGBInt": {
+    "description": "Converte uma cor em um valor inteiro RGB.",
+    "display_name": "Cor para RGB Int",
+    "inputs": {
+      "color": {
+        "name": "cor"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "rgb_int",
+        "tooltip": null
+      }
+    }
+  },
+  "CombineHooks2": {
+    "display_name": "Combinar Hooks [2]",
+    "inputs": {
+      "hooks_A": {
+        "name": "hooks_A"
+      },
+      "hooks_B": {
+        "name": "hooks_B"
+      }
+    }
+  },
+  "CombineHooks4": {
+    "display_name": "Combinar Hooks [4]",
+    "inputs": {
+      "hooks_A": {
+        "name": "hooks_A"
+      },
+      "hooks_B": {
+        "name": "hooks_B"
+      },
+      "hooks_C": {
+        "name": "hooks_C"
+      },
+      "hooks_D": {
+        "name": "hooks_D"
+      }
+    }
+  },
+  "CombineHooks8": {
+    "display_name": "Combinar Hooks [8]",
+    "inputs": {
+      "hooks_A": {
+        "name": "hooks_A"
+      },
+      "hooks_B": {
+        "name": "hooks_B"
+      },
+      "hooks_C": {
+        "name": "hooks_C"
+      },
+      "hooks_D": {
+        "name": "hooks_D"
+      },
+      "hooks_E": {
+        "name": "hooks_E"
+      },
+      "hooks_F": {
+        "name": "hooks_F"
+      },
+      "hooks_G": {
+        "name": "hooks_G"
+      },
+      "hooks_H": {
+        "name": "hooks_H"
+      }
+    }
+  },
+  "ComfySwitchNode": {
+    "display_name": "Alternar",
+    "inputs": {
+      "on_false": {
+        "name": "falso"
+      },
+      "on_true": {
+        "name": "verdadeiro"
+      },
+      "switch": {
+        "name": "alternar"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "saída",
+        "tooltip": null
+      }
+    }
+  },
+  "ConditioningAverage": {
+    "display_name": "Média de Condicionamento",
+    "inputs": {
+      "conditioning_from": {
+        "name": "condicionamento_de"
+      },
+      "conditioning_to": {
+        "name": "condicionamento_para"
+      },
+      "conditioning_to_strength": {
+        "name": "força_condicionamento_para"
+      }
+    }
+  },
+  "ConditioningCombine": {
+    "display_name": "Condicionamento (Combinar)",
+    "inputs": {
+      "conditioning_1": {
+        "name": "condicionamento_1"
+      },
+      "conditioning_2": {
+        "name": "condicionamento_2"
+      }
+    }
+  },
+  "ConditioningConcat": {
+    "display_name": "Condicionamento (Concatenar)",
+    "inputs": {
+      "conditioning_from": {
+        "name": "condicionamento_de"
+      },
+      "conditioning_to": {
+        "name": "condicionamento_para"
+      }
+    }
+  },
+  "ConditioningSetArea": {
+    "display_name": "Condicionamento (Definir Área)",
+    "inputs": {
+      "conditioning": {
+        "name": "condicionamento"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "strength": {
+        "name": "força"
+      },
+      "width": {
+        "name": "largura"
+      },
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      }
+    }
+  },
+  "ConditioningSetAreaPercentage": {
+    "display_name": "Condicionamento (Definir Área com Percentual)",
+    "inputs": {
+      "conditioning": {
+        "name": "condicionamento"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "strength": {
+        "name": "força"
+      },
+      "width": {
+        "name": "largura"
+      },
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      }
+    }
+  },
+  "ConditioningSetAreaPercentageVideo": {
+    "display_name": "CondicionamentoDefinirÁreaPercentualVídeo",
+    "inputs": {
+      "conditioning": {
+        "name": "condicionamento"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "strength": {
+        "name": "força"
+      },
+      "temporal": {
+        "name": "temporal"
+      },
+      "width": {
+        "name": "largura"
+      },
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      },
+      "z": {
+        "name": "z"
+      }
+    }
+  },
+  "ConditioningSetAreaStrength": {
+    "display_name": "CondicionamentoDefinirForçaÁrea",
+    "inputs": {
+      "conditioning": {
+        "name": "condicionamento"
+      },
+      "strength": {
+        "name": "força"
+      }
+    }
+  },
+  "ConditioningSetDefaultCombine": {
+    "display_name": "Cond Definir Combinação Padrão",
+    "inputs": {
+      "cond": {
+        "name": "cond"
+      },
+      "cond_DEFAULT": {
+        "name": "cond_PADRÃO"
+      },
+      "hooks": {
+        "name": "hooks"
+      }
+    }
+  },
+  "ConditioningSetMask": {
+    "display_name": "Condicionamento (Definir Mask)",
+    "inputs": {
+      "conditioning": {
+        "name": "condicionamento"
+      },
+      "mask": {
+        "name": "mask"
+      },
+      "set_cond_area": {
+        "name": "definir_área_cond"
+      },
+      "strength": {
+        "name": "força"
+      }
+    }
+  },
+  "ConditioningSetProperties": {
+    "display_name": "Props de Cond Set",
+    "inputs": {
+      "cond_NEW": {
+        "name": "cond_NOVO"
+      },
+      "hooks": {
+        "name": "ganchos"
+      },
+      "mask": {
+        "name": "mask"
+      },
+      "set_cond_area": {
+        "name": "definir_área_cond"
+      },
+      "strength": {
+        "name": "força"
+      },
+      "timesteps": {
+        "name": "etapas_de_tempo"
+      }
+    }
+  },
+  "ConditioningSetPropertiesAndCombine": {
+    "display_name": "Props de Cond Set Combinar",
+    "inputs": {
+      "cond": {
+        "name": "cond"
+      },
+      "cond_NEW": {
+        "name": "cond_NOVO"
+      },
+      "hooks": {
+        "name": "ganchos"
+      },
+      "mask": {
+        "name": "mask"
+      },
+      "set_cond_area": {
+        "name": "definir_área_cond"
+      },
+      "strength": {
+        "name": "força"
+      },
+      "timesteps": {
+        "name": "etapas_de_tempo"
+      }
+    }
+  },
+  "ConditioningSetTimestepRange": {
+    "display_name": "CondicionamentoDefinirIntervaloDeTempo",
+    "inputs": {
+      "conditioning": {
+        "name": "condicionamento"
+      },
+      "end": {
+        "name": "fim"
+      },
+      "start": {
+        "name": "início"
+      }
+    }
+  },
+  "ConditioningStableAudio": {
+    "display_name": "CondicionamentoStable Audio",
+    "inputs": {
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "seconds_start": {
+        "name": "segundos_início"
+      },
+      "seconds_total": {
+        "name": "segundos_total"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      }
+    }
+  },
+  "ConditioningTimestepsRange": {
+    "display_name": "Intervalo de Etapas de Tempo",
+    "inputs": {
+      "end_percent": {
+        "name": "percentual_final"
+      },
+      "start_percent": {
+        "name": "percentual_inicial"
+      }
+    },
+    "outputs": {
+      "1": {
+        "name": "ANTES_DO_INTERVALO"
+      },
+      "2": {
+        "name": "APÓS_O_INTERVALO"
+      }
+    }
+  },
+  "ConditioningZeroOut": {
+    "display_name": "CondicionamentoZerar",
+    "inputs": {
+      "conditioning": {
+        "name": "condicionamento"
+      }
+    }
+  },
+  "ContextWindowsManual": {
+    "description": "Defina manualmente as janelas de contexto.",
+    "display_name": "Janelas de Contexto (Manual)",
+    "inputs": {
+      "closed_loop": {
+        "name": "ciclo_fechado",
+        "tooltip": "Se deve fechar o ciclo da janela de contexto; aplicável apenas para agendamentos em loop."
+      },
+      "context_length": {
+        "name": "comprimento_contexto",
+        "tooltip": "O comprimento da janela de contexto."
+      },
+      "context_overlap": {
+        "name": "sobreposição_contexto",
+        "tooltip": "A sobreposição da janela de contexto."
+      },
+      "context_schedule": {
+        "name": "agendamento_contexto",
+        "tooltip": "O passo da janela de contexto."
+      },
+      "context_stride": {
+        "name": "passo_contexto",
+        "tooltip": "O passo da janela de contexto; aplicável apenas para agendamentos uniformes."
+      },
+      "dim": {
+        "name": "dimensão",
+        "tooltip": "A dimensão à qual aplicar as janelas de contexto."
+      },
+      "freenoise": {
+        "name": "freenoise",
+        "tooltip": "Se deve aplicar embaralhamento de ruído FreeNoise, melhora a mesclagem das janelas."
+      },
+      "fuse_method": {
+        "name": "método_fusão",
+        "tooltip": "O método a ser usado para fundir as janelas de contexto."
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "O modelo ao qual aplicar as janelas de contexto durante a amostragem."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "O modelo com janelas de contexto aplicadas durante a amostragem."
+      }
+    }
+  },
+  "ControlNetApply": {
+    "display_name": "Aplicar ControlNet (ANTIGO)",
+    "inputs": {
+      "conditioning": {
+        "name": "condicionamento"
+      },
+      "control_net": {
+        "name": "control_net"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "strength": {
+        "name": "força"
+      }
+    }
+  },
+  "ControlNetApplyAdvanced": {
+    "display_name": "Aplicar ControlNet",
+    "inputs": {
+      "control_net": {
+        "name": "control_net"
+      },
+      "end_percent": {
+        "name": "percentual_final"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "start_percent": {
+        "name": "percentual_inicial"
+      },
+      "strength": {
+        "name": "força"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo"
+      },
+      "1": {
+        "name": "negativo"
+      }
+    }
+  },
+  "ControlNetApplySD3": {
+    "display_name": "Aplicar Controlnet com VAE",
+    "inputs": {
+      "control_net": {
+        "name": "control_net"
+      },
+      "end_percent": {
+        "name": "percentual_final"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "start_percent": {
+        "name": "percentual_inicial"
+      },
+      "strength": {
+        "name": "força"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      }
+    }
+  },
+  "ControlNetInpaintingAliMamaApply": {
+    "display_name": "Aplicar ControlNetInpaintingAliMama",
+    "inputs": {
+      "control_net": {
+        "name": "control_net"
+      },
+      "end_percent": {
+        "name": "percentual_final"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "mask": {
+        "name": "mask"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "start_percent": {
+        "name": "percentual_inicial"
+      },
+      "strength": {
+        "name": "força"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      }
+    }
+  },
+  "ControlNetLoader": {
+    "display_name": "Carregar Modelo ControlNet",
+    "inputs": {
+      "control_net_name": {
+        "name": "control_net_name"
+      }
+    }
+  },
+  "CosmosImageToVideoLatent": {
+    "display_name": "CosmosImageToVideoLatent",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "end_image": {
+        "name": "imagem_final"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "comprimento"
+      },
+      "start_image": {
+        "name": "imagem_inicial"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CosmosPredict2ImageToVideoLatent": {
+    "display_name": "CosmosPredict2ImageToVideoLatent",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "end_image": {
+        "name": "imagem_final"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "comprimento"
+      },
+      "start_image": {
+        "name": "imagem_inicial"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CreateHookKeyframe": {
+    "display_name": "Criar Quadro-chave de Gancho",
+    "inputs": {
+      "prev_hook_kf": {
+        "name": "quadro-chave_gancho_anterior"
+      },
+      "start_percent": {
+        "name": "percentual_inicial"
+      },
+      "strength_mult": {
+        "name": "multiplicador_de_força"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "HOOK_KF"
+      }
+    }
+  },
+  "CreateHookKeyframesFromFloats": {
+    "display_name": "Criar Quadros-chave de Gancho a partir de Floats",
+    "inputs": {
+      "end_percent": {
+        "name": "percentual_final"
+      },
+      "floats_strength": {
+        "name": "força_floats"
+      },
+      "prev_hook_kf": {
+        "name": "quadro-chave_gancho_anterior"
+      },
+      "print_keyframes": {
+        "name": "imprimir_quadros-chave"
+      },
+      "start_percent": {
+        "name": "percentual_inicial"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "HOOK_KF"
+      }
+    }
+  },
+  "CreateHookKeyframesInterpolated": {
+    "display_name": "Criar Interp. de Keyframes do Hook",
+    "inputs": {
+      "end_percent": {
+        "name": "percentual_final"
+      },
+      "interpolation": {
+        "name": "interpolação"
+      },
+      "keyframes_count": {
+        "name": "quantidade_keyframes"
+      },
+      "prev_hook_kf": {
+        "name": "hook_kf_anterior"
+      },
+      "print_keyframes": {
+        "name": "imprimir_keyframes"
+      },
+      "start_percent": {
+        "name": "percentual_inicial"
+      },
+      "strength_end": {
+        "name": "força_final"
+      },
+      "strength_start": {
+        "name": "força_inicial"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "HOOK_KF"
+      }
+    }
+  },
+  "CreateHookLora": {
+    "display_name": "Criar Hook LoRA",
+    "inputs": {
+      "lora_name": {
+        "name": "lora_name"
+      },
+      "prev_hooks": {
+        "name": "hooks_anteriores"
+      },
+      "strength_clip": {
+        "name": "força_clip"
+      },
+      "strength_model": {
+        "name": "força_modelo"
+      }
+    }
+  },
+  "CreateHookLoraModelOnly": {
+    "display_name": "Criar Hook LoRA (MO)",
+    "inputs": {
+      "lora_name": {
+        "name": "lora_name"
+      },
+      "prev_hooks": {
+        "name": "hooks_anteriores"
+      },
+      "strength_model": {
+        "name": "força_modelo"
+      }
+    }
+  },
+  "CreateHookModelAsLora": {
+    "display_name": "Criar Hook Modelo como LoRA",
+    "inputs": {
+      "ckpt_name": {
+        "name": "ckpt_name"
+      },
+      "prev_hooks": {
+        "name": "hooks_anteriores"
+      },
+      "strength_clip": {
+        "name": "força_clip"
+      },
+      "strength_model": {
+        "name": "força_modelo"
+      }
+    }
+  },
+  "CreateHookModelAsLoraModelOnly": {
+    "display_name": "Criar Hook Modelo como LoRA (MO)",
+    "inputs": {
+      "ckpt_name": {
+        "name": "ckpt_name"
+      },
+      "prev_hooks": {
+        "name": "hooks_anteriores"
+      },
+      "strength_model": {
+        "name": "força_modelo"
+      }
+    }
+  },
+  "CreateList": {
+    "display_name": "Criar Lista",
+    "inputs": {
+      "inputs": {
+        "name": "entradas"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "lista",
+        "tooltip": null
+      }
+    }
+  },
+  "CreateVideo": {
+    "description": "Crie um vídeo a partir de imagens.",
+    "display_name": "Criar Vídeo",
+    "inputs": {
+      "audio": {
+        "name": "áudio",
+        "tooltip": "O áudio a ser adicionado ao vídeo."
+      },
+      "fps": {
+        "name": "fps"
+      },
+      "images": {
+        "name": "imagens",
+        "tooltip": "As imagens para criar o vídeo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CropByBBoxes": {
+    "description": "Recorta e redimensiona regiões do lote de imagens de entrada com base nas caixas delimitadoras fornecidas.",
+    "display_name": "CropByBBoxes",
+    "inputs": {
+      "bboxes": {
+        "name": "caixas delimitadoras"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "output_height": {
+        "name": "altura_de_saida",
+        "tooltip": "Altura para a qual cada recorte será redimensionado."
+      },
+      "output_width": {
+        "name": "largura_de_saida",
+        "tooltip": "Largura para a qual cada recorte será redimensionado."
+      },
+      "padding": {
+        "name": "preenchimento",
+        "tooltip": "Preenchimento extra em pixels adicionado em cada lado da caixa antes do recorte."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "Todos os recortes empilhados em um único lote de imagens."
+      }
+    }
+  },
+  "CropMask": {
+    "display_name": "Cortar Máscara",
+    "inputs": {
+      "height": {
+        "name": "altura"
+      },
+      "mask": {
+        "name": "mask"
+      },
+      "width": {
+        "name": "largura"
+      },
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CustomCombo": {
+    "display_name": "Combo Personalizado",
+    "inputs": {
+      "choice": {
+        "name": "escolha"
+      },
+      "index": {},
+      "option1": {}
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "ÍNDICE",
+        "tooltip": null
+      }
+    }
+  },
+  "DiffControlNetLoader": {
+    "display_name": "Carregar Modelo ControlNet (diff)",
+    "inputs": {
+      "control_net_name": {
+        "name": "control_net_name"
+      },
+      "model": {
+        "name": "modelo"
+      }
+    }
+  },
+  "DifferentialDiffusion": {
+    "display_name": "Diffusão Diferencial",
+    "inputs": {
+      "model": {
+        "name": "modelo"
+      },
+      "strength": {
+        "name": "força"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "DiffusersLoader": {
+    "display_name": "Carregador Diffusers",
+    "inputs": {
+      "model_path": {
+        "name": "caminho_do_modelo"
+      }
+    }
+  },
+  "DisableNoise": {
+    "display_name": "Desativar Ruído",
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "DualCFGGuider": {
+    "display_name": "Guia DualCFG",
+    "inputs": {
+      "cfg_cond2_negative": {
+        "name": "cfg_cond2_negativo"
+      },
+      "cfg_conds": {
+        "name": "cfg_conds"
+      },
+      "cond1": {
+        "name": "cond1"
+      },
+      "cond2": {
+        "name": "cond2"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "style": {
+        "name": "estilo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "DualCLIPLoader": {
+    "description": "[Receitas]\n\nsdxl: clip-l, clip-g\nsd3: clip-l, clip-g / clip-l, t5 / clip-g, t5\nflux: clip-l, t5\nhidream: pelo menos um de t5 ou llama, recomendado t5 e llama\nhunyuan_image: qwen2.5vl 7b e byt5 small\nnewbie: gemma-3-4b-it, jina clip v2",
+    "display_name": "Carregador DualCLIP",
+    "inputs": {
+      "clip_name1": {
+        "name": "clip_nome1"
+      },
+      "clip_name2": {
+        "name": "clip_nome2"
+      },
+      "device": {
+        "name": "dispositivo"
+      },
+      "type": {
+        "name": "tipo"
+      }
+    }
+  },
+  "EasyCache": {
+    "description": "Implementação nativa do EasyCache.",
+    "display_name": "EasyCache",
+    "inputs": {
+      "end_percent": {
+        "name": "percentual_final",
+        "tooltip": "A etapa relativa de amostragem para parar de usar o EasyCache."
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "O modelo ao qual adicionar o EasyCache."
+      },
+      "reuse_threshold": {
+        "name": "limite_de_reutilização",
+        "tooltip": "O limite para reutilizar etapas em cache."
+      },
+      "start_percent": {
+        "name": "percentual_inicial",
+        "tooltip": "A etapa relativa de amostragem para começar a usar o EasyCache."
+      },
+      "verbose": {
+        "name": "detalhado",
+        "tooltip": "Se deve registrar informações detalhadas."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "O modelo com EasyCache."
+      }
+    }
+  },
+  "ElevenLabsAudioIsolation": {
+    "description": "Remova o ruído de fundo do áudio, isolando vocais ou fala.",
+    "display_name": "ElevenLabs Isolamento de Voz",
+    "inputs": {
+      "audio": {
+        "name": "áudio",
+        "tooltip": "Áudio a ser processado para remoção de ruído de fundo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsInstantVoiceClone": {
+    "description": "Crie uma voz clonada a partir de amostras de áudio. Forneça de 1 a 8 gravações de áudio da voz a ser clonada.",
+    "display_name": "ElevenLabs Clonagem Instantânea de Voz",
+    "inputs": {
+      "files": {
+        "name": "arquivos",
+        "tooltip": "Gravações de áudio para clonagem de voz."
+      },
+      "remove_background_noise": {
+        "name": "remover_ruído_de_fundo",
+        "tooltip": "Remova o ruído de fundo das amostras de voz usando isolamento de áudio."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "voz",
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsSpeechToSpeech": {
+    "description": "Transforme a fala de uma voz para outra, preservando o conteúdo e a emoção originais.",
+    "display_name": "ElevenLabs Fala para Fala",
+    "inputs": {
+      "audio": {
+        "name": "áudio",
+        "tooltip": "Áudio de origem para transformar."
+      },
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Modelo a ser usado para transformação de fala para fala."
+      },
+      "model_similarity_boost": {
+        "name": "impulso_de_semelhança"
+      },
+      "model_speed": {
+        "name": "velocidade"
+      },
+      "model_style": {
+        "name": "estilo"
+      },
+      "model_use_speaker_boost": {
+        "name": "usar_impulso_de_falante"
+      },
+      "output_format": {
+        "name": "formato_de_saida",
+        "tooltip": "Formato de saída do áudio."
+      },
+      "remove_background_noise": {
+        "name": "remover_ruído_de_fundo",
+        "tooltip": "Remova o ruído de fundo do áudio de entrada usando isolamento de áudio."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "Semente para reprodutibilidade."
+      },
+      "stability": {
+        "name": "estabilidade",
+        "tooltip": "Estabilidade da voz. Valores mais baixos proporcionam maior variação emocional, valores mais altos produzem fala mais consistente, porém potencialmente monótona."
+      },
+      "voice": {
+        "name": "voz",
+        "tooltip": "Voz de destino para a transformação. Conecte a partir do Seletor de Voz ou Clonagem Instantânea de Voz."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsSpeechToText": {
+    "description": "Transcreva áudio para texto. Suporta detecção automática de idioma, diarização de locutores e marcação de eventos de áudio.",
+    "display_name": "ElevenLabs Fala para Texto",
+    "inputs": {
+      "audio": {
+        "name": "áudio",
+        "tooltip": "Áudio para transcrever."
+      },
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "language_code": {
+        "name": "código_idioma",
+        "tooltip": "Código de idioma ISO-639-1 ou ISO-639-3 (ex: 'en', 'es', 'fra'). Deixe em branco para detecção automática."
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Modelo a ser usado para transcrição."
+      },
+      "model_diarization_threshold": {
+        "name": "limiar_diarização"
+      },
+      "model_diarize": {
+        "name": "diarizar"
+      },
+      "model_tag_audio_events": {
+        "name": "marcar_eventos_áudio"
+      },
+      "model_temperature": {
+        "name": "temperatura"
+      },
+      "model_timestamps_granularity": {
+        "name": "granularidade_tempos"
+      },
+      "num_speakers": {
+        "name": "num_locs",
+        "tooltip": "Número máximo de locutores a prever. Defina como 0 para detecção automática."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "Semente para reprodutibilidade (não garante determinismo)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "texto",
+        "tooltip": null
+      },
+      "1": {
+        "name": "código_idioma",
+        "tooltip": null
+      },
+      "2": {
+        "name": "palavras_json",
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToDialogue": {
+    "description": "Gere diálogos com múltiplos locutores a partir de texto. Cada entrada de diálogo possui seu próprio texto e voz.",
+    "display_name": "ElevenLabs Texto para Diálogo",
+    "inputs": {
+      "apply_text_normalization": {
+        "name": "aplicar_normalização_texto",
+        "tooltip": "Modo de normalização de texto. 'auto' deixa o sistema decidir, 'on' sempre aplica normalização, 'off' pula a normalização."
+      },
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "inputs": {
+        "name": "entradas",
+        "tooltip": "Número de entradas de diálogo."
+      },
+      "inputs_text1": {
+        "name": "texto1"
+      },
+      "language_code": {
+        "name": "código_idioma",
+        "tooltip": "Código de idioma ISO-639-1 ou ISO-639-3 (ex: 'en', 'es', 'fra'). Deixe em branco para detecção automática."
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Modelo a ser usado para geração de diálogo."
+      },
+      "output_format": {
+        "name": "formato_saida",
+        "tooltip": "Formato de saída de áudio."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "Semente para reprodutibilidade."
+      },
+      "stability": {
+        "name": "estabilidade",
+        "tooltip": "Estabilidade da voz. Valores menores dão maior variação emocional, valores maiores produzem fala mais consistente, porém potencialmente monótona."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToSoundEffects": {
+    "description": "Gere efeitos sonoros a partir de descrições em texto.",
+    "display_name": "ElevenLabs Texto para Efeitos Sonoros",
+    "inputs": {
+      "model": {
+        "name": "modelo",
+        "tooltip": "Modelo a ser usado para geração de efeitos sonoros."
+      },
+      "model_duration": {
+        "name": "duração"
+      },
+      "model_loop": {
+        "name": "loop"
+      },
+      "model_prompt_influence": {
+        "name": "influência_prompt"
+      },
+      "output_format": {
+        "name": "formato_saida",
+        "tooltip": "Formato de saída de áudio."
+      },
+      "text": {
+        "name": "texto",
+        "tooltip": "Descrição em texto do efeito sonoro a ser gerado."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToSpeech": {
+    "description": "Converter texto em fala.",
+    "display_name": "ElevenLabs Text to Speech",
+    "inputs": {
+      "apply_text_normalization": {
+        "name": "aplicar normalização de texto",
+        "tooltip": "Modo de normalização de texto. 'auto' deixa o sistema decidir, 'on' sempre aplica a normalização, 'off' pula a normalização."
+      },
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "language_code": {
+        "name": "código do idioma",
+        "tooltip": "Código de idioma ISO-639-1 ou ISO-639-3 (ex: 'en', 'es', 'fra'). Deixe em branco para detecção automática."
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Modelo a ser usado para texto para fala."
+      },
+      "model_similarity_boost": {
+        "name": "impulso de similaridade"
+      },
+      "model_speed": {
+        "name": "velocidade"
+      },
+      "model_style": {
+        "name": "estilo"
+      },
+      "model_use_speaker_boost": {
+        "name": "usar impulso de locutor"
+      },
+      "output_format": {
+        "name": "formato de saída",
+        "tooltip": "Formato de saída do áudio."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "Semente para reprodutibilidade (determinismo não garantido)."
+      },
+      "stability": {
+        "name": "estabilidade",
+        "tooltip": "Estabilidade da voz. Valores mais baixos proporcionam maior variação emocional, valores mais altos produzem fala mais consistente, porém potencialmente monótona."
+      },
+      "text": {
+        "name": "texto",
+        "tooltip": "O texto a ser convertido em fala."
+      },
+      "voice": {
+        "name": "voz",
+        "tooltip": "Voz a ser usada para a síntese de fala. Conecte a partir do Seletor de Voz ou Instant Voice Clone."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsVoiceSelector": {
+    "description": "Selecione uma voz ElevenLabs predefinida para geração de texto para fala.",
+    "display_name": "Seletor de Voz ElevenLabs",
+    "inputs": {
+      "voice": {
+        "name": "voz",
+        "tooltip": "Escolha uma voz das vozes predefinidas do ElevenLabs."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "voz",
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyAceStep1_5LatentAudio": {
+    "display_name": "Empty Ace Step 1.5 Latent Audio",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote",
+        "tooltip": "O número de imagens latentes no lote."
+      },
+      "seconds": {
+        "name": "segundos"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyAceStepLatentAudio": {
+    "display_name": "Áudio Latente AceStep Vazio",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote",
+        "tooltip": "O número de imagens latentes no lote."
+      },
+      "seconds": {
+        "name": "segundos"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyAudio": {
+    "display_name": "Áudio Vazio",
+    "inputs": {
+      "channels": {
+        "name": "canais",
+        "tooltip": "Número de canais de áudio (1 para mono, 2 para estéreo)."
+      },
+      "duration": {
+        "name": "duração",
+        "tooltip": "Duração do áudio vazio em segundos"
+      },
+      "sample_rate": {
+        "name": "taxa_de_amostragem",
+        "tooltip": "Taxa de amostragem do áudio vazio."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyChromaRadianceLatentImage": {
+    "display_name": "EmptyChromaRadianceLatentImage",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyCosmosLatentVideo": {
+    "display_name": "EmptyCosmosLatentVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "duração"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyFlux2LatentImage": {
+    "display_name": "Empty Flux 2 Latent",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyHunyuanImageLatent": {
+    "display_name": "EmptyHunyuanImageLatent",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyHunyuanLatentVideo": {
+    "display_name": "Empty HunyuanVideo 1.0 Latent",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "duração"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyHunyuanVideo15Latent": {
+    "display_name": "Empty HunyuanVideo 1.5 Latent",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "duração"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyImage": {
+    "display_name": "EmptyImage",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "color": {
+        "name": "cor"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "width": {
+        "name": "largura"
+      }
+    }
+  },
+  "EmptyLTXVLatentVideo": {
+    "display_name": "EmptyLTXVLatentVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "comprimento"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyLatentAudio": {
+    "display_name": "Empty Latent Audio",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote",
+        "tooltip": "O número de imagens latentes no lote."
+      },
+      "seconds": {
+        "name": "segundos"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyLatentHunyuan3Dv2": {
+    "display_name": "EmptyLatentHunyuan3Dv2",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote",
+        "tooltip": "O número de imagens latentes no lote."
+      },
+      "resolution": {
+        "name": "resolução"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyLatentImage": {
+    "description": "Crie um novo lote de imagens latentes vazias para serem denoised via amostragem.",
+    "display_name": "Imagem Latente Vazia",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote",
+        "tooltip": "O número de imagens latentes no lote."
+      },
+      "height": {
+        "name": "altura",
+        "tooltip": "A altura das imagens latentes em pixels."
+      },
+      "width": {
+        "name": "largura",
+        "tooltip": "A largura das imagens latentes em pixels."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "O lote de imagens latentes vazias."
+      }
+    }
+  },
+  "EmptyMochiLatentVideo": {
+    "display_name": "EmptyMochiLatentVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "comprimento"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyQwenImageLayeredLatentImage": {
+    "display_name": "Imagem Latente em Camadas Qwen Vazia",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "layers": {
+        "name": "camadas"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "EmptySD3LatentImage": {
+    "display_name": "EmptySD3LatentImage",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Epsilon Scaling": {
+    "display_name": "Escalonamento Epsilon",
+    "inputs": {
+      "model": {
+        "name": "modelo"
+      },
+      "scaling_factor": {
+        "name": "fator_de_escalonamento"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ExponentialScheduler": {
+    "display_name": "Agendador Exponencial",
+    "inputs": {
+      "sigma_max": {
+        "name": "sigma_max"
+      },
+      "sigma_min": {
+        "name": "sigma_min"
+      },
+      "steps": {
+        "name": "passos"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ExtendIntermediateSigmas": {
+    "display_name": "Estender Sigmas Intermediários",
+    "inputs": {
+      "end_at_sigma": {
+        "name": "terminar_em_sigma"
+      },
+      "sigmas": {
+        "name": "sigmas"
+      },
+      "spacing": {
+        "name": "espaçamento"
+      },
+      "start_at_sigma": {
+        "name": "iniciar_em_sigma"
+      },
+      "steps": {
+        "name": "passos"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FeatherMask": {
+    "display_name": "FeatherMask",
+    "inputs": {
+      "bottom": {
+        "name": "inferior"
+      },
+      "left": {
+        "name": "esquerda"
+      },
+      "mask": {
+        "name": "mask"
+      },
+      "right": {
+        "name": "direita"
+      },
+      "top": {
+        "name": "topo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FlipSigmas": {
+    "display_name": "FlipSigmas",
+    "inputs": {
+      "sigmas": {
+        "name": "sigmas"
+      }
+    },
+    "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",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "images": {
+        "name": "imagens",
+        "tooltip": "Até 9 imagens para serem usadas como referência."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para geração ou edição da imagem"
+      },
+      "prompt_upsampling": {
+        "name": "upsampling do prompt",
+        "tooltip": "Se deve realizar upsampling no prompt. Se ativo, modifica automaticamente o prompt para uma geração mais criativa."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente aleatória usada para criar o ruído."
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Flux2ProImageNode": {
+    "description": "Gera imagens de forma síncrona com base no prompt e na resolução.",
+    "display_name": "Flux.2 [pro] Imagem",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "images": {
+        "name": "imagens",
+        "tooltip": "Até 9 imagens para serem usadas como referência."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para geração ou edição da imagem"
+      },
+      "prompt_upsampling": {
+        "name": "upsampling do prompt",
+        "tooltip": "Se deve realizar upsampling no prompt. Se ativo, modifica automaticamente o prompt para uma geração mais criativa."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente aleatória usada para criar o ruído."
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Flux2Scheduler": {
+    "display_name": "Flux2Scheduler",
+    "inputs": {
+      "height": {
+        "name": "altura"
+      },
+      "steps": {
+        "name": "etapas"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FluxDisableGuidance": {
+    "description": "Este nó desativa completamente o guidance embed no Flux e modelos similares ao Flux",
+    "display_name": "FluxDisableGuidance",
+    "inputs": {
+      "conditioning": {
+        "name": "condicionamento"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FluxGuidance": {
+    "display_name": "FluxGuidance",
+    "inputs": {
+      "conditioning": {
+        "name": "condicionamento"
+      },
+      "guidance": {
+        "name": "guidance"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FluxKontextImageScale": {
+    "description": "Este nó redimensiona a imagem para um tamanho mais ideal para flux kontext.",
+    "display_name": "FluxKontextImageScale",
+    "inputs": {
+      "image": {
+        "name": "imagem"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FluxKontextMaxImageNode": {
+    "description": "Edita imagens usando Flux.1 Kontext [pro] via API com base no prompt e na proporção.",
+    "display_name": "Flux.1 Kontext [max] Image",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "proporção",
+        "tooltip": "Proporção da imagem; deve estar entre 1:4 e 4:1."
+      },
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "guidance": {
+        "name": "orientação",
+        "tooltip": "Força da orientação para o processo de geração da imagem"
+      },
+      "input_image": {
+        "name": "imagem_de_entrada"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para a geração da imagem - especifique o que e como editar."
+      },
+      "prompt_upsampling": {
+        "name": "amostragem_do_prompt",
+        "tooltip": "Se deve realizar upsampling no prompt. Se ativo, modifica automaticamente o prompt para uma geração mais criativa, mas os resultados são não determinísticos (a mesma semente não produzirá exatamente o mesmo resultado)."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente aleatória usada para criar o ruído."
+      },
+      "steps": {
+        "name": "etapas",
+        "tooltip": "Número de etapas para o processo de geração da imagem"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FluxKontextMultiReferenceLatentMethod": {
+    "display_name": "Editar Método de Referência do Modelo",
+    "inputs": {
+      "conditioning": {
+        "name": "condicionamento"
+      },
+      "reference_latents_method": {
+        "name": "método_de_latent_de_referência"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FluxKontextProImageNode": {
+    "description": "Edita imagens usando Flux.1 Kontext [pro] via API com base no prompt e na proporção.",
+    "display_name": "Flux.1 Kontext [pro] Image",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "proporção",
+        "tooltip": "Proporção da imagem; deve estar entre 1:4 e 4:1."
+      },
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "guidance": {
+        "name": "orientação",
+        "tooltip": "Força da orientação para o processo de geração da imagem"
+      },
+      "input_image": {
+        "name": "imagem_de_entrada"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para a geração da imagem - especifique o que e como editar."
+      },
+      "prompt_upsampling": {
+        "name": "amostragem_do_prompt",
+        "tooltip": "Se deve realizar upsampling no prompt. Se ativo, modifica automaticamente o prompt para uma geração mais criativa, mas os resultados são não determinísticos (a mesma semente não produzirá exatamente o mesmo resultado)."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente aleatória usada para criar o ruído."
+      },
+      "steps": {
+        "name": "etapas",
+        "tooltip": "Número de etapas para o processo de geração da imagem"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FluxProExpandNode": {
+    "description": "Expande a imagem com base no prompt.",
+    "display_name": "Flux.1 Expandir Imagem",
+    "inputs": {
+      "bottom": {
+        "name": "inferior",
+        "tooltip": "Número de pixels para expandir na parte inferior da imagem"
+      },
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "guidance": {
+        "name": "orientação",
+        "tooltip": "Força da orientação para o processo de geração da imagem"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "left": {
+        "name": "esquerda",
+        "tooltip": "Número de pixels para expandir no lado esquerdo da imagem"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para a geração da imagem"
+      },
+      "prompt_upsampling": {
+        "name": "aumento de prompt",
+        "tooltip": "Se deve realizar upsampling no prompt. Se ativo, modifica automaticamente o prompt para uma geração mais criativa, mas os resultados são não determinísticos (a mesma semente não produzirá exatamente o mesmo resultado)."
+      },
+      "right": {
+        "name": "direita",
+        "tooltip": "Número de pixels para expandir no lado direito da imagem"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente aleatória usada para criar o ruído."
+      },
+      "steps": {
+        "name": "passos",
+        "tooltip": "Número de passos para o processo de geração da imagem"
+      },
+      "top": {
+        "name": "superior",
+        "tooltip": "Número de pixels para expandir na parte superior da imagem"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FluxProFillNode": {
+    "description": "Preenche a imagem com base na mask e no prompt.",
+    "display_name": "Flux.1 Preencher Imagem",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "guidance": {
+        "name": "orientação",
+        "tooltip": "Força da orientação para o processo de geração da imagem"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "mask": {
+        "name": "mask"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para a geração da imagem"
+      },
+      "prompt_upsampling": {
+        "name": "aumento de prompt",
+        "tooltip": "Se deve realizar upsampling no prompt. Se ativo, modifica automaticamente o prompt para uma geração mais criativa, mas os resultados são não determinísticos (a mesma semente não produzirá exatamente o mesmo resultado)."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente aleatória usada para criar o ruído."
+      },
+      "steps": {
+        "name": "passos",
+        "tooltip": "Número de passos para o processo de geração da imagem"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FluxProUltraImageNode": {
+    "description": "Gera imagens usando Flux Pro 1.1 Ultra via API com base no prompt e na resolução.",
+    "display_name": "Flux 1.1 [pro] Ultra Image",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "Proporção da imagem; deve estar entre 1:4 e 4:1."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image_prompt": {
+        "name": "image_prompt"
+      },
+      "image_prompt_strength": {
+        "name": "image_prompt_strength",
+        "tooltip": "Mistura entre o prompt e o image prompt."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para a geração da imagem"
+      },
+      "prompt_upsampling": {
+        "name": "prompt_upsampling",
+        "tooltip": "Se deve realizar upsampling no prompt. Se ativado, modifica automaticamente o prompt para uma geração mais criativa, mas os resultados são não determinísticos (a mesma seed não produzirá exatamente o mesmo resultado)."
+      },
+      "raw": {
+        "name": "raw",
+        "tooltip": "Quando Verdadeiro, gera imagens menos processadas e com aparência mais natural."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "A seed aleatória usada para criar o ruído."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FreSca": {
+    "description": "Aplica escalonamento dependente de frequência à orientação",
+    "display_name": "FreSca",
+    "inputs": {
+      "freq_cutoff": {
+        "name": "freq_cutoff",
+        "tooltip": "Número de índices de frequência ao redor do centro considerados como baixa frequência"
+      },
+      "model": {
+        "name": "model"
+      },
+      "scale_high": {
+        "name": "scale_high",
+        "tooltip": "Fator de escala para componentes de alta frequência"
+      },
+      "scale_low": {
+        "name": "scale_low",
+        "tooltip": "Fator de escala para componentes de baixa frequência"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FreeU": {
+    "display_name": "FreeU",
+    "inputs": {
+      "b1": {
+        "name": "b1"
+      },
+      "b2": {
+        "name": "b2"
+      },
+      "model": {
+        "name": "model"
+      },
+      "s1": {
+        "name": "s1"
+      },
+      "s2": {
+        "name": "s2"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FreeU_V2": {
+    "display_name": "FreeU_V2",
+    "inputs": {
+      "b1": {
+        "name": "b1"
+      },
+      "b2": {
+        "name": "b2"
+      },
+      "model": {
+        "name": "model"
+      },
+      "s1": {
+        "name": "s1"
+      },
+      "s2": {
+        "name": "s2"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GITSScheduler": {
+    "display_name": "GITSScheduler",
+    "inputs": {
+      "coeff": {
+        "name": "coeficiente"
+      },
+      "denoise": {
+        "name": "reduzir_ruído"
+      },
+      "steps": {
+        "name": "etapas"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GLIGENLoader": {
+    "display_name": "GLIGENLoader",
+    "inputs": {
+      "gligen_name": {
+        "name": "gligen_name"
+      }
+    }
+  },
+  "GLIGENTextBoxApply": {
+    "display_name": "GLIGENTextBoxApply",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "conditioning_to": {
+        "name": "conditioning_to"
+      },
+      "gligen_textbox_model": {
+        "name": "gligen_textbox_model"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "text": {
+        "name": "texto"
+      },
+      "width": {
+        "name": "largura"
+      },
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      }
+    }
+  },
+  "GLSLShader": {
+    "description": "Aplicar shaders de fragmento GLSL ES em imagens. u_resolution (vec2) está sempre disponível.",
+    "display_name": "GLSL Shader",
+    "inputs": {
+      "floats": {
+        "name": "floats",
+        "tooltip": "Floats estão disponíveis como u_float0-4 no código do shader"
+      },
+      "fragment_shader": {
+        "name": "fragment_shader",
+        "tooltip": "Código fonte do shader de fragmento GLSL (compatível com GLSL ES 3.00 / WebGL 2.0)"
+      },
+      "images": {
+        "name": "imagens",
+        "tooltip": "Imagens estão disponíveis como u_image0-4 (sampler2D) no código do shader"
+      },
+      "ints": {
+        "name": "ints",
+        "tooltip": "Ints estão disponíveis como u_int0-4 no código do shader"
+      },
+      "size_mode": {
+        "name": "modo_tamanho",
+        "tooltip": "Tamanho de saída: 'from_input' usa as dimensões da primeira imagem de entrada, 'custom' permite tamanho manual"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "IMAGEM0",
+        "tooltip": "Disponível via layout(location = 0) out vec4 fragColor0 no código do shader"
+      },
+      "1": {
+        "name": "IMAGEM1",
+        "tooltip": "Disponível via layout(location = 1) out vec4 fragColor1 no código do shader"
+      },
+      "2": {
+        "name": "IMAGEM2",
+        "tooltip": "Disponível via layout(location = 2) out vec4 fragColor2 no código do shader"
+      },
+      "3": {
+        "name": "IMAGEM3",
+        "tooltip": "Disponível via layout(location = 3) out vec4 fragColor3 no código do shader"
+      }
+    }
+  },
+  "GeminiImage2Node": {
+    "description": "Gere ou edite imagens de forma síncrona via Google Vertex API.",
+    "display_name": "Nano Banana Pro (Google Gemini Image)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "Se definido como 'auto', corresponde à proporção da imagem de entrada; se nenhuma imagem for fornecida, normalmente é gerado um quadrado 16:9."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "files": {
+        "name": "files",
+        "tooltip": "Arquivo(s) opcional(is) para usar como contexto para o modelo. Aceita entradas do nó Gemini Generate Content Input Files."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Imagem(ns) de referência opcional(is). Para incluir várias imagens, use o nó Batch Images (até 14)."
+      },
+      "model": {
+        "name": "model"
+      },
+      "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."
+      },
+      "resolution": {
+        "name": "resolution",
+        "tooltip": "Resolução de saída desejada. Para 2K/4K, o upscaler nativo do Gemini é utilizado."
+      },
+      "response_modalities": {
+        "name": "response_modalities",
+        "tooltip": "Escolha 'IMAGE' para saída somente de imagem, ou 'IMAGE+TEXT' para retornar tanto a imagem gerada quanto uma resposta em texto."
+      },
+      "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
+      }
+    }
+  },
+  "GeminiImageNode": {
+    "description": "Edite imagens de forma síncrona via Google API.",
+    "display_name": "Nano Banana (Google Gemini Image)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "Por padrão, corresponde ao tamanho da imagem de saída ao da sua imagem de entrada, ou gera quadrados 1:1."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "files": {
+        "name": "files",
+        "tooltip": "Arquivo(s) opcional(is) para usar como contexto para o modelo. Aceita entradas do nó Gemini Generate Content Input Files."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Imagem(ns) opcional(is) para usar como contexto para o modelo. Para incluir várias imagens, você pode usar o nó Batch Images."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "O modelo Gemini a ser usado para gerar respostas."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt de texto para geração"
+      },
+      "response_modalities": {
+        "name": "response_modalities",
+        "tooltip": "Escolha 'IMAGE' para saída somente de imagem, ou 'IMAGE+TEXT' para retornar tanto a imagem gerada quanto uma resposta em texto."
+      },
+      "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
+      }
+    }
+  },
+  "GeminiInputFiles": {
+    "description": "Carrega e prepara arquivos de entrada para incluir como inputs para os nós Gemini LLM. Os arquivos serão lidos pelo modelo Gemini ao gerar uma resposta. O conteúdo do arquivo de texto conta para o limite de tokens. 🛈 DICA: Pode ser encadeado com outros nós de Arquivo de Entrada Gemini.",
+    "display_name": "Arquivos de Entrada Gemini",
+    "inputs": {
+      "GEMINI_INPUT_FILES": {
+        "name": "GEMINI_INPUT_FILES",
+        "tooltip": "Um(s) arquivo(s) adicional(is) opcional(is) para agrupar junto com o arquivo carregado deste nó. Permite o encadeamento de arquivos de entrada para que uma única mensagem possa incluir múltiplos arquivos de entrada."
+      },
+      "file": {
+        "name": "arquivo",
+        "tooltip": "Arquivos de entrada para incluir como contexto para o modelo. Aceita apenas arquivos de texto (.txt) e PDF (.pdf) no momento."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GeminiNanoBanana2": {
+    "description": "Gere ou edite imagens de forma síncrona via Google Vertex API.",
+    "display_name": "Nano Banana 2",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "Se definido como 'auto', corresponde à proporção da imagem de entrada; se nenhuma imagem for fornecida, normalmente é gerado um quadrado 16:9."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "files": {
+        "name": "files",
+        "tooltip": "Arquivo(s) opcional(is) para usar como contexto para o modelo. Aceita entradas do nó Gemini Generate Content Input Files."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Imagem(ns) de referência opcional(is). Para incluir várias imagens, use o nó Batch Images (até 14)."
+      },
+      "model": {
+        "name": "model"
+      },
+      "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."
+      },
+      "resolution": {
+        "name": "resolution",
+        "tooltip": "Resolução de saída desejada. Para 2K/4K, o upscaler nativo do Gemini é utilizado."
+      },
+      "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."
+      },
+      "thinking_level": {
+        "name": "thinking_level"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
+  "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",
+    "inputs": {
+      "audio": {
+        "name": "áudio",
+        "tooltip": "Áudio opcional para usar como contexto para o modelo."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "files": {
+        "name": "arquivos",
+        "tooltip": "Arquivo(s) opcional(is) para usar como contexto para o modelo. Aceita entradas do nó Gemini Generate Content Input Files."
+      },
+      "images": {
+        "name": "imagens",
+        "tooltip": "Imagem(ns) opcional(is) para usar como contexto para o modelo. Para incluir múltiplas imagens, você pode usar o nó Batch Images."
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "O modelo Gemini a ser usado para gerar respostas."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Entradas de texto para o modelo, usadas para gerar uma resposta. Você pode incluir instruções detalhadas, perguntas ou contexto para o modelo."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "Quando a semente é fixada em um valor específico, o modelo faz o melhor esforço para fornecer a mesma resposta para 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 semente. Por padrão, é usada uma semente aleatória."
+      },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "Instruções fundamentais que ditam o comportamento da IA."
+      },
+      "video": {
+        "name": "vídeo",
+        "tooltip": "Vídeo opcional para usar como contexto para o modelo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GenerateTracks": {
+    "display_name": "GenerateTracks",
+    "inputs": {
+      "bezier": {
+        "name": "bezier",
+        "tooltip": "Habilitar caminho de curva Bezier usando o ponto médio como ponto de controle."
+      },
+      "end_x": {
+        "name": "fim_x",
+        "tooltip": "Coordenada X normalizada (0-1) para a posição final."
+      },
+      "end_y": {
+        "name": "fim_y",
+        "tooltip": "Coordenada Y normalizada (0-1) para a posição final."
+      },
+      "height": {
+        "name": "altura"
+      },
+      "interpolation": {
+        "name": "interpolação",
+        "tooltip": "Controla o tempo/velocidade do movimento ao longo do caminho."
+      },
+      "mid_x": {
+        "name": "meio_x",
+        "tooltip": "Ponto de controle X normalizado para a curva Bezier. Usado apenas quando 'bezier' está habilitado."
+      },
+      "mid_y": {
+        "name": "meio_y",
+        "tooltip": "Ponto de controle Y normalizado para a curva Bezier. Usado apenas quando 'bezier' está habilitado."
+      },
+      "num_frames": {
+        "name": "número_de_quadros"
+      },
+      "num_tracks": {
+        "name": "número_de_trilhas"
+      },
+      "start_x": {
+        "name": "início_x",
+        "tooltip": "Coordenada X normalizada (0-1) para a posição inicial."
+      },
+      "start_y": {
+        "name": "início_y",
+        "tooltip": "Coordenada Y normalizada (0-1) para a posição inicial."
+      },
+      "track_mask": {
+        "name": "máscara_de_trilha",
+        "tooltip": "Máscara opcional para indicar quadros visíveis."
+      },
+      "track_spread": {
+        "name": "dispersão_de_trilhas",
+        "tooltip": "Distância normalizada entre as trilhas. As trilhas são distribuídas perpendicularmente à direção do movimento."
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "comprimento_da_trilha",
+        "tooltip": null
+      }
+    }
+  },
+  "GetImageSize": {
+    "description": "Retorna a largura e altura da imagem, e a repassa inalterada.",
+    "display_name": "Obter Tamanho da Imagem",
+    "inputs": {
+      "image": {
+        "name": "imagem"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "largura",
+        "tooltip": null
+      },
+      "1": {
+        "name": "altura",
+        "tooltip": null
+      },
+      "2": {
+        "name": "tamanho_do_lote",
+        "tooltip": null
+      }
+    }
+  },
+  "GetVideoComponents": {
+    "description": "Extrai todos os componentes de um vídeo: quadros, áudio e taxa de quadros.",
+    "display_name": "Obter Componentes do Vídeo",
+    "inputs": {
+      "video": {
+        "name": "vídeo",
+        "tooltip": "O vídeo do qual extrair os componentes."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "imagens",
+        "tooltip": null
+      },
+      "1": {
+        "name": "áudio",
+        "tooltip": null
+      },
+      "2": {
+        "name": "fps",
+        "tooltip": null
+      }
+    }
+  },
+  "GrokImageEditNode": {
+    "description": "Modifique uma imagem existente com base em um prompt de texto",
+    "display_name": "Grok Image Edit",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "proporção",
+        "tooltip": "Só é permitido quando várias imagens estão conectadas à entrada de imagem."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "number_of_images": {
+        "name": "number_of_images",
+        "tooltip": "Número de imagens editadas a serem geradas"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "O prompt de texto usado para gerar a imagem"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed para determinar se o nó deve ser executado novamente; os resultados reais são não determinísticos independentemente da seed."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokImageNode": {
+    "description": "Gere imagens usando Grok com base em um prompt de texto",
+    "display_name": "Grok Image",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "number_of_images": {
+        "name": "number_of_images",
+        "tooltip": "Número de imagens a serem geradas"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "O prompt de texto usado para gerar a imagem"
+      },
+      "resolution": {
+        "name": "resolução"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed para determinar se o nó deve ser executado novamente; os resultados reais são não determinísticos independentemente da seed."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokVideoEditNode": {
+    "description": "Edite um vídeo existente com base em um prompt de texto.",
+    "display_name": "Grok Video Edit",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Descrição em texto do vídeo desejado."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed para determinar se o nó deve ser executado novamente; os resultados reais são não determinísticos independentemente da seed."
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "A duração máxima suportada é de 8,7 segundos e o tamanho máximo do arquivo é 50MB."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokVideoNode": {
+    "description": "Gere vídeo a partir de um prompt ou de uma imagem",
+    "display_name": "Grok Video",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "A proporção do vídeo de saída."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration": {
+        "name": "duration",
+        "tooltip": "A duração do vídeo de saída em segundos."
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Descrição em texto do vídeo desejado."
+      },
+      "resolution": {
+        "name": "resolution",
+        "tooltip": "A resolução do vídeo de saída."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed para determinar se o nó deve ser executado novamente; os resultados reais são não determinísticos independentemente da seed."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrowMask": {
+    "display_name": "Expandir Máscara",
+    "inputs": {
+      "expand": {
+        "name": "expandir"
+      },
+      "mask": {
+        "name": "máscara"
+      },
+      "tapered_corners": {
+        "name": "cantos arredondados"
+      }
+    },
+    "outputs": {
+      "0": {
+        "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",
+    "inputs": {
+      "auto_downscale": {
+        "name": "auto_redimensionar",
+        "tooltip": "Redimensiona automaticamente a imagem de entrada se a saída exceder o limite."
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "upscale_factor": {
+        "name": "fator_de_upscale"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HitPawVideoEnhance": {
+    "description": "Aumente vídeos de baixa resolução para alta resolução, eliminando artefatos e ruídos. Os preços exibidos são por segundo de vídeo.",
+    "display_name": "HitPaw Video Enhance",
+    "inputs": {
+      "model": {
+        "name": "modelo"
+      },
+      "model_resolution": {
+        "name": "resolução"
+      },
+      "video": {
+        "name": "vídeo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Hunyuan3Dv2Conditioning": {
+    "display_name": "Hunyuan3Dv2Conditioning",
+    "inputs": {
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      }
+    }
+  },
+  "Hunyuan3Dv2ConditioningMultiView": {
+    "display_name": "Hunyuan3Dv2ConditioningMultiView",
+    "inputs": {
+      "back": {
+        "name": "trás"
+      },
+      "front": {
+        "name": "frente"
+      },
+      "left": {
+        "name": "esquerda"
+      },
+      "right": {
+        "name": "direita"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      }
+    }
+  },
+  "HunyuanImageToVideo": {
+    "display_name": "HunyuanImageToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "guidance_type": {
+        "name": "tipo_de_guia"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "duração"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "start_image": {
+        "name": "imagem_inicial"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "latente",
+        "tooltip": null
+      }
+    }
+  },
+  "HunyuanRefinerLatent": {
+    "display_name": "HunyuanRefinerLatent",
+    "inputs": {
+      "latent": {
+        "name": "latente"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "noise_augmentation": {
+        "name": "aumento_de_ruído"
+      },
+      "positive": {
+        "name": "positivo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latente",
+        "tooltip": null
+      }
+    }
+  },
+  "HunyuanVideo15ImageToVideo": {
+    "display_name": "HunyuanVideo15ImageToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "duração"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "start_image": {
+        "name": "imagem_inicial"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latente",
+        "tooltip": null
+      }
+    }
+  },
+  "HunyuanVideo15LatentUpscaleWithModel": {
+    "display_name": "Hunyuan Video 15 Latent Upscale With Model",
+    "inputs": {
+      "crop": {
+        "name": "corte"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "samples": {
+        "name": "amostras"
+      },
+      "upscale_method": {
+        "name": "método_de_upscale"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HunyuanVideo15SuperResolution": {
+    "display_name": "HunyuanVideo15SuperResolution",
+    "inputs": {
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "latent": {
+        "name": "latente"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "noise_augmentation": {
+        "name": "aumento_de_ruído"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "start_image": {
+        "name": "imagem_inicial"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latente",
+        "tooltip": null
+      }
+    }
+  },
+  "HyperTile": {
+    "display_name": "HyperTile",
+    "inputs": {
+      "max_depth": {
+        "name": "profundidade_máxima"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "scale_depth": {
+        "name": "escala_de_profundidade"
+      },
+      "swap_size": {
+        "name": "tamanho_da_troca"
+      },
+      "tile_size": {
+        "name": "tamanho_do_tile"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HypernetworkLoader": {
+    "display_name": "HypernetworkLoader",
+    "inputs": {
+      "hypernetwork_name": {
+        "name": "nome_da_hypernetwork"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "strength": {
+        "name": "força"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "IdeogramV1": {
+    "description": "Gera imagens usando o modelo Ideogram V1.",
+    "display_name": "Ideogram V1",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "A proporção da imagem para geração."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "magic_prompt_option": {
+        "name": "magic_prompt_option",
+        "tooltip": "Determina se o MagicPrompt deve ser usado na geração"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Descrição do que deve ser excluído da imagem"
+      },
+      "num_images": {
+        "name": "num_images"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para a geração da imagem"
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "turbo": {
+        "name": "turbo",
+        "tooltip": "Se deve usar o modo turbo (geração mais rápida, potencialmente menor qualidade)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "IdeogramV2": {
+    "description": "Gera imagens usando o modelo Ideogram V2.",
+    "display_name": "Ideogram V2",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "A proporção da imagem para geração. Ignorado se a resolução não estiver definida como AUTO."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "magic_prompt_option": {
+        "name": "magic_prompt_option",
+        "tooltip": "Determina se o MagicPrompt deve ser usado na geração"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Descrição do que deve ser excluído da imagem"
+      },
+      "num_images": {
+        "name": "num_images"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para a geração da imagem"
+      },
+      "resolution": {
+        "name": "resolution",
+        "tooltip": "A resolução para geração da imagem. Se não estiver definida como AUTO, esta opção sobrescreve a configuração de aspect_ratio."
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "style_type": {
+        "name": "style_type",
+        "tooltip": "Tipo de estilo para geração (apenas V2)"
+      },
+      "turbo": {
+        "name": "turbo",
+        "tooltip": "Se deve usar o modo turbo (geração mais rápida, potencialmente menor qualidade)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "IdeogramV3": {
+    "description": "Gera imagens usando o modelo Ideogram V3. Suporta tanto a geração de imagens a partir de prompts de texto quanto a edição de imagens com máscara.",
+    "display_name": "Ideogram V3",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "proporção",
+        "tooltip": "A proporção para geração de imagem. Ignorado se a resolução não estiver definida como Automática."
+      },
+      "character_image": {
+        "name": "imagem_personagem",
+        "tooltip": "Imagem para usar como referência de personagem."
+      },
+      "character_mask": {
+        "name": "máscara_personagem",
+        "tooltip": "Máscara opcional para a imagem de referência do personagem."
+      },
+      "control_after_generate": {
+        "name": "controle_após_gerar"
+      },
+      "image": {
+        "name": "imagem",
+        "tooltip": "Imagem de referência opcional para edição de imagem."
+      },
+      "magic_prompt_option": {
+        "name": "opção_magic_prompt",
+        "tooltip": "Determina se o MagicPrompt deve ser usado na geração"
+      },
+      "mask": {
+        "name": "máscara",
+        "tooltip": "Máscara opcional para inpainting (áreas brancas serão substituídas)"
+      },
+      "num_images": {
+        "name": "número_de_imagens"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para geração ou edição de imagem"
+      },
+      "rendering_speed": {
+        "name": "velocidade_de_renderização",
+        "tooltip": "Controla o equilíbrio entre velocidade de geração e qualidade"
+      },
+      "resolution": {
+        "name": "resolução",
+        "tooltip": "A resolução para geração de imagem. Se não estiver definida como Automática, esta opção sobrescreve a configuração de proporção."
+      },
+      "seed": {
+        "name": "semente"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageAddNoise": {
+    "display_name": "Adicionar Ruído à Imagem",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle_após_gerar"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente aleatória usada para criar o ruído."
+      },
+      "strength": {
+        "name": "intensidade"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageBatch": {
+    "display_name": "Imagens em Lote",
+    "inputs": {
+      "image1": {
+        "name": "imagem1"
+      },
+      "image2": {
+        "name": "imagem2"
+      }
+    }
+  },
+  "ImageBlend": {
+    "display_name": "Misturar Imagens",
+    "inputs": {
+      "blend_factor": {
+        "name": "fator_de_mistura"
+      },
+      "blend_mode": {
+        "name": "modo_de_mistura"
+      },
+      "image1": {
+        "name": "imagem1"
+      },
+      "image2": {
+        "name": "imagem2"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageBlur": {
+    "display_name": "Desfoque de Imagem",
+    "inputs": {
+      "blur_radius": {
+        "name": "raio_de_desfoque"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "sigma": {
+        "name": "sigma"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageColorToMask": {
+    "display_name": "Cor da Imagem para Máscara",
+    "inputs": {
+      "color": {
+        "name": "cor"
+      },
+      "image": {
+        "name": "imagem"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageCompare": {
+    "description": "Compara duas imagens lado a lado com um controle deslizante.",
+    "display_name": "Comparar Imagens",
+    "inputs": {
+      "compare_view": {
+        "name": "compare_view"
+      },
+      "image_a": {
+        "name": "imagem_a"
+      },
+      "image_b": {
+        "name": "imagem_b"
+      }
+    }
+  },
+  "ImageCompositeMasked": {
+    "display_name": "Composição de Imagem com Máscara",
+    "inputs": {
+      "destination": {
+        "name": "destino"
+      },
+      "mask": {
+        "name": "máscara"
+      },
+      "resize_source": {
+        "name": "redimensionar_fonte"
+      },
+      "source": {
+        "name": "fonte"
+      },
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageCrop": {
+    "display_name": "Cortar Imagem",
+    "inputs": {
+      "height": {
+        "name": "altura"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "width": {
+        "name": "largura"
+      },
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageCropV2": {
+    "display_name": "Corte de Imagem",
+    "inputs": {
+      "crop_region": {
+        "name": "região_de_corte"
+      },
+      "height": {},
+      "image": {
+        "name": "imagem"
+      },
+      "width": {},
+      "x": {},
+      "y": {}
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageDeduplication": {
+    "display_name": "Remover Duplicatas de Imagem",
+    "inputs": {
+      "images": {
+        "name": "imagens",
+        "tooltip": "Lista de imagens para processar."
+      },
+      "similarity_threshold": {
+        "name": "limite_de_semelhança",
+        "tooltip": "Limite de semelhança (0-1). Quanto maior, mais semelhantes. Imagens acima deste limite são consideradas duplicatas."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "imagens",
+        "tooltip": "Imagens processadas"
+      }
+    }
+  },
+  "ImageFlip": {
+    "display_name": "Espelhar Imagem",
+    "inputs": {
+      "flip_method": {
+        "name": "método_de_espelhamento"
+      },
+      "image": {
+        "name": "imagem"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageFromBatch": {
+    "display_name": "Imagem do Lote",
+    "inputs": {
+      "batch_index": {
+        "name": "índice_do_lote"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "length": {
+        "name": "comprimento"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageGrid": {
+    "display_name": "Grade de Imagens",
+    "inputs": {
+      "cell_height": {
+        "name": "altura_da_célula",
+        "tooltip": "Altura de cada célula na grade."
+      },
+      "cell_width": {
+        "name": "largura_da_célula",
+        "tooltip": "Largura de cada célula na grade."
+      },
+      "columns": {
+        "name": "colunas",
+        "tooltip": "Número de colunas na grade."
+      },
+      "images": {
+        "name": "imagens",
+        "tooltip": "Lista de imagens para processar."
+      },
+      "padding": {
+        "name": "espaçamento",
+        "tooltip": "Espaçamento entre as imagens."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "imagens",
+        "tooltip": "Imagens processadas"
+      }
+    }
+  },
+  "ImageInvert": {
+    "display_name": "Inverter Imagem",
+    "inputs": {
+      "image": {
+        "name": "imagem"
+      }
+    }
+  },
+  "ImageMergeTileList": {
+    "display_name": "Mesclar Lista de Blocos em Imagem",
+    "inputs": {
+      "final_height": {
+        "name": "final_height"
+      },
+      "final_width": {
+        "name": "final_width"
+      },
+      "image_list": {
+        "name": "image_list"
+      },
+      "overlap": {
+        "name": "overlap"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageOnlyCheckpointLoader": {
+    "display_name": "Carregador de Checkpoint Somente Imagem (modelo img2vid)",
+    "inputs": {
+      "ckpt_name": {
+        "name": "nome_do_ckpt"
+      }
+    }
+  },
+  "ImageOnlyCheckpointSave": {
+    "display_name": "Salvar Checkpoint Somente Imagem",
+    "inputs": {
+      "clip_vision": {
+        "name": "clip_vision"
+      },
+      "filename_prefix": {
+        "name": "prefixo_do_arquivo"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
+  "ImagePadForOutpaint": {
+    "display_name": "Adicionar Bordas para Outpainting",
+    "inputs": {
+      "bottom": {
+        "name": "inferior"
+      },
+      "feathering": {
+        "name": "suavização"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "left": {
+        "name": "esquerda"
+      },
+      "right": {
+        "name": "direita"
+      },
+      "top": {
+        "name": "superior"
+      }
+    }
+  },
+  "ImageQuantize": {
+    "display_name": "Quantizar Imagem",
+    "inputs": {
+      "colors": {
+        "name": "cores"
+      },
+      "dither": {
+        "name": "dithering"
+      },
+      "image": {
+        "name": "imagem"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageRGBToYUV": {
+    "display_name": "Converter RGB para YUV",
+    "inputs": {
+      "image": {
+        "name": "imagem"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Y",
+        "tooltip": null
+      },
+      "1": {
+        "name": "U",
+        "tooltip": null
+      },
+      "2": {
+        "name": "V",
+        "tooltip": null
+      }
+    }
+  },
+  "ImageRotate": {
+    "display_name": "Rotacionar Imagem",
+    "inputs": {
+      "image": {
+        "name": "imagem"
+      },
+      "rotation": {
+        "name": "rotação"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageScale": {
+    "display_name": "Aumentar Resolução da Imagem",
+    "inputs": {
+      "crop": {
+        "name": "cortar"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "upscale_method": {
+        "name": "método de upscaling"
+      },
+      "width": {
+        "name": "largura"
+      }
+    }
+  },
+  "ImageScaleBy": {
+    "display_name": "Aumentar Imagem Por",
+    "inputs": {
+      "image": {
+        "name": "imagem"
+      },
+      "scale_by": {
+        "name": "fator de escala"
+      },
+      "upscale_method": {
+        "name": "método de upscaling"
+      }
+    }
+  },
+  "ImageScaleToMaxDimension": {
+    "display_name": "Redimensionar Imagem para Dimensão Máxima",
+    "inputs": {
+      "image": {
+        "name": "imagem"
+      },
+      "largest_size": {
+        "name": "maior tamanho"
+      },
+      "upscale_method": {
+        "name": "método de upscaling"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageScaleToTotalPixels": {
+    "display_name": "Redimensionar Imagem para Total de Pixels",
+    "inputs": {
+      "image": {
+        "name": "imagem"
+      },
+      "megapixels": {
+        "name": "megapixels"
+      },
+      "resolution_steps": {
+        "name": "etapas de resolução"
+      },
+      "upscale_method": {
+        "name": "método de upscaling"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageSharpen": {
+    "display_name": "Aumentar Nitidez da Imagem",
+    "inputs": {
+      "alpha": {
+        "name": "alfa"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "sharpen_radius": {
+        "name": "raio de nitidez"
+      },
+      "sigma": {
+        "name": "sigma"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageStitch": {
+    "description": "Costura a imagem2 na imagem1 na direção especificada.\nSe a imagem2 não for fornecida, retorna a imagem1 inalterada.\nUm espaçamento opcional pode ser adicionado entre as imagens.",
+    "display_name": "Costurar Imagem",
+    "inputs": {
+      "direction": {
+        "name": "direção"
+      },
+      "image1": {
+        "name": "imagem1"
+      },
+      "image2": {
+        "name": "imagem2"
+      },
+      "match_image_size": {
+        "name": "ajustar_tamanho_imagem"
+      },
+      "spacing_color": {
+        "name": "cor_espacamento"
+      },
+      "spacing_width": {
+        "name": "largura_espacamento"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageToMask": {
+    "display_name": "Converter Imagem em Máscara",
+    "inputs": {
+      "channel": {
+        "name": "canal"
+      },
+      "image": {
+        "name": "imagem"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageUpscaleWithModel": {
+    "display_name": "Aumentar Resolução da Imagem (usando Modelo)",
+    "inputs": {
+      "image": {
+        "name": "imagem"
+      },
+      "upscale_model": {
+        "name": "modelo_upscale"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageYUVToRGB": {
+    "display_name": "ImageYUVToRGB",
+    "inputs": {
+      "U": {
+        "name": "U"
+      },
+      "V": {
+        "name": "V"
+      },
+      "Y": {
+        "name": "Y"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "InpaintModelConditioning": {
+    "display_name": "InpaintModelConditioning",
+    "inputs": {
+      "mask": {
+        "name": "máscara"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "noise_mask": {
+        "name": "máscara_ruído",
+        "tooltip": "Adiciona uma máscara de ruído ao latent para que a amostragem ocorra apenas dentro da máscara. Pode melhorar os resultados ou causar falhas dependendo do modelo."
+      },
+      "pixels": {
+        "name": "pixels"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo"
+      },
+      "1": {
+        "name": "negativo"
+      },
+      "2": {
+        "name": "latent"
+      }
+    }
+  },
+  "InstructPixToPixConditioning": {
+    "display_name": "InstructPixToPixConditioning",
+    "inputs": {
+      "negative": {
+        "name": "negativo"
+      },
+      "pixels": {
+        "name": "pixels"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "InvertMask": {
+    "display_name": "Inverter Máscara",
+    "inputs": {
+      "mask": {
+        "name": "máscara"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "JoinAudioChannels": {
+    "description": "Une os canais de áudio mono esquerdo e direito em um áudio estéreo.",
+    "display_name": "Unir Canais de Áudio",
+    "inputs": {
+      "audio_left": {
+        "name": "áudio_esquerdo"
+      },
+      "audio_right": {
+        "name": "áudio_direito"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "áudio",
+        "tooltip": null
+      }
+    }
+  },
+  "JoinImageWithAlpha": {
+    "display_name": "Unir Imagem com Alfa",
+    "inputs": {
+      "alpha": {
+        "name": "alfa"
+      },
+      "image": {
+        "name": "imagem"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KSampler": {
+    "description": "Usa o modelo fornecido, condicionamento positivo e negativo para remover o ruído da imagem latente.",
+    "display_name": "KSampler",
+    "inputs": {
+      "cfg": {
+        "name": "cfg",
+        "tooltip": "A escala de Classifier-Free Guidance equilibra criatividade e aderência ao prompt. Valores mais altos resultam em imagens mais próximas do prompt, porém valores muito altos podem impactar negativamente a qualidade."
+      },
+      "control_after_generate": {
+        "name": "controlar após gerar"
+      },
+      "denoise": {
+        "name": "denoise",
+        "tooltip": "A quantidade de remoção de ruído aplicada; valores menores mantêm a estrutura da imagem inicial, permitindo amostragem de imagem para imagem."
+      },
+      "latent_image": {
+        "name": "imagem_latente",
+        "tooltip": "A imagem latente a ser denoised."
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "O modelo utilizado para remover o ruído do latent de entrada."
+      },
+      "negative": {
+        "name": "negativo",
+        "tooltip": "O condicionamento que descreve os atributos que você deseja excluir da imagem."
+      },
+      "positive": {
+        "name": "positivo",
+        "tooltip": "O condicionamento que descreve os atributos que você deseja incluir na imagem."
+      },
+      "sampler_name": {
+        "name": "nome_do_sampler",
+        "tooltip": "O algoritmo utilizado na amostragem, isso pode afetar a qualidade, velocidade e estilo do resultado gerado."
+      },
+      "scheduler": {
+        "name": "agendador",
+        "tooltip": "O agendador controla como o ruído é gradualmente removido para formar a imagem."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente aleatória usada para criar o ruído."
+      },
+      "steps": {
+        "name": "passos",
+        "tooltip": "O número de passos usados no processo de remoção de ruído."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "O latent denoised."
+      }
+    }
+  },
+  "KSamplerAdvanced": {
+    "display_name": "KSampler (Avançado)",
+    "inputs": {
+      "add_noise": {
+        "name": "adicionar_ruído"
+      },
+      "cfg": {
+        "name": "cfg"
+      },
+      "control_after_generate": {
+        "name": "controlar após gerar"
+      },
+      "end_at_step": {
+        "name": "terminar_no_passo"
+      },
+      "latent_image": {
+        "name": "imagem_latente"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "noise_seed": {
+        "name": "semente_do_ruído"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "return_with_leftover_noise": {
+        "name": "retornar_com_ruído_restante"
+      },
+      "sampler_name": {
+        "name": "nome_do_sampler"
+      },
+      "scheduler": {
+        "name": "agendador"
+      },
+      "start_at_step": {
+        "name": "iniciar_no_passo"
+      },
+      "steps": {
+        "name": "passos"
+      }
+    }
+  },
+  "KSamplerSelect": {
+    "display_name": "KSamplerSelect",
+    "inputs": {
+      "sampler_name": {
+        "name": "nome_do_sampler"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Kandinsky5ImageToVideo": {
+    "display_name": "Kandinsky5ImageToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "duração"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "start_image": {
+        "name": "imagem_inicial"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latente",
+        "tooltip": "Latente de vídeo vazio"
+      },
+      "3": {
+        "name": "latente_cond",
+        "tooltip": "Imagens iniciais codificadas limpas, usadas para substituir o início ruidoso dos latentes de saída do modelo"
+      }
+    }
+  },
+  "KarrasScheduler": {
+    "display_name": "KarrasScheduler",
+    "inputs": {
+      "rho": {
+        "name": "rho"
+      },
+      "sigma_max": {
+        "name": "sigma_max"
+      },
+      "sigma_min": {
+        "name": "sigma_min"
+      },
+      "steps": {
+        "name": "etapas"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingAvatarNode": {
+    "description": "Gere vídeos de humanos digitais em estilo de transmissão a partir de uma única foto e um arquivo de áudio.",
+    "display_name": "Kling Avatar 2.0",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar após gerar"
+      },
+      "image": {
+        "name": "imagem",
+        "tooltip": "Imagem de referência do avatar. A largura e a altura devem ser de pelo menos 300px. A proporção deve estar entre 1:2.5 e 2.5:1."
+      },
+      "mode": {
+        "name": "modo"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt opcional para definir ações, emoções e movimentos de câmera do avatar."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente controla se o nó deve ser executado novamente; os resultados são não determinísticos independentemente da semente."
+      },
+      "sound_file": {
+        "name": "arquivo_de_áudio",
+        "tooltip": "Entrada de áudio. Deve ter entre 2 e 300 segundos de duração."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingCameraControlI2VNode": {
+    "description": "Transforme imagens estáticas em vídeos cinematográficos com movimentos de câmera profissionais que simulam a cinematografia do mundo real. Controle ações virtuais da câmera, incluindo zoom, rotação, panorâmica, inclinação e visão em primeira pessoa, mantendo o foco na sua imagem original.",
+    "display_name": "Kling Imagem para Vídeo (Controle de Câmera)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "proporcao"
+      },
+      "camera_control": {
+        "name": "controle_de_camera",
+        "tooltip": "Pode ser criado usando o nó Kling Camera Controls. Controla o movimento e a ação da câmera durante a geração do vídeo."
+      },
+      "cfg_scale": {
+        "name": "cfg_scale"
+      },
+      "negative_prompt": {
+        "name": "prompt_negativo",
+        "tooltip": "Prompt de texto negativo"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt de texto positivo"
+      },
+      "start_frame": {
+        "name": "quadro_inicial",
+        "tooltip": "Imagem de referência - URL ou string codificada em Base64, não pode exceder 10MB, resolução não inferior a 300*300px, proporção entre 1:2.5 ~ 2.5:1. Base64 não deve incluir o prefixo data:image."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "id_video",
+        "tooltip": null
+      },
+      "2": {
+        "name": "duracao",
+        "tooltip": null
+      }
+    }
+  },
+  "KlingCameraControlT2VNode": {
+    "description": "Transforme texto em vídeos cinematográficos com movimentos de câmera profissionais que simulam a cinematografia do mundo real. Controle ações da câmera virtual incluindo zoom, rotação, pan, tilt e visão em primeira pessoa, mantendo o foco no seu texto original.",
+    "display_name": "Kling Texto para Vídeo (Controle de Câmera)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "camera_control": {
+        "name": "camera_control",
+        "tooltip": "Pode ser criado usando o nó Controles de Câmera Kling. Controla o movimento e a ação da câmera durante a geração do vídeo."
+      },
+      "cfg_scale": {
+        "name": "cfg_scale"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Prompt de texto negativo"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt de texto positivo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "video_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "duration",
+        "tooltip": null
+      }
+    }
+  },
+  "KlingCameraControls": {
+    "description": "Permite especificar opções de configuração para os Controles de Câmera Kling e efeitos de controle de movimento.",
+    "display_name": "Controles de Câmera Kling",
+    "inputs": {
+      "camera_control_type": {
+        "name": "camera_control_type"
+      },
+      "horizontal_movement": {
+        "name": "horizontal_movement",
+        "tooltip": "Controla o movimento da câmera ao longo do eixo horizontal (eixo x). Negativo indica para a esquerda, positivo indica para a direita"
+      },
+      "pan": {
+        "name": "pan",
+        "tooltip": "Controla a rotação da câmera no plano vertical (eixo x). Negativo indica rotação para baixo, positivo indica rotação para cima."
+      },
+      "roll": {
+        "name": "roll",
+        "tooltip": "Controla a quantidade de rotação da câmera (eixo z). Negativo indica sentido anti-horário, positivo indica sentido horário."
+      },
+      "tilt": {
+        "name": "tilt",
+        "tooltip": "Controla a rotação da câmera no plano horizontal (eixo y). Negativo indica rotação para a esquerda, positivo indica rotação para a direita."
+      },
+      "vertical_movement": {
+        "name": "vertical_movement",
+        "tooltip": "Controla o movimento da câmera ao longo do eixo vertical (eixo y). Negativo indica para baixo, positivo indica para cima."
+      },
+      "zoom": {
+        "name": "zoom",
+        "tooltip": "Controla a alteração da distância focal da câmera. Negativo indica campo de visão mais estreito, positivo indica campo de visão mais amplo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "camera_control",
+        "tooltip": null
+      }
+    }
+  },
+  "KlingDualCharacterVideoEffectNode": {
+    "description": "Alcance diferentes efeitos especiais ao gerar um vídeo com base no effect_scene. A primeira imagem será posicionada no lado esquerdo, a segunda no lado direito da composição.",
+    "display_name": "Efeitos de Vídeo com Dois Personagens Kling",
+    "inputs": {
+      "duration": {
+        "name": "duration"
+      },
+      "effect_scene": {
+        "name": "effect_scene"
+      },
+      "image_left": {
+        "name": "image_left",
+        "tooltip": "Imagem do lado esquerdo"
+      },
+      "image_right": {
+        "name": "image_right",
+        "tooltip": "Imagem do lado direito"
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "model_name": {
+        "name": "model_name"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "duration",
+        "tooltip": null
+      }
+    }
+  },
+  "KlingFirstLastFrameNode": {
+    "description": "Gere vídeos com Kling V3 usando o primeiro e o último frame.",
+    "display_name": "Kling 3.0 Primeiro-Último-Frame para Vídeo",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar após gerar"
+      },
+      "duration": {
+        "name": "duração"
+      },
+      "end_frame": {
+        "name": "último_frame"
+      },
+      "first_frame": {
+        "name": "primeiro_frame"
+      },
+      "generate_audio": {
+        "name": "gerar_áudio"
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Configurações de modelo e geração."
+      },
+      "model_resolution": {
+        "name": "resolução"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente controla se o nó deve ser executado novamente; os resultados são não determinísticos independentemente da semente."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingImage2VideoNode": {
+    "display_name": "Kling Imagem (Primeiro Quadro) para Vídeo",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "cfg_scale": {
+        "name": "cfg_scale"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Prompt de texto negativo"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt de texto positivo"
+      },
+      "start_frame": {
+        "name": "start_frame",
+        "tooltip": "A imagem de referência usada para gerar o vídeo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "video_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "duration",
+        "tooltip": null
+      }
+    }
+  },
+  "KlingImageGenerationNode": {
+    "description": "Nó de Geração de Imagem Kling. Gere uma imagem a partir de um prompt de texto com uma imagem de referência opcional.",
+    "display_name": "Geração de Imagem Kling",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "controlar após gerar"
+      },
+      "human_fidelity": {
+        "name": "human_fidelity",
+        "tooltip": "Similaridade de referência do sujeito"
+      },
+      "image": {
+        "name": "image"
+      },
+      "image_fidelity": {
+        "name": "image_fidelity",
+        "tooltip": "Intensidade de referência para imagens enviadas pelo usuário"
+      },
+      "image_type": {
+        "name": "image_type"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "Número de imagens geradas"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Prompt de texto negativo"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt de texto positivo"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente controla se o nó deve ser executado novamente; os resultados são não determinísticos independentemente da semente."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingImageToVideoWithAudio": {
+    "display_name": "Kling Imagem (Primeiro Quadro) para Vídeo com Áudio",
+    "inputs": {
+      "duration": {
+        "name": "duration"
+      },
+      "generate_audio": {
+        "name": "generate_audio"
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt de texto positivo."
+      },
+      "start_frame": {
+        "name": "start_frame"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingLipSyncAudioToVideoNode": {
+    "description": "Nó de Sincronização Labial Kling. Sincroniza os movimentos da boca em um arquivo de vídeo com o conteúdo de áudio de um arquivo de áudio. Ao usar, certifique-se de que o áudio contenha vocais claramente distinguíveis e que o vídeo contenha um rosto distinto. O arquivo de áudio não deve ser maior que 5MB. O arquivo de vídeo não deve ser maior que 100MB, deve ter altura/largura entre 720px e 1920px, e deve ter entre 2s e 10s de duração.",
+    "display_name": "Kling Sincronização Labial de Vídeo com Áudio",
+    "inputs": {
+      "audio": {
+        "name": "audio"
+      },
+      "video": {
+        "name": "video"
+      },
+      "voice_language": {
+        "name": "voice_language"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "video_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "duration",
+        "tooltip": null
+      }
+    }
+  },
+  "KlingLipSyncTextToVideoNode": {
+    "description": "Nó Kling Lip Sync Texto para Vídeo. Sincroniza os movimentos da boca em um arquivo de vídeo com um prompt de texto. O arquivo de vídeo não deve ser maior que 100MB, deve ter altura/largura entre 720px e 1920px, e duração entre 2s e 10s.",
+    "display_name": "Kling Lip Sync Vídeo com Texto",
+    "inputs": {
+      "text": {
+        "name": "texto",
+        "tooltip": "Conteúdo de texto para geração de vídeo com lip-sync. Obrigatório quando o modo for text2video. O comprimento máximo é de 120 caracteres."
+      },
+      "video": {
+        "name": "vídeo"
+      },
+      "voice": {
+        "name": "voz"
+      },
+      "voice_speed": {
+        "name": "velocidade_da_voz",
+        "tooltip": "Velocidade da fala. Faixa válida: 0,8~2,0, com precisão de uma casa decimal."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "id_vídeo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "duração",
+        "tooltip": null
+      }
+    }
+  },
+  "KlingMotionControl": {
+    "display_name": "Kling Controle de Movimento",
+    "inputs": {
+      "character_orientation": {
+        "name": "orientação_do_personagem",
+        "tooltip": "Controla de onde vem a orientação/posição do personagem.\nvídeo: movimentos, expressões, movimentos de câmera e orientação seguem o vídeo de referência de movimento (outros detalhes via prompt).\nimagem: movimentos e expressões ainda seguem o vídeo de referência de movimento, mas a orientação do personagem corresponde à imagem de referência (câmera/outros detalhes via prompt)."
+      },
+      "keep_original_sound": {
+        "name": "manter_som_original"
+      },
+      "mode": {
+        "name": "modo"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "reference_image": {
+        "name": "imagem_de_referência"
+      },
+      "reference_video": {
+        "name": "vídeo_de_referência",
+        "tooltip": "Vídeo de referência de movimento usado para guiar o movimento/expressão.\nLimites de duração dependem de character_orientation:\n - imagem: 3–10s (máx 10s)\n - vídeo: 3–30s (máx 30s)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProEditVideoNode": {
+    "description": "Edite um vídeo existente com o modelo mais recente da Kling.",
+    "display_name": "Kling Omni Editar Vídeo (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar após gerar"
+      },
+      "keep_original_sound": {
+        "name": "manter_som_original"
+      },
+      "model_name": {
+        "name": "nome_do_modelo"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Um prompt de texto descrevendo o conteúdo do vídeo. Pode incluir descrições positivas e negativas."
+      },
+      "reference_images": {
+        "name": "imagens_de_referência",
+        "tooltip": "Até 4 imagens de referência adicionais."
+      },
+      "resolution": {
+        "name": "resolução"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente controla se o nó deve ser executado novamente; os resultados são não determinísticos independentemente da semente."
+      },
+      "video": {
+        "name": "vídeo",
+        "tooltip": "Vídeo para edição. O comprimento do vídeo de saída será o mesmo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProFirstLastFrameNode": {
+    "description": "Use um quadro inicial, um quadro final opcional ou imagens de referência com o modelo mais recente da Kling.",
+    "display_name": "Kling Omni Quadro Inicial-Final para Vídeo (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar após gerar"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "end_frame": {
+        "name": "end_frame",
+        "tooltip": "Um quadro final opcional para o vídeo. Não pode ser usado simultaneamente com 'reference_images'."
+      },
+      "first_frame": {
+        "name": "first_frame"
+      },
+      "generate_audio": {
+        "name": "gerar_áudio",
+        "tooltip": "Gerar áudio para o vídeo. Suportado apenas para kling-v3-omni."
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Um prompt de texto descrevendo o conteúdo do vídeo. Pode incluir descrições positivas e negativas."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "Até 6 imagens de referência adicionais."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente controla se o nó deve ser executado novamente; os resultados são não determinísticos independentemente da semente."
+      },
+      "storyboards": {
+        "name": "storyboards",
+        "tooltip": "Gere uma série de segmentos de vídeo com prompts e durações individuais. Suportado apenas para kling-v3-omni."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProImageNode": {
+    "description": "Crie ou edite imagens com o modelo mais recente da Kling.",
+    "display_name": "Kling Omni Imagem (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "controlar após gerar"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Um prompt de texto descrevendo o conteúdo da imagem. Pode incluir descrições positivas e negativas."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "Até 10 imagens de referência adicionais."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente controla se o nó deve ser executado novamente; os resultados são não determinísticos independentemente da semente."
+      },
+      "series_amount": {
+        "name": "quantidade_de_séries",
+        "tooltip": "Gere uma série de imagens. Não suportado para kling-image-o1."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProImageToVideoNode": {
+    "description": "Use até 7 imagens de referência para gerar um vídeo com o modelo mais recente da Kling.",
+    "display_name": "Kling Omni Imagem para Vídeo (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "controlar após gerar"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "generate_audio": {
+        "name": "gerar_áudio",
+        "tooltip": "Gerar áudio para o vídeo. Suportado apenas para kling-v3-omni."
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Um prompt de texto descrevendo o conteúdo do vídeo. Pode incluir descrições positivas e negativas."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "Até 7 imagens de referência."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente controla se o nó deve ser executado novamente; os resultados são não determinísticos independentemente da semente."
+      },
+      "storyboards": {
+        "name": "storyboards",
+        "tooltip": "Gere uma série de segmentos de vídeo com prompts e durações individuais. Suportado apenas para kling-v3-omni."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProTextToVideoNode": {
+    "description": "Use prompts de texto para gerar vídeos com o modelo mais recente da Kling.",
+    "display_name": "Kling Omni Texto para Vídeo (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "controlar após gerar"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "generate_audio": {
+        "name": "gerar_áudio"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Um prompt de texto descrevendo o conteúdo do vídeo. Pode incluir descrições positivas e negativas."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente controla se o nó deve ser executado novamente; os resultados são não determinísticos independentemente da semente."
+      },
+      "storyboards": {
+        "name": "storyboards",
+        "tooltip": "Gere uma série de segmentos de vídeo com prompts e durações individuais. Ignorado para o modelo o1."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProVideoToVideoNode": {
+    "description": "Use um vídeo e até 4 imagens de referência para gerar um vídeo com o modelo Kling mais recente.",
+    "display_name": "Kling Omni Vídeo para Vídeo (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "controlar após gerar"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "keep_original_sound": {
+        "name": "keep_original_sound"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Um prompt de texto descrevendo o conteúdo do vídeo. Pode incluir descrições positivas e negativas."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "Até 4 imagens de referência adicionais."
+      },
+      "reference_video": {
+        "name": "reference_video",
+        "tooltip": "Vídeo para usar como referência."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "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
+      }
+    }
+  },
+  "KlingSingleImageVideoEffectNode": {
+    "description": "Alcance diferentes efeitos especiais ao gerar um vídeo com base no effect_scene.",
+    "display_name": "Efeitos de Vídeo Kling",
+    "inputs": {
+      "duration": {
+        "name": "duration"
+      },
+      "effect_scene": {
+        "name": "effect_scene"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "Imagem de referência. URL ou string codificada em Base64 (sem o prefixo data:image). O tamanho do arquivo não pode exceder 10MB, resolução não inferior a 300x300px, proporção entre 1:2.5 ~ 2.5:1"
+      },
+      "model_name": {
+        "name": "model_name"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "video_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "duration",
+        "tooltip": null
+      }
+    }
+  },
+  "KlingStartEndFrameNode": {
+    "description": "Gere uma sequência de vídeo que faz a transição entre as imagens inicial e final fornecidas. O nó cria todos os quadros intermediários, produzindo uma transformação suave do primeiro ao último quadro.",
+    "display_name": "Kling Quadro Inicial-Final para Vídeo",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "cfg_scale": {
+        "name": "cfg_scale"
+      },
+      "end_frame": {
+        "name": "end_frame",
+        "tooltip": "Imagem de referência - Controle do quadro final. URL ou string Base64, não pode exceder 10MB, resolução não inferior a 300x300px. Base64 não deve incluir o prefixo data:image."
+      },
+      "mode": {
+        "name": "mode",
+        "tooltip": "A configuração a ser usada para a geração do vídeo seguindo o formato: mode / duration / model_name."
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Prompt de texto negativo"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt de texto positivo"
+      },
+      "start_frame": {
+        "name": "start_frame",
+        "tooltip": "Imagem de referência - URL ou string Base64, não pode exceder 10MB, resolução não inferior a 300x300px, proporção entre 1:2.5 ~ 2.5:1. Base64 não deve incluir o prefixo data:image."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "video_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "duration",
+        "tooltip": null
+      }
+    }
+  },
+  "KlingTextToVideoNode": {
+    "description": "Nó Kling Texto para Vídeo",
+    "display_name": "Kling Texto para Vídeo",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "cfg_scale": {
+        "name": "cfg_scale"
+      },
+      "mode": {
+        "name": "mode",
+        "tooltip": "A configuração a ser usada para a geração do vídeo seguindo o formato: modo / duração / model_name."
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Prompt de texto negativo"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt de texto positivo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "video_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "duration",
+        "tooltip": null
+      }
+    }
+  },
+  "KlingTextToVideoWithAudio": {
+    "display_name": "Kling Texto para Vídeo com Áudio",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "generate_audio": {
+        "name": "generate_audio"
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt de texto positivo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingVideoExtendNode": {
+    "description": "Nó Kling Extender Vídeo. Estenda vídeos criados por outros nós Kling. O video_id é criado usando outros Nós Kling.",
+    "display_name": "Kling Extender Vídeo",
+    "inputs": {
+      "cfg_scale": {
+        "name": "cfg_scale"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Prompt de texto negativo para elementos a serem evitados no vídeo estendido"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt de texto positivo para guiar a extensão do vídeo"
+      },
+      "video_id": {
+        "name": "video_id",
+        "tooltip": "O ID do vídeo a ser estendido. Suporta vídeos gerados por texto para vídeo, imagem para vídeo e operações anteriores de extensão de vídeo. Não pode exceder 3 minutos de duração total após a extensão."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "video_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "duration",
+        "tooltip": null
+      }
+    }
+  },
+  "KlingVideoNode": {
+    "description": "Gere vídeos com Kling V3. Suporta texto-para-vídeo e imagem-para-vídeo com storyboard opcional, multi-prompt e geração de áudio.",
+    "display_name": "Kling 3.0 Vídeo",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar após gerar"
+      },
+      "generate_audio": {
+        "name": "gerar áudio"
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Configurações de modelo e geração."
+      },
+      "model_aspect_ratio": {
+        "name": "proporção"
+      },
+      "model_resolution": {
+        "name": "resolução"
+      },
+      "multi_shot": {
+        "name": "multi_shot",
+        "tooltip": "Gere uma série de segmentos de vídeo com prompts e durações individuais."
+      },
+      "multi_shot_duration": {
+        "name": "duração"
+      },
+      "multi_shot_negative_prompt": {
+        "name": "prompt_negativo"
+      },
+      "multi_shot_prompt": {
+        "name": "prompt"
+      },
+      "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."
+      },
+      "start_frame": {
+        "name": "quadro inicial",
+        "tooltip": "Quadro inicial opcional. Quando conectado, alterna para o modo imagem-para-vídeo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingVirtualTryOnNode": {
+    "description": "Nó Kling Prova Virtual. Insira uma imagem de uma pessoa e uma imagem de roupa para experimentar a roupa na pessoa. Você pode mesclar várias imagens de peças de roupa em uma única imagem com fundo branco.",
+    "display_name": "Kling Prova Virtual",
+    "inputs": {
+      "cloth_image": {
+        "name": "cloth_image"
+      },
+      "human_image": {
+        "name": "human_image"
+      },
+      "model_name": {
+        "name": "model_name"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LTXAVTextEncoderLoader": {
+    "description": "[Receitas]\n\nltxav: gemma 3 12B",
+    "display_name": "Carregador de Codificador de Texto LTXV Áudio",
+    "inputs": {
+      "ckpt_name": {
+        "name": "ckpt_name"
+      },
+      "device": {
+        "name": "device"
+      },
+      "text_encoder": {
+        "name": "text_encoder"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAddGuide": {
+    "display_name": "LTXVAddGuide",
+    "inputs": {
+      "frame_idx": {
+        "name": "frame_idx",
+        "tooltip": "Índice do quadro para iniciar o condicionamento. Para imagens de um quadro ou vídeos com 1-8 quadros, qualquer valor de frame_idx é aceitável. Para vídeos com 9+ quadros, frame_idx deve ser divisível por 8, caso contrário será arredondado para baixo para o múltiplo de 8 mais próximo. Valores negativos são contados a partir do final do vídeo."
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "Imagem ou vídeo para condicionar o vídeo latente. Deve ter 8*n + 1 quadros. Se o vídeo não tiver 8*n + 1 quadros, será cortado para o múltiplo mais próximo de 8*n + 1 quadros."
+      },
+      "latent": {
+        "name": "latent"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "strength": {
+        "name": "strength"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAEDecode": {
+    "display_name": "LTXV Decodificar Áudio VAE",
+    "inputs": {
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "O modelo Audio VAE usado para decodificar o latent."
+      },
+      "samples": {
+        "name": "amostras",
+        "tooltip": "O latent a ser decodificado."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Áudio",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAEEncode": {
+    "display_name": "LTXV Codificar Áudio VAE",
+    "inputs": {
+      "audio": {
+        "name": "áudio",
+        "tooltip": "O áudio a ser codificado."
+      },
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "O modelo Audio VAE a ser usado para codificação."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Latent de Áudio",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAELoader": {
+    "display_name": "LTXV Carregar Áudio VAE",
+    "inputs": {
+      "ckpt_name": {
+        "name": "nome_ckpt",
+        "tooltip": "Checkpoint do Audio VAE para carregar."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Audio VAE",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVConcatAVLatent": {
+    "display_name": "LTXVConcatAVLatent",
+    "inputs": {
+      "audio_latent": {
+        "name": "audio_latent"
+      },
+      "video_latent": {
+        "name": "video_latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVConditioning": {
+    "display_name": "LTXVConditioning",
+    "inputs": {
+      "frame_rate": {
+        "name": "taxa_de_quadros"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVCropGuides": {
+    "display_name": "LTXVCropGuides",
+    "inputs": {
+      "latent": {
+        "name": "latent"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVEmptyLatentAudio": {
+    "display_name": "LTXV Áudio Latente Vazio",
+    "inputs": {
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "O modelo Audio VAE do qual obter a configuração."
+      },
+      "batch_size": {
+        "name": "batch_size",
+        "tooltip": "Quantidade de amostras de áudio latente no lote."
+      },
+      "frame_rate": {
+        "name": "frame_rate",
+        "tooltip": "Número de quadros por segundo."
+      },
+      "frames_number": {
+        "name": "frames_number",
+        "tooltip": "Número de quadros."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVImgToVideo": {
+    "display_name": "LTXVImgToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "height": {
+        "name": "height"
+      },
+      "image": {
+        "name": "image"
+      },
+      "length": {
+        "name": "length"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "strength": {
+        "name": "strength"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVImgToVideoInplace": {
+    "display_name": "LTXVImgToVideoInplace",
+    "inputs": {
+      "bypass": {
+        "name": "bypass",
+        "tooltip": "Ignorar o condicionamento."
+      },
+      "image": {
+        "name": "image"
+      },
+      "latent": {
+        "name": "latent"
+      },
+      "strength": {
+        "name": "strength"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVLatentUpsampler": {
+    "display_name": "LTXVLatentUpsampler",
+    "inputs": {
+      "samples": {
+        "name": "samples"
+      },
+      "upscale_model": {
+        "name": "upscale_model"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
+  "LTXVPreprocess": {
+    "display_name": "LTXVPreprocess",
+    "inputs": {
+      "image": {
+        "name": "image"
+      },
+      "img_compression": {
+        "name": "img_compression",
+        "tooltip": "Quantidade de compressão a ser aplicada na imagem."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "output_image",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVScheduler": {
+    "display_name": "LTXVScheduler",
+    "inputs": {
+      "base_shift": {
+        "name": "base_shift"
+      },
+      "latent": {
+        "name": "latent"
+      },
+      "max_shift": {
+        "name": "max_shift"
+      },
+      "steps": {
+        "name": "steps"
+      },
+      "stretch": {
+        "name": "stretch",
+        "tooltip": "Estique os sigmas para ficarem no intervalo [terminal, 1]."
+      },
+      "terminal": {
+        "name": "terminal",
+        "tooltip": "O valor terminal dos sigmas após o estiramento."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVSeparateAVLatent": {
+    "description": "LTXV Separar AV Latent",
+    "display_name": "LTXVSeparateAVLatent",
+    "inputs": {
+      "av_latent": {
+        "name": "av_latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "video_latent",
+        "tooltip": null
+      },
+      "1": {
+        "name": "audio_latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LaplaceScheduler": {
+    "display_name": "LaplaceScheduler",
+    "inputs": {
+      "beta": {
+        "name": "beta"
+      },
+      "mu": {
+        "name": "mu"
+      },
+      "sigma_max": {
+        "name": "sigma_max"
+      },
+      "sigma_min": {
+        "name": "sigma_min"
+      },
+      "steps": {
+        "name": "passos"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentAdd": {
+    "display_name": "LatentAdd",
+    "inputs": {
+      "samples1": {
+        "name": "amostras1"
+      },
+      "samples2": {
+        "name": "amostras2"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentApplyOperation": {
+    "display_name": "LatentApplyOperation",
+    "inputs": {
+      "operation": {
+        "name": "operação"
+      },
+      "samples": {
+        "name": "amostras"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentApplyOperationCFG": {
+    "display_name": "LatentApplyOperationCFG",
+    "inputs": {
+      "model": {
+        "name": "modelo"
+      },
+      "operation": {
+        "name": "operação"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentBatch": {
+    "display_name": "LatentBatch",
+    "inputs": {
+      "samples1": {
+        "name": "amostras1"
+      },
+      "samples2": {
+        "name": "amostras2"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentBatchSeedBehavior": {
+    "display_name": "LatentBatchSeedBehavior",
+    "inputs": {
+      "samples": {
+        "name": "amostras"
+      },
+      "seed_behavior": {
+        "name": "comportamento_da_semente"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentBlend": {
+    "display_name": "Latent Blend",
+    "inputs": {
+      "blend_factor": {
+        "name": "fator_de_mistura"
+      },
+      "samples1": {
+        "name": "amostras1"
+      },
+      "samples2": {
+        "name": "amostras2"
+      }
+    }
+  },
+  "LatentComposite": {
+    "display_name": "Latent Composite",
+    "inputs": {
+      "feather": {
+        "name": "suavização"
+      },
+      "samples_from": {
+        "name": "amostras_origem"
+      },
+      "samples_to": {
+        "name": "amostras_destino"
+      },
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      }
+    }
+  },
+  "LatentCompositeMasked": {
+    "display_name": "LatentCompositeMasked",
+    "inputs": {
+      "destination": {
+        "name": "destino"
+      },
+      "mask": {
+        "name": "máscara"
+      },
+      "resize_source": {
+        "name": "redimensionar_origem"
+      },
+      "source": {
+        "name": "origem"
+      },
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentConcat": {
+    "display_name": "LatentConcat",
+    "inputs": {
+      "dim": {
+        "name": "dimensão"
+      },
+      "samples1": {
+        "name": "amostras1"
+      },
+      "samples2": {
+        "name": "amostras2"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentCrop": {
+    "display_name": "Crop Latent",
+    "inputs": {
+      "height": {
+        "name": "altura"
+      },
+      "samples": {
+        "name": "amostras"
+      },
+      "width": {
+        "name": "largura"
+      },
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      }
+    }
+  },
+  "LatentCut": {
+    "display_name": "LatentCut",
+    "inputs": {
+      "amount": {
+        "name": "quantidade"
+      },
+      "dim": {
+        "name": "dimensão"
+      },
+      "index": {
+        "name": "índice"
+      },
+      "samples": {
+        "name": "amostras"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentCutToBatch": {
+    "display_name": "LatentCutToBatch",
+    "inputs": {
+      "dim": {
+        "name": "dimensão"
+      },
+      "samples": {
+        "name": "amostras"
+      },
+      "slice_size": {
+        "name": "tamanho_do_fatiamento"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentFlip": {
+    "display_name": "Inverter Latent",
+    "inputs": {
+      "flip_method": {
+        "name": "método_de_inversão"
+      },
+      "samples": {
+        "name": "amostras"
+      }
+    }
+  },
+  "LatentFromBatch": {
+    "display_name": "Latent de Lote",
+    "inputs": {
+      "batch_index": {
+        "name": "índice_do_lote"
+      },
+      "length": {
+        "name": "comprimento"
+      },
+      "samples": {
+        "name": "amostras"
+      }
+    }
+  },
+  "LatentInterpolate": {
+    "display_name": "Interpolar Latent",
+    "inputs": {
+      "ratio": {
+        "name": "proporção"
+      },
+      "samples1": {
+        "name": "amostras1"
+      },
+      "samples2": {
+        "name": "amostras2"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentMultiply": {
+    "display_name": "Multiplicar Latent",
+    "inputs": {
+      "multiplier": {
+        "name": "multiplicador"
+      },
+      "samples": {
+        "name": "amostras"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentOperationSharpen": {
+    "display_name": "LatentOperationSharpen",
+    "inputs": {
+      "alpha": {
+        "name": "alfa"
+      },
+      "sharpen_radius": {
+        "name": "raio_de_nitidez"
+      },
+      "sigma": {
+        "name": "sigma"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentOperationTonemapReinhard": {
+    "display_name": "LatentOperationTonemapReinhard",
+    "inputs": {
+      "multiplier": {
+        "name": "multiplicador"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentRotate": {
+    "display_name": "Rotacionar Latent",
+    "inputs": {
+      "rotation": {
+        "name": "rotação"
+      },
+      "samples": {
+        "name": "amostras"
+      }
+    }
+  },
+  "LatentSubtract": {
+    "display_name": "Subtrair Latent",
+    "inputs": {
+      "samples1": {
+        "name": "amostras1"
+      },
+      "samples2": {
+        "name": "amostras2"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LatentUpscale": {
+    "display_name": "Aumentar Resolução Latent",
+    "inputs": {
+      "crop": {
+        "name": "corte"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "samples": {
+        "name": "amostras"
+      },
+      "upscale_method": {
+        "name": "método_de_upscale"
+      },
+      "width": {
+        "name": "largura"
+      }
+    }
+  },
+  "LatentUpscaleBy": {
+    "display_name": "Aumentar Resolução Latent Por",
+    "inputs": {
+      "samples": {
+        "name": "amostras"
+      },
+      "scale_by": {
+        "name": "escalar_por"
+      },
+      "upscale_method": {
+        "name": "método_de_upscale"
+      }
+    }
+  },
+  "LatentUpscaleModelLoader": {
+    "display_name": "Carregar Modelo de Upscale Latent",
+    "inputs": {
+      "model_name": {
+        "name": "nome_do_modelo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LazyCache": {
+    "description": "Uma versão caseira do EasyCache - uma versão ainda 'mais fácil' do EasyCache de implementar. No geral, funciona pior que o EasyCache, mas melhor em alguns casos raros E tem compatibilidade universal com tudo no ComfyUI.",
+    "display_name": "LazyCache",
+    "inputs": {
+      "end_percent": {
+        "name": "percentual_final",
+        "tooltip": "A etapa relativa de amostragem para parar de usar o LazyCache."
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "O modelo ao qual adicionar o LazyCache."
+      },
+      "reuse_threshold": {
+        "name": "limite_de_reutilização",
+        "tooltip": "O limite para reutilizar etapas em cache."
+      },
+      "start_percent": {
+        "name": "percentual_inicial",
+        "tooltip": "A etapa relativa de amostragem para começar a usar o LazyCache."
+      },
+      "verbose": {
+        "name": "detalhado",
+        "tooltip": "Se deve registrar informações detalhadas."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "O modelo com LazyCache."
+      }
+    }
+  },
+  "Load3D": {
+    "display_name": "Carregar 3D & Animação",
+    "inputs": {
+      "clear": {},
+      "height": {
+        "name": "altura"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "model_file": {
+        "name": "arquivo_do_modelo"
+      },
+      "upload 3d model": {},
+      "upload extra resources": {},
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "imagem",
+        "tooltip": null
+      },
+      "1": {
+        "name": "mask",
+        "tooltip": null
+      },
+      "2": {
+        "name": "caminho_do_mesh",
+        "tooltip": null
+      },
+      "3": {
+        "name": "normal",
+        "tooltip": null
+      },
+      "4": {
+        "name": "informações_da_câmera",
+        "tooltip": null
+      },
+      "5": {
+        "name": "vídeo_de_gravação",
+        "tooltip": null
+      },
+      "6": {
+        "name": "model_3d",
+        "tooltip": null
+      }
+    }
+  },
+  "LoadAudio": {
+    "display_name": "Carregar Áudio",
+    "inputs": {
+      "audio": {
+        "name": "áudio"
+      },
+      "audioUI": {
+        "name": "áudioUI"
+      },
+      "upload": {
+        "name": "escolher arquivo para enviar"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LoadImage": {
+    "display_name": "Carregar Imagem",
+    "inputs": {
+      "image": {
+        "name": "imagem"
+      },
+      "upload": {
+        "name": "escolher arquivo para enviar"
+      }
+    }
+  },
+  "LoadImageDataSetFromFolder": {
+    "display_name": "Carregar Conjunto de Imagens da Pasta",
+    "inputs": {
+      "folder": {
+        "name": "pasta",
+        "tooltip": "A pasta de onde carregar as imagens."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "imagens",
+        "tooltip": "Lista de imagens carregadas"
+      }
+    }
+  },
+  "LoadImageMask": {
+    "display_name": "Carregar Imagem (como Mask)",
+    "inputs": {
+      "channel": {
+        "name": "canal"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "upload": {
+        "name": "escolher arquivo para enviar"
+      }
+    }
+  },
+  "LoadImageOutput": {
+    "description": "Carregue uma imagem da pasta de saída. Quando o botão de atualizar for clicado, o nó irá atualizar a lista de imagens e selecionar automaticamente a primeira imagem, facilitando a iteração.",
+    "display_name": "Carregar Imagem (dos Resultados)",
+    "inputs": {
+      "Auto-refresh after generation": {},
+      "image": {
+        "name": "imagem"
+      },
+      "refresh": {},
+      "upload": {
+        "name": "escolher arquivo para enviar"
+      }
+    }
+  },
+  "LoadImageTextDataSetFromFolder": {
+    "display_name": "Carregar Conjunto de Dados de Imagem e Texto da Pasta",
+    "inputs": {
+      "folder": {
+        "name": "pasta",
+        "tooltip": "A pasta de onde as imagens serão carregadas."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "imagens",
+        "tooltip": "Lista de imagens carregadas"
+      },
+      "1": {
+        "name": "textos",
+        "tooltip": "Lista de legendas de texto"
+      }
+    }
+  },
+  "LoadLatent": {
+    "display_name": "Carregar Latent",
+    "inputs": {
+      "latent": {
+        "name": "latent"
+      }
+    }
+  },
+  "LoadTrainingDataset": {
+    "display_name": "Carregar Conjunto de Dados de Treinamento",
+    "inputs": {
+      "folder_name": {
+        "name": "nome_da_pasta",
+        "tooltip": "Nome da pasta contendo o conjunto de dados salvo (dentro do diretório de saída)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latents",
+        "tooltip": "Lista de dicionários de latent"
+      },
+      "1": {
+        "name": "condicionamentos",
+        "tooltip": "Lista de listas de condicionamento"
+      }
+    }
+  },
+  "LoadVideo": {
+    "display_name": "Carregar Vídeo",
+    "inputs": {
+      "file": {
+        "name": "arquivo"
+      },
+      "upload": {
+        "name": "escolher arquivo para enviar"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LoraLoader": {
+    "description": "LoRAs são usados para modificar modelos de difusão e CLIP, alterando a forma como os latents são denoizados, como na aplicação de estilos. Vários nós LoRA podem ser conectados juntos.",
+    "display_name": "Carregar LoRA",
+    "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "O modelo CLIP ao qual o LoRA será aplicado."
+      },
+      "lora_name": {
+        "name": "nome_do_lora",
+        "tooltip": "O nome do LoRA."
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "O modelo de difusão ao qual o LoRA será aplicado."
+      },
+      "strength_clip": {
+        "name": "força_clip",
+        "tooltip": "Quão fortemente modificar o modelo CLIP. Este valor pode ser negativo."
+      },
+      "strength_model": {
+        "name": "força_modelo",
+        "tooltip": "Quão fortemente modificar o modelo de difusão. Este valor pode ser negativo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "O modelo de difusão modificado."
+      },
+      "1": {
+        "tooltip": "O modelo CLIP modificado."
+      }
+    }
+  },
+  "LoraLoaderBypass": {
+    "description": "Aplicar LoRA no modo bypass. Diferente do LoRA regular, isso não modifica os pesos do modelo – em vez disso, injeta o cálculo do LoRA durante a passagem direta. Útil para cenários de treinamento.",
+    "display_name": "Carregar LoRA (Bypass) (Para depuração)",
+    "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "O modelo CLIP ao qual o LoRA será aplicado."
+      },
+      "lora_name": {
+        "name": "lora_name",
+        "tooltip": "O nome do LoRA."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "O modelo de difusão ao qual o LoRA será aplicado."
+      },
+      "strength_clip": {
+        "name": "strength_clip",
+        "tooltip": "Quão fortemente modificar o modelo CLIP. Este valor pode ser negativo."
+      },
+      "strength_model": {
+        "name": "strength_model",
+        "tooltip": "Quão fortemente modificar o modelo de difusão. Este valor pode ser negativo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "O modelo de difusão modificado."
+      },
+      "1": {
+        "tooltip": "O modelo CLIP modificado."
+      }
+    }
+  },
+  "LoraLoaderBypassModelOnly": {
+    "description": "Aplicar LoRA no modo bypass. Diferente do LoRA regular, isso não modifica os pesos do modelo – em vez disso, injeta o cálculo do LoRA durante a passagem direta. Útil para cenários de treinamento.",
+    "display_name": "Carregar LoRA (Bypass, Apenas Modelo) (para depuração)",
+    "inputs": {
+      "lora_name": {
+        "name": "lora_name"
+      },
+      "model": {
+        "name": "model"
+      },
+      "strength_model": {
+        "name": "strength_model"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "O modelo de difusão modificado."
+      }
+    }
+  },
+  "LoraLoaderModelOnly": {
+    "description": "LoRAs são usados para modificar modelos de difusão e CLIP, alterando a forma como os latents são denoizados, como na aplicação de estilos. Vários nós LoRA podem ser conectados juntos.",
+    "display_name": "LoraLoaderModelOnly",
+    "inputs": {
+      "lora_name": {
+        "name": "nome_do_lora"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "strength_model": {
+        "name": "força_modelo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "O modelo de difusão modificado."
+      }
+    }
+  },
+  "LoraModelLoader": {
+    "display_name": "Carregar Modelo LoRA",
+    "inputs": {
+      "bypass": {
+        "name": "bypass",
+        "tooltip": "Quando ativado, aplica o LoRA no modo bypass sem modificar os pesos do modelo base. Útil para treinamento e quando os pesos do modelo são descarregados."
+      },
+      "lora": {
+        "name": "lora",
+        "tooltip": "O modelo LoRA a ser aplicado ao modelo de difusão."
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "O modelo de difusão ao qual o LoRA será aplicado."
+      },
+      "strength_model": {
+        "name": "força_modelo",
+        "tooltip": "Quão fortemente modificar o modelo de difusão. Este valor pode ser negativo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "modelo",
+        "tooltip": "O modelo de difusão modificado."
+      }
+    }
+  },
+  "LoraSave": {
+    "display_name": "Extrair e Salvar Lora",
+    "inputs": {
+      "bias_diff": {
+        "name": "bias_diff"
+      },
+      "filename_prefix": {
+        "name": "filename_prefix"
+      },
+      "lora_type": {
+        "name": "lora_type"
+      },
+      "model_diff": {
+        "name": "model_diff",
+        "tooltip": "A saída do ModelSubtract a ser convertida em uma lora."
+      },
+      "rank": {
+        "name": "rank"
+      },
+      "text_encoder_diff": {
+        "name": "text_encoder_diff",
+        "tooltip": "A saída do CLIPSubtract a ser convertida em uma lora."
+      }
+    }
+  },
+  "LossGraphNode": {
+    "display_name": "Plotar Gráfico de Loss",
+    "inputs": {
+      "filename_prefix": {
+        "name": "filename_prefix",
+        "tooltip": "Prefixo para a imagem do gráfico de loss salvo."
+      },
+      "loss": {
+        "name": "loss",
+        "tooltip": "Mapa de loss do nó de treinamento."
+      }
+    }
+  },
+  "LotusConditioning": {
+    "display_name": "LotusConditioning",
+    "outputs": {
+      "0": {
+        "name": "conditioning",
+        "tooltip": null
+      }
+    }
+  },
+  "LtxvApiImageToVideo": {
+    "description": "Vídeos de qualidade profissional com duração e resolução personalizáveis a partir da imagem inicial.",
+    "display_name": "LTXV Imagem para Vídeo",
+    "inputs": {
+      "duration": {
+        "name": "duration"
+      },
+      "fps": {
+        "name": "fps"
+      },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "Quando verdadeiro, o vídeo gerado incluirá áudio gerado por IA correspondente à cena."
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "Primeiro quadro a ser usado para o vídeo."
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "resolution": {
+        "name": "resolution"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LtxvApiTextToVideo": {
+    "description": "Vídeos de qualidade profissional com duração e resolução personalizáveis.",
+    "display_name": "LTXV Texto para Vídeo",
+    "inputs": {
+      "duration": {
+        "name": "duração"
+      },
+      "fps": {
+        "name": "fps"
+      },
+      "generate_audio": {
+        "name": "gerar_áudio",
+        "tooltip": "Quando verdadeiro, o vídeo gerado incluirá áudio gerado por IA correspondente à cena."
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "resolution": {
+        "name": "resolução"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LumaConceptsNode": {
+    "description": "Conceitos de Câmera para uso com os nós Luma Texto para Vídeo e Luma Imagem para Vídeo.",
+    "display_name": "Luma Concepts",
+    "inputs": {
+      "concept1": {
+        "name": "concept1"
+      },
+      "concept2": {
+        "name": "concept2"
+      },
+      "concept3": {
+        "name": "concept3"
+      },
+      "concept4": {
+        "name": "concept4"
+      },
+      "luma_concepts": {
+        "name": "luma_concepts",
+        "tooltip": "Conceitos de Câmera opcionais para adicionar aos escolhidos aqui."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "luma_concepts",
+        "tooltip": null
+      }
+    }
+  },
+  "LumaImageModifyNode": {
+    "description": "Modifica imagens de forma síncrona com base no prompt e na proporção.",
+    "display_name": "Luma Imagem para Imagem",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "image"
+      },
+      "image_weight": {
+        "name": "image_weight",
+        "tooltip": "Peso da imagem; quanto mais próximo de 1.0, menos a imagem será modificada."
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para a geração da imagem"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed para determinar se o nó deve ser executado novamente; os resultados reais são não determinísticos independentemente do seed."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LumaImageNode": {
+    "description": "Gera imagens de forma síncrona com base no prompt e na proporção.",
+    "display_name": "Luma Texto para Imagem",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "character_image": {
+        "name": "character_image",
+        "tooltip": "Imagens de referência de personagem; pode ser um lote de várias, até 4 imagens podem ser consideradas."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image_luma_ref": {
+        "name": "image_luma_ref",
+        "tooltip": "Conexão do nó de Referência Luma para influenciar a geração com imagens de entrada; até 4 imagens podem ser consideradas."
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para a geração da imagem"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed para determinar se o nó deve ser executado novamente; os resultados reais são não determinísticos independentemente do seed."
+      },
+      "style_image": {
+        "name": "style_image",
+        "tooltip": "Imagem de referência de estilo; apenas 1 imagem será usada."
+      },
+      "style_image_weight": {
+        "name": "style_image_weight",
+        "tooltip": "Peso da imagem de estilo. Ignorado se nenhuma style_image for fornecida."
+      }
+    },
+    "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",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar após gerar"
+      },
+      "duration": {
+        "name": "duração"
+      },
+      "first_image": {
+        "name": "primeira_imagem",
+        "tooltip": "Primeiro quadro do vídeo gerado."
+      },
+      "last_image": {
+        "name": "última_imagem",
+        "tooltip": "Último quadro do vídeo gerado."
+      },
+      "loop": {
+        "name": "loop"
+      },
+      "luma_concepts": {
+        "name": "luma_concepts",
+        "tooltip": "Conceitos de Câmera opcionais para ditar o movimento da câmera via o nó Luma Concepts."
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para a geração do vídeo"
+      },
+      "resolution": {
+        "name": "resolução"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed para determinar se o nó deve ser executado novamente; os resultados reais são não determinísticos independentemente do seed."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LumaReferenceNode": {
+    "description": "Armazena uma imagem e peso para uso com o nó Luma Gerar Imagem.",
+    "display_name": "Luma Referência",
+    "inputs": {
+      "image": {
+        "name": "imagem",
+        "tooltip": "Imagem para usar como referência."
+      },
+      "luma_ref": {
+        "name": "luma_ref"
+      },
+      "weight": {
+        "name": "peso",
+        "tooltip": "Peso da referência da imagem."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "luma_ref",
+        "tooltip": null
+      }
+    }
+  },
+  "LumaVideoNode": {
+    "description": "Gera vídeos de forma síncrona com base no prompt e output_size.",
+    "display_name": "Luma Texto para Vídeo",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "proporção"
+      },
+      "control_after_generate": {
+        "name": "controlar após gerar"
+      },
+      "duration": {
+        "name": "duração"
+      },
+      "loop": {
+        "name": "loop"
+      },
+      "luma_concepts": {
+        "name": "luma_concepts",
+        "tooltip": "Conceitos de Câmera opcionais para ditar o movimento da câmera via o nó Luma Concepts."
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para a geração do vídeo"
+      },
+      "resolution": {
+        "name": "resolução"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed para determinar se o nó deve ser executado novamente; os resultados reais são não determinísticos independentemente do seed."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageRelightNode": {
+    "description": "Reilumine uma imagem com ajustes de iluminação e transferência de luz baseada em referência opcional.",
+    "display_name": "Magnific Reiluminar Imagem",
+    "inputs": {
+      "advanced_settings": {
+        "name": "advanced_settings",
+        "tooltip": "Opções de ajuste fino para controle avançado de iluminação."
+      },
+      "change_background": {
+        "name": "change_background",
+        "tooltip": "Modifica o fundo com base no prompt/referência."
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "A imagem a ser reiluminada."
+      },
+      "interpolate_from_original": {
+        "name": "interpolate_from_original",
+        "tooltip": "Restringe a liberdade de geração para se aproximar mais do original."
+      },
+      "light_transfer_strength": {
+        "name": "light_transfer_strength",
+        "tooltip": "Intensidade da aplicação da transferência de luz."
+      },
+      "preserve_details": {
+        "name": "preserve_details",
+        "tooltip": "Mantém a textura e os detalhes finos do original."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Orientação descritiva para iluminação. Suporta notação de ênfase (1-1.4)."
+      },
+      "reference_image": {
+        "name": "reference_image",
+        "tooltip": "Imagem de referência opcional para transferir a iluminação."
+      },
+      "style": {
+        "name": "style",
+        "tooltip": "Preferência de estilo de saída."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageSkinEnhancerNode": {
+    "description": "Realce de pele para retratos com múltiplos modos de processamento.",
+    "display_name": "Magnific Realce de Pele em Imagem",
+    "inputs": {
+      "image": {
+        "name": "image",
+        "tooltip": "A imagem de retrato a ser realçada."
+      },
+      "mode": {
+        "name": "mode",
+        "tooltip": "Modo de processamento: criativo para realce artístico, fiel para preservar a aparência original, flexível para otimização direcionada."
+      },
+      "sharpen": {
+        "name": "sharpen",
+        "tooltip": "Nível de intensidade de nitidez."
+      },
+      "smart_grain": {
+        "name": "smart_grain",
+        "tooltip": "Nível de intensidade de granulação inteligente."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageStyleTransferNode": {
+    "description": "Transfira o estilo de uma imagem de referência para sua imagem de entrada.",
+    "display_name": "Transferência de Estilo de Imagem Magnific",
+    "inputs": {
+      "engine": {
+        "name": "engine",
+        "tooltip": "Seleção do mecanismo de processamento."
+      },
+      "fixed_generation": {
+        "name": "fixed_generation",
+        "tooltip": "Quando desativado, cada geração pode introduzir um grau de aleatoriedade, levando a resultados mais diversos."
+      },
+      "flavor": {
+        "name": "flavor",
+        "tooltip": "Tipo de transferência de estilo."
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "A imagem para aplicar a transferência de estilo."
+      },
+      "portrait_mode": {
+        "name": "portrait_mode",
+        "tooltip": "Ativar modo retrato para aprimoramentos faciais."
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "reference_image": {
+        "name": "reference_image",
+        "tooltip": "A imagem de referência da qual extrair o estilo."
+      },
+      "structure_strength": {
+        "name": "structure_strength",
+        "tooltip": "Mantém a estrutura da imagem original."
+      },
+      "style_strength": {
+        "name": "style_strength",
+        "tooltip": "Porcentagem da intensidade do estilo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageUpscalerCreativeNode": {
+    "description": "Aprimoramento guiado por prompt, estilização e upscaling em 2x/4x/8x/16x. Saída máxima: 25,3 megapixels.",
+    "display_name": "Magnific Image Upscale (Criativo)",
+    "inputs": {
+      "auto_downscale": {
+        "name": "redução automática",
+        "tooltip": "Reduz automaticamente a imagem de entrada se a saída exceder o limite máximo de pixels."
+      },
+      "creativity": {
+        "name": "criatividade"
+      },
+      "engine": {
+        "name": "engine"
+      },
+      "fractality": {
+        "name": "fractalidade",
+        "tooltip": "A força do prompt e complexidade por pixel quadrado."
+      },
+      "hdr": {
+        "name": "hdr",
+        "tooltip": "O nível de definição e detalhe."
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "optimized_for": {
+        "name": "otimizado para"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "resemblance": {
+        "name": "semelhança",
+        "tooltip": "O nível de semelhança com a imagem original."
+      },
+      "scale_factor": {
+        "name": "fator de escala"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageUpscalerPreciseV2Node": {
+    "description": "Upscaling de alta fidelidade com controle refinado de nitidez, granulação e detalhes. Saída máxima: 10060×10060 pixels.",
+    "display_name": "Magnific Image Upscale (Preciso V2)",
+    "inputs": {
+      "auto_downscale": {
+        "name": "redução automática",
+        "tooltip": "Reduz automaticamente a imagem de entrada se a saída exceder a resolução máxima."
+      },
+      "flavor": {
+        "name": "estilo",
+        "tooltip": "Estilo de processamento: sublime para uso geral, photo para fotografias, photo_denoiser para fotos com ruído."
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "scale_factor": {
+        "name": "fator de escala"
+      },
+      "sharpen": {
+        "name": "nitidez",
+        "tooltip": "Intensidade da nitidez da imagem. Valores mais altos aumentam a definição das bordas e a clareza."
+      },
+      "smart_grain": {
+        "name": "granulação inteligente",
+        "tooltip": "Aprimoramento inteligente de granulação/textura para evitar que a imagem fique muito lisa ou artificial."
+      },
+      "ultra_detail": {
+        "name": "ultra detalhe",
+        "tooltip": "Controla detalhes finos, texturas e microdetalhes adicionados durante o upscaling."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Mahiro": {
+    "description": "Modifica a orientação para escalar mais na 'direção' do prompt positivo do que na diferença entre o prompt negativo.",
+    "display_name": "Mahiro CFG",
+    "inputs": {
+      "model": {
+        "name": "model"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "patched_model",
+        "tooltip": null
+      }
+    }
+  },
+  "MakeTrainingDataset": {
+    "display_name": "Criar Conjunto de Dados de Treinamento",
+    "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "Modelo CLIP para codificar texto em condicionamento."
+      },
+      "images": {
+        "name": "imagens",
+        "tooltip": "Lista de imagens para codificar."
+      },
+      "texts": {
+        "name": "textos",
+        "tooltip": "Lista de legendas de texto. Pode ter comprimento n (correspondendo às imagens), 1 (repetido para todas) ou ser omitido (usa string vazia)."
+      },
+      "vae": {
+        "name": "vae",
+        "tooltip": "Modelo VAE para codificar imagens em latents."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latents",
+        "tooltip": "Lista de dicionários latents"
+      },
+      "1": {
+        "name": "condicionamento",
+        "tooltip": "Lista de listas de condicionamento"
+      }
+    }
+  },
+  "ManualSigmas": {
+    "display_name": "Sigmas Manuais",
+    "inputs": {
+      "sigmas": {
+        "name": "sigmas"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MaskComposite": {
+    "display_name": "Composição de Mask",
+    "inputs": {
+      "destination": {
+        "name": "destino"
+      },
+      "operation": {
+        "name": "operação"
+      },
+      "source": {
+        "name": "fonte"
+      },
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MaskPreview": {
+    "description": "Salva as imagens de entrada no diretório de saída do ComfyUI.",
+    "display_name": "Pré-visualizar Mask",
+    "inputs": {
+      "mask": {
+        "name": "mask"
+      }
+    }
+  },
+  "MaskToImage": {
+    "display_name": "Converter Mask em Imagem",
+    "inputs": {
+      "mask": {
+        "name": "mask"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MergeImageLists": {
+    "display_name": "Mesclar Listas de Imagens",
+    "inputs": {
+      "images": {
+        "name": "imagens",
+        "tooltip": "Lista de imagens para processar."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "imagens",
+        "tooltip": "Imagens processadas"
+      }
+    }
+  },
+  "MergeTextLists": {
+    "display_name": "Mesclar Listas de Textos",
+    "inputs": {
+      "texts": {
+        "name": "textos",
+        "tooltip": "Lista de textos para processar."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "textos",
+        "tooltip": "Textos processados"
+      }
+    }
+  },
+  "MeshyAnimateModelNode": {
+    "description": "Aplicar uma ação de animação específica a um personagem previamente rigado.",
+    "display_name": "Meshy: Animar Modelo",
+    "inputs": {
+      "action_id": {
+        "name": "action_id",
+        "tooltip": "Visite https://docs.meshy.ai/en/api/animation-library para uma lista de valores disponíveis."
+      },
+      "rig_task_id": {
+        "name": "rig_task_id"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "arquivo_do_modelo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyImageToModelNode": {
+    "display_name": "Meshy: Imagem para Modelo",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle_após_gerar"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "pose_mode": {
+        "name": "modo_de_pose",
+        "tooltip": "Especifique o modo de pose para o modelo gerado."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente controla se o nó deve ser executado novamente; os resultados são não determinísticos independentemente da semente."
+      },
+      "should_remesh": {
+        "name": "refazer_malha",
+        "tooltip": "Quando definido como falso, retorna uma malha triangular não processada."
+      },
+      "should_remesh_target_polycount": {
+        "name": "contagem_alvo_de_polígonos"
+      },
+      "should_remesh_topology": {
+        "name": "topologia"
+      },
+      "should_texture": {
+        "name": "gerar_textura",
+        "tooltip": "Determina se as texturas serão geradas. Definir como falso pula a fase de textura e retorna uma malha sem texturas."
+      },
+      "should_texture_enable_pbr": {
+        "name": "habilitar_pbr"
+      },
+      "should_texture_texture_prompt": {
+        "name": "prompt_de_textura"
+      },
+      "symmetry_mode": {
+        "name": "modo_de_simetria"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "arquivo_do_modelo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyMultiImageToModelNode": {
+    "display_name": "Meshy: Múltiplas Imagens para Modelo",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle_após_gerar"
+      },
+      "images": {
+        "name": "imagens"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "pose_mode": {
+        "name": "modo_de_pose",
+        "tooltip": "Especifique o modo de pose para o modelo gerado."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente controla se o nó deve ser executado novamente; os resultados são não determinísticos independentemente da semente."
+      },
+      "should_remesh": {
+        "name": "refazer_malha",
+        "tooltip": "Quando definido como falso, retorna uma malha triangular não processada."
+      },
+      "should_remesh_target_polycount": {
+        "name": "contagem_alvo_de_polígonos"
+      },
+      "should_remesh_topology": {
+        "name": "topologia"
+      },
+      "should_texture": {
+        "name": "gerar_textura",
+        "tooltip": "Determina se as texturas serão geradas. Definir como falso pula a fase de textura e retorna uma malha sem texturas."
+      },
+      "should_texture_enable_pbr": {
+        "name": "habilitar_pbr"
+      },
+      "should_texture_texture_prompt": {
+        "name": "prompt_de_textura"
+      },
+      "symmetry_mode": {
+        "name": "modo_de_simetria"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "arquivo_do_modelo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyRefineNode": {
+    "description": "Refine um modelo rascunho criado anteriormente.",
+    "display_name": "Meshy: Refinar Modelo Rascunho",
+    "inputs": {
+      "enable_pbr": {
+        "name": "habilitar_pbr",
+        "tooltip": "Gerar mapas PBR (metálico, rugosidade, normal) além da cor base. Nota: isso deve ser definido como falso ao usar o estilo Escultura, pois o estilo Escultura gera seu próprio conjunto de mapas PBR."
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "texture_image": {
+        "name": "imagem_de_textura",
+        "tooltip": "Apenas um de 'texture_image' ou 'texture_prompt' pode ser usado ao mesmo tempo."
+      },
+      "texture_prompt": {
+        "name": "prompt_de_textura",
+        "tooltip": "Forneça um prompt de texto para orientar o processo de texturização. Máximo de 600 caracteres. Não pode ser usado ao mesmo tempo que 'texture_image'."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "arquivo_do_modelo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyRigModelNode": {
+    "description": "Fornece um personagem com rig em formatos padrão. O auto-rigging atualmente não é adequado para malhas sem textura, ativos não humanóides ou ativos humanóides com estrutura de membros e corpo indefinida.",
+    "display_name": "Meshy: Rig de Modelo",
+    "inputs": {
+      "height_meters": {
+        "name": "altura_metros",
+        "tooltip": "A altura aproximada do modelo do personagem em metros. Isso auxilia na escala e precisão do rig."
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "texture_image": {
+        "name": "imagem_de_textura",
+        "tooltip": "Imagem de textura de cor base UV-desdobrada do modelo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "arquivo_do_modelo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "rig_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyTextToModelNode": {
+    "display_name": "Meshy: Texto para Modelo",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle_após_gerar"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "pose_mode": {
+        "name": "modo_de_pose",
+        "tooltip": "Especifique o modo de pose para o modelo gerado."
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente controla se o nó deve ser executado novamente; os resultados são não determinísticos independentemente da semente."
+      },
+      "should_remesh": {
+        "name": "deve_refazer_malha",
+        "tooltip": "Quando definido como falso, retorna uma malha triangular não processada."
+      },
+      "should_remesh_target_polycount": {
+        "name": "contagem_alvo_de_polígonos"
+      },
+      "should_remesh_topology": {
+        "name": "topologia"
+      },
+      "style": {
+        "name": "estilo"
+      },
+      "symmetry_mode": {
+        "name": "modo_de_simetria"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "arquivo_do_modelo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyTextureNode": {
+    "display_name": "Meshy: Modelo de Textura",
+    "inputs": {
+      "enable_original_uv": {
+        "name": "habilitar_uv_original",
+        "tooltip": "Usar o UV original do modelo em vez de gerar novos UVs. Quando ativado, o Meshy preserva as texturas existentes do modelo enviado. Se o modelo não tiver UV original, a qualidade do resultado pode não ser tão boa."
+      },
+      "image_style": {
+        "name": "estilo_de_imagem",
+        "tooltip": "Uma imagem 2D para guiar o processo de texturização. Não pode ser usada ao mesmo tempo que 'text_style_prompt'."
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "pbr": {
+        "name": "pbr"
+      },
+      "text_style_prompt": {
+        "name": "prompt_de_estilo_textual",
+        "tooltip": "Descreva o estilo de textura desejado para o objeto usando texto. Máximo de 600 caracteres. Não pode ser usado ao mesmo tempo que 'image_style'."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "arquivo_do_modelo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MinimaxHailuoVideoNode": {
+    "description": "Gera vídeos a partir do prompt, com quadro inicial opcional usando o novo modelo MiniMax Hailuo-02.",
+    "display_name": "MiniMax Hailuo Vídeo",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "duration": {
+        "name": "duração",
+        "tooltip": "A duração do vídeo de saída em segundos."
+      },
+      "first_frame_image": {
+        "name": "imagem_primeiro_quadro",
+        "tooltip": "Imagem opcional para usar como o primeiro quadro do vídeo."
+      },
+      "prompt_optimizer": {
+        "name": "otimizador_de_prompt",
+        "tooltip": "Otimiza o prompt para melhorar a qualidade da geração quando necessário."
+      },
+      "prompt_text": {
+        "name": "texto_prompt",
+        "tooltip": "Prompt de texto para guiar a geração do vídeo."
+      },
+      "resolution": {
+        "name": "resolução",
+        "tooltip": "As dimensões da exibição do vídeo. 1080p é 1920x1080, 768p é 1366x768."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente aleatória usada para criar o ruído."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MinimaxImageToVideoNode": {
+    "description": "Gera vídeos de forma síncrona com base em uma imagem, prompt e parâmetros opcionais.",
+    "display_name": "MiniMax Imagem para Vídeo",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "image": {
+        "name": "imagem",
+        "tooltip": "Imagem a ser usada como o primeiro quadro da geração de vídeo"
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Modelo a ser usado para geração de vídeo"
+      },
+      "prompt_text": {
+        "name": "prompt_texto",
+        "tooltip": "Prompt de texto para guiar a geração do vídeo"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente aleatória usada para criar o ruído."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MinimaxTextToVideoNode": {
+    "description": "Gera vídeos de forma síncrona com base em um prompt e parâmetros opcionais.",
+    "display_name": "MiniMax Texto para Vídeo",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Modelo a ser usado para geração de vídeo"
+      },
+      "prompt_text": {
+        "name": "prompt_texto",
+        "tooltip": "Prompt de texto para guiar a geração do vídeo"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente aleatória usada para criar o ruído."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ModelComputeDtype": {
+    "display_name": "ModelComputeDtype",
+    "inputs": {
+      "dtype": {
+        "name": "dtype"
+      },
+      "model": {
+        "name": "modelo"
+      }
+    }
+  },
+  "ModelMergeAdd": {
+    "display_name": "ModelMergeAdd",
+    "inputs": {
+      "model1": {
+        "name": "modelo1"
+      },
+      "model2": {
+        "name": "modelo2"
+      }
+    }
+  },
+  "ModelMergeAuraflow": {
+    "display_name": "ModelMergeAuraflow",
+    "inputs": {
+      "cond_seq_linear_": {
+        "name": "cond_seq_linear."
+      },
+      "double_layers_0_": {
+        "name": "double_layers.0."
+      },
+      "double_layers_1_": {
+        "name": "double_layers.1."
+      },
+      "double_layers_2_": {
+        "name": "double_layers.2."
+      },
+      "double_layers_3_": {
+        "name": "double_layers.3."
+      },
+      "final_linear_": {
+        "name": "final_linear."
+      },
+      "init_x_linear_": {
+        "name": "init_x_linear."
+      },
+      "modF_": {
+        "name": "modF."
+      },
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "positional_encoding": {
+        "name": "codificação_posicional"
+      },
+      "register_tokens": {
+        "name": "registrar_tokens"
+      },
+      "single_layers_0_": {
+        "name": "single_layers.0."
+      },
+      "single_layers_10_": {
+        "name": "single_layers.10."
+      },
+      "single_layers_11_": {
+        "name": "single_layers.11."
+      },
+      "single_layers_12_": {
+        "name": "single_layers.12."
+      },
+      "single_layers_13_": {
+        "name": "single_layers.13."
+      },
+      "single_layers_14_": {
+        "name": "single_layers.14."
+      },
+      "single_layers_15_": {
+        "name": "single_layers.15."
+      },
+      "single_layers_16_": {
+        "name": "single_layers.16."
+      },
+      "single_layers_17_": {
+        "name": "single_layers.17."
+      },
+      "single_layers_18_": {
+        "name": "single_layers.18."
+      },
+      "single_layers_19_": {
+        "name": "single_layers.19."
+      },
+      "single_layers_1_": {
+        "name": "single_layers.1."
+      },
+      "single_layers_20_": {
+        "name": "single_layers.20."
+      },
+      "single_layers_21_": {
+        "name": "single_layers.21."
+      },
+      "single_layers_22_": {
+        "name": "single_layers.22."
+      },
+      "single_layers_23_": {
+        "name": "single_layers.23."
+      },
+      "single_layers_24_": {
+        "name": "single_layers.24."
+      },
+      "single_layers_25_": {
+        "name": "single_layers.25."
+      },
+      "single_layers_26_": {
+        "name": "single_layers.26."
+      },
+      "single_layers_27_": {
+        "name": "single_layers.27."
+      },
+      "single_layers_28_": {
+        "name": "single_layers.28."
+      },
+      "single_layers_29_": {
+        "name": "single_layers.29."
+      },
+      "single_layers_2_": {
+        "name": "single_layers.2."
+      },
+      "single_layers_30_": {
+        "name": "single_layers.30."
+      },
+      "single_layers_31_": {
+        "name": "single_layers.31."
+      },
+      "single_layers_3_": {
+        "name": "single_layers.3."
+      },
+      "single_layers_4_": {
+        "name": "single_layers.4."
+      },
+      "single_layers_5_": {
+        "name": "single_layers.5."
+      },
+      "single_layers_6_": {
+        "name": "single_layers.6."
+      },
+      "single_layers_7_": {
+        "name": "single_layers.7."
+      },
+      "single_layers_8_": {
+        "name": "single_layers.8."
+      },
+      "single_layers_9_": {
+        "name": "single_layers.9."
+      },
+      "t_embedder_": {
+        "name": "t_embedder."
+      }
+    }
+  },
+  "ModelMergeBlocks": {
+    "display_name": "ModelMergeBlocks",
+    "inputs": {
+      "input": {
+        "name": "entrada"
+      },
+      "middle": {
+        "name": "meio"
+      },
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "out": {
+        "name": "saída"
+      }
+    }
+  },
+  "ModelMergeCosmos14B": {
+    "display_name": "ModelMergeCosmos14B",
+    "inputs": {
+      "affline_norm_": {
+        "name": "affline_norm."
+      },
+      "blocks_block0_": {
+        "name": "blocos.bloco0."
+      },
+      "blocks_block10_": {
+        "name": "blocos.bloco10."
+      },
+      "blocks_block11_": {
+        "name": "blocos.bloco11."
+      },
+      "blocks_block12_": {
+        "name": "blocos.bloco12."
+      },
+      "blocks_block13_": {
+        "name": "blocos.bloco13."
+      },
+      "blocks_block14_": {
+        "name": "blocos.bloco14."
+      },
+      "blocks_block15_": {
+        "name": "blocos.bloco15."
+      },
+      "blocks_block16_": {
+        "name": "blocos.bloco16."
+      },
+      "blocks_block17_": {
+        "name": "blocos.bloco17."
+      },
+      "blocks_block18_": {
+        "name": "blocos.bloco18."
+      },
+      "blocks_block19_": {
+        "name": "blocos.bloco19."
+      },
+      "blocks_block1_": {
+        "name": "blocos.bloco1."
+      },
+      "blocks_block20_": {
+        "name": "blocos.bloco20."
+      },
+      "blocks_block21_": {
+        "name": "blocos.bloco21."
+      },
+      "blocks_block22_": {
+        "name": "blocos.bloco22."
+      },
+      "blocks_block23_": {
+        "name": "blocos.bloco23."
+      },
+      "blocks_block24_": {
+        "name": "blocos.bloco24."
+      },
+      "blocks_block25_": {
+        "name": "blocos.bloco25."
+      },
+      "blocks_block26_": {
+        "name": "blocos.bloco26."
+      },
+      "blocks_block27_": {
+        "name": "blocos.bloco27."
+      },
+      "blocks_block28_": {
+        "name": "blocos.bloco28."
+      },
+      "blocks_block29_": {
+        "name": "blocos.bloco29."
+      },
+      "blocks_block2_": {
+        "name": "blocos.bloco2."
+      },
+      "blocks_block30_": {
+        "name": "blocos.bloco30."
+      },
+      "blocks_block31_": {
+        "name": "blocos.bloco31."
+      },
+      "blocks_block32_": {
+        "name": "blocos.bloco32."
+      },
+      "blocks_block33_": {
+        "name": "blocos.bloco33."
+      },
+      "blocks_block34_": {
+        "name": "blocos.bloco34."
+      },
+      "blocks_block35_": {
+        "name": "blocos.bloco35."
+      },
+      "blocks_block3_": {
+        "name": "blocos.bloco3."
+      },
+      "blocks_block4_": {
+        "name": "blocos.bloco4."
+      },
+      "blocks_block5_": {
+        "name": "blocos.bloco5."
+      },
+      "blocks_block6_": {
+        "name": "blocos.bloco6."
+      },
+      "blocks_block7_": {
+        "name": "blocos.bloco7."
+      },
+      "blocks_block8_": {
+        "name": "blocos.bloco8."
+      },
+      "blocks_block9_": {
+        "name": "blocos.bloco9."
+      },
+      "extra_pos_embedder_": {
+        "name": "extra_pos_embedder."
+      },
+      "final_layer_": {
+        "name": "camada_final."
+      },
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "pos_embedder_": {
+        "name": "pos_embedder."
+      },
+      "t_embedder_": {
+        "name": "t_embedder."
+      },
+      "x_embedder_": {
+        "name": "x_embedder."
+      }
+    }
+  },
+  "ModelMergeCosmos7B": {
+    "display_name": "ModelMergeCosmos7B",
+    "inputs": {
+      "affline_norm_": {
+        "name": "affline_norm."
+      },
+      "blocks_block0_": {
+        "name": "blocks.block0."
+      },
+      "blocks_block10_": {
+        "name": "blocks.block10."
+      },
+      "blocks_block11_": {
+        "name": "blocks.block11."
+      },
+      "blocks_block12_": {
+        "name": "blocks.block12."
+      },
+      "blocks_block13_": {
+        "name": "blocks.block13."
+      },
+      "blocks_block14_": {
+        "name": "blocks.block14."
+      },
+      "blocks_block15_": {
+        "name": "blocks.block15."
+      },
+      "blocks_block16_": {
+        "name": "blocks.block16."
+      },
+      "blocks_block17_": {
+        "name": "blocks.block17."
+      },
+      "blocks_block18_": {
+        "name": "blocks.block18."
+      },
+      "blocks_block19_": {
+        "name": "blocks.block19."
+      },
+      "blocks_block1_": {
+        "name": "blocks.block1."
+      },
+      "blocks_block20_": {
+        "name": "blocks.block20."
+      },
+      "blocks_block21_": {
+        "name": "blocks.block21."
+      },
+      "blocks_block22_": {
+        "name": "blocks.block22."
+      },
+      "blocks_block23_": {
+        "name": "blocks.block23."
+      },
+      "blocks_block24_": {
+        "name": "blocks.block24."
+      },
+      "blocks_block25_": {
+        "name": "blocks.block25."
+      },
+      "blocks_block26_": {
+        "name": "blocks.block26."
+      },
+      "blocks_block27_": {
+        "name": "blocks.block27."
+      },
+      "blocks_block2_": {
+        "name": "blocks.block2."
+      },
+      "blocks_block3_": {
+        "name": "blocks.block3."
+      },
+      "blocks_block4_": {
+        "name": "blocks.block4."
+      },
+      "blocks_block5_": {
+        "name": "blocks.block5."
+      },
+      "blocks_block6_": {
+        "name": "blocks.block6."
+      },
+      "blocks_block7_": {
+        "name": "blocks.block7."
+      },
+      "blocks_block8_": {
+        "name": "blocks.block8."
+      },
+      "blocks_block9_": {
+        "name": "blocks.block9."
+      },
+      "extra_pos_embedder_": {
+        "name": "extra_pos_embedder."
+      },
+      "final_layer_": {
+        "name": "final_layer."
+      },
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "pos_embedder_": {
+        "name": "pos_embedder."
+      },
+      "t_embedder_": {
+        "name": "t_embedder."
+      },
+      "x_embedder_": {
+        "name": "x_embedder."
+      }
+    }
+  },
+  "ModelMergeCosmosPredict2_14B": {
+    "display_name": "ModelMergeCosmosPredict2_14B",
+    "inputs": {
+      "blocks_0_": {
+        "name": "blocks.0."
+      },
+      "blocks_10_": {
+        "name": "blocks.10."
+      },
+      "blocks_11_": {
+        "name": "blocks.11."
+      },
+      "blocks_12_": {
+        "name": "blocks.12."
+      },
+      "blocks_13_": {
+        "name": "blocks.13."
+      },
+      "blocks_14_": {
+        "name": "blocks.14."
+      },
+      "blocks_15_": {
+        "name": "blocks.15."
+      },
+      "blocks_16_": {
+        "name": "blocks.16."
+      },
+      "blocks_17_": {
+        "name": "blocks.17."
+      },
+      "blocks_18_": {
+        "name": "blocks.18."
+      },
+      "blocks_19_": {
+        "name": "blocks.19."
+      },
+      "blocks_1_": {
+        "name": "blocks.1."
+      },
+      "blocks_20_": {
+        "name": "blocks.20."
+      },
+      "blocks_21_": {
+        "name": "blocks.21."
+      },
+      "blocks_22_": {
+        "name": "blocks.22."
+      },
+      "blocks_23_": {
+        "name": "blocks.23."
+      },
+      "blocks_24_": {
+        "name": "blocks.24."
+      },
+      "blocks_25_": {
+        "name": "blocks.25."
+      },
+      "blocks_26_": {
+        "name": "blocks.26."
+      },
+      "blocks_27_": {
+        "name": "blocks.27."
+      },
+      "blocks_28_": {
+        "name": "blocks.28."
+      },
+      "blocks_29_": {
+        "name": "blocks.29."
+      },
+      "blocks_2_": {
+        "name": "blocks.2."
+      },
+      "blocks_30_": {
+        "name": "blocks.30."
+      },
+      "blocks_31_": {
+        "name": "blocks.31."
+      },
+      "blocks_32_": {
+        "name": "blocks.32."
+      },
+      "blocks_33_": {
+        "name": "blocks.33."
+      },
+      "blocks_34_": {
+        "name": "blocks.34."
+      },
+      "blocks_35_": {
+        "name": "blocks.35."
+      },
+      "blocks_3_": {
+        "name": "blocks.3."
+      },
+      "blocks_4_": {
+        "name": "blocks.4."
+      },
+      "blocks_5_": {
+        "name": "blocks.5."
+      },
+      "blocks_6_": {
+        "name": "blocks.6."
+      },
+      "blocks_7_": {
+        "name": "blocks.7."
+      },
+      "blocks_8_": {
+        "name": "blocks.8."
+      },
+      "blocks_9_": {
+        "name": "blocks.9."
+      },
+      "final_layer_": {
+        "name": "final_layer."
+      },
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "pos_embedder_": {
+        "name": "pos_embedder."
+      },
+      "t_embedder_": {
+        "name": "t_embedder."
+      },
+      "t_embedding_norm_": {
+        "name": "t_embedding_norm."
+      },
+      "x_embedder_": {
+        "name": "x_embedder."
+      }
+    }
+  },
+  "ModelMergeCosmosPredict2_2B": {
+    "display_name": "ModelMergeCosmosPredict2_2B",
+    "inputs": {
+      "blocks_0_": {
+        "name": "blocos.0."
+      },
+      "blocks_10_": {
+        "name": "blocos.10."
+      },
+      "blocks_11_": {
+        "name": "blocos.11."
+      },
+      "blocks_12_": {
+        "name": "blocos.12."
+      },
+      "blocks_13_": {
+        "name": "blocos.13."
+      },
+      "blocks_14_": {
+        "name": "blocos.14."
+      },
+      "blocks_15_": {
+        "name": "blocos.15."
+      },
+      "blocks_16_": {
+        "name": "blocos.16."
+      },
+      "blocks_17_": {
+        "name": "blocos.17."
+      },
+      "blocks_18_": {
+        "name": "blocos.18."
+      },
+      "blocks_19_": {
+        "name": "blocos.19."
+      },
+      "blocks_1_": {
+        "name": "blocos.1."
+      },
+      "blocks_20_": {
+        "name": "blocos.20."
+      },
+      "blocks_21_": {
+        "name": "blocos.21."
+      },
+      "blocks_22_": {
+        "name": "blocos.22."
+      },
+      "blocks_23_": {
+        "name": "blocos.23."
+      },
+      "blocks_24_": {
+        "name": "blocos.24."
+      },
+      "blocks_25_": {
+        "name": "blocos.25."
+      },
+      "blocks_26_": {
+        "name": "blocos.26."
+      },
+      "blocks_27_": {
+        "name": "blocos.27."
+      },
+      "blocks_2_": {
+        "name": "blocos.2."
+      },
+      "blocks_3_": {
+        "name": "blocos.3."
+      },
+      "blocks_4_": {
+        "name": "blocos.4."
+      },
+      "blocks_5_": {
+        "name": "blocos.5."
+      },
+      "blocks_6_": {
+        "name": "blocos.6."
+      },
+      "blocks_7_": {
+        "name": "blocos.7."
+      },
+      "blocks_8_": {
+        "name": "blocos.8."
+      },
+      "blocks_9_": {
+        "name": "blocos.9."
+      },
+      "final_layer_": {
+        "name": "camada_final."
+      },
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "pos_embedder_": {
+        "name": "pos_embedder."
+      },
+      "t_embedder_": {
+        "name": "t_embedder."
+      },
+      "t_embedding_norm_": {
+        "name": "t_embedding_norm."
+      },
+      "x_embedder_": {
+        "name": "x_embedder."
+      }
+    }
+  },
+  "ModelMergeFlux1": {
+    "display_name": "ModelMergeFlux1",
+    "inputs": {
+      "double_blocks_0_": {
+        "name": "double_blocks.0."
+      },
+      "double_blocks_10_": {
+        "name": "double_blocks.10."
+      },
+      "double_blocks_11_": {
+        "name": "double_blocks.11."
+      },
+      "double_blocks_12_": {
+        "name": "double_blocks.12."
+      },
+      "double_blocks_13_": {
+        "name": "double_blocks.13."
+      },
+      "double_blocks_14_": {
+        "name": "double_blocks.14."
+      },
+      "double_blocks_15_": {
+        "name": "double_blocks.15."
+      },
+      "double_blocks_16_": {
+        "name": "double_blocks.16."
+      },
+      "double_blocks_17_": {
+        "name": "double_blocks.17."
+      },
+      "double_blocks_18_": {
+        "name": "double_blocks.18."
+      },
+      "double_blocks_1_": {
+        "name": "double_blocks.1."
+      },
+      "double_blocks_2_": {
+        "name": "double_blocks.2."
+      },
+      "double_blocks_3_": {
+        "name": "double_blocks.3."
+      },
+      "double_blocks_4_": {
+        "name": "double_blocks.4."
+      },
+      "double_blocks_5_": {
+        "name": "double_blocks.5."
+      },
+      "double_blocks_6_": {
+        "name": "double_blocks.6."
+      },
+      "double_blocks_7_": {
+        "name": "double_blocks.7."
+      },
+      "double_blocks_8_": {
+        "name": "double_blocks.8."
+      },
+      "double_blocks_9_": {
+        "name": "double_blocks.9."
+      },
+      "final_layer_": {
+        "name": "final_layer."
+      },
+      "guidance_in": {
+        "name": "guidance_in"
+      },
+      "img_in_": {
+        "name": "img_in."
+      },
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "single_blocks_0_": {
+        "name": "single_blocks.0."
+      },
+      "single_blocks_10_": {
+        "name": "single_blocks.10."
+      },
+      "single_blocks_11_": {
+        "name": "single_blocks.11."
+      },
+      "single_blocks_12_": {
+        "name": "single_blocks.12."
+      },
+      "single_blocks_13_": {
+        "name": "single_blocks.13."
+      },
+      "single_blocks_14_": {
+        "name": "single_blocks.14."
+      },
+      "single_blocks_15_": {
+        "name": "single_blocks.15."
+      },
+      "single_blocks_16_": {
+        "name": "single_blocks.16."
+      },
+      "single_blocks_17_": {
+        "name": "single_blocks.17."
+      },
+      "single_blocks_18_": {
+        "name": "single_blocks.18."
+      },
+      "single_blocks_19_": {
+        "name": "single_blocks.19."
+      },
+      "single_blocks_1_": {
+        "name": "single_blocks.1."
+      },
+      "single_blocks_20_": {
+        "name": "single_blocks.20."
+      },
+      "single_blocks_21_": {
+        "name": "single_blocks.21."
+      },
+      "single_blocks_22_": {
+        "name": "single_blocks.22."
+      },
+      "single_blocks_23_": {
+        "name": "single_blocks.23."
+      },
+      "single_blocks_24_": {
+        "name": "single_blocks.24."
+      },
+      "single_blocks_25_": {
+        "name": "single_blocks.25."
+      },
+      "single_blocks_26_": {
+        "name": "single_blocks.26."
+      },
+      "single_blocks_27_": {
+        "name": "single_blocks.27."
+      },
+      "single_blocks_28_": {
+        "name": "single_blocks.28."
+      },
+      "single_blocks_29_": {
+        "name": "single_blocks.29."
+      },
+      "single_blocks_2_": {
+        "name": "single_blocks.2."
+      },
+      "single_blocks_30_": {
+        "name": "single_blocks.30."
+      },
+      "single_blocks_31_": {
+        "name": "single_blocks.31."
+      },
+      "single_blocks_32_": {
+        "name": "single_blocks.32."
+      },
+      "single_blocks_33_": {
+        "name": "single_blocks.33."
+      },
+      "single_blocks_34_": {
+        "name": "single_blocks.34."
+      },
+      "single_blocks_35_": {
+        "name": "single_blocks.35."
+      },
+      "single_blocks_36_": {
+        "name": "single_blocks.36."
+      },
+      "single_blocks_37_": {
+        "name": "single_blocks.37."
+      },
+      "single_blocks_3_": {
+        "name": "single_blocks.3."
+      },
+      "single_blocks_4_": {
+        "name": "single_blocks.4."
+      },
+      "single_blocks_5_": {
+        "name": "single_blocks.5."
+      },
+      "single_blocks_6_": {
+        "name": "single_blocks.6."
+      },
+      "single_blocks_7_": {
+        "name": "single_blocks.7."
+      },
+      "single_blocks_8_": {
+        "name": "single_blocks.8."
+      },
+      "single_blocks_9_": {
+        "name": "single_blocks.9."
+      },
+      "time_in_": {
+        "name": "time_in."
+      },
+      "txt_in_": {
+        "name": "txt_in."
+      },
+      "vector_in_": {
+        "name": "vector_in."
+      }
+    }
+  },
+  "ModelMergeLTXV": {
+    "display_name": "ModelMergeLTXV",
+    "inputs": {
+      "adaln_single_": {
+        "name": "adaln_single."
+      },
+      "caption_projection_": {
+        "name": "caption_projection."
+      },
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "patchify_proj_": {
+        "name": "patchify_proj."
+      },
+      "proj_out_": {
+        "name": "proj_out."
+      },
+      "scale_shift_table": {
+        "name": "scale_shift_table"
+      },
+      "transformer_blocks_0_": {
+        "name": "transformer_blocks.0."
+      },
+      "transformer_blocks_10_": {
+        "name": "transformer_blocks.10."
+      },
+      "transformer_blocks_11_": {
+        "name": "transformer_blocks.11."
+      },
+      "transformer_blocks_12_": {
+        "name": "transformer_blocks.12."
+      },
+      "transformer_blocks_13_": {
+        "name": "transformer_blocks.13."
+      },
+      "transformer_blocks_14_": {
+        "name": "transformer_blocks.14."
+      },
+      "transformer_blocks_15_": {
+        "name": "transformer_blocks.15."
+      },
+      "transformer_blocks_16_": {
+        "name": "transformer_blocks.16."
+      },
+      "transformer_blocks_17_": {
+        "name": "transformer_blocks.17."
+      },
+      "transformer_blocks_18_": {
+        "name": "transformer_blocks.18."
+      },
+      "transformer_blocks_19_": {
+        "name": "transformer_blocks.19."
+      },
+      "transformer_blocks_1_": {
+        "name": "transformer_blocks.1."
+      },
+      "transformer_blocks_20_": {
+        "name": "transformer_blocks.20."
+      },
+      "transformer_blocks_21_": {
+        "name": "transformer_blocks.21."
+      },
+      "transformer_blocks_22_": {
+        "name": "transformer_blocks.22."
+      },
+      "transformer_blocks_23_": {
+        "name": "transformer_blocks.23."
+      },
+      "transformer_blocks_24_": {
+        "name": "transformer_blocks.24."
+      },
+      "transformer_blocks_25_": {
+        "name": "transformer_blocks.25."
+      },
+      "transformer_blocks_26_": {
+        "name": "transformer_blocks.26."
+      },
+      "transformer_blocks_27_": {
+        "name": "transformer_blocks.27."
+      },
+      "transformer_blocks_2_": {
+        "name": "transformer_blocks.2."
+      },
+      "transformer_blocks_3_": {
+        "name": "transformer_blocks.3."
+      },
+      "transformer_blocks_4_": {
+        "name": "transformer_blocks.4."
+      },
+      "transformer_blocks_5_": {
+        "name": "transformer_blocks.5."
+      },
+      "transformer_blocks_6_": {
+        "name": "transformer_blocks.6."
+      },
+      "transformer_blocks_7_": {
+        "name": "transformer_blocks.7."
+      },
+      "transformer_blocks_8_": {
+        "name": "transformer_blocks.8."
+      },
+      "transformer_blocks_9_": {
+        "name": "transformer_blocks.9."
+      }
+    }
+  },
+  "ModelMergeMochiPreview": {
+    "display_name": "ModelMergeMochiPreview",
+    "inputs": {
+      "blocks_0_": {
+        "name": "blocks.0."
+      },
+      "blocks_10_": {
+        "name": "blocks.10."
+      },
+      "blocks_11_": {
+        "name": "blocks.11."
+      },
+      "blocks_12_": {
+        "name": "blocks.12."
+      },
+      "blocks_13_": {
+        "name": "blocks.13."
+      },
+      "blocks_14_": {
+        "name": "blocks.14."
+      },
+      "blocks_15_": {
+        "name": "blocks.15."
+      },
+      "blocks_16_": {
+        "name": "blocks.16."
+      },
+      "blocks_17_": {
+        "name": "blocks.17."
+      },
+      "blocks_18_": {
+        "name": "blocks.18."
+      },
+      "blocks_19_": {
+        "name": "blocks.19."
+      },
+      "blocks_1_": {
+        "name": "blocks.1."
+      },
+      "blocks_20_": {
+        "name": "blocks.20."
+      },
+      "blocks_21_": {
+        "name": "blocks.21."
+      },
+      "blocks_22_": {
+        "name": "blocks.22."
+      },
+      "blocks_23_": {
+        "name": "blocks.23."
+      },
+      "blocks_24_": {
+        "name": "blocks.24."
+      },
+      "blocks_25_": {
+        "name": "blocks.25."
+      },
+      "blocks_26_": {
+        "name": "blocks.26."
+      },
+      "blocks_27_": {
+        "name": "blocks.27."
+      },
+      "blocks_28_": {
+        "name": "blocks.28."
+      },
+      "blocks_29_": {
+        "name": "blocks.29."
+      },
+      "blocks_2_": {
+        "name": "blocks.2."
+      },
+      "blocks_30_": {
+        "name": "blocks.30."
+      },
+      "blocks_31_": {
+        "name": "blocks.31."
+      },
+      "blocks_32_": {
+        "name": "blocks.32."
+      },
+      "blocks_33_": {
+        "name": "blocks.33."
+      },
+      "blocks_34_": {
+        "name": "blocks.34."
+      },
+      "blocks_35_": {
+        "name": "blocks.35."
+      },
+      "blocks_36_": {
+        "name": "blocks.36."
+      },
+      "blocks_37_": {
+        "name": "blocks.37."
+      },
+      "blocks_38_": {
+        "name": "blocks.38."
+      },
+      "blocks_39_": {
+        "name": "blocks.39."
+      },
+      "blocks_3_": {
+        "name": "blocks.3."
+      },
+      "blocks_40_": {
+        "name": "blocks.40."
+      },
+      "blocks_41_": {
+        "name": "blocks.41."
+      },
+      "blocks_42_": {
+        "name": "blocks.42."
+      },
+      "blocks_43_": {
+        "name": "blocks.43."
+      },
+      "blocks_44_": {
+        "name": "blocks.44."
+      },
+      "blocks_45_": {
+        "name": "blocks.45."
+      },
+      "blocks_46_": {
+        "name": "blocks.46."
+      },
+      "blocks_47_": {
+        "name": "blocks.47."
+      },
+      "blocks_4_": {
+        "name": "blocks.4."
+      },
+      "blocks_5_": {
+        "name": "blocks.5."
+      },
+      "blocks_6_": {
+        "name": "blocks.6."
+      },
+      "blocks_7_": {
+        "name": "blocks.7."
+      },
+      "blocks_8_": {
+        "name": "blocks.8."
+      },
+      "blocks_9_": {
+        "name": "blocks.9."
+      },
+      "final_layer_": {
+        "name": "final_layer."
+      },
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "pos_frequencies_": {
+        "name": "pos_frequencies."
+      },
+      "t5_y_embedder_": {
+        "name": "t5_y_embedder."
+      },
+      "t5_yproj_": {
+        "name": "t5_yproj."
+      },
+      "t_embedder_": {
+        "name": "t_embedder."
+      }
+    }
+  },
+  "ModelMergeQwenImage": {
+    "display_name": "ModelMergeQwenImage",
+    "inputs": {
+      "img_in_": {
+        "name": "img_in."
+      },
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "pos_embeds_": {
+        "name": "pos_embeds."
+      },
+      "proj_out_": {
+        "name": "proj_out."
+      },
+      "time_text_embed_": {
+        "name": "time_text_embed."
+      },
+      "transformer_blocks_0_": {
+        "name": "transformer_blocks.0."
+      },
+      "transformer_blocks_10_": {
+        "name": "transformer_blocks.10."
+      },
+      "transformer_blocks_11_": {
+        "name": "transformer_blocks.11."
+      },
+      "transformer_blocks_12_": {
+        "name": "transformer_blocks.12."
+      },
+      "transformer_blocks_13_": {
+        "name": "transformer_blocks.13."
+      },
+      "transformer_blocks_14_": {
+        "name": "transformer_blocks.14."
+      },
+      "transformer_blocks_15_": {
+        "name": "transformer_blocks.15."
+      },
+      "transformer_blocks_16_": {
+        "name": "transformer_blocks.16."
+      },
+      "transformer_blocks_17_": {
+        "name": "transformer_blocks.17."
+      },
+      "transformer_blocks_18_": {
+        "name": "transformer_blocks.18."
+      },
+      "transformer_blocks_19_": {
+        "name": "transformer_blocks.19."
+      },
+      "transformer_blocks_1_": {
+        "name": "transformer_blocks.1."
+      },
+      "transformer_blocks_20_": {
+        "name": "transformer_blocks.20."
+      },
+      "transformer_blocks_21_": {
+        "name": "transformer_blocks.21."
+      },
+      "transformer_blocks_22_": {
+        "name": "transformer_blocks.22."
+      },
+      "transformer_blocks_23_": {
+        "name": "transformer_blocks.23."
+      },
+      "transformer_blocks_24_": {
+        "name": "transformer_blocks.24."
+      },
+      "transformer_blocks_25_": {
+        "name": "transformer_blocks.25."
+      },
+      "transformer_blocks_26_": {
+        "name": "transformer_blocks.26."
+      },
+      "transformer_blocks_27_": {
+        "name": "transformer_blocks.27."
+      },
+      "transformer_blocks_28_": {
+        "name": "transformer_blocks.28."
+      },
+      "transformer_blocks_29_": {
+        "name": "transformer_blocks.29."
+      },
+      "transformer_blocks_2_": {
+        "name": "transformer_blocks.2."
+      },
+      "transformer_blocks_30_": {
+        "name": "transformer_blocks.30."
+      },
+      "transformer_blocks_31_": {
+        "name": "transformer_blocks.31."
+      },
+      "transformer_blocks_32_": {
+        "name": "transformer_blocks.32."
+      },
+      "transformer_blocks_33_": {
+        "name": "transformer_blocks.33."
+      },
+      "transformer_blocks_34_": {
+        "name": "transformer_blocks.34."
+      },
+      "transformer_blocks_35_": {
+        "name": "transformer_blocks.35."
+      },
+      "transformer_blocks_36_": {
+        "name": "transformer_blocks.36."
+      },
+      "transformer_blocks_37_": {
+        "name": "transformer_blocks.37."
+      },
+      "transformer_blocks_38_": {
+        "name": "transformer_blocks.38."
+      },
+      "transformer_blocks_39_": {
+        "name": "transformer_blocks.39."
+      },
+      "transformer_blocks_3_": {
+        "name": "transformer_blocks.3."
+      },
+      "transformer_blocks_40_": {
+        "name": "transformer_blocks.40."
+      },
+      "transformer_blocks_41_": {
+        "name": "transformer_blocks.41."
+      },
+      "transformer_blocks_42_": {
+        "name": "transformer_blocks.42."
+      },
+      "transformer_blocks_43_": {
+        "name": "transformer_blocks.43."
+      },
+      "transformer_blocks_44_": {
+        "name": "transformer_blocks.44."
+      },
+      "transformer_blocks_45_": {
+        "name": "transformer_blocks.45."
+      },
+      "transformer_blocks_46_": {
+        "name": "transformer_blocks.46."
+      },
+      "transformer_blocks_47_": {
+        "name": "transformer_blocks.47."
+      },
+      "transformer_blocks_48_": {
+        "name": "transformer_blocks.48."
+      },
+      "transformer_blocks_49_": {
+        "name": "transformer_blocks.49."
+      },
+      "transformer_blocks_4_": {
+        "name": "transformer_blocks.4."
+      },
+      "transformer_blocks_50_": {
+        "name": "transformer_blocks.50."
+      },
+      "transformer_blocks_51_": {
+        "name": "transformer_blocks.51."
+      },
+      "transformer_blocks_52_": {
+        "name": "transformer_blocks.52."
+      },
+      "transformer_blocks_53_": {
+        "name": "transformer_blocks.53."
+      },
+      "transformer_blocks_54_": {
+        "name": "transformer_blocks.54."
+      },
+      "transformer_blocks_55_": {
+        "name": "transformer_blocks.55."
+      },
+      "transformer_blocks_56_": {
+        "name": "transformer_blocks.56."
+      },
+      "transformer_blocks_57_": {
+        "name": "transformer_blocks.57."
+      },
+      "transformer_blocks_58_": {
+        "name": "transformer_blocks.58."
+      },
+      "transformer_blocks_59_": {
+        "name": "transformer_blocks.59."
+      },
+      "transformer_blocks_5_": {
+        "name": "transformer_blocks.5."
+      },
+      "transformer_blocks_6_": {
+        "name": "transformer_blocks.6."
+      },
+      "transformer_blocks_7_": {
+        "name": "transformer_blocks.7."
+      },
+      "transformer_blocks_8_": {
+        "name": "transformer_blocks.8."
+      },
+      "transformer_blocks_9_": {
+        "name": "transformer_blocks.9."
+      },
+      "txt_in_": {
+        "name": "txt_in."
+      },
+      "txt_norm_": {
+        "name": "txt_norm."
+      }
+    }
+  },
+  "ModelMergeSD1": {
+    "display_name": "ModelMergeSD1",
+    "inputs": {
+      "input_blocks_0_": {
+        "name": "input_blocks.0."
+      },
+      "input_blocks_10_": {
+        "name": "input_blocks.10."
+      },
+      "input_blocks_11_": {
+        "name": "input_blocks.11."
+      },
+      "input_blocks_1_": {
+        "name": "input_blocks.1."
+      },
+      "input_blocks_2_": {
+        "name": "input_blocks.2."
+      },
+      "input_blocks_3_": {
+        "name": "input_blocks.3."
+      },
+      "input_blocks_4_": {
+        "name": "input_blocks.4."
+      },
+      "input_blocks_5_": {
+        "name": "input_blocks.5."
+      },
+      "input_blocks_6_": {
+        "name": "input_blocks.6."
+      },
+      "input_blocks_7_": {
+        "name": "input_blocks.7."
+      },
+      "input_blocks_8_": {
+        "name": "input_blocks.8."
+      },
+      "input_blocks_9_": {
+        "name": "input_blocks.9."
+      },
+      "label_emb_": {
+        "name": "label_emb."
+      },
+      "middle_block_0_": {
+        "name": "middle_block.0."
+      },
+      "middle_block_1_": {
+        "name": "middle_block.1."
+      },
+      "middle_block_2_": {
+        "name": "middle_block.2."
+      },
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "out_": {
+        "name": "out."
+      },
+      "output_blocks_0_": {
+        "name": "output_blocks.0."
+      },
+      "output_blocks_10_": {
+        "name": "output_blocks.10."
+      },
+      "output_blocks_11_": {
+        "name": "output_blocks.11."
+      },
+      "output_blocks_1_": {
+        "name": "output_blocks.1."
+      },
+      "output_blocks_2_": {
+        "name": "output_blocks.2."
+      },
+      "output_blocks_3_": {
+        "name": "output_blocks.3."
+      },
+      "output_blocks_4_": {
+        "name": "output_blocks.4."
+      },
+      "output_blocks_5_": {
+        "name": "output_blocks.5."
+      },
+      "output_blocks_6_": {
+        "name": "output_blocks.6."
+      },
+      "output_blocks_7_": {
+        "name": "output_blocks.7."
+      },
+      "output_blocks_8_": {
+        "name": "output_blocks.8."
+      },
+      "output_blocks_9_": {
+        "name": "output_blocks.9."
+      },
+      "time_embed_": {
+        "name": "time_embed."
+      }
+    }
+  },
+  "ModelMergeSD2": {
+    "display_name": "ModelMergeSD2",
+    "inputs": {
+      "input_blocks_0_": {
+        "name": "input_blocks.0."
+      },
+      "input_blocks_10_": {
+        "name": "input_blocks.10."
+      },
+      "input_blocks_11_": {
+        "name": "input_blocks.11."
+      },
+      "input_blocks_1_": {
+        "name": "input_blocks.1."
+      },
+      "input_blocks_2_": {
+        "name": "input_blocks.2."
+      },
+      "input_blocks_3_": {
+        "name": "input_blocks.3."
+      },
+      "input_blocks_4_": {
+        "name": "input_blocks.4."
+      },
+      "input_blocks_5_": {
+        "name": "input_blocks.5."
+      },
+      "input_blocks_6_": {
+        "name": "input_blocks.6."
+      },
+      "input_blocks_7_": {
+        "name": "input_blocks.7."
+      },
+      "input_blocks_8_": {
+        "name": "input_blocks.8."
+      },
+      "input_blocks_9_": {
+        "name": "input_blocks.9."
+      },
+      "label_emb_": {
+        "name": "label_emb."
+      },
+      "middle_block_0_": {
+        "name": "middle_block.0."
+      },
+      "middle_block_1_": {
+        "name": "middle_block.1."
+      },
+      "middle_block_2_": {
+        "name": "middle_block.2."
+      },
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "out_": {
+        "name": "out."
+      },
+      "output_blocks_0_": {
+        "name": "output_blocks.0."
+      },
+      "output_blocks_10_": {
+        "name": "output_blocks.10."
+      },
+      "output_blocks_11_": {
+        "name": "output_blocks.11."
+      },
+      "output_blocks_1_": {
+        "name": "output_blocks.1."
+      },
+      "output_blocks_2_": {
+        "name": "output_blocks.2."
+      },
+      "output_blocks_3_": {
+        "name": "output_blocks.3."
+      },
+      "output_blocks_4_": {
+        "name": "output_blocks.4."
+      },
+      "output_blocks_5_": {
+        "name": "output_blocks.5."
+      },
+      "output_blocks_6_": {
+        "name": "output_blocks.6."
+      },
+      "output_blocks_7_": {
+        "name": "output_blocks.7."
+      },
+      "output_blocks_8_": {
+        "name": "output_blocks.8."
+      },
+      "output_blocks_9_": {
+        "name": "output_blocks.9."
+      },
+      "time_embed_": {
+        "name": "time_embed."
+      }
+    }
+  },
+  "ModelMergeSD35_Large": {
+    "display_name": "ModelMergeSD35_Large",
+    "inputs": {
+      "context_embedder_": {
+        "name": "context_embedder."
+      },
+      "final_layer_": {
+        "name": "final_layer."
+      },
+      "joint_blocks_0_": {
+        "name": "joint_blocks.0."
+      },
+      "joint_blocks_10_": {
+        "name": "joint_blocks.10."
+      },
+      "joint_blocks_11_": {
+        "name": "joint_blocks.11."
+      },
+      "joint_blocks_12_": {
+        "name": "joint_blocks.12."
+      },
+      "joint_blocks_13_": {
+        "name": "joint_blocks.13."
+      },
+      "joint_blocks_14_": {
+        "name": "joint_blocks.14."
+      },
+      "joint_blocks_15_": {
+        "name": "joint_blocks.15."
+      },
+      "joint_blocks_16_": {
+        "name": "joint_blocks.16."
+      },
+      "joint_blocks_17_": {
+        "name": "joint_blocks.17."
+      },
+      "joint_blocks_18_": {
+        "name": "joint_blocks.18."
+      },
+      "joint_blocks_19_": {
+        "name": "joint_blocks.19."
+      },
+      "joint_blocks_1_": {
+        "name": "joint_blocks.1."
+      },
+      "joint_blocks_20_": {
+        "name": "joint_blocks.20."
+      },
+      "joint_blocks_21_": {
+        "name": "joint_blocks.21."
+      },
+      "joint_blocks_22_": {
+        "name": "joint_blocks.22."
+      },
+      "joint_blocks_23_": {
+        "name": "joint_blocks.23."
+      },
+      "joint_blocks_24_": {
+        "name": "joint_blocks.24."
+      },
+      "joint_blocks_25_": {
+        "name": "joint_blocks.25."
+      },
+      "joint_blocks_26_": {
+        "name": "joint_blocks.26."
+      },
+      "joint_blocks_27_": {
+        "name": "joint_blocks.27."
+      },
+      "joint_blocks_28_": {
+        "name": "joint_blocks.28."
+      },
+      "joint_blocks_29_": {
+        "name": "joint_blocks.29."
+      },
+      "joint_blocks_2_": {
+        "name": "joint_blocks.2."
+      },
+      "joint_blocks_30_": {
+        "name": "joint_blocks.30."
+      },
+      "joint_blocks_31_": {
+        "name": "joint_blocks.31."
+      },
+      "joint_blocks_32_": {
+        "name": "joint_blocks.32."
+      },
+      "joint_blocks_33_": {
+        "name": "joint_blocks.33."
+      },
+      "joint_blocks_34_": {
+        "name": "joint_blocks.34."
+      },
+      "joint_blocks_35_": {
+        "name": "joint_blocks.35."
+      },
+      "joint_blocks_36_": {
+        "name": "joint_blocks.36."
+      },
+      "joint_blocks_37_": {
+        "name": "joint_blocks.37."
+      },
+      "joint_blocks_3_": {
+        "name": "joint_blocks.3."
+      },
+      "joint_blocks_4_": {
+        "name": "joint_blocks.4."
+      },
+      "joint_blocks_5_": {
+        "name": "joint_blocks.5."
+      },
+      "joint_blocks_6_": {
+        "name": "joint_blocks.6."
+      },
+      "joint_blocks_7_": {
+        "name": "joint_blocks.7."
+      },
+      "joint_blocks_8_": {
+        "name": "joint_blocks.8."
+      },
+      "joint_blocks_9_": {
+        "name": "joint_blocks.9."
+      },
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "pos_embed_": {
+        "name": "pos_embed."
+      },
+      "t_embedder_": {
+        "name": "t_embedder."
+      },
+      "x_embedder_": {
+        "name": "x_embedder."
+      },
+      "y_embedder_": {
+        "name": "y_embedder."
+      }
+    }
+  },
+  "ModelMergeSD3_2B": {
+    "display_name": "ModelMergeSD3_2B",
+    "inputs": {
+      "context_embedder_": {
+        "name": "context_embedder."
+      },
+      "final_layer_": {
+        "name": "final_layer."
+      },
+      "joint_blocks_0_": {
+        "name": "joint_blocks.0."
+      },
+      "joint_blocks_10_": {
+        "name": "joint_blocks.10."
+      },
+      "joint_blocks_11_": {
+        "name": "joint_blocks.11."
+      },
+      "joint_blocks_12_": {
+        "name": "joint_blocks.12."
+      },
+      "joint_blocks_13_": {
+        "name": "joint_blocks.13."
+      },
+      "joint_blocks_14_": {
+        "name": "joint_blocks.14."
+      },
+      "joint_blocks_15_": {
+        "name": "joint_blocks.15."
+      },
+      "joint_blocks_16_": {
+        "name": "joint_blocks.16."
+      },
+      "joint_blocks_17_": {
+        "name": "joint_blocks.17."
+      },
+      "joint_blocks_18_": {
+        "name": "joint_blocks.18."
+      },
+      "joint_blocks_19_": {
+        "name": "joint_blocks.19."
+      },
+      "joint_blocks_1_": {
+        "name": "joint_blocks.1."
+      },
+      "joint_blocks_20_": {
+        "name": "joint_blocks.20."
+      },
+      "joint_blocks_21_": {
+        "name": "joint_blocks.21."
+      },
+      "joint_blocks_22_": {
+        "name": "joint_blocks.22."
+      },
+      "joint_blocks_23_": {
+        "name": "joint_blocks.23."
+      },
+      "joint_blocks_2_": {
+        "name": "joint_blocks.2."
+      },
+      "joint_blocks_3_": {
+        "name": "joint_blocks.3."
+      },
+      "joint_blocks_4_": {
+        "name": "joint_blocks.4."
+      },
+      "joint_blocks_5_": {
+        "name": "joint_blocks.5."
+      },
+      "joint_blocks_6_": {
+        "name": "joint_blocks.6."
+      },
+      "joint_blocks_7_": {
+        "name": "joint_blocks.7."
+      },
+      "joint_blocks_8_": {
+        "name": "joint_blocks.8."
+      },
+      "joint_blocks_9_": {
+        "name": "joint_blocks.9."
+      },
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "pos_embed_": {
+        "name": "pos_embed."
+      },
+      "t_embedder_": {
+        "name": "t_embedder."
+      },
+      "x_embedder_": {
+        "name": "x_embedder."
+      },
+      "y_embedder_": {
+        "name": "y_embedder."
+      }
+    }
+  },
+  "ModelMergeSDXL": {
+    "display_name": "ModelMergeSDXL",
+    "inputs": {
+      "input_blocks_0": {
+        "name": "input_blocks.0"
+      },
+      "input_blocks_1": {
+        "name": "input_blocks.1"
+      },
+      "input_blocks_2": {
+        "name": "input_blocks.2"
+      },
+      "input_blocks_3": {
+        "name": "input_blocks.3"
+      },
+      "input_blocks_4": {
+        "name": "input_blocks.4"
+      },
+      "input_blocks_5": {
+        "name": "input_blocks.5"
+      },
+      "input_blocks_6": {
+        "name": "input_blocks.6"
+      },
+      "input_blocks_7": {
+        "name": "input_blocks.7"
+      },
+      "input_blocks_8": {
+        "name": "input_blocks.8"
+      },
+      "label_emb_": {
+        "name": "label_emb."
+      },
+      "middle_block_0": {
+        "name": "middle_block.0"
+      },
+      "middle_block_1": {
+        "name": "middle_block.1"
+      },
+      "middle_block_2": {
+        "name": "middle_block.2"
+      },
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "out_": {
+        "name": "out."
+      },
+      "output_blocks_0": {
+        "name": "output_blocks.0"
+      },
+      "output_blocks_1": {
+        "name": "output_blocks.1"
+      },
+      "output_blocks_2": {
+        "name": "output_blocks.2"
+      },
+      "output_blocks_3": {
+        "name": "output_blocks.3"
+      },
+      "output_blocks_4": {
+        "name": "output_blocks.4"
+      },
+      "output_blocks_5": {
+        "name": "output_blocks.5"
+      },
+      "output_blocks_6": {
+        "name": "output_blocks.6"
+      },
+      "output_blocks_7": {
+        "name": "output_blocks.7"
+      },
+      "output_blocks_8": {
+        "name": "output_blocks.8"
+      },
+      "time_embed_": {
+        "name": "time_embed."
+      }
+    }
+  },
+  "ModelMergeSimple": {
+    "display_name": "ModelMergeSimple",
+    "inputs": {
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "ratio": {
+        "name": "proporção"
+      }
+    }
+  },
+  "ModelMergeSubtract": {
+    "display_name": "ModelMergeSubtract",
+    "inputs": {
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "multiplier": {
+        "name": "multiplicador"
+      }
+    }
+  },
+  "ModelMergeWAN2_1": {
+    "description": "O modelo de 1,3B possui 30 blocos, o modelo de 14B possui 40 blocos. O modelo de imagem para vídeo possui o img_emb extra.",
+    "display_name": "ModelMergeWAN2_1",
+    "inputs": {
+      "blocks_0_": {
+        "name": "blocks.0."
+      },
+      "blocks_10_": {
+        "name": "blocks.10."
+      },
+      "blocks_11_": {
+        "name": "blocks.11."
+      },
+      "blocks_12_": {
+        "name": "blocks.12."
+      },
+      "blocks_13_": {
+        "name": "blocks.13."
+      },
+      "blocks_14_": {
+        "name": "blocks.14."
+      },
+      "blocks_15_": {
+        "name": "blocks.15."
+      },
+      "blocks_16_": {
+        "name": "blocks.16."
+      },
+      "blocks_17_": {
+        "name": "blocks.17."
+      },
+      "blocks_18_": {
+        "name": "blocks.18."
+      },
+      "blocks_19_": {
+        "name": "blocks.19."
+      },
+      "blocks_1_": {
+        "name": "blocks.1."
+      },
+      "blocks_20_": {
+        "name": "blocks.20."
+      },
+      "blocks_21_": {
+        "name": "blocks.21."
+      },
+      "blocks_22_": {
+        "name": "blocks.22."
+      },
+      "blocks_23_": {
+        "name": "blocks.23."
+      },
+      "blocks_24_": {
+        "name": "blocks.24."
+      },
+      "blocks_25_": {
+        "name": "blocks.25."
+      },
+      "blocks_26_": {
+        "name": "blocks.26."
+      },
+      "blocks_27_": {
+        "name": "blocks.27."
+      },
+      "blocks_28_": {
+        "name": "blocks.28."
+      },
+      "blocks_29_": {
+        "name": "blocks.29."
+      },
+      "blocks_2_": {
+        "name": "blocks.2."
+      },
+      "blocks_30_": {
+        "name": "blocks.30."
+      },
+      "blocks_31_": {
+        "name": "blocks.31."
+      },
+      "blocks_32_": {
+        "name": "blocks.32."
+      },
+      "blocks_33_": {
+        "name": "blocks.33."
+      },
+      "blocks_34_": {
+        "name": "blocks.34."
+      },
+      "blocks_35_": {
+        "name": "blocks.35."
+      },
+      "blocks_36_": {
+        "name": "blocks.36."
+      },
+      "blocks_37_": {
+        "name": "blocks.37."
+      },
+      "blocks_38_": {
+        "name": "blocks.38."
+      },
+      "blocks_39_": {
+        "name": "blocks.39."
+      },
+      "blocks_3_": {
+        "name": "blocks.3."
+      },
+      "blocks_4_": {
+        "name": "blocks.4."
+      },
+      "blocks_5_": {
+        "name": "blocks.5."
+      },
+      "blocks_6_": {
+        "name": "blocks.6."
+      },
+      "blocks_7_": {
+        "name": "blocks.7."
+      },
+      "blocks_8_": {
+        "name": "blocks.8."
+      },
+      "blocks_9_": {
+        "name": "blocks.9."
+      },
+      "head_": {
+        "name": "head."
+      },
+      "img_emb_": {
+        "name": "img_emb."
+      },
+      "model1": {
+        "name": "model1"
+      },
+      "model2": {
+        "name": "model2"
+      },
+      "patch_embedding_": {
+        "name": "patch_embedding."
+      },
+      "text_embedding_": {
+        "name": "text_embedding."
+      },
+      "time_embedding_": {
+        "name": "time_embedding."
+      },
+      "time_projection_": {
+        "name": "time_projection."
+      }
+    }
+  },
+  "ModelPatchLoader": {
+    "display_name": "ModelPatchLoader",
+    "inputs": {
+      "name": {
+        "name": "nome"
+      }
+    }
+  },
+  "ModelSamplingAuraFlow": {
+    "display_name": "ModelSamplingAuraFlow",
+    "inputs": {
+      "model": {
+        "name": "modelo"
+      },
+      "shift": {
+        "name": "deslocamento"
+      }
+    }
+  },
+  "ModelSamplingContinuousEDM": {
+    "display_name": "ModelSamplingContinuousEDM",
+    "inputs": {
+      "model": {
+        "name": "modelo"
+      },
+      "sampling": {
+        "name": "amostragem"
+      },
+      "sigma_max": {
+        "name": "sigma_máx"
+      },
+      "sigma_min": {
+        "name": "sigma_mín"
+      }
+    }
+  },
+  "ModelSamplingContinuousV": {
+    "display_name": "ModelSamplingContinuousV",
+    "inputs": {
+      "model": {
+        "name": "modelo"
+      },
+      "sampling": {
+        "name": "amostragem"
+      },
+      "sigma_max": {
+        "name": "sigma_máx"
+      },
+      "sigma_min": {
+        "name": "sigma_mín"
+      }
+    }
+  },
+  "ModelSamplingDiscrete": {
+    "display_name": "ModelSamplingDiscrete",
+    "inputs": {
+      "model": {
+        "name": "modelo"
+      },
+      "sampling": {
+        "name": "amostragem"
+      },
+      "zsnr": {
+        "name": "zsnr"
+      }
+    }
+  },
+  "ModelSamplingFlux": {
+    "display_name": "ModelSamplingFlux",
+    "inputs": {
+      "base_shift": {
+        "name": "deslocamento_base"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "max_shift": {
+        "name": "deslocamento_máx"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "width": {
+        "name": "largura"
+      }
+    }
+  },
+  "ModelSamplingLTXV": {
+    "display_name": "ModelSamplingLTXV",
+    "inputs": {
+      "base_shift": {
+        "name": "deslocamento_base"
+      },
+      "latent": {
+        "name": "latente"
+      },
+      "max_shift": {
+        "name": "deslocamento_máx"
+      },
+      "model": {
+        "name": "modelo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ModelSamplingSD3": {
+    "display_name": "ModelSamplingSD3",
+    "inputs": {
+      "model": {
+        "name": "modelo"
+      },
+      "shift": {
+        "name": "deslocamento"
+      }
+    }
+  },
+  "ModelSamplingStableCascade": {
+    "display_name": "ModelSamplingStableCascade",
+    "inputs": {
+      "model": {
+        "name": "modelo"
+      },
+      "shift": {
+        "name": "deslocamento"
+      }
+    }
+  },
+  "ModelSave": {
+    "display_name": "ModelSave",
+    "inputs": {
+      "filename_prefix": {
+        "name": "prefixo_do_arquivo"
+      },
+      "model": {
+        "name": "modelo"
+      }
+    }
+  },
+  "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": {
+      "image": {
+        "name": "image"
+      },
+      "kernel_size": {
+        "name": "kernel_size"
+      },
+      "operation": {
+        "name": "operation"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "NAGuidance": {
+    "description": "Aplica Orientação de Atenção Normalizada aos modelos, permitindo prompts negativos em modelos distilled/schnell.",
+    "display_name": "Orientação de Atenção Normalizada",
+    "inputs": {
+      "model": {
+        "name": "modelo",
+        "tooltip": "O modelo ao qual aplicar o NAG."
+      },
+      "nag_alpha": {
+        "name": "nag_alpha",
+        "tooltip": "Fator de mesclagem para a atenção normalizada. 1.0 é substituição total, 0.0 não tem efeito."
+      },
+      "nag_scale": {
+        "name": "escala_nag",
+        "tooltip": "O fator de escala da orientação. Valores mais altos afastam mais do prompt negativo."
+      },
+      "nag_tau": {
+        "name": "nag_tau"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "O modelo modificado com NAG ativado."
+      }
+    }
+  },
+  "NormalizeImages": {
+    "display_name": "Normalizar Imagens",
+    "inputs": {
+      "images": {
+        "name": "images",
+        "tooltip": "Imagem a ser processada."
+      },
+      "mean": {
+        "name": "mean",
+        "tooltip": "Valor médio para normalização."
+      },
+      "std": {
+        "name": "std",
+        "tooltip": "Desvio padrão para normalização."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Imagens processadas"
+      }
+    }
+  },
+  "NormalizeVideoLatentStart": {
+    "description": "Normaliza os quadros iniciais de um latent de vídeo para corresponder à média e ao desvio padrão dos quadros de referência subsequentes. Ajuda a reduzir diferenças entre os quadros iniciais e o restante do vídeo.",
+    "display_name": "Normalizar Início do Latent de Vídeo",
+    "inputs": {
+      "latent": {
+        "name": "latent"
+      },
+      "reference_frame_count": {
+        "name": "reference_frame_count",
+        "tooltip": "Número de quadros latentes após os quadros iniciais a serem usados como referência"
+      },
+      "start_frame_count": {
+        "name": "start_frame_count",
+        "tooltip": "Número de quadros latentes a normalizar, contados a partir do início"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "OpenAIChatConfig": {
+    "description": "Permite especificar opções avançadas de configuração para os Nós de Chat OpenAI.",
+    "display_name": "Opções Avançadas do OpenAI ChatGPT",
+    "inputs": {
+      "instructions": {
+        "name": "instructions",
+        "tooltip": "Instruções para o modelo sobre como gerar a resposta."
+      },
+      "max_output_tokens": {
+        "name": "max_output_tokens",
+        "tooltip": "Um limite superior para o número de tokens que podem ser gerados em uma resposta, incluindo tokens de saída visíveis."
+      },
+      "truncation": {
+        "name": "truncation",
+        "tooltip": "A estratégia de truncamento a ser usada para a resposta do modelo. auto: Se o contexto desta resposta e das anteriores exceder o tamanho da janela de contexto do modelo, o modelo irá truncar a resposta para caber na janela de contexto, removendo itens de entrada no meio da conversa. disabled: Se uma resposta do modelo exceder o tamanho da janela de contexto, a solicitação falhará com um erro 400."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "OpenAIChatNode": {
+    "description": "Gera respostas em texto a partir de um modelo OpenAI.",
+    "display_name": "OpenAI ChatGPT",
+    "inputs": {
+      "advanced_options": {
+        "name": "advanced_options",
+        "tooltip": "Configuração opcional para o modelo. Aceita entradas do nó OpenAI Chat Advanced Options."
+      },
+      "files": {
+        "name": "files",
+        "tooltip": "Arquivo(s) opcional(is) para usar como contexto para o modelo. Aceita entradas do nó OpenAI Chat Input Files."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Imagem(ns) opcional(is) para usar como contexto para o modelo. Para incluir várias imagens, você pode usar o nó Batch Images."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "O modelo utilizado para gerar a resposta."
+      },
+      "persist_context": {
+        "name": "persist_context",
+        "tooltip": "Este parâmetro está obsoleto e não tem efeito."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Entradas de texto para o modelo, usadas para gerar uma resposta."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "OpenAIDalle2": {
+    "description": "Gera imagens de forma síncrona via endpoint DALL·E 2 da OpenAI.",
+    "display_name": "OpenAI DALL·E 2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "Imagem de referência opcional para edição de imagem."
+      },
+      "mask": {
+        "name": "mask",
+        "tooltip": "Máscara opcional para inpainting (áreas brancas serão substituídas)"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "Quantas imagens gerar"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt de texto para o DALL·E"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "ainda não implementado no backend"
+      },
+      "size": {
+        "name": "size",
+        "tooltip": "Tamanho da imagem"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "OpenAIDalle3": {
+    "description": "Gera imagens de forma síncrona via endpoint DALL·E 3 da OpenAI.",
+    "display_name": "OpenAI DALL·E 3",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt de texto para o DALL·E"
+      },
+      "quality": {
+        "name": "qualidade",
+        "tooltip": "Qualidade da imagem"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "ainda não implementado no backend"
+      },
+      "size": {
+        "name": "tamanho",
+        "tooltip": "Tamanho da imagem"
+      },
+      "style": {
+        "name": "estilo",
+        "tooltip": "Vivo faz o modelo tender a gerar imagens hiper-realistas e dramáticas. Natural faz o modelo produzir imagens mais naturais, com aparência menos hiper-realista."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "OpenAIGPTImage1": {
+    "description": "Gera imagens de forma síncrona via endpoint GPT Image 1 da OpenAI.",
+    "display_name": "OpenAI GPT Image 1",
+    "inputs": {
+      "background": {
+        "name": "fundo",
+        "tooltip": "Retornar imagem com ou sem fundo"
+      },
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "image": {
+        "name": "imagem",
+        "tooltip": "Imagem de referência opcional para edição de imagem."
+      },
+      "mask": {
+        "name": "mask",
+        "tooltip": "Máscara opcional para inpainting (áreas brancas serão substituídas)"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "Quantas imagens gerar"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt de texto para GPT Image"
+      },
+      "quality": {
+        "name": "qualidade",
+        "tooltip": "Qualidade da imagem, afeta o custo e o tempo de geração."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "ainda não implementado no backend"
+      },
+      "size": {
+        "name": "tamanho",
+        "tooltip": "Tamanho da imagem"
+      }
+    },
+    "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",
+    "inputs": {
+      "OPENAI_INPUT_FILES": {
+        "name": "OPENAI_INPUT_FILES",
+        "tooltip": "Arquivo(s) adicional(is) opcional(is) para agrupar junto com o arquivo carregado deste nó. Permite o encadeamento de arquivos de entrada para que uma única mensagem possa incluir múltiplos arquivos."
+      },
+      "file": {
+        "name": "arquivo",
+        "tooltip": "Arquivos de entrada para incluir como contexto para o modelo. Aceita apenas arquivos de texto (.txt) e PDF (.pdf) por enquanto."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "OpenAIVideoSora2": {
+    "description": "Geração de vídeo e áudio da OpenAI.",
+    "display_name": "OpenAI Sora - Vídeo",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "duration": {
+        "name": "duração"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Texto guia; pode estar vazio se houver uma imagem de entrada."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed para determinar se o nó deve ser executado novamente; os resultados reais são não determinísticos independentemente do seed."
+      },
+      "size": {
+        "name": "tamanho"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "OptimalStepsScheduler": {
+    "display_name": "Agendador de Passos Ótimos",
+    "inputs": {
+      "denoise": {
+        "name": "reduzir_ruído"
+      },
+      "model_type": {
+        "name": "tipo_de_modelo"
+      },
+      "steps": {
+        "name": "passos"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PairConditioningCombine": {
+    "display_name": "Combinar Par de Condições",
+    "inputs": {
+      "negative_A": {
+        "name": "negativo_A"
+      },
+      "negative_B": {
+        "name": "negativo_B"
+      },
+      "positive_A": {
+        "name": "positivo_A"
+      },
+      "positive_B": {
+        "name": "positivo_B"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo"
+      },
+      "1": {
+        "name": "negativo"
+      }
+    }
+  },
+  "PairConditioningSetDefaultCombine": {
+    "display_name": "Combinar Par de Condições Padrão",
+    "inputs": {
+      "hooks": {
+        "name": "ganchos"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "negative_DEFAULT": {
+        "name": "negativo_PADRÃO"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "positive_DEFAULT": {
+        "name": "positivo_PADRÃO"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo"
+      },
+      "1": {
+        "name": "negativo"
+      }
+    }
+  },
+  "PairConditioningSetProperties": {
+    "display_name": "Definir Propriedades do Par de Condições",
+    "inputs": {
+      "hooks": {
+        "name": "ganchos"
+      },
+      "mask": {
+        "name": "máscara"
+      },
+      "negative_NEW": {
+        "name": "negativo_NOVO"
+      },
+      "positive_NEW": {
+        "name": "positivo_NOVO"
+      },
+      "set_cond_area": {
+        "name": "definir_área_cond"
+      },
+      "strength": {
+        "name": "força"
+      },
+      "timesteps": {
+        "name": "etapas"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo"
+      },
+      "1": {
+        "name": "negativo"
+      }
+    }
+  },
+  "PairConditioningSetPropertiesAndCombine": {
+    "display_name": "Definir Propriedades e Combinar Par de Condições",
+    "inputs": {
+      "hooks": {
+        "name": "ganchos"
+      },
+      "mask": {
+        "name": "máscara"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "negative_NEW": {
+        "name": "negativo_NOVO"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "positive_NEW": {
+        "name": "positivo_NOVO"
+      },
+      "set_cond_area": {
+        "name": "definir_área_cond"
+      },
+      "strength": {
+        "name": "força"
+      },
+      "timesteps": {
+        "name": "etapas"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo"
+      },
+      "1": {
+        "name": "negativo"
+      }
+    }
+  },
+  "PatchModelAddDownscale": {
+    "display_name": "PatchModelAddDownscale (Kohya Deep Shrink)",
+    "inputs": {
+      "block_number": {
+        "name": "número_do_bloco"
+      },
+      "downscale_after_skip": {
+        "name": "reduzir_após_pular"
+      },
+      "downscale_factor": {
+        "name": "fator_de_redução"
+      },
+      "downscale_method": {
+        "name": "método_de_redução"
+      },
+      "end_percent": {
+        "name": "percentual_final"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "start_percent": {
+        "name": "percentual_inicial"
+      },
+      "upscale_method": {
+        "name": "método_de_ampliação"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PerpNeg": {
+    "display_name": "Perp-Neg (OBSOLETO por PerpNegGuider)",
+    "inputs": {
+      "empty_conditioning": {
+        "name": "empty_conditioning"
+      },
+      "model": {
+        "name": "model"
+      },
+      "neg_scale": {
+        "name": "neg_scale"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PerpNegGuider": {
+    "display_name": "PerpNegGuider",
+    "inputs": {
+      "cfg": {
+        "name": "cfg"
+      },
+      "empty_conditioning": {
+        "name": "empty_conditioning"
+      },
+      "model": {
+        "name": "model"
+      },
+      "neg_scale": {
+        "name": "neg_scale"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PerturbedAttentionGuidance": {
+    "display_name": "PerturbedAttentionGuidance",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "scale": {
+        "name": "scale"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PhotoMakerEncode": {
+    "display_name": "PhotoMakerEncode",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "photomaker": {
+        "name": "photomaker"
+      },
+      "text": {
+        "name": "texto"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PhotoMakerLoader": {
+    "display_name": "PhotoMakerLoader",
+    "inputs": {
+      "photomaker_model_name": {
+        "name": "photomaker_model_name"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PixverseImageToVideoNode": {
+    "description": "Gera vídeos com base no prompt e no output_size.",
+    "display_name": "PixVerse Imagem para Vídeo",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "duration_seconds": {
+        "name": "duração_segundos"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "motion_mode": {
+        "name": "modo_de_movimento"
+      },
+      "negative_prompt": {
+        "name": "prompt_negativo",
+        "tooltip": "Uma descrição opcional em texto de elementos indesejados em uma imagem."
+      },
+      "pixverse_template": {
+        "name": "pixverse_template",
+        "tooltip": "Um template opcional para influenciar o estilo da geração, criado pelo nó PixVerse Template."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para a geração do vídeo"
+      },
+      "quality": {
+        "name": "qualidade"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "Semente para geração do vídeo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PixverseTemplateNode": {
+    "display_name": "PixVerse Template",
+    "inputs": {
+      "template": {
+        "name": "template"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "pixverse_template",
+        "tooltip": null
+      }
+    }
+  },
+  "PixverseTextToVideoNode": {
+    "description": "Gera vídeos com base no prompt e no output_size.",
+    "display_name": "PixVerse Texto para Vídeo",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration_seconds": {
+        "name": "duration_seconds"
+      },
+      "motion_mode": {
+        "name": "motion_mode"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Uma descrição opcional de elementos indesejados em uma imagem."
+      },
+      "pixverse_template": {
+        "name": "pixverse_template",
+        "tooltip": "Um template opcional para influenciar o estilo da geração, criado pelo nó PixVerse Template."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para a geração do vídeo"
+      },
+      "quality": {
+        "name": "quality"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed para geração do vídeo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PixverseTransitionVideoNode": {
+    "description": "Gera vídeos com base no prompt e no output_size.",
+    "display_name": "PixVerse Transição de Vídeo",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration_seconds": {
+        "name": "duration_seconds"
+      },
+      "first_frame": {
+        "name": "first_frame"
+      },
+      "last_frame": {
+        "name": "last_frame"
+      },
+      "motion_mode": {
+        "name": "motion_mode"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Uma descrição opcional de elementos indesejados em uma imagem."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para a geração do vídeo"
+      },
+      "quality": {
+        "name": "quality"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed para geração do vídeo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PolyexponentialScheduler": {
+    "display_name": "PolyexponentialScheduler",
+    "inputs": {
+      "rho": {
+        "name": "rho"
+      },
+      "sigma_max": {
+        "name": "sigma_max"
+      },
+      "sigma_min": {
+        "name": "sigma_min"
+      },
+      "steps": {
+        "name": "steps"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PorterDuffImageComposite": {
+    "display_name": "Composição de Imagem Porter-Duff",
+    "inputs": {
+      "destination": {
+        "name": "destination"
+      },
+      "destination_alpha": {
+        "name": "destination_alpha"
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "source": {
+        "name": "source"
+      },
+      "source_alpha": {
+        "name": "source_alpha"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
+  "Preview3D": {
+    "display_name": "Pré-visualização 3D & Animação",
+    "inputs": {
+      "bg_image": {
+        "name": "bg_image"
+      },
+      "camera_info": {
+        "name": "camera_info"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "model_file": {
+        "name": "model_file",
+        "tooltip": "Arquivo de modelo 3D ou caminho do arquivo"
+      }
+    }
+  },
+  "PreviewAny": {
+    "display_name": "Pré-visualizar como Texto",
+    "inputs": {
+      "previewMode": {},
+      "preview_markdown": {
+        "name": "Pré-visualização"
+      },
+      "preview_text": {
+        "name": "Pré-visualização"
+      },
+      "source": {
+        "name": "source"
+      }
+    }
+  },
+  "PreviewAudio": {
+    "display_name": "Pré-visualizar Áudio",
+    "inputs": {
+      "audio": {
+        "name": "audio"
+      },
+      "audioUI": {
+        "name": "audioUI"
+      }
+    }
+  },
+  "PreviewImage": {
+    "description": "Salva as imagens de entrada no seu diretório de saída do ComfyUI.",
+    "display_name": "Imagem de Pré-visualização",
+    "inputs": {
+      "images": {
+        "name": "imagens"
+      }
+    }
+  },
+  "PrimitiveBoolean": {
+    "display_name": "Booleano",
+    "inputs": {
+      "value": {
+        "name": "valor"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PrimitiveBoundingBox": {
+    "display_name": "Caixa Delimitadora",
+    "inputs": {
+      "height": {
+        "name": "altura"
+      },
+      "width": {
+        "name": "largura"
+      },
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PrimitiveFloat": {
+    "display_name": "Ponto Flutuante",
+    "inputs": {
+      "value": {
+        "name": "valor"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PrimitiveInt": {
+    "display_name": "Inteiro",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "value": {
+        "name": "valor"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PrimitiveString": {
+    "display_name": "Texto",
+    "inputs": {
+      "value": {
+        "name": "valor"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "PrimitiveStringMultiline": {
+    "display_name": "Texto (Multilinha)",
+    "inputs": {
+      "value": {
+        "name": "valor"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "QuadrupleCLIPLoader": {
+    "description": "[Receitas]\n\nhidream: long clip-l, long clip-g, t5xxl, llama_8b_3.1_instruct",
+    "display_name": "QuadrupleCLIPLoader",
+    "inputs": {
+      "clip_name1": {
+        "name": "clip_name1"
+      },
+      "clip_name2": {
+        "name": "clip_name2"
+      },
+      "clip_name3": {
+        "name": "clip_name3"
+      },
+      "clip_name4": {
+        "name": "clip_name4"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "QwenImageDiffsynthControlnet": {
+    "display_name": "QwenImageDiffsynthControlnet",
+    "inputs": {
+      "image": {
+        "name": "imagem"
+      },
+      "mask": {
+        "name": "máscara"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "model_patch": {
+        "name": "patch do modelo"
+      },
+      "strength": {
+        "name": "força"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
+  "RandomCropImages": {
+    "display_name": "Corte Aleatório de Imagens",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "height": {
+        "name": "altura",
+        "tooltip": "Altura do corte."
+      },
+      "images": {
+        "name": "imagens",
+        "tooltip": "Imagem para processar."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "Semente aleatória."
+      },
+      "width": {
+        "name": "largura",
+        "tooltip": "Largura do corte."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "imagens",
+        "tooltip": "Imagens processadas"
+      }
+    }
+  },
+  "RandomNoise": {
+    "display_name": "Ruído Aleatório",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "noise_seed": {
+        "name": "semente do ruído"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RebatchImages": {
+    "display_name": "Reagrupar Imagens",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho do lote"
+      },
+      "images": {
+        "name": "imagens"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RebatchLatents": {
+    "display_name": "Reagrupar Latents",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "latents": {
+        "name": "latents"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecordAudio": {
+    "display_name": "Gravar Áudio",
+    "inputs": {
+      "audio": {
+        "name": "áudio"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftColorRGB": {
+    "description": "Crie uma cor Recraft escolhendo valores RGB específicos.",
+    "display_name": "Recraft Cor RGB",
+    "inputs": {
+      "b": {
+        "name": "b",
+        "tooltip": "Valor azul da cor."
+      },
+      "g": {
+        "name": "g",
+        "tooltip": "Valor verde da cor."
+      },
+      "r": {
+        "name": "r",
+        "tooltip": "Valor vermelho da cor."
+      },
+      "recraft_color": {
+        "name": "recraft_color"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "recraft_color",
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftControls": {
+    "description": "Crie Controles Recraft para personalizar a geração Recraft.",
+    "display_name": "Controles Recraft",
+    "inputs": {
+      "background_color": {
+        "name": "cor_de_fundo"
+      },
+      "colors": {
+        "name": "cores"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "recraft_controls",
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftCreateStyleNode": {
+    "description": "Crie um estilo personalizado a partir de imagens de referência. Faça upload de 1 a 5 imagens para usar como referência de estilo. O tamanho total de todas as imagens é limitado a 5 MB.",
+    "display_name": "Recraft Criar Estilo",
+    "inputs": {
+      "images": {
+        "name": "imagens"
+      },
+      "style": {
+        "name": "estilo",
+        "tooltip": "O estilo base das imagens geradas."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "id_estilo",
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftCreativeUpscaleNode": {
+    "description": "Aumente a imagem de forma síncrona.\nAprimora uma imagem rasterizada usando a ferramenta de ‘ampliação criativa’, aumentando a resolução com foco no refinamento de pequenos detalhes e rostos.",
+    "display_name": "Recraft Ampliação Criativa de Imagem",
+    "inputs": {
+      "image": {
+        "name": "imagem"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftCrispUpscaleNode": {
+    "description": "Aumente a imagem de forma síncrona.\nAprimora uma imagem rasterizada usando a ferramenta de ‘ampliação nítida’, aumentando a resolução da imagem, tornando-a mais nítida e limpa.",
+    "display_name": "Recraft Ampliação Nítida de Imagem",
+    "inputs": {
+      "image": {
+        "name": "imagem"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftImageInpaintingNode": {
+    "description": "Modifique a imagem com base no prompt e na máscara.",
+    "display_name": "Recraft Preenchimento de Imagem",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "mask": {
+        "name": "máscara"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "O número de imagens a serem geradas."
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Uma descrição opcional em texto de elementos indesejados em uma imagem."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para a geração da imagem."
+      },
+      "recraft_style": {
+        "name": "recraft_style"
+      },
+      "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
+      }
+    }
+  },
+  "RecraftImageToImageNode": {
+    "description": "Modifique a imagem com base no prompt e intensidade.",
+    "display_name": "Recraft Imagem para Imagem",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "Número de imagens a serem geradas."
+      },
+      "negative_prompt": {
+        "name": "prompt_negativo",
+        "tooltip": "Uma descrição opcional em texto de elementos indesejados na imagem."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para a geração da imagem."
+      },
+      "recraft_controls": {
+        "name": "recraft_controls",
+        "tooltip": "Controles adicionais opcionais sobre a geração via o nó Recraft Controls."
+      },
+      "recraft_style": {
+        "name": "recraft_style"
+      },
+      "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."
+      },
+      "strength": {
+        "name": "intensidade",
+        "tooltip": "Define a diferença em relação à imagem original, deve estar em [0, 1], onde 0 significa quase idêntico e 1 significa semelhança mínima."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftRemoveBackgroundNode": {
+    "description": "Remove o fundo da imagem e retorna a imagem processada e a máscara.",
+    "display_name": "Recraft Remover Fundo",
+    "inputs": {
+      "image": {
+        "name": "imagem"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftReplaceBackgroundNode": {
+    "description": "Substitua o fundo da imagem com base no prompt fornecido.",
+    "display_name": "Recraft Substituir Fundo",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "Número de imagens a serem geradas."
+      },
+      "negative_prompt": {
+        "name": "prompt_negativo",
+        "tooltip": "Uma descrição opcional em texto de elementos indesejados na imagem."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para a geração da imagem."
+      },
+      "recraft_style": {
+        "name": "recraft_style"
+      },
+      "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
+      }
+    }
+  },
+  "RecraftStyleV3DigitalIllustration": {
+    "description": "Selecione o estilo realistic_image e subestilo opcional.",
+    "display_name": "Recraft Estilo - Ilustração Digital",
+    "inputs": {
+      "substyle": {
+        "name": "subestilo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "recraft_style",
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftStyleV3InfiniteStyleLibrary": {
+    "description": "Selecione o estilo com base no UUID pré-existente da Biblioteca de Estilos Infinita do Recraft.",
+    "display_name": "Recraft Estilo - Biblioteca de Estilos Infinita",
+    "inputs": {
+      "style_id": {
+        "name": "style_id",
+        "tooltip": "UUID do estilo da Biblioteca de Estilos Infinita."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "recraft_style",
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftStyleV3LogoRaster": {
+    "description": "Selecione o estilo realistic_image e subestilo opcional.",
+    "display_name": "Recraft Estilo - Logo Raster",
+    "inputs": {
+      "substyle": {
+        "name": "subestilo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "recraft_style",
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftStyleV3RealisticImage": {
+    "description": "Selecione o estilo realistic_image e um subestilo opcional.",
+    "display_name": "Recraft Style - Imagem Realista",
+    "inputs": {
+      "substyle": {
+        "name": "substyle"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "recraft_style",
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftTextToImageNode": {
+    "description": "Gera imagens de forma síncrona com base no prompt e na resolução.",
+    "display_name": "Recraft Texto para Imagem",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "O número de imagens a serem geradas."
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Uma descrição opcional em texto de elementos indesejados na imagem."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para a geração da imagem."
+      },
+      "recraft_controls": {
+        "name": "recraft_controls",
+        "tooltip": "Controles adicionais opcionais sobre a geração via o nó Recraft Controls."
+      },
+      "recraft_style": {
+        "name": "recraft_style"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed para determinar se o nó deve ser executado novamente; os resultados reais são não determinísticos independentemente do seed."
+      },
+      "size": {
+        "name": "size",
+        "tooltip": "O tamanho da imagem gerada."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftTextToVectorNode": {
+    "description": "Gera SVG de forma síncrona com base no prompt e na resolução.",
+    "display_name": "Recraft Texto para Vetor",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "O número de imagens a serem geradas."
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Uma descrição opcional em texto de elementos indesejados na imagem."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para a geração da imagem."
+      },
+      "recraft_controls": {
+        "name": "recraft_controls",
+        "tooltip": "Controles adicionais opcionais sobre a geração via o nó Recraft Controls."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed para determinar se o nó deve ser executado novamente; os resultados reais são não determinísticos independentemente do seed."
+      },
+      "size": {
+        "name": "size",
+        "tooltip": "O tamanho da imagem gerada."
+      },
+      "substyle": {
+        "name": "substyle"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftV4TextToImageNode": {
+    "description": "Gera imagens usando os modelos Recraft V4 ou V4 Pro.",
+    "display_name": "Recraft V4 Texto para Imagem",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "O modelo a ser usado para geração."
+      },
+      "model_size": {
+        "name": "tamanho"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "O número de imagens a serem geradas."
+      },
+      "negative_prompt": {
+        "name": "prompt_negativo",
+        "tooltip": "Uma descrição opcional em texto de elementos indesejados em uma imagem."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para a geração da imagem. Máximo de 10.000 caracteres."
+      },
+      "recraft_controls": {
+        "name": "recraft_controls",
+        "tooltip": "Controles adicionais opcionais sobre a geração via o nó Recraft Controls."
+      },
+      "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
+      }
+    }
+  },
+  "RecraftV4TextToVectorNode": {
+    "description": "Gera SVG usando os modelos Recraft V4 ou V4 Pro.",
+    "display_name": "Recraft V4 Texto para Vetor",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "O modelo a ser usado para geração."
+      },
+      "model_size": {
+        "name": "tamanho"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "O número de imagens a serem geradas."
+      },
+      "negative_prompt": {
+        "name": "prompt_negativo",
+        "tooltip": "Uma descrição opcional em texto de elementos indesejados em uma imagem."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt para a geração da imagem. Máximo de 10.000 caracteres."
+      },
+      "recraft_controls": {
+        "name": "recraft_controls",
+        "tooltip": "Controles adicionais opcionais sobre a geração via o nó Recraft Controls."
+      },
+      "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
+      }
+    }
+  },
+  "RecraftVectorizeImageNode": {
+    "description": "Gera SVG de forma síncrona a partir de uma imagem de entrada.",
+    "display_name": "Recraft Vetorizar Imagem",
+    "inputs": {
+      "image": {
+        "name": "image"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ReferenceLatent": {
+    "description": "Este nó define o latent de referência para um modelo de edição. Se o modelo suportar, você pode encadear vários para definir múltiplas imagens de referência.",
+    "display_name": "ReferenceLatent",
+    "inputs": {
+      "conditioning": {
+        "name": "conditioning"
+      },
+      "latent": {
+        "name": "latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ReferenceTimbreAudio": {
+    "description": "Este nó define o áudio de referência para timbre (para ace step 1.5)",
+    "display_name": "ReferenceTimbreAudio",
+    "inputs": {
+      "conditioning": {
+        "name": "condicionamento"
+      },
+      "latent": {
+        "name": "latente"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RegexExtract": {
+    "display_name": "Extração por Regex",
+    "inputs": {
+      "case_insensitive": {
+        "name": "ignorar_maiusculas_minusculas"
+      },
+      "dotall": {
+        "name": "dotall"
+      },
+      "group_index": {
+        "name": "indice_grupo"
+      },
+      "mode": {
+        "name": "modo"
+      },
+      "multiline": {
+        "name": "multilinha"
+      },
+      "regex_pattern": {
+        "name": "regex_pattern"
+      },
+      "string": {
+        "name": "string"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RegexMatch": {
+    "display_name": "Correspondência Regex",
+    "inputs": {
+      "case_insensitive": {
+        "name": "ignorar_maiusculas_minusculas"
+      },
+      "dotall": {
+        "name": "dotall"
+      },
+      "multiline": {
+        "name": "multilinha"
+      },
+      "regex_pattern": {
+        "name": "regex_pattern"
+      },
+      "string": {
+        "name": "string"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "correspondencias",
+        "tooltip": null
+      }
+    }
+  },
+  "RegexReplace": {
+    "description": "Localize e substitua texto usando padrões regex.",
+    "display_name": "Substituir por Regex",
+    "inputs": {
+      "case_insensitive": {
+        "name": "ignorar_maiusculas_minusculas"
+      },
+      "count": {
+        "name": "quantidade",
+        "tooltip": "Número máximo de substituições a serem feitas. Defina como 0 para substituir todas as ocorrências (padrão). Defina como 1 para substituir apenas a primeira correspondência, 2 para as duas primeiras, etc."
+      },
+      "dotall": {
+        "name": "dotall",
+        "tooltip": "Quando ativado, o ponto (.) corresponderá a qualquer caractere, incluindo quebras de linha. Quando desativado, pontos não corresponderão a quebras de linha."
+      },
+      "multiline": {
+        "name": "multilinha"
+      },
+      "regex_pattern": {
+        "name": "regex_pattern"
+      },
+      "replace": {
+        "name": "substituir"
+      },
+      "string": {
+        "name": "string"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RenormCFG": {
+    "display_name": "RenormCFG",
+    "inputs": {
+      "cfg_trunc": {
+        "name": "cfg_trunc"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "renorm_cfg": {
+        "name": "renorm_cfg"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RepeatImageBatch": {
+    "display_name": "Repetir Lote de Imagem",
+    "inputs": {
+      "amount": {
+        "name": "quantidade"
+      },
+      "image": {
+        "name": "imagem"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RepeatLatentBatch": {
+    "display_name": "Repetir Lote Latent",
+    "inputs": {
+      "amount": {
+        "name": "quantidade"
+      },
+      "samples": {
+        "name": "amostras"
+      }
+    }
+  },
+  "ReplaceText": {
+    "display_name": "Substituir Texto",
+    "inputs": {
+      "find": {
+        "name": "procurar",
+        "tooltip": "Texto a ser encontrado."
+      },
+      "replace": {
+        "name": "substituir",
+        "tooltip": "Texto para substituir."
+      },
+      "texts": {
+        "name": "textos",
+        "tooltip": "Texto a ser processado."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "textos",
+        "tooltip": "Textos processados"
+      }
+    }
+  },
+  "ReplaceVideoLatentFrames": {
+    "display_name": "ReplaceVideoLatentFrames",
+    "inputs": {
+      "destination": {
+        "name": "destino",
+        "tooltip": "O espaço latente de destino onde os quadros serão substituídos."
+      },
+      "index": {
+        "name": "índice",
+        "tooltip": "O índice inicial do quadro latente no destino onde os quadros do espaço latente de origem serão inseridos. Valores negativos contam a partir do final."
+      },
+      "source": {
+        "name": "origem",
+        "tooltip": "O espaço latente de origem fornecendo quadros para inserir no espaço latente de destino. Se não for fornecido, o espaço latente de destino é retornado sem alterações."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RescaleCFG": {
+    "display_name": "RescaleCFG",
+    "inputs": {
+      "model": {
+        "name": "modelo"
+      },
+      "multiplier": {
+        "name": "multiplicador"
+      }
+    }
+  },
+  "ResizeAndPadImage": {
+    "display_name": "ResizeAndPadImage",
+    "inputs": {
+      "image": {
+        "name": "imagem"
+      },
+      "interpolation": {
+        "name": "interpolação"
+      },
+      "padding_color": {
+        "name": "cor_do_preenchimento"
+      },
+      "target_height": {
+        "name": "altura_alvo"
+      },
+      "target_width": {
+        "name": "largura_alvo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ResizeImageMaskNode": {
+    "description": "Redimensione uma imagem ou mask usando vários métodos de escala.",
+    "display_name": "Redimensionar Imagem/Máscara",
+    "inputs": {
+      "input": {
+        "name": "entrada"
+      },
+      "resize_type": {
+        "name": "tipo_de_redimensionamento",
+        "tooltip": "Selecione como redimensionar: por dimensões exatas, fator de escala, correspondendo a outra imagem, etc."
+      },
+      "resize_type_crop": {
+        "name": "cortar"
+      },
+      "resize_type_height": {
+        "name": "altura"
+      },
+      "resize_type_width": {
+        "name": "largura"
+      },
+      "scale_method": {
+        "name": "método_de_escala",
+        "tooltip": "Algoritmo de interpolação. 'area' é melhor para reduzir, 'lanczos' para aumentar, 'nearest-exact' para pixel art."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "redimensionado",
+        "tooltip": null
+      }
+    }
+  },
+  "ResizeImagesByLongerEdge": {
+    "display_name": "Redimensionar Imagens pela Borda Maior",
+    "inputs": {
+      "images": {
+        "name": "imagens",
+        "tooltip": "Imagem para processar."
+      },
+      "longer_edge": {
+        "name": "borda_maior",
+        "tooltip": "Comprimento alvo para a borda maior."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "imagens",
+        "tooltip": "Imagens processadas"
+      }
+    }
+  },
+  "ResizeImagesByShorterEdge": {
+    "display_name": "Redimensionar Imagens pela Borda Menor",
+    "inputs": {
+      "images": {
+        "name": "imagens",
+        "tooltip": "Imagem para processar."
+      },
+      "shorter_edge": {
+        "name": "borda_menor",
+        "tooltip": "Comprimento alvo para a borda menor."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "imagens",
+        "tooltip": "Imagens processadas"
+      }
+    }
+  },
+  "ResolutionBucket": {
+    "display_name": "Bucket de Resolução",
+    "inputs": {
+      "conditioning": {
+        "name": "condicionamento",
+        "tooltip": "Lista de listas de condicionamento (deve corresponder ao comprimento dos latentes)."
+      },
+      "latents": {
+        "name": "latentes",
+        "tooltip": "Lista de dicionários de espaço latente para agrupar por resolução."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latentes",
+        "tooltip": "Lista de dicionários de espaço latente em lotes, um por bucket de resolução."
+      },
+      "1": {
+        "name": "condicionamento",
+        "tooltip": "Lista de listas de condição, uma por bucket de resolução."
+      }
+    }
+  },
+  "ResolutionSelector": {
+    "description": "Calcula a largura e altura a partir da proporção de aspecto e do alvo de megapixels. Útil para definir as dimensões da Imagem Latent Vazia.",
+    "display_name": "Seletor de Resolução",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "proporção_de_aspecto",
+        "tooltip": "A proporção de aspecto para as dimensões de saída."
+      },
+      "megapixels": {
+        "name": "megapixels",
+        "tooltip": "Total de megapixels desejado. 1,0 MP ≈ 1024×1024 para quadrado."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "largura",
+        "tooltip": "Largura calculada em pixels (múltiplo de 8)."
+      },
+      "1": {
+        "name": "altura",
+        "tooltip": "Altura calculada em pixels (múltiplo de 8)."
+      }
+    }
+  },
+  "Rodin3D_Detail": {
+    "description": "Gerar ativos 3D usando a API Rodin",
+    "display_name": "Rodin 3D Gerar - Geração Detalhada",
+    "inputs": {
+      "Images": {
+        "name": "Imagens"
+      },
+      "Material_Type": {
+        "name": "Tipo de Material"
+      },
+      "Polygon_count": {
+        "name": "Contagem de Polígonos"
+      },
+      "Seed": {
+        "name": "Semente"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Caminho do Modelo 3D",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "Rodin3D_Gen2": {
+    "description": "Gerar ativos 3D usando a API Rodin",
+    "display_name": "Rodin 3D Gerar - Geração Gen-2",
+    "inputs": {
+      "Images": {
+        "name": "Imagens"
+      },
+      "Material_Type": {
+        "name": "Tipo de Material"
+      },
+      "Polygon_count": {
+        "name": "Contagem de Polígonos"
+      },
+      "Seed": {
+        "name": "Semente"
+      },
+      "TAPose": {
+        "name": "TAPose"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Caminho do Modelo 3D",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "Rodin3D_Regular": {
+    "description": "Gerar ativos 3D usando a API Rodin",
+    "display_name": "Rodin 3D Gerar - Geração Regular",
+    "inputs": {
+      "Images": {
+        "name": "Imagens"
+      },
+      "Material_Type": {
+        "name": "Tipo de Material"
+      },
+      "Polygon_count": {
+        "name": "Contagem de Polígonos"
+      },
+      "Seed": {
+        "name": "Semente"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Caminho do Modelo 3D",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "Rodin3D_Sketch": {
+    "description": "Gerar ativos 3D usando a API Rodin",
+    "display_name": "Rodin 3D Gerar - Geração de Esboço",
+    "inputs": {
+      "Images": {
+        "name": "Imagens"
+      },
+      "Seed": {
+        "name": "Semente"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Caminho do Modelo 3D",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "Rodin3D_Smooth": {
+    "description": "Gerar ativos 3D usando a API Rodin",
+    "display_name": "Rodin 3D Gerar - Geração Suave",
+    "inputs": {
+      "Images": {
+        "name": "Imagens"
+      },
+      "Material_Type": {
+        "name": "Tipo de Material"
+      },
+      "Polygon_count": {
+        "name": "Contagem de Polígonos"
+      },
+      "Seed": {
+        "name": "Semente"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Caminho do Modelo 3D",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "RunwayFirstLastFrameNode": {
+    "description": "Envie os quadros-chave inicial e final, escreva um prompt e gere um vídeo. Transições mais complexas, como casos em que o quadro final é completamente diferente do inicial, podem se beneficiar da duração mais longa de 10s. Isso dará mais tempo para a geração fazer uma transição suave entre as duas entradas. Antes de começar, revise estas melhores práticas para garantir que suas seleções de entrada ajudarão no sucesso da geração: https://help.runwayml.com/hc/en-us/articles/34170748696595-Creating-with-Keyframes-on-Gen-3.",
+    "display_name": "Runway Quadro Inicial-Final para Vídeo",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "duration": {
+        "name": "duração"
+      },
+      "end_frame": {
+        "name": "quadro_final",
+        "tooltip": "Quadro final a ser usado para o vídeo. Suportado apenas para gen3a_turbo."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt de texto para a geração"
+      },
+      "ratio": {
+        "name": "proporção"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "Semente aleatória para a geração"
+      },
+      "start_frame": {
+        "name": "quadro_inicial",
+        "tooltip": "Quadro inicial a ser usado para o vídeo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RunwayImageToVideoNodeGen3a": {
+    "description": "Gere um vídeo a partir de um único quadro inicial usando o modelo Gen3a Turbo. Antes de começar, revise estas melhores práticas para garantir que suas seleções de entrada ajudarão no sucesso da geração: https://help.runwayml.com/hc/en-us/articles/33927968552339-Creating-with-Act-One-on-Gen-3-Alpha-and-Turbo.",
+    "display_name": "Runway Imagem para Vídeo (Gen3a Turbo)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "duration": {
+        "name": "duração"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt de texto para a geração"
+      },
+      "ratio": {
+        "name": "proporção"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "Semente aleatória para a geração"
+      },
+      "start_frame": {
+        "name": "quadro_inicial",
+        "tooltip": "Quadro inicial a ser usado para o vídeo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RunwayImageToVideoNodeGen4": {
+    "description": "Gere um vídeo a partir de um único quadro inicial usando o modelo Gen4 Turbo. Antes de começar, revise estas melhores práticas para garantir que suas seleções de entrada ajudarão no sucesso da geração: https://help.runwayml.com/hc/en-us/articles/37327109429011-Creating-with-Gen-4-Video.",
+    "display_name": "Runway Imagem para Vídeo (Gen4 Turbo)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "duration": {
+        "name": "duração"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt de texto para a geração"
+      },
+      "ratio": {
+        "name": "proporção"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "Semente aleatória para a geração"
+      },
+      "start_frame": {
+        "name": "quadro_inicial",
+        "tooltip": "Quadro inicial a ser usado para o vídeo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RunwayTextToImageNode": {
+    "description": "Gere uma imagem a partir de um prompt de texto usando o modelo Gen 4 da Runway. Você também pode incluir uma imagem de referência para guiar a geração.",
+    "display_name": "Runway Texto para Imagem",
+    "inputs": {
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt de texto para a geração"
+      },
+      "ratio": {
+        "name": "proporção"
+      },
+      "reference_image": {
+        "name": "imagem_de_referência",
+        "tooltip": "Imagem de referência opcional para guiar a geração"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SDPoseDrawKeypoints": {
+    "display_name": "SDPoseDrawKeypoints",
+    "inputs": {
+      "draw_body": {
+        "name": "desenhar_corpo"
+      },
+      "draw_face": {
+        "name": "desenhar_rosto"
+      },
+      "draw_feet": {
+        "name": "desenhar_pés"
+      },
+      "draw_hands": {
+        "name": "desenhar_mãos"
+      },
+      "face_point_size": {
+        "name": "tamanho_do_ponto_do_rosto"
+      },
+      "keypoints": {
+        "name": "pontos-chave"
+      },
+      "score_threshold": {
+        "name": "limite_de_pontuação"
+      },
+      "stick_width": {
+        "name": "largura_da_linha"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SDPoseFaceBBoxes": {
+    "display_name": "SDPoseFaceBBoxes",
+    "inputs": {
+      "force_square": {
+        "name": "forçar_quadrado",
+        "tooltip": "Expande o eixo menor da caixa para que a região recortada seja sempre quadrada."
+      },
+      "keypoints": {
+        "name": "pontos-chave"
+      },
+      "scale": {
+        "name": "escala",
+        "tooltip": "Multiplicador para a área da caixa delimitadora ao redor de cada rosto detectado."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "caixas_delimitadoras",
+        "tooltip": "Caixas delimitadoras de rosto por quadro, compatíveis com a entrada de caixas do SDPoseKeypointExtractor."
+      }
+    }
+  },
+  "SDPoseKeypointExtractor": {
+    "description": "Extrai pontos-chave de pose das imagens usando o modelo SDPose: https://huggingface.co/Comfy-Org/SDPose/tree/main/checkpoints",
+    "display_name": "SDPoseKeypointExtractor",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "bboxes": {
+        "name": "caixas_delimitadoras",
+        "tooltip": "Caixas delimitadoras opcionais para detecções mais precisas. Necessário para detecção de múltiplas pessoas."
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "pontos-chave",
+        "tooltip": "Pontos-chave no formato de quadro OpenPose (canvas_width, canvas_height, pessoas)"
+      }
+    }
+  },
+  "SDTurboScheduler": {
+    "display_name": "SDTurboScheduler",
+    "inputs": {
+      "denoise": {
+        "name": "redução_de_ruído"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "steps": {
+        "name": "passos"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SD_4XUpscale_Conditioning": {
+    "display_name": "SD_4XUpscale_Conditioning",
+    "inputs": {
+      "images": {
+        "name": "imagens"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "noise_augmentation": {
+        "name": "aumento_de_ruído"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "scale_ratio": {
+        "name": "fator_de_escala"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "SV3D_Conditioning": {
+    "display_name": "SV3D_Conditioning",
+    "inputs": {
+      "clip_vision": {
+        "name": "clip_vision"
+      },
+      "elevation": {
+        "name": "elevação"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "init_image": {
+        "name": "imagem_inicial"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "video_frames": {
+        "name": "quadros_de_vídeo"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "SVD_img2vid_Conditioning": {
+    "display_name": "SVD_img2vid_Conditioning",
+    "inputs": {
+      "augmentation_level": {
+        "name": "nível_de_aumento"
+      },
+      "clip_vision": {
+        "name": "clip_vision"
+      },
+      "fps": {
+        "name": "fps"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "init_image": {
+        "name": "imagem_inicial"
+      },
+      "motion_bucket_id": {
+        "name": "id_bucket_movimento"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "video_frames": {
+        "name": "quadros_de_vídeo"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo"
+      },
+      "1": {
+        "name": "negativo"
+      },
+      "2": {
+        "name": "latent"
+      }
+    }
+  },
+  "SamplerCustom": {
+    "display_name": "SamplerCustom",
+    "inputs": {
+      "add_noise": {
+        "name": "adicionar_ruído"
+      },
+      "cfg": {
+        "name": "cfg"
+      },
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "latent_image": {
+        "name": "imagem_latente"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "noise_seed": {
+        "name": "semente_de_ruído"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "sampler": {
+        "name": "amostrador"
+      },
+      "sigmas": {
+        "name": "sigmas"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "saída",
+        "tooltip": null
+      },
+      "1": {
+        "name": "saída_denoisada",
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerCustomAdvanced": {
+    "display_name": "SamplerCustomAdvanced",
+    "inputs": {
+      "guider": {
+        "name": "guia"
+      },
+      "latent_image": {
+        "name": "imagem_latente"
+      },
+      "noise": {
+        "name": "ruído"
+      },
+      "sampler": {
+        "name": "amostrador"
+      },
+      "sigmas": {
+        "name": "sigmas"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "saída",
+        "tooltip": null
+      },
+      "1": {
+        "name": "saída_denoisada",
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerDPMAdaptative": {
+    "display_name": "SamplerDPMAdaptative",
+    "inputs": {
+      "accept_safety": {
+        "name": "aceitar_segurança"
+      },
+      "atol": {
+        "name": "atol"
+      },
+      "dcoeff": {
+        "name": "dcoeff"
+      },
+      "eta": {
+        "name": "eta"
+      },
+      "h_init": {
+        "name": "h_init"
+      },
+      "icoeff": {
+        "name": "icoeff"
+      },
+      "order": {
+        "name": "ordem"
+      },
+      "pcoeff": {
+        "name": "pcoeff"
+      },
+      "rtol": {
+        "name": "rtol"
+      },
+      "s_noise": {
+        "name": "s_ruído"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerDPMPP_2M_SDE": {
+    "display_name": "SamplerDPMPP_2M_SDE",
+    "inputs": {
+      "eta": {
+        "name": "eta"
+      },
+      "noise_device": {
+        "name": "dispositivo_de_ruído"
+      },
+      "s_noise": {
+        "name": "s_ruído"
+      },
+      "solver_type": {
+        "name": "tipo_de_solvedor"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerDPMPP_2S_Ancestral": {
+    "display_name": "SamplerDPMPP_2S_Ancestral",
+    "inputs": {
+      "eta": {
+        "name": "eta"
+      },
+      "s_noise": {
+        "name": "s_ruído"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerDPMPP_3M_SDE": {
+    "display_name": "SamplerDPMPP_3M_SDE",
+    "inputs": {
+      "eta": {
+        "name": "eta"
+      },
+      "noise_device": {
+        "name": "noise_device"
+      },
+      "s_noise": {
+        "name": "s_noise"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerDPMPP_SDE": {
+    "display_name": "SamplerDPMPP_SDE",
+    "inputs": {
+      "eta": {
+        "name": "eta"
+      },
+      "noise_device": {
+        "name": "noise_device"
+      },
+      "r": {
+        "name": "r"
+      },
+      "s_noise": {
+        "name": "s_noise"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerER_SDE": {
+    "display_name": "SamplerER_SDE",
+    "inputs": {
+      "eta": {
+        "name": "eta",
+        "tooltip": "Intensidade estocástica do SDE de tempo reverso.\nQuando eta=0, reduz para ODE determinístico. Esta configuração não se aplica ao tipo de solver ER-SDE."
+      },
+      "max_stage": {
+        "name": "max_stage"
+      },
+      "s_noise": {
+        "name": "s_noise"
+      },
+      "solver_type": {
+        "name": "solver_type"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerEulerAncestral": {
+    "display_name": "SamplerEulerAncestral",
+    "inputs": {
+      "eta": {
+        "name": "eta"
+      },
+      "s_noise": {
+        "name": "s_noise"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerEulerAncestralCFGPP": {
+    "display_name": "SamplerEulerAncestralCFG++",
+    "inputs": {
+      "eta": {
+        "name": "eta"
+      },
+      "s_noise": {
+        "name": "s_noise"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerEulerCFGpp": {
+    "display_name": "SamplerEulerCFG++",
+    "inputs": {
+      "version": {
+        "name": "versão"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerLCMUpscale": {
+    "display_name": "SamplerLCMUpscale",
+    "inputs": {
+      "scale_ratio": {
+        "name": "proporção_de_escala"
+      },
+      "scale_steps": {
+        "name": "etapas_de_escala"
+      },
+      "upscale_method": {
+        "name": "método_de_upscale"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerLMS": {
+    "display_name": "SamplerLMS",
+    "inputs": {
+      "order": {
+        "name": "ordem"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerSASolver": {
+    "display_name": "SamplerSASolver",
+    "inputs": {
+      "corrector_order": {
+        "name": "ordem_do_corretor"
+      },
+      "eta": {
+        "name": "eta"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "predictor_order": {
+        "name": "ordem_do_preditor"
+      },
+      "s_noise": {
+        "name": "s_noise"
+      },
+      "sde_end_percent": {
+        "name": "percentual_final_sde"
+      },
+      "sde_start_percent": {
+        "name": "percentual_inicial_sde"
+      },
+      "simple_order_2": {
+        "name": "ordem_simples_2"
+      },
+      "use_pece": {
+        "name": "usar_pece"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerSEEDS2": {
+    "description": "Este nó de amostragem pode representar vários amostradores:\n\nseeds_2\n- configuração padrão\n\nexp_heun_2_x0\n- solver_type=phi_2, r=1.0, eta=0.0\n\nexp_heun_2_x0_sde\n- solver_type=phi_2, r=1.0, eta=1.0, s_noise=1.0",
+    "display_name": "SamplerSEEDS2",
+    "inputs": {
+      "eta": {
+        "name": "eta",
+        "tooltip": "Intensidade estocástica"
+      },
+      "r": {
+        "name": "r",
+        "tooltip": "Tamanho relativo do passo para o estágio intermediário (nó c2)"
+      },
+      "s_noise": {
+        "name": "s_noise",
+        "tooltip": "Multiplicador de ruído SDE"
+      },
+      "solver_type": {
+        "name": "solver_type"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplingPercentToSigma": {
+    "display_name": "SamplingPercentToSigma",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "return_actual_sigma": {
+        "name": "return_actual_sigma",
+        "tooltip": "Retorna o valor sigma real em vez do valor usado para verificações de intervalo.\nIsso só afeta resultados em 0.0 e 1.0."
+      },
+      "sampling_percent": {
+        "name": "sampling_percent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "sigma_value",
+        "tooltip": null
+      }
+    }
+  },
+  "SaveAnimatedPNG": {
+    "display_name": "Salvar PNG Animado",
+    "inputs": {
+      "compress_level": {
+        "name": "nível_de_compressão"
+      },
+      "filename_prefix": {
+        "name": "prefixo_do_arquivo"
+      },
+      "fps": {
+        "name": "fps"
+      },
+      "images": {
+        "name": "imagens"
+      }
+    }
+  },
+  "SaveAnimatedWEBP": {
+    "display_name": "Salvar WEBP Animado",
+    "inputs": {
+      "filename_prefix": {
+        "name": "prefixo_do_arquivo"
+      },
+      "fps": {
+        "name": "fps"
+      },
+      "images": {
+        "name": "imagens"
+      },
+      "lossless": {
+        "name": "sem_perda"
+      },
+      "method": {
+        "name": "método"
+      },
+      "quality": {
+        "name": "qualidade"
+      }
+    }
+  },
+  "SaveAudio": {
+    "display_name": "Salvar Áudio (FLAC)",
+    "inputs": {
+      "audio": {
+        "name": "áudio"
+      },
+      "audioUI": {
+        "name": "audioUI"
+      },
+      "filename_prefix": {
+        "name": "prefixo_do_arquivo"
+      }
+    }
+  },
+  "SaveAudioMP3": {
+    "display_name": "Salvar Áudio (MP3)",
+    "inputs": {
+      "audio": {
+        "name": "áudio"
+      },
+      "audioUI": {
+        "name": "audioUI"
+      },
+      "filename_prefix": {
+        "name": "prefixo_do_arquivo"
+      },
+      "quality": {
+        "name": "qualidade"
+      }
+    }
+  },
+  "SaveAudioOpus": {
+    "display_name": "Salvar Áudio (Opus)",
+    "inputs": {
+      "audio": {
+        "name": "áudio"
+      },
+      "audioUI": {
+        "name": "audioUI"
+      },
+      "filename_prefix": {
+        "name": "prefixo_do_arquivo"
+      },
+      "quality": {
+        "name": "qualidade"
+      }
+    }
+  },
+  "SaveGLB": {
+    "display_name": "Salvar GLB",
+    "inputs": {
+      "filename_prefix": {
+        "name": "prefixo_do_arquivo"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "mesh": {
+        "name": "malha",
+        "tooltip": "Malha ou arquivo GLB para salvar"
+      }
+    }
+  },
+  "SaveImage": {
+    "description": "Salva as imagens de entrada no diretório de saída do seu ComfyUI.",
+    "display_name": "Salvar Imagem",
+    "inputs": {
+      "filename_prefix": {
+        "name": "prefixo_do_arquivo",
+        "tooltip": "O prefixo para o arquivo a ser salvo. Isso pode incluir informações de formatação como %date:yyyy-MM-dd% ou %Empty Latent Image.width% para incluir valores de nós."
+      },
+      "images": {
+        "name": "imagens",
+        "tooltip": "As imagens a serem salvas."
+      }
+    }
+  },
+  "SaveImageDataSetToFolder": {
+    "display_name": "Salvar Conjunto de Imagens na Pasta",
+    "inputs": {
+      "filename_prefix": {
+        "name": "prefixo_do_arquivo",
+        "tooltip": "Prefixo para os nomes dos arquivos de imagem salvos."
+      },
+      "folder_name": {
+        "name": "nome_da_pasta",
+        "tooltip": "Nome da pasta para salvar as imagens (dentro do diretório de saída)."
+      },
+      "images": {
+        "name": "imagens",
+        "tooltip": "Lista de imagens a serem salvas."
+      }
+    }
+  },
+  "SaveImageTextDataSetToFolder": {
+    "display_name": "Salvar Conjunto de Imagens e Textos na Pasta",
+    "inputs": {
+      "filename_prefix": {
+        "name": "prefixo_do_arquivo",
+        "tooltip": "Prefixo para os nomes dos arquivos de imagem salvos."
+      },
+      "folder_name": {
+        "name": "nome_da_pasta",
+        "tooltip": "Nome da pasta para salvar as imagens (dentro do diretório de saída)."
+      },
+      "images": {
+        "name": "imagens",
+        "tooltip": "Lista de imagens a serem salvas."
+      },
+      "texts": {
+        "name": "textos",
+        "tooltip": "Lista de legendas de texto a serem salvas."
+      }
+    }
+  },
+  "SaveImageWebsocket": {
+    "display_name": "SalvarImagemWebsocket",
+    "inputs": {
+      "images": {
+        "name": "imagens"
+      }
+    }
+  },
+  "SaveLatent": {
+    "display_name": "SalvarLatent",
+    "inputs": {
+      "filename_prefix": {
+        "name": "prefixo_do_arquivo"
+      },
+      "samples": {
+        "name": "amostras"
+      }
+    }
+  },
+  "SaveLoRA": {
+    "display_name": "Salvar Pesos LoRA",
+    "inputs": {
+      "lora": {
+        "name": "lora",
+        "tooltip": "O modelo LoRA a ser salvo. Não use o modelo com camadas LoRA."
+      },
+      "prefix": {
+        "name": "prefixo",
+        "tooltip": "O prefixo a ser usado para o arquivo LoRA salvo."
+      },
+      "steps": {
+        "name": "etapas",
+        "tooltip": "Opcional: O número de etapas para o qual o LoRA foi treinado, usado para nomear o arquivo salvo."
+      }
+    }
+  },
+  "SaveSVGNode": {
+    "description": "Salva arquivos SVG no disco.",
+    "display_name": "Salvar Nó SVG",
+    "inputs": {
+      "filename_prefix": {
+        "name": "prefixo_do_arquivo",
+        "tooltip": "O prefixo para o arquivo a ser salvo. Isso pode incluir informações de formatação como %date:yyyy-MM-dd% ou %Empty Latent Image.width% para incluir valores de nós."
+      },
+      "svg": {
+        "name": "svg"
+      }
+    }
+  },
+  "SaveTrainingDataset": {
+    "display_name": "Salvar Conjunto de Dados de Treinamento",
+    "inputs": {
+      "conditioning": {
+        "name": "condicionamento",
+        "tooltip": "Lista de listas de condicionamento do MakeTrainingDataset."
+      },
+      "folder_name": {
+        "name": "nome_da_pasta",
+        "tooltip": "Nome da pasta para salvar o conjunto de dados (dentro do diretório de saída)."
+      },
+      "latents": {
+        "name": "latents",
+        "tooltip": "Lista de dicionários de latent do MakeTrainingDataset."
+      },
+      "shard_size": {
+        "name": "tamanho_do_fragmento",
+        "tooltip": "Número de amostras por arquivo de fragmento."
+      }
+    }
+  },
+  "SaveVideo": {
+    "description": "Salva as imagens de entrada no diretório de saída do seu ComfyUI.",
+    "display_name": "Salvar Vídeo",
+    "inputs": {
+      "codec": {
+        "name": "codec",
+        "tooltip": "O codec a ser usado para o vídeo."
+      },
+      "filename_prefix": {
+        "name": "prefixo_do_arquivo",
+        "tooltip": "O prefixo para o arquivo a ser salvo. Isso pode incluir informações de formatação como %date:yyyy-MM-dd% ou %Empty Latent Image.width% para incluir valores de nós."
+      },
+      "format": {
+        "name": "formato",
+        "tooltip": "O formato para salvar o vídeo."
+      },
+      "video": {
+        "name": "vídeo",
+        "tooltip": "O vídeo a ser salvo."
+      }
+    }
+  },
+  "SaveWEBM": {
+    "display_name": "Salvar WEBM",
+    "inputs": {
+      "codec": {
+        "name": "codec"
+      },
+      "crf": {
+        "name": "crf",
+        "tooltip": "CRF mais alto significa menor qualidade e menor tamanho de arquivo, CRF mais baixo significa maior qualidade e maior tamanho de arquivo."
+      },
+      "filename_prefix": {
+        "name": "prefixo_do_arquivo"
+      },
+      "fps": {
+        "name": "fps"
+      },
+      "images": {
+        "name": "imagens"
+      }
+    }
+  },
+  "ScaleROPE": {
+    "description": "Escala e desloca o ROPE do modelo.",
+    "display_name": "Escalar ROPE",
+    "inputs": {
+      "model": {
+        "name": "modelo"
+      },
+      "scale_t": {
+        "name": "escala_t"
+      },
+      "scale_x": {
+        "name": "escala_x"
+      },
+      "scale_y": {
+        "name": "escala_y"
+      },
+      "shift_t": {
+        "name": "deslocamento_t"
+      },
+      "shift_x": {
+        "name": "deslocamento_x"
+      },
+      "shift_y": {
+        "name": "deslocamento_y"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SelfAttentionGuidance": {
+    "display_name": "Orientação por Self-Attention",
+    "inputs": {
+      "blur_sigma": {
+        "name": "sigma_de_desfoque"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "scale": {
+        "name": "escala"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SetClipHooks": {
+    "display_name": "Definir Hooks do CLIP",
+    "inputs": {
+      "apply_to_conds": {
+        "name": "aplicar_a_conds"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "hooks": {
+        "name": "hooks"
+      },
+      "schedule_clip": {
+        "name": "agendar_clip"
+      }
+    }
+  },
+  "SetFirstSigma": {
+    "display_name": "DefinirPrimeiroSigma",
+    "inputs": {
+      "sigma": {
+        "name": "sigma"
+      },
+      "sigmas": {
+        "name": "sigmas"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SetHookKeyframes": {
+    "display_name": "Definir Keyframes de Hook",
+    "inputs": {
+      "hook_kf": {
+        "name": "hook_kf"
+      },
+      "hooks": {
+        "name": "hooks"
+      }
+    }
+  },
+  "SetLatentNoiseMask": {
+    "display_name": "Definir Máscara de Ruído Latent",
+    "inputs": {
+      "mask": {
+        "name": "mask"
+      },
+      "samples": {
+        "name": "amostras"
+      }
+    }
+  },
+  "SetUnionControlNetType": {
+    "display_name": "DefinirTipoUnionControlNet",
+    "inputs": {
+      "control_net": {
+        "name": "control_net"
+      },
+      "type": {
+        "name": "tipo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ShuffleDataset": {
+    "display_name": "Embaralhar Conjunto de Imagens",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar após gerar"
+      },
+      "images": {
+        "name": "imagens",
+        "tooltip": "Lista de imagens para processar."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "Semente aleatória."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "imagens",
+        "tooltip": "Imagens processadas"
+      }
+    }
+  },
+  "ShuffleImageTextDataset": {
+    "display_name": "Embaralhar Conjunto Imagem-Texto",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar após gerar"
+      },
+      "images": {
+        "name": "imagens",
+        "tooltip": "Lista de imagens para embaralhar."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "Semente aleatória."
+      },
+      "texts": {
+        "name": "textos",
+        "tooltip": "Lista de textos para embaralhar."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "imagens",
+        "tooltip": "Imagens embaralhadas"
+      },
+      "1": {
+        "name": "textos",
+        "tooltip": "Textos embaralhados"
+      }
+    }
+  },
+  "SkipLayerGuidanceDiT": {
+    "description": "Versão genérica do nó SkipLayerGuidance que pode ser usada em qualquer modelo DiT.",
+    "display_name": "SkipLayerGuidanceDiT",
+    "inputs": {
+      "double_layers": {
+        "name": "camadas duplas"
+      },
+      "end_percent": {
+        "name": "percentual final"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "rescaling_scale": {
+        "name": "escala de reescalonamento"
+      },
+      "scale": {
+        "name": "escala"
+      },
+      "single_layers": {
+        "name": "camadas simples"
+      },
+      "start_percent": {
+        "name": "percentual inicial"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SkipLayerGuidanceDiTSimple": {
+    "description": "Versão simples do nó SkipLayerGuidanceDiT que apenas modifica a passagem uncond.",
+    "display_name": "SkipLayerGuidanceDiTSimple",
+    "inputs": {
+      "double_layers": {
+        "name": "camadas duplas"
+      },
+      "end_percent": {
+        "name": "percentual final"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "single_layers": {
+        "name": "camadas simples"
+      },
+      "start_percent": {
+        "name": "percentual inicial"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SkipLayerGuidanceSD3": {
+    "description": "Versão genérica do nó SkipLayerGuidance que pode ser usada em qualquer modelo DiT.",
+    "display_name": "SkipLayerGuidanceSD3",
+    "inputs": {
+      "end_percent": {
+        "name": "percentual_final"
+      },
+      "layers": {
+        "name": "camadas"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "scale": {
+        "name": "escala"
+      },
+      "start_percent": {
+        "name": "percentual_inicial"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SolidMask": {
+    "display_name": "SolidMask",
+    "inputs": {
+      "height": {
+        "name": "altura"
+      },
+      "value": {
+        "name": "valor"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SplitAudioChannels": {
+    "description": "Separa o áudio em canais esquerdo e direito.",
+    "display_name": "Dividir Canais de Áudio",
+    "inputs": {
+      "audio": {
+        "name": "áudio"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "esquerdo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "direito",
+        "tooltip": null
+      }
+    }
+  },
+  "SplitImageToTileList": {
+    "description": "Divide uma imagem em uma lista agrupada de blocos com uma sobreposição especificada.",
+    "display_name": "Dividir Imagem em Lista de Blocos",
+    "inputs": {
+      "image": {
+        "name": "image"
+      },
+      "overlap": {
+        "name": "overlap"
+      },
+      "tile_height": {
+        "name": "tile_height"
+      },
+      "tile_width": {
+        "name": "tile_width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SplitImageWithAlpha": {
+    "display_name": "Dividir Imagem com Alpha",
+    "inputs": {
+      "image": {
+        "name": "imagem"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
+  "SplitSigmas": {
+    "display_name": "SplitSigmas",
+    "inputs": {
+      "sigmas": {
+        "name": "sigmas"
+      },
+      "step": {
+        "name": "passo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "sigmas_altos",
+        "tooltip": null
+      },
+      "1": {
+        "name": "sigmas_baixos",
+        "tooltip": null
+      }
+    }
+  },
+  "SplitSigmasDenoise": {
+    "display_name": "SplitSigmasDenoise",
+    "inputs": {
+      "denoise": {
+        "name": "redução_de_ruído"
+      },
+      "sigmas": {
+        "name": "sigmas"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "sigmas_altos",
+        "tooltip": null
+      },
+      "1": {
+        "name": "sigmas_baixos",
+        "tooltip": null
+      }
+    }
+  },
+  "StabilityAudioInpaint": {
+    "description": "Transforma parte de uma amostra de áudio existente usando instruções de texto.",
+    "display_name": "Stability AI Audio Inpaint",
+    "inputs": {
+      "audio": {
+        "name": "áudio",
+        "tooltip": "O áudio deve ter entre 6 e 190 segundos de duração."
+      },
+      "control_after_generate": {
+        "name": "controle_após_gerar"
+      },
+      "duration": {
+        "name": "duração",
+        "tooltip": "Controla a duração em segundos do áudio gerado."
+      },
+      "mask_end": {
+        "name": "fim_da_mascara"
+      },
+      "mask_start": {
+        "name": "início_da_mascara"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente aleatória usada para a geração."
+      },
+      "steps": {
+        "name": "passos",
+        "tooltip": "Controla o número de etapas de amostragem."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StabilityAudioToAudio": {
+    "description": "Transforma amostras de áudio existentes em novas composições de alta qualidade usando instruções de texto.",
+    "display_name": "Stability AI Áudio para Áudio",
+    "inputs": {
+      "audio": {
+        "name": "áudio",
+        "tooltip": "O áudio deve ter entre 6 e 190 segundos de duração."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration": {
+        "name": "duração",
+        "tooltip": "Controla a duração em segundos do áudio gerado."
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente aleatória usada para a geração."
+      },
+      "steps": {
+        "name": "etapas",
+        "tooltip": "Controla o número de etapas de amostragem."
+      },
+      "strength": {
+        "name": "força",
+        "tooltip": "Parâmetro que controla o quanto o parâmetro de áudio influencia o áudio gerado."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StabilityStableImageSD_3_5Node": {
+    "description": "Gera imagens de forma síncrona com base no prompt e na resolução.",
+    "display_name": "Stability AI Stable Diffusion 3.5 Imagem",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "proporção",
+        "tooltip": "Proporção da imagem gerada."
+      },
+      "cfg_scale": {
+        "name": "cfg_scale",
+        "tooltip": "Quão estritamente o processo de difusão segue o texto do prompt (valores mais altos mantêm sua imagem mais próxima do prompt)"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "image_denoise": {
+        "name": "redução de ruído da imagem",
+        "tooltip": "Redução de ruído da imagem de entrada; 0.0 gera uma imagem idêntica à entrada, 1.0 é como se nenhuma imagem tivesse sido fornecida."
+      },
+      "model": {
+        "name": "model"
+      },
+      "negative_prompt": {
+        "name": "prompt negativo",
+        "tooltip": "Palavras-chave do que você não deseja ver na imagem de saída. Este é um recurso avançado."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "O que você deseja ver na imagem de saída. Um prompt forte e descritivo que define claramente elementos, cores e temas levará a melhores resultados."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente aleatória usada para criar o ruído."
+      },
+      "style_preset": {
+        "name": "estilo predefinido",
+        "tooltip": "Estilo desejado opcional da imagem gerada."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StabilityStableImageUltraNode": {
+    "description": "Gera imagens de forma síncrona com base no prompt e na resolução.",
+    "display_name": "Stability AI Stable Image Ultra",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "Proporção da imagem gerada."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "image"
+      },
+      "image_denoise": {
+        "name": "image_denoise",
+        "tooltip": "Denoise da imagem de entrada; 0.0 gera uma imagem idêntica à entrada, 1.0 é como se nenhuma imagem tivesse sido fornecida."
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Um texto descrevendo o que você NÃO deseja ver na imagem de saída. Este é um recurso avançado."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "O que você deseja ver na imagem de saída. Um prompt forte e descritivo que define claramente elementos, cores e assuntos levará a melhores resultados. Para controlar o peso de uma determinada palavra, use o formato `(palavra:peso)`, onde `palavra` é a palavra que você deseja controlar o peso e `peso` é um valor entre 0 e 1. Por exemplo: `O céu estava de um (azul:0.3) e (verde:0.8) intenso` indicaria um céu azul e verde, mas mais verde do que azul."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "A semente aleatória usada para criar o ruído."
+      },
+      "style_preset": {
+        "name": "style_preset",
+        "tooltip": "Estilo opcional desejado para a imagem gerada."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StabilityTextToAudio": {
+    "description": "Gera músicas e efeitos sonoros de alta qualidade a partir de descrições em texto.",
+    "display_name": "Stability AI Text To Audio",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration": {
+        "name": "duration",
+        "tooltip": "Controla a duração em segundos do áudio gerado."
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "A semente aleatória usada para a geração."
+      },
+      "steps": {
+        "name": "steps",
+        "tooltip": "Controla o número de etapas de amostragem."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StabilityUpscaleConservativeNode": {
+    "description": "Aumenta a resolução da imagem para 4K com alterações mínimas.",
+    "display_name": "Stability AI Upscale Conservative",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "creativity": {
+        "name": "creativity",
+        "tooltip": "Controla a probabilidade de criar detalhes adicionais não fortemente condicionados pela imagem inicial."
+      },
+      "image": {
+        "name": "image"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Palavras-chave do que você NÃO deseja ver na imagem de saída. Este é um recurso avançado."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "O que você deseja ver na imagem de saída. Um prompt forte e descritivo que define claramente elementos, cores e assuntos levará a melhores resultados."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "A semente aleatória usada para criar o ruído."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StabilityUpscaleCreativeNode": {
+    "description": "Aumente a resolução da imagem para 4K com alterações mínimas.",
+    "display_name": "Stability AI Upscale Criativo",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "creativity": {
+        "name": "criatividade",
+        "tooltip": "Controla a probabilidade de criar detalhes adicionais não fortemente condicionados pela imagem inicial."
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "negative_prompt": {
+        "name": "prompt_negativo",
+        "tooltip": "Palavras-chave do que você NÃO deseja ver na imagem de saída. Este é um recurso avançado."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "O que você deseja ver na imagem de saída. Um prompt forte e descritivo, que define claramente elementos, cores e assuntos, levará a melhores resultados."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente aleatória usada para criar o ruído."
+      },
+      "style_preset": {
+        "name": "estilo_predefinido",
+        "tooltip": "Estilo desejado opcional para a imagem gerada."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StabilityUpscaleFastNode": {
+    "description": "Aumenta rapidamente a imagem para 4x o tamanho original via chamada à API da Stability; indicado para imagens de baixa qualidade ou comprimidas.",
+    "display_name": "Stability AI Upscale Rápido",
+    "inputs": {
+      "image": {
+        "name": "imagem"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StableCascade_EmptyLatentImage": {
+    "display_name": "StableCascade_EmptyLatentImage",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "compression": {
+        "name": "compressão"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "stage_c",
+        "tooltip": null
+      },
+      "1": {
+        "name": "stage_b",
+        "tooltip": null
+      }
+    }
+  },
+  "StableCascade_StageB_Conditioning": {
+    "display_name": "StableCascade_StageB_Conditioning",
+    "inputs": {
+      "conditioning": {
+        "name": "condicionamento"
+      },
+      "stage_c": {
+        "name": "stage_c"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StableCascade_StageC_VAEEncode": {
+    "display_name": "StableCascade_StageC_VAEEncode",
+    "inputs": {
+      "compression": {
+        "name": "compressão"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "stage_c",
+        "tooltip": null
+      },
+      "1": {
+        "name": "stage_b",
+        "tooltip": null
+      }
+    }
+  },
+  "StableCascade_SuperResolutionControlnet": {
+    "display_name": "StableCascade_SuperResolutionControlnet",
+    "inputs": {
+      "image": {
+        "name": "imagem"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "controlnet_input",
+        "tooltip": null
+      },
+      "1": {
+        "name": "stage_c",
+        "tooltip": null
+      },
+      "2": {
+        "name": "stage_b",
+        "tooltip": null
+      }
+    }
+  },
+  "StableZero123_Conditioning": {
+    "display_name": "StableZero123_Conditioning",
+    "inputs": {
+      "azimuth": {
+        "name": "azimute"
+      },
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "clip_vision": {
+        "name": "clip_vision"
+      },
+      "elevation": {
+        "name": "elevação"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "init_image": {
+        "name": "imagem_inicial"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latente",
+        "tooltip": null
+      }
+    }
+  },
+  "StableZero123_Conditioning_Batched": {
+    "display_name": "StableZero123_Conditioning_Batched",
+    "inputs": {
+      "azimuth": {
+        "name": "azimute"
+      },
+      "azimuth_batch_increment": {
+        "name": "incremento_de_lote_de_azimute"
+      },
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "clip_vision": {
+        "name": "clip_vision"
+      },
+      "elevation": {
+        "name": "elevação"
+      },
+      "elevation_batch_increment": {
+        "name": "incremento_de_lote_de_elevacao"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "init_image": {
+        "name": "imagem_inicial"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latente",
+        "tooltip": null
+      }
+    }
+  },
+  "StringCompare": {
+    "display_name": "Comparar",
+    "inputs": {
+      "case_sensitive": {
+        "name": "diferenciar_maiusculas_minusculas"
+      },
+      "mode": {
+        "name": "modo"
+      },
+      "string_a": {
+        "name": "string_a"
+      },
+      "string_b": {
+        "name": "string_b"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StringConcatenate": {
+    "display_name": "Concatenar",
+    "inputs": {
+      "delimiter": {
+        "name": "delimitador"
+      },
+      "string_a": {
+        "name": "string_a"
+      },
+      "string_b": {
+        "name": "string_b"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StringContains": {
+    "display_name": "Contém",
+    "inputs": {
+      "case_sensitive": {
+        "name": "diferenciar_maiusculas_minusculas"
+      },
+      "string": {
+        "name": "string"
+      },
+      "substring": {
+        "name": "substring"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "contém",
+        "tooltip": null
+      }
+    }
+  },
+  "StringLength": {
+    "display_name": "Comprimento",
+    "inputs": {
+      "string": {
+        "name": "string"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "comprimento",
+        "tooltip": null
+      }
+    }
+  },
+  "StringReplace": {
+    "display_name": "Substituir",
+    "inputs": {
+      "find": {
+        "name": "encontrar"
+      },
+      "replace": {
+        "name": "substituir"
+      },
+      "string": {
+        "name": "string"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StringSubstring": {
+    "display_name": "Subsequência",
+    "inputs": {
+      "end": {
+        "name": "fim"
+      },
+      "start": {
+        "name": "início"
+      },
+      "string": {
+        "name": "string"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StringTrim": {
+    "display_name": "Remover Espaços",
+    "inputs": {
+      "mode": {
+        "name": "modo"
+      },
+      "string": {
+        "name": "string"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "StripWhitespace": {
+    "display_name": "Remover Espaços em Branco",
+    "inputs": {
+      "texts": {
+        "name": "textos",
+        "tooltip": "Texto para processar."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "textos",
+        "tooltip": "Textos processados"
+      }
+    }
+  },
+  "StyleModelApply": {
+    "display_name": "Aplicar Modelo de Estilo",
+    "inputs": {
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "conditioning": {
+        "name": "condicionamento"
+      },
+      "strength": {
+        "name": "força"
+      },
+      "strength_type": {
+        "name": "tipo_de_força"
+      },
+      "style_model": {
+        "name": "style_model"
+      }
+    }
+  },
+  "StyleModelLoader": {
+    "display_name": "Carregar Modelo de Estilo",
+    "inputs": {
+      "style_model_name": {
+        "name": "style_model_name"
+      }
+    }
+  },
+  "T5TokenizerOptions": {
+    "display_name": "Opções do T5Tokenizer",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "min_length": {
+        "name": "comprimento_mínimo"
+      },
+      "min_padding": {
+        "name": "preenchimento_mínimo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TCFG": {
+    "description": "TCFG – Tangential Damping CFG (2503.18137)\n\nRefina o uncond (negativo) para alinhar com o cond (positivo) e melhorar a qualidade.",
+    "display_name": "Tangential Damping CFG",
+    "inputs": {
+      "model": {
+        "name": "model"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "patched_model",
+        "tooltip": null
+      }
+    }
+  },
+  "TemporalScoreRescaling": {
+    "description": "[Função Pós-CFG]\nTSR - Redimensionamento Temporal de Pontuação (2510.01184)\n\nRedimensiona a pontuação ou o ruído do modelo para direcionar a diversidade da amostragem.\n",
+    "display_name": "TSR - Redimensionamento Temporal de Pontuação",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "tsr_k": {
+        "name": "tsr_k",
+        "tooltip": "Controla a intensidade do redimensionamento.\nValores menores de k produzem resultados mais detalhados; valores maiores de k produzem resultados mais suaves na geração de imagens. Definir k = 1 desativa o redimensionamento."
+      },
+      "tsr_sigma": {
+        "name": "tsr_sigma",
+        "tooltip": "Controla quão cedo o redimensionamento entra em efeito.\nValores maiores fazem efeito mais cedo."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "patched_model",
+        "tooltip": null
+      }
+    }
+  },
+  "Tencent3DPartNode": {
+    "description": "Realiza automaticamente a identificação e geração de componentes com base na estrutura do modelo.",
+    "display_name": "Hunyuan3D: Parte 3D",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controlar após gerar"
+      },
+      "model_3d": {
+        "name": "modelo_3d",
+        "tooltip": "Modelo 3D no formato FBX. O modelo deve ter menos de 30.000 faces."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente controla se o nó deve ser executado novamente; os resultados são não determinísticos independentemente da semente."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "TencentImageToModelNode": {
+    "display_name": "Hunyuan3D: Imagem(ns) para Modelo (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "face_count": {
+        "name": "número_de_faces"
+      },
+      "generate_type": {
+        "name": "tipo_de_geração"
+      },
+      "generate_type_pbr": {
+        "name": "pbr"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "image_back": {
+        "name": "imagem_traseira"
+      },
+      "image_left": {
+        "name": "imagem_esquerda"
+      },
+      "image_right": {
+        "name": "imagem_direita"
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "A opção LowPoly não está disponível para o modelo `3.1`."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente controla se o nó deve ser executado novamente; os resultados são não determinísticos independentemente da semente."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "arquivo_do_modelo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "OBJ",
+        "tooltip": null
+      }
+    }
+  },
+  "TencentTextToModelNode": {
+    "display_name": "Hunyuan3D: Texto para Modelo (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "face_count": {
+        "name": "número_de_faces"
+      },
+      "generate_type": {
+        "name": "tipo_de_geração"
+      },
+      "generate_type_pbr": {
+        "name": "pbr"
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "A opção LowPoly não está disponível para o modelo `3.1`."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Suporta até 1024 caracteres."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente controla se o nó deve ser executado novamente; os resultados são não determinísticos independentemente da semente."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "arquivo_do_modelo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "OBJ",
+        "tooltip": null
+      }
+    }
+  },
+  "TextEncodeAceStepAudio": {
+    "display_name": "TextEncodeAceStepAudio",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "lyrics": {
+        "name": "lyrics"
+      },
+      "lyrics_strength": {
+        "name": "lyrics_strength"
+      },
+      "tags": {
+        "name": "tags"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TextEncodeAceStepAudio1_5": {
+    "display_name": "TextEncodeAceStepAudio1.5",
+    "inputs": {
+      "bpm": {
+        "name": "bpm"
+      },
+      "cfg_scale": {
+        "name": "cfg_scale"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "duration": {
+        "name": "duração"
+      },
+      "generate_audio_codes": {
+        "name": "gerar_códigos_de_áudio",
+        "tooltip": "Ativa o LLM que gera códigos de áudio. Isso pode ser lento, mas aumentará a qualidade do áudio gerado. Desative se você fornecer uma referência de áudio ao modelo."
+      },
+      "keyscale": {
+        "name": "escala tonal"
+      },
+      "language": {
+        "name": "idioma"
+      },
+      "lyrics": {
+        "name": "letra"
+      },
+      "min_p": {
+        "name": "min_p"
+      },
+      "seed": {
+        "name": "semente"
+      },
+      "tags": {
+        "name": "tags"
+      },
+      "temperature": {
+        "name": "temperatura"
+      },
+      "timesignature": {
+        "name": "fórmula de compasso"
+      },
+      "top_k": {
+        "name": "top_k"
+      },
+      "top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TextEncodeHunyuanVideo_ImageToVideo": {
+    "display_name": "TextEncodeHunyuanVideo_ImageToVideo",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "image_interleave": {
+        "name": "image_interleave",
+        "tooltip": "Quanto a imagem influencia em relação ao prompt de texto. Um valor mais alto significa mais influência do prompt de texto."
+      },
+      "prompt": {
+        "name": "prompt"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TextEncodeQwenImageEdit": {
+    "display_name": "TextEncodeQwenImageEdit",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image": {
+        "name": "image"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TextEncodeQwenImageEditPlus": {
+    "display_name": "TextEncodeQwenImageEditPlus",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image1": {
+        "name": "image1"
+      },
+      "image2": {
+        "name": "image2"
+      },
+      "image3": {
+        "name": "image3"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TextEncodeZImageOmni": {
+    "display_name": "TextEncodeZImageOmni",
+    "inputs": {
+      "auto_resize_images": {
+        "name": "redimensionar_imagens_automaticamente"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "image1": {
+        "name": "imagem1"
+      },
+      "image2": {
+        "name": "imagem2"
+      },
+      "image3": {
+        "name": "imagem3"
+      },
+      "image_encoder": {
+        "name": "codificador_de_imagem"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TextGenerate": {
+    "display_name": "TextGenerate",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "max_length": {
+        "name": "comprimento_máximo"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "sampling_mode": {
+        "name": "modo_de_amostragem"
+      },
+      "sampling_mode_min_p": {
+        "name": "min_p"
+      },
+      "sampling_mode_repetition_penalty": {
+        "name": "penalidade_de_repetição"
+      },
+      "sampling_mode_seed": {
+        "name": "semente"
+      },
+      "sampling_mode_temperature": {
+        "name": "temperatura"
+      },
+      "sampling_mode_top_k": {
+        "name": "top_k"
+      },
+      "sampling_mode_top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "texto_gerado",
+        "tooltip": null
+      }
+    }
+  },
+  "TextGenerateLTX2Prompt": {
+    "display_name": "TextGenerateLTX2Prompt",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "max_length": {
+        "name": "comprimento_máximo"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "sampling_mode": {
+        "name": "modo_de_amostragem"
+      },
+      "sampling_mode_min_p": {
+        "name": "min_p"
+      },
+      "sampling_mode_repetition_penalty": {
+        "name": "penalidade_de_repetição"
+      },
+      "sampling_mode_seed": {
+        "name": "semente"
+      },
+      "sampling_mode_temperature": {
+        "name": "temperatura"
+      },
+      "sampling_mode_top_k": {
+        "name": "top_k"
+      },
+      "sampling_mode_top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "texto_gerado",
+        "tooltip": null
+      }
+    }
+  },
+  "TextToLowercase": {
+    "display_name": "Texto para minúsculas",
+    "inputs": {
+      "texts": {
+        "name": "texts",
+        "tooltip": "Texto para processar."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "texts",
+        "tooltip": "Textos processados"
+      }
+    }
+  },
+  "TextToUppercase": {
+    "display_name": "Texto para Maiúsculas",
+    "inputs": {
+      "texts": {
+        "name": "textos",
+        "tooltip": "Texto a ser processado."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "textos",
+        "tooltip": "Textos processados"
+      }
+    }
+  },
+  "ThresholdMask": {
+    "display_name": "ThresholdMask",
+    "inputs": {
+      "mask": {
+        "name": "mask"
+      },
+      "value": {
+        "name": "valor"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TomePatchModel": {
+    "display_name": "TomePatchModel",
+    "inputs": {
+      "model": {
+        "name": "modelo"
+      },
+      "ratio": {
+        "name": "proporção"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TopazImageEnhance": {
+    "description": "Aprimoramento e upscaling de imagem padrão da indústria.",
+    "display_name": "Topaz Image Enhance",
+    "inputs": {
+      "color_preservation": {
+        "name": "preservação_de_cores",
+        "tooltip": "Preservar as cores originais."
+      },
+      "creativity": {
+        "name": "criatividade"
+      },
+      "crop_to_fill": {
+        "name": "cortar_para_preencher",
+        "tooltip": "Por padrão, a imagem é exibida com faixas quando a proporção de aspecto de saída é diferente. Ative para cortar a imagem e preencher as dimensões de saída."
+      },
+      "face_enhancement": {
+        "name": "aprimoramento_de_rostos",
+        "tooltip": "Aprimore rostos (se presentes) durante o processamento."
+      },
+      "face_enhancement_creativity": {
+        "name": "criatividade_no_aprimoramento_de_rostos",
+        "tooltip": "Defina o nível de criatividade para o aprimoramento de rostos."
+      },
+      "face_enhancement_strength": {
+        "name": "força_do_aprimoramento_de_rostos",
+        "tooltip": "Controla o quão nítidos os rostos aprimorados ficam em relação ao fundo."
+      },
+      "face_preservation": {
+        "name": "preservação_de_rostos",
+        "tooltip": "Preservar a identidade facial dos sujeitos."
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "output_height": {
+        "name": "altura_de_saida",
+        "tooltip": "Valor zero significa manter a mesma altura da original ou da largura de saída."
+      },
+      "output_width": {
+        "name": "largura_de_saida",
+        "tooltip": "Valor zero significa calcular automaticamente (normalmente será o tamanho original ou a altura de saída, se especificada)."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt de texto opcional para orientação criativa no upscaling."
+      },
+      "subject_detection": {
+        "name": "detecção_de_sujeito"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TopazVideoEnhance": {
+    "description": "Dê nova vida aos seus vídeos com tecnologia avançada de upscaling e recuperação.",
+    "display_name": "Topaz Video Enhance",
+    "inputs": {
+      "dynamic_compression_level": {
+        "name": "dynamic_compression_level",
+        "tooltip": "Nível CQP."
+      },
+      "interpolation_duplicate": {
+        "name": "interpolation_duplicate",
+        "tooltip": "Analisa o vídeo de entrada para quadros duplicados e os remove."
+      },
+      "interpolation_duplicate_threshold": {
+        "name": "interpolation_duplicate_threshold",
+        "tooltip": "Sensibilidade de detecção para quadros duplicados."
+      },
+      "interpolation_enabled": {
+        "name": "interpolation_enabled"
+      },
+      "interpolation_frame_rate": {
+        "name": "interpolation_frame_rate",
+        "tooltip": "Taxa de quadros de saída."
+      },
+      "interpolation_model": {
+        "name": "interpolation_model"
+      },
+      "interpolation_slowmo": {
+        "name": "interpolation_slowmo",
+        "tooltip": "Fator de câmera lenta aplicado ao vídeo de entrada. Por exemplo, 2 deixa o resultado duas vezes mais lento e dobra a duração."
+      },
+      "upscaler_creativity": {
+        "name": "upscaler_creativity",
+        "tooltip": "Nível de criatividade (aplicável apenas ao Starlight (Astra) Creative)."
+      },
+      "upscaler_enabled": {
+        "name": "upscaler_enabled"
+      },
+      "upscaler_model": {
+        "name": "upscaler_model"
+      },
+      "upscaler_resolution": {
+        "name": "upscaler_resolution"
+      },
+      "video": {
+        "name": "vídeo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TorchCompileModel": {
+    "display_name": "TorchCompileModel",
+    "inputs": {
+      "backend": {
+        "name": "backend"
+      },
+      "model": {
+        "name": "modelo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TrainLoraNode": {
+    "display_name": "Treinar LoRA",
+    "inputs": {
+      "algorithm": {
+        "name": "algoritmo",
+        "tooltip": "O algoritmo a ser usado para o treinamento."
+      },
+      "batch_size": {
+        "name": "tamanho_do_lote",
+        "tooltip": "O tamanho do lote a ser usado para o treinamento."
+      },
+      "bucket_mode": {
+        "name": "modo_bucket",
+        "tooltip": "Ativar modo de bucket de resolução. Quando ativado, espera latents pré-bucketados do nó ResolutionBucket."
+      },
+      "bypass_mode": {
+        "name": "bypass_mode",
+        "tooltip": "Ativar modo bypass para treinamento. Quando ativado, os adaptadores são aplicados via hooks de encaminhamento em vez de modificação de pesos. Útil para modelos quantizados onde os pesos não podem ser modificados diretamente."
+      },
+      "checkpoint_depth": {
+        "name": "checkpoint_depth",
+        "tooltip": "Nível de profundidade para checkpointing de gradiente."
+      },
+      "control_after_generate": {
+        "name": "controlar após gerar"
+      },
+      "existing_lora": {
+        "name": "lora_existente",
+        "tooltip": "A LoRA existente para anexar. Defina como Nenhum para nova LoRA."
+      },
+      "grad_accumulation_steps": {
+        "name": "passos_de_acumulo_de_gradiente",
+        "tooltip": "O número de passos de acumulação de gradiente a serem usados para o treinamento."
+      },
+      "gradient_checkpointing": {
+        "name": "checkpointing_de_gradiente",
+        "tooltip": "Usar checkpointing de gradiente para o treinamento."
+      },
+      "latents": {
+        "name": "latents",
+        "tooltip": "Os latents a serem usados para o treinamento, servem como conjunto de dados/entrada do modelo."
+      },
+      "learning_rate": {
+        "name": "taxa_de_aprendizado",
+        "tooltip": "A taxa de aprendizado a ser usada para o treinamento."
+      },
+      "lora_dtype": {
+        "name": "lora_dtype",
+        "tooltip": "O dtype a ser usado para a lora."
+      },
+      "loss_function": {
+        "name": "função_de_perda",
+        "tooltip": "A função de perda a ser usada para o treinamento."
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "O modelo no qual treinar a LoRA."
+      },
+      "offloading": {
+        "name": "offloading",
+        "tooltip": "Nível de profundidade para checkpointing de gradiente."
+      },
+      "optimizer": {
+        "name": "otimizador",
+        "tooltip": "O otimizador a ser usado para o treinamento."
+      },
+      "positive": {
+        "name": "positivo",
+        "tooltip": "O condicionamento positivo a ser usado para o treinamento."
+      },
+      "rank": {
+        "name": "rank",
+        "tooltip": "O rank das camadas da LoRA."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "A semente a ser usada para o treinamento (usada no gerador para inicialização dos pesos da LoRA e amostragem de ruído)"
+      },
+      "steps": {
+        "name": "passos",
+        "tooltip": "O número de passos para treinar a LoRA."
+      },
+      "training_dtype": {
+        "name": "dtype_de_treinamento",
+        "tooltip": "O dtype a ser usado para o treinamento."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "modelo",
+        "tooltip": "Modelo com LoRA aplicada"
+      },
+      "1": {
+        "name": "lora",
+        "tooltip": "Pesos da LoRA"
+      },
+      "2": {
+        "name": "mapa_de_perda",
+        "tooltip": "Histórico de perda"
+      }
+    }
+  },
+  "TrimAudioDuration": {
+    "description": "Corta o tensor de áudio no intervalo de tempo escolhido.",
+    "display_name": "Cortar Duração do Áudio",
+    "inputs": {
+      "audio": {
+        "name": "áudio"
+      },
+      "duration": {
+        "name": "duração",
+        "tooltip": "Duração em segundos"
+      },
+      "start_index": {
+        "name": "índice_inicial",
+        "tooltip": "Tempo inicial em segundos, pode ser negativo para contar a partir do final (suporta frações de segundo)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TrimVideoLatent": {
+    "display_name": "Cortar Latent de Vídeo",
+    "inputs": {
+      "samples": {
+        "name": "amostras"
+      },
+      "trim_amount": {
+        "name": "quantidade_de_corte"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TripleCLIPLoader": {
+    "description": "[Receitas]\n\nsd3: clip-l, clip-g, t5",
+    "display_name": "TripleCLIPLoader",
+    "inputs": {
+      "clip_name1": {
+        "name": "clip_name1"
+      },
+      "clip_name2": {
+        "name": "clip_name2"
+      },
+      "clip_name3": {
+        "name": "clip_name3"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TripoConversionNode": {
+    "display_name": "Tripo: Converter modelo",
+    "inputs": {
+      "animate_in_place": {
+        "name": "animar_no_local"
+      },
+      "bake": {
+        "name": "bake"
+      },
+      "export_orientation": {
+        "name": "exportar_orientação"
+      },
+      "export_vertex_colors": {
+        "name": "exportar_cores_dos_vértices"
+      },
+      "face_limit": {
+        "name": "limite_de_faces"
+      },
+      "fbx_preset": {
+        "name": "preset_fbx"
+      },
+      "flatten_bottom": {
+        "name": "achatar_base"
+      },
+      "flatten_bottom_threshold": {
+        "name": "limite_achatamento_base"
+      },
+      "force_symmetry": {
+        "name": "forçar_simetria"
+      },
+      "format": {
+        "name": "formato"
+      },
+      "original_model_task_id": {
+        "name": "original_model_task_id"
+      },
+      "pack_uv": {
+        "name": "empacotar_uv"
+      },
+      "part_names": {
+        "name": "nomes_das_partes"
+      },
+      "pivot_to_center_bottom": {
+        "name": "pivô_para_centro_base"
+      },
+      "quad": {
+        "name": "quad"
+      },
+      "scale_factor": {
+        "name": "fator_de_escala"
+      },
+      "texture_format": {
+        "name": "formato_da_textura"
+      },
+      "texture_size": {
+        "name": "tamanho_da_textura"
+      },
+      "with_animation": {
+        "name": "com_animação"
+      }
+    }
+  },
+  "TripoImageToModelNode": {
+    "display_name": "Tripo: Imagem para Modelo",
+    "inputs": {
+      "face_limit": {
+        "name": "limite_de_faces"
+      },
+      "geometry_quality": {
+        "name": "qualidade_da_geometria"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "model_seed": {
+        "name": "semente_do_modelo"
+      },
+      "model_version": {
+        "name": "versão_do_modelo",
+        "tooltip": "A versão do modelo a ser usada para geração"
+      },
+      "orientation": {
+        "name": "orientação"
+      },
+      "pbr": {
+        "name": "pbr"
+      },
+      "quad": {
+        "name": "quad"
+      },
+      "style": {
+        "name": "estilo"
+      },
+      "texture": {
+        "name": "textura"
+      },
+      "texture_alignment": {
+        "name": "alinhamento_da_textura"
+      },
+      "texture_quality": {
+        "name": "qualidade_da_textura"
+      },
+      "texture_seed": {
+        "name": "semente_da_textura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "arquivo_do_modelo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "task_id_do_modelo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "TripoMultiviewToModelNode": {
+    "display_name": "Tripo: Multiview para Modelo",
+    "inputs": {
+      "face_limit": {
+        "name": "limite_de_faces"
+      },
+      "geometry_quality": {
+        "name": "qualidade_da_geometria"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "image_back": {
+        "name": "imagem_traseira"
+      },
+      "image_left": {
+        "name": "imagem_esquerda"
+      },
+      "image_right": {
+        "name": "imagem_direita"
+      },
+      "model_seed": {
+        "name": "semente_do_modelo"
+      },
+      "model_version": {
+        "name": "versão_do_modelo",
+        "tooltip": "A versão do modelo a ser usada para geração"
+      },
+      "orientation": {
+        "name": "orientação"
+      },
+      "pbr": {
+        "name": "pbr"
+      },
+      "quad": {
+        "name": "quad"
+      },
+      "texture": {
+        "name": "textura"
+      },
+      "texture_alignment": {
+        "name": "alinhamento_da_textura"
+      },
+      "texture_quality": {
+        "name": "qualidade_da_textura"
+      },
+      "texture_seed": {
+        "name": "semente_da_textura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "arquivo_do_modelo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "task_id_do_modelo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "TripoRefineNode": {
+    "description": "Refine um modelo rascunho criado apenas por modelos Tripo v1.4.",
+    "display_name": "Tripo: Refinar Modelo Rascunho",
+    "inputs": {
+      "model_task_id": {
+        "name": "id_da_tarefa_do_modelo",
+        "tooltip": "Deve ser um modelo Tripo v1.4"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "arquivo_do_modelo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "task_id_do_modelo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "TripoRetargetNode": {
+    "display_name": "Tripo: Retarget para modelo com rig",
+    "inputs": {
+      "animation": {
+        "name": "animação"
+      },
+      "original_model_task_id": {
+        "name": "id_da_tarefa_do_modelo_original"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "arquivo_do_modelo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "task_id_de_retarget",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "TripoRigNode": {
+    "display_name": "Tripo: Rig no modelo",
+    "inputs": {
+      "original_model_task_id": {
+        "name": "id_da_tarefa_do_modelo_original"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "arquivo_do_modelo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "task_id_de_rig",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "TripoTextToModelNode": {
+    "display_name": "Tripo: Texto para Modelo",
+    "inputs": {
+      "face_limit": {
+        "name": "limite_de_faces"
+      },
+      "geometry_quality": {
+        "name": "qualidade_da_geometria"
+      },
+      "image_seed": {
+        "name": "semente_da_imagem"
+      },
+      "model_seed": {
+        "name": "semente_do_modelo"
+      },
+      "model_version": {
+        "name": "versão_do_modelo"
+      },
+      "negative_prompt": {
+        "name": "prompt_negativo"
+      },
+      "pbr": {
+        "name": "pbr"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "quad": {
+        "name": "quad"
+      },
+      "style": {
+        "name": "estilo"
+      },
+      "texture": {
+        "name": "textura"
+      },
+      "texture_quality": {
+        "name": "qualidade_da_textura"
+      },
+      "texture_seed": {
+        "name": "semente_da_textura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "arquivo_do_modelo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "task_id_do_modelo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "TripoTextureNode": {
+    "display_name": "Tripo: Modelo de Textura",
+    "inputs": {
+      "model_task_id": {
+        "name": "model_task_id"
+      },
+      "pbr": {
+        "name": "pbr"
+      },
+      "texture": {
+        "name": "textura"
+      },
+      "texture_alignment": {
+        "name": "alinhamento_textura"
+      },
+      "texture_quality": {
+        "name": "qualidade_textura"
+      },
+      "texture_seed": {
+        "name": "semente_textura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "arquivo_do_modelo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "task_id_do_modelo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "TruncateText": {
+    "display_name": "Truncar Texto",
+    "inputs": {
+      "max_length": {
+        "name": "comprimento_máximo",
+        "tooltip": "Comprimento máximo do texto."
+      },
+      "texts": {
+        "name": "textos",
+        "tooltip": "Texto para processar."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "textos",
+        "tooltip": "Textos processados"
+      }
+    }
+  },
+  "UNETLoader": {
+    "display_name": "Carregar Modelo de Difusão",
+    "inputs": {
+      "unet_name": {
+        "name": "unet_name"
+      },
+      "weight_dtype": {
+        "name": "tipo_peso"
+      }
+    }
+  },
+  "UNetCrossAttentionMultiply": {
+    "display_name": "UNetCrossAttentionMultiply",
+    "inputs": {
+      "k": {
+        "name": "k"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "out": {
+        "name": "saída"
+      },
+      "q": {
+        "name": "q"
+      },
+      "v": {
+        "name": "v"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "UNetSelfAttentionMultiply": {
+    "display_name": "UNetSelfAttentionMultiply",
+    "inputs": {
+      "k": {
+        "name": "k"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "out": {
+        "name": "saída"
+      },
+      "q": {
+        "name": "q"
+      },
+      "v": {
+        "name": "v"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "UNetTemporalAttentionMultiply": {
+    "display_name": "UNetTemporalAttentionMultiply",
+    "inputs": {
+      "cross_structural": {
+        "name": "cruzado_estrutural"
+      },
+      "cross_temporal": {
+        "name": "cruzado_temporal"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "self_structural": {
+        "name": "auto_estrutural"
+      },
+      "self_temporal": {
+        "name": "auto_temporal"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "USOStyleReference": {
+    "display_name": "USOStyleReference",
+    "inputs": {
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "model": {
+        "name": "model"
+      },
+      "model_patch": {
+        "name": "model_patch"
+      }
+    }
+  },
+  "UpscaleModelLoader": {
+    "display_name": "Carregar Modelo de Upscale",
+    "inputs": {
+      "model_name": {
+        "name": "nome_modelo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VAEDecode": {
+    "description": "Decodifica imagens latentes de volta para imagens no espaço de pixels.",
+    "display_name": "VAE Decodificar",
+    "inputs": {
+      "samples": {
+        "name": "amostras",
+        "tooltip": "O latente a ser decodificado."
+      },
+      "vae": {
+        "name": "vae",
+        "tooltip": "O modelo VAE usado para decodificar o latente."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "A imagem decodificada."
+      }
+    }
+  },
+  "VAEDecodeAudio": {
+    "display_name": "VAE Decodificar Áudio",
+    "inputs": {
+      "samples": {
+        "name": "amostras"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VAEDecodeAudioTiled": {
+    "display_name": "VAE Decodificar Áudio (Em Blocos)",
+    "inputs": {
+      "overlap": {
+        "name": "sobreposição"
+      },
+      "samples": {
+        "name": "amostras"
+      },
+      "tile_size": {
+        "name": "tamanho_do_bloco"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VAEDecodeHunyuan3D": {
+    "display_name": "VAEDecodeHunyuan3D",
+    "inputs": {
+      "num_chunks": {
+        "name": "num_chunks"
+      },
+      "octree_resolution": {
+        "name": "octree_resolution"
+      },
+      "samples": {
+        "name": "amostras"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VAEDecodeTiled": {
+    "display_name": "VAE Decodificar (Em Blocos)",
+    "inputs": {
+      "overlap": {
+        "name": "sobreposição"
+      },
+      "samples": {
+        "name": "amostras"
+      },
+      "temporal_overlap": {
+        "name": "sobreposição_temporal",
+        "tooltip": "Usado apenas para VAEs de vídeo: Quantidade de quadros para sobrepor."
+      },
+      "temporal_size": {
+        "name": "tamanho_temporal",
+        "tooltip": "Usado apenas para VAEs de vídeo: Quantidade de quadros para decodificar por vez."
+      },
+      "tile_size": {
+        "name": "tamanho_do_bloco"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
+  "VAEEncode": {
+    "display_name": "VAE Codificar",
+    "inputs": {
+      "pixels": {
+        "name": "pixels"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
+  "VAEEncodeAudio": {
+    "display_name": "VAE Codificar Áudio",
+    "inputs": {
+      "audio": {
+        "name": "áudio"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VAEEncodeForInpaint": {
+    "display_name": "VAE Codificar (para Inpainting)",
+    "inputs": {
+      "grow_mask_by": {
+        "name": "aumentar_máscara_em"
+      },
+      "mask": {
+        "name": "máscara"
+      },
+      "pixels": {
+        "name": "pixels"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
+  "VAEEncodeTiled": {
+    "display_name": "VAE Codificar (Em Blocos)",
+    "inputs": {
+      "overlap": {
+        "name": "sobreposição"
+      },
+      "pixels": {
+        "name": "pixels"
+      },
+      "temporal_overlap": {
+        "name": "sobreposição_temporal",
+        "tooltip": "Usado apenas para VAEs de vídeo: Quantidade de quadros para sobrepor."
+      },
+      "temporal_size": {
+        "name": "tamanho_temporal",
+        "tooltip": "Usado apenas para VAEs de vídeo: Quantidade de quadros para codificar por vez."
+      },
+      "tile_size": {
+        "name": "tamanho_do_bloco"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
+  "VAELoader": {
+    "display_name": "Carregar VAE",
+    "inputs": {
+      "vae_name": {
+        "name": "vae_name"
+      }
+    }
+  },
+  "VAESave": {
+    "display_name": "Salvar VAE",
+    "inputs": {
+      "filename_prefix": {
+        "name": "filename_prefix"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
+  "VPScheduler": {
+    "display_name": "VPScheduler",
+    "inputs": {
+      "beta_d": {
+        "name": "beta_d"
+      },
+      "beta_min": {
+        "name": "beta_min"
+      },
+      "eps_s": {
+        "name": "eps_s"
+      },
+      "steps": {
+        "name": "etapas"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Veo3FirstLastFrameNode": {
+    "description": "Gerar vídeo usando prompt e quadros inicial e final.",
+    "display_name": "Google Veo 3 Quadro Inicial-Final para Vídeo",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "Proporção do vídeo de saída"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration": {
+        "name": "duration",
+        "tooltip": "Duração do vídeo de saída em segundos"
+      },
+      "first_frame": {
+        "name": "first_frame",
+        "tooltip": "Quadro inicial"
+      },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "Gerar áudio para o vídeo."
+      },
+      "last_frame": {
+        "name": "last_frame",
+        "tooltip": "Quadro final"
+      },
+      "model": {
+        "name": "model"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Prompt negativo para guiar o que evitar no vídeo"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Descrição em texto do vídeo"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Semente para geração do vídeo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Veo3VideoGenerationNode": {
+    "description": "Gera vídeos a partir de prompts de texto usando a API Google Veo 3",
+    "display_name": "Google Veo 3 Geração de Vídeo",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "Proporção do vídeo de saída"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration_seconds": {
+        "name": "duration_seconds",
+        "tooltip": "Duração do vídeo de saída em segundos (Veo 3 suporta apenas 8 segundos)"
+      },
+      "enhance_prompt": {
+        "name": "enhance_prompt",
+        "tooltip": "Este parâmetro está obsoleto e será ignorado."
+      },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "Gerar áudio para o vídeo. Suportado por todos os modelos Veo 3."
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "Imagem de referência opcional para guiar a geração do vídeo"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Modelo Veo 3 a ser usado para geração de vídeo"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Prompt negativo para guiar o que evitar no vídeo"
+      },
+      "person_generation": {
+        "name": "person_generation",
+        "tooltip": "Permitir ou não a geração de pessoas no vídeo"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Descrição em texto do vídeo"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Semente para geração do vídeo (0 para aleatório)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VeoVideoGenerationNode": {
+    "description": "Gera vídeos a partir de prompts de texto usando a API Veo 2 do Google",
+    "display_name": "Geração de Vídeo Google Veo 2",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "Proporção do vídeo de saída"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration_seconds": {
+        "name": "duration_seconds",
+        "tooltip": "Duração do vídeo de saída em segundos"
+      },
+      "enhance_prompt": {
+        "name": "enhance_prompt",
+        "tooltip": "Se deve aprimorar o prompt com assistência de IA"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "Imagem de referência opcional para guiar a geração do vídeo"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Modelo Veo 2 a ser usado para geração de vídeo"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Prompt negativo para orientar o que evitar no vídeo"
+      },
+      "person_generation": {
+        "name": "person_generation",
+        "tooltip": "Se permite gerar pessoas no vídeo"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Descrição em texto do vídeo"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Semente para geração de vídeo (0 para aleatório)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Video Slice": {
+    "display_name": "Corte de Vídeo",
+    "inputs": {
+      "duration": {
+        "name": "duração",
+        "tooltip": "Duração em segundos, ou 0 para duração ilimitada"
+      },
+      "start_time": {
+        "name": "início",
+        "tooltip": "Tempo de início em segundos"
+      },
+      "strict_duration": {
+        "name": "duração_estrita",
+        "tooltip": "Se Verdadeiro, quando a duração especificada não for possível, um erro será exibido."
+      },
+      "video": {
+        "name": "vídeo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VideoLinearCFGGuidance": {
+    "display_name": "VideoLinearCFGGuidance",
+    "inputs": {
+      "min_cfg": {
+        "name": "min_cfg"
+      },
+      "model": {
+        "name": "model"
+      }
+    }
+  },
+  "VideoTriangleCFGGuidance": {
+    "display_name": "VideoTriangleCFGGuidance",
+    "inputs": {
+      "min_cfg": {
+        "name": "min_cfg"
+      },
+      "model": {
+        "name": "model"
+      }
+    }
+  },
+  "Vidu2ImageToVideoNode": {
+    "description": "Gere um vídeo a partir de uma imagem e um prompt opcional.",
+    "display_name": "Geração de Vídeo a partir de Imagem Vidu2",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "duration": {
+        "name": "duração"
+      },
+      "image": {
+        "name": "imagem",
+        "tooltip": "Uma imagem a ser usada como quadro inicial do vídeo gerado."
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "movement_amplitude": {
+        "name": "amplitude_de_movimento",
+        "tooltip": "A amplitude de movimento dos objetos no quadro."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Um prompt de texto opcional para geração de vídeo (máx. 2000 caracteres)."
+      },
+      "resolution": {
+        "name": "resolução"
+      },
+      "seed": {
+        "name": "semente"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2ReferenceVideoNode": {
+    "description": "Gere um vídeo a partir de múltiplas imagens de referência e um prompt.",
+    "display_name": "Geração de Vídeo por Referência Vidu2",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "proporção"
+      },
+      "audio": {
+        "name": "áudio",
+        "tooltip": "Quando ativado, o vídeo conterá fala gerada e música de fundo com base no prompt."
+      },
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "duration": {
+        "name": "duração"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "movement_amplitude": {
+        "name": "amplitude_de_movimento",
+        "tooltip": "A amplitude de movimento dos objetos no quadro."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Quando ativado, o vídeo incluirá fala gerada e música de fundo com base no prompt."
+      },
+      "resolution": {
+        "name": "resolução"
+      },
+      "seed": {
+        "name": "semente"
+      },
+      "subjects": {
+        "name": "sujeitos",
+        "tooltip": "Para cada sujeito, forneça até 3 imagens de referência (7 imagens no total entre todos os sujeitos). Referencie-os nos prompts via @subject{subject_id}."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2StartEndToVideoNode": {
+    "description": "Gere um vídeo a partir de um quadro inicial, um quadro final e um prompt.",
+    "display_name": "Geração de Vídeo Vidu2 de Quadro Inicial/Final",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "duration": {
+        "name": "duração"
+      },
+      "end_frame": {
+        "name": "quadro_final"
+      },
+      "first_frame": {
+        "name": "quadro_inicial"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "movement_amplitude": {
+        "name": "amplitude_de_movimento",
+        "tooltip": "A amplitude de movimento dos objetos no quadro."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Descrição do prompt (máx. 2000 caracteres)."
+      },
+      "resolution": {
+        "name": "resolução"
+      },
+      "seed": {
+        "name": "semente"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2TextToVideoNode": {
+    "description": "Gerar vídeo a partir de um prompt de texto",
+    "display_name": "Geração de Vídeo Vidu2 a partir de Texto",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "proporção"
+      },
+      "background_music": {
+        "name": "música_de_fundo",
+        "tooltip": "Se deve adicionar música de fundo ao vídeo gerado."
+      },
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "duration": {
+        "name": "duração"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Uma descrição textual para geração de vídeo, com comprimento máximo de 2000 caracteres."
+      },
+      "resolution": {
+        "name": "resolução"
+      },
+      "seed": {
+        "name": "semente"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3ImageToVideoNode": {
+    "description": "Gere um vídeo a partir de uma imagem e um prompt opcional.",
+    "display_name": "Geração de Vídeo de Imagem para Vídeo Vidu Q3",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "image": {
+        "name": "imagem",
+        "tooltip": "Uma imagem a ser usada como quadro inicial do vídeo gerado."
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Modelo a ser usado para geração de vídeo."
+      },
+      "model_audio": {
+        "name": "áudio"
+      },
+      "model_duration": {
+        "name": "duração"
+      },
+      "model_resolution": {
+        "name": "resolução"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Um prompt de texto opcional para geração de vídeo (máx. 2000 caracteres)."
+      },
+      "seed": {
+        "name": "semente"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3StartEndToVideoNode": {
+    "description": "Gere um vídeo a partir de um quadro inicial, um quadro final e um prompt.",
+    "display_name": "Geração de Vídeo Quadro Inicial/Final Vidu Q3",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "end_frame": {
+        "name": "quadro final"
+      },
+      "first_frame": {
+        "name": "quadro inicial"
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Modelo a ser usado para geração de vídeo."
+      },
+      "model_audio": {
+        "name": "áudio"
+      },
+      "model_duration": {
+        "name": "duração"
+      },
+      "model_resolution": {
+        "name": "resolução"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Descrição do prompt (máx. 2000 caracteres)."
+      },
+      "seed": {
+        "name": "semente"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3TextToVideoNode": {
+    "description": "Gere um vídeo a partir de um prompt de texto.",
+    "display_name": "Geração de Vídeo de Texto para Vídeo Vidu Q3",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Modelo a ser usado para geração de vídeo."
+      },
+      "model_aspect_ratio": {
+        "name": "proporção"
+      },
+      "model_audio": {
+        "name": "áudio"
+      },
+      "model_duration": {
+        "name": "duração"
+      },
+      "model_resolution": {
+        "name": "resolução"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Uma descrição textual para geração de vídeo, com comprimento máximo de 2000 caracteres."
+      },
+      "seed": {
+        "name": "semente"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ViduExtendVideoNode": {
+    "description": "Estenda um vídeo existente gerando quadros adicionais.",
+    "display_name": "Extensão de Vídeo Vidu",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "end_frame": {
+        "name": "quadro_final"
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Modelo a ser usado para extensão de vídeo."
+      },
+      "model_duration": {
+        "name": "duração"
+      },
+      "model_resolution": {
+        "name": "resolução"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Um prompt de texto opcional para o vídeo estendido (máx. 2000 caracteres)."
+      },
+      "seed": {
+        "name": "semente"
+      },
+      "video": {
+        "name": "vídeo",
+        "tooltip": "O vídeo de origem a ser estendido."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ViduImageToVideoNode": {
+    "description": "Gera vídeo a partir de uma imagem e prompt opcional",
+    "display_name": "Geração de Vídeo a partir de Imagem Vidu",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration": {
+        "name": "duration",
+        "tooltip": "Duração do vídeo de saída em segundos"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "Uma imagem a ser usada como quadro inicial do vídeo gerado"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Nome do modelo"
+      },
+      "movement_amplitude": {
+        "name": "movement_amplitude",
+        "tooltip": "A amplitude de movimento dos objetos no quadro"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Descrição textual para geração de vídeo"
+      },
+      "resolution": {
+        "name": "resolution",
+        "tooltip": "Os valores suportados podem variar conforme o modelo e a duração"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Semente para geração de vídeo (0 para aleatório)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ViduMultiFrameVideoNode": {
+    "description": "Gere um vídeo com múltiplas transições de quadros-chave.",
+    "display_name": "Geração de Vídeo com Múltiplos Quadros Vidu",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "frames": {
+        "name": "quadros",
+        "tooltip": "Número de transições de quadros-chave (2-9)."
+      },
+      "frames_duration1": {
+        "name": "duração1"
+      },
+      "frames_duration2": {
+        "name": "duração2"
+      },
+      "frames_prompt1": {
+        "name": "prompt1"
+      },
+      "frames_prompt2": {
+        "name": "prompt2"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "resolution": {
+        "name": "resolução"
+      },
+      "seed": {
+        "name": "semente"
+      },
+      "start_image": {
+        "name": "imagem_inicial",
+        "tooltip": "A imagem do quadro inicial. A proporção deve estar entre 1:4 e 4:1."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ViduReferenceVideoNode": {
+    "description": "Gerar vídeo a partir de múltiplas imagens e prompt",
+    "display_name": "Geração de Vídeo por Referência Vidu",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "proporção",
+        "tooltip": "A proporção do vídeo de saída"
+      },
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "duration": {
+        "name": "duração",
+        "tooltip": "Duração do vídeo de saída em segundos"
+      },
+      "images": {
+        "name": "imagens",
+        "tooltip": "Imagens para usar como referência para gerar um vídeo com sujeitos consistentes (máx. 7 imagens)."
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Nome do modelo"
+      },
+      "movement_amplitude": {
+        "name": "amplitude de movimento",
+        "tooltip": "A amplitude de movimento dos objetos no quadro"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Uma descrição textual para geração de vídeo"
+      },
+      "resolution": {
+        "name": "resolução",
+        "tooltip": "Os valores suportados podem variar conforme o modelo e a duração"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "Semente para geração de vídeo (0 para aleatório)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ViduStartEndToVideoNode": {
+    "description": "Gerar um vídeo a partir dos quadros inicial e final e um prompt",
+    "display_name": "Geração de Vídeo Vidu de Início e Fim",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "duration": {
+        "name": "duração",
+        "tooltip": "Duração do vídeo de saída em segundos"
+      },
+      "end_frame": {
+        "name": "quadro final",
+        "tooltip": "Quadro final"
+      },
+      "first_frame": {
+        "name": "quadro inicial",
+        "tooltip": "Quadro inicial"
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Nome do modelo"
+      },
+      "movement_amplitude": {
+        "name": "amplitude de movimento",
+        "tooltip": "A amplitude de movimento dos objetos no quadro"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Uma descrição textual para geração de vídeo"
+      },
+      "resolution": {
+        "name": "resolução",
+        "tooltip": "Os valores suportados podem variar conforme o modelo e a duração"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "Semente para geração de vídeo (0 para aleatório)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ViduTextToVideoNode": {
+    "description": "Gerar vídeo a partir de um prompt de texto",
+    "display_name": "Geração de Vídeo Vidu por Texto",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "proporção",
+        "tooltip": "A proporção do vídeo de saída"
+      },
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "duration": {
+        "name": "duração",
+        "tooltip": "Duração do vídeo de saída em segundos"
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Nome do modelo"
+      },
+      "movement_amplitude": {
+        "name": "amplitude de movimento",
+        "tooltip": "A amplitude de movimento dos objetos no quadro"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Uma descrição textual para geração de vídeo"
+      },
+      "resolution": {
+        "name": "resolução",
+        "tooltip": "Os valores suportados podem variar conforme o modelo e a duração"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "Semente para geração de vídeo (0 para aleatório)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VoxelToMesh": {
+    "display_name": "VoxelParaMalha",
+    "inputs": {
+      "algorithm": {
+        "name": "algoritmo"
+      },
+      "threshold": {
+        "name": "limiar"
+      },
+      "voxel": {
+        "name": "voxel"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VoxelToMeshBasic": {
+    "display_name": "VoxelToMeshBasic",
+    "inputs": {
+      "threshold": {
+        "name": "limiar"
+      },
+      "voxel": {
+        "name": "voxel"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Wan22FunControlToVideo": {
+    "display_name": "Wan22FunControlToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "control_video": {
+        "name": "vídeo_de_controle"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "duração"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "ref_image": {
+        "name": "imagem_de_referência"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latente",
+        "tooltip": null
+      }
+    }
+  },
+  "Wan22ImageToVideoLatent": {
+    "display_name": "Wan22ImageToVideoLatent",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "duração"
+      },
+      "start_image": {
+        "name": "imagem_inicial"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanAnimateToVideo": {
+    "display_name": "WanAnimateToVideo",
+    "inputs": {
+      "background_video": {
+        "name": "vídeo_de_fundo"
+      },
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "character_mask": {
+        "name": "máscara_de_personagem"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "continue_motion": {
+        "name": "continuar_movimento"
+      },
+      "continue_motion_max_frames": {
+        "name": "continuar_movimento_máx_quadros"
+      },
+      "face_video": {
+        "name": "vídeo_de_rosto"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "duração"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "pose_video": {
+        "name": "vídeo_de_pose"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "reference_image": {
+        "name": "imagem_de_referência"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "video_frame_offset": {
+        "name": "deslocamento_quadro_vídeo",
+        "tooltip": "A quantidade de quadros a avançar em todos os vídeos de entrada. Usado para gerar vídeos mais longos em partes. Conecte à saída video_frame_offset do nó anterior para estender um vídeo."
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latente",
+        "tooltip": null
+      },
+      "3": {
+        "name": "latente_recortado",
+        "tooltip": null
+      },
+      "4": {
+        "name": "imagem_recortada",
+        "tooltip": null
+      },
+      "5": {
+        "name": "deslocamento_quadro_vídeo",
+        "tooltip": null
+      }
+    }
+  },
+  "WanCameraEmbedding": {
+    "display_name": "WanCameraEmbedding",
+    "inputs": {
+      "camera_pose": {
+        "name": "pose_da_câmera"
+      },
+      "cx": {
+        "name": "cx"
+      },
+      "cy": {
+        "name": "cy"
+      },
+      "fx": {
+        "name": "fx"
+      },
+      "fy": {
+        "name": "fy"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "duração"
+      },
+      "speed": {
+        "name": "velocidade"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "camera_embedding",
+        "tooltip": null
+      },
+      "1": {
+        "name": "largura",
+        "tooltip": null
+      },
+      "2": {
+        "name": "altura",
+        "tooltip": null
+      },
+      "3": {
+        "name": "duração",
+        "tooltip": null
+      }
+    }
+  },
+  "WanCameraImageToVideo": {
+    "display_name": "WanCameraImageToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "camera_conditions": {
+        "name": "condições_da_câmera"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "comprimento"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "start_image": {
+        "name": "imagem_inicial"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latente",
+        "tooltip": null
+      }
+    }
+  },
+  "WanContextWindowsManual": {
+    "description": "Defina manualmente as janelas de contexto para modelos do tipo WAN (dim=2).",
+    "display_name": "WAN Context Windows (Manual)",
+    "inputs": {
+      "closed_loop": {
+        "name": "ciclo_fechado",
+        "tooltip": "Se deve fechar o ciclo da janela de contexto; aplicável apenas para agendamentos em loop."
+      },
+      "context_length": {
+        "name": "comprimento_do_contexto",
+        "tooltip": "O comprimento da janela de contexto."
+      },
+      "context_overlap": {
+        "name": "sobreposição_do_contexto",
+        "tooltip": "A sobreposição da janela de contexto."
+      },
+      "context_schedule": {
+        "name": "agendamento_do_contexto",
+        "tooltip": "O passo da janela de contexto."
+      },
+      "context_stride": {
+        "name": "passo_do_contexto",
+        "tooltip": "O passo da janela de contexto; aplicável apenas para agendamentos uniformes."
+      },
+      "freenoise": {
+        "name": "freenoise",
+        "tooltip": "Se deve aplicar embaralhamento de ruído FreeNoise, melhora a mesclagem das janelas."
+      },
+      "fuse_method": {
+        "name": "método_de_fusão",
+        "tooltip": "O método a ser usado para fundir as janelas de contexto."
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "O modelo ao qual aplicar as janelas de contexto durante a amostragem."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "O modelo com janelas de contexto aplicadas durante a amostragem."
+      }
+    }
+  },
+  "WanFirstLastFrameToVideo": {
+    "display_name": "WanFirstLastFrameToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "clip_vision_end_image": {
+        "name": "clip_vision_end_image"
+      },
+      "clip_vision_start_image": {
+        "name": "clip_vision_start_image"
+      },
+      "end_image": {
+        "name": "imagem_final"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "comprimento"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "start_image": {
+        "name": "imagem_inicial"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latente",
+        "tooltip": null
+      }
+    }
+  },
+  "WanFunControlToVideo": {
+    "display_name": "WanFunControlToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "control_video": {
+        "name": "vídeo_de_controle"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "duração"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "start_image": {
+        "name": "imagem_inicial"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latente",
+        "tooltip": null
+      }
+    }
+  },
+  "WanFunInpaintToVideo": {
+    "display_name": "WanFunInpaintToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "end_image": {
+        "name": "imagem_final"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "duração"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "start_image": {
+        "name": "imagem_inicial"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latente",
+        "tooltip": null
+      }
+    }
+  },
+  "WanHuMoImageToVideo": {
+    "display_name": "WanHuMoImageToVideo",
+    "inputs": {
+      "audio_encoder_output": {
+        "name": "saída_do_codificador_de_áudio"
+      },
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "duração"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "ref_image": {
+        "name": "imagem_de_referência"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latente",
+        "tooltip": null
+      }
+    }
+  },
+  "WanImageToImageApi": {
+    "description": "Gera uma imagem a partir de uma ou duas imagens de entrada e um prompt de texto. A imagem de saída atualmente é fixa em 1,6 MP, e sua proporção corresponde à(s) imagem(ns) de entrada.",
+    "display_name": "Wan Imagem para Imagem",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "image": {
+        "name": "imagem",
+        "tooltip": "Edição de imagem única ou fusão de múltiplas imagens. Máximo de 2 imagens."
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Modelo a ser utilizado."
+      },
+      "negative_prompt": {
+        "name": "prompt negativo",
+        "tooltip": "Prompt negativo descrevendo o que evitar."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt descrevendo os elementos e características visuais. Suporta inglês e chinês."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "Semente a ser utilizada para a geração."
+      },
+      "watermark": {
+        "name": "marca d'água",
+        "tooltip": "Se deve adicionar uma marca d'água gerada por IA ao resultado."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanImageToVideo": {
+    "display_name": "WanImagemParaVídeo",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "duração"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "start_image": {
+        "name": "imagem_inicial"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latente",
+        "tooltip": null
+      }
+    }
+  },
+  "WanImageToVideoApi": {
+    "description": "Gera um vídeo a partir do primeiro quadro e de um prompt de texto.",
+    "display_name": "Wan Imagem para Vídeo",
+    "inputs": {
+      "audio": {
+        "name": "áudio",
+        "tooltip": "O áudio deve conter uma voz clara e alta, sem ruídos ou música de fundo."
+      },
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "duration": {
+        "name": "duração",
+        "tooltip": "Duração 15 disponível apenas para o modelo WAN2.6."
+      },
+      "generate_audio": {
+        "name": "gerar_áudio",
+        "tooltip": "Se nenhum áudio for fornecido, gerar áudio automaticamente."
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Modelo a ser utilizado."
+      },
+      "negative_prompt": {
+        "name": "prompt negativo",
+        "tooltip": "Prompt negativo descrevendo o que evitar."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt descrevendo os elementos e características visuais. Suporta inglês e chinês."
+      },
+      "prompt_extend": {
+        "name": "estender_prompt",
+        "tooltip": "Se deve aprimorar o prompt com assistência de IA."
+      },
+      "resolution": {
+        "name": "resolução"
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "Semente a ser utilizada para a geração."
+      },
+      "shot_type": {
+        "name": "tipo_de_tomada",
+        "tooltip": "Especifica o tipo de tomada para o vídeo gerado, ou seja, se o vídeo é uma única tomada contínua ou múltiplas tomadas com cortes. Este parâmetro só tem efeito quando prompt_extend é True."
+      },
+      "watermark": {
+        "name": "marca d'água",
+        "tooltip": "Se deve adicionar uma marca d'água gerada por IA ao resultado."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanInfiniteTalkToVideo": {
+    "display_name": "WanInfiniteTalkToVideo",
+    "inputs": {
+      "audio_encoder_output_1": {
+        "name": "saída do codificador de áudio 1"
+      },
+      "audio_scale": {
+        "name": "escala de áudio"
+      },
+      "clip_vision_output": {
+        "name": "saída do clip vision"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "duração"
+      },
+      "mode": {
+        "name": "modo"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "model_patch": {
+        "name": "patch do modelo"
+      },
+      "motion_frame_count": {
+        "name": "quantidade de quadros de movimento",
+        "tooltip": "Número de quadros anteriores a serem usados como contexto de movimento."
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "previous_frames": {
+        "name": "quadros anteriores"
+      },
+      "start_image": {
+        "name": "imagem inicial"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "modelo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "3": {
+        "name": "latente",
+        "tooltip": null
+      },
+      "4": {
+        "name": "imagem recortada",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveConcatTrack": {
+    "display_name": "WanMoveConcatTrack",
+    "inputs": {
+      "tracks_1": {
+        "name": "tracks_1"
+      },
+      "tracks_2": {
+        "name": "tracks_2"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveTrackToVideo": {
+    "display_name": "WanMoveTrackToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "comprimento"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "start_image": {
+        "name": "imagem_inicial"
+      },
+      "strength": {
+        "name": "força",
+        "tooltip": "Força do condicionamento da trilha."
+      },
+      "tracks": {
+        "name": "trilhas"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveTracksFromCoords": {
+    "display_name": "WanMoveTracksFromCoords",
+    "inputs": {
+      "track_coords": {
+        "name": "track_coords"
+      },
+      "track_mask": {
+        "name": "track_mask"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "track_length",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveVisualizeTracks": {
+    "display_name": "WanMoveVisualizeTracks",
+    "inputs": {
+      "circle_size": {
+        "name": "tamanho_do_círculo"
+      },
+      "images": {
+        "name": "imagens"
+      },
+      "line_resolution": {
+        "name": "resolução_da_linha"
+      },
+      "line_width": {
+        "name": "largura_da_linha"
+      },
+      "opacity": {
+        "name": "opacidade"
+      },
+      "tracks": {
+        "name": "trilhas"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanPhantomSubjectToVideo": {
+    "display_name": "WanPhantomSubjectToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "images": {
+        "name": "imagens"
+      },
+      "length": {
+        "name": "comprimento"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "texto_negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "texto_img_negativo",
+        "tooltip": null
+      },
+      "3": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "WanReferenceVideoApi": {
+    "description": "Use o personagem e a voz dos vídeos de entrada, combinados com um prompt, para gerar um novo vídeo que mantém a consistência do personagem.",
+    "display_name": "Wan Referência para Vídeo",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "duration": {
+        "name": "duração"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "negative_prompt": {
+        "name": "prompt negativo",
+        "tooltip": "Prompt negativo descrevendo o que deve ser evitado."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt descrevendo os elementos e características visuais. Suporta inglês e chinês. Use identificadores como `character1` e `character2` para se referir aos personagens de referência."
+      },
+      "reference_videos": {
+        "name": "vídeos de referência"
+      },
+      "seed": {
+        "name": "semente"
+      },
+      "shot_type": {
+        "name": "tipo de tomada",
+        "tooltip": "Especifica o tipo de tomada para o vídeo gerado, ou seja, se o vídeo é uma única tomada contínua ou múltiplas tomadas com cortes."
+      },
+      "size": {
+        "name": "tamanho"
+      },
+      "watermark": {
+        "name": "marca d'água",
+        "tooltip": "Se deve adicionar uma marca d'água gerada por IA ao resultado."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanSCAILToVideo": {
+    "display_name": "WanSCAILToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "duração"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "pose_end": {
+        "name": "fim_da_pose",
+        "tooltip": "Etapa final para usar o condicionamento de pose."
+      },
+      "pose_start": {
+        "name": "início_da_pose",
+        "tooltip": "Etapa inicial para usar o condicionamento de pose."
+      },
+      "pose_strength": {
+        "name": "força_da_pose",
+        "tooltip": "Força do espaço latente da pose."
+      },
+      "pose_video": {
+        "name": "vídeo_de_pose",
+        "tooltip": "Vídeo usado para condicionamento de pose. Será redimensionado para metade da resolução do vídeo principal."
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "reference_image": {
+        "name": "imagem_de_referência"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latente",
+        "tooltip": "Espaço latente vazio do tamanho da geração."
+      }
+    }
+  },
+  "WanSoundImageToVideo": {
+    "display_name": "WanSoundImageToVideo",
+    "inputs": {
+      "audio_encoder_output": {
+        "name": "saída do codificador de áudio"
+      },
+      "batch_size": {
+        "name": "tamanho do lote"
+      },
+      "control_video": {
+        "name": "vídeo de controle"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "comprimento"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "ref_image": {
+        "name": "imagem de referência"
+      },
+      "ref_motion": {
+        "name": "referência de movimento"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latente",
+        "tooltip": null
+      }
+    }
+  },
+  "WanSoundImageToVideoExtend": {
+    "display_name": "WanSoundImageToVideoExtend",
+    "inputs": {
+      "audio_encoder_output": {
+        "name": "saída do codificador de áudio"
+      },
+      "control_video": {
+        "name": "vídeo de controle"
+      },
+      "length": {
+        "name": "comprimento"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "ref_image": {
+        "name": "imagem de referência"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "video_latent": {
+        "name": "latente de vídeo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latente",
+        "tooltip": null
+      }
+    }
+  },
+  "WanTextToImageApi": {
+    "description": "Gera uma imagem com base em um prompt de texto.",
+    "display_name": "Wan Texto para Imagem",
+    "inputs": {
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Modelo a ser utilizado."
+      },
+      "negative_prompt": {
+        "name": "prompt_negativo",
+        "tooltip": "Prompt negativo descrevendo o que evitar."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt descrevendo os elementos e características visuais. Suporta inglês e chinês."
+      },
+      "prompt_extend": {
+        "name": "estender_prompt",
+        "tooltip": "Se deve aprimorar o prompt com assistência de IA."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "Semente a ser utilizada para a geração."
+      },
+      "watermark": {
+        "name": "marca_d'água",
+        "tooltip": "Se deve adicionar uma marca d'água gerada por IA ao resultado."
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanTextToVideoApi": {
+    "description": "Gera um vídeo com base em um prompt de texto.",
+    "display_name": "Wan Texto para Vídeo",
+    "inputs": {
+      "audio": {
+        "name": "áudio",
+        "tooltip": "O áudio deve conter uma voz clara e alta, sem ruídos ou música de fundo."
+      },
+      "control_after_generate": {
+        "name": "controle após gerar"
+      },
+      "duration": {
+        "name": "duração",
+        "tooltip": "Uma duração de 15 segundos está disponível apenas para o modelo Wan 2.6."
+      },
+      "generate_audio": {
+        "name": "gerar_áudio",
+        "tooltip": "Se nenhum áudio for fornecido, gerar áudio automaticamente."
+      },
+      "model": {
+        "name": "modelo",
+        "tooltip": "Modelo a ser utilizado."
+      },
+      "negative_prompt": {
+        "name": "prompt_negativo",
+        "tooltip": "Prompt negativo descrevendo o que evitar."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Prompt descrevendo os elementos e características visuais. Suporta inglês e chinês."
+      },
+      "prompt_extend": {
+        "name": "estender_prompt",
+        "tooltip": "Se deve aprimorar o prompt com assistência de IA."
+      },
+      "seed": {
+        "name": "semente",
+        "tooltip": "Semente a ser utilizada para a geração."
+      },
+      "shot_type": {
+        "name": "tipo_de_tomada",
+        "tooltip": "Especifica o tipo de tomada para o vídeo gerado, ou seja, se o vídeo é uma única tomada contínua ou múltiplas tomadas com cortes. Este parâmetro só tem efeito quando estender_prompt está ativado."
+      },
+      "size": {
+        "name": "tamanho"
+      },
+      "watermark": {
+        "name": "marca_d'água",
+        "tooltip": "Se deve adicionar uma marca d'água gerada por IA ao resultado."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanTrackToVideo": {
+    "display_name": "WanTrackToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "duração"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "start_image": {
+        "name": "imagem_inicial"
+      },
+      "temperature": {
+        "name": "temperatura"
+      },
+      "topk": {
+        "name": "topk"
+      },
+      "tracks": {
+        "name": "faixas"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latente",
+        "tooltip": null
+      }
+    }
+  },
+  "WanVaceToVideo": {
+    "display_name": "WanVaceToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "tamanho_do_lote"
+      },
+      "control_masks": {
+        "name": "máscaras_de_controle"
+      },
+      "control_video": {
+        "name": "control_video"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "length": {
+        "name": "duração"
+      },
+      "negative": {
+        "name": "negativo"
+      },
+      "positive": {
+        "name": "positivo"
+      },
+      "reference_image": {
+        "name": "imagem_de_referência"
+      },
+      "strength": {
+        "name": "força"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "largura"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positivo",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negativo",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latente",
+        "tooltip": null
+      },
+      "3": {
+        "name": "latente_recortado",
+        "tooltip": null
+      }
+    }
+  },
+  "WavespeedFlashVSRNode": {
+    "description": "Aprimorador de vídeo rápido e de alta qualidade que aumenta a resolução e restaura a nitidez de vídeos de baixa resolução ou borrados.",
+    "display_name": "FlashVSR Video Upscale",
+    "inputs": {
+      "target_resolution": {
+        "name": "resolução_alvo"
+      },
+      "video": {
+        "name": "vídeo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WavespeedImageUpscaleNode": {
+    "description": "Aumente a resolução e a qualidade da imagem, ampliando fotos para 4K ou 8K para resultados nítidos e detalhados.",
+    "display_name": "WaveSpeed Image Upscale",
+    "inputs": {
+      "image": {
+        "name": "imagem"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "target_resolution": {
+        "name": "resolução_alvo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WebcamCapture": {
+    "display_name": "Captura da Webcam",
+    "inputs": {
+      "capture_on_queue": {
+        "name": "capturar_na_fila"
+      },
+      "height": {
+        "name": "altura"
+      },
+      "image": {
+        "name": "imagem"
+      },
+      "waiting for camera___": {},
+      "width": {
+        "name": "largura"
+      }
+    }
+  },
+  "ZImageFunControlnet": {
+    "display_name": "ZImageFunControlnet",
+    "inputs": {
+      "image": {
+        "name": "imagem"
+      },
+      "inpaint_image": {
+        "name": "imagem_para_retouch"
+      },
+      "mask": {
+        "name": "máscara"
+      },
+      "model": {
+        "name": "modelo"
+      },
+      "model_patch": {
+        "name": "patch_do_modelo"
+      },
+      "strength": {
+        "name": "força"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
+  "unCLIPCheckpointLoader": {
+    "display_name": "unCLIPCheckpointLoader",
+    "inputs": {
+      "ckpt_name": {
+        "name": "ckpt_name"
+      }
+    }
+  },
+  "unCLIPConditioning": {
+    "display_name": "unCLIPConditioning",
+    "inputs": {
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "conditioning": {
+        "name": "condicionamento"
+      },
+      "noise_augmentation": {
+        "name": "aumento_ruído"
+      },
+      "strength": {
+        "name": "força"
+      }
+    }
+  },
+  "wanBlockSwap": {
+    "description": "NOP",
+    "display_name": "wanBlockSwap",
+    "inputs": {
+      "model": {
+        "name": "modelo"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  }
+}
diff --git a/src/locales/pt-BR/settings.json b/src/locales/pt-BR/settings.json
index 0967ef424b..a5313daf86 100644
--- a/src/locales/pt-BR/settings.json
+++ b/src/locales/pt-BR/settings.json
@@ -1 +1,499 @@
-{}
+{
+  "Comfy-Desktop_AutoUpdate": {
+    "name": "Verificar atualizações automaticamente"
+  },
+  "Comfy-Desktop_SendStatistics": {
+    "name": "Enviar métricas de uso anônimas"
+  },
+  "Comfy-Desktop_UV_PypiInstallMirror": {
+    "name": "Espelho de instalação do Pypi",
+    "tooltip": "Espelho padrão para instalação via pip"
+  },
+  "Comfy-Desktop_UV_PythonInstallMirror": {
+    "name": "Espelho de instalação do Python",
+    "tooltip": "Instalações gerenciadas do Python são baixadas do projeto Astral python-build-standalone. Esta variável pode ser definida para uma URL de espelho para usar uma fonte diferente para as instalações do Python. A URL fornecida substituirá https://github.com/astral-sh/python-build-standalone/releases/download em, por exemplo, https://github.com/astral-sh/python-build-standalone/releases/download/20240713/cpython-3.12.4%2B20240713-aarch64-apple-darwin-install_only.tar.gz. As distribuições podem ser lidas de um diretório local usando o esquema de URL file://."
+  },
+  "Comfy-Desktop_UV_TorchInstallMirror": {
+    "name": "Espelho de instalação do Torch",
+    "tooltip": "Espelho pip para instalação do pytorch"
+  },
+  "Comfy-Desktop_WindowStyle": {
+    "name": "Estilo da janela",
+    "options": {
+      "custom": "personalizado",
+      "default": "padrão"
+    },
+    "tooltip": "Personalizado: Substitui a barra de título do sistema pelo menu superior do ComfyUI"
+  },
+  "Comfy_Canvas_BackgroundImage": {
+    "name": "Imagem de fundo do canvas",
+    "tooltip": "URL da imagem para o fundo do canvas. Você pode clicar com o botão direito em uma imagem no painel de saídas e selecionar \"Definir como fundo\" para usá-la, ou enviar sua própria imagem usando o botão de upload."
+  },
+  "Comfy_Canvas_LeftMouseClickBehavior": {
+    "name": "Comportamento do clique esquerdo do mouse",
+    "options": {
+      "Panning": "Deslocar",
+      "Select": "Selecionar"
+    }
+  },
+  "Comfy_Canvas_MouseWheelScroll": {
+    "name": "Rolar com a roda do mouse",
+    "options": {
+      "Panning": "Deslocar",
+      "Zoom in/out": "Zoom in/out"
+    }
+  },
+  "Comfy_Canvas_NavigationMode": {
+    "name": "Modo de navegação",
+    "options": {
+      "Custom": "Personalizado",
+      "Drag Navigation": "Navegação por arrasto",
+      "Standard (New)": "Padrão (Novo)"
+    }
+  },
+  "Comfy_Canvas_SelectionToolbox": {
+    "name": "Mostrar caixa de ferramentas de seleção",
+    "tooltip": "Exibe uma barra de ferramentas flutuante quando os nós estão selecionados, proporcionando acesso rápido a ações comuns."
+  },
+  "Comfy_ConfirmClear": {
+    "name": "Exigir confirmação ao limpar o fluxo de trabalho"
+  },
+  "Comfy_DOMClippingEnabled": {
+    "name": "Ativar recorte de elementos DOM (ativar pode reduzir o desempenho)"
+  },
+  "Comfy_DevMode": {
+    "name": "Ativar opções de modo desenvolvedor (salvar API, etc.)"
+  },
+  "Comfy_DisableFloatRounding": {
+    "name": "Desativar arredondamento padrão de widget float.",
+    "tooltip": "(requer recarregar a página) Não é possível desativar o arredondamento quando ele é definido pelo nó no backend."
+  },
+  "Comfy_DisableSliders": {
+    "name": "Desativar sliders dos widgets dos nós"
+  },
+  "Comfy_EditAttention_Delta": {
+    "name": "Precisão de Ctrl+cima/baixo"
+  },
+  "Comfy_EnableTooltips": {
+    "name": "Ativar dicas de ferramenta"
+  },
+  "Comfy_EnableWorkflowViewRestore": {
+    "name": "Salvar e restaurar posição e nível de zoom do canvas nos fluxos de trabalho"
+  },
+  "Comfy_Execution_PreviewMethod": {
+    "name": "Método de visualização ao vivo",
+    "options": {
+      "auto": "auto",
+      "default": "padrão",
+      "latent2rgb": "latent2rgb",
+      "none": "nenhum",
+      "taesd": "taesd"
+    },
+    "tooltip": "Método de visualização ao vivo durante a geração de imagem. \"padrão\" usa a configuração do servidor CLI."
+  },
+  "Comfy_FloatRoundingPrecision": {
+    "name": "Casas decimais de arredondamento do widget float [0 = auto].",
+    "tooltip": "(requer recarregar a página)"
+  },
+  "Comfy_Graph_CanvasInfo": {
+    "name": "Mostrar informações do canvas no canto inferior esquerdo (fps, etc.)"
+  },
+  "Comfy_Graph_CanvasMenu": {
+    "name": "Mostrar menu do canvas do grafo"
+  },
+  "Comfy_Graph_CtrlShiftZoom": {
+    "name": "Ativar atalho de zoom rápido (Ctrl + Shift + Arrastar)"
+  },
+  "Comfy_Graph_DeduplicateSubgraphNodeIds": {
+    "name": "Desduplicar IDs de nós de subgrafos",
+    "tooltip": "Reatribui automaticamente IDs de nós duplicados em subgrafos ao carregar um fluxo de trabalho."
+  },
+  "Comfy_Graph_LinkMarkers": {
+    "name": "Marcadores de meio do link",
+    "options": {
+      "Arrow": "Seta",
+      "Circle": "Círculo",
+      "None": "Nenhum"
+    }
+  },
+  "Comfy_Graph_LiveSelection": {
+    "name": "Seleção ao vivo",
+    "tooltip": "Quando ativado, os nós são selecionados/deselecionados em tempo real enquanto você arrasta o retângulo de seleção, semelhante a outras ferramentas de design."
+  },
+  "Comfy_Graph_ZoomSpeed": {
+    "name": "Velocidade de zoom da tela"
+  },
+  "Comfy_GroupSelectedNodes_Padding": {
+    "name": "Espaçamento dos nós selecionados no grupo"
+  },
+  "Comfy_Group_DoubleClickTitleToEdit": {
+    "name": "Clique duplo no título do grupo para editar"
+  },
+  "Comfy_LinkRelease_Action": {
+    "name": "Ação ao soltar o link (Sem modificador)",
+    "options": {
+      "context menu": "menu de contexto",
+      "no action": "nenhuma ação",
+      "search box": "caixa de pesquisa"
+    }
+  },
+  "Comfy_LinkRelease_ActionShift": {
+    "name": "Ação ao soltar o link (Shift)",
+    "options": {
+      "context menu": "menu de contexto",
+      "no action": "nenhuma ação",
+      "search box": "caixa de pesquisa"
+    }
+  },
+  "Comfy_LinkRenderMode": {
+    "name": "Modo de renderização do link",
+    "options": {
+      "Hidden": "Oculto",
+      "Linear": "Linear",
+      "Spline": "Spline",
+      "Straight": "Reto"
+    },
+    "tooltip": "Controla a aparência e a visibilidade dos links de conexão entre os nós no canvas."
+  },
+  "Comfy_Load3D_3DViewerEnable": {
+    "name": "Ativar Visualizador 3D (Beta)",
+    "tooltip": "Ativa o Visualizador 3D (Beta) para os nós selecionados. Este recurso permite visualizar e interagir com modelos 3D diretamente no visualizador 3D em tamanho completo."
+  },
+  "Comfy_Load3D_BackgroundColor": {
+    "name": "Cor de Fundo Inicial",
+    "tooltip": "Controla a cor de fundo padrão da cena 3D. Esta configuração determina a aparência do fundo ao criar um novo widget 3D, mas pode ser ajustada individualmente para cada widget após a criação."
+  },
+  "Comfy_Load3D_CameraType": {
+    "name": "Tipo de Câmera Inicial",
+    "options": {
+      "orthographic": "ortográfica",
+      "perspective": "perspectiva"
+    },
+    "tooltip": "Controla se a câmera será perspectiva ou ortográfica por padrão ao criar um novo widget 3D. Este padrão ainda pode ser alternado individualmente para cada widget após a criação."
+  },
+  "Comfy_Load3D_LightAdjustmentIncrement": {
+    "name": "Incremento de Ajuste de Luz",
+    "tooltip": "Controla o tamanho do incremento ao ajustar a intensidade da luz em cenas 3D. Um valor menor permite um controle mais preciso dos ajustes de iluminação, enquanto um valor maior resulta em mudanças mais perceptíveis por ajuste."
+  },
+  "Comfy_Load3D_LightIntensity": {
+    "name": "Intensidade de Luz Inicial",
+    "tooltip": "Define o nível de brilho padrão da iluminação na cena 3D. Este valor determina a intensidade com que as luzes iluminam os objetos ao criar um novo widget 3D, mas pode ser ajustado individualmente para cada widget após a criação."
+  },
+  "Comfy_Load3D_LightIntensityMaximum": {
+    "name": "Intensidade Máxima da Luz",
+    "tooltip": "Define o valor máximo permitido para a intensidade da luz em cenas 3D. Isso determina o limite superior de brilho que pode ser definido ao ajustar a iluminação em qualquer widget 3D."
+  },
+  "Comfy_Load3D_LightIntensityMinimum": {
+    "name": "Intensidade Mínima da Luz",
+    "tooltip": "Define o valor mínimo permitido para a intensidade da luz em cenas 3D. Isso determina o limite inferior de brilho que pode ser definido ao ajustar a iluminação em qualquer widget 3D."
+  },
+  "Comfy_Load3D_PLYEngine": {
+    "name": "Engine PLY",
+    "options": {
+      "fastply": "fastply",
+      "sparkjs": "sparkjs",
+      "threejs": "threejs"
+    },
+    "tooltip": "Selecione a engine para carregar arquivos PLY. \"threejs\" usa o PLYLoader nativo do Three.js (melhor para arquivos PLY de malha). \"fastply\" usa um carregador otimizado para arquivos PLY de nuvem de pontos ASCII. \"sparkjs\" usa Spark.js para arquivos PLY de Gaussian Splatting 3D."
+  },
+  "Comfy_Load3D_ShowGrid": {
+    "name": "Visibilidade Inicial da Grade",
+    "tooltip": "Controla se a grade estará visível por padrão ao criar um novo widget 3D. Este padrão ainda pode ser alternado individualmente para cada widget após a criação."
+  },
+  "Comfy_Locale": {
+    "name": "Idioma"
+  },
+  "Comfy_MaskEditor_BrushAdjustmentSpeed": {
+    "name": "Multiplicador de velocidade de ajuste do pincel",
+    "tooltip": "Controla a rapidez com que o tamanho e a dureza do pincel mudam ao ajustar. Valores mais altos significam mudanças mais rápidas."
+  },
+  "Comfy_MaskEditor_UseDominantAxis": {
+    "name": "Travar ajuste do pincel ao eixo dominante",
+    "tooltip": "Quando ativado, os ajustes do pincel afetarão apenas o tamanho OU a dureza, dependendo de qual direção você mover mais"
+  },
+  "Comfy_ModelLibrary_AutoLoadAll": {
+    "name": "Carregar automaticamente todas as pastas de modelos",
+    "tooltip": "Se verdadeiro, todas as pastas serão carregadas assim que você abrir a biblioteca de modelos (isso pode causar atrasos durante o carregamento). Se falso, as pastas de modelos no nível raiz só serão carregadas quando você clicar nelas."
+  },
+  "Comfy_ModelLibrary_NameFormat": {
+    "name": "Qual nome exibir na visualização em árvore da biblioteca de modelos",
+    "options": {
+      "filename": "filename",
+      "title": "title"
+    },
+    "tooltip": "Selecione \"filename\" para exibir uma visualização simplificada do nome do arquivo bruto (sem diretório ou extensão \".safetensors\") na lista de modelos. Selecione \"title\" para exibir o título configurável dos metadados do modelo."
+  },
+  "Comfy_NodeBadge_NodeIdBadgeMode": {
+    "name": "Modo de exibição do ID do nó",
+    "options": {
+      "None": "Nenhum",
+      "Show all": "Mostrar todos"
+    }
+  },
+  "Comfy_NodeBadge_NodeLifeCycleBadgeMode": {
+    "name": "Modo de exibição do ciclo de vida do nó",
+    "options": {
+      "None": "Nenhum",
+      "Show all": "Mostrar todos"
+    }
+  },
+  "Comfy_NodeBadge_NodeSourceBadgeMode": {
+    "name": "Modo de exibição da origem do nó",
+    "options": {
+      "Hide built-in": "Ocultar integrados",
+      "None": "Nenhum",
+      "Show all": "Mostrar todos"
+    }
+  },
+  "Comfy_NodeBadge_ShowApiPricing": {
+    "name": "Mostrar selo de preço do nó de API"
+  },
+  "Comfy_NodeLibrary_NewDesign": {
+    "name": "Novo Design da Biblioteca de Nós",
+    "tooltip": "Ative a barra lateral redesenhada da biblioteca de nós com abas (Essencial, Todos, Personalizado), busca aprimorada e pré-visualizações ao passar o mouse."
+  },
+  "Comfy_NodeReplacement_Enabled": {
+    "name": "Ativar substituição automática de nós",
+    "tooltip": "Quando ativado, nós ausentes podem ser substituídos automaticamente por seus equivalentes mais recentes, se existir um mapeamento de substituição."
+  },
+  "Comfy_NodeSearchBoxImpl": {
+    "name": "Implementação da caixa de busca de nós",
+    "options": {
+      "default": "padrão",
+      "litegraph (legacy)": "litegraph (legado)",
+      "v1 (legacy)": "v1 (legado)"
+    }
+  },
+  "Comfy_NodeSearchBoxImpl_NodePreview": {
+    "name": "Pré-visualização do nó",
+    "tooltip": "Aplica-se apenas à implementação padrão"
+  },
+  "Comfy_NodeSearchBoxImpl_ShowCategory": {
+    "name": "Mostrar categoria do nó nos resultados da busca",
+    "tooltip": "Aplica-se apenas à implementação padrão"
+  },
+  "Comfy_NodeSearchBoxImpl_ShowIdName": {
+    "name": "Mostrar nome de ID do nó nos resultados da busca",
+    "tooltip": "Aplica-se apenas à implementação padrão"
+  },
+  "Comfy_NodeSearchBoxImpl_ShowNodeFrequency": {
+    "name": "Mostrar frequência do nó nos resultados da busca",
+    "tooltip": "Aplica-se apenas à implementação padrão"
+  },
+  "Comfy_NodeSuggestions_number": {
+    "name": "Número de sugestões de nós",
+    "tooltip": "Apenas para a caixa de busca/menu de contexto do litegraph"
+  },
+  "Comfy_Node_AllowImageSizeDraw": {
+    "name": "Mostrar largura × altura abaixo da pré-visualização da imagem"
+  },
+  "Comfy_Node_AlwaysShowAdvancedWidgets": {
+    "name": "Sempre mostrar widgets avançados em todos os nodes",
+    "tooltip": "Quando ativado, os widgets avançados ficam sempre visíveis em todos os nodes, sem a necessidade de expandi-los individualmente."
+  },
+  "Comfy_Node_AutoSnapLinkToSlot": {
+    "name": "Ajustar automaticamente o link ao slot do nó",
+    "tooltip": "Ao arrastar um link sobre um nó, o link se ajusta automaticamente a um slot de entrada viável no nó"
+  },
+  "Comfy_Node_BypassAllLinksOnDelete": {
+    "name": "Manter todos os links ao excluir nós",
+    "tooltip": "Ao excluir um nó, tenta reconectar todos os seus links de entrada e saída (ignorando o nó excluído)"
+  },
+  "Comfy_Node_DoubleClickTitleToEdit": {
+    "name": "Clique duplo no título do nó para editar"
+  },
+  "Comfy_Node_MiddleClickRerouteNode": {
+    "name": "Clique do meio cria um novo nó de redirecionamento"
+  },
+  "Comfy_Node_Opacity": {
+    "name": "Opacidade do nó"
+  },
+  "Comfy_Node_ShowDeprecated": {
+    "name": "Mostrar nós obsoletos na busca",
+    "tooltip": "Nós obsoletos são ocultados por padrão na interface, mas permanecem funcionais em fluxos de trabalho existentes que os utilizam."
+  },
+  "Comfy_Node_ShowExperimental": {
+    "name": "Mostrar nós experimentais na busca",
+    "tooltip": "Nós experimentais são marcados como tal na interface e podem sofrer alterações significativas ou remoção em versões futuras. Use com cautela em fluxos de trabalho de produção"
+  },
+  "Comfy_Node_SnapHighlightsNode": {
+    "name": "Destacar nó ao ajustar link",
+    "tooltip": "Ao arrastar um link sobre um nó com slot de entrada viável, destaca o nó"
+  },
+  "Comfy_Notification_ShowVersionUpdates": {
+    "name": "Mostrar atualizações de versão",
+    "tooltip": "Mostrar atualizações para novos modelos e grandes novos recursos."
+  },
+  "Comfy_Pointer_ClickBufferTime": {
+    "name": "Atraso de tolerância de clique do ponteiro",
+    "tooltip": "Após pressionar um botão do ponteiro, este é o tempo máximo (em milissegundos) em que o movimento do ponteiro pode ser ignorado.\n\nAjuda a evitar que objetos sejam movidos acidentalmente se o ponteiro for movido ao clicar."
+  },
+  "Comfy_Pointer_ClickDrift": {
+    "name": "Tolerância de movimento do clique do ponteiro (distância máxima)",
+    "tooltip": "Se o ponteiro se mover mais do que esta distância enquanto um botão estiver pressionado, será considerado arrastar (em vez de clicar).\n\nAjuda a evitar que objetos sejam movidos acidentalmente se o ponteiro for movido ao clicar."
+  },
+  "Comfy_Pointer_DoubleClickTime": {
+    "name": "Intervalo de duplo clique (máximo)",
+    "tooltip": "O tempo máximo em milissegundos entre os dois cliques de um duplo clique. Aumentar este valor pode ajudar se os duplos cliques às vezes não forem registrados."
+  },
+  "Comfy_PreviewFormat": {
+    "name": "Formato da imagem de pré-visualização",
+    "tooltip": "Ao exibir uma pré-visualização no widget de imagem, converta para uma imagem leve, por exemplo, webp, jpeg, webp;50, etc."
+  },
+  "Comfy_PromptFilename": {
+    "name": "Solicitar nome do arquivo ao salvar fluxo de trabalho"
+  },
+  "Comfy_QueueButton_BatchCountLimit": {
+    "name": "Limite de quantidade por lote",
+    "tooltip": "O número máximo de tarefas adicionadas à fila em um único clique"
+  },
+  "Comfy_Queue_MaxHistoryItems": {
+    "name": "Tamanho do histórico da fila",
+    "tooltip": "O número máximo de tarefas exibidas no histórico da fila."
+  },
+  "Comfy_Queue_QPOV2": {
+    "name": "Usar a fila de tarefas unificada no painel lateral de Assets",
+    "tooltip": "Substitui o painel flutuante de fila de tarefas por uma fila de tarefas equivalente incorporada ao painel lateral de Assets. Você pode desativar isso para voltar ao layout do painel flutuante."
+  },
+  "Comfy_RightSidePanel_ShowErrorsTab": {
+    "name": "Mostrar aba de erros no painel lateral",
+    "tooltip": "Quando ativado, uma aba de erros é exibida no painel lateral direito para mostrar rapidamente os erros de execução do fluxo de trabalho."
+  },
+  "Comfy_Sidebar_Location": {
+    "name": "Localização da barra lateral",
+    "options": {
+      "left": "esquerda",
+      "right": "direita"
+    }
+  },
+  "Comfy_Sidebar_Size": {
+    "name": "Tamanho da barra lateral",
+    "options": {
+      "normal": "normal",
+      "small": "pequena"
+    }
+  },
+  "Comfy_Sidebar_Style": {
+    "name": "Estilo da barra lateral",
+    "options": {
+      "connected": "conectada",
+      "floating": "flutuante"
+    }
+  },
+  "Comfy_Sidebar_UnifiedWidth": {
+    "name": "Largura unificada da barra lateral"
+  },
+  "Comfy_SnapToGrid_GridSize": {
+    "name": "Tamanho do grid de alinhamento",
+    "tooltip": "Ao arrastar e redimensionar nós segurando shift, eles serão alinhados à grade. Este valor controla o tamanho dessa grade."
+  },
+  "Comfy_TextareaWidget_FontSize": {
+    "name": "Tamanho da fonte do widget de área de texto"
+  },
+  "Comfy_TextareaWidget_Spellcheck": {
+    "name": "Verificação ortográfica do widget de área de texto"
+  },
+  "Comfy_TreeExplorer_ItemPadding": {
+    "name": "Espaçamento dos itens do explorador em árvore"
+  },
+  "Comfy_UI_TabBarLayout": {
+    "name": "Layout da Barra de Abas",
+    "options": {
+      "Default": "Padrão",
+      "Integrated": "Integrado"
+    },
+    "tooltip": "Controla o layout da barra de abas. \"Integrado\" move os controles de Ajuda e Usuário para a área da barra de abas."
+  },
+  "Comfy_UseNewMenu": {
+    "name": "Usar novo menu",
+    "options": {
+      "Disabled": "Desativado",
+      "Top": "Superior"
+    },
+    "tooltip": "Ativar a barra de menu superior redesenhada."
+  },
+  "Comfy_Validation_Workflows": {
+    "name": "Validar fluxos de trabalho"
+  },
+  "Comfy_VueNodes_AutoScaleLayout": {
+    "name": "Auto-escalar layout (Nodes 2.0)",
+    "tooltip": "Escala automaticamente as posições dos nós ao alternar para a renderização Nodes 2.0 para evitar sobreposição"
+  },
+  "Comfy_VueNodes_Enabled": {
+    "name": "Design Moderno de Nós (Nodes 2.0)",
+    "tooltip": "Moderno: renderização baseada em DOM com interatividade aprimorada, recursos nativos do navegador e design visual atualizado. Clássico: renderização tradicional em canvas."
+  },
+  "Comfy_WidgetControlMode": {
+    "name": "Modo de controle do widget",
+    "options": {
+      "after": "depois",
+      "before": "antes"
+    },
+    "tooltip": "Controla quando os valores do widget são atualizados (aleatorizar/incrementar/decrementar), antes ou depois do fluxo ser adicionado à fila."
+  },
+  "Comfy_Window_UnloadConfirmation": {
+    "name": "Mostrar confirmação ao fechar a janela"
+  },
+  "Comfy_Workflow_AutoSave": {
+    "name": "Salvar automaticamente",
+    "options": {
+      "after delay": "após atraso",
+      "off": "desligado"
+    }
+  },
+  "Comfy_Workflow_AutoSaveDelay": {
+    "name": "Atraso de Salvamento Automático (ms)",
+    "tooltip": "Aplica-se apenas se o Salvamento Automático estiver definido como \"após atraso\"."
+  },
+  "Comfy_Workflow_ConfirmDelete": {
+    "name": "Mostrar confirmação ao excluir fluxos de trabalho"
+  },
+  "Comfy_Workflow_Persist": {
+    "name": "Persistir estado do fluxo de trabalho e restaurar ao recarregar a página"
+  },
+  "Comfy_Workflow_ShowMissingModelsWarning": {
+    "name": "Mostrar aviso de modelos ausentes"
+  },
+  "Comfy_Workflow_ShowMissingNodesWarning": {
+    "name": "Mostrar aviso de nós ausentes"
+  },
+  "Comfy_Workflow_SortNodeIdOnSave": {
+    "name": "Ordenar IDs dos nós ao salvar fluxo de trabalho"
+  },
+  "Comfy_Workflow_WarnBlueprintOverwrite": {
+    "name": "Exigir confirmação para sobrescrever um blueprint de subgrafo existente"
+  },
+  "Comfy_Workflow_WorkflowTabsPosition": {
+    "name": "Posição dos fluxos de trabalho abertos",
+    "options": {
+      "Sidebar": "Barra lateral",
+      "Topbar": "Barra superior"
+    }
+  },
+  "LiteGraph_Canvas_MaximumFps": {
+    "name": "FPS Máximo",
+    "tooltip": "O número máximo de quadros por segundo que o canvas pode renderizar. Limita o uso da GPU ao custo de suavidade. Se 0, a taxa de atualização da tela é usada. Padrão: 0"
+  },
+  "LiteGraph_Canvas_MinFontSizeForLOD": {
+    "name": "Zoom do Nível de Detalhe do Nó - limite de tamanho da fonte",
+    "tooltip": "Controla quando os nós mudam para renderização LOD de baixa qualidade. Usa o tamanho da fonte em pixels para determinar quando alternar. Defina como 0 para desativar. Valores de 1-24 definem o limite mínimo de tamanho da fonte para LOD - valores mais altos (24px) = alterna para renderização simplificada dos nós mais cedo ao afastar o zoom, valores mais baixos (1px) = mantém a qualidade total do nó por mais tempo."
+  },
+  "LiteGraph_ContextMenu_Scaling": {
+    "name": "Escalar menus de combinação de nós (listas) ao dar zoom"
+  },
+  "LiteGraph_Node_DefaultPadding": {
+    "name": "Sempre reduzir novos nós",
+    "tooltip": "Redimensiona os nós para o menor tamanho possível ao serem criados. Quando desativado, um nó recém-adicionado será ligeiramente alargado para mostrar os valores dos widgets."
+  },
+  "LiteGraph_Node_TooltipDelay": {
+    "name": "Atraso da Dica de Ferramenta"
+  },
+  "LiteGraph_Reroute_SplineOffset": {
+    "name": "Deslocamento da curva de redirecionamento",
+    "tooltip": "O deslocamento do ponto de controle bezier a partir do ponto central de redirecionamento"
+  },
+  "pysssss_SnapToGrid": {
+    "name": "Sempre alinhar à grade",
+    "tooltip": "Quando ativado, os nós se alinharão automaticamente à grade ao serem movidos ou redimensionados."
+  }
+}
diff --git a/src/locales/ru/commands.json b/src/locales/ru/commands.json
index 433af33fb6..45f36cf57b 100644
--- a/src/locales/ru/commands.json
+++ b/src/locales/ru/commands.json
@@ -1,6 +1,42 @@
 {
+  "Comfy-Desktop_CheckForUpdates": {
+    "label": "Проверить обновления"
+  },
+  "Comfy-Desktop_Folders_OpenCustomNodesFolder": {
+    "label": "Открыть папку пользовательских узлов"
+  },
+  "Comfy-Desktop_Folders_OpenInputsFolder": {
+    "label": "Открыть папку входных данных"
+  },
+  "Comfy-Desktop_Folders_OpenLogsFolder": {
+    "label": "Открыть папку логов"
+  },
+  "Comfy-Desktop_Folders_OpenModelConfig": {
+    "label": "Открыть extra_model_paths.yaml"
+  },
+  "Comfy-Desktop_Folders_OpenModelsFolder": {
+    "label": "Открыть папку моделей"
+  },
+  "Comfy-Desktop_Folders_OpenOutputsFolder": {
+    "label": "Открыть папку выходных данных"
+  },
+  "Comfy-Desktop_OpenDevTools": {
+    "label": "Открыть инструменты разработчика"
+  },
+  "Comfy-Desktop_OpenUserGuide": {
+    "label": "Руководство пользователя для Desktop"
+  },
+  "Comfy-Desktop_Quit": {
+    "label": "Выйти"
+  },
+  "Comfy-Desktop_Reinstall": {
+    "label": "Переустановить"
+  },
+  "Comfy-Desktop_Restart": {
+    "label": "Перезапустить"
+  },
   "Comfy_3DViewer_Open3DViewer": {
-    "label": "Открыть 3D-просмотрщик (бета) для выбранного узла"
+    "label": "Открыть 3D-просмотрщик (Бета) для выбранного узла"
   },
   "Comfy_BrowseModelAssets": {
     "label": "Экспериментально: Просмотр ресурсов моделей"
@@ -8,6 +44,9 @@
   "Comfy_BrowseTemplates": {
     "label": "Просмотр шаблонов"
   },
+  "Comfy_Canvas_CopySelected": {
+    "label": "Копировать"
+  },
   "Comfy_Canvas_DeleteSelectedItems": {
     "label": "Удалить выбранные элементы"
   },
@@ -29,12 +68,18 @@
   "Comfy_Canvas_MoveSelectedNodes_Up": {
     "label": "Переместить выбранные узлы вверх"
   },
+  "Comfy_Canvas_PasteFromClipboard": {
+    "label": "Вставить"
+  },
   "Comfy_Canvas_ResetView": {
     "label": "Сбросить вид"
   },
   "Comfy_Canvas_Resize": {
     "label": "Изменить размер выбранных узлов"
   },
+  "Comfy_Canvas_SelectAll": {
+    "label": "Выбрать все"
+  },
   "Comfy_Canvas_ToggleLinkVisibility": {
     "label": "Переключить видимость ссылки"
   },
@@ -155,18 +200,30 @@
   "Comfy_Manager_ShowUpdateAvailablePacks": {
     "label": "Проверить наличие обновлений"
   },
-  "Comfy_Manager_ToggleManagerProgressDialog": {
-    "label": "Переключить диалоговое окно прогресса"
-  },
   "Comfy_MaskEditor_BrushSize_Decrease": {
     "label": "Уменьшить размер кисти в MaskEditor"
   },
   "Comfy_MaskEditor_BrushSize_Increase": {
     "label": "Увеличить размер кисти в MaskEditor"
   },
+  "Comfy_MaskEditor_ColorPicker": {
+    "label": "Открыть палитру цветов в MaskEditor"
+  },
+  "Comfy_MaskEditor_Mirror_Horizontal": {
+    "label": "Отразить по горизонтали в MaskEditor"
+  },
+  "Comfy_MaskEditor_Mirror_Vertical": {
+    "label": "Отразить по вертикали в MaskEditor"
+  },
   "Comfy_MaskEditor_OpenMaskEditor": {
     "label": "Открыть редактор масок для выбранной ноды"
   },
+  "Comfy_MaskEditor_Rotate_Left": {
+    "label": "Повернуть влево в MaskEditor"
+  },
+  "Comfy_MaskEditor_Rotate_Right": {
+    "label": "Повернуть вправо в MaskEditor"
+  },
   "Comfy_Memory_UnloadModels": {
     "label": "Выгрузить модели"
   },
@@ -197,12 +254,18 @@
   "Comfy_QueueSelectedOutputNodes": {
     "label": "Добавить выбранные выходные узлы в очередь"
   },
+  "Comfy_Queue_ToggleOverlay": {
+    "label": "Показать/скрыть историю заданий"
+  },
   "Comfy_Redo": {
     "label": "Повторить"
   },
   "Comfy_RefreshNodeDefinitions": {
     "label": "Обновить определения нод"
   },
+  "Comfy_RenameWorkflow": {
+    "label": "Переименовать рабочий процесс"
+  },
   "Comfy_SaveWorkflow": {
     "label": "Сохранить рабочий процесс"
   },
@@ -212,6 +275,12 @@
   "Comfy_ShowSettingsDialog": {
     "label": "Показать диалог настроек"
   },
+  "Comfy_Subgraph_SetDescription": {
+    "label": "Установить описание подграфа"
+  },
+  "Comfy_Subgraph_SetSearchAliases": {
+    "label": "Установить поисковые псевдонимы подграфа"
+  },
   "Comfy_ToggleAssetAPI": {
     "label": "Экспериментально: Включить AssetAPI"
   },
@@ -221,6 +290,12 @@
   "Comfy_ToggleHelpCenter": {
     "label": "Центр поддержки"
   },
+  "Comfy_ToggleLinear": {
+    "label": "переключить линейный режим"
+  },
+  "Comfy_ToggleQPOV2": {
+    "label": "Переключить панель очереди V2"
+  },
   "Comfy_ToggleTheme": {
     "label": "Переключить тему (Тёмная/Светлая)"
   },
@@ -252,10 +327,10 @@
     "label": "Переключить нижнюю панель"
   },
   "Workspace_ToggleBottomPanelTab_command-terminal": {
-    "label": "Переключить нижнюю панель терминала"
+    "label": "Показать/скрыть нижнюю панель терминала"
   },
   "Workspace_ToggleBottomPanelTab_logs-terminal": {
-    "label": "Переключить нижнюю панель логов"
+    "label": "Показать/скрыть нижнюю панель логов"
   },
   "Workspace_ToggleBottomPanelTab_shortcuts-essentials": {
     "label": "Показать/скрыть основную нижнюю панель"
@@ -269,6 +344,10 @@
   "Workspace_ToggleFocusMode": {
     "label": "Переключить режим фокуса"
   },
+  "Workspace_ToggleSidebarTab_apps": {
+    "label": "Переключить боковую панель приложений",
+    "tooltip": "Приложения"
+  },
   "Workspace_ToggleSidebarTab_assets": {
     "label": "Переключить боковую панель ресурсов",
     "tooltip": "Ресурсы"
diff --git a/src/locales/ru/main.json b/src/locales/ru/main.json
index 5867d9a535..febedfec89 100644
--- a/src/locales/ru/main.json
+++ b/src/locales/ru/main.json
@@ -1,6 +1,8 @@
 {
   "actionbar": {
-    "dockToTop": "Закрепить сверху"
+    "dockToTop": "Закрепить сверху",
+    "feedback": "Обратная связь",
+    "feedbackTooltip": "Обратная связь"
   },
   "apiNodesCostBreakdown": {
     "costPerRun": "Стоимость за запуск",
@@ -14,26 +16,175 @@
   "assetBrowser": {
     "allCategory": "Все {category}",
     "allModels": "Все модели",
+    "apiKeyHint": "Импортируете приватные или ограниченные модели? {link}.",
+    "apiKeyHintLink": "Добавьте свои API-ключи в Настройках",
     "ariaLabel": {
       "assetCard": "{name} - ресурс типа {type}",
       "loadingAsset": "Загрузка ресурса"
     },
+    "assetCollection": "Коллекция ассетов",
     "assets": "Ресурсы",
+    "baseModel": "Базовая модель",
     "baseModels": "Базовые модели",
     "browseAssets": "Просмотр ресурсов",
+    "byType": "По типу",
+    "checkpoints": "Чекпойнты",
+    "civitaiLinkExample": "{example} {link}",
+    "civitaiLinkExampleStrong": "Пример:",
+    "civitaiLinkExampleUrl": "https://civitai.com/models/10706/luisap-z-image-and-qwen-pixel-art-refiner?modelVersionId=2225295",
+    "civitaiLinkLabel": "Ссылка на модель Civitai для {download}",
+    "civitaiLinkLabelDownload": "скачивания",
+    "civitaiLinkPlaceholder": "Вставьте ссылку сюда",
+    "confirmModelDetails": "Подтвердить детали модели",
     "connectionError": "Проверьте соединение и попробуйте снова",
+    "deletion": {
+      "body": "Эта модель будет навсегда удалена из вашей библиотеки.",
+      "complete": "{assetName} удалён.",
+      "failed": "Не удалось удалить {assetName}.",
+      "header": "Удалить эту модель?",
+      "inProgress": "Удаление {assetName}..."
+    },
+    "download": {
+      "complete": "Загрузка завершена",
+      "failed": "Ошибка загрузки",
+      "inProgress": "Загрузка {assetName}..."
+    },
+    "emptyImported": {
+      "canImport": "Пока нет импортированных моделей. Нажмите «Импортировать модель», чтобы добавить свою.",
+      "restricted": "Персональные модели доступны только на уровне Creator и выше."
+    },
+    "errorAccessForbidden": "Доступ к этому ресурсу запрещён.",
+    "errorConnectionRefused": "Не удалось подключиться к источнику. Пожалуйста, попробуйте позже.",
+    "errorDownloadCancelled": "Загрузка была отменена.",
+    "errorFileTooLarge": "Файл превышает максимально допустимый размер",
+    "errorFormatNotAllowed": "Разрешён только формат SafeTensor",
+    "errorHttpError": "Произошла ошибка при получении метаданных.",
+    "errorInternalError": "Произошла непредвиденная ошибка. Пожалуйста, попробуйте ещё раз.",
+    "errorInvalidHost": "Имя хоста в URL источника не удалось разрешить.",
+    "errorInvalidUrl": "Пожалуйста, укажите URL.",
+    "errorInvalidUrlFormat": "Неверный формат URL. Пожалуйста, проверьте и попробуйте снова.",
+    "errorMetadataFetchFailed": "Не удалось получить информацию о файле с источника.",
+    "errorModelTypeNotSupported": "Этот тип модели не поддерживается",
+    "errorNetworkError": "Произошла сетевая ошибка. Проверьте подключение и попробуйте снова.",
+    "errorNetworkTimeout": "Время ожидания запроса истекло. Пожалуйста, попробуйте ещё раз.",
+    "errorRateLimited": "Слишком много запросов. Пожалуйста, попробуйте через несколько минут.",
+    "errorRequestCancelled": "Запрос был отменён.",
+    "errorResourceNotFound": "Файл не найден. Проверьте URL и попробуйте снова.",
+    "errorServiceUnavailable": "Сервис временно недоступен. Пожалуйста, попробуйте позже.",
+    "errorSourceServerError": "На сервере источника возникли проблемы. Пожалуйста, попробуйте позже.",
+    "errorUnauthorized": "Пожалуйста, войдите в систему, чтобы продолжить.",
+    "errorUnauthorizedSource": "Для этого ресурса требуется аутентификация. Добавьте свой API-токен в настройках.",
+    "errorUnknown": "Произошла непредвиденная ошибка",
+    "errorUnsafePickleScan": "CivitAI обнаружил потенциально опасный код в этом файле",
+    "errorUnsafeVirusScan": "CivitAI обнаружил вредоносное ПО или подозрительное содержимое в этом файле",
+    "errorUnsupportedSource": "Этот URL не поддерживается. Разрешены только ссылки Hugging Face и Civitai.",
+    "errorUploadFailed": "Не удалось импортировать ассет. Пожалуйста, попробуйте ещё раз.",
+    "errorUserTokenAccessDenied": "Ваш API-токен не имеет доступа к этому ресурсу. Проверьте права доступа токена.",
+    "errorUserTokenInvalid": "Ваш сохранённый API-токен недействителен или истёк. Обновите токен в настройках.",
     "failedToCreateNode": "Не удалось создать узел. Попробуйте ещё раз или проверьте консоль для подробностей.",
     "fileFormats": "Форматы файлов",
+    "fileName": "Имя файла",
+    "fileSize": "Размер файла",
+    "filterBy": "Фильтровать по",
+    "findInLibrary": "Найдите это в разделе {type} библиотеки моделей.",
+    "finish": "Готово",
+    "genericLinkPlaceholder": "Вставьте ссылку сюда",
+    "importAnother": "Импортировать другой",
+    "imported": "Импортировано",
+    "invalidAsset": "Недопустимый ресурс",
+    "invalidAssetDetail": "Выбранный ресурс не удалось проверить. Пожалуйста, попробуйте еще раз.",
+    "invalidFilename": "Недопустимое имя файла",
+    "invalidFilenameDetail": "Не удалось определить имя файла ресурса. Пожалуйста, попробуйте еще раз.",
+    "jobId": "ID задачи",
     "loadingModels": "Загрузка {type}...",
+    "maxFileSize": "Максимальный размер файла: {size}",
+    "maxFileSizeValue": "1 ГБ",
+    "media": {
+      "audioPlaceholder": "Аудио",
+      "threeDModelPlaceholder": "3D-модель"
+    },
+    "modelAssociatedWithLink": "Модель, связанная с предоставленной вами ссылкой:",
+    "modelInfo": {
+      "addBaseModel": "Добавить базовую модель...",
+      "addTag": "Добавить тег...",
+      "additionalTags": "Дополнительные теги",
+      "baseModelUnknown": "Базовая модель неизвестна",
+      "basicInfo": "Основная информация",
+      "compatibleBaseModels": "Совместимые базовые модели",
+      "description": "Описание",
+      "descriptionNotSet": "Описание не задано",
+      "descriptionPlaceholder": "Добавьте описание для этой модели...",
+      "displayName": "Отображаемое имя",
+      "editDisplayName": "Редактировать отображаемое имя",
+      "fileName": "Имя файла",
+      "modelDescription": "Описание модели",
+      "modelTagging": "Теги модели",
+      "modelType": "Тип модели",
+      "noAdditionalTags": "Нет дополнительных тегов",
+      "selectModelPrompt": "Выберите модель, чтобы увидеть её информацию",
+      "selectModelType": "Выберите тип модели...",
+      "source": "Источник",
+      "title": "Информация о модели",
+      "triggerPhrases": "Триггерные фразы",
+      "viewOnSource": "Посмотреть на {source}"
+    },
+    "modelName": "Имя модели",
+    "modelNamePlaceholder": "Введите имя для этой модели",
+    "modelTypeSelectorLabel": "Какой это тип модели?",
+    "modelTypeSelectorPlaceholder": "Выберите тип модели",
+    "modelUploaded": "Модель успешно импортирована.",
     "noAssetsFound": "Ресурсы не найдены",
     "noModelsInFolder": "Нет {type} в этой папке",
+    "noResultsCanImport": "Попробуйте изменить параметры поиска или фильтры.\nВы также можете добавить модели с помощью кнопки «Импортировать» выше.",
+    "noValidSourceDetected": "Не обнаружен действительный источник импорта",
+    "notSureLeaveAsIs": "Не уверены? Просто оставьте как есть",
+    "onlyCivitaiUrlsSupported": "Поддерживаются только ссылки Civitai",
+    "ownership": "Владение",
+    "ownershipAll": "Все",
+    "ownershipMyModels": "Мои модели",
+    "ownershipPublicModels": "Публичные модели",
+    "processingModel": "Загрузка начата",
+    "processingModelDescription": "Вы можете закрыть это окно. Загрузка продолжится в фоновом режиме.",
+    "providerCivitai": "Civitai",
+    "providerHuggingFace": "Hugging Face",
+    "rename": {
+      "failed": "Не удалось переименовать ассет."
+    },
+    "selectFrameworks": "Выберите фреймворки",
+    "selectModelType": "Выберите тип модели",
+    "selectProjects": "Выберите проекты",
     "sortAZ": "А-Я",
     "sortBy": "Сортировать по",
+    "sortDefault": "По умолчанию",
     "sortPopular": "Популярные",
     "sortRecent": "Недавние",
     "sortZA": "Я-А",
+    "sortingType": "Тип сортировки",
+    "tags": "Теги",
+    "tagsHelp": "Разделяйте теги запятыми",
+    "tagsPlaceholder": "например, models, checkpoint",
     "tryAdjustingFilters": "Попробуйте изменить поиск или фильтры",
-    "unknown": "Неизвестно"
+    "unknown": "Неизвестно",
+    "unsupportedUrlSource": "Поддерживаются только ссылки от {sources}",
+    "upgradeFeatureDescription": "Эта функция доступна только в планах Creator или Pro.",
+    "upgradeToUnlockFeature": "Обновите тариф для доступа к этой функции",
+    "upload": "Импортировать",
+    "uploadFailed": "Импорт не удался",
+    "uploadModel": "Импортировать",
+    "uploadModelDescription1": "Вставьте ссылку на скачивание модели Civitai, чтобы добавить её в свою библиотеку.",
+    "uploadModelDescription1Generic": "Вставьте ссылку на скачивание модели, чтобы добавить её в свою библиотеку.",
+    "uploadModelDescription2": "В данный момент поддерживаются только ссылки с {link}",
+    "uploadModelDescription2Generic": "В данный момент поддерживаются только ссылки от следующих провайдеров:",
+    "uploadModelDescription2Link": "https://civitai.com/models",
+    "uploadModelDescription3": "Максимальный размер файла: {size}",
+    "uploadModelFailedToRetrieveMetadata": "Не удалось получить метаданные. Пожалуйста, проверьте ссылку и попробуйте снова.",
+    "uploadModelFromCivitai": "Импортировать модель из Civitai",
+    "uploadModelGeneric": "Импортировать модель",
+    "uploadModelHelpFooterText": "Нужна помощь с поиском ссылок? Нажмите на провайдера ниже, чтобы посмотреть обучающее видео.",
+    "uploadModelHelpVideo": "Видео-помощь по загрузке модели",
+    "uploadModelHowDoIFindThis": "Как это найти?",
+    "uploadSuccess": "Модель успешно импортирована!",
+    "uploadingModel": "Импорт модели..."
   },
   "auth": {
     "apiKey": {
@@ -55,13 +206,7 @@
       "whitelistInfo": "О не включённых в белый список сайтах"
     },
     "deleteAccount": {
-      "cancel": "Отмена",
-      "confirm": "Удалить аккаунт",
-      "confirmMessage": "Вы уверены, что хотите удалить свой аккаунт? Это действие необратимо и приведёт к безвозвратному удалению всех ваших данных.",
-      "confirmTitle": "Удалить аккаунт",
-      "deleteAccount": "Удалить аккаунт",
-      "success": "Аккаунт удалён",
-      "successDetail": "Ваш аккаунт был успешно удалён."
+      "contactSupport": "Чтобы удалить свою учетную запись, пожалуйста, свяжитесь с {email}"
     },
     "errors": {
       "auth/cancelled-popup-request": "Вход был отменен. Пожалуйста, попробуйте еще раз.",
@@ -80,6 +225,7 @@
     "login": {
       "andText": "и",
       "backToLogin": "Вернуться к входу",
+      "backToSocialLogin": "Зарегистрируйтесь через Google или Github",
       "confirmPasswordLabel": "Подтвердите пароль",
       "confirmPasswordPlaceholder": "Введите тот же пароль еще раз",
       "didntReceiveEmail": "Не получили письмо? Свяжитесь с нами по адресу",
@@ -88,6 +234,9 @@
       "failed": "Вход не удался",
       "forgotPassword": "Забыли пароль?",
       "forgotPasswordError": "Не удалось отправить письмо для сброса пароля",
+      "freeTierBadge": "Доступен бесплатный тариф",
+      "freeTierDescription": "Зарегистрируйтесь через Google и получите {credits} бесплатных кредитов каждый месяц. Карта не требуется.",
+      "freeTierDescriptionGeneric": "Зарегистрируйтесь через Google и получайте бесплатные кредиты каждый месяц. Карта не требуется.",
       "insecureContextWarning": "Это соединение небезопасно (HTTP) — ваши учетные данные могут быть перехвачены злоумышленниками, если вы продолжите вход.",
       "loginButton": "Войти",
       "loginWithGithub": "Войти через Github",
@@ -106,11 +255,13 @@
       "sendResetLink": "Отправить ссылку для сброса",
       "signInOrSignUp": "Войти / Зарегистрироваться",
       "signUp": "Зарегистрироваться",
+      "signUpFreeTierPromo": "Впервые здесь? {signUp} через Google и получите {credits} бесплатных кредитов каждый месяц.",
       "success": "Вход выполнен успешно",
       "termsLink": "Условиями использования",
       "termsText": "Нажимая \"Далее\" или \"Зарегистрироваться\", вы соглашаетесь с нашими",
       "title": "Войдите в свой аккаунт",
       "useApiKey": "Comfy API-ключ",
+      "useEmailInstead": "Использовать электронную почту",
       "userAvatar": "Аватар пользователя"
     },
     "loginButton": {
@@ -130,11 +281,14 @@
     "signOut": {
       "signOut": "Выйти",
       "success": "Вы успешно вышли из системы",
-      "successDetail": "Вы вышли из своей учетной записи."
+      "successDetail": "Вы вышли из своей учетной записи.",
+      "unsavedChangesMessage": "У вас есть несохранённые изменения, которые будут потеряны при выходе из системы. Вы хотите продолжить?",
+      "unsavedChangesTitle": "Несохранённые изменения"
     },
     "signup": {
       "alreadyHaveAccount": "Уже есть аккаунт?",
       "emailLabel": "Электронная почта",
+      "emailNotEligibleForFreeTier": "Регистрация по электронной почте не даёт права на бесплатный тариф.",
       "emailPlaceholder": "Введите вашу электронную почту",
       "passwordLabel": "Пароль",
       "passwordPlaceholder": "Введите новый пароль",
@@ -147,12 +301,68 @@
       "title": "Создать аккаунт"
     }
   },
+  "batch": {
+    "index": "{current} / {total}"
+  },
+  "billingOperation": {
+    "subscriptionFailed": "Не удалось обновить подписку",
+    "subscriptionProcessing": "Обработка платежа — настройка вашего рабочего пространства...",
+    "subscriptionSuccess": "Подписка успешно обновлена",
+    "subscriptionTimeout": "Время ожидания подтверждения подписки истекло",
+    "topupFailed": "Не удалось пополнить баланс",
+    "topupProcessing": "Обработка платежа — добавление кредитов...",
+    "topupSuccess": "Кредиты успешно добавлены",
+    "topupTimeout": "Время ожидания подтверждения пополнения истекло"
+  },
+  "boundingBox": {
+    "height": "Высота",
+    "width": "Ширина",
+    "x": "X",
+    "y": "Y"
+  },
   "breadcrumbsMenu": {
     "clearWorkflow": "Очистить рабочий процесс",
     "deleteBlueprint": "Удалить схему",
     "deleteWorkflow": "Удалить рабочий процесс",
     "duplicate": "Дублировать",
-    "enterNewName": "Введите новое имя"
+    "enterAppMode": "Войти в режим приложения",
+    "enterBuilderMode": "Войти в режим конструктора приложения",
+    "enterNewName": "Введите новое имя",
+    "exitAppMode": "Выйти из режима приложения",
+    "missingNodesWarning": "В рабочем процессе есть неподдерживаемые узлы (выделены красным).",
+    "workflowActions": "Действия с рабочим процессом"
+  },
+  "builderMenu": {
+    "exitAppBuilder": "Выйти из конструктора приложений"
+  },
+  "builderToolbar": {
+    "app": "Приложение",
+    "appDescription": "Открывается как приложение по умолчанию",
+    "arrange": "Предпросмотр",
+    "arrangeDescription": "Проверьте макет приложения",
+    "connectOutput": "Подключить выход",
+    "connectOutputBody1": "Вашему приложению необходимо подключить хотя бы один выход перед сохранением.",
+    "connectOutputBody2": "Переключитесь на шаг «Выбрать» и кликните по выходным узлам, чтобы добавить их сюда.",
+    "defaultModeAppliedAppBody": "Этот рабочий процесс теперь будет открываться в режиме приложения по умолчанию.",
+    "defaultModeAppliedAppPrompt": "Хотите просмотреть его сейчас?",
+    "defaultModeAppliedGraphBody": "Этот рабочий процесс теперь будет открываться как граф узлов по умолчанию.",
+    "defaultModeAppliedGraphPrompt": "Хотите всё равно просмотреть приложение?",
+    "defaultModeAppliedTitle": "Успешно установлено",
+    "defaultView": "Установить вид по умолчанию",
+    "defaultViewDescription": "Выберите, как это будет открываться",
+    "defaultViewLabel": "По умолчанию этот рабочий процесс будет открываться как:",
+    "defaultViewTitle": "Установить вид по умолчанию для этого рабочего процесса",
+    "emptyWorkflowPrompt": "Хотите начать с шаблона?",
+    "emptyWorkflowTitle": "В этом рабочем процессе нет узлов",
+    "inputs": "Входы",
+    "inputsDescription": "Выберите входные данные",
+    "label": "Конструктор приложений",
+    "nodeGraph": "Граф узлов",
+    "nodeGraphDescription": "Открывается как граф узлов по умолчанию",
+    "outputs": "Выходы",
+    "outputsDescription": "Выберите выходные данные",
+    "switchToOutputs": "Перейти к выводам",
+    "viewApp": "Просмотреть приложение"
   },
   "clipboard": {
     "errorMessage": "Не удалось скопировать в буфер обмена",
@@ -206,6 +416,7 @@
     },
     "retry": "Попробовать снова",
     "retrying": "Повторная попытка...",
+    "skipToCloudApp": "Перейти к облачному приложению",
     "start": {
       "desc": "Не требует настройки. Работает на любом устройстве.",
       "download": "Скачать ComfyUI",
@@ -339,6 +550,8 @@
     "Edit Subgraph Widgets": "Редактировать виджеты подграфа",
     "Expand": "Развернуть",
     "Expand Node": "Развернуть ноду",
+    "Extensions": "Расширения",
+    "FavoriteWidget": "Добавить в избранное",
     "Horizontal": "Горизонтально",
     "Inputs": "Входы",
     "Left": "Влево",
@@ -358,6 +571,7 @@
     "Remove": "Удалить",
     "Remove Bypass": "Удалить обход",
     "Rename": "Переименовать",
+    "RenameWidget": "Переименовать виджет",
     "Resize": "Изменить размер",
     "Right": "Вправо",
     "Run Branch": "Запустить ветку",
@@ -368,6 +582,7 @@
     "Shapes": "Формы",
     "Title": "Заголовок",
     "Top": "Верх",
+    "UnfavoriteWidget": "Удалить из избранного",
     "Unpack Subgraph": "Распаковать подграф",
     "Unpin": "Открепить",
     "Vertical": "Вертикально",
@@ -381,6 +596,7 @@
     "additionalInfo": "Дополнительная информация",
     "apiPricing": "Цены на API",
     "credits": "Кредиты",
+    "creditsAvailable": "Доступно кредитов",
     "details": "Детали",
     "eventType": "Тип события",
     "faqs": "Часто задаваемые вопросы",
@@ -389,15 +605,47 @@
     "messageSupport": "Связаться с поддержкой",
     "model": "Модель",
     "purchaseCredits": "Купить кредиты",
+    "refreshes": "Обновляется {date}",
     "time": "Время",
     "topUp": {
+      "addMoreCredits": "Добавить больше кредитов",
+      "addMoreCreditsToRun": "Добавить больше кредитов для запуска",
+      "amountToPayLabel": "Сумма к оплате в долларах",
+      "buy": "Купить",
+      "buyCredits": "Перейти к оплате",
       "buyNow": "Купить сейчас",
+      "contactUs": "Свяжитесь с нами",
+      "creditsDescription": "Кредиты используются для запуска рабочих процессов или партнерских узлов.",
+      "creditsPerDollar": "кредитов за доллар",
+      "creditsToReceiveLabel": "Кредиты к получению",
+      "howManyCredits": "Сколько кредитов вы хотите добавить?",
       "insufficientMessage": "У вас недостаточно кредитов для запуска этого рабочего процесса.",
       "insufficientTitle": "Недостаточно кредитов",
+      "insufficientWorkflowMessage": "У вас недостаточно кредитов для запуска этого рабочего процесса.",
+      "maxAllowed": "Максимум {credits} кредитов.",
       "maxAmount": "(Макс. $1,000 USD)",
+      "maximumAmount": "Максимум ${amount}.",
+      "minRequired": "Минимум {credits} кредитов",
+      "minimumPurchase": "Минимум ${amount} ({credits} кредитов)",
+      "needMore": "Нужно больше?",
+      "purchaseError": "Покупка не удалась",
+      "purchaseErrorDetail": "Не удалось купить кредиты: {error}",
+      "purchaseSuccess": "Кредиты успешно добавлены!",
       "quickPurchase": "Быстрая покупка",
       "seeDetails": "Смотреть детали",
-      "topUp": "Пополнить"
+      "selectAmount": "Выберите сумму",
+      "templateNote": "*Сгенерировано с помощью шаблона Wan Fun Control",
+      "topUp": "Пополнить",
+      "unknownError": "Произошла неизвестная ошибка",
+      "usdAmount": "${amount}",
+      "videosEstimate": "~{count} видео",
+      "viewPricing": "Посмотреть детали цен",
+      "youGet": "Кредиты",
+      "youPay": "Сумма (USD)"
+    },
+    "unified": {
+      "message": "Кредиты были объединены",
+      "tooltip": "Мы объединили платежи в Comfy. Теперь всё работает на Comfy Credits:\n- Партнерские узлы (ранее API-узлы)\n- Облачные рабочие процессы\n\nВаш существующий баланс партнерских узлов был преобразован в кредиты."
     },
     "yourCreditBalance": "Ваш баланс кредитов"
   },
@@ -408,13 +656,26 @@
     "AUDIO_ENCODER_OUTPUT": "ВЫХОД_АУДИО_КОДЕРА",
     "AUDIO_RECORD": "АУДИО_ЗАПИСЬ",
     "BOOLEAN": "БУЛЕВО",
+    "BOUNDING_BOX": "BOUNDING_BOX",
     "CAMERA_CONTROL": "УПРАВЛЕНИЕ_КАМЕРОЙ",
     "CLIP": "CLIP",
     "CLIP_VISION": "CLIP_VISION",
     "CLIP_VISION_OUTPUT": "CLIP_VISION_OUTPUT",
+    "COLOR": "ЦВЕТ",
     "COMBO": "КОМБО",
+    "COMFY_AUTOGROW_V3": "COMFY_AUTOGROW_V3",
+    "COMFY_DYNAMICCOMBO_V3": "COMFY_DYNAMICCOMBO_V3",
+    "COMFY_MATCHTYPE_V3": "COMFY_MATCHTYPE_V3",
     "CONDITIONING": "КОНДИЦИОНИРОВАНИЕ",
     "CONTROL_NET": "CONTROL_NET",
+    "ELEVENLABS_VOICE": "ELEVENLABS_VOICE",
+    "FILE_3D": "FILE_3D",
+    "FILE_3D_FBX": "FILE_3D_FBX",
+    "FILE_3D_GLB": "FILE_3D_GLB",
+    "FILE_3D_GLTF": "FILE_3D_GLTF",
+    "FILE_3D_OBJ": "FILE_3D_OBJ",
+    "FILE_3D_STL": "FILE_3D_STL",
+    "FILE_3D_USDZ": "FILE_3D_USDZ",
     "FLOAT": "ПЛАВАЮЩИЙ",
     "FLOATS": "ПЛАВАЮЩИЕ",
     "GEMINI_INPUT_FILES": "ВХОДНЫЕ_ФАЙЛЫ_GEMINI",
@@ -423,9 +684,11 @@
     "HOOKS": "ХУКИ",
     "HOOK_KEYFRAMES": "КЛЮЧЕВЫЕ_КАДРЫ_ХУКА",
     "IMAGE": "ИЗОБРАЖЕНИЕ",
+    "IMAGECOMPARE": "СРАВНЕНИЕ_ИЗОБРАЖЕНИЙ",
     "INT": "ЦЕЛОЕ",
     "LATENT": "ЛАТЕНТНЫЙ",
     "LATENT_OPERATION": "ЛАТЕНТНАЯ_ОПЕРАЦИЯ",
+    "LATENT_UPSCALE_MODEL": "LATENT_UPSCALE_MODEL",
     "LOAD3D_CAMERA": "ЗАГРУЗИТЬ3D_КАМЕРУ",
     "LOAD_3D": "ЗАГРУЗИТЬ_3D",
     "LORA_MODEL": "МОДЕЛЬ_LORA",
@@ -434,6 +697,8 @@
     "LUMA_REF": "LUMA_REF",
     "MASK": "МАСКА",
     "MESH": "СЕТКА",
+    "MESHY_RIGGED_TASK_ID": "MESHY_RIGGED_TASK_ID",
+    "MESHY_TASK_ID": "MESHY_TASK_ID",
     "MODEL": "МОДЕЛЬ",
     "MODEL_PATCH": "ПАТЧ_МОДЕЛИ",
     "MODEL_TASK_ID": "ID_ЗАДАЧИ_МОДЕЛИ",
@@ -442,6 +707,7 @@
     "OPENAI_INPUT_FILES": "ВХОДНЫЕ_ФАЙЛЫ_OPENAI",
     "PHOTOMAKER": "PHOTOMAKER",
     "PIXVERSE_TEMPLATE": "ШАБЛОН_PIXVERSE",
+    "POSE_KEYPOINT": "POSE_KEYPOINT",
     "RECRAFT_COLOR": "RECRAFT_ЦВЕТ",
     "RECRAFT_CONTROLS": "RECRAFT_УПРАВЛЕНИЯ",
     "RECRAFT_V3_STYLE": "RECRAFT_V3_СТИЛЬ",
@@ -453,6 +719,7 @@
     "STYLE_MODEL": "МОДЕЛЬ_СТИЛЯ",
     "SVG": "SVG",
     "TIMESTEPS_RANGE": "ДИАПАЗОН_ВРЕМЕННЫХ_ШАГОВ",
+    "TRACKS": "TRACKS",
     "UPSCALE_MODEL": "МОДЕЛЬ_АПСКЕЙЛА",
     "VAE": "VAE",
     "VIDEO": "ВИДЕО",
@@ -511,24 +778,84 @@
     "noStackTrace": "Стек вызовов недоступен",
     "promptExecutionError": "Ошибка выполнения запроса"
   },
+  "errorOverlay": {
+    "errorCount": "{count} ОШИБОК | {count} ОШИБКА | {count} ОШИБКИ",
+    "seeErrors": "Посмотреть ошибки"
+  },
+  "essentials": {
+    "batchImage": "Пакетная обработка изображений",
+    "canny": "Canny",
+    "cannyToImage": "Canny в изображение",
+    "cannyToVideo": "Canny в видео",
+    "cropImage": "Обрезать изображение",
+    "depthToImage": "Глубина в изображение",
+    "depthToVideo": "Глубина в видео",
+    "extractFrame": "Извлечь кадр",
+    "imageCompare": "Сравнение изображений",
+    "imageTo3DModel": "Изображение в 3D-модель",
+    "imageToImage": "Изображение в изображение",
+    "imageToVideo": "Изображение в видео",
+    "inpaintImage": "Инпейтинг изображения",
+    "invert": "Инвертировать",
+    "lipsync": "Синхронизация губ",
+    "load3DModel": "Загрузить 3D-модель",
+    "loadAudio": "Загрузить аудио",
+    "loadImage": "Загрузить изображение",
+    "loadStyleLora": "Загрузить стиль (LoRA)",
+    "loadVideo": "Загрузить видео",
+    "musicGeneration": "Генерация музыки",
+    "outpaintImage": "Аутпейтинг изображения",
+    "poseToImage": "Поза в изображение",
+    "poseToVideo": "Поза в видео",
+    "removeBackground": "Удалить фон",
+    "resizeImage": "Изменить размер изображения",
+    "rotate": "Повернуть",
+    "save3DModel": "Сохранить 3D-модель",
+    "saveAudio": "Сохранить аудио",
+    "saveImage": "Сохранить изображение",
+    "saveVideo": "Сохранить видео",
+    "text": "Текст",
+    "textGenerationLLM": "Генерация текста (LLM)",
+    "textTo3DModel": "Текст в 3D-модель",
+    "textToImage": "Текст в изображение",
+    "textToVideo": "Текст в видео"
+  },
+  "exportToast": {
+    "allExportsCompleted": "Все экспорты завершены",
+    "downloadExport": "Скачать экспорт",
+    "downloadFailed": "Не удалось скачать «{name}»",
+    "exportCompleted": "ZIP-архив готов к загрузке",
+    "exportError": "Ошибка экспорта",
+    "exportFailed": "{count} экспорт не выполнен | {count} экспорт не выполнен | {count} экспорта не выполнено",
+    "exportFailedSingle": "Не удалось создать ZIP-экспорт",
+    "exportStarted": "Подготовка к загрузке ZIP...",
+    "exportingAssets": "Экспорт ассетов",
+    "noExportsInQueue": "Нет {filter} экспортов в очереди",
+    "preparingExport": "Подготовка к экспорту...",
+    "retryDownload": "Повторить загрузку"
+  },
   "g": {
     "1x": "1x",
     "2x": "2x",
     "about": "О программе",
     "add": "Добавить",
+    "addNode": "Добавить узел...",
     "addNodeFilterCondition": "Добавить условие фильтрации узла",
     "all": "Все",
     "amount": "Количество",
     "apply": "Применить",
     "architecture": "Архитектура",
+    "asset": "{count} ресурсов | {count} ресурс | {count} ресурса",
     "audioFailedToLoad": "Не удалось загрузить аудио",
     "audioProgress": "Прогресс аудио",
     "author": "Автор",
     "back": "Назад",
+    "batchRename": "Пакетное переименование",
     "beta": "БЕТА",
     "bookmark": "Сохранить в библиотеку",
     "calculatingDimensions": "Расчёт размеров",
     "cancel": "Отмена",
+    "cancelled": "Отменено",
     "capture": "захват",
     "category": "Категория",
     "chart": "Диаграмма",
@@ -538,6 +865,8 @@
     "clearAll": "Очистить всё",
     "clearFilters": "Сбросить фильтры",
     "close": "Закрыть",
+    "closeDialog": "Закрыть диалог",
+    "collapseAll": "Свернуть все",
     "color": "Цвет",
     "comfy": "Comfy",
     "comfyOrgLogoAlt": "Логотип ComfyOrg",
@@ -546,6 +875,7 @@
     "commandProhibited": "Команда {command} запрещена. Свяжитесь с администратором для получения дополнительной информации.",
     "community": "Сообщество",
     "completed": "Завершено",
+    "completedWithCheckmark": "Завершено ✓",
     "confirm": "Подтвердить",
     "confirmed": "Подтверждено",
     "content": "содержимое",
@@ -554,48 +884,73 @@
     "control_before_generate": "управление до генерации",
     "copied": "Скопировано",
     "copy": "Копировать",
+    "copyAll": "Скопировать всё",
     "copyJobId": "Копировать ID задания",
     "copyToClipboard": "Скопировать в буфер обмена",
     "copyURL": "Скопировать URL",
+    "core": "Ядро",
     "currentUser": "Текущий пользователь",
+    "custom": "Пользовательское",
     "customBackground": "Пользовательский фон",
     "customize": "Настроить",
     "customizeFolder": "Настроить папку",
+    "decrement": "Уменьшить",
     "defaultBanner": "баннер по умолчанию",
     "delete": "Удалить",
     "deleteAudioFile": "Удалить аудиофайл",
     "deleteImage": "Удалить изображение",
     "deprecated": "Устарело",
     "description": "Описание",
+    "devOnly": "Только для разработчиков",
     "devices": "Устройства",
     "disableAll": "Отключить все",
+    "disableSelected": "Отключить выбранное",
+    "disableThirdParty": "Отключить сторонние",
     "disabling": "Отключение",
+    "disconnectedFromBackend": "Отключено от сервера. Проверьте, запущен ли сервер.",
     "dismiss": "Закрыть",
     "download": "Скачать",
+    "downloadAudio": "Скачать аудио",
     "downloadImage": "Скачать изображение",
     "downloadVideo": "Скачать видео",
+    "downloadWithSize": "Скачать ({size})",
+    "downloading": "Загрузка",
     "dropYourFileOr": "Перетащите ваш файл или",
     "duplicate": "Дублировать",
     "edit": "Редактировать",
     "editImage": "Редактировать изображение",
     "editOrMaskImage": "Редактировать или маскировать изображение",
+    "emDash": "—",
     "empty": "Пусто",
     "enableAll": "Включить все",
     "enableOrDisablePack": "Включить или отключить пакет",
+    "enableSelected": "Включить выбранное",
     "enabled": "Включено",
     "enabling": "Включение",
+    "enter": "Ввод",
+    "enterBaseName": "Введите базовое имя",
+    "enterNewName": "Введите новое имя",
+    "enterNewNamePrompt": "Введите новое имя:",
+    "enterSubgraph": "Войти в подграф",
     "error": "Ошибка",
     "errorLoadingImage": "Ошибка загрузки изображения",
     "errorLoadingVideo": "Ошибка загрузки видео",
+    "essentials": "Основное",
+    "expandAll": "Развернуть все",
     "experimental": "БЕТА",
     "export": "Экспорт",
     "extensionName": "Название расширения",
+    "extensions": "Расширения",
+    "failed": "Ошибка",
     "failedToCopyJobId": "Не удалось скопировать ID задания",
     "failedToDownloadImage": "Не удалось скачать изображение",
     "failedToDownloadVideo": "Не удалось скачать видео",
+    "favorites": "Избранное",
     "feedback": "Обратная связь",
     "file": "файл",
     "filter": "Фильтр",
+    "filterBy": "Фильтр по:",
+    "filterByType": "Фильтр по {type}...",
     "findIssues": "Найти проблемы",
     "frameNodes": "Фреймовые ноды",
     "frontendNewer": "Версия интерфейса {frontendVersion} может быть несовместима с версией сервера {backendVersion}.",
@@ -605,23 +960,32 @@
     "goToNode": "Перейти к ноде",
     "graphNavigation": "Навигация по графу",
     "halfSpeed": "0.5x",
+    "hideLeftPanel": "Скрыть левую панель",
+    "hideRightPanel": "Скрыть правую панель",
     "icon": "Иконка",
+    "imageDoesNotExist": "Изображение не существует",
     "imageFailedToLoad": "Не удалось загрузить изображение",
     "imagePreview": "Предварительный просмотр изображения - Используйте клавиши со стрелками для навигации между изображениями",
     "imageUrl": "URL изображения",
     "import": "Импорт",
     "inProgress": "В процессе",
+    "inSubgraph": "в подграфе «{name}»",
+    "increment": "Увеличить",
     "info": "Информация о ноде",
+    "input": "Вход",
     "insert": "Вставить",
     "install": "Установить",
     "installed": "Установлено",
     "installing": "Установка",
     "interrupted": "Прервано",
     "itemSelected": "Выбран {selectedCount} элемент",
+    "itemsCopiedToClipboard": "Элементы скопированы в буфер обмена",
     "itemsSelected": "Выбрано {selectedCount} элементов",
+    "job": "Задача",
     "jobIdCopied": "ID задания скопирован в буфер обмена",
     "keybinding": "Привязка клавиш",
     "keybindingAlreadyExists": "Горячая клавиша уже существует",
+    "keybindings": "Горячие клавиши",
     "learnMore": "Узнать больше",
     "listening": "Слушаем...",
     "liveSamplingPreview": "Предпросмотр сэмплирования в реальном времени",
@@ -632,18 +996,24 @@
     "login": "Вход",
     "logoAlt": "Логотип ComfyUI",
     "logs": "Логи",
+    "manageExtensions": "Управление расширениями",
     "markdown": "markdown",
     "micPermissionDenied": "Доступ к микрофону запрещён",
     "migrate": "Мигрировать",
     "missing": "Отсутствует",
+    "more": "Больше",
     "moreOptions": "Больше опций",
     "moreWorkflows": "Больше рабочих процессов",
+    "mostRelevant": "Наиболее релевантные",
     "multiSelectDropdown": "Выпадающий список множественного выбора",
     "name": "Имя",
     "newFolder": "Новая папка",
     "next": "Далее",
+    "nightly": "NIGHTLY",
     "no": "Нет",
     "noAudioRecorded": "Аудио не записано",
+    "noItems": "Нет элементов",
+    "noResults": "Нет результатов",
     "noResultsFound": "Результатов не найдено",
     "noTasksFound": "Задачи не найдены",
     "noTasksFoundMessage": "В очереди нет задач.",
@@ -654,26 +1024,49 @@
     "nodeSlotsError": "Ошибка слотов ноды",
     "nodeWidgetsError": "Ошибка виджетов ноды",
     "nodes": "Узлы",
+    "nodesCount": "{count} узлов | {count} узел | {count} узла",
     "nodesRunning": "запущено узлов",
     "none": "Нет",
+    "nothingToCopy": "Нечего копировать",
+    "nothingToDelete": "Нечего удалять",
+    "nothingToDuplicate": "Нечего дублировать",
+    "nothingToRename": "Нечего переименовывать",
     "ok": "ОК",
     "openManager": "Открыть менеджер",
     "openNewIssue": "Открыть новую проблему",
+    "or": "или",
+    "output": "Выход",
     "overwrite": "Перезаписать",
+    "partner": "Партнёр",
+    "playPause": "Воспроизвести/Пауза",
     "playRecording": "Воспроизвести запись",
     "playbackSpeed": "Скорость воспроизведения",
     "playing": "Воспроизводится",
     "pressKeysForNewBinding": "Нажмите клавиши для новой привязки",
     "preview": "ПРЕДПРОСМОТР",
+    "profile": "Профиль",
     "progressCountOf": "из",
+    "queued": "В очереди",
     "ready": "Готов",
+    "recents": "Недавние",
     "reconnected": "Переподключено",
     "reconnecting": "Переподключение",
     "refresh": "Обновить",
     "refreshNode": "Обновить ноду",
+    "relativeTime": {
+      "daysAgo": "{count} дн. назад",
+      "hoursAgo": "{count} ч назад",
+      "minutesAgo": "{count} мин назад",
+      "monthsAgo": "{count} мес. назад",
+      "now": "сейчас",
+      "weeksAgo": "{count} нед. назад",
+      "yearsAgo": "{count} г. назад"
+    },
     "releaseTitle": "Релиз {package} {version}",
     "reloadToApplyChanges": "Перезагрузите, чтобы применить изменения",
+    "remove": "Удалить",
     "removeImage": "Удалить изображение",
+    "removeTag": "Удалить тег",
     "removeVideo": "Удалить видео",
     "rename": "Переименовать",
     "reportIssue": "Отправить отчёт",
@@ -688,21 +1081,32 @@
     "resizeFromTopRight": "Изменять размер из правого верхнего угла",
     "restart": "Перезапустить",
     "resultsCount": "Найдено {count} результатов",
+    "running": "Выполняется",
     "save": "Сохранить",
     "saving": "Сохранение",
+    "scrollLeft": "Прокрутить влево",
+    "scrollRight": "Прокрутить вправо",
     "search": "Поиск",
     "searchExtensions": "Поиск расширений",
     "searchFailedMessage": "Мы не смогли найти настройки, соответствующие вашему запросу. Попробуйте изменить поисковые термины.",
     "searchKeybindings": "Поиск сочетаний клавиш",
     "searchModels": "Поиск моделей",
     "searchNodes": "Поиск нод",
+    "searchPlaceholder": "Поиск...",
     "searchSettings": "Поиск настроек",
     "searchWorkflows": "Поиск рабочих процессов",
     "seeTutorial": "Посмотреть руководство",
+    "selectItemsToCopy": "Выберите элементы для копирования",
+    "selectItemsToDelete": "Выберите элементы для удаления",
+    "selectItemsToDuplicate": "Выберите элементы для дублирования",
+    "selectItemsToRename": "Выберите элементы для переименования",
     "selectedFile": "Выбранный файл",
     "setAsBackground": "Установить как фон",
     "settings": "Настройки",
+    "shortcutSuffix": " ({shortcut})",
+    "showLeftPanel": "Показать левую панель",
     "showReport": "Показать отчёт",
+    "showRightPanel": "Показать правую панель",
     "singleSelectDropdown": "Выпадающий список единичного выбора",
     "sort": "Сортировать",
     "source": "Источник",
@@ -710,19 +1114,24 @@
     "status": "Статус",
     "stopPlayback": "Остановить воспроизведение",
     "stopRecording": "Остановить запись",
+    "submit": "Отправить",
     "success": "Успех",
     "systemInfo": "Информация о системе",
     "terminal": "Терминал",
     "title": "Заголовок",
     "triggerPhrase": "Триггерная фраза",
     "unknownError": "Неизвестная ошибка",
+    "unknownFile": "Неизвестный файл",
+    "untitled": "Без названия",
     "update": "Обновить",
     "updateAvailable": "Доступно обновление",
     "updateFrontend": "Обновить интерфейс",
     "updated": "Обновлено",
     "updating": "Обновление",
     "upload": "Загрузить",
+    "uploadAlreadyInProgress": "Загрузка уже выполняется",
     "usageHint": "Подсказка по использованию",
+    "use": "Использовать",
     "user": "Пользователь",
     "versionMismatchWarning": "Предупреждение о несовместимости версий",
     "versionMismatchWarningMessage": "{warning}: {detail} Посетите https://docs.comfy.org/installation/update_comfyui#common-update-issues для инструкций по обновлению.",
@@ -730,11 +1139,10 @@
     "videoPreview": "Предварительный просмотр видео - Используйте клавиши со стрелками для навигации между видео",
     "viewImageOfTotal": "Просмотр изображения {index} из {total}",
     "viewVideoOfTotal": "Просмотр видео {index} из {total}",
-    "vitePreloadErrorMessage": "Вышла новая версия приложения. Хотите перезагрузить?\nЕсли нет, некоторые части приложения могут работать некорректно.\nВы можете отказаться и сохранить свой прогресс перед перезагрузкой.",
-    "vitePreloadErrorTitle": "Доступна новая версия",
     "volume": "Громкость",
     "warning": "Предупреждение",
-    "workflow": "Рабочий процесс"
+    "workflow": "Рабочий процесс",
+    "you": "Вы"
   },
   "graphCanvasMenu": {
     "fitView": "Подгонять под выделенные",
@@ -756,11 +1164,17 @@
     "create": "Создать ноду группы",
     "enterName": "Введите название"
   },
+  "help": {
+    "helpCenterMenu": "Меню справочного центра",
+    "recentReleases": "Недавние релизы"
+  },
   "helpCenter": {
     "clickToLearnMore": "Нажмите, чтобы узнать больше →",
     "desktopUserGuide": "Руководство пользователя для Desktop",
     "docs": "Документация",
+    "feedback": "Оставить отзыв",
     "github": "Github",
+    "help": "Помощь и поддержка",
     "loadingReleases": "Загрузка релизов...",
     "managerExtension": "Расширение менеджера",
     "more": "Ещё...",
@@ -769,6 +1183,12 @@
     "recentReleases": "Последние релизы",
     "reinstall": "Переустановить",
     "updateAvailable": "Обновить",
+    "updateComfyUI": "Обновить ComfyUI",
+    "updateComfyUIFailed": "Не удалось обновить ComfyUI. Пожалуйста, попробуйте снова.",
+    "updateComfyUIStarted": "Обновление начато",
+    "updateComfyUIStartedDetail": "Обновление ComfyUI поставлено в очередь. Пожалуйста, подождите...",
+    "updateComfyUISuccess": "Обновление завершено",
+    "updateComfyUISuccessDetail": "ComfyUI обновлён. Перезагрузка...",
     "whatsNew": "Что нового?"
   },
   "icon": {
@@ -782,6 +1202,24 @@
     "inbox": "Входящие",
     "star": "Звезда"
   },
+  "imageCompare": {
+    "batchLabelA": "A:",
+    "batchLabelB": "B:",
+    "noImages": "Нет изображений для сравнения"
+  },
+  "imageCrop": {
+    "cropPreviewAlt": "Предпросмотр обрезки",
+    "custom": "Пользовательское",
+    "loading": "Загрузка...",
+    "lockRatio": "Зафиксировать соотношение сторон",
+    "noInputImage": "Входное изображение не подключено",
+    "ratio": "Соотношение",
+    "unlockRatio": "Снять фиксацию соотношения сторон"
+  },
+  "importFailed": {
+    "copyError": "Ошибка копирования",
+    "title": "Ошибка импорта"
+  },
   "install": {
     "appDataLocationTooltip": "Директория данных приложения ComfyUI. Хранит:\n- Логи\n- Конфигурации сервера",
     "appPathLocationTooltip": "Директория активов приложения ComfyUI. Хранит код и активы ComfyUI",
@@ -795,6 +1233,8 @@
     "failedToSelectDirectory": "Не удалось выбрать директорию",
     "gpu": "GPU",
     "gpuPicker": {
+      "amdDescription": "Используйте вашу видеокарту AMD с ускорением ROCm™ для наилучшей производительности.",
+      "amdSubtitle": "AMD ROCm™",
       "appleMetalDescription": "Использует GPU вашего Mac для более высокой скорости и улучшенного общего опыта",
       "cpuDescription": "Используйте режим CPU для совместимости, когда ускорение GPU недоступно",
       "cpuSubtitle": "Режим CPU",
@@ -821,6 +1261,8 @@
       "selectGpuDescription": "Выберите тип GPU, который у вас есть"
     },
     "helpImprove": "Пожалуйста, помогите улучшить ComfyUI",
+    "insideAppInstallDir": "Эта папка находится внутри пакета приложения ComfyUI Desktop и будет удалена при обновлении. Выберите каталог вне папки установки, например, Документы/ComfyUI.",
+    "insideUpdaterCache": "Эта папка находится в кэше обновлений ComfyUI, который очищается при каждом обновлении. Выберите другое место для ваших данных.",
     "installLocation": "Место установки",
     "installLocationDescription": "Выберите директорию для пользовательских данных ComfyUI. В выбранном месте будет установлена среда Python. Пожалуйста, убедитесь, что на выбранном диске достаточно места (~15 ГБ).",
     "installLocationTooltip": "Директория пользовательских данных ComfyUI. Хранит:\n- Среда Python\n- Модели\n- Пользовательские ноды\n",
@@ -895,6 +1337,66 @@
   "issueReport": {
     "helpFix": "Помочь исправить это"
   },
+  "linearMode": {
+    "appModeToolbar": {
+      "appBuilder": "Конструктор приложений",
+      "apps": "Приложения",
+      "appsEmptyMessage": "Сохранённые приложения появятся здесь.\nНажмите ниже, чтобы создать своё первое приложение.",
+      "enterAppMode": "Войти в режим приложения"
+    },
+    "arrange": {
+      "atLeastOne": "хотя бы один",
+      "connectAtLeastOne": "Подключите {atLeastOne} выходной узел, чтобы пользователи могли видеть результаты после запуска.",
+      "noOutputs": "Выходы ещё не добавлены",
+      "outputExamples": "Примеры: «Сохранить изображение» или «Сохранить видео»",
+      "outputs": "Выходы",
+      "resultsLabel": "Результаты, сгенерированные выбранным(и) выходным(и) узлом(ами), будут показаны здесь после запуска приложения",
+      "switchToOutputs": "Перейдите к шагу «Вывод» и выберите выходные узлы, чтобы добавить их сюда.",
+      "switchToOutputsButton": "Перейти к выводам"
+    },
+    "backToWorkflow": "Вернуться к рабочему процессу",
+    "beta": "Режим приложения Бета - Оставить отзыв",
+    "builder": {
+      "exit": "Выйти из конструктора",
+      "exitConfirmMessage": "У вас есть несохранённые изменения, которые будут потеряны\nВыйти без сохранения?",
+      "exitConfirmTitle": "Выйти из конструктора приложений?",
+      "inputsDesc": "Пользователи будут взаимодействовать с этими параметрами и настраивать их для генерации результата.",
+      "inputsExample": "Примеры: «Загрузить изображение», «Текстовый промпт», «Шаги»",
+      "noInputs": "Входные данные ещё не добавлены",
+      "noOutputs": "Выходные узлы ещё не добавлены",
+      "outputsDesc": "Подключите хотя бы один выходной узел, чтобы пользователи видели результаты после запуска.",
+      "outputsExample": "Примеры: «Сохранить изображение» или «Сохранить видео»",
+      "promptAddInputs": "Нажмите на параметры узла, чтобы добавить их сюда как входные данные",
+      "promptAddOutputs": "Нажмите на выходные узлы, чтобы добавить их сюда. Это будут сгенерированные результаты.",
+      "title": "Режим конструктора приложений",
+      "unknownWidget": "Виджет не отображается"
+    },
+    "downloadAll": "Скачать всё",
+    "dragAndDropImage": "Перетащите изображение",
+    "emptyWorkflowExplanation": "Ваш рабочий процесс пуст. Сначала добавьте несколько узлов, чтобы начать создавать приложение.",
+    "enterNodeGraph": "Войти в граф узлов",
+    "giveFeedback": "Оставить отзыв",
+    "graphMode": "Графовый режим",
+    "linearMode": "Режим приложения",
+    "loadTemplate": "Загрузить шаблон",
+    "mobileControls": "Редактировать и запустить",
+    "queue": {
+      "clear": "Очистить очередь",
+      "clickToClear": "Нажмите, чтобы очистить очередь"
+    },
+    "rerun": "Перезапустить",
+    "reuseParameters": "Повторно использовать параметры",
+    "runCount": "Количество запусков:",
+    "viewJob": "Просмотреть задачу",
+    "welcome": {
+      "buildApp": "Создать приложение",
+      "controls": "Ваши результаты отображаются внизу, элементы управления — справа. Всё остальное не мешает.",
+      "getStarted": "Нажмите {runButton}, чтобы начать.",
+      "message": "Упрощённый вид, скрывающий граф узлов, чтобы вы могли сосредоточиться на создании.",
+      "sharing": "Делиться просто: создайте рабочий процесс, откройте режим приложения, кликните правой кнопкой по вкладке и экспортируйте. Когда другие откроют ваш файл, он сразу запустится в этом чистом виде. Вы можете делиться мощными рабочими процессами как простыми инструментами, без необходимости разбираться в графах узлов.",
+      "title": "Добро пожаловать в режим приложения"
+    }
+  },
   "load3d": {
     "applyingTexture": "Применение текстуры...",
     "backgroundColor": "Цвет фона",
@@ -921,20 +1423,24 @@
       "lineart": "Линейный арт",
       "normal": "Нормальный",
       "original": "Оригинал",
+      "pointCloud": "Облако точек",
       "wireframe": "Каркас"
     },
     "model": "Модель",
     "openIn3DViewer": "Открыть в 3D просмотрщике",
+    "panoramaMode": "Панорама",
     "previewOutput": "Предварительный просмотр",
     "reloadingModel": "Перезагрузка модели...",
     "removeBackgroundImage": "Удалить фоновое изображение",
     "resizeNodeMatchOutput": "Изменить размер узла под вывод",
     "scene": "Сцена",
     "showGrid": "Показать сетку",
+    "showSkeleton": "Показать скелет",
     "startRecording": "Начать запись",
     "stopRecording": "Остановить запись",
     "switchCamera": "Переключить камеру",
     "switchingMaterialMode": "Переключение режима материала...",
+    "tiledMode": "Плиточный",
     "unsupportedFileType": "Неподдерживаемый тип файла (поддерживаются .gltf, .glb, .obj, .fbx, .stl)",
     "upDirection": "Направление Вверх",
     "upDirections": {
@@ -955,6 +1461,11 @@
       "title": "3D Просмотрщик (Бета)"
     }
   },
+  "loadWorkflowWarning": {
+    "coreNodesFromVersion": "Базовые узлы из версии {version}:",
+    "outdatedVersion": "Этот рабочий процесс был создан в более новой версии ComfyUI ({version}). Некоторые узлы могут работать некорректно.",
+    "outdatedVersionGeneric": "Этот рабочий процесс был создан в более новой версии ComfyUI. Некоторые узлы могут работать некорректно."
+  },
   "maintenance": {
     "None": "Нет",
     "OK": "OK",
@@ -973,11 +1484,21 @@
     "showManual": "Показать задачи по обслуживанию",
     "status": "Статус",
     "terminalDefaultMessage": "Когда вы запускаете команду для устранения неполадок, любой вывод будет отображаться здесь.",
-    "title": "Обслуживание"
+    "title": "Обслуживание",
+    "unsafeMigration": {
+      "action": "Используйте задачу обслуживания «Базовый путь» ниже, чтобы переместить ComfyUI в безопасное место.",
+      "appInstallDir": "Ваш базовый путь находится внутри пакета приложения ComfyUI Desktop. Эта папка может быть удалена или перезаписана при обновлениях. Выберите каталог вне папки установки, например, Документы/ComfyUI.",
+      "generic": "Ваш текущий базовый путь ComfyUI находится в месте, которое может быть удалено или изменено при обновлениях. Чтобы избежать потери данных, переместите его в безопасную папку.",
+      "oneDrive": "Ваш базовый путь находится на OneDrive, что может привести к проблемам синхронизации и случайной потере данных. Выберите локальную папку, не управляемую OneDrive.",
+      "title": "Обнаружено небезопасное место установки",
+      "updaterCache": "Ваш базовый путь находится в кэше обновлений ComfyUI, который очищается при каждом обновлении. Выберите другое место для хранения данных."
+    }
   },
   "manager": {
+    "actions": "Действия",
     "allMissingNodesInstalled": "Все отсутствующие ноды успешно установлены",
     "applyChanges": "Применить изменения",
+    "basicInfo": "Основная информация",
     "changingVersion": "Изменение версии с {from} на {to}",
     "clickToFinishSetup": "Нажмите",
     "conflicts": {
@@ -1013,6 +1534,28 @@
     "disabledNodesWontUpdate": "Отключенные ноды не будут обновлены",
     "discoverCommunityContent": "Откройте для себя пакеты узлов, расширения и многое другое, созданные сообществом...",
     "downloads": "Загрузки",
+    "emptyState": {
+      "allInstalled": {
+        "message": "Вы еще не установили ни одного расширения.",
+        "title": "Нет установленных расширений"
+      },
+      "conflicting": {
+        "message": "Все ваши расширения совместимы.",
+        "title": "Конфликтов не обнаружено"
+      },
+      "missing": {
+        "message": "Все необходимые узлы установлены.",
+        "title": "Нет отсутствующих узлов"
+      },
+      "updateAvailable": {
+        "message": "Все ваши расширения обновлены.",
+        "title": "Все обновлено"
+      },
+      "workflow": {
+        "message": "В этом рабочем процессе не используются узлы расширений.",
+        "title": "Нет расширений в рабочем процессе"
+      }
+    },
     "enablePackToChangeVersion": "Включите этот пакет для изменения версий",
     "errorConnecting": "Ошибка подключения к реестру Comfy Node.",
     "extensionsSuccessfullyInstalled": "Расширение(я) успешно установлено и готово к использованию!",
@@ -1034,25 +1577,42 @@
     "installingDependencies": "Установка зависимостей...",
     "lastUpdated": "Последнее обновление",
     "latestVersion": "Последняя",
+    "legacyManagerSearchTip": "Ищете ComfyUI-Manager? Вы можете включить устаревший интерфейс менеджера, запустив ComfyUI с флагом --enable-manager-legacy-ui.",
     "legacyManagerUI": "Использовать устаревший UI",
     "legacyManagerUIDescription": "Чтобы использовать устаревший UI менеджера, запустите ComfyUI с --enable-manager-legacy-ui",
     "legacyMenuNotAvailable": "Устаревшее меню менеджера недоступно в этой версии ComfyUI. Пожалуйста, используйте новое меню менеджера.",
     "license": "Лицензия",
     "loadingVersions": "Загрузка версий...",
     "mixedSelectionMessage": "Невозможно выполнить массовое действие для смешанного выбора",
+    "nav": {
+      "allExtensions": "Все расширения",
+      "allInWorkflow": "Все в: {workflowName}",
+      "allInstalled": "Все установленные",
+      "conflicting": "Конфликтующие",
+      "inWorkflowSection": "В РАБОЧЕМ ПРОЦЕССЕ",
+      "installedSection": "УСТАНОВЛЕНО",
+      "missingNodes": "Отсутствующие узлы",
+      "notInstalled": "Не установлено",
+      "updatesAvailable": "Доступны обновления"
+    },
     "nightlyVersion": "Ночная",
     "noDescription": "Описание отсутствует",
     "noNodesFound": "Узлы не найдены",
     "noNodesFoundDescription": "Узлы пакета не могут быть проанализированы, или пакет является только расширением интерфейса и не имеет узлов.",
     "noResultsFound": "По вашему запросу ничего не найдено.",
     "nodePack": "Пакет Узлов",
+    "nodePackInfo": "Информация о пакете узлов",
     "notAvailable": "Недоступно",
+    "packInstall": {
+      "nodeIdRequired": "Для установки требуется идентификатор узла"
+    },
     "packsSelected": "Выбрано пакетов",
     "repository": "Репозиторий",
     "restartToApplyChanges": "Чтобы применить изменения, пожалуйста, перезапустите ComfyUI",
     "restartingBackend": "Перезапуск бэкенда для применения изменений...",
     "searchPlaceholder": "Поиск",
     "selectVersion": "Выберите версию",
+    "selected": "Выбрано",
     "sort": {
       "created": "Новейшие",
       "downloads": "Самые популярные",
@@ -1074,6 +1634,8 @@
     "totalNodes": "Всего Узлов",
     "tryAgainLater": "Пожалуйста, попробуйте позже.",
     "tryDifferentSearch": "Пожалуйста, попробуйте изменить запрос.",
+    "tryUpdate": "Попробовать обновить",
+    "tryUpdateTooltip": "Получить последние изменения из репозитория. В ночных версиях могут быть обновления, которые не определяются автоматически.",
     "uninstall": "Удалить",
     "uninstallSelected": "Удалить выбранное",
     "uninstalling": "Удаление",
@@ -1084,31 +1646,111 @@
     "version": "Версия"
   },
   "maskEditor": {
+    "activateLayer": "Активировать слой",
+    "applyToWholeImage": "Применить ко всему изображению",
+    "baseImageLayer": "Базовый слой изображения",
+    "baseLayerPreview": "Предпросмотр базового слоя",
+    "black": "Чёрный",
+    "brushSettings": "Настройки кисти",
+    "brushShape": "Форма кисти",
+    "clear": "Очистить",
+    "clickToResetZoom": "Кликните, чтобы сбросить масштаб",
+    "colorSelectSettings": "Настройки выбора цвета",
+    "colorSelector": "Выбор цвета",
+    "fillOpacity": "Непрозрачность заливки",
+    "hardness": "Жёсткость",
+    "imageLayer": "Слой изображения",
+    "invert": "Инвертировать",
+    "layers": "Слои",
+    "livePreview": "Живой предпросмотр",
+    "maskBlendingOptions": "Параметры смешивания маски",
+    "maskLayer": "Слой маски",
+    "maskOpacity": "Непрозрачность маски",
+    "maskTolerance": "Допуск маски",
+    "method": "Метод",
+    "mirrorHorizontal": "Отразить по горизонтали",
+    "mirrorVertical": "Отразить по вертикали",
+    "negative": "Негатив",
+    "opacity": "Непрозрачность",
+    "paintBucketSettings": "Настройки заливки",
+    "paintLayer": "Слой рисования",
+    "redo": "Повторить",
+    "resetToDefault": "Сбросить по умолчанию",
+    "rotateLeft": "Повернуть влево",
+    "rotateRight": "Повернуть вправо",
+    "selectionOpacity": "Непрозрачность выделения",
+    "smoothingPrecision": "Точность сглаживания",
+    "stepSize": "Размер шага",
+    "stopAtMask": "Остановить на маске",
+    "thickness": "Толщина",
+    "title": "Редактор масок",
+    "tolerance": "Допуск",
+    "undo": "Отменить",
+    "white": "Белый"
   },
   "mediaAsset": {
+    "actions": {
+      "copyJobId": "Скопировать ID задания",
+      "delete": "Удалить",
+      "download": "Скачать",
+      "exportWorkflow": "Экспортировать рабочий процесс",
+      "insertAsNodeInWorkflow": "Вставить как узел в рабочий процесс",
+      "inspect": "Просмотреть ресурс",
+      "more": "Больше опций",
+      "moreOptions": "Больше опций",
+      "openWorkflow": "Открыть как рабочий процесс в новой вкладке",
+      "seeMoreOutputs": "Показать больше результатов",
+      "zoom": "Увеличить"
+    },
     "assetDeletedSuccessfully": "Ресурс успешно удален",
     "deleteAssetDescription": "Этот ресурс будет удален безвозвратно.",
     "deleteAssetTitle": "Удалить этот ресурс?",
     "deleteSelectedDescription": "{count} ресурс(ов) будет удален безвозвратно.",
     "deleteSelectedTitle": "Удалить выбранные ресурсы?",
     "deletingImportedFilesCloudOnly": "Удаление импортированных файлов поддерживается только в облачной версии",
+    "failedToCreateNode": "Не удалось создать узел",
     "failedToDeleteAsset": "Не удалось удалить ресурс",
+    "failedToExportWorkflow": "Не удалось экспортировать рабочий процесс",
     "jobIdToast": {
       "copied": "Скопировано",
       "error": "Ошибка",
       "jobIdCopied": "ID задания скопирован в буфер обмена",
       "jobIdCopyFailed": "Не удалось скопировать ID задания"
     },
+    "noJobIdFound": "ID задания для этого ресурса не найден",
+    "noWorkflowDataFound": "В этом ресурсе не найдено данных рабочего процесса",
+    "nodeAddedToWorkflow": "Узел {nodeType} добавлен в рабочий процесс",
+    "nodeTypeNotFound": "Тип узла {nodeType} не найден",
     "selection": {
       "assetsDeletedSuccessfully": "{count} ресурс(ов) успешно удалено",
       "deleteSelected": "Удалить",
+      "deleteSelectedAll": "Удалить все",
       "deselectAll": "Снять выделение со всех",
       "downloadSelected": "Скачать",
+      "downloadSelectedAll": "Скачать все",
       "downloadStarted": "Скачивание {count} файлов...",
       "downloadsStarted": "Начато скачивание {count} файла(ов)",
+      "exportStarted": "Подготовка ZIP-экспорта для {count} файла | Подготовка ZIP-экспорта для {count} файлов",
+      "exportWorkflowAll": "Экспортировать все рабочие процессы",
+      "failedToAddNodes": "Не удалось добавить узлы в рабочий процесс",
       "failedToDeleteAssets": "Не удалось удалить выбранные ресурсы",
-      "selectedCount": "Выбрано ресурсов: {count}"
-    }
+      "insertAllAssetsAsNodes": "Вставить все ресурсы как узлы",
+      "multipleSelectedAssets": "Выбрано несколько ресурсов",
+      "noWorkflowsFound": "В выбранных ресурсах не найдено данных рабочих процессов",
+      "noWorkflowsToExport": "Нет данных рабочих процессов для экспорта",
+      "nodesAddedToWorkflow": "{count} узел(ов) добавлено в рабочий процесс",
+      "openWorkflowAll": "Открыть все рабочие процессы",
+      "partialAddNodesSuccess": "{succeeded} успешно добавлено, {failed} не удалось",
+      "partialDeleteSuccess": "{succeeded} успешно удалено, {failed} не удалось удалить",
+      "partialWorkflowsExported": "{succeeded} успешно экспортировано, {failed} не удалось",
+      "partialWorkflowsOpened": "{succeeded} рабочий(их) процесс(ов) открыт(ы), {failed} не удалось",
+      "selectedCount": "Выбрано ресурсов: {count}",
+      "workflowsExported": "{count} рабочий(их) процесс(ов) успешно экспортировано",
+      "workflowsOpened": "{count} рабочий(их) процесс(ов) открыт(ы) в новых вкладках"
+    },
+    "unsupportedFileType": "Неподдерживаемый тип файла для узла загрузки",
+    "workflowExportedSuccessfully": "Рабочий процесс успешно экспортирован",
+    "workflowOpenedInNewTab": "Рабочий процесс открыт в новой вкладке"
   },
   "menu": {
     "autoQueue": "Автоочередь",
@@ -1116,11 +1758,14 @@
     "batchCountTooltip": "Количество раз, когда генерация рабочего процесса должна быть помещена в очередь",
     "clear": "Очистить рабочий процесс",
     "clipspace": "Открыть Clipspace",
+    "customNodesManager": "Менеджер пользовательских узлов",
     "dark": "Тёмная",
     "disabled": "Отключено",
     "disabledTooltip": "Рабочий процесс не будет автоматически помещён в очередь",
     "execute": "Выполнить",
+    "fullscreen": "Полноэкранный режим",
     "help": "Справка",
+    "helpAndFeedback": "Помощь и обратная связь",
     "hideMenu": "Скрыть меню",
     "instant": "Мгновенно",
     "instantTooltip": "Рабочий процесс будет помещён в очередь сразу же после завершения генерации",
@@ -1134,9 +1779,12 @@
     "resetView": "Сбросить вид холста",
     "run": "Запустить",
     "runWorkflow": "Запустить рабочий процесс (Shift для очереди в начале)",
+    "runWorkflowDisabled": "В рабочем процессе есть неподдерживаемые узлы (выделены красным). Удалите их, чтобы запустить рабочий процесс.",
     "runWorkflowFront": "Запустить рабочий процесс (Очередь в начале)",
     "settings": "Настройки",
     "showMenu": "Показать меню",
+    "stopRunInstant": "Остановить выполнение (немедленно)",
+    "stopRunInstantTooltip": "Остановить выполнение",
     "theme": "Тема",
     "toggleBottomPanel": "Переключить нижнюю панель"
   },
@@ -1149,6 +1797,7 @@
     "Canvas Performance": "Производительность холста",
     "Canvas Toggle Lock": "Переключение блокировки холста",
     "Check for Custom Node Updates": "Проверить обновления пользовательских узлов",
+    "Check for Updates": "Проверить обновления",
     "Clear Pending Tasks": "Очистить ожидающие задачи",
     "Clear Workflow": "Очистить рабочий процесс",
     "Clipspace": "Клиппространство",
@@ -1161,16 +1810,19 @@
     "Contact Support": "Связаться с поддержкой",
     "Convert Selection to Subgraph": "Преобразовать выделенное в подграф",
     "Convert selected nodes to group node": "Преобразовать выбранные ноды в групповую ноду",
+    "Copy": "Копировать",
     "Custom Nodes (Legacy)": "Пользовательские узлы (устаревшие)",
     "Custom Nodes Manager": "Менеджер Пользовательских Узлов",
     "Decrease Brush Size in MaskEditor": "Уменьшить размер кисти в MaskEditor",
     "Delete Selected Items": "Удалить выбранные элементы",
+    "Desktop User Guide": "Руководство пользователя для Desktop",
     "Duplicate Current Workflow": "Дублировать текущий рабочий процесс",
     "Edit": "Редактировать",
     "Edit Subgraph Widgets": "Редактировать виджеты подграфа",
     "Exit Subgraph": "Выйти из подграфа",
     "Experimental: Browse Model Assets": "Экспериментально: Просмотр ассетов моделей",
     "Experimental: Enable AssetAPI": "Экспериментально: Включить AssetAPI",
+    "Experimental: Enable Nodes 2_0": "Экспериментально: Включить Nodes 2.0",
     "Export": "Экспортировать",
     "Export (API)": "Экспорт (API)",
     "File": "Файл",
@@ -1182,12 +1834,15 @@
     "Increase Brush Size in MaskEditor": "Увеличить размер кисти в MaskEditor",
     "Install Missing Custom Nodes": "Установить отсутствующие пользовательские узлы",
     "Interrupt": "Прервать",
+    "Job History": "История заданий",
     "Load Default Workflow": "Загрузить стандартный рабочий процесс",
     "Lock Canvas": "Заблокировать холст",
     "Manage group nodes": "Управление групповыми нодами",
     "Manager": "Менеджер",
     "Manager Menu (Legacy)": "Меню управления (устаревшее)",
     "Minimap": "Мини-карта",
+    "Mirror Horizontal in MaskEditor": "Отразить по горизонтали в MaskEditor",
+    "Mirror Vertical in MaskEditor": "Отразить по вертикали в MaskEditor",
     "Model Library": "Библиотека моделей",
     "Move Selected Nodes Down": "Переместить выбранные узлы вниз",
     "Move Selected Nodes Left": "Переместить выбранные узлы влево",
@@ -1199,9 +1854,18 @@
     "Node Library": "Библиотека узлов",
     "Node Links": "Связи узлов",
     "Open": "Открыть",
-    "Open 3D Viewer (Beta) for Selected Node": "Открыть 3D просмотрщик (Бета) для выбранного узла",
+    "Open 3D Viewer (Beta) for Selected Node": "Открыть 3D-просмотрщик (бета) для выбранного узла",
+    "Open Color Picker in MaskEditor": "Открыть палитру цветов в MaskEditor",
+    "Open Custom Nodes Folder": "Открыть папку пользовательских узлов",
+    "Open DevTools": "Открыть инструменты разработчика",
+    "Open Inputs Folder": "Открыть папку входных данных",
+    "Open Logs Folder": "Открыть папку журналов",
     "Open Mask Editor for Selected Node": "Открыть редактор масок для выбранного узла",
+    "Open Models Folder": "Открыть папку моделей",
+    "Open Outputs Folder": "Открыть папку выходных данных",
     "Open Sign In Dialog": "Открыть окно входа",
+    "Open extra_model_paths_yaml": "Открыть extra_model_paths.yaml",
+    "Paste": "Вставить",
     "Pin/Unpin Selected Items": "Закрепить/открепить выбранные элементы",
     "Pin/Unpin Selected Nodes": "Закрепить/открепить выбранные ноды",
     "Previous Opened Workflow": "Предыдущий открытый рабочий процесс",
@@ -1209,24 +1873,34 @@
     "Queue Prompt": "Запрос в очереди",
     "Queue Prompt (Front)": "Запрос в очереди (спереди)",
     "Queue Selected Output Nodes": "Добавить выбранные выходные узлы в очередь",
+    "Quit": "Выйти",
     "Redo": "Повторить",
     "Refresh Node Definitions": "Обновить определения нод",
+    "Reinstall": "Переустановить",
+    "Rename": "Переименовать",
     "Reset View": "Сбросить вид",
     "Resize Selected Nodes": "Изменить размер выбранных узлов",
+    "Restart": "Перезапустить",
+    "Rotate Left in MaskEditor": "Повернуть влево в MaskEditor",
+    "Rotate Right in MaskEditor": "Повернуть вправо в MaskEditor",
     "Save": "Сохранить",
     "Save As": "Сохранить как",
+    "Select All": "Выделить всё",
+    "Set Subgraph Description": "Установить описание подграфа",
+    "Set Subgraph Search Aliases": "Установить псевдонимы поиска подграфа",
     "Show Keybindings Dialog": "Показать диалог клавиш быстрого доступа",
     "Show Model Selector (Dev)": "Показать выбор модели (Dev)",
     "Show Settings Dialog": "Показать диалог настроек",
     "Sign Out": "Выйти",
+    "Toggle App Mode": "Переключить режим приложения",
     "Toggle Essential Bottom Panel": "Показать/скрыть нижнюю панель основных элементов",
     "Toggle Logs Bottom Panel": "Показать/скрыть нижнюю панель логов",
+    "Toggle Queue Panel V2": "Переключить панель очереди V2",
     "Toggle Search Box": "Переключить поисковую панель",
     "Toggle Terminal Bottom Panel": "Показать/скрыть нижнюю панель терминала",
     "Toggle Theme (Dark/Light)": "Переключение темы (Тёмная/Светлая)",
     "Toggle View Controls Bottom Panel": "Показать/скрыть нижнюю панель элементов управления",
     "Toggle promotion of hovered widget": "Переключить повышение выделенного виджета",
-    "Toggle the Custom Nodes Manager Progress Bar": "Переключить индикатор выполнения менеджера пользовательских узлов",
     "Undo": "Отменить",
     "Ungroup selected group nodes": "Разгруппировать выбранные групповые ноды",
     "Unload Models": "Выгрузить модели",
@@ -1237,7 +1911,8 @@
     "Workflows": "Рабочие процессы",
     "Zoom In": "Увеличить",
     "Zoom Out": "Уменьшить",
-    "Zoom to fit": "Масштабировать по размеру"
+    "Zoom to fit": "Масштабировать по размеру",
+    "linearMode_appModeToolbar_apps": "linearMode.appModeToolbar.apps"
   },
   "minimap": {
     "nodeColors": "Цвета узлов",
@@ -1247,20 +1922,66 @@
     "showLinks": "Показать связи"
   },
   "missingModelsDialog": {
+    "acceptTerms": "Принять условия",
+    "customModelsInstruction": "Вам нужно найти и скачать их вручную. Поискать их можно в интернете (например, на Civitai или Hugging Face) или связаться с автором рабочего процесса.",
+    "customModelsWarning": "Некоторые из них — это пользовательские модели, которые нам не известны.",
+    "description": "Для этого рабочего процесса требуются модели, которые вы ещё не скачали.",
     "doNotAskAgain": "Больше не показывать это",
-    "missingModels": "Отсутствующие модели",
-    "missingModelsMessage": "При загрузке графа следующие модели не были найдены"
+    "downloadAll": "Скачать всё",
+    "downloadAvailable": "Доступно для загрузки",
+    "footerDescription": "Скачайте и поместите эти модели в нужную папку.\nУзлы с отсутствующими моделями выделены красным на холсте.",
+    "gotIt": "Понятно",
+    "reEnableInSettings": "Включить снова в {link}",
+    "reEnableInSettingsLink": "Настройки",
+    "title": "В этом рабочем процессе отсутствуют модели",
+    "totalSize": "Общий размер загрузки:"
+  },
+  "missingNodes": {
+    "cloud": {
+      "description": "В этом рабочем процессе используются пользовательские узлы, которые пока не поддерживаются в облачной версии.",
+      "gotIt": "Понятно",
+      "learnMore": "Подробнее",
+      "priorityMessage": "Мы автоматически отметили эти узлы, чтобы ускорить их добавление.",
+      "replacementInstruction": "Пока что замените эти узлы (выделены красным на холсте) на поддерживаемые, если возможно, или попробуйте другой рабочий процесс.",
+      "title": "Эти узлы пока недоступны в Comfy Cloud"
+    },
+    "oss": {
+      "description": "В этом рабочем процессе используются пользовательские узлы, которые вы ещё не установили.",
+      "replacementInstruction": "Установите эти узлы для запуска рабочего процесса или замените их на уже установленные аналоги. Отсутствующие узлы выделены красным на холсте.",
+      "title": "В этом рабочем процессе отсутствуют узлы"
+    }
+  },
+  "nightly": {
+    "badge": {
+      "label": "Предварительная версия",
+      "tooltip": "Вы используете ночную версию ComfyUI. Пожалуйста, используйте кнопку обратной связи, чтобы поделиться своим мнением об этих функциях."
+    }
+  },
+  "nightlySurvey": {
+    "accept": "Конечно, помогу!",
+    "description": "Вы использовали эту функцию. Не могли бы вы уделить минуту, чтобы поделиться своим мнением?",
+    "dontAskAgain": "Больше не спрашивать",
+    "loadError": "Не удалось загрузить опрос. Пожалуйста, попробуйте позже.",
+    "notNow": "Не сейчас",
+    "title": "Помогите нам стать лучше"
   },
   "nodeCategories": {
+    "": "",
     "3d": "3d",
     "3d_models": "3d_модели",
     "BFL": "BFL",
+    "Bria": "Bria",
     "ByteDance": "ByteDance",
+    "ElevenLabs": "ElevenLabs",
     "Gemini": "Gemini",
+    "Grok": "Grok",
+    "HitPaw": "HitPaw",
     "Ideogram": "Ideogram",
     "Kling": "Kling",
     "LTXV": "LTXV",
     "Luma": "Luma",
+    "Magnific": "Magnific",
+    "Meshy": "Meshy",
     "MiniMax": "MiniMax",
     "Moonvalley Marey": "Moonvalley Marey",
     "OpenAI": "OpenAI",
@@ -1270,10 +1991,13 @@
     "Runway": "Runway",
     "Sora": "Sora",
     "Stability AI": "Stability AI",
+    "Tencent": "Tencent",
+    "Topaz": "Topaz",
     "Tripo": "Tripo",
     "Veo": "Veo",
     "Vidu": "Vidu",
     "Wan": "Wan",
+    "WaveSpeed": "WaveSpeed",
     "_for_testing": "_для_тестирования",
     "advanced": "расширенный",
     "animation": "анимация",
@@ -1294,6 +2018,7 @@
     "controlnet": "controlnet",
     "create": "создать",
     "custom_sampling": "пользовательский_семплинг",
+    "dataset": "dataset",
     "debug": "отладка",
     "deprecated": "устаревший",
     "edit_models": "редактировать_модели",
@@ -1305,8 +2030,10 @@
     "image": "изображение",
     "inpaint": "восстановление",
     "instructpix2pix": "instructpix2pix",
+    "kandinsky5": "kandinsky5",
     "latent": "латентный",
     "loaders": "загрузчики",
+    "logic": "логика",
     "lotus": "lotus",
     "ltxv": "ltxv",
     "mask": "маска",
@@ -1328,11 +2055,13 @@
     "scheduling": "scheduling",
     "sd": "sd",
     "sd3": "sd3",
+    "shader": "шейдер",
     "sigmas": "сигмы",
     "stable_cascade": "стабильная_каскадная",
     "string": "строка",
     "style_model": "модель_стиля",
     "text": "текст",
+    "textgen": "textgen",
     "training": "обучение",
     "transform": "преобразование",
     "unet": "unet",
@@ -1340,7 +2069,25 @@
     "upscaling": "апскейл",
     "utils": "утилиты",
     "video": "видео",
-    "video_models": "видеомодели"
+    "video_models": "видеомодели",
+    "zimage": "zimage"
+  },
+  "nodeErrors": {
+    "content": "Ошибка содержимого узла",
+    "header": "Ошибка заголовка узла",
+    "render": "Ошибка рендеринга узла",
+    "slots": "Ошибка слотов узла",
+    "widgets": "Ошибка виджетов узла"
+  },
+  "nodeFilters": {
+    "hideDeprecated": "Скрыть устаревшие узлы",
+    "hideDeprecatedDescription": "Скрывает узлы, помеченные как устаревшие, если они не включены явно",
+    "hideDevOnly": "Скрыть только для разработчиков",
+    "hideDevOnlyDescription": "Скрывает узлы, предназначенные только для разработчиков, если не включён режим разработчика",
+    "hideExperimental": "Скрыть экспериментальные узлы",
+    "hideExperimentalDescription": "Скрывает узлы, помеченные как экспериментальные, если они не включены явно",
+    "hideSubgraph": "Скрыть узлы подграфа",
+    "hideSubgraphDescription": "Временно скрывает узлы подграфа из библиотеки узлов и поиска"
   },
   "nodeHelpPage": {
     "documentationPage": "страницу документации",
@@ -1350,6 +2097,32 @@
     "outputs": "Выходы",
     "type": "Тип"
   },
+  "nodeReplacement": {
+    "compatibleAlternatives": "Совместимые альтернативы",
+    "installMissingNodes": "Установить отсутствующие узлы",
+    "installationRequired": "Требуется установка",
+    "instructionMessage": "Вам необходимо установить эти узлы или заменить их установленными альтернативами, чтобы запустить рабочий процесс. Отсутствующие узлы выделены {red} на холсте. Некоторые узлы нельзя заменить, их нужно установить через Менеджер узлов.",
+    "notReplaceable": "Требуется установка",
+    "openNodeManager": "Открыть Менеджер узлов",
+    "quickFixAvailable": "Доступно быстрое исправление",
+    "redHighlight": "красным",
+    "replaceAll": "Заменить все",
+    "replaceAllWarning": "Заменяет все доступные узлы в этой группе.",
+    "replaceFailed": "Не удалось заменить узлы",
+    "replaceNode": "Заменить узел",
+    "replaceSelected": "Заменить выбранные ({count})",
+    "replaceWarning": "Это действие навсегда изменит рабочий процесс. Сохраните копию, если не уверены.",
+    "replaceable": "Можно заменить",
+    "replaced": "Заменено",
+    "replacedAllNodes": "Заменено {count} типов(а) узлов",
+    "replacedNode": "Заменённый узел: {nodeType}",
+    "selectAll": "Выбрать все",
+    "skipForNow": "Пропустить сейчас",
+    "swapNodesGuide": "Следующие узлы могут быть автоматически заменены совместимыми альтернативами.",
+    "swapNodesTitle": "Заменить узлы",
+    "unknownNode": "Неизвестно",
+    "willBeReplacedBy": "Этот узел будет заменён на:"
+  },
   "nodeTemplates": {
     "enterName": "Введите название",
     "saveAsTemplate": "Сохранить как шаблон"
@@ -1357,6 +2130,7 @@
   "notSupported": {
     "continue": "Продолжить",
     "continueTooltip": "Я уверен, что моё устройство поддерживается",
+    "illustrationAlt": "Иллюстрация грустной девушки",
     "learnMore": "Узнать больше",
     "message": "Поддерживаются только следующие устройства:",
     "reportIssue": "Сообщить о проблеме",
@@ -1366,12 +2140,222 @@
     },
     "title": "Ваше устройство не поддерживается"
   },
+  "painter": {
+    "background": "Фон",
+    "brush": "Кисть",
+    "clear": "Очистить",
+    "color": "Палитра цветов",
+    "eraser": "Ластик",
+    "hardness": "Жёсткость",
+    "height": "Высота",
+    "size": "Размер курсора",
+    "tool": "Инструмент",
+    "uploadError": "Не удалось загрузить изображение: {status} - {statusText}",
+    "width": "Ширина"
+  },
+  "progressToast": {
+    "allDownloadsCompleted": "Все загрузки завершены",
+    "downloadingModel": "Загрузка модели...",
+    "downloadsFailed": "{count} загрузок не удалось | {count} загрузка не удалась | {count} загрузок не удалось",
+    "failed": "Не удалось",
+    "filter": {
+      "all": "Все",
+      "completed": "Завершено",
+      "failed": "Не удалось"
+    },
+    "finished": "Завершено",
+    "importingModels": "Импорт моделей",
+    "noImportsInQueue": "Нет {filter} в очереди",
+    "pending": "В ожидании",
+    "progressCount": "{completed} из {total}"
+  },
+  "queue": {
+    "completedIn": "Завершено за {duration}",
+    "inQueue": "В очереди...",
+    "initializingAlmostReady": "Инициализация — почти готово",
+    "jobAddedToQueue": "Задача добавлена в очередь",
+    "jobDetails": {
+      "computeHoursUsed": "Использовано вычислительных часов",
+      "errorMessage": "Сообщение об ошибке",
+      "estimatedFinishIn": "Ожидаемое завершение через",
+      "estimatedStartIn": "Ожидаемый старт через",
+      "eta": {
+        "minutes": "~{count} минута | ~{count} минут",
+        "minutesRange": "~{lo}-{hi} минут",
+        "seconds": "~{count} секунда | ~{count} секунд",
+        "secondsRange": "~{lo}-{hi} секунд"
+      },
+      "failedAfter": "Ошибка после",
+      "generatedOn": "Сгенерировано",
+      "header": "Детали задачи",
+      "jobId": "ID задачи",
+      "queuePosition": "Позиция в очереди",
+      "queuePositionValue": "~{count} задача перед вашей | ~{count} задач перед вашей",
+      "queuedAt": "В очереди с",
+      "report": "Сообщить",
+      "timeElapsed": "Прошедшее время",
+      "totalGenerationTime": "Общее время генерации",
+      "workflow": "Рабочий процесс"
+    },
+    "jobHistory": "История задач",
+    "jobList": {
+      "sortComputeHoursUsed": "Использовано вычислительных часов (сначала больше всего)",
+      "sortMostRecent": "Самые новые",
+      "sortTotalGenerationTime": "Общее время генерации (сначала самое долгое)",
+      "undated": "Без даты"
+    },
+    "jobMenu": {
+      "addToCurrentWorkflow": "Добавить в текущий рабочий процесс",
+      "cancelJob": "Отменить задачу",
+      "copyErrorMessage": "Скопировать сообщение об ошибке",
+      "copyJobId": "Скопировать ID задачи",
+      "delete": "Удалить",
+      "deleteAsset": "Удалить ресурс",
+      "download": "Скачать",
+      "exportWorkflow": "Экспортировать рабочий процесс",
+      "inspectAsset": "Просмотреть ресурс",
+      "openAsWorkflowNewTab": "Открыть как рабочий процесс в новой вкладке",
+      "openWorkflowNewTab": "Открыть рабочий процесс в новой вкладке",
+      "removeJob": "Удалить задачу",
+      "reportError": "Сообщить об ошибке"
+    },
+    "jobQueueing": "Задача ставится в очередь",
+    "toggleJobHistory": "Показать/скрыть историю задач"
+  },
   "releaseToast": {
+    "description": "Ознакомьтесь с последними улучшениями и функциями в этом обновлении.",
     "newVersionAvailable": "Доступна новая версия!",
     "skip": "Пропустить",
     "update": "Обновить",
     "whatsNew": "Что нового?"
   },
+  "rightSidePanel": {
+    "addFavorite": "В избранное",
+    "advancedInputs": "РАСШИРЕННЫЕ ВХОДНЫЕ ДАННЫЕ",
+    "bypass": "Обход",
+    "color": "Цвет узла",
+    "enterSubgraph": "Войти в подграф",
+    "errorHelp": "Для получения дополнительной помощи {github} или {support}",
+    "errorHelpGithub": "создайте issue на GitHub",
+    "errorHelpSupport": "свяжитесь с нашей поддержкой",
+    "errors": "Ошибки",
+    "executionErrorOccurred": "Произошла ошибка во время выполнения. Подробности смотрите на вкладке Ошибки.",
+    "fallbackGroupTitle": "Группа",
+    "fallbackNodeTitle": "Узел",
+    "favorites": "ИЗБРАННЫЕ ВХОДЫ",
+    "favoritesNone": "НЕТ ИЗБРАННЫХ ВХОДОВ",
+    "favoritesNoneDesc": "Здесь будут отображаться ваши избранные входы",
+    "favoritesNoneHint": "Во вкладке Параметры нажмите {moreIcon} на любом входе, чтобы добавить его сюда",
+    "favoritesNoneTooltip": "Отметьте виджеты звёздочкой для быстрого доступа без выбора узлов",
+    "globalSettings": {
+      "canvas": "ХОЛСТ",
+      "connectionLinks": "СВЯЗИ",
+      "gridSpacing": "Шаг сетки",
+      "linkShape": "Форма связи",
+      "nodes": "УЗЛЫ",
+      "nodes2": "Узлы 2.0",
+      "searchPlaceholder": "Поиск быстрых настроек...",
+      "showAdvanced": "Показать расширенные параметры",
+      "showAdvancedTooltip": "Это важная настройка, которая при включении отображает все расширенные параметры для узлов",
+      "showConnectedLinks": "Показывать соединённые связи",
+      "showInfoBadges": "Показывать информационные бейджи",
+      "showToolbox": "Показывать панель инструментов при выборе",
+      "snapNodesToGrid": "Привязывать узлы к сетке",
+      "title": "Глобальные настройки",
+      "viewAllSettings": "Просмотреть все настройки"
+    },
+    "groupSettings": "Настройки группы",
+    "groups": "Группы",
+    "hideAdvancedInputsButton": "Скрыть расширенные параметры",
+    "hideInput": "Скрыть вход",
+    "info": "Информация",
+    "inputs": "ВХОДЫ",
+    "inputsNone": "НЕТ ВХОДОВ",
+    "inputsNoneTooltip": "Узел не имеет входов",
+    "locateNode": "Найти узел на холсте",
+    "missingNodePacks": {
+      "applyChanges": "Применить изменения",
+      "cloudMessage": "Для этого рабочего процесса требуются пользовательские узлы, которые ещё недоступны в Comfy Cloud.",
+      "collapse": "Свернуть",
+      "expand": "Развернуть",
+      "installAll": "Установить все",
+      "installNodePack": "Установить пакет узлов",
+      "installed": "Установлено",
+      "installing": "Установка...",
+      "ossManagerDisabledHint": "Чтобы установить отсутствующие узлы, сначала выполните {pipCmd} в вашей среде Python для установки Node Manager, затем перезапустите ComfyUI с флагом {flag}.",
+      "ossMessage": "В этом рабочем процессе используются пользовательские узлы, которые вы ещё не установили.",
+      "searchInManager": "Поиск в менеджере узлов",
+      "title": "Отсутствующие пакеты узлов",
+      "unknownPack": "Неизвестный пакет",
+      "unsupportedTitle": "Неподдерживаемые пакеты узлов",
+      "viewInManager": "Просмотреть в менеджере"
+    },
+    "mute": "Отключить",
+    "noErrors": "Ошибок нет",
+    "noSelection": "Выберите узел, чтобы увидеть его свойства и информацию.",
+    "nodeState": "Состояние узла",
+    "nodes": "Узлы",
+    "nodesNoneDesc": "НЕТ УЗЛОВ",
+    "noneSearchDesc": "Нет элементов, соответствующих вашему поиску",
+    "normal": "Обычный",
+    "parameters": "Параметры",
+    "pinned": "Закреплено",
+    "promptErrors": {
+      "no_prompt": {
+        "desc": "Данные рабочего процесса, отправленные на сервер, пусты. Это может быть неожиданной системной ошибкой."
+      },
+      "prompt_no_outputs": {
+        "desc": "В рабочем процессе отсутствуют выходные узлы (например, Сохранить изображение, Предпросмотр изображения) для получения результата."
+      },
+      "server_error_cloud": {
+        "desc": "На сервере произошла непредвиденная ошибка. Пожалуйста, попробуйте позже."
+      },
+      "server_error_local": {
+        "desc": "На сервере произошла непредвиденная ошибка. Пожалуйста, проверьте логи сервера."
+      }
+    },
+    "properties": "Свойства",
+    "removeFavorite": "Убрать из избранного",
+    "resetAllParameters": "Сбросить все параметры",
+    "resetToDefault": "Сбросить по умолчанию",
+    "seeError": "Посмотреть ошибку",
+    "settings": "Настройки",
+    "showAdvancedInputsButton": "Показать расширенные входные данные",
+    "showInput": "Показать вход",
+    "title": "Нет выбранных узлов | 1 узел выбран | {count} узлов выбрано",
+    "togglePanel": "Показать/скрыть панель свойств",
+    "workflowOverview": "Обзор рабочего процесса"
+  },
+  "secrets": {
+    "addSecret": "Добавить секрет",
+    "createdAt": "Создано {date}",
+    "deleteConfirmMessage": "Вы уверены, что хотите удалить «{name}»? Это действие необратимо.",
+    "deleteConfirmTitle": "Удалить секрет",
+    "description": "Секреты шифруются и используются для хранения конфиденциальных данных, таких как API-ключи.",
+    "descriptionUsage": "Храните здесь свои токены, чтобы скачивать приватные и ограниченные модели от поддерживаемых провайдеров.",
+    "editSecret": "Редактировать секрет",
+    "errors": {
+      "duplicateName": "Секрет с таким именем уже существует",
+      "duplicateProvider": "Секрет для этого провайдера уже существует",
+      "nameRequired": "Имя обязательно",
+      "nameTooLong": "Имя должно содержать не более 255 символов",
+      "providerRequired": "Провайдер обязателен",
+      "secretValueRequired": "Значение секрета обязательно"
+    },
+    "lastUsed": "Последнее использование {date}",
+    "modelProviders": "Провайдеры моделей",
+    "name": "Имя",
+    "namePlaceholder": "например, Мой API-ключ",
+    "noSecrets": "Секреты не сохранены. Добавьте свой первый API-ключ, чтобы начать.",
+    "provider": "Провайдер",
+    "providerHint": "Необязательно. Выбор провайдера позволяет использовать токен автоматически.",
+    "secretValue": "Значение секрета",
+    "secretValueHint": "Это значение будет зашифровано и не может быть просмотрено повторно.",
+    "secretValueHintEdit": "Оставьте пустым, чтобы сохранить текущее значение.",
+    "secretValuePlaceholder": "Введите ваш API-ключ",
+    "secretValuePlaceholderEdit": "Введите новое значение для изменения",
+    "title": "API-ключи и секреты"
+  },
   "selectionToolbox": {
     "Bypass Group Nodes": "Обойти групповые узлы",
     "Set Group Nodes to Always": "Всегда использовать групповые узлы",
@@ -1384,6 +2368,8 @@
   "serverConfig": {
     "modifiedConfigs": "Вы изменили следующие конфигурации сервера. Перезапустите, чтобы применить изменения.",
     "restart": "Перезапустить",
+    "restartRequiredToastDetail": "Перезапустите приложение, чтобы применить изменения конфигурации сервера.",
+    "restartRequiredToastSummary": "Требуется перезапуск",
     "revertChanges": "Отменить изменения"
   },
   "serverConfigCategories": {
@@ -1452,6 +2438,10 @@
     "enable-cors-header": {
       "name": "Включить CORS заголовок: Используйте \"*\" для всех источников или укажите домен"
     },
+    "enable-manager-legacy-ui": {
+      "name": "Использовать устаревший интерфейс Manager",
+      "tooltip": "Использует устаревший интерфейс ComfyUI-Manager вместо нового."
+    },
     "fast": {
       "name": "Включить некоторые непроверенные и потенциально ухудшающие качество оптимизации."
     },
@@ -1553,6 +2543,8 @@
     "CustomColorPalettes": "Пользовательские цветовые палитры",
     "DevMode": "Режим разработчика",
     "EditTokenWeight": "Редактировать вес токена",
+    "Error System": "Система ошибок",
+    "Execution": "Выполнение",
     "Extension": "Расширение",
     "General": "Общие",
     "Graph": "Граф",
@@ -1568,10 +2560,14 @@
     "Menu": "Меню",
     "ModelLibrary": "Библиотека моделей",
     "Node": "Нода",
+    "Node Library": "Библиотека узлов",
     "Node Search Box": "Поисковая строка нод",
     "Node Widget": "Виджет ноды",
     "NodeLibrary": "Библиотека нод",
+    "Nodes 2_0": "Nodes 2.0",
     "Notification Preferences": "Настройки уведомлений",
+    "Other": "Другое",
+    "PLY": "PLY",
     "PlanCredits": "План и кредиты",
     "Pointer": "Указатель",
     "Queue": "Очередь",
@@ -1579,6 +2575,7 @@
     "Reroute": "Перенаправление",
     "RerouteBeta": "Бета-версия перенаправления",
     "Scene": "Сцена",
+    "Secrets": "Секреты",
     "Server": "Сервер",
     "Server-Config": "Настройки сервера",
     "Settings": "Настройки",
@@ -1590,7 +2587,8 @@
     "Vue Nodes": "Vue Nodes",
     "VueNodes": "Vue узлы",
     "Window": "Окно",
-    "Workflow": "Рабочий процесс"
+    "Workflow": "Рабочий процесс",
+    "Workspace": "Рабочее пространство"
   },
   "shape": {
     "CARD": "Карточка",
@@ -1616,11 +2614,18 @@
     "viewControls": "Управление видом"
   },
   "sideToolbar": {
+    "activeJobStatus": "Активная задача: {status}",
     "assets": "Ассеты",
     "backToAssets": "Назад ко всем ассетам",
     "browseTemplates": "Просмотреть примеры шаблонов",
     "downloads": "Загрузки",
+    "folderView": {
+      "errorDetail": "Не удалось получить выходные данные для этой задачи. Пожалуйста, попробуйте еще раз.",
+      "errorSummary": "Не удалось загрузить выходные данные"
+    },
+    "generatedAssetsHeader": "Сгенерированные ресурсы",
     "helpCenter": "Центр поддержки",
+    "importedAssetsHeader": "Импортированные ресурсы",
     "labels": {
       "assets": "Ассеты",
       "console": "Консоль",
@@ -1643,6 +2648,17 @@
     "noImportedFiles": "Импортированные файлы не найдены",
     "nodeLibrary": "Библиотека нод",
     "nodeLibraryTab": {
+      "allNodes": "Все узлы",
+      "blueprints": "Чертежи",
+      "custom": "Пользовательские",
+      "essentials": "Основное",
+      "filter": "Фильтр",
+      "filterOptions": {
+        "blueprints": "Чертежи",
+        "comfyNodes": "Comfy-узлы",
+        "extensions": "Расширения",
+        "partnerNodes": "Узлы партнёров"
+      },
       "groupBy": "Группировать по",
       "groupStrategies": {
         "category": "Категория",
@@ -1652,7 +2668,20 @@
         "source": "Источник",
         "sourceDesc": "Группировать по типу источника (Core, Custom, API)"
       },
+      "noBookmarkedNodes": "Избранных пока нет",
       "resetView": "Сбросить вид по умолчанию",
+      "sections": {
+        "bookmarked": "Избранное",
+        "comfyBlueprints": "Comfy-чертежи",
+        "comfyNodes": "Comfy-узлы",
+        "extensions": "Расширения",
+        "favoriteNode": "Избранный узел",
+        "favorites": "Избранное",
+        "myBlueprints": "Мои чертежи",
+        "partnerNodes": "Узлы партнёров",
+        "subgraphBlueprints": "Чертежи подграфов",
+        "unfavoriteNode": "Удалить из избранного"
+      },
       "sortBy": {
         "alphabetical": "По алфавиту",
         "alphabeticalDesc": "Сортировать по алфавиту внутри групп",
@@ -1661,8 +2690,62 @@
       },
       "sortMode": "Режим сортировки"
     },
+    "nodes": "Узлы",
     "openWorkflow": "Открыть рабочий процесс в локальной файловой системе",
     "queue": "Очередь",
+    "queueProgressOverlay": {
+      "activeJobs": "{count} активное задание | {count} активных задания | {count} активных заданий",
+      "activeJobsShort": "{count} активно | {count} активно",
+      "activeJobsSuffix": "активных заданий",
+      "cancelJobTooltip": "Отменить задание",
+      "clearAllJobsTooltip": "Отменить все выполняющиеся задачи",
+      "clearHistory": "Очистить историю очереди заданий",
+      "clearHistoryDialogAssetsNote": "Ассеты, созданные этими заданиями, не будут удалены и всегда доступны на панели ассетов.",
+      "clearHistoryDialogDescription": "Все завершённые или неудачные задания ниже будут удалены из этой панели очереди заданий.",
+      "clearHistoryDialogTitle": "Очистить историю очереди заданий?",
+      "clearHistoryMenuAssetsNote": "Медиафайлы не будут удалены.",
+      "clearQueueTooltip": "Очистить очередь",
+      "clearQueued": "Очистить очередь",
+      "colonPercent": ": {percent}",
+      "currentNode": "Текущий узел:",
+      "dockedJobHistory": "Закреплённая история заданий",
+      "expandCollapsedQueue": "Развернуть очередь заданий",
+      "filterAllWorkflows": "Все рабочие процессы",
+      "filterBy": "Фильтровать по",
+      "filterCurrentWorkflow": "Текущий рабочий процесс",
+      "filterJobs": "Фильтровать задания",
+      "inlineTotalLabel": "Всего",
+      "interruptAll": "Остановить все выполняющиеся задания",
+      "jobCompleted": "Задача выполнена",
+      "jobFailed": "Задача не выполнена",
+      "jobQueue": "Очередь заданий",
+      "jobsAddedToQueue": "{count} задача добавлена в очередь | {count} задач добавлено в очередь",
+      "jobsCompleted": "{count} задание завершено | {count} задания завершено | {count} заданий завершено",
+      "jobsFailed": "{count} задание не выполнено | {count} задания не выполнено | {count} заданий не выполнено",
+      "moreOptions": "Больше опций",
+      "noActiveJobs": "Нет активных заданий",
+      "preview": "Предпросмотр",
+      "queuedJobsLabel": "{count} в очереди",
+      "queuedSuffix": "в очереди",
+      "running": "выполняется",
+      "runningJobsLabel": "{count} выполняется",
+      "runningQueuedSummary": "{running}, {queued}",
+      "searchJobs": "Поиск...",
+      "showAssets": "Показать ассеты",
+      "showAssetsPanel": "Показать панель ассетов",
+      "showRunProgressBar": "Показать индикатор выполнения",
+      "sortBy": "Сортировать по",
+      "sortJobs": "Сортировать задания",
+      "stubClipTextEncode": "CLIP Text Encode:",
+      "title": "Прогресс очереди",
+      "total": "Всего: {percent}",
+      "viewAllJobs": "Просмотреть все задания",
+      "viewGrid": "Просмотр сеткой",
+      "viewJobHistory": "Просмотреть историю заданий",
+      "viewList": "Просмотр списком"
+    },
+    "searchAssets": "Поиск ассетов",
+    "sidebar": "Боковая панель",
     "templates": "Шаблоны",
     "themeToggle": "Переключить тему",
     "workflowTab": {
@@ -1686,60 +2769,208 @@
   },
   "subgraphStore": {
     "blueprintName": "Имя подграфа",
+    "blueprintNamePrompt": "Имя подграфа:",
+    "cannotDeleteGlobal": "Невозможно удалить установленные blueprints",
     "confirmDelete": "Это действие навсегда удалит подграф из вашей библиотеки",
     "confirmDeleteTitle": "Удалить подграф?",
+    "disconnected": "Отключено",
+    "enterDescription": "Введите описание",
+    "enterSearchAliases": "Введите псевдонимы для поиска (через запятую)",
     "hidden": "Скрытые / вложенные параметры",
     "hideAll": "Скрыть всё",
+    "linked": "(Связано)",
     "loadFailure": "Не удалось загрузить схемы подграфов",
     "overwriteBlueprint": "Сохранение перезапишет текущий подграф вашими изменениями",
     "overwriteBlueprintTitle": "Перезаписать существующий подграф?",
     "promoteOutsideSubgraph": "Невозможно повысить виджет вне подграфа",
+    "promoteWidget": "Продвинуть виджет: {name}",
     "publish": "Опубликовать подграф",
     "publishSuccess": "Сохранено в библиотеку узлов",
     "publishSuccessMessage": "Вы можете найти свой подграф в библиотеке узлов в разделе «Subgraph Blueprints»",
     "saveBlueprint": "Сохранить подграф в библиотеку",
+    "searchAliases": "Поиск по псевдонимам",
     "showAll": "Показать всё",
     "showRecommended": "Показать рекомендуемые виджеты",
-    "shown": "Показано на узле"
+    "shown": "Показано на узле",
+    "unpromoteWidget": "Снять продвижение виджета: {name}"
   },
   "subscription": {
     "addApiCredits": "Пополнить API-кредиты",
     "addCredits": "Добавить кредиты",
+    "addCreditsLabel": "Добавляйте кредиты в любое время",
     "benefits": {
       "benefit1": "Ежемесячные кредиты для Партнёрских узлов — пополняйте по необходимости",
-      "benefit2": "До 30 минут выполнения на задание"
+      "benefit1FreeTier": "Больше кредитов в месяц, пополнение в любое время",
+      "benefit2": "До 30 минут выполнения на задание",
+      "benefit3": "Используйте свои модели (Creator & Pro)"
     },
     "beta": "БЕТА",
+    "billedMonthly": "Оплата ежемесячно",
+    "billedYearly": "{total} Оплата ежегодно",
+    "billingComingSoon": {
+      "message": "Скоро появится командная оплата. Вы сможете оформить подписку на тариф для вашего рабочего пространства с оплатой за каждого участника. Следите за обновлениями.",
+      "title": "Скоро будет"
+    },
+    "cancelDialog": {
+      "confirmCancel": "Отменить подписку",
+      "description": "Ваш доступ сохранится до {date}. С вас больше не будет взиматься плата, а ваше рабочее пространство и кредиты будут сохранены. Вы можете возобновить подписку в любое время.",
+      "endOfBillingPeriod": "конец расчетного периода",
+      "failed": "Не удалось отменить подписку",
+      "keepSubscription": "Сохранить подписку",
+      "title": "Отмена подписки"
+    },
+    "cancelSubscription": "Отменить подписку",
+    "cancelSuccess": "Подписка успешно отменена",
+    "canceled": "Отменено",
+    "canceledCard": {
+      "description": "С вас больше не будет взиматься плата. Ваши функции останутся активными до {date}.",
+      "title": "Ваша подписка отменена"
+    },
+    "changeTo": "Перейти на {plan}",
+    "chooseBestPlanWorkspace": "Выберите лучший тариф для вашего рабочего пространства",
     "comfyCloud": "Comfy Cloud",
+    "comfyCloudLogo": "Логотип Comfy Cloud",
+    "contactOwnerToSubscribe": "Свяжитесь с владельцем рабочего пространства для оформления подписки",
+    "contactUs": "Связаться с нами",
+    "creditsRemainingThisMonth": "Кредитов осталось в этом месяце",
+    "creditsRemainingThisYear": "Кредитов осталось в этом году",
+    "creditsYouveAdded": "Добавленные вами кредиты",
+    "currentPlan": "Текущий план",
+    "customLoRAsLabel": "Импортируйте свои LoRA",
+    "description": "Выберите лучший план для себя",
+    "descriptionWorkspace": "Выберите лучший тариф для вашего рабочего пространства",
     "expiresDate": "Истекает {date}",
+    "freeTier": {
+      "description": "Ваш бесплатный тариф включает {credits} кредитов каждый месяц для использования Comfy Cloud.",
+      "descriptionGeneric": "Ваш бесплатный тариф включает ежемесячный лимит кредитов для использования Comfy Cloud.",
+      "nextRefresh": "Кредиты обновятся {date}.",
+      "outOfCredits": {
+        "subtitle": "Оформите подписку для пополнения и других возможностей",
+        "title": "У вас закончились бесплатные кредиты"
+      },
+      "subscribeCta": "Подписаться для большего",
+      "title": "Вы на бесплатном тарифе",
+      "topUpBlocked": {
+        "title": "Откройте пополнение и другие возможности"
+      },
+      "upgradeCta": "Посмотреть тарифы"
+    },
+    "gpuLabel": "RTX 6000 Pro (96ГБ VRAM)",
+    "haveQuestions": "Есть вопросы или интересует корпоративное решение?",
     "invoiceHistory": "История счетов",
     "learnMore": "Узнать больше",
+    "managePayment": "Управление оплатой",
+    "managePlan": "Управление планом",
     "manageSubscription": "Управление подпиской",
+    "maxDuration": {
+      "creator": "30 мин",
+      "founder": "30 мин",
+      "free": "30 мин",
+      "pro": "1 ч",
+      "standard": "30 мин"
+    },
+    "maxDurationLabel": "Максимальная длительность одного запуска рабочего процесса",
+    "maxMembersLabel": "Макс. участников",
+    "member": "участник",
+    "memberCount": "{count} участник | {count} участников",
+    "membersLabel": "До {count} участников",
     "messageSupport": "Написать в поддержку",
+    "monthly": "Ежемесячно",
     "monthlyBonusDescription": "Ежемесячный бонус кредитов",
+    "monthlyCreditsInfo": "Эти кредиты обновляются ежемесячно и не переносятся",
+    "monthlyCreditsLabel": "Ежемесячные кредиты",
+    "monthlyCreditsPerMemberLabel": "Ежемесячные кредиты / участник",
     "monthlyCreditsRollover": "Эти кредиты переносятся на следующий месяц",
+    "mostPopular": "Самый популярный",
     "nextBillingCycle": "следующий платёжный цикл",
+    "nextMonthInvoice": "Счет на следующий месяц",
     "partnerNodesBalance": "Баланс кредитов \"Партнёрских узлов\"",
     "partnerNodesCredits": "Кредиты партнёрских узлов",
     "partnerNodesDescription": "Для запуска коммерческих/проприетарных моделей",
     "perMonth": "USD / месяц",
+    "plansAndPricing": "Планы и цены",
     "prepaidCreditsInfo": "Кредиты, приобретённые отдельно и не имеющие срока действия",
     "prepaidDescription": "Предоплаченные кредиты",
+    "preview": {
+      "addCreditCard": "Добавить банковскую карту",
+      "backToAllPlans": "Назад ко всем тарифам",
+      "confirm": "Подтвердить",
+      "confirmPayment": "Подтвердите оплату",
+      "confirmPlanChange": "Подтвердите смену тарифа",
+      "eachMonthCreditsRefill": "Ежемесячное пополнение кредитов до",
+      "ends": "Заканчивается {date}",
+      "hideFeatures": "Скрыть функции",
+      "nextPaymentDue": "Следующий платеж {date}. Отменить можно в любое время.",
+      "perMember": "/ участник",
+      "privacyPolicy": "Политика конфиденциальности",
+      "proratedCharge": "Пропорциональная оплата за {plan}",
+      "proratedRefund": "Пропорциональный возврат за {plan}",
+      "showMoreFeatures": "Показать больше функций",
+      "starting": "Начинается {date}",
+      "startingToday": "Начинается сегодня",
+      "terms": "Условия",
+      "termsAgreement": "Продолжая, вы соглашаетесь с {terms} и {privacy} Comfy Org.",
+      "totalDueToday": "Итого к оплате сегодня"
+    },
     "renewsDate": "Обновляется {date}",
     "required": {
+      "pollingFailed": "Не удалось активировать подписку",
+      "pollingSuccess": "Подписка успешно активирована!",
+      "pollingTimeout": "Время ожидания подписки истекло. Пожалуйста, обновите страницу и попробуйте снова.",
       "subscribe": "Подписаться",
       "title": "Подписаться на",
       "waitingForSubscription": "Завершите оформление подписки в новой вкладке. Мы автоматически определим, когда вы закончите!"
     },
+    "resubscribe": "Возобновить подписку",
+    "resubscribeSuccess": "Подписка успешно возобновлена",
+    "resubscribeTo": "Возобновить подписку на {plan}",
+    "subscribeForMore": "Обновить",
     "subscribeNow": "Подписаться сейчас",
+    "subscribeTo": "Подписаться на {plan}",
     "subscribeToComfyCloud": "Подписаться на Comfy Cloud",
     "subscribeToRun": "Подписаться",
     "subscribeToRunFull": "Подписаться для запуска",
+    "subscriptionRequiredMessage": "Для запуска рабочих процессов в облаке участникам требуется подписка",
+    "tierNameYearly": "{name} Ежегодно",
+    "tiers": {
+      "creator": {
+        "name": "Creator"
+      },
+      "founder": {
+        "name": "Founder's Edition"
+      },
+      "free": {
+        "name": "Бесплатно"
+      },
+      "pro": {
+        "name": "Pro"
+      },
+      "standard": {
+        "name": "Standard"
+      }
+    },
     "title": "Подписка",
     "titleUnsubscribed": "Подпишитесь на Comfy Cloud",
     "totalCredits": "Всего кредитов",
+    "upgrade": "УЛУЧШИТЬ",
+    "upgradePlan": "Улучшить план",
+    "upgradeTo": "Улучшить до {plan}",
+    "upgradeToAddCredits": "Обновите, чтобы добавить кредиты",
+    "usdPerMonth": "USD / мес",
+    "usdPerMonthPerMember": "USD / мес / участник",
+    "videoEstimateExplanation": "Эти оценки основаны на шаблоне Wan 2.2 Image-to-Video с настройками по умолчанию (5 секунд, 640x640, 16 кадров/с, 4 шага семплирования).",
+    "videoEstimateHelp": "Подробнее об этом шаблоне",
+    "videoEstimateLabel": "Примерное количество 5-секундных видео, созданных с помощью шаблона Wan 2.2 Image-to-Video",
+    "videoEstimateTryTemplate": "Попробовать этот шаблон",
+    "videoTemplateBasedCredits": "Видео, созданные с помощью Wan 2.2 Image to Video",
+    "viewEnterprise": "Посмотреть корпоративные решения",
     "viewMoreDetails": "Подробнее",
+    "viewMoreDetailsPlans": "Подробнее о планах и ценах",
     "viewUsageHistory": "История использования",
+    "workspaceNotSubscribed": "Это рабочее пространство не имеет подписки",
+    "yearly": "Ежегодно",
+    "yearlyCreditsLabel": "Годовые кредиты",
+    "yearlyDiscount": "СКИДКА 20%",
     "yourPlanIncludes": "Ваш план включает:"
   },
   "tabMenu": {
@@ -1751,8 +2982,14 @@
     "duplicateTab": "Дублировать вкладку",
     "removeFromBookmarks": "Удалить из закладок"
   },
+  "templateWidgets": {
+    "sort": {
+      "searchPlaceholder": "Поиск..."
+    }
+  },
   "templateWorkflows": {
     "activeFilters": "Фильтры:",
+    "allTemplates": "Все шаблоны",
     "categories": "Категории",
     "category": {
       "3D": "3D",
@@ -1779,6 +3016,7 @@
     "error": {
       "templateNotFound": "Шаблон \"{templateName}\" не найден"
     },
+    "licenseFilter": "Лицензия",
     "loading": "Загрузка шаблонов...",
     "loadingMore": "Загрузка дополнительных шаблонов...",
     "modelFilter": "Фильтр моделей",
@@ -1795,14 +3033,19 @@
       "default": "По умолчанию",
       "modelSizeLowToHigh": "Размер модели (от низкого к высокому)",
       "newest": "Новейшие",
+      "popular": "Популярные",
       "recommended": "Рекомендуемые",
       "searchPlaceholder": "Поиск...",
       "vramLowToHigh": "Использование VRAM (от низкого к высокому)"
     },
     "sorting": "Сортировать по",
     "title": "Начните с шаблона",
+    "useCaseFilter": "Задачи",
     "useCasesSelected": "{count} вариантов использования"
   },
+  "templates": {
+    "logoProviderSeparator": " & "
+  },
   "toastMessages": {
     "cannotCreateSubgraph": "Невозможно создать подграф",
     "couldNotDetermineFileType": "Не удалось определить тип файла",
@@ -1810,6 +3053,7 @@
     "emptyCanvas": "Пустой холст",
     "errorCopyImage": "Ошибка копирования изображения: {error}",
     "errorLoadingModel": "Ошибка загрузки модели",
+    "errorOpenImage": "Ошибка при открытии изображения: {error}",
     "errorSaveSetting": "Ошибка сохранения настройки {id}: {err}",
     "exportSuccess": "Модель успешно экспортирована как {format}",
     "failedExecutionPathResolution": "Не удалось определить путь к выбранным узлам",
@@ -1829,9 +3073,23 @@
     "failedToLoadModel": "Не удалось загрузить 3D-модель",
     "failedToPurchaseCredits": "Не удалось купить кредиты: {error}",
     "failedToQueue": "Не удалось поставить в очередь",
+    "failedToSaveDraft": "Не удалось сохранить черновик рабочего процесса",
+    "failedToToggleCamera": "Не удалось переключить камеру",
+    "failedToToggleGrid": "Не удалось переключить сетку",
+    "failedToUpdateBackgroundColor": "Не удалось обновить цвет фона",
+    "failedToUpdateBackgroundImage": "Не удалось обновить фоновое изображение",
+    "failedToUpdateBackgroundRenderMode": "Не удалось обновить режим рендеринга фона на {mode}",
+    "failedToUpdateEdgeThreshold": "Не удалось обновить порог границ",
+    "failedToUpdateFOV": "Не удалось обновить угол обзора",
+    "failedToUpdateLightIntensity": "Не удалось обновить интенсивность освещения",
+    "failedToUpdateMaterialMode": "Не удалось обновить режим материала",
+    "failedToUpdateUpDirection": "Не удалось обновить направление вверх",
+    "failedToUploadBackgroundImage": "Не удалось загрузить фоновое изображение",
     "fileLoadError": "Не удалось найти рабочий процесс в {fileName}",
+    "fileTooLarge": "Файл слишком большой ({size} МБ). Максимально поддерживаемый размер — {maxSize} МБ",
     "fileUploadFailed": "Не удалось загрузить файл",
     "interrupted": "Выполнение было прервано",
+    "legacyMaskEditorDeprecated": "Устаревший редактор масок будет скоро удалён.",
     "migrateToLitegraphReroute": "Узлы перенаправления будут удалены в будущих версиях. Нажмите, чтобы перейти на litegraph-native reroute.",
     "modelLoadedSuccessfully": "3D-модель успешно загружена",
     "no3dScene": "Нет 3D сцены для применения текстуры",
@@ -1858,12 +3116,14 @@
     "selectUser": "Выберите пользователя"
   },
   "userSettings": {
+    "accountSettings": "Настройки аккаунта",
     "email": "Электронная почта",
     "name": "Имя",
     "notSet": "Не задано",
     "provider": "Способ входа",
     "title": "Настройки пользователя",
-    "updatePassword": "Обновить пароль"
+    "updatePassword": "Обновить пароль",
+    "workspaceSettings": "Настройки рабочего пространства"
   },
   "validation": {
     "descriptionRequired": "Описание обязательно",
@@ -1892,35 +3152,230 @@
     "updateFrontend": "Обновить интерфейс"
   },
   "vueNodesBanner": {
+    "desc": "– Более гибкие рабочие процессы, новые мощные виджеты, расширяемость",
+    "title": "Представляем Nodes 2.0",
     "tryItOut": "Попробовать"
   },
   "vueNodesMigration": {
     "button": "Открыть настройки",
     "message": "Предпочитаете классический дизайн узлов?"
   },
+  "vueNodesMigrationMainMenu": {
+    "message": "Переключиться обратно на Nodes 2.0 можно в главном меню."
+  },
+  "vueNodesSlot": {
+    "iterative": "(Итеративно)"
+  },
   "welcome": {
     "getStarted": "Начать",
     "title": "Добро пожаловать в ComfyUI"
   },
   "whatsNewPopup": {
+    "later": "Позже",
     "learnMore": "Узнать больше",
     "noReleaseNotes": "Нет доступных примечаний к выпуску."
   },
+  "widgetFileUpload": {
+    "browseFiles": "Выбрать файлы",
+    "dropPrompt": "Перетащите ваш файл или"
+  },
   "widgets": {
+    "boolean": {
+      "false": "ложь",
+      "true": "истина"
+    },
+    "node2only": "Только Node 2.0",
     "selectModel": "Выбрать модель",
     "uploadSelect": {
+      "maxSelectionReached": "Достигнут максимальный лимит выбора",
       "placeholder": "Выбрать...",
       "placeholderAudio": "Выбрать аудио...",
       "placeholderImage": "Выбрать изображение...",
+      "placeholderMesh": "Выберите mesh...",
       "placeholderModel": "Выбрать модель...",
       "placeholderUnknown": "Выбрать медиа...",
       "placeholderVideo": "Выбрать видео..."
+    },
+    "valueControl": {
+      "decrement": "Уменьшить значение",
+      "decrementDesc": "Уменьшает значение на 1 или выбирает предыдущий вариант",
+      "editSettings": "Изменить настройки управления",
+      "fixed": "Фиксированное значение",
+      "fixedDesc": "Оставляет значение без изменений",
+      "header": {
+        "after": "ПОСЛЕ",
+        "before": "ДО",
+        "postfix": "запуска рабочего процесса:",
+        "prefix": "Автоматически обновлять значение"
+      },
+      "increment": "Увеличить значение",
+      "incrementDesc": "Увеличивает значение на 1 или выбирает следующий вариант",
+      "linkToGlobal": "Связать с",
+      "linkToGlobalDesc": "Уникальное значение, связанное с настройкой глобального значения",
+      "linkToGlobalSeed": "Глобальное значение",
+      "randomize": "Случайное значение",
+      "randomizeDesc": "Случайным образом изменяет значение после каждого генерации"
     }
   },
   "workflowService": {
     "enterFilename": "Введите название файла",
+    "enterFilenamePrompt": "Введите имя файла:",
     "exportWorkflow": "Экспорт рабочего процесса",
-    "saveWorkflow": "Сохранить рабочий процесс"
+    "saveWorkflow": "Сохранить рабочий процесс",
+    "savedAsApp": "Преобразовано в рабочий процесс приложения",
+    "savedAsWorkflow": "Преобразовано только в рабочий процесс графа узлов"
+  },
+  "workspace": {
+    "addedToWorkspace": "Вы были добавлены в {workspaceName}",
+    "inviteAccepted": "Приглашение принято",
+    "inviteFailed": "Не удалось принять приглашение",
+    "unsavedChanges": {
+      "message": "У вас есть несохранённые изменения. Хотите их отменить и переключиться на другое рабочее пространство?",
+      "title": "Несохранённые изменения"
+    },
+    "viewWorkspace": "Просмотреть рабочее пространство"
+  },
+  "workspaceAuth": {
+    "errors": {
+      "accessDenied": "У вас нет доступа к этому рабочему пространству",
+      "invalidFirebaseToken": "Ошибка аутентификации. Пожалуйста, попробуйте войти снова.",
+      "notAuthenticated": "Вы должны войти в систему, чтобы получить доступ к рабочим пространствам",
+      "tokenExchangeFailed": "Не удалось выполнить аутентификацию с рабочим пространством: {error}",
+      "workspaceNotFound": "Рабочее пространство не найдено"
+    }
+  },
+  "workspacePanel": {
+    "createWorkspaceDialog": {
+      "create": "Создать",
+      "message": "Рабочие пространства позволяют участникам использовать общий пул кредитов. После создания вы станете владельцем.",
+      "nameLabel": "Название рабочего пространства*",
+      "namePlaceholder": "Введите название рабочего пространства",
+      "title": "Создать новое рабочее пространство"
+    },
+    "dashboard": {
+      "placeholder": "Настройки рабочего пространства"
+    },
+    "deleteDialog": {
+      "message": "Все неиспользованные кредиты или несохранённые ресурсы будут потеряны. Это действие необратимо.",
+      "messageWithName": "Удалить «{name}»? Все неиспользованные кредиты или несохранённые ресурсы будут потеряны. Это действие необратимо.",
+      "title": "Удалить это рабочее пространство?"
+    },
+    "editWorkspaceDialog": {
+      "nameLabel": "Название рабочего пространства",
+      "save": "Сохранить",
+      "title": "Редактировать детали рабочего пространства"
+    },
+    "invite": "Пригласить",
+    "inviteLimitReached": "Достигнут лимит в 50 участников",
+    "inviteMember": "Пригласить участника",
+    "inviteMemberDialog": {
+      "createLink": "Создать ссылку",
+      "linkCopied": "Скопировано",
+      "linkCopyFailed": "Не удалось скопировать ссылку",
+      "linkStep": {
+        "copyLink": "Скопировать ссылку",
+        "done": "Готово",
+        "message": "Убедитесь, что его аккаунт использует этот email.",
+        "title": "Отправьте эту ссылку человеку"
+      },
+      "message": "Создайте ссылку-приглашение для отправки человеку",
+      "placeholder": "Введите email человека",
+      "title": "Пригласить человека в это рабочее пространство"
+    },
+    "inviteUpsellDialog": {
+      "messageNotSubscribed": "Чтобы добавить участников в это рабочее пространство, необходим тариф Creator или выше. Тариф Standard поддерживает только одно место (владельца).",
+      "messageSingleSeat": "Тариф Standard включает одно место для владельца рабочего пространства. Чтобы пригласить дополнительных участников, обновите тариф до Creator или выше для открытия нескольких мест.",
+      "titleNotSubscribed": "Для приглашения участников требуется подписка",
+      "titleSingleSeat": "Ваш текущий тариф поддерживает только одно место",
+      "upgradeToCreator": "Обновить до Creator",
+      "viewPlans": "Посмотреть тарифы"
+    },
+    "leaveDialog": {
+      "leave": "Покинуть",
+      "message": "Вы не сможете присоединиться снова, если не свяжетесь с владельцем рабочего пространства.",
+      "title": "Покинуть это рабочее пространство?"
+    },
+    "members": {
+      "actions": {
+        "copyLink": "Скопировать ссылку приглашения",
+        "removeMember": "Удалить участника",
+        "revokeInvite": "Отозвать приглашение"
+      },
+      "columns": {
+        "expiryDate": "Дата истечения",
+        "inviteDate": "Дата приглашения",
+        "joinDate": "Дата вступления"
+      },
+      "createNewWorkspace": "создайте новое.",
+      "membersCount": "{count}/50 участников",
+      "noInvites": "Нет ожидающих приглашений",
+      "noMembers": "Нет участников",
+      "pendingInvitesCount": "{count} ожидающее приглашение | {count} ожидающих приглашений",
+      "personalWorkspaceMessage": "Вы не можете приглашать других участников в ваше личное рабочее пространство. Чтобы добавить участников,",
+      "tabs": {
+        "active": "Активные",
+        "pendingCount": "Ожидают ({count})"
+      },
+      "upsellBannerSubscribe": "Оформите подписку на тариф Creator или выше, чтобы пригласить участников в это рабочее пространство.",
+      "upsellBannerUpgrade": "Обновите тариф до Creator или выше, чтобы пригласить дополнительных участников.",
+      "viewPlans": "Посмотреть тарифы"
+    },
+    "menu": {
+      "deleteWorkspace": "Удалить рабочее пространство",
+      "deleteWorkspaceDisabledTooltip": "Сначала отмените активную подписку рабочего пространства",
+      "editWorkspace": "Редактировать детали рабочего пространства",
+      "leaveWorkspace": "Покинуть рабочее пространство"
+    },
+    "removeMemberDialog": {
+      "error": "Не удалось удалить участника",
+      "message": "Этот участник будет удалён из вашего рабочего пространства. Использованные им кредиты не будут возвращены.",
+      "remove": "Удалить участника",
+      "success": "Участник удалён",
+      "title": "Удалить этого участника?"
+    },
+    "revokeInviteDialog": {
+      "message": "Этот человек больше не сможет присоединиться к вашему рабочему пространству. Его ссылка-приглашение будет аннулирована.",
+      "revoke": "Отозвать приглашение",
+      "title": "Отозвать приглашение?"
+    },
+    "tabs": {
+      "dashboard": "Панель управления",
+      "membersCount": "Участники ({count})",
+      "planCredits": "Тариф и кредиты"
+    },
+    "toast": {
+      "failedToCreateWorkspace": "Не удалось создать рабочее пространство",
+      "failedToDeleteWorkspace": "Не удалось удалить рабочее пространство",
+      "failedToFetchWorkspaces": "Не удалось загрузить рабочие пространства",
+      "failedToLeaveWorkspace": "Не удалось покинуть рабочее пространство",
+      "failedToUpdateWorkspace": "Не удалось обновить рабочее пространство",
+      "workspaceCreated": {
+        "message": "Оформите подписку, пригласите коллег и начните совместную работу.",
+        "subscribe": "Оформить подписку",
+        "title": "Рабочее пространство создано"
+      },
+      "workspaceDeleted": {
+        "message": "Рабочее пространство было безвозвратно удалено.",
+        "title": "Рабочее пространство удалено"
+      },
+      "workspaceLeft": {
+        "message": "Вы вышли из рабочего пространства.",
+        "title": "Вы покинули рабочее пространство"
+      },
+      "workspaceUpdated": {
+        "message": "Детали рабочего пространства сохранены.",
+        "title": "Рабочее пространство обновлено"
+      }
+    }
+  },
+  "workspaceSwitcher": {
+    "createWorkspace": "Создать новое рабочее пространство",
+    "maxWorkspacesReached": "Вы можете владеть только 10 рабочими пространствами. Удалите одно, чтобы создать новое.",
+    "personal": "Личное",
+    "roleMember": "Участник",
+    "roleOwner": "Владелец",
+    "subscribe": "Оформить подписку",
+    "switchWorkspace": "Сменить рабочее пространство"
   },
   "zoomControls": {
     "hideMinimap": "Скрыть миникарту",
diff --git a/src/locales/ru/nodeDefs.json b/src/locales/ru/nodeDefs.json
index f5b98221d5..19806799ee 100644
--- a/src/locales/ru/nodeDefs.json
+++ b/src/locales/ru/nodeDefs.json
@@ -39,6 +39,87 @@
       "sigmas": {
         "name": "сигмы"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "AddTextPrefix": {
+    "display_name": "Добавить префикс к тексту",
+    "inputs": {
+      "prefix": {
+        "name": "префикс",
+        "tooltip": "Префикс для добавления."
+      },
+      "texts": {
+        "name": "тексты",
+        "tooltip": "Текст для обработки."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "тексты",
+        "tooltip": "Обработанные тексты"
+      }
+    }
+  },
+  "AddTextSuffix": {
+    "display_name": "Добавить суффикс к тексту",
+    "inputs": {
+      "suffix": {
+        "name": "суффикс",
+        "tooltip": "Суффикс для добавления."
+      },
+      "texts": {
+        "name": "тексты",
+        "tooltip": "Текст для обработки."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "тексты",
+        "tooltip": "Обработанные тексты"
+      }
+    }
+  },
+  "AdjustBrightness": {
+    "display_name": "Регулировка яркости",
+    "inputs": {
+      "factor": {
+        "name": "коэффициент",
+        "tooltip": "Коэффициент яркости. 1.0 = без изменений, <1.0 = темнее, >1.0 = ярче."
+      },
+      "images": {
+        "name": "изображения",
+        "tooltip": "Изображение для обработки."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "изображения",
+        "tooltip": "Обработанные изображения"
+      }
+    }
+  },
+  "AdjustContrast": {
+    "display_name": "Регулировка контрастности",
+    "inputs": {
+      "factor": {
+        "name": "коэффициент",
+        "tooltip": "Коэффициент контрастности. 1.0 = без изменений, <1.0 = меньше контраст, >1.0 = больше контраст."
+      },
+      "images": {
+        "name": "изображения",
+        "tooltip": "Изображение для обработки."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "изображения",
+        "tooltip": "Обработанные изображения"
+      }
     }
   },
   "AlignYourStepsScheduler": {
@@ -70,6 +151,11 @@
         "name": "громкость",
         "tooltip": "Корректировка громкости в децибелах (дБ). 0 = без изменений, +6 = удвоение, -6 = половина и т.д."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "AudioConcat": {
@@ -86,6 +172,11 @@
         "name": "направление",
         "tooltip": "Добавлять audio2 после или перед audio1."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "AudioEncoderEncode": {
@@ -117,6 +208,47 @@
       }
     }
   },
+  "AudioEqualizer3Band": {
+    "display_name": "Эквалайзер (3-полосный)",
+    "inputs": {
+      "audio": {
+        "name": "аудио"
+      },
+      "high_freq": {
+        "name": "высокая_частота",
+        "tooltip": "Частота среза для высоких частот"
+      },
+      "high_gain_dB": {
+        "name": "усиление_высоких_dB",
+        "tooltip": "Усиление высоких частот (требл)"
+      },
+      "low_freq": {
+        "name": "низкая_частота",
+        "tooltip": "Частота среза для низких частот"
+      },
+      "low_gain_dB": {
+        "name": "усиление_низких_dB",
+        "tooltip": "Усиление низких частот (бас)"
+      },
+      "mid_freq": {
+        "name": "средняя_частота",
+        "tooltip": "Центральная частота для средних"
+      },
+      "mid_gain_dB": {
+        "name": "усиление_средних_dB",
+        "tooltip": "Усиление средних частот"
+      },
+      "mid_q": {
+        "name": "средний_q",
+        "tooltip": "Q-фактор (полоса пропускания) для средних"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "AudioMerge": {
     "description": "Объединить две аудиодорожки путем наложения их волновых форм.",
     "display_name": "Аудио - Слияние",
@@ -131,6 +263,11 @@
         "name": "метод_слияния",
         "tooltip": "Метод, используемый для объединения аудиоволн."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "BasicGuider": {
@@ -142,6 +279,11 @@
       "model": {
         "name": "модель"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "BasicScheduler": {
@@ -159,6 +301,50 @@
       "steps": {
         "name": "шаги"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchImagesNode": {
+    "display_name": "Пакет изображений",
+    "inputs": {
+      "images": {
+        "name": "изображения"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchLatentsNode": {
+    "display_name": "Пакет латентных",
+    "inputs": {
+      "latents": {
+        "name": "латентные"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchMasksNode": {
+    "display_name": "Пакет масок",
+    "inputs": {
+      "masks": {
+        "name": "маски"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "BetaSamplingScheduler": {
@@ -176,6 +362,114 @@
       "steps": {
         "name": "шаги"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BriaImageEditNode": {
+    "description": "Редактирование изображений с помощью новейшей модели Bria",
+    "display_name": "Bria Image Edit",
+    "inputs": {
+      "control_after_generate": {
+        "name": "контроль после генерации"
+      },
+      "guidance_scale": {
+        "name": "guidance_scale",
+        "tooltip": "Большее значение заставляет изображение точнее следовать промпту."
+      },
+      "image": {
+        "name": "изображение"
+      },
+      "mask": {
+        "name": "маска",
+        "tooltip": "Если не указано, редактирование применяется ко всему изображению."
+      },
+      "model": {
+        "name": "model"
+      },
+      "moderation": {
+        "name": "модерация",
+        "tooltip": "Настройки модерации"
+      },
+      "negative_prompt": {
+        "name": "негативный_промпт"
+      },
+      "prompt": {
+        "name": "промпт",
+        "tooltip": "Инструкция для редактирования изображения"
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "steps": {
+        "name": "шаги"
+      },
+      "structured_prompt": {
+        "name": "структурированный_промпт",
+        "tooltip": "Строка, содержащая структурированный промпт для редактирования в формате JSON. Используйте вместо обычного промпта для точного, программного управления."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "структурированный_промпт",
+        "tooltip": null
+      }
+    }
+  },
+  "BriaRemoveImageBackground": {
+    "description": "Удалите фон с изображения с помощью Bria RMBG 2.0.",
+    "display_name": "Bria Удалить фон изображения",
+    "inputs": {
+      "control_after_generate": {
+        "name": "контроль после генерации"
+      },
+      "image": {
+        "name": "изображение"
+      },
+      "moderation": {
+        "name": "модерация",
+        "tooltip": "Настройки модерации"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed определяет, должен ли узел выполняться повторно; результаты всегда недетерминированы независимо от seed."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BriaRemoveVideoBackground": {
+    "description": "Удалите фон с видео с помощью Bria.",
+    "display_name": "Bria Удалить фон видео",
+    "inputs": {
+      "background_color": {
+        "name": "цвет фона",
+        "tooltip": "Цвет фона для выходного видео."
+      },
+      "control_after_generate": {
+        "name": "контроль после генерации"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed определяет, должен ли узел выполняться повторно; результаты всегда недетерминированы независимо от seed."
+      },
+      "video": {
+        "name": "видео"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ByteDanceFirstLastFrameNode": {
@@ -201,6 +495,10 @@
         "name": "first_frame",
         "tooltip": "Первый кадр, который будет использоваться для видео."
       },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "Этот параметр игнорируется для всех моделей, кроме seedance-1-5-pro."
+      },
       "last_frame": {
         "name": "last_frame",
         "tooltip": "Последний кадр, который будет использоваться для видео."
@@ -231,43 +529,6 @@
       }
     }
   },
-  "ByteDanceImageEditNode": {
-    "description": "Редактирование изображений с использованием моделей ByteDance через API на основе промпта",
-    "display_name": "Редактирование изображений ByteDance",
-    "inputs": {
-      "control_after_generate": {
-        "name": "control after generate"
-      },
-      "guidance_scale": {
-        "name": "guidance_scale",
-        "tooltip": "Более высокое значение заставляет изображение точнее следовать промпту"
-      },
-      "image": {
-        "name": "image",
-        "tooltip": "Базовое изображение для редактирования"
-      },
-      "model": {
-        "name": "model"
-      },
-      "prompt": {
-        "name": "prompt",
-        "tooltip": "Инструкция для редактирования изображения"
-      },
-      "seed": {
-        "name": "seed",
-        "tooltip": "Сид для использования при генерации"
-      },
-      "watermark": {
-        "name": "watermark",
-        "tooltip": "Добавлять ли водяной знак \"Сгенерировано ИИ\" на изображение"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
   "ByteDanceImageNode": {
     "description": "Генерация изображений с использованием моделей ByteDance через API на основе промпта",
     "display_name": "Изображение ByteDance",
@@ -377,6 +638,10 @@
         "name": "duration",
         "tooltip": "Продолжительность видео в секундах."
       },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "Этот параметр игнорируется для всех моделей, кроме seedance-1-5-pro."
+      },
       "image": {
         "name": "image",
         "tooltip": "Первый кадр, который будет использоваться для видео."
@@ -431,8 +696,7 @@
         "tooltip": "Максимальное количество изображений для генерации при sequential_image_generation='auto'. Общее количество изображений (входные + сгенерированные) не может превышать 15."
       },
       "model": {
-        "name": "model",
-        "tooltip": "Название модели"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
@@ -484,6 +748,10 @@
         "name": "длительность",
         "tooltip": "Длительность выходного видео в секундах."
       },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "Этот параметр игнорируется для всех моделей, кроме seedance-1-5-pro."
+      },
       "model": {
         "name": "модель"
       },
@@ -525,6 +793,11 @@
       "positive": {
         "name": "положительный"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "CFGNorm": {
@@ -763,6 +1036,25 @@
       }
     }
   },
+  "CLIPTextEncodeKandinsky5": {
+    "display_name": "CLIPTextEncodeKandinsky5",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "clip_l": {
+        "name": "clip_l"
+      },
+      "qwen25_7b": {
+        "name": "qwen25_7b"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "CLIPTextEncodeLumina2": {
     "description": "Кодирует системный запрос и запрос пользователя с помощью модели CLIP во встраиваемый элемент, который можно использовать для направления модели диффузии на генерацию конкретных изображений.",
     "display_name": "CLIP Text Encode для Lumina2",
@@ -953,6 +1245,29 @@
       }
     }
   },
+  "CenterCropImages": {
+    "display_name": "Обрезка по центру",
+    "inputs": {
+      "height": {
+        "name": "высота",
+        "tooltip": "Высота обрезки."
+      },
+      "images": {
+        "name": "изображения",
+        "tooltip": "Изображение для обработки."
+      },
+      "width": {
+        "name": "ширина",
+        "tooltip": "Ширина обрезки."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "изображения",
+        "tooltip": "Обработанные изображения"
+      }
+    }
+  },
   "CheckpointLoader": {
     "display_name": "Загрузить сheckpoint с конфигурацией (УСТАРЕЛО)",
     "inputs": {
@@ -1032,6 +1347,21 @@
       }
     }
   },
+  "ColorToRGBInt": {
+    "description": "Преобразовать цвет в целочисленное значение RGB.",
+    "display_name": "Преобразование цвета в RGB Int",
+    "inputs": {
+      "color": {
+        "name": "цвет"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "rgb_int",
+        "tooltip": null
+      }
+    }
+  },
   "CombineHooks2": {
     "display_name": "Объединить хуки [2]",
     "inputs": {
@@ -1089,6 +1419,26 @@
       }
     }
   },
+  "ComfySwitchNode": {
+    "display_name": "Переключатель",
+    "inputs": {
+      "on_false": {
+        "name": "если_ложь"
+      },
+      "on_true": {
+        "name": "если_истина"
+      },
+      "switch": {
+        "name": "переключатель"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "выход",
+        "tooltip": null
+      }
+    }
+  },
   "ConditioningAverage": {
     "display_name": "Среднее кондиционирование",
     "inputs": {
@@ -1323,10 +1673,12 @@
     },
     "outputs": {
       "0": {
-        "name": "положительный"
+        "name": "положительный",
+        "tooltip": null
       },
       "1": {
-        "name": "отрицательный"
+        "name": "отрицательный",
+        "tooltip": null
       }
     }
   },
@@ -1385,6 +1737,10 @@
         "name": "измерение",
         "tooltip": "Измерение, к которому применяются контекстные окна."
       },
+      "freenoise": {
+        "name": "свободный_шум",
+        "tooltip": "Применять ли перемешивание шума FreeNoise, улучшает смешивание окон."
+      },
       "fuse_method": {
         "name": "метод_объединения",
         "tooltip": "Метод объединения контекстных окон."
@@ -1745,6 +2101,20 @@
       }
     }
   },
+  "CreateList": {
+    "display_name": "Создать список",
+    "inputs": {
+      "inputs": {
+        "name": "входные данные"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "список",
+        "tooltip": null
+      }
+    }
+  },
   "CreateVideo": {
     "description": "Создайте видео из изображений.",
     "display_name": "Создать видео",
@@ -1767,6 +2137,35 @@
       }
     }
   },
+  "CropByBBoxes": {
+    "description": "Обрезать и изменить размер областей из входного пакета изображений на основе предоставленных ограничивающих рамок.",
+    "display_name": "CropByBBoxes",
+    "inputs": {
+      "bboxes": {
+        "name": "bboxes"
+      },
+      "image": {
+        "name": "image"
+      },
+      "output_height": {
+        "name": "output_height",
+        "tooltip": "Высота, до которой изменяется каждый обрезанный фрагмент."
+      },
+      "output_width": {
+        "name": "output_width",
+        "tooltip": "Ширина, до которой изменяется каждый обрезанный фрагмент."
+      },
+      "padding": {
+        "name": "padding",
+        "tooltip": "Дополнительный отступ в пикселях, добавляемый с каждой стороны ограничивающей рамки перед обрезкой."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "Все обрезанные фрагменты объединены в один пакет изображений."
+      }
+    }
+  },
   "CropMask": {
     "display_name": "Обрезать маску",
     "inputs": {
@@ -1785,6 +2184,30 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CustomCombo": {
+    "display_name": "Пользовательская комбинация",
+    "inputs": {
+      "choice": {
+        "name": "выбор"
+      },
+      "index": {},
+      "option1": {}
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "ИНДЕКС",
+        "tooltip": null
+      }
     }
   },
   "DiffControlNetLoader": {
@@ -1823,7 +2246,12 @@
     }
   },
   "DisableNoise": {
-    "display_name": "Отключить шум"
+    "display_name": "Отключить шум",
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
   },
   "DualCFGGuider": {
     "display_name": "Двойной CFG Гид",
@@ -1849,6 +2277,11 @@
       "style": {
         "name": "стиль"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "DualCLIPLoader": {
@@ -1900,6 +2333,321 @@
       }
     }
   },
+  "ElevenLabsAudioIsolation": {
+    "description": "Удаляет фоновый шум из аудио, изолируя вокал или речь.",
+    "display_name": "ElevenLabs Voice Isolation",
+    "inputs": {
+      "audio": {
+        "name": "аудио",
+        "tooltip": "Аудио для обработки и удаления фонового шума."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsInstantVoiceClone": {
+    "description": "Создайте клон голоса на основе аудиосэмплов. Предоставьте 1-8 аудиозаписей голоса для клонирования.",
+    "display_name": "ElevenLabs Instant Voice Clone",
+    "inputs": {
+      "files": {
+        "name": "файлы",
+        "tooltip": "Аудиозаписи для клонирования голоса."
+      },
+      "remove_background_noise": {
+        "name": "удалить_фоновый_шум",
+        "tooltip": "Удалить фоновый шум из голосовых сэмплов с помощью изоляции аудио."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "голос",
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsSpeechToSpeech": {
+    "description": "Преобразуйте речь из одного голоса в другой, сохраняя оригинальное содержание и эмоции.",
+    "display_name": "ElevenLabs Speech to Speech",
+    "inputs": {
+      "audio": {
+        "name": "аудио",
+        "tooltip": "Исходное аудио для преобразования."
+      },
+      "control_after_generate": {
+        "name": "контроль после генерации"
+      },
+      "model": {
+        "name": "модель",
+        "tooltip": "Модель для преобразования речи в речь."
+      },
+      "model_similarity_boost": {
+        "name": "повышение_сходства"
+      },
+      "model_speed": {
+        "name": "скорость"
+      },
+      "model_style": {
+        "name": "стиль"
+      },
+      "model_use_speaker_boost": {
+        "name": "использовать_усиление_голоса"
+      },
+      "output_format": {
+        "name": "формат_выхода",
+        "tooltip": "Формат выходного аудио."
+      },
+      "remove_background_noise": {
+        "name": "удалить_фоновый_шум",
+        "tooltip": "Удалить фоновый шум из входного аудио с помощью изоляции аудио."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed для воспроизводимости."
+      },
+      "stability": {
+        "name": "стабильность",
+        "tooltip": "Стабильность голоса. Низкие значения дают более широкий эмоциональный диапазон, высокие значения обеспечивают более последовательную, но возможно монотонную речь."
+      },
+      "voice": {
+        "name": "голос",
+        "tooltip": "Целевой голос для преобразования. Подключите из Voice Selector или Instant Voice Clone."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsSpeechToText": {
+    "description": "Преобразование аудио в текст. Поддерживает автоматическое определение языка, диаризацию по говорящим и тегирование аудио событий.",
+    "display_name": "ElevenLabs Распознавание речи",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "Аудио для расшифровки."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "language_code": {
+        "name": "language_code",
+        "tooltip": "Код языка по ISO-639-1 или ISO-639-3 (например, 'en', 'es', 'fra'). Оставьте пустым для автоматического определения."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Модель для расшифровки."
+      },
+      "model_diarization_threshold": {
+        "name": "diarization_threshold"
+      },
+      "model_diarize": {
+        "name": "diarize"
+      },
+      "model_tag_audio_events": {
+        "name": "tag_audio_events"
+      },
+      "model_temperature": {
+        "name": "temperature"
+      },
+      "model_timestamps_granularity": {
+        "name": "timestamps_granularity"
+      },
+      "num_speakers": {
+        "name": "num_speakers",
+        "tooltip": "Максимальное количество говорящих для распознавания. Установите 0 для автоматического определения."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Зерно для воспроизводимости (детерминированность не гарантируется)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "text",
+        "tooltip": null
+      },
+      "1": {
+        "name": "language_code",
+        "tooltip": null
+      },
+      "2": {
+        "name": "words_json",
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToDialogue": {
+    "description": "Генерация диалога с несколькими говорящими на основе текста. Каждая реплика имеет свой текст и голос.",
+    "display_name": "ElevenLabs Текст в диалог",
+    "inputs": {
+      "apply_text_normalization": {
+        "name": "apply_text_normalization",
+        "tooltip": "Режим нормализации текста. 'auto' — система выбирает автоматически, 'on' — всегда применять нормализацию, 'off' — не применять."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "inputs": {
+        "name": "inputs",
+        "tooltip": "Количество реплик в диалоге."
+      },
+      "inputs_text1": {
+        "name": "text1"
+      },
+      "language_code": {
+        "name": "language_code",
+        "tooltip": "Код языка по ISO-639-1 или ISO-639-3 (например, 'en', 'es', 'fra'). Оставьте пустым для автоматического определения."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Модель для генерации диалога."
+      },
+      "output_format": {
+        "name": "output_format",
+        "tooltip": "Формат аудиовыхода."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Зерно для воспроизводимости."
+      },
+      "stability": {
+        "name": "stability",
+        "tooltip": "Стабильность голоса. Низкие значения дают более широкий эмоциональный диапазон, высокие — более стабильную, но возможно монотонную речь."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToSoundEffects": {
+    "description": "Генерация звуковых эффектов по текстовому описанию.",
+    "display_name": "ElevenLabs Текст в звуковые эффекты",
+    "inputs": {
+      "model": {
+        "name": "model",
+        "tooltip": "Модель для генерации звукового эффекта."
+      },
+      "model_duration": {
+        "name": "duration"
+      },
+      "model_loop": {
+        "name": "loop"
+      },
+      "model_prompt_influence": {
+        "name": "prompt_influence"
+      },
+      "output_format": {
+        "name": "output_format",
+        "tooltip": "Формат аудиовыхода."
+      },
+      "text": {
+        "name": "text",
+        "tooltip": "Текстовое описание звукового эффекта для генерации."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToSpeech": {
+    "description": "Преобразование текста в речь.",
+    "display_name": "ElevenLabs Text to Speech",
+    "inputs": {
+      "apply_text_normalization": {
+        "name": "apply_text_normalization",
+        "tooltip": "Режим нормализации текста. 'auto' — система выбирает автоматически, 'on' — всегда применять нормализацию, 'off' — не применять."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "language_code": {
+        "name": "language_code",
+        "tooltip": "Код языка по ISO-639-1 или ISO-639-3 (например, 'en', 'es', 'fra'). Оставьте пустым для автоматического определения."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Модель для преобразования текста в речь."
+      },
+      "model_similarity_boost": {
+        "name": "similarity_boost"
+      },
+      "model_speed": {
+        "name": "speed"
+      },
+      "model_style": {
+        "name": "style"
+      },
+      "model_use_speaker_boost": {
+        "name": "use_speaker_boost"
+      },
+      "output_format": {
+        "name": "output_format",
+        "tooltip": "Формат аудиовыхода."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed для воспроизводимости (детерминированность не гарантируется)."
+      },
+      "stability": {
+        "name": "stability",
+        "tooltip": "Стабильность голоса. Низкие значения дают более широкий эмоциональный диапазон, высокие значения обеспечивают более стабильную, но потенциально монотонную речь."
+      },
+      "text": {
+        "name": "text",
+        "tooltip": "Текст для преобразования в речь."
+      },
+      "voice": {
+        "name": "voice",
+        "tooltip": "Голос для синтеза речи. Подключите из Voice Selector или Instant Voice Clone."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsVoiceSelector": {
+    "description": "Выбор предустановленного голоса ElevenLabs для генерации речи.",
+    "display_name": "ElevenLabs Voice Selector",
+    "inputs": {
+      "voice": {
+        "name": "voice",
+        "tooltip": "Выберите голос из предустановленных голосов ElevenLabs."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "voice",
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyAceStep1_5LatentAudio": {
+    "display_name": "Empty Ace Step 1.5 Latent Audio",
+    "inputs": {
+      "batch_size": {
+        "name": "размер_пакета",
+        "tooltip": "Количество латентных изображений в пакете."
+      },
+      "seconds": {
+        "name": "секунды"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyAceStepLatentAudio": {
     "display_name": "EmptyAceStepLatentAudio",
     "inputs": {
@@ -1932,6 +2680,11 @@
         "name": "частота_дискретизации",
         "tooltip": "Частота дискретизации пустого аудиоклипа."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "EmptyChromaRadianceLatentImage": {
@@ -1975,6 +2728,25 @@
       }
     }
   },
+  "EmptyFlux2LatentImage": {
+    "display_name": "Пустой Flux 2 latent",
+    "inputs": {
+      "batch_size": {
+        "name": "размер_пакета"
+      },
+      "height": {
+        "name": "высота"
+      },
+      "width": {
+        "name": "ширина"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyHunyuanImageLatent": {
     "display_name": "EmptyHunyuanImageLatent",
     "inputs": {
@@ -2016,6 +2788,28 @@
       }
     }
   },
+  "EmptyHunyuanVideo15Latent": {
+    "display_name": "Пустой HunyuanVideo 1.5 latent",
+    "inputs": {
+      "batch_size": {
+        "name": "размер_пакета"
+      },
+      "height": {
+        "name": "высота"
+      },
+      "length": {
+        "name": "длина"
+      },
+      "width": {
+        "name": "ширина"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyImage": {
     "display_name": "Пустое изображение",
     "inputs": {
@@ -2065,6 +2859,11 @@
       "seconds": {
         "name": "секунды"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "EmptyLatentHunyuan3Dv2": {
@@ -2077,6 +2876,11 @@
       "resolution": {
         "name": "разрешение"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "EmptyLatentImage": {
@@ -2124,6 +2928,28 @@
       }
     }
   },
+  "EmptyQwenImageLayeredLatentImage": {
+    "display_name": "Пустой Qwen Image Layered latent",
+    "inputs": {
+      "batch_size": {
+        "name": "размер_пакета"
+      },
+      "height": {
+        "name": "высота"
+      },
+      "layers": {
+        "name": "слои"
+      },
+      "width": {
+        "name": "ширина"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptySD3LatentImage": {
     "display_name": "Пустой SD3LatentImage",
     "inputs": {
@@ -2171,6 +2997,11 @@
       "steps": {
         "name": "шаги"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ExtendIntermediateSigmas": {
@@ -2191,6 +3022,11 @@
       "steps": {
         "name": "шаги"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FeatherMask": {
@@ -2211,6 +3047,11 @@
       "top": {
         "name": "сверху"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FlipSigmas": {
@@ -2219,6 +3060,102 @@
       "sigmas": {
         "name": "sigmas"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Flux2MaxImageNode": {
+    "description": "Генерирует изображения синхронно на основе запроса и разрешения.",
+    "display_name": "Flux.2 [max] Image",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "height": {
+        "name": "height"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "До 9 изображений, которые могут быть использованы в качестве референсов."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Запрос для генерации или редактирования изображения"
+      },
+      "prompt_upsampling": {
+        "name": "prompt_upsampling",
+        "tooltip": "Выполнять ли апсемплинг запроса. Если включено, автоматически модифицирует запрос для более креативной генерации."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Случайное зерно, используемое для создания шума."
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Flux2ProImageNode": {
+    "description": "Генерирует изображения синхронно на основе запроса и разрешения.",
+    "display_name": "Flux.2 [pro] Image",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "height": {
+        "name": "height"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "До 9 изображений, которые могут быть использованы в качестве референсов."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Запрос для генерации или редактирования изображения"
+      },
+      "prompt_upsampling": {
+        "name": "prompt_upsampling",
+        "tooltip": "Выполнять ли апсемплинг запроса. Если включено, автоматически модифицирует запрос для более креативной генерации."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Случайное зерно, используемое для создания шума."
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Flux2Scheduler": {
+    "display_name": "Flux2Scheduler",
+    "inputs": {
+      "height": {
+        "name": "height"
+      },
+      "steps": {
+        "name": "steps"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FluxDisableGuidance": {
@@ -2541,6 +3478,11 @@
       "s2": {
         "name": "s2"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FreeU_V2": {
@@ -2561,6 +3503,11 @@
       "s2": {
         "name": "s2"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "GITSScheduler": {
@@ -2619,6 +3566,102 @@
       }
     }
   },
+  "GLSLShader": {
+    "description": "Применяет фрагментные шейдеры GLSL ES к изображениям. u_resolution (vec2) всегда доступен.",
+    "display_name": "GLSL Shader",
+    "inputs": {
+      "floats": {
+        "name": "floats",
+        "tooltip": "Числа с плавающей точкой доступны как u_float0-4 в коде шейдера"
+      },
+      "fragment_shader": {
+        "name": "fragment_shader",
+        "tooltip": "Исходный код фрагментного шейдера GLSL (совместим с GLSL ES 3.00 / WebGL 2.0)"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Изображения доступны как u_image0-4 (sampler2D) в коде шейдера"
+      },
+      "ints": {
+        "name": "ints",
+        "tooltip": "Целые числа доступны как u_int0-4 в коде шейдера"
+      },
+      "size_mode": {
+        "name": "size_mode",
+        "tooltip": "Размер вывода: 'from_input' использует размеры первого входного изображения, 'custom' позволяет задать размер вручную"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "IMAGE0",
+        "tooltip": "Доступно через layout(location = 0) out vec4 fragColor0 в коде шейдера"
+      },
+      "1": {
+        "name": "IMAGE1",
+        "tooltip": "Доступно через layout(location = 1) out vec4 fragColor1 в коде шейдера"
+      },
+      "2": {
+        "name": "IMAGE2",
+        "tooltip": "Доступно через layout(location = 2) out vec4 fragColor2 в коде шейдера"
+      },
+      "3": {
+        "name": "IMAGE3",
+        "tooltip": "Доступно через layout(location = 3) out vec4 fragColor3 в коде шейдера"
+      }
+    }
+  },
+  "GeminiImage2Node": {
+    "description": "Генерируйте или редактируйте изображения синхронно через Google Vertex API.",
+    "display_name": "Nano Banana Pro (Google Gemini Image)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "Если установлено значение 'auto', используется соотношение сторон вашего входного изображения; если изображение не предоставлено, обычно генерируется квадрат 16:9."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "files": {
+        "name": "files",
+        "tooltip": "Необязательные файлы для использования в качестве контекста для модели. Принимает входные данные от узла Gemini Generate Content Input Files."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Необязательное(ые) референсное(ые) изображение(я). Для добавления нескольких изображений используйте узел Batch Images (до 14)."
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Текстовый запрос, описывающий изображение для генерации или редактирования. Укажите любые ограничения, стили или детали, которым должна следовать модель."
+      },
+      "resolution": {
+        "name": "resolution",
+        "tooltip": "Целевое разрешение вывода. Для 2K/4K используется собственный Gemini upscaler."
+      },
+      "response_modalities": {
+        "name": "response_modalities",
+        "tooltip": "Выберите 'IMAGE' для вывода только изображения или 'IMAGE+TEXT', чтобы получить как сгенерированное изображение, так и текстовый ответ."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Когда seed зафиксирован на определённом значении, модель старается выдавать одинаковый ответ при повторных запросах. Детерминированный результат не гарантируется. Также изменение модели или параметров, таких как температура, может привести к различиям в ответе даже при одинаковом seed. По умолчанию используется случайное значение seed."
+      },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "Базовые инструкции, определяющие поведение ИИ."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "GeminiImageNode": {
     "description": "Редактировать изображения синхронно через Google API.",
     "display_name": "Google Gemini Image",
@@ -2646,9 +3689,17 @@
         "name": "prompt",
         "tooltip": "Текстовый промпт для генерации"
       },
+      "response_modalities": {
+        "name": "response_modalities",
+        "tooltip": "Выберите 'IMAGE' для вывода только изображения или 'IMAGE+TEXT', чтобы получить как сгенерированное изображение, так и текстовый ответ."
+      },
       "seed": {
         "name": "seed",
         "tooltip": "Когда сид зафиксирован на определённом значении, модель прилагает все усилия, чтобы предоставить одинаковый ответ при повторных запросах. Детерминированный вывод не гарантируется. Также изменение модели или параметров, таких как температура, может вызвать вариации в ответе даже при использовании того же значения сида. По умолчанию используется случайное значение сида."
+      },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "Базовые инструкции, определяющие поведение ИИ."
       }
     },
     "outputs": {
@@ -2679,6 +3730,60 @@
       }
     }
   },
+  "GeminiNanoBanana2": {
+    "description": "Генерируйте или редактируйте изображения синхронно через Google Vertex API.",
+    "display_name": "Nano Banana 2",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "Если установлено значение 'auto', используется соотношение сторон вашего входного изображения; если изображение не предоставлено, обычно генерируется квадрат 16:9."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "files": {
+        "name": "files",
+        "tooltip": "Необязательные файлы для использования в качестве контекста для модели. Принимает входные данные из узла Gemini Generate Content Input Files."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Необязательное изображение(я) для ссылки. Чтобы добавить несколько изображений, используйте узел Batch Images (до 14)."
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Текстовый запрос, описывающий изображение для генерации или редактирования. Укажите любые ограничения, стили или детали, которым должна следовать модель."
+      },
+      "resolution": {
+        "name": "resolution",
+        "tooltip": "Целевое разрешение вывода. Для 2K/4K используется собственный Gemini upscaler."
+      },
+      "response_modalities": {
+        "name": "response_modalities"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Когда seed фиксирован на определённом значении, модель старается выдавать одинаковый результат при повторных запросах. Детерминированный результат не гарантируется. Также изменение модели или параметров, например, температуры, может привести к различиям в ответе даже при одинаковом seed. По умолчанию используется случайное значение seed."
+      },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "Базовые инструкции, определяющие поведение ИИ."
+      },
+      "thinking_level": {
+        "name": "thinking_level"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "GeminiNode": {
     "description": "Генерируйте текстовые ответы с помощью модели ИИ Google Gemini. Вы можете предоставить несколько типов входных данных (текст, изображения, аудио, видео) в качестве контекста для генерации более релевантных и осмысленных ответов.",
     "display_name": "Google Gemini",
@@ -2710,6 +3815,10 @@
         "name": "сид",
         "tooltip": "Когда сид зафиксирован на определённом значении, модель прилагает все усилия, чтобы предоставить одинаковый ответ для повторных запросов. Детерминированный вывод не гарантируется. Также изменение модели или параметров, таких как температура, может вызвать вариации в ответе даже при использовании того же значения сида. По умолчанию используется случайное значение сида."
       },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "Базовые инструкции, определяющие поведение ИИ."
+      },
       "video": {
         "name": "видео",
         "tooltip": "Необязательное видео для использования в качестве контекста для модели."
@@ -2721,6 +3830,72 @@
       }
     }
   },
+  "GenerateTracks": {
+    "display_name": "GenerateTracks",
+    "inputs": {
+      "bezier": {
+        "name": "bezier",
+        "tooltip": "Включить путь по кривой Безье, используя среднюю точку как управляющую."
+      },
+      "end_x": {
+        "name": "end_x",
+        "tooltip": "Нормализованная X-координата (0-1) для конечной позиции."
+      },
+      "end_y": {
+        "name": "end_y",
+        "tooltip": "Нормализованная Y-координата (0-1) для конечной позиции."
+      },
+      "height": {
+        "name": "height"
+      },
+      "interpolation": {
+        "name": "interpolation",
+        "tooltip": "Управляет таймингом/скоростью движения вдоль пути."
+      },
+      "mid_x": {
+        "name": "mid_x",
+        "tooltip": "Нормализованная X-координата управляющей точки для кривой Безье. Используется только при включённом 'bezier'."
+      },
+      "mid_y": {
+        "name": "mid_y",
+        "tooltip": "Нормализованная Y-координата управляющей точки для кривой Безье. Используется только при включённом 'bezier'."
+      },
+      "num_frames": {
+        "name": "num_frames"
+      },
+      "num_tracks": {
+        "name": "num_tracks"
+      },
+      "start_x": {
+        "name": "start_x",
+        "tooltip": "Нормализованная X-координата (0-1) для начальной позиции."
+      },
+      "start_y": {
+        "name": "start_y",
+        "tooltip": "Нормализованная Y-координата (0-1) для начальной позиции."
+      },
+      "track_mask": {
+        "name": "track_mask",
+        "tooltip": "Необязательная маска для указания видимых кадров."
+      },
+      "track_spread": {
+        "name": "track_spread",
+        "tooltip": "Нормализованное расстояние между треками. Треки распределяются перпендикулярно направлению движения."
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "track_length",
+        "tooltip": null
+      }
+    }
+  },
   "GetImageSize": {
     "description": "Возвращает ширину и высоту изображения и передаёт его без изменений.",
     "display_name": "Получить размер изображения",
@@ -2731,13 +3906,16 @@
     },
     "outputs": {
       "0": {
-        "name": "ширина"
+        "name": "width",
+        "tooltip": null
       },
       "1": {
-        "name": "высота"
+        "name": "height",
+        "tooltip": null
       },
       "2": {
-        "name": "размер_пакета"
+        "name": "batch_size",
+        "tooltip": null
       }
     }
   },
@@ -2765,6 +3943,149 @@
       }
     }
   },
+  "GrokImageEditNode": {
+    "description": "Изменить существующее изображение на основе текстового запроса",
+    "display_name": "Grok Image Edit",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "соотношение сторон",
+        "tooltip": "Разрешено только при подключении нескольких изображений к входу изображения."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "number_of_images": {
+        "name": "number_of_images",
+        "tooltip": "Количество редактируемых изображений для генерации"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Текстовый запрос, используемый для генерации изображения"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Сид для определения необходимости повторного запуска узла; фактические результаты недетерминированы независимо от сида."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokImageNode": {
+    "description": "Генерировать изображения с помощью Grok на основе текстового запроса",
+    "display_name": "Grok Image",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "number_of_images": {
+        "name": "number_of_images",
+        "tooltip": "Количество изображений для генерации"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Текстовый запрос, используемый для генерации изображения"
+      },
+      "resolution": {
+        "name": "разрешение"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Сид для определения необходимости повторного запуска узла; фактические результаты недетерминированы независимо от сида."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokVideoEditNode": {
+    "description": "Редактировать существующее видео на основе текстового запроса.",
+    "display_name": "Grok Video Edit",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Текстовое описание желаемого видео."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Сид для определения необходимости повторного запуска узла; фактические результаты недетерминированы независимо от сида."
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "Максимальная поддерживаемая длительность — 8,7 секунд и размер файла 50 МБ."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokVideoNode": {
+    "description": "Генерировать видео по запросу или изображению",
+    "display_name": "Grok Video",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "Соотношение сторон выходного видео."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration": {
+        "name": "duration",
+        "tooltip": "Длительность выходного видео в секундах."
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Текстовое описание желаемого видео."
+      },
+      "resolution": {
+        "name": "resolution",
+        "tooltip": "Разрешение выходного видео."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Сид для определения необходимости повторного запуска узла; фактические результаты недетерминированы независимо от сида."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "GrowMask": {
     "display_name": "Увеличить маску",
     "inputs": {
@@ -2777,6 +4098,55 @@
       "tapered_corners": {
         "name": "заостренные_углы"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HitPawGeneralImageEnhance": {
+    "description": "Увеличение разрешения низкокачественных изображений до сверхвысокого, устранение артефактов и шума. Максимальный выход: 32 мегапикселя.",
+    "display_name": "HitPaw General Image Enhance",
+    "inputs": {
+      "auto_downscale": {
+        "name": "авто_понижение_разрешения",
+        "tooltip": "Автоматически понижать разрешение входного изображения, если выход превышает лимит."
+      },
+      "image": {
+        "name": "изображение"
+      },
+      "model": {
+        "name": "модель"
+      },
+      "upscale_factor": {
+        "name": "коэффициент_масштабирования"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HitPawVideoEnhance": {
+    "description": "Увеличение разрешения низкокачественных видео до высокого, устранение артефактов и шума. Цена указана за секунду видео.",
+    "display_name": "HitPaw Video Enhance",
+    "inputs": {
+      "model": {
+        "name": "модель"
+      },
+      "model_resolution": {
+        "name": "разрешение"
+      },
+      "video": {
+        "name": "видео"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "Hunyuan3Dv2Conditioning": {
@@ -2788,10 +4158,12 @@
     },
     "outputs": {
       "0": {
-        "name": "положительный"
+        "name": "positive",
+        "tooltip": null
       },
       "1": {
-        "name": "отрицательный"
+        "name": "negative",
+        "tooltip": null
       }
     }
   },
@@ -2813,10 +4185,12 @@
     },
     "outputs": {
       "0": {
-        "name": "положительный"
+        "name": "positive",
+        "tooltip": null
       },
       "1": {
-        "name": "отрицательный"
+        "name": "negative",
+        "tooltip": null
       }
     }
   },
@@ -2890,6 +4264,120 @@
       }
     }
   },
+  "HunyuanVideo15ImageToVideo": {
+    "display_name": "HunyuanVideo15ImageToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "start_image": {
+        "name": "start_image"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "HunyuanVideo15LatentUpscaleWithModel": {
+    "display_name": "Hunyuan Video 15 Latent Upscale With Model",
+    "inputs": {
+      "crop": {
+        "name": "crop"
+      },
+      "height": {
+        "name": "height"
+      },
+      "model": {
+        "name": "model"
+      },
+      "samples": {
+        "name": "samples"
+      },
+      "upscale_method": {
+        "name": "upscale_method"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HunyuanVideo15SuperResolution": {
+    "display_name": "HunyuanVideo15SuperResolution",
+    "inputs": {
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "latent": {
+        "name": "латентный"
+      },
+      "negative": {
+        "name": "отрицательный"
+      },
+      "noise_augmentation": {
+        "name": "добавление шума"
+      },
+      "positive": {
+        "name": "положительный"
+      },
+      "start_image": {
+        "name": "начальное изображение"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "положительный",
+        "tooltip": null
+      },
+      "1": {
+        "name": "отрицательный",
+        "tooltip": null
+      },
+      "2": {
+        "name": "латентный",
+        "tooltip": null
+      }
+    }
+  },
   "HyperTile": {
     "display_name": "Гиперплитка",
     "inputs": {
@@ -3094,6 +4582,11 @@
       "strength": {
         "name": "сила"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageBatch": {
@@ -3157,6 +4650,26 @@
       "image": {
         "name": "изображение"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageCompare": {
+    "description": "Сравнивает два изображения бок о бок с помощью ползунка.",
+    "display_name": "Сравнение изображений",
+    "inputs": {
+      "compare_view": {
+        "name": "compare_view"
+      },
+      "image_a": {
+        "name": "image_a"
+      },
+      "image_b": {
+        "name": "image_b"
+      }
     }
   },
   "ImageCompositeMasked": {
@@ -3180,6 +4693,11 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageCrop": {
@@ -3200,6 +4718,50 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageCropV2": {
+    "display_name": "Обрезка изображения",
+    "inputs": {
+      "crop_region": {
+        "name": "область_обрезки"
+      },
+      "height": {},
+      "image": {
+        "name": "изображение"
+      },
+      "width": {},
+      "x": {},
+      "y": {}
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageDeduplication": {
+    "display_name": "Удаление дубликатов изображений",
+    "inputs": {
+      "images": {
+        "name": "изображения",
+        "tooltip": "Список изображений для обработки."
+      },
+      "similarity_threshold": {
+        "name": "порог сходства",
+        "tooltip": "Порог сходства (0-1). Чем выше значение, тем больше сходство. Изображения выше этого порога считаются дубликатами."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "изображения",
+        "tooltip": "Обработанные изображения"
+      }
     }
   },
   "ImageFlip": {
@@ -3211,6 +4773,11 @@
       "image": {
         "name": "изображение"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageFromBatch": {
@@ -3225,6 +4792,42 @@
       "length": {
         "name": "длина"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageGrid": {
+    "display_name": "Сетка изображений",
+    "inputs": {
+      "cell_height": {
+        "name": "высота ячейки",
+        "tooltip": "Высота каждой ячейки в сетке."
+      },
+      "cell_width": {
+        "name": "ширина ячейки",
+        "tooltip": "Ширина каждой ячейки в сетке."
+      },
+      "columns": {
+        "name": "колонки",
+        "tooltip": "Количество колонок в сетке."
+      },
+      "images": {
+        "name": "изображения",
+        "tooltip": "Список изображений для обработки."
+      },
+      "padding": {
+        "name": "отступ",
+        "tooltip": "Отступ между изображениями."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "изображения",
+        "tooltip": "Обработанные изображения"
+      }
     }
   },
   "ImageInvert": {
@@ -3235,6 +4838,28 @@
       }
     }
   },
+  "ImageMergeTileList": {
+    "display_name": "Объединить список тайлов в изображение",
+    "inputs": {
+      "final_height": {
+        "name": "final_height"
+      },
+      "final_width": {
+        "name": "final_width"
+      },
+      "image_list": {
+        "name": "image_list"
+      },
+      "overlap": {
+        "name": "overlap"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ImageOnlyCheckpointLoader": {
     "display_name": "Загрузчик checkpoint только для изображения (модель img2vid)",
     "inputs": {
@@ -3333,6 +4958,11 @@
       "rotation": {
         "name": "вращение"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageScale": {
@@ -3381,6 +5011,11 @@
       "upscale_method": {
         "name": "метод увеличения"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageScaleToTotalPixels": {
@@ -3392,6 +5027,9 @@
       "megapixels": {
         "name": "мегапиксели"
       },
+      "resolution_steps": {
+        "name": "шаги разрешения"
+      },
       "upscale_method": {
         "name": "метод_апскейла"
       }
@@ -3446,6 +5084,11 @@
       "spacing_width": {
         "name": "ширина отступа"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageToMask": {
@@ -3457,6 +5100,11 @@
       "image": {
         "name": "изображение"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageUpscaleWithModel": {
@@ -3566,6 +5214,29 @@
       "mask": {
         "name": "маска"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "JoinAudioChannels": {
+    "description": "Объединяет левый и правый моно аудиоканалы в стерео аудио.",
+    "display_name": "Объединить аудиоканалы",
+    "inputs": {
+      "audio_left": {
+        "name": "audio_left"
+      },
+      "audio_right": {
+        "name": "audio_right"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "аудио",
+        "tooltip": null
+      }
     }
   },
   "JoinImageWithAlpha": {
@@ -3691,6 +5362,58 @@
       "sampler_name": {
         "name": "название_сэмплера"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Kandinsky5ImageToVideo": {
+    "display_name": "Kandinsky5ImageToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "размер_пакета"
+      },
+      "height": {
+        "name": "высота"
+      },
+      "length": {
+        "name": "длина"
+      },
+      "negative": {
+        "name": "негативный"
+      },
+      "positive": {
+        "name": "позитивный"
+      },
+      "start_image": {
+        "name": "стартовое_изображение"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "ширина"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "позитивный",
+        "tooltip": null
+      },
+      "1": {
+        "name": "негативный",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": "Пустое латентное видео"
+      },
+      "3": {
+        "name": "cond_latent",
+        "tooltip": "Очищенные закодированные стартовые изображения, используются для замены зашумленного старта латентов вывода модели"
+      }
     }
   },
   "KarrasScheduler": {
@@ -3708,6 +5431,44 @@
       "steps": {
         "name": "шаги"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingAvatarNode": {
+    "description": "Создавайте видеоролики с цифровыми людьми в стиле телетрансляции из одной фотографии и аудиофайла.",
+    "display_name": "Kling Avatar 2.0",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "Референсное изображение аватара. Ширина и высота должны быть не менее 300 пикселей. Соотношение сторон должно быть от 1:2.5 до 2.5:1."
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Необязательный prompt для задания действий, эмоций и движений камеры аватара."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed управляет тем, нужно ли повторно запускать узел; результаты всегда недетерминированы, независимо от значения seed."
+      },
+      "sound_file": {
+        "name": "sound_file",
+        "tooltip": "Аудиофайл. Длительность должна быть от 2 до 300 секунд."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "KlingCameraControlI2VNode": {
@@ -3862,6 +5623,46 @@
       }
     }
   },
+  "KlingFirstLastFrameNode": {
+    "description": "Создавайте видео с помощью Kling V3, используя первый и последний кадры.",
+    "display_name": "Kling 3.0: Видео по первому и последнему кадру",
+    "inputs": {
+      "control_after_generate": {
+        "name": "контроль после генерации"
+      },
+      "duration": {
+        "name": "длительность"
+      },
+      "end_frame": {
+        "name": "последний кадр"
+      },
+      "first_frame": {
+        "name": "первый кадр"
+      },
+      "generate_audio": {
+        "name": "создать аудио"
+      },
+      "model": {
+        "name": "модель",
+        "tooltip": "Настройки модели и генерации."
+      },
+      "model_resolution": {
+        "name": "разрешение"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed определяет, нужно ли повторно запускать узел; результаты всегда недетерминированы, независимо от seed."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingImage2VideoNode": {
     "display_name": "Kling Image to Video",
     "inputs": {
@@ -3914,6 +5715,9 @@
       "aspect_ratio": {
         "name": "aspect_ratio"
       },
+      "control_after_generate": {
+        "name": "контроль после генерации"
+      },
       "human_fidelity": {
         "name": "human_fidelity",
         "tooltip": "Сходство с референсом субъекта"
@@ -3942,6 +5746,39 @@
       "prompt": {
         "name": "prompt",
         "tooltip": "Положительный текстовый запрос"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed определяет, нужно ли повторно запускать узел; результаты всегда недетерминированы, независимо от seed."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingImageToVideoWithAudio": {
+    "display_name": "Kling: изображение (первый кадр) в видео с аудио",
+    "inputs": {
+      "duration": {
+        "name": "длительность"
+      },
+      "generate_audio": {
+        "name": "создать_аудио"
+      },
+      "mode": {
+        "name": "режим"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "промпт",
+        "tooltip": "Положительный текстовый промпт."
+      },
+      "start_frame": {
+        "name": "стартовый_кадр"
       }
     },
     "outputs": {
@@ -4011,6 +5848,299 @@
       }
     }
   },
+  "KlingMotionControl": {
+    "display_name": "Kling: управление движением",
+    "inputs": {
+      "character_orientation": {
+        "name": "ориентация_персонажа",
+        "tooltip": "Управляет тем, откуда берется направление/ориентация персонажа.\nвидео: движения, выражения, движения камеры и ориентация следуют за референсным видео движения (остальные детали через промпт).\nизображение: движения и выражения также следуют за референсным видео, но ориентация персонажа соответствует референсному изображению (камера/другие детали через промпт)."
+      },
+      "keep_original_sound": {
+        "name": "сохранить_оригинальный_звук"
+      },
+      "mode": {
+        "name": "режим"
+      },
+      "model": {
+        "name": "модель"
+      },
+      "prompt": {
+        "name": "промпт"
+      },
+      "reference_image": {
+        "name": "референсное_изображение"
+      },
+      "reference_video": {
+        "name": "референсное_видео",
+        "tooltip": "Референсное видео движения, используемое для управления движением/выражением.\nОграничения по длительности зависят от character_orientation:\n - изображение: 3–10с (максимум 10с)\n - видео: 3–30с (максимум 30с)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProEditVideoNode": {
+    "description": "Редактируйте существующее видео с помощью последней модели от Kling.",
+    "display_name": "Kling: Omni редактирование видео (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "контроль после генерации"
+      },
+      "keep_original_sound": {
+        "name": "сохранить_оригинальный_звук"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "промпт",
+        "tooltip": "Текстовый промпт, описывающий содержимое видео. Может включать как положительные, так и отрицательные описания."
+      },
+      "reference_images": {
+        "name": "референсные_изображения",
+        "tooltip": "До 4 дополнительных референсных изображений."
+      },
+      "resolution": {
+        "name": "разрешение"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed определяет, нужно ли повторно запускать узел; результаты всегда недетерминированы, независимо от seed."
+      },
+      "video": {
+        "name": "видео",
+        "tooltip": "Видео для редактирования. Длина выходного видео будет такой же."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProFirstLastFrameNode": {
+    "description": "Используйте начальный кадр, необязательный конечный кадр или референсные изображения с новейшей моделью Kling.",
+    "display_name": "Kling Omni Первый-Последний Кадр в Видео (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "контроль после генерации"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "end_frame": {
+        "name": "end_frame",
+        "tooltip": "Необязательный конечный кадр для видео. Не может использоваться одновременно с 'reference_images'."
+      },
+      "first_frame": {
+        "name": "first_frame"
+      },
+      "generate_audio": {
+        "name": "создать аудио",
+        "tooltip": "Создать аудио для видео. Поддерживается только для kling-v3-omni."
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Текстовый запрос, описывающий содержимое видео. Может включать как положительные, так и отрицательные описания."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "До 6 дополнительных референсных изображений."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed определяет, нужно ли повторно запускать узел; результаты всегда недетерминированы, независимо от seed."
+      },
+      "storyboards": {
+        "name": "раскадровки",
+        "tooltip": "Создайте серию видеосегментов с индивидуальными подсказками и длительностью. Поддерживается только для kling-v3-omni."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProImageNode": {
+    "description": "Создавайте или редактируйте изображения с помощью новейшей модели Kling.",
+    "display_name": "Kling Omni Изображение (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "контроль после генерации"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Текстовый запрос, описывающий содержимое изображения. Может включать как положительные, так и отрицательные описания."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "До 10 дополнительных референсных изображений."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed определяет, нужно ли повторно запускать узел; результаты всегда недетерминированы, независимо от seed."
+      },
+      "series_amount": {
+        "name": "количество серий",
+        "tooltip": "Создать серию изображений. Не поддерживается для kling-image-o1."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProImageToVideoNode": {
+    "description": "Используйте до 7 референсных изображений для генерации видео с помощью новейшей модели Kling.",
+    "display_name": "Kling Omni Изображение в Видео (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "контроль после генерации"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "generate_audio": {
+        "name": "создать аудио",
+        "tooltip": "Создать аудио для видео. Поддерживается только для kling-v3-omni."
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Текстовый запрос, описывающий содержимое видео. Может включать как положительные, так и отрицательные описания."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "До 7 референсных изображений."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed определяет, нужно ли повторно запускать узел; результаты всегда недетерминированы, независимо от seed."
+      },
+      "storyboards": {
+        "name": "раскадровки",
+        "tooltip": "Создайте серию видеосегментов с индивидуальными подсказками и длительностью. Поддерживается только для kling-v3-omni."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProTextToVideoNode": {
+    "description": "Используйте текстовые запросы для генерации видео с помощью новейшей модели Kling.",
+    "display_name": "Kling Omni Текст в Видео (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "контроль после генерации"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "generate_audio": {
+        "name": "создать аудио"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Текстовый запрос, описывающий содержимое видео. Может включать как положительные, так и отрицательные описания."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed определяет, нужно ли повторно запускать узел; результаты всегда недетерминированы, независимо от seed."
+      },
+      "storyboards": {
+        "name": "раскадровки",
+        "tooltip": "Создайте серию видеосегментов с индивидуальными подсказками и длительностью. Игнорируется для модели o1."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProVideoToVideoNode": {
+    "description": "Используйте видео и до 4 референсных изображений для генерации видео с помощью новейшей модели Kling.",
+    "display_name": "Kling Omni Video to Video (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "контроль после генерации"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "keep_original_sound": {
+        "name": "keep_original_sound"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Текстовый запрос, описывающий содержимое видео. Может включать как положительные, так и отрицательные описания."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "До 4 дополнительных референсных изображений."
+      },
+      "reference_video": {
+        "name": "reference_video",
+        "tooltip": "Видео для использования в качестве референса."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Сид управляет тем, должен ли узел выполняться повторно; результаты остаются недетерминированными независимо от значения сида."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingSingleImageVideoEffectNode": {
     "description": "Достигайте различных спецэффектов при генерации видео на основе effect_scene.",
     "display_name": "Kling Видеоэффекты",
@@ -4125,6 +6255,35 @@
       }
     }
   },
+  "KlingTextToVideoWithAudio": {
+    "display_name": "Kling Text to Video with Audio",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "generate_audio": {
+        "name": "generate_audio"
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Положительный текстовый запрос."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingVideoExtendNode": {
     "description": "Узел Kling Video Extend. Расширяет видео, созданные другими узлами Kling. video_id создаётся с помощью других узлов Kling.",
     "display_name": "Kling Video Extend",
@@ -4159,6 +6318,54 @@
       }
     }
   },
+  "KlingVideoNode": {
+    "description": "Генерируйте видео с помощью Kling V3. Поддерживает текст-видео и изображение-видео с дополнительной раскадровкой, мультипромптом и генерацией аудио.",
+    "display_name": "Kling 3.0 Видео",
+    "inputs": {
+      "control_after_generate": {
+        "name": "контроль после генерации"
+      },
+      "generate_audio": {
+        "name": "генерировать аудио"
+      },
+      "model": {
+        "name": "модель",
+        "tooltip": "Настройки модели и генерации."
+      },
+      "model_aspect_ratio": {
+        "name": "соотношение сторон"
+      },
+      "model_resolution": {
+        "name": "разрешение"
+      },
+      "multi_shot": {
+        "name": "мульти-шот",
+        "tooltip": "Создайте серию видеосегментов с индивидуальными промптами и длительностью."
+      },
+      "multi_shot_duration": {
+        "name": "длительность"
+      },
+      "multi_shot_negative_prompt": {
+        "name": "негативный промпт"
+      },
+      "multi_shot_prompt": {
+        "name": "промпт"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Сид управляет тем, должен ли узел выполняться повторно; результаты остаются недетерминированными независимо от значения сида."
+      },
+      "start_frame": {
+        "name": "стартовый кадр",
+        "tooltip": "Необязательное стартовое изображение кадра. При подключении переключается в режим изображение-видео."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingVirtualTryOnNode": {
     "description": "Узел Kling Виртуальная Примерка. Введите изображение человека и изображение одежды, чтобы примерить одежду на человеке.",
     "display_name": "Kling Виртуальная Примерка",
@@ -4179,6 +6386,26 @@
       }
     }
   },
+  "LTXAVTextEncoderLoader": {
+    "description": "[Рецепты]\n\nltxav: gemma 3 12B",
+    "display_name": "LTXV Загрузчик аудио-текстового энкодера",
+    "inputs": {
+      "ckpt_name": {
+        "name": "ckpt_name"
+      },
+      "device": {
+        "name": "device"
+      },
+      "text_encoder": {
+        "name": "text_encoder"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LTXVAddGuide": {
     "display_name": "LTXVAddGuide",
     "inputs": {
@@ -4221,6 +6448,76 @@
       }
     }
   },
+  "LTXVAudioVAEDecode": {
+    "display_name": "LTXV Декодирование аудио VAE",
+    "inputs": {
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "Модель Audio VAE, используемая для декодирования латентного пространства."
+      },
+      "samples": {
+        "name": "samples",
+        "tooltip": "Латентное пространство для декодирования."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Audio",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAEEncode": {
+    "display_name": "LTXV Кодирование аудио VAE",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "Аудио для кодирования."
+      },
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "Модель Audio VAE для кодирования."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Audio Latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAELoader": {
+    "display_name": "LTXV Загрузчик аудио VAE",
+    "inputs": {
+      "ckpt_name": {
+        "name": "ckpt_name",
+        "tooltip": "Контрольная точка Audio VAE для загрузки."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Audio VAE",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVConcatAVLatent": {
+    "display_name": "LTXVConcatAVLatent",
+    "inputs": {
+      "audio_latent": {
+        "name": "audio_latent"
+      },
+      "video_latent": {
+        "name": "video_latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
   "LTXVConditioning": {
     "display_name": "Кондиционирование LTXV",
     "inputs": {
@@ -4273,6 +6570,33 @@
       }
     }
   },
+  "LTXVEmptyLatentAudio": {
+    "display_name": "LTXV Пустое латентное аудио",
+    "inputs": {
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "Модель Audio VAE для получения конфигурации."
+      },
+      "batch_size": {
+        "name": "batch_size",
+        "tooltip": "Количество латентных аудиосэмплов в батче."
+      },
+      "frame_rate": {
+        "name": "frame_rate",
+        "tooltip": "Количество кадров в секунду."
+      },
+      "frames_number": {
+        "name": "frames_number",
+        "tooltip": "Количество кадров."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Latent",
+        "tooltip": null
+      }
+    }
+  },
   "LTXVImgToVideo": {
     "display_name": "LTXVImgToVideo",
     "inputs": {
@@ -4319,6 +6643,47 @@
       }
     }
   },
+  "LTXVImgToVideoInplace": {
+    "display_name": "LTXVImgToVideoInplace",
+    "inputs": {
+      "bypass": {
+        "name": "обход",
+        "tooltip": "Обойти кондиционирование."
+      },
+      "image": {
+        "name": "изображение"
+      },
+      "latent": {
+        "name": "latent"
+      },
+      "strength": {
+        "name": "интенсивность"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVLatentUpsampler": {
+    "display_name": "LTXVLatentUpsampler",
+    "inputs": {
+      "samples": {
+        "name": "образцы"
+      },
+      "upscale_model": {
+        "name": "модель увеличения"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
   "LTXVPreprocess": {
     "display_name": "LTXVPreprocess",
     "inputs": {
@@ -4367,6 +6732,25 @@
       }
     }
   },
+  "LTXVSeparateAVLatent": {
+    "description": "LTXV Separate AV Latent",
+    "display_name": "LTXVSeparateAVLatent",
+    "inputs": {
+      "av_latent": {
+        "name": "av_latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "video_latent",
+        "tooltip": null
+      },
+      "1": {
+        "name": "audio_latent",
+        "tooltip": null
+      }
+    }
+  },
   "LaplaceScheduler": {
     "display_name": "Scheduler Лапласа",
     "inputs": {
@@ -4385,6 +6769,11 @@
       "steps": {
         "name": "шаги"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "LatentAdd": {
@@ -4522,6 +6911,11 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "LatentConcat": {
@@ -4585,6 +6979,25 @@
       }
     }
   },
+  "LatentCutToBatch": {
+    "display_name": "LatentCutToBatch",
+    "inputs": {
+      "dim": {
+        "name": "dim"
+      },
+      "samples": {
+        "name": "samples"
+      },
+      "slice_size": {
+        "name": "slice_size"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LatentFlip": {
     "display_name": "Перевернуть латент",
     "inputs": {
@@ -4738,6 +7151,19 @@
       }
     }
   },
+  "LatentUpscaleModelLoader": {
+    "display_name": "Загрузить модель увеличения latent",
+    "inputs": {
+      "model_name": {
+        "name": "model_name"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LazyCache": {
     "description": "Самодельная версия EasyCache - ещё более 'простая' версия EasyCache для реализации. В целом работает хуже, чем EasyCache, но лучше в некоторых редких случаях И имеет универсальную совместимость со всем в ComfyUI.",
     "display_name": "Ленивый кэш",
@@ -4772,8 +7198,7 @@
   "Load3D": {
     "display_name": "Загрузить 3D",
     "inputs": {
-      "clear": {
-      },
+      "clear": {},
       "height": {
         "name": "высота"
       },
@@ -4783,30 +7208,40 @@
       "model_file": {
         "name": "файл модели"
       },
-      "upload 3d model": {
-      },
+      "upload 3d model": {},
+      "upload extra resources": {},
       "width": {
         "name": "ширина"
       }
     },
     "outputs": {
       "0": {
-        "name": "изображение"
+        "name": "image",
+        "tooltip": null
       },
       "1": {
-        "name": "mask"
+        "name": "mask",
+        "tooltip": null
       },
       "2": {
-        "name": "путь к mesh"
+        "name": "mesh_path",
+        "tooltip": null
       },
       "3": {
-        "name": "нормаль"
+        "name": "normal",
+        "tooltip": null
       },
       "4": {
-        "name": "линейный рисунок"
+        "name": "camera_info",
+        "tooltip": null
       },
       "5": {
-        "name": "информация о камере"
+        "name": "recording_video",
+        "tooltip": null
+      },
+      "6": {
+        "name": "model_3d",
+        "tooltip": null
       }
     }
   },
@@ -4822,6 +7257,11 @@
       "upload": {
         "name": "выберите файл для загрузки"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "LoadImage": {
@@ -4835,6 +7275,21 @@
       }
     }
   },
+  "LoadImageDataSetFromFolder": {
+    "display_name": "Загрузить набор изображений из папки",
+    "inputs": {
+      "folder": {
+        "name": "folder",
+        "tooltip": "Папка, из которой загружаются изображения."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Список загруженных изображений"
+      }
+    }
+  },
   "LoadImageMask": {
     "display_name": "Загрузить изображение (как маску)",
     "inputs": {
@@ -4853,16 +7308,35 @@
     "description": "Загрузите изображение из папки вывода. При нажатии кнопки обновления, узел обновит список изображений и автоматически выберет первое изображение, что позволяет легко итерировать.",
     "display_name": "Загрузить изображение (из выходных данных)",
     "inputs": {
+      "Auto-refresh after generation": {},
       "image": {
         "name": "изображение"
       },
-      "refresh": {
-      },
+      "refresh": {},
       "upload": {
         "name": "выберите файл для загрузки"
       }
     }
   },
+  "LoadImageTextDataSetFromFolder": {
+    "display_name": "Загрузить набор изображений и текстов из папки",
+    "inputs": {
+      "folder": {
+        "name": "folder",
+        "tooltip": "Папка, из которой загружаются изображения."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Список загруженных изображений"
+      },
+      "1": {
+        "name": "texts",
+        "tooltip": "Список текстовых подписей"
+      }
+    }
+  },
   "LoadLatent": {
     "display_name": "Загрузить латент",
     "inputs": {
@@ -4871,6 +7345,25 @@
       }
     }
   },
+  "LoadTrainingDataset": {
+    "display_name": "Загрузить обучающий набор данных",
+    "inputs": {
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "Имя папки, содержащей сохранённый набор данных (внутри выходного каталога)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latents",
+        "tooltip": "Список словарей латентных пространств"
+      },
+      "1": {
+        "name": "conditioning",
+        "tooltip": "Список списков условий"
+      }
+    }
+  },
   "LoadVideo": {
     "display_name": "Загрузить видео",
     "inputs": {
@@ -4921,6 +7414,60 @@
       }
     }
   },
+  "LoraLoaderBypass": {
+    "description": "Применяет LoRA в режиме обхода. В отличие от обычной LoRA, веса модели не изменяются — вычисления LoRA внедряются во время прямого прохода. Полезно для сценариев обучения.",
+    "display_name": "Загрузка LoRA (Обход) (для отладки)",
+    "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "Модель CLIP, к которой будет применяться LoRA."
+      },
+      "lora_name": {
+        "name": "lora_name",
+        "tooltip": "Имя LoRA."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Диффузионная модель, к которой будет применяться LoRA."
+      },
+      "strength_clip": {
+        "name": "strength_clip",
+        "tooltip": "Степень изменения модели CLIP. Может быть отрицательным значением."
+      },
+      "strength_model": {
+        "name": "strength_model",
+        "tooltip": "Степень изменения диффузионной модели. Может быть отрицательным значением."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "Изменённая диффузионная модель."
+      },
+      "1": {
+        "tooltip": "Изменённая модель CLIP."
+      }
+    }
+  },
+  "LoraLoaderBypassModelOnly": {
+    "description": "Применяет LoRA в режиме обхода. В отличие от обычной LoRA, веса модели не изменяются — вычисления LoRA внедряются во время прямого прохода. Полезно для сценариев обучения.",
+    "display_name": "Загрузка LoRA (Обход, только модель) (для отладки)",
+    "inputs": {
+      "lora_name": {
+        "name": "lora_name"
+      },
+      "model": {
+        "name": "model"
+      },
+      "strength_model": {
+        "name": "strength_model"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "Изменённая диффузионная модель."
+      }
+    }
+  },
   "LoraLoaderModelOnly": {
     "description": "LoRA используются для изменения моделей диффузии и CLIP, изменяя способ, которым латенты удаляются от шума, например, применяя стили. Несколько нод LoRA могут быть связаны вместе.",
     "display_name": "Загрузчик LoRA (Только модель)",
@@ -4944,6 +7491,10 @@
   "LoraModelLoader": {
     "display_name": "Загрузить модель LoRA",
     "inputs": {
+      "bypass": {
+        "name": "bypass",
+        "tooltip": "Если включено, LoRA применяется в режиме обхода без изменения весов базовой модели. Полезно для обучения и когда веса модели выгружаются."
+      },
       "lora": {
         "name": "lora",
         "tooltip": "Модель LoRA для применения к диффузионной модели."
@@ -4959,6 +7510,7 @@
     },
     "outputs": {
       "0": {
+        "name": "model",
         "tooltip": "Модифицированная диффузионная модель."
       }
     }
@@ -4992,10 +7544,12 @@
     "display_name": "Построить график потерь",
     "inputs": {
       "filename_prefix": {
-        "name": "префикс_имени_файла"
+        "name": "префикс_имени_файла",
+        "tooltip": "Префикс для сохранённого изображения графика потерь."
       },
       "loss": {
-        "name": "потери"
+        "name": "потери",
+        "tooltip": "Карта потерь из обучающего узла."
       }
     }
   },
@@ -5286,6 +7840,208 @@
       }
     }
   },
+  "MagnificImageRelightNode": {
+    "description": "Изменение освещения изображения с возможностью передачи света по ссылке.",
+    "display_name": "Magnific: Пересвет изображения",
+    "inputs": {
+      "advanced_settings": {
+        "name": "advanced_settings",
+        "tooltip": "Тонкая настройка для продвинутого управления освещением."
+      },
+      "change_background": {
+        "name": "change_background",
+        "tooltip": "Изменяет фон на основе промпта или референса."
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "Изображение для пересвета."
+      },
+      "interpolate_from_original": {
+        "name": "interpolate_from_original",
+        "tooltip": "Ограничивает свободу генерации для большего соответствия оригиналу."
+      },
+      "light_transfer_strength": {
+        "name": "light_transfer_strength",
+        "tooltip": "Интенсивность применения передачи света."
+      },
+      "preserve_details": {
+        "name": "preserve_details",
+        "tooltip": "Сохраняет текстуру и мелкие детали оригинала."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Описание для управления освещением. Поддерживает нотацию акцентов (1-1.4)."
+      },
+      "reference_image": {
+        "name": "reference_image",
+        "tooltip": "Необязательное референсное изображение для передачи освещения."
+      },
+      "style": {
+        "name": "style",
+        "tooltip": "Предпочтительный стиль результата."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageSkinEnhancerNode": {
+    "description": "Улучшение кожи на портретах с несколькими режимами обработки.",
+    "display_name": "Magnific: Улучшение кожи на изображении",
+    "inputs": {
+      "image": {
+        "name": "image",
+        "tooltip": "Портрет для улучшения."
+      },
+      "mode": {
+        "name": "mode",
+        "tooltip": "Режим обработки: creative — для художественного улучшения, faithful — для сохранения оригинального вида, flexible — для целевой оптимизации."
+      },
+      "sharpen": {
+        "name": "sharpen",
+        "tooltip": "Уровень резкости."
+      },
+      "smart_grain": {
+        "name": "smart_grain",
+        "tooltip": "Уровень интеллектуального зерна."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageStyleTransferNode": {
+    "description": "Переносите стиль с эталонного изображения на ваше входное изображение.",
+    "display_name": "Magnific Перенос стиля изображения",
+    "inputs": {
+      "engine": {
+        "name": "engine",
+        "tooltip": "Выбор движка обработки."
+      },
+      "fixed_generation": {
+        "name": "fixed_generation",
+        "tooltip": "Если отключено, каждое новое поколение будет содержать элемент случайности, что приведёт к более разнообразным результатам."
+      },
+      "flavor": {
+        "name": "flavor",
+        "tooltip": "Вариант переноса стиля."
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "Изображение, к которому будет применён перенос стиля."
+      },
+      "portrait_mode": {
+        "name": "portrait_mode",
+        "tooltip": "Включить портретный режим для улучшения лиц."
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "reference_image": {
+        "name": "reference_image",
+        "tooltip": "Эталонное изображение, из которого будет извлекаться стиль."
+      },
+      "structure_strength": {
+        "name": "structure_strength",
+        "tooltip": "Сохраняет структуру исходного изображения."
+      },
+      "style_strength": {
+        "name": "style_strength",
+        "tooltip": "Процент силы стиля."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageUpscalerCreativeNode": {
+    "description": "Улучшение по подсказке, стилизация и увеличение в 2x/4x/8x/16x. Максимальный выход: 25,3 мегапикселя.",
+    "display_name": "Magnific Image Upscale (Creative)",
+    "inputs": {
+      "auto_downscale": {
+        "name": "автоматическое уменьшение",
+        "tooltip": "Автоматически уменьшать входное изображение, если выход превышает максимальный лимит пикселей."
+      },
+      "creativity": {
+        "name": "креативность"
+      },
+      "engine": {
+        "name": "движок"
+      },
+      "fractality": {
+        "name": "фрактальность",
+        "tooltip": "Сила промпта и сложность на квадратный пиксель."
+      },
+      "hdr": {
+        "name": "HDR",
+        "tooltip": "Уровень чёткости и детализации."
+      },
+      "image": {
+        "name": "изображение"
+      },
+      "optimized_for": {
+        "name": "оптимизировано для"
+      },
+      "prompt": {
+        "name": "промпт"
+      },
+      "resemblance": {
+        "name": "сходство",
+        "tooltip": "Степень сходства с оригинальным изображением."
+      },
+      "scale_factor": {
+        "name": "коэффициент увеличения"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageUpscalerPreciseV2Node": {
+    "description": "Высокоточное увеличение с тонкой настройкой резкости, зернистости и детализации. Максимальный выход: 10060×10060 пикселей.",
+    "display_name": "Magnific Image Upscale (Precise V2)",
+    "inputs": {
+      "auto_downscale": {
+        "name": "автоматическое уменьшение",
+        "tooltip": "Автоматически уменьшать входное изображение, если выход превышает максимальное разрешение."
+      },
+      "flavor": {
+        "name": "стиль обработки",
+        "tooltip": "Стиль обработки: sublime — для общего использования, photo — для фотографий, photo_denoiser — для шумных фото."
+      },
+      "image": {
+        "name": "изображение"
+      },
+      "scale_factor": {
+        "name": "коэффициент увеличения"
+      },
+      "sharpen": {
+        "name": "резкость",
+        "tooltip": "Интенсивность резкости изображения. Более высокие значения увеличивают чёткость и контрастность краёв."
+      },
+      "smart_grain": {
+        "name": "умная зернистость",
+        "tooltip": "Интеллектуальное усиление текстуры/зернистости, чтобы изображение не выглядело слишком гладким или искусственным."
+      },
+      "ultra_detail": {
+        "name": "ультра-детализация",
+        "tooltip": "Управляет добавлением мелких деталей, текстур и микродеталей при увеличении."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "Mahiro": {
     "description": "Измените руководство, чтобы оно больше масштабировалось в «направлении» положительной подсказки, а не разницы между отрицательной подсказкой.",
     "display_name": "Mahiro настолько мила, что заслуживает лучшей функции руководства!! (。・ω・。)",
@@ -5301,6 +8057,50 @@
       }
     }
   },
+  "MakeTrainingDataset": {
+    "display_name": "Создать обучающий датасет",
+    "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "Модель CLIP для кодирования текста в кондиционирование."
+      },
+      "images": {
+        "name": "изображения",
+        "tooltip": "Список изображений для кодирования."
+      },
+      "texts": {
+        "name": "тексты",
+        "tooltip": "Список текстовых подписей. Может быть длиной n (соответствует изображениям), 1 (повторяется для всех) или отсутствовать (используется пустая строка)."
+      },
+      "vae": {
+        "name": "vae",
+        "tooltip": "Модель VAE для кодирования изображений в latent."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latents",
+        "tooltip": "Список latent-словарей"
+      },
+      "1": {
+        "name": "conditioning",
+        "tooltip": "Список списков кондиционирования"
+      }
+    }
+  },
+  "ManualSigmas": {
+    "display_name": "ManualSigmas",
+    "inputs": {
+      "sigmas": {
+        "name": "сигмы"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "MaskComposite": {
     "display_name": "Составная маска",
     "inputs": {
@@ -5319,6 +8119,11 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "MaskPreview": {
@@ -5336,6 +8141,371 @@
       "mask": {
         "name": "маска"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MergeImageLists": {
+    "display_name": "Объединить списки изображений",
+    "inputs": {
+      "images": {
+        "name": "изображения",
+        "tooltip": "Список изображений для обработки."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "изображения",
+        "tooltip": "Обработанные изображения"
+      }
+    }
+  },
+  "MergeTextLists": {
+    "display_name": "Объединить списки текстов",
+    "inputs": {
+      "texts": {
+        "name": "тексты",
+        "tooltip": "Список текстов для обработки."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "тексты",
+        "tooltip": "Обработанные тексты"
+      }
+    }
+  },
+  "MeshyAnimateModelNode": {
+    "description": "Применить определённое анимационное действие к ранее скелетированной персонажу.",
+    "display_name": "Meshy: Анимировать модель",
+    "inputs": {
+      "action_id": {
+        "name": "action_id",
+        "tooltip": "Посетите https://docs.meshy.ai/en/api/animation-library для списка доступных значений."
+      },
+      "rig_task_id": {
+        "name": "rig_task_id"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyImageToModelNode": {
+    "display_name": "Meshy: Изображение в модель",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "Укажите режим позы для создаваемой модели."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed управляет тем, должен ли узел запускаться повторно; результаты недетерминированы независимо от seed."
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "Если установлено в false, возвращается необработанная треугольная сетка."
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      },
+      "should_texture": {
+        "name": "should_texture",
+        "tooltip": "Определяет, будут ли сгенерированы текстуры. Если установить в false, этап текстурирования пропускается и возвращается сетка без текстур."
+      },
+      "should_texture_enable_pbr": {
+        "name": "enable_pbr"
+      },
+      "should_texture_texture_prompt": {
+        "name": "texture_prompt"
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyMultiImageToModelNode": {
+    "display_name": "Meshy: Мульти-изображение в модель",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "images": {
+        "name": "images"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "Укажите режим позы для создаваемой модели."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed управляет тем, должен ли узел запускаться повторно; результаты недетерминированы независимо от seed."
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "Если установлено в false, возвращается необработанная треугольная сетка."
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      },
+      "should_texture": {
+        "name": "should_texture",
+        "tooltip": "Определяет, будут ли сгенерированы текстуры. Если установить в false, этап текстурирования пропускается и возвращается сетка без текстур."
+      },
+      "should_texture_enable_pbr": {
+        "name": "enable_pbr"
+      },
+      "should_texture_texture_prompt": {
+        "name": "texture_prompt"
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyRefineNode": {
+    "description": "Улучшить ранее созданную черновую модель.",
+    "display_name": "Meshy: Улучшить Черновую Модель",
+    "inputs": {
+      "enable_pbr": {
+        "name": "enable_pbr",
+        "tooltip": "Генерировать PBR-карты (металличность, шероховатость, нормали) в дополнение к базовому цвету. Важно: установите значение false при использовании стиля Sculpture, так как стиль Sculpture создает собственные PBR-карты."
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "model": {
+        "name": "model"
+      },
+      "texture_image": {
+        "name": "texture_image",
+        "tooltip": "Одновременно можно использовать только один из параметров: 'texture_image' или 'texture_prompt'."
+      },
+      "texture_prompt": {
+        "name": "texture_prompt",
+        "tooltip": "Введите текстовый запрос для управления процессом текстурирования. Максимум 600 символов. Не может использоваться одновременно с 'texture_image'."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyRigModelNode": {
+    "description": "Предоставляет персонажа с риггингом в стандартных форматах. Автоматический риггинг в настоящее время не подходит для моделей без текстур, не-гуманоидных объектов или гуманоидов с нечеткой структурой конечностей и тела.",
+    "display_name": "Meshy: Скелетная Анимация Модели",
+    "inputs": {
+      "height_meters": {
+        "name": "height_meters",
+        "tooltip": "Примерная высота модели персонажа в метрах. Это помогает для масштабирования и точности риггинга."
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "texture_image": {
+        "name": "texture_image",
+        "tooltip": "UV-развернутая текстура базового цвета модели."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "rig_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyTextToModelNode": {
+    "display_name": "Meshy: Текст в Модель",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "Укажите режим позы для создаваемой модели."
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed управляет тем, должен ли узел запускаться повторно; результаты всегда недетерминированы, независимо от seed."
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "Если установлено значение false, возвращается необработанная треугольная сетка."
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      },
+      "style": {
+        "name": "style"
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "файл модели",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyTextureNode": {
+    "display_name": "Meshy: Модель текстуры",
+    "inputs": {
+      "enable_original_uv": {
+        "name": "enable_original_uv",
+        "tooltip": "Использовать оригинальные UV модели вместо генерации новых UV. При включении Meshy сохраняет существующие текстуры из загруженной модели. Если у модели нет оригинальных UV, качество результата может быть ниже."
+      },
+      "image_style": {
+        "name": "image_style",
+        "tooltip": "2D-изображение для направления процесса текстурирования. Нельзя использовать одновременно с 'text_style_prompt'."
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pbr": {
+        "name": "pbr"
+      },
+      "text_style_prompt": {
+        "name": "text_style_prompt",
+        "tooltip": "Опишите желаемый стиль текстуры объекта с помощью текста. Максимум 600 символов. Нельзя использовать одновременно с 'image_style'."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "файл модели",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
     }
   },
   "MinimaxHailuoVideoNode": {
@@ -7779,6 +10949,78 @@
       }
     }
   },
+  "NAGuidance": {
+    "description": "Применяет нормализованное управление вниманием к моделям, позволяя использовать негативные подсказки на distilled/schnell моделях.",
+    "display_name": "Нормализованное управление вниманием",
+    "inputs": {
+      "model": {
+        "name": "model",
+        "tooltip": "Модель, к которой применяется NAG."
+      },
+      "nag_alpha": {
+        "name": "nag_alpha",
+        "tooltip": "Коэффициент смешивания для нормализованного внимания. 1.0 — полная замена, 0.0 — без эффекта."
+      },
+      "nag_scale": {
+        "name": "nag_scale",
+        "tooltip": "Коэффициент масштаба управления. Более высокие значения сильнее отдаляют от негативной подсказки."
+      },
+      "nag_tau": {
+        "name": "nag_tau"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "Патченная модель с включённым NAG."
+      }
+    }
+  },
+  "NormalizeImages": {
+    "display_name": "Нормализовать изображения",
+    "inputs": {
+      "images": {
+        "name": "изображения",
+        "tooltip": "Изображение для обработки."
+      },
+      "mean": {
+        "name": "среднее",
+        "tooltip": "Среднее значение для нормализации."
+      },
+      "std": {
+        "name": "стандартное отклонение",
+        "tooltip": "Стандартное отклонение для нормализации."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "изображения",
+        "tooltip": "Обработанные изображения"
+      }
+    }
+  },
+  "NormalizeVideoLatentStart": {
+    "description": "Нормализует начальные кадры видео latent, чтобы их среднее значение и стандартное отклонение соответствовали последующим опорным кадрам. Помогает уменьшить различия между начальными кадрами и остальной частью видео.",
+    "display_name": "NormalizeVideoLatentStart",
+    "inputs": {
+      "latent": {
+        "name": "latent"
+      },
+      "reference_frame_count": {
+        "name": "reference_frame_count",
+        "tooltip": "Количество кадров latent после начальных, используемых в качестве опорных"
+      },
+      "start_frame_count": {
+        "name": "start_frame_count",
+        "tooltip": "Количество кадров latent для нормализации, начиная с первого"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
   "OpenAIChatConfig": {
     "description": "Позволяет задать расширенные параметры конфигурации для узлов OpenAI Chat.",
     "display_name": "Расширенные настройки OpenAI ChatGPT",
@@ -7928,6 +11170,9 @@
         "name": "mask",
         "tooltip": "Необязательная маска для дорисовки (белые области будут заменены)"
       },
+      "model": {
+        "name": "model"
+      },
       "n": {
         "name": "n",
         "tooltip": "Сколько изображений сгенерировать"
@@ -8440,6 +11685,11 @@
       "steps": {
         "name": "шаги"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "PorterDuffImageComposite": {
@@ -8473,6 +11723,9 @@
   "Preview3D": {
     "display_name": "Предварительный просмотр 3D",
     "inputs": {
+      "bg_image": {
+        "name": "bg_image"
+      },
       "camera_info": {
         "name": "информация_камеры"
       },
@@ -8480,14 +11733,20 @@
         "name": "изображение"
       },
       "model_file": {
-        "name": "файл_модели"
+        "name": "файл_модели",
+        "tooltip": "Файл 3D-модели или строка пути"
       }
     }
   },
   "PreviewAny": {
     "display_name": "Предпросмотр любого",
     "inputs": {
-      "preview": {
+      "previewMode": {},
+      "preview_markdown": {
+        "name": "Предпросмотр"
+      },
+      "preview_text": {
+        "name": "Предпросмотр"
       },
       "source": {
         "name": "источник"
@@ -8527,6 +11786,28 @@
       }
     }
   },
+  "PrimitiveBoundingBox": {
+    "display_name": "Границы (Bounding Box)",
+    "inputs": {
+      "height": {
+        "name": "высота"
+      },
+      "width": {
+        "name": "ширина"
+      },
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "PrimitiveFloat": {
     "display_name": "Число с плавающей запятой",
     "inputs": {
@@ -8628,6 +11909,36 @@
       }
     }
   },
+  "RandomCropImages": {
+    "display_name": "Случайное кадрирование изображений",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "height": {
+        "name": "height",
+        "tooltip": "Высота кадра."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Изображение для обработки."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Случайное зерно."
+      },
+      "width": {
+        "name": "width",
+        "tooltip": "Ширина кадра."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Обработанные изображения"
+      }
+    }
+  },
   "RandomNoise": {
     "display_name": "Случайный шум",
     "inputs": {
@@ -8637,6 +11948,11 @@
       "noise_seed": {
         "name": "сид_шума"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "RebatchImages": {
@@ -8677,6 +11993,11 @@
       "audio": {
         "name": "аудио"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "RecraftColorRGB": {
@@ -8724,6 +12045,25 @@
       }
     }
   },
+  "RecraftCreateStyleNode": {
+    "description": "Создайте пользовательский стиль на основе референсных изображений. Загрузите 1–5 изображений для использования в качестве референсов стиля. Общий размер всех изображений ограничен 5 МБ.",
+    "display_name": "Recraft Создать стиль",
+    "inputs": {
+      "images": {
+        "name": "изображения"
+      },
+      "style": {
+        "name": "стиль",
+        "tooltip": "Базовый стиль сгенерированных изображений."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "style_id",
+        "tooltip": null
+      }
+    }
+  },
   "RecraftCreativeUpscaleNode": {
     "description": "Масштабирует изображение синхронно.\nУлучшает заданное растровое изображение с помощью инструмента «creative upscale», повышая разрешение с акцентом на детализацию мелких элементов и лиц.",
     "display_name": "Recraft Creative Upscale Image",
@@ -9031,6 +12371,88 @@
       }
     }
   },
+  "RecraftV4TextToImageNode": {
+    "description": "Генерирует изображения с помощью моделей Recraft V4 или V4 Pro.",
+    "display_name": "Recraft V4: текст в изображение",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Модель, используемая для генерации."
+      },
+      "model_size": {
+        "name": "size"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "Количество изображений для генерации."
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Необязательное текстовое описание нежелательных элементов на изображении."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Подсказка для генерации изображения. Максимум 10 000 символов."
+      },
+      "recraft_controls": {
+        "name": "recraft_controls",
+        "tooltip": "Необязательные дополнительные параметры управления генерацией через узел Recraft Controls."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Сид для определения необходимости повторного запуска узла; фактические результаты не детерминированы независимо от сида."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftV4TextToVectorNode": {
+    "description": "Генерирует SVG с помощью моделей Recraft V4 или V4 Pro.",
+    "display_name": "Recraft V4: текст в вектор",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Модель, используемая для генерации."
+      },
+      "model_size": {
+        "name": "size"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "Количество изображений для генерации."
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Необязательное текстовое описание нежелательных элементов на изображении."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Подсказка для генерации изображения. Максимум 10 000 символов."
+      },
+      "recraft_controls": {
+        "name": "recraft_controls",
+        "tooltip": "Необязательные дополнительные параметры управления генерацией через узел Recraft Controls."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Сид для определения необходимости повторного запуска узла; фактические результаты не детерминированы независимо от сида."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RecraftVectorizeImageNode": {
     "description": "Генерирует SVG синхронно из входного изображения.",
     "display_name": "Recraft Векторизация Изображения",
@@ -9062,6 +12484,23 @@
       }
     }
   },
+  "ReferenceTimbreAudio": {
+    "description": "Этот узел задаёт эталонное аудио для тембра (для ace step 1.5)",
+    "display_name": "ReferenceTimbreAudio",
+    "inputs": {
+      "conditioning": {
+        "name": "conditioning"
+      },
+      "latent": {
+        "name": "latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RegexExtract": {
     "display_name": "Извлечение по регулярному выражению",
     "inputs": {
@@ -9181,6 +12620,11 @@
       "image": {
         "name": "изображение"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "RepeatLatentBatch": {
@@ -9194,6 +12638,51 @@
       }
     }
   },
+  "ReplaceText": {
+    "display_name": "Заменить текст",
+    "inputs": {
+      "find": {
+        "name": "find",
+        "tooltip": "Текст для поиска."
+      },
+      "replace": {
+        "name": "replace",
+        "tooltip": "Текст для замены."
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "Текст для обработки."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "texts",
+        "tooltip": "Обработанные тексты"
+      }
+    }
+  },
+  "ReplaceVideoLatentFrames": {
+    "display_name": "Заменить кадры видео latent",
+    "inputs": {
+      "destination": {
+        "name": "destination",
+        "tooltip": "Latent-назначение, в который будут заменены кадры."
+      },
+      "index": {
+        "name": "index",
+        "tooltip": "Начальный индекс кадра latent в latent-назначении, куда будут вставлены кадры из источника. Отрицательные значения считаются с конца."
+      },
+      "source": {
+        "name": "source",
+        "tooltip": "Latent-источник, предоставляющий кадры для вставки в latent-назначение. Если не указано, latent-назначение возвращается без изменений."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RescaleCFG": {
     "display_name": "Масштабировать CFG",
     "inputs": {
@@ -9223,6 +12712,128 @@
       "target_width": {
         "name": "целевая_ширина"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ResizeImageMaskNode": {
+    "description": "Изменить размер изображения или mask с помощью различных методов масштабирования.",
+    "display_name": "Изменить размер изображения/маски",
+    "inputs": {
+      "input": {
+        "name": "input"
+      },
+      "resize_type": {
+        "name": "resize_type",
+        "tooltip": "Выберите способ изменения размера: по точным размерам, коэффициенту масштабирования, подгонке под другое изображение и т.д."
+      },
+      "resize_type_crop": {
+        "name": "обрезка"
+      },
+      "resize_type_height": {
+        "name": "высота"
+      },
+      "resize_type_width": {
+        "name": "ширина"
+      },
+      "scale_method": {
+        "name": "scale_method",
+        "tooltip": "Алгоритм интерполяции. 'area' лучше всего подходит для уменьшения, 'lanczos' — для увеличения, 'nearest-exact' — для пиксель-арта."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "resized",
+        "tooltip": null
+      }
+    }
+  },
+  "ResizeImagesByLongerEdge": {
+    "display_name": "Изменить размер изображений по длинной стороне",
+    "inputs": {
+      "images": {
+        "name": "images",
+        "tooltip": "Изображение для обработки."
+      },
+      "longer_edge": {
+        "name": "longer_edge",
+        "tooltip": "Целевая длина для длинной стороны."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Обработанные изображения"
+      }
+    }
+  },
+  "ResizeImagesByShorterEdge": {
+    "display_name": "Изменить размер изображений по короткой стороне",
+    "inputs": {
+      "images": {
+        "name": "images",
+        "tooltip": "Изображение для обработки."
+      },
+      "shorter_edge": {
+        "name": "shorter_edge",
+        "tooltip": "Целевая длина для короткой стороны."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Обработанные изображения"
+      }
+    }
+  },
+  "ResolutionBucket": {
+    "display_name": "Группировка по разрешению",
+    "inputs": {
+      "conditioning": {
+        "name": "conditioning",
+        "tooltip": "Список списков условий (должен соответствовать длине latents)."
+      },
+      "latents": {
+        "name": "latents",
+        "tooltip": "Список латентных словарей для группировки по разрешению."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latents",
+        "tooltip": "Список сгруппированных латентных словарей, по одному на каждую группу разрешения."
+      },
+      "1": {
+        "name": "conditioning",
+        "tooltip": "Список списков условий, по одному на каждую группу разрешения."
+      }
+    }
+  },
+  "ResolutionSelector": {
+    "description": "Вычисляет ширину и высоту на основе соотношения сторон и целевого количества мегапикселей. Полезно для задания размеров пустого латентного изображения.",
+    "display_name": "Выбор разрешения",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "Соотношение сторон для выходных размеров."
+      },
+      "megapixels": {
+        "name": "megapixels",
+        "tooltip": "Целевое количество мегапикселей. 1,0 МП ≈ 1024×1024 для квадрата."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "width",
+        "tooltip": "Вычисленная ширина в пикселях (кратна 8)."
+      },
+      "1": {
+        "name": "height",
+        "tooltip": "Вычисленная высота в пикселях (кратна 8)."
+      }
     }
   },
   "Rodin3D_Detail": {
@@ -9246,6 +12857,10 @@
       "0": {
         "name": "Путь к 3D-модели",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9273,6 +12888,10 @@
       "0": {
         "name": "Путь к 3D-модели",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9297,6 +12916,10 @@
       "0": {
         "name": "Путь к 3D-модели",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9315,6 +12938,10 @@
       "0": {
         "name": "Путь к 3D-модели",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9339,6 +12966,10 @@
       "0": {
         "name": "Путь к 3D-модели",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9464,6 +13095,90 @@
       }
     }
   },
+  "SDPoseDrawKeypoints": {
+    "display_name": "SDPoseDrawKeypoints",
+    "inputs": {
+      "draw_body": {
+        "name": "draw_body"
+      },
+      "draw_face": {
+        "name": "draw_face"
+      },
+      "draw_feet": {
+        "name": "draw_feet"
+      },
+      "draw_hands": {
+        "name": "draw_hands"
+      },
+      "face_point_size": {
+        "name": "face_point_size"
+      },
+      "keypoints": {
+        "name": "keypoints"
+      },
+      "score_threshold": {
+        "name": "score_threshold"
+      },
+      "stick_width": {
+        "name": "stick_width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SDPoseFaceBBoxes": {
+    "display_name": "SDPoseFaceBBoxes",
+    "inputs": {
+      "force_square": {
+        "name": "force_square",
+        "tooltip": "Увеличить меньшую сторону рамки, чтобы область обрезки всегда была квадратной."
+      },
+      "keypoints": {
+        "name": "keypoints"
+      },
+      "scale": {
+        "name": "scale",
+        "tooltip": "Множитель для области ограничивающей рамки вокруг каждого обнаруженного лица."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "bboxes",
+        "tooltip": "Ограничивающие рамки лиц для каждого кадра, совместимы с входом bboxes SDPoseKeypointExtractor."
+      }
+    }
+  },
+  "SDPoseKeypointExtractor": {
+    "description": "Извлекает ключевые точки позы из изображений с помощью модели SDPose: https://huggingface.co/Comfy-Org/SDPose/tree/main/checkpoints",
+    "display_name": "SDPoseKeypointExtractor",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "bboxes": {
+        "name": "bboxes",
+        "tooltip": "Необязательные ограничивающие рамки для более точного обнаружения. Требуется для обнаружения нескольких людей."
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "keypoints",
+        "tooltip": "Ключевые точки в формате OpenPose (canvas_width, canvas_height, people)"
+      }
+    }
+  },
   "SDTurboScheduler": {
     "display_name": "Scheduler SDTurbo",
     "inputs": {
@@ -9476,6 +13191,11 @@
       "steps": {
         "name": "шаги"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SD_4XUpscale_Conditioning": {
@@ -9631,10 +13351,12 @@
     },
     "outputs": {
       "0": {
-        "name": "выход"
+        "name": "выход",
+        "tooltip": null
       },
       "1": {
-        "name": "очищенный_выход"
+        "name": "выход без шума",
+        "tooltip": null
       }
     }
   },
@@ -9659,10 +13381,12 @@
     },
     "outputs": {
       "0": {
-        "name": "выход"
+        "name": "выход",
+        "tooltip": null
       },
       "1": {
-        "name": "очищенный_выход"
+        "name": "выход без шума",
+        "tooltip": null
       }
     }
   },
@@ -9699,6 +13423,11 @@
       "s_noise": {
         "name": "s_noise"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_2M_SDE": {
@@ -9716,6 +13445,11 @@
       "solver_type": {
         "name": "тип_решателя"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_2S_Ancestral": {
@@ -9727,6 +13461,11 @@
       "s_noise": {
         "name": "s_noise"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_3M_SDE": {
@@ -9741,6 +13480,11 @@
       "s_noise": {
         "name": "s_noise"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_SDE": {
@@ -9758,6 +13502,11 @@
       "s_noise": {
         "name": "s_noise"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerER_SDE": {
@@ -9776,6 +13525,11 @@
       "solver_type": {
         "name": "тип_решателя"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerEulerAncestral": {
@@ -9787,6 +13541,11 @@
       "s_noise": {
         "name": "s_noise"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerEulerAncestralCFGPP": {
@@ -9798,6 +13557,11 @@
       "s_noise": {
         "name": "s_noise"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerEulerCFGpp": {
@@ -9838,6 +13602,11 @@
       "order": {
         "name": "порядок"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerSASolver": {
@@ -9870,6 +13639,37 @@
       "use_pece": {
         "name": "использовать_pece"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerSEEDS2": {
+    "description": "Этот узел сэмплера может представлять несколько сэмплеров:\n\nseeds_2\n- настройка по умолчанию\n\nexp_heun_2_x0\n- solver_type=phi_2, r=1.0, eta=0.0\n\nexp_heun_2_x0_sde\n- solver_type=phi_2, r=1.0, eta=1.0, s_noise=1.0",
+    "display_name": "SamplerSEEDS2",
+    "inputs": {
+      "eta": {
+        "name": "eta",
+        "tooltip": "Сила стохастичности"
+      },
+      "r": {
+        "name": "r",
+        "tooltip": "Относительный размер шага для промежуточной стадии (узел c2)"
+      },
+      "s_noise": {
+        "name": "s_noise",
+        "tooltip": "Множитель шума SDE"
+      },
+      "solver_type": {
+        "name": "solver_type"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplingPercentToSigma": {
@@ -9888,7 +13688,8 @@
     },
     "outputs": {
       "0": {
-        "name": "значение_сигмы"
+        "name": "значение сигмы",
+        "tooltip": null
       }
     }
   },
@@ -9990,7 +13791,8 @@
         "name": "изображение"
       },
       "mesh": {
-        "name": "сетка"
+        "name": "сетка",
+        "tooltip": "Меш или GLB-файл для сохранения"
       }
     }
   },
@@ -10008,6 +13810,44 @@
       }
     }
   },
+  "SaveImageDataSetToFolder": {
+    "display_name": "Сохранить набор изображений в папку",
+    "inputs": {
+      "filename_prefix": {
+        "name": "filename_prefix",
+        "tooltip": "Префикс для имен файлов сохранённых изображений."
+      },
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "Имя папки для сохранения изображений (внутри выходного каталога)."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Список изображений для сохранения."
+      }
+    }
+  },
+  "SaveImageTextDataSetToFolder": {
+    "display_name": "Сохранить набор изображений и текстов в папку",
+    "inputs": {
+      "filename_prefix": {
+        "name": "filename_prefix",
+        "tooltip": "Префикс для имен файлов сохранённых изображений."
+      },
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "Имя папки для сохранения изображений (внутри выходного каталога)."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Список изображений для сохранения."
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "Список текстовых подписей для сохранения."
+      }
+    }
+  },
   "SaveImageWebsocket": {
     "display_name": "Сохранить изображение через веб-сокет",
     "inputs": {
@@ -10027,6 +13867,23 @@
       }
     }
   },
+  "SaveLoRA": {
+    "display_name": "Сохранить веса LoRA",
+    "inputs": {
+      "lora": {
+        "name": "lora",
+        "tooltip": "Модель LoRA для сохранения. Не используйте модель со слоями LoRA."
+      },
+      "prefix": {
+        "name": "prefix",
+        "tooltip": "Префикс для сохранённого файла LoRA."
+      },
+      "steps": {
+        "name": "steps",
+        "tooltip": "Необязательно: количество шагов, на которые обучалась LoRA, используется для имени файла."
+      }
+    }
+  },
   "SaveSVGNode": {
     "description": "Сохранить SVG файлы на диске.",
     "display_name": "SaveSVGNode",
@@ -10040,6 +13897,27 @@
       }
     }
   },
+  "SaveTrainingDataset": {
+    "display_name": "Сохранить обучающий набор данных",
+    "inputs": {
+      "conditioning": {
+        "name": "conditioning",
+        "tooltip": "Список списков conditioning из MakeTrainingDataset."
+      },
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "Имя папки для сохранения набора данных (внутри выходного каталога)."
+      },
+      "latents": {
+        "name": "latents",
+        "tooltip": "Список словарей latent из MakeTrainingDataset."
+      },
+      "shard_size": {
+        "name": "shard_size",
+        "tooltip": "Количество образцов в каждом файле-части."
+      }
+    }
+  },
   "SaveVideo": {
     "description": "Сохраняет входные изображения в вашу папку вывода ComfyUI.",
     "display_name": "Сохранить видео",
@@ -10160,6 +14038,11 @@
       "sigmas": {
         "name": "сигмы"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SetHookKeyframes": {
@@ -10200,6 +14083,58 @@
       }
     }
   },
+  "ShuffleDataset": {
+    "display_name": "Перемешать набор изображений",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Список изображений для обработки."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Случайное зерно."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Обработанные изображения"
+      }
+    }
+  },
+  "ShuffleImageTextDataset": {
+    "display_name": "Перемешать набор изображений и текстов",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Список изображений для перемешивания."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Случайное зерно."
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "Список текстов для перемешивания."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Перемешанные изображения"
+      },
+      "1": {
+        "name": "texts",
+        "tooltip": "Перемешанные тексты"
+      }
+    }
+  },
   "SkipLayerGuidanceDiT": {
     "description": "Универсальная версия ноды SkipLayerGuidance, которую можно использовать на любой модели DiT.",
     "display_name": "Пропустить руководство по слоям DiT",
@@ -10296,6 +14231,11 @@
       "width": {
         "name": "ширина"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SplitAudioChannels": {
@@ -10308,10 +14248,35 @@
     },
     "outputs": {
       "0": {
-        "name": "левый"
+        "name": "левый",
+        "tooltip": null
       },
       "1": {
-        "name": "правый"
+        "name": "правый",
+        "tooltip": null
+      }
+    }
+  },
+  "SplitImageToTileList": {
+    "description": "Разделяет изображение на пакетированный список тайлов с заданным перекрытием.",
+    "display_name": "Разделить изображение на список тайлов",
+    "inputs": {
+      "image": {
+        "name": "image"
+      },
+      "overlap": {
+        "name": "overlap"
+      },
+      "tile_height": {
+        "name": "tile_height"
+      },
+      "tile_width": {
+        "name": "tile_width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
       }
     }
   },
@@ -10343,10 +14308,12 @@
     },
     "outputs": {
       "0": {
-        "name": "высокие_сигмы"
+        "name": "высокие сигмы",
+        "tooltip": null
       },
       "1": {
-        "name": "низкие_сигмы"
+        "name": "низкие сигмы",
+        "tooltip": null
       }
     }
   },
@@ -10362,10 +14329,12 @@
     },
     "outputs": {
       "0": {
-        "name": "высокие_сигмы"
+        "name": "высокие сигмы",
+        "tooltip": null
       },
       "1": {
-        "name": "низкие_сигмы"
+        "name": "низкие сигмы",
+        "tooltip": null
       }
     }
   },
@@ -10969,6 +14938,21 @@
       }
     }
   },
+  "StripWhitespace": {
+    "display_name": "Удалить пробелы",
+    "inputs": {
+      "texts": {
+        "name": "тексты",
+        "tooltip": "Текст для обработки."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "тексты",
+        "tooltip": "Обработанные тексты"
+      }
+    }
+  },
   "StyleModelApply": {
     "display_name": "Применить модель стиля",
     "inputs": {
@@ -11054,6 +15038,123 @@
       }
     }
   },
+  "Tencent3DPartNode": {
+    "description": "Автоматически выполняет идентификацию и генерацию компонентов на основе структуры модели.",
+    "display_name": "Hunyuan3D: 3D Part",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model_3d": {
+        "name": "model_3d",
+        "tooltip": "3D-модель в формате FBX. Модель должна содержать менее 30000 граней."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed управляет необходимостью повторного запуска узла; результаты не являются детерминированными независимо от seed."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "TencentImageToModelNode": {
+    "display_name": "Hunyuan3D: Изображение(я) в модель (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "контроль после генерации"
+      },
+      "face_count": {
+        "name": "количество граней"
+      },
+      "generate_type": {
+        "name": "тип генерации"
+      },
+      "generate_type_pbr": {
+        "name": "pbr"
+      },
+      "image": {
+        "name": "изображение"
+      },
+      "image_back": {
+        "name": "изображение сзади"
+      },
+      "image_left": {
+        "name": "изображение слева"
+      },
+      "image_right": {
+        "name": "изображение справа"
+      },
+      "model": {
+        "name": "модель",
+        "tooltip": "Опция LowPoly недоступна для модели `3.1`."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed управляет тем, будет ли узел запускаться повторно; результаты всегда недетерминированы, независимо от seed."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "файл модели",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "OBJ",
+        "tooltip": null
+      }
+    }
+  },
+  "TencentTextToModelNode": {
+    "display_name": "Hunyuan3D: Текст в модель (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "контроль после генерации"
+      },
+      "face_count": {
+        "name": "количество граней"
+      },
+      "generate_type": {
+        "name": "тип генерации"
+      },
+      "generate_type_pbr": {
+        "name": "pbr"
+      },
+      "model": {
+        "name": "модель",
+        "tooltip": "Опция LowPoly недоступна для модели `3.1`."
+      },
+      "prompt": {
+        "name": "промпт",
+        "tooltip": "Поддерживается до 1024 символов."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed управляет тем, будет ли узел запускаться повторно; результаты всегда недетерминированы, независимо от seed."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "файл модели",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "OBJ",
+        "tooltip": null
+      }
+    }
+  },
   "TextEncodeAceStepAudio": {
     "display_name": "TextEncodeAceStepAudio",
     "inputs": {
@@ -11076,6 +15177,65 @@
       }
     }
   },
+  "TextEncodeAceStepAudio1_5": {
+    "display_name": "TextEncodeAceStepAudio1.5",
+    "inputs": {
+      "bpm": {
+        "name": "bpm"
+      },
+      "cfg_scale": {
+        "name": "cfg_scale"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "control_after_generate": {
+        "name": "контроль после генерации"
+      },
+      "duration": {
+        "name": "длительность"
+      },
+      "generate_audio_codes": {
+        "name": "генерировать аудиокоды",
+        "tooltip": "Включить LLM, который генерирует аудиокоды. Это может быть медленно, но повысит качество сгенерированного аудио. Отключите, если вы предоставляете модели аудиореференс."
+      },
+      "keyscale": {
+        "name": "тональность"
+      },
+      "language": {
+        "name": "язык"
+      },
+      "lyrics": {
+        "name": "текст песни"
+      },
+      "min_p": {
+        "name": "min_p"
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "tags": {
+        "name": "теги"
+      },
+      "temperature": {
+        "name": "температура"
+      },
+      "timesignature": {
+        "name": "размер"
+      },
+      "top_k": {
+        "name": "top_k"
+      },
+      "top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TextEncodeHunyuanVideo_ImageToVideo": {
     "display_name": "TextEncodeHunyuanVideo_ImageToVideo",
     "inputs": {
@@ -11149,6 +15309,158 @@
       }
     }
   },
+  "TextEncodeZImageOmni": {
+    "display_name": "TextEncodeZImageOmni",
+    "inputs": {
+      "auto_resize_images": {
+        "name": "автоматическое_изменение_размера_изображений"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "image1": {
+        "name": "изображение1"
+      },
+      "image2": {
+        "name": "изображение2"
+      },
+      "image3": {
+        "name": "изображение3"
+      },
+      "image_encoder": {
+        "name": "кодировщик_изображения"
+      },
+      "prompt": {
+        "name": "промпт"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TextGenerate": {
+    "display_name": "TextGenerate",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image": {
+        "name": "изображение"
+      },
+      "max_length": {
+        "name": "максимальная длина"
+      },
+      "prompt": {
+        "name": "запрос"
+      },
+      "sampling_mode": {
+        "name": "режим выборки"
+      },
+      "sampling_mode_min_p": {
+        "name": "min_p"
+      },
+      "sampling_mode_repetition_penalty": {
+        "name": "штраф за повторение"
+      },
+      "sampling_mode_seed": {
+        "name": "seed"
+      },
+      "sampling_mode_temperature": {
+        "name": "температура"
+      },
+      "sampling_mode_top_k": {
+        "name": "top_k"
+      },
+      "sampling_mode_top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "сгенерированный текст",
+        "tooltip": null
+      }
+    }
+  },
+  "TextGenerateLTX2Prompt": {
+    "display_name": "TextGenerateLTX2Prompt",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image": {
+        "name": "изображение"
+      },
+      "max_length": {
+        "name": "максимальная длина"
+      },
+      "prompt": {
+        "name": "подсказка"
+      },
+      "sampling_mode": {
+        "name": "режим выборки"
+      },
+      "sampling_mode_min_p": {
+        "name": "минимальное p"
+      },
+      "sampling_mode_repetition_penalty": {
+        "name": "штраф за повторение"
+      },
+      "sampling_mode_seed": {
+        "name": "seed"
+      },
+      "sampling_mode_temperature": {
+        "name": "температура"
+      },
+      "sampling_mode_top_k": {
+        "name": "top_k"
+      },
+      "sampling_mode_top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "сгенерированный текст",
+        "tooltip": null
+      }
+    }
+  },
+  "TextToLowercase": {
+    "display_name": "Преобразовать текст в нижний регистр",
+    "inputs": {
+      "texts": {
+        "name": "тексты",
+        "tooltip": "Текст для обработки."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "тексты",
+        "tooltip": "Обработанные тексты"
+      }
+    }
+  },
+  "TextToUppercase": {
+    "display_name": "Преобразовать текст в верхний регистр",
+    "inputs": {
+      "texts": {
+        "name": "тексты",
+        "tooltip": "Текст для обработки."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "тексты",
+        "tooltip": "Обработанные тексты"
+      }
+    }
+  },
   "ThresholdMask": {
     "display_name": "Пороговая маска",
     "inputs": {
@@ -11158,6 +15470,11 @@
       "value": {
         "name": "значение"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "TomePatchModel": {
@@ -11176,6 +15493,118 @@
       }
     }
   },
+  "TopazImageEnhance": {
+    "description": "Промышленный стандарт увеличения и улучшения изображений.",
+    "display_name": "Topaz Улучшение изображения",
+    "inputs": {
+      "color_preservation": {
+        "name": "сохранение цвета",
+        "tooltip": "Сохранять оригинальные цвета."
+      },
+      "creativity": {
+        "name": "креативность"
+      },
+      "crop_to_fill": {
+        "name": "обрезать до заполнения",
+        "tooltip": "По умолчанию изображение добавляется с полями, если соотношение сторон отличается. Включите, чтобы обрезать изображение до заполнения выходных размеров."
+      },
+      "face_enhancement": {
+        "name": "улучшение лица",
+        "tooltip": "Улучшить лица (если присутствуют) во время обработки."
+      },
+      "face_enhancement_creativity": {
+        "name": "креативность улучшения лица",
+        "tooltip": "Установить уровень креативности для улучшения лица."
+      },
+      "face_enhancement_strength": {
+        "name": "степень улучшения лица",
+        "tooltip": "Контролирует, насколько четкими будут улучшенные лица по сравнению с фоном."
+      },
+      "face_preservation": {
+        "name": "сохранение лица",
+        "tooltip": "Сохранять идентичность лица объекта."
+      },
+      "image": {
+        "name": "изображение"
+      },
+      "model": {
+        "name": "модель"
+      },
+      "output_height": {
+        "name": "выходная высота",
+        "tooltip": "Нулевое значение означает вывод в той же высоте, что и оригинал, или output_width."
+      },
+      "output_width": {
+        "name": "выходная ширина",
+        "tooltip": "Нулевое значение означает автоматический расчет (обычно это будет исходный размер или output_height, если указано)."
+      },
+      "prompt": {
+        "name": "промпт",
+        "tooltip": "Необязательный текстовый промпт для творческого управления увеличением."
+      },
+      "subject_detection": {
+        "name": "обнаружение объекта"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TopazVideoEnhance": {
+    "description": "Оживите видео с помощью мощных технологий увеличения разрешения и восстановления.",
+    "display_name": "Topaz Video Enhance",
+    "inputs": {
+      "dynamic_compression_level": {
+        "name": "уровень динамического сжатия",
+        "tooltip": "Уровень CQP."
+      },
+      "interpolation_duplicate": {
+        "name": "удаление дубликатов кадров",
+        "tooltip": "Анализировать входное видео на наличие дублирующихся кадров и удалять их."
+      },
+      "interpolation_duplicate_threshold": {
+        "name": "порог дубликатов кадров",
+        "tooltip": "Чувствительность обнаружения дублирующихся кадров."
+      },
+      "interpolation_enabled": {
+        "name": "включить интерполяцию"
+      },
+      "interpolation_frame_rate": {
+        "name": "частота кадров интерполяции",
+        "tooltip": "Частота кадров на выходе."
+      },
+      "interpolation_model": {
+        "name": "модель интерполяции"
+      },
+      "interpolation_slowmo": {
+        "name": "замедление интерполяции",
+        "tooltip": "Фактор замедления, применяемый к входному видео. Например, 2 делает выход в два раза медленнее и удваивает длительность."
+      },
+      "upscaler_creativity": {
+        "name": "креативность увеличителя",
+        "tooltip": "Уровень креативности (применяется только к Starlight (Astra) Creative)."
+      },
+      "upscaler_enabled": {
+        "name": "включить увеличитель"
+      },
+      "upscaler_model": {
+        "name": "модель увеличителя"
+      },
+      "upscaler_resolution": {
+        "name": "разрешение увеличителя"
+      },
+      "video": {
+        "name": "видео"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TorchCompileModel": {
     "display_name": "Скомпилировать модель Torch",
     "inputs": {
@@ -11203,6 +15632,18 @@
         "name": "размер пакета",
         "tooltip": "Размер пакета, используемый для обучения."
       },
+      "bucket_mode": {
+        "name": "режим корзины разрешений",
+        "tooltip": "Включить режим корзины разрешений. При включении ожидает предварительно разбитые латенты от узла ResolutionBucket."
+      },
+      "bypass_mode": {
+        "name": "bypass_mode",
+        "tooltip": "Включить режим обхода для обучения. При включении адаптеры применяются через forward hooks вместо изменения весов. Полезно для квантизованных моделей, где веса нельзя изменить напрямую."
+      },
+      "checkpoint_depth": {
+        "name": "checkpoint_depth",
+        "tooltip": "Уровень глубины для градиентного чекпоинтинга."
+      },
       "control_after_generate": {
         "name": "управление после генерации"
       },
@@ -11238,6 +15679,10 @@
         "name": "модель",
         "tooltip": "Модель для обучения LoRA."
       },
+      "offloading": {
+        "name": "offloading",
+        "tooltip": "Уровень глубины для градиентного чекпоинтинга."
+      },
       "optimizer": {
         "name": "оптимизатор",
         "tooltip": "Оптимизатор, используемый для обучения."
@@ -11265,16 +15710,16 @@
     },
     "outputs": {
       "0": {
-        "name": "модель с lora"
+        "name": "lora",
+        "tooltip": "Модель с применённой LoRA"
       },
       "1": {
-        "name": "lora"
+        "name": "карта потерь",
+        "tooltip": "Веса LoRA"
       },
       "2": {
-        "name": "потери"
-      },
-      "3": {
-        "name": "шаги"
+        "name": "шаги",
+        "tooltip": "История потерь"
       }
     }
   },
@@ -11293,6 +15738,11 @@
         "name": "start_index",
         "tooltip": "Время начала в секундах, может быть отрицательным для отсчёта с конца (поддерживает доли секунд)."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "TrimVideoLatent": {
@@ -11334,23 +15784,62 @@
   "TripoConversionNode": {
     "display_name": "Tripo: Конвертировать модель",
     "inputs": {
+      "animate_in_place": {
+        "name": "анимировать на месте"
+      },
+      "bake": {
+        "name": "запечь"
+      },
+      "export_orientation": {
+        "name": "экспортировать ориентацию"
+      },
+      "export_vertex_colors": {
+        "name": "экспортировать цвета вершин"
+      },
       "face_limit": {
         "name": "face_limit"
       },
+      "fbx_preset": {
+        "name": "FBX-пресет"
+      },
+      "flatten_bottom": {
+        "name": "выравнивание низа"
+      },
+      "flatten_bottom_threshold": {
+        "name": "порог выравнивания низа"
+      },
+      "force_symmetry": {
+        "name": "принудительная симметрия"
+      },
       "format": {
         "name": "format"
       },
       "original_model_task_id": {
         "name": "original_model_task_id"
       },
+      "pack_uv": {
+        "name": "упаковать UV"
+      },
+      "part_names": {
+        "name": "имена частей"
+      },
+      "pivot_to_center_bottom": {
+        "name": "центрировать нижнюю точку"
+      },
       "quad": {
         "name": "quad"
       },
+      "scale_factor": {
+        "name": "коэффициент масштабирования"
+      },
       "texture_format": {
         "name": "texture_format"
       },
       "texture_size": {
         "name": "texture_size"
+      },
+      "with_animation": {
+        "name": "с анимацией"
       }
     }
   },
@@ -11360,6 +15849,9 @@
       "face_limit": {
         "name": "face_limit"
       },
+      "geometry_quality": {
+        "name": "качество геометрии"
+      },
       "image": {
         "name": "image"
       },
@@ -11397,11 +15889,15 @@
     },
     "outputs": {
       "0": {
-        "name": "model_file",
+        "name": "файл модели",
         "tooltip": null
       },
       "1": {
-        "name": "model task_id",
+        "name": "task_id модели",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11412,6 +15908,9 @@
       "face_limit": {
         "name": "лимит_лиц"
       },
+      "geometry_quality": {
+        "name": "качество геометрии"
+      },
       "image": {
         "name": "image"
       },
@@ -11455,11 +15954,15 @@
     },
     "outputs": {
       "0": {
-        "name": "файл_модели",
+        "name": "файл модели",
         "tooltip": null
       },
       "1": {
-        "name": "идентификатор_задачи_модели",
+        "name": "task_id модели",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11475,11 +15978,15 @@
     },
     "outputs": {
       "0": {
-        "name": "файл_модели",
+        "name": "файл модели",
         "tooltip": null
       },
       "1": {
-        "name": "идентификатор_задачи_модели",
+        "name": "task_id модели",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11496,11 +16003,15 @@
     },
     "outputs": {
       "0": {
-        "name": "файл_модели",
+        "name": "файл модели",
         "tooltip": null
       },
       "1": {
-        "name": "идентификатор_задачи_перепривязки",
+        "name": "task_id ретаргетинга",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11514,11 +16025,15 @@
     },
     "outputs": {
       "0": {
-        "name": "файл_модели",
+        "name": "файл модели",
         "tooltip": null
       },
       "1": {
-        "name": "идентификатор_задачи_риггинга",
+        "name": "task_id рига",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11529,6 +16044,9 @@
       "face_limit": {
         "name": "face_limit"
       },
+      "geometry_quality": {
+        "name": "качество геометрии"
+      },
       "image_seed": {
         "name": "image_seed"
       },
@@ -11565,11 +16083,15 @@
     },
     "outputs": {
       "0": {
-        "name": "model_file",
+        "name": "файл модели",
         "tooltip": null
       },
       "1": {
-        "name": "model task_id",
+        "name": "task_id модели",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11598,12 +16120,35 @@
     },
     "outputs": {
       "0": {
-        "name": "model_file",
+        "name": "файл модели",
         "tooltip": null
       },
       "1": {
-        "name": "model task_id",
+        "name": "task_id текстуры",
         "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "TruncateText": {
+    "display_name": "Обрезать текст",
+    "inputs": {
+      "max_length": {
+        "name": "максимальная длина",
+        "tooltip": "Максимальная длина текста."
+      },
+      "texts": {
+        "name": "тексты",
+        "tooltip": "Текст для обработки."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "тексты",
+        "tooltip": "Обработанные тексты"
       }
     }
   },
@@ -11748,6 +16293,33 @@
       "vae": {
         "name": "vae"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VAEDecodeAudioTiled": {
+    "display_name": "VAE декодирование аудио (плитками)",
+    "inputs": {
+      "overlap": {
+        "name": "перекрытие"
+      },
+      "samples": {
+        "name": "образцы"
+      },
+      "tile_size": {
+        "name": "размер плитки"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VAEDecodeHunyuan3D": {
@@ -11765,6 +16337,11 @@
       "vae": {
         "name": "vae"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VAEDecodeTiled": {
@@ -11812,6 +16389,11 @@
       "vae": {
         "name": "vae"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VAEEncodeForInpaint": {
@@ -11890,6 +16472,63 @@
       "steps": {
         "name": "шаги"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Veo3FirstLastFrameNode": {
+    "description": "Генерировать видео по текстовому описанию и первым и последним кадрам.",
+    "display_name": "Google Veo 3: от первого до последнего кадра в видео",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "Соотношение сторон выходного видео"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration": {
+        "name": "duration",
+        "tooltip": "Длительность выходного видео в секундах"
+      },
+      "first_frame": {
+        "name": "first_frame",
+        "tooltip": "Начальный кадр"
+      },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "Сгенерировать аудио для видео."
+      },
+      "last_frame": {
+        "name": "last_frame",
+        "tooltip": "Конечный кадр"
+      },
+      "model": {
+        "name": "model"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Негативный текстовый запрос для указания, чего избегать в видео"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Текстовое описание видео"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Сид для генерации видео"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "Veo3VideoGenerationNode": {
@@ -11996,6 +16635,31 @@
       }
     }
   },
+  "Video Slice": {
+    "display_name": "Видеофрагмент",
+    "inputs": {
+      "duration": {
+        "name": "длительность",
+        "tooltip": "Длительность в секундах, или 0 для неограниченной длительности"
+      },
+      "start_time": {
+        "name": "время начала",
+        "tooltip": "Время начала в секундах"
+      },
+      "strict_duration": {
+        "name": "строгая длительность",
+        "tooltip": "Если Истина, при невозможности указанной длительности будет вызвана ошибка."
+      },
+      "video": {
+        "name": "видео"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "VideoLinearCFGGuidance": {
     "display_name": "Направление Video Linear CFG",
     "inputs": {
@@ -12018,6 +16682,319 @@
       }
     }
   },
+  "Vidu2ImageToVideoNode": {
+    "description": "Создаёт видео из изображения и необязательной текстовой подсказки.",
+    "display_name": "Vidu2: генерация видео из изображения",
+    "inputs": {
+      "control_after_generate": {
+        "name": "управление после генерации"
+      },
+      "duration": {
+        "name": "длительность"
+      },
+      "image": {
+        "name": "изображение",
+        "tooltip": "Изображение, которое будет использовано в качестве первого кадра сгенерированного видео."
+      },
+      "model": {
+        "name": "модель"
+      },
+      "movement_amplitude": {
+        "name": "амплитуда движения",
+        "tooltip": "Амплитуда движения объектов в кадре."
+      },
+      "prompt": {
+        "name": "подсказка",
+        "tooltip": "Необязательная текстовая подсказка для генерации видео (максимум 2000 символов)."
+      },
+      "resolution": {
+        "name": "разрешение"
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2ReferenceVideoNode": {
+    "description": "Создаёт видео из нескольких референсных изображений и подсказки.",
+    "display_name": "Vidu2: генерация видео по референсам",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "соотношение сторон"
+      },
+      "audio": {
+        "name": "аудио",
+        "tooltip": "Если включено, видео будет содержать сгенерированную речь и фоновую музыку на основе подсказки."
+      },
+      "control_after_generate": {
+        "name": "управление после генерации"
+      },
+      "duration": {
+        "name": "длительность"
+      },
+      "model": {
+        "name": "модель"
+      },
+      "movement_amplitude": {
+        "name": "амплитуда движения",
+        "tooltip": "Амплитуда движения объектов в кадре."
+      },
+      "prompt": {
+        "name": "подсказка",
+        "tooltip": "Если включено, видео будет содержать сгенерированную речь и фоновую музыку на основе подсказки."
+      },
+      "resolution": {
+        "name": "разрешение"
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "subjects": {
+        "name": "объекты",
+        "tooltip": "Для каждого объекта предоставьте до 3 референсных изображений (всего до 7 изображений для всех объектов). Ссылайтесь на них в подсказках через @subject{subject_id}."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2StartEndToVideoNode": {
+    "description": "Создайте видео из начального кадра, конечного кадра и текстового запроса.",
+    "display_name": "Vidu2 Генерация видео по начальному и конечному кадрам",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "end_frame": {
+        "name": "end_frame"
+      },
+      "first_frame": {
+        "name": "first_frame"
+      },
+      "model": {
+        "name": "model"
+      },
+      "movement_amplitude": {
+        "name": "movement_amplitude",
+        "tooltip": "Амплитуда движения объектов в кадре."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Описание запроса (максимум 2000 символов)."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2TextToVideoNode": {
+    "description": "Создайте видео по текстовому запросу",
+    "display_name": "Vidu2 Генерация видео по тексту",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "background_music": {
+        "name": "background_music",
+        "tooltip": "Добавлять ли фоновую музыку к сгенерированному видео."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Текстовое описание для генерации видео, максимум 2000 символов."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3ImageToVideoNode": {
+    "description": "Создайте видео из изображения и необязательной текстовой подсказки.",
+    "display_name": "Vidu Q3: генерация видео из изображения",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "Изображение, используемое в качестве первого кадра генерируемого видео."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Модель для генерации видео."
+      },
+      "model_audio": {
+        "name": "audio"
+      },
+      "model_duration": {
+        "name": "duration"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Необязательная текстовая подсказка для генерации видео (максимум 2000 символов)."
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3StartEndToVideoNode": {
+    "description": "Создайте видео, используя начальный кадр, конечный кадр и текстовый запрос.",
+    "display_name": "Vidu Q3 Генерация видео по начальному и конечному кадрам",
+    "inputs": {
+      "control_after_generate": {
+        "name": "контроль после генерации"
+      },
+      "end_frame": {
+        "name": "конечный кадр"
+      },
+      "first_frame": {
+        "name": "начальный кадр"
+      },
+      "model": {
+        "name": "модель",
+        "tooltip": "Модель для генерации видео."
+      },
+      "model_audio": {
+        "name": "аудио"
+      },
+      "model_duration": {
+        "name": "длительность"
+      },
+      "model_resolution": {
+        "name": "разрешение"
+      },
+      "prompt": {
+        "name": "промпт",
+        "tooltip": "Описание промпта (максимум 2000 символов)."
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3TextToVideoNode": {
+    "description": "Создайте видео по текстовой подсказке.",
+    "display_name": "Vidu Q3: генерация видео по тексту",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Модель для генерации видео."
+      },
+      "model_aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "model_audio": {
+        "name": "audio"
+      },
+      "model_duration": {
+        "name": "duration"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Текстовое описание для генерации видео, максимум 2000 символов."
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ViduExtendVideoNode": {
+    "description": "Расширьте существующее видео, сгенерировав дополнительные кадры.",
+    "display_name": "Vidu: расширение видео",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "end_frame": {
+        "name": "end_frame"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Модель для расширения видео."
+      },
+      "model_duration": {
+        "name": "duration"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Необязательная текстовая подсказка для расширенного видео (максимум 2000 символов)."
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "Исходное видео для расширения."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ViduImageToVideoNode": {
     "description": "Генерация видео из изображения и необязательного промпта",
     "display_name": "Vidu Image To Video Generation",
@@ -12060,6 +17037,49 @@
       }
     }
   },
+  "ViduMultiFrameVideoNode": {
+    "description": "Создайте видео с несколькими переходами между ключевыми кадрами.",
+    "display_name": "Vidu: генерация видео с несколькими ключевыми кадрами",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "frames": {
+        "name": "frames",
+        "tooltip": "Количество переходов между ключевыми кадрами (2-9)."
+      },
+      "frames_duration1": {
+        "name": "duration1"
+      },
+      "frames_duration2": {
+        "name": "duration2"
+      },
+      "frames_prompt1": {
+        "name": "prompt1"
+      },
+      "frames_prompt2": {
+        "name": "prompt2"
+      },
+      "model": {
+        "name": "model"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "start_image": {
+        "name": "start_image",
+        "tooltip": "Изображение начального кадра. Соотношение сторон должно быть от 1:4 до 4:1."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ViduReferenceVideoNode": {
     "description": "Генерация видео из нескольких изображений и промпта",
     "display_name": "Vidu Reference To Video Generation",
@@ -12206,6 +17226,11 @@
       "voxel": {
         "name": "voxel"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VoxelToMeshBasic": {
@@ -12217,6 +17242,11 @@
       "voxel": {
         "name": "воксель"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "Wan22FunControlToVideo": {
@@ -12496,6 +17526,10 @@
         "name": "шаг_контекста",
         "tooltip": "Шаг контекстного окна; применимо только к равномерным расписаниям."
       },
+      "freenoise": {
+        "name": "freenoise",
+        "tooltip": "Применять ли FreeNoise для перемешивания шума, улучшает смешивание окон."
+      },
       "fuse_method": {
         "name": "метод_объединения",
         "tooltip": "Метод объединения контекстных окон."
@@ -12836,6 +17870,10 @@
         "name": "сид",
         "tooltip": "Сид для использования при генерации."
       },
+      "shot_type": {
+        "name": "shot_type",
+        "tooltip": "Указывает тип кадра для сгенерированного видео, то есть будет ли видео одним непрерывным кадром или несколькими с переходами. Этот параметр действует только если prompt_extend установлен в True."
+      },
       "watermark": {
         "name": "водяной_знак",
         "tooltip": "Добавлять ли водяной знак \"Сгенерировано ИИ\" к результату."
@@ -12847,6 +17885,196 @@
       }
     }
   },
+  "WanInfiniteTalkToVideo": {
+    "display_name": "WanInfiniteTalkToVideo",
+    "inputs": {
+      "audio_encoder_output_1": {
+        "name": "выход аудиоэнкодера 1"
+      },
+      "audio_scale": {
+        "name": "масштаб аудио"
+      },
+      "clip_vision_output": {
+        "name": "выход clip vision"
+      },
+      "height": {
+        "name": "высота"
+      },
+      "length": {
+        "name": "длина"
+      },
+      "mode": {
+        "name": "режим"
+      },
+      "model": {
+        "name": "модель"
+      },
+      "model_patch": {
+        "name": "патч модели"
+      },
+      "motion_frame_count": {
+        "name": "количество кадров движения",
+        "tooltip": "Количество предыдущих кадров, используемых как контекст движения."
+      },
+      "negative": {
+        "name": "негативный"
+      },
+      "positive": {
+        "name": "позитивный"
+      },
+      "previous_frames": {
+        "name": "предыдущие кадры"
+      },
+      "start_image": {
+        "name": "стартовое изображение"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "ширина"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "модель",
+        "tooltip": null
+      },
+      "1": {
+        "name": "позитивный",
+        "tooltip": null
+      },
+      "2": {
+        "name": "негативный",
+        "tooltip": null
+      },
+      "3": {
+        "name": "latent",
+        "tooltip": null
+      },
+      "4": {
+        "name": "обрезанное изображение",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveConcatTrack": {
+    "display_name": "WanMoveConcatTrack",
+    "inputs": {
+      "tracks_1": {
+        "name": "tracks_1"
+      },
+      "tracks_2": {
+        "name": "tracks_2"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveTrackToVideo": {
+    "display_name": "WanMoveTrackToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "размер_пакета"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "высота"
+      },
+      "length": {
+        "name": "длина"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "start_image": {
+        "name": "стартовое_изображение"
+      },
+      "strength": {
+        "name": "интенсивность",
+        "tooltip": "Сила трековой кондиционировки."
+      },
+      "tracks": {
+        "name": "треки"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "ширина"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveTracksFromCoords": {
+    "display_name": "WanMoveTracksFromCoords",
+    "inputs": {
+      "track_coords": {
+        "name": "track_coords"
+      },
+      "track_mask": {
+        "name": "track_mask"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "track_length",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveVisualizeTracks": {
+    "display_name": "WanMoveVisualizeTracks",
+    "inputs": {
+      "circle_size": {
+        "name": "размер_круга"
+      },
+      "images": {
+        "name": "изображения"
+      },
+      "line_resolution": {
+        "name": "разрешение_линии"
+      },
+      "line_width": {
+        "name": "толщина_линии"
+      },
+      "opacity": {
+        "name": "непрозрачность"
+      },
+      "tracks": {
+        "name": "треки"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "WanPhantomSubjectToVideo": {
     "display_name": "WanPhantomSubjectToVideo",
     "inputs": {
@@ -12894,6 +18122,113 @@
       }
     }
   },
+  "WanReferenceVideoApi": {
+    "description": "Используйте персонажа и голос из входных видео, чтобы с помощью промпта сгенерировать новое видео с сохранением целостности персонажа.",
+    "display_name": "Wan Reference to Video",
+    "inputs": {
+      "control_after_generate": {
+        "name": "контроль_после_генерации"
+      },
+      "duration": {
+        "name": "длительность"
+      },
+      "model": {
+        "name": "модель"
+      },
+      "negative_prompt": {
+        "name": "негативный_промпт",
+        "tooltip": "Негативный промпт, описывающий, чего следует избегать."
+      },
+      "prompt": {
+        "name": "промпт",
+        "tooltip": "Промпт, описывающий элементы и визуальные особенности. Поддерживает английский и китайский языки. Используйте идентификаторы, такие как `character1` и `character2`, чтобы ссылаться на референсных персонажей."
+      },
+      "reference_videos": {
+        "name": "референсные_видео"
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "shot_type": {
+        "name": "тип_кадра",
+        "tooltip": "Указывает тип кадра для генерируемого видео: один непрерывный кадр или несколько с монтажом."
+      },
+      "size": {
+        "name": "размер"
+      },
+      "watermark": {
+        "name": "водяной_знак",
+        "tooltip": "Добавлять ли AI-сгенерированный водяной знак к результату."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanSCAILToVideo": {
+    "display_name": "WanSCAILToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "размер_пакета"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "высота"
+      },
+      "length": {
+        "name": "длина"
+      },
+      "negative": {
+        "name": "негативный"
+      },
+      "pose_end": {
+        "name": "конец_позы",
+        "tooltip": "Шаг окончания использования условия позы."
+      },
+      "pose_start": {
+        "name": "начало_позы",
+        "tooltip": "Шаг начала использования условия позы."
+      },
+      "pose_strength": {
+        "name": "сила_позы",
+        "tooltip": "Сила латентного пространства позы."
+      },
+      "pose_video": {
+        "name": "видео_позы",
+        "tooltip": "Видео, используемое для условия позы. Будет уменьшено до половины разрешения основного видео."
+      },
+      "positive": {
+        "name": "позитивный"
+      },
+      "reference_image": {
+        "name": "референсное_изображение"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "ширина"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "позитивный",
+        "tooltip": null
+      },
+      "1": {
+        "name": "негативный",
+        "tooltip": null
+      },
+      "2": {
+        "name": "латентный",
+        "tooltip": "Пустое латентное пространство размера генерации."
+      }
+    }
+  },
   "WanSoundImageToVideo": {
     "display_name": "WanSoundImageToVideo",
     "inputs": {
@@ -13072,6 +18407,10 @@
         "name": "seed",
         "tooltip": "Сид для генерации."
       },
+      "shot_type": {
+        "name": "тип_кадра",
+        "tooltip": "Указывает тип кадра для генерируемого видео: один непрерывный кадр или несколько с монтажом. Этот параметр действует только если prompt_extend установлен в True."
+      },
       "size": {
         "name": "size"
       },
@@ -13197,6 +18536,43 @@
       }
     }
   },
+  "WavespeedFlashVSRNode": {
+    "description": "Быстрый и качественный апскейлер видео, повышающий разрешение и восстанавливающий чёткость для низкокачественных или размытых кадров.",
+    "display_name": "FlashVSR Видео Апскейл",
+    "inputs": {
+      "target_resolution": {
+        "name": "целевое_разрешение"
+      },
+      "video": {
+        "name": "видео"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WavespeedImageUpscaleNode": {
+    "description": "Увеличьте разрешение и качество изображения, апскейл фотографий до 4K или 8K для чётких и детализированных результатов.",
+    "display_name": "WaveSpeed Апскейл Изображения",
+    "inputs": {
+      "image": {
+        "name": "изображение"
+      },
+      "model": {
+        "name": "model"
+      },
+      "target_resolution": {
+        "name": "целевое_разрешение"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "WebcamCapture": {
     "display_name": "Захват с веб-камеры",
     "inputs": {
@@ -13209,13 +18585,38 @@
       "image": {
         "name": "изображение"
       },
-      "waiting for camera___": {
-      },
+      "waiting for camera___": {},
       "width": {
         "name": "ширина"
       }
     }
   },
+  "ZImageFunControlnet": {
+    "display_name": "ZImageFunControlnet",
+    "inputs": {
+      "image": {
+        "name": "изображение"
+      },
+      "inpaint_image": {
+        "name": "inpaint_изображение"
+      },
+      "mask": {
+        "name": "mask"
+      },
+      "model": {
+        "name": "модель"
+      },
+      "model_patch": {
+        "name": "model_patch"
+      },
+      "strength": {
+        "name": "интенсивность"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
   "unCLIPCheckpointLoader": {
     "display_name": "Загрузчик контрольной точки unCLIP",
     "inputs": {
@@ -13240,5 +18641,19 @@
         "name": "сила"
       }
     }
+  },
+  "wanBlockSwap": {
+    "description": "NOP",
+    "display_name": "wanBlockSwap",
+    "inputs": {
+      "model": {
+        "name": "model"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
   }
 }
diff --git a/src/locales/ru/settings.json b/src/locales/ru/settings.json
index 3a467472d9..ec5f53313f 100644
--- a/src/locales/ru/settings.json
+++ b/src/locales/ru/settings.json
@@ -52,7 +52,8 @@
     }
   },
   "Comfy_Canvas_SelectionToolbox": {
-    "name": "Показать панель инструментов выбора"
+    "name": "Показать панель инструментов выбора",
+    "tooltip": "Отображает плавающую панель инструментов при выборе узлов, предоставляя быстрый доступ к основным действиям."
   },
   "Comfy_ConfirmClear": {
     "name": "Требовать подтверждение при очистке рабочего процесса"
@@ -79,6 +80,17 @@
   "Comfy_EnableWorkflowViewRestore": {
     "name": "Сохранять и восстанавливать положение и уровень масштабирования холста в рабочих процессах"
   },
+  "Comfy_Execution_PreviewMethod": {
+    "name": "Метод живого предпросмотра",
+    "options": {
+      "auto": "auto",
+      "default": "default",
+      "latent2rgb": "latent2rgb",
+      "none": "none",
+      "taesd": "taesd"
+    },
+    "tooltip": "Метод живого предпросмотра во время генерации изображения. «default» использует настройку CLI сервера."
+  },
   "Comfy_FloatRoundingPrecision": {
     "name": "Количество знаков после запятой для округления плавающего виджета [0 = авто].",
     "tooltip": "(требуется перезагрузка страницы)"
@@ -92,6 +104,10 @@
   "Comfy_Graph_CtrlShiftZoom": {
     "name": "Включить быстрый зум с помощью сочетания клавиш (Ctrl + Shift + Колёсико мыши)"
   },
+  "Comfy_Graph_DeduplicateSubgraphNodeIds": {
+    "name": "Удалить дубликаты идентификаторов узлов подграфа",
+    "tooltip": "Автоматически переназначать повторяющиеся идентификаторы узлов в подграфах при загрузке рабочего процесса."
+  },
   "Comfy_Graph_LinkMarkers": {
     "name": "Маркер середины ссылки",
     "options": {
@@ -100,6 +116,10 @@
       "None": "Нет"
     }
   },
+  "Comfy_Graph_LiveSelection": {
+    "name": "Живое выделение",
+    "tooltip": "Если включено, узлы выделяются/снимаются в реальном времени при перетаскивании прямоугольника выделения, как в других графических редакторах."
+  },
   "Comfy_Graph_ZoomSpeed": {
     "name": "Скорость зума холста"
   },
@@ -132,43 +152,53 @@
       "Linear": "Линейный",
       "Spline": "Сплайн",
       "Straight": "Прямой"
-    }
+    },
+    "tooltip": "Управляет внешним видом и видимостью соединительных линий между узлами на холсте."
   },
   "Comfy_Load3D_3DViewerEnable": {
-    "name": "Включить 3D-просмотрщик (Бета)",
-    "tooltip": "Включает 3D-просмотрщик (Бета) для выбранных узлов. Эта функция позволяет визуализировать и взаимодействовать с 3D-моделями прямо в полноразмерном 3D-просмотрщике."
+    "name": "Включить 3D просмотрщик (Бета)",
+    "tooltip": "Включает 3D просмотрщик (Бета) для выбранных узлов. Эта функция позволяет визуализировать и взаимодействовать с 3D моделями прямо во встроенном полноразмерном 3D просмотрщике."
   },
   "Comfy_Load3D_BackgroundColor": {
     "name": "Начальный цвет фона",
-    "tooltip": "Управляет цветом фона по умолчанию для 3D-сцены. Этот параметр определяет внешний вид фона при создании нового 3D-виджета, но может быть изменён индивидуально для каждого виджета после создания."
+    "tooltip": "Управляет цветом фона по умолчанию для 3D сцены. Эта настройка определяет внешний вид фона при создании нового 3D виджета, но может быть изменена индивидуально для каждого виджета после создания."
   },
   "Comfy_Load3D_CameraType": {
-    "name": "Тип камеры",
+    "name": "Начальный тип камеры",
     "options": {
       "orthographic": "ортографическая",
       "perspective": "перспективная"
     },
-    "tooltip": "Управляет тем, является ли камера перспективной или ортографической по умолчанию при создании нового 3D-виджета. Это значение по умолчанию все еще может быть переключено индивидуально для каждого виджета после его создания."
+    "tooltip": "Определяет, будет ли камера по умолчанию перспективной или ортографической при создании нового 3D виджета. Этот параметр можно изменить индивидуально для каждого виджета после создания."
   },
   "Comfy_Load3D_LightAdjustmentIncrement": {
     "name": "Шаг регулировки освещения",
-    "tooltip": "Определяет размер шага при регулировке интенсивности освещения в 3D-сценах. Меньшее значение шага позволяет более точно настраивать освещение, а большее значение приводит к более заметным изменениям при каждой регулировке."
+    "tooltip": "Определяет размер шага при изменении интенсивности освещения в 3D сценах. Меньшее значение позволяет более точно настраивать освещение, а большее — приводит к более заметным изменениям при каждом шаге."
   },
   "Comfy_Load3D_LightIntensity": {
     "name": "Начальная интенсивность освещения",
-    "tooltip": "Устанавливает уровень яркости освещения по умолчанию в 3D-сцене. Это значение определяет, насколько сильно источники света освещают объекты при создании нового 3D-виджета, но может быть изменено для каждого виджета отдельно после создания."
+    "tooltip": "Устанавливает уровень яркости освещения по умолчанию в 3D сцене. Это значение определяет, насколько ярко свет освещает объекты при создании нового 3D виджета, но может быть изменено индивидуально для каждого виджета после создания."
   },
   "Comfy_Load3D_LightIntensityMaximum": {
-    "name": "Максимальная интенсивность света",
-    "tooltip": "Устанавливает максимальное допустимое значение интенсивности света для 3D-сцен. Определяет верхний предел яркости, который можно задать при настройке освещения в любом 3D-виджете."
+    "name": "Максимальная интенсивность освещения",
+    "tooltip": "Устанавливает максимальное допустимое значение интенсивности освещения для 3D сцен. Это определяет верхний предел яркости, который можно установить при настройке освещения в любом 3D виджете."
   },
   "Comfy_Load3D_LightIntensityMinimum": {
-    "name": "Минимальная интенсивность света",
-    "tooltip": "Устанавливает минимально допустимое значение интенсивности света для 3D-сцен. Определяет нижний предел яркости, который можно установить при настройке освещения в любом 3D-виджете."
+    "name": "Минимальная интенсивность освещения",
+    "tooltip": "Устанавливает минимальное допустимое значение интенсивности освещения для 3D сцен. Это определяет нижний предел яркости, который можно установить при настройке освещения в любом 3D виджете."
+  },
+  "Comfy_Load3D_PLYEngine": {
+    "name": "Движок PLY",
+    "options": {
+      "fastply": "fastply",
+      "sparkjs": "sparkjs",
+      "threejs": "threejs"
+    },
+    "tooltip": "Выберите движок для загрузки PLY файлов. \"threejs\" использует встроенный загрузчик Three.js PLYLoader (лучше всего подходит для файлов сетки PLY). \"fastply\" использует оптимизированный загрузчик для ASCII PLY файлов облака точек. \"sparkjs\" использует Spark.js для PLY файлов с 3D Gaussian Splatting."
   },
   "Comfy_Load3D_ShowGrid": {
-    "name": "Показать сетку",
-    "tooltip": "Переключиться, чтобы показывать сетку по умолчанию"
+    "name": "Начальная видимость сетки",
+    "tooltip": "Определяет, будет ли сетка видимой по умолчанию при создании нового 3D виджета. Этот параметр можно изменить индивидуально для каждого виджета после создания."
   },
   "Comfy_Locale": {
     "name": "Язык"
@@ -218,11 +248,20 @@
   "Comfy_NodeBadge_ShowApiPricing": {
     "name": "Показать значок стоимости узла API"
   },
+  "Comfy_NodeLibrary_NewDesign": {
+    "name": "Новый дизайн библиотеки узлов",
+    "tooltip": "Включить обновлённую боковую панель библиотеки узлов с вкладками (Основные, Все, Пользовательские), улучшенным поиском и предварительным просмотром при наведении."
+  },
+  "Comfy_NodeReplacement_Enabled": {
+    "name": "Включить автоматическую замену узлов",
+    "tooltip": "Если включено, отсутствующие узлы могут быть автоматически заменены их новыми эквивалентами, если существует соответствие для замены."
+  },
   "Comfy_NodeSearchBoxImpl": {
     "name": "Реализация поискового поля нод",
     "options": {
       "default": "по умолчанию",
-      "litegraph (legacy)": "litegraph (устаревший)"
+      "litegraph (legacy)": "litegraph (устаревший)",
+      "v1 (legacy)": "v1 (устаревший)"
     }
   },
   "Comfy_NodeSearchBoxImpl_NodePreview": {
@@ -248,6 +287,10 @@
   "Comfy_Node_AllowImageSizeDraw": {
     "name": "Показывать ширину × высоту под предварительным просмотром изображения"
   },
+  "Comfy_Node_AlwaysShowAdvancedWidgets": {
+    "name": "Всегда показывать расширенные виджеты на всех узлах",
+    "tooltip": "Если включено, расширенные виджеты всегда видны на всех узлах без необходимости раскрывать их по отдельности."
+  },
   "Comfy_Node_AutoSnapLinkToSlot": {
     "name": "Автоматически привязывать ссылку к слоту ноды",
     "tooltip": "При перетаскивании ссылки над нодой ссылка автоматически привязывается к подходящему входному слоту ноды"
@@ -308,6 +351,14 @@
     "name": "Размер истории очереди",
     "tooltip": "Максимальное количество задач, отображаемых в истории очереди."
   },
+  "Comfy_Queue_QPOV2": {
+    "name": "Использовать объединённую очередь заданий в боковой панели ресурсов",
+    "tooltip": "Заменяет плавающую панель очереди заданий на аналогичную очередь, встроенную в боковую панель ресурсов. Вы можете отключить эту опцию, чтобы вернуться к плавающей панели."
+  },
+  "Comfy_RightSidePanel_ShowErrorsTab": {
+    "name": "Показать вкладку ошибок в боковой панели",
+    "tooltip": "Если включено, во вкладке ошибок в правой боковой панели будут отображаться ошибки выполнения рабочего процесса."
+  },
   "Comfy_Sidebar_Location": {
     "name": "Расположение боковой панели",
     "options": {
@@ -345,6 +396,14 @@
   "Comfy_TreeExplorer_ItemPadding": {
     "name": "Отступ элемента в проводнике дерева"
   },
+  "Comfy_UI_TabBarLayout": {
+    "name": "Макет панели вкладок",
+    "options": {
+      "Default": "По умолчанию",
+      "Integrated": "Интегрированный"
+    },
+    "tooltip": "Управляет расположением панели вкладок. «Интегрированный» перемещает элементы управления Справкой и Пользователем в область панели вкладок."
+  },
   "Comfy_UseNewMenu": {
     "name": "Использовать новое меню",
     "options": {
@@ -434,6 +493,7 @@
     "tooltip": "Смещение контрольной точки Безье от центральной точки перераспределения"
   },
   "pysssss_SnapToGrid": {
-    "name": "Всегда привязываться к сетке"
+    "name": "Всегда привязываться к сетке",
+    "tooltip": "Если включено, узлы будут автоматически выравниваться по сетке при перемещении или изменении размера."
   }
 }
diff --git a/src/locales/tr/commands.json b/src/locales/tr/commands.json
index a502c32789..6037ed13aa 100644
--- a/src/locales/tr/commands.json
+++ b/src/locales/tr/commands.json
@@ -1,6 +1,42 @@
 {
+  "Comfy-Desktop_CheckForUpdates": {
+    "label": "Güncellemeleri Kontrol Et"
+  },
+  "Comfy-Desktop_Folders_OpenCustomNodesFolder": {
+    "label": "Özel Düğüm Klasörünü Aç"
+  },
+  "Comfy-Desktop_Folders_OpenInputsFolder": {
+    "label": "Girdi Klasörünü Aç"
+  },
+  "Comfy-Desktop_Folders_OpenLogsFolder": {
+    "label": "Kayıt Klasörünü Aç"
+  },
+  "Comfy-Desktop_Folders_OpenModelConfig": {
+    "label": "extra_model_paths.yaml dosyasını Aç"
+  },
+  "Comfy-Desktop_Folders_OpenModelsFolder": {
+    "label": "Model Klasörünü Aç"
+  },
+  "Comfy-Desktop_Folders_OpenOutputsFolder": {
+    "label": "Çıktı Klasörünü Aç"
+  },
+  "Comfy-Desktop_OpenDevTools": {
+    "label": "Geliştirici Araçlarını Aç"
+  },
+  "Comfy-Desktop_OpenUserGuide": {
+    "label": "Masaüstü Kullanıcı Kılavuzu"
+  },
+  "Comfy-Desktop_Quit": {
+    "label": "Çıkış"
+  },
+  "Comfy-Desktop_Reinstall": {
+    "label": "Yeniden Yükle"
+  },
+  "Comfy-Desktop_Restart": {
+    "label": "Yeniden Başlat"
+  },
   "Comfy_3DViewer_Open3DViewer": {
-    "label": "Seçili Düğüm için 3D Görüntüleyiciyi (Beta) Aç"
+    "label": "Seçili Düğüm için 3D Görüntüleyiciyi Aç (Beta)"
   },
   "Comfy_BrowseModelAssets": {
     "label": "Deneysel: Model Varlıklarını Gözat"
@@ -8,6 +44,9 @@
   "Comfy_BrowseTemplates": {
     "label": "Şablonlara Gözat"
   },
+  "Comfy_Canvas_CopySelected": {
+    "label": "Kopyala"
+  },
   "Comfy_Canvas_DeleteSelectedItems": {
     "label": "Seçili Öğeleri Sil"
   },
@@ -29,12 +68,18 @@
   "Comfy_Canvas_MoveSelectedNodes_Up": {
     "label": "Seçili Düğümleri Yukarı Taşı"
   },
+  "Comfy_Canvas_PasteFromClipboard": {
+    "label": "Yapıştır"
+  },
   "Comfy_Canvas_ResetView": {
     "label": "Görünümü Sıfırla"
   },
   "Comfy_Canvas_Resize": {
     "label": "Seçili Düğümleri Yeniden Boyutlandır"
   },
+  "Comfy_Canvas_SelectAll": {
+    "label": "Tümünü Seç"
+  },
   "Comfy_Canvas_ToggleLinkVisibility": {
     "label": "Tuval Bağlantı Görünürlüğünü Aç/Kapat"
   },
@@ -155,18 +200,30 @@
   "Comfy_Manager_ShowUpdateAvailablePacks": {
     "label": "Özel Düğüm Güncellemelerini Kontrol Et"
   },
-  "Comfy_Manager_ToggleManagerProgressDialog": {
-    "label": "Özel Düğüm Yöneticisi İlerleme Çubuğunu Aç/Kapat"
-  },
   "Comfy_MaskEditor_BrushSize_Decrease": {
     "label": "Maske Düzenleyicide Fırça Boyutunu Azalt"
   },
   "Comfy_MaskEditor_BrushSize_Increase": {
     "label": "Maske Düzenleyicide Fırça Boyutunu Artır"
   },
+  "Comfy_MaskEditor_ColorPicker": {
+    "label": "MaskEditor'da Renk Seçiciyi Aç"
+  },
+  "Comfy_MaskEditor_Mirror_Horizontal": {
+    "label": "MaskEditor'da Yatay Aynala"
+  },
+  "Comfy_MaskEditor_Mirror_Vertical": {
+    "label": "MaskEditor'da Dikey Aynala"
+  },
   "Comfy_MaskEditor_OpenMaskEditor": {
     "label": "Seçili Düğüm için Maske Düzenleyiciyi Aç"
   },
+  "Comfy_MaskEditor_Rotate_Left": {
+    "label": "MaskEditor'da Sola Döndür"
+  },
+  "Comfy_MaskEditor_Rotate_Right": {
+    "label": "MaskEditor'da Sağa Döndür"
+  },
   "Comfy_Memory_UnloadModels": {
     "label": "Modelleri Boşalt"
   },
@@ -197,12 +254,18 @@
   "Comfy_QueueSelectedOutputNodes": {
     "label": "Seçili Çıktı Düğümlerini Kuyruğa Al"
   },
+  "Comfy_Queue_ToggleOverlay": {
+    "label": "İş Geçmişini Göster/Gizle"
+  },
   "Comfy_Redo": {
     "label": "Yinele"
   },
   "Comfy_RefreshNodeDefinitions": {
     "label": "Düğüm Tanımlarını Yenile"
   },
+  "Comfy_RenameWorkflow": {
+    "label": "Çalışma Akışını Yeniden Adlandır"
+  },
   "Comfy_SaveWorkflow": {
     "label": "İş Akışını Kaydet"
   },
@@ -212,6 +275,12 @@
   "Comfy_ShowSettingsDialog": {
     "label": "Ayarlar İletişim Kutusunu Göster"
   },
+  "Comfy_Subgraph_SetDescription": {
+    "label": "Alt Grafik Açıklamasını Ayarla"
+  },
+  "Comfy_Subgraph_SetSearchAliases": {
+    "label": "Alt Grafik Arama Takma Adlarını Ayarla"
+  },
   "Comfy_ToggleAssetAPI": {
     "label": "Deneysel: AssetAPI'yi Etkinleştir"
   },
@@ -221,6 +290,12 @@
   "Comfy_ToggleHelpCenter": {
     "label": "Yardım Merkezi"
   },
+  "Comfy_ToggleLinear": {
+    "label": "Doğrusal Modu Aç/Kapat"
+  },
+  "Comfy_ToggleQPOV2": {
+    "label": "Kuyruk Paneli V2'yi Aç/Kapat"
+  },
   "Comfy_ToggleTheme": {
     "label": "Temayı Değiştir (Karanlık/Açık)"
   },
@@ -269,6 +344,10 @@
   "Workspace_ToggleFocusMode": {
     "label": "Odak Modunu Aç/Kapat"
   },
+  "Workspace_ToggleSidebarTab_apps": {
+    "label": "Uygulamalar Kenar Çubuğunu Aç/Kapat",
+    "tooltip": "Uygulamalar"
+  },
   "Workspace_ToggleSidebarTab_assets": {
     "label": "Varlıklar Kenar Çubuğunu Aç/Kapat",
     "tooltip": "Varlıklar"
diff --git a/src/locales/tr/main.json b/src/locales/tr/main.json
index b23c9426db..51fb6df8e2 100644
--- a/src/locales/tr/main.json
+++ b/src/locales/tr/main.json
@@ -1,6 +1,8 @@
 {
   "actionbar": {
-    "dockToTop": "Üste sabitle"
+    "dockToTop": "Üste sabitle",
+    "feedback": "Geri bildirim",
+    "feedbackTooltip": "Geri bildirim"
   },
   "apiNodesCostBreakdown": {
     "costPerRun": "Çalıştırma başına maliyet",
@@ -14,26 +16,175 @@
   "assetBrowser": {
     "allCategory": "Tüm {category}",
     "allModels": "Tüm Modeller",
+    "apiKeyHint": "Özel veya kısıtlı modeller mi içe aktarılıyor? {link}.",
+    "apiKeyHintLink": "API anahtarlarınızı Ayarlar bölümüne ekleyin",
     "ariaLabel": {
       "assetCard": "{name} - {type} varlık",
       "loadingAsset": "Varlık yükleniyor"
     },
+    "assetCollection": "Varlık koleksiyonu",
     "assets": "Varlıklar",
+    "baseModel": "Temel model",
     "baseModels": "Temel modeller",
     "browseAssets": "Varlıklara Göz At",
+    "byType": "Türe göre",
+    "checkpoints": "Kontrol noktaları",
+    "civitaiLinkExample": "{example} {link}",
+    "civitaiLinkExampleStrong": "Örnek:",
+    "civitaiLinkExampleUrl": "https://civitai.com/models/10706/luisap-z-image-and-qwen-pixel-art-refiner?modelVersionId=2225295",
+    "civitaiLinkLabel": "Civitai model {download} bağlantısı",
+    "civitaiLinkLabelDownload": "indir",
+    "civitaiLinkPlaceholder": "Bağlantıyı buraya yapıştırın",
+    "confirmModelDetails": "Model Detaylarını Onayla",
     "connectionError": "Lütfen bağlantınızı kontrol edin ve tekrar deneyin",
+    "deletion": {
+      "body": "Bu model kütüphanenizden kalıcı olarak silinecek.",
+      "complete": "{assetName} silindi.",
+      "failed": "{assetName} silinemedi.",
+      "header": "Bu modeli silmek istiyor musunuz?",
+      "inProgress": "{assetName} siliniyor..."
+    },
+    "download": {
+      "complete": "İndirme tamamlandı",
+      "failed": "İndirme başarısız oldu",
+      "inProgress": "{assetName} indiriliyor..."
+    },
+    "emptyImported": {
+      "canImport": "Henüz içe aktarılmış model yok. Kendi modelinizi eklemek için \"Model İçe Aktar\"a tıklayın.",
+      "restricted": "Kişisel modeller yalnızca Creator ve üzeri seviyelerde kullanılabilir."
+    },
+    "errorAccessForbidden": "Bu kaynağa erişim yasak.",
+    "errorConnectionRefused": "Kaynağa bağlanılamıyor. Lütfen daha sonra tekrar deneyin.",
+    "errorDownloadCancelled": "İndirme iptal edildi.",
+    "errorFileTooLarge": "Dosya izin verilen maksimum boyut sınırını aşıyor",
+    "errorFormatNotAllowed": "Yalnızca SafeTensor formatı destekleniyor",
+    "errorHttpError": "Meta veriler alınırken bir hata oluştu.",
+    "errorInternalError": "Beklenmeyen bir hata oluştu. Lütfen tekrar deneyin.",
+    "errorInvalidHost": "Kaynak URL ana bilgisayarı çözümlenemedi.",
+    "errorInvalidUrl": "Lütfen bir URL girin.",
+    "errorInvalidUrlFormat": "URL formatı geçersiz. Lütfen kontrol edip tekrar deneyin.",
+    "errorMetadataFetchFailed": "Kaynaktan dosya bilgisi alınamadı.",
+    "errorModelTypeNotSupported": "Bu model türü desteklenmiyor",
+    "errorNetworkError": "Bir ağ hatası oluştu. Lütfen bağlantınızı kontrol edip tekrar deneyin.",
+    "errorNetworkTimeout": "İstek zaman aşımına uğradı. Lütfen tekrar deneyin.",
+    "errorRateLimited": "Çok fazla istek yapıldı. Lütfen birkaç dakika sonra tekrar deneyin.",
+    "errorRequestCancelled": "İstek iptal edildi.",
+    "errorResourceNotFound": "Dosya bulunamadı. Lütfen URL'yi kontrol edip tekrar deneyin.",
+    "errorServiceUnavailable": "Hizmet geçici olarak kullanılamıyor. Lütfen daha sonra tekrar deneyin.",
+    "errorSourceServerError": "Kaynak sunucusunda bir sorun var. Lütfen daha sonra tekrar deneyin.",
+    "errorUnauthorized": "Devam etmek için lütfen giriş yapın.",
+    "errorUnauthorizedSource": "Bu kaynak kimlik doğrulaması gerektiriyor. Lütfen ayarlardan API anahtarınızı ekleyin.",
+    "errorUnknown": "Beklenmeyen bir hata oluştu",
+    "errorUnsafePickleScan": "CivitAI bu dosyada potansiyel olarak güvensiz kod tespit etti",
+    "errorUnsafeVirusScan": "CivitAI bu dosyada kötü amaçlı yazılım veya şüpheli içerik tespit etti",
+    "errorUnsupportedSource": "Bu URL desteklenmiyor. Sadece Hugging Face ve Civitai URL'leri kabul edilir.",
+    "errorUploadFailed": "Varlık içe aktarılamadı. Lütfen tekrar deneyin.",
+    "errorUserTokenAccessDenied": "API anahtarınızın bu kaynağa erişimi yok. Lütfen anahtar izinlerinizi kontrol edin.",
+    "errorUserTokenInvalid": "Kayıtlı API anahtarınız geçersiz veya süresi dolmuş. Lütfen ayarlardan anahtarınızı güncelleyin.",
     "failedToCreateNode": "Düğüm oluşturulamadı. Lütfen tekrar deneyin veya ayrıntılar için konsolu kontrol edin.",
     "fileFormats": "Dosya formatları",
+    "fileName": "Dosya Adı",
+    "fileSize": "Dosya Boyutu",
+    "filterBy": "Filtrele",
+    "findInLibrary": "Bunu modeller kütüphanesinin {type} bölümünde bulabilirsiniz.",
+    "finish": "Bitir",
+    "genericLinkPlaceholder": "Bağlantıyı buraya yapıştırın",
+    "importAnother": "Başka Birini İçe Aktar",
+    "imported": "İçe aktarıldı",
+    "invalidAsset": "Geçersiz Varlık",
+    "invalidAssetDetail": "Seçilen varlık doğrulanamadı. Lütfen tekrar deneyin.",
+    "invalidFilename": "Geçersiz Dosya Adı",
+    "invalidFilenameDetail": "Varlık dosya adı belirlenemedi. Lütfen tekrar deneyin.",
+    "jobId": "İş ID",
     "loadingModels": "{type} yükleniyor...",
+    "maxFileSize": "Maksimum dosya boyutu: {size}",
+    "maxFileSizeValue": "1 GB",
+    "media": {
+      "audioPlaceholder": "Ses",
+      "threeDModelPlaceholder": "3D Model"
+    },
+    "modelAssociatedWithLink": "Sağladığınız bağlantı ile ilişkili model:",
+    "modelInfo": {
+      "addBaseModel": "Taban model ekle...",
+      "addTag": "Etiket ekle...",
+      "additionalTags": "Ek Etiketler",
+      "baseModelUnknown": "Taban model bilinmiyor",
+      "basicInfo": "Temel Bilgiler",
+      "compatibleBaseModels": "Uyumlu Taban Modelleri",
+      "description": "Açıklama",
+      "descriptionNotSet": "Açıklama ayarlanmadı",
+      "descriptionPlaceholder": "Bu model için bir açıklama ekleyin...",
+      "displayName": "Görünen Ad",
+      "editDisplayName": "Görünen Adı Düzenle",
+      "fileName": "Dosya Adı",
+      "modelDescription": "Model Açıklaması",
+      "modelTagging": "Model Etiketleme",
+      "modelType": "Model Türü",
+      "noAdditionalTags": "Ek etiket yok",
+      "selectModelPrompt": "Bilgilerini görmek için bir model seçin",
+      "selectModelType": "Model türü seç...",
+      "source": "Kaynak",
+      "title": "Model Bilgisi",
+      "triggerPhrases": "Tetikleyici İfadeler",
+      "viewOnSource": "{source} üzerinde görüntüle"
+    },
+    "modelName": "Model Adı",
+    "modelNamePlaceholder": "Bu model için bir ad girin",
+    "modelTypeSelectorLabel": "Bu hangi model türü?",
+    "modelTypeSelectorPlaceholder": "Model türünü seçin",
+    "modelUploaded": "Model başarıyla içe aktarıldı.",
     "noAssetsFound": "Varlık bulunamadı",
     "noModelsInFolder": "Bu klasörde {type} mevcut değil",
+    "noResultsCanImport": "Aramanızı veya filtrelerinizi ayarlamayı deneyin.\nAyrıca yukarıdaki \"İçe Aktar\" butonunu kullanarak modeller ekleyebilirsiniz.",
+    "noValidSourceDetected": "Geçerli bir içe aktarma kaynağı tespit edilmedi",
+    "notSureLeaveAsIs": "Emin değil misiniz? Olduğu gibi bırakın",
+    "onlyCivitaiUrlsSupported": "Yalnızca Civitai URL'leri destekleniyor",
+    "ownership": "Sahiplik",
+    "ownershipAll": "Tümü",
+    "ownershipMyModels": "Modellerim",
+    "ownershipPublicModels": "Herkese açık modeller",
+    "processingModel": "İndirme başladı",
+    "processingModelDescription": "Bu pencereyi kapatabilirsiniz. İndirme arka planda devam edecek.",
+    "providerCivitai": "Civitai",
+    "providerHuggingFace": "Hugging Face",
+    "rename": {
+      "failed": "Varlık yeniden adlandırılamadı."
+    },
+    "selectFrameworks": "Framework'leri Seçin",
+    "selectModelType": "Model türünü seçin",
+    "selectProjects": "Projeleri Seçin",
     "sortAZ": "A-Z",
     "sortBy": "Sırala",
+    "sortDefault": "Varsayılan",
     "sortPopular": "Popüler",
     "sortRecent": "En yeni",
     "sortZA": "Z-A",
+    "sortingType": "Sıralama Türü",
+    "tags": "Etiketler",
+    "tagsHelp": "Etiketleri virgül ile ayırın",
+    "tagsPlaceholder": "örn. modeller, checkpoint",
     "tryAdjustingFilters": "Aramanızı veya filtrelerinizi değiştirmeyi deneyin",
-    "unknown": "Bilinmeyen"
+    "unknown": "Bilinmeyen",
+    "unsupportedUrlSource": "Yalnızca {sources} kaynaklarından gelen URL'ler destekleniyor",
+    "upgradeFeatureDescription": "Bu özellik yalnızca Creator veya Pro planlarında mevcuttur.",
+    "upgradeToUnlockFeature": "Bu özelliğin kilidini açmak için yükseltin",
+    "upload": "İçe Aktar",
+    "uploadFailed": "İçe aktarma başarısız oldu",
+    "uploadModel": "İçe Aktar",
+    "uploadModelDescription1": "Bir Civitai model indirme bağlantısı yapıştırarak kütüphanenize ekleyin.",
+    "uploadModelDescription1Generic": "Bir model indirme bağlantısı yapıştırarak kütüphanenize ekleyin.",
+    "uploadModelDescription2": "Şu anda yalnızca {link} bağlantıları destekleniyor",
+    "uploadModelDescription2Generic": "Şu anda yalnızca aşağıdaki sağlayıcılardan gelen URL'ler destekleniyor:",
+    "uploadModelDescription2Link": "https://civitai.com/models",
+    "uploadModelDescription3": "Maksimum dosya boyutu: {size}",
+    "uploadModelFailedToRetrieveMetadata": "Meta veriler alınamadı. Lütfen bağlantıyı kontrol edip tekrar deneyin.",
+    "uploadModelFromCivitai": "Civitai'den model içe aktar",
+    "uploadModelGeneric": "Model içe aktar",
+    "uploadModelHelpFooterText": "URL'leri bulmakta yardıma mı ihtiyacınız var? Aşağıdan bir sağlayıcıya tıklayarak nasıl yapılır videosunu izleyin.",
+    "uploadModelHelpVideo": "Model Yükleme Yardım Videosu",
+    "uploadModelHowDoIFindThis": "Bunu nasıl bulurum?",
+    "uploadSuccess": "Model başarıyla içe aktarıldı!",
+    "uploadingModel": "Model içe aktarılıyor..."
   },
   "auth": {
     "apiKey": {
@@ -55,13 +206,7 @@
       "whitelistInfo": "Beyaz listede olmayan siteler hakkında"
     },
     "deleteAccount": {
-      "cancel": "İptal",
-      "confirm": "Hesabı Sil",
-      "confirmMessage": "Hesabınızı silmek istediğinizden emin misiniz? Bu işlem geri alınamaz ve tüm verilerinizi kalıcı olarak silecektir.",
-      "confirmTitle": "Hesabı Sil",
-      "deleteAccount": "Hesabı Sil",
-      "success": "Hesap Silindi",
-      "successDetail": "Hesabınız başarıyla silindi."
+      "contactSupport": "Hesabınızı silmek için lütfen {email} adresiyle iletişime geçin"
     },
     "errors": {
       "auth/cancelled-popup-request": "Giriş iptal edildi. Lütfen tekrar deneyin.",
@@ -80,6 +225,7 @@
     "login": {
       "andText": "ve",
       "backToLogin": "Girişe dön",
+      "backToSocialLogin": "Bunun yerine Google veya Github ile kaydolun",
       "confirmPasswordLabel": "Şifreyi Onayla",
       "confirmPasswordPlaceholder": "Aynı şifreyi tekrar girin",
       "didntReceiveEmail": "E-posta almadınız mı? Bize şu adresten ulaşın:",
@@ -88,6 +234,9 @@
       "failed": "Giriş başarısız",
       "forgotPassword": "Şifrenizi mi unuttunuz?",
       "forgotPasswordError": "Şifre sıfırlama e-postası gönderilemedi",
+      "freeTierBadge": "Ücretsiz Katman Uygun",
+      "freeTierDescription": "Google ile kaydolun, her ay {credits} ücretsiz kredi kazanın. Kart gerekmez.",
+      "freeTierDescriptionGeneric": "Google ile kaydolun, her ay ücretsiz kredi kazanın. Kart gerekmez.",
       "insecureContextWarning": "Bu bağlantı güvensiz (HTTP) - giriş yapmaya devam ederseniz kimlik bilgileriniz saldırganlar tarafından ele geçirilebilir.",
       "loginButton": "Giriş Yap",
       "loginWithGithub": "Github ile giriş yap",
@@ -106,11 +255,13 @@
       "sendResetLink": "Sıfırlama bağlantısını gönder",
       "signInOrSignUp": "Giriş Yap / Kaydol",
       "signUp": "Kaydol",
+      "signUpFreeTierPromo": "Yeni misiniz? Her ay {credits} ücretsiz kredi almak için Google ile {signUp} olun.",
       "success": "Giriş başarılı",
       "termsLink": "Kullanım Koşullarımızı",
       "termsText": "\"İleri\" veya \"Kaydol\" düğmesine tıklayarak,",
       "title": "Hesabınıza giriş yapın",
       "useApiKey": "Comfy API Anahtarı",
+      "useEmailInstead": "Bunun yerine e-posta kullan",
       "userAvatar": "Kullanıcı Avatarı"
     },
     "loginButton": {
@@ -130,11 +281,14 @@
     "signOut": {
       "signOut": "Çıkış Yap",
       "success": "Başarıyla çıkış yapıldı",
-      "successDetail": "Hesabınızdan başarıyla çıkış yaptınız."
+      "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?",
+      "unsavedChangesTitle": "Kaydedilmemiş Değişiklikler"
     },
     "signup": {
       "alreadyHaveAccount": "Zaten bir hesabınız var mı?",
       "emailLabel": "E-posta",
+      "emailNotEligibleForFreeTier": "E-posta ile kayıt Ücretsiz Katman için uygun değildir.",
       "emailPlaceholder": "E-postanızı girin",
       "passwordLabel": "Şifre",
       "passwordPlaceholder": "Yeni şifre girin",
@@ -147,12 +301,68 @@
       "title": "Hesap oluşturun"
     }
   },
+  "batch": {
+    "index": "{current} / {total}"
+  },
+  "billingOperation": {
+    "subscriptionFailed": "Abonelik güncellemesi başarısız oldu",
+    "subscriptionProcessing": "Ödeme işleniyor — çalışma alanınız hazırlanıyor...",
+    "subscriptionSuccess": "Abonelik başarıyla güncellendi",
+    "subscriptionTimeout": "Abonelik doğrulaması zaman aşımına uğradı",
+    "topupFailed": "Bakiye yükleme başarısız oldu",
+    "topupProcessing": "Ödeme işleniyor — krediler ekleniyor...",
+    "topupSuccess": "Krediler başarıyla eklendi",
+    "topupTimeout": "Bakiye yükleme doğrulaması zaman aşımına uğradı"
+  },
+  "boundingBox": {
+    "height": "Yükseklik",
+    "width": "Genişlik",
+    "x": "X",
+    "y": "Y"
+  },
   "breadcrumbsMenu": {
     "clearWorkflow": "İş Akışını Temizle",
     "deleteBlueprint": "Taslağı Sil",
     "deleteWorkflow": "İş Akışını Sil",
     "duplicate": "Çoğalt",
-    "enterNewName": "Yeni isim girin"
+    "enterAppMode": "Uygulama moduna gir",
+    "enterBuilderMode": "Uygulama oluşturucuya gir",
+    "enterNewName": "Yeni isim girin",
+    "exitAppMode": "Uygulama modundan çık",
+    "missingNodesWarning": "İş akışında desteklenmeyen düğümler var (kırmızı ile vurgulanmış).",
+    "workflowActions": "İş akışı işlemleri"
+  },
+  "builderMenu": {
+    "exitAppBuilder": "Uygulama oluşturucudan çık"
+  },
+  "builderToolbar": {
+    "app": "Uygulama",
+    "appDescription": "Varsayılan olarak uygulama olarak açılır",
+    "arrange": "Önizleme",
+    "arrangeDescription": "Uygulama düzenini gözden geçir",
+    "connectOutput": "Bir çıktı bağla",
+    "connectOutputBody1": "Uygulamanızın kaydedilebilmesi için en az bir çıktı bağlanmalıdır.",
+    "connectOutputBody2": "'Seç' adımına geçin ve çıktı düğümlerine tıklayarak buraya ekleyin.",
+    "defaultModeAppliedAppBody": "Bu iş akışı artık varsayılan olarak Uygulama Modunda açılacak.",
+    "defaultModeAppliedAppPrompt": "Şimdi görüntülemek ister misiniz?",
+    "defaultModeAppliedGraphBody": "Bu iş akışı artık varsayılan olarak bir düğüm grafiği olarak açılacak.",
+    "defaultModeAppliedGraphPrompt": "Uygulamayı yine de görüntülemek ister misiniz?",
+    "defaultModeAppliedTitle": "Başarıyla ayarlandı",
+    "defaultView": "Varsayılan görünümü ayarla",
+    "defaultViewDescription": "Nasıl açılacağını seçin",
+    "defaultViewLabel": "Varsayılan olarak, bu iş akışı şu şekilde açılacak:",
+    "defaultViewTitle": "Bu iş akışı için varsayılan görünümü ayarla",
+    "emptyWorkflowPrompt": "Bir şablonla başlamak ister misiniz?",
+    "emptyWorkflowTitle": "Bu iş akışında düğüm yok",
+    "inputs": "Girdiler",
+    "inputsDescription": "Girdileri seçin",
+    "label": "Uygulama Oluşturucu",
+    "nodeGraph": "Düğüm grafiği",
+    "nodeGraphDescription": "Varsayılan olarak düğüm grafiği olarak açılır",
+    "outputs": "Çıktılar",
+    "outputsDescription": "Çıktıları seçin",
+    "switchToOutputs": "Çıktılara Geç",
+    "viewApp": "Uygulamayı görüntüle"
   },
   "clipboard": {
     "errorMessage": "Panoya kopyalanamadı",
@@ -206,6 +416,7 @@
     },
     "retry": "Tekrar Dene",
     "retrying": "Yeniden deneniyor...",
+    "skipToCloudApp": "Bulut uygulamasına geç",
     "start": {
       "desc": "Kurulum gerekmez. Her cihazda çalışır.",
       "download": "ComfyUI'ı İndir",
@@ -339,6 +550,8 @@
     "Edit Subgraph Widgets": "Alt Grafik Widget'larını Düzenle",
     "Expand": "Genişlet",
     "Expand Node": "Düğümü Genişlet",
+    "Extensions": "Eklentiler",
+    "FavoriteWidget": "Widget'ı Favorilere Ekle",
     "Horizontal": "Yatay",
     "Inputs": "Girdiler",
     "Left": "Sol",
@@ -358,6 +571,7 @@
     "Remove": "Kaldır",
     "Remove Bypass": "Atlamayı Kaldır",
     "Rename": "Yeniden Adlandır",
+    "RenameWidget": "Widget'ı Yeniden Adlandır",
     "Resize": "Yeniden Boyutlandır",
     "Right": "Sağ",
     "Run Branch": "Dalı Çalıştır",
@@ -368,6 +582,7 @@
     "Shapes": "Şekiller",
     "Title": "Başlık",
     "Top": "Üst",
+    "UnfavoriteWidget": "Widget'ı Favorilerden Kaldır",
     "Unpack Subgraph": "Alt Grafiği Aç",
     "Unpin": "Sabitlemeyi Kaldır",
     "Vertical": "Dikey",
@@ -381,6 +596,7 @@
     "additionalInfo": "Ek Bilgi",
     "apiPricing": "API Fiyatlandırması",
     "credits": "Krediler",
+    "creditsAvailable": "Mevcut kredi",
     "details": "Detaylar",
     "eventType": "Etkinlik Türü",
     "faqs": "SSS",
@@ -389,15 +605,47 @@
     "messageSupport": "Destek Mesajı",
     "model": "Model",
     "purchaseCredits": "Kredi Satın Al",
+    "refreshes": "{date} tarihinde yenilenir",
     "time": "Zaman",
     "topUp": {
+      "addMoreCredits": "Daha fazla kredi ekle",
+      "addMoreCreditsToRun": "Çalıştırmak için daha fazla kredi ekle",
+      "amountToPayLabel": "Ödenecek tutar (dolar)",
+      "buy": "Satın Al",
+      "buyCredits": "Ödemeye devam et",
       "buyNow": "Şimdi al",
+      "contactUs": "Bize ulaşın",
+      "creditsDescription": "Krediler, iş akışlarını veya partner düğümlerini çalıştırmak için kullanılır.",
+      "creditsPerDollar": "dolar başına kredi",
+      "creditsToReceiveLabel": "Alınacak kredi",
+      "howManyCredits": "Kaç kredi eklemek istersiniz?",
       "insufficientMessage": "Bu iş akışını çalıştırmak için yeterli krediniz yok.",
       "insufficientTitle": "Yetersiz Kredi",
+      "insufficientWorkflowMessage": "Bu iş akışını çalıştırmak için yeterli krediniz yok.",
+      "maxAllowed": "En fazla {credits} kredi.",
       "maxAmount": "(Maks. 1.000 USD)",
+      "maximumAmount": "En fazla ${amount}.",
+      "minRequired": "En az {credits} kredi",
+      "minimumPurchase": "En az ${amount} ({credits} kredi)",
+      "needMore": "Daha fazlasına mı ihtiyacınız var?",
+      "purchaseError": "Satın Alma Başarısız",
+      "purchaseErrorDetail": "Kredi satın alınamadı: {error}",
+      "purchaseSuccess": "Krediler başarıyla eklendi!",
       "quickPurchase": "Hızlı Satın Alma",
       "seeDetails": "Detayları gör",
-      "topUp": "Yükleme Yap"
+      "selectAmount": "Tutar seç",
+      "templateNote": "*Wan Fun Control şablonu ile oluşturuldu",
+      "topUp": "Yükleme Yap",
+      "unknownError": "Bilinmeyen bir hata oluştu",
+      "usdAmount": "${amount}",
+      "videosEstimate": "~{count} video",
+      "viewPricing": "Fiyatlandırma detaylarını görüntüle",
+      "youGet": "Kredi",
+      "youPay": "Tutar (USD)"
+    },
+    "unified": {
+      "message": "Krediler birleştirildi",
+      "tooltip": "Comfy genelinde ödemeleri birleştirdik. Artık her şey Comfy Kredileri ile çalışıyor:\n- Partner Düğümleri (eski adıyla API düğümleri)\n- Bulut iş akışları\n\nMevcut Partner düğümü bakiyeniz kredilere dönüştürüldü."
     },
     "yourCreditBalance": "Kredi bakiyeniz"
   },
@@ -408,13 +656,26 @@
     "AUDIO_ENCODER_OUTPUT": "SES_KODLAYICI_ÇIKIŞI",
     "AUDIO_RECORD": "SES_KAYDI",
     "BOOLEAN": "BOOLEAN",
+    "BOUNDING_BOX": "BOUNDING_BOX",
     "CAMERA_CONTROL": "KAMERA_KONTROL",
     "CLIP": "CLIP",
     "CLIP_VISION": "CLIP_VISION",
     "CLIP_VISION_OUTPUT": "CLIP_VISION_ÇIKTISI",
+    "COLOR": "RENK",
     "COMBO": "COMBO",
+    "COMFY_AUTOGROW_V3": "COMFY_AUTOGROW_V3",
+    "COMFY_DYNAMICCOMBO_V3": "COMFY_DYNAMICCOMBO_V3",
+    "COMFY_MATCHTYPE_V3": "COMFY_MATCHTYPE_V3",
     "CONDITIONING": "KOŞULLANDIRMA",
     "CONTROL_NET": "KONTROL_AĞI",
+    "ELEVENLABS_VOICE": "ELEVENLABS_VOICE",
+    "FILE_3D": "FILE_3D",
+    "FILE_3D_FBX": "FILE_3D_FBX",
+    "FILE_3D_GLB": "FILE_3D_GLB",
+    "FILE_3D_GLTF": "FILE_3D_GLTF",
+    "FILE_3D_OBJ": "FILE_3D_OBJ",
+    "FILE_3D_STL": "FILE_3D_STL",
+    "FILE_3D_USDZ": "FILE_3D_USDZ",
     "FLOAT": "FLOAT",
     "FLOATS": "FLOATS",
     "GEMINI_INPUT_FILES": "GEMINI_GİRİŞ_DOSYALARI",
@@ -423,9 +684,11 @@
     "HOOKS": "Kancalar",
     "HOOK_KEYFRAMES": "Kanca_anahtar_kareleri",
     "IMAGE": "GÖRÜNTÜ",
+    "IMAGECOMPARE": "GÖRSELKARŞILAŞTIR",
     "INT": "TAMSAYI",
     "LATENT": "GİZLİ",
     "LATENT_OPERATION": "GİZLİ_İŞLEM",
+    "LATENT_UPSCALE_MODEL": "LATENT_UPSCALE_MODEL",
     "LOAD3D_CAMERA": "YÜKLE3D_KAMERA",
     "LOAD_3D": "3D_YÜKLE",
     "LORA_MODEL": "LORA_MODEL",
@@ -434,6 +697,8 @@
     "LUMA_REF": "LUMA_REF",
     "MASK": "MASKE",
     "MESH": "MESH",
+    "MESHY_RIGGED_TASK_ID": "MESHY_RIGGED_TASK_ID",
+    "MESHY_TASK_ID": "MESHY_TASK_ID",
     "MODEL": "MODEL",
     "MODEL_PATCH": "MODEL_YAMASI",
     "MODEL_TASK_ID": "MODEL_GÖREV_ID",
@@ -442,6 +707,7 @@
     "OPENAI_INPUT_FILES": "OPENAI_GİRİŞ_DOSYALARI",
     "PHOTOMAKER": "PHOTOMAKER",
     "PIXVERSE_TEMPLATE": "PIXVERSE_ŞABLONU",
+    "POSE_KEYPOINT": "POZ ANAHTAR NOKTASI",
     "RECRAFT_COLOR": "RECRAFT_RENK",
     "RECRAFT_CONTROLS": "RECRAFT_KONTROLLERİ",
     "RECRAFT_V3_STYLE": "RECRAFT_V3_STİLİ",
@@ -453,6 +719,7 @@
     "STYLE_MODEL": "STİL_MODELİ",
     "SVG": "SVG",
     "TIMESTEPS_RANGE": "ZAMAN_ADIMLARI_ARALIĞI",
+    "TRACKS": "TRACKS",
     "UPSCALE_MODEL": "YÜKSELTME_MODELİ",
     "VAE": "VAE",
     "VIDEO": "VİDEO",
@@ -511,24 +778,84 @@
     "noStackTrace": "Yığın izi mevcut değil",
     "promptExecutionError": "İstem yürütmesi başarısız oldu"
   },
+  "errorOverlay": {
+    "errorCount": "{count} HATA | {count} HATA | {count} HATA",
+    "seeErrors": "Hataları Gör"
+  },
+  "essentials": {
+    "batchImage": "Toplu Görüntü",
+    "canny": "Canny",
+    "cannyToImage": "Canny'den Görüntüye",
+    "cannyToVideo": "Canny'den Videoya",
+    "cropImage": "Görüntüyü Kırp",
+    "depthToImage": "Derinlikten Görüntüye",
+    "depthToVideo": "Derinlikten Videoya",
+    "extractFrame": "Kareyi Çıkar",
+    "imageCompare": "Görüntü Karşılaştır",
+    "imageTo3DModel": "Görüntüden 3D Modele",
+    "imageToImage": "Görüntüden Görüntüye",
+    "imageToVideo": "Görüntüden Videoya",
+    "inpaintImage": "Görüntüyü Tamamla",
+    "invert": "Ters Çevir",
+    "lipsync": "Dudak Senkronizasyonu",
+    "load3DModel": "3D Model Yükle",
+    "loadAudio": "Ses Yükle",
+    "loadImage": "Görüntü Yükle",
+    "loadStyleLora": "Stil Yükle (LoRA)",
+    "loadVideo": "Video Yükle",
+    "musicGeneration": "Müzik Üretimi",
+    "outpaintImage": "Görüntüyü Genişlet",
+    "poseToImage": "Pozdan Görüntüye",
+    "poseToVideo": "Pozdan Videoya",
+    "removeBackground": "Arka Planı Kaldır",
+    "resizeImage": "Görüntüyü Yeniden Boyutlandır",
+    "rotate": "Döndür",
+    "save3DModel": "3D Modeli Kaydet",
+    "saveAudio": "Sesi Kaydet",
+    "saveImage": "Görüntüyü Kaydet",
+    "saveVideo": "Videoyu Kaydet",
+    "text": "Metin",
+    "textGenerationLLM": "Metin Üretimi (LLM)",
+    "textTo3DModel": "Metinden 3D Modele",
+    "textToImage": "Metinden Görüntüye",
+    "textToVideo": "Metinden Videoya"
+  },
+  "exportToast": {
+    "allExportsCompleted": "Tüm dışa aktarmalar tamamlandı",
+    "downloadExport": "Dışa aktarmayı indir",
+    "downloadFailed": "\"{name}\" indirilemedi",
+    "exportCompleted": "ZIP indirme hazır",
+    "exportError": "Dışa aktarma başarısız",
+    "exportFailed": "{count} dışa aktarma başarısız oldu | {count} dışa aktarma başarısız oldu | {count} dışa aktarma başarısız oldu",
+    "exportFailedSingle": "ZIP dışa aktarımı oluşturulamadı",
+    "exportStarted": "ZIP indirme hazırlanıyor...",
+    "exportingAssets": "Varlıklar dışa aktarılıyor",
+    "noExportsInQueue": "Kuyrukta {filter} dışa aktarma yok",
+    "preparingExport": "Dışa aktarım hazırlanıyor...",
+    "retryDownload": "İndirmeyi tekrar dene"
+  },
   "g": {
     "1x": "1x",
     "2x": "2x",
     "about": "Hakkında",
     "add": "Ekle",
+    "addNode": "Bir düğüm ekle...",
     "addNodeFilterCondition": "Düğüm filtresi koşulu ekle",
     "all": "Tümü",
     "amount": "Miktar",
     "apply": "Uygula",
     "architecture": "Mimari",
+    "asset": "{count} varlık | {count} varlık | {count} varlık",
     "audioFailedToLoad": "Ses yüklenemedi",
     "audioProgress": "Ses ilerlemesi",
     "author": "Yazar",
     "back": "Geri",
+    "batchRename": "Toplu Yeniden Adlandır",
     "beta": "BETA",
     "bookmark": "Kütüphaneye Kaydet",
     "calculatingDimensions": "Boyutlar hesaplanıyor",
     "cancel": "İptal",
+    "cancelled": "İptal Edildi",
     "capture": "yakala",
     "category": "Kategori",
     "chart": "Grafik",
@@ -538,6 +865,8 @@
     "clearAll": "Tümünü temizle",
     "clearFilters": "Filtreleri Temizle",
     "close": "Kapat",
+    "closeDialog": "Diyaloğu kapat",
+    "collapseAll": "Hepsini daralt",
     "color": "Renk",
     "comfy": "Comfy",
     "comfyOrgLogoAlt": "ComfyOrg Logosu",
@@ -546,6 +875,7 @@
     "commandProhibited": "{command} komutu yasak. Daha fazla bilgi için bir yöneticiyle iletişime geçin.",
     "community": "Topluluk",
     "completed": "Tamamlandı",
+    "completedWithCheckmark": "Tamamlandı ✓",
     "confirm": "Onayla",
     "confirmed": "Onaylandı",
     "content": "içerik",
@@ -554,48 +884,73 @@
     "control_before_generate": "oluşturmadan önce kontrol et",
     "copied": "Kopyalandı",
     "copy": "Kopyala",
+    "copyAll": "Tümünü Kopyala",
     "copyJobId": "İş Kimliğini Kopyala",
     "copyToClipboard": "Panoya Kopyala",
     "copyURL": "URL'yi Kopyala",
+    "core": "Çekirdek",
     "currentUser": "Mevcut Kullanıcı",
+    "custom": "Özel",
     "customBackground": "Özel Arka Plan",
     "customize": "Özelleştir",
     "customizeFolder": "Klasörü Özelleştir",
+    "decrement": "Azalt",
     "defaultBanner": "varsayılan banner",
     "delete": "Sil",
     "deleteAudioFile": "Ses dosyasını sil",
     "deleteImage": "Görseli sil",
     "deprecated": "ESKİ",
     "description": "Açıklama",
+    "devOnly": "YALNIZCA GELİŞTİRİCİ",
     "devices": "Cihazlar",
     "disableAll": "Tümünü Devre Dışı Bırak",
+    "disableSelected": "Seçilenleri Devre Dışı Bırak",
+    "disableThirdParty": "Üçüncü Tarafı Devre Dışı Bırak",
     "disabling": "{id} devre dışı bırakılıyor",
+    "disconnectedFromBackend": "Sunucu ile bağlantı kesildi. Sunucunun çalışıp çalışmadığını kontrol edin.",
     "dismiss": "Kapat",
     "download": "İndir",
+    "downloadAudio": "Sesi indir",
     "downloadImage": "Görüntüyü indir",
     "downloadVideo": "Videoyu indir",
+    "downloadWithSize": "İndir ({size})",
+    "downloading": "İndiriliyor",
     "dropYourFileOr": "Dosyanızı buraya sürükleyin veya",
     "duplicate": "Çoğalt",
     "edit": "Düzenle",
     "editImage": "Görseli düzenle",
     "editOrMaskImage": "Görüntüyü düzenle veya maskele",
+    "emDash": "—",
     "empty": "Boş",
     "enableAll": "Tümünü Etkinleştir",
     "enableOrDisablePack": "Paketi etkinleştir veya devre dışı bırak",
+    "enableSelected": "Seçilenleri Etkinleştir",
     "enabled": "Etkin",
     "enabling": "{id} etkinleştiriliyor",
+    "enter": "Giriş",
+    "enterBaseName": "Temel adı girin",
+    "enterNewName": "Yeni adı girin",
+    "enterNewNamePrompt": "Yeni adı girin:",
+    "enterSubgraph": "Alt Grafiğe Gir",
     "error": "Hata",
     "errorLoadingImage": "Görüntü yüklenirken hata",
     "errorLoadingVideo": "Video yüklenirken hata",
+    "essentials": "Temel",
+    "expandAll": "Hepsini genişlet",
     "experimental": "BETA",
     "export": "Dışa Aktar",
     "extensionName": "Uzantı Adı",
+    "extensions": "Eklentiler",
+    "failed": "Başarısız",
     "failedToCopyJobId": "İş kimliği kopyalanamadı",
     "failedToDownloadImage": "Görüntü indirilemedi",
     "failedToDownloadVideo": "Video indirilemedi",
+    "favorites": "Favoriler",
     "feedback": "Geri Bildirim",
     "file": "dosya",
     "filter": "Filtrele",
+    "filterBy": "Filtrele:",
+    "filterByType": "{type} ile filtrele...",
     "findIssues": "Sorunları Bul",
     "frameNodes": "Çerçeve Düğümleri",
     "frontendNewer": "Ön uç sürümü {frontendVersion}, arka uç sürümü {backendVersion} ile uyumlu olmayabilir.",
@@ -605,23 +960,32 @@
     "goToNode": "Düğüme Git",
     "graphNavigation": "Grafik gezintisi",
     "halfSpeed": "0.5x",
+    "hideLeftPanel": "Sol paneli gizle",
+    "hideRightPanel": "Sağ paneli gizle",
     "icon": "Simge",
+    "imageDoesNotExist": "Görsel mevcut değil",
     "imageFailedToLoad": "Görsel yüklenemedi",
     "imagePreview": "Görüntü önizlemesi - Görüntüler arasında gezinmek için ok tuşlarını kullanın",
     "imageUrl": "Görsel URL'si",
     "import": "İçe Aktar",
     "inProgress": "Devam ediyor",
+    "inSubgraph": "'{name}' alt grafında",
+    "increment": "Arttır",
     "info": "Düğüm Bilgisi",
+    "input": "Girdi",
     "insert": "Ekle",
     "install": "Yükle",
     "installed": "Yüklendi",
     "installing": "Yükleniyor",
     "interrupted": "Kesintiye uğradı",
     "itemSelected": "{selectedCount} öğe seçildi",
+    "itemsCopiedToClipboard": "Öğeler panoya kopyalandı",
     "itemsSelected": "{selectedCount} öğe seçildi",
+    "job": "Görev",
     "jobIdCopied": "İş kimliği panoya kopyalandı",
     "keybinding": "Tuş Ataması",
     "keybindingAlreadyExists": "Tuş ataması zaten mevcut:",
+    "keybindings": "Kısayol Tuşları",
     "learnMore": "Daha fazla bilgi edinin",
     "listening": "Dinleniyor...",
     "liveSamplingPreview": "Canlı örnekleme önizlemesi",
@@ -632,18 +996,24 @@
     "login": "Giriş Yap",
     "logoAlt": "ComfyUI Logosu",
     "logs": "Kayıtlar",
+    "manageExtensions": "Eklentileri yönet",
     "markdown": "markdown",
     "micPermissionDenied": "Mikrofon izni reddedildi",
     "migrate": "Taşı",
     "missing": "Eksik",
+    "more": "Daha Fazla",
     "moreOptions": "Daha Fazla Seçenek",
     "moreWorkflows": "Daha fazla iş akışı",
+    "mostRelevant": "En alakalı",
     "multiSelectDropdown": "Çoklu seçim açılır menüsü",
     "name": "Ad",
     "newFolder": "Yeni Klasör",
     "next": "İleri",
+    "nightly": "NIGHTLY",
     "no": "Hayır",
     "noAudioRecorded": "Ses kaydedilmedi",
+    "noItems": "Öğe yok",
+    "noResults": "Sonuç Yok",
     "noResultsFound": "Sonuç Bulunamadı",
     "noTasksFound": "Görev Bulunamadı",
     "noTasksFoundMessage": "Kuyrukta görev yok.",
@@ -654,26 +1024,49 @@
     "nodeSlotsError": "Düğüm Yuva Hatası",
     "nodeWidgetsError": "Düğüm Widget Hatası",
     "nodes": "Düğümler",
+    "nodesCount": "{count} düğüm | {count} düğüm | {count} düğüm",
     "nodesRunning": "düğüm çalışıyor",
     "none": "Hiçbiri",
+    "nothingToCopy": "Kopyalanacak bir şey yok",
+    "nothingToDelete": "Silinecek bir şey yok",
+    "nothingToDuplicate": "Çoğaltılacak bir şey yok",
+    "nothingToRename": "Yeniden adlandırılacak bir şey yok",
     "ok": "Tamam",
     "openManager": "Yöneticiyi Aç",
     "openNewIssue": "Yeni Sorun Aç",
+    "or": "veya",
+    "output": "Çıktı",
     "overwrite": "Üzerine Yaz",
+    "partner": "Partner",
+    "playPause": "Oynat/Duraklat",
     "playRecording": "Kaydı Oynat",
     "playbackSpeed": "Oynatma Hızı",
     "playing": "Oynatılıyor",
     "pressKeysForNewBinding": "Yeni bağlama için tuşlara basın",
     "preview": "ÖNİZLEME",
+    "profile": "Profil",
     "progressCountOf": "/",
+    "queued": "Kuyrukta",
     "ready": "Hazır",
+    "recents": "Son Kullanılanlar",
     "reconnected": "Yeniden bağlandı",
     "reconnecting": "Yeniden bağlanılıyor",
     "refresh": "Yenile",
     "refreshNode": "Düğümü Yenile",
+    "relativeTime": {
+      "daysAgo": "{count}g önce",
+      "hoursAgo": "{count}s önce",
+      "minutesAgo": "{count}dk önce",
+      "monthsAgo": "{count}ay önce",
+      "now": "şimdi",
+      "weeksAgo": "{count}hft önce",
+      "yearsAgo": "{count}y önce"
+    },
     "releaseTitle": "{package} {version} Sürümü",
     "reloadToApplyChanges": "Değişiklikleri uygulamak için yeniden yükleyin",
+    "remove": "Kaldır",
     "removeImage": "Görüntüyü kaldır",
+    "removeTag": "Etiketi kaldır",
     "removeVideo": "Videoyu kaldır",
     "rename": "Yeniden Adlandır",
     "reportIssue": "Rapor Gönder",
@@ -688,21 +1081,32 @@
     "resizeFromTopRight": "Sağ üst köşeden yeniden boyutlandır",
     "restart": "Yeniden Başlat",
     "resultsCount": "{count} Sonuç Bulundu",
+    "running": "Çalışıyor",
     "save": "Kaydet",
     "saving": "Kaydediliyor",
+    "scrollLeft": "Sola Kaydır",
+    "scrollRight": "Sağa Kaydır",
     "search": "Ara",
     "searchExtensions": "Uzantıları Ara",
     "searchFailedMessage": "Aramanızla eşleşen herhangi bir ayar bulamadık. Arama terimlerinizi değiştirmeyi deneyin.",
     "searchKeybindings": "Tuş Atamalarını Ara",
     "searchModels": "Modelleri Ara",
     "searchNodes": "Düğümleri Ara",
+    "searchPlaceholder": "Ara...",
     "searchSettings": "Ayarları Ara",
     "searchWorkflows": "İş Akışlarını Ara",
     "seeTutorial": "Bir eğitim görün",
+    "selectItemsToCopy": "Kopyalanacak öğeleri seçin",
+    "selectItemsToDelete": "Silinecek öğeleri seçin",
+    "selectItemsToDuplicate": "Çoğaltılacak öğeleri seçin",
+    "selectItemsToRename": "Yeniden adlandırılacak öğeleri seçin",
     "selectedFile": "Seçilen dosya",
     "setAsBackground": "Arka Plan Olarak Ayarla",
     "settings": "Ayarlar",
+    "shortcutSuffix": " ({shortcut})",
+    "showLeftPanel": "Sol paneli göster",
     "showReport": "Raporu Göster",
+    "showRightPanel": "Sağ paneli göster",
     "singleSelectDropdown": "Tekli seçim açılır menüsü",
     "sort": "Sırala",
     "source": "Kaynak",
@@ -710,19 +1114,24 @@
     "status": "Durum",
     "stopPlayback": "Oynatmayı Durdur",
     "stopRecording": "Kaydı Durdur",
+    "submit": "Gönder",
     "success": "Başarılı",
     "systemInfo": "Sistem Bilgisi",
     "terminal": "Terminal",
     "title": "Başlık",
     "triggerPhrase": "Tetikleyici ifade",
     "unknownError": "Bilinmeyen hata",
+    "unknownFile": "Bilinmeyen dosya",
+    "untitled": "Başlıksız",
     "update": "Güncelle",
     "updateAvailable": "Güncelleme Mevcut",
     "updateFrontend": "Ön Ucu Güncelle",
     "updated": "Güncellendi",
     "updating": "{id} güncelleniyor",
     "upload": "Yükle",
+    "uploadAlreadyInProgress": "Yükleme zaten devam ediyor",
     "usageHint": "Kullanım ipucu",
+    "use": "Kullan",
     "user": "Kullanıcı",
     "versionMismatchWarning": "Sürüm Uyumluluk Uyarısı",
     "versionMismatchWarningMessage": "{warning}: {detail} Güncelleme talimatları için https://docs.comfy.org/installation/update_comfyui#common-update-issues adresini ziyaret edin.",
@@ -730,11 +1139,10 @@
     "videoPreview": "Video önizlemesi - Videolar arasında gezinmek için ok tuşlarını kullanın",
     "viewImageOfTotal": "{total} görüntüden {index}. görüntüyü görüntüle",
     "viewVideoOfTotal": "{total} videodan {index}. videoyu görüntüle",
-    "vitePreloadErrorMessage": "Uygulamanın yeni bir sürümü yayınlandı. Yeniden yüklemek ister misiniz?\nEğer yüklemezseniz, uygulamanın bazı bölümleri beklenildiği gibi çalışmayabilir.\nİlerlemenizi kaydettikten sonra yeniden yüklemek için çekinmeyin.",
-    "vitePreloadErrorTitle": "Yeni Sürüm Mevcut",
     "volume": "Ses",
     "warning": "Uyarı",
-    "workflow": "İş Akışı"
+    "workflow": "İş Akışı",
+    "you": "Sen"
   },
   "graphCanvasMenu": {
     "fitView": "Görünüme Sığdır",
@@ -756,11 +1164,17 @@
     "create": "Grup düğümü oluştur",
     "enterName": "İsim girin"
   },
+  "help": {
+    "helpCenterMenu": "Yardım Merkezi Menüsü",
+    "recentReleases": "Son sürümler"
+  },
   "helpCenter": {
     "clickToLearnMore": "Daha fazla bilgi için tıklayın →",
     "desktopUserGuide": "Masaüstü Kullanıcı Kılavuzu",
     "docs": "Belgeler",
+    "feedback": "Geri Bildirim Ver",
     "github": "Github",
+    "help": "Yardım & Destek",
     "loadingReleases": "Sürümler yükleniyor...",
     "managerExtension": "Yönetici Uzantısı",
     "more": "Daha Fazla...",
@@ -769,6 +1183,12 @@
     "recentReleases": "Son sürümler",
     "reinstall": "Yeniden Yükle",
     "updateAvailable": "Güncelle",
+    "updateComfyUI": "ComfyUI'yi Güncelle",
+    "updateComfyUIFailed": "ComfyUI güncellenemedi. Lütfen tekrar deneyin.",
+    "updateComfyUIStarted": "Güncelleme Başladı",
+    "updateComfyUIStartedDetail": "ComfyUI güncellemesi kuyruğa alındı. Lütfen bekleyin...",
+    "updateComfyUISuccess": "Güncelleme Tamamlandı",
+    "updateComfyUISuccessDetail": "ComfyUI güncellendi. Yeniden başlatılıyor...",
     "whatsNew": "Yenilikler Neler?"
   },
   "icon": {
@@ -782,6 +1202,24 @@
     "inbox": "Gelen Kutusu",
     "star": "Yıldız"
   },
+  "imageCompare": {
+    "batchLabelA": "A:",
+    "batchLabelB": "B:",
+    "noImages": "Karşılaştırılacak görsel yok"
+  },
+  "imageCrop": {
+    "cropPreviewAlt": "Kırpma önizlemesi",
+    "custom": "Özel",
+    "loading": "Yükleniyor...",
+    "lockRatio": "En-boy oranını kilitle",
+    "noInputImage": "Bağlı giriş görseli yok",
+    "ratio": "Oran",
+    "unlockRatio": "En-boy oranı kilidini aç"
+  },
+  "importFailed": {
+    "copyError": "Kopyalama Hatası",
+    "title": "İçe Aktarma Başarısız"
+  },
   "install": {
     "appDataLocationTooltip": "ComfyUI'nin uygulama veri dizini. Saklar:\n- Kayıtlar\n- Sunucu yapılandırmaları",
     "appPathLocationTooltip": "ComfyUI'nin uygulama varlık dizini. ComfyUI kodunu ve varlıklarını saklar",
@@ -795,6 +1233,8 @@
     "failedToSelectDirectory": "Dizin seçilemedi",
     "gpu": "GPU",
     "gpuPicker": {
+      "amdDescription": "En iyi performans için AMD GPU'nuzu ROCm™ hızlandırmasıyla kullanın.",
+      "amdSubtitle": "AMD ROCm™",
       "appleMetalDescription": "Daha hızlı hız ve daha iyi genel deneyim için Mac'inizin GPU'sunu kullanır",
       "cpuDescription": "GPU hızlandırma kullanılamadığında uyumluluk için CPU modunu kullanın",
       "cpuSubtitle": "CPU Modu",
@@ -821,6 +1261,8 @@
       "selectGpuDescription": "Sahip olduğunuz GPU türünü seçin"
     },
     "helpImprove": "Lütfen ComfyUI'yi geliştirmeye yardımcı olun",
+    "insideAppInstallDir": "Bu klasör ComfyUI Desktop uygulama paketinin içindedir ve güncellemeler sırasında silinir. Belgeler/ComfyUI gibi kurulum klasörü dışında bir dizin seçin.",
+    "insideUpdaterCache": "Bu klasör ComfyUI güncelleyici önbelleğinin içindedir ve her güncellemede temizlenir. Verileriniz için farklı bir konum seçin.",
     "installLocation": "Kurulum Yeri",
     "installLocationDescription": "ComfyUI'nin kullanıcı verileri için dizini seçin. Seçilen konuma bir python ortamı yüklenecektir.",
     "installLocationTooltip": "ComfyUI'nin kullanıcı veri dizini. Saklar:\n- Python Ortamı\n- Modeller\n- Özel düğümler\n",
@@ -895,6 +1337,66 @@
   "issueReport": {
     "helpFix": "Bunu Düzeltmeye Yardım Et"
   },
+  "linearMode": {
+    "appModeToolbar": {
+      "appBuilder": "Uygulama oluşturucu",
+      "apps": "Uygulamalar",
+      "appsEmptyMessage": "Kaydedilen uygulamalar burada görünecek.\nİlk uygulamanızı oluşturmak için aşağıya tıklayın.",
+      "enterAppMode": "Uygulama moduna gir"
+    },
+    "arrange": {
+      "atLeastOne": "en az bir",
+      "connectAtLeastOne": "Kullanıcıların çalıştırdıktan sonra sonuçları görebilmesi için {atLeastOne} çıktı düğümünü bağlayın.",
+      "noOutputs": "Henüz çıktı eklenmedi",
+      "outputExamples": "Örnekler: 'Görseli Kaydet' veya 'Videoyu Kaydet'",
+      "outputs": "Çıktılar",
+      "resultsLabel": "Seçili çıktı düğüm(ler)inden üretilen sonuçlar bu uygulama çalıştırıldıktan sonra burada gösterilecektir.",
+      "switchToOutputs": "'Çıktı' adımına geçin ve buraya eklemek için çıktı düğümlerine tıklayın.",
+      "switchToOutputsButton": "Çıktılara Geç"
+    },
+    "backToWorkflow": "Çalışma akışına geri dön",
+    "beta": "Uygulama Modu Beta - Geri Bildirim Verin",
+    "builder": {
+      "exit": "Oluşturucudan çık",
+      "exitConfirmMessage": "Kaydedilmemiş değişiklikleriniz kaybolacak\nKaydetmeden çıkılsın mı?",
+      "exitConfirmTitle": "Uygulama oluşturucudan çıkılsın mı?",
+      "inputsDesc": "Kullanıcılar bunlarla etkileşime geçip ayarlayarak çıktılarını oluşturacak.",
+      "inputsExample": "Örnekler: “Resim yükle”, “Metin istemi”, “Adımlar”",
+      "noInputs": "Henüz giriş eklenmedi",
+      "noOutputs": "Henüz çıktı düğümü eklenmedi",
+      "outputsDesc": "Kullanıcıların çalıştırdıktan sonra sonuçları görebilmesi için en az bir çıktı düğümü bağlayın.",
+      "outputsExample": "Örnekler: “Resmi Kaydet” veya “Videoyu Kaydet”",
+      "promptAddInputs": "Girdi olarak eklemek için düğüm parametrelerine tıklayın",
+      "promptAddOutputs": "Çıktı olarak eklemek için çıktı düğümlerine tıklayın. Bunlar oluşturulan sonuçlar olacak.",
+      "title": "Uygulama oluşturucu modu",
+      "unknownWidget": "Widget görünür değil"
+    },
+    "downloadAll": "Tümünü İndir",
+    "dragAndDropImage": "Bir görseli sürükleyip bırakın",
+    "emptyWorkflowExplanation": "Çalışma akışınız boş. Bir uygulama oluşturmaya başlamak için önce bazı düğümler eklemelisiniz.",
+    "enterNodeGraph": "Düğüm grafiğine gir",
+    "giveFeedback": "Geri bildirim ver",
+    "graphMode": "Grafik Modu",
+    "linearMode": "Uygulama Modu",
+    "loadTemplate": "Şablon yükle",
+    "mobileControls": "Düzenle ve Çalıştır",
+    "queue": {
+      "clear": "Kuyruğu temizle",
+      "clickToClear": "Kuyruğu temizlemek için tıklayın"
+    },
+    "rerun": "Tekrar Çalıştır",
+    "reuseParameters": "Parametreleri Yeniden Kullan",
+    "runCount": "Çalıştırma sayısı:",
+    "viewJob": "İşi Görüntüle",
+    "welcome": {
+      "buildApp": "Uygulama oluştur",
+      "controls": "Çıktılarınız altta, kontrolleriniz sağda görünür. Diğer her şey arka planda kalır.",
+      "getStarted": "Başlamak için {runButton} tıklayın.",
+      "message": "Düğüm grafiğini gizleyerek odaklanmanıza yardımcı olan basitleştirilmiş bir görünüm.",
+      "sharing": "Paylaşmak çok kolay: iş akışınızı oluşturun, Uygulama Modunu açın, sekmeye sağ tıklayın ve dışa aktarın. Başkaları dosyanızı açtığında, doğrudan bu sade görünüme geçer. Güçlü iş akışlarını, kimsenin düğüm grafiğini anlamasına gerek kalmadan basit araçlar olarak paylaşabilirsiniz.",
+      "title": "Uygulama Moduna Hoş Geldiniz"
+    }
+  },
   "load3d": {
     "applyingTexture": "Doku uygulanıyor...",
     "backgroundColor": "Arka Plan Rengi",
@@ -921,20 +1423,24 @@
       "lineart": "Çizgi Sanatı",
       "normal": "Normal",
       "original": "Orijinal",
+      "pointCloud": "Nokta Bulutu",
       "wireframe": "Tel Kafes"
     },
     "model": "Model",
     "openIn3DViewer": "3D Görüntüleyicide Aç",
+    "panoramaMode": "Panorama",
     "previewOutput": "Çıktıyı Önizle",
     "reloadingModel": "Model yeniden yükleniyor...",
     "removeBackgroundImage": "Arka Plan Resmini Kaldır",
     "resizeNodeMatchOutput": "Düğümü çıktıya uyacak şekilde yeniden boyutlandır",
     "scene": "Sahne",
     "showGrid": "Izgarayı Göster",
+    "showSkeleton": "İskeleti Göster",
     "startRecording": "Kaydı Başlat",
     "stopRecording": "Kaydı Durdur",
     "switchCamera": "Kamerayı Değiştir",
     "switchingMaterialMode": "Malzeme Modu Değiştiriliyor...",
+    "tiledMode": "Döşemeli",
     "unsupportedFileType": "Desteklenmeyen dosya türü (.gltf, .glb, .obj, .fbx, .stl desteklenir)",
     "upDirection": "Yukarı Yön",
     "upDirections": {
@@ -955,6 +1461,11 @@
       "title": "3D Görüntüleyici (Beta)"
     }
   },
+  "loadWorkflowWarning": {
+    "coreNodesFromVersion": "Sürüm {version} çekirdek düğümleri:",
+    "outdatedVersion": "Bu iş akışı ComfyUI'nin daha yeni bir sürümüyle oluşturulmuş ({version}). Bazı düğümler düzgün çalışmayabilir.",
+    "outdatedVersionGeneric": "Bu iş akışı ComfyUI'nin daha yeni bir sürümüyle oluşturulmuş. Bazı düğümler düzgün çalışmayabilir."
+  },
   "maintenance": {
     "None": "Yok",
     "OK": "Tamam",
@@ -973,11 +1484,21 @@
     "showManual": "Bakım görevlerini göster",
     "status": "Durum",
     "terminalDefaultMessage": "Bir sorun giderme komutu çalıştırdığınızda, herhangi bir çıktı burada gösterilecektir.",
-    "title": "Bakım"
+    "title": "Bakım",
+    "unsafeMigration": {
+      "action": "ComfyUI'yi güvenli bir konuma taşımak için aşağıdaki \"Ana yol\" bakım görevini kullanın.",
+      "appInstallDir": "Ana yolunuz ComfyUI Masaüstü uygulama paketinin içinde. Bu klasör güncellemeler sırasında silinebilir veya üzerine yazılabilir. Kurulum klasörü dışında, örneğin Belgeler/ComfyUI gibi bir dizin seçin.",
+      "generic": "Mevcut ComfyUI ana yolunuz, güncellemeler sırasında silinebilecek veya değiştirilebilecek bir konumda. Veri kaybını önlemek için güvenli bir klasöre taşıyın.",
+      "oneDrive": "Ana yolunuz OneDrive üzerinde, bu senkronizasyon sorunlarına ve kazara veri kaybına neden olabilir. OneDrive tarafından yönetilmeyen yerel bir klasör seçin.",
+      "title": "Güvensiz kurulum yeri tespit edildi",
+      "updaterCache": "Ana yolunuz ComfyUI güncelleyici önbelleğinin içinde, bu klasör her güncellemede temizlenir. Verileriniz için farklı bir konum seçin."
+    }
   },
   "manager": {
+    "actions": "Eylemler",
     "allMissingNodesInstalled": "Tüm eksik düğümler başarıyla yüklendi",
     "applyChanges": "Değişiklikleri Uygula",
+    "basicInfo": "Temel Bilgiler",
     "changingVersion": "Sürüm {from} sürümünden {to} sürümüne değiştiriliyor",
     "clickToFinishSetup": "Kurulumu tamamlamak için tıklayın",
     "conflicts": {
@@ -1013,6 +1534,28 @@
     "disabledNodesWontUpdate": "Devre dışı düğümler güncellenmeyecek",
     "discoverCommunityContent": "Topluluk tarafından yapılmış Düğüm Paketlerini, Uzantıları ve daha fazlasını keşfedin...",
     "downloads": "İndirmeler",
+    "emptyState": {
+      "allInstalled": {
+        "message": "Henüz hiç eklenti yüklemediniz.",
+        "title": "Yüklü Eklenti Yok"
+      },
+      "conflicting": {
+        "message": "Tüm eklentileriniz uyumlu.",
+        "title": "Çakışma Tespit Edilmedi"
+      },
+      "missing": {
+        "message": "Gerekli tüm düğümler yüklü.",
+        "title": "Eksik Düğüm Yok"
+      },
+      "updateAvailable": {
+        "message": "Tüm eklentileriniz güncel.",
+        "title": "Hepsi Güncel"
+      },
+      "workflow": {
+        "message": "Bu iş akışı herhangi bir eklenti düğümü kullanmıyor.",
+        "title": "İş Akışında Eklenti Yok"
+      }
+    },
     "enablePackToChangeVersion": "Sürümleri değiştirmek için bu paketi etkinleştirin",
     "errorConnecting": "Comfy Düğüm Kayıt Defteri'ne bağlanırken hata oluştu.",
     "extensionsSuccessfullyInstalled": "Uzantı(lar) başarıyla yüklendi ve kullanıma hazır!",
@@ -1034,25 +1577,42 @@
     "installingDependencies": "Bağımlılıklar yükleniyor...",
     "lastUpdated": "Son Güncelleme",
     "latestVersion": "En Son",
+    "legacyManagerSearchTip": "ComfyUI-Manager'ı mı arıyorsunuz? Eski yönetici arayüzünü etkinleştirmek için ComfyUI'yi --enable-manager-legacy-ui bayrağı ile başlatabilirsiniz.",
     "legacyManagerUI": "Eski Arayüzü Kullan",
     "legacyManagerUIDescription": "Eski Yönetici Arayüzünü kullanmak için ComfyUI'yi --enable-manager-legacy-ui ile başlatın",
     "legacyMenuNotAvailable": "Eski yönetici menüsü mevcut değil, yeni yönetici menüsüne varsayılan olarak geçiliyor.",
     "license": "Lisans",
     "loadingVersions": "Sürümler yükleniyor...",
     "mixedSelectionMessage": "Karışık seçim üzerinde toplu işlem yapılamaz",
+    "nav": {
+      "allExtensions": "Tüm Eklentiler",
+      "allInWorkflow": "Tümü: {workflowName}",
+      "allInstalled": "Tümü yüklü",
+      "conflicting": "Çakışan",
+      "inWorkflowSection": "İŞ AKIŞINDA",
+      "installedSection": "YÜKLÜ",
+      "missingNodes": "Eksik Düğümler",
+      "notInstalled": "Yüklü Değil",
+      "updatesAvailable": "Güncellemeler Mevcut"
+    },
     "nightlyVersion": "Gecelik",
     "noDescription": "Açıklama yok",
     "noNodesFound": "Düğüm bulunamadı",
     "noNodesFoundDescription": "Paketin düğümleri ya ayrıştırılamadı ya da paket yalnızca bir ön uç uzantısı ve herhangi bir düğüme sahip değil.",
     "noResultsFound": "Aramanızla eşleşen sonuç bulunamadı.",
     "nodePack": "Düğüm Paketi",
+    "nodePackInfo": "Düğüm Paketi Bilgisi",
     "notAvailable": "Mevcut Değil",
+    "packInstall": {
+      "nodeIdRequired": "Kurulum için Düğüm Kimliği gereklidir"
+    },
     "packsSelected": "paket seçildi",
     "repository": "Depo",
     "restartToApplyChanges": "Değişiklikleri uygulamak için lütfen ComfyUI'yi yeniden başlatın",
     "restartingBackend": "Değişiklikleri uygulamak için arka uç yeniden başlatılıyor...",
     "searchPlaceholder": "Ara",
     "selectVersion": "Sürüm Seç",
+    "selected": "Seçildi",
     "sort": {
       "created": "En Yeni",
       "downloads": "En Popüler",
@@ -1074,6 +1634,8 @@
     "totalNodes": "Toplam Düğüm",
     "tryAgainLater": "Lütfen daha sonra tekrar deneyin.",
     "tryDifferentSearch": "Lütfen farklı bir arama sorgusu deneyin.",
+    "tryUpdate": "Güncellemeyi Dene",
+    "tryUpdateTooltip": "Depodan en son değişiklikleri çekin. Nightly sürümlerde otomatik olarak algılanamayan güncellemeler olabilir.",
     "uninstall": "Kaldır",
     "uninstallSelected": "Seçilenleri Kaldır",
     "uninstalling": "{id} kaldırılıyor",
@@ -1084,31 +1646,111 @@
     "version": "Sürüm"
   },
   "maskEditor": {
+    "activateLayer": "Katmanı Aktifleştir",
+    "applyToWholeImage": "Tüm Görüntüye Uygula",
+    "baseImageLayer": "Temel Görüntü Katmanı",
+    "baseLayerPreview": "Temel katman önizlemesi",
+    "black": "Siyah",
+    "brushSettings": "Fırça Ayarları",
+    "brushShape": "Fırça Şekli",
+    "clear": "Temizle",
+    "clickToResetZoom": "Yakınlaştırmayı sıfırlamak için tıklayın",
+    "colorSelectSettings": "Renk Seçimi Ayarları",
+    "colorSelector": "Renk Seçici",
+    "fillOpacity": "Doldurma Opaklığı",
+    "hardness": "Sertlik",
+    "imageLayer": "Görüntü Katmanı",
+    "invert": "Ters Çevir",
+    "layers": "Katmanlar",
+    "livePreview": "Canlı Önizleme",
+    "maskBlendingOptions": "Maske Karıştırma Seçenekleri",
+    "maskLayer": "Maske Katmanı",
+    "maskOpacity": "Maske Opaklığı",
+    "maskTolerance": "Maske Toleransı",
+    "method": "Yöntem",
+    "mirrorHorizontal": "Yatay ayna",
+    "mirrorVertical": "Dikey ayna",
+    "negative": "Negatif",
+    "opacity": "Opaklık",
+    "paintBucketSettings": "Boya Kovası Ayarları",
+    "paintLayer": "Boya Katmanı",
+    "redo": "Yinele",
+    "resetToDefault": "Varsayılana Sıfırla",
+    "rotateLeft": "Sola döndür",
+    "rotateRight": "Sağa döndür",
+    "selectionOpacity": "Seçim Opaklığı",
+    "smoothingPrecision": "Yumuşatma Hassasiyeti",
+    "stepSize": "Adım Boyutu",
+    "stopAtMask": "Maskede Durdur",
+    "thickness": "Kalınlık",
+    "title": "Maske Editörü",
+    "tolerance": "Tolerans",
+    "undo": "Geri Al",
+    "white": "Beyaz"
   },
   "mediaAsset": {
+    "actions": {
+      "copyJobId": "İş ID'sini kopyala",
+      "delete": "Sil",
+      "download": "İndir",
+      "exportWorkflow": "İş akışını dışa aktar",
+      "insertAsNodeInWorkflow": "Çalışma akışına düğüm olarak ekle",
+      "inspect": "Varlığı incele",
+      "more": "Daha fazla seçenek",
+      "moreOptions": "Daha fazla seçenek",
+      "openWorkflow": "Yeni sekmede iş akışı olarak aç",
+      "seeMoreOutputs": "Daha fazla çıktı gör",
+      "zoom": "Yakınlaştır"
+    },
     "assetDeletedSuccessfully": "Varlık başarıyla silindi",
     "deleteAssetDescription": "Bu varlık kalıcı olarak kaldırılacak.",
     "deleteAssetTitle": "Bu varlık silinsin mi?",
     "deleteSelectedDescription": "{count} varlık kalıcı olarak kaldırılacak.",
     "deleteSelectedTitle": "Seçilen varlıklar silinsin mi?",
     "deletingImportedFilesCloudOnly": "İçe aktarılan dosyaların silinmesi yalnızca bulut sürümünde desteklenir",
+    "failedToCreateNode": "Düğüm oluşturulamadı",
     "failedToDeleteAsset": "Varlık silinemedi",
+    "failedToExportWorkflow": "İş akışı dışa aktarılamadı",
     "jobIdToast": {
       "copied": "Kopyalandı",
       "error": "Hata",
       "jobIdCopied": "İş Kimliği panoya kopyalandı",
       "jobIdCopyFailed": "İş Kimliği kopyalanamadı"
     },
+    "noJobIdFound": "Bu varlık için iş ID'si bulunamadı",
+    "noWorkflowDataFound": "Bu varlıkta iş akışı verisi bulunamadı",
+    "nodeAddedToWorkflow": "{nodeType} düğümü iş akışına eklendi",
+    "nodeTypeNotFound": "{nodeType} düğüm türü bulunamadı",
     "selection": {
       "assetsDeletedSuccessfully": "{count} varlık başarıyla silindi",
       "deleteSelected": "Sil",
+      "deleteSelectedAll": "Tümünü sil",
       "deselectAll": "Tümünü seçimi kaldır",
       "downloadSelected": "İndir",
+      "downloadSelectedAll": "Tümünü indir",
       "downloadStarted": "{count} dosya indiriliyor...",
       "downloadsStarted": "{count} dosya indirilmeye başlandı",
+      "exportStarted": "{count} dosya için ZIP dışa aktarımı hazırlanıyor | {count} dosya için ZIP dışa aktarımı hazırlanıyor",
+      "exportWorkflowAll": "Tüm çalışma akışlarını dışa aktar",
+      "failedToAddNodes": "Düğümler çalışma akışına eklenemedi",
       "failedToDeleteAssets": "Seçilen varlıklar silinemedi",
-      "selectedCount": "Seçilen Varlıklar: {count}"
-    }
+      "insertAllAssetsAsNodes": "Tüm varlıkları düğüm olarak ekle",
+      "multipleSelectedAssets": "Birden fazla varlık seçildi",
+      "noWorkflowsFound": "Seçilen varlıklarda çalışma akışı verisi bulunamadı",
+      "noWorkflowsToExport": "Dışa aktarılacak çalışma akışı verisi bulunamadı",
+      "nodesAddedToWorkflow": "{count} düğüm çalışma akışına eklendi",
+      "openWorkflowAll": "Tüm çalışma akışlarını aç",
+      "partialAddNodesSuccess": "{succeeded} başarıyla eklendi, {failed} başarısız oldu",
+      "partialDeleteSuccess": "{succeeded} başarıyla silindi, {failed} silinemedi",
+      "partialWorkflowsExported": "{succeeded} başarıyla dışa aktarıldı, {failed} başarısız oldu",
+      "partialWorkflowsOpened": "{succeeded} çalışma akışı açıldı, {failed} başarısız oldu",
+      "selectedCount": "Seçilen Varlıklar: {count}",
+      "workflowsExported": "{count} çalışma akışı başarıyla dışa aktarıldı",
+      "workflowsOpened": "{count} çalışma akışı yeni sekmede açıldı"
+    },
+    "unsupportedFileType": "Yükleyici düğümü için desteklenmeyen dosya türü",
+    "workflowExportedSuccessfully": "İş akışı başarıyla dışa aktarıldı",
+    "workflowOpenedInNewTab": "İş akışı yeni sekmede açıldı"
   },
   "menu": {
     "autoQueue": "Otomatik Kuyruk",
@@ -1116,11 +1758,14 @@
     "batchCountTooltip": "İş akışı oluşturma işleminin kaç kez kuyruğa alınması gerektiği",
     "clear": "İş akışını temizle",
     "clipspace": "Clipspace'i Aç",
+    "customNodesManager": "Özel Düğüm Yöneticisi",
     "dark": "Karanlık",
     "disabled": "Devre Dışı",
     "disabledTooltip": "İş akışı otomatik olarak kuyruğa alınmayacak",
     "execute": "Yürüt",
+    "fullscreen": "Tam ekran",
     "help": "Yardım",
+    "helpAndFeedback": "Yardım ve Geri Bildirim",
     "hideMenu": "Menüyü Gizle",
     "instant": "Anında",
     "instantTooltip": "İş akışı, bir oluşturma işlemi bittikten sonra anında kuyruğa alınacak",
@@ -1134,9 +1779,12 @@
     "resetView": "Tuval görünümünü sıfırla",
     "run": "Çalıştır",
     "runWorkflow": "İş akışını çalıştır (Öne kuyruklamak için Shift)",
+    "runWorkflowDisabled": "İş akışında desteklenmeyen düğümler var (kırmızı ile vurgulanmış). İş akışını çalıştırmak için bunları kaldırın.",
     "runWorkflowFront": "İş akışını çalıştır (Öne kuyrukla)",
     "settings": "Ayarlar",
     "showMenu": "Menüyü Göster",
+    "stopRunInstant": "Çalışmayı Durdur (Anında)",
+    "stopRunInstantTooltip": "Çalışmayı durdur",
     "theme": "Tema",
     "toggleBottomPanel": "Alt Paneli Aç/Kapat"
   },
@@ -1149,6 +1797,7 @@
     "Canvas Performance": "Tuval Performansı",
     "Canvas Toggle Lock": "Tuval Kilidini Aç/Kapat",
     "Check for Custom Node Updates": "Özel Düğüm Güncellemelerini Kontrol Et",
+    "Check for Updates": "Güncellemeleri Kontrol Et",
     "Clear Pending Tasks": "Bekleyen Görevleri Temizle",
     "Clear Workflow": "İş Akışını Temizle",
     "Clipspace": "Clipspace",
@@ -1161,16 +1810,19 @@
     "Contact Support": "Destekle İletişime Geç",
     "Convert Selection to Subgraph": "Seçimi Alt Grafiğe Dönüştür",
     "Convert selected nodes to group node": "Seçili düğümleri grup düğümüne dönüştür",
+    "Copy": "Kopyala",
     "Custom Nodes (Legacy)": "Özel Düğümler (Eski)",
     "Custom Nodes Manager": "Özel Düğüm Yöneticisi",
     "Decrease Brush Size in MaskEditor": "MaskEditor'da Fırça Boyutunu Azalt",
     "Delete Selected Items": "Seçili Öğeleri Sil",
+    "Desktop User Guide": "Masaüstü Kullanıcı Kılavuzu",
     "Duplicate Current Workflow": "Mevcut İş Akışını Çoğalt",
     "Edit": "Düzenle",
     "Edit Subgraph Widgets": "Alt Grafik Widget'larını Düzenle",
     "Exit Subgraph": "Alt Grafikten Çık",
     "Experimental: Browse Model Assets": "Deneysel: Model Varlıklarını Gözat",
     "Experimental: Enable AssetAPI": "Deneysel: AssetAPI'yi Etkinleştir",
+    "Experimental: Enable Nodes 2_0": "Deneysel: Nodes 2.0'ı Etkinleştir",
     "Export": "Dışa Aktar",
     "Export (API)": "Dışa Aktar (API)",
     "File": "Dosya",
@@ -1182,12 +1834,15 @@
     "Increase Brush Size in MaskEditor": "MaskEditor'da Fırça Boyutunu Artır",
     "Install Missing Custom Nodes": "Eksik Özel Düğümleri Yükle",
     "Interrupt": "Kes",
+    "Job History": "İş Geçmişi",
     "Load Default Workflow": "Varsayılan İş Akışını Yükle",
     "Lock Canvas": "Tuvali Kilitle",
     "Manage group nodes": "Grup düğümlerini yönet",
     "Manager": "Yönetici",
     "Manager Menu (Legacy)": "Yönetici Menüsü (Eski)",
     "Minimap": "Mini Harita",
+    "Mirror Horizontal in MaskEditor": "MaskEditor'da yatay ayna",
+    "Mirror Vertical in MaskEditor": "MaskEditor'da dikey ayna",
     "Model Library": "Model Kütüphanesi",
     "Move Selected Nodes Down": "Seçili Düğümleri Aşağı Taşı",
     "Move Selected Nodes Left": "Seçili Düğümleri Sola Taşı",
@@ -1199,9 +1854,18 @@
     "Node Library": "Düğüm Kütüphanesi",
     "Node Links": "Düğüm Bağlantıları",
     "Open": "Aç",
-    "Open 3D Viewer (Beta) for Selected Node": "Seçili Düğüm için 3D Görüntüleyiciyi (Beta) Aç",
+    "Open 3D Viewer (Beta) for Selected Node": "Seçili düğüm için 3D Görüntüleyiciyi (Beta) Aç",
+    "Open Color Picker in MaskEditor": "MaskEditor'da Renk Seçiciyi Aç",
+    "Open Custom Nodes Folder": "Özel Düğüm Klasörünü Aç",
+    "Open DevTools": "Geliştirici Araçlarını Aç",
+    "Open Inputs Folder": "Girdi Klasörünü Aç",
+    "Open Logs Folder": "Kayıtlar Klasörünü Aç",
     "Open Mask Editor for Selected Node": "Seçili Düğüm için Maske Düzenleyiciyi Aç",
+    "Open Models Folder": "Modeller Klasörünü Aç",
+    "Open Outputs Folder": "Çıktı Klasörünü Aç",
     "Open Sign In Dialog": "Giriş Yapma İletişim Kutusunu Aç",
+    "Open extra_model_paths_yaml": "extra_model_paths.yaml Dosyasını Aç",
+    "Paste": "Yapıştır",
     "Pin/Unpin Selected Items": "Seçili Öğeleri Sabitle/Kaldır",
     "Pin/Unpin Selected Nodes": "Seçili Düğümleri Sabitle/Kaldır",
     "Previous Opened Workflow": "Önceki Açılan İş Akışı",
@@ -1209,24 +1873,34 @@
     "Queue Prompt": "İstemi Kuyruğa Al",
     "Queue Prompt (Front)": "İstemi Kuyruğa Al (Ön)",
     "Queue Selected Output Nodes": "Seçili Çıktı Düğümlerini Kuyruğa Al",
+    "Quit": "Çık",
     "Redo": "Yinele",
     "Refresh Node Definitions": "Düğüm Tanımlarını Yenile",
+    "Reinstall": "Yeniden Yükle",
+    "Rename": "Yeniden Adlandır",
     "Reset View": "Görünümü Sıfırla",
     "Resize Selected Nodes": "Seçili Düğümleri Yeniden Boyutlandır",
+    "Restart": "Yeniden Başlat",
+    "Rotate Left in MaskEditor": "MaskEditor'da sola döndür",
+    "Rotate Right in MaskEditor": "MaskEditor'da sağa döndür",
     "Save": "Kaydet",
     "Save As": "Farklı Kaydet",
+    "Select All": "Tümünü Seç",
+    "Set Subgraph Description": "Alt Grafik Açıklamasını Ayarla",
+    "Set Subgraph Search Aliases": "Alt Grafik Arama Takma Adlarını Ayarla",
     "Show Keybindings Dialog": "Tuş Atamaları İletişim Kutusunu Göster",
     "Show Model Selector (Dev)": "Model Seçiciyi Göster (Geliştirici)",
     "Show Settings Dialog": "Ayarlar İletişim Kutusunu Göster",
     "Sign Out": "Çıkış Yap",
+    "Toggle App Mode": "Uygulama Modunu Aç/Kapat",
     "Toggle Essential Bottom Panel": "Temel Alt Paneli Aç/Kapat",
     "Toggle Logs Bottom Panel": "Kayıtlar Alt Panelini Aç/Kapat",
+    "Toggle Queue Panel V2": "Kuyruk Paneli V2'yi Aç/Kapat",
     "Toggle Search Box": "Arama Kutusunu Aç/Kapat",
     "Toggle Terminal Bottom Panel": "Terminal Alt Panelini Aç/Kapat",
     "Toggle Theme (Dark/Light)": "Temayı Değiştir (Karanlık/Açık)",
     "Toggle View Controls Bottom Panel": "Görünüm Kontrolleri Alt Panelini Aç/Kapat",
     "Toggle promotion of hovered widget": "Üzerine gelinen widget'ı yükseltmeyi aç/kapat",
-    "Toggle the Custom Nodes Manager Progress Bar": "Özel Düğüm Yöneticisi İlerleme Çubuğunu Aç/Kapat",
     "Undo": "Geri Al",
     "Ungroup selected group nodes": "Seçili grup düğümlerinin grubunu çöz",
     "Unload Models": "Modelleri Boşalt",
@@ -1237,7 +1911,8 @@
     "Workflows": "İş Akışları",
     "Zoom In": "Yakınlaştır",
     "Zoom Out": "Uzaklaştır",
-    "Zoom to fit": "Sığdırmak için yakınlaştır"
+    "Zoom to fit": "Sığdırmak için yakınlaştır",
+    "linearMode_appModeToolbar_apps": "linearMode.appModeToolbar.apps"
   },
   "minimap": {
     "nodeColors": "Düğüm Renkleri",
@@ -1247,20 +1922,66 @@
     "showLinks": "Bağlantıları Göster"
   },
   "missingModelsDialog": {
+    "acceptTerms": "Şartları kabul et",
+    "customModelsInstruction": "Bunları manuel olarak bulup indirmeniz gerekecek. İnternette arayın (Civitai veya Hugging Face deneyin) ya da orijinal iş akışı sağlayıcısıyla iletişime geçin.",
+    "customModelsWarning": "Bunlardan bazıları tanımadığımız özel modellerdir.",
+    "description": "Bu iş akışı, henüz indirmediğiniz modellere ihtiyaç duyuyor.",
     "doNotAskAgain": "Bunu bir daha gösterme",
-    "missingModels": "Eksik Modeller",
-    "missingModelsMessage": "Grafik yüklenirken aşağıdaki modeller bulunamadı"
+    "downloadAll": "Hepsini indir",
+    "downloadAvailable": "İndirilebilir",
+    "footerDescription": "Bu modelleri indirip doğru klasöre yerleştirin.\nEksik modeli olan düğümler tuvalde kırmızı ile vurgulanır.",
+    "gotIt": "Tamam, anladım",
+    "reEnableInSettings": "{link} içinde tekrar etkinleştir",
+    "reEnableInSettingsLink": "Ayarlar",
+    "title": "Bu iş akışında eksik modeller var",
+    "totalSize": "Toplam indirme boyutu:"
+  },
+  "missingNodes": {
+    "cloud": {
+      "description": "Bu iş akışı, Cloud sürümünde henüz desteklenmeyen özel düğümler kullanıyor.",
+      "gotIt": "Tamam, anladım",
+      "learnMore": "Daha fazla bilgi",
+      "priorityMessage": "Bu düğümleri otomatik olarak işaretledik, öncelikli olarak ekleyeceğiz.",
+      "replacementInstruction": "Bu arada, bu düğümleri (tuvalde kırmızı ile vurgulanan) mümkünse desteklenenlerle değiştirin veya farklı bir iş akışı deneyin.",
+      "title": "Bu düğümler henüz Comfy Cloud'da mevcut değil"
+    },
+    "oss": {
+      "description": "Bu iş akışı, henüz yüklemediğiniz özel düğümler kullanıyor.",
+      "replacementInstruction": "Bu iş akışını çalıştırmak için bu düğümleri yükleyin veya yüklü alternatiflerle değiştirin. Eksik düğümler tuvalde kırmızı ile vurgulanır.",
+      "title": "Bu iş akışında eksik düğümler var"
+    }
+  },
+  "nightly": {
+    "badge": {
+      "label": "Önizleme Sürümü",
+      "tooltip": "ComfyUI'nin nightly sürümünü kullanıyorsunuz. Lütfen bu özelliklerle ilgili görüşlerinizi paylaşmak için geri bildirim butonunu kullanın."
+    }
+  },
+  "nightlySurvey": {
+    "accept": "Tabii, yardımcı olacağım!",
+    "description": "Bu özelliği kullanıyorsunuz. Geri bildiriminizi bizimle paylaşır mısınız?",
+    "dontAskAgain": "Bir daha sorma",
+    "loadError": "Anket yüklenemedi. Lütfen daha sonra tekrar deneyin.",
+    "notNow": "Şimdi değil",
+    "title": "Bize Yardımcı Olun"
   },
   "nodeCategories": {
+    "": "",
     "3d": "3d",
     "3d_models": "3d_modeller",
     "BFL": "BFL",
+    "Bria": "Bria",
     "ByteDance": "ByteDance",
+    "ElevenLabs": "ElevenLabs",
     "Gemini": "Gemini",
+    "Grok": "Grok",
+    "HitPaw": "HitPaw",
     "Ideogram": "Ideogram",
     "Kling": "Kling",
     "LTXV": "LTXV",
     "Luma": "Luma",
+    "Magnific": "Magnific",
+    "Meshy": "Meshy",
     "MiniMax": "MiniMax",
     "Moonvalley Marey": "Moonvalley Marey",
     "OpenAI": "OpenAI",
@@ -1270,10 +1991,13 @@
     "Runway": "Runway",
     "Sora": "Sora",
     "Stability AI": "Stability AI",
+    "Tencent": "Tencent",
+    "Topaz": "Topaz",
     "Tripo": "Tripo",
     "Veo": "Veo",
     "Vidu": "Vidu",
     "Wan": "Wan",
+    "WaveSpeed": "WaveSpeed",
     "_for_testing": "_test_için",
     "advanced": "gelişmiş",
     "animation": "animasyon",
@@ -1294,6 +2018,7 @@
     "controlnet": "controlnet",
     "create": "oluştur",
     "custom_sampling": "özel_örnekleme",
+    "dataset": "veri seti",
     "debug": "hata ayıklama",
     "deprecated": "kullanımdan kaldırılmış",
     "edit_models": "modelleri_düzenle",
@@ -1305,8 +2030,10 @@
     "image": "görüntü",
     "inpaint": "inpaint",
     "instructpix2pix": "instructpix2pix",
+    "kandinsky5": "kandinsky5",
     "latent": "gizli",
     "loaders": "yükleyiciler",
+    "logic": "mantık",
     "lotus": "lotus",
     "ltxv": "ltxv",
     "mask": "maske",
@@ -1328,11 +2055,13 @@
     "scheduling": "zamanlama",
     "sd": "sd",
     "sd3": "sd3",
+    "shader": "shader",
     "sigmas": "sigmalar",
     "stable_cascade": "stabil_çağlayan",
     "string": "dize",
     "style_model": "stil_modeli",
     "text": "metin",
+    "textgen": "textgen",
     "training": "eğitim",
     "transform": "dönüştür",
     "unet": "unet",
@@ -1340,7 +2069,25 @@
     "upscaling": "yükseltme",
     "utils": "yardımcı programlar",
     "video": "video",
-    "video_models": "video_modelleri"
+    "video_models": "video_modelleri",
+    "zimage": "zimage"
+  },
+  "nodeErrors": {
+    "content": "Düğüm İçerik Hatası",
+    "header": "Düğüm Başlık Hatası",
+    "render": "Düğüm Oluşturma Hatası",
+    "slots": "Düğüm Slot Hatası",
+    "widgets": "Düğüm Widget Hatası"
+  },
+  "nodeFilters": {
+    "hideDeprecated": "Kullanımdan Kaldırılan Düğümleri Gizle",
+    "hideDeprecatedDescription": "Açıkça etkinleştirilmedikçe kullanımdan kaldırılmış olarak işaretlenen düğümleri gizler",
+    "hideDevOnly": "Yalnızca Geliştirici Düğümlerini Gizle",
+    "hideDevOnlyDescription": "Geliştirici modu etkin değilse yalnızca geliştiriciye özel düğümleri gizler",
+    "hideExperimental": "Deneysel Düğümleri Gizle",
+    "hideExperimentalDescription": "Açıkça etkinleştirilmedikçe deneysel olarak işaretlenen düğümleri gizler",
+    "hideSubgraph": "Alt Grafik Düğümlerini Gizle",
+    "hideSubgraphDescription": "Alt grafik düğümlerini geçici olarak düğüm kütüphanesinden ve aramadan gizler"
   },
   "nodeHelpPage": {
     "documentationPage": "belgelendirme sayfası",
@@ -1350,6 +2097,32 @@
     "outputs": "Çıktılar",
     "type": "Tür"
   },
+  "nodeReplacement": {
+    "compatibleAlternatives": "Uyumlu Alternatifler",
+    "installMissingNodes": "Eksik Düğümleri Yükle",
+    "installationRequired": "Kurulum Gerekli",
+    "instructionMessage": "İş akışını çalıştırmak için bu düğümleri yüklemeli veya yüklü alternatiflerle değiştirmelisiniz. Eksik düğümler tuvalde {red} ile vurgulanır. Bazı düğümler değiştirilemez ve Node Manager üzerinden yüklenmelidir.",
+    "notReplaceable": "Kurulum Gerekli",
+    "openNodeManager": "Node Manager'ı Aç",
+    "quickFixAvailable": "Hızlı Düzeltme Mevcut",
+    "redHighlight": "kırmızı",
+    "replaceAll": "Hepsini Değiştir",
+    "replaceAllWarning": "Bu gruptaki mevcut tüm düğümleri değiştirir.",
+    "replaceFailed": "Düğümler değiştirilemedi",
+    "replaceNode": "Düğümü Değiştir",
+    "replaceSelected": "Seçilenleri Değiştir ({count})",
+    "replaceWarning": "Bu işlem iş akışını kalıcı olarak değiştirecek. Emin değilseniz önce bir kopyasını kaydedin.",
+    "replaceable": "Değiştirilebilir",
+    "replaced": "Değiştirildi",
+    "replacedAllNodes": "{count} düğüm türü değiştirildi",
+    "replacedNode": "Değiştirilen düğüm: {nodeType}",
+    "selectAll": "Tümünü Seç",
+    "skipForNow": "Şimdilik Atla",
+    "swapNodesGuide": "Aşağıdaki düğümler, uyumlu alternatiflerle otomatik olarak değiştirilebilir.",
+    "swapNodesTitle": "Düğümleri Değiştir",
+    "unknownNode": "Bilinmeyen",
+    "willBeReplacedBy": "Bu düğüm şununla değiştirilecek:"
+  },
   "nodeTemplates": {
     "enterName": "İsim girin",
     "saveAsTemplate": "Şablon olarak kaydet"
@@ -1357,6 +2130,7 @@
   "notSupported": {
     "continue": "Devam Et",
     "continueTooltip": "Cihazımın desteklendiğinden eminim",
+    "illustrationAlt": "Üzgün kız illüstrasyonu",
     "learnMore": "Daha Fazla Bilgi Edinin",
     "message": "Yalnızca aşağıdaki cihazlar desteklenmektedir:",
     "reportIssue": "Sorun Bildir",
@@ -1366,12 +2140,222 @@
     },
     "title": "Cihazınız desteklenmiyor"
   },
+  "painter": {
+    "background": "Arka Plan",
+    "brush": "Fırça",
+    "clear": "Temizle",
+    "color": "Renk Seçici",
+    "eraser": "Silgi",
+    "hardness": "Sertlik",
+    "height": "Yükseklik",
+    "size": "İmleç Boyutu",
+    "tool": "Araç",
+    "uploadError": "Ressam görseli yüklenemedi: {status} - {statusText}",
+    "width": "Genişlik"
+  },
+  "progressToast": {
+    "allDownloadsCompleted": "Tüm indirmeler tamamlandı",
+    "downloadingModel": "Model indiriliyor...",
+    "downloadsFailed": "{count} indirme başarısız oldu | {count} indirme başarısız oldu | {count} indirme başarısız oldu",
+    "failed": "Başarısız",
+    "filter": {
+      "all": "Tümü",
+      "completed": "Tamamlandı",
+      "failed": "Başarısız"
+    },
+    "finished": "Tamamlandı",
+    "importingModels": "Modeller İçe Aktarılıyor",
+    "noImportsInQueue": "Kuyrukta {filter} yok",
+    "pending": "Beklemede",
+    "progressCount": "{completed} / {total}"
+  },
+  "queue": {
+    "completedIn": "{duration} içinde tamamlandı",
+    "inQueue": "Kuyrukta...",
+    "initializingAlmostReady": "Başlatılıyor - Neredeyse hazır",
+    "jobAddedToQueue": "İş kuyruğa eklendi",
+    "jobDetails": {
+      "computeHoursUsed": "Kullanılan hesaplama saati",
+      "errorMessage": "Hata mesajı",
+      "estimatedFinishIn": "Bitmesi tahmini",
+      "estimatedStartIn": "Başlaması tahmini",
+      "eta": {
+        "minutes": "Yaklaşık {count} dakika | Yaklaşık {count} dakika",
+        "minutesRange": "Yaklaşık {lo}-{hi} dakika",
+        "seconds": "Yaklaşık {count} saniye | Yaklaşık {count} saniye",
+        "secondsRange": "Yaklaşık {lo}-{hi} saniye"
+      },
+      "failedAfter": "Şu süreden sonra başarısız oldu",
+      "generatedOn": "Üretildiği zaman",
+      "header": "İş Detayları",
+      "jobId": "İş Kimliği",
+      "queuePosition": "Kuyruk pozisyonu",
+      "queuePositionValue": "Sizden önce yaklaşık {count} iş var | Sizden önce yaklaşık {count} iş var",
+      "queuedAt": "Kuyruğa alındı",
+      "report": "Bildir",
+      "timeElapsed": "Geçen süre",
+      "totalGenerationTime": "Toplam üretim süresi",
+      "workflow": "Çalışma Akışı"
+    },
+    "jobHistory": "İş Geçmişi",
+    "jobList": {
+      "sortComputeHoursUsed": "Kullanılan hesaplama saati (en çok ilk)",
+      "sortMostRecent": "En yeni",
+      "sortTotalGenerationTime": "Toplam üretim süresi (en uzun ilk)",
+      "undated": "Tarihsiz"
+    },
+    "jobMenu": {
+      "addToCurrentWorkflow": "Mevcut çalışma akışına ekle",
+      "cancelJob": "İşi İptal Et",
+      "copyErrorMessage": "Hata mesajını kopyala",
+      "copyJobId": "İş Kimliğini Kopyala",
+      "delete": "Sil",
+      "deleteAsset": "Varlığı sil",
+      "download": "İndir",
+      "exportWorkflow": "Çalışma akışını dışa aktar",
+      "inspectAsset": "Varlığı İncele",
+      "openAsWorkflowNewTab": "Çalışma akışı olarak yeni sekmede aç",
+      "openWorkflowNewTab": "Çalışma akışını yeni sekmede aç",
+      "removeJob": "İşi kaldır",
+      "reportError": "Hata bildir"
+    },
+    "jobQueueing": "İşlem kuyruğa alınıyor",
+    "toggleJobHistory": "İş Geçmişini Aç/Kapat"
+  },
   "releaseToast": {
+    "description": "Bu güncellemedeki en son iyileştirmelere ve özelliklere göz atın.",
     "newVersionAvailable": "Yeni Sürüm Mevcut!",
     "skip": "Atla",
     "update": "Güncelle",
     "whatsNew": "Yenilikler Neler?"
   },
+  "rightSidePanel": {
+    "addFavorite": "Favorilere Ekle",
+    "advancedInputs": "GELİŞMİŞ GİRDİLER",
+    "bypass": "Atla",
+    "color": "Düğüm rengi",
+    "enterSubgraph": "Alt grafiğe gir",
+    "errorHelp": "Daha fazla yardım için {github} veya {support}",
+    "errorHelpGithub": "bir GitHub sorunu gönderin",
+    "errorHelpSupport": "destek ekibimizle iletişime geçin",
+    "errors": "Hatalar",
+    "executionErrorOccurred": "Çalıştırma sırasında bir hata oluştu. Detaylar için Hatalar sekmesini kontrol edin.",
+    "fallbackGroupTitle": "Grup",
+    "fallbackNodeTitle": "Düğüm",
+    "favorites": "FAVORİ GİRDİLER",
+    "favoritesNone": "FAVORİ GİRDİ YOK",
+    "favoritesNoneDesc": "Favorilere eklediğiniz girdiler burada görünecek",
+    "favoritesNoneHint": "Parametreler sekmesinde, herhangi bir girdinin yanındaki {moreIcon} simgesine tıklayarak buraya ekleyebilirsiniz",
+    "favoritesNoneTooltip": "Düğüm seçmeden hızlı erişim için widget'ları yıldızlayın",
+    "globalSettings": {
+      "canvas": "TUVAL",
+      "connectionLinks": "BAĞLANTI LİNKLERİ",
+      "gridSpacing": "Izgara aralığı",
+      "linkShape": "Bağlantı şekli",
+      "nodes": "DÜĞÜMLER",
+      "nodes2": "Düğümler 2.0",
+      "searchPlaceholder": "Hızlı ayarlarda ara...",
+      "showAdvanced": "Gelişmiş parametreleri göster",
+      "showAdvancedTooltip": "Bu önemli bir ayardır. TRUE olarak ayarlandığında düğümler için tüm gelişmiş parametreleri gösterir",
+      "showConnectedLinks": "Bağlı linkleri göster",
+      "showInfoBadges": "Bilgi rozetlerini göster",
+      "showToolbox": "Seçimde araç kutusunu göster",
+      "snapNodesToGrid": "Düğümleri ızgaraya hizala",
+      "title": "Genel Ayarlar",
+      "viewAllSettings": "Tüm ayarları görüntüle"
+    },
+    "groupSettings": "Grup Ayarları",
+    "groups": "Gruplar",
+    "hideAdvancedInputsButton": "Gelişmiş girişleri gizle",
+    "hideInput": "Girdiyi gizle",
+    "info": "Bilgi",
+    "inputs": "GİRİŞLER",
+    "inputsNone": "GİRİŞ YOK",
+    "inputsNoneTooltip": "Düğümün girişi yok",
+    "locateNode": "Düğümü tuvalde bul",
+    "missingNodePacks": {
+      "applyChanges": "Değişiklikleri Uygula",
+      "cloudMessage": "Bu iş akışı, Comfy Cloud'da henüz mevcut olmayan özel düğümler gerektiriyor.",
+      "collapse": "Daralt",
+      "expand": "Genişlet",
+      "installAll": "Tümünü Yükle",
+      "installNodePack": "Düğüm paketini yükle",
+      "installed": "Yüklendi",
+      "installing": "Yükleniyor...",
+      "ossManagerDisabledHint": "Eksik düğümleri yüklemek için önce Python ortamınızda {pipCmd} komutunu çalıştırarak Node Manager'ı yükleyin, ardından ComfyUI'yi {flag} bayrağı ile yeniden başlatın.",
+      "ossMessage": "Bu iş akışı, henüz yüklemediğiniz özel düğümler kullanıyor.",
+      "searchInManager": "Düğüm Yöneticisinde Ara",
+      "title": "Eksik Düğüm Paketleri",
+      "unknownPack": "Bilinmeyen paket",
+      "unsupportedTitle": "Desteklenmeyen Düğüm Paketleri",
+      "viewInManager": "Yöneticide Görüntüle"
+    },
+    "mute": "Sessiz",
+    "noErrors": "Hata yok",
+    "noSelection": "Bir düğüm seçerek özelliklerini ve bilgisini görebilirsiniz.",
+    "nodeState": "Düğüm durumu",
+    "nodes": "Düğümler",
+    "nodesNoneDesc": "DÜĞÜM YOK",
+    "noneSearchDesc": "Aramanızla eşleşen öğe yok",
+    "normal": "Normal",
+    "parameters": "Parametreler",
+    "pinned": "Sabitlendi",
+    "promptErrors": {
+      "no_prompt": {
+        "desc": "Sunucuya gönderilen çalışma akışı verisi boş. Bu beklenmeyen bir sistem hatası olabilir."
+      },
+      "prompt_no_outputs": {
+        "desc": "Çalışma akışında sonuç üretecek herhangi bir çıktı düğümü (ör. Görüntüyü Kaydet, Görüntüyü Önizle) bulunmuyor."
+      },
+      "server_error_cloud": {
+        "desc": "Sunucu beklenmeyen bir hata ile karşılaştı. Lütfen daha sonra tekrar deneyin."
+      },
+      "server_error_local": {
+        "desc": "Sunucu beklenmeyen bir hata ile karşılaştı. Lütfen sunucu günlüklerini kontrol edin."
+      }
+    },
+    "properties": "Özellikler",
+    "removeFavorite": "Favorilerden Kaldır",
+    "resetAllParameters": "Tüm parametreleri sıfırla",
+    "resetToDefault": "Varsayılanlara sıfırla",
+    "seeError": "Hatayı Gör",
+    "settings": "Ayarlar",
+    "showAdvancedInputsButton": "Gelişmiş girdileri göster",
+    "showInput": "Girdiyi göster",
+    "title": "Seçili düğüm yok | 1 düğüm seçili | {count} düğüm seçili",
+    "togglePanel": "Özellikler panelini aç/kapat",
+    "workflowOverview": "Çalışma Akışı Genel Bakış"
+  },
+  "secrets": {
+    "addSecret": "Gizli Bilgi Ekle",
+    "createdAt": "{date} tarihinde oluşturuldu",
+    "deleteConfirmMessage": "\"{name}\" adlı gizli bilgiyi silmek istediğinizden emin misiniz? Bu işlem geri alınamaz.",
+    "deleteConfirmTitle": "Gizli Bilgiyi Sil",
+    "description": "Gizli bilgiler şifrelenir ve API anahtarları gibi hassas veriler için kullanılır.",
+    "descriptionUsage": "Desteklenen sağlayıcılardan özel ve kısıtlı modelleri indirmek için anahtarlarınızı burada saklayın.",
+    "editSecret": "Gizli Bilgiyi Düzenle",
+    "errors": {
+      "duplicateName": "Bu adla zaten bir gizli bilgi mevcut",
+      "duplicateProvider": "Bu sağlayıcı için zaten bir gizli bilgi mevcut",
+      "nameRequired": "Ad zorunludur",
+      "nameTooLong": "Ad 255 karakter veya daha kısa olmalıdır",
+      "providerRequired": "Sağlayıcı zorunludur",
+      "secretValueRequired": "Gizli değer zorunludur"
+    },
+    "lastUsed": "Son kullanım {date}",
+    "modelProviders": "Model Sağlayıcıları",
+    "name": "Ad",
+    "namePlaceholder": "örn. API Anahtarım",
+    "noSecrets": "Henüz gizli bilgi yok. Başlamak için ilk API anahtarınızı ekleyin.",
+    "provider": "Sağlayıcı",
+    "providerHint": "İsteğe bağlı. Bir sağlayıcı seçmek otomatik anahtar kullanımını etkinleştirir.",
+    "secretValue": "Gizli Değer",
+    "secretValueHint": "Bu değer şifrelenecek ve tekrar görüntülenemeyecek.",
+    "secretValueHintEdit": "Mevcut değeri korumak için boş bırakın.",
+    "secretValuePlaceholder": "API anahtarınızı girin",
+    "secretValuePlaceholderEdit": "Değiştirmek için yeni değeri girin",
+    "title": "API Anahtarları & Gizli Bilgiler"
+  },
   "selectionToolbox": {
     "Bypass Group Nodes": "Bypass Group Nodes",
     "Set Group Nodes to Always": "Set Group Nodes to Always",
@@ -1384,6 +2368,8 @@
   "serverConfig": {
     "modifiedConfigs": "Aşağıdaki sunucu yapılandırmalarını değiştirdiniz. Değişiklikleri uygulamak için yeniden başlatın.",
     "restart": "Yeniden Başlat",
+    "restartRequiredToastDetail": "Sunucu yapılandırma değişikliklerini uygulamak için uygulamayı yeniden başlatın.",
+    "restartRequiredToastSummary": "Yeniden başlatma gerekli",
     "revertChanges": "Değişiklikleri Geri Al"
   },
   "serverConfigCategories": {
@@ -1452,6 +2438,10 @@
     "enable-cors-header": {
       "name": "CORS başlığını etkinleştir: Tüm kaynaklar için \"*\" kullanın veya alan adı belirtin"
     },
+    "enable-manager-legacy-ui": {
+      "name": "Klasik Manager Arayüzünü Kullan",
+      "tooltip": "Yeni arayüz yerine klasik ComfyUI-Manager arayüzünü kullanır."
+    },
     "fast": {
       "name": "Test edilmemiş ve potansiyel olarak kaliteyi düşüren bazı optimizasyonları etkinleştirin."
     },
@@ -1553,6 +2543,8 @@
     "CustomColorPalettes": "Özel Renk Paletleri",
     "DevMode": "Geliştirici Modu",
     "EditTokenWeight": "Jeton Ağırlığını Düzenle",
+    "Error System": "Hata Sistemi",
+    "Execution": "Yürütme",
     "Extension": "Uzantı",
     "General": "Genel",
     "Graph": "Grafik",
@@ -1568,10 +2560,14 @@
     "Menu": "Menü",
     "ModelLibrary": "Model Kütüphanesi",
     "Node": "Düğüm",
+    "Node Library": "Düğüm Kütüphanesi",
     "Node Search Box": "Düğüm Arama Kutusu",
     "Node Widget": "Düğüm Widget'ı",
     "NodeLibrary": "Düğüm Kütüphanesi",
+    "Nodes 2_0": "Nodes 2.0",
     "Notification Preferences": "Bildirim Tercihleri",
+    "Other": "Diğer",
+    "PLY": "PLY",
     "PlanCredits": "Plan & Krediler",
     "Pointer": "İşaretçi",
     "Queue": "Kuyruk",
@@ -1579,6 +2575,7 @@
     "Reroute": "Yeniden Yönlendir",
     "RerouteBeta": "Yeniden Yönlendirme Beta",
     "Scene": "Sahne",
+    "Secrets": "Gizli Anahtarlar",
     "Server": "Sunucu",
     "Server-Config": "Sunucu-Yapılandırma",
     "Settings": "Ayarlar",
@@ -1590,7 +2587,8 @@
     "Vue Nodes": "Vue Düğümleri",
     "VueNodes": "Vue Düğümleri",
     "Window": "Pencere",
-    "Workflow": "İş Akışı"
+    "Workflow": "İş Akışı",
+    "Workspace": "Çalışma Alanı"
   },
   "shape": {
     "CARD": "Kart",
@@ -1616,11 +2614,18 @@
     "viewControls": "Görünüm Kontrolleri"
   },
   "sideToolbar": {
+    "activeJobStatus": "Aktif iş: {status}",
     "assets": "Varlıklar",
     "backToAssets": "Tüm varlıklara dön",
     "browseTemplates": "Örnek şablonlara göz atın",
     "downloads": "İndirmeler",
+    "folderView": {
+      "errorDetail": "Bu iş için çıktılar alınamadı. Lütfen tekrar deneyin.",
+      "errorSummary": "Çıktılar yüklenemedi"
+    },
+    "generatedAssetsHeader": "Oluşturulan varlıklar",
     "helpCenter": "Yardım Merkezi",
+    "importedAssetsHeader": "İçe aktarılan varlıklar",
     "labels": {
       "assets": "Varlıklar",
       "console": "Konsol",
@@ -1643,6 +2648,17 @@
     "noImportedFiles": "İçe aktarılan dosya bulunamadı",
     "nodeLibrary": "Düğüm Kütüphanesi",
     "nodeLibraryTab": {
+      "allNodes": "Tüm düğümler",
+      "blueprints": "Şablonlar",
+      "custom": "Özel",
+      "essentials": "Temel",
+      "filter": "Filtrele",
+      "filterOptions": {
+        "blueprints": "Şablonlar",
+        "comfyNodes": "Comfy Düğümleri",
+        "extensions": "Eklentiler",
+        "partnerNodes": "Partner Düğümleri"
+      },
       "groupBy": "Gruplandır",
       "groupStrategies": {
         "category": "Kategori",
@@ -1652,7 +2668,20 @@
         "source": "Kaynak",
         "sourceDesc": "Kaynak türüne göre gruplandır (Çekirdek, Özel, API)"
       },
+      "noBookmarkedNodes": "Henüz favori yok",
       "resetView": "Görünümü Varsayılana Sıfırla",
+      "sections": {
+        "bookmarked": "Favoriler",
+        "comfyBlueprints": "Comfy Şablonları",
+        "comfyNodes": "Comfy Düğümleri",
+        "extensions": "Eklentiler",
+        "favoriteNode": "Favori Düğüm",
+        "favorites": "Favoriler",
+        "myBlueprints": "Benim Şablonlarım",
+        "partnerNodes": "Partner Düğümleri",
+        "subgraphBlueprints": "Alt Grafik Şablonları",
+        "unfavoriteNode": "Favori Düğümü Kaldır"
+      },
       "sortBy": {
         "alphabetical": "Alfabetik",
         "alphabeticalDesc": "Gruplar içinde alfabetik olarak sırala",
@@ -1661,8 +2690,62 @@
       },
       "sortMode": "Sıralama Modu"
     },
+    "nodes": "Düğümler",
     "openWorkflow": "Yerel dosya sisteminde iş akışını aç",
     "queue": "Kuyruk",
+    "queueProgressOverlay": {
+      "activeJobs": "{count} aktif iş | {count} aktif iş",
+      "activeJobsShort": "{count} aktif | {count} aktif",
+      "activeJobsSuffix": "aktif iş",
+      "cancelJobTooltip": "İşi iptal et",
+      "clearAllJobsTooltip": "Tüm çalışan işleri iptal et",
+      "clearHistory": "İş kuyruğu geçmişini temizle",
+      "clearHistoryDialogAssetsNote": "Bu işler tarafından oluşturulan varlıklar silinmeyecek ve her zaman varlık panelinden görüntülenebilir.",
+      "clearHistoryDialogDescription": "Aşağıdaki tamamlanan veya başarısız olan tüm işler bu İş kuyruğu panelinden kaldırılacaktır.",
+      "clearHistoryDialogTitle": "İş kuyruğu geçmişinizi temizlemek istiyor musunuz?",
+      "clearHistoryMenuAssetsNote": "Medya varlıkları silinmeyecek.",
+      "clearQueueTooltip": "Kuyruğu temizle",
+      "clearQueued": "Kuyruktakileri temizle",
+      "colonPercent": ": {percent}",
+      "currentNode": "Mevcut düğüm:",
+      "dockedJobHistory": "Sabitlenmiş İş Geçmişi",
+      "expandCollapsedQueue": "İş kuyruğunu genişlet",
+      "filterAllWorkflows": "Tüm iş akışları",
+      "filterBy": "Filtrele",
+      "filterCurrentWorkflow": "Mevcut iş akışı",
+      "filterJobs": "İşleri filtrele",
+      "inlineTotalLabel": "Toplam",
+      "interruptAll": "Tüm çalışan işleri durdur",
+      "jobCompleted": "İşlem tamamlandı",
+      "jobFailed": "İşlem başarısız oldu",
+      "jobQueue": "İş Kuyruğu",
+      "jobsAddedToQueue": "{count} işlem kuyruğa eklendi | {count} işlem kuyruğa eklendi",
+      "jobsCompleted": "{count} iş tamamlandı | {count} iş tamamlandı",
+      "jobsFailed": "{count} iş başarısız oldu | {count} iş başarısız oldu",
+      "moreOptions": "Daha fazla seçenek",
+      "noActiveJobs": "Aktif iş yok",
+      "preview": "Önizleme",
+      "queuedJobsLabel": "{count} kuyruğa alındı",
+      "queuedSuffix": "kuyrukta",
+      "running": "çalışıyor",
+      "runningJobsLabel": "{count} çalışıyor",
+      "runningQueuedSummary": "{running}, {queued}",
+      "searchJobs": "Ara...",
+      "showAssets": "Varlıkları göster",
+      "showAssetsPanel": "Varlık panelini göster",
+      "showRunProgressBar": "Çalışma ilerleme çubuğunu göster",
+      "sortBy": "Sırala",
+      "sortJobs": "İşleri sırala",
+      "stubClipTextEncode": "CLIP Metin Kodlama:",
+      "title": "Kuyruk İlerlemesi",
+      "total": "Toplam: {percent}",
+      "viewAllJobs": "Tüm işleri görüntüle",
+      "viewGrid": "Izgara görünümü",
+      "viewJobHistory": "İş geçmişini görüntüle",
+      "viewList": "Liste görünümü"
+    },
+    "searchAssets": "Varlıkları Ara",
+    "sidebar": "Kenar Çubuğu",
     "templates": "Şablonlar",
     "themeToggle": "Temayı Değiştir",
     "workflowTab": {
@@ -1686,60 +2769,208 @@
   },
   "subgraphStore": {
     "blueprintName": "Alt Grafik adı",
+    "blueprintNamePrompt": "Alt grafik adı:",
+    "cannotDeleteGlobal": "Yüklü şablonlar silinemez",
     "confirmDelete": "Bu işlem taslağı kütüphanenizden kalıcı olarak kaldıracaktır",
     "confirmDeleteTitle": "Taslak silinsin mi?",
+    "disconnected": "Bağlantı kesildi",
+    "enterDescription": "Bir açıklama girin",
+    "enterSearchAliases": "Arama takma adlarını girin (virgülle ayrılmış)",
     "hidden": "Gizli / iç içe parametreler",
     "hideAll": "Tümünü gizle",
+    "linked": "(Bağlı)",
     "loadFailure": "Alt grafik taslakları yüklenemedi",
     "overwriteBlueprint": "Kaydetmek, mevcut taslağın üzerine değişikliklerinizi yazacaktır",
     "overwriteBlueprintTitle": "Mevcut taslağın üzerine yazılsın mı?",
     "promoteOutsideSubgraph": "Alt grafikte değilken widget yükseltilemez",
+    "promoteWidget": "Widget'ı Yükselt: {name}",
     "publish": "Alt Grafiği Yayınla",
     "publishSuccess": "Düğüm Kütüphanesine Kaydedildi",
     "publishSuccessMessage": "Alt grafik taslağınızı düğüm kütüphanesinde \"Alt Grafik Taslakları\" altında bulabilirsiniz",
     "saveBlueprint": "Alt Grafiği Kütüphaneye Kaydet",
+    "searchAliases": "Takma Adlarda Ara",
     "showAll": "Tümünü göster",
     "showRecommended": "Önerilen widget'ları göster",
-    "shown": "Düğümde gösterilen"
+    "shown": "Düğümde gösterilen",
+    "unpromoteWidget": "Widget'ı Geri Al: {name}"
   },
   "subscription": {
     "addApiCredits": "API kredisi ekle",
     "addCredits": "Kredi ekle",
+    "addCreditsLabel": "İstediğiniz zaman kredi ekleyin",
     "benefits": {
       "benefit1": "Partner Düğümleri için aylık krediler — ihtiyaç duyulduğunda yükleyin",
-      "benefit2": "İş başına en fazla 30 dakika çalışma süresi"
+      "benefit1FreeTier": "Daha fazla aylık kredi, istediğiniz zaman yükleyin",
+      "benefit2": "İş başına en fazla 30 dakika çalışma süresi",
+      "benefit3": "Kendi modellerinizi getirin (Creator & Pro)"
     },
     "beta": "BETA",
+    "billedMonthly": "Aylık faturalandırılır",
+    "billedYearly": "{total} Yıllık faturalandırılır",
+    "billingComingSoon": {
+      "message": "Takım faturalandırması yakında geliyor. Çalışma alanınız için koltuk başına fiyatlandırma ile bir plana abone olabileceksiniz. Güncellemeler için bizi takip edin.",
+      "title": "Yakında"
+    },
+    "cancelDialog": {
+      "confirmCancel": "Aboneliği iptal et",
+      "description": "Erişiminiz {date} tarihine kadar devam edecek. Tekrar ücretlendirilmeyeceksiniz ve çalışma alanınız ile kredileriniz korunacak. İstediğiniz zaman yeniden abone olabilirsiniz.",
+      "endOfBillingPeriod": "fatura dönemi sonu",
+      "failed": "Abonelik iptali başarısız oldu",
+      "keepSubscription": "Aboneliği sürdür",
+      "title": "Aboneliği iptal et"
+    },
+    "cancelSubscription": "Aboneliği İptal Et",
+    "cancelSuccess": "Abonelik başarıyla iptal edildi",
+    "canceled": "İptal edildi",
+    "canceledCard": {
+      "description": "Tekrar ücretlendirilmeyeceksiniz. Özellikleriniz {date} tarihine kadar aktif kalacak.",
+      "title": "Aboneliğiniz iptal edildi"
+    },
+    "changeTo": "{plan} planına geç",
+    "chooseBestPlanWorkspace": "Çalışma alanınız için en iyi planı seçin",
     "comfyCloud": "Comfy Cloud",
+    "comfyCloudLogo": "Comfy Cloud Logosu",
+    "contactOwnerToSubscribe": "Abone olmak için çalışma alanı sahibiyle iletişime geçin",
+    "contactUs": "Bize ulaşın",
+    "creditsRemainingThisMonth": "Bu ay kalan krediler",
+    "creditsRemainingThisYear": "Bu yıl kalan krediler",
+    "creditsYouveAdded": "Eklediğiniz krediler",
+    "currentPlan": "Mevcut Plan",
+    "customLoRAsLabel": "Kendi LoRA'larınızı içe aktarın",
+    "description": "Sizin için en iyi planı seçin",
+    "descriptionWorkspace": "Çalışma alanınız için en iyi planı seçin",
     "expiresDate": "{date} tarihinde sona erer",
+    "freeTier": {
+      "description": "Ücretsiz planınız, Comfy Cloud'u denemek için her ay {credits} kredi içerir.",
+      "descriptionGeneric": "Ücretsiz planınız, Comfy Cloud'u denemek için aylık kredi hakkı içerir.",
+      "nextRefresh": "Kredileriniz {date} tarihinde yenilenecek.",
+      "outOfCredits": {
+        "subtitle": "Yeniden yükleme ve daha fazlasının kilidini açmak için abone olun",
+        "title": "Ücretsiz kredileriniz bitti"
+      },
+      "subscribeCta": "Daha fazlası için abone olun",
+      "title": "Ücretsiz plandasınız",
+      "topUpBlocked": {
+        "title": "Yeniden yükleme ve daha fazlasının kilidini açın"
+      },
+      "upgradeCta": "Planları görüntüle"
+    },
+    "gpuLabel": "RTX 6000 Pro (96GB VRAM)",
+    "haveQuestions": "Sorularınız mı var veya kurumsal çözüm mü arıyorsunuz?",
     "invoiceHistory": "Fatura geçmişi",
     "learnMore": "Daha fazla bilgi edinin",
+    "managePayment": "Ödemeyi Yönet",
+    "managePlan": "Planı yönet",
     "manageSubscription": "Aboneliği yönet",
+    "maxDuration": {
+      "creator": "30 dk",
+      "founder": "30 dk",
+      "free": "30 dk",
+      "pro": "1 sa",
+      "standard": "30 dk"
+    },
+    "maxDurationLabel": "Her iş akışı çalıştırma için maksimum süre",
+    "maxMembersLabel": "Azami üye",
+    "member": "üye",
+    "memberCount": "{count} üye",
+    "membersLabel": "{count} üye'ye kadar",
     "messageSupport": "Destek ekibine mesaj gönder",
+    "monthly": "Aylık",
     "monthlyBonusDescription": "Aylık kredi bonusu",
+    "monthlyCreditsInfo": "Bu krediler her ay yenilenir ve devretmez",
+    "monthlyCreditsLabel": "Aylık krediler",
+    "monthlyCreditsPerMemberLabel": "Aylık kredi / üye",
     "monthlyCreditsRollover": "Bu krediler sonraki aya devredilecek",
+    "mostPopular": "En popüler",
     "nextBillingCycle": "sonraki fatura döngüsü",
+    "nextMonthInvoice": "Gelecek ay faturası",
     "partnerNodesBalance": "\"Partner Düğümleri\" Kredi Bakiyesi",
     "partnerNodesCredits": "Partner Düğümleri kredileri",
     "partnerNodesDescription": "Ticari/özel modelleri çalıştırmak için",
     "perMonth": "USD / ay",
+    "plansAndPricing": "Planlar ve fiyatlandırma",
     "prepaidCreditsInfo": "Ayrıca satın alınan ve son kullanma tarihi olmayan krediler",
     "prepaidDescription": "Ön ödemeli krediler",
+    "preview": {
+      "addCreditCard": "Kredi kartı ekle",
+      "backToAllPlans": "Tüm planlara geri dön",
+      "confirm": "Onayla",
+      "confirmPayment": "Ödemenizi onaylayın",
+      "confirmPlanChange": "Plan değişikliğini onaylayın",
+      "eachMonthCreditsRefill": "Her ay krediler yenilenir",
+      "ends": "{date} tarihinde bitiyor",
+      "hideFeatures": "Özellikleri gizle",
+      "nextPaymentDue": "Sonraki ödeme {date} tarihinde. İstediğiniz zaman iptal edebilirsiniz.",
+      "perMember": "/ üye",
+      "privacyPolicy": "Gizlilik Politikası",
+      "proratedCharge": "{plan} için orantılı ücret",
+      "proratedRefund": "{plan} için orantılı iade",
+      "showMoreFeatures": "Daha fazla özelliği göster",
+      "starting": "{date} tarihinde başlıyor",
+      "startingToday": "Bugünden itibaren başlıyor",
+      "terms": "Şartlar",
+      "termsAgreement": "Devam ederek Comfy Org'un {terms} ve {privacy} politikasını kabul etmiş olursunuz.",
+      "totalDueToday": "Bugün ödenecek toplam tutar"
+    },
     "renewsDate": "{date} tarihinde yenilenir",
     "required": {
+      "pollingFailed": "Abonelik etkinleştirme başarısız oldu",
+      "pollingSuccess": "Abonelik başarıyla etkinleştirildi!",
+      "pollingTimeout": "Abonelik için bekleme süresi doldu. Lütfen sayfayı yenileyip tekrar deneyin.",
       "subscribe": "Abone Ol",
       "title": "Abone ol",
       "waitingForSubscription": "Aboneliğinizi yeni sekmede tamamlayın. İşleminiz bittiğinde otomatik olarak algılayacağız!"
     },
+    "resubscribe": "Yeniden abone ol",
+    "resubscribeSuccess": "Abonelik başarıyla yeniden etkinleştirildi",
+    "resubscribeTo": "{plan} planına yeniden abone ol",
+    "subscribeForMore": "Yükselt",
     "subscribeNow": "Hemen Abone Ol",
+    "subscribeTo": "{plan} abonesi ol",
     "subscribeToComfyCloud": "Comfy Cloud'a Abone Ol",
     "subscribeToRun": "Abone Ol",
     "subscribeToRunFull": "Çalıştırmaya Abone Ol",
+    "subscriptionRequiredMessage": "Üyelerin Bulut'ta iş akışlarını çalıştırabilmesi için abonelik gereklidir",
+    "tierNameYearly": "{name} Yıllık",
+    "tiers": {
+      "creator": {
+        "name": "Yaratıcı"
+      },
+      "founder": {
+        "name": "Kurucu Sürümü"
+      },
+      "free": {
+        "name": "Ücretsiz"
+      },
+      "pro": {
+        "name": "Pro"
+      },
+      "standard": {
+        "name": "Standart"
+      }
+    },
     "title": "Abonelik",
     "titleUnsubscribed": "Comfy Cloud'a Abone Olun",
     "totalCredits": "Toplam kredi",
+    "upgrade": "YÜKSELT",
+    "upgradePlan": "Planı Yükselt",
+    "upgradeTo": "{plan} planına yükselt",
+    "upgradeToAddCredits": "Kredi eklemek için yükselt",
+    "usdPerMonth": "USD / ay",
+    "usdPerMonthPerMember": "USD / ay / üye",
+    "videoEstimateExplanation": "Bu tahminler, varsayılan ayarlarla (5 saniye, 640x640, 16fps, 4 adım örnekleme) Wan 2.2 Görselden Videoya şablonuna dayanmaktadır.",
+    "videoEstimateHelp": "Bu şablon hakkında daha fazla bilgi",
+    "videoEstimateLabel": "Wan 2.2 Görselden Videoya şablonu ile yaklaşık 5 sn'lik video sayısı",
+    "videoEstimateTryTemplate": "Bu şablonu dene",
+    "videoTemplateBasedCredits": "Wan 2.2 Görselden Videoya ile oluşturulan videolar",
+    "viewEnterprise": "Kurumsal çözümü görüntüle",
     "viewMoreDetails": "Daha fazla detay görüntüle",
+    "viewMoreDetailsPlans": "Planlar ve fiyatlandırma hakkında daha fazla detay",
     "viewUsageHistory": "Kullanım geçmişini görüntüle",
+    "workspaceNotSubscribed": "Bu çalışma alanı bir aboneliğe sahip değil",
+    "yearly": "Yıllık",
+    "yearlyCreditsLabel": "Toplam yıllık krediler",
+    "yearlyDiscount": "%20 İNDİRİM",
     "yourPlanIncludes": "Planınız şunları içerir:"
   },
   "tabMenu": {
@@ -1751,8 +2982,14 @@
     "duplicateTab": "Sekmeyi Çoğalt",
     "removeFromBookmarks": "Yer İmlerinden Kaldır"
   },
+  "templateWidgets": {
+    "sort": {
+      "searchPlaceholder": "Ara..."
+    }
+  },
   "templateWorkflows": {
     "activeFilters": "Filtreler:",
+    "allTemplates": "Tüm Şablonlar",
     "categories": "Kategoriler",
     "category": {
       "3D": "3D",
@@ -1779,6 +3016,7 @@
     "error": {
       "templateNotFound": "\"{templateName}\" şablonu bulunamadı"
     },
+    "licenseFilter": "Lisans",
     "loading": "Şablonlar yükleniyor...",
     "loadingMore": "Daha fazla şablon yükleniyor...",
     "modelFilter": "Model Filtresi",
@@ -1795,14 +3033,19 @@
       "default": "Varsayılan",
       "modelSizeLowToHigh": "Model Boyutu (Düşükten Yükseğe)",
       "newest": "En Yeni",
+      "popular": "Popüler",
       "recommended": "Önerilen",
       "searchPlaceholder": "Ara...",
       "vramLowToHigh": "VRAM Kullanımı (Düşükten Yükseğe)"
     },
     "sorting": "Sıralama ölçütü",
     "title": "Bir Şablonla Başlayın",
+    "useCaseFilter": "Görevler",
     "useCasesSelected": "{count} Kullanım Senaryosu"
   },
+  "templates": {
+    "logoProviderSeparator": " & "
+  },
   "toastMessages": {
     "cannotCreateSubgraph": "Alt grafik oluşturulamıyor",
     "couldNotDetermineFileType": "Dosya türü belirlenemedi",
@@ -1810,6 +3053,7 @@
     "emptyCanvas": "Boş tuval",
     "errorCopyImage": "Görüntü kopyalanırken hata oluştu: {error}",
     "errorLoadingModel": "Model yüklenirken hata oluştu",
+    "errorOpenImage": "Görüntü açılırken hata oluştu: {error}",
     "errorSaveSetting": "{id} ayarı kaydedilirken hata oluştu: {err}",
     "exportSuccess": "Model başarıyla {format} olarak dışa aktarıldı",
     "failedExecutionPathResolution": "Seçilen düğümlerin yolu çözülemedi",
@@ -1829,9 +3073,23 @@
     "failedToLoadModel": "3B model yüklenemedi",
     "failedToPurchaseCredits": "Kredi satın alınamadı: {error}",
     "failedToQueue": "Kuyruğa alınamadı",
+    "failedToSaveDraft": "Çalışma taslağı kaydedilemedi",
+    "failedToToggleCamera": "Kamera açılıp kapatılamadı",
+    "failedToToggleGrid": "Izgara açılıp kapatılamadı",
+    "failedToUpdateBackgroundColor": "Arka plan rengi güncellenemedi",
+    "failedToUpdateBackgroundImage": "Arka plan görseli güncellenemedi",
+    "failedToUpdateBackgroundRenderMode": "Arka plan render modu {mode} olarak güncellenemedi",
+    "failedToUpdateEdgeThreshold": "Kenar eşiği güncellenemedi",
+    "failedToUpdateFOV": "Görüş alanı güncellenemedi",
+    "failedToUpdateLightIntensity": "Işık şiddeti güncellenemedi",
+    "failedToUpdateMaterialMode": "Malzeme modu güncellenemedi",
+    "failedToUpdateUpDirection": "Yukarı yönü güncellenemedi",
+    "failedToUploadBackgroundImage": "Arka plan görseli yüklenemedi",
     "fileLoadError": "{fileName} içinde iş akışı bulunamıyor",
+    "fileTooLarge": "Dosya çok büyük ({size} MB). Desteklenen maksimum boyut {maxSize} MB",
     "fileUploadFailed": "Dosya yükleme başarısız oldu",
     "interrupted": "Yürütme kesintiye uğradı",
+    "legacyMaskEditorDeprecated": "Klasik maske düzenleyici kullanımdan kaldırıldı ve yakında kaldırılacak.",
     "migrateToLitegraphReroute": "Yeniden yönlendirme düğümleri gelecekteki sürümlerde kaldırılacaktır. Litegraph yerel yeniden yönlendirmeye geçmek için tıklayın.",
     "modelLoadedSuccessfully": "3B model başarıyla yüklendi",
     "no3dScene": "Doku uygulanacak 3D sahne yok",
@@ -1858,12 +3116,14 @@
     "selectUser": "Bir kullanıcı seçin"
   },
   "userSettings": {
+    "accountSettings": "Hesap ayarları",
     "email": "E-posta",
     "name": "İsim",
     "notSet": "Ayarlanmadı",
     "provider": "Giriş Sağlayıcı",
     "title": "Kullanıcı Ayarları",
-    "updatePassword": "Şifreyi Güncelle"
+    "updatePassword": "Şifreyi Güncelle",
+    "workspaceSettings": "Çalışma alanı ayarları"
   },
   "validation": {
     "descriptionRequired": "Açıklama gerekli",
@@ -1892,35 +3152,230 @@
     "updateFrontend": "Ön Ucu Güncelle"
   },
   "vueNodesBanner": {
+    "desc": "– Daha esnek iş akışları, güçlü yeni bileşenler, genişletilebilirlik için tasarlandı",
+    "title": "Nodes 2.0 Tanıtıldı",
     "tryItOut": "Deneyin"
   },
   "vueNodesMigration": {
     "button": "Ayarları Aç",
     "message": "Klasik düğüm tasarımını mı tercih ediyorsunuz?"
   },
+  "vueNodesMigrationMainMenu": {
+    "message": "Ana menüden istediğiniz zaman Nodes 2.0'a geri dönebilirsiniz."
+  },
+  "vueNodesSlot": {
+    "iterative": "(Yinelemeli)"
+  },
   "welcome": {
     "getStarted": "Başlayın",
     "title": "ComfyUI'ye Hoş Geldiniz"
   },
   "whatsNewPopup": {
+    "later": "Daha Sonra",
     "learnMore": "Daha fazla bilgi edinin",
     "noReleaseNotes": "Sürüm notu yok."
   },
+  "widgetFileUpload": {
+    "browseFiles": "Dosyalara Göz At",
+    "dropPrompt": "Dosyanızı bırakın veya"
+  },
   "widgets": {
+    "boolean": {
+      "false": "yanlış",
+      "true": "doğru"
+    },
+    "node2only": "Yalnızca Node 2.0",
     "selectModel": "Model seç",
     "uploadSelect": {
+      "maxSelectionReached": "Maksimum seçim sınırına ulaşıldı",
       "placeholder": "Seç...",
       "placeholderAudio": "Ses seç...",
       "placeholderImage": "Görsel seç...",
+      "placeholderMesh": "Ağ seç...",
       "placeholderModel": "Model seç...",
       "placeholderUnknown": "Medya seç...",
       "placeholderVideo": "Video seç..."
+    },
+    "valueControl": {
+      "decrement": "Değeri Azalt",
+      "decrementDesc": "Değerden 1 çıkarır veya önceki seçeneği seçer",
+      "editSettings": "Kontrol ayarlarını düzenle",
+      "fixed": "Sabit Değer",
+      "fixedDesc": "Değeri değiştirmez",
+      "header": {
+        "after": "SONRA",
+        "before": "ÖNCE",
+        "postfix": "iş akışını çalıştırırken:",
+        "prefix": "Değeri otomatik olarak güncelle"
+      },
+      "increment": "Değeri Artır",
+      "incrementDesc": "Değere 1 ekler veya bir sonraki seçeneği seçer",
+      "linkToGlobal": "Bağla",
+      "linkToGlobalDesc": "Global Değer'in kontrol ayarına bağlı benzersiz değer",
+      "linkToGlobalSeed": "Global Değer",
+      "randomize": "Değeri Rastgele Yap",
+      "randomizeDesc": "Her üretimden sonra değeri rastgele değiştirir"
     }
   },
   "workflowService": {
     "enterFilename": "Dosya adını girin",
+    "enterFilenamePrompt": "Dosya adını girin:",
     "exportWorkflow": "İş Akışını Dışa Aktar",
-    "saveWorkflow": "İş akışını kaydet"
+    "saveWorkflow": "İş akışını kaydet",
+    "savedAsApp": "Uygulama iş akışına dönüştürüldü",
+    "savedAsWorkflow": "Yalnızca düğüm grafiği iş akışına dönüştürüldü"
+  },
+  "workspace": {
+    "addedToWorkspace": "{workspaceName} çalışma alanına eklendiniz",
+    "inviteAccepted": "Davet kabul edildi",
+    "inviteFailed": "Davet kabul edilemedi",
+    "unsavedChanges": {
+      "message": "Kaydedilmemiş değişiklikleriniz var. Bunları iptal edip çalışma alanlarını değiştirmek istiyor musunuz?",
+      "title": "Kaydedilmemiş Değişiklikler"
+    },
+    "viewWorkspace": "Çalışma alanını görüntüle"
+  },
+  "workspaceAuth": {
+    "errors": {
+      "accessDenied": "Bu çalışma alanına erişiminiz yok",
+      "invalidFirebaseToken": "Kimlik doğrulama başarısız oldu. Lütfen tekrar giriş yapmayı deneyin.",
+      "notAuthenticated": "Çalışma alanlarına erişmek için giriş yapmalısınız",
+      "tokenExchangeFailed": "Çalışma alanı ile kimlik doğrulama başarısız oldu: {error}",
+      "workspaceNotFound": "Çalışma alanı bulunamadı"
+    }
+  },
+  "workspacePanel": {
+    "createWorkspaceDialog": {
+      "create": "Oluştur",
+      "message": "Çalışma alanları, üyelerin tek bir kredi havuzunu paylaşmasını sağlar. Oluşturduktan sonra sahibi olacaksınız.",
+      "nameLabel": "Çalışma alanı adı*",
+      "namePlaceholder": "Çalışma alanı adını girin",
+      "title": "Yeni bir çalışma alanı oluştur"
+    },
+    "dashboard": {
+      "placeholder": "Çalışma alanı kontrol paneli ayarları"
+    },
+    "deleteDialog": {
+      "message": "Kullanılmamış krediler veya kaydedilmemiş varlıklar kaybolacak. Bu işlem geri alınamaz.",
+      "messageWithName": "\"{name}\" silinsin mi? Kullanılmamış krediler veya kaydedilmemiş varlıklar kaybolacak. Bu işlem geri alınamaz.",
+      "title": "Bu çalışma alanı silinsin mi?"
+    },
+    "editWorkspaceDialog": {
+      "nameLabel": "Çalışma alanı adı",
+      "save": "Kaydet",
+      "title": "Çalışma alanı detaylarını düzenle"
+    },
+    "invite": "Davet Et",
+    "inviteLimitReached": "Maksimum 50 üye sınırına ulaştınız",
+    "inviteMember": "Üye Davet Et",
+    "inviteMemberDialog": {
+      "createLink": "Bağlantı oluştur",
+      "linkCopied": "Kopyalandı",
+      "linkCopyFailed": "Bağlantı kopyalanamadı",
+      "linkStep": {
+        "copyLink": "Bağlantıyı Kopyala",
+        "done": "Tamamlandı",
+        "message": "Hesaplarının bu e-posta adresini kullandığından emin olun.",
+        "title": "Bu bağlantıyı kişiye gönderin"
+      },
+      "message": "Birine göndermek için paylaşılabilir bir davet bağlantısı oluştur",
+      "placeholder": "Kişinin e-posta adresini girin",
+      "title": "Bu çalışma alanına birini davet et"
+    },
+    "inviteUpsellDialog": {
+      "messageNotSubscribed": "Bu çalışma alanına ekip üyeleri eklemek için Creator planına veya daha üstüne ihtiyacınız var. Standard plan yalnızca tek kişilik (sahip) destekler.",
+      "messageSingleSeat": "Standard plan, çalışma alanı sahibi için bir koltuk içerir. Ek üyeler davet etmek için Creator planına veya daha üstüne yükselterek birden fazla koltuğun kilidini açın.",
+      "titleNotSubscribed": "Üyeleri davet etmek için abonelik gereklidir",
+      "titleSingleSeat": "Mevcut planınız tek kişilik desteklemektedir",
+      "upgradeToCreator": "Creator'a Yükselt",
+      "viewPlans": "Planları Görüntüle"
+    },
+    "leaveDialog": {
+      "leave": "Ayrıl",
+      "message": "Çalışma alanı sahibiyle iletişime geçmedikçe tekrar katılamazsınız.",
+      "title": "Bu çalışma alanından ayrılsın mı?"
+    },
+    "members": {
+      "actions": {
+        "copyLink": "Davet bağlantısını kopyala",
+        "removeMember": "Üyeyi kaldır",
+        "revokeInvite": "Daveti geri al"
+      },
+      "columns": {
+        "expiryDate": "Son kullanma tarihi",
+        "inviteDate": "Davet tarihi",
+        "joinDate": "Katılma tarihi"
+      },
+      "createNewWorkspace": "yeni bir tane oluşturun.",
+      "membersCount": "{count}/50 Üye",
+      "noInvites": "Bekleyen davet yok",
+      "noMembers": "Üye yok",
+      "pendingInvitesCount": "{count} bekleyen davet | {count} bekleyen davet",
+      "personalWorkspaceMessage": "Şu anda kişisel çalışma alanınıza başka üyeler davet edemezsiniz. Bir çalışma alanına üye eklemek için,",
+      "tabs": {
+        "active": "Aktif",
+        "pendingCount": "Bekliyor ({count})"
+      },
+      "upsellBannerSubscribe": "Bu çalışma alanına ekip üyeleri davet etmek için Creator planına veya daha üstüne abone olun.",
+      "upsellBannerUpgrade": "Ek ekip üyeleri davet etmek için Creator planına veya daha üstüne yükseltin.",
+      "viewPlans": "Planları görüntüle"
+    },
+    "menu": {
+      "deleteWorkspace": "Çalışma Alanını Sil",
+      "deleteWorkspaceDisabledTooltip": "Önce çalışma alanınızın aktif aboneliğini iptal edin",
+      "editWorkspace": "Çalışma alanı detaylarını düzenle",
+      "leaveWorkspace": "Çalışma Alanından Ayrıl"
+    },
+    "removeMemberDialog": {
+      "error": "Üye kaldırılamadı",
+      "message": "Bu üye çalışma alanınızdan kaldırılacak. Kullandıkları krediler iade edilmeyecek.",
+      "remove": "Üyeyi kaldır",
+      "success": "Üye kaldırıldı",
+      "title": "Bu üye kaldırılsın mı?"
+    },
+    "revokeInviteDialog": {
+      "message": "Bu üye artık çalışma alanınıza katılamayacak. Davet bağlantısı geçersiz olacak.",
+      "revoke": "Davet Etme",
+      "title": "Bu kişiyi davet etme?"
+    },
+    "tabs": {
+      "dashboard": "Kontrol Paneli",
+      "membersCount": "Üyeler ({count})",
+      "planCredits": "Plan & Kredi"
+    },
+    "toast": {
+      "failedToCreateWorkspace": "Çalışma alanı oluşturulamadı",
+      "failedToDeleteWorkspace": "Çalışma alanı silinemedi",
+      "failedToFetchWorkspaces": "Çalışma alanları yüklenemedi",
+      "failedToLeaveWorkspace": "Çalışma alanından ayrılamadı",
+      "failedToUpdateWorkspace": "Çalışma alanı güncellenemedi",
+      "workspaceCreated": {
+        "message": "Bir plana abone olun, ekip arkadaşlarınızı davet edin ve iş birliğine başlayın.",
+        "subscribe": "Abone Ol",
+        "title": "Çalışma alanı oluşturuldu"
+      },
+      "workspaceDeleted": {
+        "message": "Çalışma alanı kalıcı olarak silindi.",
+        "title": "Çalışma alanı silindi"
+      },
+      "workspaceLeft": {
+        "message": "Çalışma alanından ayrıldınız.",
+        "title": "Çalışma alanından ayrıldınız"
+      },
+      "workspaceUpdated": {
+        "message": "Çalışma alanı detayları kaydedildi.",
+        "title": "Çalışma alanı güncellendi"
+      }
+    }
+  },
+  "workspaceSwitcher": {
+    "createWorkspace": "Yeni çalışma alanı oluştur",
+    "maxWorkspacesReached": "Yalnızca 10 çalışma alanına sahip olabilirsiniz. Yeni bir tane oluşturmak için birini silin.",
+    "personal": "Kişisel",
+    "roleMember": "Üye",
+    "roleOwner": "Sahip",
+    "subscribe": "Abone Ol",
+    "switchWorkspace": "Çalışma alanı değiştir"
   },
   "zoomControls": {
     "hideMinimap": "Mini Haritayı Gizle",
diff --git a/src/locales/tr/nodeDefs.json b/src/locales/tr/nodeDefs.json
index 37d9434267..f07f9f6040 100644
--- a/src/locales/tr/nodeDefs.json
+++ b/src/locales/tr/nodeDefs.json
@@ -39,6 +39,87 @@
       "sigmas": {
         "name": "sigmalar"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "AddTextPrefix": {
+    "display_name": "Metin Ön Eki Ekle",
+    "inputs": {
+      "prefix": {
+        "name": "ön ek",
+        "tooltip": "Eklenecek ön ek."
+      },
+      "texts": {
+        "name": "metinler",
+        "tooltip": "İşlenecek metin."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "metinler",
+        "tooltip": "İşlenmiş metinler"
+      }
+    }
+  },
+  "AddTextSuffix": {
+    "display_name": "Metin Son Eki Ekle",
+    "inputs": {
+      "suffix": {
+        "name": "son ek",
+        "tooltip": "Eklenecek son ek."
+      },
+      "texts": {
+        "name": "metinler",
+        "tooltip": "İşlenecek metin."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "metinler",
+        "tooltip": "İşlenmiş metinler"
+      }
+    }
+  },
+  "AdjustBrightness": {
+    "display_name": "Parlaklığı Ayarla",
+    "inputs": {
+      "factor": {
+        "name": "faktör",
+        "tooltip": "Parlaklık faktörü. 1.0 = değişiklik yok, <1.0 = daha koyu, >1.0 = daha parlak."
+      },
+      "images": {
+        "name": "görseller",
+        "tooltip": "İşlenecek görsel."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "görseller",
+        "tooltip": "İşlenmiş görseller"
+      }
+    }
+  },
+  "AdjustContrast": {
+    "display_name": "Kontrastı Ayarla",
+    "inputs": {
+      "factor": {
+        "name": "faktör",
+        "tooltip": "Kontrast faktörü. 1.0 = değişiklik yok, <1.0 = daha az kontrast, >1.0 = daha fazla kontrast."
+      },
+      "images": {
+        "name": "görseller",
+        "tooltip": "İşlenecek görsel."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "görseller",
+        "tooltip": "İşlenmiş görseller"
+      }
     }
   },
   "AlignYourStepsScheduler": {
@@ -70,6 +151,11 @@
         "name": "volume",
         "tooltip": "Desibel (dB) cinsinden ses seviyesi ayarı. 0 = değişiklik yok, +6 = iki katı, -6 = yarısı, vb."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "AudioConcat": {
@@ -86,6 +172,11 @@
         "name": "direction",
         "tooltip": "Ses2'nin ses1'den sonra mı yoksa önce mi ekleneceği."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "AudioEncoderEncode": {
@@ -117,6 +208,47 @@
       }
     }
   },
+  "AudioEqualizer3Band": {
+    "display_name": "Ses Ekolayzır (3-Bant)",
+    "inputs": {
+      "audio": {
+        "name": "ses"
+      },
+      "high_freq": {
+        "name": "yüksek_frekans",
+        "tooltip": "Yüksek raf için kesme frekansı"
+      },
+      "high_gain_dB": {
+        "name": "yüksek_kazanç_dB",
+        "tooltip": "Yüksek frekanslar (Tiz) için kazanç"
+      },
+      "low_freq": {
+        "name": "düşük_frekans",
+        "tooltip": "Düşük raf için kesme frekansı"
+      },
+      "low_gain_dB": {
+        "name": "düşük_kazanç_dB",
+        "tooltip": "Düşük frekanslar (Bas) için kazanç"
+      },
+      "mid_freq": {
+        "name": "orta_frekans",
+        "tooltip": "Orta frekanslar için merkez frekansı"
+      },
+      "mid_gain_dB": {
+        "name": "orta_kazanç_dB",
+        "tooltip": "Orta frekanslar için kazanç"
+      },
+      "mid_q": {
+        "name": "orta_q",
+        "tooltip": "Orta frekanslar için Q faktörü (bant genişliği)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "AudioMerge": {
     "description": "İki ses parçasını dalga formlarını üst üste bindirerek birleştirir.",
     "display_name": "Ses Birleştir",
@@ -131,6 +263,11 @@
         "name": "merge_method",
         "tooltip": "Ses dalga formlarını birleştirmek için kullanılan yöntem."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "BasicGuider": {
@@ -142,6 +279,11 @@
       "model": {
         "name": "model"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "BasicScheduler": {
@@ -159,6 +301,50 @@
       "steps": {
         "name": "adımlar"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchImagesNode": {
+    "display_name": "Toplu Görseller",
+    "inputs": {
+      "images": {
+        "name": "görseller"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchLatentsNode": {
+    "display_name": "Toplu Latentler",
+    "inputs": {
+      "latents": {
+        "name": "latentler"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchMasksNode": {
+    "display_name": "Toplu Maskeler",
+    "inputs": {
+      "masks": {
+        "name": "maskeler"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "BetaSamplingScheduler": {
@@ -176,6 +362,114 @@
       "steps": {
         "name": "adımlar"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BriaImageEditNode": {
+    "description": "Bria'nın en son modeliyle görüntüleri düzenleyin",
+    "display_name": "Bria Görüntü Düzenleme",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol"
+      },
+      "guidance_scale": {
+        "name": "yönlendirme_ölçeği",
+        "tooltip": "Daha yüksek değer, görüntünün isteme daha yakın olmasını sağlar."
+      },
+      "image": {
+        "name": "görüntü"
+      },
+      "mask": {
+        "name": "maske",
+        "tooltip": "Atlanırsa, düzenleme tüm görüntüye uygulanır."
+      },
+      "model": {
+        "name": "model"
+      },
+      "moderation": {
+        "name": "denetleme",
+        "tooltip": "Denetleme ayarları"
+      },
+      "negative_prompt": {
+        "name": "negatif_istem"
+      },
+      "prompt": {
+        "name": "istem",
+        "tooltip": "Görüntüyü düzenlemek için talimat"
+      },
+      "seed": {
+        "name": "tohum"
+      },
+      "steps": {
+        "name": "adımlar"
+      },
+      "structured_prompt": {
+        "name": "yapılandırılmış_istem",
+        "tooltip": "JSON formatında yapılandırılmış düzenleme istemi içeren bir dize. Hassas ve programatik kontrol için normal istem yerine bunu kullanın."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "yapılandırılmış_istem",
+        "tooltip": null
+      }
+    }
+  },
+  "BriaRemoveImageBackground": {
+    "description": "Bria RMBG 2.0 kullanarak bir görselin arka planını kaldırın.",
+    "display_name": "Bria Görsel Arka Planı Kaldır",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "image": {
+        "name": "görsel"
+      },
+      "moderation": {
+        "name": "moderasyon",
+        "tooltip": "Moderasyon ayarları"
+      },
+      "seed": {
+        "name": "tohum",
+        "tooltip": "Tohum, düğümün tekrar çalıştırılıp çalıştırılmayacağını kontrol eder; sonuçlar tohumdan bağımsız olarak deterministik değildir."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BriaRemoveVideoBackground": {
+    "description": "Bria kullanarak bir videonun arka planını kaldırın.",
+    "display_name": "Bria Video Arka Planı Kaldır",
+    "inputs": {
+      "background_color": {
+        "name": "arka plan rengi",
+        "tooltip": "Çıktı video için arka plan rengi."
+      },
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "seed": {
+        "name": "tohum",
+        "tooltip": "Tohum, düğümün tekrar çalıştırılıp çalıştırılmayacağını kontrol eder; sonuçlar tohumdan bağımsız olarak deterministik değildir."
+      },
+      "video": {
+        "name": "video"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ByteDanceFirstLastFrameNode": {
@@ -201,6 +495,10 @@
         "name": "ilk_kare",
         "tooltip": "Video için kullanılacak ilk kare."
       },
+      "generate_audio": {
+        "name": "ses_oluştur",
+        "tooltip": "Bu parametre, seedance-1-5-pro modeli dışında tüm modeller için yok sayılır."
+      },
       "last_frame": {
         "name": "son_kare",
         "tooltip": "Video için kullanılacak son kare."
@@ -231,43 +529,6 @@
       }
     }
   },
-  "ByteDanceImageEditNode": {
-    "description": "İstek üzerine api aracılığıyla ByteDance modellerini kullanarak görüntüleri düzenleyin",
-    "display_name": "ByteDance Görüntü Düzenleme",
-    "inputs": {
-      "control_after_generate": {
-        "name": "oluşturma sonrası kontrol"
-      },
-      "guidance_scale": {
-        "name": "rehberlik_ölçeği",
-        "tooltip": "Daha yüksek değer, görüntünün isteği daha yakından takip etmesini sağlar"
-      },
-      "image": {
-        "name": "görüntü",
-        "tooltip": "Düzenlenecek temel görüntü"
-      },
-      "model": {
-        "name": "model"
-      },
-      "prompt": {
-        "name": "istek",
-        "tooltip": "Görüntüyü düzenleme talimatı"
-      },
-      "seed": {
-        "name": "tohum",
-        "tooltip": "Oluşturma için kullanılacak tohum değeri"
-      },
-      "watermark": {
-        "name": "filigran",
-        "tooltip": "Görüntüye \"Yapay zeka tarafından oluşturulmuştur\" filigranı eklenip eklenmeyeceği"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
   "ByteDanceImageNode": {
     "description": "İstek üzerine api aracılığıyla ByteDance modellerini kullanarak görüntüler oluşturun",
     "display_name": "ByteDance Görüntü",
@@ -377,6 +638,10 @@
         "name": "süre",
         "tooltip": "Oluşturulan videonun saniye cinsinden süresi."
       },
+      "generate_audio": {
+        "name": "ses_oluştur",
+        "tooltip": "Bu parametre, seedance-1-5-pro modeli dışında tüm modeller için yok sayılır."
+      },
       "image": {
         "name": "görüntü",
         "tooltip": "Video için kullanılacak ilk kare."
@@ -431,8 +696,7 @@
         "tooltip": "sequential_image_generation='auto' olduğunda oluşturulacak maksimum resim sayısı. Toplam resim sayısı (girdi + oluşturulan) 15'i geçemez."
       },
       "model": {
-        "name": "model",
-        "tooltip": "Model adı"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
@@ -484,6 +748,10 @@
         "name": "süre",
         "tooltip": "Çıktı videosunun saniye cinsinden süresi."
       },
+      "generate_audio": {
+        "name": "ses_oluştur",
+        "tooltip": "Bu parametre, seedance-1-5-pro modeli dışında tüm modeller için yok sayılır."
+      },
       "model": {
         "name": "model"
       },
@@ -525,6 +793,11 @@
       "positive": {
         "name": "pozitif"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "CFGNorm": {
@@ -763,6 +1036,25 @@
       }
     }
   },
+  "CLIPTextEncodeKandinsky5": {
+    "display_name": "CLIPTextEncodeKandinsky5",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "clip_l": {
+        "name": "clip_l"
+      },
+      "qwen25_7b": {
+        "name": "qwen25_7b"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "CLIPTextEncodeLumina2": {
     "description": "Bir sistem istemini ve bir kullanıcı istemini bir CLIP modeli kullanarak, belirli görüntülerin oluşturulmasına yönelik difüzyon modelini yönlendirmek için kullanılabilecek bir gömme içine kodlar.",
     "display_name": "Lumina2 için CLIP Metin Kodlama",
@@ -953,6 +1245,29 @@
       }
     }
   },
+  "CenterCropImages": {
+    "display_name": "Ortadan Kırp Görseller",
+    "inputs": {
+      "height": {
+        "name": "yükseklik",
+        "tooltip": "Kırpma yüksekliği."
+      },
+      "images": {
+        "name": "görseller",
+        "tooltip": "İşlenecek görsel."
+      },
+      "width": {
+        "name": "genişlik",
+        "tooltip": "Kırpma genişliği."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "görseller",
+        "tooltip": "İşlenmiş görseller"
+      }
+    }
+  },
   "CheckpointLoader": {
     "display_name": "Yapılandırmayla Kontrol Noktası Yükle (ESKİ)",
     "inputs": {
@@ -1032,6 +1347,21 @@
       }
     }
   },
+  "ColorToRGBInt": {
+    "description": "Bir rengi RGB tam sayı değerine dönüştür.",
+    "display_name": "Renkten RGB Tam Sayıya",
+    "inputs": {
+      "color": {
+        "name": "renk"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "rgb_tam_sayı",
+        "tooltip": null
+      }
+    }
+  },
   "CombineHooks2": {
     "display_name": "Kancaları Birleştir [2]",
     "inputs": {
@@ -1089,6 +1419,26 @@
       }
     }
   },
+  "ComfySwitchNode": {
+    "display_name": "Anahtar",
+    "inputs": {
+      "on_false": {
+        "name": "yanlışta"
+      },
+      "on_true": {
+        "name": "doğruda"
+      },
+      "switch": {
+        "name": "anahtar"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "çıktı",
+        "tooltip": null
+      }
+    }
+  },
   "ConditioningAverage": {
     "display_name": "KoşullandırmaOrtalaması",
     "inputs": {
@@ -1323,10 +1673,12 @@
     },
     "outputs": {
       "0": {
-        "name": "pozitif"
+        "name": "pozitif",
+        "tooltip": null
       },
       "1": {
-        "name": "negatif"
+        "name": "negatif",
+        "tooltip": null
       }
     }
   },
@@ -1385,6 +1737,10 @@
         "name": "boyut",
         "tooltip": "Bağlam pencerelerinin uygulanacağı boyut."
       },
+      "freenoise": {
+        "name": "serbest_gürültü",
+        "tooltip": "FreeNoise gürültü karıştırmasını uygulayıp uygulamayacağını belirtir, pencere birleştirmesini iyileştirir."
+      },
       "fuse_method": {
         "name": "birleştirme yöntemi",
         "tooltip": "Bağlam pencerelerini birleştirmek için kullanılacak yöntem."
@@ -1745,6 +2101,20 @@
       }
     }
   },
+  "CreateList": {
+    "display_name": "Liste Oluştur",
+    "inputs": {
+      "inputs": {
+        "name": "girdiler"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "liste",
+        "tooltip": null
+      }
+    }
+  },
   "CreateVideo": {
     "description": "Görüntülerden bir video oluşturun.",
     "display_name": "Video Oluştur",
@@ -1767,6 +2137,35 @@
       }
     }
   },
+  "CropByBBoxes": {
+    "description": "Sağlanan sınırlayıcı kutulara göre giriş görüntü grubundan bölgeleri kırp ve yeniden boyutlandır.",
+    "display_name": "CropByBBoxes",
+    "inputs": {
+      "bboxes": {
+        "name": "sınırlayıcı_kutular"
+      },
+      "image": {
+        "name": "görüntü"
+      },
+      "output_height": {
+        "name": "çıktı_yüksekliği",
+        "tooltip": "Her kırpmanın yeniden boyutlandırılacağı yükseklik."
+      },
+      "output_width": {
+        "name": "çıktı_genişliği",
+        "tooltip": "Her kırpmanın yeniden boyutlandırılacağı genişlik."
+      },
+      "padding": {
+        "name": "dolgu",
+        "tooltip": "Kırpmadan önce sınırlayıcı kutunun her bir kenarına piksel cinsinden eklenen ekstra dolgu."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "Tüm kırpmalar tek bir görüntü grubunda birleştirilir."
+      }
+    }
+  },
   "CropMask": {
     "display_name": "Maskeyi Kırp",
     "inputs": {
@@ -1785,6 +2184,30 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CustomCombo": {
+    "display_name": "Özel Kombinasyon",
+    "inputs": {
+      "choice": {
+        "name": "seçim"
+      },
+      "index": {},
+      "option1": {}
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "INDEX",
+        "tooltip": null
+      }
     }
   },
   "DiffControlNetLoader": {
@@ -1823,7 +2246,12 @@
     }
   },
   "DisableNoise": {
-    "display_name": "Gürültüyü Devre Dışı Bırak"
+    "display_name": "Gürültüyü Devre Dışı Bırak",
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
   },
   "DualCFGGuider": {
     "display_name": "İkili CFG Rehberi",
@@ -1849,6 +2277,11 @@
       "style": {
         "name": "stil"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "DualCLIPLoader": {
@@ -1900,6 +2333,321 @@
       }
     }
   },
+  "ElevenLabsAudioIsolation": {
+    "description": "Sesten arka plan gürültüsünü kaldırarak vokalleri veya konuşmayı izole edin.",
+    "display_name": "ElevenLabs Ses İzolasyonu",
+    "inputs": {
+      "audio": {
+        "name": "ses",
+        "tooltip": "Arka plan gürültüsünü kaldırmak için işlenecek ses."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsInstantVoiceClone": {
+    "description": "Ses örneklerinden klonlanmış bir ses oluşturun. Klonlanacak sesin 1-8 adet ses kaydını sağlayın.",
+    "display_name": "ElevenLabs Anında Ses Klonlama",
+    "inputs": {
+      "files": {
+        "name": "dosyalar",
+        "tooltip": "Ses klonlama için ses kayıtları."
+      },
+      "remove_background_noise": {
+        "name": "arka_plan_gürültüsünü_kaldır",
+        "tooltip": "Ses örneklerinden arka plan gürültüsünü ses izolasyonu ile kaldırın."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "ses",
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsSpeechToSpeech": {
+    "description": "Bir sesi başka bir sese dönüştürün, orijinal içeriği ve duyguyu koruyun.",
+    "display_name": "ElevenLabs Sesten Sese",
+    "inputs": {
+      "audio": {
+        "name": "ses",
+        "tooltip": "Dönüştürülecek kaynak ses."
+      },
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Sesten sese dönüşüm için kullanılacak model."
+      },
+      "model_similarity_boost": {
+        "name": "benzerlik_arttırıcı"
+      },
+      "model_speed": {
+        "name": "hız"
+      },
+      "model_style": {
+        "name": "stil"
+      },
+      "model_use_speaker_boost": {
+        "name": "konuşmacı_arttırıcı_kullan"
+      },
+      "output_format": {
+        "name": "çıktı_formatı",
+        "tooltip": "Ses çıktı formatı."
+      },
+      "remove_background_noise": {
+        "name": "arka_plan_gürültüsünü_kaldır",
+        "tooltip": "Girdi sesinden arka plan gürültüsünü ses izolasyonu ile kaldırın."
+      },
+      "seed": {
+        "name": "tohum",
+        "tooltip": "Tekrarlanabilirlik için tohum."
+      },
+      "stability": {
+        "name": "kararlılık",
+        "tooltip": "Ses kararlılığı. Düşük değerler daha geniş duygusal aralık sunar, yüksek değerler daha tutarlı ama muhtemelen tekdüze konuşma üretir."
+      },
+      "voice": {
+        "name": "ses",
+        "tooltip": "Dönüşüm için hedef ses. Ses Seçici veya Anında Ses Klonlama'dan bağlayın."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsSpeechToText": {
+    "description": "Sesi metne dönüştürür. Otomatik dil algılama, konuşmacı ayrımı ve ses olayı etiketleme desteklenir.",
+    "display_name": "ElevenLabs Konuşmadan Metne",
+    "inputs": {
+      "audio": {
+        "name": "ses",
+        "tooltip": "Dönüştürülecek ses."
+      },
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "language_code": {
+        "name": "dil_kodu",
+        "tooltip": "ISO-639-1 veya ISO-639-3 dil kodu (örn. 'en', 'es', 'fra'). Otomatik algılama için boş bırakın."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Dönüştürme için kullanılacak model."
+      },
+      "model_diarization_threshold": {
+        "name": "ayrım eşiği"
+      },
+      "model_diarize": {
+        "name": "ayrım yap"
+      },
+      "model_tag_audio_events": {
+        "name": "ses olaylarını etiketle"
+      },
+      "model_temperature": {
+        "name": "sıcaklık"
+      },
+      "model_timestamps_granularity": {
+        "name": "zaman damgası hassasiyeti"
+      },
+      "num_speakers": {
+        "name": "konuşmacı_sayısı",
+        "tooltip": "Tahmin edilecek maksimum konuşmacı sayısı. Otomatik algılama için 0 olarak ayarlayın."
+      },
+      "seed": {
+        "name": "tohum",
+        "tooltip": "Tekrarlanabilirlik için tohum (deterministik olması garanti edilmez)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "metin",
+        "tooltip": null
+      },
+      "1": {
+        "name": "dil_kodu",
+        "tooltip": null
+      },
+      "2": {
+        "name": "kelimeler_json",
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToDialogue": {
+    "description": "Metinden çok konuşmacılı diyalog oluşturur. Her diyalog girdisinin kendi metni ve sesi vardır.",
+    "display_name": "ElevenLabs Metinden Diyaloğa",
+    "inputs": {
+      "apply_text_normalization": {
+        "name": "metin normalizasyonunu uygula",
+        "tooltip": "Metin normalizasyon modu. 'auto' sistemin karar vermesini sağlar, 'on' her zaman normalizasyon uygular, 'off' ise atlar."
+      },
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "inputs": {
+        "name": "girdiler",
+        "tooltip": "Diyalog girdisi sayısı."
+      },
+      "inputs_text1": {
+        "name": "metin1"
+      },
+      "language_code": {
+        "name": "dil_kodu",
+        "tooltip": "ISO-639-1 veya ISO-639-3 dil kodu (örn. 'en', 'es', 'fra'). Otomatik algılama için boş bırakın."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Diyalog üretimi için kullanılacak model."
+      },
+      "output_format": {
+        "name": "çıktı_formatı",
+        "tooltip": "Ses çıktısı formatı."
+      },
+      "seed": {
+        "name": "tohum",
+        "tooltip": "Tekrarlanabilirlik için tohum."
+      },
+      "stability": {
+        "name": "kararlılık",
+        "tooltip": "Ses kararlılığı. Düşük değerler daha geniş duygusal aralık sunar, yüksek değerler daha tutarlı ama muhtemelen tekdüze konuşma üretir."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToSoundEffects": {
+    "description": "Metin açıklamalarından ses efektleri oluşturur.",
+    "display_name": "ElevenLabs Metinden Ses Efektine",
+    "inputs": {
+      "model": {
+        "name": "model",
+        "tooltip": "Ses efekti üretimi için kullanılacak model."
+      },
+      "model_duration": {
+        "name": "süre"
+      },
+      "model_loop": {
+        "name": "döngü"
+      },
+      "model_prompt_influence": {
+        "name": "istem etkisi"
+      },
+      "output_format": {
+        "name": "çıktı_formatı",
+        "tooltip": "Ses çıktısı formatı."
+      },
+      "text": {
+        "name": "metin",
+        "tooltip": "Oluşturulacak ses efektinin metin açıklaması."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToSpeech": {
+    "description": "Metni konuşmaya dönüştür.",
+    "display_name": "ElevenLabs Metinden Konuşmaya",
+    "inputs": {
+      "apply_text_normalization": {
+        "name": "metin normalizasyonunu uygula",
+        "tooltip": "Metin normalizasyon modu. 'auto' sistemin karar vermesine izin verir, 'on' her zaman normalizasyon uygular, 'off' ise atlar."
+      },
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "language_code": {
+        "name": "dil_kodu",
+        "tooltip": "ISO-639-1 veya ISO-639-3 dil kodu (örn. 'en', 'es', 'fra'). Otomatik algılama için boş bırakın."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Metinden konuşmaya için kullanılacak model."
+      },
+      "model_similarity_boost": {
+        "name": "benzerlik_arttırıcı"
+      },
+      "model_speed": {
+        "name": "hız"
+      },
+      "model_style": {
+        "name": "stil"
+      },
+      "model_use_speaker_boost": {
+        "name": "konuşmacı_arttırıcıyı_kullan"
+      },
+      "output_format": {
+        "name": "çıktı_formatı",
+        "tooltip": "Ses çıktısı formatı."
+      },
+      "seed": {
+        "name": "tohum",
+        "tooltip": "Tekrarlanabilirlik için tohum (deterministik olması garanti edilmez)."
+      },
+      "stability": {
+        "name": "kararlılık",
+        "tooltip": "Ses kararlılığı. Düşük değerler daha geniş duygusal aralık sunar, yüksek değerler ise daha tutarlı fakat potansiyel olarak tekdüze konuşma üretir."
+      },
+      "text": {
+        "name": "metin",
+        "tooltip": "Konuşmaya dönüştürülecek metin."
+      },
+      "voice": {
+        "name": "ses",
+        "tooltip": "Konuşma sentezi için kullanılacak ses. Ses Seçici veya Anında Ses Klonlama'dan bağlayın."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsVoiceSelector": {
+    "description": "Metinden konuşma üretimi için önceden tanımlanmış bir ElevenLabs sesi seçin.",
+    "display_name": "ElevenLabs Ses Seçici",
+    "inputs": {
+      "voice": {
+        "name": "ses",
+        "tooltip": "Önceden tanımlanmış ElevenLabs seslerinden birini seçin."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "ses",
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyAceStep1_5LatentAudio": {
+    "display_name": "Empty Ace Step 1.5 Latent Audio",
+    "inputs": {
+      "batch_size": {
+        "name": "toplu_boyutu",
+        "tooltip": "Toplu işteki latent görüntü sayısı."
+      },
+      "seconds": {
+        "name": "saniye"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyAceStepLatentAudio": {
     "display_name": "BoşAceAdımGizliSes",
     "inputs": {
@@ -1932,6 +2680,11 @@
         "name": "örnekleme_oranı",
         "tooltip": "Boş ses klibinin örnekleme oranı."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "EmptyChromaRadianceLatentImage": {
@@ -1975,6 +2728,25 @@
       }
     }
   },
+  "EmptyFlux2LatentImage": {
+    "display_name": "Boş Flux 2 Latent",
+    "inputs": {
+      "batch_size": {
+        "name": "toplu_boyut"
+      },
+      "height": {
+        "name": "yükseklik"
+      },
+      "width": {
+        "name": "genişlik"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyHunyuanImageLatent": {
     "display_name": "Boş Hunyuan Görüntü Gizli",
     "inputs": {
@@ -2016,6 +2788,28 @@
       }
     }
   },
+  "EmptyHunyuanVideo15Latent": {
+    "display_name": "Boş HunyuanVideo 1.5 Latent",
+    "inputs": {
+      "batch_size": {
+        "name": "toplu_boyut"
+      },
+      "height": {
+        "name": "yükseklik"
+      },
+      "length": {
+        "name": "uzunluk"
+      },
+      "width": {
+        "name": "genişlik"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyImage": {
     "display_name": "Boş Görüntü",
     "inputs": {
@@ -2065,6 +2859,11 @@
       "seconds": {
         "name": "saniye"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "EmptyLatentHunyuan3Dv2": {
@@ -2077,6 +2876,11 @@
       "resolution": {
         "name": "çözünürlük"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "EmptyLatentImage": {
@@ -2124,6 +2928,28 @@
       }
     }
   },
+  "EmptyQwenImageLayeredLatentImage": {
+    "display_name": "Boş Qwen Görsel Katmanlı Latent",
+    "inputs": {
+      "batch_size": {
+        "name": "toplu_boyut"
+      },
+      "height": {
+        "name": "yükseklik"
+      },
+      "layers": {
+        "name": "katmanlar"
+      },
+      "width": {
+        "name": "genişlik"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptySD3LatentImage": {
     "display_name": "BoşSD3GizliGörüntü",
     "inputs": {
@@ -2171,6 +2997,11 @@
       "steps": {
         "name": "adımlar"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ExtendIntermediateSigmas": {
@@ -2191,6 +3022,11 @@
       "steps": {
         "name": "adımlar"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FeatherMask": {
@@ -2211,6 +3047,11 @@
       "top": {
         "name": "üst"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FlipSigmas": {
@@ -2219,6 +3060,102 @@
       "sigmas": {
         "name": "sigmalar"
       }
+    },
+    "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",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol"
+      },
+      "height": {
+        "name": "yükseklik"
+      },
+      "images": {
+        "name": "görseller",
+        "tooltip": "Referans olarak kullanılacak en fazla 9 görsel."
+      },
+      "prompt": {
+        "name": "istem",
+        "tooltip": "Görsel oluşturma veya düzenleme için istem"
+      },
+      "prompt_upsampling": {
+        "name": "istem üst örnekleme",
+        "tooltip": "İstem üzerinde üst örnekleme yapılıp yapılmayacağı. Aktifse, daha yaratıcı üretim için istemi otomatik olarak değiştirir."
+      },
+      "seed": {
+        "name": "tohum",
+        "tooltip": "Gürültü oluşturmak için kullanılan rastgele tohum."
+      },
+      "width": {
+        "name": "genişlik"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Flux2ProImageNode": {
+    "description": "İstem ve çözünürlüğe göre senkron bir şekilde görseller üretir.",
+    "display_name": "Flux.2 [pro] Görsel",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol"
+      },
+      "height": {
+        "name": "yükseklik"
+      },
+      "images": {
+        "name": "görseller",
+        "tooltip": "Referans olarak kullanılacak en fazla 9 görsel."
+      },
+      "prompt": {
+        "name": "istem",
+        "tooltip": "Görsel oluşturma veya düzenleme için istem"
+      },
+      "prompt_upsampling": {
+        "name": "istem üst örnekleme",
+        "tooltip": "İstem üzerinde üst örnekleme yapılıp yapılmayacağı. Aktifse, daha yaratıcı üretim için istemi otomatik olarak değiştirir."
+      },
+      "seed": {
+        "name": "tohum",
+        "tooltip": "Gürültü oluşturmak için kullanılan rastgele tohum."
+      },
+      "width": {
+        "name": "genişlik"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Flux2Scheduler": {
+    "display_name": "Flux2Scheduler",
+    "inputs": {
+      "height": {
+        "name": "yükseklik"
+      },
+      "steps": {
+        "name": "adım"
+      },
+      "width": {
+        "name": "genişlik"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FluxDisableGuidance": {
@@ -2541,6 +3478,11 @@
       "s2": {
         "name": "s2"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FreeU_V2": {
@@ -2561,6 +3503,11 @@
       "s2": {
         "name": "s2"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "GITSScheduler": {
@@ -2619,6 +3566,102 @@
       }
     }
   },
+  "GLSLShader": {
+    "description": "Görüntülere GLSL ES fragment shader'ları uygula. u_resolution (vec2) her zaman kullanılabilir.",
+    "display_name": "GLSL Shader",
+    "inputs": {
+      "floats": {
+        "name": "floats",
+        "tooltip": "Floats shader kodunda u_float0-4 olarak kullanılabilir"
+      },
+      "fragment_shader": {
+        "name": "fragment_shader",
+        "tooltip": "GLSL fragment shader kaynak kodu (GLSL ES 3.00 / WebGL 2.0 uyumlu)"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Görüntüler shader kodunda u_image0-4 (sampler2D) olarak kullanılabilir"
+      },
+      "ints": {
+        "name": "ints",
+        "tooltip": "Ints shader kodunda u_int0-4 olarak kullanılabilir"
+      },
+      "size_mode": {
+        "name": "size_mode",
+        "tooltip": "Çıktı boyutu: 'from_input' ilk giriş görüntüsünün boyutlarını kullanır, 'custom' elle boyut ayarlamaya izin verir"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "IMAGE0",
+        "tooltip": "Shader kodunda layout(location = 0) out vec4 fragColor0 ile kullanılabilir"
+      },
+      "1": {
+        "name": "IMAGE1",
+        "tooltip": "Shader kodunda layout(location = 1) out vec4 fragColor1 ile kullanılabilir"
+      },
+      "2": {
+        "name": "IMAGE2",
+        "tooltip": "Shader kodunda layout(location = 2) out vec4 fragColor2 ile kullanılabilir"
+      },
+      "3": {
+        "name": "IMAGE3",
+        "tooltip": "Shader kodunda layout(location = 3) out vec4 fragColor3 ile kullanılabilir"
+      }
+    }
+  },
+  "GeminiImage2Node": {
+    "description": "Google Vertex API üzerinden senkron olarak görsel oluşturun veya düzenleyin.",
+    "display_name": "Nano Banana Pro (Google Gemini Image)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "'auto' olarak ayarlanırsa, giriş görselinizin en-boy oranı kullanılır; görsel yoksa genellikle 16:9 kare oluşturulur."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "files": {
+        "name": "files",
+        "tooltip": "Model için bağlam olarak kullanılacak isteğe bağlı dosya(lar). Gemini İçerik Üretimi Girdi Dosyaları düğümünden gelen girdileri kabul eder."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "İsteğe bağlı referans görsel(ler)i. Birden fazla görsel eklemek için Toplu Görseller (Batch Images) düğümünü kullanın (en fazla 14)."
+      },
+      "model": {
+        "name": "model"
+      },
+      "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."
+      },
+      "resolution": {
+        "name": "resolution",
+        "tooltip": "Hedef çıktı çözünürlüğü. 2K/4K için yerel Gemini yükselticisi kullanılır."
+      },
+      "response_modalities": {
+        "name": "response_modalities",
+        "tooltip": "'IMAGE' seçilirse yalnızca görsel çıktısı alınır, 'IMAGE+TEXT' seçilirse hem oluşturulan görsel hem de metin yanıtı döner."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed belirli bir değere sabitlendiğinde, model tekrarlanan isteklerde aynı yanıtı vermeye çalışır. Deterministik çıktı garanti edilmez. Ayrıca, model veya parametre ayarlarını (ör. sıcaklık) değiştirmek, aynı seed değeriyle bile yanıtın farklı olması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
+      }
+    }
+  },
   "GeminiImageNode": {
     "description": "Google API üzerinden görüntüleri eşzamanlı olarak düzenleyin.",
     "display_name": "Google Gemini Görsel",
@@ -2646,9 +3689,17 @@
         "name": "istek",
         "tooltip": "Oluşturma için metin isteği"
       },
+      "response_modalities": {
+        "name": "response_modalities",
+        "tooltip": "'IMAGE' seçilirse yalnızca görsel çıktısı alınır, 'IMAGE+TEXT' seçilirse hem oluşturulan görsel hem de metin yanıtı döner."
+      },
       "seed": {
         "name": "tohum",
         "tooltip": "Tohum belirli bir değere sabitlendiğinde, model tekrarlanan istekler için aynı yanıtı sağlamak için elinden geleni yapar. Belirleyici çıktı garanti edilmez. Ayrıca, modeli veya sıcaklık gibi parametre ayarlarını değiştirmek, aynı tohum değerini kullansanız bile yanıtta değişikliklere neden olabilir. Varsayılan olarak rastgele bir tohum değeri kullanılır."
+      },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "Bir yapay zekanın davranışını belirleyen temel talimatlar."
       }
     },
     "outputs": {
@@ -2679,6 +3730,60 @@
       }
     }
   },
+  "GeminiNanoBanana2": {
+    "description": "Google Vertex API üzerinden senkron olarak görseller oluşturun veya düzenleyin.",
+    "display_name": "Nano Banana 2",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "'auto' olarak ayarlanırsa, giriş görselinizin en-boy oranı kullanılır; görsel yoksa genellikle 16:9 kare oluşturulur."
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "files": {
+        "name": "files",
+        "tooltip": "Model için bağlam olarak kullanılacak isteğe bağlı dosya(lar). Gemini Generate Content Input Files düğümünden gelen girdileri kabul eder."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "İsteğe bağlı referans görsel(ler)i. Birden fazla görsel eklemek için Batch Images düğümünü kullanın (en fazla 14)."
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Oluşturulacak görseli veya uygulanacak düzenlemeleri tanımlayan metin istemi. Modelin uyması gereken kısıtlamalar, stiller veya detayları ekleyin."
+      },
+      "resolution": {
+        "name": "resolution",
+        "tooltip": "Hedef çıktı çözünürlüğü. 2K/4K için yerel Gemini yükselticisi kullanılır."
+      },
+      "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. Deterministik çıktı garanti edilmez. Ayrıca, model veya parametre ayarlarını (ör. sıcaklık) değiştirmek, aynı seed değeriyle bile yanıtın farklı olması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."
+      },
+      "thinking_level": {
+        "name": "thinking_level"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "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",
@@ -2710,6 +3815,10 @@
         "name": "seed",
         "tooltip": "Seed belirli bir değere sabitlendiğinde, model tekrarlanan istekler için aynı yanıtı sağlamak için elinden geleni yapar. Deterministik çıktı garanti edilmez. Ayrıca, modeli veya sıcaklık gibi parametre ayarlarını değiştirmek, aynı seed değerini kullansanız bile yanıtta değişikliklere 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."
+      },
       "video": {
         "name": "video",
         "tooltip": "Model için bağlam olarak kullanılacak isteğe bağlı video."
@@ -2721,6 +3830,72 @@
       }
     }
   },
+  "GenerateTracks": {
+    "display_name": "GenerateTracks",
+    "inputs": {
+      "bezier": {
+        "name": "bezier",
+        "tooltip": "Orta noktayı kontrol noktası olarak kullanarak Bezier eğrisi yolunu etkinleştir."
+      },
+      "end_x": {
+        "name": "bitiş_x",
+        "tooltip": "Bitiş pozisyonu için normalize edilmiş X koordinatı (0-1)."
+      },
+      "end_y": {
+        "name": "bitiş_y",
+        "tooltip": "Bitiş pozisyonu için normalize edilmiş Y koordinatı (0-1)."
+      },
+      "height": {
+        "name": "yükseklik"
+      },
+      "interpolation": {
+        "name": "enterpolasyon",
+        "tooltip": "Yol boyunca hareketin zamanlamasını/hızını kontrol eder."
+      },
+      "mid_x": {
+        "name": "orta_x",
+        "tooltip": "Bezier eğrisi için normalize edilmiş X kontrol noktası. Sadece 'bezier' etkinleştirildiğinde kullanılır."
+      },
+      "mid_y": {
+        "name": "orta_y",
+        "tooltip": "Bezier eğrisi için normalize edilmiş Y kontrol noktası. Sadece 'bezier' etkinleştirildiğinde kullanılır."
+      },
+      "num_frames": {
+        "name": "kare_sayısı"
+      },
+      "num_tracks": {
+        "name": "iz_sayısı"
+      },
+      "start_x": {
+        "name": "başlangıç_x",
+        "tooltip": "Başlangıç pozisyonu için normalize edilmiş X koordinatı (0-1)."
+      },
+      "start_y": {
+        "name": "başlangıç_y",
+        "tooltip": "Başlangıç pozisyonu için normalize edilmiş Y koordinatı (0-1)."
+      },
+      "track_mask": {
+        "name": "iz_maskesi",
+        "tooltip": "Görünür kareleri belirtmek için isteğe bağlı maske."
+      },
+      "track_spread": {
+        "name": "iz_aralığı",
+        "tooltip": "İzler arasındaki normalize mesafe. İzler hareket yönüne dik olarak yayılır."
+      },
+      "width": {
+        "name": "genişlik"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "iz_uzunluğu",
+        "tooltip": null
+      }
+    }
+  },
   "GetImageSize": {
     "description": "Resmin genişlik ve yüksekliğini döndürür ve değiştirmeden iletir.",
     "display_name": "Resim Boyutunu Al",
@@ -2731,13 +3906,16 @@
     },
     "outputs": {
       "0": {
-        "name": "width"
+        "name": "genişlik",
+        "tooltip": null
       },
       "1": {
-        "name": "height"
+        "name": "yükseklik",
+        "tooltip": null
       },
       "2": {
-        "name": "batch_size"
+        "name": "toplu_boyut",
+        "tooltip": null
       }
     }
   },
@@ -2765,6 +3943,149 @@
       }
     }
   },
+  "GrokImageEditNode": {
+    "description": "Mevcut bir görüntüyü metin istemine göre değiştir",
+    "display_name": "Grok Görüntü Düzenle",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "en-boy oranı",
+        "tooltip": "Yalnızca birden fazla görsel, görsel girişine bağlandığında kullanılabilir."
+      },
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "image": {
+        "name": "görüntü"
+      },
+      "model": {
+        "name": "model"
+      },
+      "number_of_images": {
+        "name": "görüntü sayısı",
+        "tooltip": "Oluşturulacak düzenlenmiş görüntü sayısı"
+      },
+      "prompt": {
+        "name": "istem",
+        "tooltip": "Görüntüyü oluşturmak için kullanılan metin istemi"
+      },
+      "resolution": {
+        "name": "çözünürlük"
+      },
+      "seed": {
+        "name": "tohum",
+        "tooltip": "Düğümün tekrar çalıştırılıp çalıştırılmayacağını belirleyen 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ü",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "en boy oranı"
+      },
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "model": {
+        "name": "model"
+      },
+      "number_of_images": {
+        "name": "görüntü sayısı",
+        "tooltip": "Oluşturulacak görüntü sayısı"
+      },
+      "prompt": {
+        "name": "istem",
+        "tooltip": "Görüntüyü oluşturmak için kullanılan metin istemi"
+      },
+      "resolution": {
+        "name": "çözünürlük"
+      },
+      "seed": {
+        "name": "tohum",
+        "tooltip": "Düğümün tekrar çalıştırılıp çalıştırılmayacağını belirleyen tohum; gerçek sonuçlar tohumdan bağımsız olarak belirlenemezdir."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokVideoEditNode": {
+    "description": "Mevcut bir videoyu metin istemine göre düzenle.",
+    "display_name": "Grok Video Düzenle",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "istem",
+        "tooltip": "İstenen videonun metin açıklaması."
+      },
+      "seed": {
+        "name": "tohum",
+        "tooltip": "Düğümün tekrar çalıştırılıp çalıştırılmayacağını belirleyen tohum; gerçek sonuçlar tohumdan bağımsız olarak belirlenemezdir."
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "Maksimum desteklenen süre 8.7 saniye ve 50MB dosya boyutudur."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokVideoNode": {
+    "description": "Bir istem veya görüntüden video oluştur",
+    "display_name": "Grok Video",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "en boy oranı",
+        "tooltip": "Çıktı videonun en boy oranı."
+      },
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "duration": {
+        "name": "süre",
+        "tooltip": "Çıktı videonun süresi (saniye cinsinden)."
+      },
+      "image": {
+        "name": "görüntü"
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "istem",
+        "tooltip": "İstenen videonun metin açıklaması."
+      },
+      "resolution": {
+        "name": "çözünürlük",
+        "tooltip": "Çıktı videonun çözünürlüğü."
+      },
+      "seed": {
+        "name": "tohum",
+        "tooltip": "Düğümün tekrar çalıştırılıp çalıştırılmayacağını belirleyen tohum; gerçek sonuçlar tohumdan bağımsız olarak belirlenemezdir."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "GrowMask": {
     "display_name": "Maskeyi Büyüt",
     "inputs": {
@@ -2777,6 +4098,55 @@
       "tapered_corners": {
         "name": "sivri_köşeler"
       }
+    },
+    "outputs": {
+      "0": {
+        "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",
+    "inputs": {
+      "auto_downscale": {
+        "name": "otomatik_küçültme",
+        "tooltip": "Çıktı sınırı aşarsa giriş görüntüsünü otomatik olarak küçült."
+      },
+      "image": {
+        "name": "görüntü"
+      },
+      "model": {
+        "name": "model"
+      },
+      "upscale_factor": {
+        "name": "büyütme_oranı"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HitPawVideoEnhance": {
+    "description": "Düşük çözünürlüklü videoları yüksek çözünürlüğe yükseltin, bozulmaları ve gürültüyü ortadan kaldırın. Fiyatlar video saniyesi başınadır.",
+    "display_name": "HitPaw Video İyileştirme",
+    "inputs": {
+      "model": {
+        "name": "model"
+      },
+      "model_resolution": {
+        "name": "çözünürlük"
+      },
+      "video": {
+        "name": "video"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "Hunyuan3Dv2Conditioning": {
@@ -2788,10 +4158,12 @@
     },
     "outputs": {
       "0": {
-        "name": "pozitif"
+        "name": "positive",
+        "tooltip": null
       },
       "1": {
-        "name": "negatif"
+        "name": "negative",
+        "tooltip": null
       }
     }
   },
@@ -2813,10 +4185,12 @@
     },
     "outputs": {
       "0": {
-        "name": "pozitif"
+        "name": "positive",
+        "tooltip": null
       },
       "1": {
-        "name": "negatif"
+        "name": "negative",
+        "tooltip": null
       }
     }
   },
@@ -2890,6 +4264,120 @@
       }
     }
   },
+  "HunyuanVideo15ImageToVideo": {
+    "display_name": "HunyuanVideo15ImageToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "toplu_boyutu"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "yükseklik"
+      },
+      "length": {
+        "name": "uzunluk"
+      },
+      "negative": {
+        "name": "negatif"
+      },
+      "positive": {
+        "name": "pozitif"
+      },
+      "start_image": {
+        "name": "başlangıç_görseli"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "genişlik"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "pozitif",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negatif",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "HunyuanVideo15LatentUpscaleWithModel": {
+    "display_name": "Hunyuan Video 15 Latent Upscale With Model",
+    "inputs": {
+      "crop": {
+        "name": "kırp"
+      },
+      "height": {
+        "name": "yükseklik"
+      },
+      "model": {
+        "name": "model"
+      },
+      "samples": {
+        "name": "örnekler"
+      },
+      "upscale_method": {
+        "name": "büyütme_yöntemi"
+      },
+      "width": {
+        "name": "genişlik"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HunyuanVideo15SuperResolution": {
+    "display_name": "HunyuanVideo15SuperResolution",
+    "inputs": {
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "latent": {
+        "name": "latent"
+      },
+      "negative": {
+        "name": "negatif"
+      },
+      "noise_augmentation": {
+        "name": "gürültü_artırımı"
+      },
+      "positive": {
+        "name": "pozitif"
+      },
+      "start_image": {
+        "name": "başlangıç_görseli"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "pozitif",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negatif",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
   "HyperTile": {
     "display_name": "HiperDöşeme",
     "inputs": {
@@ -3094,6 +4582,11 @@
       "strength": {
         "name": "güç"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageBatch": {
@@ -3157,6 +4650,26 @@
       "image": {
         "name": "görüntü"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageCompare": {
+    "description": "İki görüntüyü yan yana bir kaydırıcı ile karşılaştırır.",
+    "display_name": "Görüntü Karşılaştırma",
+    "inputs": {
+      "compare_view": {
+        "name": "karşılaştırma_görünümü"
+      },
+      "image_a": {
+        "name": "görüntü_a"
+      },
+      "image_b": {
+        "name": "görüntü_b"
+      }
     }
   },
   "ImageCompositeMasked": {
@@ -3180,6 +4693,11 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageCrop": {
@@ -3200,6 +4718,50 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageCropV2": {
+    "display_name": "Görüntü Kırpma",
+    "inputs": {
+      "crop_region": {
+        "name": "kırpma_bölgesi"
+      },
+      "height": {},
+      "image": {
+        "name": "görüntü"
+      },
+      "width": {},
+      "x": {},
+      "y": {}
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageDeduplication": {
+    "display_name": "Görsel Çoğaltma Kaldırma",
+    "inputs": {
+      "images": {
+        "name": "görseller",
+        "tooltip": "İşlenecek görsellerin listesi."
+      },
+      "similarity_threshold": {
+        "name": "benzerlik_eşiği",
+        "tooltip": "Benzerlik eşiği (0-1). Daha yüksek değer daha benzer anlamına gelir. Bu eşiğin üzerindeki görseller çoğaltılmış kabul edilir."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "görseller",
+        "tooltip": "İşlenmiş görseller"
+      }
     }
   },
   "ImageFlip": {
@@ -3211,6 +4773,11 @@
       "image": {
         "name": "görüntü"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageFromBatch": {
@@ -3225,6 +4792,42 @@
       "length": {
         "name": "uzunluk"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageGrid": {
+    "display_name": "Görsel Izgarası",
+    "inputs": {
+      "cell_height": {
+        "name": "hücre_yüksekliği",
+        "tooltip": "Izgaradaki her hücrenin yüksekliği."
+      },
+      "cell_width": {
+        "name": "hücre_genişliği",
+        "tooltip": "Izgaradaki her hücrenin genişliği."
+      },
+      "columns": {
+        "name": "sütunlar",
+        "tooltip": "Izgaradaki sütun sayısı."
+      },
+      "images": {
+        "name": "görseller",
+        "tooltip": "İşlenecek görsellerin listesi."
+      },
+      "padding": {
+        "name": "boşluk",
+        "tooltip": "Görseller arasındaki boşluk."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "görseller",
+        "tooltip": "İşlenmiş görseller"
+      }
     }
   },
   "ImageInvert": {
@@ -3235,6 +4838,28 @@
       }
     }
   },
+  "ImageMergeTileList": {
+    "display_name": "Döşeme Listesini Görüntüye Birleştir",
+    "inputs": {
+      "final_height": {
+        "name": "final_height"
+      },
+      "final_width": {
+        "name": "final_width"
+      },
+      "image_list": {
+        "name": "image_list"
+      },
+      "overlap": {
+        "name": "overlap"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ImageOnlyCheckpointLoader": {
     "display_name": "Sadece Görüntü Kontrol Noktası Yükleyici (img2vid modeli)",
     "inputs": {
@@ -3333,6 +4958,11 @@
       "rotation": {
         "name": "döndürme"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageScale": {
@@ -3381,6 +5011,11 @@
       "upscale_method": {
         "name": "ölçeklendirme yöntemi"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageScaleToTotalPixels": {
@@ -3392,6 +5027,9 @@
       "megapixels": {
         "name": "megapiksel"
       },
+      "resolution_steps": {
+        "name": "çözünürlük_adımları"
+      },
       "upscale_method": {
         "name": "büyütme_yöntemi"
       }
@@ -3446,6 +5084,11 @@
       "spacing_width": {
         "name": "boşluk genişliği"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageToMask": {
@@ -3457,6 +5100,11 @@
       "image": {
         "name": "görüntü"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageUpscaleWithModel": {
@@ -3566,6 +5214,29 @@
       "mask": {
         "name": "maske"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "JoinAudioChannels": {
+    "description": "Sol ve sağ mono ses kanallarını stereo sese birleştirir.",
+    "display_name": "Ses Kanallarını Birleştir",
+    "inputs": {
+      "audio_left": {
+        "name": "ses_sol"
+      },
+      "audio_right": {
+        "name": "ses_sağ"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "ses",
+        "tooltip": null
+      }
     }
   },
   "JoinImageWithAlpha": {
@@ -3691,6 +5362,58 @@
       "sampler_name": {
         "name": "örnekleyici_adı"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Kandinsky5ImageToVideo": {
+    "display_name": "Kandinsky5ImageToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "toplu_boyutu"
+      },
+      "height": {
+        "name": "yükseklik"
+      },
+      "length": {
+        "name": "uzunluk"
+      },
+      "negative": {
+        "name": "negatif"
+      },
+      "positive": {
+        "name": "pozitif"
+      },
+      "start_image": {
+        "name": "başlangıç_görseli"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "genişlik"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "pozitif",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negatif",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": "Boş video latent"
+      },
+      "3": {
+        "name": "cond_latent",
+        "tooltip": "Temiz kodlanmış başlangıç görselleri, model çıktısı latentlerinin gürültülü başlangıcını değiştirmek için kullanılır"
+      }
     }
   },
   "KarrasScheduler": {
@@ -3708,6 +5431,44 @@
       "steps": {
         "name": "adımlar"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingAvatarNode": {
+    "description": "Tek bir fotoğraf ve bir ses dosyasından yayın tarzı dijital insan videoları oluşturun.",
+    "display_name": "Kling Avatar 2.0",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "Avatar referans görseli. Genişlik ve yükseklik en az 300px olmalıdır. En-boy oranı 1:2.5 ile 2.5:1 arasında olmalıdır."
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Avatarın hareketlerini, duygularını ve kamera hareketlerini tanımlamak için isteğe bağlı komut."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed, düğümün tekrar çalıştırılıp çalıştırılmayacağını kontrol eder; seed ne olursa olsun sonuçlar deterministik değildir."
+      },
+      "sound_file": {
+        "name": "sound_file",
+        "tooltip": "Ses girişi. Süresi 2 ile 300 saniye arasında olmalıdır."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "KlingCameraControlI2VNode": {
@@ -3862,6 +5623,46 @@
       }
     }
   },
+  "KlingFirstLastFrameNode": {
+    "description": "Kling V3 ile ilk ve son kareleri kullanarak video oluşturun.",
+    "display_name": "Kling 3.0 İlk-Son-Kareden Videoya",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "duration": {
+        "name": "süre"
+      },
+      "end_frame": {
+        "name": "son_kare"
+      },
+      "first_frame": {
+        "name": "ilk_kare"
+      },
+      "generate_audio": {
+        "name": "ses_oluştur"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Model ve oluşturma ayarları."
+      },
+      "model_resolution": {
+        "name": "çözünürlük"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed, düğümün 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
+      }
+    }
+  },
   "KlingImage2VideoNode": {
     "display_name": "Kling Görüntüden Videoya",
     "inputs": {
@@ -3914,6 +5715,9 @@
       "aspect_ratio": {
         "name": "en_boy_oranı"
       },
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
       "human_fidelity": {
         "name": "insan_sadakati",
         "tooltip": "Konu referans benzerliği"
@@ -3942,6 +5746,39 @@
       "prompt": {
         "name": "istem",
         "tooltip": "Pozitif metin istemi"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed, düğümün 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
+      }
+    }
+  },
+  "KlingImageToVideoWithAudio": {
+    "display_name": "Kling Görsel (İlk Kare) ile Videoya ve Sesli",
+    "inputs": {
+      "duration": {
+        "name": "süre"
+      },
+      "generate_audio": {
+        "name": "ses_oluştur"
+      },
+      "mode": {
+        "name": "mod"
+      },
+      "model_name": {
+        "name": "model_adı"
+      },
+      "prompt": {
+        "name": "istem",
+        "tooltip": "Pozitif metin istemi."
+      },
+      "start_frame": {
+        "name": "başlangıç_kare"
       }
     },
     "outputs": {
@@ -4011,6 +5848,299 @@
       }
     }
   },
+  "KlingMotionControl": {
+    "display_name": "Kling Hareket Kontrolü",
+    "inputs": {
+      "character_orientation": {
+        "name": "karakter_yönelimi",
+        "tooltip": "Karakterin bakış/yöneliminin nereden geldiğini kontrol eder.\nvideo: hareketler, ifadeler, kamera hareketleri ve yönelim hareket referans videosunu takip eder (diğer detaylar istem ile).\ngörsel: hareketler ve ifadeler yine hareket referans videosunu takip eder, ancak karakter yönelimi referans görsel ile eşleşir (kamera/diğer detaylar istem ile)."
+      },
+      "keep_original_sound": {
+        "name": "orijinal_sesi_koru"
+      },
+      "mode": {
+        "name": "mod"
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "istem"
+      },
+      "reference_image": {
+        "name": "referans_görsel"
+      },
+      "reference_video": {
+        "name": "referans_video",
+        "tooltip": "Hareket/ifade için kullanılan hareket referans videosu.\nSüre sınırları karakter_yönelimine bağlıdır:\n - görsel: 3–10sn (maks 10sn)\n - video: 3–30sn (maks 30sn)"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProEditVideoNode": {
+    "description": "Mevcut bir videoyu Kling'in en son modeliyle düzenleyin.",
+    "display_name": "Kling Omni Video Düzenle (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "keep_original_sound": {
+        "name": "orijinal_sesi_koru"
+      },
+      "model_name": {
+        "name": "model_adı"
+      },
+      "prompt": {
+        "name": "istem",
+        "tooltip": "Video içeriğini tanımlayan bir metin istemi. Hem pozitif hem de negatif açıklamalar içerebilir."
+      },
+      "reference_images": {
+        "name": "referans_görseller",
+        "tooltip": "En fazla 4 ek referans görsel."
+      },
+      "resolution": {
+        "name": "çözünürlük"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed, düğümün tekrar çalıştırılıp çalıştırılmayacağını kontrol eder; seed ne olursa olsun sonuçlar deterministik değildir."
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "Düzenlenecek video. Çıktı video uzunluğu aynı olacaktır."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProFirstLastFrameNode": {
+    "description": "Başlangıç karesi, isteğe bağlı bir bitiş karesi veya referans görselleri ile en yeni Kling modeli kullanılır.",
+    "display_name": "Kling Omni İlk-Son-Kare'den Videoya (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "end_frame": {
+        "name": "end_frame",
+        "tooltip": "Video için isteğe bağlı bir bitiş karesi. Bu, 'reference_images' ile aynı anda kullanılamaz."
+      },
+      "first_frame": {
+        "name": "first_frame"
+      },
+      "generate_audio": {
+        "name": "ses_oluştur",
+        "tooltip": "Video için ses oluşturun. Sadece kling-v3-omni için desteklenir."
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Video içeriğini tanımlayan bir metin istemi. Hem olumlu hem de olumsuz açıklamalar içerebilir."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "En fazla 6 ek referans görseli."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed, düğümün tekrar çalıştırılıp çalıştırılmayacağını kontrol eder; seed ne olursa olsun sonuçlar deterministik değildir."
+      },
+      "storyboards": {
+        "name": "hikaye_tahtaları",
+        "tooltip": "Bireysel promptlar ve sürelerle bir dizi video segmenti oluşturun. Sadece kling-v3-omni için desteklenir."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProImageNode": {
+    "description": "Kling'in en yeni modeliyle görseller oluşturun veya düzenleyin.",
+    "display_name": "Kling Omni Görsel (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Görsel içeriğini tanımlayan bir metin istemi. Hem olumlu hem de olumsuz açıklamalar içerebilir."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "En fazla 10 ek referans görseli."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed, düğümün tekrar çalıştırılıp çalıştırılmayacağını kontrol eder; seed ne olursa olsun sonuçlar deterministik değildir."
+      },
+      "series_amount": {
+        "name": "seri_sayısı",
+        "tooltip": "Bir dizi görsel oluşturun. kling-image-o1 için desteklenmez."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProImageToVideoNode": {
+    "description": "En yeni Kling modeliyle video oluşturmak için en fazla 7 referans görseli kullanın.",
+    "display_name": "Kling Omni Görselden Videoya (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "generate_audio": {
+        "name": "ses_oluştur",
+        "tooltip": "Video için ses oluşturun. Sadece kling-v3-omni için desteklenir."
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Video içeriğini tanımlayan bir metin istemi. Hem olumlu hem de olumsuz açıklamalar içerebilir."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "En fazla 7 referans görseli."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed, düğümün tekrar çalıştırılıp çalıştırılmayacağını kontrol eder; seed ne olursa olsun sonuçlar deterministik değildir."
+      },
+      "storyboards": {
+        "name": "hikaye_tahtaları",
+        "tooltip": "Bireysel promptlar ve sürelerle bir dizi video segmenti oluşturun. Sadece kling-v3-omni için desteklenir."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProTextToVideoNode": {
+    "description": "En yeni Kling modeliyle metin istemleri kullanarak videolar oluşturun.",
+    "display_name": "Kling Omni Metinden Videoya (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "generate_audio": {
+        "name": "ses_oluştur"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Video içeriğini tanımlayan bir metin istemi. Hem olumlu hem de olumsuz açıklamalar içerebilir."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed, düğümün tekrar çalıştırılıp çalıştırılmayacağını kontrol eder; seed ne olursa olsun sonuçlar deterministik değildir."
+      },
+      "storyboards": {
+        "name": "hikaye_tahtaları",
+        "tooltip": "Bireysel promptlar ve sürelerle bir dizi video segmenti oluşturun. o1 modeli için dikkate alınmaz."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProVideoToVideoNode": {
+    "description": "Bir video ve en fazla 4 referans görseli kullanarak en yeni Kling modeliyle bir video oluşturun.",
+    "display_name": "Kling Omni Video'dan Video'ya (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "keep_original_sound": {
+        "name": "keep_original_sound"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Video içeriğini tanımlayan bir metin istemi. Hem olumlu hem de olumsuz açıklamalar içerebilir."
+      },
+      "reference_images": {
+        "name": "reference_images",
+        "tooltip": "En fazla 4 ek referans görseli."
+      },
+      "reference_video": {
+        "name": "reference_video",
+        "tooltip": "Referans olarak kullanılacak video."
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "tohum",
+        "tooltip": "Tohum, düğümün yeniden çalıştırılıp çalıştırılmayacağını kontrol eder; sonuçlar tohumdan bağımsız olarak belirlenemezdir."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingSingleImageVideoEffectNode": {
     "description": "Efekt_sahnesine dayalı bir video oluştururken farklı özel efektler elde edin.",
     "display_name": "Kling Video Efektleri",
@@ -4125,6 +6255,35 @@
       }
     }
   },
+  "KlingTextToVideoWithAudio": {
+    "display_name": "Kling Metinden Videoya (Sesli)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "generate_audio": {
+        "name": "generate_audio"
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Olumlu metin istemi."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingVideoExtendNode": {
     "description": "Kling Video Uzatma Düğümü. Diğer Kling düğümleri tarafından yapılan videoları uzatın. video_id, diğer Kling Düğümleri kullanılarak oluşturulur.",
     "display_name": "Kling Video Uzatma",
@@ -4159,6 +6318,54 @@
       }
     }
   },
+  "KlingVideoNode": {
+    "description": "Kling V3 ile videolar oluşturun. Metinden videoya ve isteğe bağlı storyboard çoklu istem ve ses üretimiyle görüntüden videoya destekler.",
+    "display_name": "Kling 3.0 Video",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "generate_audio": {
+        "name": "ses oluştur"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Model ve üretim ayarları."
+      },
+      "model_aspect_ratio": {
+        "name": "en boy oranı"
+      },
+      "model_resolution": {
+        "name": "çözünürlük"
+      },
+      "multi_shot": {
+        "name": "çoklu çekim",
+        "tooltip": "Her biri ayrı istem ve süreye sahip bir dizi video segmenti oluşturun."
+      },
+      "multi_shot_duration": {
+        "name": "süre"
+      },
+      "multi_shot_negative_prompt": {
+        "name": "negatif istem"
+      },
+      "multi_shot_prompt": {
+        "name": "istem"
+      },
+      "seed": {
+        "name": "tohum",
+        "tooltip": "Tohum, düğümün yeniden çalıştırılıp çalıştırılmayacağını kontrol eder; sonuçlar tohumdan bağımsız olarak belirlenemezdir."
+      },
+      "start_frame": {
+        "name": "başlangıç karesi",
+        "tooltip": "İsteğe bağlı başlangıç kare görüntüsü. Bağlandığında, görüntüden videoya moduna geçer."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingVirtualTryOnNode": {
     "description": "Kling Sanal Deneme Düğümü. İnsan üzerine kıyafet denemek için bir insan resmi ve bir kıyafet resmi girin.",
     "display_name": "Kling Sanal Deneme",
@@ -4179,6 +6386,26 @@
       }
     }
   },
+  "LTXAVTextEncoderLoader": {
+    "description": "[Tarifler]\n\nltxav: gemma 3 12B",
+    "display_name": "LTXV Sesli Metin Kodlayıcı Yükleyici",
+    "inputs": {
+      "ckpt_name": {
+        "name": "ckpt_name"
+      },
+      "device": {
+        "name": "device"
+      },
+      "text_encoder": {
+        "name": "text_encoder"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LTXVAddGuide": {
     "display_name": "LTXVRehberEkle",
     "inputs": {
@@ -4221,6 +6448,76 @@
       }
     }
   },
+  "LTXVAudioVAEDecode": {
+    "display_name": "LTXV Sesli VAE Çöz",
+    "inputs": {
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "Latent'i çözmek için kullanılan Sesli VAE modeli."
+      },
+      "samples": {
+        "name": "samples",
+        "tooltip": "Çözülecek latent."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Ses",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAEEncode": {
+    "display_name": "LTXV Sesli VAE Kodla",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "Kodlanacak ses."
+      },
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "Kodlama için kullanılacak Sesli VAE modeli."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Ses Latenti",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAELoader": {
+    "display_name": "LTXV Sesli VAE Yükleyici",
+    "inputs": {
+      "ckpt_name": {
+        "name": "ckpt_name",
+        "tooltip": "Yüklenecek Sesli VAE kontrol noktası."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Sesli VAE",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVConcatAVLatent": {
+    "display_name": "LTXVConcatAVLatent",
+    "inputs": {
+      "audio_latent": {
+        "name": "audio_latent"
+      },
+      "video_latent": {
+        "name": "video_latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
   "LTXVConditioning": {
     "display_name": "LTXVKoşullandırma",
     "inputs": {
@@ -4273,6 +6570,33 @@
       }
     }
   },
+  "LTXVEmptyLatentAudio": {
+    "display_name": "LTXV Boş Latent Ses",
+    "inputs": {
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "Yapılandırma almak için kullanılacak Sesli VAE modeli."
+      },
+      "batch_size": {
+        "name": "batch_size",
+        "tooltip": "Toplu işteki latent ses örneklerinin sayısı."
+      },
+      "frame_rate": {
+        "name": "frame_rate",
+        "tooltip": "Saniyedeki kare sayısı."
+      },
+      "frames_number": {
+        "name": "frames_number",
+        "tooltip": "Kare sayısı."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Latent",
+        "tooltip": null
+      }
+    }
+  },
   "LTXVImgToVideo": {
     "display_name": "LTXVGörüntüdenVideoya",
     "inputs": {
@@ -4319,6 +6643,47 @@
       }
     }
   },
+  "LTXVImgToVideoInplace": {
+    "display_name": "LTXVImgToVideoInplace",
+    "inputs": {
+      "bypass": {
+        "name": "atla",
+        "tooltip": "Koşullandırmayı atla."
+      },
+      "image": {
+        "name": "görüntü"
+      },
+      "latent": {
+        "name": "latent"
+      },
+      "strength": {
+        "name": "güç"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVLatentUpsampler": {
+    "display_name": "LTXVLatentUpsampler",
+    "inputs": {
+      "samples": {
+        "name": "örnekler"
+      },
+      "upscale_model": {
+        "name": "büyütme_modeli"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
   "LTXVPreprocess": {
     "display_name": "LTXVÖnİşleme",
     "inputs": {
@@ -4367,6 +6732,25 @@
       }
     }
   },
+  "LTXVSeparateAVLatent": {
+    "description": "LTXV Ayrık AV Latent",
+    "display_name": "LTXVSeparateAVLatent",
+    "inputs": {
+      "av_latent": {
+        "name": "av_latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "video_latent",
+        "tooltip": null
+      },
+      "1": {
+        "name": "audio_latent",
+        "tooltip": null
+      }
+    }
+  },
   "LaplaceScheduler": {
     "display_name": "LaplaceZamanlayıcı",
     "inputs": {
@@ -4385,6 +6769,11 @@
       "steps": {
         "name": "adımlar"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "LatentAdd": {
@@ -4522,6 +6911,11 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "LatentConcat": {
@@ -4585,6 +6979,25 @@
       }
     }
   },
+  "LatentCutToBatch": {
+    "display_name": "LatentCutToBatch",
+    "inputs": {
+      "dim": {
+        "name": "dim"
+      },
+      "samples": {
+        "name": "samples"
+      },
+      "slice_size": {
+        "name": "slice_size"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LatentFlip": {
     "display_name": "Gizli Değişkeni Çevir",
     "inputs": {
@@ -4738,6 +7151,19 @@
       }
     }
   },
+  "LatentUpscaleModelLoader": {
+    "display_name": "Latent Büyütme Modelini Yükle",
+    "inputs": {
+      "model_name": {
+        "name": "model_name"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LazyCache": {
     "description": "EasyCache'in ev yapımı bir versiyonu - uygulaması daha 'kolay' bir EasyCache versiyonu. Genel olarak EasyCache'den daha kötü çalışır, ancak bazı nadir durumlarda daha iyidir VE ComfyUI'deki her şeyle evrensel uyumluluğa sahiptir.",
     "display_name": "Tembel Önbellek",
@@ -4772,8 +7198,7 @@
   "Load3D": {
     "display_name": "3D Yükle",
     "inputs": {
-      "clear": {
-      },
+      "clear": {},
       "height": {
         "name": "yükseklik"
       },
@@ -4783,30 +7208,40 @@
       "model_file": {
         "name": "model_dosyası"
       },
-      "upload 3d model": {
-      },
+      "upload 3d model": {},
+      "upload extra resources": {},
       "width": {
         "name": "genişlik"
       }
     },
     "outputs": {
       "0": {
-        "name": "görüntü"
+        "name": "image",
+        "tooltip": null
       },
       "1": {
-        "name": "maske"
+        "name": "mask",
+        "tooltip": null
       },
       "2": {
-        "name": "ağ_yolu"
+        "name": "mesh_path",
+        "tooltip": null
       },
       "3": {
-        "name": "normal"
+        "name": "normal",
+        "tooltip": null
       },
       "4": {
-        "name": "çizgi_sanatı"
+        "name": "camera_info",
+        "tooltip": null
       },
       "5": {
-        "name": "kamera_bilgisi"
+        "name": "recording_video",
+        "tooltip": null
+      },
+      "6": {
+        "name": "model_3d",
+        "tooltip": null
       }
     }
   },
@@ -4822,6 +7257,11 @@
       "upload": {
         "name": "yüklenecek dosyayı seçin"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "LoadImage": {
@@ -4835,6 +7275,21 @@
       }
     }
   },
+  "LoadImageDataSetFromFolder": {
+    "display_name": "Klasörden Görsel Veri Kümesi Yükle",
+    "inputs": {
+      "folder": {
+        "name": "folder",
+        "tooltip": "Görsellerin yükleneceği klasör."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Yüklenen görsellerin listesi"
+      }
+    }
+  },
   "LoadImageMask": {
     "display_name": "Görüntü Yükle (Maske olarak)",
     "inputs": {
@@ -4853,16 +7308,35 @@
     "description": "Çıktı klasöründen bir görüntü yükleyin. Yenile düğmesine tıklandığında, düğüm görüntü listesini güncelleyecek ve otomatik olarak ilk görüntüyü seçecek, bu da kolay yinelemeye olanak tanıyacaktır.",
     "display_name": "Görüntü Yükle (Çıktılardan)",
     "inputs": {
+      "Auto-refresh after generation": {},
       "image": {
         "name": "görüntü"
       },
-      "refresh": {
-      },
+      "refresh": {},
       "upload": {
         "name": "yüklenecek dosyayı seçin"
       }
     }
   },
+  "LoadImageTextDataSetFromFolder": {
+    "display_name": "Klasörden Görsel ve Metin Veri Kümesi Yükle",
+    "inputs": {
+      "folder": {
+        "name": "folder",
+        "tooltip": "Görsellerin yükleneceği klasör."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Yüklenen görsellerin listesi"
+      },
+      "1": {
+        "name": "texts",
+        "tooltip": "Metin başlıklarının listesi"
+      }
+    }
+  },
   "LoadLatent": {
     "display_name": "GizliYükle",
     "inputs": {
@@ -4871,6 +7345,25 @@
       }
     }
   },
+  "LoadTrainingDataset": {
+    "display_name": "Eğitim Verisetini Yükle",
+    "inputs": {
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "Kaydedilmiş verisetini içeren klasörün adı (çıkış dizini içinde)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latents",
+        "tooltip": "Latent sözlüklerinin listesi"
+      },
+      "1": {
+        "name": "conditioning",
+        "tooltip": "Koşullandırma listelerinin listesi"
+      }
+    }
+  },
   "LoadVideo": {
     "display_name": "Video Yükle",
     "inputs": {
@@ -4921,6 +7414,60 @@
       }
     }
   },
+  "LoraLoaderBypass": {
+    "description": "LoRA'yı bypass modunda uygula. Normal LoRA'dan farklı olarak, model ağırlıklarını değiştirmez - bunun yerine LoRA hesaplamasını ileri geçiş sırasında enjekte eder. Eğitim senaryoları için kullanışlıdır.",
+    "display_name": "LoRA Yükle (Bypass) (Hata Ayıklama İçin)",
+    "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "LoRA'nın uygulanacağı CLIP modeli."
+      },
+      "lora_name": {
+        "name": "lora_name",
+        "tooltip": "LoRA'nın adı."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "LoRA'nın uygulanacağı difüzyon modeli."
+      },
+      "strength_clip": {
+        "name": "strength_clip",
+        "tooltip": "CLIP modelini ne kadar güçlü değiştireceği. Bu değer negatif olabilir."
+      },
+      "strength_model": {
+        "name": "strength_model",
+        "tooltip": "Difüzyon modelini ne kadar güçlü değiştireceği. Bu değer negatif olabilir."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "Değiştirilmiş difüzyon modeli."
+      },
+      "1": {
+        "tooltip": "Değiştirilmiş CLIP modeli."
+      }
+    }
+  },
+  "LoraLoaderBypassModelOnly": {
+    "description": "LoRA'yı bypass modunda uygula. Normal LoRA'dan farklı olarak, model ağırlıklarını değiştirmez - bunun yerine LoRA hesaplamasını ileri geçiş sırasında enjekte eder. Eğitim senaryoları için kullanışlıdır.",
+    "display_name": "LoRA Yükle (Bypass, Sadece Model) (Hata Ayıklama İçin)",
+    "inputs": {
+      "lora_name": {
+        "name": "lora_name"
+      },
+      "model": {
+        "name": "model"
+      },
+      "strength_model": {
+        "name": "strength_model"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "Değiştirilmiş difüzyon modeli."
+      }
+    }
+  },
   "LoraLoaderModelOnly": {
     "description": "LoRA'lar, difüzyon ve CLIP modellerini değiştirmek, gizli değişkenlerin gürültüsünün giderilme şeklini değiştirmek (örneğin stiller uygulamak) için kullanılır. Birden fazla LoRA düğümü birbirine bağlanabilir.",
     "display_name": "SadeceModelLoRA Yükleyici",
@@ -4944,6 +7491,10 @@
   "LoraModelLoader": {
     "display_name": "LoRA Modeli Yükle",
     "inputs": {
+      "bypass": {
+        "name": "bypass",
+        "tooltip": "Etkinleştirildiğinde, LoRA'yı temel model ağırlıklarını değiştirmeden bypass modunda uygular. Eğitim sırasında ve model ağırlıkları dışa aktarıldığında kullanışlıdır."
+      },
       "lora": {
         "name": "lora",
         "tooltip": "Difüzyon modeline uygulanacak LoRA modeli."
@@ -4959,7 +7510,8 @@
     },
     "outputs": {
       "0": {
-        "tooltip": "Değiştirilmiş difüzyon modeli."
+        "name": "model",
+        "tooltip": "Değiştirilmiş diffusion modeli."
       }
     }
   },
@@ -4992,10 +7544,12 @@
     "display_name": "Kayıp Grafiği Çiz",
     "inputs": {
       "filename_prefix": {
-        "name": "dosya_adı_ön_eki"
+        "name": "dosya_adı_ön_eki",
+        "tooltip": "Kaydedilen kayıp grafik görseli için önek."
       },
       "loss": {
-        "name": "kayıp"
+        "name": "kayıp",
+        "tooltip": "Eğitim düğümünden kayıp haritası."
       }
     }
   },
@@ -5286,6 +7840,208 @@
       }
     }
   },
+  "MagnificImageRelightNode": {
+    "description": "Bir görseli ışık ayarlarıyla ve isteğe bağlı referans tabanlı ışık transferiyle yeniden ışıklandır.",
+    "display_name": "Magnific Görsel Yeniden Işıklandırma",
+    "inputs": {
+      "advanced_settings": {
+        "name": "advanced_settings",
+        "tooltip": "Gelişmiş ışık kontrolü için ince ayar seçenekleri."
+      },
+      "change_background": {
+        "name": "change_background",
+        "tooltip": "Arka planı prompt/referansa göre değiştirir."
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "Yeniden ışıklandırılacak görsel."
+      },
+      "interpolate_from_original": {
+        "name": "interpolate_from_original",
+        "tooltip": "Oluşturulan görselin orijinale daha yakın olmasını sınırlar."
+      },
+      "light_transfer_strength": {
+        "name": "light_transfer_strength",
+        "tooltip": "Işık transferi uygulama yoğunluğu."
+      },
+      "preserve_details": {
+        "name": "preserve_details",
+        "tooltip": "Orijinalden doku ve ince detayları korur."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Işıklandırma için açıklayıcı rehberlik. Vurgu notasyonu (1-1.4) desteklenir."
+      },
+      "reference_image": {
+        "name": "reference_image",
+        "tooltip": "Işıklandırmanın aktarılacağı isteğe bağlı referans görsel."
+      },
+      "style": {
+        "name": "style",
+        "tooltip": "Çıktı için stil tercihi."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageSkinEnhancerNode": {
+    "description": "Portreler için çoklu işleme modlarıyla cilt iyileştirme.",
+    "display_name": "Magnific Görsel Cilt İyileştirici",
+    "inputs": {
+      "image": {
+        "name": "image",
+        "tooltip": "İyileştirilecek portre görseli."
+      },
+      "mode": {
+        "name": "mode",
+        "tooltip": "İşleme modu: Sanatsal iyileştirme için yaratıcı, orijinal görünümü korumak için sadık, hedefli optimizasyon için esnek."
+      },
+      "sharpen": {
+        "name": "sharpen",
+        "tooltip": "Keskinleştirme yoğunluk seviyesi."
+      },
+      "smart_grain": {
+        "name": "smart_grain",
+        "tooltip": "Akıllı gren yoğunluk seviyesi."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageStyleTransferNode": {
+    "description": "Bir referans görüntüsünün stilini giriş görüntünüze aktarın.",
+    "display_name": "Magnific Görüntü Stil Transferi",
+    "inputs": {
+      "engine": {
+        "name": "engine",
+        "tooltip": "İşleme motoru seçimi."
+      },
+      "fixed_generation": {
+        "name": "fixed_generation",
+        "tooltip": "Devre dışı bırakıldığında, her üretimde bir miktar rastgelelik beklenir ve bu da daha çeşitli sonuçlar elde edilmesini sağlar."
+      },
+      "flavor": {
+        "name": "flavor",
+        "tooltip": "Stil transferi türü."
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "Stil transferinin uygulanacağı görüntü."
+      },
+      "portrait_mode": {
+        "name": "portrait_mode",
+        "tooltip": "Yüz iyileştirmeleri için portre modunu etkinleştir."
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "reference_image": {
+        "name": "reference_image",
+        "tooltip": "Stilinin çıkarılacağı referans görüntü."
+      },
+      "structure_strength": {
+        "name": "structure_strength",
+        "tooltip": "Orijinal görüntünün yapısını korur."
+      },
+      "style_strength": {
+        "name": "style_strength",
+        "tooltip": "Stil gücü yüzdesi."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageUpscalerCreativeNode": {
+    "description": "Prompt rehberliğinde geliştirme, stilizasyon ve 2x/4x/8x/16x büyütme. Maksimum çıktı: 25,3 megapiksel.",
+    "display_name": "Magnific Görüntü Büyütme (Yaratıcı)",
+    "inputs": {
+      "auto_downscale": {
+        "name": "otomatik_küçültme",
+        "tooltip": "Çıktı maksimum piksel sınırını aşarsa giriş görüntüsünü otomatik olarak küçült."
+      },
+      "creativity": {
+        "name": "yaratıcılık"
+      },
+      "engine": {
+        "name": "motor"
+      },
+      "fractality": {
+        "name": "fraktalite",
+        "tooltip": "Prompt gücü ve piksel başına karmaşıklık."
+      },
+      "hdr": {
+        "name": "hdr",
+        "tooltip": "Tanım ve detay seviyesi."
+      },
+      "image": {
+        "name": "görüntü"
+      },
+      "optimized_for": {
+        "name": "için_optimize_edildi"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "resemblance": {
+        "name": "benzerlik",
+        "tooltip": "Orijinal görüntüye benzerlik seviyesi."
+      },
+      "scale_factor": {
+        "name": "ölçek_faktörü"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageUpscalerPreciseV2Node": {
+    "description": "Keskinlik, gren ve detay üzerinde hassas kontrol ile yüksek doğrulukta büyütme. Maksimum çıktı: 10060×10060 piksel.",
+    "display_name": "Magnific Görüntü Büyütme (Hassas V2)",
+    "inputs": {
+      "auto_downscale": {
+        "name": "otomatik_küçültme",
+        "tooltip": "Çıktı maksimum çözünürlüğü aşarsa giriş görüntüsünü otomatik olarak küçült."
+      },
+      "flavor": {
+        "name": "stil",
+        "tooltip": "İşleme stili: genel kullanım için sublime, fotoğraflar için photo, gürültülü fotoğraflar için photo_denoiser."
+      },
+      "image": {
+        "name": "görüntü"
+      },
+      "scale_factor": {
+        "name": "ölçek_faktörü"
+      },
+      "sharpen": {
+        "name": "keskinleştirme",
+        "tooltip": "Görüntü keskinliği yoğunluğu. Yüksek değerler kenar tanımını ve netliği artırır."
+      },
+      "smart_grain": {
+        "name": "akıllı_gren",
+        "tooltip": "Görüntünün çok pürüzsüz veya yapay görünmesini önlemek için akıllı gren/doku artırımı."
+      },
+      "ultra_detail": {
+        "name": "ultra_detay",
+        "tooltip": "Büyütme sırasında eklenen ince detayları, dokuları ve mikro detayları kontrol eder."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "Mahiro": {
     "description": "Rehberliği, negatif istem arasındaki farktan ziyade pozitif istemin 'yönüne' daha fazla ölçeklenecek şekilde değiştirin.",
     "display_name": "Mahiro o kadar sevimli ki daha iyi bir rehberlik fonksiyonunu hak ediyor!! (。・ω・。)",
@@ -5301,6 +8057,50 @@
       }
     }
   },
+  "MakeTrainingDataset": {
+    "display_name": "Eğitim Veriseti Oluştur",
+    "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "Metni koşullandırmaya kodlamak için CLIP modeli."
+      },
+      "images": {
+        "name": "görüntüler",
+        "tooltip": "Kodlanacak görüntülerin listesi."
+      },
+      "texts": {
+        "name": "metinler",
+        "tooltip": "Metin başlıklarının listesi. Uzunluk n (görüntülerle eşleşen), 1 (hepsi için tekrarlanan) veya boş bırakılabilir (boş dize kullanılır)."
+      },
+      "vae": {
+        "name": "vae",
+        "tooltip": "Görüntüleri latentlere kodlamak için VAE modeli."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latents",
+        "tooltip": "Latent sözlüklerinin listesi"
+      },
+      "1": {
+        "name": "koşullandırma",
+        "tooltip": "Koşullandırma listelerinin listesi"
+      }
+    }
+  },
+  "ManualSigmas": {
+    "display_name": "Manuel Sigmalar",
+    "inputs": {
+      "sigmas": {
+        "name": "sigmalar"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "MaskComposite": {
     "display_name": "MaskeBirleştirme",
     "inputs": {
@@ -5319,6 +8119,11 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "MaskPreview": {
@@ -5336,6 +8141,371 @@
       "mask": {
         "name": "maske"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MergeImageLists": {
+    "display_name": "Görüntü Listelerini Birleştir",
+    "inputs": {
+      "images": {
+        "name": "görüntüler",
+        "tooltip": "İşlenecek görüntülerin listesi."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "görüntüler",
+        "tooltip": "İşlenmiş görüntüler"
+      }
+    }
+  },
+  "MergeTextLists": {
+    "display_name": "Metin Listelerini Birleştir",
+    "inputs": {
+      "texts": {
+        "name": "metinler",
+        "tooltip": "İşlenecek metinlerin listesi."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "metinler",
+        "tooltip": "İşlenmiş metinler"
+      }
+    }
+  },
+  "MeshyAnimateModelNode": {
+    "description": "Daha önce rig işlemi uygulanmış bir karaktere belirli bir animasyon hareketi uygula.",
+    "display_name": "Meshy: Modeli Canlandır",
+    "inputs": {
+      "action_id": {
+        "name": "action_id",
+        "tooltip": "Mevcut değerlerin listesi için https://docs.meshy.ai/en/api/animation-library adresini ziyaret edin."
+      },
+      "rig_task_id": {
+        "name": "rig_task_id"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyImageToModelNode": {
+    "display_name": "Meshy: Görüntüden Modele",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "Oluşturulan model için poz modunu belirtin."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed, düğümün tekrar çalıştırılıp çalıştırılmayacağını kontrol eder; seed ne olursa olsun sonuçlar deterministik değildir."
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "Yanlış olarak ayarlanırsa, işlenmemiş üçgen ağ döndürülür."
+      },
+      "should_remesh_target_polycount": {
+        "name": "hedef_poligon_sayısı"
+      },
+      "should_remesh_topology": {
+        "name": "topoloji"
+      },
+      "should_texture": {
+        "name": "should_texture",
+        "tooltip": "Doku oluşturulup oluşturulmayacağını belirler. Yanlış olarak ayarlanırsa doku aşaması atlanır ve dokusuz bir ağ döndürülür."
+      },
+      "should_texture_enable_pbr": {
+        "name": "pbr_aktif_et"
+      },
+      "should_texture_texture_prompt": {
+        "name": "doku_isteği"
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyMultiImageToModelNode": {
+    "display_name": "Meshy: Çoklu Görüntüden Modele",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "images": {
+        "name": "images"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "Oluşturulan model için poz modunu belirtin."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed, düğümün tekrar çalıştırılıp çalıştırılmayacağını kontrol eder; seed ne olursa olsun sonuçlar deterministik değildir."
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "Yanlış olarak ayarlanırsa, işlenmemiş üçgen ağ döndürülür."
+      },
+      "should_remesh_target_polycount": {
+        "name": "hedef_poligon_sayısı"
+      },
+      "should_remesh_topology": {
+        "name": "topoloji"
+      },
+      "should_texture": {
+        "name": "should_texture",
+        "tooltip": "Doku oluşturulup oluşturulmayacağını belirler. Yanlış olarak ayarlanırsa doku aşaması atlanır ve dokusuz bir ağ döndürülür."
+      },
+      "should_texture_enable_pbr": {
+        "name": "pbr_aktif_et"
+      },
+      "should_texture_texture_prompt": {
+        "name": "doku_isteği"
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyRefineNode": {
+    "description": "Önceden oluşturulmuş bir taslak modeli iyileştirir.",
+    "display_name": "Meshy: Taslak Modeli İyileştir",
+    "inputs": {
+      "enable_pbr": {
+        "name": "enable_pbr",
+        "tooltip": "Temel renge ek olarak PBR Haritaları (metalik, pürüzlülük, normal) oluşturur. Not: Heykel tarzı kullanıldığında bu seçenek kapalı olmalıdır, çünkü Heykel tarzı kendi PBR haritalarını üretir."
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "model": {
+        "name": "model"
+      },
+      "texture_image": {
+        "name": "texture_image",
+        "tooltip": "'texture_image' veya 'texture_prompt' seçeneklerinden yalnızca biri aynı anda kullanılabilir."
+      },
+      "texture_prompt": {
+        "name": "texture_prompt",
+        "tooltip": "Kaplama sürecini yönlendirmek için bir metin istemi girin. Maksimum 600 karakter. 'texture_image' ile aynı anda kullanılamaz."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyRigModelNode": {
+    "description": "Standart formatlarda riglenmiş bir karakter sağlar. Otomatik rigleme, şu anda dokusuz meshler, insan olmayan varlıklar veya uzuv ve vücut yapısı belirsiz olan insan benzeri varlıklar için uygun değildir.",
+    "display_name": "Meshy: Modeli Rigle",
+    "inputs": {
+      "height_meters": {
+        "name": "height_meters",
+        "tooltip": "Karakter modelinin yaklaşık yüksekliği (metre cinsinden). Ölçekleme ve rigleme doğruluğu için yardımcı olur."
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "texture_image": {
+        "name": "texture_image",
+        "tooltip": "Modelin UV-unwrap edilmiş temel renk doku görseli."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_file",
+        "tooltip": null
+      },
+      "1": {
+        "name": "rig_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyTextToModelNode": {
+    "display_name": "Meshy: Metinden Modele",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "Oluşturulan model için poz modu belirtin."
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "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."
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "Kapalı olarak ayarlanırsa, işlenmemiş üçgen mesh döndürülür."
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      },
+      "style": {
+        "name": "style"
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_dosyası",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_görev_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyTextureNode": {
+    "display_name": "Meshy: Doku Modeli",
+    "inputs": {
+      "enable_original_uv": {
+        "name": "orijinal UV'yi etkinleştir",
+        "tooltip": "Modelin yeni UV'leri oluşturmak yerine orijinal UV'sini kullan. Etkinleştirildiğinde, Meshy yüklenen modeldeki mevcut dokuları korur. Modelin orijinal UV'si yoksa, çıktı kalitesi o kadar iyi olmayabilir."
+      },
+      "image_style": {
+        "name": "görsel stil",
+        "tooltip": "Dokulandırma sürecine rehberlik edecek 2D bir görsel. 'text_style_prompt' ile aynı anda kullanılamaz."
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pbr": {
+        "name": "pbr"
+      },
+      "text_style_prompt": {
+        "name": "metin stil istemi",
+        "tooltip": "Nesnenin istediğiniz doku stilini metinle tanımlayın. En fazla 600 karakter. 'image_style' ile aynı anda kullanılamaz."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_dosyası",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_görev_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
     }
   },
   "MinimaxHailuoVideoNode": {
@@ -7779,6 +10949,78 @@
       }
     }
   },
+  "NAGuidance": {
+    "description": "Modellere Normalize Edilmiş Dikkat Yönlendirmesi uygular, distilled/schnell modellerde negatif istemlere olanak tanır.",
+    "display_name": "Normalize Edilmiş Dikkat Yönlendirmesi",
+    "inputs": {
+      "model": {
+        "name": "model",
+        "tooltip": "NAG uygulanacak model."
+      },
+      "nag_alpha": {
+        "name": "nag_alpha",
+        "tooltip": "Normalize edilmiş dikkat için karıştırma faktörü. 1.0 tam değişim, 0.0 hiçbir etki yok."
+      },
+      "nag_scale": {
+        "name": "nag_scale",
+        "tooltip": "Yönlendirme ölçek faktörü. Daha yüksek değerler, negatif istemden daha fazla uzaklaştırır."
+      },
+      "nag_tau": {
+        "name": "nag_tau"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "NAG etkinleştirilmiş yamalı model."
+      }
+    }
+  },
+  "NormalizeImages": {
+    "display_name": "Görüntüleri Normalleştir",
+    "inputs": {
+      "images": {
+        "name": "görüntüler",
+        "tooltip": "İşlenecek görüntü."
+      },
+      "mean": {
+        "name": "ortalama",
+        "tooltip": "Normalleştirme için ortalama değer."
+      },
+      "std": {
+        "name": "std",
+        "tooltip": "Normalleştirme için standart sapma."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "görüntüler",
+        "tooltip": "İşlenmiş görüntüler"
+      }
+    }
+  },
+  "NormalizeVideoLatentStart": {
+    "description": "Bir video latentinin ilk karelerini, sonraki referans karelerin ortalaması ve standart sapmasına uyacak şekilde normalleştirir. Başlangıç kareleri ile videonun geri kalanı arasındaki farkların azaltılmasına yardımcı olur.",
+    "display_name": "NormalizeVideoLatentStart",
+    "inputs": {
+      "latent": {
+        "name": "latent"
+      },
+      "reference_frame_count": {
+        "name": "reference_frame_count",
+        "tooltip": "Referans olarak kullanılacak, başlangıç karelerinden sonraki latent kare sayısı"
+      },
+      "start_frame_count": {
+        "name": "start_frame_count",
+        "tooltip": "Başlangıçtan itibaren normalleştirilecek latent kare sayısı"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
   "OpenAIChatConfig": {
     "description": "OpenAI Sohbet Düğümleri için gelişmiş yapılandırma seçeneklerini belirlemeye olanak tanır.",
     "display_name": "OpenAI ChatGPT Gelişmiş Seçenekler",
@@ -7928,6 +11170,9 @@
         "name": "maske",
         "tooltip": "İç boyama için isteğe bağlı maske (beyaz alanlar değiştirilecektir)"
       },
+      "model": {
+        "name": "model"
+      },
       "n": {
         "name": "n",
         "tooltip": "Kaç tane görüntü oluşturulacağı"
@@ -8440,6 +11685,11 @@
       "steps": {
         "name": "adımlar"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "PorterDuffImageComposite": {
@@ -8473,6 +11723,9 @@
   "Preview3D": {
     "display_name": "3D Önizleme",
     "inputs": {
+      "bg_image": {
+        "name": "bg_image"
+      },
       "camera_info": {
         "name": "kamera_bilgisi"
       },
@@ -8480,14 +11733,20 @@
         "name": "görüntü"
       },
       "model_file": {
-        "name": "model_dosyası"
+        "name": "model_dosyası",
+        "tooltip": "3D model dosyası veya yol dizgesi"
       }
     }
   },
   "PreviewAny": {
     "display_name": "Herhangi Bir Şeyi Önizle",
     "inputs": {
-      "preview": {
+      "previewMode": {},
+      "preview_markdown": {
+        "name": "Önizleme"
+      },
+      "preview_text": {
+        "name": "Önizleme"
       },
       "source": {
         "name": "kaynak"
@@ -8527,6 +11786,28 @@
       }
     }
   },
+  "PrimitiveBoundingBox": {
+    "display_name": "Sınır Kutusu",
+    "inputs": {
+      "height": {
+        "name": "yükseklik"
+      },
+      "width": {
+        "name": "genişlik"
+      },
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "PrimitiveFloat": {
     "display_name": "Float",
     "inputs": {
@@ -8628,6 +11909,36 @@
       }
     }
   },
+  "RandomCropImages": {
+    "display_name": "Rastgele Kırpılmış Görseller",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "height": {
+        "name": "height",
+        "tooltip": "Kırpma yüksekliği."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "İşlenecek görsel."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Rastgelelik tohumu."
+      },
+      "width": {
+        "name": "width",
+        "tooltip": "Kırpma genişliği."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "İşlenmiş görseller"
+      }
+    }
+  },
   "RandomNoise": {
     "display_name": "RastgeleGürültü",
     "inputs": {
@@ -8637,6 +11948,11 @@
       "noise_seed": {
         "name": "gürültü_tohumu"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "RebatchImages": {
@@ -8677,6 +11993,11 @@
       "audio": {
         "name": "ses"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "RecraftColorRGB": {
@@ -8724,6 +12045,25 @@
       }
     }
   },
+  "RecraftCreateStyleNode": {
+    "description": "Referans görsellerden özel bir stil oluşturun. Stil referansı olarak kullanmak için 1-5 görsel yükleyin. Tüm görsellerin toplam boyutu 5 MB ile sınırlıdır.",
+    "display_name": "Recraft Stil Oluştur",
+    "inputs": {
+      "images": {
+        "name": "görseller"
+      },
+      "style": {
+        "name": "stil",
+        "tooltip": "Oluşturulan görsellerin temel stili."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "stil_id",
+        "tooltip": null
+      }
+    }
+  },
   "RecraftCreativeUpscaleNode": {
     "description": "Görüntüyü eşzamanlı olarak büyütün.\nVerilen bir raster görüntüyü ‘yaratıcı büyütme’ aracıyla geliştirir, küçük ayrıntıları ve yüzleri iyileştirmeye odaklanarak çözünürlüğü artırır.",
     "display_name": "Recraft Yaratıcı Büyütme Görüntüsü",
@@ -9031,6 +12371,88 @@
       }
     }
   },
+  "RecraftV4TextToImageNode": {
+    "description": "Recraft V4 veya V4 Pro modelleriyle görseller üretir.",
+    "display_name": "Recraft V4 Metinden Görsele",
+    "inputs": {
+      "control_after_generate": {
+        "name": "üretimden sonra kontrol"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Üretim için kullanılacak model."
+      },
+      "model_size": {
+        "name": "boyut"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "Üretilecek görsel sayısı."
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Bir görselde istenmeyen ögelerin isteğe bağlı metin açıklaması."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Görsel üretimi için istem. En fazla 10.000 karakter."
+      },
+      "recraft_controls": {
+        "name": "recraft_controls",
+        "tooltip": "Recraft Controls düğümüyle üretim üzerinde isteğe bağlı ek kontroller."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Düğümün tekrar çalıştırılıp çalıştırılmayacağını belirleyen tohum; tohuma bakılmaksızın gerçek sonuçlar deterministik değildir."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftV4TextToVectorNode": {
+    "description": "Recraft V4 veya V4 Pro modelleriyle SVG üretir.",
+    "display_name": "Recraft V4 Metinden Vektöre",
+    "inputs": {
+      "control_after_generate": {
+        "name": "üretimden sonra kontrol"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Üretim için kullanılacak model."
+      },
+      "model_size": {
+        "name": "boyut"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "Üretilecek görsel sayısı."
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Bir görselde istenmeyen ögelerin isteğe bağlı metin açıklaması."
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Görsel üretimi için istem. En fazla 10.000 karakter."
+      },
+      "recraft_controls": {
+        "name": "recraft_controls",
+        "tooltip": "Recraft Controls düğümüyle üretim üzerinde isteğe bağlı ek kontroller."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Düğümün tekrar çalıştırılıp çalıştırılmayacağını belirleyen tohum; tohuma bakılmaksızın gerçek sonuçlar deterministik değildir."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RecraftVectorizeImageNode": {
     "description": "Bir giriş görüntüsünden eşzamanlı olarak SVG oluşturur.",
     "display_name": "Recraft Görüntüyü Vektörleştir",
@@ -9062,6 +12484,23 @@
       }
     }
   },
+  "ReferenceTimbreAudio": {
+    "description": "Bu düğüm, tını için referans sesi ayarlar (ace step 1.5 için)",
+    "display_name": "ReferenceTimbreAudio",
+    "inputs": {
+      "conditioning": {
+        "name": "koşullandırma"
+      },
+      "latent": {
+        "name": "latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RegexExtract": {
     "display_name": "Regex Çıkar",
     "inputs": {
@@ -9181,6 +12620,11 @@
       "image": {
         "name": "görüntü"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "RepeatLatentBatch": {
@@ -9194,6 +12638,51 @@
       }
     }
   },
+  "ReplaceText": {
+    "display_name": "Metni Değiştir",
+    "inputs": {
+      "find": {
+        "name": "find",
+        "tooltip": "Bulunacak metin."
+      },
+      "replace": {
+        "name": "replace",
+        "tooltip": "Yerine konacak metin."
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "İşlenecek metin."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "texts",
+        "tooltip": "İşlenmiş metinler"
+      }
+    }
+  },
+  "ReplaceVideoLatentFrames": {
+    "display_name": "ReplaceVideoLatentFrames",
+    "inputs": {
+      "destination": {
+        "name": "destination",
+        "tooltip": "Karelerin değiştirileceği hedef latent."
+      },
+      "index": {
+        "name": "index",
+        "tooltip": "Kaynak latent karelerinin hedef latente yerleştirileceği başlangıç latent kare indeksi. Negatif değerler sondan sayılır."
+      },
+      "source": {
+        "name": "source",
+        "tooltip": "Hedef latente eklenecek kareleri sağlayan kaynak latent. Sağlanmazsa, hedef latent değişmeden döndürülür."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RescaleCFG": {
     "display_name": "CFG'yiYenidenÖlçekle",
     "inputs": {
@@ -9223,6 +12712,128 @@
       "target_width": {
         "name": "hedef_genişlik"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ResizeImageMaskNode": {
+    "description": "Bir görüntüyü veya maskeyi çeşitli ölçeklendirme yöntemleriyle yeniden boyutlandırın.",
+    "display_name": "Görsel/Maske Yeniden Boyutlandır",
+    "inputs": {
+      "input": {
+        "name": "input"
+      },
+      "resize_type": {
+        "name": "resize_type",
+        "tooltip": "Yeniden boyutlandırma yöntemini seçin: tam boyutlar, ölçek faktörü, başka bir görüntüyle eşleştirme vb."
+      },
+      "resize_type_crop": {
+        "name": "kırp"
+      },
+      "resize_type_height": {
+        "name": "yükseklik"
+      },
+      "resize_type_width": {
+        "name": "genişlik"
+      },
+      "scale_method": {
+        "name": "scale_method",
+        "tooltip": "Enterpolasyon algoritması. 'area' küçültme için en iyisidir, 'lanczos' büyütme için uygundur, 'nearest-exact' piksel sanatı için idealdir."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "resized",
+        "tooltip": null
+      }
+    }
+  },
+  "ResizeImagesByLongerEdge": {
+    "display_name": "Görüntüleri Uzun Kenara Göre Yeniden Boyutlandır",
+    "inputs": {
+      "images": {
+        "name": "görüntüler",
+        "tooltip": "İşlenecek görüntü."
+      },
+      "longer_edge": {
+        "name": "uzun_kenar",
+        "tooltip": "Uzun kenar için hedef uzunluk."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "görüntüler",
+        "tooltip": "İşlenmiş görüntüler"
+      }
+    }
+  },
+  "ResizeImagesByShorterEdge": {
+    "display_name": "Görüntüleri Kısa Kenara Göre Yeniden Boyutlandır",
+    "inputs": {
+      "images": {
+        "name": "görüntüler",
+        "tooltip": "İşlenecek görüntü."
+      },
+      "shorter_edge": {
+        "name": "kısa_kenar",
+        "tooltip": "Kısa kenar için hedef uzunluk."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "görüntüler",
+        "tooltip": "İşlenmiş görüntüler"
+      }
+    }
+  },
+  "ResolutionBucket": {
+    "display_name": "Çözünürlük Kovası",
+    "inputs": {
+      "conditioning": {
+        "name": "koşullandırma",
+        "tooltip": "Koşullandırma listelerinin listesi (latentler ile aynı uzunlukta olmalı)."
+      },
+      "latents": {
+        "name": "latentler",
+        "tooltip": "Çözünürlüğe göre kovalanacak latent sözlüklerinin listesi."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latentler",
+        "tooltip": "Her çözünürlük kovası için birer toplu latent sözlükleri listesi."
+      },
+      "1": {
+        "name": "koşullandırma",
+        "tooltip": "Her çözünürlük kovası için birer koşul listesi."
+      }
+    }
+  },
+  "ResolutionSelector": {
+    "description": "En-boy oranı ve megapiksel hedefinden genişlik ve yükseklik hesaplayın. Boş Latent Görüntü boyutlarını ayarlamak için kullanışlıdır.",
+    "display_name": "Çözünürlük Seçici",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "en_boy_orani",
+        "tooltip": "Çıktı boyutları için en-boy oranı."
+      },
+      "megapixels": {
+        "name": "megapiksel",
+        "tooltip": "Hedef toplam megapiksel. 1,0 MP ≈ 1024×1024 (kare için)."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "genislik",
+        "tooltip": "Piksel cinsinden hesaplanan genişlik (8'in katı)."
+      },
+      "1": {
+        "name": "yukseklik",
+        "tooltip": "Piksel cinsinden hesaplanan yükseklik (8'in katı)."
+      }
     }
   },
   "Rodin3D_Detail": {
@@ -9244,7 +12855,11 @@
     },
     "outputs": {
       "0": {
-        "name": "3D Model Yolu",
+        "name": "3B Model Yolu",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -9271,7 +12886,11 @@
     },
     "outputs": {
       "0": {
-        "name": "3D Model Yolu",
+        "name": "3B Model Yolu",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -9295,7 +12914,11 @@
     },
     "outputs": {
       "0": {
-        "name": "3D Model Yolu",
+        "name": "3B Model Yolu",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -9313,7 +12936,11 @@
     },
     "outputs": {
       "0": {
-        "name": "3D Model Yolu",
+        "name": "3B Model Yolu",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -9337,7 +12964,11 @@
     },
     "outputs": {
       "0": {
-        "name": "3D Model Yolu",
+        "name": "3B Model Yolu",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -9464,6 +13095,90 @@
       }
     }
   },
+  "SDPoseDrawKeypoints": {
+    "display_name": "SDPoseDrawKeypoints",
+    "inputs": {
+      "draw_body": {
+        "name": "gövde_çiz"
+      },
+      "draw_face": {
+        "name": "yüzü_çiz"
+      },
+      "draw_feet": {
+        "name": "ayakları_çiz"
+      },
+      "draw_hands": {
+        "name": "elleri_çiz"
+      },
+      "face_point_size": {
+        "name": "yüz_nokta_boyutu"
+      },
+      "keypoints": {
+        "name": "anahtar_noktalar"
+      },
+      "score_threshold": {
+        "name": "puan_eşiği"
+      },
+      "stick_width": {
+        "name": "çizgi_genişliği"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SDPoseFaceBBoxes": {
+    "display_name": "SDPoseFaceBBoxes",
+    "inputs": {
+      "force_square": {
+        "name": "kare_zorla",
+        "tooltip": "Kırpma bölgesinin her zaman kare olması için kısa olan kutu eksenini genişlet."
+      },
+      "keypoints": {
+        "name": "anahtar_noktalar"
+      },
+      "scale": {
+        "name": "ölçek",
+        "tooltip": "Her tespit edilen yüzün etrafındaki sınırlayıcı kutu alanı için çarpan."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "sınırlayıcı_kutular",
+        "tooltip": "Her kare için yüz sınırlayıcı kutuları, SDPoseKeypointExtractor bboxes girişiyle uyumlu."
+      }
+    }
+  },
+  "SDPoseKeypointExtractor": {
+    "description": "SDPose modeli ile görüntülerden poz anahtar noktalarını çıkar: https://huggingface.co/Comfy-Org/SDPose/tree/main/checkpoints",
+    "display_name": "SDPoseKeypointExtractor",
+    "inputs": {
+      "batch_size": {
+        "name": "toplu_boyut"
+      },
+      "bboxes": {
+        "name": "sınırlayıcı_kutular",
+        "tooltip": "Daha doğru tespitler için isteğe bağlı sınırlayıcı kutular. Çoklu kişi tespiti için gereklidir."
+      },
+      "image": {
+        "name": "görüntü"
+      },
+      "model": {
+        "name": "model"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "anahtar_noktalar",
+        "tooltip": "OpenPose çerçeve formatında anahtar noktalar (canvas_genişliği, canvas_yüksekliği, kişiler)"
+      }
+    }
+  },
   "SDTurboScheduler": {
     "display_name": "SDTurboZamanlayıcı",
     "inputs": {
@@ -9476,6 +13191,11 @@
       "steps": {
         "name": "adımlar"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SD_4XUpscale_Conditioning": {
@@ -9631,10 +13351,12 @@
     },
     "outputs": {
       "0": {
-        "name": "çıktı"
+        "name": "çıktı",
+        "tooltip": null
       },
       "1": {
-        "name": "gürültüsü_alınmış_çıktı"
+        "name": "gürültüsüz_çıktı",
+        "tooltip": null
       }
     }
   },
@@ -9659,10 +13381,12 @@
     },
     "outputs": {
       "0": {
-        "name": "çıktı"
+        "name": "çıktı",
+        "tooltip": null
       },
       "1": {
-        "name": "gürültüsü_alınmış_çıktı"
+        "name": "gürültüsüz_çıktı",
+        "tooltip": null
       }
     }
   },
@@ -9699,6 +13423,11 @@
       "s_noise": {
         "name": "s_gürültü"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_2M_SDE": {
@@ -9716,6 +13445,11 @@
       "solver_type": {
         "name": "çözücü_türü"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_2S_Ancestral": {
@@ -9727,6 +13461,11 @@
       "s_noise": {
         "name": "s_gürültü"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_3M_SDE": {
@@ -9741,6 +13480,11 @@
       "s_noise": {
         "name": "s_gürültü"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_SDE": {
@@ -9758,6 +13502,11 @@
       "s_noise": {
         "name": "s_gürültü"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerER_SDE": {
@@ -9776,6 +13525,11 @@
       "solver_type": {
         "name": "çözücü_tipi"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerEulerAncestral": {
@@ -9787,6 +13541,11 @@
       "s_noise": {
         "name": "s_gürültü"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerEulerAncestralCFGPP": {
@@ -9798,6 +13557,11 @@
       "s_noise": {
         "name": "s_gürültü"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerEulerCFGpp": {
@@ -9838,6 +13602,11 @@
       "order": {
         "name": "sıra"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerSASolver": {
@@ -9870,6 +13639,37 @@
       "use_pece": {
         "name": "pece_kullan"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerSEEDS2": {
+    "description": "Bu örnekleyici düğümü birden fazla örnekleyiciyi temsil edebilir:\n\nseeds_2\n- varsayılan ayar\n\nexp_heun_2_x0\n- solver_type=phi_2, r=1.0, eta=0.0\n\nexp_heun_2_x0_sde\n- solver_type=phi_2, r=1.0, eta=1.0, s_noise=1.0",
+    "display_name": "SamplerSEEDS2",
+    "inputs": {
+      "eta": {
+        "name": "eta",
+        "tooltip": "Stokastik güç"
+      },
+      "r": {
+        "name": "r",
+        "tooltip": "Ara aşama için göreli adım boyutu (c2 düğümü)"
+      },
+      "s_noise": {
+        "name": "s_noise",
+        "tooltip": "SDE gürültü çarpanı"
+      },
+      "solver_type": {
+        "name": "solver_type"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplingPercentToSigma": {
@@ -9888,7 +13688,8 @@
     },
     "outputs": {
       "0": {
-        "name": "sigma_değeri"
+        "name": "sigma_değeri",
+        "tooltip": null
       }
     }
   },
@@ -9990,7 +13791,8 @@
         "name": "görüntü"
       },
       "mesh": {
-        "name": "ağ"
+        "name": "ağ",
+        "tooltip": "Kaydedilecek Mesh veya GLB dosyası"
       }
     }
   },
@@ -10008,6 +13810,44 @@
       }
     }
   },
+  "SaveImageDataSetToFolder": {
+    "display_name": "Görüntü Veri Setini Klasöre Kaydet",
+    "inputs": {
+      "filename_prefix": {
+        "name": "filename_prefix",
+        "tooltip": "Kaydedilen görüntü dosya adları için ön ek."
+      },
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "Görüntülerin kaydedileceği klasörün adı (çıktı dizini içinde)."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Kaydedilecek görüntülerin listesi."
+      }
+    }
+  },
+  "SaveImageTextDataSetToFolder": {
+    "display_name": "Görüntü ve Metin Veri Setini Klasöre Kaydet",
+    "inputs": {
+      "filename_prefix": {
+        "name": "filename_prefix",
+        "tooltip": "Kaydedilen görüntü dosya adları için ön ek."
+      },
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "Görüntülerin kaydedileceği klasörün adı (çıktı dizini içinde)."
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Kaydedilecek görüntülerin listesi."
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "Kaydedilecek metin başlıklarının listesi."
+      }
+    }
+  },
   "SaveImageWebsocket": {
     "display_name": "GörüntüyüWebsocketKaydet",
     "inputs": {
@@ -10027,6 +13867,23 @@
       }
     }
   },
+  "SaveLoRA": {
+    "display_name": "LoRA Ağırlıklarını Kaydet",
+    "inputs": {
+      "lora": {
+        "name": "lora",
+        "tooltip": "Kaydedilecek LoRA modeli. LoRA katmanlarıyla modeli kullanmayın."
+      },
+      "prefix": {
+        "name": "prefix",
+        "tooltip": "Kaydedilen LoRA dosyası için kullanılacak ön ek."
+      },
+      "steps": {
+        "name": "steps",
+        "tooltip": "İsteğe bağlı: LoRA'nın eğitildiği adım sayısı, kaydedilen dosyanın adında kullanılır."
+      }
+    }
+  },
   "SaveSVGNode": {
     "description": "SVG dosyalarını diske kaydet.",
     "display_name": "SVGDüğümünüKaydet",
@@ -10040,6 +13897,27 @@
       }
     }
   },
+  "SaveTrainingDataset": {
+    "display_name": "Eğitim Veri Setini Kaydet",
+    "inputs": {
+      "conditioning": {
+        "name": "conditioning",
+        "tooltip": "MakeTrainingDataset'ten alınan koşullandırma listelerinin listesi."
+      },
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "Veri setinin kaydedileceği klasörün adı (çıktı dizini içinde)."
+      },
+      "latents": {
+        "name": "latents",
+        "tooltip": "MakeTrainingDataset'ten alınan latent sözlüklerinin listesi."
+      },
+      "shard_size": {
+        "name": "shard_size",
+        "tooltip": "Her bir parça dosyası başına örnek sayısı."
+      }
+    }
+  },
   "SaveVideo": {
     "description": "Giriş görüntülerini ComfyUI çıktı dizininize kaydeder.",
     "display_name": "Videoyu Kaydet",
@@ -10160,6 +14038,11 @@
       "sigmas": {
         "name": "sigmalar"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SetHookKeyframes": {
@@ -10200,6 +14083,58 @@
       }
     }
   },
+  "ShuffleDataset": {
+    "display_name": "Görüntü Veri Setini Karıştır",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "İşlenecek görüntülerin listesi."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Rastgele tohum."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "İşlenmiş görüntüler"
+      }
+    }
+  },
+  "ShuffleImageTextDataset": {
+    "display_name": "Görüntü-Metin Veri Setini Karıştır",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "Karıştırılacak görüntülerin listesi."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Rastgele tohum."
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "Karıştırılacak metinlerin listesi."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "Karıştırılmış görüntüler"
+      },
+      "1": {
+        "name": "texts",
+        "tooltip": "Karıştırılmış metinler"
+      }
+    }
+  },
   "SkipLayerGuidanceDiT": {
     "description": "Her DiT modelinde kullanılabilecek SkipLayerGuidance düğümünün genel bir sürümü.",
     "display_name": "KatmanAtlamaRehberliğiDiT",
@@ -10296,6 +14231,11 @@
       "width": {
         "name": "genişlik"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SplitAudioChannels": {
@@ -10308,10 +14248,35 @@
     },
     "outputs": {
       "0": {
-        "name": "sol"
+        "name": "sol",
+        "tooltip": null
       },
       "1": {
-        "name": "sağ"
+        "name": "sağ",
+        "tooltip": null
+      }
+    }
+  },
+  "SplitImageToTileList": {
+    "description": "Bir görüntüyü, belirtilen örtüşme ile toplu bir döşeme listesine böler.",
+    "display_name": "Görüntüyü Döşeme Listesine Böl",
+    "inputs": {
+      "image": {
+        "name": "image"
+      },
+      "overlap": {
+        "name": "overlap"
+      },
+      "tile_height": {
+        "name": "tile_height"
+      },
+      "tile_width": {
+        "name": "tile_width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
       }
     }
   },
@@ -10343,10 +14308,12 @@
     },
     "outputs": {
       "0": {
-        "name": "yüksek_sigmalar"
+        "name": "yüksek_sigma",
+        "tooltip": null
       },
       "1": {
-        "name": "düşük_sigmalar"
+        "name": "düşük_sigma",
+        "tooltip": null
       }
     }
   },
@@ -10362,10 +14329,12 @@
     },
     "outputs": {
       "0": {
-        "name": "yüksek_sigmalar"
+        "name": "yüksek_sigma",
+        "tooltip": null
       },
       "1": {
-        "name": "düşük_sigmalar"
+        "name": "düşük_sigma",
+        "tooltip": null
       }
     }
   },
@@ -10969,6 +14938,21 @@
       }
     }
   },
+  "StripWhitespace": {
+    "display_name": "Boşlukları Kaldır",
+    "inputs": {
+      "texts": {
+        "name": "metinler",
+        "tooltip": "İşlenecek metin."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "metinler",
+        "tooltip": "İşlenmiş metinler"
+      }
+    }
+  },
   "StyleModelApply": {
     "display_name": "Stil Modeli Uygula",
     "inputs": {
@@ -11054,6 +15038,123 @@
       }
     }
   },
+  "Tencent3DPartNode": {
+    "description": "Model yapısına göre otomatik olarak bileşen tanımlama ve oluşturma işlemlerini gerçekleştirir.",
+    "display_name": "Hunyuan3D: 3D Parça",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "model_3d": {
+        "name": "model_3d",
+        "tooltip": "FBX formatında 3D model. Model 30000'den az yüzeye sahip olmalıdır."
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed, düğümün tekrar çalıştırılıp çalıştırılmayacağını kontrol eder; seed ne olursa olsun sonuçlar deterministik değildir."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "TencentImageToModelNode": {
+    "display_name": "Hunyuan3D: Görsel(ler)den Modele (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturma sonrası kontrol"
+      },
+      "face_count": {
+        "name": "yüz sayısı"
+      },
+      "generate_type": {
+        "name": "oluşturma türü"
+      },
+      "generate_type_pbr": {
+        "name": "pbr"
+      },
+      "image": {
+        "name": "görsel"
+      },
+      "image_back": {
+        "name": "arka görsel"
+      },
+      "image_left": {
+        "name": "sol görsel"
+      },
+      "image_right": {
+        "name": "sağ görsel"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "`3.1` modeli için LowPoly seçeneği kullanılamaz."
+      },
+      "seed": {
+        "name": "tohum",
+        "tooltip": "Tohum, düğümün tekrar çalıştırılıp çalıştırılmayacağını kontrol eder; sonuçlar tohumdan bağımsız olarak deterministik değildir."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_dosyası",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "OBJ",
+        "tooltip": null
+      }
+    }
+  },
+  "TencentTextToModelNode": {
+    "display_name": "Hunyuan3D: Metinden Modele (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturma sonrası kontrol"
+      },
+      "face_count": {
+        "name": "yüz sayısı"
+      },
+      "generate_type": {
+        "name": "oluşturma türü"
+      },
+      "generate_type_pbr": {
+        "name": "pbr"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "`3.1` modeli için LowPoly seçeneği kullanılamaz."
+      },
+      "prompt": {
+        "name": "istem",
+        "tooltip": "En fazla 1024 karakter desteklenir."
+      },
+      "seed": {
+        "name": "tohum",
+        "tooltip": "Tohum, düğümün tekrar çalıştırılıp çalıştırılmayacağını kontrol eder; sonuçlar tohumdan bağımsız olarak deterministik değildir."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model_dosyası",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "OBJ",
+        "tooltip": null
+      }
+    }
+  },
   "TextEncodeAceStepAudio": {
     "display_name": "TextEncodeAceStepAudio",
     "inputs": {
@@ -11076,6 +15177,65 @@
       }
     }
   },
+  "TextEncodeAceStepAudio1_5": {
+    "display_name": "TextEncodeAceStepAudio1.5",
+    "inputs": {
+      "bpm": {
+        "name": "bpm"
+      },
+      "cfg_scale": {
+        "name": "cfg ölçeği"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol"
+      },
+      "duration": {
+        "name": "süre"
+      },
+      "generate_audio_codes": {
+        "name": "ses kodlarını üret",
+        "tooltip": "Ses kodlarını üreten LLM'i etkinleştir. Bu işlem yavaş olabilir ancak üretilen sesin kalitesini artırır. Eğer modele bir ses referansı veriyorsanız bunu kapatın."
+      },
+      "keyscale": {
+        "name": "ton anahtarı"
+      },
+      "language": {
+        "name": "dil"
+      },
+      "lyrics": {
+        "name": "şarkı sözleri"
+      },
+      "min_p": {
+        "name": "min_p"
+      },
+      "seed": {
+        "name": "tohum"
+      },
+      "tags": {
+        "name": "etiketler"
+      },
+      "temperature": {
+        "name": "sıcaklık"
+      },
+      "timesignature": {
+        "name": "zaman imzası"
+      },
+      "top_k": {
+        "name": "top_k"
+      },
+      "top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TextEncodeHunyuanVideo_ImageToVideo": {
     "display_name": "MetinKodlamaHunyuanVideo_GörüntüdenVideoya",
     "inputs": {
@@ -11149,6 +15309,158 @@
       }
     }
   },
+  "TextEncodeZImageOmni": {
+    "display_name": "TextEncodeZImageOmni",
+    "inputs": {
+      "auto_resize_images": {
+        "name": "görüntüleri_otomatik_yeniden_boyutlandır"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "image1": {
+        "name": "görüntü1"
+      },
+      "image2": {
+        "name": "görüntü2"
+      },
+      "image3": {
+        "name": "görüntü3"
+      },
+      "image_encoder": {
+        "name": "görüntü_kodlayıcı"
+      },
+      "prompt": {
+        "name": "istem"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TextGenerate": {
+    "display_name": "TextGenerate",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image": {
+        "name": "görsel"
+      },
+      "max_length": {
+        "name": "maks_uzunluk"
+      },
+      "prompt": {
+        "name": "istem"
+      },
+      "sampling_mode": {
+        "name": "örnekleme_modu"
+      },
+      "sampling_mode_min_p": {
+        "name": "min_p"
+      },
+      "sampling_mode_repetition_penalty": {
+        "name": "tekrar_cezası"
+      },
+      "sampling_mode_seed": {
+        "name": "tohum"
+      },
+      "sampling_mode_temperature": {
+        "name": "sıcaklık"
+      },
+      "sampling_mode_top_k": {
+        "name": "top_k"
+      },
+      "sampling_mode_top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "oluşturulan_metin",
+        "tooltip": null
+      }
+    }
+  },
+  "TextGenerateLTX2Prompt": {
+    "display_name": "TextGenerateLTX2Prompt",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image": {
+        "name": "görsel"
+      },
+      "max_length": {
+        "name": "maksimum_uzunluk"
+      },
+      "prompt": {
+        "name": "istem"
+      },
+      "sampling_mode": {
+        "name": "örnekleme_modu"
+      },
+      "sampling_mode_min_p": {
+        "name": "min_p"
+      },
+      "sampling_mode_repetition_penalty": {
+        "name": "tekrar_cezası"
+      },
+      "sampling_mode_seed": {
+        "name": "tohum"
+      },
+      "sampling_mode_temperature": {
+        "name": "sıcaklık"
+      },
+      "sampling_mode_top_k": {
+        "name": "top_k"
+      },
+      "sampling_mode_top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "üretilen_metin",
+        "tooltip": null
+      }
+    }
+  },
+  "TextToLowercase": {
+    "display_name": "Metni Küçük Harfe Çevir",
+    "inputs": {
+      "texts": {
+        "name": "metinler",
+        "tooltip": "İşlenecek metin."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "metinler",
+        "tooltip": "İşlenmiş metinler"
+      }
+    }
+  },
+  "TextToUppercase": {
+    "display_name": "Metni Büyük Harfe Çevir",
+    "inputs": {
+      "texts": {
+        "name": "metinler",
+        "tooltip": "İşlenecek metin."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "metinler",
+        "tooltip": "İşlenmiş metinler"
+      }
+    }
+  },
   "ThresholdMask": {
     "display_name": "EşikMaskesi",
     "inputs": {
@@ -11158,6 +15470,11 @@
       "value": {
         "name": "değer"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "TomePatchModel": {
@@ -11176,6 +15493,118 @@
       }
     }
   },
+  "TopazImageEnhance": {
+    "description": "Endüstri standardı büyütme ve görüntü iyileştirme.",
+    "display_name": "Topaz Görüntü İyileştirme",
+    "inputs": {
+      "color_preservation": {
+        "name": "renk_koruma",
+        "tooltip": "Orijinal renkleri koru."
+      },
+      "creativity": {
+        "name": "yaratıcılık"
+      },
+      "crop_to_fill": {
+        "name": "doldurmak_için_kırp",
+        "tooltip": "Varsayılan olarak, çıktı en-boy oranı farklıysa görüntü letterbox yapılır. Çıktı boyutlarını doldurmak için görüntüyü kırpmak için etkinleştirin."
+      },
+      "face_enhancement": {
+        "name": "yüz_iyileştirme",
+        "tooltip": "İşleme sırasında (varsa) yüzleri iyileştir."
+      },
+      "face_enhancement_creativity": {
+        "name": "yüz_iyileştirme_yaratıcılığı",
+        "tooltip": "Yüz iyileştirme için yaratıcılık seviyesini ayarla."
+      },
+      "face_enhancement_strength": {
+        "name": "yüz_iyileştirme_gücü",
+        "tooltip": "İyileştirilen yüzlerin arka plana göre ne kadar keskin olacağını kontrol eder."
+      },
+      "face_preservation": {
+        "name": "yüz_koruma",
+        "tooltip": "Konu yüzlerinin kimliğini koru."
+      },
+      "image": {
+        "name": "görüntü"
+      },
+      "model": {
+        "name": "model"
+      },
+      "output_height": {
+        "name": "çıktı_yüksekliği",
+        "tooltip": "Sıfır değeri, orijinal ile aynı yükseklikte veya çıktı genişliğinde çıktı alınacağı anlamına gelir."
+      },
+      "output_width": {
+        "name": "çıktı_genişliği",
+        "tooltip": "Sıfır değeri otomatik olarak hesaplanacağı anlamına gelir (genellikle orijinal boyut veya belirtilmişse çıktı_yüksekliği olur)."
+      },
+      "prompt": {
+        "name": "istem",
+        "tooltip": "Yaratıcı büyütme rehberliği için isteğe bağlı metin istemi."
+      },
+      "subject_detection": {
+        "name": "konu_tespiti"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TopazVideoEnhance": {
+    "description": "Güçlü ölçek büyütme ve iyileştirme teknolojisiyle videolara yeniden hayat verin.",
+    "display_name": "Topaz Video Enhance",
+    "inputs": {
+      "dynamic_compression_level": {
+        "name": "dynamic_compression_level",
+        "tooltip": "CQP seviyesi."
+      },
+      "interpolation_duplicate": {
+        "name": "interpolation_duplicate",
+        "tooltip": "Girdideki yinelenen kareleri analiz edip kaldırır."
+      },
+      "interpolation_duplicate_threshold": {
+        "name": "interpolation_duplicate_threshold",
+        "tooltip": "Yinelenen kareler için algılama hassasiyeti."
+      },
+      "interpolation_enabled": {
+        "name": "interpolation_enabled"
+      },
+      "interpolation_frame_rate": {
+        "name": "interpolation_frame_rate",
+        "tooltip": "Çıktı kare hızı."
+      },
+      "interpolation_model": {
+        "name": "interpolation_model"
+      },
+      "interpolation_slowmo": {
+        "name": "interpolation_slowmo",
+        "tooltip": "Girdi videoya uygulanan ağır çekim faktörü. Örneğin, 2 çıktıyı iki kat yavaşlatır ve süresini iki katına çıkarır."
+      },
+      "upscaler_creativity": {
+        "name": "upscaler_creativity",
+        "tooltip": "Yaratıcılık seviyesi (yalnızca Starlight (Astra) Creative için geçerlidir)."
+      },
+      "upscaler_enabled": {
+        "name": "upscaler_enabled"
+      },
+      "upscaler_model": {
+        "name": "upscaler_model"
+      },
+      "upscaler_resolution": {
+        "name": "upscaler_resolution"
+      },
+      "video": {
+        "name": "video"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TorchCompileModel": {
     "display_name": "Torch Model Derleme",
     "inputs": {
@@ -11203,6 +15632,18 @@
         "name": "toplu_iş_boyutu",
         "tooltip": "Eğitim için kullanılacak toplu iş boyutu."
       },
+      "bucket_mode": {
+        "name": "bucket_mode",
+        "tooltip": "Çözünürlük kova modunu etkinleştir. Etkinleştirildiğinde, ResolutionBucket düğümünden önceden kovalanmış latentler beklenir."
+      },
+      "bypass_mode": {
+        "name": "bypass_mode",
+        "tooltip": "Eğitim için bypass modunu etkinleştir. Etkinleştirildiğinde, adapter'lar ağırlık değişikliği yerine forward hook'lar ile uygulanır. Ağırlıkların doğrudan değiştirilemediği quantized modeller için kullanışlıdır."
+      },
+      "checkpoint_depth": {
+        "name": "checkpoint_depth",
+        "tooltip": "Gradyan kontrol noktası derinlik seviyesi."
+      },
       "control_after_generate": {
         "name": "oluşturduktan sonra kontrol et"
       },
@@ -11238,6 +15679,10 @@
         "name": "model",
         "tooltip": "LoRA'nın eğitileceği model."
       },
+      "offloading": {
+        "name": "offloading",
+        "tooltip": "Gradyan kontrol noktası derinlik seviyesi."
+      },
       "optimizer": {
         "name": "optimize_edici",
         "tooltip": "Eğitim için kullanılacak optimize edici."
@@ -11265,16 +15710,16 @@
     },
     "outputs": {
       "0": {
-        "name": "lora_ile_model"
+        "name": "lora",
+        "tooltip": "LoRA uygulanmış model"
       },
       "1": {
-        "name": "lora"
+        "name": "kayıp_haritası",
+        "tooltip": "LoRA ağırlıkları"
       },
       "2": {
-        "name": "kayıp"
-      },
-      "3": {
-        "name": "adımlar"
+        "name": "adımlar",
+        "tooltip": "Kayıp geçmişi"
       }
     }
   },
@@ -11293,6 +15738,11 @@
         "name": "başlangıç_indeksi",
         "tooltip": "Saniye cinsinden başlangıç zamanı, sondan saymak için negatif olabilir (saniyenin alt birimlerini destekler)."
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "TrimVideoLatent": {
@@ -11334,23 +15784,62 @@
   "TripoConversionNode": {
     "display_name": "Tripo: Modeli Dönüştür",
     "inputs": {
+      "animate_in_place": {
+        "name": "animate_in_place"
+      },
+      "bake": {
+        "name": "bake"
+      },
+      "export_orientation": {
+        "name": "export_orientation"
+      },
+      "export_vertex_colors": {
+        "name": "export_vertex_colors"
+      },
       "face_limit": {
         "name": "yüz_sınırı"
       },
+      "fbx_preset": {
+        "name": "fbx_preset"
+      },
+      "flatten_bottom": {
+        "name": "flatten_bottom"
+      },
+      "flatten_bottom_threshold": {
+        "name": "flatten_bottom_threshold"
+      },
+      "force_symmetry": {
+        "name": "force_symmetry"
+      },
       "format": {
         "name": "biçim"
       },
       "original_model_task_id": {
         "name": "orijinal_model_görev_id"
       },
+      "pack_uv": {
+        "name": "pack_uv"
+      },
+      "part_names": {
+        "name": "part_names"
+      },
+      "pivot_to_center_bottom": {
+        "name": "pivot_to_center_bottom"
+      },
       "quad": {
         "name": "dörtlü"
       },
+      "scale_factor": {
+        "name": "scale_factor"
+      },
       "texture_format": {
         "name": "doku_biçimi"
       },
       "texture_size": {
         "name": "doku_boyutu"
+      },
+      "with_animation": {
+        "name": "with_animation"
       }
     }
   },
@@ -11360,6 +15849,9 @@
       "face_limit": {
         "name": "yüz_sınırı"
       },
+      "geometry_quality": {
+        "name": "geometry_quality"
+      },
       "image": {
         "name": "görüntü"
       },
@@ -11401,7 +15893,11 @@
         "tooltip": null
       },
       "1": {
-        "name": "model görev_id",
+        "name": "model_görev_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11412,6 +15908,9 @@
       "face_limit": {
         "name": "yüz_sınırı"
       },
+      "geometry_quality": {
+        "name": "geometry_quality"
+      },
       "image": {
         "name": "görüntü"
       },
@@ -11459,7 +15958,11 @@
         "tooltip": null
       },
       "1": {
-        "name": "model görev_id",
+        "name": "model_görev_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11479,7 +15982,11 @@
         "tooltip": null
       },
       "1": {
-        "name": "model görev_id",
+        "name": "model_görev_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11496,11 +16003,15 @@
     },
     "outputs": {
       "0": {
-        "name": "model_dosyası",
+        "name": "retarget_görev_id",
         "tooltip": null
       },
       "1": {
-        "name": "yeniden_hedefleme görev_id",
+        "name": "yeniden hedefleme task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11518,7 +16029,11 @@
         "tooltip": null
       },
       "1": {
-        "name": "rigleme görev_id",
+        "name": "rig_görev_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11529,6 +16044,9 @@
       "face_limit": {
         "name": "yüz_sınırı"
       },
+      "geometry_quality": {
+        "name": "geometry_quality"
+      },
       "image_seed": {
         "name": "görüntü_tohumu"
       },
@@ -11569,7 +16087,11 @@
         "tooltip": null
       },
       "1": {
-        "name": "model görev_id",
+        "name": "model_görev_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11602,8 +16124,31 @@
         "tooltip": null
       },
       "1": {
-        "name": "model görev_id",
+        "name": "model_görev_id",
         "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "TruncateText": {
+    "display_name": "Metni Kısalt",
+    "inputs": {
+      "max_length": {
+        "name": "max_length",
+        "tooltip": "Maksimum metin uzunluğu."
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "İşlenecek metin."
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "texts",
+        "tooltip": "İşlenmiş metinler"
       }
     }
   },
@@ -11748,6 +16293,33 @@
       "vae": {
         "name": "vae"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VAEDecodeAudioTiled": {
+    "display_name": "VAE Sesini Çöz (Döşemeli)",
+    "inputs": {
+      "overlap": {
+        "name": "örtüşme"
+      },
+      "samples": {
+        "name": "örnekler"
+      },
+      "tile_size": {
+        "name": "döşeme boyutu"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VAEDecodeHunyuan3D": {
@@ -11765,6 +16337,11 @@
       "vae": {
         "name": "vae"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VAEDecodeTiled": {
@@ -11812,6 +16389,11 @@
       "vae": {
         "name": "vae"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VAEEncodeForInpaint": {
@@ -11890,6 +16472,63 @@
       "steps": {
         "name": "adımlar"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Veo3FirstLastFrameNode": {
+    "description": "Açıklama ve ilk ile son kareleri kullanarak video oluştur.",
+    "display_name": "Google Veo 3 İlk-Son-Kare'den Videoya",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "Çıktı videonun en-boy oranı"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration": {
+        "name": "duration",
+        "tooltip": "Çıktı videonun süresi (saniye cinsinden)"
+      },
+      "first_frame": {
+        "name": "first_frame",
+        "tooltip": "Başlangıç karesi"
+      },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "Video için ses oluştur."
+      },
+      "last_frame": {
+        "name": "last_frame",
+        "tooltip": "Bitiş karesi"
+      },
+      "model": {
+        "name": "model"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "Videoda kaçınılması gerekenleri yönlendiren negatif metin açıklaması"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Videonun metin açıklaması"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Video üretimi için tohum"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "Veo3VideoGenerationNode": {
@@ -11996,6 +16635,31 @@
       }
     }
   },
+  "Video Slice": {
+    "display_name": "Video Dilimle",
+    "inputs": {
+      "duration": {
+        "name": "süre",
+        "tooltip": "Süre (saniye cinsinden) veya sınırsız süre için 0"
+      },
+      "start_time": {
+        "name": "başlangıç zamanı",
+        "tooltip": "Başlangıç zamanı (saniye cinsinden)"
+      },
+      "strict_duration": {
+        "name": "kesin süre",
+        "tooltip": "Doğruysa, belirtilen süre mümkün değilse bir hata oluşur."
+      },
+      "video": {
+        "name": "video"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "VideoLinearCFGGuidance": {
     "display_name": "VideoDoğrusalCFGRehberliği",
     "inputs": {
@@ -12018,6 +16682,319 @@
       }
     }
   },
+  "Vidu2ImageToVideoNode": {
+    "description": "Bir görüntüden ve isteğe bağlı bir istemden video oluşturun.",
+    "display_name": "Vidu2 Görüntüden Videoya Üretim",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "duration": {
+        "name": "süre"
+      },
+      "image": {
+        "name": "görüntü",
+        "tooltip": "Oluşturulan videonun başlangıç karesi olarak kullanılacak bir görüntü."
+      },
+      "model": {
+        "name": "model"
+      },
+      "movement_amplitude": {
+        "name": "hareket_genliği",
+        "tooltip": "Karedeki nesnelerin hareket genliği."
+      },
+      "prompt": {
+        "name": "istem",
+        "tooltip": "Video üretimi için isteğe bağlı metin istemi (en fazla 2000 karakter)."
+      },
+      "resolution": {
+        "name": "çözünürlük"
+      },
+      "seed": {
+        "name": "tohum"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2ReferenceVideoNode": {
+    "description": "Birden fazla referans görüntü ve bir istemden video oluşturun.",
+    "display_name": "Vidu2 Referans ile Videoya Üretim",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "en-boy_oranı"
+      },
+      "audio": {
+        "name": "ses",
+        "tooltip": "Etkinleştirildiğinde, video isteme göre oluşturulan konuşma ve arka plan müziği içerecektir."
+      },
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "duration": {
+        "name": "süre"
+      },
+      "model": {
+        "name": "model"
+      },
+      "movement_amplitude": {
+        "name": "hareket_genliği",
+        "tooltip": "Karedeki nesnelerin hareket genliği."
+      },
+      "prompt": {
+        "name": "istem",
+        "tooltip": "Etkinleştirildiğinde, video isteme göre oluşturulan konuşma ve arka plan müziği içerecektir."
+      },
+      "resolution": {
+        "name": "çözünürlük"
+      },
+      "seed": {
+        "name": "tohum"
+      },
+      "subjects": {
+        "name": "konular",
+        "tooltip": "Her konu için en fazla 3 referans görüntü sağlayın (tüm konular için toplam 7 görüntü). İstemlerde @subject{subject_id} ile referans verin."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2StartEndToVideoNode": {
+    "description": "Bir başlangıç karesi, bir bitiş karesi ve bir komut istemiyle video oluşturun.",
+    "display_name": "Vidu2 Başlangıç/Bitiş Kareden Videoya Üretim",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "duration": {
+        "name": "süre"
+      },
+      "end_frame": {
+        "name": "bitiş_kare"
+      },
+      "first_frame": {
+        "name": "ilk_kare"
+      },
+      "model": {
+        "name": "model"
+      },
+      "movement_amplitude": {
+        "name": "hareket_genliği",
+        "tooltip": "Karedeki nesnelerin hareket genliği."
+      },
+      "prompt": {
+        "name": "komut_istemi",
+        "tooltip": "Komut istemi açıklaması (en fazla 2000 karakter)."
+      },
+      "resolution": {
+        "name": "çözünürlük"
+      },
+      "seed": {
+        "name": "tohum"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2TextToVideoNode": {
+    "description": "Bir metin komut isteminden video oluşturun",
+    "display_name": "Vidu2 Metinden Videoya Üretim",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "en-boy_oranı"
+      },
+      "background_music": {
+        "name": "arka_plan_müziği",
+        "tooltip": "Oluşturulan videoya arka plan müziği eklenip eklenmeyeceği."
+      },
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "duration": {
+        "name": "süre"
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "komut_istemi",
+        "tooltip": "Video üretimi için metinsel açıklama, maksimum uzunluk 2000 karakter."
+      },
+      "resolution": {
+        "name": "çözünürlük"
+      },
+      "seed": {
+        "name": "tohum"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3ImageToVideoNode": {
+    "description": "Bir görüntüden ve isteğe bağlı bir istemden video oluşturun.",
+    "display_name": "Vidu Q3 Görüntüden Videoya Üretim",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "Oluşturulan videonun başlangıç karesi olarak kullanılacak bir görüntü."
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Video üretimi için kullanılacak model."
+      },
+      "model_audio": {
+        "name": "ses"
+      },
+      "model_duration": {
+        "name": "süre"
+      },
+      "model_resolution": {
+        "name": "çözünürlük"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Video üretimi için isteğe bağlı metin istemi (en fazla 2000 karakter)."
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3StartEndToVideoNode": {
+    "description": "Bir başlangıç karesi, bir bitiş karesi ve bir komut istemi ile video oluşturun.",
+    "display_name": "Vidu Q3 Başlangıç/Bitiş Kareden Videoya Oluşturma",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "end_frame": {
+        "name": "bitiş karesi"
+      },
+      "first_frame": {
+        "name": "ilk kare"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Video oluşturmak için kullanılacak model."
+      },
+      "model_audio": {
+        "name": "ses"
+      },
+      "model_duration": {
+        "name": "süre"
+      },
+      "model_resolution": {
+        "name": "çözünürlük"
+      },
+      "prompt": {
+        "name": "komut istemi",
+        "tooltip": "Komut istemi açıklaması (en fazla 2000 karakter)."
+      },
+      "seed": {
+        "name": "tohum"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3TextToVideoNode": {
+    "description": "Bir metin isteminden video oluşturun.",
+    "display_name": "Vidu Q3 Metinden Videoya Üretim",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Video üretimi için kullanılacak model."
+      },
+      "model_aspect_ratio": {
+        "name": "en-boy oranı"
+      },
+      "model_audio": {
+        "name": "ses"
+      },
+      "model_duration": {
+        "name": "süre"
+      },
+      "model_resolution": {
+        "name": "çözünürlük"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Video üretimi için metinsel açıklama, maksimum 2000 karakter."
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ViduExtendVideoNode": {
+    "description": "Mevcut bir videoyu ek kareler üreterek uzatın.",
+    "display_name": "Vidu Video Uzatma",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "end_frame": {
+        "name": "bitiş karesi"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "Video uzatma için kullanılacak model."
+      },
+      "model_duration": {
+        "name": "süre"
+      },
+      "model_resolution": {
+        "name": "çözünürlük"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "Uzatılan video için isteğe bağlı metin istemi (en fazla 2000 karakter)."
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "Uzatılacak kaynak video."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ViduImageToVideoNode": {
     "description": "Görsel ve isteğe bağlı prompt'tan video oluştur",
     "display_name": "Vidu Görselden Video Oluşturma",
@@ -12060,6 +17037,49 @@
       }
     }
   },
+  "ViduMultiFrameVideoNode": {
+    "description": "Birden fazla ana kare geçişiyle video oluşturun.",
+    "display_name": "Vidu Çok Kareli Video Üretimi",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol et"
+      },
+      "frames": {
+        "name": "kareler",
+        "tooltip": "Ana kare geçiş sayısı (2-9)."
+      },
+      "frames_duration1": {
+        "name": "süre1"
+      },
+      "frames_duration2": {
+        "name": "süre2"
+      },
+      "frames_prompt1": {
+        "name": "prompt1"
+      },
+      "frames_prompt2": {
+        "name": "prompt2"
+      },
+      "model": {
+        "name": "model"
+      },
+      "resolution": {
+        "name": "çözünürlük"
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "start_image": {
+        "name": "başlangıç_görüntüsü",
+        "tooltip": "Başlangıç karesi görüntüsü. En-boy oranı 1:4 ile 4:1 arasında olmalıdır."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ViduReferenceVideoNode": {
     "description": "Birden fazla görsel ve prompt'tan video oluştur",
     "display_name": "Vidu Referanstan Video Oluşturma",
@@ -12206,6 +17226,11 @@
       "voxel": {
         "name": "voksel"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VoxelToMeshBasic": {
@@ -12217,6 +17242,11 @@
       "voxel": {
         "name": "voksel"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "Wan22FunControlToVideo": {
@@ -12496,6 +17526,10 @@
         "name": "bağlam_adımı",
         "tooltip": "Bağlam penceresinin adım aralığı; sadece düzenli çizelgeler için geçerlidir."
       },
+      "freenoise": {
+        "name": "freenoise",
+        "tooltip": "FreeNoise gürültü karıştırmayı uygulayıp uygulamama, pencere birleştirmesini iyileştirir."
+      },
       "fuse_method": {
         "name": "birleştirme_yöntemi",
         "tooltip": "Bağlam pencerelerini birleştirmek için kullanılacak yöntem."
@@ -12836,6 +17870,10 @@
         "name": "tohum",
         "tooltip": "Oluşturma için kullanılacak tohum değeri."
       },
+      "shot_type": {
+        "name": "shot_type",
+        "tooltip": "Oluşturulan video için çekim türünü belirtir; yani, videonun tek bir sürekli çekim mi yoksa kesmeli birden fazla çekim mi olacağını belirler. Bu parametre yalnızca prompt_extend True olduğunda geçerlidir."
+      },
       "watermark": {
         "name": "filigran",
         "tooltip": "Sonuca \"AI tarafından oluşturulmuştur\" filigranı eklenip eklenmeyeceği."
@@ -12847,6 +17885,196 @@
       }
     }
   },
+  "WanInfiniteTalkToVideo": {
+    "display_name": "WanInfiniteTalkToVideo",
+    "inputs": {
+      "audio_encoder_output_1": {
+        "name": "audio_encoder_output_1"
+      },
+      "audio_scale": {
+        "name": "audio_scale"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "yükseklik"
+      },
+      "length": {
+        "name": "uzunluk"
+      },
+      "mode": {
+        "name": "mod"
+      },
+      "model": {
+        "name": "model"
+      },
+      "model_patch": {
+        "name": "model_patch"
+      },
+      "motion_frame_count": {
+        "name": "hareket_kare_sayısı",
+        "tooltip": "Hareket bağlamı olarak kullanılacak önceki karelerin sayısı."
+      },
+      "negative": {
+        "name": "negatif"
+      },
+      "positive": {
+        "name": "pozitif"
+      },
+      "previous_frames": {
+        "name": "önceki_kareler"
+      },
+      "start_image": {
+        "name": "başlangıç_görseli"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "genişlik"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "model",
+        "tooltip": null
+      },
+      "1": {
+        "name": "pozitif",
+        "tooltip": null
+      },
+      "2": {
+        "name": "negatif",
+        "tooltip": null
+      },
+      "3": {
+        "name": "latent",
+        "tooltip": null
+      },
+      "4": {
+        "name": "kırpılmış_görsel",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveConcatTrack": {
+    "display_name": "WanMoveConcatTrack",
+    "inputs": {
+      "tracks_1": {
+        "name": "tracks_1"
+      },
+      "tracks_2": {
+        "name": "tracks_2"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveTrackToVideo": {
+    "display_name": "WanMoveTrackToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "toplu_boyutu"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "yükseklik"
+      },
+      "length": {
+        "name": "uzunluk"
+      },
+      "negative": {
+        "name": "negatif"
+      },
+      "positive": {
+        "name": "pozitif"
+      },
+      "start_image": {
+        "name": "başlangıç_görseli"
+      },
+      "strength": {
+        "name": "güç",
+        "tooltip": "Parça koşullandırmasının gücü."
+      },
+      "tracks": {
+        "name": "izler"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "genişlik"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "pozitif",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negatif",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveTracksFromCoords": {
+    "display_name": "WanMoveTracksFromCoords",
+    "inputs": {
+      "track_coords": {
+        "name": "track_coords"
+      },
+      "track_mask": {
+        "name": "track_mask"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "track_length",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveVisualizeTracks": {
+    "display_name": "WanMoveVisualizeTracks",
+    "inputs": {
+      "circle_size": {
+        "name": "daire_boyutu"
+      },
+      "images": {
+        "name": "görseller"
+      },
+      "line_resolution": {
+        "name": "çizgi_çözünürlüğü"
+      },
+      "line_width": {
+        "name": "çizgi_kalınlığı"
+      },
+      "opacity": {
+        "name": "opaklık"
+      },
+      "tracks": {
+        "name": "izler"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "WanPhantomSubjectToVideo": {
     "display_name": "WanPhantomSubjectToVideo",
     "inputs": {
@@ -12894,6 +18122,113 @@
       }
     }
   },
+  "WanReferenceVideoApi": {
+    "description": "Girdi videolarındaki karakter ve sesi, bir istemle birleştirerek karakter tutarlılığını koruyan yeni bir video oluşturun.",
+    "display_name": "Wan Reference to Video",
+    "inputs": {
+      "control_after_generate": {
+        "name": "oluşturduktan sonra kontrol"
+      },
+      "duration": {
+        "name": "süre"
+      },
+      "model": {
+        "name": "model"
+      },
+      "negative_prompt": {
+        "name": "negatif_istem",
+        "tooltip": "Kaçınılması gerekenleri tanımlayan negatif istem."
+      },
+      "prompt": {
+        "name": "istem",
+        "tooltip": "Öğeleri ve görsel özellikleri tanımlayan istem. İngilizce ve Çince desteklenir. Referans karakterlere atıfta bulunmak için `character1` ve `character2` gibi tanımlayıcılar kullanın."
+      },
+      "reference_videos": {
+        "name": "referans_videolar"
+      },
+      "seed": {
+        "name": "tohum"
+      },
+      "shot_type": {
+        "name": "çekim_türü",
+        "tooltip": "Oluşturulan video için çekim türünü belirtir; yani, videonun tek bir sürekli çekim mi yoksa kesmeli birden fazla çekim mi olacağını belirtir."
+      },
+      "size": {
+        "name": "boyut"
+      },
+      "watermark": {
+        "name": "filigran",
+        "tooltip": "Sonuca yapay zeka tarafından oluşturulan bir filigran eklenip eklenmeyeceği."
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanSCAILToVideo": {
+    "display_name": "WanSCAILToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "toplu_boyutu"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "yükseklik"
+      },
+      "length": {
+        "name": "uzunluk"
+      },
+      "negative": {
+        "name": "negatif"
+      },
+      "pose_end": {
+        "name": "poz_bitişi",
+        "tooltip": "Poz koşullandırmasının biteceği adım."
+      },
+      "pose_start": {
+        "name": "poz_başlangıcı",
+        "tooltip": "Poz koşullandırmasının başlayacağı adım."
+      },
+      "pose_strength": {
+        "name": "poz_gücü",
+        "tooltip": "Poz latentinin gücü."
+      },
+      "pose_video": {
+        "name": "poz_videosu",
+        "tooltip": "Poz koşullandırması için kullanılan video. Ana videonun çözünürlüğünün yarısına düşürülecek."
+      },
+      "positive": {
+        "name": "pozitif"
+      },
+      "reference_image": {
+        "name": "referans_görsel"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "genişlik"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "pozitif",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negatif",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": "Üretim boyutunda boş latent."
+      }
+    }
+  },
   "WanSoundImageToVideo": {
     "display_name": "WanSoundImageToVideo",
     "inputs": {
@@ -13072,6 +18407,10 @@
         "name": "seed",
         "tooltip": "Oluşturma için kullanılacak seed değeri."
       },
+      "shot_type": {
+        "name": "çekim_türü",
+        "tooltip": "Oluşturulan video için çekim türünü belirtir; yani, videonun tek bir sürekli çekim mi yoksa kesmeli birden fazla çekim mi olacağını belirtir. Bu parametre yalnızca prompt_extend True olduğunda geçerlidir."
+      },
       "size": {
         "name": "size"
       },
@@ -13197,6 +18536,43 @@
       }
     }
   },
+  "WavespeedFlashVSRNode": {
+    "description": "Düşük çözünürlüklü veya bulanık videolar için hızlı, yüksek kaliteli video yükseltici; çözünürlüğü artırır ve netliği geri kazandırır.",
+    "display_name": "FlashVSR Video Yükseltme",
+    "inputs": {
+      "target_resolution": {
+        "name": "hedef_çözünürlük"
+      },
+      "video": {
+        "name": "video"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WavespeedImageUpscaleNode": {
+    "description": "Görüntü çözünürlüğünü ve kalitesini artırın, fotoğrafları keskin ve ayrıntılı sonuçlar için 4K veya 8K'ya yükseltin.",
+    "display_name": "WaveSpeed Görüntü Yükseltme",
+    "inputs": {
+      "image": {
+        "name": "görüntü"
+      },
+      "model": {
+        "name": "model"
+      },
+      "target_resolution": {
+        "name": "hedef_çözünürlük"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "WebcamCapture": {
     "display_name": "Webcam Yakalama",
     "inputs": {
@@ -13209,13 +18585,38 @@
       "image": {
         "name": "görüntü"
       },
-      "waiting for camera___": {
-      },
+      "waiting for camera___": {},
       "width": {
         "name": "genişlik"
       }
     }
   },
+  "ZImageFunControlnet": {
+    "display_name": "ZImageFunControlnet",
+    "inputs": {
+      "image": {
+        "name": "görsel"
+      },
+      "inpaint_image": {
+        "name": "boyanacak_görsel"
+      },
+      "mask": {
+        "name": "mask"
+      },
+      "model": {
+        "name": "model"
+      },
+      "model_patch": {
+        "name": "model_patch"
+      },
+      "strength": {
+        "name": "güç"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
   "unCLIPCheckpointLoader": {
     "display_name": "unCLIPKontrolNoktasıYükleyici",
     "inputs": {
@@ -13240,5 +18641,19 @@
         "name": "güç"
       }
     }
+  },
+  "wanBlockSwap": {
+    "description": "NOP",
+    "display_name": "wanBlockSwap",
+    "inputs": {
+      "model": {
+        "name": "model"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
   }
 }
diff --git a/src/locales/tr/settings.json b/src/locales/tr/settings.json
index 34a323fd47..823b9206d9 100644
--- a/src/locales/tr/settings.json
+++ b/src/locales/tr/settings.json
@@ -52,7 +52,8 @@
     }
   },
   "Comfy_Canvas_SelectionToolbox": {
-    "name": "Seçim araç kutusunu göster"
+    "name": "Seçim araç kutusunu göster",
+    "tooltip": "Düğümler seçildiğinde, yaygın işlemlere hızlı erişim sağlayan bir araç çubuğu gösterir."
   },
   "Comfy_ConfirmClear": {
     "name": "İş akışını temizlerken onay iste"
@@ -79,6 +80,17 @@
   "Comfy_EnableWorkflowViewRestore": {
     "name": "İş akışlarında tuval konumunu ve yakınlaştırma seviyesini kaydet ve geri yükle"
   },
+  "Comfy_Execution_PreviewMethod": {
+    "name": "Canlı önizleme yöntemi",
+    "options": {
+      "auto": "otomatik",
+      "default": "default",
+      "latent2rgb": "latent2rgb",
+      "none": "hiçbiri",
+      "taesd": "taesd"
+    },
+    "tooltip": "Görüntü oluşturma sırasında canlı önizleme yöntemi. \"default\" sunucu CLI ayarını kullanır."
+  },
   "Comfy_FloatRoundingPrecision": {
     "name": "Ondalık sayı widget yuvarlama ondalık basamakları [0 = otomatik].",
     "tooltip": "(sayfanın yeniden yüklenmesini gerektirir)"
@@ -92,6 +104,10 @@
   "Comfy_Graph_CtrlShiftZoom": {
     "name": "Hızlı yakınlaştırma kısayolunu etkinleştir (Ctrl + Shift + Sürükle)"
   },
+  "Comfy_Graph_DeduplicateSubgraphNodeIds": {
+    "name": "Alt grafik düğüm kimliklerini çoğaltmayı önle",
+    "tooltip": "Bir iş akışı yüklenirken alt grafiklerdeki yinelenen düğüm kimliklerini otomatik olarak yeniden ata."
+  },
   "Comfy_Graph_LinkMarkers": {
     "name": "Bağlantı orta nokta işaretçileri",
     "options": {
@@ -100,6 +116,10 @@
       "None": "Yok"
     }
   },
+  "Comfy_Graph_LiveSelection": {
+    "name": "Canlı seçim",
+    "tooltip": "Etkinleştirildiğinde, seçim dikdörtgenini sürüklerken düğümler gerçek zamanlı olarak seçilir/seçimi kaldırılır; diğer tasarım araçlarına benzer şekilde çalışır."
+  },
   "Comfy_Graph_ZoomSpeed": {
     "name": "Tuval yakınlaştırma hızı"
   },
@@ -132,15 +152,16 @@
       "Linear": "Doğrusal",
       "Spline": "Eğri",
       "Straight": "Düz"
-    }
+    },
+    "tooltip": "Tuvaldeki düğümler arasındaki bağlantı çizgilerinin görünümünü ve görünürlüğünü kontrol eder."
   },
   "Comfy_Load3D_3DViewerEnable": {
     "name": "3D Görüntüleyiciyi Etkinleştir (Beta)",
-    "tooltip": "Seçili düğümler için 3D Görüntüleyiciyi (Beta) etkinleştirir. Bu özellik, 3D modelleri doğrudan tam boyutlu 3D görüntüleyici içinde görselleştirmenize ve etkileşimde bulunmanıza olanak tanır."
+    "tooltip": "Seçili düğümler için 3D Görüntüleyiciyi (Beta) etkinleştirir. Bu özellik, tam boyutlu 3D görüntüleyicide 3D modelleri doğrudan görselleştirmenize ve etkileşimde bulunmanıza olanak tanır."
   },
   "Comfy_Load3D_BackgroundColor": {
     "name": "Başlangıç Arka Plan Rengi",
-    "tooltip": "3D sahnenin varsayılan arka plan rengini kontrol eder. Bu ayar, yeni bir 3D widget oluşturulduğunda arka plan görünümünü belirler, ancak oluşturulduktan sonra her widget için ayrı ayrı ayarlanabilir."
+    "tooltip": "3D sahnenin varsayılan arka plan rengini kontrol eder. Bu ayar, yeni bir 3D bileşeni oluşturulduğunda arka planın nasıl görüneceğini belirler, ancak oluşturulduktan sonra her bileşen için ayrı ayrı ayarlanabilir."
   },
   "Comfy_Load3D_CameraType": {
     "name": "Başlangıç Kamera Tipi",
@@ -148,27 +169,36 @@
       "orthographic": "ortografik",
       "perspective": "perspektif"
     },
-    "tooltip": "Yeni bir 3D widget oluşturulduğunda kameranın varsayılan olarak perspektif mi yoksa ortografik mi olacağını kontrol eder. Bu varsayılan, oluşturulduktan sonra her widget için ayrı ayrı değiştirilebilir."
+    "tooltip": "Yeni bir 3D bileşeni oluşturulduğunda kameranın varsayılan olarak perspektif mi yoksa ortografik mi olacağını kontrol eder. Bu varsayılan ayar, oluşturulduktan sonra her bileşen için ayrı ayrı değiştirilebilir."
   },
   "Comfy_Load3D_LightAdjustmentIncrement": {
-    "name": "Işık Ayarlama Artışı",
-    "tooltip": "3D sahnelerde ışık yoğunluğunu ayarlarken artış boyutunu kontrol eder. Daha küçük bir adım değeri, aydınlatma ayarlamaları üzerinde daha ince kontrol sağlarken, daha büyük bir değer ayarlama başına daha belirgin değişikliklere neden olur."
+    "name": "Işık Ayar Artışı",
+    "tooltip": "3D sahnelerde ışık yoğunluğunu ayarlarken artış miktarını kontrol eder. Daha küçük bir adım değeri, ışık ayarlarında daha hassas kontrol sağlar; daha büyük bir değer ise her ayarda daha belirgin değişiklikler oluşturur."
   },
   "Comfy_Load3D_LightIntensity": {
     "name": "Başlangıç Işık Yoğunluğu",
-    "tooltip": "3D sahnedeki aydınlatmanın varsayılan parlaklık seviyesini ayarlar. Bu değer, yeni bir 3D widget oluşturulduğunda ışıkların nesneleri ne kadar yoğun aydınlatacağını belirler, ancak oluşturulduktan sonra her widget için ayrı ayrı ayarlanabilir."
+    "tooltip": "3D sahnedeki ışıkların varsayılan parlaklık seviyesini ayarlar. Bu değer, yeni bir 3D bileşeni oluşturulduğunda nesnelerin ne kadar aydınlatılacağını belirler, ancak oluşturulduktan sonra her bileşen için ayrı ayrı ayarlanabilir."
   },
   "Comfy_Load3D_LightIntensityMaximum": {
     "name": "Maksimum Işık Yoğunluğu",
-    "tooltip": "3D sahneler için izin verilen maksimum ışık yoğunluğu değerini ayarlar. Bu, herhangi bir 3D widget'ta aydınlatma ayarlanırken ayarlanabilecek üst parlaklık sınırını tanımlar."
+    "tooltip": "3D sahneler için izin verilen maksimum ışık yoğunluğu değerini ayarlar. Bu, herhangi bir 3D bileşende ışık ayarlanırken belirlenebilecek en yüksek parlaklık sınırını tanımlar."
   },
   "Comfy_Load3D_LightIntensityMinimum": {
     "name": "Minimum Işık Yoğunluğu",
-    "tooltip": "3D sahneler için izin verilen minimum ışık yoğunluğu değerini ayarlar. Bu, herhangi bir 3D widget'ta aydınlatma ayarlanırken ayarlanabilecek alt parlaklık sınırını tanımlar."
+    "tooltip": "3D sahneler için izin verilen minimum ışık yoğunluğu değerini ayarlar. Bu, herhangi bir 3D bileşende ışık ayarlanırken belirlenebilecek en düşük parlaklık sınırını tanımlar."
+  },
+  "Comfy_Load3D_PLYEngine": {
+    "name": "PLY Motoru",
+    "options": {
+      "fastply": "fastply",
+      "sparkjs": "sparkjs",
+      "threejs": "threejs"
+    },
+    "tooltip": "PLY dosyalarını yüklemek için motoru seçin. \"threejs\" yerel Three.js PLYLoader'ı kullanır (ağ PLY dosyaları için en iyisi). \"fastply\" ASCII nokta bulutu PLY dosyaları için optimize edilmiş bir yükleyici kullanır. \"sparkjs\" ise 3D Gaussian Splatting PLY dosyaları için Spark.js kullanır."
   },
   "Comfy_Load3D_ShowGrid": {
     "name": "Başlangıç Izgara Görünürlüğü",
-    "tooltip": "Yeni bir 3D widget oluşturulduğunda ızgaranın varsayılan olarak görünür olup olmadığını kontrol eder. Bu varsayılan, oluşturulduktan sonra her widget için ayrı ayrı değiştirilebilir."
+    "tooltip": "Yeni bir 3D bileşeni oluşturulduğunda ızgaranın varsayılan olarak görünüp görünmeyeceğini kontrol eder. Bu varsayılan ayar, oluşturulduktan sonra her bileşen için ayrı ayrı değiştirilebilir."
   },
   "Comfy_Locale": {
     "name": "Dil"
@@ -218,11 +248,20 @@
   "Comfy_NodeBadge_ShowApiPricing": {
     "name": "API düğüm fiyatlandırma rozetini göster"
   },
+  "Comfy_NodeLibrary_NewDesign": {
+    "name": "Yeni Düğüm Kütüphanesi Tasarımı",
+    "tooltip": "Sekmeli (Temel, Tümü, Özel), geliştirilmiş arama ve üzerine gelindiğinde önizleme özelliklerine sahip yeniden tasarlanmış düğüm kütüphanesi kenar çubuğunu etkinleştir."
+  },
+  "Comfy_NodeReplacement_Enabled": {
+    "name": "Otomatik düğüm değiştirmeyi etkinleştir",
+    "tooltip": "Etkinleştirildiğinde, eksik düğümler için bir değiştirme eşlemesi varsa otomatik olarak daha yeni karşılıklarıyla değiştirilebilir."
+  },
   "Comfy_NodeSearchBoxImpl": {
     "name": "Düğüm arama kutusu uygulaması",
     "options": {
       "default": "varsayılan",
-      "litegraph (legacy)": "litegraph (eski)"
+      "litegraph (legacy)": "litegraph (eski)",
+      "v1 (legacy)": "v1 (eski)"
     }
   },
   "Comfy_NodeSearchBoxImpl_NodePreview": {
@@ -248,6 +287,10 @@
   "Comfy_Node_AllowImageSizeDraw": {
     "name": "Görüntü önizlemesinin altında genişlik × yüksekliği göster"
   },
+  "Comfy_Node_AlwaysShowAdvancedWidgets": {
+    "name": "Tüm düğümlerde gelişmiş araçları her zaman göster",
+    "tooltip": "Etkinleştirildiğinde, gelişmiş araçlar tüm düğümlerde ayrı ayrı genişletmeye gerek kalmadan her zaman görünür olur."
+  },
   "Comfy_Node_AutoSnapLinkToSlot": {
     "name": "Bağlantıyı otomatik olarak düğüm yuvasına yapıştır",
     "tooltip": "Bir bağlantıyı bir düğümün üzerine sürüklerken, bağlantı otomatik olarak düğüm üzerindeki uygun bir giriş yuvasına yapışır"
@@ -308,6 +351,14 @@
     "name": "Kuyruk geçmişi boyutu",
     "tooltip": "Kuyruk geçmişinde gösterilen maksimum görev sayısı."
   },
+  "Comfy_Queue_QPOV2": {
+    "name": "Varlıklar yan panelinde birleşik iş kuyruğunu kullan",
+    "tooltip": "Kayan iş kuyruğu panelini, Varlıklar yan paneline gömülü eşdeğer bir iş kuyruğu ile değiştirir. Kayan panel düzenine dönmek için bunu devre dışı bırakabilirsiniz."
+  },
+  "Comfy_RightSidePanel_ShowErrorsTab": {
+    "name": "Hatalar sekmesini yan panelde göster",
+    "tooltip": "Etkinleştirildiğinde, iş akışı yürütme hatalarını hızlıca görmek için sağ yan panelde bir hatalar sekmesi görüntülenir."
+  },
   "Comfy_Sidebar_Location": {
     "name": "Kenar çubuğu konumu",
     "options": {
@@ -345,6 +396,14 @@
   "Comfy_TreeExplorer_ItemPadding": {
     "name": "Ağaç gezgini öğe dolgusu"
   },
+  "Comfy_UI_TabBarLayout": {
+    "name": "Sekme Çubuğu Düzeni",
+    "options": {
+      "Default": "Varsayılan",
+      "Integrated": "Entegre"
+    },
+    "tooltip": "Sekme çubuğu düzenini kontrol eder. \"Entegre\" seçeneği, Yardım ve Kullanıcı kontrollerini sekme çubuğu alanına taşır."
+  },
   "Comfy_UseNewMenu": {
     "name": "Yeni menüyü kullan",
     "options": {
@@ -434,6 +493,7 @@
     "tooltip": "Yeniden yönlendirme merkez noktasından bezier kontrol noktası ofseti"
   },
   "pysssss_SnapToGrid": {
-    "name": "Her zaman ızgaraya yapıştır"
+    "name": "Her zaman ızgaraya yapıştır",
+    "tooltip": "Etkinleştirildiğinde, düğümler taşındığında veya yeniden boyutlandırıldığında otomatik olarak ızgaraya hizalanır."
   }
 }
diff --git a/src/locales/zh-TW/commands.json b/src/locales/zh-TW/commands.json
index 0a52ed2f8b..5dea5a8df9 100644
--- a/src/locales/zh-TW/commands.json
+++ b/src/locales/zh-TW/commands.json
@@ -1,4 +1,40 @@
 {
+  "Comfy-Desktop_CheckForUpdates": {
+    "label": "檢查更新"
+  },
+  "Comfy-Desktop_Folders_OpenCustomNodesFolder": {
+    "label": "開啟自訂節點資料夾"
+  },
+  "Comfy-Desktop_Folders_OpenInputsFolder": {
+    "label": "開啟輸入資料夾"
+  },
+  "Comfy-Desktop_Folders_OpenLogsFolder": {
+    "label": "開啟日誌資料夾"
+  },
+  "Comfy-Desktop_Folders_OpenModelConfig": {
+    "label": "開啟 extra_model_paths.yaml"
+  },
+  "Comfy-Desktop_Folders_OpenModelsFolder": {
+    "label": "開啟模型資料夾"
+  },
+  "Comfy-Desktop_Folders_OpenOutputsFolder": {
+    "label": "開啟輸出資料夾"
+  },
+  "Comfy-Desktop_OpenDevTools": {
+    "label": "開啟開發者工具"
+  },
+  "Comfy-Desktop_OpenUserGuide": {
+    "label": "桌面版使用指南"
+  },
+  "Comfy-Desktop_Quit": {
+    "label": "結束"
+  },
+  "Comfy-Desktop_Reinstall": {
+    "label": "重新安裝"
+  },
+  "Comfy-Desktop_Restart": {
+    "label": "重新啟動"
+  },
   "Comfy_3DViewer_Open3DViewer": {
     "label": "為選取的節點開啟 3D 檢視器（Beta）"
   },
@@ -8,6 +44,9 @@
   "Comfy_BrowseTemplates": {
     "label": "瀏覽範本"
   },
+  "Comfy_Canvas_CopySelected": {
+    "label": "複製"
+  },
   "Comfy_Canvas_DeleteSelectedItems": {
     "label": "刪除選取項目"
   },
@@ -29,12 +68,18 @@
   "Comfy_Canvas_MoveSelectedNodes_Up": {
     "label": "上移選取的節點"
   },
+  "Comfy_Canvas_PasteFromClipboard": {
+    "label": "貼上"
+  },
   "Comfy_Canvas_ResetView": {
     "label": "重設視圖"
   },
   "Comfy_Canvas_Resize": {
     "label": "調整所選節點大小"
   },
+  "Comfy_Canvas_SelectAll": {
+    "label": "全選"
+  },
   "Comfy_Canvas_ToggleLinkVisibility": {
     "label": "畫布切換連結可見性"
   },
@@ -155,18 +200,30 @@
   "Comfy_Manager_ShowUpdateAvailablePacks": {
     "label": "檢查自訂節點更新"
   },
-  "Comfy_Manager_ToggleManagerProgressDialog": {
-    "label": "切換自訂節點管理器進度條"
-  },
   "Comfy_MaskEditor_BrushSize_Decrease": {
     "label": "減少 MaskEditor 畫筆大小"
   },
   "Comfy_MaskEditor_BrushSize_Increase": {
     "label": "增加 MaskEditor 畫筆大小"
   },
+  "Comfy_MaskEditor_ColorPicker": {
+    "label": "在 MaskEditor 中開啟顏色選擇器"
+  },
+  "Comfy_MaskEditor_Mirror_Horizontal": {
+    "label": "在 MaskEditor 中水平鏡像"
+  },
+  "Comfy_MaskEditor_Mirror_Vertical": {
+    "label": "在 MaskEditor 中垂直鏡像"
+  },
   "Comfy_MaskEditor_OpenMaskEditor": {
     "label": "為選取的節點開啟 Mask 編輯器"
   },
+  "Comfy_MaskEditor_Rotate_Left": {
+    "label": "在 MaskEditor 中向左旋轉"
+  },
+  "Comfy_MaskEditor_Rotate_Right": {
+    "label": "在 MaskEditor 中向右旋轉"
+  },
   "Comfy_Memory_UnloadModels": {
     "label": "卸載模型"
   },
@@ -197,12 +254,18 @@
   "Comfy_QueueSelectedOutputNodes": {
     "label": "佇列所選的輸出節點"
   },
+  "Comfy_Queue_ToggleOverlay": {
+    "label": "切換任務歷史"
+  },
   "Comfy_Redo": {
     "label": "重做"
   },
   "Comfy_RefreshNodeDefinitions": {
     "label": "重新整理節點定義"
   },
+  "Comfy_RenameWorkflow": {
+    "label": "重新命名工作流程"
+  },
   "Comfy_SaveWorkflow": {
     "label": "儲存工作流程"
   },
@@ -212,6 +275,12 @@
   "Comfy_ShowSettingsDialog": {
     "label": "顯示設定對話框"
   },
+  "Comfy_Subgraph_SetDescription": {
+    "label": "設定子圖描述"
+  },
+  "Comfy_Subgraph_SetSearchAliases": {
+    "label": "設定子圖搜尋別名"
+  },
   "Comfy_ToggleAssetAPI": {
     "label": "實驗性：啟用 AssetAPI"
   },
@@ -221,6 +290,12 @@
   "Comfy_ToggleHelpCenter": {
     "label": "說明中心"
   },
+  "Comfy_ToggleLinear": {
+    "label": "切換線性模式"
+  },
+  "Comfy_ToggleQPOV2": {
+    "label": "切換佇列面板 V2"
+  },
   "Comfy_ToggleTheme": {
     "label": "切換主題（深色／淺色）"
   },
@@ -269,6 +344,10 @@
   "Workspace_ToggleFocusMode": {
     "label": "切換專注模式"
   },
+  "Workspace_ToggleSidebarTab_apps": {
+    "label": "切換應用程式側邊欄",
+    "tooltip": "應用程式"
+  },
   "Workspace_ToggleSidebarTab_assets": {
     "label": "切換資源側邊欄",
     "tooltip": "資源"
diff --git a/src/locales/zh-TW/main.json b/src/locales/zh-TW/main.json
index 7a4693971b..08fb38fb8c 100644
--- a/src/locales/zh-TW/main.json
+++ b/src/locales/zh-TW/main.json
@@ -1,6 +1,8 @@
 {
   "actionbar": {
-    "dockToTop": "停靠到頂部"
+    "dockToTop": "停靠到頂部",
+    "feedback": "意見回饋",
+    "feedbackTooltip": "意見回饋"
   },
   "apiNodesCostBreakdown": {
     "costPerRun": "每次執行成本",
@@ -14,26 +16,175 @@
   "assetBrowser": {
     "allCategory": "所有 {category}",
     "allModels": "所有模型",
+    "apiKeyHint": "要匯入私人或受限模型嗎？{link}。",
+    "apiKeyHintLink": "請在設定中新增您的 API 金鑰",
     "ariaLabel": {
       "assetCard": "{name} - {type} 資源",
       "loadingAsset": "載入資源中"
     },
+    "assetCollection": "資產收藏",
     "assets": "資產",
+    "baseModel": "基礎模型",
     "baseModels": "基礎模型",
     "browseAssets": "瀏覽資產",
+    "byType": "依類型",
+    "checkpoints": "Checkpoints",
+    "civitaiLinkExample": "{example} {link}",
+    "civitaiLinkExampleStrong": "範例：",
+    "civitaiLinkExampleUrl": "https://civitai.com/models/10706/luisap-z-image-and-qwen-pixel-art-refiner?modelVersionId=2225295",
+    "civitaiLinkLabel": "Civitai 模型{download}連結",
+    "civitaiLinkLabelDownload": "下載",
+    "civitaiLinkPlaceholder": "請在此貼上連結",
+    "confirmModelDetails": "確認模型細節",
     "connectionError": "請檢查您的連線並重試",
+    "deletion": {
+      "body": "此模型將會從您的資料庫中永久移除。",
+      "complete": "{assetName} 已被刪除。",
+      "failed": "無法刪除 {assetName}。",
+      "header": "要刪除此模型嗎？",
+      "inProgress": "正在刪除 {assetName}..."
+    },
+    "download": {
+      "complete": "下載完成",
+      "failed": "下載失敗",
+      "inProgress": "正在下載 {assetName}..."
+    },
+    "emptyImported": {
+      "canImport": "尚未匯入模型。點擊「匯入模型」以新增您的模型。",
+      "restricted": "個人模型僅限 Creator 方案及以上等級使用。"
+    },
+    "errorAccessForbidden": "無法存取此資源。",
+    "errorConnectionRefused": "無法連接來源，請稍後再試。",
+    "errorDownloadCancelled": "下載已取消。",
+    "errorFileTooLarge": "檔案超過允許的最大大小限制",
+    "errorFormatNotAllowed": "僅允許 SafeTensor 格式",
+    "errorHttpError": "擷取中繼資料時發生錯誤。",
+    "errorInternalError": "發生非預期錯誤，請再試一次。",
+    "errorInvalidHost": "無法解析來源網址的主機名稱。",
+    "errorInvalidUrl": "請提供一個網址。",
+    "errorInvalidUrlFormat": "網址格式無效，請檢查後再試。",
+    "errorMetadataFetchFailed": "無法從來源取得檔案資訊。",
+    "errorModelTypeNotSupported": "不支援此模型類型",
+    "errorNetworkError": "網路錯誤，請檢查連線後再試。",
+    "errorNetworkTimeout": "請求逾時，請再試一次。",
+    "errorRateLimited": "請求過多，請幾分鐘後再試。",
+    "errorRequestCancelled": "請求已取消。",
+    "errorResourceNotFound": "找不到檔案，請檢查網址後再試。",
+    "errorServiceUnavailable": "服務暫時無法使用，請稍後再試。",
+    "errorSourceServerError": "來源伺服器發生問題，請稍後再試。",
+    "errorUnauthorized": "請登入以繼續。",
+    "errorUnauthorizedSource": "此資源需要驗證，請在設定中新增 API 金鑰。",
+    "errorUnknown": "發生未預期的錯誤",
+    "errorUnsafePickleScan": "CivitAI 偵測到此檔案中可能存在不安全的程式碼",
+    "errorUnsafeVirusScan": "CivitAI 偵測到此檔案中有惡意軟體或可疑內容",
+    "errorUnsupportedSource": "此網址不支援。僅支援 Hugging Face 與 Civitai 網址。",
+    "errorUploadFailed": "匯入資產失敗，請再試一次。",
+    "errorUserTokenAccessDenied": "您的 API 金鑰無法存取此資源，請檢查權限。",
+    "errorUserTokenInvalid": "儲存的 API 金鑰無效或已過期，請在設定中更新。",
     "failedToCreateNode": "無法建立節點。請重試或查看主控台以取得詳細資訊。",
     "fileFormats": "檔案格式",
+    "fileName": "檔案名稱",
+    "fileSize": "檔案大小",
+    "filterBy": "篩選條件",
+    "findInLibrary": "可在模型庫的 {type} 區段找到。",
+    "finish": "完成",
+    "genericLinkPlaceholder": "請在此貼上連結",
+    "importAnother": "匯入其他",
+    "imported": "已匯入",
+    "invalidAsset": "無效的資產",
+    "invalidAssetDetail": "無法驗證所選資產。請再試一次。",
+    "invalidFilename": "無效的檔案名稱",
+    "invalidFilenameDetail": "無法判斷資產檔案名稱。請再試一次。",
+    "jobId": "工作 ID",
     "loadingModels": "正在載入 {type}...",
+    "maxFileSize": "最大檔案大小：{size}",
+    "maxFileSizeValue": "1 GB",
+    "media": {
+      "audioPlaceholder": "音訊",
+      "threeDModelPlaceholder": "3D 模型"
+    },
+    "modelAssociatedWithLink": "您提供的連結所對應的模型：",
+    "modelInfo": {
+      "addBaseModel": "新增基礎模型...",
+      "addTag": "新增標籤...",
+      "additionalTags": "其他標籤",
+      "baseModelUnknown": "基礎模型未知",
+      "basicInfo": "基本資訊",
+      "compatibleBaseModels": "相容基礎模型",
+      "description": "描述",
+      "descriptionNotSet": "尚未設定描述",
+      "descriptionPlaceholder": "為此模型新增描述...",
+      "displayName": "顯示名稱",
+      "editDisplayName": "編輯顯示名稱",
+      "fileName": "檔案名稱",
+      "modelDescription": "模型描述",
+      "modelTagging": "模型標籤",
+      "modelType": "模型類型",
+      "noAdditionalTags": "沒有其他標籤",
+      "selectModelPrompt": "選擇模型以查看其資訊",
+      "selectModelType": "選擇模型類型...",
+      "source": "來源",
+      "title": "模型資訊",
+      "triggerPhrases": "觸發詞",
+      "viewOnSource": "在 {source} 上檢視"
+    },
+    "modelName": "模型名稱",
+    "modelNamePlaceholder": "請輸入此模型的名稱",
+    "modelTypeSelectorLabel": "這是什麼類型的模型？",
+    "modelTypeSelectorPlaceholder": "選擇模型類型",
+    "modelUploaded": "模型匯入成功。",
     "noAssetsFound": "找不到資產",
     "noModelsInFolder": "此資料夾中沒有可用的 {type}",
+    "noResultsCanImport": "請嘗試調整搜尋或篩選條件。\n你也可以使用上方的「匯入」按鈕新增模型。",
+    "noValidSourceDetected": "未偵測到有效的匯入來源",
+    "notSureLeaveAsIs": "不確定？請保持原樣",
+    "onlyCivitaiUrlsSupported": "僅支援 Civitai 的網址",
+    "ownership": "擁有權",
+    "ownershipAll": "全部",
+    "ownershipMyModels": "我的模型",
+    "ownershipPublicModels": "公開模型",
+    "processingModel": "已開始下載",
+    "processingModelDescription": "您可以關閉此對話框，下載將在背景繼續進行。",
+    "providerCivitai": "Civitai",
+    "providerHuggingFace": "Hugging Face",
+    "rename": {
+      "failed": "無法重新命名資產。"
+    },
+    "selectFrameworks": "選擇框架",
+    "selectModelType": "選擇模型類型",
+    "selectProjects": "選擇專案",
     "sortAZ": "A-Z",
     "sortBy": "排序依據",
+    "sortDefault": "預設",
     "sortPopular": "熱門",
     "sortRecent": "最近",
     "sortZA": "Z-A",
+    "sortingType": "排序方式",
+    "tags": "標籤",
+    "tagsHelp": "以逗號分隔標籤",
+    "tagsPlaceholder": "例如：models, checkpoint",
     "tryAdjustingFilters": "請嘗試調整您的搜尋或篩選條件",
-    "unknown": "未知"
+    "unknown": "未知",
+    "unsupportedUrlSource": "僅支援來自 {sources} 的網址",
+    "upgradeFeatureDescription": "此功能僅限 Creator 或 Pro 方案使用。",
+    "upgradeToUnlockFeature": "升級以解鎖此功能",
+    "upload": "匯入",
+    "uploadFailed": "匯入失敗",
+    "uploadModel": "匯入",
+    "uploadModelDescription1": "貼上 Civitai 模型下載連結以新增至您的資料庫。",
+    "uploadModelDescription1Generic": "貼上模型下載連結以新增至您的資料庫。",
+    "uploadModelDescription2": "目前僅支援來自 {link} 的連結",
+    "uploadModelDescription2Generic": "目前僅支援以下提供者的網址：",
+    "uploadModelDescription2Link": "https://civitai.com/models",
+    "uploadModelDescription3": "最大檔案大小：{size}",
+    "uploadModelFailedToRetrieveMetadata": "無法取得中繼資料。請檢查連結並再試一次。",
+    "uploadModelFromCivitai": "從 Civitai 匯入模型",
+    "uploadModelGeneric": "匯入模型",
+    "uploadModelHelpFooterText": "需要協助尋找網址嗎？點擊下方提供者觀看教學影片。",
+    "uploadModelHelpVideo": "模型匯入教學影片",
+    "uploadModelHowDoIFindThis": "要如何找到這個？",
+    "uploadSuccess": "模型匯入成功！",
+    "uploadingModel": "正在匯入模型..."
   },
   "auth": {
     "apiKey": {
@@ -55,13 +206,7 @@
       "whitelistInfo": "關於未列入白名單的網站"
     },
     "deleteAccount": {
-      "cancel": "取消",
-      "confirm": "刪除帳號",
-      "confirmMessage": "您確定要刪除您的帳號嗎？此操作無法復原，且將永久移除您所有的資料。",
-      "confirmTitle": "刪除帳號",
-      "deleteAccount": "刪除帳號",
-      "success": "帳號已刪除",
-      "successDetail": "您的帳號已成功刪除。"
+      "contactSupport": "若要刪除你的帳號，請聯絡 {email}"
     },
     "errors": {
       "auth/cancelled-popup-request": "登入已取消。請再試一次。",
@@ -80,6 +225,7 @@
     "login": {
       "andText": "以及",
       "backToLogin": "返回登入",
+      "backToSocialLogin": "改用 Google 或 Github 註冊",
       "confirmPasswordLabel": "確認密碼",
       "confirmPasswordPlaceholder": "請再次輸入相同密碼",
       "didntReceiveEmail": "沒有收到電子郵件？請聯絡我們：",
@@ -88,6 +234,9 @@
       "failed": "登入失敗",
       "forgotPassword": "忘記密碼？",
       "forgotPasswordError": "密碼重設郵件發送失敗",
+      "freeTierBadge": "符合免費方案資格",
+      "freeTierDescription": "使用 Google 註冊，每月可獲得 {credits} 免費點數。無需信用卡。",
+      "freeTierDescriptionGeneric": "使用 Google 註冊，每月可獲得免費點數。無需信用卡。",
       "insecureContextWarning": "此連線不安全（HTTP）。如果您繼續登入，您的憑證可能會被攻擊者攔截。",
       "loginButton": "登入",
       "loginWithGithub": "使用 Github 登入",
@@ -106,11 +255,13 @@
       "sendResetLink": "發送重設連結",
       "signInOrSignUp": "登入 / 註冊",
       "signUp": "註冊",
+      "signUpFreeTierPromo": "新用戶？{signUp} 使用 Google 註冊，每月獲得 {credits} 免費點數。",
       "success": "登入成功",
       "termsLink": "使用條款",
       "termsText": "點擊「下一步」或「註冊」即表示您同意我們的",
       "title": "登入您的帳戶",
       "useApiKey": "Comfy API 金鑰",
+      "useEmailInstead": "改用電子郵件",
       "userAvatar": "用戶頭像"
     },
     "loginButton": {
@@ -130,11 +281,14 @@
     "signOut": {
       "signOut": "登出",
       "success": "成功登出",
-      "successDetail": "您已成功登出您的帳戶。"
+      "successDetail": "您已成功登出您的帳戶。",
+      "unsavedChangesMessage": "您有尚未儲存的變更，登出後這些變更將會遺失。您確定要繼續嗎？",
+      "unsavedChangesTitle": "未儲存的變更"
     },
     "signup": {
       "alreadyHaveAccount": "已經有帳戶？",
       "emailLabel": "電子郵件",
+      "emailNotEligibleForFreeTier": "電子郵件註冊不符合免費方案資格。",
       "emailPlaceholder": "請輸入您的電子郵件",
       "passwordLabel": "密碼",
       "passwordPlaceholder": "請輸入新密碼",
@@ -147,12 +301,68 @@
       "title": "建立帳戶"
     }
   },
+  "batch": {
+    "index": "{current} / {total}"
+  },
+  "billingOperation": {
+    "subscriptionFailed": "訂閱更新失敗",
+    "subscriptionProcessing": "正在處理付款 — 設定您的工作區...",
+    "subscriptionSuccess": "訂閱已成功更新",
+    "subscriptionTimeout": "訂閱驗證逾時",
+    "topupFailed": "儲值失敗",
+    "topupProcessing": "正在處理付款 — 新增點數中...",
+    "topupSuccess": "點數儲值成功",
+    "topupTimeout": "儲值驗證逾時"
+  },
+  "boundingBox": {
+    "height": "高度",
+    "width": "寬度",
+    "x": "X",
+    "y": "Y"
+  },
   "breadcrumbsMenu": {
     "clearWorkflow": "清除工作流程",
     "deleteBlueprint": "刪除藍圖",
     "deleteWorkflow": "刪除工作流程",
     "duplicate": "複製",
-    "enterNewName": "輸入新名稱"
+    "enterAppMode": "進入應用模式",
+    "enterBuilderMode": "進入應用程式建構器",
+    "enterNewName": "輸入新名稱",
+    "exitAppMode": "離開應用模式",
+    "missingNodesWarning": "工作流程包含不支援的節點（以紅色標示）。",
+    "workflowActions": "工作流程操作"
+  },
+  "builderMenu": {
+    "exitAppBuilder": "離開應用程式建構器"
+  },
+  "builderToolbar": {
+    "app": "應用",
+    "appDescription": "預設以應用模式開啟",
+    "arrange": "預覽",
+    "arrangeDescription": "檢視應用版面",
+    "connectOutput": "連接輸出",
+    "connectOutputBody1": "您的應用必須至少連接一個輸出才能儲存。",
+    "connectOutputBody2": "切換到「選擇」步驟，點擊輸出節點以新增到這裡。",
+    "defaultModeAppliedAppBody": "此工作流程將從現在起預設以應用程式模式開啟。",
+    "defaultModeAppliedAppPrompt": "您想現在查看嗎？",
+    "defaultModeAppliedGraphBody": "此工作流程將從現在起預設以節點圖形模式開啟。",
+    "defaultModeAppliedGraphPrompt": "您還想查看應用程式嗎？",
+    "defaultModeAppliedTitle": "設定成功",
+    "defaultView": "設定預設檢視",
+    "defaultViewDescription": "選擇開啟方式",
+    "defaultViewLabel": "預設情況下，此工作流程將以以下方式開啟：",
+    "defaultViewTitle": "設定此工作流程的預設檢視",
+    "emptyWorkflowPrompt": "您想從範本開始嗎？",
+    "emptyWorkflowTitle": "此工作流程沒有節點",
+    "inputs": "輸入",
+    "inputsDescription": "選擇輸入",
+    "label": "應用建立器",
+    "nodeGraph": "節點圖",
+    "nodeGraphDescription": "預設以節點圖開啟",
+    "outputs": "輸出",
+    "outputsDescription": "選擇輸出",
+    "switchToOutputs": "切換到輸出",
+    "viewApp": "查看應用程式"
   },
   "clipboard": {
     "errorMessage": "複製到剪貼簿失敗",
@@ -206,6 +416,7 @@
     },
     "retry": "再試一次",
     "retrying": "正在重試...",
+    "skipToCloudApp": "跳至雲端應用程式",
     "start": {
       "desc": "無需任何設定。可在任何裝置上使用。",
       "download": "下載 ComfyUI",
@@ -339,6 +550,8 @@
     "Edit Subgraph Widgets": "編輯子圖小工具",
     "Expand": "展開",
     "Expand Node": "展開節點",
+    "Extensions": "擴充功能",
+    "FavoriteWidget": "收藏元件",
     "Horizontal": "水平",
     "Inputs": "輸入",
     "Left": "左側",
@@ -358,6 +571,7 @@
     "Remove": "移除",
     "Remove Bypass": "移除繞過",
     "Rename": "重新命名",
+    "RenameWidget": "重新命名元件",
     "Resize": "調整大小",
     "Right": "右側",
     "Run Branch": "執行分支",
@@ -368,6 +582,7 @@
     "Shapes": "形狀",
     "Title": "標題",
     "Top": "頂部",
+    "UnfavoriteWidget": "取消收藏元件",
     "Unpack Subgraph": "解包子圖",
     "Unpin": "取消釘選",
     "Vertical": "垂直",
@@ -381,6 +596,7 @@
     "additionalInfo": "其他資訊",
     "apiPricing": "API 價格",
     "credits": "點數",
+    "creditsAvailable": "可用點數",
     "details": "詳細資料",
     "eventType": "事件類型",
     "faqs": "常見問題",
@@ -389,15 +605,47 @@
     "messageSupport": "聯絡客服",
     "model": "模型",
     "purchaseCredits": "購買點數",
+    "refreshes": "將於 {date} 重置",
     "time": "時間",
     "topUp": {
+      "addMoreCredits": "儲值點數",
+      "addMoreCreditsToRun": "儲值點數以執行",
+      "amountToPayLabel": "需支付的美元金額",
+      "buy": "購買",
+      "buyCredits": "繼續付款",
       "buyNow": "立即購買",
+      "contactUs": "聯絡我們",
+      "creditsDescription": "點數用於執行工作流程或合作夥伴節點。",
+      "creditsPerDollar": "每美元點數",
+      "creditsToReceiveLabel": "可獲得的點數",
+      "howManyCredits": "您想要儲值多少點數？",
       "insufficientMessage": "您的點數不足，無法執行此工作流程。",
       "insufficientTitle": "點數不足",
+      "insufficientWorkflowMessage": "您的點數不足，無法執行此工作流程。",
+      "maxAllowed": "最多可購買 {credits} 點。",
       "maxAmount": "（最高 $1,000 美元）",
+      "maximumAmount": "最高 ${amount}",
+      "minRequired": "最低需購買 {credits} 點",
+      "minimumPurchase": "最低購買 ${amount}（${credits} 點）",
+      "needMore": "需要更多？",
+      "purchaseError": "購買失敗",
+      "purchaseErrorDetail": "購買點數失敗：{error}",
+      "purchaseSuccess": "點數儲值成功！",
       "quickPurchase": "快速購買",
       "seeDetails": "查看詳情",
-      "topUp": "儲值"
+      "selectAmount": "選擇金額",
+      "templateNote": "*以 Wan Fun Control 範本產生",
+      "topUp": "儲值",
+      "unknownError": "發生未知錯誤",
+      "usdAmount": "${amount}",
+      "videosEstimate": "約 {count} 部影片",
+      "viewPricing": "查看價格詳情",
+      "youGet": "點數",
+      "youPay": "金額（美元）"
+    },
+    "unified": {
+      "message": "點數已統一",
+      "tooltip": "我們已統一 Comfy 的付款系統。現在一切都以 Comfy 點數運作：\n- 合作夥伴節點（原 API 節點）\n- 雲端工作流程\n\n您原有的合作夥伴節點餘額已轉換為點數。"
     },
     "yourCreditBalance": "您的點數餘額"
   },
@@ -408,13 +656,26 @@
     "AUDIO_ENCODER_OUTPUT": "音訊編碼器輸出",
     "AUDIO_RECORD": "音訊錄製",
     "BOOLEAN": "布林值",
+    "BOUNDING_BOX": "邊界框",
     "CAMERA_CONTROL": "攝影機控制",
     "CLIP": "CLIP",
     "CLIP_VISION": "CLIP 視覺",
     "CLIP_VISION_OUTPUT": "CLIP 視覺輸出",
+    "COLOR": "顏色",
     "COMBO": "組合",
+    "COMFY_AUTOGROW_V3": "COMFY_AUTOGROW_V3",
+    "COMFY_DYNAMICCOMBO_V3": "COMFY_DYNAMICCOMBO_V3",
+    "COMFY_MATCHTYPE_V3": "COMFY_MATCHTYPE_V3",
     "CONDITIONING": "條件設定",
     "CONTROL_NET": "ControlNet",
+    "ELEVENLABS_VOICE": "ELEVENLABS_VOICE",
+    "FILE_3D": "FILE_3D",
+    "FILE_3D_FBX": "FILE_3D_FBX",
+    "FILE_3D_GLB": "FILE_3D_GLB",
+    "FILE_3D_GLTF": "FILE_3D_GLTF",
+    "FILE_3D_OBJ": "FILE_3D_OBJ",
+    "FILE_3D_STL": "FILE_3D_STL",
+    "FILE_3D_USDZ": "FILE_3D_USDZ",
     "FLOAT": "浮點數",
     "FLOATS": "浮點數組",
     "GEMINI_INPUT_FILES": "Gemini輸入檔案",
@@ -423,9 +684,11 @@
     "HOOKS": "掛鉤",
     "HOOK_KEYFRAMES": "關鍵影格掛鉤",
     "IMAGE": "影像",
+    "IMAGECOMPARE": "圖像比較",
     "INT": "整數",
     "LATENT": "latent (潛空間)",
     "LATENT_OPERATION": "latent 操作",
+    "LATENT_UPSCALE_MODEL": "LATENT_UPSCALE_MODEL",
     "LOAD3D_CAMERA": "載入 3D 攝影機",
     "LOAD_3D": "載入 3D",
     "LORA_MODEL": "LoRA模型",
@@ -434,6 +697,8 @@
     "LUMA_REF": "LUMA 參考",
     "MASK": "遮罩",
     "MESH": "網格",
+    "MESHY_RIGGED_TASK_ID": "MESHY_RIGGED_TASK_ID",
+    "MESHY_TASK_ID": "MESHY_TASK_ID",
     "MODEL": "模型",
     "MODEL_PATCH": "模型修補",
     "MODEL_TASK_ID": "模型任務ID",
@@ -442,6 +707,7 @@
     "OPENAI_INPUT_FILES": "OpenAI輸入檔案",
     "PHOTOMAKER": "PhotoMaker",
     "PIXVERSE_TEMPLATE": "PIXVERSE 範本",
+    "POSE_KEYPOINT": "POSE_KEYPOINT",
     "RECRAFT_COLOR": "RECRAFT 顏色",
     "RECRAFT_CONTROLS": "RECRAFT 控制",
     "RECRAFT_V3_STYLE": "RECRAFT V3 風格",
@@ -453,6 +719,7 @@
     "STYLE_MODEL": "風格模型",
     "SVG": "SVG",
     "TIMESTEPS_RANGE": "時間步範圍",
+    "TRACKS": "TRACKS",
     "UPSCALE_MODEL": "升頻模型",
     "VAE": "VAE",
     "VIDEO": "影片",
@@ -511,24 +778,84 @@
     "noStackTrace": "沒有可用的堆疊追蹤",
     "promptExecutionError": "提示執行失敗"
   },
+  "errorOverlay": {
+    "errorCount": "{count} 個錯誤",
+    "seeErrors": "查看錯誤"
+  },
+  "essentials": {
+    "batchImage": "批次圖片",
+    "canny": "Canny 邊緣",
+    "cannyToImage": "Canny 邊緣轉圖片",
+    "cannyToVideo": "Canny 邊緣轉影片",
+    "cropImage": "裁切圖片",
+    "depthToImage": "深度轉圖片",
+    "depthToVideo": "深度轉影片",
+    "extractFrame": "擷取影格",
+    "imageCompare": "圖片比較",
+    "imageTo3DModel": "圖片轉 3D 模型",
+    "imageToImage": "圖片轉圖片",
+    "imageToVideo": "圖片轉影片",
+    "inpaintImage": "圖片修補",
+    "invert": "反相",
+    "lipsync": "唇形同步",
+    "load3DModel": "載入 3D 模型",
+    "loadAudio": "載入音訊",
+    "loadImage": "載入圖片",
+    "loadStyleLora": "載入風格 (LoRA)",
+    "loadVideo": "載入影片",
+    "musicGeneration": "音樂生成",
+    "outpaintImage": "圖片擴展",
+    "poseToImage": "姿勢轉圖片",
+    "poseToVideo": "姿勢轉影片",
+    "removeBackground": "去背",
+    "resizeImage": "調整圖片尺寸",
+    "rotate": "旋轉",
+    "save3DModel": "儲存 3D 模型",
+    "saveAudio": "儲存音訊",
+    "saveImage": "儲存圖片",
+    "saveVideo": "儲存影片",
+    "text": "文字",
+    "textGenerationLLM": "文字生成 (LLM)",
+    "textTo3DModel": "文字轉 3D 模型",
+    "textToImage": "文字轉圖片",
+    "textToVideo": "文字轉影片"
+  },
+  "exportToast": {
+    "allExportsCompleted": "所有匯出已完成",
+    "downloadExport": "下載匯出檔",
+    "downloadFailed": "下載「{name}」失敗",
+    "exportCompleted": "ZIP 下載已就緒",
+    "exportError": "匯出失敗",
+    "exportFailed": "{count} 項匯出失敗",
+    "exportFailedSingle": "建立 ZIP 匯出失敗",
+    "exportStarted": "正在準備 ZIP 下載...",
+    "exportingAssets": "正在匯出資產",
+    "noExportsInQueue": "佇列中沒有 {filter} 匯出",
+    "preparingExport": "正在準備匯出...",
+    "retryDownload": "重試下載"
+  },
   "g": {
     "1x": "1倍速",
     "2x": "2倍速",
     "about": "關於",
     "add": "新增",
+    "addNode": "新增節點...",
     "addNodeFilterCondition": "新增節點篩選條件",
     "all": "全部",
     "amount": "數量",
     "apply": "套用",
     "architecture": "架構",
+    "asset": "{count} 筆資產",
     "audioFailedToLoad": "無法載入音訊",
     "audioProgress": "音訊進度",
     "author": "作者",
     "back": "返回",
+    "batchRename": "批次重新命名",
     "beta": "測試版",
     "bookmark": "儲存至程式庫",
     "calculatingDimensions": "計算尺寸中",
     "cancel": "取消",
+    "cancelled": "已取消",
     "capture": "擷取",
     "category": "分類",
     "chart": "圖表",
@@ -538,6 +865,8 @@
     "clearAll": "全部清除",
     "clearFilters": "清除篩選",
     "close": "關閉",
+    "closeDialog": "關閉對話框",
+    "collapseAll": "全部摺疊",
     "color": "顏色",
     "comfy": "Comfy",
     "comfyOrgLogoAlt": "ComfyOrg 標誌",
@@ -546,6 +875,7 @@
     "commandProhibited": "指令 {command} 已被禁止。如需更多資訊，請聯絡管理員。",
     "community": "社群",
     "completed": "已完成",
+    "completedWithCheckmark": "已完成 ✓",
     "confirm": "確認",
     "confirmed": "已確認",
     "content": "內容",
@@ -554,48 +884,73 @@
     "control_before_generate": "生成前控制",
     "copied": "已複製",
     "copy": "複製",
+    "copyAll": "全部複製",
     "copyJobId": "複製工作 ID",
     "copyToClipboard": "複製到剪貼簿",
     "copyURL": "複製網址",
+    "core": "核心",
     "currentUser": "目前使用者",
+    "custom": "自訂",
     "customBackground": "自訂背景",
     "customize": "自訂",
     "customizeFolder": "自訂資料夾",
+    "decrement": "減少",
     "defaultBanner": "預設橫幅",
     "delete": "刪除",
     "deleteAudioFile": "刪除音訊檔案",
     "deleteImage": "刪除圖片",
     "deprecated": "已棄用",
     "description": "描述",
+    "devOnly": "開發專用",
     "devices": "裝置",
     "disableAll": "全部停用",
+    "disableSelected": "停用所選",
+    "disableThirdParty": "停用第三方",
     "disabling": "停用中",
+    "disconnectedFromBackend": "已與後端斷線。請檢查伺服器是否正在運行。",
     "dismiss": "關閉",
     "download": "下載",
+    "downloadAudio": "下載音訊",
     "downloadImage": "下載圖片",
     "downloadVideo": "下載影片",
+    "downloadWithSize": "下載（{size}）",
+    "downloading": "下載中",
     "dropYourFileOr": "拖放您的檔案或",
     "duplicate": "複製",
     "edit": "編輯",
     "editImage": "編輯圖片",
     "editOrMaskImage": "編輯或遮罩圖片",
+    "emDash": "—",
     "empty": "空",
     "enableAll": "全部啟用",
     "enableOrDisablePack": "啟用或停用套件",
+    "enableSelected": "啟用所選",
     "enabled": "已啟用",
     "enabling": "啟用中",
+    "enter": "輸入",
+    "enterBaseName": "輸入基礎名稱",
+    "enterNewName": "輸入新名稱",
+    "enterNewNamePrompt": "輸入新名稱：",
+    "enterSubgraph": "進入子圖",
     "error": "錯誤",
     "errorLoadingImage": "載入圖片時發生錯誤",
     "errorLoadingVideo": "載入影片時發生錯誤",
+    "essentials": "基本功能",
+    "expandAll": "全部展開",
     "experimental": "實驗性",
     "export": "匯出",
     "extensionName": "擴充套件名稱",
+    "extensions": "擴充功能",
+    "failed": "失敗",
     "failedToCopyJobId": "複製工作 ID 失敗",
     "failedToDownloadImage": "下載圖片失敗",
     "failedToDownloadVideo": "下載影片失敗",
+    "favorites": "我的最愛",
     "feedback": "意見回饋",
     "file": "檔案",
     "filter": "篩選",
+    "filterBy": "篩選依據：",
+    "filterByType": "依 {type} 篩選...",
     "findIssues": "尋找問題",
     "frameNodes": "框架節點",
     "frontendNewer": "前端版本 {frontendVersion} 可能與後端版本 {backendVersion} 不相容。",
@@ -605,23 +960,32 @@
     "goToNode": "前往節點",
     "graphNavigation": "圖形導覽",
     "halfSpeed": "0.5倍速",
+    "hideLeftPanel": "隱藏左側面板",
+    "hideRightPanel": "隱藏右側面板",
     "icon": "圖示",
+    "imageDoesNotExist": "圖像不存在",
     "imageFailedToLoad": "無法載入圖片",
     "imagePreview": "圖片預覽 - 使用方向鍵在圖片間導航",
     "imageUrl": "圖片網址",
     "import": "匯入",
     "inProgress": "進行中",
+    "inSubgraph": "於子圖「{name}」中",
+    "increment": "增加",
     "info": "節點資訊",
+    "input": "輸入",
     "insert": "插入",
     "install": "安裝",
     "installed": "已安裝",
     "installing": "安裝中",
     "interrupted": "已中斷",
     "itemSelected": "已選取 {selectedCount} 項",
+    "itemsCopiedToClipboard": "已複製項目到剪貼簿",
     "itemsSelected": "已選取 {selectedCount} 項",
+    "job": "工作",
     "jobIdCopied": "工作 ID 已複製到剪貼簿",
     "keybinding": "快捷鍵",
     "keybindingAlreadyExists": "快捷鍵已存在於",
+    "keybindings": "快捷鍵",
     "learnMore": "了解更多",
     "listening": "聆聽中...",
     "liveSamplingPreview": "即時取樣預覽",
@@ -632,18 +996,24 @@
     "login": "登入",
     "logoAlt": "ComfyUI 標誌",
     "logs": "日誌",
+    "manageExtensions": "管理擴充功能",
     "markdown": "標記語言",
     "micPermissionDenied": "麥克風權限被拒絕",
     "migrate": "遷移",
     "missing": "缺少",
+    "more": "更多",
     "moreOptions": "更多選項",
     "moreWorkflows": "更多工作流程",
+    "mostRelevant": "最相關",
     "multiSelectDropdown": "多選下拉式選單",
     "name": "名稱",
     "newFolder": "新資料夾",
     "next": "下一步",
+    "nightly": "NIGHTLY",
     "no": "否",
     "noAudioRecorded": "沒有錄製到音訊",
+    "noItems": "沒有項目",
+    "noResults": "沒有結果",
     "noResultsFound": "找不到結果",
     "noTasksFound": "找不到任務",
     "noTasksFoundMessage": "佇列中沒有任務。",
@@ -654,26 +1024,49 @@
     "nodeSlotsError": "節點插槽錯誤",
     "nodeWidgetsError": "節點小工具錯誤",
     "nodes": "節點",
+    "nodesCount": "{count} 個節點 | {count} 個節點 | {count} 個節點",
     "nodesRunning": "節點執行中",
     "none": "無",
+    "nothingToCopy": "沒有可複製的項目",
+    "nothingToDelete": "沒有可刪除的項目",
+    "nothingToDuplicate": "沒有可複製的項目",
+    "nothingToRename": "沒有可重新命名的項目",
     "ok": "確定",
     "openManager": "開啟管理器",
     "openNewIssue": "開啟新問題",
+    "or": "或",
+    "output": "輸出",
     "overwrite": "覆蓋",
+    "partner": "合作夥伴",
+    "playPause": "播放/暫停",
     "playRecording": "播放錄製",
     "playbackSpeed": "播放速度",
     "playing": "播放中",
     "pressKeysForNewBinding": "按下按鍵設定新綁定",
     "preview": "預覽",
+    "profile": "個人檔案",
     "progressCountOf": "共",
+    "queued": "已排隊",
     "ready": "就緒",
+    "recents": "最近使用",
     "reconnected": "已重新連線",
     "reconnecting": "重新連線中",
     "refresh": "重新整理",
     "refreshNode": "重新整理節點",
+    "relativeTime": {
+      "daysAgo": "{count}天前",
+      "hoursAgo": "{count}小時前",
+      "minutesAgo": "{count}分鐘前",
+      "monthsAgo": "{count}個月前",
+      "now": "現在",
+      "weeksAgo": "{count}週前",
+      "yearsAgo": "{count}年前"
+    },
     "releaseTitle": "{package} {version} 版本發佈",
     "reloadToApplyChanges": "重新載入以套用變更",
+    "remove": "移除",
     "removeImage": "移除圖片",
+    "removeTag": "移除標籤",
     "removeVideo": "移除影片",
     "rename": "重新命名",
     "reportIssue": "送出回報",
@@ -688,21 +1081,32 @@
     "resizeFromTopRight": "從右上角調整大小",
     "restart": "重新啟動",
     "resultsCount": "找到 {count} 筆結果",
+    "running": "執行中",
     "save": "儲存",
     "saving": "儲存中",
+    "scrollLeft": "向左捲動",
+    "scrollRight": "向右捲動",
     "search": "搜尋",
     "searchExtensions": "搜尋擴充套件",
     "searchFailedMessage": "找不到符合您搜尋的設定。請嘗試調整搜尋條件。",
     "searchKeybindings": "搜尋快捷鍵",
     "searchModels": "搜尋模型",
     "searchNodes": "搜尋節點",
+    "searchPlaceholder": "搜尋...",
     "searchSettings": "搜尋設定",
     "searchWorkflows": "搜尋工作流程",
     "seeTutorial": "查看教學",
+    "selectItemsToCopy": "請選擇要複製的項目",
+    "selectItemsToDelete": "請選擇要刪除的項目",
+    "selectItemsToDuplicate": "請選擇要複製的項目",
+    "selectItemsToRename": "請選擇要重新命名的項目",
     "selectedFile": "已選取的檔案",
     "setAsBackground": "設為背景",
     "settings": "設定",
+    "shortcutSuffix": "（{shortcut}）",
+    "showLeftPanel": "顯示左側面板",
     "showReport": "顯示報告",
+    "showRightPanel": "顯示右側面板",
     "singleSelectDropdown": "單選下拉式選單",
     "sort": "排序",
     "source": "來源",
@@ -710,19 +1114,24 @@
     "status": "狀態",
     "stopPlayback": "停止播放",
     "stopRecording": "停止錄音",
+    "submit": "提交",
     "success": "成功",
     "systemInfo": "系統資訊",
     "terminal": "終端機",
     "title": "標題",
     "triggerPhrase": "觸發詞",
     "unknownError": "未知錯誤",
+    "unknownFile": "未知檔案",
+    "untitled": "未命名",
     "update": "更新",
     "updateAvailable": "有可用更新",
     "updateFrontend": "更新前端",
     "updated": "已更新",
     "updating": "更新中",
     "upload": "上傳",
+    "uploadAlreadyInProgress": "上傳已在進行中",
     "usageHint": "使用提示",
+    "use": "使用",
     "user": "使用者",
     "versionMismatchWarning": "版本相容性警告",
     "versionMismatchWarningMessage": "{warning}：{detail} 請參閱 https://docs.comfy.org/installation/update_comfyui#common-update-issues 以取得更新說明。",
@@ -730,11 +1139,10 @@
     "videoPreview": "影片預覽 - 使用方向鍵在影片間導航",
     "viewImageOfTotal": "檢視第 {index} 張圖片（共 {total} 張）",
     "viewVideoOfTotal": "檢視第 {index} 個影片（共 {total} 個）",
-    "vitePreloadErrorMessage": "應用程式的新版本已發佈。您要重新載入嗎？\n如果不重新載入，應用程式的某些部分可能無法正常運作。\n您可以拒絕並先儲存進度，稍後再重新載入。",
-    "vitePreloadErrorTitle": "新版本可用",
     "volume": "音量",
     "warning": "警告",
-    "workflow": "工作流程"
+    "workflow": "工作流程",
+    "you": "你"
   },
   "graphCanvasMenu": {
     "fitView": "適合視窗",
@@ -756,11 +1164,17 @@
     "create": "建立群組節點",
     "enterName": "輸入名稱"
   },
+  "help": {
+    "helpCenterMenu": "說明中心選單",
+    "recentReleases": "近期版本"
+  },
   "helpCenter": {
     "clickToLearnMore": "點擊了解更多 →",
     "desktopUserGuide": "桌面版使用指南",
     "docs": "文件",
+    "feedback": "提供回饋",
     "github": "Github",
+    "help": "協助與支援",
     "loadingReleases": "正在載入版本資訊…",
     "managerExtension": "管理器擴充功能",
     "more": "更多…",
@@ -769,6 +1183,12 @@
     "recentReleases": "近期發布",
     "reinstall": "重新安裝",
     "updateAvailable": "有更新",
+    "updateComfyUI": "更新 ComfyUI",
+    "updateComfyUIFailed": "ComfyUI 更新失敗，請再試一次。",
+    "updateComfyUIStarted": "開始更新",
+    "updateComfyUIStartedDetail": "ComfyUI 更新已排入佇列，請稍候……",
+    "updateComfyUISuccess": "更新完成",
+    "updateComfyUISuccessDetail": "ComfyUI 已更新，正在重新啟動……",
     "whatsNew": "有什麼新功能？"
   },
   "icon": {
@@ -782,6 +1202,24 @@
     "inbox": "收件匣",
     "star": "星號"
   },
+  "imageCompare": {
+    "batchLabelA": "A：",
+    "batchLabelB": "B：",
+    "noImages": "沒有可比較的圖像"
+  },
+  "imageCrop": {
+    "cropPreviewAlt": "裁切預覽",
+    "custom": "自訂",
+    "loading": "載入中...",
+    "lockRatio": "鎖定長寬比",
+    "noInputImage": "未連接輸入影像",
+    "ratio": "比例",
+    "unlockRatio": "解除鎖定長寬比"
+  },
+  "importFailed": {
+    "copyError": "複製錯誤",
+    "title": "匯入失敗"
+  },
   "install": {
     "appDataLocationTooltip": "ComfyUI 的應用程式資料目錄。儲存：\n- 日誌\n- 伺服器設定",
     "appPathLocationTooltip": "ComfyUI 的應用程式資產目錄。儲存 ComfyUI 程式碼與資產",
@@ -795,6 +1233,8 @@
     "failedToSelectDirectory": "選擇目錄失敗",
     "gpu": "GPU",
     "gpuPicker": {
+      "amdDescription": "使用您的 AMD 顯示卡搭配 ROCm™ 加速以獲得最佳效能。",
+      "amdSubtitle": "AMD ROCm™",
       "appleMetalDescription": "利用您 Mac 的 GPU 提升速度並獲得更好的整體體驗",
       "cpuDescription": "當 GPU 加速不可用時，使用 CPU 模式以取得相容性",
       "cpuSubtitle": "CPU 模式",
@@ -821,6 +1261,8 @@
       "selectGpuDescription": "選擇您擁有的 GPU 類型"
     },
     "helpImprove": "請協助改進 ComfyUI",
+    "insideAppInstallDir": "此資料夾位於 ComfyUI Desktop 應用程式包內，更新時會被刪除。請選擇安裝資料夾以外的目錄，例如 Documents/ComfyUI。",
+    "insideUpdaterCache": "此資料夾位於 ComfyUI 更新快取中，每次更新時都會清除。請選擇其他位置儲存您的資料。",
     "installLocation": "安裝位置",
     "installLocationDescription": "選擇 ComfyUI 使用者資料的目錄。Python 環境將安裝在所選位置。",
     "installLocationTooltip": "ComfyUI 的使用者資料目錄。儲存：\n- Python 環境\n- 模型\n- 自訂節點\n",
@@ -895,6 +1337,66 @@
   "issueReport": {
     "helpFix": "協助修復此問題"
   },
+  "linearMode": {
+    "appModeToolbar": {
+      "appBuilder": "應用建立器",
+      "apps": "應用",
+      "appsEmptyMessage": "已儲存的應用程式將顯示在這裡。\n點擊下方開始建立您的第一個應用程式。",
+      "enterAppMode": "進入應用程式模式"
+    },
+    "arrange": {
+      "atLeastOne": "至少一個",
+      "connectAtLeastOne": "請連接{atLeastOne}個輸出節點，讓使用者在執行後能看到結果。",
+      "noOutputs": "尚未新增任何輸出",
+      "outputExamples": "範例：「儲存圖像」或「儲存影片」",
+      "outputs": "輸出",
+      "resultsLabel": "執行此應用後，從所選輸出節點產生的結果將顯示於此",
+      "switchToOutputs": "切換到「輸出」步驟，然後點擊輸出節點以將其新增到這裡。",
+      "switchToOutputsButton": "切換到輸出"
+    },
+    "backToWorkflow": "返回工作流程",
+    "beta": "App 模式 Beta - 提供回饋",
+    "builder": {
+      "exit": "離開建構器",
+      "exitConfirmMessage": "您有尚未儲存的變更將會遺失\n確定要不儲存直接離開嗎？",
+      "exitConfirmTitle": "要離開應用程式建構器嗎？",
+      "inputsDesc": "使用者可調整這些參數以產生輸出。",
+      "inputsExample": "例如：「載入圖像」、「文字提示」、「步數」",
+      "noInputs": "尚未新增任何輸入",
+      "noOutputs": "尚未新增任何輸出節點",
+      "outputsDesc": "請至少連接一個輸出節點，讓使用者在執行後能看到結果。",
+      "outputsExample": "例如：「儲存圖像」或「儲存影片」",
+      "promptAddInputs": "點擊節點參數，將其新增為輸入",
+      "promptAddOutputs": "點擊輸出節點，將其新增於此。這些將是產生的結果。",
+      "title": "應用程式建構模式",
+      "unknownWidget": "元件不可見"
+    },
+    "downloadAll": "全部下載",
+    "dragAndDropImage": "拖曳圖片到此",
+    "emptyWorkflowExplanation": "您的工作流程目前是空的。您需要先新增一些節點，才能開始建立應用程式。",
+    "enterNodeGraph": "進入節點圖",
+    "giveFeedback": "提供回饋",
+    "graphMode": "圖形模式",
+    "linearMode": "App 模式",
+    "loadTemplate": "載入範本",
+    "mobileControls": "編輯與執行",
+    "queue": {
+      "clear": "清除佇列",
+      "clickToClear": "點擊以清除佇列"
+    },
+    "rerun": "重新執行",
+    "reuseParameters": "重用參數",
+    "runCount": "執行次數：",
+    "viewJob": "檢視任務",
+    "welcome": {
+      "buildApp": "建立應用",
+      "controls": "您的輸出會顯示在下方，控制項在右側。其他內容都不會干擾您。",
+      "getStarted": "點擊 {runButton} 開始。",
+      "message": "這是一個簡化視圖，隱藏節點圖，讓您專注於創作。",
+      "sharing": "分享很簡單：建立工作流程，開啟 App 模式，右鍵分頁並匯出。其他人開啟你的檔案時，會直接進入這個乾淨的視圖。你可以將強大的工作流程分享成簡單工具，無需理解節點圖。",
+      "title": "歡迎使用 App 模式"
+    }
+  },
   "load3d": {
     "applyingTexture": "正在套用材質貼圖...",
     "backgroundColor": "背景顏色",
@@ -921,20 +1423,24 @@
       "lineart": "線稿",
       "normal": "一般",
       "original": "原始",
+      "pointCloud": "點雲",
       "wireframe": "線框"
     },
     "model": "模型",
     "openIn3DViewer": "在 3D 檢視器中開啟",
+    "panoramaMode": "全景",
     "previewOutput": "預覽輸出",
     "reloadingModel": "重新載入模型中...",
     "removeBackgroundImage": "移除背景圖片",
     "resizeNodeMatchOutput": "調整節點以符合輸出",
     "scene": "場景",
     "showGrid": "顯示格線",
+    "showSkeleton": "顯示骨架",
     "startRecording": "開始錄影",
     "stopRecording": "停止錄影",
     "switchCamera": "切換相機",
     "switchingMaterialMode": "正在切換材質模式...",
+    "tiledMode": "平鋪",
     "unsupportedFileType": "不支援的檔案類型（支援 .gltf、.glb、.obj、.fbx、.stl）",
     "upDirection": "上方方向",
     "upDirections": {
@@ -955,6 +1461,11 @@
       "title": "3D 檢視器（測試版）"
     }
   },
+  "loadWorkflowWarning": {
+    "coreNodesFromVersion": "來自版本 {version} 的核心節點：",
+    "outdatedVersion": "此工作流程是以較新版本的 ComfyUI（{version}）建立的。部分節點可能無法正確運作。",
+    "outdatedVersionGeneric": "此工作流程是以較新版本的 ComfyUI 建立的。部分節點可能無法正確運作。"
+  },
   "maintenance": {
     "None": "無",
     "OK": "正常",
@@ -973,11 +1484,21 @@
     "showManual": "顯示維護任務",
     "status": "狀態",
     "terminalDefaultMessage": "當您執行疑難排解指令時，任何輸出都會顯示在這裡。",
-    "title": "維護"
+    "title": "維護",
+    "unsafeMigration": {
+      "action": "請使用下方「基本路徑」維護任務，將 ComfyUI 移動到安全位置。",
+      "appInstallDir": "您的基本路徑位於 ComfyUI Desktop 應用程式包內。此資料夾在更新時可能會被刪除或覆蓋。請選擇安裝資料夾外的目錄，例如 Documents/ComfyUI。",
+      "generic": "您目前的 ComfyUI 基本路徑位於可能在更新時被刪除或修改的位置。為避免資料遺失，請將其移動到安全的資料夾。",
+      "oneDrive": "您的基本路徑位於 OneDrive，這可能導致同步問題及意外資料遺失。請選擇未由 OneDrive 管理的本機資料夾。",
+      "title": "偵測到不安全的安裝位置",
+      "updaterCache": "您的基本路徑位於 ComfyUI 更新快取中，每次更新時都會清除。請為您的資料選擇其他位置。"
+    }
   },
   "manager": {
+    "actions": "操作",
     "allMissingNodesInstalled": "所有缺少的節點已成功安裝",
     "applyChanges": "套用變更",
+    "basicInfo": "基本資訊",
     "changingVersion": "正在將版本從 {from} 變更為 {to}",
     "clickToFinishSetup": "點擊",
     "conflicts": {
@@ -1013,6 +1534,28 @@
     "disabledNodesWontUpdate": "已停用的節點將不會更新",
     "discoverCommunityContent": "探索社群製作的節點包、擴充功能等...",
     "downloads": "下載次數",
+    "emptyState": {
+      "allInstalled": {
+        "message": "你尚未安裝任何擴充功能。",
+        "title": "尚未安裝擴充功能"
+      },
+      "conflicting": {
+        "message": "你的所有擴充功能皆相容。",
+        "title": "未偵測到衝突"
+      },
+      "missing": {
+        "message": "所有必要的節點都已安裝。",
+        "title": "無缺少的節點"
+      },
+      "updateAvailable": {
+        "message": "你的所有擴充功能都是最新的。",
+        "title": "全部為最新版本"
+      },
+      "workflow": {
+        "message": "此工作流程未使用任何擴充節點。",
+        "title": "工作流程中無擴充功能"
+      }
+    },
     "enablePackToChangeVersion": "啟用此套件以變更版本",
     "errorConnecting": "連線至 Comfy Node Registry 時發生錯誤。",
     "extensionsSuccessfullyInstalled": "擴充功能已成功安裝並可使用！",
@@ -1034,25 +1577,42 @@
     "installingDependencies": "正在安裝相依套件...",
     "lastUpdated": "最後更新",
     "latestVersion": "最新版本",
+    "legacyManagerSearchTip": "正在尋找 ComfyUI-Manager？你可以在啟動 ComfyUI 時加上 --enable-manager-legacy-ui 參數來啟用舊版管理介面。",
     "legacyManagerUI": "使用舊版介面",
     "legacyManagerUIDescription": "若要使用舊版管理介面，請以 --enable-manager-legacy-ui 啟動 ComfyUI",
     "legacyMenuNotAvailable": "舊版管理選單不可用，已預設切換至新版管理選單。",
     "license": "授權條款",
     "loadingVersions": "正在載入版本...",
     "mixedSelectionMessage": "無法對混合選取執行批次操作",
+    "nav": {
+      "allExtensions": "所有擴充功能",
+      "allInWorkflow": "全部於：{workflowName}",
+      "allInstalled": "全部已安裝",
+      "conflicting": "有衝突",
+      "inWorkflowSection": "工作流程中",
+      "installedSection": "已安裝",
+      "missingNodes": "缺少節點",
+      "notInstalled": "未安裝",
+      "updatesAvailable": "有可用更新"
+    },
     "nightlyVersion": "每夜建置版",
     "noDescription": "沒有可用的說明",
     "noNodesFound": "找不到任何節點",
     "noNodesFoundDescription": "此套件的節點無法解析，或此套件僅為前端擴充功能，沒有任何節點。",
     "noResultsFound": "找不到符合搜尋條件的結果。",
     "nodePack": "節點包",
+    "nodePackInfo": "節點包資訊",
     "notAvailable": "不可用",
+    "packInstall": {
+      "nodeIdRequired": "安裝需要節點 ID"
+    },
     "packsSelected": "已選擇套件",
     "repository": "儲存庫",
     "restartToApplyChanges": "請重新啟動 ComfyUI 以套用變更",
     "restartingBackend": "正在重新啟動後端以套用變更...",
     "searchPlaceholder": "搜尋",
     "selectVersion": "選擇版本",
+    "selected": "已選取",
     "sort": {
       "created": "最新上架",
       "downloads": "最受歡迎",
@@ -1074,6 +1634,8 @@
     "totalNodes": "節點總數",
     "tryAgainLater": "請稍後再試。",
     "tryDifferentSearch": "請嘗試其他搜尋關鍵字。",
+    "tryUpdate": "嘗試更新",
+    "tryUpdateTooltip": "從儲存庫拉取最新變更。Nightly 版本可能有無法自動偵測的更新。",
     "uninstall": "解除安裝",
     "uninstallSelected": "解除安裝所選項目",
     "uninstalling": "正在解除安裝",
@@ -1084,31 +1646,111 @@
     "version": "版本"
   },
   "maskEditor": {
+    "activateLayer": "啟用圖層",
+    "applyToWholeImage": "套用至整張圖片",
+    "baseImageLayer": "基礎影像圖層",
+    "baseLayerPreview": "基礎圖層預覽",
+    "black": "黑色",
+    "brushSettings": "筆刷設定",
+    "brushShape": "筆刷形狀",
+    "clear": "清除",
+    "clickToResetZoom": "點擊以重設縮放",
+    "colorSelectSettings": "顏色選擇設定",
+    "colorSelector": "顏色選擇器",
+    "fillOpacity": "填充不透明度",
+    "hardness": "硬度",
+    "imageLayer": "影像圖層",
+    "invert": "反轉",
+    "layers": "圖層",
+    "livePreview": "即時預覽",
+    "maskBlendingOptions": "遮罩混合選項",
+    "maskLayer": "遮罩圖層",
+    "maskOpacity": "遮罩不透明度",
+    "maskTolerance": "遮罩容差",
+    "method": "方法",
+    "mirrorHorizontal": "水平鏡像",
+    "mirrorVertical": "垂直鏡像",
+    "negative": "負片",
+    "opacity": "不透明度",
+    "paintBucketSettings": "油漆桶設定",
+    "paintLayer": "繪圖圖層",
+    "redo": "重做",
+    "resetToDefault": "重設為預設值",
+    "rotateLeft": "向左旋轉",
+    "rotateRight": "向右旋轉",
+    "selectionOpacity": "選取不透明度",
+    "smoothingPrecision": "平滑精度",
+    "stepSize": "步進大小",
+    "stopAtMask": "於遮罩處停止",
+    "thickness": "粗細",
+    "title": "遮罩編輯器",
+    "tolerance": "容差",
+    "undo": "復原",
+    "white": "白色"
   },
   "mediaAsset": {
+    "actions": {
+      "copyJobId": "複製作業 ID",
+      "delete": "刪除",
+      "download": "下載",
+      "exportWorkflow": "匯出工作流程",
+      "insertAsNodeInWorkflow": "插入為工作流程節點",
+      "inspect": "檢查資產",
+      "more": "更多選項",
+      "moreOptions": "更多選項",
+      "openWorkflow": "在新分頁中以工作流程開啟",
+      "seeMoreOutputs": "查看更多輸出",
+      "zoom": "放大"
+    },
     "assetDeletedSuccessfully": "資源刪除成功",
     "deleteAssetDescription": "此資源將被永久移除。",
     "deleteAssetTitle": "刪除此資源？",
     "deleteSelectedDescription": "{count} 個資源將被永久移除。",
     "deleteSelectedTitle": "刪除選取的資源？",
     "deletingImportedFilesCloudOnly": "僅雲端版本支援刪除匯入的檔案",
+    "failedToCreateNode": "建立節點失敗",
     "failedToDeleteAsset": "刪除資源失敗",
+    "failedToExportWorkflow": "匯出工作流程失敗",
     "jobIdToast": {
       "copied": "已複製",
       "error": "錯誤",
       "jobIdCopied": "工作 ID 已複製到剪貼簿",
       "jobIdCopyFailed": "複製工作 ID 失敗"
     },
+    "noJobIdFound": "此資產找不到作業 ID",
+    "noWorkflowDataFound": "此資產找不到工作流程資料",
+    "nodeAddedToWorkflow": "{nodeType} 節點已加入工作流程",
+    "nodeTypeNotFound": "找不到節點類型 {nodeType}",
     "selection": {
       "assetsDeletedSuccessfully": "{count} 個資源刪除成功",
       "deleteSelected": "刪除",
+      "deleteSelectedAll": "全部刪除",
       "deselectAll": "取消全選",
       "downloadSelected": "下載",
+      "downloadSelectedAll": "全部下載",
       "downloadStarted": "正在下載 {count} 個檔案...",
       "downloadsStarted": "已開始下載 {count} 個檔案",
+      "exportStarted": "正在準備 {count} 個檔案的 ZIP 匯出",
+      "exportWorkflowAll": "全部匯出工作流程",
+      "failedToAddNodes": "加入節點至工作流程失敗",
       "failedToDeleteAssets": "刪除選取資源失敗",
-      "selectedCount": "已選取資源：{count}"
-    }
+      "insertAllAssetsAsNodes": "將所有資產插入為節點",
+      "multipleSelectedAssets": "已選取多個資產",
+      "noWorkflowsFound": "所選資產中未找到工作流程資料",
+      "noWorkflowsToExport": "未找到可匯出的工作流程資料",
+      "nodesAddedToWorkflow": "已將 {count} 個節點加入工作流程",
+      "openWorkflowAll": "全部開啟工作流程",
+      "partialAddNodesSuccess": "成功加入 {succeeded} 個，失敗 {failed} 個",
+      "partialDeleteSuccess": "{succeeded} 刪除成功，{failed} 刪除失敗",
+      "partialWorkflowsExported": "成功匯出 {succeeded} 個，失敗 {failed} 個",
+      "partialWorkflowsOpened": "已開啟 {succeeded} 個工作流程，失敗 {failed} 個",
+      "selectedCount": "已選取資源：{count}",
+      "workflowsExported": "成功匯出 {count} 個工作流程",
+      "workflowsOpened": "已在新分頁開啟 {count} 個工作流程"
+    },
+    "unsupportedFileType": "此載入節點不支援的檔案類型",
+    "workflowExportedSuccessfully": "工作流程匯出成功",
+    "workflowOpenedInNewTab": "工作流程已在新分頁開啟"
   },
   "menu": {
     "autoQueue": "自動排隊",
@@ -1116,11 +1758,14 @@
     "batchCountTooltip": "工作流程產生應排入佇列的次數",
     "clear": "清除工作流程",
     "clipspace": "開啟 Clipspace",
+    "customNodesManager": "自訂節點管理器",
     "dark": "深色",
     "disabled": "已停用",
     "disabledTooltip": "工作流程將不會自動排入佇列",
     "execute": "執行",
+    "fullscreen": "全螢幕",
     "help": "說明",
+    "helpAndFeedback": "說明與回饋",
     "hideMenu": "隱藏選單",
     "instant": "立即",
     "instantTooltip": "每次產生完成後，工作流程會立即排入佇列",
@@ -1134,9 +1779,12 @@
     "resetView": "重設畫布視圖",
     "run": "執行",
     "runWorkflow": "執行工作流程（Shift 於前方排隊）",
+    "runWorkflowDisabled": "工作流程包含不支援的節點（以紅色標示）。請移除後再執行工作流程。",
     "runWorkflowFront": "執行工作流程（前方排隊）",
     "settings": "設定",
     "showMenu": "顯示選單",
+    "stopRunInstant": "立即停止執行",
+    "stopRunInstantTooltip": "停止執行",
     "theme": "主題",
     "toggleBottomPanel": "切換下方面板"
   },
@@ -1149,6 +1797,7 @@
     "Canvas Performance": "畫布效能",
     "Canvas Toggle Lock": "切換畫布鎖定",
     "Check for Custom Node Updates": "檢查自訂節點更新",
+    "Check for Updates": "檢查更新",
     "Clear Pending Tasks": "清除待處理任務",
     "Clear Workflow": "清除工作流程",
     "Clipspace": "Clipspace",
@@ -1161,16 +1810,19 @@
     "Contact Support": "聯絡支援",
     "Convert Selection to Subgraph": "將選取內容轉為子圖",
     "Convert selected nodes to group node": "將選取節點轉為群組節點",
+    "Copy": "複製",
     "Custom Nodes (Legacy)": "自訂節點（舊版）",
     "Custom Nodes Manager": "自訂節點管理員",
     "Decrease Brush Size in MaskEditor": "在 MaskEditor 中減小筆刷大小",
     "Delete Selected Items": "刪除選取項目",
+    "Desktop User Guide": "桌面版使用指南",
     "Duplicate Current Workflow": "複製目前工作流程",
     "Edit": "編輯",
     "Edit Subgraph Widgets": "編輯子圖小工具",
     "Exit Subgraph": "退出子圖",
     "Experimental: Browse Model Assets": "實驗性：瀏覽模型資源",
     "Experimental: Enable AssetAPI": "實驗性：啟用 AssetAPI",
+    "Experimental: Enable Nodes 2_0": "實驗性：啟用 Nodes 2.0",
     "Export": "匯出",
     "Export (API)": "匯出（API）",
     "File": "檔案",
@@ -1182,12 +1834,15 @@
     "Increase Brush Size in MaskEditor": "在 MaskEditor 中增大筆刷大小",
     "Install Missing Custom Nodes": "安裝缺少的自訂節點",
     "Interrupt": "中斷",
+    "Job History": "任務歷史",
     "Load Default Workflow": "載入預設工作流程",
     "Lock Canvas": "鎖定畫布",
     "Manage group nodes": "管理群組節點",
     "Manager": "管理員",
     "Manager Menu (Legacy)": "管理員選單（舊版）",
     "Minimap": "迷你地圖",
+    "Mirror Horizontal in MaskEditor": "在遮罩編輯器中水平鏡像",
+    "Mirror Vertical in MaskEditor": "在遮罩編輯器中垂直鏡像",
     "Model Library": "模型庫",
     "Move Selected Nodes Down": "選取節點下移",
     "Move Selected Nodes Left": "選取節點左移",
@@ -1199,9 +1854,18 @@
     "Node Library": "節點庫",
     "Node Links": "節點連結",
     "Open": "開啟",
-    "Open 3D Viewer (Beta) for Selected Node": "為選取節點開啟 3D 檢視器（測試版）",
+    "Open 3D Viewer (Beta) for Selected Node": "為所選節點開啟 3D 檢視器（Beta）",
+    "Open Color Picker in MaskEditor": "在 MaskEditor 中開啟顏色選擇器",
+    "Open Custom Nodes Folder": "開啟自訂節點資料夾",
+    "Open DevTools": "開啟開發者工具",
+    "Open Inputs Folder": "開啟輸入資料夾",
+    "Open Logs Folder": "開啟日誌資料夾",
     "Open Mask Editor for Selected Node": "為選取節點開啟遮罩編輯器",
+    "Open Models Folder": "開啟模型資料夾",
+    "Open Outputs Folder": "開啟輸出資料夾",
     "Open Sign In Dialog": "開啟登入對話框",
+    "Open extra_model_paths_yaml": "開啟 extra_model_paths.yaml",
+    "Paste": "貼上",
     "Pin/Unpin Selected Items": "釘選/取消釘選選取項目",
     "Pin/Unpin Selected Nodes": "釘選/取消釘選選取節點",
     "Previous Opened Workflow": "上一個已開啟的工作流程",
@@ -1209,24 +1873,34 @@
     "Queue Prompt": "加入提示至佇列",
     "Queue Prompt (Front)": "將提示加入佇列前端",
     "Queue Selected Output Nodes": "將選取的輸出節點加入佇列",
+    "Quit": "結束",
     "Redo": "重做",
     "Refresh Node Definitions": "重新整理節點定義",
+    "Reinstall": "重新安裝",
+    "Rename": "重新命名",
     "Reset View": "重設視圖",
     "Resize Selected Nodes": "調整選取節點大小",
+    "Restart": "重新啟動",
+    "Rotate Left in MaskEditor": "在遮罩編輯器中向左旋轉",
+    "Rotate Right in MaskEditor": "在遮罩編輯器中向右旋轉",
     "Save": "儲存",
     "Save As": "另存新檔",
+    "Select All": "全選",
+    "Set Subgraph Description": "設定子圖描述",
+    "Set Subgraph Search Aliases": "設定子圖搜尋別名",
     "Show Keybindings Dialog": "顯示快捷鍵對話框",
     "Show Model Selector (Dev)": "顯示模型選擇器（開發用）",
     "Show Settings Dialog": "顯示設定對話框",
     "Sign Out": "登出",
+    "Toggle App Mode": "切換 App 模式",
     "Toggle Essential Bottom Panel": "切換基本底部面板",
     "Toggle Logs Bottom Panel": "切換日誌底部面板",
+    "Toggle Queue Panel V2": "切換佇列面板 V2",
     "Toggle Search Box": "切換搜尋框",
     "Toggle Terminal Bottom Panel": "切換終端機底部面板",
     "Toggle Theme (Dark/Light)": "切換主題（深色/淺色）",
     "Toggle View Controls Bottom Panel": "切換檢視控制底部面板",
     "Toggle promotion of hovered widget": "切換懸停小工具提升狀態",
-    "Toggle the Custom Nodes Manager Progress Bar": "切換自訂節點管理器進度條",
     "Undo": "復原",
     "Ungroup selected group nodes": "取消群組選取的群組節點",
     "Unload Models": "卸載模型",
@@ -1237,7 +1911,8 @@
     "Workflows": "工作流程",
     "Zoom In": "放大",
     "Zoom Out": "縮小",
-    "Zoom to fit": "縮放至適合大小"
+    "Zoom to fit": "縮放至適合大小",
+    "linearMode_appModeToolbar_apps": "linearMode.appModeToolbar.apps"
   },
   "minimap": {
     "nodeColors": "節點顏色",
@@ -1247,20 +1922,66 @@
     "showLinks": "顯示連結"
   },
   "missingModelsDialog": {
+    "acceptTerms": "接受條款",
+    "customModelsInstruction": "您需要自行尋找並下載這些模型。請在網路上搜尋（可嘗試 Civitai 或 Hugging Face），或聯絡原始工作流程提供者。",
+    "customModelsWarning": "其中有些是我們無法識別的自訂模型。",
+    "description": "此工作流程需要您尚未下載的模型。",
     "doNotAskAgain": "不要再顯示此訊息",
-    "missingModels": "缺少模型",
-    "missingModelsMessage": "載入圖形時，找不到以下模型"
+    "downloadAll": "全部下載",
+    "downloadAvailable": "下載可用項目",
+    "footerDescription": "請下載並將這些模型放置在正確的資料夾中。\n缺少模型的節點會在畫布上以紅色標示。",
+    "gotIt": "知道了",
+    "reEnableInSettings": "請在{link}中重新啟用",
+    "reEnableInSettingsLink": "設定",
+    "title": "此工作流程缺少模型",
+    "totalSize": "總下載大小："
+  },
+  "missingNodes": {
+    "cloud": {
+      "description": "此工作流程使用了雲端版本尚未支援的自訂節點。",
+      "gotIt": "知道了",
+      "learnMore": "了解更多",
+      "priorityMessage": "我們已自動標記這些節點，以便優先新增支援。",
+      "replacementInstruction": "在此期間，請將這些節點（畫布上以紅色標示）替換為支援的節點，或嘗試其他工作流程。",
+      "title": "這些節點尚未在 Comfy Cloud 上提供"
+    },
+    "oss": {
+      "description": "此工作流程使用了你尚未安裝的自訂節點。",
+      "replacementInstruction": "請安裝這些節點以執行此工作流程，或以已安裝的替代節點取代。缺少的節點會在畫布上以紅色標示。",
+      "title": "此工作流程有缺少的節點"
+    }
+  },
+  "nightly": {
+    "badge": {
+      "label": "預覽版本",
+      "tooltip": "您正在使用 ComfyUI 的夜間版本。請使用反饋按鈕分享您對這些功能的看法。"
+    }
+  },
+  "nightlySurvey": {
+    "accept": "好的，我願意協助！",
+    "description": "您已經使用過這個功能。能否花一點時間分享您的回饋？",
+    "dontAskAgain": "不要再詢問",
+    "loadError": "載入問卷失敗。請稍後再試。",
+    "notNow": "暫時不要",
+    "title": "協助我們改進"
   },
   "nodeCategories": {
+    "": "",
     "3d": "3D",
     "3d_models": "3D 模型",
     "BFL": "BFL",
+    "Bria": "Bria",
     "ByteDance": "字節跳動",
+    "ElevenLabs": "ElevenLabs",
     "Gemini": "雙子星",
+    "Grok": "Grok",
+    "HitPaw": "HitPaw",
     "Ideogram": "Ideogram",
     "Kling": "Kling",
     "LTXV": "LTXV",
     "Luma": "Luma",
+    "Magnific": "Magnific",
+    "Meshy": "Meshy",
     "MiniMax": "MiniMax",
     "Moonvalley Marey": "月谷馬雷",
     "OpenAI": "OpenAI",
@@ -1270,10 +1991,13 @@
     "Runway": "跑道",
     "Sora": "蒼穹",
     "Stability AI": "Stability AI",
+    "Tencent": "Tencent",
+    "Topaz": "Topaz",
     "Tripo": "三重奏",
     "Veo": "Veo",
     "Vidu": "維度",
     "Wan": "Wan",
+    "WaveSpeed": "WaveSpeed",
     "_for_testing": "_for_testing",
     "advanced": "進階",
     "animation": "動畫",
@@ -1294,6 +2018,7 @@
     "controlnet": "ControlNet",
     "create": "建立",
     "custom_sampling": "自訂取樣",
+    "dataset": "資料集",
     "debug": "除錯",
     "deprecated": "已棄用",
     "edit_models": "編輯模型",
@@ -1305,8 +2030,10 @@
     "image": "影像",
     "inpaint": "修補",
     "instructpix2pix": "instructpix2pix",
+    "kandinsky5": "kandinsky5",
     "latent": "潛空間",
     "loaders": "載入器",
+    "logic": "邏輯",
     "lotus": "lotus",
     "ltxv": "ltxv",
     "mask": "遮罩",
@@ -1328,11 +2055,13 @@
     "scheduling": "排程",
     "sd": "SD",
     "sd3": "sd3",
+    "shader": "著色器",
     "sigmas": "西格瑪值",
     "stable_cascade": "stable_cascade",
     "string": "字串",
     "style_model": "風格模型",
     "text": "文字",
+    "textgen": "文字生成",
     "training": "訓練",
     "transform": "轉換",
     "unet": "UNet",
@@ -1340,7 +2069,25 @@
     "upscaling": "放大",
     "utils": "工具",
     "video": "影片",
-    "video_models": "影片模型"
+    "video_models": "影片模型",
+    "zimage": "zimage"
+  },
+  "nodeErrors": {
+    "content": "節點內容錯誤",
+    "header": "節點標頭錯誤",
+    "render": "節點渲染錯誤",
+    "slots": "節點插槽錯誤",
+    "widgets": "節點元件錯誤"
+  },
+  "nodeFilters": {
+    "hideDeprecated": "隱藏已棄用節點",
+    "hideDeprecatedDescription": "隱藏標記為已棄用的節點，除非明確啟用",
+    "hideDevOnly": "隱藏僅限開發者節點",
+    "hideDevOnlyDescription": "隱藏標記為僅限開發者的節點，除非啟用開發者模式",
+    "hideExperimental": "隱藏實驗性節點",
+    "hideExperimentalDescription": "隱藏標記為實驗性的節點，除非明確啟用",
+    "hideSubgraph": "隱藏子圖節點",
+    "hideSubgraphDescription": "暫時從節點庫與搜尋中隱藏子圖節點"
   },
   "nodeHelpPage": {
     "documentationPage": "說明文件頁面",
@@ -1350,6 +2097,32 @@
     "outputs": "輸出",
     "type": "類型"
   },
+  "nodeReplacement": {
+    "compatibleAlternatives": "相容替代方案",
+    "installMissingNodes": "安裝缺少的節點",
+    "installationRequired": "需要安裝",
+    "instructionMessage": "您必須安裝這些節點，或以已安裝的替代方案進行替換，才能執行工作流程。缺少的節點會在畫布上以{red}標示。有些節點無法替換，必須透過節點管理器安裝。",
+    "notReplaceable": "需要安裝",
+    "openNodeManager": "開啟節點管理器",
+    "quickFixAvailable": "可用快速修復",
+    "redHighlight": "紅色",
+    "replaceAll": "全部替換",
+    "replaceAllWarning": "將替換此群組中所有可用的節點。",
+    "replaceFailed": "替換節點失敗",
+    "replaceNode": "替換節點",
+    "replaceSelected": "替換所選 ({count})",
+    "replaceWarning": "這將永久修改工作流程。如有疑慮，請先儲存副本。",
+    "replaceable": "可替換",
+    "replaced": "已替換",
+    "replacedAllNodes": "已替換 {count} 種節點類型",
+    "replacedNode": "已替換節點：{nodeType}",
+    "selectAll": "全選",
+    "skipForNow": "暫時略過",
+    "swapNodesGuide": "以下節點可以自動替換為相容的替代品。",
+    "swapNodesTitle": "交換節點",
+    "unknownNode": "未知",
+    "willBeReplacedBy": "此節點將被替換為："
+  },
   "nodeTemplates": {
     "enterName": "輸入名稱",
     "saveAsTemplate": "儲存為範本"
@@ -1357,6 +2130,7 @@
   "notSupported": {
     "continue": "繼續",
     "continueTooltip": "我確定我的裝置受支援",
+    "illustrationAlt": "難過的女孩插圖",
     "learnMore": "了解更多",
     "message": "僅支援以下裝置：",
     "reportIssue": "回報問題",
@@ -1366,12 +2140,222 @@
     },
     "title": "您的裝置不受支援"
   },
+  "painter": {
+    "background": "背景",
+    "brush": "畫筆",
+    "clear": "清除",
+    "color": "顏色選擇器",
+    "eraser": "橡皮擦",
+    "hardness": "硬度",
+    "height": "高度",
+    "size": "游標大小",
+    "tool": "工具",
+    "uploadError": "上傳繪圖圖像失敗：{status} - {statusText}",
+    "width": "寬度"
+  },
+  "progressToast": {
+    "allDownloadsCompleted": "所有下載已完成",
+    "downloadingModel": "正在下載模型...",
+    "downloadsFailed": "{count} 個下載失敗 | {count} 個下載失敗 | {count} 個下載失敗",
+    "failed": "失敗",
+    "filter": {
+      "all": "全部",
+      "completed": "已完成",
+      "failed": "失敗"
+    },
+    "finished": "已完成",
+    "importingModels": "正在匯入模型",
+    "noImportsInQueue": "佇列中沒有 {filter}",
+    "pending": "處理中",
+    "progressCount": "{completed} / {total}"
+  },
+  "queue": {
+    "completedIn": "於 {duration} 完成",
+    "inQueue": "排隊中...",
+    "initializingAlmostReady": "初始化中 - 即將完成",
+    "jobAddedToQueue": "工作已加入佇列",
+    "jobDetails": {
+      "computeHoursUsed": "運算時數",
+      "errorMessage": "錯誤訊息",
+      "estimatedFinishIn": "預計完成於",
+      "estimatedStartIn": "預計開始於",
+      "eta": {
+        "minutes": "~{count} 分鐘 | ~{count} 分鐘",
+        "minutesRange": "~{lo}-{hi} 分鐘",
+        "seconds": "~{count} 秒 | ~{count} 秒",
+        "secondsRange": "~{lo}-{hi} 秒"
+      },
+      "failedAfter": "失敗於",
+      "generatedOn": "生成於",
+      "header": "工作詳情",
+      "jobId": "工作 ID",
+      "queuePosition": "佇列位置",
+      "queuePositionValue": "~{count} 個工作在您之前 | ~{count} 個工作在您之前",
+      "queuedAt": "排隊時間",
+      "report": "回報",
+      "timeElapsed": "已過時間",
+      "totalGenerationTime": "總生成時間",
+      "workflow": "工作流程"
+    },
+    "jobHistory": "工作歷史",
+    "jobList": {
+      "sortComputeHoursUsed": "運算時數（最多優先）",
+      "sortMostRecent": "最新",
+      "sortTotalGenerationTime": "總生成時間（最長優先）",
+      "undated": "未標日期"
+    },
+    "jobMenu": {
+      "addToCurrentWorkflow": "加入目前工作流程",
+      "cancelJob": "取消工作",
+      "copyErrorMessage": "複製錯誤訊息",
+      "copyJobId": "複製工作 ID",
+      "delete": "刪除",
+      "deleteAsset": "刪除資產",
+      "download": "下載",
+      "exportWorkflow": "匯出工作流程",
+      "inspectAsset": "檢視資產",
+      "openAsWorkflowNewTab": "以工作流程於新分頁開啟",
+      "openWorkflowNewTab": "於新分頁開啟工作流程",
+      "removeJob": "移除工作",
+      "reportError": "回報錯誤"
+    },
+    "jobQueueing": "任務排入佇列中",
+    "toggleJobHistory": "切換工作歷史"
+  },
   "releaseToast": {
+    "description": "查看本次更新的最新改進與功能。",
     "newVersionAvailable": "有新版本可用！",
     "skip": "跳過",
     "update": "更新",
     "whatsNew": "有什麼新功能？"
   },
+  "rightSidePanel": {
+    "addFavorite": "收藏",
+    "advancedInputs": "進階輸入",
+    "bypass": "繞過",
+    "color": "節點顏色",
+    "enterSubgraph": "進入子圖",
+    "errorHelp": "如需更多協助，請{github}或{support}",
+    "errorHelpGithub": "提交 GitHub 問題",
+    "errorHelpSupport": "聯絡我們的客服",
+    "errors": "錯誤",
+    "executionErrorOccurred": "執行時發生錯誤。請查看「錯誤」分頁以取得詳細資訊。",
+    "fallbackGroupTitle": "群組",
+    "fallbackNodeTitle": "節點",
+    "favorites": "已收藏輸入",
+    "favoritesNone": "尚無已收藏輸入",
+    "favoritesNoneDesc": "你收藏的輸入會顯示在這裡",
+    "favoritesNoneHint": "在參數分頁，點擊任一輸入的 {moreIcon} 可加入這裡",
+    "favoritesNoneTooltip": "將元件加星標，快速存取無需選擇節點",
+    "globalSettings": {
+      "canvas": "畫布",
+      "connectionLinks": "連接線",
+      "gridSpacing": "網格間距",
+      "linkShape": "連線形狀",
+      "nodes": "節點",
+      "nodes2": "節點 2.0",
+      "searchPlaceholder": "搜尋快速設定...",
+      "showAdvanced": "顯示進階參數",
+      "showAdvancedTooltip": "這是一個重要設定，設為 TRUE 時會顯示所有節點的進階參數",
+      "showConnectedLinks": "顯示已連接線",
+      "showInfoBadges": "顯示資訊徽章",
+      "showToolbox": "選取時顯示工具箱",
+      "snapNodesToGrid": "節點貼齊網格",
+      "title": "全域設定",
+      "viewAllSettings": "檢視所有設定"
+    },
+    "groupSettings": "群組設定",
+    "groups": "群組",
+    "hideAdvancedInputsButton": "隱藏進階輸入",
+    "hideInput": "隱藏輸入",
+    "info": "資訊",
+    "inputs": "輸入",
+    "inputsNone": "無輸入",
+    "inputsNoneTooltip": "此節點沒有輸入",
+    "locateNode": "在畫布上定位節點",
+    "missingNodePacks": {
+      "applyChanges": "套用變更",
+      "cloudMessage": "此工作流程需要 Comfy Cloud 尚未提供的自訂節點。",
+      "collapse": "收合",
+      "expand": "展開",
+      "installAll": "全部安裝",
+      "installNodePack": "安裝節點包",
+      "installed": "已安裝",
+      "installing": "安裝中⋯⋯",
+      "ossManagerDisabledHint": "若要安裝缺少的節點，請先在您的 Python 環境中執行 {pipCmd} 以安裝 Node Manager，然後使用 {flag} 旗標重新啟動 ComfyUI。",
+      "ossMessage": "此工作流程使用了你尚未安裝的自訂節點。",
+      "searchInManager": "在節點管理器中搜尋",
+      "title": "缺少節點包",
+      "unknownPack": "未知的節點包",
+      "unsupportedTitle": "不支援的節點包",
+      "viewInManager": "在管理器中檢視"
+    },
+    "mute": "靜音",
+    "noErrors": "沒有錯誤",
+    "noSelection": "請選擇節點以檢視其屬性與資訊。",
+    "nodeState": "節點狀態",
+    "nodes": "節點",
+    "nodesNoneDesc": "無節點",
+    "noneSearchDesc": "沒有符合搜尋的項目",
+    "normal": "一般",
+    "parameters": "參數",
+    "pinned": "已釘選",
+    "promptErrors": {
+      "no_prompt": {
+        "desc": "傳送到伺服器的工作流程資料為空。這可能是系統發生了非預期的錯誤。"
+      },
+      "prompt_no_outputs": {
+        "desc": "工作流程中沒有任何輸出節點（例如：儲存圖像、預覽圖像），無法產生結果。"
+      },
+      "server_error_cloud": {
+        "desc": "伺服器發生非預期錯誤。請稍後再試。"
+      },
+      "server_error_local": {
+        "desc": "伺服器發生非預期錯誤。請檢查伺服器日誌。"
+      }
+    },
+    "properties": "屬性",
+    "removeFavorite": "取消收藏",
+    "resetAllParameters": "重設所有參數",
+    "resetToDefault": "重設為預設值",
+    "seeError": "查看錯誤",
+    "settings": "設定",
+    "showAdvancedInputsButton": "顯示進階輸入",
+    "showInput": "顯示輸入",
+    "title": "未選取節點 | 已選取 1 個節點 | 已選取 {count} 個節點",
+    "togglePanel": "切換屬性面板",
+    "workflowOverview": "工作流程總覽"
+  },
+  "secrets": {
+    "addSecret": "新增機密",
+    "createdAt": "建立於 {date}",
+    "deleteConfirmMessage": "您確定要刪除「{name}」嗎？此操作無法復原。",
+    "deleteConfirmTitle": "刪除機密",
+    "description": "機密會被加密，用於儲存像 API 金鑰這類敏感資料。",
+    "descriptionUsage": "在這裡儲存您的權杖，以啟用從支援的供應商下載私人與受限模型。",
+    "editSecret": "編輯機密",
+    "errors": {
+      "duplicateName": "已存在同名的機密",
+      "duplicateProvider": "此供應商已存在機密",
+      "nameRequired": "名稱為必填項目",
+      "nameTooLong": "名稱長度必須在 255 個字元以內",
+      "providerRequired": "供應商為必填項目",
+      "secretValueRequired": "機密值為必填項目"
+    },
+    "lastUsed": "上次使用 {date}",
+    "modelProviders": "模型供應商",
+    "name": "名稱",
+    "namePlaceholder": "例如：我的 API 金鑰",
+    "noSecrets": "尚未儲存任何機密。新增您的第一個 API 金鑰以開始使用。",
+    "provider": "供應商",
+    "providerHint": "選填。選擇供應商可自動啟用權杖使用。",
+    "secretValue": "機密值",
+    "secretValueHint": "此值將被加密，且無法再次查看。",
+    "secretValueHintEdit": "若要保留目前的值，請留空。",
+    "secretValuePlaceholder": "請輸入您的 API 金鑰",
+    "secretValuePlaceholderEdit": "輸入新值以變更",
+    "title": "API 金鑰與機密"
+  },
   "selectionToolbox": {
     "Bypass Group Nodes": "繞過群組節點",
     "Set Group Nodes to Always": "將群組節點設為總是",
@@ -1384,6 +2368,8 @@
   "serverConfig": {
     "modifiedConfigs": "您已修改以下伺服器設定。請重新啟動以套用變更。",
     "restart": "重新啟動",
+    "restartRequiredToastDetail": "請重新啟動應用程式以套用伺服器設定變更。",
+    "restartRequiredToastSummary": "需要重新啟動",
     "revertChanges": "還原變更"
   },
   "serverConfigCategories": {
@@ -1452,6 +2438,10 @@
     "enable-cors-header": {
       "name": "啟用 CORS 標頭：使用「*」允許所有來源或指定網域"
     },
+    "enable-manager-legacy-ui": {
+      "name": "使用舊版 Manager 介面",
+      "tooltip": "使用舊版 ComfyUI-Manager 介面而非新版介面。"
+    },
     "fast": {
       "name": "啟用部分未經測試且可能降低品質的最佳化。"
     },
@@ -1553,6 +2543,8 @@
     "CustomColorPalettes": "自訂色彩調色盤",
     "DevMode": "開發者模式",
     "EditTokenWeight": "編輯權重",
+    "Error System": "錯誤系統",
+    "Execution": "執行",
     "Extension": "擴充功能",
     "General": "一般",
     "Graph": "圖形",
@@ -1568,10 +2560,14 @@
     "Menu": "選單",
     "ModelLibrary": "模型庫",
     "Node": "節點",
+    "Node Library": "節點庫",
     "Node Search Box": "節點搜尋框",
     "Node Widget": "節點元件",
     "NodeLibrary": "節點庫",
+    "Nodes 2_0": "Nodes 2.0",
     "Notification Preferences": "通知偏好設定",
+    "Other": "其他",
+    "PLY": "PLY",
     "PlanCredits": "方案與點數",
     "Pointer": "指標",
     "Queue": "佇列",
@@ -1579,6 +2575,7 @@
     "Reroute": "重新導向",
     "RerouteBeta": "重新導向 Beta",
     "Scene": "場景",
+    "Secrets": "機密資訊",
     "Server": "伺服器",
     "Server-Config": "伺服器設定",
     "Settings": "設定",
@@ -1590,7 +2587,8 @@
     "Vue Nodes": "Vue 節點",
     "VueNodes": "Vue 節點",
     "Window": "視窗",
-    "Workflow": "工作流程"
+    "Workflow": "工作流程",
+    "Workspace": "工作區"
   },
   "shape": {
     "CARD": "卡片",
@@ -1616,11 +2614,18 @@
     "viewControls": "檢視控制"
   },
   "sideToolbar": {
+    "activeJobStatus": "進行中作業：{status}",
     "assets": "資源",
     "backToAssets": "返回所有資源",
     "browseTemplates": "瀏覽範例模板",
     "downloads": "下載",
+    "folderView": {
+      "errorDetail": "無法取得此作業的輸出。請再試一次。",
+      "errorSummary": "載入輸出失敗"
+    },
+    "generatedAssetsHeader": "已產生資產",
     "helpCenter": "說明中心",
+    "importedAssetsHeader": "已匯入資產",
     "labels": {
       "assets": "資源",
       "console": "控制台",
@@ -1643,6 +2648,17 @@
     "noImportedFiles": "找不到已匯入的檔案",
     "nodeLibrary": "節點庫",
     "nodeLibraryTab": {
+      "allNodes": "所有節點",
+      "blueprints": "藍圖",
+      "custom": "自訂",
+      "essentials": "基本功能",
+      "filter": "篩選",
+      "filterOptions": {
+        "blueprints": "藍圖",
+        "comfyNodes": "Comfy 節點",
+        "extensions": "擴充功能",
+        "partnerNodes": "合作夥伴節點"
+      },
       "groupBy": "分組依據",
       "groupStrategies": {
         "category": "類別",
@@ -1652,7 +2668,20 @@
         "source": "來源",
         "sourceDesc": "依來源類型分組（核心、自訂、API）"
       },
+      "noBookmarkedNodes": "尚未有收藏",
       "resetView": "重設檢視為預設值",
+      "sections": {
+        "bookmarked": "已收藏",
+        "comfyBlueprints": "Comfy 藍圖",
+        "comfyNodes": "Comfy 節點",
+        "extensions": "擴充功能",
+        "favoriteNode": "收藏節點",
+        "favorites": "我的最愛",
+        "myBlueprints": "我的藍圖",
+        "partnerNodes": "合作夥伴節點",
+        "subgraphBlueprints": "子圖藍圖",
+        "unfavoriteNode": "取消收藏節點"
+      },
       "sortBy": {
         "alphabetical": "字母順序",
         "alphabeticalDesc": "在分組內以字母排序",
@@ -1661,8 +2690,62 @@
       },
       "sortMode": "排序模式"
     },
+    "nodes": "節點",
     "openWorkflow": "在本機檔案系統中開啟工作流程",
     "queue": "佇列",
+    "queueProgressOverlay": {
+      "activeJobs": "{count} 個執行中作業",
+      "activeJobsShort": "{count} 個進行中",
+      "activeJobsSuffix": "執行中作業",
+      "cancelJobTooltip": "取消作業",
+      "clearAllJobsTooltip": "取消所有執行中的作業",
+      "clearHistory": "清除作業佇列歷史",
+      "clearHistoryDialogAssetsNote": "這些作業產生的資產不會被刪除，隨時可從資產面板檢視。",
+      "clearHistoryDialogDescription": "下方所有已完成或失敗的作業將會從此作業佇列面板中移除。",
+      "clearHistoryDialogTitle": "要清除作業佇列歷史嗎？",
+      "clearHistoryMenuAssetsNote": "媒體資產不會被刪除。",
+      "clearQueueTooltip": "清除佇列",
+      "clearQueued": "清除已排入佇列",
+      "colonPercent": "：{percent}",
+      "currentNode": "目前節點：",
+      "dockedJobHistory": "固定工作歷史",
+      "expandCollapsedQueue": "展開作業佇列",
+      "filterAllWorkflows": "所有工作流程",
+      "filterBy": "篩選依據",
+      "filterCurrentWorkflow": "目前工作流程",
+      "filterJobs": "篩選作業",
+      "inlineTotalLabel": "總計",
+      "interruptAll": "中斷所有執行中作業",
+      "jobCompleted": "任務已完成",
+      "jobFailed": "任務失敗",
+      "jobQueue": "作業佇列",
+      "jobsAddedToQueue": "{count} 個任務已加入佇列",
+      "jobsCompleted": "{count} 個作業已完成",
+      "jobsFailed": "{count} 個作業失敗",
+      "moreOptions": "更多選項",
+      "noActiveJobs": "沒有執行中作業",
+      "preview": "預覽",
+      "queuedJobsLabel": "{count} 已排隊",
+      "queuedSuffix": "已排入佇列",
+      "running": "執行中",
+      "runningJobsLabel": "{count} 執行中",
+      "runningQueuedSummary": "{running} 執行中, {queued} 已排隊",
+      "searchJobs": "搜尋...",
+      "showAssets": "顯示資產",
+      "showAssetsPanel": "顯示資產面板",
+      "showRunProgressBar": "顯示運行進度條",
+      "sortBy": "排序依據",
+      "sortJobs": "排序作業",
+      "stubClipTextEncode": "CLIP 文字編碼：",
+      "title": "佇列進度",
+      "total": "總計：{percent}",
+      "viewAllJobs": "檢視所有作業",
+      "viewGrid": "網格檢視",
+      "viewJobHistory": "檢視作業歷史",
+      "viewList": "清單檢視"
+    },
+    "searchAssets": "搜尋資產",
+    "sidebar": "側邊欄",
     "templates": "範本",
     "themeToggle": "切換主題",
     "workflowTab": {
@@ -1686,60 +2769,208 @@
   },
   "subgraphStore": {
     "blueprintName": "子圖名稱",
+    "blueprintNamePrompt": "子圖名稱：",
+    "cannotDeleteGlobal": "無法刪除已安裝的藍圖",
     "confirmDelete": "此操作將永久從您的程式庫中移除藍圖",
     "confirmDeleteTitle": "刪除藍圖？",
+    "disconnected": "已斷線",
+    "enterDescription": "輸入描述",
+    "enterSearchAliases": "輸入搜尋別名（以逗號分隔）",
     "hidden": "隱藏 / 巢狀參數",
     "hideAll": "全部隱藏",
+    "linked": "（已連結）",
     "loadFailure": "載入子圖藍圖失敗",
     "overwriteBlueprint": "儲存將以您的變更覆蓋目前的藍圖",
     "overwriteBlueprintTitle": "覆蓋現有藍圖？",
     "promoteOutsideSubgraph": "不在子圖中時無法提升小工具",
+    "promoteWidget": "推廣元件：{name}",
     "publish": "發佈子圖",
     "publishSuccess": "已儲存至節點庫",
     "publishSuccessMessage": "您可以在節點庫的「子圖藍圖」中找到您的子圖藍圖",
     "saveBlueprint": "將子圖儲存到資料庫",
+    "searchAliases": "搜尋別名",
     "showAll": "顯示全部",
     "showRecommended": "顯示建議的小工具",
-    "shown": "在節點上顯示"
+    "shown": "在節點上顯示",
+    "unpromoteWidget": "取消推廣元件：{name}"
   },
   "subscription": {
     "addApiCredits": "新增 API 點數",
     "addCredits": "新增點數",
+    "addCreditsLabel": "隨時可儲值點數",
     "benefits": {
       "benefit1": "合作節點每月點數 — 需要時可隨時加值",
-      "benefit2": "每項任務最多運行 30 分鐘"
+      "benefit1FreeTier": "每月更多點數，隨時加值",
+      "benefit2": "每項任務最多運行 30 分鐘",
+      "benefit3": "可自帶模型（Creator & Pro）"
     },
     "beta": "測試版",
+    "billedMonthly": "每月收費",
+    "billedYearly": "每年收費 {total}",
+    "billingComingSoon": {
+      "message": "團隊計費功能即將推出。屆時你可以為你的工作區訂閱方案，並依照每位成員計價。請持續關注最新消息。",
+      "title": "即將推出"
+    },
+    "cancelDialog": {
+      "confirmCancel": "取消訂閱",
+      "description": "您的存取權限將持續至 {date}。您將不會再次被收費，您的工作區與點數將被保留。您可隨時重新訂閱。",
+      "endOfBillingPeriod": "帳單週期結束",
+      "failed": "取消訂閱失敗",
+      "keepSubscription": "保留訂閱",
+      "title": "取消訂閱"
+    },
+    "cancelSubscription": "取消訂閱",
+    "cancelSuccess": "訂閱已成功取消",
+    "canceled": "已取消",
+    "canceledCard": {
+      "description": "您將不會再次被收費。您的功能將持續至 {date}。",
+      "title": "您的訂閱已取消"
+    },
+    "changeTo": "切換至 {plan}",
+    "chooseBestPlanWorkspace": "為您的工作區選擇最佳方案",
     "comfyCloud": "Comfy Cloud",
+    "comfyCloudLogo": "Comfy Cloud 標誌",
+    "contactOwnerToSubscribe": "請聯絡工作區擁有者以訂閱",
+    "contactUs": "聯絡我們",
+    "creditsRemainingThisMonth": "本月剩餘點數",
+    "creditsRemainingThisYear": "本年剩餘點數",
+    "creditsYouveAdded": "您已儲值的點數",
+    "currentPlan": "目前方案",
+    "customLoRAsLabel": "匯入您自己的 LoRAs",
+    "description": "選擇最適合您的方案",
+    "descriptionWorkspace": "為您的工作區選擇最佳方案",
     "expiresDate": "將於 {date} 到期",
+    "freeTier": {
+      "description": "您的免費方案每月包含 {credits} 點數，可體驗 Comfy Cloud。",
+      "descriptionGeneric": "您的免費方案每月包含點數額度，可體驗 Comfy Cloud。",
+      "nextRefresh": "您的點數將於 {date} 重置。",
+      "outOfCredits": {
+        "subtitle": "訂閱以解鎖加值與更多功能",
+        "title": "您的免費點數已用完"
+      },
+      "subscribeCta": "訂閱以獲得更多",
+      "title": "您目前使用的是免費方案",
+      "topUpBlocked": {
+        "title": "解鎖加值與更多功能"
+      },
+      "upgradeCta": "查看方案"
+    },
+    "gpuLabel": "RTX 6000 Pro（96GB VRAM）",
+    "haveQuestions": "有疑問或想了解企業方案？",
     "invoiceHistory": "發票記錄",
     "learnMore": "了解更多",
+    "managePayment": "管理付款",
+    "managePlan": "管理方案",
     "manageSubscription": "管理訂閱",
+    "maxDuration": {
+      "creator": "30 分鐘",
+      "founder": "30 分鐘",
+      "free": "30 分鐘",
+      "pro": "1 小時",
+      "standard": "30 分鐘"
+    },
+    "maxDurationLabel": "每次工作流程最長執行時間",
+    "maxMembersLabel": "最大成員數",
+    "member": "成員",
+    "memberCount": "{count} 位成員",
+    "membersLabel": "最多 {count} 位成員",
     "messageSupport": "聯繫客服",
+    "monthly": "每月",
     "monthlyBonusDescription": "每月點數獎勵",
+    "monthlyCreditsInfo": "這些點數每月重置，不可累積",
+    "monthlyCreditsLabel": "每月點數",
+    "monthlyCreditsPerMemberLabel": "每月點數／成員",
     "monthlyCreditsRollover": "這些點數將結轉至下個月",
+    "mostPopular": "最受歡迎",
     "nextBillingCycle": "下個計費週期",
+    "nextMonthInvoice": "下月發票",
     "partnerNodesBalance": "「合作夥伴節點」點數餘額",
     "partnerNodesCredits": "合作節點點數",
     "partnerNodesDescription": "用於執行商業/專有模型",
     "perMonth": "美元 / 月",
+    "plansAndPricing": "方案與價格",
     "prepaidCreditsInfo": "單獨購買且不會過期的點數",
     "prepaidDescription": "預付點數",
+    "preview": {
+      "addCreditCard": "新增信用卡",
+      "backToAllPlans": "返回所有方案",
+      "confirm": "確認",
+      "confirmPayment": "確認您的付款",
+      "confirmPlanChange": "確認您的方案變更",
+      "eachMonthCreditsRefill": "每月點數補充至",
+      "ends": "結束於 {date}",
+      "hideFeatures": "隱藏功能",
+      "nextPaymentDue": "下次付款日為 {date}。可隨時取消。",
+      "perMember": "／成員",
+      "privacyPolicy": "隱私政策",
+      "proratedCharge": "{plan} 按比例收費",
+      "proratedRefund": "{plan} 按比例退款",
+      "showMoreFeatures": "顯示更多功能",
+      "starting": "自 {date} 開始",
+      "startingToday": "今日開始",
+      "terms": "服務條款",
+      "termsAgreement": "繼續即表示您同意 Comfy Org 的{terms}與{privacy}。",
+      "totalDueToday": "今日應付總額"
+    },
     "renewsDate": "將於 {date} 續訂",
     "required": {
+      "pollingFailed": "訂閱啟用失敗",
+      "pollingSuccess": "訂閱已成功啟用！",
+      "pollingTimeout": "等待訂閱逾時。請重新整理並再試一次。",
       "subscribe": "訂閱",
       "title": "訂閱",
       "waitingForSubscription": "請在新分頁中完成訂閱。完成後我們會自動偵測！"
     },
+    "resubscribe": "重新訂閱",
+    "resubscribeSuccess": "訂閱已重新啟用",
+    "resubscribeTo": "重新訂閱 {plan}",
+    "subscribeForMore": "升級",
     "subscribeNow": "立即訂閱",
+    "subscribeTo": "訂閱 {plan}",
     "subscribeToComfyCloud": "訂閱 Comfy Cloud",
     "subscribeToRun": "訂閱",
     "subscribeToRunFull": "訂閱運行方案",
+    "subscriptionRequiredMessage": "會員需訂閱才能在雲端執行工作流程",
+    "tierNameYearly": "{name} 年度方案",
+    "tiers": {
+      "creator": {
+        "name": "創作者版"
+      },
+      "founder": {
+        "name": "創始版"
+      },
+      "free": {
+        "name": "免費"
+      },
+      "pro": {
+        "name": "專業版"
+      },
+      "standard": {
+        "name": "標準版"
+      }
+    },
     "title": "訂閱方案",
     "titleUnsubscribed": "訂閱 Comfy Cloud",
     "totalCredits": "總點數",
+    "upgrade": "升級",
+    "upgradePlan": "升級方案",
+    "upgradeTo": "升級至 {plan}",
+    "upgradeToAddCredits": "升級以增加點數",
+    "usdPerMonth": "美元／月",
+    "usdPerMonthPerMember": "美元／月／成員",
+    "videoEstimateExplanation": "此估算以 Wan 2.2 圖轉影範本的預設設定（5 秒、640x640、16fps、4 步採樣）為基礎。",
+    "videoEstimateHelp": "查看更多此範本細節",
+    "videoEstimateLabel": "以 Wan 2.2 圖轉影範本約可產生的 5 秒影片數量",
+    "videoEstimateTryTemplate": "試用此範本",
+    "videoTemplateBasedCredits": "以 Wan 2.2 圖轉影產生的影片",
+    "viewEnterprise": "查看企業方案",
     "viewMoreDetails": "查看更多詳情",
+    "viewMoreDetailsPlans": "查看更多方案與價格細節",
     "viewUsageHistory": "檢視使用記錄",
+    "workspaceNotSubscribed": "此工作區尚未訂閱",
+    "yearly": "每年",
+    "yearlyCreditsLabel": "年度總點數",
+    "yearlyDiscount": "八折優惠",
     "yourPlanIncludes": "您的方案包含："
   },
   "tabMenu": {
@@ -1751,8 +2982,14 @@
     "duplicateTab": "複製分頁",
     "removeFromBookmarks": "從書籤移除"
   },
+  "templateWidgets": {
+    "sort": {
+      "searchPlaceholder": "搜尋……"
+    }
+  },
   "templateWorkflows": {
     "activeFilters": "篩選條件：",
+    "allTemplates": "所有範本",
     "categories": "分類",
     "category": {
       "3D": "3D",
@@ -1779,6 +3016,7 @@
     "error": {
       "templateNotFound": "找不到範本 \"{templateName}\""
     },
+    "licenseFilter": "授權",
     "loading": "正在載入範本...",
     "loadingMore": "載入更多範本...",
     "modelFilter": "模型篩選",
@@ -1795,14 +3033,19 @@
       "default": "預設",
       "modelSizeLowToHigh": "模型大小 (低到高)",
       "newest": "最新",
+      "popular": "熱門",
       "recommended": "推薦",
       "searchPlaceholder": "搜尋...",
       "vramLowToHigh": "VRAM 使用量 (低到高)"
     },
     "sorting": "排序依據",
     "title": "從範本開始",
+    "useCaseFilter": "任務",
     "useCasesSelected": "{count} 個使用案例"
   },
+  "templates": {
+    "logoProviderSeparator": " ＆ "
+  },
   "toastMessages": {
     "cannotCreateSubgraph": "無法建立子圖",
     "couldNotDetermineFileType": "無法判斷檔案類型",
@@ -1810,6 +3053,7 @@
     "emptyCanvas": "畫布為空",
     "errorCopyImage": "複製圖片時發生錯誤：{error}",
     "errorLoadingModel": "載入模型時發生錯誤",
+    "errorOpenImage": "開啟圖像時發生錯誤：{error}",
     "errorSaveSetting": "儲存設定 {id} 時發生錯誤：{err}",
     "exportSuccess": "已成功將模型匯出為 {format}",
     "failedExecutionPathResolution": "無法解析所選節點的路徑",
@@ -1829,9 +3073,23 @@
     "failedToLoadModel": "無法載入 3D 模型",
     "failedToPurchaseCredits": "購買點數失敗：{error}",
     "failedToQueue": "加入佇列失敗",
+    "failedToSaveDraft": "無法儲存工作流程草稿",
+    "failedToToggleCamera": "切換相機失敗",
+    "failedToToggleGrid": "切換格線失敗",
+    "failedToUpdateBackgroundColor": "更新背景顏色失敗",
+    "failedToUpdateBackgroundImage": "更新背景圖像失敗",
+    "failedToUpdateBackgroundRenderMode": "更新背景渲染模式為 {mode} 失敗",
+    "failedToUpdateEdgeThreshold": "更新邊緣閾值失敗",
+    "failedToUpdateFOV": "更新視野失敗",
+    "failedToUpdateLightIntensity": "更新光源強度失敗",
+    "failedToUpdateMaterialMode": "更新材質模式失敗",
+    "failedToUpdateUpDirection": "更新上方方向失敗",
+    "failedToUploadBackgroundImage": "上傳背景圖像失敗",
     "fileLoadError": "無法在 {fileName} 中找到工作流程",
+    "fileTooLarge": "檔案過大（{size} MB）。最大支援大小為 {maxSize} MB",
     "fileUploadFailed": "檔案上傳失敗",
     "interrupted": "執行已被中斷",
+    "legacyMaskEditorDeprecated": "舊版遮罩編輯器即將淘汰並很快移除。",
     "migrateToLitegraphReroute": "重導節點將於未來版本移除。點擊以遷移至 litegraph 原生重導。",
     "modelLoadedSuccessfully": "3D 模型載入成功",
     "no3dScene": "沒有 3D 場景可套用材質",
@@ -1858,12 +3116,14 @@
     "selectUser": "選擇用戶"
   },
   "userSettings": {
+    "accountSettings": "帳戶設定",
     "email": "電子郵件",
     "name": "名稱",
     "notSet": "未設定",
     "provider": "登入提供者",
     "title": "使用者設定",
-    "updatePassword": "更新密碼"
+    "updatePassword": "更新密碼",
+    "workspaceSettings": "工作區設定"
   },
   "validation": {
     "descriptionRequired": "說明為必填項目",
@@ -1892,35 +3152,230 @@
     "updateFrontend": "更新前端"
   },
   "vueNodesBanner": {
+    "desc": "– 更靈活的工作流程、強大的新元件、專為擴充性打造",
+    "title": "全新 Nodes 2.0 上線",
     "tryItOut": "試試看"
   },
   "vueNodesMigration": {
     "button": "開啟設定",
     "message": "偏好經典節點設計？"
   },
+  "vueNodesMigrationMainMenu": {
+    "message": "隨時可從主選單切換回 Nodes 2.0。"
+  },
+  "vueNodesSlot": {
+    "iterative": "（反覆運算）"
+  },
   "welcome": {
     "getStarted": "開始使用",
     "title": "歡迎使用 ComfyUI"
   },
   "whatsNewPopup": {
+    "later": "稍後",
     "learnMore": "了解更多",
     "noReleaseNotes": "沒有可用的發行說明。"
   },
+  "widgetFileUpload": {
+    "browseFiles": "瀏覽檔案",
+    "dropPrompt": "拖放您的檔案或"
+  },
   "widgets": {
+    "boolean": {
+      "false": "否",
+      "true": "是"
+    },
+    "node2only": "僅限 Node 2.0",
     "selectModel": "選擇模型",
     "uploadSelect": {
+      "maxSelectionReached": "已達到最大選取限制",
       "placeholder": "選擇...",
       "placeholderAudio": "選擇音訊...",
       "placeholderImage": "選擇圖片...",
+      "placeholderMesh": "選擇網格...",
       "placeholderModel": "選擇模型...",
       "placeholderUnknown": "選擇媒體...",
       "placeholderVideo": "選擇影片..."
+    },
+    "valueControl": {
+      "decrement": "減少數值",
+      "decrementDesc": "數值減 1 或選擇上一個選項",
+      "editSettings": "編輯控制設定",
+      "fixed": "固定數值",
+      "fixedDesc": "數值保持不變",
+      "header": {
+        "after": "之後",
+        "before": "之前",
+        "postfix": "執行工作流程：",
+        "prefix": "自動更新數值"
+      },
+      "increment": "增加數值",
+      "incrementDesc": "數值加 1 或選擇下一個選項",
+      "linkToGlobal": "連結到",
+      "linkToGlobalDesc": "連結至全域數值控制設定的唯一數值",
+      "linkToGlobalSeed": "全域數值",
+      "randomize": "隨機數值",
+      "randomizeDesc": "每次生成後隨機打亂數值"
     }
   },
   "workflowService": {
     "enterFilename": "輸入檔案名稱",
+    "enterFilenamePrompt": "請輸入檔案名稱：",
     "exportWorkflow": "匯出工作流程",
-    "saveWorkflow": "儲存工作流程"
+    "saveWorkflow": "儲存工作流程",
+    "savedAsApp": "已轉換為應用程式工作流程",
+    "savedAsWorkflow": "已轉換為僅節點圖工作流程"
+  },
+  "workspace": {
+    "addedToWorkspace": "你已被加入 {workspaceName}",
+    "inviteAccepted": "已接受邀請",
+    "inviteFailed": "接受邀請失敗",
+    "unsavedChanges": {
+      "message": "您有未儲存的變更。是否要捨棄這些變更並切換工作區？",
+      "title": "未儲存的變更"
+    },
+    "viewWorkspace": "檢視工作區"
+  },
+  "workspaceAuth": {
+    "errors": {
+      "accessDenied": "您沒有存取此工作區的權限",
+      "invalidFirebaseToken": "驗證失敗。請重新登入。",
+      "notAuthenticated": "您必須登入才能存取工作區",
+      "tokenExchangeFailed": "與工作區驗證失敗：{error}",
+      "workspaceNotFound": "找不到工作區"
+    }
+  },
+  "workspacePanel": {
+    "createWorkspaceDialog": {
+      "create": "建立",
+      "message": "工作區可讓成員共用點數池。建立後您將成為擁有者。",
+      "nameLabel": "工作區名稱*",
+      "namePlaceholder": "輸入工作區名稱",
+      "title": "建立新工作區"
+    },
+    "dashboard": {
+      "placeholder": "儀表板工作區設定"
+    },
+    "deleteDialog": {
+      "message": "任何未使用的點數或未儲存的資產都將遺失。此操作無法復原。",
+      "messageWithName": "刪除「{name}」？任何未使用的點數或未儲存的資產都將遺失。此操作無法復原。",
+      "title": "確定要刪除此工作區？"
+    },
+    "editWorkspaceDialog": {
+      "nameLabel": "工作區名稱",
+      "save": "儲存",
+      "title": "編輯工作區詳細資料"
+    },
+    "invite": "邀請",
+    "inviteLimitReached": "你已達到最多 50 位成員的上限",
+    "inviteMember": "邀請成員",
+    "inviteMemberDialog": {
+      "createLink": "建立連結",
+      "linkCopied": "已複製",
+      "linkCopyFailed": "複製連結失敗",
+      "linkStep": {
+        "copyLink": "複製連結",
+        "done": "完成",
+        "message": "請確認他們的帳號使用此電子郵件。",
+        "title": "將此連結發送給對方"
+      },
+      "message": "建立可分享的邀請連結並發送給對方",
+      "placeholder": "輸入對方的電子郵件",
+      "title": "邀請他人加入此工作區"
+    },
+    "inviteUpsellDialog": {
+      "messageNotSubscribed": "若要將團隊成員加入此工作區，您需要 Creator 方案或更高級別。Standard 方案僅支援單一席次（擁有者）。",
+      "messageSingleSeat": "Standard 方案僅包含工作區擁有者一席。若要邀請更多成員，請升級至 Creator 方案或更高級別以解鎖多席次功能。",
+      "titleNotSubscribed": "邀請成員需訂閱方案",
+      "titleSingleSeat": "您目前的方案僅支援單一席次",
+      "upgradeToCreator": "升級至 Creator",
+      "viewPlans": "查看方案"
+    },
+    "leaveDialog": {
+      "leave": "離開",
+      "message": "除非聯絡工作區擁有者，否則您將無法再次加入。",
+      "title": "確定要離開此工作區？"
+    },
+    "members": {
+      "actions": {
+        "copyLink": "複製邀請連結",
+        "removeMember": "移除成員",
+        "revokeInvite": "撤銷邀請"
+      },
+      "columns": {
+        "expiryDate": "到期日",
+        "inviteDate": "邀請日期",
+        "joinDate": "加入日期"
+      },
+      "createNewWorkspace": "建立新工作區。",
+      "membersCount": "{count}/50 位成員",
+      "noInvites": "沒有待處理邀請",
+      "noMembers": "沒有成員",
+      "pendingInvitesCount": "{count} 個待處理邀請",
+      "personalWorkspaceMessage": "你目前無法邀請其他成員加入你的個人工作區。若要新增成員，請",
+      "tabs": {
+        "active": "已啟用",
+        "pendingCount": "待處理 ({count})"
+      },
+      "upsellBannerSubscribe": "訂閱 Creator 方案或更高級別，即可邀請團隊成員加入此工作區。",
+      "upsellBannerUpgrade": "升級至 Creator 方案或更高級別，即可邀請更多團隊成員。",
+      "viewPlans": "查看方案"
+    },
+    "menu": {
+      "deleteWorkspace": "刪除工作區",
+      "deleteWorkspaceDisabledTooltip": "請先取消工作區的有效訂閱",
+      "editWorkspace": "編輯工作區詳細資料",
+      "leaveWorkspace": "離開工作區"
+    },
+    "removeMemberDialog": {
+      "error": "移除成員失敗",
+      "message": "此成員將會從你的工作區中移除。他們已使用的點數不會退還。",
+      "remove": "移除成員",
+      "success": "已移除成員",
+      "title": "要移除此成員嗎？"
+    },
+    "revokeInviteDialog": {
+      "message": "此人將無法再加入你的工作區，他們的邀請連結也會失效。",
+      "revoke": "取消邀請",
+      "title": "要取消邀請此人嗎？"
+    },
+    "tabs": {
+      "dashboard": "儀表板",
+      "membersCount": "成員 ({count})",
+      "planCredits": "方案與點數"
+    },
+    "toast": {
+      "failedToCreateWorkspace": "建立工作區失敗",
+      "failedToDeleteWorkspace": "刪除工作區失敗",
+      "failedToFetchWorkspaces": "載入工作區失敗",
+      "failedToLeaveWorkspace": "離開工作區失敗",
+      "failedToUpdateWorkspace": "更新工作區失敗",
+      "workspaceCreated": {
+        "message": "訂閱方案、邀請團隊成員並開始協作。",
+        "subscribe": "訂閱",
+        "title": "已建立工作區"
+      },
+      "workspaceDeleted": {
+        "message": "該工作區已被永久刪除。",
+        "title": "已刪除工作區"
+      },
+      "workspaceLeft": {
+        "message": "你已離開該工作區。",
+        "title": "已離開工作區"
+      },
+      "workspaceUpdated": {
+        "message": "工作區詳細資料已儲存。",
+        "title": "工作區已更新"
+      }
+    }
+  },
+  "workspaceSwitcher": {
+    "createWorkspace": "建立新工作區",
+    "maxWorkspacesReached": "您最多只能擁有 10 個工作區。請刪除一個以建立新工作區。",
+    "personal": "個人",
+    "roleMember": "成員",
+    "roleOwner": "擁有者",
+    "subscribe": "訂閱",
+    "switchWorkspace": "切換工作區"
   },
   "zoomControls": {
     "hideMinimap": "隱藏小地圖",
diff --git a/src/locales/zh-TW/nodeDefs.json b/src/locales/zh-TW/nodeDefs.json
index 70421fd543..9b6b65f04a 100644
--- a/src/locales/zh-TW/nodeDefs.json
+++ b/src/locales/zh-TW/nodeDefs.json
@@ -39,6 +39,87 @@
       "sigmas": {
         "name": "sigmas"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "AddTextPrefix": {
+    "display_name": "新增文字前綴",
+    "inputs": {
+      "prefix": {
+        "name": "前綴",
+        "tooltip": "要新增的前綴。"
+      },
+      "texts": {
+        "name": "文字",
+        "tooltip": "要處理的文字。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "文字",
+        "tooltip": "已處理的文字"
+      }
+    }
+  },
+  "AddTextSuffix": {
+    "display_name": "新增文字後綴",
+    "inputs": {
+      "suffix": {
+        "name": "後綴",
+        "tooltip": "要新增的後綴。"
+      },
+      "texts": {
+        "name": "文字",
+        "tooltip": "要處理的文字。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "文字",
+        "tooltip": "已處理的文字"
+      }
+    }
+  },
+  "AdjustBrightness": {
+    "display_name": "調整亮度",
+    "inputs": {
+      "factor": {
+        "name": "亮度係數",
+        "tooltip": "亮度係數。1.0 = 無變化，<1.0 = 變暗，>1.0 = 變亮。"
+      },
+      "images": {
+        "name": "影像",
+        "tooltip": "要處理的影像。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "影像",
+        "tooltip": "已處理的影像"
+      }
+    }
+  },
+  "AdjustContrast": {
+    "display_name": "調整對比度",
+    "inputs": {
+      "factor": {
+        "name": "對比度係數",
+        "tooltip": "對比度係數。1.0 = 無變化，<1.0 = 對比度降低，>1.0 = 對比度提高。"
+      },
+      "images": {
+        "name": "影像",
+        "tooltip": "要處理的影像。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "影像",
+        "tooltip": "已處理的影像"
+      }
     }
   },
   "AlignYourStepsScheduler": {
@@ -70,6 +151,11 @@
         "name": "volume",
         "tooltip": "以分貝 (dB) 為單位的音量調整。0 = 無變化，+6 = 兩倍，-6 = 一半，依此類推"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "AudioConcat": {
@@ -86,6 +172,11 @@
         "name": "direction",
         "tooltip": "將 audio2 附加在 audio1 之後或之前。"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "AudioEncoderEncode": {
@@ -117,6 +208,47 @@
       }
     }
   },
+  "AudioEqualizer3Band": {
+    "display_name": "音訊等化器（三頻段）",
+    "inputs": {
+      "audio": {
+        "name": "音訊"
+      },
+      "high_freq": {
+        "name": "高頻截止",
+        "tooltip": "高頻架濾波器截止頻率"
+      },
+      "high_gain_dB": {
+        "name": "高頻增益（dB）",
+        "tooltip": "高頻（高音）增益"
+      },
+      "low_freq": {
+        "name": "低頻截止",
+        "tooltip": "低頻架濾波器截止頻率"
+      },
+      "low_gain_dB": {
+        "name": "低頻增益（dB）",
+        "tooltip": "低頻（低音）增益"
+      },
+      "mid_freq": {
+        "name": "中頻中心頻率",
+        "tooltip": "中頻中心頻率"
+      },
+      "mid_gain_dB": {
+        "name": "中頻增益（dB）",
+        "tooltip": "中頻增益"
+      },
+      "mid_q": {
+        "name": "中頻Q值",
+        "tooltip": "中頻Q值（頻寬）"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "AudioMerge": {
     "description": "透過疊加波形來合併兩個音軌。",
     "display_name": "音訊合併",
@@ -131,6 +263,11 @@
         "name": "merge_method",
         "tooltip": "用於合併音訊波形的方法。"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "BasicGuider": {
@@ -142,6 +279,11 @@
       "model": {
         "name": "model"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "BasicScheduler": {
@@ -159,6 +301,50 @@
       "steps": {
         "name": "步驟數"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchImagesNode": {
+    "display_name": "批次影像",
+    "inputs": {
+      "images": {
+        "name": "影像"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchLatentsNode": {
+    "display_name": "批次 latent",
+    "inputs": {
+      "latents": {
+        "name": "latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchMasksNode": {
+    "display_name": "批次遮罩",
+    "inputs": {
+      "masks": {
+        "name": "遮罩"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "BetaSamplingScheduler": {
@@ -176,6 +362,114 @@
       "steps": {
         "name": "步驟數"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BriaImageEditNode": {
+    "description": "使用 Bria 最新模型編輯圖像",
+    "display_name": "Bria 圖像編輯",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "guidance_scale": {
+        "name": "指引強度",
+        "tooltip": "數值越高，圖像越貼合提示詞。"
+      },
+      "image": {
+        "name": "圖像"
+      },
+      "mask": {
+        "name": "遮罩",
+        "tooltip": "若未設定，編輯將套用至整張圖像。"
+      },
+      "model": {
+        "name": "model"
+      },
+      "moderation": {
+        "name": "審核",
+        "tooltip": "審核設定"
+      },
+      "negative_prompt": {
+        "name": "負面提示詞"
+      },
+      "prompt": {
+        "name": "提示詞",
+        "tooltip": "編輯圖像的指令"
+      },
+      "seed": {
+        "name": "種子"
+      },
+      "steps": {
+        "name": "步數"
+      },
+      "structured_prompt": {
+        "name": "結構化提示詞",
+        "tooltip": "包含結構化編輯提示的 JSON 格式字串。若需精確、程式化控制，請使用此項取代一般提示詞。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "結構化提示詞",
+        "tooltip": null
+      }
+    }
+  },
+  "BriaRemoveImageBackground": {
+    "description": "使用 Bria RMBG 2.0 移除影像的背景。",
+    "display_name": "Bria 移除影像背景",
+    "inputs": {
+      "control_after_generate": {
+        "name": "產生後控制"
+      },
+      "image": {
+        "name": "影像"
+      },
+      "moderation": {
+        "name": "審核",
+        "tooltip": "審核設定"
+      },
+      "seed": {
+        "name": "種子",
+        "tooltip": "種子控制此節點是否重新執行；無論種子為何，結果皆為非決定性。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BriaRemoveVideoBackground": {
+    "description": "使用 Bria 移除影片的背景。",
+    "display_name": "Bria 移除影片背景",
+    "inputs": {
+      "background_color": {
+        "name": "背景顏色",
+        "tooltip": "輸出影片的背景顏色。"
+      },
+      "control_after_generate": {
+        "name": "產生後控制"
+      },
+      "seed": {
+        "name": "種子",
+        "tooltip": "種子控制此節點是否重新執行；無論種子為何，結果皆為非決定性。"
+      },
+      "video": {
+        "name": "影片"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ByteDanceFirstLastFrameNode": {
@@ -201,6 +495,10 @@
         "name": "首幀",
         "tooltip": "用於影片的首幀。"
       },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "此參數僅適用於 seedance-1-5-pro，其他模型將會忽略。"
+      },
       "last_frame": {
         "name": "尾幀",
         "tooltip": "用於影片的尾幀。"
@@ -231,43 +529,6 @@
       }
     }
   },
-  "ByteDanceImageEditNode": {
-    "description": "透過 API 使用字節跳動模型根據提示詞編輯圖片",
-    "display_name": "字節跳動圖片編輯",
-    "inputs": {
-      "control_after_generate": {
-        "name": "control after generate"
-      },
-      "guidance_scale": {
-        "name": "guidance_scale",
-        "tooltip": "數值越高，圖像越遵循提示詞"
-      },
-      "image": {
-        "name": "圖片",
-        "tooltip": "要編輯的基礎圖片"
-      },
-      "model": {
-        "name": "模型"
-      },
-      "prompt": {
-        "name": "提示詞",
-        "tooltip": "編輯圖片的指令"
-      },
-      "seed": {
-        "name": "seed",
-        "tooltip": "用於生成的種子值"
-      },
-      "watermark": {
-        "name": "watermark",
-        "tooltip": "是否在圖像上添加「AI 生成」浮水印"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
   "ByteDanceImageNode": {
     "description": "透過 API 基於提示詞使用字節跳動模型生成圖像",
     "display_name": "字節跳動圖像",
@@ -377,6 +638,10 @@
         "name": "duration",
         "tooltip": "輸出影片的持續時間（以秒為單位）。"
       },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "此參數僅適用於 seedance-1-5-pro，其他模型將會忽略。"
+      },
       "image": {
         "name": "image",
         "tooltip": "用於影片的第一幀圖片。"
@@ -431,8 +696,7 @@
         "tooltip": "當 sequential_image_generation='auto' 時，生成圖像的最大數量。總圖像數（輸入 + 生成）不得超過 15 張。"
       },
       "model": {
-        "name": "model",
-        "tooltip": "模型名稱"
+        "name": "model"
       },
       "prompt": {
         "name": "prompt",
@@ -484,6 +748,10 @@
         "name": "持續時間",
         "tooltip": "輸出影片的持續時間（秒）。"
       },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "此參數僅適用於 seedance-1-5-pro，其他模型將會忽略。"
+      },
       "model": {
         "name": "模型"
       },
@@ -525,6 +793,11 @@
       "positive": {
         "name": "正向"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "CFGNorm": {
@@ -763,6 +1036,25 @@
       }
     }
   },
+  "CLIPTextEncodeKandinsky5": {
+    "display_name": "CLIPTextEncodeKandinsky5",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "clip_l": {
+        "name": "clip_l"
+      },
+      "qwen25_7b": {
+        "name": "qwen25_7b"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "CLIPTextEncodeLumina2": {
     "description": "使用 CLIP 模型將系統提示與使用者提示編碼為嵌入向量，可用於引導擴散模型生成特定圖像。",
     "display_name": "CLIP 文本編碼（Lumina2）",
@@ -953,6 +1245,29 @@
       }
     }
   },
+  "CenterCropImages": {
+    "display_name": "中心裁切影像",
+    "inputs": {
+      "height": {
+        "name": "高度",
+        "tooltip": "裁切高度。"
+      },
+      "images": {
+        "name": "影像",
+        "tooltip": "要處理的影像。"
+      },
+      "width": {
+        "name": "寬度",
+        "tooltip": "裁切寬度。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "影像",
+        "tooltip": "已處理的影像"
+      }
+    }
+  },
   "CheckpointLoader": {
     "display_name": "載入檢查點與設定檔（已淘汰）",
     "inputs": {
@@ -1032,6 +1347,21 @@
       }
     }
   },
+  "ColorToRGBInt": {
+    "description": "將顏色轉換為 RGB 整數值。",
+    "display_name": "顏色轉為 RGB 整數值",
+    "inputs": {
+      "color": {
+        "name": "顏色"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "rgb 整數值",
+        "tooltip": null
+      }
+    }
+  },
   "CombineHooks2": {
     "display_name": "合併 Hooks [2]",
     "inputs": {
@@ -1089,6 +1419,26 @@
       }
     }
   },
+  "ComfySwitchNode": {
+    "display_name": "切換",
+    "inputs": {
+      "on_false": {
+        "name": "為假時"
+      },
+      "on_true": {
+        "name": "為真時"
+      },
+      "switch": {
+        "name": "切換"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "輸出",
+        "tooltip": null
+      }
+    }
+  },
   "ConditioningAverage": {
     "display_name": "條件設定（平均）",
     "inputs": {
@@ -1323,10 +1673,12 @@
     },
     "outputs": {
       "0": {
-        "name": "正向"
+        "name": "正向",
+        "tooltip": null
       },
       "1": {
-        "name": "負向"
+        "name": "負向",
+        "tooltip": null
       }
     }
   },
@@ -1385,6 +1737,10 @@
         "name": "維度",
         "tooltip": "應用上下文窗口的維度。"
       },
+      "freenoise": {
+        "name": "自由雜訊",
+        "tooltip": "是否應用 FreeNoise 雜訊洗牌，可改善視窗混合效果。"
+      },
       "fuse_method": {
         "name": "融合方法",
         "tooltip": "用於融合上下文窗口的方法。"
@@ -1745,6 +2101,20 @@
       }
     }
   },
+  "CreateList": {
+    "display_name": "建立清單",
+    "inputs": {
+      "inputs": {
+        "name": "輸入"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "清單",
+        "tooltip": null
+      }
+    }
+  },
   "CreateVideo": {
     "description": "從圖片建立影片。",
     "display_name": "建立影片",
@@ -1767,6 +2137,35 @@
       }
     }
   },
+  "CropByBBoxes": {
+    "description": "根據提供的邊界框，從輸入影像批次中裁切並調整區域大小。",
+    "display_name": "CropByBBoxes",
+    "inputs": {
+      "bboxes": {
+        "name": "bboxes"
+      },
+      "image": {
+        "name": "image"
+      },
+      "output_height": {
+        "name": "output_height",
+        "tooltip": "每個裁切區域調整後的高度。"
+      },
+      "output_width": {
+        "name": "output_width",
+        "tooltip": "每個裁切區域調整後的寬度。"
+      },
+      "padding": {
+        "name": "padding",
+        "tooltip": "在裁切前，於邊界框每側額外增加的像素邊距。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "所有裁切區域堆疊為單一影像批次。"
+      }
+    }
+  },
   "CropMask": {
     "display_name": "裁剪遮罩",
     "inputs": {
@@ -1785,6 +2184,30 @@
       "y": {
         "name": "Y 座標"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CustomCombo": {
+    "display_name": "自訂組合",
+    "inputs": {
+      "choice": {
+        "name": "選項"
+      },
+      "index": {},
+      "option1": {}
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "INDEX",
+        "tooltip": null
+      }
     }
   },
   "DiffControlNetLoader": {
@@ -1823,7 +2246,12 @@
     }
   },
   "DisableNoise": {
-    "display_name": "停用雜訊"
+    "display_name": "停用雜訊",
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
   },
   "DualCFGGuider": {
     "display_name": "雙 CFG 引導器",
@@ -1849,6 +2277,11 @@
       "style": {
         "name": "風格"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "DualCLIPLoader": {
@@ -1900,6 +2333,321 @@
       }
     }
   },
+  "ElevenLabsAudioIsolation": {
+    "description": "從音訊中移除背景噪音，僅保留人聲或語音。",
+    "display_name": "ElevenLabs 語音隔離",
+    "inputs": {
+      "audio": {
+        "name": "音訊",
+        "tooltip": "要進行背景噪音移除處理的音訊。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsInstantVoiceClone": {
+    "description": "從音訊樣本建立克隆語音。請提供 1-8 段要克隆的語音錄音。",
+    "display_name": "ElevenLabs 即時語音克隆",
+    "inputs": {
+      "files": {
+        "name": "檔案",
+        "tooltip": "用於語音克隆的語音錄音。"
+      },
+      "remove_background_noise": {
+        "name": "移除背景噪音",
+        "tooltip": "使用音訊隔離從語音樣本中移除背景噪音。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "語音",
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsSpeechToSpeech": {
+    "description": "將一種語音轉換為另一種語音，同時保留原始內容與情感。",
+    "display_name": "ElevenLabs 語音轉語音",
+    "inputs": {
+      "audio": {
+        "name": "音訊",
+        "tooltip": "要轉換的來源音訊。"
+      },
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "用於語音轉語音轉換的模型。"
+      },
+      "model_similarity_boost": {
+        "name": "相似度提升"
+      },
+      "model_speed": {
+        "name": "速度"
+      },
+      "model_style": {
+        "name": "風格"
+      },
+      "model_use_speaker_boost": {
+        "name": "使用說話者增強"
+      },
+      "output_format": {
+        "name": "輸出格式",
+        "tooltip": "音訊輸出格式。"
+      },
+      "remove_background_noise": {
+        "name": "移除背景噪音",
+        "tooltip": "使用音訊隔離從輸入音訊中移除背景噪音。"
+      },
+      "seed": {
+        "name": "種子",
+        "tooltip": "用於重現性的種子值。"
+      },
+      "stability": {
+        "name": "穩定性",
+        "tooltip": "語音穩定性。較低的值提供更廣泛的情感範圍，較高的值則產生更一致但可能較單調的語音。"
+      },
+      "voice": {
+        "name": "目標語音",
+        "tooltip": "轉換的目標語音。可從語音選擇器或即時語音克隆連接。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsSpeechToText": {
+    "description": "將音訊轉錄為文字。支援自動語言偵測、說話者分離與音訊事件標記。",
+    "display_name": "ElevenLabs 語音轉文字",
+    "inputs": {
+      "audio": {
+        "name": "音訊",
+        "tooltip": "要轉錄的音訊。"
+      },
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "language_code": {
+        "name": "語言代碼",
+        "tooltip": "ISO-639-1 或 ISO-639-3 語言代碼（例如 'en'、'es'、'fra'）。留空以自動偵測。"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "用於轉錄的模型。"
+      },
+      "model_diarization_threshold": {
+        "name": "分離閾值"
+      },
+      "model_diarize": {
+        "name": "說話者分離"
+      },
+      "model_tag_audio_events": {
+        "name": "音訊事件標記"
+      },
+      "model_temperature": {
+        "name": "溫度"
+      },
+      "model_timestamps_granularity": {
+        "name": "時間戳精細度"
+      },
+      "num_speakers": {
+        "name": "說話者數量",
+        "tooltip": "預測的最大說話者數量。設為 0 以自動偵測。"
+      },
+      "seed": {
+        "name": "隨機種子",
+        "tooltip": "用於重現性的隨機種子（不保證完全確定性）。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "文字",
+        "tooltip": null
+      },
+      "1": {
+        "name": "語言代碼",
+        "tooltip": null
+      },
+      "2": {
+        "name": "單詞 JSON",
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToDialogue": {
+    "description": "從文字產生多說話者對話。每個對話項目有其專屬文字與語音。",
+    "display_name": "ElevenLabs 文字轉對話",
+    "inputs": {
+      "apply_text_normalization": {
+        "name": "套用文字正規化",
+        "tooltip": "文字正規化模式。'auto' 由系統決定，'on' 總是套用正規化，'off' 則略過。"
+      },
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "inputs": {
+        "name": "對話項目數",
+        "tooltip": "對話項目的數量。"
+      },
+      "inputs_text1": {
+        "name": "文字1"
+      },
+      "language_code": {
+        "name": "語言代碼",
+        "tooltip": "ISO-639-1 或 ISO-639-3 語言代碼（例如 'en'、'es'、'fra'）。留空以自動偵測。"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "用於對話生成的模型。"
+      },
+      "output_format": {
+        "name": "輸出格式",
+        "tooltip": "音訊輸出格式。"
+      },
+      "seed": {
+        "name": "隨機種子",
+        "tooltip": "用於重現性的隨機種子。"
+      },
+      "stability": {
+        "name": "穩定性",
+        "tooltip": "語音穩定性。較低值提供更廣的情感範圍，較高值則產生更一致但可能較單調的語音。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToSoundEffects": {
+    "description": "根據文字描述產生音效。",
+    "display_name": "ElevenLabs 文字轉音效",
+    "inputs": {
+      "model": {
+        "name": "模型",
+        "tooltip": "用於音效生成的模型。"
+      },
+      "model_duration": {
+        "name": "時長"
+      },
+      "model_loop": {
+        "name": "循環"
+      },
+      "model_prompt_influence": {
+        "name": "提示影響力"
+      },
+      "output_format": {
+        "name": "輸出格式",
+        "tooltip": "音訊輸出格式。"
+      },
+      "text": {
+        "name": "文字",
+        "tooltip": "要產生的音效文字描述。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToSpeech": {
+    "description": "將文字轉換為語音。",
+    "display_name": "ElevenLabs 語音合成",
+    "inputs": {
+      "apply_text_normalization": {
+        "name": "套用文字正規化",
+        "tooltip": "文字正規化模式。'auto' 由系統自動決定，'on' 總是套用正規化，'off' 則跳過正規化。"
+      },
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "language_code": {
+        "name": "語言代碼",
+        "tooltip": "ISO-639-1 或 ISO-639-3 語言代碼（例如 'en'、'es'、'fra'）。留空則自動偵測。"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "用於文字轉語音的模型。"
+      },
+      "model_similarity_boost": {
+        "name": "相似度提升"
+      },
+      "model_speed": {
+        "name": "速度"
+      },
+      "model_style": {
+        "name": "風格"
+      },
+      "model_use_speaker_boost": {
+        "name": "啟用說話者增強"
+      },
+      "output_format": {
+        "name": "輸出格式",
+        "tooltip": "音訊輸出格式。"
+      },
+      "seed": {
+        "name": "種子值",
+        "tooltip": "用於重現性的種子值（不保證完全確定性）。"
+      },
+      "stability": {
+        "name": "穩定性",
+        "tooltip": "語音穩定性。較低的值提供更廣泛的情感表現，較高的值則產生更一致但可能較單調的語音。"
+      },
+      "text": {
+        "name": "文字",
+        "tooltip": "要轉換為語音的文字內容。"
+      },
+      "voice": {
+        "name": "語音",
+        "tooltip": "用於語音合成的聲音。可從語音選擇器或即時語音克隆連接。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsVoiceSelector": {
+    "description": "選擇預設的 ElevenLabs 語音用於文字轉語音生成。",
+    "display_name": "ElevenLabs 語音選擇器",
+    "inputs": {
+      "voice": {
+        "name": "語音",
+        "tooltip": "從預設的 ElevenLabs 語音中選擇一個語音。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "語音",
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyAceStep1_5LatentAudio": {
+    "display_name": "Empty Ace Step 1.5 Latent Audio",
+    "inputs": {
+      "batch_size": {
+        "name": "批次大小",
+        "tooltip": "批次中 latent 圖像的數量。"
+      },
+      "seconds": {
+        "name": "秒數"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyAceStepLatentAudio": {
     "display_name": "EmptyAceStepLatentAudio",
     "inputs": {
@@ -1932,6 +2680,11 @@
         "name": "取樣率",
         "tooltip": "空白音訊片段的取樣率。"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "EmptyChromaRadianceLatentImage": {
@@ -1975,6 +2728,25 @@
       }
     }
   },
+  "EmptyFlux2LatentImage": {
+    "display_name": "空白 Flux 轉 Latent",
+    "inputs": {
+      "batch_size": {
+        "name": "批次大小"
+      },
+      "height": {
+        "name": "高度"
+      },
+      "width": {
+        "name": "寬度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyHunyuanImageLatent": {
     "display_name": "EmptyHunyuanImageLatent",
     "inputs": {
@@ -2016,6 +2788,28 @@
       }
     }
   },
+  "EmptyHunyuanVideo15Latent": {
+    "display_name": "空白 HunyuanVideo 1.5 Latent",
+    "inputs": {
+      "batch_size": {
+        "name": "批次大小"
+      },
+      "height": {
+        "name": "高度"
+      },
+      "length": {
+        "name": "長度"
+      },
+      "width": {
+        "name": "寬度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyImage": {
     "display_name": "空白圖片",
     "inputs": {
@@ -2065,6 +2859,11 @@
       "seconds": {
         "name": "秒數"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "EmptyLatentHunyuan3Dv2": {
@@ -2077,6 +2876,11 @@
       "resolution": {
         "name": "解析度"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "EmptyLatentImage": {
@@ -2124,6 +2928,28 @@
       }
     }
   },
+  "EmptyQwenImageLayeredLatentImage": {
+    "display_name": "空白 Qwen 圖像分層 Latent",
+    "inputs": {
+      "batch_size": {
+        "name": "批次大小"
+      },
+      "height": {
+        "name": "高度"
+      },
+      "layers": {
+        "name": "圖層數"
+      },
+      "width": {
+        "name": "寬度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptySD3LatentImage": {
     "display_name": "EmptySD3LatentImage",
     "inputs": {
@@ -2171,6 +2997,11 @@
       "steps": {
         "name": "步驟數"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ExtendIntermediateSigmas": {
@@ -2191,6 +3022,11 @@
       "steps": {
         "name": "步驟數"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FeatherMask": {
@@ -2211,6 +3047,11 @@
       "top": {
         "name": "上方"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FlipSigmas": {
@@ -2219,6 +3060,102 @@
       "sigmas": {
         "name": "sigmas"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Flux2MaxImageNode": {
+    "description": "根據提示詞與解析度同步生成圖像。",
+    "display_name": "Flux.2 [max] 圖像",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "height": {
+        "name": "高度"
+      },
+      "images": {
+        "name": "參考圖像",
+        "tooltip": "最多可使用 9 張圖像作為參考。"
+      },
+      "prompt": {
+        "name": "提示詞",
+        "tooltip": "用於圖像生成或編輯的提示詞"
+      },
+      "prompt_upsampling": {
+        "name": "提示詞升頻",
+        "tooltip": "是否對提示詞進行升頻。啟用時，會自動調整提示詞以產生更具創意的圖像。"
+      },
+      "seed": {
+        "name": "隨機種子",
+        "tooltip": "用於產生雜訊的隨機種子。"
+      },
+      "width": {
+        "name": "寬度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Flux2ProImageNode": {
+    "description": "根據提示詞與解析度同步生成圖像。",
+    "display_name": "Flux.2 [pro] 圖像",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "height": {
+        "name": "高度"
+      },
+      "images": {
+        "name": "參考圖像",
+        "tooltip": "最多可使用 9 張圖像作為參考。"
+      },
+      "prompt": {
+        "name": "提示詞",
+        "tooltip": "用於圖像生成或編輯的提示詞"
+      },
+      "prompt_upsampling": {
+        "name": "提示詞升頻",
+        "tooltip": "是否對提示詞進行升頻。啟用時，會自動調整提示詞以產生更具創意的圖像。"
+      },
+      "seed": {
+        "name": "隨機種子",
+        "tooltip": "用於產生雜訊的隨機種子。"
+      },
+      "width": {
+        "name": "寬度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Flux2Scheduler": {
+    "display_name": "Flux2Scheduler",
+    "inputs": {
+      "height": {
+        "name": "高度"
+      },
+      "steps": {
+        "name": "步數"
+      },
+      "width": {
+        "name": "寬度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FluxDisableGuidance": {
@@ -2541,6 +3478,11 @@
       "s2": {
         "name": "s2"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "FreeU_V2": {
@@ -2561,6 +3503,11 @@
       "s2": {
         "name": "s2"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "GITSScheduler": {
@@ -2619,6 +3566,102 @@
       }
     }
   },
+  "GLSLShader": {
+    "description": "將 GLSL ES 片段著色器應用於影像。u_resolution（vec2）始終可用。",
+    "display_name": "GLSL 葉片著色器",
+    "inputs": {
+      "floats": {
+        "name": "浮點數",
+        "tooltip": "浮點數在著色器程式碼中以 u_float0-4 提供"
+      },
+      "fragment_shader": {
+        "name": "片段著色器",
+        "tooltip": "GLSL 片段著色器原始碼（相容 GLSL ES 3.00 / WebGL 2.0）"
+      },
+      "images": {
+        "name": "影像",
+        "tooltip": "影像在著色器程式碼中以 u_image0-4（sampler2D）提供"
+      },
+      "ints": {
+        "name": "整數",
+        "tooltip": "整數在著色器程式碼中以 u_int0-4 提供"
+      },
+      "size_mode": {
+        "name": "尺寸模式",
+        "tooltip": "輸出尺寸：「from_input」使用第一個輸入影像的尺寸，「custom」可手動設定尺寸"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "影像0",
+        "tooltip": "可在著色器程式碼中以 layout(location = 0) out vec4 fragColor0 取得"
+      },
+      "1": {
+        "name": "影像1",
+        "tooltip": "可在著色器程式碼中以 layout(location = 1) out vec4 fragColor1 取得"
+      },
+      "2": {
+        "name": "影像2",
+        "tooltip": "可在著色器程式碼中以 layout(location = 2) out vec4 fragColor2 取得"
+      },
+      "3": {
+        "name": "影像3",
+        "tooltip": "可在著色器程式碼中以 layout(location = 3) out vec4 fragColor3 取得"
+      }
+    }
+  },
+  "GeminiImage2Node": {
+    "description": "透過 Google Vertex API 同步產生或編輯影像。",
+    "display_name": "Nano Banana Pro（Google Gemini Image）",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "若設為「auto」，則會配合輸入影像的長寬比；若未提供影像，通常會產生 16:9 的正方形。"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "files": {
+        "name": "files",
+        "tooltip": "可選的檔案，作為模型的參考。可接受來自 Gemini Generate Content Input Files 節點的輸入。"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "可選的參考影像。若要加入多張影像，請使用 Batch Images 節點（最多 14 張）。"
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "描述要產生影像或要套用編輯的文字提示。請包含任何限制、風格或模型應遵循的細節。"
+      },
+      "resolution": {
+        "name": "resolution",
+        "tooltip": "目標輸出解析度。2K/4K 會使用 Gemini 原生升頻器。"
+      },
+      "response_modalities": {
+        "name": "response_modalities",
+        "tooltip": "選擇「IMAGE」僅輸出影像，或「IMAGE+TEXT」同時回傳產生的影像與文字回應。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "當 seed 設定為特定值時，模型會盡力在重複請求時提供相同的回應，但不保證完全一致。更改模型或參數（如 temperature）即使使用相同 seed 也可能導致回應不同。預設會使用隨機 seed 值。"
+      },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "決定 AI 行為的基礎指令。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "GeminiImageNode": {
     "description": "透過 Google API 同步編輯影像。",
     "display_name": "Google Gemini 影像",
@@ -2646,9 +3689,17 @@
         "name": "提示詞",
         "tooltip": "生成的文字提示詞"
       },
+      "response_modalities": {
+        "name": "response_modalities",
+        "tooltip": "選擇「IMAGE」僅輸出影像，或「IMAGE+TEXT」同時回傳產生的影像與文字回應。"
+      },
       "seed": {
         "name": "種子值",
         "tooltip": "當種子值固定為特定值時，模型會盡力為重複請求提供相同的回應。不保證輸出具有確定性。此外，更改模型或參數設置（例如溫度）即使使用相同的種子值也可能導致回應發生變化。預設情況下，使用隨機種子值。"
+      },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "決定 AI 行為的基礎指令。"
       }
     },
     "outputs": {
@@ -2679,6 +3730,60 @@
       }
     }
   },
+  "GeminiNanoBanana2": {
+    "description": "透過 Google Vertex API 同步產生或編輯影像。",
+    "display_name": "Nano Banana 2",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "若設為「auto」，則會配合輸入影像的長寬比；若未提供影像，通常會產生 16:9 的正方形。"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "files": {
+        "name": "files",
+        "tooltip": "可選的檔案，作為模型的參考內容。可接受來自 Gemini Generate Content Input Files 節點的輸入。"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "可選的參考影像。若要加入多張影像，請使用 Batch Images 節點（最多 14 張）。"
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "描述要產生影像或要套用編輯的文字提示。請包含模型應遵循的任何限制、風格或細節。"
+      },
+      "resolution": {
+        "name": "resolution",
+        "tooltip": "目標輸出解析度。若選擇 2K/4K，將使用原生 Gemini 放大器。"
+      },
+      "response_modalities": {
+        "name": "response_modalities"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "當 seed 設定為特定值時，模型會盡力在重複請求時提供相同的回應，但不保證完全一致。更改模型或參數（如 temperature）即使使用相同 seed 也可能導致回應不同。預設會使用隨機 seed 值。"
+      },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "決定 AI 行為的基礎指令。"
+      },
+      "thinking_level": {
+        "name": "thinking_level"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
   "GeminiNode": {
     "description": "使用 Google 的 Gemini AI 模型生成文字回應。您可以提供多種類型的輸入（文字、圖片、音訊、影片）作為上下文，以生成更相關且有意義的回應。",
     "display_name": "Google Gemini",
@@ -2710,6 +3815,10 @@
         "name": "種子值",
         "tooltip": "當種子值固定為特定值時，模型會盡力為重複請求提供相同回應。不保證輸出具有確定性。此外，更改模型或參數設定（例如溫度）可能導致回應變化，即使使用相同的種子值。預設使用隨機種子值。"
       },
+      "system_prompt": {
+        "name": "system_prompt",
+        "tooltip": "決定 AI 行為的基礎指令。"
+      },
       "video": {
         "name": "影片",
         "tooltip": "可選的影片，用作模型的上下文。"
@@ -2721,6 +3830,72 @@
       }
     }
   },
+  "GenerateTracks": {
+    "display_name": "GenerateTracks",
+    "inputs": {
+      "bezier": {
+        "name": "bezier",
+        "tooltip": "啟用貝茲曲線路徑，使用中點作為控制點。"
+      },
+      "end_x": {
+        "name": "end_x",
+        "tooltip": "結束位置的標準化 X 座標（0-1）。"
+      },
+      "end_y": {
+        "name": "end_y",
+        "tooltip": "結束位置的標準化 Y 座標（0-1）。"
+      },
+      "height": {
+        "name": "height"
+      },
+      "interpolation": {
+        "name": "interpolation",
+        "tooltip": "控制沿路徑移動的時序／速度。"
+      },
+      "mid_x": {
+        "name": "mid_x",
+        "tooltip": "貝茲曲線的標準化 X 控制點。僅在啟用 'bezier' 時使用。"
+      },
+      "mid_y": {
+        "name": "mid_y",
+        "tooltip": "貝茲曲線的標準化 Y 控制點。僅在啟用 'bezier' 時使用。"
+      },
+      "num_frames": {
+        "name": "num_frames"
+      },
+      "num_tracks": {
+        "name": "num_tracks"
+      },
+      "start_x": {
+        "name": "start_x",
+        "tooltip": "起始位置的標準化 X 座標（0-1）。"
+      },
+      "start_y": {
+        "name": "start_y",
+        "tooltip": "起始位置的標準化 Y 座標（0-1）。"
+      },
+      "track_mask": {
+        "name": "track_mask",
+        "tooltip": "可選的 mask，用於標示可見的影格。"
+      },
+      "track_spread": {
+        "name": "track_spread",
+        "tooltip": "軌跡之間的標準化距離。軌跡會垂直於移動方向分布。"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "track_length",
+        "tooltip": null
+      }
+    }
+  },
   "GetImageSize": {
     "description": "回傳圖片的寬度和高度，並保持原樣傳遞。",
     "display_name": "取得圖片尺寸",
@@ -2731,13 +3906,16 @@
     },
     "outputs": {
       "0": {
-        "name": "寬度"
+        "name": "寬度",
+        "tooltip": null
       },
       "1": {
-        "name": "高度"
+        "name": "高度",
+        "tooltip": null
       },
       "2": {
-        "name": "批次大小"
+        "name": "批次大小",
+        "tooltip": null
       }
     }
   },
@@ -2765,6 +3943,149 @@
       }
     }
   },
+  "GrokImageEditNode": {
+    "description": "根據文字提示修改現有圖像",
+    "display_name": "Grok 圖像編輯",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "長寬比",
+        "tooltip": "僅當多張圖片連接到圖片輸入時才允許。"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "number_of_images": {
+        "name": "number_of_images",
+        "tooltip": "要生成的編輯圖像數量"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "用於生成圖像的文字提示"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "決定節點是否重新執行的種子；實際結果無論種子如何都不具決定性。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokImageNode": {
+    "description": "根據文字提示使用 Grok 生成圖像",
+    "display_name": "Grok 圖像",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "number_of_images": {
+        "name": "number_of_images",
+        "tooltip": "要生成的圖像數量"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "用於生成圖像的文字提示"
+      },
+      "resolution": {
+        "name": "解析度"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "決定節點是否重新執行的種子；實際結果無論種子如何都不具決定性。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokVideoEditNode": {
+    "description": "根據文字提示編輯現有影片。",
+    "display_name": "Grok 影片編輯",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "所需影片的文字描述。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "決定節點是否重新執行的種子；實際結果無論種子如何都不具決定性。"
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "最大支援長度為 8.7 秒且檔案大小為 50MB。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokVideoNode": {
+    "description": "從提示或圖像生成影片",
+    "display_name": "Grok 影片",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "輸出影片的長寬比。"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration": {
+        "name": "duration",
+        "tooltip": "輸出影片的長度（秒）。"
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "所需影片的文字描述。"
+      },
+      "resolution": {
+        "name": "resolution",
+        "tooltip": "輸出影片的解析度。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "決定節點是否重新執行的種子；實際結果無論種子如何都不具決定性。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "GrowMask": {
     "display_name": "GrowMask",
     "inputs": {
@@ -2777,6 +4098,55 @@
       "tapered_corners": {
         "name": "圓角"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HitPawGeneralImageEnhance": {
+    "description": "將低解析度影像升級為超高解析度，消除雜訊與失真。最大輸出：32 百萬像素。",
+    "display_name": "HitPaw 通用影像增強",
+    "inputs": {
+      "auto_downscale": {
+        "name": "自動縮小",
+        "tooltip": "若輸出超過限制，將自動縮小輸入影像。"
+      },
+      "image": {
+        "name": "影像"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "upscale_factor": {
+        "name": "放大倍率"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HitPawVideoEnhance": {
+    "description": "將低解析度影片升級為高解析度，消除雜訊與失真。價格以每秒影片計算。",
+    "display_name": "HitPaw 影片增強",
+    "inputs": {
+      "model": {
+        "name": "模型"
+      },
+      "model_resolution": {
+        "name": "解析度"
+      },
+      "video": {
+        "name": "影片"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "Hunyuan3Dv2Conditioning": {
@@ -2788,10 +4158,12 @@
     },
     "outputs": {
       "0": {
-        "name": "正向"
+        "name": "正向",
+        "tooltip": null
       },
       "1": {
-        "name": "負向"
+        "name": "負向",
+        "tooltip": null
       }
     }
   },
@@ -2813,10 +4185,12 @@
     },
     "outputs": {
       "0": {
-        "name": "正向"
+        "name": "正向",
+        "tooltip": null
       },
       "1": {
-        "name": "負向"
+        "name": "負向",
+        "tooltip": null
       }
     }
   },
@@ -2890,6 +4264,120 @@
       }
     }
   },
+  "HunyuanVideo15ImageToVideo": {
+    "display_name": "HunyuanVideo15ImageToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "height"
+      },
+      "length": {
+        "name": "length"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "start_image": {
+        "name": "start_image"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "HunyuanVideo15LatentUpscaleWithModel": {
+    "display_name": "Hunyuan Video 15 Latent Upscale With Model",
+    "inputs": {
+      "crop": {
+        "name": "crop"
+      },
+      "height": {
+        "name": "height"
+      },
+      "model": {
+        "name": "model"
+      },
+      "samples": {
+        "name": "samples"
+      },
+      "upscale_method": {
+        "name": "upscale_method"
+      },
+      "width": {
+        "name": "width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HunyuanVideo15SuperResolution": {
+    "display_name": "HunyuanVideo15SuperResolution",
+    "inputs": {
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "latent": {
+        "name": "latent"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "noise_augmentation": {
+        "name": "雜訊增強"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "start_image": {
+        "name": "起始影像"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
   "HyperTile": {
     "display_name": "HyperTile",
     "inputs": {
@@ -3094,6 +4582,11 @@
       "strength": {
         "name": "強度"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageBatch": {
@@ -3157,6 +4650,26 @@
       "image": {
         "name": "圖片"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageCompare": {
+    "description": "將兩張圖像並排顯示，並可用滑桿比較差異。",
+    "display_name": "圖像比較",
+    "inputs": {
+      "compare_view": {
+        "name": "compare_view"
+      },
+      "image_a": {
+        "name": "image_a"
+      },
+      "image_b": {
+        "name": "image_b"
+      }
     }
   },
   "ImageCompositeMasked": {
@@ -3180,6 +4693,11 @@
       "y": {
         "name": "Y 座標"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageCrop": {
@@ -3200,6 +4718,50 @@
       "y": {
         "name": "Y 座標"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageCropV2": {
+    "display_name": "圖像裁切",
+    "inputs": {
+      "crop_region": {
+        "name": "裁切區域"
+      },
+      "height": {},
+      "image": {
+        "name": "圖像"
+      },
+      "width": {},
+      "x": {},
+      "y": {}
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageDeduplication": {
+    "display_name": "影像去重",
+    "inputs": {
+      "images": {
+        "name": "影像",
+        "tooltip": "要處理的影像清單。"
+      },
+      "similarity_threshold": {
+        "name": "相似度閾值",
+        "tooltip": "相似度閾值（0-1）。數值越高表示越相似。超過此閾值的影像會被視為重複。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "影像",
+        "tooltip": "已處理的影像"
+      }
     }
   },
   "ImageFlip": {
@@ -3211,6 +4773,11 @@
       "image": {
         "name": "影像"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageFromBatch": {
@@ -3225,6 +4792,42 @@
       "length": {
         "name": "長度"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ImageGrid": {
+    "display_name": "影像網格",
+    "inputs": {
+      "cell_height": {
+        "name": "格子高度",
+        "tooltip": "每個格子的高度。"
+      },
+      "cell_width": {
+        "name": "格子寬度",
+        "tooltip": "每個格子的寬度。"
+      },
+      "columns": {
+        "name": "欄數",
+        "tooltip": "網格中的欄數。"
+      },
+      "images": {
+        "name": "影像",
+        "tooltip": "要處理的影像清單。"
+      },
+      "padding": {
+        "name": "間距",
+        "tooltip": "影像之間的間距。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "影像",
+        "tooltip": "已處理的影像"
+      }
     }
   },
   "ImageInvert": {
@@ -3235,6 +4838,28 @@
       }
     }
   },
+  "ImageMergeTileList": {
+    "display_name": "合併圖塊清單為圖像",
+    "inputs": {
+      "final_height": {
+        "name": "final_height"
+      },
+      "final_width": {
+        "name": "final_width"
+      },
+      "image_list": {
+        "name": "image_list"
+      },
+      "overlap": {
+        "name": "overlap"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ImageOnlyCheckpointLoader": {
     "display_name": "僅影像權重載入器（img2vid 模型）",
     "inputs": {
@@ -3333,6 +4958,11 @@
       "rotation": {
         "name": "旋轉"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageScale": {
@@ -3381,6 +5011,11 @@
       "upscale_method": {
         "name": "放大方法"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageScaleToTotalPixels": {
@@ -3392,6 +5027,9 @@
       "megapixels": {
         "name": "百萬像素"
       },
+      "resolution_steps": {
+        "name": "解析度步驟"
+      },
       "upscale_method": {
         "name": "放大方法"
       }
@@ -3446,6 +5084,11 @@
       "spacing_width": {
         "name": "間距寬度"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageToMask": {
@@ -3457,6 +5100,11 @@
       "image": {
         "name": "圖片"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "ImageUpscaleWithModel": {
@@ -3566,6 +5214,29 @@
       "mask": {
         "name": "遮罩"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "JoinAudioChannels": {
+    "description": "將左聲道與右聲道的單聲道音訊合併為立體聲音訊。",
+    "display_name": "合併音訊聲道",
+    "inputs": {
+      "audio_left": {
+        "name": "audio_left"
+      },
+      "audio_right": {
+        "name": "audio_right"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "audio",
+        "tooltip": null
+      }
     }
   },
   "JoinImageWithAlpha": {
@@ -3691,6 +5362,58 @@
       "sampler_name": {
         "name": "取樣器名稱"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Kandinsky5ImageToVideo": {
+    "display_name": "Kandinsky5ImageToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "批次大小"
+      },
+      "height": {
+        "name": "高度"
+      },
+      "length": {
+        "name": "長度"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "start_image": {
+        "name": "起始圖片"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "寬度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": "空的影片 latent"
+      },
+      "3": {
+        "name": "cond_latent",
+        "tooltip": "已清理編碼的起始圖片，用於取代模型輸出 latent 的雜訊起始"
+      }
     }
   },
   "KarrasScheduler": {
@@ -3708,6 +5431,44 @@
       "steps": {
         "name": "步驟數"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingAvatarNode": {
+    "description": "從單張照片和音訊檔案生成廣播風格的數位人像影片。",
+    "display_name": "Kling Avatar 2.0",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "頭像參考圖片。寬度與高度需至少 300 像素。長寬比需介於 1:2.5 與 2.5:1 之間。"
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "可選提示，用於定義頭像動作、情緒與鏡頭運動。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed 控制此節點是否重新執行；無論 seed 為何，結果皆為非確定性。"
+      },
+      "sound_file": {
+        "name": "sound_file",
+        "tooltip": "音訊輸入。長度必須介於 2 到 300 秒之間。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "KlingCameraControlI2VNode": {
@@ -3862,6 +5623,46 @@
       }
     }
   },
+  "KlingFirstLastFrameNode": {
+    "description": "使用 Kling V3 以首尾影格產生影片。",
+    "display_name": "Kling 3.0 首尾影格轉影片",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "duration": {
+        "name": "時長"
+      },
+      "end_frame": {
+        "name": "尾影格"
+      },
+      "first_frame": {
+        "name": "首影格"
+      },
+      "generate_audio": {
+        "name": "產生音訊"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "模型與生成設定。"
+      },
+      "model_resolution": {
+        "name": "解析度"
+      },
+      "prompt": {
+        "name": "提示詞"
+      },
+      "seed": {
+        "name": "種子",
+        "tooltip": "種子決定此節點是否需重新執行；無論種子為何，結果皆為非決定性。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingImage2VideoNode": {
     "display_name": "Kling 圖像轉影片",
     "inputs": {
@@ -3914,6 +5715,9 @@
       "aspect_ratio": {
         "name": "aspect_ratio"
       },
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
       "human_fidelity": {
         "name": "human_fidelity",
         "tooltip": "主體參考相似度"
@@ -3942,6 +5746,39 @@
       "prompt": {
         "name": "prompt",
         "tooltip": "正向文字提示"
+      },
+      "seed": {
+        "name": "種子",
+        "tooltip": "種子決定此節點是否需重新執行；無論種子為何，結果皆為非決定性。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingImageToVideoWithAudio": {
+    "display_name": "Kling 圖片（首幀）轉影片並加音訊",
+    "inputs": {
+      "duration": {
+        "name": "時長"
+      },
+      "generate_audio": {
+        "name": "產生音訊"
+      },
+      "mode": {
+        "name": "模式"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "提示詞",
+        "tooltip": "正向文字提示。"
+      },
+      "start_frame": {
+        "name": "起始幀"
       }
     },
     "outputs": {
@@ -4011,6 +5848,299 @@
       }
     }
   },
+  "KlingMotionControl": {
+    "display_name": "Kling 動作控制",
+    "inputs": {
+      "character_orientation": {
+        "name": "角色朝向",
+        "tooltip": "控制角色的面向／朝向來源。\nvideo：動作、表情、鏡頭移動與朝向皆依據動作參考影片（其他細節由提示詞決定）。\nimage：動作與表情仍依據動作參考影片，但角色朝向與參考圖片一致（鏡頭／其他細節由提示詞決定）。"
+      },
+      "keep_original_sound": {
+        "name": "保留原始音訊"
+      },
+      "mode": {
+        "name": "模式"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "prompt": {
+        "name": "提示詞"
+      },
+      "reference_image": {
+        "name": "參考圖片"
+      },
+      "reference_video": {
+        "name": "參考影片",
+        "tooltip": "用於驅動動作／表情的動作參考影片。\n時長限制依角色朝向而定：\n - 圖片：3–10秒（最多10秒）\n - 影片：3–30秒（最多30秒）"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProEditVideoNode": {
+    "description": "使用 Kling 最新模型編輯現有影片。",
+    "display_name": "Kling Omni 編輯影片（專業版）",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "keep_original_sound": {
+        "name": "保留原始音訊"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "提示詞",
+        "tooltip": "描述影片內容的文字提示，可包含正向與負向描述。"
+      },
+      "reference_images": {
+        "name": "參考圖片",
+        "tooltip": "最多可加入 4 張額外參考圖片。"
+      },
+      "resolution": {
+        "name": "解析度"
+      },
+      "seed": {
+        "name": "種子",
+        "tooltip": "種子決定此節點是否需重新執行；無論種子為何，結果皆為非決定性。"
+      },
+      "video": {
+        "name": "影片",
+        "tooltip": "要編輯的影片。輸出影片長度將與原影片相同。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProFirstLastFrameNode": {
+    "description": "使用起始影格、可選的結束影格，或參考圖片，搭配最新 Kling 模型。",
+    "display_name": "Kling Omni 首末影格轉影片 (Pro)",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "duration": {
+        "name": "時長"
+      },
+      "end_frame": {
+        "name": "結束影格",
+        "tooltip": "影片的可選結束影格。不可與「reference_images」同時使用。"
+      },
+      "first_frame": {
+        "name": "起始影格"
+      },
+      "generate_audio": {
+        "name": "產生音訊",
+        "tooltip": "為影片產生音訊。僅支援 kling-v3-omni。"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "提示詞",
+        "tooltip": "描述影片內容的文字提示，可包含正面與負面描述。"
+      },
+      "reference_images": {
+        "name": "參考圖片",
+        "tooltip": "最多可加入 6 張額外參考圖片。"
+      },
+      "resolution": {
+        "name": "解析度"
+      },
+      "seed": {
+        "name": "種子",
+        "tooltip": "種子決定此節點是否需重新執行；無論種子為何，結果皆為非決定性。"
+      },
+      "storyboards": {
+        "name": "分鏡腳本",
+        "tooltip": "以個別提示詞與時長產生一系列影片片段。僅支援 kling-v3-omni。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProImageNode": {
+    "description": "使用 Kling 最新模型建立或編輯圖像。",
+    "display_name": "Kling Omni 圖像 (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "長寬比"
+      },
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "提示詞",
+        "tooltip": "描述圖像內容的文字提示，可包含正面與負面描述。"
+      },
+      "reference_images": {
+        "name": "參考圖片",
+        "tooltip": "最多可加入 10 張額外參考圖片。"
+      },
+      "resolution": {
+        "name": "解析度"
+      },
+      "seed": {
+        "name": "種子",
+        "tooltip": "種子決定此節點是否需重新執行；無論種子為何，結果皆為非決定性。"
+      },
+      "series_amount": {
+        "name": "系列數量",
+        "tooltip": "產生一系列影像。不支援 kling-image-o1。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProImageToVideoNode": {
+    "description": "使用最多 7 張參考圖片，搭配最新 Kling 模型產生影片。",
+    "display_name": "Kling Omni 圖像轉影片 (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "長寬比"
+      },
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "duration": {
+        "name": "時長"
+      },
+      "generate_audio": {
+        "name": "產生音訊",
+        "tooltip": "為影片產生音訊。僅支援 kling-v3-omni。"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "提示詞",
+        "tooltip": "描述影片內容的文字提示，可包含正面與負面描述。"
+      },
+      "reference_images": {
+        "name": "參考圖片",
+        "tooltip": "最多可加入 7 張參考圖片。"
+      },
+      "resolution": {
+        "name": "解析度"
+      },
+      "seed": {
+        "name": "種子",
+        "tooltip": "種子決定此節點是否需重新執行；無論種子為何，結果皆為非決定性。"
+      },
+      "storyboards": {
+        "name": "分鏡腳本",
+        "tooltip": "以個別提示詞與時長產生一系列影片片段。僅支援 kling-v3-omni。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProTextToVideoNode": {
+    "description": "使用文字提示，搭配最新 Kling 模型產生影片。",
+    "display_name": "Kling Omni 文字轉影片 (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "長寬比"
+      },
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "duration": {
+        "name": "時長"
+      },
+      "generate_audio": {
+        "name": "產生音訊"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "提示詞",
+        "tooltip": "描述影片內容的文字提示，可包含正面與負面描述。"
+      },
+      "resolution": {
+        "name": "解析度"
+      },
+      "seed": {
+        "name": "種子",
+        "tooltip": "種子決定此節點是否需重新執行；無論種子為何，結果皆為非決定性。"
+      },
+      "storyboards": {
+        "name": "分鏡腳本",
+        "tooltip": "以個別提示詞與時長產生一系列影片片段。o1 模型將忽略此設定。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProVideoToVideoNode": {
+    "description": "使用一段影片和最多 4 張參考圖片，搭配最新 Kling 模型生成影片。",
+    "display_name": "Kling Omni 影片轉影片（專業版）",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "長寬比"
+      },
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "duration": {
+        "name": "時長"
+      },
+      "keep_original_sound": {
+        "name": "保留原始聲音"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "提示詞",
+        "tooltip": "描述影片內容的文字提示，可包含正面或負面描述。"
+      },
+      "reference_images": {
+        "name": "參考圖片",
+        "tooltip": "最多 4 張額外參考圖片。"
+      },
+      "reference_video": {
+        "name": "參考影片",
+        "tooltip": "作為參考的影片。"
+      },
+      "resolution": {
+        "name": "解析度"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed 控制此節點是否重新執行；無論 seed 為何，結果皆為非確定性。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingSingleImageVideoEffectNode": {
     "description": "根據 effect_scene 產生影片時，實現不同的特殊效果。",
     "display_name": "Kling 影片特效",
@@ -4125,6 +6255,35 @@
       }
     }
   },
+  "KlingTextToVideoWithAudio": {
+    "display_name": "Kling 文字轉影片（含音訊）",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "長寬比"
+      },
+      "duration": {
+        "name": "時長"
+      },
+      "generate_audio": {
+        "name": "生成音訊"
+      },
+      "mode": {
+        "name": "模式"
+      },
+      "model_name": {
+        "name": "model_name"
+      },
+      "prompt": {
+        "name": "提示詞",
+        "tooltip": "正向文字提示。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingVideoExtendNode": {
     "description": "Kling Video 延伸節點。可延伸由其他 Kling 節點製作的影片。video_id 是透過其他 Kling 節點產生的。",
     "display_name": "Kling Video 延伸",
@@ -4159,6 +6318,54 @@
       }
     }
   },
+  "KlingVideoNode": {
+    "description": "使用 Kling V3 產生影片。支援文字轉影片與圖片轉影片，可選擇分鏡多提示與音訊生成。",
+    "display_name": "Kling 3.0 影片",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "generate_audio": {
+        "name": "生成音訊"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "模型與生成設定。"
+      },
+      "model_aspect_ratio": {
+        "name": "長寬比"
+      },
+      "model_resolution": {
+        "name": "解析度"
+      },
+      "multi_shot": {
+        "name": "多段生成",
+        "tooltip": "以個別提示與時長產生一系列影片片段。"
+      },
+      "multi_shot_duration": {
+        "name": "時長"
+      },
+      "multi_shot_negative_prompt": {
+        "name": "負面提示"
+      },
+      "multi_shot_prompt": {
+        "name": "提示"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed 控制此節點是否重新執行；無論 seed 為何，結果皆為非確定性。"
+      },
+      "start_frame": {
+        "name": "起始畫格",
+        "tooltip": "可選的起始畫格圖片。連接後將切換為圖片轉影片模式。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingVirtualTryOnNode": {
     "description": "Kling 虛擬試穿節點。輸入一張人物圖片和一張服裝圖片，將服裝試穿在人物身上。",
     "display_name": "Kling 虛擬試穿",
@@ -4179,6 +6386,26 @@
       }
     }
   },
+  "LTXAVTextEncoderLoader": {
+    "description": "[Recipes]\n\nltxav: gemma 3 12B",
+    "display_name": "LTXV 音訊文字編碼器載入器",
+    "inputs": {
+      "ckpt_name": {
+        "name": "ckpt_name"
+      },
+      "device": {
+        "name": "device"
+      },
+      "text_encoder": {
+        "name": "text_encoder"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LTXVAddGuide": {
     "display_name": "LTXV 添加引導",
     "inputs": {
@@ -4221,6 +6448,76 @@
       }
     }
   },
+  "LTXVAudioVAEDecode": {
+    "display_name": "LTXV 音訊 VAE 解碼",
+    "inputs": {
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "用於解碼 latent 的 Audio VAE 模型。"
+      },
+      "samples": {
+        "name": "samples",
+        "tooltip": "要解碼的 latent。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Audio",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAEEncode": {
+    "display_name": "LTXV 音訊 VAE 編碼",
+    "inputs": {
+      "audio": {
+        "name": "audio",
+        "tooltip": "要編碼的音訊。"
+      },
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "用於編碼的 Audio VAE 模型。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Audio Latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAELoader": {
+    "display_name": "LTXV 音訊 VAE 載入器",
+    "inputs": {
+      "ckpt_name": {
+        "name": "ckpt_name",
+        "tooltip": "要載入的 Audio VAE 檢查點。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Audio VAE",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVConcatAVLatent": {
+    "display_name": "LTXVConcatAVLatent",
+    "inputs": {
+      "audio_latent": {
+        "name": "audio_latent"
+      },
+      "video_latent": {
+        "name": "video_latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
   "LTXVConditioning": {
     "display_name": "LTXV 條件化",
     "inputs": {
@@ -4273,6 +6570,33 @@
       }
     }
   },
+  "LTXVEmptyLatentAudio": {
+    "display_name": "LTXV 空 latent 音訊",
+    "inputs": {
+      "audio_vae": {
+        "name": "audio_vae",
+        "tooltip": "用於取得組態的 Audio VAE 模型。"
+      },
+      "batch_size": {
+        "name": "batch_size",
+        "tooltip": "批次中的 latent 音訊樣本數。"
+      },
+      "frame_rate": {
+        "name": "frame_rate",
+        "tooltip": "每秒影格數。"
+      },
+      "frames_number": {
+        "name": "frames_number",
+        "tooltip": "影格數量。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "Latent",
+        "tooltip": null
+      }
+    }
+  },
   "LTXVImgToVideo": {
     "display_name": "LTXV 圖片轉影片",
     "inputs": {
@@ -4319,6 +6643,47 @@
       }
     }
   },
+  "LTXVImgToVideoInplace": {
+    "display_name": "LTXVImgToVideoInplace",
+    "inputs": {
+      "bypass": {
+        "name": "繞過",
+        "tooltip": "繞過條件處理。"
+      },
+      "image": {
+        "name": "圖片"
+      },
+      "latent": {
+        "name": "latent"
+      },
+      "strength": {
+        "name": "強度"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVLatentUpsampler": {
+    "display_name": "LTXVLatentUpsampler",
+    "inputs": {
+      "samples": {
+        "name": "樣本"
+      },
+      "upscale_model": {
+        "name": "放大模型"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
   "LTXVPreprocess": {
     "display_name": "LTXV 預處理",
     "inputs": {
@@ -4367,6 +6732,25 @@
       }
     }
   },
+  "LTXVSeparateAVLatent": {
+    "description": "LTXV 分離 AV latent",
+    "display_name": "LTXVSeparateAVLatent",
+    "inputs": {
+      "av_latent": {
+        "name": "av_latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "video_latent",
+        "tooltip": null
+      },
+      "1": {
+        "name": "audio_latent",
+        "tooltip": null
+      }
+    }
+  },
   "LaplaceScheduler": {
     "display_name": "Laplace 排程器",
     "inputs": {
@@ -4385,6 +6769,11 @@
       "steps": {
         "name": "步驟數"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "LatentAdd": {
@@ -4522,6 +6911,11 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "LatentConcat": {
@@ -4585,6 +6979,25 @@
       }
     }
   },
+  "LatentCutToBatch": {
+    "display_name": "LatentCutToBatch",
+    "inputs": {
+      "dim": {
+        "name": "維度"
+      },
+      "samples": {
+        "name": "樣本"
+      },
+      "slice_size": {
+        "name": "切片大小"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LatentFlip": {
     "display_name": "翻轉 Latent",
     "inputs": {
@@ -4738,6 +7151,19 @@
       }
     }
   },
+  "LatentUpscaleModelLoader": {
+    "display_name": "載入 Latent 放大模型",
+    "inputs": {
+      "model_name": {
+        "name": "model_name"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "LazyCache": {
     "description": "自製版 EasyCache - 更「簡單」的 EasyCache 實作版本。整體表現不如 EasyCache，但在某些罕見情況下表現更好，且與 ComfyUI 中的所有內容具有通用相容性。",
     "display_name": "懶快取",
@@ -4772,8 +7198,7 @@
   "Load3D": {
     "display_name": "載入 3D",
     "inputs": {
-      "clear": {
-      },
+      "clear": {},
       "height": {
         "name": "高度"
       },
@@ -4783,30 +7208,40 @@
       "model_file": {
         "name": "模型檔案"
       },
-      "upload 3d model": {
-      },
+      "upload 3d model": {},
+      "upload extra resources": {},
       "width": {
         "name": "寬度"
       }
     },
     "outputs": {
       "0": {
-        "name": "圖片"
+        "name": "影像",
+        "tooltip": null
       },
       "1": {
-        "name": "遮罩"
+        "name": "遮罩",
+        "tooltip": null
       },
       "2": {
-        "name": "網格路徑"
+        "name": "網格路徑",
+        "tooltip": null
       },
       "3": {
-        "name": "法線"
+        "name": "法線",
+        "tooltip": null
       },
       "4": {
-        "name": "線稿"
+        "name": "相機資訊",
+        "tooltip": null
       },
       "5": {
-        "name": "相機資訊"
+        "name": "錄影",
+        "tooltip": null
+      },
+      "6": {
+        "name": "3D 模型",
+        "tooltip": null
       }
     }
   },
@@ -4822,6 +7257,11 @@
       "upload": {
         "name": "選擇檔案上傳"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "LoadImage": {
@@ -4835,6 +7275,21 @@
       }
     }
   },
+  "LoadImageDataSetFromFolder": {
+    "display_name": "從資料夾載入圖片資料集",
+    "inputs": {
+      "folder": {
+        "name": "資料夾",
+        "tooltip": "從此資料夾載入圖片。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "圖片",
+        "tooltip": "已載入的圖片清單"
+      }
+    }
+  },
   "LoadImageMask": {
     "display_name": "載入圖片（作為遮罩）",
     "inputs": {
@@ -4853,16 +7308,35 @@
     "description": "從輸出資料夾載入圖片。當點擊重新整理按鈕時，節點會更新圖片清單並自動選取第一張圖片，方便進行反覆操作。",
     "display_name": "載入圖片（來自輸出）",
     "inputs": {
+      "Auto-refresh after generation": {},
       "image": {
         "name": "影像"
       },
-      "refresh": {
-      },
+      "refresh": {},
       "upload": {
         "name": "選擇要上傳的檔案"
       }
     }
   },
+  "LoadImageTextDataSetFromFolder": {
+    "display_name": "從資料夾載入圖片與文字資料集",
+    "inputs": {
+      "folder": {
+        "name": "資料夾",
+        "tooltip": "從此資料夾載入圖片。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "圖片",
+        "tooltip": "已載入的圖片清單"
+      },
+      "1": {
+        "name": "文字",
+        "tooltip": "文字標註清單"
+      }
+    }
+  },
   "LoadLatent": {
     "display_name": "LoadLatent",
     "inputs": {
@@ -4871,6 +7345,25 @@
       }
     }
   },
+  "LoadTrainingDataset": {
+    "display_name": "載入訓練資料集",
+    "inputs": {
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "包含已儲存資料集的資料夾名稱（位於輸出目錄內）。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latents",
+        "tooltip": "latent 字典的列表"
+      },
+      "1": {
+        "name": "conditioning",
+        "tooltip": "conditioning 列表的列表"
+      }
+    }
+  },
   "LoadVideo": {
     "display_name": "載入影片",
     "inputs": {
@@ -4921,6 +7414,60 @@
       }
     }
   },
+  "LoraLoaderBypass": {
+    "description": "以繞過模式套用 LoRA。與一般 LoRA 不同，此方式不會修改模型權重，而是在前向傳遞時注入 LoRA 計算。適用於訓練場景。",
+    "display_name": "載入 LoRA（繞過模式）（除錯用）",
+    "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "將套用 LoRA 的 CLIP 模型。"
+      },
+      "lora_name": {
+        "name": "lora_name",
+        "tooltip": "LoRA 的名稱。"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "將套用 LoRA 的擴散模型。"
+      },
+      "strength_clip": {
+        "name": "strength_clip",
+        "tooltip": "調整 CLIP 模型的強度。此值可為負數。"
+      },
+      "strength_model": {
+        "name": "strength_model",
+        "tooltip": "調整擴散模型的強度。此值可為負數。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "已修改的擴散模型。"
+      },
+      "1": {
+        "tooltip": "已修改的 CLIP 模型。"
+      }
+    }
+  },
+  "LoraLoaderBypassModelOnly": {
+    "description": "以繞過模式套用 LoRA。與一般 LoRA 不同，此方式不會修改模型權重，而是在前向傳遞時注入 LoRA 計算。適用於訓練場景。",
+    "display_name": "載入 LoRA（繞過模式，僅模型）（除錯用）",
+    "inputs": {
+      "lora_name": {
+        "name": "lora_name"
+      },
+      "model": {
+        "name": "model"
+      },
+      "strength_model": {
+        "name": "strength_model"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "已修改的擴散模型。"
+      }
+    }
+  },
   "LoraLoaderModelOnly": {
     "description": "LoRA 用於修改 diffusion 和 CLIP 模型，改變 latent 去噪的方式，例如套用風格。多個 LoRA 節點可以串接在一起使用。",
     "display_name": "LoraLoaderModelOnly",
@@ -4944,6 +7491,10 @@
   "LoraModelLoader": {
     "display_name": "載入 LoRA 模型",
     "inputs": {
+      "bypass": {
+        "name": "bypass",
+        "tooltip": "啟用時，以 bypass 模式應用 LoRA，不會修改基礎模型權重。適用於訓練及模型權重卸載時。"
+      },
       "lora": {
         "name": "LoRA 模型",
         "tooltip": "要應用到擴散模型的 LoRA 模型。"
@@ -4959,7 +7510,8 @@
     },
     "outputs": {
       "0": {
-        "tooltip": "修改後的擴散模型。"
+        "name": "model",
+        "tooltip": "已修改的擴散模型。"
       }
     }
   },
@@ -4992,10 +7544,12 @@
     "display_name": "繪製損失圖表",
     "inputs": {
       "filename_prefix": {
-        "name": "檔案名稱前綴"
+        "name": "檔案名稱前綴",
+        "tooltip": "儲存 loss 圖像的檔名前綴。"
       },
       "loss": {
-        "name": "損失"
+        "name": "損失",
+        "tooltip": "來自訓練節點的 loss 映射。"
       }
     }
   },
@@ -5286,6 +7840,208 @@
       }
     }
   },
+  "MagnificImageRelightNode": {
+    "description": "透過光線調整與可選的參考光線轉移，重新打光圖像。",
+    "display_name": "Magnific 圖像重光",
+    "inputs": {
+      "advanced_settings": {
+        "name": "advanced_settings",
+        "tooltip": "進階光線控制的微調選項。"
+      },
+      "change_background": {
+        "name": "change_background",
+        "tooltip": "根據提示或參考圖修改背景。"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "要重新打光的圖像。"
+      },
+      "interpolate_from_original": {
+        "name": "interpolate_from_original",
+        "tooltip": "限制生成自由度，使結果更貼近原圖。"
+      },
+      "light_transfer_strength": {
+        "name": "light_transfer_strength",
+        "tooltip": "光線轉移應用的強度。"
+      },
+      "preserve_details": {
+        "name": "preserve_details",
+        "tooltip": "保留原圖的紋理與細節。"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "光線描述指引。支援強調標註（1-1.4）。"
+      },
+      "reference_image": {
+        "name": "reference_image",
+        "tooltip": "可選的參考圖像，用於轉移光線。"
+      },
+      "style": {
+        "name": "style",
+        "tooltip": "風格化輸出偏好。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageSkinEnhancerNode": {
+    "description": "人像美膚增強，支援多種處理模式。",
+    "display_name": "Magnific 圖像美膚增強",
+    "inputs": {
+      "image": {
+        "name": "image",
+        "tooltip": "要增強的人像圖像。"
+      },
+      "mode": {
+        "name": "mode",
+        "tooltip": "處理模式：creative 為藝術增強，faithful 保留原貌，flexible 針對性優化。"
+      },
+      "sharpen": {
+        "name": "sharpen",
+        "tooltip": "銳化強度等級。"
+      },
+      "smart_grain": {
+        "name": "smart_grain",
+        "tooltip": "智慧顆粒強度等級。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageStyleTransferNode": {
+    "description": "將參考圖像的風格轉移到您的輸入圖像上。",
+    "display_name": "Magnific 圖像風格轉換",
+    "inputs": {
+      "engine": {
+        "name": "engine",
+        "tooltip": "處理引擎選擇。"
+      },
+      "fixed_generation": {
+        "name": "fixed_generation",
+        "tooltip": "停用時，每次生成都會引入一定的隨機性，產生更多元的結果。"
+      },
+      "flavor": {
+        "name": "flavor",
+        "tooltip": "風格轉換風格。"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "要進行風格轉換的圖像。"
+      },
+      "portrait_mode": {
+        "name": "portrait_mode",
+        "tooltip": "啟用人像模式以增強臉部細節。"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "reference_image": {
+        "name": "reference_image",
+        "tooltip": "用於提取風格的參考圖像。"
+      },
+      "structure_strength": {
+        "name": "structure_strength",
+        "tooltip": "維持原始圖像的結構。"
+      },
+      "style_strength": {
+        "name": "style_strength",
+        "tooltip": "風格強度的百分比。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageUpscalerCreativeNode": {
+    "description": "基於提示詞的增強、風格化，以及 2x/4x/8x/16x 放大。最大輸出：25.3 百萬像素。",
+    "display_name": "Magnific 影像放大（創意）",
+    "inputs": {
+      "auto_downscale": {
+        "name": "自動降尺寸",
+        "tooltip": "若輸出超過最大像素限制，自動縮小輸入影像。"
+      },
+      "creativity": {
+        "name": "創意"
+      },
+      "engine": {
+        "name": "引擎"
+      },
+      "fractality": {
+        "name": "複雜度",
+        "tooltip": "每平方像素的提示詞強度與細緻度。"
+      },
+      "hdr": {
+        "name": "HDR",
+        "tooltip": "細節與解析度的等級。"
+      },
+      "image": {
+        "name": "影像"
+      },
+      "optimized_for": {
+        "name": "最佳化目標"
+      },
+      "prompt": {
+        "name": "提示詞"
+      },
+      "resemblance": {
+        "name": "相似度",
+        "tooltip": "與原始影像的相似程度。"
+      },
+      "scale_factor": {
+        "name": "放大倍率"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageUpscalerPreciseV2Node": {
+    "description": "高保真放大，細緻控制銳利度、顆粒感與細節。最大輸出：10060×10060 像素。",
+    "display_name": "Magnific 影像放大（精確 V2）",
+    "inputs": {
+      "auto_downscale": {
+        "name": "自動降尺寸",
+        "tooltip": "若輸出超過最大解析度，自動縮小輸入影像。"
+      },
+      "flavor": {
+        "name": "處理風格",
+        "tooltip": "處理風格：sublime 適用於一般用途，photo 適用於照片，photo_denoiser 適用於雜訊照片。"
+      },
+      "image": {
+        "name": "影像"
+      },
+      "scale_factor": {
+        "name": "放大倍率"
+      },
+      "sharpen": {
+        "name": "銳利度",
+        "tooltip": "影像銳利度強度。數值越高，邊緣越清晰。"
+      },
+      "smart_grain": {
+        "name": "智慧顆粒",
+        "tooltip": "智慧增強顆粒/紋理，避免影像過於平滑或不自然。"
+      },
+      "ultra_detail": {
+        "name": "極致細節",
+        "tooltip": "控制放大時新增的細節、紋理與微細節。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "Mahiro": {
     "description": "修改引導方式，讓其更著重於正向提示詞的「方向性」而非正負提示詞之間的差異。",
     "display_name": "Mahiro 太可愛了，應該要有更好的引導功能!! (。・ω・。)",
@@ -5301,6 +8057,50 @@
       }
     }
   },
+  "MakeTrainingDataset": {
+    "display_name": "建立訓練資料集",
+    "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "用於將文字編碼為條件的 CLIP 模型。"
+      },
+      "images": {
+        "name": "圖片",
+        "tooltip": "要編碼的圖片清單。"
+      },
+      "texts": {
+        "name": "文字",
+        "tooltip": "文字標題清單。可為 n 筆（與圖片數量相同）、1 筆（全部重複），或省略（使用空字串）。"
+      },
+      "vae": {
+        "name": "vae",
+        "tooltip": "用於將圖片編碼為 latent 的 VAE 模型。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latents",
+        "tooltip": "latent 字典清單"
+      },
+      "1": {
+        "name": "conditioning",
+        "tooltip": "條件清單"
+      }
+    }
+  },
+  "ManualSigmas": {
+    "display_name": "手動 Sigma",
+    "inputs": {
+      "sigmas": {
+        "name": "sigmas"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "MaskComposite": {
     "display_name": "遮罩合成",
     "inputs": {
@@ -5319,6 +8119,11 @@
       "y": {
         "name": "y"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "MaskPreview": {
@@ -5336,6 +8141,371 @@
       "mask": {
         "name": "遮罩"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MergeImageLists": {
+    "display_name": "合併圖片清單",
+    "inputs": {
+      "images": {
+        "name": "圖片",
+        "tooltip": "要處理的圖片清單。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "圖片",
+        "tooltip": "已處理的圖片"
+      }
+    }
+  },
+  "MergeTextLists": {
+    "display_name": "合併文字清單",
+    "inputs": {
+      "texts": {
+        "name": "文字",
+        "tooltip": "要處理的文字清單。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "文字",
+        "tooltip": "已處理的文字"
+      }
+    }
+  },
+  "MeshyAnimateModelNode": {
+    "description": "將特定動畫動作應用於先前已綁定骨架的角色。",
+    "display_name": "Meshy：動畫模型",
+    "inputs": {
+      "action_id": {
+        "name": "action_id",
+        "tooltip": "請造訪 https://docs.meshy.ai/en/api/animation-library 以取得可用值列表。"
+      },
+      "rig_task_id": {
+        "name": "rig_task_id"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "模型檔案",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyImageToModelNode": {
+    "display_name": "Meshy：圖片轉模型",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "指定產生模型的姿勢模式。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed 控制此節點是否重新執行；無論 seed 為何，結果皆為非確定性。"
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "設為 false 時，將回傳未處理的三角網格。"
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      },
+      "should_texture": {
+        "name": "should_texture",
+        "tooltip": "決定是否產生材質。設為 false 時會跳過材質階段，並回傳無材質的網格。"
+      },
+      "should_texture_enable_pbr": {
+        "name": "enable_pbr"
+      },
+      "should_texture_texture_prompt": {
+        "name": "texture_prompt"
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "模型檔案",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy 任務 ID",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyMultiImageToModelNode": {
+    "display_name": "Meshy：多圖轉模型",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "images": {
+        "name": "images"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "指定產生模型的姿勢模式。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed 控制此節點是否重新執行；無論 seed 為何，結果皆為非確定性。"
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "設為 false 時，將回傳未處理的三角網格。"
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      },
+      "should_texture": {
+        "name": "should_texture",
+        "tooltip": "決定是否產生材質。設為 false 時會跳過材質階段，並回傳無材質的網格。"
+      },
+      "should_texture_enable_pbr": {
+        "name": "enable_pbr"
+      },
+      "should_texture_texture_prompt": {
+        "name": "texture_prompt"
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "模型檔案",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy 任務 ID",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyRefineNode": {
+    "description": "精修先前建立的草稿模型。",
+    "display_name": "Meshy：精修草稿模型",
+    "inputs": {
+      "enable_pbr": {
+        "name": "enable_pbr",
+        "tooltip": "除了基礎色彩外，還會產生 PBR 貼圖（金屬度、粗糙度、法線）。注意：若使用雕塑風格，請設為 false，因為雕塑風格會產生自己的 PBR 貼圖。"
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "model": {
+        "name": "model"
+      },
+      "texture_image": {
+        "name": "texture_image",
+        "tooltip": "「texture_image」與「texture_prompt」只能擇一使用。"
+      },
+      "texture_prompt": {
+        "name": "texture_prompt",
+        "tooltip": "提供文字提示以引導材質製作。最多 600 字元。不可與「texture_image」同時使用。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "模型檔案",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy 任務 ID",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyRigModelNode": {
+    "description": "提供標準格式的骨架綁定角色。目前自動綁定不適用於無材質網格、非人形資產，或肢體結構不明確的人形資產。",
+    "display_name": "Meshy：骨架綁定模型",
+    "inputs": {
+      "height_meters": {
+        "name": "height_meters",
+        "tooltip": "角色模型的約略高度（公尺）。有助於縮放與骨架綁定精度。"
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "texture_image": {
+        "name": "texture_image",
+        "tooltip": "模型 UV 展開後的基礎色彩貼圖。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "模型檔案",
+        "tooltip": null
+      },
+      "1": {
+        "name": "rig 任務 ID",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyTextToModelNode": {
+    "display_name": "Meshy：文字生成模型",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "指定生成模型的姿勢模式。"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed 控制節點是否重新執行；無論 seed 為何，結果皆為非確定性。"
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "設為 false 時，回傳未處理的三角網格。"
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      },
+      "style": {
+        "name": "style"
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "模型檔案",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyTextureNode": {
+    "display_name": "Meshy：材質模型",
+    "inputs": {
+      "enable_original_uv": {
+        "name": "啟用原始UV",
+        "tooltip": "使用模型的原始UV，而非產生新的UV。啟用後，Meshy會保留上傳模型中現有的材質。如果模型沒有原始UV，輸出品質可能會較差。"
+      },
+      "image_style": {
+        "name": "影像風格",
+        "tooltip": "用一張2D影像來引導材質生成過程。不能與「text_style_prompt」同時使用。"
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "pbr": {
+        "name": "PBR"
+      },
+      "text_style_prompt": {
+        "name": "文字風格提示",
+        "tooltip": "用文字描述你想要的物件材質風格。最多600字。不能與「image_style」同時使用。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "模型檔案",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
     }
   },
   "MinimaxHailuoVideoNode": {
@@ -7779,6 +10949,78 @@
       }
     }
   },
+  "NAGuidance": {
+    "description": "對模型應用標準化注意力引導，讓蒸餾／schnell 模型支援負面提示。",
+    "display_name": "標準化注意力引導",
+    "inputs": {
+      "model": {
+        "name": "model",
+        "tooltip": "要套用 NAG 的模型。"
+      },
+      "nag_alpha": {
+        "name": "nag_alpha",
+        "tooltip": "標準化注意力的混合係數。1.0 為完全取代，0.0 則無效果。"
+      },
+      "nag_scale": {
+        "name": "nag_scale",
+        "tooltip": "引導強度係數。數值越高，越遠離負面提示。"
+      },
+      "nag_tau": {
+        "name": "nag_tau"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "已啟用 NAG 的修補模型。"
+      }
+    }
+  },
+  "NormalizeImages": {
+    "display_name": "標準化圖片",
+    "inputs": {
+      "images": {
+        "name": "圖片",
+        "tooltip": "要處理的圖片。"
+      },
+      "mean": {
+        "name": "平均值",
+        "tooltip": "標準化的平均值。"
+      },
+      "std": {
+        "name": "標準差",
+        "tooltip": "標準化的標準差。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "圖片",
+        "tooltip": "已處理的圖片"
+      }
+    }
+  },
+  "NormalizeVideoLatentStart": {
+    "description": "將影片 latent 的初始幀正規化，使其均值與標準差與後續參考幀相符。可幫助減少起始幀與影片其餘部分的差異。",
+    "display_name": "NormalizeVideoLatentStart",
+    "inputs": {
+      "latent": {
+        "name": "latent"
+      },
+      "reference_frame_count": {
+        "name": "reference_frame_count",
+        "tooltip": "用作參考的 latent 幀數，從起始幀之後開始"
+      },
+      "start_frame_count": {
+        "name": "start_frame_count",
+        "tooltip": "要正規化的 latent 幀數，從起始處開始計算"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
   "OpenAIChatConfig": {
     "description": "允許為 OpenAI 聊天節點指定進階配置選項。",
     "display_name": "OpenAI ChatGPT 進階選項",
@@ -7928,6 +11170,9 @@
         "name": "遮罩",
         "tooltip": "可選的修補遮罩（白色區域將被取代）"
       },
+      "model": {
+        "name": "model"
+      },
       "n": {
         "name": "數量",
         "tooltip": "要產生多少張影像"
@@ -8440,6 +11685,11 @@
       "steps": {
         "name": "步驟數"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "PorterDuffImageComposite": {
@@ -8473,6 +11723,9 @@
   "Preview3D": {
     "display_name": "3D 預覽",
     "inputs": {
+      "bg_image": {
+        "name": "bg_image"
+      },
       "camera_info": {
         "name": "camera_info"
       },
@@ -8480,14 +11733,20 @@
         "name": "影像"
       },
       "model_file": {
-        "name": "model_file"
+        "name": "model_file",
+        "tooltip": "3D 模型檔案或路徑字串"
       }
     }
   },
   "PreviewAny": {
     "display_name": "預覽任意",
     "inputs": {
-      "preview": {
+      "previewMode": {},
+      "preview_markdown": {
+        "name": "預覽"
+      },
+      "preview_text": {
+        "name": "預覽"
       },
       "source": {
         "name": "來源"
@@ -8527,6 +11786,28 @@
       }
     }
   },
+  "PrimitiveBoundingBox": {
+    "display_name": "邊界框",
+    "inputs": {
+      "height": {
+        "name": "高度"
+      },
+      "width": {
+        "name": "寬度"
+      },
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "PrimitiveFloat": {
     "display_name": "浮點數",
     "inputs": {
@@ -8628,6 +11909,36 @@
       }
     }
   },
+  "RandomCropImages": {
+    "display_name": "隨機裁切影像",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "height": {
+        "name": "height",
+        "tooltip": "裁切高度。"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "要處理的影像。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "隨機種子。"
+      },
+      "width": {
+        "name": "width",
+        "tooltip": "裁切寬度。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "已處理的影像"
+      }
+    }
+  },
   "RandomNoise": {
     "display_name": "隨機雜訊",
     "inputs": {
@@ -8637,6 +11948,11 @@
       "noise_seed": {
         "name": "noise_seed"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "RebatchImages": {
@@ -8677,6 +11993,11 @@
       "audio": {
         "name": "音訊"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "RecraftColorRGB": {
@@ -8724,6 +12045,25 @@
       }
     }
   },
+  "RecraftCreateStyleNode": {
+    "description": "從參考圖片建立自訂風格。上傳 1-5 張圖片作為風格參考。所有圖片的總大小限制為 5 MB。",
+    "display_name": "Recraft 建立風格",
+    "inputs": {
+      "images": {
+        "name": "圖片"
+      },
+      "style": {
+        "name": "風格",
+        "tooltip": "生成圖片的基礎風格。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "風格 ID",
+        "tooltip": null
+      }
+    }
+  },
   "RecraftCreativeUpscaleNode": {
     "description": "同步放大影像。\n使用「creative upscale」工具增強所提供的點陣影像，提升解析度，特別強化細節與人臉。",
     "display_name": "Recraft Creative 影像放大",
@@ -9031,6 +12371,88 @@
       }
     }
   },
+  "RecraftV4TextToImageNode": {
+    "description": "使用 Recraft V4 或 V4 Pro 模型產生圖像。",
+    "display_name": "Recraft V4 文字轉圖像",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "用於生成的模型。"
+      },
+      "model_size": {
+        "name": "size"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "要生成的圖像數量。"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "可選的圖像中不希望出現元素的文字描述。"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "圖像生成提示語。最多 10,000 字元。"
+      },
+      "recraft_controls": {
+        "name": "recraft_controls",
+        "tooltip": "可選，透過 Recraft Controls 節點進行額外生成控制。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "決定節點是否重新執行的種子值；實際結果無論種子如何都不保證可重現。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftV4TextToVectorNode": {
+    "description": "使用 Recraft V4 或 V4 Pro 模型產生 SVG。",
+    "display_name": "Recraft V4 文字轉向量圖",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "用於生成的模型。"
+      },
+      "model_size": {
+        "name": "size"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "要生成的圖像數量。"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "可選的圖像中不希望出現元素的文字描述。"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "圖像生成提示語。最多 10,000 字元。"
+      },
+      "recraft_controls": {
+        "name": "recraft_controls",
+        "tooltip": "可選，透過 Recraft Controls 節點進行額外生成控制。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "決定節點是否重新執行的種子值；實際結果無論種子如何都不保證可重現。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RecraftVectorizeImageNode": {
     "description": "從輸入圖片同步產生 SVG。",
     "display_name": "Recraft 向量化圖片",
@@ -9062,6 +12484,23 @@
       }
     }
   },
+  "ReferenceTimbreAudio": {
+    "description": "此節點設定 timbre 的參考音訊（適用於 ace step 1.5）",
+    "display_name": "ReferenceTimbreAudio",
+    "inputs": {
+      "conditioning": {
+        "name": "條件"
+      },
+      "latent": {
+        "name": "latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RegexExtract": {
     "display_name": "正則表達式提取",
     "inputs": {
@@ -9181,6 +12620,11 @@
       "image": {
         "name": "影像"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "RepeatLatentBatch": {
@@ -9194,6 +12638,51 @@
       }
     }
   },
+  "ReplaceText": {
+    "display_name": "取代文字",
+    "inputs": {
+      "find": {
+        "name": "find",
+        "tooltip": "要尋找的文字。"
+      },
+      "replace": {
+        "name": "replace",
+        "tooltip": "要取代成的文字。"
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "要處理的文字。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "texts",
+        "tooltip": "已處理的文字"
+      }
+    }
+  },
+  "ReplaceVideoLatentFrames": {
+    "display_name": "ReplaceVideoLatentFrames",
+    "inputs": {
+      "destination": {
+        "name": "destination",
+        "tooltip": "要被取代幀的目標 latent。"
+      },
+      "index": {
+        "name": "index",
+        "tooltip": "來源 latent 幀將插入目標 latent 的起始幀索引。負值則從結尾倒數計算。"
+      },
+      "source": {
+        "name": "source",
+        "tooltip": "提供要插入目標 latent 幀的來源 latent。如果未提供，則返回未更動的目標 latent。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RescaleCFG": {
     "display_name": "RescaleCFG",
     "inputs": {
@@ -9223,6 +12712,128 @@
       "target_width": {
         "name": "目標寬度"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ResizeImageMaskNode": {
+    "description": "使用各種縮放方法調整圖像或 mask 的大小。",
+    "display_name": "調整影像／遮罩大小",
+    "inputs": {
+      "input": {
+        "name": "input"
+      },
+      "resize_type": {
+        "name": "resize_type",
+        "tooltip": "選擇調整大小的方式：依照精確尺寸、縮放比例、匹配其他圖像等。"
+      },
+      "resize_type_crop": {
+        "name": "裁切"
+      },
+      "resize_type_height": {
+        "name": "高度"
+      },
+      "resize_type_width": {
+        "name": "寬度"
+      },
+      "scale_method": {
+        "name": "scale_method",
+        "tooltip": "插值演算法。'area' 適合縮小，'lanczos' 適合放大，'nearest-exact' 適合像素藝術。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "resized",
+        "tooltip": null
+      }
+    }
+  },
+  "ResizeImagesByLongerEdge": {
+    "display_name": "依較長邊調整圖片尺寸",
+    "inputs": {
+      "images": {
+        "name": "images",
+        "tooltip": "要處理的圖片。"
+      },
+      "longer_edge": {
+        "name": "longer_edge",
+        "tooltip": "較長邊的目標長度。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "已處理的圖片"
+      }
+    }
+  },
+  "ResizeImagesByShorterEdge": {
+    "display_name": "依較短邊調整圖片尺寸",
+    "inputs": {
+      "images": {
+        "name": "images",
+        "tooltip": "要處理的圖片。"
+      },
+      "shorter_edge": {
+        "name": "shorter_edge",
+        "tooltip": "較短邊的目標長度。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "已處理的圖片"
+      }
+    }
+  },
+  "ResolutionBucket": {
+    "display_name": "解析度分桶",
+    "inputs": {
+      "conditioning": {
+        "name": "conditioning",
+        "tooltip": "條件列表（必須與 latents 長度相同）。"
+      },
+      "latents": {
+        "name": "latents",
+        "tooltip": "依解析度分桶的 latent 字典列表。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latents",
+        "tooltip": "每個解析度分桶的 batched latent 字典列表。"
+      },
+      "1": {
+        "name": "conditioning",
+        "tooltip": "每個解析度分桶的條件列表。"
+      }
+    }
+  },
+  "ResolutionSelector": {
+    "description": "根據長寬比與百萬像素目標計算寬度與高度。適合用於設定 Empty Latent Image 的尺寸。",
+    "display_name": "解析度選擇器",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "長寬比",
+        "tooltip": "輸出尺寸的長寬比。"
+      },
+      "megapixels": {
+        "name": "百萬像素",
+        "tooltip": "目標總百萬像素。1.0 MP ≈ 1024×1024（正方形）。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "寬度",
+        "tooltip": "計算後的像素寬度（8 的倍數）。"
+      },
+      "1": {
+        "name": "高度",
+        "tooltip": "計算後的像素高度（8 的倍數）。"
+      }
     }
   },
   "Rodin3D_Detail": {
@@ -9246,6 +12857,10 @@
       "0": {
         "name": "3D 模型路徑",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9273,6 +12888,10 @@
       "0": {
         "name": "3D 模型路徑",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9297,6 +12916,10 @@
       "0": {
         "name": "3D 模型路徑",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9315,6 +12938,10 @@
       "0": {
         "name": "3D 模型路徑",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9339,6 +12966,10 @@
       "0": {
         "name": "3D 模型路徑",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -9464,6 +13095,90 @@
       }
     }
   },
+  "SDPoseDrawKeypoints": {
+    "display_name": "SDPoseDrawKeypoints",
+    "inputs": {
+      "draw_body": {
+        "name": "draw_body"
+      },
+      "draw_face": {
+        "name": "draw_face"
+      },
+      "draw_feet": {
+        "name": "draw_feet"
+      },
+      "draw_hands": {
+        "name": "draw_hands"
+      },
+      "face_point_size": {
+        "name": "face_point_size"
+      },
+      "keypoints": {
+        "name": "keypoints"
+      },
+      "score_threshold": {
+        "name": "score_threshold"
+      },
+      "stick_width": {
+        "name": "stick_width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SDPoseFaceBBoxes": {
+    "display_name": "SDPoseFaceBBoxes",
+    "inputs": {
+      "force_square": {
+        "name": "force_square",
+        "tooltip": "將較短的邊界框軸向擴展，使裁切區域始終為正方形。"
+      },
+      "keypoints": {
+        "name": "keypoints"
+      },
+      "scale": {
+        "name": "scale",
+        "tooltip": "每個偵測到的臉部邊界框區域的倍率。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "bboxes",
+        "tooltip": "每幀的臉部邊界框，與 SDPoseKeypointExtractor 的 bboxes 輸入相容。"
+      }
+    }
+  },
+  "SDPoseKeypointExtractor": {
+    "description": "使用 SDPose 模型從影像中提取姿勢關鍵點：https://huggingface.co/Comfy-Org/SDPose/tree/main/checkpoints",
+    "display_name": "SDPoseKeypointExtractor",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "bboxes": {
+        "name": "bboxes",
+        "tooltip": "可選的邊界框以提升偵測準確度。多人偵測時必須提供。"
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "keypoints",
+        "tooltip": "以 OpenPose 幀格式（canvas_width, canvas_height, people）表示的關鍵點"
+      }
+    }
+  },
   "SDTurboScheduler": {
     "display_name": "SDTurboScheduler",
     "inputs": {
@@ -9476,6 +13191,11 @@
       "steps": {
         "name": "步驟"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SD_4XUpscale_Conditioning": {
@@ -9631,10 +13351,12 @@
     },
     "outputs": {
       "0": {
-        "name": "輸出"
+        "name": "輸出",
+        "tooltip": null
       },
       "1": {
-        "name": "去噪輸出"
+        "name": "去雜訊輸出",
+        "tooltip": null
       }
     }
   },
@@ -9659,10 +13381,12 @@
     },
     "outputs": {
       "0": {
-        "name": "輸出"
+        "name": "輸出",
+        "tooltip": null
       },
       "1": {
-        "name": "去噪輸出"
+        "name": "去雜訊輸出",
+        "tooltip": null
       }
     }
   },
@@ -9699,6 +13423,11 @@
       "s_noise": {
         "name": "s_noise"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_2M_SDE": {
@@ -9716,6 +13445,11 @@
       "solver_type": {
         "name": "solver_type"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_2S_Ancestral": {
@@ -9727,6 +13461,11 @@
       "s_noise": {
         "name": "s_noise"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_3M_SDE": {
@@ -9741,6 +13480,11 @@
       "s_noise": {
         "name": "s_noise"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerDPMPP_SDE": {
@@ -9758,6 +13502,11 @@
       "s_noise": {
         "name": "s_noise"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerER_SDE": {
@@ -9776,6 +13525,11 @@
       "solver_type": {
         "name": "solver_type"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerEulerAncestral": {
@@ -9787,6 +13541,11 @@
       "s_noise": {
         "name": "s_noise"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerEulerAncestralCFGPP": {
@@ -9798,6 +13557,11 @@
       "s_noise": {
         "name": "s_noise"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerEulerCFGpp": {
@@ -9838,6 +13602,11 @@
       "order": {
         "name": "順序"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplerSASolver": {
@@ -9870,6 +13639,37 @@
       "use_pece": {
         "name": "use_pece"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SamplerSEEDS2": {
+    "description": "此採樣器節點可代表多種採樣器：\n\nseeds_2\n- 預設設定\n\nexp_heun_2_x0\n- solver_type=phi_2, r=1.0, eta=0.0\n\nexp_heun_2_x0_sde\n- solver_type=phi_2, r=1.0, eta=1.0, s_noise=1.0",
+    "display_name": "SamplerSEEDS2",
+    "inputs": {
+      "eta": {
+        "name": "eta",
+        "tooltip": "隨機強度"
+      },
+      "r": {
+        "name": "r",
+        "tooltip": "中間階段的相對步長（c2 節點）"
+      },
+      "s_noise": {
+        "name": "s_noise",
+        "tooltip": "SDE 噪聲倍率"
+      },
+      "solver_type": {
+        "name": "solver_type"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SamplingPercentToSigma": {
@@ -9888,7 +13688,8 @@
     },
     "outputs": {
       "0": {
-        "name": "sigma_value"
+        "name": "sigma 值",
+        "tooltip": null
       }
     }
   },
@@ -9990,7 +13791,8 @@
         "name": "影像"
       },
       "mesh": {
-        "name": "mesh"
+        "name": "mesh",
+        "tooltip": "要儲存的 Mesh 或 GLB 檔案"
       }
     }
   },
@@ -10008,6 +13810,44 @@
       }
     }
   },
+  "SaveImageDataSetToFolder": {
+    "display_name": "儲存影像資料集到資料夾",
+    "inputs": {
+      "filename_prefix": {
+        "name": "filename_prefix",
+        "tooltip": "儲存影像檔名的前綴。"
+      },
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "要儲存影像的資料夾名稱（於輸出目錄內）。"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "要儲存的影像清單。"
+      }
+    }
+  },
+  "SaveImageTextDataSetToFolder": {
+    "display_name": "儲存影像與文字資料集到資料夾",
+    "inputs": {
+      "filename_prefix": {
+        "name": "filename_prefix",
+        "tooltip": "儲存影像檔名的前綴。"
+      },
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "要儲存影像的資料夾名稱（於輸出目錄內）。"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "要儲存的影像清單。"
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "要儲存的文字標註清單。"
+      }
+    }
+  },
   "SaveImageWebsocket": {
     "display_name": "SaveImageWebsocket",
     "inputs": {
@@ -10027,6 +13867,23 @@
       }
     }
   },
+  "SaveLoRA": {
+    "display_name": "儲存 LoRA 權重",
+    "inputs": {
+      "lora": {
+        "name": "lora",
+        "tooltip": "要儲存的 LoRA 模型。請勿使用帶有 LoRA 層的模型。"
+      },
+      "prefix": {
+        "name": "prefix",
+        "tooltip": "儲存 LoRA 檔案時使用的前綴。"
+      },
+      "steps": {
+        "name": "steps",
+        "tooltip": "選填：LoRA 訓練的步數，將用於命名儲存檔案。"
+      }
+    }
+  },
   "SaveSVGNode": {
     "description": "在磁碟上儲存 SVG 檔案。",
     "display_name": "儲存SVG節點",
@@ -10040,6 +13897,27 @@
       }
     }
   },
+  "SaveTrainingDataset": {
+    "display_name": "儲存訓練資料集",
+    "inputs": {
+      "conditioning": {
+        "name": "conditioning",
+        "tooltip": "來自 MakeTrainingDataset 的 conditioning 清單。"
+      },
+      "folder_name": {
+        "name": "folder_name",
+        "tooltip": "要儲存資料集的資料夾名稱（於輸出目錄內）。"
+      },
+      "latents": {
+        "name": "latents",
+        "tooltip": "來自 MakeTrainingDataset 的 latent 字典清單。"
+      },
+      "shard_size": {
+        "name": "shard_size",
+        "tooltip": "每個分片檔案的樣本數。"
+      }
+    }
+  },
   "SaveVideo": {
     "description": "將輸入的影像儲存到您的 ComfyUI 輸出目錄。",
     "display_name": "儲存影片",
@@ -10160,6 +14038,11 @@
       "sigmas": {
         "name": "sigmas"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SetHookKeyframes": {
@@ -10200,6 +14083,58 @@
       }
     }
   },
+  "ShuffleDataset": {
+    "display_name": "隨機重排影像資料集",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "要處理的影像清單。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "隨機種子。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "已處理的影像"
+      }
+    }
+  },
+  "ShuffleImageTextDataset": {
+    "display_name": "隨機重排影像-文字資料集",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "要隨機重排的影像清單。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "隨機種子。"
+      },
+      "texts": {
+        "name": "texts",
+        "tooltip": "要隨機重排的文字清單。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "images",
+        "tooltip": "已隨機重排的影像"
+      },
+      "1": {
+        "name": "texts",
+        "tooltip": "已隨機重排的文字"
+      }
+    }
+  },
   "SkipLayerGuidanceDiT": {
     "description": "可用於所有 DiT 模型的通用 SkipLayerGuidance 節點版本。",
     "display_name": "跳過層引導 DiT",
@@ -10296,6 +14231,11 @@
       "width": {
         "name": "寬度"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "SplitAudioChannels": {
@@ -10308,10 +14248,35 @@
     },
     "outputs": {
       "0": {
-        "name": "左聲道"
+        "name": "左聲道",
+        "tooltip": null
       },
       "1": {
-        "name": "右聲道"
+        "name": "右聲道",
+        "tooltip": null
+      }
+    }
+  },
+  "SplitImageToTileList": {
+    "description": "將圖像分割為具有指定重疊區域的批次圖塊清單。",
+    "display_name": "將圖像分割為圖塊清單",
+    "inputs": {
+      "image": {
+        "name": "image"
+      },
+      "overlap": {
+        "name": "overlap"
+      },
+      "tile_height": {
+        "name": "tile_height"
+      },
+      "tile_width": {
+        "name": "tile_width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
       }
     }
   },
@@ -10343,10 +14308,12 @@
     },
     "outputs": {
       "0": {
-        "name": "高 sigmas"
+        "name": "高 sigma",
+        "tooltip": null
       },
       "1": {
-        "name": "低 sigmas"
+        "name": "低 sigma",
+        "tooltip": null
       }
     }
   },
@@ -10362,10 +14329,12 @@
     },
     "outputs": {
       "0": {
-        "name": "高 sigmas"
+        "name": "高 sigma",
+        "tooltip": null
       },
       "1": {
-        "name": "低 sigmas"
+        "name": "低 sigma",
+        "tooltip": null
       }
     }
   },
@@ -10969,6 +14938,21 @@
       }
     }
   },
+  "StripWhitespace": {
+    "display_name": "去除空白字元",
+    "inputs": {
+      "texts": {
+        "name": "文字",
+        "tooltip": "要處理的文字。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "文字",
+        "tooltip": "已處理的文字"
+      }
+    }
+  },
   "StyleModelApply": {
     "display_name": "套用風格模型",
     "inputs": {
@@ -11054,6 +15038,123 @@
       }
     }
   },
+  "Tencent3DPartNode": {
+    "description": "根據模型結構自動進行元件識別與生成。",
+    "display_name": "Hunyuan3D：3D零件",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "model_3d": {
+        "name": "model_3d",
+        "tooltip": "FBX 格式的 3D 模型。模型面數應少於 30000。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed 控制此節點是否重新執行；無論 seed 為何，結果皆為非確定性。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "TencentImageToModelNode": {
+    "display_name": "Hunyuan3D：圖片轉模型（專業版）",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "face_count": {
+        "name": "面數"
+      },
+      "generate_type": {
+        "name": "生成類型"
+      },
+      "generate_type_pbr": {
+        "name": "PBR"
+      },
+      "image": {
+        "name": "圖片"
+      },
+      "image_back": {
+        "name": "背面圖片"
+      },
+      "image_left": {
+        "name": "左側圖片"
+      },
+      "image_right": {
+        "name": "右側圖片"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "「LowPoly」選項在 `3.1` 模型中不可用。"
+      },
+      "seed": {
+        "name": "種子",
+        "tooltip": "種子控制節點是否重新執行；無論種子如何，結果皆為非確定性。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "模型檔案",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "OBJ",
+        "tooltip": null
+      }
+    }
+  },
+  "TencentTextToModelNode": {
+    "display_name": "Hunyuan3D：文字轉模型（專業版）",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "face_count": {
+        "name": "面數"
+      },
+      "generate_type": {
+        "name": "生成類型"
+      },
+      "generate_type_pbr": {
+        "name": "PBR"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "「LowPoly」選項在 `3.1` 模型中不可用。"
+      },
+      "prompt": {
+        "name": "提示詞",
+        "tooltip": "最多支援 1024 個字元。"
+      },
+      "seed": {
+        "name": "種子",
+        "tooltip": "種子控制節點是否重新執行；無論種子如何，結果皆為非確定性。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "模型檔案",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "OBJ",
+        "tooltip": null
+      }
+    }
+  },
   "TextEncodeAceStepAudio": {
     "display_name": "TextEncodeAceStepAudio",
     "inputs": {
@@ -11076,6 +15177,65 @@
       }
     }
   },
+  "TextEncodeAceStepAudio1_5": {
+    "display_name": "TextEncodeAceStepAudio1.5",
+    "inputs": {
+      "bpm": {
+        "name": "每分鐘節拍數"
+      },
+      "cfg_scale": {
+        "name": "cfg_scale"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "duration": {
+        "name": "時長"
+      },
+      "generate_audio_codes": {
+        "name": "產生音訊編碼",
+        "tooltip": "啟用產生音訊編碼的 LLM。這可能會較慢，但能提升產生音訊的品質。如果你已提供模型音訊參考，請關閉此選項。"
+      },
+      "keyscale": {
+        "name": "調性"
+      },
+      "language": {
+        "name": "語言"
+      },
+      "lyrics": {
+        "name": "歌詞"
+      },
+      "min_p": {
+        "name": "最小 p 值"
+      },
+      "seed": {
+        "name": "種子"
+      },
+      "tags": {
+        "name": "標籤"
+      },
+      "temperature": {
+        "name": "temperature"
+      },
+      "timesignature": {
+        "name": "拍號"
+      },
+      "top_k": {
+        "name": "top_k"
+      },
+      "top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TextEncodeHunyuanVideo_ImageToVideo": {
     "display_name": "文字編碼 HunyuanVideo 影像轉影片",
     "inputs": {
@@ -11149,6 +15309,158 @@
       }
     }
   },
+  "TextEncodeZImageOmni": {
+    "display_name": "TextEncodeZImageOmni",
+    "inputs": {
+      "auto_resize_images": {
+        "name": "自動調整圖像尺寸"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "image1": {
+        "name": "圖像1"
+      },
+      "image2": {
+        "name": "圖像2"
+      },
+      "image3": {
+        "name": "圖像3"
+      },
+      "image_encoder": {
+        "name": "圖像編碼器"
+      },
+      "prompt": {
+        "name": "提示詞"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TextGenerate": {
+    "display_name": "TextGenerate",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image": {
+        "name": "圖像"
+      },
+      "max_length": {
+        "name": "最大長度"
+      },
+      "prompt": {
+        "name": "提示詞"
+      },
+      "sampling_mode": {
+        "name": "取樣模式"
+      },
+      "sampling_mode_min_p": {
+        "name": "最小 p"
+      },
+      "sampling_mode_repetition_penalty": {
+        "name": "重複懲罰"
+      },
+      "sampling_mode_seed": {
+        "name": "隨機種子"
+      },
+      "sampling_mode_temperature": {
+        "name": "溫度"
+      },
+      "sampling_mode_top_k": {
+        "name": "top_k"
+      },
+      "sampling_mode_top_p": {
+        "name": "top_p"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "生成文字",
+        "tooltip": null
+      }
+    }
+  },
+  "TextGenerateLTX2Prompt": {
+    "display_name": "TextGenerateLTX2Prompt",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image": {
+        "name": "圖像"
+      },
+      "max_length": {
+        "name": "最大長度"
+      },
+      "prompt": {
+        "name": "提示詞"
+      },
+      "sampling_mode": {
+        "name": "取樣模式"
+      },
+      "sampling_mode_min_p": {
+        "name": "最小 p 值"
+      },
+      "sampling_mode_repetition_penalty": {
+        "name": "重複懲罰"
+      },
+      "sampling_mode_seed": {
+        "name": "隨機種子"
+      },
+      "sampling_mode_temperature": {
+        "name": "溫度"
+      },
+      "sampling_mode_top_k": {
+        "name": "Top-K"
+      },
+      "sampling_mode_top_p": {
+        "name": "Top-P"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "生成文字",
+        "tooltip": null
+      }
+    }
+  },
+  "TextToLowercase": {
+    "display_name": "轉換為小寫",
+    "inputs": {
+      "texts": {
+        "name": "文字",
+        "tooltip": "要處理的文字。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "文字",
+        "tooltip": "已處理的文字"
+      }
+    }
+  },
+  "TextToUppercase": {
+    "display_name": "轉換為大寫",
+    "inputs": {
+      "texts": {
+        "name": "文字",
+        "tooltip": "要處理的文字。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "文字",
+        "tooltip": "已處理的文字"
+      }
+    }
+  },
   "ThresholdMask": {
     "display_name": "闾值遮罩",
     "inputs": {
@@ -11158,6 +15470,11 @@
       "value": {
         "name": "數值"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "TomePatchModel": {
@@ -11176,6 +15493,118 @@
       }
     }
   },
+  "TopazImageEnhance": {
+    "description": "業界標準的放大與影像增強。",
+    "display_name": "Topaz 影像增強",
+    "inputs": {
+      "color_preservation": {
+        "name": "色彩保留",
+        "tooltip": "保留原始色彩。"
+      },
+      "creativity": {
+        "name": "創意度"
+      },
+      "crop_to_fill": {
+        "name": "裁切填滿",
+        "tooltip": "預設當輸出長寬比不同時會加黑邊。啟用後將裁切影像以填滿輸出尺寸。"
+      },
+      "face_enhancement": {
+        "name": "臉部增強",
+        "tooltip": "處理時增強臉部（如有）。"
+      },
+      "face_enhancement_creativity": {
+        "name": "臉部增強創意度",
+        "tooltip": "設定臉部增強的創意程度。"
+      },
+      "face_enhancement_strength": {
+        "name": "臉部增強強度",
+        "tooltip": "控制增強臉部相對於背景的銳利度。"
+      },
+      "face_preservation": {
+        "name": "臉部保留",
+        "tooltip": "保留主體的臉部特徵。"
+      },
+      "image": {
+        "name": "影像"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "output_height": {
+        "name": "輸出高度",
+        "tooltip": "設為 0 代表與原始高度或指定的輸出寬度相同。"
+      },
+      "output_width": {
+        "name": "輸出寬度",
+        "tooltip": "設為 0 代表自動計算（通常為原始尺寸或指定的輸出高度）。"
+      },
+      "prompt": {
+        "name": "提示詞",
+        "tooltip": "可選的文字提示，用於創意放大指引。"
+      },
+      "subject_detection": {
+        "name": "主體偵測"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TopazVideoEnhance": {
+    "description": "以強大的升頻與修復技術為影片注入新生命。",
+    "display_name": "Topaz Video Enhance",
+    "inputs": {
+      "dynamic_compression_level": {
+        "name": "CQP 等級",
+        "tooltip": "CQP 等級。"
+      },
+      "interpolation_duplicate": {
+        "name": "移除重複幀",
+        "tooltip": "分析輸入影片中的重複幀並移除。"
+      },
+      "interpolation_duplicate_threshold": {
+        "name": "重複幀靈敏度",
+        "tooltip": "重複幀的偵測靈敏度。"
+      },
+      "interpolation_enabled": {
+        "name": "啟用插幀"
+      },
+      "interpolation_frame_rate": {
+        "name": "輸出幀率",
+        "tooltip": "輸出影片的幀率。"
+      },
+      "interpolation_model": {
+        "name": "插幀模型"
+      },
+      "interpolation_slowmo": {
+        "name": "慢動作倍數",
+        "tooltip": "對輸入影片應用的慢動作倍數。例如，2 會讓輸出變成原來的兩倍慢，時長加倍。"
+      },
+      "upscaler_creativity": {
+        "name": "創意程度",
+        "tooltip": "創意等級（僅適用於 Starlight (Astra) Creative）。"
+      },
+      "upscaler_enabled": {
+        "name": "啟用升頻"
+      },
+      "upscaler_model": {
+        "name": "升頻模型"
+      },
+      "upscaler_resolution": {
+        "name": "升頻解析度"
+      },
+      "video": {
+        "name": "影片"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "TorchCompileModel": {
     "display_name": "Torch 編譯模型",
     "inputs": {
@@ -11203,6 +15632,18 @@
         "name": "批次大小",
         "tooltip": "用於訓練的批次大小。"
       },
+      "bucket_mode": {
+        "name": "解析度分桶模式",
+        "tooltip": "啟用解析度分桶模式。啟用後，需從 ResolutionBucket 節點輸入預先分桶的 latent。"
+      },
+      "bypass_mode": {
+        "name": "bypass_mode",
+        "tooltip": "啟用訓練旁路模式。啟用後，adapter 會透過 forward hook 應用，而不是直接修改權重。適用於無法直接修改權重的量化模型。"
+      },
+      "checkpoint_depth": {
+        "name": "checkpoint_depth",
+        "tooltip": "梯度檢查點的深度層級。"
+      },
       "control_after_generate": {
         "name": "生成後控制"
       },
@@ -11238,6 +15679,10 @@
         "name": "模型",
         "tooltip": "用於訓練 LoRA 的模型。"
       },
+      "offloading": {
+        "name": "offloading",
+        "tooltip": "梯度檢查點的深度層級。"
+      },
       "optimizer": {
         "name": "優化器",
         "tooltip": "訓練時使用的優化器。"
@@ -11265,16 +15710,16 @@
     },
     "outputs": {
       "0": {
-        "name": "含 LoRA 的模型"
+        "name": "lora",
+        "tooltip": "已套用 LoRA 的模型"
       },
       "1": {
-        "name": "LoRA"
+        "name": "損失地圖",
+        "tooltip": "LoRA 權重"
       },
       "2": {
-        "name": "損失"
-      },
-      "3": {
-        "name": "步數"
+        "name": "步數",
+        "tooltip": "損失歷史"
       }
     }
   },
@@ -11293,6 +15738,11 @@
         "name": "起始索引",
         "tooltip": "開始時間（秒），可為負數表示從末尾計算（支援小數秒）。"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "TrimVideoLatent": {
@@ -11334,23 +15784,62 @@
   "TripoConversionNode": {
     "display_name": "Tripo：轉換模型",
     "inputs": {
+      "animate_in_place": {
+        "name": "原地動畫"
+      },
+      "bake": {
+        "name": "烘焙"
+      },
+      "export_orientation": {
+        "name": "匯出方向"
+      },
+      "export_vertex_colors": {
+        "name": "匯出頂點色"
+      },
       "face_limit": {
         "name": "面數限制"
       },
+      "fbx_preset": {
+        "name": "FBX 預設"
+      },
+      "flatten_bottom": {
+        "name": "底部平整化"
+      },
+      "flatten_bottom_threshold": {
+        "name": "平整化閾值"
+      },
+      "force_symmetry": {
+        "name": "強制對稱"
+      },
       "format": {
         "name": "格式"
       },
       "original_model_task_id": {
         "name": "原始模型任務ID"
       },
+      "pack_uv": {
+        "name": "打包 UV"
+      },
+      "part_names": {
+        "name": "部件名稱"
+      },
+      "pivot_to_center_bottom": {
+        "name": "樞軸移至底部中心"
+      },
       "quad": {
         "name": "四邊形"
       },
+      "scale_factor": {
+        "name": "縮放係數"
+      },
       "texture_format": {
         "name": "紋理格式"
       },
       "texture_size": {
         "name": "紋理尺寸"
+      },
+      "with_animation": {
+        "name": "包含動畫"
       }
     }
   },
@@ -11360,6 +15849,9 @@
       "face_limit": {
         "name": "面數限制"
       },
+      "geometry_quality": {
+        "name": "幾何品質"
+      },
       "image": {
         "name": "圖像"
       },
@@ -11401,7 +15893,11 @@
         "tooltip": null
       },
       "1": {
-        "name": "模型任務ID",
+        "name": "模型任務 ID",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11412,6 +15908,9 @@
       "face_limit": {
         "name": "face_limit"
       },
+      "geometry_quality": {
+        "name": "幾何品質"
+      },
       "image": {
         "name": "圖像"
       },
@@ -11455,11 +15954,15 @@
     },
     "outputs": {
       "0": {
-        "name": "model_file",
+        "name": "模型檔案",
         "tooltip": null
       },
       "1": {
-        "name": "model task_id",
+        "name": "模型任務 ID",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11475,11 +15978,15 @@
     },
     "outputs": {
       "0": {
-        "name": "model_file",
+        "name": "模型檔案",
         "tooltip": null
       },
       "1": {
-        "name": "model task_id",
+        "name": "模型任務 ID",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11496,11 +16003,15 @@
     },
     "outputs": {
       "0": {
-        "name": "model_file",
+        "name": "模型檔案",
         "tooltip": null
       },
       "1": {
-        "name": "retarget task_id",
+        "name": "重定向任務 ID",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11518,7 +16029,11 @@
         "tooltip": null
       },
       "1": {
-        "name": "綁定任務ID",
+        "name": "綁定任務 ID",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11529,6 +16044,9 @@
       "face_limit": {
         "name": "面數限制"
       },
+      "geometry_quality": {
+        "name": "幾何品質"
+      },
       "image_seed": {
         "name": "圖片種子"
       },
@@ -11569,7 +16087,11 @@
         "tooltip": null
       },
       "1": {
-        "name": "模型任務ID",
+        "name": "模型任務 ID",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
         "tooltip": null
       }
     }
@@ -11602,8 +16124,31 @@
         "tooltip": null
       },
       "1": {
-        "name": "模型任務ID",
+        "name": "模型任務 ID",
         "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      }
+    }
+  },
+  "TruncateText": {
+    "display_name": "截斷文字",
+    "inputs": {
+      "max_length": {
+        "name": "最大長度",
+        "tooltip": "文字最大長度。"
+      },
+      "texts": {
+        "name": "文字",
+        "tooltip": "要處理的文字。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "文字",
+        "tooltip": "已處理的文字"
       }
     }
   },
@@ -11748,6 +16293,33 @@
       "vae": {
         "name": "vae"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VAEDecodeAudioTiled": {
+    "display_name": "VAE 解碼音訊（分塊）",
+    "inputs": {
+      "overlap": {
+        "name": "重疊"
+      },
+      "samples": {
+        "name": "樣本"
+      },
+      "tile_size": {
+        "name": "分塊大小"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VAEDecodeHunyuan3D": {
@@ -11765,6 +16337,11 @@
       "vae": {
         "name": "vae"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VAEDecodeTiled": {
@@ -11812,6 +16389,11 @@
       "vae": {
         "name": "vae"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VAEEncodeForInpaint": {
@@ -11890,6 +16472,63 @@
       "steps": {
         "name": "步驟數"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Veo3FirstLastFrameNode": {
+    "description": "使用提示詞及首尾影格生成影片。",
+    "display_name": "Google Veo 3 首尾影格生成影片",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "長寬比",
+        "tooltip": "輸出影片的長寬比"
+      },
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "duration": {
+        "name": "時長",
+        "tooltip": "輸出影片的秒數"
+      },
+      "first_frame": {
+        "name": "起始影格",
+        "tooltip": "開始影格"
+      },
+      "generate_audio": {
+        "name": "生成音訊",
+        "tooltip": "為影片生成音訊。"
+      },
+      "last_frame": {
+        "name": "結束影格",
+        "tooltip": "結束影格"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "negative_prompt": {
+        "name": "反向提示詞",
+        "tooltip": "用於引導影片中應避免內容的反向文字提示"
+      },
+      "prompt": {
+        "name": "提示詞",
+        "tooltip": "影片的文字描述"
+      },
+      "resolution": {
+        "name": "解析度"
+      },
+      "seed": {
+        "name": "種子",
+        "tooltip": "影片生成的隨機種子"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "Veo3VideoGenerationNode": {
@@ -11996,6 +16635,31 @@
       }
     }
   },
+  "Video Slice": {
+    "display_name": "影片切片",
+    "inputs": {
+      "duration": {
+        "name": "時長",
+        "tooltip": "以秒為單位的時長，0 代表無限時長"
+      },
+      "start_time": {
+        "name": "起始時間",
+        "tooltip": "以秒為單位的起始時間"
+      },
+      "strict_duration": {
+        "name": "嚴格時長",
+        "tooltip": "若為 True，當指定時長無法達成時，將產生錯誤。"
+      },
+      "video": {
+        "name": "影片"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "VideoLinearCFGGuidance": {
     "display_name": "影片線性 CFG 引導",
     "inputs": {
@@ -12018,6 +16682,319 @@
       }
     }
   },
+  "Vidu2ImageToVideoNode": {
+    "description": "從一張圖像及可選提示詞生成影片。",
+    "display_name": "Vidu2 圖像轉影片生成",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "用作生成影片起始畫格的圖像。"
+      },
+      "model": {
+        "name": "model"
+      },
+      "movement_amplitude": {
+        "name": "movement_amplitude",
+        "tooltip": "畫面中物件的移動幅度。"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "影片生成的可選文字提示（最多 2000 字元）。"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2ReferenceVideoNode": {
+    "description": "從多張參考圖像及提示詞生成影片。",
+    "display_name": "Vidu2 參考圖像轉影片生成",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "audio": {
+        "name": "audio",
+        "tooltip": "啟用後，影片將根據提示詞包含生成的語音及背景音樂。"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "model": {
+        "name": "model"
+      },
+      "movement_amplitude": {
+        "name": "movement_amplitude",
+        "tooltip": "畫面中物件的移動幅度。"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "啟用後，影片將根據提示詞生成語音及背景音樂。"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "subjects": {
+        "name": "subjects",
+        "tooltip": "每個主體最多可提供 3 張參考圖像（所有主體合計最多 7 張）。可在提示詞中以 @subject{subject_id} 參照。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2StartEndToVideoNode": {
+    "description": "根據起始影格、結束影格與提示詞生成影片。",
+    "display_name": "Vidu2 起始/結束影格轉影片生成",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "end_frame": {
+        "name": "end_frame"
+      },
+      "first_frame": {
+        "name": "first_frame"
+      },
+      "model": {
+        "name": "model"
+      },
+      "movement_amplitude": {
+        "name": "movement_amplitude",
+        "tooltip": "畫面中物件的移動幅度。"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "提示描述（最多 2000 字元）。"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2TextToVideoNode": {
+    "description": "根據文字提示生成影片",
+    "display_name": "Vidu2 文字轉影片生成",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "background_music": {
+        "name": "background_music",
+        "tooltip": "是否為生成的影片加入背景音樂。"
+      },
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "用於影片生成的文字描述，最長 2000 字元。"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3ImageToVideoNode": {
+    "description": "從圖像及可選提示詞生成影片。",
+    "display_name": "Vidu Q3 圖像轉影片生成",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "作為生成影片起始畫格的圖像。"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "用於影片生成的模型。"
+      },
+      "model_audio": {
+        "name": "audio"
+      },
+      "model_duration": {
+        "name": "duration"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "影片生成的可選文字提示（最多 2000 字元）。"
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3StartEndToVideoNode": {
+    "description": "根據起始影格、結束影格與提示詞生成影片。",
+    "display_name": "Vidu Q3 起始/結束影格轉影片生成",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "end_frame": {
+        "name": "結束影格"
+      },
+      "first_frame": {
+        "name": "起始影格"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "用於影片生成的模型。"
+      },
+      "model_audio": {
+        "name": "音訊"
+      },
+      "model_duration": {
+        "name": "時長"
+      },
+      "model_resolution": {
+        "name": "解析度"
+      },
+      "prompt": {
+        "name": "提示詞",
+        "tooltip": "提示描述（最多 2000 字元）。"
+      },
+      "seed": {
+        "name": "隨機種子"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3TextToVideoNode": {
+    "description": "根據文字提示生成影片。",
+    "display_name": "Vidu Q3 文字轉影片生成",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "用於影片生成的模型。"
+      },
+      "model_aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "model_audio": {
+        "name": "audio"
+      },
+      "model_duration": {
+        "name": "duration"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "影片生成的文字描述，最長 2000 字元。"
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ViduExtendVideoNode": {
+    "description": "透過生成額外畫格來延伸現有影片。",
+    "display_name": "Vidu 影片延伸",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "end_frame": {
+        "name": "end_frame"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "用於影片延伸的模型。"
+      },
+      "model_duration": {
+        "name": "duration"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "延伸影片的可選文字提示（最多 2000 字元）。"
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "要延伸的來源影片。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ViduImageToVideoNode": {
     "description": "從圖像和可選提示生成影片",
     "display_name": "Vidu 圖像轉影片生成",
@@ -12060,6 +17037,49 @@
       }
     }
   },
+  "ViduMultiFrameVideoNode": {
+    "description": "生成具有多個關鍵畫格轉場的影片。",
+    "display_name": "Vidu 多畫格影片生成",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "frames": {
+        "name": "frames",
+        "tooltip": "關鍵畫格轉場數量（2-9）。"
+      },
+      "frames_duration1": {
+        "name": "duration1"
+      },
+      "frames_duration2": {
+        "name": "duration2"
+      },
+      "frames_prompt1": {
+        "name": "prompt1"
+      },
+      "frames_prompt2": {
+        "name": "prompt2"
+      },
+      "model": {
+        "name": "model"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "start_image": {
+        "name": "start_image",
+        "tooltip": "起始畫格圖像。長寬比需介於 1:4 與 4:1 之間。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ViduReferenceVideoNode": {
     "description": "從多張圖像和提示生成影片",
     "display_name": "Vidu 參考圖像轉影片生成",
@@ -12206,6 +17226,11 @@
       "voxel": {
         "name": "voxel"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "VoxelToMeshBasic": {
@@ -12217,6 +17242,11 @@
       "voxel": {
         "name": "voxel"
       }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
     }
   },
   "Wan22FunControlToVideo": {
@@ -12496,6 +17526,10 @@
         "name": "上下文步幅",
         "tooltip": "上下文窗口的步幅；僅適用於均勻排程。"
       },
+      "freenoise": {
+        "name": "freenoise",
+        "tooltip": "是否套用 FreeNoise 噪聲洗牌，可提升視窗融合效果。"
+      },
       "fuse_method": {
         "name": "融合方法",
         "tooltip": "用於融合上下文窗口的方法。"
@@ -12836,6 +17870,10 @@
         "name": "種子值",
         "tooltip": "用於生成的種子值。"
       },
+      "shot_type": {
+        "name": "鏡頭類型",
+        "tooltip": "指定生成影片的鏡頭類型，即影片是單一連續鏡頭還是多鏡頭剪接。此參數僅在 prompt_extend 為 True 時生效。"
+      },
       "watermark": {
         "name": "浮水印",
         "tooltip": "是否在結果中添加「AI生成」浮水印。"
@@ -12847,6 +17885,196 @@
       }
     }
   },
+  "WanInfiniteTalkToVideo": {
+    "display_name": "WanInfiniteTalkToVideo",
+    "inputs": {
+      "audio_encoder_output_1": {
+        "name": "音訊編碼器輸出 1"
+      },
+      "audio_scale": {
+        "name": "音訊縮放"
+      },
+      "clip_vision_output": {
+        "name": "clip 視覺輸出"
+      },
+      "height": {
+        "name": "高度"
+      },
+      "length": {
+        "name": "長度"
+      },
+      "mode": {
+        "name": "模式"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "model_patch": {
+        "name": "模型修補"
+      },
+      "motion_frame_count": {
+        "name": "動作影格數",
+        "tooltip": "用作動作參考的前置影格數量。"
+      },
+      "negative": {
+        "name": "負向提示"
+      },
+      "positive": {
+        "name": "正向提示"
+      },
+      "previous_frames": {
+        "name": "前置影格"
+      },
+      "start_image": {
+        "name": "起始圖像"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "寬度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "模型",
+        "tooltip": null
+      },
+      "1": {
+        "name": "正向提示",
+        "tooltip": null
+      },
+      "2": {
+        "name": "負向提示",
+        "tooltip": null
+      },
+      "3": {
+        "name": "latent",
+        "tooltip": null
+      },
+      "4": {
+        "name": "裁切圖像",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveConcatTrack": {
+    "display_name": "WanMoveConcatTrack",
+    "inputs": {
+      "tracks_1": {
+        "name": "tracks_1"
+      },
+      "tracks_2": {
+        "name": "tracks_2"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveTrackToVideo": {
+    "display_name": "WanMoveTrackToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "批次大小"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "高度"
+      },
+      "length": {
+        "name": "長度"
+      },
+      "negative": {
+        "name": "negative"
+      },
+      "positive": {
+        "name": "positive"
+      },
+      "start_image": {
+        "name": "起始影像"
+      },
+      "strength": {
+        "name": "強度",
+        "tooltip": "軌跡條件的強度。"
+      },
+      "tracks": {
+        "name": "軌跡"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "寬度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "positive",
+        "tooltip": null
+      },
+      "1": {
+        "name": "negative",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveTracksFromCoords": {
+    "display_name": "WanMoveTracksFromCoords",
+    "inputs": {
+      "track_coords": {
+        "name": "track_coords"
+      },
+      "track_mask": {
+        "name": "track_mask"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "track_length",
+        "tooltip": null
+      }
+    }
+  },
+  "WanMoveVisualizeTracks": {
+    "display_name": "WanMoveVisualizeTracks",
+    "inputs": {
+      "circle_size": {
+        "name": "圓圈大小"
+      },
+      "images": {
+        "name": "影像"
+      },
+      "line_resolution": {
+        "name": "線條解析度"
+      },
+      "line_width": {
+        "name": "線寬"
+      },
+      "opacity": {
+        "name": "不透明度"
+      },
+      "tracks": {
+        "name": "軌跡"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "WanPhantomSubjectToVideo": {
     "display_name": "萬幻影主體轉影片",
     "inputs": {
@@ -12894,6 +18122,113 @@
       }
     }
   },
+  "WanReferenceVideoApi": {
+    "description": "使用輸入影片中的角色與聲音，結合提示詞，生成一個保持角色一致性的新影片。",
+    "display_name": "Wan Reference to Video",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成後控制"
+      },
+      "duration": {
+        "name": "時長"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "negative_prompt": {
+        "name": "反向提示詞",
+        "tooltip": "描述需要避免內容的反向提示詞。"
+      },
+      "prompt": {
+        "name": "提示詞",
+        "tooltip": "描述元素與視覺特徵的提示詞。支援英文與中文。可使用 `character1`、`character2` 等標識來指代參考角色。"
+      },
+      "reference_videos": {
+        "name": "參考影片"
+      },
+      "seed": {
+        "name": "隨機種子"
+      },
+      "shot_type": {
+        "name": "鏡頭類型",
+        "tooltip": "指定生成影片的鏡頭類型，即影片是單一連續鏡頭還是多個剪接鏡頭。"
+      },
+      "size": {
+        "name": "尺寸"
+      },
+      "watermark": {
+        "name": "浮水印",
+        "tooltip": "是否在結果中加入 AI 生成的浮水印。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanSCAILToVideo": {
+    "display_name": "WanSCAILToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "批次大小"
+      },
+      "clip_vision_output": {
+        "name": "clip_vision_output"
+      },
+      "height": {
+        "name": "高度"
+      },
+      "length": {
+        "name": "長度"
+      },
+      "negative": {
+        "name": "負向"
+      },
+      "pose_end": {
+        "name": "姿勢結束步驟",
+        "tooltip": "結束使用姿勢條件的步驟。"
+      },
+      "pose_start": {
+        "name": "姿勢起始步驟",
+        "tooltip": "開始使用姿勢條件的步驟。"
+      },
+      "pose_strength": {
+        "name": "姿勢強度",
+        "tooltip": "姿勢 latent 的強度。"
+      },
+      "pose_video": {
+        "name": "姿勢影片",
+        "tooltip": "用於姿勢條件的影片。將會縮小為主影片解析度的一半。"
+      },
+      "positive": {
+        "name": "正向"
+      },
+      "reference_image": {
+        "name": "參考圖片"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "寬度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "正向",
+        "tooltip": null
+      },
+      "1": {
+        "name": "負向",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": "生成尺寸的空 latent。"
+      }
+    }
+  },
   "WanSoundImageToVideo": {
     "display_name": "萬聲圖像轉影片",
     "inputs": {
@@ -13072,6 +18407,10 @@
         "name": "種子值",
         "tooltip": "用於生成的種子值。"
       },
+      "shot_type": {
+        "name": "鏡頭類型",
+        "tooltip": "指定生成影片的鏡頭類型，即影片是單一連續鏡頭還是多個剪接鏡頭。此參數僅在 prompt_extend 為 True 時生效。"
+      },
       "size": {
         "name": "尺寸"
       },
@@ -13197,6 +18536,43 @@
       }
     }
   },
+  "WavespeedFlashVSRNode": {
+    "description": "快速高品質影片升頻器，提升解析度並恢復低解析度或模糊影片的清晰度。",
+    "display_name": "FlashVSR 影片升頻",
+    "inputs": {
+      "target_resolution": {
+        "name": "目標解析度"
+      },
+      "video": {
+        "name": "影片"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WavespeedImageUpscaleNode": {
+    "description": "提升圖像解析度與品質，將照片升頻至 4K 或 8K，獲得銳利細緻的效果。",
+    "display_name": "WaveSpeed 圖像升頻",
+    "inputs": {
+      "image": {
+        "name": "圖像"
+      },
+      "model": {
+        "name": "model"
+      },
+      "target_resolution": {
+        "name": "目標解析度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "WebcamCapture": {
     "display_name": "網路攝影機擷取",
     "inputs": {
@@ -13209,13 +18585,38 @@
       "image": {
         "name": "影像"
       },
-      "waiting for camera___": {
-      },
+      "waiting for camera___": {},
       "width": {
         "name": "寬度"
       }
     }
   },
+  "ZImageFunControlnet": {
+    "display_name": "ZImageFunControlnet",
+    "inputs": {
+      "image": {
+        "name": "影像"
+      },
+      "inpaint_image": {
+        "name": "修補影像"
+      },
+      "mask": {
+        "name": "遮罩"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "model_patch": {
+        "name": "模型補丁"
+      },
+      "strength": {
+        "name": "強度"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
   "unCLIPCheckpointLoader": {
     "display_name": "unCLIP 檢查點載入器",
     "inputs": {
@@ -13240,5 +18641,19 @@
         "name": "強度"
       }
     }
+  },
+  "wanBlockSwap": {
+    "description": "NOP",
+    "display_name": "wanBlockSwap",
+    "inputs": {
+      "model": {
+        "name": "模型"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
   }
 }
diff --git a/src/locales/zh-TW/settings.json b/src/locales/zh-TW/settings.json
index 3e66a779da..8626acaafc 100644
--- a/src/locales/zh-TW/settings.json
+++ b/src/locales/zh-TW/settings.json
@@ -52,7 +52,8 @@
     }
   },
   "Comfy_Canvas_SelectionToolbox": {
-    "name": "顯示選取工具箱"
+    "name": "顯示選取工具箱",
+    "tooltip": "當選取節點時顯示浮動工具列，快速存取常用操作。"
   },
   "Comfy_ConfirmClear": {
     "name": "清除工作流程時需要確認"
@@ -79,6 +80,17 @@
   "Comfy_EnableWorkflowViewRestore": {
     "name": "在工作流程中儲存並還原畫布位置與縮放等級"
   },
+  "Comfy_Execution_PreviewMethod": {
+    "name": "即時預覽方式",
+    "options": {
+      "auto": "auto",
+      "default": "default",
+      "latent2rgb": "latent2rgb",
+      "none": "none",
+      "taesd": "taesd"
+    },
+    "tooltip": "在圖像生成過程中使用的即時預覽方式。「default」會使用伺服器 CLI 設定。"
+  },
   "Comfy_FloatRoundingPrecision": {
     "name": "浮點元件小數點位數 [0 = 自動]。",
     "tooltip": "（需重新載入頁面）"
@@ -92,6 +104,10 @@
   "Comfy_Graph_CtrlShiftZoom": {
     "name": "啟用快速縮放快捷鍵（Ctrl + Shift + 拖曳）"
   },
+  "Comfy_Graph_DeduplicateSubgraphNodeIds": {
+    "name": "去重子圖節點 ID",
+    "tooltip": "載入工作流程時，自動重新分配子圖中重複的節點 ID。"
+  },
   "Comfy_Graph_LinkMarkers": {
     "name": "連結中點標記",
     "options": {
@@ -100,6 +116,10 @@
       "None": "無"
     }
   },
+  "Comfy_Graph_LiveSelection": {
+    "name": "即時選取",
+    "tooltip": "啟用後，拖曳選取框時會即時選取/取消選取節點，類似其他設計工具的操作方式。"
+  },
   "Comfy_Graph_ZoomSpeed": {
     "name": "畫布縮放速度"
   },
@@ -132,15 +152,16 @@
       "Linear": "線性",
       "Spline": "曲線",
       "Straight": "直線"
-    }
+    },
+    "tooltip": "控制畫布上節點連接線的外觀與可見性。"
   },
   "Comfy_Load3D_3DViewerEnable": {
-    "name": "啟用 3D 檢視器（測試版）",
-    "tooltip": "為所選節點啟用 3D 檢視器（測試版）。此功能可讓您在全尺寸 3D 檢視器中直接瀏覽與互動 3D 模型。"
+    "name": "啟用 3D 檢視器（Beta）",
+    "tooltip": "為所選節點啟用 3D 檢視器（Beta）。此功能可讓您在全尺寸 3D 檢視器中直接視覺化並互動 3D 模型。"
   },
   "Comfy_Load3D_BackgroundColor": {
     "name": "初始背景顏色",
-    "tooltip": "控制 3D 場景的預設背景顏色。此設定決定新建立 3D 元件時的背景外觀，但每個元件在建立後都可單獨調整。"
+    "tooltip": "控制 3D 場景的預設背景顏色。此設定決定新建立 3D 元件時的背景外觀，但建立後可針對每個元件單獨調整。"
   },
   "Comfy_Load3D_CameraType": {
     "name": "初始相機類型",
@@ -148,27 +169,36 @@
       "orthographic": "正交",
       "perspective": "透視"
     },
-    "tooltip": "控制新建 3D 元件時，相機預設為透視或正交。此預設值在建立後仍可針對每個元件單獨切換。"
+    "tooltip": "控制新建立 3D 元件時相機預設為透視或正交。此預設值可於建立後針對每個元件單獨切換。"
   },
   "Comfy_Load3D_LightAdjustmentIncrement": {
     "name": "燈光調整增量",
-    "tooltip": "控制在 3D 場景中調整燈光強度時的增量大小。較小的步進值可讓您更細緻地調整燈光，較大的值則每次調整會有更明顯的變化。"
+    "tooltip": "控制調整 3D 場景燈光強度時的增量大小。較小的步進值可更細緻地控制燈光調整，較大的值則每次調整變化更明顯。"
   },
   "Comfy_Load3D_LightIntensity": {
-    "name": "初始光源強度",
-    "tooltip": "設定 3D 場景中燈光的預設亮度等級。此數值決定新建立 3D 元件時燈光照亮物體的強度，但每個元件在建立後都可以個別調整。"
+    "name": "初始燈光強度",
+    "tooltip": "設定 3D 場景燈光的預設亮度。此值決定新建立 3D 元件時燈光照亮物件的強度，但建立後可針對每個元件單獨調整。"
   },
   "Comfy_Load3D_LightIntensityMaximum": {
-    "name": "最大光照強度",
-    "tooltip": "設定 3D 場景中允許的最大光照強度值。這會定義在調整任何 3D 小工具照明時可設定的最高亮度上限。"
+    "name": "燈光強度上限",
+    "tooltip": "設定 3D 場景可允許的最大燈光強度值。此值定義在任何 3D 元件中調整燈光時可設定的最高亮度。"
   },
   "Comfy_Load3D_LightIntensityMinimum": {
-    "name": "光源強度下限",
-    "tooltip": "設定 3D 場景中允許的最小光源強度值。這會定義在調整任何 3D 控制元件照明時可設定的最低亮度限制。"
+    "name": "燈光強度下限",
+    "tooltip": "設定 3D 場景可允許的最小燈光強度值。此值定義在任何 3D 元件中調整燈光時可設定的最低亮度。"
+  },
+  "Comfy_Load3D_PLYEngine": {
+    "name": "PLY 引擎",
+    "options": {
+      "fastply": "fastply",
+      "sparkjs": "sparkjs",
+      "threejs": "threejs"
+    },
+    "tooltip": "選擇用於載入 PLY 檔案的引擎。「threejs」使用原生 Three.js PLYLoader（適合網格 PLY 檔案）。「fastply」使用優化的 ASCII 點雲 PLY 檔案載入器。「sparkjs」使用 Spark.js 處理 3D Gaussian Splatting PLY 檔案。"
   },
   "Comfy_Load3D_ShowGrid": {
-    "name": "初始網格可見性",
-    "tooltip": "控制在建立新的 3D 元件時，網格是否預設可見。此預設值在建立後仍可針對每個元件單獨切換。"
+    "name": "初始格線可見性",
+    "tooltip": "控制新建立 3D 元件時格線是否預設可見。此預設值可於建立後針對每個元件單獨切換。"
   },
   "Comfy_Locale": {
     "name": "語言"
@@ -218,11 +248,20 @@
   "Comfy_NodeBadge_ShowApiPricing": {
     "name": "顯示 API 節點價格標籤"
   },
+  "Comfy_NodeLibrary_NewDesign": {
+    "name": "全新節點庫設計",
+    "tooltip": "啟用重新設計的節點庫側邊欄，包含分頁（精選、全部、自訂）、強化搜尋功能及滑鼠懸停預覽。"
+  },
+  "Comfy_NodeReplacement_Enabled": {
+    "name": "啟用自動節點替換",
+    "tooltip": "啟用後，若有替換對應關係，遺失的節點可自動以其較新的對應節點替換。"
+  },
   "Comfy_NodeSearchBoxImpl": {
     "name": "節點搜尋框實作",
     "options": {
       "default": "預設",
-      "litegraph (legacy)": "litegraph（舊版）"
+      "litegraph (legacy)": "litegraph（舊版）",
+      "v1 (legacy)": "v1（舊版）"
     }
   },
   "Comfy_NodeSearchBoxImpl_NodePreview": {
@@ -248,6 +287,10 @@
   "Comfy_Node_AllowImageSizeDraw": {
     "name": "在圖片預覽下方顯示寬度 × 高度"
   },
+  "Comfy_Node_AlwaysShowAdvancedWidgets": {
+    "name": "在所有節點上總是顯示進階小工具",
+    "tooltip": "啟用後，所有節點的進階小工具將始終可見，無需單獨展開。"
+  },
   "Comfy_Node_AutoSnapLinkToSlot": {
     "name": "自動吸附連結到節點插槽",
     "tooltip": "拖曳連結到節點時，連結會自動吸附到節點上可用的輸入插槽"
@@ -308,6 +351,14 @@
     "name": "佇列歷史記錄大小",
     "tooltip": "佇列歷史中顯示的最大任務數量。"
   },
+  "Comfy_Queue_QPOV2": {
+    "name": "在資產側邊欄中使用統一任務佇列",
+    "tooltip": "將浮動任務佇列面板替換為嵌入資產側邊欄的等效任務佇列。您可以停用此選項以恢復浮動面板佈局。"
+  },
+  "Comfy_RightSidePanel_ShowErrorsTab": {
+    "name": "在側邊面板顯示錯誤分頁",
+    "tooltip": "啟用後，右側邊面板會顯示錯誤分頁，方便一覽工作流程執行錯誤。"
+  },
   "Comfy_Sidebar_Location": {
     "name": "側邊欄位置",
     "options": {
@@ -345,6 +396,14 @@
   "Comfy_TreeExplorer_ItemPadding": {
     "name": "樹狀瀏覽器項目間距"
   },
+  "Comfy_UI_TabBarLayout": {
+    "name": "分頁列佈局",
+    "options": {
+      "Default": "預設",
+      "Integrated": "整合"
+    },
+    "tooltip": "控制分頁列的佈局。「整合」會將說明和使用者控制項移至分頁列區域。"
+  },
   "Comfy_UseNewMenu": {
     "name": "使用新選單",
     "options": {
@@ -434,6 +493,7 @@
     "tooltip": "貝茲控制點相對於重導中心點的偏移量"
   },
   "pysssss_SnapToGrid": {
-    "name": "總是對齊格線"
+    "name": "總是對齊格線",
+    "tooltip": "啟用後，移動或調整節點大小時會自動對齊網格。"
   }
 }
diff --git a/src/locales/zh/commands.json b/src/locales/zh/commands.json
index 144df6c18b..35696befd1 100644
--- a/src/locales/zh/commands.json
+++ b/src/locales/zh/commands.json
@@ -36,7 +36,7 @@
     "label": "重启"
   },
   "Comfy_3DViewer_Open3DViewer": {
-    "label": "为所选节点开启 3D 浏览器（Beta 版）"
+    "label": "为选中节点打开3D查看器（测试版）"
   },
   "Comfy_BrowseModelAssets": {
     "label": "实验性：浏览模型资源"
@@ -44,6 +44,9 @@
   "Comfy_BrowseTemplates": {
     "label": "浏览模板"
   },
+  "Comfy_Canvas_CopySelected": {
+    "label": "复制"
+  },
   "Comfy_Canvas_DeleteSelectedItems": {
     "label": "删除选定的项目"
   },
@@ -65,12 +68,18 @@
   "Comfy_Canvas_MoveSelectedNodes_Up": {
     "label": "上移选中的节点"
   },
+  "Comfy_Canvas_PasteFromClipboard": {
+    "label": "粘贴"
+  },
   "Comfy_Canvas_ResetView": {
     "label": "重置视图"
   },
   "Comfy_Canvas_Resize": {
     "label": "调整选定节点的大小"
   },
+  "Comfy_Canvas_SelectAll": {
+    "label": "全选"
+  },
   "Comfy_Canvas_ToggleLinkVisibility": {
     "label": "切换链接可见性"
   },
@@ -80,9 +89,6 @@
   "Comfy_Canvas_ToggleMinimap": {
     "label": "画布切换小地图"
   },
-  "Comfy_Canvas_ToggleSelected_Pin": {
-    "label": "固定/取消固定选中项"
-  },
   "Comfy_Canvas_ToggleSelectedNodes_Bypass": {
     "label": "忽略/取消忽略选中节点"
   },
@@ -95,6 +101,9 @@
   "Comfy_Canvas_ToggleSelectedNodes_Pin": {
     "label": "固定/取消固定选中节点"
   },
+  "Comfy_Canvas_ToggleSelected_Pin": {
+    "label": "固定/取消固定选中项"
+  },
   "Comfy_Canvas_Unlock": {
     "label": "解锁画布"
   },
@@ -191,18 +200,30 @@
   "Comfy_Manager_ShowUpdateAvailablePacks": {
     "label": "检查更新"
   },
-  "Comfy_Manager_ToggleManagerProgressDialog": {
-    "label": "切换进度对话框"
-  },
   "Comfy_MaskEditor_BrushSize_Decrease": {
     "label": "减小 MaskEditor 中的笔刷大小"
   },
   "Comfy_MaskEditor_BrushSize_Increase": {
     "label": "增加 MaskEditor 画笔大小"
   },
+  "Comfy_MaskEditor_ColorPicker": {
+    "label": "在MaskEditor中打开取色器"
+  },
+  "Comfy_MaskEditor_Mirror_Horizontal": {
+    "label": "在MaskEditor中水平镜像"
+  },
+  "Comfy_MaskEditor_Mirror_Vertical": {
+    "label": "在MaskEditor中垂直镜像"
+  },
   "Comfy_MaskEditor_OpenMaskEditor": {
     "label": "打开选中节点的遮罩编辑器"
   },
+  "Comfy_MaskEditor_Rotate_Left": {
+    "label": "在MaskEditor中向左旋转"
+  },
+  "Comfy_MaskEditor_Rotate_Right": {
+    "label": "在MaskEditor中向右旋转"
+  },
   "Comfy_Memory_UnloadModels": {
     "label": "卸载模型"
   },
@@ -233,12 +254,18 @@
   "Comfy_QueueSelectedOutputNodes": {
     "label": "队列所选输出节点"
   },
+  "Comfy_Queue_ToggleOverlay": {
+    "label": "切换作业历史"
+  },
   "Comfy_Redo": {
     "label": "重做"
   },
   "Comfy_RefreshNodeDefinitions": {
     "label": "刷新节点定义"
   },
+  "Comfy_RenameWorkflow": {
+    "label": "重命名工作流"
+  },
   "Comfy_SaveWorkflow": {
     "label": "保存工作流"
   },
@@ -248,6 +275,12 @@
   "Comfy_ShowSettingsDialog": {
     "label": "显示设置对话框"
   },
+  "Comfy_Subgraph_SetDescription": {
+    "label": "设置子图描述"
+  },
+  "Comfy_Subgraph_SetSearchAliases": {
+    "label": "设置子图搜索别名"
+  },
   "Comfy_ToggleAssetAPI": {
     "label": "实验性：启用 AssetAPI"
   },
@@ -260,6 +293,9 @@
   "Comfy_ToggleLinear": {
     "label": "切换线性模式"
   },
+  "Comfy_ToggleQPOV2": {
+    "label": "切换队列面板V2"
+  },
   "Comfy_ToggleTheme": {
     "label": "切换主题"
   },
@@ -290,9 +326,6 @@
   "Workspace_ToggleBottomPanel": {
     "label": "切换底部面板"
   },
-  "Workspace_ToggleBottomPanel_Shortcuts": {
-    "label": "显示快捷键对话框"
-  },
   "Workspace_ToggleBottomPanelTab_command-terminal": {
     "label": "切换终端底部面板"
   },
@@ -305,9 +338,16 @@
   "Workspace_ToggleBottomPanelTab_shortcuts-view-controls": {
     "label": "切换检视控制底部面板"
   },
+  "Workspace_ToggleBottomPanel_Shortcuts": {
+    "label": "显示快捷键对话框"
+  },
   "Workspace_ToggleFocusMode": {
     "label": "切换焦点模式"
   },
+  "Workspace_ToggleSidebarTab_apps": {
+    "label": "切换应用侧边栏",
+    "tooltip": "应用"
+  },
   "Workspace_ToggleSidebarTab_assets": {
     "label": "切换资产侧边栏",
     "tooltip": "资产"
@@ -324,4 +364,4 @@
     "label": "切换工作流侧边栏",
     "tooltip": "工作流"
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/zh/main.json b/src/locales/zh/main.json
index 7b5decab8d..d62336d7dd 100644
--- a/src/locales/zh/main.json
+++ b/src/locales/zh/main.json
@@ -1,1475 +1,653 @@
 {
-  "g": {
-    "user": "用户",
-    "currentUser": "当前用户",
-    "empty": "空",
-    "noWorkflowsFound": "未找到工作流。",
-    "comingSoon": "即将推出",
-    "download": "下载",
-    "downloadImage": "下载图片",
-    "downloadVideo": "下载视频",
-    "editOrMaskImage": "编辑或遮罩图片",
-    "editImage": "编辑图片",
-    "deleteImage": "删除图片",
-    "deleteAudioFile": "删除音频文件",
-    "removeImage": "移除图片",
-    "removeVideo": "移除视频",
-    "chart": "图表",
-    "chartLowercase": "图表",
-    "file": "文件",
-    "selectedFile": "已选文件",
-    "none": "无",
-    "markdown": "markdown",
-    "content": "内容",
-    "audioProgress": "音频进度",
-    "viewImageOfTotal": "查看第 {index} 张图片，共 {total} 张",
-    "viewVideoOfTotal": "查看第 {index} 个视频，共 {total} 个",
-    "imagePreview": "图片预览 - 使用方向键切换图片",
-    "videoPreview": "视频预览 - 使用方向键切换视频",
-    "galleryImage": "图库图片",
-    "galleryThumbnail": "图库缩略图",
-    "errorLoadingImage": "图片加载出错",
-    "errorLoadingVideo": "视频加载出错",
-    "failedToDownloadImage": "图片下载失败",
-    "failedToDownloadVideo": "视频下载失败",
-    "calculatingDimensions": "正在计算尺寸",
-    "import": "导入",
-    "loadAllFolders": "加载所有文件夹",
-    "logoAlt": "ComfyUI 标志",
-    "comfyOrgLogoAlt": "ComfyOrg 徽标",
-    "comfy": "舒适",
-    "refresh": "刷新",
-    "refreshNode": "刷新节点",
-    "vitePreloadErrorTitle": "新版本可用",
-    "vitePreloadErrorMessage": "应用已发布新版本。是否立即重新加载？\n如果不重新加载，应用的某些功能可能无法正常工作。\n您可以先拒绝，保存进度后再重新加载。",
-    "terminal": "终端",
-    "logs": "日志",
-    "videoFailedToLoad": "视频加载失败",
-    "audioFailedToLoad": "音频加载失败",
-    "liveSamplingPreview": "实时采样预览",
-    "extensionName": "扩展名称",
-    "reloadToApplyChanges": "重新加载以应用更改",
-    "insert": "插入",
-    "systemInfo": "系统信息",
-    "devices": "设备",
-    "about": "关于",
-    "add": "添加",
-    "confirm": "确认",
-    "confirmed": "已确认",
-    "reset": "重置",
-    "resetAll": "重置所有",
-    "clearFilters": "清除筛选",
-    "resetAllKeybindingsTooltip": "将所有键绑定重置为默认",
-    "customizeFolder": "自定义文件夹",
-    "icon": "图标",
-    "color": "颜色",
-    "error": "错误",
-    "resizeFromBottomRight": "从右下角调整大小",
-    "resizeFromTopRight": "从右上角调整大小",
-    "resizeFromBottomLeft": "从左下角调整大小",
-    "resizeFromTopLeft": "从左上角调整大小",
-    "info": "节点信息",
-    "bookmark": "保存到库",
-    "moreOptions": "更多选项",
-    "more": "更多",
-    "loading": "加载中",
-    "loadingPanel": "正在加载{panel}面板...",
-    "preview": "预览",
-    "addNodeFilterCondition": "添加节点筛选条件",
-    "architecture": "架构",
-    "author": "作者",
-    "usageHint": "使用提示",
-    "triggerPhrase": "触发短语",
-    "findIssues": "查找问题",
-    "reportIssue": "发送报告",
-    "reportIssueTooltip": "向 Comfy Org 提交错误报告",
-    "reportSent": "报告已提交",
-    "copyToClipboard": "复制到剪贴板",
-    "openNewIssue": "打开新问题",
-    "showReport": "显示报告",
-    "imageFailedToLoad": "图像加载失败",
-    "reconnecting": "重新连接中",
-    "reconnected": "已重新连接",
-    "delete": "删除",
-    "rename": "重命名",
-    "save": "保存",
-    "saving": "正在保存",
-    "no": "否",
-    "cancel": "取消",
-    "close": "关闭",
-    "or": "或",
-    "pressKeysForNewBinding": "按下按键设置新绑定",
-    "defaultBanner": "默认横幅",
-    "enableOrDisablePack": "启用或禁用包",
-    "openManager": "打开管理器",
-    "graphNavigation": "图形导航",
-    "dropYourFileOr": "拖放您的文件或",
-    "back": "返回",
-    "next": "下一个",
-    "submit": "提交",
-    "install": "安装",
-    "installing": "正在安装",
-    "overwrite": "覆盖",
-    "customize": "自定义",
-    "experimental": "测试版",
-    "deprecated": "已弃用",
-    "loadWorkflow": "加载工作流",
-    "goToNode": "转到节点",
-    "setAsBackground": "设为背景",
-    "customBackground": "自定义背景",
-    "settings": "设置",
-    "searchWorkflows": "搜索工作流",
-    "searchSettings": "搜索设置",
-    "searchNodes": "搜索节点",
-    "searchModels": "搜索模型",
-    "searchKeybindings": "搜索快捷键",
-    "searchExtensions": "搜索扩展",
-    "search": "搜索",
-    "searchPlaceholder": "搜索占位符",
-    "noResultsFound": "未找到结果",
-    "noResults": "无结果",
-    "searchFailedMessage": "我们找不到任何与您的搜索匹配的设置。请尝试调整您的搜索词。",
-    "noTasksFound": "未找到任务",
-    "noTasksFoundMessage": "队列中没有任务。",
-    "newFolder": "新文件夹",
-    "enableAll": "启用全部",
-    "disableAll": "禁用全部",
-    "enableSelected": "启用选中项",
-    "disableSelected": "禁用选中项",
-    "disableThirdParty": "禁用第三方",
-    "core": "核心",
-    "custom": "自定义",
-    "command": "指令",
-    "keybinding": "按键绑定",
-    "upload": "上传",
-    "export": "导出",
-    "workflow": "工作流",
-    "success": "成功",
-    "ok": "确定",
+  "actionbar": {
+    "dockToTop": "停靠到顶部",
     "feedback": "反馈",
-    "continue": "继续",
-    "control_after_generate": "生成后控制",
-    "control_before_generate": "生成前控制",
-    "choose_file_to_upload": "选择要上传的文件",
-    "capture": "捕获",
-    "nodes": "节点",
-    "community": "社区",
-    "all": "全部",
-    "versionMismatchWarning": "版本兼容性警告",
-    "versionMismatchWarningMessage": "{warning}：{detail} 请参阅 https://docs.comfy.org/installation/update_comfyui#common-update-issues 以取得更新说明。",
-    "frontendOutdated": "前端版本 {frontendVersion} 已过时。后端需要 {requiredVersion} 或更高版本。",
-    "frontendNewer": "前端版本 {frontendVersion} 可能与后端版本 {backendVersion} 不相容。",
-    "updateFrontend": "更新前端",
-    "dismiss": "关闭",
-    "update": "更新",
-    "updated": "已更新",
-    "resultsCount": "找到 {count} 个结果",
-    "status": "状态",
-    "description": "描述",
-    "warning": "警告",
-    "name": "名称",
-    "category": "类别",
-    "sort": "排序",
-    "source": "来源",
-    "filter": "过滤",
-    "apply": "应用",
-    "enabled": "已启用",
-    "installed": "已安装",
-    "restart": "重新启动",
-    "missing": "缺失",
-    "inProgress": "进行中",
-    "completed": "已完成",
-    "interrupted": "已中断",
-    "queued": "已执行",
-    "running": "正在运行",
-    "failed": "失败",
-    "cancelled": "已取消",
-    "job": "任务",
-    "untitled": "无标题",
-    "emDash": "-",
-    "enabling": "启用中",
-    "disabling": "禁用中",
-    "updating": "更新中",
-    "migrate": "迁移",
-    "updateAvailable": "有更新可用",
-    "login": "登录",
-    "learnMore": "了解更多",
-    "amount": "数量",
-    "unknownError": "未知错误",
-    "title": "标题",
-    "edit": "编辑",
-    "copy": "复制",
-    "copyJobId": "复制队列 ID",
-    "copied": "已复制",
-    "relativeTime": {
-      "now": "刚才",
-      "yearsAgo": "{count}年 前",
-      "monthsAgo": "{count}月 前",
-      "weeksAgo": "{count}周 前",
-      "daysAgo": "{count}天 前",
-      "hoursAgo": "{count}时 前",
-      "minutesAgo": "{count}分 前"
+    "feedbackTooltip": "反馈"
+  },
+  "apiNodesCostBreakdown": {
+    "costPerRun": "每次运行的成本",
+    "title": "API节点",
+    "totalCost": "总成本"
+  },
+  "apiNodesSignInDialog": {
+    "message": "此工作流包含API节点，需要您登录账户才能运行。",
+    "title": "使用API节点需要登录"
+  },
+  "assetBrowser": {
+    "allCategory": "全部{category}",
+    "allModels": "全部模型",
+    "apiKeyHint": "导入私有或受限模型？{link}。",
+    "apiKeyHintLink": "在设置中添加您的 API 密钥",
+    "ariaLabel": {
+      "assetCard": "{name} - {type}资产",
+      "loadingAsset": "正在加载资产"
     },
-    "jobIdCopied": "队列 ID 已复制到剪贴板",
-    "failedToCopyJobId": "未能复制队列 ID",
-    "imageUrl": "图片网址",
-    "clear": "清除",
-    "clearAll": "全部清除",
-    "copyURL": "复制链接",
-    "releaseTitle": "{package} {version} 发布",
-    "itemSelected": "已选择 {selectedCount} 项",
-    "itemsSelected": "已选择 {selectedCount} 项",
-    "multiSelectDropdown": "多选下拉框",
-    "singleSelectDropdown": "单选下拉框",
-    "progressCountOf": "共",
-    "keybindingAlreadyExists": "快捷键已存在",
-    "commandProhibited": "命令 {command} 被禁止。请联系管理员了解更多信息。",
-    "startRecording": "开始录音",
-    "stopRecording": "停止录音",
-    "micPermissionDenied": "麦克风权限被拒绝",
-    "noAudioRecorded": "未录制音频",
-    "nodesRunning": "节点正在运行",
-    "duplicate": "复制",
-    "itemsCopiedToClipboard": "已复制到剪贴板",
-    "selectItemsToCopy": "选择复制",
-    "nothingToCopy": "没有可以复制的内容",
-    "selectItemsToDuplicate": "选择复制",
-    "nothingToDuplicate": "Nothing to duplicate",
-    "selectItemsToDelete": "选择删除",
-    "nothingToDelete": "没有可以删除的内容",
-    "batchRename": "批量重命名",
-    "enterBaseName": "输入基础名称",
-    "enterNewName": "输入新名称",
-    "selectItemsToRename": "选择重命名",
-    "nothingToRename": "没有可以重命名的内容",
-    "moreWorkflows": "更多工作流",
-    "seeTutorial": "查看教程",
-    "nodeRenderError": "节点渲染错误",
-    "nodeContentError": "节点内容错误",
-    "nodeHeaderError": "节点标题错误",
-    "nodeSlotsError": "节点插槽错误",
-    "nodeWidgetsError": "节点控件错误",
-    "frameNodes": "框选节点",
-    "listening": "正在监听...",
-    "ready": "就绪",
-    "playPause": "开启/暂停",
-    "playRecording": "播放录音",
-    "playing": "播放中",
-    "stopPlayback": "停止播放",
-    "playbackSpeed": "播放速度",
-    "volume": "音量",
-    "halfSpeed": "0.5倍",
-    "1x": "1倍",
-    "2x": "2倍",
-    "beta": "测试版",
-    "profile": "档案",
-    "noItems": "无项目"
-  },
-  "manager": {
-    "title": "自定义节点管理器",
-    "legacyMenuNotAvailable": "传统管理器菜单不可用，已切换为新管理器菜单。",
-    "legacyManagerUI": "使用传统界面",
-    "legacyManagerUIDescription": "如需使用传统管理器界面，请以 --enable-manager-legacy-ui 参数启动 ComfyUI",
-    "failed": "失败 ({count})",
-    "failedToInstall": "安装失败",
-    "installError": "安装错误",
-    "importFailedGenericError": "软件包导入失败。请查看控制台获取更多信息。",
-    "noNodesFound": "未找到节点",
-    "noNodesFoundDescription": "无法解析包的节点，或者该包仅为前端扩展，没有任何节点。",
-    "installationQueue": "安装队列",
-    "changingVersion": "将版本从 {from} 更改为 {to}",
-    "dependencies": "依赖关系",
-    "inWorkflow": "在工作流中",
-    "infoPanelEmpty": "点击一个项目查看信息",
-    "applyChanges": "应用更改",
-    "restartToApplyChanges": "要应用更改，请重新启动ComfyUI",
-    "clickToFinishSetup": "点击",
-    "toFinishSetup": "以完成设置",
-    "restartingBackend": "正在重启后端以应用更改...",
-    "extensionsSuccessfullyInstalled": "扩展已成功安装并可使用！",
-    "installingDependencies": "正在安装依赖项...",
-    "loadingVersions": "正在加载版本...",
-    "selectVersion": "选择版本",
-    "downloads": "下载",
-    "repository": "仓库",
-    "uninstall": "卸载",
-    "uninstalling": "正在卸载",
-    "update": "更新",
-    "tryUpdate": "尝试更新",
-    "tryUpdateTooltip": "从库中拉取更新。测试版本可能有无法自动检测到更新。",
-    "uninstallSelected": "卸载所选",
-    "updateSelected": "更新所选",
-    "updateAll": "全部更新",
-    "updatingAllPacks": "更新所有包",
-    "disabledNodesWontUpdate": "已禁用的节点不会被更新",
-    "enablePackToChangeVersion": "启用此包以更改版本",
-    "license": "许可证",
-    "nightlyVersion": "每夜",
-    "latestVersion": "最新",
-    "createdBy": "创建者",
-    "totalNodes": "节点总数",
-    "discoverCommunityContent": "发现社区制作的节点包，扩展等等...",
-    "errorConnecting": "连接到Comfy节点注册表时出错。",
-    "noResultsFound": "未找到符合您搜索的结果。",
-    "tryDifferentSearch": "请尝试不同的搜索查询。",
-    "tryAgainLater": "请稍后再试。",
-    "gettingInfo": "正在获取信息...",
-    "nodePack": "节点包",
-    "searchPlaceholder": "搜索",
-    "version": "版本",
-    "lastUpdated": "最后更新",
-    "noDescription": "无可用描述",
-    "installSelected": "安装选定",
-    "installAllMissingNodes": "安装所有缺失节点",
-    "allMissingNodesInstalled": "所有缺失节点已成功安装",
-    "packsSelected": "选定的包",
-    "mixedSelectionMessage": "无法对混合选择执行批量操作",
-    "notAvailable": "不可用",
-    "status": {
-      "active": "活跃",
-      "pending": "待定",
-      "flagged": "已标记",
-      "deleted": "已删除",
-      "banned": "已禁止",
-      "unknown": "未知",
-      "conflicting": "冲突",
-      "importFailed": "安装错误"
-    },
-    "sort": {
-      "downloads": "最受欢迎",
-      "publisher": "出版商",
-      "created": "最新",
-      "updated": "最近更新"
-    },
-    "filter": {
-      "nodePack": "节点包",
-      "enabled": "已启用",
-      "disabled": "已禁用"
-    },
-    "conflicts": {
-      "title": "检测到节点包问题！",
-      "description": "我们检测到您的部分扩展与新版 ComfyUI 存在冲突。更新后，依赖这些扩展的工作流可能会被破坏。",
-      "info": "如果继续更新，冲突的扩展将被自动禁用。您可以随时在 ComfyUI 管理器中查看和管理它们。",
-      "extensionAtRisk": "有风险的扩展",
-      "conflicts": "冲突",
-      "importFailedExtensions": "导入失败的扩展",
-      "conflictInfoTitle": "为什么会发生这种情况？",
-      "installAnyway": "仍然安装",
-      "enableAnyway": "仍然启用",
-      "understood": "我已了解",
-      "warningBanner": {
-        "title": "部分扩展因与当前环境不兼容而被禁用",
-        "message": "这些扩展需要与您当前环境不同版本的系统包。安装它们可能会覆盖核心依赖，并影响其他扩展或工作流。",
-        "button": "了解更多..."
-      },
-      "conflictMessages": {
-        "comfyui_version": "ComfyUI 版本不匹配（当前：{current}，要求：{required}）",
-        "frontend_version": "前端版本不匹配（当前：{current}，要求：{required}）",
-        "os": "操作系统不受支持（当前：{current}，要求：{required}）",
-        "accelerator": "GPU/加速器不受支持（可用：{current}，要求：{required}）",
-        "generic": "兼容性问题（当前：{current}，要求：{required}）",
-        "banned": "该软件包因安全原因被禁用",
-        "pending": "安全验证待定 - 无法验证兼容性",
-        "import_failed": "导入失败"
-      },
-      "warningTooltip": "该软件包可能与您当前的环境存在兼容性问题"
-    }
-  },
-  "issueReport": {
-    "helpFix": "帮助修复这个"
-  },
-  "color": {
-    "noColor": "无色",
-    "default": "默认",
-    "blue": "蓝色",
-    "green": "绿色",
-    "red": "红色",
-    "pink": "粉色",
-    "yellow": "黄色",
-    "brown": "棕色",
-    "pale_blue": "淡蓝色",
-    "cyan": "青色",
-    "purple": "紫色",
-    "black": "黑色",
-    "custom": "自定义"
-  },
-  "contextMenu": {
-    "Inputs": "输入",
-    "Outputs": "输出",
-    "Properties": "属性",
-    "Properties Panel": "属性面板",
-    "Title": "标题",
-    "Mode": "模式",
-    "Resize": "调整大小",
-    "Collapse": "折叠",
-    "Expand": "展开",
-    "Pin": "固定",
-    "Unpin": "取消固定",
-    "Clone": "克隆",
-    "Remove": "删除",
-    "Colors": "颜色",
-    "Shapes": "形状",
-    "Bypass": "绕过",
-    "Copy (Clipspace)": "复制 (Clipspace)",
-    "Add Node": "添加节点",
-    "Add Group": "添加组",
-    "Convert to Group Node": "转换为组节点",
-    "Convert to Group Node (Deprecated)": "转换为组节点（已弃用）",
-    "Manage Group Nodes": "管理组节点",
-    "Add Group For Selected Nodes": "为选定节点添加组",
-    "Save Selected as Template": "将选定节点另存为模板",
-    "Node Templates": "节点模板",
-    "Manage": "管理",
-    "Search": "搜索",
-    "Open in Mask Editor": "用遮罩编辑器打开",
-    "Open Image": "打开图像",
-    "Copy Image": "复制图像",
-    "Save Image": "保存图像",
-    "Rename": "重命名",
-    "RenameWidget": "重命名组件",
-    "Copy": "复制",
-    "Duplicate": "复制",
-    "Paste": "站贴",
-    "Node Info": "节点信息",
-    "Adjust Size": "调整尺寸",
-    "Minimize Node": "最小化节点",
-    "Expand Node": "展开节点",
-    "Shape": "形状",
-    "Color": "颜色",
-    "Add Subgraph to Library": "添加子工作流到节点库",
-    "Unpack Subgraph": "解包子工作流",
-    "Edit Subgraph Widgets": "编辑子工作流组件",
-    "Convert to Subgraph": "转换为子工作流",
-    "Align Selected To": "对齐选中项到",
-    "Distribute Nodes": "分布节点",
-    "Remove Bypass": "删除所有忽略节点",
-    "Run Branch": "运行支流节点",
-    "Delete": "删除",
-    "Top": "顶部",
-    "Bottom": "底部",
-    "Left": "左侧",
-    "Right": "右侧",
-    "Horizontal": "水平",
-    "Vertical": "竖直",
-    "new": "新",
-    "deprecated": "弃用",
-    "Extensions": "扩展"
-  },
-  "icon": {
-    "bookmark": "书签",
-    "folder": "文件夹",
-    "star": "星星",
-    "heart": "心",
-    "file": "文件",
-    "inbox": "收件箱",
-    "box": "盒子",
-    "briefcase": "公文包",
-    "exclamation-triangle": "警告"
-  },
-  "welcome": {
-    "title": "欢迎使用 ComfyUI",
-    "getStarted": "开始使用"
-  },
-  "userSelect": {
-    "newUser": "新用户",
-    "enterUsername": "输入用户名",
-    "existingUser": "用户已存在",
-    "selectUser": "选择用户",
-    "next": "下一步"
-  },
-  "notSupported": {
-    "title": "您的设备不受支持",
-    "message": "仅支持以下设备：",
-    "illustrationAlt": "Sad girl illustration",
-    "learnMore": "了解更多",
-    "reportIssue": "报告问题",
-    "supportedDevices": {
-      "macos": "MacOS (M1 或更高版本)",
-      "windows": "Windows (支持 CUDA 的 Nvidia GPU)"
-    },
-    "continue": "继续",
-    "continueTooltip": "我确定我的设备是受支持的"
-  },
-  "downloadGit": {
-    "title": "下载 git",
-    "message": "无法找到 git。正常操作需要一个可用的 git 副本。",
-    "instructions": "请下载并安装适合您操作系统的最新版本。下面的下载 git 按钮将打开 git-scm.com 下载页面。",
-    "warning": "如果您确定不需要安装 git，或者已经安装了 git，您可以点击跳过以绕过此检查。当前不支持在没有可用 git 副本的情况下运行 ComfyUI。",
-    "gitWebsite": "下载 git",
-    "skip": "跳过"
-  },
-  "install": {
-    "installLocation": "安装位置",
-    "migration": "迁移",
-    "desktopSettings": "桌面设置",
-    "chooseInstallationLocation": "选择安装位置",
-    "gpuPicker": {
-      "title": "选择您的硬件配置",
-      "recommended": "推荐",
-      "nvidiaSubtitle": "NVIDIA CUDA",
-      "cpuSubtitle": "CPU模式",
-      "manualSubtitle": "手动设置",
-      "appleMetalDescription": "利用您的Mac GPU以获得更快速度和更佳体验",
-      "nvidiaDescription": "使用NVIDIA GPU和CUDA加速以获得最佳性能。",
-      "cpuDescription": "当GPU加速不可用时，使用CPU模式以获得兼容性",
-      "manualDescription": "为高级配置或不受支持的硬件手动配置ComfyUI"
-    },
-    "locationPicker": {
-      "title": "选择ComfyUI的安装位置",
-      "subtitle": "选择一个文件夹用于存放ComfyUI文件。我们也会自动在此处设置Python。",
-      "pathPlaceholder": "/Users/username/Documents/ComfyUI",
-      "migrationPathPlaceholder": "选择已有的ComfyUI安装（可选）",
-      "migrateFromExisting": "从现有安装迁移",
-      "migrateDescription": "从之前的ComfyUI安装复制或链接您的模型、自定义节点和配置。",
-      "chooseDownloadServers": "手动选择下载服务器",
-      "downloadServersDescription": "根据您的位置选择用于下载Python、PyPI包和PyTorch的特定镜像服务器。"
-    },
-    "systemLocations": "系统位置",
-    "failedToSelectDirectory": "选择目录失败",
-    "pathValidationFailed": "路径验证失败",
-    "pathExists": "目录已存在 - 请确保您已备份全部数据",
-    "cannotWrite": "无法写入所选路径。",
-    "insufficientFreeSpace": "空间不足 - 最小可用空间",
-    "isOneDrive": "在OneDrive中安装可能会导致问题。强烈建议在非OneDrive位置安装。",
-    "insideAppInstallDir": "该文件夹位于 ComfyUI Desktop 应用程序包中，程序更新时会删除该文件夹。选择安装文件夹之外的目录，例如 Documents/ComfyUI。",
-    "insideUpdaterCache": "该文件夹位于 ComfyUI 更新缓存中，程序更新时会清除该缓存。为您的数据选择一个不同的位置。",
-    "nonDefaultDrive": "请在您的系统驱动器上安装ComfyUI（例如C:\\）。具有不同文件系统的驱动器可能会导致不可预测的问题。安装后，模型和其他文件可以存储在其他驱动器上。",
-    "parentMissing": "路径不存在 - 请先创建包含该路径的目录",
-    "unhandledError": "未知错误",
-    "installLocationDescription": "选择 ComfyUI 用户数据的存放目录。将安装一个 Python 环境到所选位置。请确保所选磁盘有足够的空间（约 15GB）。",
-    "installLocationTooltip": "ComfyUI 的用户数据目录。存储：\n- Python 环境\n- 模型\n- 自定义节点\n",
-    "appDataLocationTooltip": "ComfyUI 的应用数据目录。存储：\n- 日志\n- 服务器配置",
-    "appPathLocationTooltip": "ComfyUI 的应用资产目录。存储 ComfyUI 代码和资产",
-    "migrateFromExistingInstallation": "从现有安装迁移",
-    "migrationSourcePathDescription": "如果您已有现有的ComfyUI安装，我们可以复制/链接您现有的用户文件和模型到新的安装。您现有的ComfyUI安装将不会受到影响。",
-    "selectItemsToMigrate": "选择要迁移的项目",
-    "migrationOptional": "迁移是可选的。如果您之前没有安装过 ComfyUI，可以跳过此步骤。",
-    "desktopAppSettings": "桌面应用设置",
-    "desktopAppSettingsDescription": "配置 ComfyUI 在桌面上的行为。您可以稍后更改这些设置。",
-    "gpu": "GPU",
-    "gpuSelection": {
-      "selectGpu": "选择 GPU",
-      "selectGpuDescription": "选择你拥有的 GPU 类型",
-      "cpuMode": "CPU 模式",
-      "cpuModeDescription": "CPU 模式仅适用于开发者和极少数特殊情况。",
-      "cpuModeDescription2": "如果你不完全确定你需要这个，忽略该选项并在上面选择你的 GPU。",
-      "enableCpuMode": "启用 CPU 模式",
-      "nvidiaDescription": "NVIDIA 设备直接支持使用 pytorch CUDA 构建。",
-      "mpsDescription": "Apple Metal Performance Shaders 使用 pytorch nightly 支持。",
-      "customSkipsPython": "此选项跳过正常的 python 设置。",
-      "customComfyNeedsPython": "在 python 完成设置前，ComfyUI 将无法工作",
-      "customManualVenv": "手动配置 python 虚拟环境",
-      "customInstallRequirements": "安装所有需求和依赖项（例如：自定义 torch）",
-      "customMayNotWork": "完全不支持，可能无法工作"
-    },
-    "manualConfiguration": {
-      "title": "手动配置",
-      "requirements": "依赖项",
-      "createVenv": "您需要在以下目录中创建虚拟环境",
-      "virtualEnvironmentPath": "虚拟环境路径",
-      "restartWhenFinished": "配置虚拟环境完成后，请重新启动ComfyUI。"
-    },
-    "settings": {
-      "autoUpdate": "自动更新",
-      "allowMetrics": "使用情况指标",
-      "errorUpdatingConsent": "更新同意错误",
-      "errorUpdatingConsentDetail": "无法更新度量同意设置",
-      "autoUpdateDescription": "更新可用时自动更新。您将在安装更新之前收到通知。",
-      "allowMetricsDescription": "通过发送匿名使用情况指标来帮助改进ComfyUI。不会收集任何个人信息或工作流内容。",
-      "learnMoreAboutData": "了解更多关于数据收集的信息",
-      "dataCollectionDialog": {
-        "title": "关于数据收集",
-        "whatWeCollect": "我们收集的内容：",
-        "whatWeDoNotCollect": "我们不收集的内容：",
-        "collect": {
-          "errorReports": "错误报告和堆栈跟踪",
-          "systemInfo": "硬件，操作系统类型和应用版本",
-          "userJourneyEvents": "用户旅程事件"
-        },
-        "doNotCollect": {
-          "personalInformation": "个人信息",
-          "fileSystemInformation": "文件系统信息",
-          "workflowContents": "工作流内容",
-          "customNodeConfigurations": "自定义节点配置"
-        },
-        "viewFullPolicy": "查看完整政策"
-      },
-      "pythonMirrorPlaceholder": "输入Python镜像URL",
-      "pypiMirrorPlaceholder": "输入PyPI镜像URL",
-      "checkingMirrors": "正在检查到Python镜像的网络访问...",
-      "mirrorsReachable": "到Python镜像的网络访问良好",
-      "mirrorsUnreachable": "对某些python镜像的网络访问不佳",
-      "mirrorSettings": "镜像设置"
-    },
-    "customNodes": "自定义节点",
-    "customNodesDescription": "引用现有 ComfyUI 安装的自定义节点文件并安装其依赖项。",
-    "helpImprove": "请帮助我们改进ComfyUI",
-    "moreInfo": "有关更多信息，请阅读我们的",
-    "privacyPolicy": "隐私政策",
-    "metricsEnabled": "启用度量",
-    "metricsDisabled": "禁用度量",
-    "updateConsent": "您之前选择了报告崩溃。我们现在正在跟踪基于事件的度量，以帮助识别错误并改进应用程序。我们不收集任何个人可识别信息。"
-  },
-  "desktopStart": {
-    "initialising": "正在初始化..."
-  },
-  "serverStart": {
-    "title": "启动 ComfyUI",
-    "troubleshoot": "故障排除",
-    "reportIssue": "报告问题",
-    "openLogs": "打开日志",
-    "showTerminal": "显示终端",
-    "copySelectionTooltip": "复制所选内容",
-    "copyAllTooltip": "全部复制",
-    "errorMessage": "无法启动 ComfyUI 桌面版",
-    "installation": {
-      "title": "正在安装 ComfyUI"
-    },
-    "process": {
-      "initial-state": "加载中...",
-      "python-setup": "正在设置 Python 环境...",
-      "starting-server": "正在启动 ComfyUI 服务器...",
-      "ready": "完成中...",
-      "error": "无法启动 ComfyUI 桌面版"
-    }
-  },
-  "serverConfig": {
-    "modifiedConfigs": "您已修改以下服务器配置。重启以应用更改。",
-    "revertChanges": "撤销更改",
-    "restart": "重启",
-    "restartRequiredToastSummary": "需要重启",
-    "restartRequiredToastDetail": "重启软件应用设置。"
-  },
-  "shape": {
-    "default": "默认",
-    "round": "圆角",
-    "CARD": "卡片",
-    "circle": "圆形",
-    "arrow": "箭头",
-    "box": "方框"
-  },
-  "sideToolbar": {
-    "themeToggle": "切换主题",
-    "helpCenter": "帮助中心",
-    "logout": "登出",
-    "queue": "队列",
-    "nodeLibrary": "节点库",
-    "workflows": "工作流",
-    "templates": "模板",
+    "assetCollection": "资产合集",
     "assets": "资产",
-    "mediaAssets": {
-      "title": "媒体资产",
-      "sortNewestFirst": "最新",
-      "sortOldestFirst": "最旧",
-      "sortLongestFirst": "生成时间（最慢）",
-      "sortFastestFirst": "生成时间（最快）",
-      "filterImage": "图像",
-      "filterVideo": "视频",
-      "filterAudio": "音频",
-      "filter3D": "3D"
+    "baseModel": "基础模型",
+    "baseModels": "基础模型",
+    "browseAssets": "浏览资产",
+    "byType": "按类型",
+    "checkpoints": "模型",
+    "civitaiLinkExample": "<strong>案例：</strong> <a href=\"https://civitai.com/api/download/models/833921?type=Model&format=SafeTensor\" target=\"_blank\" class=\"text-muted-foreground\">https://civitai.com/api/download/models/833921?type=Model&format=SafeTensor</a>",
+    "civitaiLinkExampleStrong": "案例:",
+    "civitaiLinkExampleUrl": "https://civitai.com/models/10706/luisap-z-image-and-qwen-pixel-art-refiner?modelVersionId=2225295",
+    "civitaiLinkLabel": "Civitai 模型 <span class=\"font-bold italic\">download</span> link",
+    "civitaiLinkLabelDownload": "下载",
+    "civitaiLinkPlaceholder": "粘贴链接到此",
+    "confirmModelDetails": "确认模型信息",
+    "connectionError": "请检查您的网络连接后重试",
+    "deletion": {
+      "body": "从资产库永久移除这个模型。",
+      "complete": "{assetName} 已经删除。",
+      "failed": "{assetName} 无法删除。",
+      "header": "删除该模型？",
+      "inProgress": "正在删除 {assetName}..."
     },
-    "backToAssets": "返回所有资产",
-    "searchAssets": "搜索资产",
-    "labels": {
-      "queue": "队列",
-      "nodes": "节点",
-      "models": "模型",
-      "assets": "资产",
-      "workflows": "工作流",
-      "templates": "模板",
-      "console": "控制台",
-      "menu": "菜单",
-      "imported": "已导入",
-      "generated": "已生成"
+    "download": {
+      "complete": "下载完成",
+      "failed": "下载失败",
+      "inProgress": "正在下载 {assetName}..."
     },
-    "noFilesFound": "未找到文件",
-    "noImportedFiles": "未找到导入的文件",
-    "noGeneratedFiles": "未找到生成的文件",
-    "noFilesFoundMessage": "上传文件或生成内容以在此处查看",
-    "browseTemplates": "浏览示例模板",
-    "openWorkflow": "在本地文件系统中打开工作流",
-    "newBlankWorkflow": "创建空白工作流",
-    "nodeLibraryTab": {
-      "groupBy": "分组方式",
-      "sortMode": "排序模式",
-      "resetView": "重置视图为默认",
-      "groupStrategies": {
-        "category": "类别",
-        "categoryDesc": "按节点类别分组",
-        "module": "模块",
-        "moduleDesc": "按模块来源分组",
-        "source": "来源",
-        "sourceDesc": "按来源类型分组（核心，自定义，API）"
+    "emptyImported": {
+      "canImport": "尚未导入模型。点击“导入模型”添加您的模型。",
+      "restricted": "个人模型仅限创作者及以上等级使用。"
+    },
+    "errorAccessForbidden": "无法访问此资源。",
+    "errorConnectionRefused": "无法连接到来源。请稍后再试。",
+    "errorDownloadCancelled": "下载已取消。",
+    "errorFileTooLarge": "允许执行文件的文件大小限制",
+    "errorFormatNotAllowed": "仅允许 SafeTensor 格式",
+    "errorHttpError": "获取元数据时发生错误。",
+    "errorInternalError": "发生意外错误。请重试。",
+    "errorInvalidHost": "无法解析来源 URL 的主机名。",
+    "errorInvalidUrl": "请输入一个 URL。",
+    "errorInvalidUrlFormat": "URL 格式无效。请检查后重试。",
+    "errorMetadataFetchFailed": "从来源获取文件信息失败。",
+    "errorModelTypeNotSupported": "不支持该类型的模型",
+    "errorNetworkError": "发生网络错误。请检查您的连接并重试。",
+    "errorNetworkTimeout": "请求超时。请重试。",
+    "errorRateLimited": "请求过多。请几分钟后再试。",
+    "errorRequestCancelled": "请求已取消。",
+    "errorResourceNotFound": "未找到文件。请检查 URL 并重试。",
+    "errorServiceUnavailable": "服务暂时不可用。请稍后再试。",
+    "errorSourceServerError": "来源服务器出现问题。请稍后再试。",
+    "errorUnauthorized": "请登录以继续。",
+    "errorUnauthorizedSource": "此资源需要身份验证。请在设置中添加您的 API 密钥。",
+    "errorUnknown": "发生了意外错误",
+    "errorUnsafePickleScan": "CivitAI 在该文件中检测到不安全代码",
+    "errorUnsafeVirusScan": "CivitAI 在该文件中检测到木马或可疑文件",
+    "errorUnsupportedSource": "此 URL 不受支持。仅允许 Hugging Face 和 Civitai 的链接。",
+    "errorUploadFailed": "导入资产失败，请重试。",
+    "errorUserTokenAccessDenied": "您的 API 密钥无权访问此资源。请检查密钥权限。",
+    "errorUserTokenInvalid": "您保存的 API 密钥无效或已过期。请在设置中更新密钥。",
+    "failedToCreateNode": "创建节点失败。请重试或查看控制台获取详细信息。",
+    "fileFormats": "文件格式",
+    "fileName": "文件名",
+    "fileSize": "文件大小",
+    "filterBy": "筛选方式",
+    "findInLibrary": "模型在模型库的{type}区里",
+    "finish": "完成",
+    "genericLinkPlaceholder": "粘贴链接到这",
+    "importAnother": "导入其他",
+    "imported": "已导入",
+    "invalidAsset": "无效资源",
+    "invalidAssetDetail": "所选资源无法验证。请重试。",
+    "invalidFilename": "无效文件名",
+    "invalidFilenameDetail": "无法确定资源文件名。请重试。",
+    "jobId": "任务ID",
+    "loadingModels": "正在加载{type}...",
+    "maxFileSize": "最大文件大小：{size}",
+    "maxFileSizeValue": "1 GB",
+    "media": {
+      "audioPlaceholder": "音频",
+      "threeDModelPlaceholder": "3D 模型"
+    },
+    "modelAssociatedWithLink": "您提供的链接的模型：",
+    "modelInfo": {
+      "addBaseModel": "添加基础模型...",
+      "addTag": "添加标签...",
+      "additionalTags": "附加标签",
+      "baseModelUnknown": "基础模型未知",
+      "basicInfo": "基本信息",
+      "compatibleBaseModels": "兼容基础模型",
+      "description": "描述",
+      "descriptionNotSet": "未设置描述",
+      "descriptionPlaceholder": "为此模型添加描述...",
+      "displayName": "显示名称",
+      "editDisplayName": "编辑显示名称",
+      "fileName": "文件名",
+      "modelDescription": "模型描述",
+      "modelTagging": "模型标签",
+      "modelType": "模型类型",
+      "noAdditionalTags": "无附加标签",
+      "selectModelPrompt": "选择一个模型以查看其信息",
+      "selectModelType": "选择模型类型...",
+      "source": "来源",
+      "title": "模型信息",
+      "triggerPhrases": "触发短语",
+      "viewOnSource": "在 {source} 上查看"
+    },
+    "modelName": "模型名",
+    "modelNamePlaceholder": "输入该模型的名称",
+    "modelTypeSelectorLabel": "这是什么类型的模型？",
+    "modelTypeSelectorPlaceholder": "选择模型类型",
+    "modelUploaded": "模型导入成功！🎉",
+    "noAssetsFound": "未找到资产",
+    "noModelsInFolder": "此文件夹中没有可用的{type}",
+    "noResultsCanImport": "尝试调整您的搜索或筛选条件。\n您也可以使用上方的“导入”按钮添加模型。",
+    "noValidSourceDetected": "检测不到有效的导入源",
+    "notSureLeaveAsIs": "不确定？那就放着不管吧",
+    "onlyCivitaiUrlsSupported": "仅支持 Civitai 链接",
+    "ownership": "所属",
+    "ownershipAll": "全部",
+    "ownershipMyModels": "我的模型",
+    "ownershipPublicModels": "公共模型",
+    "processingModel": "已开始下载",
+    "processingModelDescription": "您可以关闭此对话框。下载将在后台继续。",
+    "providerCivitai": "Civitai",
+    "providerHuggingFace": "Hugging Face",
+    "rename": {
+      "failed": "无法重命名资产。"
+    },
+    "selectFrameworks": "选择框架",
+    "selectModelType": "选择模型类型",
+    "selectProjects": "选择项目",
+    "sortAZ": "A-Z",
+    "sortBy": "排序方式",
+    "sortDefault": "默认",
+    "sortPopular": "最受欢迎",
+    "sortRecent": "最近",
+    "sortZA": "Z-A",
+    "sortingType": "排序类型",
+    "tags": "标签",
+    "tagsHelp": "按逗号区分标签",
+    "tagsPlaceholder": "例如：模型, checkpoint",
+    "tryAdjustingFilters": "请尝试调整搜索或筛选条件",
+    "unknown": "未知",
+    "unsupportedUrlSource": "仅支持来自 {sources} URL 的模型",
+    "upgradeFeatureDescription": "该功能仅 Creator 和 Pro 订阅计划可用",
+    "upgradeToUnlockFeature": "升级订阅解锁该功能",
+    "upload": "导入",
+    "uploadFailed": "导入失败",
+    "uploadModel": "导入模型",
+    "uploadModelDescription1": "粘贴 Civitai 模型下载链接，将其添加到库中。",
+    "uploadModelDescription1Generic": "粘贴模型下载链接，将其添加到模型库中。",
+    "uploadModelDescription2": "目前仅支持 <a href=\"https://civitai.com\" target=\"_blank\" class=\"text-muted-foreground\">https://civitai.com</a> 链接。",
+    "uploadModelDescription2Generic": "仅支持来自以下提供服务的 URL ：",
+    "uploadModelDescription2Link": "https://civitai.com/models",
+    "uploadModelDescription3": "最大文件大小：<strong>1 GB</strong>",
+    "uploadModelFailedToRetrieveMetadata": "检索元数据失败。请检查连接并重试。",
+    "uploadModelFromCivitai": "从 Civitai 导入模型",
+    "uploadModelGeneric": "导入模型",
+    "uploadModelHelpFooterText": "需要查找 URL 的帮助吗？点击下面的教程视频。",
+    "uploadModelHelpVideo": "上传模型视频",
+    "uploadModelHowDoIFindThis": "如何找到这个？",
+    "uploadSuccess": "模型导入成功！",
+    "uploadingModel": "正在导入模型..."
+  },
+  "auth": {
+    "apiKey": {
+      "cleared": "API 密钥已清除",
+      "clearedDetail": "您的 API 密钥已成功清除",
+      "description": "使用您的 Comfy API 密钥以启用 API 节点",
+      "error": "无效的 API 密钥",
+      "generateKey": "在这里获取",
+      "helpText": "需要 API 密钥？",
+      "invalid": "无效的 API 密钥",
+      "invalidDetail": "请输入有效的 API 密钥",
+      "label": "API 密钥",
+      "placeholder": "请输入您的 API 密钥",
+      "storageFailed": "API 密钥存储失败",
+      "storageFailedDetail": "请重试。",
+      "stored": "API 密钥已存储",
+      "storedDetail": "您的 API 密钥已成功存储",
+      "title": "API 密钥",
+      "whitelistInfo": "关于非白名单网站"
+    },
+    "deleteAccount": {
+      "contactSupport": "如需删除您的账户，请联系 {email}"
+    },
+    "errors": {
+      "auth/cancelled-popup-request": "登录已取消。请重试。",
+      "auth/email-already-in-use": "已存在使用此电子邮件的账户。请尝试登录。",
+      "auth/invalid-credential": "登录凭据无效。请检查您的邮箱和密码。",
+      "auth/invalid-email": "请输入有效的电子邮件地址。",
+      "auth/network-request-failed": "网络错误。请检查您的连接并重试。",
+      "auth/operation-not-allowed": "此登录方法目前不受支持。",
+      "auth/popup-closed-by-user": "登录已取消。请重试。",
+      "auth/too-many-requests": "登录尝试次数过多。请稍等片刻再试。",
+      "auth/user-disabled": "此账户已被禁用。请联系客服。",
+      "auth/user-not-found": "未找到使用此电子邮件的账户。您想要创建一个新账户吗？",
+      "auth/weak-password": "密码强度太弱。请使用至少6个字符的更强密码。",
+      "auth/wrong-password": "您输入的密码不正确，请重试。"
+    },
+    "login": {
+      "andText": "和",
+      "backToLogin": "返回登录",
+      "backToSocialLogin": "改用 Google 或 Github 注册",
+      "confirmPasswordLabel": "确认密码",
+      "confirmPasswordPlaceholder": "再次输入相同的密码",
+      "didntReceiveEmail": "没有收到邮件？请联系我们：",
+      "emailLabel": "电子邮件",
+      "emailPlaceholder": "输入您的电子邮件",
+      "failed": "登录失败",
+      "forgotPassword": "忘记密码？",
+      "forgotPasswordError": "发送重置密码邮件失败",
+      "freeTierBadge": "可享免费套餐",
+      "freeTierDescription": "使用 Google 注册，每月可获得 {credits} 免费积分。无需绑定银行卡。",
+      "freeTierDescriptionGeneric": "使用 Google 注册，每月可获得免费积分。无需绑定银行卡。",
+      "insecureContextWarning": "此连接不安全（HTTP）—如果继续登录，您的凭据可能会被攻击者拦截。",
+      "loginButton": "登录",
+      "loginWithGithub": "使用Github登录",
+      "loginWithGoogle": "使用Google登录",
+      "newUser": "新用户？",
+      "noAssociatedUser": "所提供的 API 密钥未关联任何 Comfy 用户",
+      "orContinueWith": "或者继续使用",
+      "passwordLabel": "密码",
+      "passwordPlaceholder": "输入您的密码",
+      "passwordResetError": "发送密码重置邮件失败。请重试。",
+      "passwordResetInstructions": "请输入您的电子邮件地址，我们将向您发送重置密码的链接。",
+      "passwordResetSent": "重置密码邮件已发送",
+      "passwordResetSentDetail": "请查收您的电子邮件，点击链接重置密码。",
+      "privacyLink": "隐私政策",
+      "questionsContactPrefix": "有疑问？请联系我们：",
+      "sendResetLink": "发送重置链接",
+      "signInOrSignUp": "登录 / 注册",
+      "signUp": "注册",
+      "signUpFreeTierPromo": "新用户？使用 Google {signUp}，每月可获得 {credits} 免费积分。",
+      "success": "登录成功",
+      "termsLink": "使用条款",
+      "termsText": "点击“下一步”或“注册”即表示您同意我们的",
+      "title": "登录您的账户",
+      "useApiKey": "Comfy API 密钥",
+      "useEmailInstead": "改用邮箱",
+      "userAvatar": "用户头像"
+    },
+    "loginButton": {
+      "tooltipHelp": "登录以使用“API 节点”",
+      "tooltipLearnMore": "了解更多..."
+    },
+    "passwordUpdate": {
+      "success": "密码已更新",
+      "successDetail": "您的密码已成功更新"
+    },
+    "reauthRequired": {
+      "cancel": "取消",
+      "confirm": "重新登录",
+      "message": "出于安全原因，此操作需要您重新登录。是否继续？",
+      "title": "需要重新认证"
+    },
+    "signOut": {
+      "signOut": "退出登录",
+      "success": "成功退出登录",
+      "successDetail": "您已成功退出账户。",
+      "unsavedChangesMessage": "您有未保存的更改，注销后这些更改将会丢失。是否继续？",
+      "unsavedChangesTitle": "未保存的更改"
+    },
+    "signup": {
+      "alreadyHaveAccount": "已经有账户了？",
+      "emailLabel": "电子邮件",
+      "emailNotEligibleForFreeTier": "邮箱注册不支持免费套餐。",
+      "emailPlaceholder": "输入您的电子邮件",
+      "passwordLabel": "密码",
+      "passwordPlaceholder": "输入新密码",
+      "personalDataConsentLabel": "我同意处理我的个人数据。",
+      "regionRestrictionChina": "根据当地法规要求，我们暂时无法为中国地区的用户提供服务。",
+      "signIn": "登录",
+      "signUpButton": "注册",
+      "signUpWithGithub": "使用Github注册",
+      "signUpWithGoogle": "使用Google注册",
+      "title": "创建一个账户"
+    }
+  },
+  "batch": {
+    "index": "{current} / {total}"
+  },
+  "billingOperation": {
+    "subscriptionFailed": "订阅更新失败",
+    "subscriptionProcessing": "正在处理付款 — 正在设置您的工作区...",
+    "subscriptionSuccess": "订阅更新成功",
+    "subscriptionTimeout": "订阅验证超时",
+    "topupFailed": "充值失败",
+    "topupProcessing": "正在处理付款 — 正在添加积分...",
+    "topupSuccess": "积分添加成功",
+    "topupTimeout": "充值验证超时"
+  },
+  "boundingBox": {
+    "height": "高度",
+    "width": "宽度",
+    "x": "X",
+    "y": "Y"
+  },
+  "breadcrumbsMenu": {
+    "clearWorkflow": "清除工作流",
+    "deleteBlueprint": "删除蓝图",
+    "deleteWorkflow": "删除工作流",
+    "duplicate": "复制",
+    "enterAppMode": "进入应用模式",
+    "enterBuilderMode": "进入应用构建器",
+    "enterNewName": "输入新名称",
+    "exitAppMode": "退出应用模式",
+    "missingNodesWarning": "工作流包含不支持的节点（红色突出显示）。",
+    "workflowActions": "工作流操作"
+  },
+  "builderMenu": {
+    "exitAppBuilder": "退出应用构建器"
+  },
+  "builderToolbar": {
+    "app": "应用",
+    "appDescription": "默认以应用方式打开",
+    "arrange": "预览",
+    "arrangeDescription": "查看应用布局",
+    "connectOutput": "连接输出",
+    "connectOutputBody1": "您的应用需要至少连接一个输出，才能保存。",
+    "connectOutputBody2": "切换到“选择”步骤，点击输出节点将其添加到此处。",
+    "defaultModeAppliedAppBody": "此工作流将从现在起默认以应用模式打开。",
+    "defaultModeAppliedAppPrompt": "你想现在查看吗？",
+    "defaultModeAppliedGraphBody": "此工作流将从现在起默认以节点图模式打开。",
+    "defaultModeAppliedGraphPrompt": "你还想查看应用吗？",
+    "defaultModeAppliedTitle": "设置成功",
+    "defaultView": "设置默认视图",
+    "defaultViewDescription": "选择打开方式",
+    "defaultViewLabel": "默认情况下，此工作流将以以下方式打开：",
+    "defaultViewTitle": "为此工作流设置默认视图",
+    "emptyWorkflowPrompt": "要使用模板开始吗？",
+    "emptyWorkflowTitle": "此工作流没有节点",
+    "inputs": "输入",
+    "inputsDescription": "选择输入",
+    "label": "应用构建器",
+    "nodeGraph": "节点图",
+    "nodeGraphDescription": "默认以节点图方式打开",
+    "outputs": "输出",
+    "outputsDescription": "选择输出",
+    "switchToOutputs": "切换到输出",
+    "viewApp": "查看应用"
+  },
+  "clipboard": {
+    "errorMessage": "复制到剪贴板失败",
+    "errorNotSupported": "您的浏览器不支持剪贴板API",
+    "successMessage": "已复制到剪贴板"
+  },
+  "cloudFooter_needHelp": "需要帮助？",
+  "cloudForgotPassword_backToLogin": "返回登录",
+  "cloudForgotPassword_didntReceiveEmail": "没有收到邮件？",
+  "cloudForgotPassword_emailLabel": "电子邮件",
+  "cloudForgotPassword_emailPlaceholder": "输入您的邮箱",
+  "cloudForgotPassword_emailRequired": "邮箱是必填项",
+  "cloudForgotPassword_instructions": "请输入您的电子邮件地址，我们将向您发送重置密码的链接。",
+  "cloudForgotPassword_passwordResetError": "发送密码重置邮件失败",
+  "cloudForgotPassword_passwordResetSent": "密码重置邮件已发送",
+  "cloudForgotPassword_sendResetLink": "发送重置链接",
+  "cloudForgotPassword_title": "忘记密码",
+  "cloudOnboarding": {
+    "authTimeout": {
+      "causes": [
+        "Corporate firewall or proxy blocking authentication services",
+        "VPN or network restrictions",
+        "Browser extensions interfering with requests",
+        "Regional network limitations",
+        "Try a different browser or network"
+      ],
+      "helpText": "需要帮助？联系",
+      "message": "我们无法连接到 ComfyUI 云端服务。这可能是由于网络连接缓慢或临时服务问题导致的。",
+      "restart": "退出并重试",
+      "supportLink": "支持",
+      "technicalDetails": "技术细节",
+      "title": "连接时间过长",
+      "troubleshooting": "常见原因："
+    },
+    "checkingStatus": "正在检查您的账户状态...",
+    "forgotPassword": {
+      "backToLogin": "返回登录",
+      "didntReceiveEmail": "没有收到邮件？请联系我们：",
+      "emailLabel": "电子邮件",
+      "emailPlaceholder": "输入您的邮箱",
+      "emailRequired": "邮箱为必填项",
+      "instructions": "请输入您的电子邮件地址，我们将向您发送重置密码的链接。",
+      "passwordResetError": "发送密码重置邮件失败，请重试。",
+      "passwordResetSent": "密码重置邮件已发送",
+      "sendResetLink": "发送重置链接",
+      "title": "忘记密码"
+    },
+    "privateBeta": {
+      "desc": "登录以加入等候名单。轮到您时我们会通知您。已经收到通知？登录开始使用 Cloud。",
+      "title": "云服务目前处于内测阶段"
+    },
+    "retry": "重试",
+    "retrying": "正在重试...",
+    "skipToCloudApp": "跳转到云应用",
+    "start": {
+      "desc": "无需任何设置。可在任何设备上使用。",
+      "download": "下载 ComfyUI",
+      "explain": "一次生成多个输出。轻松分享工作流。",
+      "learnAboutButton": "了解云服务",
+      "title": "几秒内开始创作",
+      "wantToRun": "想在本机运行 ComfyUI 吗？"
+    },
+    "survey": {
+      "options": {
+        "familiarity": {
+          "advanced": "高级用户（自定义工作流）",
+          "basics": "熟练掌握基础知识",
+          "expert": "专家（帮助他人）",
+          "new": "ComfyUI 新手（从未使用过）",
+          "starting": "刚刚开始（正在学习教程）"
+        },
+        "industry": {
+          "architecture": "架构",
+          "education": "教育",
+          "film_tv_animation": "电影、电视与动画",
+          "fine_art": "美术与插画",
+          "gaming": "游戏",
+          "marketing": "营销与广告",
+          "other": "其他",
+          "otherPlaceholder": "请指定",
+          "product_design": "产品与平面设计",
+          "software": "软件与技术"
+        },
+        "making": {
+          "3d": "3D 资产",
+          "audio": "音频 / 音乐",
+          "custom_nodes": "自定义节点和工作流",
+          "images": "图片",
+          "video": "视频与动画"
+        },
+        "purpose": {
+          "client": "客户工作（自由职业）",
+          "community": "社区贡献（节点、工作流等）",
+          "inhouse": "我自己的工作场所（内部）",
+          "personal": "个人项目 / 爱好",
+          "research": "学术研究"
+        }
       },
-      "sortBy": {
-        "original": "原始顺序",
-        "originalDesc": "保持原始顺序",
-        "alphabetical": "字母顺序",
-        "alphabeticalDesc": "在分组内按字母顺序排序"
-      }
-    },
-    "modelLibrary": "模型库",
-    "downloads": "下载",
-    "queueProgressOverlay": {
-      "title": "队列进度",
-      "total": "全部：{percent}",
-      "colonPercent": "：{percent}",
-      "currentNode": "当前节点：",
-      "viewAllJobs": "查看全部任务",
-      "running": "运行中",
-      "preview": "预览",
-      "interruptAll": "中断全部正在运行的任务",
-      "moreOptions": "更多设置",
-      "showAssets": "显示资产",
-      "showAssetsPanel": "显示资产面板",
-      "queuedSuffix": "已执行",
-      "clearQueued": "清除已执行",
-      "clearHistory": "清除任务记录",
-      "filterJobs": "筛选任务",
-      "filterBy": "筛选方式",
-      "filterAllWorkflows": "全部工作流",
-      "filterCurrentWorkflow": "当前工作流",
-      "sortJobs": "排序任务",
-      "sortBy": "排序方式",
-      "activeJobsSuffix": "活跃任务",
-      "jobQueue": "任务队列",
-      "expandCollapsedQueue": "展开任务队列",
-      "viewJobHistory": "查看任务记录",
-      "noActiveJobs": "无活跃任务",
-      "stubClipTextEncode": "CLIP文本编码：",
-      "jobsCompleted": "{count} 任务完成 | {count} 任务完成",
-      "jobsFailed": "{count} 任务失败 | {count} 任务失败",
-      "cancelJobTooltip": "取消任务",
-      "clearQueueTooltip": "清理队列",
-      "clearHistoryDialogTitle": "确定要清除任务记录？",
-      "clearHistoryDialogDescription": "以下所有已完成或失败的任务将从队列面板中删除。",
-      "clearHistoryDialogAssetsNote": "这些任务生成的资产不会被删除，并且始终可以在资产面板中查看。"
-    },
-    "workflowTab": {
-      "confirmDeleteTitle": "删除工作流？",
-      "confirmDelete": "您确定要删除此工作流吗？",
-      "deleted": "工作流已删除",
-      "deleteFailedTitle": "删除失败",
-      "deleteFailed": "尝试删除工作流失败。",
-      "dirtyCloseTitle": "保存更改？",
-      "dirtyClose": "以下文件已被更改。您想在关闭之前保存它们吗？",
-      "dirtyCloseHint": "按住 Shift 关闭而不提示",
-      "confirmOverwriteTitle": "覆盖现有文件？",
-      "confirmOverwrite": "下面的文件已经存在。您想要覆盖它吗？",
-      "workflowTreeType": {
-        "browse": "浏览",
-        "bookmarks": "书签",
-        "open": "打开"
-      }
+      "placeholder": "调查问题占位符",
+      "questions": {
+        "familiarity": "你对 ComfyUI 有多熟悉？",
+        "industry": "您的主要行业是什么？",
+        "making": "你打算做什么？",
+        "purpose": "您主要将使用 ComfyUI 做什么？"
+      },
+      "steps": {
+        "familiarity": "你对 ComfyUI 有多熟悉？",
+        "industry": "您的主要行业是什么？",
+        "making": "你打算做什么？",
+        "purpose": "您将主要使用 ComfyUI 做什么？"
+      },
+      "title": "云调研"
     }
   },
-  "helpCenter": {
-    "feedback": "提交反馈",
-    "docs": "文档",
-    "github": "Github",
-    "help": "帮助和支持",
-    "managerExtension": "管理扩展",
-    "more": "更多...",
-    "whatsNew": "新功能?",
-    "clickToLearnMore": "点击了解更多 →",
-    "loadingReleases": "加载发布信息...",
-    "recentReleases": "最近发布",
-    "noRecentReleases": "没有最近的发布",
-    "updateAvailable": "更新",
-    "desktopUserGuide": "桌面端用户指南",
-    "openDevTools": "打开开发者工具",
-    "reinstall": "重新安装",
-    "updateComfyUI": "更新 ComfyUI",
-    "updateComfyUIStarted": "更新开始",
-    "updateComfyUIStartedDetail": "正在更新 ComfyUI，请稍等...",
-    "updateComfyUISuccess": "更新完成",
-    "updateComfyUISuccessDetail": "ComfyUI 已更新，正在重启...",
-    "updateComfyUIFailed": "更新 ComfyUI 失败，请重试。"
-  },
-  "releaseToast": {
-    "newVersionAvailable": "新版本可用！",
-    "whatsNew": "新功能?",
-    "skip": "跳过",
-    "update": "更新",
-    "description": "在此更新中尝试最新的改进和功能。"
-  },
-  "menu": {
-    "hideMenu": "隐藏菜单",
-    "showMenu": "显示菜单",
-    "batchCount": "批次数量",
-    "batchCountTooltip": "工作流生成次数",
-    "autoQueue": "自动执行",
-    "disabled": "禁用",
-    "disabledTooltip": "工作流将不会自动执行",
-    "instant": "实时",
-    "instantTooltip": "工作流将会在生成完成后立即执行",
-    "onChange": "更改时",
-    "onChangeTooltip": "一旦进行更改，工作流将添加到执行队列",
-    "runWorkflow": "运行工作流（Shift排在前面）",
-    "runWorkflowFront": "运行工作流（排在前面）",
-    "runWorkflowDisabled": "工作流包含不支持的节点（已用红色突出显示）。删除这些节点以运行工作流。",
-    "run": "运行",
-    "execute": "执行",
-    "interrupt": "取消当前任务",
-    "refresh": "刷新节点",
-    "clipspace": "打开剪贴板",
-    "resetView": "重置视图",
-    "clear": "清空工作流",
-    "toggleBottomPanel": "底部面板",
-    "theme": "主题",
-    "dark": "深色",
-    "light": "淺色",
-    "manageExtensions": "管理扩展功能",
-    "customNodesManager": "自定义节点管理器",
-    "settings": "设定",
-    "help": "说明",
-    "queue": "队列面板"
-  },
-  "tabMenu": {
-    "duplicateTab": "复制标签",
-    "closeTab": "关闭标签",
-    "closeTabsToLeft": "关闭左侧标签",
-    "closeTabsToRight": "关闭右侧标签",
-    "closeOtherTabs": "关闭其他标签",
-    "addToBookmarks": "添加到书签",
-    "removeFromBookmarks": "从书签中移除"
-  },
-  "templateWorkflows": {
-    "title": "从模板开始",
-    "loadingMore": "正在加载更多模板...",
-    "searchPlaceholder": "搜索模板...",
-    "category": {
-      "ComfyUI Examples": "ComfyUI示例",
-      "Custom Nodes": "自定义节点",
-      "Basics": "基础",
-      "GettingStarted": "入门",
-      "Flux": "Flux",
-      "ControlNet": "ControlNet",
-      "Upscaling": "图像放大",
-      "Video": "视频生成",
-      "Image": "图像生成",
-      "Area Composition": "区域合成",
-      "3D": "3D",
-      "Audio": "音频生成",
-      "LLMs": "LLMs",
-      "Image API": "图像 API",
-      "Video API": "视频 API",
-      "LLM API": "LLM API",
-      "All": "所有模板",
-      "Extensions": "扩展",
-      "Partner Nodes": "合作伙伴节点",
-      "Generation Type": "生成类型"
-    },
-    "categories": "分类",
-    "resetFilters": "清除筛选",
-    "sorting": "排序方式",
-    "activeFilters": "筛选条件：",
-    "loading": "正在加载模板...",
-    "noResults": "未找到模板",
-    "noResultsHint": "请尝试调整搜索或筛选条件",
-    "allTemplates": "全部模板",
-    "modelFilter": "模型筛选",
-    "useCaseFilter": "使用例",
-    "licenseFilter": "许可证",
-    "modelsSelected": "已选 {count} 个模型",
-    "useCasesSelected": "已选 {count} 个用例",
-    "runsOnSelected": "{count} 次运行",
-    "runsOnFilter": "运行于",
-    "resultsCount": "显示 {count} / 共 {total} 个模板",
-    "sort": {
-      "recommended": "推荐",
-      "alphabetical": "A → Z",
-      "newest": "最新",
-      "searchPlaceholder": "搜索...",
-      "vramLowToHigh": "VRAM 使用量（从低到高）",
-      "modelSizeLowToHigh": "模型大小（从低到高）",
-      "default": "默认"
-    },
-    "error": {
-      "templateNotFound": "未找到模板 \"{templateName}\""
-    }
-  },
-  "templateWidgets": {
-    "sort": {
-      "searchPlaceholder": "搜索中..."
-    }
-  },
-  "graphCanvasMenu": {
-    "zoomIn": "放大",
-    "zoomOut": "缩小",
-    "resetView": "重置视图",
-    "fitView": "适应视图",
-    "selectMode": "选择模式",
-    "panMode": "平移模式",
-    "toggleMinimap": "切换小地图",
-    "select": "选择",
-    "hand": "拖拽",
-    "zoomOptions": "缩放选项",
-    "focusMode": "专注模式",
-    "hideLinks": "隐藏链接",
-    "showLinks": "显示链接",
-    "toggleLinkVisibility": "切换链接可见性"
-  },
-  "zoomControls": {
-    "label": "缩放控制",
-    "zoomToFit": "适合画面",
-    "showMinimap": "显示小地图",
-    "hideMinimap": "隐藏小地图"
-  },
-  "groupNode": {
-    "create": "创建组节点",
-    "enterName": "输入名称"
-  },
-  "nodeTemplates": {
-    "saveAsTemplate": "另存为模板",
-    "enterName": "输入名称"
-  },
-  "workflowService": {
-    "exportWorkflow": "导出工作流",
-    "enterFilename": "输入文件名",
-    "saveWorkflow": "保存工作流"
-  },
-  "subgraphStore": {
-    "confirmDeleteTitle": "删除子工作流？",
-    "confirmDelete": "此操作将永久从您的库中移除该子工作流",
-    "saveBlueprint": "保存子工作流到节点库",
-    "overwriteBlueprintTitle": "覆盖现有子工作流？",
-    "overwriteBlueprint": "保存将用您的更改覆盖当前子工作流",
-    "blueprintName": "子工作流名称",
-    "promoteOutsideSubgraph": "不在子工作流中时无法提升小部件",
-    "publish": "发布子工作流",
-    "publishSuccess": "已保存到节点库",
-    "publishSuccessMessage": "您可以在节点库的“子工作流蓝图”下找到您的子工作流蓝图",
-    "loadFailure": "加载子工作流蓝图失败",
-    "shown": "节点上显示",
-    "showAll": "全部显示",
-    "hidden": "隐藏/嵌套参数",
-    "hideAll": "全部隐藏",
-    "showRecommended": "显示推荐控件"
-  },
-  "electronFileDownload": {
-    "inProgress": "进行中",
-    "pause": "暂停下载",
-    "paused": "已暂停",
-    "resume": "恢复下载",
-    "cancel": "取消下载",
-    "cancelled": "已取消"
-  },
-  "maskEditor": {
-    "title": "遮罩编辑器",
-    "invert": "反转",
-    "clear": "清除",
-    "undo": "撤回",
-    "redo": "重做",
-    "clickToResetZoom": "点击重置缩放",
-    "brushSettings": "笔刷设置",
-    "brushShape": "笔刷形状",
-    "colorSelector": "色彩选取",
-    "thickness": "厚度",
-    "opacity": "不透明度",
-    "hardness": "硬度",
-    "stepSize": "间距",
-    "smoothingPrecision": "预测平滑",
-    "resetToDefault": "重置为默认",
-    "paintBucketSettings": "填充设置",
-    "tolerance": "阈值",
-    "fillOpacity": "填充不透明度",
-    "colorSelectSettings": "色彩选取设置",
-    "selectionOpacity": "选取不透明度",
-    "livePreview": "实时预览",
-    "applyToWholeImage": "应用到图像整体",
-    "method": "方法",
-    "stopAtMask": "遇到遮罩时停止",
-    "maskTolerance": "遮罩阈值",
-    "layers": "图层",
-    "maskLayer": "遮罩层",
-    "maskOpacity": "遮罩不透明度",
-    "imageLayer": "图像层",
-    "maskBlendingOptions": "遮罩混合设置",
-    "paintLayer": "绘画层",
-    "baseImageLayer": "基础图像层",
-    "activateLayer": "活跃层",
-    "baseLayerPreview": "基础图像层预览",
-    "black": "黑",
-    "white": "白",
-    "negative": "负面"
+  "cloudPrivateBeta_desc": "登录以加入等候名单。轮到您时我们会通知您。已经收到通知？登录开始使用 Cloud。",
+  "cloudPrivateBeta_title": "云服务目前处于内测阶段",
+  "cloudSorryContactSupport_title": "抱歉，请联系客服",
+  "cloudStart_desc": "无需任何设置。可在任何设备上使用。",
+  "cloudStart_download": "下载 ComfyUI",
+  "cloudStart_explain": "一次性生成多个输出。轻松分享工作流。",
+  "cloudStart_learnAboutButton": "了解云服务",
+  "cloudStart_title": "几秒钟内开始创作",
+  "cloudStart_wantToRun": "想在本地运行 ComfyUI 吗？",
+  "cloudSurvey_steps_familiarity": "你对 ComfyUI 有多熟悉？",
+  "cloudSurvey_steps_industry": "您的主要行业是什么？",
+  "cloudSurvey_steps_making": "你打算做什么？",
+  "cloudSurvey_steps_purpose": "您将主要使用 ComfyUI 做什么？",
+  "cloudWaitlist_contactLink": "这里",
+  "cloudWaitlist_questionsText": "有问题？联系我们",
+  "color": {
+    "black": "黑色",
+    "blue": "蓝色",
+    "brown": "棕色",
+    "custom": "自定义",
+    "cyan": "青色",
+    "default": "默认",
+    "green": "绿色",
+    "noColor": "无色",
+    "pale_blue": "淡蓝色",
+    "pink": "粉色",
+    "purple": "紫色",
+    "red": "红色",
+    "yellow": "黄色"
   },
   "commands": {
-    "runWorkflow": "运行工作流",
-    "runWorkflowFront": "运行工作流（队列前端）",
-    "run": "运行",
-    "execute": "执行",
-    "interrupt": "取消当前运行",
-    "refresh": "刷新节点定义",
-    "clipspace": "打开 Clipspace",
-    "resetView": "重置画布视图",
     "clear": "清空工作流",
-    "toggleBottomPanel": "切换底部面板",
-    "theme": "主题",
+    "clipspace": "打开 Clipspace",
     "dark": "深色",
+    "execute": "执行",
+    "help": "帮助",
+    "interrupt": "取消当前运行",
     "light": "浅色",
     "manageExtensions": "管理扩展",
+    "queue": "队列面板",
+    "refresh": "刷新节点定义",
+    "resetView": "重置画布视图",
+    "run": "运行",
+    "runWorkflow": "运行工作流",
+    "runWorkflowFront": "运行工作流（队列前端）",
     "settings": "设置",
-    "help": "帮助",
-    "queue": "队列面板"
+    "theme": "主题",
+    "toggleBottomPanel": "切换底部面板"
   },
-  "queue": {
-    "initializingAlmostReady": "初始化中 - 即将完成",
-    "inQueue": "正在执行...",
-    "jobAddedToQueue": "任务添加到队列",
-    "completedIn": "{duration} 后完成",
-    "jobMenu": {
-      "openAsWorkflowNewTab": "在新标签页中读取工作流",
-      "openWorkflowNewTab": "在新标签页中打开工作流",
-      "copyJobId": "复制任务ID",
-      "cancelJob": "取消任务",
-      "inspectAsset": "查看资产",
-      "addToCurrentWorkflow": "添加到当前工作流",
-      "download": "下载",
-      "exportWorkflow": "导出工作流",
-      "delete": "删除",
-      "deleteAsset": "删除资产",
-      "removeJob": "移除任务",
-      "copyErrorMessage": "复制报错信息",
-      "reportError": "反馈报错"
-    },
-    "jobList": {
-      "undated": "无日期",
-      "sortMostRecent": "最新",
-      "sortTotalGenerationTime": "生成时间（最慢）",
-      "sortComputeHoursUsed": "计算用时（最先）"
-    },
-    "jobDetails": {
-      "header": "任务细节",
-      "workflow": "工作流",
-      "jobId": "任务ID",
-      "queuedAt": "执行于",
-      "queuePosition": "队列位置",
-      "timeElapsed": "耗时",
-      "estimatedStartIn": "预计开始于",
-      "estimatedFinishIn": "预计完成于",
-      "generatedOn": "生成于",
-      "totalGenerationTime": "总生成时间",
-      "computeHoursUsed": "计算耗时",
-      "failedAfter": "失败于",
-      "errorMessage": "报错信息",
-      "report": "反馈",
-      "queuePositionValue": "在您前方有 ~{count} 个任务 | 在您前方有 ~{count} 个任务",
-      "eta": {
-        "seconds": "~{count} 秒 | ~{count} 秒",
-        "secondsRange": "~{lo}-{hi} 秒",
-        "minutes": "~{count} 分钟 | ~{count} 分钟",
-        "minutesRange": "~{lo}-{hi} 分钟"
-      }
-    }
-  },
-  "menuLabels": {
-    "File": "文件",
-    "Edit": "编辑",
-    "View": "视图",
-    "Help": "帮助",
-    "Check for Updates": "检查更新",
-    "Open Custom Nodes Folder": "打开自定义节点文件夹",
-    "Open Inputs Folder": "打开输入文件夹",
-    "Open Logs Folder": "打开日志文件夹",
-    "Open extra_model_paths_yaml": "打开 extra_model_paths.yaml",
-    "Open Models Folder": "打开模型文件夹",
-    "Open Outputs Folder": "打开输出文件夹",
-    "Open DevTools": "打开开发者工具",
-    "Desktop User Guide": "桌面端用户手册",
-    "Quit": "退出",
-    "Reinstall": "重装",
-    "Restart": "重启",
-    "Open 3D Viewer (Beta) for Selected Node": "为选中节点打开3D查看器（测试版）",
-    "Experimental: Browse Model Assets": "实验性：浏览模型资产",
-    "Browse Templates": "浏览模板",
-    "Delete Selected Items": "删除选定的项目",
-    "Zoom to fit": "缩放以适应",
-    "Lock Canvas": "锁定画布",
-    "Move Selected Nodes Down": "下移所选节点",
-    "Move Selected Nodes Left": "左移所选节点",
-    "Move Selected Nodes Right": "右移所选节点",
-    "Move Selected Nodes Up": "上移所选节点",
-    "Reset View": "重置视图",
-    "Resize Selected Nodes": "调整选定节点的大小",
-    "Node Links": "节点连接",
-    "Canvas Toggle Lock": "切换视图锁定",
-    "Minimap": "小地图",
-    "Pin/Unpin Selected Items": "固定/取消固定选定项目",
-    "Bypass/Unbypass Selected Nodes": "忽略/取消忽略选定节点",
-    "Collapse/Expand Selected Nodes": "折叠/展开选定节点",
-    "Mute/Unmute Selected Nodes": "静音/取消静音选定节点",
-    "Pin/Unpin Selected Nodes": "固定/取消固定选定节点",
-    "Unlock Canvas": "解除锁定画布",
-    "Zoom In": "放大画面",
-    "Zoom Out": "缩小画面",
-    "Clear Pending Tasks": "清除待处理任务",
-    "Clear Workflow": "清除工作流",
-    "Contact Support": "联系支持",
-    "Show Model Selector (Dev)": "显示模型选择器（开发用）",
-    "Duplicate Current Workflow": "复制当前工作流",
-    "Export": "导出",
-    "Export (API)": "导出 (API)",
-    "Convert Selection to Subgraph": "将选中内容转换为子工作流",
+  "contextMenu": {
+    "Add Group": "添加组",
+    "Add Group For Selected Nodes": "为选定节点添加组",
+    "Add Node": "添加节点",
+    "Add Subgraph to Library": "添加子工作流到节点库",
+    "Adjust Size": "调整尺寸",
+    "Align Selected To": "对齐选中项到",
+    "Bottom": "底部",
+    "Bypass": "绕过",
+    "Clone": "克隆",
+    "Collapse": "折叠",
+    "Color": "颜色",
+    "Colors": "颜色",
+    "Convert to Group Node": "转换为组节点",
+    "Convert to Subgraph": "转换为子工作流",
+    "Copy": "复制",
+    "Copy (Clipspace)": "复制 (Clipspace)",
+    "Copy Image": "复制图像",
+    "Delete": "删除",
+    "Distribute Nodes": "分布节点",
+    "Duplicate": "复制",
     "Edit Subgraph Widgets": "编辑子工作流组件",
-    "Exit Subgraph": "退出子工作流",
-    "Fit Group To Contents": "适应组内容",
-    "Group Selected Nodes": "将选中节点转换为组节点",
-    "Toggle promotion of hovered widget": "切换悬停小部件的提升",
-    "Unpack the selected Subgraph": "解包选中子工作流",
-    "Convert selected nodes to group node": "将选中节点转换为组节点",
-    "Manage group nodes": "管理组节点",
-    "Ungroup selected group nodes": "解散选中组节点",
-    "About ComfyUI": "关于ComfyUI",
-    "Comfy-Org Discord": "Comfy-Org Discord",
-    "ComfyUI Docs": "ComfyUI 文档",
-    "ComfyUI Forum": "ComfyUI 论坛",
-    "ComfyUI Issues": "ComfyUI 问题",
-    "Interrupt": "中断",
-    "Load Default Workflow": "加载默认工作流",
-    "Custom Nodes Manager": "自定义节点管理器",
-    "Custom Nodes (Legacy)": "自定义节点（旧版）",
-    "Manager Menu (Legacy)": "管理菜单（旧版）",
-    "Install Missing Custom Nodes": "安装缺失的自定义节点",
-    "Check for Custom Node Updates": "检查自定义节点更新",
-    "Toggle the Custom Nodes Manager Progress Bar": "切换自定义节点管理器进度条",
-    "Decrease Brush Size in MaskEditor": "在 MaskEditor 中减小笔刷大小",
-    "Increase Brush Size in MaskEditor": "在 MaskEditor 中增大笔刷大小",
-    "Open Mask Editor for Selected Node": "为选中节点打开 Mask 编辑器",
-    "Unload Models": "卸载模型",
-    "Unload Models and Execution Cache": "卸载模型和执行缓存",
-    "New": "新建",
-    "Clipspace": "剪贴空间",
-    "Manager": "管理器",
-    "Open": "打开",
-    "Publish": "发布",
-    "Queue Prompt": "执行提示词",
-    "Queue Prompt (Front)": "执行提示词 (优先执行)",
-    "Queue Selected Output Nodes": "将所选输出节点加入队列",
-    "Redo": "重做",
-    "Refresh Node Definitions": "刷新节点定义",
-    "Save": "保存",
-    "Save As": "另存为",
-    "Show Settings Dialog": "显示设置对话框",
-    "Experimental: Enable AssetAPI": "实验性：启用 AssetAPI",
-    "Canvas Performance": "画布性能",
-    "Help Center": "帮助中心",
-    "toggle linear mode": "切换线性模式",
-    "Toggle Theme (Dark/Light)": "切换主题（暗/亮）",
-    "Undo": "撤销",
-    "Open Sign In Dialog": "打开登录对话框",
-    "Sign Out": "退出登录",
-    "Experimental: Enable Nodes 2_0": "实验性：启用 Nodes 2.0",
-    "Close Current Workflow": "关闭当前工作流",
-    "Next Opened Workflow": "下一个打开的工作流",
-    "Previous Opened Workflow": "上一个打开的工作流",
-    "Toggle Search Box": "切换搜索框",
-    "Bottom Panel": "底部面板",
-    "Show Keybindings Dialog": "显示快捷键对话框",
-    "Toggle Terminal Bottom Panel": "切换终端底部面板",
-    "Toggle Logs Bottom Panel": "切换日志底部面板",
-    "Toggle Essential Bottom Panel": "切换基础底部面板",
-    "Toggle View Controls Bottom Panel": "切换视图控制底部面板",
-    "Focus Mode": "专注模式",
-    "Assets": "资产",
-    "Model Library": "模型库",
-    "Node Library": "节点库",
-    "Workflows": "工作流"
+    "Expand": "展开",
+    "Expand Node": "展开节点",
+    "Extensions": "扩展",
+    "FavoriteWidget": "收藏组件",
+    "Horizontal": "水平",
+    "Inputs": "输入",
+    "Left": "左侧",
+    "Manage": "管理",
+    "Manage Group Nodes": "管理组节点",
+    "Minimize Node": "最小化节点",
+    "Mode": "模式",
+    "Node Info": "节点信息",
+    "Node Templates": "节点模板",
+    "Open Image": "打开图像",
+    "Open in Mask Editor": "用遮罩编辑器打开",
+    "Outputs": "输出",
+    "Paste": "粘贴",
+    "Pin": "固定",
+    "Properties": "属性",
+    "Properties Panel": "属性面板",
+    "Remove": "删除",
+    "Remove Bypass": "删除所有忽略节点",
+    "Rename": "重命名",
+    "RenameWidget": "重命名组件",
+    "Resize": "调整大小",
+    "Right": "右侧",
+    "Run Branch": "运行支流节点",
+    "Save Image": "保存图像",
+    "Save Selected as Template": "将选定节点另存为模板",
+    "Search": "搜索",
+    "Shape": "形状",
+    "Shapes": "形状",
+    "Title": "标题",
+    "Top": "顶部",
+    "UnfavoriteWidget": "取消收藏组件",
+    "Unpack Subgraph": "解包子工作流",
+    "Unpin": "取消固定",
+    "Vertical": "竖直",
+    "deprecated": "弃用",
+    "new": "新"
   },
-  "desktopMenu": {
-    "reinstall": "重新安装",
-    "confirmReinstall": "这将清除您的 extra_models_config.yaml 文件，并重新开始安装。您确定吗？",
-    "quit": "退出",
-    "confirmQuit": "有未保存的工作流开启；任何未保存的更改都将丢失。忽略此警告并退出？"
-  },
-  "settingsCategories": {
-    "Comfy-Desktop": "Comfy桌面版",
-    "General": "常规",
-    "Appearance": "外观",
-    "ColorPalette": "色彩主题",
-    "Comfy": "Comfy",
-    "Workflow": "工作流",
-    "DevMode": "开发模式",
-    "LiteGraph": "画面",
-    "Node Widget": "节点组件",
-    "Node": "节点",
-    "Extension": "扩展",
-    "Canvas": "画布",
-    "Link": "连线",
-    "Group": "组",
-    "Menu": "菜单",
-    "Keybinding": "快捷键",
-    "LinkRelease": "释放链接",
-    "Graph": "画面",
-    "Locale": "区域设置",
-    "Mask Editor": "遮罩编辑器",
-    "BrushAdjustment": "画笔调整",
-    "ModelLibrary": "模型库",
-    "NodeLibrary": "节点库",
-    "Node Search Box": "节点搜索框",
-    "Pointer": "指针",
-    "Queue": "队列",
-    "QueueButton": "执行按钮",
-    "RerouteBeta": "转接点 Beta",
-    "Server": "服务器",
-    "Settings": "设置",
-    "Sidebar": "侧边栏",
-    "Tree Explorer": "树形浏览器",
-    "Validation": "验证",
-    "Window": "窗口",
-    "Server-Config": "服务器配置",
-    "About": "关于",
-    "EditTokenWeight": "编辑令牌权重",
-    "CustomColorPalettes": "自定义色彩主题",
-    "UV": "UV",
-    "ContextMenu": "上下文菜单",
-    "Reroute": "重新路由",
-    "Load 3D": "加载3D",
-    "Camera": "相机",
-    "Scene": "场景",
-    "3D": "3D",
-    "Light": "光照",
-    "User": "用户",
-    "Credits": "积分",
-    "API Nodes": "API 节点",
-    "Notification Preferences": "通知偏好",
-    "3DViewer": "3D查看器",
-    "Canvas Navigation": "画布导航",
-    "PlanCredits": "计划与积分",
-    "Vue Nodes": "Nodes 2.0",
-    "VueNodes": "Nodes 2.0",
-    "Nodes 2_0": "Nodes 2.0",
-    "Execution": "执行",
-    "PLY": "PLY"
-  },
-  "serverConfigItems": {
-    "listen": {
-      "name": "主机：要监听的IP地址"
-    },
-    "port": {
-      "name": "端口：要监听的端口"
-    },
-    "tls-keyfile": {
-      "name": "TLS 密钥文件：HTTPS 的 TLS 密钥文件路径"
-    },
-    "tls-certfile": {
-      "name": "TLS 证书文件：HTTPS 的 TLS 证书文件路径"
-    },
-    "enable-cors-header": {
-      "name": "启用 CORS header：使用 \"*\" 代表所有来源或指定域名"
-    },
-    "max-upload-size": {
-      "name": "最大上传大小 (MB)"
-    },
-    "cuda-device": {
-      "name": "要使用的 CUDA 设备索引"
-    },
-    "cuda-malloc": {
-      "name": "使用 CUDA malloc 进行内存分配"
-    },
-    "global-precision": {
-      "name": "全局浮点精度",
-      "tooltip": "全局浮点精度"
-    },
-    "unet-precision": {
-      "name": "UNET 精度",
-      "tooltip": "UNET 精度"
-    },
-    "vae-precision": {
-      "name": "VAE 精度",
-      "tooltip": "VAE 精度"
-    },
-    "cpu-vae": {
-      "name": "在 CPU 上运行 VAE"
-    },
-    "text-encoder-precision": {
-      "name": "文本编码器精度",
-      "tooltip": "文本编码器精度"
-    },
-    "force-channels-last": {
-      "name": "强制使用 channels-last 内存格式"
-    },
-    "directml": {
-      "name": "DirectML 设备索引"
-    },
-    "disable-ipex-optimize": {
-      "name": "禁用 IPEX 优化"
-    },
-    "preview-method": {
-      "name": "用于潜空间预览的方法"
-    },
-    "preview-size": {
-      "name": "预览图像的大小"
-    },
-    "cache-classic": {
-      "name": "使用经典缓存系统"
-    },
-    "cache-lru": {
-      "name": "使用 LRU 缓存，最多缓存 N 个节点结果。",
-      "tooltip": "可能会使用更多的 RAM/VRAM。"
-    },
-    "cross-attention-method": {
-      "name": "交叉注意力方法"
-    },
-    "disable-xformers": {
-      "name": "禁用 xFormers 优化"
-    },
-    "force-upcast-attention": {
-      "name": "强制 upcast-attention"
-    },
-    "dont-upcast-attention": {
-      "name": "不使用 upcast-attention"
-    },
-    "vram-management": {
-      "name": "VRAM 管理模式"
-    },
-    "reserve-vram": {
-      "name": "保留 VRAM (GB)",
-      "tooltip": "设置您希望为操作系统/其他软件保留的 VRAM （GB）。默认会根据系统类型保留一定数量。"
-    },
-    "default-hashing-function": {
-      "name": "模型文件的默认哈希函数"
-    },
-    "disable-smart-memory": {
-      "name": "禁用智能内存管理",
-      "tooltip": "强制 ComfyUI 在可以时将模型从 VRAM 移出到常规 RAM。"
-    },
-    "deterministic": {
-      "name": "使 pytorch 在可以时使用较慢的确定性算法。",
-      "tooltip": "请注意，这可能不会在所有情况下使图像具有确定性。"
-    },
-    "fast": {
-      "name": "启用一些未经测试且可能降低质量的优化。"
-    },
-    "dont-print-server": {
-      "name": "不将服务器输出打印到控制台。"
-    },
-    "disable-metadata": {
-      "name": "禁用在文件中保存提示元数据。"
-    },
-    "enable-manager-legacy-ui": {
-      "name": "使用旧版管理器UI",
-      "tooltip": "是用旧版 ComfyUI-Manager UI。"
-    },
-    "disable-all-custom-nodes": {
-      "name": "禁用加载所有自定义节点。"
-    },
-    "log-level": {
-      "name": "日志详细级别"
-    },
-    "input-directory": {
-      "name": "输入目录"
-    },
-    "output-directory": {
-      "name": "输出目录"
-    }
-  },
-  "serverConfigCategories": {
-    "Network": "网络",
-    "CUDA": "CUDA",
-    "Inference": "推理",
-    "Memory": "内存",
-    "Preview": "预览",
-    "Cache": "缓存",
-    "Attention": "注意力",
-    "General": "常规",
-    "Directories": "目录"
-  },
-  "nodeCategories": {
-    "_for_testing": "_用于测试",
-    "custom_sampling": "自定义采样",
-    "noise": "噪波",
-    "dataset": "dataset",
-    "text": "文本",
-    "image": "图像",
-    "sampling": "采样",
-    "schedulers": "调度器",
-    "audio": "音频",
-    "conditioning": "条件",
-    "loaders": "加载器",
-    "guiders": "引导器",
-    "api node": "api 节点",
-    "video": "视频",
-    "ByteDance": "字节跳动",
-    "preprocessors": "预处理器",
-    "utils": "工具",
-    "string": "字符串",
-    "advanced": "高级",
-    "guidance": "引导",
-    "model_merging": "模型合并",
-    "model_patches": "模型微调",
-    "chroma_radiance": "chroma_radiance",
-    "attention_experiments": "注意力实验",
-    "flux": "Flux",
-    "kandinsky5": "kandinsky5",
-    "hooks": "约束",
-    "combine": "组合",
-    "cond single": "条件单",
-    "context": "上下文",
-    "controlnet": "ControlNet",
-    "inpaint": "局部重绘",
-    "scheduling": "调度",
-    "create": "创建",
-    "mask": "遮罩",
-    "deprecated": "已弃用",
-    "debug": "调试",
+  "credits": {
+    "accountInitialized": "账户已初始化",
+    "activity": "活动",
+    "added": "已添加",
+    "additionalInfo": "附加信息",
+    "apiPricing": "API 价格",
+    "credits": "积分",
+    "creditsAvailable": "积分可用",
+    "details": "详情",
+    "eventType": "事件类型",
+    "faqs": "常见问题",
+    "invoiceHistory": "发票历史",
+    "lastUpdated": "最近更新",
+    "messageSupport": "联系客服",
     "model": "模型",
-    "latent": "Latent",
-    "3d": "3d",
-    "ltxv": "LTXV",
-    "qwen": "Qwen千问",
-    "sd3": "SD3",
-    "unet": "U-Net",
-    "sigmas": "Sigmas",
-    "BFL": "BFL",
-    "Gemini": "Gemini",
-    "video_models": "视频模型",
-    "gligen": "GLIGEN",
-    "sd": "sd",
-    "Ideogram": "Ideogram",
-    "postprocessing": "后处理",
-    "transform": "变换",
-    "batch": "批处理",
-    "upscaling": "放大",
-    "instructpix2pix": "InstructPix2Pix",
-    "compositing": "合成",
-    "Kling": "Kling",
-    "samplers": "采样器",
-    "operations": "操作",
-    "training": "训练",
-    "lotus": "lotus",
-    "LTXV": "LTXV",
-    "Luma": "Luma",
-    "MiniMax": "MiniMax",
-    "model_specific": "模型特定",
-    "Moonvalley Marey": "Moonvalley Marey",
-    "OpenAI": "OpenAI",
-    "Sora": "Sora",
-    "cond pair": "条件对",
-    "photomaker": "PhotoMaker",
-    "PixVerse": "PixVerse",
-    "primitive": "基础",
-    "Recraft": "Recraft",
-    "edit_models": "编辑模型",
-    "Rodin": "Rodin",
-    "Runway": "Runway",
-    "animation": "动画",
-    "api": "API",
-    "save": "保存",
-    "upscale_diffusion": "放大扩散",
-    "clip": "CLIP",
-    "Stability AI": "Stability AI",
-    "stable_cascade": "StableCascade",
-    "3d_models": "3D模型",
-    "style_model": "风格模型",
-    "Topaz": "Topaz",
-    "Tripo": "Tripo",
-    "Veo": "Veo",
-    "Vidu": "Vidu",
-    "": "",
-    "camera": "相机",
-    "Wan": "Wan万相",
-    "zimage": "zimage"
+    "purchaseCredits": "购买积分",
+    "refreshes": "于 {date} 刷新",
+    "time": "时间",
+    "topUp": {
+      "addMoreCredits": "获取更多积分",
+      "addMoreCreditsToRun": "获取更多积分来运行",
+      "amountToPayLabel": "支付金额（美元）",
+      "buy": "购买",
+      "buyCredits": "继续付款",
+      "buyNow": "立即购买",
+      "contactUs": "联系我们",
+      "creditsDescription": "该工作流需要积分运行。",
+      "creditsPerDollar": "每美元积分数",
+      "creditsToReceiveLabel": "获得积分数",
+      "howManyCredits": "您想要多少积分？",
+      "insufficientMessage": "您的积分不足，无法运行此工作流。",
+      "insufficientTitle": "积分不足",
+      "insufficientWorkflowMessage": "您的积分不足以运行该工作流。",
+      "maxAllowed": "最多{credits}积分。",
+      "maxAmount": "（最高 $1,000 美元）",
+      "maximumAmount": "最多${amount}",
+      "minRequired": "最少{credits}积分",
+      "minimumPurchase": "最低${amount}（{credits}积分）",
+      "needMore": "需要更多？",
+      "purchaseError": "购买失败",
+      "purchaseErrorDetail": "购买积分失败：{error}",
+      "purchaseSuccess": "积分添加成功！",
+      "quickPurchase": "快速购买",
+      "seeDetails": "查看详情",
+      "selectAmount": "选择金额",
+      "templateNote": "*使用 Wan Fun Control 模板生成",
+      "topUp": "充值",
+      "unknownError": "发生未知错误",
+      "usdAmount": "${amount}",
+      "videosEstimate": "~{count} 个视频*",
+      "viewPricing": "查看定价详情",
+      "youGet": "获得积分",
+      "youPay": "支付金额（美元）"
+    },
+    "unified": {
+      "message": "积分已合并",
+      "tooltip": "我们统一了 Comfy 的支付方式。现在全部使用 Comfy 积分 :\n- 合作节点（API节点）\n- Cloud 工作流\n\n您现有的合作伙伴节点积分将自动转换为 Comfy 积分。"
+    },
+    "yourCreditBalance": "您的积分余额"
   },
   "dataTypes": {
     "*": "*",
@@ -1478,33 +656,49 @@
     "AUDIO_ENCODER_OUTPUT": "音频编码器输出",
     "AUDIO_RECORD": "音频录制",
     "BOOLEAN": "布尔",
+    "BOUNDING_BOX": "边界框",
     "CAMERA_CONTROL": "相机控制",
     "CLIP": "CLIP",
     "CLIP_VISION": "CLIP视觉",
     "CLIP_VISION_OUTPUT": "CLIP视觉输出",
+    "COLOR": "颜色",
     "COMBO": "组合",
+    "COMFY_AUTOGROW_V3": "COMFY_AUTOGROW_V3",
+    "COMFY_DYNAMICCOMBO_V3": "COMFY_DYNAMICCOMBO_V3",
+    "COMFY_MATCHTYPE_V3": "COMFY_MATCHTYPE_V3",
     "CONDITIONING": "条件",
     "CONTROL_NET": "ControlNet",
+    "ELEVENLABS_VOICE": "ELEVENLABS_VOICE",
+    "FILE_3D": "FILE_3D",
+    "FILE_3D_FBX": "FILE_3D_FBX",
+    "FILE_3D_GLB": "FILE_3D_GLB",
+    "FILE_3D_GLTF": "FILE_3D_GLTF",
+    "FILE_3D_OBJ": "FILE_3D_OBJ",
+    "FILE_3D_STL": "FILE_3D_STL",
+    "FILE_3D_USDZ": "FILE_3D_USDZ",
     "FLOAT": "浮点",
     "FLOATS": "浮点组",
     "GEMINI_INPUT_FILES": "GEMINI 输入文件",
     "GLIGEN": "GLIGEN",
     "GUIDER": "引导器",
-    "HOOK_KEYFRAMES": "约束关键帧",
     "HOOKS": "约束",
+    "HOOK_KEYFRAMES": "约束关键帧",
     "IMAGE": "图像",
+    "IMAGECOMPARE": "图像对比",
     "INT": "整数",
     "LATENT": "Latent",
     "LATENT_OPERATION": "Latent操作",
     "LATENT_UPSCALE_MODEL": "LATENT_UPSCALE_MODEL",
-    "LOAD_3D": "加载3D",
     "LOAD3D_CAMERA": "加载3D相机",
+    "LOAD_3D": "加载3D",
     "LORA_MODEL": "LORA模型",
     "LOSS_MAP": "损失图",
     "LUMA_CONCEPTS": "Luma 概念",
     "LUMA_REF": "Luma 参考",
     "MASK": "遮罩",
     "MESH": "网格",
+    "MESHY_RIGGED_TASK_ID": "MESHY_RIGGED_TASK_ID",
+    "MESHY_TASK_ID": "MESHY_TASK_ID",
     "MODEL": "模型",
     "MODEL_PATCH": "模型补丁",
     "MODEL_TASK_ID": "模型任务ID",
@@ -1513,6 +707,7 @@
     "OPENAI_INPUT_FILES": "OpenAI输入文件",
     "PHOTOMAKER": "PhotoMaker",
     "PIXVERSE_TEMPLATE": "Pixverse 模板",
+    "POSE_KEYPOINT": "POSE_KEYPOINT",
     "RECRAFT_COLOR": "Recraft 颜色",
     "RECRAFT_CONTROLS": "Recraft 控件",
     "RECRAFT_V3_STYLE": "Recraft V3 风格",
@@ -1532,919 +727,2672 @@
     "WAN_CAMERA_EMBEDDING": "WAN 摄像头嵌入",
     "WEBCAM": "摄像头"
   },
-  "maintenance": {
-    "title": "维护",
-    "allOk": "未检测到任何问题。",
-    "status": "状态",
-    "detected": "检测到",
-    "refreshing": "刷新中",
-    "None": "无",
-    "OK": "确定",
-    "Skipped": "跳过",
-    "showManual": "显示维护任务",
-    "confirmTitle": "你确定吗？",
-    "terminalDefaultMessage": "当你运行一个故障排除命令时，任何输出都会在这里显示。",
-    "consoleLogs": "控制台日志",
-    "error": {
-      "toastTitle": "任务错误",
-      "taskFailed": "任务运行失败。",
-      "cannotContinue": "无法继续 - 仍有错误",
-      "defaultDescription": "运行维护任务时发生错误。"
-    },
-    "unsafeMigration": {
-      "title": "检测到安装路径不安全",
-      "generic": "您当前的 ComfyUI 基本路径所在的位置可能会在更新期间被删除或修改。为避免数据丢失，请将其移至安全文件夹。",
-      "appInstallDir": "您当前的 ComfyUI 基本路径位于 ComfyUI Desktop 应用程序包中，程序更新时会删除该文件夹。选择安装文件夹之外的目录，例如 Documents/ComfyUI。",
-      "updaterCache": "您当前的 ComfyUI 基本路径位于 ComfyUI 更新缓存中，程序更新时会清除该缓存。为您的数据选择一个不同的位置。",
-      "oneDrive": "您当前的 ComfyUI 基本路径在 OneDrive上，这可能会导致同步问题和意外的数据丢失。选择一个不受 OneDrive 管理的本地文件夹。",
-      "action": "使用下方的 \"基本路径\" 维护将路径移动到安全位置。"
+  "desktopDialogs": {
+    "": {
+      "buttons": {
+        "Close": "关闭"
+      },
+      "message": "提供的对话 ID 无效。",
+      "title": "无效对话框"
     }
   },
-  "missingModelsDialog": {
-    "doNotAskAgain": "不再显示此消息",
-    "missingModels": "缺少模型",
-    "missingModelsMessage": "加载工作流时，未找到以下模型"
+  "desktopMenu": {
+    "confirmQuit": "有未保存的工作流开启；任何未保存的更改都将丢失。忽略此警告并退出？",
+    "confirmReinstall": "这将清除您的 extra_models_config.yaml 文件，并重新开始安装。您确定吗？",
+    "quit": "退出",
+    "reinstall": "重新安装"
   },
-  "versionMismatchWarning": {
-    "title": "版本相容性警告",
-    "frontendOutdated": "前端版本 {frontendVersion} 已过时。后端需要 {requiredVersion} 版或更高版本。",
-    "frontendNewer": "前端版本 {frontendVersion} 可能与后端版本 {backendVersion} 不相容。",
-    "updateFrontend": "更新前端",
-    "dismiss": "关闭"
+  "desktopStart": {
+    "initialising": "正在初始化..."
   },
-  "loadWorkflowWarning": {
-    "outdatedVersion": "这个工作流由新版 ComfyUI（{version}）创建，部分节点可能无法正常运行。",
-    "outdatedVersionGeneric": "这个工作流由新版 ComfyUI 创建，部分节点可能无法正常运行。",
-    "coreNodesFromVersion": "核心节点来源于 {version} 版本。"
+  "desktopUpdate": {
+    "description": "ComfyUI桌面正在安装新的依赖项。这可能需要几分钟的时间。",
+    "errorCheckingUpdate": "检查更新时出错",
+    "errorInstallingUpdate": "安装更新时出错",
+    "noUpdateFound": "未发现更新",
+    "terminalDefaultMessage": "更新过程中的任何控制台输出都将在这里显示。",
+    "title": "正在更新ComfyUI桌面",
+    "updateAvailableMessage": "有可用的更新。您现在要重启并更新吗？",
+    "updateFoundTitle": "找到更新 (v{version})"
+  },
+  "downloadGit": {
+    "gitWebsite": "下载 git",
+    "instructions": "请下载并安装适合您操作系统的最新版本。下面的下载 git 按钮将打开 git-scm.com 下载页面。",
+    "message": "无法找到 git。正常操作需要一个可用的 git 副本。",
+    "skip": "跳过",
+    "title": "下载 git",
+    "warning": "如果您确定不需要安装 git，或者已经安装了 git，您可以点击跳过以绕过此检查。当前不支持在没有可用 git 副本的情况下运行 ComfyUI。"
+  },
+  "electronFileDownload": {
+    "cancel": "取消下载",
+    "cancelled": "已取消",
+    "inProgress": "进行中",
+    "pause": "暂停下载",
+    "paused": "已暂停",
+    "resume": "恢复下载"
   },
   "errorDialog": {
     "defaultTitle": "发生错误",
+    "extensionFileHint": "这可能是由于以下脚本",
     "loadWorkflowTitle": "由于重新加载工作流数据出错，加载被中止",
     "noStackTrace": "无可用堆栈跟踪",
-    "extensionFileHint": "这可能是由于以下脚本",
     "promptExecutionError": "提示执行失败"
   },
-  "apiNodesSignInDialog": {
-    "title": "使用API节点需要登录",
-    "message": "此工作流包含API节点，需要您登录账户才能运行。"
+  "errorOverlay": {
+    "errorCount": "{count}个错误",
+    "seeErrors": "查看错误"
   },
-  "apiNodesCostBreakdown": {
-    "title": "API节点",
-    "costPerRun": "每次运行的成本",
-    "totalCost": "总成本"
+  "essentials": {
+    "batchImage": "批量图像",
+    "canny": "Canny",
+    "cannyToImage": "Canny转图像",
+    "cannyToVideo": "Canny转视频",
+    "cropImage": "裁剪图像",
+    "depthToImage": "深度转图像",
+    "depthToVideo": "深度转视频",
+    "extractFrame": "提取帧",
+    "imageCompare": "图像对比",
+    "imageTo3DModel": "图像转3D模型",
+    "imageToImage": "图像转图像",
+    "imageToVideo": "图像转视频",
+    "inpaintImage": "图像修复",
+    "invert": "反转",
+    "lipsync": "唇形同步",
+    "load3DModel": "加载3D模型",
+    "loadAudio": "加载音频",
+    "loadImage": "加载图像",
+    "loadStyleLora": "加载风格（LoRA）",
+    "loadVideo": "加载视频",
+    "musicGeneration": "音乐生成",
+    "outpaintImage": "图像扩展",
+    "poseToImage": "姿态转图像",
+    "poseToVideo": "姿态转视频",
+    "removeBackground": "移除背景",
+    "resizeImage": "调整图像大小",
+    "rotate": "旋转",
+    "save3DModel": "保存3D模型",
+    "saveAudio": "保存音频",
+    "saveImage": "保存图像",
+    "saveVideo": "保存视频",
+    "text": "文本",
+    "textGenerationLLM": "文本生成（LLM）",
+    "textTo3DModel": "文本转3D模型",
+    "textToImage": "文本转图像",
+    "textToVideo": "文本转视频"
   },
-  "desktopUpdate": {
-    "title": "正在更新ComfyUI桌面",
-    "description": "ComfyUI桌面正在安装新的依赖项。这可能需要几分钟的时间。",
-    "terminalDefaultMessage": "更新过程中的任何控制台输出都将在这里显示。",
-    "updateFoundTitle": "找到更新 (v{version})",
-    "updateAvailableMessage": "有可用的更新。您现在要重启并更新吗？",
-    "noUpdateFound": "未发现更新",
-    "errorCheckingUpdate": "检查更新时出错",
-    "errorInstallingUpdate": "安装更新时出错"
+  "exportToast": {
+    "allExportsCompleted": "全部导出完成",
+    "downloadExport": "下载导出文件",
+    "downloadFailed": "下载“{name}”失败",
+    "exportCompleted": "ZIP下载已就绪",
+    "exportError": "导出失败",
+    "exportFailed": "{count}个导出失败",
+    "exportFailedSingle": "创建ZIP导出失败",
+    "exportStarted": "正在准备ZIP下载...",
+    "exportingAssets": "正在导出资源",
+    "noExportsInQueue": "队列中没有{filter}导出",
+    "preparingExport": "正在准备导出...",
+    "retryDownload": "重试下载"
   },
-  "clipboard": {
-    "successMessage": "已复制到剪贴板",
-    "errorMessage": "复制到剪贴板失败",
-    "errorNotSupported": "您的浏览器不支持剪贴板API"
+  "g": {
+    "1x": "1倍",
+    "2x": "2倍",
+    "about": "关于",
+    "add": "添加",
+    "addNode": "添加节点...",
+    "addNodeFilterCondition": "添加节点筛选条件",
+    "all": "全部",
+    "amount": "数量",
+    "apply": "应用",
+    "architecture": "架构",
+    "asset": "{count} 个资源",
+    "audioFailedToLoad": "音频加载失败",
+    "audioProgress": "音频进度",
+    "author": "作者",
+    "back": "返回",
+    "batchRename": "批量重命名",
+    "beta": "测试版",
+    "bookmark": "保存到库",
+    "calculatingDimensions": "正在计算尺寸",
+    "cancel": "取消",
+    "cancelled": "已取消",
+    "capture": "捕获",
+    "category": "类别",
+    "chart": "图表",
+    "chartLowercase": "图表",
+    "choose_file_to_upload": "选择要上传的文件",
+    "clear": "清除",
+    "clearAll": "全部清除",
+    "clearFilters": "清除筛选",
+    "close": "关闭",
+    "closeDialog": "关闭对话框",
+    "collapseAll": "全部折叠",
+    "color": "颜色",
+    "comfy": "舒适",
+    "comfyOrgLogoAlt": "ComfyOrg 徽标",
+    "comingSoon": "即将推出",
+    "command": "指令",
+    "commandProhibited": "命令 {command} 被禁止。请联系管理员了解更多信息。",
+    "community": "社区",
+    "completed": "已完成",
+    "completedWithCheckmark": "已完成 ✓",
+    "confirm": "确认",
+    "confirmed": "已确认",
+    "content": "内容",
+    "continue": "继续",
+    "control_after_generate": "生成后控制",
+    "control_before_generate": "生成前控制",
+    "copied": "已复制",
+    "copy": "复制",
+    "copyAll": "全部复制",
+    "copyJobId": "复制队列 ID",
+    "copyToClipboard": "复制到剪贴板",
+    "copyURL": "复制链接",
+    "core": "核心",
+    "currentUser": "当前用户",
+    "custom": "自定义",
+    "customBackground": "自定义背景",
+    "customize": "自定义",
+    "customizeFolder": "自定义文件夹",
+    "decrement": "减小",
+    "defaultBanner": "默认横幅",
+    "delete": "删除",
+    "deleteAudioFile": "删除音频文件",
+    "deleteImage": "删除图片",
+    "deprecated": "已弃用",
+    "description": "描述",
+    "devOnly": "开发专用",
+    "devices": "设备",
+    "disableAll": "禁用全部",
+    "disableSelected": "禁用选中项",
+    "disableThirdParty": "禁用第三方",
+    "disabling": "禁用中",
+    "disconnectedFromBackend": "已与后端断开连接。请检查服务器是否正在运行。",
+    "dismiss": "关闭",
+    "download": "下载",
+    "downloadAudio": "下载音频",
+    "downloadImage": "下载图片",
+    "downloadVideo": "下载视频",
+    "downloadWithSize": "下载（{size}）",
+    "downloading": "正在下载",
+    "dropYourFileOr": "拖放您的文件或",
+    "duplicate": "复制",
+    "edit": "编辑",
+    "editImage": "编辑图片",
+    "editOrMaskImage": "编辑或遮罩图片",
+    "emDash": "-",
+    "empty": "空",
+    "enableAll": "启用全部",
+    "enableOrDisablePack": "启用或禁用包",
+    "enableSelected": "启用选中项",
+    "enabled": "已启用",
+    "enabling": "启用中",
+    "enter": "进入",
+    "enterBaseName": "输入基础名称",
+    "enterNewName": "输入新名称",
+    "enterNewNamePrompt": "输入新名称：",
+    "enterSubgraph": "进入子图",
+    "error": "错误",
+    "errorLoadingImage": "图片加载出错",
+    "errorLoadingVideo": "视频加载出错",
+    "essentials": "基础",
+    "expandAll": "全部展开",
+    "experimental": "测试版",
+    "export": "导出",
+    "extensionName": "扩展名称",
+    "extensions": "扩展",
+    "failed": "失败",
+    "failedToCopyJobId": "未能复制队列 ID",
+    "failedToDownloadImage": "图片下载失败",
+    "failedToDownloadVideo": "视频下载失败",
+    "favorites": "收藏夹",
+    "feedback": "反馈",
+    "file": "文件",
+    "filter": "过滤",
+    "filterBy": "筛选方式：",
+    "filterByType": "按{type}筛选...",
+    "findIssues": "查找问题",
+    "frameNodes": "框选节点",
+    "frontendNewer": "前端版本 {frontendVersion} 可能与后端版本 {backendVersion} 不相容。",
+    "frontendOutdated": "前端版本 {frontendVersion} 已过时。后端需要 {requiredVersion} 或更高版本。",
+    "galleryImage": "图库图片",
+    "galleryThumbnail": "图库缩略图",
+    "goToNode": "转到节点",
+    "graphNavigation": "图形导航",
+    "halfSpeed": "0.5倍",
+    "hideLeftPanel": "隐藏左侧面板",
+    "hideRightPanel": "隐藏右侧面板",
+    "icon": "图标",
+    "imageDoesNotExist": "图像不存在",
+    "imageFailedToLoad": "图像加载失败",
+    "imagePreview": "图片预览 - 使用方向键切换图片",
+    "imageUrl": "图片网址",
+    "import": "导入",
+    "inProgress": "进行中",
+    "inSubgraph": "在子图 '{name}' 中",
+    "increment": "增加",
+    "info": "节点信息",
+    "input": "输入",
+    "insert": "插入",
+    "install": "安装",
+    "installed": "已安装",
+    "installing": "正在安装",
+    "interrupted": "已中断",
+    "itemSelected": "已选择 {selectedCount} 项",
+    "itemsCopiedToClipboard": "已复制到剪贴板",
+    "itemsSelected": "已选择 {selectedCount} 项",
+    "job": "任务",
+    "jobIdCopied": "队列 ID 已复制到剪贴板",
+    "keybinding": "按键绑定",
+    "keybindingAlreadyExists": "快捷键已存在",
+    "keybindings": "快捷键",
+    "learnMore": "了解更多",
+    "listening": "正在监听...",
+    "liveSamplingPreview": "实时采样预览",
+    "loadAllFolders": "加载所有文件夹",
+    "loadWorkflow": "加载工作流",
+    "loading": "加载中",
+    "loadingPanel": "正在加载{panel}面板...",
+    "login": "登录",
+    "logoAlt": "ComfyUI 标志",
+    "logs": "日志",
+    "manageExtensions": "管理扩展",
+    "markdown": "markdown",
+    "micPermissionDenied": "麦克风权限被拒绝",
+    "migrate": "迁移",
+    "missing": "缺失",
+    "more": "更多",
+    "moreOptions": "更多选项",
+    "moreWorkflows": "更多工作流",
+    "mostRelevant": "最相关",
+    "multiSelectDropdown": "多选下拉框",
+    "name": "名称",
+    "newFolder": "新文件夹",
+    "next": "下一个",
+    "nightly": "NIGHTLY",
+    "no": "否",
+    "noAudioRecorded": "未录制音频",
+    "noItems": "无项目",
+    "noResults": "无结果",
+    "noResultsFound": "未找到结果",
+    "noTasksFound": "未找到任务",
+    "noTasksFoundMessage": "队列中没有任务。",
+    "noWorkflowsFound": "未找到工作流。",
+    "nodeContentError": "节点内容错误",
+    "nodeHeaderError": "节点标题错误",
+    "nodeRenderError": "节点渲染错误",
+    "nodeSlotsError": "节点插槽错误",
+    "nodeWidgetsError": "节点控件错误",
+    "nodes": "节点",
+    "nodesCount": "{count} 个节点",
+    "nodesRunning": "节点正在运行",
+    "none": "无",
+    "nothingToCopy": "没有可以复制的内容",
+    "nothingToDelete": "没有可以删除的内容",
+    "nothingToDuplicate": "Nothing to duplicate",
+    "nothingToRename": "没有可以重命名的内容",
+    "ok": "确定",
+    "openManager": "打开管理器",
+    "openNewIssue": "打开新问题",
+    "or": "或",
+    "output": "输出",
+    "overwrite": "覆盖",
+    "partner": "合作伙伴",
+    "playPause": "开启/暂停",
+    "playRecording": "播放录音",
+    "playbackSpeed": "播放速度",
+    "playing": "播放中",
+    "pressKeysForNewBinding": "按下按键设置新绑定",
+    "preview": "预览",
+    "profile": "档案",
+    "progressCountOf": "共",
+    "queued": "已执行",
+    "ready": "就绪",
+    "recents": "最近使用",
+    "reconnected": "已重新连接",
+    "reconnecting": "重新连接中",
+    "refresh": "刷新",
+    "refreshNode": "刷新节点",
+    "relativeTime": {
+      "daysAgo": "{count}天 前",
+      "hoursAgo": "{count}时 前",
+      "minutesAgo": "{count}分 前",
+      "monthsAgo": "{count}月 前",
+      "now": "刚才",
+      "weeksAgo": "{count}周 前",
+      "yearsAgo": "{count}年 前"
+    },
+    "releaseTitle": "{package} {version} 发布",
+    "reloadToApplyChanges": "重新加载以应用更改",
+    "remove": "移除",
+    "removeImage": "移除图片",
+    "removeTag": "移除标签",
+    "removeVideo": "移除视频",
+    "rename": "重命名",
+    "reportIssue": "发送报告",
+    "reportIssueTooltip": "向 Comfy Org 提交错误报告",
+    "reportSent": "报告已提交",
+    "reset": "重置",
+    "resetAll": "重置所有",
+    "resetAllKeybindingsTooltip": "将所有键绑定重置为默认",
+    "resizeFromBottomLeft": "从左下角调整大小",
+    "resizeFromBottomRight": "从右下角调整大小",
+    "resizeFromTopLeft": "从左上角调整大小",
+    "resizeFromTopRight": "从右上角调整大小",
+    "restart": "重新启动",
+    "resultsCount": "找到 {count} 个结果",
+    "running": "正在运行",
+    "save": "保存",
+    "saving": "正在保存",
+    "scrollLeft": "向左滚动",
+    "scrollRight": "向右滚动",
+    "search": "搜索",
+    "searchExtensions": "搜索扩展",
+    "searchFailedMessage": "我们找不到任何与您的搜索匹配的设置。请尝试调整您的搜索词。",
+    "searchKeybindings": "搜索快捷键",
+    "searchModels": "搜索模型",
+    "searchNodes": "搜索节点",
+    "searchPlaceholder": "搜索占位符",
+    "searchSettings": "搜索设置",
+    "searchWorkflows": "搜索工作流",
+    "seeTutorial": "查看教程",
+    "selectItemsToCopy": "选择复制",
+    "selectItemsToDelete": "选择删除",
+    "selectItemsToDuplicate": "选择复制",
+    "selectItemsToRename": "选择重命名",
+    "selectedFile": "已选文件",
+    "setAsBackground": "设为背景",
+    "settings": "设置",
+    "shortcutSuffix": "（{shortcut}）",
+    "showLeftPanel": "显示左侧面板",
+    "showReport": "显示报告",
+    "showRightPanel": "显示右侧面板",
+    "singleSelectDropdown": "单选下拉框",
+    "sort": "排序",
+    "source": "来源",
+    "startRecording": "开始录音",
+    "status": "状态",
+    "stopPlayback": "停止播放",
+    "stopRecording": "停止录音",
+    "submit": "提交",
+    "success": "成功",
+    "systemInfo": "系统信息",
+    "terminal": "终端",
+    "title": "标题",
+    "triggerPhrase": "触发短语",
+    "unknownError": "未知错误",
+    "unknownFile": "未知文件",
+    "untitled": "无标题",
+    "update": "更新",
+    "updateAvailable": "有更新可用",
+    "updateFrontend": "更新前端",
+    "updated": "已更新",
+    "updating": "更新中",
+    "upload": "上传",
+    "uploadAlreadyInProgress": "上传已在进行中",
+    "usageHint": "使用提示",
+    "use": "使用",
+    "user": "用户",
+    "versionMismatchWarning": "版本兼容性警告",
+    "versionMismatchWarningMessage": "{warning}：{detail} 请参阅 https://docs.comfy.org/installation/update_comfyui#common-update-issues 以取得更新说明。",
+    "videoFailedToLoad": "视频加载失败",
+    "videoPreview": "视频预览 - 使用方向键切换视频",
+    "viewImageOfTotal": "查看第 {index} 张图片，共 {total} 张",
+    "viewVideoOfTotal": "查看第 {index} 个视频，共 {total} 个",
+    "volume": "音量",
+    "warning": "警告",
+    "workflow": "工作流",
+    "you": "你"
+  },
+  "graphCanvasMenu": {
+    "fitView": "适应视图",
+    "focusMode": "专注模式",
+    "hand": "拖拽",
+    "hideLinks": "隐藏链接",
+    "panMode": "平移模式",
+    "resetView": "重置视图",
+    "select": "选择",
+    "selectMode": "选择模式",
+    "showLinks": "显示链接",
+    "toggleLinkVisibility": "切换链接可见性",
+    "toggleMinimap": "切换小地图",
+    "zoomIn": "放大",
+    "zoomOptions": "缩放选项",
+    "zoomOut": "缩小"
+  },
+  "groupNode": {
+    "create": "创建组节点",
+    "enterName": "输入名称"
+  },
+  "help": {
+    "helpCenterMenu": "帮助中心菜单",
+    "recentReleases": "最近发布"
+  },
+  "helpCenter": {
+    "clickToLearnMore": "点击了解更多 →",
+    "desktopUserGuide": "桌面端用户指南",
+    "docs": "文档",
+    "feedback": "提交反馈",
+    "github": "Github",
+    "help": "帮助和支持",
+    "loadingReleases": "加载发布信息...",
+    "managerExtension": "管理扩展",
+    "more": "更多...",
+    "noRecentReleases": "没有最近的发布",
+    "openDevTools": "打开开发者工具",
+    "recentReleases": "最近发布",
+    "reinstall": "重新安装",
+    "updateAvailable": "更新",
+    "updateComfyUI": "更新 ComfyUI",
+    "updateComfyUIFailed": "更新 ComfyUI 失败，请重试。",
+    "updateComfyUIStarted": "更新开始",
+    "updateComfyUIStartedDetail": "正在更新 ComfyUI，请稍等...",
+    "updateComfyUISuccess": "更新完成",
+    "updateComfyUISuccessDetail": "ComfyUI 已更新，正在重启...",
+    "whatsNew": "新功能?"
+  },
+  "icon": {
+    "bookmark": "书签",
+    "box": "盒子",
+    "briefcase": "公文包",
+    "exclamation-triangle": "警告",
+    "file": "文件",
+    "folder": "文件夹",
+    "heart": "心",
+    "inbox": "收件箱",
+    "star": "星星"
   },
   "imageCompare": {
+    "batchLabelA": "A：",
+    "batchLabelB": "B：",
     "noImages": "没有可以对比的图像"
   },
+  "imageCrop": {
+    "cropPreviewAlt": "裁剪预览",
+    "custom": "自定义",
+    "loading": "加载中...",
+    "lockRatio": "锁定宽高比",
+    "noInputImage": "未连接输入图像",
+    "ratio": "比例",
+    "unlockRatio": "解锁宽高比"
+  },
+  "importFailed": {
+    "copyError": "复制错误",
+    "title": "导入失败"
+  },
+  "install": {
+    "appDataLocationTooltip": "ComfyUI 的应用数据目录。存储：\n- 日志\n- 服务器配置",
+    "appPathLocationTooltip": "ComfyUI 的应用资产目录。存储 ComfyUI 代码和资产",
+    "cannotWrite": "无法写入所选路径。",
+    "chooseInstallationLocation": "选择安装位置",
+    "customNodes": "自定义节点",
+    "customNodesDescription": "引用现有 ComfyUI 安装的自定义节点文件并安装其依赖项。",
+    "desktopAppSettings": "桌面应用设置",
+    "desktopAppSettingsDescription": "配置 ComfyUI 在桌面上的行为。您可以稍后更改这些设置。",
+    "desktopSettings": "桌面设置",
+    "failedToSelectDirectory": "选择目录失败",
+    "gpu": "GPU",
+    "gpuPicker": {
+      "amdDescription": "使用您的 AMD GPU 结合 ROCm™ 加速以获得最佳性能。",
+      "amdSubtitle": "AMD ROCm™",
+      "appleMetalDescription": "利用您的Mac GPU以获得更快速度和更佳体验",
+      "cpuDescription": "当GPU加速不可用时，使用CPU模式以获得兼容性",
+      "cpuSubtitle": "CPU模式",
+      "manualDescription": "为高级配置或不受支持的硬件手动配置ComfyUI",
+      "manualSubtitle": "手动设置",
+      "nvidiaDescription": "使用NVIDIA GPU和CUDA加速以获得最佳性能。",
+      "nvidiaSubtitle": "NVIDIA CUDA",
+      "recommended": "推荐",
+      "title": "选择您的硬件配置"
+    },
+    "gpuSelection": {
+      "cpuMode": "CPU 模式",
+      "cpuModeDescription": "CPU 模式仅适用于开发者和极少数特殊情况。",
+      "cpuModeDescription2": "如果你不完全确定你需要这个，忽略该选项并在上面选择你的 GPU。",
+      "customComfyNeedsPython": "在 python 完成设置前，ComfyUI 将无法工作",
+      "customInstallRequirements": "安装所有需求和依赖项（例如：自定义 torch）",
+      "customManualVenv": "手动配置 python 虚拟环境",
+      "customMayNotWork": "完全不支持，可能无法工作",
+      "customSkipsPython": "此选项跳过正常的 python 设置。",
+      "enableCpuMode": "启用 CPU 模式",
+      "mpsDescription": "Apple Metal Performance Shaders 使用 pytorch nightly 支持。",
+      "nvidiaDescription": "NVIDIA 设备直接支持使用 pytorch CUDA 构建。",
+      "selectGpu": "选择 GPU",
+      "selectGpuDescription": "选择你拥有的 GPU 类型"
+    },
+    "helpImprove": "请帮助我们改进ComfyUI",
+    "insideAppInstallDir": "该文件夹位于 ComfyUI Desktop 应用程序包中，程序更新时会删除该文件夹。选择安装文件夹之外的目录，例如 Documents/ComfyUI。",
+    "insideUpdaterCache": "该文件夹位于 ComfyUI 更新缓存中，程序更新时会清除该缓存。为您的数据选择一个不同的位置。",
+    "installLocation": "安装位置",
+    "installLocationDescription": "选择 ComfyUI 用户数据的存放目录。将安装一个 Python 环境到所选位置。请确保所选磁盘有足够的空间（约 15GB）。",
+    "installLocationTooltip": "ComfyUI 的用户数据目录。存储：\n- Python 环境\n- 模型\n- 自定义节点\n",
+    "insufficientFreeSpace": "空间不足 - 最小可用空间",
+    "isOneDrive": "在OneDrive中安装可能会导致问题。强烈建议在非OneDrive位置安装。",
+    "locationPicker": {
+      "chooseDownloadServers": "手动选择下载服务器",
+      "downloadServersDescription": "根据您的位置选择用于下载Python、PyPI包和PyTorch的特定镜像服务器。",
+      "migrateDescription": "从之前的ComfyUI安装复制或链接您的模型、自定义节点和配置。",
+      "migrateFromExisting": "从现有安装迁移",
+      "migrationPathPlaceholder": "选择已有的ComfyUI安装（可选）",
+      "pathPlaceholder": "/Users/username/Documents/ComfyUI",
+      "subtitle": "选择一个文件夹用于存放ComfyUI文件。我们也会自动在此处设置Python。",
+      "title": "选择ComfyUI的安装位置"
+    },
+    "manualConfiguration": {
+      "createVenv": "您需要在以下目录中创建虚拟环境",
+      "requirements": "依赖项",
+      "restartWhenFinished": "配置虚拟环境完成后，请重新启动ComfyUI。",
+      "title": "手动配置",
+      "virtualEnvironmentPath": "虚拟环境路径"
+    },
+    "metricsDisabled": "禁用度量",
+    "metricsEnabled": "启用度量",
+    "migrateFromExistingInstallation": "从现有安装迁移",
+    "migration": "迁移",
+    "migrationOptional": "迁移是可选的。如果您之前没有安装过 ComfyUI，可以跳过此步骤。",
+    "migrationSourcePathDescription": "如果您已有现有的ComfyUI安装，我们可以复制/链接您现有的用户文件和模型到新的安装。您现有的ComfyUI安装将不会受到影响。",
+    "moreInfo": "有关更多信息，请阅读我们的",
+    "nonDefaultDrive": "请在您的系统驱动器上安装ComfyUI（例如C:\\）。具有不同文件系统的驱动器可能会导致不可预测的问题。安装后，模型和其他文件可以存储在其他驱动器上。",
+    "parentMissing": "路径不存在 - 请先创建包含该路径的目录",
+    "pathExists": "目录已存在 - 请确保您已备份全部数据",
+    "pathValidationFailed": "路径验证失败",
+    "privacyPolicy": "隐私政策",
+    "selectItemsToMigrate": "选择要迁移的项目",
+    "settings": {
+      "allowMetrics": "使用情况指标",
+      "allowMetricsDescription": "通过发送匿名使用情况指标来帮助改进ComfyUI。不会收集任何个人信息或工作流内容。",
+      "autoUpdate": "自动更新",
+      "autoUpdateDescription": "更新可用时自动更新。您将在安装更新之前收到通知。",
+      "checkingMirrors": "正在检查到Python镜像的网络访问...",
+      "dataCollectionDialog": {
+        "collect": {
+          "errorReports": "错误报告和堆栈跟踪",
+          "systemInfo": "硬件，操作系统类型和应用版本",
+          "userJourneyEvents": "用户旅程事件"
+        },
+        "doNotCollect": {
+          "customNodeConfigurations": "自定义节点配置",
+          "fileSystemInformation": "文件系统信息",
+          "personalInformation": "个人信息",
+          "workflowContents": "工作流内容"
+        },
+        "title": "关于数据收集",
+        "viewFullPolicy": "查看完整政策",
+        "whatWeCollect": "我们收集的内容：",
+        "whatWeDoNotCollect": "我们不收集的内容："
+      },
+      "errorUpdatingConsent": "更新同意错误",
+      "errorUpdatingConsentDetail": "无法更新度量同意设置",
+      "learnMoreAboutData": "了解更多关于数据收集的信息",
+      "mirrorSettings": "镜像设置",
+      "mirrorsReachable": "到Python镜像的网络访问良好",
+      "mirrorsUnreachable": "对某些python镜像的网络访问不佳",
+      "pypiMirrorPlaceholder": "输入PyPI镜像URL",
+      "pythonMirrorPlaceholder": "输入Python镜像URL"
+    },
+    "systemLocations": "系统位置",
+    "unhandledError": "未知错误",
+    "updateConsent": "您之前选择了报告崩溃。我们现在正在跟踪基于事件的度量，以帮助识别错误并改进应用程序。我们不收集任何个人可识别信息。"
+  },
+  "issueReport": {
+    "helpFix": "帮助修复这个"
+  },
+  "linearMode": {
+    "appModeToolbar": {
+      "appBuilder": "应用构建器",
+      "apps": "应用",
+      "appsEmptyMessage": "已保存的应用会显示在这里。\n点击下方开始构建你的第一个应用。",
+      "enterAppMode": "进入应用模式"
+    },
+    "arrange": {
+      "atLeastOne": "至少一个",
+      "connectAtLeastOne": "请连接{atLeastOne}个输出节点，以便用户在运行后查看结果。",
+      "noOutputs": "尚未添加输出",
+      "outputExamples": "示例：“保存图像”或“保存视频”",
+      "outputs": "输出",
+      "resultsLabel": "运行此应用后，所选输出节点生成的结果将在此显示",
+      "switchToOutputs": "切换到“输出”步骤，并点击输出节点将其添加到此处。",
+      "switchToOutputsButton": "切换到输出"
+    },
+    "backToWorkflow": "返回工作流",
+    "beta": "App 模式测试版 - 提供反馈",
+    "builder": {
+      "exit": "退出构建器",
+      "exitConfirmMessage": "您有未保存的更改将会丢失\n确定不保存直接退出吗？",
+      "exitConfirmTitle": "退出应用构建器？",
+      "inputsDesc": "用户可通过这些输入项进行交互和调整，以生成输出结果。",
+      "inputsExample": "示例：“加载图像”、“文本提示”、“步数”",
+      "noInputs": "尚未添加输入项",
+      "noOutputs": "尚未添加输出节点",
+      "outputsDesc": "请至少连接一个输出节点，用户运行后才能看到结果。",
+      "outputsExample": "示例：“保存图像”或“保存视频”",
+      "promptAddInputs": "点击节点参数，将其添加为输入项",
+      "promptAddOutputs": "点击输出节点，将其添加到此处。这些将作为生成结果。",
+      "title": "应用构建模式",
+      "unknownWidget": "组件不可见"
+    },
+    "downloadAll": "全部下载",
+    "dragAndDropImage": "拖拽图片到此处",
+    "emptyWorkflowExplanation": "你的工作流为空。你需要先添加一些节点，才能开始构建应用。",
+    "enterNodeGraph": "进入节点图",
+    "giveFeedback": "提供反馈",
+    "graphMode": "图形模式",
+    "linearMode": "App 模式",
+    "loadTemplate": "加载模板",
+    "mobileControls": "编辑与运行",
+    "queue": {
+      "clear": "清空队列",
+      "clickToClear": "点击清空队列"
+    },
+    "rerun": "重新运行",
+    "reuseParameters": "复用参数",
+    "runCount": "运行次数：",
+    "viewJob": "查看任务",
+    "welcome": {
+      "buildApp": "构建应用",
+      "controls": "输出显示在底部，控制项在右侧。其他内容都不会干扰您。",
+      "getStarted": "点击 {runButton} 开始。",
+      "message": "简化视图，隐藏节点图，让您专注于创作。",
+      "sharing": "分享很简单：创建工作流，打开应用模式，右键点击标签页并导出。当他人打开你的文件时，会直接进入这个简洁视图。你可以将强大的工作流作为简单工具分享，无需理解节点图。",
+      "title": "欢迎使用应用模式"
+    }
+  },
   "load3d": {
-    "switchCamera": "切换摄影机类型",
-    "showGrid": "显示网格",
+    "applyingTexture": "应用纹理中...",
     "backgroundColor": "背景颜色",
-    "lightIntensity": "光照强度",
-    "fov": "视场",
-    "previewOutput": "预览输出",
-    "uploadBackgroundImage": "上传背景图片",
-    "removeBackgroundImage": "移除背景图片",
-    "tiledMode": "分快",
-    "panoramaMode": "全景",
-    "loadingModel": "正在加载3D模型...",
-    "upDirection": "上方向",
-    "materialMode": "材质模式",
-    "scene": "场景",
-    "model": "模型",
     "camera": "摄影机",
-    "light": "灯光",
-    "switchingMaterialMode": "切换材质模式中...",
+    "cameraType": {
+      "orthographic": "正交",
+      "perspective": "透视"
+    },
+    "clearRecording": "清除录制",
+    "dropToLoad": "拖放 3D 模型以加载",
     "edgeThreshold": "边缘阈值",
     "export": "导出",
     "exportModel": "导出模型",
+    "exportRecording": "导出录制",
     "exportingModel": "正在导出模型...",
-    "reloadingModel": "正在重新加载模型...",
-    "uploadTexture": "上传纹理",
-    "applyingTexture": "应用纹理中...",
+    "fov": "视场",
+    "light": "灯光",
+    "lightIntensity": "光照强度",
+    "loadingBackgroundImage": "正在加载背景图像",
+    "loadingModel": "正在加载3D模型...",
+    "materialMode": "材质模式",
     "materialModes": {
+      "depth": "深度",
+      "lineart": "线稿",
       "normal": "法线",
-      "wireframe": "线框",
       "original": "原始",
       "pointCloud": "点云",
-      "depth": "深度",
-      "lineart": "线稿"
+      "wireframe": "线框"
     },
+    "model": "模型",
+    "openIn3DViewer": "在 3D 查看器中打开",
+    "panoramaMode": "全景",
+    "previewOutput": "预览输出",
+    "reloadingModel": "正在重新加载模型...",
+    "removeBackgroundImage": "移除背景图片",
+    "resizeNodeMatchOutput": "调整节点以匹配输出",
+    "scene": "场景",
+    "showGrid": "显示网格",
+    "showSkeleton": "显示骨架",
+    "startRecording": "开始录制",
+    "stopRecording": "停止录制",
+    "switchCamera": "切换摄影机类型",
+    "switchingMaterialMode": "切换材质模式中...",
+    "tiledMode": "分快",
+    "unsupportedFileType": "不支持的文件类型（支持 .gltf、.glb、.obj、.fbx、.stl）",
+    "upDirection": "上方向",
     "upDirections": {
       "original": "原始"
     },
-    "startRecording": "开始录制",
-    "stopRecording": "停止录制",
-    "exportRecording": "导出录制",
-    "clearRecording": "清除录制",
-    "resizeNodeMatchOutput": "调整节点以匹配输出",
-    "loadingBackgroundImage": "正在加载背景图像",
-    "cameraType": {
-      "perspective": "透视",
-      "orthographic": "正交"
-    },
+    "uploadBackgroundImage": "上传背景图片",
+    "uploadTexture": "上传纹理",
+    "uploadingModel": "正在上传3D模型...",
     "viewer": {
-      "title": "3D 查看器（测试版）",
       "apply": "应用",
-      "cancel": "取消",
-      "cameraType": "相机类型",
-      "sceneSettings": "场景设置",
       "cameraSettings": "相机设置",
-      "lightSettings": "灯光设置",
-      "exportSettings": "导出设置",
-      "modelSettings": "模型设置"
-    },
-    "openIn3DViewer": "在 3D 查看器中打开",
-    "dropToLoad": "拖放 3D 模型以加载",
-    "unsupportedFileType": "不支持的文件类型（支持 .gltf、.glb、.obj、.fbx、.stl）",
-    "uploadingModel": "正在上传3D模型..."
-  },
-  "toastMessages": {
-    "nothingToQueue": "没有可加入队列的内容",
-    "pleaseSelectOutputNodes": "请选择输出节点",
-    "failedToQueue": "排队失败",
-    "failedExecutionPathResolution": "无法解析所选节点的路径",
-    "no3dScene": "没有3D场景可以应用纹理",
-    "failedToApplyTexture": "应用纹理失败",
-    "no3dSceneToExport": "没有3D场景可以导出",
-    "failedToExportModel": "无法将模型导出为 {format}",
-    "exportSuccess": "成功将模型导出为 {format}",
-    "fileLoadError": "无法在 {fileName} 中找到工作流",
-    "dropFileError": "无法处理掉落的项目：{error}",
-    "interrupted": "执行已被中断",
-    "pendingTasksDeleted": "待处理任务已删除",
-    "nothingToGroup": "没有可分组的内容",
-    "pleaseSelectNodesToGroup": "请选取节点（或其他组）以创建分组",
-    "emptyCanvas": "画布为空",
-    "fileUploadFailed": "文件上传失败",
-    "unableToGetModelFilePath": "无法获取模型文件路径",
-    "couldNotDetermineFileType": "无法确定文件类型",
-    "errorLoadingModel": "加载模型出错",
-    "failedToDownloadFile": "文件下载失败",
-    "updateRequested": "已请求更新",
-    "nodeDefinitionsUpdated": "节点定义已更新",
-    "errorSaveSetting": "保存设置 {id} 出错：{err}",
-    "errorCopyImage": "复制图片出错：{error}",
-    "noTemplatesToExport": "没有模板可以导出",
-    "failedToFetchLogs": "无法获取服务器日志",
-    "migrateToLitegraphReroute": "将来的版本中将删除重定向节点。点击以迁移到litegraph-native重定向。",
-    "legacyMaskEditorDeprecated": "旧版遮罩编辑器已弃用，即将删除。",
-    "userNotAuthenticated": "用户未认证",
-    "failedToFetchBalance": "获取余额失败：{error}",
-    "failedToCreateCustomer": "创建客户失败：{error}",
-    "failedToInitiateCreditPurchase": "发起积分购买失败：{error}",
-    "failedToAccessBillingPortal": "访问账单门户失败：{error}",
-    "failedToPurchaseCredits": "购买积分失败：{error}",
-    "failedToFetchSubscription": "获取订阅状态失败：{error}",
-    "failedToInitiateSubscription": "订阅启动失败：{error}",
-    "unauthorizedDomain": "您的域名 {domain} 未被授权使用此服务。请联系 {email} 将您的域名添加到白名单。",
-    "useApiKeyTip": "提示：无法正常登录？请使用 Comfy API Key 选项。",
-    "nothingSelected": "未选择任何内容",
-    "cannotCreateSubgraph": "无法创建子工作流",
-    "failedToConvertToSubgraph": "无法将项目转换为子工作流",
-    "failedToInitializeLoad3dViewer": "初始化3D查看器失败",
-    "failedToLoadBackgroundImage": "无法加载背景图片",
-    "failedToLoadModel": "无法加载3D模型",
-    "modelLoadedSuccessfully": "3D模型加载成功",
-    "failedToUpdateBackgroundColor": "更新背景色失败",
-    "failedToToggleGrid": "切换网格失败",
-    "failedToToggleCamera": "切换镜头失败",
-    "failedToUpdateFOV": "更新FOV失败",
-    "failedToUpdateLightIntensity": "更新光照强度失败",
-    "failedToUpdateBackgroundImage": "更新背景图像失败",
-    "failedToUpdateUpDirection": "更新向上轴失败",
-    "failedToUpdateMaterialMode": "更新材质模式失败",
-    "failedToUpdateEdgeThreshold": "更新边缘阈值失败",
-    "failedToUploadBackgroundImage": "上传背景图像失败",
-    "failedToUpdateBackgroundRenderMode": "切换背景模式到 {mode} 失败"
-  },
-  "nodeErrors": {
-    "render": "节点渲染错误",
-    "content": "节点内容错误",
-    "header": "节点头错误",
-    "slots": "节点接口错误",
-    "widgets": "节点组件错误"
-  },
-  "auth": {
-    "apiKey": {
-      "title": "API 密钥",
-      "label": "API 密钥",
-      "description": "使用您的 Comfy API 密钥以启用 API 节点",
-      "placeholder": "请输入您的 API 密钥",
-      "error": "无效的 API 密钥",
-      "storageFailed": "API 密钥存储失败",
-      "storageFailedDetail": "请重试。",
-      "stored": "API 密钥已存储",
-      "storedDetail": "您的 API 密钥已成功存储",
-      "cleared": "API 密钥已清除",
-      "clearedDetail": "您的 API 密钥已成功清除",
-      "invalid": "无效的 API 密钥",
-      "invalidDetail": "请输入有效的 API 密钥",
-      "helpText": "需要 API 密钥？",
-      "generateKey": "在这里获取",
-      "whitelistInfo": "关于非白名单网站"
-    },
-    "login": {
-      "title": "登录您的账户",
-      "useApiKey": "Comfy API 密钥",
-      "signInOrSignUp": "登录 / 注册",
-      "forgotPasswordError": "发送重置密码邮件失败",
-      "passwordResetSent": "重置密码邮件已发送",
-      "passwordResetSentDetail": "请查收您的电子邮件，点击链接重置密码。",
-      "newUser": "新用户？",
-      "userAvatar": "用户头像",
-      "signUp": "注册",
-      "emailLabel": "电子邮件",
-      "emailPlaceholder": "输入您的电子邮件",
-      "passwordLabel": "密码",
-      "passwordPlaceholder": "输入您的密码",
-      "confirmPasswordLabel": "确认密码",
-      "confirmPasswordPlaceholder": "再次输入相同的密码",
-      "forgotPassword": "忘记密码？",
-      "passwordResetInstructions": "请输入您的电子邮件地址，我们将向您发送重置密码的链接。",
-      "sendResetLink": "发送重置链接",
-      "backToLogin": "返回登录",
-      "didntReceiveEmail": "没有收到邮件？请联系我们：",
-      "passwordResetError": "发送密码重置邮件失败。请重试。",
-      "loginButton": "登录",
-      "orContinueWith": "或者继续使用",
-      "loginWithGoogle": "使用Google登录",
-      "loginWithGithub": "使用Github登录",
-      "termsText": "点击“下一步”或“注册”即表示您同意我们的",
-      "termsLink": "使用条款",
-      "andText": "和",
-      "privacyLink": "隐私政策",
-      "success": "登录成功",
-      "failed": "登录失败",
-      "insecureContextWarning": "此连接不安全（HTTP）—如果继续登录，您的凭据可能会被攻击者拦截。",
-      "questionsContactPrefix": "有疑问？请联系我们：",
-      "noAssociatedUser": "所提供的 API 密钥未关联任何 Comfy 用户"
-    },
-    "signup": {
-      "title": "创建一个账户",
-      "alreadyHaveAccount": "已经有账户了？",
-      "emailLabel": "电子邮件",
-      "emailPlaceholder": "输入您的电子邮件",
-      "passwordLabel": "密码",
-      "passwordPlaceholder": "输入新密码",
-      "signUpButton": "注册",
-      "signIn": "登录",
-      "signUpWithGoogle": "使用Google注册",
-      "signUpWithGithub": "使用Github注册",
-      "regionRestrictionChina": "根据当地法规要求，我们暂时无法为中国地区的用户提供服务。",
-      "personalDataConsentLabel": "我同意处理我的个人数据。"
-    },
-    "signOut": {
-      "signOut": "退出登录",
-      "success": "成功退出登录",
-      "successDetail": "您已成功退出账户。"
-    },
-    "passwordUpdate": {
-      "success": "密码已更新",
-      "successDetail": "您的密码已成功更新"
-    },
-    "errors": {
-      "auth/invalid-email": "请输入有效的电子邮件地址。",
-      "auth/user-disabled": "此账户已被禁用。请联系客服。",
-      "auth/user-not-found": "未找到使用此电子邮件的账户。您想要创建一个新账户吗？",
-      "auth/wrong-password": "您输入的密码不正确，请重试。",
-      "auth/email-already-in-use": "已存在使用此电子邮件的账户。请尝试登录。",
-      "auth/weak-password": "密码强度太弱。请使用至少6个字符的更强密码。",
-      "auth/too-many-requests": "登录尝试次数过多。请稍等片刻再试。",
-      "auth/operation-not-allowed": "此登录方法目前不受支持。",
-      "auth/invalid-credential": "登录凭据无效。请检查您的邮箱和密码。",
-      "auth/network-request-failed": "网络错误。请检查您的连接并重试。",
-      "auth/popup-closed-by-user": "登录已取消。请重试。",
-      "auth/cancelled-popup-request": "登录已取消。请重试。"
-    },
-    "deleteAccount": {
-      "deleteAccount": "删除账户",
-      "confirmTitle": "删除账户",
-      "confirmMessage": "您确定要删除您的账户吗？此操作无法撤销，并且会永久删除您的所有数据。",
-      "confirm": "删除账户",
+      "cameraType": "相机类型",
       "cancel": "取消",
-      "success": "账户已删除",
-      "successDetail": "您的账户已成功删除。"
-    },
-    "reauthRequired": {
-      "title": "需要重新认证",
-      "message": "出于安全原因，此操作需要您重新登录。是否继续？",
-      "confirm": "重新登录",
-      "cancel": "取消"
-    },
-    "loginButton": {
-      "tooltipHelp": "登录以使用“API 节点”",
-      "tooltipLearnMore": "了解更多..."
+      "exportSettings": "导出设置",
+      "lightSettings": "灯光设置",
+      "modelSettings": "模型设置",
+      "sceneSettings": "场景设置",
+      "title": "3D 查看器（测试版）"
     }
   },
-  "validation": {
-    "invalidEmail": "无效的电子邮件地址",
-    "required": "必填",
-    "minLength": "必须至少有{length}个字符",
-    "maxLength": "不能超过{length}个字符",
-    "prefix": "必须以 {prefix} 开头",
-    "descriptionRequired": "描述是必填的",
-    "length": "必须为{length}个字符",
-    "password": {
-      "requirements": "密码要求",
-      "minLength": "必须在8到32个字符之间",
-      "uppercase": "必须包含至少一个大写字母",
-      "lowercase": "必须包含至少一个小写字母",
-      "number": "必须包含至少一个数字",
-      "special": "必须包含至少一个特殊字符",
-      "match": "密码必须匹配"
-    },
-    "personalDataConsentRequired": "您必须同意处理您的个人数据。"
+  "loadWorkflowWarning": {
+    "coreNodesFromVersion": "核心节点来源于 {version} 版本。",
+    "outdatedVersion": "这个工作流由新版 ComfyUI（{version}）创建，部分节点可能无法正常运行。",
+    "outdatedVersionGeneric": "这个工作流由新版 ComfyUI 创建，部分节点可能无法正常运行。"
   },
-  "credits": {
-    "activity": "活动",
-    "credits": "积分",
-    "yourCreditBalance": "您的积分余额",
-    "purchaseCredits": "购买积分",
-    "invoiceHistory": "发票历史",
-    "apiPricing": "API 价格",
-    "faqs": "常见问题",
-    "messageSupport": "联系客服",
-    "lastUpdated": "最近更新",
-    "topUp": {
-      "insufficientTitle": "积分不足",
-      "insufficientMessage": "您的积分不足，无法运行此工作流。",
-      "quickPurchase": "快速购买",
-      "maxAmount": "（最高 $1,000 美元）",
-      "buyNow": "立即购买",
-      "seeDetails": "查看详情",
-      "topUp": "充值",
-      "addMoreCredits": "获取更多积分",
-      "addMoreCreditsToRun": "获取更多积分来运行",
-      "insufficientWorkflowMessage": "您的积分不足以运行该工作流。",
-      "creditsDescription": "该工作流需要积分运行。",
-      "howManyCredits": "您想要多少积分？",
-      "videosEstimate": "~{count} 个视频*",
-      "templateNote": "*使用 Wan Fun Control 模板生成",
-      "buy": "购买",
-      "purchaseError": "购买失败",
-      "purchaseErrorDetail": "购买积分失败：{error}",
-      "unknownError": "发生未知错误"
+  "maintenance": {
+    "None": "无",
+    "OK": "确定",
+    "Skipped": "跳过",
+    "allOk": "未检测到任何问题。",
+    "confirmTitle": "你确定吗？",
+    "consoleLogs": "控制台日志",
+    "detected": "检测到",
+    "error": {
+      "cannotContinue": "无法继续 - 仍有错误",
+      "defaultDescription": "运行维护任务时发生错误。",
+      "taskFailed": "任务运行失败。",
+      "toastTitle": "任务错误"
     },
-    "creditsAvailable": "积分可用",
-    "refreshes": "于 {date} 刷新",
-    "eventType": "事件类型",
-    "details": "详情",
-    "time": "时间",
-    "additionalInfo": "附加信息",
-    "model": "模型",
-    "added": "已添加",
-    "accountInitialized": "账户已初始化",
-    "unified": {
-      "message": "积分已合并",
-      "tooltip": "我们统一了 Comfy 的支付方式。现在全部使用 Comfy 积分 :\n- 合作节点（API节点）\n- Cloud 工作流\n\n您现有的合作伙伴节点积分将自动转换为 Comfy 积分。"
+    "refreshing": "刷新中",
+    "showManual": "显示维护任务",
+    "status": "状态",
+    "terminalDefaultMessage": "当你运行一个故障排除命令时，任何输出都会在这里显示。",
+    "title": "维护",
+    "unsafeMigration": {
+      "action": "使用下方的 \"基本路径\" 维护将路径移动到安全位置。",
+      "appInstallDir": "您当前的 ComfyUI 基本路径位于 ComfyUI Desktop 应用程序包中，程序更新时会删除该文件夹。选择安装文件夹之外的目录，例如 Documents/ComfyUI。",
+      "generic": "您当前的 ComfyUI 基本路径所在的位置可能会在更新期间被删除或修改。为避免数据丢失，请将其移至安全文件夹。",
+      "oneDrive": "您当前的 ComfyUI 基本路径在 OneDrive上，这可能会导致同步问题和意外的数据丢失。选择一个不受 OneDrive 管理的本地文件夹。",
+      "title": "检测到安装路径不安全",
+      "updaterCache": "您当前的 ComfyUI 基本路径位于 ComfyUI 更新缓存中，程序更新时会清除该缓存。为您的数据选择一个不同的位置。"
     }
   },
-  "subscription": {
-    "title": "订阅",
-    "titleUnsubscribed": "订阅 Comfy Cloud",
-    "comfyCloud": "Comfy 云",
-    "comfyCloudLogo": "Comfy Cloud Logo",
-    "beta": "测试版",
-    "perMonth": "美元 / 月",
-    "usdPerMonth": "USD / mo",
-    "renewsDate": "将于 {date} 续订",
-    "expiresDate": "于 {date} 过期",
-    "manageSubscription": "管理订阅",
-    "partnerNodesBalance": "\"合作伙伴节点\"积分余额",
-    "partnerNodesDescription": "用于运行商业/专有模型",
-    "totalCredits": "总积分",
-    "viewUsageHistory": "查看使用历史",
-    "addApiCredits": "添加API额度",
-    "addCredits": "添加积分",
-    "monthlyCreditsRollover": "这些积分将结转到下个月",
-    "monthlyBonusDescription": "每月积分奖励",
-    "prepaidDescription": "预付款额度",
-    "prepaidCreditsInfo": "单独购买且不会过期的积分",
-    "creditsRemainingThisMonth": "本月剩余积分",
-    "creditsRemainingThisYear": "今年剩余积分",
-    "creditsYouveAdded": "你获得的积分",
-    "monthlyCreditsInfo": "积分每月刷新，不会保留",
-    "viewMoreDetailsPlans": "查看有关订阅和定价的更多信息",
-    "nextBillingCycle": "下一个计费周期",
-    "yourPlanIncludes": "您的计划包括：",
-    "viewMoreDetails": "查看更多详情",
-    "learnMore": "了解更多",
-    "billedMonthly": "每月付款",
-    "billedYearly": "{total} 每年付款",
-    "monthly": "月度",
-    "yearly": "年度",
-    "tierNameYearly": "{name} 年度",
-    "messageSupport": "消息支持",
-    "invoiceHistory": "发票历史",
-    "benefits": {
-      "benefit1": "合作伙伴节点的月度积分 — 按需充值",
-      "benefit2": "每个队列最长运行 30 分钟"
+  "manager": {
+    "actions": "操作",
+    "allMissingNodesInstalled": "所有缺失节点已成功安装",
+    "applyChanges": "应用更改",
+    "basicInfo": "基本信息",
+    "changingVersion": "将版本从 {from} 更改为 {to}",
+    "clickToFinishSetup": "点击",
+    "conflicts": {
+      "conflictInfoTitle": "为什么会发生这种情况？",
+      "conflictMessages": {
+        "accelerator": "GPU/加速器不受支持（可用：{current}，要求：{required}）",
+        "banned": "该软件包因安全原因被禁用",
+        "comfyui_version": "ComfyUI 版本不匹配（当前：{current}，要求：{required}）",
+        "frontend_version": "前端版本不匹配（当前：{current}，要求：{required}）",
+        "generic": "兼容性问题（当前：{current}，要求：{required}）",
+        "import_failed": "导入失败",
+        "os": "操作系统不受支持（当前：{current}，要求：{required}）",
+        "pending": "安全验证待定 - 无法验证兼容性"
+      },
+      "conflicts": "冲突",
+      "description": "我们检测到您的部分扩展与新版 ComfyUI 存在冲突。更新后，依赖这些扩展的工作流可能会被破坏。",
+      "enableAnyway": "仍然启用",
+      "extensionAtRisk": "有风险的扩展",
+      "importFailedExtensions": "导入失败的扩展",
+      "info": "如果继续更新，冲突的扩展将被自动禁用。您可以随时在 ComfyUI 管理器中查看和管理它们。",
+      "installAnyway": "仍然安装",
+      "title": "检测到节点包问题！",
+      "understood": "我已了解",
+      "warningBanner": {
+        "button": "了解更多...",
+        "message": "这些扩展需要与您当前环境不同版本的系统包。安装它们可能会覆盖核心依赖，并影响其他扩展或工作流。",
+        "title": "部分扩展因与当前环境不兼容而被禁用"
+      },
+      "warningTooltip": "该软件包可能与您当前的环境存在兼容性问题"
     },
-    "yearlyDiscount": "20% 减免",
-    "tiers": {
-      "founder": {
-        "name": "Founder's Edition"
+    "createdBy": "创建者",
+    "dependencies": "依赖关系",
+    "disabledNodesWontUpdate": "已禁用的节点不会被更新",
+    "discoverCommunityContent": "发现社区制作的节点包，扩展等等...",
+    "downloads": "下载",
+    "emptyState": {
+      "allInstalled": {
+        "message": "你还没有安装任何扩展。",
+        "title": "未安装扩展"
       },
-      "standard": {
-        "name": "Standard"
+      "conflicting": {
+        "message": "你的所有扩展均兼容。",
+        "title": "未检测到冲突"
       },
-      "creator": {
-        "name": "Creator"
+      "missing": {
+        "message": "所有必需节点均已安装。",
+        "title": "无缺失节点"
       },
-      "pro": {
-        "name": "Pro"
+      "updateAvailable": {
+        "message": "你的所有扩展都是最新的。",
+        "title": "全部已是最新"
+      },
+      "workflow": {
+        "message": "此工作流未使用任何扩展节点。",
+        "title": "工作流中无扩展"
       }
     },
-    "required": {
-      "title": "订阅",
-      "waitingForSubscription": "请在新标签页中完成订阅。我们会自动检测到您已完成！",
-      "subscribe": "订阅"
+    "enablePackToChangeVersion": "启用此包以更改版本",
+    "errorConnecting": "连接到Comfy节点注册表时出错。",
+    "extensionsSuccessfullyInstalled": "扩展已成功安装并可使用！",
+    "failed": "失败 ({count})",
+    "failedToInstall": "安装失败",
+    "filter": {
+      "disabled": "已禁用",
+      "enabled": "已启用",
+      "nodePack": "节点包"
     },
-    "subscribeToRun": "订阅",
-    "subscribeToRunFull": "订阅 Run",
-    "subscribeNow": "立即订阅",
-    "subscribeToComfyCloud": "订阅 Comfy Cloud",
-    "description": "选择最适合您的订阅计划",
-    "haveQuestions": "对企业级有疑问？",
-    "contactUs": "联系我们",
-    "viewEnterprise": "查看企业",
-    "partnerNodesCredits": "合作伙伴节点积分",
-    "plansAndPricing": "订阅和定价",
-    "managePlan": "管理订阅",
-    "upgrade": "升级",
-    "mostPopular": "最受欢迎",
-    "currentPlan": "当前订阅计划",
-    "subscribeTo": "订阅 {plan}",
-    "monthlyCreditsLabel": "每月积分",
-    "yearlyCreditsLabel": "总共年度积分",
-    "maxDurationLabel": "运行单个工作流的最大时长",
-    "gpuLabel": "RTX 6000 Pro (96GB VRAM)",
-    "addCreditsLabel": "随时获取更多积分",
-    "customLoRAsLabel": "导入您的 Lora",
-    "videoEstimateLabel": "可使用  Wan Fun Control 模板生成 5 秒视频的数量",
-    "videoEstimateHelp": "这是什么？",
-    "videoEstimateExplanation": "这些预估基于 Wan Fun Control 生成 5 秒视频。",
-    "videoEstimateTryTemplate": "试试 Wan Fun Control template →",
-    "upgradePlan": "升级订阅",
-    "upgradeTo": "升级到 {plan}",
-    "changeTo": "更改为 {plan}",
-    "maxDuration": {
-      "standard": "30 分钟",
-      "creator": "30 分钟",
-      "pro": "1 小时",
-      "founder": "30 分钟"
-    }
-  },
-  "userSettings": {
-    "title": "我的用户设置",
-    "accountSettings": "用户设置",
-    "name": "名称",
-    "email": "电子邮件",
-    "provider": "登录方式",
-    "notSet": "未设置",
-    "updatePassword": "更新密码"
-  },
-  "selectionToolbox": {
-    "executeButton": {
-      "tooltip": "执行到选定的输出节点（用橙色边框高亮显示）",
-      "disabledTooltip": "未选择输出节点"
+    "gettingInfo": "正在获取信息...",
+    "importFailedGenericError": "软件包导入失败。请查看控制台获取更多信息。",
+    "inWorkflow": "在工作流中",
+    "infoPanelEmpty": "点击一个项目查看信息",
+    "installAllMissingNodes": "安装所有缺失节点",
+    "installError": "安装错误",
+    "installSelected": "安装选定",
+    "installationQueue": "安装队列",
+    "installingDependencies": "正在安装依赖项...",
+    "lastUpdated": "最后更新",
+    "latestVersion": "最新",
+    "legacyManagerSearchTip": "在找 ComfyUI-Manager？你可以通过启动 ComfyUI 并添加 --enable-manager-legacy-ui 参数来启用旧版管理器界面。",
+    "legacyManagerUI": "使用传统界面",
+    "legacyManagerUIDescription": "如需使用传统管理器界面，请以 --enable-manager-legacy-ui 参数启动 ComfyUI",
+    "legacyMenuNotAvailable": "传统管理器菜单不可用，已切换为新管理器菜单。",
+    "license": "许可证",
+    "loadingVersions": "正在加载版本...",
+    "mixedSelectionMessage": "无法对混合选择执行批量操作",
+    "nav": {
+      "allExtensions": "全部扩展",
+      "allInWorkflow": "全部在：{workflowName}",
+      "allInstalled": "全部已安装",
+      "conflicting": "存在冲突",
+      "inWorkflowSection": "工作流中",
+      "installedSection": "已安装",
+      "missingNodes": "缺失节点",
+      "notInstalled": "未安装",
+      "updatesAvailable": "有可用更新"
     },
-    "Set Group Nodes to Never": "将分组节点设置为从不",
-    "Bypass Group Nodes": "绕过分组节点",
-    "Set Group Nodes to Always": "将分组节点设置为始终"
-  },
-  "widgets": {
-    "selectModel": "选择模型",
-    "uploadSelect": {
-      "placeholder": "请选择...",
-      "placeholderImage": "请选择图片...",
-      "placeholderAudio": "请选择音频...",
-      "placeholderVideo": "请选择视频...",
-      "placeholderModel": "请选择模型...",
-      "placeholderUnknown": "请选择媒体..."
+    "nightlyVersion": "每夜",
+    "noDescription": "无可用描述",
+    "noNodesFound": "未找到节点",
+    "noNodesFoundDescription": "无法解析包的节点，或者该包仅为前端扩展，没有任何节点。",
+    "noResultsFound": "未找到符合您搜索的结果。",
+    "nodePack": "节点包",
+    "nodePackInfo": "节点包信息",
+    "notAvailable": "不可用",
+    "packInstall": {
+      "nodeIdRequired": "安装需要节点 ID"
     },
-    "valueControl": {
-      "header": {
-        "prefix": "自动更新该值",
-        "after": "之后",
-        "before": "之前",
-        "postfix": "正在运行工作流："
-      },
-      "linkToGlobal": "连接到",
-      "linkToGlobalSeed": "全局值",
-      "linkToGlobalDesc": "唯一值连接到全局值控制设置",
-      "randomize": "随机值",
-      "randomizeDesc": "每次运行后随机化该值",
-      "increment": "递增值",
-      "incrementDesc": "数值+1或切换到下一个选项",
-      "decrement": "递减值",
-      "decrementDesc": "数值-1或切换到上一个选项",
-      "fixed": "固定值",
-      "fixedDesc": "数值不变",
-      "editSettings": "改变控制设置"
-    }
+    "packsSelected": "选定的包",
+    "repository": "仓库",
+    "restartToApplyChanges": "要应用更改，请重新启动ComfyUI",
+    "restartingBackend": "正在重启后端以应用更改...",
+    "searchPlaceholder": "搜索",
+    "selectVersion": "选择版本",
+    "selected": "已选择",
+    "sort": {
+      "created": "最新",
+      "downloads": "最受欢迎",
+      "publisher": "出版商",
+      "updated": "最近更新"
+    },
+    "status": {
+      "active": "活跃",
+      "banned": "已禁止",
+      "conflicting": "冲突",
+      "deleted": "已删除",
+      "flagged": "已标记",
+      "importFailed": "安装错误",
+      "pending": "待定",
+      "unknown": "未知"
+    },
+    "title": "自定义节点管理器",
+    "toFinishSetup": "以完成设置",
+    "totalNodes": "节点总数",
+    "tryAgainLater": "请稍后再试。",
+    "tryDifferentSearch": "请尝试不同的搜索查询。",
+    "tryUpdate": "尝试更新",
+    "tryUpdateTooltip": "从库中拉取更新。测试版本可能有无法自动检测到更新。",
+    "uninstall": "卸载",
+    "uninstallSelected": "卸载所选",
+    "uninstalling": "正在卸载",
+    "update": "更新",
+    "updateAll": "全部更新",
+    "updateSelected": "更新所选",
+    "updatingAllPacks": "更新所有包",
+    "version": "版本"
   },
-  "widgetFileUpload": {
-    "dropPrompt": "将文件拖到此处或",
-    "browseFiles": "浏览文件"
+  "maskEditor": {
+    "activateLayer": "活跃层",
+    "applyToWholeImage": "应用到图像整体",
+    "baseImageLayer": "基础图像层",
+    "baseLayerPreview": "基础图像层预览",
+    "black": "黑",
+    "brushSettings": "笔刷设置",
+    "brushShape": "笔刷形状",
+    "clear": "清除",
+    "clickToResetZoom": "点击重置缩放",
+    "colorSelectSettings": "色彩选取设置",
+    "colorSelector": "色彩选取",
+    "fillOpacity": "填充不透明度",
+    "hardness": "硬度",
+    "imageLayer": "图像层",
+    "invert": "反转",
+    "layers": "图层",
+    "livePreview": "实时预览",
+    "maskBlendingOptions": "遮罩混合设置",
+    "maskLayer": "遮罩层",
+    "maskOpacity": "遮罩不透明度",
+    "maskTolerance": "遮罩阈值",
+    "method": "方法",
+    "mirrorHorizontal": "水平翻转",
+    "mirrorVertical": "垂直翻转",
+    "negative": "负面",
+    "opacity": "不透明度",
+    "paintBucketSettings": "填充设置",
+    "paintLayer": "绘画层",
+    "redo": "重做",
+    "resetToDefault": "重置为默认",
+    "rotateLeft": "向左旋转",
+    "rotateRight": "向右旋转",
+    "selectionOpacity": "选取不透明度",
+    "smoothingPrecision": "预测平滑",
+    "stepSize": "间距",
+    "stopAtMask": "遇到遮罩时停止",
+    "thickness": "厚度",
+    "title": "遮罩编辑器",
+    "tolerance": "阈值",
+    "undo": "撤回",
+    "white": "白"
   },
-  "nodeHelpPage": {
-    "inputs": "输入",
-    "outputs": "输出",
-    "type": "类型",
-    "moreHelp": "如需更多帮助，请访问",
-    "documentationPage": "文档页面",
-    "loadError": "加载帮助失败：{error}"
+  "mediaAsset": {
+    "actions": {
+      "copyJobId": "复制任务ID",
+      "delete": "删除",
+      "download": "下载",
+      "exportWorkflow": "导出工作流",
+      "insertAsNodeInWorkflow": "作为节点插入到工作流",
+      "inspect": "查看资产",
+      "more": "更多设置",
+      "moreOptions": "更多选项",
+      "openWorkflow": "在新标签页中读取工作流",
+      "seeMoreOutputs": "查看更多输出",
+      "zoom": "放大"
+    },
+    "assetDeletedSuccessfully": "资产删除成功",
+    "deleteAssetDescription": "此资产将被永久删除。",
+    "deleteAssetTitle": "删除此资产？",
+    "deleteSelectedDescription": "{count} 项资产将被永久删除。",
+    "deleteSelectedTitle": "删除所选资产？",
+    "deletingImportedFilesCloudOnly": "删除导入文件仅支持云版本",
+    "failedToCreateNode": "创建节点失败",
+    "failedToDeleteAsset": "删除资产失败",
+    "failedToExportWorkflow": "工作流导出失败",
+    "jobIdToast": {
+      "copied": "已复制",
+      "error": "错误",
+      "jobIdCopied": "任务 ID 已复制到剪贴板",
+      "jobIdCopyFailed": "复制队列 ID 失败"
+    },
+    "noJobIdFound": "该资产不包含任务ID",
+    "noWorkflowDataFound": "该资产不包含工作流数据",
+    "nodeAddedToWorkflow": "{nodeType} 节点已添加到工作流",
+    "nodeTypeNotFound": "节点类型 {nodeType} 不存在",
+    "selection": {
+      "assetsDeletedSuccessfully": "已成功删除 {count} 个资产",
+      "deleteSelected": "删除",
+      "deleteSelectedAll": "全部删除",
+      "deselectAll": "取消全选",
+      "downloadSelected": "下载",
+      "downloadSelectedAll": "全部下载",
+      "downloadStarted": "正在下载 {count} 个文件...",
+      "downloadsStarted": "开始下载 {count} 个文件",
+      "exportStarted": "正在为{count}个文件准备ZIP导出",
+      "exportWorkflowAll": "导出所有工作流",
+      "failedToAddNodes": "添加节点到工作流失败",
+      "failedToDeleteAssets": "未能删除所选资产",
+      "insertAllAssetsAsNodes": "将所有资源作为节点插入",
+      "multipleSelectedAssets": "已选择多个资源",
+      "noWorkflowsFound": "所选资源中未找到工作流数据",
+      "noWorkflowsToExport": "未找到可导出的工作流数据",
+      "nodesAddedToWorkflow": "已添加 {count} 个节点到工作流",
+      "openWorkflowAll": "打开所有工作流",
+      "partialAddNodesSuccess": "成功添加 {succeeded} 个，失败 {failed} 个",
+      "partialDeleteSuccess": "{succeeded} 删除成功, {failed} 失败",
+      "partialWorkflowsExported": "成功导出 {succeeded} 个，失败 {failed} 个",
+      "partialWorkflowsOpened": "已打开 {succeeded} 个工作流，失败 {failed} 个",
+      "selectedCount": "已选择资产：{count}",
+      "workflowsExported": "成功导出 {count} 个工作流",
+      "workflowsOpened": "已在新标签页打开 {count} 个工作流"
+    },
+    "unsupportedFileType": "加载节点不支持该类型文件",
+    "workflowExportedSuccessfully": "工作流导出成功！",
+    "workflowOpenedInNewTab": "工作流已在新标签页中打开"
   },
-  "whatsNewPopup": {
-    "learnMore": "了解更多",
-    "later": "Later",
-    "noReleaseNotes": "暂无更新说明。"
+  "menu": {
+    "autoQueue": "自动执行",
+    "batchCount": "批次数量",
+    "batchCountTooltip": "工作流生成次数",
+    "clear": "清空工作流",
+    "clipspace": "打开剪贴板",
+    "customNodesManager": "自定义节点管理器",
+    "dark": "深色",
+    "disabled": "禁用",
+    "disabledTooltip": "工作流将不会自动执行",
+    "execute": "执行",
+    "fullscreen": "全屏",
+    "help": "说明",
+    "helpAndFeedback": "帮助与反馈",
+    "hideMenu": "隐藏菜单",
+    "instant": "实时",
+    "instantTooltip": "工作流将会在生成完成后立即执行",
+    "interrupt": "取消当前任务",
+    "light": "淺色",
+    "manageExtensions": "管理扩展功能",
+    "onChange": "更改时",
+    "onChangeTooltip": "一旦进行更改，工作流将添加到执行队列",
+    "queue": "队列面板",
+    "refresh": "刷新节点",
+    "resetView": "重置视图",
+    "run": "运行",
+    "runWorkflow": "运行工作流（Shift排在前面）",
+    "runWorkflowDisabled": "工作流包含不支持的节点（已用红色突出显示）。删除这些节点以运行工作流。",
+    "runWorkflowFront": "运行工作流（排在前面）",
+    "settings": "设定",
+    "showMenu": "显示菜单",
+    "stopRunInstant": "立即停止运行",
+    "stopRunInstantTooltip": "停止运行",
+    "theme": "主题",
+    "toggleBottomPanel": "底部面板"
   },
-  "breadcrumbsMenu": {
-    "duplicate": "复制",
-    "clearWorkflow": "清除工作流",
-    "deleteWorkflow": "删除工作流",
-    "deleteBlueprint": "删除蓝图",
-    "enterNewName": "输入新名称",
-    "missingNodesWarning": "工作流包含不支持的节点（红色突出显示）。"
-  },
-  "shortcuts": {
-    "shortcuts": "快捷键",
-    "essentials": "常用",
-    "viewControls": "视图控制",
-    "manageShortcuts": "管理快捷键",
-    "noKeybinding": "无快捷键",
-    "keyboardShortcuts": "键盘快捷键",
-    "subcategories": {
-      "workflow": "工作流",
-      "node": "节点",
-      "queue": "队列",
-      "view": "视图",
-      "panelControls": "面板控制"
-    }
+  "menuLabels": {
+    "About ComfyUI": "关于ComfyUI",
+    "Assets": "资产",
+    "Bottom Panel": "底部面板",
+    "Browse Templates": "浏览模板",
+    "Bypass/Unbypass Selected Nodes": "忽略/取消忽略选定节点",
+    "Canvas Performance": "画布性能",
+    "Canvas Toggle Lock": "切换视图锁定",
+    "Check for Custom Node Updates": "检查自定义节点更新",
+    "Check for Updates": "检查更新",
+    "Clear Pending Tasks": "清除待处理任务",
+    "Clear Workflow": "清除工作流",
+    "Clipspace": "剪贴空间",
+    "Close Current Workflow": "关闭当前工作流",
+    "Collapse/Expand Selected Nodes": "折叠/展开选定节点",
+    "Comfy-Org Discord": "Comfy-Org Discord",
+    "ComfyUI Docs": "ComfyUI 文档",
+    "ComfyUI Forum": "ComfyUI 论坛",
+    "ComfyUI Issues": "ComfyUI 问题",
+    "Contact Support": "联系支持",
+    "Convert Selection to Subgraph": "将选中内容转换为子工作流",
+    "Convert selected nodes to group node": "将选中节点转换为组节点",
+    "Copy": "复制",
+    "Custom Nodes (Legacy)": "自定义节点（旧版）",
+    "Custom Nodes Manager": "自定义节点管理器",
+    "Decrease Brush Size in MaskEditor": "在 MaskEditor 中减小笔刷大小",
+    "Delete Selected Items": "删除选定的项目",
+    "Desktop User Guide": "桌面端用户手册",
+    "Duplicate Current Workflow": "复制当前工作流",
+    "Edit": "编辑",
+    "Edit Subgraph Widgets": "编辑子工作流组件",
+    "Exit Subgraph": "退出子工作流",
+    "Experimental: Browse Model Assets": "实验性：浏览模型资产",
+    "Experimental: Enable AssetAPI": "实验性：启用 AssetAPI",
+    "Experimental: Enable Nodes 2_0": "实验性：启用 Nodes 2.0",
+    "Export": "导出",
+    "Export (API)": "导出 (API)",
+    "File": "文件",
+    "Fit Group To Contents": "适应组内容",
+    "Focus Mode": "专注模式",
+    "Group Selected Nodes": "将选中节点转换为组节点",
+    "Help": "帮助",
+    "Help Center": "帮助中心",
+    "Increase Brush Size in MaskEditor": "在 MaskEditor 中增大笔刷大小",
+    "Install Missing Custom Nodes": "安装缺失的自定义节点",
+    "Interrupt": "中断",
+    "Job History": "任务历史",
+    "Load Default Workflow": "加载默认工作流",
+    "Lock Canvas": "锁定画布",
+    "Manage group nodes": "管理组节点",
+    "Manager": "管理器",
+    "Manager Menu (Legacy)": "管理菜单（旧版）",
+    "Minimap": "小地图",
+    "Mirror Horizontal in MaskEditor": "在蒙版编辑器中水平翻转",
+    "Mirror Vertical in MaskEditor": "在蒙版编辑器中垂直翻转",
+    "Model Library": "模型库",
+    "Move Selected Nodes Down": "下移所选节点",
+    "Move Selected Nodes Left": "左移所选节点",
+    "Move Selected Nodes Right": "右移所选节点",
+    "Move Selected Nodes Up": "上移所选节点",
+    "Mute/Unmute Selected Nodes": "静音/取消静音选定节点",
+    "New": "新建",
+    "Next Opened Workflow": "下一个打开的工作流",
+    "Node Library": "节点库",
+    "Node Links": "节点连接",
+    "Open": "打开",
+    "Open 3D Viewer (Beta) for Selected Node": "为选中节点打开3D查看器（测试版）",
+    "Open Color Picker in MaskEditor": "在 MaskEditor 中打开取色器",
+    "Open Custom Nodes Folder": "打开自定义节点文件夹",
+    "Open DevTools": "打开开发者工具",
+    "Open Inputs Folder": "打开输入文件夹",
+    "Open Logs Folder": "打开日志文件夹",
+    "Open Mask Editor for Selected Node": "为选中节点打开 Mask 编辑器",
+    "Open Models Folder": "打开模型文件夹",
+    "Open Outputs Folder": "打开输出文件夹",
+    "Open Sign In Dialog": "打开登录对话框",
+    "Open extra_model_paths_yaml": "打开 extra_model_paths.yaml",
+    "Paste": "粘贴",
+    "Pin/Unpin Selected Items": "固定/取消固定选定项目",
+    "Pin/Unpin Selected Nodes": "固定/取消固定选定节点",
+    "Previous Opened Workflow": "上一个打开的工作流",
+    "Publish": "发布",
+    "Queue Prompt": "执行提示词",
+    "Queue Prompt (Front)": "执行提示词 (优先执行)",
+    "Queue Selected Output Nodes": "将所选输出节点加入队列",
+    "Quit": "退出",
+    "Redo": "重做",
+    "Refresh Node Definitions": "刷新节点定义",
+    "Reinstall": "重装",
+    "Rename": "重命名",
+    "Reset View": "重置视图",
+    "Resize Selected Nodes": "调整选定节点的大小",
+    "Restart": "重启",
+    "Rotate Left in MaskEditor": "在蒙版编辑器中向左旋转",
+    "Rotate Right in MaskEditor": "在蒙版编辑器中向右旋转",
+    "Save": "保存",
+    "Save As": "另存为",
+    "Select All": "全选",
+    "Set Subgraph Description": "设置子图描述",
+    "Set Subgraph Search Aliases": "设置子图搜索别名",
+    "Show Keybindings Dialog": "显示快捷键对话框",
+    "Show Model Selector (Dev)": "显示模型选择器（开发用）",
+    "Show Settings Dialog": "显示设置对话框",
+    "Sign Out": "退出登录",
+    "Toggle App Mode": "切换 App 模式",
+    "Toggle Essential Bottom Panel": "切换基础底部面板",
+    "Toggle Logs Bottom Panel": "切换日志底部面板",
+    "Toggle Queue Panel V2": "切换队列面板 V2",
+    "Toggle Search Box": "切换搜索框",
+    "Toggle Terminal Bottom Panel": "切换终端底部面板",
+    "Toggle Theme (Dark/Light)": "切换主题（暗/亮）",
+    "Toggle View Controls Bottom Panel": "切换视图控制底部面板",
+    "Toggle promotion of hovered widget": "切换悬停小部件的提升",
+    "Undo": "撤销",
+    "Ungroup selected group nodes": "解散选中组节点",
+    "Unload Models": "卸载模型",
+    "Unload Models and Execution Cache": "卸载模型和执行缓存",
+    "Unlock Canvas": "解除锁定画布",
+    "Unpack the selected Subgraph": "解包选中子工作流",
+    "View": "视图",
+    "Workflows": "工作流",
+    "Zoom In": "放大画面",
+    "Zoom Out": "缩小画面",
+    "Zoom to fit": "缩放以适应",
+    "linearMode_appModeToolbar_apps": "linearMode.appModeToolbar.apps"
   },
   "minimap": {
     "nodeColors": "节点颜色",
-    "showLinks": "显示连接",
-    "showGroups": "显示框架/分组",
     "renderBypassState": "渲染绕过状态",
-    "renderErrorState": "渲染错误状态"
+    "renderErrorState": "渲染错误状态",
+    "showGroups": "显示框架/分组",
+    "showLinks": "显示连接"
   },
-  "cloudOnboarding": {
-    "survey": {
-      "title": "云调研",
-      "placeholder": "调查问题占位符",
-      "steps": {
-        "familiarity": "你对 ComfyUI 有多熟悉？",
-        "purpose": "您将主要使用 ComfyUI 做什么？",
-        "industry": "您的主要行业是什么？",
-        "making": "你打算做什么？"
-      },
-      "questions": {
-        "familiarity": "你对 ComfyUI 有多熟悉？",
-        "purpose": "您主要将使用 ComfyUI 做什么？",
-        "industry": "您的主要行业是什么？",
-        "making": "你打算做什么？"
-      },
-      "options": {
-        "familiarity": {
-          "new": "ComfyUI 新手（从未使用过）",
-          "starting": "刚刚开始（正在学习教程）",
-          "basics": "熟练掌握基础知识",
-          "advanced": "高级用户（自定义工作流）",
-          "expert": "专家（帮助他人）"
-        },
-        "purpose": {
-          "personal": "个人项目 / 爱好",
-          "community": "社区贡献（节点、工作流等）",
-          "client": "客户工作（自由职业）",
-          "inhouse": "我自己的工作场所（内部）",
-          "research": "学术研究"
-        },
-        "industry": {
-          "film_tv_animation": "电影、电视与动画",
-          "gaming": "游戏",
-          "marketing": "营销与广告",
-          "architecture": "架构",
-          "product_design": "产品与平面设计",
-          "fine_art": "美术与插画",
-          "software": "软件与技术",
-          "education": "教育",
-          "other": "其他",
-          "otherPlaceholder": "请指定"
-        },
-        "making": {
-          "images": "图片",
-          "video": "视频与动画",
-          "3d": "3D 资产",
-          "audio": "音频 / 音乐",
-          "custom_nodes": "自定义节点和工作流"
-        }
-      }
+  "missingModelsDialog": {
+    "acceptTerms": "接受条款",
+    "customModelsInstruction": "您需要手动查找并下载这些模型。请在网上搜索（如 Civitai 或 Hugging Face），或联系原始工作流提供者。",
+    "customModelsWarning": "其中一些是我们无法识别的自定义模型。",
+    "description": "此工作流需要您尚未下载的模型。",
+    "doNotAskAgain": "不再显示此消息",
+    "downloadAll": "全部下载",
+    "downloadAvailable": "下载可用项",
+    "footerDescription": "请下载并将这些模型放入正确的文件夹。\n画布上缺少模型的节点会以红色高亮显示。",
+    "gotIt": "好的，知道了",
+    "reEnableInSettings": "可在{link}中重新启用",
+    "reEnableInSettingsLink": "设置",
+    "title": "此工作流缺少模型",
+    "totalSize": "总下载大小："
+  },
+  "missingNodes": {
+    "cloud": {
+      "description": "该工作流包含 Comfy Cloud 目前不支持的节点",
+      "gotIt": "好的",
+      "learnMore": "查看更多",
+      "priorityMessage": "我们已经标记这些节点，将会优先支持它们。",
+      "replacementInstruction": "同时，如果可能的话，将这些节点（红色突出显示）替换为已经支持的节点，或者尝试不同的工作流。",
+      "title": "Comfy Cloud 目前不支持这些节点"
     },
-    "forgotPassword": {
-      "title": "忘记密码",
-      "instructions": "请输入您的电子邮件地址，我们将向您发送重置密码的链接。",
-      "emailLabel": "电子邮件",
-      "emailPlaceholder": "输入您的邮箱",
-      "sendResetLink": "发送重置链接",
-      "backToLogin": "返回登录",
-      "didntReceiveEmail": "没有收到邮件？请联系我们：",
-      "passwordResetSent": "密码重置邮件已发送",
-      "passwordResetError": "发送密码重置邮件失败，请重试。",
-      "emailRequired": "邮箱为必填项"
-    },
-    "privateBeta": {
-      "title": "云服务目前处于内测阶段",
-      "desc": "登录以加入等候名单。轮到您时我们会通知您。已经收到通知？登录开始使用 Cloud。"
-    },
-    "start": {
-      "title": "几秒内开始创作",
-      "desc": "无需任何设置。可在任何设备上使用。",
-      "explain": "一次生成多个输出。轻松分享工作流。",
-      "learnAboutButton": "了解云服务",
-      "wantToRun": "想在本机运行 ComfyUI 吗？",
-      "download": "下载 ComfyUI"
-    },
-    "checkingStatus": "正在检查您的账户状态...",
-    "retrying": "正在重试...",
-    "retry": "重试",
-    "authTimeout": {
-      "title": "连接时间过长",
-      "message": "我们无法连接到 ComfyUI 云端服务。这可能是由于网络连接缓慢或临时服务问题导致的。",
-      "restart": "退出并重试",
-      "troubleshooting": "常见原因：",
-      "causes": [
-        "Corporate firewall or proxy blocking authentication services",
-        "VPN or network restrictions",
-        "Browser extensions interfering with requests",
-        "Regional network limitations",
-        "Try a different browser or network"
-      ],
-      "technicalDetails": "技术细节",
-      "helpText": "需要帮助？联系",
-      "supportLink": "支持"
+    "oss": {
+      "description": "该工作流包含您未安装的自定义节点",
+      "replacementInstruction": "安装这些节点后运行此工作流，或者用已安装的节点替换它们。缺失的节点在画布上以红色突出显示。",
+      "title": "该工作流含有缺失节点"
     }
   },
-  "cloudFooter_needHelp": "需要帮助？",
-  "cloudStart_title": "几秒钟内开始创作",
-  "cloudStart_desc": "无需任何设置。可在任何设备上使用。",
-  "cloudStart_explain": "一次性生成多个输出。轻松分享工作流。",
-  "cloudStart_learnAboutButton": "了解云服务",
-  "cloudStart_wantToRun": "想在本地运行 ComfyUI 吗？",
-  "cloudStart_download": "下载 ComfyUI",
-  "cloudWaitlist_questionsText": "有问题？联系我们",
-  "cloudWaitlist_contactLink": "这里",
-  "cloudSorryContactSupport_title": "抱歉，请联系客服",
-  "cloudPrivateBeta_title": "云服务目前处于内测阶段",
-  "cloudPrivateBeta_desc": "登录以加入等候名单。轮到您时我们会通知您。已经收到通知？登录开始使用 Cloud。",
-  "cloudForgotPassword_title": "忘记密码",
-  "cloudForgotPassword_instructions": "请输入您的电子邮件地址，我们将向您发送重置密码的链接。",
-  "cloudForgotPassword_emailLabel": "电子邮件",
-  "cloudForgotPassword_emailPlaceholder": "输入您的邮箱",
-  "cloudForgotPassword_sendResetLink": "发送重置链接",
-  "cloudForgotPassword_backToLogin": "返回登录",
-  "cloudForgotPassword_didntReceiveEmail": "没有收到邮件？",
-  "cloudForgotPassword_emailRequired": "邮箱是必填项",
-  "cloudForgotPassword_passwordResetSent": "密码重置邮件已发送",
-  "cloudForgotPassword_passwordResetError": "发送密码重置邮件失败",
-  "cloudSurvey_steps_familiarity": "你对 ComfyUI 有多熟悉？",
-  "cloudSurvey_steps_purpose": "您将主要使用 ComfyUI 做什么？",
-  "cloudSurvey_steps_industry": "您的主要行业是什么？",
-  "cloudSurvey_steps_making": "你打算做什么？",
-  "assetBrowser": {
-    "allCategory": "全部{category}",
-    "allModels": "全部模型",
-    "assetCollection": "资产合集",
-    "assets": "资产",
-    "baseModels": "基础模型",
-    "browseAssets": "浏览资产",
-    "checkpoints": "模型",
-    "civitaiLinkExample": "<strong>案例：</strong> <a href=\"https://civitai.com/api/download/models/833921?type=Model&format=SafeTensor\" target=\"_blank\" class=\"text-muted-foreground\">https://civitai.com/api/download/models/833921?type=Model&format=SafeTensor</a>",
-    "civitaiLinkExampleStrong": "案例:",
-    "civitaiLinkExampleUrl": "https://civitai.com/models/10706/luisap-z-image-and-qwen-pixel-art-refiner?modelVersionId=2225295",
-    "civitaiLinkLabel": "Civitai 模型 <span class=\"font-bold italic\">download</span> link",
-    "civitaiLinkLabelDownload": "下载",
-    "civitaiLinkPlaceholder": "粘贴链接到此",
-    "confirmModelDetails": "确认模型信息",
-    "connectionError": "请检查您的网络连接后重试",
-    "errorFileTooLarge": "允许执行文件的文件大小限制",
-    "errorFormatNotAllowed": "仅允许 SafeTensor 格式",
-    "errorModelTypeNotSupported": "不支持该类型的模型",
-    "errorUnknown": "发生了意外错误",
-    "errorUnsafePickleScan": "CivitAI 在该文件中检测到不安全代码",
-    "errorUnsafeVirusScan": "CivitAI 在该文件中检测到木马或可疑文件",
-    "errorUploadFailed": "导入资产失败，请重试。",
-    "failedToCreateNode": "创建节点失败。请重试或查看控制台获取详细信息。",
-    "fileFormats": "文件格式",
-    "fileName": "文件名",
-    "fileSize": "文件大小",
-    "filterBy": "筛选方式",
-    "findInLibrary": "模型在模型库的{type}区里",
-    "finish": "完成",
-    "genericLinkPlaceholder": "粘贴链接到这",
-    "jobId": "任务ID",
-    "loadingModels": "正在加载{type}...",
-    "maxFileSize": "最大文件大小：{size}",
-    "maxFileSizeValue": "1 GB",
-    "modelAssociatedWithLink": "您提供的链接的模型：",
-    "modelName": "模型名",
-    "modelNamePlaceholder": "输入该模型的名称",
-    "modelTypeSelectorLabel": "这是什么类型的模型？",
-    "modelTypeSelectorPlaceholder": "选择模型类型",
-    "modelUploaded": "模型导入成功！🎉",
-    "noAssetsFound": "未找到资产",
-    "noModelsInFolder": "此文件夹中没有可用的{type}",
-    "notSureLeaveAsIs": "不确定？那就放着不管吧",
-    "onlyCivitaiUrlsSupported": "仅支持 Civitai 链接",
-    "ownership": "所属",
-    "ownershipAll": "全部",
-    "ownershipMyModels": "我的模型",
-    "ownershipPublicModels": "公共模型",
-    "providerCivitai": "Civitai",
-    "providerHuggingFace": "Hugging Face",
-    "noValidSourceDetected": "检测不到有效的导入源",
-    "selectFrameworks": "选择框架",
-    "selectModelType": "选择模型类型",
-    "selectProjects": "选择项目",
-    "sortAZ": "A-Z",
-    "sortBy": "排序方式",
-    "sortingType": "排序类型",
-    "sortPopular": "最受欢迎",
-    "sortRecent": "最近",
-    "sortZA": "Z-A",
-    "tags": "标签",
-    "tagsHelp": "按逗号区分标签",
-    "tagsPlaceholder": "例如：模型, checkpoint",
-    "tryAdjustingFilters": "请尝试调整搜索或筛选条件",
-    "unknown": "未知",
-    "unsupportedUrlSource": "仅支持来自 {sources} URL 的模型",
-    "upgradeFeatureDescription": "该功能仅 Creator 和 Pro 订阅计划可用",
-    "upgradeToUnlockFeature": "升级订阅解锁该功能",
-    "upload": "导入",
-    "uploadFailed": "导入失败",
-    "uploadingModel": "正在导入模型...",
-    "uploadModel": "导入模型",
-    "uploadModelDescription1": "粘贴 Civitai 模型下载链接，将其添加到库中。",
-    "uploadModelDescription1Generic": "站贴模型下载链接，将其添加到模型库中。",
-    "uploadModelDescription2": "目前仅支持 <a href=\"https://civitai.com\" target=\"_blank\" class=\"text-muted-foreground\">https://civitai.com</a> 链接。",
-    "uploadModelDescription2Link": "https://civitai.com/models",
-    "uploadModelDescription2Generic": "仅支持来自以下提供服务的 URL ：",
-    "uploadModelDescription3": "最大文件大小：<strong>1 GB</strong>",
-    "uploadModelFailedToRetrieveMetadata": "检索元数据失败。请检查连接并重试。",
-    "uploadModelFromCivitai": "从 Civitai 导入模型",
-    "uploadModelGeneric": "导入模型",
-    "uploadModelHelpFooterText": "需要查找 URL 的帮助吗？点击下面的教程视频。",
-    "uploadModelHelpVideo": "上传模型视频",
-    "uploadModelHowDoIFindThis": "如何找到这个？",
-    "uploadSuccess": "模型导入成功！",
-    "ariaLabel": {
-      "assetCard": "{name} - {type}资产",
-      "loadingAsset": "正在加载资产"
-    },
-    "media": {
-      "threeDModelPlaceholder": "3D 模型",
-      "audioPlaceholder": "音频"
-    },
-    "deletion": {
-      "header": "删除该模型？",
-      "body": "从资产库永久移除这个模型。",
-      "inProgress": "正在删除 {assetName}...",
-      "complete": "{assetName} 已经删除。",
-      "failed": "{assetName} 无法删除。"
-    },
-    "rename": {
-      "failed": "无法重命名资产。"
+  "nightly": {
+    "badge": {
+      "label": "预览版",
+      "tooltip": "您正在使用 ComfyUI 的夜间版本。请使用反馈按钮分享您对这些功能的看法。"
     }
   },
-  "mediaAsset": {
-    "deleteAssetTitle": "删除此资产？",
-    "deleteAssetDescription": "此资产将被永久删除。",
-    "deleteSelectedTitle": "删除所选资产？",
-    "deleteSelectedDescription": "{count} 项资产将被永久删除。",
-    "assetDeletedSuccessfully": "资产删除成功",
-    "deletingImportedFilesCloudOnly": "删除导入文件仅支持云版本",
-    "failedToDeleteAsset": "删除资产失败",
-    "actions": {
-      "inspect": "查看资产",
-      "more": "更多设置",
-      "seeMoreOutputs": "查看更多输出",
-      "addToWorkflow": "添加到当前工作流",
-      "download": "下载",
-      "openWorkflow": "在新标签页中读取工作流",
-      "exportWorkflow": "导出工作流",
+  "nightlySurvey": {
+    "accept": "好的，我来帮忙！",
+    "description": "您一直在使用此功能。能否花一点时间分享您的反馈？",
+    "dontAskAgain": "不再询问",
+    "loadError": "加载问卷失败。请稍后再试。",
+    "notNow": "暂不",
+    "title": "帮助我们改进"
+  },
+  "nodeCategories": {
+    "": "",
+    "3d": "3d",
+    "3d_models": "3D模型",
+    "BFL": "BFL",
+    "Bria": "Bria",
+    "ByteDance": "字节跳动",
+    "ElevenLabs": "ElevenLabs",
+    "Gemini": "Gemini",
+    "Grok": "Grok",
+    "HitPaw": "HitPaw",
+    "Ideogram": "Ideogram",
+    "Kling": "Kling",
+    "LTXV": "LTXV",
+    "Luma": "Luma",
+    "Magnific": "Magnific",
+    "Meshy": "Meshy",
+    "MiniMax": "MiniMax",
+    "Moonvalley Marey": "Moonvalley Marey",
+    "OpenAI": "OpenAI",
+    "PixVerse": "PixVerse",
+    "Recraft": "Recraft",
+    "Rodin": "Rodin",
+    "Runway": "Runway",
+    "Sora": "Sora",
+    "Stability AI": "Stability AI",
+    "Tencent": "Tencent",
+    "Topaz": "Topaz",
+    "Tripo": "Tripo",
+    "Veo": "Veo",
+    "Vidu": "Vidu",
+    "Wan": "Wan万相",
+    "WaveSpeed": "WaveSpeed",
+    "_for_testing": "_用于测试",
+    "advanced": "高级",
+    "animation": "动画",
+    "api": "API",
+    "api node": "api 节点",
+    "attention_experiments": "注意力实验",
+    "audio": "音频",
+    "batch": "批处理",
+    "camera": "相机",
+    "chroma_radiance": "chroma_radiance",
+    "clip": "CLIP",
+    "combine": "组合",
+    "compositing": "合成",
+    "cond pair": "条件对",
+    "cond single": "条件单",
+    "conditioning": "条件",
+    "context": "上下文",
+    "controlnet": "ControlNet",
+    "create": "创建",
+    "custom_sampling": "自定义采样",
+    "dataset": "dataset",
+    "debug": "调试",
+    "deprecated": "已弃用",
+    "edit_models": "编辑模型",
+    "flux": "Flux",
+    "gligen": "GLIGEN",
+    "guidance": "引导",
+    "guiders": "引导器",
+    "hooks": "约束",
+    "image": "图像",
+    "inpaint": "局部重绘",
+    "instructpix2pix": "InstructPix2Pix",
+    "kandinsky5": "kandinsky5",
+    "latent": "Latent",
+    "loaders": "加载器",
+    "logic": "逻辑",
+    "lotus": "lotus",
+    "ltxv": "LTXV",
+    "mask": "遮罩",
+    "model": "模型",
+    "model_merging": "模型合并",
+    "model_patches": "模型微调",
+    "model_specific": "模型特定",
+    "noise": "噪波",
+    "operations": "操作",
+    "photomaker": "PhotoMaker",
+    "postprocessing": "后处理",
+    "preprocessors": "预处理器",
+    "primitive": "基础",
+    "qwen": "Qwen千问",
+    "samplers": "采样器",
+    "sampling": "采样",
+    "save": "保存",
+    "schedulers": "调度器",
+    "scheduling": "调度",
+    "sd": "sd",
+    "sd3": "SD3",
+    "shader": "shader",
+    "sigmas": "Sigmas",
+    "stable_cascade": "StableCascade",
+    "string": "字符串",
+    "style_model": "风格模型",
+    "text": "文本",
+    "textgen": "textgen",
+    "training": "训练",
+    "transform": "变换",
+    "unet": "U-Net",
+    "upscale_diffusion": "放大扩散",
+    "upscaling": "放大",
+    "utils": "工具",
+    "video": "视频",
+    "video_models": "视频模型",
+    "zimage": "zimage"
+  },
+  "nodeErrors": {
+    "content": "节点内容错误",
+    "header": "节点头错误",
+    "render": "节点渲染错误",
+    "slots": "节点接口错误",
+    "widgets": "节点组件错误"
+  },
+  "nodeFilters": {
+    "hideDeprecated": "隐藏已弃用节点",
+    "hideDeprecatedDescription": "隐藏标记为已弃用的节点，除非明确启用",
+    "hideDevOnly": "隐藏仅开发者可见节点",
+    "hideDevOnlyDescription": "隐藏标记为仅开发者可见的节点，除非启用开发者模式",
+    "hideExperimental": "隐藏实验性节点",
+    "hideExperimentalDescription": "隐藏标记为实验性的节点，除非明确启用",
+    "hideSubgraph": "隐藏子图节点",
+    "hideSubgraphDescription": "暂时从节点库和搜索中隐藏子图节点"
+  },
+  "nodeHelpPage": {
+    "documentationPage": "文档页面",
+    "inputs": "输入",
+    "loadError": "加载帮助失败：{error}",
+    "moreHelp": "如需更多帮助，请访问",
+    "outputs": "输出",
+    "type": "类型"
+  },
+  "nodeReplacement": {
+    "compatibleAlternatives": "兼容替代项",
+    "installMissingNodes": "安装缺失节点",
+    "installationRequired": "需要安装",
+    "instructionMessage": "您必须安装这些节点或用已安装的替代项替换它们，才能运行工作流。缺失的节点会在画布上以{red}高亮显示。有些节点无法替换，必须通过节点管理器安装。",
+    "notReplaceable": "需要安装",
+    "openNodeManager": "打开节点管理器",
+    "quickFixAvailable": "可用快速修复",
+    "redHighlight": "红色",
+    "replaceAll": "全部替换",
+    "replaceAllWarning": "将替换此组中所有可用节点。",
+    "replaceFailed": "替换节点失败",
+    "replaceNode": "替换节点",
+    "replaceSelected": "替换已选（{count}）",
+    "replaceWarning": "此操作将永久修改工作流。如不确定，请先保存副本。",
+    "replaceable": "可替换",
+    "replaced": "已替换",
+    "replacedAllNodes": "已替换 {count} 种节点类型",
+    "replacedNode": "已替换节点：{nodeType}",
+    "selectAll": "全选",
+    "skipForNow": "暂时跳过",
+    "swapNodesGuide": "以下节点可以自动替换为兼容的替代项。",
+    "swapNodesTitle": "交换节点",
+    "unknownNode": "未知",
+    "willBeReplacedBy": "此节点将被替换为："
+  },
+  "nodeTemplates": {
+    "enterName": "输入名称",
+    "saveAsTemplate": "另存为模板"
+  },
+  "notSupported": {
+    "continue": "继续",
+    "continueTooltip": "我确定我的设备是受支持的",
+    "illustrationAlt": "Sad girl illustration",
+    "learnMore": "了解更多",
+    "message": "仅支持以下设备：",
+    "reportIssue": "报告问题",
+    "supportedDevices": {
+      "macos": "MacOS (M1 或更高版本)",
+      "windows": "Windows (支持 CUDA 的 Nvidia GPU)"
+    },
+    "title": "您的设备不受支持"
+  },
+  "painter": {
+    "background": "背景",
+    "brush": "画笔",
+    "clear": "清除",
+    "color": "取色器",
+    "eraser": "橡皮擦",
+    "hardness": "硬度",
+    "height": "高度",
+    "size": "光标大小",
+    "tool": "工具",
+    "uploadError": "上传绘图图像失败：{status} - {statusText}",
+    "width": "宽度"
+  },
+  "progressToast": {
+    "allDownloadsCompleted": "所有下载已完成",
+    "downloadingModel": "正在下载模型...",
+    "downloadsFailed": "{count} 个下载失败",
+    "failed": "失败",
+    "filter": {
+      "all": "全部",
+      "completed": "已完成",
+      "failed": "失败"
+    },
+    "finished": "已完成",
+    "importingModels": "正在导入模型",
+    "noImportsInQueue": "队列中没有 {filter}",
+    "pending": "待处理",
+    "progressCount": "{completed} / {total}"
+  },
+  "queue": {
+    "completedIn": "{duration} 后完成",
+    "inQueue": "正在执行...",
+    "initializingAlmostReady": "初始化中 - 即将完成",
+    "jobAddedToQueue": "任务添加到队列",
+    "jobDetails": {
+      "computeHoursUsed": "计算耗时",
+      "errorMessage": "报错信息",
+      "estimatedFinishIn": "预计完成于",
+      "estimatedStartIn": "预计开始于",
+      "eta": {
+        "minutes": "~{count} 分钟 | ~{count} 分钟",
+        "minutesRange": "~{lo}-{hi} 分钟",
+        "seconds": "~{count} 秒 | ~{count} 秒",
+        "secondsRange": "~{lo}-{hi} 秒"
+      },
+      "failedAfter": "失败于",
+      "generatedOn": "生成于",
+      "header": "任务细节",
+      "jobId": "任务ID",
+      "queuePosition": "队列位置",
+      "queuePositionValue": "在您前方有 ~{count} 个任务 | 在您前方有 ~{count} 个任务",
+      "queuedAt": "执行于",
+      "report": "反馈",
+      "timeElapsed": "耗时",
+      "totalGenerationTime": "总生成时间",
+      "workflow": "工作流"
+    },
+    "jobHistory": "任务历史",
+    "jobList": {
+      "sortComputeHoursUsed": "计算用时（最先）",
+      "sortMostRecent": "最新",
+      "sortTotalGenerationTime": "生成时间（最慢）",
+      "undated": "无日期"
+    },
+    "jobMenu": {
+      "addToCurrentWorkflow": "添加到当前工作流",
+      "cancelJob": "取消任务",
+      "copyErrorMessage": "复制报错信息",
       "copyJobId": "复制任务ID",
-      "delete": "删除"
+      "delete": "删除",
+      "deleteAsset": "删除资产",
+      "download": "下载",
+      "exportWorkflow": "导出工作流",
+      "inspectAsset": "查看资产",
+      "openAsWorkflowNewTab": "在新标签页中读取工作流",
+      "openWorkflowNewTab": "在新标签页中打开工作流",
+      "removeJob": "移除任务",
+      "reportError": "反馈报错"
     },
-    "jobIdToast": {
-      "jobIdCopied": "任务 ID 已复制到剪贴板",
-      "jobIdCopyFailed": "复制队列 ID 失败",
-      "copied": "已复制",
-      "error": "错误"
-    },
-    "selection": {
-      "selectedCount": "已选择资产：{count}",
-      "deselectAll": "取消全选",
-      "downloadSelected": "下载",
-      "deleteSelected": "删除",
-      "downloadStarted": "正在下载 {count} 个文件...",
-      "downloadsStarted": "开始下载 {count} 个文件",
-      "assetsDeletedSuccessfully": "已成功删除 {count} 个资产",
-      "failedToDeleteAssets": "未能删除所选资产",
-      "partialDeleteSuccess": "{succeeded} 删除成功, {failed} 失败"
-    },
-    "noJobIdFound": "该资产不包含任务ID",
-    "unsupportedFileType": "加载节点不支持该类型文件",
-    "nodeTypeNotFound": "节点类型 {nodeType} 不存在",
-    "failedToCreateNode": "创建节点失败",
-    "nodeAddedToWorkflow": "{nodeType} 节点已添加到工作流",
-    "noWorkflowDataFound": "该资产不包含工作流数据",
-    "workflowOpenedInNewTab": "工作流已在新标签页中打开",
-    "failedToExportWorkflow": "工作流导出失败",
-    "workflowExportedSuccessfully": "工作流导出成功！"
+    "jobQueueing": "作业排队中",
+    "toggleJobHistory": "切换任务历史"
   },
-  "actionbar": {
-    "dockToTop": "停靠到顶部",
-    "feedback": "反馈",
-    "feedbackTooltip": "反馈"
+  "releaseToast": {
+    "description": "在此更新中尝试最新的改进和功能。",
+    "newVersionAvailable": "新版本可用！",
+    "skip": "跳过",
+    "update": "更新",
+    "whatsNew": "新功能?"
   },
-  "desktopDialogs": {
-    "": {
-      "title": "无效对话框",
-      "message": "提供的对话 ID 无效。",
-      "buttons": {
-        "Close": "关闭"
+  "rightSidePanel": {
+    "addFavorite": "收藏",
+    "advancedInputs": "高级输入",
+    "bypass": "忽略",
+    "color": "节点颜色",
+    "enterSubgraph": "进入子图",
+    "errorHelp": "如需更多帮助，请{github}或{support}",
+    "errorHelpGithub": "提交 GitHub 问题",
+    "errorHelpSupport": "联系我们的支持团队",
+    "errors": "错误",
+    "executionErrorOccurred": "执行过程中发生错误。请查看“错误”标签获取详情。",
+    "fallbackGroupTitle": "分组",
+    "fallbackNodeTitle": "节点",
+    "favorites": "已收藏输入",
+    "favoritesNone": "暂无已收藏输入",
+    "favoritesNoneDesc": "你收藏的输入会显示在这里",
+    "favoritesNoneHint": "在参数标签页，点击任意输入项的 {moreIcon} 可将其添加到这里",
+    "favoritesNoneTooltip": "星标组件后可快速访问，无需选择节点",
+    "globalSettings": {
+      "canvas": "画布",
+      "connectionLinks": "连接线",
+      "gridSpacing": "网格间距",
+      "linkShape": "连线形状",
+      "nodes": "节点",
+      "nodes2": "节点 2.0",
+      "searchPlaceholder": "搜索快捷设置...",
+      "showAdvanced": "显示高级参数",
+      "showAdvancedTooltip": "这是一个重要设置，开启后将显示所有节点的高级参数",
+      "showConnectedLinks": "显示已连接的连线",
+      "showInfoBadges": "显示信息徽章",
+      "showToolbox": "选中时显示工具箱",
+      "snapNodesToGrid": "节点吸附到网格",
+      "title": "全局设置",
+      "viewAllSettings": "查看所有设置"
+    },
+    "groupSettings": "分组设置",
+    "groups": "分组",
+    "hideAdvancedInputsButton": "隐藏高级输入",
+    "hideInput": "隐藏输入",
+    "info": "信息",
+    "inputs": "输入",
+    "inputsNone": "无输入",
+    "inputsNoneTooltip": "节点没有输入",
+    "locateNode": "在画布上定位节点",
+    "missingNodePacks": {
+      "applyChanges": "应用更改",
+      "cloudMessage": "此工作流需要 Comfy Cloud 上尚未提供的自定义节点。",
+      "collapse": "收起",
+      "expand": "展开",
+      "installAll": "全部安装",
+      "installNodePack": "安装节点包",
+      "installed": "已安装",
+      "installing": "正在安装...",
+      "ossManagerDisabledHint": "要安装缺失的节点，请先在你的 Python 环境中运行 {pipCmd} 安装 Node Manager，然后使用 {flag} 参数重启 ComfyUI。",
+      "ossMessage": "此工作流使用了你尚未安装的自定义节点。",
+      "searchInManager": "在节点管理器中搜索",
+      "title": "缺失节点包",
+      "unknownPack": "未知包",
+      "unsupportedTitle": "不支持的节点包",
+      "viewInManager": "在管理器中查看"
+    },
+    "mute": "禁用",
+    "noErrors": "无错误",
+    "noSelection": "选择一个节点查看其属性信息。",
+    "nodeState": "节点状态",
+    "nodes": "节点",
+    "nodesNoneDesc": "暂无节点",
+    "noneSearchDesc": "没有符合搜索条件的项目",
+    "normal": "正常",
+    "parameters": "参数",
+    "pinned": "顶固",
+    "promptErrors": {
+      "no_prompt": {
+        "desc": "发送到服务器的工作流数据为空。这可能是一个意外的系统错误。"
+      },
+      "prompt_no_outputs": {
+        "desc": "工作流中没有包含任何输出节点（例如：保存图像、预览图像），无法生成结果。"
+      },
+      "server_error_cloud": {
+        "desc": "服务器遇到意外错误。请稍后再试。"
+      },
+      "server_error_local": {
+        "desc": "服务器遇到意外错误。请检查服务器日志。"
       }
+    },
+    "properties": "属性",
+    "removeFavorite": "取消收藏",
+    "resetAllParameters": "重置所有参数",
+    "resetToDefault": "重置为默认值",
+    "seeError": "查看错误",
+    "settings": "设置",
+    "showAdvancedInputsButton": "显示高级输入",
+    "showInput": "显示输入",
+    "title": "无选中节点 | 选中了 1 个节点 | 选中了 {count} 个节点",
+    "togglePanel": "开关属性面板",
+    "workflowOverview": "工作流总览"
+  },
+  "secrets": {
+    "addSecret": "添加机密",
+    "createdAt": "创建于 {date}",
+    "deleteConfirmMessage": "确定要删除“{name}”吗？此操作无法撤销。",
+    "deleteConfirmTitle": "删除机密",
+    "description": "机密信息会被加密，用于存储诸如 API 密钥等敏感数据。",
+    "descriptionUsage": "在此处存储您的令牌，以便从支持的提供商下载私有和受限模型。",
+    "editSecret": "编辑机密",
+    "errors": {
+      "duplicateName": "已存在同名机密",
+      "duplicateProvider": "该提供商的机密已存在",
+      "nameRequired": "名称为必填项",
+      "nameTooLong": "名称长度不能超过 255 个字符",
+      "providerRequired": "提供商为必填项",
+      "secretValueRequired": "机密值为必填项"
+    },
+    "lastUsed": "上次使用 {date}",
+    "modelProviders": "模型提供商",
+    "name": "名称",
+    "namePlaceholder": "例如：我的 API 密钥",
+    "noSecrets": "尚未存储任何机密。添加您的第一个 API 密钥以开始使用。",
+    "provider": "提供商",
+    "providerHint": "可选。选择提供商可自动使用令牌。",
+    "secretValue": "机密值",
+    "secretValueHint": "该值将被加密，之后无法再次查看。",
+    "secretValueHintEdit": "如需保留当前值，请留空。",
+    "secretValuePlaceholder": "请输入您的 API 密钥",
+    "secretValuePlaceholderEdit": "输入新值以更改",
+    "title": "API 密钥与机密"
+  },
+  "selectionToolbox": {
+    "Bypass Group Nodes": "绕过分组节点",
+    "Set Group Nodes to Always": "将分组节点设置为始终",
+    "Set Group Nodes to Never": "将分组节点设置为从不",
+    "executeButton": {
+      "disabledTooltip": "未选择输出节点",
+      "tooltip": "执行到选定的输出节点（用橙色边框高亮显示）"
     }
   },
+  "serverConfig": {
+    "modifiedConfigs": "您已修改以下服务器配置。重启以应用更改。",
+    "restart": "重启",
+    "restartRequiredToastDetail": "重启软件应用设置。",
+    "restartRequiredToastSummary": "需要重启",
+    "revertChanges": "撤销更改"
+  },
+  "serverConfigCategories": {
+    "Attention": "注意力",
+    "CUDA": "CUDA",
+    "Cache": "缓存",
+    "Directories": "目录",
+    "General": "常规",
+    "Inference": "推理",
+    "Memory": "内存",
+    "Network": "网络",
+    "Preview": "预览"
+  },
+  "serverConfigItems": {
+    "cache-classic": {
+      "name": "使用经典缓存系统"
+    },
+    "cache-lru": {
+      "name": "使用 LRU 缓存，最多缓存 N 个节点结果。",
+      "tooltip": "可能会使用更多的 RAM/VRAM。"
+    },
+    "cpu-vae": {
+      "name": "在 CPU 上运行 VAE"
+    },
+    "cross-attention-method": {
+      "name": "交叉注意力方法"
+    },
+    "cuda-device": {
+      "name": "要使用的 CUDA 设备索引"
+    },
+    "cuda-malloc": {
+      "name": "使用 CUDA malloc 进行内存分配"
+    },
+    "default-hashing-function": {
+      "name": "模型文件的默认哈希函数"
+    },
+    "deterministic": {
+      "name": "使 pytorch 在可以时使用较慢的确定性算法。",
+      "tooltip": "请注意，这可能不会在所有情况下使图像具有确定性。"
+    },
+    "directml": {
+      "name": "DirectML 设备索引"
+    },
+    "disable-all-custom-nodes": {
+      "name": "禁用加载所有自定义节点。"
+    },
+    "disable-ipex-optimize": {
+      "name": "禁用 IPEX 优化"
+    },
+    "disable-metadata": {
+      "name": "禁用在文件中保存提示元数据。"
+    },
+    "disable-smart-memory": {
+      "name": "禁用智能内存管理",
+      "tooltip": "强制 ComfyUI 在可以时将模型从 VRAM 移出到常规 RAM。"
+    },
+    "disable-xformers": {
+      "name": "禁用 xFormers 优化"
+    },
+    "dont-print-server": {
+      "name": "不将服务器输出打印到控制台。"
+    },
+    "dont-upcast-attention": {
+      "name": "不使用 upcast-attention"
+    },
+    "enable-cors-header": {
+      "name": "启用 CORS header：使用 \"*\" 代表所有来源或指定域名"
+    },
+    "enable-manager-legacy-ui": {
+      "name": "使用旧版管理器UI",
+      "tooltip": "是用旧版 ComfyUI-Manager UI。"
+    },
+    "fast": {
+      "name": "启用一些未经测试且可能降低质量的优化。"
+    },
+    "force-channels-last": {
+      "name": "强制使用 channels-last 内存格式"
+    },
+    "force-upcast-attention": {
+      "name": "强制 upcast-attention"
+    },
+    "global-precision": {
+      "name": "全局浮点精度",
+      "tooltip": "全局浮点精度"
+    },
+    "input-directory": {
+      "name": "输入目录"
+    },
+    "listen": {
+      "name": "主机：要监听的IP地址"
+    },
+    "log-level": {
+      "name": "日志详细级别"
+    },
+    "max-upload-size": {
+      "name": "最大上传大小 (MB)"
+    },
+    "output-directory": {
+      "name": "输出目录"
+    },
+    "port": {
+      "name": "端口：要监听的端口"
+    },
+    "preview-method": {
+      "name": "用于潜空间预览的方法"
+    },
+    "preview-size": {
+      "name": "预览图像的大小"
+    },
+    "reserve-vram": {
+      "name": "保留 VRAM (GB)",
+      "tooltip": "设置您希望为操作系统/其他软件保留的 VRAM （GB）。默认会根据系统类型保留一定数量。"
+    },
+    "text-encoder-precision": {
+      "name": "文本编码器精度",
+      "tooltip": "文本编码器精度"
+    },
+    "tls-certfile": {
+      "name": "TLS 证书文件：HTTPS 的 TLS 证书文件路径"
+    },
+    "tls-keyfile": {
+      "name": "TLS 密钥文件：HTTPS 的 TLS 密钥文件路径"
+    },
+    "unet-precision": {
+      "name": "UNET 精度",
+      "tooltip": "UNET 精度"
+    },
+    "vae-precision": {
+      "name": "VAE 精度",
+      "tooltip": "VAE 精度"
+    },
+    "vram-management": {
+      "name": "VRAM 管理模式"
+    }
+  },
+  "serverStart": {
+    "copyAllTooltip": "全部复制",
+    "copySelectionTooltip": "复制所选内容",
+    "errorMessage": "无法启动 ComfyUI 桌面版",
+    "installation": {
+      "title": "正在安装 ComfyUI"
+    },
+    "openLogs": "打开日志",
+    "process": {
+      "error": "无法启动 ComfyUI 桌面版",
+      "initial-state": "加载中...",
+      "python-setup": "正在设置 Python 环境...",
+      "ready": "完成中...",
+      "starting-server": "正在启动 ComfyUI 服务器..."
+    },
+    "reportIssue": "报告问题",
+    "showTerminal": "显示终端",
+    "title": "启动 ComfyUI",
+    "troubleshoot": "故障排除"
+  },
+  "settingsCategories": {
+    "3D": "3D",
+    "3DViewer": "3D查看器",
+    "API Nodes": "API 节点",
+    "About": "关于",
+    "Appearance": "外观",
+    "BrushAdjustment": "画笔调整",
+    "Camera": "相机",
+    "Canvas": "画布",
+    "Canvas Navigation": "画布导航",
+    "ColorPalette": "色彩主题",
+    "Comfy": "Comfy",
+    "Comfy-Desktop": "Comfy桌面版",
+    "ContextMenu": "上下文菜单",
+    "Credits": "积分",
+    "CustomColorPalettes": "自定义色彩主题",
+    "DevMode": "开发模式",
+    "EditTokenWeight": "编辑令牌权重",
+    "Error System": "错误系统",
+    "Execution": "执行",
+    "Extension": "扩展",
+    "General": "常规",
+    "Graph": "画面",
+    "Group": "组",
+    "Keybinding": "快捷键",
+    "Light": "光照",
+    "Link": "连线",
+    "LinkRelease": "释放链接",
+    "LiteGraph": "画面",
+    "Load 3D": "加载3D",
+    "Locale": "区域设置",
+    "Mask Editor": "遮罩编辑器",
+    "Menu": "菜单",
+    "ModelLibrary": "模型库",
+    "Node": "节点",
+    "Node Library": "节点库",
+    "Node Search Box": "节点搜索框",
+    "Node Widget": "节点组件",
+    "NodeLibrary": "节点库",
+    "Nodes 2_0": "Nodes 2.0",
+    "Notification Preferences": "通知偏好",
+    "Other": "其他",
+    "PLY": "PLY",
+    "PlanCredits": "计划与积分",
+    "Pointer": "指针",
+    "Queue": "队列",
+    "QueueButton": "执行按钮",
+    "Reroute": "重新路由",
+    "RerouteBeta": "转接点 Beta",
+    "Scene": "场景",
+    "Secrets": "密钥",
+    "Server": "服务器",
+    "Server-Config": "服务器配置",
+    "Settings": "设置",
+    "Sidebar": "侧边栏",
+    "Tree Explorer": "树形浏览器",
+    "UV": "UV",
+    "User": "用户",
+    "Validation": "验证",
+    "Vue Nodes": "Nodes 2.0",
+    "VueNodes": "Nodes 2.0",
+    "Window": "窗口",
+    "Workflow": "工作流",
+    "Workspace": "工作区"
+  },
+  "shape": {
+    "CARD": "卡片",
+    "arrow": "箭头",
+    "box": "方框",
+    "circle": "圆形",
+    "default": "默认",
+    "round": "圆角"
+  },
+  "shortcuts": {
+    "essentials": "常用",
+    "keyboardShortcuts": "键盘快捷键",
+    "manageShortcuts": "管理快捷键",
+    "noKeybinding": "无快捷键",
+    "shortcuts": "快捷键",
+    "subcategories": {
+      "node": "节点",
+      "panelControls": "面板控制",
+      "queue": "队列",
+      "view": "视图",
+      "workflow": "工作流"
+    },
+    "viewControls": "视图控制"
+  },
+  "sideToolbar": {
+    "activeJobStatus": "当前任务：{status}",
+    "assets": "资产",
+    "backToAssets": "返回所有资产",
+    "browseTemplates": "浏览示例模板",
+    "downloads": "下载",
+    "folderView": {
+      "errorDetail": "无法获取此任务的输出。请重试。",
+      "errorSummary": "加载输出失败"
+    },
+    "generatedAssetsHeader": "生成的资源",
+    "helpCenter": "帮助中心",
+    "importedAssetsHeader": "已导入资源",
+    "labels": {
+      "assets": "资产",
+      "console": "控制台",
+      "generated": "已生成",
+      "imported": "已导入",
+      "menu": "菜单",
+      "models": "模型",
+      "nodes": "节点",
+      "queue": "队列",
+      "templates": "模板",
+      "workflows": "工作流"
+    },
+    "logout": "登出",
+    "mediaAssets": {
+      "filter3D": "3D",
+      "filterAudio": "音频",
+      "filterImage": "图像",
+      "filterText": "文本",
+      "filterVideo": "视频",
+      "sortFastestFirst": "生成时间（最快）",
+      "sortLongestFirst": "生成时间（最慢）",
+      "sortNewestFirst": "最新",
+      "sortOldestFirst": "最旧",
+      "title": "媒体资产",
+      "viewSettings": "查看设置"
+    },
+    "modelLibrary": "模型库",
+    "newBlankWorkflow": "创建空白工作流",
+    "noFilesFound": "未找到文件",
+    "noFilesFoundMessage": "上传文件或生成内容以在此处查看",
+    "noGeneratedFiles": "未找到生成的文件",
+    "noImportedFiles": "未找到导入的文件",
+    "nodeLibrary": "节点库",
+    "nodeLibraryTab": {
+      "allNodes": "全部节点",
+      "blueprints": "蓝图",
+      "custom": "自定义",
+      "essentials": "基础",
+      "filter": "筛选",
+      "filterOptions": {
+        "blueprints": "蓝图",
+        "comfyNodes": "Comfy 节点",
+        "extensions": "扩展",
+        "partnerNodes": "合作伙伴节点"
+      },
+      "groupBy": "分组方式",
+      "groupStrategies": {
+        "category": "类别",
+        "categoryDesc": "按节点类别分组",
+        "module": "模块",
+        "moduleDesc": "按模块来源分组",
+        "source": "来源",
+        "sourceDesc": "按来源类型分组（核心，自定义，API）"
+      },
+      "noBookmarkedNodes": "暂无收藏",
+      "resetView": "重置视图为默认",
+      "sections": {
+        "bookmarked": "已收藏",
+        "comfyBlueprints": "Comfy 蓝图",
+        "comfyNodes": "Comfy 节点",
+        "extensions": "扩展",
+        "favoriteNode": "收藏节点",
+        "favorites": "收藏夹",
+        "myBlueprints": "我的蓝图",
+        "partnerNodes": "合作伙伴节点",
+        "subgraphBlueprints": "子图蓝图",
+        "unfavoriteNode": "取消收藏节点"
+      },
+      "sortBy": {
+        "alphabetical": "字母顺序",
+        "alphabeticalDesc": "在分组内按字母顺序排序",
+        "original": "原始顺序",
+        "originalDesc": "保持原始顺序"
+      },
+      "sortMode": "排序模式"
+    },
+    "nodes": "节点",
+    "openWorkflow": "在本地文件系统中打开工作流",
+    "queue": "队列",
+    "queueProgressOverlay": {
+      "activeJobs": "{count} 个活跃任务",
+      "activeJobsShort": "{count} 个活动任务 | {count} 个活动任务",
+      "activeJobsSuffix": "活跃任务",
+      "cancelJobTooltip": "取消任务",
+      "clearAllJobsTooltip": "取消所有正在运行的任务",
+      "clearHistory": "清除任务记录",
+      "clearHistoryDialogAssetsNote": "这些任务生成的资产不会被删除，并且始终可以在资产面板中查看。",
+      "clearHistoryDialogDescription": "以下所有已完成或失败的任务将从队列面板中删除。",
+      "clearHistoryDialogTitle": "确定要清除任务记录？",
+      "clearHistoryMenuAssetsNote": "媒体资源不会被删除。",
+      "clearQueueTooltip": "清理队列",
+      "clearQueued": "清除已执行",
+      "colonPercent": "：{percent}",
+      "currentNode": "当前节点：",
+      "dockedJobHistory": "停靠的作业历史",
+      "expandCollapsedQueue": "展开任务队列",
+      "filterAllWorkflows": "全部工作流",
+      "filterBy": "筛选方式",
+      "filterCurrentWorkflow": "当前工作流",
+      "filterJobs": "筛选任务",
+      "inlineTotalLabel": "总计",
+      "interruptAll": "中断全部正在运行的任务",
+      "jobCompleted": "作业已完成",
+      "jobFailed": "作业失败",
+      "jobQueue": "任务队列",
+      "jobsAddedToQueue": "{count} 个作业已加入队列",
+      "jobsCompleted": "{count} 任务完成 | {count} 任务完成",
+      "jobsFailed": "{count} 任务失败 | {count} 任务失败",
+      "moreOptions": "更多设置",
+      "noActiveJobs": "无活跃任务",
+      "preview": "预览",
+      "queuedJobsLabel": "{count} 个已排队",
+      "queuedSuffix": "已执行",
+      "running": "运行中",
+      "runningJobsLabel": "{count} 个正在运行",
+      "runningQueuedSummary": "{running}，{queued}",
+      "searchJobs": "搜索...",
+      "showAssets": "显示资产",
+      "showAssetsPanel": "显示资产面板",
+      "showRunProgressBar": "显示运行进度条",
+      "sortBy": "排序方式",
+      "sortJobs": "排序任务",
+      "stubClipTextEncode": "CLIP文本编码：",
+      "title": "队列进度",
+      "total": "全部：{percent}",
+      "viewAllJobs": "查看全部任务",
+      "viewGrid": "网格视图",
+      "viewJobHistory": "查看任务记录",
+      "viewList": "列表视图"
+    },
+    "searchAssets": "搜索资产",
+    "sidebar": "侧边栏",
+    "templates": "模板",
+    "themeToggle": "切换主题",
+    "workflowTab": {
+      "confirmDelete": "您确定要删除此工作流吗？",
+      "confirmDeleteTitle": "删除工作流？",
+      "confirmOverwrite": "下面的文件已经存在。您想要覆盖它吗？",
+      "confirmOverwriteTitle": "覆盖现有文件？",
+      "deleteFailed": "尝试删除工作流失败。",
+      "deleteFailedTitle": "删除失败",
+      "deleted": "工作流已删除",
+      "dirtyClose": "以下文件已被更改。您想在关闭之前保存它们吗？",
+      "dirtyCloseHint": "按住 Shift 关闭而不提示",
+      "dirtyCloseTitle": "保存更改？",
+      "workflowTreeType": {
+        "bookmarks": "书签",
+        "browse": "浏览",
+        "open": "打开"
+      }
+    },
+    "workflows": "工作流"
+  },
+  "subgraphStore": {
+    "blueprintName": "子工作流名称",
+    "blueprintNamePrompt": "子图名称：",
+    "cannotDeleteGlobal": "无法删除已安装的蓝图",
+    "confirmDelete": "此操作将永久从您的库中移除该子工作流",
+    "confirmDeleteTitle": "删除子工作流？",
+    "disconnected": "已断开连接",
+    "enterDescription": "输入描述",
+    "enterSearchAliases": "输入搜索别名（用逗号分隔）",
+    "hidden": "隐藏/嵌套参数",
+    "hideAll": "全部隐藏",
+    "linked": "（已关联）",
+    "loadFailure": "加载子工作流蓝图失败",
+    "overwriteBlueprint": "保存将用您的更改覆盖当前子工作流",
+    "overwriteBlueprintTitle": "覆盖现有子工作流？",
+    "promoteOutsideSubgraph": "不在子工作流中时无法提升小部件",
+    "promoteWidget": "提升组件：{name}",
+    "publish": "发布子工作流",
+    "publishSuccess": "已保存到节点库",
+    "publishSuccessMessage": "您可以在节点库的“子工作流蓝图”下找到您的子工作流蓝图",
+    "saveBlueprint": "保存子工作流到节点库",
+    "searchAliases": "搜索别名",
+    "showAll": "全部显示",
+    "showRecommended": "显示推荐控件",
+    "shown": "节点上显示",
+    "unpromoteWidget": "取消提升组件：{name}"
+  },
+  "subscription": {
+    "addApiCredits": "添加API额度",
+    "addCredits": "添加积分",
+    "addCreditsLabel": "随时获取更多积分",
+    "benefits": {
+      "benefit1": "合作伙伴节点的月度积分 — 按需充值",
+      "benefit1FreeTier": "每月更多积分，随时补充",
+      "benefit2": "每个队列最长运行 30 分钟",
+      "benefit3": "支持自带模型（Creator & Pro）"
+    },
+    "beta": "测试版",
+    "billedMonthly": "每月付款",
+    "billedYearly": "{total} 每年付款",
+    "billingComingSoon": {
+      "message": "团队计费功能即将上线。您将可以为您的工作区按成员数订阅套餐。敬请关注后续更新。",
+      "title": "即将推出"
+    },
+    "cancelDialog": {
+      "confirmCancel": "取消订阅",
+      "description": "您的访问权限将持续到 {date}。您将不再被扣费，您的工作区和积分将被保留。您可以随时重新订阅。",
+      "endOfBillingPeriod": "账单周期结束",
+      "failed": "取消订阅失败",
+      "keepSubscription": "保留订阅",
+      "title": "取消订阅"
+    },
+    "cancelSubscription": "取消订阅",
+    "cancelSuccess": "订阅取消成功",
+    "canceled": "已取消",
+    "canceledCard": {
+      "description": "您将不再被扣费。您的功能将在 {date} 前保持激活。",
+      "title": "您的订阅已被取消"
+    },
+    "changeTo": "更改为 {plan}",
+    "chooseBestPlanWorkspace": "为您的工作区选择最佳方案",
+    "comfyCloud": "Comfy 云",
+    "comfyCloudLogo": "Comfy Cloud Logo",
+    "contactOwnerToSubscribe": "请联系工作区所有者进行订阅",
+    "contactUs": "联系我们",
+    "creditsRemainingThisMonth": "本月剩余积分",
+    "creditsRemainingThisYear": "今年剩余积分",
+    "creditsYouveAdded": "你获得的积分",
+    "currentPlan": "当前订阅计划",
+    "customLoRAsLabel": "导入您的 Lora",
+    "description": "选择最适合您的订阅计划",
+    "descriptionWorkspace": "为您的工作区选择最佳方案",
+    "expiresDate": "于 {date} 过期",
+    "freeTier": {
+      "description": "您的免费套餐每月包含 {credits} 积分，可体验 Comfy Cloud。",
+      "descriptionGeneric": "您的免费套餐每月包含积分额度，可体验 Comfy Cloud。",
+      "nextRefresh": "您的积分将在 {date} 刷新。",
+      "outOfCredits": {
+        "subtitle": "订阅以解锁补充积分和更多功能",
+        "title": "您的免费积分已用完"
+      },
+      "subscribeCta": "订阅获取更多",
+      "title": "您正在使用免费套餐",
+      "topUpBlocked": {
+        "title": "解锁补充积分和更多功能"
+      },
+      "upgradeCta": "查看套餐"
+    },
+    "gpuLabel": "RTX 6000 Pro (96GB VRAM)",
+    "haveQuestions": "对企业级有疑问？",
+    "invoiceHistory": "发票历史",
+    "learnMore": "了解更多",
+    "managePayment": "管理付款",
+    "managePlan": "管理订阅",
+    "manageSubscription": "管理订阅",
+    "maxDuration": {
+      "creator": "30 分钟",
+      "founder": "30 分钟",
+      "free": "30 分钟",
+      "pro": "1 小时",
+      "standard": "30 分钟"
+    },
+    "maxDurationLabel": "运行单个工作流的最大时长",
+    "maxMembersLabel": "最大成员数",
+    "member": "成员",
+    "memberCount": "{count} 名成员",
+    "membersLabel": "最多 {count} 名成员",
+    "messageSupport": "消息支持",
+    "monthly": "月度",
+    "monthlyBonusDescription": "每月积分奖励",
+    "monthlyCreditsInfo": "积分每月刷新，不会保留",
+    "monthlyCreditsLabel": "每月积分",
+    "monthlyCreditsPerMemberLabel": "每成员每月积分",
+    "monthlyCreditsRollover": "这些积分将结转到下个月",
+    "mostPopular": "最受欢迎",
+    "nextBillingCycle": "下一个计费周期",
+    "nextMonthInvoice": "下月账单",
+    "partnerNodesBalance": "\"合作伙伴节点\"积分余额",
+    "partnerNodesCredits": "合作伙伴节点积分",
+    "partnerNodesDescription": "用于运行商业/专有模型",
+    "perMonth": "美元 / 月",
+    "plansAndPricing": "订阅和定价",
+    "prepaidCreditsInfo": "单独购买且不会过期的积分",
+    "prepaidDescription": "预付款额度",
+    "preview": {
+      "addCreditCard": "添加信用卡",
+      "backToAllPlans": "返回所有方案",
+      "confirm": "确认",
+      "confirmPayment": "确认付款",
+      "confirmPlanChange": "确认更改方案",
+      "eachMonthCreditsRefill": "每月积分补充至",
+      "ends": "{date} 结束",
+      "hideFeatures": "隐藏功能",
+      "nextPaymentDue": "下次付款截止日期 {date}。可随时取消。",
+      "perMember": "/ 每成员",
+      "privacyPolicy": "隐私政策",
+      "proratedCharge": "{plan} 按比例收费",
+      "proratedRefund": "{plan} 按比例退款",
+      "showMoreFeatures": "显示更多功能",
+      "starting": "{date} 开始",
+      "startingToday": "今日开始",
+      "terms": "条款",
+      "termsAgreement": "继续操作即表示您同意 Comfy Org 的{terms}和{privacy}。",
+      "totalDueToday": "今日应付总额"
+    },
+    "renewsDate": "将于 {date} 续订",
+    "required": {
+      "pollingFailed": "订阅激活失败",
+      "pollingSuccess": "订阅激活成功！",
+      "pollingTimeout": "等待订阅超时。请刷新并重试。",
+      "subscribe": "订阅",
+      "title": "订阅",
+      "waitingForSubscription": "请在新标签页中完成订阅。我们会自动检测到您已完成！"
+    },
+    "resubscribe": "重新订阅",
+    "resubscribeSuccess": "订阅已成功重新激活",
+    "resubscribeTo": "重新订阅 {plan}",
+    "subscribeForMore": "升级",
+    "subscribeNow": "立即订阅",
+    "subscribeTo": "订阅 {plan}",
+    "subscribeToComfyCloud": "订阅 Comfy Cloud",
+    "subscribeToRun": "订阅",
+    "subscribeToRunFull": "订阅 Run",
+    "subscriptionRequiredMessage": "成员在云端运行工作流需要订阅",
+    "tierNameYearly": "{name} 年度",
+    "tiers": {
+      "creator": {
+        "name": "Creator"
+      },
+      "founder": {
+        "name": "Founder's Edition"
+      },
+      "free": {
+        "name": "免费"
+      },
+      "pro": {
+        "name": "Pro"
+      },
+      "standard": {
+        "name": "Standard"
+      }
+    },
+    "title": "订阅",
+    "titleUnsubscribed": "订阅 Comfy Cloud",
+    "totalCredits": "总积分",
+    "upgrade": "升级",
+    "upgradePlan": "升级订阅",
+    "upgradeTo": "升级到 {plan}",
+    "upgradeToAddCredits": "升级以添加积分",
+    "usdPerMonth": "USD / mo",
+    "usdPerMonthPerMember": "美元 / 月 / 每成员",
+    "videoEstimateExplanation": "这些预估基于 Wan Fun Control 生成 5 秒视频。",
+    "videoEstimateHelp": "这是什么？",
+    "videoEstimateLabel": "可使用  Wan Fun Control 模板生成 5 秒视频的数量",
+    "videoEstimateTryTemplate": "试试 Wan Fun Control template →",
+    "videoTemplateBasedCredits": "使用 Wan 2.2 图像转视频生成的视频",
+    "viewEnterprise": "查看企业",
+    "viewMoreDetails": "查看更多详情",
+    "viewMoreDetailsPlans": "查看有关订阅和定价的更多信息",
+    "viewUsageHistory": "查看使用历史",
+    "workspaceNotSubscribed": "此工作区未订阅",
+    "yearly": "年度",
+    "yearlyCreditsLabel": "总共年度积分",
+    "yearlyDiscount": "20% 减免",
+    "yourPlanIncludes": "您的计划包括："
+  },
+  "tabMenu": {
+    "addToBookmarks": "添加到书签",
+    "closeOtherTabs": "关闭其他标签",
+    "closeTab": "关闭标签",
+    "closeTabsToLeft": "关闭左侧标签",
+    "closeTabsToRight": "关闭右侧标签",
+    "duplicateTab": "复制标签",
+    "removeFromBookmarks": "从书签中移除"
+  },
+  "templateWidgets": {
+    "sort": {
+      "searchPlaceholder": "搜索中..."
+    }
+  },
+  "templateWorkflows": {
+    "activeFilters": "筛选条件：",
+    "allTemplates": "全部模板",
+    "categories": "分类",
+    "category": {
+      "3D": "3D",
+      "All": "所有模板",
+      "Area Composition": "区域合成",
+      "Audio": "音频生成",
+      "Basics": "基础",
+      "ComfyUI Examples": "ComfyUI示例",
+      "ControlNet": "ControlNet",
+      "Custom Nodes": "自定义节点",
+      "Extensions": "扩展",
+      "Flux": "Flux",
+      "Generation Type": "生成类型",
+      "GettingStarted": "入门",
+      "Image": "图像生成",
+      "Image API": "图像 API",
+      "LLM API": "LLM API",
+      "LLMs": "LLMs",
+      "Partner Nodes": "合作伙伴节点",
+      "Upscaling": "图像放大",
+      "Video": "视频生成",
+      "Video API": "视频 API"
+    },
+    "error": {
+      "templateNotFound": "未找到模板 \"{templateName}\""
+    },
+    "licenseFilter": "许可证",
+    "loading": "正在加载模板...",
+    "loadingMore": "正在加载更多模板...",
+    "modelFilter": "模型筛选",
+    "modelsSelected": "已选 {count} 个模型",
+    "noResults": "未找到模板",
+    "noResultsHint": "请尝试调整搜索或筛选条件",
+    "resetFilters": "清除筛选",
+    "resultsCount": "显示 {count} / 共 {total} 个模板",
+    "runsOnFilter": "运行于",
+    "runsOnSelected": "{count} 次运行",
+    "searchPlaceholder": "搜索模板...",
+    "sort": {
+      "alphabetical": "A → Z",
+      "default": "默认",
+      "modelSizeLowToHigh": "模型大小（从低到高）",
+      "newest": "最新",
+      "popular": "热门",
+      "recommended": "推荐",
+      "searchPlaceholder": "搜索...",
+      "vramLowToHigh": "VRAM 使用量（从低到高）"
+    },
+    "sorting": "排序方式",
+    "title": "从模板开始",
+    "useCaseFilter": "使用例",
+    "useCasesSelected": "已选 {count} 个用例"
+  },
+  "templates": {
+    "logoProviderSeparator": " 与 "
+  },
+  "toastMessages": {
+    "cannotCreateSubgraph": "无法创建子工作流",
+    "couldNotDetermineFileType": "无法确定文件类型",
+    "dropFileError": "无法处理掉落的项目：{error}",
+    "emptyCanvas": "画布为空",
+    "errorCopyImage": "复制图片出错：{error}",
+    "errorLoadingModel": "加载模型出错",
+    "errorOpenImage": "打开图像时出错：{error}",
+    "errorSaveSetting": "保存设置 {id} 出错：{err}",
+    "exportSuccess": "成功将模型导出为 {format}",
+    "failedExecutionPathResolution": "无法解析所选节点的路径",
+    "failedToAccessBillingPortal": "访问账单门户失败：{error}",
+    "failedToApplyTexture": "应用纹理失败",
+    "failedToConvertToSubgraph": "无法将项目转换为子工作流",
+    "failedToCreateCustomer": "创建客户失败：{error}",
+    "failedToDownloadFile": "文件下载失败",
+    "failedToExportModel": "无法将模型导出为 {format}",
+    "failedToFetchBalance": "获取余额失败：{error}",
+    "failedToFetchLogs": "无法获取服务器日志",
+    "failedToFetchSubscription": "获取订阅状态失败：{error}",
+    "failedToInitializeLoad3dViewer": "初始化3D查看器失败",
+    "failedToInitiateCreditPurchase": "发起积分购买失败：{error}",
+    "failedToInitiateSubscription": "订阅启动失败：{error}",
+    "failedToLoadBackgroundImage": "无法加载背景图片",
+    "failedToLoadModel": "无法加载3D模型",
+    "failedToPurchaseCredits": "购买积分失败：{error}",
+    "failedToQueue": "排队失败",
+    "failedToSaveDraft": "保存工作流草稿失败",
+    "failedToToggleCamera": "切换镜头失败",
+    "failedToToggleGrid": "切换网格失败",
+    "failedToUpdateBackgroundColor": "更新背景色失败",
+    "failedToUpdateBackgroundImage": "更新背景图像失败",
+    "failedToUpdateBackgroundRenderMode": "切换背景模式到 {mode} 失败",
+    "failedToUpdateEdgeThreshold": "更新边缘阈值失败",
+    "failedToUpdateFOV": "更新FOV失败",
+    "failedToUpdateLightIntensity": "更新光照强度失败",
+    "failedToUpdateMaterialMode": "更新材质模式失败",
+    "failedToUpdateUpDirection": "更新向上轴失败",
+    "failedToUploadBackgroundImage": "上传背景图像失败",
+    "fileLoadError": "无法在 {fileName} 中找到工作流",
+    "fileTooLarge": "文件过大（{size} MB）。最大支持大小为 {maxSize} MB",
+    "fileUploadFailed": "文件上传失败",
+    "interrupted": "执行已被中断",
+    "legacyMaskEditorDeprecated": "旧版遮罩编辑器已弃用，即将删除。",
+    "migrateToLitegraphReroute": "将来的版本中将删除重定向节点。点击以迁移到litegraph-native重定向。",
+    "modelLoadedSuccessfully": "3D模型加载成功",
+    "no3dScene": "没有3D场景可以应用纹理",
+    "no3dSceneToExport": "没有3D场景可以导出",
+    "noTemplatesToExport": "没有模板可以导出",
+    "nodeDefinitionsUpdated": "节点定义已更新",
+    "nothingSelected": "未选择任何内容",
+    "nothingToGroup": "没有可分组的内容",
+    "nothingToQueue": "没有可加入队列的内容",
+    "pendingTasksDeleted": "待处理任务已删除",
+    "pleaseSelectNodesToGroup": "请选取节点（或其他组）以创建分组",
+    "pleaseSelectOutputNodes": "请选择输出节点",
+    "unableToGetModelFilePath": "无法获取模型文件路径",
+    "unauthorizedDomain": "您的域名 {domain} 未被授权使用此服务。请联系 {email} 将您的域名添加到白名单。",
+    "updateRequested": "已请求更新",
+    "useApiKeyTip": "提示：无法正常登录？请使用 Comfy API Key 选项。",
+    "userNotAuthenticated": "用户未认证"
+  },
+  "userSelect": {
+    "enterUsername": "输入用户名",
+    "existingUser": "用户已存在",
+    "newUser": "新用户",
+    "next": "下一步",
+    "selectUser": "选择用户"
+  },
+  "userSettings": {
+    "accountSettings": "用户设置",
+    "email": "电子邮件",
+    "name": "名称",
+    "notSet": "未设置",
+    "provider": "登录方式",
+    "title": "我的用户设置",
+    "updatePassword": "更新密码",
+    "workspaceSettings": "工作区设置"
+  },
+  "validation": {
+    "descriptionRequired": "描述是必填的",
+    "invalidEmail": "无效的电子邮件地址",
+    "length": "必须为{length}个字符",
+    "maxLength": "不能超过{length}个字符",
+    "minLength": "必须至少有{length}个字符",
+    "password": {
+      "lowercase": "必须包含至少一个小写字母",
+      "match": "密码必须匹配",
+      "minLength": "必须在8到32个字符之间",
+      "number": "必须包含至少一个数字",
+      "requirements": "密码要求",
+      "special": "必须包含至少一个特殊字符",
+      "uppercase": "必须包含至少一个大写字母"
+    },
+    "personalDataConsentRequired": "您必须同意处理您的个人数据。",
+    "prefix": "必须以 {prefix} 开头",
+    "required": "必填"
+  },
+  "versionMismatchWarning": {
+    "dismiss": "关闭",
+    "frontendNewer": "前端版本 {frontendVersion} 可能与后端版本 {backendVersion} 不相容。",
+    "frontendOutdated": "前端版本 {frontendVersion} 已过时。后端需要 {requiredVersion} 版或更高版本。",
+    "title": "版本相容性警告",
+    "updateFrontend": "更新前端"
+  },
   "vueNodesBanner": {
-    "title": "介绍 Nodes 2.0",
     "desc": "– 更灵活的工作流，强力的新组件，为拓展性而生",
+    "title": "介绍 Nodes 2.0",
     "tryItOut": "试试看"
   },
   "vueNodesMigration": {
-    "message": "是否偏好经典节点设计？",
-    "button": "打开设置"
+    "button": "打开设置",
+    "message": "是否偏好经典节点设计？"
   },
   "vueNodesMigrationMainMenu": {
     "message": "在主菜单中随时切换回 Nodes 2.0"
   },
-  "linearMode": {
-    "share": "分享",
-    "openWorkflow": "打开工作流"
+  "vueNodesSlot": {
+    "iterative": "（迭代）"
   },
-  "missingNodes": {
-    "cloud": {
-      "title": "Comfy Cloud 目前不支持这些节点",
-      "description": "该工作流包含 Comfy Cloud 目前不支持的节点",
-      "priorityMessage": "我们已经标记这些节点，将会优先支持它们。",
-      "replacementInstruction": "同时，如果可能的话，将这些节点（红色突出显示）替换为已经支持的节点，或者尝试不同的工作流。",
-      "learnMore": "查看更多",
-      "gotIt": "好的"
+  "welcome": {
+    "getStarted": "开始使用",
+    "title": "欢迎使用 ComfyUI"
+  },
+  "whatsNewPopup": {
+    "later": "Later",
+    "learnMore": "了解更多",
+    "noReleaseNotes": "暂无更新说明。"
+  },
+  "widgetFileUpload": {
+    "browseFiles": "浏览文件",
+    "dropPrompt": "将文件拖到此处或"
+  },
+  "widgets": {
+    "boolean": {
+      "false": "否",
+      "true": "是"
     },
-    "oss": {
-      "title": "该工作流含有缺失节点",
-      "description": "该工作流包含您未安装的自定义节点",
-      "replacementInstruction": "安装这些节点后运行此工作流，或者用已安装的节点替换它们。缺失的节点在画布上以红色突出显示。"
+    "node2only": "仅限 Node 2.0",
+    "selectModel": "选择模型",
+    "uploadSelect": {
+      "maxSelectionReached": "已达到最大选择数量",
+      "placeholder": "请选择...",
+      "placeholderAudio": "请选择音频...",
+      "placeholderImage": "请选择图片...",
+      "placeholderMesh": "选择网格...",
+      "placeholderModel": "请选择模型...",
+      "placeholderUnknown": "请选择媒体...",
+      "placeholderVideo": "请选择视频..."
+    },
+    "valueControl": {
+      "decrement": "递减值",
+      "decrementDesc": "数值-1或切换到上一个选项",
+      "editSettings": "改变控制设置",
+      "fixed": "固定值",
+      "fixedDesc": "数值不变",
+      "header": {
+        "after": "之后",
+        "before": "之前",
+        "postfix": "正在运行工作流：",
+        "prefix": "自动更新该值"
+      },
+      "increment": "递增值",
+      "incrementDesc": "数值+1或切换到下一个选项",
+      "linkToGlobal": "连接到",
+      "linkToGlobalDesc": "唯一值连接到全局值控制设置",
+      "linkToGlobalSeed": "全局值",
+      "randomize": "随机值",
+      "randomizeDesc": "每次运行后随机化该值"
     }
   },
-  "rightSidePanel": {
-    "togglePanel": "开关属性面板",
-    "noSelection": "选择一个节点查看其属性信息。",
-    "title": "无选中节点 | 选中了 1 个节点 | 选中了 {count} 个节点",
-    "parameters": "参数",
-    "info": "信息",
-    "color": "节点颜色",
-    "pinned": "顶固",
-    "bypass": "忽略",
-    "normal": "正常",
-    "mute": "禁用",
-    "inputs": "输入",
-    "inputsNone": "无输入",
-    "inputsNoneTooltip": "节点没有输入",
-    "properties": "属性",
-    "nodeState": "节点状态",
-    "settings": "设置"
+  "workflowService": {
+    "enterFilename": "输入文件名",
+    "enterFilenamePrompt": "输入文件名：",
+    "exportWorkflow": "导出工作流",
+    "saveWorkflow": "保存工作流",
+    "savedAsApp": "已转换为应用工作流",
+    "savedAsWorkflow": "已转换为节点图工作流"
   },
-  "help": {
-    "recentReleases": "最近发布",
-    "helpCenterMenu": "帮助中心菜单"
+  "workspace": {
+    "addedToWorkspace": "您已被加入 {workspaceName}",
+    "inviteAccepted": "邀请已接受",
+    "inviteFailed": "接受邀请失败",
+    "unsavedChanges": {
+      "message": "您有未保存的更改。是否要放弃这些更改并切换工作区？",
+      "title": "未保存的更改"
+    },
+    "viewWorkspace": "查看工作区"
+  },
+  "workspaceAuth": {
+    "errors": {
+      "accessDenied": "您无权访问此工作区",
+      "invalidFirebaseToken": "身份验证失败。请重新登录。",
+      "notAuthenticated": "您必须登录才能访问工作区",
+      "tokenExchangeFailed": "与工作区认证失败：{error}",
+      "workspaceNotFound": "未找到工作区"
+    }
+  },
+  "workspacePanel": {
+    "createWorkspaceDialog": {
+      "create": "创建",
+      "message": "工作区让成员共享积分池。创建后您将成为所有者。",
+      "nameLabel": "工作区名称*",
+      "namePlaceholder": "请输入工作区名称",
+      "title": "创建新工作区"
+    },
+    "dashboard": {
+      "placeholder": "仪表盘工作区设置"
+    },
+    "deleteDialog": {
+      "message": "任何未使用的积分或未保存的资源都将丢失。此操作无法撤销。",
+      "messageWithName": "删除“{name}”？任何未使用的积分或未保存的资源都将丢失。此操作无法撤销。",
+      "title": "删除此工作区？"
+    },
+    "editWorkspaceDialog": {
+      "nameLabel": "工作区名称",
+      "save": "保存",
+      "title": "编辑工作区详情"
+    },
+    "invite": "邀请",
+    "inviteLimitReached": "您已达到最多 50 名成员的上限",
+    "inviteMember": "邀请成员",
+    "inviteMemberDialog": {
+      "createLink": "创建链接",
+      "linkCopied": "已复制",
+      "linkCopyFailed": "复制链接失败",
+      "linkStep": {
+        "copyLink": "复制链接",
+        "done": "完成",
+        "message": "请确保其账号使用的是该邮箱。",
+        "title": "将此链接发送给对方"
+      },
+      "message": "创建一个可分享的邀请链接发送给他人",
+      "placeholder": "输入对方邮箱",
+      "title": "邀请他人加入此工作区"
+    },
+    "inviteUpsellDialog": {
+      "messageNotSubscribed": "如需添加团队成员到此工作区，您需要订阅 Creator 及以上套餐。Standard 套餐仅支持单人席位（所有者）。",
+      "messageSingleSeat": "Standard 套餐仅包含一个工作区所有者席位。如需邀请更多成员，请升级到 Creator 及以上套餐以解锁多席位功能。",
+      "titleNotSubscribed": "邀请成员需要订阅套餐",
+      "titleSingleSeat": "您当前的套餐仅支持单人席位",
+      "upgradeToCreator": "升级到 Creator",
+      "viewPlans": "查看套餐"
+    },
+    "leaveDialog": {
+      "leave": "离开",
+      "message": "除非联系工作区所有者，否则您将无法重新加入。",
+      "title": "离开此工作区？"
+    },
+    "members": {
+      "actions": {
+        "copyLink": "复制邀请链接",
+        "removeMember": "移除成员",
+        "revokeInvite": "撤销邀请"
+      },
+      "columns": {
+        "expiryDate": "过期日期",
+        "inviteDate": "邀请日期",
+        "joinDate": "加入日期"
+      },
+      "createNewWorkspace": "创建新工作区。",
+      "membersCount": "{count}/50 名成员",
+      "noInvites": "暂无待处理邀请",
+      "noMembers": "暂无成员",
+      "pendingInvitesCount": "{count} 个待处理邀请",
+      "personalWorkspaceMessage": "您目前无法邀请其他成员加入您的个人工作区。如需添加成员，请",
+      "tabs": {
+        "active": "已激活",
+        "pendingCount": "待处理（{count}）"
+      },
+      "upsellBannerSubscribe": "订阅 Creator 及以上套餐以邀请团队成员加入此工作区。",
+      "upsellBannerUpgrade": "升级到 Creator 及以上套餐以邀请更多团队成员。",
+      "viewPlans": "查看套餐"
+    },
+    "menu": {
+      "deleteWorkspace": "删除工作区",
+      "deleteWorkspaceDisabledTooltip": "请先取消工作区的有效订阅",
+      "editWorkspace": "编辑工作区详情",
+      "leaveWorkspace": "离开工作区"
+    },
+    "removeMemberDialog": {
+      "error": "移除成员失败",
+      "message": "该成员将被移出您的工作区。其已使用的积分不会被退还。",
+      "remove": "移除成员",
+      "success": "成员已移除",
+      "title": "移除该成员？"
+    },
+    "revokeInviteDialog": {
+      "message": "该成员将无法再加入您的工作区，其邀请链接将失效。",
+      "revoke": "取消邀请",
+      "title": "取消邀请此人？"
+    },
+    "tabs": {
+      "dashboard": "仪表盘",
+      "membersCount": "成员（{count}）",
+      "planCredits": "套餐与积分"
+    },
+    "toast": {
+      "failedToCreateWorkspace": "创建工作区失败",
+      "failedToDeleteWorkspace": "删除工作区失败",
+      "failedToFetchWorkspaces": "加载工作区失败",
+      "failedToLeaveWorkspace": "离开工作区失败",
+      "failedToUpdateWorkspace": "更新工作区失败",
+      "workspaceCreated": {
+        "message": "订阅套餐，邀请队友，开始协作。",
+        "subscribe": "订阅",
+        "title": "工作区已创建"
+      },
+      "workspaceDeleted": {
+        "message": "该工作区已被永久删除。",
+        "title": "工作区已删除"
+      },
+      "workspaceLeft": {
+        "message": "您已退出该工作区。",
+        "title": "已退出工作区"
+      },
+      "workspaceUpdated": {
+        "message": "工作区详情已保存。",
+        "title": "工作区已更新"
+      }
+    }
+  },
+  "workspaceSwitcher": {
+    "createWorkspace": "创建新工作区",
+    "maxWorkspacesReached": "您最多只能拥有10个工作区。请删除一个以创建新工作区。",
+    "personal": "个人",
+    "roleMember": "成员",
+    "roleOwner": "所有者",
+    "subscribe": "订阅",
+    "switchWorkspace": "切换工作区"
+  },
+  "zoomControls": {
+    "hideMinimap": "隐藏小地图",
+    "label": "缩放控制",
+    "showMinimap": "显示小地图",
+    "zoomToFit": "适合画面"
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/zh/nodeDefs.json b/src/locales/zh/nodeDefs.json
index 3cc201f777..8bb932a133 100644
--- a/src/locales/zh/nodeDefs.json
+++ b/src/locales/zh/nodeDefs.json
@@ -1,7 +1,35 @@
 {
+  "APG": {
+    "display_name": "自适应投影引导",
+    "inputs": {
+      "eta": {
+        "name": "预计到达时间",
+        "tooltip": "控制平行引导向量的缩放比例。默认 CFG 行为设置为 1。"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "momentum": {
+        "name": "动量",
+        "tooltip": "控制扩散过程中的引导运行平均值，设置为0时禁用。"
+      },
+      "norm_threshold": {
+        "name": "向量归一化",
+        "tooltip": "将引导向量归一化到此值，设置为 0 时禁用归一化。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "AddNoise": {
     "display_name": "添加噪波",
     "inputs": {
+      "latent_image": {
+        "name": "Latent"
+      },
       "model": {
         "name": "模型"
       },
@@ -10,9 +38,6 @@
       },
       "sigmas": {
         "name": "Sigmas"
-      },
-      "latent_image": {
-        "name": "Latent"
       }
     },
     "outputs": {
@@ -24,13 +49,13 @@
   "AddTextPrefix": {
     "display_name": "文本前添加",
     "inputs": {
-      "texts": {
-        "name": "文本",
-        "tooltip": "需要被添加的文本。"
-      },
       "prefix": {
         "name": "前缀",
         "tooltip": "要添加的内容。"
+      },
+      "texts": {
+        "name": "文本",
+        "tooltip": "需要被添加的文本。"
       }
     },
     "outputs": {
@@ -43,13 +68,13 @@
   "AddTextSuffix": {
     "display_name": "文本后添加",
     "inputs": {
-      "texts": {
-        "name": "文本",
-        "tooltip": "需要被添加的文本。"
-      },
       "suffix": {
         "name": "后缀",
         "tooltip": "要添加的内容。"
+      },
+      "texts": {
+        "name": "文本",
+        "tooltip": "需要被添加的文本。"
       }
     },
     "outputs": {
@@ -62,13 +87,13 @@
   "AdjustBrightness": {
     "display_name": "调整亮度",
     "inputs": {
-      "images": {
-        "name": "图像",
-        "tooltip": "需要调整的图像"
-      },
       "factor": {
         "name": "系数",
         "tooltip": "亮度系数。1.0表示无变化，<1.0表示更暗，>1.0表示更亮。"
+      },
+      "images": {
+        "name": "图像",
+        "tooltip": "需要调整的图像"
       }
     },
     "outputs": {
@@ -81,13 +106,13 @@
   "AdjustContrast": {
     "display_name": "调整对比度",
     "inputs": {
-      "images": {
-        "name": "图像",
-        "tooltip": "需要调整的图像"
-      },
       "factor": {
         "name": "系数",
         "tooltip": "对比度系数。1.0表示无变化，<1.0表示更低，>1.0表示更高。"
+      },
+      "images": {
+        "name": "图像",
+        "tooltip": "需要调整的图像"
       }
     },
     "outputs": {
@@ -100,39 +125,14 @@
   "AlignYourStepsScheduler": {
     "display_name": "AlignYourSteps调度器",
     "inputs": {
+      "denoise": {
+        "name": "降噪"
+      },
       "model_type": {
         "name": "模型类型"
       },
       "steps": {
         "name": "步数"
-      },
-      "denoise": {
-        "name": "降噪"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "APG": {
-    "display_name": "自适应投影引导",
-    "inputs": {
-      "model": {
-        "name": "模型"
-      },
-      "eta": {
-        "name": "预计到达时间",
-        "tooltip": "控制平行引导向量的缩放比例。默认 CFG 行为设置为 1。"
-      },
-      "norm_threshold": {
-        "name": "向量归一化",
-        "tooltip": "将引导向量归一化到此值，设置为 0 时禁用归一化。"
-      },
-      "momentum": {
-        "name": "动量",
-        "tooltip": "控制扩散过程中的引导运行平均值，设置为0时禁用。"
       }
     },
     "outputs": {
@@ -159,8 +159,8 @@
     }
   },
   "AudioConcat": {
-    "display_name": "音频拼接",
     "description": "将 音频1 与 音频2 按指定方向连接。",
+    "display_name": "音频拼接",
     "inputs": {
       "audio1": {
         "name": "音频1"
@@ -182,11 +182,11 @@
   "AudioEncoderEncode": {
     "display_name": "音频编码器编码",
     "inputs": {
-      "audio_encoder": {
-        "name": "音频编码器"
-      },
       "audio": {
         "name": "音频"
+      },
+      "audio_encoder": {
+        "name": "音频编码器"
       }
     },
     "outputs": {
@@ -208,9 +208,50 @@
       }
     }
   },
+  "AudioEqualizer3Band": {
+    "display_name": "音频均衡器（三段）",
+    "inputs": {
+      "audio": {
+        "name": "音频"
+      },
+      "high_freq": {
+        "name": "高频截止",
+        "tooltip": "高频搁架的截止频率"
+      },
+      "high_gain_dB": {
+        "name": "高频增益（dB）",
+        "tooltip": "高频（高音）增益"
+      },
+      "low_freq": {
+        "name": "低频截止",
+        "tooltip": "低频搁架的截止频率"
+      },
+      "low_gain_dB": {
+        "name": "低频增益（dB）",
+        "tooltip": "低频（低音）增益"
+      },
+      "mid_freq": {
+        "name": "中频中心",
+        "tooltip": "中频的中心频率"
+      },
+      "mid_gain_dB": {
+        "name": "中频增益（dB）",
+        "tooltip": "中频增益"
+      },
+      "mid_q": {
+        "name": "中频Q值",
+        "tooltip": "中频的Q因子（带宽）"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "AudioMerge": {
-    "display_name": "音频合并",
     "description": "叠加 音频1 和 音频2 轨道的波形。",
+    "display_name": "音频合并",
     "inputs": {
       "audio1": {
         "name": "音频1"
@@ -232,11 +273,11 @@
   "BasicGuider": {
     "display_name": "基本引导器",
     "inputs": {
-      "model": {
-        "name": "模型"
-      },
       "conditioning": {
         "name": "条件"
+      },
+      "model": {
+        "name": "模型"
       }
     },
     "outputs": {
@@ -248,6 +289,9 @@
   "BasicScheduler": {
     "display_name": "基本调度器",
     "inputs": {
+      "denoise": {
+        "name": "降噪"
+      },
       "model": {
         "name": "模型"
       },
@@ -256,9 +300,45 @@
       },
       "steps": {
         "name": "步数"
-      },
-      "denoise": {
-        "name": "降噪"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchImagesNode": {
+    "display_name": "批量图像",
+    "inputs": {
+      "images": {
+        "name": "图像"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchLatentsNode": {
+    "display_name": "批量latent",
+    "inputs": {
+      "latents": {
+        "name": "latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BatchMasksNode": {
+    "display_name": "批量mask",
+    "inputs": {
+      "masks": {
+        "name": "mask"
       }
     },
     "outputs": {
@@ -270,17 +350,120 @@
   "BetaSamplingScheduler": {
     "display_name": "Beta采样调度器",
     "inputs": {
-      "model": {
-        "name": "模型"
-      },
-      "steps": {
-        "name": "步数"
-      },
       "alpha": {
         "name": "alpha"
       },
       "beta": {
         "name": "beta"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "steps": {
+        "name": "步数"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BriaImageEditNode": {
+    "description": "使用 Bria 最新模型编辑图像",
+    "display_name": "Bria 图像编辑",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "guidance_scale": {
+        "name": "guidance_scale",
+        "tooltip": "数值越高，图像越贴合 prompt。"
+      },
+      "image": {
+        "name": "image"
+      },
+      "mask": {
+        "name": "mask",
+        "tooltip": "如未指定，编辑将应用于整个图像。"
+      },
+      "model": {
+        "name": "model"
+      },
+      "moderation": {
+        "name": "moderation",
+        "tooltip": "内容审核设置"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "编辑图像的指令"
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "steps": {
+        "name": "steps"
+      },
+      "structured_prompt": {
+        "name": "structured_prompt",
+        "tooltip": "包含结构化编辑提示的 JSON 字符串。使用此项可实现更精确、可编程的控制，替代常规 prompt。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "structured_prompt",
+        "tooltip": null
+      }
+    }
+  },
+  "BriaRemoveImageBackground": {
+    "description": "使用 Bria RMBG 2.0 移除图像的背景。",
+    "display_name": "Bria 移除图像背景",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "image": {
+        "name": "图像"
+      },
+      "moderation": {
+        "name": "内容审核",
+        "tooltip": "内容审核设置"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "种子控制节点是否重新运行；无论种子如何，结果都是非确定性的。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "BriaRemoveVideoBackground": {
+    "description": "使用 Bria 移除视频的背景。",
+    "display_name": "Bria 移除视频背景",
+    "inputs": {
+      "background_color": {
+        "name": "背景颜色",
+        "tooltip": "输出视频的背景颜色。"
+      },
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "种子控制节点是否重新运行；无论种子如何，结果都是非确定性的。"
+      },
+      "video": {
+        "name": "视频"
       }
     },
     "outputs": {
@@ -290,9 +473,36 @@
     }
   },
   "ByteDanceFirstLastFrameNode": {
-    "display_name": "字节跳动首尾帧转视频",
     "description": "使用提示词和首尾帧生成视频。",
+    "display_name": "字节跳动首尾帧转视频",
     "inputs": {
+      "aspect_ratio": {
+        "name": "宽高比",
+        "tooltip": "输出视频的宽高比。"
+      },
+      "camera_fixed": {
+        "name": "相机固定",
+        "tooltip": "指定是否固定相机。平台会在您的提示词中附加固定相机的指令，但不保证实际效果。"
+      },
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "duration": {
+        "name": "时长",
+        "tooltip": "输出视频的时长（以秒为单位）。"
+      },
+      "first_frame": {
+        "name": "第一帧",
+        "tooltip": "用于视频的第一帧。"
+      },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "此参数仅对 seedance-1-5-pro 模型有效，其他模型将被忽略。"
+      },
+      "last_frame": {
+        "name": "最后一帧",
+        "tooltip": "用于视频的最后一帧。"
+      },
       "model": {
         "name": "模型"
       },
@@ -300,77 +510,17 @@
         "name": "提示",
         "tooltip": "用于生成视频的文本提示。"
       },
-      "first_frame": {
-        "name": "第一帧",
-        "tooltip": "用于视频的第一帧。"
-      },
-      "last_frame": {
-        "name": "最后一帧",
-        "tooltip": "用于视频的最后一帧。"
-      },
       "resolution": {
         "name": "分辨率",
         "tooltip": "输出视频的分辨率。"
       },
-      "aspect_ratio": {
-        "name": "宽高比",
-        "tooltip": "输出视频的宽高比。"
-      },
-      "duration": {
-        "name": "时长",
-        "tooltip": "输出视频的时长（以秒为单位）。"
-      },
       "seed": {
         "name": "种子",
         "tooltip": "用于生成的种子。"
       },
-      "camera_fixed": {
-        "name": "相机固定",
-        "tooltip": "指定是否固定相机。平台会在您的提示词中附加固定相机的指令，但不保证实际效果。"
-      },
       "watermark": {
         "name": "水印",
         "tooltip": "是否在视频中添加“AI 生成”水印。"
-      },
-      "control_after_generate": {
-        "name": "生成后控制"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "ByteDanceImageEditNode": {
-    "display_name": "字节跳动图片编辑",
-    "description": "通过基于提示的API使用字节跳动模型编辑图像",
-    "inputs": {
-      "model": {
-        "name": "模型"
-      },
-      "image": {
-        "name": "图片",
-        "tooltip": "要编辑的基础图像"
-      },
-      "prompt": {
-        "name": "提示",
-        "tooltip": "编辑图像的指令"
-      },
-      "seed": {
-        "name": "种子",
-        "tooltip": "用于生成的种子"
-      },
-      "guidance_scale": {
-        "name": "引导尺度",
-        "tooltip": "数值越高，图像越紧密地遵循提示"
-      },
-      "watermark": {
-        "name": "水印",
-        "tooltip": "是否在图像上添加“AI生成”水印"
-      },
-      "control_after_generate": {
-        "name": "生成后控制"
       }
     },
     "outputs": {
@@ -380,9 +530,20 @@
     }
   },
   "ByteDanceImageNode": {
-    "display_name": "字节跳动图片",
     "description": "通过基于提示的API使用字节跳动模型生成图像",
+    "display_name": "字节跳动图片",
     "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "guidance_scale": {
+        "name": "引导尺度",
+        "tooltip": "数值越高，图像越紧密地遵循提示"
+      },
+      "height": {
+        "name": "高度",
+        "tooltip": "图像的自定义高度。仅当 `size_preset` 设置为 `Custom` 时该值才生效"
+      },
       "model": {
         "name": "模型"
       },
@@ -390,32 +551,21 @@
         "name": "提示",
         "tooltip": "用于生成图像的文本提示"
       },
-      "size_preset": {
-        "name": "尺寸预设",
-        "tooltip": "选择一个推荐尺寸。选择自定义以使用下方的宽度和高度"
-      },
-      "width": {
-        "name": "宽度",
-        "tooltip": "图像的自定义宽度。仅当 `size_preset` 设置为 `Custom` 时该值才生效"
-      },
-      "height": {
-        "name": "高度",
-        "tooltip": "图像的自定义高度。仅当 `size_preset` 设置为 `Custom` 时该值才生效"
-      },
       "seed": {
         "name": "种子",
         "tooltip": "用于生成的种子"
       },
-      "guidance_scale": {
-        "name": "引导尺度",
-        "tooltip": "数值越高，图像越紧密地遵循提示"
+      "size_preset": {
+        "name": "尺寸预设",
+        "tooltip": "选择一个推荐尺寸。选择自定义以使用下方的宽度和高度"
       },
       "watermark": {
         "name": "水印",
         "tooltip": "是否在图像上添加“AI生成”水印"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "width": {
+        "name": "宽度",
+        "tooltip": "图像的自定义宽度。仅当 `size_preset` 设置为 `Custom` 时该值才生效"
       }
     },
     "outputs": {
@@ -425,9 +575,24 @@
     }
   },
   "ByteDanceImageReferenceNode": {
-    "display_name": "字节跳动参考图像转视频",
     "description": "使用提示和参考图像生成视频。",
+    "display_name": "字节跳动参考图像转视频",
     "inputs": {
+      "aspect_ratio": {
+        "name": "宽高比",
+        "tooltip": "输出视频的宽高比。"
+      },
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "duration": {
+        "name": "时长",
+        "tooltip": "输出视频的时长（以秒为单位）。"
+      },
+      "images": {
+        "name": "图片",
+        "tooltip": "一到四张图片。"
+      },
       "model": {
         "name": "模型"
       },
@@ -435,22 +600,10 @@
         "name": "提示",
         "tooltip": "用于生成视频的文本提示。"
       },
-      "images": {
-        "name": "图片",
-        "tooltip": "一到四张图片。"
-      },
       "resolution": {
         "name": "分辨率",
         "tooltip": "输出视频的分辨率。"
       },
-      "aspect_ratio": {
-        "name": "宽高比",
-        "tooltip": "输出视频的宽高比。"
-      },
-      "duration": {
-        "name": "时长",
-        "tooltip": "输出视频的时长（以秒为单位）。"
-      },
       "seed": {
         "name": "种子",
         "tooltip": "用于生成的种子。"
@@ -458,9 +611,6 @@
       "watermark": {
         "name": "水印",
         "tooltip": "是否在视频中添加“AI 生成”水印。"
-      },
-      "control_after_generate": {
-        "name": "生成后控制"
       }
     },
     "outputs": {
@@ -470,9 +620,32 @@
     }
   },
   "ByteDanceImageToVideoNode": {
-    "display_name": "字节跳动图片转视频",
     "description": "通过API基于图像和提示使用字节跳动模型生成视频",
+    "display_name": "字节跳动图片转视频",
     "inputs": {
+      "aspect_ratio": {
+        "name": "宽高比",
+        "tooltip": "输出视频的宽高比。"
+      },
+      "camera_fixed": {
+        "name": "摄像头已固定",
+        "tooltip": "指定是否固定相机。平台会在您的提示词中附加固定相机的指令，但不保证实际效果。"
+      },
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "duration": {
+        "name": "时长",
+        "tooltip": "输出视频的时长（以秒为单位）。"
+      },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "此参数仅对 seedance-1-5-pro 模型有效，其他模型将被忽略。"
+      },
+      "image": {
+        "name": "图片",
+        "tooltip": "用于视频的第一帧。"
+      },
       "model": {
         "name": "模型"
       },
@@ -480,36 +653,17 @@
         "name": "提示",
         "tooltip": "用于生成视频的文本提示。"
       },
-      "image": {
-        "name": "图片",
-        "tooltip": "用于视频的第一帧。"
-      },
       "resolution": {
         "name": "分辨率",
         "tooltip": "输出视频的分辨率。"
       },
-      "aspect_ratio": {
-        "name": "宽高比",
-        "tooltip": "输出视频的宽高比。"
-      },
-      "duration": {
-        "name": "时长",
-        "tooltip": "输出视频的时长（以秒为单位）。"
-      },
       "seed": {
         "name": "种子",
         "tooltip": "用于生成的种子。"
       },
-      "camera_fixed": {
-        "name": "摄像头已固定",
-        "tooltip": "指定是否固定相机。平台会在您的提示词中附加固定相机的指令，但不保证实际效果。"
-      },
       "watermark": {
         "name": "水印",
         "tooltip": "是否在视频中添加“AI生成”水印。"
-      },
-      "control_after_generate": {
-        "name": "生成后控制"
       }
     },
     "outputs": {
@@ -519,55 +673,54 @@
     }
   },
   "ByteDanceSeedreamNode": {
-    "display_name": "字节跳动Seedream 4",
     "description": "统一文本到图像生成，支持高达4K分辨率的精确单句编辑。",
+    "display_name": "字节跳动Seedream 4",
     "inputs": {
-      "model": {
-        "name": "模型",
-        "tooltip": "模型名称"
-      },
-      "prompt": {
-        "name": "提示",
-        "tooltip": "用于创建或编辑图像的文本提示。"
-      },
-      "size_preset": {
-        "name": "尺寸预设",
-        "tooltip": "选择一个推荐尺寸。选择“自定义”以使用下面的宽度和高度。"
-      },
-      "image": {
-        "name": "图像",
-        "tooltip": "用于图像到图像生成的输入图像。用于单参考或多参考生成的1-10张图像列表。"
-      },
-      "width": {
-        "name": "宽度",
-        "tooltip": "图像的自定义宽度。仅当 `size_preset` 设置为 `Custom` 时该值生效"
-      },
-      "height": {
-        "name": "高度",
-        "tooltip": "图像的自定义高度。仅当 `size_preset` 设置为 `Custom` 时该值生效"
-      },
-      "sequential_image_generation": {
-        "name": "顺序图像生成",
-        "tooltip": "分组图像生成模式。'disabled' 生成单张图像。'auto' 由模型决定是否生成多张相关图像（例如故事场景、角色变体）。"
-      },
-      "max_images": {
-        "name": "最大图片数",
-        "tooltip": "当 sequential_image_generation='auto' 时生成图像的最大数量。总图像数（输入+生成）不能超过 15。"
-      },
-      "seed": {
-        "name": "种子",
-        "tooltip": "用于生成的种子。"
-      },
-      "watermark": {
-        "name": "水印",
-        "tooltip": "是否在图像上添加“AI 生成”水印。"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "fail_on_partial": {
         "name": "部分失败时停止",
         "tooltip": "如果启用，当任何请求的图像缺失或返回错误时，将中止执行。"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "height": {
+        "name": "高度",
+        "tooltip": "图像的自定义高度。仅当 `size_preset` 设置为 `Custom` 时该值生效"
+      },
+      "image": {
+        "name": "图像",
+        "tooltip": "用于图像到图像生成的输入图像。用于单参考或多参考生成的1-10张图像列表。"
+      },
+      "max_images": {
+        "name": "最大图片数",
+        "tooltip": "当 sequential_image_generation='auto' 时生成图像的最大数量。总图像数（输入+生成）不能超过 15。"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "prompt": {
+        "name": "提示",
+        "tooltip": "用于创建或编辑图像的文本提示。"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "用于生成的种子。"
+      },
+      "sequential_image_generation": {
+        "name": "顺序图像生成",
+        "tooltip": "分组图像生成模式。'disabled' 生成单张图像。'auto' 由模型决定是否生成多张相关图像（例如故事场景、角色变体）。"
+      },
+      "size_preset": {
+        "name": "尺寸预设",
+        "tooltip": "选择一个推荐尺寸。选择“自定义”以使用下面的宽度和高度。"
+      },
+      "watermark": {
+        "name": "水印",
+        "tooltip": "是否在图像上添加“AI 生成”水印。"
+      },
+      "width": {
+        "name": "宽度",
+        "tooltip": "图像的自定义宽度。仅当 `size_preset` 设置为 `Custom` 时该值生效"
       }
     },
     "outputs": {
@@ -577,9 +730,28 @@
     }
   },
   "ByteDanceTextToVideoNode": {
-    "display_name": "字节跳动文生视频",
     "description": "通过API基于提示使用字节跳动模型生成视频",
+    "display_name": "字节跳动文生视频",
     "inputs": {
+      "aspect_ratio": {
+        "name": "宽高比",
+        "tooltip": "输出视频的宽高比。"
+      },
+      "camera_fixed": {
+        "name": "固定相机",
+        "tooltip": "指定是否固定相机。平台会在您的提示后附加固定相机的指令，但不保证实际效果。"
+      },
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "duration": {
+        "name": "时长",
+        "tooltip": "输出视频的时长（秒）。"
+      },
+      "generate_audio": {
+        "name": "generate_audio",
+        "tooltip": "此参数仅对 seedance-1-5-pro 模型有效，其他模型将被忽略。"
+      },
       "model": {
         "name": "模型"
       },
@@ -591,28 +763,13 @@
         "name": "分辨率",
         "tooltip": "输出视频的分辨率。"
       },
-      "aspect_ratio": {
-        "name": "宽高比",
-        "tooltip": "输出视频的宽高比。"
-      },
-      "duration": {
-        "name": "时长",
-        "tooltip": "输出视频的时长（秒）。"
-      },
       "seed": {
         "name": "种子",
         "tooltip": "用于生成的种子值。"
       },
-      "camera_fixed": {
-        "name": "固定相机",
-        "tooltip": "指定是否固定相机。平台会在您的提示后附加固定相机的指令，但不保证实际效果。"
-      },
       "watermark": {
         "name": "水印",
         "tooltip": "是否在视频中添加“AI生成”水印。"
-      },
-      "control_after_generate": {
-        "name": "生成后控制"
       }
     },
     "outputs": {
@@ -621,78 +778,20 @@
       }
     }
   },
-  "Canny": {
-    "display_name": "Canny边缘检测",
-    "inputs": {
-      "image": {
-        "name": "图像"
-      },
-      "low_threshold": {
-        "name": "低阈值"
-      },
-      "high_threshold": {
-        "name": "高阈值"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "CaseConverter": {
-    "display_name": "大小写转换器",
-    "inputs": {
-      "string": {
-        "name": "字符串"
-      },
-      "mode": {
-        "name": "模式"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "CenterCropImages": {
-    "display_name": "裁剪图像（中心）",
-    "inputs": {
-      "images": {
-        "name": "图像",
-        "tooltip": "需要调整的图像"
-      },
-      "width": {
-        "name": "宽度",
-        "tooltip": "裁剪框宽度"
-      },
-      "height": {
-        "name": "高度",
-        "tooltip": "裁剪框高度"
-      }
-    },
-    "outputs": {
-      "0": {
-        "name": "图像",
-        "tooltip": "调整后的图像"
-      }
-    }
-  },
   "CFGGuider": {
     "display_name": "CFG引导器",
     "inputs": {
+      "cfg": {
+        "name": "CFG"
+      },
       "model": {
         "name": "模型"
       },
-      "positive": {
-        "name": "正面条件"
-      },
       "negative": {
         "name": "负面条件"
       },
-      "cfg": {
-        "name": "CFG"
+      "positive": {
+        "name": "正面条件"
       }
     },
     "outputs": {
@@ -732,102 +831,23 @@
       }
     }
   },
-  "CheckpointLoader": {
-    "display_name": "Ckeckpoint加载器（已弃用）",
-    "inputs": {
-      "config_name": {
-        "name": "配置名称"
-      },
-      "ckpt_name": {
-        "name": "Checkpoint名称"
-      }
-    }
-  },
-  "CheckpointLoaderSimple": {
-    "display_name": "Checkpoint加载器（简易）",
-    "description": "加载扩散模型 Checkpoint，用于去除 Latent 噪波。",
-    "inputs": {
-      "ckpt_name": {
-        "name": "Checkpoint名称",
-        "tooltip": "要加载的Checkpoint模型的名称。"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": "用于去除 Latent 噪波的模型。"
-      },
-      "1": {
-        "tooltip": "用于编码文本提示的 CLIP 模型。"
-      },
-      "2": {
-        "tooltip": "用于将图像编码和解码到 Latent 的 VAE 模型。"
-      }
-    }
-  },
-  "CheckpointSave": {
-    "display_name": "保存Checkpoint",
-    "inputs": {
-      "model": {
-        "name": "模型"
-      },
-      "clip": {
-        "name": "clip"
-      },
-      "vae": {
-        "name": "vae"
-      },
-      "filename_prefix": {
-        "name": "文件名前缀"
-      }
-    }
-  },
-  "ChromaRadianceOptions": {
-    "display_name": "ChromaRadiance选项",
-    "description": "允许为Chroma Radiance模型设置高级选项。",
-    "inputs": {
-      "model": {
-        "name": "模型"
-      },
-      "preserve_wrapper": {
-        "name": "保留包装器",
-        "tooltip": "启用时，如果存在现有模型函数包装器，将委托给该包装器。通常应保持启用状态。"
-      },
-      "start_sigma": {
-        "name": "起始sigma",
-        "tooltip": "这些选项生效的第一个sigma值。"
-      },
-      "end_sigma": {
-        "name": "结束sigma",
-        "tooltip": "这些选项生效的最后一个sigma值。"
-      },
-      "nerf_tile_size": {
-        "name": "NeRF瓦片大小",
-        "tooltip": "允许覆盖默认的NeRF瓦片大小。-1表示使用默认值（32）。0表示使用非平铺模式（可能需要大量显存）。"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
   "CLIPAttentionMultiply": {
     "display_name": "CLIP注意力相乘",
     "inputs": {
       "clip": {
         "name": "CLIP"
       },
-      "q": {
-        "name": "q"
-      },
       "k": {
         "name": "k"
       },
-      "v": {
-        "name": "v"
-      },
       "out": {
         "name": "输出"
+      },
+      "q": {
+        "name": "q"
+      },
+      "v": {
+        "name": "v"
       }
     },
     "outputs": {
@@ -837,17 +857,17 @@
     }
   },
   "CLIPLoader": {
-    "display_name": "加载CLIP",
     "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",
+    "display_name": "加载CLIP",
     "inputs": {
       "clip_name": {
         "name": "CLIP名称"
       },
-      "type": {
-        "name": "类型"
-      },
       "device": {
         "name": "设备"
+      },
+      "type": {
+        "name": "类型"
       }
     }
   },
@@ -913,16 +933,16 @@
     }
   },
   "CLIPTextEncode": {
-    "display_name": "CLIP文本编码",
     "description": "使用 CLIP 模型将文本编码成嵌入组（embedding），用于引导扩散模型生成图像。",
+    "display_name": "CLIP文本编码",
     "inputs": {
-      "text": {
-        "name": "文本",
-        "tooltip": "要编码的文本。"
-      },
       "clip": {
         "name": "clip",
         "tooltip": "用于编码文本的 CLIP 模型。"
+      },
+      "text": {
+        "name": "文本",
+        "tooltip": "要编码的文本。"
       }
     },
     "outputs": {
@@ -959,11 +979,11 @@
       "clip_l": {
         "name": "clip_l"
       },
-      "t5xxl": {
-        "name": "t5xxl"
-      },
       "guidance": {
         "name": "引导"
+      },
+      "t5xxl": {
+        "name": "t5xxl"
       }
     },
     "outputs": {
@@ -978,17 +998,17 @@
       "clip": {
         "name": "clip"
       },
-      "clip_l": {
-        "name": "clip_l"
-      },
       "clip_g": {
         "name": "clip_g"
       },
-      "t5xxl": {
-        "name": "t5xxl"
+      "clip_l": {
+        "name": "clip_l"
       },
       "llama": {
         "name": "llama"
+      },
+      "t5xxl": {
+        "name": "t5xxl"
       }
     },
     "outputs": {
@@ -1000,12 +1020,12 @@
   "CLIPTextEncodeHunyuanDiT": {
     "display_name": "CLIP文本编码（混元DiT）",
     "inputs": {
-      "clip": {
-        "name": "clip"
-      },
       "bert": {
         "name": "bert"
       },
+      "clip": {
+        "name": "clip"
+      },
       "mt5xl": {
         "name": "mt5xl"
       }
@@ -1036,9 +1056,13 @@
     }
   },
   "CLIPTextEncodeLumina2": {
-    "display_name": "CLIP文本编码（Lumina2）",
     "description": "使用CLIP模型将系统提示和用户提示编码成可以用来引导扩散模型生成特定图像的嵌入。",
+    "display_name": "CLIP文本编码（Lumina2）",
     "inputs": {
+      "clip": {
+        "name": "clip",
+        "tooltip": "用于编码文本的CLIP模型。"
+      },
       "system_prompt": {
         "name": "系统提示词",
         "tooltip": "Lumina2提供两种类型的系统提示：优越：你是一个设计来根据文本提示或用户提示生成优越图像的助手，这些图像具有基于文本提示的优越度的图像-文本对齐。对齐：你是一个设计来根据文本提示生成高质量图像的助手，这些图像具有基于文本提示的最高度的图像-文本对齐。"
@@ -1046,10 +1070,6 @@
       "user_prompt": {
         "name": "提示词",
         "tooltip": "需要编码的文本。"
-      },
-      "clip": {
-        "name": "clip",
-        "tooltip": "用于编码文本的CLIP模型。"
       }
     },
     "outputs": {
@@ -1059,11 +1079,11 @@
     }
   },
   "CLIPTextEncodePixArtAlpha": {
-    "display_name": "CLIP文本编码（PixArtAlpha）",
     "description": "编码文本并设置PixArt Alpha的分辨率条件。不适用于PixArt Sigma。",
+    "display_name": "CLIP文本编码（PixArtAlpha）",
     "inputs": {
-      "width": {
-        "name": "宽度"
+      "clip": {
+        "name": "剪辑"
       },
       "height": {
         "name": "高度"
@@ -1071,8 +1091,8 @@
       "text": {
         "name": "文本"
       },
-      "clip": {
-        "name": "剪辑"
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -1087,17 +1107,17 @@
       "clip": {
         "name": "clip"
       },
-      "clip_l": {
-        "name": "clip_l"
-      },
       "clip_g": {
         "name": "clip_g"
       },
-      "t5xxl": {
-        "name": "t5xxl"
+      "clip_l": {
+        "name": "clip_l"
       },
       "empty_padding": {
         "name": "空白填充"
+      },
+      "t5xxl": {
+        "name": "t5xxl"
       }
     },
     "outputs": {
@@ -1112,29 +1132,29 @@
       "clip": {
         "name": "clip"
       },
-      "width": {
-        "name": "宽度"
-      },
-      "height": {
-        "name": "高度"
+      "crop_h": {
+        "name": "裁剪高"
       },
       "crop_w": {
         "name": "裁剪宽"
       },
-      "crop_h": {
-        "name": "裁剪高"
-      },
-      "target_width": {
-        "name": "目标宽度"
+      "height": {
+        "name": "高度"
       },
       "target_height": {
         "name": "目标高度"
       },
+      "target_width": {
+        "name": "目标宽度"
+      },
       "text_g": {
         "name": "文本_g"
       },
       "text_l": {
         "name": "文本_l"
+      },
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -1149,8 +1169,8 @@
       "ascore": {
         "name": "美学分数"
       },
-      "width": {
-        "name": "宽度"
+      "clip": {
+        "name": "clip"
       },
       "height": {
         "name": "高度"
@@ -1158,8 +1178,8 @@
       "text": {
         "name": "文本"
       },
-      "clip": {
-        "name": "clip"
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -1174,11 +1194,11 @@
       "clip_vision": {
         "name": "clip视觉"
       },
-      "image": {
-        "name": "图像"
-      },
       "crop": {
         "name": "裁剪"
+      },
+      "image": {
+        "name": "图像"
       }
     }
   },
@@ -1190,6 +1210,158 @@
       }
     }
   },
+  "Canny": {
+    "display_name": "Canny边缘检测",
+    "inputs": {
+      "high_threshold": {
+        "name": "高阈值"
+      },
+      "image": {
+        "name": "图像"
+      },
+      "low_threshold": {
+        "name": "低阈值"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CaseConverter": {
+    "display_name": "大小写转换器",
+    "inputs": {
+      "mode": {
+        "name": "模式"
+      },
+      "string": {
+        "name": "字符串"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "CenterCropImages": {
+    "display_name": "裁剪图像（中心）",
+    "inputs": {
+      "height": {
+        "name": "高度",
+        "tooltip": "裁剪框高度"
+      },
+      "images": {
+        "name": "图像",
+        "tooltip": "需要调整的图像"
+      },
+      "width": {
+        "name": "宽度",
+        "tooltip": "裁剪框宽度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "图像",
+        "tooltip": "调整后的图像"
+      }
+    }
+  },
+  "CheckpointLoader": {
+    "display_name": "Ckeckpoint加载器（已弃用）",
+    "inputs": {
+      "ckpt_name": {
+        "name": "Checkpoint名称"
+      },
+      "config_name": {
+        "name": "配置名称"
+      }
+    }
+  },
+  "CheckpointLoaderSimple": {
+    "description": "加载扩散模型 Checkpoint，用于去除 Latent 噪波。",
+    "display_name": "Checkpoint加载器（简易）",
+    "inputs": {
+      "ckpt_name": {
+        "name": "Checkpoint名称",
+        "tooltip": "要加载的Checkpoint模型的名称。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "用于去除 Latent 噪波的模型。"
+      },
+      "1": {
+        "tooltip": "用于编码文本提示的 CLIP 模型。"
+      },
+      "2": {
+        "tooltip": "用于将图像编码和解码到 Latent 的 VAE 模型。"
+      }
+    }
+  },
+  "CheckpointSave": {
+    "display_name": "保存Checkpoint",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "filename_prefix": {
+        "name": "文件名前缀"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
+  "ChromaRadianceOptions": {
+    "description": "允许为Chroma Radiance模型设置高级选项。",
+    "display_name": "ChromaRadiance选项",
+    "inputs": {
+      "end_sigma": {
+        "name": "结束sigma",
+        "tooltip": "这些选项生效的最后一个sigma值。"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "nerf_tile_size": {
+        "name": "NeRF瓦片大小",
+        "tooltip": "允许覆盖默认的NeRF瓦片大小。-1表示使用默认值（32）。0表示使用非平铺模式（可能需要大量显存）。"
+      },
+      "preserve_wrapper": {
+        "name": "保留包装器",
+        "tooltip": "启用时，如果存在现有模型函数包装器，将委托给该包装器。通常应保持启用状态。"
+      },
+      "start_sigma": {
+        "name": "起始sigma",
+        "tooltip": "这些选项生效的第一个sigma值。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ColorToRGBInt": {
+    "description": "将颜色转换为RGB整数值。",
+    "display_name": "颜色转RGB整数",
+    "inputs": {
+      "color": {
+        "name": "颜色"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "rgb整数",
+        "tooltip": null
+      }
+    }
+  },
   "CombineHooks2": {
     "display_name": "组合约束 [2]",
     "inputs": {
@@ -1247,15 +1419,35 @@
       }
     }
   },
+  "ComfySwitchNode": {
+    "display_name": "切换",
+    "inputs": {
+      "on_false": {
+        "name": "为假时"
+      },
+      "on_true": {
+        "name": "为真时"
+      },
+      "switch": {
+        "name": "切换"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "输出",
+        "tooltip": null
+      }
+    }
+  },
   "ConditioningAverage": {
     "display_name": "条件平均",
     "inputs": {
-      "conditioning_to": {
-        "name": "条件到"
-      },
       "conditioning_from": {
         "name": "条件从"
       },
+      "conditioning_to": {
+        "name": "条件到"
+      },
       "conditioning_to_strength": {
         "name": "条件到强度"
       }
@@ -1275,11 +1467,11 @@
   "ConditioningConcat": {
     "display_name": "条件连接",
     "inputs": {
-      "conditioning_to": {
-        "name": "条件到"
-      },
       "conditioning_from": {
         "name": "条件从"
+      },
+      "conditioning_to": {
+        "name": "条件到"
       }
     }
   },
@@ -1289,20 +1481,20 @@
       "conditioning": {
         "name": "条件"
       },
-      "width": {
-        "name": "宽度"
-      },
       "height": {
         "name": "高度"
       },
+      "strength": {
+        "name": "强度"
+      },
+      "width": {
+        "name": "宽度"
+      },
       "x": {
         "name": "x"
       },
       "y": {
         "name": "y"
-      },
-      "strength": {
-        "name": "强度"
       }
     }
   },
@@ -1312,20 +1504,20 @@
       "conditioning": {
         "name": "条件化"
       },
-      "width": {
-        "name": "宽度"
-      },
       "height": {
         "name": "高度"
       },
+      "strength": {
+        "name": "强度"
+      },
+      "width": {
+        "name": "宽度"
+      },
       "x": {
         "name": "x"
       },
       "y": {
         "name": "y"
-      },
-      "strength": {
-        "name": "强度"
       }
     }
   },
@@ -1335,15 +1527,18 @@
       "conditioning": {
         "name": "调节"
       },
-      "width": {
-        "name": "宽度"
-      },
       "height": {
         "name": "高度"
       },
+      "strength": {
+        "name": "强度"
+      },
       "temporal": {
         "name": "时间"
       },
+      "width": {
+        "name": "宽度"
+      },
       "x": {
         "name": "x"
       },
@@ -1352,9 +1547,6 @@
       },
       "z": {
         "name": "z"
-      },
-      "strength": {
-        "name": "强度"
       }
     }
   },
@@ -1392,11 +1584,11 @@
       "mask": {
         "name": "遮罩"
       },
-      "strength": {
-        "name": "强度"
-      },
       "set_cond_area": {
         "name": "设置条件区域"
+      },
+      "strength": {
+        "name": "强度"
       }
     }
   },
@@ -1406,17 +1598,17 @@
       "cond_NEW": {
         "name": "新条件"
       },
-      "strength": {
-        "name": "强度"
-      },
-      "set_cond_area": {
-        "name": "设置条件区域"
+      "hooks": {
+        "name": "约束"
       },
       "mask": {
         "name": "遮罩"
       },
-      "hooks": {
-        "name": "约束"
+      "set_cond_area": {
+        "name": "设置条件区域"
+      },
+      "strength": {
+        "name": "强度"
       },
       "timesteps": {
         "name": "间隔"
@@ -1432,17 +1624,17 @@
       "cond_NEW": {
         "name": "新条件"
       },
-      "strength": {
-        "name": "强度"
-      },
-      "set_cond_area": {
-        "name": "设置条件区域"
+      "hooks": {
+        "name": "约束"
       },
       "mask": {
         "name": "遮罩"
       },
-      "hooks": {
-        "name": "约束"
+      "set_cond_area": {
+        "name": "设置条件区域"
+      },
+      "strength": {
+        "name": "强度"
       },
       "timesteps": {
         "name": "间隔"
@@ -1455,23 +1647,23 @@
       "conditioning": {
         "name": "条件"
       },
-      "start": {
-        "name": "开始"
-      },
       "end": {
         "name": "结束"
+      },
+      "start": {
+        "name": "开始"
       }
     }
   },
   "ConditioningStableAudio": {
     "display_name": "StableAudio条件",
     "inputs": {
-      "positive": {
-        "name": "正面条件"
-      },
       "negative": {
         "name": "负面条件"
       },
+      "positive": {
+        "name": "正面条件"
+      },
       "seconds_start": {
         "name": "开始秒数"
       },
@@ -1493,11 +1685,11 @@
   "ConditioningTimestepsRange": {
     "display_name": "条件间隔范围",
     "inputs": {
-      "start_percent": {
-        "name": "开始百分比"
-      },
       "end_percent": {
         "name": "结束百分比"
+      },
+      "start_percent": {
+        "name": "开始百分比"
       }
     },
     "outputs": {
@@ -1518,12 +1710,12 @@
     }
   },
   "ContextWindowsManual": {
-    "display_name": "上下文窗口（手动）",
     "description": "手动设置上下文窗口。",
+    "display_name": "上下文窗口（手动）",
     "inputs": {
-      "model": {
-        "name": "模型",
-        "tooltip": "在采样期间应用上下文窗口的模型。"
+      "closed_loop": {
+        "name": "闭环",
+        "tooltip": "是否闭合上下文窗口循环；仅适用于循环调度。"
       },
       "context_length": {
         "name": "上下文长度",
@@ -1541,14 +1733,6 @@
         "name": "上下文步幅",
         "tooltip": "上下文窗口的步幅；仅适用于均匀调度。"
       },
-      "closed_loop": {
-        "name": "闭环",
-        "tooltip": "是否闭合上下文窗口循环；仅适用于循环调度。"
-      },
-      "fuse_method": {
-        "name": "融合方法",
-        "tooltip": "用于融合上下文窗口的方法。"
-      },
       "dim": {
         "name": "维度",
         "tooltip": "应用上下文窗口的维度。"
@@ -1556,6 +1740,14 @@
       "freenoise": {
         "name": "Freenoise",
         "tooltip": "是否应用 Freenoise，优化窗口融合。"
+      },
+      "fuse_method": {
+        "name": "融合方法",
+        "tooltip": "用于融合上下文窗口的方法。"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "在采样期间应用上下文窗口的模型。"
       }
     },
     "outputs": {
@@ -1584,26 +1776,26 @@
   "ControlNetApplyAdvanced": {
     "display_name": "应用ControlNet（旧版高级）",
     "inputs": {
-      "positive": {
-        "name": "正面条件"
-      },
-      "negative": {
-        "name": "负面条件"
-      },
       "control_net": {
         "name": "ControlNet"
       },
+      "end_percent": {
+        "name": "结束百分比"
+      },
       "image": {
         "name": "图像"
       },
-      "strength": {
-        "name": "强度"
+      "negative": {
+        "name": "负面条件"
+      },
+      "positive": {
+        "name": "正面条件"
       },
       "start_percent": {
         "name": "开始百分比"
       },
-      "end_percent": {
-        "name": "结束百分比"
+      "strength": {
+        "name": "强度"
       },
       "vae": {
         "name": "vae"
@@ -1621,29 +1813,29 @@
   "ControlNetApplySD3": {
     "display_name": "应用ControlNet",
     "inputs": {
-      "positive": {
-        "name": "正面条件"
-      },
-      "negative": {
-        "name": "负面条件"
-      },
       "control_net": {
         "name": "ControlNet"
       },
-      "vae": {
-        "name": "vae"
+      "end_percent": {
+        "name": "结束百分比"
       },
       "image": {
         "name": "图像"
       },
-      "strength": {
-        "name": "强度"
+      "negative": {
+        "name": "负面条件"
+      },
+      "positive": {
+        "name": "正面条件"
       },
       "start_percent": {
         "name": "开始百分比"
       },
-      "end_percent": {
-        "name": "结束百分比"
+      "strength": {
+        "name": "强度"
+      },
+      "vae": {
+        "name": "vae"
       }
     },
     "outputs": {
@@ -1660,17 +1852,11 @@
   "ControlNetInpaintingAliMamaApply": {
     "display_name": "应用ControlNet（阿里妈妈局部重绘）",
     "inputs": {
-      "positive": {
-        "name": "正面条件"
-      },
-      "negative": {
-        "name": "负面条件"
-      },
       "control_net": {
         "name": "ControlNet"
       },
-      "vae": {
-        "name": "vae"
+      "end_percent": {
+        "name": "结束百分比"
       },
       "image": {
         "name": "图像"
@@ -1678,14 +1864,20 @@
       "mask": {
         "name": "遮罩"
       },
-      "strength": {
-        "name": "强度"
+      "negative": {
+        "name": "负面条件"
+      },
+      "positive": {
+        "name": "正面条件"
       },
       "start_percent": {
         "name": "开始百分比"
       },
-      "end_percent": {
-        "name": "结束百分比"
+      "strength": {
+        "name": "强度"
+      },
+      "vae": {
+        "name": "vae"
       }
     },
     "outputs": {
@@ -1710,11 +1902,11 @@
   "CosmosImageToVideoLatent": {
     "display_name": "图像到视频Latent（Cosmos）",
     "inputs": {
-      "vae": {
-        "name": "vae"
+      "batch_size": {
+        "name": "批量大小"
       },
-      "width": {
-        "name": "宽度"
+      "end_image": {
+        "name": "结束图像"
       },
       "height": {
         "name": "高度"
@@ -1722,14 +1914,14 @@
       "length": {
         "name": "长度"
       },
-      "batch_size": {
-        "name": "批量大小"
-      },
       "start_image": {
         "name": "开始图像"
       },
-      "end_image": {
-        "name": "结束图像"
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -1741,11 +1933,11 @@
   "CosmosPredict2ImageToVideoLatent": {
     "display_name": "图像到视频Latent（CosmosPredict2）",
     "inputs": {
-      "vae": {
-        "name": "vae"
+      "batch_size": {
+        "name": "批次大小"
       },
-      "width": {
-        "name": "宽度"
+      "end_image": {
+        "name": "结束图像"
       },
       "height": {
         "name": "高度"
@@ -1753,14 +1945,14 @@
       "length": {
         "name": "长度"
       },
-      "batch_size": {
-        "name": "批次大小"
-      },
       "start_image": {
         "name": "起始图像"
       },
-      "end_image": {
-        "name": "结束图像"
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -1772,14 +1964,14 @@
   "CreateHookKeyframe": {
     "display_name": "创建约束关键帧",
     "inputs": {
-      "strength_mult": {
-        "name": "强度倍数"
+      "prev_hook_kf": {
+        "name": "前一个约束关键帧"
       },
       "start_percent": {
         "name": "开始百分比"
       },
-      "prev_hook_kf": {
-        "name": "前一个约束关键帧"
+      "strength_mult": {
+        "name": "强度倍数"
       }
     },
     "outputs": {
@@ -1791,20 +1983,20 @@
   "CreateHookKeyframesFromFloats": {
     "display_name": "从浮点数创建约束关键帧",
     "inputs": {
+      "end_percent": {
+        "name": "结束百分比"
+      },
       "floats_strength": {
         "name": "浮点强度"
       },
-      "start_percent": {
-        "name": "开始百分比"
-      },
-      "end_percent": {
-        "name": "结束百分比"
+      "prev_hook_kf": {
+        "name": "前一个约束关键帧"
       },
       "print_keyframes": {
         "name": "打印关键帧"
       },
-      "prev_hook_kf": {
-        "name": "前一个约束关键帧"
+      "start_percent": {
+        "name": "开始百分比"
       }
     },
     "outputs": {
@@ -1816,29 +2008,29 @@
   "CreateHookKeyframesInterpolated": {
     "display_name": "创建约束关键帧插值",
     "inputs": {
-      "strength_start": {
-        "name": "开始强度"
-      },
-      "strength_end": {
-        "name": "结束强度"
+      "end_percent": {
+        "name": "结束百分比"
       },
       "interpolation": {
         "name": "插值"
       },
-      "start_percent": {
-        "name": "开始百分比"
-      },
-      "end_percent": {
-        "name": "结束百分比"
-      },
       "keyframes_count": {
         "name": "关键帧数量"
       },
+      "prev_hook_kf": {
+        "name": "前一个约束关键帧"
+      },
       "print_keyframes": {
         "name": "打印关键帧"
       },
-      "prev_hook_kf": {
-        "name": "前一个约束关键帧"
+      "start_percent": {
+        "name": "开始百分比"
+      },
+      "strength_end": {
+        "name": "结束强度"
+      },
+      "strength_start": {
+        "name": "开始强度"
       }
     },
     "outputs": {
@@ -1853,14 +2045,14 @@
       "lora_name": {
         "name": "LoRA名称"
       },
-      "strength_model": {
-        "name": "模型强度"
+      "prev_hooks": {
+        "name": "前一个约束"
       },
       "strength_clip": {
         "name": "CLIP强度"
       },
-      "prev_hooks": {
-        "name": "前一个约束"
+      "strength_model": {
+        "name": "模型强度"
       }
     }
   },
@@ -1870,11 +2062,11 @@
       "lora_name": {
         "name": "LoRA名称"
       },
-      "strength_model": {
-        "name": "模型强度"
-      },
       "prev_hooks": {
         "name": "前一个约束"
+      },
+      "strength_model": {
+        "name": "模型强度"
       }
     }
   },
@@ -1884,14 +2076,14 @@
       "ckpt_name": {
         "name": "Checkpoint名称"
       },
-      "strength_model": {
-        "name": "模型强度"
+      "prev_hooks": {
+        "name": "前一个约束"
       },
       "strength_clip": {
         "name": "CLIP强度"
       },
-      "prev_hooks": {
-        "name": "前一个约束"
+      "strength_model": {
+        "name": "模型强度"
       }
     }
   },
@@ -1901,28 +2093,42 @@
       "ckpt_name": {
         "name": "Checkpoint名称"
       },
-      "strength_model": {
-        "name": "模型强度"
-      },
       "prev_hooks": {
         "name": "前一个约束"
+      },
+      "strength_model": {
+        "name": "模型强度"
+      }
+    }
+  },
+  "CreateList": {
+    "display_name": "创建列表",
+    "inputs": {
+      "inputs": {
+        "name": "输入"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "列表",
+        "tooltip": null
       }
     }
   },
   "CreateVideo": {
-    "display_name": "创建视频",
     "description": "从图像创建视频。",
+    "display_name": "创建视频",
     "inputs": {
-      "images": {
-        "name": "图像",
-        "tooltip": "用于创建视频的图像。"
+      "audio": {
+        "name": "音频",
+        "tooltip": "要添加到视频中的音频。"
       },
       "fps": {
         "name": "帧率"
       },
-      "audio": {
-        "name": "音频",
-        "tooltip": "要添加到视频中的音频。"
+      "images": {
+        "name": "图像",
+        "tooltip": "用于创建视频的图像。"
       }
     },
     "outputs": {
@@ -1931,23 +2137,52 @@
       }
     }
   },
+  "CropByBBoxes": {
+    "description": "根据提供的边界框，从输入图像批量中裁剪并调整区域大小。",
+    "display_name": "CropByBBoxes",
+    "inputs": {
+      "bboxes": {
+        "name": "bboxes"
+      },
+      "image": {
+        "name": "image"
+      },
+      "output_height": {
+        "name": "output_height",
+        "tooltip": "每个裁剪区域调整后的高度。"
+      },
+      "output_width": {
+        "name": "output_width",
+        "tooltip": "每个裁剪区域调整后的宽度。"
+      },
+      "padding": {
+        "name": "padding",
+        "tooltip": "在裁剪前，每个边界框四周额外添加的像素填充。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "所有裁剪区域堆叠为一个图像批量。"
+      }
+    }
+  },
   "CropMask": {
     "display_name": "裁剪遮罩",
     "inputs": {
+      "height": {
+        "name": "高度"
+      },
       "mask": {
         "name": "遮罩"
       },
+      "width": {
+        "name": "宽度"
+      },
       "x": {
         "name": "x"
       },
       "y": {
         "name": "y"
-      },
-      "width": {
-        "name": "宽度"
-      },
-      "height": {
-        "name": "高度"
       }
     },
     "outputs": {
@@ -1956,14 +2191,33 @@
       }
     }
   },
+  "CustomCombo": {
+    "display_name": "自定义组合",
+    "inputs": {
+      "choice": {
+        "name": "选择"
+      },
+      "index": {},
+      "option1": {}
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "索引",
+        "tooltip": null
+      }
+    }
+  },
   "DiffControlNetLoader": {
     "display_name": "加载ControlNet模型（diff）",
     "inputs": {
-      "model": {
-        "name": "模型"
-      },
       "control_net_name": {
         "name": "ControlNet名称"
+      },
+      "model": {
+        "name": "模型"
       }
     }
   },
@@ -2002,8 +2256,11 @@
   "DualCFGGuider": {
     "display_name": "双CFG引导器",
     "inputs": {
-      "model": {
-        "name": "模型"
+      "cfg_cond2_negative": {
+        "name": "cfg_条件2_负面"
+      },
+      "cfg_conds": {
+        "name": "cfg_条件1"
       },
       "cond1": {
         "name": "条件1"
@@ -2011,15 +2268,12 @@
       "cond2": {
         "name": "条件2"
       },
+      "model": {
+        "name": "模型"
+      },
       "negative": {
         "name": "负面条件"
       },
-      "cfg_conds": {
-        "name": "cfg_条件1"
-      },
-      "cfg_cond2_negative": {
-        "name": "cfg_条件2_负面"
-      },
       "style": {
         "name": "样式"
       }
@@ -2031,8 +2285,8 @@
     }
   },
   "DualCLIPLoader": {
-    "display_name": "双CLIP加载器",
     "description": "[配方]\n\nSDXL：clip-l，clip-g\nSD3：clip-l，clip-g / clip-l，t5 / clip-g，t5\nFlux：clip-l，t5",
+    "display_name": "双CLIP加载器",
     "inputs": {
       "clip_name1": {
         "name": "CLIP名称1"
@@ -2040,18 +2294,22 @@
       "clip_name2": {
         "name": "CLIP名称2"
       },
-      "type": {
-        "name": "类型"
-      },
       "device": {
         "name": "设备"
+      },
+      "type": {
+        "name": "类型"
       }
     }
   },
   "EasyCache": {
-    "display_name": "EasyCache",
     "description": "原生 EasyCache 实现。",
+    "display_name": "EasyCache",
     "inputs": {
+      "end_percent": {
+        "name": "结束位置",
+        "tooltip": "结束使用 EasyCache 的相对采样步数。"
+      },
       "model": {
         "name": "模型",
         "tooltip": "要添加 EasyCache 的模型。"
@@ -2064,10 +2322,6 @@
         "name": "开始位置",
         "tooltip": "开始使用 EasyCache 的相对采样步数。"
       },
-      "end_percent": {
-        "name": "结束位置",
-        "tooltip": "结束使用 EasyCache 的相对采样步数。"
-      },
       "verbose": {
         "name": "调试信息",
         "tooltip": "是否记录详细信息。"
@@ -2079,15 +2333,330 @@
       }
     }
   },
+  "ElevenLabsAudioIsolation": {
+    "description": "去除音频中的背景噪音，仅保留人声或语音。",
+    "display_name": "ElevenLabs 语音隔离",
+    "inputs": {
+      "audio": {
+        "name": "音频",
+        "tooltip": "需要去除背景噪音的音频。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsInstantVoiceClone": {
+    "description": "通过音频样本创建克隆语音。请提供 1-8 段需要克隆的语音录音。",
+    "display_name": "ElevenLabs 即时语音克隆",
+    "inputs": {
+      "files": {
+        "name": "音频文件",
+        "tooltip": "用于语音克隆的录音。"
+      },
+      "remove_background_noise": {
+        "name": "去除背景噪音",
+        "tooltip": "使用音频隔离去除语音样本中的背景噪音。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "语音",
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsSpeechToSpeech": {
+    "description": "将一种声音的语音转换为另一种声音，同时保留原始内容和情感。",
+    "display_name": "ElevenLabs 语音转换",
+    "inputs": {
+      "audio": {
+        "name": "源音频",
+        "tooltip": "需要转换的源音频。"
+      },
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "用于语音转换的模型。"
+      },
+      "model_similarity_boost": {
+        "name": "相似度增强"
+      },
+      "model_speed": {
+        "name": "速度"
+      },
+      "model_style": {
+        "name": "风格"
+      },
+      "model_use_speaker_boost": {
+        "name": "扬声器增强"
+      },
+      "output_format": {
+        "name": "输出格式",
+        "tooltip": "音频输出格式。"
+      },
+      "remove_background_noise": {
+        "name": "去除背景噪音",
+        "tooltip": "使用音频隔离去除输入音频中的背景噪音。"
+      },
+      "seed": {
+        "name": "随机种子",
+        "tooltip": "用于结果复现的随机种子。"
+      },
+      "stability": {
+        "name": "稳定性",
+        "tooltip": "语音稳定性。较低数值带来更广的情感范围，较高数值则更一致但可能较为单调。"
+      },
+      "voice": {
+        "name": "目标语音",
+        "tooltip": "转换的目标语音。可从语音选择器或即时语音克隆连接。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsSpeechToText": {
+    "description": "将音频转录为文本。支持自动语言检测、说话人分离和音频事件标记。",
+    "display_name": "ElevenLabs 语音转文本",
+    "inputs": {
+      "audio": {
+        "name": "音频",
+        "tooltip": "要转录的音频。"
+      },
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "language_code": {
+        "name": "语言代码",
+        "tooltip": "ISO-639-1 或 ISO-639-3 语言代码（如 'en'、'es'、'fra'）。留空以自动检测。"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "用于转录的模型。"
+      },
+      "model_diarization_threshold": {
+        "name": "分离阈值"
+      },
+      "model_diarize": {
+        "name": "说话人分离"
+      },
+      "model_tag_audio_events": {
+        "name": "音频事件标记"
+      },
+      "model_temperature": {
+        "name": "温度"
+      },
+      "model_timestamps_granularity": {
+        "name": "时间戳粒度"
+      },
+      "num_speakers": {
+        "name": "说话人数",
+        "tooltip": "要预测的最大说话人数。设置为 0 以自动检测。"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "用于结果复现的种子（不保证确定性）。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "文本",
+        "tooltip": null
+      },
+      "1": {
+        "name": "语言代码",
+        "tooltip": null
+      },
+      "2": {
+        "name": "单词 JSON",
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToDialogue": {
+    "description": "从文本生成多说话人对话。每条对话都有独立的文本和声音。",
+    "display_name": "ElevenLabs 文本转对话",
+    "inputs": {
+      "apply_text_normalization": {
+        "name": "应用文本规范化",
+        "tooltip": "文本规范化模式。'auto' 由系统决定，'on' 总是应用规范化，'off' 跳过规范化。"
+      },
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "inputs": {
+        "name": "对话条数",
+        "tooltip": "对话条目的数量。"
+      },
+      "inputs_text1": {
+        "name": "文本1"
+      },
+      "language_code": {
+        "name": "语言代码",
+        "tooltip": "ISO-639-1 或 ISO-639-3 语言代码（如 'en'、'es'、'fra'）。留空以自动检测。"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "用于对话生成的模型。"
+      },
+      "output_format": {
+        "name": "输出格式",
+        "tooltip": "音频输出格式。"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "用于结果复现的种子。"
+      },
+      "stability": {
+        "name": "稳定性",
+        "tooltip": "语音稳定性。值越低情感范围越广，值越高语音更一致但可能更单调。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToSoundEffects": {
+    "description": "根据文本描述生成音效。",
+    "display_name": "ElevenLabs 文本转音效",
+    "inputs": {
+      "model": {
+        "name": "模型",
+        "tooltip": "用于音效生成的模型。"
+      },
+      "model_duration": {
+        "name": "时长"
+      },
+      "model_loop": {
+        "name": "循环"
+      },
+      "model_prompt_influence": {
+        "name": "提示影响"
+      },
+      "output_format": {
+        "name": "输出格式",
+        "tooltip": "音频输出格式。"
+      },
+      "text": {
+        "name": "文本",
+        "tooltip": "要生成的音效的文本描述。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsTextToSpeech": {
+    "description": "将文字转换为语音。",
+    "display_name": "ElevenLabs 文字转语音",
+    "inputs": {
+      "apply_text_normalization": {
+        "name": "apply_text_normalization",
+        "tooltip": "文本规范化模式。'auto' 由系统决定，'on' 总是应用规范化，'off' 跳过规范化。"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "language_code": {
+        "name": "language_code",
+        "tooltip": "ISO-639-1 或 ISO-639-3 语言代码（如 'en'、'es'、'fra'）。留空则自动检测。"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "用于文字转语音的模型。"
+      },
+      "model_similarity_boost": {
+        "name": "similarity_boost"
+      },
+      "model_speed": {
+        "name": "speed"
+      },
+      "model_style": {
+        "name": "style"
+      },
+      "model_use_speaker_boost": {
+        "name": "use_speaker_boost"
+      },
+      "output_format": {
+        "name": "output_format",
+        "tooltip": "音频输出格式。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "用于结果可复现的种子（不保证完全确定性）。"
+      },
+      "stability": {
+        "name": "stability",
+        "tooltip": "语音稳定性。较低的数值带来更广泛的情感变化，较高的数值则语音更一致但可能单调。"
+      },
+      "text": {
+        "name": "text",
+        "tooltip": "要转换为语音的文本。"
+      },
+      "voice": {
+        "name": "voice",
+        "tooltip": "用于语音合成的声音。从 Voice Selector 或 Instant Voice Clone 连接。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ElevenLabsVoiceSelector": {
+    "description": "为文字转语音生成选择预设的 ElevenLabs 声音。",
+    "display_name": "ElevenLabs 声音选择器",
+    "inputs": {
+      "voice": {
+        "name": "voice",
+        "tooltip": "从预设的 ElevenLabs 声音中选择一个声音。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "voice",
+        "tooltip": null
+      }
+    }
+  },
+  "EmptyAceStep1_5LatentAudio": {
+    "display_name": "Empty Ace Step 1.5 潜空间音频",
+    "inputs": {
+      "batch_size": {
+        "name": "批量大小",
+        "tooltip": "批次中的潜空间图像数量。"
+      },
+      "seconds": {
+        "name": "秒数"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "EmptyAceStepLatentAudio": {
     "display_name": "空Latent音频（AceStep）",
     "inputs": {
-      "seconds": {
-        "name": "秒数"
-      },
       "batch_size": {
         "name": "批次大小",
         "tooltip": "批次中的 Latent 数量。"
+      },
+      "seconds": {
+        "name": "秒数"
       }
     },
     "outputs": {
@@ -2099,6 +2668,10 @@
   "EmptyAudio": {
     "display_name": "空音频",
     "inputs": {
+      "channels": {
+        "name": "通道",
+        "tooltip": "音频通道数（1 为单声道，2 为立体声）。"
+      },
       "duration": {
         "name": "长度",
         "tooltip": "空音频片段的持续时间（秒）"
@@ -2106,10 +2679,6 @@
       "sample_rate": {
         "name": "采样率",
         "tooltip": "空音频片段的采样率。"
-      },
-      "channels": {
-        "name": "通道",
-        "tooltip": "音频通道数（1 为单声道，2 为立体声）。"
       }
     },
     "outputs": {
@@ -2121,14 +2690,14 @@
   "EmptyChromaRadianceLatentImage": {
     "display_name": "空Latent图像（ChromaRadiance）",
     "inputs": {
-      "width": {
-        "name": "宽度"
+      "batch_size": {
+        "name": "批次大小"
       },
       "height": {
         "name": "高度"
       },
-      "batch_size": {
-        "name": "批次大小"
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -2140,8 +2709,8 @@
   "EmptyCosmosLatentVideo": {
     "display_name": "空Latent视频（Cosmos）",
     "inputs": {
-      "width": {
-        "name": "宽度"
+      "batch_size": {
+        "name": "批量大小"
       },
       "height": {
         "name": "高度"
@@ -2149,8 +2718,8 @@
       "length": {
         "name": "长度"
       },
-      "batch_size": {
-        "name": "批量大小"
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -2162,14 +2731,14 @@
   "EmptyFlux2LatentImage": {
     "display_name": "空Latent图像（Flux2）",
     "inputs": {
-      "width": {
-        "name": "width"
+      "batch_size": {
+        "name": "batch_size"
       },
       "height": {
         "name": "height"
       },
-      "batch_size": {
-        "name": "batch_size"
+      "width": {
+        "name": "width"
       }
     },
     "outputs": {
@@ -2179,16 +2748,16 @@
     }
   },
   "EmptyHunyuanImageLatent": {
-    "display_name": "空Latent图像",
+    "display_name": "空Latent图像（Hunyuan）",
     "inputs": {
-      "width": {
-        "name": "宽度"
+      "batch_size": {
+        "name": "批次大小"
       },
       "height": {
         "name": "高度"
       },
-      "batch_size": {
-        "name": "批次大小"
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -2200,8 +2769,8 @@
   "EmptyHunyuanLatentVideo": {
     "display_name": "空Latent视频（Hunyuan）",
     "inputs": {
-      "width": {
-        "name": "宽度"
+      "batch_size": {
+        "name": "批量大小"
       },
       "height": {
         "name": "高度"
@@ -2209,8 +2778,8 @@
       "length": {
         "name": "长度"
       },
-      "batch_size": {
-        "name": "批量大小"
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -2222,8 +2791,8 @@
   "EmptyHunyuanVideo15Latent": {
     "display_name": "空Latent视频（Hunyuan1.5）",
     "inputs": {
-      "width": {
-        "name": "宽度"
+      "batch_size": {
+        "name": "批次大小"
       },
       "height": {
         "name": "高度"
@@ -2231,8 +2800,8 @@
       "length": {
         "name": "时长"
       },
-      "batch_size": {
-        "name": "批次大小"
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -2244,29 +2813,51 @@
   "EmptyImage": {
     "display_name": "空图像",
     "inputs": {
-      "width": {
-        "name": "宽度"
-      },
-      "height": {
-        "name": "高度"
-      },
       "batch_size": {
         "name": "批量大小"
       },
       "color": {
         "name": "颜色"
+      },
+      "height": {
+        "name": "高度"
+      },
+      "width": {
+        "name": "宽度"
+      }
+    }
+  },
+  "EmptyLTXVLatentVideo": {
+    "display_name": "空Latent视频（LTXV）",
+    "inputs": {
+      "batch_size": {
+        "name": "批量大小"
+      },
+      "height": {
+        "name": "高度"
+      },
+      "length": {
+        "name": "长度"
+      },
+      "width": {
+        "name": "宽度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
       }
     }
   },
   "EmptyLatentAudio": {
     "display_name": "空Latent音频",
     "inputs": {
-      "seconds": {
-        "name": "秒"
-      },
       "batch_size": {
         "name": "批量大小",
         "tooltip": "批次中的Latent数量。"
+      },
+      "seconds": {
+        "name": "秒"
       }
     },
     "outputs": {
@@ -2278,12 +2869,12 @@
   "EmptyLatentHunyuan3Dv2": {
     "display_name": "空Latent图像（Hunyuan3Dv2）",
     "inputs": {
-      "resolution": {
-        "name": "分辨率"
-      },
       "batch_size": {
         "name": "批次大小",
         "tooltip": "批次中的Latent数量。"
+      },
+      "resolution": {
+        "name": "分辨率"
       }
     },
     "outputs": {
@@ -2293,20 +2884,20 @@
     }
   },
   "EmptyLatentImage": {
-    "display_name": "空Latent图像",
     "description": "创建一批新的空Latent图像，以通过采样进行降噪。",
+    "display_name": "空Latent图像",
     "inputs": {
-      "width": {
-        "name": "宽度",
-        "tooltip": "Latent图像的宽度（像素）。"
+      "batch_size": {
+        "name": "批量大小",
+        "tooltip": "批次中的Latent数量。"
       },
       "height": {
         "name": "高度",
         "tooltip": "Latent图像的高度（像素）。"
       },
-      "batch_size": {
-        "name": "批量大小",
-        "tooltip": "批次中的Latent数量。"
+      "width": {
+        "name": "宽度",
+        "tooltip": "Latent图像的宽度（像素）。"
       }
     },
     "outputs": {
@@ -2315,33 +2906,11 @@
       }
     }
   },
-  "EmptyLTXVLatentVideo": {
-    "display_name": "空Latent视频（LTXV）",
-    "inputs": {
-      "width": {
-        "name": "宽度"
-      },
-      "height": {
-        "name": "高度"
-      },
-      "length": {
-        "name": "长度"
-      },
-      "batch_size": {
-        "name": "批量大小"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
   "EmptyMochiLatentVideo": {
     "display_name": "空Latent视频（Mochi）",
     "inputs": {
-      "width": {
-        "name": "宽度"
+      "batch_size": {
+        "name": "批量大小"
       },
       "height": {
         "name": "高度"
@@ -2349,8 +2918,8 @@
       "length": {
         "name": "长度"
       },
-      "batch_size": {
-        "name": "批量大小"
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -2362,8 +2931,8 @@
   "EmptyQwenImageLayeredLatentImage": {
     "display_name": "空Latent图像（QwenImageLayerd）",
     "inputs": {
-      "width": {
-        "name": "宽度"
+      "batch_size": {
+        "name": "批次大小"
       },
       "height": {
         "name": "高度"
@@ -2371,8 +2940,8 @@
       "layers": {
         "name": "图层"
       },
-      "batch_size": {
-        "name": "批次大小"
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -2384,14 +2953,14 @@
   "EmptySD3LatentImage": {
     "display_name": "空Latent图像（SD3）",
     "inputs": {
-      "width": {
-        "name": "宽度"
+      "batch_size": {
+        "name": "批量大小"
       },
       "height": {
         "name": "高度"
       },
-      "batch_size": {
-        "name": "批量大小"
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -2419,14 +2988,14 @@
   "ExponentialScheduler": {
     "display_name": "Exponential调度器",
     "inputs": {
-      "steps": {
-        "name": "步数"
-      },
       "sigma_max": {
         "name": "最大Sigma"
       },
       "sigma_min": {
         "name": "最小Sigma"
+      },
+      "steps": {
+        "name": "步数"
       }
     },
     "outputs": {
@@ -2438,20 +3007,20 @@
   "ExtendIntermediateSigmas": {
     "display_name": "插值扩展Sigmas",
     "inputs": {
+      "end_at_sigma": {
+        "name": "结束 sigma"
+      },
       "sigmas": {
         "name": "sigmas"
       },
-      "steps": {
-        "name": "步数"
+      "spacing": {
+        "name": "间距方式"
       },
       "start_at_sigma": {
         "name": "起始 sigma"
       },
-      "end_at_sigma": {
-        "name": "结束 sigma"
-      },
-      "spacing": {
-        "name": "间距方式"
+      "steps": {
+        "name": "步数"
       }
     },
     "outputs": {
@@ -2463,20 +3032,20 @@
   "FeatherMask": {
     "display_name": "羽化遮罩",
     "inputs": {
-      "mask": {
-        "name": "遮罩"
+      "bottom": {
+        "name": "底"
       },
       "left": {
         "name": "左"
       },
-      "top": {
-        "name": "顶"
+      "mask": {
+        "name": "遮罩"
       },
       "right": {
         "name": "右"
       },
-      "bottom": {
-        "name": "底"
+      "top": {
+        "name": "顶"
       }
     },
     "outputs": {
@@ -2499,33 +3068,33 @@
     }
   },
   "Flux2MaxImageNode": {
-    "display_name": "Flux.2 [max] 图像",
     "description": "根据提示词和分辨率同步生成图像。",
+    "display_name": "Flux.2 [max] 图像",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于生成或编辑的提示词"
-      },
-      "width": {
-        "name": "宽度"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "height": {
         "name": "高度"
       },
-      "seed": {
-        "name": "随机种",
-        "tooltip": "创建噪波的随机种"
-      },
-      "prompt_upsampling": {
-        "name": "提示词上采样",
-        "tooltip": "选择启用提示词采样，启用后会自动修改提示词生成更具创意的内容。"
-      },
       "images": {
         "name": "图像",
         "tooltip": "参考图像（最多9张）"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于生成或编辑的提示词"
+      },
+      "prompt_upsampling": {
+        "name": "提示词上采样",
+        "tooltip": "选择启用提示词采样，启用后会自动修改提示词生成更具创意的内容。"
+      },
+      "seed": {
+        "name": "随机种",
+        "tooltip": "创建噪波的随机种"
+      },
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -2535,33 +3104,33 @@
     }
   },
   "Flux2ProImageNode": {
-    "display_name": "Flux.2 [pro] 图像",
     "description": "根据提示词和分辨率同步生成图像。",
+    "display_name": "Flux.2 [pro] 图像",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于生成或编辑的提示词"
-      },
-      "width": {
-        "name": "宽度"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "height": {
         "name": "高度"
       },
-      "seed": {
-        "name": "随机种",
-        "tooltip": "创建噪波的随机种"
-      },
-      "prompt_upsampling": {
-        "name": "提示词上采样",
-        "tooltip": "选择启用提示词采样，启用后会自动修改提示词生成更具创意的内容。"
-      },
       "images": {
         "name": "图像",
         "tooltip": "参考图像（最多9张）"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于生成或编辑的提示词"
+      },
+      "prompt_upsampling": {
+        "name": "提示词上采样",
+        "tooltip": "选择启用提示词采样，启用后会自动修改提示词生成更具创意的内容。"
+      },
+      "seed": {
+        "name": "随机种",
+        "tooltip": "创建噪波的随机种"
+      },
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -2573,14 +3142,14 @@
   "Flux2Scheduler": {
     "display_name": "Flux2调度器",
     "inputs": {
+      "height": {
+        "name": "高度"
+      },
       "steps": {
         "name": "步数"
       },
       "width": {
         "name": "宽度"
-      },
-      "height": {
-        "name": "高度"
       }
     },
     "outputs": {
@@ -2590,8 +3159,8 @@
     }
   },
   "FluxDisableGuidance": {
-    "display_name": "Flux禁用指导",
     "description": "此节点完全禁用Flux和类似Flux模型上的引导嵌入",
+    "display_name": "Flux禁用指导",
     "inputs": {
       "conditioning": {
         "name": "条件"
@@ -2620,8 +3189,8 @@
     }
   },
   "FluxKontextImageScale": {
-    "display_name": "图像缩放为FluxKontext",
     "description": "将图像调整为更适合 Flux Kontext 的尺寸。",
+    "display_name": "图像缩放为FluxKontext",
     "inputs": {
       "image": {
         "name": "图像"
@@ -2634,38 +3203,38 @@
     }
   },
   "FluxKontextMaxImageNode": {
-    "display_name": "Flux.1 Kontext [max] 图像",
     "description": "使用Flux.1 Kontext [max]通过API基于提示词和宽高比编辑图像。",
+    "display_name": "Flux.1 Kontext [max] 图像",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "图像生成的提示词 - 指定编辑内容和方式。"
-      },
       "aspect_ratio": {
         "name": "宽高比",
         "tooltip": "图像宽高比；必须在1:4和4:1之间。"
       },
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
       "guidance": {
         "name": "引导强度",
         "tooltip": "图像生成过程的引导强度"
       },
-      "steps": {
-        "name": "步数",
-        "tooltip": "图像生成过程的步数"
+      "input_image": {
+        "name": "输入图像"
       },
-      "seed": {
-        "name": "种子",
-        "tooltip": "用于创建噪声的随机种子。"
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "图像生成的提示词 - 指定编辑内容和方式。"
       },
       "prompt_upsampling": {
         "name": "提示词上采样",
         "tooltip": "是否对提示词执行上采样。如果启用，会自动修改提示词以获得更具创意的生成结果，但结果具有不确定性（相同种子不会产生完全相同的结果）。"
       },
-      "input_image": {
-        "name": "输入图像"
+      "seed": {
+        "name": "种子",
+        "tooltip": "用于创建噪声的随机种子。"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "steps": {
+        "name": "步数",
+        "tooltip": "图像生成过程的步数"
       }
     },
     "outputs": {
@@ -2691,38 +3260,38 @@
     }
   },
   "FluxKontextProImageNode": {
-    "display_name": "Flux.1 Kontext [pro] 图像",
     "description": "使用Flux.1 Kontext [pro]通过API基于提示词和宽高比编辑图像。",
+    "display_name": "Flux.1 Kontext [pro] 图像",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "图像生成的提示词 - 指定编辑内容和方式。"
-      },
       "aspect_ratio": {
         "name": "宽高比",
         "tooltip": "图像宽高比；必须在1:4到4:1之间。"
       },
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
       "guidance": {
         "name": "引导强度",
         "tooltip": "图像生成过程的引导强度"
       },
-      "steps": {
-        "name": "步数",
-        "tooltip": "图像生成过程的步数"
+      "input_image": {
+        "name": "输入图像"
       },
-      "seed": {
-        "name": "种子",
-        "tooltip": "用于创建噪声的随机种子。"
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "图像生成的提示词 - 指定编辑内容和方式。"
       },
       "prompt_upsampling": {
         "name": "提示词上采样",
         "tooltip": "是否对提示词执行上采样。如果启用，会自动修改提示词以获得更具创意的生成结果，但结果具有不确定性（相同种子不会产生完全相同的结果）。"
       },
-      "input_image": {
-        "name": "输入图像"
+      "seed": {
+        "name": "种子",
+        "tooltip": "用于创建噪声的随机种子。"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "steps": {
+        "name": "步数",
+        "tooltip": "图像生成过程的步数"
       }
     },
     "outputs": {
@@ -2732,12 +3301,27 @@
     }
   },
   "FluxProExpandNode": {
-    "display_name": "Flux.1 扩展图像",
     "description": "根据提示词对图像进行外扩。",
+    "display_name": "Flux.1 扩展图像",
     "inputs": {
+      "bottom": {
+        "name": "下方扩展",
+        "tooltip": "在图像底部扩展的像素数"
+      },
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "guidance": {
+        "name": "引导强度",
+        "tooltip": "图像生成过程中的引导强度"
+      },
       "image": {
         "name": "图像"
       },
+      "left": {
+        "name": "左侧扩展",
+        "tooltip": "在图像左侧扩展的像素数"
+      },
       "prompt": {
         "name": "提示词",
         "tooltip": "用于生成图像的提示词"
@@ -2746,36 +3330,21 @@
         "name": "提示词上采样",
         "tooltip": "是否对提示词进行上采样。启用后会自动修改提示词以获得更具创意的生成效果，但结果具有不确定性（相同种子不会产生完全相同的结果）。"
       },
-      "top": {
-        "name": "上方扩展",
-        "tooltip": "在图像顶部扩展的像素数"
-      },
-      "bottom": {
-        "name": "下方扩展",
-        "tooltip": "在图像底部扩展的像素数"
-      },
-      "left": {
-        "name": "左侧扩展",
-        "tooltip": "在图像左侧扩展的像素数"
-      },
       "right": {
         "name": "右侧扩展",
         "tooltip": "在图像右侧扩展的像素数"
       },
-      "guidance": {
-        "name": "引导强度",
-        "tooltip": "图像生成过程中的引导强度"
-      },
-      "steps": {
-        "name": "步数",
-        "tooltip": "图像生成过程的步数"
-      },
       "seed": {
         "name": "种子",
         "tooltip": "用于生成噪声的随机种子。"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "steps": {
+        "name": "步数",
+        "tooltip": "图像生成过程的步数"
+      },
+      "top": {
+        "name": "上方扩展",
+        "tooltip": "在图像顶部扩展的像素数"
       }
     },
     "outputs": {
@@ -2785,9 +3354,16 @@
     }
   },
   "FluxProFillNode": {
-    "display_name": "Flux.1 填充图像",
     "description": "根据 mask 和提示词对图像进行修复填充。",
+    "display_name": "Flux.1 填充图像",
     "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "guidance": {
+        "name": "引导强度",
+        "tooltip": "图像生成过程中的引导强度"
+      },
       "image": {
         "name": "图像"
       },
@@ -2802,20 +3378,13 @@
         "name": "提示词上采样",
         "tooltip": "是否对提示词进行上采样。启用后会自动修改提示词以获得更具创意的生成效果，但结果具有不确定性（相同种子不会产生完全相同的结果）。"
       },
-      "guidance": {
-        "name": "引导强度",
-        "tooltip": "图像生成过程中的引导强度"
-      },
-      "steps": {
-        "name": "步数",
-        "tooltip": "图像生成过程的步数"
-      },
       "seed": {
         "name": "种子",
         "tooltip": "用于生成噪声的随机种子。"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "steps": {
+        "name": "步数",
+        "tooltip": "图像生成过程的步数"
       }
     },
     "outputs": {
@@ -2825,28 +3394,15 @@
     }
   },
   "FluxProUltraImageNode": {
-    "display_name": "Flux 1.1 [pro] Ultra Image",
     "description": "通过 API 使用 Flux Pro 1.1 Ultra 根据提示词和分辨率生成图像。",
+    "display_name": "Flux 1.1 [pro] Ultra Image",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于图像生成的提示词"
-      },
-      "prompt_upsampling": {
-        "name": "提示词上采样",
-        "tooltip": "是否对提示词进行上采样。启用时，会自动修改提示词以获得更具创意的生成效果，但结果是非确定性的（相同种子不会产生完全相同的结果）。"
-      },
-      "seed": {
-        "name": "种子",
-        "tooltip": "用于生成噪声的随机种子。"
-      },
       "aspect_ratio": {
         "name": "宽高比",
         "tooltip": "图像的宽高比；必须在 1:4 到 4:1 之间。"
       },
-      "raw": {
-        "name": "原始",
-        "tooltip": "为 True 时，生成更少处理、更自然的图像。"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "image_prompt": {
         "name": "图像提示词"
@@ -2855,8 +3411,47 @@
         "name": "图像提示词强度",
         "tooltip": "在提示词和图像提示词之间进行混合。"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于图像生成的提示词"
+      },
+      "prompt_upsampling": {
+        "name": "提示词上采样",
+        "tooltip": "是否对提示词进行上采样。启用时，会自动修改提示词以获得更具创意的生成效果，但结果是非确定性的（相同种子不会产生完全相同的结果）。"
+      },
+      "raw": {
+        "name": "原始",
+        "tooltip": "为 True 时，生成更少处理、更自然的图像。"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "用于生成噪声的随机种子。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "FreSca": {
+    "description": "对引导应用频率相关的缩放",
+    "display_name": "FreSca",
+    "inputs": {
+      "freq_cutoff": {
+        "name": "低频阈值",
+        "tooltip": "围绕中心被视为低频的频率索引数量"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "scale_high": {
+        "name": "高频缩放",
+        "tooltip": "高频分量的缩放因子"
+      },
+      "scale_low": {
+        "name": "低频缩放",
+        "tooltip": "低频分量的缩放因子"
       }
     },
     "outputs": {
@@ -2868,15 +3463,15 @@
   "FreeU": {
     "display_name": "FreeU",
     "inputs": {
-      "model": {
-        "name": "模型"
-      },
       "b1": {
         "name": "b1"
       },
       "b2": {
         "name": "b2"
       },
+      "model": {
+        "name": "模型"
+      },
       "s1": {
         "name": "s1"
       },
@@ -2893,15 +3488,15 @@
   "FreeU_V2": {
     "display_name": "FreeU_V2",
     "inputs": {
-      "model": {
-        "name": "模型"
-      },
       "b1": {
         "name": "b1"
       },
       "b2": {
         "name": "b2"
       },
+      "model": {
+        "name": "模型"
+      },
       "s1": {
         "name": "s1"
       },
@@ -2915,24 +3510,17 @@
       }
     }
   },
-  "FreSca": {
-    "display_name": "FreSca",
-    "description": "对引导应用频率相关的缩放",
+  "GITSScheduler": {
+    "display_name": "GITS调度器",
     "inputs": {
-      "model": {
-        "name": "模型"
+      "coeff": {
+        "name": "系数"
       },
-      "scale_low": {
-        "name": "低频缩放",
-        "tooltip": "低频分量的缩放因子"
+      "denoise": {
+        "name": "降噪"
       },
-      "scale_high": {
-        "name": "高频缩放",
-        "tooltip": "高频分量的缩放因子"
-      },
-      "freq_cutoff": {
-        "name": "低频阈值",
-        "tooltip": "围绕中心被视为低频的频率索引数量"
+      "steps": {
+        "name": "步数"
       }
     },
     "outputs": {
@@ -2941,24 +3529,112 @@
       }
     }
   },
-  "GeminiImage2Node": {
-    "display_name": "Nano Banana Pro（Google Gemini 图像）",
-    "description": "通过Google API编辑图像。",
+  "GLIGENLoader": {
+    "display_name": "GLIGEN加载器",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "使用文本描述要生成的图像或要应用的编辑的内容。包括模型应该遵循的任何约束、样式或细节。"
+      "gligen_name": {
+        "name": "gligen名称"
+      }
+    }
+  },
+  "GLIGENTextBoxApply": {
+    "display_name": "GLIGEN文本框应用",
+    "inputs": {
+      "clip": {
+        "name": "CLIP"
+      },
+      "conditioning_to": {
+        "name": "条件到"
+      },
+      "gligen_textbox_model": {
+        "name": "GLIGEN文本框模型"
+      },
+      "height": {
+        "name": "高度"
+      },
+      "text": {
+        "name": "文本"
+      },
+      "width": {
+        "name": "宽度"
+      },
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      }
+    }
+  },
+  "GLSLShader": {
+    "description": "对图像应用 GLSL ES 片段着色器。u_resolution（vec2）始终可用。",
+    "display_name": "GLSL 着色器",
+    "inputs": {
+      "floats": {
+        "name": "floats",
+        "tooltip": "浮点数在着色器代码中以 u_float0-4 形式可用"
+      },
+      "fragment_shader": {
+        "name": "fragment_shader",
+        "tooltip": "GLSL 片段着色器源码（兼容 GLSL ES 3.00 / WebGL 2.0）"
+      },
+      "images": {
+        "name": "images",
+        "tooltip": "图像在着色器代码中以 u_image0-4（sampler2D）形式可用"
+      },
+      "ints": {
+        "name": "ints",
+        "tooltip": "整数在着色器代码中以 u_int0-4 形式可用"
+      },
+      "size_mode": {
+        "name": "size_mode",
+        "tooltip": "输出尺寸：'from_input' 使用第一个输入图像尺寸，'custom' 允许手动设置尺寸"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "IMAGE0",
+        "tooltip": "在着色器代码中通过 layout(location = 0) out vec4 fragColor0 可用"
+      },
+      "1": {
+        "name": "IMAGE1",
+        "tooltip": "在着色器代码中通过 layout(location = 1) out vec4 fragColor1 可用"
+      },
+      "2": {
+        "name": "IMAGE2",
+        "tooltip": "在着色器代码中通过 layout(location = 2) out vec4 fragColor2 可用"
+      },
+      "3": {
+        "name": "IMAGE3",
+        "tooltip": "在着色器代码中通过 layout(location = 3) out vec4 fragColor3 可用"
+      }
+    }
+  },
+  "GeminiImage2Node": {
+    "description": "通过Google API编辑图像。",
+    "display_name": "Nano Banana Pro（Google Gemini 图像）",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "宽高比",
+        "tooltip": "自动：会自动匹配输入图像的宽高比，或如果没有提供图像，则生成1:1的正方形。"
+      },
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "files": {
+        "name": "文件",
+        "tooltip": "模型上下文文件。接受来自 Gemini输入文件 节点的输入。"
+      },
+      "images": {
+        "name": "图像",
+        "tooltip": "参考图像。如果要使用多个参考图，使用 图像批次 节点（最多14张）。"
       },
       "model": {
         "name": "模型"
       },
-      "seed": {
-        "name": "随机种",
-        "tooltip": "为特定值时，模型将尽可能提供相同的结果。但不保证确定一致的输出。此外，即使使用相同的种子值，更改模型或参数设置（例如温度）也会导致结果变化。默认使用随机值。"
-      },
-      "aspect_ratio": {
-        "name": "宽高比",
-        "tooltip": "自动：会自动匹配输入图像的宽高比，或如果没有提供图像，则生成1:1的正方形。"
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "使用文本描述要生成的图像或要应用的编辑的内容。包括模型应该遵循的任何约束、样式或细节。"
       },
       "resolution": {
         "name": "分辨率",
@@ -2968,20 +3644,13 @@
         "name": "响应模态",
         "tooltip": "选择 图像 仅生成图像，选择 图像+文本 会生成图像和文本。"
       },
-      "images": {
-        "name": "图像",
-        "tooltip": "参考图像。如果要使用多个参考图，使用 图像批次 节点（最多14张）。"
-      },
-      "files": {
-        "name": "文件",
-        "tooltip": "模型上下文文件。接受来自 Gemini输入文件 节点的输入。"
+      "seed": {
+        "name": "随机种",
+        "tooltip": "为特定值时，模型将尽可能提供相同的结果。但不保证确定一致的输出。此外，即使使用相同的种子值，更改模型或参数设置（例如温度）也会导致结果变化。默认使用随机值。"
       },
       "system_prompt": {
         "name": "系统提示词",
         "tooltip": "决定 AI 行为的基本指令。"
-      },
-      "control_after_generate": {
-        "name": "生成后控制"
       }
     },
     "outputs": {
@@ -2994,43 +3663,43 @@
     }
   },
   "GeminiImageNode": {
-    "display_name": "Nano Banana （Google Gemini 图像）",
     "description": "通过Google API同步编辑图像。",
+    "display_name": "Nano Banana （Google Gemini 图像）",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于生成的文本提示词"
+      "aspect_ratio": {
+        "name": "宽高比",
+        "tooltip": "默认匹配输入图像的输出尺寸，否则生成1:1正方形。"
       },
-      "model": {
-        "name": "模型",
-        "tooltip": "用于生成响应的Gemini模型。"
-      },
-      "seed": {
-        "name": "种子",
-        "tooltip": "当种子固定为特定值时，模型会尽力为重复请求提供相同的响应。不能保证确定性输出。此外，更改模型或参数设置（如温度）即使使用相同的种子值也可能导致响应变化。默认使用随机种子值。"
-      },
-      "images": {
-        "name": "图像",
-        "tooltip": "可选图像，用作模型的上下文。要包含多个图像，可以使用批量图像节点。"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "files": {
         "name": "文件",
         "tooltip": "可选文件，用作模型的上下文。接受来自Gemini生成内容输入文件节点的输入。"
       },
-      "aspect_ratio": {
-        "name": "宽高比",
-        "tooltip": "默认匹配输入图像的输出尺寸，否则生成1:1正方形。"
+      "images": {
+        "name": "图像",
+        "tooltip": "可选图像，用作模型的上下文。要包含多个图像，可以使用批量图像节点。"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "用于生成响应的Gemini模型。"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于生成的文本提示词"
       },
       "response_modalities": {
         "name": "回复模态",
         "tooltip": "选择“图像”仅输出图像，选择“图像+文本”输出图像和文本。"
       },
+      "seed": {
+        "name": "种子",
+        "tooltip": "当种子固定为特定值时，模型会尽力为重复请求提供相同的响应。不能保证确定性输出。此外，更改模型或参数设置（如温度）即使使用相同的种子值也可能导致响应变化。默认使用随机种子值。"
+      },
       "system_prompt": {
         "name": "系统提示词",
         "tooltip": "决定 AI 行为的基本指令。"
-      },
-      "control_after_generate": {
-        "name": "生成后控制"
       }
     },
     "outputs": {
@@ -3043,16 +3712,16 @@
     }
   },
   "GeminiInputFiles": {
-    "display_name": "Gemini 输入文件",
     "description": "加载并准备输入文件，作为 Gemini LLM 节点的输入。文件将在生成响应时由 Gemini 模型读取。文本文件的内容计入令牌限制。🛈 提示：可与其他 Gemini 输入文件节点链式连接。",
+    "display_name": "Gemini 输入文件",
     "inputs": {
-      "file": {
-        "name": "文件",
-        "tooltip": "作为模型上下文包含的输入文件。目前仅接受文本 (.txt) 和 PDF (.pdf) 文件。"
-      },
       "GEMINI_INPUT_FILES": {
         "name": "Gemini 输入文件",
         "tooltip": "与此节点加载的文件批量组合的可选附加文件。允许链式连接输入文件，以便单个消息可包含多个输入文件。"
+      },
+      "file": {
+        "name": "文件",
+        "tooltip": "作为模型上下文包含的输入文件。目前仅接受文本 (.txt) 和 PDF (.pdf) 文件。"
       }
     },
     "outputs": {
@@ -3061,44 +3730,98 @@
       }
     }
   },
-  "GeminiNode": {
-    "display_name": "Google Gemini",
-    "description": "使用 Google 的 Gemini AI 模型生成文本响应。您可以提供多种类型的输入（文本、图像、音频、视频）作为上下文，以生成更相关和有意义的响应。",
+  "GeminiNanoBanana2": {
+    "description": "通过 Google Vertex API 同步生成或编辑图像。",
+    "display_name": "Nano Banana 2",
     "inputs": {
-      "prompt": {
-        "name": "提示",
-        "tooltip": "模型的文本输入，用于生成响应。您可以包含详细的指令、问题或模型上下文。"
+      "aspect_ratio": {
+        "name": "宽高比",
+        "tooltip": "如果设置为“自动”，则匹配输入图像的宽高比；如果未提供图像，通常会生成 16:9 的正方形。"
       },
-      "model": {
-        "name": "模型",
-        "tooltip": "用于生成响应的 Gemini 模型。"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
-      "seed": {
-        "name": "种子",
-        "tooltip": "当种子固定为特定值时，模型会尽力为重复请求提供相同的响应。不保证确定性输出。此外，更改模型或参数设置（如温度）即使使用相同的种子值也可能导致响应变化。默认使用随机种子值。"
+      "files": {
+        "name": "文件",
+        "tooltip": "可选的文件，作为模型的上下文使用。可接受来自 Gemini 生成内容输入文件节点的输入。"
       },
       "images": {
         "name": "图像",
-        "tooltip": "用作模型上下文的可选图像。要包含多个图像，可使用批处理图像节点。"
+        "tooltip": "可选的参考图像。要包含多张图片，请使用批量图像节点（最多 14 张）。"
       },
+      "model": {
+        "name": "模型"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "描述要生成图像或要应用编辑的文本提示。请包含模型应遵循的任何约束、风格或细节。"
+      },
+      "resolution": {
+        "name": "分辨率",
+        "tooltip": "目标输出分辨率。对于 2K/4K，使用原生 Gemini 超分辨率算法。"
+      },
+      "response_modalities": {
+        "name": "响应模式"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "当种子值固定时，模型会尽力为重复请求提供相同的响应，但不能保证输出完全一致。此外，更改模型或参数设置（如温度）即使使用相同的种子值，也可能导致响应不同。默认情况下使用随机种子值。"
+      },
+      "system_prompt": {
+        "name": "系统提示词",
+        "tooltip": "决定 AI 行为的基础性指令。"
+      },
+      "thinking_level": {
+        "name": "思考层级"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "tooltip": null
+      }
+    }
+  },
+  "GeminiNode": {
+    "description": "使用 Google 的 Gemini AI 模型生成文本响应。您可以提供多种类型的输入（文本、图像、音频、视频）作为上下文，以生成更相关和有意义的响应。",
+    "display_name": "Google Gemini",
+    "inputs": {
       "audio": {
         "name": "音频",
         "tooltip": "用作模型上下文的可选音频。"
       },
-      "video": {
-        "name": "视频",
-        "tooltip": "用作模型上下文的可选视频。"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "files": {
         "name": "文件",
         "tooltip": "用作模型上下文的可选文件。接受来自 Gemini 生成内容输入文件节点的输入。"
       },
+      "images": {
+        "name": "图像",
+        "tooltip": "用作模型上下文的可选图像。要包含多个图像，可使用批处理图像节点。"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "用于生成响应的 Gemini 模型。"
+      },
+      "prompt": {
+        "name": "提示",
+        "tooltip": "模型的文本输入，用于生成响应。您可以包含详细的指令、问题或模型上下文。"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "当种子固定为特定值时，模型会尽力为重复请求提供相同的响应。不保证确定性输出。此外，更改模型或参数设置（如温度）即使使用相同的种子值也可能导致响应变化。默认使用随机种子值。"
+      },
       "system_prompt": {
         "name": "系统提示词",
         "tooltip": "决定 AI 行为的基本指令。"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "video": {
+        "name": "视频",
+        "tooltip": "用作模型上下文的可选视频。"
       }
     },
     "outputs": {
@@ -3110,19 +3833,9 @@
   "GenerateTracks": {
     "display_name": "生成轨道",
     "inputs": {
-      "width": {
-        "name": "宽度"
-      },
-      "height": {
-        "name": "高度"
-      },
-      "start_x": {
-        "name": "起始点X",
-        "tooltip": "起始点的规格化X坐标（0-1）。"
-      },
-      "start_y": {
-        "name": "起始点Y",
-        "tooltip": "起始点的规格化Y坐标（0-1）。"
+      "bezier": {
+        "name": "贝塞尔曲线",
+        "tooltip": "贝塞尔曲线路径，使用中点作为控制点。"
       },
       "end_x": {
         "name": "结束点X",
@@ -3132,19 +3845,12 @@
         "name": "结束点Y",
         "tooltip": "结束点的规格化Y坐标（0-1）。"
       },
-      "num_frames": {
-        "name": "帧数"
+      "height": {
+        "name": "高度"
       },
-      "num_tracks": {
-        "name": "轨迹数"
-      },
-      "track_spread": {
-        "name": "轨道分布",
-        "tooltip": "轨道间的规格化距离。垂直于轨迹运动方向展开。"
-      },
-      "bezier": {
-        "name": "贝塞尔曲线",
-        "tooltip": "贝塞尔曲线路径，使用中点作为控制点。"
+      "interpolation": {
+        "name": "插值",
+        "tooltip": "控制轨迹沿着路径移动的时间/速度。"
       },
       "mid_x": {
         "name": "中间点Y",
@@ -3154,13 +3860,30 @@
         "name": "中间点Y",
         "tooltip": "中间点的规格化Y坐标（0-1）。"
       },
-      "interpolation": {
-        "name": "插值",
-        "tooltip": "控制轨迹沿着路径移动的时间/速度。"
+      "num_frames": {
+        "name": "帧数"
+      },
+      "num_tracks": {
+        "name": "轨迹数"
+      },
+      "start_x": {
+        "name": "起始点X",
+        "tooltip": "起始点的规格化X坐标（0-1）。"
+      },
+      "start_y": {
+        "name": "起始点Y",
+        "tooltip": "起始点的规格化Y坐标（0-1）。"
       },
       "track_mask": {
         "name": "轨道遮罩",
         "tooltip": "遮罩，用于标记可见帧"
+      },
+      "track_spread": {
+        "name": "轨道分布",
+        "tooltip": "轨道间的规格化距离。垂直于轨迹运动方向展开。"
+      },
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -3174,8 +3897,8 @@
     }
   },
   "GetImageSize": {
-    "display_name": "获取图像尺寸",
     "description": "返回图像的宽度和高度，并原样传递图像。",
+    "display_name": "获取图像尺寸",
     "inputs": {
       "image": {
         "name": "图像"
@@ -3197,8 +3920,8 @@
     }
   },
   "GetVideoComponents": {
-    "display_name": "获取视频元素",
     "description": "提取视频中的所有元素：帧、音频和帧率。",
+    "display_name": "获取视频元素",
     "inputs": {
       "video": {
         "name": "视频",
@@ -3220,17 +3943,37 @@
       }
     }
   },
-  "GITSScheduler": {
-    "display_name": "GITS调度器",
+  "GrokImageEditNode": {
+    "description": "根据文本提示修改现有图像",
+    "display_name": "Grok 图像编辑",
     "inputs": {
-      "coeff": {
-        "name": "系数"
+      "aspect_ratio": {
+        "name": "宽高比",
+        "tooltip": "仅当多个图像连接到图像输入时允许。"
       },
-      "steps": {
-        "name": "步数"
+      "control_after_generate": {
+        "name": "control after generate"
       },
-      "denoise": {
-        "name": "降噪"
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "number_of_images": {
+        "name": "number_of_images",
+        "tooltip": "要生成的编辑图像数量"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "用于生成图像的文本提示"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "用于确定节点是否应重新运行的种子；无论种子如何，实际结果都是非确定性的。"
       }
     },
     "outputs": {
@@ -3239,52 +3982,119 @@
       }
     }
   },
-  "GLIGENLoader": {
-    "display_name": "GLIGEN加载器",
+  "GrokImageNode": {
+    "description": "使用 Grok 根据文本提示生成图像",
+    "display_name": "Grok 图像",
     "inputs": {
-      "gligen_name": {
-        "name": "gligen名称"
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "number_of_images": {
+        "name": "number_of_images",
+        "tooltip": "要生成的图像数量"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "用于生成图像的文本提示"
+      },
+      "resolution": {
+        "name": "分辨率"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "用于确定节点是否应重新运行的种子；无论种子如何，实际结果都是非确定性的。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
       }
     }
   },
-  "GLIGENTextBoxApply": {
-    "display_name": "GLIGEN文本框应用",
+  "GrokVideoEditNode": {
+    "description": "根据文本提示编辑现有视频。",
+    "display_name": "Grok 视频编辑",
     "inputs": {
-      "conditioning_to": {
-        "name": "条件到"
+      "control_after_generate": {
+        "name": "control after generate"
       },
-      "clip": {
-        "name": "CLIP"
+      "model": {
+        "name": "model"
       },
-      "gligen_textbox_model": {
-        "name": "GLIGEN文本框模型"
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "所需视频的文本描述。"
       },
-      "text": {
-        "name": "文本"
+      "seed": {
+        "name": "seed",
+        "tooltip": "用于确定节点是否应重新运行的种子；无论种子如何，实际结果都是非确定性的。"
       },
-      "width": {
-        "name": "宽度"
+      "video": {
+        "name": "video",
+        "tooltip": "最大支持时长为 8.7 秒，文件大小为 50MB。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "GrokVideoNode": {
+    "description": "根据提示或图像生成视频",
+    "display_name": "Grok 视频",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio",
+        "tooltip": "输出视频的宽高比。"
       },
-      "height": {
-        "name": "高度"
+      "control_after_generate": {
+        "name": "control after generate"
       },
-      "x": {
-        "name": "x"
+      "duration": {
+        "name": "duration",
+        "tooltip": "输出视频的时长（秒）。"
       },
-      "y": {
-        "name": "y"
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "所需视频的文本描述。"
+      },
+      "resolution": {
+        "name": "resolution",
+        "tooltip": "输出视频的分辨率。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "用于确定节点是否应重新运行的种子；无论种子如何，实际结果都是非确定性的。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
       }
     }
   },
   "GrowMask": {
     "display_name": "扩展遮罩",
     "inputs": {
-      "mask": {
-        "name": "遮罩"
-      },
       "expand": {
         "name": "扩展"
       },
+      "mask": {
+        "name": "遮罩"
+      },
       "tapered_corners": {
         "name": "倒角"
       }
@@ -3295,6 +4105,50 @@
       }
     }
   },
+  "HitPawGeneralImageEnhance": {
+    "description": "将低分辨率图像放大至超分辨率，消除伪影和噪点。最大输出：3200万像素。",
+    "display_name": "HitPaw 通用图像增强",
+    "inputs": {
+      "auto_downscale": {
+        "name": "自动缩小",
+        "tooltip": "如果输出超出限制，自动缩小输入图像。"
+      },
+      "image": {
+        "name": "图像"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "upscale_factor": {
+        "name": "放大倍数"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HitPawVideoEnhance": {
+    "description": "将低分辨率视频放大至高分辨率，消除伪影和噪点。价格按视频每秒计费。",
+    "display_name": "HitPaw 视频增强",
+    "inputs": {
+      "model": {
+        "name": "模型"
+      },
+      "model_resolution": {
+        "name": "分辨率"
+      },
+      "video": {
+        "name": "视频"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "Hunyuan3Dv2Conditioning": {
     "display_name": "Hunyuan3Dv2条件",
     "inputs": {
@@ -3316,15 +4170,15 @@
   "Hunyuan3Dv2ConditioningMultiView": {
     "display_name": "Hunyuan3Dv2条件多视角",
     "inputs": {
+      "back": {
+        "name": "后"
+      },
       "front": {
         "name": "前"
       },
       "left": {
         "name": "左"
       },
-      "back": {
-        "name": "后"
-      },
       "right": {
         "name": "右"
       }
@@ -3343,14 +4197,11 @@
   "HunyuanImageToVideo": {
     "display_name": "图像到视频（Hunyuan）",
     "inputs": {
-      "positive": {
-        "name": "正向"
+      "batch_size": {
+        "name": "批量大小"
       },
-      "vae": {
-        "name": "vae"
-      },
-      "width": {
-        "name": "宽度"
+      "guidance_type": {
+        "name": "指导类型"
       },
       "height": {
         "name": "高度"
@@ -3358,14 +4209,17 @@
       "length": {
         "name": "长度"
       },
-      "batch_size": {
-        "name": "批量大小"
-      },
-      "guidance_type": {
-        "name": "指导类型"
+      "positive": {
+        "name": "正向"
       },
       "start_image": {
         "name": "起始图像"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -3382,17 +4236,17 @@
   "HunyuanRefinerLatent": {
     "display_name": "HunyuanRefinerLatent",
     "inputs": {
-      "positive": {
-        "name": "正面"
+      "latent": {
+        "name": "Latent"
       },
       "negative": {
         "name": "负面"
       },
-      "latent": {
-        "name": "Latent"
-      },
       "noise_augmentation": {
         "name": "噪声增强"
+      },
+      "positive": {
+        "name": "正面"
       }
     },
     "outputs": {
@@ -3413,17 +4267,11 @@
   "HunyuanVideo15ImageToVideo": {
     "display_name": "图像到视频（Hunyuan Video 15 ）",
     "inputs": {
-      "positive": {
-        "name": "正面条件"
+      "batch_size": {
+        "name": "批次大小"
       },
-      "negative": {
-        "name": "负面条件"
-      },
-      "vae": {
-        "name": "vae"
-      },
-      "width": {
-        "name": "宽度"
+      "clip_vision_output": {
+        "name": "CLIP视觉输出"
       },
       "height": {
         "name": "高度"
@@ -3431,14 +4279,20 @@
       "length": {
         "name": "帧数"
       },
-      "batch_size": {
-        "name": "批次大小"
+      "negative": {
+        "name": "负面条件"
+      },
+      "positive": {
+        "name": "正面条件"
       },
       "start_image": {
         "name": "图像"
       },
-      "clip_vision_output": {
-        "name": "CLIP视觉输出"
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -3459,6 +4313,12 @@
   "HunyuanVideo15LatentUpscaleWithModel": {
     "display_name": "Hunyuan Video 15 Latent 使用模型放大",
     "inputs": {
+      "crop": {
+        "name": "裁剪"
+      },
+      "height": {
+        "name": "高度"
+      },
       "model": {
         "name": "模型"
       },
@@ -3470,12 +4330,6 @@
       },
       "width": {
         "name": "宽度"
-      },
-      "height": {
-        "name": "高度"
-      },
-      "crop": {
-        "name": "裁剪"
       }
     },
     "outputs": {
@@ -3487,26 +4341,26 @@
   "HunyuanVideo15SuperResolution": {
     "display_name": "Hunyuan Video 15超分辨率",
     "inputs": {
-      "positive": {
-        "name": "正面条件"
-      },
-      "negative": {
-        "name": "负面条件"
+      "clip_vision_output": {
+        "name": "CLIP视觉输出"
       },
       "latent": {
         "name": "latent"
       },
+      "negative": {
+        "name": "负面条件"
+      },
       "noise_augmentation": {
         "name": "噪波增强"
       },
-      "vae": {
-        "name": "vae"
+      "positive": {
+        "name": "正面条件"
       },
       "start_image": {
         "name": "图像"
       },
-      "clip_vision_output": {
-        "name": "CLIP视觉输出"
+      "vae": {
+        "name": "vae"
       }
     },
     "outputs": {
@@ -3524,15 +4378,40 @@
       }
     }
   },
-  "HypernetworkLoader": {
-    "display_name": "超网络加载器",
+  "HyperTile": {
+    "display_name": "超分块HyperTile",
     "inputs": {
+      "max_depth": {
+        "name": "最大深度"
+      },
       "model": {
         "name": "模型"
       },
+      "scale_depth": {
+        "name": "规模深度"
+      },
+      "swap_size": {
+        "name": "分割尺寸"
+      },
+      "tile_size": {
+        "name": "分块尺寸"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "HypernetworkLoader": {
+    "display_name": "超网络加载器",
+    "inputs": {
       "hypernetwork_name": {
         "name": "HyperNetwork名称"
       },
+      "model": {
+        "name": "模型"
+      },
       "strength": {
         "name": "强度"
       }
@@ -3543,54 +4422,21 @@
       }
     }
   },
-  "HyperTile": {
-    "display_name": "超分块HyperTile",
-    "inputs": {
-      "model": {
-        "name": "模型"
-      },
-      "tile_size": {
-        "name": "分块尺寸"
-      },
-      "swap_size": {
-        "name": "分割尺寸"
-      },
-      "max_depth": {
-        "name": "最大深度"
-      },
-      "scale_depth": {
-        "name": "规模深度"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
   "IdeogramV1": {
-    "display_name": "Ideogram V1",
     "description": "使用 Ideogram V1 模型同步生成图像。\n\n图片链接仅在有限时间内有效；如果您想保留图片，请务必下载。",
+    "display_name": "Ideogram V1",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于图像生成的提示词"
-      },
-      "turbo": {
-        "name": "turbo",
-        "tooltip": "是否启用 turbo 模式（生成更快，但可能质量较低）"
-      },
       "aspect_ratio": {
         "name": "宽高比",
         "tooltip": "图像生成的宽高比。"
       },
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
       "magic_prompt_option": {
         "name": "Magic Prompt",
         "tooltip": "确定生成时是否使用 MagicPrompt"
       },
-      "seed": {
-        "name": "随机种"
-      },
       "negative_prompt": {
         "name": "负面提示词",
         "tooltip": "描述需要从图像中排除的内容"
@@ -3598,8 +4444,16 @@
       "num_images": {
         "name": "图像数量"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于图像生成的提示词"
+      },
+      "seed": {
+        "name": "随机种"
+      },
+      "turbo": {
+        "name": "turbo",
+        "tooltip": "是否启用 turbo 模式（生成更快，但可能质量较低）"
       }
     },
     "outputs": {
@@ -3609,36 +4463,20 @@
     }
   },
   "IdeogramV2": {
-    "display_name": "Ideogram V2",
     "description": "使用 Ideogram V2 模型同步生成图像。\n\n图像链接仅在有限时间内有效；如果您想保留图像，请务必下载。",
+    "display_name": "Ideogram V2",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于图像生成的提示词"
-      },
-      "turbo": {
-        "name": "turbo",
-        "tooltip": "是否启用 turbo 模式（生成更快，质量可能略低）"
-      },
       "aspect_ratio": {
         "name": "宽高比",
         "tooltip": "图像生成的宽高比。如果分辨率未设置为 AUTO，则此项无效。"
       },
-      "resolution": {
-        "name": "分辨率",
-        "tooltip": "图像生成的分辨率。如果未设置为 AUTO，则会覆盖 aspect_ratio 设置。"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "magic_prompt_option": {
         "name": "Magic Prompt",
         "tooltip": "确定生成时是否使用 MagicPrompt"
       },
-      "seed": {
-        "name": "随机种"
-      },
-      "style_type": {
-        "name": "风格",
-        "tooltip": "生成的风格类型（仅限 V2）"
-      },
       "negative_prompt": {
         "name": "负面提示词",
         "tooltip": "描述图像中需要排除的内容"
@@ -3646,8 +4484,24 @@
       "num_images": {
         "name": "图像数量"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于图像生成的提示词"
+      },
+      "resolution": {
+        "name": "分辨率",
+        "tooltip": "图像生成的分辨率。如果未设置为 AUTO，则会覆盖 aspect_ratio 设置。"
+      },
+      "seed": {
+        "name": "随机种"
+      },
+      "style_type": {
+        "name": "风格",
+        "tooltip": "生成的风格类型（仅限 V2）"
+      },
+      "turbo": {
+        "name": "turbo",
+        "tooltip": "是否启用 turbo 模式（生成更快，质量可能略低）"
       }
     },
     "outputs": {
@@ -3657,43 +4511,13 @@
     }
   },
   "IdeogramV3": {
-    "display_name": "Ideogram V3",
     "description": "使用 Ideogram V3 模型同步生成图像。\n\n支持从文本提示生成常规图像，也支持使用 mask 进行图像编辑。\n图片链接仅在有限时间内有效；如需保留图片，请务必下载。",
+    "display_name": "Ideogram V3",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于图像生成或编辑的提示词"
-      },
-      "image": {
-        "name": "图像",
-        "tooltip": "用于图像编辑的可选参考图片。"
-      },
-      "mask": {
-        "name": "遮罩",
-        "tooltip": "用于修复的可选 mask（白色区域将被替换）"
-      },
       "aspect_ratio": {
         "name": "宽高比",
         "tooltip": "图像生成的宽高比。如果分辨率未设置为自动，则忽略此项。"
       },
-      "resolution": {
-        "name": "分辨率",
-        "tooltip": "图像生成的分辨率。如果未设置为自动，则覆盖 aspect_ratio 设置。"
-      },
-      "magic_prompt_option": {
-        "name": "Magic Prompt",
-        "tooltip": "决定生成时是否使用 MagicPrompt"
-      },
-      "seed": {
-        "name": "随机种"
-      },
-      "num_images": {
-        "name": "图像数量"
-      },
-      "rendering_speed": {
-        "name": "生成速度",
-        "tooltip": "控制生成速度与质量之间的权衡"
-      },
       "character_image": {
         "name": "角色图像",
         "tooltip": "用作角色参考的图像。"
@@ -3704,6 +4528,36 @@
       },
       "control_after_generate": {
         "name": "生成后控制"
+      },
+      "image": {
+        "name": "图像",
+        "tooltip": "用于图像编辑的可选参考图片。"
+      },
+      "magic_prompt_option": {
+        "name": "Magic Prompt",
+        "tooltip": "决定生成时是否使用 MagicPrompt"
+      },
+      "mask": {
+        "name": "遮罩",
+        "tooltip": "用于修复的可选 mask（白色区域将被替换）"
+      },
+      "num_images": {
+        "name": "图像数量"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于图像生成或编辑的提示词"
+      },
+      "rendering_speed": {
+        "name": "生成速度",
+        "tooltip": "控制生成速度与质量之间的权衡"
+      },
+      "resolution": {
+        "name": "分辨率",
+        "tooltip": "图像生成的分辨率。如果未设置为自动，则覆盖 aspect_ratio 设置。"
+      },
+      "seed": {
+        "name": "随机种"
       }
     },
     "outputs": {
@@ -3715,6 +4569,9 @@
   "ImageAddNoise": {
     "display_name": "图像添加噪声",
     "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
       "image": {
         "name": "图像"
       },
@@ -3724,9 +4581,6 @@
       },
       "strength": {
         "name": "强度"
-      },
-      "control_after_generate": {
-        "name": "生成后控制"
       }
     },
     "outputs": {
@@ -3749,17 +4603,17 @@
   "ImageBlend": {
     "display_name": "混合图像",
     "inputs": {
-      "image1": {
-        "name": "图像1"
-      },
-      "image2": {
-        "name": "图像2"
-      },
       "blend_factor": {
         "name": "系数"
       },
       "blend_mode": {
         "name": "混合模式"
+      },
+      "image1": {
+        "name": "图像1"
+      },
+      "image2": {
+        "name": "图像2"
       }
     },
     "outputs": {
@@ -3771,12 +4625,12 @@
   "ImageBlur": {
     "display_name": "模糊图像",
     "inputs": {
-      "image": {
-        "name": "图像"
-      },
       "blur_radius": {
         "name": "模糊半径"
       },
+      "image": {
+        "name": "图像"
+      },
       "sigma": {
         "name": "西格玛"
       }
@@ -3790,11 +4644,11 @@
   "ImageColorToMask": {
     "display_name": "图像颜色到遮罩",
     "inputs": {
-      "image": {
-        "name": "图像"
-      },
       "color": {
         "name": "颜色"
+      },
+      "image": {
+        "name": "图像"
       }
     },
     "outputs": {
@@ -3803,12 +4657,33 @@
       }
     }
   },
+  "ImageCompare": {
+    "description": "通过滑块并排比较两张图像。",
+    "display_name": "图像对比",
+    "inputs": {
+      "compare_view": {
+        "name": "compare_view"
+      },
+      "image_a": {
+        "name": "image_a"
+      },
+      "image_b": {
+        "name": "image_b"
+      }
+    }
+  },
   "ImageCompositeMasked": {
     "display_name": "合成图像（遮罩）",
     "inputs": {
       "destination": {
         "name": "目标图像"
       },
+      "mask": {
+        "name": "遮罩"
+      },
+      "resize_source": {
+        "name": "缩放来源图像"
+      },
       "source": {
         "name": "来源图像"
       },
@@ -3817,12 +4692,6 @@
       },
       "y": {
         "name": "y"
-      },
-      "resize_source": {
-        "name": "缩放来源图像"
-      },
-      "mask": {
-        "name": "遮罩"
       }
     },
     "outputs": {
@@ -3834,15 +4703,15 @@
   "ImageCrop": {
     "display_name": "裁剪图像",
     "inputs": {
+      "height": {
+        "name": "高度"
+      },
       "image": {
         "name": "图像"
       },
       "width": {
         "name": "宽度"
       },
-      "height": {
-        "name": "高度"
-      },
       "x": {
         "name": "x"
       },
@@ -3856,6 +4725,26 @@
       }
     }
   },
+  "ImageCropV2": {
+    "display_name": "图像裁剪",
+    "inputs": {
+      "crop_region": {
+        "name": "裁剪区域"
+      },
+      "height": {},
+      "image": {
+        "name": "图像"
+      },
+      "width": {},
+      "x": {},
+      "y": {}
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ImageDeduplication": {
     "display_name": "图像去重",
     "inputs": {
@@ -3878,11 +4767,11 @@
   "ImageFlip": {
     "display_name": "图像翻转",
     "inputs": {
-      "image": {
-        "name": "图像"
-      },
       "flip_method": {
         "name": "翻转方法"
+      },
+      "image": {
+        "name": "图像"
       }
     },
     "outputs": {
@@ -3894,12 +4783,12 @@
   "ImageFromBatch": {
     "display_name": "从批次获取图像",
     "inputs": {
-      "image": {
-        "name": "图像"
-      },
       "batch_index": {
         "name": "批次索引"
       },
+      "image": {
+        "name": "图像"
+      },
       "length": {
         "name": "长度"
       }
@@ -3913,21 +4802,21 @@
   "ImageGrid": {
     "display_name": "图像表格",
     "inputs": {
-      "images": {
-        "name": "图像",
-        "tooltip": "需要处理的图像序列。"
-      },
-      "columns": {
-        "name": "列数",
-        "tooltip": "表格的列数。"
+      "cell_height": {
+        "name": "单元格高度",
+        "tooltip": "表格中每个单元格的高度。"
       },
       "cell_width": {
         "name": "单元格宽度",
         "tooltip": "表格中每个单元格的宽度。"
       },
-      "cell_height": {
-        "name": "单元格高度",
-        "tooltip": "表格中每个单元格的高度。"
+      "columns": {
+        "name": "列数",
+        "tooltip": "表格的列数。"
+      },
+      "images": {
+        "name": "图像",
+        "tooltip": "需要处理的图像序列。"
       },
       "padding": {
         "name": "间距",
@@ -3949,6 +4838,28 @@
       }
     }
   },
+  "ImageMergeTileList": {
+    "display_name": "将图块列表合并为图像",
+    "inputs": {
+      "final_height": {
+        "name": "final_height"
+      },
+      "final_width": {
+        "name": "final_width"
+      },
+      "image_list": {
+        "name": "image_list"
+      },
+      "overlap": {
+        "name": "overlap"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "ImageOnlyCheckpointLoader": {
     "display_name": "Checkpoint加载器（仅图像）",
     "inputs": {
@@ -3960,54 +4871,54 @@
   "ImageOnlyCheckpointSave": {
     "display_name": "保存Checkpoint（仅图像）",
     "inputs": {
-      "model": {
-        "name": "模型"
-      },
       "clip_vision": {
         "name": "clip视觉"
       },
-      "vae": {
-        "name": "vae"
-      },
       "filename_prefix": {
         "name": "文件名前缀"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "vae": {
+        "name": "vae"
       }
     }
   },
   "ImagePadForOutpaint": {
     "display_name": "外补画板",
     "inputs": {
+      "bottom": {
+        "name": "下"
+      },
+      "feathering": {
+        "name": "羽化"
+      },
       "image": {
         "name": "图像"
       },
       "left": {
         "name": "左"
       },
-      "top": {
-        "name": "上"
-      },
       "right": {
         "name": "右"
       },
-      "bottom": {
-        "name": "下"
-      },
-      "feathering": {
-        "name": "羽化"
+      "top": {
+        "name": "上"
       }
     }
   },
   "ImageQuantize": {
     "display_name": "量化图像",
     "inputs": {
-      "image": {
-        "name": "图像"
-      },
       "colors": {
         "name": "颜色"
       },
       "dither": {
         "name": "抖动"
+      },
+      "image": {
+        "name": "图像"
       }
     },
     "outputs": {
@@ -4057,6 +4968,12 @@
   "ImageScale": {
     "display_name": "缩放图像",
     "inputs": {
+      "crop": {
+        "name": "裁剪"
+      },
+      "height": {
+        "name": "高度"
+      },
       "image": {
         "name": "图像"
       },
@@ -4065,12 +4982,6 @@
       },
       "width": {
         "name": "宽度"
-      },
-      "height": {
-        "name": "高度"
-      },
-      "crop": {
-        "name": "裁剪"
       }
     }
   },
@@ -4080,11 +4991,11 @@
       "image": {
         "name": "图像"
       },
-      "upscale_method": {
-        "name": "缩放算法"
-      },
       "scale_by": {
         "name": "缩放系数"
+      },
+      "upscale_method": {
+        "name": "缩放算法"
       }
     }
   },
@@ -4094,11 +5005,11 @@
       "image": {
         "name": "图像"
       },
-      "upscale_method": {
-        "name": "放大方法"
-      },
       "largest_size": {
         "name": "最大尺寸"
+      },
+      "upscale_method": {
+        "name": "放大方法"
       }
     },
     "outputs": {
@@ -4113,14 +5024,14 @@
       "image": {
         "name": "图像"
       },
-      "upscale_method": {
-        "name": "缩放算法"
-      },
       "megapixels": {
         "name": "像素数量"
       },
       "resolution_steps": {
         "name": "分辨率步数"
+      },
+      "upscale_method": {
+        "name": "缩放算法"
       }
     },
     "outputs": {
@@ -4132,6 +5043,9 @@
   "ImageSharpen": {
     "display_name": "锐化图像",
     "inputs": {
+      "alpha": {
+        "name": "alpha"
+      },
       "image": {
         "name": "图像"
       },
@@ -4140,9 +5054,6 @@
       },
       "sigma": {
         "name": "Sigma"
-      },
-      "alpha": {
-        "name": "alpha"
       }
     },
     "outputs": {
@@ -4152,26 +5063,26 @@
     }
   },
   "ImageStitch": {
-    "display_name": "图像拼接",
     "description": "\n将 image2 按指定方向拼接到 image1 上。\n如果未提供 image2，则返回未更改的 image1。\n可以在图像之间添加可选间距。\n",
+    "display_name": "图像拼接",
     "inputs": {
+      "direction": {
+        "name": "方向"
+      },
       "image1": {
         "name": "图像1"
       },
-      "direction": {
-        "name": "方向"
+      "image2": {
+        "name": "图像2"
       },
       "match_image_size": {
         "name": "匹配图像尺寸"
       },
-      "spacing_width": {
-        "name": "间距宽度"
-      },
       "spacing_color": {
         "name": "间距颜色"
       },
-      "image2": {
-        "name": "图像2"
+      "spacing_width": {
+        "name": "间距宽度"
       }
     },
     "outputs": {
@@ -4183,11 +5094,11 @@
   "ImageToMask": {
     "display_name": "图像转换为遮罩",
     "inputs": {
-      "image": {
-        "name": "图像"
-      },
       "channel": {
         "name": "通道"
+      },
+      "image": {
+        "name": "图像"
       }
     },
     "outputs": {
@@ -4199,11 +5110,11 @@
   "ImageUpscaleWithModel": {
     "display_name": "使用模型放大图像",
     "inputs": {
-      "upscale_model": {
-        "name": "放大模型"
-      },
       "image": {
         "name": "图像"
+      },
+      "upscale_model": {
+        "name": "放大模型"
       }
     },
     "outputs": {
@@ -4215,14 +5126,14 @@
   "ImageYUVToRGB": {
     "display_name": "图像YUV到RGB",
     "inputs": {
-      "Y": {
-        "name": "Y"
-      },
       "U": {
         "name": "U"
       },
       "V": {
         "name": "V"
+      },
+      "Y": {
+        "name": "Y"
       }
     },
     "outputs": {
@@ -4234,24 +5145,24 @@
   "InpaintModelConditioning": {
     "display_name": "内补模型条件",
     "inputs": {
-      "positive": {
-        "name": "正面条件"
+      "mask": {
+        "name": "遮罩"
       },
       "negative": {
         "name": "负面条件"
       },
-      "vae": {
-        "name": "vae"
+      "noise_mask": {
+        "name": "噪波遮罩",
+        "tooltip": "向Latent图像添加遮罩，采样仅在遮罩内进行。根据模型的不同，可能会改善结果或完全破坏效果。"
       },
       "pixels": {
         "name": "像素"
       },
-      "mask": {
-        "name": "遮罩"
+      "positive": {
+        "name": "正面条件"
       },
-      "noise_mask": {
-        "name": "噪波遮罩",
-        "tooltip": "向Latent图像添加遮罩，采样仅在遮罩内进行。根据模型的不同，可能会改善结果或完全破坏效果。"
+      "vae": {
+        "name": "vae"
       }
     },
     "outputs": {
@@ -4269,17 +5180,17 @@
   "InstructPixToPixConditioning": {
     "display_name": "InstructPixToPix条件",
     "inputs": {
-      "positive": {
-        "name": "正面条件"
-      },
       "negative": {
         "name": "负面条件"
       },
-      "vae": {
-        "name": "vae"
-      },
       "pixels": {
         "name": "像素"
+      },
+      "positive": {
+        "name": "正面条件"
+      },
+      "vae": {
+        "name": "vae"
       }
     },
     "outputs": {
@@ -4310,14 +5221,146 @@
       }
     }
   },
+  "JoinAudioChannels": {
+    "description": "将左声道和右声道的单声道音频合成为立体声音频。",
+    "display_name": "音频通道合并",
+    "inputs": {
+      "audio_left": {
+        "name": "audio_left"
+      },
+      "audio_right": {
+        "name": "audio_right"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "audio",
+        "tooltip": null
+      }
+    }
+  },
   "JoinImageWithAlpha": {
     "display_name": "合并图像Alpha",
     "inputs": {
-      "image": {
-        "name": "图像"
-      },
       "alpha": {
         "name": "阿尔法"
+      },
+      "image": {
+        "name": "图像"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KSampler": {
+    "description": "使用提供的模型、正面条件和负面条件条件降噪Latent图像。",
+    "display_name": "K采样器",
+    "inputs": {
+      "cfg": {
+        "name": "cfg",
+        "tooltip": "用于平衡随机性和提示词服从性。提高该值会使结果更加符合提示词，但过高会导致图像质量下降。"
+      },
+      "control_after_generate": {
+        "name": "生成后的控制"
+      },
+      "denoise": {
+        "name": "降噪",
+        "tooltip": "降噪的强度，降低该值会保留原图的大部分内容从而实现图生图。"
+      },
+      "latent_image": {
+        "name": "Latent图像",
+        "tooltip": "要降噪的 Latent 图像。"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "用于降噪输入 Latent 图像的模型。"
+      },
+      "negative": {
+        "name": "负面条件",
+        "tooltip": "描述不包含在图像中的内容的条件。"
+      },
+      "positive": {
+        "name": "正面条件",
+        "tooltip": "描述包含在图像中的内容的条件。"
+      },
+      "sampler_name": {
+        "name": "采样器名称",
+        "tooltip": "采样算法，会影响结果质量、生成速度、风格样式。"
+      },
+      "scheduler": {
+        "name": "调度器",
+        "tooltip": "控制逐渐移除噪波的方法。"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "生成噪波的随机种。"
+      },
+      "steps": {
+        "name": "步数",
+        "tooltip": "降噪的步数。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "降噪后的 Latent。"
+      }
+    }
+  },
+  "KSamplerAdvanced": {
+    "display_name": "K采样器（高级）",
+    "inputs": {
+      "add_noise": {
+        "name": "添加噪波"
+      },
+      "cfg": {
+        "name": "cfg"
+      },
+      "control_after_generate": {
+        "name": "生成后的控制"
+      },
+      "end_at_step": {
+        "name": "结束步数"
+      },
+      "latent_image": {
+        "name": "Latent图像"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "negative": {
+        "name": "负面条件"
+      },
+      "noise_seed": {
+        "name": "随机种"
+      },
+      "positive": {
+        "name": "正面条件"
+      },
+      "return_with_leftover_noise": {
+        "name": "返回剩余噪波"
+      },
+      "sampler_name": {
+        "name": "采样器名称"
+      },
+      "scheduler": {
+        "name": "调度器"
+      },
+      "start_at_step": {
+        "name": "开始步数"
+      },
+      "steps": {
+        "name": "步数"
+      }
+    }
+  },
+  "KSamplerSelect": {
+    "display_name": "K采样器选择",
+    "inputs": {
+      "sampler_name": {
+        "name": "采样器名称"
       }
     },
     "outputs": {
@@ -4329,17 +5372,8 @@
   "Kandinsky5ImageToVideo": {
     "display_name": "图像到视频（Kandinsky5）",
     "inputs": {
-      "positive": {
-        "name": "正面条件"
-      },
-      "negative": {
-        "name": "负面条件"
-      },
-      "vae": {
-        "name": "vae"
-      },
-      "width": {
-        "name": "宽度"
+      "batch_size": {
+        "name": "批次大小"
       },
       "height": {
         "name": "高度  "
@@ -4347,11 +5381,20 @@
       "length": {
         "name": "时长"
       },
-      "batch_size": {
-        "name": "批次大小"
+      "negative": {
+        "name": "负面条件"
+      },
+      "positive": {
+        "name": "正面条件"
       },
       "start_image": {
         "name": "初始图象"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -4376,8 +5419,8 @@
   "KarrasScheduler": {
     "display_name": "Karras调度器",
     "inputs": {
-      "steps": {
-        "name": "步数"
+      "rho": {
+        "name": "rho"
       },
       "sigma_max": {
         "name": "最大Sigma"
@@ -4385,8 +5428,41 @@
       "sigma_min": {
         "name": "最小Sigma"
       },
-      "rho": {
-        "name": "rho"
+      "steps": {
+        "name": "步数"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingAvatarNode": {
+    "description": "从单张照片和音频文件生成广播风格的数字人视频。",
+    "display_name": "Kling Avatar 2.0",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "头像参考图像。宽度和高度必须至少为300像素。宽高比需在1:2.5到2.5:1之间。"
+      },
+      "mode": {
+        "name": "mode"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "可选提示，用于定义头像动作、情感和摄像机运动。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "种子用于控制节点是否重新运行；无论种子如何，结果都是非确定性的。"
+      },
+      "sound_file": {
+        "name": "sound_file",
+        "tooltip": "音频输入。时长必须在2到300秒之间。"
       }
     },
     "outputs": {
@@ -4396,30 +5472,67 @@
     }
   },
   "KlingCameraControlI2VNode": {
-    "display_name": "Kling 图像转视频（摄像机控制）",
     "description": "将静态图像转化为具有专业摄像机运动的电影级视频，模拟真实世界的电影摄影。可控制虚拟摄像机的缩放、旋转、平移、俯仰和第一人称视角，同时保持对原始图像的聚焦。",
+    "display_name": "Kling 图像转视频（摄像机控制）",
     "inputs": {
-      "start_frame": {
-        "name": "起始帧",
-        "tooltip": "参考图像 - URL 或 Base64 编码字符串，不能超过 10MB，分辨率不低于 300*300 像素，宽高比在 1:2.5 ~ 2.5:1 之间。Base64 不应包含 data:image 前缀。"
-      },
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "正向文本提示"
-      },
-      "negative_prompt": {
-        "name": "负面提示词",
-        "tooltip": "反向文本提示"
-      },
-      "cfg_scale": {
-        "name": "CFG"
-      },
       "aspect_ratio": {
         "name": "宽高比"
       },
       "camera_control": {
         "name": "镜头控制",
         "tooltip": "可通过 Kling Camera Controls 节点创建。控制视频生成过程中的摄像机运动和动作。"
+      },
+      "cfg_scale": {
+        "name": "CFG"
+      },
+      "negative_prompt": {
+        "name": "负面提示词",
+        "tooltip": "反向文本提示"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "正向文本提示"
+      },
+      "start_frame": {
+        "name": "起始帧",
+        "tooltip": "参考图像 - URL 或 Base64 编码字符串，不能超过 10MB，分辨率不低于 300*300 像素，宽高比在 1:2.5 ~ 2.5:1 之间。Base64 不应包含 data:image 前缀。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      },
+      "1": {
+        "name": "视频ID",
+        "tooltip": null
+      },
+      "2": {
+        "name": "时长",
+        "tooltip": null
+      }
+    }
+  },
+  "KlingCameraControlT2VNode": {
+    "description": "将文本转化为具有专业摄像机运动的电影级视频，模拟真实世界的电影摄影。可控制虚拟摄像机的动作，包括缩放、旋转、平移、俯仰和第一人称视角，同时保持对原始文本的聚焦。",
+    "display_name": "Kling 文本转视频（摄像机控制）",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "宽高比"
+      },
+      "camera_control": {
+        "name": "镜头控制",
+        "tooltip": "可通过 Kling Camera Controls 节点创建。控制视频生成过程中的摄像机运动和移动。"
+      },
+      "cfg_scale": {
+        "name": "CFG"
+      },
+      "negative_prompt": {
+        "name": "负面提示词",
+        "tooltip": "反向文本提示"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "正向文本提示"
       }
     },
     "outputs": {
@@ -4437,8 +5550,8 @@
     }
   },
   "KlingCameraControls": {
-    "display_name": "Kling 相机控制",
     "description": "允许指定 Kling 相机控制和运动控制效果的配置选项。",
+    "display_name": "Kling 相机控制",
     "inputs": {
       "camera_control_type": {
         "name": "镜头类型"
@@ -4447,21 +5560,21 @@
         "name": "水平移动",
         "tooltip": "控制相机在水平轴（x 轴）上的移动。负值表示向左，正值表示向右。"
       },
-      "vertical_movement": {
-        "name": "垂直移动",
-        "tooltip": "控制相机在垂直轴（y 轴）上的移动。负值表示向下，正值表示向上。"
-      },
       "pan": {
         "name": "垂直旋转",
         "tooltip": "控制相机在垂直平面（x 轴）上的旋转。负值表示向下旋转，正值表示向上旋转。"
       },
+      "roll": {
+        "name": "滚转",
+        "tooltip": "控制相机的滚转量（z 轴）。负值表示逆时针，正值表示顺时针。"
+      },
       "tilt": {
         "name": "水平旋转",
         "tooltip": "控制相机在水平平面（y 轴）上的旋转。负值表示向左旋转，正值表示向右旋转。"
       },
-      "roll": {
-        "name": "滚转",
-        "tooltip": "控制相机的滚转量（z 轴）。负值表示逆时针，正值表示顺时针。"
+      "vertical_movement": {
+        "name": "垂直移动",
+        "tooltip": "控制相机在垂直轴（y 轴）上的移动。负值表示向下，正值表示向上。"
       },
       "zoom": {
         "name": "变焦",
@@ -4475,47 +5588,16 @@
       }
     }
   },
-  "KlingCameraControlT2VNode": {
-    "display_name": "Kling 文本转视频（摄像机控制）",
-    "description": "将文本转化为具有专业摄像机运动的电影级视频，模拟真实世界的电影摄影。可控制虚拟摄像机的动作，包括缩放、旋转、平移、俯仰和第一人称视角，同时保持对原始文本的聚焦。",
-    "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "正向文本提示"
-      },
-      "negative_prompt": {
-        "name": "负面提示词",
-        "tooltip": "反向文本提示"
-      },
-      "cfg_scale": {
-        "name": "CFG"
-      },
-      "aspect_ratio": {
-        "name": "宽高比"
-      },
-      "camera_control": {
-        "name": "镜头控制",
-        "tooltip": "可通过 Kling Camera Controls 节点创建。控制视频生成过程中的摄像机运动和移动。"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      },
-      "1": {
-        "name": "视频ID",
-        "tooltip": null
-      },
-      "2": {
-        "name": "时长",
-        "tooltip": null
-      }
-    }
-  },
   "KlingDualCharacterVideoEffectNode": {
-    "display_name": "Kling 双角色视频特效",
     "description": "根据 效果 在生成视频时实现不同的特效。第一张图片将被放置在合成画面的左侧，第二张图片在右侧。",
+    "display_name": "Kling 双角色视频特效",
     "inputs": {
+      "duration": {
+        "name": "时长"
+      },
+      "effect_scene": {
+        "name": "效果"
+      },
       "image_left": {
         "name": "左侧图像",
         "tooltip": "左侧图片"
@@ -4524,17 +5606,11 @@
         "name": "右侧图像",
         "tooltip": "右侧图片"
       },
-      "effect_scene": {
-        "name": "效果"
-      },
-      "model_name": {
-        "name": "模型"
-      },
       "mode": {
         "name": "模式"
       },
-      "duration": {
-        "name": "时长"
+      "model_name": {
+        "name": "模型"
       }
     },
     "outputs": {
@@ -4547,35 +5623,75 @@
       }
     }
   },
+  "KlingFirstLastFrameNode": {
+    "description": "使用 Kling V3 通过首帧和末帧生成视频。",
+    "display_name": "Kling 3.0 首帧-末帧生成视频",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "duration": {
+        "name": "时长"
+      },
+      "end_frame": {
+        "name": "末帧"
+      },
+      "first_frame": {
+        "name": "首帧"
+      },
+      "generate_audio": {
+        "name": "生成音频"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "模型与生成设置。"
+      },
+      "model_resolution": {
+        "name": "分辨率"
+      },
+      "prompt": {
+        "name": "提示词"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "种子控制节点是否重新运行；无论种子如何，结果都是非确定性的。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "KlingImage2VideoNode": {
     "display_name": "Kling 图像转视频",
     "inputs": {
-      "start_frame": {
-        "name": "起始帧",
-        "tooltip": "参考图像 - URL 或 Base64 编码字符串，不能超过 10MB，分辨率不少于 300*300 像素，宽高比在 1:2.5 ~ 2.5:1 之间。Base64 不应包含 data:image 前缀。"
+      "aspect_ratio": {
+        "name": "宽高比"
       },
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "正向文本提示"
+      "cfg_scale": {
+        "name": "CFG"
+      },
+      "duration": {
+        "name": "时长"
+      },
+      "mode": {
+        "name": "模式"
+      },
+      "model_name": {
+        "name": "模型"
       },
       "negative_prompt": {
         "name": "负面提示词",
         "tooltip": "反向文本提示"
       },
-      "model_name": {
-        "name": "模型"
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "正向文本提示"
       },
-      "cfg_scale": {
-        "name": "CFG"
-      },
-      "mode": {
-        "name": "模式"
-      },
-      "aspect_ratio": {
-        "name": "宽高比"
-      },
-      "duration": {
-        "name": "时长"
+      "start_frame": {
+        "name": "起始帧",
+        "tooltip": "参考图像 - URL 或 Base64 编码字符串，不能超过 10MB，分辨率不少于 300*300 像素，宽高比在 1:2.5 ~ 2.5:1 之间。Base64 不应包含 data:image 前缀。"
       }
     },
     "outputs": {
@@ -4593,40 +5709,47 @@
     }
   },
   "KlingImageGenerationNode": {
-    "display_name": "Kling 图像生成",
     "description": "Kling 图像生成节点。通过文本提示生成图像，可选参考图像。",
+    "display_name": "Kling 图像生成",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "正向文本提示"
+      "aspect_ratio": {
+        "name": "宽高比"
       },
-      "negative_prompt": {
-        "name": "负面提示词",
-        "tooltip": "反向文本提示"
-      },
-      "image_type": {
-        "name": "图像类型"
-      },
-      "image_fidelity": {
-        "name": "图像参考强度",
-        "tooltip": "用户上传图像的参考强度"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "human_fidelity": {
         "name": "主体参考强度",
         "tooltip": "主体参考相似度"
       },
+      "image": {
+        "name": "图像"
+      },
+      "image_fidelity": {
+        "name": "图像参考强度",
+        "tooltip": "用户上传图像的参考强度"
+      },
+      "image_type": {
+        "name": "图像类型"
+      },
       "model_name": {
         "name": "模型"
       },
-      "aspect_ratio": {
-        "name": "宽高比"
-      },
       "n": {
         "name": "图像数量",
         "tooltip": "生成图像数量"
       },
-      "image": {
-        "name": "图像"
+      "negative_prompt": {
+        "name": "负面提示词",
+        "tooltip": "反向文本提示"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "正向文本提示"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "种子控制节点是否重新运行；无论种子如何，结果都是非确定性的。"
       }
     },
     "outputs": {
@@ -4638,24 +5761,24 @@
   "KlingImageToVideoWithAudio": {
     "display_name": "Kling 图像到视频音频",
     "inputs": {
-      "model_name": {
-        "name": "模型"
-      },
-      "start_frame": {
-        "name": "起始帧"
-      },
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "正面文本提示词。"
-      },
-      "mode": {
-        "name": "模式"
-      },
       "duration": {
         "name": "时长（秒）"
       },
       "generate_audio": {
         "name": "生成音频"
+      },
+      "mode": {
+        "name": "模式"
+      },
+      "model_name": {
+        "name": "模型"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "正面文本提示词。"
+      },
+      "start_frame": {
+        "name": "起始帧"
       }
     },
     "outputs": {
@@ -4665,15 +5788,15 @@
     }
   },
   "KlingLipSyncAudioToVideoNode": {
-    "display_name": "Kling 音频驱动视频口型同步",
     "description": "Kling 音频驱动视频口型同步节点。将视频文件中的嘴部动作与音频文件的音频内容进行同步。",
+    "display_name": "Kling 音频驱动视频口型同步",
     "inputs": {
-      "video": {
-        "name": "视频"
-      },
       "audio": {
         "name": "音频"
       },
+      "video": {
+        "name": "视频"
+      },
       "voice_language": {
         "name": "语音语言"
       }
@@ -4693,16 +5816,16 @@
     }
   },
   "KlingLipSyncTextToVideoNode": {
-    "display_name": "Kling 文字驱动口型同步视频",
     "description": "Kling 文字驱动口型同步节点。将视频文件中的嘴部动作与文本提示同步。",
+    "display_name": "Kling 文字驱动口型同步视频",
     "inputs": {
-      "video": {
-        "name": "视频"
-      },
       "text": {
         "name": "文本",
         "tooltip": "用于口型同步视频生成的文本内容。当模式为 text2video 时必填。最大长度为 120 个字符。"
       },
+      "video": {
+        "name": "视频"
+      },
       "voice": {
         "name": "语音"
       },
@@ -4728,6 +5851,19 @@
   "KlingMotionControl": {
     "display_name": "Kling 动作控制",
     "inputs": {
+      "character_orientation": {
+        "name": "参考方向",
+        "tooltip": "控制角色的朝向/方向。\nv视频：动作，表情，相机移动和方向遵循运动参考视频（其他细节通过提示）。\n图像：运动和表情仍然遵循运动参考视频，但角色方向匹配参考图像（通过提示相机/其他细节）"
+      },
+      "keep_original_sound": {
+        "name": "保留原音频"
+      },
+      "mode": {
+        "name": "模式"
+      },
+      "model": {
+        "name": "模型"
+      },
       "prompt": {
         "name": "提示词"
       },
@@ -4737,16 +5873,6 @@
       "reference_video": {
         "name": "参考视频",
         "tooltip": "动作或表情的参考视频。\n持续时间取决于参考类型：\n图像：3-10 秒\n视频：3-30 秒"
-      },
-      "keep_original_sound": {
-        "name": "保留原音频"
-      },
-      "character_orientation": {
-        "name": "参考方向",
-        "tooltip": "控制角色的朝向/方向。\nv视频：动作，表情，相机移动和方向遵循运动参考视频（其他细节通过提示）。\n图像：运动和表情仍然遵循运动参考视频，但角色方向匹配参考图像（通过提示相机/其他细节）"
-      },
-      "mode": {
-        "name": "模式"
       }
     },
     "outputs": {
@@ -4756,9 +5882,15 @@
     }
   },
   "KlingOmniProEditVideoNode": {
-    "display_name": "Kling Omni 编辑视频 (Pro)",
     "description": "使用 Kling 最新模型编辑视频。",
+    "display_name": "Kling Omni 编辑视频 (Pro)",
     "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "keep_original_sound": {
+        "name": "保留原音频"
+      },
       "model_name": {
         "name": "模型"
       },
@@ -4766,16 +5898,20 @@
         "name": "提示词",
         "tooltip": "描述视频内容的文本提示词。可以同时包括正面负面描述。"
       },
-      "video": {
-        "name": "视频",
-        "tooltip": "需要编辑的视频，输出视频的时长和输入视频相同。"
-      },
-      "keep_original_sound": {
-        "name": "保留原音频"
-      },
       "reference_images": {
         "name": "参考图像",
         "tooltip": "最多 4 个参考图像"
+      },
+      "resolution": {
+        "name": "分辨率"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "种子控制节点是否重新运行；无论种子如何，结果都是非确定性的。"
+      },
+      "video": {
+        "name": "视频",
+        "tooltip": "需要编辑的视频，输出视频的时长和输入视频相同。"
       }
     },
     "outputs": {
@@ -4785,9 +5921,26 @@
     }
   },
   "KlingOmniProFirstLastFrameNode": {
-    "display_name": "Kling Omni 首尾帧到视频 (Pro)",
     "description": "使用 Kling 最新模型和起始帧、可选的结束帧或参考图像。",
+    "display_name": "Kling Omni 首尾帧到视频 (Pro)",
     "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "duration": {
+        "name": "时长"
+      },
+      "end_frame": {
+        "name": "结束帧",
+        "tooltip": "可选的视频结束帧。不能和“参考图像”同时使用。"
+      },
+      "first_frame": {
+        "name": "起始帧"
+      },
+      "generate_audio": {
+        "name": "生成音频",
+        "tooltip": "为视频生成音频。仅支持 kling-v3-omni。"
+      },
       "model_name": {
         "name": "模型"
       },
@@ -4795,19 +5948,20 @@
         "name": "提示词",
         "tooltip": "描述视频内容的文本提示词。可以同时包括正面负面描述。"
       },
-      "duration": {
-        "name": "时长"
-      },
-      "first_frame": {
-        "name": "起始帧"
-      },
-      "end_frame": {
-        "name": "结束帧",
-        "tooltip": "可选的视频结束帧。不能和“参考图像”同时使用。"
-      },
       "reference_images": {
         "name": "参考图像",
         "tooltip": "最多 6 个参考图像"
+      },
+      "resolution": {
+        "name": "分辨率"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "种子控制节点是否重新运行；无论种子如何，结果都是非确定性的。"
+      },
+      "storyboards": {
+        "name": "分镜",
+        "tooltip": "生成一系列带有独立提示词和时长的视频片段。仅支持 kling-v3-omni。"
       }
     },
     "outputs": {
@@ -4817,9 +5971,106 @@
     }
   },
   "KlingOmniProImageNode": {
-    "display_name": "Kling Omni 图像 (Pro)",
     "description": "使用 Kling 最新模型生成或编辑图像。",
+    "display_name": "Kling Omni 图像 (Pro)",
     "inputs": {
+      "aspect_ratio": {
+        "name": "宽高比"
+      },
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "model_name": {
+        "name": "模型"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "描述图像内容的文本提示词。可以同时包括正面负面描述。"
+      },
+      "reference_images": {
+        "name": "参考图像",
+        "tooltip": "最多 10 个参考图像"
+      },
+      "resolution": {
+        "name": "分辨率"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "种子控制节点是否重新运行；无论种子如何，结果都是非确定性的。"
+      },
+      "series_amount": {
+        "name": "系列数量",
+        "tooltip": "生成一系列图像。不支持 kling-image-o1。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProImageToVideoNode": {
+    "description": "使用 Kling 最新模型基于最多 7 个参考图生成视频。",
+    "display_name": "Kling Omni 图像到视频 (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "宽高比"
+      },
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "duration": {
+        "name": "时长"
+      },
+      "generate_audio": {
+        "name": "生成音频",
+        "tooltip": "为视频生成音频。仅支持 kling-v3-omni。"
+      },
+      "model_name": {
+        "name": "模型"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "描述图像内容的文本提示词。可以同时包括正面负面描述。"
+      },
+      "reference_images": {
+        "name": "参考图像",
+        "tooltip": "最多 7 个参考图像"
+      },
+      "resolution": {
+        "name": "分辨率"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "种子控制节点是否重新运行；无论种子如何，结果都是非确定性的。"
+      },
+      "storyboards": {
+        "name": "分镜",
+        "tooltip": "生成一系列带有独立提示词和时长的视频片段。仅支持 kling-v3-omni。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingOmniProTextToVideoNode": {
+    "description": "使用 Kling 最新模型和提示词生成视频。",
+    "display_name": "Kling Omni 文本到视频 (Pro)",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "宽高比"
+      },
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "duration": {
+        "name": "时长"
+      },
+      "generate_audio": {
+        "name": "生成音频"
+      },
       "model_name": {
         "name": "模型"
       },
@@ -4830,64 +6081,13 @@
       "resolution": {
         "name": "分辨率"
       },
-      "aspect_ratio": {
-        "name": "宽高比"
+      "seed": {
+        "name": "种子",
+        "tooltip": "种子控制节点是否重新运行；无论种子如何，结果都是非确定性的。"
       },
-      "reference_images": {
-        "name": "参考图像",
-        "tooltip": "最多 10 个参考图像"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "KlingOmniProImageToVideoNode": {
-    "display_name": "Kling Omni 图像到视频 (Pro)",
-    "description": "使用 Kling 最新模型基于最多 7 个参考图生成视频。",
-    "inputs": {
-      "model_name": {
-        "name": "模型"
-      },
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "描述图像内容的文本提示词。可以同时包括正面负面描述。"
-      },
-      "aspect_ratio": {
-        "name": "宽高比"
-      },
-      "duration": {
-        "name": "时长"
-      },
-      "reference_images": {
-        "name": "参考图像",
-        "tooltip": "最多 7 个参考图像"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "KlingOmniProTextToVideoNode": {
-    "display_name": "Kling Omni 文本到视频 (Pro)",
-    "description": "使用 Kling 最新模型和提示词生成视频。",
-    "inputs": {
-      "model_name": {
-        "name": "模型"
-      },
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "描述图像内容的文本提示词。可以同时包括正面负面描述。"
-      },
-      "aspect_ratio": {
-        "name": "宽高比"
-      },
-      "duration": {
-        "name": "时长"
+      "storyboards": {
+        "name": "分镜",
+        "tooltip": "生成一系列带有独立提示词和时长的视频片段。o1 模型将忽略此项。"
       }
     },
     "outputs": {
@@ -4897,9 +6097,21 @@
     }
   },
   "KlingOmniProVideoToVideoNode": {
-    "display_name": "Kling Omni 视频到视频 (Pro)",
     "description": "使用 Kling 最新模型基于最多 4 个参考图编辑视频。",
+    "display_name": "Kling Omni 视频到视频 (Pro)",
     "inputs": {
+      "aspect_ratio": {
+        "name": "宽高比"
+      },
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "duration": {
+        "name": "时长"
+      },
+      "keep_original_sound": {
+        "name": "保留原音频"
+      },
       "model_name": {
         "name": "模型"
       },
@@ -4907,22 +6119,20 @@
         "name": "提示词",
         "tooltip": "描述图像内容的文本提示词。可以同时包括正面负面描述。"
       },
-      "aspect_ratio": {
-        "name": "宽高比"
-      },
-      "duration": {
-        "name": "时长"
+      "reference_images": {
+        "name": "参考图像",
+        "tooltip": "最多 4 个参考图像"
       },
       "reference_video": {
         "name": "参考视频",
         "tooltip": "用于参考的视频。"
       },
-      "keep_original_sound": {
-        "name": "保留原音频"
+      "resolution": {
+        "name": "分辨率"
       },
-      "reference_images": {
-        "name": "参考图像",
-        "tooltip": "最多 4 个参考图像"
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed 控制节点是否重新运行；无论 seed 如何，结果都是非确定性的。"
       }
     },
     "outputs": {
@@ -4932,21 +6142,21 @@
     }
   },
   "KlingSingleImageVideoEffectNode": {
-    "display_name": "Kling 视频特效",
     "description": "根据 效果 在生成视频时实现不同的特效。",
+    "display_name": "Kling 视频特效",
     "inputs": {
-      "image": {
-        "name": "图像3",
-        "tooltip": "参考图片。URL 或 Base64 编码字符串（不含 data:image 前缀）。文件大小不得超过 10MB，分辨率不低于 300*300 像素，宽高比在 1:2.5 ~ 2.5:1 之间。"
+      "duration": {
+        "name": "时长"
       },
       "effect_scene": {
         "name": "效果"
       },
+      "image": {
+        "name": "图像3",
+        "tooltip": "参考图片。URL 或 Base64 编码字符串（不含 data:image 前缀）。文件大小不得超过 10MB，分辨率不低于 300*300 像素，宽高比在 1:2.5 ~ 2.5:1 之间。"
+      },
       "model_name": {
         "name": "模型"
-      },
-      "duration": {
-        "name": "时长"
       }
     },
     "outputs": {
@@ -4964,34 +6174,34 @@
     }
   },
   "KlingStartEndFrameNode": {
-    "display_name": "Kling 起止帧生成视频",
     "description": "生成一个在起始图像和结束图像之间过渡的视频序列。该节点会创建所有中间帧，实现从第一帧到最后一帧的平滑变换。",
+    "display_name": "Kling 起止帧生成视频",
     "inputs": {
-      "start_frame": {
-        "name": "起始帧",
-        "tooltip": "参考图像 - URL 或 Base64 编码字符串，不能超过 10MB，分辨率不低于 300*300 像素，宽高比在 1:2.5 ~ 2.5:1 之间。Base64 不应包含 data:image 前缀。"
+      "aspect_ratio": {
+        "name": "宽高比"
+      },
+      "cfg_scale": {
+        "name": "CFG"
       },
       "end_frame": {
         "name": "end_frame",
         "tooltip": "参考图像 - 结束帧控制。URL 或 Base64 编码字符串，不能超过 10MB，分辨率不低于 300*300 像素。Base64 不应包含 data:image 前缀。"
       },
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "正向文本提示"
+      "mode": {
+        "name": "模式",
+        "tooltip": "用于视频生成的配置，格式为：mode / duration / model_name。"
       },
       "negative_prompt": {
         "name": "负面提示词",
         "tooltip": "反向文本提示"
       },
-      "cfg_scale": {
-        "name": "CFG"
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "正向文本提示"
       },
-      "aspect_ratio": {
-        "name": "宽高比"
-      },
-      "mode": {
-        "name": "模式",
-        "tooltip": "用于视频生成的配置，格式为：mode / duration / model_name。"
+      "start_frame": {
+        "name": "起始帧",
+        "tooltip": "参考图像 - URL 或 Base64 编码字符串，不能超过 10MB，分辨率不低于 300*300 像素，宽高比在 1:2.5 ~ 2.5:1 之间。Base64 不应包含 data:image 前缀。"
       }
     },
     "outputs": {
@@ -5009,26 +6219,26 @@
     }
   },
   "KlingTextToVideoNode": {
-    "display_name": "Kling 文本转视频",
     "description": "Kling 文本转视频节点",
+    "display_name": "Kling 文本转视频",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "正向文本提示"
+      "aspect_ratio": {
+        "name": "宽高比"
+      },
+      "cfg_scale": {
+        "name": "CFG"
+      },
+      "mode": {
+        "name": "模式",
+        "tooltip": "用于视频生成的配置，格式为：mode / duration / model_name。"
       },
       "negative_prompt": {
         "name": "负面提示词",
         "tooltip": "反向文本提示"
       },
-      "cfg_scale": {
-        "name": "CFG"
-      },
-      "aspect_ratio": {
-        "name": "宽高比"
-      },
-      "mode": {
-        "name": "模式",
-        "tooltip": "用于视频生成的配置，格式为：mode / duration / model_name。"
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "正向文本提示"
       }
     },
     "outputs": {
@@ -5048,16 +6258,6 @@
   "KlingTextToVideoWithAudio": {
     "display_name": "Kling 文本到视频音频",
     "inputs": {
-      "model_name": {
-        "name": "模型"
-      },
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "正面文本提示词。"
-      },
-      "mode": {
-        "name": "模式"
-      },
       "aspect_ratio": {
         "name": "宽高比"
       },
@@ -5066,6 +6266,16 @@
       },
       "generate_audio": {
         "name": "生成音频"
+      },
+      "mode": {
+        "name": "模式"
+      },
+      "model_name": {
+        "name": "模型"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "正面文本提示词。"
       }
     },
     "outputs": {
@@ -5075,19 +6285,19 @@
     }
   },
   "KlingVideoExtendNode": {
-    "display_name": "Kling 视频扩展",
     "description": "Kling 视频扩展节点。扩展由其他 Kling 节点生成的视频。video_id 由其他 Kling 节点生成。",
+    "display_name": "Kling 视频扩展",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于引导视频扩展的正向文本提示"
+      "cfg_scale": {
+        "name": "CFG"
       },
       "negative_prompt": {
         "name": "负面提示词",
         "tooltip": "用于在扩展视频中避免出现的元素的负向文本提示"
       },
-      "cfg_scale": {
-        "name": "CFG"
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于引导视频扩展的正向文本提示"
       },
       "video_id": {
         "name": "视频ID",
@@ -5108,16 +6318,64 @@
       }
     }
   },
-  "KlingVirtualTryOnNode": {
-    "display_name": "Kling 虚拟试穿",
-    "description": "Kling 虚拟试穿节点。输入一张人物图片和一张服装图片，将服装试穿到人物身上。",
+  "KlingVideoNode": {
+    "description": "使用 Kling V3 生成视频。支持文生视频和图生视频，可选分镜多提示词和音频生成。",
+    "display_name": "Kling 3.0 视频",
     "inputs": {
-      "human_image": {
-        "name": "主体"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
+      "generate_audio": {
+        "name": "生成音频"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "模型和生成设置。"
+      },
+      "model_aspect_ratio": {
+        "name": "宽高比"
+      },
+      "model_resolution": {
+        "name": "分辨率"
+      },
+      "multi_shot": {
+        "name": "多镜头",
+        "tooltip": "使用单独的提示词和时长生成一系列视频片段。"
+      },
+      "multi_shot_duration": {
+        "name": "时长"
+      },
+      "multi_shot_negative_prompt": {
+        "name": "反向提示词"
+      },
+      "multi_shot_prompt": {
+        "name": "提示词"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed 控制节点是否重新运行；无论 seed 如何，结果都是非确定性的。"
+      },
+      "start_frame": {
+        "name": "起始帧",
+        "tooltip": "可选的起始帧图像。连接后切换为图生视频模式。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "KlingVirtualTryOnNode": {
+    "description": "Kling 虚拟试穿节点。输入一张人物图片和一张服装图片，将服装试穿到人物身上。",
+    "display_name": "Kling 虚拟试穿",
+    "inputs": {
       "cloth_image": {
         "name": "服装"
       },
+      "human_image": {
+        "name": "主体"
+      },
       "model_name": {
         "name": "模型"
       }
@@ -5128,112 +6386,18 @@
       }
     }
   },
-  "KSampler": {
-    "display_name": "K采样器",
-    "description": "使用提供的模型、正面条件和负面条件条件降噪Latent图像。",
+  "LTXAVTextEncoderLoader": {
+    "description": "[Recipes]\n\nltxav: gemma 3 12B",
+    "display_name": "LTXV音频文本编码器加载器",
     "inputs": {
-      "model": {
-        "name": "模型",
-        "tooltip": "用于降噪输入 Latent 图像的模型。"
+      "ckpt_name": {
+        "name": "ckpt名称"
       },
-      "seed": {
-        "name": "种子",
-        "tooltip": "生成噪波的随机种。"
+      "device": {
+        "name": "设备"
       },
-      "steps": {
-        "name": "步数",
-        "tooltip": "降噪的步数。"
-      },
-      "cfg": {
-        "name": "cfg",
-        "tooltip": "用于平衡随机性和提示词服从性。提高该值会使结果更加符合提示词，但过高会导致图像质量下降。"
-      },
-      "sampler_name": {
-        "name": "采样器名称",
-        "tooltip": "采样算法，会影响结果质量、生成速度、风格样式。"
-      },
-      "scheduler": {
-        "name": "调度器",
-        "tooltip": "控制逐渐移除噪波的方法。"
-      },
-      "positive": {
-        "name": "正面条件",
-        "tooltip": "描述包含在图像中的内容的条件。"
-      },
-      "negative": {
-        "name": "负面条件",
-        "tooltip": "描述不包含在图像中的内容的条件。"
-      },
-      "latent_image": {
-        "name": "Latent图像",
-        "tooltip": "要降噪的 Latent 图像。"
-      },
-      "denoise": {
-        "name": "降噪",
-        "tooltip": "降噪的强度，降低该值会保留原图的大部分内容从而实现图生图。"
-      },
-      "control_after_generate": {
-        "name": "生成后的控制"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": "降噪后的 Latent。"
-      }
-    }
-  },
-  "KSamplerAdvanced": {
-    "display_name": "K采样器（高级）",
-    "inputs": {
-      "model": {
-        "name": "模型"
-      },
-      "add_noise": {
-        "name": "添加噪波"
-      },
-      "noise_seed": {
-        "name": "随机种"
-      },
-      "steps": {
-        "name": "步数"
-      },
-      "cfg": {
-        "name": "cfg"
-      },
-      "sampler_name": {
-        "name": "采样器名称"
-      },
-      "scheduler": {
-        "name": "调度器"
-      },
-      "positive": {
-        "name": "正面条件"
-      },
-      "negative": {
-        "name": "负面条件"
-      },
-      "latent_image": {
-        "name": "Latent图像"
-      },
-      "start_at_step": {
-        "name": "开始步数"
-      },
-      "end_at_step": {
-        "name": "结束步数"
-      },
-      "return_with_leftover_noise": {
-        "name": "返回剩余噪波"
-      },
-      "control_after_generate": {
-        "name": "生成后的控制"
-      }
-    }
-  },
-  "KSamplerSelect": {
-    "display_name": "K采样器选择",
-    "inputs": {
-      "sampler_name": {
-        "name": "采样器名称"
+      "text_encoder": {
+        "name": "文本编码器"
       }
     },
     "outputs": {
@@ -5242,11 +6406,359 @@
       }
     }
   },
+  "LTXVAddGuide": {
+    "display_name": "LTXV添加指导",
+    "inputs": {
+      "frame_idx": {
+        "name": "帧索引",
+        "tooltip": "开始调节的帧索引。对于单帧图像或1-8帧的视频，任何帧索引值都可以接受。对于9+帧的视频，帧索引必须能被8整除，否则它将被向下取整到最接近的8的倍数。负值从视频的末尾开始计算。"
+      },
+      "image": {
+        "name": "图像",
+        "tooltip": "用于调节潜在视频的图像或视频。必须是8*n + 1帧。如果视频不是8*n + 1帧，它将被裁剪到最接近的8*n + 1帧。"
+      },
+      "latent": {
+        "name": "潜在空间"
+      },
+      "negative": {
+        "name": "负向"
+      },
+      "positive": {
+        "name": "正向"
+      },
+      "strength": {
+        "name": "强度"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "正向",
+        "tooltip": null
+      },
+      "1": {
+        "name": "负向",
+        "tooltip": null
+      },
+      "2": {
+        "name": "潜在空间",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAEDecode": {
+    "display_name": "LTXV音频VAE解码",
+    "inputs": {
+      "audio_vae": {
+        "name": "音频VAE",
+        "tooltip": "用于解码latent的音频VAE模型。"
+      },
+      "samples": {
+        "name": "样本",
+        "tooltip": "要解码的latent。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "音频",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAEEncode": {
+    "display_name": "LTXV音频VAE编码",
+    "inputs": {
+      "audio": {
+        "name": "音频",
+        "tooltip": "要编码的音频。"
+      },
+      "audio_vae": {
+        "name": "音频VAE",
+        "tooltip": "用于编码的音频VAE模型。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "音频latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVAudioVAELoader": {
+    "display_name": "LTXV音频VAE加载器",
+    "inputs": {
+      "ckpt_name": {
+        "name": "ckpt名称",
+        "tooltip": "要加载的音频VAE检查点。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "音频VAE",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVConcatAVLatent": {
+    "display_name": "LTXVConcatAVLatent",
+    "inputs": {
+      "audio_latent": {
+        "name": "audio_latent"
+      },
+      "video_latent": {
+        "name": "video_latent"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVConditioning": {
+    "display_name": "LTXV条件",
+    "inputs": {
+      "frame_rate": {
+        "name": "帧率"
+      },
+      "negative": {
+        "name": "负面条件"
+      },
+      "positive": {
+        "name": "正面条件"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "正面条件",
+        "tooltip": null
+      },
+      "1": {
+        "name": "负面条件",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVCropGuides": {
+    "display_name": "LTXV裁剪指导",
+    "inputs": {
+      "latent": {
+        "name": "潜在空间"
+      },
+      "negative": {
+        "name": "负向"
+      },
+      "positive": {
+        "name": "正向"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "正向",
+        "tooltip": null
+      },
+      "1": {
+        "name": "负向",
+        "tooltip": null
+      },
+      "2": {
+        "name": "潜在空间",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVEmptyLatentAudio": {
+    "display_name": "LTXV 空音频潜空间",
+    "inputs": {
+      "audio_vae": {
+        "name": "音频VAE",
+        "tooltip": "用于获取配置信息的音频VAE模型。"
+      },
+      "batch_size": {
+        "name": "批量大小",
+        "tooltip": "批次中潜音频样本的数量。"
+      },
+      "frame_rate": {
+        "name": "帧率",
+        "tooltip": "每秒的帧数。"
+      },
+      "frames_number": {
+        "name": "帧数",
+        "tooltip": "帧的数量。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "潜空间",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVImgToVideo": {
+    "display_name": "图像到视频（LTXV）",
+    "inputs": {
+      "batch_size": {
+        "name": "批量大小"
+      },
+      "height": {
+        "name": "高度"
+      },
+      "image": {
+        "name": "图像"
+      },
+      "length": {
+        "name": "长度"
+      },
+      "negative": {
+        "name": "负面条件"
+      },
+      "positive": {
+        "name": "正面条件"
+      },
+      "strength": {
+        "name": "强度"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "宽度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "正面条件",
+        "tooltip": null
+      },
+      "1": {
+        "name": "负面条件",
+        "tooltip": null
+      },
+      "2": {
+        "name": "Latent",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVImgToVideoInplace": {
+    "display_name": "LTXV图像转视频（原地）",
+    "inputs": {
+      "bypass": {
+        "name": "跳过",
+        "tooltip": "跳过条件处理。"
+      },
+      "image": {
+        "name": "图像"
+      },
+      "latent": {
+        "name": "潜空间"
+      },
+      "strength": {
+        "name": "强度"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "潜空间",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVLatentUpsampler": {
+    "display_name": "LTXV潜空间上采样器",
+    "inputs": {
+      "samples": {
+        "name": "样本"
+      },
+      "upscale_model": {
+        "name": "放大模型"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
+  "LTXVPreprocess": {
+    "display_name": "LTXV预处理",
+    "inputs": {
+      "image": {
+        "name": "图像"
+      },
+      "img_compression": {
+        "name": "图像压缩",
+        "tooltip": "应用于图像的压缩量。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "输出图像",
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVScheduler": {
+    "display_name": "LTXV调度器",
+    "inputs": {
+      "base_shift": {
+        "name": "基础移位"
+      },
+      "latent": {
+        "name": "Latent"
+      },
+      "max_shift": {
+        "name": "最大移位"
+      },
+      "steps": {
+        "name": "步数"
+      },
+      "stretch": {
+        "name": "拉伸",
+        "tooltip": "将 sigma 拉伸到范围 [终值, 1]。"
+      },
+      "terminal": {
+        "name": "终值",
+        "tooltip": "拉伸后 sigma 的终值。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "LTXVSeparateAVLatent": {
+    "description": "LTXV分离音视频潜空间",
+    "display_name": "LTXV分离音视频潜空间",
+    "inputs": {
+      "av_latent": {
+        "name": "音视频潜空间"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "video_latent",
+        "tooltip": null
+      },
+      "1": {
+        "name": "audio_latent",
+        "tooltip": null
+      }
+    }
+  },
   "LaplaceScheduler": {
     "display_name": "Laplace调度器",
     "inputs": {
-      "steps": {
-        "name": "步数"
+      "beta": {
+        "name": "beta"
+      },
+      "mu": {
+        "name": "mu"
       },
       "sigma_max": {
         "name": "sigma_max"
@@ -5254,11 +6766,8 @@
       "sigma_min": {
         "name": "sigma_min"
       },
-      "mu": {
-        "name": "mu"
-      },
-      "beta": {
-        "name": "beta"
+      "steps": {
+        "name": "步数"
       }
     },
     "outputs": {
@@ -5286,11 +6795,11 @@
   "LatentApplyOperation": {
     "display_name": "Latent应用操作",
     "inputs": {
-      "samples": {
-        "name": "Latent"
-      },
       "operation": {
         "name": "操作"
+      },
+      "samples": {
+        "name": "Latent"
       }
     },
     "outputs": {
@@ -5350,34 +6859,34 @@
   "LatentBlend": {
     "display_name": "混合Latent",
     "inputs": {
+      "blend_factor": {
+        "name": "系数"
+      },
       "samples1": {
         "name": "Latent1"
       },
       "samples2": {
         "name": "Latent2"
-      },
-      "blend_factor": {
-        "name": "系数"
       }
     }
   },
   "LatentComposite": {
     "display_name": "合成Latent",
     "inputs": {
-      "samples_to": {
-        "name": "Latent到"
+      "feather": {
+        "name": "羽化"
       },
       "samples_from": {
         "name": "Latent从"
       },
+      "samples_to": {
+        "name": "Latent到"
+      },
       "x": {
         "name": "x"
       },
       "y": {
         "name": "y"
-      },
-      "feather": {
-        "name": "羽化"
       }
     }
   },
@@ -5387,6 +6896,12 @@
       "destination": {
         "name": "目标Latent"
       },
+      "mask": {
+        "name": "遮罩"
+      },
+      "resize_source": {
+        "name": "调整来源大小"
+      },
       "source": {
         "name": "来源Latent"
       },
@@ -5395,12 +6910,6 @@
       },
       "y": {
         "name": "y"
-      },
-      "resize_source": {
-        "name": "调整来源大小"
-      },
-      "mask": {
-        "name": "遮罩"
       }
     },
     "outputs": {
@@ -5412,14 +6921,14 @@
   "LatentConcat": {
     "display_name": "潜在空间拼接",
     "inputs": {
+      "dim": {
+        "name": "维度"
+      },
       "samples1": {
         "name": "样本1"
       },
       "samples2": {
         "name": "样本2"
-      },
-      "dim": {
-        "name": "维度"
       }
     },
     "outputs": {
@@ -5431,15 +6940,15 @@
   "LatentCrop": {
     "display_name": "裁剪Latent",
     "inputs": {
+      "height": {
+        "name": "高度"
+      },
       "samples": {
         "name": "Latent"
       },
       "width": {
         "name": "宽度"
       },
-      "height": {
-        "name": "高度"
-      },
       "x": {
         "name": "x"
       },
@@ -5451,8 +6960,8 @@
   "LatentCut": {
     "display_name": "潜在空间切割",
     "inputs": {
-      "samples": {
-        "name": "样本"
+      "amount": {
+        "name": "数量"
       },
       "dim": {
         "name": "维度"
@@ -5460,8 +6969,8 @@
       "index": {
         "name": "索引"
       },
-      "amount": {
-        "name": "数量"
+      "samples": {
+        "name": "样本"
       }
     },
     "outputs": {
@@ -5473,12 +6982,12 @@
   "LatentCutToBatch": {
     "display_name": "Latent切割",
     "inputs": {
-      "samples": {
-        "name": "Latent"
-      },
       "dim": {
         "name": "维度"
       },
+      "samples": {
+        "name": "Latent"
+      },
       "slice_size": {
         "name": "碎片大小"
       }
@@ -5492,39 +7001,39 @@
   "LatentFlip": {
     "display_name": "翻转Latent",
     "inputs": {
-      "samples": {
-        "name": "Latent"
-      },
       "flip_method": {
         "name": "翻转方法"
+      },
+      "samples": {
+        "name": "Latent"
       }
     }
   },
   "LatentFromBatch": {
     "display_name": "从批次获取Latent",
     "inputs": {
-      "samples": {
-        "name": "Latent"
-      },
       "batch_index": {
         "name": "批次索引"
       },
       "length": {
         "name": "长度"
+      },
+      "samples": {
+        "name": "Latent"
       }
     }
   },
   "LatentInterpolate": {
     "display_name": "Latent插值",
     "inputs": {
+      "ratio": {
+        "name": "比率"
+      },
       "samples1": {
         "name": "Latent1"
       },
       "samples2": {
         "name": "Latent2"
-      },
-      "ratio": {
-        "name": "比率"
       }
     },
     "outputs": {
@@ -5536,11 +7045,11 @@
   "LatentMultiply": {
     "display_name": "Latent相乘",
     "inputs": {
-      "samples": {
-        "name": "Latent"
-      },
       "multiplier": {
         "name": "乘数"
+      },
+      "samples": {
+        "name": "Latent"
       }
     },
     "outputs": {
@@ -5552,14 +7061,14 @@
   "LatentOperationSharpen": {
     "display_name": "Latent操作锐化",
     "inputs": {
+      "alpha": {
+        "name": "阿尔法"
+      },
       "sharpen_radius": {
         "name": "锐化半径"
       },
       "sigma": {
         "name": "西格玛"
-      },
-      "alpha": {
-        "name": "阿尔法"
       }
     },
     "outputs": {
@@ -5584,11 +7093,11 @@
   "LatentRotate": {
     "display_name": "旋转Latent",
     "inputs": {
-      "samples": {
-        "name": "Latent"
-      },
       "rotation": {
         "name": "旋转"
+      },
+      "samples": {
+        "name": "Latent"
       }
     }
   },
@@ -5611,6 +7120,12 @@
   "LatentUpscale": {
     "display_name": "缩放Latent",
     "inputs": {
+      "crop": {
+        "name": "裁剪"
+      },
+      "height": {
+        "name": "高度"
+      },
       "samples": {
         "name": "Latent"
       },
@@ -5619,12 +7134,6 @@
       },
       "width": {
         "name": "宽度"
-      },
-      "height": {
-        "name": "高度"
-      },
-      "crop": {
-        "name": "裁剪"
       }
     }
   },
@@ -5634,11 +7143,11 @@
       "samples": {
         "name": "Latent"
       },
-      "upscale_method": {
-        "name": "缩放算法"
-      },
       "scale_by": {
         "name": "缩放比例"
+      },
+      "upscale_method": {
+        "name": "缩放算法"
       }
     }
   },
@@ -5656,9 +7165,13 @@
     }
   },
   "LazyCache": {
-    "display_name": "惰性缓存",
     "description": "EasyCache 的自制版本 - 更'简单'的 EasyCache 实现。总体效果不如 EasyCache，但在某些罕见情况下表现更好，并且与 ComfyUI 中的所有内容具有通用兼容性。",
+    "display_name": "惰性缓存",
     "inputs": {
+      "end_percent": {
+        "name": "结束百分比",
+        "tooltip": "结束使用惰性缓存的相对采样步骤。"
+      },
       "model": {
         "name": "模型",
         "tooltip": "要添加惰性缓存的模型。"
@@ -5671,10 +7184,6 @@
         "name": "起始百分比",
         "tooltip": "开始使用惰性缓存的相对采样步骤。"
       },
-      "end_percent": {
-        "name": "结束百分比",
-        "tooltip": "结束使用惰性缓存的相对采样步骤。"
-      },
       "verbose": {
         "name": "详细模式",
         "tooltip": "是否记录详细信息。"
@@ -5689,21 +7198,21 @@
   "Load3D": {
     "display_name": "加载3D",
     "inputs": {
-      "model_file": {
-        "name": "模型文件"
+      "clear": "清除",
+      "height": {
+        "name": "高度"
       },
       "image": {
         "name": "图像"
       },
+      "model_file": {
+        "name": "模型文件"
+      },
+      "upload 3d model": "上传3D模型",
+      "upload extra resources": "上传额外资源",
       "width": {
         "name": "宽度"
-      },
-      "height": {
-        "name": "高度"
-      },
-      "clear": {},
-      "upload 3d model": {},
-      "upload extra resources": {}
+      }
     },
     "outputs": {
       "0": {
@@ -5711,7 +7220,7 @@
         "tooltip": null
       },
       "1": {
-        "name": "遮罩",
+        "name": "mask",
         "tooltip": null
       },
       "2": {
@@ -5719,15 +7228,19 @@
         "tooltip": null
       },
       "3": {
-        "name": "法向",
+        "name": "法线",
         "tooltip": null
       },
       "4": {
-        "name": "线条",
+        "name": "相机信息",
         "tooltip": null
       },
       "5": {
-        "name": "相机信息",
+        "name": "录制视频",
+        "tooltip": null
+      },
+      "6": {
+        "name": "model_3d",
         "tooltip": null
       }
     }
@@ -5780,25 +7293,25 @@
   "LoadImageMask": {
     "display_name": "加载图像（作为遮罩）",
     "inputs": {
-      "image": {
-        "name": "图像"
-      },
       "channel": {
         "name": "通道"
       },
+      "image": {
+        "name": "图像"
+      },
       "upload": {
         "name": "选择文件上传"
       }
     }
   },
   "LoadImageOutput": {
-    "display_name": "加载图像（来自输出）",
     "description": "从输出文件夹加载图像。当点击刷新按钮时，节点将更新图像列表并自动选择第一张图像，便于轻松迭代。",
+    "display_name": "加载图像（来自输出）",
     "inputs": {
+      "Auto-refresh after generation": {},
       "image": {
         "name": "图像"
       },
-      "Auto-refresh after generation": {},
       "refresh": {},
       "upload": {
         "name": "选择文件上传"
@@ -5868,13 +7381,9 @@
     }
   },
   "LoraLoader": {
-    "display_name": "加载LoRA",
     "description": "LoRA用于修改扩散和CLIP模型，改变Latent图像的降噪方式，例如应用风格。多个LoRA节点可以链接在一起。",
+    "display_name": "加载LoRA",
     "inputs": {
-      "model": {
-        "name": "模型",
-        "tooltip": "LoRA 将应用于的扩散模型。"
-      },
       "clip": {
         "name": "CLIP",
         "tooltip": "LoRA 将应用于的 CLIP 模型。"
@@ -5883,13 +7392,17 @@
         "name": "LoRA名称",
         "tooltip": "LoRA 的名称。"
       },
-      "strength_model": {
-        "name": "模型强度",
-        "tooltip": "修改扩散模型的强度。此值可以为负。"
+      "model": {
+        "name": "模型",
+        "tooltip": "LoRA 将应用于的扩散模型。"
       },
       "strength_clip": {
         "name": "CLIP强度",
         "tooltip": "修改 CLIP 模型的强度。此值可以为负。"
+      },
+      "strength_model": {
+        "name": "模型强度",
+        "tooltip": "修改扩散模型的强度。此值可以为负。"
       }
     },
     "outputs": {
@@ -5901,16 +7414,70 @@
       }
     }
   },
-  "LoraLoaderModelOnly": {
-    "display_name": "LoRA加载器（仅模型）",
-    "description": "LoRA用于修改扩散和CLIP模型，改变Latent图像的降噪方式，例如应用风格。多个LoRA节点可以链接在一起。",
+  "LoraLoaderBypass": {
+    "description": "以旁路模式应用LoRA。与常规LoRA不同，此方式不会修改模型权重——而是在前向传播时注入LoRA计算。适用于训练场景。",
+    "display_name": "加载LoRA（旁路）（用于调试）",
     "inputs": {
-      "model": {
-        "name": "模型"
+      "clip": {
+        "name": "clip",
+        "tooltip": "将应用LoRA的CLIP模型。"
       },
+      "lora_name": {
+        "name": "lora_name",
+        "tooltip": "LoRA的名称。"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "将应用LoRA的扩散模型。"
+      },
+      "strength_clip": {
+        "name": "strength_clip",
+        "tooltip": "对CLIP模型的修改强度。该值可以为负数。"
+      },
+      "strength_model": {
+        "name": "strength_model",
+        "tooltip": "对扩散模型的修改强度。该值可以为负数。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "已修改的扩散模型。"
+      },
+      "1": {
+        "tooltip": "已修改的CLIP模型。"
+      }
+    }
+  },
+  "LoraLoaderBypassModelOnly": {
+    "description": "以旁路模式应用LoRA。与常规LoRA不同，此方式不会修改模型权重——而是在前向传播时注入LoRA计算。适用于训练场景。",
+    "display_name": "加载LoRA（旁路，仅模型）（用于调试）",
+    "inputs": {
+      "lora_name": {
+        "name": "lora_name"
+      },
+      "model": {
+        "name": "model"
+      },
+      "strength_model": {
+        "name": "strength_model"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "已修改的扩散模型。"
+      }
+    }
+  },
+  "LoraLoaderModelOnly": {
+    "description": "LoRA用于修改扩散和CLIP模型，改变Latent图像的降噪方式，例如应用风格。多个LoRA节点可以链接在一起。",
+    "display_name": "LoRA加载器（仅模型）",
+    "inputs": {
       "lora_name": {
         "name": "LoRA名称"
       },
+      "model": {
+        "name": "模型"
+      },
       "strength_model": {
         "name": "模型强度"
       }
@@ -5924,14 +7491,18 @@
   "LoraModelLoader": {
     "display_name": "加载 LoRA 模型",
     "inputs": {
-      "model": {
-        "name": "模型",
-        "tooltip": "LoRA 将应用于的扩散模型。"
+      "bypass": {
+        "name": "bypass",
+        "tooltip": "启用后，以旁路模式应用LoRA，不修改基础模型权重。适用于训练和模型权重卸载时。"
       },
       "lora": {
         "name": "lora",
         "tooltip": "要应用于扩散模型的 LoRA 模型。"
       },
+      "model": {
+        "name": "模型",
+        "tooltip": "LoRA 将应用于的扩散模型。"
+      },
       "strength_model": {
         "name": "模型强度",
         "tooltip": "修改扩散模型的强度。此值可以为负数。"
@@ -5947,22 +7518,22 @@
   "LoraSave": {
     "display_name": "保存LoRA",
     "inputs": {
+      "bias_diff": {
+        "name": "偏差差异"
+      },
       "filename_prefix": {
         "name": "文件名前缀"
       },
-      "rank": {
-        "name": "排名"
-      },
       "lora_type": {
         "name": "lora类型"
       },
-      "bias_diff": {
-        "name": "偏差差异"
-      },
       "model_diff": {
         "name": "模型差异",
         "tooltip": "要转换为 LoRA 的模型差异输出。"
       },
+      "rank": {
+        "name": "排名"
+      },
       "text_encoder_diff": {
         "name": "文本编码器差异",
         "tooltip": "要转换为 LoRA 的CLIP差异输出。"
@@ -5972,13 +7543,13 @@
   "LossGraphNode": {
     "display_name": "绘制损失图",
     "inputs": {
-      "loss": {
-        "name": "损失",
-        "tooltip": "训练节点的损失图"
-      },
       "filename_prefix": {
         "name": "文件名前缀",
         "tooltip": "保存损失图的文件名前缀"
+      },
+      "loss": {
+        "name": "损失",
+        "tooltip": "训练节点的损失图"
       }
     }
   },
@@ -5991,52 +7562,20 @@
       }
     }
   },
-  "LTXVAddGuide": {
-    "display_name": "LTXV添加指导",
-    "inputs": {
-      "positive": {
-        "name": "正向"
-      },
-      "negative": {
-        "name": "负向"
-      },
-      "vae": {
-        "name": "vae"
-      },
-      "latent": {
-        "name": "潜在空间"
-      },
-      "image": {
-        "name": "图像",
-        "tooltip": "用于调节潜在视频的图像或视频。必须是8*n + 1帧。如果视频不是8*n + 1帧，它将被裁剪到最接近的8*n + 1帧。"
-      },
-      "frame_idx": {
-        "name": "帧索引",
-        "tooltip": "开始调节的帧索引。对于单帧图像或1-8帧的视频，任何帧索引值都可以接受。对于9+帧的视频，帧索引必须能被8整除，否则它将被向下取整到最接近的8的倍数。负值从视频的末尾开始计算。"
-      },
-      "strength": {
-        "name": "强度"
-      }
-    },
-    "outputs": {
-      "0": {
-        "name": "正向",
-        "tooltip": null
-      },
-      "1": {
-        "name": "负向",
-        "tooltip": null
-      },
-      "2": {
-        "name": "潜在空间",
-        "tooltip": null
-      }
-    }
-  },
   "LtxvApiImageToVideo": {
-    "display_name": "LTXV 图像到视频",
     "description": "基于起始图像生成专业品质视频，可自定义时长和分辨率。",
+    "display_name": "LTXV 图像到视频",
     "inputs": {
+      "duration": {
+        "name": "时长"
+      },
+      "fps": {
+        "name": "帧率"
+      },
+      "generate_audio": {
+        "name": "生成音频",
+        "tooltip": "为 true 时，生成的视频将包含与场景匹配的 AI 生成音频。"
+      },
       "image": {
         "name": "图像",
         "tooltip": "用于视频的第一帧图像。"
@@ -6047,18 +7586,8 @@
       "prompt": {
         "name": "提示词"
       },
-      "duration": {
-        "name": "时长"
-      },
       "resolution": {
         "name": "分辨率"
-      },
-      "fps": {
-        "name": "帧率"
-      },
-      "generate_audio": {
-        "name": "生成音频",
-        "tooltip": "为 true 时，生成的视频将包含与场景匹配的 AI 生成音频。"
       }
     },
     "outputs": {
@@ -6068,173 +7597,27 @@
     }
   },
   "LtxvApiTextToVideo": {
-    "display_name": "LTXV 文本到视频",
     "description": "可自定义时长和分辨率的专业品质视频。",
+    "display_name": "LTXV 文本到视频",
     "inputs": {
-      "model": {
-        "name": "模型"
-      },
-      "prompt": {
-        "name": "提示词"
-      },
       "duration": {
         "name": "时长"
       },
-      "resolution": {
-        "name": "分辨率"
-      },
       "fps": {
         "name": "帧率"
       },
       "generate_audio": {
         "name": "生成音频",
         "tooltip": "生成的视频将包含与场景匹配的 AI 生成音频。"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "LTXVConditioning": {
-    "display_name": "LTXV条件",
-    "inputs": {
-      "positive": {
-        "name": "正面条件"
       },
-      "negative": {
-        "name": "负面条件"
+      "model": {
+        "name": "模型"
       },
-      "frame_rate": {
-        "name": "帧率"
-      }
-    },
-    "outputs": {
-      "0": {
-        "name": "正面条件",
-        "tooltip": null
+      "prompt": {
+        "name": "提示词"
       },
-      "1": {
-        "name": "负面条件",
-        "tooltip": null
-      }
-    }
-  },
-  "LTXVCropGuides": {
-    "display_name": "LTXV裁剪指导",
-    "inputs": {
-      "positive": {
-        "name": "正向"
-      },
-      "negative": {
-        "name": "负向"
-      },
-      "latent": {
-        "name": "潜在空间"
-      }
-    },
-    "outputs": {
-      "0": {
-        "name": "正向",
-        "tooltip": null
-      },
-      "1": {
-        "name": "负向",
-        "tooltip": null
-      },
-      "2": {
-        "name": "潜在空间",
-        "tooltip": null
-      }
-    }
-  },
-  "LTXVImgToVideo": {
-    "display_name": "图像到视频（LTXV）",
-    "inputs": {
-      "positive": {
-        "name": "正面条件"
-      },
-      "negative": {
-        "name": "负面条件"
-      },
-      "vae": {
-        "name": "vae"
-      },
-      "image": {
-        "name": "图像"
-      },
-      "width": {
-        "name": "宽度"
-      },
-      "height": {
-        "name": "高度"
-      },
-      "length": {
-        "name": "长度"
-      },
-      "batch_size": {
-        "name": "批量大小"
-      },
-      "strength": {
-        "name": "强度"
-      }
-    },
-    "outputs": {
-      "0": {
-        "name": "正面条件",
-        "tooltip": null
-      },
-      "1": {
-        "name": "负面条件",
-        "tooltip": null
-      },
-      "2": {
-        "name": "Latent",
-        "tooltip": null
-      }
-    }
-  },
-  "LTXVPreprocess": {
-    "display_name": "LTXV预处理",
-    "inputs": {
-      "image": {
-        "name": "图像"
-      },
-      "img_compression": {
-        "name": "图像压缩",
-        "tooltip": "应用于图像的压缩量。"
-      }
-    },
-    "outputs": {
-      "0": {
-        "name": "输出图像",
-        "tooltip": null
-      }
-    }
-  },
-  "LTXVScheduler": {
-    "display_name": "LTXV调度器",
-    "inputs": {
-      "steps": {
-        "name": "步数"
-      },
-      "max_shift": {
-        "name": "最大移位"
-      },
-      "base_shift": {
-        "name": "基础移位"
-      },
-      "stretch": {
-        "name": "拉伸",
-        "tooltip": "将 sigma 拉伸到范围 [终值, 1]。"
-      },
-      "terminal": {
-        "name": "终值",
-        "tooltip": "拉伸后 sigma 的终值。"
-      },
-      "latent": {
-        "name": "Latent"
+      "resolution": {
+        "name": "分辨率"
       }
     },
     "outputs": {
@@ -6244,8 +7627,8 @@
     }
   },
   "LumaConceptsNode": {
-    "display_name": "Luma 概念",
     "description": "包含一个或多个相机概念，可用于 Luma 文本转视频和 Luma 图像转视频节点。",
+    "display_name": "Luma 概念",
     "inputs": {
       "concept1": {
         "name": "概念1"
@@ -6272,16 +7655,15 @@
     }
   },
   "LumaImageModifyNode": {
-    "display_name": "Luma 图像到图像",
     "description": "根据提示词和宽高比同步修改图像。",
+    "display_name": "Luma 图像到图像",
     "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
       "image": {
         "name": "图像"
       },
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于图像生成的提示词"
-      },
       "image_weight": {
         "name": "图像权重",
         "tooltip": "图像权重；越接近 1.0，图像被修改的程度越小。"
@@ -6289,12 +7671,13 @@
       "model": {
         "name": "模型"
       },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于图像生成的提示词"
+      },
       "seed": {
         "name": "随机种",
         "tooltip": "用于决定节点是否重新运行的种子；无论种子如何，实际结果都是非确定性的。"
-      },
-      "control_after_generate": {
-        "name": "生成后控制"
       }
     },
     "outputs": {
@@ -6304,41 +7687,41 @@
     }
   },
   "LumaImageNode": {
-    "display_name": "Luma 文生图",
     "description": "根据提示词和宽高比同步生成图像。",
+    "display_name": "Luma 文生图",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于图像生成的提示词"
-      },
-      "model": {
-        "name": "模型"
-      },
       "aspect_ratio": {
         "name": "宽高比"
       },
-      "seed": {
-        "name": "种子",
-        "tooltip": "用于决定节点是否重新运行的种子；无论种子如何，实际结果都是非确定性的。"
-      },
-      "style_image_weight": {
-        "name": "风格图权重",
-        "tooltip": "风格图像的权重。如果未提供风格图像则忽略。"
-      },
-      "image_luma_ref": {
-        "name": "Luma 参考图",
-        "tooltip": "Luma 参考节点连接，可用输入图像影响生成；最多可考虑 4 张图像。"
-      },
-      "style_image": {
-        "name": "风格参考图",
-        "tooltip": "风格参考图像；仅使用 1 张图像。"
-      },
       "character_image": {
         "name": "角色参考图",
         "tooltip": "角色参考图像；可为多张批量输入，最多可考虑 4 张图像。"
       },
       "control_after_generate": {
         "name": "生成后控制"
+      },
+      "image_luma_ref": {
+        "name": "Luma 参考图",
+        "tooltip": "Luma 参考节点连接，可用输入图像影响生成；最多可考虑 4 张图像。"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于图像生成的提示词"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "用于决定节点是否重新运行的种子；无论种子如何，实际结果都是非确定性的。"
+      },
+      "style_image": {
+        "name": "风格参考图",
+        "tooltip": "风格参考图像；仅使用 1 张图像。"
+      },
+      "style_image_weight": {
+        "name": "风格图权重",
+        "tooltip": "风格图像的权重。如果未提供风格图像则忽略。"
       }
     },
     "outputs": {
@@ -6348,29 +7731,15 @@
     }
   },
   "LumaImageToVideoNode": {
-    "display_name": "Luma 图像转视频",
     "description": "根据提示词、输入图像和输出尺寸同步生成视频。",
+    "display_name": "Luma 图像转视频",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于视频生成的提示词"
-      },
-      "model": {
-        "name": "模型"
-      },
-      "resolution": {
-        "name": "分辨率"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "duration": {
         "name": "时长"
       },
-      "loop": {
-        "name": "循环"
-      },
-      "seed": {
-        "name": "种子",
-        "tooltip": "用于决定节点是否重新运行的种子；无论种子如何，实际结果都是非确定性的。"
-      },
       "first_image": {
         "name": "首帧图像",
         "tooltip": "生成视频的第一帧。"
@@ -6379,12 +7748,26 @@
         "name": "末帧图像",
         "tooltip": "生成视频的最后一帧。"
       },
+      "loop": {
+        "name": "循环"
+      },
       "luma_concepts": {
         "name": "Luma概念",
         "tooltip": "可选的 Camera Concepts，通过 Luma Concepts 节点控制相机运动。"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "model": {
+        "name": "模型"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于视频生成的提示词"
+      },
+      "resolution": {
+        "name": "分辨率"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "用于决定节点是否重新运行的种子；无论种子如何，实际结果都是非确定性的。"
       }
     },
     "outputs": {
@@ -6394,19 +7777,19 @@
     }
   },
   "LumaReferenceNode": {
-    "display_name": "Luma 参考",
     "description": "用于 Luma 生成图像节点，包含一张图片和权重。",
+    "display_name": "Luma 参考",
     "inputs": {
       "image": {
         "name": "图片",
         "tooltip": "用作参考的图片。"
       },
+      "luma_ref": {
+        "name": "Luma参考"
+      },
       "weight": {
         "name": "权重",
         "tooltip": "图片参考的权重。"
-      },
-      "luma_ref": {
-        "name": "Luma参考"
       }
     },
     "outputs": {
@@ -6417,21 +7800,14 @@
     }
   },
   "LumaVideoNode": {
-    "display_name": "Luma 文本转视频",
     "description": "根据提示词和输出尺寸同步生成视频。",
+    "display_name": "Luma 文本转视频",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于视频生成的提示词"
-      },
-      "model": {
-        "name": "模型"
-      },
       "aspect_ratio": {
         "name": "宽高比"
       },
-      "resolution": {
-        "name": "分辨率"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "duration": {
         "name": "时长"
@@ -6439,16 +7815,225 @@
       "loop": {
         "name": "循环"
       },
-      "seed": {
-        "name": "种子",
-        "tooltip": "用于决定节点是否重新运行的种子；无论种子如何，实际结果都是非确定性的。"
-      },
       "luma_concepts": {
         "name": "Luma概念",
         "tooltip": "可选的相机概念，通过 Luma Concepts 节点控制相机运动。"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "model": {
+        "name": "模型"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于视频生成的提示词"
+      },
+      "resolution": {
+        "name": "分辨率"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "用于决定节点是否重新运行的种子；无论种子如何，实际结果都是非确定性的。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageRelightNode": {
+    "description": "通过光照调整和可选的参考光照迁移对图像进行重光照。",
+    "display_name": "Magnific图像重光照",
+    "inputs": {
+      "advanced_settings": {
+        "name": "advanced_settings",
+        "tooltip": "高级光照控制的微调选项。"
+      },
+      "change_background": {
+        "name": "change_background",
+        "tooltip": "根据提示/参考修改背景。"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "需要重光照的图像。"
+      },
+      "interpolate_from_original": {
+        "name": "interpolate_from_original",
+        "tooltip": "限制生成自由度，更贴近原图。"
+      },
+      "light_transfer_strength": {
+        "name": "light_transfer_strength",
+        "tooltip": "光照迁移应用强度。"
+      },
+      "preserve_details": {
+        "name": "preserve_details",
+        "tooltip": "保留原图的纹理和细节。"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "光照描述性引导。支持强调符号（1-1.4）。"
+      },
+      "reference_image": {
+        "name": "reference_image",
+        "tooltip": "可选的参考图像，用于迁移光照。"
+      },
+      "style": {
+        "name": "style",
+        "tooltip": "风格化输出偏好。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageSkinEnhancerNode": {
+    "description": "用于人像的美肤增强，支持多种处理模式。",
+    "display_name": "Magnific图像美肤增强",
+    "inputs": {
+      "image": {
+        "name": "image",
+        "tooltip": "需要增强的人像图像。"
+      },
+      "mode": {
+        "name": "mode",
+        "tooltip": "处理模式：creative为艺术增强，faithful为保留原貌，flexible为定向优化。"
+      },
+      "sharpen": {
+        "name": "sharpen",
+        "tooltip": "锐化强度等级。"
+      },
+      "smart_grain": {
+        "name": "smart_grain",
+        "tooltip": "智能颗粒强度等级。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageStyleTransferNode": {
+    "description": "将参考图像的风格迁移到你的输入图像上。",
+    "display_name": "Magnific 图像风格迁移",
+    "inputs": {
+      "engine": {
+        "name": "engine",
+        "tooltip": "处理引擎选择。"
+      },
+      "fixed_generation": {
+        "name": "fixed_generation",
+        "tooltip": "禁用时，每次生成都会引入一定的随机性，从而产生更多样化的结果。"
+      },
+      "flavor": {
+        "name": "flavor",
+        "tooltip": "风格迁移风格类型。"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "要进行风格迁移的图像。"
+      },
+      "portrait_mode": {
+        "name": "portrait_mode",
+        "tooltip": "启用人像模式以增强面部效果。"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "reference_image": {
+        "name": "reference_image",
+        "tooltip": "用于提取风格的参考图像。"
+      },
+      "structure_strength": {
+        "name": "structure_strength",
+        "tooltip": "保持原始图像结构。"
+      },
+      "style_strength": {
+        "name": "style_strength",
+        "tooltip": "风格强度百分比。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageUpscalerCreativeNode": {
+    "description": "基于提示词的增强、风格化，以及 2x/4x/8x/16x 放大。最大输出：25.3 百万像素。",
+    "display_name": "Magnific 图像放大（创意）",
+    "inputs": {
+      "auto_downscale": {
+        "name": "自动降采样",
+        "tooltip": "如果输出超过最大像素限制，则自动缩小输入图像。"
+      },
+      "creativity": {
+        "name": "创意"
+      },
+      "engine": {
+        "name": "引擎"
+      },
+      "fractality": {
+        "name": "复杂度",
+        "tooltip": "每平方像素的提示词强度和复杂度。"
+      },
+      "hdr": {
+        "name": "HDR",
+        "tooltip": "清晰度和细节级别。"
+      },
+      "image": {
+        "name": "图像"
+      },
+      "optimized_for": {
+        "name": "优化目标"
+      },
+      "prompt": {
+        "name": "提示词"
+      },
+      "resemblance": {
+        "name": "相似度",
+        "tooltip": "与原始图像的相似程度。"
+      },
+      "scale_factor": {
+        "name": "放大倍数"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "MagnificImageUpscalerPreciseV2Node": {
+    "description": "高保真放大，精细控制锐度、颗粒感和细节。最大输出：10060×10060 像素。",
+    "display_name": "Magnific 图像放大（精确 V2）",
+    "inputs": {
+      "auto_downscale": {
+        "name": "自动降采样",
+        "tooltip": "如果输出超过最大分辨率，则自动缩小输入图像。"
+      },
+      "flavor": {
+        "name": "风格",
+        "tooltip": "处理风格：sublime 适用于通用，photo 适用于照片，photo_denoiser 适用于有噪点的照片。"
+      },
+      "image": {
+        "name": "图像"
+      },
+      "scale_factor": {
+        "name": "放大倍数"
+      },
+      "sharpen": {
+        "name": "锐化",
+        "tooltip": "图像锐度强度。数值越高，边缘越清晰。"
+      },
+      "smart_grain": {
+        "name": "智能颗粒",
+        "tooltip": "智能增强颗粒/纹理，防止图像过于平滑或失真。"
+      },
+      "ultra_detail": {
+        "name": "超细节",
+        "tooltip": "控制放大过程中添加的细节、纹理和微观细节。"
       }
     },
     "outputs": {
@@ -6458,8 +8043,8 @@
     }
   },
   "Mahiro": {
-    "display_name": "真寻太可爱了，她应该有个更好的引导功能！！(。・ω・。)",
     "description": "修改引导以更多地侧重于正面条件提示的'方向'，而不是负面条件提示之间的差异。",
+    "display_name": "真寻太可爱了，她应该有个更好的引导功能！！(。・ω・。)",
     "inputs": {
       "model": {
         "name": "模型"
@@ -6475,21 +8060,21 @@
   "MakeTrainingDataset": {
     "display_name": "制作训练数据集",
     "inputs": {
-      "images": {
-        "name": "图像",
-        "tooltip": "需要编码的图像序列。"
-      },
-      "vae": {
-        "name": "VAE",
-        "tooltip": "用于编码图像的 VAE 模型"
-      },
       "clip": {
         "name": "CLIP",
         "tooltip": "用于编码文本的 CLIP 模型"
       },
+      "images": {
+        "name": "图像",
+        "tooltip": "需要编码的图像序列。"
+      },
       "texts": {
         "name": "文本",
         "tooltip": "标注文本序列。数量可以是n（匹配图像），1（重复使用），或者省略（使用空字符串）。"
+      },
+      "vae": {
+        "name": "VAE",
+        "tooltip": "用于编码图像的 VAE 模型"
       }
     },
     "outputs": {
@@ -6522,6 +8107,9 @@
       "destination": {
         "name": "目标"
       },
+      "operation": {
+        "name": "操作"
+      },
       "source": {
         "name": "源"
       },
@@ -6530,9 +8118,6 @@
       },
       "y": {
         "name": "y"
-      },
-      "operation": {
-        "name": "操作"
       }
     },
     "outputs": {
@@ -6542,8 +8127,8 @@
     }
   },
   "MaskPreview": {
-    "display_name": "预览遮罩",
     "description": "将输入图像保存到您的 ComfyUI 输出目录。",
+    "display_name": "预览遮罩",
     "inputs": {
       "mask": {
         "name": "遮罩"
@@ -6593,17 +8178,346 @@
       }
     }
   },
-  "MinimaxHailuoVideoNode": {
-    "display_name": "MiniMax 海螺视频",
-    "description": "使用新的 MiniMax Hailuo-02 模型从提示词生成视频，可选择起始帧。",
+  "MeshyAnimateModelNode": {
+    "description": "为已绑定骨骼的角色应用特定动画动作。",
+    "display_name": "Meshy：动画模型",
     "inputs": {
-      "prompt_text": {
-        "name": "提示文本",
-        "tooltip": "指导视频生成的文本提示。"
+      "action_id": {
+        "name": "action_id",
+        "tooltip": "访问 https://docs.meshy.ai/en/api/animation-library 查看可用值列表。"
+      },
+      "rig_task_id": {
+        "name": "rig_task_id"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "模型文件",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyImageToModelNode": {
+    "display_name": "Meshy：图像转模型",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "指定生成模型的姿态模式。"
       },
       "seed": {
-        "name": "种子",
-        "tooltip": "用于创建噪声的随机种子。"
+        "name": "seed",
+        "tooltip": "Seed 控制节点是否重新运行；无论 seed 如何，结果都是非确定性的。"
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "设置为 false 时，返回未处理的三角网格。"
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      },
+      "should_texture": {
+        "name": "should_texture",
+        "tooltip": "决定是否生成纹理。设置为 false 跳过纹理阶段，返回无纹理的网格。"
+      },
+      "should_texture_enable_pbr": {
+        "name": "enable_pbr"
+      },
+      "should_texture_texture_prompt": {
+        "name": "texture_prompt"
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "模型文件",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyMultiImageToModelNode": {
+    "display_name": "Meshy：多图像转模型",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "images": {
+        "name": "images"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "指定生成模型的姿态模式。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed 控制节点是否重新运行；无论 seed 如何，结果都是非确定性的。"
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "设置为 false 时，返回未处理的三角网格。"
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      },
+      "should_texture": {
+        "name": "should_texture",
+        "tooltip": "决定是否生成纹理。设置为 false 跳过纹理阶段，返回无纹理的网格。"
+      },
+      "should_texture_enable_pbr": {
+        "name": "enable_pbr"
+      },
+      "should_texture_texture_prompt": {
+        "name": "texture_prompt"
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "模型文件",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyRefineNode": {
+    "description": "对先前创建的草稿模型进行精细化处理。",
+    "display_name": "Meshy：精细化草稿模型",
+    "inputs": {
+      "enable_pbr": {
+        "name": "enable_pbr",
+        "tooltip": "在基础色之外生成PBR贴图（金属度、粗糙度、法线）。注意：使用雕塑风格时应设置为false，因为雕塑风格会生成其专属的PBR贴图。"
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "model": {
+        "name": "model"
+      },
+      "texture_image": {
+        "name": "texture_image",
+        "tooltip": "‘texture_image’和‘texture_prompt’只能二选一。"
+      },
+      "texture_prompt": {
+        "name": "texture_prompt",
+        "tooltip": "提供文本提示以引导材质生成。最多600个字符。不能与'texture_image'同时使用。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "模型文件",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyRigModelNode": {
+    "description": "以标准格式提供带骨骼的角色模型。自动骨骼绑定目前不适用于无贴图网格、非类人资产或肢体结构不清晰的类人资产。",
+    "display_name": "Meshy：骨骼绑定模型",
+    "inputs": {
+      "height_meters": {
+        "name": "height_meters",
+        "tooltip": "角色模型的大致高度（米），有助于缩放和骨骼绑定的准确性。"
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "texture_image": {
+        "name": "texture_image",
+        "tooltip": "模型的UV展开基础色贴图。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "模型文件",
+        "tooltip": null
+      },
+      "1": {
+        "name": "rig_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyTextToModelNode": {
+    "display_name": "Meshy：文本生成模型",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model"
+      },
+      "pose_mode": {
+        "name": "pose_mode",
+        "tooltip": "指定生成模型的姿态模式。"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed用于控制节点是否重新运行；无论seed如何，结果都是非确定性的。"
+      },
+      "should_remesh": {
+        "name": "should_remesh",
+        "tooltip": "设置为false时，返回未处理的三角网格。"
+      },
+      "should_remesh_target_polycount": {
+        "name": "target_polycount"
+      },
+      "should_remesh_topology": {
+        "name": "topology"
+      },
+      "style": {
+        "name": "style"
+      },
+      "symmetry_mode": {
+        "name": "symmetry_mode"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "模型文件",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MeshyTextureNode": {
+    "display_name": "Meshy：纹理模型",
+    "inputs": {
+      "enable_original_uv": {
+        "name": "启用原始UV",
+        "tooltip": "使用模型的原始UV，而不是生成新的UV。启用后，Meshy会保留上传模型中已有的纹理。如果模型没有原始UV，输出质量可能会有所下降。"
+      },
+      "image_style": {
+        "name": "图像风格",
+        "tooltip": "用于引导纹理生成的2D图像。不能与“text_style_prompt”同时使用。"
+      },
+      "meshy_task_id": {
+        "name": "meshy_task_id"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "pbr": {
+        "name": "PBR"
+      },
+      "text_style_prompt": {
+        "name": "文本风格提示",
+        "tooltip": "用文本描述你想要的物体纹理风格。最多600个字符。不能与“image_style”同时使用。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "模型文件",
+        "tooltip": null
+      },
+      "1": {
+        "name": "meshy_task_id",
+        "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "3": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "MinimaxHailuoVideoNode": {
+    "description": "使用新的 MiniMax Hailuo-02 模型从提示词生成视频，可选择起始帧。",
+    "display_name": "MiniMax 海螺视频",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "duration": {
+        "name": "时长",
+        "tooltip": "输出视频的长度（秒）。"
       },
       "first_frame_image": {
         "name": "第一帧图像",
@@ -6613,16 +8527,17 @@
         "name": "提示优化器",
         "tooltip": "需要时优化提示词以提高生成质量。"
       },
-      "duration": {
-        "name": "时长",
-        "tooltip": "输出视频的长度（秒）。"
+      "prompt_text": {
+        "name": "提示文本",
+        "tooltip": "指导视频生成的文本提示。"
       },
       "resolution": {
         "name": "分辨率",
         "tooltip": "视频显示的尺寸。1080p为1920x1080，768p为1366x768。"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "seed": {
+        "name": "种子",
+        "tooltip": "用于创建噪声的随机种子。"
       }
     },
     "outputs": {
@@ -6632,27 +8547,27 @@
     }
   },
   "MinimaxImageToVideoNode": {
-    "display_name": "MiniMax 图像转视频",
     "description": "使用 MiniMax 的 API 根据图像和提示生成视频",
+    "display_name": "MiniMax 图像转视频",
     "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
       "image": {
         "name": "图像",
         "tooltip": "用于视频生成首帧的图像"
       },
-      "prompt_text": {
-        "name": "提示词",
-        "tooltip": "用于引导视频生成的文本提示"
-      },
       "model": {
         "name": "模型",
         "tooltip": "用于视频生成的模型"
       },
+      "prompt_text": {
+        "name": "提示词",
+        "tooltip": "用于引导视频生成的文本提示"
+      },
       "seed": {
         "name": "随机种",
         "tooltip": "用于生成噪声的随机种子。"
-      },
-      "control_after_generate": {
-        "name": "生成后控制"
       }
     },
     "outputs": {
@@ -6662,23 +8577,23 @@
     }
   },
   "MinimaxTextToVideoNode": {
-    "display_name": "MiniMax 文本转视频",
     "description": "使用 MiniMax 的 API 根据提示生成视频",
+    "display_name": "MiniMax 文本转视频",
     "inputs": {
-      "prompt_text": {
-        "name": "提示词",
-        "tooltip": "用于引导视频生成的文本提示"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "model": {
         "name": "模型",
         "tooltip": "用于视频生成的模型"
       },
+      "prompt_text": {
+        "name": "提示词",
+        "tooltip": "用于引导视频生成的文本提示"
+      },
       "seed": {
         "name": "随机种",
         "tooltip": "用于生成噪声的随机种子。"
-      },
-      "control_after_generate": {
-        "name": "生成后控制"
       }
     },
     "outputs": {
@@ -6690,11 +8605,11 @@
   "ModelComputeDtype": {
     "display_name": "模型计算Dtype",
     "inputs": {
-      "model": {
-        "name": "模型"
-      },
       "dtype": {
         "name": "dtype"
+      },
+      "model": {
+        "name": "模型"
       }
     }
   },
@@ -6712,27 +8627,9 @@
   "ModelMergeAuraflow": {
     "display_name": "模型融合（Auraflow ）",
     "inputs": {
-      "model1": {
-        "name": "模型1"
-      },
-      "model2": {
-        "name": "模型2"
-      },
-      "init_x_linear_": {
-        "name": "初始x线性."
-      },
-      "positional_encoding": {
-        "name": "位置编码"
-      },
       "cond_seq_linear_": {
         "name": "条件序列线性."
       },
-      "register_tokens": {
-        "name": "注册令牌"
-      },
-      "t_embedder_": {
-        "name": "t嵌入器."
-      },
       "double_layers_0_": {
         "name": "双层.0."
       },
@@ -6745,36 +8642,30 @@
       "double_layers_3_": {
         "name": "双层.3."
       },
+      "final_linear_": {
+        "name": "最终线性."
+      },
+      "init_x_linear_": {
+        "name": "初始x线性."
+      },
+      "modF_": {
+        "name": "modF."
+      },
+      "model1": {
+        "name": "模型1"
+      },
+      "model2": {
+        "name": "模型2"
+      },
+      "positional_encoding": {
+        "name": "位置编码"
+      },
+      "register_tokens": {
+        "name": "注册令牌"
+      },
       "single_layers_0_": {
         "name": "单层.0."
       },
-      "single_layers_1_": {
-        "name": "单层.1."
-      },
-      "single_layers_2_": {
-        "name": "单层.2."
-      },
-      "single_layers_3_": {
-        "name": "单层.3."
-      },
-      "single_layers_4_": {
-        "name": "单层.4."
-      },
-      "single_layers_5_": {
-        "name": "单层.5."
-      },
-      "single_layers_6_": {
-        "name": "单层.6."
-      },
-      "single_layers_7_": {
-        "name": "单层.7."
-      },
-      "single_layers_8_": {
-        "name": "单层.8."
-      },
-      "single_layers_9_": {
-        "name": "单层.9."
-      },
       "single_layers_10_": {
         "name": "单层.10."
       },
@@ -6805,6 +8696,9 @@
       "single_layers_19_": {
         "name": "单层.19."
       },
+      "single_layers_1_": {
+        "name": "单层.1."
+      },
       "single_layers_20_": {
         "name": "单层.20."
       },
@@ -6835,35 +8729,56 @@
       "single_layers_29_": {
         "name": "单层.29."
       },
+      "single_layers_2_": {
+        "name": "单层.2."
+      },
       "single_layers_30_": {
         "name": "单层.30."
       },
       "single_layers_31_": {
         "name": "单层.31."
       },
-      "modF_": {
-        "name": "modF."
+      "single_layers_3_": {
+        "name": "单层.3."
       },
-      "final_linear_": {
-        "name": "最终线性."
+      "single_layers_4_": {
+        "name": "单层.4."
+      },
+      "single_layers_5_": {
+        "name": "单层.5."
+      },
+      "single_layers_6_": {
+        "name": "单层.6."
+      },
+      "single_layers_7_": {
+        "name": "单层.7."
+      },
+      "single_layers_8_": {
+        "name": "单层.8."
+      },
+      "single_layers_9_": {
+        "name": "单层.9."
+      },
+      "t_embedder_": {
+        "name": "t嵌入器."
       }
     }
   },
   "ModelMergeBlocks": {
     "display_name": "模型融合（分块）",
     "inputs": {
-      "model1": {
-        "name": "模型1"
-      },
-      "model2": {
-        "name": "模型2"
-      },
       "input": {
         "name": "输入"
       },
       "middle": {
         "name": "中间"
       },
+      "model1": {
+        "name": "模型1"
+      },
+      "model2": {
+        "name": "模型2"
+      },
       "out": {
         "name": "输出"
       }
@@ -6872,57 +8787,12 @@
   "ModelMergeCosmos14B": {
     "display_name": "模型融合（Cosmos14B）",
     "inputs": {
-      "model1": {
-        "name": "模型1"
-      },
-      "model2": {
-        "name": "模型2"
-      },
-      "pos_embedder_": {
-        "name": "位置嵌入器."
-      },
-      "extra_pos_embedder_": {
-        "name": "额外位置嵌入器."
-      },
-      "x_embedder_": {
-        "name": "x嵌入器."
-      },
-      "t_embedder_": {
-        "name": "t嵌入器."
-      },
       "affline_norm_": {
         "name": "仿射规范化."
       },
       "blocks_block0_": {
         "name": "blocks.block0."
       },
-      "blocks_block1_": {
-        "name": "blocks.block1."
-      },
-      "blocks_block2_": {
-        "name": "blocks.block2."
-      },
-      "blocks_block3_": {
-        "name": "blocks.block3."
-      },
-      "blocks_block4_": {
-        "name": "blocks.block4."
-      },
-      "blocks_block5_": {
-        "name": "blocks.block5."
-      },
-      "blocks_block6_": {
-        "name": "blocks.block6."
-      },
-      "blocks_block7_": {
-        "name": "blocks.block7."
-      },
-      "blocks_block8_": {
-        "name": "blocks.block8."
-      },
-      "blocks_block9_": {
-        "name": "blocks.block9."
-      },
       "blocks_block10_": {
         "name": "blocks.block10."
       },
@@ -6953,6 +8823,9 @@
       "blocks_block19_": {
         "name": "blocks.block19."
       },
+      "blocks_block1_": {
+        "name": "blocks.block1."
+      },
       "blocks_block20_": {
         "name": "blocks.block20."
       },
@@ -6983,6 +8856,9 @@
       "blocks_block29_": {
         "name": "blocks.block29."
       },
+      "blocks_block2_": {
+        "name": "blocks.block2."
+      },
       "blocks_block30_": {
         "name": "blocks.block30."
       },
@@ -7001,44 +8877,6 @@
       "blocks_block35_": {
         "name": "blocks.block35."
       },
-      "final_layer_": {
-        "name": "最终层."
-      }
-    }
-  },
-  "ModelMergeCosmos7B": {
-    "display_name": "模型融合（COsmos7B）",
-    "inputs": {
-      "model1": {
-        "name": "模型1"
-      },
-      "model2": {
-        "name": "模型2"
-      },
-      "pos_embedder_": {
-        "name": "位置嵌入器."
-      },
-      "extra_pos_embedder_": {
-        "name": "额外位置嵌入器."
-      },
-      "x_embedder_": {
-        "name": "x嵌入器."
-      },
-      "t_embedder_": {
-        "name": "t嵌入器."
-      },
-      "affline_norm_": {
-        "name": "仿射规范化."
-      },
-      "blocks_block0_": {
-        "name": "blocks.block0."
-      },
-      "blocks_block1_": {
-        "name": "blocks.block1."
-      },
-      "blocks_block2_": {
-        "name": "blocks.block2."
-      },
       "blocks_block3_": {
         "name": "blocks.block3."
       },
@@ -7060,6 +8898,38 @@
       "blocks_block9_": {
         "name": "blocks.block9."
       },
+      "extra_pos_embedder_": {
+        "name": "额外位置嵌入器."
+      },
+      "final_layer_": {
+        "name": "最终层."
+      },
+      "model1": {
+        "name": "模型1"
+      },
+      "model2": {
+        "name": "模型2"
+      },
+      "pos_embedder_": {
+        "name": "位置嵌入器."
+      },
+      "t_embedder_": {
+        "name": "t嵌入器."
+      },
+      "x_embedder_": {
+        "name": "x嵌入器."
+      }
+    }
+  },
+  "ModelMergeCosmos7B": {
+    "display_name": "模型融合（COsmos7B）",
+    "inputs": {
+      "affline_norm_": {
+        "name": "仿射规范化."
+      },
+      "blocks_block0_": {
+        "name": "blocks.block0."
+      },
       "blocks_block10_": {
         "name": "blocks.block10."
       },
@@ -7090,6 +8960,9 @@
       "blocks_block19_": {
         "name": "blocks.block19."
       },
+      "blocks_block1_": {
+        "name": "blocks.block1."
+      },
       "blocks_block20_": {
         "name": "blocks.block20."
       },
@@ -7114,14 +8987,36 @@
       "blocks_block27_": {
         "name": "blocks.block27."
       },
+      "blocks_block2_": {
+        "name": "blocks.block2."
+      },
+      "blocks_block3_": {
+        "name": "blocks.block3."
+      },
+      "blocks_block4_": {
+        "name": "blocks.block4."
+      },
+      "blocks_block5_": {
+        "name": "blocks.block5."
+      },
+      "blocks_block6_": {
+        "name": "blocks.block6."
+      },
+      "blocks_block7_": {
+        "name": "blocks.block7."
+      },
+      "blocks_block8_": {
+        "name": "blocks.block8."
+      },
+      "blocks_block9_": {
+        "name": "blocks.block9."
+      },
+      "extra_pos_embedder_": {
+        "name": "额外位置嵌入器."
+      },
       "final_layer_": {
         "name": "最终层."
-      }
-    }
-  },
-  "ModelMergeCosmosPredict2_14B": {
-    "display_name": "模型融合（CosmosPredict2_14B）",
-    "inputs": {
+      },
       "model1": {
         "name": "模型1"
       },
@@ -7129,47 +9024,22 @@
         "name": "模型2"
       },
       "pos_embedder_": {
-        "name": "位置嵌入器。"
-      },
-      "x_embedder_": {
-        "name": "x嵌入器。"
+        "name": "位置嵌入器."
       },
       "t_embedder_": {
-        "name": "t嵌入器。"
-      },
-      "t_embedding_norm_": {
-        "name": "t嵌入归一化。"
+        "name": "t嵌入器."
       },
+      "x_embedder_": {
+        "name": "x嵌入器."
+      }
+    }
+  },
+  "ModelMergeCosmosPredict2_14B": {
+    "display_name": "模型融合（CosmosPredict2_14B）",
+    "inputs": {
       "blocks_0_": {
         "name": "块0。"
       },
-      "blocks_1_": {
-        "name": "块1。"
-      },
-      "blocks_2_": {
-        "name": "块2。"
-      },
-      "blocks_3_": {
-        "name": "块3。"
-      },
-      "blocks_4_": {
-        "name": "块4。"
-      },
-      "blocks_5_": {
-        "name": "块5。"
-      },
-      "blocks_6_": {
-        "name": "块6。"
-      },
-      "blocks_7_": {
-        "name": "块7。"
-      },
-      "blocks_8_": {
-        "name": "块8。"
-      },
-      "blocks_9_": {
-        "name": "块9。"
-      },
       "blocks_10_": {
         "name": "块10。"
       },
@@ -7200,6 +9070,9 @@
       "blocks_19_": {
         "name": "块19。"
       },
+      "blocks_1_": {
+        "name": "块1。"
+      },
       "blocks_20_": {
         "name": "块20。"
       },
@@ -7230,6 +9103,9 @@
       "blocks_29_": {
         "name": "块29。"
       },
+      "blocks_2_": {
+        "name": "块2。"
+      },
       "blocks_30_": {
         "name": "块30。"
       },
@@ -7248,14 +9124,30 @@
       "blocks_35_": {
         "name": "块35。"
       },
+      "blocks_3_": {
+        "name": "块3。"
+      },
+      "blocks_4_": {
+        "name": "块4。"
+      },
+      "blocks_5_": {
+        "name": "块5。"
+      },
+      "blocks_6_": {
+        "name": "块6。"
+      },
+      "blocks_7_": {
+        "name": "块7。"
+      },
+      "blocks_8_": {
+        "name": "块8。"
+      },
+      "blocks_9_": {
+        "name": "块9。"
+      },
       "final_layer_": {
         "name": "最终层。"
-      }
-    }
-  },
-  "ModelMergeCosmosPredict2_2B": {
-    "display_name": "模型融合（CosmosPredict2_2B）",
-    "inputs": {
+      },
       "model1": {
         "name": "模型1"
       },
@@ -7265,45 +9157,23 @@
       "pos_embedder_": {
         "name": "位置嵌入器。"
       },
-      "x_embedder_": {
-        "name": "x_嵌入器。"
-      },
       "t_embedder_": {
-        "name": "t_嵌入器。"
+        "name": "t嵌入器。"
       },
       "t_embedding_norm_": {
-        "name": "t_嵌入归一化。"
+        "name": "t嵌入归一化。"
       },
+      "x_embedder_": {
+        "name": "x嵌入器。"
+      }
+    }
+  },
+  "ModelMergeCosmosPredict2_2B": {
+    "display_name": "模型融合（CosmosPredict2_2B）",
+    "inputs": {
       "blocks_0_": {
         "name": "块.0."
       },
-      "blocks_1_": {
-        "name": "块.1."
-      },
-      "blocks_2_": {
-        "name": "块.2."
-      },
-      "blocks_3_": {
-        "name": "块.3."
-      },
-      "blocks_4_": {
-        "name": "块.4."
-      },
-      "blocks_5_": {
-        "name": "块.5."
-      },
-      "blocks_6_": {
-        "name": "块.6."
-      },
-      "blocks_7_": {
-        "name": "块.7."
-      },
-      "blocks_8_": {
-        "name": "块.8."
-      },
-      "blocks_9_": {
-        "name": "块.9."
-      },
       "blocks_10_": {
         "name": "块.10."
       },
@@ -7334,6 +9204,9 @@
       "blocks_19_": {
         "name": "块.19."
       },
+      "blocks_1_": {
+        "name": "块.1."
+      },
       "blocks_20_": {
         "name": "块.20."
       },
@@ -7358,65 +9231,59 @@
       "blocks_27_": {
         "name": "块.27."
       },
+      "blocks_2_": {
+        "name": "块.2."
+      },
+      "blocks_3_": {
+        "name": "块.3."
+      },
+      "blocks_4_": {
+        "name": "块.4."
+      },
+      "blocks_5_": {
+        "name": "块.5."
+      },
+      "blocks_6_": {
+        "name": "块.6."
+      },
+      "blocks_7_": {
+        "name": "块.7."
+      },
+      "blocks_8_": {
+        "name": "块.8."
+      },
+      "blocks_9_": {
+        "name": "块.9."
+      },
       "final_layer_": {
         "name": "最终层。"
-      }
-    }
-  },
-  "ModelMergeFlux1": {
-    "display_name": "模型融合（Flux1）",
-    "inputs": {
+      },
       "model1": {
         "name": "模型1"
       },
       "model2": {
         "name": "模型2"
       },
-      "img_in_": {
-        "name": "输入图像."
+      "pos_embedder_": {
+        "name": "位置嵌入器。"
       },
-      "time_in_": {
-        "name": "输入时间."
+      "t_embedder_": {
+        "name": "t_嵌入器。"
       },
-      "guidance_in": {
-        "name": "输入引导"
-      },
-      "vector_in_": {
-        "name": "输入向量."
-      },
-      "txt_in_": {
-        "name": "输入文本."
+      "t_embedding_norm_": {
+        "name": "t_嵌入归一化。"
       },
+      "x_embedder_": {
+        "name": "x_嵌入器。"
+      }
+    }
+  },
+  "ModelMergeFlux1": {
+    "display_name": "模型融合（Flux1）",
+    "inputs": {
       "double_blocks_0_": {
         "name": "双块.0."
       },
-      "double_blocks_1_": {
-        "name": "双块.1."
-      },
-      "double_blocks_2_": {
-        "name": "双块.2."
-      },
-      "double_blocks_3_": {
-        "name": "双块.3."
-      },
-      "double_blocks_4_": {
-        "name": "双块.4."
-      },
-      "double_blocks_5_": {
-        "name": "双块.5."
-      },
-      "double_blocks_6_": {
-        "name": "双块.6."
-      },
-      "double_blocks_7_": {
-        "name": "双块.7."
-      },
-      "double_blocks_8_": {
-        "name": "双块.8."
-      },
-      "double_blocks_9_": {
-        "name": "双块.9."
-      },
       "double_blocks_10_": {
         "name": "双块.10."
       },
@@ -7444,36 +9311,51 @@
       "double_blocks_18_": {
         "name": "双块.18."
       },
+      "double_blocks_1_": {
+        "name": "双块.1."
+      },
+      "double_blocks_2_": {
+        "name": "双块.2."
+      },
+      "double_blocks_3_": {
+        "name": "双块.3."
+      },
+      "double_blocks_4_": {
+        "name": "双块.4."
+      },
+      "double_blocks_5_": {
+        "name": "双块.5."
+      },
+      "double_blocks_6_": {
+        "name": "双块.6."
+      },
+      "double_blocks_7_": {
+        "name": "双块.7."
+      },
+      "double_blocks_8_": {
+        "name": "双块.8."
+      },
+      "double_blocks_9_": {
+        "name": "双块.9."
+      },
+      "final_layer_": {
+        "name": "最终层."
+      },
+      "guidance_in": {
+        "name": "输入引导"
+      },
+      "img_in_": {
+        "name": "输入图像."
+      },
+      "model1": {
+        "name": "模型1"
+      },
+      "model2": {
+        "name": "模型2"
+      },
       "single_blocks_0_": {
         "name": "单块.0."
       },
-      "single_blocks_1_": {
-        "name": "单块.1."
-      },
-      "single_blocks_2_": {
-        "name": "单块.2."
-      },
-      "single_blocks_3_": {
-        "name": "单块.3."
-      },
-      "single_blocks_4_": {
-        "name": "单块.4."
-      },
-      "single_blocks_5_": {
-        "name": "单块.5."
-      },
-      "single_blocks_6_": {
-        "name": "单块.6."
-      },
-      "single_blocks_7_": {
-        "name": "单块.7."
-      },
-      "single_blocks_8_": {
-        "name": "单块.8."
-      },
-      "single_blocks_9_": {
-        "name": "单块.9."
-      },
       "single_blocks_10_": {
         "name": "单块.10."
       },
@@ -7504,6 +9386,9 @@
       "single_blocks_19_": {
         "name": "单块.19."
       },
+      "single_blocks_1_": {
+        "name": "单块.1."
+      },
       "single_blocks_20_": {
         "name": "单块.20."
       },
@@ -7534,6 +9419,9 @@
       "single_blocks_29_": {
         "name": "单块.29."
       },
+      "single_blocks_2_": {
+        "name": "单块.2."
+      },
       "single_blocks_30_": {
         "name": "单块.30."
       },
@@ -7558,14 +9446,47 @@
       "single_blocks_37_": {
         "name": "单块.37."
       },
-      "final_layer_": {
-        "name": "最终层."
+      "single_blocks_3_": {
+        "name": "单块.3."
+      },
+      "single_blocks_4_": {
+        "name": "单块.4."
+      },
+      "single_blocks_5_": {
+        "name": "单块.5."
+      },
+      "single_blocks_6_": {
+        "name": "单块.6."
+      },
+      "single_blocks_7_": {
+        "name": "单块.7."
+      },
+      "single_blocks_8_": {
+        "name": "单块.8."
+      },
+      "single_blocks_9_": {
+        "name": "单块.9."
+      },
+      "time_in_": {
+        "name": "输入时间."
+      },
+      "txt_in_": {
+        "name": "输入文本."
+      },
+      "vector_in_": {
+        "name": "输入向量."
       }
     }
   },
   "ModelMergeLTXV": {
     "display_name": "模型融合（LTXV）",
     "inputs": {
+      "adaln_single_": {
+        "name": "adaln_single."
+      },
+      "caption_projection_": {
+        "name": "caption_projection."
+      },
       "model1": {
         "name": "模型1"
       },
@@ -7575,42 +9496,15 @@
       "patchify_proj_": {
         "name": "patchify_proj."
       },
-      "adaln_single_": {
-        "name": "adaln_single."
+      "proj_out_": {
+        "name": "proj_out."
       },
-      "caption_projection_": {
-        "name": "caption_projection."
+      "scale_shift_table": {
+        "name": "scale_shift_table"
       },
       "transformer_blocks_0_": {
         "name": "transformer_blocks.0."
       },
-      "transformer_blocks_1_": {
-        "name": "transformer_blocks.1."
-      },
-      "transformer_blocks_2_": {
-        "name": "transformer_blocks.2."
-      },
-      "transformer_blocks_3_": {
-        "name": "transformer_blocks.3."
-      },
-      "transformer_blocks_4_": {
-        "name": "transformer_blocks.4."
-      },
-      "transformer_blocks_5_": {
-        "name": "transformer_blocks.5."
-      },
-      "transformer_blocks_6_": {
-        "name": "transformer_blocks.6."
-      },
-      "transformer_blocks_7_": {
-        "name": "transformer_blocks.7."
-      },
-      "transformer_blocks_8_": {
-        "name": "transformer_blocks.8."
-      },
-      "transformer_blocks_9_": {
-        "name": "transformer_blocks.9."
-      },
       "transformer_blocks_10_": {
         "name": "transformer_blocks.10."
       },
@@ -7641,6 +9535,9 @@
       "transformer_blocks_19_": {
         "name": "transformer_blocks.19."
       },
+      "transformer_blocks_1_": {
+        "name": "transformer_blocks.1."
+      },
       "transformer_blocks_20_": {
         "name": "transformer_blocks.20."
       },
@@ -7665,65 +9562,38 @@
       "transformer_blocks_27_": {
         "name": "transformer_blocks.27."
       },
-      "scale_shift_table": {
-        "name": "scale_shift_table"
+      "transformer_blocks_2_": {
+        "name": "transformer_blocks.2."
       },
-      "proj_out_": {
-        "name": "proj_out."
+      "transformer_blocks_3_": {
+        "name": "transformer_blocks.3."
+      },
+      "transformer_blocks_4_": {
+        "name": "transformer_blocks.4."
+      },
+      "transformer_blocks_5_": {
+        "name": "transformer_blocks.5."
+      },
+      "transformer_blocks_6_": {
+        "name": "transformer_blocks.6."
+      },
+      "transformer_blocks_7_": {
+        "name": "transformer_blocks.7."
+      },
+      "transformer_blocks_8_": {
+        "name": "transformer_blocks.8."
+      },
+      "transformer_blocks_9_": {
+        "name": "transformer_blocks.9."
       }
     }
   },
   "ModelMergeMochiPreview": {
     "display_name": "模型融合（Mochi预览）",
     "inputs": {
-      "model1": {
-        "name": "模型1"
-      },
-      "model2": {
-        "name": "模型2"
-      },
-      "pos_frequencies_": {
-        "name": "pos_frequencies."
-      },
-      "t_embedder_": {
-        "name": "t_embedder."
-      },
-      "t5_y_embedder_": {
-        "name": "t5_y_embedder."
-      },
-      "t5_yproj_": {
-        "name": "t5_yproj."
-      },
       "blocks_0_": {
         "name": "blocks.0."
       },
-      "blocks_1_": {
-        "name": "blocks.1."
-      },
-      "blocks_2_": {
-        "name": "blocks.2."
-      },
-      "blocks_3_": {
-        "name": "blocks.3."
-      },
-      "blocks_4_": {
-        "name": "blocks.4."
-      },
-      "blocks_5_": {
-        "name": "blocks.5."
-      },
-      "blocks_6_": {
-        "name": "blocks.6."
-      },
-      "blocks_7_": {
-        "name": "blocks.7."
-      },
-      "blocks_8_": {
-        "name": "blocks.8."
-      },
-      "blocks_9_": {
-        "name": "blocks.9."
-      },
       "blocks_10_": {
         "name": "blocks.10."
       },
@@ -7754,6 +9624,9 @@
       "blocks_19_": {
         "name": "blocks.19."
       },
+      "blocks_1_": {
+        "name": "blocks.1."
+      },
       "blocks_20_": {
         "name": "blocks.20."
       },
@@ -7784,6 +9657,9 @@
       "blocks_29_": {
         "name": "blocks.29."
       },
+      "blocks_2_": {
+        "name": "blocks.2."
+      },
       "blocks_30_": {
         "name": "blocks.30."
       },
@@ -7814,6 +9690,9 @@
       "blocks_39_": {
         "name": "blocks.39."
       },
+      "blocks_3_": {
+        "name": "blocks.3."
+      },
       "blocks_40_": {
         "name": "blocks.40."
       },
@@ -7838,14 +9717,53 @@
       "blocks_47_": {
         "name": "blocks.47."
       },
+      "blocks_4_": {
+        "name": "blocks.4."
+      },
+      "blocks_5_": {
+        "name": "blocks.5."
+      },
+      "blocks_6_": {
+        "name": "blocks.6."
+      },
+      "blocks_7_": {
+        "name": "blocks.7."
+      },
+      "blocks_8_": {
+        "name": "blocks.8."
+      },
+      "blocks_9_": {
+        "name": "blocks.9."
+      },
       "final_layer_": {
         "name": "final_layer."
+      },
+      "model1": {
+        "name": "模型1"
+      },
+      "model2": {
+        "name": "模型2"
+      },
+      "pos_frequencies_": {
+        "name": "pos_frequencies."
+      },
+      "t5_y_embedder_": {
+        "name": "t5_y_embedder."
+      },
+      "t5_yproj_": {
+        "name": "t5_yproj."
+      },
+      "t_embedder_": {
+        "name": "t_embedder."
       }
     }
   },
   "ModelMergeQwenImage": {
     "display_name": "模型融合Qwen图像",
     "inputs": {
+      "img_in_": {
+        "name": "图像输入。"
+      },
       "model1": {
         "name": "模型1"
       },
@@ -7855,14 +9773,8 @@
       "pos_embeds_": {
         "name": "位置嵌入。"
       },
-      "img_in_": {
-        "name": "图像输入。"
-      },
-      "txt_norm_": {
-        "name": "文本归一化。"
-      },
-      "txt_in_": {
-        "name": "文本输入。"
+      "proj_out_": {
+        "name": "proj_out."
       },
       "time_text_embed_": {
         "name": "时间文本嵌入。"
@@ -7870,33 +9782,6 @@
       "transformer_blocks_0_": {
         "name": "变换器块.0."
       },
-      "transformer_blocks_1_": {
-        "name": "变换器块.1."
-      },
-      "transformer_blocks_2_": {
-        "name": "变换器块.2."
-      },
-      "transformer_blocks_3_": {
-        "name": "变换器块.3."
-      },
-      "transformer_blocks_4_": {
-        "name": "变换器块.4."
-      },
-      "transformer_blocks_5_": {
-        "name": "变换器块.5."
-      },
-      "transformer_blocks_6_": {
-        "name": "变换器块.6."
-      },
-      "transformer_blocks_7_": {
-        "name": "变换器块.7."
-      },
-      "transformer_blocks_8_": {
-        "name": "变换器块.8."
-      },
-      "transformer_blocks_9_": {
-        "name": "变换器块.9."
-      },
       "transformer_blocks_10_": {
         "name": "transformer_blocks.10."
       },
@@ -7927,6 +9812,9 @@
       "transformer_blocks_19_": {
         "name": "transformer_blocks.19."
       },
+      "transformer_blocks_1_": {
+        "name": "变换器块.1."
+      },
       "transformer_blocks_20_": {
         "name": "transformer_blocks.20."
       },
@@ -7957,6 +9845,9 @@
       "transformer_blocks_29_": {
         "name": "transformer_blocks.29."
       },
+      "transformer_blocks_2_": {
+        "name": "变换器块.2."
+      },
       "transformer_blocks_30_": {
         "name": "transformer_blocks.30."
       },
@@ -7987,6 +9878,9 @@
       "transformer_blocks_39_": {
         "name": "transformer_blocks.39."
       },
+      "transformer_blocks_3_": {
+        "name": "变换器块.3."
+      },
       "transformer_blocks_40_": {
         "name": "transformer_blocks.40."
       },
@@ -8017,6 +9911,9 @@
       "transformer_blocks_49_": {
         "name": "transformer_blocks.49."
       },
+      "transformer_blocks_4_": {
+        "name": "变换器块.4."
+      },
       "transformer_blocks_50_": {
         "name": "transformer_blocks.50."
       },
@@ -8047,29 +9944,41 @@
       "transformer_blocks_59_": {
         "name": "transformer_blocks.59."
       },
-      "proj_out_": {
-        "name": "proj_out."
+      "transformer_blocks_5_": {
+        "name": "变换器块.5."
+      },
+      "transformer_blocks_6_": {
+        "name": "变换器块.6."
+      },
+      "transformer_blocks_7_": {
+        "name": "变换器块.7."
+      },
+      "transformer_blocks_8_": {
+        "name": "变换器块.8."
+      },
+      "transformer_blocks_9_": {
+        "name": "变换器块.9."
+      },
+      "txt_in_": {
+        "name": "文本输入。"
+      },
+      "txt_norm_": {
+        "name": "文本归一化。"
       }
     }
   },
   "ModelMergeSD1": {
     "display_name": "模型融合（SD1）",
     "inputs": {
-      "model1": {
-        "name": "模型1"
-      },
-      "model2": {
-        "name": "模型2"
-      },
-      "time_embed_": {
-        "name": "时间嵌入."
-      },
-      "label_emb_": {
-        "name": "标签嵌入."
-      },
       "input_blocks_0_": {
         "name": "输入块.0."
       },
+      "input_blocks_10_": {
+        "name": "输入块.10."
+      },
+      "input_blocks_11_": {
+        "name": "输入块.11."
+      },
       "input_blocks_1_": {
         "name": "输入块.1."
       },
@@ -8097,11 +10006,8 @@
       "input_blocks_9_": {
         "name": "输入块.9."
       },
-      "input_blocks_10_": {
-        "name": "输入块.10."
-      },
-      "input_blocks_11_": {
-        "name": "输入块.11."
+      "label_emb_": {
+        "name": "标签嵌入."
       },
       "middle_block_0_": {
         "name": "中间块.0."
@@ -8112,9 +10018,24 @@
       "middle_block_2_": {
         "name": "中间块.2."
       },
+      "model1": {
+        "name": "模型1"
+      },
+      "model2": {
+        "name": "模型2"
+      },
+      "out_": {
+        "name": "出."
+      },
       "output_blocks_0_": {
         "name": "输出块.0."
       },
+      "output_blocks_10_": {
+        "name": "输出块.10."
+      },
+      "output_blocks_11_": {
+        "name": "输出块.11."
+      },
       "output_blocks_1_": {
         "name": "输出块.1."
       },
@@ -8142,35 +10063,23 @@
       "output_blocks_9_": {
         "name": "输出块.9."
       },
-      "output_blocks_10_": {
-        "name": "输出块.10."
-      },
-      "output_blocks_11_": {
-        "name": "输出块.11."
-      },
-      "out_": {
-        "name": "出."
+      "time_embed_": {
+        "name": "时间嵌入."
       }
     }
   },
   "ModelMergeSD2": {
     "display_name": "模型融合（SD2）",
     "inputs": {
-      "model1": {
-        "name": "模型1"
-      },
-      "model2": {
-        "name": "模型2"
-      },
-      "time_embed_": {
-        "name": "时间嵌入."
-      },
-      "label_emb_": {
-        "name": "标签嵌入."
-      },
       "input_blocks_0_": {
         "name": "输入块.0."
       },
+      "input_blocks_10_": {
+        "name": "输入块.10."
+      },
+      "input_blocks_11_": {
+        "name": "输入块.11."
+      },
       "input_blocks_1_": {
         "name": "输入块.1."
       },
@@ -8198,11 +10107,8 @@
       "input_blocks_9_": {
         "name": "输入块.9."
       },
-      "input_blocks_10_": {
-        "name": "输入块.10."
-      },
-      "input_blocks_11_": {
-        "name": "输入块.11."
+      "label_emb_": {
+        "name": "标签嵌入."
       },
       "middle_block_0_": {
         "name": "中间块.0."
@@ -8213,9 +10119,24 @@
       "middle_block_2_": {
         "name": "中间块.2."
       },
+      "model1": {
+        "name": "模型1"
+      },
+      "model2": {
+        "name": "模型2"
+      },
+      "out_": {
+        "name": "出."
+      },
       "output_blocks_0_": {
         "name": "输出块.0."
       },
+      "output_blocks_10_": {
+        "name": "输出块.10."
+      },
+      "output_blocks_11_": {
+        "name": "输出块.11."
+      },
       "output_blocks_1_": {
         "name": "输出块.1."
       },
@@ -8243,172 +10164,23 @@
       "output_blocks_9_": {
         "name": "输出块.9."
       },
-      "output_blocks_10_": {
-        "name": "输出块.10."
-      },
-      "output_blocks_11_": {
-        "name": "输出块.11."
-      },
-      "out_": {
-        "name": "出."
-      }
-    }
-  },
-  "ModelMergeSD3_2B": {
-    "display_name": "模型融合（SD3_2B）",
-    "inputs": {
-      "model1": {
-        "name": "模型1"
-      },
-      "model2": {
-        "name": "模型2"
-      },
-      "pos_embed_": {
-        "name": "位置嵌入."
-      },
-      "x_embedder_": {
-        "name": "x嵌入器."
-      },
-      "context_embedder_": {
-        "name": "上下文嵌入器."
-      },
-      "y_embedder_": {
-        "name": "y嵌入器."
-      },
-      "t_embedder_": {
-        "name": "t嵌入器."
-      },
-      "joint_blocks_0_": {
-        "name": "联合块.0."
-      },
-      "joint_blocks_1_": {
-        "name": "联合块.1."
-      },
-      "joint_blocks_2_": {
-        "name": "联合块.2."
-      },
-      "joint_blocks_3_": {
-        "name": "联合块.3."
-      },
-      "joint_blocks_4_": {
-        "name": "联合块.4."
-      },
-      "joint_blocks_5_": {
-        "name": "联合块.5."
-      },
-      "joint_blocks_6_": {
-        "name": "联合块.6."
-      },
-      "joint_blocks_7_": {
-        "name": "联合块.7."
-      },
-      "joint_blocks_8_": {
-        "name": "联合块.8."
-      },
-      "joint_blocks_9_": {
-        "name": "联合块.9."
-      },
-      "joint_blocks_10_": {
-        "name": "联合块.10."
-      },
-      "joint_blocks_11_": {
-        "name": "联合块.11."
-      },
-      "joint_blocks_12_": {
-        "name": "联合块.12."
-      },
-      "joint_blocks_13_": {
-        "name": "联合块.13."
-      },
-      "joint_blocks_14_": {
-        "name": "联合块.14."
-      },
-      "joint_blocks_15_": {
-        "name": "联合块.15."
-      },
-      "joint_blocks_16_": {
-        "name": "联合块.16."
-      },
-      "joint_blocks_17_": {
-        "name": "联合块.17."
-      },
-      "joint_blocks_18_": {
-        "name": "联合块.18."
-      },
-      "joint_blocks_19_": {
-        "name": "联合块.19."
-      },
-      "joint_blocks_20_": {
-        "name": "联合块.20."
-      },
-      "joint_blocks_21_": {
-        "name": "联合块.21."
-      },
-      "joint_blocks_22_": {
-        "name": "联合块.22."
-      },
-      "joint_blocks_23_": {
-        "name": "联合块.23."
-      },
-      "final_layer_": {
-        "name": "最终层."
+      "time_embed_": {
+        "name": "时间嵌入."
       }
     }
   },
   "ModelMergeSD35_Large": {
     "display_name": "模型融合（SD35_大）",
     "inputs": {
-      "model1": {
-        "name": "模型1"
-      },
-      "model2": {
-        "name": "模型2"
-      },
-      "pos_embed_": {
-        "name": "位置嵌入."
-      },
-      "x_embedder_": {
-        "name": "x嵌入器."
-      },
       "context_embedder_": {
         "name": "上下文嵌入器."
       },
-      "y_embedder_": {
-        "name": "y嵌入器."
-      },
-      "t_embedder_": {
-        "name": "t嵌入器."
+      "final_layer_": {
+        "name": "最终层."
       },
       "joint_blocks_0_": {
         "name": "联合块.0."
       },
-      "joint_blocks_1_": {
-        "name": "联合块.1."
-      },
-      "joint_blocks_2_": {
-        "name": "联合块.2."
-      },
-      "joint_blocks_3_": {
-        "name": "联合块.3."
-      },
-      "joint_blocks_4_": {
-        "name": "联合块.4."
-      },
-      "joint_blocks_5_": {
-        "name": "联合块.5."
-      },
-      "joint_blocks_6_": {
-        "name": "联合块.6."
-      },
-      "joint_blocks_7_": {
-        "name": "联合块.7."
-      },
-      "joint_blocks_8_": {
-        "name": "联合块.8."
-      },
-      "joint_blocks_9_": {
-        "name": "联合块.9."
-      },
       "joint_blocks_10_": {
         "name": "联合块.10."
       },
@@ -8439,6 +10211,9 @@
       "joint_blocks_19_": {
         "name": "联合块.19."
       },
+      "joint_blocks_1_": {
+        "name": "联合块.1."
+      },
       "joint_blocks_20_": {
         "name": "联合块.20."
       },
@@ -8469,6 +10244,9 @@
       "joint_blocks_29_": {
         "name": "联合块.29."
       },
+      "joint_blocks_2_": {
+        "name": "联合块.2."
+      },
       "joint_blocks_30_": {
         "name": "联合块.30."
       },
@@ -8493,26 +10271,151 @@
       "joint_blocks_37_": {
         "name": "联合块.37."
       },
-      "final_layer_": {
-        "name": "最终层."
-      }
-    }
-  },
-  "ModelMergeSDXL": {
-    "display_name": "模型融合（SDXL）",
-    "inputs": {
+      "joint_blocks_3_": {
+        "name": "联合块.3."
+      },
+      "joint_blocks_4_": {
+        "name": "联合块.4."
+      },
+      "joint_blocks_5_": {
+        "name": "联合块.5."
+      },
+      "joint_blocks_6_": {
+        "name": "联合块.6."
+      },
+      "joint_blocks_7_": {
+        "name": "联合块.7."
+      },
+      "joint_blocks_8_": {
+        "name": "联合块.8."
+      },
+      "joint_blocks_9_": {
+        "name": "联合块.9."
+      },
       "model1": {
         "name": "模型1"
       },
       "model2": {
         "name": "模型2"
       },
-      "time_embed_": {
-        "name": "时间嵌入."
+      "pos_embed_": {
+        "name": "位置嵌入."
       },
-      "label_emb_": {
-        "name": "标签嵌入."
+      "t_embedder_": {
+        "name": "t嵌入器."
       },
+      "x_embedder_": {
+        "name": "x嵌入器."
+      },
+      "y_embedder_": {
+        "name": "y嵌入器."
+      }
+    }
+  },
+  "ModelMergeSD3_2B": {
+    "display_name": "模型融合（SD3_2B）",
+    "inputs": {
+      "context_embedder_": {
+        "name": "上下文嵌入器."
+      },
+      "final_layer_": {
+        "name": "最终层."
+      },
+      "joint_blocks_0_": {
+        "name": "联合块.0."
+      },
+      "joint_blocks_10_": {
+        "name": "联合块.10."
+      },
+      "joint_blocks_11_": {
+        "name": "联合块.11."
+      },
+      "joint_blocks_12_": {
+        "name": "联合块.12."
+      },
+      "joint_blocks_13_": {
+        "name": "联合块.13."
+      },
+      "joint_blocks_14_": {
+        "name": "联合块.14."
+      },
+      "joint_blocks_15_": {
+        "name": "联合块.15."
+      },
+      "joint_blocks_16_": {
+        "name": "联合块.16."
+      },
+      "joint_blocks_17_": {
+        "name": "联合块.17."
+      },
+      "joint_blocks_18_": {
+        "name": "联合块.18."
+      },
+      "joint_blocks_19_": {
+        "name": "联合块.19."
+      },
+      "joint_blocks_1_": {
+        "name": "联合块.1."
+      },
+      "joint_blocks_20_": {
+        "name": "联合块.20."
+      },
+      "joint_blocks_21_": {
+        "name": "联合块.21."
+      },
+      "joint_blocks_22_": {
+        "name": "联合块.22."
+      },
+      "joint_blocks_23_": {
+        "name": "联合块.23."
+      },
+      "joint_blocks_2_": {
+        "name": "联合块.2."
+      },
+      "joint_blocks_3_": {
+        "name": "联合块.3."
+      },
+      "joint_blocks_4_": {
+        "name": "联合块.4."
+      },
+      "joint_blocks_5_": {
+        "name": "联合块.5."
+      },
+      "joint_blocks_6_": {
+        "name": "联合块.6."
+      },
+      "joint_blocks_7_": {
+        "name": "联合块.7."
+      },
+      "joint_blocks_8_": {
+        "name": "联合块.8."
+      },
+      "joint_blocks_9_": {
+        "name": "联合块.9."
+      },
+      "model1": {
+        "name": "模型1"
+      },
+      "model2": {
+        "name": "模型2"
+      },
+      "pos_embed_": {
+        "name": "位置嵌入."
+      },
+      "t_embedder_": {
+        "name": "t嵌入器."
+      },
+      "x_embedder_": {
+        "name": "x嵌入器."
+      },
+      "y_embedder_": {
+        "name": "y嵌入器."
+      }
+    }
+  },
+  "ModelMergeSDXL": {
+    "display_name": "模型融合（SDXL）",
+    "inputs": {
       "input_blocks_0": {
         "name": "输入块.0"
       },
@@ -8540,6 +10443,9 @@
       "input_blocks_8": {
         "name": "输入块.8"
       },
+      "label_emb_": {
+        "name": "标签嵌入."
+      },
       "middle_block_0": {
         "name": "中间块.0"
       },
@@ -8549,6 +10455,15 @@
       "middle_block_2": {
         "name": "中间块.2"
       },
+      "model1": {
+        "name": "模型1"
+      },
+      "model2": {
+        "name": "模型2"
+      },
+      "out_": {
+        "name": "输出."
+      },
       "output_blocks_0": {
         "name": "输出块.0"
       },
@@ -8576,8 +10491,8 @@
       "output_blocks_8": {
         "name": "输出块.8"
       },
-      "out_": {
-        "name": "输出."
+      "time_embed_": {
+        "name": "时间嵌入."
       }
     }
   },
@@ -8610,60 +10525,12 @@
     }
   },
   "ModelMergeWAN2_1": {
-    "display_name": "模型融合（WAN2.1）",
     "description": "1.3B模型有30个模块，14B模型有40个模块。图像转视频模型有额外的img_emb。",
+    "display_name": "模型融合（WAN2.1）",
     "inputs": {
-      "model1": {
-        "name": "模型1"
-      },
-      "model2": {
-        "name": "模型2"
-      },
-      "patch_embedding_": {
-        "name": "patch_embedding."
-      },
-      "time_embedding_": {
-        "name": "time_embedding."
-      },
-      "time_projection_": {
-        "name": "time_projection."
-      },
-      "text_embedding_": {
-        "name": "text_embedding."
-      },
-      "img_emb_": {
-        "name": "img_emb."
-      },
       "blocks_0_": {
         "name": "blocks.0."
       },
-      "blocks_1_": {
-        "name": "blocks.1."
-      },
-      "blocks_2_": {
-        "name": "blocks.2."
-      },
-      "blocks_3_": {
-        "name": "blocks.3."
-      },
-      "blocks_4_": {
-        "name": "blocks.4."
-      },
-      "blocks_5_": {
-        "name": "blocks.5."
-      },
-      "blocks_6_": {
-        "name": "blocks.6."
-      },
-      "blocks_7_": {
-        "name": "blocks.7."
-      },
-      "blocks_8_": {
-        "name": "blocks.8."
-      },
-      "blocks_9_": {
-        "name": "blocks.9."
-      },
       "blocks_10_": {
         "name": "blocks.10."
       },
@@ -8694,6 +10561,9 @@
       "blocks_19_": {
         "name": "blocks.19."
       },
+      "blocks_1_": {
+        "name": "blocks.1."
+      },
       "blocks_20_": {
         "name": "blocks.20."
       },
@@ -8724,6 +10594,9 @@
       "blocks_29_": {
         "name": "blocks.29."
       },
+      "blocks_2_": {
+        "name": "blocks.2."
+      },
       "blocks_30_": {
         "name": "blocks.30."
       },
@@ -8754,8 +10627,50 @@
       "blocks_39_": {
         "name": "blocks.39."
       },
+      "blocks_3_": {
+        "name": "blocks.3."
+      },
+      "blocks_4_": {
+        "name": "blocks.4."
+      },
+      "blocks_5_": {
+        "name": "blocks.5."
+      },
+      "blocks_6_": {
+        "name": "blocks.6."
+      },
+      "blocks_7_": {
+        "name": "blocks.7."
+      },
+      "blocks_8_": {
+        "name": "blocks.8."
+      },
+      "blocks_9_": {
+        "name": "blocks.9."
+      },
       "head_": {
         "name": "head."
+      },
+      "img_emb_": {
+        "name": "img_emb."
+      },
+      "model1": {
+        "name": "模型1"
+      },
+      "model2": {
+        "name": "模型2"
+      },
+      "patch_embedding_": {
+        "name": "patch_embedding."
+      },
+      "text_embedding_": {
+        "name": "text_embedding."
+      },
+      "time_embedding_": {
+        "name": "time_embedding."
+      },
+      "time_projection_": {
+        "name": "time_projection."
       }
     }
   },
@@ -8829,37 +10744,37 @@
   "ModelSamplingFlux": {
     "display_name": "采样算法（Flux）",
     "inputs": {
-      "model": {
-        "name": "模型"
+      "base_shift": {
+        "name": "基础移位"
+      },
+      "height": {
+        "name": "高度"
       },
       "max_shift": {
         "name": "最大移位"
       },
-      "base_shift": {
-        "name": "基础移位"
+      "model": {
+        "name": "模型"
       },
       "width": {
         "name": "宽度"
-      },
-      "height": {
-        "name": "高度"
       }
     }
   },
   "ModelSamplingLTXV": {
     "display_name": "采样算法（LTXV）",
     "inputs": {
-      "model": {
-        "name": "模型"
-      },
-      "max_shift": {
-        "name": "最大移位"
-      },
       "base_shift": {
         "name": "基础移位"
       },
       "latent": {
         "name": "Latent"
+      },
+      "max_shift": {
+        "name": "最大移位"
+      },
+      "model": {
+        "name": "模型"
       }
     },
     "outputs": {
@@ -8893,37 +10808,40 @@
   "ModelSave": {
     "display_name": "保存模型",
     "inputs": {
-      "model": {
-        "name": "模型"
-      },
       "filename_prefix": {
         "name": "文件名前缀"
+      },
+      "model": {
+        "name": "模型"
       }
     }
   },
   "MoonvalleyImg2VideoNode": {
-    "display_name": "Moonvalley Marey 图像转视频",
     "description": "Moonvalley Marey 图像转视频节点",
+    "display_name": "Moonvalley Marey 图像转视频",
     "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
       "image": {
         "name": "图像",
         "tooltip": "用于生成视频的参考图像"
       },
-      "prompt": {
-        "name": "提示词"
-      },
       "negative_prompt": {
         "name": "负面提示词",
         "tooltip": "负面提示词文本"
       },
-      "resolution": {
-        "name": "分辨率",
-        "tooltip": "输出视频的分辨率"
+      "prompt": {
+        "name": "提示词"
       },
       "prompt_adherence": {
         "name": "提示词遵循度",
         "tooltip": "用于生成控制的引导尺度"
       },
+      "resolution": {
+        "name": "分辨率",
+        "tooltip": "输出视频的分辨率"
+      },
       "seed": {
         "name": "种子",
         "tooltip": "随机种子值"
@@ -8931,9 +10849,6 @@
       "steps": {
         "name": "步数",
         "tooltip": "去噪步数"
-      },
-      "control_after_generate": {
-        "name": "生成后控制"
       }
     },
     "outputs": {
@@ -8945,21 +10860,24 @@
   "MoonvalleyTxt2VideoNode": {
     "display_name": "Moonvalley Marey 文本转视频",
     "inputs": {
-      "prompt": {
-        "name": "提示词"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "negative_prompt": {
         "name": "负面提示词",
         "tooltip": "负面提示词文本"
       },
-      "resolution": {
-        "name": "分辨率",
-        "tooltip": "输出视频的分辨率"
+      "prompt": {
+        "name": "提示词"
       },
       "prompt_adherence": {
         "name": "提示词遵循度",
         "tooltip": "用于生成控制的引导尺度"
       },
+      "resolution": {
+        "name": "分辨率",
+        "tooltip": "输出视频的分辨率"
+      },
       "seed": {
         "name": "种子",
         "tooltip": "随机种子值"
@@ -8967,9 +10885,6 @@
       "steps": {
         "name": "步数",
         "tooltip": "推理步数"
-      },
-      "control_after_generate": {
-        "name": "生成后控制"
       }
     },
     "outputs": {
@@ -8981,32 +10896,32 @@
   "MoonvalleyVideo2VideoNode": {
     "display_name": "Moonvalley Marey 视频转视频",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "描述要生成的视频"
-      },
-      "negative_prompt": {
-        "name": "负面提示词",
-        "tooltip": "负面提示词文本"
-      },
-      "seed": {
-        "name": "种子",
-        "tooltip": "随机种子值"
-      },
-      "video": {
-        "name": "视频",
-        "tooltip": "用于生成输出视频的参考视频。必须至少5秒长。超过5秒的视频将被自动裁剪。仅支持MP4格式。"
-      },
-      "steps": {
-        "name": "步数",
-        "tooltip": "推理步数"
-      },
       "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": {
@@ -9021,11 +10936,11 @@
       "image": {
         "name": "图像"
       },
-      "operation": {
-        "name": "操作"
-      },
       "kernel_size": {
         "name": "核心大小"
+      },
+      "operation": {
+        "name": "操作"
       }
     },
     "outputs": {
@@ -9034,6 +10949,32 @@
       }
     }
   },
+  "NAGuidance": {
+    "description": "对模型应用归一化注意力引导，使蒸馏/快速模型支持负向提示。",
+    "display_name": "归一化注意力引导",
+    "inputs": {
+      "model": {
+        "name": "model",
+        "tooltip": "要应用NAG的模型。"
+      },
+      "nag_alpha": {
+        "name": "nag_alpha",
+        "tooltip": "归一化注意力的混合因子。1.0为完全替换，0.0为无效果。"
+      },
+      "nag_scale": {
+        "name": "nag_scale",
+        "tooltip": "引导缩放因子。数值越大，越远离负向提示。"
+      },
+      "nag_tau": {
+        "name": "nag_tau"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": "已启用NAG的修补模型。"
+      }
+    }
+  },
   "NormalizeImages": {
     "display_name": "规格化图像",
     "inputs": {
@@ -9058,19 +10999,19 @@
     }
   },
   "NormalizeVideoLatentStart": {
-    "display_name": "规格化视频Latent",
     "description": "将视频初始帧的 Latent 规格化，使其符合后续参考帧的平均值与标准差。有助于减少起始帧与视频其余部分之间的差异。",
+    "display_name": "规格化视频Latent",
     "inputs": {
       "latent": {
         "name": "Latent"
       },
-      "start_frame_count": {
-        "name": "规格化数量",
-        "tooltip": "从起始帧开始，需要规格化的 Latent 数量"
-      },
       "reference_frame_count": {
         "name": "参考数量",
         "tooltip": "从起始帧开始，用于参考的 Latent 数量"
+      },
+      "start_frame_count": {
+        "name": "规格化数量",
+        "tooltip": "从起始帧开始，需要规格化的 Latent 数量"
       }
     },
     "outputs": {
@@ -9081,20 +11022,20 @@
     }
   },
   "OpenAIChatConfig": {
-    "display_name": "OpenAI ChatGPT 高级选项",
     "description": "允许为OpenAI聊天节点指定高级配置选项。",
+    "display_name": "OpenAI ChatGPT 高级选项",
     "inputs": {
-      "truncation": {
-        "name": "截断",
-        "tooltip": "用于模型响应的截断策略。auto：如果此响应和先前响应的上下文超过模型的上下文窗口大小，模型将通过丢弃对话中间部分的输入项来截断响应以适应上下文窗口。disabled：如果模型响应将超过模型的上下文窗口大小，请求将失败并返回400错误。"
+      "instructions": {
+        "name": "指令",
+        "tooltip": "指导模型如何生成响应的指令"
       },
       "max_output_tokens": {
         "name": "Token输出上限",
         "tooltip": "生成响应时可生成token数量的上限，包括可见输出token"
       },
-      "instructions": {
-        "name": "指令",
-        "tooltip": "指导模型如何生成响应的指令"
+      "truncation": {
+        "name": "截断",
+        "tooltip": "用于模型响应的截断策略。auto：如果此响应和先前响应的上下文超过模型的上下文窗口大小，模型将通过丢弃对话中间部分的输入项来截断响应以适应上下文窗口。disabled：如果模型响应将超过模型的上下文窗口大小，请求将失败并返回400错误。"
       }
     },
     "outputs": {
@@ -9104,32 +11045,32 @@
     }
   },
   "OpenAIChatNode": {
-    "display_name": "OpenAI ChatGPT",
     "description": "从OpenAI模型生成文本响应。",
+    "display_name": "OpenAI ChatGPT",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "模型的文本输入，用于生成响应。"
-      },
-      "persist_context": {
-        "name": "保持上下文",
-        "tooltip": "此参数已弃用，无任何效果。"
-      },
-      "model": {
-        "name": "模型",
-        "tooltip": "用于生成响应的模型"
-      },
-      "images": {
-        "name": "图像",
-        "tooltip": "可选图像，用作模型的上下文。要包含多张图像，可使用批处理图像节点。"
+      "advanced_options": {
+        "name": "高级设置",
+        "tooltip": "模型的可选配置。接受来自OpenAI聊天高级选项节点的输入。"
       },
       "files": {
         "name": "文件",
         "tooltip": "可选文件，用作模型的上下文。接受来自OpenAI聊天输入文件节点的输入。"
       },
-      "advanced_options": {
-        "name": "高级设置",
-        "tooltip": "模型的可选配置。接受来自OpenAI聊天高级选项节点的输入。"
+      "images": {
+        "name": "图像",
+        "tooltip": "可选图像，用作模型的上下文。要包含多张图像，可使用批处理图像节点。"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "用于生成响应的模型"
+      },
+      "persist_context": {
+        "name": "保持上下文",
+        "tooltip": "此参数已弃用，无任何效果。"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "模型的文本输入，用于生成响应。"
       }
     },
     "outputs": {
@@ -9139,9 +11080,24 @@
     }
   },
   "OpenAIDalle2": {
-    "display_name": "OpenAI DALL·E 2",
     "description": "通过 OpenAI 的 DALL·E 2 接口同步生成图像。",
+    "display_name": "OpenAI DALL·E 2",
     "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "image": {
+        "name": "参考图像",
+        "tooltip": "用于图像编辑的可选参考图像。"
+      },
+      "mask": {
+        "name": "掩码",
+        "tooltip": "用于修复的可选掩码（白色区域将被替换）"
+      },
+      "n": {
+        "name": "数量",
+        "tooltip": "生成的图像数量"
+      },
       "prompt": {
         "name": "提示词",
         "tooltip": "用于 DALL·E 的文本提示"
@@ -9153,21 +11109,6 @@
       "size": {
         "name": "尺寸",
         "tooltip": "图像尺寸"
-      },
-      "n": {
-        "name": "数量",
-        "tooltip": "生成的图像数量"
-      },
-      "image": {
-        "name": "参考图像",
-        "tooltip": "用于图像编辑的可选参考图像。"
-      },
-      "mask": {
-        "name": "掩码",
-        "tooltip": "用于修复的可选掩码（白色区域将被替换）"
-      },
-      "control_after_generate": {
-        "name": "生成后控制"
       }
     },
     "outputs": {
@@ -9177,31 +11118,31 @@
     }
   },
   "OpenAIDalle3": {
-    "display_name": "OpenAI DALL·E 3",
     "description": "通过 OpenAI 的 DALL·E 3 接口同步生成图像。",
+    "display_name": "OpenAI DALL·E 3",
     "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
       "prompt": {
         "name": "提示词",
         "tooltip": "DALL·E 的文本提示"
       },
-      "seed": {
-        "name": "种子",
-        "tooltip": "后端尚未实现"
-      },
       "quality": {
         "name": "质量",
         "tooltip": "图像质量"
       },
-      "style": {
-        "name": "风格",
-        "tooltip": "“生动”会让模型倾向于生成超现实和戏剧性的图像。“自然”会让模型生成更自然、较少超现实感的图像。"
+      "seed": {
+        "name": "种子",
+        "tooltip": "后端尚未实现"
       },
       "size": {
         "name": "尺寸",
         "tooltip": "图像尺寸"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "style": {
+        "name": "风格",
+        "tooltip": "“生动”会让模型倾向于生成超现实和戏剧性的图像。“自然”会让模型生成更自然、较少超现实感的图像。"
       }
     },
     "outputs": {
@@ -9211,32 +11152,15 @@
     }
   },
   "OpenAIGPTImage1": {
-    "display_name": "OpenAI GPT Image 1",
     "description": "通过 OpenAI 的 GPT Image 1 端点同步生成图像。",
+    "display_name": "OpenAI GPT Image 1",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于 GPT Image 1 的文本提示"
-      },
-      "seed": {
-        "name": "种子",
-        "tooltip": "后端尚未实现"
-      },
-      "quality": {
-        "name": "质量",
-        "tooltip": "图像质量，影响成本和生成时间。"
-      },
       "background": {
         "name": "背景",
         "tooltip": "返回带有或不带背景的图像"
       },
-      "size": {
-        "name": "尺寸",
-        "tooltip": "图像尺寸"
-      },
-      "n": {
-        "name": "数量",
-        "tooltip": "生成多少张图像"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "image": {
         "name": "参考图像",
@@ -9249,8 +11173,25 @@
       "model": {
         "name": "模型"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "n": {
+        "name": "数量",
+        "tooltip": "生成多少张图像"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于 GPT Image 1 的文本提示"
+      },
+      "quality": {
+        "name": "质量",
+        "tooltip": "图像质量，影响成本和生成时间。"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "后端尚未实现"
+      },
+      "size": {
+        "name": "尺寸",
+        "tooltip": "图像尺寸"
       }
     },
     "outputs": {
@@ -9260,16 +11201,16 @@
     }
   },
   "OpenAIInputFiles": {
-    "display_name": "OpenAI ChatGPT Input Files",
     "description": "加载并准备输入文件（文本、PDF等）作为OpenAI聊天节点的输入。生成响应时，OpenAI模型将读取这些文件。🛈 提示：可与其他OpenAI输入文件节点链式连接。",
+    "display_name": "OpenAI ChatGPT Input Files",
     "inputs": {
-      "file": {
-        "name": "文件",
-        "tooltip": "作为模型上下文的输入文件。目前仅接受文本(.txt)和PDF(.pdf)文件。"
-      },
       "OPENAI_INPUT_FILES": {
         "name": "OpenAI输入文件",
         "tooltip": "可选的附加文件，与此节点加载的文件一起批处理。允许链式连接输入文件，以便单个消息可包含多个输入文件。"
+      },
+      "file": {
+        "name": "文件",
+        "tooltip": "作为模型上下文的输入文件。目前仅接受文本(.txt)和PDF(.pdf)文件。"
       }
     },
     "outputs": {
@@ -9279,18 +11220,11 @@
     }
   },
   "OpenAIVideoSora2": {
-    "display_name": "OpenAI Sora - Video",
     "description": "OpenAI视频和音频生成。",
+    "display_name": "OpenAI Sora - Video",
     "inputs": {
-      "model": {
-        "name": "模型"
-      },
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "引导文本；如果存在输入图像，可为空。"
-      },
-      "size": {
-        "name": "尺寸"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "duration": {
         "name": "时长"
@@ -9298,12 +11232,19 @@
       "image": {
         "name": "图像"
       },
+      "model": {
+        "name": "模型"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "引导文本；如果存在输入图像，可为空。"
+      },
       "seed": {
         "name": "随机种",
         "tooltip": "确定节点是否应重新运行的种子；无论种子如何，实际结果都是非确定性的。"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "size": {
+        "name": "尺寸"
       }
     },
     "outputs": {
@@ -9315,14 +11256,14 @@
   "OptimalStepsScheduler": {
     "display_name": "OptimalSteps调度器",
     "inputs": {
+      "denoise": {
+        "name": "去噪"
+      },
       "model_type": {
         "name": "模型"
       },
       "steps": {
         "name": "步数"
-      },
-      "denoise": {
-        "name": "去噪"
       }
     },
     "outputs": {
@@ -9334,17 +11275,17 @@
   "PairConditioningCombine": {
     "display_name": "条件对合并",
     "inputs": {
-      "positive_A": {
-        "name": "正面条件_A"
-      },
       "negative_A": {
         "name": "负面条件_A"
       },
-      "positive_B": {
-        "name": "正面条件_B"
-      },
       "negative_B": {
         "name": "负面条件_B"
+      },
+      "positive_A": {
+        "name": "正面条件_A"
+      },
+      "positive_B": {
+        "name": "正面条件_B"
       }
     },
     "outputs": {
@@ -9359,20 +11300,20 @@
   "PairConditioningSetDefaultCombine": {
     "display_name": "条件对设置默认合并",
     "inputs": {
-      "positive": {
-        "name": "正面条件"
+      "hooks": {
+        "name": "约束"
       },
       "negative": {
         "name": "负面条件"
       },
-      "positive_DEFAULT": {
-        "name": "默认正面条件"
-      },
       "negative_DEFAULT": {
         "name": "默认负面条件"
       },
-      "hooks": {
-        "name": "约束"
+      "positive": {
+        "name": "正面条件"
+      },
+      "positive_DEFAULT": {
+        "name": "默认正面条件"
       }
     },
     "outputs": {
@@ -9387,23 +11328,23 @@
   "PairConditioningSetProperties": {
     "display_name": "条件对设置属性",
     "inputs": {
-      "positive_NEW": {
-        "name": "新正面条件"
-      },
-      "negative_NEW": {
-        "name": "新负面条件"
-      },
-      "strength": {
-        "name": "强度"
-      },
-      "set_cond_area": {
-        "name": "设置条件区域"
+      "hooks": {
+        "name": "约束"
       },
       "mask": {
         "name": "遮罩"
       },
-      "hooks": {
-        "name": "约束"
+      "negative_NEW": {
+        "name": "新负面条件"
+      },
+      "positive_NEW": {
+        "name": "新正面条件"
+      },
+      "set_cond_area": {
+        "name": "设置条件区域"
+      },
+      "strength": {
+        "name": "强度"
       },
       "timesteps": {
         "name": "间隔"
@@ -9421,29 +11362,29 @@
   "PairConditioningSetPropertiesAndCombine": {
     "display_name": "条件对设置属性合并",
     "inputs": {
-      "positive": {
-        "name": "正面条件"
-      },
-      "negative": {
-        "name": "负面条件"
-      },
-      "positive_NEW": {
-        "name": "新正面条件"
-      },
-      "negative_NEW": {
-        "name": "新负面条件"
-      },
-      "strength": {
-        "name": "强度"
-      },
-      "set_cond_area": {
-        "name": "设置条件区域"
+      "hooks": {
+        "name": "约束"
       },
       "mask": {
         "name": "遮罩"
       },
-      "hooks": {
-        "name": "约束"
+      "negative": {
+        "name": "负面条件"
+      },
+      "negative_NEW": {
+        "name": "新负面条件"
+      },
+      "positive": {
+        "name": "正面条件"
+      },
+      "positive_NEW": {
+        "name": "新正面条件"
+      },
+      "set_cond_area": {
+        "name": "设置条件区域"
+      },
+      "strength": {
+        "name": "强度"
       },
       "timesteps": {
         "name": "间隔"
@@ -9461,27 +11402,27 @@
   "PatchModelAddDownscale": {
     "display_name": "收缩模型UNET（Kohya Deep Shrink）",
     "inputs": {
-      "model": {
-        "name": "模型"
-      },
       "block_number": {
         "name": "层编号"
       },
-      "downscale_factor": {
-        "name": "收缩系数"
-      },
-      "start_percent": {
-        "name": "开始百分比"
-      },
-      "end_percent": {
-        "name": "结束百分比"
-      },
       "downscale_after_skip": {
         "name": "跳过后收缩"
       },
+      "downscale_factor": {
+        "name": "收缩系数"
+      },
       "downscale_method": {
         "name": "收缩算法"
       },
+      "end_percent": {
+        "name": "结束百分比"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "start_percent": {
+        "name": "开始百分比"
+      },
       "upscale_method": {
         "name": "放大方法"
       }
@@ -9495,12 +11436,12 @@
   "PerpNeg": {
     "display_name": "Perp-Neg（已弃用，使用PerpNegGuider）",
     "inputs": {
-      "model": {
-        "name": "模型"
-      },
       "empty_conditioning": {
         "name": "空条件"
       },
+      "model": {
+        "name": "模型"
+      },
       "neg_scale": {
         "name": "负面缩放"
       }
@@ -9514,23 +11455,23 @@
   "PerpNegGuider": {
     "display_name": "PerpNeg引导器",
     "inputs": {
-      "model": {
-        "name": "模型"
-      },
-      "positive": {
-        "name": "正面条件"
-      },
-      "negative": {
-        "name": "负面条件"
+      "cfg": {
+        "name": "cfg"
       },
       "empty_conditioning": {
         "name": "空条件"
       },
-      "cfg": {
-        "name": "cfg"
+      "model": {
+        "name": "模型"
       },
       "neg_scale": {
         "name": "负面缩放"
+      },
+      "negative": {
+        "name": "负面条件"
+      },
+      "positive": {
+        "name": "正面条件"
       }
     },
     "outputs": {
@@ -9558,14 +11499,14 @@
   "PhotoMakerEncode": {
     "display_name": "PhotoMaker编码",
     "inputs": {
-      "photomaker": {
-        "name": "photomaker"
+      "clip": {
+        "name": "clip"
       },
       "image": {
         "name": "图像"
       },
-      "clip": {
-        "name": "clip"
+      "photomaker": {
+        "name": "photomaker"
       },
       "text": {
         "name": "文本"
@@ -9591,29 +11532,21 @@
     }
   },
   "PixverseImageToVideoNode": {
-    "display_name": "PixVerse 图像转视频",
     "description": "根据提示词和输出尺寸同步生成视频。",
+    "display_name": "PixVerse 图像转视频",
     "inputs": {
-      "image": {
-        "name": "图像"
-      },
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于视频生成的提示词"
-      },
-      "quality": {
-        "name": "质量"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "duration_seconds": {
         "name": "时长（秒）"
       },
+      "image": {
+        "name": "图像"
+      },
       "motion_mode": {
         "name": "运动模式"
       },
-      "seed": {
-        "name": "种子",
-        "tooltip": "用于视频生成的种子。"
-      },
       "negative_prompt": {
         "name": "反向提示词",
         "tooltip": "可选的文本描述，用于指定图像中不希望出现的元素。"
@@ -9622,8 +11555,16 @@
         "name": "PixVerse 模板",
         "tooltip": "可选模板，由 PixVerse Template 节点创建，用于影响生成风格。"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于视频生成的提示词"
+      },
+      "quality": {
+        "name": "质量"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "用于视频生成的种子。"
       }
     },
     "outputs": {
@@ -9647,18 +11588,14 @@
     }
   },
   "PixverseTextToVideoNode": {
-    "display_name": "PixVerse 文本转视频",
     "description": "根据提示词和输出尺寸同步生成视频。",
+    "display_name": "PixVerse 文本转视频",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于视频生成的提示词"
-      },
       "aspect_ratio": {
         "name": "宽高比"
       },
-      "quality": {
-        "name": "质量"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "duration_seconds": {
         "name": "时长（秒）"
@@ -9666,10 +11603,6 @@
       "motion_mode": {
         "name": "运动模式"
       },
-      "seed": {
-        "name": "种子",
-        "tooltip": "用于视频生成的种子。"
-      },
       "negative_prompt": {
         "name": "反向提示词",
         "tooltip": "用于描述图像中不希望出现元素的可选文本。"
@@ -9678,8 +11611,16 @@
         "name": "PixVerse 模板",
         "tooltip": "可选模板，用于影响生成风格，由 PixVerse Template 节点创建。"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于视频生成的提示词"
+      },
+      "quality": {
+        "name": "质量"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "用于视频生成的种子。"
       }
     },
     "outputs": {
@@ -9689,15 +11630,28 @@
     }
   },
   "PixverseTransitionVideoNode": {
-    "display_name": "PixVerse 转场视频",
     "description": "根据提示词和输出尺寸同步生成视频。",
+    "display_name": "PixVerse 转场视频",
     "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "duration_seconds": {
+        "name": "时长（秒）"
+      },
       "first_frame": {
         "name": "首帧"
       },
       "last_frame": {
         "name": "末帧"
       },
+      "motion_mode": {
+        "name": "运动模式"
+      },
+      "negative_prompt": {
+        "name": "反向提示词",
+        "tooltip": "用于描述图像中不希望出现元素的可选文本。"
+      },
       "prompt": {
         "name": "提示词",
         "tooltip": "用于视频生成的提示词"
@@ -9705,22 +11659,9 @@
       "quality": {
         "name": "质量"
       },
-      "duration_seconds": {
-        "name": "时长（秒）"
-      },
-      "motion_mode": {
-        "name": "运动模式"
-      },
       "seed": {
         "name": "种子",
         "tooltip": "用于视频生成的种子。"
-      },
-      "negative_prompt": {
-        "name": "反向提示词",
-        "tooltip": "用于描述图像中不希望出现元素的可选文本。"
-      },
-      "control_after_generate": {
-        "name": "生成后控制"
       }
     },
     "outputs": {
@@ -9732,8 +11673,8 @@
   "PolyexponentialScheduler": {
     "display_name": "Polyexponential调度器",
     "inputs": {
-      "steps": {
-        "name": "步数"
+      "rho": {
+        "name": "rho"
       },
       "sigma_max": {
         "name": "sigma最大值"
@@ -9741,8 +11682,8 @@
       "sigma_min": {
         "name": "sigma最小值"
       },
-      "rho": {
-        "name": "rho"
+      "steps": {
+        "name": "步数"
       }
     },
     "outputs": {
@@ -9754,12 +11695,6 @@
   "PorterDuffImageComposite": {
     "display_name": "Porter-Duff图像合成",
     "inputs": {
-      "source": {
-        "name": "来源图像"
-      },
-      "source_alpha": {
-        "name": "来源图像alpha"
-      },
       "destination": {
         "name": "目标图像"
       },
@@ -9768,6 +11703,12 @@
       },
       "mode": {
         "name": "模式"
+      },
+      "source": {
+        "name": "来源图像"
+      },
+      "source_alpha": {
+        "name": "来源图像alpha"
       }
     },
     "outputs": {
@@ -9782,28 +11723,34 @@
   "Preview3D": {
     "display_name": "预览3D",
     "inputs": {
-      "model_file": {
-        "name": "模型文件"
+      "bg_image": {
+        "name": "背景图像"
       },
       "camera_info": {
         "name": "相机信息"
       },
-      "bg_image": {
-        "name": "背景图像"
-      },
       "image": {
         "name": "图像"
+      },
+      "model_file": {
+        "name": "模型文件",
+        "tooltip": "3D模型文件或路径字符串"
       }
     }
   },
   "PreviewAny": {
     "display_name": "预览任意",
     "inputs": {
+      "previewMode": {},
+      "preview_markdown": {
+        "name": "预览"
+      },
+      "preview_text": {
+        "name": "预览"
+      },
       "source": {
         "name": "源"
-      },
-      "preview": {},
-      "previewMode": {}
+      }
     }
   },
   "PreviewAudio": {
@@ -9818,8 +11765,8 @@
     }
   },
   "PreviewImage": {
-    "display_name": "预览图像",
     "description": "将输入图像保存到您的ComfyUI临时目录。",
+    "display_name": "预览图像",
     "inputs": {
       "images": {
         "name": "图像"
@@ -9839,6 +11786,28 @@
       }
     }
   },
+  "PrimitiveBoundingBox": {
+    "display_name": "边界框",
+    "inputs": {
+      "height": {
+        "name": "高度"
+      },
+      "width": {
+        "name": "宽度"
+      },
+      "x": {
+        "name": "x"
+      },
+      "y": {
+        "name": "y"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "PrimitiveFloat": {
     "display_name": "浮点数",
     "inputs": {
@@ -9855,11 +11824,11 @@
   "PrimitiveInt": {
     "display_name": "整数",
     "inputs": {
-      "value": {
-        "name": "数值"
-      },
       "control_after_generate": {
         "name": "生成后控制"
+      },
+      "value": {
+        "name": "数值"
       }
     },
     "outputs": {
@@ -9895,8 +11864,8 @@
     }
   },
   "QuadrupleCLIPLoader": {
-    "display_name": "四重CLIP加载器",
     "description": "[配方]\n\nhidream: long clip-l, long clip-g, t5xxl, llama_8b_3.1_instruct",
+    "display_name": "四重CLIP加载器",
     "inputs": {
       "clip_name1": {
         "name": "clip_name1"
@@ -9920,47 +11889,47 @@
   "QwenImageDiffsynthControlnet": {
     "display_name": "QwenImageDiffsynthControlnet",
     "inputs": {
+      "image": {
+        "name": "图像"
+      },
+      "mask": {
+        "name": "遮罩"
+      },
       "model": {
         "name": "模型"
       },
       "model_patch": {
         "name": "模型补丁"
       },
-      "vae": {
-        "name": "vae"
-      },
-      "image": {
-        "name": "图像"
-      },
       "strength": {
         "name": "强度"
       },
-      "mask": {
-        "name": "遮罩"
+      "vae": {
+        "name": "vae"
       }
     }
   },
   "RandomCropImages": {
     "display_name": "裁剪图像（随机）",
     "inputs": {
-      "images": {
-        "name": "图像",
-        "tooltip": "需要处理的图像序列。"
-      },
-      "width": {
-        "name": "宽度",
-        "tooltip": "裁剪框宽度"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "height": {
         "name": "高度",
         "tooltip": "裁剪框高度"
       },
+      "images": {
+        "name": "图像",
+        "tooltip": "需要处理的图像序列。"
+      },
       "seed": {
         "name": "随机种",
         "tooltip": "随机种"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "width": {
+        "name": "宽度",
+        "tooltip": "裁剪框宽度"
       }
     },
     "outputs": {
@@ -9973,11 +11942,11 @@
   "RandomNoise": {
     "display_name": "随机噪波",
     "inputs": {
-      "noise_seed": {
-        "name": "噪波随机种"
-      },
       "control_after_generate": {
         "name": "生成后控制"
+      },
+      "noise_seed": {
+        "name": "噪波随机种"
       }
     },
     "outputs": {
@@ -9989,11 +11958,11 @@
   "RebatchImages": {
     "display_name": "重设图像批次",
     "inputs": {
-      "images": {
-        "name": "图像"
-      },
       "batch_size": {
         "name": "批量大小"
+      },
+      "images": {
+        "name": "图像"
       }
     },
     "outputs": {
@@ -10005,11 +11974,11 @@
   "RebatchLatents": {
     "display_name": "重设Latent批次",
     "inputs": {
-      "latents": {
-        "name": "Latent因素"
-      },
       "batch_size": {
         "name": "批量大小"
+      },
+      "latents": {
+        "name": "Latent因素"
       }
     },
     "outputs": {
@@ -10032,20 +12001,20 @@
     }
   },
   "RecraftColorRGB": {
-    "display_name": "Recraft 颜色 RGB",
     "description": "通过选择特定的 RGB 值来创建 Recraft 颜色。",
+    "display_name": "Recraft 颜色 RGB",
     "inputs": {
-      "r": {
-        "name": "r",
-        "tooltip": "颜色的红色值。"
+      "b": {
+        "name": "b",
+        "tooltip": "颜色的蓝色值。"
       },
       "g": {
         "name": "g",
         "tooltip": "颜色的绿色值。"
       },
-      "b": {
-        "name": "b",
-        "tooltip": "颜色的蓝色值。"
+      "r": {
+        "name": "r",
+        "tooltip": "颜色的红色值。"
       },
       "recraft_color": {
         "name": "Recraft色彩"
@@ -10059,14 +12028,14 @@
     }
   },
   "RecraftControls": {
-    "display_name": "Recraft 控件",
     "description": "创建 Recraft 控件以自定义 Recraft 生成。",
+    "display_name": "Recraft 控件",
     "inputs": {
-      "colors": {
-        "name": "色彩"
-      },
       "background_color": {
         "name": "背景色"
+      },
+      "colors": {
+        "name": "色彩"
       }
     },
     "outputs": {
@@ -10076,9 +12045,28 @@
       }
     }
   },
+  "RecraftCreateStyleNode": {
+    "description": "从参考图像创建自定义风格。上传1-5张图片作为风格参考。所有图片的总大小限制为5MB。",
+    "display_name": "Recraft创建风格",
+    "inputs": {
+      "images": {
+        "name": "图片"
+      },
+      "style": {
+        "name": "风格",
+        "tooltip": "生成图像的基础风格。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "风格ID",
+        "tooltip": null
+      }
+    }
+  },
   "RecraftCreativeUpscaleNode": {
-    "display_name": "Recraft 创意放大图像",
     "description": "同步放大图像。\n使用“创意放大”工具增强给定的光栅图像，提升分辨率，重点优化细节和人脸。",
+    "display_name": "Recraft 创意放大图像",
     "inputs": {
       "image": {
         "name": "图像"
@@ -10091,8 +12079,8 @@
     }
   },
   "RecraftCrispUpscaleNode": {
-    "display_name": "Recraft 清晰放大图像",
     "description": "同步放大图像。\n使用“清晰放大”工具增强给定的光栅图像，提高图像分辨率，使图像更加锐利和干净。",
+    "display_name": "Recraft 清晰放大图像",
     "inputs": {
       "image": {
         "name": "图像"
@@ -10105,36 +12093,36 @@
     }
   },
   "RecraftImageInpaintingNode": {
-    "display_name": "Recraft 图像修复",
     "description": "根据提示词和 mask 修改图像。",
+    "display_name": "Recraft 图像修复",
     "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
       "image": {
         "name": "图像"
       },
       "mask": {
         "name": "遮罩"
       },
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于图像生成的提示词。"
-      },
       "n": {
         "name": "数量",
         "tooltip": "要生成的图像数量。"
       },
-      "seed": {
-        "name": "种子",
-        "tooltip": "用于决定节点是否重新运行的种子；无论种子如何，实际结果都是非确定性的。"
-      },
-      "recraft_style": {
-        "name": "Recraft风格"
-      },
       "negative_prompt": {
         "name": "反向提示词",
         "tooltip": "对图像中不希望出现元素的可选文本描述。"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于图像生成的提示词。"
+      },
+      "recraft_style": {
+        "name": "Recraft风格"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "用于决定节点是否重新运行的种子；无论种子如何，实际结果都是非确定性的。"
       }
     },
     "outputs": {
@@ -10144,41 +12132,41 @@
     }
   },
   "RecraftImageToImageNode": {
-    "display_name": "Recraft 图像到图像",
     "description": "根据提示词和强度修改图像。",
+    "display_name": "Recraft 图像到图像",
     "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
       "image": {
         "name": "图像"
       },
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于生成图像的提示词。"
-      },
       "n": {
         "name": "数量",
         "tooltip": "要生成的图像数量。"
       },
-      "strength": {
-        "name": "强度",
-        "tooltip": "定义与原始图像的差异，范围为[0, 1]，0表示几乎相同，1表示极大不同。"
-      },
-      "seed": {
-        "name": "种子",
-        "tooltip": "用于决定节点是否重新运行的种子；无论种子如何，实际结果都是非确定性的。"
-      },
-      "recraft_style": {
-        "name": "Recraft风格"
-      },
       "negative_prompt": {
         "name": "反向提示词",
         "tooltip": "可选的文本描述，用于指定图像中不希望出现的元素。"
       },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于生成图像的提示词。"
+      },
       "recraft_controls": {
         "name": "Recraft控制",
         "tooltip": "通过 Recraft Controls 节点对生成过程进行可选的附加控制。"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "recraft_style": {
+        "name": "Recraft风格"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "用于决定节点是否重新运行的种子；无论种子如何，实际结果都是非确定性的。"
+      },
+      "strength": {
+        "name": "强度",
+        "tooltip": "定义与原始图像的差异，范围为[0, 1]，0表示几乎相同，1表示极大不同。"
       }
     },
     "outputs": {
@@ -10188,8 +12176,8 @@
     }
   },
   "RecraftRemoveBackgroundNode": {
-    "display_name": "Recraft 移除背景",
     "description": "从图像中移除背景，返回处理后的图像和 mask。",
+    "display_name": "Recraft 移除背景",
     "inputs": {
       "image": {
         "name": "图像"
@@ -10205,33 +12193,33 @@
     }
   },
   "RecraftReplaceBackgroundNode": {
-    "display_name": "Recraft 更换背景",
     "description": "根据提供的提示词替换图像背景。",
+    "display_name": "Recraft 更换背景",
     "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
       "image": {
         "name": "图像"
       },
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于图像生成的提示词。"
-      },
       "n": {
         "name": "数量",
         "tooltip": "要生成的图像数量。"
       },
-      "seed": {
-        "name": "种子",
-        "tooltip": "用于决定节点是否重新运行的种子；无论种子如何，实际结果都是非确定性的。"
-      },
-      "recraft_style": {
-        "name": "recraft 风格"
-      },
       "negative_prompt": {
         "name": "反向提示词",
         "tooltip": "对图像中不希望出现元素的可选文本描述。"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于图像生成的提示词。"
+      },
+      "recraft_style": {
+        "name": "recraft 风格"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "用于决定节点是否重新运行的种子；无论种子如何，实际结果都是非确定性的。"
       }
     },
     "outputs": {
@@ -10241,8 +12229,8 @@
     }
   },
   "RecraftStyleV3DigitalIllustration": {
-    "display_name": "Recraft 风格 - 数字插画",
     "description": "选择 realistic_image 风格和可选的子风格。",
+    "display_name": "Recraft 风格 - 数字插画",
     "inputs": {
       "substyle": {
         "name": "子风格"
@@ -10256,8 +12244,8 @@
     }
   },
   "RecraftStyleV3InfiniteStyleLibrary": {
-    "display_name": "Recraft 风格 - 无限风格库",
     "description": "根据 Recraft 的无限风格库中已有的 UUID 选择风格。",
+    "display_name": "Recraft 风格 - 无限风格库",
     "inputs": {
       "style_id": {
         "name": "风格ID",
@@ -10272,8 +12260,8 @@
     }
   },
   "RecraftStyleV3LogoRaster": {
-    "display_name": "Recraft 风格 - 标志光栅图",
     "description": "选择 realistic_image 风格和可选的子风格。",
+    "display_name": "Recraft 风格 - 标志光栅图",
     "inputs": {
       "substyle": {
         "name": "子风格"
@@ -10287,8 +12275,8 @@
     }
   },
   "RecraftStyleV3RealisticImage": {
-    "display_name": "Recraft 风格 - 真实图像",
     "description": "选择 realistic_image 风格和可选的子风格。",
+    "display_name": "Recraft 风格 - 真实图像",
     "inputs": {
       "substyle": {
         "name": "子风格"
@@ -10302,38 +12290,38 @@
     }
   },
   "RecraftTextToImageNode": {
-    "display_name": "Recraft 文本转图像",
     "description": "根据提示词和分辨率同步生成图像。",
+    "display_name": "Recraft 文本转图像",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于图像生成的提示词。"
-      },
-      "size": {
-        "name": "尺寸",
-        "tooltip": "生成图像的尺寸。"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "n": {
         "name": "n",
         "tooltip": "要生成的图像数量。"
       },
-      "seed": {
-        "name": "随机种",
-        "tooltip": "用于决定节点是否重新运行的种子；无论种子如何，实际结果都是非确定性的。"
-      },
-      "recraft_style": {
-        "name": "Recraft风格"
-      },
       "negative_prompt": {
         "name": "负面提示词",
         "tooltip": "对图像中不希望出现元素的可选文本描述。"
       },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于图像生成的提示词。"
+      },
       "recraft_controls": {
         "name": "Recraft控制",
         "tooltip": "通过 Recraft Controls 节点对生成过程的可选附加控制。"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "recraft_style": {
+        "name": "Recraft风格"
+      },
+      "seed": {
+        "name": "随机种",
+        "tooltip": "用于决定节点是否重新运行的种子；无论种子如何，实际结果都是非确定性的。"
+      },
+      "size": {
+        "name": "尺寸",
+        "tooltip": "生成图像的尺寸。"
       }
     },
     "outputs": {
@@ -10343,38 +12331,120 @@
     }
   },
   "RecraftTextToVectorNode": {
-    "display_name": "Recraft 文本转矢量",
     "description": "根据提示词和分辨率同步生成 SVG。",
+    "display_name": "Recraft 文本转矢量",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于生成图像的提示词。"
-      },
-      "substyle": {
-        "name": "子风格"
-      },
-      "size": {
-        "name": "尺寸",
-        "tooltip": "生成图像的尺寸。"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "n": {
         "name": "数量",
         "tooltip": "要生成的图像数量。"
       },
-      "seed": {
-        "name": "种子",
-        "tooltip": "用于决定节点是否重新运行的种子；无论种子如何，实际结果都是非确定性的。"
-      },
       "negative_prompt": {
         "name": "反向提示词",
         "tooltip": "对图像中不希望出现元素的可选文本描述。"
       },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于生成图像的提示词。"
+      },
       "recraft_controls": {
         "name": "Recraft 控制",
         "tooltip": "通过 Recraft Controls 节点对生成过程的可选附加控制。"
       },
+      "seed": {
+        "name": "种子",
+        "tooltip": "用于决定节点是否重新运行的种子；无论种子如何，实际结果都是非确定性的。"
+      },
+      "size": {
+        "name": "尺寸",
+        "tooltip": "生成图像的尺寸。"
+      },
+      "substyle": {
+        "name": "子风格"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftV4TextToImageNode": {
+    "description": "使用Recraft V4或V4 Pro模型生成图像。",
+    "display_name": "Recraft V4 文本转图像",
+    "inputs": {
       "control_after_generate": {
-        "name": "生成后控制"
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "用于生成的模型。"
+      },
+      "model_size": {
+        "name": "size"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "要生成的图像数量。"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "可选的图像中不希望出现元素的文本描述。"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "用于图像生成的提示词。最多10,000个字符。"
+      },
+      "recraft_controls": {
+        "name": "recraft_controls",
+        "tooltip": "通过Recraft Controls节点对生成过程的可选附加控制。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "用于决定节点是否重新运行的种子；无论种子如何，实际结果都是非确定性的。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "RecraftV4TextToVectorNode": {
+    "description": "使用Recraft V4或V4 Pro模型生成SVG。",
+    "display_name": "Recraft V4 文本转矢量",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "用于生成的模型。"
+      },
+      "model_size": {
+        "name": "size"
+      },
+      "n": {
+        "name": "n",
+        "tooltip": "要生成的图像数量。"
+      },
+      "negative_prompt": {
+        "name": "negative_prompt",
+        "tooltip": "可选的图像中不希望出现元素的文本描述。"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "用于图像生成的提示词。最多10,000个字符。"
+      },
+      "recraft_controls": {
+        "name": "recraft_controls",
+        "tooltip": "通过Recraft Controls节点对生成过程的可选附加控制。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "用于决定节点是否重新运行的种子；无论种子如何，实际结果都是非确定性的。"
       }
     },
     "outputs": {
@@ -10384,8 +12454,8 @@
     }
   },
   "RecraftVectorizeImageNode": {
-    "display_name": "Recraft 矢量化图像",
     "description": "从输入图像同步生成 SVG。",
+    "display_name": "Recraft 矢量化图像",
     "inputs": {
       "image": {
         "name": "图像"
@@ -10398,8 +12468,8 @@
     }
   },
   "ReferenceLatent": {
-    "display_name": "参考Latent",
     "description": "此节点为编辑模型设置引导潜在空间。如果模型支持，您可以链式连接多个以设置多个参考图像。",
+    "display_name": "参考Latent",
     "inputs": {
       "conditioning": {
         "name": "条件"
@@ -10414,29 +12484,46 @@
       }
     }
   },
+  "ReferenceTimbreAudio": {
+    "description": "此节点设置音色参考音频（用于 ace step 1.5）",
+    "display_name": "ReferenceTimbreAudio",
+    "inputs": {
+      "conditioning": {
+        "name": "条件"
+      },
+      "latent": {
+        "name": "潜空间"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "RegexExtract": {
     "display_name": "正则表达式提取",
     "inputs": {
-      "string": {
-        "name": "字符串"
-      },
-      "regex_pattern": {
-        "name": "正则表达式模式"
-      },
-      "mode": {
-        "name": "模式"
-      },
       "case_insensitive": {
         "name": "忽略大小写"
       },
-      "multiline": {
-        "name": "多行模式"
-      },
       "dotall": {
         "name": "点号匹配所有"
       },
       "group_index": {
         "name": "分组索引"
+      },
+      "mode": {
+        "name": "模式"
+      },
+      "multiline": {
+        "name": "多行模式"
+      },
+      "regex_pattern": {
+        "name": "正则表达式模式"
+      },
+      "string": {
+        "name": "字符串"
       }
     },
     "outputs": {
@@ -10448,20 +12535,20 @@
   "RegexMatch": {
     "display_name": "正则表达式匹配",
     "inputs": {
-      "string": {
-        "name": "字符串"
-      },
-      "regex_pattern": {
-        "name": "正则表达式模式"
-      },
       "case_insensitive": {
         "name": "忽略大小写"
       },
+      "dotall": {
+        "name": "点号匹配所有"
+      },
       "multiline": {
         "name": "多行模式"
       },
-      "dotall": {
-        "name": "点号匹配所有"
+      "regex_pattern": {
+        "name": "正则表达式模式"
+      },
+      "string": {
+        "name": "字符串"
       }
     },
     "outputs": {
@@ -10472,11 +12559,22 @@
     }
   },
   "RegexReplace": {
-    "display_name": "正则表达式替换",
     "description": "使用正则表达式模式查找和替换文本。",
+    "display_name": "正则表达式替换",
     "inputs": {
-      "string": {
-        "name": "字符串"
+      "case_insensitive": {
+        "name": "忽略大小写"
+      },
+      "count": {
+        "name": "计数",
+        "tooltip": "最大替换次数。设置为0可替换所有匹配项（默认）。设置为1仅替换第一个匹配项，2替换前两个匹配项，依此类推。"
+      },
+      "dotall": {
+        "name": "点号匹配所有",
+        "tooltip": "启用时，点号（.）字符将匹配包括换行符在内的任何字符。禁用时，点号不会匹配换行符。"
+      },
+      "multiline": {
+        "name": "多行模式"
       },
       "regex_pattern": {
         "name": "正则表达式模式"
@@ -10484,19 +12582,8 @@
       "replace": {
         "name": "替换内容"
       },
-      "case_insensitive": {
-        "name": "忽略大小写"
-      },
-      "multiline": {
-        "name": "多行模式"
-      },
-      "dotall": {
-        "name": "点号匹配所有",
-        "tooltip": "启用时，点号（.）字符将匹配包括换行符在内的任何字符。禁用时，点号不会匹配换行符。"
-      },
-      "count": {
-        "name": "计数",
-        "tooltip": "最大替换次数。设置为0可替换所有匹配项（默认）。设置为1仅替换第一个匹配项，2替换前两个匹配项，依此类推。"
+      "string": {
+        "name": "字符串"
       }
     },
     "outputs": {
@@ -10508,12 +12595,12 @@
   "RenormCFG": {
     "display_name": "RenormCFG",
     "inputs": {
-      "model": {
-        "name": "模型"
-      },
       "cfg_trunc": {
         "name": "cfg_trunc"
       },
+      "model": {
+        "name": "模型"
+      },
       "renorm_cfg": {
         "name": "renorm_cfg"
       }
@@ -10527,11 +12614,11 @@
   "RepeatImageBatch": {
     "display_name": "复制图像批次",
     "inputs": {
-      "image": {
-        "name": "图像"
-      },
       "amount": {
         "name": "数量"
+      },
+      "image": {
+        "name": "图像"
       }
     },
     "outputs": {
@@ -10543,21 +12630,17 @@
   "RepeatLatentBatch": {
     "display_name": "复制Latent批次",
     "inputs": {
-      "samples": {
-        "name": "Latent"
-      },
       "amount": {
         "name": "数量"
+      },
+      "samples": {
+        "name": "Latent"
       }
     }
   },
   "ReplaceText": {
     "display_name": "替换文本",
     "inputs": {
-      "texts": {
-        "name": "文本",
-        "tooltip": "需要处理的文本"
-      },
       "find": {
         "name": "搜索",
         "tooltip": "需要被替换的文本"
@@ -10565,6 +12648,10 @@
       "replace": {
         "name": "替换",
         "tooltip": "用于替换的文本"
+      },
+      "texts": {
+        "name": "文本",
+        "tooltip": "需要处理的文本"
       }
     },
     "outputs": {
@@ -10613,17 +12700,17 @@
       "image": {
         "name": "图像"
       },
-      "target_width": {
-        "name": "目标宽度"
-      },
-      "target_height": {
-        "name": "目标高度"
+      "interpolation": {
+        "name": "插值方法"
       },
       "padding_color": {
         "name": "填充颜色"
       },
-      "interpolation": {
-        "name": "插值方法"
+      "target_height": {
+        "name": "目标高度"
+      },
+      "target_width": {
+        "name": "目标宽度"
       }
     },
     "outputs": {
@@ -10632,6 +12719,38 @@
       }
     }
   },
+  "ResizeImageMaskNode": {
+    "description": "使用多种缩放方法调整图像或 mask 的大小。",
+    "display_name": "调整图像/掩码大小",
+    "inputs": {
+      "input": {
+        "name": "输入"
+      },
+      "resize_type": {
+        "name": "调整类型",
+        "tooltip": "选择如何调整大小：按精确尺寸、缩放因子、匹配另一张图像等。"
+      },
+      "resize_type_crop": {
+        "name": "裁剪"
+      },
+      "resize_type_height": {
+        "name": "高度"
+      },
+      "resize_type_width": {
+        "name": "宽度"
+      },
+      "scale_method": {
+        "name": "缩放方法",
+        "tooltip": "插值算法。'area' 适合缩小，'lanczos' 适合放大，'nearest-exact' 适合像素艺术。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "已调整大小",
+        "tooltip": null
+      }
+    }
+  },
   "ResizeImagesByLongerEdge": {
     "display_name": "缩放图像（长边）",
     "inputs": {
@@ -10673,13 +12792,13 @@
   "ResolutionBucket": {
     "display_name": "分辨率 Bucket",
     "inputs": {
-      "latents": {
-        "name": "Latent",
-        "tooltip": "需要 bucket 的 Latent 字典序列"
-      },
       "conditioning": {
         "name": "条件",
         "tooltip": "条件序列（必须和 Latent 序列数量相同）"
+      },
+      "latents": {
+        "name": "Latent",
+        "tooltip": "需要 bucket 的 Latent 字典序列"
       }
     },
     "outputs": {
@@ -10693,84 +12812,120 @@
       }
     }
   },
+  "ResolutionSelector": {
+    "description": "根据宽高比和目标百万像素数计算宽度和高度。适用于设置空latent图像的尺寸。",
+    "display_name": "分辨率选择器",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "宽高比",
+        "tooltip": "输出尺寸的宽高比。"
+      },
+      "megapixels": {
+        "name": "百万像素",
+        "tooltip": "目标总百万像素数。1.0 MP ≈ 1024×1024（正方形）。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "宽度",
+        "tooltip": "计算得到的像素宽度（8的倍数）。"
+      },
+      "1": {
+        "name": "高度",
+        "tooltip": "计算得到的像素高度（8的倍数）。"
+      }
+    }
+  },
   "Rodin3D_Detail": {
-    "display_name": "Rodin 3D生成 - 细节生成",
     "description": "使用Rodin API生成3D资源",
+    "display_name": "Rodin 3D生成 - 细节生成",
     "inputs": {
       "Images": {
         "name": "图像"
       },
-      "Seed": {
-        "name": "种子"
-      },
       "Material_Type": {
         "name": "材质类型"
       },
       "Polygon_count": {
         "name": "多边形数量"
+      },
+      "Seed": {
+        "name": "种子"
       }
     },
     "outputs": {
       "0": {
         "name": "3D模型路径",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
   "Rodin3D_Gen2": {
-    "display_name": "Rodin 3D生成 - Gen-2生成",
     "description": "使用Rodin API生成3D资源",
+    "display_name": "Rodin 3D生成 - Gen-2生成",
     "inputs": {
       "Images": {
         "name": "图像"
       },
-      "TAPose": {
-        "name": "TAPose"
-      },
-      "Seed": {
-        "name": "种子"
-      },
       "Material_Type": {
         "name": "材质类型"
       },
       "Polygon_count": {
         "name": "多边形数量"
+      },
+      "Seed": {
+        "name": "种子"
+      },
+      "TAPose": {
+        "name": "TAPose"
       }
     },
     "outputs": {
       "0": {
         "name": "3D模型路径",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
   "Rodin3D_Regular": {
-    "display_name": "Rodin 3D生成 - 常规生成",
     "description": "使用Rodin API生成3D资源",
+    "display_name": "Rodin 3D生成 - 常规生成",
     "inputs": {
       "Images": {
         "name": "图像"
       },
-      "Seed": {
-        "name": "种子"
-      },
       "Material_Type": {
         "name": "材质类型"
       },
       "Polygon_count": {
         "name": "多边形数量"
+      },
+      "Seed": {
+        "name": "种子"
       }
     },
     "outputs": {
       "0": {
         "name": "3D模型路径",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
   "Rodin3D_Sketch": {
-    "display_name": "Rodin 3D生成 - 草图生成",
     "description": "使用Rodin API生成3D资源",
+    "display_name": "Rodin 3D生成 - 草图生成",
     "inputs": {
       "Images": {
         "name": "图像"
@@ -10783,51 +12938,58 @@
       "0": {
         "name": "3D模型路径",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
   "Rodin3D_Smooth": {
-    "display_name": "Rodin 3D生成 - 平滑生成",
     "description": "使用Rodin API生成3D资源",
+    "display_name": "Rodin 3D生成 - 平滑生成",
     "inputs": {
       "Images": {
         "name": "图像"
       },
-      "Seed": {
-        "name": "种子"
-      },
       "Material_Type": {
         "name": "材质类型"
       },
       "Polygon_count": {
         "name": "多边形数量"
+      },
+      "Seed": {
+        "name": "种子"
       }
     },
     "outputs": {
       "0": {
         "name": "3D模型路径",
         "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
   "RunwayFirstLastFrameNode": {
-    "display_name": "Runway首尾帧转视频",
     "description": "上传首尾关键帧，草拟提示词，生成视频。对于更复杂的过渡（例如尾帧与首帧完全不同的情况），较长的10秒时长可能更有利，这能为生成过程提供更多时间在两个输入之间平滑过渡。开始前，请查看这些最佳实践以确保您的输入选择能为生成成功奠定基础：https://help.runwayml.com/hc/en-us/articles/34170748696595-Creating-with-Keyframes-on-Gen-3。",
+    "display_name": "Runway首尾帧转视频",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "生成的文本提示词"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
-      "start_frame": {
-        "name": "起始帧",
-        "tooltip": "用于视频的起始帧"
+      "duration": {
+        "name": "时长"
       },
       "end_frame": {
         "name": "结束帧",
         "tooltip": "用于视频的结束帧。仅支持gen3a_turbo。"
       },
-      "duration": {
-        "name": "时长"
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "生成的文本提示词"
       },
       "ratio": {
         "name": "比例"
@@ -10836,8 +12998,9 @@
         "name": "种子",
         "tooltip": "生成的随机种子"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "start_frame": {
+        "name": "起始帧",
+        "tooltip": "用于视频的起始帧"
       }
     },
     "outputs": {
@@ -10847,20 +13010,19 @@
     }
   },
   "RunwayImageToVideoNodeGen3a": {
-    "display_name": "Runway图像转视频（Gen3a Turbo）",
     "description": "使用Gen3a Turbo模型从单个起始帧生成视频。开始前，请查看这些最佳实践以确保您的输入选择能为生成成功奠定基础：https://help.runwayml.com/hc/en-us/articles/33927968552339-Creating-with-Act-One-on-Gen-3-Alpha-and-Turbo。",
+    "display_name": "Runway图像转视频（Gen3a Turbo）",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "生成的文本提示词"
-      },
-      "start_frame": {
-        "name": "起始帧",
-        "tooltip": "用于视频的起始帧"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "duration": {
         "name": "时长"
       },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "生成的文本提示词"
+      },
       "ratio": {
         "name": "比例"
       },
@@ -10868,8 +13030,9 @@
         "name": "种子",
         "tooltip": "生成的随机种子"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "start_frame": {
+        "name": "起始帧",
+        "tooltip": "用于视频的起始帧"
       }
     },
     "outputs": {
@@ -10879,20 +13042,19 @@
     }
   },
   "RunwayImageToVideoNodeGen4": {
-    "display_name": "Runway图像转视频（Gen4 Turbo）",
     "description": "使用Gen4 Turbo模型从单个起始帧生成视频。开始前，请查看这些最佳实践以确保您的输入选择能为生成成功奠定基础：https://help.runwayml.com/hc/en-us/articles/37327109429011-Creating-with-Gen-4-Video。",
+    "display_name": "Runway图像转视频（Gen4 Turbo）",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "生成的文本提示词"
-      },
-      "start_frame": {
-        "name": "起始帧",
-        "tooltip": "用于视频的起始帧"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "duration": {
         "name": "时长"
       },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "生成的文本提示词"
+      },
       "ratio": {
         "name": "比例"
       },
@@ -10900,8 +13062,9 @@
         "name": "种子",
         "tooltip": "生成的随机种子"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "start_frame": {
+        "name": "起始帧",
+        "tooltip": "用于视频的起始帧"
       }
     },
     "outputs": {
@@ -10911,8 +13074,8 @@
     }
   },
   "RunwayTextToImageNode": {
-    "display_name": "Runway 文生图",
     "description": "使用 Runway 的 Gen 4 模型从文本提示生成图像。您还可以包含参考图像来引导生成过程。",
+    "display_name": "Runway 文生图",
     "inputs": {
       "prompt": {
         "name": "提示词",
@@ -10932,38 +13095,258 @@
       }
     }
   },
-  "SamplerCustom": {
-    "display_name": "自定义采样器",
+  "SDPoseDrawKeypoints": {
+    "display_name": "SDPoseDrawKeypoints",
     "inputs": {
+      "draw_body": {
+        "name": "draw_body"
+      },
+      "draw_face": {
+        "name": "draw_face"
+      },
+      "draw_feet": {
+        "name": "draw_feet"
+      },
+      "draw_hands": {
+        "name": "draw_hands"
+      },
+      "face_point_size": {
+        "name": "face_point_size"
+      },
+      "keypoints": {
+        "name": "keypoints"
+      },
+      "score_threshold": {
+        "name": "score_threshold"
+      },
+      "stick_width": {
+        "name": "stick_width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SDPoseFaceBBoxes": {
+    "display_name": "SDPoseFaceBBoxes",
+    "inputs": {
+      "force_square": {
+        "name": "force_square",
+        "tooltip": "扩展较短的边界框轴，使裁剪区域始终为正方形。"
+      },
+      "keypoints": {
+        "name": "keypoints"
+      },
+      "scale": {
+        "name": "scale",
+        "tooltip": "每个检测到的人脸边界框区域的缩放倍数。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "bboxes",
+        "tooltip": "每帧的人脸边界框，可与SDPoseKeypointExtractor的bboxes输入兼容。"
+      }
+    }
+  },
+  "SDPoseKeypointExtractor": {
+    "description": "使用SDPose模型从图像中提取姿态关键点：https://huggingface.co/Comfy-Org/SDPose/tree/main/checkpoints",
+    "display_name": "SDPoseKeypointExtractor",
+    "inputs": {
+      "batch_size": {
+        "name": "batch_size"
+      },
+      "bboxes": {
+        "name": "bboxes",
+        "tooltip": "可选的边界框，用于更精确的检测。多人检测时必需。"
+      },
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "keypoints",
+        "tooltip": "OpenPose帧格式的关键点（canvas_width, canvas_height, people）"
+      }
+    }
+  },
+  "SDTurboScheduler": {
+    "display_name": "SDTurbo调度器",
+    "inputs": {
+      "denoise": {
+        "name": "降噪"
+      },
       "model": {
         "name": "模型"
       },
-      "add_noise": {
-        "name": "添加噪波"
+      "steps": {
+        "name": "步数"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "SD_4XUpscale_Conditioning": {
+    "display_name": "SD_4X放大条件",
+    "inputs": {
+      "images": {
+        "name": "图片"
       },
-      "noise_seed": {
-        "name": "噪波种子"
+      "negative": {
+        "name": "负面条件"
       },
-      "cfg": {
-        "name": "cfg"
+      "noise_augmentation": {
+        "name": "噪波增强"
       },
       "positive": {
         "name": "正面条件"
       },
+      "scale_ratio": {
+        "name": "缩放比例"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "正面条件",
+        "tooltip": null
+      },
+      "1": {
+        "name": "负面条件",
+        "tooltip": null
+      },
+      "2": {
+        "name": "Latent",
+        "tooltip": null
+      }
+    }
+  },
+  "SV3D_Conditioning": {
+    "display_name": "SV3D条件",
+    "inputs": {
+      "clip_vision": {
+        "name": "clip视觉"
+      },
+      "elevation": {
+        "name": "俯仰角"
+      },
+      "height": {
+        "name": "高度"
+      },
+      "init_image": {
+        "name": "初始图像"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "video_frames": {
+        "name": "帧数"
+      },
+      "width": {
+        "name": "宽度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "正面条件",
+        "tooltip": null
+      },
+      "1": {
+        "name": "负面条件",
+        "tooltip": null
+      },
+      "2": {
+        "name": "Latent",
+        "tooltip": null
+      }
+    }
+  },
+  "SVD_img2vid_Conditioning": {
+    "display_name": "SVD_img2vid条件",
+    "inputs": {
+      "augmentation_level": {
+        "name": "增强"
+      },
+      "clip_vision": {
+        "name": "clip视觉"
+      },
+      "fps": {
+        "name": "帧率"
+      },
+      "height": {
+        "name": "高度"
+      },
+      "init_image": {
+        "name": "初始图像"
+      },
+      "motion_bucket_id": {
+        "name": "动态bucketID"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "video_frames": {
+        "name": "帧数"
+      },
+      "width": {
+        "name": "宽度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "正面条件"
+      },
+      "1": {
+        "name": "负面条件"
+      },
+      "2": {
+        "name": "Latent"
+      }
+    }
+  },
+  "SamplerCustom": {
+    "display_name": "自定义采样器",
+    "inputs": {
+      "add_noise": {
+        "name": "添加噪波"
+      },
+      "cfg": {
+        "name": "cfg"
+      },
+      "control_after_generate": {
+        "name": "生成后的控制"
+      },
+      "latent_image": {
+        "name": "Latent"
+      },
+      "model": {
+        "name": "模型"
+      },
       "negative": {
         "name": "负面条件"
       },
+      "noise_seed": {
+        "name": "噪波种子"
+      },
+      "positive": {
+        "name": "正面条件"
+      },
       "sampler": {
         "name": "采样器"
       },
       "sigmas": {
         "name": "Sigmas"
-      },
-      "latent_image": {
-        "name": "Latent"
-      },
-      "control_after_generate": {
-        "name": "生成后的控制"
       }
     },
     "outputs": {
@@ -10980,20 +13363,20 @@
   "SamplerCustomAdvanced": {
     "display_name": "自定义采样器（高级）",
     "inputs": {
-      "noise": {
-        "name": "噪波"
-      },
       "guider": {
         "name": "引导器"
       },
+      "latent_image": {
+        "name": "Latent图像"
+      },
+      "noise": {
+        "name": "噪波"
+      },
       "sampler": {
         "name": "采样器"
       },
       "sigmas": {
         "name": "西格玛"
-      },
-      "latent_image": {
-        "name": "Latent图像"
       }
     },
     "outputs": {
@@ -11010,32 +13393,32 @@
   "SamplerDPMAdaptative": {
     "display_name": "DPMAdaptative采样器",
     "inputs": {
-      "order": {
-        "name": "order"
-      },
-      "rtol": {
-        "name": "rtol"
+      "accept_safety": {
+        "name": "accept_safety"
       },
       "atol": {
         "name": "atol"
       },
+      "dcoeff": {
+        "name": "dcoeff"
+      },
+      "eta": {
+        "name": "eta"
+      },
       "h_init": {
         "name": "h_init"
       },
-      "pcoeff": {
-        "name": "pcoeff"
-      },
       "icoeff": {
         "name": "icoeff"
       },
-      "dcoeff": {
-        "name": "dcoeff"
+      "order": {
+        "name": "order"
       },
-      "accept_safety": {
-        "name": "accept_safety"
+      "pcoeff": {
+        "name": "pcoeff"
       },
-      "eta": {
-        "name": "eta"
+      "rtol": {
+        "name": "rtol"
       },
       "s_noise": {
         "name": "s_noise"
@@ -11050,17 +13433,17 @@
   "SamplerDPMPP_2M_SDE": {
     "display_name": "DPMPP_2M_SDE采样器",
     "inputs": {
-      "solver_type": {
-        "name": "求解器类型"
-      },
       "eta": {
         "name": "eta"
       },
+      "noise_device": {
+        "name": "设备"
+      },
       "s_noise": {
         "name": "s_noise"
       },
-      "noise_device": {
-        "name": "设备"
+      "solver_type": {
+        "name": "求解器类型"
       }
     },
     "outputs": {
@@ -11091,11 +13474,11 @@
       "eta": {
         "name": "eta"
       },
-      "s_noise": {
-        "name": "s_noise"
-      },
       "noise_device": {
         "name": "设备"
+      },
+      "s_noise": {
+        "name": "s_noise"
       }
     },
     "outputs": {
@@ -11110,14 +13493,14 @@
       "eta": {
         "name": "eta"
       },
-      "s_noise": {
-        "name": "s_noise"
+      "noise_device": {
+        "name": "设备"
       },
       "r": {
         "name": "r"
       },
-      "noise_device": {
-        "name": "设备"
+      "s_noise": {
+        "name": "s_noise"
       }
     },
     "outputs": {
@@ -11129,18 +13512,18 @@
   "SamplerER_SDE": {
     "display_name": "ER_SDE采样器",
     "inputs": {
-      "solver_type": {
-        "name": "求解器"
-      },
-      "max_stage": {
-        "name": "最大阶段"
-      },
       "eta": {
         "name": "eta",
         "tooltip": "反向时间 SDE 的随机强度。\n当 eta=0 时，简化为确定性 ODE。此设置不适用于 ER-SDE 求解器类型。"
       },
+      "max_stage": {
+        "name": "最大阶段"
+      },
       "s_noise": {
         "name": "s_noise"
+      },
+      "solver_type": {
+        "name": "求解器"
       }
     },
     "outputs": {
@@ -11229,32 +13612,32 @@
   "SamplerSASolver": {
     "display_name": "SASolver采样器",
     "inputs": {
-      "model": {
-        "name": "模型"
+      "corrector_order": {
+        "name": "校正器阶数"
       },
       "eta": {
         "name": "eta"
       },
-      "sde_start_percent": {
-        "name": "SDE 起始百分比"
-      },
-      "sde_end_percent": {
-        "name": "SDE 结束百分比"
-      },
-      "s_noise": {
-        "name": "s_noise"
+      "model": {
+        "name": "模型"
       },
       "predictor_order": {
         "name": "预测器阶数"
       },
-      "corrector_order": {
-        "name": "校正器阶数"
+      "s_noise": {
+        "name": "s_noise"
       },
-      "use_pece": {
-        "name": "使用 PECE"
+      "sde_end_percent": {
+        "name": "SDE 结束百分比"
+      },
+      "sde_start_percent": {
+        "name": "SDE 起始百分比"
       },
       "simple_order_2": {
         "name": "简单二阶"
+      },
+      "use_pece": {
+        "name": "使用 PECE"
       }
     },
     "outputs": {
@@ -11264,23 +13647,23 @@
     }
   },
   "SamplerSEEDS2": {
-    "display_name": "SEEDS2采样器",
     "description": "该采样器节点可以表示多个采样器：\n\nseeds 2\n-默认设置\n\nexp_heun_2_x0\n- 求解器=phi 2, r=1.0, eta=0.0\n\nexp_heun_2_x0_sde\n- 求解器=phi 2, r=1.0, eta=1.0, s noise=1.0",
+    "display_name": "SEEDS2采样器",
     "inputs": {
-      "solver_type": {
-        "name": "求解器"
-      },
       "eta": {
         "name": "eta",
         "tooltip": "Stochastic strength"
       },
+      "r": {
+        "name": "r",
+        "tooltip": "Relative step size for the intermediate stage (c2 node)"
+      },
       "s_noise": {
         "name": "s_noise",
         "tooltip": "SDE noise multiplier"
       },
-      "r": {
-        "name": "r",
-        "tooltip": "Relative step size for the intermediate stage (c2 node)"
+      "solver_type": {
+        "name": "求解器"
       }
     },
     "outputs": {
@@ -11295,12 +13678,12 @@
       "model": {
         "name": "模型"
       },
-      "sampling_percent": {
-        "name": "采样百分比"
-      },
       "return_actual_sigma": {
         "name": "返回实际 sigma 值",
         "tooltip": "返回实际的 sigma 值而不是用于区间检查的值。\n这仅影响 0.0 和 1.0 处的结果。"
+      },
+      "sampling_percent": {
+        "name": "采样百分比"
       }
     },
     "outputs": {
@@ -11313,8 +13696,8 @@
   "SaveAnimatedPNG": {
     "display_name": "保存动画（APNG）",
     "inputs": {
-      "images": {
-        "name": "图片"
+      "compress_level": {
+        "name": "压缩级别"
       },
       "filename_prefix": {
         "name": "文件名前缀"
@@ -11322,31 +13705,31 @@
       "fps": {
         "name": "帧率"
       },
-      "compress_level": {
-        "name": "压缩级别"
+      "images": {
+        "name": "图片"
       }
     }
   },
   "SaveAnimatedWEBP": {
     "display_name": "保存动画（WEBP）",
     "inputs": {
-      "images": {
-        "name": "图片"
-      },
       "filename_prefix": {
         "name": "文件名前缀"
       },
       "fps": {
         "name": "帧率"
       },
+      "images": {
+        "name": "图片"
+      },
       "lossless": {
         "name": "无损"
       },
-      "quality": {
-        "name": "质量"
-      },
       "method": {
         "name": "方法"
+      },
+      "quality": {
+        "name": "质量"
       }
     }
   },
@@ -11356,11 +13739,11 @@
       "audio": {
         "name": "音频"
       },
-      "filename_prefix": {
-        "name": "文件名前缀"
-      },
       "audioUI": {
         "name": "音频UI"
+      },
+      "filename_prefix": {
+        "name": "文件名前缀"
       }
     }
   },
@@ -11370,14 +13753,14 @@
       "audio": {
         "name": "音频"
       },
+      "audioUI": {
+        "name": "audioUI"
+      },
       "filename_prefix": {
         "name": "文件名前缀"
       },
       "quality": {
         "name": "质量"
-      },
-      "audioUI": {
-        "name": "audioUI"
       }
     }
   },
@@ -11387,65 +13770,74 @@
       "audio": {
         "name": "音频"
       },
+      "audioUI": {
+        "name": "audioUI"
+      },
       "filename_prefix": {
         "name": "文件名前缀"
       },
       "quality": {
         "name": "质量"
-      },
-      "audioUI": {
-        "name": "audioUI"
       }
     }
   },
   "SaveGLB": {
     "display_name": "保存GLB",
     "inputs": {
-      "mesh": {
-        "name": "网格"
-      },
       "filename_prefix": {
         "name": "文件名前缀"
       },
       "image": {
         "name": "图像"
+      },
+      "mesh": {
+        "name": "网格",
+        "tooltip": "要保存的网格或GLB文件"
       }
     }
   },
   "SaveImage": {
-    "display_name": "保存图像",
     "description": "将输入图像保存到您的ComfyUI输出目录。",
+    "display_name": "保存图像",
     "inputs": {
-      "images": {
-        "name": "图片",
-        "tooltip": "要保存的图像。"
-      },
       "filename_prefix": {
         "name": "文件名前缀",
         "tooltip": "保存文件的文件名的前缀。可使用格式信息如 %date:yyyy-MM-dd% 或 %空Latent.width%，以包含来自工作流内的信息。"
+      },
+      "images": {
+        "name": "图片",
+        "tooltip": "要保存的图像。"
       }
     }
   },
   "SaveImageDataSetToFolder": {
     "display_name": "保存图像数据集",
     "inputs": {
-      "images": {
-        "name": "图像",
-        "tooltip": "需要保存的图像序列。"
+      "filename_prefix": {
+        "name": "文件名前缀",
+        "tooltip": "保存的图像的文件名前缀。"
       },
       "folder_name": {
         "name": "文件夹名",
         "tooltip": "保存训练数据集的文件夹名（在 输出 文件夹内）。"
       },
-      "filename_prefix": {
-        "name": "文件名前缀",
-        "tooltip": "保存的图像的文件名前缀。"
+      "images": {
+        "name": "图像",
+        "tooltip": "需要保存的图像序列。"
       }
     }
   },
   "SaveImageTextDataSetToFolder": {
     "display_name": "保存图像文本数据集",
     "inputs": {
+      "filename_prefix": {
+        "name": "文件名前缀",
+        "tooltip": "保存的图像的文件名前缀。"
+      },
+      "folder_name": {
+        "name": "文件夹名",
+        "tooltip": "保存训练数据集的文件夹名（在 输出 文件夹内）。"
+      },
       "images": {
         "name": "图像",
         "tooltip": "需要保存的图像序列。"
@@ -11453,14 +13845,6 @@
       "texts": {
         "name": "文本",
         "tooltip": "需要保存的标注文本序列。"
-      },
-      "folder_name": {
-        "name": "文件夹名",
-        "tooltip": "保存训练数据集的文件夹名（在 输出 文件夹内）。"
-      },
-      "filename_prefix": {
-        "name": "文件名前缀",
-        "tooltip": "保存的图像的文件名前缀。"
       }
     }
   },
@@ -11475,11 +13859,11 @@
   "SaveLatent": {
     "display_name": "保存Latent",
     "inputs": {
-      "samples": {
-        "name": "Latent"
-      },
       "filename_prefix": {
         "name": "文件名前缀"
+      },
+      "samples": {
+        "name": "Latent"
       }
     }
   },
@@ -11501,25 +13885,21 @@
     }
   },
   "SaveSVGNode": {
-    "display_name": "保存SVG",
     "description": "在磁盘上保存 SVG 文件。",
+    "display_name": "保存SVG",
     "inputs": {
-      "svg": {
-        "name": "svg"
-      },
       "filename_prefix": {
         "name": "文件名前缀",
         "tooltip": "保存文件的前缀。可包含格式化信息，如 %date:yyyy-MM-dd% 或 %Empty Latent Image.width% 以包含节点中的值。"
+      },
+      "svg": {
+        "name": "svg"
       }
     }
   },
   "SaveTrainingDataset": {
     "display_name": "保存训练数据集",
     "inputs": {
-      "latents": {
-        "name": "Latent",
-        "tooltip": "制作训练数据集 节点输出的 Latent 字典"
-      },
       "conditioning": {
         "name": "条件",
         "tooltip": "制作训练数据集 节点输出的条件字典"
@@ -11528,6 +13908,10 @@
         "name": "文件夹名",
         "tooltip": "包含训练数据集的文件夹名（在 输出 文件夹内）。"
       },
+      "latents": {
+        "name": "Latent",
+        "tooltip": "制作训练数据集 节点输出的 Latent 字典"
+      },
       "shard_size": {
         "name": "shard_size",
         "tooltip": "Number of samples per shard file."
@@ -11535,12 +13919,12 @@
     }
   },
   "SaveVideo": {
-    "display_name": "保存视频",
     "description": "将输入图像保存到您的 ComfyUI 输出目录。",
+    "display_name": "保存视频",
     "inputs": {
-      "video": {
-        "name": "视频",
-        "tooltip": "要保存的视频。"
+      "codec": {
+        "name": "编码器",
+        "tooltip": "用于视频的编码器。"
       },
       "filename_prefix": {
         "name": "文件名前缀",
@@ -11550,110 +13934,57 @@
         "name": "格式",
         "tooltip": "保存视频的格式。"
       },
-      "codec": {
-        "name": "编码器",
-        "tooltip": "用于视频的编码器。"
+      "video": {
+        "name": "视频",
+        "tooltip": "要保存的视频。"
       }
     }
   },
   "SaveWEBM": {
     "display_name": "保存WEBM",
     "inputs": {
-      "images": {
-        "name": "图像"
-      },
-      "filename_prefix": {
-        "name": "文件名前缀"
-      },
       "codec": {
         "name": "编解码器"
       },
-      "fps": {
-        "name": "帧率"
-      },
       "crf": {
         "name": "crf",
         "tooltip": "更高的crf意味着更低的质量和更小的文件大小，更低的crf意味着更高的质量和更大的文件大小。"
+      },
+      "filename_prefix": {
+        "name": "文件名前缀"
+      },
+      "fps": {
+        "name": "帧率"
+      },
+      "images": {
+        "name": "图像"
       }
     }
   },
   "ScaleROPE": {
-    "display_name": "缩放ROPE",
     "description": "缩放和偏移模型的ROPE。",
+    "display_name": "缩放ROPE",
     "inputs": {
       "model": {
         "name": "模型"
       },
-      "scale_x": {
-        "name": "scale_x"
-      },
-      "shift_x": {
-        "name": "shift_x"
-      },
-      "scale_y": {
-        "name": "scale_y"
-      },
-      "shift_y": {
-        "name": "shift_y"
-      },
       "scale_t": {
         "name": "scale_t"
       },
+      "scale_x": {
+        "name": "scale_x"
+      },
+      "scale_y": {
+        "name": "scale_y"
+      },
       "shift_t": {
         "name": "shift_t"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "SD_4XUpscale_Conditioning": {
-    "display_name": "SD_4X放大条件",
-    "inputs": {
-      "images": {
-        "name": "图片"
       },
-      "positive": {
-        "name": "正面条件"
+      "shift_x": {
+        "name": "shift_x"
       },
-      "negative": {
-        "name": "负面条件"
-      },
-      "scale_ratio": {
-        "name": "缩放比例"
-      },
-      "noise_augmentation": {
-        "name": "噪波增强"
-      }
-    },
-    "outputs": {
-      "0": {
-        "name": "正面条件",
-        "tooltip": null
-      },
-      "1": {
-        "name": "负面条件",
-        "tooltip": null
-      },
-      "2": {
-        "name": "Latent",
-        "tooltip": null
-      }
-    }
-  },
-  "SDTurboScheduler": {
-    "display_name": "SDTurbo调度器",
-    "inputs": {
-      "model": {
-        "name": "模型"
-      },
-      "steps": {
-        "name": "步数"
-      },
-      "denoise": {
-        "name": "降噪"
+      "shift_y": {
+        "name": "shift_y"
       }
     },
     "outputs": {
@@ -11665,14 +13996,14 @@
   "SelfAttentionGuidance": {
     "display_name": "SAG自注意力引导",
     "inputs": {
+      "blur_sigma": {
+        "name": "模糊Sigma"
+      },
       "model": {
         "name": "模型"
       },
       "scale": {
         "name": "缩放"
-      },
-      "blur_sigma": {
-        "name": "模糊Sigma"
       }
     },
     "outputs": {
@@ -11684,28 +14015,28 @@
   "SetClipHooks": {
     "display_name": "设置CLIP约束",
     "inputs": {
-      "clip": {
-        "name": "clip"
-      },
       "apply_to_conds": {
         "name": "应用于条件"
       },
-      "schedule_clip": {
-        "name": "安排clip"
+      "clip": {
+        "name": "clip"
       },
       "hooks": {
         "name": "约束"
+      },
+      "schedule_clip": {
+        "name": "安排clip"
       }
     }
   },
   "SetFirstSigma": {
     "display_name": "设置第一个Sigma",
     "inputs": {
-      "sigmas": {
-        "name": "sigmas"
-      },
       "sigma": {
         "name": "sigma"
+      },
+      "sigmas": {
+        "name": "sigmas"
       }
     },
     "outputs": {
@@ -11717,22 +14048,22 @@
   "SetHookKeyframes": {
     "display_name": "设置约束关键帧",
     "inputs": {
-      "hooks": {
-        "name": "约束"
-      },
       "hook_kf": {
         "name": "约束关键帧"
+      },
+      "hooks": {
+        "name": "约束"
       }
     }
   },
   "SetLatentNoiseMask": {
     "display_name": "设置Latent噪波遮罩",
     "inputs": {
-      "samples": {
-        "name": "Latent"
-      },
       "mask": {
         "name": "遮罩"
+      },
+      "samples": {
+        "name": "Latent"
       }
     }
   },
@@ -11755,6 +14086,9 @@
   "ShuffleDataset": {
     "display_name": "打乱图像数据集",
     "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
       "images": {
         "name": "图像",
         "tooltip": "需要处理的图像序列。"
@@ -11762,9 +14096,6 @@
       "seed": {
         "name": "随机种",
         "tooltip": "随机种"
-      },
-      "control_after_generate": {
-        "name": "生成后控制"
       }
     },
     "outputs": {
@@ -11777,20 +14108,20 @@
   "ShuffleImageTextDataset": {
     "display_name": "打乱图像文本数据集",
     "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
       "images": {
         "name": "图像",
         "tooltip": "需要打乱的图像序列。"
       },
-      "texts": {
-        "name": "文本",
-        "tooltip": "需要打乱的文本序列"
-      },
       "seed": {
         "name": "随机种",
         "tooltip": "随机种"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "texts": {
+        "name": "文本",
+        "tooltip": "需要打乱的文本序列"
       }
     },
     "outputs": {
@@ -11805,29 +14136,29 @@
     }
   },
   "SkipLayerGuidanceDiT": {
-    "display_name": "跳过层引导（DiT）",
     "description": "通用的跳过层引导节点，可用于每个DiT模型。",
+    "display_name": "跳过层引导（DiT）",
     "inputs": {
-      "model": {
-        "name": "模型"
-      },
       "double_layers": {
         "name": "双层"
       },
-      "single_layers": {
-        "name": "单层"
-      },
-      "scale": {
-        "name": "缩放"
-      },
-      "start_percent": {
-        "name": "开始百分比"
-      },
       "end_percent": {
         "name": "结束百分比"
       },
+      "model": {
+        "name": "模型"
+      },
       "rescaling_scale": {
         "name": "重新缩放比例"
+      },
+      "scale": {
+        "name": "缩放"
+      },
+      "single_layers": {
+        "name": "单层"
+      },
+      "start_percent": {
+        "name": "开始百分比"
       }
     },
     "outputs": {
@@ -11837,23 +14168,23 @@
     }
   },
   "SkipLayerGuidanceDiTSimple": {
-    "display_name": "跳过层引导（DiT简化）",
     "description": "跳过层引导（DiT）节点的简化版本，仅修改无条件传递。",
+    "display_name": "跳过层引导（DiT简化）",
     "inputs": {
-      "model": {
-        "name": "模型"
-      },
       "double_layers": {
         "name": "双层"
       },
+      "end_percent": {
+        "name": "结束百分比"
+      },
+      "model": {
+        "name": "模型"
+      },
       "single_layers": {
         "name": "单层"
       },
       "start_percent": {
         "name": "开始百分比"
-      },
-      "end_percent": {
-        "name": "结束百分比"
       }
     },
     "outputs": {
@@ -11863,23 +14194,23 @@
     }
   },
   "SkipLayerGuidanceSD3": {
-    "display_name": "跳过层引导（SD3）",
     "description": "通用版本的跳过层引导节点，可用于每个DiT模型。",
+    "display_name": "跳过层引导（SD3）",
     "inputs": {
-      "model": {
-        "name": "模型"
+      "end_percent": {
+        "name": "结束百分比"
       },
       "layers": {
         "name": "层"
       },
+      "model": {
+        "name": "模型"
+      },
       "scale": {
         "name": "缩放"
       },
       "start_percent": {
         "name": "开始百分比"
-      },
-      "end_percent": {
-        "name": "结束百分比"
       }
     },
     "outputs": {
@@ -11891,14 +14222,14 @@
   "SolidMask": {
     "display_name": "纯块遮罩",
     "inputs": {
+      "height": {
+        "name": "高度"
+      },
       "value": {
         "name": "明度"
       },
       "width": {
         "name": "宽度"
-      },
-      "height": {
-        "name": "高度"
       }
     },
     "outputs": {
@@ -11908,8 +14239,8 @@
     }
   },
   "SplitAudioChannels": {
-    "display_name": "分离音频通道",
     "description": "将音频分离为左右声道。",
+    "display_name": "分离音频通道",
     "inputs": {
       "audio": {
         "name": "音频"
@@ -11926,6 +14257,29 @@
       }
     }
   },
+  "SplitImageToTileList": {
+    "description": "将图像拆分为带有指定重叠的批量图块列表。",
+    "display_name": "将图像拆分为图块列表",
+    "inputs": {
+      "image": {
+        "name": "image"
+      },
+      "overlap": {
+        "name": "overlap"
+      },
+      "tile_height": {
+        "name": "tile_height"
+      },
+      "tile_width": {
+        "name": "tile_width"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "SplitImageWithAlpha": {
     "display_name": "分离图像Alpha",
     "inputs": {
@@ -11966,11 +14320,11 @@
   "SplitSigmasDenoise": {
     "display_name": "分离Sigma降噪",
     "inputs": {
-      "sigmas": {
-        "name": "Sigmas"
-      },
       "denoise": {
         "name": "降噪"
+      },
+      "sigmas": {
+        "name": "Sigmas"
       }
     },
     "outputs": {
@@ -11985,23 +14339,32 @@
     }
   },
   "StabilityAudioInpaint": {
-    "display_name": "Stability AI 音频重绘",
     "description": "使用文本指令转换现有音频样本的部分内容。",
+    "display_name": "Stability AI 音频重绘",
     "inputs": {
+      "audio": {
+        "name": "音频",
+        "tooltip": "音频长度必须在6到190秒之间。"
+      },
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "duration": {
+        "name": "时长",
+        "tooltip": "控制生成音频的时长（秒）。"
+      },
+      "mask_end": {
+        "name": "结束遮罩"
+      },
+      "mask_start": {
+        "name": "开始遮罩"
+      },
       "model": {
         "name": "模型"
       },
       "prompt": {
         "name": "提示词"
       },
-      "audio": {
-        "name": "音频",
-        "tooltip": "音频长度必须在6到190秒之间。"
-      },
-      "duration": {
-        "name": "时长",
-        "tooltip": "控制生成音频的时长（秒）。"
-      },
       "seed": {
         "name": "随机种",
         "tooltip": "用于生成的随机种子。"
@@ -12009,15 +14372,6 @@
       "steps": {
         "name": "步数",
         "tooltip": "控制采样步数。"
-      },
-      "mask_start": {
-        "name": "开始遮罩"
-      },
-      "mask_end": {
-        "name": "结束遮罩"
-      },
-      "control_after_generate": {
-        "name": "生成后控制"
       }
     },
     "outputs": {
@@ -12027,23 +14381,26 @@
     }
   },
   "StabilityAudioToAudio": {
-    "display_name": "Stability AI 音频到音频",
     "description": "使用文本指令将现有音频样本转换为新的高质量作品。",
+    "display_name": "Stability AI 音频到音频",
     "inputs": {
+      "audio": {
+        "name": "音频",
+        "tooltip": "音频长度必须在6到190秒之间。"
+      },
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "duration": {
+        "name": "时长",
+        "tooltip": "控制生成音频的时长（秒）。"
+      },
       "model": {
         "name": "模型"
       },
       "prompt": {
         "name": "提示词"
       },
-      "audio": {
-        "name": "音频",
-        "tooltip": "音频长度必须在6到190秒之间。"
-      },
-      "duration": {
-        "name": "时长",
-        "tooltip": "控制生成音频的时长（秒）。"
-      },
       "seed": {
         "name": "随机种",
         "tooltip": "用于生成的随机种子。"
@@ -12055,9 +14412,6 @@
       "strength": {
         "name": "强度",
         "tooltip": "参数控制音频参数对生成音频的影响程度。"
-      },
-      "control_after_generate": {
-        "name": "生成后控制"
       }
     },
     "outputs": {
@@ -12067,45 +14421,45 @@
     }
   },
   "StabilityStableImageSD_3_5Node": {
-    "display_name": "Stability AI Stable Diffusion 3.5 图像",
     "description": "根据提示词和分辨率同步生成图像。",
+    "display_name": "Stability AI Stable Diffusion 3.5 图像",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "你希望在输出图像中看到的内容。强有力且描述清晰的提示词，能够明确定义元素、颜色和主题，将带来更好的结果。"
-      },
-      "model": {
-        "name": "模型"
-      },
       "aspect_ratio": {
         "name": "宽高比",
         "tooltip": "生成图像的宽高比。"
       },
-      "style_preset": {
-        "name": "风格预设",
-        "tooltip": "可选，生成图像的期望风格。"
-      },
       "cfg_scale": {
         "name": "CFG",
         "tooltip": "扩散过程对提示词文本的遵循程度（数值越高，生成的图像越接近你的提示词）"
       },
-      "seed": {
-        "name": "随机种",
-        "tooltip": "用于生成噪声的随机种子。"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "image": {
         "name": "图像"
       },
-      "negative_prompt": {
-        "name": "负面提示词",
-        "tooltip": "你不希望在输出图像中出现的关键词。此为高级功能。"
-      },
       "image_denoise": {
         "name": "图像降噪",
         "tooltip": "输入图像的去噪程度；0.0 表示与输入图像完全相同，1.0 表示完全不使用输入图像。"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "model": {
+        "name": "模型"
+      },
+      "negative_prompt": {
+        "name": "负面提示词",
+        "tooltip": "你不希望在输出图像中出现的关键词。此为高级功能。"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "你希望在输出图像中看到的内容。强有力且描述清晰的提示词，能够明确定义元素、颜色和主题，将带来更好的结果。"
+      },
+      "seed": {
+        "name": "随机种",
+        "tooltip": "用于生成噪声的随机种子。"
+      },
+      "style_preset": {
+        "name": "风格预设",
+        "tooltip": "可选，生成图像的期望风格。"
       }
     },
     "outputs": {
@@ -12115,38 +14469,38 @@
     }
   },
   "StabilityStableImageUltraNode": {
-    "display_name": "Stability AI Stable 图像 Ultra",
     "description": "根据提示词和分辨率同步生成图像。",
+    "display_name": "Stability AI Stable 图像 Ultra",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "你希望在输出图像中看到的内容。一个强有力且描述清晰的提示词，能够明确界定元素、颜色和主题，将带来更好的结果。要控制某个词的权重，请使用格式 `(word:weight)`，其中 `word` 是你想要控制权重的词，`weight` 是介于 0 到 1 之间的数值。例如：`The sky was a crisp (blue:0.3) and (green:0.8)` 表示天空是蓝色和绿色，但绿色多于蓝色。"
-      },
       "aspect_ratio": {
         "name": "宽高比",
         "tooltip": "生成图像的宽高比。"
       },
-      "style_preset": {
-        "name": "风格预设",
-        "tooltip": "可选的生成图像风格。"
-      },
-      "seed": {
-        "name": "随机种",
-        "tooltip": "用于生成噪声的随机种子。"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "image": {
         "name": "图像"
       },
-      "negative_prompt": {
-        "name": "负面提示词",
-        "tooltip": "描述你不希望在输出图像中出现内容的文本。这是一个高级功能。"
-      },
       "image_denoise": {
         "name": "降噪",
         "tooltip": "输入图像的去噪强度；0.0 表示与输入图像完全相同，1.0 表示完全不参考输入图像。"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "negative_prompt": {
+        "name": "负面提示词",
+        "tooltip": "描述你不希望在输出图像中出现内容的文本。这是一个高级功能。"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "你希望在输出图像中看到的内容。一个强有力且描述清晰的提示词，能够明确界定元素、颜色和主题，将带来更好的结果。要控制某个词的权重，请使用格式 `(word:weight)`，其中 `word` 是你想要控制权重的词，`weight` 是介于 0 到 1 之间的数值。例如：`The sky was a crisp (blue:0.3) and (green:0.8)` 表示天空是蓝色和绿色，但绿色多于蓝色。"
+      },
+      "seed": {
+        "name": "随机种",
+        "tooltip": "用于生成噪声的随机种子。"
+      },
+      "style_preset": {
+        "name": "风格预设",
+        "tooltip": "可选的生成图像风格。"
       }
     },
     "outputs": {
@@ -12156,19 +14510,22 @@
     }
   },
   "StabilityTextToAudio": {
-    "display_name": "Stability AI 文本转音频",
     "description": "根据文本描述生成高质量音乐和音效。",
+    "display_name": "Stability AI 文本转音频",
     "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "duration": {
+        "name": "时长",
+        "tooltip": "控制生成音频的时长（秒）。"
+      },
       "model": {
         "name": "模型"
       },
       "prompt": {
         "name": "提示词"
       },
-      "duration": {
-        "name": "时长",
-        "tooltip": "控制生成音频的时长（秒）。"
-      },
       "seed": {
         "name": "种子",
         "tooltip": "用于生成的随机种子。"
@@ -12176,9 +14533,6 @@
       "steps": {
         "name": "步数",
         "tooltip": "控制采样步数。"
-      },
-      "control_after_generate": {
-        "name": "生成后控制"
       }
     },
     "outputs": {
@@ -12188,30 +14542,30 @@
     }
   },
   "StabilityUpscaleConservativeNode": {
-    "display_name": "Stability AI 保守放大",
     "description": "以最小改动将图像放大至 4K 分辨率。",
+    "display_name": "Stability AI 保守放大",
     "inputs": {
-      "image": {
-        "name": "图像"
-      },
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "你希望在输出图像中看到什么。强有力且描述清晰的提示词，能更好地定义元素、颜色和主题，从而获得更佳效果。"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "creativity": {
         "name": "创造性",
         "tooltip": "控制生成与初始图像不强相关的额外细节的可能性。"
       },
-      "seed": {
-        "name": "种子",
-        "tooltip": "用于生成噪声的随机种子。"
+      "image": {
+        "name": "图像"
       },
       "negative_prompt": {
         "name": "反向提示词",
         "tooltip": "你不希望在输出图像中出现的关键词。此为高级功能。"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "你希望在输出图像中看到什么。强有力且描述清晰的提示词，能更好地定义元素、颜色和主题，从而获得更佳效果。"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "用于生成噪声的随机种子。"
       }
     },
     "outputs": {
@@ -12221,34 +14575,34 @@
     }
   },
   "StabilityUpscaleCreativeNode": {
-    "display_name": "Stability AI 创意放大",
     "description": "以最小改动将图像放大至4K分辨率。",
+    "display_name": "Stability AI 创意放大",
     "inputs": {
-      "image": {
-        "name": "图像"
-      },
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "你希望在输出图像中看到什么。强有力且描述清晰的提示词，明确元素、颜色和主题，将获得更好的结果。"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "creativity": {
         "name": "创造性",
         "tooltip": "控制生成不受初始图像强烈约束的额外细节的可能性。"
       },
-      "style_preset": {
-        "name": "风格预设",
-        "tooltip": "可选，生成图像的期望风格。"
-      },
-      "seed": {
-        "name": "随机种子",
-        "tooltip": "用于生成噪声的随机种子。"
+      "image": {
+        "name": "图像"
       },
       "negative_prompt": {
         "name": "反向提示词",
         "tooltip": "你不希望在输出图像中出现的关键词。此为高级功能。"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "你希望在输出图像中看到什么。强有力且描述清晰的提示词，明确元素、颜色和主题，将获得更好的结果。"
+      },
+      "seed": {
+        "name": "随机种子",
+        "tooltip": "用于生成噪声的随机种子。"
+      },
+      "style_preset": {
+        "name": "风格预设",
+        "tooltip": "可选，生成图像的期望风格。"
       }
     },
     "outputs": {
@@ -12258,8 +14612,8 @@
     }
   },
   "StabilityUpscaleFastNode": {
-    "display_name": "Stability AI 极速放大",
     "description": "通过 Stability API 快速将图像放大至原始尺寸的 4 倍；适用于低质量或压缩图像的放大。",
+    "display_name": "Stability AI 极速放大",
     "inputs": {
       "image": {
         "name": "图像"
@@ -12274,17 +14628,17 @@
   "StableCascade_EmptyLatentImage": {
     "display_name": "空Latent图像（Stable Cascade）",
     "inputs": {
-      "width": {
-        "name": "宽度"
-      },
-      "height": {
-        "name": "高度"
+      "batch_size": {
+        "name": "批量大小"
       },
       "compression": {
         "name": "压缩"
       },
-      "batch_size": {
-        "name": "批量大小"
+      "height": {
+        "name": "高度"
+      },
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -12317,14 +14671,14 @@
   "StableCascade_StageC_VAEEncode": {
     "display_name": "Stable Cascade_C阶段_VAE编码",
     "inputs": {
+      "compression": {
+        "name": "压缩"
+      },
       "image": {
         "name": "图像"
       },
       "vae": {
         "name": "vae"
-      },
-      "compression": {
-        "name": "压缩"
       }
     },
     "outputs": {
@@ -12366,9 +14720,21 @@
   "StableZero123_Conditioning": {
     "display_name": "StableZero123条件",
     "inputs": {
+      "azimuth": {
+        "name": "方位角"
+      },
+      "batch_size": {
+        "name": "批量大小"
+      },
       "clip_vision": {
         "name": "clip视觉"
       },
+      "elevation": {
+        "name": "俯仰角"
+      },
+      "height": {
+        "name": "高度"
+      },
       "init_image": {
         "name": "初始图像"
       },
@@ -12377,18 +14743,6 @@
       },
       "width": {
         "name": "宽度"
-      },
-      "height": {
-        "name": "高度"
-      },
-      "batch_size": {
-        "name": "批量大小"
-      },
-      "elevation": {
-        "name": "俯仰角"
-      },
-      "azimuth": {
-        "name": "方位角"
       }
     },
     "outputs": {
@@ -12409,9 +14763,27 @@
   "StableZero123_Conditioning_Batched": {
     "display_name": "StableZero123条件_批处理",
     "inputs": {
+      "azimuth": {
+        "name": "方位角"
+      },
+      "azimuth_batch_increment": {
+        "name": "方位角增量"
+      },
+      "batch_size": {
+        "name": "批量大小"
+      },
       "clip_vision": {
         "name": "clip视觉"
       },
+      "elevation": {
+        "name": "俯仰角"
+      },
+      "elevation_batch_increment": {
+        "name": "俯仰角增量"
+      },
+      "height": {
+        "name": "高度"
+      },
       "init_image": {
         "name": "初始图像"
       },
@@ -12420,24 +14792,6 @@
       },
       "width": {
         "name": "宽度"
-      },
-      "height": {
-        "name": "高度"
-      },
-      "batch_size": {
-        "name": "批量大小"
-      },
-      "elevation": {
-        "name": "俯仰角"
-      },
-      "azimuth": {
-        "name": "方位角"
-      },
-      "elevation_batch_increment": {
-        "name": "俯仰角增量"
-      },
-      "azimuth_batch_increment": {
-        "name": "方位角增量"
       }
     },
     "outputs": {
@@ -12458,17 +14812,17 @@
   "StringCompare": {
     "display_name": "比较",
     "inputs": {
+      "case_sensitive": {
+        "name": "区分大小写"
+      },
+      "mode": {
+        "name": "模式"
+      },
       "string_a": {
         "name": "字符串A"
       },
       "string_b": {
         "name": "字符串B"
-      },
-      "mode": {
-        "name": "模式"
-      },
-      "case_sensitive": {
-        "name": "区分大小写"
       }
     },
     "outputs": {
@@ -12480,14 +14834,14 @@
   "StringConcatenate": {
     "display_name": "连接",
     "inputs": {
+      "delimiter": {
+        "name": "分隔符"
+      },
       "string_a": {
         "name": "字符串A"
       },
       "string_b": {
         "name": "字符串B"
-      },
-      "delimiter": {
-        "name": "分隔符"
       }
     },
     "outputs": {
@@ -12499,14 +14853,14 @@
   "StringContains": {
     "display_name": "包含",
     "inputs": {
+      "case_sensitive": {
+        "name": "区分大小写"
+      },
       "string": {
         "name": "字符串"
       },
       "substring": {
         "name": "子字符串"
-      },
-      "case_sensitive": {
-        "name": "区分大小写"
       }
     },
     "outputs": {
@@ -12533,14 +14887,14 @@
   "StringReplace": {
     "display_name": "替换",
     "inputs": {
-      "string": {
-        "name": "字符串"
-      },
       "find": {
         "name": "查找"
       },
       "replace": {
         "name": "替换"
+      },
+      "string": {
+        "name": "字符串"
       }
     },
     "outputs": {
@@ -12552,14 +14906,14 @@
   "StringSubstring": {
     "display_name": "子字符串",
     "inputs": {
-      "string": {
-        "name": "字符串"
+      "end": {
+        "name": "结束"
       },
       "start": {
         "name": "起始"
       },
-      "end": {
-        "name": "结束"
+      "string": {
+        "name": "字符串"
       }
     },
     "outputs": {
@@ -12571,11 +14925,11 @@
   "StringTrim": {
     "display_name": "修剪",
     "inputs": {
-      "string": {
-        "name": "字符串"
-      },
       "mode": {
         "name": "模式"
+      },
+      "string": {
+        "name": "字符串"
       }
     },
     "outputs": {
@@ -12602,20 +14956,20 @@
   "StyleModelApply": {
     "display_name": "应用风格模型",
     "inputs": {
-      "conditioning": {
-        "name": "条件"
-      },
-      "style_model": {
-        "name": "风格模型"
-      },
       "clip_vision_output": {
         "name": "clip视觉输出"
       },
+      "conditioning": {
+        "name": "条件"
+      },
       "strength": {
         "name": "强度"
       },
       "strength_type": {
         "name": "强度类型"
+      },
+      "style_model": {
+        "name": "风格模型"
       }
     }
   },
@@ -12627,100 +14981,17 @@
       }
     }
   },
-  "SV3D_Conditioning": {
-    "display_name": "SV3D条件",
-    "inputs": {
-      "clip_vision": {
-        "name": "clip视觉"
-      },
-      "init_image": {
-        "name": "初始图像"
-      },
-      "vae": {
-        "name": "vae"
-      },
-      "width": {
-        "name": "宽度"
-      },
-      "height": {
-        "name": "高度"
-      },
-      "video_frames": {
-        "name": "帧数"
-      },
-      "elevation": {
-        "name": "俯仰角"
-      }
-    },
-    "outputs": {
-      "0": {
-        "name": "正面条件",
-        "tooltip": null
-      },
-      "1": {
-        "name": "负面条件",
-        "tooltip": null
-      },
-      "2": {
-        "name": "Latent",
-        "tooltip": null
-      }
-    }
-  },
-  "SVD_img2vid_Conditioning": {
-    "display_name": "SVD_img2vid条件",
-    "inputs": {
-      "clip_vision": {
-        "name": "clip视觉"
-      },
-      "init_image": {
-        "name": "初始图像"
-      },
-      "vae": {
-        "name": "vae"
-      },
-      "width": {
-        "name": "宽度"
-      },
-      "height": {
-        "name": "高度"
-      },
-      "video_frames": {
-        "name": "帧数"
-      },
-      "motion_bucket_id": {
-        "name": "动态bucketID"
-      },
-      "fps": {
-        "name": "帧率"
-      },
-      "augmentation_level": {
-        "name": "增强"
-      }
-    },
-    "outputs": {
-      "0": {
-        "name": "正面条件"
-      },
-      "1": {
-        "name": "负面条件"
-      },
-      "2": {
-        "name": "Latent"
-      }
-    }
-  },
   "T5TokenizerOptions": {
     "display_name": "T5Tokenizer设置",
     "inputs": {
       "clip": {
         "name": "clip"
       },
-      "min_padding": {
-        "name": "最小填充"
-      },
       "min_length": {
         "name": "最小长度"
+      },
+      "min_padding": {
+        "name": "最小填充"
       }
     },
     "outputs": {
@@ -12730,8 +15001,8 @@
     }
   },
   "TCFG": {
-    "display_name": "切向阻尼CFG",
     "description": "TCFG – 切向阻尼CFG (2503.18137)\n\n优化无条件（负向）以与有条件（正向）对齐，从而提高质量。",
+    "display_name": "切向阻尼CFG",
     "inputs": {
       "model": {
         "name": "模型"
@@ -12745,8 +15016,8 @@
     }
   },
   "TemporalScoreRescaling": {
-    "display_name": "TSR - 时序分数重缩放",
     "description": "[后CFG函数]\nTSR - 时序分数重缩放 (2510.01184)\n\n重缩放模型的分数或噪声以引导采样多样性。",
+    "display_name": "TSR - 时序分数重缩放",
     "inputs": {
       "model": {
         "name": "模型"
@@ -12767,20 +15038,196 @@
       }
     }
   },
+  "Tencent3DPartNode": {
+    "description": "根据模型结构自动进行组件识别与生成。",
+    "display_name": "Hunyuan3D：3D部件",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "model_3d": {
+        "name": "model_3d",
+        "tooltip": "FBX格式的3D模型。模型面数应少于30000。"
+      },
+      "seed": {
+        "name": "seed",
+        "tooltip": "Seed用于控制节点是否重新运行；无论seed如何，结果都是非确定性的。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "FBX",
+        "tooltip": null
+      }
+    }
+  },
+  "TencentImageToModelNode": {
+    "display_name": "Hunyuan3D：图像转模型（专业版）",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "face_count": {
+        "name": "面数"
+      },
+      "generate_type": {
+        "name": "生成类型"
+      },
+      "generate_type_pbr": {
+        "name": "PBR"
+      },
+      "image": {
+        "name": "图像"
+      },
+      "image_back": {
+        "name": "背面图像"
+      },
+      "image_left": {
+        "name": "左侧图像"
+      },
+      "image_right": {
+        "name": "右侧图像"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "LowPoly 选项在 `3.1` 模型中不可用。"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "种子控制节点是否重新运行；无论种子如何，结果都是非确定性的。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "模型文件",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "OBJ",
+        "tooltip": null
+      }
+    }
+  },
+  "TencentTextToModelNode": {
+    "display_name": "Hunyuan3D：文本转模型（专业版）",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "face_count": {
+        "name": "面数"
+      },
+      "generate_type": {
+        "name": "生成类型"
+      },
+      "generate_type_pbr": {
+        "name": "PBR"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "LowPoly 选项在 `3.1` 模型中不可用。"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "支持最多 1024 个字符。"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "种子控制节点是否重新运行；无论种子如何，结果都是非确定性的。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "模型文件",
+        "tooltip": null
+      },
+      "1": {
+        "name": "GLB",
+        "tooltip": null
+      },
+      "2": {
+        "name": "OBJ",
+        "tooltip": null
+      }
+    }
+  },
   "TextEncodeAceStepAudio": {
     "display_name": "文本音频编码（AceStep）",
     "inputs": {
       "clip": {
         "name": "clip"
       },
-      "tags": {
-        "name": "标签"
-      },
       "lyrics": {
         "name": "歌词"
       },
       "lyrics_strength": {
         "name": "歌词强度"
+      },
+      "tags": {
+        "name": "标签"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TextEncodeAceStepAudio1_5": {
+    "display_name": "TextEncodeAceStepAudio1.5",
+    "inputs": {
+      "bpm": {
+        "name": "每分钟节拍数"
+      },
+      "cfg_scale": {
+        "name": "cfg_scale"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "duration": {
+        "name": "时长"
+      },
+      "generate_audio_codes": {
+        "name": "生成音频代码",
+        "tooltip": "启用生成音频代码的LLM。这可能较慢，但会提升生成音频的质量。如果你为模型提供了音频参考，请关闭此选项。"
+      },
+      "keyscale": {
+        "name": "调式"
+      },
+      "language": {
+        "name": "语言"
+      },
+      "lyrics": {
+        "name": "歌词"
+      },
+      "min_p": {
+        "name": "最小 p"
+      },
+      "seed": {
+        "name": "种子"
+      },
+      "tags": {
+        "name": "标签"
+      },
+      "temperature": {
+        "name": "temperature"
+      },
+      "timesignature": {
+        "name": "拍号"
+      },
+      "top_k": {
+        "name": "top_k"
+      },
+      "top_p": {
+        "name": "top_p"
       }
     },
     "outputs": {
@@ -12798,12 +15245,12 @@
       "clip_vision_output": {
         "name": "clip视觉输出"
       },
-      "prompt": {
-        "name": "提示"
-      },
       "image_interleave": {
         "name": "图像交错",
         "tooltip": "图像与文本提示的影响程度。数字越高，文本提示的影响越大。"
+      },
+      "prompt": {
+        "name": "提示"
       }
     },
     "outputs": {
@@ -12818,14 +15265,14 @@
       "clip": {
         "name": "clip"
       },
+      "image": {
+        "name": "图像"
+      },
       "prompt": {
         "name": "提示词"
       },
       "vae": {
         "name": "vae"
-      },
-      "image": {
-        "name": "图像"
       }
     },
     "outputs": {
@@ -12840,12 +15287,6 @@
       "clip": {
         "name": "clip"
       },
-      "prompt": {
-        "name": "提示词"
-      },
-      "vae": {
-        "name": "vae"
-      },
       "image1": {
         "name": "图像1"
       },
@@ -12854,6 +15295,12 @@
       },
       "image3": {
         "name": "图像3"
+      },
+      "prompt": {
+        "name": "提示词"
+      },
+      "vae": {
+        "name": "vae"
       }
     },
     "outputs": {
@@ -12862,6 +15309,128 @@
       }
     }
   },
+  "TextEncodeZImageOmni": {
+    "display_name": "TextEncodeZImageOmni",
+    "inputs": {
+      "auto_resize_images": {
+        "name": "auto_resize_images"
+      },
+      "clip": {
+        "name": "clip"
+      },
+      "image1": {
+        "name": "image1"
+      },
+      "image2": {
+        "name": "image2"
+      },
+      "image3": {
+        "name": "image3"
+      },
+      "image_encoder": {
+        "name": "image_encoder"
+      },
+      "prompt": {
+        "name": "prompt"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "TextGenerate": {
+    "display_name": "TextGenerate",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image": {
+        "name": "图像"
+      },
+      "max_length": {
+        "name": "最大长度"
+      },
+      "prompt": {
+        "name": "提示词"
+      },
+      "sampling_mode": {
+        "name": "采样模式"
+      },
+      "sampling_mode_min_p": {
+        "name": "最小概率"
+      },
+      "sampling_mode_repetition_penalty": {
+        "name": "重复惩罚"
+      },
+      "sampling_mode_seed": {
+        "name": "种子"
+      },
+      "sampling_mode_temperature": {
+        "name": "温度"
+      },
+      "sampling_mode_top_k": {
+        "name": "Top K"
+      },
+      "sampling_mode_top_p": {
+        "name": "Top P"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "生成文本",
+        "tooltip": null
+      }
+    }
+  },
+  "TextGenerateLTX2Prompt": {
+    "display_name": "TextGenerateLTX2Prompt",
+    "inputs": {
+      "clip": {
+        "name": "clip"
+      },
+      "image": {
+        "name": "图像"
+      },
+      "max_length": {
+        "name": "最大长度"
+      },
+      "prompt": {
+        "name": "提示词"
+      },
+      "sampling_mode": {
+        "name": "采样模式"
+      },
+      "sampling_mode_min_p": {
+        "name": "最小概率"
+      },
+      "sampling_mode_repetition_penalty": {
+        "name": "重复惩罚"
+      },
+      "sampling_mode_seed": {
+        "name": "种子"
+      },
+      "sampling_mode_temperature": {
+        "name": "温度"
+      },
+      "sampling_mode_top_k": {
+        "name": "Top K"
+      },
+      "sampling_mode_top_p": {
+        "name": "Top P"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "生成文本",
+        "tooltip": null
+      }
+    }
+  },
   "TextToLowercase": {
     "display_name": "文本半角",
     "inputs": {
@@ -12925,21 +15494,19 @@
     }
   },
   "TopazImageEnhance": {
-    "display_name": "Topaz 图像增强",
     "description": "专业级放大和图像增强。",
+    "display_name": "Topaz 图像增强",
     "inputs": {
-      "model": {
-        "name": "模型"
+      "color_preservation": {
+        "name": "固定色彩",
+        "tooltip": "保证色彩一致性。"
       },
-      "image": {
-        "name": "图像"
+      "creativity": {
+        "name": "多样性"
       },
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于引导放大"
-      },
-      "subject_detection": {
-        "name": "物体检测"
+      "crop_to_fill": {
+        "name": "裁剪",
+        "tooltip": "默认情况下，当输出宽高比不同时，图像会带有边框。启用后会裁剪图像填充输出尺寸。"
       },
       "face_enhancement": {
         "name": "面部增强",
@@ -12953,28 +15520,30 @@
         "name": "面部增强强度",
         "tooltip": "控制面部相对于背景的锐度。"
       },
-      "crop_to_fill": {
-        "name": "裁剪",
-        "tooltip": "默认情况下，当输出宽高比不同时，图像会带有边框。启用后会裁剪图像填充输出尺寸。"
+      "face_preservation": {
+        "name": "固定面部",
+        "tooltip": "保证主体面部一致性。"
       },
-      "output_width": {
-        "name": "输出宽度",
-        "tooltip": "0为自动（一般情况下和输入图像相同）。"
+      "image": {
+        "name": "图像"
+      },
+      "model": {
+        "name": "模型"
       },
       "output_height": {
         "name": "输出高度",
         "tooltip": "0为自动（一般情况下和输入图像相同）。"
       },
-      "creativity": {
-        "name": "多样性"
+      "output_width": {
+        "name": "输出宽度",
+        "tooltip": "0为自动（一般情况下和输入图像相同）。"
       },
-      "face_preservation": {
-        "name": "固定面部",
-        "tooltip": "保证主体面部一致性。"
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于引导放大"
       },
-      "color_preservation": {
-        "name": "固定色彩",
-        "tooltip": "保证色彩一致性。"
+      "subject_detection": {
+        "name": "物体检测"
       }
     },
     "outputs": {
@@ -12984,11 +15553,38 @@
     }
   },
   "TopazVideoEnhance": {
-    "display_name": "Topaz 视频增强",
     "description": "通过强大的放大和修复技术，为视频注入新的生命。",
+    "display_name": "Topaz 视频增强",
     "inputs": {
-      "video": {
-        "name": "视频"
+      "dynamic_compression_level": {
+        "name": "动态压缩",
+        "tooltip": "CQP 等级."
+      },
+      "interpolation_duplicate": {
+        "name": "补帧重复帧",
+        "tooltip": "分析原视频，移除重复的帧。"
+      },
+      "interpolation_duplicate_threshold": {
+        "name": "补帧重复帧阈值",
+        "tooltip": "判断为重复帧的阈值。"
+      },
+      "interpolation_enabled": {
+        "name": "补帧"
+      },
+      "interpolation_frame_rate": {
+        "name": "补帧帧率",
+        "tooltip": "输出帧率"
+      },
+      "interpolation_model": {
+        "name": "补帧模型"
+      },
+      "interpolation_slowmo": {
+        "name": "补帧慢动作",
+        "tooltip": "使用慢动作补帧。例如，设为 2 会让视频变慢到 0.5 倍，持续时间增加到 2 倍。"
+      },
+      "upscaler_creativity": {
+        "name": "放大多样性",
+        "tooltip": "多样等级（仅适用 Starlight (Astra) Creative 模型）."
       },
       "upscaler_enabled": {
         "name": "放大"
@@ -12999,35 +15595,8 @@
       "upscaler_resolution": {
         "name": "放大分辨率"
       },
-      "upscaler_creativity": {
-        "name": "放大多样性",
-        "tooltip": "多样等级（仅适用 Starlight (Astra) Creative 模型）."
-      },
-      "interpolation_enabled": {
-        "name": "补帧"
-      },
-      "interpolation_model": {
-        "name": "补帧模型"
-      },
-      "interpolation_slowmo": {
-        "name": "补帧慢动作",
-        "tooltip": "使用慢动作补帧。例如，设为 2 会让视频变慢到 0.5 倍，持续时间增加到 2 倍。"
-      },
-      "interpolation_frame_rate": {
-        "name": "补帧帧率",
-        "tooltip": "输出帧率"
-      },
-      "interpolation_duplicate": {
-        "name": "补帧重复帧",
-        "tooltip": "分析原视频，移除重复的帧。"
-      },
-      "interpolation_duplicate_threshold": {
-        "name": "补帧重复帧阈值",
-        "tooltip": "判断为重复帧的阈值。"
-      },
-      "dynamic_compression_level": {
-        "name": "动态压缩",
-        "tooltip": "CQP 等级."
+      "video": {
+        "name": "视频"
       }
     },
     "outputs": {
@@ -13039,11 +15608,11 @@
   "TorchCompileModel": {
     "display_name": "Torch编译模型",
     "inputs": {
-      "model": {
-        "name": "模型"
-      },
       "backend": {
         "name": "后端"
+      },
+      "model": {
+        "name": "模型"
       }
     },
     "outputs": {
@@ -13055,76 +15624,88 @@
   "TrainLoraNode": {
     "display_name": "训练 LoRA",
     "inputs": {
-      "model": {
-        "name": "模型",
-        "tooltip": "用于训练 LoRA 的模型。"
-      },
-      "latents": {
-        "name": "潜变量",
-        "tooltip": "用于训练的潜变量，作为模型的数据集/输入。"
-      },
-      "positive": {
-        "name": "正向条件",
-        "tooltip": "用于训练的正向条件。"
+      "algorithm": {
+        "name": "算法",
+        "tooltip": "用于训练的算法。"
       },
       "batch_size": {
         "name": "批次大小",
         "tooltip": "用于训练的批次大小。"
       },
-      "grad_accumulation_steps": {
-        "name": "梯度累积步数",
-        "tooltip": "用于训练的梯度累积步数。"
+      "bucket_mode": {
+        "name": "bucket模式",
+        "tooltip": "启用分辨率 bucket 模式。开启后会先使用 分辨率Bucket 节点处理 Latent。"
       },
-      "steps": {
-        "name": "步数",
-        "tooltip": "训练 LoRA 的步数。"
+      "bypass_mode": {
+        "name": "bypass_mode",
+        "tooltip": "为训练启用旁路模式。启用后，适配器通过前向钩子应用，而不是直接修改权重。适用于权重无法直接修改的量化模型。"
       },
-      "learning_rate": {
-        "name": "学习率",
-        "tooltip": "用于训练的学习率。"
+      "checkpoint_depth": {
+        "name": "checkpoint_depth",
+        "tooltip": "用于梯度检查点的深度级别。"
       },
-      "rank": {
-        "name": "秩",
-        "tooltip": "LoRA 层的秩。"
-      },
-      "optimizer": {
-        "name": "优化器",
-        "tooltip": "用于训练的优化器。"
-      },
-      "loss_function": {
-        "name": "损失函数",
-        "tooltip": "用于训练的损失函数。"
-      },
-      "seed": {
-        "name": "种子",
-        "tooltip": "用于训练的种子（用于 LoRA 权重初始化和噪声采样的生成器）"
-      },
-      "training_dtype": {
-        "name": "训练数据类型",
-        "tooltip": "用于训练的数据类型。"
-      },
-      "lora_dtype": {
-        "name": "LoRA 数据类型",
-        "tooltip": "用于 LoRA 的数据类型。"
-      },
-      "algorithm": {
-        "name": "算法",
-        "tooltip": "用于训练的算法。"
-      },
-      "gradient_checkpointing": {
-        "name": "梯度检查点",
-        "tooltip": "训练时使用梯度检查点。"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "existing_lora": {
         "name": "现有LoRA",
         "tooltip": "要附加到的现有LoRA。设置为None以创建新LoRA。"
       },
-      "bucket_mode": {
-        "name": "bucket模式",
-        "tooltip": "启用分辨率 bucket 模式。开启后会先使用 分辨率Bucket 节点处理 Latent。"
+      "grad_accumulation_steps": {
+        "name": "梯度累积步数",
+        "tooltip": "用于训练的梯度累积步数。"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "gradient_checkpointing": {
+        "name": "梯度检查点",
+        "tooltip": "训练时使用梯度检查点。"
+      },
+      "latents": {
+        "name": "潜变量",
+        "tooltip": "用于训练的潜变量，作为模型的数据集/输入。"
+      },
+      "learning_rate": {
+        "name": "学习率",
+        "tooltip": "用于训练的学习率。"
+      },
+      "lora_dtype": {
+        "name": "LoRA 数据类型",
+        "tooltip": "用于 LoRA 的数据类型。"
+      },
+      "loss_function": {
+        "name": "损失函数",
+        "tooltip": "用于训练的损失函数。"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "用于训练 LoRA 的模型。"
+      },
+      "offloading": {
+        "name": "offloading",
+        "tooltip": "用于梯度检查点的深度级别。"
+      },
+      "optimizer": {
+        "name": "优化器",
+        "tooltip": "用于训练的优化器。"
+      },
+      "positive": {
+        "name": "正向条件",
+        "tooltip": "用于训练的正向条件。"
+      },
+      "rank": {
+        "name": "秩",
+        "tooltip": "LoRA 层的秩。"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "用于训练的种子（用于 LoRA 权重初始化和噪声采样的生成器）"
+      },
+      "steps": {
+        "name": "步数",
+        "tooltip": "训练 LoRA 的步数。"
+      },
+      "training_dtype": {
+        "name": "训练数据类型",
+        "tooltip": "用于训练的数据类型。"
       }
     },
     "outputs": {
@@ -13139,27 +15720,23 @@
       "2": {
         "name": "损失",
         "tooltip": "损失历史图"
-      },
-      "3": {
-        "name": "步数",
-        "tooltip": "总训练步数"
       }
     }
   },
   "TrimAudioDuration": {
-    "display_name": "修剪音频时长",
     "description": "将音频张量修剪到选定的时间范围。",
+    "display_name": "修剪音频时长",
     "inputs": {
       "audio": {
         "name": "音频"
       },
-      "start_index": {
-        "name": "起始索引",
-        "tooltip": "开始时间（秒），可为负数表示从末尾开始计数（支持小数秒）。"
-      },
       "duration": {
         "name": "时长",
         "tooltip": "持续时间（秒）"
+      },
+      "start_index": {
+        "name": "起始索引",
+        "tooltip": "开始时间（秒），可为负数表示从末尾开始计数（支持小数秒）。"
       }
     },
     "outputs": {
@@ -13185,8 +15762,8 @@
     }
   },
   "TripleCLIPLoader": {
-    "display_name": "三重CLIP加载器",
     "description": "[配方]\n\nSD3：clip-l，clip-g，t5",
+    "display_name": "三重CLIP加载器",
     "inputs": {
       "clip_name1": {
         "name": "CLIP名称1"
@@ -13207,26 +15784,23 @@
   "TripoConversionNode": {
     "display_name": "Tripo：转换模型",
     "inputs": {
-      "original_model_task_id": {
-        "name": "原始模型任务ID"
+      "animate_in_place": {
+        "name": "原地动画"
       },
-      "format": {
-        "name": "格式"
+      "bake": {
+        "name": "烘焙"
       },
-      "quad": {
-        "name": "四边形"
+      "export_orientation": {
+        "name": "导出朝向"
+      },
+      "export_vertex_colors": {
+        "name": "导出顶点色"
       },
       "face_limit": {
         "name": "面数限制"
       },
-      "texture_size": {
-        "name": "纹理大小"
-      },
-      "texture_format": {
-        "name": "纹理格式"
-      },
-      "force_symmetry": {
-        "name": "强制对称"
+      "fbx_preset": {
+        "name": "fbx预设"
       },
       "flatten_bottom": {
         "name": "平滑底部"
@@ -13234,80 +15808,83 @@
       "flatten_bottom_threshold": {
         "name": "平滑底部阈值"
       },
-      "pivot_to_center_bottom": {
-        "name": "对齐底部中心"
+      "force_symmetry": {
+        "name": "强制对称"
       },
-      "scale_factor": {
-        "name": "缩放系数"
+      "format": {
+        "name": "格式"
       },
-      "with_animation": {
-        "name": "加入动画"
+      "original_model_task_id": {
+        "name": "原始模型任务ID"
       },
       "pack_uv": {
         "name": "打包uv"
       },
-      "bake": {
-        "name": "烘焙"
-      },
       "part_names": {
         "name": "部件名称"
       },
-      "fbx_preset": {
-        "name": "fbx预设"
+      "pivot_to_center_bottom": {
+        "name": "对齐底部中心"
       },
-      "export_vertex_colors": {
-        "name": "导出顶点色"
+      "quad": {
+        "name": "四边形"
       },
-      "export_orientation": {
-        "name": "导出朝向"
+      "scale_factor": {
+        "name": "缩放系数"
       },
-      "animate_in_place": {
-        "name": "原地动画"
+      "texture_format": {
+        "name": "纹理格式"
+      },
+      "texture_size": {
+        "name": "纹理大小"
+      },
+      "with_animation": {
+        "name": "加入动画"
       }
     }
   },
   "TripoImageToModelNode": {
     "display_name": "Tripo：图像转模型",
     "inputs": {
+      "face_limit": {
+        "name": "面数限制"
+      },
+      "geometry_quality": {
+        "name": "几何质量"
+      },
       "image": {
         "name": "图像"
       },
+      "model_seed": {
+        "name": "模型种子"
+      },
       "model_version": {
         "name": "模型版本",
         "tooltip": "用于生成的模型版本"
       },
+      "orientation": {
+        "name": "朝向"
+      },
+      "pbr": {
+        "name": "PBR"
+      },
+      "quad": {
+        "name": "四边形"
+      },
       "style": {
         "name": "风格"
       },
       "texture": {
         "name": "纹理"
       },
-      "pbr": {
-        "name": "PBR"
-      },
-      "model_seed": {
-        "name": "模型种子"
-      },
-      "orientation": {
-        "name": "朝向"
-      },
-      "texture_seed": {
-        "name": "纹理种子"
+      "texture_alignment": {
+        "name": "纹理对齐"
       },
       "texture_quality": {
         "name": "纹理质量"
       },
-      "texture_alignment": {
-        "name": "纹理对齐"
-      },
-      "face_limit": {
-        "name": "面数限制"
-      },
-      "quad": {
-        "name": "四边形"
-      },
-      "geometry_quality": {
-        "name": "几何质量"
+      "texture_seed": {
+        "name": "纹理种子"
       }
     },
     "outputs": {
@@ -13318,24 +15895,37 @@
       "1": {
         "name": "模型任务ID",
         "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
   "TripoMultiviewToModelNode": {
     "display_name": "Tripo：多视图转模型",
     "inputs": {
+      "face_limit": {
+        "name": "面数限制"
+      },
+      "geometry_quality": {
+        "name": "几何质量"
+      },
       "image": {
         "name": "图像"
       },
-      "image_left": {
-        "name": "左侧图像"
-      },
       "image_back": {
         "name": "背面图像"
       },
+      "image_left": {
+        "name": "左侧图像"
+      },
       "image_right": {
         "name": "右侧图像"
       },
+      "model_seed": {
+        "name": "模型种子"
+      },
       "model_version": {
         "name": "模型版本",
         "tooltip": "用于生成的模型版本"
@@ -13343,32 +15933,23 @@
       "orientation": {
         "name": "朝向"
       },
-      "texture": {
-        "name": "纹理"
-      },
       "pbr": {
         "name": "PBR"
       },
-      "model_seed": {
-        "name": "模型种子"
-      },
-      "texture_seed": {
-        "name": "纹理种子"
-      },
-      "texture_quality": {
-        "name": "纹理质量"
-      },
-      "texture_alignment": {
-        "name": "纹理对齐"
-      },
-      "face_limit": {
-        "name": "面数限制"
-      },
       "quad": {
         "name": "四边形"
       },
-      "geometry_quality": {
-        "name": "几何质量"
+      "texture": {
+        "name": "纹理"
+      },
+      "texture_alignment": {
+        "name": "纹理对齐"
+      },
+      "texture_quality": {
+        "name": "纹理质量"
+      },
+      "texture_seed": {
+        "name": "纹理种子"
       }
     },
     "outputs": {
@@ -13379,12 +15960,16 @@
       "1": {
         "name": "模型任务ID",
         "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
   "TripoRefineNode": {
-    "display_name": "Tripo: 精修草稿模型",
     "description": "仅精修由v1.4 Tripo模型创建的草稿模型。",
+    "display_name": "Tripo: 精修草稿模型",
     "inputs": {
       "model_task_id": {
         "name": "模型任务ID",
@@ -13399,17 +15984,21 @@
       "1": {
         "name": "模型任务ID",
         "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
   "TripoRetargetNode": {
     "display_name": "Tripo: 重定向绑定模型",
     "inputs": {
-      "original_model_task_id": {
-        "name": "原始模型任务ID"
-      },
       "animation": {
         "name": "动画"
+      },
+      "original_model_task_id": {
+        "name": "原始模型任务ID"
       }
     },
     "outputs": {
@@ -13420,6 +16009,10 @@
       "1": {
         "name": "重定向任务ID",
         "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -13438,29 +16031,21 @@
       "1": {
         "name": "绑定任务ID",
         "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
   "TripoTextToModelNode": {
     "display_name": "Tripo: 文本转模型",
     "inputs": {
-      "prompt": {
-        "name": "提示词"
+      "face_limit": {
+        "name": "面数限制"
       },
-      "negative_prompt": {
-        "name": "负面提示词"
-      },
-      "model_version": {
-        "name": "模型版本"
-      },
-      "style": {
-        "name": "风格"
-      },
-      "texture": {
-        "name": "纹理"
-      },
-      "pbr": {
-        "name": "PBR"
+      "geometry_quality": {
+        "name": "几何质量"
       },
       "image_seed": {
         "name": "图像种子"
@@ -13468,20 +16053,32 @@
       "model_seed": {
         "name": "模型种子"
       },
-      "texture_seed": {
-        "name": "纹理种子"
+      "model_version": {
+        "name": "模型版本"
       },
-      "texture_quality": {
-        "name": "纹理质量"
+      "negative_prompt": {
+        "name": "负面提示词"
       },
-      "face_limit": {
-        "name": "面数限制"
+      "pbr": {
+        "name": "PBR"
+      },
+      "prompt": {
+        "name": "提示词"
       },
       "quad": {
         "name": "四边形"
       },
-      "geometry_quality": {
-        "name": "几何质量"
+      "style": {
+        "name": "风格"
+      },
+      "texture": {
+        "name": "纹理"
+      },
+      "texture_quality": {
+        "name": "纹理质量"
+      },
+      "texture_seed": {
+        "name": "纹理种子"
       }
     },
     "outputs": {
@@ -13492,6 +16089,10 @@
       "1": {
         "name": "模型任务ID",
         "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
@@ -13501,20 +16102,20 @@
       "model_task_id": {
         "name": "模型任务ID"
       },
-      "texture": {
-        "name": "纹理"
-      },
       "pbr": {
         "name": "PBR"
       },
-      "texture_seed": {
-        "name": "纹理种子"
+      "texture": {
+        "name": "纹理"
+      },
+      "texture_alignment": {
+        "name": "纹理对齐"
       },
       "texture_quality": {
         "name": "纹理质量"
       },
-      "texture_alignment": {
-        "name": "纹理对齐"
+      "texture_seed": {
+        "name": "纹理种子"
       }
     },
     "outputs": {
@@ -13525,19 +16126,23 @@
       "1": {
         "name": "模型任务ID",
         "tooltip": null
+      },
+      "2": {
+        "name": "GLB",
+        "tooltip": null
       }
     }
   },
   "TruncateText": {
     "display_name": "截断文本",
     "inputs": {
-      "texts": {
-        "name": "文本",
-        "tooltip": "需要处理的文本"
-      },
       "max_length": {
         "name": "长度上限",
         "tooltip": "文本长度上限"
+      },
+      "texts": {
+        "name": "文本",
+        "tooltip": "需要处理的文本"
       }
     },
     "outputs": {
@@ -13547,56 +16152,6 @@
       }
     }
   },
-  "unCLIPCheckpointLoader": {
-    "display_name": "unCLIPCheckpoint加载器",
-    "inputs": {
-      "ckpt_name": {
-        "name": "Checkpoint名称"
-      }
-    }
-  },
-  "unCLIPConditioning": {
-    "display_name": "unCLIP条件",
-    "inputs": {
-      "conditioning": {
-        "name": "条件"
-      },
-      "clip_vision_output": {
-        "name": "CLIP视觉输出"
-      },
-      "strength": {
-        "name": "强度"
-      },
-      "noise_augmentation": {
-        "name": "噪波增强"
-      }
-    }
-  },
-  "UNetCrossAttentionMultiply": {
-    "display_name": "UNet交叉注意力乘数",
-    "inputs": {
-      "model": {
-        "name": "模型"
-      },
-      "q": {
-        "name": "q"
-      },
-      "k": {
-        "name": "k"
-      },
-      "v": {
-        "name": "v"
-      },
-      "out": {
-        "name": "输出"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
   "UNETLoader": {
     "display_name": "UNet加载器",
     "inputs": {
@@ -13608,23 +16163,48 @@
       }
     }
   },
-  "UNetSelfAttentionMultiply": {
-    "display_name": "UNet自注意力乘数",
+  "UNetCrossAttentionMultiply": {
+    "display_name": "UNet交叉注意力乘数",
     "inputs": {
+      "k": {
+        "name": "k"
+      },
       "model": {
         "name": "模型"
       },
+      "out": {
+        "name": "输出"
+      },
       "q": {
         "name": "q"
       },
+      "v": {
+        "name": "v"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "UNetSelfAttentionMultiply": {
+    "display_name": "UNet自注意力乘数",
+    "inputs": {
       "k": {
         "name": "k"
       },
-      "v": {
-        "name": "v"
+      "model": {
+        "name": "模型"
       },
       "out": {
         "name": "输出"
+      },
+      "q": {
+        "name": "q"
+      },
+      "v": {
+        "name": "v"
       }
     },
     "outputs": {
@@ -13636,6 +16216,12 @@
   "UNetTemporalAttentionMultiply": {
     "display_name": "UNet时间注意力乘数",
     "inputs": {
+      "cross_structural": {
+        "name": "交叉结构"
+      },
+      "cross_temporal": {
+        "name": "交叉时间"
+      },
       "model": {
         "name": "模型"
       },
@@ -13644,12 +16230,6 @@
       },
       "self_temporal": {
         "name": "自我时间"
-      },
-      "cross_structural": {
-        "name": "交叉结构"
-      },
-      "cross_temporal": {
-        "name": "交叉时间"
       }
     },
     "outputs": {
@@ -13658,6 +16238,20 @@
       }
     }
   },
+  "USOStyleReference": {
+    "display_name": "USO风格参考",
+    "inputs": {
+      "clip_vision_output": {
+        "name": "CLIP视觉输出"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "model_patch": {
+        "name": "模型补丁"
+      }
+    }
+  },
   "UpscaleModelLoader": {
     "display_name": "加载放大模型",
     "inputs": {
@@ -13671,23 +16265,9 @@
       }
     }
   },
-  "USOStyleReference": {
-    "display_name": "USO风格参考",
-    "inputs": {
-      "model": {
-        "name": "模型"
-      },
-      "model_patch": {
-        "name": "模型补丁"
-      },
-      "clip_vision_output": {
-        "name": "CLIP视觉输出"
-      }
-    }
-  },
   "VAEDecode": {
-    "display_name": "VAE解码",
     "description": "将 Latent 图像解码为像素空间的图像。",
+    "display_name": "VAE解码",
     "inputs": {
       "samples": {
         "name": "Latent",
@@ -13720,20 +16300,42 @@
       }
     }
   },
-  "VAEDecodeHunyuan3D": {
-    "display_name": "VAE解码（Hunyuan3D）",
+  "VAEDecodeAudioTiled": {
+    "display_name": "VAE解码音频（分块）",
     "inputs": {
+      "overlap": {
+        "name": "重叠"
+      },
       "samples": {
         "name": "样本"
       },
+      "tile_size": {
+        "name": "分块大小"
+      },
       "vae": {
         "name": "vae"
-      },
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "VAEDecodeHunyuan3D": {
+    "display_name": "VAE解码（Hunyuan3D）",
+    "inputs": {
       "num_chunks": {
         "name": "块数"
       },
       "octree_resolution": {
         "name": "八叉树分辨率"
+      },
+      "samples": {
+        "name": "样本"
+      },
+      "vae": {
+        "name": "vae"
       }
     },
     "outputs": {
@@ -13745,25 +16347,25 @@
   "VAEDecodeTiled": {
     "display_name": "VAE解码（分块）",
     "inputs": {
+      "overlap": {
+        "name": "重叠"
+      },
       "samples": {
         "name": "Latent"
       },
-      "vae": {
-        "name": "vae"
-      },
-      "tile_size": {
-        "name": "分块尺寸"
-      },
-      "overlap": {
-        "name": "重叠"
+      "temporal_overlap": {
+        "name": "时间重叠",
+        "tooltip": "仅用于视频VAE：重叠的帧数。"
       },
       "temporal_size": {
         "name": "时间尺寸",
         "tooltip": "仅用于视频VAE：一次解码的帧数。"
       },
-      "temporal_overlap": {
-        "name": "时间重叠",
-        "tooltip": "仅用于视频VAE：重叠的帧数。"
+      "tile_size": {
+        "name": "分块尺寸"
+      },
+      "vae": {
+        "name": "vae"
       }
     }
   },
@@ -13797,42 +16399,42 @@
   "VAEEncodeForInpaint": {
     "display_name": "VAE编码（局部重绘）",
     "inputs": {
+      "grow_mask_by": {
+        "name": "扩展遮罩"
+      },
+      "mask": {
+        "name": "遮罩"
+      },
       "pixels": {
         "name": "像素"
       },
       "vae": {
         "name": "vae"
-      },
-      "mask": {
-        "name": "遮罩"
-      },
-      "grow_mask_by": {
-        "name": "扩展遮罩"
       }
     }
   },
   "VAEEncodeTiled": {
     "display_name": "VAE编码分块）",
     "inputs": {
+      "overlap": {
+        "name": "重叠"
+      },
       "pixels": {
         "name": "像素"
       },
-      "vae": {
-        "name": "vae"
-      },
-      "tile_size": {
-        "name": "分块尺寸"
-      },
-      "overlap": {
-        "name": "重叠"
+      "temporal_overlap": {
+        "name": "时间重叠",
+        "tooltip": "仅用于视频VAE：重叠的帧数。"
       },
       "temporal_size": {
         "name": "时间尺寸",
         "tooltip": "仅用于视频VAE：一次编码的帧数。"
       },
-      "temporal_overlap": {
-        "name": "时间重叠",
-        "tooltip": "仅用于视频VAE：重叠的帧数。"
+      "tile_size": {
+        "name": "分块尺寸"
+      },
+      "vae": {
+        "name": "vae"
       }
     }
   },
@@ -13847,45 +16449,59 @@
   "VAESave": {
     "display_name": "保存VAE",
     "inputs": {
-      "vae": {
-        "name": "vae"
-      },
       "filename_prefix": {
         "name": "文件名前缀"
+      },
+      "vae": {
+        "name": "vae"
+      }
+    }
+  },
+  "VPScheduler": {
+    "display_name": "VPS调度器",
+    "inputs": {
+      "beta_d": {
+        "name": "beta_d"
+      },
+      "beta_min": {
+        "name": "beta_min"
+      },
+      "eps_s": {
+        "name": "eps_s"
+      },
+      "steps": {
+        "name": "步数"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
       }
     }
   },
   "Veo3FirstLastFrameNode": {
-    "display_name": "Google Veo 3 首尾帧视频",
     "description": "使用首尾帧和提示词生成视频",
+    "display_name": "Google Veo 3 首尾帧视频",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "视频的文本描述"
-      },
-      "negative_prompt": {
-        "name": "负面提示词",
-        "tooltip": "避免视频出现内容的文本描述"
-      },
-      "resolution": {
-        "name": "分辨率"
-      },
       "aspect_ratio": {
         "name": "宽高比",
         "tooltip": "输出视频的宽高比"
       },
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
       "duration": {
         "name": "时长",
         "tooltip": "输出视频的秒数"
       },
-      "seed": {
-        "name": "随机种",
-        "tooltip": "生成视频的随机种"
-      },
       "first_frame": {
         "name": "初始帧",
         "tooltip": "初始帧"
       },
+      "generate_audio": {
+        "name": "生成音频",
+        "tooltip": "为视频生成音频"
+      },
       "last_frame": {
         "name": "结束帧",
         "tooltip": "结束帧"
@@ -13893,12 +16509,20 @@
       "model": {
         "name": "模型"
       },
-      "generate_audio": {
-        "name": "生成音频",
-        "tooltip": "为视频生成音频"
+      "negative_prompt": {
+        "name": "负面提示词",
+        "tooltip": "避免视频出现内容的文本描述"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "视频的文本描述"
+      },
+      "resolution": {
+        "name": "分辨率"
+      },
+      "seed": {
+        "name": "随机种",
+        "tooltip": "生成视频的随机种"
       }
     },
     "outputs": {
@@ -13908,20 +16532,15 @@
     }
   },
   "Veo3VideoGenerationNode": {
-    "display_name": "Google Veo 3 视频生成",
     "description": "使用 Google Veo 3 API 从文本提示生成视频",
+    "display_name": "Google Veo 3 视频生成",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "视频的文本描述"
-      },
       "aspect_ratio": {
         "name": "宽高比",
         "tooltip": "输出视频的宽高比"
       },
-      "negative_prompt": {
-        "name": "负面提示词",
-        "tooltip": "负面文本提示，指导视频中应避免的内容"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "duration_seconds": {
         "name": "时长",
@@ -13931,13 +16550,9 @@
         "name": "优化提示词",
         "tooltip": "是否使用 AI 辅助增强提示"
       },
-      "person_generation": {
-        "name": "生成人类",
-        "tooltip": "是否允许在视频中生成人物"
-      },
-      "seed": {
-        "name": "随机种",
-        "tooltip": "视频生成的种子值（0 表示随机）"
+      "generate_audio": {
+        "name": "生成音频",
+        "tooltip": "为视频生成音频。所有 Veo 3 模型均支持此功能。"
       },
       "image": {
         "name": "图像",
@@ -13947,12 +16562,21 @@
         "name": "模型",
         "tooltip": "用于视频生成的 Veo 3 模型"
       },
-      "generate_audio": {
-        "name": "生成音频",
-        "tooltip": "为视频生成音频。所有 Veo 3 模型均支持此功能。"
+      "negative_prompt": {
+        "name": "负面提示词",
+        "tooltip": "负面文本提示，指导视频中应避免的内容"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "person_generation": {
+        "name": "生成人类",
+        "tooltip": "是否允许在视频中生成人物"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "视频的文本描述"
+      },
+      "seed": {
+        "name": "随机种",
+        "tooltip": "视频生成的种子值（0 表示随机）"
       }
     },
     "outputs": {
@@ -13962,20 +16586,15 @@
     }
   },
   "VeoVideoGenerationNode": {
-    "display_name": "Google Veo2 视频生成",
     "description": "使用 Google 的 Veo API 根据文本提示生成视频",
+    "display_name": "Google Veo2 视频生成",
     "inputs": {
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "视频的文本描述"
-      },
       "aspect_ratio": {
         "name": "宽高比",
         "tooltip": "输出视频的宽高比"
       },
-      "negative_prompt": {
-        "name": "负面提示词",
-        "tooltip": "用于指导视频中应避免内容的负面文本提示"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "duration_seconds": {
         "name": "时长",
@@ -13985,14 +16604,6 @@
         "name": "优化提示词",
         "tooltip": "是否使用 AI 辅助增强提示词"
       },
-      "person_generation": {
-        "name": "生成人类",
-        "tooltip": "是否允许在视频中生成人物"
-      },
-      "seed": {
-        "name": "随机种",
-        "tooltip": "视频生成的种子（0 表示随机）"
-      },
       "image": {
         "name": "图像",
         "tooltip": "可选的参考图像，用于引导视频生成"
@@ -14001,8 +16612,46 @@
         "name": "模型",
         "tooltip": "用于视频生成的 Veo 2 模型"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "negative_prompt": {
+        "name": "负面提示词",
+        "tooltip": "用于指导视频中应避免内容的负面文本提示"
+      },
+      "person_generation": {
+        "name": "生成人类",
+        "tooltip": "是否允许在视频中生成人物"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "视频的文本描述"
+      },
+      "seed": {
+        "name": "随机种",
+        "tooltip": "视频生成的种子（0 表示随机）"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Video Slice": {
+    "display_name": "视频切片",
+    "inputs": {
+      "duration": {
+        "name": "时长",
+        "tooltip": "以秒为单位的时长，0 表示不限时长"
+      },
+      "start_time": {
+        "name": "起始时间",
+        "tooltip": "以秒为单位的起始时间"
+      },
+      "strict_duration": {
+        "name": "严格时长",
+        "tooltip": "如为 True，当指定时长无法实现时将报错。"
+      },
+      "video": {
+        "name": "视频"
       }
     },
     "outputs": {
@@ -14014,59 +16663,415 @@
   "VideoLinearCFGGuidance": {
     "display_name": "视频线性CFG引导",
     "inputs": {
-      "model": {
-        "name": "模型"
-      },
       "min_cfg": {
         "name": "最小配置"
+      },
+      "model": {
+        "name": "模型"
       }
     }
   },
   "VideoTriangleCFGGuidance": {
     "display_name": "视频三角形CFG引导",
     "inputs": {
+      "min_cfg": {
+        "name": "最小配置"
+      },
+      "model": {
+        "name": "模型"
+      }
+    }
+  },
+  "Vidu2ImageToVideoNode": {
+    "description": "根据一张图像和可选提示生成视频。",
+    "display_name": "Vidu2 图像转视频生成",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "用于生成视频起始帧的图像。"
+      },
+      "model": {
+        "name": "model"
+      },
+      "movement_amplitude": {
+        "name": "movement_amplitude",
+        "tooltip": "画面中物体的运动幅度。"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "用于视频生成的可选文本提示（最多2000字符）。"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2ReferenceVideoNode": {
+    "description": "根据多张参考图像和提示生成视频。",
+    "display_name": "Vidu2 参考图像转视频生成",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "audio": {
+        "name": "audio",
+        "tooltip": "启用后，视频将根据提示包含生成的语音和背景音乐。"
+      },
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "duration": {
+        "name": "duration"
+      },
+      "model": {
+        "name": "model"
+      },
+      "movement_amplitude": {
+        "name": "movement_amplitude",
+        "tooltip": "画面中物体的运动幅度。"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "启用后，视频将根据提示生成语音和背景音乐。"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "subjects": {
+        "name": "subjects",
+        "tooltip": "每个主体最多提供3张参考图像（所有主体共7张）。可通过 @subject{subject_id} 在提示中引用。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2StartEndToVideoNode": {
+    "description": "根据起始帧、结束帧和提示词生成视频。",
+    "display_name": "Vidu2 起始/结束帧到视频生成",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "duration": {
+        "name": "时长"
+      },
+      "end_frame": {
+        "name": "结束帧"
+      },
+      "first_frame": {
+        "name": "起始帧"
+      },
       "model": {
         "name": "模型"
       },
-      "min_cfg": {
-        "name": "最小配置"
+      "movement_amplitude": {
+        "name": "运动幅度",
+        "tooltip": "帧中物体的运动幅度。"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "提示描述（最多2000个字符）。"
+      },
+      "resolution": {
+        "name": "分辨率"
+      },
+      "seed": {
+        "name": "种子"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu2TextToVideoNode": {
+    "description": "根据文本提示生成视频",
+    "display_name": "Vidu2 文本到视频生成",
+    "inputs": {
+      "aspect_ratio": {
+        "name": "宽高比"
+      },
+      "background_music": {
+        "name": "背景音乐",
+        "tooltip": "是否为生成的视频添加背景音乐。"
+      },
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "duration": {
+        "name": "时长"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于视频生成的文本描述，最大长度为2000个字符。"
+      },
+      "resolution": {
+        "name": "分辨率"
+      },
+      "seed": {
+        "name": "种子"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3ImageToVideoNode": {
+    "description": "根据图像和可选提示生成视频。",
+    "display_name": "Vidu Q3 图像转视频生成",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "image": {
+        "name": "image",
+        "tooltip": "用作生成视频起始帧的图像。"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "用于视频生成的模型。"
+      },
+      "model_audio": {
+        "name": "audio"
+      },
+      "model_duration": {
+        "name": "duration"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "用于视频生成的可选文本提示（最多2000字符）。"
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3StartEndToVideoNode": {
+    "description": "根据起始帧、结束帧和提示词生成视频。",
+    "display_name": "Vidu Q3 起始/结束帧到视频生成",
+    "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "end_frame": {
+        "name": "结束帧"
+      },
+      "first_frame": {
+        "name": "起始帧"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "用于视频生成的模型。"
+      },
+      "model_audio": {
+        "name": "音频"
+      },
+      "model_duration": {
+        "name": "时长"
+      },
+      "model_resolution": {
+        "name": "分辨率"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "提示描述（最多2000字符）。"
+      },
+      "seed": {
+        "name": "种子"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "Vidu3TextToVideoNode": {
+    "description": "根据文本提示生成视频。",
+    "display_name": "Vidu Q3 文本转视频生成",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "用于视频生成的模型。"
+      },
+      "model_aspect_ratio": {
+        "name": "aspect_ratio"
+      },
+      "model_audio": {
+        "name": "audio"
+      },
+      "model_duration": {
+        "name": "duration"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "用于视频生成的文本描述，最大长度为2000字符。"
+      },
+      "seed": {
+        "name": "seed"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ViduExtendVideoNode": {
+    "description": "通过生成额外帧来扩展已有视频。",
+    "display_name": "Vidu 视频扩展",
+    "inputs": {
+      "control_after_generate": {
+        "name": "control after generate"
+      },
+      "end_frame": {
+        "name": "end_frame"
+      },
+      "model": {
+        "name": "model",
+        "tooltip": "用于视频扩展的模型。"
+      },
+      "model_duration": {
+        "name": "duration"
+      },
+      "model_resolution": {
+        "name": "resolution"
+      },
+      "prompt": {
+        "name": "prompt",
+        "tooltip": "用于扩展视频的可选文本提示（最多2000字符）。"
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "video": {
+        "name": "video",
+        "tooltip": "要扩展的源视频。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
       }
     }
   },
   "ViduImageToVideoNode": {
-    "display_name": "Vidu 图像转视频生成",
     "description": "从图像和可选提示生成视频",
+    "display_name": "Vidu 图像转视频生成",
     "inputs": {
-      "model": {
-        "name": "模型",
-        "tooltip": "模型名称"
-      },
-      "image": {
-        "name": "图像",
-        "tooltip": "用作生成视频起始帧的图像"
-      },
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于视频生成的文本描述"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "duration": {
         "name": "时长",
         "tooltip": "输出视频的时长（秒）"
       },
-      "seed": {
-        "name": "随机种",
-        "tooltip": "视频生成的种子值（0 表示随机）"
+      "image": {
+        "name": "图像",
+        "tooltip": "用作生成视频起始帧的图像"
       },
-      "resolution": {
-        "name": "分辨率",
-        "tooltip": "支持的值可能因模型和时长而异"
+      "model": {
+        "name": "模型",
+        "tooltip": "模型名称"
       },
       "movement_amplitude": {
         "name": "运动幅度",
         "tooltip": "画面中对象的运动幅度"
       },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于视频生成的文本描述"
+      },
+      "resolution": {
+        "name": "分辨率",
+        "tooltip": "支持的值可能因模型和时长而异"
+      },
+      "seed": {
+        "name": "随机种",
+        "tooltip": "视频生成的种子值（0 表示随机）"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "ViduMultiFrameVideoNode": {
+    "description": "生成包含多个关键帧过渡的视频。",
+    "display_name": "Vidu 多帧视频生成",
+    "inputs": {
       "control_after_generate": {
-        "name": "生成后控制"
+        "name": "control after generate"
+      },
+      "frames": {
+        "name": "frames",
+        "tooltip": "关键帧过渡数量（2-9）。"
+      },
+      "frames_duration1": {
+        "name": "duration1"
+      },
+      "frames_duration2": {
+        "name": "duration2"
+      },
+      "frames_prompt1": {
+        "name": "prompt1"
+      },
+      "frames_prompt2": {
+        "name": "prompt2"
+      },
+      "model": {
+        "name": "model"
+      },
+      "resolution": {
+        "name": "resolution"
+      },
+      "seed": {
+        "name": "seed"
+      },
+      "start_image": {
+        "name": "start_image",
+        "tooltip": "起始帧图像。宽高比需在1:4到4:1之间。"
       }
     },
     "outputs": {
@@ -14076,43 +17081,43 @@
     }
   },
   "ViduReferenceVideoNode": {
-    "display_name": "Vidu 参考转视频生成",
     "description": "从多张图像和提示生成视频",
+    "display_name": "Vidu 参考转视频生成",
     "inputs": {
-      "model": {
-        "name": "模型",
-        "tooltip": "模型名称"
+      "aspect_ratio": {
+        "name": "宽高比",
+        "tooltip": "输出视频的宽高比"
       },
-      "images": {
-        "name": "图像",
-        "tooltip": "用作参考以生成具有一致主体的图像（最多 7 张图像）"
-      },
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于视频生成的文本描述"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "duration": {
         "name": "时长",
         "tooltip": "输出视频的时长（秒）"
       },
-      "seed": {
-        "name": "种子",
-        "tooltip": "视频生成的种子值（0表示随机）"
+      "images": {
+        "name": "图像",
+        "tooltip": "用作参考以生成具有一致主体的图像（最多 7 张图像）"
       },
-      "aspect_ratio": {
-        "name": "宽高比",
-        "tooltip": "输出视频的宽高比"
-      },
-      "resolution": {
-        "name": "分辨率",
-        "tooltip": "支持的值可能因模型和时长而异"
+      "model": {
+        "name": "模型",
+        "tooltip": "模型名称"
       },
       "movement_amplitude": {
         "name": "运动幅度",
         "tooltip": "画面中物体的运动幅度"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于视频生成的文本描述"
+      },
+      "resolution": {
+        "name": "分辨率",
+        "tooltip": "支持的值可能因模型和时长而异"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "视频生成的种子值（0表示随机）"
       }
     },
     "outputs": {
@@ -14122,43 +17127,43 @@
     }
   },
   "ViduStartEndToVideoNode": {
-    "display_name": "Vidu 起始结束帧转视频生成",
     "description": "根据起始帧、结束帧和提示词生成视频",
+    "display_name": "Vidu 起始结束帧转视频生成",
     "inputs": {
-      "model": {
-        "name": "模型",
-        "tooltip": "模型名称"
-      },
-      "first_frame": {
-        "name": "起始帧",
-        "tooltip": "开始帧"
-      },
-      "end_frame": {
-        "name": "结束帧",
-        "tooltip": "结束帧"
-      },
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于视频生成的文本描述"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "duration": {
         "name": "时长",
         "tooltip": "输出视频的时长（秒）"
       },
-      "seed": {
-        "name": "种子",
-        "tooltip": "视频生成的种子值（0表示随机）"
+      "end_frame": {
+        "name": "结束帧",
+        "tooltip": "结束帧"
       },
-      "resolution": {
-        "name": "分辨率",
-        "tooltip": "支持的值可能因模型和时长而异"
+      "first_frame": {
+        "name": "起始帧",
+        "tooltip": "开始帧"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "模型名称"
       },
       "movement_amplitude": {
         "name": "运动幅度",
         "tooltip": "画面中物体的运动幅度"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于视频生成的文本描述"
+      },
+      "resolution": {
+        "name": "分辨率",
+        "tooltip": "支持的值可能因模型和时长而异"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "视频生成的种子值（0表示随机）"
       }
     },
     "outputs": {
@@ -14168,39 +17173,39 @@
     }
   },
   "ViduTextToVideoNode": {
-    "display_name": "Vidu 文本转视频生成",
     "description": "根据文本提示词生成视频",
+    "display_name": "Vidu 文本转视频生成",
     "inputs": {
-      "model": {
-        "name": "模型",
-        "tooltip": "模型名称"
+      "aspect_ratio": {
+        "name": "宽高比",
+        "tooltip": "输出视频的宽高比"
       },
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于视频生成的文本描述"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "duration": {
         "name": "时长",
         "tooltip": "输出视频的时长（秒）"
       },
-      "seed": {
-        "name": "种子",
-        "tooltip": "视频生成的种子值（0表示随机）"
-      },
-      "aspect_ratio": {
-        "name": "宽高比",
-        "tooltip": "输出视频的宽高比"
-      },
-      "resolution": {
-        "name": "分辨率",
-        "tooltip": "支持的值可能因模型和时长而异"
+      "model": {
+        "name": "模型",
+        "tooltip": "模型名称"
       },
       "movement_amplitude": {
         "name": "运动幅度",
         "tooltip": "画面中物体的运动幅度"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于视频生成的文本描述"
+      },
+      "resolution": {
+        "name": "分辨率",
+        "tooltip": "支持的值可能因模型和时长而异"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "视频生成的种子值（0表示随机）"
       }
     },
     "outputs": {
@@ -14212,14 +17217,14 @@
   "VoxelToMesh": {
     "display_name": "体素到网格",
     "inputs": {
-      "voxel": {
-        "name": "体素"
-      },
       "algorithm": {
         "name": "算法"
       },
       "threshold": {
         "name": "阈值"
+      },
+      "voxel": {
+        "name": "体素"
       }
     },
     "outputs": {
@@ -14231,33 +17236,11 @@
   "VoxelToMeshBasic": {
     "display_name": "体素到网格（基础）",
     "inputs": {
-      "voxel": {
-        "name": "体素"
-      },
       "threshold": {
         "name": "阈值"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
-  "VPScheduler": {
-    "display_name": "VPS调度器",
-    "inputs": {
-      "steps": {
-        "name": "步数"
       },
-      "beta_d": {
-        "name": "beta_d"
-      },
-      "beta_min": {
-        "name": "beta_min"
-      },
-      "eps_s": {
-        "name": "eps_s"
+      "voxel": {
+        "name": "体素"
       }
     },
     "outputs": {
@@ -14269,17 +17252,11 @@
   "Wan22FunControlToVideo": {
     "display_name": "Wan22FunControl视频",
     "inputs": {
-      "positive": {
-        "name": "正面提示词"
+      "batch_size": {
+        "name": "批次大小"
       },
-      "negative": {
-        "name": "负面提示词"
-      },
-      "vae": {
-        "name": "VAE"
-      },
-      "width": {
-        "name": "宽度"
+      "control_video": {
+        "name": "控制视频"
       },
       "height": {
         "name": "高度"
@@ -14287,14 +17264,20 @@
       "length": {
         "name": "长度"
       },
-      "batch_size": {
-        "name": "批次大小"
+      "negative": {
+        "name": "负面提示词"
+      },
+      "positive": {
+        "name": "正面提示词"
       },
       "ref_image": {
         "name": "参考图像"
       },
-      "control_video": {
-        "name": "控制视频"
+      "vae": {
+        "name": "VAE"
+      },
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -14315,11 +17298,8 @@
   "Wan22ImageToVideoLatent": {
     "display_name": "Wan22图像转视频潜变量",
     "inputs": {
-      "vae": {
-        "name": "VAE"
-      },
-      "width": {
-        "name": "宽度"
+      "batch_size": {
+        "name": "批次大小"
       },
       "height": {
         "name": "高度"
@@ -14327,11 +17307,14 @@
       "length": {
         "name": "长度"
       },
-      "batch_size": {
-        "name": "批次大小"
-      },
       "start_image": {
         "name": "起始图像"
+      },
+      "vae": {
+        "name": "VAE"
+      },
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -14343,17 +17326,26 @@
   "WanAnimateToVideo": {
     "display_name": "Wan动画转视频",
     "inputs": {
-      "positive": {
-        "name": "正向提示"
+      "background_video": {
+        "name": "背景视频"
       },
-      "negative": {
-        "name": "负向提示"
+      "batch_size": {
+        "name": "批次大小"
       },
-      "vae": {
-        "name": "VAE"
+      "character_mask": {
+        "name": "角色遮罩"
       },
-      "width": {
-        "name": "宽度"
+      "clip_vision_output": {
+        "name": "CLIP视觉输出"
+      },
+      "continue_motion": {
+        "name": "继续运动"
+      },
+      "continue_motion_max_frames": {
+        "name": "继续运动最大帧数"
+      },
+      "face_video": {
+        "name": "面部视频"
       },
       "height": {
         "name": "高度"
@@ -14361,36 +17353,27 @@
       "length": {
         "name": "长度"
       },
-      "batch_size": {
-        "name": "批次大小"
+      "negative": {
+        "name": "负向提示"
       },
-      "continue_motion_max_frames": {
-        "name": "继续运动最大帧数"
+      "pose_video": {
+        "name": "姿态视频"
+      },
+      "positive": {
+        "name": "正向提示"
+      },
+      "reference_image": {
+        "name": "参考图像"
+      },
+      "vae": {
+        "name": "VAE"
       },
       "video_frame_offset": {
         "name": "视频帧偏移",
         "tooltip": "在所有输入视频中跳过的帧数。用于通过分块生成更长的视频。连接到上一个节点的video_frame_offset输出以扩展视频。"
       },
-      "clip_vision_output": {
-        "name": "CLIP视觉输出"
-      },
-      "reference_image": {
-        "name": "参考图像"
-      },
-      "face_video": {
-        "name": "面部视频"
-      },
-      "pose_video": {
-        "name": "姿态视频"
-      },
-      "background_video": {
-        "name": "背景视频"
-      },
-      "character_mask": {
-        "name": "角色遮罩"
-      },
-      "continue_motion": {
-        "name": "继续运动"
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -14420,28 +17403,23 @@
       }
     }
   },
-  "wanBlockSwap": {
-    "display_name": "Wan块置换",
-    "description": "NOP",
-    "inputs": {
-      "model": {
-        "name": "模型"
-      }
-    },
-    "outputs": {
-      "0": {
-        "tooltip": null
-      }
-    }
-  },
   "WanCameraEmbedding": {
     "display_name": "Wan相机嵌入",
     "inputs": {
       "camera_pose": {
         "name": "相机姿态"
       },
-      "width": {
-        "name": "宽度"
+      "cx": {
+        "name": "cx"
+      },
+      "cy": {
+        "name": "cy"
+      },
+      "fx": {
+        "name": "fx"
+      },
+      "fy": {
+        "name": "fy"
       },
       "height": {
         "name": "高度"
@@ -14452,17 +17430,8 @@
       "speed": {
         "name": "速度"
       },
-      "fx": {
-        "name": "fx"
-      },
-      "fy": {
-        "name": "fy"
-      },
-      "cx": {
-        "name": "cx"
-      },
-      "cy": {
-        "name": "cy"
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -14487,17 +17456,14 @@
   "WanCameraImageToVideo": {
     "display_name": "万相机图像转视频",
     "inputs": {
-      "positive": {
-        "name": "正面提示词"
+      "batch_size": {
+        "name": "批次大小"
       },
-      "negative": {
-        "name": "负面提示词"
+      "camera_conditions": {
+        "name": "相机条件"
       },
-      "vae": {
-        "name": "VAE"
-      },
-      "width": {
-        "name": "宽度"
+      "clip_vision_output": {
+        "name": "CLIP视觉输出"
       },
       "height": {
         "name": "高度"
@@ -14505,17 +17471,20 @@
       "length": {
         "name": "长度"
       },
-      "batch_size": {
-        "name": "批次大小"
+      "negative": {
+        "name": "负面提示词"
       },
-      "clip_vision_output": {
-        "name": "CLIP视觉输出"
+      "positive": {
+        "name": "正面提示词"
       },
       "start_image": {
         "name": "起始图像"
       },
-      "camera_conditions": {
-        "name": "相机条件"
+      "vae": {
+        "name": "VAE"
+      },
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -14534,12 +17503,12 @@
     }
   },
   "WanContextWindowsManual": {
-    "display_name": "WAN上下文窗口（手动）",
     "description": "手动设置类WAN模型的上下文窗口（维度=2）。",
+    "display_name": "WAN上下文窗口（手动）",
     "inputs": {
-      "model": {
-        "name": "模型",
-        "tooltip": "在采样过程中应用上下文窗口的模型。"
+      "closed_loop": {
+        "name": "闭环",
+        "tooltip": "是否关闭上下文窗口循环；仅适用于循环调度。"
       },
       "context_length": {
         "name": "上下文长度",
@@ -14557,17 +17526,17 @@
         "name": "上下文步长",
         "tooltip": "上下文窗口的步长；仅适用于均匀调度。"
       },
-      "closed_loop": {
-        "name": "闭环",
-        "tooltip": "是否关闭上下文窗口循环；仅适用于循环调度。"
+      "freenoise": {
+        "name": "Freenoise",
+        "tooltip": "是否应用 Freenoise，优化窗口融合。"
       },
       "fuse_method": {
         "name": "融合方法",
         "tooltip": "用于融合上下文窗口的方法。"
       },
-      "freenoise": {
-        "name": "Freenoise",
-        "tooltip": "是否应用 Freenoise，优化窗口融合。"
+      "model": {
+        "name": "模型",
+        "tooltip": "在采样过程中应用上下文窗口的模型。"
       }
     },
     "outputs": {
@@ -14579,17 +17548,17 @@
   "WanFirstLastFrameToVideo": {
     "display_name": "Wan首尾帧视频",
     "inputs": {
-      "positive": {
-        "name": "正向"
+      "batch_size": {
+        "name": "批量大小"
       },
-      "negative": {
-        "name": "负向"
+      "clip_vision_end_image": {
+        "name": "clip 视觉结束图像"
       },
-      "vae": {
-        "name": "vae"
+      "clip_vision_start_image": {
+        "name": "clip 视觉起始图像"
       },
-      "width": {
-        "name": "宽度"
+      "end_image": {
+        "name": "结束图像"
       },
       "height": {
         "name": "高度"
@@ -14597,20 +17566,20 @@
       "length": {
         "name": "长度"
       },
-      "batch_size": {
-        "name": "批量大小"
+      "negative": {
+        "name": "负向"
       },
-      "clip_vision_start_image": {
-        "name": "clip 视觉起始图像"
-      },
-      "clip_vision_end_image": {
-        "name": "clip 视觉结束图像"
+      "positive": {
+        "name": "正向"
       },
       "start_image": {
         "name": "起始图像"
       },
-      "end_image": {
-        "name": "结束图像"
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -14631,17 +17600,14 @@
   "WanFunControlToVideo": {
     "display_name": "WanFunControl视频",
     "inputs": {
-      "positive": {
-        "name": "正向"
+      "batch_size": {
+        "name": "批量大小"
       },
-      "negative": {
-        "name": "负向"
+      "clip_vision_output": {
+        "name": "CLIP视觉输出"
       },
-      "vae": {
-        "name": "vae"
-      },
-      "width": {
-        "name": "宽度"
+      "control_video": {
+        "name": "控制视频"
       },
       "height": {
         "name": "高度"
@@ -14649,17 +17615,20 @@
       "length": {
         "name": "长度"
       },
-      "batch_size": {
-        "name": "批量大小"
+      "negative": {
+        "name": "负向"
       },
-      "clip_vision_output": {
-        "name": "CLIP视觉输出"
+      "positive": {
+        "name": "正向"
       },
       "start_image": {
         "name": "起始图像"
       },
-      "control_video": {
-        "name": "控制视频"
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -14680,17 +17649,14 @@
   "WanFunInpaintToVideo": {
     "display_name": "WanFunInpaint视频",
     "inputs": {
-      "positive": {
-        "name": "正向"
+      "batch_size": {
+        "name": "批量大小"
       },
-      "negative": {
-        "name": "负向"
+      "clip_vision_output": {
+        "name": "CLIP视觉输出"
       },
-      "vae": {
-        "name": "vae"
-      },
-      "width": {
-        "name": "宽度"
+      "end_image": {
+        "name": "结束图像"
       },
       "height": {
         "name": "高度"
@@ -14698,17 +17664,20 @@
       "length": {
         "name": "长度"
       },
-      "batch_size": {
-        "name": "批量大小"
+      "negative": {
+        "name": "负向"
       },
-      "clip_vision_output": {
-        "name": "CLIP视觉输出"
+      "positive": {
+        "name": "正向"
       },
       "start_image": {
         "name": "起始图像"
       },
-      "end_image": {
-        "name": "结束图像"
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -14729,17 +17698,11 @@
   "WanHuMoImageToVideo": {
     "display_name": "万虎魔图像转视频",
     "inputs": {
-      "positive": {
-        "name": "正面提示词"
+      "audio_encoder_output": {
+        "name": "音频编码器输出"
       },
-      "negative": {
-        "name": "负面提示词"
-      },
-      "vae": {
-        "name": "VAE"
-      },
-      "width": {
-        "name": "宽度"
+      "batch_size": {
+        "name": "批次大小"
       },
       "height": {
         "name": "高度"
@@ -14747,14 +17710,20 @@
       "length": {
         "name": "长度"
       },
-      "batch_size": {
-        "name": "批次大小"
+      "negative": {
+        "name": "负面提示词"
       },
-      "audio_encoder_output": {
-        "name": "音频编码器输出"
+      "positive": {
+        "name": "正面提示词"
       },
       "ref_image": {
         "name": "参考图像"
+      },
+      "vae": {
+        "name": "VAE"
+      },
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -14773,25 +17742,28 @@
     }
   },
   "WanImageToImageApi": {
-    "display_name": "Wan 图像转图像",
     "description": "根据一张或两张输入图像和文本提示生成图像。输出图像目前固定为160万像素；其宽高比与输入图像匹配。",
+    "display_name": "Wan 图像转图像",
     "inputs": {
-      "model": {
-        "name": "模型",
-        "tooltip": "要使用的模型。"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "image": {
         "name": "图像",
         "tooltip": "单图编辑或多图融合，最多2张图像。"
       },
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于描述元素和视觉特征的提示词，支持英文/中文。"
+      "model": {
+        "name": "模型",
+        "tooltip": "要使用的模型。"
       },
       "negative_prompt": {
         "name": "负面提示词",
         "tooltip": "用于指导避免内容的负面文本提示。"
       },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于描述元素和视觉特征的提示词，支持英文/中文。"
+      },
       "seed": {
         "name": "种子",
         "tooltip": "生成使用的种子值。"
@@ -14799,9 +17771,6 @@
       "watermark": {
         "name": "水印",
         "tooltip": "是否在结果中添加\"AI生成\"水印。"
-      },
-      "control_after_generate": {
-        "name": "生成后控制"
       }
     },
     "outputs": {
@@ -14813,17 +17782,11 @@
   "WanImageToVideo": {
     "display_name": "图像到视频（Wan）",
     "inputs": {
-      "positive": {
-        "name": "正面"
+      "batch_size": {
+        "name": "批量大小"
       },
-      "negative": {
-        "name": "负面"
-      },
-      "vae": {
-        "name": "vae"
-      },
-      "width": {
-        "name": "宽度"
+      "clip_vision_output": {
+        "name": "clip视觉输出"
       },
       "height": {
         "name": "高度"
@@ -14831,14 +17794,20 @@
       "length": {
         "name": "长度"
       },
-      "batch_size": {
-        "name": "批量大小"
+      "negative": {
+        "name": "负面"
       },
-      "clip_vision_output": {
-        "name": "clip视觉输出"
+      "positive": {
+        "name": "正面"
       },
       "start_image": {
         "name": "开始图像"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -14857,57 +17826,57 @@
     }
   },
   "WanImageToVideoApi": {
-    "display_name": "Wan 图生视频",
     "description": "基于首帧图像和文本提示生成视频。",
+    "display_name": "Wan 图生视频",
     "inputs": {
-      "model": {
-        "name": "模型",
-        "tooltip": "要使用的模型。"
+      "audio": {
+        "name": "音频",
+        "tooltip": "音频必须包含清晰、响亮的人声，无杂音和背景音乐。"
       },
-      "image": {
-        "name": "图像"
-      },
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于描述元素和视觉特征的提示词，支持英文/中文。"
-      },
-      "negative_prompt": {
-        "name": "负面提示词",
-        "tooltip": "用于指导避免内容的负面文本提示。"
-      },
-      "resolution": {
-        "name": "分辨率"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "duration": {
         "name": "时长",
         "tooltip": "可用时长：5秒和10秒"
       },
-      "audio": {
-        "name": "音频",
-        "tooltip": "音频必须包含清晰、响亮的人声，无杂音和背景音乐。"
-      },
-      "seed": {
-        "name": "种子",
-        "tooltip": "生成使用的种子值。"
-      },
       "generate_audio": {
         "name": "生成音频",
         "tooltip": "若无音频输入，则自动生成音频。"
       },
+      "image": {
+        "name": "图像"
+      },
+      "model": {
+        "name": "模型",
+        "tooltip": "要使用的模型。"
+      },
+      "negative_prompt": {
+        "name": "负面提示词",
+        "tooltip": "用于指导避免内容的负面文本提示。"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于描述元素和视觉特征的提示词，支持英文/中文。"
+      },
       "prompt_extend": {
         "name": "优化提示词",
         "tooltip": "是否通过AI辅助增强提示词。"
       },
-      "watermark": {
-        "name": "水印",
-        "tooltip": "是否在结果中添加\"AI生成\"水印。"
+      "resolution": {
+        "name": "分辨率"
+      },
+      "seed": {
+        "name": "种子",
+        "tooltip": "生成使用的种子值。"
       },
       "shot_type": {
         "name": "镜头类型",
         "tooltip": "选择生成的视频的镜头类型，即视频是单个连续镜头还是多个剪辑镜头。需要开启 优化提示词。"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "watermark": {
+        "name": "水印",
+        "tooltip": "是否在结果中添加\"AI生成\"水印。"
       }
     },
     "outputs": {
@@ -14916,6 +17885,79 @@
       }
     }
   },
+  "WanInfiniteTalkToVideo": {
+    "display_name": "WanInfiniteTalkToVideo",
+    "inputs": {
+      "audio_encoder_output_1": {
+        "name": "音频编码器输出1"
+      },
+      "audio_scale": {
+        "name": "音频缩放"
+      },
+      "clip_vision_output": {
+        "name": "clip视觉输出"
+      },
+      "height": {
+        "name": "高度"
+      },
+      "length": {
+        "name": "长度"
+      },
+      "mode": {
+        "name": "模式"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "model_patch": {
+        "name": "模型补丁"
+      },
+      "motion_frame_count": {
+        "name": "运动帧数",
+        "tooltip": "用作运动上下文的前置帧数量。"
+      },
+      "negative": {
+        "name": "负向提示"
+      },
+      "positive": {
+        "name": "正向提示"
+      },
+      "previous_frames": {
+        "name": "前置帧"
+      },
+      "start_image": {
+        "name": "起始图像"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "宽度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "模型",
+        "tooltip": null
+      },
+      "1": {
+        "name": "正向提示",
+        "tooltip": null
+      },
+      "2": {
+        "name": "负向提示",
+        "tooltip": null
+      },
+      "3": {
+        "name": "latent",
+        "tooltip": null
+      },
+      "4": {
+        "name": "裁剪图像",
+        "tooltip": null
+      }
+    }
+  },
   "WanMoveConcatTrack": {
     "display_name": "WanMove合并轨道",
     "inputs": {
@@ -14932,6 +17974,59 @@
       }
     }
   },
+  "WanMoveTrackToVideo": {
+    "display_name": "WanMove轨道到视频",
+    "inputs": {
+      "batch_size": {
+        "name": "批次大小"
+      },
+      "clip_vision_output": {
+        "name": "CLIP视觉输出"
+      },
+      "height": {
+        "name": "高度"
+      },
+      "length": {
+        "name": "时长"
+      },
+      "negative": {
+        "name": "负面条件"
+      },
+      "positive": {
+        "name": "正面条件"
+      },
+      "start_image": {
+        "name": "起始帧"
+      },
+      "strength": {
+        "name": "强度",
+        "tooltip": "轨道条件的强度。"
+      },
+      "tracks": {
+        "name": "轨道"
+      },
+      "vae": {
+        "name": "VAE"
+      },
+      "width": {
+        "name": "宽度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "正面条件",
+        "tooltip": null
+      },
+      "1": {
+        "name": "负面条件",
+        "tooltip": null
+      },
+      "2": {
+        "name": "Latent",
+        "tooltip": null
+      }
+    }
+  },
   "WanMoveTracksFromCoords": {
     "display_name": "WanMove坐标到轨道",
     "inputs": {
@@ -14952,77 +18047,24 @@
       }
     }
   },
-  "WanMoveTrackToVideo": {
-    "display_name": "WanMove轨道到视频",
-    "inputs": {
-      "positive": {
-        "name": "正面条件"
-      },
-      "negative": {
-        "name": "负面条件"
-      },
-      "vae": {
-        "name": "VAE"
-      },
-      "strength": {
-        "name": "强度",
-        "tooltip": "轨道条件的强度。"
-      },
-      "width": {
-        "name": "宽度"
-      },
-      "height": {
-        "name": "高度"
-      },
-      "length": {
-        "name": "时长"
-      },
-      "batch_size": {
-        "name": "批次大小"
-      },
-      "start_image": {
-        "name": "起始帧"
-      },
-      "tracks": {
-        "name": "轨道"
-      },
-      "clip_vision_output": {
-        "name": "CLIP视觉输出"
-      }
-    },
-    "outputs": {
-      "0": {
-        "name": "正面条件",
-        "tooltip": null
-      },
-      "1": {
-        "name": "负面条件",
-        "tooltip": null
-      },
-      "2": {
-        "name": "Latent",
-        "tooltip": null
-      }
-    }
-  },
   "WanMoveVisualizeTracks": {
     "display_name": "WanMove预览轨道",
     "inputs": {
+      "circle_size": {
+        "name": "圆环尺寸"
+      },
       "images": {
         "name": "图像"
       },
       "line_resolution": {
         "name": "线条分辨率"
       },
-      "circle_size": {
-        "name": "圆环尺寸"
+      "line_width": {
+        "name": "线条宽度"
       },
       "opacity": {
         "name": "不透明度"
       },
-      "line_width": {
-        "name": "线条宽度"
-      },
       "tracks": {
         "name": "轨道"
       }
@@ -15036,29 +18078,29 @@
   "WanPhantomSubjectToVideo": {
     "display_name": "WanPhantom主体转视频",
     "inputs": {
-      "positive": {
-        "name": "正面提示词"
+      "batch_size": {
+        "name": "批次大小"
+      },
+      "height": {
+        "name": "高度"
+      },
+      "images": {
+        "name": "图像"
+      },
+      "length": {
+        "name": "长度"
       },
       "negative": {
         "name": "负面提示词"
       },
+      "positive": {
+        "name": "正面提示词"
+      },
       "vae": {
         "name": "VAE"
       },
       "width": {
         "name": "宽度"
-      },
-      "height": {
-        "name": "高度"
-      },
-      "length": {
-        "name": "长度"
-      },
-      "batch_size": {
-        "name": "批次大小"
-      },
-      "images": {
-        "name": "图像"
       }
     },
     "outputs": {
@@ -15080,20 +18122,59 @@
       }
     }
   },
-  "WanSoundImageToVideo": {
-    "display_name": "图像到视频（WanSound）",
+  "WanReferenceVideoApi": {
+    "description": "使用输入视频中的角色和声音，结合提示词，生成保持角色一致性的新视频。",
+    "display_name": "Wan 参考视频生成",
     "inputs": {
-      "positive": {
-        "name": "正面提示词"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
-      "negative": {
-        "name": "负面提示词"
+      "duration": {
+        "name": "时长"
       },
-      "vae": {
-        "name": "VAE"
+      "model": {
+        "name": "模型"
       },
-      "width": {
-        "name": "宽度"
+      "negative_prompt": {
+        "name": "反向提示词",
+        "tooltip": "描述需要避免内容的反向提示词。"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "描述元素和视觉特征的提示词。支持英文和中文。使用如 `character1` 和 `character2` 这样的标识符来指代参考角色。"
+      },
+      "reference_videos": {
+        "name": "参考视频"
+      },
+      "seed": {
+        "name": "种子"
+      },
+      "shot_type": {
+        "name": "镜头类型",
+        "tooltip": "指定生成视频的镜头类型，即视频是单一连续镜头还是包含多个剪辑的镜头。"
+      },
+      "size": {
+        "name": "尺寸"
+      },
+      "watermark": {
+        "name": "水印",
+        "tooltip": "是否为结果添加 AI 生成的水印。"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WanSCAILToVideo": {
+    "display_name": "WanSCAILToVideo",
+    "inputs": {
+      "batch_size": {
+        "name": "批量大小"
+      },
+      "clip_vision_output": {
+        "name": "clip视觉输出"
       },
       "height": {
         "name": "高度"
@@ -15101,20 +18182,88 @@
       "length": {
         "name": "长度"
       },
-      "batch_size": {
-        "name": "批次大小"
+      "negative": {
+        "name": "负向"
       },
+      "pose_end": {
+        "name": "姿态结束步",
+        "tooltip": "用于姿态调控的结束步数。"
+      },
+      "pose_start": {
+        "name": "姿态起始步",
+        "tooltip": "用于姿态调控的起始步数。"
+      },
+      "pose_strength": {
+        "name": "姿态强度",
+        "tooltip": "姿态latent的强度。"
+      },
+      "pose_video": {
+        "name": "姿态视频",
+        "tooltip": "用于姿态调控的视频。将被缩小到主视频分辨率的一半。"
+      },
+      "positive": {
+        "name": "正向"
+      },
+      "reference_image": {
+        "name": "参考图像"
+      },
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "宽度"
+      }
+    },
+    "outputs": {
+      "0": {
+        "name": "正向",
+        "tooltip": null
+      },
+      "1": {
+        "name": "负向",
+        "tooltip": null
+      },
+      "2": {
+        "name": "latent",
+        "tooltip": "生成尺寸的空latent。"
+      }
+    }
+  },
+  "WanSoundImageToVideo": {
+    "display_name": "图像到视频（WanSound）",
+    "inputs": {
       "audio_encoder_output": {
         "name": "音频编码器输出"
       },
-      "ref_image": {
-        "name": "参考图像"
+      "batch_size": {
+        "name": "批次大小"
       },
       "control_video": {
         "name": "控制视频"
       },
+      "height": {
+        "name": "高度"
+      },
+      "length": {
+        "name": "长度"
+      },
+      "negative": {
+        "name": "负面提示词"
+      },
+      "positive": {
+        "name": "正面提示词"
+      },
+      "ref_image": {
+        "name": "参考图像"
+      },
       "ref_motion": {
         "name": "参考动作"
+      },
+      "vae": {
+        "name": "VAE"
+      },
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -15135,29 +18284,29 @@
   "WanSoundImageToVideoExtend": {
     "display_name": "图像到视频扩展（WanSound）",
     "inputs": {
-      "positive": {
-        "name": "正面提示词"
+      "audio_encoder_output": {
+        "name": "音频编码器输出"
       },
-      "negative": {
-        "name": "负面提示词"
-      },
-      "vae": {
-        "name": "VAE"
+      "control_video": {
+        "name": "控制视频"
       },
       "length": {
         "name": "长度"
       },
-      "video_latent": {
-        "name": "视频潜变量"
+      "negative": {
+        "name": "负面提示词"
       },
-      "audio_encoder_output": {
-        "name": "音频编码器输出"
+      "positive": {
+        "name": "正面提示词"
       },
       "ref_image": {
         "name": "参考图像"
       },
-      "control_video": {
-        "name": "控制视频"
+      "vae": {
+        "name": "VAE"
+      },
+      "video_latent": {
+        "name": "视频潜变量"
       }
     },
     "outputs": {
@@ -15176,41 +18325,41 @@
     }
   },
   "WanTextToImageApi": {
-    "display_name": "Wan文生图",
     "description": "基于文本提示生成图像。",
+    "display_name": "Wan文生图",
     "inputs": {
+      "control_after_generate": {
+        "name": "生成后控制"
+      },
+      "height": {
+        "name": "高度"
+      },
       "model": {
         "name": "模型",
         "tooltip": "要使用的模型。"
       },
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于描述元素和视觉特征的提示词，支持英文/中文。"
-      },
       "negative_prompt": {
         "name": "负面提示词",
         "tooltip": "用于指导避免内容的负面文本提示。"
       },
-      "width": {
-        "name": "宽度"
-      },
-      "height": {
-        "name": "高度"
-      },
-      "seed": {
-        "name": "种子",
-        "tooltip": "用于生成的种子值。"
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于描述元素和视觉特征的提示词，支持英文/中文。"
       },
       "prompt_extend": {
         "name": "提示词增强",
         "tooltip": "是否使用AI辅助增强提示词。"
       },
+      "seed": {
+        "name": "种子",
+        "tooltip": "用于生成的种子值。"
+      },
       "watermark": {
         "name": "水印",
         "tooltip": "是否在结果中添加\"AI生成\"水印。"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -15220,54 +18369,54 @@
     }
   },
   "WanTextToVideoApi": {
-    "display_name": "Wan文生视频",
     "description": "基于文本提示生成视频。",
+    "display_name": "Wan文生视频",
     "inputs": {
-      "model": {
-        "name": "模型",
-        "tooltip": "要使用的模型。"
+      "audio": {
+        "name": "音频",
+        "tooltip": "音频必须包含清晰、响亮的人声，无杂音和背景音乐。"
       },
-      "prompt": {
-        "name": "提示词",
-        "tooltip": "用于描述元素和视觉特征的提示词，支持英文/中文。"
-      },
-      "negative_prompt": {
-        "name": "负面提示词",
-        "tooltip": "用于引导避免内容的负面文本提示。"
-      },
-      "size": {
-        "name": "尺寸"
+      "control_after_generate": {
+        "name": "生成后控制"
       },
       "duration": {
         "name": "时长",
         "tooltip": "可用时长：5秒和10秒"
       },
-      "audio": {
-        "name": "音频",
-        "tooltip": "音频必须包含清晰、响亮的人声，无杂音和背景音乐。"
-      },
-      "seed": {
-        "name": "随机种",
-        "tooltip": "用于生成的种子值。"
-      },
       "generate_audio": {
         "name": "生成音频",
         "tooltip": "若无音频输入，则自动生成音频。"
       },
+      "model": {
+        "name": "模型",
+        "tooltip": "要使用的模型。"
+      },
+      "negative_prompt": {
+        "name": "负面提示词",
+        "tooltip": "用于引导避免内容的负面文本提示。"
+      },
+      "prompt": {
+        "name": "提示词",
+        "tooltip": "用于描述元素和视觉特征的提示词，支持英文/中文。"
+      },
       "prompt_extend": {
         "name": "优化提示词",
         "tooltip": "是否通过AI辅助增强提示词。"
       },
-      "watermark": {
-        "name": "水印",
-        "tooltip": "是否在结果中添加“AI生成”水印。"
+      "seed": {
+        "name": "随机种",
+        "tooltip": "用于生成的种子值。"
       },
       "shot_type": {
         "name": "镜头类型",
         "tooltip": "选择生成的视频的镜头类型，即视频是单个连续镜头还是多个剪辑镜头。需要开启 优化提示词。"
       },
-      "control_after_generate": {
-        "name": "生成后控制"
+      "size": {
+        "name": "尺寸"
+      },
+      "watermark": {
+        "name": "水印",
+        "tooltip": "是否在结果中添加“AI生成”水印。"
       }
     },
     "outputs": {
@@ -15279,20 +18428,11 @@
   "WanTrackToVideo": {
     "display_name": "WanTrack视频",
     "inputs": {
-      "positive": {
-        "name": "正面条件"
+      "batch_size": {
+        "name": "批次大小"
       },
-      "negative": {
-        "name": "负面条件"
-      },
-      "vae": {
-        "name": "vae"
-      },
-      "tracks": {
-        "name": "tracks"
-      },
-      "width": {
-        "name": "宽度"
+      "clip_vision_output": {
+        "name": "CLIP视觉输出"
       },
       "height": {
         "name": "高度"
@@ -15300,8 +18440,14 @@
       "length": {
         "name": "长度"
       },
-      "batch_size": {
-        "name": "批次大小"
+      "negative": {
+        "name": "负面条件"
+      },
+      "positive": {
+        "name": "正面条件"
+      },
+      "start_image": {
+        "name": "图像"
       },
       "temperature": {
         "name": "温度"
@@ -15309,11 +18455,14 @@
       "topk": {
         "name": "topk"
       },
-      "start_image": {
-        "name": "图像"
+      "tracks": {
+        "name": "tracks"
       },
-      "clip_vision_output": {
-        "name": "CLIP视觉输出"
+      "vae": {
+        "name": "vae"
+      },
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -15334,17 +18483,14 @@
   "WanVaceToVideo": {
     "display_name": "WanVace视频",
     "inputs": {
-      "positive": {
-        "name": "正面条件"
+      "batch_size": {
+        "name": "批量大小"
       },
-      "negative": {
-        "name": "负面条件"
+      "control_masks": {
+        "name": "控制遮罩"
       },
-      "vae": {
-        "name": "vae"
-      },
-      "width": {
-        "name": "宽度"
+      "control_video": {
+        "name": "控制视频"
       },
       "height": {
         "name": "高度"
@@ -15352,20 +18498,23 @@
       "length": {
         "name": "长度"
       },
-      "batch_size": {
-        "name": "批量大小"
+      "negative": {
+        "name": "负面条件"
+      },
+      "positive": {
+        "name": "正面条件"
+      },
+      "reference_image": {
+        "name": "参考图像"
       },
       "strength": {
         "name": "强度"
       },
-      "control_video": {
-        "name": "控制视频"
+      "vae": {
+        "name": "vae"
       },
-      "control_masks": {
-        "name": "控制遮罩"
-      },
-      "reference_image": {
-        "name": "参考图像"
+      "width": {
+        "name": "宽度"
       }
     },
     "outputs": {
@@ -15387,39 +18536,64 @@
       }
     }
   },
+  "WavespeedFlashVSRNode": {
+    "description": "快速高质量的视频超分辨率工具，可提升分辨率并恢复低分辨率或模糊视频的清晰度。",
+    "display_name": "FlashVSR 视频超分辨率",
+    "inputs": {
+      "target_resolution": {
+        "name": "target_resolution"
+      },
+      "video": {
+        "name": "video"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
+  "WavespeedImageUpscaleNode": {
+    "description": "提升图像分辨率和质量，将照片放大至 4K 或 8K，获得清晰细致的效果。",
+    "display_name": "WaveSpeed 图像超分辨率",
+    "inputs": {
+      "image": {
+        "name": "image"
+      },
+      "model": {
+        "name": "model"
+      },
+      "target_resolution": {
+        "name": "target_resolution"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
+      }
+    }
+  },
   "WebcamCapture": {
     "display_name": "网络摄像头捕获",
     "inputs": {
-      "image": {
-        "name": "图像"
-      },
-      "width": {
-        "name": "宽度"
+      "capture_on_queue": {
+        "name": "执行时捕获"
       },
       "height": {
         "name": "高度"
       },
-      "capture_on_queue": {
-        "name": "执行时捕获"
+      "image": {
+        "name": "图像"
       },
-      "waiting for camera___": {}
+      "waiting for camera___": {},
+      "width": {
+        "name": "宽度"
+      }
     }
   },
   "ZImageFunControlnet": {
     "display_name": "ZImageFunControlnet",
     "inputs": {
-      "model": {
-        "name": "模型"
-      },
-      "model_patch": {
-        "name": "模型补丁"
-      },
-      "vae": {
-        "name": "VAE"
-      },
-      "strength": {
-        "name": "强度"
-      },
       "image": {
         "name": "图像"
       },
@@ -15428,7 +18602,58 @@
       },
       "mask": {
         "name": "遮罩"
+      },
+      "model": {
+        "name": "模型"
+      },
+      "model_patch": {
+        "name": "模型补丁"
+      },
+      "strength": {
+        "name": "强度"
+      },
+      "vae": {
+        "name": "VAE"
+      }
+    }
+  },
+  "unCLIPCheckpointLoader": {
+    "display_name": "unCLIPCheckpoint加载器",
+    "inputs": {
+      "ckpt_name": {
+        "name": "Checkpoint名称"
+      }
+    }
+  },
+  "unCLIPConditioning": {
+    "display_name": "unCLIP条件",
+    "inputs": {
+      "clip_vision_output": {
+        "name": "CLIP视觉输出"
+      },
+      "conditioning": {
+        "name": "条件"
+      },
+      "noise_augmentation": {
+        "name": "噪波增强"
+      },
+      "strength": {
+        "name": "强度"
+      }
+    }
+  },
+  "wanBlockSwap": {
+    "description": "NOP",
+    "display_name": "Wan块置换",
+    "inputs": {
+      "model": {
+        "name": "模型"
+      }
+    },
+    "outputs": {
+      "0": {
+        "tooltip": null
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/zh/settings.json b/src/locales/zh/settings.json
index 847861dfef..4afce5f992 100644
--- a/src/locales/zh/settings.json
+++ b/src/locales/zh/settings.json
@@ -19,11 +19,11 @@
   },
   "Comfy-Desktop_WindowStyle": {
     "name": "窗口样式",
-    "tooltip": "选择自定义选项以隐藏系统标题栏",
     "options": {
-      "default": "默认",
-      "custom": "自定义"
-    }
+      "custom": "自定义",
+      "default": "默认"
+    },
+    "tooltip": "选择自定义选项以隐藏系统标题栏"
   },
   "Comfy_Canvas_BackgroundImage": {
     "name": "画布背景图像",
@@ -46,17 +46,21 @@
   "Comfy_Canvas_NavigationMode": {
     "name": "画布导航模式",
     "options": {
-      "Standard (New)": "标准（新）",
+      "Custom": "自定义",
       "Drag Navigation": "拖动画布",
-      "Custom": "自定义"
+      "Standard (New)": "标准（新）"
     }
   },
   "Comfy_Canvas_SelectionToolbox": {
-    "name": "显示选择工具箱"
+    "name": "显示选择工具箱",
+    "tooltip": "当选择节点时显示浮动工具栏，便于快速访问常用操作。"
   },
   "Comfy_ConfirmClear": {
     "name": "清除工作流时需要确认"
   },
+  "Comfy_DOMClippingEnabled": {
+    "name": "启用DOM元素裁剪（启用可能会降低性能）"
+  },
   "Comfy_DevMode": {
     "name": "启用开发模式选项（API保存等）"
   },
@@ -67,9 +71,6 @@
   "Comfy_DisableSliders": {
     "name": "禁用节点组件滑块"
   },
-  "Comfy_DOMClippingEnabled": {
-    "name": "启用DOM元素裁剪（启用可能会降低性能）"
-  },
   "Comfy_EditAttention_Delta": {
     "name": "Ctrl+上/下 精度"
   },
@@ -81,14 +82,14 @@
   },
   "Comfy_Execution_PreviewMethod": {
     "name": "实时预览",
-    "tooltip": "图像生成过程中实时预览。 \"默认\" 使用服务器 CLI 设置。",
     "options": {
-      "default": "默认",
-      "none": "无",
       "auto": "自动",
+      "default": "默认",
       "latent2rgb": "latent2rgb",
+      "none": "无",
       "taesd": "taesd"
-    }
+    },
+    "tooltip": "图像生成过程中实时预览。 \"默认\" 使用服务器 CLI 设置。"
   },
   "Comfy_FloatRoundingPrecision": {
     "name": "浮点组件四舍五入的小数位数 [0 = 自动]。",
@@ -103,12 +104,16 @@
   "Comfy_Graph_CtrlShiftZoom": {
     "name": "启用快速缩放快捷键（Ctrl + Shift + 拖动）"
   },
+  "Comfy_Graph_DeduplicateSubgraphNodeIds": {
+    "name": "去重子图节点ID",
+    "tooltip": "在加载工作流时，自动重新分配子图中重复的节点ID。"
+  },
   "Comfy_Graph_LinkMarkers": {
     "name": "连线中点标记",
     "options": {
-      "None": "无",
+      "Arrow": "箭头",
       "Circle": "圆",
-      "Arrow": "箭头"
+      "None": "无"
     }
   },
   "Comfy_Graph_LiveSelection": {
@@ -118,36 +123,37 @@
   "Comfy_Graph_ZoomSpeed": {
     "name": "画布缩放速度"
   },
-  "Comfy_Group_DoubleClickTitleToEdit": {
-    "name": "双击组标题以编辑"
-  },
   "Comfy_GroupSelectedNodes_Padding": {
     "name": "选定节点的组内边距"
   },
+  "Comfy_Group_DoubleClickTitleToEdit": {
+    "name": "双击组标题以编辑"
+  },
   "Comfy_LinkRelease_Action": {
     "name": "释放连线时的操作",
     "options": {
       "context menu": "上下文菜单",
-      "search box": "搜索框",
-      "no action": "无操作"
+      "no action": "无操作",
+      "search box": "搜索框"
     }
   },
   "Comfy_LinkRelease_ActionShift": {
     "name": "释放连线时的操作（Shift）",
     "options": {
       "context menu": "上下文菜单",
-      "search box": "搜索框",
-      "no action": "无操作"
+      "no action": "无操作",
+      "search box": "搜索框"
     }
   },
   "Comfy_LinkRenderMode": {
     "name": "连线渲染样式",
     "options": {
-      "Straight": "直角线",
+      "Hidden": "隐藏",
       "Linear": "直线",
       "Spline": "曲线",
-      "Hidden": "隐藏"
-    }
+      "Straight": "直角线"
+    },
+    "tooltip": "控制画布上节点之间连接线的外观和可见性。"
   },
   "Comfy_Load3D_3DViewerEnable": {
     "name": "启用3D查看器（测试版）",
@@ -155,44 +161,44 @@
   },
   "Comfy_Load3D_BackgroundColor": {
     "name": "初始背景颜色",
-    "tooltip": "控制3D场景的默认背景颜色。此设置决定新建3D组件时的背景外观，但每个组件在创建后都可以单独调整。"
+    "tooltip": "控制3D场景的默认背景颜色。此设置决定新建3D组件时的背景外观，但每个组件创建后可单独调整。"
   },
   "Comfy_Load3D_CameraType": {
-    "name": "摄像机类型",
-    "tooltip": "控制创建新的3D小部件时，默认的相机是透视还是正交。这个默认设置仍然可以在创建后为每个小部件单独切换。",
+    "name": "初始相机类型",
     "options": {
-      "perspective": "透视",
-      "orthographic": "正交"
-    }
+      "orthographic": "正交",
+      "perspective": "透视"
+    },
+    "tooltip": "控制新建3D组件时相机默认是透视还是正交。此默认值可在每个组件创建后单独切换。"
   },
   "Comfy_Load3D_LightAdjustmentIncrement": {
     "name": "光照调整步长",
-    "tooltip": "控制在3D场景中调整光照强度时的步长。较小的步长值可以实现更精细的光照调整，较大的值则会使每次调整的变化更加明显。"
+    "tooltip": "控制调整3D场景光照强度时的步长。较小的步长值可实现更精细的光照调整，较大的值则每次调整变化更明显。"
   },
   "Comfy_Load3D_LightIntensity": {
     "name": "初始光照强度",
-    "tooltip": "设置3D场景中灯光的默认亮度级别。该数值决定新建3D控件时灯光照亮物体的强度，但每个控件在创建后都可以单独调整。"
+    "tooltip": "设置3D场景光照的默认亮度级别。此值决定新建3D组件时灯光照亮物体的强度，但每个组件创建后可单独调整。"
   },
   "Comfy_Load3D_LightIntensityMaximum": {
-    "name": "最大光照强度",
-    "tooltip": "设置3D场景允许的最大光照强度值。此项定义了在调整任何3D控件照明时可设定的最高亮度上限。"
+    "name": "光照强度上限",
+    "tooltip": "设置3D场景允许的最大光照强度值。此值定义在任何3D组件中调整光照时可设置的最大亮度。"
   },
   "Comfy_Load3D_LightIntensityMinimum": {
     "name": "光照强度下限",
-    "tooltip": "设置3D场景允许的最小光照强度值。此项定义在调整任何3D控件照明时可设定的最低亮度。"
+    "tooltip": "设置3D场景允许的最小光照强度值。此值定义在任何3D组件中调整光照时可设置的最小亮度。"
   },
   "Comfy_Load3D_PLYEngine": {
-    "name": "PLY 引擎",
-    "tooltip": "选择加载 PLY 文件的引擎。 \"threejs\" 使用原生 Three.js PLY 加载器（最适合网格 PLY）。 \"fastply\" 使用专用于 ASCII 点云的 PLY 文件加载器。 \"sparkjs\" 使用 Spark.js 加载 3D 高斯泼溅 PLY 文件。",
+    "name": "PLY引擎",
     "options": {
-      "threejs": "threejs",
       "fastply": "fastply",
-      "sparkjs": "sparkjs"
-    }
+      "sparkjs": "sparkjs",
+      "threejs": "threejs"
+    },
+    "tooltip": "选择用于加载PLY文件的引擎。\"threejs\" 使用原生Three.js PLYLoader（适合网格PLY文件）。\"fastply\" 用于优化的ASCII点云PLY文件加载。\"sparkjs\" 用于3D高斯斑点PLY文件的Spark.js。"
   },
   "Comfy_Load3D_ShowGrid": {
-    "name": "显示网格",
-    "tooltip": "默认显示网格开关"
+    "name": "初始网格可见性",
+    "tooltip": "控制新建3D组件时网格是否默认可见。此默认值可在每个组件创建后单独切换。"
   },
   "Comfy_Locale": {
     "name": "语言"
@@ -211,15 +217,80 @@
   },
   "Comfy_ModelLibrary_NameFormat": {
     "name": "在模型库树视图中显示的名称",
-    "tooltip": "选择“文件名”以在模型列表中显示原始文件名的简化视图（不带目录和“.safetensors”后缀名）。选择“标题”以显示可配置的模型元数据标题。",
     "options": {
       "filename": "文件名",
       "title": "标题"
+    },
+    "tooltip": "选择“文件名”以在模型列表中显示原始文件名的简化视图（不带目录和“.safetensors”后缀名）。选择“标题”以显示可配置的模型元数据标题。"
+  },
+  "Comfy_NodeBadge_NodeIdBadgeMode": {
+    "name": "节点ID标签",
+    "options": {
+      "None": "无",
+      "Show all": "显示全部"
     }
   },
+  "Comfy_NodeBadge_NodeLifeCycleBadgeMode": {
+    "name": "节点制作周期标签",
+    "options": {
+      "None": "无",
+      "Show all": "显示全部"
+    }
+  },
+  "Comfy_NodeBadge_NodeSourceBadgeMode": {
+    "name": "节点源标签",
+    "options": {
+      "Hide built-in": "仅第三方",
+      "None": "无",
+      "Show all": "显示全部"
+    }
+  },
+  "Comfy_NodeBadge_ShowApiPricing": {
+    "name": "显示 API 节点定价徽章"
+  },
+  "Comfy_NodeLibrary_NewDesign": {
+    "name": "全新节点库设计",
+    "tooltip": "启用带有标签页（基础、全部、自定义）、改进搜索和悬停预览功能的全新节点库侧边栏。"
+  },
+  "Comfy_NodeReplacement_Enabled": {
+    "name": "启用自动节点替换",
+    "tooltip": "启用后，如果存在替换映射，缺失的节点可以自动替换为其较新的等效节点。"
+  },
+  "Comfy_NodeSearchBoxImpl": {
+    "name": "节点搜索框",
+    "options": {
+      "default": "默认",
+      "litegraph (legacy)": "litegraph（旧版）",
+      "v1 (legacy)": "v1（旧版）"
+    }
+  },
+  "Comfy_NodeSearchBoxImpl_NodePreview": {
+    "name": "显示节点预览",
+    "tooltip": "仅适用于默认框架"
+  },
+  "Comfy_NodeSearchBoxImpl_ShowCategory": {
+    "name": "显示节点类别",
+    "tooltip": "仅适用于默认框架"
+  },
+  "Comfy_NodeSearchBoxImpl_ShowIdName": {
+    "name": "显示节点ID名称",
+    "tooltip": "仅适用于默认框架"
+  },
+  "Comfy_NodeSearchBoxImpl_ShowNodeFrequency": {
+    "name": "显示节点频率",
+    "tooltip": "仅适用于默认框架"
+  },
+  "Comfy_NodeSuggestions_number": {
+    "name": "节点建议数量",
+    "tooltip": "仅适用于 litegraph"
+  },
   "Comfy_Node_AllowImageSizeDraw": {
     "name": "在图像预览下方显示宽度×高度"
   },
+  "Comfy_Node_AlwaysShowAdvancedWidgets": {
+    "name": "始终在所有节点上显示高级控件",
+    "tooltip": "启用后，所有节点的高级控件将始终可见，无需单独展开。"
+  },
   "Comfy_Node_AutoSnapLinkToSlot": {
     "name": "连线自动吸附到节点接口",
     "tooltip": "在节点上拖动连线时，连线会自动吸附到节点的可用输入接口。"
@@ -249,58 +320,6 @@
     "name": "吸附高亮节点",
     "tooltip": "在拖动连线经过具有可用输入接口的节点时，高亮显示该节点。"
   },
-  "Comfy_NodeBadge_NodeIdBadgeMode": {
-    "name": "节点ID标签",
-    "options": {
-      "None": "无",
-      "Show all": "显示全部"
-    }
-  },
-  "Comfy_NodeBadge_NodeLifeCycleBadgeMode": {
-    "name": "节点制作周期标签",
-    "options": {
-      "None": "无",
-      "Show all": "显示全部"
-    }
-  },
-  "Comfy_NodeBadge_NodeSourceBadgeMode": {
-    "name": "节点源标签",
-    "options": {
-      "None": "无",
-      "Show all": "显示全部",
-      "Hide built-in": "仅第三方"
-    }
-  },
-  "Comfy_NodeBadge_ShowApiPricing": {
-    "name": "显示 API 节点定价徽章"
-  },
-  "Comfy_NodeSearchBoxImpl": {
-    "name": "节点搜索框",
-    "options": {
-      "default": "默认",
-      "litegraph (legacy)": "litegraph（旧版）"
-    }
-  },
-  "Comfy_NodeSearchBoxImpl_NodePreview": {
-    "name": "显示节点预览",
-    "tooltip": "仅适用于默认框架"
-  },
-  "Comfy_NodeSearchBoxImpl_ShowCategory": {
-    "name": "显示节点类别",
-    "tooltip": "仅适用于默认框架"
-  },
-  "Comfy_NodeSearchBoxImpl_ShowIdName": {
-    "name": "显示节点ID名称",
-    "tooltip": "仅适用于默认框架"
-  },
-  "Comfy_NodeSearchBoxImpl_ShowNodeFrequency": {
-    "name": "显示节点频率",
-    "tooltip": "仅适用于默认框架"
-  },
-  "Comfy_NodeSuggestions_number": {
-    "name": "节点建议数量",
-    "tooltip": "仅适用于 litegraph"
-  },
   "Comfy_Notification_ShowVersionUpdates": {
     "name": "显示版本更新",
     "tooltip": "显示新模型和主要新功能的更新。"
@@ -324,13 +343,21 @@
   "Comfy_PromptFilename": {
     "name": "保存工作流时提示文件名"
   },
+  "Comfy_QueueButton_BatchCountLimit": {
+    "name": "批处理计数限制",
+    "tooltip": "单次添加到队列的最大任务数量"
+  },
   "Comfy_Queue_MaxHistoryItems": {
     "name": "队列历史大小",
     "tooltip": "队列历史中显示的最大任务数量。"
   },
-  "Comfy_QueueButton_BatchCountLimit": {
-    "name": "批处理计数限制",
-    "tooltip": "单次添加到队列的最大任务数量"
+  "Comfy_Queue_QPOV2": {
+    "name": "在资源侧边栏中使用统一作业队列",
+    "tooltip": "将浮动作业队列面板替换为嵌入资源侧边栏的等效作业队列。您可以禁用此选项以恢复为浮动面板布局。"
+  },
+  "Comfy_RightSidePanel_ShowErrorsTab": {
+    "name": "在侧边面板显示错误标签页",
+    "tooltip": "启用后，右侧面板将显示一个错误标签页，可一目了然地查看工作流执行错误。"
   },
   "Comfy_Sidebar_Location": {
     "name": "侧边栏位置",
@@ -349,8 +376,8 @@
   "Comfy_Sidebar_Style": {
     "name": "侧边栏样式",
     "options": {
-      "floating": "浮动式",
-      "connected": "连接式"
+      "connected": "连接式",
+      "floating": "浮动式"
     }
   },
   "Comfy_Sidebar_UnifiedWidth": {
@@ -369,13 +396,21 @@
   "Comfy_TreeExplorer_ItemPadding": {
     "name": "树形浏览器项目内边距"
   },
+  "Comfy_UI_TabBarLayout": {
+    "name": "标签栏布局",
+    "options": {
+      "Default": "默认",
+      "Integrated": "集成"
+    },
+    "tooltip": "控制标签栏的布局。“集成”会将帮助和用户控件移动到标签栏区域。"
+  },
   "Comfy_UseNewMenu": {
     "name": "使用新菜单",
-    "tooltip": "选单列位置。在行动装置上，选单始终显示于顶端。",
     "options": {
       "Disabled": "禁用",
       "Top": "顶部"
-    }
+    },
+    "tooltip": "选单列位置。在行动装置上，选单始终显示于顶端。"
   },
   "Comfy_Validation_Workflows": {
     "name": "校验工作流"
@@ -390,11 +425,11 @@
   },
   "Comfy_WidgetControlMode": {
     "name": "组件控制模式",
-    "tooltip": "控制组件值的更新时机（随机/增加/减少），可以在执行工作流之前或之后。",
     "options": {
-      "before": "之前",
-      "after": "之后"
-    }
+      "after": "之后",
+      "before": "之前"
+    },
+    "tooltip": "控制组件值的更新时机（随机/增加/减少），可以在执行工作流之前或之后。"
   },
   "Comfy_Window_UnloadConfirmation": {
     "name": "关闭窗口时显示确认"
@@ -402,8 +437,8 @@
   "Comfy_Workflow_AutoSave": {
     "name": "自动保存",
     "options": {
-      "off": "关闭",
-      "after delay": "延迟后"
+      "after delay": "延迟后",
+      "off": "关闭"
     }
   },
   "Comfy_Workflow_AutoSaveDelay": {
@@ -458,6 +493,7 @@
     "tooltip": "贝塞尔控制点从重新路由中心点的偏移"
   },
   "pysssss_SnapToGrid": {
-    "name": "始终吸附到网格"
+    "name": "始终吸附到网格",
+    "tooltip": "启用后，移动或调整节点大小时会自动对齐到网格。"
   }
-}
\ No newline at end of file
+}
diff --git a/src/main.ts b/src/main.ts
index 94af1fcd96..1ec8303453 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -14,6 +14,7 @@ import { VueFire, VueFireAuth } from 'vuefire'
 import { getFirebaseConfig } from '@/config/firebase'
 import '@/lib/litegraph/public/css/litegraph.css'
 import router from '@/router'
+import { useBootstrapStore } from '@/stores/bootstrapStore'
 
 import App from './App.vue'
 // Intentionally relative import to ensure the CSS is loaded in the right order (after litegraph.css)
@@ -24,12 +25,15 @@ import { i18n } from './i18n'
  * CRITICAL: Load remote config FIRST for cloud builds to ensure
  * window.__CONFIG__is available for all modules during initialization
  */
-import { isCloud } from '@/platform/distribution/types'
+const isCloud = __DISTRIBUTION__ === 'cloud'
 
 if (isCloud) {
-  const { loadRemoteConfig } =
-    await import('@/platform/remoteConfig/remoteConfig')
-  await loadRemoteConfig()
+  const { refreshRemoteConfig } =
+    await import('@/platform/remoteConfig/refreshRemoteConfig')
+  await refreshRemoteConfig({ useAuth: false })
+
+  const { initTelemetry } = await import('@/platform/telemetry/initTelemetry')
+  await initTelemetry()
 }
 
 const ComfyUIPreset = definePreset(Aura, {
@@ -43,6 +47,7 @@ const firebaseApp = initializeApp(getFirebaseConfig())
 
 const app = createApp(App)
 const pinia = createPinia()
+
 Sentry.init({
   app,
   dsn: __SENTRY_DSN__,
@@ -88,4 +93,7 @@ app
     modules: [VueFireAuth()]
   })
 
+const bootstrapStore = useBootstrapStore(pinia)
+void bootstrapStore.startStoreBootstrap()
+
 app.mount('#vue-app')
diff --git a/src/platform/assets/components/ActiveMediaAssetCard.stories.ts b/src/platform/assets/components/ActiveMediaAssetCard.stories.ts
new file mode 100644
index 0000000000..1e32e96b2e
--- /dev/null
+++ b/src/platform/assets/components/ActiveMediaAssetCard.stories.ts
@@ -0,0 +1,143 @@
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+
+import type { JobListItem } from '@/composables/queue/useJobList'
+
+import ActiveMediaAssetCard from './ActiveMediaAssetCard.vue'
+
+const meta: Meta<typeof ActiveMediaAssetCard> = {
+  title: 'Platform/Assets/ActiveMediaAssetCard',
+  component: ActiveMediaAssetCard
+}
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+const SAMPLE_PREVIEW =
+  'https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/images/BigBuckBunny.jpg'
+
+function createJob(overrides: Partial<JobListItem> = {}): JobListItem {
+  return {
+    id: 'job-1',
+    title: 'Running...',
+    meta: 'Step 5/10',
+    state: 'running',
+    progressTotalPercent: 50,
+    progressCurrentPercent: 75,
+    ...overrides
+  }
+}
+
+export const Running: Story = {
+  decorators: [
+    () => ({
+      template: '<div style="max-width: 220px;"><story /></div>'
+    })
+  ],
+  args: {
+    job: createJob({
+      state: 'running',
+      progressTotalPercent: 65,
+      iconImageUrl: SAMPLE_PREVIEW
+    })
+  }
+}
+
+export const RunningWithoutPreview: Story = {
+  decorators: [
+    () => ({
+      template: '<div style="max-width: 220px;"><story /></div>'
+    })
+  ],
+  args: {
+    job: createJob({
+      state: 'running',
+      progressTotalPercent: 30
+    })
+  }
+}
+
+export const Pending: Story = {
+  decorators: [
+    () => ({
+      template: '<div style="max-width: 220px;"><story /></div>'
+    })
+  ],
+  args: {
+    job: createJob({
+      state: 'pending',
+      title: 'In queue...',
+      progressTotalPercent: undefined
+    })
+  }
+}
+
+export const Initialization: Story = {
+  decorators: [
+    () => ({
+      template: '<div style="max-width: 220px;"><story /></div>'
+    })
+  ],
+  args: {
+    job: createJob({
+      state: 'initialization',
+      title: 'Initializing...',
+      progressTotalPercent: undefined
+    })
+  }
+}
+
+export const Failed: Story = {
+  decorators: [
+    () => ({
+      template: '<div style="max-width: 220px;"><story /></div>'
+    })
+  ],
+  args: {
+    job: createJob({
+      state: 'failed',
+      title: 'Failed'
+    })
+  }
+}
+
+export const GridLayout: Story = {
+  render: () => ({
+    components: { ActiveMediaAssetCard },
+    setup() {
+      const jobs: JobListItem[] = [
+        createJob({
+          id: 'job-1',
+          state: 'running',
+          progressTotalPercent: 75,
+          iconImageUrl: SAMPLE_PREVIEW
+        }),
+        createJob({
+          id: 'job-2',
+          state: 'running',
+          progressTotalPercent: 45
+        }),
+        createJob({
+          id: 'job-3',
+          state: 'pending',
+          title: 'In queue...',
+          progressTotalPercent: undefined
+        }),
+        createJob({
+          id: 'job-4',
+          state: 'failed',
+          title: 'Failed'
+        })
+      ]
+      return { jobs }
+    },
+    template: `
+      <div style="display: grid; grid-template-columns: repeat(auto-fill, minmax(200px, 1fr)); gap: 8px; padding: 8px;">
+        <ActiveMediaAssetCard
+          v-for="job in jobs"
+          :key="job.id"
+          :job="job"
+        />
+      </div>
+    `
+  })
+}
diff --git a/src/platform/assets/components/ActiveMediaAssetCard.test.ts b/src/platform/assets/components/ActiveMediaAssetCard.test.ts
new file mode 100644
index 0000000000..1ad0849cd1
--- /dev/null
+++ b/src/platform/assets/components/ActiveMediaAssetCard.test.ts
@@ -0,0 +1,213 @@
+import { mount } from '@vue/test-utils'
+import { ref } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+import ActiveJobCard from './ActiveMediaAssetCard.vue'
+
+import type { JobListItem } from '@/composables/queue/useJobList'
+
+const mockRunCancelJob = vi.fn()
+const mockRunDeleteJob = vi.fn()
+const mockCanCancelJob = ref(false)
+const mockCanDeleteJob = ref(false)
+
+vi.mock('@/composables/queue/useJobActions', () => ({
+  useJobActions: () => ({
+    cancelAction: {
+      icon: 'icon-[lucide--x]',
+      label: 'Cancel',
+      variant: 'destructive'
+    },
+    canCancelJob: mockCanCancelJob,
+    runCancelJob: mockRunCancelJob,
+    deleteAction: {
+      icon: 'icon-[lucide--circle-minus]',
+      label: 'Remove job',
+      variant: 'destructive'
+    },
+    canDeleteJob: mockCanDeleteJob,
+    runDeleteJob: mockRunDeleteJob
+  })
+}))
+
+vi.mock('@/composables/useProgressBarBackground', () => ({
+  useProgressBarBackground: () => ({
+    progressBarPrimaryClass: 'bg-blue-500',
+    hasProgressPercent: (val: number | undefined) => typeof val === 'number',
+    progressPercentStyle: (val: number) => ({ width: `${val}%` })
+  })
+}))
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      sideToolbar: {
+        activeJobStatus: 'Active job: {status}'
+      }
+    }
+  }
+})
+
+const createJob = (overrides: Partial<JobListItem> = {}): JobListItem => ({
+  id: 'test-job-1',
+  title: 'Running...',
+  meta: 'Step 5/10',
+  state: 'running',
+  progressTotalPercent: 50,
+  progressCurrentPercent: 75,
+  ...overrides
+})
+
+const mountComponent = (job: JobListItem) =>
+  mount(ActiveJobCard, {
+    props: { job },
+    global: {
+      plugins: [i18n]
+    }
+  })
+
+describe('ActiveJobCard', () => {
+  beforeEach(() => {
+    mockCanCancelJob.value = false
+    mockCanDeleteJob.value = false
+    mockRunCancelJob.mockReset()
+    mockRunDeleteJob.mockReset()
+  })
+
+  it('displays percentage and progress bar when job is running', () => {
+    const wrapper = mountComponent(
+      createJob({ state: 'running', progressTotalPercent: 65 })
+    )
+
+    expect(wrapper.text()).toContain('65%')
+    const progressBar = wrapper.find('.bg-blue-500')
+    expect(progressBar.exists()).toBe(true)
+    expect(progressBar.attributes('style')).toContain('width: 65%')
+  })
+
+  it('displays status text when job is pending', () => {
+    const wrapper = mountComponent(
+      createJob({
+        state: 'pending',
+        title: 'In queue...',
+        progressTotalPercent: undefined
+      })
+    )
+
+    expect(wrapper.text()).toContain('In queue...')
+    const progressBar = wrapper.find('.bg-blue-500')
+    expect(progressBar.exists()).toBe(false)
+  })
+
+  it('shows spinner for pending state', () => {
+    const wrapper = mountComponent(createJob({ state: 'pending' }))
+
+    const spinner = wrapper.find('.icon-\\[lucide--loader-circle\\]')
+    expect(spinner.exists()).toBe(true)
+    expect(spinner.classes()).toContain('animate-spin')
+  })
+
+  it('shows error icon for failed state', () => {
+    const wrapper = mountComponent(
+      createJob({ state: 'failed', title: 'Failed' })
+    )
+
+    const errorIcon = wrapper.find('.icon-\\[lucide--circle-alert\\]')
+    expect(errorIcon.exists()).toBe(true)
+    expect(wrapper.text()).toContain('Failed')
+  })
+
+  it('shows preview image when running with iconImageUrl', () => {
+    const wrapper = mountComponent(
+      createJob({
+        state: 'running',
+        iconImageUrl: 'https://example.com/preview.jpg'
+      })
+    )
+
+    const img = wrapper.find('img')
+    expect(img.exists()).toBe(true)
+    expect(img.attributes('src')).toBe('https://example.com/preview.jpg')
+  })
+
+  it('has proper accessibility attributes', () => {
+    const wrapper = mountComponent(createJob({ title: 'Generating...' }))
+
+    const container = wrapper.find('[role="status"]')
+    expect(container.exists()).toBe(true)
+    expect(container.attributes('aria-label')).toBe('Active job: Generating...')
+  })
+
+  it('shows delete button on hover for failed jobs', async () => {
+    mockCanDeleteJob.value = true
+
+    const wrapper = mountComponent(
+      createJob({ state: 'failed', title: 'Failed' })
+    )
+
+    expect(wrapper.findComponent({ name: 'Button' }).exists()).toBe(false)
+
+    await wrapper.find('[role="status"]').trigger('mouseenter')
+
+    const button = wrapper.findComponent({ name: 'Button' })
+    expect(button.exists()).toBe(true)
+    expect(button.attributes('aria-label')).toBe('Remove job')
+  })
+
+  it('calls runDeleteJob when delete button is clicked on a failed job', async () => {
+    mockCanDeleteJob.value = true
+
+    const wrapper = mountComponent(
+      createJob({ state: 'failed', title: 'Failed' })
+    )
+
+    await wrapper.find('[role="status"]').trigger('mouseenter')
+
+    const button = wrapper.findComponent({ name: 'Button' })
+    await button.trigger('click')
+
+    expect(mockRunDeleteJob).toHaveBeenCalledOnce()
+  })
+
+  it('does not show action button when job cannot be cancelled or deleted', async () => {
+    const wrapper = mountComponent(
+      createJob({ state: 'running', progressTotalPercent: 50 })
+    )
+
+    await wrapper.find('[role="status"]').trigger('mouseenter')
+
+    expect(wrapper.findComponent({ name: 'Button' }).exists()).toBe(false)
+  })
+
+  it('shows cancel button on hover for cancellable jobs', async () => {
+    mockCanCancelJob.value = true
+
+    const wrapper = mountComponent(
+      createJob({ state: 'running', progressTotalPercent: 50 })
+    )
+
+    await wrapper.find('[role="status"]').trigger('mouseenter')
+
+    const button = wrapper.findComponent({ name: 'Button' })
+    expect(button.exists()).toBe(true)
+    expect(button.attributes('aria-label')).toBe('Cancel')
+  })
+
+  it('calls runCancelJob when cancel button is clicked', async () => {
+    mockCanCancelJob.value = true
+
+    const wrapper = mountComponent(
+      createJob({ state: 'running', progressTotalPercent: 50 })
+    )
+
+    await wrapper.find('[role="status"]').trigger('mouseenter')
+
+    const button = wrapper.findComponent({ name: 'Button' })
+    await button.trigger('click')
+
+    expect(mockRunCancelJob).toHaveBeenCalledOnce()
+  })
+})
diff --git a/src/platform/assets/components/ActiveMediaAssetCard.vue b/src/platform/assets/components/ActiveMediaAssetCard.vue
new file mode 100644
index 0000000000..a87bd9ea55
--- /dev/null
+++ b/src/platform/assets/components/ActiveMediaAssetCard.vue
@@ -0,0 +1,122 @@
+<template>
+  <div
+    role="status"
+    tabindex="0"
+    :aria-label="t('sideToolbar.activeJobStatus', { status: statusText })"
+    class="flex flex-col gap-2 rounded-lg p-2"
+    @mouseenter="hovered = true"
+    @mouseleave="hovered = false"
+    @focusin="hovered = true"
+    @focusout="hovered = false"
+  >
+    <!-- Thumbnail -->
+    <div class="relative aspect-square overflow-hidden rounded-lg">
+      <!-- Running state with preview image -->
+      <img
+        v-if="isRunning && job.iconImageUrl"
+        :src="job.iconImageUrl"
+        :alt="statusText"
+        class="size-full object-cover"
+      />
+      <!-- Placeholder for queued/failed states or running without preview -->
+      <div
+        v-else
+        class="absolute inset-0 flex items-center justify-center bg-modal-card-placeholder-background"
+      >
+        <!-- Spinner for queued/initialization states -->
+        <Loader v-if="isQueued" size="md" class="text-muted-foreground" />
+        <!-- Error icon for failed state -->
+        <i
+          v-else-if="isFailed"
+          class="icon-[lucide--circle-alert] size-8 text-red-500"
+        />
+        <!-- Spinner for running without preview -->
+        <Loader v-else size="md" class="text-muted-foreground" />
+      </div>
+      <!-- Cancel/Delete button overlay -->
+      <Button
+        v-if="hovered && showActionButton"
+        variant="destructive"
+        size="icon"
+        :aria-label="activeAction.label"
+        class="absolute top-2 right-2"
+        @click.stop="runActiveAction()"
+      >
+        <i :class="activeAction.icon" />
+      </Button>
+    </div>
+
+    <!-- Footer: Progress bar or status text -->
+    <div class="flex h-5 items-center gap-1.5">
+      <!-- Running state: percentage + progress bar -->
+      <template v-if="isRunning && hasProgressPercent(progressPercent)">
+        <span class="shrink-0 text-sm text-muted-foreground">
+          {{ Math.round(progressPercent ?? 0) }}%
+        </span>
+        <div class="relative h-1 flex-1 rounded-sm bg-secondary-background">
+          <div
+            :class="progressBarPrimaryClass"
+            :style="progressPercentStyle(progressPercent)"
+          />
+        </div>
+      </template>
+      <!-- Non-running states: status text only -->
+      <template v-else>
+        <div class="w-full truncate text-center text-sm text-muted-foreground">
+          {{ statusText }}
+        </div>
+      </template>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Loader from '@/components/loader/Loader.vue'
+import Button from '@/components/ui/button/Button.vue'
+import { useJobActions } from '@/composables/queue/useJobActions'
+import type { JobListItem } from '@/composables/queue/useJobList'
+import { useProgressBarBackground } from '@/composables/useProgressBarBackground'
+
+const { job } = defineProps<{ job: JobListItem }>()
+
+const { t } = useI18n()
+const hovered = ref(false)
+
+const {
+  cancelAction,
+  canCancelJob,
+  runCancelJob,
+  deleteAction,
+  canDeleteJob,
+  runDeleteJob
+} = useJobActions(() => job)
+
+const showActionButton = computed(
+  () => canCancelJob.value || canDeleteJob.value
+)
+const activeAction = computed(() =>
+  canCancelJob.value ? cancelAction : deleteAction
+)
+const runActiveAction = () => {
+  if (canCancelJob.value) {
+    runCancelJob()
+  } else if (canDeleteJob.value) {
+    runDeleteJob()
+  }
+}
+
+const { progressBarPrimaryClass, hasProgressPercent, progressPercentStyle } =
+  useProgressBarBackground()
+
+const statusText = computed(() => job.title)
+const progressPercent = computed(() => job.progressTotalPercent)
+
+const isQueued = computed(
+  () => job.state === 'pending' || job.state === 'initialization'
+)
+const isRunning = computed(() => job.state === 'running')
+const isFailed = computed(() => job.state === 'failed')
+</script>
diff --git a/src/platform/assets/components/AssetBadgeGroup.vue b/src/platform/assets/components/AssetBadgeGroup.vue
index e78fe3a605..82c2211134 100644
--- a/src/platform/assets/components/AssetBadgeGroup.vue
+++ b/src/platform/assets/components/AssetBadgeGroup.vue
@@ -1,11 +1,13 @@
 <template>
-  <div class="absolute left-2 bottom-2 flex flex-wrap justify-start gap-1">
+  <div
+    class="absolute bottom-2 left-2 flex flex-wrap justify-start gap-1 select-none"
+  >
     <span
       v-for="badge in badges"
       :key="badge.label"
       :class="
         cn(
-          'px-2 py-1 rounded text-xs font-bold uppercase tracking-wider text-modal-card-tag-foreground bg-modal-card-tag-background'
+          'rounded-sm bg-modal-card-tag-background px-2 py-1 text-xs font-bold tracking-wider break-all text-modal-card-tag-foreground uppercase'
         )
       "
     >
diff --git a/tests-ui/platform/assets/components/AssetBrowserModal.test.ts b/src/platform/assets/components/AssetBrowserModal.test.ts
similarity index 78%
rename from tests-ui/platform/assets/components/AssetBrowserModal.test.ts
rename to src/platform/assets/components/AssetBrowserModal.test.ts
index 756dee2628..6fb0275198 100644
--- a/tests-ui/platform/assets/components/AssetBrowserModal.test.ts
+++ b/src/platform/assets/components/AssetBrowserModal.test.ts
@@ -4,20 +4,10 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import AssetBrowserModal from '@/platform/assets/components/AssetBrowserModal.vue'
 import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import { useAssetsStore } from '@/stores/assetsStore'
 
-const mockAssetService = vi.hoisted(() => ({
-  getAssetsForNodeType: vi.fn(),
-  getAssetsByTag: vi.fn(),
-  getAssetDetails: vi.fn((id: string) =>
-    Promise.resolve({
-      id,
-      name: 'Test Model',
-      user_metadata: {
-        filename: 'Test Model'
-      }
-    })
-  )
-}))
+const mockAssetsByKey = vi.hoisted(() => new Map<string, AssetItem[]>())
+const mockLoadingByKey = vi.hoisted(() => new Map<string, boolean>())
 
 vi.mock('@/i18n', () => ({
   t: (key: string, params?: Record<string, string>) =>
@@ -25,9 +15,22 @@ vi.mock('@/i18n', () => ({
   d: (date: Date) => date.toLocaleDateString()
 }))
 
-vi.mock('@/platform/assets/services/assetService', () => ({
-  assetService: mockAssetService
-}))
+vi.mock('@/stores/assetsStore', () => {
+  const getAssets = vi.fn((key: string) => mockAssetsByKey.get(key) ?? [])
+  const isModelLoading = vi.fn(
+    (key: string) => mockLoadingByKey.get(key) ?? false
+  )
+  const updateModelsForNodeType = vi.fn()
+  const updateModelsForTag = vi.fn()
+  return {
+    useAssetsStore: () => ({
+      getAssets,
+      isModelLoading,
+      updateModelsForNodeType,
+      updateModelsForTag
+    })
+  }
+})
 
 vi.mock('@/stores/modelToNodeStore', () => ({
   useModelToNodeStore: () => ({
@@ -191,8 +194,9 @@ describe('AssetBrowserModal', () => {
   }
 
   beforeEach(() => {
-    mockAssetService.getAssetsForNodeType.mockReset()
-    mockAssetService.getAssetsByTag.mockReset()
+    vi.resetAllMocks()
+    mockAssetsByKey.clear()
+    mockLoadingByKey.clear()
   })
 
   describe('Integration with useAssetBrowser', () => {
@@ -201,7 +205,7 @@ describe('AssetBrowserModal', () => {
         createTestAsset('asset1', 'Model A', 'checkpoints'),
         createTestAsset('asset2', 'Model B', 'loras')
       ]
-      mockAssetService.getAssetsForNodeType.mockResolvedValueOnce(assets)
+      mockAssetsByKey.set('CheckpointLoaderSimple', assets)
 
       const wrapper = createWrapper({ nodeType: 'CheckpointLoaderSimple' })
       await flushPromises()
@@ -218,7 +222,7 @@ describe('AssetBrowserModal', () => {
         createTestAsset('c1', 'model.safetensors', 'checkpoints'),
         createTestAsset('l1', 'lora.pt', 'loras')
       ]
-      mockAssetService.getAssetsForNodeType.mockResolvedValueOnce(assets)
+      mockAssetsByKey.set('CheckpointLoaderSimple', assets)
 
       const wrapper = createWrapper({
         nodeType: 'CheckpointLoaderSimple',
@@ -234,31 +238,56 @@ describe('AssetBrowserModal', () => {
   })
 
   describe('Data fetching', () => {
-    it('fetches assets for node type', async () => {
-      mockAssetService.getAssetsForNodeType.mockResolvedValueOnce([])
-
+    it('triggers store refresh for node type on mount', async () => {
+      const store = useAssetsStore()
       createWrapper({ nodeType: 'CheckpointLoaderSimple' })
       await flushPromises()
 
-      expect(mockAssetService.getAssetsForNodeType).toHaveBeenCalledWith(
+      expect(store.updateModelsForNodeType).toHaveBeenCalledWith(
         'CheckpointLoaderSimple'
       )
     })
 
-    it('fetches assets for tag when node type not provided', async () => {
-      mockAssetService.getAssetsByTag.mockResolvedValueOnce([])
+    it('displays cached assets immediately from store', async () => {
+      const assets = [createTestAsset('asset1', 'Cached Model', 'checkpoints')]
+      mockAssetsByKey.set('CheckpointLoaderSimple', assets)
 
-      createWrapper({ assetType: 'loras' })
+      const wrapper = createWrapper({ nodeType: 'CheckpointLoaderSimple' })
+
+      const assetGrid = wrapper.findComponent({ name: 'AssetGrid' })
+      const gridAssets = assetGrid.props('assets') as AssetItem[]
+
+      expect(gridAssets).toHaveLength(1)
+      expect(gridAssets[0].name).toBe('Cached Model')
+    })
+
+    it('triggers store refresh for asset type (tag) on mount', async () => {
+      const store = useAssetsStore()
+      createWrapper({ assetType: 'models' })
       await flushPromises()
 
-      expect(mockAssetService.getAssetsByTag).toHaveBeenCalledWith('loras')
+      expect(store.updateModelsForTag).toHaveBeenCalledWith('models')
+    })
+
+    it('uses tag: prefix for cache key when assetType is provided', async () => {
+      const assets = [createTestAsset('asset1', 'Tagged Model', 'models')]
+      mockAssetsByKey.set('tag:models', assets)
+
+      const wrapper = createWrapper({ assetType: 'models' })
+      await flushPromises()
+
+      const assetGrid = wrapper.findComponent({ name: 'AssetGrid' })
+      const gridAssets = assetGrid.props('assets') as AssetItem[]
+
+      expect(gridAssets).toHaveLength(1)
+      expect(gridAssets[0].name).toBe('Tagged Model')
     })
   })
 
   describe('Asset Selection', () => {
     it('emits asset-select event when asset is selected', async () => {
       const assets = [createTestAsset('asset1', 'Model A', 'checkpoints')]
-      mockAssetService.getAssetsForNodeType.mockResolvedValueOnce(assets)
+      mockAssetsByKey.set('CheckpointLoaderSimple', assets)
 
       const wrapper = createWrapper({ nodeType: 'CheckpointLoaderSimple' })
       await flushPromises()
@@ -271,7 +300,7 @@ describe('AssetBrowserModal', () => {
 
     it('executes onSelect callback when provided', async () => {
       const assets = [createTestAsset('asset1', 'Model A', 'checkpoints')]
-      mockAssetService.getAssetsForNodeType.mockResolvedValueOnce(assets)
+      mockAssetsByKey.set('CheckpointLoaderSimple', assets)
 
       const onSelect = vi.fn()
       const wrapper = createWrapper({
@@ -289,8 +318,6 @@ describe('AssetBrowserModal', () => {
 
   describe('Left Panel Conditional Logic', () => {
     it('hides left panel by default when showLeftPanel is undefined', async () => {
-      mockAssetService.getAssetsForNodeType.mockResolvedValueOnce([])
-
       const wrapper = createWrapper({ nodeType: 'CheckpointLoaderSimple' })
       await flushPromises()
 
@@ -299,8 +326,6 @@ describe('AssetBrowserModal', () => {
     })
 
     it('shows left panel when showLeftPanel prop is explicitly true', async () => {
-      mockAssetService.getAssetsForNodeType.mockResolvedValueOnce([])
-
       const wrapper = createWrapper({
         nodeType: 'CheckpointLoaderSimple',
         showLeftPanel: true
@@ -318,7 +343,7 @@ describe('AssetBrowserModal', () => {
         createTestAsset('asset1', 'Model A', 'checkpoints'),
         createTestAsset('asset2', 'Model B', 'loras')
       ]
-      mockAssetService.getAssetsForNodeType.mockResolvedValueOnce(assets)
+      mockAssetsByKey.set('CheckpointLoaderSimple', assets)
 
       const wrapper = createWrapper({
         nodeType: 'CheckpointLoaderSimple',
@@ -339,8 +364,6 @@ describe('AssetBrowserModal', () => {
 
   describe('Title Management', () => {
     it('passes custom title to BaseModalLayout when title prop provided', async () => {
-      mockAssetService.getAssetsForNodeType.mockResolvedValueOnce([])
-
       const wrapper = createWrapper({
         nodeType: 'CheckpointLoaderSimple',
         title: 'Custom Title'
@@ -353,7 +376,7 @@ describe('AssetBrowserModal', () => {
 
     it('passes computed contentTitle to BaseModalLayout when no title prop', async () => {
       const assets = [createTestAsset('asset1', 'Model A', 'checkpoints')]
-      mockAssetService.getAssetsForNodeType.mockResolvedValueOnce(assets)
+      mockAssetsByKey.set('CheckpointLoaderSimple', assets)
 
       const wrapper = createWrapper({ nodeType: 'CheckpointLoaderSimple' })
       await flushPromises()
diff --git a/src/platform/assets/components/AssetBrowserModal.vue b/src/platform/assets/components/AssetBrowserModal.vue
index 40cc1fb1b0..1fe04e955f 100644
--- a/src/platform/assets/components/AssetBrowserModal.vue
+++ b/src/platform/assets/components/AssetBrowserModal.vue
@@ -1,38 +1,42 @@
 <template>
   <BaseModalLayout
+    v-model:right-panel-open="isRightPanelOpen"
     data-component-id="AssetBrowserModal"
     class="size-full max-h-full max-w-full min-w-0"
     :content-title="displayTitle"
+    :right-panel-title="$t('assetBrowser.modelInfo.title')"
     @close="handleClose"
   >
+    <template v-if="shouldShowLeftPanel" #leftPanelHeaderTitle>
+      <i class="icon-[comfy--ai-model] size-4" />
+      <h2 class="flex-auto text-base font-semibold text-nowrap select-none">
+        {{ displayTitle }}
+      </h2>
+    </template>
     <template v-if="shouldShowLeftPanel" #leftPanel>
       <LeftSidePanel
-        v-model="selectedCategory"
+        v-model="selectedNavItem"
         data-component-id="AssetBrowserModal-LeftSidePanel"
-        :nav-items="availableCategories"
-      >
-        <template #header-icon>
-          <div class="icon-[lucide--folder] size-4" />
-        </template>
-        <template #header-title>
-          <span class="capitalize">{{ displayTitle }}</span>
-        </template>
-      </LeftSidePanel>
+        :nav-items
+      />
     </template>
 
     <template #header>
-      <div class="flex w-full items-center justify-between gap-2">
+      <div
+        class="flex w-full items-center justify-between gap-2"
+        @click.self="focusedAsset = null"
+      >
         <SearchBox
           v-model="searchQuery"
           :autofocus="true"
           size="lg"
-          :placeholder="$t('g.searchPlaceholder')"
+          :placeholder="$t('g.searchPlaceholder', { subject: '' })"
           class="max-w-96"
         />
         <Button
           v-if="isUploadButtonEnabled"
           variant="primary"
-          :size="breakpoints.md ? 'md' : 'icon'"
+          :size="breakpoints.md ? 'lg' : 'icon'"
           data-attr="upload-model-button"
           @click="showUploadDialog"
         >
@@ -47,8 +51,9 @@
     <template #contentFilter>
       <AssetFilterBar
         :assets="categoryFilteredAssets"
-        :all-assets="fetchedAssets"
+        :show-ownership-filter
         @filter-change="updateFilters"
+        @click.self="focusedAsset = null"
       />
     </template>
 
@@ -56,19 +61,31 @@
       <AssetGrid
         :assets="filteredAssets"
         :loading="isLoading"
+        :focused-asset-id="focusedAsset?.id"
+        :empty-message
+        @asset-focus="handleAssetFocus"
         @asset-select="handleAssetSelectAndEmit"
+        @asset-deleted="refreshAssets"
+        @asset-show-info="handleShowInfo"
+        @click="focusedAsset = null"
       />
     </template>
+
+    <template #rightPanel>
+      <ModelInfoPanel v-if="focusedAsset" :asset="focusedAsset" :cache-key />
+      <div
+        v-else
+        class="flex h-full items-center justify-center p-6 text-center wrap-break-word text-muted"
+      >
+        {{ $t('assetBrowser.modelInfo.selectModelPrompt') }}
+      </div>
+    </template>
   </BaseModalLayout>
 </template>
 
 <script setup lang="ts">
-import {
-  breakpointsTailwind,
-  useAsyncState,
-  useBreakpoints
-} from '@vueuse/core'
-import { computed, provide, watch } from 'vue'
+import { breakpointsTailwind, useBreakpoints } from '@vueuse/core'
+import { computed, provide, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import SearchBox from '@/components/common/SearchBox.vue'
@@ -77,71 +94,81 @@ import BaseModalLayout from '@/components/widget/layout/BaseModalLayout.vue'
 import LeftSidePanel from '@/components/widget/panel/LeftSidePanel.vue'
 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'
 import type { AssetDisplayItem } from '@/platform/assets/composables/useAssetBrowser'
 import { useAssetBrowser } from '@/platform/assets/composables/useAssetBrowser'
+import { useModelTypes } from '@/platform/assets/composables/useModelTypes'
 import { useModelUpload } from '@/platform/assets/composables/useModelUpload'
 import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
-import { assetService } from '@/platform/assets/services/assetService'
 import { formatCategoryLabel } from '@/platform/assets/utils/categoryLabel'
+import { useAssetsStore } from '@/stores/assetsStore'
 import { useModelToNodeStore } from '@/stores/modelToNodeStore'
 import { OnCloseKey } from '@/types/widgetTypes'
 
+const { t } = useI18n()
+const assetStore = useAssetsStore()
+const modelToNodeStore = useModelToNodeStore()
+const breakpoints = useBreakpoints(breakpointsTailwind)
+
 const props = defineProps<{
   nodeType?: string
+  assetType?: string
   onSelect?: (asset: AssetItem) => void
   onClose?: () => void
   showLeftPanel?: boolean
   title?: string
-  assetType?: string
 }>()
 
-const { t } = useI18n()
-
 const emit = defineEmits<{
   'asset-select': [asset: AssetDisplayItem]
   close: []
 }>()
 
-const breakpoints = useBreakpoints(breakpointsTailwind)
-
 provide(OnCloseKey, props.onClose ?? (() => {}))
 
-const fetchAssets = async () => {
+const cacheKey = computed(() => {
+  if (props.nodeType) return props.nodeType
+  if (props.assetType) return `tag:${props.assetType}`
+  return ''
+})
+
+const fetchedAssets = computed(() => assetStore.getAssets(cacheKey.value))
+
+const isStoreLoading = computed(() => assetStore.isModelLoading(cacheKey.value))
+
+const isLoading = computed(
+  () => isStoreLoading.value && fetchedAssets.value.length === 0
+)
+
+async function refreshAssets(): Promise<void> {
   if (props.nodeType) {
-    return (await assetService.getAssetsForNodeType(props.nodeType)) ?? []
+    await assetStore.updateModelsForNodeType(props.nodeType)
+  } else if (props.assetType) {
+    await assetStore.updateModelsForTag(props.assetType)
   }
-
-  if (props.assetType) {
-    return (await assetService.getAssetsByTag(props.assetType)) ?? []
-  }
-
-  return []
 }
 
-const {
-  state: fetchedAssets,
-  isLoading,
-  execute
-} = useAsyncState<AssetItem[]>(fetchAssets, [], { immediate: false })
+void refreshAssets()
 
-watch(
-  () => [props.nodeType, props.assetType],
-  async () => {
-    await execute()
-  },
-  { immediate: true }
-)
+const { fetchModelTypes } = useModelTypes()
+void fetchModelTypes()
+
+const { isUploadButtonEnabled, showUploadDialog } =
+  useModelUpload(refreshAssets)
 
 const {
   searchQuery,
+  selectedNavItem,
   selectedCategory,
-  availableCategories,
+  navItems,
   categoryFilteredAssets,
   filteredAssets,
+  isImportedSelected,
   updateFilters
 } = useAssetBrowser(fetchedAssets)
 
-const modelToNodeStore = useModelToNodeStore()
+const focusedAsset = ref<AssetDisplayItem | null>(null)
+const isRightPanelOpen = ref(false)
 
 const primaryCategoryTag = computed(() => {
   const assets = fetchedAssets.value ?? []
@@ -179,17 +206,40 @@ const shouldShowLeftPanel = computed(() => {
   return props.showLeftPanel ?? true
 })
 
+const showOwnershipFilter = computed(
+  () =>
+    !shouldShowLeftPanel.value ||
+    (selectedNavItem.value !== 'all' && selectedNavItem.value !== 'imported')
+)
+
+const emptyMessage = computed(() => {
+  if (!isImportedSelected.value) {
+    return isUploadButtonEnabled.value
+      ? t('assetBrowser.noResultsCanImport')
+      : undefined
+  }
+
+  return isUploadButtonEnabled.value
+    ? t('assetBrowser.emptyImported.canImport')
+    : t('assetBrowser.emptyImported.restricted')
+})
+
 function handleClose() {
   props.onClose?.()
   emit('close')
 }
 
-function handleAssetSelectAndEmit(asset: AssetDisplayItem) {
-  emit('asset-select', asset)
-  // onSelect callback is provided by dialog composable layer
-  // It handles the appropriate transformation (filename extraction or full asset)
-  props.onSelect?.(asset)
+function handleAssetFocus(asset: AssetDisplayItem) {
+  focusedAsset.value = asset
 }
 
-const { isUploadButtonEnabled, showUploadDialog } = useModelUpload(execute)
+function handleShowInfo(asset: AssetDisplayItem) {
+  focusedAsset.value = asset
+  isRightPanelOpen.value = true
+}
+
+function handleAssetSelectAndEmit(asset: AssetDisplayItem) {
+  emit('asset-select', asset)
+  props.onSelect?.(asset)
+}
 </script>
diff --git a/src/platform/assets/components/AssetCard.stories.ts b/src/platform/assets/components/AssetCard.stories.ts
index c1753033e6..49464259c0 100644
--- a/src/platform/assets/components/AssetCard.stories.ts
+++ b/src/platform/assets/components/AssetCard.stories.ts
@@ -10,7 +10,7 @@ const createAssetData = (
   overrides: Partial<AssetDisplayItem> = {}
 ): AssetDisplayItem => ({
   ...baseAsset,
-  description:
+  secondaryText:
     'High-quality realistic images with perfect detail and natural lighting effects for professional photography',
   badges: [
     { label: 'checkpoints', type: 'type' },
@@ -131,20 +131,21 @@ export const EdgeCases: Story = {
         // Default case for comparison
         createAssetData({
           name: 'Complete Data',
-          description: 'Asset with all data present for comparison'
+          secondaryText: 'Asset with all data present for comparison'
         }),
         // No badges
         createAssetData({
           id: 'no-badges',
           name: 'No Badges',
-          description: 'Testing graceful handling when badges are not provided',
+          secondaryText:
+            'Testing graceful handling when badges are not provided',
           badges: []
         }),
         // No stars
         createAssetData({
           id: 'no-stars',
           name: 'No Stars',
-          description: 'Testing missing stars data gracefully',
+          secondaryText: 'Testing missing stars data gracefully',
           stats: {
             downloadCount: '1.8k',
             formattedDate: '3/15/25'
@@ -154,7 +155,7 @@ export const EdgeCases: Story = {
         createAssetData({
           id: 'no-downloads',
           name: 'No Downloads',
-          description: 'Testing missing downloads data gracefully',
+          secondaryText: 'Testing missing downloads data gracefully',
           stats: {
             stars: '4.2k',
             formattedDate: '3/15/25'
@@ -164,7 +165,7 @@ export const EdgeCases: Story = {
         createAssetData({
           id: 'no-date',
           name: 'No Date',
-          description: 'Testing missing date data gracefully',
+          secondaryText: 'Testing missing date data gracefully',
           stats: {
             stars: '4.2k',
             downloadCount: '1.8k'
@@ -174,21 +175,21 @@ export const EdgeCases: Story = {
         createAssetData({
           id: 'no-stats',
           name: 'No Stats',
-          description: 'Testing when all stats are missing',
+          secondaryText: 'Testing when all stats are missing',
           stats: {}
         }),
-        // Long description
+        // Long secondaryText
         createAssetData({
           id: 'long-desc',
           name: 'Long Description',
-          description:
+          secondaryText:
             'This is a very long description that should demonstrate how the component handles text overflow and truncation with ellipsis. The description continues with even more content to ensure we test the 2-line clamp behavior properly and see how it renders when there is significantly more text than can fit in the allocated space.'
         }),
         // Minimal data
         createAssetData({
           id: 'minimal',
           name: 'Minimal',
-          description: 'Basic model',
+          secondaryText: 'Basic model',
           tags: ['models'],
           badges: [],
           stats: {}
diff --git a/src/platform/assets/components/AssetCard.vue b/src/platform/assets/components/AssetCard.vue
index e0be225826..38c271fb38 100644
--- a/src/platform/assets/components/AssetCard.vue
+++ b/src/platform/assets/components/AssetCard.vue
@@ -1,6 +1,5 @@
 <template>
   <div
-    v-if="!deletedLocal"
     data-component-id="AssetCard"
     :data-asset-id="asset.id"
     :aria-labelledby="titleId"
@@ -8,50 +7,52 @@
     :tabindex="interactive ? 0 : -1"
     :class="
       cn(
-        'rounded-2xl overflow-hidden transition-all duration-200 bg-modal-card-background p-2 gap-2 flex flex-col h-full',
+        'flex h-full flex-col gap-2 overflow-hidden rounded-2xl bg-modal-card-background p-2 transition-all duration-200 select-none',
         interactive &&
-          'group appearance-none bg-transparent m-0 outline-none text-left hover:bg-secondary-background focus:bg-secondary-background border-none focus:outline-solid outline-base-foreground outline-4'
+          'group m-0 appearance-none border-none bg-transparent text-left outline-4 outline-base-foreground outline-none hover:bg-secondary-background focus:bg-secondary-background focus:outline-solid',
+        focused && 'bg-secondary-background outline-solid'
       )
     "
+    @click.stop="interactive && $emit('focus', asset)"
+    @focus="interactive && $emit('focus', asset)"
     @keydown.enter.self="interactive && $emit('select', asset)"
   >
     <div class="relative aspect-square w-full overflow-hidden rounded-xl">
       <div
         v-if="isLoading || error"
-        class="flex size-full cursor-pointer items-center justify-center bg-gradient-to-br from-smoke-400 via-smoke-800 to-charcoal-400"
-        role="button"
-        @click.self="interactive && $emit('select', asset)"
+        class="flex size-full cursor-pointer items-center justify-center bg-linear-to-br from-smoke-400 via-smoke-800 to-charcoal-400"
       />
       <img
         v-else
         :src="asset.preview_url"
         :alt="displayName"
-        class="size-full object-cover cursor-pointer"
-        role="button"
-        @click.self="interactive && $emit('select', asset)"
+        class="size-full cursor-pointer object-cover"
       />
 
       <AssetBadgeGroup :badges="asset.badges" />
       <IconGroup
-        v-if="flags.assetUpdateOptionsEnabled && !(asset.is_immutable ?? true)"
         :class="
           cn(
-            'absolute top-2 right-2 invisible group-hover:visible',
+            'invisible absolute top-2 right-2 group-hover:visible',
             dropdownMenuButton?.isOpen && 'visible'
           )
         "
       >
-        <MoreButton ref="dropdown-menu-button" size="sm">
+        <Button
+          v-tooltip.bottom="$t('assetBrowser.modelInfo.title')"
+          :aria-label="$t('assetBrowser.modelInfo.title')"
+          variant="secondary"
+          size="sm"
+          @click.stop="$emit('showInfo', asset)"
+        >
+          <i class="icon-[lucide--info]" />
+        </Button>
+        <MoreButton
+          v-if="showAssetOptions"
+          ref="dropdown-menu-button"
+          size="sm"
+        >
           <template #default>
-            <Button
-              variant="secondary"
-              size="md"
-              class="justify-start"
-              @click="startAssetRename"
-            >
-              <i class="icon-[lucide--pencil]" />
-              <span>{{ $t('g.rename') }}</span>
-            </Button>
             <Button
               variant="secondary"
               size="md"
@@ -65,49 +66,65 @@
         </MoreButton>
       </IconGroup>
     </div>
-    <div class="max-h-32 flex flex-col gap-2 justify-between flex-auto">
+    <div class="flex max-h-32 flex-auto flex-col justify-between gap-2">
       <h3
         :id="titleId"
         v-tooltip.top="{ value: displayName, showDelay: tooltipDelay }"
         :class="
           cn(
-            'mb-2 m-0 text-base font-semibold line-clamp-2 wrap-anywhere',
+            'm-0 line-clamp-2 text-sm font-semibold wrap-anywhere',
             'text-base-foreground'
           )
         "
       >
-        <EditableText
-          :model-value="displayName"
-          :is-editing="isEditing"
-          :input-attrs="{ 'data-testid': 'asset-name-input' }"
-          @edit="assetRename"
-          @cancel="assetRename()"
-        />
+        {{ displayName }}
       </h3>
       <p
         :id="descId"
-        v-tooltip.top="{ value: asset.description, showDelay: tooltipDelay }"
+        v-tooltip.top="{ value: asset.secondaryText, showDelay: tooltipDelay }"
         :class="
           cn(
-            'm-0 text-sm leading-6 overflow-hidden [-webkit-box-orient:vertical] [-webkit-line-clamp:2] [display:-webkit-box] text-muted-foreground'
+            'm-0 line-clamp-2 [display:-webkit-box] text-sm text-muted-foreground [-webkit-box-orient:vertical] [-webkit-line-clamp:2]'
           )
         "
       >
-        {{ asset.description }}
+        {{ asset.secondaryText }}
       </p>
-      <div class="flex gap-4 text-xs text-muted-foreground mt-auto">
-        <span v-if="asset.stats.stars" class="flex items-center gap-1">
-          <i class="icon-[lucide--star] size-3" />
-          {{ asset.stats.stars }}
-        </span>
-        <span v-if="asset.stats.downloadCount" class="flex items-center gap-1">
-          <i class="icon-[lucide--download] size-3" />
-          {{ asset.stats.downloadCount }}
-        </span>
-        <span v-if="asset.stats.formattedDate" class="flex items-center gap-1">
-          <i class="icon-[lucide--clock] size-3" />
-          {{ asset.stats.formattedDate }}
-        </span>
+      <div class="mt-auto flex items-center justify-between gap-2">
+        <div class="flex gap-3 text-xs text-muted-foreground">
+          <span v-if="asset.stats.stars" class="flex items-center gap-1">
+            <i class="icon-[lucide--star] size-3" />
+            {{ asset.stats.stars }}
+          </span>
+          <span
+            v-if="asset.stats.downloadCount"
+            class="flex items-center gap-1"
+          >
+            <i class="icon-[lucide--download] size-3" />
+            {{ asset.stats.downloadCount }}
+          </span>
+          <span
+            v-if="asset.stats.formattedDate"
+            class="flex items-center gap-1"
+          >
+            <i class="icon-[lucide--clock] size-3" />
+            {{ asset.stats.formattedDate }}
+          </span>
+        </div>
+        <Button
+          v-if="interactive"
+          variant="secondary"
+          size="lg"
+          class="relative shrink-0"
+          @click.stop="handleSelect"
+        >
+          {{ $t('g.use') }}
+          <StatusBadge
+            v-if="isNewlyImported"
+            severity="contrast"
+            class="absolute -top-0.5 -right-0.5"
+          />
+        </Button>
       </div>
     </div>
   </div>
@@ -120,32 +137,35 @@ import { useI18n } from 'vue-i18n'
 
 import IconGroup from '@/components/button/IconGroup.vue'
 import MoreButton from '@/components/button/MoreButton.vue'
-import EditableText from '@/components/common/EditableText.vue'
+import StatusBadge from '@/components/common/StatusBadge.vue'
 import { showConfirmDialog } from '@/components/dialog/confirm/confirmDialog'
 import Button from '@/components/ui/button/Button.vue'
-import { useFeatureFlags } from '@/composables/useFeatureFlags'
 import AssetBadgeGroup from '@/platform/assets/components/AssetBadgeGroup.vue'
 import type { AssetDisplayItem } from '@/platform/assets/composables/useAssetBrowser'
 import { assetService } from '@/platform/assets/services/assetService'
+import { getAssetDisplayName } from '@/platform/assets/utils/assetMetadataUtils'
 import { useSettingStore } from '@/platform/settings/settingStore'
-import { useToastStore } from '@/platform/updates/common/toastStore'
+import { useAssetDownloadStore } from '@/stores/assetDownloadStore'
 import { useDialogStore } from '@/stores/dialogStore'
 import { cn } from '@/utils/tailwindUtil'
 
-const { asset, interactive } = defineProps<{
+const { asset, interactive, focused } = defineProps<{
   asset: AssetDisplayItem
   interactive?: boolean
+  focused?: boolean
 }>()
 
-defineEmits<{
+const emit = defineEmits<{
+  focus: [asset: AssetDisplayItem]
   select: [asset: AssetDisplayItem]
+  deleted: [asset: AssetDisplayItem]
+  showInfo: [asset: AssetDisplayItem]
 }>()
 
 const { t } = useI18n()
 const settingStore = useSettingStore()
 const { closeDialog } = useDialogStore()
-const { flags } = useFeatureFlags()
-const toastStore = useToastStore()
+const { isDownloadedThisSession, acknowledgeAsset } = useAssetDownloadStore()
 
 const dropdownMenuButton = useTemplateRef<InstanceType<typeof MoreButton>>(
   'dropdown-menu-button'
@@ -154,11 +174,11 @@ const dropdownMenuButton = useTemplateRef<InstanceType<typeof MoreButton>>(
 const titleId = useId()
 const descId = useId()
 
-const isEditing = ref(false)
-const newNameRef = ref<string>()
-const deletedLocal = ref(false)
+const displayName = computed(() => getAssetDisplayName(asset))
 
-const displayName = computed(() => newNameRef.value ?? asset.name)
+const isNewlyImported = computed(() => isDownloadedThisSession(asset.id))
+
+const showAssetOptions = computed(() => !(asset.is_immutable ?? true))
 
 const tooltipDelay = computed<number>(() =>
   settingStore.get('LiteGraph.Node.TooltipDelay')
@@ -169,6 +189,11 @@ const { isLoading, error } = useImage({
   alt: asset.name
 })
 
+function handleSelect() {
+  acknowledgeAsset(asset.id)
+  emit('select', asset)
+}
+
 function confirmDeletion() {
   dropdownMenuButton.value?.hide()
   const assetName = toValue(displayName)
@@ -185,7 +210,7 @@ function confirmDeletion() {
       confirmText: t('g.delete'),
       // TODO: These need to be put into the new Button Variants once we have them.
       confirmClass: cn(
-        'bg-danger-200 text-base-foreground hover:bg-danger-200/80 focus:bg-danger-200/80 focus:ring ring-base-foreground'
+        'bg-danger-200 text-base-foreground ring-base-foreground hover:bg-danger-200/80 focus:bg-danger-200/80 focus:ring'
       ),
       optionsDisabled,
       onCancel: () => {
@@ -203,7 +228,7 @@ function confirmDeletion() {
           })
           // Give a second for the completion message
           await new Promise((resolve) => setTimeout(resolve, 1_000))
-          deletedLocal.value = true
+          emit('deleted', asset)
         } catch (err: unknown) {
           console.error(err)
           promptText.value = t('assetBrowser.deletion.failed', {
@@ -218,32 +243,4 @@ function confirmDeletion() {
     }
   })
 }
-
-function startAssetRename() {
-  dropdownMenuButton.value?.hide()
-  isEditing.value = true
-}
-
-async function assetRename(newName?: string) {
-  isEditing.value = false
-  if (newName) {
-    // Optimistic update
-    newNameRef.value = newName
-    try {
-      const result = await assetService.updateAsset(asset.id, {
-        name: newName
-      })
-      // Update with the actual name once the server responds
-      newNameRef.value = result.name
-    } catch (err: unknown) {
-      console.error(err)
-      toastStore.add({
-        severity: 'error',
-        summary: t('assetBrowser.rename.failed'),
-        life: 10_000
-      })
-      newNameRef.value = undefined
-    }
-  }
-}
 </script>
diff --git a/src/platform/assets/components/AssetExportProgressDialog.vue b/src/platform/assets/components/AssetExportProgressDialog.vue
new file mode 100644
index 0000000000..e28764d730
--- /dev/null
+++ b/src/platform/assets/components/AssetExportProgressDialog.vue
@@ -0,0 +1,253 @@
+<script setup lang="ts">
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Loader from '@/components/loader/Loader.vue'
+import HoneyToast from '@/components/honeyToast/HoneyToast.vue'
+import Button from '@/components/ui/button/Button.vue'
+import type { AssetExport } from '@/stores/assetExportStore'
+import { useAssetExportStore } from '@/stores/assetExportStore'
+import { cn } from '@/utils/tailwindUtil'
+
+const { t } = useI18n()
+const assetExportStore = useAssetExportStore()
+
+const visible = computed(() => assetExportStore.hasExports)
+const isExpanded = ref(false)
+
+const exportJobs = computed(() => assetExportStore.exportList)
+const failedJobs = computed(() =>
+  assetExportStore.finishedExports.filter((e) => e.status === 'failed')
+)
+
+const isInProgress = computed(() => assetExportStore.hasActiveExports)
+const currentJobName = computed(() => {
+  const activeJob = exportJobs.value.find((job) => job.status === 'running')
+  return activeJob?.exportName || t('exportToast.preparingExport')
+})
+
+function jobDisplayName(job: AssetExport): string {
+  if (job.status === 'failed') return job.error || t('exportToast.exportError')
+  return job.exportName || t('exportToast.preparingExport')
+}
+
+const completedCount = computed(() => assetExportStore.finishedExports.length)
+const totalCount = computed(() => exportJobs.value.length)
+
+const footerLabel = computed(() => {
+  if (isInProgress.value) return currentJobName.value
+  if (failedJobs.value.length > 0)
+    return t('exportToast.exportFailed', { count: failedJobs.value.length })
+  return t('exportToast.allExportsCompleted')
+})
+
+const footerIconClass = computed(() => {
+  if (isInProgress.value)
+    return 'icon-[lucide--loader-circle] animate-spin text-muted-foreground'
+  if (failedJobs.value.length > 0)
+    return 'icon-[lucide--circle-alert] text-destructive-background'
+  return 'icon-[lucide--check-circle] text-jade-600'
+})
+
+const tooltipConfig = computed(() => ({
+  value: footerLabel.value,
+  disabled: isExpanded.value,
+  pt: { root: { class: 'z-10000!' } }
+}))
+
+function progressPercent(job: AssetExport): number {
+  return Math.round(job.progress * 100)
+}
+
+function closeDialog() {
+  assetExportStore.clearFinishedExports()
+  isExpanded.value = false
+}
+</script>
+
+<template>
+  <HoneyToast v-model:expanded="isExpanded" :visible>
+    <template #default>
+      <div
+        class="flex h-12 items-center justify-between border-b border-border-default px-4"
+      >
+        <h3 class="text-sm font-bold text-base-foreground">
+          {{ t('exportToast.exportingAssets') }}
+        </h3>
+      </div>
+
+      <div class="relative max-h-75 overflow-y-auto p-4">
+        <div class="flex flex-col gap-2">
+          <div
+            v-for="job in exportJobs"
+            :key="job.taskId"
+            :class="
+              cn(
+                'flex items-center justify-between rounded-lg bg-modal-card-background px-4 py-3',
+                job.status === 'completed' && 'opacity-50'
+              )
+            "
+          >
+            <div class="min-w-0 flex-1">
+              <span
+                :class="
+                  cn(
+                    'block truncate text-sm',
+                    job.status === 'failed'
+                      ? 'text-destructive-background'
+                      : 'text-base-foreground'
+                  )
+                "
+              >
+                {{ jobDisplayName(job) }}
+              </span>
+              <span
+                v-if="job.assetsTotal > 0"
+                class="text-xs text-muted-foreground"
+              >
+                {{ job.assetsAttempted }}/{{ job.assetsTotal }}
+              </span>
+            </div>
+
+            <div class="flex items-center gap-2">
+              <template v-if="job.status === 'failed'">
+                <i
+                  class="icon-[lucide--circle-alert] size-4 text-destructive-background"
+                />
+              </template>
+              <template
+                v-else-if="job.status === 'completed' && job.downloadError"
+              >
+                <span
+                  class="max-w-32 truncate text-xs text-destructive-background"
+                >
+                  {{ job.downloadError }}
+                </span>
+                <Button
+                  variant="muted-textonly"
+                  size="icon"
+                  :aria-label="t('exportToast.retryDownload')"
+                  @click.stop="assetExportStore.triggerDownload(job, true)"
+                >
+                  <i
+                    class="icon-[lucide--rotate-ccw] size-4 text-destructive-background"
+                  />
+                </Button>
+              </template>
+              <template v-else-if="job.status === 'completed'">
+                <Button
+                  variant="muted-textonly"
+                  size="icon"
+                  :aria-label="t('exportToast.downloadExport')"
+                  @click.stop="assetExportStore.triggerDownload(job, true)"
+                >
+                  <i
+                    class="icon-[lucide--download] size-4 text-success-background"
+                  />
+                </Button>
+              </template>
+              <template v-else-if="job.status === 'running'">
+                <Loader size="sm" class="text-base-foreground" />
+                <span class="text-xs text-base-foreground">
+                  {{ progressPercent(job) }}%
+                </span>
+              </template>
+              <template v-else>
+                <span class="text-xs text-muted-foreground">
+                  {{ t('progressToast.pending') }}
+                </span>
+              </template>
+            </div>
+          </div>
+        </div>
+
+        <div
+          v-if="exportJobs.length === 0"
+          class="flex flex-col items-center justify-center py-6 text-center"
+        >
+          <span class="text-sm text-muted-foreground">
+            {{
+              t('exportToast.noExportsInQueue', {
+                filter: t('progressToast.filter.all')
+              })
+            }}
+          </span>
+        </div>
+      </div>
+    </template>
+
+    <template #footer="{ toggle }">
+      <div
+        class="flex h-12 min-w-0 flex-1 items-center justify-between gap-2 border-t border-border-default px-4"
+      >
+        <div class="flex min-w-0 flex-1 items-center gap-2 text-sm">
+          <i
+            v-tooltip.top="tooltipConfig"
+            :class="cn('size-4 shrink-0', footerIconClass)"
+          />
+          <span
+            :class="
+              cn(
+                'truncate overflow-hidden font-bold text-base-foreground transition-all duration-300',
+                isExpanded ? 'min-w-0 flex-1' : 'w-0'
+              )
+            "
+          >
+            {{ footerLabel }}
+          </span>
+        </div>
+
+        <div class="flex items-center gap-2">
+          <span
+            v-if="isInProgress"
+            :class="
+              cn(
+                'overflow-hidden text-sm text-muted-foreground transition-all duration-300',
+                isExpanded ? 'whitespace-nowrap' : 'w-0'
+              )
+            "
+          >
+            {{
+              t('progressToast.progressCount', {
+                completed: completedCount,
+                total: totalCount
+              })
+            }}
+          </span>
+
+          <div class="flex items-center">
+            <Button
+              variant="muted-textonly"
+              size="icon"
+              :aria-label="
+                isExpanded ? t('contextMenu.Collapse') : t('contextMenu.Expand')
+              "
+              @click.stop="toggle"
+            >
+              <i
+                :class="
+                  cn(
+                    'size-4',
+                    isExpanded
+                      ? 'icon-[lucide--chevron-down]'
+                      : 'icon-[lucide--chevron-up]'
+                  )
+                "
+              />
+            </Button>
+
+            <Button
+              v-if="!isInProgress"
+              variant="muted-textonly"
+              size="icon"
+              :aria-label="t('g.close')"
+              @click.stop="closeDialog"
+            >
+              <i class="icon-[lucide--x] size-4" />
+            </Button>
+          </div>
+        </div>
+      </div>
+    </template>
+  </HoneyToast>
+</template>
diff --git a/tests-ui/platform/assets/components/AssetFilterBar.test.ts b/src/platform/assets/components/AssetFilterBar.test.ts
similarity index 70%
rename from tests-ui/platform/assets/components/AssetFilterBar.test.ts
rename to src/platform/assets/components/AssetFilterBar.test.ts
index 49d58b55b9..5b19500fff 100644
--- a/tests-ui/platform/assets/components/AssetFilterBar.test.ts
+++ b/src/platform/assets/components/AssetFilterBar.test.ts
@@ -3,18 +3,22 @@ import { describe, expect, it, vi } from 'vitest'
 import { nextTick } from 'vue'
 
 import AssetFilterBar from '@/platform/assets/components/AssetFilterBar.vue'
-import type { FilterState } from '@/platform/assets/components/AssetFilterBar.vue'
+import type { AssetFilterState } from '@/platform/assets/types/filterTypes'
 import {
   createAssetWithSpecificBaseModel,
   createAssetWithSpecificExtension,
   createAssetWithoutBaseModel
 } from '@/platform/assets/fixtures/ui-mock-assets'
 import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import { createI18n } from 'vue-i18n'
 
-// Mock @/i18n directly since component imports { t } from '@/i18n'
-vi.mock('@/i18n', () => ({
-  t: (key: string) => key
-}))
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {}
+  }
+})
 
 // Mock components with minimal functionality for business logic testing
 vi.mock('@/components/input/MultiSelect.vue', () => ({
@@ -66,9 +70,7 @@ function mountAssetFilterBar(props = {}) {
   return mount(AssetFilterBar, {
     props,
     global: {
-      mocks: {
-        $t: (key: string) => key
-      }
+      plugins: [i18n]
     }
   })
 }
@@ -86,10 +88,6 @@ function findBaseModelsFilter(wrapper: ReturnType<typeof mountAssetFilterBar>) {
   return wrapper.findComponent('[data-component-id="asset-filter-base-models"]')
 }
 
-function findOwnershipFilter(wrapper: ReturnType<typeof mountAssetFilterBar>) {
-  return wrapper.findComponent('[data-component-id="asset-filter-ownership"]')
-}
-
 function findSortFilter(wrapper: ReturnType<typeof mountAssetFilterBar>) {
   return wrapper.findComponent('[data-component-id="asset-filter-sort"]')
 }
@@ -144,15 +142,16 @@ describe('AssetFilterBar', () => {
       expect(emitted!.length).toBeGreaterThanOrEqual(3)
 
       // Check final state
-      const finalState: FilterState = emitted![
+      const finalState: AssetFilterState = emitted![
         emitted!.length - 1
-      ][0] as FilterState
+      ][0] as AssetFilterState
       expect(finalState.fileFormats).toEqual(['ckpt', 'safetensors'])
       expect(finalState.baseModels).toEqual(['sdxl'])
       expect(finalState.sortBy).toBe('name-desc')
+      expect(finalState.ownership).toBe('all')
     })
 
-    it('ensures FilterState interface compliance', async () => {
+    it('ensures AssetFilterState interface compliance', async () => {
       // Provide assets with options so filters are visible
       const assets = [
         createAssetWithSpecificExtension('safetensors'),
@@ -169,7 +168,7 @@ describe('AssetFilterBar', () => {
       await nextTick()
 
       const emitted = wrapper.emitted('filterChange')
-      const filterState = emitted![0][0] as FilterState
+      const filterState = emitted![0][0] as AssetFilterState
 
       // Type and structure assertions
       expect(Array.isArray(filterState.fileFormats)).toBe(true)
@@ -268,90 +267,5 @@ describe('AssetFilterBar', () => {
       expect(fileFormatSelect.exists()).toBe(false)
       expect(baseModelSelect.exists()).toBe(false)
     })
-
-    it('hides ownership filter when no mutable assets', () => {
-      const assets = [
-        createAssetWithSpecificExtension('safetensors', true) // immutable
-      ]
-      const wrapper = mountAssetFilterBar({ assets })
-
-      const ownershipSelect = findOwnershipFilter(wrapper)
-      expect(ownershipSelect.exists()).toBe(false)
-    })
-
-    it('shows ownership filter when mutable assets exist', () => {
-      const assets = [
-        createAssetWithSpecificExtension('safetensors', false) // mutable
-      ]
-      const wrapper = mountAssetFilterBar({ assets })
-
-      const ownershipSelect = findOwnershipFilter(wrapper)
-      expect(ownershipSelect.exists()).toBe(true)
-    })
-
-    it('shows ownership filter when mixed assets exist', () => {
-      const assets = [
-        createAssetWithSpecificExtension('safetensors', true), // immutable
-        createAssetWithSpecificExtension('ckpt', false) // mutable
-      ]
-      const wrapper = mountAssetFilterBar({ assets })
-
-      const ownershipSelect = findOwnershipFilter(wrapper)
-      expect(ownershipSelect.exists()).toBe(true)
-    })
-
-    it('shows ownership filter with allAssets when provided', () => {
-      const assets = [
-        createAssetWithSpecificExtension('safetensors', true) // immutable
-      ]
-      const allAssets = [
-        createAssetWithSpecificExtension('safetensors', true), // immutable
-        createAssetWithSpecificExtension('ckpt', false) // mutable
-      ]
-      const wrapper = mountAssetFilterBar({ assets, allAssets })
-
-      const ownershipSelect = findOwnershipFilter(wrapper)
-      expect(ownershipSelect.exists()).toBe(true)
-    })
-  })
-
-  describe('Ownership Filter', () => {
-    it('emits ownership filter changes', async () => {
-      const assets = [
-        createAssetWithSpecificExtension('safetensors', false) // mutable
-      ]
-      const wrapper = mountAssetFilterBar({ assets })
-
-      const ownershipSelect = findOwnershipFilter(wrapper)
-      expect(ownershipSelect.exists()).toBe(true)
-
-      const ownershipSelectElement = ownershipSelect.find('select')
-      ownershipSelectElement.element.value = 'my-models'
-      await ownershipSelectElement.trigger('change')
-      await nextTick()
-
-      const emitted = wrapper.emitted('filterChange')
-      expect(emitted).toBeTruthy()
-
-      const filterState = emitted![emitted!.length - 1][0] as FilterState
-      expect(filterState.ownership).toBe('my-models')
-    })
-
-    it('ownership filter defaults to "all"', async () => {
-      const assets = [
-        createAssetWithSpecificExtension('safetensors', false) // mutable
-      ]
-      const wrapper = mountAssetFilterBar({ assets })
-
-      const sortSelect = findSortFilter(wrapper)
-      const sortSelectElement = sortSelect.find('select')
-      sortSelectElement.element.value = 'recent'
-      await sortSelectElement.trigger('change')
-      await nextTick()
-
-      const emitted = wrapper.emitted('filterChange')
-      const filterState = emitted![0][0] as FilterState
-      expect(filterState.ownership).toBe('all')
-    })
   })
 })
diff --git a/src/platform/assets/components/AssetFilterBar.vue b/src/platform/assets/components/AssetFilterBar.vue
index 0ffcba32de..bb48106f0b 100644
--- a/src/platform/assets/components/AssetFilterBar.vue
+++ b/src/platform/assets/components/AssetFilterBar.vue
@@ -1,15 +1,15 @@
 <template>
   <div
-    class="flex gap-4 items-center justify-between px-6 pt-2 pb-6"
+    class="flex items-center justify-between gap-4 px-6 pt-2 pb-6"
     data-component-id="asset-filter-bar"
   >
     <div
-      class="flex gap-4 items-center"
+      class="flex items-center gap-4"
       data-component-id="asset-filter-bar-left"
     >
       <MultiSelect
         v-if="availableFileFormats.length > 0"
-        v-model="fileFormats"
+        v-model="activeFileFormatObjects"
         :label="$t('assetBrowser.fileFormats')"
         :options="availableFileFormats"
         class="min-w-32"
@@ -19,7 +19,7 @@
 
       <MultiSelect
         v-if="availableBaseModels.length > 0"
-        v-model="baseModels"
+        v-model="activeBaseModelObjects"
         :label="$t('assetBrowser.baseModels')"
         :options="availableBaseModels"
         class="min-w-32"
@@ -28,11 +28,11 @@
       />
 
       <SingleSelect
-        v-if="hasMutableAssets"
+        v-if="showOwnershipFilter"
         v-model="ownership"
         :label="$t('assetBrowser.ownership')"
         :options="ownershipOptions"
-        class="min-w-42"
+        class="min-w-32"
         data-component-id="asset-filter-ownership"
         @update:model-value="handleFilterChange"
       />
@@ -48,7 +48,7 @@
         @update:model-value="handleFilterChange"
       >
         <template #icon>
-          <i class="icon-[lucide--arrow-up-down] size-3" />
+          <i class="icon-[lucide--arrow-up-down]" />
         </template>
       </SingleSelect>
     </div>
@@ -57,64 +57,71 @@
 
 <script setup lang="ts">
 import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
 
 import MultiSelect from '@/components/input/MultiSelect.vue'
 import SingleSelect from '@/components/input/SingleSelect.vue'
 import type { SelectOption } from '@/components/input/types'
-import { t } from '@/i18n'
-import type { OwnershipOption } from '@/platform/assets/composables/useAssetBrowser'
 import { useAssetFilterOptions } from '@/platform/assets/composables/useAssetFilterOptions'
 import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import type {
+  AssetFilterState,
+  AssetSortOption,
+  OwnershipOption
+} from '@/platform/assets/types/filterTypes'
 
-const SORT_OPTIONS = [
-  { name: t('assetBrowser.sortRecent'), value: 'recent' },
-  { name: t('assetBrowser.sortAZ'), value: 'name-asc' },
-  { name: t('assetBrowser.sortZA'), value: 'name-desc' }
-] as const
+const { t } = useI18n()
 
-type SortOption = (typeof SORT_OPTIONS)[number]['value']
+const sortOptions = computed(() => [
+  { name: t('assetBrowser.sortRecent'), value: 'recent' as const },
+  { name: t('assetBrowser.sortAZ'), value: 'name-asc' as const },
+  { name: t('assetBrowser.sortZA'), value: 'name-desc' as const }
+])
 
-const sortOptions = [...SORT_OPTIONS]
-
-const ownershipOptions = [
-  { name: t('assetBrowser.ownershipAll'), value: 'all' },
-  { name: t('assetBrowser.ownershipMyModels'), value: 'my-models' },
-  { name: t('assetBrowser.ownershipPublicModels'), value: 'public-models' }
-]
-
-export interface FilterState {
-  fileFormats: string[]
-  baseModels: string[]
-  sortBy: string
-  ownership: OwnershipOption
-}
-
-const { assets = [], allAssets = [] } = defineProps<{
+const { assets = [], showOwnershipFilter = false } = defineProps<{
   assets?: AssetItem[]
-  allAssets?: AssetItem[]
+  showOwnershipFilter?: boolean
 }>()
 
-const fileFormats = ref<SelectOption[]>([])
-const baseModels = ref<SelectOption[]>([])
-const sortBy = ref<SortOption>('recent')
+const selectedFileFormats = ref<SelectOption[]>([])
+const selectedBaseModels = ref<SelectOption[]>([])
+const sortBy = ref<AssetSortOption>('recent')
 const ownership = ref<OwnershipOption>('all')
 
-const { availableFileFormats, availableBaseModels } =
-  useAssetFilterOptions(assets)
+const { availableFileFormats, availableBaseModels, ownershipOptions } =
+  useAssetFilterOptions(() => assets)
 
-const hasMutableAssets = computed(() => {
-  const assetsToCheck = allAssets.length ? allAssets : assets
-  return assetsToCheck.some((asset) => asset.is_immutable === false)
+// Only show selected items that exist in the current scope
+const activeFileFormatObjects = computed({
+  get() {
+    return selectedFileFormats.value.filter((opt) =>
+      availableFileFormats.value.some((a) => a.value === opt.value)
+    )
+  },
+  set(value: SelectOption[]) {
+    selectedFileFormats.value = value
+  }
+})
+
+const activeBaseModelObjects = computed({
+  get() {
+    return selectedBaseModels.value.filter((opt) =>
+      availableBaseModels.value.some((a) => a.value === opt.value)
+    )
+  },
+  set(value: SelectOption[]) {
+    selectedBaseModels.value = value
+  }
 })
 
 const emit = defineEmits<{
-  filterChange: [filters: FilterState]
+  filterChange: [filters: AssetFilterState]
 }>()
 
 function handleFilterChange() {
   emit('filterChange', {
-    fileFormats: fileFormats.value.map((option: SelectOption) => option.value),
-    baseModels: baseModels.value.map((option: SelectOption) => option.value),
+    fileFormats: activeFileFormatObjects.value.map((opt) => opt.value),
+    baseModels: activeBaseModelObjects.value.map((opt) => opt.value),
     sortBy: sortBy.value,
     ownership: ownership.value
   })
diff --git a/src/platform/assets/components/AssetGrid.vue b/src/platform/assets/components/AssetGrid.vue
index 47fcc1fcdc..59e398baf1 100644
--- a/src/platform/assets/components/AssetGrid.vue
+++ b/src/platform/assets/components/AssetGrid.vue
@@ -1,58 +1,98 @@
 <template>
   <div
     data-component-id="AssetGrid"
-    :class="
-      cn('grid grid-cols-[repeat(auto-fill,minmax(15rem,1fr))] gap-4 p-2')
-    "
+    class="h-full"
     role="grid"
     :aria-label="$t('assetBrowser.assetCollection')"
     :aria-rowcount="-1"
     :aria-colcount="-1"
     :aria-setsize="assets.length"
   >
-    <!-- Loading state -->
-    <div
-      v-if="loading"
-      class="col-span-full flex items-center justify-center py-20"
-    >
+    <div v-if="loading" class="flex h-full items-center justify-center py-20">
       <i
         class="icon-[lucide--loader] size-12 animate-spin text-muted-foreground"
       />
     </div>
-    <!-- Empty state -->
     <div
       v-else-if="assets.length === 0"
-      class="col-span-full flex flex-col items-center justify-center py-16 text-muted-foreground"
+      class="flex h-full flex-col items-center justify-center py-16 text-muted-foreground select-none"
     >
       <i class="mb-4 icon-[lucide--search] size-10" />
       <h3 class="mb-2 text-lg font-medium">
-        {{ $t('assetBrowser.noAssetsFound') }}
+        {{ emptyTitle ?? $t('assetBrowser.noAssetsFound') }}
       </h3>
-      <p class="text-sm">{{ $t('assetBrowser.tryAdjustingFilters') }}</p>
+      <p class="text-center text-sm whitespace-pre-wrap">
+        {{ emptyMessage ?? $t('assetBrowser.tryAdjustingFilters') }}
+      </p>
     </div>
-    <template v-else>
-      <AssetCard
-        v-for="asset in assets"
-        :key="asset.id"
-        :asset="asset"
-        :interactive="true"
-        @select="$emit('assetSelect', $event)"
-      />
-    </template>
+    <VirtualGrid
+      v-else
+      :items="assetsWithKey"
+      :grid-style
+      :default-item-height="320"
+      :default-item-width="240"
+      :max-columns
+    >
+      <template #item="{ item }">
+        <AssetCard
+          :asset="item"
+          :interactive="true"
+          :focused="item.id === focusedAssetId"
+          @focus="$emit('assetFocus', $event)"
+          @select="$emit('assetSelect', $event)"
+          @deleted="$emit('assetDeleted', $event)"
+          @show-info="$emit('assetShowInfo', $event)"
+        />
+      </template>
+    </VirtualGrid>
   </div>
 </template>
 
 <script setup lang="ts">
+import { breakpointsTailwind, useBreakpoints } from '@vueuse/core'
+import type { CSSProperties } from 'vue'
+import { computed } from 'vue'
+
+import VirtualGrid from '@/components/common/VirtualGrid.vue'
 import AssetCard from '@/platform/assets/components/AssetCard.vue'
 import type { AssetDisplayItem } from '@/platform/assets/composables/useAssetBrowser'
-import { cn } from '@/utils/tailwindUtil'
 
-defineProps<{
+const { assets, focusedAssetId, emptyTitle, emptyMessage } = defineProps<{
   assets: AssetDisplayItem[]
   loading?: boolean
+  focusedAssetId?: string | null
+  emptyTitle?: string
+  emptyMessage?: string
 }>()
 
 defineEmits<{
+  assetFocus: [asset: AssetDisplayItem]
   assetSelect: [asset: AssetDisplayItem]
+  assetDeleted: [asset: AssetDisplayItem]
+  assetShowInfo: [asset: AssetDisplayItem]
 }>()
+
+const assetsWithKey = computed(() =>
+  assets.map((asset) => ({ ...asset, key: asset.id }))
+)
+
+const breakpoints = useBreakpoints(breakpointsTailwind)
+const is2Xl = breakpoints.greaterOrEqual('2xl')
+const isXl = breakpoints.greaterOrEqual('xl')
+const isLg = breakpoints.greaterOrEqual('lg')
+const isMd = breakpoints.greaterOrEqual('md')
+const maxColumns = computed(() => {
+  if (is2Xl.value) return 5
+  if (isXl.value) return 3
+  if (isLg.value) return 3
+  if (isMd.value) return 2
+  return 1
+})
+
+const gridStyle: CSSProperties = {
+  display: 'grid',
+  gridTemplateColumns: 'repeat(auto-fill, minmax(15rem, 1fr))',
+  gap: '1rem',
+  padding: '0.5rem'
+}
 </script>
diff --git a/src/platform/assets/components/AssetsListItem.stories.ts b/src/platform/assets/components/AssetsListItem.stories.ts
new file mode 100644
index 0000000000..91cd7bc632
--- /dev/null
+++ b/src/platform/assets/components/AssetsListItem.stories.ts
@@ -0,0 +1,137 @@
+import type { Meta, StoryObj } from '@storybook/vue3-vite'
+
+import Button from '@/components/ui/button/Button.vue'
+import AssetsListItem from '@/platform/assets/components/AssetsListItem.vue'
+import { iconForJobState } from '@/utils/queueDisplay'
+
+const meta: Meta<typeof AssetsListItem> = {
+  title: 'Platform/Assets/AssetsListItem',
+  component: AssetsListItem,
+  parameters: {
+    layout: 'centered'
+  },
+  decorators: [
+    () => ({
+      template: '<div class="p-8 bg-base-background"><story /></div>'
+    })
+  ]
+}
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+const IMAGE_PREVIEW = '/assets/images/comfy-logo-single.svg'
+const VIDEO_PREVIEW = '/assets/images/default-template.png'
+
+export const PendingJob: Story = {
+  args: {
+    iconName: iconForJobState('pending'),
+    iconClass: 'animate-spin',
+    primaryText: 'In queue',
+    secondaryText: '8:59:30pm'
+  }
+}
+
+export const InitializationJob: Story = {
+  args: {
+    iconName: iconForJobState('initialization'),
+    primaryText: 'Initializing...',
+    secondaryText: '8:59:35pm'
+  }
+}
+
+export const RunningJob: Story = {
+  args: {
+    iconName: iconForJobState('running'),
+    primaryText: 'Total: 30%',
+    secondaryText: 'CLIP Text Encode: 70%',
+    progressTotalPercent: 30,
+    progressCurrentPercent: 70
+  }
+}
+
+export const RunningJobWithActions: Story = {
+  args: {
+    iconName: iconForJobState('running'),
+    progressTotalPercent: 30,
+    progressCurrentPercent: 70
+  },
+  render: renderRunningJobWithActions
+}
+
+export const FailedJob: Story = {
+  args: {
+    iconName: iconForJobState('failed'),
+    iconClass: 'text-destructive-background',
+    iconWrapperClass: 'bg-modal-card-placeholder-background',
+    primaryText: 'Failed',
+    secondaryText: '8:59:30pm'
+  }
+}
+
+export const GeneratedImage: Story = {
+  args: {
+    previewUrl: IMAGE_PREVIEW,
+    previewAlt: 'image-032.png',
+    primaryText: 'image-032.png',
+    secondaryText: '1.84s'
+  }
+}
+
+export const GeneratedVideo: Story = {
+  args: {
+    previewUrl: VIDEO_PREVIEW,
+    previewAlt: 'clip-01.mp4',
+    isVideoPreview: true,
+    primaryText: 'clip-01.mp4',
+    secondaryText: '2m 12s'
+  }
+}
+
+export const GeneratedAudio: Story = {
+  args: {
+    iconName: 'icon-[lucide--music]',
+    primaryText: 'soundtrack-01.mp3',
+    secondaryText: '3m 20s'
+  }
+}
+
+export const Generated3D: Story = {
+  args: {
+    iconName: 'icon-[lucide--box]',
+    primaryText: 'scene-01.glb',
+    secondaryText: '128 MB'
+  }
+}
+
+type AssetsListItemProps = InstanceType<typeof AssetsListItem>['$props']
+
+function renderRunningJobWithActions(args: AssetsListItemProps) {
+  return {
+    components: { AssetsListItem, Button },
+    setup() {
+      return { args }
+    },
+    template: `
+      <AssetsListItem v-bind="args">
+        <template #primary>
+          <div class="flex items-center gap-1 text-text-primary">
+            <span>Total:</span>
+            <span class="font-medium">30%</span>
+          </div>
+        </template>
+        <template #secondary>
+          <div class="flex items-center gap-1 text-text-secondary">
+            <span>CLIP Text Encode:</span>
+            <span>70%</span>
+          </div>
+        </template>
+        <template #actions>
+          <Button variant="destructive" size="icon" aria-label="Cancel">
+            <i class="icon-[lucide--x] size-4" />
+          </Button>
+        </template>
+      </AssetsListItem>
+    `
+  }
+}
diff --git a/src/platform/assets/components/AssetsListItem.test.ts b/src/platform/assets/components/AssetsListItem.test.ts
new file mode 100644
index 0000000000..f274c997eb
--- /dev/null
+++ b/src/platform/assets/components/AssetsListItem.test.ts
@@ -0,0 +1,63 @@
+import { mount } from '@vue/test-utils'
+import { describe, expect, it } from 'vitest'
+
+import AssetsListItem from './AssetsListItem.vue'
+
+describe('AssetsListItem', () => {
+  it('renders video element with play overlay for video previews', () => {
+    const wrapper = mount(AssetsListItem, {
+      props: {
+        previewUrl: 'https://example.com/preview.mp4',
+        previewAlt: 'clip.mp4',
+        isVideoPreview: true
+      }
+    })
+
+    const video = wrapper.find('video')
+    expect(video.exists()).toBe(true)
+    expect(video.attributes('src')).toBe('https://example.com/preview.mp4')
+    expect(video.attributes('preload')).toBe('metadata')
+    expect(wrapper.find('img').exists()).toBe(false)
+    expect(wrapper.find('.bg-black\\/15').exists()).toBe(true)
+    expect(wrapper.find('.icon-\\[lucide--play\\]').exists()).toBe(true)
+  })
+
+  it('does not show play overlay for non-video previews', () => {
+    const wrapper = mount(AssetsListItem, {
+      props: {
+        previewUrl: 'https://example.com/preview.jpg',
+        previewAlt: 'image.png',
+        isVideoPreview: false
+      }
+    })
+
+    expect(wrapper.find('img').exists()).toBe(true)
+    expect(wrapper.find('video').exists()).toBe(false)
+    expect(wrapper.find('.icon-\\[lucide--play\\]').exists()).toBe(false)
+  })
+
+  it('emits preview-click when preview is clicked', async () => {
+    const wrapper = mount(AssetsListItem, {
+      props: {
+        previewUrl: 'https://example.com/preview.jpg',
+        previewAlt: 'image.png'
+      }
+    })
+
+    await wrapper.find('img').trigger('click')
+
+    expect(wrapper.emitted('preview-click')).toHaveLength(1)
+  })
+
+  it('emits preview-click when fallback icon is clicked', async () => {
+    const wrapper = mount(AssetsListItem, {
+      props: {
+        iconName: 'icon-[lucide--box]'
+      }
+    })
+
+    await wrapper.find('i').trigger('click')
+
+    expect(wrapper.emitted('preview-click')).toHaveLength(1)
+  })
+})
diff --git a/src/platform/assets/components/AssetsListItem.vue b/src/platform/assets/components/AssetsListItem.vue
new file mode 100644
index 0000000000..2fd4113275
--- /dev/null
+++ b/src/platform/assets/components/AssetsListItem.vue
@@ -0,0 +1,189 @@
+<template>
+  <div
+    class="relative flex items-center gap-2 overflow-hidden rounded-lg p-2 select-none"
+  >
+    <div
+      v-if="hasAnyProgressPercent(progressTotalPercent, progressCurrentPercent)"
+      :class="progressBarContainerClass"
+    >
+      <div
+        v-if="hasProgressPercent(progressTotalPercent)"
+        :class="progressBarPrimaryClass"
+        :style="progressPercentStyle(progressTotalPercent)"
+      />
+      <div
+        v-if="hasProgressPercent(progressCurrentPercent)"
+        :class="progressBarSecondaryClass"
+        :style="progressPercentStyle(progressCurrentPercent)"
+      />
+    </div>
+
+    <div
+      :class="
+        cn(
+          'relative z-1 flex size-8 shrink-0 items-center justify-center overflow-hidden rounded-sm bg-secondary-background',
+          iconWrapperClass
+        )
+      "
+      :aria-label="iconAriaLabel || undefined"
+    >
+      <slot
+        name="icon"
+        :preview-url="previewUrl"
+        :preview-alt="previewAlt"
+        :icon-name="iconName"
+        :icon-class="iconClass"
+        :icon-aria-label="iconAriaLabel"
+      >
+        <div
+          v-if="previewUrl"
+          class="relative size-full"
+          @click="emit('preview-click')"
+        >
+          <template v-if="isVideoPreview">
+            <video
+              :src="previewUrl"
+              preload="metadata"
+              muted
+              playsinline
+              class="pointer-events-none size-full object-cover"
+            />
+            <VideoPlayOverlay size="sm" />
+          </template>
+          <img
+            v-else
+            :src="previewUrl"
+            :alt="previewAlt"
+            class="size-full object-cover"
+          />
+        </div>
+        <div
+          v-else
+          class="flex size-full items-center justify-center"
+          @click="emit('preview-click')"
+        >
+          <i
+            aria-hidden="true"
+            :class="
+              cn(
+                iconName ?? 'icon-[lucide--image]',
+                'size-4 text-text-secondary',
+                iconClass
+              )
+            "
+          />
+        </div>
+      </slot>
+    </div>
+
+    <div class="relative z-1 flex min-w-0 flex-1 flex-col gap-1">
+      <div
+        v-if="$slots.primary || primaryText"
+        class="min-w-0 text-xs leading-none text-text-primary"
+      >
+        <slot v-if="$slots.primary" name="primary" />
+        <span v-else class="block truncate" :title="primaryText">
+          {{ primaryText }}
+        </span>
+      </div>
+      <div
+        v-if="$slots.secondary || secondaryText"
+        class="min-w-0 text-xs leading-none text-text-secondary"
+      >
+        <slot v-if="$slots.secondary" name="secondary" />
+        <span v-else class="block truncate" :title="secondaryText">
+          {{ secondaryText }}
+        </span>
+      </div>
+    </div>
+
+    <div
+      v-if="$slots.actions"
+      class="relative z-1 flex shrink-0 items-center gap-2"
+    >
+      <slot name="actions" />
+    </div>
+
+    <div
+      v-if="typeof stackCount === 'number' && stackCount > 1"
+      class="relative z-1 flex shrink-0 items-center"
+    >
+      <Button
+        variant="secondary"
+        size="md"
+        class="gap-1 font-bold"
+        :aria-label="stackIndicatorLabel"
+        :aria-expanded="stackExpanded"
+        @click.stop="emit('stack-toggle')"
+      >
+        <i aria-hidden="true" class="icon-[lucide--layers] size-4" />
+        <span class="text-xs leading-none">{{ stackCount }}</span>
+        <i
+          aria-hidden="true"
+          :class="
+            cn(
+              stackExpanded
+                ? 'icon-[lucide--chevron-down]'
+                : 'icon-[lucide--chevron-right]',
+              'size-3'
+            )
+          "
+        />
+      </Button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useProgressBarBackground } from '@/composables/useProgressBarBackground'
+import Button from '@/components/ui/button/Button.vue'
+import { cn } from '@/utils/tailwindUtil'
+
+import VideoPlayOverlay from './VideoPlayOverlay.vue'
+
+const emit = defineEmits<{
+  'stack-toggle': []
+  'preview-click': []
+}>()
+
+const {
+  previewUrl,
+  previewAlt = '',
+  iconName,
+  iconAriaLabel,
+  iconClass,
+  iconWrapperClass,
+  isVideoPreview = false,
+  primaryText,
+  secondaryText,
+  stackCount,
+  stackIndicatorLabel,
+  stackExpanded = false,
+  progressTotalPercent,
+  progressCurrentPercent
+} = defineProps<{
+  previewUrl?: string
+  previewAlt?: string
+  iconName?: string
+  iconAriaLabel?: string
+  iconClass?: string
+  iconWrapperClass?: string
+  isVideoPreview?: boolean
+  primaryText?: string
+  secondaryText?: string
+  stackCount?: number
+  stackIndicatorLabel?: string
+  stackExpanded?: boolean
+  progressTotalPercent?: number
+  progressCurrentPercent?: number
+}>()
+
+const {
+  progressBarContainerClass,
+  progressBarPrimaryClass,
+  progressBarSecondaryClass,
+  hasProgressPercent,
+  hasAnyProgressPercent,
+  progressPercentStyle
+} = useProgressBarBackground()
+</script>
diff --git a/src/platform/assets/components/Media3DBottom.vue b/src/platform/assets/components/Media3DBottom.vue
deleted file mode 100644
index 6483b651a9..0000000000
--- a/src/platform/assets/components/Media3DBottom.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<template>
-  <div class="flex flex-col items-center gap-1">
-    <MediaTitle :file-name="fileName" />
-    <!-- TBD: File size will be provided by backend history API -->
-    <div
-      v-if="asset.size"
-      class="flex items-center gap-2 text-xs text-zinc-400"
-    >
-      <span>{{ formatSize(asset.size) }}</span>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed } from 'vue'
-
-import { formatSize, getFilenameDetails } from '@/utils/formatUtil'
-
-import type { AssetMeta } from '../schemas/mediaAssetSchema'
-import MediaTitle from './MediaTitle.vue'
-
-const { asset } = defineProps<{
-  asset: AssetMeta
-}>()
-
-const fileName = computed(() => {
-  return getFilenameDetails(asset.name).filename
-})
-</script>
diff --git a/src/platform/assets/components/Media3DTop.vue b/src/platform/assets/components/Media3DTop.vue
index a4cc141db1..977558a921 100644
--- a/src/platform/assets/components/Media3DTop.vue
+++ b/src/platform/assets/components/Media3DTop.vue
@@ -1,12 +1,35 @@
 <template>
-  <div class="relative size-full overflow-hidden rounded">
+  <div class="relative size-full overflow-hidden rounded-sm">
+    <img
+      v-if="!thumbnailError"
+      :src="thumbnailSrc"
+      :alt="asset?.name"
+      class="size-full object-contain transition-transform duration-300 group-hover:scale-105 group-data-[selected=true]:scale-105"
+      @error="thumbnailError = true"
+    />
     <div
+      v-else
       class="flex size-full flex-col items-center justify-center gap-2 bg-modal-card-placeholder-background transition-transform duration-300 group-hover:scale-105 group-data-[selected=true]:scale-105"
     >
       <i class="icon-[lucide--box] text-3xl text-muted-foreground" />
-      <span class="text-sm text-base-foreground">{{
-        $t('assetBrowser.media.threeDModelPlaceholder')
-      }}</span>
+      <span class="text-sm text-base-foreground">
+        {{ $t('assetBrowser.media.threeDModelPlaceholder') }}
+      </span>
     </div>
   </div>
 </template>
+
+<script setup lang="ts">
+import { computed, ref } from 'vue'
+
+import type { AssetMeta } from '../schemas/mediaAssetSchema'
+
+const { asset } = defineProps<{ asset: AssetMeta }>()
+
+const thumbnailError = ref(false)
+
+const thumbnailSrc = computed(() => {
+  if (!asset?.src) return ''
+  return asset.src.replace(/([?&]filename=)([^&]*)/, '$1$2.png')
+})
+</script>
diff --git a/src/platform/assets/components/MediaAssetCard.stories.ts b/src/platform/assets/components/MediaAssetCard.stories.ts
index d7ccc8ac0f..d40bbc07f9 100644
--- a/src/platform/assets/components/MediaAssetCard.stories.ts
+++ b/src/platform/assets/components/MediaAssetCard.stories.ts
@@ -141,6 +141,40 @@ export const AudioAsset: Story = {
   }
 }
 
+export const TextAsset: Story = {
+  decorators: [
+    () => ({
+      template: '<div style="max-width: 280px;"><story /></div>'
+    })
+  ],
+  args: {
+    asset: {
+      ...sampleAsset,
+      id: 'asset-5',
+      name: 'generation-notes.txt',
+      size: 2048,
+      preview_url: SAMPLE_MEDIA.image1
+    }
+  }
+}
+
+export const OtherAsset: Story = {
+  decorators: [
+    () => ({
+      template: '<div style="max-width: 280px;"><story /></div>'
+    })
+  ],
+  args: {
+    asset: {
+      ...sampleAsset,
+      id: 'asset-6',
+      name: 'workflow-payload.bin',
+      size: 8192,
+      preview_url: SAMPLE_MEDIA.image1
+    }
+  }
+}
+
 export const LoadingState: Story = {
   decorators: [
     () => ({
diff --git a/src/platform/assets/components/MediaAssetCard.vue b/src/platform/assets/components/MediaAssetCard.vue
index 4514846fc2..8f05cdfc82 100644
--- a/src/platform/assets/components/MediaAssetCard.vue
+++ b/src/platform/assets/components/MediaAssetCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <CardContainer
+  <div
     ref="cardContainerRef"
     role="button"
     :aria-label="
@@ -11,129 +11,142 @@
         : $t('assetBrowser.ariaLabel.loadingAsset')
     "
     :tabindex="loading ? -1 : 0"
-    size="mini"
-    variant="ghost"
-    rounded="lg"
-    :class="containerClasses"
+    :class="
+      cn(
+        'flex cursor-pointer flex-col overflow-hidden rounded-lg p-2 transition-colors duration-200',
+        'group gap-2 select-none',
+        selected
+          ? 'ring-3 ring-modal-card-border-highlighted ring-inset'
+          : 'hover:bg-modal-card-background-hovered/20'
+      )
+    "
     :data-selected="selected"
     @click.stop="$emit('click')"
-    @contextmenu.prevent="handleContextMenu"
+    @contextmenu.prevent.stop="
+      asset ? emit('context-menu', $event, asset) : undefined
+    "
   >
-    <template #top>
-      <CardTop
-        ratio="square"
-        :bottom-left-class="durationChipClasses"
-        :bottom-right-class="durationChipClasses"
+    <!-- Top Area: Media Preview -->
+    <div class="relative aspect-square overflow-hidden p-0">
+      <!-- Loading State -->
+      <div
+        v-if="loading"
+        class="size-full animate-pulse rounded-lg bg-modal-card-placeholder-background"
+      />
+
+      <!-- Content based on asset type -->
+      <component
+        :is="getTopComponent(previewKind)"
+        v-else-if="asset && adaptedAsset"
+        :asset="adaptedAsset"
+        :context="{ type: assetType }"
+        class="absolute inset-0"
+        @view="handleZoomClick"
+        @download="actions.downloadAsset()"
+        @video-playing-state-changed="isVideoPlaying = $event"
+        @video-controls-changed="showVideoControls = $event"
+        @image-loaded="handleImageLoaded"
+      />
+
+      <LoadingOverlay :loading="isDeleting">
+        <i class="icon-[lucide--trash-2] size-5" />
+      </LoadingOverlay>
+
+      <!-- Action buttons overlay (top-left) -->
+      <div
+        v-if="showActionsOverlay"
+        class="absolute top-2 left-2 flex flex-wrap justify-start gap-2"
       >
-        <!-- Loading State -->
-        <template v-if="loading">
+        <IconGroup background-class="bg-white">
+          <Button
+            v-if="canInspect"
+            variant="overlay-white"
+            size="icon"
+            :aria-label="$t('mediaAsset.actions.zoom')"
+            @click.stop="handleZoomClick"
+          >
+            <i class="icon-[lucide--zoom-in] size-4" />
+          </Button>
+          <Button
+            variant="overlay-white"
+            size="icon"
+            :aria-label="$t('mediaAsset.actions.moreOptions')"
+            @click.stop="
+              asset ? emit('context-menu', $event, asset) : undefined
+            "
+          >
+            <i class="icon-[lucide--ellipsis] size-4" />
+          </Button>
+        </IconGroup>
+      </div>
+    </div>
+
+    <!-- Bottom Area: Media Info -->
+    <div class="flex-1">
+      <!-- Loading State -->
+      <div v-if="loading" class="flex items-start justify-between">
+        <div class="flex flex-col gap-1">
           <div
-            class="size-full animate-pulse rounded-lg bg-modal-card-placeholder-background"
+            class="h-4 w-24 animate-pulse rounded-sm bg-modal-card-background"
           />
-        </template>
-
-        <!-- Content based on asset type -->
-        <template v-else-if="asset && adaptedAsset">
-          <component
-            :is="getTopComponent(fileKind)"
-            :asset="adaptedAsset"
-            :context="{ type: assetType }"
-            @view="handleZoomClick"
-            @download="actions.downloadAsset()"
-            @video-playing-state-changed="isVideoPlaying = $event"
-            @video-controls-changed="showVideoControls = $event"
-            @image-loaded="handleImageLoaded"
+          <div
+            class="h-3 w-20 animate-pulse rounded-sm bg-modal-card-background"
           />
-        </template>
+        </div>
+        <div
+          class="h-6 w-12 animate-pulse rounded-sm bg-modal-card-background"
+        />
+      </div>
 
-        <!-- Top-left slot: Duration/Format chips OR Media actions -->
-        <template #top-left>
-          <!-- Duration/Format chips - show when not hovered and not playing -->
-          <div v-if="showStaticChips" class="flex flex-wrap items-center gap-1">
-            <SquareChip
-              v-if="formattedDuration"
-              variant="gray"
-              :label="formattedDuration"
-            />
+      <!-- Content -->
+      <div
+        v-else-if="asset && adaptedAsset"
+        class="flex items-end justify-between gap-1.5"
+      >
+        <!-- Left side: Media name and metadata -->
+        <div class="flex flex-col gap-1">
+          <!-- Title -->
+          <MediaTitle :file-name="fileName" />
+          <!-- Metadata -->
+          <div class="flex gap-1.5 text-xs text-muted-foreground">
+            <span v-if="formattedDuration">{{ formattedDuration }}</span>
+            <span v-if="metaInfo">{{ metaInfo }}</span>
           </div>
+        </div>
 
-          <!-- Media actions - show on hover or when playing -->
-          <IconGroup v-else-if="showActionsOverlay">
-            <Button size="icon" @click.stop="handleZoomClick">
-              <i class="icon-[lucide--zoom-in] size-4" />
-            </Button>
-            <Button size="icon" @click.stop="handleContextMenu">
-              <i class="icon-[lucide--ellipsis] size-4" />
-            </Button>
-          </IconGroup>
-        </template>
-
-        <!-- Output count (top-right) -->
-        <template v-if="showOutputCount" #top-right>
+        <!-- Right side: Output count -->
+        <div v-if="showOutputCount" class="shrink-0">
           <Button
             v-tooltip.top.pt:pointer-events-none="
               $t('mediaAsset.actions.seeMoreOutputs')
             "
             variant="secondary"
-            size="sm"
             @click.stop="handleOutputCountClick"
           >
             <i class="icon-[lucide--layers] size-4" />
             <span>{{ outputCount }}</span>
           </Button>
-        </template>
-      </CardTop>
-    </template>
-
-    <template #bottom>
-      <CardBottom>
-        <!-- Loading State -->
-        <template v-if="loading">
-          <div class="flex flex-col items-center justify-between gap-1">
-            <div
-              class="h-4 w-2/3 animate-pulse rounded bg-modal-card-background"
-            />
-            <div
-              class="h-3 w-1/2 animate-pulse rounded bg-modal-card-background"
-            />
-          </div>
-        </template>
-
-        <!-- Content based on asset type -->
-        <template v-else-if="asset && adaptedAsset">
-          <component
-            :is="getBottomComponent(fileKind)"
-            :asset="adaptedAsset"
-            :context="{ type: assetType }"
-          />
-        </template>
-      </CardBottom>
-    </template>
-  </CardContainer>
-
-  <MediaAssetContextMenu
-    v-if="asset"
-    ref="contextMenu"
-    :asset="asset"
-    :asset-type="assetType"
-    :file-kind="fileKind"
-    :show-delete-button="showDeleteButton"
-    @zoom="handleZoomClick"
-    @asset-deleted="emit('asset-deleted')"
-  />
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script setup lang="ts">
-import { useElementHover, whenever } from '@vueuse/core'
+import { useElementHover } from '@vueuse/core'
 import { computed, defineAsyncComponent, provide, ref, toRef } from 'vue'
 
 import IconGroup from '@/components/button/IconGroup.vue'
-import CardBottom from '@/components/card/CardBottom.vue'
-import CardContainer from '@/components/card/CardContainer.vue'
-import CardTop from '@/components/card/CardTop.vue'
-import SquareChip from '@/components/chip/SquareChip.vue'
+import LoadingOverlay from '@/components/common/LoadingOverlay.vue'
 import Button from '@/components/ui/button/Button.vue'
-import { formatDuration, getMediaTypeFromFilename } from '@/utils/formatUtil'
+import { useAssetsStore } from '@/stores/assetsStore'
+import {
+  formatDuration,
+  formatSize,
+  getFilenameDetails,
+  getMediaTypeFromFilename,
+  isPreviewableMediaType
+} from '@/utils/formatUtil'
 import { cn } from '@/utils/tailwindUtil'
 
 import { getAssetType } from '../composables/media/assetMappers'
@@ -141,59 +154,48 @@ import { useMediaAssetActions } from '../composables/useMediaAssetActions'
 import type { AssetItem } from '../schemas/assetSchema'
 import type { MediaKind } from '../schemas/mediaAssetSchema'
 import { MediaAssetKey } from '../schemas/mediaAssetSchema'
-import MediaAssetContextMenu from './MediaAssetContextMenu.vue'
+import MediaTitle from './MediaTitle.vue'
+
+type PreviewKind = ReturnType<typeof getMediaTypeFromFilename>
 
 const mediaComponents = {
   top: {
     video: defineAsyncComponent(() => import('./MediaVideoTop.vue')),
     audio: defineAsyncComponent(() => import('./MediaAudioTop.vue')),
     image: defineAsyncComponent(() => import('./MediaImageTop.vue')),
-    '3D': defineAsyncComponent(() => import('./Media3DTop.vue'))
-  },
-  bottom: {
-    video: defineAsyncComponent(() => import('./MediaVideoBottom.vue')),
-    audio: defineAsyncComponent(() => import('./MediaAudioBottom.vue')),
-    image: defineAsyncComponent(() => import('./MediaImageBottom.vue')),
-    '3D': defineAsyncComponent(() => import('./Media3DBottom.vue'))
+    '3D': defineAsyncComponent(() => import('./Media3DTop.vue')),
+    text: defineAsyncComponent(() => import('./MediaTextTop.vue')),
+    other: defineAsyncComponent(() => import('./MediaOtherTop.vue'))
   }
 }
 
-function getTopComponent(kind: MediaKind) {
-  return mediaComponents.top[kind] || mediaComponents.top.image
+function getTopComponent(kind: PreviewKind) {
+  return mediaComponents.top[kind] || mediaComponents.top.other
 }
 
-function getBottomComponent(kind: MediaKind) {
-  return mediaComponents.bottom[kind] || mediaComponents.bottom.image
-}
-
-const {
-  asset,
-  loading,
-  selected,
-  showOutputCount,
-  outputCount,
-  showDeleteButton,
-  openContextMenuId
-} = defineProps<{
+const { asset, loading, selected, showOutputCount, outputCount } = defineProps<{
   asset?: AssetItem
   loading?: boolean
   selected?: boolean
   showOutputCount?: boolean
   outputCount?: number
-  showDeleteButton?: boolean
-  openContextMenuId?: string | null
 }>()
 
+const assetsStore = useAssetsStore()
+
+// Get deletion state from store
+const isDeleting = computed(() =>
+  asset ? assetsStore.isAssetDeleting(asset.id) : false
+)
+
 const emit = defineEmits<{
   click: []
   zoom: [asset: AssetItem]
   'output-count-click': []
-  'asset-deleted': []
-  'context-menu-opened': []
+  'context-menu': [event: MouseEvent, asset: AssetItem]
 }>()
 
 const cardContainerRef = ref<HTMLElement>()
-const contextMenu = ref<InstanceType<typeof MediaAssetContextMenu>>()
 
 const isVideoPlaying = ref(false)
 const showVideoControls = ref(false)
@@ -212,7 +214,18 @@ const assetType = computed(() => {
 
 // Determine file type from extension
 const fileKind = computed((): MediaKind => {
-  return getMediaTypeFromFilename(asset?.name || '') as MediaKind
+  return getMediaTypeFromFilename(asset?.name || '')
+})
+
+const previewKind = computed((): PreviewKind => {
+  return getMediaTypeFromFilename(asset?.name || '')
+})
+
+const canInspect = computed(() => isPreviewableMediaType(fileKind.value))
+
+// Get filename without extension
+const fileName = computed(() => {
+  return getFilenameDetails(asset?.name || '').filename
 })
 
 // Adapt AssetItem to legacy AssetMeta format for existing components
@@ -240,15 +253,6 @@ provide(MediaAssetKey, {
   showVideoControls
 })
 
-const containerClasses = computed(() =>
-  cn(
-    'gap-1 select-none group',
-    selected
-      ? 'ring-3 ring-inset ring-modal-card-border-highlighted'
-      : 'hover:bg-modal-card-background-hovered'
-  )
-)
-
 const formattedDuration = computed(() => {
   // Check for execution time first (from history API)
   const executionTime = asset?.user_metadata?.executionTimeInSeconds
@@ -262,33 +266,25 @@ const formattedDuration = computed(() => {
   return formatDuration(Number(duration))
 })
 
-const durationChipClasses = computed(() => {
-  if (fileKind.value === 'audio') {
-    return '-translate-y-11'
+// Get metadata info based on file kind
+const metaInfo = computed(() => {
+  if (!asset) return ''
+  if (fileKind.value === 'image' && imageDimensions.value) {
+    return `${imageDimensions.value.width}x${imageDimensions.value.height}`
   }
-  if (fileKind.value === 'video' && showVideoControls.value) {
-    return '-translate-y-16'
+  if (asset.size && ['video', 'audio', '3D'].includes(fileKind.value)) {
+    return formatSize(asset.size)
   }
   return ''
 })
 
-// Show static chips when NOT hovered and NOT playing (normal state)
-const showStaticChips = computed(
-  () =>
-    !loading &&
-    !!asset &&
-    !isHovered.value &&
-    !isVideoPlaying.value &&
-    formattedDuration.value
-)
-
-// Show action overlay when hovered OR playing
-const showActionsOverlay = computed(
-  () => !loading && !!asset && (isHovered.value || isVideoPlaying.value)
-)
+const showActionsOverlay = computed(() => {
+  if (loading || !asset || isDeleting.value) return false
+  return isHovered.value || selected || isVideoPlaying.value
+})
 
 const handleZoomClick = () => {
-  if (asset) {
+  if (asset && canInspect.value) {
     emit('zoom', asset)
   }
 }
@@ -300,17 +296,4 @@ const handleImageLoaded = (width: number, height: number) => {
 const handleOutputCountClick = () => {
   emit('output-count-click')
 }
-
-const handleContextMenu = (event: MouseEvent) => {
-  emit('context-menu-opened')
-  contextMenu.value?.show(event)
-}
-
-// Close this context menu when another opens
-whenever(
-  () => openContextMenuId && openContextMenuId !== asset?.id,
-  () => {
-    contextMenu.value?.hide()
-  }
-)
 </script>
diff --git a/src/platform/assets/components/MediaAssetContextMenu.vue b/src/platform/assets/components/MediaAssetContextMenu.vue
index d2b456c16c..c9be754a12 100644
--- a/src/platform/assets/components/MediaAssetContextMenu.vue
+++ b/src/platform/assets/components/MediaAssetContextMenu.vue
@@ -11,15 +11,15 @@
         )
       }
     }"
+    @hide="onMenuHide"
   >
     <template #item="{ item, props }">
       <Button
         variant="secondary"
-        size="sm"
         class="w-full justify-start"
         v-bind="props.action"
       >
-        <i :class="item.icon" class="size-4" />
+        <i v-if="item.icon" :class="item.icon" class="size-4" />
         <span>{{
           typeof item.label === 'function' ? item.label() : (item.label ?? '')
         }}</span>
@@ -29,15 +29,17 @@
 </template>
 
 <script setup lang="ts">
-import { onClickOutside } from '@vueuse/core'
+import { useEventListener } from '@vueuse/core'
 import ContextMenu from 'primevue/contextmenu'
 import type { MenuItem } from 'primevue/menuitem'
+import type { ComponentPublicInstance } from 'vue'
 import { computed, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import Button from '@/components/ui/button/Button.vue'
 import { isCloud } from '@/platform/distribution/types'
 import { supportsWorkflowMetadata } from '@/platform/workflow/utils/workflowExtractionUtil'
+import { isPreviewableMediaType } from '@/utils/formatUtil'
 import { detectNodeTypeFromFilename } from '@/utils/loaderNodeUtil'
 import { cn } from '@/utils/tailwindUtil'
 
@@ -45,29 +47,62 @@ import { useMediaAssetActions } from '../composables/useMediaAssetActions'
 import type { AssetItem } from '../schemas/assetSchema'
 import type { AssetContext, MediaKind } from '../schemas/mediaAssetSchema'
 
-const { asset, assetType, fileKind, showDeleteButton } = defineProps<{
+const {
+  asset,
+  assetType,
+  fileKind,
+  showDeleteButton,
+  selectedAssets,
+  isBulkMode
+} = defineProps<{
   asset: AssetItem
   assetType: AssetContext['type']
   fileKind: MediaKind
   showDeleteButton?: boolean
+  selectedAssets?: AssetItem[]
+  isBulkMode?: boolean
 }>()
 
 const emit = defineEmits<{
   zoom: []
+  hide: []
   'asset-deleted': []
+  'bulk-download': [assets: AssetItem[]]
+  'bulk-delete': [assets: AssetItem[]]
+  'bulk-add-to-workflow': [assets: AssetItem[]]
+  'bulk-open-workflow': [assets: AssetItem[]]
+  'bulk-export-workflow': [assets: AssetItem[]]
 }>()
 
-const contextMenu = ref<InstanceType<typeof ContextMenu>>()
+type ContextMenuInstance = ComponentPublicInstance & {
+  show: (event: MouseEvent) => void
+  hide: () => void
+  container?: HTMLElement
+  $el?: HTMLElement
+}
+
+const contextMenu = ref<ContextMenuInstance | null>(null)
+const isVisible = ref(false)
 const actions = useMediaAssetActions()
 const { t } = useI18n()
 
-// Close context menu when clicking outside
-onClickOutside(
-  computed(() => (contextMenu.value as any)?.$el),
-  () => {
-    hide()
-  }
-)
+function getOverlayEl(): HTMLElement | null {
+  return contextMenu.value?.container ?? contextMenu.value?.$el ?? null
+}
+
+function dismissIfOutside(event: Event) {
+  if (!isVisible.value) return
+  const overlay = getOverlayEl()
+  if (!overlay) return
+  if (overlay.contains(event.target as Node)) return
+  hide()
+}
+
+useEventListener(window, 'pointerdown', dismissIfOutside, { capture: true })
+useEventListener(window, 'scroll', dismissIfOutside, {
+  capture: true,
+  passive: true
+})
 
 const showAddToWorkflow = computed(() => {
   // Output assets can always be added
@@ -112,8 +147,68 @@ const contextMenuItems = computed<MenuItem[]>(() => {
 
   const items: MenuItem[] = []
 
-  // Inspect (if not 3D)
-  if (fileKind !== '3D') {
+  // Check if current asset is part of the selection
+  const isCurrentAssetSelected = selectedAssets?.some(
+    (selectedAsset) => selectedAsset.id === asset.id
+  )
+
+  // Bulk mode: Show selected count and bulk actions only if current asset is selected
+  if (
+    isBulkMode &&
+    selectedAssets &&
+    selectedAssets.length > 0 &&
+    isCurrentAssetSelected
+  ) {
+    // Header item showing selected count
+    items.push({
+      label: t('mediaAsset.selection.multipleSelectedAssets'),
+      disabled: true
+    })
+
+    // Bulk Add to Workflow
+    items.push({
+      label: t('mediaAsset.selection.insertAllAssetsAsNodes'),
+      icon: 'icon-[comfy--node]',
+      command: () => emit('bulk-add-to-workflow', selectedAssets)
+    })
+
+    // Bulk Open Workflow
+    items.push({
+      label: t('mediaAsset.selection.openWorkflowAll'),
+      icon: 'icon-[comfy--workflow]',
+      command: () => emit('bulk-open-workflow', selectedAssets)
+    })
+
+    // Bulk Export Workflow
+    items.push({
+      label: t('mediaAsset.selection.exportWorkflowAll'),
+      icon: 'icon-[lucide--file-output]',
+      command: () => emit('bulk-export-workflow', selectedAssets)
+    })
+
+    // Bulk Download
+    items.push({
+      label: t('mediaAsset.selection.downloadSelectedAll'),
+      icon: 'icon-[lucide--download]',
+      command: () => emit('bulk-download', selectedAssets)
+    })
+
+    // Bulk Delete (if allowed)
+    if (shouldShowDeleteButton.value) {
+      items.push({
+        label: t('mediaAsset.selection.deleteSelectedAll'),
+        icon: 'icon-[lucide--trash-2]',
+        command: () => emit('bulk-delete', selectedAssets)
+      })
+    }
+
+    return items
+  }
+
+  // Individual mode: Show all menu options
+
+  // Inspect
+  if (isPreviewableMediaType(fileKind)) {
     items.push({
       label: t('mediaAsset.actions.inspect'),
       icon: 'icon-[lucide--zoom-in]',
@@ -124,7 +219,7 @@ const contextMenuItems = computed<MenuItem[]>(() => {
   // Add to workflow (conditional)
   if (showAddToWorkflow.value) {
     items.push({
-      label: t('mediaAsset.actions.addToWorkflow'),
+      label: t('mediaAsset.actions.insertAsNodeInWorkflow'),
       icon: 'icon-[comfy--node]',
       command: () => actions.addWorkflow(asset)
     })
@@ -172,8 +267,8 @@ const contextMenuItems = computed<MenuItem[]>(() => {
       icon: 'icon-[lucide--trash-2]',
       command: async () => {
         if (asset) {
-          const success = await actions.confirmDelete(asset)
-          if (success) {
+          const confirmed = await actions.deleteAssets(asset)
+          if (confirmed) {
             emit('asset-deleted')
           }
         }
@@ -184,11 +279,18 @@ const contextMenuItems = computed<MenuItem[]>(() => {
   return items
 })
 
-const show = (event: MouseEvent) => {
+function onMenuHide() {
+  isVisible.value = false
+  emit('hide')
+}
+
+function show(event: MouseEvent) {
+  isVisible.value = true
   contextMenu.value?.show(event)
 }
 
-const hide = () => {
+function hide() {
+  isVisible.value = false
   contextMenu.value?.hide()
 }
 
diff --git a/src/platform/assets/components/MediaAssetFilterBar.vue b/src/platform/assets/components/MediaAssetFilterBar.vue
index 0eca412bd3..80cbc94776 100644
--- a/src/platform/assets/components/MediaAssetFilterBar.vue
+++ b/src/platform/assets/components/MediaAssetFilterBar.vue
@@ -1,36 +1,38 @@
 <template>
-  <div class="flex gap-3">
+  <div class="flex items-center gap-3">
     <SearchBox
       :model-value="searchQuery"
-      :placeholder="$t('sideToolbar.searchAssets') + '...'"
+      :placeholder="
+        $t('g.searchPlaceholder', { subject: $t('sideToolbar.labels.assets') })
+      "
       @update:model-value="handleSearchChange"
     />
-    <MediaAssetFilterButton
-      v-if="isCloud"
-      v-tooltip.top="{ value: $t('assetBrowser.filterBy') }"
-      size="md"
-    >
-      <template #default="{ close }">
-        <MediaAssetFilterMenu
-          :media-type-filters="mediaTypeFilters"
-          :close="close"
-          @update:media-type-filters="handleMediaTypeFiltersChange"
-        />
-      </template>
-    </MediaAssetFilterButton>
-    <AssetSortButton
-      v-if="isCloud"
-      v-tooltip.top="{ value: $t('assetBrowser.sortBy') }"
-      size="md"
-    >
-      <template #default="{ close }">
-        <MediaAssetSortMenu
-          v-model:sort-by="sortBy"
-          :show-generation-time-sort
-          :close="close"
-        />
-      </template>
-    </AssetSortButton>
+    <div class="flex items-center gap-1.5">
+      <MediaAssetFilterButton
+        v-if="isCloud"
+        v-tooltip.top="{ value: $t('assetBrowser.filterBy') }"
+      >
+        <template #default="{ close }">
+          <MediaAssetFilterMenu
+            :media-type-filters
+            :close
+            @update:media-type-filters="handleMediaTypeFiltersChange"
+          />
+        </template>
+      </MediaAssetFilterButton>
+      <MediaAssetSettingsButton
+        v-tooltip.top="{ value: $t('sideToolbar.mediaAssets.viewSettings') }"
+      >
+        <template #default>
+          <MediaAssetSettingsMenu
+            v-model:view-mode="viewMode"
+            v-model:sort-by="sortBy"
+            :show-sort-options="isCloud"
+            :show-generation-time-sort
+          />
+        </template>
+      </MediaAssetSettingsButton>
+    </div>
   </div>
 </template>
 
@@ -40,9 +42,9 @@ import { isCloud } from '@/platform/distribution/types'
 
 import MediaAssetFilterButton from './MediaAssetFilterButton.vue'
 import MediaAssetFilterMenu from './MediaAssetFilterMenu.vue'
-import AssetSortButton from './MediaAssetSortButton.vue'
-import MediaAssetSortMenu from './MediaAssetSortMenu.vue'
-import type { SortBy } from './MediaAssetSortMenu.vue'
+import MediaAssetSettingsButton from './MediaAssetSettingsButton.vue'
+import MediaAssetSettingsMenu from './MediaAssetSettingsMenu.vue'
+import type { SortBy } from './MediaAssetSettingsMenu.vue'
 
 const { showGenerationTimeSort = false } = defineProps<{
   searchQuery: string
@@ -56,6 +58,7 @@ const emit = defineEmits<{
 }>()
 
 const sortBy = defineModel<SortBy>('sortBy', { required: true })
+const viewMode = defineModel<'list' | 'grid'>('viewMode', { required: true })
 
 const handleSearchChange = (value: string | undefined) => {
   emit('update:searchQuery', value ?? '')
diff --git a/src/platform/assets/components/MediaAssetFilterButton.vue b/src/platform/assets/components/MediaAssetFilterButton.vue
index 98658fb01c..2b89c3096f 100644
--- a/src/platform/assets/components/MediaAssetFilterButton.vue
+++ b/src/platform/assets/components/MediaAssetFilterButton.vue
@@ -1,58 +1,19 @@
 <template>
-  <div class="relative inline-flex items-center">
-    <Button variant="secondary" size="icon" @click="toggle">
-      <i class="icon-[lucide--list-filter]" />
-    </Button>
-
-    <Popover
-      ref="popover"
-      append-to="#vue-app"
-      auto-z-index
-      :base-z-index="1000"
-      dismissable
-      close-on-escape
-      unstyled
-      :pt="pt"
-      @show="$emit('menuOpened')"
-      @hide="$emit('menuClosed')"
-    >
-      <div class="flex min-w-40 flex-col gap-2 p-2">
-        <slot :close="hide" />
-      </div>
+  <div class="inline-flex items-center">
+    <Popover>
+      <template #button>
+        <Button variant="secondary" size="icon">
+          <i class="icon-[lucide--list-filter]" />
+        </Button>
+      </template>
+      <template #default="{ close }">
+        <slot :close />
+      </template>
     </Popover>
   </div>
 </template>
 
 <script setup lang="ts">
-import Popover from 'primevue/popover'
-import { computed, ref } from 'vue'
-
 import Button from '@/components/ui/button/Button.vue'
-import { cn } from '@/utils/tailwindUtil'
-
-const popover = ref<InstanceType<typeof Popover>>()
-
-defineEmits<{
-  menuOpened: []
-  menuClosed: []
-}>()
-
-const toggle = (event: Event) => {
-  popover.value?.toggle(event)
-}
-
-const hide = () => {
-  popover.value?.hide()
-}
-
-const pt = computed(() => ({
-  root: {
-    class: cn('absolute z-50')
-  },
-  content: {
-    class: cn(
-      'mt-1 rounded-lg bg-base-background text-base-foreground border border-border-default shadow-lg'
-    )
-  }
-}))
+import Popover from '@/components/ui/Popover.vue'
 </script>
diff --git a/src/platform/assets/components/MediaAssetFilterMenu.vue b/src/platform/assets/components/MediaAssetFilterMenu.vue
index 20c5960b7c..0df3dac9be 100644
--- a/src/platform/assets/components/MediaAssetFilterMenu.vue
+++ b/src/platform/assets/components/MediaAssetFilterMenu.vue
@@ -11,11 +11,11 @@ TODO: Extract checkbox pattern into reusable Checkbox component
 - Benefits: Consistent checkbox UI, better maintainability, reusable design system component
 -->
 <template>
-  <div class="flex flex-col gap-0 p-0 m-0">
+  <div class="m-0 flex flex-col gap-0 p-0">
     <div
       v-for="filter in filters"
       :key="filter.type"
-      class="flex h-10 cursor-pointer items-center gap-2 rounded-lg px-2 hover:bg-secondary-background-hover"
+      class="flex h-10 min-w-32 cursor-pointer items-center gap-2 rounded-lg px-2 hover:bg-secondary-background-hover"
       tabindex="0"
       role="checkbox"
       :aria-checked="mediaTypeFilters.includes(filter.type)"
@@ -24,10 +24,10 @@ TODO: Extract checkbox pattern into reusable Checkbox component
       @keydown.space.prevent="toggleMediaType(filter.type)"
     >
       <div
-        class="flex h-4 w-4 shrink-0 items-center justify-center rounded p-0.5 transition-all duration-200"
+        class="flex size-4 shrink-0 items-center justify-center rounded-sm p-0.5 transition-all duration-200"
         :class="
           mediaTypeFilters.includes(filter.type)
-            ? 'bg-primary-background border-primary-background'
+            ? 'border-primary-background bg-primary-background'
             : 'bg-secondary-background'
         "
       >
diff --git a/src/platform/assets/components/MediaAssetSettingsButton.vue b/src/platform/assets/components/MediaAssetSettingsButton.vue
new file mode 100644
index 0000000000..570f844baa
--- /dev/null
+++ b/src/platform/assets/components/MediaAssetSettingsButton.vue
@@ -0,0 +1,23 @@
+<template>
+  <div class="inline-flex items-center">
+    <Popover>
+      <template #button>
+        <Button
+          variant="secondary"
+          size="icon"
+          :aria-label="$t('sideToolbar.mediaAssets.viewSettings')"
+        >
+          <i class="icon-[lucide--settings-2]" />
+        </Button>
+      </template>
+      <template #default="{ close }">
+        <slot :close />
+      </template>
+    </Popover>
+  </div>
+</template>
+
+<script setup lang="ts">
+import Button from '@/components/ui/button/Button.vue'
+import Popover from '@/components/ui/Popover.vue'
+</script>
diff --git a/src/platform/assets/components/MediaAssetSettingsMenu.vue b/src/platform/assets/components/MediaAssetSettingsMenu.vue
new file mode 100644
index 0000000000..6d4e1cc2c6
--- /dev/null
+++ b/src/platform/assets/components/MediaAssetSettingsMenu.vue
@@ -0,0 +1,110 @@
+<template>
+  <div class="flex flex-col">
+    <Button
+      variant="textonly"
+      class="w-full"
+      @click="handleViewModeChange('list')"
+    >
+      <span class="flex items-center gap-2">
+        <i class="icon-[lucide--table-of-contents] size-4" />
+        <span>{{ $t('sideToolbar.queueProgressOverlay.viewList') }}</span>
+      </span>
+      <i
+        class="ml-auto icon-[lucide--check] size-4"
+        :class="viewMode !== 'list' && 'opacity-0'"
+      />
+    </Button>
+
+    <Button
+      variant="textonly"
+      class="w-full"
+      @click="handleViewModeChange('grid')"
+    >
+      <span class="flex items-center gap-2">
+        <i class="icon-[lucide--layout-grid] size-4" />
+        <span>{{ $t('sideToolbar.queueProgressOverlay.viewGrid') }}</span>
+      </span>
+      <i
+        class="ml-auto icon-[lucide--check] size-4"
+        :class="viewMode !== 'grid' && 'opacity-0'"
+      />
+    </Button>
+
+    <template v-if="showSortOptions">
+      <div class="my-1 w-full border-b border-border-subtle" />
+
+      <Button
+        variant="textonly"
+        class="w-full"
+        @click="handleSortChange('newest')"
+      >
+        <span>{{ $t('sideToolbar.mediaAssets.sortNewestFirst') }}</span>
+        <i
+          class="ml-auto icon-[lucide--check] size-4"
+          :class="sortBy !== 'newest' && 'opacity-0'"
+        />
+      </Button>
+
+      <Button
+        variant="textonly"
+        class="w-full"
+        @click="handleSortChange('oldest')"
+      >
+        <span>{{ $t('sideToolbar.mediaAssets.sortOldestFirst') }}</span>
+        <i
+          class="ml-auto icon-[lucide--check] size-4"
+          :class="sortBy !== 'oldest' && 'opacity-0'"
+        />
+      </Button>
+
+      <template v-if="showGenerationTimeSort">
+        <Button
+          variant="textonly"
+          class="w-full"
+          @click="handleSortChange('longest')"
+        >
+          <span>{{ $t('sideToolbar.mediaAssets.sortLongestFirst') }}</span>
+          <i
+            class="ml-auto icon-[lucide--check] size-4"
+            :class="sortBy !== 'longest' && 'opacity-0'"
+          />
+        </Button>
+
+        <Button
+          variant="textonly"
+          class="w-full"
+          @click="handleSortChange('fastest')"
+        >
+          <span>{{ $t('sideToolbar.mediaAssets.sortFastestFirst') }}</span>
+          <i
+            class="ml-auto icon-[lucide--check] size-4"
+            :class="sortBy !== 'fastest' && 'opacity-0'"
+          />
+        </Button>
+      </template>
+    </template>
+  </div>
+</template>
+
+<script setup lang="ts">
+import Button from '@/components/ui/button/Button.vue'
+
+export type SortBy = 'newest' | 'oldest' | 'longest' | 'fastest'
+
+const { showSortOptions = false, showGenerationTimeSort = false } =
+  defineProps<{
+    showSortOptions?: boolean
+    showGenerationTimeSort?: boolean
+  }>()
+
+const viewMode = defineModel<'list' | 'grid'>('viewMode', { required: true })
+const sortBy = defineModel<SortBy>('sortBy', { required: true })
+
+function handleViewModeChange(value: 'list' | 'grid') {
+  viewMode.value = value
+}
+
+function handleSortChange(value: SortBy) {
+  sortBy.value = value
+}
+</script>
diff --git a/src/platform/assets/components/MediaAssetSortButton.vue b/src/platform/assets/components/MediaAssetSortButton.vue
deleted file mode 100644
index 1721eaf854..0000000000
--- a/src/platform/assets/components/MediaAssetSortButton.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <div class="relative inline-flex items-center">
-    <Button variant="secondary" size="icon" @click="toggle">
-      <i class="icon-[lucide--arrow-up-down]" />
-    </Button>
-
-    <Popover
-      ref="popover"
-      append-to="body"
-      :auto-z-index="true"
-      :base-z-index="1000"
-      :dismissable="true"
-      :close-on-escape="true"
-      unstyled
-      :pt="pt"
-      @show="$emit('menuOpened')"
-      @hide="$emit('menuClosed')"
-    >
-      <div class="flex min-w-40 flex-col gap-2 p-2">
-        <slot :close="hide" />
-      </div>
-    </Popover>
-  </div>
-</template>
-
-<script setup lang="ts">
-import Popover from 'primevue/popover'
-import { computed, ref } from 'vue'
-
-import Button from '@/components/ui/button/Button.vue'
-import { cn } from '@/utils/tailwindUtil'
-
-const popover = ref<InstanceType<typeof Popover>>()
-
-defineEmits<{
-  menuOpened: []
-  menuClosed: []
-}>()
-
-const toggle = (event: Event) => {
-  popover.value?.toggle(event)
-}
-
-const hide = () => {
-  popover.value?.hide()
-}
-
-const pt = computed(() => ({
-  root: {
-    class: cn('absolute z-50')
-  },
-  content: {
-    class: cn(
-      'mt-1 rounded-lg',
-      'bg-base-background text-base-foreground border border-border-default',
-      'shadow-lg'
-    )
-  }
-}))
-</script>
diff --git a/src/platform/assets/components/MediaAssetSortMenu.vue b/src/platform/assets/components/MediaAssetSortMenu.vue
deleted file mode 100644
index 463b8a9060..0000000000
--- a/src/platform/assets/components/MediaAssetSortMenu.vue
+++ /dev/null
@@ -1,59 +0,0 @@
-<template>
-  <div class="flex flex-col">
-    <Button
-      variant="textonly"
-      class="justify-start"
-      @click="handleSortChange('newest')"
-    >
-      <span>{{ $t('sideToolbar.mediaAssets.sortNewestFirst') }}</span>
-      <i v-if="sortBy === 'newest'" class="icon-[lucide--check] size-4" />
-    </Button>
-
-    <Button
-      variant="textonly"
-      class="justify-start"
-      @click="handleSortChange('oldest')"
-    >
-      <span>{{ $t('sideToolbar.mediaAssets.sortOldestFirst') }}</span>
-      <i v-if="sortBy === 'oldest'" class="icon-[lucide--check] size-4" />
-    </Button>
-
-    <template v-if="showGenerationTimeSort">
-      <Button
-        variant="textonly"
-        class="justify-start"
-        @click="handleSortChange('longest')"
-      >
-        <span>{{ $t('sideToolbar.mediaAssets.sortLongestFirst') }}</span>
-        <i v-if="sortBy === 'longest'" class="icon-[lucide--check] size-4" />
-      </Button>
-
-      <Button
-        variant="textonly"
-        class="justify-start"
-        @click="handleSortChange('fastest')"
-      >
-        <span>{{ $t('sideToolbar.mediaAssets.sortFastestFirst') }}</span>
-        <i v-if="sortBy === 'fastest'" class="icon-[lucide--check] size-4" />
-      </Button>
-    </template>
-  </div>
-</template>
-
-<script setup lang="ts">
-import Button from '@/components/ui/button/Button.vue'
-
-export type SortBy = 'newest' | 'oldest' | 'longest' | 'fastest'
-
-const { close, showGenerationTimeSort = false } = defineProps<{
-  close: () => void
-  showGenerationTimeSort?: boolean
-}>()
-
-const sortBy = defineModel<SortBy>('sortBy', { required: true })
-
-const handleSortChange = (value: SortBy) => {
-  sortBy.value = value
-  close()
-}
-</script>
diff --git a/src/platform/assets/components/MediaAudioBottom.vue b/src/platform/assets/components/MediaAudioBottom.vue
deleted file mode 100644
index 6483b651a9..0000000000
--- a/src/platform/assets/components/MediaAudioBottom.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<template>
-  <div class="flex flex-col items-center gap-1">
-    <MediaTitle :file-name="fileName" />
-    <!-- TBD: File size will be provided by backend history API -->
-    <div
-      v-if="asset.size"
-      class="flex items-center gap-2 text-xs text-zinc-400"
-    >
-      <span>{{ formatSize(asset.size) }}</span>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed } from 'vue'
-
-import { formatSize, getFilenameDetails } from '@/utils/formatUtil'
-
-import type { AssetMeta } from '../schemas/mediaAssetSchema'
-import MediaTitle from './MediaTitle.vue'
-
-const { asset } = defineProps<{
-  asset: AssetMeta
-}>()
-
-const fileName = computed(() => {
-  return getFilenameDetails(asset.name).filename
-})
-</script>
diff --git a/src/platform/assets/components/MediaAudioTop.vue b/src/platform/assets/components/MediaAudioTop.vue
index 2cad5da45c..64ea8bbcbf 100644
--- a/src/platform/assets/components/MediaAudioTop.vue
+++ b/src/platform/assets/components/MediaAudioTop.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="relative size-full overflow-hidden rounded">
+  <div class="relative size-full overflow-hidden rounded-sm">
     <div
       class="flex size-full flex-col items-center justify-center gap-2 bg-modal-card-placeholder-background transition-transform duration-300 group-hover:scale-105 group-data-[selected=true]:scale-105"
     >
diff --git a/src/platform/assets/components/MediaImageBottom.vue b/src/platform/assets/components/MediaImageBottom.vue
deleted file mode 100644
index 6c1444b423..0000000000
--- a/src/platform/assets/components/MediaImageBottom.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-<template>
-  <div class="flex flex-col items-center gap-1">
-    <MediaTitle :file-name="fileName" />
-    <div class="flex items-center text-xs text-zinc-400">
-      <span v-if="asset.dimensions"
-        >{{ asset.dimensions?.width }}x{{ asset.dimensions?.height }}</span
-      >
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed } from 'vue'
-
-import { getFilenameDetails } from '@/utils/formatUtil'
-
-import type { AssetMeta } from '../schemas/mediaAssetSchema'
-import MediaTitle from './MediaTitle.vue'
-
-const { asset } = defineProps<{
-  asset: AssetMeta
-}>()
-
-const fileName = computed(() => {
-  return getFilenameDetails(asset.name).filename
-})
-</script>
diff --git a/src/platform/assets/components/MediaImageTop.vue b/src/platform/assets/components/MediaImageTop.vue
index 8bd64fe6c4..2aa6722645 100644
--- a/src/platform/assets/components/MediaImageTop.vue
+++ b/src/platform/assets/components/MediaImageTop.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="relative size-full overflow-hidden rounded bg-modal-card-placeholder-background"
+    class="relative size-full overflow-hidden rounded-sm bg-modal-card-placeholder-background"
     @dblclick="emit('view')"
   >
     <img
diff --git a/src/platform/assets/components/MediaOtherTop.vue b/src/platform/assets/components/MediaOtherTop.vue
new file mode 100644
index 0000000000..896d4a4426
--- /dev/null
+++ b/src/platform/assets/components/MediaOtherTop.vue
@@ -0,0 +1,9 @@
+<template>
+  <div class="relative size-full overflow-hidden rounded-sm">
+    <div
+      class="flex size-full items-center justify-center bg-modal-card-placeholder-background transition-transform duration-300 group-hover:scale-105 group-data-[selected=true]:scale-105"
+    >
+      <i class="icon-[lucide--check-check] text-3xl text-base-foreground" />
+    </div>
+  </div>
+</template>
diff --git a/src/platform/assets/components/MediaTextTop.vue b/src/platform/assets/components/MediaTextTop.vue
new file mode 100644
index 0000000000..75f3831cdb
--- /dev/null
+++ b/src/platform/assets/components/MediaTextTop.vue
@@ -0,0 +1,9 @@
+<template>
+  <div class="relative size-full overflow-hidden rounded-sm">
+    <div
+      class="flex size-full items-center justify-center bg-modal-card-placeholder-background transition-transform duration-300 group-hover:scale-105 group-data-[selected=true]:scale-105"
+    >
+      <i class="icon-[lucide--text] text-3xl text-base-foreground" />
+    </div>
+  </div>
+</template>
diff --git a/src/platform/assets/components/MediaTitle.vue b/src/platform/assets/components/MediaTitle.vue
index 7ad9999af5..6b4a27153a 100644
--- a/src/platform/assets/components/MediaTitle.vue
+++ b/src/platform/assets/components/MediaTitle.vue
@@ -1,21 +1,14 @@
 <template>
-  <h3
-    class="m-0 line-clamp-1 text-sm font-bold text-base-foreground"
-    :title="fullName"
+  <p
+    class="m-0 line-clamp-2 text-sm/tight break-all text-base-foreground"
+    :title="fileName"
   >
-    {{ displayName }}
-  </h3>
+    {{ fileName }}
+  </p>
 </template>
 
 <script setup lang="ts">
-import { computed } from 'vue'
-
-import { truncateFilename } from '@/utils/formatUtil'
-
-const props = defineProps<{
+defineProps<{
   fileName: string
 }>()
-
-const fullName = computed(() => props.fileName)
-const displayName = computed(() => truncateFilename(props.fileName))
 </script>
diff --git a/src/platform/assets/components/MediaVideoBottom.vue b/src/platform/assets/components/MediaVideoBottom.vue
deleted file mode 100644
index 7eb5998840..0000000000
--- a/src/platform/assets/components/MediaVideoBottom.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<template>
-  <div class="flex flex-col items-center gap-1">
-    <MediaTitle :file-name="fileName" />
-    <!-- TBD: File size will be provided by backend history API -->
-    <div v-if="asset.size" class="flex items-center text-xs text-zinc-400">
-      <span>{{ formatSize(asset.size) }}</span>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed } from 'vue'
-
-import { formatSize, getFilenameDetails } from '@/utils/formatUtil'
-
-import type { AssetMeta } from '../schemas/mediaAssetSchema'
-import MediaTitle from './MediaTitle.vue'
-
-const { asset } = defineProps<{
-  asset: AssetMeta
-}>()
-
-const fileName = computed(() => {
-  return getFilenameDetails(asset.name).filename
-})
-</script>
diff --git a/src/platform/assets/components/MediaVideoTop.test.ts b/src/platform/assets/components/MediaVideoTop.test.ts
new file mode 100644
index 0000000000..d871145bb0
--- /dev/null
+++ b/src/platform/assets/components/MediaVideoTop.test.ts
@@ -0,0 +1,101 @@
+import { mount } from '@vue/test-utils'
+import { describe, expect, it, vi } from 'vitest'
+
+import type { AssetMeta } from '../schemas/mediaAssetSchema'
+import MediaVideoTop from './MediaVideoTop.vue'
+
+function createVideoAsset(
+  src: string,
+  mimeType: AssetMeta['mime_type'] = 'video/mp4'
+): AssetMeta {
+  return {
+    id: 'video-1',
+    name: 'clip.mp4',
+    asset_hash: null,
+    mime_type: mimeType,
+    tags: [],
+    kind: 'video',
+    src
+  }
+}
+
+describe('MediaVideoTop', () => {
+  it('renders playable video with darkened paused overlay and play icon', () => {
+    const wrapper = mount(MediaVideoTop, {
+      props: {
+        asset: createVideoAsset('https://example.com/thumb.jpg')
+      }
+    })
+
+    const video = wrapper.find('video')
+    const videoElement = video.element as HTMLVideoElement
+    expect(video.exists()).toBe(true)
+    expect(videoElement.controls).toBe(false)
+    expect(wrapper.find('source').attributes('src')).toBe(
+      'https://example.com/thumb.jpg'
+    )
+    expect(wrapper.find('source').attributes('type')).toBe('video/mp4')
+    expect(wrapper.find('.bg-black\\/15').exists()).toBe(true)
+    expect(wrapper.find('.icon-\\[lucide--play\\]').exists()).toBe(true)
+  })
+
+  it('does not render source element when src is empty', () => {
+    const wrapper = mount(MediaVideoTop, {
+      props: {
+        asset: createVideoAsset('')
+      }
+    })
+
+    expect(wrapper.find('video').exists()).toBe(true)
+    expect(wrapper.find('source').exists()).toBe(false)
+  })
+  it('emits playback events and hides paused overlay while playing', async () => {
+    const wrapper = mount(MediaVideoTop, {
+      props: {
+        asset: createVideoAsset('https://example.com/thumb.jpg')
+      }
+    })
+
+    const video = wrapper.find('video')
+    const videoElement = video.element as HTMLVideoElement
+    expect(video.exists()).toBe(true)
+
+    await video.trigger('play')
+    expect(wrapper.emitted('videoPlayingStateChanged')?.at(-1)).toEqual([true])
+    expect(wrapper.find('.bg-black\\/15').exists()).toBe(false)
+
+    await wrapper.trigger('mouseenter')
+    expect(videoElement.controls).toBe(true)
+
+    await wrapper.trigger('mouseleave')
+    expect(videoElement.controls).toBe(false)
+
+    await video.trigger('pause')
+    expect(wrapper.emitted('videoPlayingStateChanged')?.at(-1)).toEqual([false])
+    expect(wrapper.find('.bg-black\\/15').exists()).toBe(true)
+    expect(videoElement.controls).toBe(false)
+  })
+
+  it('starts playback from click when controls are hidden', async () => {
+    const wrapper = mount(MediaVideoTop, {
+      props: {
+        asset: createVideoAsset('https://example.com/thumb.jpg')
+      }
+    })
+
+    const video = wrapper.find('video')
+    const videoElement = video.element as HTMLVideoElement
+    const playSpy = vi
+      .spyOn(videoElement, 'play')
+      .mockImplementation(() => Promise.resolve())
+
+    Object.defineProperty(videoElement, 'paused', {
+      value: true,
+      configurable: true
+    })
+
+    await video.trigger('click')
+
+    expect(playSpy).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/src/platform/assets/components/MediaVideoTop.vue b/src/platform/assets/components/MediaVideoTop.vue
index 62db746aba..6a0dacce06 100644
--- a/src/platform/assets/components/MediaVideoTop.vue
+++ b/src/platform/assets/components/MediaVideoTop.vue
@@ -1,25 +1,28 @@
 <template>
   <div
-    class="relative size-full overflow-hidden rounded bg-black"
+    class="relative size-full overflow-hidden rounded-sm bg-black"
     @mouseenter="isHovered = true"
     @mouseleave="isHovered = false"
   >
     <video
+      ref="videoElement"
       :controls="shouldShowControls"
       preload="metadata"
-      autoplay
       muted
       loop
       playsinline
-      :poster="asset.preview_url"
       class="relative size-full object-contain transition-transform duration-300 group-hover:scale-105 group-data-[selected=true]:scale-105"
-      @click.stop
+      @click.stop="onVideoClick"
       @play="onVideoPlay"
       @pause="onVideoPause"
-      @ended="onVideoEnded"
     >
-      <source :src="asset.src || ''" />
+      <source
+        v-if="asset.src"
+        :src="asset.src"
+        :type="asset.mime_type ?? undefined"
+      />
     </video>
+    <VideoPlayOverlay :visible="!isPlaying" size="md" />
   </div>
 </template>
 
@@ -28,6 +31,8 @@ import { computed, onMounted, ref, watch } from 'vue'
 
 import type { AssetMeta } from '../schemas/mediaAssetSchema'
 
+import VideoPlayOverlay from './VideoPlayOverlay.vue'
+
 const { asset } = defineProps<{
   asset: AssetMeta
 }>()
@@ -37,11 +42,12 @@ const emit = defineEmits<{
   videoControlsChanged: [showControls: boolean]
 }>()
 
+const videoElement = ref<HTMLVideoElement | null>(null)
 const isHovered = ref(false)
 const isPlaying = ref(false)
 
-// Always show controls when not playing, hide/show based on hover when playing
-const shouldShowControls = computed(() => !isPlaying.value || isHovered.value)
+// Show native controls only while actively playing and hovered.
+const shouldShowControls = computed(() => isPlaying.value && isHovered.value)
 
 watch(shouldShowControls, (controlsVisible) => {
   emit('videoControlsChanged', controlsVisible)
@@ -61,8 +67,17 @@ const onVideoPause = () => {
   emit('videoPlayingStateChanged', false)
 }
 
-const onVideoEnded = () => {
-  isPlaying.value = false
-  emit('videoPlayingStateChanged', false)
+const onVideoClick = async () => {
+  if (shouldShowControls.value) return
+
+  const video = videoElement.value
+  if (!video) return
+
+  if (video.paused || video.ended) {
+    await video.play().catch(() => {})
+    return
+  }
+
+  video.pause()
 }
 </script>
diff --git a/src/platform/assets/components/ModelImportProgressDialog.vue b/src/platform/assets/components/ModelImportProgressDialog.vue
new file mode 100644
index 0000000000..8c02cb8eb4
--- /dev/null
+++ b/src/platform/assets/components/ModelImportProgressDialog.vue
@@ -0,0 +1,256 @@
+<script setup lang="ts">
+import { whenever } from '@vueuse/core'
+import Popover from 'primevue/popover'
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Loader from '@/components/loader/Loader.vue'
+import HoneyToast from '@/components/honeyToast/HoneyToast.vue'
+import ProgressToastItem from '@/components/toast/ProgressToastItem.vue'
+import Button from '@/components/ui/button/Button.vue'
+import { useAssetDownloadStore } from '@/stores/assetDownloadStore'
+import { cn } from '@/utils/tailwindUtil'
+
+const { t } = useI18n()
+const assetDownloadStore = useAssetDownloadStore()
+
+const visible = computed(() => assetDownloadStore.hasDownloads)
+
+const isExpanded = ref(false)
+const activeFilter = ref<'all' | 'completed' | 'failed'>('all')
+const filterPopoverRef = ref<InstanceType<typeof Popover> | null>(null)
+
+whenever(
+  () => !isExpanded.value,
+  () => filterPopoverRef.value?.hide()
+)
+
+const filterOptions = [
+  { value: 'all', label: 'all' },
+  { value: 'completed', label: 'completed' },
+  { value: 'failed', label: 'failed' }
+] as const
+
+function onFilterClick(event: Event) {
+  filterPopoverRef.value?.toggle(event)
+}
+
+function setFilter(filter: typeof activeFilter.value) {
+  activeFilter.value = filter
+  filterPopoverRef.value?.hide()
+}
+
+const downloadJobs = computed(() => assetDownloadStore.downloadList)
+const completedJobs = computed(() =>
+  assetDownloadStore.finishedDownloads.filter((d) => d.status === 'completed')
+)
+const failedJobs = computed(() =>
+  assetDownloadStore.finishedDownloads.filter((d) => d.status === 'failed')
+)
+
+const isInProgress = computed(() => assetDownloadStore.hasActiveDownloads)
+const currentJobName = computed(() => {
+  const activeJob = downloadJobs.value.find((job) => job.status === 'running')
+  return activeJob?.assetName || t('progressToast.downloadingModel')
+})
+
+const completedCount = computed(
+  () => completedJobs.value.length + failedJobs.value.length
+)
+const totalCount = computed(() => downloadJobs.value.length)
+
+const filteredJobs = computed(() => {
+  switch (activeFilter.value) {
+    case 'completed':
+      return completedJobs.value
+    case 'failed':
+      return failedJobs.value
+    default:
+      return downloadJobs.value
+  }
+})
+
+const activeFilterLabel = computed(() => {
+  const option = filterOptions.find((f) => f.value === activeFilter.value)
+  return option
+    ? t(`progressToast.filter.${option.label}`)
+    : t('progressToast.filter.all')
+})
+
+function closeDialog() {
+  assetDownloadStore.clearFinishedDownloads()
+  isExpanded.value = false
+}
+</script>
+
+<template>
+  <HoneyToast v-model:expanded="isExpanded" :visible>
+    <template #default>
+      <div
+        class="flex h-12 items-center justify-between border-b border-border-default px-4"
+      >
+        <h3 class="text-sm font-bold text-base-foreground">
+          {{ t('progressToast.importingModels') }}
+        </h3>
+        <div class="flex items-center gap-2">
+          <Button
+            variant="secondary"
+            size="md"
+            class="gap-1.5 px-2"
+            @click="onFilterClick"
+          >
+            <i class="icon-[lucide--list-filter] size-4" />
+            <span>{{ activeFilterLabel }}</span>
+            <i class="icon-[lucide--chevron-down] size-3" />
+          </Button>
+          <Popover
+            ref="filterPopoverRef"
+            :dismissable="true"
+            :close-on-escape="true"
+            unstyled
+            :base-z-index="9999"
+            :pt="{
+              root: { class: 'absolute z-50' },
+              content: {
+                class:
+                  'bg-transparent border-none p-0 pt-2 rounded-lg shadow-lg'
+              }
+            }"
+          >
+            <div
+              class="flex min-w-30 flex-col items-stretch rounded-lg border border-interface-stroke bg-interface-panel-surface px-2 py-3"
+            >
+              <Button
+                v-for="option in filterOptions"
+                :key="option.value"
+                variant="textonly"
+                size="sm"
+                :class="
+                  cn(
+                    'w-full justify-start bg-transparent',
+                    activeFilter === option.value &&
+                      'bg-secondary-background-selected'
+                  )
+                "
+                @click="setFilter(option.value)"
+              >
+                {{ t(`progressToast.filter.${option.label}`) }}
+              </Button>
+            </div>
+          </Popover>
+        </div>
+      </div>
+
+      <div class="relative max-h-75 overflow-y-auto p-4">
+        <div
+          v-if="filteredJobs.length > 3"
+          class="absolute top-4 right-1 h-12 w-1 rounded-full bg-muted-foreground"
+        />
+
+        <div class="flex flex-col gap-2">
+          <ProgressToastItem
+            v-for="job in filteredJobs"
+            :key="job.taskId"
+            :job="job"
+          />
+        </div>
+
+        <div
+          v-if="filteredJobs.length === 0"
+          class="flex flex-col items-center justify-center py-6 text-center"
+        >
+          <span class="text-sm text-muted-foreground">
+            {{
+              t('progressToast.noImportsInQueue', {
+                filter: activeFilterLabel
+              })
+            }}
+          </span>
+        </div>
+      </div>
+    </template>
+
+    <template #footer="{ toggle }">
+      <div
+        class="flex h-12 items-center justify-between gap-2 border-t border-border-default px-4"
+      >
+        <div class="flex min-w-0 flex-1 items-center gap-2 text-sm">
+          <template v-if="isInProgress">
+            <Loader size="sm" class="shrink-0 text-muted-foreground" />
+            <span
+              class="min-w-0 flex-1 truncate font-bold text-base-foreground"
+            >
+              {{ currentJobName }}
+            </span>
+          </template>
+          <template v-else-if="failedJobs.length > 0">
+            <i
+              class="icon-[lucide--circle-alert] size-4 shrink-0 text-destructive-background"
+            />
+            <span class="min-w-0 truncate font-bold text-base-foreground">
+              {{
+                t('progressToast.downloadsFailed', {
+                  count: failedJobs.length
+                })
+              }}
+            </span>
+          </template>
+          <template v-else>
+            <i
+              class="icon-[lucide--check-circle] size-4 shrink-0 text-jade-600"
+            />
+            <span class="min-w-0 truncate font-bold text-base-foreground">
+              {{ t('progressToast.allDownloadsCompleted') }}
+            </span>
+          </template>
+        </div>
+
+        <div class="flex shrink-0 items-center gap-2">
+          <span
+            v-if="isInProgress"
+            class="text-sm whitespace-nowrap text-muted-foreground"
+          >
+            {{
+              t('progressToast.progressCount', {
+                completed: completedCount,
+                total: totalCount
+              })
+            }}
+          </span>
+
+          <div class="flex items-center">
+            <Button
+              variant="muted-textonly"
+              size="icon"
+              :aria-label="
+                isExpanded ? t('contextMenu.Collapse') : t('contextMenu.Expand')
+              "
+              @click.stop="toggle"
+            >
+              <i
+                :class="
+                  cn(
+                    'size-4',
+                    isExpanded
+                      ? 'icon-[lucide--chevron-down]'
+                      : 'icon-[lucide--chevron-up]'
+                  )
+                "
+              />
+            </Button>
+
+            <Button
+              v-if="!isInProgress"
+              variant="muted-textonly"
+              size="icon"
+              :aria-label="t('g.close')"
+              @click.stop="closeDialog"
+            >
+              <i class="icon-[lucide--x] size-4" />
+            </Button>
+          </div>
+        </div>
+      </div>
+    </template>
+  </HoneyToast>
+</template>
diff --git a/src/platform/assets/components/UploadModelConfirmation.vue b/src/platform/assets/components/UploadModelConfirmation.vue
index ceef749308..722d566dce 100644
--- a/src/platform/assets/components/UploadModelConfirmation.vue
+++ b/src/platform/assets/components/UploadModelConfirmation.vue
@@ -5,15 +5,15 @@
         {{ $t('assetBrowser.modelAssociatedWithLink') }}
       </p>
       <div
-        class="flex items-center gap-3 bg-secondary-background p-3 rounded-lg"
+        class="flex items-center gap-3 rounded-lg bg-secondary-background px-4 py-2"
       >
         <img
           v-if="previewImage"
           :src="previewImage"
           :alt="metadata?.filename || metadata?.name || 'Model preview'"
-          class="w-14 h-14 rounded object-cover flex-shrink-0"
+          class="size-14 shrink-0 rounded-sm object-cover"
         />
-        <p class="m-0 text-base-foreground">
+        <p class="m-0 min-w-0 flex-1 truncate text-base-foreground">
           {{ metadata?.filename || metadata?.name }}
         </p>
       </div>
@@ -21,9 +21,15 @@
 
     <!-- Model Type Selection -->
     <div class="flex flex-col gap-2">
-      <label class="">
-        {{ $t('assetBrowser.modelTypeSelectorLabel') }}
-      </label>
+      <div class="flex items-center gap-2">
+        <label>
+          {{ $t('assetBrowser.modelTypeSelectorLabel') }}
+        </label>
+        <i class="icon-[lucide--circle-question-mark] text-muted-foreground" />
+        <span class="text-muted-foreground">
+          {{ $t('assetBrowser.notSureLeaveAsIs') }}
+        </span>
+      </div>
       <SingleSelect
         v-model="modelValue"
         :label="
@@ -35,10 +41,6 @@
         :disabled="isLoading"
         data-attr="upload-model-step2-type-selector"
       />
-      <div class="flex items-center gap-2">
-        <i class="icon-[lucide--circle-question-mark]" />
-        <span>{{ $t('assetBrowser.notSureLeaveAsIs') }}</span>
-      </div>
     </div>
   </div>
 </template>
diff --git a/src/platform/assets/components/UploadModelDialog.vue b/src/platform/assets/components/UploadModelDialog.vue
index d6be9e97e9..efbff2ca37 100644
--- a/src/platform/assets/components/UploadModelDialog.vue
+++ b/src/platform/assets/components/UploadModelDialog.vue
@@ -1,40 +1,38 @@
 <template>
   <div
-    class="upload-model-dialog flex flex-col justify-between gap-6 p-4 pt-6 border-t border-border-default"
+    class="upload-model-dialog flex flex-col gap-6 border-t border-border-default p-4 pt-6"
   >
-    <!-- Step 1: Enter URL -->
-    <UploadModelUrlInput
-      v-if="currentStep === 1 && flags.huggingfaceModelImportEnabled"
-      v-model="wizardData.url"
-      :error="uploadError"
-      class="flex-1"
-    />
-    <UploadModelUrlInputCivitai
-      v-else-if="currentStep === 1"
-      v-model="wizardData.url"
-      :error="uploadError"
-    />
+    <!-- Scrollable content area -->
+    <div class="min-h-0 flex-auto basis-0 overflow-y-auto">
+      <!-- Step 1: Enter URL -->
+      <UploadModelUrlInput
+        v-if="currentStep === 1"
+        v-model="wizardData.url"
+        :error="uploadError"
+      />
 
-    <!-- Step 2: Confirm Metadata -->
-    <UploadModelConfirmation
-      v-else-if="currentStep === 2"
-      v-model="selectedModelType"
-      :metadata="wizardData.metadata"
-      :preview-image="wizardData.previewImage"
-    />
+      <!-- Step 2: Confirm Metadata -->
+      <UploadModelConfirmation
+        v-else-if="currentStep === 2"
+        v-model="selectedModelType"
+        :metadata="wizardData.metadata"
+        :preview-image="wizardData.previewImage"
+      />
 
-    <!-- Step 3: Upload Progress -->
-    <UploadModelProgress
-      v-else-if="currentStep === 3"
-      :status="uploadStatus"
-      :error="uploadError"
-      :metadata="wizardData.metadata"
-      :model-type="selectedModelType"
-      :preview-image="wizardData.previewImage"
-    />
+      <!-- Step 3: Upload Progress -->
+      <UploadModelProgress
+        v-else-if="currentStep === 3 && uploadStatus != null"
+        :result="uploadStatus"
+        :error="uploadError"
+        :metadata="wizardData.metadata"
+        :model-type="selectedModelType"
+        :preview-image="wizardData.previewImage"
+      />
+    </div>
 
-    <!-- Navigation Footer -->
+    <!-- Navigation Footer - always visible -->
     <UploadModelFooter
+      class="shrink-0"
       :current-step="currentStep"
       :is-fetching-metadata="isFetchingMetadata"
       :is-uploading="isUploading"
@@ -45,6 +43,7 @@
       @fetch-metadata="handleFetchMetadata"
       @upload="handleUploadModel"
       @close="handleClose"
+      @import-another="resetWizard"
     />
   </div>
 </template>
@@ -52,17 +51,14 @@
 <script setup lang="ts">
 import { onMounted } from 'vue'
 
-import { useFeatureFlags } from '@/composables/useFeatureFlags'
 import UploadModelConfirmation from '@/platform/assets/components/UploadModelConfirmation.vue'
 import UploadModelFooter from '@/platform/assets/components/UploadModelFooter.vue'
 import UploadModelProgress from '@/platform/assets/components/UploadModelProgress.vue'
 import UploadModelUrlInput from '@/platform/assets/components/UploadModelUrlInput.vue'
-import UploadModelUrlInputCivitai from '@/platform/assets/components/UploadModelUrlInputCivitai.vue'
 import { useModelTypes } from '@/platform/assets/composables/useModelTypes'
 import { useUploadModelWizard } from '@/platform/assets/composables/useUploadModelWizard'
 import { useDialogStore } from '@/stores/dialogStore'
 
-const { flags } = useFeatureFlags()
 const dialogStore = useDialogStore()
 const { modelTypes, fetchModelTypes } = useModelTypes()
 
@@ -82,7 +78,8 @@ const {
   canUploadModel,
   fetchMetadata,
   uploadModel,
-  goToPreviousStep
+  goToPreviousStep,
+  resetWizard
 } = useUploadModelWizard(modelTypes)
 
 async function handleFetchMetadata() {
@@ -109,7 +106,8 @@ onMounted(() => {
 .upload-model-dialog {
   width: 90vw;
   max-width: 800px;
-  min-height: 400px;
+  min-height: min(400px, 80vh);
+  max-height: 90vh;
 }
 
 @media (min-width: 640px) {
diff --git a/src/platform/assets/components/UploadModelDialogHeader.vue b/src/platform/assets/components/UploadModelDialogHeader.vue
index fb52bf5019..2d4e3aa311 100644
--- a/src/platform/assets/components/UploadModelDialogHeader.vue
+++ b/src/platform/assets/components/UploadModelDialogHeader.vue
@@ -1,29 +1,10 @@
 <template>
   <div class="flex items-center gap-2 p-4 font-bold">
-    <img
-      v-if="!flags.huggingfaceModelImportEnabled"
-      src="/assets/images/civitai.svg"
-      class="size-4"
-    />
-    <span>{{ $t(titleKey) }}</span>
+    <span>{{ $t('assetBrowser.uploadModelGeneric') }}</span>
     <span
-      class="rounded-full bg-white px-1.5 py-0 text-xxs font-inter font-semibold uppercase text-black"
+      class="rounded-full bg-white px-1.5 py-0 font-inter text-xxs font-semibold text-black uppercase"
     >
       {{ $t('g.beta') }}
     </span>
   </div>
 </template>
-
-<script setup lang="ts">
-import { computed } from 'vue'
-
-import { useFeatureFlags } from '@/composables/useFeatureFlags'
-
-const { flags } = useFeatureFlags()
-
-const titleKey = computed(() => {
-  return flags.huggingfaceModelImportEnabled
-    ? 'assetBrowser.uploadModelGeneric'
-    : 'assetBrowser.uploadModelFromCivitai'
-})
-</script>
diff --git a/src/platform/assets/components/UploadModelFooter.vue b/src/platform/assets/components/UploadModelFooter.vue
index 607484d7cc..a7d10e76f6 100644
--- a/src/platform/assets/components/UploadModelFooter.vue
+++ b/src/platform/assets/components/UploadModelFooter.vue
@@ -1,9 +1,6 @@
 <template>
-  <div class="flex justify-end gap-2 w-full">
-    <div
-      v-if="currentStep === 1 && flags.huggingfaceModelImportEnabled"
-      class="mr-auto flex items-center gap-2"
-    >
+  <div class="flex w-full justify-end gap-2">
+    <div v-if="currentStep === 1" class="mr-auto flex items-center gap-2">
       <i class="icon-[lucide--circle-question-mark] text-muted-foreground" />
       <Button
         variant="muted-textonly"
@@ -22,17 +19,6 @@
         {{ $t('assetBrowser.providerHuggingFace') }}
       </Button>
     </div>
-    <Button
-      v-else-if="currentStep === 1"
-      variant="muted-textonly"
-      size="lg"
-      class="mr-auto underline"
-      data-attr="upload-model-step1-help-link"
-      @click="showCivitaiHelp = true"
-    >
-      <i class="icon-[lucide--circle-question-mark]" />
-      <span>{{ $t('assetBrowser.uploadModelHowDoIFindThis') }}</span>
-    </Button>
     <Button
       v-if="currentStep === 1"
       variant="muted-textonly"
@@ -63,10 +49,7 @@
       :disabled="!canFetchMetadata || isFetchingMetadata"
       @click="emit('fetchMetadata')"
     >
-      <i
-        v-if="isFetchingMetadata"
-        class="icon-[lucide--loader-circle] animate-spin"
-      />
+      <Loader v-if="isFetchingMetadata" />
       <span>{{ $t('g.continue') }}</span>
     </Button>
     <Button
@@ -77,17 +60,36 @@
       :disabled="!canUploadModel || isUploading"
       @click="emit('upload')"
     >
-      <i v-if="isUploading" class="icon-[lucide--loader-circle] animate-spin" />
+      <Loader v-if="isUploading" />
       <span>{{ $t('assetBrowser.upload') }}</span>
     </Button>
-    <Button
-      v-else-if="currentStep === 3 && uploadStatus === 'success'"
-      variant="secondary"
-      data-attr="upload-model-step3-finish-button"
-      @click="emit('close')"
+    <template
+      v-else-if="
+        currentStep === 3 &&
+        (uploadStatus === 'success' || uploadStatus === 'processing')
+      "
     >
-      {{ $t('assetBrowser.finish') }}
-    </Button>
+      <Button
+        variant="muted-textonly"
+        size="lg"
+        data-attr="upload-model-step3-import-another-button"
+        @click="emit('importAnother')"
+      >
+        {{ $t('assetBrowser.importAnother') }}
+      </Button>
+      <Button
+        variant="secondary"
+        size="lg"
+        data-attr="upload-model-step3-finish-button"
+        @click="emit('close')"
+      >
+        {{
+          uploadStatus === 'processing'
+            ? $t('g.close')
+            : $t('assetBrowser.finish')
+        }}
+      </Button>
+    </template>
     <VideoHelpDialog
       v-model="showCivitaiHelp"
       video-url="https://media.comfy.org/compressed_768/civitai_howto.webm"
@@ -104,12 +106,10 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 
+import Loader from '@/components/loader/Loader.vue'
 import Button from '@/components/ui/button/Button.vue'
-import { useFeatureFlags } from '@/composables/useFeatureFlags'
 import VideoHelpDialog from '@/platform/assets/components/VideoHelpDialog.vue'
 
-const { flags } = useFeatureFlags()
-
 const showCivitaiHelp = ref(false)
 const showHuggingFaceHelp = ref(false)
 
@@ -119,7 +119,7 @@ defineProps<{
   isUploading: boolean
   canFetchMetadata: boolean
   canUploadModel: boolean
-  uploadStatus: 'idle' | 'uploading' | 'success' | 'error'
+  uploadStatus?: 'processing' | 'success' | 'error'
 }>()
 
 const emit = defineEmits<{
@@ -127,5 +127,6 @@ const emit = defineEmits<{
   (e: 'fetchMetadata'): void
   (e: 'upload'): void
   (e: 'close'): void
+  (e: 'importAnother'): void
 }>()
 </script>
diff --git a/src/platform/assets/components/UploadModelProgress.vue b/src/platform/assets/components/UploadModelProgress.vue
index 839b5d3b41..09240b6b1a 100644
--- a/src/platform/assets/components/UploadModelProgress.vue
+++ b/src/platform/assets/components/UploadModelProgress.vue
@@ -1,22 +1,38 @@
 <template>
   <div class="flex flex-1 flex-col gap-6 text-sm text-muted-foreground">
-    <!-- Uploading State -->
-    <div
-      v-if="status === 'uploading'"
-      class="flex flex-1 flex-col items-center justify-center gap-2"
-    >
-      <i
-        class="icon-[lucide--loader-circle] animate-spin text-6xl text-muted-foreground"
-      />
-      <div class="text-center">
-        <p class="m-0 font-bold">
-          {{ $t('assetBrowser.uploadingModel') }}
-        </p>
+    <!-- Processing State (202 async download in progress) -->
+    <div v-if="result === 'processing'" class="flex flex-col gap-2">
+      <p class="m-0 font-bold">
+        {{ $t('assetBrowser.processingModel') }}
+      </p>
+      <p class="m-0">
+        {{ $t('assetBrowser.processingModelDescription') }}
+      </p>
+
+      <div
+        class="flex flex-row items-center gap-3 rounded-lg bg-modal-card-background p-4"
+      >
+        <img
+          v-if="previewImage"
+          :src="previewImage"
+          :alt="metadata?.filename || metadata?.name || 'Model preview'"
+          class="size-14 shrink-0 rounded-sm object-cover"
+        />
+        <div
+          class="flex min-w-0 flex-1 flex-col items-start justify-center gap-1"
+        >
+          <p class="m-0 w-full truncate text-base-foreground">
+            {{ metadata?.filename || metadata?.name }}
+          </p>
+          <p class="m-0 text-sm text-muted">
+            {{ modelType }}
+          </p>
+        </div>
       </div>
     </div>
 
     <!-- Success State -->
-    <div v-else-if="status === 'success'" class="flex flex-col gap-2">
+    <div v-else-if="result === 'success'" class="flex flex-col gap-2">
       <p class="m-0 font-bold">
         {{ $t('assetBrowser.modelUploaded') }}
       </p>
@@ -25,20 +41,21 @@
       </p>
 
       <div
-        class="flex flex-row items-center gap-3 p-4 bg-modal-card-background rounded-lg"
+        class="flex flex-row items-center gap-3 rounded-lg bg-modal-card-background p-4"
       >
         <img
           v-if="previewImage"
           :src="previewImage"
           :alt="metadata?.filename || metadata?.name || 'Model preview'"
-          class="w-14 h-14 rounded object-cover flex-shrink-0"
+          class="size-14 shrink-0 rounded-sm object-cover"
         />
-        <div class="flex flex-col justify-center items-start gap-1 flex-1">
-          <p class="text-base-foreground m-0">
+        <div
+          class="flex min-w-0 flex-1 flex-col items-start justify-center gap-1"
+        >
+          <p class="m-0 w-full truncate text-base-foreground">
             {{ metadata?.filename || metadata?.name }}
           </p>
-          <p class="text-sm text-muted m-0">
-            <!-- Going to want to add another translation here to get a nice display name. -->
+          <p class="m-0 text-sm text-muted">
             {{ modelType }}
           </p>
         </div>
@@ -47,7 +64,7 @@
 
     <!-- Error State -->
     <div
-      v-else-if="status === 'error'"
+      v-else-if="result === 'error'"
       class="flex flex-1 flex-col items-center justify-center gap-6"
     >
       <i class="icon-[lucide--x-circle] text-6xl text-error" />
@@ -55,7 +72,7 @@
         <p class="m-0 text-sm font-bold">
           {{ $t('assetBrowser.uploadFailed') }}
         </p>
-        <p v-if="error" class="text-sm text-muted mb-0">
+        <p v-if="error" class="mb-0 text-sm text-muted">
           {{ error }}
         </p>
       </div>
@@ -67,7 +84,7 @@
 import type { AssetMetadata } from '@/platform/assets/schemas/assetSchema'
 
 defineProps<{
-  status: 'idle' | 'uploading' | 'success' | 'error'
+  result: 'processing' | 'success' | 'error'
   error?: string
   metadata?: AssetMetadata
   modelType?: string
diff --git a/src/platform/assets/components/UploadModelUpgradeModal.vue b/src/platform/assets/components/UploadModelUpgradeModal.vue
index 48010a3bb0..2ba3e6d19b 100644
--- a/src/platform/assets/components/UploadModelUpgradeModal.vue
+++ b/src/platform/assets/components/UploadModelUpgradeModal.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="flex flex-col justify-between gap-10 p-4 border-t border-border-default w-auto max-w-[min(500px,90vw)]"
+    class="flex w-auto max-w-[min(500px,90vw)] flex-col justify-between gap-10 border-t border-border-default p-4"
   >
     <UploadModelUpgradeModalBody />
 
@@ -12,13 +12,13 @@
 </template>
 
 <script setup lang="ts">
+import { useBillingContext } from '@/composables/billing/useBillingContext'
 import UploadModelUpgradeModalBody from '@/platform/assets/components/UploadModelUpgradeModalBody.vue'
 import UploadModelUpgradeModalFooter from '@/platform/assets/components/UploadModelUpgradeModalFooter.vue'
-import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
 import { useDialogStore } from '@/stores/dialogStore'
 
 const dialogStore = useDialogStore()
-const { showSubscriptionDialog } = useSubscription()
+const { showSubscriptionDialog } = useBillingContext()
 
 function handleClose() {
   dialogStore.closeDialog({ key: 'upload-model-upgrade' })
diff --git a/src/platform/assets/components/UploadModelUpgradeModalFooter.vue b/src/platform/assets/components/UploadModelUpgradeModalFooter.vue
index b030a7c3a2..777aa54410 100644
--- a/src/platform/assets/components/UploadModelUpgradeModalFooter.vue
+++ b/src/platform/assets/components/UploadModelUpgradeModalFooter.vue
@@ -1,10 +1,10 @@
 <template>
-  <div class="flex flex-wrap justify-end gap-2 w-full">
+  <div class="flex w-full flex-wrap justify-end gap-2">
     <a
       href="https://blog.comfy.org/p/comfy-cloud-new-features-and-pricing"
       target="_blank"
       rel="noopener noreferrer"
-      class="text-muted-foreground mr-auto underline flex items-center gap-2"
+      class="mr-auto flex items-center gap-2 text-muted-foreground underline"
     >
       <i class="icon-[lucide--external-link]" />
       <span>{{ $t('g.learnMore') }}</span>
diff --git a/src/platform/assets/components/UploadModelUrlInput.vue b/src/platform/assets/components/UploadModelUrlInput.vue
index 635d28c02c..baf5dd0c6f 100644
--- a/src/platform/assets/components/UploadModelUrlInput.vue
+++ b/src/platform/assets/components/UploadModelUrlInput.vue
@@ -1,26 +1,26 @@
 <template>
-  <div class="flex flex-col justify-between h-full gap-6 text-sm">
+  <div class="flex h-full flex-col justify-between gap-6 text-sm">
     <div class="flex flex-col gap-6">
       <div class="flex flex-col gap-2">
-        <p class="m-0 text-foreground">
+        <p class="text-foreground m-0">
           {{ $t('assetBrowser.uploadModelDescription1Generic') }}
         </p>
         <div class="m-0">
           <p class="m-0 text-muted-foreground">
             {{ $t('assetBrowser.uploadModelDescription2Generic') }}
           </p>
-          <span class="inline-flex items-center gap-1 flex-wrap mt-2">
+          <span class="mt-2 inline-flex flex-wrap items-center gap-1">
             <span class="inline-flex items-center gap-1">
               <img
                 :src="civitaiIcon"
                 :alt="$t('assetBrowser.providerCivitai')"
-                class="w-4 h-4"
+                class="size-4"
               />
               <a
                 :href="civitaiUrl"
                 target="_blank"
                 rel="noopener noreferrer"
-                class="text-muted underline"
+                class="text-muted-foreground underline"
               >
                 {{ $t('assetBrowser.providerCivitai') }}</a
               ><span>,</span>
@@ -29,13 +29,13 @@
               <img
                 :src="huggingFaceIcon"
                 :alt="$t('assetBrowser.providerHuggingFace')"
-                class="w-4 h-4"
+                class="size-4"
               />
               <a
                 :href="huggingFaceUrl"
                 target="_blank"
                 rel="noopener noreferrer"
-                class="text-muted underline"
+                class="text-muted-foreground underline"
               >
                 {{ $t('assetBrowser.providerHuggingFace') }}
               </a>
@@ -49,26 +49,33 @@
           v-model="url"
           autofocus
           :placeholder="$t('assetBrowser.genericLinkPlaceholder')"
-          class="w-full bg-secondary-background border-0 p-4"
+          class="w-full border-0 bg-secondary-background p-4"
           data-attr="upload-model-step1-url-input"
         />
-        <p v-if="error" class="text-xs text-error">
+        <p v-if="error" class="text-sm text-error">
           {{ error }}
         </p>
-        <p v-else class="text-foreground">
-          <i18n-t keypath="assetBrowser.maxFileSize" tag="span">
-            <template #size>
-              <span class="font-bold italic">{{
-                $t('assetBrowser.maxFileSizeValue')
-              }}</span>
-            </template>
-          </i18n-t>
-        </p>
       </div>
     </div>
 
-    <div class="text-sm text-muted">
-      {{ $t('assetBrowser.uploadModelHelpFooterText') }}
+    <div class="flex flex-col gap-6 text-sm text-muted-foreground">
+      <div v-if="showSecretsHint">
+        <i18n-t keypath="assetBrowser.apiKeyHint" tag="span">
+          <template #link>
+            <Button
+              variant="textonly"
+              size="unset"
+              class="p-0 text-muted-foreground underline"
+              @click="openSecretsSettings"
+            >
+              {{ $t('assetBrowser.apiKeyHintLink') }}
+            </Button>
+          </template>
+        </i18n-t>
+      </div>
+      <div>
+        {{ $t('assetBrowser.uploadModelHelpFooterText') }}
+      </div>
     </div>
   </div>
 </template>
@@ -77,6 +84,19 @@
 import InputText from 'primevue/inputtext'
 import { computed } from 'vue'
 
+import Button from '@/components/ui/button/Button.vue'
+import { useFeatureFlags } from '@/composables/useFeatureFlags'
+import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
+
+const { flags } = useFeatureFlags()
+const settingsDialog = useSettingsDialog()
+
+const showSecretsHint = computed(() => flags.userSecretsEnabled)
+
+function openSecretsSettings() {
+  settingsDialog.show('secrets')
+}
+
 const props = defineProps<{
   modelValue: string
   error?: string
diff --git a/src/platform/assets/components/UploadModelUrlInputCivitai.vue b/src/platform/assets/components/UploadModelUrlInputCivitai.vue
deleted file mode 100644
index b89ee53296..0000000000
--- a/src/platform/assets/components/UploadModelUrlInputCivitai.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-<template>
-  <div class="flex flex-col gap-6 text-sm text-muted-foreground">
-    <div class="flex flex-col gap-2">
-      <p class="m-0">
-        {{ $t('assetBrowser.uploadModelDescription1') }}
-      </p>
-      <ul class="list-disc space-y-1 pl-5 mt-0">
-        <li>
-          <i18n-t keypath="assetBrowser.uploadModelDescription2" tag="span">
-            <template #link>
-              <a
-                href="https://civitai.com/models"
-                target="_blank"
-                class="text-muted-foreground"
-              >
-                {{ $t('assetBrowser.uploadModelDescription2Link') }}
-              </a>
-            </template>
-          </i18n-t>
-        </li>
-        <li>
-          <i18n-t keypath="assetBrowser.uploadModelDescription3" tag="span">
-            <template #size>
-              <span class="font-bold italic">{{
-                $t('assetBrowser.maxFileSizeValue')
-              }}</span>
-            </template>
-          </i18n-t>
-        </li>
-      </ul>
-    </div>
-
-    <div class="flex flex-col gap-2">
-      <i18n-t keypath="assetBrowser.civitaiLinkLabel" tag="label" class="mb-0">
-        <template #download>
-          <span class="font-bold italic">{{
-            $t('assetBrowser.civitaiLinkLabelDownload')
-          }}</span>
-        </template>
-      </i18n-t>
-      <InputText
-        v-model="url"
-        autofocus
-        :placeholder="$t('assetBrowser.civitaiLinkPlaceholder')"
-        class="w-full bg-secondary-background border-0 p-4"
-        data-attr="upload-model-step1-url-input"
-      />
-      <p v-if="error" class="text-xs text-error">
-        {{ error }}
-      </p>
-      <i18n-t
-        v-else
-        keypath="assetBrowser.civitaiLinkExample"
-        tag="p"
-        class="text-xs"
-      >
-        <template #example>
-          <strong>{{ $t('assetBrowser.civitaiLinkExampleStrong') }}</strong>
-        </template>
-        <template #link>
-          <a
-            href="https://civitai.com/models/10706/luisap-z-image-and-qwen-pixel-art-refiner?modelVersionId=2225295"
-            target="_blank"
-            class="text-muted-foreground"
-          >
-            {{ $t('assetBrowser.civitaiLinkExampleUrl') }}
-          </a>
-        </template>
-      </i18n-t>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import InputText from 'primevue/inputtext'
-
-defineProps<{
-  error?: string
-}>()
-
-const url = defineModel<string>({ required: true })
-</script>
diff --git a/src/platform/assets/components/VideoHelpDialog.vue b/src/platform/assets/components/VideoHelpDialog.vue
index 9fe6a26d02..94811e147a 100644
--- a/src/platform/assets/components/VideoHelpDialog.vue
+++ b/src/platform/assets/components/VideoHelpDialog.vue
@@ -11,7 +11,7 @@
       content: { class: '!p-0' },
       mask: { class: '!bg-black/70' }
     }"
-    :style="{ width: '90vw', maxWidth: '800px' }"
+    :style="{ width: '90vw' }"
   >
     <div class="relative">
       <Button
diff --git a/src/platform/assets/components/VideoPlayOverlay.vue b/src/platform/assets/components/VideoPlayOverlay.vue
new file mode 100644
index 0000000000..54a71158a7
--- /dev/null
+++ b/src/platform/assets/components/VideoPlayOverlay.vue
@@ -0,0 +1,31 @@
+<template>
+  <template v-if="visible">
+    <div :class="cn('pointer-events-none absolute inset-0', overlayClass)" />
+    <div
+      class="pointer-events-none absolute inset-0 flex items-center justify-center"
+    >
+      <i
+        aria-hidden="true"
+        :class="cn('icon-[lucide--play] text-white', iconSizeClass)"
+      />
+    </div>
+  </template>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+const {
+  visible = true,
+  size = 'md',
+  overlayClass = 'bg-black/15'
+} = defineProps<{
+  visible?: boolean
+  size?: 'sm' | 'md'
+  overlayClass?: string
+}>()
+
+const iconSizeClass = computed(() => (size === 'sm' ? 'size-3' : 'size-6'))
+</script>
diff --git a/src/platform/assets/components/modelInfo/ModelInfoField.vue b/src/platform/assets/components/modelInfo/ModelInfoField.vue
new file mode 100644
index 0000000000..251c215cdf
--- /dev/null
+++ b/src/platform/assets/components/modelInfo/ModelInfoField.vue
@@ -0,0 +1,15 @@
+<template>
+  <div class="flex flex-col gap-2 px-4 py-2 text-sm text-base-foreground">
+    <div class="relative flex items-center justify-between">
+      <span class="select-none">{{ label }}</span>
+      <slot name="label-action" />
+    </div>
+    <slot />
+  </div>
+</template>
+
+<script setup lang="ts">
+defineProps<{
+  label: string
+}>()
+</script>
diff --git a/src/platform/assets/components/modelInfo/ModelInfoPanel.test.ts b/src/platform/assets/components/modelInfo/ModelInfoPanel.test.ts
new file mode 100644
index 0000000000..272d66b25e
--- /dev/null
+++ b/src/platform/assets/components/modelInfo/ModelInfoPanel.test.ts
@@ -0,0 +1,171 @@
+import { mount } from '@vue/test-utils'
+import { createTestingPinia } from '@pinia/testing'
+import { describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+import type { AssetDisplayItem } from '@/platform/assets/composables/useAssetBrowser'
+
+import ModelInfoPanel from './ModelInfoPanel.vue'
+
+vi.mock('@/composables/useCopyToClipboard', () => ({
+  useCopyToClipboard: () => ({
+    copyToClipboard: vi.fn()
+  })
+}))
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: { en: {} },
+  missingWarn: false,
+  fallbackWarn: false
+})
+
+describe('ModelInfoPanel', () => {
+  const createMockAsset = (
+    overrides: Partial<AssetDisplayItem> = {}
+  ): AssetDisplayItem => ({
+    id: 'test-id',
+    name: 'test-model.safetensors',
+    asset_hash: 'hash123',
+    size: 1024,
+    mime_type: 'application/octet-stream',
+    tags: ['models', 'checkpoints'],
+    created_at: '2024-01-01T00:00:00Z',
+    updated_at: '2024-01-01T00:00:00Z',
+    last_access_time: '2024-01-01T00:00:00Z',
+    secondaryText: 'A test model description',
+    badges: [],
+    stats: {},
+    ...overrides
+  })
+
+  const mountPanel = (asset: AssetDisplayItem) => {
+    return mount(ModelInfoPanel, {
+      props: { asset },
+      global: {
+        plugins: [createTestingPinia({ stubActions: false }), i18n]
+      }
+    })
+  }
+
+  describe('Basic Info Section', () => {
+    it('renders basic info section', () => {
+      const wrapper = mountPanel(createMockAsset())
+      expect(wrapper.text()).toContain('assetBrowser.modelInfo.basicInfo')
+    })
+
+    it('displays asset filename', () => {
+      const asset = createMockAsset({ name: 'my-model.safetensors' })
+      const wrapper = mountPanel(asset)
+      expect(wrapper.text()).toContain('my-model.safetensors')
+    })
+
+    it('displays name from user_metadata when present', () => {
+      const asset = createMockAsset({
+        user_metadata: { name: 'My Custom Model' }
+      })
+      const wrapper = mountPanel(asset)
+      expect(wrapper.text()).toContain('My Custom Model')
+    })
+
+    it('falls back to asset name when user_metadata.name not present', () => {
+      const asset = createMockAsset({ name: 'fallback-model.safetensors' })
+      const wrapper = mountPanel(asset)
+      expect(wrapper.text()).toContain('fallback-model.safetensors')
+    })
+
+    it('renders source link when source_arn is present', () => {
+      const asset = createMockAsset({
+        user_metadata: { source_arn: 'civitai:model:123:version:456' }
+      })
+      const wrapper = mountPanel(asset)
+      const link = wrapper.find(
+        'a[href="https://civitai.com/models/123?modelVersionId=456"]'
+      )
+      expect(link.exists()).toBe(true)
+      expect(link.attributes('target')).toBe('_blank')
+    })
+
+    it('displays Civitai icon for Civitai source', () => {
+      const asset = createMockAsset({
+        user_metadata: { source_arn: 'civitai:model:123:version:456' }
+      })
+      const wrapper = mountPanel(asset)
+      expect(
+        wrapper.find('img[src="/assets/images/civitai.svg"]').exists()
+      ).toBe(true)
+    })
+
+    it('does not render source field when source_arn is absent', () => {
+      const asset = createMockAsset()
+      const wrapper = mountPanel(asset)
+      const links = wrapper.findAll('a')
+      expect(links).toHaveLength(0)
+    })
+  })
+
+  describe('Model Tagging Section', () => {
+    it('renders model tagging section', () => {
+      const wrapper = mountPanel(createMockAsset())
+      expect(wrapper.text()).toContain('assetBrowser.modelInfo.modelTagging')
+    })
+
+    it('renders model type field', () => {
+      const wrapper = mountPanel(createMockAsset())
+      expect(wrapper.text()).toContain('assetBrowser.modelInfo.modelType')
+    })
+
+    it('renders base models field', () => {
+      const asset = createMockAsset({
+        user_metadata: { base_model: ['SDXL'] }
+      })
+      const wrapper = mountPanel(asset)
+      expect(wrapper.text()).toContain(
+        'assetBrowser.modelInfo.compatibleBaseModels'
+      )
+    })
+
+    it('renders additional tags field', () => {
+      const wrapper = mountPanel(createMockAsset())
+      expect(wrapper.text()).toContain('assetBrowser.modelInfo.additionalTags')
+    })
+  })
+
+  describe('Model Description Section', () => {
+    it('renders trigger phrases when present', () => {
+      const asset = createMockAsset({
+        user_metadata: { trained_words: ['trigger1', 'trigger2'] }
+      })
+      const wrapper = mountPanel(asset)
+      expect(wrapper.text()).toContain('trigger1')
+      expect(wrapper.text()).toContain('trigger2')
+    })
+
+    it('renders description section', () => {
+      const wrapper = mountPanel(createMockAsset())
+      expect(wrapper.text()).toContain(
+        'assetBrowser.modelInfo.modelDescription'
+      )
+    })
+
+    it('does not render trigger phrases field when empty', () => {
+      const asset = createMockAsset()
+      const wrapper = mountPanel(asset)
+      expect(wrapper.text()).not.toContain(
+        'assetBrowser.modelInfo.triggerPhrases'
+      )
+    })
+  })
+
+  describe('Accordion Structure', () => {
+    it('renders all three section labels', () => {
+      const wrapper = mountPanel(createMockAsset())
+      expect(wrapper.text()).toContain('assetBrowser.modelInfo.basicInfo')
+      expect(wrapper.text()).toContain('assetBrowser.modelInfo.modelTagging')
+      expect(wrapper.text()).toContain(
+        'assetBrowser.modelInfo.modelDescription'
+      )
+    })
+  })
+})
diff --git a/src/platform/assets/components/modelInfo/ModelInfoPanel.vue b/src/platform/assets/components/modelInfo/ModelInfoPanel.vue
new file mode 100644
index 0000000000..75076cca0e
--- /dev/null
+++ b/src/platform/assets/components/modelInfo/ModelInfoPanel.vue
@@ -0,0 +1,350 @@
+<template>
+  <div
+    data-component-id="ModelInfoPanel"
+    class="flex scrollbar-custom h-full flex-col"
+  >
+    <PropertiesAccordionItem :class="accordionClass">
+      <template #label>
+        <span class="font-inter text-xs uppercase select-none">
+          {{ t('assetBrowser.modelInfo.basicInfo') }}
+        </span>
+      </template>
+      <ModelInfoField :label="t('assetBrowser.modelInfo.displayName')">
+        <div class="group flex justify-between">
+          <EditableText
+            :model-value="displayName"
+            :is-editing="isEditingDisplayName"
+            :class="cn('flex-auto break-all text-muted-foreground')"
+            @dblclick="isEditingDisplayName = !isImmutable"
+            @edit="handleDisplayNameEdit"
+            @cancel="isEditingDisplayName = false"
+          />
+          <Button
+            v-if="!isImmutable && !isEditingDisplayName"
+            size="icon-sm"
+            variant="muted-textonly"
+            class="opacity-0 transition-opacity group-hover:opacity-100"
+            :aria-label="t('assetBrowser.modelInfo.editDisplayName')"
+            @click="isEditingDisplayName = !isImmutable"
+          >
+            <i class="icon-[lucide--square-pen] size-4 self-center" />
+          </Button>
+        </div>
+      </ModelInfoField>
+      <ModelInfoField :label="t('assetBrowser.modelInfo.fileName')">
+        <span class="break-all text-muted-foreground">{{ asset.name }}</span>
+      </ModelInfoField>
+      <ModelInfoField
+        v-if="sourceUrl"
+        :label="t('assetBrowser.modelInfo.source')"
+      >
+        <a
+          :href="sourceUrl"
+          target="_blank"
+          rel="noopener noreferrer"
+          class="hover:text-foreground inline-flex items-center gap-1.5 text-muted-foreground no-underline transition-colors"
+        >
+          <img
+            v-if="sourceName === 'Civitai'"
+            src="/assets/images/civitai.svg"
+            alt=""
+            class="size-4 shrink-0"
+          />
+          <img
+            v-else-if="sourceName === 'Hugging Face'"
+            src="/assets/images/hf-logo.svg"
+            alt=""
+            class="size-4 shrink-0"
+          />
+          {{ t('assetBrowser.modelInfo.viewOnSource', { source: sourceName }) }}
+          <i class="icon-[lucide--external-link] size-4 shrink-0" />
+        </a>
+      </ModelInfoField>
+    </PropertiesAccordionItem>
+
+    <PropertiesAccordionItem :class="accordionClass">
+      <template #label>
+        <span class="font-inter text-xs uppercase select-none">
+          {{ t('assetBrowser.modelInfo.modelTagging') }}
+        </span>
+      </template>
+      <ModelInfoField :label="t('assetBrowser.modelInfo.modelType')">
+        <Select v-if="!isImmutable" v-model="selectedModelType">
+          <SelectTrigger class="w-full">
+            <SelectValue
+              :placeholder="t('assetBrowser.modelInfo.selectModelType')"
+            />
+          </SelectTrigger>
+          <SelectContent>
+            <SelectItem
+              v-for="option in modelTypes"
+              :key="option.value"
+              :value="option.value"
+            >
+              {{ option.name }}
+            </SelectItem>
+          </SelectContent>
+        </Select>
+        <div v-else class="p-2 text-sm text-muted-foreground">
+          {{
+            modelTypes.find((o) => o.value === selectedModelType)?.name ??
+            t('assetBrowser.unknown')
+          }}
+        </div>
+      </ModelInfoField>
+      <ModelInfoField :label="t('assetBrowser.modelInfo.compatibleBaseModels')">
+        <TagsInput
+          v-slot="{ isEmpty }"
+          v-model="baseModels"
+          :disabled="isImmutable"
+        >
+          <TagsInputItem
+            v-for="model in baseModels"
+            :key="model"
+            :value="model"
+          >
+            <TagsInputItemText />
+            <TagsInputItemDelete />
+          </TagsInputItem>
+          <TagsInputInput
+            :is-empty="isEmpty"
+            :placeholder="
+              isImmutable
+                ? t('assetBrowser.modelInfo.baseModelUnknown')
+                : t('assetBrowser.modelInfo.addBaseModel')
+            "
+          />
+        </TagsInput>
+      </ModelInfoField>
+      <ModelInfoField :label="t('assetBrowser.modelInfo.additionalTags')">
+        <TagsInput
+          v-slot="{ isEmpty }"
+          v-model="additionalTags"
+          :disabled="isImmutable"
+        >
+          <TagsInputItem v-for="tag in additionalTags" :key="tag" :value="tag">
+            <TagsInputItemText />
+            <TagsInputItemDelete />
+          </TagsInputItem>
+          <TagsInputInput
+            :is-empty="isEmpty"
+            :placeholder="
+              isImmutable
+                ? t('assetBrowser.modelInfo.noAdditionalTags')
+                : t('assetBrowser.modelInfo.addTag')
+            "
+          />
+        </TagsInput>
+      </ModelInfoField>
+    </PropertiesAccordionItem>
+
+    <PropertiesAccordionItem :class="accordionClass">
+      <template #label>
+        <span class="font-inter text-xs uppercase select-none">
+          {{ t('assetBrowser.modelInfo.modelDescription') }}
+        </span>
+      </template>
+      <ModelInfoField
+        v-if="triggerPhrases.length > 0"
+        :label="t('assetBrowser.modelInfo.triggerPhrases')"
+      >
+        <template #label-action>
+          <Button
+            variant="muted-textonly"
+            size="icon-sm"
+            :title="t('g.copyAll')"
+            :aria-label="t('g.copyAll')"
+            class="p-0"
+            @click="copyToClipboard(triggerPhrases.join(', '))"
+          >
+            <i class="icon-[lucide--copy] size-4 min-h-4 min-w-4 opacity-60" />
+          </Button>
+        </template>
+        <div class="flex flex-wrap gap-1 pt-1">
+          <Button
+            v-for="phrase in triggerPhrases"
+            :key="phrase"
+            variant="muted-textonly"
+            size="unset"
+            :title="t('g.copyToClipboard')"
+            class="text-left text-xs text-pretty whitespace-normal"
+            @click="copyToClipboard(phrase)"
+          >
+            {{ phrase }}
+            <i class="icon-[lucide--copy] size-4 min-h-4 min-w-4 opacity-60" />
+          </Button>
+        </div>
+      </ModelInfoField>
+      <ModelInfoField
+        v-if="description"
+        :label="t('assetBrowser.modelInfo.description')"
+      >
+        <p class="text-sm whitespace-pre-wrap">{{ description }}</p>
+      </ModelInfoField>
+      <ModelInfoField :label="t('assetBrowser.modelInfo.description')">
+        <textarea
+          ref="descriptionTextarea"
+          v-model="userDescription"
+          :disabled="isImmutable"
+          :placeholder="
+            isImmutable
+              ? t('assetBrowser.modelInfo.descriptionNotSet')
+              : t('assetBrowser.modelInfo.descriptionPlaceholder')
+          "
+          rows="3"
+          :class="
+            cn(
+              'w-full resize-y rounded-lg border border-transparent bg-transparent px-3 py-2 text-sm text-component-node-foreground transition-colors outline-none focus:bg-component-node-widget-background',
+              isImmutable && 'cursor-not-allowed'
+            )
+          "
+          @keydown.escape.stop="descriptionTextarea?.blur()"
+        />
+      </ModelInfoField>
+    </PropertiesAccordionItem>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useDebounceFn } from '@vueuse/core'
+import { computed, ref, useTemplateRef, watch } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import EditableText from '@/components/common/EditableText.vue'
+import { useCopyToClipboard } from '@/composables/useCopyToClipboard'
+import PropertiesAccordionItem from '@/components/rightSidePanel/layout/PropertiesAccordionItem.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 TagsInput from '@/components/ui/tags-input/TagsInput.vue'
+import TagsInputInput from '@/components/ui/tags-input/TagsInputInput.vue'
+import TagsInputItem from '@/components/ui/tags-input/TagsInputItem.vue'
+import TagsInputItemDelete from '@/components/ui/tags-input/TagsInputItemDelete.vue'
+import TagsInputItemText from '@/components/ui/tags-input/TagsInputItemText.vue'
+import type { AssetDisplayItem } from '@/platform/assets/composables/useAssetBrowser'
+import { useModelTypes } from '@/platform/assets/composables/useModelTypes'
+import type { AssetUserMetadata } from '@/platform/assets/schemas/assetSchema'
+import {
+  getAssetAdditionalTags,
+  getAssetBaseModels,
+  getAssetDescription,
+  getAssetDisplayName,
+  getAssetModelType,
+  getAssetSourceUrl,
+  getAssetTriggerPhrases,
+  getAssetUserDescription,
+  getSourceName
+} from '@/platform/assets/utils/assetMetadataUtils'
+import { useAssetsStore } from '@/stores/assetsStore'
+import { cn } from '@/utils/tailwindUtil'
+
+import ModelInfoField from './ModelInfoField.vue'
+
+const { t } = useI18n()
+const { copyToClipboard } = useCopyToClipboard()
+
+const descriptionTextarea = useTemplateRef<HTMLTextAreaElement>(
+  'descriptionTextarea'
+)
+
+const accordionClass = cn(
+  'border-t border-border-default bg-modal-panel-background'
+)
+
+const { asset, cacheKey } = defineProps<{
+  asset: AssetDisplayItem
+  cacheKey?: string
+}>()
+
+const assetsStore = useAssetsStore()
+const { modelTypes } = useModelTypes()
+
+const pendingUpdates = ref<AssetUserMetadata>({})
+const pendingModelType = ref<string | undefined>(undefined)
+const isEditingDisplayName = ref(false)
+
+const isImmutable = computed(() => asset.is_immutable ?? true)
+const displayName = computed(
+  () => pendingUpdates.value.name ?? getAssetDisplayName(asset)
+)
+const sourceUrl = computed(() => getAssetSourceUrl(asset))
+const sourceName = computed(() =>
+  sourceUrl.value ? getSourceName(sourceUrl.value) : ''
+)
+const description = computed(() => getAssetDescription(asset))
+const triggerPhrases = computed(() => getAssetTriggerPhrases(asset))
+
+watch(
+  () => asset.user_metadata,
+  () => {
+    pendingUpdates.value = {}
+  }
+)
+
+watch(
+  () => asset.tags,
+  () => {
+    pendingModelType.value = undefined
+  }
+)
+
+const debouncedFlushMetadata = useDebounceFn(() => {
+  if (isImmutable.value) return
+  assetsStore.updateAssetMetadata(
+    asset,
+    { ...(asset.user_metadata ?? {}), ...pendingUpdates.value },
+    cacheKey
+  )
+}, 500)
+
+function queueMetadataUpdate(updates: AssetUserMetadata) {
+  pendingUpdates.value = { ...pendingUpdates.value, ...updates }
+  debouncedFlushMetadata()
+}
+
+function handleDisplayNameEdit(newName: string) {
+  isEditingDisplayName.value = false
+  if (newName && newName !== displayName.value) {
+    queueMetadataUpdate({ name: newName })
+  }
+}
+
+const debouncedSaveModelType = useDebounceFn((newModelType: string) => {
+  if (isImmutable.value) return
+  const currentModelType = getAssetModelType(asset)
+  if (currentModelType === newModelType) return
+  const newTags = asset.tags
+    .filter((tag) => tag !== currentModelType)
+    .concat(newModelType)
+  assetsStore.updateAssetTags(asset, newTags, cacheKey)
+}, 500)
+
+const baseModels = computed({
+  get: () => pendingUpdates.value.base_model ?? getAssetBaseModels(asset),
+  set: (value: string[]) => queueMetadataUpdate({ base_model: value })
+})
+
+const additionalTags = computed({
+  get: () =>
+    pendingUpdates.value.additional_tags ?? getAssetAdditionalTags(asset),
+  set: (value: string[]) => queueMetadataUpdate({ additional_tags: value })
+})
+
+const userDescription = computed({
+  get: () =>
+    pendingUpdates.value.user_description ?? getAssetUserDescription(asset),
+  set: (value: string) => queueMetadataUpdate({ user_description: value })
+})
+
+const selectedModelType = computed({
+  get: () => pendingModelType.value ?? getAssetModelType(asset) ?? undefined,
+  set: (value: string | undefined) => {
+    if (!value) return
+    pendingModelType.value = value
+    debouncedSaveModelType(value)
+  }
+})
+</script>
diff --git a/src/platform/assets/composables/media/assetMappers.ts b/src/platform/assets/composables/media/assetMappers.ts
index c03b277bd5..096d9696ec 100644
--- a/src/platform/assets/composables/media/assetMappers.ts
+++ b/src/platform/assets/composables/media/assetMappers.ts
@@ -1,6 +1,7 @@
 import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
 import type { OutputAssetMetadata } from '@/platform/assets/schemas/assetMetadataSchema'
 import type { AssetContext } from '@/platform/assets/schemas/mediaAssetSchema'
+import { appendCloudResParam } from '@/platform/distribution/cloudPreviewUtil'
 import { api } from '@/scripts/api'
 import type { ResultItemImpl, TaskItemImpl } from '@/stores/queueStore'
 
@@ -27,24 +28,23 @@ export function mapTaskOutputToAssetItem(
   output: ResultItemImpl
 ): AssetItem {
   const metadata: OutputAssetMetadata = {
-    promptId: taskItem.promptId,
+    jobId: taskItem.jobId,
     nodeId: output.nodeId,
     subfolder: output.subfolder,
     executionTimeInSeconds: taskItem.executionTimeInSeconds,
     format: output.format,
-    workflow: taskItem.workflow,
     create_time: taskItem.createTime
   }
 
   return {
-    id: taskItem.promptId,
+    id: taskItem.jobId,
     name: output.filename,
     size: 0,
     created_at: taskItem.executionStartTimestamp
       ? new Date(taskItem.executionStartTimestamp).toISOString()
       : new Date().toISOString(),
     tags: ['output'],
-    preview_url: output.url,
+    preview_url: output.previewUrl,
     user_metadata: metadata
   }
 }
@@ -61,14 +61,15 @@ export function mapInputFileToAssetItem(
   index: number,
   directory: 'input' | 'output' = 'input'
 ): AssetItem {
+  const params = new URLSearchParams({ filename, type: directory })
+  appendCloudResParam(params, filename)
+
   return {
     id: `${directory}-${index}-${filename}`,
     name: filename,
     size: 0,
     created_at: new Date().toISOString(),
     tags: [directory],
-    preview_url: api.apiURL(
-      `/view?filename=${encodeURIComponent(filename)}&type=${directory}`
-    )
+    preview_url: api.apiURL(`/view?${params}`)
   }
 }
diff --git a/tests-ui/platform/assets/composables/useAssetBrowser.test.ts b/src/platform/assets/composables/useAssetBrowser.test.ts
similarity index 53%
rename from tests-ui/platform/assets/composables/useAssetBrowser.test.ts
rename to src/platform/assets/composables/useAssetBrowser.test.ts
index 9c724f32b7..498000cc1f 100644
--- a/tests-ui/platform/assets/composables/useAssetBrowser.test.ts
+++ b/src/platform/assets/composables/useAssetBrowser.test.ts
@@ -1,13 +1,22 @@
+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'
 
+vi.mock('vue-i18n', () => ({
+  useI18n: () => ({
+    t: (key: string) => key
+  })
+}))
+
 vi.mock('@/i18n', () => ({
   t: (key: string) => {
     const translations: Record<string, string> = {
       'assetBrowser.allModels': 'All Models',
+      'assetBrowser.imported': 'Imported',
+      'assetBrowser.byType': 'By type',
       'assetBrowser.assets': 'Assets',
       'assetBrowser.unknown': 'unknown'
     }
@@ -18,6 +27,7 @@ vi.mock('@/i18n', () => ({
 
 describe('useAssetBrowser', () => {
   beforeEach(() => {
+    setActivePinia(createPinia())
     vi.restoreAllMocks()
   })
 
@@ -32,6 +42,7 @@ describe('useAssetBrowser', () => {
     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,
     ...overrides
   })
 
@@ -48,7 +59,7 @@ describe('useAssetBrowser', () => {
         tags: ['models', 'loras']
       })
 
-      const { selectedCategory, categoryFilteredAssets } = useAssetBrowser(
+      const { selectedNavItem, categoryFilteredAssets } = useAssetBrowser(
         ref([checkpointAsset, loraAsset])
       )
 
@@ -56,11 +67,11 @@ describe('useAssetBrowser', () => {
       expect(categoryFilteredAssets.value).toHaveLength(2)
 
       // When category selected, should only show that category
-      selectedCategory.value = 'checkpoints'
+      selectedNavItem.value = 'checkpoints'
       expect(categoryFilteredAssets.value).toHaveLength(1)
       expect(categoryFilteredAssets.value[0].id).toBe('checkpoint-1')
 
-      selectedCategory.value = 'loras'
+      selectedNavItem.value = 'loras'
       expect(categoryFilteredAssets.value).toHaveLength(1)
       expect(categoryFilteredAssets.value[0].id).toBe('lora-1')
     })
@@ -80,14 +91,14 @@ describe('useAssetBrowser', () => {
       expect(result.name).toBe(apiAsset.name)
 
       // Adds display properties
-      expect(result.description).toBe('Test model')
+      expect(result.secondaryText).toBe('test-asset.safetensors')
       expect(result.badges).toContainEqual({
         label: 'checkpoints',
         type: 'type'
       })
     })
 
-    it('creates fallback description from tags when metadata missing', () => {
+    it('creates secondaryText from filename when metadata missing', () => {
       const apiAsset = createApiAsset({
         tags: ['models', 'loras'],
         user_metadata: undefined
@@ -96,7 +107,49 @@ describe('useAssetBrowser', () => {
       const { filteredAssets } = useAssetBrowser(ref([apiAsset]))
       const result = filteredAssets.value[0]
 
-      expect(result.description).toBe('loras model')
+      expect(result.secondaryText).toBe('test-asset.safetensors')
+    })
+
+    it('removes category prefix from badge labels', () => {
+      const apiAsset = createApiAsset({
+        tags: ['models', 'checkpoint/stable-diffusion-v1-5']
+      })
+
+      const { filteredAssets } = useAssetBrowser(ref([apiAsset]))
+      const result = filteredAssets.value[0]
+
+      expect(result.badges).toContainEqual({
+        label: 'stable-diffusion-v1-5',
+        type: 'type'
+      })
+    })
+
+    it('handles tags without slash for badges', () => {
+      const apiAsset = createApiAsset({
+        tags: ['models', 'checkpoints']
+      })
+
+      const { filteredAssets } = useAssetBrowser(ref([apiAsset]))
+      const result = filteredAssets.value[0]
+
+      expect(result.badges).toContainEqual({
+        label: 'checkpoints',
+        type: 'type'
+      })
+    })
+
+    it('handles tags with multiple slashes in badges', () => {
+      const apiAsset = createApiAsset({
+        tags: ['models', 'checkpoint/subfolder/model-name']
+      })
+
+      const { filteredAssets } = useAssetBrowser(ref([apiAsset]))
+      const result = filteredAssets.value[0]
+
+      expect(result.badges).toContainEqual({
+        label: 'subfolder/model-name',
+        type: 'type'
+      })
     })
   })
 
@@ -108,9 +161,9 @@ describe('useAssetBrowser', () => {
         createApiAsset({ id: '3', tags: ['models', 'checkpoints'] })
       ]
 
-      const { selectedCategory, filteredAssets } = useAssetBrowser(ref(assets))
+      const { selectedNavItem, filteredAssets } = useAssetBrowser(ref(assets))
 
-      selectedCategory.value = 'checkpoints'
+      selectedNavItem.value = 'checkpoints'
       await nextTick()
 
       expect(filteredAssets.value).toHaveLength(2)
@@ -127,9 +180,9 @@ describe('useAssetBrowser', () => {
         createApiAsset({ id: '2', tags: ['models', 'loras'] })
       ]
 
-      const { selectedCategory, filteredAssets } = useAssetBrowser(ref(assets))
+      const { selectedNavItem, filteredAssets } = useAssetBrowser(ref(assets))
 
-      selectedCategory.value = 'all'
+      selectedNavItem.value = 'all'
       await nextTick()
 
       expect(filteredAssets.value).toHaveLength(2)
@@ -312,12 +365,12 @@ describe('useAssetBrowser', () => {
         })
       ]
 
-      const { searchQuery, selectedCategory, filteredAssets } = useAssetBrowser(
+      const { searchQuery, selectedNavItem, filteredAssets } = useAssetBrowser(
         ref(assets)
       )
 
       searchQuery.value = 'realistic'
-      selectedCategory.value = 'checkpoints'
+      selectedNavItem.value = 'checkpoints'
       await nextTick()
 
       expect(filteredAssets.value).toHaveLength(1)
@@ -338,7 +391,7 @@ describe('useAssetBrowser', () => {
       const { updateFilters, filteredAssets } = useAssetBrowser(ref(assets))
 
       updateFilters({
-        sortBy: 'name',
+        sortBy: 'name-asc',
         fileFormats: [],
         baseModels: [],
         ownership: 'all'
@@ -406,7 +459,7 @@ describe('useAssetBrowser', () => {
       expect(filteredAssets.value).toHaveLength(3)
     })
 
-    it('filters by ownership - my models only', async () => {
+    it('filters by ownership - imported models only via nav selection', async () => {
       const assets = [
         createApiAsset({ name: 'my-model.safetensors', is_immutable: false }),
         createApiAsset({
@@ -416,11 +469,73 @@ describe('useAssetBrowser', () => {
         createApiAsset({
           name: 'another-my-model.safetensors',
           is_immutable: false
+        }),
+        // Need a second category so typeCategories.length > 1
+        createApiAsset({
+          name: 'lora.safetensors',
+          is_immutable: true,
+          tags: ['models', 'loras']
         })
       ]
 
-      const { updateFilters, filteredAssets } = useAssetBrowser(ref(assets))
+      const { selectedNavItem, filteredAssets } = useAssetBrowser(ref(assets))
 
+      // Selecting 'imported' nav item filters to my-models (non-immutable)
+      selectedNavItem.value = 'imported'
+      await nextTick()
+
+      expect(filteredAssets.value).toHaveLength(2)
+      expect(filteredAssets.value.every((asset) => !asset.is_immutable)).toBe(
+        true
+      )
+    })
+
+    it('shows all models when nav is "all"', async () => {
+      const assets = [
+        createApiAsset({ name: 'my-model.safetensors', is_immutable: false }),
+        createApiAsset({
+          name: 'public-model.safetensors',
+          is_immutable: true
+        }),
+        createApiAsset({
+          name: 'another-public-model.safetensors',
+          is_immutable: true
+        })
+      ]
+
+      const { selectedNavItem, filteredAssets } = useAssetBrowser(ref(assets))
+
+      // Selecting 'all' nav item shows all models
+      selectedNavItem.value = 'all'
+      await nextTick()
+
+      expect(filteredAssets.value).toHaveLength(3)
+    })
+
+    it('filters by ownership via filter bar - my-models', async () => {
+      const assets = [
+        createApiAsset({
+          name: 'my-model.safetensors',
+          is_immutable: false,
+          tags: ['models', 'checkpoints']
+        }),
+        createApiAsset({
+          name: 'public-model.safetensors',
+          is_immutable: true,
+          tags: ['models', 'checkpoints']
+        }),
+        createApiAsset({
+          name: 'another-my-model.safetensors',
+          is_immutable: false,
+          tags: ['models', 'checkpoints']
+        })
+      ]
+
+      const { selectedNavItem, updateFilters, filteredAssets } =
+        useAssetBrowser(ref(assets))
+
+      // Must select a specific category for ownership filter to apply
+      selectedNavItem.value = 'checkpoints'
       updateFilters({
         sortBy: 'name-asc',
         fileFormats: [],
@@ -435,21 +550,30 @@ describe('useAssetBrowser', () => {
       )
     })
 
-    it('filters by ownership - public models only', async () => {
+    it('filters by ownership via filter bar - public-models', async () => {
       const assets = [
-        createApiAsset({ name: 'my-model.safetensors', is_immutable: false }),
+        createApiAsset({
+          name: 'my-model.safetensors',
+          is_immutable: false,
+          tags: ['models', 'loras']
+        }),
         createApiAsset({
           name: 'public-model.safetensors',
-          is_immutable: true
+          is_immutable: true,
+          tags: ['models', 'loras']
         }),
         createApiAsset({
           name: 'another-public-model.safetensors',
-          is_immutable: true
+          is_immutable: true,
+          tags: ['models', 'loras']
         })
       ]
 
-      const { updateFilters, filteredAssets } = useAssetBrowser(ref(assets))
+      const { selectedNavItem, updateFilters, filteredAssets } =
+        useAssetBrowser(ref(assets))
 
+      // Must select a specific category for ownership filter to apply
+      selectedNavItem.value = 'loras'
       updateFilters({
         sortBy: 'name-asc',
         fileFormats: [],
@@ -463,26 +587,84 @@ describe('useAssetBrowser', () => {
         true
       )
     })
+
+    it('nav imported selection overrides filter bar ownership', async () => {
+      const assets = [
+        createApiAsset({
+          name: 'my-model.safetensors',
+          is_immutable: false,
+          tags: ['models', 'checkpoints']
+        }),
+        createApiAsset({
+          name: 'public-model.safetensors',
+          is_immutable: true,
+          tags: ['models', 'checkpoints']
+        }),
+        // Need a second category so typeCategories.length > 1
+        createApiAsset({
+          name: 'lora.safetensors',
+          is_immutable: true,
+          tags: ['models', 'loras']
+        })
+      ]
+
+      const { selectedNavItem, updateFilters, filteredAssets } =
+        useAssetBrowser(ref(assets))
+
+      // Must select a specific category for ownership filter to apply
+      selectedNavItem.value = 'checkpoints'
+      // Set filter bar to public-models
+      updateFilters({
+        sortBy: 'name-asc',
+        fileFormats: [],
+        baseModels: [],
+        ownership: 'public-models'
+      })
+      await nextTick()
+
+      expect(filteredAssets.value).toHaveLength(1)
+      expect(filteredAssets.value[0].is_immutable).toBe(true)
+
+      // Nav selection to 'imported' should override filter bar
+      selectedNavItem.value = 'imported'
+      await nextTick()
+
+      expect(filteredAssets.value).toHaveLength(1)
+      expect(filteredAssets.value[0].is_immutable).toBe(false)
+    })
   })
 
   describe('Dynamic Category Extraction', () => {
-    it('extracts categories from asset tags', () => {
+    it('extracts categories from asset tags into navItems', () => {
       const assets = [
         createApiAsset({ tags: ['models', 'checkpoints'] }),
         createApiAsset({ tags: ['models', 'loras'] }),
         createApiAsset({ tags: ['models', 'checkpoints'] }) // duplicate
       ]
 
-      const { availableCategories } = useAssetBrowser(ref(assets))
+      const { navItems } = useAssetBrowser(ref(assets))
 
-      expect(availableCategories.value).toEqual([
-        { id: 'all', label: 'All Models', icon: 'icon-[lucide--folder]' },
+      // navItems includes quick filters plus a "By type" group
+      expect(navItems.value).toEqual([
+        { id: 'all', label: 'All Models', icon: 'icon-[lucide--list]' },
         {
-          id: 'checkpoints',
-          label: 'Checkpoints',
-          icon: 'icon-[lucide--package]'
+          id: 'imported',
+          label: 'Imported',
+          icon: 'icon-[lucide--folder-input]',
+          badge: undefined
         },
-        { id: 'loras', label: 'Loras', icon: 'icon-[lucide--package]' }
+        {
+          title: 'By type',
+          collapsible: false,
+          items: [
+            {
+              id: 'checkpoints',
+              label: 'Checkpoints',
+              icon: 'icon-[lucide--folder]'
+            },
+            { id: 'loras', label: 'Loras', icon: 'icon-[lucide--folder]' }
+          ]
+        }
       ])
     })
 
@@ -492,11 +674,21 @@ describe('useAssetBrowser', () => {
         createApiAsset({ tags: ['models', 'vae'] })
       ]
 
-      const { availableCategories } = useAssetBrowser(ref(assets))
+      const { navItems } = useAssetBrowser(ref(assets))
 
-      expect(availableCategories.value).toEqual([
-        { id: 'all', label: 'All Models', icon: 'icon-[lucide--folder]' },
-        { id: 'vae', label: 'Vae', icon: 'icon-[lucide--package]' }
+      expect(navItems.value).toEqual([
+        { id: 'all', label: 'All Models', icon: 'icon-[lucide--list]' },
+        {
+          id: 'imported',
+          label: 'Imported',
+          icon: 'icon-[lucide--folder-input]',
+          badge: undefined
+        },
+        {
+          title: 'By type',
+          collapsible: false,
+          items: [{ id: 'vae', label: 'Vae', icon: 'icon-[lucide--folder]' }]
+        }
       ])
     })
 
@@ -506,32 +698,177 @@ describe('useAssetBrowser', () => {
         createApiAsset({ tags: ['models', 'checkpoints'] })
       ]
 
-      const { availableCategories } = useAssetBrowser(ref(assets))
+      const { navItems } = useAssetBrowser(ref(assets))
 
-      expect(availableCategories.value).toEqual([
-        { id: 'all', label: 'All Models', icon: 'icon-[lucide--folder]' },
+      expect(navItems.value).toEqual([
+        { id: 'all', label: 'All Models', icon: 'icon-[lucide--list]' },
         {
-          id: 'checkpoints',
-          label: 'Checkpoints',
-          icon: 'icon-[lucide--package]'
+          id: 'imported',
+          label: 'Imported',
+          icon: 'icon-[lucide--folder-input]',
+          badge: undefined
+        },
+        {
+          title: 'By type',
+          collapsible: false,
+          items: [
+            {
+              id: 'checkpoints',
+              label: 'Checkpoints',
+              icon: 'icon-[lucide--folder]'
+            }
+          ]
         }
       ])
     })
 
-    it('computes content title from selected category', () => {
+    it('computes content title from selected nav item', () => {
       const assets = [createApiAsset({ tags: ['models', 'checkpoints'] })]
-      const { selectedCategory, contentTitle } = useAssetBrowser(ref(assets))
+      const { selectedNavItem, contentTitle } = useAssetBrowser(ref(assets))
 
       // Default
       expect(contentTitle.value).toBe('All Models')
 
       // Set specific category
-      selectedCategory.value = 'checkpoints'
+      selectedNavItem.value = 'checkpoints'
       expect(contentTitle.value).toBe('Checkpoints')
 
+      // Set imported
+      selectedNavItem.value = 'imported'
+      expect(contentTitle.value).toBe('Imported')
+
       // Unknown category
-      selectedCategory.value = 'unknown'
+      selectedNavItem.value = 'unknown'
       expect(contentTitle.value).toBe('Assets')
     })
+
+    it('ignores stale file format filter when navigating to category without that format', async () => {
+      const assets = [
+        createApiAsset({
+          id: 'ckpt-safetensors',
+          name: 'model.safetensors',
+          tags: ['models', 'checkpoints']
+        }),
+        createApiAsset({
+          id: 'lora-pt',
+          name: 'lora.pt',
+          tags: ['models', 'loras']
+        }),
+        createApiAsset({
+          id: 'lora-pt-2',
+          name: 'lora2.pt',
+          tags: ['models', 'loras']
+        })
+      ]
+
+      const { selectedNavItem, updateFilters, filteredAssets } =
+        useAssetBrowser(ref(assets))
+
+      // Select safetensors filter while viewing checkpoints
+      selectedNavItem.value = 'checkpoints'
+      updateFilters({
+        sortBy: 'recent',
+        fileFormats: ['safetensors'],
+        baseModels: [],
+        ownership: 'all'
+      })
+      await nextTick()
+
+      expect(filteredAssets.value).toHaveLength(1)
+      expect(filteredAssets.value[0].id).toBe('ckpt-safetensors')
+
+      // Navigate to loras category which has no .safetensors files
+      selectedNavItem.value = 'loras'
+      await nextTick()
+
+      // Should show all loras, not empty (stale filter should be ignored)
+      expect(filteredAssets.value).toHaveLength(2)
+    })
+
+    it('ignores stale base model filter when navigating to category without that model', async () => {
+      const assets = [
+        createApiAsset({
+          id: 'ckpt-sdxl',
+          name: 'model.safetensors',
+          tags: ['models', 'checkpoints'],
+          user_metadata: { base_model: 'SDXL' }
+        }),
+        createApiAsset({
+          id: 'lora-sd15',
+          name: 'lora.pt',
+          tags: ['models', 'loras'],
+          user_metadata: { base_model: 'SD1.5' }
+        })
+      ]
+
+      const { selectedNavItem, updateFilters, filteredAssets } =
+        useAssetBrowser(ref(assets))
+
+      // Select SDXL base model filter while viewing checkpoints
+      selectedNavItem.value = 'checkpoints'
+      updateFilters({
+        sortBy: 'recent',
+        fileFormats: [],
+        baseModels: ['SDXL'],
+        ownership: 'all'
+      })
+      await nextTick()
+
+      expect(filteredAssets.value).toHaveLength(1)
+      expect(filteredAssets.value[0].id).toBe('ckpt-sdxl')
+
+      // Navigate to loras which has no SDXL models
+      selectedNavItem.value = 'loras'
+      await nextTick()
+
+      // Should show all loras, not empty
+      expect(filteredAssets.value).toHaveLength(1)
+      expect(filteredAssets.value[0].id).toBe('lora-sd15')
+    })
+
+    it('groups models by top-level folder name', () => {
+      const assets = [
+        createApiAsset({
+          id: 'asset-1',
+          tags: ['models', 'Chatterbox/subfolder1/model1']
+        }),
+        createApiAsset({
+          id: 'asset-2',
+          tags: ['models', 'Chatterbox/subfolder2/model2']
+        }),
+        createApiAsset({
+          id: 'asset-3',
+          tags: ['models', 'Chatterbox/subfolder3/model3']
+        }),
+        createApiAsset({
+          id: 'asset-4',
+          tags: ['models', 'OtherFolder/subfolder1/model4']
+        })
+      ]
+
+      const { navItems, selectedNavItem, categoryFilteredAssets } =
+        useAssetBrowser(ref(assets))
+
+      // Should group all Chatterbox subfolders under single category in the type group
+      const typeGroup = navItems.value[2] as { items: { id: string }[] }
+      expect(typeGroup.items.map((i) => i.id)).toEqual([
+        'Chatterbox',
+        'OtherFolder'
+      ])
+
+      // When selecting Chatterbox category, should include all models from its subfolders
+      selectedNavItem.value = 'Chatterbox'
+      expect(categoryFilteredAssets.value).toHaveLength(3)
+      expect(categoryFilteredAssets.value.map((a) => a.id)).toEqual([
+        'asset-1',
+        'asset-2',
+        'asset-3'
+      ])
+
+      // When selecting OtherFolder category, should include only its models
+      selectedNavItem.value = 'OtherFolder'
+      expect(categoryFilteredAssets.value).toHaveLength(1)
+      expect(categoryFilteredAssets.value[0].id).toBe('asset-4')
+    })
   })
 })
diff --git a/src/platform/assets/composables/useAssetBrowser.ts b/src/platform/assets/composables/useAssetBrowser.ts
index 799834614d..448a89b434 100644
--- a/src/platform/assets/composables/useAssetBrowser.ts
+++ b/src/platform/assets/composables/useAssetBrowser.ts
@@ -2,49 +2,30 @@ import { computed, ref } from 'vue'
 import type { Ref } from 'vue'
 import { useFuse } from '@vueuse/integrations/useFuse'
 import type { UseFuseOptions } from '@vueuse/integrations/useFuse'
+import { storeToRefs } from 'pinia'
 
 import { d, t } from '@/i18n'
-import type { FilterState } from '@/platform/assets/components/AssetFilterBar.vue'
+import type {
+  AssetFilterState,
+  OwnershipOption
+} from '@/platform/assets/types/filterTypes'
 import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import { useAssetFilterOptions } from '@/platform/assets/composables/useAssetFilterOptions'
 import {
-  getAssetBaseModel,
-  getAssetDescription
+  filterByBaseModels,
+  filterByCategory,
+  filterByFileFormats,
+  filterByOwnership
+} from '@/platform/assets/utils/assetFilterUtils'
+import {
+  getAssetBaseModels,
+  getAssetFilename
 } from '@/platform/assets/utils/assetMetadataUtils'
+import { sortAssets } from '@/platform/assets/utils/assetSortUtils'
+import { useAssetDownloadStore } from '@/stores/assetDownloadStore'
+import type { NavGroupData, NavItemData } from '@/types/navTypes'
 
-export type OwnershipOption = 'all' | 'my-models' | 'public-models'
-
-function filterByCategory(category: string) {
-  return (asset: AssetItem) => {
-    return category === 'all' || asset.tags.includes(category)
-  }
-}
-
-function filterByFileFormats(formats: string[]) {
-  return (asset: AssetItem) => {
-    if (formats.length === 0) return true
-    const formatSet = new Set(formats)
-    const extension = asset.name.split('.').pop()?.toLowerCase()
-    return extension ? formatSet.has(extension) : false
-  }
-}
-
-function filterByBaseModels(models: string[]) {
-  return (asset: AssetItem) => {
-    if (models.length === 0) return true
-    const modelSet = new Set(models)
-    const baseModel = getAssetBaseModel(asset)
-    return baseModel ? modelSet.has(baseModel) : false
-  }
-}
-
-function filterByOwnership(ownership: OwnershipOption) {
-  return (asset: AssetItem) => {
-    if (ownership === 'all') return true
-    if (ownership === 'my-models') return asset.is_immutable === false
-    if (ownership === 'public-models') return asset.is_immutable === true
-    return true
-  }
-}
+type NavId = 'all' | 'imported' | (string & {})
 
 type AssetBadge = {
   label: string
@@ -53,7 +34,7 @@ type AssetBadge = {
 
 // Display properties for transformed assets
 export interface AssetDisplayItem extends AssetItem {
-  description: string
+  secondaryText: string
   badges: AssetBadge[]
   stats: {
     formattedDate?: string
@@ -70,88 +51,139 @@ export function useAssetBrowser(
   assetsSource: Ref<AssetItem[] | undefined> = ref<AssetItem[] | undefined>([])
 ) {
   const assets = computed<AssetItem[]>(() => assetsSource.value ?? [])
+  const assetDownloadStore = useAssetDownloadStore()
+  const { sessionDownloadCount } = storeToRefs(assetDownloadStore)
+
   // State
   const searchQuery = ref('')
-  const selectedCategory = ref('all')
-  const filters = ref<FilterState>({
+  const selectedNavItem = ref<NavId>('all')
+  const filters = ref<AssetFilterState>({
     sortBy: 'recent',
     fileFormats: [],
     baseModels: [],
     ownership: 'all'
   })
 
+  const selectedOwnership = computed<OwnershipOption>(() => {
+    if (typeCategories.value.length <= 1) return filters.value.ownership
+    if (selectedNavItem.value === 'imported') return 'my-models'
+    if (selectedNavItem.value === 'all') return 'all'
+    return filters.value.ownership
+  })
+
+  const selectedCategory = computed(() => {
+    if (
+      selectedNavItem.value === 'all' ||
+      selectedNavItem.value === 'imported'
+    ) {
+      return 'all'
+    }
+    return selectedNavItem.value
+  })
+
   // Transform API asset to display asset
   function transformAssetForDisplay(asset: AssetItem): AssetDisplayItem {
-    // Extract description from metadata or create from tags
-    const typeTag = asset.tags.find((tag) => tag !== 'models')
-    const description =
-      getAssetDescription(asset) ||
-      `${typeTag || t('assetBrowser.unknown')} model`
+    const secondaryText = getAssetFilename(asset)
 
-    // Create badges from tags and metadata
     const badges: AssetBadge[] = []
 
+    const typeTag = asset.tags.find((tag) => tag !== 'models')
     // Type badge from non-root tag
     if (typeTag) {
-      badges.push({ label: typeTag, type: 'type' })
+      // 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 badge from metadata
-    const baseModel = getAssetBaseModel(asset)
-    if (baseModel) {
-      badges.push({
-        label: baseModel,
-        type: 'base'
-      })
+    // 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: d(new Date(asset.created_at), { dateStyle: 'short' }),
+      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,
-      description,
+      secondaryText,
       badges,
       stats
     }
   }
 
-  const availableCategories = computed(() => {
+  const typeCategories = computed<NavItemData[]>(() => {
     const categories = assets.value
       .filter((asset) => asset.tags[0] === 'models')
       .map((asset) => asset.tags[1])
       .filter((tag): tag is string => typeof tag === 'string' && tag.length > 0)
+      .map((tag) => tag.split('/')[0])
 
-    const uniqueCategories = Array.from(new Set(categories))
+    return Array.from(new Set(categories))
       .sort()
       .map((category) => ({
         id: category,
         label: category.charAt(0).toUpperCase() + category.slice(1),
-        icon: 'icon-[lucide--package]'
+        icon: 'icon-[lucide--folder]'
       }))
+  })
 
-    return [
+  const navItems = computed<(NavItemData | NavGroupData)[]>(() => {
+    const quickFilters: NavItemData[] = [
       {
         id: 'all',
         label: t('assetBrowser.allModels'),
-        icon: 'icon-[lucide--folder]'
+        icon: 'icon-[lucide--list]'
       },
-      ...uniqueCategories
+      {
+        id: 'imported',
+        label: t('assetBrowser.imported'),
+        icon: 'icon-[lucide--folder-input]',
+        badge:
+          sessionDownloadCount.value > 0
+            ? sessionDownloadCount.value
+            : undefined
+      }
+    ]
+
+    if (typeCategories.value.length === 0) {
+      return quickFilters
+    }
+
+    return [
+      ...quickFilters,
+      {
+        title: t('assetBrowser.byType'),
+        items: typeCategories.value,
+        collapsible: false
+      }
     ]
   })
 
-  // Compute content title from selected category
+  const isImportedSelected = computed(
+    () => selectedNavItem.value === 'imported'
+  )
+
+  // Compute content title from selected nav item
   const contentTitle = computed(() => {
-    if (selectedCategory.value === 'all') {
+    if (selectedNavItem.value === 'all') {
       return t('assetBrowser.allModels')
     }
+    if (selectedNavItem.value === 'imported') {
+      return t('assetBrowser.imported')
+    }
 
-    const category = availableCategories.value.find(
-      (cat) => cat.id === selectedCategory.value
+    const category = typeCategories.value.find(
+      (cat) => cat.id === selectedNavItem.value
     )
     return category?.label || t('assetBrowser.assets')
   })
@@ -161,11 +193,33 @@ export function useAssetBrowser(
     return assets.value.filter(filterByCategory(selectedCategory.value))
   })
 
+  const { availableFileFormats, availableBaseModels } = useAssetFilterOptions(
+    categoryFilteredAssets
+  )
+
+  const activeFileFormats = computed(() =>
+    filters.value.fileFormats.filter((f) =>
+      availableFileFormats.value.some((opt) => opt.value === f)
+    )
+  )
+
+  const activeBaseModels = computed(() =>
+    filters.value.baseModels.filter((m) =>
+      availableBaseModels.value.some((opt) => opt.value === m)
+    )
+  )
+
   const fuseOptions: UseFuseOptions<AssetItem> = {
     fuseOptions: {
       keys: [
         { name: 'name', weight: 0.4 },
-        { name: 'tags', weight: 0.3 }
+        { name: 'tags', weight: 0.3 },
+        { name: 'user_metadata.name', weight: 0.4 },
+        { name: 'user_metadata.additional_tags', weight: 0.3 },
+        { name: 'user_metadata.trained_words', weight: 0.3 },
+        { name: 'user_metadata.user_description', weight: 0.3 },
+        { name: 'metadata.name', weight: 0.4 },
+        { name: 'metadata.trained_words', weight: 0.3 }
       ],
       threshold: 0.4, // Higher threshold for typo tolerance (0.0 = exact, 1.0 = match all)
       ignoreLocation: true, // Search anywhere in the string, not just at the beginning
@@ -186,42 +240,29 @@ export function useAssetBrowser(
 
   const filteredAssets = computed(() => {
     const filtered = searchFiltered.value
-      .filter(filterByFileFormats(filters.value.fileFormats))
-      .filter(filterByBaseModels(filters.value.baseModels))
-      .filter(filterByOwnership(filters.value.ownership))
+      .filter(filterByFileFormats(activeFileFormats.value))
+      .filter(filterByBaseModels(activeBaseModels.value))
+      .filter(filterByOwnership(selectedOwnership.value))
 
-    const sortedAssets = [...filtered]
-    sortedAssets.sort((a, b) => {
-      switch (filters.value.sortBy) {
-        case 'name-desc':
-          return b.name.localeCompare(a.name)
-        case 'recent':
-          return (
-            new Date(b.created_at).getTime() - new Date(a.created_at).getTime()
-          )
-        case 'popular':
-          return a.name.localeCompare(b.name)
-        case 'name-asc':
-        default:
-          return a.name.localeCompare(b.name)
-      }
-    })
+    const sortedAssets = sortAssets(filtered, filters.value.sortBy)
 
     // Transform to display format
     return sortedAssets.map(transformAssetForDisplay)
   })
 
-  function updateFilters(newFilters: FilterState) {
+  function updateFilters(newFilters: AssetFilterState) {
     filters.value = { ...newFilters }
   }
 
   return {
     searchQuery,
+    selectedNavItem,
     selectedCategory,
-    availableCategories,
+    navItems,
     contentTitle,
     categoryFilteredAssets,
     filteredAssets,
+    isImportedSelected,
     updateFilters
   }
 }
diff --git a/tests-ui/platform/assets/composables/useAssetBrowserDialog.test.ts b/src/platform/assets/composables/useAssetBrowserDialog.test.ts
similarity index 100%
rename from tests-ui/platform/assets/composables/useAssetBrowserDialog.test.ts
rename to src/platform/assets/composables/useAssetBrowserDialog.test.ts
diff --git a/src/platform/assets/composables/useAssetBrowserDialog.ts b/src/platform/assets/composables/useAssetBrowserDialog.ts
index 41c4c011d3..8f09395600 100644
--- a/src/platform/assets/composables/useAssetBrowserDialog.ts
+++ b/src/platform/assets/composables/useAssetBrowserDialog.ts
@@ -1,7 +1,7 @@
 import AssetBrowserModal from '@/platform/assets/components/AssetBrowserModal.vue'
 import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import { useDialogService } from '@/services/dialogService'
 import { useDialogStore } from '@/stores/dialogStore'
-import type { DialogComponentProps } from '@/stores/dialogStore'
 
 interface ShowOptions {
   /** ComfyUI node type for context (e.g., 'CheckpointLoaderSimple') */
@@ -22,64 +22,51 @@ interface BrowseOptions {
   onAssetSelected?: (asset: AssetItem) => void
 }
 
-const dialogComponentProps: DialogComponentProps = {
-  headless: true,
-  modal: true,
-  closable: true,
-  pt: {
-    root: {
-      class: 'rounded-2xl overflow-hidden asset-browser-dialog'
-    },
-    header: {
-      class: '!p-0 hidden'
-    },
-    content: {
-      class: '!p-0 !m-0 h-full w-full'
-    }
-  }
-} as const
+const DIALOG_KEY = 'global-asset-browser'
 
 export const useAssetBrowserDialog = () => {
+  const dialogService = useDialogService()
   const dialogStore = useDialogStore()
-  const dialogKey = 'global-asset-browser'
 
-  async function show(props: ShowOptions) {
+  function hide() {
+    dialogStore.closeDialog({ key: DIALOG_KEY })
+  }
+
+  function show(props: ShowOptions) {
     const handleAssetSelected = (asset: AssetItem) => {
       props.onAssetSelected?.(asset)
-      dialogStore.closeDialog({ key: dialogKey })
+      hide()
     }
 
-    dialogStore.showDialog({
-      key: dialogKey,
+    dialogService.showLayoutDialog({
+      key: DIALOG_KEY,
       component: AssetBrowserModal,
       props: {
         nodeType: props.nodeType,
         inputName: props.inputName,
         currentValue: props.currentValue,
         onSelect: handleAssetSelected,
-        onClose: () => dialogStore.closeDialog({ key: dialogKey })
-      },
-      dialogComponentProps
+        onClose: hide
+      }
     })
   }
 
-  async function browse(options: BrowseOptions): Promise<void> {
+  function browse(options: BrowseOptions) {
     const handleAssetSelected = (asset: AssetItem) => {
       options.onAssetSelected?.(asset)
-      dialogStore.closeDialog({ key: dialogKey })
+      hide()
     }
 
-    dialogStore.showDialog({
-      key: dialogKey,
+    dialogService.showLayoutDialog({
+      key: DIALOG_KEY,
       component: AssetBrowserModal,
       props: {
         showLeftPanel: true,
         assetType: options.assetType,
         title: options.title,
         onSelect: handleAssetSelected,
-        onClose: () => dialogStore.closeDialog({ key: dialogKey })
-      },
-      dialogComponentProps
+        onClose: hide
+      }
     })
   }
 
diff --git a/tests-ui/platform/assets/composables/useAssetFilterOptions.test.ts b/src/platform/assets/composables/useAssetFilterOptions.test.ts
similarity index 97%
rename from tests-ui/platform/assets/composables/useAssetFilterOptions.test.ts
rename to src/platform/assets/composables/useAssetFilterOptions.test.ts
index 08537650a7..b956b4de1a 100644
--- a/tests-ui/platform/assets/composables/useAssetFilterOptions.test.ts
+++ b/src/platform/assets/composables/useAssetFilterOptions.test.ts
@@ -1,6 +1,7 @@
-import { describe, expect, it } from 'vitest'
+import { describe, expect, it, vi } from 'vitest'
 
 import { useAssetFilterOptions } from '@/platform/assets/composables/useAssetFilterOptions'
+
 import {
   createAssetWithSpecificBaseModel,
   createAssetWithSpecificExtension,
@@ -9,6 +10,12 @@ import {
   createAssetWithoutUserMetadata
 } from '@/platform/assets/fixtures/ui-mock-assets'
 
+vi.mock('vue-i18n', () => ({
+  useI18n: () => ({
+    t: (key: string) => key
+  })
+}))
+
 describe('useAssetFilterOptions', () => {
   describe('File Format Extraction', () => {
     it('extracts file formats from asset names', () => {
diff --git a/src/platform/assets/composables/useAssetFilterOptions.ts b/src/platform/assets/composables/useAssetFilterOptions.ts
index a71fadae26..a111d9e322 100644
--- a/src/platform/assets/composables/useAssetFilterOptions.ts
+++ b/src/platform/assets/composables/useAssetFilterOptions.ts
@@ -1,15 +1,25 @@
 import { uniqWith } from 'es-toolkit'
 import { computed, toValue } from 'vue'
 import type { MaybeRefOrGetter } from 'vue'
+import { useI18n } from 'vue-i18n'
 
 import type { SelectOption } from '@/components/input/types'
 import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import type { OwnershipFilterOption } from '@/platform/assets/types/filterTypes'
+import { getAssetBaseModels } from '@/platform/assets/utils/assetMetadataUtils'
 
 /**
  * Composable that extracts available filter options from asset data
- * Provides reactive computed properties for file formats and base models
+ * Provides reactive computed properties for file formats, base models, and ownership
  */
 export function useAssetFilterOptions(assets: MaybeRefOrGetter<AssetItem[]>) {
+  const { t } = useI18n()
+
+  const ownershipOptions = computed<OwnershipFilterOption[]>(() => [
+    { name: t('assetBrowser.ownershipAll'), value: 'all' },
+    { name: t('assetBrowser.ownershipMyModels'), value: 'my-models' },
+    { name: t('assetBrowser.ownershipPublicModels'), value: 'public-models' }
+  ])
   /**
    * Extract unique file formats from asset names
    * Returns sorted SelectOption array with extensions
@@ -37,12 +47,7 @@ export function useAssetFilterOptions(assets: MaybeRefOrGetter<AssetItem[]>) {
    */
   const availableBaseModels = computed<SelectOption[]>(() => {
     const assetList = toValue(assets)
-    const models = assetList
-      .map((asset) => asset.user_metadata?.base_model)
-      .filter(
-        (baseModel): baseModel is string =>
-          baseModel !== undefined && typeof baseModel === 'string'
-      )
+    const models = assetList.flatMap((asset) => getAssetBaseModels(asset))
 
     const uniqueModels = uniqWith(models, (a, b) => a === b)
 
@@ -54,6 +59,7 @@ export function useAssetFilterOptions(assets: MaybeRefOrGetter<AssetItem[]>) {
 
   return {
     availableFileFormats,
-    availableBaseModels
+    availableBaseModels,
+    ownershipOptions
   }
 }
diff --git a/src/platform/assets/composables/useAssetSelection.test.ts b/src/platform/assets/composables/useAssetSelection.test.ts
new file mode 100644
index 0000000000..4ac0f09910
--- /dev/null
+++ b/src/platform/assets/composables/useAssetSelection.test.ts
@@ -0,0 +1,275 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { ref } from 'vue'
+
+import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+
+// Mock useKeyModifier before importing the composable
+const mockShiftKey = ref(false)
+const mockCtrlKey = ref(false)
+const mockMetaKey = ref(false)
+
+vi.mock('@vueuse/core', async (importOriginal) => {
+  const actual = await importOriginal()
+  return {
+    ...(actual as object),
+    useKeyModifier: (key: string) => {
+      if (key === 'Shift') return mockShiftKey
+      if (key === 'Control') return mockCtrlKey
+      if (key === 'Meta') return mockMetaKey
+      return ref(false)
+    }
+  }
+})
+
+import { useAssetSelection } from './useAssetSelection'
+import { useAssetSelectionStore } from './useAssetSelectionStore'
+
+function createMockAssets(count: number): AssetItem[] {
+  return Array.from({ length: count }, (_, i) => ({
+    id: `asset-${i}`,
+    name: `Asset ${i}`,
+    size: 1000,
+    created_at: new Date().toISOString(),
+    tags: ['output'],
+    preview_url: `http://example.com/asset-${i}.png`
+  }))
+}
+
+describe('useAssetSelection', () => {
+  beforeEach(() => {
+    setActivePinia(createPinia())
+    mockShiftKey.value = false
+    mockCtrlKey.value = false
+    mockMetaKey.value = false
+  })
+
+  describe('reconcileSelection', () => {
+    it('prunes selection to visible assets', () => {
+      const selection = useAssetSelection()
+      const store = useAssetSelectionStore()
+      const assets: AssetItem[] = [
+        { id: 'a', name: 'a.png', tags: [] },
+        { id: 'b', name: 'b.png', tags: [] }
+      ]
+
+      store.setSelection(['a', 'b'])
+      store.setLastSelectedIndex(1)
+      store.setLastSelectedAssetId('b')
+
+      selection.reconcileSelection([assets[1]])
+
+      expect(Array.from(store.selectedAssetIds)).toEqual(['b'])
+      expect(store.lastSelectedIndex).toBe(0)
+      expect(store.lastSelectedAssetId).toBe('b')
+    })
+
+    it('clears selection when no visible assets remain', () => {
+      const selection = useAssetSelection()
+      const store = useAssetSelectionStore()
+
+      store.setSelection(['a'])
+      store.setLastSelectedIndex(0)
+      store.setLastSelectedAssetId('a')
+
+      selection.reconcileSelection([])
+
+      expect(store.selectedAssetIds.size).toBe(0)
+      expect(store.lastSelectedIndex).toBe(-1)
+      expect(store.lastSelectedAssetId).toBeNull()
+    })
+
+    it('recomputes the anchor index when assets reorder', () => {
+      const selection = useAssetSelection()
+      const store = useAssetSelectionStore()
+      const assets: AssetItem[] = [
+        { id: 'a', name: 'a.png', tags: [] },
+        { id: 'b', name: 'b.png', tags: [] }
+      ]
+
+      store.setSelection(['a'])
+      store.setLastSelectedIndex(0)
+      store.setLastSelectedAssetId('a')
+
+      selection.reconcileSelection([assets[1], assets[0]])
+
+      expect(store.lastSelectedIndex).toBe(1)
+      expect(store.lastSelectedAssetId).toBe('a')
+    })
+
+    it('clears anchor when the anchored asset is no longer visible', () => {
+      const selection = useAssetSelection()
+      const store = useAssetSelectionStore()
+      const assets: AssetItem[] = [
+        { id: 'a', name: 'a.png', tags: [] },
+        { id: 'b', name: 'b.png', tags: [] }
+      ]
+
+      store.setSelection(['a', 'b'])
+      store.setLastSelectedIndex(0)
+      store.setLastSelectedAssetId('a')
+
+      selection.reconcileSelection([assets[1]])
+
+      expect(Array.from(store.selectedAssetIds)).toEqual(['b'])
+      expect(store.lastSelectedIndex).toBe(-1)
+      expect(store.lastSelectedAssetId).toBeNull()
+    })
+  })
+
+  describe('handleAssetClick - normal click', () => {
+    it('selects single asset and clears previous selection', () => {
+      const { handleAssetClick, isSelected, selectedCount } =
+        useAssetSelection()
+      const assets = createMockAssets(3)
+
+      handleAssetClick(assets[0], 0, assets)
+      expect(isSelected('asset-0')).toBe(true)
+      expect(selectedCount.value).toBe(1)
+
+      handleAssetClick(assets[1], 1, assets)
+      expect(isSelected('asset-0')).toBe(false)
+      expect(isSelected('asset-1')).toBe(true)
+      expect(selectedCount.value).toBe(1)
+    })
+  })
+
+  describe('handleAssetClick - shift+click', () => {
+    it('selects range from anchor to clicked item', () => {
+      const { handleAssetClick, isSelected, selectedCount } =
+        useAssetSelection()
+      const assets = createMockAssets(5)
+
+      // Click first item (sets anchor)
+      handleAssetClick(assets[0], 0, assets)
+
+      // Shift+click third item
+      mockShiftKey.value = true
+      handleAssetClick(assets[2], 2, assets)
+
+      expect(isSelected('asset-0')).toBe(true)
+      expect(isSelected('asset-1')).toBe(true)
+      expect(isSelected('asset-2')).toBe(true)
+      expect(selectedCount.value).toBe(3)
+    })
+
+    it('replaces selection when shift+clicking smaller range (bug fix)', () => {
+      const { handleAssetClick, isSelected, selectedCount } =
+        useAssetSelection()
+      const assets = createMockAssets(5)
+
+      // Click first item
+      handleAssetClick(assets[0], 0, assets)
+
+      // Shift+click third item -> selects 0,1,2
+      mockShiftKey.value = true
+      handleAssetClick(assets[2], 2, assets)
+      expect(selectedCount.value).toBe(3)
+
+      // Shift+click first item again -> should select only 0 (not 0,1,2)
+      handleAssetClick(assets[0], 0, assets)
+      expect(isSelected('asset-0')).toBe(true)
+      expect(isSelected('asset-1')).toBe(false)
+      expect(isSelected('asset-2')).toBe(false)
+      expect(selectedCount.value).toBe(1)
+    })
+
+    it('works in reverse direction', () => {
+      const { handleAssetClick, isSelected, selectedCount } =
+        useAssetSelection()
+      const assets = createMockAssets(5)
+
+      // Click third item (sets anchor)
+      handleAssetClick(assets[2], 2, assets)
+
+      // Shift+click first item
+      mockShiftKey.value = true
+      handleAssetClick(assets[0], 0, assets)
+
+      expect(isSelected('asset-0')).toBe(true)
+      expect(isSelected('asset-1')).toBe(true)
+      expect(isSelected('asset-2')).toBe(true)
+      expect(selectedCount.value).toBe(3)
+    })
+  })
+
+  describe('handleAssetClick - ctrl/cmd+click', () => {
+    it('toggles individual selection without clearing others', () => {
+      const { handleAssetClick, isSelected, selectedCount } =
+        useAssetSelection()
+      const assets = createMockAssets(3)
+
+      handleAssetClick(assets[0], 0, assets)
+
+      mockCtrlKey.value = true
+      handleAssetClick(assets[2], 2, assets)
+
+      expect(isSelected('asset-0')).toBe(true)
+      expect(isSelected('asset-2')).toBe(true)
+      expect(selectedCount.value).toBe(2)
+    })
+
+    it('can deselect with ctrl+click', () => {
+      const { handleAssetClick, isSelected, selectedCount } =
+        useAssetSelection()
+      const assets = createMockAssets(3)
+
+      handleAssetClick(assets[0], 0, assets)
+      mockCtrlKey.value = true
+      handleAssetClick(assets[0], 0, assets)
+
+      expect(isSelected('asset-0')).toBe(false)
+      expect(selectedCount.value).toBe(0)
+    })
+
+    it('toggles with meta key (macOS)', () => {
+      const { handleAssetClick, isSelected, selectedCount } =
+        useAssetSelection()
+      const assets = createMockAssets(3)
+
+      handleAssetClick(assets[0], 0, assets)
+
+      mockMetaKey.value = true
+      handleAssetClick(assets[2], 2, assets)
+
+      expect(isSelected('asset-0')).toBe(true)
+      expect(isSelected('asset-2')).toBe(true)
+      expect(selectedCount.value).toBe(2)
+    })
+  })
+
+  describe('selectAll', () => {
+    it('selects all assets', () => {
+      const { selectAll, selectedCount } = useAssetSelection()
+      const assets = createMockAssets(5)
+
+      selectAll(assets)
+      expect(selectedCount.value).toBe(5)
+    })
+  })
+
+  describe('clearSelection', () => {
+    it('clears all selections', () => {
+      const { handleAssetClick, clearSelection, selectedCount } =
+        useAssetSelection()
+      const assets = createMockAssets(3)
+
+      handleAssetClick(assets[0], 0, assets)
+      clearSelection()
+      expect(selectedCount.value).toBe(0)
+    })
+  })
+
+  describe('getSelectedAssets', () => {
+    it('returns selected asset objects', () => {
+      const { handleAssetClick, getSelectedAssets } = useAssetSelection()
+      const assets = createMockAssets(3)
+
+      handleAssetClick(assets[1], 1, assets)
+      const selected = getSelectedAssets(assets)
+
+      expect(selected).toHaveLength(1)
+      expect(selected[0].id).toBe('asset-1')
+    })
+  })
+})
diff --git a/src/platform/assets/composables/useAssetSelection.ts b/src/platform/assets/composables/useAssetSelection.ts
index 5848b9d8f8..935d3faf1c 100644
--- a/src/platform/assets/composables/useAssetSelection.ts
+++ b/src/platform/assets/composables/useAssetSelection.ts
@@ -21,6 +21,25 @@ export function useAssetSelection() {
   const metaKey = computed(() => isActive.value && metaKeyRaw.value)
   const cmdOrCtrlKey = computed(() => ctrlKey.value || metaKey.value)
 
+  function setAnchor(index: number, assetId: string | null) {
+    selectionStore.setLastSelectedIndex(index)
+    selectionStore.setLastSelectedAssetId(assetId)
+  }
+
+  function syncAnchorFromAssets(assets: AssetItem[]) {
+    const anchorId = selectionStore.lastSelectedAssetId
+    const anchorIndex = anchorId
+      ? assets.findIndex((asset) => asset.id === anchorId)
+      : -1
+
+    if (anchorIndex !== -1) {
+      selectionStore.setLastSelectedIndex(anchorIndex)
+      return
+    }
+
+    setAnchor(-1, null)
+  }
+
   /**
    * Handle asset click with modifier keys for selection
    * @param asset The clicked asset
@@ -45,13 +64,9 @@ export function useAssetSelection() {
       const start = Math.min(selectionStore.lastSelectedIndex, index)
       const end = Math.max(selectionStore.lastSelectedIndex, index)
 
-      // Batch operation for better performance
+      // Select only the range from anchor to clicked item
       const rangeIds = allAssets.slice(start, end + 1).map((a) => a.id)
-      const existingIds = Array.from(selectionStore.selectedAssetIds)
-      const combinedIds = [...new Set([...existingIds, ...rangeIds])]
-
-      // Single update instead of multiple forEach operations
-      selectionStore.setSelection(combinedIds)
+      selectionStore.setSelection(rangeIds)
 
       // Don't update lastSelectedIndex for shift selection
       return
@@ -60,14 +75,14 @@ export function useAssetSelection() {
     // Ctrl/Cmd + Click: Toggle individual selection
     if (cmdOrCtrlKey.value) {
       selectionStore.toggleSelection(assetId)
-      selectionStore.setLastSelectedIndex(index)
+      setAnchor(index, assetId)
       return
     }
 
     // Normal Click: Single selection
     selectionStore.clearSelection()
     selectionStore.addToSelection(assetId)
-    selectionStore.setLastSelectedIndex(index)
+    setAnchor(index, assetId)
   }
 
   /**
@@ -77,7 +92,8 @@ export function useAssetSelection() {
     const allIds = allAssets.map((a) => a.id)
     selectionStore.setSelection(allIds)
     if (allAssets.length > 0) {
-      selectionStore.setLastSelectedIndex(allAssets.length - 1)
+      const lastIndex = allAssets.length - 1
+      setAnchor(lastIndex, allAssets[lastIndex].id)
     }
   }
 
@@ -88,6 +104,55 @@ export function useAssetSelection() {
     return allAssets.filter((asset) => selectionStore.isSelected(asset.id))
   }
 
+  function reconcileSelection(assets: AssetItem[]) {
+    if (selectionStore.selectedAssetIds.size === 0) {
+      return
+    }
+
+    if (assets.length === 0) {
+      selectionStore.clearSelection()
+      return
+    }
+
+    const visibleIds = new Set(assets.map((asset) => asset.id))
+    const nextSelectedIds: string[] = []
+
+    for (const id of selectionStore.selectedAssetIds) {
+      if (visibleIds.has(id)) {
+        nextSelectedIds.push(id)
+      }
+    }
+
+    if (nextSelectedIds.length === selectionStore.selectedAssetIds.size) {
+      syncAnchorFromAssets(assets)
+      return
+    }
+
+    if (nextSelectedIds.length === 0) {
+      selectionStore.clearSelection()
+      return
+    }
+
+    selectionStore.setSelection(nextSelectedIds)
+    syncAnchorFromAssets(assets)
+  }
+
+  /**
+   * Get the output count for a single asset
+   * Same logic as in AssetsSidebarTab.vue
+   */
+  function getOutputCount(item: AssetItem): number {
+    const count = item.user_metadata?.outputCount
+    return typeof count === 'number' && count > 0 ? count : 1
+  }
+
+  /**
+   * Get the total output count for given assets
+   */
+  function getTotalOutputCount(assets: AssetItem[]): number {
+    return assets.reduce((sum, asset) => sum + getOutputCount(asset), 0)
+  }
+
   /**
    * Activate key event listeners (when sidebar opens)
    */
@@ -101,7 +166,7 @@ export function useAssetSelection() {
   function deactivate() {
     isActive.value = false
     // Reset selection state to ensure clean state when deactivated
-    selectionStore.reset()
+    selectionStore.clearSelection()
   }
 
   return {
@@ -116,8 +181,9 @@ export function useAssetSelection() {
     selectAll,
     clearSelection: () => selectionStore.clearSelection(),
     getSelectedAssets,
-    reset: () => selectionStore.reset(),
-
+    reconcileSelection,
+    getOutputCount,
+    getTotalOutputCount,
     // Lifecycle management
     activate,
     deactivate,
diff --git a/src/platform/assets/composables/useAssetSelectionStore.test.ts b/src/platform/assets/composables/useAssetSelectionStore.test.ts
new file mode 100644
index 0000000000..9bfed2f1a8
--- /dev/null
+++ b/src/platform/assets/composables/useAssetSelectionStore.test.ts
@@ -0,0 +1,135 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it } from 'vitest'
+
+import { useAssetSelectionStore } from './useAssetSelectionStore'
+
+describe('useAssetSelectionStore', () => {
+  beforeEach(() => {
+    setActivePinia(createPinia())
+  })
+
+  describe('addToSelection', () => {
+    it('adds an asset ID to the selection', () => {
+      const store = useAssetSelectionStore()
+      store.addToSelection('asset-1')
+      expect(store.isSelected('asset-1')).toBe(true)
+      expect(store.selectedCount).toBe(1)
+    })
+
+    it('can add multiple IDs', () => {
+      const store = useAssetSelectionStore()
+      store.addToSelection('asset-1')
+      store.addToSelection('asset-2')
+      expect(store.selectedCount).toBe(2)
+    })
+  })
+
+  describe('removeFromSelection', () => {
+    it('removes an asset ID from the selection', () => {
+      const store = useAssetSelectionStore()
+      store.addToSelection('asset-1')
+      store.removeFromSelection('asset-1')
+      expect(store.isSelected('asset-1')).toBe(false)
+      expect(store.selectedCount).toBe(0)
+    })
+  })
+
+  describe('setSelection', () => {
+    it('replaces entire selection with new IDs', () => {
+      const store = useAssetSelectionStore()
+      store.addToSelection('asset-1')
+      store.addToSelection('asset-2')
+
+      store.setSelection(['asset-3', 'asset-4'])
+
+      expect(store.isSelected('asset-1')).toBe(false)
+      expect(store.isSelected('asset-2')).toBe(false)
+      expect(store.isSelected('asset-3')).toBe(true)
+      expect(store.isSelected('asset-4')).toBe(true)
+      expect(store.selectedCount).toBe(2)
+    })
+
+    it('can set to empty selection', () => {
+      const store = useAssetSelectionStore()
+      store.addToSelection('asset-1')
+      store.setSelection([])
+      expect(store.selectedCount).toBe(0)
+    })
+  })
+
+  describe('clearSelection', () => {
+    it('clears all selections and resets lastSelectedIndex', () => {
+      const store = useAssetSelectionStore()
+      store.addToSelection('asset-1')
+      store.setLastSelectedIndex(5)
+
+      store.clearSelection()
+
+      expect(store.selectedCount).toBe(0)
+      expect(store.lastSelectedIndex).toBe(-1)
+    })
+
+    it('resets lastSelectedAssetId', () => {
+      const store = useAssetSelectionStore()
+      store.addToSelection('asset-1')
+      store.setLastSelectedAssetId('asset-1')
+
+      store.clearSelection()
+
+      expect(store.lastSelectedAssetId).toBe(null)
+    })
+  })
+
+  describe('toggleSelection', () => {
+    it('adds unselected item', () => {
+      const store = useAssetSelectionStore()
+      store.toggleSelection('asset-1')
+      expect(store.isSelected('asset-1')).toBe(true)
+    })
+
+    it('removes selected item', () => {
+      const store = useAssetSelectionStore()
+      store.addToSelection('asset-1')
+      store.toggleSelection('asset-1')
+      expect(store.isSelected('asset-1')).toBe(false)
+    })
+  })
+
+  describe('isSelected', () => {
+    it('returns true for selected items', () => {
+      const store = useAssetSelectionStore()
+      store.addToSelection('asset-1')
+      expect(store.isSelected('asset-1')).toBe(true)
+    })
+
+    it('returns false for unselected items', () => {
+      const store = useAssetSelectionStore()
+      expect(store.isSelected('asset-1')).toBe(false)
+    })
+  })
+
+  describe('setLastSelectedIndex', () => {
+    it('updates lastSelectedIndex', () => {
+      const store = useAssetSelectionStore()
+      store.setLastSelectedIndex(10)
+      expect(store.lastSelectedIndex).toBe(10)
+    })
+  })
+
+  describe('computed properties', () => {
+    it('hasSelection returns true when items are selected', () => {
+      const store = useAssetSelectionStore()
+      expect(store.hasSelection).toBe(false)
+      store.addToSelection('asset-1')
+      expect(store.hasSelection).toBe(true)
+    })
+
+    it('selectedIdsArray returns array of selected IDs', () => {
+      const store = useAssetSelectionStore()
+      store.addToSelection('asset-1')
+      store.addToSelection('asset-2')
+      expect(store.selectedIdsArray).toContain('asset-1')
+      expect(store.selectedIdsArray).toContain('asset-2')
+    })
+  })
+})
diff --git a/src/platform/assets/composables/useAssetSelectionStore.ts b/src/platform/assets/composables/useAssetSelectionStore.ts
index 08edb7bf85..46c2698218 100644
--- a/src/platform/assets/composables/useAssetSelectionStore.ts
+++ b/src/platform/assets/composables/useAssetSelectionStore.ts
@@ -5,6 +5,7 @@ export const useAssetSelectionStore = defineStore('assetSelection', () => {
   // State
   const selectedAssetIds = ref<Set<string>>(new Set())
   const lastSelectedIndex = ref<number>(-1)
+  const lastSelectedAssetId = ref<string | null>(null)
 
   // Getters
   const selectedCount = computed(() => selectedAssetIds.value.size)
@@ -21,19 +22,13 @@ export const useAssetSelectionStore = defineStore('assetSelection', () => {
   }
 
   function setSelection(assetIds: string[]) {
-    // Only update if there's an actual change to prevent unnecessary re-renders
-    const newSet = new Set(assetIds)
-    if (
-      newSet.size !== selectedAssetIds.value.size ||
-      !assetIds.every((id) => selectedAssetIds.value.has(id))
-    ) {
-      selectedAssetIds.value = newSet
-    }
+    selectedAssetIds.value = new Set(assetIds)
   }
 
   function clearSelection() {
     selectedAssetIds.value.clear()
     lastSelectedIndex.value = -1
+    lastSelectedAssetId.value = null
   }
 
   function toggleSelection(assetId: string) {
@@ -52,16 +47,15 @@ export const useAssetSelectionStore = defineStore('assetSelection', () => {
     lastSelectedIndex.value = index
   }
 
-  // Reset function for cleanup
-  function reset() {
-    selectedAssetIds.value.clear()
-    lastSelectedIndex.value = -1
+  function setLastSelectedAssetId(assetId: string | null) {
+    lastSelectedAssetId.value = assetId
   }
 
   return {
     // State
     selectedAssetIds: computed(() => selectedAssetIds.value),
     lastSelectedIndex: computed(() => lastSelectedIndex.value),
+    lastSelectedAssetId: computed(() => lastSelectedAssetId.value),
 
     // Getters
     selectedCount,
@@ -76,6 +70,6 @@ export const useAssetSelectionStore = defineStore('assetSelection', () => {
     toggleSelection,
     isSelected,
     setLastSelectedIndex,
-    reset
+    setLastSelectedAssetId
   }
 })
diff --git a/src/platform/assets/composables/useMediaAssetActions.test.ts b/src/platform/assets/composables/useMediaAssetActions.test.ts
new file mode 100644
index 0000000000..250525b09e
--- /dev/null
+++ b/src/platform/assets/composables/useMediaAssetActions.test.ts
@@ -0,0 +1,371 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+
+import { useMediaAssetActions } from './useMediaAssetActions'
+
+// Use vi.hoisted to create a mutable reference for isCloud
+const mockIsCloud = vi.hoisted(() => ({ value: false }))
+
+// Track the filename passed to createAnnotatedPath
+const capturedFilenames = vi.hoisted(() => ({ values: [] as string[] }))
+
+vi.mock('@/platform/distribution/types', () => ({
+  get isCloud() {
+    return mockIsCloud.value
+  }
+}))
+
+vi.mock('primevue/usetoast', () => ({
+  useToast: () => ({
+    add: vi.fn()
+  })
+}))
+
+vi.mock('vue-i18n', () => ({
+  useI18n: () => ({
+    t: (key: string) => key
+  }),
+  createI18n: () => ({
+    global: {
+      t: (key: string) => key
+    }
+  })
+}))
+
+const mockShowDialog = vi.hoisted(() => vi.fn())
+vi.mock('@/stores/dialogStore', () => ({
+  useDialogStore: () => ({
+    showDialog: mockShowDialog
+  })
+}))
+
+const mockInvalidateModelsForCategory = vi.hoisted(() => vi.fn())
+const mockSetAssetDeleting = vi.hoisted(() => vi.fn())
+const mockUpdateHistory = vi.hoisted(() => vi.fn())
+const mockUpdateInputs = vi.hoisted(() => vi.fn())
+const mockHasCategory = vi.hoisted(() => vi.fn())
+vi.mock('@/stores/assetsStore', () => ({
+  useAssetsStore: () => ({
+    setAssetDeleting: mockSetAssetDeleting,
+    updateHistory: mockUpdateHistory,
+    updateInputs: mockUpdateInputs,
+    invalidateModelsForCategory: mockInvalidateModelsForCategory,
+    hasCategory: mockHasCategory
+  })
+}))
+
+vi.mock('@/stores/modelToNodeStore', () => ({
+  useModelToNodeStore: () => ({})
+}))
+
+vi.mock('@/composables/useCopyToClipboard', () => ({
+  useCopyToClipboard: () => ({
+    copyToClipboard: vi.fn()
+  })
+}))
+
+vi.mock('@/platform/workflow/core/services/workflowActionsService', () => ({
+  useWorkflowActionsService: () => ({
+    openWorkflowAction: vi.fn(),
+    exportWorkflowAction: vi.fn()
+  })
+}))
+
+vi.mock('@/services/litegraphService', () => ({
+  useLitegraphService: () => ({
+    addNodeOnGraph: vi.fn().mockReturnValue({
+      widgets: [{ name: 'image', value: '', callback: vi.fn() }],
+      graph: { setDirtyCanvas: vi.fn() }
+    } as unknown as LGraphNode),
+    getCanvasCenter: vi.fn().mockReturnValue([100, 100])
+  })
+}))
+
+vi.mock('@/stores/nodeDefStore', () => ({
+  useNodeDefStore: () => ({
+    nodeDefsByName: {
+      LoadImage: {
+        name: 'LoadImage',
+        display_name: 'Load Image'
+      }
+    }
+  })
+}))
+
+vi.mock('@/utils/createAnnotatedPath', () => ({
+  createAnnotatedPath: vi.fn((item: { filename: string }) => {
+    capturedFilenames.values.push(item.filename)
+    return item.filename
+  })
+}))
+
+vi.mock('@/utils/loaderNodeUtil', () => ({
+  detectNodeTypeFromFilename: vi.fn().mockReturnValue({
+    nodeType: 'LoadImage',
+    widgetName: 'image'
+  })
+}))
+
+vi.mock('@/utils/typeGuardUtil', () => ({
+  isResultItemType: vi.fn().mockReturnValue(true)
+}))
+
+const mockGetAssetType = vi.hoisted(() => vi.fn())
+vi.mock('@/platform/assets/utils/assetTypeUtil', () => ({
+  getAssetType: mockGetAssetType
+}))
+
+vi.mock('../schemas/assetMetadataSchema', () => ({
+  getOutputAssetMetadata: vi.fn().mockReturnValue(null)
+}))
+
+const mockDeleteAsset = vi.hoisted(() => vi.fn())
+vi.mock('../services/assetService', () => ({
+  assetService: {
+    deleteAsset: mockDeleteAsset
+  }
+}))
+
+vi.mock('@/scripts/api', () => ({
+  api: {
+    deleteItem: vi.fn(),
+    apiURL: vi.fn((path: string) => `http://localhost:8188/api${path}`),
+    internalURL: vi.fn((path: string) => `http://localhost:8188${path}`),
+    addEventListener: vi.fn(),
+    removeEventListener: vi.fn(),
+    user: 'test-user'
+  }
+}))
+
+function createMockAsset(overrides: Partial<AssetItem> = {}): AssetItem {
+  return {
+    id: 'test-asset-id',
+    name: 'original-name.jpeg',
+    size: 1024,
+    created_at: '2025-01-01T00:00:00Z',
+    tags: ['input'],
+    ...overrides
+  }
+}
+
+describe('useMediaAssetActions', () => {
+  beforeEach(() => {
+    vi.resetModules()
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    vi.clearAllMocks()
+    capturedFilenames.values = []
+    mockIsCloud.value = false
+  })
+
+  describe('addWorkflow', () => {
+    describe('OSS mode (isCloud = false)', () => {
+      beforeEach(() => {
+        mockIsCloud.value = false
+      })
+
+      it('should use asset.name as filename', async () => {
+        const actions = useMediaAssetActions()
+
+        const asset = createMockAsset({
+          name: 'my-image.jpeg',
+          asset_hash: 'hash123.jpeg'
+        })
+
+        await actions.addWorkflow(asset)
+
+        expect(capturedFilenames.values).toContain('my-image.jpeg')
+      })
+    })
+
+    describe('Cloud mode (isCloud = true)', () => {
+      beforeEach(() => {
+        mockIsCloud.value = true
+      })
+
+      it('should use asset_hash as filename when available', async () => {
+        const actions = useMediaAssetActions()
+
+        const asset = createMockAsset({
+          name: 'original.jpeg',
+          asset_hash: 'abc123hash.jpeg'
+        })
+
+        await actions.addWorkflow(asset)
+
+        expect(capturedFilenames.values).toContain('abc123hash.jpeg')
+      })
+
+      it('should fall back to asset.name when asset_hash is not available', async () => {
+        const actions = useMediaAssetActions()
+
+        const asset = createMockAsset({
+          name: 'fallback-name.jpeg',
+          asset_hash: undefined
+        })
+
+        await actions.addWorkflow(asset)
+
+        expect(capturedFilenames.values).toContain('fallback-name.jpeg')
+      })
+
+      it('should fall back to asset.name when asset_hash is null', async () => {
+        const actions = useMediaAssetActions()
+
+        const asset = createMockAsset({
+          name: 'fallback-null.jpeg',
+          asset_hash: null
+        })
+
+        await actions.addWorkflow(asset)
+
+        expect(capturedFilenames.values).toContain('fallback-null.jpeg')
+      })
+    })
+  })
+
+  describe('addMultipleToWorkflow', () => {
+    describe('Cloud mode (isCloud = true)', () => {
+      beforeEach(() => {
+        mockIsCloud.value = true
+      })
+
+      it('should use asset_hash for each asset', async () => {
+        const actions = useMediaAssetActions()
+
+        const assets = [
+          createMockAsset({
+            id: '1',
+            name: 'file1.jpeg',
+            asset_hash: 'hash1.jpeg'
+          }),
+          createMockAsset({
+            id: '2',
+            name: 'file2.jpeg',
+            asset_hash: 'hash2.jpeg'
+          })
+        ]
+
+        await actions.addMultipleToWorkflow(assets)
+
+        expect(capturedFilenames.values).toContain('hash1.jpeg')
+        expect(capturedFilenames.values).toContain('hash2.jpeg')
+        expect(capturedFilenames.values).not.toContain('file1.jpeg')
+        expect(capturedFilenames.values).not.toContain('file2.jpeg')
+      })
+    })
+  })
+
+  describe('deleteAssets - model cache invalidation', () => {
+    beforeEach(() => {
+      mockIsCloud.value = true
+      mockGetAssetType.mockReturnValue('input')
+      mockDeleteAsset.mockResolvedValue(undefined)
+      mockInvalidateModelsForCategory.mockClear()
+      mockSetAssetDeleting.mockClear()
+      mockUpdateHistory.mockClear()
+      mockUpdateInputs.mockClear()
+      mockHasCategory.mockClear()
+      // By default, hasCategory returns true for model categories
+      mockHasCategory.mockImplementation(
+        (tag: string) => tag === 'checkpoints' || tag === 'loras'
+      )
+    })
+
+    it('should invalidate model cache when deleting a model asset', async () => {
+      const actions = useMediaAssetActions()
+
+      const modelAsset = createMockAsset({
+        id: 'checkpoint-1',
+        name: 'model.safetensors',
+        tags: ['models', 'checkpoints']
+      })
+
+      mockShowDialog.mockImplementation(
+        ({ props }: { props: { onConfirm: () => Promise<void> } }) => {
+          void props.onConfirm()
+        }
+      )
+
+      await actions.deleteAssets(modelAsset)
+
+      // Only 'checkpoints' exists in cache; 'models' is excluded
+      expect(mockInvalidateModelsForCategory).toHaveBeenCalledTimes(1)
+      expect(mockInvalidateModelsForCategory).toHaveBeenCalledWith(
+        'checkpoints'
+      )
+    })
+
+    it('should invalidate multiple categories for multiple assets', async () => {
+      const actions = useMediaAssetActions()
+
+      const assets = [
+        createMockAsset({ id: '1', tags: ['models', 'checkpoints'] }),
+        createMockAsset({ id: '2', tags: ['models', 'loras'] })
+      ]
+
+      mockShowDialog.mockImplementation(
+        ({ props }: { props: { onConfirm: () => Promise<void> } }) => {
+          void props.onConfirm()
+        }
+      )
+
+      await actions.deleteAssets(assets)
+
+      expect(mockInvalidateModelsForCategory).toHaveBeenCalledWith(
+        'checkpoints'
+      )
+      expect(mockInvalidateModelsForCategory).toHaveBeenCalledWith('loras')
+    })
+
+    it('should not invalidate model cache for non-model assets', async () => {
+      const actions = useMediaAssetActions()
+
+      const inputAsset = createMockAsset({
+        id: 'input-1',
+        name: 'image.png',
+        tags: ['input']
+      })
+
+      mockShowDialog.mockImplementation(
+        ({ props }: { props: { onConfirm: () => Promise<void> } }) => {
+          void props.onConfirm()
+        }
+      )
+
+      await actions.deleteAssets(inputAsset)
+
+      // 'input' tag is excluded, so no cache invalidation
+      expect(mockInvalidateModelsForCategory).not.toHaveBeenCalled()
+    })
+
+    it('should only invalidate categories that exist in cache', async () => {
+      const actions = useMediaAssetActions()
+
+      // hasCategory returns false for 'unknown-category'
+      mockHasCategory.mockImplementation((tag: string) => tag === 'checkpoints')
+
+      const assets = [
+        createMockAsset({ id: '1', tags: ['models', 'checkpoints'] }),
+        createMockAsset({ id: '2', tags: ['models', 'unknown-category'] })
+      ]
+
+      mockShowDialog.mockImplementation(
+        ({ props }: { props: { onConfirm: () => Promise<void> } }) => {
+          void props.onConfirm()
+        }
+      )
+
+      await actions.deleteAssets(assets)
+
+      // Only checkpoints should be invalidated (unknown-category not in cache)
+      expect(mockInvalidateModelsForCategory).toHaveBeenCalledTimes(1)
+      expect(mockInvalidateModelsForCategory).toHaveBeenCalledWith(
+        'checkpoints'
+      )
+    })
+  })
+})
diff --git a/src/platform/assets/composables/useMediaAssetActions.ts b/src/platform/assets/composables/useMediaAssetActions.ts
index ec17364d19..0dfd7c7733 100644
--- a/src/platform/assets/composables/useMediaAssetActions.ts
+++ b/src/platform/assets/composables/useMediaAssetActions.ts
@@ -20,10 +20,14 @@ import { createAnnotatedPath } from '@/utils/createAnnotatedPath'
 import { detectNodeTypeFromFilename } from '@/utils/loaderNodeUtil'
 import { isResultItemType } from '@/utils/typeGuardUtil'
 
+import { useAssetExportStore } from '@/stores/assetExportStore'
+
 import type { AssetItem } from '../schemas/assetSchema'
 import { MediaAssetKey } from '../schemas/mediaAssetSchema'
 import { assetService } from '../services/assetService'
 
+const EXCLUDED_TAGS = new Set(['models', 'input', 'output'])
+
 export function useMediaAssetActions() {
   const { t } = useI18n()
   const toast = useToast()
@@ -44,12 +48,12 @@ export function useMediaAssetActions() {
     assetType: string
   ): Promise<void> => {
     if (assetType === 'output') {
-      const promptId =
-        asset.id || getOutputAssetMetadata(asset.user_metadata)?.promptId
-      if (!promptId) {
-        throw new Error('Unable to extract prompt ID from asset')
+      const jobId =
+        getOutputAssetMetadata(asset.user_metadata)?.jobId || asset.id
+      if (!jobId) {
+        throw new Error('Unable to extract job ID from asset')
       }
-      await api.deleteItem('history', promptId)
+      await api.deleteItem('history', jobId)
     } else {
       // Input assets can only be deleted in cloud environment
       if (!isCloud) {
@@ -65,22 +69,15 @@ export function useMediaAssetActions() {
 
     try {
       const filename = targetAsset.name
-      let downloadUrl: string
-
-      // In cloud, use preview_url directly (from cloud storage)
-      // In OSS/localhost, use the /view endpoint
-      if (isCloud && targetAsset.preview_url) {
-        downloadUrl = targetAsset.preview_url
-      } else {
-        downloadUrl = getAssetUrl(targetAsset)
-      }
+      // Prefer preview_url (already includes subfolder) with getAssetUrl as fallback
+      const downloadUrl = targetAsset.preview_url || getAssetUrl(targetAsset)
 
       downloadFile(downloadUrl, filename)
 
       toast.add({
         severity: 'success',
         summary: t('g.success'),
-        detail: t('mediaAsset.selection.downloadsStarted', { count: 1 }),
+        detail: t('mediaAsset.selection.downloadsStarted', 1),
         life: 2000
       })
     } catch (error) {
@@ -94,33 +91,34 @@ export function useMediaAssetActions() {
   }
 
   /**
-   * Download multiple assets at once
-   * @param assets Array of assets to download
+   * Download multiple assets at once.
+   * In cloud mode with 2+ assets, creates a ZIP export via the backend.
+   * Falls back to individual downloads in OSS mode or for single assets.
    */
   const downloadMultipleAssets = (assets: AssetItem[]) => {
     if (!assets || assets.length === 0) return
 
+    const hasMultiOutputJobs = assets.some((a) => {
+      const count = getOutputAssetMetadata(a.user_metadata)?.outputCount
+      return typeof count === 'number' && count > 1
+    })
+
+    if (isCloud && (assets.length > 1 || hasMultiOutputJobs)) {
+      void downloadMultipleAssetsAsZip(assets)
+      return
+    }
+
     try {
       assets.forEach((asset) => {
         const filename = asset.name
-        let downloadUrl: string
-
-        // In cloud, use preview_url directly (from GCS or other cloud storage)
-        // In OSS/localhost, use the /view endpoint
-        if (isCloud && asset.preview_url) {
-          downloadUrl = asset.preview_url
-        } else {
-          downloadUrl = getAssetUrl(asset)
-        }
+        const downloadUrl = asset.preview_url || getAssetUrl(asset)
         downloadFile(downloadUrl, filename)
       })
 
       toast.add({
         severity: 'success',
         summary: t('g.success'),
-        detail: t('mediaAsset.selection.downloadsStarted', {
-          count: assets.length
-        }),
+        detail: t('mediaAsset.selection.downloadsStarted', assets.length),
         life: 2000
       })
     } catch (error) {
@@ -134,68 +132,59 @@ export function useMediaAssetActions() {
     }
   }
 
-  /**
-   * Show confirmation dialog and delete asset if confirmed
-   * @param asset The asset to delete
-   * @returns true if the asset was deleted, false otherwise
-   */
-  const confirmDelete = async (asset: AssetItem): Promise<boolean> => {
-    const assetType = getAssetType(asset)
-
-    return new Promise((resolve) => {
-      dialogStore.showDialog({
-        key: 'delete-asset-confirmation',
-        title: t('mediaAsset.deleteAssetTitle'),
-        component: ConfirmationDialogContent,
-        props: {
-          message: t('mediaAsset.deleteAssetDescription'),
-          type: 'delete',
-          itemList: [asset.name],
-          onConfirm: async () => {
-            const success = await deleteAsset(asset, assetType)
-            resolve(success)
-          },
-          onCancel: () => {
-            resolve(false)
-          }
-        }
-      })
-    })
-  }
-
-  const deleteAsset = async (asset: AssetItem, assetType: string) => {
-    const assetsStore = useAssetsStore()
+  async function downloadMultipleAssetsAsZip(assets: AssetItem[]) {
+    const assetExportStore = useAssetExportStore()
 
     try {
-      // Perform the deletion
-      await deleteAssetApi(asset, assetType)
+      const jobIds: string[] = []
+      const assetIds: string[] = []
+      const jobAssetNameFilters: Record<string, string[]> = {}
 
-      // Update the appropriate store based on asset type
-      if (assetType === 'output') {
-        await assetsStore.updateHistory()
-      } else {
-        await assetsStore.updateInputs()
+      for (const asset of assets) {
+        if (getAssetType(asset) === 'output') {
+          const metadata = getOutputAssetMetadata(asset.user_metadata)
+          const jobId = metadata?.jobId || asset.id
+          if (!jobIds.includes(jobId)) {
+            jobIds.push(jobId)
+          }
+          if (metadata?.jobId && asset.name) {
+            if (!jobAssetNameFilters[metadata.jobId]) {
+              jobAssetNameFilters[metadata.jobId] = []
+            }
+            if (!jobAssetNameFilters[metadata.jobId].includes(asset.name)) {
+              jobAssetNameFilters[metadata.jobId].push(asset.name)
+            }
+          }
+        } else {
+          assetIds.push(asset.id)
+        }
       }
 
-      toast.add({
-        severity: 'success',
-        summary: t('g.success'),
-        detail: t('mediaAsset.assetDeletedSuccessfully'),
-        life: 2000
+      const result = await assetService.createAssetExport({
+        ...(jobIds.length > 0 ? { job_ids: jobIds } : {}),
+        ...(assetIds.length > 0 ? { asset_ids: assetIds } : {}),
+        ...(Object.keys(jobAssetNameFilters).length > 0
+          ? { job_asset_name_filters: jobAssetNameFilters }
+          : {}),
+        naming_strategy: 'preserve'
       })
-      return true
-    } catch (error) {
-      console.error('Failed to delete asset:', error)
-      const errorMessage = error instanceof Error ? error.message : ''
-      const isCloudWarning = errorMessage.includes('Cloud')
+
+      assetExportStore.trackExport(result.task_id)
 
       toast.add({
-        severity: isCloudWarning ? 'warn' : 'error',
-        summary: isCloudWarning ? t('g.warning') : t('g.error'),
-        detail: errorMessage || t('mediaAsset.failedToDeleteAsset'),
+        severity: 'info',
+        summary: t('exportToast.exportStarted'),
+        detail: t('mediaAsset.selection.exportStarted', assets.length),
+        life: 3000
+      })
+    } catch (error) {
+      console.error('Failed to create asset export:', error)
+      toast.add({
+        severity: 'error',
+        summary: t('g.error'),
+        detail: t('exportToast.exportFailedSingle'),
         life: 3000
       })
-      return false
     }
   }
 
@@ -203,11 +192,12 @@ export function useMediaAssetActions() {
     const targetAsset = asset ?? mediaContext?.asset.value
     if (!targetAsset) return
 
-    // Try asset.id first (OSS), then fall back to metadata (Cloud)
     const metadata = getOutputAssetMetadata(targetAsset.user_metadata)
-    const promptId = targetAsset.id || metadata?.promptId
+    const jobId =
+      metadata?.jobId ||
+      (getAssetType(targetAsset) === 'output' ? targetAsset.id : undefined)
 
-    if (!promptId) {
+    if (!jobId) {
       toast.add({
         severity: 'warn',
         summary: t('g.warning'),
@@ -217,7 +207,7 @@ export function useMediaAssetActions() {
       return
     }
 
-    await copyToClipboard(promptId)
+    await copyToClipboard(jobId)
   }
 
   /**
@@ -272,10 +262,17 @@ export function useMediaAssetActions() {
     const metadata = getOutputAssetMetadata(targetAsset.user_metadata)
     const assetType = getAssetType(targetAsset, 'input')
 
+    // In Cloud mode, use asset_hash (the actual stored filename)
+    // In OSS mode, use the original name
+    const filename =
+      isCloud && targetAsset.asset_hash
+        ? targetAsset.asset_hash
+        : targetAsset.name
+
     // Create annotated path for the asset
     const annotated = createAnnotatedPath(
       {
-        filename: targetAsset.name,
+        filename,
         subfolder: metadata?.subfolder || '',
         type: isResultItemType(assetType) ? assetType : undefined
       },
@@ -366,30 +363,251 @@ export function useMediaAssetActions() {
   }
 
   /**
-   * Delete multiple assets with confirmation dialog
-   * @param assets Array of assets to delete
+   * Add multiple assets to the current workflow
+   * Creates loader nodes for each asset
    */
-  const deleteMultipleAssets = async (assets: AssetItem[]) => {
+  const addMultipleToWorkflow = async (assets: AssetItem[]) => {
     if (!assets || assets.length === 0) return
 
-    const assetsStore = useAssetsStore()
+    const NODE_OFFSET = 50
+    let nodeIndex = 0
+    let succeeded = 0
+    let failed = 0
 
-    return new Promise<void>((resolve) => {
+    for (const asset of assets) {
+      const { nodeType, widgetName } = detectNodeTypeFromFilename(asset.name)
+
+      if (!nodeType || !widgetName) {
+        failed++
+        continue
+      }
+
+      const nodeDef = nodeDefStore.nodeDefsByName[nodeType]
+      if (!nodeDef) {
+        failed++
+        continue
+      }
+
+      const center = litegraphService.getCanvasCenter()
+      const node = litegraphService.addNodeOnGraph(nodeDef, {
+        pos: [
+          center[0] + nodeIndex * NODE_OFFSET,
+          center[1] + nodeIndex * NODE_OFFSET
+        ]
+      })
+
+      if (!node) {
+        failed++
+        continue
+      }
+
+      const metadata = getOutputAssetMetadata(asset.user_metadata)
+      const assetType = getAssetType(asset, 'input')
+
+      // In Cloud mode, use asset_hash (the actual stored filename)
+      // In OSS mode, use the original name
+      const filename =
+        isCloud && asset.asset_hash ? asset.asset_hash : asset.name
+
+      const annotated = createAnnotatedPath(
+        {
+          filename,
+          subfolder: metadata?.subfolder || '',
+          type: isResultItemType(assetType) ? assetType : undefined
+        },
+        {
+          rootFolder: isResultItemType(assetType) ? assetType : undefined
+        }
+      )
+
+      const widget = node.widgets?.find((w) => w.name === widgetName)
+      if (widget) {
+        widget.value = annotated
+        widget.callback?.(annotated)
+      }
+      node.graph?.setDirtyCanvas(true, true)
+      succeeded++
+      nodeIndex++
+    }
+
+    if (failed === 0) {
+      toast.add({
+        severity: 'success',
+        summary: t('g.success'),
+        detail: t('mediaAsset.selection.nodesAddedToWorkflow', {
+          count: succeeded
+        }),
+        life: 2000
+      })
+    } else if (succeeded === 0) {
+      toast.add({
+        severity: 'error',
+        summary: t('g.error'),
+        detail: t('mediaAsset.selection.failedToAddNodes'),
+        life: 3000
+      })
+    } else {
+      toast.add({
+        severity: 'warn',
+        summary: t('g.warning'),
+        detail: t('mediaAsset.selection.partialAddNodesSuccess', {
+          succeeded,
+          failed
+        }),
+        life: 3000
+      })
+    }
+  }
+
+  /**
+   * Open workflows from multiple assets in new tabs
+   */
+  const openMultipleWorkflows = async (assets: AssetItem[]) => {
+    if (!assets || assets.length === 0) return
+
+    let succeeded = 0
+    let failed = 0
+
+    for (const asset of assets) {
+      try {
+        const { workflow, filename } = await extractWorkflowFromAsset(asset)
+        const result = await workflowActions.openWorkflowAction(
+          workflow,
+          filename
+        )
+
+        if (result.success) {
+          succeeded++
+        } else {
+          failed++
+        }
+      } catch {
+        failed++
+      }
+    }
+
+    if (failed === 0) {
+      toast.add({
+        severity: 'success',
+        summary: t('g.success'),
+        detail: t('mediaAsset.selection.workflowsOpened', { count: succeeded }),
+        life: 2000
+      })
+    } else if (succeeded === 0) {
+      toast.add({
+        severity: 'warn',
+        summary: t('g.warning'),
+        detail: t('mediaAsset.selection.noWorkflowsFound'),
+        life: 3000
+      })
+    } else {
+      toast.add({
+        severity: 'warn',
+        summary: t('g.warning'),
+        detail: t('mediaAsset.selection.partialWorkflowsOpened', {
+          succeeded,
+          failed
+        }),
+        life: 3000
+      })
+    }
+  }
+
+  /**
+   * Export workflows from multiple assets as JSON files
+   */
+  const exportMultipleWorkflows = async (assets: AssetItem[]) => {
+    if (!assets || assets.length === 0) return
+
+    let succeeded = 0
+    let failed = 0
+
+    for (const asset of assets) {
+      try {
+        const { workflow, filename } = await extractWorkflowFromAsset(asset)
+        const result = await workflowActions.exportWorkflowAction(
+          workflow,
+          filename
+        )
+
+        if (result.success) {
+          succeeded++
+        } else {
+          failed++
+        }
+      } catch {
+        failed++
+      }
+    }
+
+    if (failed === 0) {
+      toast.add({
+        severity: 'success',
+        summary: t('g.success'),
+        detail: t('mediaAsset.selection.workflowsExported', {
+          count: succeeded
+        }),
+        life: 2000
+      })
+    } else if (succeeded === 0) {
+      toast.add({
+        severity: 'warn',
+        summary: t('g.warning'),
+        detail: t('mediaAsset.selection.noWorkflowsToExport'),
+        life: 3000
+      })
+    } else {
+      toast.add({
+        severity: 'warn',
+        summary: t('g.warning'),
+        detail: t('mediaAsset.selection.partialWorkflowsExported', {
+          succeeded,
+          failed
+        }),
+        life: 3000
+      })
+    }
+  }
+
+  /**
+   * Show confirmation dialog and delete asset(s) if confirmed
+   * @param assets Single asset or array of assets to delete
+   * @returns true if user confirmed and deletion was attempted, false if cancelled
+   */
+  const deleteAssets = async (
+    assets: AssetItem | AssetItem[]
+  ): Promise<boolean> => {
+    const assetArray = Array.isArray(assets) ? assets : [assets]
+    if (assetArray.length === 0) return false
+
+    const assetsStore = useAssetsStore()
+    const isSingle = assetArray.length === 1
+
+    return new Promise((resolve) => {
       dialogStore.showDialog({
-        key: 'delete-multiple-assets-confirmation',
-        title: t('mediaAsset.deleteSelectedTitle'),
+        key: 'delete-assets-confirmation',
+        title: isSingle
+          ? t('mediaAsset.deleteAssetTitle')
+          : t('mediaAsset.deleteSelectedTitle'),
         component: ConfirmationDialogContent,
         props: {
-          message: t('mediaAsset.deleteSelectedDescription', {
-            count: assets.length
-          }),
+          message: isSingle
+            ? t('mediaAsset.deleteAssetDescription')
+            : t('mediaAsset.deleteSelectedDescription', {
+                count: assetArray.length
+              }),
           type: 'delete',
-          itemList: assets.map((asset) => asset.name),
+          itemList: assetArray.map((asset) => asset.name),
           onConfirm: async () => {
+            // Show loading overlay for all assets being deleted
+            assetArray.forEach((asset) =>
+              assetsStore.setAssetDeleting(asset.id, true)
+            )
+
             try {
               // Delete all assets using Promise.allSettled to track individual results
               const results = await Promise.allSettled(
-                assets.map((asset) =>
+                assetArray.map((asset) =>
                   deleteAssetApi(asset, getAssetType(asset))
                 )
               )
@@ -403,16 +621,16 @@ export function useMediaAssetActions() {
               // Log failed deletions for debugging
               failed.forEach((result, index) => {
                 console.warn(
-                  `Failed to delete asset ${assets[index].name}:`,
+                  `Failed to delete asset ${assetArray[index].name}:`,
                   result.reason
                 )
               })
 
               // Update stores after deletions
-              const hasOutputAssets = assets.some(
+              const hasOutputAssets = assetArray.some(
                 (a) => getAssetType(a) === 'output'
               )
-              const hasInputAssets = assets.some(
+              const hasInputAssets = assetArray.some(
                 (a) => getAssetType(a) === 'input'
               )
 
@@ -423,27 +641,46 @@ export function useMediaAssetActions() {
                 await assetsStore.updateInputs()
               }
 
+              // Invalidate model caches for affected categories
+              const modelCategories = new Set<string>()
+
+              for (const asset of assetArray) {
+                for (const tag of asset.tags ?? []) {
+                  if (EXCLUDED_TAGS.has(tag)) continue
+                  if (assetsStore.hasCategory(tag)) {
+                    modelCategories.add(tag)
+                  }
+                }
+              }
+
+              for (const category of modelCategories) {
+                assetsStore.invalidateModelsForCategory(category)
+              }
+
               // Show appropriate feedback based on results
               if (failed.length === 0) {
-                // All succeeded
                 toast.add({
                   severity: 'success',
                   summary: t('g.success'),
-                  detail: t('mediaAsset.selection.assetsDeletedSuccessfully', {
-                    count: succeeded
-                  }),
+                  detail: isSingle
+                    ? t('mediaAsset.assetDeletedSuccessfully')
+                    : t(
+                        'mediaAsset.selection.assetsDeletedSuccessfully',
+                        succeeded
+                      ),
                   life: 2000
                 })
               } else if (succeeded === 0) {
-                // All failed
                 toast.add({
                   severity: 'error',
                   summary: t('g.error'),
-                  detail: t('mediaAsset.selection.failedToDeleteAssets'),
+                  detail: isSingle
+                    ? t('mediaAsset.failedToDeleteAsset')
+                    : t('mediaAsset.selection.failedToDeleteAssets'),
                   life: 3000
                 })
               } else {
-                // Partial success
+                // Partial success (only possible with multiple assets)
                 toast.add({
                   severity: 'warn',
                   summary: t('g.warning'),
@@ -459,15 +696,22 @@ export function useMediaAssetActions() {
               toast.add({
                 severity: 'error',
                 summary: t('g.error'),
-                detail: t('mediaAsset.selection.failedToDeleteAssets'),
+                detail: isSingle
+                  ? t('mediaAsset.failedToDeleteAsset')
+                  : t('mediaAsset.selection.failedToDeleteAssets'),
                 life: 3000
               })
+            } finally {
+              // Hide loading overlay for all assets
+              assetArray.forEach((asset) =>
+                assetsStore.setAssetDeleting(asset.id, false)
+              )
             }
 
-            resolve()
+            resolve(true)
           },
           onCancel: () => {
-            resolve()
+            resolve(false)
           }
         }
       })
@@ -477,12 +721,13 @@ export function useMediaAssetActions() {
   return {
     downloadAsset,
     downloadMultipleAssets,
-    confirmDelete,
-    deleteAsset,
-    deleteMultipleAssets,
+    deleteAssets,
     copyJobId,
     addWorkflow,
+    addMultipleToWorkflow,
     openWorkflow,
-    exportWorkflow
+    openMultipleWorkflows,
+    exportWorkflow,
+    exportMultipleWorkflows
   }
 }
diff --git a/src/platform/assets/composables/useModelTypes.ts b/src/platform/assets/composables/useModelTypes.ts
index a60d94813e..fecb5fdd47 100644
--- a/src/platform/assets/composables/useModelTypes.ts
+++ b/src/platform/assets/composables/useModelTypes.ts
@@ -46,9 +46,10 @@ const DISALLOWED_MODEL_TYPES = ['nlf'] as const
 export const useModelTypes = createSharedComposable(() => {
   const {
     state: modelTypes,
+    isReady,
     isLoading,
     error,
-    execute: fetchModelTypes
+    execute
   } = useAsyncState(
     async (): Promise<ModelTypeOption[]> => {
       const response = await api.getModelFolders()
@@ -74,6 +75,11 @@ export const useModelTypes = createSharedComposable(() => {
     }
   )
 
+  async function fetchModelTypes() {
+    if (isReady.value || isLoading.value) return
+    await execute()
+  }
+
   return {
     modelTypes,
     isLoading,
diff --git a/src/platform/assets/composables/useModelUpload.ts b/src/platform/assets/composables/useModelUpload.ts
index 86372473d4..af042b4dee 100644
--- a/src/platform/assets/composables/useModelUpload.ts
+++ b/src/platform/assets/composables/useModelUpload.ts
@@ -1,15 +1,14 @@
+import { computed } from 'vue'
+
 import { useFeatureFlags } from '@/composables/useFeatureFlags'
 import UploadModelDialog from '@/platform/assets/components/UploadModelDialog.vue'
 import UploadModelDialogHeader from '@/platform/assets/components/UploadModelDialogHeader.vue'
 import UploadModelUpgradeModal from '@/platform/assets/components/UploadModelUpgradeModal.vue'
 import UploadModelUpgradeModalHeader from '@/platform/assets/components/UploadModelUpgradeModalHeader.vue'
-import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
 import { useDialogStore } from '@/stores/dialogStore'
-import type { UseAsyncStateReturn } from '@vueuse/core'
-import { computed } from 'vue'
 
 export function useModelUpload(
-  execute?: UseAsyncStateReturn<AssetItem[], [], true>['execute']
+  onUploadSuccess?: () => Promise<unknown> | void
 ) {
   const dialogStore = useDialogStore()
   const { flags } = useFeatureFlags()
@@ -17,7 +16,6 @@ export function useModelUpload(
 
   function showUploadDialog() {
     if (!flags.privateModelsEnabled) {
-      // Show upgrade modal if private models are disabled
       dialogStore.showDialog({
         key: 'upload-model-upgrade',
         headerComponent: UploadModelUpgradeModalHeader,
@@ -25,25 +23,24 @@ export function useModelUpload(
         dialogComponentProps: {
           pt: {
             header: 'py-0! pl-0!',
-            content: 'p-0!'
+            content: 'p-0! overflow-y-hidden!'
           }
         }
       })
     } else {
-      // Show regular upload modal
       dialogStore.showDialog({
         key: 'upload-model',
         headerComponent: UploadModelDialogHeader,
         component: UploadModelDialog,
         props: {
           onUploadSuccess: async () => {
-            await execute?.()
+            await onUploadSuccess?.()
           }
         },
         dialogComponentProps: {
           pt: {
             header: 'py-0! pl-0!',
-            content: 'p-0!'
+            content: 'p-0! overflow-y-hidden!'
           }
         }
       })
diff --git a/src/platform/assets/composables/useOutputStacks.test.ts b/src/platform/assets/composables/useOutputStacks.test.ts
new file mode 100644
index 0000000000..3b89952622
--- /dev/null
+++ b/src/platform/assets/composables/useOutputStacks.test.ts
@@ -0,0 +1,205 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { ref } from 'vue'
+
+import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import type * as OutputAssetUtil from '@/platform/assets/utils/outputAssetUtil'
+import { useOutputStacks } from '@/platform/assets/composables/useOutputStacks'
+
+const mocks = vi.hoisted(() => ({
+  resolveOutputAssetItems: vi.fn()
+}))
+
+vi.mock('@/platform/assets/utils/outputAssetUtil', async (importOriginal) => {
+  const actual = await importOriginal<typeof OutputAssetUtil>()
+  return {
+    ...actual,
+    resolveOutputAssetItems: mocks.resolveOutputAssetItems
+  }
+})
+
+type Deferred<T> = {
+  promise: Promise<T>
+  resolve: (value: T) => void
+  reject: (reason?: unknown) => void
+}
+
+function createDeferred<T>(): Deferred<T> {
+  let resolve!: (value: T) => void
+  let reject!: (reason?: unknown) => void
+  const promise = new Promise<T>((resolveFn, rejectFn) => {
+    resolve = resolveFn
+    reject = rejectFn
+  })
+  return { promise, resolve, reject }
+}
+
+function createAsset(overrides: Partial<AssetItem> = {}): AssetItem {
+  return {
+    id: 'asset-1',
+    name: 'parent.png',
+    tags: [],
+    created_at: '2025-01-01T00:00:00.000Z',
+    user_metadata: {
+      jobId: 'job-1',
+      nodeId: 'node-1',
+      subfolder: 'outputs'
+    },
+    ...overrides
+  }
+}
+
+describe('useOutputStacks', () => {
+  beforeEach(() => {
+    vi.resetAllMocks()
+  })
+
+  it('expands stacks and exposes children as selectable assets', async () => {
+    const parent = createAsset({ id: 'parent', name: 'parent.png' })
+    const childA = createAsset({
+      id: 'child-a',
+      name: 'child-a.png',
+      user_metadata: undefined
+    })
+    const childB = createAsset({
+      id: 'child-b',
+      name: 'child-b.png',
+      user_metadata: undefined
+    })
+
+    vi.mocked(mocks.resolveOutputAssetItems).mockResolvedValue([childA, childB])
+
+    const { assetItems, isStackExpanded, selectableAssets, toggleStack } =
+      useOutputStacks({ assets: ref([parent]) })
+
+    await toggleStack(parent)
+
+    expect(mocks.resolveOutputAssetItems).toHaveBeenCalledWith(
+      expect.objectContaining({ jobId: 'job-1' }),
+      {
+        createdAt: parent.created_at,
+        excludeOutputKey: 'node-1-outputs-parent.png'
+      }
+    )
+    expect(isStackExpanded(parent)).toBe(true)
+    expect(assetItems.value.map((item) => item.asset.id)).toEqual([
+      parent.id,
+      childA.id,
+      childB.id
+    ])
+    expect(assetItems.value[1]).toMatchObject({
+      asset: childA,
+      isChild: true
+    })
+    expect(assetItems.value[2]).toMatchObject({
+      asset: childB,
+      isChild: true
+    })
+    expect(selectableAssets.value).toEqual([parent, childA, childB])
+  })
+
+  it('collapses an expanded stack when toggled again', async () => {
+    const parent = createAsset({ id: 'parent', name: 'parent.png' })
+    const child = createAsset({
+      id: 'child',
+      name: 'child.png',
+      user_metadata: undefined
+    })
+
+    vi.mocked(mocks.resolveOutputAssetItems).mockResolvedValue([child])
+
+    const { assetItems, isStackExpanded, toggleStack } = useOutputStacks({
+      assets: ref([parent])
+    })
+
+    await toggleStack(parent)
+    await toggleStack(parent)
+
+    expect(isStackExpanded(parent)).toBe(false)
+    expect(assetItems.value.map((item) => item.asset.id)).toEqual([parent.id])
+  })
+
+  it('ignores assets without stack metadata', async () => {
+    const asset = createAsset({
+      id: 'no-meta',
+      name: 'no-meta.png',
+      user_metadata: undefined
+    })
+
+    const { assetItems, isStackExpanded, toggleStack } = useOutputStacks({
+      assets: ref([asset])
+    })
+
+    await toggleStack(asset)
+
+    expect(mocks.resolveOutputAssetItems).not.toHaveBeenCalled()
+    expect(isStackExpanded(asset)).toBe(false)
+    expect(assetItems.value).toHaveLength(1)
+    expect(assetItems.value[0].asset).toMatchObject(asset)
+  })
+
+  it('does not expand when no children are resolved', async () => {
+    const parent = createAsset({ id: 'parent', name: 'parent.png' })
+
+    vi.mocked(mocks.resolveOutputAssetItems).mockResolvedValue([])
+
+    const { assetItems, isStackExpanded, toggleStack } = useOutputStacks({
+      assets: ref([parent])
+    })
+
+    await toggleStack(parent)
+
+    expect(isStackExpanded(parent)).toBe(false)
+    expect(assetItems.value.map((item) => item.asset.id)).toEqual([parent.id])
+  })
+
+  it('does not expand when resolving children throws', async () => {
+    const parent = createAsset({ id: 'parent', name: 'parent.png' })
+    const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
+
+    vi.mocked(mocks.resolveOutputAssetItems).mockRejectedValue(
+      new Error('resolve failed')
+    )
+
+    const { assetItems, isStackExpanded, toggleStack } = useOutputStacks({
+      assets: ref([parent])
+    })
+
+    await toggleStack(parent)
+
+    expect(isStackExpanded(parent)).toBe(false)
+    expect(assetItems.value.map((item) => item.asset.id)).toEqual([parent.id])
+
+    errorSpy.mockRestore()
+  })
+
+  it('guards against duplicate loads while a stack is resolving', async () => {
+    const parent = createAsset({ id: 'parent', name: 'parent.png' })
+    const child = createAsset({
+      id: 'child',
+      name: 'child.png',
+      user_metadata: undefined
+    })
+    const deferred = createDeferred<AssetItem[]>()
+
+    vi.mocked(mocks.resolveOutputAssetItems).mockReturnValue(deferred.promise)
+
+    const { assetItems, toggleStack } = useOutputStacks({
+      assets: ref([parent])
+    })
+
+    const firstToggle = toggleStack(parent)
+    const secondToggle = toggleStack(parent)
+
+    expect(mocks.resolveOutputAssetItems).toHaveBeenCalledTimes(1)
+
+    deferred.resolve([child])
+
+    await firstToggle
+    await secondToggle
+
+    expect(assetItems.value.map((item) => item.asset.id)).toEqual([
+      parent.id,
+      child.id
+    ])
+  })
+})
diff --git a/src/platform/assets/composables/useOutputStacks.ts b/src/platform/assets/composables/useOutputStacks.ts
new file mode 100644
index 0000000000..0651cc0f86
--- /dev/null
+++ b/src/platform/assets/composables/useOutputStacks.ts
@@ -0,0 +1,138 @@
+import { computed, ref } from 'vue'
+import type { Ref } from 'vue'
+
+import { getOutputAssetMetadata } from '@/platform/assets/schemas/assetMetadataSchema'
+import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import {
+  getOutputKey,
+  resolveOutputAssetItems
+} from '@/platform/assets/utils/outputAssetUtil'
+
+export type OutputStackListItem = {
+  key: string
+  asset: AssetItem
+  isChild?: boolean
+}
+
+type UseOutputStacksOptions = {
+  assets: Ref<AssetItem[]>
+}
+
+export function useOutputStacks({ assets }: UseOutputStacksOptions) {
+  const expandedStackJobIds = ref<Set<string>>(new Set())
+  const stackChildrenByJobId = ref<Record<string, AssetItem[]>>({})
+  const loadingStackJobIds = ref<Set<string>>(new Set())
+
+  const assetItems = computed<OutputStackListItem[]>(() => {
+    const items: OutputStackListItem[] = []
+
+    for (const asset of assets.value) {
+      const jobId = getStackJobId(asset)
+      items.push({
+        key: `asset-${asset.id}`,
+        asset
+      })
+
+      if (!jobId || !expandedStackJobIds.value.has(jobId)) {
+        continue
+      }
+
+      const children = stackChildrenByJobId.value[jobId] ?? []
+      for (const child of children) {
+        items.push({
+          key: `asset-${child.id}`,
+          asset: child,
+          isChild: true
+        })
+      }
+    }
+
+    return items
+  })
+
+  const selectableAssets = computed(() =>
+    assetItems.value.map((item) => item.asset)
+  )
+
+  function getStackJobId(asset: AssetItem): string | null {
+    const metadata = getOutputAssetMetadata(asset.user_metadata)
+    return metadata?.jobId ?? null
+  }
+
+  function isStackExpanded(asset: AssetItem): boolean {
+    const jobId = getStackJobId(asset)
+    if (!jobId) return false
+    return expandedStackJobIds.value.has(jobId)
+  }
+
+  async function toggleStack(asset: AssetItem) {
+    const jobId = getStackJobId(asset)
+    if (!jobId) return
+
+    if (expandedStackJobIds.value.has(jobId)) {
+      const next = new Set(expandedStackJobIds.value)
+      next.delete(jobId)
+      expandedStackJobIds.value = next
+      return
+    }
+
+    if (!stackChildrenByJobId.value[jobId]?.length) {
+      if (loadingStackJobIds.value.has(jobId)) {
+        return
+      }
+      const nextLoading = new Set(loadingStackJobIds.value)
+      nextLoading.add(jobId)
+      loadingStackJobIds.value = nextLoading
+
+      const children = await resolveStackChildren(asset)
+
+      const afterLoading = new Set(loadingStackJobIds.value)
+      afterLoading.delete(jobId)
+      loadingStackJobIds.value = afterLoading
+
+      if (!children.length) {
+        return
+      }
+
+      stackChildrenByJobId.value = {
+        ...stackChildrenByJobId.value,
+        [jobId]: children
+      }
+    }
+
+    const nextExpanded = new Set(expandedStackJobIds.value)
+    nextExpanded.add(jobId)
+    expandedStackJobIds.value = nextExpanded
+  }
+
+  async function resolveStackChildren(asset: AssetItem): Promise<AssetItem[]> {
+    const metadata = getOutputAssetMetadata(asset.user_metadata)
+    if (!metadata) {
+      return []
+    }
+
+    const excludeOutputKey =
+      getOutputKey({
+        nodeId: metadata.nodeId,
+        subfolder: metadata.subfolder,
+        filename: asset.name
+      }) ?? undefined
+
+    try {
+      return await resolveOutputAssetItems(metadata, {
+        createdAt: asset.created_at,
+        excludeOutputKey
+      })
+    } catch (error) {
+      console.error('Failed to resolve stack children:', error)
+      return []
+    }
+  }
+
+  return {
+    assetItems,
+    selectableAssets,
+    isStackExpanded,
+    toggleStack
+  }
+}
diff --git a/src/platform/assets/composables/useUploadModelWizard.ts b/src/platform/assets/composables/useUploadModelWizard.ts
index 2d97efd9c4..b82b4b8142 100644
--- a/src/platform/assets/composables/useUploadModelWizard.ts
+++ b/src/platform/assets/composables/useUploadModelWizard.ts
@@ -2,7 +2,6 @@ import type { Ref } from 'vue'
 import { computed, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 
-import { useFeatureFlags } from '@/composables/useFeatureFlags'
 import { st } from '@/i18n'
 import { civitaiImportSource } from '@/platform/assets/importSources/civitaiImportSource'
 import { huggingfaceImportSource } from '@/platform/assets/importSources/huggingfaceImportSource'
@@ -10,6 +9,7 @@ import type { AssetMetadata } from '@/platform/assets/schemas/assetSchema'
 import { assetService } from '@/platform/assets/services/assetService'
 import type { ImportSource } from '@/platform/assets/types/importSource'
 import { validateSourceUrl } from '@/platform/assets/utils/importSourceUtil'
+import { useAssetDownloadStore } from '@/stores/assetDownloadStore'
 import { useAssetsStore } from '@/stores/assetsStore'
 import { useModelToNodeStore } from '@/stores/modelToNodeStore'
 
@@ -29,12 +29,12 @@ interface ModelTypeOption {
 export function useUploadModelWizard(modelTypes: Ref<ModelTypeOption[]>) {
   const { t } = useI18n()
   const assetsStore = useAssetsStore()
+  const assetDownloadStore = useAssetDownloadStore()
   const modelToNodeStore = useModelToNodeStore()
-  const { flags } = useFeatureFlags()
   const currentStep = ref(1)
   const isFetchingMetadata = ref(false)
   const isUploading = ref(false)
-  const uploadStatus = ref<'idle' | 'uploading' | 'success' | 'error'>('idle')
+  const uploadStatus = ref<'processing' | 'success' | 'error'>()
   const uploadError = ref('')
 
   const wizardData = ref<WizardData>({
@@ -45,10 +45,10 @@ export function useUploadModelWizard(modelTypes: Ref<ModelTypeOption[]>) {
 
   const selectedModelType = ref<string>()
 
-  // Available import sources
-  const importSources: ImportSource[] = flags.huggingfaceModelImportEnabled
-    ? [civitaiImportSource, huggingfaceImportSource]
-    : [civitaiImportSource]
+  const importSources: ImportSource[] = [
+    civitaiImportSource,
+    huggingfaceImportSource
+  ]
 
   // Detected import source based on URL
   const detectedSource = computed(() => {
@@ -67,9 +67,9 @@ export function useUploadModelWizard(modelTypes: Ref<ModelTypeOption[]>) {
     }
   )
 
-  // Validation
+  // Validation - only enable Continue when URL matches a supported source
   const canFetchMetadata = computed(() => {
-    return wizardData.value.url.trim().length > 0
+    return detectedSource.value !== null
   })
 
   const canUploadModel = computed(() => {
@@ -154,11 +154,59 @@ export function useUploadModelWizard(modelTypes: Ref<ModelTypeOption[]>) {
     }
   }
 
-  async function uploadModel() {
-    if (!canUploadModel.value) return
+  async function uploadPreviewImage(
+    filename: string
+  ): Promise<string | undefined> {
+    if (!wizardData.value.previewImage) return undefined
+
+    try {
+      const baseFilename = filename.split('.')[0]
+      let extension = 'png'
+      const mimeMatch = wizardData.value.previewImage.match(
+        /^data:image\/([^;]+);/
+      )
+      if (mimeMatch) {
+        extension = mimeMatch[1] === 'jpeg' ? 'jpg' : mimeMatch[1]
+      }
+
+      const previewAsset = await assetService.uploadAssetFromBase64({
+        data: wizardData.value.previewImage,
+        name: `${baseFilename}_preview.${extension}`,
+        tags: ['preview']
+      })
+      return previewAsset.id
+    } catch (error) {
+      console.error('Failed to upload preview image:', error)
+      return undefined
+    }
+  }
+
+  async function refreshModelCaches() {
+    if (!selectedModelType.value) return
+
+    const providers = modelToNodeStore.getAllNodeProviders(
+      selectedModelType.value
+    )
+    const results = await Promise.allSettled(
+      providers.map((provider) =>
+        assetsStore.updateModelsForNodeType(provider.nodeDef.name)
+      )
+    )
+    results.forEach((result, index) => {
+      if (result.status === 'rejected') {
+        console.error(
+          `Failed to refresh ${providers[index].nodeDef.name}:`,
+          result.reason
+        )
+      }
+    })
+  }
+
+  async function uploadModel(): Promise<boolean> {
+    if (!canUploadModel.value) {
+      return false
+    }
 
-    // Defensive check: detectedSource should be valid after fetchMetadata validation,
-    // but guard against edge cases (e.g., URL modified between steps)
     const source = detectedSource.value
     if (!source) {
       uploadError.value = t('assetBrowser.noValidSourceDetected')
@@ -166,7 +214,6 @@ export function useUploadModelWizard(modelTypes: Ref<ModelTypeOption[]>) {
     }
 
     isUploading.value = true
-    uploadStatus.value = 'uploading'
 
     try {
       const tags = selectedModelType.value
@@ -177,72 +224,44 @@ export function useUploadModelWizard(modelTypes: Ref<ModelTypeOption[]>) {
         wizardData.value.metadata?.name ||
         'model'
 
-      let previewId: string | undefined
-
-      // Upload preview image first if available
-      if (wizardData.value.previewImage) {
-        try {
-          const baseFilename = filename.split('.')[0]
-
-          // Extract extension from data URL MIME type
-          let extension = 'png'
-          const mimeMatch = wizardData.value.previewImage.match(
-            /^data:image\/([^;]+);/
-          )
-          if (mimeMatch) {
-            extension = mimeMatch[1] === 'jpeg' ? 'jpg' : mimeMatch[1]
-          }
-
-          const previewAsset = await assetService.uploadAssetFromBase64({
-            data: wizardData.value.previewImage,
-            name: `${baseFilename}_preview.${extension}`,
-            tags: ['preview']
-          })
-          previewId = previewAsset.id
-        } catch (error) {
-          console.error('Failed to upload preview image:', error)
-          // Continue with model upload even if preview fails
-        }
+      const previewId = await uploadPreviewImage(filename)
+      const userMetadata = {
+        source: source.type,
+        source_url: wizardData.value.url,
+        model_type: selectedModelType.value
       }
 
-      await assetService.uploadAssetFromUrl({
-        url: wizardData.value.url,
-        name: filename,
+      const result = await assetService.uploadAssetAsync({
+        source_url: wizardData.value.url,
         tags,
-        user_metadata: {
-          source: source.type,
-          source_url: wizardData.value.url,
-          model_type: selectedModelType.value
-        },
+        user_metadata: userMetadata,
         preview_id: previewId
       })
 
-      uploadStatus.value = 'success'
-      currentStep.value = 3
-
-      // Refresh model caches for all node types that use this model category
-      if (selectedModelType.value) {
-        const providers = modelToNodeStore.getAllNodeProviders(
-          selectedModelType.value
-        )
-        await Promise.all(
-          providers.map((provider) =>
-            assetsStore.updateModelsForNodeType(provider.nodeDef.name)
+      if (result.type === 'async' && result.task.status !== 'completed') {
+        if (selectedModelType.value) {
+          assetDownloadStore.trackDownload(
+            result.task.task_id,
+            selectedModelType.value,
+            filename
           )
-        )
+        }
+        uploadStatus.value = 'processing'
+      } else {
+        uploadStatus.value = 'success'
+        await refreshModelCaches()
       }
-
-      return true
+      currentStep.value = 3
     } catch (error) {
       console.error('Failed to upload asset:', error)
       uploadStatus.value = 'error'
       uploadError.value =
         error instanceof Error ? error.message : 'Failed to upload model'
       currentStep.value = 3
-      return false
     } finally {
       isUploading.value = false
     }
+    return uploadStatus.value !== 'error'
   }
 
   function goToPreviousStep() {
@@ -251,6 +270,20 @@ export function useUploadModelWizard(modelTypes: Ref<ModelTypeOption[]>) {
     }
   }
 
+  function resetWizard() {
+    currentStep.value = 1
+    isFetchingMetadata.value = false
+    isUploading.value = false
+    uploadStatus.value = undefined
+    uploadError.value = ''
+    wizardData.value = {
+      url: '',
+      name: '',
+      tags: []
+    }
+    selectedModelType.value = undefined
+  }
+
   return {
     // State
     currentStep,
@@ -269,6 +302,7 @@ export function useUploadModelWizard(modelTypes: Ref<ModelTypeOption[]>) {
     // Actions
     fetchMetadata,
     uploadModel,
-    goToPreviousStep
+    goToPreviousStep,
+    resetWizard
   }
 }
diff --git a/src/platform/assets/schemas/assetMetadataSchema.ts b/src/platform/assets/schemas/assetMetadataSchema.ts
index 1a9b02f820..86b4fd043c 100644
--- a/src/platform/assets/schemas/assetMetadataSchema.ts
+++ b/src/platform/assets/schemas/assetMetadataSchema.ts
@@ -6,7 +6,7 @@ import type { ResultItemImpl } from '@/stores/queueStore'
  * Extends Record<string, unknown> for compatibility with AssetItem schema
  */
 export interface OutputAssetMetadata extends Record<string, unknown> {
-  promptId: string
+  jobId: string
   nodeId: string | number
   subfolder: string
   executionTimeInSeconds?: number
@@ -24,7 +24,7 @@ function isOutputAssetMetadata(
 ): metadata is OutputAssetMetadata {
   if (!metadata) return false
   return (
-    typeof metadata.promptId === 'string' &&
+    typeof metadata.jobId === 'string' &&
     (typeof metadata.nodeId === 'string' || typeof metadata.nodeId === 'number')
   )
 }
diff --git a/src/platform/assets/schemas/assetSchema.ts b/src/platform/assets/schemas/assetSchema.ts
index 876cbf3874..d6941e18cf 100644
--- a/src/platform/assets/schemas/assetSchema.ts
+++ b/src/platform/assets/schemas/assetSchema.ts
@@ -10,10 +10,11 @@ const zAsset = z.object({
   tags: z.array(z.string()).optional().default([]),
   preview_id: z.string().nullable().optional(),
   preview_url: z.string().optional(),
-  created_at: z.string(),
+  created_at: z.string().optional(),
   updated_at: z.string().optional(),
   is_immutable: z.boolean().optional(),
   last_access_time: z.string().optional(),
+  metadata: z.record(z.unknown()).optional(), // API allows arbitrary key-value pairs
   user_metadata: z.record(z.unknown()).optional() // API allows arbitrary key-value pairs
 })
 
@@ -58,6 +59,17 @@ const zAssetMetadata = z.object({
   validation: zValidationResult.optional()
 })
 
+const zAsyncUploadTask = z.object({
+  task_id: z.string(),
+  status: z.enum(['created', 'running', 'completed', 'failed']),
+  message: z.string().optional()
+})
+
+const zAsyncUploadResponse = z.discriminatedUnion('type', [
+  z.object({ type: z.literal('sync'), asset: zAsset }),
+  z.object({ type: z.literal('async'), task: zAsyncUploadTask })
+])
+
 // Filename validation schema
 export const assetFilenameSchema = z
   .string()
@@ -69,14 +81,41 @@ export const assetFilenameSchema = z
 // Export schemas following repository patterns
 export const assetItemSchema = zAsset
 export const assetResponseSchema = zAssetResponse
+export const asyncUploadResponseSchema = zAsyncUploadResponse
 
 // Export types derived from Zod schemas
 export type AssetItem = z.infer<typeof zAsset>
 export type AssetResponse = z.infer<typeof zAssetResponse>
 export type AssetMetadata = z.infer<typeof zAssetMetadata>
+export type AsyncUploadResponse = z.infer<typeof zAsyncUploadResponse>
 export type ModelFolder = z.infer<typeof zModelFolder>
 export type ModelFile = z.infer<typeof zModelFile>
 
+/** Payload for updating an asset via PUT /assets/:id */
+export type AssetUpdatePayload = Partial<
+  Pick<AssetItem, 'name' | 'tags' | 'user_metadata'>
+>
+
+/** User-editable metadata fields for model assets */
+const zAssetUserMetadata = z.object({
+  name: z.string().optional(),
+  base_model: z.array(z.string()).optional(),
+  additional_tags: z.array(z.string()).optional(),
+  user_description: z.string().optional()
+})
+
+export type AssetUserMetadata = z.infer<typeof zAssetUserMetadata>
+
+export const tagsOperationResultSchema = z.object({
+  total_tags: z.array(z.string()),
+  added: z.array(z.string()).optional(),
+  removed: z.array(z.string()).optional(),
+  already_present: z.array(z.string()).optional(),
+  not_present: z.array(z.string()).optional()
+})
+
+export type TagsOperationResult = z.infer<typeof tagsOperationResultSchema>
+
 // Legacy interface for backward compatibility (now aligned with Zod schema)
 export interface ModelFolderInfo {
   name: string
diff --git a/src/platform/assets/schemas/mediaAssetSchema.ts b/src/platform/assets/schemas/mediaAssetSchema.ts
index 818db6b4a2..acd909e001 100644
--- a/src/platform/assets/schemas/mediaAssetSchema.ts
+++ b/src/platform/assets/schemas/mediaAssetSchema.ts
@@ -3,7 +3,14 @@ import { z } from 'zod'
 
 import { assetItemSchema } from './assetSchema'
 
-const zMediaKindSchema = z.enum(['video', 'audio', 'image', '3D'])
+const zMediaKindSchema = z.enum([
+  'video',
+  'audio',
+  'image',
+  '3D',
+  'text',
+  'other'
+])
 export type MediaKind = z.infer<typeof zMediaKindSchema>
 
 const zDimensionsSchema = z.object({
diff --git a/src/platform/assets/services/assetService.test.ts b/src/platform/assets/services/assetService.test.ts
new file mode 100644
index 0000000000..2a8c525b07
--- /dev/null
+++ b/src/platform/assets/services/assetService.test.ts
@@ -0,0 +1,106 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { assetService } from '@/platform/assets/services/assetService'
+
+const mockDistributionState = vi.hoisted(() => ({ isCloud: false }))
+const mockSettingStoreGet = vi.hoisted(() => vi.fn(() => false))
+
+vi.mock('@/platform/distribution/types', () => ({
+  get isCloud() {
+    return mockDistributionState.isCloud
+  }
+}))
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: vi.fn(() => ({
+    get: mockSettingStoreGet
+  }))
+}))
+
+vi.mock('@/stores/modelToNodeStore', () => {
+  const registeredNodeTypes: Record<string, string> = {
+    CheckpointLoaderSimple: 'ckpt_name',
+    LoraLoader: 'lora_name'
+  }
+  return {
+    useModelToNodeStore: vi.fn(() => ({
+      getRegisteredNodeTypes: () => registeredNodeTypes,
+      getCategoryForNodeType: vi.fn()
+    }))
+  }
+})
+
+vi.mock('@/scripts/api', () => ({
+  api: {
+    fetchApi: vi.fn()
+  }
+}))
+
+vi.mock('@/i18n', () => ({
+  st: vi.fn((_key: string, fallback: string) => fallback)
+}))
+
+describe(assetService.shouldUseAssetBrowser, () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockDistributionState.isCloud = false
+    mockSettingStoreGet.mockReturnValue(false)
+  })
+
+  it('returns false when not on cloud', () => {
+    mockDistributionState.isCloud = false
+    mockSettingStoreGet.mockReturnValue(true)
+
+    expect(
+      assetService.shouldUseAssetBrowser('CheckpointLoaderSimple', 'ckpt_name')
+    ).toBe(false)
+  })
+
+  it('returns false when asset API setting is disabled', () => {
+    mockDistributionState.isCloud = true
+    mockSettingStoreGet.mockReturnValue(false)
+
+    expect(
+      assetService.shouldUseAssetBrowser('CheckpointLoaderSimple', 'ckpt_name')
+    ).toBe(false)
+  })
+
+  it('returns false when node type is not eligible', () => {
+    mockDistributionState.isCloud = true
+    mockSettingStoreGet.mockReturnValue(true)
+
+    expect(
+      assetService.shouldUseAssetBrowser('UnknownNode', 'some_input')
+    ).toBe(false)
+  })
+
+  it('returns true when cloud, setting enabled, and node is eligible', () => {
+    mockDistributionState.isCloud = true
+    mockSettingStoreGet.mockReturnValue(true)
+
+    expect(
+      assetService.shouldUseAssetBrowser('CheckpointLoaderSimple', 'ckpt_name')
+    ).toBe(true)
+  })
+
+  it('returns false when nodeType is undefined', () => {
+    mockDistributionState.isCloud = true
+    mockSettingStoreGet.mockReturnValue(true)
+
+    expect(assetService.shouldUseAssetBrowser(undefined, 'ckpt_name')).toBe(
+      false
+    )
+  })
+
+  it('returns false when widget name does not match registered input', () => {
+    mockDistributionState.isCloud = true
+    mockSettingStoreGet.mockReturnValue(true)
+
+    expect(
+      assetService.shouldUseAssetBrowser(
+        'CheckpointLoaderSimple',
+        'wrong_input'
+      )
+    ).toBe(false)
+  })
+})
diff --git a/src/platform/assets/services/assetService.ts b/src/platform/assets/services/assetService.ts
index b1a15a433e..d85a44aec3 100644
--- a/src/platform/assets/services/assetService.ts
+++ b/src/platform/assets/services/assetService.ts
@@ -1,25 +1,55 @@
 import { fromZodError } from 'zod-validation-error'
 
 import { st } from '@/i18n'
+
 import {
   assetItemSchema,
-  assetResponseSchema
+  assetResponseSchema,
+  asyncUploadResponseSchema,
+  tagsOperationResultSchema
 } from '@/platform/assets/schemas/assetSchema'
 import type {
   AssetItem,
   AssetMetadata,
   AssetResponse,
+  AssetUpdatePayload,
+  AsyncUploadResponse,
   ModelFile,
-  ModelFolder
+  ModelFolder,
+  TagsOperationResult
 } from '@/platform/assets/schemas/assetSchema'
+import { isCloud } from '@/platform/distribution/types'
+import { useSettingStore } from '@/platform/settings/settingStore'
 import { api } from '@/scripts/api'
 import { useModelToNodeStore } from '@/stores/modelToNodeStore'
 
+export interface PaginationOptions {
+  limit?: number
+  offset?: number
+}
+
+interface AssetRequestOptions extends PaginationOptions {
+  includeTags: string[]
+  includePublic?: boolean
+}
+
+interface AssetExportOptions {
+  job_ids?: string[]
+  asset_ids?: string[]
+  naming_strategy?:
+    | 'group_by_job_id'
+    | 'prepend_job_id'
+    | 'preserve'
+    | 'asset_id'
+  job_asset_name_filters?: Record<string, string[]>
+}
+
 /**
  * Maps CivitAI validation error codes to localized error messages
  */
 function getLocalizedErrorMessage(errorCode: string): string {
   const errorMessages: Record<string, string> = {
+    // Validation errors
     FILE_TOO_LARGE: st('assetBrowser.errorFileTooLarge', 'File too large'),
     FORMAT_NOT_ALLOWED: st(
       'assetBrowser.errorFormatNotAllowed',
@@ -36,6 +66,95 @@ function getLocalizedErrorMessage(errorCode: string): string {
     MODEL_TYPE_NOT_SUPPORTED: st(
       'assetBrowser.errorModelTypeNotSupported',
       'Model type not supported'
+    ),
+
+    // HTTP 400 - Bad Request
+    INVALID_URL: st('assetBrowser.errorInvalidUrl', 'Please provide a URL.'),
+    INVALID_URL_FORMAT: st(
+      'assetBrowser.errorInvalidUrlFormat',
+      'The URL format is invalid. Please check and try again.'
+    ),
+    UNSUPPORTED_SOURCE: st(
+      'assetBrowser.errorUnsupportedSource',
+      'This URL is not supported. Only Hugging Face and Civitai URLs are allowed.'
+    ),
+
+    // HTTP 401 - Unauthorized
+    UNAUTHORIZED: st(
+      'assetBrowser.errorUnauthorized',
+      'Please sign in to continue.'
+    ),
+
+    // HTTP 422 - External Source Errors
+    USER_TOKEN_INVALID: st(
+      'assetBrowser.errorUserTokenInvalid',
+      'Your stored API token is invalid or expired. Please update your token in settings.'
+    ),
+    USER_TOKEN_ACCESS_DENIED: st(
+      'assetBrowser.errorUserTokenAccessDenied',
+      'Your API token does not have access to this resource. Please check your token permissions.'
+    ),
+    UNAUTHORIZED_SOURCE: st(
+      'assetBrowser.errorUnauthorizedSource',
+      'This resource requires authentication. Please add your API token in settings.'
+    ),
+    ACCESS_FORBIDDEN: st(
+      'assetBrowser.errorAccessForbidden',
+      'Access to this resource is forbidden.'
+    ),
+    RESOURCE_NOT_FOUND: st(
+      'assetBrowser.errorResourceNotFound',
+      'The file was not found. Please check the URL and try again.'
+    ),
+    RATE_LIMITED: st(
+      'assetBrowser.errorRateLimited',
+      'Too many requests. Please try again in a few minutes.'
+    ),
+    SOURCE_SERVER_ERROR: st(
+      'assetBrowser.errorSourceServerError',
+      'The source server is experiencing issues. Please try again later.'
+    ),
+    NETWORK_TIMEOUT: st(
+      'assetBrowser.errorNetworkTimeout',
+      'Request timed out. Please try again.'
+    ),
+    CONNECTION_REFUSED: st(
+      'assetBrowser.errorConnectionRefused',
+      'Unable to connect to the source. Please try again later.'
+    ),
+    INVALID_HOST: st(
+      'assetBrowser.errorInvalidHost',
+      'The source URL hostname could not be resolved.'
+    ),
+    NETWORK_ERROR: st(
+      'assetBrowser.errorNetworkError',
+      'A network error occurred. Please check your connection and try again.'
+    ),
+    REQUEST_CANCELLED: st(
+      'assetBrowser.errorRequestCancelled',
+      'Request was cancelled.'
+    ),
+    DOWNLOAD_CANCELLED: st(
+      'assetBrowser.errorDownloadCancelled',
+      'Download was cancelled.'
+    ),
+    METADATA_FETCH_FAILED: st(
+      'assetBrowser.errorMetadataFetchFailed',
+      'Failed to fetch file information from the source.'
+    ),
+    HTTP_ERROR: st(
+      'assetBrowser.errorHttpError',
+      'An error occurred while fetching metadata.'
+    ),
+
+    // HTTP 500 - Internal Server Errors
+    SERVICE_UNAVAILABLE: st(
+      'assetBrowser.errorServiceUnavailable',
+      'Service temporarily unavailable. Please try again later.'
+    ),
+    INTERNAL_ERROR: st(
+      'assetBrowser.errorInternalError',
+      'An unexpected error occurred. Please try again.'
     )
   }
   return (
@@ -46,6 +165,8 @@ function getLocalizedErrorMessage(errorCode: string): string {
 }
 
 const ASSETS_ENDPOINT = '/assets'
+const ASSETS_DOWNLOAD_ENDPOINT = '/assets/download'
+const ASSETS_EXPORT_ENDPOINT = '/assets/export'
 const EXPERIMENTAL_WARNING = `EXPERIMENTAL: If you are seeing this please make sure "Comfy.Assets.UseAssetAPI" is set to "false" in your ComfyUI Settings.\n`
 const DEFAULT_LIMIT = 500
 
@@ -74,9 +195,27 @@ function createAssetService() {
    * Handles API response with consistent error handling and Zod validation
    */
   async function handleAssetRequest(
-    url: string,
+    options: AssetRequestOptions,
     context: string
   ): Promise<AssetResponse> {
+    const {
+      includeTags,
+      limit = DEFAULT_LIMIT,
+      offset,
+      includePublic
+    } = options
+    const queryParams = new URLSearchParams({
+      include_tags: includeTags.join(','),
+      limit: limit.toString()
+    })
+    if (offset !== undefined && offset > 0) {
+      queryParams.set('offset', offset.toString())
+    }
+    if (includePublic !== undefined) {
+      queryParams.set('include_public', includePublic ? 'true' : 'false')
+    }
+
+    const url = `${ASSETS_ENDPOINT}?${queryParams.toString()}`
     const res = await api.fetchApi(url)
     if (!res.ok) {
       throw new Error(
@@ -98,7 +237,7 @@ function createAssetService() {
    */
   async function getAssetModelFolders(): Promise<ModelFolder[]> {
     const data = await handleAssetRequest(
-      `${ASSETS_ENDPOINT}?include_tags=${MODELS_TAG}&limit=${DEFAULT_LIMIT}`,
+      { includeTags: [MODELS_TAG] },
       'model folders'
     )
 
@@ -127,7 +266,7 @@ function createAssetService() {
    */
   async function getAssetModels(folder: string): Promise<ModelFile[]> {
     const data = await handleAssetRequest(
-      `${ASSETS_ENDPOINT}?include_tags=${MODELS_TAG},${folder}&limit=${DEFAULT_LIMIT}`,
+      { includeTags: [MODELS_TAG, folder] },
       `models for ${folder}`
     )
 
@@ -161,14 +300,43 @@ function createAssetService() {
     )
   }
 
+  /**
+   * Checks if the asset API is enabled (cloud environment + user setting).
+   */
+  function isAssetAPIEnabled(): boolean {
+    if (!isCloud) return false
+    return !!useSettingStore().get('Comfy.Assets.UseAssetAPI')
+  }
+
+  /**
+   * Checks if the asset browser should be used for a given node input.
+   * Combines the cloud environment check, user setting, and eligibility check.
+   *
+   * @param nodeType - The ComfyUI node comfyClass
+   * @param widgetName - The name of the widget to check
+   * @returns true if this input should use the asset browser
+   */
+  function shouldUseAssetBrowser(
+    nodeType: string | undefined,
+    widgetName: string
+  ): boolean {
+    return isAssetAPIEnabled() && isAssetBrowserEligible(nodeType, widgetName)
+  }
+
   /**
    * Gets assets for a specific node type by finding the matching category
    * and fetching all assets with that category tag
    *
    * @param nodeType - The ComfyUI node type (e.g., 'CheckpointLoaderSimple')
+   * @param options - Pagination options
+   * @param options.limit - Maximum number of assets to return (default: 500)
+   * @param options.offset - Number of assets to skip (default: 0)
    * @returns Promise<AssetItem[]> - Full asset objects with preserved metadata
    */
-  async function getAssetsForNodeType(nodeType: string): Promise<AssetItem[]> {
+  async function getAssetsForNodeType(
+    nodeType: string,
+    { limit = DEFAULT_LIMIT, offset = 0 }: PaginationOptions = {}
+  ): Promise<AssetItem[]> {
     if (!nodeType || typeof nodeType !== 'string') {
       return []
     }
@@ -183,7 +351,7 @@ function createAssetService() {
 
     // Fetch assets for this category using same API pattern as getAssetModels
     const data = await handleAssetRequest(
-      `${ASSETS_ENDPOINT}?include_tags=${MODELS_TAG},${category}&limit=${DEFAULT_LIMIT}`,
+      { includeTags: [MODELS_TAG, category], limit, offset },
       `assets for ${nodeType}`
     )
 
@@ -239,23 +407,10 @@ function createAssetService() {
   async function getAssetsByTag(
     tag: string,
     includePublic: boolean = true,
-    {
-      limit = DEFAULT_LIMIT,
-      offset = 0
-    }: { limit?: number; offset?: number } = {}
+    { limit = DEFAULT_LIMIT, offset = 0 }: PaginationOptions = {}
   ): Promise<AssetItem[]> {
-    const queryParams = new URLSearchParams({
-      include_tags: tag,
-      limit: limit.toString(),
-      include_public: includePublic ? 'true' : 'false'
-    })
-
-    if (offset > 0) {
-      queryParams.set('offset', offset.toString())
-    }
-
     const data = await handleAssetRequest(
-      `${ASSETS_ENDPOINT}?${queryParams.toString()}`,
+      { includeTags: [tag], limit, offset, includePublic },
       `assets for tag ${tag}`
     )
 
@@ -295,7 +450,7 @@ function createAssetService() {
    */
   async function updateAsset(
     id: string,
-    newData: Partial<AssetMetadata>
+    newData: AssetUpdatePayload
   ): Promise<AssetItem> {
     const res = await api.fetchApi(`${ASSETS_ENDPOINT}/${id}`, {
       method: 'PUT',
@@ -369,7 +524,7 @@ function createAssetService() {
     url: string
     name: string
     tags?: string[]
-    user_metadata?: Record<string, any>
+    user_metadata?: Record<string, unknown>
     preview_id?: string
   }): Promise<AssetItem & { created_new: boolean }> {
     const res = await api.fetchApi(ASSETS_ENDPOINT, {
@@ -407,7 +562,7 @@ function createAssetService() {
     data: string
     name: string
     tags?: string[]
-    user_metadata?: Record<string, any>
+    user_metadata?: Record<string, unknown>
   }): Promise<AssetItem & { created_new: boolean }> {
     // Validate that data is a data URL
     if (!params.data || !params.data.startsWith('data:')) {
@@ -445,18 +600,179 @@ function createAssetService() {
     return await res.json()
   }
 
+  /**
+   * Add tags to an asset
+   * @param id - The asset ID (UUID)
+   * @param tags - Tags to add
+   * @returns Promise<TagsOperationResult>
+   */
+  async function addAssetTags(
+    id: string,
+    tags: string[]
+  ): Promise<TagsOperationResult> {
+    const res = await api.fetchApi(`${ASSETS_ENDPOINT}/${id}/tags`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ tags })
+    })
+
+    if (!res.ok) {
+      throw new Error(
+        `Unable to add tags to asset ${id}: Server returned ${res.status}`
+      )
+    }
+
+    const result = await res.json()
+    const parseResult = tagsOperationResultSchema.safeParse(result)
+    if (!parseResult.success) {
+      throw fromZodError(parseResult.error)
+    }
+    return parseResult.data
+  }
+
+  /**
+   * Remove tags from an asset
+   * @param id - The asset ID (UUID)
+   * @param tags - Tags to remove
+   * @returns Promise<TagsOperationResult>
+   */
+  async function removeAssetTags(
+    id: string,
+    tags: string[]
+  ): Promise<TagsOperationResult> {
+    const res = await api.fetchApi(`${ASSETS_ENDPOINT}/${id}/tags`, {
+      method: 'DELETE',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ tags })
+    })
+
+    if (!res.ok) {
+      throw new Error(
+        `Unable to remove tags from asset ${id}: Server returned ${res.status}`
+      )
+    }
+
+    const result = await res.json()
+    const parseResult = tagsOperationResultSchema.safeParse(result)
+    if (!parseResult.success) {
+      throw fromZodError(parseResult.error)
+    }
+    return parseResult.data
+  }
+
+  /**
+   * Uploads an asset asynchronously using the /api/assets/download endpoint
+   * Returns immediately with either the asset (if already exists) or a task to track
+   *
+   * @param params - Upload parameters
+   * @param params.source_url - HTTP/HTTPS URL to download from
+   * @param params.tags - Optional freeform tags
+   * @param params.user_metadata - Optional custom metadata object
+   * @param params.preview_id - Optional UUID for preview asset
+   * @returns Promise<AsyncUploadResponse> - Either sync asset or async task info
+   * @throws Error if upload fails
+   */
+  async function uploadAssetAsync(params: {
+    source_url: string
+    tags?: string[]
+    user_metadata?: Record<string, unknown>
+    preview_id?: string
+  }): Promise<AsyncUploadResponse> {
+    const res = await api.fetchApi(ASSETS_DOWNLOAD_ENDPOINT, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(params)
+    })
+
+    if (!res.ok) {
+      throw new Error(
+        st(
+          'assetBrowser.errorUploadFailed',
+          'Failed to upload asset. Please try again.'
+        )
+      )
+    }
+
+    const data = await res.json()
+
+    if (res.status === 202) {
+      const result = asyncUploadResponseSchema.safeParse({
+        type: 'async',
+        task: data
+      })
+      if (!result.success) {
+        throw new Error(
+          st(
+            'assetBrowser.errorUploadFailed',
+            'Failed to parse async upload response. Please try again.'
+          )
+        )
+      }
+      return result.data
+    }
+
+    const result = asyncUploadResponseSchema.safeParse({
+      type: 'sync',
+      asset: data
+    })
+    if (!result.success) {
+      throw new Error(
+        st(
+          'assetBrowser.errorUploadFailed',
+          'Failed to parse sync upload response. Please try again.'
+        )
+      )
+    }
+    return result.data
+  }
+
+  async function createAssetExport(
+    params: AssetExportOptions
+  ): Promise<{ task_id: string; status: string; message?: string }> {
+    const res = await api.fetchApi(ASSETS_EXPORT_ENDPOINT, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(params)
+    })
+
+    if (!res.ok) {
+      throw new Error(`Failed to create asset export: ${res.status}`)
+    }
+
+    return await res.json()
+  }
+
+  async function getExportDownloadUrl(
+    exportName: string
+  ): Promise<{ url: string; expires_at?: string }> {
+    const res = await api.fetchApi(`/assets/exports/${exportName}`)
+
+    if (!res.ok) {
+      throw new Error(`Failed to get export download URL: ${res.status}`)
+    }
+
+    return await res.json()
+  }
+
   return {
     getAssetModelFolders,
     getAssetModels,
+    isAssetAPIEnabled,
     isAssetBrowserEligible,
+    shouldUseAssetBrowser,
     getAssetsForNodeType,
     getAssetDetails,
     getAssetsByTag,
     deleteAsset,
     updateAsset,
+    addAssetTags,
+    removeAssetTags,
     getAssetMetadata,
     uploadAssetFromUrl,
-    uploadAssetFromBase64
+    uploadAssetFromBase64,
+    uploadAssetAsync,
+    createAssetExport,
+    getExportDownloadUrl
   }
 }
 
diff --git a/src/platform/assets/types/filterTypes.ts b/src/platform/assets/types/filterTypes.ts
new file mode 100644
index 0000000000..0e6e8173a8
--- /dev/null
+++ b/src/platform/assets/types/filterTypes.ts
@@ -0,0 +1,48 @@
+/**
+ * Asset filtering and sorting types
+ * Shared across AssetBrowser, AssetFilterBar, and widget dropdowns
+ */
+
+/**
+ * Generic filter/select option used across components
+ * Compatible with SelectOption (name/value) pattern
+ */
+export interface FilterOption {
+  name: string
+  value: string
+}
+
+/**
+ * Ownership filter options for assets
+ * - 'all': Show all assets
+ * - 'my-models': Show only user-owned assets (is_immutable === false)
+ * - 'public-models': Show only public assets (is_immutable === true)
+ */
+export type OwnershipOption = 'all' | 'my-models' | 'public-models'
+
+/**
+ * Ownership filter option for dropdowns/selects
+ */
+export interface OwnershipFilterOption {
+  name: string
+  value: OwnershipOption
+}
+
+/**
+ * Sort options for asset lists
+ * - 'default': Preserve original order (no sorting)
+ * - 'recent': Sort by created_at descending
+ * - 'name-asc': Sort by display name A-Z
+ * - 'name-desc': Sort by display name Z-A
+ */
+export type AssetSortOption = 'default' | 'recent' | 'name-asc' | 'name-desc'
+
+/**
+ * Filter state for asset browser and filter bar
+ */
+export interface AssetFilterState {
+  fileFormats: string[]
+  baseModels: string[]
+  sortBy: AssetSortOption
+  ownership: OwnershipOption
+}
diff --git a/src/platform/assets/utils/assetFilterUtils.test.ts b/src/platform/assets/utils/assetFilterUtils.test.ts
new file mode 100644
index 0000000000..24d35e90e1
--- /dev/null
+++ b/src/platform/assets/utils/assetFilterUtils.test.ts
@@ -0,0 +1,181 @@
+import { describe, expect, it } from 'vitest'
+
+import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+
+import {
+  filterByBaseModels,
+  filterByCategory,
+  filterByFileFormats,
+  filterByOwnership,
+  filterItemByBaseModels,
+  filterItemByOwnership
+} from './assetFilterUtils'
+
+function createAsset(
+  name: string,
+  options: Partial<AssetItem> = {}
+): AssetItem {
+  return {
+    id: `asset-${name}`,
+    name,
+    tags: [],
+    is_immutable: false,
+    ...options
+  } satisfies AssetItem
+}
+
+describe('filterByCategory', () => {
+  it.for([
+    { category: 'all', tags: ['checkpoint'], expected: true },
+    { category: 'checkpoint', tags: ['checkpoint'], expected: true },
+    { category: 'lora', tags: ['checkpoint'], expected: false },
+    {
+      category: 'checkpoint',
+      tags: ['models', 'checkpoint/xl'],
+      expected: true
+    },
+    { category: 'xl', tags: ['models', 'checkpoint/xl'], expected: false }
+  ])(
+    'category=$category with tags=$tags returns $expected',
+    ({ category, tags, expected }) => {
+      const filter = filterByCategory(category)
+      const asset = createAsset('model.safetensors', { tags })
+      expect(filter(asset)).toBe(expected)
+    }
+  )
+})
+
+describe('filterByFileFormats', () => {
+  it.for([
+    { formats: [], name: 'model.safetensors', expected: true },
+    { formats: ['safetensors'], name: 'model.safetensors', expected: true },
+    { formats: ['ckpt'], name: 'model.safetensors', expected: false },
+    { formats: ['safetensors'], name: 'MODEL.SAFETENSORS', expected: true },
+    { formats: ['safetensors'], name: 'model', expected: false }
+  ])(
+    'formats=$formats with name=$name returns $expected',
+    ({ formats, name, expected }) => {
+      const filter = filterByFileFormats(formats)
+      const asset = createAsset(name)
+      expect(filter(asset)).toBe(expected)
+    }
+  )
+
+  it('matches any of multiple formats', () => {
+    const filter = filterByFileFormats(['safetensors', 'ckpt', 'bin'])
+    expect(filter(createAsset('model.safetensors'))).toBe(true)
+    expect(filter(createAsset('model.ckpt'))).toBe(true)
+    expect(filter(createAsset('model.bin'))).toBe(true)
+  })
+})
+
+describe('filterByBaseModels', () => {
+  it.for([
+    { models: [], expected: true },
+    { models: new Set<string>(), expected: true }
+  ])('empty models ($models) returns true', ({ models }) => {
+    const filter = filterByBaseModels(models)
+    const asset = createAsset('model.safetensors')
+    expect(filter(asset)).toBe(true)
+  })
+
+  it.for([
+    {
+      models: ['SDXL'],
+      metadata: { base_model: ['SDXL'] },
+      expected: true
+    },
+    {
+      models: ['SDXL'],
+      metadata: { base_model: ['SD1.5'] },
+      expected: false
+    },
+    {
+      models: new Set(['SDXL', 'SD1.5']),
+      metadata: { base_model: ['SDXL'] },
+      expected: true
+    }
+  ])(
+    'models=$models with metadata.base_model returns $expected',
+    ({ models, metadata, expected }) => {
+      const filter = filterByBaseModels(models)
+      const asset = createAsset('model.safetensors', { metadata })
+      expect(filter(asset)).toBe(expected)
+    }
+  )
+
+  it('matches base model in user_metadata', () => {
+    const filter = filterByBaseModels(['SD1.5'])
+    const asset = createAsset('model.safetensors', {
+      user_metadata: { base_model: ['SD1.5'] }
+    })
+    expect(filter(asset)).toBe(true)
+  })
+})
+
+describe('filterByOwnership', () => {
+  it.for([
+    { ownership: 'all' as const, is_immutable: true, expected: true },
+    { ownership: 'all' as const, is_immutable: false, expected: true },
+    { ownership: 'my-models' as const, is_immutable: false, expected: true },
+    { ownership: 'my-models' as const, is_immutable: true, expected: false },
+    {
+      ownership: 'public-models' as const,
+      is_immutable: true,
+      expected: true
+    },
+    {
+      ownership: 'public-models' as const,
+      is_immutable: false,
+      expected: false
+    }
+  ])(
+    'ownership=$ownership with is_immutable=$is_immutable returns $expected',
+    ({ ownership, is_immutable, expected }) => {
+      const filter = filterByOwnership(ownership)
+      const asset = createAsset('model', { is_immutable })
+      expect(filter(asset)).toBe(expected)
+    }
+  )
+})
+
+describe('filterItemByOwnership', () => {
+  const items = [
+    { id: '1', is_immutable: true },
+    { id: '2', is_immutable: false },
+    { id: '3', is_immutable: true }
+  ]
+
+  it.for([
+    { ownership: 'all' as const, expectedIds: ['1', '2', '3'] },
+    { ownership: 'my-models' as const, expectedIds: ['2'] },
+    { ownership: 'public-models' as const, expectedIds: ['1', '3'] }
+  ])(
+    'ownership=$ownership returns items with ids=$expectedIds',
+    ({ ownership, expectedIds }) => {
+      const result = filterItemByOwnership(items, ownership)
+      expect(result.map((i) => i.id)).toEqual(expectedIds)
+    }
+  )
+})
+
+describe('filterItemByBaseModels', () => {
+  const items = [
+    { id: '1', base_models: ['SDXL'] },
+    { id: '2', base_models: ['SD1.5'] },
+    { id: '3', base_models: ['SDXL', 'SD1.5'] },
+    { id: '4' }
+  ]
+
+  it.for([
+    { selectedModels: new Set<string>(), expectedIds: ['1', '2', '3', '4'] },
+    { selectedModels: new Set(['SDXL']), expectedIds: ['1', '3'] },
+    { selectedModels: new Set(['SD1.5']), expectedIds: ['2', '3'] }
+  ])(
+    'selectedModels=$selectedModels returns items with ids=$expectedIds',
+    ({ selectedModels, expectedIds }) => {
+      const result = filterItemByBaseModels(items, selectedModels)
+      expect(result.map((i) => i.id)).toEqual(expectedIds)
+    }
+  )
+})
diff --git a/src/platform/assets/utils/assetFilterUtils.ts b/src/platform/assets/utils/assetFilterUtils.ts
new file mode 100644
index 0000000000..cdcc1946b1
--- /dev/null
+++ b/src/platform/assets/utils/assetFilterUtils.ts
@@ -0,0 +1,66 @@
+import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import type { OwnershipOption } from '@/platform/assets/types/filterTypes'
+import { getAssetBaseModels } from '@/platform/assets/utils/assetMetadataUtils'
+
+export function filterByCategory(category: string) {
+  return (asset: AssetItem) => {
+    if (category === 'all') return true
+
+    // Check if any tag matches the category (for exact matches)
+    if (asset.tags.includes(category)) return true
+
+    // Check if any tag's top-level folder matches the category
+    return asset.tags.some((tag) => {
+      if (typeof tag === 'string' && tag.includes('/')) {
+        return tag.split('/')[0] === category
+      }
+      return false
+    })
+  }
+}
+
+export function filterByFileFormats(formats: string[]) {
+  return (asset: AssetItem) => {
+    if (formats.length === 0) return true
+    const formatSet = new Set(formats)
+    const extension = asset.name.split('.').pop()?.toLowerCase()
+    return extension ? formatSet.has(extension) : false
+  }
+}
+
+export function filterByBaseModels(models: string[] | Set<string>) {
+  const modelSet = models instanceof Set ? models : new Set(models)
+  return (asset: AssetItem) => {
+    if (modelSet.size === 0) return true
+    const assetBaseModels = getAssetBaseModels(asset)
+    return assetBaseModels.some((model) => modelSet.has(model))
+  }
+}
+
+export function filterByOwnership(ownership: OwnershipOption) {
+  return (asset: AssetItem) => {
+    if (ownership === 'all') return true
+    if (ownership === 'my-models') return asset.is_immutable === false
+    if (ownership === 'public-models') return asset.is_immutable === true
+    return true
+  }
+}
+
+export function filterItemByOwnership<T extends { is_immutable?: boolean }>(
+  items: T[],
+  ownership: OwnershipOption
+): T[] {
+  if (ownership === 'all') return items
+  const isPublic = ownership === 'public-models'
+  return items.filter((item) => item.is_immutable === isPublic)
+}
+
+export function filterItemByBaseModels<T extends { base_models?: string[] }>(
+  items: T[],
+  selectedModels: Set<string>
+): T[] {
+  if (selectedModels.size === 0) return items
+  return items.filter((item) =>
+    item.base_models?.some((model) => selectedModels.has(model))
+  )
+}
diff --git a/src/platform/assets/utils/assetMetadataUtils.test.ts b/src/platform/assets/utils/assetMetadataUtils.test.ts
new file mode 100644
index 0000000000..0e0d94383e
--- /dev/null
+++ b/src/platform/assets/utils/assetMetadataUtils.test.ts
@@ -0,0 +1,274 @@
+import { describe, expect, it } from 'vitest'
+
+import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import {
+  getAssetAdditionalTags,
+  getAssetBaseModel,
+  getAssetBaseModels,
+  getAssetDescription,
+  getAssetDisplayName,
+  getAssetModelType,
+  getAssetSourceUrl,
+  getAssetTriggerPhrases,
+  getAssetUserDescription,
+  getSourceName
+} from '@/platform/assets/utils/assetMetadataUtils'
+
+describe('assetMetadataUtils', () => {
+  const mockAsset: AssetItem = {
+    id: 'test-id',
+    name: 'test-model',
+    asset_hash: 'hash123',
+    size: 1024,
+    mime_type: 'application/octet-stream',
+    tags: ['models', 'checkpoints'],
+    created_at: '2024-01-01T00:00:00Z',
+    updated_at: '2024-01-01T00:00:00Z',
+    last_access_time: '2024-01-01T00:00:00Z'
+  }
+
+  describe('getAssetDescription', () => {
+    it.for([
+      {
+        name: 'returns string description when present',
+        description: 'A test model',
+        expected: 'A test model'
+      },
+      { name: 'returns null for non-string', description: 123, expected: null },
+      { name: 'returns null for null', description: null, expected: null }
+    ])('$name', ({ description, expected }) => {
+      const asset = { ...mockAsset, user_metadata: { description } }
+      expect(getAssetDescription(asset)).toBe(expected)
+    })
+
+    it('should return null when no metadata', () => {
+      expect(getAssetDescription(mockAsset)).toBeNull()
+    })
+  })
+
+  describe('getAssetBaseModel', () => {
+    it.for([
+      {
+        name: 'returns string base_model when present',
+        base_model: 'SDXL',
+        expected: 'SDXL'
+      },
+      { name: 'returns null for non-string', base_model: 123, expected: null },
+      { name: 'returns null for null', base_model: null, expected: null }
+    ])('$name', ({ base_model, expected }) => {
+      const asset = { ...mockAsset, user_metadata: { base_model } }
+      expect(getAssetBaseModel(asset)).toBe(expected)
+    })
+
+    it('should return null when no metadata', () => {
+      expect(getAssetBaseModel(mockAsset)).toBeNull()
+    })
+  })
+
+  describe('getAssetDisplayName', () => {
+    it.for([
+      {
+        name: 'returns name from user_metadata when present',
+        user_metadata: { name: 'My Custom Name' },
+        expected: 'My Custom Name'
+      },
+      {
+        name: 'falls back to asset name for non-string',
+        user_metadata: { name: 123 },
+        expected: 'test-model'
+      },
+      {
+        name: 'falls back to asset name for undefined',
+        user_metadata: undefined,
+        expected: 'test-model'
+      }
+    ])('$name', ({ user_metadata, expected }) => {
+      const asset = { ...mockAsset, user_metadata }
+      expect(getAssetDisplayName(asset)).toBe(expected)
+    })
+  })
+
+  describe('getAssetSourceUrl', () => {
+    it.for([
+      {
+        name: 'constructs URL from civitai format',
+        source_arn: 'civitai:model:123:version:456',
+        expected: 'https://civitai.com/models/123?modelVersionId=456'
+      },
+      { name: 'returns null for non-string', source_arn: 123, expected: null },
+      {
+        name: 'returns null for unrecognized format',
+        source_arn: 'unknown:format',
+        expected: null
+      }
+    ])('$name', ({ source_arn, expected }) => {
+      const asset = { ...mockAsset, user_metadata: { source_arn } }
+      expect(getAssetSourceUrl(asset)).toBe(expected)
+    })
+
+    it('should return null when no metadata', () => {
+      expect(getAssetSourceUrl(mockAsset)).toBeNull()
+    })
+  })
+
+  describe('getAssetTriggerPhrases', () => {
+    it.for([
+      {
+        name: 'returns array when array present',
+        trained_words: ['phrase1', 'phrase2'],
+        expected: ['phrase1', 'phrase2']
+      },
+      {
+        name: 'wraps single string in array',
+        trained_words: 'single phrase',
+        expected: ['single phrase']
+      },
+      {
+        name: 'filters non-string values from array',
+        trained_words: ['valid', 123, 'also valid', null],
+        expected: ['valid', 'also valid']
+      }
+    ])('$name', ({ trained_words, expected }) => {
+      const asset = { ...mockAsset, user_metadata: { trained_words } }
+      expect(getAssetTriggerPhrases(asset)).toEqual(expected)
+    })
+
+    it('should return empty array when no metadata', () => {
+      expect(getAssetTriggerPhrases(mockAsset)).toEqual([])
+    })
+  })
+
+  describe('getAssetAdditionalTags', () => {
+    it.for([
+      {
+        name: 'returns array of tags when present',
+        additional_tags: ['tag1', 'tag2'],
+        expected: ['tag1', 'tag2']
+      },
+      {
+        name: 'filters non-string values from array',
+        additional_tags: ['valid', 123, 'also valid'],
+        expected: ['valid', 'also valid']
+      },
+      {
+        name: 'returns empty array for non-array',
+        additional_tags: 'not an array',
+        expected: []
+      }
+    ])('$name', ({ additional_tags, expected }) => {
+      const asset = { ...mockAsset, user_metadata: { additional_tags } }
+      expect(getAssetAdditionalTags(asset)).toEqual(expected)
+    })
+
+    it('should return empty array when no metadata', () => {
+      expect(getAssetAdditionalTags(mockAsset)).toEqual([])
+    })
+  })
+
+  describe('getSourceName', () => {
+    it.for([
+      {
+        name: 'returns Civitai for civitai.com',
+        url: 'https://civitai.com/models/123',
+        expected: 'Civitai'
+      },
+      {
+        name: 'returns Hugging Face for huggingface.co',
+        url: 'https://huggingface.co/org/model',
+        expected: 'Hugging Face'
+      },
+      {
+        name: 'returns Source for unknown URLs',
+        url: 'https://example.com/model',
+        expected: 'Source'
+      }
+    ])('$name', ({ url, expected }) => {
+      expect(getSourceName(url)).toBe(expected)
+    })
+  })
+
+  describe('getAssetBaseModels', () => {
+    it.for([
+      {
+        name: 'array of strings',
+        base_model: ['SDXL', 'SD1.5', 'Flux'],
+        expected: ['SDXL', 'SD1.5', 'Flux']
+      },
+      {
+        name: 'filters non-string entries',
+        base_model: ['SDXL', 123, 'SD1.5', null, undefined],
+        expected: ['SDXL', 'SD1.5']
+      },
+      {
+        name: 'single string wrapped in array',
+        base_model: 'SDXL',
+        expected: ['SDXL']
+      },
+      {
+        name: 'non-array/string returns empty',
+        base_model: 123,
+        expected: []
+      },
+      { name: 'undefined returns empty', base_model: undefined, expected: [] }
+    ])('$name', ({ base_model, expected }) => {
+      const asset = { ...mockAsset, user_metadata: { base_model } }
+      expect(getAssetBaseModels(asset)).toEqual(expected)
+    })
+
+    it('should return empty array when no metadata', () => {
+      expect(getAssetBaseModels(mockAsset)).toEqual([])
+    })
+  })
+
+  describe('getAssetModelType', () => {
+    it.for([
+      {
+        name: 'returns model type from tags',
+        tags: ['models', 'checkpoints'],
+        expected: 'checkpoints'
+      },
+      {
+        name: 'returns full path for path-style tags',
+        tags: ['models', 'diffusers/Kolors/text_encoder'],
+        expected: 'diffusers/Kolors/text_encoder'
+      },
+      {
+        name: 'returns null when only models tag',
+        tags: ['models'],
+        expected: null
+      },
+      { name: 'returns null when tags empty', tags: [], expected: null }
+    ])('$name', ({ tags, expected }) => {
+      const asset = { ...mockAsset, tags }
+      expect(getAssetModelType(asset)).toBe(expected)
+    })
+  })
+
+  describe('getAssetUserDescription', () => {
+    it.for([
+      {
+        name: 'returns description when present',
+        user_description: 'A custom user description',
+        expected: 'A custom user description'
+      },
+      {
+        name: 'returns empty for non-string',
+        user_description: 123,
+        expected: ''
+      },
+      { name: 'returns empty for null', user_description: null, expected: '' },
+      {
+        name: 'returns empty for undefined',
+        user_description: undefined,
+        expected: ''
+      }
+    ])('$name', ({ user_description, expected }) => {
+      const asset = { ...mockAsset, user_metadata: { user_description } }
+      expect(getAssetUserDescription(asset)).toBe(expected)
+    })
+
+    it('should return empty string when no metadata', () => {
+      expect(getAssetUserDescription(mockAsset)).toBe('')
+    })
+  })
+})
diff --git a/src/platform/assets/utils/assetMetadataUtils.ts b/src/platform/assets/utils/assetMetadataUtils.ts
index 2d32fa07fe..4da1f89c74 100644
--- a/src/platform/assets/utils/assetMetadataUtils.ts
+++ b/src/platform/assets/utils/assetMetadataUtils.ts
@@ -1,27 +1,163 @@
 import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
 
 /**
- * Type-safe utilities for extracting metadata from assets
+ * Type-safe utilities for extracting metadata from assets.
+ * These utilities check user_metadata first, then metadata, then fallback.
  */
 
+/**
+ * Helper to get a string property from user_metadata or metadata
+ */
+function getStringProperty(asset: AssetItem, key: string): string | undefined {
+  const userValue = asset.user_metadata?.[key]
+  if (typeof userValue === 'string') return userValue
+
+  const metaValue = asset.metadata?.[key]
+  if (typeof metaValue === 'string') return metaValue
+
+  return undefined
+}
+
 /**
  * Safely extracts string description from asset metadata
+ * Checks user_metadata first, then metadata, then returns null
  * @param asset - The asset to extract description from
  * @returns The description string or null if not present/not a string
  */
 export function getAssetDescription(asset: AssetItem): string | null {
-  return typeof asset.user_metadata?.description === 'string'
-    ? asset.user_metadata.description
-    : null
+  return getStringProperty(asset, 'description') ?? null
 }
 
 /**
  * Safely extracts string base_model from asset metadata
+ * Checks user_metadata first, then metadata, then returns null
  * @param asset - The asset to extract base_model from
  * @returns The base_model string or null if not present/not a string
  */
 export function getAssetBaseModel(asset: AssetItem): string | null {
-  return typeof asset.user_metadata?.base_model === 'string'
-    ? asset.user_metadata.base_model
-    : null
+  return getStringProperty(asset, 'base_model') ?? null
+}
+
+/**
+ * Extracts base models as an array from asset metadata
+ * Checks user_metadata first, then metadata, then returns empty array
+ * @param asset - The asset to extract base models from
+ * @returns Array of base model strings
+ */
+export function getAssetBaseModels(asset: AssetItem): string[] {
+  const baseModel =
+    asset.user_metadata?.base_model ?? asset.metadata?.base_model
+  if (Array.isArray(baseModel)) {
+    return baseModel.filter((m): m is string => typeof m === 'string')
+  }
+  if (typeof baseModel === 'string' && baseModel) {
+    return [baseModel]
+  }
+  return []
+}
+
+/**
+ * Gets the display name for an asset
+ * Checks user_metadata.name first, then metadata.name, then asset.name
+ * @param asset - The asset to get display name from
+ * @returns The display name
+ */
+export function getAssetDisplayName(asset: AssetItem): string {
+  return getStringProperty(asset, 'name') ?? asset.name
+}
+
+/**
+ * Constructs source URL from asset's source_arn
+ * @param asset - The asset to extract source URL from
+ * @returns The source URL or null if not present/parseable
+ */
+export function getAssetSourceUrl(asset: AssetItem): string | null {
+  if (typeof asset.metadata?.repo_url === 'string') {
+    return asset.metadata.repo_url
+  }
+  // Note: Reversed priority for backwards compatibility
+  const sourceArn =
+    asset.metadata?.source_arn ?? asset.user_metadata?.source_arn
+  if (typeof sourceArn !== 'string') return null
+
+  const civitaiMatch = sourceArn.match(
+    /^civitai:model:(\d+):version:(\d+)(?::file:\d+)?$/
+  )
+  if (civitaiMatch) {
+    const [, modelId, versionId] = civitaiMatch
+    return `https://civitai.com/models/${modelId}?modelVersionId=${versionId}`
+  }
+
+  return null
+}
+
+/**
+ * Extracts trigger phrases from asset metadata
+ * Checks user_metadata first, then metadata, then returns empty array
+ * @param asset - The asset to extract trigger phrases from
+ * @returns Array of trigger phrases
+ */
+export function getAssetTriggerPhrases(asset: AssetItem): string[] {
+  const phrases =
+    asset.user_metadata?.trained_words ?? asset.metadata?.trained_words
+  if (Array.isArray(phrases)) {
+    return phrases.filter((p): p is string => typeof p === 'string')
+  }
+  if (typeof phrases === 'string') return [phrases]
+  return []
+}
+
+/**
+ * Extracts additional tags from asset user_metadata
+ * @param asset - The asset to extract tags from
+ * @returns Array of user-defined tags
+ */
+export function getAssetAdditionalTags(asset: AssetItem): string[] {
+  const tags = asset.user_metadata?.additional_tags
+  if (Array.isArray(tags)) {
+    return tags.filter((t): t is string => typeof t === 'string')
+  }
+  return []
+}
+
+/**
+ * Determines the source name from a URL
+ * @param url - The source URL
+ * @returns Human-readable source name
+ */
+export function getSourceName(url: string): string {
+  if (url.includes('civitai.com')) return 'Civitai'
+  if (url.includes('huggingface.co')) return 'Hugging Face'
+  return 'Source'
+}
+
+/**
+ * Extracts the model type from asset tags
+ * @param asset - The asset to extract model type from
+ * @returns The model type string or null if not present
+ */
+export function getAssetModelType(asset: AssetItem): string | null {
+  const typeTag = asset.tags?.find((tag) => tag && tag !== 'models')
+  return typeTag ?? null
+}
+
+/**
+ * Extracts user description from asset user_metadata
+ * @param asset - The asset to extract user description from
+ * @returns The user description string or empty string if not present
+ */
+export function getAssetUserDescription(asset: AssetItem): string {
+  return typeof asset.user_metadata?.user_description === 'string'
+    ? asset.user_metadata.user_description
+    : ''
+}
+
+/**
+ * Gets the filename for an asset with fallback chain
+ * Checks user_metadata.filename first, then metadata.filename, then asset.name
+ * @param asset - The asset to extract filename from
+ * @returns The filename string
+ */
+export function getAssetFilename(asset: AssetItem): string {
+  return getStringProperty(asset, 'filename') ?? asset.name
 }
diff --git a/src/platform/assets/utils/assetSortUtils.test.ts b/src/platform/assets/utils/assetSortUtils.test.ts
new file mode 100644
index 0000000000..ac374133fa
--- /dev/null
+++ b/src/platform/assets/utils/assetSortUtils.test.ts
@@ -0,0 +1,122 @@
+import { describe, expect, it } from 'vitest'
+
+import type { SortableItem } from './assetSortUtils'
+import { sortAssets } from './assetSortUtils'
+
+function createItem(
+  name: string,
+  options: { label?: string; created_at?: string } = {}
+): SortableItem {
+  return { name, ...options }
+}
+
+describe('sortAssets', () => {
+  describe('default sort', () => {
+    it('preserves original order', () => {
+      const items = [createItem('z'), createItem('a'), createItem('m')]
+      const result = sortAssets(items, 'default')
+      expect(result.map((i) => i.name)).toEqual(['z', 'a', 'm'])
+    })
+
+    it('returns a new array (does not mutate)', () => {
+      const items = [createItem('z'), createItem('a')]
+      const result = sortAssets(items, 'default')
+      expect(result).not.toBe(items)
+    })
+  })
+
+  describe('name-asc sort', () => {
+    it('sorts alphabetically A-Z by name', () => {
+      const items = [
+        createItem('cherry'),
+        createItem('apple'),
+        createItem('banana')
+      ]
+      const result = sortAssets(items, 'name-asc')
+      expect(result.map((i) => i.name)).toEqual(['apple', 'banana', 'cherry'])
+    })
+
+    it('prefers label over name when label exists', () => {
+      const items = [
+        createItem('file_c.png', { label: 'Cherry' }),
+        createItem('file_a.png', { label: 'Apple' }),
+        createItem('file_b.png', { label: 'Banana' })
+      ]
+      const result = sortAssets(items, 'name-asc')
+      expect(result.map((i) => i.name)).toEqual([
+        'file_a.png',
+        'file_b.png',
+        'file_c.png'
+      ])
+    })
+
+    it('uses natural sort for numeric values', () => {
+      const items = [
+        createItem('img_10.png'),
+        createItem('img_2.png'),
+        createItem('img_1.png'),
+        createItem('img_20.png')
+      ]
+      const result = sortAssets(items, 'name-asc')
+      expect(result.map((i) => i.name)).toEqual([
+        'img_1.png',
+        'img_2.png',
+        'img_10.png',
+        'img_20.png'
+      ])
+    })
+
+    it('is case-insensitive', () => {
+      const items = [
+        createItem('Banana'),
+        createItem('apple'),
+        createItem('CHERRY')
+      ]
+      const result = sortAssets(items, 'name-asc')
+      expect(result.map((i) => i.name)).toEqual(['apple', 'Banana', 'CHERRY'])
+    })
+  })
+
+  describe('name-desc sort', () => {
+    it('sorts alphabetically Z-A by name', () => {
+      const items = [
+        createItem('apple'),
+        createItem('cherry'),
+        createItem('banana')
+      ]
+      const result = sortAssets(items, 'name-desc')
+      expect(result.map((i) => i.name)).toEqual(['cherry', 'banana', 'apple'])
+    })
+  })
+
+  describe('recent sort', () => {
+    it('sorts by created_at descending (newest first)', () => {
+      const items = [
+        createItem('old', { created_at: '2024-01-01T00:00:00Z' }),
+        createItem('newest', { created_at: '2024-03-01T00:00:00Z' }),
+        createItem('middle', { created_at: '2024-02-01T00:00:00Z' })
+      ]
+      const result = sortAssets(items, 'recent')
+      expect(result.map((i) => i.name)).toEqual(['newest', 'middle', 'old'])
+    })
+
+    it('handles null/undefined created_at (sorts to end)', () => {
+      const items = [
+        createItem('no-date'),
+        createItem('has-date', { created_at: '2024-01-01T00:00:00Z' }),
+        createItem('undefined-date', { created_at: undefined })
+      ]
+      const result = sortAssets(items, 'recent')
+      expect(result[0].name).toBe('has-date')
+    })
+  })
+
+  describe('immutability', () => {
+    it('does not mutate the original array', () => {
+      const items = [createItem('z'), createItem('a')]
+      const original = [...items]
+      sortAssets(items, 'name-asc')
+      expect(items).toEqual(original)
+    })
+  })
+})
diff --git a/src/platform/assets/utils/assetSortUtils.ts b/src/platform/assets/utils/assetSortUtils.ts
new file mode 100644
index 0000000000..76158ec062
--- /dev/null
+++ b/src/platform/assets/utils/assetSortUtils.ts
@@ -0,0 +1,61 @@
+/**
+ * Shared asset sorting utilities
+ * Used by both AssetBrowser and FormDropdown
+ */
+
+import type { AssetSortOption } from '../types/filterTypes'
+
+/**
+ * Minimal interface for sortable items
+ * Works with both AssetItem and FormDropdownItem
+ */
+export interface SortableItem {
+  name: string
+  label?: string
+  created_at?: string | null
+}
+
+function getDisplayName(item: SortableItem): string {
+  return item.label ?? item.name
+}
+
+/**
+ * Sort items by the specified sort option
+ * @param items - Array of sortable items
+ * @param sortBy - Sort option from AssetSortOption
+ * @returns New sorted array (does not mutate input)
+ */
+export function sortAssets<T extends SortableItem>(
+  items: readonly T[],
+  sortBy: AssetSortOption
+): T[] {
+  if (sortBy === 'default') {
+    return items.slice()
+  }
+
+  const sorted = items.slice()
+
+  switch (sortBy) {
+    case 'name-desc':
+      return sorted.sort((a, b) =>
+        getDisplayName(b).localeCompare(getDisplayName(a), undefined, {
+          numeric: true,
+          sensitivity: 'base'
+        })
+      )
+    case 'recent':
+      return sorted.sort(
+        (a, b) =>
+          new Date(b.created_at ?? 0).getTime() -
+          new Date(a.created_at ?? 0).getTime()
+      )
+    case 'name-asc':
+    default:
+      return sorted.sort((a, b) =>
+        getDisplayName(a).localeCompare(getDisplayName(b), undefined, {
+          numeric: true,
+          sensitivity: 'base'
+        })
+      )
+  }
+}
diff --git a/src/platform/assets/utils/assetUrlUtil.ts b/src/platform/assets/utils/assetUrlUtil.ts
index 60956eb5f9..ad0c2be25f 100644
--- a/src/platform/assets/utils/assetUrlUtil.ts
+++ b/src/platform/assets/utils/assetUrlUtil.ts
@@ -8,7 +8,7 @@ import { getAssetType } from './assetTypeUtil'
 
 /**
  * Get the download/view URL for an asset
- * Constructs the proper URL with filename encoding and type parameter
+ * Constructs the proper URL with filename encoding, type, and subfolder parameters
  *
  * @param asset The asset to get URL for
  * @param defaultType Default type if asset doesn't have tags (default: 'output')
@@ -23,7 +23,12 @@ export function getAssetUrl(
   defaultType: 'input' | 'output' = 'output'
 ): string {
   const assetType = getAssetType(asset, defaultType)
-  return api.apiURL(
-    `/view?filename=${encodeURIComponent(asset.name)}&type=${assetType}`
-  )
+  const subfolder = asset.user_metadata?.subfolder
+  const params = new URLSearchParams()
+  params.set('filename', asset.name)
+  params.set('type', assetType)
+  if (typeof subfolder === 'string' && subfolder) {
+    params.set('subfolder', subfolder)
+  }
+  return api.apiURL(`/view?${params}`)
 }
diff --git a/src/platform/assets/utils/createAssetWidget.ts b/src/platform/assets/utils/createAssetWidget.ts
new file mode 100644
index 0000000000..7e80290c04
--- /dev/null
+++ b/src/platform/assets/utils/createAssetWidget.ts
@@ -0,0 +1,114 @@
+import { fromZodError } from 'zod-validation-error'
+
+import { t } from '@/i18n'
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type {
+  IBaseWidget,
+  IWidgetAssetOptions
+} from '@/lib/litegraph/src/types/widgets'
+import { useAssetBrowserDialog } from '@/platform/assets/composables/useAssetBrowserDialog'
+import {
+  assetFilenameSchema,
+  assetItemSchema
+} from '@/platform/assets/schemas/assetSchema'
+import { useToastStore } from '@/platform/updates/common/toastStore'
+import { getAssetFilename } from '@/platform/assets/utils/assetMetadataUtils'
+
+interface CreateAssetWidgetParams {
+  /** The node to add the widget to */
+  node: LGraphNode
+  /** The widget name */
+  widgetName: string
+  /** The node type to show in asset browser (may differ from node.comfyClass for PrimitiveNode) */
+  nodeTypeForBrowser: string
+  /** Input name for asset browser filtering (defaults to widgetName if not provided) */
+  inputNameForBrowser?: string
+  /** Default value for the widget */
+  defaultValue?: string
+  /** Callback when widget value changes */
+  onValueChange?: (
+    widget: IBaseWidget,
+    newValue: string,
+    oldValue: unknown
+  ) => void
+}
+
+/**
+ * Creates an asset widget that opens the Asset Browser dialog for model selection.
+ * Used by both regular nodes (via useComboWidget) and PrimitiveNode.
+ *
+ * @param params - Configuration for the asset widget
+ * @returns The created asset widget
+ */
+export function createAssetWidget(
+  params: CreateAssetWidgetParams
+): IBaseWidget {
+  const {
+    node,
+    widgetName,
+    nodeTypeForBrowser,
+    inputNameForBrowser,
+    defaultValue,
+    onValueChange
+  } = params
+
+  const displayLabel = defaultValue ?? t('widgets.selectModel')
+  const assetBrowserDialog = useAssetBrowserDialog()
+
+  async function openModal(widget: IBaseWidget) {
+    const toastStore = useToastStore()
+
+    await assetBrowserDialog.show({
+      nodeType: nodeTypeForBrowser,
+      inputName: inputNameForBrowser ?? widgetName,
+      currentValue: widget.value as string,
+      onAssetSelected: (asset) => {
+        const validatedAsset = assetItemSchema.safeParse(asset)
+
+        if (!validatedAsset.success) {
+          console.error(
+            'Invalid asset item:',
+            fromZodError(validatedAsset.error).message
+          )
+          toastStore.add({
+            severity: 'error',
+            summary: t('assetBrowser.invalidAsset'),
+            detail: t('assetBrowser.invalidAssetDetail'),
+            life: 5000
+          })
+          return
+        }
+
+        const filename = getAssetFilename(validatedAsset.data)
+        const validatedFilename = assetFilenameSchema.safeParse(filename)
+
+        if (!validatedFilename.success) {
+          console.error(
+            'Invalid asset filename:',
+            validatedFilename.error.errors,
+            'for asset:',
+            validatedAsset.data.id
+          )
+          toastStore.add({
+            severity: 'error',
+            summary: t('assetBrowser.invalidFilename'),
+            detail: t('assetBrowser.invalidFilenameDetail'),
+            life: 5000
+          })
+          return
+        }
+
+        const oldValue = widget.value
+        widget.value = validatedFilename.data
+        onValueChange?.(widget, validatedFilename.data, oldValue)
+      }
+    })
+  }
+
+  const options: IWidgetAssetOptions = {
+    openModal,
+    nodeType: nodeTypeForBrowser
+  }
+
+  return node.addWidget('asset', widgetName, displayLabel, () => {}, options)
+}
diff --git a/tests-ui/platform/assets/utils/createModelNodeFromAsset.test.ts b/src/platform/assets/utils/createModelNodeFromAsset.test.ts
similarity index 78%
rename from tests-ui/platform/assets/utils/createModelNodeFromAsset.test.ts
rename to src/platform/assets/utils/createModelNodeFromAsset.test.ts
index 2c7d6c303a..cdc42dc397 100644
--- a/tests-ui/platform/assets/utils/createModelNodeFromAsset.test.ts
+++ b/src/platform/assets/utils/createModelNodeFromAsset.test.ts
@@ -1,11 +1,14 @@
+// oxlint-disable no-misused-spread
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { type Raw, markRaw } from 'vue'
+import { markRaw } from 'vue'
+import type { Raw } from 'vue'
 
-import {
-  type LGraphNode,
-  LiteGraph,
-  type Subgraph
-} from '@/lib/litegraph/src/litegraph'
+import type { LGraphNode, Subgraph } from '@/lib/litegraph/src/litegraph'
+import { LiteGraph } from '@/lib/litegraph/src/litegraph'
+import type * as LitegraphModule from '@/lib/litegraph/src/litegraph'
+import type * as ModelToNodeStoreModule from '@/stores/modelToNodeStore'
+import type * as WorkflowStoreModule from '@/platform/workflow/management/stores/workflowStore'
+import type * as LitegraphServiceModule from '@/services/litegraphService'
 import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
 import { createModelNodeFromAsset } from '@/platform/assets/utils/createModelNodeFromAsset'
 import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
@@ -20,8 +23,7 @@ vi.mock('@/scripts/api', () => ({
   }
 }))
 vi.mock('@/stores/modelToNodeStore', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@/stores/modelToNodeStore')>()
+  const actual = await importOriginal<typeof ModelToNodeStoreModule>()
   return {
     ...actual,
     useModelToNodeStore: vi.fn()
@@ -30,10 +32,7 @@ vi.mock('@/stores/modelToNodeStore', async (importOriginal) => {
 vi.mock(
   '@/platform/workflow/management/stores/workflowStore',
   async (importOriginal) => {
-    const actual =
-      await importOriginal<
-        typeof import('@/platform/workflow/management/stores/workflowStore')
-      >()
+    const actual = await importOriginal<typeof WorkflowStoreModule>()
     return {
       ...actual,
       useWorkflowStore: vi.fn()
@@ -41,16 +40,14 @@ vi.mock(
   }
 )
 vi.mock('@/services/litegraphService', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@/services/litegraphService')>()
+  const actual = await importOriginal<typeof LitegraphServiceModule>()
   return {
     ...actual,
     useLitegraphService: vi.fn()
   }
 })
 vi.mock('@/lib/litegraph/src/litegraph', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@/lib/litegraph/src/litegraph')>()
+  const actual = await importOriginal<typeof LitegraphModule>()
   return {
     ...actual,
     LiteGraph: {
@@ -93,7 +90,7 @@ async function createMockNode(overrides?: {
   } = overrides || {}
 
   const { LGraphNode: ActualLGraphNode } = await vi.importActual<
-    typeof import('@/lib/litegraph/src/litegraph')
+    typeof LitegraphModule
   >('@/lib/litegraph/src/litegraph')
 
   if (!hasWidgets) {
@@ -113,13 +110,19 @@ async function createMockNode(overrides?: {
     widgets: { value: [widget], writable: true }
   })
 }
-function createMockNodeProvider() {
+function createMockNodeProvider(
+  overrides: {
+    nodeDef?: { name: string; display_name: string }
+    key?: string
+  } = {}
+) {
   return {
     nodeDef: {
       name: 'CheckpointLoaderSimple',
-      display_name: 'Load Checkpoint'
+      display_name: 'Load Checkpoint',
+      ...overrides.nodeDef
     },
-    key: 'ckpt_name'
+    key: overrides.key ?? 'ckpt_name'
   }
 }
 /**
@@ -229,12 +232,36 @@ describe('createModelNodeFromAsset', () => {
       expect(result.success).toBe(true)
       expect(vi.mocked(app).canvas.graph!.add).toHaveBeenCalledWith(mockNode)
     })
+    it('should fallback to asset.metadata.filename when user_metadata.filename missing', async () => {
+      const asset = createMockAsset({
+        user_metadata: {},
+        metadata: { filename: 'models/checkpoints/from-metadata.safetensors' }
+      })
+      const mockNode = await createMockNode()
+      await setupMocks({ createdNode: mockNode })
+      const result = createModelNodeFromAsset(asset)
+      expect(result.success).toBe(true)
+      expect(mockNode.widgets?.[0].value).toBe(
+        'models/checkpoints/from-metadata.safetensors'
+      )
+    })
+    it('should fallback to asset.name when both filename sources missing', async () => {
+      const asset = createMockAsset({
+        user_metadata: {},
+        metadata: undefined
+      })
+      const mockNode = await createMockNode()
+      await setupMocks({ createdNode: mockNode })
+      const result = createModelNodeFromAsset(asset)
+      expect(result.success).toBe(true)
+      expect(mockNode.widgets?.[0].value).toBe('test-model.safetensors')
+    })
     it('should add node to active subgraph when present', async () => {
       const asset = createMockAsset()
       const mockNode = await createMockNode()
-      const { Subgraph } = await vi.importActual<
-        typeof import('@/lib/litegraph/src/litegraph')
-      >('@/lib/litegraph/src/litegraph')
+      const { Subgraph } = await vi.importActual<typeof LitegraphModule>(
+        '@/lib/litegraph/src/litegraph'
+      )
       const mockSubgraph = markRaw(
         Object.create(Subgraph.prototype, {
           add: { value: vi.fn() }
@@ -249,6 +276,24 @@ describe('createModelNodeFromAsset', () => {
       expect(mockSubgraph.add).toHaveBeenCalledWith(mockNode)
       expect(vi.mocked(app).canvas.graph!.add).not.toHaveBeenCalled()
     })
+    it('should succeed when provider has empty key (auto-load nodes)', async () => {
+      const asset = createMockAsset({
+        tags: ['models', 'chatterbox/chatterbox_vc'],
+        user_metadata: { filename: 'chatterbox_vc_model.pt' }
+      })
+      const mockNode = await createMockNode({ hasWidgets: false })
+      const nodeProvider = createMockNodeProvider({
+        nodeDef: {
+          name: 'FL_ChatterboxVC',
+          display_name: 'FL Chatterbox VC'
+        },
+        key: ''
+      })
+      await setupMocks({ createdNode: mockNode, nodeProvider })
+      const result = createModelNodeFromAsset(asset)
+      expect(result.success).toBe(true)
+      expect(vi.mocked(app).canvas.graph!.add).toHaveBeenCalledWith(mockNode)
+    })
   })
   describe('when asset data is incomplete or invalid', () => {
     beforeEach(() => {
@@ -256,27 +301,18 @@ describe('createModelNodeFromAsset', () => {
     })
     it.each([
       {
-        case: 'missing user_metadata',
-        overrides: { user_metadata: undefined },
+        case: 'missing user_metadata with no fallback',
+        overrides: { user_metadata: undefined, metadata: undefined, name: '' },
         expectedCode: 'INVALID_ASSET' as const,
-        errorPattern: /missing required user_metadata/
+        errorPattern: /Invalid filename.*expected non-empty string/
       },
       {
-        case: 'missing filename property',
-        overrides: { user_metadata: {} },
-        expectedCode: 'INVALID_ASSET' as const,
-        errorPattern:
-          /Invalid filename.*expected non-empty string, got undefined/
-      },
-      {
-        case: 'non-string filename',
-        overrides: { user_metadata: { filename: 123 } },
-        expectedCode: 'INVALID_ASSET' as const,
-        errorPattern: /Invalid filename.*expected non-empty string, got number/
-      },
-      {
-        case: 'empty filename',
-        overrides: { user_metadata: { filename: '' } },
+        case: 'empty filename with no fallback',
+        overrides: {
+          user_metadata: { filename: '' },
+          metadata: undefined,
+          name: ''
+        },
         expectedCode: 'INVALID_ASSET' as const,
         errorPattern: /Invalid filename.*expected non-empty string/
       }
diff --git a/src/platform/assets/utils/createModelNodeFromAsset.ts b/src/platform/assets/utils/createModelNodeFromAsset.ts
index b180a0a5da..1701d1e3d0 100644
--- a/src/platform/assets/utils/createModelNodeFromAsset.ts
+++ b/src/platform/assets/utils/createModelNodeFromAsset.ts
@@ -6,12 +6,13 @@ import {
   MISSING_TAG,
   MODELS_TAG
 } from '@/platform/assets/services/assetService'
+import { getAssetFilename } from '@/platform/assets/utils/assetMetadataUtils'
 import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
 import { app } from '@/scripts/app'
 import { useLitegraphService } from '@/services/litegraphService'
 import { useModelToNodeStore } from '@/stores/modelToNodeStore'
 
-interface CreateNodeOptions {
+interface ModelNodeCreateOptions {
   position?: Point
 }
 
@@ -47,7 +48,7 @@ type Result<T, E> = { success: true; value: T } | { success: false; error: E }
  */
 export function createModelNodeFromAsset(
   asset: AssetItem,
-  options?: CreateNodeOptions
+  options?: ModelNodeCreateOptions
 ): Result<LGraphNode, NodeCreationError> {
   const validatedAsset = assetItemSchema.safeParse(asset)
 
@@ -69,21 +70,8 @@ export function createModelNodeFromAsset(
 
   const validAsset = validatedAsset.data
 
-  const userMetadata = validAsset.user_metadata
-  if (!userMetadata) {
-    console.error(`Asset ${validAsset.id} missing required user_metadata`)
-    return {
-      success: false,
-      error: {
-        code: 'INVALID_ASSET',
-        message: 'Asset missing required user_metadata',
-        assetId: validAsset.id
-      }
-    }
-  }
-
-  const filename = userMetadata.filename
-  if (typeof filename !== 'string' || filename.length === 0) {
+  const filename = getAssetFilename(validAsset)
+  if (filename.length === 0) {
     console.error(
       `Asset ${validAsset.id} has invalid user_metadata.filename (expected non-empty string, got ${typeof filename})`
     )
@@ -183,26 +171,27 @@ export function createModelNodeFromAsset(
     }
   }
 
-  const widget = node.widgets?.find((w) => w.name === provider.key)
-  if (!widget) {
-    console.error(
-      `Widget ${provider.key} not found on node ${provider.nodeDef.name}`
-    )
-    return {
-      success: false,
-      error: {
-        code: 'MISSING_WIDGET',
-        message: `Widget ${provider.key} not found on node ${provider.nodeDef.name}`,
-        assetId: validAsset.id,
-        details: { widgetName: provider.key, nodeType: provider.nodeDef.name }
+  // Set widget value if provider specifies a key (some nodes auto-load models without a widget)
+  if (provider.key) {
+    const widget = node.widgets?.find((w) => w.name === provider.key)
+    if (!widget) {
+      console.error(
+        `Widget ${provider.key} not found on node ${provider.nodeDef.name}`
+      )
+      return {
+        success: false,
+        error: {
+          code: 'MISSING_WIDGET',
+          message: `Widget ${provider.key} not found on node ${provider.nodeDef.name}`,
+          assetId: validAsset.id,
+          details: { widgetName: provider.key, nodeType: provider.nodeDef.name }
+        }
       }
     }
+    widget.value = filename
   }
 
-  // Set widget value BEFORE adding to graph so the node is created with correct value
-  widget.value = filename
-
-  // Now add the node to the graph with the correct widget value already set
+  // Add the node to the graph
   targetGraph.add(node)
 
   return { success: true, value: node }
diff --git a/src/platform/assets/utils/mediaIconUtil.test.ts b/src/platform/assets/utils/mediaIconUtil.test.ts
new file mode 100644
index 0000000000..b7dfdc0fa0
--- /dev/null
+++ b/src/platform/assets/utils/mediaIconUtil.test.ts
@@ -0,0 +1,17 @@
+import { describe, expect, it } from 'vitest'
+
+import { iconForMediaType } from './mediaIconUtil'
+
+describe('iconForMediaType', () => {
+  it('maps text and misc fallbacks correctly', () => {
+    expect(iconForMediaType('text')).toBe('icon-[lucide--text]')
+    expect(iconForMediaType('other')).toBe('icon-[lucide--check-check]')
+  })
+
+  it('preserves existing mappings for core media types', () => {
+    expect(iconForMediaType('image')).toBe('icon-[lucide--image]')
+    expect(iconForMediaType('video')).toBe('icon-[lucide--video]')
+    expect(iconForMediaType('audio')).toBe('icon-[lucide--music]')
+    expect(iconForMediaType('3D')).toBe('icon-[lucide--box]')
+  })
+})
diff --git a/src/platform/assets/utils/mediaIconUtil.ts b/src/platform/assets/utils/mediaIconUtil.ts
new file mode 100644
index 0000000000..587bc4a799
--- /dev/null
+++ b/src/platform/assets/utils/mediaIconUtil.ts
@@ -0,0 +1,18 @@
+import type { MediaKind } from '@/platform/assets/schemas/mediaAssetSchema'
+
+export function iconForMediaType(mediaType: MediaKind): string {
+  switch (mediaType) {
+    case 'video':
+      return 'icon-[lucide--video]'
+    case 'audio':
+      return 'icon-[lucide--music]'
+    case '3D':
+      return 'icon-[lucide--box]'
+    case 'text':
+      return 'icon-[lucide--text]'
+    case 'other':
+      return 'icon-[lucide--check-check]'
+    default:
+      return 'icon-[lucide--image]'
+  }
+}
diff --git a/src/platform/assets/utils/outputAssetUtil.test.ts b/src/platform/assets/utils/outputAssetUtil.test.ts
new file mode 100644
index 0000000000..649df87fc5
--- /dev/null
+++ b/src/platform/assets/utils/outputAssetUtil.test.ts
@@ -0,0 +1,157 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { OutputAssetMetadata } from '@/platform/assets/schemas/assetMetadataSchema'
+import type { ResultItemImpl } from '@/stores/queueStore'
+
+import { resolveOutputAssetItems } from './outputAssetUtil'
+
+const mocks = vi.hoisted(() => ({
+  getJobDetail: vi.fn(),
+  getPreviewableOutputsFromJobDetail: vi.fn()
+}))
+
+vi.mock('@/services/jobOutputCache', () => ({
+  getJobDetail: mocks.getJobDetail,
+  getPreviewableOutputsFromJobDetail: mocks.getPreviewableOutputsFromJobDetail
+}))
+
+type OutputOverrides = Partial<{
+  filename: string
+  subfolder: string
+  nodeId: string
+  url: string
+}>
+
+function createOutput(overrides: OutputOverrides = {}): ResultItemImpl {
+  const merged = {
+    filename: 'file.png',
+    subfolder: 'sub',
+    nodeId: '1',
+    url: 'https://example.com/file.png',
+    ...overrides
+  }
+  return {
+    ...merged,
+    previewUrl: merged.url
+  } as ResultItemImpl
+}
+
+describe('resolveOutputAssetItems', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('maps outputs and excludes a composite output key', async () => {
+    const outputA = createOutput({
+      filename: 'a.png',
+      nodeId: '1',
+      url: 'https://example.com/a.png'
+    })
+    const outputB = createOutput({
+      filename: 'b.png',
+      nodeId: '2',
+      url: 'https://example.com/b.png'
+    })
+    const metadata: OutputAssetMetadata = {
+      jobId: 'job-1',
+      nodeId: '1',
+      subfolder: 'sub',
+      executionTimeInSeconds: 12.5,
+      outputCount: 2,
+      allOutputs: [outputA, outputB]
+    }
+
+    const results = await resolveOutputAssetItems(metadata, {
+      createdAt: '2025-01-01T00:00:00.000Z',
+      excludeOutputKey: '2-sub-b.png'
+    })
+
+    expect(mocks.getJobDetail).not.toHaveBeenCalled()
+    expect(results).toHaveLength(1)
+    expect(results[0]).toEqual(
+      expect.objectContaining({
+        id: 'job-1-1-sub-a.png',
+        name: 'a.png',
+        created_at: '2025-01-01T00:00:00.000Z',
+        tags: ['output'],
+        preview_url: 'https://example.com/a.png'
+      })
+    )
+    expect(results[0].user_metadata).toEqual(
+      expect.objectContaining({
+        jobId: 'job-1',
+        nodeId: '1',
+        subfolder: 'sub',
+        executionTimeInSeconds: 12.5
+      })
+    )
+  })
+
+  it('loads full outputs when metadata indicates more outputs', async () => {
+    const previewOutput = createOutput({
+      filename: 'preview.png',
+      nodeId: '1',
+      url: 'https://example.com/preview.png'
+    })
+    const fullOutput = createOutput({
+      filename: 'full.png',
+      nodeId: '2',
+      url: 'https://example.com/full.png'
+    })
+    const metadata: OutputAssetMetadata = {
+      jobId: 'job-2',
+      nodeId: '1',
+      subfolder: 'sub',
+      outputCount: 3,
+      allOutputs: [previewOutput]
+    }
+    const jobDetail = { id: 'job-1' }
+
+    mocks.getJobDetail.mockResolvedValue(jobDetail)
+    mocks.getPreviewableOutputsFromJobDetail.mockReturnValue([
+      fullOutput,
+      previewOutput
+    ])
+
+    const results = await resolveOutputAssetItems(metadata)
+
+    expect(mocks.getJobDetail).toHaveBeenCalledWith('job-2')
+    expect(mocks.getPreviewableOutputsFromJobDetail).toHaveBeenCalledWith(
+      jobDetail
+    )
+    expect(results.map((asset) => asset.name)).toEqual([
+      'full.png',
+      'preview.png'
+    ])
+  })
+
+  it('keeps root outputs with empty subfolders', async () => {
+    const output = createOutput({
+      filename: 'root.png',
+      nodeId: '1',
+      subfolder: '',
+      url: 'https://example.com/root.png'
+    })
+    const metadata: OutputAssetMetadata = {
+      jobId: 'job-root',
+      nodeId: '1',
+      subfolder: '',
+      outputCount: 1,
+      allOutputs: [output]
+    }
+
+    const results = await resolveOutputAssetItems(metadata)
+
+    expect(mocks.getJobDetail).not.toHaveBeenCalled()
+    expect(results).toHaveLength(1)
+    const [asset] = results
+    if (!asset) {
+      throw new Error('Expected a root output asset')
+    }
+    expect(asset.id).toBe('job-root-1--root.png')
+    if (!asset.user_metadata) {
+      throw new Error('Expected output metadata')
+    }
+    expect(asset.user_metadata.subfolder).toBe('')
+  })
+})
diff --git a/src/platform/assets/utils/outputAssetUtil.ts b/src/platform/assets/utils/outputAssetUtil.ts
new file mode 100644
index 0000000000..81e4d31fc3
--- /dev/null
+++ b/src/platform/assets/utils/outputAssetUtil.ts
@@ -0,0 +1,110 @@
+import type { OutputAssetMetadata } from '@/platform/assets/schemas/assetMetadataSchema'
+import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import type { NodeId } from '@/platform/workflow/validation/schemas/workflowSchema'
+import {
+  getJobDetail,
+  getPreviewableOutputsFromJobDetail
+} from '@/services/jobOutputCache'
+import type { ResultItemImpl } from '@/stores/queueStore'
+
+type OutputAssetMapOptions = {
+  jobId: string
+  outputs: readonly ResultItemImpl[]
+  createdAt?: string
+  executionTimeInSeconds?: number
+  workflow?: OutputAssetMetadata['workflow']
+  excludeOutputKey?: string
+}
+
+type ResolveOutputAssetItemsOptions = {
+  createdAt?: string
+  excludeOutputKey?: string
+}
+
+type OutputKeyParts = {
+  nodeId?: NodeId | null
+  subfolder?: string | null
+  filename?: string | null
+}
+
+function shouldLoadFullOutputs(
+  outputCount: OutputAssetMetadata['outputCount'],
+  outputsLength: number
+): boolean {
+  return (
+    typeof outputCount === 'number' &&
+    outputCount > 1 &&
+    outputsLength < outputCount
+  )
+}
+
+export function getOutputKey({
+  nodeId,
+  subfolder,
+  filename
+}: OutputKeyParts): string | null {
+  if (nodeId == null || subfolder == null || !filename) {
+    return null
+  }
+
+  return `${nodeId}-${subfolder}-${filename}`
+}
+
+function mapOutputsToAssetItems({
+  jobId,
+  outputs,
+  createdAt,
+  executionTimeInSeconds,
+  workflow,
+  excludeOutputKey
+}: OutputAssetMapOptions): AssetItem[] {
+  const createdAtValue = createdAt ?? new Date().toISOString()
+
+  return outputs.reduce<AssetItem[]>((items, output) => {
+    const outputKey = getOutputKey(output)
+    if (!output.filename || !outputKey || outputKey === excludeOutputKey) {
+      return items
+    }
+
+    items.push({
+      id: `${jobId}-${outputKey}`,
+      name: output.filename,
+      size: 0,
+      created_at: createdAtValue,
+      tags: ['output'],
+      preview_url: output.previewUrl,
+      user_metadata: {
+        jobId,
+        nodeId: output.nodeId,
+        subfolder: output.subfolder,
+        executionTimeInSeconds,
+        workflow
+      }
+    })
+
+    return items
+  }, [])
+}
+
+export async function resolveOutputAssetItems(
+  metadata: OutputAssetMetadata,
+  { createdAt, excludeOutputKey }: ResolveOutputAssetItemsOptions = {}
+): Promise<AssetItem[]> {
+  let outputsToDisplay = metadata.allOutputs ?? []
+  if (shouldLoadFullOutputs(metadata.outputCount, outputsToDisplay.length)) {
+    const jobDetail = await getJobDetail(metadata.jobId)
+    const previewableOutputs = getPreviewableOutputsFromJobDetail(jobDetail)
+    if (previewableOutputs.length) {
+      outputsToDisplay = previewableOutputs
+    }
+  }
+
+  return mapOutputsToAssetItems({
+    jobId: metadata.jobId,
+    outputs: outputsToDisplay,
+    createdAt,
+    executionTimeInSeconds: metadata.executionTimeInSeconds,
+    workflow: metadata.workflow,
+    excludeOutputKey
+  })
+}
diff --git a/src/platform/auth/session/useSessionCookie.ts b/src/platform/auth/session/useSessionCookie.ts
index 49f6fec46e..295e2ab264 100644
--- a/src/platform/auth/session/useSessionCookie.ts
+++ b/src/platform/auth/session/useSessionCookie.ts
@@ -1,5 +1,6 @@
-import { api } from '@/scripts/api'
+import { useFeatureFlags } from '@/composables/useFeatureFlags'
 import { isCloud } from '@/platform/distribution/types'
+import { api } from '@/scripts/api'
 import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
 
 /**
@@ -10,31 +11,60 @@ export const useSessionCookie = () => {
   /**
    * Creates or refreshes the session cookie.
    * Called after login and on token refresh.
+   *
+   * When team_workspaces_enabled is true, uses Firebase token directly
+   * (since getAuthHeader() returns workspace token which shouldn't be used for session creation).
+   * When disabled, uses getAuthHeader() for backward compatibility.
    */
   const createSession = async (): Promise<void> => {
     if (!isCloud) return
 
-    const authStore = useFirebaseAuthStore()
-    const authHeader = await authStore.getAuthHeader()
+    const { flags } = useFeatureFlags()
+    try {
+      const authStore = useFirebaseAuthStore()
 
-    if (!authHeader) {
-      throw new Error('No auth header available for session creation')
-    }
+      let authHeader: Record<string, string>
 
-    const response = await fetch(api.apiURL('/auth/session'), {
-      method: 'POST',
-      credentials: 'include',
-      headers: {
-        ...authHeader,
-        'Content-Type': 'application/json'
+      if (flags.teamWorkspacesEnabled) {
+        const firebaseToken = await authStore.getIdToken()
+        if (!firebaseToken) {
+          console.warn(
+            'Failed to create session cookie:',
+            'No Firebase token available for session creation'
+          )
+          return
+        }
+        authHeader = { Authorization: `Bearer ${firebaseToken}` }
+      } else {
+        const header = await authStore.getAuthHeader()
+        if (!header) {
+          console.warn(
+            'Failed to create session cookie:',
+            'No auth header available for session creation'
+          )
+          return
+        }
+        authHeader = header
       }
-    })
 
-    if (!response.ok) {
-      const errorData = await response.json().catch(() => ({}))
-      throw new Error(
-        `Failed to create session: ${errorData.message || response.statusText}`
-      )
+      const response = await fetch(api.apiURL('/auth/session'), {
+        method: 'POST',
+        credentials: 'include',
+        headers: {
+          ...authHeader,
+          'Content-Type': 'application/json'
+        }
+      })
+
+      if (!response.ok) {
+        const errorData = await response.json().catch(() => ({}))
+        console.warn(
+          'Failed to create session cookie:',
+          errorData.message || response.statusText
+        )
+      }
+    } catch (error) {
+      console.warn('Failed to create session cookie:', error)
     }
   }
 
@@ -45,16 +75,21 @@ export const useSessionCookie = () => {
   const deleteSession = async (): Promise<void> => {
     if (!isCloud) return
 
-    const response = await fetch(api.apiURL('/auth/session'), {
-      method: 'DELETE',
-      credentials: 'include'
-    })
+    try {
+      const response = await fetch(api.apiURL('/auth/session'), {
+        method: 'DELETE',
+        credentials: 'include'
+      })
 
-    if (!response.ok) {
-      const errorData = await response.json().catch(() => ({}))
-      throw new Error(
-        `Failed to delete session: ${errorData.message || response.statusText}`
-      )
+      if (!response.ok) {
+        const errorData = await response.json().catch(() => ({}))
+        console.warn(
+          'Failed to delete session cookie:',
+          errorData.message || response.statusText
+        )
+      }
+    } catch (error) {
+      console.warn('Failed to delete session cookie:', error)
     }
   }
 
diff --git a/src/platform/cloud/onboarding/CloudAuthTimeoutView.vue b/src/platform/cloud/onboarding/CloudAuthTimeoutView.vue
index 3e403a6ea1..3ca7907623 100644
--- a/src/platform/cloud/onboarding/CloudAuthTimeoutView.vue
+++ b/src/platform/cloud/onboarding/CloudAuthTimeoutView.vue
@@ -9,7 +9,7 @@
       </p>
 
       <!-- Troubleshooting Section -->
-      <div class="mb-4 rounded bg-secondary-background px-3 py-2 text-left">
+      <div class="mb-4 rounded-sm bg-secondary-background px-3 py-2 text-left">
         <h3 class="mb-2 text-sm font-semibold text-text-primary">
           {{ $t('cloudOnboarding.authTimeout.troubleshooting') }}
         </h3>
@@ -28,7 +28,7 @@
       <!-- Technical Details (Collapsible) -->
       <div v-if="errorMessage" class="mb-4 text-left">
         <button
-          class="flex w-full items-center justify-between rounded bg-secondary-background px-4 py-2 text-sm text-text-secondary transition-colors hover:bg-secondary-background-hover border-0"
+          class="flex w-full items-center justify-between rounded-sm border-0 bg-secondary-background px-4 py-2 text-sm text-text-secondary transition-colors hover:bg-secondary-background-hover"
           @click="showTechnicalDetails = !showTechnicalDetails"
         >
           <span>{{ $t('cloudOnboarding.authTimeout.technicalDetails') }}</span>
@@ -41,7 +41,7 @@
         </button>
         <div
           v-if="showTechnicalDetails"
-          class="mt-2 rounded border-muted-background border p-4 font-mono text-xs text-muted-foreground break-all"
+          class="mt-2 rounded-sm border border-muted-background p-4 font-mono text-xs break-all text-muted-foreground"
         >
           {{ errorMessage }}
         </div>
diff --git a/src/platform/cloud/onboarding/CloudForgotPasswordView.vue b/src/platform/cloud/onboarding/CloudForgotPasswordView.vue
index 93add77577..37d90d67a0 100644
--- a/src/platform/cloud/onboarding/CloudForgotPasswordView.vue
+++ b/src/platform/cloud/onboarding/CloudForgotPasswordView.vue
@@ -3,7 +3,7 @@
     <div class="max-w-[100vw] p-2 lg:w-96">
       <!-- Header -->
       <div class="mb-8 flex flex-col gap-4">
-        <h1 class="my-0 text-xl leading-normal font-medium">
+        <h1 class="my-0 text-xl/normal font-medium">
           {{ t('cloudForgotPassword_title') }}
         </h1>
         <p class="my-0 text-base text-muted">
@@ -52,7 +52,7 @@
           <Button
             type="button"
             variant="secondary"
-            class="h-10 bg-[#2d2e32]"
+            class="h-10 bg-charcoal-500"
             @click="navigateToLogin"
           >
             {{ t('cloudForgotPassword_backToLogin') }}
diff --git a/src/platform/cloud/onboarding/CloudLoginView.vue b/src/platform/cloud/onboarding/CloudLoginView.vue
index b7d1cd1315..abdf2303e3 100644
--- a/src/platform/cloud/onboarding/CloudLoginView.vue
+++ b/src/platform/cloud/onboarding/CloudLoginView.vue
@@ -2,14 +2,30 @@
   <div class="flex h-full items-center justify-center p-8">
     <div class="max-w-screen p-2 lg:w-96">
       <!-- Header -->
-      <div class="mt-6 mb-8 flex flex-col gap-4">
-        <h1 class="my-0 text-xl leading-normal font-medium">
+      <div class="mb-8 flex flex-col gap-4">
+        <h1 class="my-0 text-xl/normal font-medium">
           {{ t('auth.login.title') }}
         </h1>
-        <p class="my-0 text-base">
-          <span class="text-muted">{{ t('auth.login.newUser') }}</span>
+        <i18n-t
+          v-if="isFreeTierEnabled"
+          keypath="auth.login.signUpFreeTierPromo"
+          tag="p"
+          class="my-0 text-base text-muted"
+          :plural="freeTierCredits ?? undefined"
+        >
+          <template #signUp>
+            <span
+              class="cursor-pointer text-blue-500"
+              @click="navigateToSignup"
+              >{{ t('auth.login.signUp') }}</span
+            >
+          </template>
+          <template #credits>{{ freeTierCredits }}</template>
+        </i18n-t>
+        <p v-else class="my-0 text-base text-muted">
+          {{ t('auth.login.newUser') }}
           <span
-            class="ml-1 cursor-pointer text-blue-500"
+            class="cursor-pointer text-blue-500"
             @click="navigateToSignup"
             >{{ t('auth.login.signUp') }}</span
           >
@@ -20,36 +36,49 @@
         {{ t('auth.login.insecureContextWarning') }}
       </Message>
 
-      <!-- Form -->
-      <CloudSignInForm :auth-error="authError" @submit="signInWithEmail" />
+      <template v-if="!showEmailForm">
+        <!-- OAuth Buttons (primary) -->
+        <div class="flex flex-col gap-4">
+          <Button type="button" class="h-10 w-full" @click="signInWithGoogle">
+            <i class="pi pi-google mr-2"></i>
+            {{ t('auth.login.loginWithGoogle') }}
+          </Button>
 
-      <!-- Divider -->
-      <Divider align="center" layout="horizontal" class="my-8">
-        <span class="text-muted">{{ t('auth.login.orContinueWith') }}</span>
-      </Divider>
+          <Button
+            type="button"
+            class="h-10 bg-charcoal-500"
+            variant="secondary"
+            @click="signInWithGithub"
+          >
+            <i class="pi pi-github mr-2"></i>
+            {{ t('auth.login.loginWithGithub') }}
+          </Button>
+        </div>
 
-      <!-- Social Login Buttons -->
-      <div class="flex flex-col gap-6">
-        <Button
-          type="button"
-          class="h-10 bg-[#2d2e32]"
-          variant="secondary"
-          @click="signInWithGoogle"
-        >
-          <i class="pi pi-google mr-2"></i>
-          {{ t('auth.login.loginWithGoogle') }}
-        </Button>
+        <div class="mt-6 text-center">
+          <Button
+            variant="muted-textonly"
+            class="text-sm underline"
+            @click="switchToEmailForm"
+          >
+            {{ t('auth.login.useEmailInstead') }}
+          </Button>
+        </div>
+      </template>
 
-        <Button
-          type="button"
-          class="h-10 bg-[#2d2e32]"
-          variant="secondary"
-          @click="signInWithGithub"
-        >
-          <i class="pi pi-github mr-2"></i>
-          {{ t('auth.login.loginWithGithub') }}
-        </Button>
-      </div>
+      <template v-else>
+        <CloudSignInForm :auth-error="authError" @submit="signInWithEmail" />
+
+        <div class="mt-4 text-center">
+          <Button
+            variant="muted-textonly"
+            class="text-sm underline"
+            @click="switchToSocialLogin"
+          >
+            {{ t('auth.login.backToSocialLogin') }}
+          </Button>
+        </div>
+      </template>
 
       <!-- Terms & Contact -->
       <p class="mt-5 text-sm text-gray-600">
@@ -75,7 +104,6 @@
 </template>
 
 <script setup lang="ts">
-import Divider from 'primevue/divider'
 import Message from 'primevue/message'
 import { ref } from 'vue'
 import { useI18n } from 'vue-i18n'
@@ -84,6 +112,8 @@ import { useRoute, useRouter } from 'vue-router'
 import Button from '@/components/ui/button/Button.vue'
 import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
 import CloudSignInForm from '@/platform/cloud/onboarding/components/CloudSignInForm.vue'
+import { useFreeTierOnboarding } from '@/platform/cloud/onboarding/composables/useFreeTierOnboarding'
+import { getSafePreviousFullPath } from '@/platform/cloud/onboarding/utils/previousFullPath'
 import { useToastStore } from '@/platform/updates/common/toastStore'
 import type { SignInData } from '@/schemas/signInSchema'
 
@@ -91,12 +121,22 @@ const { t } = useI18n()
 const router = useRouter()
 const route = useRoute()
 const authActions = useFirebaseAuthActions()
-const isSecureContext = window.isSecureContext
+const isSecureContext = globalThis.isSecureContext
 const authError = ref('')
 const toastStore = useToastStore()
+const showEmailForm = ref(false)
+const { isFreeTierEnabled, freeTierCredits } = useFreeTierOnboarding()
 
-const navigateToSignup = () => {
-  void router.push({ name: 'cloud-signup', query: route.query })
+function switchToEmailForm() {
+  showEmailForm.value = true
+}
+
+function switchToSocialLogin() {
+  showEmailForm.value = false
+}
+
+const navigateToSignup = async () => {
+  await router.push({ name: 'cloud-signup', query: route.query })
 }
 
 const onSuccess = async () => {
@@ -105,6 +145,13 @@ const onSuccess = async () => {
     summary: 'Login Completed',
     life: 2000
   })
+
+  const previousFullPath = getSafePreviousFullPath(route.query)
+  if (previousFullPath) {
+    await router.replace(previousFullPath)
+    return
+  }
+
   await router.push({ name: 'cloud-user-check' })
 }
 
diff --git a/src/platform/cloud/onboarding/CloudSignupView.vue b/src/platform/cloud/onboarding/CloudSignupView.vue
index 5a8bf5c3e8..b3445f4ed4 100644
--- a/src/platform/cloud/onboarding/CloudSignupView.vue
+++ b/src/platform/cloud/onboarding/CloudSignupView.vue
@@ -3,7 +3,7 @@
     <div class="max-w-screen p-2 lg:w-96">
       <!-- Header -->
       <div class="mb-8 flex flex-col gap-4">
-        <h1 class="my-0 text-xl leading-normal font-medium">
+        <h1 class="my-0 text-xl/normal font-medium">
           {{ t('auth.signup.title') }}
         </h1>
         <p class="my-0 text-base">
@@ -22,42 +22,77 @@
         {{ t('auth.login.insecureContextWarning') }}
       </Message>
 
-      <!-- Form -->
-      <Message v-if="userIsInChina" severity="warn" class="mb-4">
-        {{ t('auth.signup.regionRestrictionChina') }}
-      </Message>
-      <SignUpForm v-else :auth-error="authError" @submit="signUpWithEmail" />
+      <template v-if="!showEmailForm">
+        <p v-if="isFreeTierEnabled" class="mb-4 text-sm text-muted-foreground">
+          {{
+            freeTierCredits
+              ? t('auth.login.freeTierDescription', {
+                  credits: freeTierCredits
+                })
+              : t('auth.login.freeTierDescriptionGeneric')
+          }}
+        </p>
 
-      <!-- Divider -->
-      <Divider align="center" layout="horizontal" class="my-8">
-        <span class="text-muted">{{ t('auth.login.orContinueWith') }}</span>
-      </Divider>
+        <!-- OAuth Buttons (primary) -->
+        <div class="flex flex-col gap-4">
+          <div class="relative">
+            <Button type="button" class="h-10 w-full" @click="signInWithGoogle">
+              <i class="pi pi-google mr-2"></i>
+              {{ t('auth.signup.signUpWithGoogle') }}
+            </Button>
+            <span
+              v-if="isFreeTierEnabled"
+              class="absolute -top-2.5 -right-2.5 rounded-full bg-yellow-400 px-2 py-0.5 text-[10px] font-bold whitespace-nowrap text-gray-900"
+            >
+              {{ t('auth.login.freeTierBadge') }}
+            </span>
+          </div>
 
-      <!-- Social Login Buttons -->
-      <div class="flex flex-col gap-6">
-        <Button
-          type="button"
-          class="h-10 bg-[#2d2e32]"
-          variant="secondary"
-          @click="signInWithGoogle"
-        >
-          <i class="pi pi-google mr-2"></i>
-          {{ t('auth.signup.signUpWithGoogle') }}
-        </Button>
+          <Button
+            type="button"
+            class="h-10 bg-charcoal-500"
+            variant="secondary"
+            @click="signInWithGithub"
+          >
+            <i class="pi pi-github mr-2"></i>
+            {{ t('auth.signup.signUpWithGithub') }}
+          </Button>
+        </div>
 
-        <Button
-          type="button"
-          class="h-10 bg-[#2d2e32]"
-          variant="secondary"
-          @click="signInWithGithub"
-        >
-          <i class="pi pi-github mr-2"></i>
-          {{ t('auth.signup.signUpWithGithub') }}
-        </Button>
-      </div>
+        <div class="mt-6 text-center">
+          <Button
+            variant="muted-textonly"
+            class="text-sm underline"
+            @click="switchToEmailForm"
+          >
+            {{ t('auth.login.useEmailInstead') }}
+          </Button>
+        </div>
+      </template>
+
+      <template v-else>
+        <Message v-if="isFreeTierEnabled" severity="warn" class="mb-4">
+          {{ t('auth.signup.emailNotEligibleForFreeTier') }}
+        </Message>
+
+        <Message v-if="userIsInChina" severity="warn" class="mb-4">
+          {{ t('auth.signup.regionRestrictionChina') }}
+        </Message>
+        <SignUpForm v-else :auth-error="authError" @submit="signUpWithEmail" />
+
+        <div class="mt-4 text-center">
+          <Button
+            variant="muted-textonly"
+            class="text-sm underline"
+            @click="switchToSocialLogin"
+          >
+            {{ t('auth.login.backToSocialLogin') }}
+          </Button>
+        </div>
+      </template>
 
       <!-- Terms & Contact -->
-      <div class="mt-5 text-sm text-gray-600">
+      <p class="mt-5 text-sm text-gray-600">
         {{ t('auth.login.termsText') }}
         <a
           href="https://www.comfy.org/terms-of-service"
@@ -68,30 +103,29 @@
         </a>
         {{ t('auth.login.andText') }}
         <a
-          href="/privacy-policy"
+          href="https://www.comfy.org/privacy-policy"
           target="_blank"
           class="cursor-pointer text-blue-400 no-underline"
         >
           {{ t('auth.login.privacyLink') }} </a
         >.
-        <p class="mt-2">
-          {{ t('cloudWaitlist_questionsText') }}
-          <a
-            href="https://support.comfy.org"
-            class="cursor-pointer text-blue-400 no-underline"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            {{ t('cloudWaitlist_contactLink') }}</a
-          >.
-        </p>
-      </div>
+      </p>
+      <p class="mt-2 text-sm text-gray-600">
+        {{ t('cloudWaitlist_questionsText') }}
+        <a
+          href="https://support.comfy.org"
+          class="cursor-pointer text-blue-400 no-underline"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          {{ t('cloudWaitlist_contactLink') }}</a
+        >.
+      </p>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import Divider from 'primevue/divider'
 import Message from 'primevue/message'
 import { onMounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
@@ -100,6 +134,8 @@ import { useRoute, useRouter } from 'vue-router'
 import SignUpForm from '@/components/dialog/content/signin/SignUpForm.vue'
 import Button from '@/components/ui/button/Button.vue'
 import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
+import { useFreeTierOnboarding } from '@/platform/cloud/onboarding/composables/useFreeTierOnboarding'
+import { getSafePreviousFullPath } from '@/platform/cloud/onboarding/utils/previousFullPath'
 import { isCloud } from '@/platform/distribution/types'
 import { useTelemetry } from '@/platform/telemetry'
 import { useToastStore } from '@/platform/updates/common/toastStore'
@@ -110,13 +146,21 @@ const { t } = useI18n()
 const router = useRouter()
 const route = useRoute()
 const authActions = useFirebaseAuthActions()
-const isSecureContext = window.isSecureContext
+const isSecureContext = globalThis.isSecureContext
 const authError = ref('')
 const userIsInChina = ref(false)
 const toastStore = useToastStore()
+const telemetry = useTelemetry()
+const {
+  showEmailForm,
+  freeTierCredits,
+  isFreeTierEnabled,
+  switchToEmailForm,
+  switchToSocialLogin
+} = useFreeTierOnboarding()
 
-const navigateToLogin = () => {
-  void router.push({ name: 'cloud-login', query: route.query })
+const navigateToLogin = async () => {
+  await router.push({ name: 'cloud-login', query: route.query })
 }
 
 const onSuccess = async () => {
@@ -125,7 +169,14 @@ const onSuccess = async () => {
     summary: 'Sign up Completed',
     life: 2000
   })
-  // Direct redirect to main app - email verification removed
+
+  const previousFullPath = getSafePreviousFullPath(route.query)
+  if (previousFullPath) {
+    await router.replace(previousFullPath)
+    return
+  }
+
+  // Default redirect to the normal onboarding flow
   await router.push({ path: '/', query: route.query })
 }
 
@@ -153,7 +204,7 @@ const signUpWithEmail = async (values: SignUpData) => {
 onMounted(async () => {
   // Track signup screen opened
   if (isCloud) {
-    useTelemetry()?.trackSignupOpened()
+    telemetry?.trackSignupOpened()
   }
 
   userIsInChina.value = await isInChina()
diff --git a/src/platform/cloud/onboarding/CloudSubscriptionRedirectView.test.ts b/src/platform/cloud/onboarding/CloudSubscriptionRedirectView.test.ts
new file mode 100644
index 0000000000..de86279241
--- /dev/null
+++ b/src/platform/cloud/onboarding/CloudSubscriptionRedirectView.test.ts
@@ -0,0 +1,167 @@
+import { mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, test, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+import CloudSubscriptionRedirectView from './CloudSubscriptionRedirectView.vue'
+
+const flushPromises = () => new Promise((resolve) => setTimeout(resolve, 0))
+
+// Router mocks
+let mockQuery: Record<string, unknown> = {}
+const mockRouterPush = vi.fn()
+
+vi.mock('vue-router', () => ({
+  useRoute: () => ({
+    query: mockQuery
+  }),
+  useRouter: () => ({
+    push: mockRouterPush
+  })
+}))
+
+// Firebase / subscription mocks
+const authActionMocks = vi.hoisted(() => ({
+  reportError: vi.fn(),
+  accessBillingPortal: vi.fn()
+}))
+
+vi.mock('@/composables/auth/useFirebaseAuthActions', () => ({
+  useFirebaseAuthActions: () => authActionMocks
+}))
+
+vi.mock('@/composables/useErrorHandling', () => ({
+  useErrorHandling: () => ({
+    wrapWithErrorHandlingAsync:
+      <T extends (...args: never[]) => unknown>(fn: T) =>
+      (...args: Parameters<T>) =>
+        fn(...args)
+  })
+}))
+
+const subscriptionMocks = vi.hoisted(() => ({
+  isActiveSubscription: { value: false },
+  isInitialized: { value: true },
+  subscriptionStatus: { value: null }
+}))
+
+vi.mock('@/platform/cloud/subscription/composables/useSubscription', () => ({
+  useSubscription: () => subscriptionMocks
+}))
+
+vi.mock('@/composables/billing/useBillingContext', () => ({
+  useBillingContext: () => subscriptionMocks
+}))
+
+// Avoid real network / isCloud behavior
+const mockPerformSubscriptionCheckout = vi.fn()
+vi.mock('@/platform/cloud/subscription/utils/subscriptionCheckoutUtil', () => ({
+  performSubscriptionCheckout: (...args: unknown[]) =>
+    mockPerformSubscriptionCheckout(...args)
+}))
+
+const createI18nInstance = () =>
+  createI18n({
+    legacy: false,
+    locale: 'en',
+    messages: {
+      en: {
+        cloudOnboarding: {
+          skipToCloudApp: 'Skip to the cloud app'
+        },
+        g: {
+          comfyOrgLogoAlt: 'Comfy org logo'
+        },
+        subscription: {
+          subscribeTo: 'Subscribe to {plan}',
+          tiers: {
+            standard: { name: 'Standard' },
+            creator: { name: 'Creator' },
+            pro: { name: 'Pro' }
+          }
+        }
+      }
+    }
+  })
+
+const mountView = async (query: Record<string, unknown>) => {
+  mockQuery = query
+
+  const wrapper = mount(CloudSubscriptionRedirectView, {
+    global: {
+      plugins: [createI18nInstance()]
+    }
+  })
+
+  await flushPromises()
+
+  return { wrapper }
+}
+
+describe('CloudSubscriptionRedirectView', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockQuery = {}
+    subscriptionMocks.isActiveSubscription.value = false
+    subscriptionMocks.isInitialized.value = true
+  })
+
+  test('redirects to home when subscriptionType is missing', async () => {
+    await mountView({})
+
+    expect(mockRouterPush).toHaveBeenCalledWith('/')
+  })
+
+  test('redirects to home when subscriptionType is invalid', async () => {
+    await mountView({ tier: 'invalid' })
+
+    expect(mockRouterPush).toHaveBeenCalledWith('/')
+  })
+
+  test('shows subscription copy when subscriptionType is valid', async () => {
+    const { wrapper } = await mountView({ tier: 'creator' })
+
+    // Should not redirect to home
+    expect(mockRouterPush).not.toHaveBeenCalledWith('/')
+
+    // Shows copy under logo
+    expect(wrapper.text()).toContain('Subscribe to Creator')
+
+    // Triggers checkout flow
+    expect(mockPerformSubscriptionCheckout).toHaveBeenCalledWith(
+      'creator',
+      'monthly',
+      false
+    )
+
+    // Shows loading affordances
+    expect(wrapper.findComponent({ name: 'ProgressSpinner' }).exists()).toBe(
+      true
+    )
+    const skipLink = wrapper.get('a[href="/"]')
+    expect(skipLink.text()).toContain('Skip to the cloud app')
+  })
+
+  test('opens billing portal when subscription is already active', async () => {
+    subscriptionMocks.isActiveSubscription.value = true
+
+    await mountView({ tier: 'creator' })
+
+    expect(mockRouterPush).not.toHaveBeenCalledWith('/')
+    expect(authActionMocks.accessBillingPortal).toHaveBeenCalledTimes(1)
+    expect(mockPerformSubscriptionCheckout).not.toHaveBeenCalled()
+  })
+
+  test('uses first value when subscriptionType is an array', async () => {
+    const { wrapper } = await mountView({
+      tier: ['creator', 'pro']
+    })
+
+    expect(mockRouterPush).not.toHaveBeenCalledWith('/')
+    expect(wrapper.text()).toContain('Subscribe to Creator')
+    expect(mockPerformSubscriptionCheckout).toHaveBeenCalledWith(
+      'creator',
+      'monthly',
+      false
+    )
+  })
+})
diff --git a/src/platform/cloud/onboarding/CloudSubscriptionRedirectView.vue b/src/platform/cloud/onboarding/CloudSubscriptionRedirectView.vue
new file mode 100644
index 0000000000..6d5f626f87
--- /dev/null
+++ b/src/platform/cloud/onboarding/CloudSubscriptionRedirectView.vue
@@ -0,0 +1,128 @@
+<script setup lang="ts">
+import { until } from '@vueuse/core'
+import Button from 'primevue/button'
+import ProgressSpinner from 'primevue/progressspinner'
+import { computed, onMounted, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+import { useRoute, useRouter } from 'vue-router'
+
+import { useBillingContext } from '@/composables/billing/useBillingContext'
+import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
+import { useErrorHandling } from '@/composables/useErrorHandling'
+import type { TierKey } from '@/platform/cloud/subscription/constants/tierPricing'
+import { performSubscriptionCheckout } from '@/platform/cloud/subscription/utils/subscriptionCheckoutUtil'
+
+import type { BillingCycle } from '../subscription/utils/subscriptionTierRank'
+
+const { t } = useI18n()
+const route = useRoute()
+const router = useRouter()
+const { reportError, accessBillingPortal } = useFirebaseAuthActions()
+const { wrapWithErrorHandlingAsync } = useErrorHandling()
+
+const { isActiveSubscription, isInitialized } = useBillingContext()
+
+const selectedTierKey = ref<TierKey | null>(null)
+
+const tierDisplayName = computed(() => {
+  if (!selectedTierKey.value) return ''
+  const names: Record<TierKey, string> = {
+    free: t('subscription.tiers.free.name'),
+    standard: t('subscription.tiers.standard.name'),
+    creator: t('subscription.tiers.creator.name'),
+    pro: t('subscription.tiers.pro.name'),
+    founder: t('subscription.tiers.founder.name')
+  }
+  return names[selectedTierKey.value]
+})
+
+const runRedirect = wrapWithErrorHandlingAsync(async () => {
+  const rawType = route.query.tier
+  const rawCycle = route.query.cycle
+  let tierKeyParam: string | null = null
+  let cycleParam = 'monthly'
+
+  if (typeof rawType === 'string') {
+    tierKeyParam = rawType
+  } else if (Array.isArray(rawType) && rawType[0]) {
+    tierKeyParam = rawType[0]
+  }
+
+  if (typeof rawCycle === 'string') {
+    cycleParam = rawCycle
+  } else if (Array.isArray(rawCycle) && rawCycle[0]) {
+    cycleParam = rawCycle[0]
+  }
+
+  if (!tierKeyParam) {
+    await router.push('/')
+    return
+  }
+
+  // Only paid tiers can be checked out via redirect
+  const validTierKeys: TierKey[] = ['standard', 'creator', 'pro', 'founder']
+  if (!(validTierKeys as string[]).includes(tierKeyParam)) {
+    await router.push('/')
+    return
+  }
+
+  const tierKey = tierKeyParam as TierKey
+
+  selectedTierKey.value = tierKey
+
+  const validCycles: BillingCycle[] = ['monthly', 'yearly']
+  if (!cycleParam || !(validCycles as string[]).includes(cycleParam)) {
+    cycleParam = 'monthly'
+  }
+
+  if (!isInitialized.value) {
+    await until(isInitialized).toBe(true)
+  }
+
+  if (isActiveSubscription.value) {
+    await accessBillingPortal(undefined, false)
+  } else {
+    await performSubscriptionCheckout(
+      tierKey,
+      cycleParam as BillingCycle,
+      false
+    )
+  }
+}, reportError)
+
+onMounted(() => {
+  void runRedirect()
+})
+</script>
+
+<template>
+  <div
+    class="bg-comfy-menu-secondary-bg flex size-full items-center justify-center"
+  >
+    <div class="flex flex-col items-center gap-4">
+      <img
+        src="/assets/images/comfy-logo-single.svg"
+        :alt="t('g.comfyOrgLogoAlt')"
+        class="size-16"
+      />
+      <p
+        v-if="selectedTierKey"
+        class="font-inter text-base/normal font-normal text-base-foreground"
+      >
+        {{
+          t('subscription.subscribeTo', {
+            plan: tierDisplayName
+          })
+        }}
+      </p>
+      <ProgressSpinner v-if="selectedTierKey" class="size-8" stroke-width="4" />
+      <Button
+        v-if="selectedTierKey"
+        as="a"
+        href="/"
+        link
+        :label="t('cloudOnboarding.skipToCloudApp')"
+      />
+    </div>
+  </div>
+</template>
diff --git a/src/platform/cloud/onboarding/UserCheckView.vue b/src/platform/cloud/onboarding/UserCheckView.vue
index e2186ff483..a5f14ae9f8 100644
--- a/src/platform/cloud/onboarding/UserCheckView.vue
+++ b/src/platform/cloud/onboarding/UserCheckView.vue
@@ -15,7 +15,7 @@
     </div>
   </div>
   <div v-else class="flex items-center justify-center">
-    <ProgressSpinner class="h-8 w-8" />
+    <ProgressSpinner class="size-8" />
   </div>
 </template>
 
@@ -78,7 +78,7 @@ const {
     }
 
     // User is fully onboarded (active or whitelist check disabled)
-    window.location.href = '/'
+    globalThis.location.href = '/'
   }),
   null,
   { resetOnExecute: false }
diff --git a/src/platform/cloud/onboarding/assets/css/fonts.css b/src/platform/cloud/onboarding/assets/css/fonts.css
index a3464f5f2d..a6feae5f76 100644
--- a/src/platform/cloud/onboarding/assets/css/fonts.css
+++ b/src/platform/cloud/onboarding/assets/css/fonts.css
@@ -30,4 +30,4 @@
   text-shadow: 0 4px 4px rgb(0 0 0 / 0.25);
   /* Figma has leading-trim/text-edge which CSS doesn't support; emulate with tight line-height */
   line-height: 1.1;
-}
\ No newline at end of file
+}
diff --git a/src/platform/cloud/onboarding/auth.ts b/src/platform/cloud/onboarding/auth.ts
index 75d183dc66..e5d148303f 100644
--- a/src/platform/cloud/onboarding/auth.ts
+++ b/src/platform/cloud/onboarding/auth.ts
@@ -18,9 +18,9 @@ function captureApiError(
   errorType: 'http_error' | 'network_error',
   httpStatus?: number,
   operation?: string,
-  extraContext?: Record<string, any>
+  extraContext?: Record<string, unknown>
 ) {
-  const tags: Record<string, any> = {
+  const tags: Record<string, string | number> = {
     api_endpoint: endpoint,
     error_type: errorType
   }
@@ -33,7 +33,7 @@ function captureApiError(
     tags.operation = operation
   }
 
-  const sentryOptions: any = {
+  const sentryOptions: Sentry.ExclusiveEventHintOrCaptureContext = {
     tags,
     extra: extraContext ? { ...extraContext } : undefined
   }
@@ -127,53 +127,6 @@ export async function getSurveyCompletedStatus(): Promise<boolean> {
   }
 }
 
-// @ts-expect-error - Unused function kept for future use
-async function postSurveyStatus(): Promise<void> {
-  try {
-    const response = await api.fetchApi(`/settings/${ONBOARDING_SURVEY_KEY}`, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json'
-      },
-      body: JSON.stringify({ [ONBOARDING_SURVEY_KEY]: undefined })
-    })
-
-    if (!response.ok) {
-      const error = new Error(
-        `Failed to post survey status: ${response.statusText}`
-      )
-      captureApiError(
-        error,
-        '/settings/{key}',
-        'http_error',
-        response.status,
-        'post_survey_status',
-        {
-          route_template: '/settings/{key}',
-          route_actual: `/settings/${ONBOARDING_SURVEY_KEY}`
-        }
-      )
-      throw error
-    }
-  } catch (error) {
-    // Only capture network errors (not HTTP errors we already captured)
-    if (!isHttpError(error, 'Failed to post survey status:')) {
-      captureApiError(
-        error as Error,
-        '/settings/{key}',
-        'network_error',
-        undefined,
-        'post_survey_status',
-        {
-          route_template: '/settings/{key}',
-          route_actual: `/settings/${ONBOARDING_SURVEY_KEY}`
-        }
-      )
-    }
-    throw error
-  }
-}
-
 export async function submitSurvey(
   survey: Record<string, unknown>
 ): Promise<void> {
diff --git a/src/platform/cloud/onboarding/components/CloudSignInForm.vue b/src/platform/cloud/onboarding/components/CloudSignInForm.vue
index 57718328c6..51981901e9 100644
--- a/src/platform/cloud/onboarding/components/CloudSignInForm.vue
+++ b/src/platform/cloud/onboarding/components/CloudSignInForm.vue
@@ -63,7 +63,7 @@
     </Message>
 
     <!-- Submit Button -->
-    <ProgressSpinner v-if="loading" class="h-8 w-8" />
+    <ProgressSpinner v-if="loading" class="size-8" />
     <Button
       v-else
       type="submit"
diff --git a/src/platform/cloud/onboarding/components/CloudTemplate.vue b/src/platform/cloud/onboarding/components/CloudTemplate.vue
index 24f9765f8a..f96acd5ea7 100644
--- a/src/platform/cloud/onboarding/components/CloudTemplate.vue
+++ b/src/platform/cloud/onboarding/components/CloudTemplate.vue
@@ -12,7 +12,7 @@
     <div class="relative hidden flex-1 overflow-hidden bg-black lg:block">
       <!-- Video Background -->
       <video
-        class="absolute inset-0 h-full w-full object-cover"
+        class="absolute inset-0 size-full object-cover"
         autoplay
         muted
         loop
@@ -22,7 +22,7 @@
         <source :src="videoSrc" type="video/mp4" />
       </video>
 
-      <div class="absolute inset-0 h-full w-full bg-black/30"></div>
+      <div class="absolute inset-0 size-full bg-black/30"></div>
 
       <!-- Optional Overlay for better visual -->
       <div
@@ -62,14 +62,17 @@
 </template>
 
 <script setup lang="ts">
+import { useI18n } from 'vue-i18n'
+
 import Button from '@/components/ui/button/Button.vue'
-import { t } from '@/i18n'
 import videoPoster from '@/platform/cloud/onboarding/assets/videos/thumbnail.png'
 import videoSrc from '@/platform/cloud/onboarding/assets/videos/video.mp4'
 import CloudLogo from '@/platform/cloud/onboarding/components/CloudLogo.vue'
 import CloudTemplateFooter from '@/platform/cloud/onboarding/components/CloudTemplateFooter.vue'
 import BaseViewTemplate from '@/views/templates/BaseViewTemplate.vue'
 
+const { t } = useI18n()
+
 const handleDownloadClick = () => {
   window.open('https://www.comfy.org/download', '_blank')
 }
diff --git a/src/platform/cloud/onboarding/composables/useFreeTierOnboarding.test.ts b/src/platform/cloud/onboarding/composables/useFreeTierOnboarding.test.ts
new file mode 100644
index 0000000000..347299f0b6
--- /dev/null
+++ b/src/platform/cloud/onboarding/composables/useFreeTierOnboarding.test.ts
@@ -0,0 +1,61 @@
+import { describe, expect, it, vi } from 'vitest'
+
+import { useFreeTierOnboarding } from '@/platform/cloud/onboarding/composables/useFreeTierOnboarding'
+
+const mockRemoteConfig = vi.hoisted(() => ({
+  value: { free_tier_credits: 50 } as Record<string, unknown>
+}))
+
+vi.mock('@/platform/remoteConfig/remoteConfig', () => ({
+  remoteConfig: mockRemoteConfig
+}))
+
+describe('useFreeTierOnboarding', () => {
+  describe('showEmailForm', () => {
+    it('starts as false', () => {
+      const { showEmailForm } = useFreeTierOnboarding()
+      expect(showEmailForm.value).toBe(false)
+    })
+
+    it('switchToEmailForm sets it to true', () => {
+      const { showEmailForm, switchToEmailForm } = useFreeTierOnboarding()
+      switchToEmailForm()
+      expect(showEmailForm.value).toBe(true)
+    })
+
+    it('switchToSocialLogin sets it back to false', () => {
+      const { showEmailForm, switchToEmailForm, switchToSocialLogin } =
+        useFreeTierOnboarding()
+      switchToEmailForm()
+      switchToSocialLogin()
+      expect(showEmailForm.value).toBe(false)
+    })
+  })
+
+  describe('freeTierCredits', () => {
+    it('returns value from remote config', () => {
+      const { freeTierCredits } = useFreeTierOnboarding()
+      expect(freeTierCredits.value).toBe(50)
+    })
+  })
+
+  describe('isFreeTierEnabled', () => {
+    it('returns true when remote config says enabled', () => {
+      mockRemoteConfig.value.new_free_tier_subscriptions = true
+      const { isFreeTierEnabled } = useFreeTierOnboarding()
+      expect(isFreeTierEnabled.value).toBe(true)
+    })
+
+    it('returns false when remote config says disabled', () => {
+      mockRemoteConfig.value.new_free_tier_subscriptions = false
+      const { isFreeTierEnabled } = useFreeTierOnboarding()
+      expect(isFreeTierEnabled.value).toBe(false)
+    })
+
+    it('defaults to false when not set in remote config', () => {
+      mockRemoteConfig.value = { free_tier_credits: 50 }
+      const { isFreeTierEnabled } = useFreeTierOnboarding()
+      expect(isFreeTierEnabled.value).toBe(false)
+    })
+  })
+})
diff --git a/src/platform/cloud/onboarding/composables/useFreeTierOnboarding.ts b/src/platform/cloud/onboarding/composables/useFreeTierOnboarding.ts
new file mode 100644
index 0000000000..cd4a2122df
--- /dev/null
+++ b/src/platform/cloud/onboarding/composables/useFreeTierOnboarding.ts
@@ -0,0 +1,28 @@
+import { computed, ref } from 'vue'
+
+import { getTierCredits } from '@/platform/cloud/subscription/constants/tierPricing'
+import { remoteConfig } from '@/platform/remoteConfig/remoteConfig'
+
+export function useFreeTierOnboarding() {
+  const showEmailForm = ref(false)
+  const freeTierCredits = computed(() => getTierCredits('free'))
+  const isFreeTierEnabled = computed(
+    () => remoteConfig.value.new_free_tier_subscriptions ?? false
+  )
+
+  function switchToEmailForm() {
+    showEmailForm.value = true
+  }
+
+  function switchToSocialLogin() {
+    showEmailForm.value = false
+  }
+
+  return {
+    showEmailForm,
+    freeTierCredits,
+    isFreeTierEnabled,
+    switchToEmailForm,
+    switchToSocialLogin
+  }
+}
diff --git a/src/platform/cloud/onboarding/onboardingCloudRoutes.ts b/src/platform/cloud/onboarding/onboardingCloudRoutes.ts
index 1a613c02e5..52ffc79433 100644
--- a/src/platform/cloud/onboarding/onboardingCloudRoutes.ts
+++ b/src/platform/cloud/onboarding/onboardingCloudRoutes.ts
@@ -65,6 +65,13 @@ export const cloudOnboardingRoutes: RouteRecordRaw[] = [
         component: () =>
           import('@/platform/cloud/onboarding/CloudAuthTimeoutView.vue'),
         props: true
+      },
+      {
+        path: 'subscribe',
+        name: 'cloud-subscribe',
+        component: () =>
+          import('@/platform/cloud/onboarding/CloudSubscriptionRedirectView.vue'),
+        meta: { requiresAuth: true }
       }
     ]
   }
diff --git a/src/platform/cloud/onboarding/skeletons/CloudLoginViewSkeleton.vue b/src/platform/cloud/onboarding/skeletons/CloudLoginViewSkeleton.vue
index 9727cb6bbf..1cf6767420 100644
--- a/src/platform/cloud/onboarding/skeletons/CloudLoginViewSkeleton.vue
+++ b/src/platform/cloud/onboarding/skeletons/CloudLoginViewSkeleton.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex h-full items-center justify-center p-8">
     <div class="max-w-[100vw] lg:w-96">
-      <div class="rounded-lg bg-[#2d2e32] p-4">
+      <div class="rounded-lg bg-charcoal-500 p-4">
         <Skeleton width="60%" height="1.125rem" class="mb-2" />
         <Skeleton width="90%" height="1rem" class="mb-2" />
         <Skeleton width="80%" height="1rem" />
diff --git a/src/platform/cloud/onboarding/utils/previousFullPath.test.ts b/src/platform/cloud/onboarding/utils/previousFullPath.test.ts
new file mode 100644
index 0000000000..d74c1e609a
--- /dev/null
+++ b/src/platform/cloud/onboarding/utils/previousFullPath.test.ts
@@ -0,0 +1,38 @@
+import { describe, expect, test } from 'vitest'
+import type { LocationQuery } from 'vue-router'
+
+import { getSafePreviousFullPath } from './previousFullPath'
+
+describe('getSafePreviousFullPath', () => {
+  test('returns null when missing', () => {
+    expect(getSafePreviousFullPath({})).toBeNull()
+  })
+
+  test('decodes and returns internal relative paths', () => {
+    const query: LocationQuery = {
+      previousFullPath: encodeURIComponent('/some/path?x=1')
+    }
+    expect(getSafePreviousFullPath(query)).toBe('/some/path?x=1')
+  })
+
+  test('rejects protocol-relative urls', () => {
+    const query: LocationQuery = {
+      previousFullPath: encodeURIComponent('//evil.com')
+    }
+    expect(getSafePreviousFullPath(query)).toBeNull()
+  })
+
+  test('rejects absolute external urls', () => {
+    const query: LocationQuery = {
+      previousFullPath: encodeURIComponent('https://evil.com/path')
+    }
+    expect(getSafePreviousFullPath(query)).toBeNull()
+  })
+
+  test('rejects malformed encodings', () => {
+    const query: LocationQuery = {
+      previousFullPath: '%E0%A4%A'
+    }
+    expect(getSafePreviousFullPath(query)).toBeNull()
+  })
+})
diff --git a/src/platform/cloud/onboarding/utils/previousFullPath.ts b/src/platform/cloud/onboarding/utils/previousFullPath.ts
new file mode 100644
index 0000000000..9f6b257e00
--- /dev/null
+++ b/src/platform/cloud/onboarding/utils/previousFullPath.ts
@@ -0,0 +1,27 @@
+import type { LocationQuery } from 'vue-router'
+
+const decodeQueryParam = (value: string): string | null => {
+  try {
+    return decodeURIComponent(value)
+  } catch {
+    return null
+  }
+}
+
+const isSafeInternalRedirectPath = (path: string): boolean => {
+  // Must be a relative in-app path. Disallow protocol-relative URLs ("//evil.com").
+  return path.startsWith('/') && !path.startsWith('//')
+}
+
+export const getSafePreviousFullPath = (
+  query: LocationQuery
+): string | null => {
+  const raw = query.previousFullPath
+  const value = Array.isArray(raw) ? raw[0] : raw
+  if (!value) return null
+
+  const decoded = decodeQueryParam(value)
+  if (!decoded) return null
+
+  return isSafeInternalRedirectPath(decoded) ? decoded : null
+}
diff --git a/src/platform/cloud/subscription/components/FreeTierDialogContent.vue b/src/platform/cloud/subscription/components/FreeTierDialogContent.vue
new file mode 100644
index 0000000000..74ff5f37bb
--- /dev/null
+++ b/src/platform/cloud/subscription/components/FreeTierDialogContent.vue
@@ -0,0 +1,122 @@
+<template>
+  <div class="relative grid h-full grid-cols-5">
+    <!-- Custom close button -->
+    <Button
+      size="icon"
+      variant="muted-textonly"
+      class="absolute top-2.5 right-2.5 z-10 size-8 rounded-full p-0 text-white hover:bg-white/20"
+      :aria-label="$t('g.close')"
+      @click="$emit('close', false)"
+    >
+      <i class="pi pi-times" />
+    </Button>
+
+    <div
+      class="relative col-span-2 flex items-center justify-center overflow-hidden rounded-sm"
+    >
+      <video
+        autoplay
+        loop
+        muted
+        playsinline
+        class="h-full min-w-[125%] object-cover p-0"
+        style="margin-left: -20%"
+      >
+        <source
+          src="/assets/images/cloud-subscription.webm"
+          type="video/webm"
+        />
+      </video>
+    </div>
+
+    <div class="col-span-3 flex flex-col justify-between p-8">
+      <div>
+        <div class="flex flex-col gap-6">
+          <div class="text-sm text-text-primary">
+            <template v-if="reason === 'out_of_credits'">
+              {{ $t('subscription.freeTier.outOfCredits.title') }}
+            </template>
+            <template v-else-if="reason === 'top_up_blocked'">
+              {{ $t('subscription.freeTier.topUpBlocked.title') }}
+            </template>
+            <template v-else>
+              {{ $t('subscription.freeTier.title') }}
+            </template>
+          </div>
+
+          <p
+            v-if="reason === 'out_of_credits'"
+            class="m-0 text-sm text-text-secondary"
+          >
+            {{ $t('subscription.freeTier.outOfCredits.subtitle') }}
+          </p>
+
+          <p
+            v-if="!reason || reason === 'subscription_required'"
+            class="m-0 text-sm text-text-secondary"
+          >
+            {{
+              freeTierCredits
+                ? $t('subscription.freeTier.description', {
+                    credits: freeTierCredits.toLocaleString()
+                  })
+                : $t('subscription.freeTier.descriptionGeneric')
+            }}
+          </p>
+
+          <p
+            v-if="
+              (!reason || reason === 'subscription_required') &&
+              formattedRenewalDate
+            "
+            class="m-0 text-sm text-text-secondary"
+          >
+            {{
+              $t('subscription.freeTier.nextRefresh', {
+                date: formattedRenewalDate
+              })
+            }}
+          </p>
+        </div>
+
+        <SubscriptionBenefits is-free-tier class="mt-6 text-muted" />
+      </div>
+
+      <div class="flex flex-col pt-8">
+        <Button
+          class="w-full rounded-lg bg-(--color-accent-blue,#0B8CE9) px-4 py-2 font-inter text-sm font-bold text-white hover:bg-(--color-accent-blue,#0B8CE9)/90"
+          @click="$emit('upgrade')"
+        >
+          {{
+            reason === 'out_of_credits' || reason === 'top_up_blocked'
+              ? $t('subscription.freeTier.upgradeCta')
+              : $t('subscription.freeTier.subscribeCta')
+          }}
+        </Button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+
+import Button from '@/components/ui/button/Button.vue'
+import type { SubscriptionDialogReason } from '@/platform/cloud/subscription/composables/useSubscriptionDialog'
+import SubscriptionBenefits from '@/platform/cloud/subscription/components/SubscriptionBenefits.vue'
+import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
+import { getTierCredits } from '@/platform/cloud/subscription/constants/tierPricing'
+
+defineProps<{
+  reason?: SubscriptionDialogReason
+}>()
+
+defineEmits<{
+  close: [subscribed: boolean]
+  upgrade: []
+}>()
+
+const { formattedRenewalDate } = useSubscription()
+
+const freeTierCredits = computed(() => getTierCredits('free'))
+</script>
diff --git a/tests-ui/tests/platform/cloud/subscription/components/PricingTable.test.ts b/src/platform/cloud/subscription/components/PricingTable.test.ts
similarity index 74%
rename from tests-ui/tests/platform/cloud/subscription/components/PricingTable.test.ts
rename to src/platform/cloud/subscription/components/PricingTable.test.ts
index 2094805d3c..e8097d146c 100644
--- a/tests-ui/tests/platform/cloud/subscription/components/PricingTable.test.ts
+++ b/src/platform/cloud/subscription/components/PricingTable.test.ts
@@ -1,7 +1,7 @@
 import { createTestingPinia } from '@pinia/testing'
 import { flushPromises, mount } from '@vue/test-utils'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { computed, ref } from 'vue'
+import { computed, reactive, ref } from 'vue'
 import { createI18n } from 'vue-i18n'
 
 import PricingTable from '@/platform/cloud/subscription/components/PricingTable.vue'
@@ -14,15 +14,20 @@ const mockSubscriptionTier = ref<
 const mockIsYearlySubscription = ref(false)
 const mockAccessBillingPortal = vi.fn()
 const mockReportError = vi.fn()
+const mockTrackBeginCheckout = vi.fn()
+const mockUserId = ref<string | undefined>('user-123')
 const mockGetAuthHeader = vi.fn(() =>
   Promise.resolve({ Authorization: 'Bearer test-token' })
 )
+const mockGetCheckoutAttribution = vi.hoisted(() => vi.fn(() => ({})))
 
 vi.mock('@/platform/cloud/subscription/composables/useSubscription', () => ({
   useSubscription: () => ({
     isActiveSubscription: computed(() => mockIsActiveSubscription.value),
+    isFreeTier: computed(() => false),
     subscriptionTier: computed(() => mockSubscriptionTier.value),
-    isYearlySubscription: computed(() => mockIsYearlySubscription.value)
+    isYearlySubscription: computed(() => mockIsYearlySubscription.value),
+    subscriptionStatus: ref(null)
   })
 }))
 
@@ -52,12 +57,24 @@ vi.mock('@/composables/useErrorHandling', () => ({
 }))
 
 vi.mock('@/stores/firebaseAuthStore', () => ({
-  useFirebaseAuthStore: () => ({
-    getAuthHeader: mockGetAuthHeader
-  }),
+  useFirebaseAuthStore: () =>
+    reactive({
+      getAuthHeader: mockGetAuthHeader,
+      userId: computed(() => mockUserId.value)
+    }),
   FirebaseAuthStoreError: class extends Error {}
 }))
 
+vi.mock('@/platform/telemetry', () => ({
+  useTelemetry: () => ({
+    trackBeginCheckout: mockTrackBeginCheckout
+  })
+}))
+
+vi.mock('@/platform/telemetry/utils/checkoutAttribution', () => ({
+  getCheckoutAttribution: mockGetCheckoutAttribution
+}))
+
 vi.mock('@/platform/distribution/types', () => ({
   isCloud: true
 }))
@@ -79,6 +96,17 @@ const i18n = createI18n({
         currentPlan: 'Current Plan',
         subscribeTo: 'Subscribe to {plan}',
         changeTo: 'Change to {plan}',
+        tierNameYearly: '{name} Yearly',
+        yearlyCreditsLabel: 'Yearly credits',
+        monthlyCreditsLabel: 'Monthly credits',
+        maxDurationLabel: 'Max duration',
+        gpuLabel: 'GPU',
+        addCreditsLabel: 'Add more credits',
+        customLoRAsLabel: 'Custom LoRAs',
+        videoEstimateLabel: 'Video estimate',
+        videoEstimateHelp: 'How is this calculated?',
+        videoEstimateExplanation: 'Based on average usage.',
+        videoEstimateTryTemplate: 'Try template',
         maxDuration: {
           standard: '30 min',
           creator: '30 min',
@@ -126,6 +154,8 @@ describe('PricingTable', () => {
     mockIsActiveSubscription.value = false
     mockSubscriptionTier.value = null
     mockIsYearlySubscription.value = false
+    mockUserId.value = 'user-123'
+    mockTrackBeginCheckout.mockReset()
     vi.mocked(global.fetch).mockResolvedValue({
       ok: true,
       json: async () => ({ checkout_url: 'https://checkout.stripe.com/test' })
@@ -148,6 +178,13 @@ describe('PricingTable', () => {
       await creatorButton?.trigger('click')
       await flushPromises()
 
+      expect(mockTrackBeginCheckout).toHaveBeenCalledWith({
+        user_id: 'user-123',
+        tier: 'creator',
+        cycle: 'yearly',
+        checkout_type: 'change',
+        previous_tier: 'standard'
+      })
       expect(mockAccessBillingPortal).toHaveBeenCalledWith('creator-yearly')
     })
 
@@ -168,6 +205,33 @@ describe('PricingTable', () => {
       expect(mockAccessBillingPortal).toHaveBeenCalledWith('pro-yearly')
     })
 
+    it('should use the latest userId value when it changes after mount', async () => {
+      mockIsActiveSubscription.value = true
+      mockSubscriptionTier.value = 'STANDARD'
+      mockUserId.value = 'user-early'
+
+      const wrapper = createWrapper()
+      await flushPromises()
+
+      mockUserId.value = 'user-late'
+
+      const creatorButton = wrapper
+        .findAll('button')
+        .find((btn) => btn.text().includes('Creator'))
+
+      await creatorButton?.trigger('click')
+      await flushPromises()
+
+      expect(mockTrackBeginCheckout).toHaveBeenCalledTimes(1)
+      expect(mockTrackBeginCheckout).toHaveBeenCalledWith({
+        user_id: 'user-late',
+        tier: 'creator',
+        cycle: 'yearly',
+        checkout_type: 'change',
+        previous_tier: 'standard'
+      })
+    })
+
     it('should not call accessBillingPortal when clicking current plan', async () => {
       mockIsActiveSubscription.value = true
       mockSubscriptionTier.value = 'CREATOR'
diff --git a/src/platform/cloud/subscription/components/PricingTable.vue b/src/platform/cloud/subscription/components/PricingTable.vue
index c803bc2343..7a90ac5dc0 100644
--- a/src/platform/cloud/subscription/components/PricingTable.vue
+++ b/src/platform/cloud/subscription/components/PricingTable.vue
@@ -30,7 +30,7 @@
             <span>{{ option.label }}</span>
             <div
               v-if="option.value === 'yearly'"
-              class="bg-primary-background text-white text-[11px] px-1 py-0.5 rounded-full flex items-center font-bold"
+              class="flex items-center rounded-full bg-primary-background px-1 py-0.5 text-[11px] font-bold text-white"
             >
               -20%
             </div>
@@ -38,27 +38,27 @@
         </template>
       </SelectButton>
     </div>
-    <div class="flex flex-col xl:flex-row items-stretch gap-6">
+    <div class="flex flex-col items-stretch gap-6 xl:flex-row">
       <div
         v-for="tier in tiers"
         :key="tier.id"
         :class="
           cn(
-            'flex-1 flex flex-col rounded-2xl border border-border-default bg-base-background shadow-[0_0_12px_rgba(0,0,0,0.1)]',
+            'flex flex-1 flex-col rounded-2xl border border-border-default bg-base-background shadow-[0_0_12px_rgba(0,0,0,0.1)]',
             tier.isPopular ? 'border-muted-foreground' : ''
           )
         "
       >
-        <div class="p-8 pb-0 flex flex-col gap-8">
-          <div class="flex flex-row items-center gap-2 justify-between">
+        <div class="flex flex-col gap-8 p-8 pb-0">
+          <div class="flex flex-row items-center justify-between gap-2">
             <span
-              class="font-inter text-base font-bold leading-normal text-base-foreground"
+              class="font-inter text-base/normal font-bold text-base-foreground"
             >
               {{ tier.name }}
             </span>
             <div
               v-if="tier.isPopular"
-              class="rounded-full bg-base-foreground px-1.5 text-[11px] font-bold uppercase text-base-background h-5 tracking-tight flex items-center"
+              class="flex h-5 items-center rounded-full bg-base-foreground px-1.5 text-[11px] font-bold tracking-tight text-base-background uppercase"
             >
               {{ t('subscription.mostPopular') }}
             </div>
@@ -67,19 +67,17 @@
             <div class="flex flex-col gap-2">
               <div class="flex flex-row items-baseline gap-2">
                 <span
-                  class="font-inter text-[32px] font-semibold leading-normal text-base-foreground"
+                  class="font-inter text-[32px] leading-normal font-semibold text-base-foreground"
                 >
                   <span
                     v-show="currentBillingCycle === 'yearly'"
-                    class="line-through text-2xl text-muted-foreground"
+                    class="text-2xl text-muted-foreground line-through"
                   >
                     ${{ tier.pricing.monthly }}
                   </span>
                   ${{ getPrice(tier) }}
                 </span>
-                <span
-                  class="font-inter text-xl leading-normal text-base-foreground"
-                >
+                <span class="font-inter text-xl/normal text-base-foreground">
                   {{ t('subscription.usdPerMonth') }}
                 </span>
               </div>
@@ -97,10 +95,10 @@
             </div>
           </div>
 
-          <div class="flex flex-col gap-4 pb-0 flex-1">
+          <div class="flex flex-1 flex-col gap-4 pb-0">
             <div class="flex flex-row items-center justify-between">
               <span
-                class="font-inter text-sm font-normal leading-normal text-foreground"
+                class="text-foreground font-inter text-sm/normal font-normal"
               >
                 {{
                   currentBillingCycle === 'yearly'
@@ -109,9 +107,9 @@
                 }}
               </span>
               <div class="flex flex-row items-center gap-1">
-                <i class="icon-[lucide--component] text-amber-400 text-sm" />
+                <i class="icon-[lucide--component] text-sm text-amber-400" />
                 <span
-                  class="font-inter text-sm font-bold leading-normal text-base-foreground"
+                  class="font-inter text-sm/normal font-bold text-base-foreground"
                 >
                   {{ n(getCreditsDisplay(tier)) }}
                 </span>
@@ -119,53 +117,53 @@
             </div>
 
             <div class="flex flex-row items-center justify-between">
-              <span class="text-sm font-normal text-foreground">
+              <span class="text-foreground text-sm font-normal">
                 {{ t('subscription.maxDurationLabel') }}
               </span>
               <span
-                class="font-inter text-sm font-bold leading-normal text-base-foreground"
+                class="font-inter text-sm/normal font-bold text-base-foreground"
               >
                 {{ tier.maxDuration }}
               </span>
             </div>
 
             <div class="flex flex-row items-center justify-between">
-              <span class="text-sm font-normal text-foreground">
+              <span class="text-foreground text-sm font-normal">
                 {{ t('subscription.gpuLabel') }}
               </span>
-              <i class="pi pi-check text-xs text-success-foreground" />
+              <i class="pi pi-check text-success-foreground text-xs" />
             </div>
 
             <div class="flex flex-row items-center justify-between">
-              <span class="text-sm font-normal text-foreground">
+              <span class="text-foreground text-sm font-normal">
                 {{ t('subscription.addCreditsLabel') }}
               </span>
-              <i class="pi pi-check text-xs text-success-foreground" />
+              <i class="pi pi-check text-success-foreground text-xs" />
             </div>
 
             <div class="flex flex-row items-center justify-between">
-              <span class="text-sm font-normal text-foreground">
+              <span class="text-foreground text-sm font-normal">
                 {{ t('subscription.customLoRAsLabel') }}
               </span>
               <i
                 v-if="tier.customLoRAs"
-                class="pi pi-check text-xs text-success-foreground"
+                class="pi pi-check text-success-foreground text-xs"
               />
-              <i v-else class="pi pi-times text-xs text-foreground" />
+              <i v-else class="pi pi-times text-foreground text-xs" />
             </div>
 
             <div class="flex flex-col gap-2">
               <div class="flex flex-row items-start justify-between">
                 <div class="flex flex-col gap-2">
-                  <span class="text-sm font-normal text-foreground">
+                  <span class="text-foreground text-sm/relaxed font-normal">
                     {{ t('subscription.videoEstimateLabel') }}
                   </span>
-                  <div class="flex flex-row items-center gap-2 group pt-2">
+                  <div class="group flex flex-row items-center gap-2 pt-2">
                     <i
                       class="pi pi-question-circle text-xs text-muted-foreground group-hover:text-base-foreground"
                     />
                     <span
-                      class="text-sm font-normal text-muted-foreground cursor-pointer group-hover:text-base-foreground"
+                      class="cursor-pointer text-sm font-normal text-muted-foreground group-hover:text-base-foreground"
                       @click="togglePopover"
                     >
                       {{ t('subscription.videoEstimateHelp') }}
@@ -173,7 +171,7 @@
                   </div>
                 </div>
                 <span
-                  class="font-inter text-sm font-bold leading-normal text-base-foreground"
+                  class="font-inter text-sm/normal font-bold text-base-foreground"
                 >
                   ~{{ n(tier.pricing.videoEstimate) }}
                 </span>
@@ -191,8 +189,8 @@
                 'h-10 w-full',
                 getButtonTextClass(tier),
                 tier.key === 'creator'
-                  ? 'bg-base-foreground border-transparent hover:bg-inverted-background-hover'
-                  : 'bg-secondary-background border-transparent hover:bg-secondary-background-hover focus:bg-secondary-background-selected'
+                  ? 'border-transparent bg-base-foreground hover:bg-inverted-background-hover'
+                  : 'border-transparent bg-secondary-background hover:bg-secondary-background-hover focus:bg-secondary-background-selected'
               )
             "
             @click="() => handleSubscribe(tier.key)"
@@ -220,16 +218,19 @@
       }"
     >
       <div class="flex flex-col gap-2">
-        <p class="text-sm text-base-foreground">
+        <p class="text-sm/normal text-base-foreground">
           {{ t('subscription.videoEstimateExplanation') }}
         </p>
         <a
-          href="https://cloud.comfy.org/?template=video_wan2_2_14B_fun_camera"
+          href="https://cloud.comfy.org/?template=video_wan2_2_14B_i2v"
           target="_blank"
           rel="noopener noreferrer"
-          class="text-sm text-azure-600 hover:text-azure-400 underline"
+          class="flex gap-1 text-sm text-azure-600 no-underline hover:text-azure-400"
         >
-          {{ t('subscription.videoEstimateTryTemplate') }}
+          <span class="underline">
+            {{ t('subscription.videoEstimateTryTemplate') }}
+          </span>
+          <span class="no-underline" v-html="'&rarr;'"></span>
         </a>
       </div>
     </Popover>
@@ -238,6 +239,7 @@
 
 <script setup lang="ts">
 import { cn } from '@comfyorg/tailwind-utils'
+import { storeToRefs } from 'pinia'
 import Popover from 'primevue/popover'
 import SelectButton from 'primevue/selectbutton'
 import type { ToggleButtonPassThroughMethodOptions } from 'primevue/togglebutton'
@@ -247,8 +249,6 @@ import { useI18n } from 'vue-i18n'
 import Button from '@/components/ui/button/Button.vue'
 import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
 import { useErrorHandling } from '@/composables/useErrorHandling'
-import { getComfyApiBaseUrl } from '@/config/comfyApi'
-import { t } from '@/i18n'
 import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
 import {
   TIER_PRICING,
@@ -258,17 +258,17 @@ import type {
   TierKey,
   TierPricing
 } from '@/platform/cloud/subscription/constants/tierPricing'
+import { performSubscriptionCheckout } from '@/platform/cloud/subscription/utils/subscriptionCheckoutUtil'
 import { isPlanDowngrade } from '@/platform/cloud/subscription/utils/subscriptionTierRank'
 import type { BillingCycle } from '@/platform/cloud/subscription/utils/subscriptionTierRank'
 import { isCloud } from '@/platform/distribution/types'
-import {
-  FirebaseAuthStoreError,
-  useFirebaseAuthStore
-} from '@/stores/firebaseAuthStore'
+import { useTelemetry } from '@/platform/telemetry'
+import type { CheckoutAttributionMetadata } from '@/platform/telemetry/types'
+import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
 import type { components } from '@/types/comfyRegistryTypes'
 
 type SubscriptionTier = components['schemas']['SubscriptionTier']
-type CheckoutTierKey = Exclude<TierKey, 'founder'>
+type CheckoutTierKey = Exclude<TierKey, 'free' | 'founder'>
 type CheckoutTier = CheckoutTierKey | `${CheckoutTierKey}-yearly`
 
 const getCheckoutTier = (
@@ -276,6 +276,18 @@ const getCheckoutTier = (
   billingCycle: BillingCycle
 ): CheckoutTier => (billingCycle === 'yearly' ? `${tierKey}-yearly` : tierKey)
 
+const getCheckoutAttributionForCloud =
+  async (): Promise<CheckoutAttributionMetadata> => {
+    if (__DISTRIBUTION__ !== 'cloud') {
+      return {}
+    }
+
+    const { getCheckoutAttribution } =
+      await import('@/platform/telemetry/utils/checkoutAttribution')
+
+    return getCheckoutAttribution()
+  }
+
 interface BillingCycleOption {
   label: string
   value: BillingCycle
@@ -291,6 +303,8 @@ interface PricingTierConfig {
   isPopular?: boolean
 }
 
+const { t, n } = useI18n()
+
 const billingCycleOptions: BillingCycleOption[] = [
   { label: t('subscription.yearly'), value: 'yearly' },
   { label: t('subscription.monthly'), value: 'monthly' }
@@ -325,11 +339,14 @@ const tiers: PricingTierConfig[] = [
     isPopular: false
   }
 ]
-
-const { n } = useI18n()
-const { getAuthHeader } = useFirebaseAuthStore()
-const { isActiveSubscription, subscriptionTier, isYearlySubscription } =
-  useSubscription()
+const {
+  isActiveSubscription,
+  isFreeTier,
+  subscriptionTier,
+  isYearlySubscription
+} = useSubscription()
+const telemetry = useTelemetry()
+const { userId } = storeToRefs(useFirebaseAuthStore())
 const { accessBillingPortal, reportError } = useFirebaseAuthActions()
 const { wrapWithErrorHandlingAsync } = useErrorHandling()
 
@@ -338,6 +355,10 @@ const loadingTier = ref<CheckoutTierKey | null>(null)
 const popover = ref()
 const currentBillingCycle = ref<BillingCycle>('yearly')
 
+const hasPaidSubscription = computed(
+  () => isActiveSubscription.value && !isFreeTier.value
+)
+
 const currentTierKey = computed<TierKey | null>(() =>
   subscriptionTier.value ? TIER_TO_KEY[subscriptionTier.value] : null
 )
@@ -374,17 +395,18 @@ const getButtonLabel = (tier: PricingTierConfig): string => {
       ? t('subscription.tierNameYearly', { name: tier.name })
       : tier.name
 
-  return isActiveSubscription.value
+  return hasPaidSubscription.value
     ? t('subscription.changeTo', { plan: planName })
     : t('subscription.subscribeTo', { plan: planName })
 }
 
-const getButtonSeverity = (tier: PricingTierConfig): 'primary' | 'secondary' =>
-  isCurrentPlan(tier.key)
-    ? 'secondary'
-    : tier.key === 'creator'
-      ? 'primary'
-      : 'secondary'
+const getButtonSeverity = (
+  tier: PricingTierConfig
+): 'primary' | 'secondary' => {
+  if (isCurrentPlan(tier.key)) return 'secondary'
+  if (tier.key === 'creator') return 'primary'
+  return 'secondary'
+}
 
 const getButtonTextClass = (tier: PricingTierConfig): string =>
   tier.key === 'creator'
@@ -400,47 +422,6 @@ const getAnnualTotal = (tier: PricingTierConfig): number =>
 const getCreditsDisplay = (tier: PricingTierConfig): number =>
   tier.pricing.credits * (currentBillingCycle.value === 'yearly' ? 12 : 1)
 
-const initiateCheckout = async (tierKey: CheckoutTierKey) => {
-  const authHeader = await getAuthHeader()
-  if (!authHeader) {
-    throw new FirebaseAuthStoreError(t('toastMessages.userNotAuthenticated'))
-  }
-
-  const checkoutTier = getCheckoutTier(tierKey, currentBillingCycle.value)
-  const response = await fetch(
-    `${getComfyApiBaseUrl()}/customers/cloud-subscription-checkout/${checkoutTier}`,
-    {
-      method: 'POST',
-      headers: { ...authHeader, 'Content-Type': 'application/json' }
-    }
-  )
-
-  if (!response.ok) {
-    let errorMessage = 'Failed to initiate checkout'
-    try {
-      const errorData = await response.json()
-      errorMessage = errorData.message || errorMessage
-    } catch {
-      // If JSON parsing fails, try to get text response or use HTTP status
-      try {
-        const errorText = await response.text()
-        errorMessage =
-          errorText || `HTTP ${response.status} ${response.statusText}`
-      } catch {
-        errorMessage = `HTTP ${response.status} ${response.statusText}`
-      }
-    }
-
-    throw new FirebaseAuthStoreError(
-      t('toastMessages.failedToInitiateSubscription', {
-        error: errorMessage
-      })
-    )
-  }
-
-  return await response.json()
-}
-
 const handleSubscribe = wrapWithErrorHandlingAsync(
   async (tierKey: CheckoutTierKey) => {
     if (!isCloud || isLoading.value || isCurrentPlan(tierKey)) return
@@ -449,7 +430,20 @@ const handleSubscribe = wrapWithErrorHandlingAsync(
     loadingTier.value = tierKey
 
     try {
-      if (isActiveSubscription.value) {
+      if (hasPaidSubscription.value) {
+        const checkoutAttribution = await getCheckoutAttributionForCloud()
+        if (userId.value) {
+          telemetry?.trackBeginCheckout({
+            user_id: userId.value,
+            tier: tierKey,
+            cycle: currentBillingCycle.value,
+            checkout_type: 'change',
+            ...checkoutAttribution,
+            ...(currentTierKey.value
+              ? { previous_tier: currentTierKey.value }
+              : {})
+          })
+        }
         // Pass the target tier to create a deep link to subscription update confirmation
         const checkoutTier = getCheckoutTier(tierKey, currentBillingCycle.value)
         const targetPlan = {
@@ -470,10 +464,11 @@ const handleSubscribe = wrapWithErrorHandlingAsync(
           await accessBillingPortal(checkoutTier)
         }
       } else {
-        const response = await initiateCheckout(tierKey)
-        if (response.checkout_url) {
-          window.open(response.checkout_url, '_blank')
-        }
+        await performSubscriptionCheckout(
+          tierKey,
+          currentBillingCycle.value,
+          true
+        )
       }
     } finally {
       isLoading.value = false
diff --git a/src/platform/cloud/subscription/components/SubscribeButton.vue b/src/platform/cloud/subscription/components/SubscribeButton.vue
index 1cf5096ce4..71132a3c92 100644
--- a/src/platform/cloud/subscription/components/SubscribeButton.vue
+++ b/src/platform/cloud/subscription/components/SubscribeButton.vue
@@ -1,17 +1,8 @@
 <template>
   <Button
     :size
-    :loading="isLoading"
-    :disabled="isPolling"
-    variant="primary"
-    :style="
-      variant === 'gradient'
-        ? {
-            background: 'var(--color-subscription-button-gradient)',
-            color: 'var(--color-white)'
-          }
-        : undefined
-    "
+    :disabled="disabled"
+    :variant="buttonVariant === 'gradient' ? 'gradient' : 'primary'"
     :class="cn('font-bold', fluid && 'w-full')"
     @click="handleSubscribe"
   >
@@ -23,81 +14,34 @@
 import { onBeforeUnmount, ref, watch } from 'vue'
 
 import Button from '@/components/ui/button/Button.vue'
-import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
+import { useBillingContext } from '@/composables/billing/useBillingContext'
 import { isCloud } from '@/platform/distribution/types'
+import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
 import { useTelemetry } from '@/platform/telemetry'
 import { cn } from '@/utils/tailwindUtil'
 
 const {
   size = 'lg',
   fluid = true,
-  variant = 'default',
-  label
+  buttonVariant = 'default',
+  label,
+  disabled = false
 } = defineProps<{
   label?: string
   size?: 'sm' | 'lg'
-  variant?: 'default' | 'gradient'
+  buttonVariant?: 'default' | 'gradient'
   fluid?: boolean
+  disabled?: boolean
 }>()
 
 const emit = defineEmits<{
   subscribed: []
 }>()
 
-const { subscribe, isActiveSubscription, fetchStatus, showSubscriptionDialog } =
-  useSubscription()
-
-const telemetry = useTelemetry()
-
-const isLoading = ref(false)
-const isPolling = ref(false)
-let pollInterval: number | null = null
+const { isActiveSubscription, showSubscriptionDialog } = useBillingContext()
+const { subscriptionTier } = useSubscription()
 const isAwaitingStripeSubscription = ref(false)
 
-const POLL_INTERVAL_MS = 3000 // Poll every 3 seconds
-const MAX_POLL_DURATION_MS = 5 * 60 * 1000 // Stop polling after 5 minutes
-
-const startPollingSubscriptionStatus = () => {
-  isPolling.value = true
-  isLoading.value = true
-
-  const startTime = Date.now()
-
-  const poll = async () => {
-    try {
-      if (Date.now() - startTime > MAX_POLL_DURATION_MS) {
-        stopPolling()
-        return
-      }
-
-      await fetchStatus()
-
-      if (isActiveSubscription.value) {
-        stopPolling()
-        telemetry?.trackMonthlySubscriptionSucceeded()
-        emit('subscribed')
-      }
-    } catch (error) {
-      console.error(
-        '[SubscribeButton] Error polling subscription status:',
-        error
-      )
-    }
-  }
-
-  void poll()
-  pollInterval = window.setInterval(poll, POLL_INTERVAL_MS)
-}
-
-const stopPolling = () => {
-  if (pollInterval) {
-    clearInterval(pollInterval)
-    pollInterval = null
-  }
-  isPolling.value = false
-  isLoading.value = false
-}
-
 watch(
   [isAwaitingStripeSubscription, isActiveSubscription],
   ([awaiting, isActive]) => {
@@ -108,27 +52,17 @@ watch(
   }
 )
 
-const handleSubscribe = async () => {
+const handleSubscribe = () => {
   if (isCloud) {
-    useTelemetry()?.trackSubscription('subscribe_clicked')
-    isAwaitingStripeSubscription.value = true
-    showSubscriptionDialog()
-    return
-  }
-
-  isLoading.value = true
-  try {
-    await subscribe()
-
-    startPollingSubscriptionStatus()
-  } catch (error) {
-    console.error('[SubscribeButton] Error initiating subscription:', error)
-    isLoading.value = false
+    useTelemetry()?.trackSubscription('subscribe_clicked', {
+      current_tier: subscriptionTier.value?.toLowerCase()
+    })
   }
+  isAwaitingStripeSubscription.value = true
+  showSubscriptionDialog()
 }
 
 onBeforeUnmount(() => {
-  stopPolling()
   isAwaitingStripeSubscription.value = false
 })
 </script>
diff --git a/src/platform/cloud/subscription/components/SubscribeToRun.vue b/src/platform/cloud/subscription/components/SubscribeToRun.vue
index bcc65f3951..80976c2e96 100644
--- a/src/platform/cloud/subscription/components/SubscribeToRun.vue
+++ b/src/platform/cloud/subscription/components/SubscribeToRun.vue
@@ -5,13 +5,8 @@
       showDelay: 600
     }"
     class="subscribe-to-run-button whitespace-nowrap"
-    variant="primary"
+    variant="gradient"
     size="sm"
-    :style="{
-      background: 'var(--color-subscription-button-gradient)',
-      color: 'var(--color-white)',
-      borderColor: 'transparent'
-    }"
     data-testid="subscribe-to-run-button"
     @click="handleSubscribeToRun"
   >
@@ -26,7 +21,7 @@ import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import Button from '@/components/ui/button/Button.vue'
-import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
+import { useBillingContext } from '@/composables/billing/useBillingContext'
 import { isCloud } from '@/platform/distribution/types'
 import { useTelemetry } from '@/platform/telemetry'
 
@@ -40,7 +35,7 @@ const buttonLabel = computed(() =>
     : t('subscription.subscribeToRun')
 )
 
-const { showSubscriptionDialog } = useSubscription()
+const { showSubscriptionDialog } = useBillingContext()
 
 const handleSubscribeToRun = () => {
   if (isCloud) {
diff --git a/src/platform/cloud/subscription/components/SubscriptionBenefits.vue b/src/platform/cloud/subscription/components/SubscriptionBenefits.vue
index a3c18ef1a6..5ea7edf968 100644
--- a/src/platform/cloud/subscription/components/SubscriptionBenefits.vue
+++ b/src/platform/cloud/subscription/components/SubscriptionBenefits.vue
@@ -3,7 +3,11 @@
     <div class="flex items-center gap-2 py-2">
       <i class="pi pi-check text-xs text-text-primary" />
       <span class="text-sm text-text-primary">
-        {{ $t('subscription.benefits.benefit1') }}
+        {{
+          isFreeTier
+            ? $t('subscription.benefits.benefit1FreeTier')
+            : $t('subscription.benefits.benefit1')
+        }}
       </span>
     </div>
 
@@ -13,7 +17,18 @@
         {{ $t('subscription.benefits.benefit2') }}
       </span>
     </div>
+
+    <div class="flex items-center gap-2 py-2">
+      <i class="pi pi-check text-xs text-text-primary" />
+      <span class="text-sm text-text-primary">
+        {{ $t('subscription.benefits.benefit3') }}
+      </span>
+    </div>
   </div>
 </template>
 
-<script setup lang="ts"></script>
+<script setup lang="ts">
+const { isFreeTier = false } = defineProps<{
+  isFreeTier?: boolean
+}>()
+</script>
diff --git a/tests-ui/tests/platform/cloud/subscription/components/SubscriptionPanel.test.ts b/src/platform/cloud/subscription/components/SubscriptionPanel.test.ts
similarity index 93%
rename from tests-ui/tests/platform/cloud/subscription/components/SubscriptionPanel.test.ts
rename to src/platform/cloud/subscription/components/SubscriptionPanel.test.ts
index 3646224463..7810a56dcd 100644
--- a/tests-ui/tests/platform/cloud/subscription/components/SubscriptionPanel.test.ts
+++ b/src/platform/cloud/subscription/components/SubscriptionPanel.test.ts
@@ -33,6 +33,9 @@ const mockSubscriptionData = {
     const baseName = TIER_TO_NAME[mockSubscriptionTier.value]
     return mockIsYearlySubscription.value ? `${baseName} Yearly` : baseName
   }),
+  subscriptionStatus: computed(() => ({
+    renewal_date: '2024-12-31T00:00:00Z'
+  })),
   isYearlySubscription: computed(() => mockIsYearlySubscription.value),
   handleInvoiceHistory: vi.fn()
 }
@@ -87,10 +90,18 @@ vi.mock('@/composables/auth/useFirebaseAuthActions', () => ({
   }))
 }))
 
+vi.mock('@/composables/billing/useBillingContext', () => ({
+  useBillingContext: () => ({
+    isActiveSubscription: computed(() => mockIsActiveSubscription.value),
+    manageSubscription: vi.fn()
+  })
+}))
+
 // Create i18n instance for testing
 const i18n = createI18n({
   legacy: false,
   locale: 'en',
+  escapeParameter: true,
   messages: {
     en: {
       subscription: {
@@ -102,7 +113,8 @@ const i18n = createI18n({
         partnerNodesBalance: 'Partner Nodes Balance',
         partnerNodesDescription: 'Credits for partner nodes',
         totalCredits: 'Total Credits',
-        creditsRemainingThisMonth: 'Credits remaining this month',
+        creditsRemainingThisMonth: 'Included (Refills {date})',
+        creditsRemainingThisYear: 'Included (Refills {date})',
         creditsYouveAdded: "Credits you've added",
         monthlyBonusDescription: 'Monthly bonus',
         prepaidDescription: 'Prepaid credits',
@@ -276,6 +288,13 @@ describe('SubscriptionPanel', () => {
       const wrapper = createWrapper()
       expect(wrapper.findAll('.skeleton').length).toBe(0)
     })
+
+    it('renders refill date with literal slashes', () => {
+      mockIsActiveSubscription.value = true
+      const wrapper = createWrapper()
+      expect(wrapper.text()).toContain('Included (Refills 12/31/24)')
+      expect(wrapper.text()).not.toContain('&#x2F;')
+    })
   })
 
   // TODO: Re-enable when migrating to VTL so we can find by user visible content.
diff --git a/src/platform/cloud/subscription/components/SubscriptionPanel.vue b/src/platform/cloud/subscription/components/SubscriptionPanel.vue
index a2d246a192..2f82b3bf2d 100644
--- a/src/platform/cloud/subscription/components/SubscriptionPanel.vue
+++ b/src/platform/cloud/subscription/components/SubscriptionPanel.vue
@@ -1,8 +1,8 @@
 <template>
-  <TabPanel value="PlanCredits" class="subscription-container h-full">
+  <div class="subscription-container h-full">
     <div class="flex h-full flex-col gap-6">
       <div class="flex items-center gap-2">
-        <span class="text-2xl font-inter font-semibold leading-tight">
+        <span class="font-inter text-2xl/tight font-semibold">
           {{
             isActiveSubscription
               ? $t('subscription.title')
@@ -17,229 +17,10 @@
         </div>
       </div>
 
-      <div class="grow overflow-auto">
-        <div class="rounded-2xl border border-interface-stroke p-6">
-          <div>
-            <div class="flex items-center justify-between gap-2">
-              <div class="flex flex-col gap-2">
-                <div class="text-sm font-bold text-text-primary">
-                  {{ subscriptionTierName }}
-                </div>
-                <div class="flex items-baseline gap-1 font-inter font-semibold">
-                  <span class="text-2xl">${{ tierPrice }}</span>
-                  <span class="text-base">{{
-                    $t('subscription.perMonth')
-                  }}</span>
-                </div>
-                <div
-                  v-if="isActiveSubscription"
-                  class="text-sm text-text-secondary"
-                >
-                  <template v-if="isCancelled">
-                    {{
-                      $t('subscription.expiresDate', {
-                        date: formattedEndDate
-                      })
-                    }}
-                  </template>
-                  <template v-else>
-                    {{
-                      $t('subscription.renewsDate', {
-                        date: formattedRenewalDate
-                      })
-                    }}
-                  </template>
-                </div>
-              </div>
-
-              <Button
-                v-if="isActiveSubscription"
-                variant="secondary"
-                class="ml-auto rounded-lg px-4 py-2 text-sm font-normal text-text-primary bg-interface-menu-component-surface-selected"
-                @click="
-                  async () => {
-                    await authActions.accessBillingPortal()
-                  }
-                "
-              >
-                {{ $t('subscription.manageSubscription') }}
-              </Button>
-              <Button
-                v-if="isActiveSubscription"
-                variant="primary"
-                class="rounded-lg px-4 py-2 text-sm font-normal text-text-primary"
-                @click="showSubscriptionDialog"
-              >
-                {{ $t('subscription.upgradePlan') }}
-              </Button>
-
-              <SubscribeButton
-                v-else
-                :label="$t('subscription.subscribeNow')"
-                size="sm"
-                :fluid="false"
-                class="text-xs"
-                @subscribed="handleRefresh"
-              />
-            </div>
-          </div>
-
-          <div class="grid grid-cols-1 gap-6 pt-9 lg:grid-cols-2">
-            <div class="flex flex-col flex-1">
-              <div class="flex flex-col gap-3">
-                <div
-                  :class="
-                    cn(
-                      'relative flex flex-col gap-6 rounded-2xl p-5',
-                      'bg-modal-panel-background'
-                    )
-                  "
-                >
-                  <Button
-                    variant="muted-textonly"
-                    size="icon-sm"
-                    class="absolute top-0.5 right-0"
-                    :loading="isLoadingBalance"
-                    @click="handleRefresh"
-                  >
-                    <i class="pi pi-sync text-text-secondary text-xs" />
-                  </Button>
-
-                  <div class="flex flex-col gap-2">
-                    <div class="text-sm text-muted">
-                      {{ $t('subscription.totalCredits') }}
-                    </div>
-                    <Skeleton
-                      v-if="isLoadingBalance"
-                      width="8rem"
-                      height="2rem"
-                    />
-                    <div v-else class="text-2xl font-bold">
-                      {{ totalCredits }}
-                    </div>
-                  </div>
-
-                  <!-- Credit Breakdown -->
-                  <div class="flex flex-col gap-1">
-                    <div class="flex items-center gap-4">
-                      <Skeleton
-                        v-if="isLoadingBalance"
-                        width="3rem"
-                        height="1rem"
-                      />
-                      <div
-                        v-else
-                        class="text-sm font-bold w-12 shrink-0 text-left text-muted"
-                      >
-                        {{ monthlyBonusCredits }}
-                      </div>
-                      <div class="flex items-center gap-1 min-w-0">
-                        <div
-                          class="text-sm truncate text-muted"
-                          :title="creditsRemainingLabel"
-                        >
-                          {{ creditsRemainingLabel }}
-                        </div>
-                      </div>
-                    </div>
-                    <div class="flex items-center gap-4">
-                      <Skeleton
-                        v-if="isLoadingBalance"
-                        width="3rem"
-                        height="1rem"
-                      />
-                      <div
-                        v-else
-                        class="text-sm font-bold w-12 shrink-0 text-left text-muted"
-                      >
-                        {{ prepaidCredits }}
-                      </div>
-                      <div class="flex items-center gap-1 min-w-0">
-                        <div
-                          class="text-sm truncate text-muted"
-                          :title="$t('subscription.creditsYouveAdded')"
-                        >
-                          {{ $t('subscription.creditsYouveAdded') }}
-                        </div>
-                        <Button
-                          v-tooltip="$t('subscription.prepaidCreditsInfo')"
-                          variant="muted-textonly"
-                          size="icon-sm"
-                          class="h-4 w-4 shrink-0 rounded-full"
-                        >
-                          <i
-                            class="pi pi-question-circle text-text-secondary text-xs"
-                          />
-                        </Button>
-                      </div>
-                    </div>
-                  </div>
-
-                  <div class="flex items-center justify-between">
-                    <a
-                      href="https://platform.comfy.org/profile/usage"
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      class="text-sm underline text-center text-muted"
-                    >
-                      {{ $t('subscription.viewUsageHistory') }}
-                    </a>
-                    <Button
-                      v-if="isActiveSubscription"
-                      variant="secondary"
-                      class="p-2 min-h-8 rounded-lg text-sm font-normal text-text-primary bg-interface-menu-component-surface-selected"
-                      @click="handleAddApiCredits"
-                    >
-                      {{ $t('subscription.addCredits') }}
-                    </Button>
-                  </div>
-                </div>
-              </div>
-            </div>
-
-            <div class="flex flex-col gap-2 flex-1">
-              <div class="text-sm text-text-primary">
-                {{ $t('subscription.yourPlanIncludes') }}
-              </div>
-
-              <div class="flex flex-col gap-0">
-                <div
-                  v-for="benefit in tierBenefits"
-                  :key="benefit.key"
-                  class="flex items-center gap-2 py-2"
-                >
-                  <i
-                    v-if="benefit.type === 'feature'"
-                    class="pi pi-check text-xs text-text-primary"
-                  />
-                  <span
-                    v-else-if="benefit.type === 'metric' && benefit.value"
-                    class="text-sm font-normal whitespace-nowrap text-text-primary"
-                  >
-                    {{ benefit.value }}
-                  </span>
-                  <span class="text-sm text-muted">
-                    {{ benefit.label }}
-                  </span>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <!-- View More Details - Outside main content -->
-        <div class="flex items-center gap-2 py-4">
-          <i class="pi pi-external-link text-muted"></i>
-          <a
-            href="https://www.comfy.org/cloud/pricing"
-            target="_blank"
-            rel="noopener noreferrer"
-            class="text-sm underline hover:opacity-80 text-muted"
-          >
-            {{ $t('subscription.viewMoreDetailsPlans') }}
-          </a>
-        </div>
-      </div>
+      <!-- Workspace mode: workspace-aware subscription content -->
+      <SubscriptionPanelContentWorkspace v-if="teamWorkspacesEnabled" />
+      <!-- Legacy mode: user-level subscription content -->
+      <SubscriptionPanelContentLegacy v-else />
 
       <div
         class="flex items-center justify-between border-t border-interface-stroke pt-3"
@@ -250,7 +31,7 @@
             class="text-xs text-text-secondary"
             @click="handleLearnMoreClick"
           >
-            <i class="pi pi-question-circle text-text-secondary text-xs" />
+            <i class="pi pi-question-circle text-xs text-text-secondary" />
             {{ $t('subscription.learnMore') }}
           </Button>
           <Button
@@ -258,7 +39,7 @@
             class="text-xs text-text-secondary"
             @click="handleOpenPartnerNodesInfo"
           >
-            <i class="pi pi-question-circle text-text-secondary text-xs" />
+            <i class="pi pi-question-circle text-xs text-text-secondary" />
             {{ $t('subscription.partnerNodesCredits') }}
           </Button>
           <Button
@@ -267,7 +48,7 @@
             :loading="isLoadingSupport"
             @click="handleMessageSupport"
           >
-            <i class="pi pi-comment text-text-secondary text-xs" />
+            <i class="pi pi-comment text-xs text-text-secondary" />
             {{ $t('subscription.messageSupport') }}
           </Button>
         </div>
@@ -278,130 +59,46 @@
           @click="handleInvoiceHistory"
         >
           {{ $t('subscription.invoiceHistory') }}
-          <i class="pi pi-external-link text-text-secondary text-xs" />
+          <i class="pi pi-external-link text-xs text-text-secondary" />
         </Button>
       </div>
     </div>
-  </TabPanel>
+  </div>
 </template>
 
 <script setup lang="ts">
-import Skeleton from 'primevue/skeleton'
-import TabPanel from 'primevue/tabpanel'
-import { computed } from 'vue'
-import { useI18n } from 'vue-i18n'
+import { computed, defineAsyncComponent } from 'vue'
 
 import CloudBadge from '@/components/topbar/CloudBadge.vue'
 import Button from '@/components/ui/button/Button.vue'
-import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
+import { useBillingContext } from '@/composables/billing/useBillingContext'
 import { useExternalLink } from '@/composables/useExternalLink'
-import SubscribeButton from '@/platform/cloud/subscription/components/SubscribeButton.vue'
-import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
+import { useFeatureFlags } from '@/composables/useFeatureFlags'
+import SubscriptionPanelContentLegacy from '@/platform/cloud/subscription/components/SubscriptionPanelContentLegacy.vue'
 import { useSubscriptionActions } from '@/platform/cloud/subscription/composables/useSubscriptionActions'
-import { useSubscriptionCredits } from '@/platform/cloud/subscription/composables/useSubscriptionCredits'
-import { useSubscriptionDialog } from '@/platform/cloud/subscription/composables/useSubscriptionDialog'
-import {
-  DEFAULT_TIER_KEY,
-  TIER_TO_KEY,
-  getTierCredits,
-  getTierFeatures,
-  getTierPrice
-} from '@/platform/cloud/subscription/constants/tierPricing'
-import { cn } from '@/utils/tailwindUtil'
+import { isCloud } from '@/platform/distribution/types'
+
+const SubscriptionPanelContentWorkspace = defineAsyncComponent(
+  () =>
+    import('@/platform/workspace/components/SubscriptionPanelContentWorkspace.vue')
+)
+
+const { flags } = useFeatureFlags()
+const teamWorkspacesEnabled = computed(
+  () => isCloud && flags.teamWorkspacesEnabled
+)
 
 const { buildDocsUrl, docsPaths } = useExternalLink()
-const authActions = useFirebaseAuthActions()
-const { t, n } = useI18n()
 
-const {
-  isActiveSubscription,
-  isCancelled,
-  formattedRenewalDate,
-  formattedEndDate,
-  subscriptionTier,
-  subscriptionTierName,
-  isYearlySubscription,
-  handleInvoiceHistory
-} = useSubscription()
+const { isActiveSubscription, manageSubscription } = useBillingContext()
 
-const { show: showSubscriptionDialog } = useSubscriptionDialog()
+const { isLoadingSupport, handleMessageSupport, handleLearnMoreClick } =
+  useSubscriptionActions()
 
-const tierKey = computed(() => {
-  const tier = subscriptionTier.value
-  if (!tier) return DEFAULT_TIER_KEY
-  return TIER_TO_KEY[tier] ?? DEFAULT_TIER_KEY
-})
-const tierPrice = computed(() =>
-  getTierPrice(tierKey.value, isYearlySubscription.value)
-)
-const creditsRemainingLabel = computed(() =>
-  isYearlySubscription.value
-    ? t('subscription.creditsRemainingThisYear')
-    : t('subscription.creditsRemainingThisMonth')
-)
-
-// Tier benefits for v-for loop
-type BenefitType = 'metric' | 'feature'
-
-interface Benefit {
-  key: string
-  type: BenefitType
-  label: string
-  value?: string
+const handleInvoiceHistory = async () => {
+  await manageSubscription()
 }
 
-const tierBenefits = computed((): Benefit[] => {
-  const key = tierKey.value
-
-  const benefits: Benefit[] = [
-    {
-      key: 'monthlyCredits',
-      type: 'metric',
-      value: n(getTierCredits(key)),
-      label: isYearlySubscription.value
-        ? t('subscription.yearlyCreditsLabel')
-        : t('subscription.monthlyCreditsLabel')
-    },
-    {
-      key: 'maxDuration',
-      type: 'metric',
-      value: t(`subscription.maxDuration.${key}`),
-      label: t('subscription.maxDurationLabel')
-    },
-    {
-      key: 'gpu',
-      type: 'feature',
-      label: t('subscription.gpuLabel')
-    },
-    {
-      key: 'addCredits',
-      type: 'feature',
-      label: t('subscription.addCreditsLabel')
-    }
-  ]
-
-  if (getTierFeatures(key).customLoRAs) {
-    benefits.push({
-      key: 'customLoRAs',
-      type: 'feature',
-      label: t('subscription.customLoRAsLabel')
-    })
-  }
-
-  return benefits
-})
-
-const { totalCredits, monthlyBonusCredits, prepaidCredits, isLoadingBalance } =
-  useSubscriptionCredits()
-
-const {
-  isLoadingSupport,
-  handleAddApiCredits,
-  handleMessageSupport,
-  handleRefresh,
-  handleLearnMoreClick
-} = useSubscriptionActions()
-
 const handleOpenPartnerNodesInfo = () => {
   window.open(
     buildDocsUrl(docsPaths.partnerNodesPricing, { includeLocale: true }),
@@ -409,9 +106,3 @@ const handleOpenPartnerNodesInfo = () => {
   )
 }
 </script>
-
-<style scoped>
-:deep(.bg-comfy-menu-secondary) {
-  background-color: transparent;
-}
-</style>
diff --git a/src/platform/cloud/subscription/components/SubscriptionPanelContentLegacy.vue b/src/platform/cloud/subscription/components/SubscriptionPanelContentLegacy.vue
new file mode 100644
index 0000000000..b43dac7b42
--- /dev/null
+++ b/src/platform/cloud/subscription/components/SubscriptionPanelContentLegacy.vue
@@ -0,0 +1,346 @@
+<template>
+  <div class="grow overflow-auto">
+    <div class="rounded-2xl border border-interface-stroke p-6">
+      <div>
+        <div class="flex items-center justify-between gap-2">
+          <div class="flex flex-col gap-2">
+            <div class="text-sm font-bold text-text-primary">
+              {{ subscriptionTierName }}
+            </div>
+            <div class="flex items-baseline gap-1 font-inter font-semibold">
+              <span class="text-2xl">${{ tierPrice }}</span>
+              <span class="text-base">{{ $t('subscription.perMonth') }}</span>
+            </div>
+            <div
+              v-if="isActiveSubscription"
+              class="text-sm text-text-secondary"
+            >
+              <template v-if="isCancelled">
+                {{
+                  $t('subscription.expiresDate', {
+                    date: formattedEndDate
+                  })
+                }}
+              </template>
+              <template v-else>
+                {{
+                  $t('subscription.renewsDate', {
+                    date: formattedRenewalDate
+                  })
+                }}
+              </template>
+            </div>
+          </div>
+
+          <Button
+            v-if="isActiveSubscription && !isFreeTier"
+            variant="secondary"
+            class="ml-auto rounded-lg bg-interface-menu-component-surface-selected px-4 py-2 text-sm font-normal text-text-primary"
+            @click="
+              async () => {
+                await authActions.accessBillingPortal()
+              }
+            "
+          >
+            {{ $t('subscription.manageSubscription') }}
+          </Button>
+          <Button
+            v-if="isActiveSubscription"
+            variant="primary"
+            class="rounded-lg px-4 py-2 text-sm font-normal text-text-primary"
+            @click="showSubscriptionDialog"
+          >
+            {{ $t('subscription.upgradePlan') }}
+          </Button>
+
+          <SubscribeButton
+            v-if="!isActiveSubscription"
+            :label="$t('subscription.subscribeNow')"
+            size="sm"
+            :fluid="false"
+            class="text-xs"
+            @subscribed="handleRefresh"
+          />
+        </div>
+      </div>
+
+      <div class="flex flex-col gap-6 pt-9 lg:flex-row">
+        <div class="flex shrink-0 flex-col">
+          <div class="flex flex-col gap-3">
+            <div
+              :class="
+                cn(
+                  'relative flex flex-col gap-6 rounded-2xl p-5',
+                  'bg-modal-panel-background'
+                )
+              "
+            >
+              <Button
+                variant="muted-textonly"
+                size="icon-sm"
+                class="absolute top-4 right-4"
+                :loading="isLoadingBalance"
+                @click="handleRefresh"
+              >
+                <i class="pi pi-sync text-sm text-text-secondary" />
+              </Button>
+
+              <div class="flex flex-col gap-2">
+                <div class="text-sm text-muted">
+                  {{ $t('subscription.totalCredits') }}
+                </div>
+                <Skeleton v-if="isLoadingBalance" width="8rem" height="2rem" />
+                <div v-else class="text-2xl font-bold">
+                  {{ totalCredits }}
+                </div>
+              </div>
+
+              <!-- Credit Breakdown -->
+              <table class="text-sm text-muted">
+                <tbody>
+                  <tr>
+                    <td class="pr-4 text-left align-middle font-bold">
+                      <Skeleton
+                        v-if="isLoadingBalance"
+                        width="5rem"
+                        height="1rem"
+                      />
+                      <span v-else>{{ includedCreditsDisplay }}</span>
+                    </td>
+                    <td class="align-middle" :title="creditsRemainingLabel">
+                      {{ creditsRemainingLabel }}
+                    </td>
+                  </tr>
+                  <tr>
+                    <td class="pr-4 text-left align-middle font-bold">
+                      <Skeleton
+                        v-if="isLoadingBalance"
+                        width="3rem"
+                        height="1rem"
+                      />
+                      <span v-else>{{ prepaidCredits }}</span>
+                    </td>
+                    <td
+                      class="align-middle"
+                      :title="$t('subscription.creditsYouveAdded')"
+                    >
+                      {{ $t('subscription.creditsYouveAdded') }}
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+
+              <div class="flex flex-col gap-3">
+                <a
+                  href="https://platform.comfy.org/profile/usage"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  class="text-sm text-muted underline"
+                >
+                  {{ $t('subscription.viewUsageHistory') }}
+                </a>
+                <Button
+                  v-if="isActiveSubscription && isFreeTier"
+                  variant="gradient"
+                  class="min-h-8 w-full rounded-lg p-2 text-sm font-normal"
+                  @click="handleUpgradeToAddCredits"
+                >
+                  {{ $t('subscription.upgradeToAddCredits') }}
+                </Button>
+                <Button
+                  v-else-if="isActiveSubscription"
+                  variant="secondary"
+                  class="min-h-8 rounded-lg bg-interface-menu-component-surface-selected p-2 text-sm font-normal text-text-primary"
+                  @click="handleAddApiCredits"
+                >
+                  {{ $t('subscription.addCredits') }}
+                </Button>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div class="flex flex-col gap-2">
+          <div class="text-sm text-text-primary">
+            {{ $t('subscription.yourPlanIncludes') }}
+          </div>
+
+          <div class="flex flex-col gap-0">
+            <div
+              v-for="benefit in tierBenefits"
+              :key="benefit.key"
+              class="flex items-center gap-2 py-2"
+            >
+              <i
+                v-if="benefit.type === 'feature'"
+                class="pi pi-check text-xs text-text-primary"
+              />
+              <span
+                v-else-if="benefit.type === 'metric' && benefit.value"
+                class="text-sm font-normal whitespace-nowrap text-text-primary"
+              >
+                {{ benefit.value }}
+              </span>
+              <span class="text-sm text-muted">
+                {{ benefit.label }}
+              </span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- View More Details - Outside main content -->
+    <div class="flex items-center gap-2 py-4">
+      <i class="pi pi-external-link text-muted"></i>
+      <a
+        href="https://www.comfy.org/cloud/pricing"
+        target="_blank"
+        rel="noopener noreferrer"
+        class="text-sm text-muted underline hover:opacity-80"
+      >
+        {{ $t('subscription.viewMoreDetailsPlans') }}
+      </a>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import Skeleton from 'primevue/skeleton'
+import { computed, onBeforeUnmount, onMounted } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
+import SubscribeButton from '@/platform/cloud/subscription/components/SubscribeButton.vue'
+import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
+import { useSubscriptionActions } from '@/platform/cloud/subscription/composables/useSubscriptionActions'
+import { useSubscriptionCredits } from '@/platform/cloud/subscription/composables/useSubscriptionCredits'
+import { useSubscriptionDialog } from '@/platform/cloud/subscription/composables/useSubscriptionDialog'
+import {
+  DEFAULT_TIER_KEY,
+  TIER_TO_KEY,
+  getTierCredits,
+  getTierPrice
+} from '@/platform/cloud/subscription/constants/tierPricing'
+import type { TierBenefit } from '@/platform/cloud/subscription/utils/tierBenefits'
+import { getCommonTierBenefits } from '@/platform/cloud/subscription/utils/tierBenefits'
+import { cn } from '@/utils/tailwindUtil'
+
+const authActions = useFirebaseAuthActions()
+const { t, n } = useI18n()
+
+const {
+  isActiveSubscription,
+  isCancelled,
+  isFreeTier,
+  formattedRenewalDate,
+  formattedEndDate,
+  subscriptionTier,
+  subscriptionTierName,
+  subscriptionStatus,
+  isYearlySubscription
+} = useSubscription()
+
+const { show: showSubscriptionDialog, showPricingTable } =
+  useSubscriptionDialog()
+
+const tierKey = computed(() => {
+  const tier = subscriptionTier.value
+  if (!tier) return DEFAULT_TIER_KEY
+  return TIER_TO_KEY[tier] ?? DEFAULT_TIER_KEY
+})
+const tierPrice = computed(() =>
+  getTierPrice(tierKey.value, isYearlySubscription.value)
+)
+
+const refillsDate = computed(() => {
+  if (!subscriptionStatus.value?.renewal_date) return ''
+  const date = new Date(subscriptionStatus.value.renewal_date)
+  const day = String(date.getDate()).padStart(2, '0')
+  const month = String(date.getMonth() + 1).padStart(2, '0')
+  const year = String(date.getFullYear()).slice(-2)
+  return `${month}/${day}/${year}`
+})
+
+const creditsRemainingLabel = computed(() =>
+  isYearlySubscription.value
+    ? t(
+        'subscription.creditsRemainingThisYear',
+        {
+          date: refillsDate.value
+        },
+        {
+          escapeParameter: false
+        }
+      )
+    : t(
+        'subscription.creditsRemainingThisMonth',
+        {
+          date: refillsDate.value
+        },
+        {
+          escapeParameter: false
+        }
+      )
+)
+
+const planTotalCredits = computed(() => {
+  const credits = getTierCredits(tierKey.value)
+  if (credits === null) return '—'
+  const total = isYearlySubscription.value ? credits * 12 : credits
+  return n(total)
+})
+
+const includedCreditsDisplay = computed(
+  () => `${monthlyBonusCredits.value} / ${planTotalCredits.value}`
+)
+
+const tierBenefits = computed((): TierBenefit[] =>
+  getCommonTierBenefits(tierKey.value, t, n)
+)
+
+const { totalCredits, monthlyBonusCredits, prepaidCredits, isLoadingBalance } =
+  useSubscriptionCredits()
+
+const { handleAddApiCredits, handleRefresh } = useSubscriptionActions()
+
+function handleUpgradeToAddCredits() {
+  showPricingTable()
+}
+
+// Focus-based polling: refresh balance when user returns from Stripe checkout
+const PENDING_TOPUP_KEY = 'pending_topup_timestamp'
+const TOPUP_EXPIRY_MS = 5 * 60 * 1000 // 5 minutes
+
+function handleWindowFocus() {
+  const timestampStr = localStorage.getItem(PENDING_TOPUP_KEY)
+  if (!timestampStr) return
+
+  const timestamp = parseInt(timestampStr, 10)
+
+  // Clear expired tracking (older than 5 minutes)
+  if (Date.now() - timestamp > TOPUP_EXPIRY_MS) {
+    localStorage.removeItem(PENDING_TOPUP_KEY)
+    return
+  }
+
+  // Refresh and clear tracking to prevent repeated calls
+  void handleRefresh()
+  localStorage.removeItem(PENDING_TOPUP_KEY)
+}
+
+onMounted(() => {
+  window.addEventListener('focus', handleWindowFocus)
+})
+
+onBeforeUnmount(() => {
+  window.removeEventListener('focus', handleWindowFocus)
+})
+</script>
+
+<style scoped>
+:deep(.bg-comfy-menu-secondary) {
+  background-color: transparent;
+}
+</style>
diff --git a/src/platform/cloud/subscription/components/SubscriptionRequiredDialogContent.vue b/src/platform/cloud/subscription/components/SubscriptionRequiredDialogContent.vue
index 61f432c37d..48787a4ee4 100644
--- a/src/platform/cloud/subscription/components/SubscriptionRequiredDialogContent.vue
+++ b/src/platform/cloud/subscription/components/SubscriptionRequiredDialogContent.vue
@@ -1,19 +1,19 @@
 <template>
   <div
     v-if="showCustomPricingTable"
-    class="relative flex flex-col p-4 pt-8 md:p-16 !overflow-y-auto h-full gap-8"
+    class="relative flex h-full flex-col gap-8 overflow-y-auto! p-4 pt-8 md:p-16"
   >
     <Button
       size="icon"
       variant="muted-textonly"
-      class="rounded-full shrink-0 text-text-secondary hover:bg-white/10 absolute right-2.5 top-2.5"
+      class="absolute top-2.5 right-2.5 shrink-0 rounded-full text-text-secondary hover:bg-white/10"
       :aria-label="$t('g.close')"
       @click="handleClose"
     >
       <i class="pi pi-times text-xl" />
     </Button>
     <div class="text-center">
-      <h2 class="text-xl lg:text-2xl text-muted-foreground m-0">
+      <h2 class="m-0 text-xl text-muted-foreground lg:text-2xl">
         {{ $t('subscription.description') }}
       </h2>
     </div>
@@ -22,7 +22,7 @@
 
     <!-- Contact and Enterprise Links -->
     <div class="flex flex-col items-center gap-2">
-      <p class="text-sm text-text-secondary m-0">
+      <p class="m-0 text-sm text-text-secondary">
         {{ $t('subscription.haveQuestions') }}
       </p>
       <div class="flex items-center gap-1.5">
@@ -51,7 +51,7 @@
     <Button
       size="icon"
       variant="muted-textonly"
-      class="rounded-full absolute top-2.5 right-2.5 z-10 h-8 w-8 p-0 text-white hover:bg-white/20"
+      class="absolute top-2.5 right-2.5 z-10 size-8 rounded-full p-0 text-white hover:bg-white/20"
       :aria-label="$t('g.close')"
       @click="handleClose"
     >
@@ -81,7 +81,11 @@
         <div class="flex flex-col gap-6">
           <div class="inline-flex items-center gap-2">
             <div class="text-sm text-text-primary">
-              {{ $t('subscription.required.title') }}
+              {{
+                reason === 'out_of_credits'
+                  ? $t('credits.topUp.insufficientTitle')
+                  : $t('subscription.required.title')
+              }}
             </div>
             <CloudBadge
               reverse-order
@@ -91,6 +95,13 @@
             />
           </div>
 
+          <p
+            v-if="reason === 'out_of_credits'"
+            class="m-0 text-sm text-text-secondary"
+          >
+            {{ $t('credits.topUp.insufficientMessage') }}
+          </p>
+
           <div class="flex items-baseline gap-2">
             <span class="text-4xl font-bold">{{ formattedMonthlyPrice }}</span>
             <span class="text-xl">{{ $t('subscription.perMonth') }}</span>
@@ -102,7 +113,7 @@
 
       <div class="flex flex-col pt-8">
         <SubscribeButton
-          class="py-2 px-4 rounded-lg"
+          class="rounded-lg px-4 py-2"
           :pt="{
             root: {
               style: 'background: var(--color-accent-blue, #0B8CE9);'
@@ -127,20 +138,25 @@ import { MONTHLY_SUBSCRIPTION_PRICE } from '@/config/subscriptionPricesConfig'
 import PricingTable from '@/platform/cloud/subscription/components/PricingTable.vue'
 import SubscribeButton from '@/platform/cloud/subscription/components/SubscribeButton.vue'
 import SubscriptionBenefits from '@/platform/cloud/subscription/components/SubscriptionBenefits.vue'
-import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
+import { useBillingContext } from '@/composables/billing/useBillingContext'
 import { isCloud } from '@/platform/distribution/types'
 import { useTelemetry } from '@/platform/telemetry'
 import { useCommandStore } from '@/stores/commandStore'
+import type { SubscriptionDialogReason } from '@/platform/cloud/subscription/composables/useSubscriptionDialog'
 
-const props = defineProps<{
+const { onClose, reason } = defineProps<{
   onClose: () => void
+  reason?: SubscriptionDialogReason
 }>()
 
 const emit = defineEmits<{
   close: [subscribed: boolean]
 }>()
 
-const { fetchStatus, isActiveSubscription } = useSubscription()
+const { fetchStatus, isActiveSubscription } = useBillingContext()
+
+const isSubscriptionEnabled = (): boolean =>
+  Boolean(isCloud && window.__CONFIG__?.subscription_required)
 
 // Legacy price for non-tier flow with locale-aware formatting
 const formattedMonthlyPrice = new Intl.NumberFormat(
@@ -156,9 +172,7 @@ const commandStore = useCommandStore()
 const telemetry = useTelemetry()
 
 // Always show custom pricing table for cloud subscriptions
-const showCustomPricingTable = computed(
-  () => isCloud && window.__CONFIG__?.subscription_required
-)
+const showCustomPricingTable = computed(() => isSubscriptionEnabled())
 
 const POLL_INTERVAL_MS = 3000
 const MAX_POLL_ATTEMPTS = 3
@@ -233,7 +247,7 @@ const handleSubscribed = () => {
 
 const handleClose = () => {
   stopPolling()
-  props.onClose()
+  onClose()
 }
 
 const handleContactUs = async () => {
diff --git a/src/platform/cloud/subscription/composables/useBillingPlans.ts b/src/platform/cloud/subscription/composables/useBillingPlans.ts
new file mode 100644
index 0000000000..7751dc8711
--- /dev/null
+++ b/src/platform/cloud/subscription/composables/useBillingPlans.ts
@@ -0,0 +1,60 @@
+import { computed, ref } from 'vue'
+
+import type { Plan } from '@/platform/workspace/api/workspaceApi'
+import { workspaceApi } from '@/platform/workspace/api/workspaceApi'
+
+const plans = ref<Plan[]>([])
+const currentPlanSlug = ref<string | null>(null)
+const isLoading = ref(false)
+const error = ref<string | null>(null)
+
+export function useBillingPlans() {
+  async function fetchPlans() {
+    if (isLoading.value) return
+
+    isLoading.value = true
+    error.value = null
+
+    try {
+      const response = await workspaceApi.getBillingPlans()
+      plans.value = response.plans
+      currentPlanSlug.value = response.current_plan_slug ?? null
+    } catch (err) {
+      error.value = err instanceof Error ? err.message : 'Failed to fetch plans'
+      console.error('[useBillingPlans] Failed to fetch plans:', err)
+    } finally {
+      isLoading.value = false
+    }
+  }
+
+  const monthlyPlans = computed(() =>
+    plans.value.filter((p) => p.duration === 'MONTHLY')
+  )
+
+  const annualPlans = computed(() =>
+    plans.value.filter((p) => p.duration === 'ANNUAL')
+  )
+
+  function getPlanBySlug(slug: string) {
+    return plans.value.find((p) => p.slug === slug)
+  }
+
+  function getPlansForTier(tier: Plan['tier']) {
+    return plans.value.filter((p) => p.tier === tier)
+  }
+
+  const isCurrentPlan = (slug: string) => currentPlanSlug.value === slug
+
+  return {
+    plans,
+    currentPlanSlug,
+    isLoading,
+    error,
+    monthlyPlans,
+    annualPlans,
+    fetchPlans,
+    getPlanBySlug,
+    getPlansForTier,
+    isCurrentPlan
+  }
+}
diff --git a/tests-ui/tests/platform/cloud/subscription/useSubscription.test.ts b/src/platform/cloud/subscription/composables/useSubscription.test.ts
similarity index 75%
rename from tests-ui/tests/platform/cloud/subscription/useSubscription.test.ts
rename to src/platform/cloud/subscription/composables/useSubscription.test.ts
index 9409709d3a..f4375fce78 100644
--- a/tests-ui/tests/platform/cloud/subscription/useSubscription.test.ts
+++ b/src/platform/cloud/subscription/composables/useSubscription.test.ts
@@ -1,22 +1,60 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { ref } from 'vue'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { effectScope } from 'vue'
 
 import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
 
-// Create mocks
-const mockIsLoggedIn = ref(false)
-const mockReportError = vi.fn()
-const mockAccessBillingPortal = vi.fn()
-const mockShowSubscriptionRequiredDialog = vi.fn()
-const mockGetAuthHeader = vi.fn(() =>
-  Promise.resolve({ Authorization: 'Bearer test-token' })
-)
-const mockTelemetry = {
-  trackSubscription: vi.fn(),
-  trackMonthlySubscriptionCancelled: vi.fn()
+const {
+  mockIsLoggedIn,
+  mockReportError,
+  mockAccessBillingPortal,
+  mockShowSubscriptionRequiredDialog,
+  mockGetAuthHeader,
+  mockGetCheckoutAttribution,
+  mockTelemetry,
+  mockUserId,
+  mockIsCloud
+} = vi.hoisted(() => ({
+  mockIsLoggedIn: { value: false },
+  mockIsCloud: { value: true },
+  mockReportError: vi.fn(),
+  mockAccessBillingPortal: vi.fn(),
+  mockShowSubscriptionRequiredDialog: vi.fn(),
+  mockGetAuthHeader: vi.fn(() =>
+    Promise.resolve({ Authorization: 'Bearer test-token' })
+  ),
+  mockGetCheckoutAttribution: vi.fn(() => ({
+    im_ref: 'impact-click-001',
+    utm_source: 'impact'
+  })),
+  mockTelemetry: {
+    trackSubscription: vi.fn(),
+    trackMonthlySubscriptionCancelled: vi.fn()
+  },
+  mockUserId: { value: 'user-123' }
+}))
+
+let scope: ReturnType<typeof effectScope> | undefined
+type Distribution = 'desktop' | 'localhost' | 'cloud'
+
+const setDistribution = (distribution: Distribution) => {
+  ;(
+    globalThis as typeof globalThis & { __DISTRIBUTION__: Distribution }
+  ).__DISTRIBUTION__ = distribution
+}
+
+function useSubscriptionWithScope() {
+  if (!scope) {
+    throw new Error('Test scope not initialized')
+  }
+
+  const subscription = scope.run(() => useSubscription())
+  if (!subscription) {
+    throw new Error('Failed to initialize subscription composable')
+  }
+
+  return subscription
 }
 
-// Mock dependencies
 vi.mock('@/composables/auth/useCurrentUser', () => ({
   useCurrentUser: vi.fn(() => ({
     isLoggedIn: mockIsLoggedIn
@@ -38,7 +76,7 @@ vi.mock('@/composables/useErrorHandling', () => ({
   useErrorHandling: vi.fn(() => ({
     wrapWithErrorHandlingAsync: vi.fn(
       (fn, errorHandler) =>
-        async (...args: any[]) => {
+        async (...args: Parameters<typeof fn>) => {
           try {
             return await fn(...args)
           } catch (error) {
@@ -53,7 +91,13 @@ vi.mock('@/composables/useErrorHandling', () => ({
 }))
 
 vi.mock('@/platform/distribution/types', () => ({
-  isCloud: true
+  get isCloud() {
+    return mockIsCloud.value
+  }
+}))
+
+vi.mock('@/platform/telemetry/utils/checkoutAttribution', () => ({
+  getCheckoutAttribution: mockGetCheckoutAttribution
 }))
 
 vi.mock('@/services/dialogService', () => ({
@@ -64,7 +108,10 @@ vi.mock('@/services/dialogService', () => ({
 
 vi.mock('@/stores/firebaseAuthStore', () => ({
   useFirebaseAuthStore: vi.fn(() => ({
-    getAuthHeader: mockGetAuthHeader
+    getAuthHeader: mockGetAuthHeader,
+    get userId() {
+      return mockUserId.value
+    }
   })),
   FirebaseAuthStoreError: class extends Error {}
 }))
@@ -73,11 +120,23 @@ vi.mock('@/stores/firebaseAuthStore', () => ({
 global.fetch = vi.fn()
 
 describe('useSubscription', () => {
+  afterEach(() => {
+    scope?.stop()
+    scope = undefined
+    setDistribution('localhost')
+  })
+
   beforeEach(() => {
+    scope?.stop()
+    scope = effectScope()
+    setDistribution('cloud')
+
     vi.clearAllMocks()
     mockIsLoggedIn.value = false
     mockTelemetry.trackSubscription.mockReset()
     mockTelemetry.trackMonthlySubscriptionCancelled.mockReset()
+    mockUserId.value = 'user-123'
+    mockIsCloud.value = true
     window.__CONFIG__ = {
       subscription_required: true
     } as typeof window.__CONFIG__
@@ -103,7 +162,7 @@ describe('useSubscription', () => {
       } as Response)
 
       mockIsLoggedIn.value = true
-      const { isActiveSubscription, fetchStatus } = useSubscription()
+      const { isActiveSubscription, fetchStatus } = useSubscriptionWithScope()
 
       await fetchStatus()
       expect(isActiveSubscription.value).toBe(true)
@@ -120,7 +179,7 @@ describe('useSubscription', () => {
       } as Response)
 
       mockIsLoggedIn.value = true
-      const { isActiveSubscription, fetchStatus } = useSubscription()
+      const { isActiveSubscription, fetchStatus } = useSubscriptionWithScope()
 
       await fetchStatus()
       expect(isActiveSubscription.value).toBe(false)
@@ -137,7 +196,7 @@ describe('useSubscription', () => {
       } as Response)
 
       mockIsLoggedIn.value = true
-      const { formattedRenewalDate, fetchStatus } = useSubscription()
+      const { formattedRenewalDate, fetchStatus } = useSubscriptionWithScope()
 
       await fetchStatus()
       // The date format may vary based on timezone, so we just check it's a valid date string
@@ -147,7 +206,7 @@ describe('useSubscription', () => {
     })
 
     it('should return empty string when renewal date is not available', () => {
-      const { formattedRenewalDate } = useSubscription()
+      const { formattedRenewalDate } = useSubscriptionWithScope()
 
       expect(formattedRenewalDate.value).toBe('')
     })
@@ -164,14 +223,14 @@ describe('useSubscription', () => {
       } as Response)
 
       mockIsLoggedIn.value = true
-      const { subscriptionTier, fetchStatus } = useSubscription()
+      const { subscriptionTier, fetchStatus } = useSubscriptionWithScope()
 
       await fetchStatus()
       expect(subscriptionTier.value).toBe('CREATOR')
     })
 
     it('should return null when subscription tier is not available', () => {
-      const { subscriptionTier } = useSubscription()
+      const { subscriptionTier } = useSubscriptionWithScope()
 
       expect(subscriptionTier.value).toBeNull()
     })
@@ -191,7 +250,7 @@ describe('useSubscription', () => {
       } as Response)
 
       mockIsLoggedIn.value = true
-      const { fetchStatus } = useSubscription()
+      const { fetchStatus } = useSubscriptionWithScope()
 
       await fetchStatus()
 
@@ -212,7 +271,7 @@ describe('useSubscription', () => {
         json: async () => ({ message: 'Subscription not found' })
       } as Response)
 
-      const { fetchStatus } = useSubscription()
+      const { fetchStatus } = useSubscriptionWithScope()
 
       await expect(fetchStatus()).rejects.toThrow()
     })
@@ -232,7 +291,7 @@ describe('useSubscription', () => {
         .spyOn(window, 'open')
         .mockImplementation(() => null)
 
-      const { subscribe } = useSubscription()
+      const { subscribe } = useSubscriptionWithScope()
 
       await subscribe()
 
@@ -243,6 +302,10 @@ describe('useSubscription', () => {
           headers: expect.objectContaining({
             Authorization: 'Bearer test-token',
             'Content-Type': 'application/json'
+          }),
+          body: JSON.stringify({
+            im_ref: 'impact-click-001',
+            utm_source: 'impact'
           })
         })
       )
@@ -258,7 +321,7 @@ describe('useSubscription', () => {
         json: async () => ({})
       } as Response)
 
-      const { subscribe } = useSubscription()
+      const { subscribe } = useSubscriptionWithScope()
 
       await expect(subscribe()).rejects.toThrow()
     })
@@ -275,7 +338,7 @@ describe('useSubscription', () => {
         })
       } as Response)
 
-      const { requireActiveSubscription } = useSubscription()
+      const { requireActiveSubscription } = useSubscriptionWithScope()
 
       await requireActiveSubscription()
 
@@ -292,7 +355,7 @@ describe('useSubscription', () => {
         })
       } as Response)
 
-      const { requireActiveSubscription } = useSubscription()
+      const { requireActiveSubscription } = useSubscriptionWithScope()
 
       await requireActiveSubscription()
 
@@ -300,13 +363,34 @@ describe('useSubscription', () => {
     })
   })
 
+  describe('non-cloud environments', () => {
+    it('should not fetch subscription status when not on cloud', async () => {
+      mockIsCloud.value = false
+      mockIsLoggedIn.value = true
+
+      useSubscriptionWithScope()
+
+      await vi.dynamicImportSettled()
+
+      expect(global.fetch).not.toHaveBeenCalled()
+    })
+
+    it('should report isActiveSubscription as true when not on cloud', () => {
+      mockIsCloud.value = false
+
+      const { isActiveSubscription } = useSubscriptionWithScope()
+
+      expect(isActiveSubscription.value).toBe(true)
+    })
+  })
+
   describe('action handlers', () => {
     it('should open usage history URL', () => {
       const windowOpenSpy = vi
         .spyOn(window, 'open')
         .mockImplementation(() => null)
 
-      const { handleViewUsageHistory } = useSubscription()
+      const { handleViewUsageHistory } = useSubscriptionWithScope()
       handleViewUsageHistory()
 
       expect(windowOpenSpy).toHaveBeenCalledWith(
@@ -322,7 +406,7 @@ describe('useSubscription', () => {
         .spyOn(window, 'open')
         .mockImplementation(() => null)
 
-      const { handleLearnMore } = useSubscription()
+      const { handleLearnMore } = useSubscriptionWithScope()
       handleLearnMore()
 
       expect(windowOpenSpy).toHaveBeenCalledWith(
@@ -334,7 +418,7 @@ describe('useSubscription', () => {
     })
 
     it('should call accessBillingPortal for invoice history', async () => {
-      const { handleInvoiceHistory } = useSubscription()
+      const { handleInvoiceHistory } = useSubscriptionWithScope()
 
       await handleInvoiceHistory()
 
@@ -342,7 +426,7 @@ describe('useSubscription', () => {
     })
 
     it('should call accessBillingPortal for manage subscription', async () => {
-      const { manageSubscription } = useSubscription()
+      const { manageSubscription } = useSubscriptionWithScope()
 
       await manageSubscription()
 
@@ -378,7 +462,7 @@ describe('useSubscription', () => {
         .mockResolvedValueOnce(cancelledResponse as Response)
 
       try {
-        const { fetchStatus, manageSubscription } = useSubscription()
+        const { fetchStatus, manageSubscription } = useSubscriptionWithScope()
 
         await fetchStatus()
         await manageSubscription()
@@ -422,7 +506,7 @@ describe('useSubscription', () => {
         .mockResolvedValueOnce(cancelledResponse as Response)
 
       try {
-        const { fetchStatus, manageSubscription } = useSubscription()
+        const { fetchStatus, manageSubscription } = useSubscriptionWithScope()
 
         await fetchStatus()
         await manageSubscription()
diff --git a/src/platform/cloud/subscription/composables/useSubscription.ts b/src/platform/cloud/subscription/composables/useSubscription.ts
index 816e5afbf7..1d3413b713 100644
--- a/src/platform/cloud/subscription/composables/useSubscription.ts
+++ b/src/platform/cloud/subscription/composables/useSubscription.ts
@@ -8,6 +8,8 @@ import { getComfyApiBaseUrl, getComfyPlatformBaseUrl } from '@/config/comfyApi'
 import { t } from '@/i18n'
 import { isCloud } from '@/platform/distribution/types'
 import { useTelemetry } from '@/platform/telemetry'
+import type { SubscriptionDialogReason } from '@/platform/cloud/subscription/composables/useSubscriptionDialog'
+import type { CheckoutAttributionMetadata } from '@/platform/telemetry/types'
 import {
   FirebaseAuthStoreError,
   useFirebaseAuthStore
@@ -28,6 +30,7 @@ export type CloudSubscriptionStatusResponse = NonNullable<
 function useSubscriptionInternal() {
   const subscriptionStatus = ref<CloudSubscriptionStatusResponse | null>(null)
   const telemetry = useTelemetry()
+  const isInitialized = ref(false)
 
   const isSubscribedOrIsNotCloud = computed(() => {
     if (!isCloud || !window.__CONFIG__?.subscription_required) return true
@@ -37,7 +40,8 @@ function useSubscriptionInternal() {
   const { reportError, accessBillingPortal } = useFirebaseAuthActions()
   const { showSubscriptionRequiredDialog } = useDialogService()
 
-  const { getAuthHeader } = useFirebaseAuthStore()
+  const firebaseAuthStore = useFirebaseAuthStore()
+  const { getAuthHeader } = firebaseAuthStore
   const { wrapWithErrorHandlingAsync } = useErrorHandling()
 
   const { isLoggedIn } = useCurrentUser()
@@ -74,6 +78,8 @@ function useSubscriptionInternal() {
     () => subscriptionStatus.value?.subscription_tier ?? null
   )
 
+  const isFreeTier = computed(() => subscriptionTier.value === 'FREE')
+
   const subscriptionDuration = computed(
     () => subscriptionStatus.value?.subscription_duration ?? null
   )
@@ -92,7 +98,21 @@ function useSubscriptionInternal() {
       : baseName
   })
 
-  const buildApiUrl = (path: string) => `${getComfyApiBaseUrl()}${path}`
+  function buildApiUrl(path: string): string {
+    return `${getComfyApiBaseUrl()}${path}`
+  }
+
+  const getCheckoutAttributionForCloud =
+    async (): Promise<CheckoutAttributionMetadata> => {
+      if (__DISTRIBUTION__ !== 'cloud') {
+        return {}
+      }
+
+      const { getCheckoutAttribution } =
+        await import('@/platform/telemetry/utils/checkoutAttribution')
+
+      return getCheckoutAttribution()
+    }
 
   const fetchStatus = wrapWithErrorHandlingAsync(
     fetchSubscriptionStatus,
@@ -113,15 +133,24 @@ function useSubscriptionInternal() {
     window.open(response.checkout_url, '_blank')
   }, reportError)
 
-  const showSubscriptionDialog = () => {
+  const showSubscriptionDialog = (options?: {
+    reason?: SubscriptionDialogReason
+  }) => {
     if (isCloud) {
-      useTelemetry()?.trackSubscription('modal_opened')
+      useTelemetry()?.trackSubscription('modal_opened', {
+        current_tier: subscriptionTier.value?.toLowerCase(),
+        reason: options?.reason
+      })
     }
 
-    void showSubscriptionRequiredDialog()
+    void showSubscriptionRequiredDialog(options)
   }
 
-  const shouldWatchCancellation = (): boolean =>
+  /**
+   * Whether cloud subscription mode is enabled (cloud distribution with subscription_required config).
+   * Use to determine which UI to show (SubscriptionPanel vs LegacyCreditsPanel).
+   */
+  const isSubscriptionEnabled = (): boolean =>
     Boolean(isCloud && window.__CONFIG__?.subscription_required)
 
   const { startCancellationWatcher, stopCancellationWatcher } =
@@ -130,7 +159,7 @@ function useSubscriptionInternal() {
       isActiveSubscription: isSubscribedOrIsNotCloud,
       subscriptionStatus,
       telemetry,
-      shouldWatchCancellation
+      shouldWatchCancellation: isSubscriptionEnabled
     })
 
   const manageSubscription = async () => {
@@ -189,17 +218,27 @@ function useSubscriptionInternal() {
 
     const statusData = await response.json()
     subscriptionStatus.value = statusData
+
     return statusData
   }
 
   watch(
     () => isLoggedIn.value,
     async (loggedIn) => {
-      if (loggedIn) {
-        await fetchSubscriptionStatus()
+      if (loggedIn && isCloud) {
+        try {
+          await fetchSubscriptionStatus()
+        } catch (error) {
+          // Network errors are expected during navigation/component unmount
+          // and when offline - log for debugging but don't surface to user
+          console.error('Failed to fetch subscription status:', error)
+        } finally {
+          isInitialized.value = true
+        }
       } else {
         subscriptionStatus.value = null
         stopCancellationWatcher()
+        isInitialized.value = true
       }
     },
     { immediate: true }
@@ -213,6 +252,7 @@ function useSubscriptionInternal() {
           t('toastMessages.userNotAuthenticated')
         )
       }
+      const checkoutAttribution = await getCheckoutAttributionForCloud()
 
       const response = await fetch(
         buildApiUrl('/customers/cloud-subscription-checkout'),
@@ -221,7 +261,8 @@ function useSubscriptionInternal() {
           headers: {
             ...authHeader,
             'Content-Type': 'application/json'
-          }
+          },
+          body: JSON.stringify(checkoutAttribution)
         }
       )
 
@@ -240,15 +281,20 @@ function useSubscriptionInternal() {
   return {
     // State
     isActiveSubscription: isSubscribedOrIsNotCloud,
+    isInitialized,
     isCancelled,
     formattedRenewalDate,
     formattedEndDate,
     subscriptionTier,
+    isFreeTier,
     subscriptionDuration,
     isYearlySubscription,
     subscriptionTierName,
     subscriptionStatus,
 
+    // Utilities
+    isSubscriptionEnabled,
+
     // Actions
     subscribe,
     fetchStatus,
diff --git a/tests-ui/tests/platform/cloud/subscription/composables/useSubscriptionActions.test.ts b/src/platform/cloud/subscription/composables/useSubscriptionActions.test.ts
similarity index 95%
rename from tests-ui/tests/platform/cloud/subscription/composables/useSubscriptionActions.test.ts
rename to src/platform/cloud/subscription/composables/useSubscriptionActions.test.ts
index f3f3de2957..bcb41c0d1b 100644
--- a/tests-ui/tests/platform/cloud/subscription/composables/useSubscriptionActions.test.ts
+++ b/src/platform/cloud/subscription/composables/useSubscriptionActions.test.ts
@@ -20,6 +20,12 @@ vi.mock('@/platform/cloud/subscription/composables/useSubscription', () => ({
   })
 }))
 
+vi.mock('@/composables/billing/useBillingContext', () => ({
+  useBillingContext: () => ({
+    fetchStatus: mockFetchStatus
+  })
+}))
+
 vi.mock('@/services/dialogService', () => ({
   useDialogService: () => ({
     showTopUpCreditsDialog: mockShowTopUpCreditsDialog
diff --git a/src/platform/cloud/subscription/composables/useSubscriptionActions.ts b/src/platform/cloud/subscription/composables/useSubscriptionActions.ts
index 7c09942f0d..f33a3994cb 100644
--- a/src/platform/cloud/subscription/composables/useSubscriptionActions.ts
+++ b/src/platform/cloud/subscription/composables/useSubscriptionActions.ts
@@ -1,7 +1,7 @@
 import { onMounted, ref } from 'vue'
 
+import { useBillingContext } from '@/composables/billing/useBillingContext'
 import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
-import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
 import { isCloud } from '@/platform/distribution/types'
 import { useTelemetry } from '@/platform/telemetry'
 import { useDialogService } from '@/services/dialogService'
@@ -15,7 +15,7 @@ export function useSubscriptionActions() {
   const authActions = useFirebaseAuthActions()
   const commandStore = useCommandStore()
   const telemetry = useTelemetry()
-  const { fetchStatus } = useSubscription()
+  const { fetchStatus } = useBillingContext()
 
   const isLoadingSupport = ref(false)
 
@@ -24,7 +24,7 @@ export function useSubscriptionActions() {
   })
 
   const handleAddApiCredits = () => {
-    dialogService.showTopUpCreditsDialog()
+    void dialogService.showTopUpCreditsDialog()
   }
 
   const handleMessageSupport = async () => {
diff --git a/tests-ui/tests/platform/cloud/subscription/useSubscriptionCancellationWatcher.test.ts b/src/platform/cloud/subscription/composables/useSubscriptionCancellationWatcher.test.ts
similarity index 98%
rename from tests-ui/tests/platform/cloud/subscription/useSubscriptionCancellationWatcher.test.ts
rename to src/platform/cloud/subscription/composables/useSubscriptionCancellationWatcher.test.ts
index 94db275495..a44564801d 100644
--- a/tests-ui/tests/platform/cloud/subscription/useSubscriptionCancellationWatcher.test.ts
+++ b/src/platform/cloud/subscription/composables/useSubscriptionCancellationWatcher.test.ts
@@ -4,11 +4,12 @@ import type { EffectScope } from 'vue'
 
 import type { CloudSubscriptionStatusResponse } from '@/platform/cloud/subscription/composables/useSubscription'
 import { useSubscriptionCancellationWatcher } from '@/platform/cloud/subscription/composables/useSubscriptionCancellationWatcher'
+import type { TelemetryDispatcher } from '@/platform/telemetry/types'
 
 describe('useSubscriptionCancellationWatcher', () => {
   const trackMonthlySubscriptionCancelled = vi.fn()
   const telemetryMock: Pick<
-    import('@/platform/telemetry/types').TelemetryProvider,
+    TelemetryDispatcher,
     'trackMonthlySubscriptionCancelled'
   > = {
     trackMonthlySubscriptionCancelled
diff --git a/src/platform/cloud/subscription/composables/useSubscriptionCancellationWatcher.ts b/src/platform/cloud/subscription/composables/useSubscriptionCancellationWatcher.ts
index d841b02fcd..01e1660693 100644
--- a/src/platform/cloud/subscription/composables/useSubscriptionCancellationWatcher.ts
+++ b/src/platform/cloud/subscription/composables/useSubscriptionCancellationWatcher.ts
@@ -2,7 +2,7 @@ import { onScopeDispose, ref } from 'vue'
 import type { ComputedRef, Ref } from 'vue'
 import { defaultWindow, useEventListener, useTimeoutFn } from '@vueuse/core'
 
-import type { TelemetryProvider } from '@/platform/telemetry/types'
+import type { TelemetryDispatcher } from '@/platform/telemetry/types'
 
 import type { CloudSubscriptionStatusResponse } from './useSubscription'
 
@@ -14,7 +14,10 @@ type CancellationWatcherOptions = {
   fetchStatus: () => Promise<CloudSubscriptionStatusResponse | null | void>
   isActiveSubscription: ComputedRef<boolean>
   subscriptionStatus: Ref<CloudSubscriptionStatusResponse | null>
-  telemetry: Pick<TelemetryProvider, 'trackMonthlySubscriptionCancelled'> | null
+  telemetry: Pick<
+    TelemetryDispatcher,
+    'trackMonthlySubscriptionCancelled'
+  > | null
   shouldWatchCancellation: () => boolean
 }
 
diff --git a/src/platform/cloud/subscription/composables/useSubscriptionCredits.test.ts b/src/platform/cloud/subscription/composables/useSubscriptionCredits.test.ts
new file mode 100644
index 0000000000..cad73e5659
--- /dev/null
+++ b/src/platform/cloud/subscription/composables/useSubscriptionCredits.test.ts
@@ -0,0 +1,117 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { computed } from 'vue'
+import type * as VueI18nModule from 'vue-i18n'
+
+import * as comfyCredits from '@/base/credits/comfyCredits'
+import { useSubscriptionCredits } from '@/platform/cloud/subscription/composables/useSubscriptionCredits'
+
+// Shared mock state (reset in beforeEach)
+let mockBillingBalance: {
+  amountMicros: number
+  cloudCreditBalanceMicros?: number
+  prepaidBalanceMicros?: number
+} | null = null
+let mockBillingIsLoading = false
+
+vi.mock(
+  'vue-i18n',
+  async (importOriginal: () => Promise<typeof VueI18nModule>) => {
+    const actual = await importOriginal()
+    return {
+      ...actual,
+      useI18n: () => ({
+        t: () => 'Credits',
+        locale: { value: 'en-US' }
+      })
+    }
+  }
+)
+
+// Mock useBillingContext - returns computed refs that read from module-level state
+vi.mock('@/composables/billing/useBillingContext', () => ({
+  useBillingContext: () => ({
+    balance: computed(() => mockBillingBalance),
+    isLoading: computed(() => mockBillingIsLoading)
+  })
+}))
+
+describe('useSubscriptionCredits', () => {
+  beforeEach(() => {
+    mockBillingBalance = null
+    mockBillingIsLoading = false
+    vi.clearAllMocks()
+  })
+
+  describe('totalCredits', () => {
+    it('should return "0" when balance is null', () => {
+      mockBillingBalance = null
+      const { totalCredits } = useSubscriptionCredits()
+      expect(totalCredits.value).toBe('0')
+    })
+
+    it('should format amountMicros correctly', () => {
+      mockBillingBalance = { amountMicros: 100 }
+      const { totalCredits } = useSubscriptionCredits()
+      expect(totalCredits.value).toBe('211')
+    })
+
+    it('should handle formatting errors by throwing', () => {
+      const formatSpy = vi.spyOn(comfyCredits, 'formatCreditsFromCents')
+      formatSpy.mockImplementationOnce(() => {
+        throw new Error('Formatting error')
+      })
+
+      mockBillingBalance = { amountMicros: 100 }
+      const { totalCredits } = useSubscriptionCredits()
+      expect(() => totalCredits.value).toThrow('Formatting error')
+      formatSpy.mockRestore()
+    })
+  })
+
+  describe('monthlyBonusCredits', () => {
+    it('should return "0" when cloudCreditBalanceMicros is missing', () => {
+      mockBillingBalance = { amountMicros: 100 }
+      const { monthlyBonusCredits } = useSubscriptionCredits()
+      expect(monthlyBonusCredits.value).toBe('0')
+    })
+
+    it('should format cloudCreditBalanceMicros correctly', () => {
+      mockBillingBalance = {
+        amountMicros: 300,
+        cloudCreditBalanceMicros: 200
+      }
+      const { monthlyBonusCredits } = useSubscriptionCredits()
+      expect(monthlyBonusCredits.value).toBe('422')
+    })
+  })
+
+  describe('prepaidCredits', () => {
+    it('should return "0" when prepaidBalanceMicros is missing', () => {
+      mockBillingBalance = { amountMicros: 100 }
+      const { prepaidCredits } = useSubscriptionCredits()
+      expect(prepaidCredits.value).toBe('0')
+    })
+
+    it('should format prepaidBalanceMicros correctly', () => {
+      mockBillingBalance = {
+        amountMicros: 500,
+        prepaidBalanceMicros: 300
+      }
+      const { prepaidCredits } = useSubscriptionCredits()
+      expect(prepaidCredits.value).toBe('633')
+    })
+  })
+
+  describe('isLoadingBalance', () => {
+    it('should reflect billingContext.isLoading', () => {
+      mockBillingIsLoading = true
+      const { isLoadingBalance } = useSubscriptionCredits()
+      expect(isLoadingBalance.value).toBe(true)
+
+      mockBillingIsLoading = false
+      // Need to re-get the composable since computed caches the value
+      const { isLoadingBalance: reloaded } = useSubscriptionCredits()
+      expect(reloaded.value).toBe(false)
+    })
+  })
+})
diff --git a/src/platform/cloud/subscription/composables/useSubscriptionCredits.ts b/src/platform/cloud/subscription/composables/useSubscriptionCredits.ts
index e67b943ad0..21521a1ea8 100644
--- a/src/platform/cloud/subscription/composables/useSubscriptionCredits.ts
+++ b/src/platform/cloud/subscription/composables/useSubscriptionCredits.ts
@@ -1,43 +1,54 @@
-import { computed } from 'vue'
+import { computed, toValue } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import { formatCreditsFromCents } from '@/base/credits/comfyCredits'
-import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
+import { useBillingContext } from '@/composables/billing/useBillingContext'
 
 /**
- * Composable for handling subscription credit calculations and formatting
+ * Composable for handling subscription credit calculations and formatting.
+ *
+ * Uses useBillingContext which automatically selects the correct billing source:
+ * - If team workspaces feature is disabled: uses legacy (/customers)
+ * - If team workspaces feature is enabled:
+ *   - Personal workspace: uses legacy (/customers)
+ *   - Team workspace: uses workspace (/billing)
  */
+/**
+ * Formats a cent value to display credits.
+ * Backend returns cents despite the *_micros naming convention.
+ */
+function formatBalance(maybeCents: number | undefined, locale: string): string {
+  const cents = maybeCents ?? 0
+  return formatCreditsFromCents({
+    cents,
+    locale,
+    numberOptions: {
+      minimumFractionDigits: 0,
+      maximumFractionDigits: 0
+    }
+  })
+}
+
 export function useSubscriptionCredits() {
-  const authStore = useFirebaseAuthStore()
+  const billingContext = useBillingContext()
   const { locale } = useI18n()
 
-  const formatBalance = (maybeCents?: number) => {
-    // Backend returns cents despite the *_micros naming convention.
-    const cents = maybeCents ?? 0
-    const amount = formatCreditsFromCents({
-      cents,
-      locale: locale.value,
-      numberOptions: {
-        minimumFractionDigits: 0,
-        maximumFractionDigits: 0
-      }
-    })
-    return amount
-  }
+  const totalCredits = computed(() => {
+    const balance = toValue(billingContext.balance)
+    return formatBalance(balance?.amountMicros, locale.value)
+  })
 
-  const totalCredits = computed(() =>
-    formatBalance(authStore.balance?.amount_micros)
-  )
+  const monthlyBonusCredits = computed(() => {
+    const balance = toValue(billingContext.balance)
+    return formatBalance(balance?.cloudCreditBalanceMicros, locale.value)
+  })
 
-  const monthlyBonusCredits = computed(() =>
-    formatBalance(authStore.balance?.cloud_credit_balance_micros)
-  )
+  const prepaidCredits = computed(() => {
+    const balance = toValue(billingContext.balance)
+    return formatBalance(balance?.prepaidBalanceMicros, locale.value)
+  })
 
-  const prepaidCredits = computed(() =>
-    formatBalance(authStore.balance?.prepaid_balance_micros)
-  )
-
-  const isLoadingBalance = computed(() => authStore.isFetchingBalance)
+  const isLoadingBalance = computed(() => toValue(billingContext.isLoading))
 
   return {
     totalCredits,
diff --git a/src/platform/cloud/subscription/composables/useSubscriptionDialog.ts b/src/platform/cloud/subscription/composables/useSubscriptionDialog.ts
index c7fae5b757..3d0c87bed7 100644
--- a/src/platform/cloud/subscription/composables/useSubscriptionDialog.ts
+++ b/src/platform/cloud/subscription/composables/useSubscriptionDialog.ts
@@ -1,44 +1,106 @@
 import { defineAsyncComponent } from 'vue'
 import { useDialogService } from '@/services/dialogService'
 import { useDialogStore } from '@/stores/dialogStore'
+import { useFeatureFlags } from '@/composables/useFeatureFlags'
+import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
+import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
 
 const DIALOG_KEY = 'subscription-required'
+const FREE_TIER_DIALOG_KEY = 'free-tier-info'
+
+export type SubscriptionDialogReason =
+  | 'subscription_required'
+  | 'out_of_credits'
+  | 'top_up_blocked'
 
 export const useSubscriptionDialog = () => {
+  const { flags } = useFeatureFlags()
   const dialogService = useDialogService()
   const dialogStore = useDialogStore()
+  const workspaceStore = useTeamWorkspaceStore()
+  const { isFreeTier } = useSubscription()
 
   function hide() {
     dialogStore.closeDialog({ key: DIALOG_KEY })
+    dialogStore.closeDialog({ key: FREE_TIER_DIALOG_KEY })
   }
 
-  function show() {
+  function showPricingTable(options?: { reason?: SubscriptionDialogReason }) {
+    const useWorkspaceVariant =
+      flags.teamWorkspacesEnabled && !workspaceStore.isInPersonalWorkspace
+
+    const component = useWorkspaceVariant
+      ? defineAsyncComponent(
+          () =>
+            import('@/platform/workspace/components/SubscriptionRequiredDialogContentWorkspace.vue')
+        )
+      : defineAsyncComponent(
+          () =>
+            import('@/platform/cloud/subscription/components/SubscriptionRequiredDialogContent.vue')
+        )
+
     dialogService.showLayoutDialog({
       key: DIALOG_KEY,
-      component: defineAsyncComponent(
-        () =>
-          import('@/platform/cloud/subscription/components/SubscriptionRequiredDialogContent.vue')
-      ),
+      component,
       props: {
-        onClose: hide
+        onClose: hide,
+        reason: options?.reason
       },
       dialogComponentProps: {
-        style: 'width: min(1328px, 95vw); max-height: 90vh;',
+        style: 'width: min(1328px, 95vw); max-height: 958px;',
         pt: {
           root: {
-            class: 'rounded-2xl bg-transparent'
+            class: 'rounded-2xl bg-transparent h-full'
           },
           content: {
             class:
-              '!p-0 rounded-2xl border border-border-default bg-base-background/60 backdrop-blur-md shadow-[0_25px_80px_rgba(5,6,12,0.45)]'
+              '!p-0 rounded-2xl border border-border-default bg-base-background/60 backdrop-blur-md shadow-[0_25px_80px_rgba(5,6,12,0.45)] h-full'
           }
         }
       }
     })
   }
 
+  function show(options?: { reason?: SubscriptionDialogReason }) {
+    if (isFreeTier.value && workspaceStore.isInPersonalWorkspace) {
+      const component = defineAsyncComponent(
+        () =>
+          import('@/platform/cloud/subscription/components/FreeTierDialogContent.vue')
+      )
+
+      dialogService.showLayoutDialog({
+        key: FREE_TIER_DIALOG_KEY,
+        component,
+        props: {
+          reason: options?.reason,
+          onClose: hide,
+          onUpgrade: () => {
+            hide()
+            showPricingTable(options)
+          }
+        },
+        dialogComponentProps: {
+          style: 'width: min(640px, 95vw);',
+          pt: {
+            root: {
+              class: 'rounded-2xl bg-transparent'
+            },
+            content: {
+              class:
+                '!p-0 rounded-2xl border border-border-default bg-base-background/60 backdrop-blur-md shadow-[0_25px_80px_rgba(5,6,12,0.45)]'
+            }
+          }
+        }
+      })
+      return
+    }
+
+    showPricingTable(options)
+  }
+
   return {
     show,
+    showPricingTable,
     hide
   }
 }
diff --git a/src/platform/cloud/subscription/constants/tierPricing.ts b/src/platform/cloud/subscription/constants/tierPricing.ts
index 88ed0cd7d0..8d8f4c77a6 100644
--- a/src/platform/cloud/subscription/constants/tierPricing.ts
+++ b/src/platform/cloud/subscription/constants/tierPricing.ts
@@ -1,16 +1,26 @@
+import { remoteConfig } from '@/platform/remoteConfig/remoteConfig'
 import type { components } from '@/types/comfyRegistryTypes'
 
 type SubscriptionTier = components['schemas']['SubscriptionTier']
 
-export type TierKey = 'standard' | 'creator' | 'pro' | 'founder'
+export type TierKey = 'free' | 'standard' | 'creator' | 'pro' | 'founder'
 
 export const TIER_TO_KEY: Record<SubscriptionTier, TierKey> = {
+  FREE: 'free',
   STANDARD: 'standard',
   CREATOR: 'creator',
   PRO: 'pro',
   FOUNDERS_EDITION: 'founder'
 }
 
+export const KEY_TO_TIER: Record<TierKey, SubscriptionTier> = {
+  free: 'FREE',
+  standard: 'STANDARD',
+  creator: 'CREATOR',
+  pro: 'PRO',
+  founder: 'FOUNDERS_EDITION'
+}
+
 export interface TierPricing {
   monthly: number
   yearly: number
@@ -18,21 +28,26 @@ export interface TierPricing {
   videoEstimate: number
 }
 
-export const TIER_PRICING: Record<Exclude<TierKey, 'founder'>, TierPricing> = {
-  standard: { monthly: 20, yearly: 16, credits: 4200, videoEstimate: 164 },
-  creator: { monthly: 35, yearly: 28, credits: 7400, videoEstimate: 288 },
-  pro: { monthly: 100, yearly: 80, credits: 21100, videoEstimate: 821 }
+export const TIER_PRICING: Record<
+  Exclude<TierKey, 'free' | 'founder'>,
+  TierPricing
+> = {
+  standard: { monthly: 20, yearly: 16, credits: 4200, videoEstimate: 380 },
+  creator: { monthly: 35, yearly: 28, credits: 7400, videoEstimate: 670 },
+  pro: { monthly: 100, yearly: 80, credits: 21100, videoEstimate: 1915 }
 }
 
 interface TierFeatures {
   customLoRAs: boolean
+  maxMembers: number
 }
 
 const TIER_FEATURES: Record<TierKey, TierFeatures> = {
-  standard: { customLoRAs: false },
-  creator: { customLoRAs: true },
-  pro: { customLoRAs: true },
-  founder: { customLoRAs: false }
+  free: { customLoRAs: false, maxMembers: 1 },
+  standard: { customLoRAs: false, maxMembers: 1 },
+  creator: { customLoRAs: true, maxMembers: 5 },
+  pro: { customLoRAs: true, maxMembers: 20 },
+  founder: { customLoRAs: false, maxMembers: 1 }
 }
 
 export const DEFAULT_TIER_KEY: TierKey = 'standard'
@@ -41,12 +56,14 @@ const FOUNDER_MONTHLY_PRICE = 20
 const FOUNDER_MONTHLY_CREDITS = 5460
 
 export function getTierPrice(tierKey: TierKey, isYearly = false): number {
+  if (tierKey === 'free') return 0
   if (tierKey === 'founder') return FOUNDER_MONTHLY_PRICE
   const pricing = TIER_PRICING[tierKey]
   return isYearly ? pricing.yearly : pricing.monthly
 }
 
-export function getTierCredits(tierKey: TierKey): number {
+export function getTierCredits(tierKey: TierKey): number | null {
+  if (tierKey === 'free') return remoteConfig.value.free_tier_credits ?? null
   if (tierKey === 'founder') return FOUNDER_MONTHLY_CREDITS
   return TIER_PRICING[tierKey].credits
 }
diff --git a/src/platform/cloud/subscription/utils/subscriptionCheckoutUtil.test.ts b/src/platform/cloud/subscription/utils/subscriptionCheckoutUtil.test.ts
new file mode 100644
index 0000000000..8386a469ca
--- /dev/null
+++ b/src/platform/cloud/subscription/utils/subscriptionCheckoutUtil.test.ts
@@ -0,0 +1,206 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { computed, reactive } from 'vue'
+
+import { performSubscriptionCheckout } from './subscriptionCheckoutUtil'
+
+const {
+  mockTelemetry,
+  mockGetAuthHeader,
+  mockUserId,
+  mockIsCloud,
+  mockGetCheckoutAttribution
+} = vi.hoisted(() => ({
+  mockTelemetry: {
+    trackBeginCheckout: vi.fn()
+  },
+  mockGetAuthHeader: vi.fn(() =>
+    Promise.resolve({ Authorization: 'Bearer test-token' })
+  ),
+  mockUserId: { value: 'user-123' as string | undefined },
+  mockIsCloud: { value: true },
+  mockGetCheckoutAttribution: vi.fn(() => ({
+    ga_client_id: 'ga-client-id',
+    ga_session_id: 'ga-session-id',
+    ga_session_number: 'ga-session-number',
+    im_ref: 'impact-click-123',
+    utm_source: 'impact',
+    utm_medium: 'affiliate',
+    utm_campaign: 'spring-launch',
+    gclid: 'gclid-123',
+    gbraid: 'gbraid-456',
+    wbraid: 'wbraid-789'
+  }))
+}))
+
+vi.mock('@/platform/telemetry', () => ({
+  useTelemetry: vi.fn(() => mockTelemetry)
+}))
+
+vi.mock('@/stores/firebaseAuthStore', () => ({
+  useFirebaseAuthStore: vi.fn(() =>
+    reactive({
+      getAuthHeader: mockGetAuthHeader,
+      userId: computed(() => mockUserId.value)
+    })
+  ),
+  FirebaseAuthStoreError: class extends Error {}
+}))
+
+vi.mock('@/platform/distribution/types', () => ({
+  get isCloud() {
+    return mockIsCloud.value
+  }
+}))
+
+vi.mock('@/platform/telemetry/utils/checkoutAttribution', () => ({
+  getCheckoutAttribution: mockGetCheckoutAttribution
+}))
+
+global.fetch = vi.fn()
+
+type Distribution = 'desktop' | 'localhost' | 'cloud'
+
+const setDistribution = (distribution: Distribution) => {
+  ;(
+    globalThis as typeof globalThis & { __DISTRIBUTION__: Distribution }
+  ).__DISTRIBUTION__ = distribution
+}
+
+function createDeferred<T>() {
+  let resolve: (value: T) => void = () => {}
+  const promise = new Promise<T>((res) => {
+    resolve = res
+  })
+
+  return { promise, resolve }
+}
+
+describe('performSubscriptionCheckout', () => {
+  beforeEach(() => {
+    setDistribution('cloud')
+    vi.clearAllMocks()
+    mockIsCloud.value = true
+    mockUserId.value = 'user-123'
+  })
+
+  afterEach(() => {
+    vi.restoreAllMocks()
+    setDistribution('localhost')
+  })
+
+  it('tracks begin_checkout with user id and tier metadata', async () => {
+    const checkoutUrl = 'https://checkout.stripe.com/test'
+    const openSpy = vi.spyOn(window, 'open').mockImplementation(() => null)
+
+    vi.mocked(global.fetch).mockResolvedValue({
+      ok: true,
+      json: async () => ({ checkout_url: checkoutUrl })
+    } as Response)
+
+    await performSubscriptionCheckout('pro', 'yearly', true)
+
+    expect(mockTelemetry.trackBeginCheckout).toHaveBeenCalledWith({
+      user_id: 'user-123',
+      tier: 'pro',
+      cycle: 'yearly',
+      checkout_type: 'new',
+      ga_client_id: 'ga-client-id',
+      ga_session_id: 'ga-session-id',
+      ga_session_number: 'ga-session-number',
+      im_ref: 'impact-click-123',
+      utm_source: 'impact',
+      utm_medium: 'affiliate',
+      utm_campaign: 'spring-launch',
+      gclid: 'gclid-123',
+      gbraid: 'gbraid-456',
+      wbraid: 'wbraid-789'
+    })
+    expect(global.fetch).toHaveBeenCalledWith(
+      expect.stringContaining(
+        '/customers/cloud-subscription-checkout/pro-yearly'
+      ),
+      expect.objectContaining({
+        method: 'POST',
+        body: JSON.stringify({
+          ga_client_id: 'ga-client-id',
+          ga_session_id: 'ga-session-id',
+          ga_session_number: 'ga-session-number',
+          im_ref: 'impact-click-123',
+          utm_source: 'impact',
+          utm_medium: 'affiliate',
+          utm_campaign: 'spring-launch',
+          gclid: 'gclid-123',
+          gbraid: 'gbraid-456',
+          wbraid: 'wbraid-789'
+        })
+      })
+    )
+    expect(openSpy).toHaveBeenCalledWith(checkoutUrl, '_blank')
+  })
+
+  it('continues checkout when attribution collection fails', async () => {
+    const checkoutUrl = 'https://checkout.stripe.com/test'
+    const openSpy = vi.spyOn(window, 'open').mockImplementation(() => null)
+    const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
+
+    mockGetCheckoutAttribution.mockRejectedValueOnce(
+      new Error('Attribution failed')
+    )
+    vi.mocked(global.fetch).mockResolvedValue({
+      ok: true,
+      json: async () => ({ checkout_url: checkoutUrl })
+    } as Response)
+
+    await performSubscriptionCheckout('pro', 'monthly', true)
+
+    expect(warnSpy).toHaveBeenCalledWith(
+      '[SubscriptionCheckout] Failed to collect checkout attribution',
+      expect.any(Error)
+    )
+    expect(global.fetch).toHaveBeenCalledWith(
+      expect.stringContaining('/customers/cloud-subscription-checkout/pro'),
+      expect.objectContaining({
+        method: 'POST',
+        body: JSON.stringify({})
+      })
+    )
+    expect(mockTelemetry.trackBeginCheckout).toHaveBeenCalledWith({
+      user_id: 'user-123',
+      tier: 'pro',
+      cycle: 'monthly',
+      checkout_type: 'new'
+    })
+    expect(openSpy).toHaveBeenCalledWith(checkoutUrl, '_blank')
+  })
+
+  it('uses the latest userId when it changes after checkout starts', async () => {
+    const checkoutUrl = 'https://checkout.stripe.com/test'
+    const openSpy = vi.spyOn(window, 'open').mockImplementation(() => null)
+    const authHeader = createDeferred<{ Authorization: string }>()
+
+    mockUserId.value = 'user-early'
+    mockGetAuthHeader.mockImplementationOnce(() => authHeader.promise)
+    vi.mocked(global.fetch).mockResolvedValue({
+      ok: true,
+      json: async () => ({ checkout_url: checkoutUrl })
+    } as Response)
+
+    const checkoutPromise = performSubscriptionCheckout('pro', 'yearly', true)
+
+    mockUserId.value = 'user-late'
+    authHeader.resolve({ Authorization: 'Bearer test-token' })
+
+    await checkoutPromise
+
+    expect(mockTelemetry.trackBeginCheckout).toHaveBeenCalledTimes(1)
+    expect(mockTelemetry.trackBeginCheckout).toHaveBeenCalledWith(
+      expect.objectContaining({
+        user_id: 'user-late',
+        tier: 'pro',
+        cycle: 'yearly',
+        checkout_type: 'new'
+      })
+    )
+    expect(openSpy).toHaveBeenCalledWith(checkoutUrl, '_blank')
+  })
+})
diff --git a/src/platform/cloud/subscription/utils/subscriptionCheckoutUtil.ts b/src/platform/cloud/subscription/utils/subscriptionCheckoutUtil.ts
new file mode 100644
index 0000000000..1982a4d4f9
--- /dev/null
+++ b/src/platform/cloud/subscription/utils/subscriptionCheckoutUtil.ts
@@ -0,0 +1,125 @@
+import { storeToRefs } from 'pinia'
+
+import { getComfyApiBaseUrl } from '@/config/comfyApi'
+import { t } from '@/i18n'
+import { isCloud } from '@/platform/distribution/types'
+import { useTelemetry } from '@/platform/telemetry'
+import {
+  FirebaseAuthStoreError,
+  useFirebaseAuthStore
+} from '@/stores/firebaseAuthStore'
+import type { CheckoutAttributionMetadata } from '@/platform/telemetry/types'
+import type { TierKey } from '@/platform/cloud/subscription/constants/tierPricing'
+import type { BillingCycle } from './subscriptionTierRank'
+
+type CheckoutTier = TierKey | `${TierKey}-yearly`
+
+const getCheckoutTier = (
+  tierKey: TierKey,
+  billingCycle: BillingCycle
+): CheckoutTier => (billingCycle === 'yearly' ? `${tierKey}-yearly` : tierKey)
+
+const getCheckoutAttributionForCloud =
+  async (): Promise<CheckoutAttributionMetadata> => {
+    if (__DISTRIBUTION__ !== 'cloud') {
+      return {}
+    }
+
+    const { getCheckoutAttribution } =
+      await import('@/platform/telemetry/utils/checkoutAttribution')
+
+    return getCheckoutAttribution()
+  }
+
+/**
+ * Core subscription checkout logic shared between PricingTable and
+ * SubscriptionRedirectView. Handles:
+ * - Ensuring the user is authenticated
+ * - Calling the backend checkout endpoint
+ * - Normalizing error responses
+ * - Opening the checkout URL in a new tab when available
+ *
+ * Callers are responsible for:
+ * - Guarding on cloud-only behavior (isCloud)
+ * - Managing loading state
+ * - Wrapping with error handling (e.g. useErrorHandling)
+ */
+export async function performSubscriptionCheckout(
+  tierKey: TierKey,
+  currentBillingCycle: BillingCycle,
+  openInNewTab: boolean = true
+): Promise<void> {
+  if (!isCloud) return
+
+  const firebaseAuthStore = useFirebaseAuthStore()
+  const { userId } = storeToRefs(firebaseAuthStore)
+  const telemetry = useTelemetry()
+  const authHeader = await firebaseAuthStore.getAuthHeader()
+
+  if (!authHeader) {
+    throw new FirebaseAuthStoreError(t('toastMessages.userNotAuthenticated'))
+  }
+
+  const checkoutTier = getCheckoutTier(tierKey, currentBillingCycle)
+  let checkoutAttribution: CheckoutAttributionMetadata = {}
+  try {
+    checkoutAttribution = await getCheckoutAttributionForCloud()
+  } catch (error) {
+    console.warn(
+      '[SubscriptionCheckout] Failed to collect checkout attribution',
+      error
+    )
+  }
+  const checkoutPayload = { ...checkoutAttribution }
+
+  const response = await fetch(
+    `${getComfyApiBaseUrl()}/customers/cloud-subscription-checkout/${checkoutTier}`,
+    {
+      method: 'POST',
+      headers: { ...authHeader, 'Content-Type': 'application/json' },
+      body: JSON.stringify(checkoutPayload)
+    }
+  )
+
+  if (!response.ok) {
+    let errorMessage = 'Failed to initiate checkout'
+    try {
+      const errorData = await response.json()
+      errorMessage = errorData.message || errorMessage
+    } catch {
+      // If JSON parsing fails, try to get text response or use HTTP status
+      try {
+        const errorText = await response.text()
+        errorMessage =
+          errorText || `HTTP ${response.status} ${response.statusText}`
+      } catch {
+        errorMessage = `HTTP ${response.status} ${response.statusText}`
+      }
+    }
+
+    throw new FirebaseAuthStoreError(
+      t('toastMessages.failedToInitiateSubscription', {
+        error: errorMessage
+      })
+    )
+  }
+
+  const data = await response.json()
+
+  if (data.checkout_url) {
+    if (userId.value) {
+      telemetry?.trackBeginCheckout({
+        user_id: userId.value,
+        tier: tierKey,
+        cycle: currentBillingCycle,
+        checkout_type: 'new',
+        ...checkoutAttribution
+      })
+    }
+    if (openInNewTab) {
+      window.open(data.checkout_url, '_blank')
+    } else {
+      globalThis.location.href = data.checkout_url
+    }
+  }
+}
diff --git a/src/platform/cloud/subscription/utils/subscriptionTierRank.ts b/src/platform/cloud/subscription/utils/subscriptionTierRank.ts
index f85c8af915..f9a78f7f8f 100644
--- a/src/platform/cloud/subscription/utils/subscriptionTierRank.ts
+++ b/src/platform/cloud/subscription/utils/subscriptionTierRank.ts
@@ -2,7 +2,7 @@ import type { TierKey } from '@/platform/cloud/subscription/constants/tierPricin
 
 export type BillingCycle = 'monthly' | 'yearly'
 
-type RankedTierKey = Exclude<TierKey, 'founder'>
+type RankedTierKey = Exclude<TierKey, 'founder' | 'free'>
 type RankedPlanKey = `${BillingCycle}-${RankedTierKey}`
 
 interface PlanDescriptor {
@@ -28,7 +28,7 @@ const toRankedPlanKey = (
   tierKey: TierKey,
   billingCycle: BillingCycle
 ): RankedPlanKey | null => {
-  if (tierKey === 'founder') return null
+  if (tierKey === 'founder' || tierKey === 'free') return null
   return `${billingCycle}-${tierKey}` as RankedPlanKey
 }
 
diff --git a/src/platform/cloud/subscription/utils/tierBenefits.ts b/src/platform/cloud/subscription/utils/tierBenefits.ts
new file mode 100644
index 0000000000..7c7bf3495f
--- /dev/null
+++ b/src/platform/cloud/subscription/utils/tierBenefits.ts
@@ -0,0 +1,67 @@
+import {
+  getTierCredits,
+  getTierFeatures
+} from '@/platform/cloud/subscription/constants/tierPricing'
+import type { TierKey } from '@/platform/cloud/subscription/constants/tierPricing'
+
+type BenefitType = 'metric' | 'feature' | 'icon'
+
+export interface TierBenefit {
+  key: string
+  type: BenefitType
+  label: string
+  value?: string
+  icon?: string
+}
+
+export function getCommonTierBenefits(
+  key: TierKey,
+  t: (key: string, params?: Record<string, unknown>) => string,
+  n: (value: number) => string
+): TierBenefit[] {
+  const benefits: TierBenefit[] = []
+  const isFree = key === 'free'
+
+  if (isFree) {
+    const credits = getTierCredits(key)
+    if (credits !== null) {
+      benefits.push({
+        key: 'monthlyCredits',
+        type: 'metric',
+        value: n(credits),
+        label: t('subscription.monthlyCreditsLabel')
+      })
+    }
+  }
+
+  benefits.push({
+    key: 'maxDuration',
+    type: 'metric',
+    value: t(`subscription.maxDuration.${key}`),
+    label: t('subscription.maxDurationLabel')
+  })
+
+  benefits.push({
+    key: 'gpu',
+    type: 'feature',
+    label: t('subscription.gpuLabel')
+  })
+
+  if (!isFree) {
+    benefits.push({
+      key: 'addCredits',
+      type: 'feature',
+      label: t('subscription.addCreditsLabel')
+    })
+  }
+
+  if (getTierFeatures(key).customLoRAs) {
+    benefits.push({
+      key: 'customLoRAs',
+      type: 'feature',
+      label: t('subscription.customLoRAsLabel')
+    })
+  }
+
+  return benefits
+}
diff --git a/src/platform/distribution/cloudPreviewUtil.test.ts b/src/platform/distribution/cloudPreviewUtil.test.ts
new file mode 100644
index 0000000000..59dc725edd
--- /dev/null
+++ b/src/platform/distribution/cloudPreviewUtil.test.ts
@@ -0,0 +1,56 @@
+import { describe, expect, it, vi } from 'vitest'
+
+import { appendCloudResParam } from './cloudPreviewUtil'
+
+const mockIsCloud = vi.hoisted(() => ({ value: false }))
+
+vi.mock('./types', () => ({
+  get isCloud() {
+    return mockIsCloud.value
+  }
+}))
+
+function buildParams(filename?: string): URLSearchParams {
+  const params = new URLSearchParams()
+  appendCloudResParam(params, filename)
+  return params
+}
+
+describe('appendCloudResParam', () => {
+  it('does not set res in non-cloud mode', () => {
+    mockIsCloud.value = false
+    expect(buildParams('test.png').has('res')).toBe(false)
+  })
+
+  it.for(['png', 'jpg', 'jpeg', 'webp', 'gif', 'bmp', 'tiff', 'tif'])(
+    'sets res=512 for .%s in cloud mode',
+    (ext) => {
+      mockIsCloud.value = true
+      const params = buildParams(`file.${ext}`)
+      expect(params.get('res')).toBe('512')
+    }
+  )
+
+  it.for([
+    'video.mp4',
+    'video.webm',
+    'audio.mp3',
+    'audio.wav',
+    'model.glb',
+    'icon.svg'
+  ])('does not set res for %s in cloud mode', (name) => {
+    mockIsCloud.value = true
+    expect(buildParams(name).has('res')).toBe(false)
+  })
+
+  it('sets res=512 when no filename provided in cloud mode', () => {
+    mockIsCloud.value = true
+    expect(buildParams().get('res')).toBe('512')
+    expect(buildParams(undefined).get('res')).toBe('512')
+  })
+
+  it('does not set res when no filename provided in non-cloud mode', () => {
+    mockIsCloud.value = false
+    expect(buildParams().has('res')).toBe(false)
+  })
+})
diff --git a/src/platform/distribution/cloudPreviewUtil.ts b/src/platform/distribution/cloudPreviewUtil.ts
new file mode 100644
index 0000000000..28a32858cc
--- /dev/null
+++ b/src/platform/distribution/cloudPreviewUtil.ts
@@ -0,0 +1,19 @@
+import { getMediaTypeFromFilename } from '@/utils/formatUtil'
+
+import { isCloud } from './types'
+
+/**
+ * Appends `res=512` to the given URLSearchParams when in cloud mode
+ * and the file is an image (or filename is unknown).
+ *
+ * The cloud backend resizes images server-side to prevent
+ * the frontend from loading very large originals for previews.
+ */
+export function appendCloudResParam(
+  params: URLSearchParams,
+  filename?: string
+): void {
+  if (!isCloud) return
+  if (filename && getMediaTypeFromFilename(filename) !== 'image') return
+  params.set('res', '512')
+}
diff --git a/src/platform/distribution/types.ts b/src/platform/distribution/types.ts
index d03e6d53b8..fedd02fe17 100644
--- a/src/platform/distribution/types.ts
+++ b/src/platform/distribution/types.ts
@@ -1,5 +1,3 @@
-import { isElectron } from '@/utils/envUtil'
-
 /**
  * Distribution types and compile-time constants for managing
  * multi-distribution builds (Desktop, Localhost, Cloud)
@@ -9,12 +7,18 @@ type Distribution = 'desktop' | 'localhost' | 'cloud'
 
 declare global {
   const __DISTRIBUTION__: Distribution
+  const __IS_NIGHTLY__: boolean
 }
 
 /** Current distribution - replaced at compile time */
 const DISTRIBUTION: Distribution = __DISTRIBUTION__
 
-/** Distribution type checks */
-export const isDesktop = DISTRIBUTION === 'desktop' || isElectron() // TODO: replace with build var
+export const isDesktop = DISTRIBUTION === 'desktop'
 export const isCloud = DISTRIBUTION === 'cloud'
-// export const isLocalhost = DISTRIBUTION === 'localhost' || (!isDesktop && !isCloud)
+
+/**
+ * Whether this is a nightly build (from main branch).
+ * Nightly builds may show experimental features and surveys.
+ * @public
+ */
+export const isNightly = __IS_NIGHTLY__
diff --git a/src/constants/coreKeybindings.ts b/src/platform/keybindings/defaults.ts
similarity index 73%
rename from src/constants/coreKeybindings.ts
rename to src/platform/keybindings/defaults.ts
index cd8f3e5bba..448ebc3172 100644
--- a/src/constants/coreKeybindings.ts
+++ b/src/platform/keybindings/defaults.ts
@@ -1,4 +1,4 @@
-import type { Keybinding } from '@/schemas/keyBindingSchema'
+import type { Keybinding } from './types'
 
 export const CORE_KEYBINDINGS: Keybinding[] = [
   {
@@ -48,6 +48,20 @@ export const CORE_KEYBINDINGS: Keybinding[] = [
     },
     commandId: 'Workspace.ToggleSidebarTab.model-library'
   },
+  {
+    combo: {
+      key: 'a'
+    },
+    commandId: 'Workspace.ToggleSidebarTab.assets'
+  },
+  {
+    combo: {
+      ctrl: true,
+      shift: true,
+      key: 'a'
+    },
+    commandId: 'Comfy.ToggleLinear'
+  },
   {
     combo: {
       key: 's',
@@ -76,7 +90,6 @@ export const CORE_KEYBINDINGS: Keybinding[] = [
     },
     commandId: 'Comfy.ShowSettingsDialog'
   },
-  // For '=' both holding shift and not holding shift
   {
     combo: {
       key: '=',
@@ -94,7 +107,6 @@ export const CORE_KEYBINDINGS: Keybinding[] = [
     commandId: 'Comfy.Canvas.ZoomIn',
     targetElementId: 'graph-canvas'
   },
-  // For number pad '+'
   {
     combo: {
       key: '+',
@@ -196,5 +208,52 @@ export const CORE_KEYBINDINGS: Keybinding[] = [
       key: 'Escape'
     },
     commandId: 'Comfy.Graph.ExitSubgraph'
+  },
+  {
+    combo: {
+      ctrl: true,
+      key: 'a'
+    },
+    commandId: 'Comfy.Canvas.SelectAll',
+    targetElementId: 'graph-canvas-container'
+  },
+  {
+    combo: {
+      ctrl: true,
+      key: 'c'
+    },
+    commandId: 'Comfy.Canvas.CopySelected',
+    targetElementId: 'graph-canvas-container'
+  },
+  {
+    combo: {
+      ctrl: true,
+      key: 'v'
+    },
+    commandId: 'Comfy.Canvas.PasteFromClipboard',
+    targetElementId: 'graph-canvas-container'
+  },
+  {
+    combo: {
+      ctrl: true,
+      shift: true,
+      key: 'v'
+    },
+    commandId: 'Comfy.Canvas.PasteFromClipboardWithConnect',
+    targetElementId: 'graph-canvas-container'
+  },
+  {
+    combo: {
+      key: 'Delete'
+    },
+    commandId: 'Comfy.Canvas.DeleteSelectedItems',
+    targetElementId: 'graph-canvas-container'
+  },
+  {
+    combo: {
+      key: 'Backspace'
+    },
+    commandId: 'Comfy.Canvas.DeleteSelectedItems',
+    targetElementId: 'graph-canvas-container'
   }
 ]
diff --git a/src/platform/keybindings/keyCombo.ts b/src/platform/keybindings/keyCombo.ts
new file mode 100644
index 0000000000..2a61c0fc79
--- /dev/null
+++ b/src/platform/keybindings/keyCombo.ts
@@ -0,0 +1,86 @@
+import { toRaw } from 'vue'
+
+import { RESERVED_BY_TEXT_INPUT } from './reserved'
+import type { KeyCombo } from './types'
+
+export class KeyComboImpl implements KeyCombo {
+  key: string
+  ctrl: boolean
+  alt: boolean
+  shift: boolean
+
+  constructor(obj: KeyCombo) {
+    this.key = obj.key
+    this.ctrl = obj.ctrl ?? false
+    this.alt = obj.alt ?? false
+    this.shift = obj.shift ?? false
+  }
+
+  static fromEvent(event: KeyboardEvent) {
+    return new KeyComboImpl({
+      key: event.key,
+      ctrl: event.ctrlKey || event.metaKey,
+      alt: event.altKey,
+      shift: event.shiftKey
+    })
+  }
+
+  equals(other: unknown): boolean {
+    const raw = toRaw(other)
+
+    return raw instanceof KeyComboImpl
+      ? this.key.toUpperCase() === raw.key.toUpperCase() &&
+          this.ctrl === raw.ctrl &&
+          this.alt === raw.alt &&
+          this.shift === raw.shift
+      : false
+  }
+
+  serialize(): string {
+    return `${this.key.toUpperCase()}:${this.ctrl}:${this.alt}:${this.shift}`
+  }
+
+  toString(): string {
+    return this.getKeySequences().join(' + ')
+  }
+
+  get hasModifier(): boolean {
+    return this.ctrl || this.alt || this.shift
+  }
+
+  get isModifier(): boolean {
+    return ['Control', 'Meta', 'Alt', 'Shift'].includes(this.key)
+  }
+
+  get modifierCount(): number {
+    const modifiers = [this.ctrl, this.alt, this.shift]
+    return modifiers.reduce((acc, cur) => acc + Number(cur), 0)
+  }
+
+  get isShiftOnly(): boolean {
+    return this.shift && this.modifierCount === 1
+  }
+
+  get isReservedByTextInput(): boolean {
+    return (
+      !this.hasModifier ||
+      this.isShiftOnly ||
+      RESERVED_BY_TEXT_INPUT.has(this.toString())
+    )
+  }
+
+  getKeySequences(): string[] {
+    const sequences: string[] = []
+    if (this.ctrl) {
+      sequences.push('Ctrl')
+    }
+    if (this.alt) {
+      sequences.push('Alt')
+    }
+    if (this.shift) {
+      sequences.push('Shift')
+    }
+    sequences.push(this.key)
+    return sequences
+  }
+}
diff --git a/src/platform/keybindings/keybinding.ts b/src/platform/keybindings/keybinding.ts
new file mode 100644
index 0000000000..9f879c92e4
--- /dev/null
+++ b/src/platform/keybindings/keybinding.ts
@@ -0,0 +1,26 @@
+import { toRaw } from 'vue'
+
+import { KeyComboImpl } from './keyCombo'
+import type { Keybinding } from './types'
+
+export class KeybindingImpl implements Keybinding {
+  commandId: string
+  combo: KeyComboImpl
+  targetElementId?: string
+
+  constructor(obj: Keybinding) {
+    this.commandId = obj.commandId
+    this.combo = new KeyComboImpl(obj.combo)
+    this.targetElementId = obj.targetElementId
+  }
+
+  equals(other: unknown): boolean {
+    const raw = toRaw(other)
+
+    return raw instanceof KeybindingImpl
+      ? this.commandId === raw.commandId &&
+          this.combo.equals(raw.combo) &&
+          this.targetElementId === raw.targetElementId
+      : false
+  }
+}
diff --git a/src/platform/keybindings/keybindingService.escape.test.ts b/src/platform/keybindings/keybindingService.escape.test.ts
new file mode 100644
index 0000000000..42b946a13a
--- /dev/null
+++ b/src/platform/keybindings/keybindingService.escape.test.ts
@@ -0,0 +1,181 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { markRaw, reactive } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { CORE_KEYBINDINGS } from '@/platform/keybindings/defaults'
+import { KeyComboImpl } from '@/platform/keybindings/keyCombo'
+import { KeybindingImpl } from '@/platform/keybindings/keybinding'
+import { useKeybindingService } from '@/platform/keybindings/keybindingService'
+import { useKeybindingStore } from '@/platform/keybindings/keybindingStore'
+import { useCommandStore } from '@/stores/commandStore'
+import type { DialogInstance } from '@/stores/dialogStore'
+import { useDialogStore } from '@/stores/dialogStore'
+
+function createTestDialogInstance(
+  key: string,
+  overrides: Partial<DialogInstance> = {}
+): DialogInstance {
+  return {
+    key,
+    visible: true,
+    component: markRaw({ template: '<div />' }),
+    contentProps: {},
+    dialogComponentProps: {},
+    priority: 0,
+    ...overrides
+  }
+}
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: vi.fn(() => ({
+    get: vi.fn(() => [])
+  }))
+}))
+
+vi.mock('@/stores/dialogStore', () => {
+  const dialogStack = reactive<DialogInstance[]>([])
+  return {
+    useDialogStore: () => ({ dialogStack })
+  }
+})
+
+vi.mock('@/scripts/app', () => ({
+  app: {
+    canvas: null
+  }
+}))
+
+describe('keybindingService - Escape key handling', () => {
+  let keybindingService: ReturnType<typeof useKeybindingService>
+  let mockCommandExecute: ReturnType<typeof useCommandStore>['execute']
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    setActivePinia(createPinia())
+
+    const commandStore = useCommandStore()
+    mockCommandExecute = vi.fn()
+    commandStore.execute = mockCommandExecute
+
+    const dialogStore = useDialogStore()
+    dialogStore.dialogStack.length = 0
+
+    keybindingService = useKeybindingService()
+    keybindingService.registerCoreKeybindings()
+  })
+
+  function createKeyboardEvent(
+    key: string,
+    options: {
+      ctrlKey?: boolean
+      altKey?: boolean
+      metaKey?: boolean
+      shiftKey?: boolean
+    } = {}
+  ): KeyboardEvent {
+    const event = new KeyboardEvent('keydown', {
+      key,
+      ctrlKey: options.ctrlKey ?? false,
+      altKey: options.altKey ?? false,
+      metaKey: options.metaKey ?? false,
+      shiftKey: options.shiftKey ?? false,
+      bubbles: true,
+      cancelable: true
+    })
+
+    event.preventDefault = vi.fn()
+    event.composedPath = vi.fn(() => [document.body])
+
+    return event
+  }
+
+  it('should execute Escape keybinding when no dialogs are open', async () => {
+    const event = createKeyboardEvent('Escape')
+    await keybindingService.keybindHandler(event)
+
+    expect(mockCommandExecute).toHaveBeenCalledWith('Comfy.Graph.ExitSubgraph')
+  })
+
+  it('should NOT execute Escape keybinding when dialogs are open', async () => {
+    const dialogStore = useDialogStore()
+    dialogStore.dialogStack.push(createTestDialogInstance('test-dialog'))
+
+    keybindingService = useKeybindingService()
+
+    const event = createKeyboardEvent('Escape')
+    await keybindingService.keybindHandler(event)
+
+    expect(mockCommandExecute).not.toHaveBeenCalled()
+  })
+
+  it('should execute Escape keybinding with modifiers regardless of dialog state', async () => {
+    const dialogStore = useDialogStore()
+    dialogStore.dialogStack.push(createTestDialogInstance('test-dialog'))
+
+    const keybindingStore = useKeybindingStore()
+    keybindingStore.addDefaultKeybinding(
+      new KeybindingImpl({
+        commandId: 'Test.CtrlEscape',
+        combo: { key: 'Escape', ctrl: true }
+      })
+    )
+
+    keybindingService = useKeybindingService()
+
+    const event = createKeyboardEvent('Escape', { ctrlKey: true })
+    await keybindingService.keybindHandler(event)
+
+    expect(mockCommandExecute).toHaveBeenCalledWith('Test.CtrlEscape')
+  })
+
+  it('should verify Escape keybinding exists in CORE_KEYBINDINGS', () => {
+    const escapeBinding = CORE_KEYBINDINGS.find(
+      (kb) => kb.combo.key === 'Escape' && !kb.combo.ctrl && !kb.combo.alt
+    )
+
+    expect(escapeBinding).toBeDefined()
+    expect(escapeBinding?.commandId).toBe('Comfy.Graph.ExitSubgraph')
+  })
+
+  it('should create correct KeyComboImpl from Escape event', () => {
+    const event = new KeyboardEvent('keydown', {
+      key: 'Escape',
+      ctrlKey: false,
+      altKey: false,
+      metaKey: false,
+      shiftKey: false
+    })
+
+    const keyCombo = KeyComboImpl.fromEvent(event)
+
+    expect(keyCombo.key).toBe('Escape')
+    expect(keyCombo.ctrl).toBe(false)
+    expect(keyCombo.alt).toBe(false)
+    expect(keyCombo.shift).toBe(false)
+  })
+
+  it('should still close legacy modals on Escape when no keybinding matched', async () => {
+    setActivePinia(createPinia())
+    keybindingService = useKeybindingService()
+
+    const mockModal = document.createElement('div')
+    mockModal.className = 'comfy-modal'
+    mockModal.style.display = 'block'
+    document.body.appendChild(mockModal)
+
+    const originalGetComputedStyle = window.getComputedStyle
+    window.getComputedStyle = vi.fn().mockReturnValue({
+      getPropertyValue: vi.fn().mockReturnValue('block')
+    })
+
+    try {
+      const event = createKeyboardEvent('Escape')
+      await keybindingService.keybindHandler(event)
+
+      expect(mockModal.style.display).toBe('none')
+    } finally {
+      document.body.removeChild(mockModal)
+      window.getComputedStyle = originalGetComputedStyle
+    }
+  })
+})
diff --git a/src/platform/keybindings/keybindingService.forwarding.test.ts b/src/platform/keybindings/keybindingService.forwarding.test.ts
new file mode 100644
index 0000000000..594a81acc7
--- /dev/null
+++ b/src/platform/keybindings/keybindingService.forwarding.test.ts
@@ -0,0 +1,225 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { useKeybindingService } from '@/platform/keybindings/keybindingService'
+import { useCommandStore } from '@/stores/commandStore'
+import { useDialogStore } from '@/stores/dialogStore'
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: vi.fn(() => ({
+    get: vi.fn(() => [])
+  }))
+}))
+
+vi.mock('@/stores/dialogStore', () => ({
+  useDialogStore: vi.fn(() => ({
+    dialogStack: []
+  }))
+}))
+
+function createTestKeyboardEvent(
+  key: string,
+  options: {
+    target?: Element
+    ctrlKey?: boolean
+    altKey?: boolean
+    metaKey?: boolean
+    shiftKey?: boolean
+  } = {}
+): KeyboardEvent {
+  const {
+    target = document.body,
+    ctrlKey = false,
+    altKey = false,
+    metaKey = false,
+    shiftKey = false
+  } = options
+
+  const event = new KeyboardEvent('keydown', {
+    key,
+    ctrlKey,
+    altKey,
+    metaKey,
+    shiftKey,
+    bubbles: true,
+    cancelable: true
+  })
+
+  event.preventDefault = vi.fn()
+  event.composedPath = vi.fn(() => [target])
+
+  return event
+}
+
+describe('keybindingService - Canvas Keybindings', () => {
+  let keybindingService: ReturnType<typeof useKeybindingService>
+  let canvasContainer: HTMLDivElement
+  let canvasChild: HTMLCanvasElement
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    setActivePinia(createTestingPinia({ stubActions: false }))
+
+    const commandStore = useCommandStore()
+    commandStore.execute = vi.fn()
+
+    vi.mocked(useDialogStore).mockReturnValue({
+      dialogStack: []
+    } as Partial<ReturnType<typeof useDialogStore>> as ReturnType<
+      typeof useDialogStore
+    >)
+
+    canvasContainer = document.createElement('div')
+    canvasContainer.id = 'graph-canvas-container'
+    canvasChild = document.createElement('canvas')
+    canvasContainer.appendChild(canvasChild)
+    document.body.appendChild(canvasContainer)
+
+    keybindingService = useKeybindingService()
+    keybindingService.registerCoreKeybindings()
+  })
+
+  afterEach(() => {
+    canvasContainer.remove()
+  })
+
+  it('should execute DeleteSelectedItems for Delete key on canvas', async () => {
+    const event = createTestKeyboardEvent('Delete', {
+      target: canvasChild
+    })
+
+    await keybindingService.keybindHandler(event)
+
+    expect(vi.mocked(useCommandStore().execute)).toHaveBeenCalledWith(
+      'Comfy.Canvas.DeleteSelectedItems'
+    )
+  })
+
+  it('should execute DeleteSelectedItems for Backspace key on canvas', async () => {
+    const event = createTestKeyboardEvent('Backspace', {
+      target: canvasChild
+    })
+
+    await keybindingService.keybindHandler(event)
+
+    expect(vi.mocked(useCommandStore().execute)).toHaveBeenCalledWith(
+      'Comfy.Canvas.DeleteSelectedItems'
+    )
+  })
+
+  it('should not execute DeleteSelectedItems when typing in input field', async () => {
+    const inputElement = document.createElement('input')
+    const event = createTestKeyboardEvent('Delete', { target: inputElement })
+
+    await keybindingService.keybindHandler(event)
+
+    expect(vi.mocked(useCommandStore().execute)).not.toHaveBeenCalled()
+  })
+
+  it('should not execute DeleteSelectedItems when typing in textarea', async () => {
+    const textareaElement = document.createElement('textarea')
+    const event = createTestKeyboardEvent('Delete', {
+      target: textareaElement
+    })
+
+    await keybindingService.keybindHandler(event)
+
+    expect(vi.mocked(useCommandStore().execute)).not.toHaveBeenCalled()
+  })
+
+  it('should execute SelectAll for Ctrl+A on canvas', async () => {
+    const event = createTestKeyboardEvent('a', {
+      ctrlKey: true,
+      target: canvasChild
+    })
+
+    await keybindingService.keybindHandler(event)
+
+    expect(vi.mocked(useCommandStore().execute)).toHaveBeenCalledWith(
+      'Comfy.Canvas.SelectAll'
+    )
+  })
+
+  it('should execute CopySelected for Ctrl+C on canvas', async () => {
+    const event = createTestKeyboardEvent('c', {
+      ctrlKey: true,
+      target: canvasChild
+    })
+
+    await keybindingService.keybindHandler(event)
+
+    expect(vi.mocked(useCommandStore().execute)).toHaveBeenCalledWith(
+      'Comfy.Canvas.CopySelected'
+    )
+  })
+
+  it('should execute PasteFromClipboard for Ctrl+V on canvas', async () => {
+    const event = createTestKeyboardEvent('v', {
+      ctrlKey: true,
+      target: canvasChild
+    })
+
+    await keybindingService.keybindHandler(event)
+
+    expect(vi.mocked(useCommandStore().execute)).toHaveBeenCalledWith(
+      'Comfy.Canvas.PasteFromClipboard'
+    )
+  })
+
+  it('should execute PasteFromClipboardWithConnect for Ctrl+Shift+V on canvas', async () => {
+    const event = createTestKeyboardEvent('v', {
+      ctrlKey: true,
+      shiftKey: true,
+      target: canvasChild
+    })
+
+    await keybindingService.keybindHandler(event)
+
+    expect(vi.mocked(useCommandStore().execute)).toHaveBeenCalledWith(
+      'Comfy.Canvas.PasteFromClipboardWithConnect'
+    )
+  })
+
+  it('should execute graph-canvas bindings by normalizing to graph-canvas-container', async () => {
+    const event = createTestKeyboardEvent('=', {
+      altKey: true,
+      target: canvasChild
+    })
+
+    await keybindingService.keybindHandler(event)
+
+    expect(vi.mocked(useCommandStore().execute)).toHaveBeenCalledWith(
+      'Comfy.Canvas.ZoomIn'
+    )
+  })
+
+  it('should not execute graph-canvas bindings when target is outside canvas', async () => {
+    const outsideDiv = document.createElement('div')
+    document.body.appendChild(outsideDiv)
+
+    const event = createTestKeyboardEvent('=', {
+      altKey: true,
+      target: outsideDiv
+    })
+
+    await keybindingService.keybindHandler(event)
+
+    expect(vi.mocked(useCommandStore().execute)).not.toHaveBeenCalled()
+    outsideDiv.remove()
+  })
+
+  it('should not execute canvas commands when target is outside canvas container', async () => {
+    const outsideDiv = document.createElement('div')
+    document.body.appendChild(outsideDiv)
+
+    const event = createTestKeyboardEvent('Delete', {
+      target: outsideDiv
+    })
+
+    await keybindingService.keybindHandler(event)
+
+    expect(vi.mocked(useCommandStore().execute)).not.toHaveBeenCalled()
+    outsideDiv.remove()
+  })
+})
diff --git a/src/services/keybindingService.ts b/src/platform/keybindings/keybindingService.ts
similarity index 57%
rename from src/services/keybindingService.ts
rename to src/platform/keybindings/keybindingService.ts
index d2f45e0053..b11d6831a7 100644
--- a/src/services/keybindingService.ts
+++ b/src/platform/keybindings/keybindingService.ts
@@ -1,40 +1,25 @@
-import { CORE_KEYBINDINGS } from '@/constants/coreKeybindings'
+import { isCloud } from '@/platform/distribution/types'
 import { useSettingStore } from '@/platform/settings/settingStore'
-import { app } from '@/scripts/app'
 import { useCommandStore } from '@/stores/commandStore'
 import { useDialogStore } from '@/stores/dialogStore'
-import {
-  KeyComboImpl,
-  KeybindingImpl,
-  useKeybindingStore
-} from '@/stores/keybindingStore'
 
-export const useKeybindingService = () => {
+import { CORE_KEYBINDINGS } from './defaults'
+import { KeyComboImpl } from './keyCombo'
+import { KeybindingImpl } from './keybinding'
+import { useKeybindingStore } from './keybindingStore'
+
+export function useKeybindingService() {
   const keybindingStore = useKeybindingStore()
   const commandStore = useCommandStore()
   const settingStore = useSettingStore()
   const dialogStore = useDialogStore()
 
-  // Helper function to determine if an event should be forwarded to canvas
-  const shouldForwardToCanvas = (event: KeyboardEvent): boolean => {
-    // Don't forward if modifier keys are pressed (except shift)
-    if (event.ctrlKey || event.altKey || event.metaKey) {
-      return false
-    }
-
-    // Keys that LiteGraph handles but aren't in core keybindings
-    const canvasKeys = ['Delete', 'Backspace']
-
-    return canvasKeys.includes(event.key)
-  }
-
-  const keybindHandler = async function (event: KeyboardEvent) {
+  async function keybindHandler(event: KeyboardEvent) {
     const keyCombo = KeyComboImpl.fromEvent(event)
     if (keyCombo.isModifier) {
       return
     }
 
-    // Ignore reserved or non-modifier keybindings if typing in input fields
     const target = event.composedPath()[0] as HTMLElement
     if (
       keyCombo.isReservedByTextInput &&
@@ -48,21 +33,28 @@ export const useKeybindingService = () => {
     }
 
     const keybinding = keybindingStore.getKeybinding(keyCombo)
-    if (keybinding && keybinding.targetElementId !== 'graph-canvas') {
-      // Special handling for Escape key - let dialogs handle it first
+    if (keybinding) {
+      const targetElementId =
+        keybinding.targetElementId === 'graph-canvas'
+          ? 'graph-canvas-container'
+          : keybinding.targetElementId
+      if (targetElementId) {
+        const container = document.getElementById(targetElementId)
+        if (!container?.contains(target)) {
+          return
+        }
+      }
       if (
         event.key === 'Escape' &&
         !event.ctrlKey &&
         !event.altKey &&
         !event.metaKey
       ) {
-        // If dialogs are open, don't execute the keybinding - let the dialog handle it
         if (dialogStore.dialogStack.length > 0) {
           return
         }
       }
 
-      // Prevent default browser behavior first, then execute the command
       event.preventDefault()
       const runCommandIds = new Set([
         'Comfy.QueuePrompt',
@@ -81,26 +73,10 @@ export const useKeybindingService = () => {
       return
     }
 
-    // Forward unhandled canvas-targeted events to LiteGraph
-    if (!keybinding && shouldForwardToCanvas(event)) {
-      const canvas = app.canvas
-      if (
-        canvas &&
-        canvas.processKey &&
-        typeof canvas.processKey === 'function'
-      ) {
-        // Let LiteGraph handle the event
-        canvas.processKey(event)
-        return
-      }
-    }
-
-    // Only clear dialogs if not using modifiers
     if (event.ctrlKey || event.altKey || event.metaKey) {
       return
     }
 
-    // Escape key: close the first open modal found, and all dialogs
     if (event.key === 'Escape') {
       const modals = document.querySelectorAll<HTMLElement>('.comfy-modal')
       for (const modal of modals) {
@@ -118,35 +94,44 @@ export const useKeybindingService = () => {
     }
   }
 
-  const registerCoreKeybindings = () => {
+  function registerCoreKeybindings() {
     for (const keybinding of CORE_KEYBINDINGS) {
+      if (
+        isCloud &&
+        keybinding.commandId === 'Workspace.ToggleBottomPanelTab.logs-terminal'
+      ) {
+        continue
+      }
       keybindingStore.addDefaultKeybinding(new KeybindingImpl(keybinding))
     }
   }
 
   function registerUserKeybindings() {
-    // Unset bindings first as new bindings might conflict with default bindings.
     const unsetBindings = settingStore.get('Comfy.Keybinding.UnsetBindings')
     for (const keybinding of unsetBindings) {
       keybindingStore.unsetKeybinding(new KeybindingImpl(keybinding))
     }
     const newBindings = settingStore.get('Comfy.Keybinding.NewBindings')
     for (const keybinding of newBindings) {
+      if (
+        isCloud &&
+        keybinding.commandId === 'Workspace.ToggleBottomPanelTab.logs-terminal'
+      ) {
+        continue
+      }
       keybindingStore.addUserKeybinding(new KeybindingImpl(keybinding))
     }
   }
 
   async function persistUserKeybindings() {
-    // TODO(https://github.com/Comfy-Org/ComfyUI_frontend/issues/1079):
-    // Allow setting multiple values at once in settingStore
-    await settingStore.set(
-      'Comfy.Keybinding.NewBindings',
-      Object.values(keybindingStore.getUserKeybindings())
-    )
-    await settingStore.set(
-      'Comfy.Keybinding.UnsetBindings',
-      Object.values(keybindingStore.getUserUnsetKeybindings())
-    )
+    await settingStore.setMany({
+      'Comfy.Keybinding.NewBindings': Object.values(
+        keybindingStore.getUserKeybindings()
+      ),
+      'Comfy.Keybinding.UnsetBindings': Object.values(
+        keybindingStore.getUserUnsetKeybindings()
+      )
+    })
   }
 
   return {
diff --git a/tests-ui/tests/store/keybindingStore.test.ts b/src/platform/keybindings/keybindingStore.test.ts
similarity index 93%
rename from tests-ui/tests/store/keybindingStore.test.ts
rename to src/platform/keybindings/keybindingStore.test.ts
index 120f8c1741..15f16444f5 100644
--- a/tests-ui/tests/store/keybindingStore.test.ts
+++ b/src/platform/keybindings/keybindingStore.test.ts
@@ -1,11 +1,13 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it } from 'vitest'
 
-import { KeybindingImpl, useKeybindingStore } from '@/stores/keybindingStore'
+import { KeybindingImpl } from '@/platform/keybindings/keybinding'
+import { useKeybindingStore } from '@/platform/keybindings/keybindingStore'
 
 describe('useKeybindingStore', () => {
   beforeEach(() => {
-    setActivePinia(createPinia())
+    setActivePinia(createTestingPinia({ stubActions: false }))
   })
 
   it('should add and retrieve default keybindings', () => {
@@ -175,18 +177,14 @@ describe('useKeybindingStore', () => {
       combo: { key: 'I', ctrl: true }
     })
 
-    // Add default keybinding
     store.addDefaultKeybinding(defaultKeybinding)
     expect(store.keybindings).toHaveLength(1)
 
-    // Unset the default keybinding
     store.unsetKeybinding(defaultKeybinding)
     expect(store.keybindings).toHaveLength(0)
 
-    // Add the same keybinding as a user keybinding
     store.addUserKeybinding(defaultKeybinding)
 
-    // Check that the keybinding is back and not in the unset list
     expect(store.keybindings).toHaveLength(1)
     expect(store.getKeybinding(defaultKeybinding.combo)).toEqual(
       defaultKeybinding
@@ -199,10 +197,7 @@ describe('useKeybindingStore', () => {
       commandId: 'test.command',
       combo: { key: 'J', ctrl: true }
     })
-    // Add default keybinding.
-    // This can happen when we change default keybindings.
     store.addDefaultKeybinding(keybinding)
-    // Add user keybinding.
     store.addUserKeybinding(keybinding)
 
     expect(store.keybindings).toHaveLength(1)
@@ -210,10 +205,6 @@ describe('useKeybindingStore', () => {
   })
 
   it('Should keep previously customized keybindings after default keybindings change', () => {
-    // Initially command 'foo' was bound to 'K, Ctrl'. User unset it and bound the
-    // command to 'A, Ctrl'.
-    // Now we change the default keybindings of 'foo' to 'A, Ctrl'.
-    // The user customized keybinding should be kept.
     const store = useKeybindingStore()
 
     const userUnsetKeybindings = [
@@ -390,18 +381,15 @@ describe('useKeybindingStore', () => {
   it('should handle complex scenario with both unset and user keybindings', () => {
     const store = useKeybindingStore()
 
-    // Create default keybinding
     const defaultKeybinding = new KeybindingImpl({
       commandId: 'test.command',
       combo: { key: 'Q', ctrl: true }
     })
     store.addDefaultKeybinding(defaultKeybinding)
 
-    // Unset default keybinding
     store.unsetKeybinding(defaultKeybinding)
     expect(store.keybindings).toHaveLength(0)
 
-    // Add user keybinding with different combo
     const userKeybinding = new KeybindingImpl({
       commandId: 'test.command',
       combo: { key: 'R', alt: true }
@@ -412,7 +400,6 @@ describe('useKeybindingStore', () => {
       userKeybinding
     )
 
-    // Reset keybinding to default
     const result = store.resetKeybindingForCommand('test.command')
 
     expect(result).toBe(true)
diff --git a/src/stores/keybindingStore.ts b/src/platform/keybindings/keybindingStore.ts
similarity index 55%
rename from src/stores/keybindingStore.ts
rename to src/platform/keybindings/keybindingStore.ts
index 76a21120cc..84b0f271b1 100644
--- a/src/stores/keybindingStore.ts
+++ b/src/platform/keybindings/keybindingStore.ts
@@ -1,140 +1,20 @@
-import _ from 'es-toolkit/compat'
+import { groupBy } from 'es-toolkit/compat'
 import { defineStore } from 'pinia'
 import type { Ref } from 'vue'
-import { computed, ref, toRaw } from 'vue'
+import { computed, ref } from 'vue'
 
-import { RESERVED_BY_TEXT_INPUT } from '@/constants/reservedKeyCombos'
-import type { KeyCombo, Keybinding } from '@/schemas/keyBindingSchema'
-
-export class KeybindingImpl implements Keybinding {
-  commandId: string
-  combo: KeyComboImpl
-  targetElementId?: string
-
-  constructor(obj: Keybinding) {
-    this.commandId = obj.commandId
-    this.combo = new KeyComboImpl(obj.combo)
-    this.targetElementId = obj.targetElementId
-  }
-
-  equals(other: unknown): boolean {
-    const raw = toRaw(other)
-
-    return raw instanceof KeybindingImpl
-      ? this.commandId === raw.commandId &&
-          this.combo.equals(raw.combo) &&
-          this.targetElementId === raw.targetElementId
-      : false
-  }
-}
-
-export class KeyComboImpl implements KeyCombo {
-  key: string
-  // ctrl or meta(cmd on mac)
-  ctrl: boolean
-  alt: boolean
-  shift: boolean
-
-  constructor(obj: KeyCombo) {
-    this.key = obj.key
-    this.ctrl = obj.ctrl ?? false
-    this.alt = obj.alt ?? false
-    this.shift = obj.shift ?? false
-  }
-
-  static fromEvent(event: KeyboardEvent) {
-    return new KeyComboImpl({
-      key: event.key,
-      ctrl: event.ctrlKey || event.metaKey,
-      alt: event.altKey,
-      shift: event.shiftKey
-    })
-  }
-
-  equals(other: unknown): boolean {
-    const raw = toRaw(other)
-
-    return raw instanceof KeyComboImpl
-      ? this.key.toUpperCase() === raw.key.toUpperCase() &&
-          this.ctrl === raw.ctrl &&
-          this.alt === raw.alt &&
-          this.shift === raw.shift
-      : false
-  }
-
-  serialize(): string {
-    return `${this.key.toUpperCase()}:${this.ctrl}:${this.alt}:${this.shift}`
-  }
-
-  toString(): string {
-    return this.getKeySequences().join(' + ')
-  }
-
-  get hasModifier(): boolean {
-    return this.ctrl || this.alt || this.shift
-  }
-
-  get isModifier(): boolean {
-    return ['Control', 'Meta', 'Alt', 'Shift'].includes(this.key)
-  }
-
-  get modifierCount(): number {
-    const modifiers = [this.ctrl, this.alt, this.shift]
-    return modifiers.reduce((acc, cur) => acc + Number(cur), 0)
-  }
-
-  get isShiftOnly(): boolean {
-    return this.shift && this.modifierCount === 1
-  }
-
-  get isReservedByTextInput(): boolean {
-    return (
-      !this.hasModifier ||
-      this.isShiftOnly ||
-      RESERVED_BY_TEXT_INPUT.has(this.toString())
-    )
-  }
-
-  getKeySequences(): string[] {
-    const sequences: string[] = []
-    if (this.ctrl) {
-      sequences.push('Ctrl')
-    }
-    if (this.alt) {
-      sequences.push('Alt')
-    }
-    if (this.shift) {
-      sequences.push('Shift')
-    }
-    sequences.push(this.key)
-    return sequences
-  }
-}
+import type { KeyComboImpl } from './keyCombo'
+import type { KeybindingImpl } from './keybinding'
 
 export const useKeybindingStore = defineStore('keybinding', () => {
-  /**
-   * Default keybindings provided by core and extensions.
-   */
   const defaultKeybindings = ref<Record<string, KeybindingImpl>>({})
-  /**
-   * User-defined keybindings.
-   */
   const userKeybindings = ref<Record<string, KeybindingImpl>>({})
-  /**
-   * User-defined keybindings that unset default keybindings.
-   */
   const userUnsetKeybindings = ref<Record<string, KeybindingImpl>>({})
 
-  /**
-   * Get user-defined keybindings.
-   */
   function getUserKeybindings() {
     return userKeybindings.value
   }
 
-  /**
-   * Get user-defined keybindings that unset default keybindings.
-   */
   function getUserUnsetKeybindings() {
     return userUnsetKeybindings.value
   }
@@ -167,7 +47,7 @@ export const useKeybindingStore = defineStore('keybinding', () => {
 
   const keybindingsByCommandId = computed<Record<string, KeybindingImpl[]>>(
     () => {
-      return _.groupBy(keybindings.value, 'commandId')
+      return groupBy(keybindings.value, 'commandId')
     }
   )
 
@@ -178,26 +58,13 @@ export const useKeybindingStore = defineStore('keybinding', () => {
   const defaultKeybindingsByCommandId = computed<
     Record<string, KeybindingImpl[]>
   >(() => {
-    return _.groupBy(Object.values(defaultKeybindings.value), 'commandId')
+    return groupBy(Object.values(defaultKeybindings.value), 'commandId')
   })
 
   function getKeybindingByCommandId(commandId: string) {
     return getKeybindingsByCommandId(commandId)[0]
   }
 
-  /**
-   * Adds a keybinding to the specified target reference.
-   *
-   * @param target - A ref that holds a record of keybindings. The keys represent
-   * serialized key combos, and the values are `KeybindingImpl` objects.
-   * @param keybinding - The keybinding to add, represented as a `KeybindingImpl` object.
-   * @param options - An options object.
-   * @param options.existOk - If true, allows overwriting an existing keybinding with the
-   * same combo. Defaults to false.
-   *
-   * @throws {Error} Throws an error if a keybinding with the same combo already exists in
-   * the target and `existOk` is false.
-   */
   function addKeybinding(
     target: Ref<Record<string, KeybindingImpl>>,
     keybinding: KeybindingImpl,
@@ -223,7 +90,6 @@ export const useKeybindingStore = defineStore('keybinding', () => {
     const userUnsetKeybinding =
       userUnsetKeybindings.value[keybinding.combo.serialize()]
 
-    // User is adding back a keybinding that was an unsetted default keybinding.
     if (
       keybinding.equals(defaultKeybinding) &&
       keybinding.equals(userUnsetKeybinding)
@@ -232,7 +98,6 @@ export const useKeybindingStore = defineStore('keybinding', () => {
       return
     }
 
-    // Unset keybinding on default keybinding if it exists and is not the same as userUnsetKeybinding
     if (defaultKeybinding && !defaultKeybinding.equals(userUnsetKeybinding)) {
       unsetKeybinding(defaultKeybinding)
     }
@@ -262,11 +127,6 @@ export const useKeybindingStore = defineStore('keybinding', () => {
     console.warn(`Unset unknown keybinding: ${JSON.stringify(keybinding)}`)
   }
 
-  /**
-   * Update the keybinding on given command if it is different from the current keybinding.
-   *
-   * @returns true if the keybinding is updated, false otherwise.
-   */
   function updateKeybindingOnCommand(keybinding: KeybindingImpl): boolean {
     const currentKeybinding = getKeybindingByCommandId(keybinding.commandId)
     if (currentKeybinding?.equals(keybinding)) {
@@ -284,18 +144,11 @@ export const useKeybindingStore = defineStore('keybinding', () => {
     userUnsetKeybindings.value = {}
   }
 
-  /**
-   * Resets the keybinding for a given command to its default value.
-   *
-   * @param commandId - The commandId of the keybind to be reset
-   * @returns `true` if changes were made, `false` if not
-   */
   function resetKeybindingForCommand(commandId: string): boolean {
     const currentKeybinding = getKeybindingByCommandId(commandId)
     const defaultKeybinding =
       defaultKeybindingsByCommandId.value[commandId]?.[0]
 
-    // No default keybinding exists, need to remove any user binding
     if (!defaultKeybinding) {
       if (currentKeybinding) {
         unsetKeybinding(currentKeybinding)
@@ -304,17 +157,14 @@ export const useKeybindingStore = defineStore('keybinding', () => {
       return false
     }
 
-    // Current binding equals default binding, no changes needed
     if (currentKeybinding?.equals(defaultKeybinding)) {
       return false
     }
 
-    // Unset current keybinding if exists
     if (currentKeybinding) {
       unsetKeybinding(currentKeybinding)
     }
 
-    // Remove the unset record if it exists
     const serializedCombo = defaultKeybinding.combo.serialize()
     if (
       userUnsetKeybindings.value[serializedCombo]?.equals(defaultKeybinding)
diff --git a/src/constants/reservedKeyCombos.ts b/src/platform/keybindings/reserved.ts
similarity index 100%
rename from src/constants/reservedKeyCombos.ts
rename to src/platform/keybindings/reserved.ts
diff --git a/src/schemas/keyBindingSchema.ts b/src/platform/keybindings/types.ts
similarity index 59%
rename from src/schemas/keyBindingSchema.ts
rename to src/platform/keybindings/types.ts
index 04cbe319a1..670101b0bb 100644
--- a/src/schemas/keyBindingSchema.ts
+++ b/src/platform/keybindings/types.ts
@@ -1,6 +1,5 @@
 import { z } from 'zod'
 
-// KeyCombo schema
 const zKeyCombo = z.object({
   key: z.string(),
   ctrl: z.boolean().optional(),
@@ -9,17 +8,11 @@ const zKeyCombo = z.object({
   meta: z.boolean().optional()
 })
 
-// Keybinding schema
 export const zKeybinding = z.object({
   commandId: z.string(),
   combo: zKeyCombo,
-  // Optional target element ID to limit keybinding to.
-  // Note: Currently only used to distinguish between global keybindings
-  // and litegraph canvas keybindings.
-  // Do NOT use this field in extensions as it has no effect.
   targetElementId: z.string().optional()
 })
 
-// Infer types from schemas
 export type KeyCombo = z.infer<typeof zKeyCombo>
 export type Keybinding = z.infer<typeof zKeybinding>
diff --git a/tests-ui/tests/platform/navigation/preservedQueryManager.test.ts b/src/platform/navigation/preservedQueryManager.test.ts
similarity index 100%
rename from tests-ui/tests/platform/navigation/preservedQueryManager.test.ts
rename to src/platform/navigation/preservedQueryManager.test.ts
diff --git a/src/platform/navigation/preservedQueryManager.ts b/src/platform/navigation/preservedQueryManager.ts
index 358d40144a..24d468614a 100644
--- a/src/platform/navigation/preservedQueryManager.ts
+++ b/src/platform/navigation/preservedQueryManager.ts
@@ -56,7 +56,9 @@ const writeToStorage = (
 }
 
 export const hydratePreservedQuery = (namespace: string) => {
-  if (preservedQueries.has(namespace)) return
+  if (preservedQueries.has(namespace)) {
+    return
+  }
   const payload = readFromStorage(namespace)
   if (payload) {
     preservedQueries.set(namespace, payload)
@@ -77,7 +79,9 @@ export const capturePreservedQuery = (
     }
   })
 
-  if (Object.keys(payload).length === 0) return
+  if (Object.keys(payload).length === 0) {
+    return
+  }
 
   preservedQueries.set(namespace, payload)
   writeToStorage(namespace, payload)
diff --git a/src/platform/navigation/preservedQueryNamespaces.ts b/src/platform/navigation/preservedQueryNamespaces.ts
index 541f18869f..944e578e05 100644
--- a/src/platform/navigation/preservedQueryNamespaces.ts
+++ b/src/platform/navigation/preservedQueryNamespaces.ts
@@ -1,3 +1,5 @@
 export const PRESERVED_QUERY_NAMESPACES = {
-  TEMPLATE: 'template'
+  TEMPLATE: 'template',
+  INVITE: 'invite',
+  SHARE: 'share'
 } as const
diff --git a/src/platform/nodeReplacement/components/SwapNodeGroupRow.test.ts b/src/platform/nodeReplacement/components/SwapNodeGroupRow.test.ts
new file mode 100644
index 0000000000..4c199ca9bf
--- /dev/null
+++ b/src/platform/nodeReplacement/components/SwapNodeGroupRow.test.ts
@@ -0,0 +1,244 @@
+import { mount } from '@vue/test-utils'
+import { createTestingPinia } from '@pinia/testing'
+import PrimeVue from 'primevue/config'
+import { describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+import type { SwapNodeGroup } from '@/components/rightSidePanel/errors/useErrorGroups'
+import type { MissingNodeType } from '@/types/comfy'
+import SwapNodeGroupRow from './SwapNodeGroupRow.vue'
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      rightSidePanel: {
+        locateNode: 'Locate Node',
+        missingNodePacks: {
+          collapse: 'Collapse',
+          expand: 'Expand'
+        }
+      },
+      nodeReplacement: {
+        willBeReplacedBy: 'This node will be replaced by:',
+        replaceNode: 'Replace Node',
+        unknownNode: 'Unknown'
+      }
+    }
+  },
+  missingWarn: false,
+  fallbackWarn: false
+})
+
+function makeGroup(overrides: Partial<SwapNodeGroup> = {}): SwapNodeGroup {
+  return {
+    type: 'OldNodeType',
+    newNodeId: 'NewNodeType',
+    nodeTypes: [
+      { type: 'OldNodeType', nodeId: '1', isReplaceable: true },
+      { type: 'OldNodeType', nodeId: '2', isReplaceable: true }
+    ],
+    ...overrides
+  }
+}
+
+function mountRow(
+  props: Partial<{
+    group: SwapNodeGroup
+    showNodeIdBadge: boolean
+  }> = {}
+) {
+  return mount(SwapNodeGroupRow, {
+    props: {
+      group: makeGroup(),
+      showNodeIdBadge: false,
+      ...props
+    },
+    global: {
+      plugins: [createTestingPinia({ createSpy: vi.fn }), PrimeVue, i18n],
+      stubs: {
+        TransitionCollapse: { template: '<div><slot /></div>' }
+      }
+    }
+  })
+}
+
+describe('SwapNodeGroupRow', () => {
+  describe('Basic Rendering', () => {
+    it('renders the group type name', () => {
+      const wrapper = mountRow()
+      expect(wrapper.text()).toContain('OldNodeType')
+    })
+
+    it('renders node count in parentheses', () => {
+      const wrapper = mountRow()
+      expect(wrapper.text()).toContain('(2)')
+    })
+
+    it('renders node count of 5 for 5 nodeTypes', () => {
+      const wrapper = mountRow({
+        group: makeGroup({
+          nodeTypes: Array.from({ length: 5 }, (_, i) => ({
+            type: 'OldNodeType',
+            nodeId: String(i),
+            isReplaceable: true
+          }))
+        })
+      })
+      expect(wrapper.text()).toContain('(5)')
+    })
+
+    it('renders the replacement target name', () => {
+      const wrapper = mountRow()
+      expect(wrapper.text()).toContain('NewNodeType')
+    })
+
+    it('shows "Unknown" when newNodeId is undefined', () => {
+      const wrapper = mountRow({
+        group: makeGroup({ newNodeId: undefined })
+      })
+      expect(wrapper.text()).toContain('Unknown')
+    })
+
+    it('renders "Replace Node" button', () => {
+      const wrapper = mountRow()
+      expect(wrapper.text()).toContain('Replace Node')
+    })
+  })
+
+  describe('Expand / Collapse', () => {
+    it('starts collapsed — node list not visible', () => {
+      const wrapper = mountRow({ showNodeIdBadge: true })
+      expect(wrapper.text()).not.toContain('#1')
+    })
+
+    it('expands when chevron is clicked', async () => {
+      const wrapper = mountRow({ showNodeIdBadge: true })
+      await wrapper.get('button[aria-label="Expand"]').trigger('click')
+      expect(wrapper.text()).toContain('#1')
+      expect(wrapper.text()).toContain('#2')
+    })
+
+    it('collapses when chevron is clicked again', async () => {
+      const wrapper = mountRow({ showNodeIdBadge: true })
+      await wrapper.get('button[aria-label="Expand"]').trigger('click')
+      expect(wrapper.text()).toContain('#1')
+      await wrapper.get('button[aria-label="Collapse"]').trigger('click')
+      expect(wrapper.text()).not.toContain('#1')
+    })
+
+    it('updates the toggle control state when expanded', async () => {
+      const wrapper = mountRow()
+      expect(wrapper.find('button[aria-label="Expand"]').exists()).toBe(true)
+      await wrapper.get('button[aria-label="Expand"]').trigger('click')
+      expect(wrapper.find('button[aria-label="Collapse"]').exists()).toBe(true)
+    })
+  })
+
+  describe('Node Type List (Expanded)', () => {
+    async function expand(wrapper: ReturnType<typeof mountRow>) {
+      await wrapper.get('button[aria-label="Expand"]').trigger('click')
+    }
+
+    it('renders all nodeTypes when expanded', async () => {
+      const wrapper = mountRow({
+        group: makeGroup({
+          nodeTypes: [
+            { type: 'OldNodeType', nodeId: '10', isReplaceable: true },
+            { type: 'OldNodeType', nodeId: '20', isReplaceable: true },
+            { type: 'OldNodeType', nodeId: '30', isReplaceable: true }
+          ]
+        }),
+        showNodeIdBadge: true
+      })
+      await expand(wrapper)
+      expect(wrapper.text()).toContain('#10')
+      expect(wrapper.text()).toContain('#20')
+      expect(wrapper.text()).toContain('#30')
+    })
+
+    it('shows nodeId badge when showNodeIdBadge is true', async () => {
+      const wrapper = mountRow({ showNodeIdBadge: true })
+      await expand(wrapper)
+      expect(wrapper.text()).toContain('#1')
+      expect(wrapper.text()).toContain('#2')
+    })
+
+    it('hides nodeId badge when showNodeIdBadge is false', async () => {
+      const wrapper = mountRow({ showNodeIdBadge: false })
+      await expand(wrapper)
+      expect(wrapper.text()).not.toContain('#1')
+      expect(wrapper.text()).not.toContain('#2')
+    })
+
+    it('renders Locate button for each nodeType with nodeId', async () => {
+      const wrapper = mountRow({ showNodeIdBadge: true })
+      await expand(wrapper)
+      expect(wrapper.findAll('button[aria-label="Locate Node"]')).toHaveLength(
+        2
+      )
+    })
+
+    it('does not render Locate button for nodeTypes without nodeId', async () => {
+      const wrapper = mountRow({
+        group: makeGroup({
+          // Intentionally omits nodeId to test graceful handling of incomplete node data
+          nodeTypes: [
+            { type: 'NoIdNode', isReplaceable: true }
+          ] as unknown as MissingNodeType[]
+        })
+      })
+      await expand(wrapper)
+      expect(wrapper.find('button[aria-label="Locate Node"]').exists()).toBe(
+        false
+      )
+    })
+  })
+
+  describe('Events', () => {
+    it('emits locate-node with correct nodeId', async () => {
+      const wrapper = mountRow({ showNodeIdBadge: true })
+      await wrapper.get('button[aria-label="Expand"]').trigger('click')
+      const locateBtns = wrapper.findAll('button[aria-label="Locate Node"]')
+      await locateBtns[0].trigger('click')
+      expect(wrapper.emitted('locate-node')).toBeTruthy()
+      expect(wrapper.emitted('locate-node')?.[0]).toEqual(['1'])
+
+      await locateBtns[1].trigger('click')
+      expect(wrapper.emitted('locate-node')?.[1]).toEqual(['2'])
+    })
+
+    it('emits replace with group when Replace button is clicked', async () => {
+      const group = makeGroup()
+      const wrapper = mountRow({ group })
+      const replaceBtn = wrapper
+        .findAll('button')
+        .find((b) => b.text().includes('Replace Node'))
+      if (!replaceBtn) throw new Error('Replace button not found')
+      await replaceBtn.trigger('click')
+      expect(wrapper.emitted('replace')).toBeTruthy()
+      expect(wrapper.emitted('replace')?.[0][0]).toEqual(group)
+    })
+  })
+
+  describe('Edge Cases', () => {
+    it('handles empty nodeTypes array', () => {
+      const wrapper = mountRow({
+        group: makeGroup({ nodeTypes: [] })
+      })
+      expect(wrapper.text()).toContain('(0)')
+    })
+
+    it('handles string nodeType entries', async () => {
+      const wrapper = mountRow({
+        group: makeGroup({
+          // Intentionally uses a plain string entry to test legacy node type handling
+          nodeTypes: ['StringType'] as unknown as MissingNodeType[]
+        })
+      })
+      await wrapper.get('button[aria-label="Expand"]').trigger('click')
+      expect(wrapper.text()).toContain('StringType')
+    })
+  })
+})
diff --git a/src/platform/nodeReplacement/components/SwapNodeGroupRow.vue b/src/platform/nodeReplacement/components/SwapNodeGroupRow.vue
new file mode 100644
index 0000000000..5508623203
--- /dev/null
+++ b/src/platform/nodeReplacement/components/SwapNodeGroupRow.vue
@@ -0,0 +1,142 @@
+<template>
+  <div class="mb-4 flex w-full flex-col">
+    <!-- Type header row: type name + chevron -->
+    <div class="flex h-8 w-full items-center">
+      <p class="text-foreground min-w-0 flex-1 truncate text-sm font-medium">
+        {{ `${group.type} (${group.nodeTypes.length})` }}
+      </p>
+
+      <Button
+        variant="textonly"
+        size="icon-sm"
+        :class="
+          cn(
+            'size-8 shrink-0 transition-transform duration-200 hover:bg-transparent',
+            { 'rotate-180': expanded }
+          )
+        "
+        :aria-label="
+          expanded
+            ? t('rightSidePanel.missingNodePacks.collapse', 'Collapse')
+            : t('rightSidePanel.missingNodePacks.expand', 'Expand')
+        "
+        @click="toggleExpand"
+      >
+        <i
+          class="icon-[lucide--chevron-down] size-4 text-muted-foreground group-hover:text-base-foreground"
+        />
+      </Button>
+    </div>
+
+    <!-- Sub-labels: individual node instances, each with their own Locate button -->
+    <TransitionCollapse>
+      <div
+        v-if="expanded"
+        class="mb-2 flex flex-col gap-0.5 overflow-hidden pl-2"
+      >
+        <div
+          v-for="nodeType in group.nodeTypes"
+          :key="getKey(nodeType)"
+          class="flex h-7 items-center"
+        >
+          <span
+            v-if="
+              showNodeIdBadge &&
+              typeof nodeType !== 'string' &&
+              nodeType.nodeId != null
+            "
+            class="mr-1 shrink-0 rounded-md bg-secondary-background-selected px-2 py-0.5 font-mono text-xs font-bold text-muted-foreground"
+          >
+            #{{ nodeType.nodeId }}
+          </span>
+          <p class="min-w-0 flex-1 truncate text-xs text-muted-foreground">
+            {{ getLabel(nodeType) }}
+          </p>
+          <Button
+            v-if="typeof nodeType !== 'string' && nodeType.nodeId != null"
+            variant="textonly"
+            size="icon-sm"
+            class="mr-1 size-6 shrink-0 text-muted-foreground hover:text-base-foreground"
+            :aria-label="t('rightSidePanel.locateNode', 'Locate Node')"
+            @click="handleLocateNode(nodeType)"
+          >
+            <i class="icon-[lucide--locate] size-3" />
+          </Button>
+        </div>
+      </div>
+    </TransitionCollapse>
+
+    <!-- Description rows: what it is replaced by -->
+    <div class="mt-1 mb-2 flex flex-col gap-0.5 px-1 text-[13px]">
+      <span class="text-muted-foreground">{{
+        t('nodeReplacement.willBeReplacedBy', 'This node will be replaced by:')
+      }}</span>
+      <span class="text-foreground font-bold">{{
+        group.newNodeId ?? t('nodeReplacement.unknownNode', 'Unknown')
+      }}</span>
+    </div>
+
+    <!-- Replace Action Button -->
+    <div class="flex w-full items-start py-1">
+      <Button
+        variant="secondary"
+        size="md"
+        class="flex w-full flex-1"
+        @click="handleReplaceNode"
+      >
+        <i class="text-foreground mr-1 icon-[lucide--repeat] size-4 shrink-0" />
+        <span class="text-foreground min-w-0 truncate text-sm">
+          {{ t('nodeReplacement.replaceNode', 'Replace Node') }}
+        </span>
+      </Button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import { cn } from '@/utils/tailwindUtil'
+import { useI18n } from 'vue-i18n'
+import Button from '@/components/ui/button/Button.vue'
+import TransitionCollapse from '@/components/rightSidePanel/layout/TransitionCollapse.vue'
+import type { MissingNodeType } from '@/types/comfy'
+import type { SwapNodeGroup } from '@/components/rightSidePanel/errors/useErrorGroups'
+
+const props = defineProps<{
+  group: SwapNodeGroup
+  showNodeIdBadge: boolean
+}>()
+
+const emit = defineEmits<{
+  'locate-node': [nodeId: string]
+  replace: [group: SwapNodeGroup]
+}>()
+
+const { t } = useI18n()
+
+const expanded = ref(false)
+
+function toggleExpand() {
+  expanded.value = !expanded.value
+}
+
+function getKey(nodeType: MissingNodeType): string {
+  if (typeof nodeType === 'string') return nodeType
+  return nodeType.nodeId != null ? String(nodeType.nodeId) : nodeType.type
+}
+
+function getLabel(nodeType: MissingNodeType): string {
+  return typeof nodeType === 'string' ? nodeType : nodeType.type
+}
+
+function handleLocateNode(nodeType: MissingNodeType) {
+  if (typeof nodeType === 'string') return
+  if (nodeType.nodeId != null) {
+    emit('locate-node', String(nodeType.nodeId))
+  }
+}
+
+function handleReplaceNode() {
+  emit('replace', props.group)
+}
+</script>
diff --git a/src/platform/nodeReplacement/components/SwapNodesCard.test.ts b/src/platform/nodeReplacement/components/SwapNodesCard.test.ts
new file mode 100644
index 0000000000..79453804db
--- /dev/null
+++ b/src/platform/nodeReplacement/components/SwapNodesCard.test.ts
@@ -0,0 +1,129 @@
+import { mount } from '@vue/test-utils'
+import { createTestingPinia } from '@pinia/testing'
+import PrimeVue from 'primevue/config'
+import { describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+import type { SwapNodeGroup } from '@/components/rightSidePanel/errors/useErrorGroups'
+
+vi.mock('./SwapNodeGroupRow.vue', () => ({
+  default: {
+    name: 'SwapNodeGroupRow',
+    template: '<div class="swap-row" />',
+    props: ['group', 'showNodeIdBadge'],
+    emits: ['locate-node', 'replace']
+  }
+}))
+
+import SwapNodesCard from './SwapNodesCard.vue'
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: { en: {} },
+  missingWarn: false,
+  fallbackWarn: false
+})
+
+function makeGroups(count = 2): SwapNodeGroup[] {
+  return Array.from({ length: count }, (_, i) => ({
+    type: `Type${i}`,
+    newNodeId: `NewType${i}`,
+    nodeTypes: [{ type: `Type${i}`, nodeId: String(i), isReplaceable: true }]
+  }))
+}
+
+function mountCard(
+  props: Partial<{
+    swapNodeGroups: SwapNodeGroup[]
+    showNodeIdBadge: boolean
+  }> = {}
+) {
+  return mount(SwapNodesCard, {
+    props: {
+      swapNodeGroups: makeGroups(),
+      showNodeIdBadge: false,
+      ...props
+    },
+    global: {
+      plugins: [createTestingPinia({ createSpy: vi.fn }), PrimeVue, i18n]
+    }
+  })
+}
+
+describe('SwapNodesCard', () => {
+  describe('Rendering', () => {
+    it('renders guidance message', () => {
+      const wrapper = mountCard()
+      expect(wrapper.find('p').exists()).toBe(true)
+    })
+
+    it('renders correct number of SwapNodeGroupRow components', () => {
+      const wrapper = mountCard({ swapNodeGroups: makeGroups(3) })
+      expect(
+        wrapper.findAllComponents({ name: 'SwapNodeGroupRow' })
+      ).toHaveLength(3)
+    })
+
+    it('renders zero rows when swapNodeGroups is empty', () => {
+      const wrapper = mountCard({ swapNodeGroups: [] })
+      expect(
+        wrapper.findAllComponents({ name: 'SwapNodeGroupRow' })
+      ).toHaveLength(0)
+    })
+
+    it('renders one row when swapNodeGroups has one entry', () => {
+      const wrapper = mountCard({ swapNodeGroups: makeGroups(1) })
+      expect(
+        wrapper.findAllComponents({ name: 'SwapNodeGroupRow' })
+      ).toHaveLength(1)
+    })
+
+    it('passes showNodeIdBadge to children', () => {
+      const wrapper = mountCard({
+        swapNodeGroups: makeGroups(1),
+        showNodeIdBadge: true
+      })
+      const row = wrapper.findComponent({ name: 'SwapNodeGroupRow' })
+      expect(row.props('showNodeIdBadge')).toBe(true)
+    })
+
+    it('passes group prop to children', () => {
+      const groups = makeGroups(1)
+      const wrapper = mountCard({ swapNodeGroups: groups })
+      const row = wrapper.findComponent({ name: 'SwapNodeGroupRow' })
+      expect(row.props('group')).toEqual(groups[0])
+    })
+  })
+
+  describe('Events', () => {
+    it('bubbles locate-node event from child', async () => {
+      const wrapper = mountCard()
+      const row = wrapper.findComponent({ name: 'SwapNodeGroupRow' })
+      await row.vm.$emit('locate-node', '42')
+      expect(wrapper.emitted('locate-node')).toBeTruthy()
+      expect(wrapper.emitted('locate-node')?.[0]).toEqual(['42'])
+    })
+
+    it('bubbles replace event from child', async () => {
+      const groups = makeGroups(1)
+      const wrapper = mountCard({ swapNodeGroups: groups })
+      const row = wrapper.findComponent({ name: 'SwapNodeGroupRow' })
+      await row.vm.$emit('replace', groups[0])
+      expect(wrapper.emitted('replace')).toBeTruthy()
+      expect(wrapper.emitted('replace')?.[0][0]).toEqual(groups[0])
+    })
+
+    it('bubbles events from correct child when multiple rows', async () => {
+      const groups = makeGroups(3)
+      const wrapper = mountCard({ swapNodeGroups: groups })
+      const rows = wrapper.findAllComponents({ name: 'SwapNodeGroupRow' })
+
+      await rows[2].vm.$emit('locate-node', '99')
+      expect(wrapper.emitted('locate-node')?.[0]).toEqual(['99'])
+
+      await rows[1].vm.$emit('replace', groups[1])
+      expect(wrapper.emitted('replace')?.[0][0]).toEqual(groups[1])
+    })
+  })
+})
diff --git a/src/platform/nodeReplacement/components/SwapNodesCard.vue b/src/platform/nodeReplacement/components/SwapNodesCard.vue
new file mode 100644
index 0000000000..bd40872a4a
--- /dev/null
+++ b/src/platform/nodeReplacement/components/SwapNodesCard.vue
@@ -0,0 +1,40 @@
+<template>
+  <div class="mt-2 px-4 pb-2">
+    <!-- Sub-label: guidance message shown above all swap groups -->
+    <p class="m-0 pb-5 text-sm/relaxed text-muted-foreground">
+      {{
+        t(
+          'nodeReplacement.swapNodesGuide',
+          'The following nodes can be automatically replaced with compatible alternatives.'
+        )
+      }}
+    </p>
+    <!-- Group Rows -->
+    <SwapNodeGroupRow
+      v-for="group in swapNodeGroups"
+      :key="group.type"
+      :group="group"
+      :show-node-id-badge="showNodeIdBadge"
+      @locate-node="emit('locate-node', $event)"
+      @replace="emit('replace', $event)"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useI18n } from 'vue-i18n'
+import type { SwapNodeGroup } from '@/components/rightSidePanel/errors/useErrorGroups'
+import SwapNodeGroupRow from '@/platform/nodeReplacement/components/SwapNodeGroupRow.vue'
+
+const { t } = useI18n()
+
+const { swapNodeGroups, showNodeIdBadge } = defineProps<{
+  swapNodeGroups: SwapNodeGroup[]
+  showNodeIdBadge: boolean
+}>()
+
+const emit = defineEmits<{
+  'locate-node': [nodeId: string]
+  replace: [group: SwapNodeGroup]
+}>()
+</script>
diff --git a/src/platform/nodeReplacement/missingNodeScan.test.ts b/src/platform/nodeReplacement/missingNodeScan.test.ts
new file mode 100644
index 0000000000..cf13fc75e9
--- /dev/null
+++ b/src/platform/nodeReplacement/missingNodeScan.test.ts
@@ -0,0 +1,232 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph'
+import { LiteGraph } from '@/lib/litegraph/src/litegraph'
+
+vi.mock('@/lib/litegraph/src/litegraph', async (importOriginal) => {
+  const actual = await importOriginal<Record<string, unknown>>()
+  return {
+    ...actual,
+    LiteGraph: {
+      ...(actual.LiteGraph as Record<string, unknown>),
+      registered_node_types: {} as Record<string, unknown>
+    }
+  }
+})
+
+vi.mock('@/utils/graphTraversalUtil', () => ({
+  collectAllNodes: vi.fn(),
+  getExecutionIdByNode: vi.fn()
+}))
+
+vi.mock('@/workbench/extensions/manager/utils/missingNodeErrorUtil', () => ({
+  getCnrIdFromNode: vi.fn(() => null)
+}))
+
+vi.mock('@/i18n', () => ({
+  st: vi.fn((_key: string, fallback: string) => fallback)
+}))
+
+vi.mock('@/platform/distribution/types', () => ({
+  isCloud: false
+}))
+
+vi.mock('@/stores/settingStore', () => ({
+  useSettingStore: () => ({
+    get: vi.fn(() => true)
+  })
+}))
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: () => ({
+    get: vi.fn(() => true)
+  })
+}))
+
+import {
+  collectAllNodes,
+  getExecutionIdByNode
+} from '@/utils/graphTraversalUtil'
+import { getCnrIdFromNode } from '@/workbench/extensions/manager/utils/missingNodeErrorUtil'
+import { useNodeReplacementStore } from '@/platform/nodeReplacement/nodeReplacementStore'
+import { rescanAndSurfaceMissingNodes } from './missingNodeScan'
+import { useExecutionErrorStore } from '@/stores/executionErrorStore'
+
+function mockNode(
+  id: number,
+  type: string,
+  overrides: Partial<LGraphNode> = {}
+): LGraphNode {
+  return {
+    id,
+    type,
+    last_serialization: { type },
+    ...overrides
+  } as unknown as LGraphNode
+}
+
+function mockGraph(): LGraph {
+  return {} as unknown as LGraph
+}
+
+function getMissingNodesError(
+  store: ReturnType<typeof useExecutionErrorStore>
+) {
+  const error = store.missingNodesError
+  if (!error) throw new Error('Expected missingNodesError to be defined')
+  return error
+}
+
+describe('scanMissingNodes (via rescanAndSurfaceMissingNodes)', () => {
+  beforeEach(() => {
+    setActivePinia(createPinia())
+    vi.clearAllMocks()
+    // Reset registered_node_types
+    const reg = LiteGraph.registered_node_types as Record<string, unknown>
+    for (const key of Object.keys(reg)) {
+      delete reg[key]
+    }
+  })
+
+  it('returns empty when all nodes are registered', () => {
+    const reg = LiteGraph.registered_node_types as Record<string, unknown>
+    reg['KSampler'] = {}
+
+    vi.mocked(collectAllNodes).mockReturnValue([mockNode(1, 'KSampler')])
+    vi.mocked(getExecutionIdByNode).mockReturnValue(null)
+
+    rescanAndSurfaceMissingNodes(mockGraph())
+
+    const store = useExecutionErrorStore()
+    expect(store.missingNodesError).toBeNull()
+  })
+
+  it('detects unregistered nodes as missing', () => {
+    vi.mocked(collectAllNodes).mockReturnValue([
+      mockNode(1, 'OldNode'),
+      mockNode(2, 'AnotherOldNode')
+    ])
+    vi.mocked(getExecutionIdByNode).mockReturnValue(null)
+
+    rescanAndSurfaceMissingNodes(mockGraph())
+
+    const store = useExecutionErrorStore()
+    const error = getMissingNodesError(store)
+    expect(error.nodeTypes).toHaveLength(2)
+  })
+
+  it('skips registered nodes and lists only unregistered', () => {
+    const reg = LiteGraph.registered_node_types as Record<string, unknown>
+    reg['RegisteredNode'] = {}
+
+    vi.mocked(collectAllNodes).mockReturnValue([
+      mockNode(1, 'RegisteredNode'),
+      mockNode(2, 'UnregisteredNode')
+    ])
+    vi.mocked(getExecutionIdByNode).mockReturnValue(null)
+
+    rescanAndSurfaceMissingNodes(mockGraph())
+
+    const store = useExecutionErrorStore()
+    const error = getMissingNodesError(store)
+    expect(error.nodeTypes).toHaveLength(1)
+    const missing = error.nodeTypes[0]
+    expect(typeof missing !== 'string' && missing.type).toBe('UnregisteredNode')
+  })
+
+  it('uses executionId when available for nodeId', () => {
+    vi.mocked(collectAllNodes).mockReturnValue([mockNode(1, 'Missing')])
+    vi.mocked(getExecutionIdByNode).mockReturnValue('exec-42')
+
+    rescanAndSurfaceMissingNodes(mockGraph())
+
+    const store = useExecutionErrorStore()
+    const error = getMissingNodesError(store)
+    const missing = error.nodeTypes[0]
+    expect(typeof missing !== 'string' && missing.nodeId).toBe('exec-42')
+  })
+
+  it('falls back to node.id when executionId is null', () => {
+    vi.mocked(collectAllNodes).mockReturnValue([mockNode(99, 'Missing')])
+    vi.mocked(getExecutionIdByNode).mockReturnValue(null)
+
+    rescanAndSurfaceMissingNodes(mockGraph())
+
+    const store = useExecutionErrorStore()
+    const error = getMissingNodesError(store)
+    const missing = error.nodeTypes[0]
+    expect(typeof missing !== 'string' && missing.nodeId).toBe('99')
+  })
+
+  it('populates cnrId from getCnrIdFromNode', () => {
+    vi.mocked(collectAllNodes).mockReturnValue([mockNode(1, 'Missing')])
+    vi.mocked(getExecutionIdByNode).mockReturnValue(null)
+    vi.mocked(getCnrIdFromNode).mockReturnValue('comfy-nodes/my-pack')
+
+    rescanAndSurfaceMissingNodes(mockGraph())
+
+    const store = useExecutionErrorStore()
+    const error = getMissingNodesError(store)
+    const missing = error.nodeTypes[0]
+    expect(typeof missing !== 'string' && missing.cnrId).toBe(
+      'comfy-nodes/my-pack'
+    )
+  })
+
+  it('marks node as replaceable when replacement exists', () => {
+    vi.mocked(collectAllNodes).mockReturnValue([mockNode(1, 'OldNode')])
+    vi.mocked(getExecutionIdByNode).mockReturnValue(null)
+
+    const replacementStore = useNodeReplacementStore()
+    replacementStore.replacements = {
+      OldNode: [
+        {
+          old_node_id: 'OldNode',
+          new_node_id: 'NewNode',
+          old_widget_ids: null,
+          input_mapping: null,
+          output_mapping: null
+        }
+      ]
+    }
+
+    rescanAndSurfaceMissingNodes(mockGraph())
+
+    const store = useExecutionErrorStore()
+    const error = getMissingNodesError(store)
+    const missing = error.nodeTypes[0]
+    expect(typeof missing !== 'string' && missing.isReplaceable).toBe(true)
+    expect(
+      typeof missing !== 'string' && missing.replacement?.new_node_id
+    ).toBe('NewNode')
+  })
+
+  it('marks node as not replaceable when no replacement', () => {
+    vi.mocked(collectAllNodes).mockReturnValue([mockNode(1, 'OldNode')])
+    vi.mocked(getExecutionIdByNode).mockReturnValue(null)
+
+    rescanAndSurfaceMissingNodes(mockGraph())
+
+    const store = useExecutionErrorStore()
+    const error = getMissingNodesError(store)
+    const missing = error.nodeTypes[0]
+    expect(typeof missing !== 'string' && missing.isReplaceable).toBe(false)
+  })
+
+  it('uses last_serialization.type over node.type', () => {
+    const node = mockNode(1, 'LiveType')
+    node.last_serialization = {
+      type: 'OriginalType'
+    } as unknown as LGraphNode['last_serialization']
+    vi.mocked(collectAllNodes).mockReturnValue([node])
+    vi.mocked(getExecutionIdByNode).mockReturnValue(null)
+
+    rescanAndSurfaceMissingNodes(mockGraph())
+
+    const store = useExecutionErrorStore()
+    const error = getMissingNodesError(store)
+    const missing = error.nodeTypes[0]
+    expect(typeof missing !== 'string' && missing.type).toBe('OriginalType')
+  })
+})
diff --git a/src/platform/nodeReplacement/missingNodeScan.ts b/src/platform/nodeReplacement/missingNodeScan.ts
new file mode 100644
index 0000000000..4c7be563ee
--- /dev/null
+++ b/src/platform/nodeReplacement/missingNodeScan.ts
@@ -0,0 +1,44 @@
+import { LiteGraph } from '@/lib/litegraph/src/litegraph'
+import type { LGraph } from '@/lib/litegraph/src/litegraph'
+import { useNodeReplacementStore } from '@/platform/nodeReplacement/nodeReplacementStore'
+import { useExecutionErrorStore } from '@/stores/executionErrorStore'
+import type { MissingNodeType } from '@/types/comfy'
+import {
+  collectAllNodes,
+  getExecutionIdByNode
+} from '@/utils/graphTraversalUtil'
+import { getCnrIdFromNode } from '@/workbench/extensions/manager/utils/missingNodeErrorUtil'
+
+/** Scan the live graph for unregistered node types and build a full MissingNodeType list. */
+function scanMissingNodes(rootGraph: LGraph): MissingNodeType[] {
+  const nodeReplacementStore = useNodeReplacementStore()
+  const missingNodeTypes: MissingNodeType[] = []
+
+  const allNodes = collectAllNodes(rootGraph)
+
+  for (const node of allNodes) {
+    const originalType = node.last_serialization?.type ?? node.type ?? 'Unknown'
+
+    if (originalType in LiteGraph.registered_node_types) continue
+
+    const cnrId = getCnrIdFromNode(node)
+    const replacement = nodeReplacementStore.getReplacementFor(originalType)
+    const executionId = getExecutionIdByNode(rootGraph, node)
+
+    missingNodeTypes.push({
+      type: originalType,
+      nodeId: executionId ?? String(node.id),
+      cnrId,
+      isReplaceable: replacement !== null,
+      replacement: replacement ?? undefined
+    })
+  }
+
+  return missingNodeTypes
+}
+
+/** Re-scan the graph for missing nodes and update the error store. */
+export function rescanAndSurfaceMissingNodes(rootGraph: LGraph): void {
+  const types = scanMissingNodes(rootGraph)
+  useExecutionErrorStore().surfaceMissingNodes(types)
+}
diff --git a/src/platform/nodeReplacement/nodeReplacementService.ts b/src/platform/nodeReplacement/nodeReplacementService.ts
new file mode 100644
index 0000000000..c50b30140c
--- /dev/null
+++ b/src/platform/nodeReplacement/nodeReplacementService.ts
@@ -0,0 +1,13 @@
+import type { NodeReplacementResponse } from './types'
+
+import { api } from '@/scripts/api'
+
+export async function fetchNodeReplacements(): Promise<NodeReplacementResponse> {
+  const response = await api.fetchApi('/node_replacements')
+  if (!response.ok) {
+    throw new Error(
+      `Failed to fetch node replacements: ${response.status} ${response.statusText}`
+    )
+  }
+  return response.json()
+}
diff --git a/src/platform/nodeReplacement/nodeReplacementStore.test.ts b/src/platform/nodeReplacement/nodeReplacementStore.test.ts
new file mode 100644
index 0000000000..4523cd8e9a
--- /dev/null
+++ b/src/platform/nodeReplacement/nodeReplacementStore.test.ts
@@ -0,0 +1,277 @@
+import type { NodeReplacementResponse } from './types'
+
+import { createPinia, setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { ServerFeatureFlag } from '@/composables/useFeatureFlags'
+import { useSettingStore } from '@/platform/settings/settingStore'
+import { api } from '@/scripts/api'
+import { fetchNodeReplacements } from './nodeReplacementService'
+import { useNodeReplacementStore } from './nodeReplacementStore'
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: vi.fn()
+}))
+
+vi.mock('./nodeReplacementService', () => ({
+  fetchNodeReplacements: vi.fn()
+}))
+
+vi.mock('@/scripts/api', () => ({
+  api: {
+    getServerFeature: vi.fn()
+  }
+}))
+
+function mockSettingStore(enabled: boolean) {
+  vi.mocked(useSettingStore, { partial: true }).mockReturnValue({
+    get: vi.fn().mockImplementation((key: string) => {
+      if (key === 'Comfy.NodeReplacement.Enabled') {
+        return enabled
+      }
+      return false
+    }),
+    load: vi.fn().mockResolvedValue(undefined)
+  })
+}
+
+function createStore(settingEnabled = true, serverFeatureEnabled = true) {
+  setActivePinia(createPinia())
+  mockSettingStore(settingEnabled)
+  vi.mocked(api.getServerFeature).mockImplementation(
+    (flag: string, defaultValue?: unknown) => {
+      if (flag === ServerFeatureFlag.NODE_REPLACEMENTS) {
+        return serverFeatureEnabled
+      }
+      return defaultValue
+    }
+  )
+  return useNodeReplacementStore()
+}
+
+describe('useNodeReplacementStore', () => {
+  let store: ReturnType<typeof useNodeReplacementStore>
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    store = createStore()
+  })
+
+  it('should initialize with empty replacements', () => {
+    expect(store.replacements).toEqual({})
+    expect(store.isLoaded).toBe(false)
+  })
+
+  describe('getReplacementFor', () => {
+    it('should return first replacement for existing node type', () => {
+      store.replacements = {
+        OldNode: [
+          {
+            new_node_id: 'NewNodeA',
+            old_node_id: 'OldNode',
+            old_widget_ids: null,
+            input_mapping: null,
+            output_mapping: null
+          },
+          {
+            new_node_id: 'NewNodeB',
+            old_node_id: 'OldNode',
+            old_widget_ids: null,
+            input_mapping: null,
+            output_mapping: null
+          }
+        ]
+      }
+
+      const result = store.getReplacementFor('OldNode')
+
+      expect(result).not.toBeNull()
+      expect(result?.new_node_id).toBe('NewNodeA')
+    })
+
+    it('should return null for non-existing node type', () => {
+      store.replacements = {
+        OldNode: [
+          {
+            new_node_id: 'NewNode',
+            old_node_id: 'OldNode',
+            old_widget_ids: null,
+            input_mapping: null,
+            output_mapping: null
+          }
+        ]
+      }
+
+      const result = store.getReplacementFor('NonExistentNode')
+
+      expect(result).toBeNull()
+    })
+
+    it('should return null for empty replacement array', () => {
+      store.replacements = {
+        OldNode: []
+      }
+
+      const result = store.getReplacementFor('OldNode')
+
+      expect(result).toBeNull()
+    })
+
+    it('should return null when feature is disabled', () => {
+      store = createStore(false)
+      store.replacements = {
+        OldNode: [
+          {
+            new_node_id: 'NewNode',
+            old_node_id: 'OldNode',
+            old_widget_ids: null,
+            input_mapping: null,
+            output_mapping: null
+          }
+        ]
+      }
+
+      const result = store.getReplacementFor('OldNode')
+
+      expect(result).toBeNull()
+    })
+  })
+
+  describe('hasReplacement', () => {
+    it('should return true when replacement exists', () => {
+      store.replacements = {
+        OldNode: [
+          {
+            new_node_id: 'NewNode',
+            old_node_id: 'OldNode',
+            old_widget_ids: null,
+            input_mapping: null,
+            output_mapping: null
+          }
+        ]
+      }
+
+      expect(store.hasReplacement('OldNode')).toBe(true)
+    })
+
+    it('should return false when node type does not exist', () => {
+      store.replacements = {}
+
+      expect(store.hasReplacement('NonExistentNode')).toBe(false)
+    })
+
+    it('should return false when replacement array is empty', () => {
+      store.replacements = {
+        OldNode: []
+      }
+
+      expect(store.hasReplacement('OldNode')).toBe(false)
+    })
+
+    it('should return false when feature is disabled', () => {
+      store = createStore(false)
+      store.replacements = {
+        OldNode: [
+          {
+            new_node_id: 'NewNode',
+            old_node_id: 'OldNode',
+            old_widget_ids: null,
+            input_mapping: null,
+            output_mapping: null
+          }
+        ]
+      }
+
+      expect(store.hasReplacement('OldNode')).toBe(false)
+    })
+  })
+
+  describe('isEnabled', () => {
+    it('should return true when setting is enabled', () => {
+      expect(store.isEnabled).toBe(true)
+    })
+
+    it('should return false when setting is disabled', () => {
+      store = createStore(false)
+      expect(store.isEnabled).toBe(false)
+    })
+  })
+
+  describe('load', () => {
+    const mockReplacements: NodeReplacementResponse = {
+      OldNode: [
+        {
+          new_node_id: 'NewNode',
+          old_node_id: 'OldNode',
+          old_widget_ids: null,
+          input_mapping: null,
+          output_mapping: null
+        }
+      ]
+    }
+
+    beforeEach(() => {
+      vi.mocked(fetchNodeReplacements).mockReset()
+    })
+
+    it('should fetch and assign replacements on successful load', async () => {
+      vi.mocked(fetchNodeReplacements).mockResolvedValue(mockReplacements)
+      store = createStore()
+
+      await store.load()
+
+      expect(fetchNodeReplacements).toHaveBeenCalledOnce()
+      expect(store.replacements).toEqual(mockReplacements)
+      expect(store.isLoaded).toBe(true)
+    })
+
+    it('should log error but not throw when fetch fails', async () => {
+      const consoleErrorSpy = vi
+        .spyOn(console, 'error')
+        .mockImplementation(() => {})
+      const error = new Error('Network error')
+      vi.mocked(fetchNodeReplacements).mockRejectedValue(error)
+      store = createStore()
+
+      await expect(store.load()).resolves.toBeUndefined()
+
+      expect(consoleErrorSpy).toHaveBeenCalledWith(
+        'Failed to load node replacements:',
+        error
+      )
+      expect(store.isLoaded).toBe(false)
+
+      consoleErrorSpy.mockRestore()
+    })
+
+    it('should not fetch when setting is disabled', async () => {
+      vi.mocked(fetchNodeReplacements).mockResolvedValue({})
+      store = createStore(false)
+
+      await store.load()
+
+      expect(fetchNodeReplacements).not.toHaveBeenCalled()
+      expect(store.isLoaded).toBe(false)
+    })
+
+    it('should not fetch when server feature flag is disabled', async () => {
+      vi.mocked(fetchNodeReplacements).mockResolvedValue(mockReplacements)
+      store = createStore(true, false)
+
+      await store.load()
+
+      expect(fetchNodeReplacements).not.toHaveBeenCalled()
+      expect(store.isLoaded).toBe(false)
+    })
+
+    it('should not re-fetch when called twice', async () => {
+      vi.mocked(fetchNodeReplacements).mockResolvedValue(mockReplacements)
+      store = createStore()
+
+      await store.load()
+      await store.load()
+
+      expect(fetchNodeReplacements).toHaveBeenCalledOnce()
+    })
+  })
+})
diff --git a/src/platform/nodeReplacement/nodeReplacementStore.ts b/src/platform/nodeReplacement/nodeReplacementStore.ts
new file mode 100644
index 0000000000..bf11ba7cb3
--- /dev/null
+++ b/src/platform/nodeReplacement/nodeReplacementStore.ts
@@ -0,0 +1,50 @@
+import type { NodeReplacement, NodeReplacementResponse } from './types'
+
+import { defineStore } from 'pinia'
+import { computed, ref } from 'vue'
+
+import { ServerFeatureFlag } from '@/composables/useFeatureFlags'
+import { useSettingStore } from '@/platform/settings/settingStore'
+import { api } from '@/scripts/api'
+import { fetchNodeReplacements } from './nodeReplacementService'
+
+export const useNodeReplacementStore = defineStore('nodeReplacement', () => {
+  const settingStore = useSettingStore()
+  const replacements = ref<NodeReplacementResponse>({})
+  const isLoaded = ref(false)
+  const isEnabled = computed(() =>
+    settingStore.get('Comfy.NodeReplacement.Enabled')
+  )
+
+  async function load() {
+    if (!isEnabled.value || isLoaded.value) return
+    if (!api.getServerFeature(ServerFeatureFlag.NODE_REPLACEMENTS, false))
+      return
+
+    try {
+      replacements.value = await fetchNodeReplacements()
+      isLoaded.value = true
+    } catch (error) {
+      console.error('Failed to load node replacements:', error)
+    }
+  }
+
+  function getReplacementFor(nodeType: string): NodeReplacement | null {
+    if (!isEnabled.value) return null
+    return replacements.value[nodeType]?.[0] ?? null
+  }
+
+  function hasReplacement(nodeType: string): boolean {
+    if (!isEnabled.value) return false
+    return !!replacements.value[nodeType]?.length
+  }
+
+  return {
+    replacements,
+    isLoaded,
+    isEnabled,
+    load,
+    getReplacementFor,
+    hasReplacement
+  }
+})
diff --git a/src/platform/nodeReplacement/types.ts b/src/platform/nodeReplacement/types.ts
new file mode 100644
index 0000000000..e82ed5bcdf
--- /dev/null
+++ b/src/platform/nodeReplacement/types.ts
@@ -0,0 +1,26 @@
+interface InputMapOldId {
+  new_id: string
+  old_id: string
+}
+
+interface InputMapSetValue {
+  new_id: string
+  set_value: unknown
+}
+
+type InputMap = InputMapOldId | InputMapSetValue
+
+interface OutputMap {
+  new_idx: number
+  old_idx: number
+}
+
+export interface NodeReplacement {
+  new_node_id: string
+  old_node_id: string
+  old_widget_ids: string[] | null
+  input_mapping: InputMap[] | null
+  output_mapping: OutputMap[] | null
+}
+
+export type NodeReplacementResponse = Record<string, NodeReplacement[]>
diff --git a/src/platform/nodeReplacement/useNodeReplacement.test.ts b/src/platform/nodeReplacement/useNodeReplacement.test.ts
new file mode 100644
index 0000000000..7f3af48110
--- /dev/null
+++ b/src/platform/nodeReplacement/useNodeReplacement.test.ts
@@ -0,0 +1,978 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph'
+import { LiteGraph } from '@/lib/litegraph/src/litegraph'
+import type { NodeReplacement } from './types'
+import type { MissingNodeType } from '@/types/comfy'
+
+vi.mock('@/lib/litegraph/src/litegraph', () => ({
+  LiteGraph: {
+    createNode: vi.fn(),
+    registered_node_types: {}
+  }
+}))
+
+vi.mock('@/scripts/app', () => ({
+  app: { rootGraph: null },
+  sanitizeNodeName: (name: string) => name.replace(/[&<>"'`=]/g, '')
+}))
+
+vi.mock('@/utils/graphTraversalUtil', () => ({
+  collectAllNodes: vi.fn()
+}))
+
+vi.mock('@/platform/updates/common/toastStore', () => ({
+  useToastStore: vi.fn(() => ({
+    add: vi.fn()
+  }))
+}))
+
+vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
+  useWorkflowStore: vi.fn(() => ({
+    activeWorkflow: {
+      changeTracker: {
+        beforeChange: vi.fn(),
+        afterChange: vi.fn()
+      }
+    }
+  }))
+}))
+
+vi.mock('@/i18n', () => ({
+  t: (key: string, params?: Record<string, unknown>) =>
+    params ? `${key}:${JSON.stringify(params)}` : key
+}))
+
+const { mockRemoveMissingNodesByType } = vi.hoisted(() => ({
+  mockRemoveMissingNodesByType: vi.fn()
+}))
+vi.mock('@/stores/executionErrorStore', () => ({
+  useExecutionErrorStore: vi.fn(() => ({
+    removeMissingNodesByType: mockRemoveMissingNodesByType
+  }))
+}))
+
+import { app } from '@/scripts/app'
+import { collectAllNodes } from '@/utils/graphTraversalUtil'
+import { useNodeReplacement } from './useNodeReplacement'
+
+function createMockLink(
+  id: number,
+  originId: number,
+  originSlot: number,
+  targetId: number,
+  targetSlot: number
+) {
+  return {
+    id,
+    origin_id: originId,
+    origin_slot: originSlot,
+    target_id: targetId,
+    target_slot: targetSlot,
+    type: 'IMAGE'
+  }
+}
+
+function createMockGraph(
+  nodes: LGraphNode[],
+  links: ReturnType<typeof createMockLink>[] = []
+): LGraph {
+  const linksMap = new Map(links.map((l) => [l.id, l]))
+  return {
+    _nodes: nodes,
+    _nodes_by_id: Object.fromEntries(nodes.map((n) => [n.id, n])),
+    links: linksMap,
+    updateExecutionOrder: vi.fn(),
+    setDirtyCanvas: vi.fn()
+  } as unknown as LGraph
+}
+
+function createPlaceholderNode(
+  id: number,
+  type: string,
+  inputs: { name: string; link: number | null }[] = [],
+  outputs: { name: string; links: number[] | null }[] = [],
+  graph?: LGraph
+): LGraphNode {
+  return {
+    id,
+    type,
+    pos: [100, 200],
+    size: [200, 100],
+    order: 0,
+    mode: 0,
+    flags: {},
+    has_errors: true,
+    last_serialization: {
+      id,
+      type,
+      pos: [100, 200],
+      size: [200, 100],
+      flags: {},
+      order: 0,
+      mode: 0,
+      inputs: inputs.map((i) => ({ ...i, type: 'IMAGE' })),
+      outputs: outputs.map((o) => ({ ...o, type: 'IMAGE' })),
+      widgets_values: []
+    },
+    inputs: inputs.map((i) => ({ ...i, type: 'IMAGE' })),
+    outputs: outputs.map((o) => ({ ...o, type: 'IMAGE' })),
+    graph: graph ?? null,
+    serialize: vi.fn(() => ({
+      id,
+      type,
+      pos: [100, 200],
+      size: [200, 100],
+      flags: {},
+      order: 0,
+      mode: 0,
+      inputs: inputs.map((i) => ({ ...i, type: 'IMAGE' })),
+      outputs: outputs.map((o) => ({ ...o, type: 'IMAGE' })),
+      widgets_values: []
+    }))
+  } as unknown as LGraphNode
+}
+
+function createNewNode(
+  inputs: { name: string; link: number | null }[] = [],
+  outputs: { name: string; links: number[] | null }[] = [],
+  widgets: { name: string; value: unknown }[] = []
+): LGraphNode {
+  return {
+    id: 0,
+    type: '',
+    pos: [0, 0],
+    size: [100, 50],
+    order: 0,
+    mode: 0,
+    flags: {},
+    has_errors: false,
+    inputs: inputs.map((i) => ({ ...i, type: 'IMAGE' })),
+    outputs: outputs.map((o) => ({ ...o, type: 'IMAGE' })),
+    widgets: widgets.map((w) => ({ ...w, type: 'combo', options: {} })),
+    configure: vi.fn(),
+    serialize: vi.fn()
+  } as unknown as LGraphNode
+}
+
+function makeMissingNodeType(
+  type: string,
+  replacement: NodeReplacement
+): MissingNodeType {
+  return {
+    type,
+    isReplaceable: true,
+    replacement
+  }
+}
+
+describe('useNodeReplacement', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    setActivePinia(createPinia())
+  })
+
+  describe('replaceNodesInPlace', () => {
+    it('should return empty array when no placeholders exist', () => {
+      const graph = createMockGraph([])
+      Object.assign(app, { rootGraph: graph })
+      vi.mocked(collectAllNodes).mockReturnValue([])
+
+      const { replaceNodesInPlace } = useNodeReplacement()
+      const result = replaceNodesInPlace([])
+
+      expect(result).toEqual([])
+    })
+
+    it('should use default mapping when no explicit mapping exists', () => {
+      const placeholder = createPlaceholderNode(1, 'Load3DAnimation')
+      const graph = createMockGraph([placeholder])
+      placeholder.graph = graph
+      Object.assign(app, { rootGraph: graph })
+
+      vi.mocked(collectAllNodes).mockReturnValue([placeholder])
+
+      const newNode = createNewNode()
+      vi.mocked(LiteGraph.createNode).mockReturnValue(newNode)
+
+      const { replaceNodesInPlace } = useNodeReplacement()
+      const result = replaceNodesInPlace([
+        makeMissingNodeType('Load3DAnimation', {
+          new_node_id: 'Load3D',
+          old_node_id: 'Load3DAnimation',
+          old_widget_ids: null,
+          input_mapping: null,
+          output_mapping: null
+        })
+      ])
+
+      expect(result).toEqual(['Load3DAnimation'])
+      expect(newNode.configure).not.toHaveBeenCalled()
+      expect(newNode.id).toBe(1)
+      expect(newNode.has_errors).toBe(false)
+    })
+
+    it('should transfer input connections using input_mapping', () => {
+      const link = createMockLink(10, 5, 0, 1, 0)
+      const placeholder = createPlaceholderNode(
+        1,
+        'T2IAdapterLoader',
+        [{ name: 't2i_adapter_name', link: 10 }],
+        []
+      )
+      const graph = createMockGraph([placeholder], [link])
+      placeholder.graph = graph
+      Object.assign(app, { rootGraph: graph })
+
+      vi.mocked(collectAllNodes).mockReturnValue([placeholder])
+
+      const newNode = createNewNode(
+        [{ name: 'control_net_name', link: null }],
+        []
+      )
+      vi.mocked(LiteGraph.createNode).mockReturnValue(newNode)
+
+      const { replaceNodesInPlace } = useNodeReplacement()
+      const result = replaceNodesInPlace([
+        makeMissingNodeType('T2IAdapterLoader', {
+          new_node_id: 'ControlNetLoader',
+          old_node_id: 'T2IAdapterLoader',
+          old_widget_ids: null,
+          input_mapping: [
+            { new_id: 'control_net_name', old_id: 't2i_adapter_name' }
+          ],
+          output_mapping: null
+        })
+      ])
+
+      expect(result).toEqual(['T2IAdapterLoader'])
+      // Link should be updated to point at new node's input
+      expect(link.target_id).toBe(1)
+      expect(link.target_slot).toBe(0)
+      expect(newNode.inputs[0].link).toBe(10)
+    })
+
+    it('should transfer output connections using output_mapping', () => {
+      const link = createMockLink(20, 1, 0, 5, 0)
+      const placeholder = createPlaceholderNode(
+        1,
+        'ResizeImagesByLongerEdge',
+        [],
+        [{ name: 'IMAGE', links: [20] }]
+      )
+      const graph = createMockGraph([placeholder], [link])
+      placeholder.graph = graph
+      Object.assign(app, { rootGraph: graph })
+
+      vi.mocked(collectAllNodes).mockReturnValue([placeholder])
+
+      const newNode = createNewNode(
+        [{ name: 'image', link: null }],
+        [{ name: 'IMAGE', links: null }]
+      )
+      vi.mocked(LiteGraph.createNode).mockReturnValue(newNode)
+
+      const { replaceNodesInPlace } = useNodeReplacement()
+      replaceNodesInPlace([
+        makeMissingNodeType('ResizeImagesByLongerEdge', {
+          new_node_id: 'ImageScaleToMaxDimension',
+          old_node_id: 'ResizeImagesByLongerEdge',
+          old_widget_ids: ['longer_edge'],
+          input_mapping: [
+            { new_id: 'image', old_id: 'images' },
+            { new_id: 'largest_size', old_id: 'longer_edge' },
+            { new_id: 'upscale_method', set_value: 'lanczos' }
+          ],
+          output_mapping: [{ new_idx: 0, old_idx: 0 }]
+        })
+      ])
+
+      // Output link should be remapped
+      expect(link.origin_id).toBe(1)
+      expect(link.origin_slot).toBe(0)
+      expect(newNode.outputs[0].links).toEqual([20])
+    })
+
+    it('should apply set_value to widget', () => {
+      const placeholder = createPlaceholderNode(1, 'ImageScaleBy')
+      const graph = createMockGraph([placeholder])
+      placeholder.graph = graph
+      Object.assign(app, { rootGraph: graph })
+
+      vi.mocked(collectAllNodes).mockReturnValue([placeholder])
+
+      const newNode = createNewNode(
+        [{ name: 'input', link: null }],
+        [],
+        [
+          { name: 'resize_type', value: '' },
+          { name: 'scale_method', value: '' }
+        ]
+      )
+      vi.mocked(LiteGraph.createNode).mockReturnValue(newNode)
+
+      const { replaceNodesInPlace } = useNodeReplacement()
+      replaceNodesInPlace([
+        makeMissingNodeType('ImageScaleBy', {
+          new_node_id: 'ResizeImageMaskNode',
+          old_node_id: 'ImageScaleBy',
+          old_widget_ids: ['upscale_method', 'scale_by'],
+          input_mapping: [
+            { new_id: 'input', old_id: 'image' },
+            { new_id: 'resize_type', set_value: 'scale by multiplier' },
+            { new_id: 'resize_type.multiplier', old_id: 'scale_by' },
+            { new_id: 'scale_method', old_id: 'upscale_method' }
+          ],
+          output_mapping: null
+        })
+      ])
+
+      // set_value should be applied to the widget
+      expect(newNode.widgets![0].value).toBe('scale by multiplier')
+    })
+
+    it('should transfer widget values using old_widget_ids', () => {
+      const placeholder = createPlaceholderNode(1, 'ResizeImagesByLongerEdge')
+      // Set widget values in serialized data
+      placeholder.last_serialization!.widgets_values = [512]
+
+      const graph = createMockGraph([placeholder])
+      placeholder.graph = graph
+      Object.assign(app, { rootGraph: graph })
+
+      vi.mocked(collectAllNodes).mockReturnValue([placeholder])
+
+      const newNode = createNewNode(
+        [
+          { name: 'image', link: null },
+          { name: 'largest_size', link: null }
+        ],
+        [{ name: 'IMAGE', links: null }],
+        [{ name: 'largest_size', value: 0 }]
+      )
+      vi.mocked(LiteGraph.createNode).mockReturnValue(newNode)
+
+      const { replaceNodesInPlace } = useNodeReplacement()
+      replaceNodesInPlace([
+        makeMissingNodeType('ResizeImagesByLongerEdge', {
+          new_node_id: 'ImageScaleToMaxDimension',
+          old_node_id: 'ResizeImagesByLongerEdge',
+          old_widget_ids: ['longer_edge'],
+          input_mapping: [
+            { new_id: 'image', old_id: 'images' },
+            { new_id: 'largest_size', old_id: 'longer_edge' },
+            { new_id: 'upscale_method', set_value: 'lanczos' }
+          ],
+          output_mapping: [{ new_idx: 0, old_idx: 0 }]
+        })
+      ])
+
+      // Widget value should be transferred: old "longer_edge" (idx 0, value 512) → new "largest_size"
+      expect(newNode.widgets![0].value).toBe(512)
+    })
+
+    it('should skip replacement when new node type is not registered', () => {
+      const placeholder = createPlaceholderNode(1, 'UnknownNode')
+      const graph = createMockGraph([placeholder])
+      placeholder.graph = graph
+      Object.assign(app, { rootGraph: graph })
+
+      vi.mocked(collectAllNodes).mockReturnValue([placeholder])
+      vi.mocked(LiteGraph.createNode).mockReturnValue(null)
+
+      const { replaceNodesInPlace } = useNodeReplacement()
+      const result = replaceNodesInPlace([
+        makeMissingNodeType('UnknownNode', {
+          new_node_id: 'NonExistentNode',
+          old_node_id: 'UnknownNode',
+          old_widget_ids: null,
+          input_mapping: null,
+          output_mapping: null
+        })
+      ])
+
+      expect(result).toEqual([])
+    })
+
+    it('should replace multiple different node types at once', () => {
+      const placeholder1 = createPlaceholderNode(1, 'Load3DAnimation')
+      const placeholder2 = createPlaceholderNode(
+        2,
+        'ConditioningAverage',
+        [],
+        []
+      )
+      // sanitizeNodeName strips & from type names (HTML entity chars)
+      placeholder2.type = 'ConditioningAverage'
+
+      const graph = createMockGraph([placeholder1, placeholder2])
+      placeholder1.graph = graph
+      placeholder2.graph = graph
+      Object.assign(app, { rootGraph: graph })
+
+      vi.mocked(collectAllNodes).mockReturnValue([placeholder1, placeholder2])
+
+      const newNode1 = createNewNode()
+      const newNode2 = createNewNode()
+      vi.mocked(LiteGraph.createNode)
+        .mockReturnValueOnce(newNode1)
+        .mockReturnValueOnce(newNode2)
+
+      const { replaceNodesInPlace } = useNodeReplacement()
+      const result = replaceNodesInPlace([
+        makeMissingNodeType('Load3DAnimation', {
+          new_node_id: 'Load3D',
+          old_node_id: 'Load3DAnimation',
+          old_widget_ids: null,
+          input_mapping: null,
+          output_mapping: null
+        }),
+        makeMissingNodeType('ConditioningAverage&', {
+          new_node_id: 'ConditioningAverage',
+          old_node_id: 'ConditioningAverage&',
+          old_widget_ids: null,
+          input_mapping: null,
+          output_mapping: null
+        })
+      ])
+
+      expect(result).toHaveLength(2)
+      expect(result).toContain('Load3DAnimation')
+      expect(result).toContain('ConditioningAverage&')
+    })
+
+    it('should copy position and identity for mapped replacements', () => {
+      const link = createMockLink(10, 5, 0, 1, 0)
+      const placeholder = createPlaceholderNode(
+        42,
+        'T2IAdapterLoader',
+        [{ name: 't2i_adapter_name', link: 10 }],
+        []
+      )
+      placeholder.pos = [300, 400]
+      placeholder.size = [250, 150]
+
+      const graph = createMockGraph([placeholder], [link])
+      placeholder.graph = graph
+      Object.assign(app, { rootGraph: graph })
+
+      vi.mocked(collectAllNodes).mockReturnValue([placeholder])
+
+      const newNode = createNewNode(
+        [{ name: 'control_net_name', link: null }],
+        []
+      )
+      vi.mocked(LiteGraph.createNode).mockReturnValue(newNode)
+
+      const { replaceNodesInPlace } = useNodeReplacement()
+      replaceNodesInPlace([
+        makeMissingNodeType('T2IAdapterLoader', {
+          new_node_id: 'ControlNetLoader',
+          old_node_id: 'T2IAdapterLoader',
+          old_widget_ids: null,
+          input_mapping: [
+            { new_id: 'control_net_name', old_id: 't2i_adapter_name' }
+          ],
+          output_mapping: null
+        })
+      ])
+
+      expect(newNode.id).toBe(42)
+      expect(newNode.pos).toEqual([300, 400])
+      expect(newNode.size).toEqual([250, 150])
+      expect(graph._nodes[0]).toBe(newNode)
+    })
+
+    it('should transfer all widget values for ImageScaleBy with real workflow data', () => {
+      const placeholder = createPlaceholderNode(
+        12,
+        'ImageScaleBy',
+        [{ name: 'image', link: 2 }],
+        [{ name: 'IMAGE', links: [3, 4] }]
+      )
+      // Real workflow data: widgets_values: ["lanczos", 2.0]
+      placeholder.last_serialization!.widgets_values = ['lanczos', 2.0]
+
+      const graph = createMockGraph([placeholder])
+      placeholder.graph = graph
+      Object.assign(app, { rootGraph: graph })
+
+      vi.mocked(collectAllNodes).mockReturnValue([placeholder])
+
+      const newNode = createNewNode(
+        [{ name: 'input', link: null }],
+        [],
+        [
+          { name: 'resize_type', value: '' },
+          { name: 'scale_method', value: '' }
+        ]
+      )
+      vi.mocked(LiteGraph.createNode).mockReturnValue(newNode)
+
+      const { replaceNodesInPlace } = useNodeReplacement()
+      replaceNodesInPlace([
+        makeMissingNodeType('ImageScaleBy', {
+          new_node_id: 'ResizeImageMaskNode',
+          old_node_id: 'ImageScaleBy',
+          old_widget_ids: ['upscale_method', 'scale_by'],
+          input_mapping: [
+            { new_id: 'input', old_id: 'image' },
+            { new_id: 'resize_type', set_value: 'scale by multiplier' },
+            { new_id: 'resize_type.multiplier', old_id: 'scale_by' },
+            { new_id: 'scale_method', old_id: 'upscale_method' }
+          ],
+          output_mapping: null
+        })
+      ])
+
+      // set_value should be applied
+      expect(newNode.widgets![0].value).toBe('scale by multiplier')
+      // upscale_method (idx 0, value "lanczos") → scale_method widget
+      expect(newNode.widgets![1].value).toBe('lanczos')
+    })
+
+    it('should transfer widget value for ResizeImagesByLongerEdge with real workflow data', () => {
+      const link = createMockLink(1, 5, 0, 8, 0)
+      const placeholder = createPlaceholderNode(
+        8,
+        'ResizeImagesByLongerEdge',
+        [{ name: 'images', link: 1 }],
+        [{ name: 'IMAGE', links: [2] }]
+      )
+      // Real workflow data: widgets_values: [1024]
+      placeholder.last_serialization!.widgets_values = [1024]
+
+      const graph = createMockGraph([placeholder], [link])
+      placeholder.graph = graph
+      Object.assign(app, { rootGraph: graph })
+
+      vi.mocked(collectAllNodes).mockReturnValue([placeholder])
+
+      const newNode = createNewNode(
+        [
+          { name: 'image', link: null },
+          { name: 'largest_size', link: null }
+        ],
+        [{ name: 'IMAGE', links: null }],
+        [
+          { name: 'largest_size', value: 0 },
+          { name: 'upscale_method', value: '' }
+        ]
+      )
+      vi.mocked(LiteGraph.createNode).mockReturnValue(newNode)
+
+      const { replaceNodesInPlace } = useNodeReplacement()
+      replaceNodesInPlace([
+        makeMissingNodeType('ResizeImagesByLongerEdge', {
+          new_node_id: 'ImageScaleToMaxDimension',
+          old_node_id: 'ResizeImagesByLongerEdge',
+          old_widget_ids: ['longer_edge'],
+          input_mapping: [
+            { new_id: 'image', old_id: 'images' },
+            { new_id: 'largest_size', old_id: 'longer_edge' },
+            { new_id: 'upscale_method', set_value: 'lanczos' }
+          ],
+          output_mapping: [{ new_idx: 0, old_idx: 0 }]
+        })
+      ])
+
+      // longer_edge (idx 0, value 1024) → largest_size widget
+      expect(newNode.widgets![0].value).toBe(1024)
+      // set_value "lanczos" → upscale_method widget
+      expect(newNode.widgets![1].value).toBe('lanczos')
+    })
+
+    it('should transfer ConditioningAverage widget value with real workflow data', () => {
+      const link = createMockLink(4, 7, 0, 13, 0)
+      // sanitizeNodeName doesn't strip spaces, so placeholder keeps trailing space
+      const placeholder = createPlaceholderNode(
+        13,
+        'ConditioningAverage ',
+        [
+          { name: 'conditioning_to', link: 4 },
+          { name: 'conditioning_from', link: null }
+        ],
+        [{ name: 'CONDITIONING', links: [6] }]
+      )
+      placeholder.last_serialization!.widgets_values = [0.75]
+
+      const graph = createMockGraph([placeholder], [link])
+      placeholder.graph = graph
+      Object.assign(app, { rootGraph: graph })
+
+      vi.mocked(collectAllNodes).mockReturnValue([placeholder])
+
+      const newNode = createNewNode(
+        [
+          { name: 'conditioning_to', link: null },
+          { name: 'conditioning_from', link: null }
+        ],
+        [{ name: 'CONDITIONING', links: null }],
+        [{ name: 'conditioning_average', value: 0 }]
+      )
+      vi.mocked(LiteGraph.createNode).mockReturnValue(newNode)
+
+      const { replaceNodesInPlace } = useNodeReplacement()
+      replaceNodesInPlace([
+        makeMissingNodeType('ConditioningAverage ', {
+          new_node_id: 'ConditioningAverage',
+          old_node_id: 'ConditioningAverage ',
+          old_widget_ids: null,
+          input_mapping: null,
+          output_mapping: null
+        })
+      ])
+
+      // Default mapping transfers connections and widget values by name
+      expect(newNode.id).toBe(13)
+      expect(newNode.inputs[0].link).toBe(4)
+      expect(newNode.outputs[0].links).toEqual([6])
+      expect(newNode.widgets![0].value).toBe(0.75)
+    })
+
+    it('should skip dot-notation input connections but still transfer widget values', () => {
+      const placeholder = createPlaceholderNode(1, 'ImageBatch')
+      const graph = createMockGraph([placeholder])
+      placeholder.graph = graph
+      Object.assign(app, { rootGraph: graph })
+
+      vi.mocked(collectAllNodes).mockReturnValue([placeholder])
+
+      const newNode = createNewNode([], [])
+      vi.mocked(LiteGraph.createNode).mockReturnValue(newNode)
+
+      const { replaceNodesInPlace } = useNodeReplacement()
+      const result = replaceNodesInPlace([
+        makeMissingNodeType('ImageBatch', {
+          new_node_id: 'BatchImagesNode',
+          old_node_id: 'ImageBatch',
+          old_widget_ids: null,
+          input_mapping: [
+            { new_id: 'images.image0', old_id: 'image1' },
+            { new_id: 'images.image1', old_id: 'image2' }
+          ],
+          output_mapping: null
+        })
+      ])
+
+      // Should still succeed (dot-notation skipped gracefully)
+      expect(result).toEqual(['ImageBatch'])
+    })
+  })
+
+  describe('placeholder detection predicate', () => {
+    /**
+     * replaceNodesInPlace calls collectAllNodes with a predicate.
+     * These tests capture the predicate by inspecting the mock call
+     * and verify it matches only nodes whose serialized type is in
+     * the targetTypes set — regardless of has_errors or registered_node_types.
+     */
+
+    function capturedPredicate(): (n: LGraphNode) => boolean {
+      const calls = vi.mocked(collectAllNodes).mock.calls
+      expect(calls.length).toBeGreaterThan(0)
+      return calls[calls.length - 1][1] as (n: LGraphNode) => boolean
+    }
+
+    it('should detect placeholder when type is in targetTypes even if has_errors is false', () => {
+      const placeholder = createPlaceholderNode(1, 'OldNode')
+      placeholder.has_errors = false
+      const graph = createMockGraph([placeholder])
+      placeholder.graph = graph
+      Object.assign(app, { rootGraph: graph })
+
+      vi.mocked(collectAllNodes).mockReturnValue([])
+
+      const { replaceNodesInPlace } = useNodeReplacement()
+      replaceNodesInPlace([
+        makeMissingNodeType('OldNode', {
+          new_node_id: 'NewNode',
+          old_node_id: 'OldNode',
+          old_widget_ids: null,
+          input_mapping: null,
+          output_mapping: null
+        })
+      ])
+
+      const predicate = capturedPredicate()
+      expect(predicate(placeholder)).toBe(true)
+    })
+
+    it('should detect placeholder when type is in targetTypes even if type is registered', () => {
+      // Simulate the pack being reinstalled — type is now registered
+      ;(LiteGraph.registered_node_types as Record<string, unknown>)['OldNode'] =
+        {}
+
+      const placeholder = createPlaceholderNode(1, 'OldNode')
+      const graph = createMockGraph([placeholder])
+      placeholder.graph = graph
+      Object.assign(app, { rootGraph: graph })
+
+      vi.mocked(collectAllNodes).mockReturnValue([])
+
+      const { replaceNodesInPlace } = useNodeReplacement()
+      replaceNodesInPlace([
+        makeMissingNodeType('OldNode', {
+          new_node_id: 'NewNode',
+          old_node_id: 'OldNode',
+          old_widget_ids: null,
+          input_mapping: null,
+          output_mapping: null
+        })
+      ])
+
+      const predicate = capturedPredicate()
+      expect(predicate(placeholder)).toBe(true)
+
+      // Cleanup
+      delete (LiteGraph.registered_node_types as Record<string, unknown>)[
+        'OldNode'
+      ]
+    })
+
+    it('should exclude nodes whose type is NOT in targetTypes', () => {
+      const unrelatedNode = createPlaceholderNode(1, 'UnrelatedNode')
+      const graph = createMockGraph([unrelatedNode])
+      unrelatedNode.graph = graph
+      Object.assign(app, { rootGraph: graph })
+
+      vi.mocked(collectAllNodes).mockReturnValue([])
+
+      const { replaceNodesInPlace } = useNodeReplacement()
+      replaceNodesInPlace([
+        makeMissingNodeType('SomeOtherNode', {
+          new_node_id: 'NewNode',
+          old_node_id: 'SomeOtherNode',
+          old_widget_ids: null,
+          input_mapping: null,
+          output_mapping: null
+        })
+      ])
+
+      const predicate = capturedPredicate()
+      expect(predicate(unrelatedNode)).toBe(false)
+    })
+
+    it('should exclude nodes without last_serialization', () => {
+      const freshNode = createPlaceholderNode(1, 'OldNode')
+      freshNode.last_serialization =
+        undefined as unknown as LGraphNode['last_serialization']
+      const graph = createMockGraph([freshNode])
+      Object.assign(app, { rootGraph: graph })
+
+      vi.mocked(collectAllNodes).mockReturnValue([])
+
+      const { replaceNodesInPlace } = useNodeReplacement()
+      replaceNodesInPlace([
+        makeMissingNodeType('OldNode', {
+          new_node_id: 'NewNode',
+          old_node_id: 'OldNode',
+          old_widget_ids: null,
+          input_mapping: null,
+          output_mapping: null
+        })
+      ])
+
+      const predicate = capturedPredicate()
+      expect(predicate(freshNode)).toBe(false)
+    })
+
+    it('should fall back to node.type when last_serialization.type is undefined', () => {
+      const node = createPlaceholderNode(1, 'FallbackType')
+      node.last_serialization!.type = undefined as unknown as string
+      node.type = 'FallbackType'
+      const graph = createMockGraph([node])
+      Object.assign(app, { rootGraph: graph })
+
+      vi.mocked(collectAllNodes).mockReturnValue([])
+
+      const { replaceNodesInPlace } = useNodeReplacement()
+      replaceNodesInPlace([
+        makeMissingNodeType('FallbackType', {
+          new_node_id: 'NewNode',
+          old_node_id: 'FallbackType',
+          old_widget_ids: null,
+          input_mapping: null,
+          output_mapping: null
+        })
+      ])
+
+      const predicate = capturedPredicate()
+      expect(predicate(node)).toBe(true)
+    })
+
+    it('should match node via sanitized type when last_serialization.type is absent and live type contains HTML special chars', () => {
+      // Simulates an old serialization format (no last_serialization.type)
+      // where app.ts has already run sanitizeNodeName on n.type,
+      // stripping '&' from "OldNode&Special" → "OldNodeSpecial".
+      // targetTypes still holds the original unsanitized name "OldNode&Special",
+      // so the predicate must fall back to checking sanitizeNodeName(originalType).
+      const node = createPlaceholderNode(1, 'OldNodeSpecial')
+      node.last_serialization!.type = undefined as unknown as string
+      // Simulate what sanitizeNodeName does to '&' in the live type
+      node.type = 'OldNodeSpecial' // '&' already stripped by sanitizeNodeName
+      const graph = createMockGraph([node])
+      Object.assign(app, { rootGraph: graph })
+
+      vi.mocked(collectAllNodes).mockReturnValue([])
+
+      const { replaceNodesInPlace } = useNodeReplacement()
+      replaceNodesInPlace([
+        // targetTypes will contain the original name with '&'
+        makeMissingNodeType('OldNode&Special', {
+          new_node_id: 'NewNode',
+          old_node_id: 'OldNode&Special',
+          old_widget_ids: null,
+          input_mapping: null,
+          output_mapping: null
+        })
+      ])
+
+      const predicate = capturedPredicate()
+      // Without the sanitize fallback this would return false.
+      expect(predicate(node)).toBe(true)
+    })
+  })
+
+  describe('replaceGroup', () => {
+    it('calls removeMissingNodesByType with replaced types on success', () => {
+      const placeholder = createPlaceholderNode(1, 'OldNode')
+      const graph = createMockGraph([placeholder])
+      placeholder.graph = graph
+      Object.assign(app, { rootGraph: graph })
+
+      const newNode = createNewNode()
+      vi.mocked(collectAllNodes).mockReturnValue([placeholder])
+      vi.mocked(LiteGraph.createNode).mockReturnValue(newNode)
+
+      const { replaceGroup } = useNodeReplacement()
+      replaceGroup({
+        type: 'OldNode',
+        nodeTypes: [
+          makeMissingNodeType('OldNode', {
+            new_node_id: 'NewNode',
+            old_node_id: 'OldNode',
+            old_widget_ids: null,
+            input_mapping: null,
+            output_mapping: null
+          })
+        ]
+      })
+
+      expect(mockRemoveMissingNodesByType).toHaveBeenCalledWith(['OldNode'])
+    })
+
+    it('does not call removeMissingNodesByType when no nodes are replaced', () => {
+      const graph = createMockGraph([])
+      Object.assign(app, { rootGraph: graph })
+      vi.mocked(collectAllNodes).mockReturnValue([])
+
+      const { replaceGroup } = useNodeReplacement()
+      replaceGroup({
+        type: 'OldNode',
+        nodeTypes: [
+          makeMissingNodeType('OldNode', {
+            new_node_id: 'NewNode',
+            old_node_id: 'OldNode',
+            old_widget_ids: null,
+            input_mapping: null,
+            output_mapping: null
+          })
+        ]
+      })
+
+      expect(mockRemoveMissingNodesByType).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('replaceAllGroups', () => {
+    it('calls removeMissingNodesByType with all successfully replaced types', () => {
+      const p1 = createPlaceholderNode(1, 'TypeA')
+      const p2 = createPlaceholderNode(2, 'TypeB')
+      const graph = createMockGraph([p1, p2])
+      p1.graph = graph
+      p2.graph = graph
+      Object.assign(app, { rootGraph: graph })
+
+      vi.mocked(collectAllNodes).mockReturnValue([p1, p2])
+      vi.mocked(LiteGraph.createNode)
+        .mockReturnValueOnce(createNewNode())
+        .mockReturnValueOnce(createNewNode())
+
+      const { replaceAllGroups } = useNodeReplacement()
+      replaceAllGroups([
+        {
+          type: 'TypeA',
+          nodeTypes: [
+            makeMissingNodeType('TypeA', {
+              new_node_id: 'NewA',
+              old_node_id: 'TypeA',
+              old_widget_ids: null,
+              input_mapping: null,
+              output_mapping: null
+            })
+          ]
+        },
+        {
+          type: 'TypeB',
+          nodeTypes: [
+            makeMissingNodeType('TypeB', {
+              new_node_id: 'NewB',
+              old_node_id: 'TypeB',
+              old_widget_ids: null,
+              input_mapping: null,
+              output_mapping: null
+            })
+          ]
+        }
+      ])
+
+      expect(mockRemoveMissingNodesByType).toHaveBeenCalledWith(
+        expect.arrayContaining(['TypeA', 'TypeB'])
+      )
+    })
+
+    it('removes only the types that were actually replaced when some fail', () => {
+      const p1 = createPlaceholderNode(1, 'TypeA')
+      const graph = createMockGraph([p1])
+      p1.graph = graph
+      Object.assign(app, { rootGraph: graph })
+
+      // Only TypeA appears as a placeholder; TypeB has no matching node
+      vi.mocked(collectAllNodes).mockReturnValue([p1])
+      vi.mocked(LiteGraph.createNode).mockReturnValueOnce(createNewNode())
+
+      const { replaceAllGroups } = useNodeReplacement()
+      replaceAllGroups([
+        {
+          type: 'TypeA',
+          nodeTypes: [
+            makeMissingNodeType('TypeA', {
+              new_node_id: 'NewA',
+              old_node_id: 'TypeA',
+              old_widget_ids: null,
+              input_mapping: null,
+              output_mapping: null
+            })
+          ]
+        },
+        {
+          type: 'TypeB',
+          nodeTypes: [
+            makeMissingNodeType('TypeB', {
+              new_node_id: 'NewB',
+              old_node_id: 'TypeB',
+              old_widget_ids: null,
+              input_mapping: null,
+              output_mapping: null
+            })
+          ]
+        }
+      ])
+
+      // Only TypeA was replaced; TypeB had no matching placeholder
+      expect(mockRemoveMissingNodesByType).toHaveBeenCalledWith(['TypeA'])
+    })
+  })
+})
diff --git a/src/platform/nodeReplacement/useNodeReplacement.ts b/src/platform/nodeReplacement/useNodeReplacement.ts
new file mode 100644
index 0000000000..bd0cba856f
--- /dev/null
+++ b/src/platform/nodeReplacement/useNodeReplacement.ts
@@ -0,0 +1,359 @@
+import type { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph'
+import { LiteGraph } from '@/lib/litegraph/src/litegraph'
+import type { ISerialisedNode } from '@/lib/litegraph/src/types/serialisation'
+import type { TWidgetValue } from '@/lib/litegraph/src/types/widgets'
+import { t } from '@/i18n'
+import type { NodeReplacement } from '@/platform/nodeReplacement/types'
+import { useToastStore } from '@/platform/updates/common/toastStore'
+import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
+import { app, sanitizeNodeName } from '@/scripts/app'
+import { useExecutionErrorStore } from '@/stores/executionErrorStore'
+import type { MissingNodeType } from '@/types/comfy'
+import { collectAllNodes } from '@/utils/graphTraversalUtil'
+
+interface ReplacementGroup {
+  type: string
+  nodeTypes: MissingNodeType[]
+}
+
+/** Compares sanitized type strings to match placeholder → missing node type. */
+function findMatchingType(
+  node: LGraphNode,
+  selectedTypes: MissingNodeType[]
+): Extract<MissingNodeType, { type: string }> | undefined {
+  const nodeType = node.type
+  for (const selected of selectedTypes) {
+    if (typeof selected !== 'object' || !selected.isReplaceable) continue
+    if (sanitizeNodeName(selected.type) === nodeType) return selected
+  }
+  return undefined
+}
+
+function transferInputConnection(
+  oldNode: LGraphNode,
+  oldInputName: string,
+  newNode: LGraphNode,
+  newInputName: string,
+  graph: LGraph
+): void {
+  const oldSlotIdx = oldNode.inputs?.findIndex((i) => i.name === oldInputName)
+  const newSlotIdx = newNode.inputs?.findIndex((i) => i.name === newInputName)
+  if (oldSlotIdx == null || oldSlotIdx === -1) return
+  if (newSlotIdx == null || newSlotIdx === -1) return
+
+  const linkId = oldNode.inputs[oldSlotIdx].link
+  if (linkId == null) return
+
+  const link = graph.links.get(linkId)
+  if (!link) return
+
+  link.target_id = newNode.id
+  link.target_slot = newSlotIdx
+  newNode.inputs[newSlotIdx].link = linkId
+  oldNode.inputs[oldSlotIdx].link = null
+}
+
+function transferOutputConnections(
+  oldNode: LGraphNode,
+  oldOutputIdx: number,
+  newNode: LGraphNode,
+  newOutputIdx: number,
+  graph: LGraph
+): void {
+  const oldLinks = oldNode.outputs?.[oldOutputIdx]?.links
+  if (!oldLinks?.length) return
+  if (!newNode.outputs?.[newOutputIdx]) return
+
+  for (const linkId of oldLinks) {
+    const link = graph.links.get(linkId)
+    if (!link) continue
+    link.origin_id = newNode.id
+    link.origin_slot = newOutputIdx
+  }
+  newNode.outputs[newOutputIdx].links = [...oldLinks]
+  oldNode.outputs[oldOutputIdx].links = []
+}
+
+/** Uses old_widget_ids as name→index lookup into widgets_values. */
+function transferWidgetValue(
+  serialized: ISerialisedNode,
+  oldWidgetIds: string[] | null,
+  oldInputName: string,
+  newNode: LGraphNode,
+  newInputName: string
+): void {
+  if (!oldWidgetIds || !serialized.widgets_values) return
+
+  const oldWidgetIdx = oldWidgetIds.indexOf(oldInputName)
+  if (oldWidgetIdx === -1) return
+
+  const oldValue = serialized.widgets_values[oldWidgetIdx]
+  if (oldValue === undefined) return
+
+  const newWidget = newNode.widgets?.find((w) => w.name === newInputName)
+  if (newWidget) {
+    newWidget.value = oldValue
+    newWidget.callback?.(oldValue)
+  }
+}
+
+function applySetValue(
+  newNode: LGraphNode,
+  inputName: string,
+  value: unknown
+): void {
+  const widget = newNode.widgets?.find((w) => w.name === inputName)
+  if (widget) {
+    widget.value = value as TWidgetValue
+    widget.callback?.(widget.value)
+  }
+}
+
+function isDotNotation(id: string): boolean {
+  return id.includes('.')
+}
+
+/** Auto-generates identity mapping by name for same-structure replacements without backend mapping. */
+function generateDefaultMapping(
+  serialized: ISerialisedNode,
+  newNode: LGraphNode
+): Pick<
+  NodeReplacement,
+  'input_mapping' | 'output_mapping' | 'old_widget_ids'
+> {
+  const oldInputNames = new Set(serialized.inputs?.map((i) => i.name) ?? [])
+
+  const inputMapping: { old_id: string; new_id: string }[] = []
+  for (const newInput of newNode.inputs ?? []) {
+    if (oldInputNames.has(newInput.name)) {
+      inputMapping.push({ old_id: newInput.name, new_id: newInput.name })
+    }
+  }
+
+  const oldWidgetIds = (newNode.widgets ?? []).map((w) => w.name)
+  for (const widget of newNode.widgets ?? []) {
+    if (!oldInputNames.has(widget.name)) {
+      inputMapping.push({ old_id: widget.name, new_id: widget.name })
+    }
+  }
+
+  const outputMapping: { old_idx: number; new_idx: number }[] = []
+  for (const [oldIdx, oldOutput] of (serialized.outputs ?? []).entries()) {
+    const newIdx = newNode.outputs?.findIndex((o) => o.name === oldOutput.name)
+    if (newIdx != null && newIdx !== -1) {
+      outputMapping.push({ old_idx: oldIdx, new_idx: newIdx })
+    }
+  }
+
+  return {
+    input_mapping: inputMapping.length > 0 ? inputMapping : null,
+    output_mapping: outputMapping.length > 0 ? outputMapping : null,
+    old_widget_ids: oldWidgetIds.length > 0 ? oldWidgetIds : null
+  }
+}
+
+function replaceWithMapping(
+  node: LGraphNode,
+  newNode: LGraphNode,
+  replacement: NodeReplacement,
+  nodeGraph: LGraph,
+  idx: number
+): void {
+  newNode.id = node.id
+  newNode.pos = [...node.pos]
+  newNode.size = [...node.size]
+  newNode.order = node.order
+  newNode.mode = node.mode
+  if (node.flags) newNode.flags = { ...node.flags }
+
+  nodeGraph._nodes[idx] = newNode
+  newNode.graph = nodeGraph
+  nodeGraph._nodes_by_id[newNode.id] = newNode
+
+  const serialized = node.last_serialization ?? node.serialize()
+
+  if (serialized.title != null) newNode.title = serialized.title
+  if (serialized.properties) {
+    newNode.properties = { ...serialized.properties }
+    if ('Node name for S&R' in newNode.properties) {
+      newNode.properties['Node name for S&R'] = replacement.new_node_id
+    }
+  }
+
+  if (replacement.input_mapping) {
+    for (const inputMap of replacement.input_mapping) {
+      if ('old_id' in inputMap) {
+        if (isDotNotation(inputMap.new_id)) continue // Autogrow/DynamicCombo
+        transferInputConnection(
+          node,
+          inputMap.old_id,
+          newNode,
+          inputMap.new_id,
+          nodeGraph
+        )
+        transferWidgetValue(
+          serialized,
+          replacement.old_widget_ids,
+          inputMap.old_id,
+          newNode,
+          inputMap.new_id
+        )
+      } else {
+        if (!isDotNotation(inputMap.new_id)) {
+          applySetValue(newNode, inputMap.new_id, inputMap.set_value)
+        }
+      }
+    }
+  }
+
+  if (replacement.output_mapping) {
+    for (const outMap of replacement.output_mapping) {
+      transferOutputConnections(
+        node,
+        outMap.old_idx,
+        newNode,
+        outMap.new_idx,
+        nodeGraph
+      )
+    }
+  }
+
+  newNode.has_errors = false
+}
+
+export function useNodeReplacement() {
+  const toastStore = useToastStore()
+
+  function replaceNodesInPlace(selectedTypes: MissingNodeType[]): string[] {
+    const replacedTypes: string[] = []
+    const graph = app.rootGraph
+
+    const changeTracker =
+      useWorkflowStore().activeWorkflow?.changeTracker ?? null
+    changeTracker?.beforeChange()
+
+    // Target types come from node_replacements fetched at workflow load time
+    // and the missing nodes detected at that point — not from the current
+    // registered_node_types. This ensures replacement still works even if
+    // the user has since installed the missing node pack.
+    // Also include sanitized variants so that when the fallback path reads
+    // n.type (which app.ts may have already run through sanitizeNodeName),
+    // we can still match against the original type stored in selectedTypes.
+    const targetTypes = new Set([
+      ...selectedTypes.map((t) => (typeof t === 'string' ? t : t.type)),
+      ...selectedTypes.map((t) =>
+        sanitizeNodeName(typeof t === 'string' ? t : t.type)
+      )
+    ])
+
+    try {
+      const placeholders = collectAllNodes(graph, (n) => {
+        if (!n.last_serialization) return false
+        // Prefer the original serialized type; fall back to the live type
+        // for nodes whose serialization predates the type field.
+        // n.type may have been sanitized by app.ts (HTML special chars stripped);
+        // the sanitized variants in targetTypes ensure we still match correctly.
+        const originalType = n.last_serialization.type ?? n.type
+        return !!originalType && targetTypes.has(originalType)
+      })
+
+      for (const node of placeholders) {
+        const match = findMatchingType(node, selectedTypes)
+        if (!match?.replacement) continue
+
+        const replacement = match.replacement
+        const nodeGraph = node.graph
+        if (!nodeGraph) continue
+
+        const idx = nodeGraph._nodes.indexOf(node)
+        if (idx === -1) continue
+
+        const newNode = LiteGraph.createNode(replacement.new_node_id)
+        if (!newNode) continue
+
+        const hasMapping =
+          replacement.input_mapping != null ||
+          replacement.output_mapping != null
+
+        const effectiveReplacement = hasMapping
+          ? replacement
+          : {
+              ...replacement,
+              ...generateDefaultMapping(
+                node.last_serialization ?? node.serialize(),
+                newNode
+              )
+            }
+        replaceWithMapping(node, newNode, effectiveReplacement, nodeGraph, idx)
+
+        // Refresh Vue node data — replaceWithMapping bypasses graph.add()
+        // so onNodeAdded must be called explicitly to update VueNodeData.
+        nodeGraph.onNodeAdded?.(newNode)
+
+        if (!replacedTypes.includes(match.type)) {
+          replacedTypes.push(match.type)
+        }
+      }
+
+      if (replacedTypes.length > 0) {
+        graph.updateExecutionOrder()
+        graph.setDirtyCanvas(true, true)
+
+        toastStore.add({
+          severity: 'success',
+          summary: t('g.success'),
+          detail: t('nodeReplacement.replacedAllNodes', {
+            count: replacedTypes.length
+          }),
+          life: 3000
+        })
+      }
+    } catch (error) {
+      console.error('Failed to replace nodes:', error)
+      if (replacedTypes.length > 0) {
+        graph.updateExecutionOrder()
+        graph.setDirtyCanvas(true, true)
+      }
+      toastStore.add({
+        severity: 'error',
+        summary: t('g.error', 'Error'),
+        detail: t('nodeReplacement.replaceFailed', 'Failed to replace nodes'),
+        life: 5000
+      })
+      return replacedTypes
+    } finally {
+      changeTracker?.afterChange()
+    }
+
+    return replacedTypes
+  }
+
+  /**
+   * Replaces all nodes in a single swap group and removes successfully
+   * replaced types from the execution error store.
+   */
+  function replaceGroup(group: ReplacementGroup): void {
+    const replaced = replaceNodesInPlace(group.nodeTypes)
+    if (replaced.length > 0) {
+      useExecutionErrorStore().removeMissingNodesByType(replaced)
+    }
+  }
+
+  /**
+   * Replaces every available node across all swap groups and removes
+   * the succeeded types from the execution error store.
+   */
+  function replaceAllGroups(groups: ReplacementGroup[]): void {
+    const allNodeTypes = groups.flatMap((g) => g.nodeTypes)
+    const replaced = replaceNodesInPlace(allNodeTypes)
+    if (replaced.length > 0) {
+      useExecutionErrorStore().removeMissingNodesByType(replaced)
+    }
+  }
+
+  return {
+    replaceNodesInPlace,
+    replaceGroup,
+    replaceAllGroups
+  }
+}
diff --git a/src/platform/remote/comfyui/history/adapters/v2ToV1Adapter.ts b/src/platform/remote/comfyui/history/adapters/v2ToV1Adapter.ts
deleted file mode 100644
index fcb46eda7d..0000000000
--- a/src/platform/remote/comfyui/history/adapters/v2ToV1Adapter.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * @fileoverview Adapter to convert V2 history format to V1 format
- * @module platform/remote/comfyui/history/adapters/v2ToV1Adapter
- */
-import type { HistoryTaskItem, TaskPrompt } from '../types/historyV1Types'
-import type {
-  HistoryResponseV2,
-  RawHistoryItemV2,
-  TaskOutput,
-  TaskPromptV2
-} from '../types/historyV2Types'
-
-function mapPromptV2toV1(
-  promptV2: TaskPromptV2,
-  outputs: TaskOutput,
-  syntheticPriority: number,
-  createTime?: number
-): TaskPrompt {
-  const extraData = {
-    ...(promptV2.extra_data ?? {}),
-    ...(typeof createTime === 'number' ? { create_time: createTime } : {})
-  }
-  return [
-    syntheticPriority,
-    promptV2.prompt_id,
-    {},
-    extraData,
-    Object.keys(outputs)
-  ]
-}
-
-function getExecutionSuccessTimestamp(item: RawHistoryItemV2): number {
-  return (
-    item.status?.messages?.find((m) => m[0] === 'execution_success')?.[1]
-      ?.timestamp ?? 0
-  )
-}
-
-export function mapHistoryV2toHistory(
-  historyV2Response: HistoryResponseV2
-): HistoryTaskItem[] {
-  const { history } = historyV2Response
-
-  // Sort by execution_success timestamp, descending (newest first)
-  history.sort((a, b) => {
-    return getExecutionSuccessTimestamp(b) - getExecutionSuccessTimestamp(a)
-  })
-
-  // Count items with valid timestamps for synthetic priority calculation
-  const countWithTimestamps = history.filter(
-    (item) => getExecutionSuccessTimestamp(item) > 0
-  ).length
-
-  return history.map((item, index): HistoryTaskItem => {
-    const { prompt, outputs, status, meta } = item
-    const timestamp = getExecutionSuccessTimestamp(item)
-
-    // Items with timestamps get priority based on sorted position (highest first)
-    const syntheticPriority = timestamp > 0 ? countWithTimestamps - index : 0
-
-    return {
-      taskType: 'History' as const,
-      prompt: mapPromptV2toV1(
-        prompt,
-        outputs,
-        syntheticPriority,
-        item.create_time
-      ),
-      status,
-      outputs,
-      meta
-    }
-  })
-}
diff --git a/src/platform/remote/comfyui/history/fetchers/fetchHistoryV1.ts b/src/platform/remote/comfyui/history/fetchers/fetchHistoryV1.ts
deleted file mode 100644
index 6d566d035b..0000000000
--- a/src/platform/remote/comfyui/history/fetchers/fetchHistoryV1.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * @fileoverview V1 History Fetcher - Desktop/localhost API
- * @module platform/remote/comfyui/history/fetchers/fetchHistoryV1
- *
- * Fetches history directly from V1 API endpoint.
- * Used by desktop and localhost distributions.
- */
-
-import type {
-  HistoryTaskItem,
-  HistoryV1Response
-} from '../types/historyV1Types'
-
-/**
- * Fetches history from V1 API endpoint
- * @param api - API instance with fetchApi method
- * @param maxItems - Maximum number of history items to fetch
- * @param offset - Offset for pagination (must be non-negative integer)
- * @returns Promise resolving to V1 history response
- * @throws Error if offset is invalid (negative or non-integer)
- */
-export async function fetchHistoryV1(
-  fetchApi: (url: string) => Promise<Response>,
-  maxItems: number = 200,
-  offset?: number
-): Promise<HistoryV1Response> {
-  // Validate offset parameter
-  if (offset !== undefined && (offset < 0 || !Number.isInteger(offset))) {
-    throw new Error(
-      `Invalid offset parameter: ${offset}. Must be a non-negative integer.`
-    )
-  }
-
-  const params = new URLSearchParams({ max_items: maxItems.toString() })
-  if (offset !== undefined) {
-    params.set('offset', offset.toString())
-  }
-  const url = `/history?${params.toString()}`
-  const res = await fetchApi(url)
-  const json: Record<
-    string,
-    Omit<HistoryTaskItem, 'taskType'>
-  > = await res.json()
-
-  return {
-    History: Object.values(json).map((item) => ({
-      ...item,
-      taskType: 'History'
-    }))
-  }
-}
diff --git a/src/platform/remote/comfyui/history/fetchers/fetchHistoryV2.ts b/src/platform/remote/comfyui/history/fetchers/fetchHistoryV2.ts
deleted file mode 100644
index dfe86ece1d..0000000000
--- a/src/platform/remote/comfyui/history/fetchers/fetchHistoryV2.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * @fileoverview V2 History Fetcher - Cloud API with adapter
- * @module platform/remote/comfyui/history/fetchers/fetchHistoryV2
- *
- * Fetches history from V2 API endpoint and converts to V1 format.
- * Used exclusively by cloud distribution.
- */
-
-import { mapHistoryV2toHistory } from '../adapters/v2ToV1Adapter'
-import type { HistoryV1Response } from '../types/historyV1Types'
-import type { HistoryResponseV2 } from '../types/historyV2Types'
-
-/**
- * Fetches history from V2 API endpoint and adapts to V1 format
- * @param fetchApi - API instance with fetchApi method
- * @param maxItems - Maximum number of history items to fetch
- * @param offset - Offset for pagination (must be non-negative integer)
- * @returns Promise resolving to V1 history response (adapted from V2)
- * @throws Error if offset is invalid (negative or non-integer)
- */
-export async function fetchHistoryV2(
-  fetchApi: (url: string) => Promise<Response>,
-  maxItems: number = 200,
-  offset?: number
-): Promise<HistoryV1Response> {
-  // Validate offset parameter
-  if (offset !== undefined && (offset < 0 || !Number.isInteger(offset))) {
-    throw new Error(
-      `Invalid offset parameter: ${offset}. Must be a non-negative integer.`
-    )
-  }
-
-  const params = new URLSearchParams({ max_items: maxItems.toString() })
-  if (offset !== undefined) {
-    params.set('offset', offset.toString())
-  }
-  const url = `/history_v2?${params.toString()}`
-  const res = await fetchApi(url)
-  const rawData: HistoryResponseV2 = await res.json()
-  const adaptedHistory = mapHistoryV2toHistory(rawData)
-  return { History: adaptedHistory }
-}
diff --git a/src/platform/remote/comfyui/history/index.ts b/src/platform/remote/comfyui/history/index.ts
deleted file mode 100644
index fc96225e49..0000000000
--- a/src/platform/remote/comfyui/history/index.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * @fileoverview History API module - Distribution-aware exports
- * @module platform/remote/comfyui/history
- *
- * This module provides a unified history fetching interface that automatically
- * uses the correct implementation based on build-time distribution constant.
- *
- * - Cloud builds: Uses V2 API with adapter (tree-shakes V1 fetcher)
- * - Desktop/localhost builds: Uses V1 API directly (tree-shakes V2 fetcher + adapter)
- *
- * The rest of the application only needs to import from this module and use
- * V1 types - all distribution-specific details are encapsulated here.
- */
-
-import { isCloud } from '@/platform/distribution/types'
-import { fetchHistoryV1 } from './fetchers/fetchHistoryV1'
-import { fetchHistoryV2 } from './fetchers/fetchHistoryV2'
-
-/**
- * Fetches history using the appropriate API for the current distribution.
- * Build-time constant enables dead code elimination - only one implementation
- * will be included in the final bundle.
- */
-export const fetchHistory = isCloud ? fetchHistoryV2 : fetchHistoryV1
-
-/**
- * Export only V1 types publicly - consumers don't need to know about V2
- */
-export type * from './types'
diff --git a/src/platform/remote/comfyui/history/reconciliation.ts b/src/platform/remote/comfyui/history/reconciliation.ts
deleted file mode 100644
index aaf445775d..0000000000
--- a/src/platform/remote/comfyui/history/reconciliation.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
- * @fileoverview History reconciliation for V1 and V2 APIs
- * @module platform/remote/comfyui/history/reconciliation
- *
- * Returns list of items that should be displayed, sorted by queueIndex (newest first).
- * Caller is responsible for mapping to their own class instances.
- *
- * V1: QueueIndex-based filtering for stable monotonic indices
- * V2: PromptId-based merging for synthetic priorities (V2 assigns synthetic
- *     priorities after timestamp sorting, so new items may have lower priority
- *     than existing items)
- */
-import { isCloud } from '@/platform/distribution/types'
-import type { TaskItem } from '@/schemas/apiSchema'
-
-/**
- * V1 reconciliation: QueueIndex-based filtering works because V1 has stable,
- * monotonically increasing queue indices.
- *
- * Sort order: Sorts serverHistory by queueIndex descending (newest first) to ensure
- * consistent ordering. JavaScript .filter() maintains iteration order, so filtered
- * results remain sorted. clientHistory is assumed already sorted from previous update.
- *
- * @returns All items to display, sorted by queueIndex descending (newest first)
- */
-function reconcileHistoryV1(
-  serverHistory: TaskItem[],
-  clientHistory: TaskItem[],
-  maxItems: number,
-  lastKnownQueueIndex: number | undefined
-): TaskItem[] {
-  const sortedServerHistory = serverHistory.sort(
-    (a, b) => b.prompt[0] - a.prompt[0]
-  )
-
-  const serverPromptIds = new Set(
-    sortedServerHistory.map((item) => item.prompt[1])
-  )
-
-  // If undefined, treat as initial sync (all items are new)
-  const itemsAddedSinceLastSync =
-    lastKnownQueueIndex === undefined
-      ? sortedServerHistory
-      : sortedServerHistory.filter(
-          (item) => item.prompt[0] > lastKnownQueueIndex
-        )
-
-  const clientItemsStillOnServer = clientHistory.filter((item) =>
-    serverPromptIds.has(item.prompt[1])
-  )
-
-  // Merge new and reused items, sort by queueIndex descending, limit to maxItems
-  return [...itemsAddedSinceLastSync, ...clientItemsStillOnServer]
-    .sort((a, b) => b.prompt[0] - a.prompt[0])
-    .slice(0, maxItems)
-}
-
-/**
- * V2 reconciliation: PromptId-based merging because V2 assigns synthetic
- * priorities after sorting by timestamp.
- *
- * Sort order: Sorts serverHistory by queueIndex descending (newest first) to ensure
- * consistent ordering. JavaScript .filter() maintains iteration order, so filtered
- * results remain sorted. clientHistory is assumed already sorted from previous update.
- *
- * @returns All items to display, sorted by queueIndex descending (newest first)
- */
-function reconcileHistoryV2(
-  serverHistory: TaskItem[],
-  clientHistory: TaskItem[],
-  maxItems: number
-): TaskItem[] {
-  const sortedServerHistory = serverHistory.sort(
-    (a, b) => b.prompt[0] - a.prompt[0]
-  )
-
-  const serverPromptIds = new Set(
-    sortedServerHistory.map((item) => item.prompt[1])
-  )
-  const clientPromptIds = new Set(clientHistory.map((item) => item.prompt[1]))
-
-  const newItems = sortedServerHistory.filter(
-    (item) => !clientPromptIds.has(item.prompt[1])
-  )
-
-  const clientItemsStillOnServer = clientHistory.filter((item) =>
-    serverPromptIds.has(item.prompt[1])
-  )
-
-  // Merge new and reused items, sort by queueIndex descending, limit to maxItems
-  return [...newItems, ...clientItemsStillOnServer]
-    .sort((a, b) => b.prompt[0] - a.prompt[0])
-    .slice(0, maxItems)
-}
-
-/**
- * Reconciles server history with client history.
- * Automatically uses V1 (queueIndex-based) or V2 (promptId-based) algorithm based on
- * distribution type.
- *
- * @param serverHistory - Server's current history items
- * @param clientHistory - Client's existing history items
- * @param maxItems - Maximum number of items to return
- * @param lastKnownQueueIndex - Last queue index seen (V1 only, optional for V2)
- * @returns All items that should be displayed, sorted by queueIndex descending
- */
-export function reconcileHistory(
-  serverHistory: TaskItem[],
-  clientHistory: TaskItem[],
-  maxItems: number,
-  lastKnownQueueIndex?: number
-): TaskItem[] {
-  if (isCloud) {
-    return reconcileHistoryV2(serverHistory, clientHistory, maxItems)
-  }
-  return reconcileHistoryV1(
-    serverHistory,
-    clientHistory,
-    maxItems,
-    lastKnownQueueIndex
-  )
-}
diff --git a/src/platform/remote/comfyui/history/types/historyV1Types.ts b/src/platform/remote/comfyui/history/types/historyV1Types.ts
deleted file mode 100644
index f7bff7a848..0000000000
--- a/src/platform/remote/comfyui/history/types/historyV1Types.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * @fileoverview History V1 types - Public interface used throughout the app
- * @module platform/remote/comfyui/history/types/historyV1Types
- *
- * These types represent the V1 history format that the application expects.
- * Both desktop (direct V1 API) and cloud (V2 API + adapter) return data in this format.
- */
-
-import type { HistoryTaskItem, TaskPrompt } from '@/schemas/apiSchema'
-
-export interface HistoryV1Response {
-  History: HistoryTaskItem[]
-}
-
-export type { HistoryTaskItem, TaskPrompt }
diff --git a/src/platform/remote/comfyui/history/types/historyV2Types.ts b/src/platform/remote/comfyui/history/types/historyV2Types.ts
deleted file mode 100644
index 08580edb9d..0000000000
--- a/src/platform/remote/comfyui/history/types/historyV2Types.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * @fileoverview History V2 types and schemas - Internal cloud API format
- * @module platform/remote/comfyui/history/types/historyV2Types
- *
- * These types and schemas represent the V2 history format returned by the cloud API.
- * They are only used internally and are converted to V1 format via adapter.
- *
- * IMPORTANT: These types should NOT be used outside this history module.
- */
-
-import { z } from 'zod'
-
-import {
-  zExtraData,
-  zPromptId,
-  zQueueIndex,
-  zStatus,
-  zTaskMeta,
-  zTaskOutput
-} from '@/schemas/apiSchema'
-
-const zTaskPromptV2 = z.object({
-  priority: zQueueIndex,
-  prompt_id: zPromptId,
-  extra_data: zExtraData
-})
-
-const zRawHistoryItemV2 = z.object({
-  prompt_id: zPromptId,
-  prompt: zTaskPromptV2,
-  status: zStatus.optional(),
-  outputs: zTaskOutput,
-  meta: zTaskMeta.optional(),
-  create_time: z.number().int().optional()
-})
-
-const zHistoryResponseV2 = z.object({
-  history: z.array(zRawHistoryItemV2)
-})
-
-export type TaskPromptV2 = z.infer<typeof zTaskPromptV2>
-export type RawHistoryItemV2 = z.infer<typeof zRawHistoryItemV2>
-export type HistoryResponseV2 = z.infer<typeof zHistoryResponseV2>
-export type TaskOutput = z.infer<typeof zTaskOutput>
-
-export { zRawHistoryItemV2 }
diff --git a/src/platform/remote/comfyui/history/types/index.ts b/src/platform/remote/comfyui/history/types/index.ts
deleted file mode 100644
index d49f66ffed..0000000000
--- a/src/platform/remote/comfyui/history/types/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * @fileoverview Public history types export
- * @module platform/remote/comfyui/history/types
- *
- * Only V1 types are exported publicly - the rest of the app
- * should never need to know about V2 types or implementation details.
- */
-
-export type * from './historyV1Types'
diff --git a/tests-ui/tests/platform/remote/comfyui/jobs/fetchJobs.test.ts b/src/platform/remote/comfyui/jobs/fetchJobs.test.ts
similarity index 83%
rename from tests-ui/tests/platform/remote/comfyui/jobs/fetchJobs.test.ts
rename to src/platform/remote/comfyui/jobs/fetchJobs.test.ts
index f3b2ad5a82..ec32cb3b38 100644
--- a/tests-ui/tests/platform/remote/comfyui/jobs/fetchJobs.test.ts
+++ b/src/platform/remote/comfyui/jobs/fetchJobs.test.ts
@@ -16,17 +16,13 @@ type JobsListResponse = z.infer<typeof zJobsListResponse>
 
 function createMockJob(
   id: string,
-  status: 'pending' | 'in_progress' | 'completed' = 'completed',
+  status: 'pending' | 'in_progress' | 'completed' | 'failed' = 'completed',
   overrides: Partial<RawJobListItem> = {}
 ): RawJobListItem {
   return {
     id,
     status,
     create_time: Date.now(),
-    execution_start_time: null,
-    execution_end_time: null,
-    preview_output: null,
-    outputs_count: 0,
     ...overrides
   }
 }
@@ -63,7 +59,7 @@ describe('fetchJobs', () => {
       const result = await fetchHistory(mockFetch)
 
       expect(mockFetch).toHaveBeenCalledWith(
-        '/jobs?status=completed&limit=200&offset=0'
+        '/jobs?status=completed,failed,cancelled&limit=200&offset=0'
       )
       expect(result).toHaveLength(2)
       expect(result[0].id).toBe('job1')
@@ -113,7 +109,7 @@ describe('fetchJobs', () => {
       const result = await fetchHistory(mockFetch, 200, 5)
 
       expect(mockFetch).toHaveBeenCalledWith(
-        '/jobs?status=completed&limit=200&offset=5'
+        '/jobs?status=completed,failed,cancelled&limit=200&offset=5'
       )
       // Priority base is total - offset = 10 - 5 = 5
       expect(result[0].priority).toBe(5) // (total - offset) - 0
@@ -257,35 +253,66 @@ describe('fetchJobs', () => {
   })
 
   describe('extractWorkflow', () => {
-    it('extracts workflow from nested structure', () => {
+    const validWorkflow = {
+      version: 0.4,
+      last_node_id: 1,
+      last_link_id: 0,
+      nodes: [],
+      links: []
+    }
+
+    it('extracts and validates workflow from nested structure', async () => {
       const jobDetail = {
         ...createMockJob('job1', 'completed'),
         workflow: {
           extra_data: {
             extra_pnginfo: {
-              workflow: { nodes: [], links: [] }
+              workflow: validWorkflow
             }
           }
         }
       }
 
-      const workflow = extractWorkflow(jobDetail)
+      const workflow = await extractWorkflow(jobDetail)
 
-      expect(workflow).toEqual({ nodes: [], links: [] })
+      expect(workflow).toEqual(validWorkflow)
     })
 
-    it('returns undefined if workflow not present', () => {
+    it('returns undefined if workflow not present', async () => {
       const jobDetail = createMockJob('job1', 'completed')
 
-      const workflow = extractWorkflow(jobDetail)
+      const workflow = await extractWorkflow(jobDetail)
 
       expect(workflow).toBeUndefined()
     })
 
-    it('returns undefined for undefined input', () => {
-      const workflow = extractWorkflow(undefined)
+    it('returns undefined for undefined input', async () => {
+      const workflow = await extractWorkflow(undefined)
 
       expect(workflow).toBeUndefined()
     })
+
+    it('returns undefined for invalid workflow and logs warning', async () => {
+      const consoleSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
+      const jobDetail = {
+        ...createMockJob('job1', 'completed'),
+        workflow: {
+          extra_data: {
+            extra_pnginfo: {
+              workflow: { invalid: 'data' }
+            }
+          }
+        }
+      }
+
+      const workflow = await extractWorkflow(jobDetail)
+
+      expect(workflow).toBeUndefined()
+      expect(consoleSpy).toHaveBeenCalledWith(
+        '[extractWorkflow] Workflow validation failed:',
+        expect.any(String)
+      )
+      consoleSpy.mockRestore()
+    })
   })
 })
diff --git a/src/platform/remote/comfyui/jobs/fetchJobs.ts b/src/platform/remote/comfyui/jobs/fetchJobs.ts
index 136f683d65..6eee0e959c 100644
--- a/src/platform/remote/comfyui/jobs/fetchJobs.ts
+++ b/src/platform/remote/comfyui/jobs/fetchJobs.ts
@@ -6,7 +6,9 @@
  * All distributions use the /jobs endpoint.
  */
 
-import type { PromptId } from '@/schemas/apiSchema'
+import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
+import { validateComfyWorkflow } from '@/platform/workflow/validation/schemas/workflowSchema'
+import type { JobId } from '@/schemas/apiSchema'
 
 import type {
   JobDetail,
@@ -66,7 +68,7 @@ function assignPriority(
 }
 
 /**
- * Fetches history (completed jobs)
+ * Fetches history (terminal state jobs: completed, failed, cancelled)
  * Assigns synthetic priority starting from total (lower than queue jobs).
  */
 export async function fetchHistory(
@@ -76,7 +78,7 @@ export async function fetchHistory(
 ): Promise<JobListItem[]> {
   const { jobs, total } = await fetchJobsRaw(
     fetchApi,
-    ['completed'],
+    ['completed', 'failed', 'cancelled'],
     maxItems,
     offset
   )
@@ -117,30 +119,43 @@ export async function fetchQueue(
  */
 export async function fetchJobDetail(
   fetchApi: (url: string) => Promise<Response>,
-  promptId: PromptId
+  jobId: JobId
 ): Promise<JobDetail | undefined> {
   try {
-    const res = await fetchApi(`/jobs/${encodeURIComponent(promptId)}`)
+    const res = await fetchApi(`/jobs/${encodeURIComponent(jobId)}`)
 
     if (!res.ok) {
-      console.warn(`Job not found for prompt ${promptId}`)
+      console.warn(`Job not found for job ${jobId}`)
       return undefined
     }
 
     return zJobDetail.parse(await res.json())
   } catch (error) {
-    console.error(`Failed to fetch job detail for prompt ${promptId}:`, error)
+    console.error(`Failed to fetch job detail for job ${jobId}:`, error)
     return undefined
   }
 }
 
 /**
- * Extracts workflow from job detail response.
+ * Extracts and validates workflow from job detail response.
  * The workflow is nested at: workflow.extra_data.extra_pnginfo.workflow
- * Full workflow validation happens downstream via validateComfyWorkflow.
+ *
+ * Uses Zod validation via validateComfyWorkflow to ensure the workflow
+ * conforms to the expected schema. Logs validation failures for debugging
+ * but still returns undefined to allow graceful degradation.
  */
-export function extractWorkflow(job: JobDetail | undefined): unknown {
+export async function extractWorkflow(
+  job: JobDetail | undefined
+): Promise<ComfyWorkflowJSON | undefined> {
   const parsed = zWorkflowContainer.safeParse(job?.workflow)
   if (!parsed.success) return undefined
-  return parsed.data.extra_data?.extra_pnginfo?.workflow
+
+  const rawWorkflow = parsed.data.extra_data?.extra_pnginfo?.workflow
+  if (!rawWorkflow) return undefined
+
+  const validated = await validateComfyWorkflow(rawWorkflow, (error) => {
+    console.warn('[extractWorkflow] Workflow validation failed:', error)
+  })
+
+  return validated ?? undefined
 }
diff --git a/src/platform/remote/comfyui/jobs/jobTypes.ts b/src/platform/remote/comfyui/jobs/jobTypes.ts
index 8553483095..48e2bfbc46 100644
--- a/src/platform/remote/comfyui/jobs/jobTypes.ts
+++ b/src/platform/remote/comfyui/jobs/jobTypes.ts
@@ -21,12 +21,15 @@ const zJobStatus = z.enum([
 const zPreviewOutput = z.object({
   filename: z.string(),
   subfolder: z.string(),
-  type: resultItemType
+  type: resultItemType,
+  nodeId: z.string(),
+  mediaType: z.string()
 })
 
 /**
- * Execution error details for error jobs.
- * Contains the same structure as ExecutionErrorWsMessage from WebSocket.
+ * Execution error from Jobs API.
+ * Similar to ExecutionErrorWsMessage but with optional prompt_id/timestamp/executed
+ * since these may not be present in stored errors or infrastructure-generated errors.
  */
 const zExecutionError = z
   .object({
@@ -43,6 +46,8 @@ const zExecutionError = z
   })
   .passthrough()
 
+export type ExecutionError = z.infer<typeof zExecutionError>
+
 /**
  * Raw job from API - uses passthrough to allow extra fields
  */
@@ -105,3 +110,9 @@ export type RawJobListItem = z.infer<typeof zRawJobListItem>
 /** Job list item with priority always set (server-provided or synthetic) */
 export type JobListItem = RawJobListItem & { priority: number }
 export type JobDetail = z.infer<typeof zJobDetail>
+
+/** Task type used in the API (queue vs history endpoints) */
+export type APITaskType = 'queue' | 'history'
+
+/** Internal task type derived from job status for UI display */
+export type TaskType = 'Running' | 'Pending' | 'History'
diff --git a/src/platform/remote/comfyui/useQueuePolling.test.ts b/src/platform/remote/comfyui/useQueuePolling.test.ts
new file mode 100644
index 0000000000..c27c8f9565
--- /dev/null
+++ b/src/platform/remote/comfyui/useQueuePolling.test.ts
@@ -0,0 +1,173 @@
+import { mount } from '@vue/test-utils'
+import type { VueWrapper } from '@vue/test-utils'
+import { nextTick, reactive } from 'vue'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { useQueuePolling } from '@/platform/remote/comfyui/useQueuePolling'
+
+vi.mock('@/stores/queueStore', () => {
+  const state = reactive({
+    activeJobsCount: 0,
+    isLoading: false,
+    update: vi.fn()
+  })
+
+  return {
+    useQueueStore: () => state
+  }
+})
+
+// Re-import to get the mock instance for assertions
+import { useQueueStore } from '@/stores/queueStore'
+
+function mountUseQueuePolling() {
+  return mount({
+    template: '<div />',
+    setup() {
+      useQueuePolling()
+      return {}
+    }
+  })
+}
+
+describe('useQueuePolling', () => {
+  let wrapper: VueWrapper
+  const store = useQueueStore() as Partial<
+    ReturnType<typeof useQueueStore>
+  > as {
+    activeJobsCount: number
+    isLoading: boolean
+    update: ReturnType<typeof vi.fn>
+  }
+
+  beforeEach(() => {
+    vi.useFakeTimers()
+    store.activeJobsCount = 0
+    store.isLoading = false
+    store.update.mockReset()
+  })
+
+  afterEach(() => {
+    wrapper?.unmount()
+    vi.useRealTimers()
+  })
+
+  it('does not call update on creation', () => {
+    wrapper = mountUseQueuePolling()
+    expect(store.update).not.toHaveBeenCalled()
+  })
+
+  it('polls when activeJobsCount is exactly 1', async () => {
+    wrapper = mountUseQueuePolling()
+
+    store.activeJobsCount = 1
+    await vi.advanceTimersByTimeAsync(8_000)
+
+    expect(store.update).toHaveBeenCalledOnce()
+  })
+
+  it('does not poll when activeJobsCount > 1', async () => {
+    wrapper = mountUseQueuePolling()
+
+    store.activeJobsCount = 2
+    await vi.advanceTimersByTimeAsync(16_000)
+
+    expect(store.update).not.toHaveBeenCalled()
+  })
+
+  it('stops polling when activeJobsCount drops to 0', async () => {
+    store.activeJobsCount = 1
+    wrapper = mountUseQueuePolling()
+
+    store.activeJobsCount = 0
+    await vi.advanceTimersByTimeAsync(16_000)
+
+    expect(store.update).not.toHaveBeenCalled()
+  })
+
+  it('resets timer when loading completes', async () => {
+    store.activeJobsCount = 1
+    wrapper = mountUseQueuePolling()
+
+    // Advance 5s toward the 8s timeout
+    await vi.advanceTimersByTimeAsync(5_000)
+    expect(store.update).not.toHaveBeenCalled()
+
+    // Simulate an external update (e.g. WebSocket-triggered) completing
+    store.isLoading = true
+    await nextTick()
+    store.isLoading = false
+    await nextTick()
+
+    // Timer should now be reset — should not fire 3s later (original 8s mark)
+    await vi.advanceTimersByTimeAsync(3_000)
+    expect(store.update).not.toHaveBeenCalled()
+
+    // Should fire 8s after the reset (5s more)
+    await vi.advanceTimersByTimeAsync(5_000)
+    expect(store.update).toHaveBeenCalledOnce()
+  })
+
+  it('applies exponential backoff on successive polls', async () => {
+    store.activeJobsCount = 1
+    wrapper = mountUseQueuePolling()
+
+    // First poll at 8s
+    await vi.advanceTimersByTimeAsync(8_000)
+    expect(store.update).toHaveBeenCalledTimes(1)
+
+    // Simulate update completing to reschedule
+    store.isLoading = true
+    await nextTick()
+    store.isLoading = false
+    await nextTick()
+
+    // Second poll at 12s (8 * 1.5)
+    await vi.advanceTimersByTimeAsync(11_000)
+    expect(store.update).toHaveBeenCalledTimes(1)
+    await vi.advanceTimersByTimeAsync(1_000)
+    expect(store.update).toHaveBeenCalledTimes(2)
+  })
+
+  it('skips poll when an update is already in-flight', async () => {
+    store.activeJobsCount = 1
+    wrapper = mountUseQueuePolling()
+
+    // Simulate an external update starting before the timer fires
+    store.isLoading = true
+
+    await vi.advanceTimersByTimeAsync(8_000)
+    expect(store.update).not.toHaveBeenCalled()
+
+    // Once the in-flight update completes, polling resumes
+    store.isLoading = false
+
+    await vi.advanceTimersByTimeAsync(8_000)
+    expect(store.update).toHaveBeenCalledOnce()
+  })
+
+  it('resets backoff when activeJobsCount changes', async () => {
+    store.activeJobsCount = 1
+    wrapper = mountUseQueuePolling()
+
+    // First poll at 8s (backs off delay to 12s)
+    await vi.advanceTimersByTimeAsync(8_000)
+    expect(store.update).toHaveBeenCalledTimes(1)
+
+    // Simulate update completing
+    store.isLoading = true
+    await nextTick()
+    store.isLoading = false
+    await nextTick()
+
+    // Count changes — backoff should reset to 8s
+    store.activeJobsCount = 0
+    await nextTick()
+    store.activeJobsCount = 1
+    await nextTick()
+
+    store.update.mockClear()
+    await vi.advanceTimersByTimeAsync(8_000)
+    expect(store.update).toHaveBeenCalledOnce()
+  })
+})
diff --git a/src/platform/remote/comfyui/useQueuePolling.ts b/src/platform/remote/comfyui/useQueuePolling.ts
new file mode 100644
index 0000000000..c66c14a25a
--- /dev/null
+++ b/src/platform/remote/comfyui/useQueuePolling.ts
@@ -0,0 +1,47 @@
+import { useTimeoutFn } from '@vueuse/core'
+import { ref, watch } from 'vue'
+
+import { useQueueStore } from '@/stores/queueStore'
+
+const BASE_INTERVAL_MS = 8_000
+const MAX_INTERVAL_MS = 32_000
+const BACKOFF_MULTIPLIER = 1.5
+
+export function useQueuePolling() {
+  const queueStore = useQueueStore()
+  const delay = ref(BASE_INTERVAL_MS)
+
+  const { start, stop } = useTimeoutFn(
+    () => {
+      if (queueStore.activeJobsCount !== 1 || queueStore.isLoading) return
+      delay.value = Math.min(delay.value * BACKOFF_MULTIPLIER, MAX_INTERVAL_MS)
+      void queueStore.update()
+    },
+    delay,
+    { immediate: false }
+  )
+
+  function scheduleNextPoll() {
+    if (queueStore.activeJobsCount === 1 && !queueStore.isLoading) start()
+    else stop()
+  }
+
+  watch(
+    () => queueStore.activeJobsCount,
+    () => {
+      delay.value = BASE_INTERVAL_MS
+      scheduleNextPoll()
+    },
+    { immediate: true }
+  )
+
+  // Reschedule after any update completes (whether from polling or
+  // WebSocket events) to avoid redundant requests.
+  watch(
+    () => queueStore.isLoading,
+    (loading, wasLoading) => {
+      if (wasLoading && !loading) scheduleNextPoll()
+    },
+    { flush: 'sync' }
+  )
+}
diff --git a/src/platform/remoteConfig/refreshRemoteConfig.test.ts b/src/platform/remoteConfig/refreshRemoteConfig.test.ts
new file mode 100644
index 0000000000..f947b822cb
--- /dev/null
+++ b/src/platform/remoteConfig/refreshRemoteConfig.test.ts
@@ -0,0 +1,126 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { api } from '@/scripts/api'
+
+import { refreshRemoteConfig } from './refreshRemoteConfig'
+import { remoteConfig } from './remoteConfig'
+
+vi.mock('@/scripts/api', () => ({
+  api: {
+    fetchApi: vi.fn()
+  }
+}))
+
+vi.stubGlobal('fetch', vi.fn())
+
+describe('refreshRemoteConfig', () => {
+  const mockConfig = { feature1: true, feature2: 'value' }
+
+  function mockSuccessResponse(config = mockConfig) {
+    return {
+      ok: true,
+      json: async () => config
+    } as Response
+  }
+
+  function mockErrorResponse(status: number, statusText: string) {
+    return {
+      ok: false,
+      status,
+      statusText
+    } as Response
+  }
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    remoteConfig.value = {}
+    window.__CONFIG__ = {}
+  })
+
+  describe('with auth (default)', () => {
+    it('uses api.fetchApi when useAuth is true', async () => {
+      vi.mocked(api.fetchApi).mockResolvedValue(mockSuccessResponse())
+
+      await refreshRemoteConfig({ useAuth: true })
+
+      expect(api.fetchApi).toHaveBeenCalledWith('/features', {
+        cache: 'no-store'
+      })
+      expect(global.fetch).not.toHaveBeenCalled()
+      expect(remoteConfig.value).toEqual(mockConfig)
+      expect(window.__CONFIG__).toEqual(mockConfig)
+    })
+
+    it('uses api.fetchApi by default', async () => {
+      vi.mocked(api.fetchApi).mockResolvedValue(mockSuccessResponse())
+
+      await refreshRemoteConfig()
+
+      expect(api.fetchApi).toHaveBeenCalled()
+      expect(global.fetch).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('without auth', () => {
+    it('uses raw fetch when useAuth is false', async () => {
+      vi.mocked(global.fetch).mockResolvedValue(mockSuccessResponse())
+
+      await refreshRemoteConfig({ useAuth: false })
+
+      expect(global.fetch).toHaveBeenCalledWith('/api/features', {
+        cache: 'no-store'
+      })
+      expect(api.fetchApi).not.toHaveBeenCalled()
+      expect(remoteConfig.value).toEqual(mockConfig)
+      expect(window.__CONFIG__).toEqual(mockConfig)
+    })
+  })
+
+  describe('error handling', () => {
+    it('clears config on 401 response', async () => {
+      vi.mocked(api.fetchApi).mockResolvedValue(
+        mockErrorResponse(401, 'Unauthorized')
+      )
+
+      await refreshRemoteConfig()
+
+      expect(remoteConfig.value).toEqual({})
+      expect(window.__CONFIG__).toEqual({})
+    })
+
+    it('clears config on 403 response', async () => {
+      vi.mocked(api.fetchApi).mockResolvedValue(
+        mockErrorResponse(403, 'Forbidden')
+      )
+
+      await refreshRemoteConfig()
+
+      expect(remoteConfig.value).toEqual({})
+      expect(window.__CONFIG__).toEqual({})
+    })
+
+    it('clears config on fetch error', async () => {
+      vi.mocked(api.fetchApi).mockRejectedValue(new Error('Network error'))
+
+      await refreshRemoteConfig()
+
+      expect(remoteConfig.value).toEqual({})
+      expect(window.__CONFIG__).toEqual({})
+    })
+
+    it('preserves config on 500 response', async () => {
+      const existingConfig = { subscription_required: true }
+      remoteConfig.value = existingConfig
+      window.__CONFIG__ = existingConfig
+
+      vi.mocked(api.fetchApi).mockResolvedValue(
+        mockErrorResponse(500, 'Internal Server Error')
+      )
+
+      await refreshRemoteConfig()
+
+      expect(remoteConfig.value).toEqual(existingConfig)
+      expect(window.__CONFIG__).toEqual(existingConfig)
+    })
+  })
+})
diff --git a/src/platform/remoteConfig/refreshRemoteConfig.ts b/src/platform/remoteConfig/refreshRemoteConfig.ts
index 5000f20142..86b4990902 100644
--- a/src/platform/remoteConfig/refreshRemoteConfig.ts
+++ b/src/platform/remoteConfig/refreshRemoteConfig.ts
@@ -1,14 +1,39 @@
 import { api } from '@/scripts/api'
 
-import { remoteConfig } from './remoteConfig'
+import { remoteConfig, remoteConfigState } from './remoteConfig'
+
+interface RefreshRemoteConfigOptions {
+  /**
+   * Whether to use authenticated API (default: true).
+   * Set to false during bootstrap before auth is initialized.
+   */
+  useAuth?: boolean
+}
+
+/**
+ * Loads remote configuration from the backend /features endpoint
+ * and updates the reactive remoteConfig ref.
+ *
+ * Sets remoteConfigState to:
+ * - 'anonymous' when loaded without auth
+ * - 'authenticated' when loaded with auth
+ * - 'error' when load fails
+ */
+export async function refreshRemoteConfig(
+  options: RefreshRemoteConfigOptions = {}
+): Promise<void> {
+  const { useAuth = true } = options
 
-export async function refreshRemoteConfig(): Promise<void> {
   try {
-    const response = await api.fetchApi('/features', { cache: 'no-store' })
+    const response = useAuth
+      ? await api.fetchApi('/features', { cache: 'no-store' })
+      : await fetch('/api/features', { cache: 'no-store' })
+
     if (response.ok) {
       const config = await response.json()
       window.__CONFIG__ = config
       remoteConfig.value = config
+      remoteConfigState.value = useAuth ? 'authenticated' : 'anonymous'
       return
     }
 
@@ -16,8 +41,12 @@ export async function refreshRemoteConfig(): Promise<void> {
     if (response.status === 401 || response.status === 403) {
       window.__CONFIG__ = {}
       remoteConfig.value = {}
+      remoteConfigState.value = 'error'
     }
   } catch (error) {
     console.error('Failed to fetch remote config:', error)
+    window.__CONFIG__ = {}
+    remoteConfig.value = {}
+    remoteConfigState.value = 'error'
   }
 }
diff --git a/src/platform/remoteConfig/remoteConfig.ts b/src/platform/remoteConfig/remoteConfig.ts
index 7d8f28c5f5..3b6ecb96c0 100644
--- a/src/platform/remoteConfig/remoteConfig.ts
+++ b/src/platform/remoteConfig/remoteConfig.ts
@@ -8,13 +8,34 @@
  * - Avoiding vendor lock-in for native apps
  *
  * This module is tree-shaken in OSS builds.
- * Used for initial config load in main.ts and polling in the extension.
  */
 
-import { ref } from 'vue'
+import { computed, ref } from 'vue'
 
 import type { RemoteConfig } from './types'
 
+/**
+ * Load state for remote configuration.
+ * - 'unloaded': No config loaded yet
+ * - 'anonymous': Config loaded without auth (bootstrap)
+ * - 'authenticated': Config loaded with auth (user-specific flags available)
+ * - 'error': Failed to load config
+ */
+type RemoteConfigState = 'unloaded' | 'anonymous' | 'authenticated' | 'error'
+
+/**
+ * Current load state of remote configuration
+ */
+export const remoteConfigState = ref<RemoteConfigState>('unloaded')
+
+/**
+ * Whether the authenticated config has been loaded.
+ * Use this to gate access to user-specific feature flags like teamWorkspacesEnabled.
+ */
+export const isAuthenticatedConfigLoaded = computed(
+  () => remoteConfigState.value === 'authenticated'
+)
+
 /**
  * Reactive remote configuration
  * Updated whenever config is loaded from the server
@@ -29,26 +50,3 @@ export function configValueOrDefault<K extends keyof RemoteConfig>(
   const configValue = remoteConfig[key]
   return configValue || defaultValue
 }
-
-/**
- * Loads remote configuration from the backend /api/features endpoint
- * and updates the reactive remoteConfig ref
- */
-export async function loadRemoteConfig(): Promise<void> {
-  try {
-    const response = await fetch('/api/features', { cache: 'no-store' })
-    if (response.ok) {
-      const config = await response.json()
-      window.__CONFIG__ = config
-      remoteConfig.value = config
-    } else {
-      console.warn('Failed to load remote config:', response.statusText)
-      window.__CONFIG__ = {}
-      remoteConfig.value = {}
-    }
-  } catch (error) {
-    console.error('Failed to fetch remote config:', error)
-    window.__CONFIG__ = {}
-    remoteConfig.value = {}
-  }
-}
diff --git a/src/platform/remoteConfig/types.ts b/src/platform/remoteConfig/types.ts
index cbca526bf8..f931259a98 100644
--- a/src/platform/remoteConfig/types.ts
+++ b/src/platform/remoteConfig/types.ts
@@ -26,7 +26,11 @@ type FirebaseRuntimeConfig = {
  * Configuration fetched from the server at runtime
  */
 export type RemoteConfig = {
+  gtm_container_id?: string
+  ga_measurement_id?: string
   mixpanel_token?: string
+  posthog_project_token?: string
+  posthog_api_host?: string
   subscription_required?: boolean
   server_health_alert?: ServerHealthAlert
   max_upload_size?: number
@@ -35,8 +39,16 @@ export type RemoteConfig = {
   firebase_config?: FirebaseRuntimeConfig
   telemetry_disabled_events?: TelemetryEventName[]
   model_upload_button_enabled?: boolean
-  asset_update_options_enabled?: boolean
+  asset_rename_enabled?: boolean
   private_models_enabled?: boolean
   onboarding_survey_enabled?: boolean
-  huggingface_model_import_enabled?: boolean
+  linear_toggle_enabled?: boolean
+  team_workspaces_enabled?: boolean
+  user_secrets_enabled?: boolean
+  node_library_essentials_enabled?: boolean
+  free_tier_credits?: number
+  new_free_tier_subscriptions?: boolean
+  workflow_sharing_enabled?: boolean
+  comfyhub_upload_enabled?: boolean
+  comfyhub_profile_gate_enabled?: boolean
 }
diff --git a/src/platform/secrets/api/secretsApi.ts b/src/platform/secrets/api/secretsApi.ts
new file mode 100644
index 0000000000..84457d0641
--- /dev/null
+++ b/src/platform/secrets/api/secretsApi.ts
@@ -0,0 +1,89 @@
+import { api } from '@/scripts/api'
+
+import type {
+  SecretCreateRequest,
+  SecretErrorCode,
+  SecretMetadata,
+  SecretUpdateRequest
+} from '../types'
+import { SECRET_ERROR_CODES } from '../types'
+
+interface ListSecretsResponse {
+  data: SecretMetadata[]
+}
+
+interface ErrorResponse {
+  message?: string
+  code?: string
+}
+
+export class SecretsApiError extends Error {
+  constructor(
+    message: string,
+    public readonly status?: number,
+    public readonly code?: SecretErrorCode
+  ) {
+    super(message)
+    this.name = 'SecretsApiError'
+  }
+}
+
+async function handleResponse<T>(response: Response): Promise<T> {
+  if (!response.ok) {
+    let errorData: ErrorResponse = {}
+    try {
+      errorData = await response.json()
+    } catch {
+      // Response body is not JSON
+    }
+    const code = SECRET_ERROR_CODES.includes(
+      errorData.code as (typeof SECRET_ERROR_CODES)[number]
+    )
+      ? (errorData.code as SecretErrorCode)
+      : undefined
+    throw new SecretsApiError(
+      errorData.message ?? response.statusText,
+      response.status,
+      code
+    )
+  }
+  return response.json()
+}
+
+export async function listSecrets(): Promise<SecretMetadata[]> {
+  const response = await api.fetchApi('/secrets')
+  const data = await handleResponse<ListSecretsResponse>(response)
+  return data.data
+}
+
+export async function createSecret(
+  payload: SecretCreateRequest
+): Promise<SecretMetadata> {
+  const response = await api.fetchApi('/secrets', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify(payload)
+  })
+  return handleResponse<SecretMetadata>(response)
+}
+
+export async function updateSecret(
+  id: string,
+  payload: SecretUpdateRequest
+): Promise<SecretMetadata> {
+  const response = await api.fetchApi(`/secrets/${id}`, {
+    method: 'PATCH',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify(payload)
+  })
+  return handleResponse<SecretMetadata>(response)
+}
+
+export async function deleteSecret(id: string): Promise<void> {
+  const response = await api.fetchApi(`/secrets/${id}`, {
+    method: 'DELETE'
+  })
+  if (!response.ok) {
+    await handleResponse<void>(response)
+  }
+}
diff --git a/src/platform/secrets/components/SecretFormDialog.vue b/src/platform/secrets/components/SecretFormDialog.vue
new file mode 100644
index 0000000000..65be26f59e
--- /dev/null
+++ b/src/platform/secrets/components/SecretFormDialog.vue
@@ -0,0 +1,137 @@
+<template>
+  <Dialog
+    v-model:visible="visible"
+    :header="
+      mode === 'create' ? $t('secrets.addSecret') : $t('secrets.editSecret')
+    "
+    modal
+    class="w-full max-w-md"
+  >
+    <form class="flex flex-col gap-4" @submit.prevent="handleSubmit">
+      <div class="flex flex-col gap-1">
+        <label for="secret-provider" class="text-sm font-medium">
+          {{ $t('secrets.provider') }}
+        </label>
+        <Select v-model="form.provider" :disabled="mode === 'edit'">
+          <SelectTrigger id="secret-provider" class="w-full" autofocus>
+            <SelectValue :placeholder="$t('g.none')" />
+          </SelectTrigger>
+          <SelectContent disable-portal>
+            <SelectItem
+              v-for="option in providerOptions"
+              :key="option.value || 'none'"
+              :value="option.value"
+              :disabled="option.disabled"
+            >
+              {{ option.label }}
+            </SelectItem>
+          </SelectContent>
+        </Select>
+        <small v-if="errors.provider" class="text-red-500">
+          {{ errors.provider }}
+        </small>
+      </div>
+
+      <div class="flex flex-col gap-1">
+        <label for="secret-name" class="text-sm font-medium">
+          {{ $t('secrets.name') }}
+        </label>
+        <InputText
+          id="secret-name"
+          v-model="form.name"
+          :placeholder="$t('secrets.namePlaceholder')"
+          :class="{ 'p-invalid': errors.name }"
+        />
+        <small v-if="errors.name" class="text-red-500">{{ errors.name }}</small>
+      </div>
+
+      <div class="flex flex-col gap-1">
+        <label for="secret-value" class="text-sm font-medium">
+          {{ $t('secrets.secretValue') }}
+        </label>
+        <Password
+          id="secret-value"
+          v-model="form.secretValue"
+          :placeholder="
+            mode === 'edit'
+              ? $t('secrets.secretValuePlaceholderEdit')
+              : $t('secrets.secretValuePlaceholder')
+          "
+          :feedback="false"
+          toggle-mask
+          fluid
+          :class="{ 'p-invalid': errors.secretValue }"
+        />
+        <small v-if="errors.secretValue" class="text-red-500">
+          {{ errors.secretValue }}
+        </small>
+        <small v-else class="text-muted">
+          {{
+            mode === 'edit'
+              ? $t('secrets.secretValueHintEdit')
+              : $t('secrets.secretValueHint')
+          }}
+        </small>
+      </div>
+
+      <span v-if="apiError" class="text-destructive text-sm">
+        {{ apiError }}
+      </span>
+
+      <div class="flex justify-end gap-2 pt-2">
+        <Button
+          variant="secondary"
+          type="button"
+          tabindex="0"
+          @click="visible = false"
+        >
+          {{ $t('g.cancel') }}
+        </Button>
+        <Button type="submit" tabindex="0" :loading="loading">
+          {{ $t('g.save') }}
+        </Button>
+      </div>
+    </form>
+  </Dialog>
+</template>
+
+<script setup lang="ts">
+import Dialog from 'primevue/dialog'
+import InputText from 'primevue/inputtext'
+import Password from 'primevue/password'
+
+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 { useSecretForm } from '../composables/useSecretForm'
+import type { SecretMetadata, SecretProvider } from '../types'
+
+const {
+  secret,
+  existingProviders = [],
+  mode = 'create'
+} = defineProps<{
+  secret?: SecretMetadata
+  existingProviders?: SecretProvider[]
+  mode?: 'create' | 'edit'
+}>()
+
+const visible = defineModel<boolean>('visible', { default: false })
+
+const emit = defineEmits<{
+  saved: []
+}>()
+
+const { form, errors, loading, apiError, providerOptions, handleSubmit } =
+  useSecretForm({
+    mode,
+    secret: () => secret,
+    existingProviders: () => existingProviders,
+    visible,
+    onSaved: () => emit('saved')
+  })
+</script>
diff --git a/src/platform/secrets/components/SecretListItem.test.ts b/src/platform/secrets/components/SecretListItem.test.ts
new file mode 100644
index 0000000000..6d7907ef73
--- /dev/null
+++ b/src/platform/secrets/components/SecretListItem.test.ts
@@ -0,0 +1,178 @@
+import { mount } from '@vue/test-utils'
+import { describe, expect, it, vi } from 'vitest'
+
+import type { SecretMetadata } from '../types'
+import SecretListItem from './SecretListItem.vue'
+
+vi.mock('../providers', () => ({
+  getProviderLabel: (provider: string | undefined) => {
+    if (provider === 'huggingface') return 'HuggingFace'
+    if (provider === 'civitai') return 'Civitai'
+    return ''
+  },
+  getProviderLogo: () => undefined
+}))
+
+function createMockSecret(
+  overrides: Partial<SecretMetadata> = {}
+): SecretMetadata {
+  return {
+    id: 'secret-1',
+    name: 'Test Secret',
+    provider: 'huggingface',
+    created_at: '2024-01-15T10:00:00Z',
+    updated_at: '2024-01-15T10:00:00Z',
+    ...overrides
+  }
+}
+
+function mountComponent(props: {
+  secret: SecretMetadata
+  loading?: boolean
+  disabled?: boolean
+}) {
+  return mount(SecretListItem, {
+    props,
+    global: {
+      stubs: {
+        Button: {
+          template:
+            '<button :disabled="disabled" @click="$emit(\'click\')"><slot /></button>',
+          props: ['disabled', 'variant', 'size', 'aria-label']
+        }
+      },
+      directives: {
+        tooltip: () => {}
+      },
+      mocks: {
+        $t: (key: string, params?: object) =>
+          `${key}${params ? JSON.stringify(params) : ''}`
+      }
+    }
+  })
+}
+
+describe('SecretListItem', () => {
+  describe('rendering', () => {
+    it('displays secret name', () => {
+      const secret = createMockSecret({ name: 'My API Key' })
+      const wrapper = mountComponent({ secret })
+
+      expect(wrapper.text()).toContain('My API Key')
+    })
+
+    it('displays provider label when provider exists', () => {
+      const secret = createMockSecret({ provider: 'huggingface' })
+      const wrapper = mountComponent({ secret })
+
+      expect(wrapper.text()).toContain('HuggingFace')
+    })
+
+    it('displays Civitai provider label', () => {
+      const secret = createMockSecret({ provider: 'civitai' })
+      const wrapper = mountComponent({ secret })
+
+      expect(wrapper.text()).toContain('Civitai')
+    })
+
+    it('hides provider badge when no provider', () => {
+      const secret = createMockSecret({ provider: undefined })
+      const wrapper = mountComponent({ secret })
+
+      expect(wrapper.text()).not.toContain('HuggingFace')
+      expect(wrapper.text()).not.toContain('Civitai')
+    })
+
+    it('displays created date', () => {
+      const secret = createMockSecret({ created_at: '2024-01-15T10:00:00Z' })
+      const wrapper = mountComponent({ secret })
+
+      expect(wrapper.text()).toContain('secrets.createdAt')
+    })
+
+    it('displays last used date when available', () => {
+      const secret = createMockSecret({ last_used_at: '2024-01-20T10:00:00Z' })
+      const wrapper = mountComponent({ secret })
+
+      expect(wrapper.text()).toContain('secrets.lastUsed')
+    })
+
+    it('hides last used when not available', () => {
+      const secret = createMockSecret({ last_used_at: undefined })
+      const wrapper = mountComponent({ secret })
+
+      expect(wrapper.text()).not.toContain('secrets.lastUsed')
+    })
+  })
+
+  describe('loading state', () => {
+    it('shows spinner when loading', () => {
+      const secret = createMockSecret()
+      const wrapper = mountComponent({ secret, loading: true })
+
+      expect(wrapper.find('.pi-spinner').exists()).toBe(true)
+    })
+
+    it('hides action buttons when loading', () => {
+      const secret = createMockSecret()
+      const wrapper = mountComponent({ secret, loading: true })
+
+      expect(wrapper.find('.pi-pen-to-square').exists()).toBe(false)
+      expect(wrapper.find('.pi-trash').exists()).toBe(false)
+    })
+
+    it('shows action buttons when not loading', () => {
+      const secret = createMockSecret()
+      const wrapper = mountComponent({ secret, loading: false })
+
+      expect(wrapper.find('.pi-pen-to-square').exists()).toBe(true)
+      expect(wrapper.find('.pi-trash').exists()).toBe(true)
+    })
+  })
+
+  describe('disabled state', () => {
+    it('disables buttons when disabled prop is true', () => {
+      const secret = createMockSecret()
+      const wrapper = mountComponent({ secret, disabled: true })
+
+      const buttons = wrapper.findAll('button')
+      buttons.forEach((button) => {
+        expect(button.attributes('disabled')).toBeDefined()
+      })
+    })
+
+    it('enables buttons when disabled prop is false', () => {
+      const secret = createMockSecret()
+      const wrapper = mountComponent({ secret, disabled: false })
+
+      const buttons = wrapper.findAll('button')
+      buttons.forEach((button) => {
+        expect(button.attributes('disabled')).toBeUndefined()
+      })
+    })
+  })
+
+  describe('events', () => {
+    it('emits edit event when edit button clicked', async () => {
+      const secret = createMockSecret()
+      const wrapper = mountComponent({ secret })
+
+      const editButton = wrapper.findAll('button')[0]
+      await editButton.trigger('click')
+
+      expect(wrapper.emitted('edit')).toBeDefined()
+      expect(wrapper.emitted('edit')!.length).toBeGreaterThanOrEqual(1)
+    })
+
+    it('emits delete event when delete button clicked', async () => {
+      const secret = createMockSecret()
+      const wrapper = mountComponent({ secret })
+
+      const deleteButton = wrapper.findAll('button')[1]
+      await deleteButton.trigger('click')
+
+      expect(wrapper.emitted('delete')).toBeDefined()
+      expect(wrapper.emitted('delete')!.length).toBeGreaterThanOrEqual(1)
+    })
+  })
+})
diff --git a/src/platform/secrets/components/SecretListItem.vue b/src/platform/secrets/components/SecretListItem.vue
new file mode 100644
index 0000000000..20e6cb3115
--- /dev/null
+++ b/src/platform/secrets/components/SecretListItem.vue
@@ -0,0 +1,91 @@
+<template>
+  <div
+    class="bg-base-raised-surface flex items-center justify-between rounded-lg border border-border-default p-4"
+  >
+    <div class="flex flex-col gap-1">
+      <div class="flex items-center gap-2">
+        <span class="font-medium text-base-foreground">{{ secret.name }}</span>
+        <img
+          v-if="providerLogo"
+          :src="providerLogo"
+          :alt="providerLabel"
+          class="size-5"
+        />
+        <span
+          v-else-if="secret.provider"
+          class="bg-base-surface rounded-sm px-2 py-0.5 text-xs text-muted"
+        >
+          {{ providerLabel }}
+        </span>
+      </div>
+      <div class="flex gap-3 text-xs text-muted">
+        <span>{{ $t('secrets.createdAt', { date: createdDate }) }}</span>
+        <span v-if="secret.last_used_at">
+          {{ $t('secrets.lastUsed', { date: lastUsedDate }) }}
+        </span>
+      </div>
+    </div>
+    <div class="flex items-center gap-2">
+      <i v-if="loading" class="pi pi-spinner pi-spin text-muted" />
+      <template v-else>
+        <Button
+          v-tooltip="{ value: $t('g.edit'), showDelay: 300 }"
+          variant="muted-textonly"
+          size="icon-sm"
+          :aria-label="$t('g.edit')"
+          :disabled="disabled"
+          @click="emit('edit')"
+        >
+          <i class="pi pi-pen-to-square" />
+        </Button>
+        <Button
+          v-tooltip="{ value: $t('g.delete'), showDelay: 300 }"
+          variant="muted-textonly"
+          size="icon-sm"
+          :aria-label="$t('g.delete')"
+          :disabled="disabled"
+          @click="emit('delete')"
+        >
+          <i class="pi pi-trash" />
+        </Button>
+      </template>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+
+import Button from '@/components/ui/button/Button.vue'
+
+import { getProviderLabel, getProviderLogo } from '../providers'
+import type { SecretMetadata } from '../types'
+
+const {
+  secret,
+  loading = false,
+  disabled = false
+} = defineProps<{
+  secret: SecretMetadata
+  loading?: boolean
+  disabled?: boolean
+}>()
+
+const emit = defineEmits<{
+  edit: []
+  delete: []
+}>()
+
+const providerLabel = computed(() => getProviderLabel(secret.provider))
+const providerLogo = computed(() => getProviderLogo(secret.provider))
+
+function formatDateString(dateString: string): string {
+  const date = new Date(dateString)
+  return date.toLocaleDateString()
+}
+
+const createdDate = computed(() => formatDateString(secret.created_at))
+const lastUsedDate = computed(() =>
+  secret.last_used_at ? formatDateString(secret.last_used_at) : ''
+)
+</script>
diff --git a/src/platform/secrets/components/SecretsPanel.vue b/src/platform/secrets/components/SecretsPanel.vue
new file mode 100644
index 0000000000..68dd1f57a4
--- /dev/null
+++ b/src/platform/secrets/components/SecretsPanel.vue
@@ -0,0 +1,119 @@
+<template>
+  <TabPanel value="Secrets" class="h-full">
+    <div class="flex h-full flex-col">
+      <div>
+        <h2 class="text-2xl font-bold">{{ $t('secrets.title') }}</h2>
+        <p class="mt-1 text-sm text-muted">{{ $t('secrets.description') }}</p>
+        <p class="mt-1 text-sm text-muted">
+          {{ $t('secrets.descriptionUsage') }}
+        </p>
+      </div>
+
+      <Divider class="my-4" />
+
+      <div class="my-4 flex items-center justify-between">
+        <h3 class="my-0 text-lg font-semibold">
+          {{ $t('secrets.modelProviders') }}
+        </h3>
+        <Button @click="openCreateDialog">
+          <i class="pi pi-plus mr-1" />
+          {{ $t('secrets.addSecret') }}
+        </Button>
+      </div>
+
+      <div v-if="loading" class="flex items-center justify-center py-8">
+        <ProgressSpinner class="size-8" />
+      </div>
+
+      <div
+        v-else-if="secrets.length === 0"
+        class="py-4 text-center text-sm text-muted"
+      >
+        {{ $t('secrets.noSecrets') }}
+      </div>
+
+      <div v-else class="flex flex-col gap-3">
+        <SecretListItem
+          v-for="secret in secrets"
+          :key="secret.id"
+          :secret="secret"
+          :loading="operatingSecretId === secret.id"
+          :disabled="operatingSecretId !== null"
+          @edit="openEditDialog(secret)"
+          @delete="confirmDelete(secret)"
+        />
+      </div>
+
+      <SecretFormDialog
+        v-model:visible="createDialogVisible"
+        mode="create"
+        :existing-providers="existingProviders"
+        @saved="fetchSecrets"
+      />
+
+      <SecretFormDialog
+        v-model:visible="editDialogVisible"
+        mode="edit"
+        :secret="selectedSecret"
+        :existing-providers="existingProviders"
+        @saved="fetchSecrets"
+      />
+
+      <ConfirmDialog group="secrets" />
+    </div>
+  </TabPanel>
+</template>
+
+<script setup lang="ts">
+import ConfirmDialog from 'primevue/confirmdialog'
+import Divider from 'primevue/divider'
+import ProgressSpinner from 'primevue/progressspinner'
+import TabPanel from 'primevue/tabpanel'
+import { useConfirm } from 'primevue/useconfirm'
+import { ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+
+import { useSecrets } from '../composables/useSecrets'
+import type { SecretMetadata } from '../types'
+import SecretFormDialog from './SecretFormDialog.vue'
+import SecretListItem from './SecretListItem.vue'
+
+const { t } = useI18n()
+const confirm = useConfirm()
+
+const {
+  loading,
+  secrets,
+  operatingSecretId,
+  existingProviders,
+  fetchSecrets,
+  deleteSecret
+} = useSecrets()
+
+const createDialogVisible = ref(false)
+const editDialogVisible = ref(false)
+const selectedSecret = ref<SecretMetadata | undefined>()
+
+function openCreateDialog() {
+  createDialogVisible.value = true
+}
+
+function openEditDialog(secret: SecretMetadata) {
+  selectedSecret.value = secret
+  editDialogVisible.value = true
+}
+
+function confirmDelete(secret: SecretMetadata) {
+  confirm.require({
+    group: 'secrets',
+    header: t('secrets.deleteConfirmTitle'),
+    message: t('secrets.deleteConfirmMessage', { name: secret.name }),
+    acceptClass: 'p-button-danger',
+    accept: () => deleteSecret(secret)
+  })
+}
+
+fetchSecrets()
+</script>
diff --git a/src/platform/secrets/composables/useSecretForm.test.ts b/src/platform/secrets/composables/useSecretForm.test.ts
new file mode 100644
index 0000000000..3bb9deb762
--- /dev/null
+++ b/src/platform/secrets/composables/useSecretForm.test.ts
@@ -0,0 +1,364 @@
+import { ref } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { SecretMetadata, SecretProvider } from '../types'
+import { useSecretForm } from './useSecretForm'
+
+vi.mock('vue-i18n', () => ({
+  useI18n: () => ({ t: (key: string) => key })
+}))
+
+const mockCreate = vi.fn()
+const mockUpdate = vi.fn()
+
+vi.mock('../api/secretsApi', () => ({
+  createSecret: (payload: unknown) => mockCreate(payload),
+  updateSecret: (id: string, payload: unknown) => mockUpdate(id, payload),
+  SecretsApiError: class SecretsApiError extends Error {
+    constructor(
+      message: string,
+      public readonly status?: number,
+      public readonly code?: string
+    ) {
+      super(message)
+      this.name = 'SecretsApiError'
+    }
+  }
+}))
+
+function createMockSecret(
+  overrides: Partial<SecretMetadata> = {}
+): SecretMetadata {
+  return {
+    id: 'secret-1',
+    name: 'Test Secret',
+    provider: 'huggingface',
+    created_at: '2024-01-01T00:00:00Z',
+    updated_at: '2024-01-01T00:00:00Z',
+    ...overrides
+  }
+}
+
+describe('useSecretForm', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  describe('validation via handleSubmit', () => {
+    it('requires name in create mode', async () => {
+      const visible = ref(true)
+      const { form, errors, handleSubmit } = useSecretForm({
+        mode: 'create',
+        existingProviders: () => [],
+        visible,
+        onSaved: vi.fn()
+      })
+
+      form.name = ''
+      form.provider = 'huggingface'
+      form.secretValue = 'secret123'
+
+      await handleSubmit()
+
+      expect(mockCreate).not.toHaveBeenCalled()
+      expect(errors.name).toBe('secrets.errors.nameRequired')
+    })
+
+    it('requires name not to exceed 255 characters', async () => {
+      const visible = ref(true)
+      const { form, errors, handleSubmit } = useSecretForm({
+        mode: 'create',
+        existingProviders: () => [],
+        visible,
+        onSaved: vi.fn()
+      })
+
+      form.name = 'a'.repeat(256)
+      form.provider = 'huggingface'
+      form.secretValue = 'secret123'
+
+      await handleSubmit()
+
+      expect(mockCreate).not.toHaveBeenCalled()
+      expect(errors.name).toBe('secrets.errors.nameTooLong')
+    })
+
+    it('requires provider in create mode', async () => {
+      const visible = ref(true)
+      const { form, errors, handleSubmit } = useSecretForm({
+        mode: 'create',
+        existingProviders: () => [],
+        visible,
+        onSaved: vi.fn()
+      })
+
+      form.name = 'My Secret'
+      form.provider = null
+      form.secretValue = 'secret123'
+
+      await handleSubmit()
+
+      expect(mockCreate).not.toHaveBeenCalled()
+      expect(errors.provider).toBe('secrets.errors.providerRequired')
+    })
+
+    it('requires secret value in create mode', async () => {
+      const visible = ref(true)
+      const { form, errors, handleSubmit } = useSecretForm({
+        mode: 'create',
+        existingProviders: () => [],
+        visible,
+        onSaved: vi.fn()
+      })
+
+      form.name = 'My Secret'
+      form.provider = 'huggingface'
+      form.secretValue = ''
+
+      await handleSubmit()
+
+      expect(mockCreate).not.toHaveBeenCalled()
+      expect(errors.secretValue).toBe('secrets.errors.secretValueRequired')
+    })
+
+    it('allows empty secret value in edit mode', async () => {
+      const visible = ref(false)
+      const secret = createMockSecret()
+      mockUpdate.mockResolvedValue({})
+      const { form, handleSubmit } = useSecretForm({
+        mode: 'edit',
+        secret: () => secret,
+        existingProviders: () => [],
+        visible,
+        onSaved: vi.fn()
+      })
+
+      visible.value = true
+      await Promise.resolve()
+
+      form.name = 'Updated Name'
+      form.secretValue = ''
+
+      await handleSubmit()
+
+      expect(mockUpdate).toHaveBeenCalled()
+    })
+
+    it('requires provider in edit mode', async () => {
+      const visible = ref(true)
+      const secret = createMockSecret({ provider: undefined })
+      const { form, errors, handleSubmit } = useSecretForm({
+        mode: 'edit',
+        secret: () => secret,
+        existingProviders: () => [],
+        visible,
+        onSaved: vi.fn()
+      })
+
+      form.name = 'Updated Name'
+      form.provider = null
+
+      await handleSubmit()
+
+      expect(mockUpdate).not.toHaveBeenCalled()
+      expect(errors.provider).toBe('secrets.errors.providerRequired')
+    })
+  })
+
+  describe('providerOptions', () => {
+    it('marks existing providers as disabled', () => {
+      const visible = ref(true)
+      const { providerOptions } = useSecretForm({
+        mode: 'create',
+        existingProviders: () => ['huggingface'],
+        visible,
+        onSaved: vi.fn()
+      })
+
+      const huggingface = providerOptions.value.find(
+        (o) => o.value === 'huggingface'
+      )
+      const civitai = providerOptions.value.find((o) => o.value === 'civitai')
+
+      expect(huggingface?.disabled).toBe(true)
+      expect(civitai?.disabled).toBe(false)
+    })
+
+    it('updates disabled state when existingProviders changes', () => {
+      const visible = ref(true)
+      const existingProviders = ref<SecretProvider[]>(['huggingface'])
+      const { providerOptions } = useSecretForm({
+        mode: 'create',
+        existingProviders: () => existingProviders.value,
+        visible,
+        onSaved: vi.fn()
+      })
+
+      expect(
+        providerOptions.value.find((o) => o.value === 'huggingface')?.disabled
+      ).toBe(true)
+
+      existingProviders.value = []
+
+      expect(
+        providerOptions.value.find((o) => o.value === 'huggingface')?.disabled
+      ).toBe(false)
+    })
+  })
+
+  describe('handleSubmit', () => {
+    it('calls create API with correct payload', async () => {
+      const visible = ref(true)
+      const onSaved = vi.fn()
+      mockCreate.mockResolvedValue({})
+
+      const { form, handleSubmit } = useSecretForm({
+        mode: 'create',
+        existingProviders: () => [],
+        visible,
+        onSaved
+      })
+
+      form.name = 'My Secret'
+      form.provider = 'civitai'
+      form.secretValue = 'secret123'
+
+      await handleSubmit()
+
+      expect(mockCreate).toHaveBeenCalledWith({
+        name: 'My Secret',
+        secret_value: 'secret123',
+        provider: 'civitai'
+      })
+      expect(onSaved).toHaveBeenCalled()
+      expect(visible.value).toBe(false)
+    })
+
+    it('calls update API with correct payload', async () => {
+      const visible = ref(false)
+      const onSaved = vi.fn()
+      const secret = createMockSecret({ id: 'secret-123' })
+      mockUpdate.mockResolvedValue({})
+
+      const { form, handleSubmit } = useSecretForm({
+        mode: 'edit',
+        secret: () => secret,
+        existingProviders: () => [],
+        visible,
+        onSaved
+      })
+
+      visible.value = true
+      await Promise.resolve()
+
+      form.name = 'Updated Name'
+      form.secretValue = 'newvalue'
+
+      await handleSubmit()
+
+      expect(mockUpdate).toHaveBeenCalledWith('secret-123', {
+        name: 'Updated Name',
+        secret_value: 'newvalue'
+      })
+      expect(onSaved).toHaveBeenCalled()
+    })
+
+    it('omits secret_value in update if empty', async () => {
+      const visible = ref(false)
+      const secret = createMockSecret({ id: 'secret-123' })
+      mockUpdate.mockResolvedValue({})
+
+      const { form, handleSubmit } = useSecretForm({
+        mode: 'edit',
+        secret: () => secret,
+        existingProviders: () => [],
+        visible,
+        onSaved: vi.fn()
+      })
+
+      visible.value = true
+      await Promise.resolve()
+
+      form.name = 'Updated Name'
+      form.secretValue = ''
+
+      await handleSubmit()
+
+      expect(mockUpdate).toHaveBeenCalledWith('secret-123', {
+        name: 'Updated Name'
+      })
+    })
+
+    it('sets apiError on API failure', async () => {
+      const { SecretsApiError } = await import('../api/secretsApi')
+      const visible = ref(true)
+      mockCreate.mockRejectedValue(
+        new SecretsApiError('Duplicate', 400, 'DUPLICATE_NAME')
+      )
+
+      const { form, apiError, handleSubmit } = useSecretForm({
+        mode: 'create',
+        existingProviders: () => [],
+        visible,
+        onSaved: vi.fn()
+      })
+
+      form.name = 'My Secret'
+      form.provider = 'huggingface'
+      form.secretValue = 'secret123'
+
+      await handleSubmit()
+
+      expect(apiError.value).toBe('secrets.errors.duplicateName')
+      expect(visible.value).toBe(true)
+    })
+  })
+
+  describe('form reset on visible', () => {
+    it('resets to empty state in create mode when visible becomes true', async () => {
+      const visible = ref(false)
+      const { form, errors } = useSecretForm({
+        mode: 'create',
+        existingProviders: () => [],
+        visible,
+        onSaved: vi.fn()
+      })
+
+      form.name = 'Some Name'
+      form.secretValue = 'some value'
+      errors.name = 'some error'
+
+      visible.value = true
+      await Promise.resolve()
+
+      expect(form.name).toBe('')
+      expect(form.secretValue).toBe('')
+      expect(form.provider).toBeNull()
+      expect(errors.name).toBe('')
+    })
+
+    it('resets to secret values in edit mode when visible becomes true', async () => {
+      const visible = ref(false)
+      const secret = createMockSecret({
+        name: 'Original Name',
+        provider: 'civitai'
+      })
+      const { form } = useSecretForm({
+        mode: 'edit',
+        secret: () => secret,
+        existingProviders: () => [],
+        visible,
+        onSaved: vi.fn()
+      })
+
+      form.name = 'Changed Name'
+
+      visible.value = true
+      await Promise.resolve()
+
+      expect(form.name).toBe('Original Name')
+      expect(form.provider).toBe('civitai')
+      expect(form.secretValue).toBe('')
+    })
+  })
+})
diff --git a/src/platform/secrets/composables/useSecretForm.ts b/src/platform/secrets/composables/useSecretForm.ts
new file mode 100644
index 0000000000..a74cfb12d9
--- /dev/null
+++ b/src/platform/secrets/composables/useSecretForm.ts
@@ -0,0 +1,171 @@
+import { whenever } from '@vueuse/core'
+import type { MaybeRefOrGetter } from 'vue'
+import { computed, reactive, ref, toValue } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import { createSecret, SecretsApiError, updateSecret } from '../api/secretsApi'
+import { SECRET_PROVIDERS } from '../providers'
+import type { SecretErrorCode, SecretMetadata, SecretProvider } from '../types'
+
+interface SecretFormState {
+  name: string
+  secretValue: string
+  provider: SecretProvider | null
+}
+
+interface SecretFormErrors {
+  name: string
+  secretValue: string
+  provider: string
+}
+
+interface ProviderOption {
+  label: string
+  value: SecretProvider
+  disabled: boolean
+}
+
+interface UseSecretFormOptions {
+  mode: 'create' | 'edit'
+  secret?: MaybeRefOrGetter<SecretMetadata | undefined>
+  existingProviders: MaybeRefOrGetter<SecretProvider[]>
+  visible: { value: boolean }
+  onSaved: () => void
+}
+
+export function useSecretForm(options: UseSecretFormOptions) {
+  const { t } = useI18n()
+  const {
+    mode,
+    secret: secretRef,
+    existingProviders,
+    visible,
+    onSaved
+  } = options
+
+  const loading = ref(false)
+  const apiErrorCode = ref<SecretErrorCode | null>(null)
+  const apiErrorMessage = ref<string | null>(null)
+
+  const form = reactive<SecretFormState>({
+    name: '',
+    secretValue: '',
+    provider: null
+  })
+
+  const errors = reactive<SecretFormErrors>({
+    name: '',
+    secretValue: '',
+    provider: ''
+  })
+
+  const providerOptions = computed<ProviderOption[]>(() =>
+    SECRET_PROVIDERS.map((p) => ({
+      label: p.label,
+      value: p.value,
+      disabled:
+        mode === 'edit' ? false : toValue(existingProviders).includes(p.value)
+    }))
+  )
+
+  const apiError = computed(() => {
+    if (!apiErrorCode.value && !apiErrorMessage.value) return null
+    switch (apiErrorCode.value) {
+      case 'DUPLICATE_NAME':
+        return t('secrets.errors.duplicateName')
+      case 'DUPLICATE_PROVIDER':
+        return t('secrets.errors.duplicateProvider')
+      default:
+        return apiErrorMessage.value
+    }
+  })
+
+  function resetForm() {
+    const secret = toValue(secretRef)
+    if (mode === 'edit' && secret) {
+      form.name = secret.name
+      form.provider = secret.provider ?? null
+      form.secretValue = ''
+    } else {
+      form.name = ''
+      form.secretValue = ''
+      form.provider = null
+    }
+    errors.name = ''
+    errors.secretValue = ''
+    errors.provider = ''
+    apiErrorCode.value = null
+    apiErrorMessage.value = null
+  }
+
+  whenever(() => visible.value, resetForm)
+
+  function validate(): boolean {
+    errors.name = ''
+    errors.secretValue = ''
+    errors.provider = ''
+
+    if (!form.name.trim()) {
+      errors.name = t('secrets.errors.nameRequired')
+      return false
+    }
+    if (form.name.length > 255) {
+      errors.name = t('secrets.errors.nameTooLong')
+      return false
+    }
+    if (!form.provider) {
+      errors.provider = t('secrets.errors.providerRequired')
+      return false
+    }
+    if (mode === 'create' && !form.secretValue) {
+      errors.secretValue = t('secrets.errors.secretValueRequired')
+      return false
+    }
+    return true
+  }
+
+  async function handleSubmit() {
+    if (!validate()) return
+
+    loading.value = true
+    apiErrorCode.value = null
+    apiErrorMessage.value = null
+
+    try {
+      const secret = toValue(secretRef)
+      if (mode === 'create') {
+        await createSecret({
+          name: form.name.trim(),
+          secret_value: form.secretValue,
+          provider: form.provider!
+        })
+      } else if (secret) {
+        const updatePayload: { name: string; secret_value?: string } = {
+          name: form.name.trim()
+        }
+        if (form.secretValue) {
+          updatePayload.secret_value = form.secretValue
+        }
+        await updateSecret(secret.id, updatePayload)
+      }
+      onSaved()
+      visible.value = false
+    } catch (err) {
+      if (err instanceof SecretsApiError) {
+        apiErrorCode.value = err.code ?? null
+        apiErrorMessage.value = err.message
+      }
+    } finally {
+      loading.value = false
+    }
+  }
+
+  return {
+    form,
+    errors,
+    loading,
+    apiError,
+    providerOptions,
+    handleSubmit
+  }
+}
diff --git a/src/platform/secrets/composables/useSecrets.test.ts b/src/platform/secrets/composables/useSecrets.test.ts
new file mode 100644
index 0000000000..4cadeb5aea
--- /dev/null
+++ b/src/platform/secrets/composables/useSecrets.test.ts
@@ -0,0 +1,154 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { SecretMetadata } from '../types'
+import { useSecrets } from './useSecrets'
+
+const mockAdd = vi.fn()
+
+vi.mock('vue-i18n', () => ({
+  useI18n: () => ({ t: (key: string) => key })
+}))
+
+vi.mock('@/platform/updates/common/toastStore', () => ({
+  useToastStore: () => ({ add: mockAdd })
+}))
+
+const mockListSecrets = vi.fn()
+const mockDeleteSecret = vi.fn()
+
+vi.mock('../api/secretsApi', () => ({
+  listSecrets: () => mockListSecrets(),
+  deleteSecret: (id: string) => mockDeleteSecret(id),
+  SecretsApiError: class SecretsApiError extends Error {
+    constructor(
+      message: string,
+      public readonly status?: number,
+      public readonly code?: string
+    ) {
+      super(message)
+      this.name = 'SecretsApiError'
+    }
+  }
+}))
+
+function createMockSecret(
+  overrides: Partial<SecretMetadata> = {}
+): SecretMetadata {
+  return {
+    id: 'secret-1',
+    name: 'Test Secret',
+    provider: 'huggingface',
+    created_at: '2024-01-01T00:00:00Z',
+    updated_at: '2024-01-01T00:00:00Z',
+    ...overrides
+  }
+}
+
+describe('useSecrets', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  describe('fetchSecrets', () => {
+    it('fetches and populates secrets list', async () => {
+      const mockSecrets = [
+        createMockSecret({ id: '1', name: 'Secret 1' }),
+        createMockSecret({ id: '2', name: 'Secret 2' })
+      ]
+      mockListSecrets.mockResolvedValue(mockSecrets)
+
+      const { secrets, loading, fetchSecrets } = useSecrets()
+
+      expect(loading.value).toBe(false)
+      const fetchPromise = fetchSecrets()
+      expect(loading.value).toBe(true)
+
+      await fetchPromise
+
+      expect(loading.value).toBe(false)
+      expect(secrets.value).toEqual(mockSecrets)
+    })
+
+    it('shows error toast on API failure', async () => {
+      const { SecretsApiError } = await import('../api/secretsApi')
+      mockListSecrets.mockRejectedValue(
+        new SecretsApiError('Network error', 500)
+      )
+
+      const { secrets, fetchSecrets } = useSecrets()
+
+      await fetchSecrets()
+
+      expect(secrets.value).toEqual([])
+      expect(mockAdd).toHaveBeenCalledWith({
+        severity: 'error',
+        summary: 'g.error',
+        detail: 'Network error',
+        life: 5000
+      })
+    })
+  })
+
+  describe('deleteSecret', () => {
+    it('deletes secret and removes from list', async () => {
+      const secretToDelete = createMockSecret({ id: '1' })
+      const remainingSecret = createMockSecret({ id: '2' })
+      mockListSecrets.mockResolvedValue([secretToDelete, remainingSecret])
+      mockDeleteSecret.mockResolvedValue(undefined)
+
+      const { secrets, operatingSecretId, fetchSecrets, deleteSecret } =
+        useSecrets()
+
+      await fetchSecrets()
+      expect(secrets.value).toHaveLength(2)
+
+      const deletePromise = deleteSecret(secretToDelete)
+      expect(operatingSecretId.value).toBe('1')
+
+      await deletePromise
+
+      expect(operatingSecretId.value).toBe(null)
+      expect(secrets.value).toHaveLength(1)
+      expect(secrets.value[0].id).toBe('2')
+      expect(mockDeleteSecret).toHaveBeenCalledWith('1')
+    })
+
+    it('shows error toast on delete failure', async () => {
+      const { SecretsApiError } = await import('../api/secretsApi')
+      const secret = createMockSecret()
+      mockListSecrets.mockResolvedValue([secret])
+      mockDeleteSecret.mockRejectedValue(
+        new SecretsApiError('Delete failed', 500)
+      )
+
+      const { secrets, fetchSecrets, deleteSecret } = useSecrets()
+
+      await fetchSecrets()
+      await deleteSecret(secret)
+
+      expect(secrets.value).toHaveLength(1)
+      expect(mockAdd).toHaveBeenCalledWith({
+        severity: 'error',
+        summary: 'g.error',
+        detail: 'Delete failed',
+        life: 5000
+      })
+    })
+  })
+
+  describe('existingProviders', () => {
+    it('returns list of providers from secrets', async () => {
+      mockListSecrets.mockResolvedValue([
+        createMockSecret({ id: '1', provider: 'huggingface' }),
+        createMockSecret({ id: '2', provider: 'civitai' }),
+        createMockSecret({ id: '3', provider: undefined })
+      ])
+
+      const { existingProviders, fetchSecrets } = useSecrets()
+
+      await fetchSecrets()
+
+      expect(existingProviders.value).toEqual(['huggingface', 'civitai'])
+    })
+  })
+})
diff --git a/src/platform/secrets/composables/useSecrets.ts b/src/platform/secrets/composables/useSecrets.ts
new file mode 100644
index 0000000000..fa7438eba0
--- /dev/null
+++ b/src/platform/secrets/composables/useSecrets.ts
@@ -0,0 +1,88 @@
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import { useToastStore } from '@/platform/updates/common/toastStore'
+
+import {
+  deleteSecret as deleteSecretApi,
+  listSecrets,
+  SecretsApiError
+} from '../api/secretsApi'
+import type { SecretMetadata, SecretProvider } from '../types'
+
+export function useSecrets() {
+  const { t } = useI18n()
+  const toastStore = useToastStore()
+
+  const loading = ref(false)
+  const secrets = ref<SecretMetadata[]>([])
+  const operatingSecretId = ref<string | null>(null)
+
+  const existingProviders = computed<SecretProvider[]>(() =>
+    secrets.value
+      .map((s) => s.provider)
+      .filter((p): p is SecretProvider => p !== undefined)
+  )
+
+  async function fetchSecrets() {
+    loading.value = true
+    try {
+      secrets.value = await listSecrets()
+    } catch (err) {
+      if (err instanceof SecretsApiError) {
+        toastStore.add({
+          severity: 'error',
+          summary: t('g.error'),
+          detail: err.message,
+          life: 5000
+        })
+      } else {
+        console.error('Unexpected error fetching secrets:', err)
+        toastStore.add({
+          severity: 'error',
+          summary: t('g.error'),
+          detail: t('g.unknownError'),
+          life: 5000
+        })
+      }
+    } finally {
+      loading.value = false
+    }
+  }
+
+  async function deleteSecret(secret: SecretMetadata) {
+    operatingSecretId.value = secret.id
+    try {
+      await deleteSecretApi(secret.id)
+      secrets.value = secrets.value.filter((s) => s.id !== secret.id)
+    } catch (err) {
+      if (err instanceof SecretsApiError) {
+        toastStore.add({
+          severity: 'error',
+          summary: t('g.error'),
+          detail: err.message,
+          life: 5000
+        })
+      } else {
+        console.error('Unexpected error deleting secret:', err)
+        toastStore.add({
+          severity: 'error',
+          summary: t('g.error'),
+          detail: t('g.unknownError'),
+          life: 5000
+        })
+      }
+    } finally {
+      operatingSecretId.value = null
+    }
+  }
+
+  return {
+    loading,
+    secrets,
+    operatingSecretId,
+    existingProviders,
+    fetchSecrets,
+    deleteSecret
+  }
+}
diff --git a/src/platform/secrets/providers.ts b/src/platform/secrets/providers.ts
new file mode 100644
index 0000000000..f1dff2bd95
--- /dev/null
+++ b/src/platform/secrets/providers.ts
@@ -0,0 +1,30 @@
+import type { SecretProvider } from './types'
+
+interface ProviderConfig {
+  value: SecretProvider
+  label: string
+  logo: string
+}
+
+export const SECRET_PROVIDERS: ProviderConfig[] = [
+  {
+    value: 'huggingface',
+    label: 'HuggingFace',
+    logo: '/assets/images/hf-logo.svg'
+  },
+  { value: 'civitai', label: 'Civitai', logo: '/assets/images/civitai.svg' }
+] as const
+
+export function getProviderLabel(provider: SecretProvider | undefined): string {
+  if (!provider) return ''
+  const config = SECRET_PROVIDERS.find((p) => p.value === provider)
+  return config?.label ?? provider
+}
+
+export function getProviderLogo(
+  provider: SecretProvider | undefined
+): string | undefined {
+  if (!provider) return undefined
+  const config = SECRET_PROVIDERS.find((p) => p.value === provider)
+  return config?.logo
+}
diff --git a/src/platform/secrets/types.ts b/src/platform/secrets/types.ts
new file mode 100644
index 0000000000..a0fe2f0dbc
--- /dev/null
+++ b/src/platform/secrets/types.ts
@@ -0,0 +1,32 @@
+export type SecretProvider = 'huggingface' | 'civitai'
+
+export interface SecretMetadata {
+  id: string
+  name: string
+  provider?: SecretProvider
+  last_used_at?: string
+  created_at: string
+  updated_at: string
+}
+
+export interface SecretCreateRequest {
+  name: string
+  secret_value: string
+  provider?: SecretProvider
+}
+
+export interface SecretUpdateRequest {
+  name?: string
+  secret_value?: string
+}
+
+export const SECRET_ERROR_CODES = [
+  'INVALID_REQUEST',
+  'INVALID_PROVIDER',
+  'DUPLICATE_NAME',
+  'DUPLICATE_PROVIDER',
+  'FORBIDDEN',
+  'NOT_FOUND'
+] as const
+
+export type SecretErrorCode = (typeof SECRET_ERROR_CODES)[number]
diff --git a/src/platform/settings/components/ExtensionPanel.vue b/src/platform/settings/components/ExtensionPanel.vue
index cd5a7890fd..0abf42cd15 100644
--- a/src/platform/settings/components/ExtensionPanel.vue
+++ b/src/platform/settings/components/ExtensionPanel.vue
@@ -1,31 +1,29 @@
 <template>
-  <PanelTemplate value="Extension" class="extension-panel">
-    <template #header>
-      <SearchBox
-        v-model="filters['global'].value"
-        :placeholder="$t('g.searchExtensions') + '...'"
-      />
-      <Message
-        v-if="hasChanges"
-        severity="info"
-        pt:text="w-full"
-        class="max-h-96 overflow-y-auto"
-      >
-        <ul>
-          <li v-for="ext in changedExtensions" :key="ext.name">
-            <span>
-              {{ extensionStore.isExtensionEnabled(ext.name) ? '[-]' : '[+]' }}
-            </span>
-            {{ ext.name }}
-          </li>
-        </ul>
-        <div class="flex justify-end">
-          <Button variant="destructive" @click="applyChanges">
-            {{ $t('g.reloadToApplyChanges') }}
-          </Button>
-        </div>
-      </Message>
-    </template>
+  <div class="extension-panel flex flex-col gap-2">
+    <SearchBox
+      v-model="filters['global'].value"
+      :placeholder="$t('g.searchPlaceholder', { subject: $t('g.extensions') })"
+    />
+    <Message
+      v-if="hasChanges"
+      severity="info"
+      pt:text="w-full"
+      class="max-h-96 overflow-y-auto"
+    >
+      <ul>
+        <li v-for="ext in changedExtensions" :key="ext.name">
+          <span>
+            {{ extensionStore.isExtensionEnabled(ext.name) ? '[-]' : '[+]' }}
+          </span>
+          {{ ext.name }}
+        </li>
+      </ul>
+      <div class="flex justify-end">
+        <Button variant="destructive" @click="applyChanges">
+          {{ $t('g.reloadToApplyChanges') }}
+        </Button>
+      </div>
+    </Message>
     <div class="mb-3 flex gap-2">
       <SelectButton
         v-model="filterType"
@@ -79,7 +77,7 @@
         </template>
       </Column>
     </DataTable>
-  </PanelTemplate>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -95,7 +93,6 @@ import { computed, onMounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import SearchBox from '@/components/common/SearchBox.vue'
-import PanelTemplate from '@/components/dialog/content/setting/PanelTemplate.vue'
 import Button from '@/components/ui/button/Button.vue'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { useExtensionStore } from '@/stores/extensionStore'
diff --git a/src/platform/settings/components/ServerConfigPanel.vue b/src/platform/settings/components/ServerConfigPanel.vue
index 1632d0335b..2ab713fd78 100644
--- a/src/platform/settings/components/ServerConfigPanel.vue
+++ b/src/platform/settings/components/ServerConfigPanel.vue
@@ -1,46 +1,39 @@
 <template>
-  <PanelTemplate value="Server-Config" class="server-config-panel">
-    <template #header>
-      <div class="flex flex-col gap-2">
-        <Message
-          v-if="modifiedConfigs.length > 0"
-          severity="info"
-          pt:text="w-full"
-        >
-          <p>
-            {{ $t('serverConfig.modifiedConfigs') }}
-          </p>
-          <ul>
-            <li v-for="config in modifiedConfigs" :key="config.id">
-              {{ config.name }}: {{ config.initialValue }} → {{ config.value }}
-            </li>
-          </ul>
-          <div class="flex justify-end gap-2">
-            <Button variant="secondary" @click="revertChanges">
-              {{ $t('serverConfig.revertChanges') }}
-            </Button>
-            <Button variant="destructive" @click="restartApp">
-              {{ $t('serverConfig.restart') }}
-            </Button>
-          </div>
-        </Message>
-        <Message v-if="commandLineArgs" severity="secondary" pt:text="w-full">
-          <template #icon>
-            <i class="icon-[lucide--terminal] text-xl font-bold" />
-          </template>
-          <div class="flex items-center justify-between">
-            <p>{{ commandLineArgs }}</p>
-            <Button
-              size="icon"
-              variant="muted-textonly"
-              @click="copyCommandLineArgs"
-            >
-              <i class="pi pi-clipboard" />
-            </Button>
-          </div>
-        </Message>
+  <div class="server-config-panel flex flex-col gap-2">
+    <Message v-if="modifiedConfigs.length > 0" severity="info" pt:text="w-full">
+      <p>
+        {{ $t('serverConfig.modifiedConfigs') }}
+      </p>
+      <ul>
+        <li v-for="config in modifiedConfigs" :key="config.id">
+          {{ config.name }}: {{ config.initialValue }} → {{ config.value }}
+        </li>
+      </ul>
+      <div class="flex justify-end gap-2">
+        <Button variant="secondary" @click="revertChanges">
+          {{ $t('serverConfig.revertChanges') }}
+        </Button>
+        <Button variant="destructive" @click="restartApp">
+          {{ $t('serverConfig.restart') }}
+        </Button>
       </div>
-    </template>
+    </Message>
+    <Message v-if="commandLineArgs" severity="secondary" pt:text="w-full">
+      <template #icon>
+        <i class="icon-[lucide--terminal] text-xl font-bold" />
+      </template>
+      <div class="flex items-center justify-between">
+        <p>{{ commandLineArgs }}</p>
+        <Button
+          size="icon"
+          variant="muted-textonly"
+          :aria-label="$t('g.copyToClipboard')"
+          @click="copyCommandLineArgs"
+        >
+          <i class="pi pi-clipboard" />
+        </Button>
+      </div>
+    </Message>
     <div
       v-for="([label, items], i) in Object.entries(serverConfigsByCategory)"
       :key="label"
@@ -58,7 +51,7 @@
         />
       </div>
     </div>
-  </PanelTemplate>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -69,10 +62,9 @@ import { onBeforeUnmount, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import FormItem from '@/components/common/FormItem.vue'
-import PanelTemplate from '@/components/dialog/content/setting/PanelTemplate.vue'
 import Button from '@/components/ui/button/Button.vue'
 import { useCopyToClipboard } from '@/composables/useCopyToClipboard'
-import type { ServerConfig } from '@/constants/serverConfig'
+import type { ServerConfig, ServerConfigValue } from '@/constants/serverConfig'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import type { FormItem as FormItemType } from '@/platform/settings/types'
 import { useToastStore } from '@/platform/updates/common/toastStore'
@@ -133,7 +125,7 @@ onBeforeUnmount(() => {
   })
 })
 
-const translateItem = (item: ServerConfig<any>): FormItemType => {
+const translateItem = (item: ServerConfig<ServerConfigValue>): FormItemType => {
   return {
     ...item,
     name: t(`serverConfigItems.${item.id}.name`, item.name),
diff --git a/src/platform/settings/components/SettingDialog.vue b/src/platform/settings/components/SettingDialog.vue
new file mode 100644
index 0000000000..89baba3013
--- /dev/null
+++ b/src/platform/settings/components/SettingDialog.vue
@@ -0,0 +1,256 @@
+<template>
+  <BaseModalLayout content-title="" data-testid="settings-dialog" size="md">
+    <template #leftPanelHeaderTitle>
+      <i class="icon-[lucide--settings]" />
+      <h2 class="text-neutral text-base">{{ $t('g.settings') }}</h2>
+    </template>
+
+    <template #leftPanel>
+      <div class="px-3">
+        <SearchBox
+          v-model:model-value="searchQuery"
+          size="md"
+          :placeholder="$t('g.searchSettings') + '...'"
+          :debounce-time="128"
+          @search="handleSearch"
+        />
+      </div>
+
+      <nav
+        ref="navRef"
+        class="flex scrollbar-hide flex-1 flex-col gap-1 overflow-y-auto px-3 py-4"
+      >
+        <div
+          v-for="(group, index) in navGroups"
+          :key="index"
+          class="flex flex-col gap-2"
+        >
+          <NavTitle :title="group.title" />
+          <NavItem
+            v-for="item in group.items"
+            :key="item.id"
+            :data-nav-id="item.id"
+            :icon="item.icon"
+            :badge="item.badge"
+            :active="activeCategoryKey === item.id"
+            @click="onNavItemClick(item.id)"
+          >
+            {{ item.label }}
+          </NavItem>
+        </div>
+      </nav>
+    </template>
+
+    <template #header />
+
+    <template #content>
+      <template v-if="activePanel">
+        <Suspense>
+          <component :is="activePanel.component" v-bind="activePanel.props" />
+          <template #fallback>
+            <div>
+              {{ $t('g.loadingPanel', { panel: activePanel.node.label }) }}
+            </div>
+          </template>
+        </Suspense>
+      </template>
+      <template v-else-if="inSearch">
+        <SettingsPanel :setting-groups="searchResults" />
+      </template>
+      <template v-else-if="activeSettingCategory">
+        <CurrentUserMessage v-if="activeSettingCategory.label === 'Comfy'" />
+        <ColorPaletteMessage
+          v-if="activeSettingCategory.label === 'Appearance'"
+        />
+        <SettingsPanel :setting-groups="sortedGroups(activeSettingCategory)" />
+      </template>
+    </template>
+  </BaseModalLayout>
+</template>
+
+<script setup lang="ts">
+import { computed, nextTick, onBeforeUnmount, provide, ref, watch } from 'vue'
+
+import SearchBox from '@/components/common/SearchBox.vue'
+import CurrentUserMessage from '@/components/dialog/content/setting/CurrentUserMessage.vue'
+import BaseModalLayout from '@/components/widget/layout/BaseModalLayout.vue'
+import NavItem from '@/components/widget/nav/NavItem.vue'
+import NavTitle from '@/components/widget/nav/NavTitle.vue'
+import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
+import ColorPaletteMessage from '@/platform/settings/components/ColorPaletteMessage.vue'
+import SettingsPanel from '@/platform/settings/components/SettingsPanel.vue'
+import { useSettingSearch } from '@/platform/settings/composables/useSettingSearch'
+import { useSettingUI } from '@/platform/settings/composables/useSettingUI'
+import type { SettingTreeNode } from '@/platform/settings/settingStore'
+import type {
+  ISettingGroup,
+  SettingPanelType,
+  SettingParams
+} from '@/platform/settings/types'
+import { OnCloseKey } from '@/types/widgetTypes'
+import { flattenTree } from '@/utils/treeUtil'
+
+const { onClose, defaultPanel, scrollToSettingId } = defineProps<{
+  onClose: () => void
+  defaultPanel?: SettingPanelType
+  scrollToSettingId?: string
+}>()
+
+provide(OnCloseKey, onClose)
+
+const {
+  defaultCategory,
+  settingCategories,
+  navGroups,
+  findCategoryByKey,
+  findPanelByKey
+} = useSettingUI(defaultPanel, scrollToSettingId)
+
+const {
+  searchQuery,
+  inSearch,
+  searchResultsCategories,
+  matchedNavItemKeys,
+  handleSearch: handleSearchBase,
+  getSearchResults
+} = useSettingSearch()
+
+const authActions = useFirebaseAuthActions()
+
+const navRef = ref<HTMLElement | null>(null)
+const activeCategoryKey = ref<string | null>(defaultCategory.value?.key ?? null)
+
+const searchableNavItems = computed(() =>
+  navGroups.value.flatMap((g) =>
+    g.items.map((item) => ({
+      key: item.id,
+      label: item.label
+    }))
+  )
+)
+
+watch(
+  [searchResultsCategories, matchedNavItemKeys],
+  ([categories, navKeys]) => {
+    if (!inSearch.value || (categories.size === 0 && navKeys.size === 0)) return
+    const firstMatch = navGroups.value
+      .flatMap((g) => g.items)
+      .find((item) => {
+        if (navKeys.has(item.id)) return true
+        const node = findCategoryByKey(item.id)
+        return node && categories.has(node.label)
+      })
+    activeCategoryKey.value = firstMatch?.id ?? null
+  }
+)
+
+const activeSettingCategory = computed<SettingTreeNode | null>(() => {
+  if (!activeCategoryKey.value) return null
+  return (
+    settingCategories.value.find((c) => c.key === activeCategoryKey.value) ??
+    null
+  )
+})
+
+const activePanel = computed(() => {
+  if (!activeCategoryKey.value) return null
+  return findPanelByKey(activeCategoryKey.value)
+})
+
+const getGroupSortOrder = (group: SettingTreeNode): number =>
+  Math.max(0, ...flattenTree<SettingParams>(group).map((s) => s.sortOrder ?? 0))
+
+function sortedGroups(category: SettingTreeNode): ISettingGroup[] {
+  return [...(category.children ?? [])]
+    .sort((a, b) => {
+      const orderDiff = getGroupSortOrder(b) - getGroupSortOrder(a)
+      return orderDiff !== 0 ? orderDiff : a.label.localeCompare(b.label)
+    })
+    .map((group) => ({
+      label: group.label,
+      settings: flattenTree<SettingParams>(group).sort((a, b) => {
+        const sortOrderA = a.sortOrder ?? 0
+        const sortOrderB = b.sortOrder ?? 0
+        return sortOrderB - sortOrderA
+      })
+    }))
+}
+
+function handleSearch(query: string) {
+  handleSearchBase(query.trim(), searchableNavItems.value)
+  if (query) {
+    activeCategoryKey.value = null
+  } else if (!activeCategoryKey.value) {
+    activeCategoryKey.value = defaultCategory.value?.key ?? null
+  }
+}
+
+function onNavItemClick(id: string) {
+  activeCategoryKey.value = id
+}
+
+const searchResults = computed<ISettingGroup[]>(() => getSearchResults(null))
+
+// Scroll to and highlight the target setting once the correct category renders.
+if (scrollToSettingId) {
+  const stopScrollWatch = watch(
+    activeCategoryKey,
+    () => {
+      void nextTick(() => {
+        const el = document.querySelector(
+          `[data-setting-id="${CSS.escape(scrollToSettingId)}"]`
+        )
+        if (!el) return
+        stopScrollWatch()
+        el.scrollIntoView({ behavior: 'smooth', block: 'center' })
+        el.classList.add('setting-highlight')
+        el.addEventListener(
+          'animationend',
+          () => el.classList.remove('setting-highlight'),
+          { once: true }
+        )
+      })
+    },
+    { immediate: true }
+  )
+  onBeforeUnmount(stopScrollWatch)
+}
+
+watch(activeCategoryKey, (newKey, oldKey) => {
+  if (!newKey && !inSearch.value) {
+    activeCategoryKey.value = oldKey
+  }
+  if (newKey === 'credits') {
+    void authActions.fetchBalance()
+  }
+  if (newKey) {
+    void nextTick(() => {
+      navRef.value
+        ?.querySelector(`[data-nav-id="${newKey}"]`)
+        ?.scrollIntoView({ block: 'nearest', behavior: 'smooth' })
+    })
+  }
+})
+</script>
+
+<style>
+@media (prefers-reduced-motion: no-preference) {
+  .setting-highlight {
+    animation: setting-highlight-pulse 1.5s ease-in-out;
+  }
+}
+
+@keyframes setting-highlight-pulse {
+  0%,
+  100% {
+    background-color: transparent;
+  }
+  30% {
+    background-color: color-mix(
+      in srgb,
+      var(--p-primary-color) 15%,
+      transparent
+    );
+  }
+}
+</style>
diff --git a/src/platform/settings/components/SettingDialogContent.vue b/src/platform/settings/components/SettingDialogContent.vue
deleted file mode 100644
index 13da104375..0000000000
--- a/src/platform/settings/components/SettingDialogContent.vue
+++ /dev/null
@@ -1,197 +0,0 @@
-<template>
-  <div class="settings-container">
-    <ScrollPanel class="settings-sidebar w-48 shrink-0 p-2 2xl:w-64">
-      <SearchBox
-        v-model:model-value="searchQuery"
-        class="settings-search-box mb-2 w-full"
-        :placeholder="$t('g.searchSettings') + '...'"
-        :debounce-time="128"
-        autofocus
-        @search="handleSearch"
-      />
-      <Listbox
-        v-model="activeCategory"
-        :options="groupedMenuTreeNodes"
-        option-label="translatedLabel"
-        option-group-label="label"
-        option-group-children="children"
-        scroll-height="100%"
-        :option-disabled="
-          (option: SettingTreeNode) =>
-            !queryIsEmpty && !searchResultsCategories.has(option.label ?? '')
-        "
-        class="w-full border-none"
-      >
-        <template #optiongroup>
-          <Divider class="my-0" />
-        </template>
-      </Listbox>
-    </ScrollPanel>
-    <Divider layout="vertical" class="mx-1 hidden md:flex 2xl:mx-4" />
-    <Divider layout="horizontal" class="flex md:hidden" />
-    <Tabs :value="tabValue" :lazy="true" class="settings-content h-full w-full">
-      <TabPanels class="settings-tab-panels h-full w-full pr-0">
-        <PanelTemplate value="Search Results">
-          <SettingsPanel :setting-groups="searchResults" />
-        </PanelTemplate>
-
-        <PanelTemplate
-          v-for="category in settingCategories"
-          :key="category.key"
-          :value="category.label ?? ''"
-        >
-          <template #header>
-            <CurrentUserMessage v-if="tabValue === 'Comfy'" />
-            <ColorPaletteMessage v-if="tabValue === 'Appearance'" />
-          </template>
-          <SettingsPanel :setting-groups="sortedGroups(category)" />
-        </PanelTemplate>
-
-        <Suspense v-for="panel in panels" :key="panel.node.key">
-          <component :is="panel.component" />
-          <template #fallback>
-            <div>{{ $t('g.loadingPanel', { panel: panel.node.label }) }}</div>
-          </template>
-        </Suspense>
-      </TabPanels>
-    </Tabs>
-  </div>
-</template>
-
-<script setup lang="ts">
-import Divider from 'primevue/divider'
-import Listbox from 'primevue/listbox'
-import ScrollPanel from 'primevue/scrollpanel'
-import TabPanels from 'primevue/tabpanels'
-import Tabs from 'primevue/tabs'
-import { computed, watch } from 'vue'
-
-import SearchBox from '@/components/common/SearchBox.vue'
-import CurrentUserMessage from '@/components/dialog/content/setting/CurrentUserMessage.vue'
-import PanelTemplate from '@/components/dialog/content/setting/PanelTemplate.vue'
-import { useFirebaseAuthActions } from '@/composables/auth/useFirebaseAuthActions'
-import ColorPaletteMessage from '@/platform/settings/components/ColorPaletteMessage.vue'
-import SettingsPanel from '@/platform/settings/components/SettingsPanel.vue'
-import { useSettingSearch } from '@/platform/settings/composables/useSettingSearch'
-import { useSettingUI } from '@/platform/settings/composables/useSettingUI'
-import type { SettingTreeNode } from '@/platform/settings/settingStore'
-import type { ISettingGroup, SettingParams } from '@/platform/settings/types'
-import { flattenTree } from '@/utils/treeUtil'
-
-const { defaultPanel } = defineProps<{
-  defaultPanel?:
-    | 'about'
-    | 'keybinding'
-    | 'extension'
-    | 'server-config'
-    | 'user'
-    | 'credits'
-}>()
-
-const {
-  activeCategory,
-  defaultCategory,
-  settingCategories,
-  groupedMenuTreeNodes,
-  panels
-} = useSettingUI(defaultPanel)
-
-const {
-  searchQuery,
-  searchResultsCategories,
-  queryIsEmpty,
-  inSearch,
-  handleSearch: handleSearchBase,
-  getSearchResults
-} = useSettingSearch()
-
-const authActions = useFirebaseAuthActions()
-
-// Get max sortOrder from settings in a group
-const getGroupSortOrder = (group: SettingTreeNode): number =>
-  Math.max(0, ...flattenTree<SettingParams>(group).map((s) => s.sortOrder ?? 0))
-
-// Sort groups for a category
-const sortedGroups = (category: SettingTreeNode): ISettingGroup[] => {
-  return [...(category.children ?? [])]
-    .sort((a, b) => {
-      const orderDiff = getGroupSortOrder(b) - getGroupSortOrder(a)
-      return orderDiff !== 0 ? orderDiff : a.label.localeCompare(b.label)
-    })
-    .map((group) => ({
-      label: group.label,
-      settings: flattenTree<SettingParams>(group).sort((a, b) => {
-        const sortOrderA = a.sortOrder ?? 0
-        const sortOrderB = b.sortOrder ?? 0
-
-        return sortOrderB - sortOrderA
-      })
-    }))
-}
-
-const handleSearch = (query: string) => {
-  handleSearchBase(query.trim())
-  activeCategory.value = query ? null : defaultCategory.value
-}
-
-// Get search results
-const searchResults = computed<ISettingGroup[]>(() =>
-  getSearchResults(activeCategory.value)
-)
-
-const tabValue = computed<string>(() =>
-  inSearch.value ? 'Search Results' : (activeCategory.value?.label ?? '')
-)
-
-// Don't allow null category to be set outside of search.
-// In search mode, the active category can be null to show all search results.
-watch(activeCategory, (_, oldValue) => {
-  if (!tabValue.value) {
-    activeCategory.value = oldValue
-  }
-  if (activeCategory.value?.key === 'credits') {
-    void authActions.fetchBalance()
-  }
-})
-</script>
-
-<style>
-.settings-tab-panels {
-  padding-top: 0 !important;
-}
-</style>
-
-<style scoped>
-.settings-container {
-  display: flex;
-  height: 70vh;
-  width: 60vw;
-  max-width: 64rem;
-  overflow: hidden;
-}
-
-.settings-content {
-  overflow-x: auto;
-}
-
-@media (max-width: 768px) {
-  .settings-container {
-    flex-direction: column;
-    height: auto;
-    width: 80vw;
-  }
-
-  .settings-sidebar {
-    width: 100%;
-  }
-
-  .settings-content {
-    height: 350px;
-  }
-}
-
-/* Hide the first group separator */
-.settings-sidebar :deep(.p-listbox-option-group:nth-child(1)) {
-  display: none;
-}
-</style>
diff --git a/src/platform/settings/components/SettingGroup.vue b/src/platform/settings/components/SettingGroup.vue
index ea18aa5692..5824322041 100644
--- a/src/platform/settings/components/SettingGroup.vue
+++ b/src/platform/settings/components/SettingGroup.vue
@@ -2,6 +2,15 @@
   <div class="setting-group">
     <Divider v-if="divider" />
     <h3>
+      <span v-if="group.category" class="text-muted">
+        {{
+          $t(
+            `settingsCategories.${normalizeI18nKey(group.category)}`,
+            group.category
+          )
+        }}
+        &#8250;
+      </span>
       {{
         $t(`settingsCategories.${normalizeI18nKey(group.label)}`, group.label)
       }}
@@ -9,6 +18,7 @@
     <div
       v-for="setting in group.settings.filter((s) => !s.deprecated)"
       :key="setting.id"
+      :data-setting-id="setting.id"
       class="setting-item mb-4"
     >
       <SettingItem :setting="setting" />
@@ -26,6 +36,7 @@ import { normalizeI18nKey } from '@/utils/formatUtil'
 defineProps<{
   group: {
     label: string
+    category?: string
     settings: SettingParams[]
   }
   divider?: boolean
diff --git a/tests-ui/tests/platform/settings/components/SettingItem.test.ts b/src/platform/settings/components/SettingItem.test.ts
similarity index 100%
rename from tests-ui/tests/platform/settings/components/SettingItem.test.ts
rename to src/platform/settings/components/SettingItem.test.ts
diff --git a/src/platform/settings/components/SettingItem.vue b/src/platform/settings/components/SettingItem.vue
index 91f92b2e94..89260db935 100644
--- a/src/platform/settings/components/SettingItem.vue
+++ b/src/platform/settings/components/SettingItem.vue
@@ -40,6 +40,7 @@ const props = defineProps<{
 }>()
 
 const { t } = useI18n()
+
 function translateOptions(options: (SettingOption | string)[]) {
   if (typeof options === 'function') {
     // @ts-expect-error: Audit and deprecate usage of legacy options type:
diff --git a/tests-ui/tests/composables/useSettingSearch.test.ts b/src/platform/settings/composables/useSettingSearch.test.ts
similarity index 74%
rename from tests-ui/tests/composables/useSettingSearch.test.ts
rename to src/platform/settings/composables/useSettingSearch.test.ts
index ba63256e8d..dd173e8e82 100644
--- a/tests-ui/tests/composables/useSettingSearch.test.ts
+++ b/src/platform/settings/composables/useSettingSearch.test.ts
@@ -8,6 +8,17 @@ import {
   getSettingInfo,
   useSettingStore
 } from '@/platform/settings/settingStore'
+import type { SettingTreeNode } from '@/platform/settings/settingStore'
+
+// Test-specific type for mock settings
+interface MockSettingParams {
+  id: string
+  name: string
+  type: string
+  defaultValue: unknown
+  category?: string[]
+  deprecated?: boolean
+}
 
 // Mock dependencies
 vi.mock('@/i18n', () => ({
@@ -20,8 +31,8 @@ vi.mock('@/platform/settings/settingStore', () => ({
 }))
 
 describe('useSettingSearch', () => {
-  let mockSettingStore: any
-  let mockSettings: any
+  let mockSettingStore: ReturnType<typeof useSettingStore>
+  let mockSettings: Record<string, MockSettingParams>
 
   beforeEach(() => {
     setActivePinia(createPinia())
@@ -70,11 +81,11 @@ describe('useSettingSearch', () => {
     // Mock setting store
     mockSettingStore = {
       settingsById: mockSettings
-    }
+    } as ReturnType<typeof useSettingStore>
     vi.mocked(useSettingStore).mockReturnValue(mockSettingStore)
 
     // Mock getSettingInfo function
-    vi.mocked(getSettingInfo).mockImplementation((setting: any) => {
+    vi.mocked(getSettingInfo).mockImplementation((setting) => {
       const parts = setting.category || setting.id.split('.')
       return {
         category: parts[0] ?? 'Other',
@@ -288,10 +299,12 @@ describe('useSettingSearch', () => {
       expect(results).toEqual([
         {
           label: 'Basic',
+          category: 'Category',
           settings: [mockSettings['Category.Setting1']]
         },
         {
           label: 'Advanced',
+          category: 'Category',
           settings: [mockSettings['Category.Setting2']]
         }
       ])
@@ -301,8 +314,8 @@ describe('useSettingSearch', () => {
       const search = useSettingSearch()
       search.filteredSettingIds.value = ['Category.Setting1', 'Other.Setting3']
 
-      const activeCategory = { label: 'Category' } as any
-      const results = search.getSearchResults(activeCategory)
+      const activeCategory: Partial<SettingTreeNode> = { label: 'Category' }
+      const results = search.getSearchResults(activeCategory as SettingTreeNode)
 
       expect(results).toEqual([
         {
@@ -321,15 +334,50 @@ describe('useSettingSearch', () => {
       expect(results).toEqual([
         {
           label: 'Basic',
+          category: 'Category',
           settings: [mockSettings['Category.Setting1']]
         },
         {
           label: 'SubCategory',
+          category: 'Other',
           settings: [mockSettings['Other.Setting3']]
         }
       ])
     })
 
+    it('returns results from all categories when searching cross-category term', () => {
+      // Simulates the "badge" scenario: same term matches settings in
+      // multiple categories (e.g. LiteGraph and Comfy)
+      mockSettings['LiteGraph.BadgeSetting'] = {
+        id: 'LiteGraph.BadgeSetting',
+        name: 'Node source badge mode',
+        type: 'combo',
+        defaultValue: 'default',
+        category: ['LiteGraph', 'Node']
+      }
+      mockSettings['Comfy.BadgeSetting'] = {
+        id: 'Comfy.BadgeSetting',
+        name: 'Show API node pricing badge',
+        type: 'boolean',
+        defaultValue: true,
+        category: ['Comfy', 'API Nodes']
+      }
+
+      const search = useSettingSearch()
+      search.handleSearch('badge')
+
+      expect(search.filteredSettingIds.value).toContain(
+        'LiteGraph.BadgeSetting'
+      )
+      expect(search.filteredSettingIds.value).toContain('Comfy.BadgeSetting')
+
+      // getSearchResults(null) should return both categories' results
+      const results = search.getSearchResults(null)
+      const labels = results.map((g) => g.label)
+      expect(labels).toContain('Node')
+      expect(labels).toContain('API Nodes')
+    })
+
     it('returns empty array when no filtered results', () => {
       const search = useSettingSearch()
       search.filteredSettingIds.value = []
@@ -361,6 +409,7 @@ describe('useSettingSearch', () => {
       expect(results).toEqual([
         {
           label: 'Basic',
+          category: 'Category',
           settings: [
             mockSettings['Category.Setting1'],
             mockSettings['Category.Setting4']
@@ -370,6 +419,75 @@ describe('useSettingSearch', () => {
     })
   })
 
+  describe('nav item matching', () => {
+    const navItems = [
+      { key: 'keybinding', label: 'Keybinding' },
+      { key: 'about', label: 'About' },
+      { key: 'extension', label: 'Extension' },
+      { key: 'Comfy', label: 'Comfy' }
+    ]
+
+    it('matches nav items by key', () => {
+      const search = useSettingSearch()
+
+      search.handleSearch('keybinding', navItems)
+
+      expect(search.matchedNavItemKeys.value.has('keybinding')).toBe(true)
+    })
+
+    it('matches nav items by translated label (case insensitive)', () => {
+      const search = useSettingSearch()
+
+      search.handleSearch('ABOUT', navItems)
+
+      expect(search.matchedNavItemKeys.value.has('about')).toBe(true)
+    })
+
+    it('matches partial nav item labels', () => {
+      const search = useSettingSearch()
+
+      search.handleSearch('ext', navItems)
+
+      expect(search.matchedNavItemKeys.value.has('extension')).toBe(true)
+    })
+
+    it('clears matched nav item keys on empty query', () => {
+      const search = useSettingSearch()
+
+      search.handleSearch('keybinding', navItems)
+      expect(search.matchedNavItemKeys.value.size).toBeGreaterThan(0)
+
+      search.handleSearch('', navItems)
+      expect(search.matchedNavItemKeys.value.size).toBe(0)
+    })
+
+    it('can match both settings and nav items simultaneously', () => {
+      const search = useSettingSearch()
+
+      search.handleSearch('other', navItems)
+
+      expect(search.filteredSettingIds.value).toContain('Other.Setting3')
+      expect(search.matchedNavItemKeys.value.size).toBe(0)
+    })
+
+    it('matches nav items with translated labels different from key', () => {
+      const translatedNavItems = [{ key: 'keybinding', label: '키 바인딩' }]
+      const search = useSettingSearch()
+
+      search.handleSearch('키 바인딩', translatedNavItems)
+
+      expect(search.matchedNavItemKeys.value.has('keybinding')).toBe(true)
+    })
+
+    it('does not match nav items when no nav items provided', () => {
+      const search = useSettingSearch()
+
+      search.handleSearch('keybinding')
+
+      expect(search.matchedNavItemKeys.value.size).toBe(0)
+    })
+  })
+
   describe('edge cases', () => {
     it('handles empty settings store', () => {
       mockSettingStore.settingsById = {}
diff --git a/src/platform/settings/composables/useSettingSearch.ts b/src/platform/settings/composables/useSettingSearch.ts
index a2d29f2a64..a5a6d6fedd 100644
--- a/src/platform/settings/composables/useSettingSearch.ts
+++ b/src/platform/settings/composables/useSettingSearch.ts
@@ -10,12 +10,18 @@ import type { ISettingGroup, SettingParams } from '@/platform/settings/types'
 import { normalizeI18nKey } from '@/utils/formatUtil'
 import { useVueFeatureFlags } from '@/composables/useVueFeatureFlags'
 
+interface SearchableNavItem {
+  key: string
+  label: string
+}
+
 export function useSettingSearch() {
   const settingStore = useSettingStore()
   const { shouldRenderVueNodes } = useVueFeatureFlags()
 
   const searchQuery = ref<string>('')
   const filteredSettingIds = ref<string[]>([])
+  const matchedNavItemKeys = ref<Set<string>>(new Set())
   const searchInProgress = ref<boolean>(false)
 
   watch(searchQuery, () => (searchInProgress.value = true))
@@ -46,7 +52,9 @@ export function useSettingSearch() {
   /**
    * Handle search functionality
    */
-  const handleSearch = (query: string) => {
+  const handleSearch = (query: string, navItems?: SearchableNavItem[]) => {
+    matchedNavItemKeys.value = new Set()
+
     if (!query) {
       filteredSettingIds.value = []
       return
@@ -89,6 +97,17 @@ export function useSettingSearch() {
       )
     })
 
+    if (navItems) {
+      for (const item of navItems) {
+        if (
+          item.key.toLocaleLowerCase().includes(queryLower) ||
+          item.label.toLocaleLowerCase().includes(queryLower)
+        ) {
+          matchedNavItemKeys.value.add(item.key)
+        }
+      }
+    }
+
     filteredSettingIds.value = filteredSettings.map((x) => x.id)
     searchInProgress.value = false
   }
@@ -99,30 +118,42 @@ export function useSettingSearch() {
   const getSearchResults = (
     activeCategory: SettingTreeNode | null
   ): ISettingGroup[] => {
-    const groupedSettings: { [key: string]: SettingParams[] } = {}
+    const groupedSettings: {
+      [key: string]: { category: string; settings: SettingParams[] }
+    } = {}
 
     filteredSettingIds.value.forEach((id) => {
       const setting = settingStore.settingsById[id]
       const info = getSettingInfo(setting)
-      const groupLabel = info.subCategory
+      const groupKey =
+        activeCategory === null
+          ? `${info.category}/${info.subCategory}`
+          : info.subCategory
 
       if (activeCategory === null || activeCategory.label === info.category) {
-        if (!groupedSettings[groupLabel]) {
-          groupedSettings[groupLabel] = []
+        if (!groupedSettings[groupKey]) {
+          groupedSettings[groupKey] = {
+            category: info.category,
+            settings: []
+          }
         }
-        groupedSettings[groupLabel].push(setting)
+        groupedSettings[groupKey].settings.push(setting)
       }
     })
 
-    return Object.entries(groupedSettings).map(([label, settings]) => ({
-      label,
-      settings
-    }))
+    return Object.entries(groupedSettings).map(
+      ([key, { category, settings }]) => ({
+        label: activeCategory === null ? key.split('/')[1] : key,
+        ...(activeCategory === null ? { category } : {}),
+        settings
+      })
+    )
   }
 
   return {
     searchQuery,
     filteredSettingIds,
+    matchedNavItemKeys,
     searchInProgress,
     searchResultsCategories,
     queryIsEmpty,
diff --git a/src/platform/settings/composables/useSettingUI.test.ts b/src/platform/settings/composables/useSettingUI.test.ts
new file mode 100644
index 0000000000..4d8e5983a0
--- /dev/null
+++ b/src/platform/settings/composables/useSettingUI.test.ts
@@ -0,0 +1,140 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { ref } from 'vue'
+
+import {
+  getSettingInfo,
+  useSettingStore
+} from '@/platform/settings/settingStore'
+import type { SettingTreeNode } from '@/platform/settings/settingStore'
+
+import { useSettingUI } from './useSettingUI'
+
+vi.mock('vue-i18n', () => ({
+  useI18n: () => ({ t: (_: string, fallback: string) => fallback })
+}))
+
+vi.mock('@/composables/auth/useCurrentUser', () => ({
+  useCurrentUser: () => ({ isLoggedIn: ref(false) })
+}))
+
+vi.mock('@/composables/billing/useBillingContext', () => ({
+  useBillingContext: () => ({ isActiveSubscription: ref(false) })
+}))
+
+vi.mock('@/composables/useFeatureFlags', () => ({
+  useFeatureFlags: () => ({
+    flags: { teamWorkspacesEnabled: false, userSecretsEnabled: false }
+  })
+}))
+
+vi.mock('@/composables/useVueFeatureFlags', () => ({
+  useVueFeatureFlags: () => ({ shouldRenderVueNodes: ref(false) })
+}))
+
+vi.mock('@/platform/distribution/types', () => ({
+  isCloud: false,
+  isDesktop: false
+}))
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: vi.fn(),
+  getSettingInfo: vi.fn()
+}))
+
+interface MockSettingParams {
+  id: string
+  name: string
+  type: string
+  defaultValue: unknown
+  category?: string[]
+}
+
+describe('useSettingUI', () => {
+  const mockSettings: Record<string, MockSettingParams> = {
+    'Comfy.Locale': {
+      id: 'Comfy.Locale',
+      name: 'Locale',
+      type: 'combo',
+      defaultValue: 'en'
+    },
+    'LiteGraph.Zoom': {
+      id: 'LiteGraph.Zoom',
+      name: 'Zoom',
+      type: 'slider',
+      defaultValue: 1
+    },
+    'Appearance.Theme': {
+      id: 'Appearance.Theme',
+      name: 'Theme',
+      type: 'combo',
+      defaultValue: 'dark'
+    }
+  }
+
+  beforeEach(() => {
+    setActivePinia(createTestingPinia())
+    vi.clearAllMocks()
+
+    vi.mocked(useSettingStore).mockReturnValue({
+      settingsById: mockSettings
+    } as ReturnType<typeof useSettingStore>)
+
+    vi.mocked(getSettingInfo).mockImplementation((setting) => {
+      const parts = setting.category || setting.id.split('.')
+      return {
+        category: parts[0] ?? 'Other',
+        subCategory: parts[1] ?? 'Other'
+      }
+    })
+  })
+
+  function findCategory(
+    categories: SettingTreeNode[],
+    label: string
+  ): SettingTreeNode | undefined {
+    return categories.find((c) => c.label === label)
+  }
+
+  it('defaults to first category when no params are given', () => {
+    const { defaultCategory, settingCategories } = useSettingUI()
+    expect(defaultCategory.value).toBe(settingCategories.value[0])
+  })
+
+  it('resolves category from scrollToSettingId', () => {
+    const { defaultCategory, settingCategories } = useSettingUI(
+      undefined,
+      'Comfy.Locale'
+    )
+    const comfyCategory = findCategory(settingCategories.value, 'Comfy')
+    expect(comfyCategory).toBeDefined()
+    expect(defaultCategory.value).toBe(comfyCategory)
+  })
+
+  it('resolves different category from scrollToSettingId', () => {
+    const { defaultCategory, settingCategories } = useSettingUI(
+      undefined,
+      'Appearance.Theme'
+    )
+    const appearanceCategory = findCategory(
+      settingCategories.value,
+      'Appearance'
+    )
+    expect(appearanceCategory).toBeDefined()
+    expect(defaultCategory.value).toBe(appearanceCategory)
+  })
+
+  it('falls back to first category for unknown scrollToSettingId', () => {
+    const { defaultCategory, settingCategories } = useSettingUI(
+      undefined,
+      'NonExistent.Setting'
+    )
+    expect(defaultCategory.value).toBe(settingCategories.value[0])
+  })
+
+  it('gives defaultPanel precedence over scrollToSettingId', () => {
+    const { defaultCategory } = useSettingUI('about', 'Comfy.Locale')
+    expect(defaultCategory.value.key).toBe('about')
+  })
+})
diff --git a/src/platform/settings/composables/useSettingUI.ts b/src/platform/settings/composables/useSettingUI.ts
index 79a54fba46..93be00bc36 100644
--- a/src/platform/settings/composables/useSettingUI.ts
+++ b/src/platform/settings/composables/useSettingUI.ts
@@ -3,38 +3,61 @@ import type { Component } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import { useCurrentUser } from '@/composables/auth/useCurrentUser'
-import { isCloud } from '@/platform/distribution/types'
+import { useBillingContext } from '@/composables/billing/useBillingContext'
+import { useFeatureFlags } from '@/composables/useFeatureFlags'
+import { useVueFeatureFlags } from '@/composables/useVueFeatureFlags'
+import { isCloud, isDesktop } from '@/platform/distribution/types'
+import {
+  getSettingInfo,
+  useSettingStore
+} from '@/platform/settings/settingStore'
 import type { SettingTreeNode } from '@/platform/settings/settingStore'
-import { useSettingStore } from '@/platform/settings/settingStore'
-import type { SettingParams } from '@/platform/settings/types'
-import { isElectron } from '@/utils/envUtil'
+import type { SettingPanelType, SettingParams } from '@/platform/settings/types'
+import type { NavGroupData } from '@/types/navTypes'
 import { normalizeI18nKey } from '@/utils/formatUtil'
 import { buildTree } from '@/utils/treeUtil'
-import { useVueFeatureFlags } from '@/composables/useVueFeatureFlags'
-import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
+
+const CATEGORY_ICONS: Record<string, string> = {
+  '3D': 'icon-[lucide--box]',
+  about: 'icon-[lucide--info]',
+  Appearance: 'icon-[lucide--palette]',
+  Comfy: 'icon-[lucide--settings]',
+  credits: 'icon-[lucide--coins]',
+  extension: 'icon-[lucide--puzzle]',
+  keybinding: 'icon-[lucide--keyboard]',
+  LiteGraph: 'icon-[lucide--workflow]',
+  'Mask Editor': 'icon-[lucide--pen-tool]',
+  Other: 'icon-[lucide--ellipsis]',
+  PlanCredits: 'icon-[lucide--credit-card]',
+  secrets: 'icon-[lucide--key-round]',
+  'server-config': 'icon-[lucide--server]',
+  subscription: 'icon-[lucide--credit-card]',
+  user: 'icon-[lucide--user]',
+  workspace: 'icon-[lucide--building-2]'
+}
 
 interface SettingPanelItem {
   node: SettingTreeNode
   component: Component
+  props?: Record<string, unknown>
 }
 
 export function useSettingUI(
-  defaultPanel?:
-    | 'about'
-    | 'keybinding'
-    | 'extension'
-    | 'server-config'
-    | 'user'
-    | 'credits'
-    | 'subscription'
+  defaultPanel?: SettingPanelType,
+  scrollToSettingId?: string
 ) {
   const { t } = useI18n()
   const { isLoggedIn } = useCurrentUser()
   const settingStore = useSettingStore()
   const activeCategory = ref<SettingTreeNode | null>(null)
 
+  const { flags } = useFeatureFlags()
   const { shouldRenderVueNodes } = useVueFeatureFlags()
-  const { isActiveSubscription } = useSubscription()
+  const { isActiveSubscription } = useBillingContext()
+
+  const teamWorkspacesEnabled = computed(
+    () => isCloud && flags.teamWorkspacesEnabled
+  )
 
   const settingRoot = computed<SettingTreeNode>(() => {
     const root = buildTree(
@@ -64,6 +87,33 @@ export function useSettingUI(
     () => settingRoot.value.children ?? []
   )
 
+  // Core setting categories (built-in to ComfyUI) in display order
+  // 'Other' includes floating settings that don't have a specific category
+  const CORE_CATEGORIES_ORDER = [
+    'Comfy',
+    'LiteGraph',
+    'Appearance',
+    '3D',
+    'Mask Editor',
+    'Other'
+  ]
+  const CORE_CATEGORIES = new Set(CORE_CATEGORIES_ORDER)
+
+  const coreSettingCategories = computed<SettingTreeNode[]>(() => {
+    const categories = settingCategories.value.filter((node) =>
+      CORE_CATEGORIES.has(node.label)
+    )
+    return categories.sort(
+      (a, b) =>
+        CORE_CATEGORIES_ORDER.indexOf(a.label) -
+        CORE_CATEGORIES_ORDER.indexOf(b.label)
+    )
+  })
+
+  const customNodeSettingCategories = computed<SettingTreeNode[]>(() =>
+    settingCategories.value.filter((node) => !CORE_CATEGORIES.has(node.label))
+  )
+
   // Define panel items
   const aboutPanel: SettingPanelItem = {
     node: {
@@ -118,6 +168,38 @@ export function useSettingUI(
     )
   }
 
+  // Workspace panel: only available on cloud with team workspaces enabled
+  const workspacePanel: SettingPanelItem = {
+    node: {
+      key: 'workspace',
+      label: 'Workspace',
+      children: []
+    },
+    component: defineAsyncComponent(
+      () =>
+        import('@/platform/workspace/components/dialogs/settings/WorkspacePanelContent.vue')
+    )
+  }
+
+  const shouldShowWorkspacePanel = computed(
+    () => teamWorkspacesEnabled.value && isLoggedIn.value
+  )
+
+  const secretsPanel: SettingPanelItem = {
+    node: {
+      key: 'secrets',
+      label: 'Secrets',
+      children: []
+    },
+    component: defineAsyncComponent(
+      () => import('@/platform/secrets/components/SecretsPanel.vue')
+    )
+  }
+
+  const shouldShowSecretsPanel = computed(
+    () => flags.userSecretsEnabled && isLoggedIn.value
+  )
+
   const keybindingPanel: SettingPanelItem = {
     node: {
       key: 'keybinding',
@@ -156,25 +238,38 @@ export function useSettingUI(
       aboutPanel,
       creditsPanel,
       userPanel,
+      ...(shouldShowWorkspacePanel.value ? [workspacePanel] : []),
       keybindingPanel,
       extensionPanel,
-      ...(isElectron() ? [serverConfigPanel] : []),
+      ...(isDesktop ? [serverConfigPanel] : []),
       ...(shouldShowPlanCreditsPanel.value && subscriptionPanel
         ? [subscriptionPanel]
-        : [])
-    ].filter((panel) => panel.component)
+        : []),
+      ...(shouldShowSecretsPanel.value ? [secretsPanel] : [])
+    ].filter((panel) => panel !== null && panel.component)
   )
 
   /**
    * The default category to show when the dialog is opened.
    */
   const defaultCategory = computed<SettingTreeNode>(() => {
-    if (!defaultPanel) return settingCategories.value[0]
-    // Search through all groups in groupedMenuTreeNodes
-    for (const group of groupedMenuTreeNodes.value) {
-      const found = group.children?.find((node) => node.key === defaultPanel)
-      if (found) return found
+    if (defaultPanel) {
+      for (const group of groupedMenuTreeNodes.value) {
+        const found = group.children?.find((node) => node.key === defaultPanel)
+        if (found) return found
+      }
+      return settingCategories.value[0]
     }
+
+    if (scrollToSettingId) {
+      const setting = settingStore.settingsById[scrollToSettingId]
+      if (setting) {
+        const { category } = getSettingInfo(setting)
+        const found = settingCategories.value.find((c) => c.label === category)
+        if (found) return found
+      }
+    }
+
     return settingCategories.value[0]
   })
 
@@ -186,7 +281,51 @@ export function useSettingUI(
     )
   })
 
-  const groupedMenuTreeNodes = computed<SettingTreeNode[]>(() => [
+  // Sidebar structure when team workspaces is enabled
+  const workspaceMenuTreeNodes = computed<SettingTreeNode[]>(() => [
+    // Workspace settings
+    translateCategory({
+      key: 'workspace',
+      label: 'Workspace',
+      children: [
+        ...(shouldShowWorkspacePanel.value ? [workspacePanel.node] : []),
+        ...(isLoggedIn.value &&
+        !(isCloud && window.__CONFIG__?.subscription_required)
+          ? [creditsPanel.node]
+          : [])
+      ].map(translateCategory)
+    }),
+    // General settings - Profile + all core settings + special panels
+    translateCategory({
+      key: 'general',
+      label: 'General',
+      children: [
+        translateCategory(userPanel.node),
+        ...coreSettingCategories.value.slice(0, 1).map(translateCategory),
+        ...(shouldShowSecretsPanel.value
+          ? [translateCategory(secretsPanel.node)]
+          : []),
+        ...coreSettingCategories.value.slice(1).map(translateCategory),
+        translateCategory(keybindingPanel.node),
+        translateCategory(extensionPanel.node),
+        translateCategory(aboutPanel.node),
+        ...(isDesktop ? [translateCategory(serverConfigPanel.node)] : [])
+      ]
+    }),
+    // Custom node settings (only shown if custom nodes have registered settings)
+    ...(customNodeSettingCategories.value.length > 0
+      ? [
+          translateCategory({
+            key: 'other',
+            label: 'Other',
+            children: customNodeSettingCategories.value.map(translateCategory)
+          })
+        ]
+      : [])
+  ])
+
+  // Sidebar structure when team workspaces is disabled (legacy)
+  const legacyMenuTreeNodes = computed<SettingTreeNode[]>(() => [
     // Account settings - show different panels based on distribution and auth state
     {
       key: 'account',
@@ -198,6 +337,7 @@ export function useSettingUI(
         subscriptionPanel
           ? [subscriptionPanel.node]
           : []),
+        ...(shouldShowSecretsPanel.value ? [secretsPanel.node] : []),
         ...(isLoggedIn.value &&
         !(isCloud && window.__CONFIG__?.subscription_required)
           ? [creditsPanel.node]
@@ -218,11 +358,47 @@ export function useSettingUI(
         keybindingPanel.node,
         extensionPanel.node,
         aboutPanel.node,
-        ...(isElectron() ? [serverConfigPanel.node] : [])
+        ...(isDesktop ? [serverConfigPanel.node] : [])
       ].map(translateCategory)
     }
   ])
 
+  const groupedMenuTreeNodes = computed<SettingTreeNode[]>(() =>
+    teamWorkspacesEnabled.value
+      ? workspaceMenuTreeNodes.value
+      : legacyMenuTreeNodes.value
+  )
+
+  const navGroups = computed<NavGroupData[]>(() =>
+    groupedMenuTreeNodes.value.map((group) => ({
+      title:
+        (group as SettingTreeNode & { translatedLabel?: string })
+          .translatedLabel ?? group.label,
+      items: (group.children ?? []).map((child) => ({
+        id: child.key,
+        label:
+          (child as SettingTreeNode & { translatedLabel?: string })
+            .translatedLabel ?? child.label,
+        icon:
+          CATEGORY_ICONS[child.key] ??
+          CATEGORY_ICONS[child.label] ??
+          'icon-[lucide--plug]'
+      }))
+    }))
+  )
+
+  function findCategoryByKey(key: string): SettingTreeNode | null {
+    for (const group of groupedMenuTreeNodes.value) {
+      const found = group.children?.find((node) => node.key === key)
+      if (found) return found
+    }
+    return null
+  }
+
+  function findPanelByKey(key: string): SettingPanelItem | null {
+    return panels.value.find((p) => p.node.key === key) ?? null
+  }
+
   onMounted(() => {
     activeCategory.value = defaultCategory.value
   })
@@ -232,6 +408,10 @@ export function useSettingUI(
     activeCategory,
     defaultCategory,
     groupedMenuTreeNodes,
-    settingCategories
+    settingCategories,
+    navGroups,
+    teamWorkspacesEnabled,
+    findCategoryByKey,
+    findPanelByKey
   }
 }
diff --git a/src/platform/settings/composables/useSettingsDialog.ts b/src/platform/settings/composables/useSettingsDialog.ts
new file mode 100644
index 0000000000..bb8162ad38
--- /dev/null
+++ b/src/platform/settings/composables/useSettingsDialog.ts
@@ -0,0 +1,34 @@
+import { useDialogService } from '@/services/dialogService'
+import { useDialogStore } from '@/stores/dialogStore'
+
+import SettingDialog from '@/platform/settings/components/SettingDialog.vue'
+import type { SettingPanelType } from '@/platform/settings/types'
+
+const DIALOG_KEY = 'global-settings'
+
+export function useSettingsDialog() {
+  const dialogService = useDialogService()
+  const dialogStore = useDialogStore()
+
+  function hide() {
+    dialogStore.closeDialog({ key: DIALOG_KEY })
+  }
+
+  function show(panel?: SettingPanelType, settingId?: string) {
+    dialogService.showLayoutDialog({
+      key: DIALOG_KEY,
+      component: SettingDialog,
+      props: {
+        onClose: hide,
+        ...(panel ? { defaultPanel: panel } : {}),
+        ...(settingId ? { scrollToSettingId: settingId } : {})
+      }
+    })
+  }
+
+  function showAbout() {
+    show('about')
+  }
+
+  return { show, hide, showAbout }
+}
diff --git a/src/platform/settings/constants/coreSettings.ts b/src/platform/settings/constants/coreSettings.ts
index 94d7cf9146..cc55671f3d 100644
--- a/src/platform/settings/constants/coreSettings.ts
+++ b/src/platform/settings/constants/coreSettings.ts
@@ -3,7 +3,7 @@ import { isCloud } from '@/platform/distribution/types'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import type { SettingParams } from '@/platform/settings/types'
 import type { ColorPalettes } from '@/schemas/colorPaletteSchema'
-import type { Keybinding } from '@/schemas/keyBindingSchema'
+import type { Keybinding } from '@/platform/keybindings/types'
 import { NodeBadgeMode } from '@/types/nodeSource'
 import { LinkReleaseTriggerAction } from '@/types/searchBoxTypes'
 import { breakpointsTailwind } from '@vueuse/core'
@@ -35,7 +35,7 @@ export const CORE_SETTINGS: SettingParams[] = [
     experimental: true,
     name: 'Node search box implementation',
     type: 'combo',
-    options: ['default', 'litegraph (legacy)'],
+    options: ['default', 'v1 (legacy)', 'litegraph (legacy)'],
     defaultValue: 'default'
   },
   {
@@ -72,7 +72,7 @@ export const CORE_SETTINGS: SettingParams[] = [
     id: 'Comfy.NodeSearchBoxImpl.ShowCategory',
     category: ['Comfy', 'Node Search Box', 'ShowCategory'],
     name: 'Show node category in search results',
-    tooltip: 'Only applies to the default implementation',
+    tooltip: 'Only applies to v1 (legacy)',
     type: 'boolean',
     defaultValue: true
   },
@@ -80,7 +80,7 @@ export const CORE_SETTINGS: SettingParams[] = [
     id: 'Comfy.NodeSearchBoxImpl.ShowIdName',
     category: ['Comfy', 'Node Search Box', 'ShowIdName'],
     name: 'Show node id name in search results',
-    tooltip: 'Only applies to the default implementation',
+    tooltip: 'Does not apply to litegraph (legacy)',
     type: 'boolean',
     defaultValue: false
   },
@@ -88,7 +88,7 @@ export const CORE_SETTINGS: SettingParams[] = [
     id: 'Comfy.NodeSearchBoxImpl.ShowNodeFrequency',
     category: ['Comfy', 'Node Search Box', 'ShowNodeFrequency'],
     name: 'Show node frequency in search results',
-    tooltip: 'Only applies to the default implementation',
+    tooltip: 'Only applies to v1 (legacy)',
     type: 'boolean',
     defaultValue: false
   },
@@ -165,18 +165,22 @@ export const CORE_SETTINGS: SettingParams[] = [
     defaultsByInstallVersion: {
       '1.25.0': 'legacy'
     },
-    onChange: async (newValue: string, oldValue?: string) => {
+    onChange: async (val: unknown, old?: unknown) => {
+      const newValue = val as string
+      const oldValue = old as string | undefined
       if (!oldValue) return
       const settingStore = useSettingStore()
 
       if (newValue === 'standard') {
-        // Update related settings to match standard mode - select + panning
-        await settingStore.set('Comfy.Canvas.LeftMouseClickBehavior', 'select')
-        await settingStore.set('Comfy.Canvas.MouseWheelScroll', 'panning')
+        await settingStore.setMany({
+          'Comfy.Canvas.LeftMouseClickBehavior': 'select',
+          'Comfy.Canvas.MouseWheelScroll': 'panning'
+        })
       } else if (newValue === 'legacy') {
-        // Update related settings to match legacy mode - panning + zoom
-        await settingStore.set('Comfy.Canvas.LeftMouseClickBehavior', 'panning')
-        await settingStore.set('Comfy.Canvas.MouseWheelScroll', 'zoom')
+        await settingStore.setMany({
+          'Comfy.Canvas.LeftMouseClickBehavior': 'panning',
+          'Comfy.Canvas.MouseWheelScroll': 'zoom'
+        })
       }
     }
   },
@@ -192,7 +196,8 @@ export const CORE_SETTINGS: SettingParams[] = [
       { value: 'select', text: 'Select' }
     ],
     versionAdded: '1.27.4',
-    onChange: async (newValue: string) => {
+    onChange: async (val: unknown) => {
+      const newValue = val as string
       const settingStore = useSettingStore()
 
       const navigationMode = settingStore.get('Comfy.Canvas.NavigationMode')
@@ -221,7 +226,8 @@ export const CORE_SETTINGS: SettingParams[] = [
       { value: 'zoom', text: 'Zoom in/out' }
     ],
     versionAdded: '1.27.4',
-    onChange: async (newValue: string) => {
+    onChange: async (val: unknown) => {
+      const newValue = val as string
       const settingStore = useSettingStore()
 
       const navigationMode = settingStore.get('Comfy.Canvas.NavigationMode')
@@ -306,6 +312,16 @@ export const CORE_SETTINGS: SettingParams[] = [
     }
   },
   // Bookmarks are stored in the settings store.
+  {
+    id: 'Comfy.NodeLibrary.NewDesign',
+    category: ['Comfy', 'Node Library', 'NewDesign'],
+    name: 'New Node Library Design',
+    type: 'boolean',
+    tooltip:
+      'Enable the redesigned node library sidebar with tabs (Essential, All, Custom), improved search, and hover previews.',
+    defaultValue: true,
+    experimental: true
+  },
   // Bookmarks are in format of category/display_name. e.g. "conditioning/CLIPTextEncode"
   {
     id: 'Comfy.NodeLibrary.Bookmarks',
@@ -410,7 +426,8 @@ export const CORE_SETTINGS: SettingParams[] = [
       { value: 'es', text: 'Español' },
       { value: 'ar', text: 'عربي' },
       { value: 'tr', text: 'Türkçe' },
-      { value: 'pt-BR', text: 'Português (BR)' }
+      { value: 'pt-BR', text: 'Português (BR)' },
+      { value: 'fa', text: 'فارسی' }
     ],
     defaultValue: () => navigator.language.split('-')[0] || 'en'
   },
@@ -548,6 +565,16 @@ export const CORE_SETTINGS: SettingParams[] = [
       }
     }
   },
+  {
+    id: 'Comfy.UI.TabBarLayout',
+    category: ['Appearance', 'General'],
+    name: 'Tab Bar Layout',
+    type: 'combo',
+    options: ['Default', 'Integrated'],
+    tooltip:
+      'Controls the layout of the tab bar. "Integrated" moves Help and User controls into the tab bar area.',
+    defaultValue: 'Default'
+  },
   {
     id: 'Comfy.UseNewMenu',
     category: ['Comfy', 'Menu', 'UseNewMenu'],
@@ -556,7 +583,8 @@ export const CORE_SETTINGS: SettingParams[] = [
     type: 'combo',
     options: ['Disabled', 'Top'],
     tooltip: 'Enable the redesigned top menu bar.',
-    migrateDeprecatedValue: (value: string) => {
+    migrateDeprecatedValue: (val: unknown) => {
+      const value = val as string
       // Floating is now supported by dragging the docked actionbar off.
       if (value === 'Floating') {
         return 'Top'
@@ -572,7 +600,8 @@ export const CORE_SETTINGS: SettingParams[] = [
     type: 'combo',
     options: ['Sidebar', 'Topbar'],
     defaultValue: 'Topbar',
-    migrateDeprecatedValue: (value: string) => {
+    migrateDeprecatedValue: (val: unknown) => {
+      const value = val as string
       if (value === 'Topbar (2nd-row)') {
         return 'Topbar'
       }
@@ -592,7 +621,7 @@ export const CORE_SETTINGS: SettingParams[] = [
     tooltip:
       'The maximum number of tasks added to the queue at one button click',
     type: 'number',
-    defaultValue: isCloud ? 4 : 100,
+    defaultValue: isCloud ? 32 : 100,
     versionAdded: '1.3.5'
   },
   {
@@ -602,9 +631,8 @@ export const CORE_SETTINGS: SettingParams[] = [
     defaultValue: [] as Keybinding[],
     versionAdded: '1.3.7',
     versionModified: '1.7.3',
-    migrateDeprecatedValue: (
-      value: (Keybinding & { targetSelector?: string })[]
-    ) => {
+    migrateDeprecatedValue: (val: unknown) => {
+      const value = val as (Keybinding & { targetSelector?: string })[]
       return value.map((keybinding) => {
         if (keybinding.targetSelector === '#graph-canvas') {
           keybinding.targetElementId = 'graph-canvas-container'
@@ -631,6 +659,8 @@ export const CORE_SETTINGS: SettingParams[] = [
     id: 'Comfy.LinkRenderMode',
     category: ['LiteGraph', 'Graph', 'LinkRenderMode'],
     name: 'Link Render Mode',
+    tooltip:
+      'Controls the appearance and visibility of connection links between nodes on the canvas.',
     defaultValue: 2,
     type: 'combo',
     options: [
@@ -782,6 +812,8 @@ export const CORE_SETTINGS: SettingParams[] = [
     id: 'pysssss.SnapToGrid',
     category: ['LiteGraph', 'Canvas', 'AlwaysSnapToGrid'],
     name: 'Always snap to grid',
+    tooltip:
+      'When enabled, nodes will automatically align to the grid when moved or resized.',
     type: 'boolean',
     defaultValue: false,
     versionAdded: '1.3.13'
@@ -817,6 +849,20 @@ export const CORE_SETTINGS: SettingParams[] = [
     defaultValue: 64,
     versionAdded: '1.4.12'
   },
+  {
+    id: 'Comfy.Queue.History.Expanded',
+    name: 'Queue history expanded',
+    type: 'hidden',
+    defaultValue: false,
+    versionAdded: '1.37.0'
+  },
+  {
+    id: 'Comfy.WorkflowActions.SeenItems',
+    name: 'Seen new workflow action items',
+    type: 'hidden',
+    defaultValue: [] as string[],
+    versionAdded: '1.41.5'
+  },
   {
     id: 'Comfy.Execution.PreviewMethod',
     category: ['Comfy', 'Execution', 'PreviewMethod'],
@@ -862,7 +908,8 @@ export const CORE_SETTINGS: SettingParams[] = [
     type: 'hidden',
     defaultValue: 'dark',
     versionModified: '1.6.7',
-    migrateDeprecatedValue(value: string) {
+    migrateDeprecatedValue(val: unknown) {
+      const value = val as string
       // Legacy custom palettes were prefixed with 'custom_'
       return value.startsWith('custom_') ? value.replace('custom_', '') : value
     }
@@ -942,6 +989,8 @@ export const CORE_SETTINGS: SettingParams[] = [
     id: 'Comfy.Canvas.SelectionToolbox',
     category: ['LiteGraph', 'Canvas', 'SelectionToolbox'],
     name: 'Show selection toolbox',
+    tooltip:
+      'Display a floating toolbar when nodes are selected, providing quick access to common actions.',
     type: 'boolean',
     defaultValue: true,
     versionAdded: '1.10.5'
@@ -1095,7 +1144,7 @@ export const CORE_SETTINGS: SettingParams[] = [
     id: 'Comfy.Templates.SortBy',
     name: 'Template library - Sort preference',
     type: 'hidden',
-    defaultValue: 'newest'
+    defaultValue: 'default'
   },
 
   /**
@@ -1109,6 +1158,7 @@ export const CORE_SETTINGS: SettingParams[] = [
     tooltip:
       'Modern: DOM-based rendering with enhanced interactivity, native browser features, and updated visual design. Classic: Traditional canvas rendering.',
     defaultValue: false,
+    defaultsByInstallVersion: { '1.41.0': isCloud },
     sortOrder: 100,
     experimental: true,
     versionAdded: '1.27.1'
@@ -1139,5 +1189,73 @@ export const CORE_SETTINGS: SettingParams[] = [
     type: 'hidden',
     defaultValue: false,
     versionAdded: '1.34.1'
+  },
+  {
+    id: 'Comfy.RightSidePanel.IsOpen',
+    name: 'Right side panel open state',
+    type: 'hidden',
+    defaultValue: false,
+    versionAdded: '1.37.0'
+  },
+  {
+    id: 'Comfy.Queue.QPOV2',
+    category: ['Comfy', 'Queue', 'Layout'],
+    name: 'Use the unified job queue in the Assets side panel',
+    type: 'boolean',
+    tooltip:
+      'Replaces the floating job queue panel with an equivalent job queue embedded in the Assets side panel. You can disable this to return to the floating panel layout.',
+    defaultValue: false,
+    experimental: true
+  },
+  {
+    id: 'Comfy.Queue.ShowRunProgressBar',
+    name: 'Show run progress bar',
+    type: 'hidden',
+    defaultValue: true,
+    versionAdded: '1.41.3'
+  },
+  {
+    id: 'Comfy.Node.AlwaysShowAdvancedWidgets',
+    category: ['LiteGraph', 'Node Widget', 'AlwaysShowAdvancedWidgets'],
+    name: 'Always show advanced widgets on all nodes',
+    tooltip:
+      'When enabled, advanced widgets are always visible on all nodes without needing to expand them individually.',
+    type: 'boolean',
+    defaultValue: false,
+    versionAdded: '1.39.0'
+  },
+  {
+    id: 'Comfy.NodeReplacement.Enabled',
+    category: ['Comfy', 'Workflow', 'NodeReplacement'],
+    name: 'Enable node replacement suggestions',
+    tooltip:
+      'When enabled, missing nodes with known replacements will be shown as replaceable in the missing nodes dialog, allowing you to review and apply replacements.',
+    type: 'boolean',
+    defaultValue: false,
+    experimental: true,
+    versionAdded: '1.40.0'
+  },
+  {
+    id: 'Comfy.Graph.DeduplicateSubgraphNodeIds',
+    category: ['Comfy', 'Graph', 'Subgraph'],
+    name: 'Deduplicate subgraph node IDs',
+    tooltip:
+      'Automatically reassign duplicate node IDs in subgraphs when loading a workflow.',
+    type: 'boolean',
+    deprecated: true,
+    defaultValue: true,
+    experimental: true,
+    versionAdded: '1.40.0'
+  },
+  {
+    id: 'Comfy.RightSidePanel.ShowErrorsTab',
+    category: ['Comfy', 'Error System'],
+    name: 'Show errors tab in side panel',
+    tooltip:
+      'When enabled, an errors tab is displayed in the right side panel to show workflow execution errors at a glance.',
+    type: 'boolean',
+    defaultValue: true,
+    experimental: true,
+    versionAdded: '1.40.0'
   }
 ]
diff --git a/tests-ui/tests/store/settingStore.test.ts b/src/platform/settings/settingStore.test.ts
similarity index 82%
rename from tests-ui/tests/store/settingStore.test.ts
rename to src/platform/settings/settingStore.test.ts
index 60d7acd1c4..ae45d3d241 100644
--- a/tests-ui/tests/store/settingStore.test.ts
+++ b/src/platform/settings/settingStore.test.ts
@@ -1,4 +1,5 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import {
@@ -6,6 +7,7 @@ import {
   useSettingStore
 } from '@/platform/settings/settingStore'
 import type { SettingParams } from '@/platform/settings/types'
+import type { Settings } from '@/schemas/apiSchema'
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
 
@@ -13,7 +15,8 @@ import { app } from '@/scripts/app'
 vi.mock('@/scripts/api', () => ({
   api: {
     getSettings: vi.fn(),
-    storeSetting: vi.fn()
+    storeSetting: vi.fn(),
+    storeSettings: vi.fn()
   }
 }))
 
@@ -32,7 +35,7 @@ describe('useSettingStore', () => {
   let store: ReturnType<typeof useSettingStore>
 
   beforeEach(() => {
-    setActivePinia(createPinia())
+    setActivePinia(createTestingPinia({ stubActions: false }))
     store = useSettingStore()
     vi.clearAllMocks()
   })
@@ -42,18 +45,20 @@ describe('useSettingStore', () => {
     expect(store.settingsById).toEqual({})
   })
 
-  describe('loadSettingValues', () => {
+  describe('load', () => {
     it('should load settings from API', async () => {
       const mockSettings = { 'test.setting': 'value' }
-      vi.mocked(api.getSettings).mockResolvedValue(mockSettings as any)
+      vi.mocked(api.getSettings).mockResolvedValue(
+        mockSettings as Partial<Settings> as Settings
+      )
 
-      await store.loadSettingValues()
+      await store.load()
 
       expect(store.settingValues).toEqual(mockSettings)
       expect(api.getSettings).toHaveBeenCalled()
     })
 
-    it('should throw error if settings are loaded after registration', async () => {
+    it('should set error if settings are loaded after registration', async () => {
       const setting: SettingParams = {
         id: 'test.setting',
         name: 'test.setting',
@@ -62,9 +67,14 @@ describe('useSettingStore', () => {
       }
       store.addSetting(setting)
 
-      await expect(store.loadSettingValues()).rejects.toThrow(
-        'Setting values must be loaded before any setting is registered.'
-      )
+      await store.load()
+
+      expect(store.error).toBeInstanceOf(Error)
+      if (store.error instanceof Error) {
+        expect(store.error.message).toBe(
+          'Setting values must be loaded before any setting is registered.'
+        )
+      }
     })
   })
 
@@ -82,18 +92,24 @@ describe('useSettingStore', () => {
       expect(store.settingsById['test.setting']).toEqual(setting)
     })
 
-    it('should throw error for duplicate setting ID', () => {
+    it('should warn and skip for duplicate setting ID', () => {
       const setting: SettingParams = {
         id: 'test.setting',
         name: 'test.setting',
         type: 'text',
         defaultValue: 'default'
       }
+      const consoleWarnSpy = vi
+        .spyOn(console, 'warn')
+        .mockImplementation(() => {})
 
       store.addSetting(setting)
-      expect(() => store.addSetting(setting)).toThrow(
-        'Setting test.setting must have a unique ID.'
+      store.addSetting(setting)
+
+      expect(consoleWarnSpy).toHaveBeenCalledWith(
+        'Setting already registered: test.setting'
       )
+      consoleWarnSpy.mockRestore()
     })
 
     it('should migrate deprecated values', () => {
@@ -102,7 +118,7 @@ describe('useSettingStore', () => {
         name: 'test.setting',
         type: 'text',
         defaultValue: 'default',
-        migrateDeprecatedValue: (value: string) => value.toUpperCase()
+        migrateDeprecatedValue: (val: unknown) => (val as string).toUpperCase()
       }
 
       store.settingValues['test.setting'] = 'oldvalue'
@@ -488,6 +504,85 @@ describe('useSettingStore', () => {
       })
     })
   })
+
+  describe('setMany', () => {
+    it('should set multiple values and make a single API call', async () => {
+      const onChange1 = vi.fn()
+      const onChange2 = vi.fn()
+      store.addSetting({
+        id: 'Comfy.Release.Version',
+        name: 'Release Version',
+        type: 'hidden',
+        defaultValue: '',
+        onChange: onChange1
+      })
+      store.addSetting({
+        id: 'Comfy.Release.Status',
+        name: 'Release Status',
+        type: 'hidden',
+        defaultValue: 'skipped',
+        onChange: onChange2
+      })
+      vi.clearAllMocks()
+
+      await store.setMany({
+        'Comfy.Release.Version': '1.0.0',
+        'Comfy.Release.Status': 'changelog seen'
+      })
+
+      expect(store.get('Comfy.Release.Version')).toBe('1.0.0')
+      expect(store.get('Comfy.Release.Status')).toBe('changelog seen')
+      expect(onChange1).toHaveBeenCalledWith('1.0.0', '')
+      expect(onChange2).toHaveBeenCalledWith('changelog seen', 'skipped')
+      expect(api.storeSettings).toHaveBeenCalledTimes(1)
+      expect(api.storeSettings).toHaveBeenCalledWith({
+        'Comfy.Release.Version': '1.0.0',
+        'Comfy.Release.Status': 'changelog seen'
+      })
+      expect(api.storeSetting).not.toHaveBeenCalled()
+    })
+
+    it('should skip unchanged values', async () => {
+      store.addSetting({
+        id: 'Comfy.Release.Version',
+        name: 'Release Version',
+        type: 'hidden',
+        defaultValue: ''
+      })
+      store.addSetting({
+        id: 'Comfy.Release.Status',
+        name: 'Release Status',
+        type: 'hidden',
+        defaultValue: 'skipped'
+      })
+      await store.set('Comfy.Release.Version', 'existing')
+      vi.clearAllMocks()
+
+      await store.setMany({
+        'Comfy.Release.Version': 'existing',
+        'Comfy.Release.Status': 'changelog seen'
+      })
+
+      expect(api.storeSettings).toHaveBeenCalledWith({
+        'Comfy.Release.Status': 'changelog seen'
+      })
+    })
+
+    it('should not call API when all values are unchanged', async () => {
+      store.addSetting({
+        id: 'Comfy.Release.Version',
+        name: 'Release Version',
+        type: 'hidden',
+        defaultValue: ''
+      })
+      await store.set('Comfy.Release.Version', 'existing')
+      vi.clearAllMocks()
+
+      await store.setMany({ 'Comfy.Release.Version': 'existing' })
+
+      expect(api.storeSettings).not.toHaveBeenCalled()
+    })
+  })
 })
 
 describe('getSettingInfo', () => {
diff --git a/src/platform/settings/settingStore.ts b/src/platform/settings/settingStore.ts
index 2c9e8e0a36..3bfa58b4e6 100644
--- a/src/platform/settings/settingStore.ts
+++ b/src/platform/settings/settingStore.ts
@@ -1,4 +1,6 @@
+import { retry } from 'es-toolkit'
 import _ from 'es-toolkit/compat'
+import { until, useAsyncState } from '@vueuse/core'
 import { defineStore } from 'pinia'
 import { compare, valid } from 'semver'
 import { ref } from 'vue'
@@ -44,36 +46,104 @@ function onChange(
 }
 
 export const useSettingStore = defineStore('setting', () => {
-  const settingValues = ref<Record<string, any>>({})
+  const settingValues = ref<Partial<Settings>>({})
   const settingsById = ref<Record<string, SettingParams>>({})
 
+  const {
+    isReady,
+    isLoading,
+    error,
+    execute: loadSettingValues
+  } = useAsyncState(
+    async () => {
+      if (Object.keys(settingsById.value).length) {
+        throw new Error(
+          'Setting values must be loaded before any setting is registered.'
+        )
+      }
+      settingValues.value = await retry(() => api.getSettings(), {
+        retries: 3,
+        delay: (attempt) => Math.min(1000 * Math.pow(2, attempt), 8000)
+      })
+      await migrateZoomThresholdToFontSize()
+    },
+    undefined,
+    { immediate: false }
+  )
+
+  async function load(): Promise<void> {
+    if (isReady.value) return
+
+    if (isLoading.value) {
+      await until(isLoading).toBe(false)
+      return
+    }
+
+    await loadSettingValues()
+  }
+
   /**
    * Check if a setting's value exists, i.e. if the user has set it manually.
    * @param key - The key of the setting to check.
    * @returns Whether the setting exists.
    */
-  function exists(key: string) {
+  function exists<K extends keyof Settings>(key: K) {
     return settingValues.value[key] !== undefined
   }
 
+  /**
+   * Apply a setting value locally: clone, migrate, fire onChange, and
+   * update the in-memory store. Returns the migrated value, or
+   * `undefined` when the value is unchanged and was skipped.
+   */
+  function applySettingLocally<K extends keyof Settings>(
+    key: K,
+    value: Settings[K]
+  ): Settings[K] | undefined {
+    const clonedValue = _.cloneDeep(value)
+    const newValue = tryMigrateDeprecatedValue(
+      settingsById.value[key],
+      clonedValue
+    )
+    const oldValue = get(key)
+    if (newValue === oldValue) return undefined
+
+    onChange(settingsById.value[key], newValue, oldValue)
+    settingValues.value[key] = newValue
+    return newValue as Settings[K]
+  }
+
   /**
    * Set a setting value.
    * @param key - The key of the setting to set.
    * @param value - The value to set.
    */
   async function set<K extends keyof Settings>(key: K, value: Settings[K]) {
-    // Clone the incoming value to prevent external mutations
-    const clonedValue = _.cloneDeep(value)
-    const newValue = tryMigrateDeprecatedValue(
-      settingsById.value[key],
-      clonedValue
-    )
-    const oldValue = get(key)
-    if (newValue === oldValue) return
+    const applied = applySettingLocally(key, value)
+    if (applied === undefined) return
+    await api.storeSetting(key, applied)
+  }
 
-    onChange(settingsById.value[key], newValue, oldValue)
-    settingValues.value[key] = newValue
-    await api.storeSetting(key, newValue)
+  /**
+   * Set multiple setting values in a single API call.
+   * @param settings - A partial settings object with key-value pairs to set.
+   */
+  async function setMany(settings: Partial<Settings>) {
+    const updatedSettings: Partial<Settings> = {}
+
+    for (const key of Object.keys(settings) as (keyof Settings)[]) {
+      const applied = applySettingLocally(
+        key,
+        settings[key] as Settings[typeof key]
+      )
+      if (applied !== undefined) {
+        updatedSettings[key] = applied
+      }
+    }
+
+    if (Object.keys(updatedSettings).length > 0) {
+      await api.storeSettings(updatedSettings)
+    }
   }
 
   /**
@@ -83,7 +153,7 @@ export const useSettingStore = defineStore('setting', () => {
    */
   function get<K extends keyof Settings>(key: K): Settings[K] {
     // Clone the value when returning to prevent external mutations
-    return _.cloneDeep(settingValues.value[key] ?? getDefaultValue(key))
+    return _.cloneDeep(settingValues.value[key] ?? getDefaultValue(key)!)
   }
 
   /**
@@ -170,7 +240,11 @@ export const useSettingStore = defineStore('setting', () => {
       throw new Error('Settings must have an ID')
     }
     if (setting.id in settingsById.value) {
-      throw new Error(`Setting ${setting.id} must have a unique ID.`)
+      // Setting already registered - skip to allow component remounting
+      // TODO: Add store reset methods to bootstrapStore and settingStore, then
+      // replace window.location.reload() with router.push() in SidebarLogoutIcon.vue
+      console.warn(`Setting already registered: ${setting.id}`)
+      return
     }
 
     settingsById.value[setting.id] = setting
@@ -184,22 +258,6 @@ export const useSettingStore = defineStore('setting', () => {
     onChange(setting, get(setting.id), undefined)
   }
 
-  /*
-   * Load setting values from server.
-   * This needs to be called before any setting is registered.
-   */
-  async function loadSettingValues() {
-    if (Object.keys(settingsById.value).length) {
-      throw new Error(
-        'Setting values must be loaded before any setting is registered.'
-      )
-    }
-    settingValues.value = await api.getSettings()
-
-    // Migrate old zoom threshold setting to new font size setting
-    await migrateZoomThresholdToFontSize()
-  }
-
   /**
    * Migrate the old zoom threshold setting to the new font size setting.
    * Preserves the exact zoom threshold behavior by converting it to equivalent font size.
@@ -242,9 +300,13 @@ export const useSettingStore = defineStore('setting', () => {
   return {
     settingValues,
     settingsById,
+    isReady,
+    isLoading,
+    error,
+    load,
     addSetting,
-    loadSettingValues,
     set,
+    setMany,
     get,
     exists,
     getDefaultValue
diff --git a/src/platform/settings/types.ts b/src/platform/settings/types.ts
index 021fac3750..62139cb6fd 100644
--- a/src/platform/settings/types.ts
+++ b/src/platform/settings/types.ts
@@ -26,11 +26,11 @@ export interface SettingOption {
   value?: string | number
 }
 
-export interface SettingParams<TValue = any> extends FormItem {
+export interface SettingParams<TValue = unknown> extends FormItem {
   id: keyof Settings
   defaultValue: TValue | (() => TValue)
   defaultsByInstallVersion?: Record<`${number}.${number}.${number}`, TValue>
-  onChange?: (newValue: TValue, oldValue?: TValue) => void
+  onChange?(newValue: TValue, oldValue?: TValue): void
   // By default category is id.split('.'). However, changing id to assign
   // new category has poor backward compatibility. Use this field to overwrite
   // default category from id.
@@ -62,5 +62,17 @@ export interface FormItem {
 
 export interface ISettingGroup {
   label: string
+  category?: string
   settings: SettingParams[]
 }
+
+export type SettingPanelType =
+  | 'about'
+  | 'credits'
+  | 'extension'
+  | 'keybinding'
+  | 'secrets'
+  | 'server-config'
+  | 'subscription'
+  | 'user'
+  | 'workspace'
diff --git a/src/platform/support/config.ts b/src/platform/support/config.ts
index 5845187129..b93690c8a1 100644
--- a/src/platform/support/config.ts
+++ b/src/platform/support/config.ts
@@ -1,9 +1,9 @@
-import { isCloud } from '@/platform/distribution/types'
+import { isCloud, isNightly } from '@/platform/distribution/types'
 
 /**
  * Zendesk ticket form field IDs.
  */
-const ZENDESK_FIELDS = {
+export const ZENDESK_FIELDS = {
   /** Distribution tag (cloud vs OSS) */
   DISTRIBUTION: 'tf_42243568391700',
   /** User email (anonymous requester) */
@@ -14,6 +14,16 @@ const ZENDESK_FIELDS = {
   USER_ID: 'tf_42515251051412'
 } as const
 
+/**
+ * Gets the distribution identifier for Zendesk tracking.
+ * Helps distinguish feedback from different build types.
+ */
+export function getDistribution(): 'ccloud' | 'oss-nightly' | 'oss' {
+  if (isCloud) return 'ccloud'
+  if (isNightly) return 'oss-nightly'
+  return 'oss'
+}
+
 const SUPPORT_BASE_URL = 'https://support.comfy.org/hc/en-us/requests/new'
 
 /**
@@ -28,7 +38,7 @@ export function buildSupportUrl(params?: {
   userId?: string | null
 }): string {
   const searchParams = new URLSearchParams({
-    [ZENDESK_FIELDS.DISTRIBUTION]: isCloud ? 'ccloud' : 'oss'
+    [ZENDESK_FIELDS.DISTRIBUTION]: getDistribution()
   })
 
   if (params?.userEmail) {
diff --git a/src/platform/surveys/NightlySurveyPopover.test.ts b/src/platform/surveys/NightlySurveyPopover.test.ts
new file mode 100644
index 0000000000..b6d8505e6c
--- /dev/null
+++ b/src/platform/surveys/NightlySurveyPopover.test.ts
@@ -0,0 +1,194 @@
+import { mount } from '@vue/test-utils'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { nextTick } from 'vue'
+
+const FEATURE_USAGE_KEY = 'Comfy.FeatureUsage'
+const POPOVER_SELECTOR = '[data-testid="nightly-survey-popover"]'
+
+const mockIsNightly = vi.hoisted(() => ({ value: true }))
+const mockIsCloud = vi.hoisted(() => ({ value: false }))
+const mockIsDesktop = vi.hoisted(() => ({ value: false }))
+
+vi.mock('@/platform/distribution/types', () => ({
+  get isNightly() {
+    return mockIsNightly.value
+  },
+  get isCloud() {
+    return mockIsCloud.value
+  },
+  get isDesktop() {
+    return mockIsDesktop.value
+  }
+}))
+
+vi.mock('vue-i18n', () => ({
+  useI18n: vi.fn(() => ({
+    t: (key: string) => key
+  }))
+}))
+
+describe('NightlySurveyPopover', () => {
+  const defaultConfig = {
+    featureId: 'test-feature',
+    typeformId: 'abc123',
+    triggerThreshold: 3,
+    delayMs: 100,
+    enabled: true
+  }
+
+  function setFeatureUsage(featureId: string, useCount: number) {
+    const existing = JSON.parse(localStorage.getItem(FEATURE_USAGE_KEY) ?? '{}')
+    existing[featureId] = {
+      useCount,
+      firstUsed: Date.now() - 1000,
+      lastUsed: Date.now()
+    }
+    localStorage.setItem(FEATURE_USAGE_KEY, JSON.stringify(existing))
+  }
+
+  beforeEach(() => {
+    localStorage.clear()
+    vi.resetModules()
+    vi.useFakeTimers()
+    vi.setSystemTime(new Date('2024-06-15T12:00:00Z'))
+
+    mockIsNightly.value = true
+    mockIsCloud.value = false
+    mockIsDesktop.value = false
+  })
+
+  afterEach(() => {
+    localStorage.clear()
+    vi.useRealTimers()
+    document.body.innerHTML = ''
+  })
+
+  async function mountComponent(config = defaultConfig) {
+    const { default: NightlySurveyPopover } =
+      await import('./NightlySurveyPopover.vue')
+    return mount(NightlySurveyPopover, {
+      props: { config },
+      global: {
+        stubs: {
+          Teleport: true
+        }
+      },
+      attachTo: document.body
+    })
+  }
+
+  describe('visibility', () => {
+    it('shows popover after delay when eligible', async () => {
+      setFeatureUsage('test-feature', 5)
+
+      const wrapper = await mountComponent()
+      await nextTick()
+
+      expect(wrapper.find(POPOVER_SELECTOR).exists()).toBe(false)
+
+      await vi.advanceTimersByTimeAsync(100)
+      await nextTick()
+
+      expect(wrapper.find(POPOVER_SELECTOR).exists()).toBe(true)
+    })
+
+    it('does not show when not eligible', async () => {
+      setFeatureUsage('test-feature', 1)
+
+      const wrapper = await mountComponent()
+      await nextTick()
+      await vi.advanceTimersByTimeAsync(1000)
+      await nextTick()
+
+      expect(wrapper.find(POPOVER_SELECTOR).exists()).toBe(false)
+    })
+
+    it('does not show on cloud', async () => {
+      mockIsCloud.value = true
+      setFeatureUsage('test-feature', 5)
+
+      const wrapper = await mountComponent()
+      await nextTick()
+      await vi.advanceTimersByTimeAsync(1000)
+      await nextTick()
+
+      expect(wrapper.find(POPOVER_SELECTOR).exists()).toBe(false)
+    })
+  })
+
+  describe('user actions', () => {
+    it('emits shown event when displayed', async () => {
+      setFeatureUsage('test-feature', 5)
+
+      const wrapper = await mountComponent()
+      await vi.advanceTimersByTimeAsync(100)
+      await nextTick()
+
+      expect(wrapper.emitted('shown')).toHaveLength(1)
+    })
+
+    it('emits dismissed when close button clicked', async () => {
+      setFeatureUsage('test-feature', 5)
+
+      const wrapper = await mountComponent()
+      await vi.advanceTimersByTimeAsync(100)
+      await nextTick()
+
+      const closeButton = wrapper.find('[aria-label="g.close"]')
+      await closeButton.trigger('click')
+
+      expect(wrapper.emitted('dismissed')).toHaveLength(1)
+    })
+
+    it('emits optedOut when opt out button clicked', async () => {
+      setFeatureUsage('test-feature', 5)
+
+      const wrapper = await mountComponent()
+      await vi.advanceTimersByTimeAsync(100)
+      await nextTick()
+
+      const buttons = wrapper.findAll('button')
+      const optOutButton = buttons.find((b) =>
+        b.text().includes('nightlySurvey.dontAskAgain')
+      )
+      expect(optOutButton).toBeDefined()
+      await optOutButton!.trigger('click')
+
+      expect(wrapper.emitted('optedOut')).toHaveLength(1)
+    })
+  })
+
+  describe('config', () => {
+    it('uses custom delay from config', async () => {
+      setFeatureUsage('test-feature', 5)
+
+      const wrapper = await mountComponent({
+        ...defaultConfig,
+        delayMs: 500
+      })
+      await nextTick()
+
+      await vi.advanceTimersByTimeAsync(400)
+      await nextTick()
+      expect(wrapper.find(POPOVER_SELECTOR).exists()).toBe(false)
+
+      await vi.advanceTimersByTimeAsync(100)
+      await nextTick()
+      expect(wrapper.find(POPOVER_SELECTOR).exists()).toBe(true)
+    })
+
+    it('does not show when config is disabled', async () => {
+      setFeatureUsage('test-feature', 5)
+
+      const wrapper = await mountComponent({
+        ...defaultConfig,
+        enabled: false
+      })
+      await nextTick()
+      await vi.advanceTimersByTimeAsync(1000)
+      await nextTick()
+
+      expect(wrapper.find(POPOVER_SELECTOR).exists()).toBe(false)
+    })
+  })
+})
diff --git a/src/platform/surveys/NightlySurveyPopover.vue b/src/platform/surveys/NightlySurveyPopover.vue
new file mode 100644
index 0000000000..b4784e727a
--- /dev/null
+++ b/src/platform/surveys/NightlySurveyPopover.vue
@@ -0,0 +1,166 @@
+<script setup lang="ts">
+import { whenever } from '@vueuse/core'
+import { computed, onUnmounted, ref, useTemplateRef, watch } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+
+import type { FeatureSurveyConfig } from './useSurveyEligibility'
+import { useSurveyEligibility } from './useSurveyEligibility'
+
+const { config } = defineProps<{
+  config: FeatureSurveyConfig
+}>()
+
+const emit = defineEmits<{
+  shown: []
+  dismissed: []
+  optedOut: []
+}>()
+
+const { t } = useI18n()
+
+const { isEligible, delayMs, markSurveyShown, optOut } = useSurveyEligibility(
+  () => config
+)
+
+const TYPEFORM_SRC = 'https://embed.typeform.com/next/embed.js'
+
+const isVisible = ref(false)
+const typeformError = ref(false)
+const typeformRef = useTemplateRef<HTMLDivElement>('typeformRef')
+
+let showTimeout: ReturnType<typeof setTimeout> | null = null
+
+const isValidTypeformId = computed(() =>
+  /^[A-Za-z0-9]+$/.test(config.typeformId)
+)
+const typeformId = computed(() =>
+  isValidTypeformId.value ? config.typeformId : ''
+)
+
+watch(
+  isEligible,
+  (eligible) => {
+    if (!eligible) {
+      if (showTimeout) {
+        clearTimeout(showTimeout)
+        showTimeout = null
+      }
+      return
+    }
+
+    if (isVisible.value || showTimeout) return
+
+    showTimeout = setTimeout(() => {
+      showTimeout = null
+      isVisible.value = true
+      emit('shown')
+    }, delayMs.value)
+  },
+  { immediate: true }
+)
+
+onUnmounted(() => {
+  if (showTimeout) {
+    clearTimeout(showTimeout)
+  }
+})
+
+whenever(typeformRef, () => {
+  if (document.querySelector(`script[src="${TYPEFORM_SRC}"]`)) return
+
+  const scriptEl = document.createElement('script')
+  scriptEl.src = TYPEFORM_SRC
+  scriptEl.async = true
+  scriptEl.onerror = () => {
+    typeformError.value = true
+  }
+  document.head.appendChild(scriptEl)
+})
+
+function handleAccept() {
+  markSurveyShown()
+}
+
+function handleDismiss() {
+  isVisible.value = false
+  emit('dismissed')
+}
+
+function handleOptOut() {
+  optOut()
+  isVisible.value = false
+  emit('optedOut')
+}
+</script>
+
+<template>
+  <Teleport to="body">
+    <Transition
+      enter-active-class="transition duration-300 ease-out"
+      enter-from-class="translate-x-full opacity-0"
+      enter-to-class="translate-x-0 opacity-100"
+      leave-active-class="transition duration-300 ease-in"
+      leave-from-class="translate-x-0 opacity-100"
+      leave-to-class="translate-x-full opacity-0"
+    >
+      <div
+        v-if="isVisible"
+        data-testid="nightly-survey-popover"
+        class="fixed right-4 bottom-4 z-10000 w-80 rounded-lg border border-border-subtle bg-base-background p-4 shadow-lg"
+      >
+        <div class="mb-3 flex items-start justify-between">
+          <h3 class="text-sm font-medium text-text-primary">
+            {{ t('nightlySurvey.title') }}
+          </h3>
+          <button
+            class="text-text-muted hover:text-text-primary"
+            :aria-label="t('g.close')"
+            @click="handleDismiss"
+          >
+            <i class="icon-[lucide--x] size-4" />
+          </button>
+        </div>
+
+        <p class="mb-4 text-sm text-text-secondary">
+          {{ t('nightlySurvey.description') }}
+        </p>
+
+        <div v-if="typeformError" class="text-danger mb-4 text-sm">
+          {{ t('nightlySurvey.loadError') }}
+        </div>
+
+        <div
+          v-show="isVisible && !typeformError && isValidTypeformId"
+          ref="typeformRef"
+          data-tf-auto-resize
+          :data-tf-widget="typeformId"
+          class="min-h-[300px]"
+        />
+
+        <div class="mt-4 flex flex-col gap-2">
+          <Button variant="primary" class="w-full" @click="handleAccept">
+            {{ t('nightlySurvey.accept') }}
+          </Button>
+          <div class="flex gap-2">
+            <Button
+              variant="textonly"
+              class="flex-1 text-xs"
+              @click="handleDismiss"
+            >
+              {{ t('nightlySurvey.notNow') }}
+            </Button>
+            <Button
+              variant="muted-textonly"
+              class="flex-1 text-xs"
+              @click="handleOptOut"
+            >
+              {{ t('nightlySurvey.dontAskAgain') }}
+            </Button>
+          </div>
+        </div>
+      </div>
+    </Transition>
+  </Teleport>
+</template>
diff --git a/src/platform/surveys/surveyRegistry.test.ts b/src/platform/surveys/surveyRegistry.test.ts
new file mode 100644
index 0000000000..c79098536f
--- /dev/null
+++ b/src/platform/surveys/surveyRegistry.test.ts
@@ -0,0 +1,75 @@
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+
+import type { FeatureSurveyConfig } from './useSurveyEligibility'
+
+import {
+  FEATURE_SURVEYS,
+  getEnabledSurveys,
+  getSurveyConfig
+} from './surveyRegistry'
+
+const TEST_FEATURE_ID = '__test-feature__'
+const TEST_CONFIG: FeatureSurveyConfig = {
+  featureId: TEST_FEATURE_ID,
+  typeformId: 'test-form-123',
+  triggerThreshold: 5,
+  delayMs: 3000,
+  enabled: true
+}
+
+describe('surveyRegistry', () => {
+  let originalEntries: Record<string, FeatureSurveyConfig>
+
+  beforeEach(() => {
+    originalEntries = { ...FEATURE_SURVEYS }
+    FEATURE_SURVEYS[TEST_FEATURE_ID] = TEST_CONFIG
+  })
+
+  afterEach(() => {
+    for (const key of Object.keys(FEATURE_SURVEYS)) {
+      delete FEATURE_SURVEYS[key]
+    }
+    Object.assign(FEATURE_SURVEYS, originalEntries)
+  })
+
+  describe('getSurveyConfig', () => {
+    it('returns undefined for unknown feature', () => {
+      expect(getSurveyConfig('nonexistent-feature')).toBeUndefined()
+    })
+
+    it('returns config for registered feature', () => {
+      const config = getSurveyConfig(TEST_FEATURE_ID)
+      expect(config).toEqual(TEST_CONFIG)
+    })
+  })
+
+  describe('getEnabledSurveys', () => {
+    it('includes surveys with enabled: true', () => {
+      const enabled = getEnabledSurveys()
+      expect(enabled).toContainEqual(TEST_CONFIG)
+    })
+
+    it('includes surveys where enabled is undefined', () => {
+      const implicitlyEnabled: FeatureSurveyConfig = {
+        featureId: '__implicit__',
+        typeformId: 'form-456'
+      }
+      FEATURE_SURVEYS['__implicit__'] = implicitlyEnabled
+
+      const enabled = getEnabledSurveys()
+      expect(enabled).toContainEqual(implicitlyEnabled)
+    })
+
+    it('excludes surveys with enabled: false', () => {
+      const disabledConfig: FeatureSurveyConfig = {
+        featureId: '__disabled__',
+        typeformId: 'form-789',
+        enabled: false
+      }
+      FEATURE_SURVEYS['__disabled__'] = disabledConfig
+
+      const enabled = getEnabledSurveys()
+      expect(enabled).not.toContainEqual(disabledConfig)
+    })
+  })
+})
diff --git a/src/platform/surveys/surveyRegistry.ts b/src/platform/surveys/surveyRegistry.ts
new file mode 100644
index 0000000000..e93f581814
--- /dev/null
+++ b/src/platform/surveys/surveyRegistry.ts
@@ -0,0 +1,19 @@
+import type { FeatureSurveyConfig } from './useSurveyEligibility'
+
+/**
+ * Registry of all feature surveys.
+ * Add new surveys here when targeting specific features for feedback.
+ */
+export const FEATURE_SURVEYS: Record<string, FeatureSurveyConfig> = {}
+
+export function getSurveyConfig(
+  featureId: string
+): FeatureSurveyConfig | undefined {
+  return FEATURE_SURVEYS[featureId]
+}
+
+export function getEnabledSurveys(): FeatureSurveyConfig[] {
+  return Object.values(FEATURE_SURVEYS).filter(
+    (config) => config.enabled !== false
+  )
+}
diff --git a/src/platform/surveys/useFeatureUsageTracker.test.ts b/src/platform/surveys/useFeatureUsageTracker.test.ts
new file mode 100644
index 0000000000..f37b41ee1c
--- /dev/null
+++ b/src/platform/surveys/useFeatureUsageTracker.test.ts
@@ -0,0 +1,121 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { useFeatureUsageTracker } from './useFeatureUsageTracker'
+
+const STORAGE_KEY = 'Comfy.FeatureUsage'
+
+describe('useFeatureUsageTracker', () => {
+  beforeEach(() => {
+    localStorage.clear()
+    vi.clearAllMocks()
+  })
+
+  afterEach(() => {
+    localStorage.clear()
+  })
+
+  it('initializes with zero count for new feature', () => {
+    const { useCount } = useFeatureUsageTracker('test-feature-1')
+
+    expect(useCount.value).toBe(0)
+  })
+
+  it('increments count on trackUsage', () => {
+    const { useCount, trackUsage } = useFeatureUsageTracker('test-feature-2')
+
+    expect(useCount.value).toBe(0)
+
+    trackUsage()
+    expect(useCount.value).toBe(1)
+
+    trackUsage()
+    expect(useCount.value).toBe(2)
+  })
+
+  it('sets firstUsed only on first use', () => {
+    vi.useFakeTimers()
+    const firstTs = 1000000
+    vi.setSystemTime(firstTs)
+    try {
+      const { usage, trackUsage } = useFeatureUsageTracker('test-feature-3')
+
+      trackUsage()
+      expect(usage.value?.firstUsed).toBe(firstTs)
+
+      vi.setSystemTime(firstTs + 5000)
+      trackUsage()
+      expect(usage.value?.firstUsed).toBe(firstTs)
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it('updates lastUsed on each use', () => {
+    vi.useFakeTimers()
+    try {
+      const { usage, trackUsage } = useFeatureUsageTracker('test-feature-4')
+
+      trackUsage()
+      const firstLastUsed = usage.value?.lastUsed ?? 0
+
+      vi.advanceTimersByTime(10)
+      trackUsage()
+
+      expect(usage.value?.lastUsed).toBeGreaterThan(firstLastUsed)
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it('reset clears feature data', () => {
+    const { useCount, trackUsage, reset } =
+      useFeatureUsageTracker('test-feature-5')
+
+    trackUsage()
+    trackUsage()
+    expect(useCount.value).toBe(2)
+
+    reset()
+    expect(useCount.value).toBe(0)
+  })
+
+  it('tracks multiple features independently', () => {
+    const featureA = useFeatureUsageTracker('feature-a')
+    const featureB = useFeatureUsageTracker('feature-b')
+
+    featureA.trackUsage()
+    featureA.trackUsage()
+    featureB.trackUsage()
+
+    expect(featureA.useCount.value).toBe(2)
+    expect(featureB.useCount.value).toBe(1)
+  })
+
+  it('persists to localStorage', async () => {
+    vi.useFakeTimers()
+    try {
+      const { trackUsage } = useFeatureUsageTracker('persisted-feature')
+
+      trackUsage()
+      await vi.runAllTimersAsync()
+
+      const stored = JSON.parse(localStorage.getItem(STORAGE_KEY) ?? '{}')
+      expect(stored['persisted-feature']?.useCount).toBe(1)
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it('loads existing data from localStorage', () => {
+    localStorage.setItem(
+      STORAGE_KEY,
+      JSON.stringify({
+        'existing-feature': { useCount: 5, firstUsed: 1000, lastUsed: 2000 }
+      })
+    )
+
+    const { useCount } = useFeatureUsageTracker('existing-feature')
+
+    expect(useCount.value).toBe(5)
+  })
+})
diff --git a/src/platform/surveys/useFeatureUsageTracker.ts b/src/platform/surveys/useFeatureUsageTracker.ts
new file mode 100644
index 0000000000..b8d825db48
--- /dev/null
+++ b/src/platform/surveys/useFeatureUsageTracker.ts
@@ -0,0 +1,46 @@
+import { useStorage } from '@vueuse/core'
+import { computed } from 'vue'
+
+interface FeatureUsage {
+  useCount: number
+  firstUsed: number
+  lastUsed: number
+}
+
+type FeatureUsageRecord = Record<string, FeatureUsage>
+
+const STORAGE_KEY = 'Comfy.FeatureUsage'
+
+/**
+ * Tracks feature usage for survey eligibility.
+ * Persists to localStorage.
+ */
+export function useFeatureUsageTracker(featureId: string) {
+  const usageData = useStorage<FeatureUsageRecord>(STORAGE_KEY, {})
+
+  const usage = computed(() => usageData.value[featureId])
+
+  const useCount = computed(() => usage.value?.useCount ?? 0)
+
+  function trackUsage() {
+    const now = Date.now()
+    const existing = usageData.value[featureId]
+
+    usageData.value[featureId] = {
+      useCount: (existing?.useCount ?? 0) + 1,
+      firstUsed: existing?.firstUsed ?? now,
+      lastUsed: now
+    }
+  }
+
+  function reset() {
+    delete usageData.value[featureId]
+  }
+
+  return {
+    usage,
+    useCount,
+    trackUsage,
+    reset
+  }
+}
diff --git a/src/platform/surveys/useSurveyEligibility.test.ts b/src/platform/surveys/useSurveyEligibility.test.ts
new file mode 100644
index 0000000000..a99a6e1d9d
--- /dev/null
+++ b/src/platform/surveys/useSurveyEligibility.test.ts
@@ -0,0 +1,259 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { useSurveyEligibility } from './useSurveyEligibility'
+
+const SURVEY_STATE_KEY = 'Comfy.SurveyState'
+const FEATURE_USAGE_KEY = 'Comfy.FeatureUsage'
+
+const mockDistribution = vi.hoisted(() => ({
+  isNightly: true,
+  isCloud: false,
+  isDesktop: false
+}))
+
+vi.mock('@/platform/distribution/types', () => ({
+  get isNightly() {
+    return mockDistribution.isNightly
+  },
+  get isCloud() {
+    return mockDistribution.isCloud
+  },
+  get isDesktop() {
+    return mockDistribution.isDesktop
+  }
+}))
+
+describe('useSurveyEligibility', () => {
+  const defaultConfig = {
+    featureId: 'test-feature',
+    typeformId: 'abc123'
+  }
+
+  beforeEach(() => {
+    localStorage.clear()
+    vi.useFakeTimers()
+    vi.setSystemTime(new Date('2024-06-15T12:00:00Z'))
+
+    mockDistribution.isNightly = true
+    mockDistribution.isCloud = false
+    mockDistribution.isDesktop = false
+  })
+
+  afterEach(() => {
+    localStorage.clear()
+    vi.useRealTimers()
+  })
+
+  function setFeatureUsage(featureId: string, useCount: number) {
+    const existing = JSON.parse(localStorage.getItem(FEATURE_USAGE_KEY) ?? '{}')
+    existing[featureId] = {
+      useCount,
+      firstUsed: Date.now() - 1000,
+      lastUsed: Date.now()
+    }
+    localStorage.setItem(FEATURE_USAGE_KEY, JSON.stringify(existing))
+  }
+
+  describe('eligibility checks', () => {
+    it('is not eligible when not nightly', () => {
+      mockDistribution.isNightly = false
+      setFeatureUsage('test-feature', 5)
+
+      const { isEligible } = useSurveyEligibility(defaultConfig)
+
+      expect(isEligible.value).toBe(false)
+    })
+
+    it('is not eligible on cloud', () => {
+      mockDistribution.isCloud = true
+      setFeatureUsage('test-feature', 5)
+
+      const { isEligible } = useSurveyEligibility(defaultConfig)
+
+      expect(isEligible.value).toBe(false)
+    })
+
+    it('is not eligible on desktop', () => {
+      mockDistribution.isDesktop = true
+      setFeatureUsage('test-feature', 5)
+
+      const { isEligible } = useSurveyEligibility(defaultConfig)
+
+      expect(isEligible.value).toBe(false)
+    })
+
+    it('is not eligible below threshold', () => {
+      setFeatureUsage('test-feature', 2)
+
+      const { isEligible } = useSurveyEligibility(defaultConfig)
+
+      expect(isEligible.value).toBe(false)
+    })
+
+    it('is eligible when all conditions met', () => {
+      setFeatureUsage('test-feature', 3)
+
+      const { isEligible } = useSurveyEligibility(defaultConfig)
+
+      expect(isEligible.value).toBe(true)
+    })
+
+    it('respects custom threshold', () => {
+      setFeatureUsage('test-feature', 5)
+
+      const { isEligible } = useSurveyEligibility({
+        ...defaultConfig,
+        triggerThreshold: 10
+      })
+
+      expect(isEligible.value).toBe(false)
+    })
+
+    it('is not eligible when survey already seen', () => {
+      setFeatureUsage('test-feature', 5)
+      localStorage.setItem(
+        SURVEY_STATE_KEY,
+        JSON.stringify({
+          optedOut: false,
+          seenSurveys: { 'test-feature': Date.now() }
+        })
+      )
+
+      const { isEligible } = useSurveyEligibility(defaultConfig)
+
+      expect(isEligible.value).toBe(false)
+    })
+
+    it('is not eligible during global cooldown', () => {
+      setFeatureUsage('test-feature', 5)
+      const threeDaysAgo = Date.now() - 3 * 24 * 60 * 60 * 1000
+      localStorage.setItem(
+        SURVEY_STATE_KEY,
+        JSON.stringify({
+          optedOut: false,
+          seenSurveys: { 'other-feature': threeDaysAgo }
+        })
+      )
+
+      const { isEligible } = useSurveyEligibility(defaultConfig)
+
+      expect(isEligible.value).toBe(false)
+    })
+
+    it('is eligible after global cooldown expires', () => {
+      setFeatureUsage('test-feature', 5)
+      const fiveDaysAgo = Date.now() - 5 * 24 * 60 * 60 * 1000
+      localStorage.setItem(
+        SURVEY_STATE_KEY,
+        JSON.stringify({
+          optedOut: false,
+          seenSurveys: { 'other-feature': fiveDaysAgo }
+        })
+      )
+
+      const { isEligible } = useSurveyEligibility(defaultConfig)
+
+      expect(isEligible.value).toBe(true)
+    })
+
+    it('is not eligible when opted out', () => {
+      setFeatureUsage('test-feature', 5)
+      localStorage.setItem(
+        SURVEY_STATE_KEY,
+        JSON.stringify({
+          optedOut: true,
+          seenSurveys: {}
+        })
+      )
+
+      const { isEligible } = useSurveyEligibility(defaultConfig)
+
+      expect(isEligible.value).toBe(false)
+    })
+
+    it('is not eligible when config disabled', () => {
+      setFeatureUsage('test-feature', 5)
+
+      const { isEligible } = useSurveyEligibility({
+        ...defaultConfig,
+        enabled: false
+      })
+
+      expect(isEligible.value).toBe(false)
+    })
+  })
+
+  describe('actions', () => {
+    it('markSurveyShown makes user ineligible', () => {
+      setFeatureUsage('test-feature', 5)
+
+      const { isEligible, markSurveyShown } =
+        useSurveyEligibility(defaultConfig)
+
+      expect(isEligible.value).toBe(true)
+
+      markSurveyShown()
+
+      expect(isEligible.value).toBe(false)
+    })
+
+    it('optOut prevents all future surveys', () => {
+      setFeatureUsage('test-feature', 5)
+
+      const { isEligible, optOut } = useSurveyEligibility(defaultConfig)
+
+      expect(isEligible.value).toBe(true)
+
+      optOut()
+
+      expect(isEligible.value).toBe(false)
+    })
+
+    it('resetState restores eligibility', () => {
+      setFeatureUsage('test-feature', 5)
+      localStorage.setItem(
+        SURVEY_STATE_KEY,
+        JSON.stringify({
+          optedOut: true,
+          seenSurveys: { 'test-feature': Date.now() }
+        })
+      )
+
+      const { isEligible, resetState } = useSurveyEligibility(defaultConfig)
+
+      expect(isEligible.value).toBe(false)
+
+      resetState()
+
+      expect(isEligible.value).toBe(true)
+    })
+  })
+
+  describe('config values', () => {
+    it('exposes delayMs from config', () => {
+      const { delayMs } = useSurveyEligibility({
+        ...defaultConfig,
+        delayMs: 10000
+      })
+
+      expect(delayMs.value).toBe(10000)
+    })
+  })
+
+  describe('persistence', () => {
+    it('loads existing state from localStorage', () => {
+      setFeatureUsage('test-feature', 5)
+      localStorage.setItem(
+        SURVEY_STATE_KEY,
+        JSON.stringify({
+          optedOut: false,
+          seenSurveys: { 'test-feature': 1000 }
+        })
+      )
+
+      const { isEligible } = useSurveyEligibility(defaultConfig)
+
+      expect(isEligible.value).toBe(false)
+    })
+  })
+})
diff --git a/src/platform/surveys/useSurveyEligibility.ts b/src/platform/surveys/useSurveyEligibility.ts
new file mode 100644
index 0000000000..e8e86f230e
--- /dev/null
+++ b/src/platform/surveys/useSurveyEligibility.ts
@@ -0,0 +1,97 @@
+import { useStorage } from '@vueuse/core'
+import type { MaybeRefOrGetter } from 'vue'
+import { computed, toValue } from 'vue'
+
+import { isCloud, isDesktop, isNightly } from '@/platform/distribution/types'
+
+import { useFeatureUsageTracker } from './useFeatureUsageTracker'
+
+export interface FeatureSurveyConfig {
+  /** Feature identifier. Must remain static after initialization. */
+  featureId: string
+  typeformId: string
+  triggerThreshold?: number
+  delayMs?: number
+  enabled?: boolean
+}
+
+interface SurveyState {
+  optedOut: boolean
+  seenSurveys: Record<string, number>
+}
+
+const STORAGE_KEY = 'Comfy.SurveyState'
+const GLOBAL_COOLDOWN_MS = 4 * 24 * 60 * 60 * 1000 // 4 days
+const DEFAULT_THRESHOLD = 3
+const DEFAULT_DELAY_MS = 5000
+
+export function useSurveyEligibility(
+  config: MaybeRefOrGetter<FeatureSurveyConfig>
+) {
+  const state = useStorage<SurveyState>(STORAGE_KEY, {
+    optedOut: false,
+    seenSurveys: {}
+  })
+  const resolvedConfig = computed(() => toValue(config))
+
+  const { useCount } = useFeatureUsageTracker(resolvedConfig.value.featureId)
+
+  const threshold = computed(
+    () => resolvedConfig.value.triggerThreshold ?? DEFAULT_THRESHOLD
+  )
+  const delayMs = computed(
+    () => resolvedConfig.value.delayMs ?? DEFAULT_DELAY_MS
+  )
+  const isSurveyEnabled = computed(() => resolvedConfig.value.enabled ?? true)
+
+  const isNightlyLocalhost = computed(() => isNightly && !isCloud && !isDesktop)
+
+  const hasReachedThreshold = computed(() => useCount.value >= threshold.value)
+
+  const hasSeenSurvey = computed(
+    () => !!state.value.seenSurveys[resolvedConfig.value.featureId]
+  )
+
+  const isInGlobalCooldown = computed(() => {
+    const timestamps = Object.values(state.value.seenSurveys)
+    if (timestamps.length === 0) return false
+    const lastShown = Math.max(...timestamps)
+    return Date.now() - lastShown < GLOBAL_COOLDOWN_MS
+  })
+
+  const hasOptedOut = computed(() => state.value.optedOut)
+
+  const isEligible = computed(() => {
+    if (!isSurveyEnabled.value) return false
+    if (!isNightlyLocalhost.value) return false
+    if (!hasReachedThreshold.value) return false
+    if (hasSeenSurvey.value) return false
+    if (isInGlobalCooldown.value) return false
+    if (hasOptedOut.value) return false
+
+    return true
+  })
+
+  function markSurveyShown() {
+    state.value.seenSurveys[resolvedConfig.value.featureId] = Date.now()
+  }
+
+  function optOut() {
+    state.value.optedOut = true
+  }
+
+  function resetState() {
+    state.value = {
+      optedOut: false,
+      seenSurveys: {}
+    }
+  }
+
+  return {
+    isEligible,
+    delayMs,
+    markSurveyShown,
+    optOut,
+    resetState
+  }
+}
diff --git a/src/platform/tasks/services/taskService.ts b/src/platform/tasks/services/taskService.ts
new file mode 100644
index 0000000000..7dc1e62db5
--- /dev/null
+++ b/src/platform/tasks/services/taskService.ts
@@ -0,0 +1,70 @@
+/**
+ * Task Service for polling background task status.
+ *
+ * CAVEAT: The `payload` and `result` schemas below are specific to
+ * `task:download_file` tasks. Other task types may have different
+ * payload/result structures. We are not generalizing this until
+ * additional use cases arise.
+ */
+import { z } from 'zod'
+import { fromZodError } from 'zod-validation-error'
+
+import { api } from '@/scripts/api'
+
+const TASKS_ENDPOINT = '/tasks'
+
+const zTaskStatus = z.enum(['created', 'running', 'completed', 'failed'])
+
+const zDownloadFileResult = z.object({
+  success: z.boolean(),
+  file_path: z.string().optional(),
+  bytes_downloaded: z.number().optional(),
+  content_type: z.string().optional(),
+  hash: z.string().optional(),
+  filename: z.string().optional(),
+  asset_id: z.string().optional(),
+  metadata: z.record(z.unknown()).optional(),
+  error: z.string().optional()
+})
+
+const zTaskResponse = z.object({
+  id: z.string().uuid(),
+  idempotency_key: z.string(),
+  task_name: z.string(),
+  payload: z.record(z.unknown()),
+  status: zTaskStatus,
+  result: zDownloadFileResult.optional(),
+  error_message: z.string().optional(),
+  create_time: z.string().datetime(),
+  update_time: z.string().datetime(),
+  started_at: z.string().datetime().optional(),
+  completed_at: z.string().datetime().optional()
+})
+
+export type TaskResponse = z.infer<typeof zTaskResponse>
+
+function createTaskService() {
+  async function getTask(taskId: string): Promise<TaskResponse> {
+    const res = await api.fetchApi(`${TASKS_ENDPOINT}/${taskId}`)
+
+    if (!res.ok) {
+      if (res.status === 404) {
+        throw new Error(`Task not found: ${taskId}`)
+      }
+      throw new Error(`Failed to get task ${taskId}: ${res.status}`)
+    }
+
+    const data = await res.json()
+    const result = zTaskResponse.safeParse(data)
+
+    if (!result.success) {
+      throw new Error(fromZodError(result.error).message)
+    }
+
+    return result.data
+  }
+
+  return { getTask }
+}
+
+export const taskService = createTaskService()
diff --git a/src/platform/telemetry/TelemetryRegistry.ts b/src/platform/telemetry/TelemetryRegistry.ts
new file mode 100644
index 0000000000..786f061a71
--- /dev/null
+++ b/src/platform/telemetry/TelemetryRegistry.ts
@@ -0,0 +1,224 @@
+import type { AuditLog } from '@/services/customerEventsService'
+
+import type {
+  AuthMetadata,
+  BeginCheckoutMetadata,
+  EnterLinearMetadata,
+  ExecutionErrorMetadata,
+  ExecutionSuccessMetadata,
+  ExecutionTriggerSource,
+  HelpCenterClosedMetadata,
+  HelpCenterOpenedMetadata,
+  HelpResourceClickedMetadata,
+  NodeSearchMetadata,
+  NodeSearchResultMetadata,
+  PageViewMetadata,
+  PageVisibilityMetadata,
+  SettingChangedMetadata,
+  SubscriptionMetadata,
+  SurveyResponses,
+  TabCountMetadata,
+  TelemetryDispatcher,
+  TelemetryProvider,
+  TemplateFilterMetadata,
+  TemplateLibraryClosedMetadata,
+  TemplateLibraryMetadata,
+  TemplateMetadata,
+  UiButtonClickMetadata,
+  WorkflowCreatedMetadata,
+  WorkflowImportMetadata
+} from './types'
+
+/**
+ * Registry that holds multiple telemetry providers and dispatches
+ * all tracking calls to each registered provider.
+ *
+ * Implements TelemetryDispatcher (all methods required) while dispatching
+ * to TelemetryProvider instances using optional chaining since providers
+ * only implement the methods they care about.
+ */
+export class TelemetryRegistry implements TelemetryDispatcher {
+  private providers: TelemetryProvider[] = []
+
+  registerProvider(provider: TelemetryProvider): void {
+    this.providers.push(provider)
+  }
+
+  private dispatch(action: (provider: TelemetryProvider) => void): void {
+    this.providers.forEach((provider) => {
+      try {
+        action(provider)
+      } catch (error) {
+        console.error('[Telemetry] Provider dispatch failed', error)
+      }
+    })
+  }
+
+  trackSignupOpened(): void {
+    this.dispatch((provider) => provider.trackSignupOpened?.())
+  }
+
+  trackAuth(metadata: AuthMetadata): void {
+    this.dispatch((provider) => provider.trackAuth?.(metadata))
+  }
+
+  trackUserLoggedIn(): void {
+    this.dispatch((provider) => provider.trackUserLoggedIn?.())
+  }
+
+  trackSubscription(
+    event: 'modal_opened' | 'subscribe_clicked',
+    metadata?: SubscriptionMetadata
+  ): void {
+    this.dispatch((provider) => provider.trackSubscription?.(event, metadata))
+  }
+
+  trackBeginCheckout(metadata: BeginCheckoutMetadata): void {
+    this.dispatch((provider) => provider.trackBeginCheckout?.(metadata))
+  }
+
+  trackMonthlySubscriptionSucceeded(): void {
+    this.dispatch((provider) => provider.trackMonthlySubscriptionSucceeded?.())
+  }
+
+  trackMonthlySubscriptionCancelled(): void {
+    this.dispatch((provider) => provider.trackMonthlySubscriptionCancelled?.())
+  }
+
+  trackAddApiCreditButtonClicked(): void {
+    this.dispatch((provider) => provider.trackAddApiCreditButtonClicked?.())
+  }
+
+  trackApiCreditTopupButtonPurchaseClicked(amount: number): void {
+    this.dispatch((provider) =>
+      provider.trackApiCreditTopupButtonPurchaseClicked?.(amount)
+    )
+  }
+
+  trackApiCreditTopupSucceeded(): void {
+    this.dispatch((provider) => provider.trackApiCreditTopupSucceeded?.())
+  }
+
+  trackRunButton(options?: {
+    subscribe_to_run?: boolean
+    trigger_source?: ExecutionTriggerSource
+  }): void {
+    this.dispatch((provider) => provider.trackRunButton?.(options))
+  }
+
+  startTopupTracking(): void {
+    this.dispatch((provider) => provider.startTopupTracking?.())
+  }
+
+  checkForCompletedTopup(events: AuditLog[] | undefined | null): boolean {
+    return this.providers.some((provider) => {
+      try {
+        return provider.checkForCompletedTopup?.(events) ?? false
+      } catch (error) {
+        console.error('[Telemetry] Provider dispatch failed', error)
+        return false
+      }
+    })
+  }
+
+  clearTopupTracking(): void {
+    this.dispatch((provider) => provider.clearTopupTracking?.())
+  }
+
+  trackSurvey(
+    stage: 'opened' | 'submitted',
+    responses?: SurveyResponses
+  ): void {
+    this.dispatch((provider) => provider.trackSurvey?.(stage, responses))
+  }
+
+  trackEmailVerification(stage: 'opened' | 'requested' | 'completed'): void {
+    this.dispatch((provider) => provider.trackEmailVerification?.(stage))
+  }
+
+  trackTemplate(metadata: TemplateMetadata): void {
+    this.dispatch((provider) => provider.trackTemplate?.(metadata))
+  }
+
+  trackTemplateLibraryOpened(metadata: TemplateLibraryMetadata): void {
+    this.dispatch((provider) => provider.trackTemplateLibraryOpened?.(metadata))
+  }
+
+  trackTemplateLibraryClosed(metadata: TemplateLibraryClosedMetadata): void {
+    this.dispatch((provider) => provider.trackTemplateLibraryClosed?.(metadata))
+  }
+
+  trackWorkflowImported(metadata: WorkflowImportMetadata): void {
+    this.dispatch((provider) => provider.trackWorkflowImported?.(metadata))
+  }
+
+  trackWorkflowOpened(metadata: WorkflowImportMetadata): void {
+    this.dispatch((provider) => provider.trackWorkflowOpened?.(metadata))
+  }
+
+  trackEnterLinear(metadata: EnterLinearMetadata): void {
+    this.dispatch((provider) => provider.trackEnterLinear?.(metadata))
+  }
+
+  trackPageVisibilityChanged(metadata: PageVisibilityMetadata): void {
+    this.dispatch((provider) => provider.trackPageVisibilityChanged?.(metadata))
+  }
+
+  trackTabCount(metadata: TabCountMetadata): void {
+    this.dispatch((provider) => provider.trackTabCount?.(metadata))
+  }
+
+  trackNodeSearch(metadata: NodeSearchMetadata): void {
+    this.dispatch((provider) => provider.trackNodeSearch?.(metadata))
+  }
+
+  trackNodeSearchResultSelected(metadata: NodeSearchResultMetadata): void {
+    this.dispatch((provider) =>
+      provider.trackNodeSearchResultSelected?.(metadata)
+    )
+  }
+
+  trackTemplateFilterChanged(metadata: TemplateFilterMetadata): void {
+    this.dispatch((provider) => provider.trackTemplateFilterChanged?.(metadata))
+  }
+
+  trackHelpCenterOpened(metadata: HelpCenterOpenedMetadata): void {
+    this.dispatch((provider) => provider.trackHelpCenterOpened?.(metadata))
+  }
+
+  trackHelpResourceClicked(metadata: HelpResourceClickedMetadata): void {
+    this.dispatch((provider) => provider.trackHelpResourceClicked?.(metadata))
+  }
+
+  trackHelpCenterClosed(metadata: HelpCenterClosedMetadata): void {
+    this.dispatch((provider) => provider.trackHelpCenterClosed?.(metadata))
+  }
+
+  trackWorkflowCreated(metadata: WorkflowCreatedMetadata): void {
+    this.dispatch((provider) => provider.trackWorkflowCreated?.(metadata))
+  }
+
+  trackWorkflowExecution(): void {
+    this.dispatch((provider) => provider.trackWorkflowExecution?.())
+  }
+
+  trackExecutionError(metadata: ExecutionErrorMetadata): void {
+    this.dispatch((provider) => provider.trackExecutionError?.(metadata))
+  }
+
+  trackExecutionSuccess(metadata: ExecutionSuccessMetadata): void {
+    this.dispatch((provider) => provider.trackExecutionSuccess?.(metadata))
+  }
+
+  trackSettingChanged(metadata: SettingChangedMetadata): void {
+    this.dispatch((provider) => provider.trackSettingChanged?.(metadata))
+  }
+
+  trackUiButtonClicked(metadata: UiButtonClickMetadata): void {
+    this.dispatch((provider) => provider.trackUiButtonClicked?.(metadata))
+  }
+
+  trackPageView(pageName: string, properties?: PageViewMetadata): void {
+    this.dispatch((provider) => provider.trackPageView?.(pageName, properties))
+  }
+}
diff --git a/src/platform/telemetry/index.ts b/src/platform/telemetry/index.ts
index 83d7f2c9f9..293acc21fa 100644
--- a/src/platform/telemetry/index.ts
+++ b/src/platform/telemetry/index.ts
@@ -1,42 +1,19 @@
-/**
- * Telemetry Provider - OSS Build Safety
- *
- * CRITICAL: OSS Build Safety
- * This module is conditionally compiled based on distribution. When building
- * the open source version (DISTRIBUTION unset), this entire module and its dependencies
- * are excluded through via tree-shaking.
- *
- * To verify OSS builds exclude this code:
- * 1. `DISTRIBUTION= pnpm build` (OSS build)
- * 2. `grep -RinE --include='*.js' 'trackWorkflow|trackEvent|mixpanel' dist/` (should find nothing)
- * 3. Check dist/assets/*.js files contain no tracking code
- *
- * This approach maintains complete separation between cloud and OSS builds
- * while ensuring the open source version contains no telemetry dependencies.
- */
-import { isCloud } from '@/platform/distribution/types'
+import type { TelemetryDispatcher } from './types'
 
-import { MixpanelTelemetryProvider } from './providers/cloud/MixpanelTelemetryProvider'
-import type { TelemetryProvider } from './types'
-
-// Singleton instance
-let _telemetryProvider: TelemetryProvider | null = null
+let _telemetryRegistry: TelemetryDispatcher | null = null
 
 /**
- * Telemetry factory - conditionally creates provider based on distribution
- * Returns singleton instance.
+ * Get the telemetry dispatcher for tracking events.
+ * Returns null in OSS builds - all tracking calls become no-ops.
  *
- * CRITICAL: This returns undefined in OSS builds. There is no telemetry provider
- * for OSS builds and all tracking calls are no-ops.
+ * Usage: useTelemetry()?.trackAuth({ method: 'google' })
  */
-export function useTelemetry(): TelemetryProvider | null {
-  if (_telemetryProvider === null) {
-    // Use distribution check for tree-shaking
-    if (isCloud) {
-      _telemetryProvider = new MixpanelTelemetryProvider()
-    }
-    // For OSS builds, _telemetryProvider stays null
-  }
-
-  return _telemetryProvider
+export function useTelemetry(): TelemetryDispatcher | null {
+  return _telemetryRegistry
+}
+
+export function setTelemetryRegistry(
+  registry: TelemetryDispatcher | null
+): void {
+  _telemetryRegistry = registry
 }
diff --git a/src/platform/telemetry/initTelemetry.ts b/src/platform/telemetry/initTelemetry.ts
new file mode 100644
index 0000000000..cf12cc80d4
--- /dev/null
+++ b/src/platform/telemetry/initTelemetry.ts
@@ -0,0 +1,47 @@
+/**
+ * Telemetry Provider - Cloud Initialization
+ *
+ * This module is only imported in cloud builds to keep
+ * cloud telemetry code out of local/desktop bundles.
+ */
+import { setTelemetryRegistry } from './index'
+
+const IS_CLOUD_BUILD = __DISTRIBUTION__ === 'cloud'
+
+let _initPromise: Promise<void> | null = null
+
+/**
+ * Initialize telemetry providers for cloud builds.
+ * Must be called early in app startup (e.g., main.ts).
+ * Safe to call multiple times - only initializes once.
+ */
+export async function initTelemetry(): Promise<void> {
+  if (!IS_CLOUD_BUILD) return
+  if (_initPromise) return _initPromise
+
+  _initPromise = (async () => {
+    const [
+      { TelemetryRegistry },
+      { MixpanelTelemetryProvider },
+      { GtmTelemetryProvider },
+      { ImpactTelemetryProvider },
+      { PostHogTelemetryProvider }
+    ] = await Promise.all([
+      import('./TelemetryRegistry'),
+      import('./providers/cloud/MixpanelTelemetryProvider'),
+      import('./providers/cloud/GtmTelemetryProvider'),
+      import('./providers/cloud/ImpactTelemetryProvider'),
+      import('./providers/cloud/PostHogTelemetryProvider')
+    ])
+
+    const registry = new TelemetryRegistry()
+    registry.registerProvider(new MixpanelTelemetryProvider())
+    registry.registerProvider(new GtmTelemetryProvider())
+    registry.registerProvider(new ImpactTelemetryProvider())
+    registry.registerProvider(new PostHogTelemetryProvider())
+
+    setTelemetryRegistry(registry)
+  })()
+
+  return _initPromise
+}
diff --git a/src/platform/telemetry/providers/cloud/GtmTelemetryProvider.test.ts b/src/platform/telemetry/providers/cloud/GtmTelemetryProvider.test.ts
new file mode 100644
index 0000000000..89b62ab1de
--- /dev/null
+++ b/src/platform/telemetry/providers/cloud/GtmTelemetryProvider.test.ts
@@ -0,0 +1,69 @@
+import { beforeEach, describe, expect, it } from 'vitest'
+
+import { GtmTelemetryProvider } from './GtmTelemetryProvider'
+
+describe('GtmTelemetryProvider', () => {
+  beforeEach(() => {
+    window.__CONFIG__ = {}
+    window.dataLayer = undefined
+    window.gtag = undefined
+    document.head.innerHTML = ''
+  })
+
+  it('injects the GTM runtime script', () => {
+    window.__CONFIG__ = {
+      gtm_container_id: 'GTM-TEST123'
+    }
+
+    new GtmTelemetryProvider()
+
+    const gtmScript = document.querySelector(
+      'script[src="https://www.googletagmanager.com/gtm.js?id=GTM-TEST123"]'
+    )
+
+    expect(gtmScript).not.toBeNull()
+    expect(window.dataLayer?.[0]).toMatchObject({
+      event: 'gtm.js'
+    })
+  })
+
+  it('bootstraps gtag when a GA measurement id exists', () => {
+    window.__CONFIG__ = {
+      ga_measurement_id: 'G-TEST123'
+    }
+
+    new GtmTelemetryProvider()
+
+    const gtagScript = document.querySelector(
+      'script[src="https://www.googletagmanager.com/gtag/js?id=G-TEST123"]'
+    )
+    const dataLayer = window.dataLayer as unknown[]
+
+    expect(gtagScript).not.toBeNull()
+    expect(typeof window.gtag).toBe('function')
+    expect(dataLayer).toHaveLength(2)
+    expect(Array.from(dataLayer[0] as IArguments)[0]).toBe('js')
+    expect(Array.from(dataLayer[1] as IArguments)).toEqual([
+      'config',
+      'G-TEST123',
+      {
+        send_page_view: false
+      }
+    ])
+  })
+
+  it('does not inject duplicate gtag scripts across repeated init', () => {
+    window.__CONFIG__ = {
+      ga_measurement_id: 'G-TEST123'
+    }
+
+    new GtmTelemetryProvider()
+    new GtmTelemetryProvider()
+
+    const gtagScripts = document.querySelectorAll(
+      'script[src="https://www.googletagmanager.com/gtag/js?id=G-TEST123"]'
+    )
+
+    expect(gtagScripts).toHaveLength(1)
+  })
+})
diff --git a/src/platform/telemetry/providers/cloud/GtmTelemetryProvider.ts b/src/platform/telemetry/providers/cloud/GtmTelemetryProvider.ts
new file mode 100644
index 0000000000..d4eb467543
--- /dev/null
+++ b/src/platform/telemetry/providers/cloud/GtmTelemetryProvider.ts
@@ -0,0 +1,117 @@
+import type {
+  AuthMetadata,
+  BeginCheckoutMetadata,
+  PageViewMetadata,
+  TelemetryProvider
+} from '../../types'
+
+/**
+ * Google Tag Manager telemetry provider.
+ * Pushes events to the GTM dataLayer for GA4 and marketing integrations.
+ *
+ * Only implements events relevant to GTM/GA4 tracking.
+ */
+export class GtmTelemetryProvider implements TelemetryProvider {
+  private initialized = false
+
+  constructor() {
+    this.initialize()
+  }
+
+  private initialize(): void {
+    if (typeof window === 'undefined') return
+
+    const gtmId = window.__CONFIG__?.gtm_container_id
+    if (gtmId) {
+      this.initializeGtm(gtmId)
+    } else {
+      if (import.meta.env.MODE === 'development') {
+        console.warn('[GTM] No GTM ID configured, skipping initialization')
+      }
+    }
+
+    const measurementId = window.__CONFIG__?.ga_measurement_id
+    if (measurementId) {
+      this.bootstrapGtag(measurementId)
+    }
+  }
+
+  private initializeGtm(gtmId: string): void {
+    window.dataLayer = window.dataLayer || []
+
+    window.dataLayer.push({
+      'gtm.start': new Date().getTime(),
+      event: 'gtm.js'
+    })
+
+    const script = document.createElement('script')
+    script.async = true
+    script.src = `https://www.googletagmanager.com/gtm.js?id=${gtmId}`
+    document.head.insertBefore(script, document.head.firstChild)
+
+    this.initialized = true
+  }
+
+  private bootstrapGtag(measurementId: string): void {
+    window.dataLayer = window.dataLayer || []
+
+    if (typeof window.gtag !== 'function') {
+      function gtag() {
+        // gtag queue shape is dataLayer.push(arguments)
+        // eslint-disable-next-line prefer-rest-params
+        ;(window.dataLayer as unknown[] | undefined)?.push(arguments)
+      }
+
+      window.gtag = gtag as Window['gtag']
+    }
+
+    const gtagScriptSrc = `https://www.googletagmanager.com/gtag/js?id=${measurementId}`
+    const existingGtagScript = document.querySelector(
+      `script[src="${gtagScriptSrc}"]`
+    )
+
+    if (!existingGtagScript) {
+      const script = document.createElement('script')
+      script.async = true
+      script.src = gtagScriptSrc
+      document.head.insertBefore(script, document.head.firstChild)
+    }
+
+    const gtag = window.gtag
+    if (typeof gtag !== 'function') return
+
+    gtag('js', new Date())
+    gtag('config', measurementId, { send_page_view: false })
+  }
+
+  private pushEvent(event: string, properties?: Record<string, unknown>): void {
+    if (!this.initialized) return
+    window.dataLayer?.push({ event, ...properties })
+  }
+
+  trackPageView(pageName: string, properties?: PageViewMetadata): void {
+    this.pushEvent('page_view', {
+      page_title: pageName,
+      page_location: properties?.path,
+      page_referrer: properties?.referrer
+    })
+  }
+
+  trackAuth(metadata: AuthMetadata): void {
+    const basePayload = {
+      method: metadata.method,
+      ...(metadata.user_id ? { user_id: metadata.user_id } : {})
+    }
+
+    if (metadata.is_new_user) {
+      this.pushEvent('sign_up', basePayload)
+      return
+    }
+
+    this.pushEvent('login', basePayload)
+  }
+
+  trackBeginCheckout(metadata: BeginCheckoutMetadata): void {
+    this.pushEvent('begin_checkout', metadata)
+  }
+}
diff --git a/src/platform/telemetry/providers/cloud/ImpactTelemetryProvider.test.ts b/src/platform/telemetry/providers/cloud/ImpactTelemetryProvider.test.ts
new file mode 100644
index 0000000000..37339ccd04
--- /dev/null
+++ b/src/platform/telemetry/providers/cloud/ImpactTelemetryProvider.test.ts
@@ -0,0 +1,260 @@
+import { createHash } from 'node:crypto'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+type MockApiKeyUser = {
+  id: string
+  email?: string
+} | null
+
+type MockFirebaseUser = {
+  uid: string
+  email?: string | null
+} | null
+
+const {
+  mockCaptureCheckoutAttributionFromSearch,
+  mockUseApiKeyAuthStore,
+  mockUseFirebaseAuthStore,
+  mockApiKeyAuthStore,
+  mockFirebaseAuthStore
+} = vi.hoisted(() => ({
+  mockCaptureCheckoutAttributionFromSearch: vi.fn(),
+  mockUseApiKeyAuthStore: vi.fn(),
+  mockUseFirebaseAuthStore: vi.fn(),
+  mockApiKeyAuthStore: {
+    isAuthenticated: false,
+    currentUser: null as MockApiKeyUser
+  },
+  mockFirebaseAuthStore: {
+    currentUser: null as MockFirebaseUser
+  }
+}))
+
+vi.mock('@/platform/telemetry/utils/checkoutAttribution', () => ({
+  captureCheckoutAttributionFromSearch: mockCaptureCheckoutAttributionFromSearch
+}))
+
+vi.mock('@/stores/apiKeyAuthStore', () => ({
+  useApiKeyAuthStore: mockUseApiKeyAuthStore
+}))
+
+vi.mock('@/stores/firebaseAuthStore', () => ({
+  useFirebaseAuthStore: mockUseFirebaseAuthStore
+}))
+
+import { ImpactTelemetryProvider } from './ImpactTelemetryProvider'
+
+const IMPACT_SCRIPT_URL =
+  'https://utt.impactcdn.com/A6951770-3747-434a-9ac7-4e582e67d91f1.js'
+
+async function flushAsyncWork() {
+  await Promise.resolve()
+  await Promise.resolve()
+}
+
+function toUint8Array(data: BufferSource): Uint8Array {
+  if (data instanceof ArrayBuffer) {
+    return new Uint8Array(data)
+  }
+
+  return new Uint8Array(data.buffer, data.byteOffset, data.byteLength)
+}
+
+describe('ImpactTelemetryProvider', () => {
+  beforeEach(() => {
+    mockCaptureCheckoutAttributionFromSearch.mockReset()
+    mockUseApiKeyAuthStore.mockReset()
+    mockUseFirebaseAuthStore.mockReset()
+    mockApiKeyAuthStore.isAuthenticated = false
+    mockApiKeyAuthStore.currentUser = null
+    mockFirebaseAuthStore.currentUser = null
+    vi.restoreAllMocks()
+    vi.unstubAllGlobals()
+    mockUseApiKeyAuthStore.mockReturnValue(mockApiKeyAuthStore)
+    mockUseFirebaseAuthStore.mockReturnValue(mockFirebaseAuthStore)
+
+    const queueFn: NonNullable<Window['ire']> = (...args: unknown[]) => {
+      ;(queueFn.a ??= []).push(args)
+    }
+    window.ire = queueFn
+    window.ire_o = undefined
+
+    vi.spyOn(document, 'querySelector').mockImplementation((selector) => {
+      if (selector === `script[src="${IMPACT_SCRIPT_URL}"]`) {
+        return document.createElement('script')
+      }
+
+      return null
+    })
+  })
+
+  afterEach(() => {
+    vi.unstubAllGlobals()
+  })
+
+  it('captures attribution and invokes identify with hashed email', async () => {
+    mockFirebaseAuthStore.currentUser = {
+      uid: 'user-123',
+      email: ' User@Example.com '
+    }
+    vi.stubGlobal('crypto', {
+      subtle: {
+        digest: vi.fn(
+          async (_algorithm: AlgorithmIdentifier, data: BufferSource) => {
+            const digest = createHash('sha1')
+              .update(toUint8Array(data))
+              .digest()
+            return Uint8Array.from(digest).buffer
+          }
+        )
+      }
+    })
+    const provider = new ImpactTelemetryProvider()
+    provider.trackPageView('pricing', {
+      path: 'https://cloud.comfy.org/pricing?im_ref=impact-123'
+    })
+
+    await flushAsyncWork()
+
+    expect(window.ire_o).toBe('ire')
+    expect(mockCaptureCheckoutAttributionFromSearch).toHaveBeenCalledWith(
+      '?im_ref=impact-123'
+    )
+    expect(window.ire?.a).toHaveLength(1)
+    expect(window.ire?.a?.[0]?.[0]).toBe('identify')
+    expect(window.ire?.a?.[0]?.[1]).toEqual({
+      customerId: 'user-123',
+      customerEmail: '63a710569261a24b3766275b7000ce8d7b32e2f7'
+    })
+  })
+
+  it('falls back to current URL search and empty identify values when user is unresolved', async () => {
+    mockUseApiKeyAuthStore.mockImplementation(() => {
+      throw new Error('No active pinia')
+    })
+    window.history.pushState({}, '', '/?im_ref=fallback-123')
+
+    const provider = new ImpactTelemetryProvider()
+    provider.trackPageView('home')
+
+    await flushAsyncWork()
+
+    expect(mockCaptureCheckoutAttributionFromSearch).toHaveBeenCalledWith(
+      '?im_ref=fallback-123'
+    )
+    expect(window.ire?.a).toHaveLength(1)
+    expect(window.ire?.a?.[0]).toEqual([
+      'identify',
+      {
+        customerId: '',
+        customerEmail: ''
+      }
+    ])
+  })
+
+  it('invokes identify on each page view even with identical identity payloads', async () => {
+    mockFirebaseAuthStore.currentUser = {
+      uid: 'user-123',
+      email: 'user@example.com'
+    }
+    vi.stubGlobal('crypto', {
+      subtle: {
+        digest: vi.fn(async () => new Uint8Array([16, 32, 48]).buffer)
+      }
+    })
+    const provider = new ImpactTelemetryProvider()
+    provider.trackPageView('home', {
+      path: 'https://cloud.comfy.org/?im_ref=1'
+    })
+    provider.trackPageView('pricing', {
+      path: 'https://cloud.comfy.org/pricing?im_ref=2'
+    })
+
+    await flushAsyncWork()
+
+    expect(window.ire?.a).toHaveLength(2)
+    expect(window.ire?.a?.[0]?.[0]).toBe('identify')
+    expect(window.ire?.a?.[0]?.[1]).toMatchObject({
+      customerId: 'user-123'
+    })
+    expect(window.ire?.a?.[1]?.[0]).toBe('identify')
+    expect(window.ire?.a?.[1]?.[1]).toMatchObject({
+      customerId: 'user-123'
+    })
+  })
+
+  it('prefers firebase identity when both firebase and API key identity are available', async () => {
+    mockApiKeyAuthStore.isAuthenticated = true
+    mockApiKeyAuthStore.currentUser = {
+      id: 'api-key-user-123',
+      email: 'apikey@example.com'
+    }
+    mockFirebaseAuthStore.currentUser = {
+      uid: 'firebase-user-123',
+      email: 'firebase@example.com'
+    }
+    vi.stubGlobal('crypto', {
+      subtle: {
+        digest: vi.fn(
+          async (_algorithm: AlgorithmIdentifier, data: BufferSource) => {
+            const digest = createHash('sha1')
+              .update(toUint8Array(data))
+              .digest()
+            return Uint8Array.from(digest).buffer
+          }
+        )
+      }
+    })
+
+    const provider = new ImpactTelemetryProvider()
+    provider.trackPageView('home', {
+      path: 'https://cloud.comfy.org/?im_ref=impact-123'
+    })
+
+    await flushAsyncWork()
+
+    expect(window.ire?.a?.[0]).toEqual([
+      'identify',
+      {
+        customerId: 'firebase-user-123',
+        customerEmail: '2a2f2883bb1c5dd4ec5d18d95630834744609a7e'
+      }
+    ])
+  })
+
+  it('falls back to API key identity when firebase user is unavailable', async () => {
+    mockApiKeyAuthStore.isAuthenticated = true
+    mockApiKeyAuthStore.currentUser = {
+      id: 'api-key-user-123',
+      email: 'apikey@example.com'
+    }
+    mockFirebaseAuthStore.currentUser = null
+    vi.stubGlobal('crypto', {
+      subtle: {
+        digest: vi.fn(
+          async (_algorithm: AlgorithmIdentifier, data: BufferSource) => {
+            const digest = createHash('sha1')
+              .update(toUint8Array(data))
+              .digest()
+            return Uint8Array.from(digest).buffer
+          }
+        )
+      }
+    })
+
+    const provider = new ImpactTelemetryProvider()
+    provider.trackPageView('home', {
+      path: 'https://cloud.comfy.org/?im_ref=impact-123'
+    })
+
+    await flushAsyncWork()
+
+    expect(window.ire?.a?.[0]).toEqual([
+      'identify',
+      {
+        customerId: 'api-key-user-123',
+        customerEmail: '76ce7ed8519b3ab66d7520bbc3c4efcdff657028'
+      }
+    ])
+  })
+})
diff --git a/src/platform/telemetry/providers/cloud/ImpactTelemetryProvider.ts b/src/platform/telemetry/providers/cloud/ImpactTelemetryProvider.ts
new file mode 100644
index 0000000000..ff11d420a7
--- /dev/null
+++ b/src/platform/telemetry/providers/cloud/ImpactTelemetryProvider.ts
@@ -0,0 +1,174 @@
+import { captureCheckoutAttributionFromSearch } from '@/platform/telemetry/utils/checkoutAttribution'
+import { useApiKeyAuthStore } from '@/stores/apiKeyAuthStore'
+import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
+
+import type { PageViewMetadata, TelemetryProvider } from '../../types'
+
+const IMPACT_SCRIPT_URL =
+  'https://utt.impactcdn.com/A6951770-3747-434a-9ac7-4e582e67d91f1.js'
+const IMPACT_QUEUE_NAME = 'ire'
+const EMPTY_CUSTOMER_VALUE = ''
+
+/**
+ * Impact telemetry provider.
+ * Initializes the Impact queue globals and loads the runtime script.
+ */
+export class ImpactTelemetryProvider implements TelemetryProvider {
+  private initialized = false
+  private stores: {
+    apiKeyAuthStore: ReturnType<typeof useApiKeyAuthStore>
+    firebaseAuthStore: ReturnType<typeof useFirebaseAuthStore>
+  } | null = null
+
+  constructor() {
+    this.initialize()
+  }
+
+  trackPageView(_pageName: string, properties?: PageViewMetadata): void {
+    const search = this.extractSearchFromPath(properties?.path)
+
+    if (search) {
+      captureCheckoutAttributionFromSearch(search)
+    } else if (typeof window !== 'undefined') {
+      captureCheckoutAttributionFromSearch(window.location.search)
+    }
+
+    void this.identifyCurrentUser()
+  }
+
+  private initialize(): void {
+    if (typeof window === 'undefined' || this.initialized) return
+
+    window.ire_o = IMPACT_QUEUE_NAME
+
+    if (!window.ire) {
+      const queueFn: NonNullable<Window['ire']> = (...args: unknown[]) => {
+        ;(queueFn.a ??= []).push(args)
+      }
+      window.ire = queueFn
+    }
+
+    const existingScript = document.querySelector(
+      `script[src="${IMPACT_SCRIPT_URL}"]`
+    )
+    if (existingScript) {
+      this.initialized = true
+      return
+    }
+
+    const script = document.createElement('script')
+    script.async = true
+    script.src = IMPACT_SCRIPT_URL
+
+    document.head.insertBefore(script, document.head.firstChild)
+
+    this.initialized = true
+  }
+
+  private extractSearchFromPath(path?: string): string {
+    if (!path) return ''
+
+    if (typeof window !== 'undefined') {
+      try {
+        const url = new URL(path, window.location.origin)
+        return url.search
+      } catch {
+        // Fall through to manual parsing.
+      }
+    }
+
+    const queryIndex = path.indexOf('?')
+    return queryIndex >= 0 ? path.slice(queryIndex) : ''
+  }
+
+  private async identifyCurrentUser(): Promise<void> {
+    if (typeof window === 'undefined') return
+
+    const { customerId, customerEmail } = this.resolveCustomerIdentity()
+    const normalizedEmail = customerEmail.trim().toLowerCase()
+    // Impact's Identify spec requires customerEmail to be sent as a SHA1 hash.
+    const hashedEmail = normalizedEmail
+      ? await this.hashSha1(normalizedEmail)
+      : EMPTY_CUSTOMER_VALUE
+
+    window.ire?.('identify', {
+      customerId,
+      customerEmail: hashedEmail
+    })
+  }
+
+  private resolveCustomerIdentity(): {
+    customerId: string
+    customerEmail: string
+  } {
+    const stores = this.resolveAuthStores()
+    if (!stores) {
+      return {
+        customerId: EMPTY_CUSTOMER_VALUE,
+        customerEmail: EMPTY_CUSTOMER_VALUE
+      }
+    }
+
+    if (stores.firebaseAuthStore.currentUser) {
+      return {
+        customerId:
+          stores.firebaseAuthStore.currentUser.uid ?? EMPTY_CUSTOMER_VALUE,
+        customerEmail:
+          stores.firebaseAuthStore.currentUser.email ?? EMPTY_CUSTOMER_VALUE
+      }
+    }
+
+    if (stores.apiKeyAuthStore.isAuthenticated) {
+      return {
+        customerId:
+          stores.apiKeyAuthStore.currentUser?.id ?? EMPTY_CUSTOMER_VALUE,
+        customerEmail:
+          stores.apiKeyAuthStore.currentUser?.email ?? EMPTY_CUSTOMER_VALUE
+      }
+    }
+
+    return {
+      customerId: EMPTY_CUSTOMER_VALUE,
+      customerEmail: EMPTY_CUSTOMER_VALUE
+    }
+  }
+
+  private resolveAuthStores(): {
+    apiKeyAuthStore: ReturnType<typeof useApiKeyAuthStore>
+    firebaseAuthStore: ReturnType<typeof useFirebaseAuthStore>
+  } | null {
+    if (this.stores) {
+      return this.stores
+    }
+
+    try {
+      const stores = {
+        apiKeyAuthStore: useApiKeyAuthStore(),
+        firebaseAuthStore: useFirebaseAuthStore()
+      }
+      this.stores = stores
+      return stores
+    } catch {
+      return null
+    }
+  }
+
+  private async hashSha1(value: string): Promise<string> {
+    try {
+      if (!globalThis.crypto?.subtle || typeof TextEncoder === 'undefined') {
+        return EMPTY_CUSTOMER_VALUE
+      }
+
+      const digestBuffer = await crypto.subtle.digest(
+        'SHA-1',
+        new TextEncoder().encode(value)
+      )
+
+      return Array.from(new Uint8Array(digestBuffer))
+        .map((byte) => byte.toString(16).padStart(2, '0'))
+        .join('')
+    } catch {
+      return EMPTY_CUSTOMER_VALUE
+    }
+  }
+}
diff --git a/src/platform/telemetry/providers/cloud/MixpanelTelemetryProvider.test.ts b/src/platform/telemetry/providers/cloud/MixpanelTelemetryProvider.test.ts
new file mode 100644
index 0000000000..b92b49ff0b
--- /dev/null
+++ b/src/platform/telemetry/providers/cloud/MixpanelTelemetryProvider.test.ts
@@ -0,0 +1,178 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+
+vi.mock('vue', async () => {
+  const actual = await vi.importActual('vue')
+  return {
+    ...actual,
+    watch: vi.fn()
+  }
+})
+
+vi.mock('@/composables/auth/useCurrentUser', () => ({
+  useCurrentUser: () => ({
+    onUserResolved: vi.fn()
+  })
+}))
+
+vi.mock('@/platform/telemetry/topupTracker', () => ({
+  checkForCompletedTopup: vi.fn(),
+  clearTopupTracking: vi.fn(),
+  startTopupTracking: vi.fn()
+}))
+
+const hoisted = vi.hoisted(() => ({
+  mockNodeDefsByName: {} as Record<string, unknown>,
+  mockNodes: [] as Pick<LGraphNode, 'type' | 'isSubgraphNode'>[]
+}))
+
+vi.mock('@/stores/nodeDefStore', () => ({
+  useNodeDefStore: () => ({
+    nodeDefsByName: hoisted.mockNodeDefsByName
+  })
+}))
+
+vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
+  useWorkflowStore: () => ({
+    activeWorkflow: null
+  })
+}))
+
+vi.mock(
+  '@/platform/workflow/templates/repositories/workflowTemplatesStore',
+  () => ({
+    useWorkflowTemplatesStore: () => ({
+      knownTemplateNames: new Set()
+    })
+  })
+)
+
+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: {} }
+}))
+
+vi.mock('@/platform/remoteConfig/remoteConfig', () => ({
+  remoteConfig: { value: null }
+}))
+
+import { getExecutionContext } from '../../utils/getExecutionContext'
+
+describe('getExecutionContext', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    hoisted.mockNodes.length = 0
+    for (const key of Object.keys(hoisted.mockNodeDefsByName)) {
+      delete hoisted.mockNodeDefsByName[key]
+    }
+  })
+
+  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'])
+  })
+})
diff --git a/src/platform/telemetry/providers/cloud/MixpanelTelemetryProvider.ts b/src/platform/telemetry/providers/cloud/MixpanelTelemetryProvider.ts
index 86b3a5553f..30043522cd 100644
--- a/src/platform/telemetry/providers/cloud/MixpanelTelemetryProvider.ts
+++ b/src/platform/telemetry/providers/cloud/MixpanelTelemetryProvider.ts
@@ -7,16 +7,14 @@ import {
   clearTopupTracking as clearTopupUtil,
   startTopupTracking as startTopupUtil
 } from '@/platform/telemetry/topupTracker'
-import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
-import { useWorkflowTemplatesStore } from '@/platform/workflow/templates/repositories/workflowTemplatesStore'
-import { app } from '@/scripts/app'
-import { useNodeDefStore } from '@/stores/nodeDefStore'
-import { NodeSourceType } from '@/types/nodeSource'
-import { reduceAllNodes } from '@/utils/graphTraversalUtil'
+import type { AuditLog } from '@/services/customerEventsService'
+
+import { getExecutionContext } from '../../utils/getExecutionContext'
 
 import type {
   AuthMetadata,
   CreditTopupMetadata,
+  EnterLinearMetadata,
   ExecutionContext,
   ExecutionTriggerSource,
   ExecutionErrorMetadata,
@@ -29,6 +27,7 @@ import type {
   PageVisibilityMetadata,
   RunButtonProperties,
   SettingChangedMetadata,
+  SubscriptionMetadata,
   SurveyResponses,
   TabCountMetadata,
   TelemetryEventName,
@@ -216,13 +215,16 @@ export class MixpanelTelemetryProvider implements TelemetryProvider {
     this.trackEvent(TelemetryEvents.USER_LOGGED_IN)
   }
 
-  trackSubscription(event: 'modal_opened' | 'subscribe_clicked'): void {
+  trackSubscription(
+    event: 'modal_opened' | 'subscribe_clicked',
+    metadata?: SubscriptionMetadata
+  ): void {
     const eventName =
       event === 'modal_opened'
         ? TelemetryEvents.SUBSCRIPTION_REQUIRED_MODAL_OPENED
         : TelemetryEvents.SUBSCRIBE_NOW_BUTTON_CLICKED
 
-    this.trackEvent(eventName)
+    this.trackEvent(eventName, metadata)
   }
 
   trackAddApiCreditButtonClicked(): void {
@@ -260,7 +262,7 @@ export class MixpanelTelemetryProvider implements TelemetryProvider {
     startTopupUtil()
   }
 
-  checkForCompletedTopup(events: any[] | undefined | null): boolean {
+  checkForCompletedTopup(events: AuditLog[] | undefined | null): boolean {
     return checkTopupUtil(events)
   }
 
@@ -272,7 +274,7 @@ export class MixpanelTelemetryProvider implements TelemetryProvider {
     subscribe_to_run?: boolean
     trigger_source?: ExecutionTriggerSource
   }): void {
-    const executionContext = this.getExecutionContext()
+    const executionContext = getExecutionContext()
 
     const runButtonProperties: RunButtonProperties = {
       subscribe_to_run: options?.subscribe_to_run || false,
@@ -283,6 +285,8 @@ export class MixpanelTelemetryProvider implements TelemetryProvider {
       subgraph_count: executionContext.subgraph_count,
       has_api_nodes: executionContext.has_api_nodes,
       api_node_names: executionContext.api_node_names,
+      has_toolkit_nodes: executionContext.has_toolkit_nodes,
+      toolkit_node_names: executionContext.toolkit_node_names,
       trigger_source: options?.trigger_source
     }
 
@@ -354,6 +358,10 @@ export class MixpanelTelemetryProvider implements TelemetryProvider {
     this.trackEvent(TelemetryEvents.WORKFLOW_OPENED, metadata)
   }
 
+  trackEnterLinear(metadata: EnterLinearMetadata): void {
+    this.trackEvent(TelemetryEvents.ENTER_LINEAR_MODE, metadata)
+  }
+
   trackPageVisibilityChanged(metadata: PageVisibilityMetadata): void {
     this.trackEvent(TelemetryEvents.PAGE_VISIBILITY_CHANGED, metadata)
   }
@@ -391,7 +399,7 @@ export class MixpanelTelemetryProvider implements TelemetryProvider {
   }
 
   trackWorkflowExecution(): void {
-    const context = this.getExecutionContext()
+    const context = getExecutionContext()
     const eventContext: ExecutionContext = {
       ...context,
       trigger_source: this.lastTriggerSource ?? 'unknown'
@@ -415,98 +423,4 @@ export class MixpanelTelemetryProvider implements TelemetryProvider {
   trackUiButtonClicked(metadata: UiButtonClickMetadata): void {
     this.trackEvent(TelemetryEvents.UI_BUTTON_CLICKED, metadata)
   }
-
-  getExecutionContext(): ExecutionContext {
-    const workflowStore = useWorkflowStore()
-    const templatesStore = useWorkflowTemplatesStore()
-    const nodeDefStore = useNodeDefStore()
-    const activeWorkflow = workflowStore.activeWorkflow
-
-    // Calculate node metrics in a single traversal
-    type NodeMetrics = {
-      custom_node_count: number
-      api_node_count: number
-      subgraph_count: number
-      total_node_count: number
-      has_api_nodes: boolean
-      api_node_names: string[]
-    }
-
-    const nodeCounts = reduceAllNodes<NodeMetrics>(
-      app.rootGraph,
-      (metrics, node) => {
-        const nodeDef = nodeDefStore.nodeDefsByName[node.type]
-        const isCustomNode =
-          nodeDef?.nodeSource?.type === NodeSourceType.CustomNodes
-        const isApiNode = nodeDef?.api_node === true
-        const isSubgraph = node.isSubgraphNode?.() === true
-
-        if (isApiNode) {
-          metrics.has_api_nodes = true
-          const canonicalName = nodeDef?.name
-          if (
-            canonicalName &&
-            !metrics.api_node_names.includes(canonicalName)
-          ) {
-            metrics.api_node_names.push(canonicalName)
-          }
-        }
-
-        metrics.custom_node_count += isCustomNode ? 1 : 0
-        metrics.api_node_count += isApiNode ? 1 : 0
-        metrics.subgraph_count += isSubgraph ? 1 : 0
-        metrics.total_node_count += 1
-
-        return metrics
-      },
-      {
-        custom_node_count: 0,
-        api_node_count: 0,
-        subgraph_count: 0,
-        total_node_count: 0,
-        has_api_nodes: false,
-        api_node_names: []
-      }
-    )
-
-    if (activeWorkflow?.filename) {
-      const isTemplate = templatesStore.knownTemplateNames.has(
-        activeWorkflow.filename
-      )
-
-      if (isTemplate) {
-        const template = templatesStore.getTemplateByName(
-          activeWorkflow.filename
-        )
-
-        const englishMetadata = templatesStore.getEnglishMetadata(
-          activeWorkflow.filename
-        )
-
-        return {
-          is_template: true,
-          workflow_name: activeWorkflow.filename,
-          template_source: template?.sourceModule,
-          template_category: englishMetadata?.category ?? template?.category,
-          template_tags: englishMetadata?.tags ?? template?.tags,
-          template_models: englishMetadata?.models ?? template?.models,
-          template_use_case: englishMetadata?.useCase ?? template?.useCase,
-          template_license: englishMetadata?.license ?? template?.license,
-          ...nodeCounts
-        }
-      }
-
-      return {
-        is_template: false,
-        workflow_name: activeWorkflow.filename,
-        ...nodeCounts
-      }
-    }
-
-    return {
-      is_template: false,
-      workflow_name: undefined,
-      ...nodeCounts
-    }
-  }
 }
diff --git a/src/platform/telemetry/providers/cloud/PostHogTelemetryProvider.test.ts b/src/platform/telemetry/providers/cloud/PostHogTelemetryProvider.test.ts
new file mode 100644
index 0000000000..f36b7f5ba6
--- /dev/null
+++ b/src/platform/telemetry/providers/cloud/PostHogTelemetryProvider.test.ts
@@ -0,0 +1,246 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { TelemetryEvents } from '../../types'
+
+const hoisted = vi.hoisted(() => {
+  const mockCapture = vi.fn()
+  const mockInit = vi.fn()
+  const mockIdentify = vi.fn()
+  const mockPeopleSet = vi.fn()
+  const mockOnUserResolved = vi.fn()
+
+  return {
+    mockCapture,
+    mockInit,
+    mockIdentify,
+    mockPeopleSet,
+    mockOnUserResolved,
+    mockPosthog: {
+      default: {
+        init: mockInit,
+        capture: mockCapture,
+        identify: mockIdentify,
+        people: { set: mockPeopleSet }
+      }
+    }
+  }
+})
+
+vi.mock('vue', async () => {
+  const actual = await vi.importActual('vue')
+  return {
+    ...actual,
+    watch: vi.fn()
+  }
+})
+
+vi.mock('@/composables/auth/useCurrentUser', () => ({
+  useCurrentUser: () => ({
+    onUserResolved: hoisted.mockOnUserResolved
+  })
+}))
+
+vi.mock('@/platform/remoteConfig/remoteConfig', () => ({
+  remoteConfig: { value: null }
+}))
+
+vi.mock('posthog-js', () => hoisted.mockPosthog)
+
+import { PostHogTelemetryProvider } from './PostHogTelemetryProvider'
+
+function createProvider(
+  config: Partial<typeof window.__CONFIG__> = {}
+): PostHogTelemetryProvider {
+  const original = window.__CONFIG__
+  window.__CONFIG__ = { ...original, ...config }
+  const provider = new PostHogTelemetryProvider()
+  window.__CONFIG__ = original
+  return provider
+}
+
+describe('PostHogTelemetryProvider', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    window.__CONFIG__ = {
+      posthog_project_token: 'phc_test_token'
+    } as typeof window.__CONFIG__
+  })
+
+  describe('initialization', () => {
+    it('disables itself when posthog_project_token is not provided', async () => {
+      const provider = createProvider({ posthog_project_token: undefined })
+      await vi.dynamicImportSettled()
+
+      provider.trackSignupOpened()
+
+      expect(hoisted.mockCapture).not.toHaveBeenCalled()
+    })
+
+    it('calls posthog.init with the token and default api_host', async () => {
+      createProvider()
+      await vi.dynamicImportSettled()
+
+      expect(hoisted.mockInit).toHaveBeenCalledWith('phc_test_token', {
+        api_host: 'https://ph.comfy.org',
+        autocapture: false,
+        capture_pageview: false,
+        capture_pageleave: false,
+        persistence: 'localStorage+cookie'
+      })
+    })
+
+    it('uses custom api_host from config when provided', async () => {
+      window.__CONFIG__ = {
+        posthog_project_token: 'phc_test_token',
+        posthog_api_host: 'https://custom.host.com'
+      } as typeof window.__CONFIG__
+      new PostHogTelemetryProvider()
+      await vi.dynamicImportSettled()
+
+      expect(hoisted.mockInit).toHaveBeenCalledWith(
+        'phc_test_token',
+        expect.objectContaining({ api_host: 'https://custom.host.com' })
+      )
+    })
+
+    it('registers onUserResolved callback after init', async () => {
+      createProvider()
+      await vi.dynamicImportSettled()
+
+      expect(hoisted.mockOnUserResolved).toHaveBeenCalledOnce()
+    })
+
+    it('identifies user when onUserResolved fires', async () => {
+      createProvider()
+      await vi.dynamicImportSettled()
+
+      const callback = hoisted.mockOnUserResolved.mock.calls[0][0]
+      callback({ id: 'user-123' })
+
+      expect(hoisted.mockIdentify).toHaveBeenCalledWith('user-123')
+    })
+  })
+
+  describe('event tracking', () => {
+    it('captures events after initialization', async () => {
+      const provider = createProvider()
+      await vi.dynamicImportSettled()
+
+      provider.trackSignupOpened()
+
+      expect(hoisted.mockCapture).toHaveBeenCalledWith(
+        TelemetryEvents.USER_SIGN_UP_OPENED,
+        {}
+      )
+    })
+
+    it('captures events with metadata', async () => {
+      const provider = createProvider()
+      await vi.dynamicImportSettled()
+
+      provider.trackAuth({ method: 'google' })
+
+      expect(hoisted.mockCapture).toHaveBeenCalledWith(
+        TelemetryEvents.USER_AUTH_COMPLETED,
+        { method: 'google' }
+      )
+    })
+
+    it('queues events before initialization and flushes after', async () => {
+      const provider = createProvider()
+
+      provider.trackUserLoggedIn()
+      expect(hoisted.mockCapture).not.toHaveBeenCalled()
+
+      await vi.dynamicImportSettled()
+
+      expect(hoisted.mockCapture).toHaveBeenCalledWith(
+        TelemetryEvents.USER_LOGGED_IN,
+        {}
+      )
+    })
+  })
+
+  describe('disabled events', () => {
+    it('does not capture default disabled events', async () => {
+      const provider = createProvider()
+      await vi.dynamicImportSettled()
+
+      provider.trackWorkflowOpened({
+        missing_node_count: 0,
+        missing_node_types: []
+      })
+
+      expect(hoisted.mockCapture).not.toHaveBeenCalled()
+    })
+
+    it('captures events not in the disabled list', async () => {
+      const provider = createProvider()
+      await vi.dynamicImportSettled()
+
+      provider.trackMonthlySubscriptionSucceeded()
+
+      expect(hoisted.mockCapture).toHaveBeenCalledWith(
+        TelemetryEvents.MONTHLY_SUBSCRIPTION_SUCCEEDED,
+        {}
+      )
+    })
+  })
+
+  describe('survey tracking', () => {
+    it('sets user properties on survey submission', async () => {
+      const provider = createProvider()
+      await vi.dynamicImportSettled()
+
+      const responses = { familiarity: 'beginner', industry: 'tech' }
+      provider.trackSurvey('submitted', responses)
+
+      expect(hoisted.mockCapture).toHaveBeenCalledWith(
+        TelemetryEvents.USER_SURVEY_SUBMITTED,
+        expect.objectContaining({ familiarity: 'beginner' })
+      )
+      expect(hoisted.mockPeopleSet).toHaveBeenCalled()
+    })
+
+    it('does not set user properties on survey opened', async () => {
+      const provider = createProvider()
+      await vi.dynamicImportSettled()
+
+      provider.trackSurvey('opened')
+
+      expect(hoisted.mockCapture).toHaveBeenCalledWith(
+        TelemetryEvents.USER_SURVEY_OPENED,
+        {}
+      )
+      expect(hoisted.mockPeopleSet).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('page view', () => {
+    it('captures page view with page_name property', async () => {
+      const provider = createProvider()
+      await vi.dynamicImportSettled()
+
+      provider.trackPageView('workflow_editor')
+
+      expect(hoisted.mockCapture).toHaveBeenCalledWith(
+        TelemetryEvents.PAGE_VIEW,
+        { page_name: 'workflow_editor' }
+      )
+    })
+
+    it('forwards additional metadata', async () => {
+      const provider = createProvider()
+      await vi.dynamicImportSettled()
+
+      provider.trackPageView('workflow_editor', {
+        path: '/workflows/123'
+      })
+
+      expect(hoisted.mockCapture).toHaveBeenCalledWith(
+        TelemetryEvents.PAGE_VIEW,
+        { page_name: 'workflow_editor', path: '/workflows/123' }
+      )
+    })
+  })
+})
diff --git a/src/platform/telemetry/providers/cloud/PostHogTelemetryProvider.ts b/src/platform/telemetry/providers/cloud/PostHogTelemetryProvider.ts
new file mode 100644
index 0000000000..aba47173e8
--- /dev/null
+++ b/src/platform/telemetry/providers/cloud/PostHogTelemetryProvider.ts
@@ -0,0 +1,417 @@
+import type { PostHog } from 'posthog-js'
+import { watch } from 'vue'
+
+import { useCurrentUser } from '@/composables/auth/useCurrentUser'
+import { remoteConfig } from '@/platform/remoteConfig/remoteConfig'
+import type { RemoteConfig } from '@/platform/remoteConfig/types'
+
+import type {
+  AuthMetadata,
+  EnterLinearMetadata,
+  ExecutionContext,
+  ExecutionErrorMetadata,
+  ExecutionSuccessMetadata,
+  ExecutionTriggerSource,
+  HelpCenterClosedMetadata,
+  HelpCenterOpenedMetadata,
+  HelpResourceClickedMetadata,
+  NodeSearchMetadata,
+  NodeSearchResultMetadata,
+  PageViewMetadata,
+  PageVisibilityMetadata,
+  RunButtonProperties,
+  SettingChangedMetadata,
+  SubscriptionMetadata,
+  SurveyResponses,
+  TabCountMetadata,
+  TelemetryEventName,
+  TelemetryEventProperties,
+  TelemetryProvider,
+  TemplateFilterMetadata,
+  TemplateLibraryClosedMetadata,
+  TemplateLibraryMetadata,
+  TemplateMetadata,
+  UiButtonClickMetadata,
+  WorkflowCreatedMetadata,
+  WorkflowImportMetadata
+} from '../../types'
+import { TelemetryEvents } from '../../types'
+import { getExecutionContext } from '../../utils/getExecutionContext'
+import { normalizeSurveyResponses } from '../../utils/surveyNormalization'
+
+const DEFAULT_DISABLED_EVENTS = [
+  TelemetryEvents.WORKFLOW_OPENED,
+  TelemetryEvents.PAGE_VISIBILITY_CHANGED,
+  TelemetryEvents.TAB_COUNT_TRACKING,
+  TelemetryEvents.NODE_SEARCH,
+  TelemetryEvents.NODE_SEARCH_RESULT_SELECTED,
+  TelemetryEvents.TEMPLATE_FILTER_CHANGED,
+  TelemetryEvents.SETTING_CHANGED,
+  TelemetryEvents.HELP_CENTER_OPENED,
+  TelemetryEvents.HELP_RESOURCE_CLICKED,
+  TelemetryEvents.HELP_CENTER_CLOSED,
+  TelemetryEvents.WORKFLOW_CREATED,
+  TelemetryEvents.UI_BUTTON_CLICKED
+] as const satisfies TelemetryEventName[]
+
+const TELEMETRY_EVENT_SET = new Set<TelemetryEventName>(
+  Object.values(TelemetryEvents) as TelemetryEventName[]
+)
+
+interface QueuedEvent {
+  eventName: TelemetryEventName
+  properties?: TelemetryEventProperties
+}
+
+/**
+ * PostHog Telemetry Provider - Cloud Build Implementation
+ *
+ * Sends all telemetry events to PostHog so they can be correlated
+ * with session recordings. Follows the same pattern as MixpanelTelemetryProvider.
+ *
+ * CRITICAL: OSS Build Safety
+ * Entire file is tree-shaken away in OSS builds (DISTRIBUTION unset).
+ */
+export class PostHogTelemetryProvider implements TelemetryProvider {
+  private isEnabled = true
+  private posthog: PostHog | null = null
+  private eventQueue: QueuedEvent[] = []
+  private isInitialized = false
+  private lastTriggerSource: ExecutionTriggerSource | undefined
+  private disabledEvents = new Set<TelemetryEventName>(DEFAULT_DISABLED_EVENTS)
+
+  constructor() {
+    this.configureDisabledEvents(
+      (window.__CONFIG__ as Partial<RemoteConfig> | undefined) ?? null
+    )
+    watch(
+      remoteConfig,
+      (config) => {
+        this.configureDisabledEvents(config)
+      },
+      { immediate: true }
+    )
+
+    const apiKey = window.__CONFIG__?.posthog_project_token
+    if (apiKey) {
+      try {
+        void import('posthog-js')
+          .then((posthogModule) => {
+            this.posthog = posthogModule.default
+            this.posthog!.init(apiKey, {
+              api_host:
+                window.__CONFIG__?.posthog_api_host || 'https://ph.comfy.org',
+              autocapture: false,
+              capture_pageview: false,
+              capture_pageleave: false,
+              persistence: 'localStorage+cookie'
+            })
+            this.isInitialized = true
+            this.flushEventQueue()
+
+            useCurrentUser().onUserResolved((user) => {
+              if (this.posthog && user.id) {
+                this.posthog.identify(user.id)
+              }
+            })
+          })
+          .catch((error) => {
+            console.error('Failed to load PostHog:', error)
+            this.isEnabled = false
+          })
+      } catch (error) {
+        console.error('Failed to initialize PostHog:', error)
+        this.isEnabled = false
+      }
+    } else {
+      console.warn('PostHog API key not provided in runtime config')
+      this.isEnabled = false
+    }
+  }
+
+  private flushEventQueue(): void {
+    if (!this.isInitialized || !this.posthog) return
+
+    while (this.eventQueue.length > 0) {
+      const event = this.eventQueue.shift()!
+      try {
+        this.posthog.capture(event.eventName, event.properties || {})
+      } catch (error) {
+        console.error('Failed to track queued PostHog event:', error)
+      }
+    }
+  }
+
+  private trackEvent(
+    eventName: TelemetryEventName,
+    properties?: TelemetryEventProperties
+  ): void {
+    if (!this.isEnabled) return
+    if (this.disabledEvents.has(eventName)) return
+
+    const event: QueuedEvent = { eventName, properties }
+
+    if (this.isInitialized && this.posthog) {
+      try {
+        this.posthog.capture(eventName, properties || {})
+      } catch (error) {
+        console.error('Failed to track PostHog event:', error)
+      }
+    } else {
+      this.eventQueue.push(event)
+    }
+  }
+
+  private captureRaw(
+    eventName: TelemetryEventName,
+    properties?: Record<string, unknown>
+  ): void {
+    if (!this.isEnabled) return
+    if (this.disabledEvents.has(eventName)) return
+
+    if (this.isInitialized && this.posthog) {
+      try {
+        this.posthog.capture(eventName, properties || {})
+      } catch (error) {
+        console.error('Failed to track PostHog event:', error)
+      }
+    } else {
+      this.eventQueue.push({
+        eventName,
+        properties: properties as TelemetryEventProperties
+      })
+    }
+  }
+
+  private configureDisabledEvents(config: Partial<RemoteConfig> | null): void {
+    const disabledSource =
+      config?.telemetry_disabled_events ?? DEFAULT_DISABLED_EVENTS
+
+    this.disabledEvents = this.buildEventSet(disabledSource)
+  }
+
+  private buildEventSet(values: TelemetryEventName[]): Set<TelemetryEventName> {
+    return new Set(
+      values.filter((value) => {
+        const isValid = TELEMETRY_EVENT_SET.has(value)
+        if (!isValid && import.meta.env.DEV) {
+          console.warn(
+            `Unknown telemetry event name in disabled list: ${value}`
+          )
+        }
+        return isValid
+      })
+    )
+  }
+
+  trackSignupOpened(): void {
+    this.trackEvent(TelemetryEvents.USER_SIGN_UP_OPENED)
+  }
+
+  trackAuth(metadata: AuthMetadata): void {
+    this.trackEvent(TelemetryEvents.USER_AUTH_COMPLETED, metadata)
+  }
+
+  trackUserLoggedIn(): void {
+    this.trackEvent(TelemetryEvents.USER_LOGGED_IN)
+  }
+
+  trackSubscription(
+    event: 'modal_opened' | 'subscribe_clicked',
+    metadata?: SubscriptionMetadata
+  ): void {
+    const eventName =
+      event === 'modal_opened'
+        ? TelemetryEvents.SUBSCRIPTION_REQUIRED_MODAL_OPENED
+        : TelemetryEvents.SUBSCRIBE_NOW_BUTTON_CLICKED
+
+    this.trackEvent(eventName, metadata)
+  }
+
+  trackAddApiCreditButtonClicked(): void {
+    this.trackEvent(TelemetryEvents.ADD_API_CREDIT_BUTTON_CLICKED)
+  }
+
+  trackMonthlySubscriptionSucceeded(): void {
+    this.trackEvent(TelemetryEvents.MONTHLY_SUBSCRIPTION_SUCCEEDED)
+  }
+
+  trackMonthlySubscriptionCancelled(): void {
+    this.trackEvent(TelemetryEvents.MONTHLY_SUBSCRIPTION_CANCELLED)
+  }
+
+  trackApiCreditTopupButtonPurchaseClicked(amount: number): void {
+    this.trackEvent(TelemetryEvents.API_CREDIT_TOPUP_BUTTON_PURCHASE_CLICKED, {
+      credit_amount: amount
+    })
+  }
+
+  trackApiCreditTopupSucceeded(): void {
+    this.trackEvent(TelemetryEvents.API_CREDIT_TOPUP_SUCCEEDED)
+  }
+
+  trackRunButton(options?: {
+    subscribe_to_run?: boolean
+    trigger_source?: ExecutionTriggerSource
+  }): void {
+    const executionContext = getExecutionContext()
+
+    const runButtonProperties: RunButtonProperties = {
+      subscribe_to_run: options?.subscribe_to_run || false,
+      workflow_type: executionContext.is_template ? 'template' : 'custom',
+      workflow_name: executionContext.workflow_name ?? 'untitled',
+      custom_node_count: executionContext.custom_node_count,
+      total_node_count: executionContext.total_node_count,
+      subgraph_count: executionContext.subgraph_count,
+      has_api_nodes: executionContext.has_api_nodes,
+      api_node_names: executionContext.api_node_names,
+      has_toolkit_nodes: executionContext.has_toolkit_nodes,
+      toolkit_node_names: executionContext.toolkit_node_names,
+      trigger_source: options?.trigger_source
+    }
+
+    this.lastTriggerSource = options?.trigger_source
+    this.trackEvent(TelemetryEvents.RUN_BUTTON_CLICKED, runButtonProperties)
+  }
+
+  trackSurvey(
+    stage: 'opened' | 'submitted',
+    responses?: SurveyResponses
+  ): void {
+    const eventName =
+      stage === 'opened'
+        ? TelemetryEvents.USER_SURVEY_OPENED
+        : TelemetryEvents.USER_SURVEY_SUBMITTED
+
+    const normalizedResponses = responses
+      ? normalizeSurveyResponses(responses)
+      : undefined
+
+    this.trackEvent(eventName, normalizedResponses)
+
+    if (
+      stage === 'submitted' &&
+      normalizedResponses &&
+      this.posthog &&
+      this.isEnabled &&
+      !this.disabledEvents.has(TelemetryEvents.USER_SURVEY_SUBMITTED)
+    ) {
+      try {
+        this.posthog.people.set(normalizedResponses)
+      } catch (error) {
+        console.error('Failed to set PostHog user properties:', error)
+      }
+    }
+  }
+
+  trackEmailVerification(stage: 'opened' | 'requested' | 'completed'): void {
+    let eventName: TelemetryEventName
+
+    switch (stage) {
+      case 'opened':
+        eventName = TelemetryEvents.USER_EMAIL_VERIFY_OPENED
+        break
+      case 'requested':
+        eventName = TelemetryEvents.USER_EMAIL_VERIFY_REQUESTED
+        break
+      case 'completed':
+        eventName = TelemetryEvents.USER_EMAIL_VERIFY_COMPLETED
+        break
+    }
+
+    this.trackEvent(eventName)
+  }
+
+  trackTemplate(metadata: TemplateMetadata): void {
+    this.trackEvent(TelemetryEvents.TEMPLATE_WORKFLOW_OPENED, metadata)
+  }
+
+  trackTemplateLibraryOpened(metadata: TemplateLibraryMetadata): void {
+    this.trackEvent(TelemetryEvents.TEMPLATE_LIBRARY_OPENED, metadata)
+  }
+
+  trackTemplateLibraryClosed(metadata: TemplateLibraryClosedMetadata): void {
+    this.trackEvent(TelemetryEvents.TEMPLATE_LIBRARY_CLOSED, metadata)
+  }
+
+  trackWorkflowImported(metadata: WorkflowImportMetadata): void {
+    this.trackEvent(TelemetryEvents.WORKFLOW_IMPORTED, metadata)
+  }
+
+  trackWorkflowOpened(metadata: WorkflowImportMetadata): void {
+    this.trackEvent(TelemetryEvents.WORKFLOW_OPENED, metadata)
+  }
+
+  trackEnterLinear(metadata: EnterLinearMetadata): void {
+    this.trackEvent(TelemetryEvents.ENTER_LINEAR_MODE, metadata)
+  }
+
+  trackPageVisibilityChanged(metadata: PageVisibilityMetadata): void {
+    this.trackEvent(TelemetryEvents.PAGE_VISIBILITY_CHANGED, metadata)
+  }
+
+  trackTabCount(metadata: TabCountMetadata): void {
+    this.trackEvent(TelemetryEvents.TAB_COUNT_TRACKING, metadata)
+  }
+
+  trackNodeSearch(metadata: NodeSearchMetadata): void {
+    this.trackEvent(TelemetryEvents.NODE_SEARCH, metadata)
+  }
+
+  trackNodeSearchResultSelected(metadata: NodeSearchResultMetadata): void {
+    this.trackEvent(TelemetryEvents.NODE_SEARCH_RESULT_SELECTED, metadata)
+  }
+
+  trackTemplateFilterChanged(metadata: TemplateFilterMetadata): void {
+    this.trackEvent(TelemetryEvents.TEMPLATE_FILTER_CHANGED, metadata)
+  }
+
+  trackHelpCenterOpened(metadata: HelpCenterOpenedMetadata): void {
+    this.trackEvent(TelemetryEvents.HELP_CENTER_OPENED, metadata)
+  }
+
+  trackHelpResourceClicked(metadata: HelpResourceClickedMetadata): void {
+    this.trackEvent(TelemetryEvents.HELP_RESOURCE_CLICKED, metadata)
+  }
+
+  trackHelpCenterClosed(metadata: HelpCenterClosedMetadata): void {
+    this.trackEvent(TelemetryEvents.HELP_CENTER_CLOSED, metadata)
+  }
+
+  trackWorkflowCreated(metadata: WorkflowCreatedMetadata): void {
+    this.trackEvent(TelemetryEvents.WORKFLOW_CREATED, metadata)
+  }
+
+  trackWorkflowExecution(): void {
+    const context = getExecutionContext()
+    const eventContext: ExecutionContext = {
+      ...context,
+      trigger_source: this.lastTriggerSource ?? 'unknown'
+    }
+    this.trackEvent(TelemetryEvents.EXECUTION_START, eventContext)
+    this.lastTriggerSource = undefined
+  }
+
+  trackExecutionError(metadata: ExecutionErrorMetadata): void {
+    this.trackEvent(TelemetryEvents.EXECUTION_ERROR, metadata)
+  }
+
+  trackExecutionSuccess(metadata: ExecutionSuccessMetadata): void {
+    this.trackEvent(TelemetryEvents.EXECUTION_SUCCESS, metadata)
+  }
+
+  trackSettingChanged(metadata: SettingChangedMetadata): void {
+    this.trackEvent(TelemetryEvents.SETTING_CHANGED, metadata)
+  }
+
+  trackUiButtonClicked(metadata: UiButtonClickMetadata): void {
+    this.trackEvent(TelemetryEvents.UI_BUTTON_CLICKED, metadata)
+  }
+
+  trackPageView(pageName: string, properties?: PageViewMetadata): void {
+    this.captureRaw(TelemetryEvents.PAGE_VIEW, {
+      page_name: pageName,
+      ...properties
+    })
+  }
+}
diff --git a/tests-ui/tests/platform/telemetry/topupTracker.test.ts b/src/platform/telemetry/topupTracker.test.ts
similarity index 87%
rename from tests-ui/tests/platform/telemetry/topupTracker.test.ts
rename to src/platform/telemetry/topupTracker.test.ts
index 668ed2db72..9f8e38ccf0 100644
--- a/tests-ui/tests/platform/telemetry/topupTracker.test.ts
+++ b/src/platform/telemetry/topupTracker.test.ts
@@ -1,5 +1,10 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
+import {
+  startTopupTracking,
+  checkForCompletedTopup,
+  clearTopupTracking
+} from '@/platform/telemetry/topupTracker'
 import type { AuditLog } from '@/services/customerEventsService'
 
 // Mock localStorage
@@ -24,19 +29,15 @@ vi.mock('@/platform/telemetry', () => ({
 }))
 
 describe('topupTracker', () => {
-  let topupTracker: typeof import('@/platform/telemetry/topupTracker')
-
-  beforeEach(async () => {
+  beforeEach(() => {
     vi.clearAllMocks()
-    // Dynamically import to ensure fresh module state
-    topupTracker = await import('@/platform/telemetry/topupTracker')
   })
 
   describe('startTopupTracking', () => {
     it('should save current timestamp to localStorage', () => {
       const beforeTimestamp = Date.now()
 
-      topupTracker.startTopupTracking()
+      startTopupTracking()
 
       expect(mockLocalStorage.setItem).toHaveBeenCalledWith(
         'pending_topup_timestamp',
@@ -56,7 +57,7 @@ describe('topupTracker', () => {
     it('should return false if no pending topup exists', () => {
       mockLocalStorage.getItem.mockReturnValue(null)
 
-      const result = topupTracker.checkForCompletedTopup([])
+      const result = checkForCompletedTopup([])
 
       expect(result).toBe(false)
       expect(mockTelemetry.trackApiCreditTopupSucceeded).not.toHaveBeenCalled()
@@ -65,7 +66,7 @@ describe('topupTracker', () => {
     it('should return false if events array is empty', () => {
       mockLocalStorage.getItem.mockReturnValue(Date.now().toString())
 
-      const result = topupTracker.checkForCompletedTopup([])
+      const result = checkForCompletedTopup([])
 
       expect(result).toBe(false)
       expect(mockTelemetry.trackApiCreditTopupSucceeded).not.toHaveBeenCalled()
@@ -74,7 +75,7 @@ describe('topupTracker', () => {
     it('should return false if events array is null', () => {
       mockLocalStorage.getItem.mockReturnValue(Date.now().toString())
 
-      const result = topupTracker.checkForCompletedTopup(null)
+      const result = checkForCompletedTopup(null)
 
       expect(result).toBe(false)
       expect(mockTelemetry.trackApiCreditTopupSucceeded).not.toHaveBeenCalled()
@@ -93,7 +94,7 @@ describe('topupTracker', () => {
         }
       ]
 
-      const result = topupTracker.checkForCompletedTopup(events)
+      const result = checkForCompletedTopup(events)
 
       expect(result).toBe(false)
       expect(mockLocalStorage.removeItem).toHaveBeenCalledWith(
@@ -121,7 +122,7 @@ describe('topupTracker', () => {
         }
       ]
 
-      const result = topupTracker.checkForCompletedTopup(events)
+      const result = checkForCompletedTopup(events)
 
       expect(result).toBe(true)
       expect(mockTelemetry.trackApiCreditTopupSucceeded).toHaveBeenCalledOnce()
@@ -143,7 +144,7 @@ describe('topupTracker', () => {
         }
       ]
 
-      const result = topupTracker.checkForCompletedTopup(events)
+      const result = checkForCompletedTopup(events)
 
       expect(result).toBe(false)
       expect(mockTelemetry.trackApiCreditTopupSucceeded).not.toHaveBeenCalled()
@@ -163,7 +164,7 @@ describe('topupTracker', () => {
         }
       ]
 
-      const result = topupTracker.checkForCompletedTopup(events)
+      const result = checkForCompletedTopup(events)
 
       expect(result).toBe(false)
       expect(mockTelemetry.trackApiCreditTopupSucceeded).not.toHaveBeenCalled()
@@ -188,7 +189,7 @@ describe('topupTracker', () => {
         }
       ]
 
-      const result = topupTracker.checkForCompletedTopup(events)
+      const result = checkForCompletedTopup(events)
 
       expect(result).toBe(false)
       expect(mockTelemetry.trackApiCreditTopupSucceeded).not.toHaveBeenCalled()
@@ -197,7 +198,7 @@ describe('topupTracker', () => {
 
   describe('clearTopupTracking', () => {
     it('should remove pending topup from localStorage', () => {
-      topupTracker.clearTopupTracking()
+      clearTopupTracking()
 
       expect(mockLocalStorage.removeItem).toHaveBeenCalledWith(
         'pending_topup_timestamp'
diff --git a/src/platform/telemetry/types.ts b/src/platform/telemetry/types.ts
index a707069a48..4e97a115c0 100644
--- a/src/platform/telemetry/types.ts
+++ b/src/platform/telemetry/types.ts
@@ -12,6 +12,9 @@
  * 3. Check dist/assets/*.js files contain no tracking code
  */
 
+import type { SubscriptionDialogReason } from '@/platform/cloud/subscription/composables/useSubscriptionDialog'
+import type { TierKey } from '@/platform/cloud/subscription/constants/tierPricing'
+import type { BillingCycle } from '@/platform/cloud/subscription/utils/subscriptionTierRank'
 import type { AuditLog } from '@/services/customerEventsService'
 
 /**
@@ -20,6 +23,7 @@ import type { AuditLog } from '@/services/customerEventsService'
 export interface AuthMetadata {
   method?: 'email' | 'google' | 'github'
   is_new_user?: boolean
+  user_id?: string
   referrer_url?: string
   utm_source?: string
   utm_medium?: string
@@ -37,6 +41,13 @@ export interface SurveyResponses {
   making?: string[]
 }
 
+export interface SurveyResponsesNormalized extends SurveyResponses {
+  industry_normalized?: string
+  industry_raw?: string
+  useCase_normalized?: string
+  useCase_raw?: string
+}
+
 /**
  * Run button tracking properties
  */
@@ -49,6 +60,8 @@ export interface RunButtonProperties {
   subgraph_count: number
   has_api_nodes: boolean
   api_node_names: string[]
+  has_toolkit_nodes: boolean
+  toolkit_node_names: string[]
   trigger_source?: ExecutionTriggerSource
 }
 
@@ -72,6 +85,9 @@ export interface ExecutionContext {
   total_node_count: number
   has_api_nodes: boolean
   api_node_names: string[]
+  has_toolkit_nodes: boolean
+  toolkit_node_names: string[]
+  toolkit_node_count: number
   trigger_source?: ExecutionTriggerSource
 }
 
@@ -124,6 +140,10 @@ export interface WorkflowImportMetadata {
   open_source?: 'file_button' | 'file_drop' | 'template' | 'unknown'
 }
 
+export interface EnterLinearMetadata {
+  source?: string
+}
+
 /**
  * Workflow open metadata
  */
@@ -138,7 +158,7 @@ export type WorkflowOpenSource = NonNullable<
  * Template library metadata
  */
 export interface TemplateLibraryMetadata {
-  source: 'sidebar' | 'menu' | 'command'
+  source: 'sidebar' | 'menu' | 'command' | 'appbuilder'
 }
 
 /**
@@ -197,6 +217,8 @@ export interface TemplateFilterMetadata {
   selected_runs_on: string[]
   sort_by:
     | 'default'
+    | 'recommended'
+    | 'popular'
     | 'alphabetical'
     | 'newest'
     | 'vram-low-to-high'
@@ -256,79 +278,134 @@ export interface WorkflowCreatedMetadata {
 }
 
 /**
- * Core telemetry provider interface
+ * Page view metadata for route tracking
+ */
+export interface PageViewMetadata {
+  path?: string
+  referrer?: string
+  title?: string
+  [key: string]: unknown
+}
+
+export interface CheckoutAttributionMetadata {
+  ga_client_id?: string
+  ga_session_id?: string
+  ga_session_number?: string
+  im_ref?: string
+  utm_source?: string
+  utm_medium?: string
+  utm_campaign?: string
+  utm_term?: string
+  utm_content?: string
+  gclid?: string
+  gbraid?: string
+  wbraid?: string
+}
+
+export interface SubscriptionMetadata {
+  current_tier?: string
+  reason?: SubscriptionDialogReason
+}
+
+export interface BeginCheckoutMetadata
+  extends Record<string, unknown>, CheckoutAttributionMetadata {
+  user_id: string
+  tier: TierKey
+  cycle: BillingCycle
+  checkout_type: 'new' | 'change'
+  previous_tier?: TierKey
+}
+
+/**
+ * Telemetry provider interface for individual providers.
+ * All methods are optional - providers only implement what they need.
  */
 export interface TelemetryProvider {
   // Authentication flow events
-  trackSignupOpened(): void
-  trackAuth(metadata: AuthMetadata): void
-  trackUserLoggedIn(): void
+  trackSignupOpened?(): void
+  trackAuth?(metadata: AuthMetadata): void
+  trackUserLoggedIn?(): void
 
   // Subscription flow events
-  trackSubscription(event: 'modal_opened' | 'subscribe_clicked'): void
-  trackMonthlySubscriptionSucceeded(): void
-  trackMonthlySubscriptionCancelled(): void
-  trackAddApiCreditButtonClicked(): void
-  trackApiCreditTopupButtonPurchaseClicked(amount: number): void
-  trackApiCreditTopupSucceeded(): void
-  trackRunButton(options?: {
+  trackSubscription?(
+    event: 'modal_opened' | 'subscribe_clicked',
+    metadata?: SubscriptionMetadata
+  ): void
+  trackBeginCheckout?(metadata: BeginCheckoutMetadata): void
+  trackMonthlySubscriptionSucceeded?(): void
+  trackMonthlySubscriptionCancelled?(): void
+  trackAddApiCreditButtonClicked?(): void
+  trackApiCreditTopupButtonPurchaseClicked?(amount: number): void
+  trackApiCreditTopupSucceeded?(): void
+  trackRunButton?(options?: {
     subscribe_to_run?: boolean
     trigger_source?: ExecutionTriggerSource
   }): void
 
   // Credit top-up tracking (composition with internal utilities)
-  startTopupTracking(): void
-  checkForCompletedTopup(events: AuditLog[] | undefined | null): boolean
-  clearTopupTracking(): void
+  startTopupTracking?(): void
+  checkForCompletedTopup?(events: AuditLog[] | undefined | null): boolean
+  clearTopupTracking?(): void
 
   // Survey flow events
-  trackSurvey(stage: 'opened' | 'submitted', responses?: SurveyResponses): void
+  trackSurvey?(stage: 'opened' | 'submitted', responses?: SurveyResponses): void
 
   // Email verification events
-  trackEmailVerification(stage: 'opened' | 'requested' | 'completed'): void
+  trackEmailVerification?(stage: 'opened' | 'requested' | 'completed'): void
 
   // Template workflow events
-  trackTemplate(metadata: TemplateMetadata): void
-  trackTemplateLibraryOpened(metadata: TemplateLibraryMetadata): void
-  trackTemplateLibraryClosed(metadata: TemplateLibraryClosedMetadata): void
+  trackTemplate?(metadata: TemplateMetadata): void
+  trackTemplateLibraryOpened?(metadata: TemplateLibraryMetadata): void
+  trackTemplateLibraryClosed?(metadata: TemplateLibraryClosedMetadata): void
 
   // Workflow management events
-  trackWorkflowImported(metadata: WorkflowImportMetadata): void
-  trackWorkflowOpened(metadata: WorkflowImportMetadata): void
+  trackWorkflowImported?(metadata: WorkflowImportMetadata): void
+  trackWorkflowOpened?(metadata: WorkflowImportMetadata): void
+  trackEnterLinear?(metadata: EnterLinearMetadata): void
 
   // Page visibility events
-  trackPageVisibilityChanged(metadata: PageVisibilityMetadata): void
+  trackPageVisibilityChanged?(metadata: PageVisibilityMetadata): void
 
   // Tab tracking events
-  trackTabCount(metadata: TabCountMetadata): void
+  trackTabCount?(metadata: TabCountMetadata): void
 
   // Node search analytics events
-  trackNodeSearch(metadata: NodeSearchMetadata): void
-  trackNodeSearchResultSelected(metadata: NodeSearchResultMetadata): void
+  trackNodeSearch?(metadata: NodeSearchMetadata): void
+  trackNodeSearchResultSelected?(metadata: NodeSearchResultMetadata): void
 
   // Template filter tracking events
-  trackTemplateFilterChanged(metadata: TemplateFilterMetadata): void
+  trackTemplateFilterChanged?(metadata: TemplateFilterMetadata): void
 
   // Help center events
-  trackHelpCenterOpened(metadata: HelpCenterOpenedMetadata): void
-  trackHelpResourceClicked(metadata: HelpResourceClickedMetadata): void
-  trackHelpCenterClosed(metadata: HelpCenterClosedMetadata): void
+  trackHelpCenterOpened?(metadata: HelpCenterOpenedMetadata): void
+  trackHelpResourceClicked?(metadata: HelpResourceClickedMetadata): void
+  trackHelpCenterClosed?(metadata: HelpCenterClosedMetadata): void
 
   // Workflow creation events
-  trackWorkflowCreated(metadata: WorkflowCreatedMetadata): void
+  trackWorkflowCreated?(metadata: WorkflowCreatedMetadata): void
 
   // Workflow execution events
-  trackWorkflowExecution(): void
-  trackExecutionError(metadata: ExecutionErrorMetadata): void
-  trackExecutionSuccess(metadata: ExecutionSuccessMetadata): void
+  trackWorkflowExecution?(): void
+  trackExecutionError?(metadata: ExecutionErrorMetadata): void
+  trackExecutionSuccess?(metadata: ExecutionSuccessMetadata): void
 
   // Settings events
-  trackSettingChanged(metadata: SettingChangedMetadata): void
+  trackSettingChanged?(metadata: SettingChangedMetadata): void
 
   // Generic UI button click events
-  trackUiButtonClicked(metadata: UiButtonClickMetadata): void
+  trackUiButtonClicked?(metadata: UiButtonClickMetadata): void
+
+  // Page view tracking
+  trackPageView?(pageName: string, properties?: PageViewMetadata): void
 }
 
+/**
+ * Telemetry dispatcher interface returned by useTelemetry().
+ * All methods are required - the registry implements all methods and dispatches
+ * to registered providers using optional chaining.
+ */
+export type TelemetryDispatcher = Required<TelemetryProvider>
+
 /**
  * Telemetry event constants
  *
@@ -370,6 +447,7 @@ export const TelemetryEvents = {
   // Workflow Management
   WORKFLOW_IMPORTED: 'app:workflow_imported',
   WORKFLOW_OPENED: 'app:workflow_opened',
+  ENTER_LINEAR_MODE: 'app:toggle_linear_mode',
 
   // Page Visibility
   PAGE_VISIBILITY_CHANGED: 'app:page_visibility_changed',
@@ -400,7 +478,10 @@ export const TelemetryEvents = {
   EXECUTION_ERROR: 'execution_error',
   EXECUTION_SUCCESS: 'execution_success',
   // Generic UI Button Click
-  UI_BUTTON_CLICKED: 'app:ui_button_clicked'
+  UI_BUTTON_CLICKED: 'app:ui_button_clicked',
+
+  // Page View
+  PAGE_VIEW: 'app:page_view'
 } as const
 
 export type TelemetryEventName =
@@ -411,6 +492,7 @@ export type ExecutionTriggerSource =
   | 'keybinding'
   | 'legacy_ui'
   | 'unknown'
+  | 'linear'
 
 /**
  * Union type for all possible telemetry event properties
@@ -438,3 +520,5 @@ export type TelemetryEventProperties =
   | HelpResourceClickedMetadata
   | HelpCenterClosedMetadata
   | WorkflowCreatedMetadata
+  | EnterLinearMetadata
+  | SubscriptionMetadata
diff --git a/tests-ui/tests/platform/telemetry/useTelemetry.test.ts b/src/platform/telemetry/useTelemetry.test.ts
similarity index 64%
rename from tests-ui/tests/platform/telemetry/useTelemetry.test.ts
rename to src/platform/telemetry/useTelemetry.test.ts
index b5c887c742..d3d565c2ec 100644
--- a/tests-ui/tests/platform/telemetry/useTelemetry.test.ts
+++ b/src/platform/telemetry/useTelemetry.test.ts
@@ -1,5 +1,7 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
+import { useTelemetry } from '@/platform/telemetry'
+
 vi.mock('@/platform/distribution/types', () => ({
   isCloud: false
 }))
@@ -9,17 +11,14 @@ describe('useTelemetry', () => {
     vi.clearAllMocks()
   })
 
-  it('should return null when not in cloud distribution', async () => {
-    const { useTelemetry } = await import('@/platform/telemetry')
+  it('should return null when not in cloud distribution', () => {
     const provider = useTelemetry()
 
     // Should return null for OSS builds
     expect(provider).toBeNull()
-  }, 10000)
-
-  it('should return null consistently for OSS builds', async () => {
-    const { useTelemetry } = await import('@/platform/telemetry')
+  })
 
+  it('should return null consistently for OSS builds', () => {
     const provider1 = useTelemetry()
     const provider2 = useTelemetry()
 
diff --git a/src/platform/telemetry/utils/__tests__/checkoutAttribution.test.ts b/src/platform/telemetry/utils/__tests__/checkoutAttribution.test.ts
new file mode 100644
index 0000000000..a17522c044
--- /dev/null
+++ b/src/platform/telemetry/utils/__tests__/checkoutAttribution.test.ts
@@ -0,0 +1,231 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import {
+  captureCheckoutAttributionFromSearch,
+  getCheckoutAttribution
+} from '../checkoutAttribution'
+
+describe('getCheckoutAttribution', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    window.localStorage.clear()
+    window.__CONFIG__ = {
+      ...window.__CONFIG__,
+      ga_measurement_id: undefined
+    }
+    window.gtag = undefined
+    window.ire = undefined
+    window.history.pushState({}, '', '/')
+  })
+
+  it('reads GA identity and URL attribution, and prefers generated click id', async () => {
+    window.__CONFIG__ = {
+      ...window.__CONFIG__,
+      ga_measurement_id: 'G-TEST123'
+    }
+    const gtagSpy = vi.fn(
+      (
+        _command: 'get',
+        _targetId: string,
+        fieldName: GtagGetFieldName,
+        callback: (value: GtagGetFieldValueMap[GtagGetFieldName]) => void
+      ) => {
+        const valueByField = {
+          client_id: '123.456',
+          session_id: '1700000000',
+          session_number: '2'
+        }
+        callback(valueByField[fieldName])
+      }
+    )
+    window.gtag = gtagSpy as Partial<Window['gtag']> as Window['gtag']
+
+    window.history.pushState(
+      {},
+      '',
+      '/?gclid=gclid-123&utm_source=impact&im_ref=url-click-id'
+    )
+    const mockIreCall = vi.fn()
+    window.ire = (...args: unknown[]) => {
+      mockIreCall(...args)
+      const callback = args[1]
+      if (typeof callback === 'function') {
+        ;(callback as (value: string) => void)('generated-click-id')
+      }
+    }
+
+    const attribution = await getCheckoutAttribution()
+
+    expect(attribution).toMatchObject({
+      ga_client_id: '123.456',
+      ga_session_id: '1700000000',
+      ga_session_number: '2',
+      gclid: 'gclid-123',
+      utm_source: 'impact',
+      im_ref: 'generated-click-id'
+    })
+    expect(mockIreCall).toHaveBeenCalledWith(
+      'generateClickId',
+      expect.any(Function)
+    )
+    expect(gtagSpy).toHaveBeenCalledWith(
+      'get',
+      'G-TEST123',
+      'client_id',
+      expect.any(Function)
+    )
+    expect(gtagSpy).toHaveBeenCalledWith(
+      'get',
+      'G-TEST123',
+      'session_id',
+      expect.any(Function)
+    )
+    expect(gtagSpy).toHaveBeenCalledWith(
+      'get',
+      'G-TEST123',
+      'session_number',
+      expect.any(Function)
+    )
+  })
+
+  it('stringifies numeric GA values from gtag', async () => {
+    window.__CONFIG__ = {
+      ...window.__CONFIG__,
+      ga_measurement_id: 'G-TEST123'
+    }
+    const gtagSpy = vi.fn(
+      (
+        _command: 'get',
+        _targetId: string,
+        fieldName: GtagGetFieldName,
+        callback: (value: GtagGetFieldValueMap[GtagGetFieldName]) => void
+      ) => {
+        const valueByField = {
+          client_id: '123.456',
+          session_id: 1700000000,
+          session_number: 2
+        }
+        callback(valueByField[fieldName])
+      }
+    )
+    window.gtag = gtagSpy as Partial<Window['gtag']> as Window['gtag']
+
+    const attribution = await getCheckoutAttribution()
+
+    expect(attribution).toMatchObject({
+      ga_client_id: '123.456',
+      ga_session_id: '1700000000',
+      ga_session_number: '2'
+    })
+    expect(gtagSpy).toHaveBeenCalledWith(
+      'get',
+      'G-TEST123',
+      'session_number',
+      expect.any(Function)
+    )
+  })
+
+  it('falls back to URL click id when generateClickId is unavailable', async () => {
+    window.history.pushState(
+      {},
+      '',
+      '/?utm_campaign=launch&im_ref=fallback-from-url'
+    )
+
+    const attribution = await getCheckoutAttribution()
+
+    expect(attribution).toMatchObject({
+      utm_campaign: 'launch',
+      im_ref: 'fallback-from-url'
+    })
+  })
+
+  it('returns URL attribution only when no click id is available', async () => {
+    window.history.pushState({}, '', '/?utm_source=impact&utm_medium=affiliate')
+
+    const attribution = await getCheckoutAttribution()
+
+    expect(attribution).toMatchObject({
+      utm_source: 'impact',
+      utm_medium: 'affiliate'
+    })
+    expect(attribution.im_ref).toBeUndefined()
+  })
+
+  it('falls back to URL im_ref when generateClickId throws', async () => {
+    window.history.pushState({}, '', '/?im_ref=url-fallback')
+    window.ire = () => {
+      throw new Error('Impact unavailable')
+    }
+
+    const attribution = await getCheckoutAttribution()
+
+    expect(attribution.im_ref).toBe('url-fallback')
+  })
+
+  it('persists click and UTM attribution across navigation', async () => {
+    window.history.pushState(
+      {},
+      '',
+      '/?gclid=gclid-123&utm_source=impact&utm_campaign=spring-launch'
+    )
+
+    await getCheckoutAttribution()
+    window.history.pushState({}, '', '/pricing')
+
+    const attribution = await getCheckoutAttribution()
+
+    expect(attribution).toMatchObject({
+      gclid: 'gclid-123',
+      utm_source: 'impact',
+      utm_campaign: 'spring-launch'
+    })
+  })
+
+  it('stores attribution from page-view capture for later checkout', async () => {
+    captureCheckoutAttributionFromSearch(
+      '?gbraid=gbraid-123&utm_medium=affiliate'
+    )
+    window.history.pushState({}, '', '/pricing')
+
+    const attribution = await getCheckoutAttribution()
+
+    expect(attribution).toMatchObject({
+      gbraid: 'gbraid-123',
+      utm_medium: 'affiliate'
+    })
+  })
+
+  it('stores click id from page-view capture for later checkout', async () => {
+    captureCheckoutAttributionFromSearch('?im_ref=impact-123')
+    window.history.pushState({}, '', '/pricing')
+
+    const attribution = await getCheckoutAttribution()
+
+    expect(attribution).toMatchObject({
+      im_ref: 'impact-123'
+    })
+  })
+
+  it('does not rewrite click id when page-view capture value is unchanged', () => {
+    window.localStorage.setItem(
+      'comfy_checkout_attribution',
+      JSON.stringify({
+        im_ref: 'impact-123'
+      })
+    )
+    const setItemSpy = vi.spyOn(Storage.prototype, 'setItem')
+
+    captureCheckoutAttributionFromSearch('?im_ref=impact-123')
+
+    expect(setItemSpy).not.toHaveBeenCalled()
+  })
+
+  it('ignores impact_click_id query param', async () => {
+    window.history.pushState({}, '', '/?impact_click_id=impact-query-id')
+
+    const attribution = await getCheckoutAttribution()
+
+    expect(attribution.im_ref).toBeUndefined()
+  })
+})
diff --git a/src/platform/telemetry/utils/__tests__/surveyNormalization.test.ts b/src/platform/telemetry/utils/__tests__/surveyNormalization.test.ts
index ea85bd6eba..059f7d67db 100644
--- a/src/platform/telemetry/utils/__tests__/surveyNormalization.test.ts
+++ b/src/platform/telemetry/utils/__tests__/surveyNormalization.test.ts
@@ -328,9 +328,9 @@ describe('normalizeIndustry', () => {
     })
 
     it('should handle null and invalid inputs', () => {
-      expect(normalizeIndustry(null as any)).toBe('Other / Undefined')
-      expect(normalizeIndustry(undefined as any)).toBe('Other / Undefined')
-      expect(normalizeIndustry(123 as any)).toBe('Other / Undefined')
+      expect(normalizeIndustry(null)).toBe('Other / Undefined')
+      expect(normalizeIndustry(undefined)).toBe('Other / Undefined')
+      expect(normalizeIndustry(123)).toBe('Other / Undefined')
     })
   })
 
@@ -508,7 +508,7 @@ describe('normalizeUseCase', () => {
       expect(normalizeUseCase('none')).toBe('Other / Undefined')
       expect(normalizeUseCase('undefined')).toBe('Other / Undefined')
       expect(normalizeUseCase('')).toBe('Other / Undefined')
-      expect(normalizeUseCase(null as any)).toBe('Other / Undefined')
+      expect(normalizeUseCase(null)).toBe('Other / Undefined')
     })
   })
 
diff --git a/src/platform/telemetry/utils/checkoutAttribution.ts b/src/platform/telemetry/utils/checkoutAttribution.ts
new file mode 100644
index 0000000000..c525a35a10
--- /dev/null
+++ b/src/platform/telemetry/utils/checkoutAttribution.ts
@@ -0,0 +1,223 @@
+import { isPlainObject } from 'es-toolkit'
+import { withTimeout } from 'es-toolkit/promise'
+
+import type { CheckoutAttributionMetadata } from '../types'
+
+type GaIdentity = {
+  client_id?: string
+  session_id?: string
+  session_number?: string
+}
+
+const GA_IDENTITY_FIELDS = [
+  'client_id',
+  'session_id',
+  'session_number'
+] as const satisfies ReadonlyArray<GtagGetFieldName>
+type GaIdentityField = GtagGetFieldName
+
+const ATTRIBUTION_QUERY_KEYS = [
+  'im_ref',
+  'utm_source',
+  'utm_medium',
+  'utm_campaign',
+  'utm_term',
+  'utm_content',
+  'gclid',
+  'gbraid',
+  'wbraid'
+] as const
+type AttributionQueryKey = (typeof ATTRIBUTION_QUERY_KEYS)[number]
+const ATTRIBUTION_STORAGE_KEY = 'comfy_checkout_attribution'
+const GENERATE_CLICK_ID_TIMEOUT_MS = 300
+const GET_GA_IDENTITY_TIMEOUT_MS = 300
+
+function readStoredAttribution(): Partial<Record<AttributionQueryKey, string>> {
+  if (typeof window === 'undefined') return {}
+
+  try {
+    const stored = localStorage.getItem(ATTRIBUTION_STORAGE_KEY)
+    if (!stored) return {}
+
+    const parsed: unknown = JSON.parse(stored)
+    if (!isPlainObject(parsed)) return {}
+
+    const result: Partial<Record<AttributionQueryKey, string>> = {}
+
+    for (const key of ATTRIBUTION_QUERY_KEYS) {
+      const value = asNonEmptyString(parsed[key])
+      if (value) {
+        result[key] = value
+      }
+    }
+
+    return result
+  } catch {
+    return {}
+  }
+}
+
+function persistAttribution(
+  payload: Partial<Record<AttributionQueryKey, string>>
+): void {
+  if (typeof window === 'undefined') return
+
+  try {
+    localStorage.setItem(ATTRIBUTION_STORAGE_KEY, JSON.stringify(payload))
+  } catch {
+    return
+  }
+}
+
+function readAttributionFromUrl(
+  search: string
+): Partial<Record<AttributionQueryKey, string>> {
+  const params = new URLSearchParams(search)
+
+  const result: Partial<Record<AttributionQueryKey, string>> = {}
+
+  for (const key of ATTRIBUTION_QUERY_KEYS) {
+    const value = params.get(key)
+    if (value) {
+      result[key] = value
+    }
+  }
+
+  return result
+}
+
+function hasAttributionChanges(
+  existing: Partial<Record<AttributionQueryKey, string>>,
+  incoming: Partial<Record<AttributionQueryKey, string>>
+): boolean {
+  for (const key of ATTRIBUTION_QUERY_KEYS) {
+    const value = incoming[key]
+    if (value !== undefined && existing[key] !== value) {
+      return true
+    }
+  }
+
+  return false
+}
+
+function asNonEmptyString(value: unknown): string | undefined {
+  if (typeof value === 'number' && Number.isFinite(value)) {
+    return String(value)
+  }
+
+  return typeof value === 'string' && value.length > 0 ? value : undefined
+}
+
+async function getGaIdentityField(
+  measurementId: string,
+  fieldName: GaIdentityField
+): Promise<string | undefined> {
+  if (typeof window === 'undefined' || typeof window.gtag !== 'function') {
+    return undefined
+  }
+  const gtag = window.gtag
+
+  return withTimeout(
+    () =>
+      new Promise<string | undefined>((resolve) => {
+        gtag('get', measurementId, fieldName, (value) => {
+          resolve(asNonEmptyString(value))
+        })
+      }),
+    GET_GA_IDENTITY_TIMEOUT_MS
+  ).catch(() => undefined)
+}
+
+async function getGaIdentity(): Promise<GaIdentity | undefined> {
+  const measurementId = asNonEmptyString(window.__CONFIG__?.ga_measurement_id)
+  if (!measurementId) {
+    return undefined
+  }
+
+  const [clientId, sessionId, sessionNumber] = await Promise.all(
+    GA_IDENTITY_FIELDS.map((fieldName) =>
+      getGaIdentityField(measurementId, fieldName)
+    )
+  )
+
+  if (!clientId && !sessionId && !sessionNumber) {
+    return undefined
+  }
+
+  return {
+    client_id: clientId,
+    session_id: sessionId,
+    session_number: sessionNumber
+  }
+}
+
+async function getGeneratedClickId(): Promise<string | undefined> {
+  if (typeof window === 'undefined') {
+    return undefined
+  }
+
+  const impactQueue = window.ire
+  if (typeof impactQueue !== 'function') {
+    return undefined
+  }
+
+  try {
+    return await withTimeout(
+      () =>
+        new Promise<string | undefined>((resolve, reject) => {
+          try {
+            impactQueue('generateClickId', (clickId: unknown) => {
+              resolve(asNonEmptyString(clickId))
+            })
+          } catch (error) {
+            reject(error)
+          }
+        }),
+      GENERATE_CLICK_ID_TIMEOUT_MS
+    )
+  } catch {
+    return undefined
+  }
+}
+
+export function captureCheckoutAttributionFromSearch(search: string): void {
+  const fromUrl = readAttributionFromUrl(search)
+  const storedAttribution = readStoredAttribution()
+  if (Object.keys(fromUrl).length === 0) return
+
+  if (!hasAttributionChanges(storedAttribution, fromUrl)) return
+
+  persistAttribution({
+    ...storedAttribution,
+    ...fromUrl
+  })
+}
+
+export async function getCheckoutAttribution(): Promise<CheckoutAttributionMetadata> {
+  if (typeof window === 'undefined') return {}
+
+  const storedAttribution = readStoredAttribution()
+  const fromUrl = readAttributionFromUrl(window.location.search)
+  const generatedClickId = await getGeneratedClickId()
+  const attribution: Partial<Record<AttributionQueryKey, string>> = {
+    ...storedAttribution,
+    ...fromUrl
+  }
+
+  if (generatedClickId) {
+    attribution.im_ref = generatedClickId
+  }
+
+  if (hasAttributionChanges(storedAttribution, attribution)) {
+    persistAttribution(attribution)
+  }
+
+  const gaIdentity = await getGaIdentity()
+
+  return {
+    ...attribution,
+    ga_client_id: gaIdentity?.client_id,
+    ga_session_id: gaIdentity?.session_id,
+    ga_session_number: gaIdentity?.session_number
+  }
+}
diff --git a/src/platform/telemetry/utils/getExecutionContext.ts b/src/platform/telemetry/utils/getExecutionContext.ts
new file mode 100644
index 0000000000..2418ce73e4
--- /dev/null
+++ b/src/platform/telemetry/utils/getExecutionContext.ts
@@ -0,0 +1,119 @@
+import {
+  TOOLKIT_BLUEPRINT_MODULES,
+  TOOLKIT_NODE_NAMES
+} from '@/constants/toolkitNodes'
+import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
+import { useWorkflowTemplatesStore } from '@/platform/workflow/templates/repositories/workflowTemplatesStore'
+import { app } from '@/scripts/app'
+import { useNodeDefStore } from '@/stores/nodeDefStore'
+import { NodeSourceType } from '@/types/nodeSource'
+import { reduceAllNodes } from '@/utils/graphTraversalUtil'
+
+import type { ExecutionContext } from '../types'
+
+type NodeMetrics = {
+  custom_node_count: number
+  api_node_count: number
+  toolkit_node_count: number
+  subgraph_count: number
+  total_node_count: number
+  has_api_nodes: boolean
+  api_node_names: string[]
+  has_toolkit_nodes: boolean
+  toolkit_node_names: string[]
+}
+
+export function getExecutionContext(): ExecutionContext {
+  const workflowStore = useWorkflowStore()
+  const templatesStore = useWorkflowTemplatesStore()
+  const nodeDefStore = useNodeDefStore()
+  const activeWorkflow = workflowStore.activeWorkflow
+
+  const nodeCounts = reduceAllNodes<NodeMetrics>(
+    app.rootGraph,
+    (metrics, node) => {
+      const nodeDef = nodeDefStore.nodeDefsByName[node.type]
+      const isCustomNode =
+        nodeDef?.nodeSource?.type === NodeSourceType.CustomNodes
+      const isApiNode = nodeDef?.api_node === true
+      const isSubgraph = node.isSubgraphNode?.() === true
+
+      if (isApiNode) {
+        metrics.has_api_nodes = true
+        const canonicalName = nodeDef?.name
+        if (canonicalName && !metrics.api_node_names.includes(canonicalName)) {
+          metrics.api_node_names.push(canonicalName)
+        }
+      }
+
+      const isToolkitNode =
+        TOOLKIT_NODE_NAMES.has(node.type) ||
+        (nodeDef?.python_module !== undefined &&
+          TOOLKIT_BLUEPRINT_MODULES.has(nodeDef.python_module))
+      if (isToolkitNode) {
+        metrics.has_toolkit_nodes = true
+        const trackingName = nodeDef?.name ?? node.type
+        if (!metrics.toolkit_node_names.includes(trackingName)) {
+          metrics.toolkit_node_names.push(trackingName)
+        }
+      }
+
+      metrics.custom_node_count += isCustomNode ? 1 : 0
+      metrics.api_node_count += isApiNode ? 1 : 0
+      metrics.toolkit_node_count += isToolkitNode ? 1 : 0
+      metrics.subgraph_count += isSubgraph ? 1 : 0
+      metrics.total_node_count += 1
+
+      return metrics
+    },
+    {
+      custom_node_count: 0,
+      api_node_count: 0,
+      toolkit_node_count: 0,
+      subgraph_count: 0,
+      total_node_count: 0,
+      has_api_nodes: false,
+      api_node_names: [],
+      has_toolkit_nodes: false,
+      toolkit_node_names: []
+    }
+  )
+
+  if (activeWorkflow?.filename) {
+    const isTemplate = templatesStore.knownTemplateNames.has(
+      activeWorkflow.filename
+    )
+
+    if (isTemplate) {
+      const template = templatesStore.getTemplateByName(activeWorkflow.filename)
+
+      const englishMetadata = templatesStore.getEnglishMetadata(
+        activeWorkflow.filename
+      )
+
+      return {
+        is_template: true,
+        workflow_name: activeWorkflow.filename,
+        template_source: template?.sourceModule,
+        template_category: englishMetadata?.category ?? template?.category,
+        template_tags: englishMetadata?.tags ?? template?.tags,
+        template_models: englishMetadata?.models ?? template?.models,
+        template_use_case: englishMetadata?.useCase ?? template?.useCase,
+        template_license: englishMetadata?.license ?? template?.license,
+        ...nodeCounts
+      }
+    }
+
+    return {
+      is_template: false,
+      workflow_name: activeWorkflow.filename,
+      ...nodeCounts
+    }
+  }
+
+  return {
+    is_template: false,
+    workflow_name: undefined,
+    ...nodeCounts
+  }
+}
diff --git a/src/platform/telemetry/utils/surveyNormalization.ts b/src/platform/telemetry/utils/surveyNormalization.ts
index ae281ca346..ba126f9056 100644
--- a/src/platform/telemetry/utils/surveyNormalization.ts
+++ b/src/platform/telemetry/utils/surveyNormalization.ts
@@ -6,6 +6,7 @@
  * Uses Fuse.js for fuzzy matching against category keywords.
  */
 import Fuse from 'fuse.js'
+import type { SurveyResponses, SurveyResponsesNormalized } from '../types'
 
 interface CategoryMapping {
   name: string
@@ -526,7 +527,7 @@ const useCaseFuse = new Fuse(USE_CASE_CATEGORIES, FUSE_OPTIONS)
 /**
  * Normalize industry responses using Fuse.js fuzzy search
  */
-export function normalizeIndustry(rawIndustry: string): string {
+export function normalizeIndustry(rawIndustry: unknown): string {
   if (!rawIndustry || typeof rawIndustry !== 'string') {
     return 'Other / Undefined'
   }
@@ -554,7 +555,7 @@ export function normalizeIndustry(rawIndustry: string): string {
 /**
  * Normalize use case responses using Fuse.js fuzzy search
  */
-export function normalizeUseCase(rawUseCase: string): string {
+export function normalizeUseCase(rawUseCase: unknown): string {
   if (!rawUseCase || typeof rawUseCase !== 'string') {
     return 'Other / Undefined'
   }
@@ -583,21 +584,19 @@ export function normalizeUseCase(rawUseCase: string): string {
  * Apply normalization to survey responses
  * Creates both normalized and raw versions of responses
  */
-export function normalizeSurveyResponses(responses: {
-  industry?: string
-  useCase?: string
-  [key: string]: any
-}) {
-  const normalized = { ...responses }
+export function normalizeSurveyResponses(
+  responses: SurveyResponses
+): SurveyResponsesNormalized {
+  const normalized: SurveyResponsesNormalized = { ...responses }
 
   // Normalize industry
-  if (responses.industry) {
+  if (typeof responses.industry === 'string') {
     normalized.industry_normalized = normalizeIndustry(responses.industry)
     normalized.industry_raw = responses.industry
   }
 
   // Normalize use case
-  if (responses.useCase) {
+  if (typeof responses.useCase === 'string') {
     normalized.useCase_normalized = normalizeUseCase(responses.useCase)
     normalized.useCase_raw = responses.useCase
   }
diff --git a/tests-ui/tests/services/releaseService.test.ts b/src/platform/updates/common/releaseService.test.ts
similarity index 99%
rename from tests-ui/tests/services/releaseService.test.ts
rename to src/platform/updates/common/releaseService.test.ts
index 8dd2d7a94c..adffac56a0 100644
--- a/tests-ui/tests/services/releaseService.test.ts
+++ b/src/platform/updates/common/releaseService.test.ts
@@ -190,7 +190,7 @@ describe('useReleaseService', () => {
     })
 
     it('should set loading state correctly', async () => {
-      let resolvePromise: (value: any) => void
+      let resolvePromise: (value: unknown) => void
       const promise = new Promise((resolve) => {
         resolvePromise = resolve
       })
diff --git a/tests-ui/tests/store/releaseStore.test.ts b/src/platform/updates/common/releaseStore.test.ts
similarity index 50%
rename from tests-ui/tests/store/releaseStore.test.ts
rename to src/platform/updates/common/releaseStore.test.ts
index 1d99cc3815..6f045003ff 100644
--- a/tests-ui/tests/store/releaseStore.test.ts
+++ b/src/platform/updates/common/releaseStore.test.ts
@@ -1,16 +1,99 @@
-import { createPinia, setActivePinia } from 'pinia'
-import { compare, valid } from 'semver'
+import { until } from '@vueuse/core'
+import { setActivePinia } from 'pinia'
+import { compare } from 'semver'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { ref } from 'vue'
 
+import type { ReleaseNote } from '@/platform/updates/common/releaseService'
+import { useSettingStore } from '@/platform/settings/settingStore'
 import { useReleaseStore } from '@/platform/updates/common/releaseStore'
+import { useReleaseService } from '@/platform/updates/common/releaseService'
+import { useSystemStatsStore } from '@/stores/systemStatsStore'
+import { createTestingPinia } from '@pinia/testing'
+import type { SystemStats } from '@/types'
 
 // Mock the dependencies
-vi.mock('semver')
-vi.mock('@/utils/envUtil')
-vi.mock('@/platform/distribution/types', () => ({ isCloud: false }))
-vi.mock('@/platform/updates/common/releaseService')
-vi.mock('@/platform/settings/settingStore')
-vi.mock('@/stores/systemStatsStore')
+vi.mock('semver', () => ({
+  compare: vi.fn(),
+  valid: vi.fn(() => '1.0.0')
+}))
+
+const mockData = vi.hoisted(() => ({ isDesktop: true }))
+
+vi.mock('@/platform/distribution/types', () => ({
+  get isDesktop() {
+    return mockData.isDesktop
+  },
+  isCloud: false
+}))
+
+vi.mock('@/platform/updates/common/releaseService', () => {
+  const getReleases = vi.fn()
+  const isLoading = ref(false)
+  const error = ref<string | null>(null)
+  return {
+    useReleaseService: () => ({
+      getReleases,
+      isLoading,
+      error
+    })
+  }
+})
+
+vi.mock('@/platform/settings/settingStore', () => {
+  const get = vi.fn((key: string) => {
+    if (key === 'Comfy.Notification.ShowVersionUpdates') return true
+    return null
+  })
+  const set = vi.fn()
+  const setMany = vi.fn()
+  return {
+    useSettingStore: () => ({ get, set, setMany })
+  }
+})
+
+const mockSystemStatsState = vi.hoisted(() => ({
+  systemStats: {
+    system: {
+      comfyui_version: '1.0.0',
+      argv: []
+    }
+  } satisfies {
+    system: Partial<SystemStats['system']>
+  },
+  isInitialized: true,
+  reset() {
+    this.systemStats = {
+      system: {
+        comfyui_version: '1.0.0',
+        argv: []
+      } satisfies Partial<SystemStats['system']>
+    }
+    this.isInitialized = true
+  }
+}))
+vi.mock('@/stores/systemStatsStore', () => {
+  const refetchSystemStats = vi.fn()
+  const getFormFactor = vi.fn(() => 'git-windows')
+  return {
+    useSystemStatsStore: () => ({
+      get systemStats() {
+        return mockSystemStatsState.systemStats
+      },
+      set systemStats(val) {
+        mockSystemStatsState.systemStats = val
+      },
+      get isInitialized() {
+        return mockSystemStatsState.isInitialized
+      },
+      set isInitialized(val) {
+        mockSystemStatsState.isInitialized = val
+      },
+      refetchSystemStats,
+      getFormFactor
+    })
+  }
+})
 vi.mock('@vueuse/core', () => ({
   until: vi.fn(() => Promise.resolve()),
   useStorage: vi.fn(() => ({ value: {} })),
@@ -18,11 +101,6 @@ vi.mock('@vueuse/core', () => ({
 }))
 
 describe('useReleaseStore', () => {
-  let store: ReturnType<typeof useReleaseStore>
-  let mockReleaseService: any
-  let mockSettingStore: any
-  let mockSystemStatsStore: any
-
   const mockRelease = {
     id: 1,
     project: 'comfyui' as const,
@@ -32,59 +110,16 @@ describe('useReleaseStore', () => {
     attention: 'high' as const
   }
 
-  beforeEach(async () => {
-    setActivePinia(createPinia())
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
 
-    // Reset all mocks
-    vi.clearAllMocks()
-
-    // Setup mock services
-    mockReleaseService = {
-      getReleases: vi.fn(),
-      isLoading: { value: false },
-      error: { value: null }
-    }
-
-    mockSettingStore = {
-      get: vi.fn(),
-      set: vi.fn()
-    }
-
-    mockSystemStatsStore = {
-      systemStats: {
-        system: {
-          comfyui_version: '1.0.0'
-        }
-      },
-      isInitialized: true,
-      refetchSystemStats: vi.fn(),
-      getFormFactor: vi.fn(() => 'git-windows')
-    }
-
-    // Setup mock implementations
-    const { useReleaseService } =
-      await import('@/platform/updates/common/releaseService')
-    const { useSettingStore } = await import('@/platform/settings/settingStore')
-    const { useSystemStatsStore } = await import('@/stores/systemStatsStore')
-    const { isElectron } = await import('@/utils/envUtil')
-
-    vi.mocked(useReleaseService).mockReturnValue(mockReleaseService)
-    vi.mocked(useSettingStore).mockReturnValue(mockSettingStore)
-    vi.mocked(useSystemStatsStore).mockReturnValue(mockSystemStatsStore)
-    vi.mocked(isElectron).mockReturnValue(true)
-    vi.mocked(valid).mockReturnValue('1.0.0')
-
-    // Default showVersionUpdates to true
-    mockSettingStore.get.mockImplementation((key: string) => {
-      if (key === 'Comfy.Notification.ShowVersionUpdates') return true
-      return null
-    })
-
-    store = useReleaseStore()
+    vi.resetAllMocks()
+    mockSystemStatsState.reset()
   })
 
   describe('initial state', () => {
     it('should initialize with default state', () => {
+      const store = useReleaseStore()
       expect(store.releases).toEqual([])
       expect(store.isLoading).toBe(false)
       expect(store.error).toBeNull()
@@ -93,6 +128,7 @@ describe('useReleaseStore', () => {
 
   describe('computed properties', () => {
     it('should return most recent release', () => {
+      const store = useReleaseStore()
       const olderRelease = {
         ...mockRelease,
         id: 2,
@@ -105,6 +141,7 @@ describe('useReleaseStore', () => {
     })
 
     it('should return 3 most recent releases', () => {
+      const store = useReleaseStore()
       const releases = [
         mockRelease,
         { ...mockRelease, id: 2, version: '1.1.0' },
@@ -117,6 +154,7 @@ describe('useReleaseStore', () => {
     })
 
     it('should show update button (shouldShowUpdateButton)', () => {
+      const store = useReleaseStore()
       vi.mocked(compare).mockReturnValue(1) // newer version available
 
       store.releases = [mockRelease]
@@ -124,6 +162,7 @@ describe('useReleaseStore', () => {
     })
 
     it('should not show update button when no new version', () => {
+      const store = useReleaseStore()
       vi.mocked(compare).mockReturnValue(-1) // current version is newer
 
       store.releases = [mockRelease]
@@ -132,19 +171,17 @@ describe('useReleaseStore', () => {
   })
 
   describe('showVersionUpdates setting', () => {
-    beforeEach(async () => {
-      store.releases = [mockRelease]
-    })
-
     describe('when notifications are enabled', () => {
-      beforeEach(async () => {
-        mockSettingStore.get.mockImplementation((key: string) => {
+      beforeEach(() => {
+        const settingStore = useSettingStore()
+        vi.mocked(settingStore.get).mockImplementation((key: string) => {
           if (key === 'Comfy.Notification.ShowVersionUpdates') return true
           return null
         })
       })
 
       it('should show toast for medium/high attention releases', () => {
+        const store = useReleaseStore()
         vi.mocked(compare).mockReturnValue(1)
         store.releases = [mockRelease]
 
@@ -152,6 +189,7 @@ describe('useReleaseStore', () => {
       })
 
       it('should not show toast for low attention releases', () => {
+        const store = useReleaseStore()
         vi.mocked(compare).mockReturnValue(1)
 
         const lowAttentionRelease = {
@@ -165,13 +203,18 @@ describe('useReleaseStore', () => {
       })
 
       it('should show red dot for new versions', () => {
+        const store = useReleaseStore()
+        store.releases = [mockRelease]
         vi.mocked(compare).mockReturnValue(1)
 
         expect(store.shouldShowRedDot).toBe(true)
       })
 
       it('should show popup for latest version', () => {
-        mockSystemStatsStore.systemStats.system.comfyui_version = '1.2.0'
+        const store = useReleaseStore()
+        store.releases = [mockRelease]
+        const systemStatsStore = useSystemStatsStore()
+        systemStatsStore.systemStats!.system.comfyui_version = '1.2.0'
 
         vi.mocked(compare).mockReturnValue(0)
 
@@ -179,11 +222,13 @@ describe('useReleaseStore', () => {
       })
 
       it('should fetch releases during initialization', async () => {
-        mockReleaseService.getReleases.mockResolvedValue([mockRelease])
+        const store = useReleaseStore()
+        const releaseService = useReleaseService()
+        vi.mocked(releaseService.getReleases).mockResolvedValue([mockRelease])
 
         await store.initialize()
 
-        expect(mockReleaseService.getReleases).toHaveBeenCalledWith({
+        expect(releaseService.getReleases).toHaveBeenCalledWith({
           project: 'comfyui',
           current_version: '1.0.0',
           form_factor: 'git-windows',
@@ -193,27 +238,35 @@ describe('useReleaseStore', () => {
     })
 
     describe('when notifications are disabled', () => {
-      beforeEach(async () => {
-        mockSettingStore.get.mockImplementation((key: string) => {
+      beforeEach(() => {
+        const settingStore = useSettingStore()
+        vi.mocked(settingStore.get).mockImplementation((key: string) => {
           if (key === 'Comfy.Notification.ShowVersionUpdates') return false
           return null
         })
       })
 
       it('should not show toast even with new version available', () => {
+        const store = useReleaseStore()
+        store.releases = [mockRelease]
         vi.mocked(compare).mockReturnValue(1)
 
         expect(store.shouldShowToast).toBe(false)
       })
 
       it('should not show red dot even with new version available', () => {
+        const store = useReleaseStore()
+        store.releases = [mockRelease]
         vi.mocked(compare).mockReturnValue(1)
 
         expect(store.shouldShowRedDot).toBe(false)
       })
 
       it('should not show popup even for latest version', () => {
-        mockSystemStatsStore.systemStats.system.comfyui_version = '1.2.0'
+        const store = useReleaseStore()
+        store.releases = [mockRelease]
+        const systemStatsStore = useSystemStatsStore()
+        systemStatsStore.systemStats!.system.comfyui_version = '1.2.0'
 
         vi.mocked(compare).mockReturnValue(0)
 
@@ -221,15 +274,19 @@ describe('useReleaseStore', () => {
       })
 
       it('should skip fetching releases during initialization', async () => {
+        const store = useReleaseStore()
+        const releaseService = useReleaseService()
         await store.initialize()
 
-        expect(mockReleaseService.getReleases).not.toHaveBeenCalled()
+        expect(releaseService.getReleases).not.toHaveBeenCalled()
       })
 
       it('should not fetch releases when calling fetchReleases directly', async () => {
+        const store = useReleaseStore()
+        const releaseService = useReleaseService()
         await store.fetchReleases()
 
-        expect(mockReleaseService.getReleases).not.toHaveBeenCalled()
+        expect(releaseService.getReleases).not.toHaveBeenCalled()
         expect(store.isLoading).toBe(false)
       })
     })
@@ -237,11 +294,13 @@ describe('useReleaseStore', () => {
 
   describe('release initialization', () => {
     it('should fetch releases successfully', async () => {
-      mockReleaseService.getReleases.mockResolvedValue([mockRelease])
+      const store = useReleaseStore()
+      const releaseService = useReleaseService()
+      vi.mocked(releaseService.getReleases).mockResolvedValue([mockRelease])
 
       await store.initialize()
 
-      expect(mockReleaseService.getReleases).toHaveBeenCalledWith({
+      expect(releaseService.getReleases).toHaveBeenCalledWith({
         project: 'comfyui',
         current_version: '1.0.0',
         form_factor: 'git-windows',
@@ -251,12 +310,15 @@ describe('useReleaseStore', () => {
     })
 
     it('should include form_factor in API call', async () => {
-      mockSystemStatsStore.getFormFactor.mockReturnValue('desktop-mac')
-      mockReleaseService.getReleases.mockResolvedValue([mockRelease])
+      const store = useReleaseStore()
+      const releaseService = useReleaseService()
+      const systemStatsStore = useSystemStatsStore()
+      vi.mocked(systemStatsStore.getFormFactor).mockReturnValue('desktop-mac')
+      vi.mocked(releaseService.getReleases).mockResolvedValue([mockRelease])
 
       await store.initialize()
 
-      expect(mockReleaseService.getReleases).toHaveBeenCalledWith({
+      expect(releaseService.getReleases).toHaveBeenCalledWith({
         project: 'comfyui',
         current_version: '1.0.0',
         form_factor: 'desktop-mac',
@@ -265,16 +327,22 @@ describe('useReleaseStore', () => {
     })
 
     it('should skip fetching when --disable-api-nodes is present', async () => {
-      mockSystemStatsStore.systemStats.system.argv = ['--disable-api-nodes']
+      const store = useReleaseStore()
+      const releaseService = useReleaseService()
+      const systemStatsStore = useSystemStatsStore()
+      systemStatsStore.systemStats!.system.argv = ['--disable-api-nodes']
 
       await store.initialize()
 
-      expect(mockReleaseService.getReleases).not.toHaveBeenCalled()
+      expect(releaseService.getReleases).not.toHaveBeenCalled()
       expect(store.isLoading).toBe(false)
     })
 
     it('should skip fetching when --disable-api-nodes is one of multiple args', async () => {
-      mockSystemStatsStore.systemStats.system.argv = [
+      const store = useReleaseStore()
+      const releaseService = useReleaseService()
+      const systemStatsStore = useSystemStatsStore()
+      systemStatsStore.systemStats!.system.argv = [
         '--port',
         '8080',
         '--disable-api-nodes',
@@ -283,37 +351,46 @@ describe('useReleaseStore', () => {
 
       await store.initialize()
 
-      expect(mockReleaseService.getReleases).not.toHaveBeenCalled()
+      expect(releaseService.getReleases).not.toHaveBeenCalled()
       expect(store.isLoading).toBe(false)
     })
 
     it('should fetch normally when --disable-api-nodes is not present', async () => {
-      mockSystemStatsStore.systemStats.system.argv = [
+      const store = useReleaseStore()
+      const releaseService = useReleaseService()
+      const systemStatsStore = useSystemStatsStore()
+      systemStatsStore.systemStats!.system.argv = [
         '--port',
         '8080',
         '--verbose'
       ]
-      mockReleaseService.getReleases.mockResolvedValue([mockRelease])
+      vi.mocked(releaseService.getReleases).mockResolvedValue([mockRelease])
 
       await store.initialize()
 
-      expect(mockReleaseService.getReleases).toHaveBeenCalled()
+      expect(releaseService.getReleases).toHaveBeenCalled()
       expect(store.releases).toEqual([mockRelease])
     })
 
     it('should fetch normally when argv is undefined', async () => {
-      mockSystemStatsStore.systemStats.system.argv = undefined
-      mockReleaseService.getReleases.mockResolvedValue([mockRelease])
+      const store = useReleaseStore()
+      const releaseService = useReleaseService()
+      const systemStatsStore = useSystemStatsStore()
+      // TODO: Consider deleting this test since the types have to be violated for it to be relevant
+      delete (systemStatsStore.systemStats!.system as { argv?: string[] }).argv
+      vi.mocked(releaseService.getReleases).mockResolvedValue([mockRelease])
 
       await store.initialize()
 
-      expect(mockReleaseService.getReleases).toHaveBeenCalled()
+      expect(releaseService.getReleases).toHaveBeenCalled()
       expect(store.releases).toEqual([mockRelease])
     })
 
     it('should handle API errors gracefully', async () => {
-      mockReleaseService.getReleases.mockResolvedValue(null)
-      mockReleaseService.error.value = 'API Error'
+      const store = useReleaseStore()
+      const releaseService = useReleaseService()
+      vi.mocked(releaseService.getReleases).mockResolvedValue(null)
+      releaseService.error.value = 'API Error'
 
       await store.initialize()
 
@@ -322,7 +399,9 @@ describe('useReleaseStore', () => {
     })
 
     it('should handle non-Error objects', async () => {
-      mockReleaseService.getReleases.mockRejectedValue('String error')
+      const store = useReleaseStore()
+      const releaseService = useReleaseService()
+      vi.mocked(releaseService.getReleases).mockRejectedValue('String error')
 
       await store.initialize()
 
@@ -330,12 +409,14 @@ describe('useReleaseStore', () => {
     })
 
     it('should set loading state correctly', async () => {
-      let resolvePromise: (value: any) => void
-      const promise = new Promise((resolve) => {
+      const store = useReleaseStore()
+      const releaseService = useReleaseService()
+      let resolvePromise: (value: ReleaseNote[] | null) => void
+      const promise = new Promise<ReleaseNote[] | null>((resolve) => {
         resolvePromise = resolve
       })
 
-      mockReleaseService.getReleases.mockReturnValue(promise)
+      vi.mocked(releaseService.getReleases).mockReturnValue(promise)
 
       const initPromise = store.initialize()
       expect(store.isLoading).toBe(true)
@@ -347,19 +428,23 @@ describe('useReleaseStore', () => {
     })
 
     it('should fetch system stats if not available', async () => {
-      const { until } = await import('@vueuse/core')
-      mockSystemStatsStore.systemStats = null
-      mockSystemStatsStore.isInitialized = false
-      mockReleaseService.getReleases.mockResolvedValue([mockRelease])
+      const store = useReleaseStore()
+      const releaseService = useReleaseService()
+      const systemStatsStore = useSystemStatsStore()
+      systemStatsStore.systemStats = null
+      systemStatsStore.isInitialized = false
+      vi.mocked(releaseService.getReleases).mockResolvedValue([mockRelease])
 
       await store.initialize()
 
-      expect(until).toHaveBeenCalled()
-      expect(mockReleaseService.getReleases).toHaveBeenCalled()
+      expect(vi.mocked(until)).toHaveBeenCalled()
+      expect(releaseService.getReleases).toHaveBeenCalled()
     })
 
     it('should not set loading state when notifications disabled', async () => {
-      mockSettingStore.get.mockImplementation((key: string) => {
+      const store = useReleaseStore()
+      const settingStore = useSettingStore()
+      vi.mocked(settingStore.get).mockImplementation((key: string) => {
         if (key === 'Comfy.Notification.ShowVersionUpdates') return false
         return null
       })
@@ -372,16 +457,22 @@ describe('useReleaseStore', () => {
 
   describe('--disable-api-nodes argument handling', () => {
     it('should skip fetchReleases when --disable-api-nodes is present', async () => {
-      mockSystemStatsStore.systemStats.system.argv = ['--disable-api-nodes']
+      const store = useReleaseStore()
+      const releaseService = useReleaseService()
+      const systemStatsStore = useSystemStatsStore()
+      systemStatsStore.systemStats!.system.argv = ['--disable-api-nodes']
 
       await store.fetchReleases()
 
-      expect(mockReleaseService.getReleases).not.toHaveBeenCalled()
+      expect(releaseService.getReleases).not.toHaveBeenCalled()
       expect(store.isLoading).toBe(false)
     })
 
     it('should skip fetchReleases when --disable-api-nodes is among other args', async () => {
-      mockSystemStatsStore.systemStats.system.argv = [
+      const store = useReleaseStore()
+      const releaseService = useReleaseService()
+      const systemStatsStore = useSystemStatsStore()
+      systemStatsStore.systemStats!.system.argv = [
         '--port',
         '8080',
         '--disable-api-nodes',
@@ -390,105 +481,99 @@ describe('useReleaseStore', () => {
 
       await store.fetchReleases()
 
-      expect(mockReleaseService.getReleases).not.toHaveBeenCalled()
+      expect(releaseService.getReleases).not.toHaveBeenCalled()
       expect(store.isLoading).toBe(false)
     })
 
     it('should proceed with fetchReleases when --disable-api-nodes is not present', async () => {
-      mockSystemStatsStore.systemStats.system.argv = [
+      const store = useReleaseStore()
+      const releaseService = useReleaseService()
+      const systemStatsStore = useSystemStatsStore()
+      systemStatsStore.systemStats!.system.argv = [
         '--port',
         '8080',
         '--verbose'
       ]
-      mockReleaseService.getReleases.mockResolvedValue([mockRelease])
+      vi.mocked(releaseService.getReleases).mockResolvedValue([mockRelease])
 
       await store.fetchReleases()
 
-      expect(mockReleaseService.getReleases).toHaveBeenCalled()
+      expect(releaseService.getReleases).toHaveBeenCalled()
     })
 
-    it('should proceed with fetchReleases when argv is null', async () => {
-      mockSystemStatsStore.systemStats.system.argv = null
-      mockReleaseService.getReleases.mockResolvedValue([mockRelease])
+    it('should proceed with fetchReleases when argv is undefined', async () => {
+      const store = useReleaseStore()
+      const releaseService = useReleaseService()
+      const systemStatsStore = useSystemStatsStore()
+      delete (systemStatsStore.systemStats!.system as { argv?: string[] }).argv
+      vi.mocked(releaseService.getReleases).mockResolvedValue([mockRelease])
 
       await store.fetchReleases()
 
-      expect(mockReleaseService.getReleases).toHaveBeenCalled()
+      expect(releaseService.getReleases).toHaveBeenCalled()
     })
 
     it('should proceed with fetchReleases when system stats are not available', async () => {
-      const { until } = await import('@vueuse/core')
-      mockSystemStatsStore.systemStats = null
-      mockSystemStatsStore.isInitialized = false
-      mockReleaseService.getReleases.mockResolvedValue([mockRelease])
+      const store = useReleaseStore()
+      const releaseService = useReleaseService()
+      const systemStatsStore = useSystemStatsStore()
+      systemStatsStore.systemStats = null
+      systemStatsStore.isInitialized = false
+      vi.mocked(releaseService.getReleases).mockResolvedValue([mockRelease])
 
       await store.fetchReleases()
 
       expect(until).toHaveBeenCalled()
-      expect(mockReleaseService.getReleases).toHaveBeenCalled()
+      expect(releaseService.getReleases).toHaveBeenCalled()
     })
   })
 
   describe('action handlers', () => {
-    beforeEach(async () => {
-      store.releases = [mockRelease]
-    })
-
     it('should handle skip release', async () => {
+      const store = useReleaseStore()
+      store.releases = [mockRelease]
+      const settingStore = useSettingStore()
       await store.handleSkipRelease('1.2.0')
 
-      expect(mockSettingStore.set).toHaveBeenCalledWith(
-        'Comfy.Release.Version',
-        '1.2.0'
-      )
-      expect(mockSettingStore.set).toHaveBeenCalledWith(
-        'Comfy.Release.Status',
-        'skipped'
-      )
-      expect(mockSettingStore.set).toHaveBeenCalledWith(
-        'Comfy.Release.Timestamp',
-        expect.any(Number)
-      )
+      expect(settingStore.setMany).toHaveBeenCalledWith({
+        'Comfy.Release.Version': '1.2.0',
+        'Comfy.Release.Status': 'skipped',
+        'Comfy.Release.Timestamp': expect.any(Number)
+      })
     })
 
     it('should handle show changelog', async () => {
+      const store = useReleaseStore()
+      store.releases = [mockRelease]
+      const settingStore = useSettingStore()
       await store.handleShowChangelog('1.2.0')
 
-      expect(mockSettingStore.set).toHaveBeenCalledWith(
-        'Comfy.Release.Version',
-        '1.2.0'
-      )
-      expect(mockSettingStore.set).toHaveBeenCalledWith(
-        'Comfy.Release.Status',
-        'changelog seen'
-      )
-      expect(mockSettingStore.set).toHaveBeenCalledWith(
-        'Comfy.Release.Timestamp',
-        expect.any(Number)
-      )
+      expect(settingStore.setMany).toHaveBeenCalledWith({
+        'Comfy.Release.Version': '1.2.0',
+        'Comfy.Release.Status': 'changelog seen',
+        'Comfy.Release.Timestamp': expect.any(Number)
+      })
     })
 
     it('should handle whats new seen', async () => {
+      const store = useReleaseStore()
+      store.releases = [mockRelease]
+      const settingStore = useSettingStore()
       await store.handleWhatsNewSeen('1.2.0')
 
-      expect(mockSettingStore.set).toHaveBeenCalledWith(
-        'Comfy.Release.Version',
-        '1.2.0'
-      )
-      expect(mockSettingStore.set).toHaveBeenCalledWith(
-        'Comfy.Release.Status',
-        "what's new seen"
-      )
-      expect(mockSettingStore.set).toHaveBeenCalledWith(
-        'Comfy.Release.Timestamp',
-        expect.any(Number)
-      )
+      expect(settingStore.setMany).toHaveBeenCalledWith({
+        'Comfy.Release.Version': '1.2.0',
+        'Comfy.Release.Status': "what's new seen",
+        'Comfy.Release.Timestamp': expect.any(Number)
+      })
     })
   })
 
   describe('popup visibility', () => {
     it('should show toast for medium/high attention releases', () => {
-      mockSettingStore.get.mockImplementation((key: string) => {
+      const store = useReleaseStore()
+      const settingStore = useSettingStore()
+      vi.mocked(settingStore.get).mockImplementation((key: string) => {
         if (key === 'Comfy.Release.Version') return null
         if (key === 'Comfy.Release.Status') return null
         if (key === 'Comfy.Notification.ShowVersionUpdates') return true
@@ -503,8 +588,10 @@ describe('useReleaseStore', () => {
     })
 
     it('should show red dot for new versions', () => {
+      const store = useReleaseStore()
+      const settingStore = useSettingStore()
       vi.mocked(compare).mockReturnValue(1)
-      mockSettingStore.get.mockImplementation((key: string) => {
+      vi.mocked(settingStore.get).mockImplementation((key: string) => {
         if (key === 'Comfy.Notification.ShowVersionUpdates') return true
         return null
       })
@@ -515,8 +602,11 @@ describe('useReleaseStore', () => {
     })
 
     it('should show popup for latest version', () => {
-      mockSystemStatsStore.systemStats.system.comfyui_version = '1.2.0' // Same as release
-      mockSettingStore.get.mockImplementation((key: string) => {
+      const store = useReleaseStore()
+      const systemStatsStore = useSystemStatsStore()
+      const settingStore = useSettingStore()
+      systemStatsStore.systemStats!.system.comfyui_version = '1.2.0' // Same as release
+      vi.mocked(settingStore.get).mockImplementation((key: string) => {
         if (key === 'Comfy.Notification.ShowVersionUpdates') return true
         return null
       })
@@ -531,8 +621,11 @@ describe('useReleaseStore', () => {
 
   describe('edge cases', () => {
     it('should handle missing system stats gracefully', async () => {
-      mockSystemStatsStore.systemStats = null
-      mockSettingStore.get.mockImplementation((key: string) => {
+      const store = useReleaseStore()
+      const systemStatsStore = useSystemStatsStore()
+      const settingStore = useSettingStore()
+      systemStatsStore.systemStats = null
+      vi.mocked(settingStore.get).mockImplementation((key: string) => {
         if (key === 'Comfy.Notification.ShowVersionUpdates') return false
         return null
       })
@@ -540,11 +633,13 @@ describe('useReleaseStore', () => {
       await store.initialize()
 
       // Should not fetch system stats when notifications disabled
-      expect(mockSystemStatsStore.refetchSystemStats).not.toHaveBeenCalled()
+      expect(systemStatsStore.refetchSystemStats).not.toHaveBeenCalled()
     })
 
     it('should handle concurrent fetchReleases calls', async () => {
-      mockReleaseService.getReleases.mockImplementation(
+      const store = useReleaseStore()
+      const releaseService = useReleaseService()
+      vi.mocked(releaseService.getReleases).mockImplementation(
         () =>
           new Promise((resolve) =>
             setTimeout(() => resolve([mockRelease]), 100)
@@ -558,41 +653,37 @@ describe('useReleaseStore', () => {
       await Promise.all([promise1, promise2])
 
       // Should only call API once due to loading check
-      expect(mockReleaseService.getReleases).toHaveBeenCalledTimes(1)
+      expect(releaseService.getReleases).toHaveBeenCalledTimes(1)
     })
   })
 
-  describe('isElectron environment checks', () => {
-    beforeEach(async () => {
-      // Set up a new version available
-      store.releases = [mockRelease]
-      mockSettingStore.get.mockImplementation((key: string) => {
-        if (key === 'Comfy.Notification.ShowVersionUpdates') return true
-        return null
-      })
-    })
-
-    describe('when running in Electron (desktop)', () => {
-      beforeEach(async () => {
-        const { isElectron } = await import('@/utils/envUtil')
-        vi.mocked(isElectron).mockReturnValue(true)
+  describe('isDesktop environment checks', () => {
+    describe('when running on desktop', () => {
+      beforeEach(() => {
+        mockData.isDesktop = true
       })
 
       it('should show toast when conditions are met', () => {
-        vi.mocked(compare).mockReturnValue(1)
+        const store = useReleaseStore()
         store.releases = [mockRelease]
+        vi.mocked(compare).mockReturnValue(1)
 
         expect(store.shouldShowToast).toBe(true)
       })
 
       it('should show red dot when new version available', () => {
+        const store = useReleaseStore()
+        store.releases = [mockRelease]
         vi.mocked(compare).mockReturnValue(1)
 
         expect(store.shouldShowRedDot).toBe(true)
       })
 
       it('should show popup for latest version', () => {
-        mockSystemStatsStore.systemStats.system.comfyui_version = '1.2.0'
+        const store = useReleaseStore()
+        store.releases = [mockRelease]
+        const systemStatsStore = useSystemStatsStore()
+        systemStatsStore.systemStats!.system.comfyui_version = '1.2.0'
 
         vi.mocked(compare).mockReturnValue(0)
 
@@ -600,13 +691,13 @@ describe('useReleaseStore', () => {
       })
     })
 
-    describe('when NOT running in Electron (web)', () => {
-      beforeEach(async () => {
-        const { isElectron } = await import('@/utils/envUtil')
-        vi.mocked(isElectron).mockReturnValue(false)
+    describe('when NOT running on desktop (web)', () => {
+      beforeEach(() => {
+        mockData.isDesktop = false
       })
 
       it('should NOT show toast even when all other conditions are met', () => {
+        const store = useReleaseStore()
         vi.mocked(compare).mockReturnValue(1)
 
         // Set up all conditions that would normally show toast
@@ -616,12 +707,15 @@ describe('useReleaseStore', () => {
       })
 
       it('should NOT show red dot even when new version available', () => {
+        const store = useReleaseStore()
+        store.releases = [mockRelease]
         vi.mocked(compare).mockReturnValue(1)
 
         expect(store.shouldShowRedDot).toBe(false)
       })
 
       it('should NOT show toast regardless of attention level', () => {
+        const store = useReleaseStore()
         vi.mocked(compare).mockReturnValue(1)
 
         // Test with high attention releases
@@ -641,6 +735,7 @@ describe('useReleaseStore', () => {
       })
 
       it('should NOT show red dot even with high attention release', () => {
+        const store = useReleaseStore()
         vi.mocked(compare).mockReturnValue(1)
 
         store.releases = [{ ...mockRelease, attention: 'high' as const }]
@@ -649,7 +744,10 @@ describe('useReleaseStore', () => {
       })
 
       it('should NOT show popup even for latest version', () => {
-        mockSystemStatsStore.systemStats.system.comfyui_version = '1.2.0'
+        const store = useReleaseStore()
+        store.releases = [mockRelease]
+        const systemStatsStore = useSystemStatsStore()
+        systemStatsStore.systemStats!.system.comfyui_version = '1.2.0'
 
         vi.mocked(compare).mockReturnValue(0)
 
diff --git a/src/platform/updates/common/releaseStore.ts b/src/platform/updates/common/releaseStore.ts
index 80c2bc05d1..fa268ed8c3 100644
--- a/src/platform/updates/common/releaseStore.ts
+++ b/src/platform/updates/common/releaseStore.ts
@@ -3,10 +3,9 @@ import { defineStore } from 'pinia'
 import { compare, valid } from 'semver'
 import { computed, ref } from 'vue'
 
-import { isCloud } from '@/platform/distribution/types'
+import { isCloud, isDesktop } from '@/platform/distribution/types'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { useSystemStatsStore } from '@/stores/systemStatsStore'
-import { isElectron } from '@/utils/envUtil'
 import { stringToLocale } from '@/utils/formatUtil'
 
 import { useReleaseService } from './releaseService'
@@ -95,7 +94,7 @@ export const useReleaseStore = defineStore('release', () => {
   // Show toast if needed
   const shouldShowToast = computed(() => {
     // Only show on desktop version
-    if (!isElectron() || isCloud) {
+    if (!isDesktop || isCloud) {
       return false
     }
 
@@ -127,7 +126,7 @@ export const useReleaseStore = defineStore('release', () => {
   // Show red-dot indicator
   const shouldShowRedDot = computed(() => {
     // Only show on desktop version
-    if (!isElectron() || isCloud) {
+    if (!isDesktop || isCloud) {
       return false
     }
 
@@ -172,7 +171,7 @@ export const useReleaseStore = defineStore('release', () => {
   })
 
   const shouldShowPopup = computed(() => {
-    if (!isElectron() && !isCloud) {
+    if (!isDesktop && !isCloud) {
       return false
     }
 
@@ -209,9 +208,11 @@ export const useReleaseStore = defineStore('release', () => {
       return
     }
 
-    await settingStore.set('Comfy.Release.Version', version)
-    await settingStore.set('Comfy.Release.Status', 'skipped')
-    await settingStore.set('Comfy.Release.Timestamp', Date.now())
+    await settingStore.setMany({
+      'Comfy.Release.Version': version,
+      'Comfy.Release.Status': 'skipped',
+      'Comfy.Release.Timestamp': Date.now()
+    })
   }
 
   async function handleShowChangelog(version: string): Promise<void> {
@@ -219,9 +220,11 @@ export const useReleaseStore = defineStore('release', () => {
       return
     }
 
-    await settingStore.set('Comfy.Release.Version', version)
-    await settingStore.set('Comfy.Release.Status', 'changelog seen')
-    await settingStore.set('Comfy.Release.Timestamp', Date.now())
+    await settingStore.setMany({
+      'Comfy.Release.Version': version,
+      'Comfy.Release.Status': 'changelog seen',
+      'Comfy.Release.Timestamp': Date.now()
+    })
   }
 
   async function handleWhatsNewSeen(version: string): Promise<void> {
@@ -229,9 +232,11 @@ export const useReleaseStore = defineStore('release', () => {
       return
     }
 
-    await settingStore.set('Comfy.Release.Version', version)
-    await settingStore.set('Comfy.Release.Status', "what's new seen")
-    await settingStore.set('Comfy.Release.Timestamp', Date.now())
+    await settingStore.setMany({
+      'Comfy.Release.Version': version,
+      'Comfy.Release.Status': "what's new seen",
+      'Comfy.Release.Timestamp': Date.now()
+    })
   }
 
   // Fetch releases from API
diff --git a/tests-ui/tests/composables/useFrontendVersionMismatchWarning.test.ts b/src/platform/updates/common/useFrontendVersionMismatchWarning.test.ts
similarity index 89%
rename from tests-ui/tests/composables/useFrontendVersionMismatchWarning.test.ts
rename to src/platform/updates/common/useFrontendVersionMismatchWarning.test.ts
index 8c175ab056..173879aaba 100644
--- a/tests-ui/tests/composables/useFrontendVersionMismatchWarning.test.ts
+++ b/src/platform/updates/common/useFrontendVersionMismatchWarning.test.ts
@@ -1,6 +1,5 @@
 import { createPinia, setActivePinia } from 'pinia'
-import { vi } from 'vitest'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { nextTick } from 'vue'
 
 import { useToastStore } from '@/platform/updates/common/toastStore'
@@ -41,17 +40,20 @@ vi.mock('@/scripts/api', () => ({
 // Mock vue-i18n
 vi.mock('vue-i18n', () => ({
   useI18n: () => ({
-    t: (key: string, params?: any) => {
+    t: (key: string, params?: Record<string, string | number> | unknown) => {
       if (key === 'g.versionMismatchWarning')
         return 'Version Compatibility Warning'
       if (key === 'g.versionMismatchWarningMessage' && params) {
-        return `${params.warning}: ${params.detail} Visit https://docs.comfy.org/installation/update_comfyui#common-update-issues for update instructions.`
+        const p = params as Record<string, string>
+        return `${p.warning}: ${p.detail} Visit https://docs.comfy.org/installation/update_comfyui#common-update-issues for update instructions.`
       }
       if (key === 'g.frontendOutdated' && params) {
-        return `Frontend version ${params.frontendVersion} is outdated. Backend requires ${params.requiredVersion} or higher.`
+        const p = params as Record<string, string>
+        return `Frontend version ${p.frontendVersion} is outdated. Backend requires ${p.requiredVersion} or higher.`
       }
       if (key === 'g.frontendNewer' && params) {
-        return `Frontend version ${params.frontendVersion} may not be compatible with backend version ${params.backendVersion}.`
+        const p = params as Record<string, string>
+        return `Frontend version ${p.frontendVersion} may not be compatible with backend version ${p.backendVersion}.`
       }
       return key
     }
@@ -66,8 +68,8 @@ vi.mock('vue-i18n', () => ({
 
 // Mock lifecycle hooks to track their calls
 const mockOnMounted = vi.fn()
-vi.mock('vue', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('vue')>()
+vi.mock('vue', async () => {
+  const actual = await vi.importActual('vue')
   return {
     ...actual,
     onMounted: (fn: () => void) => {
diff --git a/src/platform/updates/common/useFrontendVersionMismatchWarning.ts b/src/platform/updates/common/useFrontendVersionMismatchWarning.ts
index adb1bd7026..4505936d1a 100644
--- a/src/platform/updates/common/useFrontendVersionMismatchWarning.ts
+++ b/src/platform/updates/common/useFrontendVersionMismatchWarning.ts
@@ -1,5 +1,5 @@
 import { whenever } from '@vueuse/core'
-import { computed, onMounted } from 'vue'
+import { computed, nextTick, onMounted } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import { useToastStore } from './toastStore'
@@ -65,9 +65,12 @@ export function useFrontendVersionMismatchWarning(
     versionCompatibilityStore.dismissWarning()
   }
 
-  onMounted(() => {
+  onMounted(async () => {
     // Only set up the watcher if immediate is true
     if (immediate) {
+      // Wait for next tick to ensure reactive updates from settings load have propagated
+      await nextTick()
+
       whenever(
         () => versionCompatibilityStore.shouldShowWarning,
         () => {
diff --git a/tests-ui/tests/store/versionCompatibilityStore.test.ts b/src/platform/updates/common/versionCompatibilityStore.test.ts
similarity index 89%
rename from tests-ui/tests/store/versionCompatibilityStore.test.ts
rename to src/platform/updates/common/versionCompatibilityStore.test.ts
index d6e9c15af0..06ba4aea82 100644
--- a/tests-ui/tests/store/versionCompatibilityStore.test.ts
+++ b/src/platform/updates/common/versionCompatibilityStore.test.ts
@@ -1,10 +1,10 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { until } from '@vueuse/core'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { ref } from 'vue'
 
 import { useVersionCompatibilityStore } from '@/platform/updates/common/versionCompatibilityStore'
-import { useSettingStore } from '@/platform/settings/settingStore'
-import { useSystemStatsStore } from '@/stores/systemStatsStore'
 
 vi.mock('@/config', () => ({
   default: {
@@ -12,13 +12,14 @@ vi.mock('@/config', () => ({
   }
 }))
 
-vi.mock('@/stores/systemStatsStore')
+const mockUseSystemStatsStore = vi.hoisted(() => vi.fn())
+vi.mock('@/stores/systemStatsStore', () => ({
+  useSystemStatsStore: mockUseSystemStatsStore
+}))
 
-// Mock settingStore
+const mockUseSettingStore = vi.hoisted(() => vi.fn())
 vi.mock('@/platform/settings/settingStore', () => ({
-  useSettingStore: vi.fn(() => ({
-    get: vi.fn(() => false) // Default to warnings enabled (false = not disabled)
-  }))
+  useSettingStore: mockUseSettingStore
 }))
 
 // Mock useStorage and until from VueUse
@@ -28,13 +29,19 @@ vi.mock('@vueuse/core', () => ({
   until: vi.fn(() => Promise.resolve())
 }))
 
+type MockSystemStatsStore = {
+  systemStats: unknown
+  isInitialized: boolean
+  refetchSystemStats: ReturnType<typeof vi.fn>
+}
+
 describe('useVersionCompatibilityStore', () => {
   let store: ReturnType<typeof useVersionCompatibilityStore>
-  let mockSystemStatsStore: any
-  let mockSettingStore: any
+  let mockSystemStatsStore: MockSystemStatsStore
+  let mockSettingStore: { get: ReturnType<typeof vi.fn> }
 
   beforeEach(() => {
-    setActivePinia(createPinia())
+    setActivePinia(createTestingPinia({ stubActions: false }))
 
     // Clear the mock dismissal storage
     mockDismissalStorage.value = {}
@@ -49,8 +56,8 @@ describe('useVersionCompatibilityStore', () => {
       get: vi.fn(() => false) // Default to warnings enabled
     }
 
-    vi.mocked(useSystemStatsStore).mockReturnValue(mockSystemStatsStore)
-    vi.mocked(useSettingStore).mockReturnValue(mockSettingStore)
+    mockUseSystemStatsStore.mockReturnValue(mockSystemStatsStore)
+    mockUseSettingStore.mockReturnValue(mockSettingStore)
 
     store = useVersionCompatibilityStore()
   })
@@ -213,7 +220,9 @@ describe('useVersionCompatibilityStore', () => {
 
     it('should not show warning when disabled via setting', async () => {
       // Enable the disable setting
-      mockSettingStore.get.mockReturnValue(true)
+      ;(
+        mockSettingStore as { get: ReturnType<typeof vi.fn> }
+      ).get.mockReturnValue(true)
 
       // Set up version mismatch that would normally show warning
       mockSystemStatsStore.systemStats = {
@@ -227,9 +236,9 @@ describe('useVersionCompatibilityStore', () => {
       await store.checkVersionCompatibility()
 
       expect(store.shouldShowWarning).toBe(false)
-      expect(mockSettingStore.get).toHaveBeenCalledWith(
-        'Comfy.VersionCompatibility.DisableWarnings'
-      )
+      expect(
+        (mockSettingStore as { get: ReturnType<typeof vi.fn> }).get
+      ).toHaveBeenCalledWith('Comfy.VersionCompatibility.DisableWarnings')
     })
   })
 
@@ -350,17 +359,15 @@ describe('useVersionCompatibilityStore', () => {
 
   describe('initialization', () => {
     it('should fetch system stats if not available', async () => {
-      const { until } = await import('@vueuse/core')
       mockSystemStatsStore.systemStats = null
       mockSystemStatsStore.isInitialized = false
 
       await store.initialize()
 
-      expect(until).toHaveBeenCalled()
+      expect(vi.mocked(until)).toHaveBeenCalled()
     })
 
     it('should not fetch system stats if already available', async () => {
-      const { until } = await import('@vueuse/core')
       mockSystemStatsStore.systemStats = {
         system: {
           comfyui_version: '1.24.0',
@@ -371,7 +378,7 @@ describe('useVersionCompatibilityStore', () => {
 
       await store.initialize()
 
-      expect(until).not.toHaveBeenCalled()
+      expect(vi.mocked(until)).not.toHaveBeenCalled()
     })
   })
 })
diff --git a/src/platform/updates/common/versionCompatibilityStore.ts b/src/platform/updates/common/versionCompatibilityStore.ts
index f59cbc2799..a1ca0f3d0e 100644
--- a/src/platform/updates/common/versionCompatibilityStore.ts
+++ b/src/platform/updates/common/versionCompatibilityStore.ts
@@ -88,11 +88,16 @@ export const useVersionCompatibilityStore = defineStore(
       return Date.now() < dismissedUntil
     })
 
+    const warningsDisabled = computed(() =>
+      settingStore.get('Comfy.VersionCompatibility.DisableWarnings')
+    )
+
     const shouldShowWarning = computed(() => {
-      const warningsDisabled = settingStore.get(
-        'Comfy.VersionCompatibility.DisableWarnings'
+      return (
+        hasVersionMismatch.value &&
+        !isDismissed.value &&
+        !warningsDisabled.value
       )
-      return hasVersionMismatch.value && !isDismissed.value && !warningsDisabled
     })
 
     const warningMessage = computed(() => {
diff --git a/src/platform/updates/components/ReleaseNotificationToast.test.ts b/src/platform/updates/components/ReleaseNotificationToast.test.ts
index 76a5509da7..0cf29e3aac 100644
--- a/src/platform/updates/components/ReleaseNotificationToast.test.ts
+++ b/src/platform/updates/components/ReleaseNotificationToast.test.ts
@@ -5,6 +5,8 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type { ReleaseNote } from '../common/releaseService'
 import ReleaseNotificationToast from './ReleaseNotificationToast.vue'
 
+const mockData = vi.hoisted(() => ({ isDesktop: false }))
+
 const { commandExecuteMock } = vi.hoisted(() => ({
   commandExecuteMock: vi.fn()
 }))
@@ -13,6 +15,14 @@ const { toastErrorHandlerMock } = vi.hoisted(() => ({
   toastErrorHandlerMock: vi.fn()
 }))
 
+vi.mock('@/platform/distribution/types', () => ({
+  isCloud: false,
+  isNightly: false,
+  get isDesktop() {
+    return mockData.isDesktop
+  }
+}))
+
 // Mock dependencies
 vi.mock('vue-i18n', () => ({
   useI18n: vi.fn(() => ({
@@ -101,6 +111,7 @@ describe('ReleaseNotificationToast', () => {
 
   beforeEach(() => {
     vi.clearAllMocks()
+    mockData.isDesktop = false
     // Reset store state
     mockReleaseStore.recentRelease = null
     mockReleaseStore.shouldShowToast = true // Force show for testing
@@ -179,7 +190,8 @@ describe('ReleaseNotificationToast', () => {
     )
   })
 
-  it('executes desktop updater flow when running in Electron', async () => {
+  it('executes desktop updater flow when running on desktop', async () => {
+    mockData.isDesktop = true
     mockReleaseStore.recentRelease = {
       version: '1.2.3',
       content: '# Test Release'
@@ -192,7 +204,6 @@ describe('ReleaseNotificationToast', () => {
       value: mockWindowOpen,
       writable: true
     })
-    ;(window as any).electronAPI = {}
 
     wrapper = mountComponent()
     await wrapper.vm.handleUpdate()
@@ -202,11 +213,10 @@ describe('ReleaseNotificationToast', () => {
     )
     expect(mockWindowOpen).not.toHaveBeenCalled()
     expect(toastErrorHandlerMock).not.toHaveBeenCalled()
-
-    delete (window as any).electronAPI
   })
 
-  it('shows an error toast if the desktop updater flow fails in Electron', async () => {
+  it('shows an error toast if the desktop updater flow fails on desktop', async () => {
+    mockData.isDesktop = true
     mockReleaseStore.recentRelease = {
       version: '1.2.3',
       content: '# Test Release'
@@ -220,15 +230,12 @@ describe('ReleaseNotificationToast', () => {
       value: mockWindowOpen,
       writable: true
     })
-    ;(window as any).electronAPI = {}
 
     wrapper = mountComponent()
     await wrapper.vm.handleUpdate()
 
     expect(toastErrorHandlerMock).toHaveBeenCalledWith(error)
     expect(mockWindowOpen).not.toHaveBeenCalled()
-
-    delete (window as any).electronAPI
   })
 
   it('calls handleShowChangelog when learn more link is clicked', async () => {
diff --git a/src/platform/updates/components/ReleaseNotificationToast.vue b/src/platform/updates/components/ReleaseNotificationToast.vue
index 90419f4a1f..ff1cad8de4 100644
--- a/src/platform/updates/components/ReleaseNotificationToast.vue
+++ b/src/platform/updates/components/ReleaseNotificationToast.vue
@@ -1,25 +1,25 @@
 <template>
   <div v-if="shouldShow" class="release-toast-popup">
     <div
-      class="w-96 max-h-96 bg-base-background border border-border-default rounded-lg shadow-[1px_1px_8px_0_rgba(0,0,0,0.4)] flex flex-col"
+      class="flex max-h-96 w-96 flex-col rounded-lg border border-border-default bg-base-background shadow-[1px_1px_8px_0_rgba(0,0,0,0.4)]"
     >
       <!-- Main content -->
-      <div class="p-4 flex flex-col gap-4 flex-1 min-h-0">
+      <div class="flex min-h-0 flex-1 flex-col gap-4 p-4">
         <!-- Header section with icon and text -->
         <div class="flex items-center gap-4">
           <div
-            class="p-3 bg-primary-background-hover rounded-lg flex items-center justify-center shrink-0"
+            class="flex shrink-0 items-center justify-center rounded-lg bg-primary-background-hover p-3"
           >
-            <i class="icon-[lucide--rocket] w-4 h-4 text-white" />
+            <i class="icon-[lucide--rocket] size-4 text-white" />
           </div>
           <div class="flex flex-col gap-1">
             <div
-              class="text-sm font-normal text-base-foreground leading-[1.429]"
+              class="text-sm leading-[1.429] font-normal text-base-foreground"
             >
               {{ $t('releaseToast.newVersionAvailable') }}
             </div>
             <div
-              class="text-sm font-normal text-muted-foreground leading-[1.21]"
+              class="text-sm leading-[1.21] font-normal text-muted-foreground"
             >
               {{ latestRelease?.version }}
             </div>
@@ -28,32 +28,32 @@
 
         <!-- Description section -->
         <div
-          class="pl-14 text-sm font-normal text-muted-foreground leading-[1.21] overflow-y-auto flex-1 min-h-0"
+          class="min-h-0 flex-1 overflow-y-auto pl-14 text-sm leading-[1.21] font-normal text-muted-foreground"
           v-html="formattedContent"
         ></div>
       </div>
 
       <!-- Footer section -->
-      <div class="flex justify-between items-center px-4 pb-4">
+      <div class="flex items-center justify-between px-4 pb-4">
         <a
-          class="flex items-center gap-2 text-sm font-normal py-1 text-muted-foreground hover:text-base-foreground"
+          class="flex items-center gap-2 py-1 text-sm font-normal text-muted-foreground hover:text-base-foreground"
           :href="changelogUrl"
           target="_blank"
           rel="noopener noreferrer"
           @click="handleLearnMore"
         >
-          <i class="icon-[lucide--external-link] w-4 h-4"></i>
+          <i class="icon-[lucide--external-link] size-4"></i>
           {{ $t('releaseToast.whatsNew') }}
         </a>
         <div class="flex items-center gap-4">
           <button
-            class="h-6 px-0 bg-transparent border-none text-sm font-normal text-muted-foreground hover:text-base-foreground cursor-pointer"
+            class="h-6 cursor-pointer border-none bg-transparent px-0 text-sm font-normal text-muted-foreground hover:text-base-foreground"
             @click="handleSkip"
           >
             {{ $t('releaseToast.skip') }}
           </button>
           <button
-            class="h-10 px-4 bg-secondary-background hover:bg-secondary-background-hover rounded-lg border-none text-sm font-normal text-base-foreground cursor-pointer"
+            class="h-10 cursor-pointer rounded-lg border-none bg-secondary-background px-4 text-sm font-normal text-base-foreground hover:bg-secondary-background-hover"
             @click="handleUpdate"
           >
             {{ $t('releaseToast.update') }}
@@ -72,7 +72,7 @@ import { useI18n } from 'vue-i18n'
 import { useErrorHandling } from '@/composables/useErrorHandling'
 import { useExternalLink } from '@/composables/useExternalLink'
 import { useCommandStore } from '@/stores/commandStore'
-import { isElectron } from '@/utils/envUtil'
+import { isDesktop } from '@/platform/distribution/types'
 import { formatVersionAnchor } from '@/utils/formatUtil'
 import { renderMarkdownToHtml } from '@/utils/markdownRendererUtil'
 
@@ -177,7 +177,7 @@ const handleLearnMore = () => {
 }
 
 const handleUpdate = async () => {
-  if (isElectron()) {
+  if (isDesktop) {
     try {
       await useCommandStore().execute('Comfy-Desktop.CheckForUpdates')
       dismissToast()
diff --git a/src/platform/updates/components/WhatsNewPopup.test.ts b/src/platform/updates/components/WhatsNewPopup.test.ts
index f40399730f..41a0008eb6 100644
--- a/src/platform/updates/components/WhatsNewPopup.test.ts
+++ b/src/platform/updates/components/WhatsNewPopup.test.ts
@@ -165,7 +165,9 @@ describe('WhatsNewPopup', () => {
     wrapper = mountComponent()
 
     // Call the close method directly instead of triggering DOM event
-    await (wrapper.vm as any).closePopup()
+    await (
+      wrapper.vm as typeof wrapper.vm & { closePopup: () => Promise<void> }
+    ).closePopup()
 
     expect(wrapper.emitted('whats-new-dismissed')).toBeTruthy()
   })
diff --git a/src/platform/updates/components/WhatsNewPopup.vue b/src/platform/updates/components/WhatsNewPopup.vue
index 511d053c2f..d5fae81122 100644
--- a/src/platform/updates/components/WhatsNewPopup.vue
+++ b/src/platform/updates/components/WhatsNewPopup.vue
@@ -3,7 +3,7 @@
     <div class="whats-new-popup" @click.stop>
       <!-- Close Button -->
       <Button
-        class="close-button absolute top-2 right-2 z-10 w-8 h-8 p-2 rounded-lg opacity-50"
+        class="close-button absolute top-2 right-2 z-10 size-8 rounded-lg p-2 opacity-50"
         :aria-label="$t('g.close')"
         size="icon-sm"
         variant="muted-textonly"
@@ -13,7 +13,7 @@
       </Button>
 
       <!-- Modal Body -->
-      <div class="modal-body flex flex-col gap-4 px-0 pt-0 pb-2 flex-1">
+      <div class="modal-body flex flex-1 flex-col gap-4 px-0 pt-0 pb-2">
         <!-- Release Content -->
         <div
           class="content-text max-h-96 overflow-y-auto"
@@ -23,10 +23,10 @@
 
       <!-- Modal Footer -->
       <div
-        class="modal-footer flex justify-between items-center gap-4 px-4 pb-4"
+        class="modal-footer flex items-center justify-between gap-4 px-4 pb-4"
       >
         <a
-          class="learn-more-link flex items-center gap-2 text-sm font-normal py-1"
+          class="learn-more-link flex items-center gap-2 py-1 text-sm font-normal"
           :href="changelogUrl"
           target="_blank"
           rel="noopener noreferrer"
diff --git a/src/platform/workflow/cloud/getWorkflowFromHistory.test.ts b/src/platform/workflow/cloud/getWorkflowFromHistory.test.ts
new file mode 100644
index 0000000000..8ed1c15c4a
--- /dev/null
+++ b/src/platform/workflow/cloud/getWorkflowFromHistory.test.ts
@@ -0,0 +1,127 @@
+import { describe, expect, it, vi } from 'vitest'
+
+import type { JobDetail } from '@/platform/remote/comfyui/jobs/jobTypes'
+import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
+import {
+  extractWorkflow,
+  fetchJobDetail
+} from '@/platform/remote/comfyui/jobs/fetchJobs'
+
+const mockWorkflow: ComfyWorkflowJSON = {
+  last_node_id: 5,
+  last_link_id: 3,
+  nodes: [],
+  links: [],
+  groups: [],
+  config: {},
+  extra: {},
+  version: 0.4
+}
+
+// Jobs API detail response structure (matches actual /jobs/{id} response)
+// workflow is nested at: workflow.extra_data.extra_pnginfo.workflow
+const mockJobDetailResponse: JobDetail = {
+  id: 'test-job-id',
+  status: 'completed',
+  create_time: 1234567890,
+  update_time: 1234567900,
+  workflow: {
+    extra_data: {
+      extra_pnginfo: {
+        workflow: mockWorkflow
+      }
+    }
+  },
+  outputs: {
+    '20': {
+      images: [
+        { filename: 'test.png', subfolder: '', type: 'output' },
+        { filename: 'test2.png', subfolder: '', type: 'output' }
+      ]
+    }
+  }
+}
+
+describe('fetchJobDetail', () => {
+  it('should fetch job detail from /jobs/{job_id} endpoint', async () => {
+    const mockFetchApi = vi.fn().mockResolvedValue({
+      ok: true,
+      json: async () => mockJobDetailResponse
+    })
+
+    await fetchJobDetail(mockFetchApi, 'test-job-id')
+
+    expect(mockFetchApi).toHaveBeenCalledWith('/jobs/test-job-id')
+  })
+
+  it('should return job detail with workflow and outputs', async () => {
+    const mockFetchApi = vi.fn().mockResolvedValue({
+      ok: true,
+      json: async () => mockJobDetailResponse
+    })
+
+    const result = await fetchJobDetail(mockFetchApi, 'test-job-id')
+
+    expect(result).toBeDefined()
+    expect(result?.id).toBe('test-job-id')
+    expect(result?.outputs).toEqual(mockJobDetailResponse.outputs)
+    expect(result?.workflow).toBeDefined()
+  })
+
+  it('should return undefined when job not found (non-OK response)', async () => {
+    const mockFetchApi = vi.fn().mockResolvedValue({
+      ok: false,
+      status: 404
+    })
+
+    const result = await fetchJobDetail(mockFetchApi, 'nonexistent-id')
+
+    expect(result).toBeUndefined()
+  })
+
+  it('should handle fetch errors gracefully', async () => {
+    const mockFetchApi = vi.fn().mockRejectedValue(new Error('Network error'))
+
+    const result = await fetchJobDetail(mockFetchApi, 'test-job-id')
+
+    expect(result).toBeUndefined()
+  })
+
+  it('should handle malformed JSON responses', async () => {
+    const mockFetchApi = vi.fn().mockResolvedValue({
+      ok: true,
+      json: async () => {
+        throw new Error('Invalid JSON')
+      }
+    })
+
+    const result = await fetchJobDetail(mockFetchApi, 'test-job-id')
+
+    expect(result).toBeUndefined()
+  })
+})
+
+describe('extractWorkflow', () => {
+  it('should extract workflow from job detail', async () => {
+    const result = await extractWorkflow(mockJobDetailResponse)
+
+    expect(result).toEqual(mockWorkflow)
+  })
+
+  it('should return undefined when job is undefined', async () => {
+    const result = await extractWorkflow(undefined)
+
+    expect(result).toBeUndefined()
+  })
+
+  it('should return undefined when workflow is missing', async () => {
+    const jobWithoutWorkflow: JobDetail = {
+      ...mockJobDetailResponse,
+      workflow: {}
+    }
+
+    const result = await extractWorkflow(jobWithoutWorkflow)
+
+    expect(result).toBeUndefined()
+  })
+})
diff --git a/src/platform/workflow/cloud/getWorkflowFromHistory.ts b/src/platform/workflow/cloud/getWorkflowFromHistory.ts
deleted file mode 100644
index 8c9027e308..0000000000
--- a/src/platform/workflow/cloud/getWorkflowFromHistory.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
-import type { PromptId } from '@/schemas/apiSchema'
-
-export async function getWorkflowFromHistory(
-  fetchApi: (url: string) => Promise<Response>,
-  promptId: PromptId
-): Promise<ComfyWorkflowJSON | undefined> {
-  try {
-    const res = await fetchApi(`/history_v2/${promptId}`)
-    const json = await res.json()
-
-    const historyItem = json[promptId]
-    if (!historyItem) return undefined
-
-    const workflow = historyItem.prompt?.extra_data?.extra_pnginfo?.workflow
-    return workflow ?? undefined
-  } catch (error) {
-    console.error(`Failed to fetch workflow for prompt ${promptId}:`, error)
-    return undefined
-  }
-}
diff --git a/src/platform/workflow/cloud/index.ts b/src/platform/workflow/cloud/index.ts
deleted file mode 100644
index 1f54224027..0000000000
--- a/src/platform/workflow/cloud/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Cloud: Fetches workflow by prompt_id. Desktop: Returns undefined (workflows already in history).
- */
-import { isCloud } from '@/platform/distribution/types'
-
-import { getWorkflowFromHistory as cloudImpl } from './getWorkflowFromHistory'
-
-export const getWorkflowFromHistory = isCloud
-  ? cloudImpl
-  : async () => undefined
diff --git a/src/platform/workflow/core/services/workflowActionsService.ts b/src/platform/workflow/core/services/workflowActionsService.ts
index 0bc9c999d2..ffff13fb76 100644
--- a/src/platform/workflow/core/services/workflowActionsService.ts
+++ b/src/platform/workflow/core/services/workflowActionsService.ts
@@ -55,7 +55,7 @@ export function useWorkflowActionsService() {
       if (settingStore.get('Comfy.PromptFilename')) {
         const input = await dialogService.prompt({
           title: t('workflowService.exportWorkflow'),
-          message: t('workflowService.enterFilename') + ':',
+          message: t('workflowService.enterFilenamePrompt'),
           defaultValue: filename
         })
         // User cancelled the prompt
diff --git a/src/platform/workflow/core/services/workflowService.test.ts b/src/platform/workflow/core/services/workflowService.test.ts
new file mode 100644
index 0000000000..9a9df0cb3a
--- /dev/null
+++ b/src/platform/workflow/core/services/workflowService.test.ts
@@ -0,0 +1,884 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type {
+  LoadedComfyWorkflow,
+  PendingWarnings
+} from '@/platform/workflow/management/stores/comfyWorkflow'
+import { ComfyWorkflow as ComfyWorkflowClass } from '@/platform/workflow/management/stores/comfyWorkflow'
+import { useSettingStore } from '@/platform/settings/settingStore'
+import { useToastStore } from '@/platform/updates/common/toastStore'
+import type { ComfyWorkflow } from '@/platform/workflow/management/stores/workflowStore'
+import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
+import { useWorkflowService } from '@/platform/workflow/core/services/workflowService'
+import { app } from '@/scripts/app'
+import { useAppMode } from '@/composables/useAppMode'
+import type { AppMode } from '@/composables/useAppMode'
+import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
+import { createMockChangeTracker } from '@/utils/__tests__/litegraphTestUtils'
+
+function createModeTestWorkflow(
+  options: {
+    path?: string
+    initialMode?: AppMode | null
+    activeMode?: AppMode | null
+    loaded?: boolean
+  } = {}
+): LoadedComfyWorkflow {
+  const workflow = new ComfyWorkflowClass({
+    path: options.path ?? 'workflows/test.json',
+    modified: Date.now(),
+    size: 100
+  })
+  if ('initialMode' in options) workflow.initialMode = options.initialMode
+  workflow.activeMode = options.activeMode ?? null
+  if (options.loaded !== false) {
+    workflow.changeTracker = createMockChangeTracker()
+    workflow.content = '{}'
+    workflow.originalContent = '{}'
+  }
+  return workflow as LoadedComfyWorkflow
+}
+
+function makeWorkflowData(
+  extra: Record<string, unknown> = {}
+): ComfyWorkflowJSON {
+  return {
+    last_node_id: 5,
+    last_link_id: 3,
+    nodes: [],
+    links: [],
+    groups: [],
+    config: {},
+    version: 0.4,
+    extra
+  }
+}
+
+const { mockShowMissingNodes, mockShowMissingModels, mockConfirm } = vi.hoisted(
+  () => ({
+    mockShowMissingNodes: vi.fn(),
+    mockShowMissingModels: vi.fn(),
+    mockConfirm: vi.fn()
+  })
+)
+
+vi.mock('@/composables/useMissingNodesDialog', () => ({
+  useMissingNodesDialog: () => ({ show: mockShowMissingNodes, hide: vi.fn() })
+}))
+
+vi.mock('@/composables/useMissingModelsDialog', () => ({
+  useMissingModelsDialog: () => ({ show: mockShowMissingModels, hide: vi.fn() })
+}))
+
+vi.mock('@/services/dialogService', () => ({
+  useDialogService: () => ({
+    prompt: vi.fn(),
+    confirm: mockConfirm
+  })
+}))
+
+vi.mock('@/scripts/app', () => ({
+  app: {
+    canvas: { ds: { offset: [0, 0], scale: 1 } },
+    rootGraph: { serialize: vi.fn(() => ({})) },
+    loadGraphData: vi.fn()
+  }
+}))
+
+vi.mock('@/scripts/defaultGraph', () => ({
+  defaultGraph: {},
+  blankGraph: {}
+}))
+
+vi.mock('@/renderer/core/canvas/canvasStore', () => ({
+  useCanvasStore: () => ({ linearMode: false })
+}))
+
+vi.mock('@/renderer/core/thumbnail/useWorkflowThumbnail', () => ({
+  useWorkflowThumbnail: () => ({
+    storeThumbnail: vi.fn(),
+    getThumbnail: vi.fn()
+  })
+}))
+
+vi.mock('@/platform/telemetry', () => ({
+  useTelemetry: () => null
+}))
+
+vi.mock('@/platform/workflow/persistence/stores/workflowDraftStore', () => ({
+  useWorkflowDraftStore: () => ({
+    saveDraft: vi.fn(),
+    getDraft: vi.fn(),
+    removeDraft: vi.fn(),
+    markDraftUsed: vi.fn()
+  })
+}))
+
+vi.mock('@/stores/domWidgetStore', () => ({
+  useDomWidgetStore: () => ({
+    clear: vi.fn()
+  })
+}))
+
+vi.mock('@/stores/workspaceStore', () => ({
+  useWorkspaceStore: () => ({
+    get workflow() {
+      return useWorkflowStore()
+    }
+  })
+}))
+
+const MISSING_MODELS: PendingWarnings['missingModels'] = {
+  missingModels: [
+    { name: 'model.safetensors', url: '', directory: 'checkpoints' }
+  ],
+  paths: { checkpoints: ['/models/checkpoints'] }
+}
+
+function createWorkflow(
+  warnings: PendingWarnings | null = null,
+  options: { loadable?: boolean; path?: string } = {}
+): ComfyWorkflow {
+  const wf = {
+    pendingWarnings: warnings,
+    ...(options.loadable && {
+      path: options.path ?? 'workflows/test.json',
+      isLoaded: true,
+      activeState: { nodes: [], links: [] },
+      changeTracker: { reset: vi.fn(), restore: vi.fn() }
+    })
+  } as Partial<ComfyWorkflow>
+  return wf as ComfyWorkflow
+}
+
+function enableWarningSettings() {
+  vi.spyOn(useSettingStore(), 'get').mockImplementation(
+    (key: string): boolean => {
+      if (key === 'Comfy.Workflow.ShowMissingNodesWarning') return true
+      if (key === 'Comfy.Workflow.ShowMissingModelsWarning') return true
+      return false
+    }
+  )
+}
+
+describe('useWorkflowService', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    vi.clearAllMocks()
+  })
+
+  describe('showPendingWarnings', () => {
+    beforeEach(() => {
+      enableWarningSettings()
+    })
+
+    it('should do nothing when workflow has no pending warnings', () => {
+      const workflow = createWorkflow(null)
+      useWorkflowService().showPendingWarnings(workflow)
+
+      expect(mockShowMissingNodes).not.toHaveBeenCalled()
+      expect(mockShowMissingModels).not.toHaveBeenCalled()
+    })
+
+    it('should show missing nodes dialog and clear warnings', () => {
+      const missingNodeTypes = ['CustomNode1', 'CustomNode2']
+      const workflow = createWorkflow({ missingNodeTypes })
+
+      useWorkflowService().showPendingWarnings(workflow)
+
+      expect(mockShowMissingNodes).toHaveBeenCalledWith({
+        missingNodeTypes
+      })
+      expect(workflow.pendingWarnings).toBeNull()
+    })
+
+    it('should show missing models dialog and clear warnings', () => {
+      const workflow = createWorkflow({ missingModels: MISSING_MODELS })
+
+      useWorkflowService().showPendingWarnings(workflow)
+
+      expect(mockShowMissingModels).toHaveBeenCalledWith(MISSING_MODELS)
+      expect(workflow.pendingWarnings).toBeNull()
+    })
+
+    it('should not show dialogs when settings are disabled', () => {
+      vi.spyOn(useSettingStore(), 'get').mockReturnValue(false)
+
+      const workflow = createWorkflow({
+        missingNodeTypes: ['CustomNode1'],
+        missingModels: MISSING_MODELS
+      })
+
+      useWorkflowService().showPendingWarnings(workflow)
+
+      expect(mockShowMissingNodes).not.toHaveBeenCalled()
+      expect(mockShowMissingModels).not.toHaveBeenCalled()
+      expect(workflow.pendingWarnings).toBeNull()
+    })
+
+    it('should only show warnings once across multiple calls', () => {
+      const workflow = createWorkflow({
+        missingNodeTypes: ['CustomNode1']
+      })
+
+      const service = useWorkflowService()
+      service.showPendingWarnings(workflow)
+      service.showPendingWarnings(workflow)
+
+      expect(mockShowMissingNodes).toHaveBeenCalledTimes(1)
+    })
+  })
+
+  describe('openWorkflow deferred warnings', () => {
+    let workflowStore: ReturnType<typeof useWorkflowStore>
+
+    beforeEach(() => {
+      enableWarningSettings()
+      workflowStore = useWorkflowStore()
+      vi.mocked(app.loadGraphData).mockImplementation(
+        async (_data, _clean, _restore, wf) => {
+          workflowStore.activeWorkflow = wf as LoadedComfyWorkflow
+        }
+      )
+    })
+
+    it('should defer warnings during load and show on focus', async () => {
+      const workflow = createWorkflow(
+        { missingNodeTypes: ['CustomNode1'] },
+        { loadable: true }
+      )
+
+      expect(mockShowMissingNodes).not.toHaveBeenCalled()
+
+      await useWorkflowService().openWorkflow(workflow)
+
+      expect(app.loadGraphData).toHaveBeenCalledWith(
+        expect.anything(),
+        true,
+        true,
+        workflow,
+        expect.objectContaining({ deferWarnings: true })
+      )
+      expect(mockShowMissingNodes).toHaveBeenCalledWith({
+        missingNodeTypes: ['CustomNode1']
+      })
+      expect(workflow.pendingWarnings).toBeNull()
+    })
+
+    it('should show each workflow warnings only when that tab is focused', async () => {
+      const workflow1 = createWorkflow(
+        { missingNodeTypes: ['MissingNodeA'] },
+        { loadable: true, path: 'workflows/first.json' }
+      )
+      const workflow2 = createWorkflow(
+        { missingNodeTypes: ['MissingNodeB'] },
+        { loadable: true, path: 'workflows/second.json' }
+      )
+
+      const service = useWorkflowService()
+
+      await service.openWorkflow(workflow1)
+      expect(mockShowMissingNodes).toHaveBeenCalledTimes(1)
+      expect(mockShowMissingNodes).toHaveBeenCalledWith({
+        missingNodeTypes: ['MissingNodeA']
+      })
+      expect(workflow1.pendingWarnings).toBeNull()
+      expect(workflow2.pendingWarnings).not.toBeNull()
+
+      await service.openWorkflow(workflow2)
+      expect(mockShowMissingNodes).toHaveBeenCalledTimes(2)
+      expect(mockShowMissingNodes).toHaveBeenLastCalledWith({
+        missingNodeTypes: ['MissingNodeB']
+      })
+      expect(workflow2.pendingWarnings).toBeNull()
+    })
+
+    it('should not show warnings when refocusing a cleared tab', async () => {
+      const workflow = createWorkflow(
+        { missingNodeTypes: ['CustomNode1'] },
+        { loadable: true }
+      )
+
+      const service = useWorkflowService()
+
+      await service.openWorkflow(workflow, { force: true })
+      expect(mockShowMissingNodes).toHaveBeenCalledTimes(1)
+
+      await service.openWorkflow(workflow, { force: true })
+      expect(mockShowMissingNodes).toHaveBeenCalledTimes(1)
+    })
+  })
+
+  describe('saveWorkflow', () => {
+    let workflowStore: ReturnType<typeof useWorkflowStore>
+
+    beforeEach(() => {
+      setActivePinia(createTestingPinia())
+      workflowStore = useWorkflowStore()
+    })
+
+    it('should delegate to workflowStore.saveWorkflow for persisted workflows', async () => {
+      const workflow = createModeTestWorkflow({
+        path: 'workflows/persisted.json'
+      })
+      vi.mocked(workflowStore.saveWorkflow).mockResolvedValue()
+
+      await useWorkflowService().saveWorkflow(workflow)
+
+      expect(workflowStore.saveWorkflow).toHaveBeenCalledWith(workflow)
+    })
+
+    it('should call saveWorkflowAs for temporary workflows', 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)
+
+      expect(workflowStore.saveWorkflow).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('saveWorkflowAs', () => {
+    let workflowStore: ReturnType<typeof useWorkflowStore>
+
+    beforeEach(() => {
+      setActivePinia(createTestingPinia())
+      workflowStore = useWorkflowStore()
+    })
+
+    it('should rename then save when workflow is temporary', async () => {
+      const workflow = createModeTestWorkflow({
+        path: 'workflows/Unsaved Workflow.json'
+      })
+      Object.defineProperty(workflow, 'isTemporary', { get: () => true })
+      vi.mocked(workflowStore.getWorkflowByPath).mockReturnValue(null)
+      vi.mocked(workflowStore.renameWorkflow).mockResolvedValue()
+      vi.mocked(workflowStore.saveWorkflow).mockResolvedValue()
+
+      const result = await useWorkflowService().saveWorkflowAs(workflow, {
+        filename: 'my-workflow'
+      })
+
+      expect(result).toBe(true)
+      expect(workflowStore.renameWorkflow).toHaveBeenCalledWith(
+        workflow,
+        'workflows/my-workflow.json'
+      )
+      expect(workflowStore.saveWorkflow).toHaveBeenCalledWith(workflow)
+    })
+
+    it('should return false when no filename is provided', async () => {
+      const workflow = createModeTestWorkflow({
+        path: 'workflows/test.json'
+      })
+      vi.spyOn(workflow, 'promptSave').mockResolvedValue(null)
+
+      const result = await useWorkflowService().saveWorkflowAs(workflow)
+
+      expect(result).toBe(false)
+      expect(workflowStore.saveWorkflow).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('afterLoadNewGraph', () => {
+    let workflowStore: ReturnType<typeof useWorkflowStore>
+    let existingWorkflow: LoadedComfyWorkflow
+
+    beforeEach(() => {
+      setActivePinia(createTestingPinia())
+      workflowStore = useWorkflowStore()
+      existingWorkflow = createModeTestWorkflow({
+        path: 'workflows/repeat.json'
+      })
+      vi.mocked(workflowStore.getWorkflowByPath).mockReturnValue(
+        existingWorkflow
+      )
+      vi.mocked(workflowStore.isActive).mockReturnValue(true)
+      vi.mocked(workflowStore.openWorkflow).mockResolvedValue(existingWorkflow)
+    })
+
+    it('should reuse the active workflow when loading the same path repeatedly', async () => {
+      const workflowId = 'repeat-workflow-id'
+      existingWorkflow.changeTracker.activeState.id = workflowId
+
+      await useWorkflowService().afterLoadNewGraph('repeat', {
+        id: workflowId,
+        nodes: [{ id: 1, type: 'TestNode', pos: [0, 0], size: [100, 100] }]
+      } as never)
+
+      expect(workflowStore.getWorkflowByPath).toHaveBeenCalledWith(
+        'workflows/repeat.json'
+      )
+      expect(workflowStore.openWorkflow).toHaveBeenCalledWith(existingWorkflow)
+      expect(existingWorkflow.changeTracker.reset).toHaveBeenCalled()
+      expect(existingWorkflow.changeTracker.restore).toHaveBeenCalled()
+      expect(workflowStore.createNewTemporary).not.toHaveBeenCalled()
+    })
+
+    it('should reuse active workflow for repeated same-path loads without ids', async () => {
+      await useWorkflowService().afterLoadNewGraph('repeat', {
+        nodes: [{ id: 1, type: 'TestNode', pos: [0, 0], size: [100, 100] }]
+      } as never)
+
+      expect(workflowStore.getWorkflowByPath).toHaveBeenCalledWith(
+        'workflows/repeat.json'
+      )
+      expect(workflowStore.openWorkflow).toHaveBeenCalledWith(existingWorkflow)
+      expect(existingWorkflow.changeTracker.reset).toHaveBeenCalled()
+      expect(existingWorkflow.changeTracker.restore).toHaveBeenCalled()
+      expect(workflowStore.createNewTemporary).not.toHaveBeenCalled()
+    })
+
+    it('should reuse active workflow when only one side has an id', async () => {
+      existingWorkflow.changeTracker.activeState.id = 'existing-id'
+
+      await useWorkflowService().afterLoadNewGraph('repeat', {
+        nodes: [{ id: 1, type: 'TestNode', pos: [0, 0], size: [100, 100] }]
+      } as never)
+
+      expect(workflowStore.openWorkflow).toHaveBeenCalledWith(existingWorkflow)
+      expect(existingWorkflow.changeTracker.reset).toHaveBeenCalled()
+      expect(existingWorkflow.changeTracker.restore).toHaveBeenCalled()
+      expect(workflowStore.createNewTemporary).not.toHaveBeenCalled()
+    })
+
+    it('should reuse active workflow when only workflowData has an id', async () => {
+      await useWorkflowService().afterLoadNewGraph('repeat', {
+        id: 'incoming-id',
+        nodes: [{ id: 1, type: 'TestNode', pos: [0, 0], size: [100, 100] }]
+      } as never)
+
+      expect(workflowStore.openWorkflow).toHaveBeenCalledWith(existingWorkflow)
+      expect(existingWorkflow.changeTracker.reset).toHaveBeenCalled()
+      expect(existingWorkflow.changeTracker.restore).toHaveBeenCalled()
+      expect(workflowStore.createNewTemporary).not.toHaveBeenCalled()
+    })
+
+    it('should create new temporary when ids differ', async () => {
+      existingWorkflow.changeTracker.activeState.id = 'existing-id'
+
+      const tempWorkflow = createModeTestWorkflow({
+        path: 'workflows/repeat (2).json'
+      })
+      vi.mocked(workflowStore.createNewTemporary).mockReturnValue(tempWorkflow)
+      vi.mocked(workflowStore.openWorkflow).mockResolvedValue(tempWorkflow)
+
+      await useWorkflowService().afterLoadNewGraph('repeat', {
+        id: 'different-id',
+        nodes: [{ id: 1, type: 'TestNode', pos: [0, 0], size: [100, 100] }]
+      } as never)
+
+      expect(workflowStore.createNewTemporary).toHaveBeenCalled()
+    })
+  })
+
+  describe('per-workflow mode switching', () => {
+    let appMode: ReturnType<typeof useAppMode>
+    let workflowStore: ReturnType<typeof useWorkflowStore>
+    let service: ReturnType<typeof useWorkflowService>
+
+    function mockOpenWorkflow() {
+      vi.spyOn(workflowStore, 'openWorkflow').mockImplementation(async (wf) => {
+        // Simulate load() setting changeTracker on first open
+        if (!wf.changeTracker) {
+          wf.changeTracker = createMockChangeTracker()
+          wf.content = '{}'
+          wf.originalContent = '{}'
+        }
+        const loaded = wf as LoadedComfyWorkflow
+        workflowStore.activeWorkflow = loaded
+        return loaded
+      })
+    }
+
+    beforeEach(() => {
+      appMode = useAppMode()
+      workflowStore = useWorkflowStore()
+      service = useWorkflowService()
+    })
+
+    describe('mode derivation from active workflow', () => {
+      it('reflects initialMode of the active workflow', () => {
+        const workflow = createModeTestWorkflow({ initialMode: 'app' })
+        workflowStore.activeWorkflow = workflow
+
+        expect(appMode.mode.value).toBe('app')
+      })
+
+      it('activeMode takes precedence over initialMode', () => {
+        const workflow = createModeTestWorkflow({
+          initialMode: 'app',
+          activeMode: 'graph'
+        })
+        workflowStore.activeWorkflow = workflow
+
+        expect(appMode.mode.value).toBe('graph')
+      })
+
+      it('defaults to graph when no active workflow', () => {
+        expect(appMode.mode.value).toBe('graph')
+      })
+
+      it('updates when activeWorkflow changes', () => {
+        const workflow1 = createModeTestWorkflow({
+          path: 'workflows/one.json',
+          initialMode: 'app'
+        })
+        const workflow2 = createModeTestWorkflow({
+          path: 'workflows/two.json',
+          activeMode: 'builder:inputs'
+        })
+
+        workflowStore.activeWorkflow = workflow1
+        expect(appMode.mode.value).toBe('app')
+
+        workflowStore.activeWorkflow = workflow2
+        expect(appMode.mode.value).toBe('builder:inputs')
+      })
+    })
+
+    describe('setMode writes to active workflow', () => {
+      it('writes activeMode without changing initialMode', () => {
+        const workflow = createModeTestWorkflow({ initialMode: 'graph' })
+        workflowStore.activeWorkflow = workflow
+
+        appMode.setMode('builder:arrange')
+
+        expect(workflow.activeMode).toBe('builder:arrange')
+        expect(workflow.initialMode).toBe('graph')
+        expect(appMode.mode.value).toBe('builder:arrange')
+      })
+    })
+
+    describe('afterLoadNewGraph initializes initialMode', () => {
+      beforeEach(() => {
+        mockOpenWorkflow()
+      })
+
+      it('sets initialMode from extra.linearMode on first load', async () => {
+        const workflow = createModeTestWorkflow({ loaded: false })
+
+        await service.afterLoadNewGraph(
+          workflow,
+          makeWorkflowData({ linearMode: true })
+        )
+
+        expect(workflow.initialMode).toBe('app')
+      })
+
+      it('leaves initialMode null when extra.linearMode is absent', async () => {
+        const workflow = createModeTestWorkflow({ loaded: false })
+
+        await service.afterLoadNewGraph(workflow, makeWorkflowData())
+
+        expect(workflow.initialMode).toBeNull()
+      })
+
+      it('sets initialMode to graph when extra.linearMode is false', async () => {
+        const workflow = createModeTestWorkflow({ loaded: false })
+
+        await service.afterLoadNewGraph(
+          workflow,
+          makeWorkflowData({ linearMode: false })
+        )
+
+        expect(workflow.initialMode).toBe('graph')
+      })
+
+      it('does not set initialMode on tab switch even if data has linearMode', async () => {
+        const workflow = createModeTestWorkflow({ loaded: false })
+
+        // First load — no linearMode in data
+        await service.afterLoadNewGraph(workflow, makeWorkflowData())
+        expect(workflow.initialMode).toBeNull()
+
+        // User switches to app mode at runtime
+        workflow.activeMode = 'app'
+
+        // Tab switch / reload — data now has linearMode (leaked from graph)
+        await service.afterLoadNewGraph(
+          workflow,
+          makeWorkflowData({ linearMode: true })
+        )
+
+        // initialMode should NOT have been updated — only builder save sets it
+        expect(workflow.initialMode).toBeNull()
+      })
+
+      it('preserves existing initialMode on tab switch', async () => {
+        const workflow = createModeTestWorkflow({
+          initialMode: 'app'
+        })
+
+        await service.afterLoadNewGraph(workflow, makeWorkflowData())
+
+        expect(workflow.initialMode).toBe('app')
+      })
+
+      it('sets initialMode to app for fresh string-based loads with linearMode', async () => {
+        vi.spyOn(workflowStore, 'createNewTemporary').mockReturnValue(
+          createModeTestWorkflow()
+        )
+
+        await service.afterLoadNewGraph(
+          'test.json',
+          makeWorkflowData({ linearMode: true })
+        )
+
+        expect(appMode.mode.value).toBe('app')
+      })
+
+      it('reads initialMode from file when draft lacks linearMode (restoration)', async () => {
+        const filePath = 'workflows/saved-app.json'
+        const fileInitialState = makeWorkflowData({ linearMode: true })
+        const mockTracker = createMockChangeTracker()
+        mockTracker.initialState = fileInitialState
+
+        // Persisted, not-loaded workflow in the store
+        const persistedWorkflow = new ComfyWorkflowClass({
+          path: filePath,
+          modified: Date.now(),
+          size: 100
+        })
+
+        vi.spyOn(workflowStore, 'getWorkflowByPath').mockReturnValue(
+          persistedWorkflow
+        )
+        vi.spyOn(workflowStore, 'openWorkflow').mockImplementation(
+          async (wf) => {
+            wf.changeTracker = mockTracker
+            wf.content = JSON.stringify(fileInitialState)
+            wf.originalContent = wf.content
+            workflowStore.activeWorkflow = wf as LoadedComfyWorkflow
+            return wf as LoadedComfyWorkflow
+          }
+        )
+
+        // Draft data has NO linearMode (simulates rootGraph serialization)
+        const draftData = makeWorkflowData()
+
+        await service.afterLoadNewGraph('saved-app.json', draftData)
+
+        // initialMode should come from the file, not the draft
+        expect(persistedWorkflow.initialMode).toBe('app')
+      })
+    })
+
+    describe('round-trip mode preservation', () => {
+      it('each workflow retains its own mode across tab switches', () => {
+        const workflow1 = createModeTestWorkflow({
+          path: 'workflows/one.json',
+          activeMode: 'builder:inputs'
+        })
+        const workflow2 = createModeTestWorkflow({
+          path: 'workflows/two.json',
+          initialMode: 'app'
+        })
+
+        workflowStore.activeWorkflow = workflow1
+        expect(appMode.mode.value).toBe('builder:inputs')
+
+        workflowStore.activeWorkflow = workflow2
+        expect(appMode.mode.value).toBe('app')
+
+        workflowStore.activeWorkflow = workflow1
+        expect(appMode.mode.value).toBe('builder:inputs')
+      })
+    })
+  })
+
+  describe('saveWorkflowAs', () => {
+    let workflowStore: ReturnType<typeof useWorkflowStore>
+    let service: ReturnType<typeof useWorkflowService>
+
+    beforeEach(() => {
+      workflowStore = useWorkflowStore()
+      service = useWorkflowService()
+      vi.spyOn(workflowStore, 'saveWorkflow').mockResolvedValue()
+      vi.spyOn(workflowStore, 'renameWorkflow').mockResolvedValue()
+    })
+
+    function createTemporaryWorkflow(
+      directory: string = 'workflows'
+    ): LoadedComfyWorkflow {
+      const workflow = new ComfyWorkflowClass({
+        path: directory + '/temp.json',
+        modified: Date.now(),
+        size: 100
+      })
+      workflow.changeTracker = createMockChangeTracker()
+      workflow.content = '{}'
+      workflow.originalContent = '{}'
+      Object.defineProperty(workflow, 'isTemporary', { get: () => true })
+      return workflow as LoadedComfyWorkflow
+    }
+
+    it('appends .app.json extension when initialMode is app', async () => {
+      const workflow = createTemporaryWorkflow()
+      workflow.initialMode = 'app'
+
+      await service.saveWorkflowAs(workflow, { filename: 'my-workflow' })
+
+      expect(workflowStore.renameWorkflow).toHaveBeenCalledWith(
+        workflow,
+        'workflows/my-workflow.app.json'
+      )
+    })
+
+    it('appends .json extension when initialMode is graph', async () => {
+      const workflow = createTemporaryWorkflow()
+      workflow.initialMode = 'graph'
+
+      await service.saveWorkflowAs(workflow, { filename: 'my-workflow' })
+
+      expect(workflowStore.renameWorkflow).toHaveBeenCalledWith(
+        workflow,
+        'workflows/my-workflow.json'
+      )
+    })
+
+    it('appends .json extension when initialMode is not set', async () => {
+      const workflow = createTemporaryWorkflow()
+
+      await service.saveWorkflowAs(workflow, { filename: 'my-workflow' })
+
+      expect(workflowStore.renameWorkflow).toHaveBeenCalledWith(
+        workflow,
+        'workflows/my-workflow.json'
+      )
+    })
+  })
+
+  describe('saveWorkflow', () => {
+    let workflowStore: ReturnType<typeof useWorkflowStore>
+    let toastStore: ReturnType<typeof useToastStore>
+    let service: ReturnType<typeof useWorkflowService>
+
+    beforeEach(() => {
+      workflowStore = useWorkflowStore()
+      toastStore = useToastStore()
+      service = useWorkflowService()
+      vi.spyOn(workflowStore, 'saveWorkflow').mockResolvedValue()
+      vi.spyOn(workflowStore, 'renameWorkflow').mockResolvedValue()
+    })
+
+    function createSaveableWorkflow(path: string): LoadedComfyWorkflow {
+      const workflow = new ComfyWorkflowClass({
+        path,
+        modified: Date.now(),
+        size: 100
+      })
+      workflow.changeTracker = createMockChangeTracker()
+      workflow.content = '{}'
+      workflow.originalContent = '{}'
+      return workflow as LoadedComfyWorkflow
+    }
+
+    it('renames .json to .app.json when initialMode is app', async () => {
+      const workflow = createSaveableWorkflow('workflows/test.json')
+      workflow.initialMode = 'app'
+
+      await service.saveWorkflow(workflow)
+
+      expect(workflowStore.renameWorkflow).toHaveBeenCalledWith(
+        workflow,
+        'workflows/test.app.json'
+      )
+      expect(workflowStore.saveWorkflow).toHaveBeenCalledWith(workflow)
+    })
+
+    it('renames .app.json to .json when initialMode is graph', async () => {
+      const workflow = createSaveableWorkflow('workflows/test.app.json')
+      workflow.initialMode = 'graph'
+
+      await service.saveWorkflow(workflow)
+
+      expect(workflowStore.renameWorkflow).toHaveBeenCalledWith(
+        workflow,
+        'workflows/test.json'
+      )
+      expect(workflowStore.saveWorkflow).toHaveBeenCalledWith(workflow)
+    })
+
+    it('does not rename when extension already matches', async () => {
+      const workflow = createSaveableWorkflow('workflows/test.app.json')
+      workflow.initialMode = 'app'
+
+      await service.saveWorkflow(workflow)
+
+      expect(workflowStore.renameWorkflow).not.toHaveBeenCalled()
+      expect(workflowStore.saveWorkflow).toHaveBeenCalledWith(workflow)
+    })
+
+    it('shows toast only when rename occurs', async () => {
+      const addSpy = vi.spyOn(toastStore, 'add')
+
+      const workflow = createSaveableWorkflow('workflows/test.json')
+      workflow.initialMode = 'app'
+
+      await service.saveWorkflow(workflow)
+
+      expect(addSpy).toHaveBeenCalledWith(
+        expect.objectContaining({ severity: 'info' })
+      )
+    })
+
+    it('does not show toast when no rename occurs', async () => {
+      const addSpy = vi.spyOn(toastStore, 'add')
+
+      const workflow = createSaveableWorkflow('workflows/test.app.json')
+      workflow.initialMode = 'app'
+
+      await service.saveWorkflow(workflow)
+
+      expect(addSpy).not.toHaveBeenCalled()
+    })
+
+    it('does not rename when initialMode is not set', async () => {
+      const workflow = createSaveableWorkflow('workflows/test.json')
+
+      await service.saveWorkflow(workflow)
+
+      expect(workflowStore.renameWorkflow).not.toHaveBeenCalled()
+    })
+
+    it('prompts for overwrite when target path already exists', async () => {
+      const workflow = createSaveableWorkflow('workflows/test.json')
+      workflow.initialMode = 'app'
+
+      const existing = createSaveableWorkflow('workflows/test.app.json')
+      vi.spyOn(workflowStore, 'getWorkflowByPath').mockReturnValue(existing)
+      vi.spyOn(workflowStore, 'deleteWorkflow').mockResolvedValue()
+      mockConfirm.mockResolvedValue(true)
+
+      await service.saveWorkflow(workflow)
+
+      expect(mockConfirm).toHaveBeenCalled()
+      expect(workflowStore.renameWorkflow).toHaveBeenCalledWith(
+        workflow,
+        'workflows/test.app.json'
+      )
+      expect(workflowStore.saveWorkflow).toHaveBeenCalledWith(workflow)
+    })
+
+    it('saves without renaming when user declines overwrite', async () => {
+      const workflow = createSaveableWorkflow('workflows/test.json')
+      workflow.initialMode = 'app'
+
+      const existing = createSaveableWorkflow('workflows/test.app.json')
+      vi.spyOn(workflowStore, 'getWorkflowByPath').mockReturnValue(existing)
+      mockConfirm.mockResolvedValue(false)
+
+      await service.saveWorkflow(workflow)
+
+      expect(mockConfirm).toHaveBeenCalled()
+      expect(workflowStore.renameWorkflow).not.toHaveBeenCalled()
+      expect(workflowStore.saveWorkflow).toHaveBeenCalledWith(workflow)
+    })
+  })
+})
diff --git a/src/platform/workflow/core/services/workflowService.ts b/src/platform/workflow/core/services/workflowService.ts
index 37c4ef5e5a..e0625d4db5 100644
--- a/src/platform/workflow/core/services/workflowService.ts
+++ b/src/platform/workflow/core/services/workflowService.ts
@@ -6,32 +6,61 @@ import { LGraph, LGraphCanvas } from '@/lib/litegraph/src/litegraph'
 import type { Point, SerialisableGraph } from '@/lib/litegraph/src/litegraph'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { useToastStore } from '@/platform/updates/common/toastStore'
+import { useWorkflowDraftStore } from '@/platform/workflow/persistence/stores/workflowDraftStore'
 import {
   ComfyWorkflow,
   useWorkflowStore
 } from '@/platform/workflow/management/stores/workflowStore'
+import { useTelemetry } from '@/platform/telemetry'
 import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
 import { useWorkflowThumbnail } from '@/renderer/core/thumbnail/useWorkflowThumbnail'
 import { app } from '@/scripts/app'
 import { blankGraph, defaultGraph } from '@/scripts/defaultGraph'
+import { useMissingModelsDialog } from '@/composables/useMissingModelsDialog'
+import { useMissingNodesDialog } from '@/composables/useMissingNodesDialog'
 import { useDialogService } from '@/services/dialogService'
+import { useAppMode } from '@/composables/useAppMode'
+import type { AppMode } from '@/composables/useAppMode'
 import { useDomWidgetStore } from '@/stores/domWidgetStore'
+import { useExecutionErrorStore } from '@/stores/executionErrorStore'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
-import { appendJsonExt } from '@/utils/formatUtil'
+import {
+  appendJsonExt,
+  appendWorkflowJsonExt,
+  generateUUID
+} from '@/utils/formatUtil'
+
+function linearModeToAppMode(linearMode: unknown): AppMode | null {
+  if (typeof linearMode !== 'boolean') return null
+  return linearMode ? 'app' : 'graph'
+}
 
 export const useWorkflowService = () => {
   const settingStore = useSettingStore()
   const workflowStore = useWorkflowStore()
   const toastStore = useToastStore()
   const dialogService = useDialogService()
+  const missingModelsDialog = useMissingModelsDialog()
+  const missingNodesDialog = useMissingNodesDialog()
   const workflowThumbnail = useWorkflowThumbnail()
   const domWidgetStore = useDomWidgetStore()
+  const executionErrorStore = useExecutionErrorStore()
+  const workflowDraftStore = useWorkflowDraftStore()
+
+  function confirmOverwrite(targetPath: string) {
+    return dialogService.confirm({
+      title: t('sideToolbar.workflowTab.confirmOverwriteTitle'),
+      type: 'overwrite',
+      message: t('sideToolbar.workflowTab.confirmOverwrite'),
+      itemList: [targetPath]
+    })
+  }
 
   async function getFilename(defaultName: string): Promise<string | null> {
     if (settingStore.get('Comfy.PromptFilename')) {
       let filename = await dialogService.prompt({
         title: t('workflowService.exportWorkflow'),
-        message: t('workflowService.enterFilename') + ':',
+        message: t('workflowService.enterFilenamePrompt'),
         defaultValue: defaultName
       })
       if (!filename) return null
@@ -82,33 +111,37 @@ export const useWorkflowService = () => {
   /**
    * Save a workflow as a new file
    * @param workflow The workflow to save
+   * @param options.filename Pre-supplied filename (skips the prompt dialog)
    */
-  const saveWorkflowAs = async (workflow: ComfyWorkflow) => {
-    const newFilename = await workflow.promptSave()
-    if (!newFilename) return
+  const saveWorkflowAs = async (
+    workflow: ComfyWorkflow,
+    options: { filename?: string } = {}
+  ): Promise<boolean> => {
+    const newFilename = options.filename ?? (await workflow.promptSave())
+    if (!newFilename) return false
 
-    const newPath = workflow.directory + '/' + appendJsonExt(newFilename)
+    const isApp = workflow.initialMode === 'app'
+    const newPath =
+      workflow.directory + '/' + appendWorkflowJsonExt(newFilename, isApp)
     const existingWorkflow = workflowStore.getWorkflowByPath(newPath)
 
+    const isSelfOverwrite =
+      existingWorkflow?.path === workflow.path && !existingWorkflow?.isTemporary
+
     if (existingWorkflow && !existingWorkflow.isTemporary) {
-      const res = await dialogService.confirm({
-        title: t('sideToolbar.workflowTab.confirmOverwriteTitle'),
-        type: 'overwrite',
-        message: t('sideToolbar.workflowTab.confirmOverwrite'),
-        itemList: [newPath]
-      })
+      if ((await confirmOverwrite(newPath)) !== true) return false
 
-      if (res !== true) return
-
-      if (existingWorkflow.path === workflow.path) {
-        await saveWorkflow(workflow)
-        return
+      if (!isSelfOverwrite) {
+        const deleted = await deleteWorkflow(existingWorkflow, true)
+        if (!deleted) return false
       }
-      const deleted = await deleteWorkflow(existingWorkflow, true)
-      if (!deleted) return
     }
 
-    if (workflow.isTemporary) {
+    workflow.changeTracker?.checkState()
+
+    if (isSelfOverwrite) {
+      await saveWorkflow(workflow)
+    } else if (workflow.isTemporary) {
       await renameWorkflow(workflow, newPath)
       await workflowStore.saveWorkflow(workflow)
     } else {
@@ -116,6 +149,7 @@ export const useWorkflowService = () => {
       await openWorkflow(tempWorkflow)
       await workflowStore.saveWorkflow(tempWorkflow)
     }
+    return true
   }
 
   /**
@@ -126,6 +160,34 @@ export const useWorkflowService = () => {
     if (workflow.isTemporary) {
       await saveWorkflowAs(workflow)
     } else {
+      workflow.changeTracker?.checkState()
+
+      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)
     }
   }
@@ -179,9 +241,11 @@ export const useWorkflowService = () => {
       {
         showMissingModelsDialog: loadFromRemote,
         showMissingNodesDialog: loadFromRemote,
-        checkForRerouteMigration: false
+        checkForRerouteMigration: false,
+        deferWarnings: true
       }
     )
+    showPendingWarnings()
   }
 
   /**
@@ -211,6 +275,8 @@ export const useWorkflowService = () => {
       }
     }
 
+    workflowDraftStore.removeDraft(workflow.path)
+
     // If this is the last workflow, create a new default temporary workflow
     if (workflowStore.openWorkflows.length === 1) {
       await loadDefaultWorkflow()
@@ -289,6 +355,27 @@ export const useWorkflowService = () => {
     const activeWorkflow = workflowStore.activeWorkflow
     if (activeWorkflow) {
       activeWorkflow.changeTracker.store()
+      if (settingStore.get('Comfy.Workflow.Persist') && activeWorkflow.path) {
+        const activeState = activeWorkflow.activeState
+        if (activeState) {
+          try {
+            const workflowJson = JSON.stringify(activeState)
+            workflowDraftStore.saveDraft(activeWorkflow.path, {
+              data: workflowJson,
+              updatedAt: Date.now(),
+              name: activeWorkflow.key,
+              isTemporary: activeWorkflow.isTemporary
+            })
+          } catch {
+            toastStore.add({
+              severity: 'error',
+              summary: t('g.error'),
+              detail: t('toastMessages.failedToSaveDraft'),
+              life: 3000
+            })
+          }
+        }
+      }
       // Capture thumbnail before loading new graph
       void workflowThumbnail.storeThumbnail(activeWorkflow)
       domWidgetStore.clear()
@@ -311,6 +398,18 @@ export const useWorkflowService = () => {
     workflowData: ComfyWorkflowJSON
   ) => {
     const workflowStore = useWorkspaceStore().workflow
+    const { isAppMode } = useAppMode()
+    const wasAppMode = isAppMode.value
+
+    // Determine the initial app mode for fresh loads from serialized state.
+    // null means linearMode was never explicitly set (not builder-saved).
+    const freshLoadMode = linearModeToAppMode(workflowData.extra?.linearMode)
+
+    function trackIfEnteringApp(workflow: ComfyWorkflow) {
+      if (!wasAppMode && workflow.initialMode === 'app') {
+        useTelemetry()?.trackEnterLinear({ source: 'workflow' })
+      }
+    }
 
     if (value === null || typeof value === 'string') {
       const path = value as string | null
@@ -320,12 +419,35 @@ export const useWorkflowService = () => {
         const fullPath = ComfyWorkflow.basePath + appendJsonExt(path)
         const existingWorkflow = workflowStore.getWorkflowByPath(fullPath)
 
-        // If the workflow exists and is NOT loaded yet (restoration case),
-        // use the existing workflow instead of creating a new one.
-        // If it IS loaded, this is a re-import case - create new with suffix.
-        if (existingWorkflow?.isPersisted && !existingWorkflow.isLoaded) {
+        // Reuse an existing workflow when this is a restoration case
+        // (persisted but currently unloaded) or an idempotent repeated load
+        // of the currently active same-path workflow.
+        //
+        // This prevents accidental duplicate tabs when startup/load flows
+        // invoke loadGraphData more than once for the same workflow name.
+        const isSameActiveWorkflowLoad =
+          !!existingWorkflow &&
+          workflowStore.isActive(existingWorkflow) &&
+          (existingWorkflow.activeState?.id === undefined ||
+            workflowData.id === undefined ||
+            existingWorkflow.activeState.id === workflowData.id)
+
+        if (
+          existingWorkflow &&
+          ((existingWorkflow.isPersisted && !existingWorkflow.isLoaded) ||
+            isSameActiveWorkflowLoad)
+        ) {
           const loadedWorkflow =
             await workflowStore.openWorkflow(existingWorkflow)
+          if (loadedWorkflow.initialMode === undefined) {
+            // Prefer the file's linearMode over the draft's since the file
+            // is the authoritative saved state.
+            loadedWorkflow.initialMode =
+              linearModeToAppMode(
+                loadedWorkflow.initialState?.extra?.linearMode
+              ) ?? freshLoadMode
+            trackIfEnteringApp(loadedWorkflow)
+          }
           loadedWorkflow.changeTracker.reset(workflowData)
           loadedWorkflow.changeTracker.restore()
           return
@@ -336,11 +458,17 @@ export const useWorkflowService = () => {
         path ? appendJsonExt(path) : undefined,
         workflowData
       )
+      tempWorkflow.initialMode = freshLoadMode
+      trackIfEnteringApp(tempWorkflow)
       await workflowStore.openWorkflow(tempWorkflow)
       return
     }
 
     const loadedWorkflow = await workflowStore.openWorkflow(value)
+    if (loadedWorkflow.initialMode === undefined) {
+      loadedWorkflow.initialMode = freshLoadMode
+      trackIfEnteringApp(loadedWorkflow)
+    }
     loadedWorkflow.changeTracker.reset(workflowData)
     loadedWorkflow.changeTracker.restore()
   }
@@ -389,7 +517,10 @@ export const useWorkflowService = () => {
    * Takes an existing workflow and duplicates it with a new name
    */
   const duplicateWorkflow = async (workflow: ComfyWorkflow) => {
+    if (!workflow.isLoaded) await workflow.load()
     const state = JSON.parse(JSON.stringify(workflow.activeState))
+    // Ensure duplicates are always treated as distinct workflows.
+    if (state) state.id = generateUUID()
     const suffix = workflow.isPersisted ? ' (Copy)' : ''
     // Remove the suffix `(2)` or similar
     const filename = workflow.filename.replace(/\s*\(\d+\)$/, '') + suffix
@@ -397,6 +528,35 @@ export const useWorkflowService = () => {
     await app.loadGraphData(state, true, true, filename)
   }
 
+  /**
+   * Show and clear any pending warnings (missing nodes/models) stored on the
+   * active workflow. Called after a workflow becomes visible so dialogs don't
+   * overlap with subsequent loads.
+   */
+  function showPendingWarnings(workflow?: ComfyWorkflow | null) {
+    const wf = workflow ?? workflowStore.activeWorkflow
+    if (!wf?.pendingWarnings) return
+
+    const { missingNodeTypes, missingModels } = wf.pendingWarnings
+    wf.pendingWarnings = null
+
+    if (missingNodeTypes?.length) {
+      // Remove modal once Node Replacement is implemented in TabErrors.
+      if (settingStore.get('Comfy.Workflow.ShowMissingNodesWarning')) {
+        missingNodesDialog.show({ missingNodeTypes })
+      }
+
+      executionErrorStore.surfaceMissingNodes(missingNodeTypes)
+    }
+
+    if (
+      missingModels &&
+      settingStore.get('Comfy.Workflow.ShowMissingModelsWarning')
+    ) {
+      missingModelsDialog.show(missingModels)
+    }
+  }
+
   return {
     exportWorkflow,
     saveWorkflowAs,
@@ -412,6 +572,7 @@ export const useWorkflowService = () => {
     loadNextOpenedWorkflow,
     loadPreviousOpenedWorkflow,
     duplicateWorkflow,
+    showPendingWarnings,
     afterLoadNewGraph,
     beforeLoadNewGraph
   }
diff --git a/src/platform/workflow/management/composables/useAppsSidebarTab.ts b/src/platform/workflow/management/composables/useAppsSidebarTab.ts
new file mode 100644
index 0000000000..7dbbd68c15
--- /dev/null
+++ b/src/platform/workflow/management/composables/useAppsSidebarTab.ts
@@ -0,0 +1,15 @@
+import { markRaw } from 'vue'
+
+import AppsSidebarTab from '@/components/sidebar/tabs/AppsSidebarTab.vue'
+import type { SidebarTabExtension } from '@/types/extensionTypes'
+
+export const useAppsSidebarTab = (): SidebarTabExtension => {
+  return {
+    id: 'apps',
+    icon: 'icon-[lucide--panels-top-left]',
+    title: 'linearMode.appModeToolbar.apps',
+    tooltip: 'linearMode.appModeToolbar.apps',
+    component: markRaw(AppsSidebarTab),
+    type: 'vue'
+  }
+}
diff --git a/src/platform/workflow/management/stores/comfyWorkflow.ts b/src/platform/workflow/management/stores/comfyWorkflow.ts
new file mode 100644
index 0000000000..ff535859cc
--- /dev/null
+++ b/src/platform/workflow/management/stores/comfyWorkflow.ts
@@ -0,0 +1,200 @@
+import { markRaw } from 'vue'
+
+import { t } from '@/i18n'
+import type { ChangeTracker } from '@/scripts/changeTracker'
+import type { AppMode } from '@/composables/useAppMode'
+import type { NodeId } from '@/lib/litegraph/src/LGraphNode'
+import { UserFile } from '@/stores/userFileStore'
+import type {
+  ComfyWorkflowJSON,
+  ModelFile
+} from '@/platform/workflow/validation/schemas/workflowSchema'
+import type { MissingNodeType } from '@/types/comfy'
+
+export interface LinearData {
+  inputs: [NodeId, string][]
+  outputs: NodeId[]
+}
+
+export interface PendingWarnings {
+  missingNodeTypes?: MissingNodeType[]
+  missingModels?: {
+    missingModels: ModelFile[]
+    paths: Record<string, string[]>
+  }
+}
+
+export class ComfyWorkflow extends UserFile {
+  static readonly basePath: string = 'workflows/'
+  readonly tintCanvasBg?: string
+
+  /**
+   * The change tracker for the workflow. Non-reactive raw object.
+   */
+  changeTracker: ChangeTracker | null = null
+  /**
+   * Whether the workflow has been modified comparing to the initial state.
+   */
+  _isModified: boolean = false
+  /**
+   * Warnings deferred from load time, shown when the workflow is first focused.
+   */
+  pendingWarnings: PendingWarnings | null = null
+  /**
+   * Initial app mode derived from the serialized workflow (extra.linearMode).
+   * - `undefined`: not yet resolved (first load hasn't happened)
+   * - `null`: resolved, but no mode was set (never builder-saved)
+   * - `AppMode`: resolved to a specific mode
+   */
+  initialMode: AppMode | null | undefined = undefined
+  /**
+   * Current app mode set by the user during the session.
+   * Takes precedence over initialMode when present.
+   */
+  activeMode: AppMode | null = null
+  /**
+   * @param options The path, modified, and size of the workflow.
+   * Note: path is the full path, including the 'workflows/' prefix.
+   */
+  constructor(options: { path: string; modified: number; size: number }) {
+    super(options.path, options.modified, options.size)
+  }
+
+  override get key() {
+    return this.path.substring(ComfyWorkflow.basePath.length)
+  }
+
+  get activeState(): ComfyWorkflowJSON | null {
+    return this.changeTracker?.activeState ?? null
+  }
+
+  get initialState(): ComfyWorkflowJSON | null {
+    return this.changeTracker?.initialState ?? null
+  }
+
+  override get isLoaded(): boolean {
+    return this.changeTracker !== null
+  }
+
+  override get isModified(): boolean {
+    return this._isModified
+  }
+
+  override set isModified(value: boolean) {
+    this._isModified = value
+  }
+
+  /**
+   * Load the workflow content from remote storage. Directly returns the loaded
+   * workflow if the content is already loaded.
+   *
+   * @param force Whether to force loading the content even if it is already loaded.
+   * @returns this
+   */
+  override async load({ force = false }: { force?: boolean } = {}): Promise<
+    this & LoadedComfyWorkflow
+  > {
+    const { useWorkflowDraftStore } =
+      await import('@/platform/workflow/persistence/stores/workflowDraftStore')
+    const { useSettingStore } = await import('@/platform/settings/settingStore')
+    const draftStore = useWorkflowDraftStore()
+    const persistEnabled = useSettingStore().get('Comfy.Workflow.Persist')
+    let draft =
+      !force && persistEnabled ? draftStore.getDraft(this.path) : undefined
+    let draftState: ComfyWorkflowJSON | null = null
+    let draftContent: string | null = null
+
+    if (draft) {
+      if (draft.updatedAt < this.lastModified) {
+        draftStore.removeDraft(this.path)
+        draft = undefined
+      }
+    }
+
+    if (draft) {
+      try {
+        draftState = JSON.parse(draft.data)
+        draftContent = draft.data
+      } catch (err) {
+        console.warn('Failed to parse workflow draft, clearing it', err)
+        draftStore.removeDraft(this.path)
+      }
+    }
+
+    await super.load({ force })
+    if (!force && this.isLoaded) return this as this & LoadedComfyWorkflow
+
+    if (this.originalContent == null) {
+      throw new Error(
+        `[ASSERT] Workflow content should be loaded for '${this.path}'`
+      )
+    }
+    if (this.originalContent.trim().length === 0) {
+      throw new Error(`Workflow content is empty for '${this.path}'`)
+    }
+
+    const initialState = JSON.parse(this.originalContent)
+    const { ChangeTracker } = await import('@/scripts/changeTracker')
+    this.changeTracker = markRaw(new ChangeTracker(this, initialState))
+    if (draftState && draftContent) {
+      this.changeTracker.activeState = draftState
+      this.content = draftContent
+      this._isModified = true
+      draftStore.markDraftUsed(this.path)
+    }
+    return this as this & LoadedComfyWorkflow
+  }
+
+  override unload(): void {
+    this.changeTracker = null
+    this.activeMode = null
+    super.unload()
+  }
+
+  override async save() {
+    const { useWorkflowDraftStore } =
+      await import('@/platform/workflow/persistence/stores/workflowDraftStore')
+    const draftStore = useWorkflowDraftStore()
+    this.content = JSON.stringify(this.activeState)
+    // Force save to ensure the content is updated in remote storage incase
+    // the isModified state is screwed by changeTracker.
+    const ret = await super.save({ force: true })
+    this.changeTracker?.reset()
+    this.isModified = false
+    draftStore.removeDraft(this.path)
+    return ret
+  }
+
+  /**
+   * Save the workflow as a new file.
+   * @param path The path to save the workflow to. Note: with 'workflows/' prefix.
+   * @returns this
+   */
+  override async saveAs(path: string) {
+    const { useWorkflowDraftStore } =
+      await import('@/platform/workflow/persistence/stores/workflowDraftStore')
+    const draftStore = useWorkflowDraftStore()
+    this.content = JSON.stringify(this.activeState)
+    const result = await super.saveAs(path)
+    draftStore.removeDraft(path)
+    return result
+  }
+
+  async promptSave(): Promise<string | null> {
+    const { useDialogService } = await import('@/services/dialogService')
+    return await useDialogService().prompt({
+      title: t('workflowService.saveWorkflow'),
+      message: t('workflowService.enterFilenamePrompt'),
+      defaultValue: this.filename
+    })
+  }
+}
+
+export interface LoadedComfyWorkflow extends ComfyWorkflow {
+  isLoaded: true
+  originalContent: string
+  content: string
+  changeTracker: ChangeTracker
+  initialState: ComfyWorkflowJSON
+  activeState: ComfyWorkflowJSON
+}
diff --git a/tests-ui/tests/store/workflowStore.test.ts b/src/platform/workflow/management/stores/workflowStore.test.ts
similarity index 78%
rename from tests-ui/tests/store/workflowStore.test.ts
rename to src/platform/workflow/management/stores/workflowStore.test.ts
index 7dd549e087..fcbe6ca187 100644
--- a/tests-ui/tests/store/workflowStore.test.ts
+++ b/src/platform/workflow/management/stores/workflowStore.test.ts
@@ -1,8 +1,9 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { nextTick } from 'vue'
 
-import type { Subgraph } from '@/lib/litegraph/src/litegraph'
+import type { LGraph, Subgraph } from '@/lib/litegraph/src/litegraph'
 import type {
   ComfyWorkflow,
   LoadedComfyWorkflow
@@ -11,10 +12,15 @@ import {
   useWorkflowBookmarkStore,
   useWorkflowStore
 } from '@/platform/workflow/management/stores/workflowStore'
+import { useWorkflowDraftStore } from '@/platform/workflow/persistence/stores/workflowDraftStore'
 import { api } from '@/scripts/api'
 import { app as comfyApp } from '@/scripts/app'
 import { defaultGraph, defaultGraphJSON } from '@/scripts/defaultGraph'
 import { isSubgraph } from '@/utils/typeGuardUtil'
+import {
+  createMockCanvas,
+  createMockChangeTracker
+} from '@/utils/__tests__/litegraphTestUtils'
 
 // Add mock for api at the top of the file
 vi.mock('@/scripts/api', () => ({
@@ -54,8 +60,15 @@ describe('useWorkflowStore', () => {
     return await store.syncWorkflows()
   }
 
+  const syncRemoteWorkflowsWithMeta = async (
+    files: Array<{ path: string; modified: number; size: number }>
+  ) => {
+    vi.mocked(api.listUserDataFullInfo).mockResolvedValue(files)
+    return await store.syncWorkflows()
+  }
+
   beforeEach(() => {
-    setActivePinia(createPinia())
+    setActivePinia(createTestingPinia({ stubActions: false }))
     store = useWorkflowStore()
     bookmarkStore = useWorkflowBookmarkStore()
     vi.clearAllMocks()
@@ -82,6 +95,78 @@ describe('useWorkflowStore', () => {
       expect(store.workflows.length).toBe(3)
       expect(store.workflows.filter((w) => w.isTemporary)).toEqual([workflow])
     })
+
+    it('should not unload the active workflow during sync', async () => {
+      await syncRemoteWorkflowsWithMeta([
+        { path: 'a.json', modified: 100, size: 1 }
+      ])
+      const workflow = store.getWorkflowByPath('workflows/a.json')!
+
+      vi.mocked(api.getUserData).mockResolvedValue({
+        status: 200,
+        text: () => Promise.resolve(defaultGraphJSON)
+      } as Response)
+
+      await store.openWorkflow(workflow)
+      expect(store.activeWorkflow?.path).toBe('workflows/a.json')
+      expect(store.activeWorkflow?.isLoaded).toBe(true)
+
+      await syncRemoteWorkflowsWithMeta([
+        { path: 'a.json', modified: 200, size: 2 }
+      ])
+
+      expect(store.activeWorkflow?.isLoaded).toBe(true)
+      expect(workflow.lastModified).toBe(200)
+      expect(workflow.size).toBe(2)
+    })
+
+    it('should not unload a loaded workflow if metadata has not changed', async () => {
+      await syncRemoteWorkflowsWithMeta([
+        { path: 'a.json', modified: 100, size: 1 }
+      ])
+      const workflow = store.getWorkflowByPath('workflows/a.json')!
+
+      vi.mocked(api.getUserData).mockResolvedValue({
+        status: 200,
+        text: () => Promise.resolve(defaultGraphJSON)
+      } as Response)
+
+      await workflow.load()
+      expect(workflow.isLoaded).toBe(true)
+
+      await syncRemoteWorkflowsWithMeta([
+        { path: 'a.json', modified: 100, size: 1 }
+      ])
+      expect(workflow.isLoaded).toBe(true)
+    })
+
+    it('should unload a loaded workflow if metadata has changed and it is not active', async () => {
+      await syncRemoteWorkflowsWithMeta([
+        { path: 'a.json', modified: 100, size: 1 }
+      ])
+      const workflow = store.getWorkflowByPath('workflows/a.json')!
+
+      vi.mocked(api.getUserData).mockResolvedValue({
+        status: 200,
+        text: () => Promise.resolve(defaultGraphJSON)
+      } as Response)
+
+      await workflow.load()
+      expect(workflow.isLoaded).toBe(true)
+      expect(workflow.content).toBe(defaultGraphJSON)
+      expect(workflow.originalContent).toBe(defaultGraphJSON)
+
+      // Metadata change should invalidate cached content for non-active workflows.
+      await syncRemoteWorkflowsWithMeta([
+        { path: 'a.json', modified: 200, size: 2 }
+      ])
+
+      expect(workflow.lastModified).toBe(200)
+      expect(workflow.size).toBe(2)
+      expect(workflow.isLoaded).toBe(false)
+      expect(workflow.content).toBeNull()
+      expect(workflow.originalContent).toBeNull()
+    })
   })
 
   describe('createTemporary', () => {
@@ -98,17 +183,43 @@ describe('useWorkflowStore', () => {
       const workflow = store.createTemporary('a.json')
       expect(workflow.path).toBe('workflows/a (2).json')
     })
+
+    it('should assign a workflow id to newly created temporary workflows', () => {
+      const workflow = store.createTemporary('id-test.json')
+      const state = JSON.parse(workflow.content!)
+
+      expect(typeof state.id).toBe('string')
+      expect(state.id.length).toBeGreaterThan(0)
+    })
+
+    it('should assign an id when temporary workflow data is missing one', () => {
+      const workflowDataWithoutId = {
+        ...defaultGraph,
+        id: undefined
+      }
+
+      const workflow = store.createTemporary(
+        'missing-id.json',
+        workflowDataWithoutId
+      )
+      const state = JSON.parse(workflow.content!)
+
+      expect(typeof state.id).toBe('string')
+      expect(state.id.length).toBeGreaterThan(0)
+      expect(workflowDataWithoutId.id).toBeUndefined()
+    })
   })
 
   describe('openWorkflow', () => {
     it('should load and open a temporary workflow', async () => {
       // Create a test workflow
       const workflow = store.createTemporary('test.json')
-      const mockWorkflowData = { nodes: [], links: [] }
 
       // Mock the load response
       vi.spyOn(workflow, 'load').mockImplementation(async () => {
-        workflow.changeTracker = { activeState: mockWorkflowData } as any
+        workflow.changeTracker = createMockChangeTracker({
+          workflow
+        })
         return workflow as LoadedComfyWorkflow
       })
 
@@ -285,10 +396,11 @@ describe('useWorkflowStore', () => {
 
       // Mock super.rename
       vi.spyOn(Object.getPrototypeOf(workflow), 'rename').mockImplementation(
-        async function (this: any, newPath: string) {
-          this.path = newPath
-          return this
-        } as any
+        async function (this: unknown, ...args: unknown[]) {
+          const newPath = args[0] as string
+          ;(this as typeof workflow).path = newPath
+          return this as typeof workflow
+        }
       )
 
       // Perform rename
@@ -308,10 +420,11 @@ describe('useWorkflowStore', () => {
 
       // Mock super.rename
       vi.spyOn(Object.getPrototypeOf(workflow), 'rename').mockImplementation(
-        async function (this: any, newPath: string) {
-          this.path = newPath
-          return this
-        } as any
+        async function (this: unknown, ...args: unknown[]) {
+          const newPath = args[0] as string
+          ;(this as typeof workflow).path = newPath
+          return this as typeof workflow
+        }
       )
 
       // Perform rename
@@ -376,12 +489,9 @@ describe('useWorkflowStore', () => {
       await syncRemoteWorkflows(['test.json'])
       const workflow = store.getWorkflowByPath('workflows/test.json')!
 
-      // Mock the activeState
-      const mockState = { nodes: [] }
-      workflow.changeTracker = {
-        activeState: mockState,
-        reset: vi.fn()
-      } as any
+      workflow.changeTracker = createMockChangeTracker({
+        workflow
+      })
       vi.mocked(api.storeUserData).mockResolvedValue({
         status: 200,
         json: () =>
@@ -396,7 +506,9 @@ describe('useWorkflowStore', () => {
       await workflow.save()
 
       // Verify the content was updated
-      expect(workflow.content).toBe(JSON.stringify(mockState))
+      expect(workflow.content).toBe(
+        JSON.stringify(workflow.changeTracker!.activeState)
+      )
       expect(workflow.changeTracker!.reset).toHaveBeenCalled()
       expect(workflow.isModified).toBe(false)
     })
@@ -406,12 +518,9 @@ describe('useWorkflowStore', () => {
       const workflow = store.getWorkflowByPath('workflows/test.json')!
       workflow.isModified = false
 
-      // Mock the activeState
-      const mockState = { nodes: [] }
-      workflow.changeTracker = {
-        activeState: mockState,
-        reset: vi.fn()
-      } as any
+      workflow.changeTracker = createMockChangeTracker({
+        workflow
+      })
       vi.mocked(api.storeUserData).mockResolvedValue({
         status: 200,
         json: () =>
@@ -440,12 +549,9 @@ describe('useWorkflowStore', () => {
       const workflow = store.getWorkflowByPath('workflows/test.json')!
       workflow.isModified = true
 
-      // Mock the activeState
-      const mockState = { nodes: [] }
-      workflow.changeTracker = {
-        activeState: mockState,
-        reset: vi.fn()
-      } as any
+      workflow.changeTracker = createMockChangeTracker({
+        workflow
+      })
       vi.mocked(api.storeUserData).mockResolvedValue({
         status: 200,
         json: () =>
@@ -464,7 +570,9 @@ describe('useWorkflowStore', () => {
       expect(workflow.isModified).toBe(true)
 
       expect(newWorkflow.path).toBe('workflows/new-test.json')
-      expect(newWorkflow.content).toBe(JSON.stringify(mockState))
+      expect(newWorkflow.content).toBe(
+        JSON.stringify(workflow.changeTracker!.activeState)
+      )
       expect(newWorkflow.isModified).toBe(false)
     })
   })
@@ -472,13 +580,17 @@ describe('useWorkflowStore', () => {
   describe('Subgraphs', () => {
     beforeEach(async () => {
       // Ensure canvas exists for these tests
-      vi.mocked(comfyApp).canvas = { subgraph: null } as any
+      vi.mocked(comfyApp).canvas = createMockCanvas({
+        subgraph: undefined
+      }) as typeof comfyApp.canvas
 
       // Setup an active workflow as updateActiveGraph depends on it
       const workflow = store.createTemporary('test-subgraph-workflow.json')
       // Mock load to avoid actual file operations/parsing
       vi.spyOn(workflow, 'load').mockImplementation(async () => {
-        workflow.changeTracker = { activeState: {} } as any // Minimal mock
+        workflow.changeTracker = createMockChangeTracker({
+          workflow
+        })
         workflow.originalContent = '{}'
         workflow.content = '{}'
         return workflow as LoadedComfyWorkflow
@@ -491,7 +603,7 @@ describe('useWorkflowStore', () => {
 
     it('should handle when comfyApp.canvas is not available', async () => {
       // Arrange
-      vi.mocked(comfyApp).canvas = null as any // Simulate canvas not ready
+      vi.mocked(comfyApp).canvas = null! as typeof comfyApp.canvas
 
       // Act
       console.debug(store.isSubgraphActive)
@@ -527,7 +639,7 @@ describe('useWorkflowStore', () => {
           { name: 'Level 1 Subgraph' },
           { name: 'Level 2 Subgraph' }
         ]
-      } as any
+      } as Partial<Subgraph> as Subgraph
       vi.mocked(comfyApp.canvas).subgraph = mockSubgraph
 
       // Mock isSubgraph to return true for our mockSubgraph
@@ -550,7 +662,7 @@ describe('useWorkflowStore', () => {
         name: 'Initial Subgraph',
         pathToRootGraph: [{ name: 'Root' }, { name: 'Initial Subgraph' }],
         isRootGraph: false
-      } as any
+      } as Partial<Subgraph> as Subgraph
       vi.mocked(comfyApp.canvas).subgraph = initialSubgraph
 
       // Mock isSubgraph to return true for our initialSubgraph
@@ -570,7 +682,9 @@ describe('useWorkflowStore', () => {
       const workflow2 = store.createTemporary('workflow2.json')
       // Mock load for the second workflow
       vi.spyOn(workflow2, 'load').mockImplementation(async () => {
-        workflow2.changeTracker = { activeState: {} } as any
+        workflow2.changeTracker = createMockChangeTracker({
+          workflow: workflow2
+        })
         workflow2.originalContent = '{}'
         workflow2.content = '{}'
         return workflow2 as LoadedComfyWorkflow
@@ -597,12 +711,25 @@ describe('useWorkflowStore', () => {
   describe('NodeLocatorId conversions', () => {
     beforeEach(() => {
       // Setup mock graph structure with subgraphs
+      const mockRootGraph = {
+        _nodes: [] as unknown[],
+        nodes: [] as unknown[],
+        subgraphs: new Map(),
+        getNodeById: (id: string | number) => {
+          if (String(id) === '123') return mockNode
+          return null
+        }
+      }
+
       const mockSubgraph = {
         id: 'a1b2c3d4-e5f6-7890-abcd-ef1234567890',
-        rootGraph: null as any,
+        rootGraph: mockRootGraph as LGraph,
         _nodes: [],
-        nodes: []
-      }
+        nodes: [],
+        clear() {
+          return undefined
+        }
+      } as Partial<Subgraph> as Subgraph
 
       const mockNode = {
         id: 123,
@@ -610,21 +737,13 @@ describe('useWorkflowStore', () => {
         subgraph: mockSubgraph
       }
 
-      const mockRootGraph = {
-        _nodes: [mockNode],
-        nodes: [mockNode],
-        subgraphs: new Map([[mockSubgraph.id, mockSubgraph]]),
-        getNodeById: (id: string | number) => {
-          if (String(id) === '123') return mockNode
-          return null
-        }
-      }
+      mockRootGraph._nodes = [mockNode]
+      mockRootGraph.nodes = [mockNode]
+      mockRootGraph.subgraphs = new Map([[mockSubgraph.id, mockSubgraph]])
 
-      mockSubgraph.rootGraph = mockRootGraph as any
-
-      vi.mocked(comfyApp).rootGraph = mockRootGraph as any
-      vi.mocked(comfyApp.canvas).subgraph = mockSubgraph as any
-      store.activeSubgraph = mockSubgraph as any
+      vi.mocked(comfyApp).rootGraph = mockRootGraph as LGraph
+      vi.mocked(comfyApp.canvas).subgraph = mockSubgraph
+      store.activeSubgraph = mockSubgraph
     })
 
     describe('nodeIdToNodeLocatorId', () => {
@@ -641,8 +760,12 @@ describe('useWorkflowStore', () => {
 
       it('should use provided subgraph instead of active one', () => {
         const customSubgraph = {
-          id: 'custom-uuid-1234-5678-90ab-cdef12345678'
-        } as any
+          id: 'custom-uuid-1234-5678-90ab-cdef12345678',
+          rootGraph: undefined! as LGraph,
+          _nodes: [],
+          nodes: [],
+          clear: vi.fn()
+        } as Partial<Subgraph> as Subgraph
         const result = store.nodeIdToNodeLocatorId(789, customSubgraph)
         expect(result).toBe('custom-uuid-1234-5678-90ab-cdef12345678:789')
       })
@@ -814,4 +937,41 @@ describe('useWorkflowStore', () => {
       expect(mostRecent).toBeNull()
     })
   })
+
+  describe('closeWorkflow draft cleanup', () => {
+    it('should remove draft for persisted workflows on close', async () => {
+      const draftStore = useWorkflowDraftStore()
+      await syncRemoteWorkflows(['a.json'])
+      const workflow = store.getWorkflowByPath('workflows/a.json')!
+
+      draftStore.saveDraft('workflows/a.json', {
+        data: '{"dirty":true}',
+        updatedAt: Date.now(),
+        name: 'a.json',
+        isTemporary: false
+      })
+      expect(draftStore.getDraft('workflows/a.json')).toBeDefined()
+
+      await store.closeWorkflow(workflow)
+
+      expect(draftStore.getDraft('workflows/a.json')).toBeUndefined()
+    })
+
+    it('should remove draft for temporary workflows on close', async () => {
+      const draftStore = useWorkflowDraftStore()
+      const workflow = store.createTemporary('temp.json')
+
+      draftStore.saveDraft(workflow.path, {
+        data: '{"dirty":true}',
+        updatedAt: Date.now(),
+        name: 'temp.json',
+        isTemporary: true
+      })
+      expect(draftStore.getDraft(workflow.path)).toBeDefined()
+
+      await store.closeWorkflow(workflow)
+
+      expect(draftStore.getDraft(workflow.path)).toBeUndefined()
+    })
+  })
 })
diff --git a/src/platform/workflow/management/stores/workflowStore.ts b/src/platform/workflow/management/stores/workflowStore.ts
index 4b8b64f3db..d97193a7a5 100644
--- a/src/platform/workflow/management/stores/workflowStore.ts
+++ b/src/platform/workflow/management/stores/workflowStore.ts
@@ -1,9 +1,9 @@
 import _ from 'es-toolkit/compat'
+import { until, useAsyncState } from '@vueuse/core'
 import { defineStore } from 'pinia'
 import { computed, markRaw, ref, shallowRef, watch } from 'vue'
 import type { Raw } from 'vue'
 
-import { t } from '@/i18n'
 import type {
   LGraph,
   LGraphNode,
@@ -13,14 +13,11 @@ import type {
   ComfyWorkflowJSON,
   NodeId
 } from '@/platform/workflow/validation/schemas/workflowSchema'
-import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import { useWorkflowDraftStore } from '@/platform/workflow/persistence/stores/workflowDraftStore'
 import { useWorkflowThumbnail } from '@/renderer/core/thumbnail/useWorkflowThumbnail'
 import { api } from '@/scripts/api'
 import { app as comfyApp } from '@/scripts/app'
-import { ChangeTracker } from '@/scripts/changeTracker'
 import { defaultGraphJSON } from '@/scripts/defaultGraph'
-import { useDialogService } from '@/services/dialogService'
-import { UserFile } from '@/stores/userFileStore'
 import type { NodeExecutionId, NodeLocatorId } from '@/types/nodeIdentification'
 import {
   createNodeExecutionId,
@@ -31,121 +28,9 @@ import {
 import { generateUUID, getPathDetails } from '@/utils/formatUtil'
 import { syncEntities } from '@/utils/syncUtil'
 import { isSubgraph } from '@/utils/typeGuardUtil'
-
-export class ComfyWorkflow extends UserFile {
-  static readonly basePath: string = 'workflows/'
-  readonly tintCanvasBg?: string
-
-  /**
-   * The change tracker for the workflow. Non-reactive raw object.
-   */
-  changeTracker: ChangeTracker | null = null
-  /**
-   * Whether the workflow has been modified comparing to the initial state.
-   */
-  _isModified: boolean = false
-
-  /**
-   * @param options The path, modified, and size of the workflow.
-   * Note: path is the full path, including the 'workflows/' prefix.
-   */
-  constructor(options: { path: string; modified: number; size: number }) {
-    super(options.path, options.modified, options.size)
-  }
-
-  override get key() {
-    return this.path.substring(ComfyWorkflow.basePath.length)
-  }
-
-  get activeState(): ComfyWorkflowJSON | null {
-    return this.changeTracker?.activeState ?? null
-  }
-
-  get initialState(): ComfyWorkflowJSON | null {
-    return this.changeTracker?.initialState ?? null
-  }
-
-  override get isLoaded(): boolean {
-    return this.changeTracker !== null
-  }
-
-  override get isModified(): boolean {
-    return this._isModified
-  }
-
-  override set isModified(value: boolean) {
-    this._isModified = value
-  }
-
-  /**
-   * Load the workflow content from remote storage. Directly returns the loaded
-   * workflow if the content is already loaded.
-   *
-   * @param force Whether to force loading the content even if it is already loaded.
-   * @returns this
-   */
-  override async load({ force = false }: { force?: boolean } = {}): Promise<
-    this & LoadedComfyWorkflow
-  > {
-    await super.load({ force })
-    if (!force && this.isLoaded) return this as this & LoadedComfyWorkflow
-
-    if (!this.originalContent) {
-      throw new Error('[ASSERT] Workflow content should be loaded')
-    }
-
-    // Note: originalContent is populated by super.load()
-    this.changeTracker = markRaw(
-      new ChangeTracker(
-        this,
-        /* initialState= */ JSON.parse(this.originalContent)
-      )
-    )
-    return this as this & LoadedComfyWorkflow
-  }
-
-  override unload(): void {
-    this.changeTracker = null
-    super.unload()
-  }
-
-  override async save() {
-    this.content = JSON.stringify(this.activeState)
-    // Force save to ensure the content is updated in remote storage incase
-    // the isModified state is screwed by changeTracker.
-    const ret = await super.save({ force: true })
-    this.changeTracker?.reset()
-    this.isModified = false
-    return ret
-  }
-
-  /**
-   * Save the workflow as a new file.
-   * @param path The path to save the workflow to. Note: with 'workflows/' prefix.
-   * @returns this
-   */
-  override async saveAs(path: string) {
-    this.content = JSON.stringify(this.activeState)
-    return await super.saveAs(path)
-  }
-
-  async promptSave(): Promise<string | null> {
-    return await useDialogService().prompt({
-      title: t('workflowService.saveWorkflow'),
-      message: t('workflowService.enterFilename') + ':',
-      defaultValue: this.filename
-    })
-  }
-}
-
-export interface LoadedComfyWorkflow extends ComfyWorkflow {
-  isLoaded: true
-  originalContent: string
-  content: string
-  changeTracker: ChangeTracker
-  initialState: ComfyWorkflowJSON
-  activeState: ComfyWorkflowJSON
-}
+import { ComfyWorkflow } from './comfyWorkflow'
+import type { LoadedComfyWorkflow } from './comfyWorkflow'
+export { ComfyWorkflow, type LoadedComfyWorkflow }
 
 /**
  * Exposed store interface for the workflow store.
@@ -193,7 +78,7 @@ interface WorkflowStore {
   activeSubgraph: Subgraph | undefined
   /** Updates the {@link subgraphNamePath} and {@link isSubgraphActive} values. */
   updateActiveGraph: () => void
-  executionIdToCurrentId: (id: string) => any
+  executionIdToCurrentId: (id: string) => string | undefined
   nodeIdToNodeLocatorId: (nodeId: NodeId, subgraph?: Subgraph) => NodeLocatorId
   nodeToNodeLocatorId: (node: LGraphNode) => NodeLocatorId
   nodeExecutionIdToNodeLocatorId: (
@@ -334,7 +219,6 @@ export const useWorkflowStore = defineStore('workflow', () => {
       tabActivationHistory.value.shift()
     }
 
-    useCanvasStore().linearMode = !!loadedWorkflow.activeState.extra?.linearMode
     return loadedWorkflow
   }
 
@@ -359,16 +243,32 @@ export const useWorkflowStore = defineStore('workflow', () => {
     ) as ComfyWorkflowJSON
     state.id = id
 
-    const workflow: ComfyWorkflow = new (existingWorkflow.constructor as any)({
-      path,
-      modified: Date.now(),
-      size: -1
-    })
+    const workflow: ComfyWorkflow =
+      new (existingWorkflow.constructor as typeof ComfyWorkflow)({
+        path,
+        modified: Date.now(),
+        size: -1
+      })
+    workflow.initialMode = existingWorkflow.initialMode
     workflow.originalContent = workflow.content = JSON.stringify(state)
     workflowLookup.value[workflow.path] = workflow
     return workflow
   }
 
+  const ensureWorkflowId = (
+    workflowData?: ComfyWorkflowJSON
+  ): ComfyWorkflowJSON => {
+    const base = workflowData
+      ? (JSON.parse(JSON.stringify(workflowData)) as ComfyWorkflowJSON)
+      : (JSON.parse(defaultGraphJSON) as ComfyWorkflowJSON)
+
+    if (!base.id) {
+      base.id = generateUUID()
+    }
+
+    return base
+  }
+
   /**
    * Helper to create a new temporary workflow
    */
@@ -382,9 +282,9 @@ export const useWorkflowStore = defineStore('workflow', () => {
       size: -1
     })
 
-    workflow.originalContent = workflow.content = workflowData
-      ? JSON.stringify(workflowData)
-      : defaultGraphJSON
+    const initialWorkflowData = ensureWorkflowId(workflowData)
+    workflow.originalContent = workflow.content =
+      JSON.stringify(initialWorkflowData)
 
     workflowLookup.value[workflow.path] = workflow
     return workflow
@@ -398,9 +298,13 @@ export const useWorkflowStore = defineStore('workflow', () => {
       ComfyWorkflow.basePath + (path ?? 'Unsaved Workflow.json')
     )
 
+    const normalizedWorkflowData = workflowData
+      ? ensureWorkflowId(workflowData)
+      : undefined
+
     // Try to reuse an existing loaded workflow with the same filename
     // that is not stored in the workflows directory
-    if (path && workflowData) {
+    if (path && normalizedWorkflowData) {
       const existingWorkflow = workflows.value.find(
         (w) => w.fullFilename === path
       )
@@ -410,12 +314,12 @@ export const useWorkflowStore = defineStore('workflow', () => {
           ComfyWorkflow.basePath.slice(0, -1)
         )
       ) {
-        existingWorkflow.changeTracker.reset(workflowData)
+        existingWorkflow.changeTracker.reset(normalizedWorkflowData)
         return existingWorkflow
       }
     }
 
-    return createNewWorkflow(fullPath, workflowData)
+    return createNewWorkflow(fullPath, normalizedWorkflowData)
   }
 
   /**
@@ -435,8 +339,8 @@ export const useWorkflowStore = defineStore('workflow', () => {
     openWorkflowPaths.value = openWorkflowPaths.value.filter(
       (path) => path !== workflow.path
     )
+    useWorkflowDraftStore().removeDraft(workflow.path)
     if (workflow.isTemporary) {
-      // Clear thumbnail when temporary workflow is closed
       clearThumbnail(workflow.key)
       delete workflowLookup.value[workflow.path]
     } else {
@@ -502,23 +406,72 @@ export const useWorkflowStore = defineStore('workflow', () => {
         workflow.isPersisted && !workflow.path.startsWith('subgraphs/')
     )
   )
-  const syncWorkflows = async (dir: string = '') => {
-    await syncEntities(
-      dir ? 'workflows/' + dir : 'workflows',
-      workflowLookup.value,
-      (file) =>
-        new ComfyWorkflow({
-          path: file.path,
-          modified: file.modified,
-          size: file.size
-        }),
-      (existingWorkflow, file) => {
-        existingWorkflow.lastModified = file.modified
-        existingWorkflow.size = file.size
-        existingWorkflow.unload()
-      },
-      /* exclude */ (workflow) => workflow.isTemporary
-    )
+
+  const {
+    isReady: isSyncReady,
+    isLoading: isSyncLoading,
+    execute: executeSyncWorkflows
+  } = useAsyncState(
+    async (dir: string = '') => {
+      await syncEntities(
+        dir ? 'workflows/' + dir : 'workflows',
+        workflowLookup.value,
+        (file) =>
+          new ComfyWorkflow({
+            path: file.path,
+            modified: file.modified,
+            size: file.size
+          }),
+        (existingWorkflow, file) => {
+          const isActiveWorkflow =
+            activeWorkflow.value?.path === existingWorkflow.path
+
+          const nextLastModified = Math.max(
+            existingWorkflow.lastModified,
+            file.modified
+          )
+
+          const isMetadataUnchanged =
+            nextLastModified === existingWorkflow.lastModified &&
+            file.size === existingWorkflow.size
+
+          if (!isMetadataUnchanged) {
+            existingWorkflow.lastModified = nextLastModified
+            existingWorkflow.size = file.size
+          }
+
+          // Never unload the active workflow - it may contain unsaved in-memory edits.
+          if (isActiveWorkflow) {
+            return
+          }
+
+          // If nothing changed, keep any loaded content cached.
+          if (isMetadataUnchanged) {
+            return
+          }
+
+          existingWorkflow.unload()
+        },
+        /* exclude */ (workflow) => workflow.isTemporary
+      )
+    },
+    undefined,
+    { immediate: false }
+  )
+
+  async function syncWorkflows(dir: string = '') {
+    return executeSyncWorkflows(0, dir)
+  }
+
+  async function loadWorkflows(): Promise<void> {
+    if (isSyncReady.value) return
+
+    if (isSyncLoading.value) {
+      await until(isSyncLoading).toBe(false)
+      return
+    }
+
+    await syncWorkflows()
   }
 
   const bookmarkStore = useWorkflowBookmarkStore()
@@ -542,15 +495,21 @@ export const useWorkflowStore = defineStore('workflow', () => {
       const oldPath = workflow.path
       const oldKey = workflow.key
       const wasBookmarked = bookmarkStore.isBookmarked(oldPath)
+      const draftStore = useWorkflowDraftStore()
 
-      const openIndex = detachWorkflow(workflow)
-      // Perform the actual rename operation first
-      try {
-        await workflow.rename(newPath)
-      } finally {
-        attachWorkflow(workflow, openIndex)
+      await workflow.rename(newPath)
+
+      // Synchronously swap old path for new path in lookup and open paths
+      // to avoid a tab flicker caused by an async gap between detach/attach.
+      delete workflowLookup.value[oldPath]
+      workflowLookup.value[workflow.path] = workflow
+      const openIndex = openWorkflowPaths.value.indexOf(oldPath)
+      if (openIndex !== -1) {
+        openWorkflowPaths.value.splice(openIndex, 1, workflow.path)
       }
 
+      draftStore.moveDraft(oldPath, newPath, workflow.key)
+
       // Move thumbnail from old key to new key (using workflow keys, not full paths)
       const newKey = workflow.key
       moveWorkflowThumbnail(oldKey, newKey)
@@ -568,6 +527,7 @@ export const useWorkflowStore = defineStore('workflow', () => {
     isBusy.value = true
     try {
       await workflow.delete()
+      useWorkflowDraftStore().removeDraft(workflow.path)
       if (bookmarkStore.isBookmarked(workflow.path)) {
         await bookmarkStore.setBookmarked(workflow.path, false)
       }
@@ -586,13 +546,11 @@ export const useWorkflowStore = defineStore('workflow', () => {
   const saveWorkflow = async (workflow: ComfyWorkflow) => {
     isBusy.value = true
     try {
-      // Detach the workflow and re-attach to force refresh the tree objects.
+      await workflow.save()
+      // Synchronously detach and re-attach to force refresh the tree objects
+      // without an async gap that would cause the tab to disappear.
       const openIndex = detachWorkflow(workflow)
-      try {
-        await workflow.save()
-      } finally {
-        attachWorkflow(workflow, openIndex)
-      }
+      attachWorkflow(workflow, openIndex)
     } finally {
       isBusy.value = false
     }
@@ -634,7 +592,7 @@ export const useWorkflowStore = defineStore('workflow', () => {
   }
 
   //FIXME: use existing util function
-  const executionIdToCurrentId = (id: string) => {
+  const executionIdToCurrentId = (id: string): string | undefined => {
     const subgraph = activeSubgraph.value
 
     // Short-circuit: ID belongs to the parent workflow / no active subgraph
@@ -826,6 +784,7 @@ export const useWorkflowStore = defineStore('workflow', () => {
     modifiedWorkflows,
     getWorkflowByPath,
     syncWorkflows,
+    loadWorkflows,
 
     isSubgraphActive,
     activeSubgraph,
diff --git a/src/platform/workflow/persistence/base/draftCache.test.ts b/src/platform/workflow/persistence/base/draftCache.test.ts
new file mode 100644
index 0000000000..8c7dfff3e3
--- /dev/null
+++ b/src/platform/workflow/persistence/base/draftCache.test.ts
@@ -0,0 +1,79 @@
+import { describe, expect, it } from 'vitest'
+
+import {
+  MAX_DRAFTS,
+  createDraftCacheState,
+  mostRecentDraftPath,
+  moveDraft,
+  removeDraft,
+  touchEntry,
+  upsertDraft
+} from './draftCache'
+import type { WorkflowDraftSnapshot } from './draftCache'
+
+function createSnapshot(name: string): WorkflowDraftSnapshot {
+  return {
+    data: JSON.stringify({ name }),
+    updatedAt: Date.now(),
+    name,
+    isTemporary: true
+  }
+}
+
+describe('draftCache helpers', () => {
+  it('touchEntry moves path to end', () => {
+    expect(touchEntry(['a', 'b'], 'a')).toEqual(['b', 'a'])
+    expect(touchEntry(['a', 'b'], 'c')).toEqual(['a', 'b', 'c'])
+  })
+
+  it('upsertDraft stores snapshot and applies LRU', () => {
+    let state = createDraftCacheState()
+    for (let i = 0; i < MAX_DRAFTS; i++) {
+      const path = `workflows/Draft${i}.json`
+      state = upsertDraft(state, path, createSnapshot(String(i)))
+    }
+
+    expect(Object.keys(state.drafts).length).toBe(MAX_DRAFTS)
+
+    state = upsertDraft(state, 'workflows/New.json', createSnapshot('new'))
+    expect(Object.keys(state.drafts).length).toBe(MAX_DRAFTS)
+    expect(state.drafts).not.toHaveProperty('workflows/Draft0.json')
+    expect(state.order[state.order.length - 1]).toBe('workflows/New.json')
+  })
+
+  it('removeDraft clears entry and order', () => {
+    const state = upsertDraft(
+      createDraftCacheState(),
+      'workflows/test.json',
+      createSnapshot('test')
+    )
+
+    const nextState = removeDraft(state, 'workflows/test.json')
+    expect(nextState.drafts).toEqual({})
+    expect(nextState.order).toEqual([])
+  })
+
+  it('moveDraft renames entry and updates order', () => {
+    const state = upsertDraft(
+      createDraftCacheState(),
+      'workflows/old.json',
+      createSnapshot('old')
+    )
+
+    const nextState = moveDraft(
+      state,
+      'workflows/old.json',
+      'workflows/new.json',
+      'new'
+    )
+    expect(nextState.drafts).not.toHaveProperty('workflows/old.json')
+    expect(nextState.drafts['workflows/new.json']?.name).toBe('new')
+    expect(nextState.order).toEqual(['workflows/new.json'])
+  })
+
+  it('mostRecentDraftPath returns last entry', () => {
+    const state = createDraftCacheState({}, ['a', 'b', 'c'])
+    expect(mostRecentDraftPath(state.order)).toBe('c')
+    expect(mostRecentDraftPath([])).toBeNull()
+  })
+})
diff --git a/src/platform/workflow/persistence/base/draftCache.ts b/src/platform/workflow/persistence/base/draftCache.ts
new file mode 100644
index 0000000000..634f355de4
--- /dev/null
+++ b/src/platform/workflow/persistence/base/draftCache.ts
@@ -0,0 +1,78 @@
+export interface WorkflowDraftSnapshot {
+  data: string
+  updatedAt: number
+  name: string
+  isTemporary: boolean
+}
+
+export interface DraftCacheState {
+  drafts: Record<string, WorkflowDraftSnapshot>
+  order: string[]
+}
+
+export const MAX_DRAFTS = 32
+
+export const createDraftCacheState = (
+  drafts: Record<string, WorkflowDraftSnapshot> = {},
+  order: string[] = []
+): DraftCacheState => ({ drafts, order })
+
+export const touchEntry = (order: string[], path: string): string[] => {
+  const next = order.filter((entry) => entry !== path)
+  next.push(path)
+  return next
+}
+
+export const upsertDraft = (
+  state: DraftCacheState,
+  path: string,
+  snapshot: WorkflowDraftSnapshot,
+  limit: number = MAX_DRAFTS
+): DraftCacheState => {
+  const effectiveLimit = Math.max(1, limit)
+  const drafts = { ...state.drafts, [path]: snapshot }
+  const order = touchEntry(state.order, path)
+
+  while (order.length > effectiveLimit) {
+    const oldest = order.shift()
+    if (!oldest) continue
+    if (oldest !== path) {
+      delete drafts[oldest]
+    }
+  }
+
+  return createDraftCacheState(drafts, order)
+}
+
+export const removeDraft = (
+  state: DraftCacheState,
+  path: string
+): DraftCacheState => {
+  if (!(path in state.drafts)) return state
+  const drafts = { ...state.drafts }
+  delete drafts[path]
+  const order = state.order.filter((entry) => entry !== path)
+  return createDraftCacheState(drafts, order)
+}
+
+export const moveDraft = (
+  state: DraftCacheState,
+  oldPath: string,
+  newPath: string,
+  name: string
+): DraftCacheState => {
+  const draft = state.drafts[oldPath]
+  if (!draft) return state
+  const updatedDraft = { ...draft, name }
+  const drafts = { ...state.drafts }
+  delete drafts[oldPath]
+  drafts[newPath] = updatedDraft
+  const order = touchEntry(
+    state.order.filter((entry) => entry !== oldPath && entry !== newPath),
+    newPath
+  )
+  return createDraftCacheState(drafts, order)
+}
+
+export const mostRecentDraftPath = (order: string[]): string | null =>
+  order.length ? order[order.length - 1] : null
diff --git a/src/platform/workflow/persistence/base/draftCacheV2.test.ts b/src/platform/workflow/persistence/base/draftCacheV2.test.ts
new file mode 100644
index 0000000000..6c621f114f
--- /dev/null
+++ b/src/platform/workflow/persistence/base/draftCacheV2.test.ts
@@ -0,0 +1,338 @@
+import { describe, expect, it } from 'vitest'
+
+import {
+  createEmptyIndex,
+  getEntryByPath,
+  getMostRecentKey,
+  moveEntry,
+  removeEntry,
+  removeOrphanedEntries,
+  touchOrder,
+  upsertEntry
+} from './draftCacheV2'
+import { hashPath } from './hashUtil'
+
+describe('draftCacheV2', () => {
+  describe('createEmptyIndex', () => {
+    it('creates index with version 2', () => {
+      const index = createEmptyIndex()
+      expect(index.v).toBe(2)
+      expect(index.order).toEqual([])
+      expect(index.entries).toEqual({})
+    })
+  })
+
+  describe('touchOrder', () => {
+    it('moves existing key to end', () => {
+      expect(touchOrder(['a', 'b', 'c'], 'a')).toEqual(['b', 'c', 'a'])
+    })
+
+    it('adds new key to end', () => {
+      expect(touchOrder(['a', 'b'], 'c')).toEqual(['a', 'b', 'c'])
+    })
+
+    it('handles empty order', () => {
+      expect(touchOrder([], 'a')).toEqual(['a'])
+    })
+  })
+
+  describe('upsertEntry', () => {
+    it('adds new entry to empty index', () => {
+      const index = createEmptyIndex()
+      const { index: updated, evicted } = upsertEntry(
+        index,
+        'workflows/a.json',
+        {
+          name: 'a',
+          isTemporary: true,
+          updatedAt: Date.now()
+        }
+      )
+
+      expect(updated.order).toHaveLength(1)
+      expect(Object.keys(updated.entries)).toHaveLength(1)
+      expect(evicted).toEqual([])
+    })
+
+    it('updates existing entry and moves to end of order', () => {
+      let index = createEmptyIndex()
+      index = upsertEntry(index, 'workflows/a.json', {
+        name: 'a',
+        isTemporary: true,
+        updatedAt: 1000
+      }).index
+      index = upsertEntry(index, 'workflows/b.json', {
+        name: 'b',
+        isTemporary: true,
+        updatedAt: 2000
+      }).index
+
+      const keyA = hashPath('workflows/a.json')
+      const keyB = hashPath('workflows/b.json')
+      expect(index.order).toEqual([keyA, keyB])
+
+      const { index: updated } = upsertEntry(index, 'workflows/a.json', {
+        name: 'a-updated',
+        isTemporary: false,
+        updatedAt: 3000
+      })
+
+      expect(updated.order).toEqual([keyB, keyA])
+      expect(updated.entries[keyA].name).toBe('a-updated')
+      expect(updated.entries[keyA].isTemporary).toBe(false)
+    })
+
+    it('evicts oldest entries when over limit', () => {
+      let index = createEmptyIndex()
+      const limit = 3
+
+      for (let i = 0; i < limit; i++) {
+        index = upsertEntry(
+          index,
+          `workflows/draft${i}.json`,
+          { name: `draft${i}`, isTemporary: true, updatedAt: i },
+          limit
+        ).index
+      }
+
+      expect(index.order).toHaveLength(3)
+
+      const { index: updated, evicted } = upsertEntry(
+        index,
+        'workflows/new.json',
+        { name: 'new', isTemporary: true, updatedAt: 100 },
+        limit
+      )
+
+      expect(updated.order).toHaveLength(3)
+      expect(evicted).toHaveLength(1)
+      expect(evicted[0]).toBe(hashPath('workflows/draft0.json'))
+    })
+
+    it('does not evict the entry being upserted', () => {
+      let index = createEmptyIndex()
+
+      index = upsertEntry(
+        index,
+        'workflows/only.json',
+        { name: 'only', isTemporary: true, updatedAt: 1000 },
+        1
+      ).index
+
+      const { index: updated, evicted } = upsertEntry(
+        index,
+        'workflows/only.json',
+        { name: 'only-updated', isTemporary: true, updatedAt: 2000 },
+        1
+      )
+
+      expect(updated.order).toHaveLength(1)
+      expect(evicted).toHaveLength(0)
+    })
+  })
+
+  describe('removeEntry', () => {
+    it('removes existing entry', () => {
+      let index = createEmptyIndex()
+      index = upsertEntry(index, 'workflows/test.json', {
+        name: 'test',
+        isTemporary: true,
+        updatedAt: Date.now()
+      }).index
+
+      const { index: updated, removedKey } = removeEntry(
+        index,
+        'workflows/test.json'
+      )
+
+      expect(updated.order).toHaveLength(0)
+      expect(Object.keys(updated.entries)).toHaveLength(0)
+      expect(removedKey).toBe(hashPath('workflows/test.json'))
+    })
+
+    it('returns null for non-existent path', () => {
+      const index = createEmptyIndex()
+      const { index: updated, removedKey } = removeEntry(
+        index,
+        'workflows/missing.json'
+      )
+
+      expect(updated).toBe(index)
+      expect(removedKey).toBeNull()
+    })
+  })
+
+  describe('moveEntry', () => {
+    it('moves entry to new path with new name', () => {
+      let index = createEmptyIndex()
+      index = upsertEntry(index, 'workflows/old.json', {
+        name: 'old',
+        isTemporary: true,
+        updatedAt: 1000
+      }).index
+
+      const result = moveEntry(
+        index,
+        'workflows/old.json',
+        'workflows/new.json',
+        'new'
+      )
+
+      expect(result).not.toBeNull()
+      expect(result!.index.entries[result!.newKey].name).toBe('new')
+      expect(result!.index.entries[result!.newKey].path).toBe(
+        'workflows/new.json'
+      )
+      expect(result!.index.entries[result!.oldKey]).toBeUndefined()
+    })
+
+    it('returns null for non-existent source', () => {
+      const index = createEmptyIndex()
+      const result = moveEntry(
+        index,
+        'workflows/missing.json',
+        'workflows/new.json',
+        'new'
+      )
+      expect(result).toBeNull()
+    })
+
+    it('returns null when destination path already exists', () => {
+      let index = createEmptyIndex()
+      index = upsertEntry(index, 'workflows/a.json', {
+        name: 'a',
+        isTemporary: true,
+        updatedAt: 1000
+      }).index
+      index = upsertEntry(index, 'workflows/b.json', {
+        name: 'b',
+        isTemporary: true,
+        updatedAt: 2000
+      }).index
+
+      const result = moveEntry(
+        index,
+        'workflows/a.json',
+        'workflows/b.json',
+        'b-renamed'
+      )
+      expect(result).toBeNull()
+    })
+
+    it('moves entry to end of order', () => {
+      let index = createEmptyIndex()
+      index = upsertEntry(index, 'workflows/a.json', {
+        name: 'a',
+        isTemporary: true,
+        updatedAt: 1000
+      }).index
+      index = upsertEntry(index, 'workflows/b.json', {
+        name: 'b',
+        isTemporary: true,
+        updatedAt: 2000
+      }).index
+
+      const result = moveEntry(
+        index,
+        'workflows/a.json',
+        'workflows/c.json',
+        'c'
+      )
+
+      const keyB = hashPath('workflows/b.json')
+      const keyC = hashPath('workflows/c.json')
+      expect(result!.index.order).toEqual([keyB, keyC])
+    })
+  })
+
+  describe('getMostRecentKey', () => {
+    it('returns last key in order', () => {
+      let index = createEmptyIndex()
+      index = upsertEntry(index, 'workflows/a.json', {
+        name: 'a',
+        isTemporary: true,
+        updatedAt: 1000
+      }).index
+      index = upsertEntry(index, 'workflows/b.json', {
+        name: 'b',
+        isTemporary: true,
+        updatedAt: 2000
+      }).index
+
+      expect(getMostRecentKey(index)).toBe(hashPath('workflows/b.json'))
+    })
+
+    it('returns null for empty index', () => {
+      expect(getMostRecentKey(createEmptyIndex())).toBeNull()
+    })
+  })
+
+  describe('getEntryByPath', () => {
+    it('returns entry for existing path', () => {
+      let index = createEmptyIndex()
+      index = upsertEntry(index, 'workflows/test.json', {
+        name: 'test',
+        isTemporary: true,
+        updatedAt: 1000
+      }).index
+
+      const entry = getEntryByPath(index, 'workflows/test.json')
+      expect(entry).not.toBeNull()
+      expect(entry!.name).toBe('test')
+    })
+
+    it('returns null for missing path', () => {
+      const index = createEmptyIndex()
+      expect(getEntryByPath(index, 'workflows/missing.json')).toBeNull()
+    })
+  })
+
+  describe('removeOrphanedEntries', () => {
+    it('removes entries without payloads', () => {
+      let index = createEmptyIndex()
+      index = upsertEntry(index, 'workflows/a.json', {
+        name: 'a',
+        isTemporary: true,
+        updatedAt: 1000
+      }).index
+      index = upsertEntry(index, 'workflows/b.json', {
+        name: 'b',
+        isTemporary: true,
+        updatedAt: 2000
+      }).index
+
+      const existingKeys = new Set([hashPath('workflows/a.json')])
+      const cleaned = removeOrphanedEntries(index, existingKeys)
+
+      expect(cleaned.order).toHaveLength(1)
+      expect(Object.keys(cleaned.entries)).toHaveLength(1)
+      expect(cleaned.entries[hashPath('workflows/a.json')]).toBeDefined()
+    })
+
+    it('preserves order of remaining entries', () => {
+      let index = createEmptyIndex()
+      index = upsertEntry(index, 'workflows/a.json', {
+        name: 'a',
+        isTemporary: true,
+        updatedAt: 1000
+      }).index
+      index = upsertEntry(index, 'workflows/b.json', {
+        name: 'b',
+        isTemporary: true,
+        updatedAt: 2000
+      }).index
+      index = upsertEntry(index, 'workflows/c.json', {
+        name: 'c',
+        isTemporary: true,
+        updatedAt: 3000
+      }).index
+
+      const keyA = hashPath('workflows/a.json')
+      const keyC = hashPath('workflows/c.json')
+      const existingKeys = new Set([keyA, keyC])
+      const cleaned = removeOrphanedEntries(index, existingKeys)
+
+      expect(cleaned.order).toEqual([keyA, keyC])
+    })
+  })
+})
diff --git a/src/platform/workflow/persistence/base/draftCacheV2.ts b/src/platform/workflow/persistence/base/draftCacheV2.ts
new file mode 100644
index 0000000000..55b3c90b56
--- /dev/null
+++ b/src/platform/workflow/persistence/base/draftCacheV2.ts
@@ -0,0 +1,197 @@
+/**
+ * V2 Draft Cache - Pure functions for draft index manipulation.
+ *
+ * This module provides immutable operations on the draft index structure.
+ * All functions return new objects rather than mutating inputs.
+ */
+
+import type { DraftEntryMeta, DraftIndexV2 } from './draftTypes'
+import { MAX_DRAFTS } from './draftTypes'
+import { hashPath } from './hashUtil'
+
+/**
+ * Creates an empty draft index.
+ */
+export function createEmptyIndex(): DraftIndexV2 {
+  return {
+    v: 2,
+    updatedAt: Date.now(),
+    order: [],
+    entries: {}
+  }
+}
+
+/**
+ * Moves a draft key to the end of the LRU order (most recently used).
+ */
+export function touchOrder(order: string[], draftKey: string): string[] {
+  const filtered = order.filter((key) => key !== draftKey)
+  return [...filtered, draftKey]
+}
+
+/**
+ * Adds or updates a draft entry in the index.
+ * Handles LRU eviction if over the limit.
+ *
+ * @returns Object with updated index and list of evicted draft keys
+ */
+export function upsertEntry(
+  index: DraftIndexV2,
+  path: string,
+  meta: Omit<DraftEntryMeta, 'path'>,
+  limit: number = MAX_DRAFTS
+): { index: DraftIndexV2; evicted: string[] } {
+  const draftKey = hashPath(path)
+  const effectiveLimit = Math.max(1, limit)
+
+  const entries = {
+    ...index.entries,
+    [draftKey]: { ...meta, path }
+  }
+
+  const touchedOrder = touchOrder(index.order, draftKey)
+  const evicted: string[] = []
+
+  let evictCount = 0
+  while (touchedOrder.length - evictCount > effectiveLimit) {
+    const oldest = touchedOrder[evictCount]
+    if (oldest && oldest !== draftKey) {
+      delete entries[oldest]
+      evicted.push(oldest)
+    }
+    evictCount++
+  }
+
+  const finalOrder = touchedOrder.slice(evictCount)
+
+  return {
+    index: {
+      v: 2,
+      updatedAt: Date.now(),
+      order: finalOrder,
+      entries
+    },
+    evicted
+  }
+}
+
+/**
+ * Removes a draft entry from the index.
+ *
+ * @returns Object with updated index and the removed draft key (if any)
+ */
+export function removeEntry(
+  index: DraftIndexV2,
+  path: string
+): { index: DraftIndexV2; removedKey: string | null } {
+  const draftKey = hashPath(path)
+
+  if (!(draftKey in index.entries)) {
+    return { index, removedKey: null }
+  }
+
+  const entries = { ...index.entries }
+  delete entries[draftKey]
+
+  return {
+    index: {
+      v: 2,
+      updatedAt: Date.now(),
+      order: index.order.filter((key) => key !== draftKey),
+      entries
+    },
+    removedKey: draftKey
+  }
+}
+
+/**
+ * Moves a draft from one path to another (rename operation).
+ *
+ * @returns Object with updated index and keys involved
+ */
+export function moveEntry(
+  index: DraftIndexV2,
+  oldPath: string,
+  newPath: string,
+  newName: string
+): { index: DraftIndexV2; oldKey: string; newKey: string } | null {
+  const oldKey = hashPath(oldPath)
+  const newKey = hashPath(newPath)
+
+  const oldEntry = index.entries[oldKey]
+  if (!oldEntry) return null
+  if (oldKey !== newKey && index.entries[newKey]) return null
+
+  const entries = { ...index.entries }
+  delete entries[oldKey]
+
+  entries[newKey] = {
+    ...oldEntry,
+    path: newPath,
+    name: newName,
+    updatedAt: Date.now()
+  }
+
+  const order = index.order
+    .filter((key) => key !== oldKey && key !== newKey)
+    .concat(newKey)
+
+  return {
+    index: {
+      v: 2,
+      updatedAt: Date.now(),
+      order,
+      entries
+    },
+    oldKey,
+    newKey
+  }
+}
+
+/**
+ * Gets the most recently used draft key.
+ */
+export function getMostRecentKey(index: DraftIndexV2): string | null {
+  return index.order.length > 0 ? index.order[index.order.length - 1] : null
+}
+
+/**
+ * Gets entry metadata by path.
+ */
+export function getEntryByPath(
+  index: DraftIndexV2,
+  path: string
+): DraftEntryMeta | null {
+  const draftKey = hashPath(path)
+  return index.entries[draftKey] ?? null
+}
+
+/**
+ * Removes entries from index that don't have corresponding payloads.
+ * Used for index/payload drift recovery.
+ *
+ * @param index - The draft index
+ * @param existingPayloadKeys - Set of draft keys that have payloads in storage
+ * @returns Updated index with orphaned entries removed
+ */
+export function removeOrphanedEntries(
+  index: DraftIndexV2,
+  existingPayloadKeys: Set<string>
+): DraftIndexV2 {
+  const entries: Record<string, DraftEntryMeta> = {}
+  const order: string[] = []
+
+  for (const key of index.order) {
+    if (existingPayloadKeys.has(key) && index.entries[key]) {
+      entries[key] = index.entries[key]
+      order.push(key)
+    }
+  }
+
+  return {
+    v: 2,
+    updatedAt: Date.now(),
+    order,
+    entries
+  }
+}
diff --git a/src/platform/workflow/persistence/base/draftTypes.ts b/src/platform/workflow/persistence/base/draftTypes.ts
new file mode 100644
index 0000000000..abb99d7312
--- /dev/null
+++ b/src/platform/workflow/persistence/base/draftTypes.ts
@@ -0,0 +1,84 @@
+/**
+ * V2 Workflow Persistence Type Definitions
+ *
+ * Two-layer state system:
+ * - sessionStorage: Per-tab pointers (tiny, scoped by clientId)
+ * - localStorage: Persistent drafts (per-workspace, per-draft keys)
+ */
+
+/**
+ * Metadata for a single draft entry stored in the index.
+ * The actual workflow data is stored separately in a Draft payload key.
+ */
+export interface DraftEntryMeta {
+  /** Workflow path (e.g., "workflows/Untitled.json") */
+  path: string
+  /** Display name of the workflow */
+  name: string
+  /** Whether this is an unsaved temporary workflow */
+  isTemporary: boolean
+  /** Last update timestamp (ms since epoch) */
+  updatedAt: number
+}
+
+/**
+ * Draft index stored in localStorage.
+ * Contains LRU order and metadata for all drafts in a workspace.
+ *
+ * Key: `Comfy.Workflow.DraftIndex.v2:${workspaceId}`
+ */
+export interface DraftIndexV2 {
+  /** Schema version */
+  v: 2
+  /** Last update timestamp */
+  updatedAt: number
+  /** LRU order: oldest → newest (draftKey array) */
+  order: string[]
+  /** Metadata keyed by draftKey (hash of path) */
+  entries: Record<string, DraftEntryMeta>
+}
+
+/**
+ * Individual draft payload stored in localStorage.
+ *
+ * Key: `Comfy.Workflow.Draft.v2:${workspaceId}:${draftKey}`
+ */
+export interface DraftPayloadV2 {
+  /** Serialized workflow JSON */
+  data: string
+  /** Last update timestamp */
+  updatedAt: number
+}
+
+/**
+ * Pointer stored in sessionStorage to track active workflow per tab.
+ * Includes workspaceId for validation on read.
+ *
+ * Key: `Comfy.Workflow.ActivePath:${clientId}`
+ */
+export interface ActivePathPointer {
+  /** Workspace ID for validation */
+  workspaceId: string
+  /** Path to the active workflow */
+  path: string
+}
+
+/**
+ * Pointer stored in sessionStorage to track open workflow tabs.
+ * Includes workspaceId for validation on read.
+ *
+ * Key: `Comfy.Workflow.OpenPaths:${clientId}`
+ */
+export interface OpenPathsPointer {
+  /** Workspace ID for validation */
+  workspaceId: string
+  /** Ordered list of open workflow paths */
+  paths: string[]
+  /** Index of the active workflow in paths array */
+  activeIndex: number
+}
+
+/** Maximum number of drafts to keep per workspace */
+export const MAX_DRAFTS = 32
+
+export const PERSIST_DEBOUNCE_MS = 512
diff --git a/src/platform/workflow/persistence/base/hashUtil.test.ts b/src/platform/workflow/persistence/base/hashUtil.test.ts
new file mode 100644
index 0000000000..30595b2876
--- /dev/null
+++ b/src/platform/workflow/persistence/base/hashUtil.test.ts
@@ -0,0 +1,65 @@
+import { describe, expect, it } from 'vitest'
+
+import { fnv1a, hashPath } from './hashUtil'
+
+describe('fnv1a', () => {
+  it('returns consistent hash for same input', () => {
+    const hash1 = fnv1a('workflows/test.json')
+    const hash2 = fnv1a('workflows/test.json')
+    expect(hash1).toBe(hash2)
+  })
+
+  it('returns different hashes for different inputs', () => {
+    const hash1 = fnv1a('workflows/a.json')
+    const hash2 = fnv1a('workflows/b.json')
+    expect(hash1).not.toBe(hash2)
+  })
+
+  it('returns unsigned 32-bit integer', () => {
+    const hash = fnv1a('test')
+    expect(hash).toBeGreaterThanOrEqual(0)
+    expect(hash).toBeLessThanOrEqual(0xffffffff)
+  })
+
+  it('handles empty string', () => {
+    const hash = fnv1a('')
+    expect(hash).toBe(2166136261)
+  })
+
+  it('handles unicode characters', () => {
+    const hash = fnv1a('workflows/工作流程.json')
+    expect(hash).toBeGreaterThanOrEqual(0)
+    expect(hash).toBeLessThanOrEqual(0xffffffff)
+  })
+
+  it('handles special characters', () => {
+    const hash = fnv1a('workflows/My Workflow (Copy 2).json')
+    expect(hash).toBeGreaterThanOrEqual(0)
+  })
+})
+
+describe('hashPath', () => {
+  it('returns 8-character hex string', () => {
+    const result = hashPath('workflows/test.json')
+    expect(result).toMatch(/^[0-9a-f]{8}$/)
+  })
+
+  it('pads short hashes with leading zeros', () => {
+    const result = hashPath('')
+    expect(result).toHaveLength(8)
+    expect(result).toBe('811c9dc5')
+  })
+
+  it('returns consistent results', () => {
+    const path = 'workflows/My Complex Workflow Name.json'
+    const hash1 = hashPath(path)
+    const hash2 = hashPath(path)
+    expect(hash1).toBe(hash2)
+  })
+
+  it('produces different hashes for similar paths', () => {
+    const hash1 = hashPath('workflows/Untitled.json')
+    const hash2 = hashPath('workflows/Untitled (2).json')
+    expect(hash1).not.toBe(hash2)
+  })
+})
diff --git a/src/platform/workflow/persistence/base/hashUtil.ts b/src/platform/workflow/persistence/base/hashUtil.ts
new file mode 100644
index 0000000000..85fe99368c
--- /dev/null
+++ b/src/platform/workflow/persistence/base/hashUtil.ts
@@ -0,0 +1,30 @@
+/**
+ * FNV-1a hash function for creating short, deterministic keys from strings.
+ *
+ * Used to create 8-character hex keys from workflow paths for localStorage keys.
+ * FNV-1a is chosen for its simplicity, speed, and good distribution properties.
+ *
+ * @param str - The string to hash (typically a workflow path)
+ * @returns A 32-bit unsigned integer hash
+ */
+export function fnv1a(str: string): number {
+  let hash = 2166136261
+  for (let i = 0; i < str.length; i++) {
+    hash ^= str.charCodeAt(i)
+    hash = Math.imul(hash, 16777619)
+  }
+  return hash >>> 0
+}
+
+/**
+ * Creates an 8-character hex key from a workflow path using FNV-1a hash.
+ *
+ * @param path - The workflow path (e.g., "workflows/My Workflow.json")
+ * @returns An 8-character hex string (e.g., "a1b2c3d4")
+ *
+ * @example
+ * hashPath("workflows/Untitled.json") // "1a2b3c4d"
+ */
+export function hashPath(path: string): string {
+  return fnv1a(path).toString(16).padStart(8, '0')
+}
diff --git a/src/platform/workflow/persistence/base/storageIO.test.ts b/src/platform/workflow/persistence/base/storageIO.test.ts
new file mode 100644
index 0000000000..bac277d860
--- /dev/null
+++ b/src/platform/workflow/persistence/base/storageIO.test.ts
@@ -0,0 +1,321 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { DraftIndexV2, DraftPayloadV2 } from './draftTypes'
+import {
+  clearAllV2Storage,
+  deleteOrphanPayloads,
+  deletePayload,
+  deletePayloads,
+  getPayloadKeys,
+  readActivePath,
+  readIndex,
+  readOpenPaths,
+  readPayload,
+  writeActivePath,
+  writeIndex,
+  writeOpenPaths,
+  writePayload
+} from './storageIO'
+
+describe('storageIO', () => {
+  beforeEach(() => {
+    localStorage.clear()
+    sessionStorage.clear()
+    vi.resetModules()
+  })
+
+  afterEach(() => {
+    localStorage.clear()
+    sessionStorage.clear()
+  })
+
+  describe('index operations', () => {
+    const workspaceId = 'test-workspace'
+
+    it('reads and writes index', () => {
+      const index: DraftIndexV2 = {
+        v: 2,
+        updatedAt: Date.now(),
+        order: ['abc123'],
+        entries: {
+          abc123: {
+            path: 'workflows/test.json',
+            name: 'test',
+            isTemporary: true,
+            updatedAt: Date.now()
+          }
+        }
+      }
+
+      expect(writeIndex(workspaceId, index)).toBe(true)
+
+      const read = readIndex(workspaceId)
+      expect(read).not.toBeNull()
+      expect(read!.v).toBe(2)
+      expect(read!.order).toEqual(['abc123'])
+    })
+
+    it('returns null for missing index', () => {
+      expect(readIndex(workspaceId)).toBeNull()
+    })
+
+    it('returns null for invalid JSON', () => {
+      localStorage.setItem(
+        'Comfy.Workflow.DraftIndex.v2:test-workspace',
+        'invalid'
+      )
+      expect(readIndex(workspaceId)).toBeNull()
+    })
+
+    it('returns null for wrong version', () => {
+      localStorage.setItem(
+        'Comfy.Workflow.DraftIndex.v2:test-workspace',
+        JSON.stringify({ v: 1 })
+      )
+      expect(readIndex(workspaceId)).toBeNull()
+    })
+  })
+
+  describe('payload operations', () => {
+    const workspaceId = 'test-workspace'
+    const draftKey = 'abc12345'
+
+    it('reads and writes payload', () => {
+      const payload: DraftPayloadV2 = {
+        data: '{"nodes":[]}',
+        updatedAt: Date.now()
+      }
+
+      expect(writePayload(workspaceId, draftKey, payload)).toBe(true)
+
+      const read = readPayload(workspaceId, draftKey)
+      expect(read).not.toBeNull()
+      expect(read!.data).toBe('{"nodes":[]}')
+    })
+
+    it('returns null for missing payload', () => {
+      expect(readPayload(workspaceId, 'missing')).toBeNull()
+    })
+
+    it('deletes payload', () => {
+      const payload: DraftPayloadV2 = {
+        data: '{}',
+        updatedAt: Date.now()
+      }
+      writePayload(workspaceId, draftKey, payload)
+      expect(readPayload(workspaceId, draftKey)).not.toBeNull()
+
+      deletePayload(workspaceId, draftKey)
+      expect(readPayload(workspaceId, draftKey)).toBeNull()
+    })
+
+    it('deletes multiple payloads', () => {
+      writePayload(workspaceId, 'key1', { data: '{}', updatedAt: 1 })
+      writePayload(workspaceId, 'key2', { data: '{}', updatedAt: 2 })
+      writePayload(workspaceId, 'key3', { data: '{}', updatedAt: 3 })
+
+      deletePayloads(workspaceId, ['key1', 'key3'])
+
+      expect(readPayload(workspaceId, 'key1')).toBeNull()
+      expect(readPayload(workspaceId, 'key2')).not.toBeNull()
+      expect(readPayload(workspaceId, 'key3')).toBeNull()
+    })
+  })
+
+  describe('getPayloadKeys', () => {
+    it('returns all payload keys for workspace', () => {
+      localStorage.setItem('Comfy.Workflow.Draft.v2:ws-1:abc', '{"data":""}')
+      localStorage.setItem('Comfy.Workflow.Draft.v2:ws-1:def', '{"data":""}')
+      localStorage.setItem('Comfy.Workflow.Draft.v2:ws-2:ghi', '{"data":""}')
+      localStorage.setItem('unrelated-key', 'value')
+
+      const keys = getPayloadKeys('ws-1')
+      expect(keys).toHaveLength(2)
+      expect(keys).toContain('abc')
+      expect(keys).toContain('def')
+    })
+  })
+
+  describe('deleteOrphanPayloads', () => {
+    it('deletes payloads not in index', () => {
+      localStorage.setItem('Comfy.Workflow.Draft.v2:ws-1:keep', '{"data":""}')
+      localStorage.setItem(
+        'Comfy.Workflow.Draft.v2:ws-1:orphan1',
+        '{"data":""}'
+      )
+      localStorage.setItem(
+        'Comfy.Workflow.Draft.v2:ws-1:orphan2',
+        '{"data":""}'
+      )
+
+      const indexKeys = new Set(['keep'])
+      const deleted = deleteOrphanPayloads('ws-1', indexKeys)
+
+      expect(deleted).toBe(2)
+      expect(getPayloadKeys('ws-1')).toEqual(['keep'])
+    })
+  })
+
+  describe('session storage pointers', () => {
+    const clientId = 'client-abc'
+
+    it('reads and writes active path pointer', () => {
+      const pointer = { workspaceId: 'ws-1', path: 'workflows/test.json' }
+      writeActivePath(clientId, pointer)
+
+      const read = readActivePath(clientId)
+      expect(read).toEqual(pointer)
+    })
+
+    it('returns null for missing active path', () => {
+      expect(readActivePath('missing')).toBeNull()
+    })
+
+    it('reads and writes open paths pointer', () => {
+      const pointer = {
+        workspaceId: 'ws-1',
+        paths: ['workflows/a.json', 'workflows/b.json'],
+        activeIndex: 1
+      }
+      writeOpenPaths(clientId, pointer)
+
+      const read = readOpenPaths(clientId)
+      expect(read).toEqual(pointer)
+    })
+
+    it('returns null for missing open paths', () => {
+      expect(readOpenPaths('missing')).toBeNull()
+    })
+
+    it('falls back to workspace search when clientId does not match and migrates', () => {
+      const oldClientId = 'old-client'
+      const newClientId = 'new-client'
+      const workspaceId = 'ws-123'
+
+      // Store pointer with old clientId
+      const pointer = {
+        workspaceId,
+        paths: ['workflows/a.json', 'workflows/b.json'],
+        activeIndex: 0
+      }
+      writeOpenPaths(oldClientId, pointer)
+
+      // Read with new clientId but same workspace - should find via fallback
+      const read = readOpenPaths(newClientId, workspaceId)
+      expect(read).toEqual(pointer)
+
+      // Should have migrated to new key and removed old key
+      const oldKey = `Comfy.Workflow.OpenPaths:${oldClientId}`
+      const newKey = `Comfy.Workflow.OpenPaths:${newClientId}`
+      expect(sessionStorage.getItem(oldKey)).toBeNull()
+      expect(sessionStorage.getItem(newKey)).not.toBeNull()
+    })
+
+    it('does not fall back to different workspace pointer', () => {
+      const oldClientId = 'old-client'
+      const newClientId = 'new-client'
+
+      // Store pointer for workspace-A
+      writeOpenPaths(oldClientId, {
+        workspaceId: 'workspace-A',
+        paths: ['workflows/a.json'],
+        activeIndex: 0
+      })
+
+      // Read with new clientId looking for workspace-B - should not find
+      const read = readOpenPaths(newClientId, 'workspace-B')
+      expect(read).toBeNull()
+    })
+
+    it('prefers exact clientId match over fallback search', () => {
+      const clientId = 'my-client'
+      const workspaceId = 'ws-123'
+
+      // Store pointer with different clientId for same workspace
+      writeOpenPaths('other-client', {
+        workspaceId,
+        paths: ['workflows/old.json'],
+        activeIndex: 0
+      })
+
+      // Store pointer with exact clientId match
+      const exactPointer = {
+        workspaceId,
+        paths: ['workflows/exact.json'],
+        activeIndex: 0
+      }
+      writeOpenPaths(clientId, exactPointer)
+
+      // Should return exact match, not fallback
+      const read = readOpenPaths(clientId, workspaceId)
+      expect(read).toEqual(exactPointer)
+    })
+
+    it('removes stale exact match from wrong workspace and falls back', () => {
+      const clientId = 'my-client'
+
+      // Store pointer for workspace-A under this clientId
+      writeActivePath(clientId, {
+        workspaceId: 'ws-A',
+        path: 'workflows/stale.json'
+      })
+
+      // Store pointer for workspace-B under a different clientId
+      writeActivePath('old-client', {
+        workspaceId: 'ws-B',
+        path: 'workflows/correct.json'
+      })
+
+      // Reading with workspace-B should skip the stale ws-A pointer and find the fallback
+      const result = readActivePath(clientId, 'ws-B')
+      expect(result).toEqual({
+        workspaceId: 'ws-B',
+        path: 'workflows/correct.json'
+      })
+
+      // Stale pointer should have been removed
+      const raw = sessionStorage.getItem(
+        `Comfy.Workflow.ActivePath:${clientId}`
+      )
+      expect(JSON.parse(raw!).workspaceId).toBe('ws-B')
+    })
+  })
+
+  describe('clearAllV2Storage', () => {
+    it('clears all V2 keys from localStorage', () => {
+      localStorage.setItem('Comfy.Workflow.DraftIndex.v2:ws-1', '{}')
+      localStorage.setItem('Comfy.Workflow.Draft.v2:ws-1:abc', '{}')
+      localStorage.setItem('Comfy.Workflow.Draft.v2:ws-2:def', '{}')
+      localStorage.setItem('unrelated', 'keep')
+
+      clearAllV2Storage()
+
+      expect(
+        localStorage.getItem('Comfy.Workflow.DraftIndex.v2:ws-1')
+      ).toBeNull()
+      expect(
+        localStorage.getItem('Comfy.Workflow.Draft.v2:ws-1:abc')
+      ).toBeNull()
+      expect(
+        localStorage.getItem('Comfy.Workflow.Draft.v2:ws-2:def')
+      ).toBeNull()
+      expect(localStorage.getItem('unrelated')).toBe('keep')
+    })
+
+    it('clears all V2 keys from sessionStorage', () => {
+      sessionStorage.setItem('Comfy.Workflow.ActivePath:client-1', '{}')
+      sessionStorage.setItem('Comfy.Workflow.OpenPaths:client-2', '{}')
+      sessionStorage.setItem('unrelated', 'keep')
+
+      clearAllV2Storage()
+
+      expect(
+        sessionStorage.getItem('Comfy.Workflow.ActivePath:client-1')
+      ).toBeNull()
+      expect(
+        sessionStorage.getItem('Comfy.Workflow.OpenPaths:client-2')
+      ).toBeNull()
+      expect(sessionStorage.getItem('unrelated')).toBe('keep')
+    })
+  })
+})
diff --git a/src/platform/workflow/persistence/base/storageIO.ts b/src/platform/workflow/persistence/base/storageIO.ts
new file mode 100644
index 0000000000..c09943022a
--- /dev/null
+++ b/src/platform/workflow/persistence/base/storageIO.ts
@@ -0,0 +1,357 @@
+/**
+ * V2 Storage I/O - localStorage read/write with error handling.
+ *
+ * Handles quota management, orphan cleanup, and graceful degradation.
+ */
+
+import type {
+  ActivePathPointer,
+  DraftIndexV2,
+  DraftPayloadV2,
+  OpenPathsPointer
+} from './draftTypes'
+import { StorageKeys } from './storageKeys'
+
+/** Flag indicating if storage is available */
+let storageAvailable = true
+
+export function isStorageAvailable(): boolean {
+  return storageAvailable
+}
+
+export function markStorageUnavailable(): void {
+  storageAvailable = false
+}
+
+function isQuotaExceeded(error: unknown): boolean {
+  return (
+    error instanceof DOMException &&
+    (error.name === 'QuotaExceededError' ||
+      error.name === 'NS_ERROR_DOM_QUOTA_REACHED' ||
+      error.code === 22 ||
+      error.code === 1014)
+  )
+}
+
+function isValidIndex(value: unknown): value is DraftIndexV2 {
+  if (typeof value !== 'object' || value === null) return false
+  const obj = value as Record<string, unknown>
+  return (
+    obj.v === 2 &&
+    typeof obj.updatedAt === 'number' &&
+    Array.isArray(obj.order) &&
+    typeof obj.entries === 'object' &&
+    obj.entries !== null
+  )
+}
+
+/**
+ * Reads and parses the draft index from localStorage.
+ */
+export function readIndex(workspaceId: string): DraftIndexV2 | null {
+  if (!storageAvailable) return null
+
+  try {
+    const key = StorageKeys.draftIndex(workspaceId)
+    const json = localStorage.getItem(key)
+    if (!json) return null
+
+    const parsed = JSON.parse(json)
+    if (!isValidIndex(parsed)) return null
+
+    return parsed
+  } catch {
+    return null
+  }
+}
+
+/**
+ * Writes the draft index to localStorage.
+ */
+export function writeIndex(workspaceId: string, index: DraftIndexV2): boolean {
+  if (!storageAvailable) return false
+
+  try {
+    const key = StorageKeys.draftIndex(workspaceId)
+    localStorage.setItem(key, JSON.stringify(index))
+    return true
+  } catch (error) {
+    if (isQuotaExceeded(error)) return false
+    throw error
+  }
+}
+
+/**
+ * Reads a draft payload from localStorage.
+ */
+export function readPayload(
+  workspaceId: string,
+  draftKey: string
+): DraftPayloadV2 | null {
+  if (!storageAvailable) return null
+
+  try {
+    const key = `${StorageKeys.prefixes.draftPayload}${workspaceId}:${draftKey}`
+    const json = localStorage.getItem(key)
+    if (!json) return null
+
+    return JSON.parse(json) as DraftPayloadV2
+  } catch {
+    return null
+  }
+}
+
+/**
+ * Writes a draft payload to localStorage.
+ */
+export function writePayload(
+  workspaceId: string,
+  draftKey: string,
+  payload: DraftPayloadV2
+): boolean {
+  if (!storageAvailable) return false
+
+  try {
+    const key = `${StorageKeys.prefixes.draftPayload}${workspaceId}:${draftKey}`
+    localStorage.setItem(key, JSON.stringify(payload))
+    return true
+  } catch (error) {
+    if (isQuotaExceeded(error)) return false
+    throw error
+  }
+}
+
+/**
+ * Deletes a draft payload from localStorage.
+ */
+export function deletePayload(workspaceId: string, draftKey: string): void {
+  try {
+    const key = `${StorageKeys.prefixes.draftPayload}${workspaceId}:${draftKey}`
+    localStorage.removeItem(key)
+  } catch {
+    // Ignore errors during deletion
+  }
+}
+
+/**
+ * Deletes multiple draft payloads from localStorage.
+ */
+export function deletePayloads(workspaceId: string, draftKeys: string[]): void {
+  for (const draftKey of draftKeys) {
+    deletePayload(workspaceId, draftKey)
+  }
+}
+
+/**
+ * Gets all draft payload keys for a workspace from localStorage.
+ */
+export function getPayloadKeys(workspaceId: string): string[] {
+  if (!storageAvailable) return []
+
+  const prefix = `${StorageKeys.prefixes.draftPayload}${workspaceId}:`
+  const keys: string[] = []
+
+  try {
+    for (let i = 0; i < localStorage.length; i++) {
+      const key = localStorage.key(i)
+      if (key?.startsWith(prefix)) {
+        keys.push(key.slice(prefix.length))
+      }
+    }
+  } catch {
+    return []
+  }
+
+  return keys
+}
+
+/**
+ * Deletes orphan payloads that are not in the index.
+ */
+export function deleteOrphanPayloads(
+  workspaceId: string,
+  indexKeys: Set<string>
+): number {
+  const payloadKeys = getPayloadKeys(workspaceId)
+  let deleted = 0
+
+  for (const key of payloadKeys) {
+    if (!indexKeys.has(key)) {
+      deletePayload(workspaceId, key)
+      deleted++
+    }
+  }
+
+  return deleted
+}
+
+/**
+ * Searches sessionStorage for a pointer matching the target workspaceId
+ * when the exact clientId key has no entry (e.g. clientId changed after reload).
+ * Migrates the found pointer to the new clientId key.
+ */
+function findAndMigratePointer<T extends { workspaceId: string }>(
+  newKey: string,
+  prefix: string,
+  targetWorkspaceId: string
+): T | null {
+  for (let i = 0; i < sessionStorage.length; i++) {
+    const storageKey = sessionStorage.key(i)
+    if (!storageKey?.startsWith(prefix) || storageKey === newKey) continue
+
+    const json = sessionStorage.getItem(storageKey)
+    if (!json) continue
+
+    try {
+      const pointer = JSON.parse(json) as T
+      if (pointer.workspaceId === targetWorkspaceId) {
+        sessionStorage.setItem(newKey, json)
+        sessionStorage.removeItem(storageKey)
+        return pointer
+      }
+    } catch {
+      continue
+    }
+  }
+  return null
+}
+
+/**
+ * Reads a session pointer by clientId with workspace-based fallback.
+ * Validates workspace on exact match and removes stale cross-workspace pointers.
+ * If no valid entry exists, searches for any pointer matching the target
+ * workspaceId and migrates it to the new key.
+ */
+function readSessionPointer<T extends { workspaceId: string }>(
+  key: string,
+  prefix: string,
+  targetWorkspaceId?: string
+): T | null {
+  try {
+    const json = sessionStorage.getItem(key)
+    if (json) {
+      const pointer = JSON.parse(json) as T
+      if (targetWorkspaceId && pointer.workspaceId !== targetWorkspaceId) {
+        sessionStorage.removeItem(key)
+      } else {
+        return pointer
+      }
+    }
+
+    if (targetWorkspaceId) {
+      return findAndMigratePointer<T>(key, prefix, targetWorkspaceId)
+    }
+
+    return null
+  } catch {
+    return null
+  }
+}
+
+/**
+ * Reads the active path pointer from sessionStorage.
+ * Falls back to workspace-based search when clientId changes after reload.
+ */
+export function readActivePath(
+  clientId: string,
+  targetWorkspaceId?: string
+): ActivePathPointer | null {
+  return readSessionPointer<ActivePathPointer>(
+    StorageKeys.activePath(clientId),
+    StorageKeys.prefixes.activePath,
+    targetWorkspaceId
+  )
+}
+
+/**
+ * Writes the active path pointer to sessionStorage.
+ */
+export function writeActivePath(
+  clientId: string,
+  pointer: ActivePathPointer
+): void {
+  try {
+    const key = StorageKeys.activePath(clientId)
+    sessionStorage.setItem(key, JSON.stringify(pointer))
+  } catch {
+    // Best effort - ignore errors
+  }
+}
+
+/**
+ * Reads the open paths pointer from sessionStorage.
+ * Falls back to workspace-based search when clientId changes after reload.
+ */
+export function readOpenPaths(
+  clientId: string,
+  targetWorkspaceId?: string
+): OpenPathsPointer | null {
+  return readSessionPointer<OpenPathsPointer>(
+    StorageKeys.openPaths(clientId),
+    StorageKeys.prefixes.openPaths,
+    targetWorkspaceId
+  )
+}
+
+/**
+ * Writes the open paths pointer to sessionStorage.
+ */
+export function writeOpenPaths(
+  clientId: string,
+  pointer: OpenPathsPointer
+): void {
+  try {
+    const key = StorageKeys.openPaths(clientId)
+    sessionStorage.setItem(key, JSON.stringify(pointer))
+  } catch {
+    // Best effort - ignore errors
+  }
+}
+
+/**
+ * Clears all V2 workflow persistence data from storage.
+ * Used during signout to prevent data leakage.
+ */
+export function clearAllV2Storage(): void {
+  if (!storageAvailable) return
+
+  const prefixes = [
+    StorageKeys.prefixes.draftIndex,
+    StorageKeys.prefixes.draftPayload
+  ]
+
+  try {
+    for (let i = localStorage.length - 1; i >= 0; i--) {
+      const key = localStorage.key(i)
+      if (key && prefixes.some((prefix) => key.startsWith(prefix))) {
+        try {
+          localStorage.removeItem(key)
+        } catch {
+          // Ignore
+        }
+      }
+    }
+  } catch {
+    // Ignore
+  }
+
+  const sessionPrefixes = [
+    StorageKeys.prefixes.activePath,
+    StorageKeys.prefixes.openPaths
+  ]
+
+  try {
+    for (let i = sessionStorage.length - 1; i >= 0; i--) {
+      const key = sessionStorage.key(i)
+      if (key && sessionPrefixes.some((prefix) => key.startsWith(prefix))) {
+        try {
+          sessionStorage.removeItem(key)
+        } catch {
+          // Ignore
+        }
+      }
+    }
+  } catch {
+    // Ignore
+  }
+}
diff --git a/src/platform/workflow/persistence/base/storageKeys.test.ts b/src/platform/workflow/persistence/base/storageKeys.test.ts
new file mode 100644
index 0000000000..72fd7e6590
--- /dev/null
+++ b/src/platform/workflow/persistence/base/storageKeys.test.ts
@@ -0,0 +1,123 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+describe('storageKeys', () => {
+  beforeEach(() => {
+    vi.resetModules()
+    sessionStorage.clear()
+  })
+
+  describe('getWorkspaceId', () => {
+    it('returns personal when no workspace is set', async () => {
+      const { getWorkspaceId } = await import('./storageKeys')
+      expect(getWorkspaceId()).toBe('personal')
+    })
+
+    it('returns personal for personal workspace type', async () => {
+      sessionStorage.setItem(
+        'Comfy.Workspace.Current',
+        JSON.stringify({ type: 'personal', id: null })
+      )
+      const { getWorkspaceId } = await import('./storageKeys')
+      expect(getWorkspaceId()).toBe('personal')
+    })
+
+    it('returns workspace ID for team workspace', async () => {
+      sessionStorage.setItem(
+        'Comfy.Workspace.Current',
+        JSON.stringify({ type: 'team', id: 'ws-abc-123' })
+      )
+      const { getWorkspaceId } = await import('./storageKeys')
+      expect(getWorkspaceId()).toBe('ws-abc-123')
+    })
+
+    it('returns personal when JSON parsing fails', async () => {
+      sessionStorage.setItem('Comfy.Workspace.Current', 'invalid-json')
+      const { getWorkspaceId } = await import('./storageKeys')
+      expect(getWorkspaceId()).toBe('personal')
+    })
+
+    it('returns personal when workspace has no id', async () => {
+      sessionStorage.setItem(
+        'Comfy.Workspace.Current',
+        JSON.stringify({ type: 'team', id: '' })
+      )
+      const { getWorkspaceId } = await import('./storageKeys')
+      expect(getWorkspaceId()).toBe('personal')
+    })
+
+    it('reads fresh value on each call (not cached)', async () => {
+      const { getWorkspaceId } = await import('./storageKeys')
+
+      // Initially no workspace set
+      expect(getWorkspaceId()).toBe('personal')
+
+      // Set workspace after import
+      sessionStorage.setItem(
+        'Comfy.Workspace.Current',
+        JSON.stringify({ type: 'team', id: 'ws-new' })
+      )
+
+      // Should read the new value (not cached 'personal')
+      expect(getWorkspaceId()).toBe('ws-new')
+
+      // Change workspace again
+      sessionStorage.setItem(
+        'Comfy.Workspace.Current',
+        JSON.stringify({ type: 'team', id: 'ws-another' })
+      )
+
+      expect(getWorkspaceId()).toBe('ws-another')
+    })
+  })
+
+  describe('StorageKeys', () => {
+    it('generates draftIndex key with workspace scope', async () => {
+      const { StorageKeys } = await import('./storageKeys')
+
+      expect(StorageKeys.draftIndex('ws-123')).toBe(
+        'Comfy.Workflow.DraftIndex.v2:ws-123'
+      )
+    })
+
+    it('generates draftPayload key with hash', async () => {
+      const { StorageKeys } = await import('./storageKeys')
+      const key = StorageKeys.draftPayload('workflows/test.json', 'ws-1')
+
+      expect(key).toMatch(/^Comfy\.Workflow\.Draft\.v2:ws-1:[0-9a-f]{8}$/)
+    })
+
+    it('generates consistent draftKey from path', async () => {
+      const { StorageKeys } = await import('./storageKeys')
+      const key1 = StorageKeys.draftKey('workflows/test.json')
+      const key2 = StorageKeys.draftKey('workflows/test.json')
+
+      expect(key1).toBe(key2)
+      expect(key1).toMatch(/^[0-9a-f]{8}$/)
+    })
+
+    it('generates activePath key with clientId', async () => {
+      const { StorageKeys } = await import('./storageKeys')
+      expect(StorageKeys.activePath('client-abc')).toBe(
+        'Comfy.Workflow.ActivePath:client-abc'
+      )
+    })
+
+    it('generates openPaths key with clientId', async () => {
+      const { StorageKeys } = await import('./storageKeys')
+      expect(StorageKeys.openPaths('client-abc')).toBe(
+        'Comfy.Workflow.OpenPaths:client-abc'
+      )
+    })
+
+    it('exposes prefix patterns for cleanup', async () => {
+      const { StorageKeys } = await import('./storageKeys')
+
+      expect(StorageKeys.prefixes.draftIndex).toBe(
+        'Comfy.Workflow.DraftIndex.v2:'
+      )
+      expect(StorageKeys.prefixes.draftPayload).toBe('Comfy.Workflow.Draft.v2:')
+      expect(StorageKeys.prefixes.activePath).toBe('Comfy.Workflow.ActivePath:')
+      expect(StorageKeys.prefixes.openPaths).toBe('Comfy.Workflow.OpenPaths:')
+    })
+  })
+})
diff --git a/src/platform/workflow/persistence/base/storageKeys.ts b/src/platform/workflow/persistence/base/storageKeys.ts
new file mode 100644
index 0000000000..18b943891c
--- /dev/null
+++ b/src/platform/workflow/persistence/base/storageKeys.ts
@@ -0,0 +1,84 @@
+import { WORKSPACE_STORAGE_KEYS } from '@/platform/workspace/workspaceConstants'
+
+import { hashPath } from './hashUtil'
+
+/**
+ * Gets the current workspace ID from sessionStorage.
+ * Returns 'personal' for personal workspace or when no workspace is set.
+ *
+ * NOTE: This is called fresh each time rather than cached at module load,
+ * because the workspace auth store may not have set sessionStorage yet
+ * when this module is first imported.
+ */
+export function getWorkspaceId(): string {
+  try {
+    const json = sessionStorage.getItem(
+      WORKSPACE_STORAGE_KEYS.CURRENT_WORKSPACE
+    )
+    if (!json) return 'personal'
+
+    const workspace = JSON.parse(json)
+    if (workspace.type === 'personal' || !workspace.id) return 'personal'
+    return workspace.id
+  } catch {
+    return 'personal'
+  }
+}
+
+/**
+ * Storage key generators for V2 workflow persistence.
+ *
+ * localStorage keys are scoped by workspaceId.
+ * sessionStorage keys are scoped by clientId.
+ */
+export const StorageKeys = {
+  /**
+   * Draft index key for localStorage.
+   * Contains LRU order and metadata for all drafts.
+   */
+  draftIndex(workspaceId: string): string {
+    return `Comfy.Workflow.DraftIndex.v2:${workspaceId}`
+  },
+
+  /**
+   * Individual draft payload key for localStorage.
+   * @param path - Workflow path (will be hashed to create key)
+   */
+  draftPayload(path: string, workspaceId: string): string {
+    const draftKey = hashPath(path)
+    return `Comfy.Workflow.Draft.v2:${workspaceId}:${draftKey}`
+  },
+
+  /**
+   * Creates a draft key (hash) from a workflow path.
+   */
+  draftKey(path: string): string {
+    return hashPath(path)
+  },
+
+  /**
+   * Active workflow pointer key for sessionStorage.
+   * @param clientId - Browser tab identifier from api.clientId
+   */
+  activePath(clientId: string): string {
+    return `Comfy.Workflow.ActivePath:${clientId}`
+  },
+
+  /**
+   * Open workflows pointer key for sessionStorage.
+   * @param clientId - Browser tab identifier from api.clientId
+   */
+  openPaths(clientId: string): string {
+    return `Comfy.Workflow.OpenPaths:${clientId}`
+  },
+
+  /**
+   * Prefix patterns for cleanup operations.
+   */
+  prefixes: {
+    draftIndex: 'Comfy.Workflow.DraftIndex.v2:',
+    draftPayload: 'Comfy.Workflow.Draft.v2:',
+    activePath: 'Comfy.Workflow.ActivePath:',
+    openPaths: 'Comfy.Workflow.OpenPaths:'
+  }
+} as const
diff --git a/tests-ui/tests/composables/useWorkflowAutoSave.test.ts b/src/platform/workflow/persistence/composables/useWorkflowAutoSave.test.ts
similarity index 84%
rename from tests-ui/tests/composables/useWorkflowAutoSave.test.ts
rename to src/platform/workflow/persistence/composables/useWorkflowAutoSave.test.ts
index f5dc7ae96a..cd7a3f7617 100644
--- a/tests-ui/tests/composables/useWorkflowAutoSave.test.ts
+++ b/src/platform/workflow/persistence/composables/useWorkflowAutoSave.test.ts
@@ -64,7 +64,7 @@ describe('useWorkflowAutoSave', () => {
 
     vi.advanceTimersByTime(1000)
 
-    const serviceInstance = (useWorkflowService as any).mock.results[0].value
+    const serviceInstance = vi.mocked(useWorkflowService).mock.results[0].value
     expect(serviceInstance.saveWorkflow).toHaveBeenCalledWith(
       mockActiveWorkflow
     )
@@ -85,7 +85,7 @@ describe('useWorkflowAutoSave', () => {
 
     vi.advanceTimersByTime(1000)
 
-    const serviceInstance = (useWorkflowService as any).mock.results[0].value
+    const serviceInstance = vi.mocked(useWorkflowService).mock.results[0].value
     expect(serviceInstance.saveWorkflow).not.toHaveBeenCalledWith(
       mockActiveWorkflow
     )
@@ -106,7 +106,7 @@ describe('useWorkflowAutoSave', () => {
 
     vi.advanceTimersByTime(mockAutoSaveDelay)
 
-    const serviceInstance = (useWorkflowService as any).mock.results[0].value
+    const serviceInstance = vi.mocked(useWorkflowService).mock.results[0].value
     expect(serviceInstance.saveWorkflow).not.toHaveBeenCalled()
   })
 
@@ -125,7 +125,7 @@ describe('useWorkflowAutoSave', () => {
 
     vi.advanceTimersByTime(1000)
 
-    const serviceInstance = (useWorkflowService as any).mock.results[0].value
+    const serviceInstance = vi.mocked(useWorkflowService).mock.results[0].value
     expect(serviceInstance.saveWorkflow).not.toHaveBeenCalled()
 
     vi.advanceTimersByTime(1000)
@@ -146,14 +146,15 @@ describe('useWorkflowAutoSave', () => {
       }
     })
 
-    const serviceInstance = (useWorkflowService as any).mock.results[0].value
-    const graphChangedCallback = (api.addEventListener as any).mock.calls[0][1]
+    const serviceInstance = vi.mocked(useWorkflowService).mock.results[0].value
+    const graphChangedCallback = vi.mocked(api.addEventListener).mock
+      .calls[0][1]
 
-    graphChangedCallback()
+    graphChangedCallback?.({} as Parameters<typeof graphChangedCallback>[0])
 
     vi.advanceTimersByTime(500)
 
-    graphChangedCallback()
+    graphChangedCallback?.({} as Parameters<typeof graphChangedCallback>[0])
 
     vi.advanceTimersByTime(1999)
     expect(serviceInstance.saveWorkflow).not.toHaveBeenCalled()
@@ -180,7 +181,8 @@ describe('useWorkflowAutoSave', () => {
         }
       })
 
-      const serviceInstance = (useWorkflowService as any).mock.results[0].value
+      const serviceInstance =
+        vi.mocked(useWorkflowService).mock.results[0].value
       serviceInstance.saveWorkflow.mockRejectedValue(new Error('Test Error'))
 
       vi.advanceTimersByTime(1000)
@@ -208,7 +210,7 @@ describe('useWorkflowAutoSave', () => {
       }
     })
 
-    const serviceInstance = (useWorkflowService as any).mock.results[0].value
+    const serviceInstance = vi.mocked(useWorkflowService).mock.results[0].value
     let resolveSave: () => void
     const firstSavePromise = new Promise<void>((resolve) => {
       resolveSave = resolve
@@ -218,8 +220,9 @@ describe('useWorkflowAutoSave', () => {
 
     vi.advanceTimersByTime(1000)
 
-    const graphChangedCallback = (api.addEventListener as any).mock.calls[0][1]
-    graphChangedCallback()
+    const graphChangedCallback = vi.mocked(api.addEventListener).mock
+      .calls[0][1]
+    graphChangedCallback?.({} as Parameters<typeof graphChangedCallback>[0])
 
     resolveSave!()
     await Promise.resolve()
@@ -259,14 +262,15 @@ describe('useWorkflowAutoSave', () => {
 
     await vi.runAllTimersAsync()
 
-    const serviceInstance = (useWorkflowService as any).mock.results[0].value
+    const serviceInstance = vi.mocked(useWorkflowService).mock.results[0].value
     expect(serviceInstance.saveWorkflow).toHaveBeenCalledTimes(1)
     serviceInstance.saveWorkflow.mockClear()
 
     mockAutoSaveDelay = -500
 
-    const graphChangedCallback = (api.addEventListener as any).mock.calls[0][1]
-    graphChangedCallback()
+    const graphChangedCallback = vi.mocked(api.addEventListener).mock
+      .calls[0][1]
+    graphChangedCallback?.({} as Parameters<typeof graphChangedCallback>[0])
 
     await vi.runAllTimersAsync()
 
@@ -288,7 +292,7 @@ describe('useWorkflowAutoSave', () => {
 
     vi.advanceTimersByTime(1000)
 
-    const serviceInstance = (useWorkflowService as any).mock.results[0].value
+    const serviceInstance = vi.mocked(useWorkflowService).mock.results[0].value
     expect(serviceInstance.saveWorkflow).not.toHaveBeenCalledWith(
       mockActiveWorkflow
     )
diff --git a/src/platform/workflow/persistence/composables/useWorkflowPersistence.ts b/src/platform/workflow/persistence/composables/useWorkflowPersistence.ts
deleted file mode 100644
index 09ffd58950..0000000000
--- a/src/platform/workflow/persistence/composables/useWorkflowPersistence.ts
+++ /dev/null
@@ -1,202 +0,0 @@
-import { tryOnScopeDispose } from '@vueuse/core'
-import { computed, watch } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
-
-import {
-  hydratePreservedQuery,
-  mergePreservedQueryIntoQuery
-} from '@/platform/navigation/preservedQueryManager'
-import { PRESERVED_QUERY_NAMESPACES } from '@/platform/navigation/preservedQueryNamespaces'
-import { useSettingStore } from '@/platform/settings/settingStore'
-import { useWorkflowService } from '@/platform/workflow/core/services/workflowService'
-import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
-import { useTemplateUrlLoader } from '@/platform/workflow/templates/composables/useTemplateUrlLoader'
-import { api } from '@/scripts/api'
-import { app as comfyApp } from '@/scripts/app'
-import { getStorageValue, setStorageValue } from '@/scripts/utils'
-import { useCommandStore } from '@/stores/commandStore'
-
-export function useWorkflowPersistence() {
-  const workflowStore = useWorkflowStore()
-  const settingStore = useSettingStore()
-  const route = useRoute()
-  const router = useRouter()
-  const templateUrlLoader = useTemplateUrlLoader()
-  const TEMPLATE_NAMESPACE = PRESERVED_QUERY_NAMESPACES.TEMPLATE
-
-  const ensureTemplateQueryFromIntent = async () => {
-    hydratePreservedQuery(TEMPLATE_NAMESPACE)
-    const mergedQuery = mergePreservedQueryIntoQuery(
-      TEMPLATE_NAMESPACE,
-      route.query
-    )
-
-    if (mergedQuery) {
-      await router.replace({ query: mergedQuery })
-    }
-
-    return mergedQuery ?? route.query
-  }
-
-  const workflowPersistenceEnabled = computed(() =>
-    settingStore.get('Comfy.Workflow.Persist')
-  )
-
-  const persistCurrentWorkflow = () => {
-    if (!workflowPersistenceEnabled.value) return
-    const workflow = JSON.stringify(comfyApp.rootGraph.serialize())
-
-    try {
-      localStorage.setItem('workflow', workflow)
-      if (api.clientId) {
-        sessionStorage.setItem(`workflow:${api.clientId}`, workflow)
-      }
-    } catch (error) {
-      // Only log our own keys and aggregate stats
-      const ourKeys = Object.keys(sessionStorage).filter(
-        (key) => key.startsWith('workflow:') || key === 'workflow'
-      )
-      console.error('QuotaExceededError details:', {
-        workflowSizeKB: Math.round(workflow.length / 1024),
-        totalStorageItems: Object.keys(sessionStorage).length,
-        ourWorkflowKeys: ourKeys.length,
-        ourWorkflowSizes: ourKeys.map((key) => ({
-          key,
-          sizeKB: Math.round(sessionStorage[key].length / 1024)
-        })),
-        error: error instanceof Error ? error.message : String(error)
-      })
-      throw error
-    }
-  }
-
-  const loadWorkflowFromStorage = async (
-    json: string | null,
-    workflowName: string | null
-  ) => {
-    if (!json) return false
-    const workflow = JSON.parse(json)
-    await comfyApp.loadGraphData(workflow, true, true, workflowName)
-    return true
-  }
-
-  const loadPreviousWorkflowFromStorage = async () => {
-    const workflowName = getStorageValue('Comfy.PreviousWorkflow')
-    const clientId = api.initialClientId ?? api.clientId
-
-    // Try loading from session storage first
-    if (clientId) {
-      const sessionWorkflow = sessionStorage.getItem(`workflow:${clientId}`)
-      if (await loadWorkflowFromStorage(sessionWorkflow, workflowName)) {
-        return true
-      }
-    }
-
-    // Fall back to local storage
-    const localWorkflow = localStorage.getItem('workflow')
-    return await loadWorkflowFromStorage(localWorkflow, workflowName)
-  }
-
-  const loadDefaultWorkflow = async () => {
-    if (!settingStore.get('Comfy.TutorialCompleted')) {
-      await settingStore.set('Comfy.TutorialCompleted', true)
-      await useWorkflowService().loadBlankWorkflow()
-      await useCommandStore().execute('Comfy.BrowseTemplates')
-    } else {
-      await comfyApp.loadGraphData()
-    }
-  }
-
-  const initializeWorkflow = async () => {
-    if (!workflowPersistenceEnabled.value) return
-
-    try {
-      const restored = await loadPreviousWorkflowFromStorage()
-      if (!restored) {
-        await loadDefaultWorkflow()
-      }
-    } catch (err) {
-      console.error('Error loading previous workflow', err)
-      await loadDefaultWorkflow()
-    }
-  }
-
-  const loadTemplateFromUrlIfPresent = async () => {
-    const query = await ensureTemplateQueryFromIntent()
-    const hasTemplateUrl = query.template && typeof query.template === 'string'
-
-    if (hasTemplateUrl) {
-      await templateUrlLoader.loadTemplateFromUrl()
-    }
-  }
-
-  // Setup watchers
-  watch(
-    () => workflowStore.activeWorkflow?.key,
-    (activeWorkflowKey) => {
-      if (!activeWorkflowKey) return
-      setStorageValue('Comfy.PreviousWorkflow', activeWorkflowKey)
-      // When the activeWorkflow changes, the graph has already been loaded.
-      // Saving the current state of the graph to the localStorage.
-      persistCurrentWorkflow()
-    }
-  )
-  api.addEventListener('graphChanged', persistCurrentWorkflow)
-
-  // Clean up event listener when component unmounts
-  tryOnScopeDispose(() => {
-    api.removeEventListener('graphChanged', persistCurrentWorkflow)
-  })
-
-  // Restore workflow tabs states
-  const openWorkflows = computed(() => workflowStore.openWorkflows)
-  const activeWorkflow = computed(() => workflowStore.activeWorkflow)
-  const restoreState = computed<{ paths: string[]; activeIndex: number }>(
-    () => {
-      if (!openWorkflows.value || !activeWorkflow.value) {
-        return { paths: [], activeIndex: -1 }
-      }
-
-      const paths = openWorkflows.value
-        .filter((workflow) => workflow?.isPersisted)
-        .map((workflow) => workflow.path)
-      const activeIndex = openWorkflows.value.findIndex(
-        (workflow) => workflow.path === activeWorkflow.value?.path
-      )
-
-      return { paths, activeIndex }
-    }
-  )
-
-  // Get storage values before setting watchers
-  const storedWorkflows = JSON.parse(
-    getStorageValue('Comfy.OpenWorkflowsPaths') || '[]'
-  )
-  const storedActiveIndex = JSON.parse(
-    getStorageValue('Comfy.ActiveWorkflowIndex') || '-1'
-  )
-
-  watch(restoreState, ({ paths, activeIndex }) => {
-    if (workflowPersistenceEnabled.value) {
-      setStorageValue('Comfy.OpenWorkflowsPaths', JSON.stringify(paths))
-      setStorageValue('Comfy.ActiveWorkflowIndex', JSON.stringify(activeIndex))
-    }
-  })
-
-  const restoreWorkflowTabsState = () => {
-    if (!workflowPersistenceEnabled.value) return
-    const isRestorable = storedWorkflows?.length > 0 && storedActiveIndex >= 0
-    if (isRestorable) {
-      workflowStore.openWorkflowsInBackground({
-        left: storedWorkflows.slice(0, storedActiveIndex),
-        right: storedWorkflows.slice(storedActiveIndex)
-      })
-    }
-  }
-
-  return {
-    initializeWorkflow,
-    loadTemplateFromUrlIfPresent,
-    restoreWorkflowTabsState
-  }
-}
diff --git a/src/platform/workflow/persistence/composables/useWorkflowPersistenceV2.ts b/src/platform/workflow/persistence/composables/useWorkflowPersistenceV2.ts
new file mode 100644
index 0000000000..93ff5bd168
--- /dev/null
+++ b/src/platform/workflow/persistence/composables/useWorkflowPersistenceV2.ts
@@ -0,0 +1,292 @@
+/**
+ * V2 Workflow Persistence Composable
+ *
+ * Key changes from V1:
+ * - Uses V2 draft store with per-draft keys
+ * - Uses tab state composable for session pointers
+ * - Adds 512ms debounce on graph change persistence
+ * - Runs V1→V2 migration on first load
+ */
+
+import { debounce } from 'es-toolkit'
+import { useToast } from 'primevue'
+import { tryOnScopeDispose } from '@vueuse/core'
+import { computed, ref, watch } from 'vue'
+import { useI18n } from 'vue-i18n'
+import { useRoute, useRouter } from 'vue-router'
+
+import { useCurrentUser } from '@/composables/auth/useCurrentUser'
+import {
+  hydratePreservedQuery,
+  mergePreservedQueryIntoQuery
+} from '@/platform/navigation/preservedQueryManager'
+import { PRESERVED_QUERY_NAMESPACES } from '@/platform/navigation/preservedQueryNamespaces'
+import { isCloud } from '@/platform/distribution/types'
+import { useSettingStore } from '@/platform/settings/settingStore'
+import { useWorkflowService } from '@/platform/workflow/core/services/workflowService'
+import {
+  ComfyWorkflow,
+  useWorkflowStore
+} from '@/platform/workflow/management/stores/workflowStore'
+import { PERSIST_DEBOUNCE_MS } from '../base/draftTypes'
+import { clearAllV2Storage } from '../base/storageIO'
+import { migrateV1toV2 } from '../migration/migrateV1toV2'
+import { useWorkflowDraftStoreV2 } from '../stores/workflowDraftStoreV2'
+import { useWorkflowTabState } from './useWorkflowTabState'
+import { useSharedWorkflowUrlLoader } from '@/platform/workflow/sharing/composables/useSharedWorkflowUrlLoader'
+import { useTemplateUrlLoader } from '@/platform/workflow/templates/composables/useTemplateUrlLoader'
+import { api } from '@/scripts/api'
+import { app as comfyApp } from '@/scripts/app'
+import { useCommandStore } from '@/stores/commandStore'
+
+export function useWorkflowPersistenceV2() {
+  const { t } = useI18n()
+  const workflowStore = useWorkflowStore()
+  const settingStore = useSettingStore()
+  const route = useRoute()
+  const router = useRouter()
+  const sharedWorkflowUrlLoader = useSharedWorkflowUrlLoader()
+  const templateUrlLoader = useTemplateUrlLoader()
+  const TEMPLATE_NAMESPACE = PRESERVED_QUERY_NAMESPACES.TEMPLATE
+  const draftStore = useWorkflowDraftStoreV2()
+  const tabState = useWorkflowTabState()
+  const toast = useToast()
+  const { onUserLogout } = useCurrentUser()
+
+  // Run migration on module load
+  migrateV1toV2()
+
+  // Clear workflow persistence storage when user signs out (cloud only)
+  onUserLogout(() => {
+    if (isCloud) {
+      clearAllV2Storage()
+    }
+  })
+
+  const ensureTemplateQueryFromIntent = async () => {
+    hydratePreservedQuery(TEMPLATE_NAMESPACE)
+    const mergedQuery = mergePreservedQueryIntoQuery(
+      TEMPLATE_NAMESPACE,
+      route.query
+    )
+
+    if (mergedQuery) {
+      await router.replace({ query: mergedQuery })
+    }
+
+    return mergedQuery ?? route.query
+  }
+
+  const workflowPersistenceEnabled = computed(() =>
+    settingStore.get('Comfy.Workflow.Persist')
+  )
+
+  const lastSavedJsonByPath = ref<Record<string, string>>({})
+
+  watch(workflowPersistenceEnabled, (enabled) => {
+    if (!enabled) {
+      draftStore.reset()
+      lastSavedJsonByPath.value = {}
+    }
+  })
+
+  const persistCurrentWorkflow = () => {
+    if (!workflowPersistenceEnabled.value) return
+    const activeWorkflow = workflowStore.activeWorkflow
+    if (!activeWorkflow) return
+
+    const graphData = comfyApp.rootGraph.serialize()
+    const workflowJson = JSON.stringify(graphData)
+    const workflowPath = activeWorkflow.path
+
+    // Skip if unchanged
+    if (workflowJson === lastSavedJsonByPath.value[workflowPath]) return
+
+    // Save to V2 draft store
+    const saved = draftStore.saveDraft(workflowPath, workflowJson, {
+      name: activeWorkflow.key,
+      isTemporary: activeWorkflow.isTemporary
+    })
+
+    if (!saved) {
+      toast.add({
+        severity: 'error',
+        summary: t('g.error'),
+        detail: t('toastMessages.failedToSaveDraft'),
+        life: 3000
+      })
+      return
+    }
+
+    // Update session pointer
+    tabState.setActivePath(workflowPath)
+
+    lastSavedJsonByPath.value[workflowPath] = workflowJson
+
+    // Clean up draft if workflow is saved and unmodified
+    if (!activeWorkflow.isTemporary && !activeWorkflow.isModified) {
+      draftStore.removeDraft(workflowPath)
+    }
+  }
+
+  // Debounced version for graphChanged events
+  const debouncedPersist = debounce(persistCurrentWorkflow, PERSIST_DEBOUNCE_MS)
+
+  const loadPreviousWorkflowFromStorage = async () => {
+    // 1. Try session pointer (for tab restoration)
+    const sessionPath = tabState.getActivePath()
+    if (
+      sessionPath &&
+      (await draftStore.loadPersistedWorkflow({
+        workflowName: null,
+        preferredPath: sessionPath
+      }))
+    ) {
+      return true
+    }
+
+    // 2. Fall back to most recent draft
+    return await draftStore.loadPersistedWorkflow({
+      workflowName: null,
+      fallbackToLatestDraft: true
+    })
+  }
+
+  const loadDefaultWorkflow = async () => {
+    if (!settingStore.get('Comfy.TutorialCompleted')) {
+      await settingStore.set('Comfy.TutorialCompleted', true)
+      await useWorkflowService().loadBlankWorkflow()
+      await useCommandStore().execute('Comfy.BrowseTemplates')
+    } else {
+      await comfyApp.loadGraphData()
+    }
+  }
+
+  const initializeWorkflow = async () => {
+    if (!workflowPersistenceEnabled.value) return
+
+    try {
+      const restored = await loadPreviousWorkflowFromStorage()
+      if (!restored) {
+        await loadDefaultWorkflow()
+      }
+    } catch (err) {
+      console.error('Error loading previous workflow', err)
+      await loadDefaultWorkflow()
+    }
+  }
+
+  const loadTemplateFromUrlIfPresent = async () => {
+    const query = await ensureTemplateQueryFromIntent()
+    const hasTemplateUrl = query.template && typeof query.template === 'string'
+
+    if (hasTemplateUrl) {
+      await templateUrlLoader.loadTemplateFromUrl()
+    }
+  }
+
+  const loadSharedWorkflowFromUrlIfPresent = async () => {
+    return await sharedWorkflowUrlLoader.loadSharedWorkflowFromUrl()
+  }
+
+  // Setup watchers
+  watch(
+    () => workflowStore.activeWorkflow?.key,
+    (activeWorkflowKey) => {
+      if (!activeWorkflowKey) return
+      // Flush any pending persistence from the previous workflow
+      debouncedPersist.flush()
+      // Persist the new workflow immediately
+      persistCurrentWorkflow()
+    }
+  )
+
+  // Debounced persistence on graph changes
+  api.addEventListener('graphChanged', debouncedPersist)
+
+  // Clean up event listener when component unmounts
+  tryOnScopeDispose(() => {
+    api.removeEventListener('graphChanged', debouncedPersist)
+    debouncedPersist.cancel()
+  })
+
+  // Restore workflow tabs states
+  const openWorkflows = computed(() => workflowStore.openWorkflows)
+  const activeWorkflow = computed(() => workflowStore.activeWorkflow)
+  const restoreState = computed<{ paths: string[]; activeIndex: number }>(
+    () => {
+      if (!openWorkflows.value || !activeWorkflow.value) {
+        return { paths: [], activeIndex: -1 }
+      }
+
+      const paths = openWorkflows.value
+        .map((workflow) => workflow?.path)
+        .filter(
+          (path): path is string =>
+            typeof path === 'string' && path.startsWith(ComfyWorkflow.basePath)
+        )
+      const activeIndex = paths.indexOf(activeWorkflow.value.path)
+
+      return { paths, activeIndex }
+    }
+  )
+
+  // Track whether tab state has been properly restored to avoid
+  // overwriting with stale data during initialization
+  let tabStateRestored = false
+
+  watch(restoreState, ({ paths, activeIndex }) => {
+    // Only persist after tab state has been restored to avoid
+    // writing leaked data from wrong workspace during init
+    if (workflowPersistenceEnabled.value && tabStateRestored) {
+      tabState.setOpenPaths(paths, activeIndex)
+    }
+  })
+
+  const restoreWorkflowTabsState = () => {
+    if (!workflowPersistenceEnabled.value) {
+      tabStateRestored = true
+      return
+    }
+
+    // Read storage fresh at restore time, not at composable init,
+    // to ensure workspace is properly determined
+    const storedTabState = tabState.getOpenPaths()
+    const storedWorkflows = storedTabState?.paths ?? []
+    const storedActiveIndex = storedTabState?.activeIndex ?? -1
+
+    tabStateRestored = true
+
+    const isRestorable = storedWorkflows.length > 0 && storedActiveIndex >= 0
+    if (!isRestorable) return
+
+    storedWorkflows.forEach((path: string) => {
+      if (workflowStore.getWorkflowByPath(path)) return
+      const draft = draftStore.getDraft(path)
+      if (!draft?.isTemporary) return
+      try {
+        const workflowData = JSON.parse(draft.data)
+        workflowStore.createTemporary(draft.name, workflowData)
+      } catch (err) {
+        console.warn(
+          'Failed to parse workflow draft, creating with default',
+          err
+        )
+        draftStore.removeDraft(path)
+        workflowStore.createTemporary(draft.name)
+      }
+    })
+
+    workflowStore.openWorkflowsInBackground({
+      left: storedWorkflows.slice(0, storedActiveIndex),
+      right: storedWorkflows.slice(storedActiveIndex)
+    })
+  }
+
+  return {
+    initializeWorkflow,
+    loadSharedWorkflowFromUrlIfPresent,
+    loadTemplateFromUrlIfPresent,
+    restoreWorkflowTabsState
+  }
+}
diff --git a/src/platform/workflow/persistence/composables/useWorkflowTabState.test.ts b/src/platform/workflow/persistence/composables/useWorkflowTabState.test.ts
new file mode 100644
index 0000000000..d54c37d90f
--- /dev/null
+++ b/src/platform/workflow/persistence/composables/useWorkflowTabState.test.ts
@@ -0,0 +1,114 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+vi.mock('@/scripts/api', () => ({
+  api: {
+    clientId: 'test-client-id',
+    initialClientId: 'test-client-id'
+  }
+}))
+
+describe('useWorkflowTabState', () => {
+  beforeEach(() => {
+    vi.resetModules()
+    sessionStorage.clear()
+  })
+
+  describe('activePath', () => {
+    it('returns null when no pointer exists', async () => {
+      const { useWorkflowTabState } = await import('./useWorkflowTabState')
+      const { getActivePath } = useWorkflowTabState()
+
+      expect(getActivePath()).toBeNull()
+    })
+
+    it('saves and retrieves active path', async () => {
+      const { useWorkflowTabState } = await import('./useWorkflowTabState')
+      const { getActivePath, setActivePath } = useWorkflowTabState()
+
+      setActivePath('workflows/test.json')
+      expect(getActivePath()).toBe('workflows/test.json')
+    })
+
+    it('ignores pointer from different workspace', async () => {
+      sessionStorage.setItem(
+        'Comfy.Workspace.Current',
+        JSON.stringify({ type: 'team', id: 'ws-1' })
+      )
+      const { useWorkflowTabState } = await import('./useWorkflowTabState')
+      const { setActivePath } = useWorkflowTabState()
+      setActivePath('workflows/test.json')
+
+      vi.resetModules()
+      sessionStorage.setItem(
+        'Comfy.Workspace.Current',
+        JSON.stringify({ type: 'team', id: 'ws-2' })
+      )
+
+      const { useWorkflowTabState: useWorkflowTabState2 } =
+        await import('./useWorkflowTabState')
+      const { getActivePath } = useWorkflowTabState2()
+
+      expect(getActivePath()).toBeNull()
+    })
+  })
+
+  describe('openPaths', () => {
+    it('returns null when no pointer exists', async () => {
+      const { useWorkflowTabState } = await import('./useWorkflowTabState')
+      const { getOpenPaths } = useWorkflowTabState()
+
+      expect(getOpenPaths()).toBeNull()
+    })
+
+    it('saves and retrieves open paths', async () => {
+      const { useWorkflowTabState } = await import('./useWorkflowTabState')
+      const { getOpenPaths, setOpenPaths } = useWorkflowTabState()
+
+      const paths = ['workflows/a.json', 'workflows/b.json']
+      setOpenPaths(paths, 1)
+
+      const result = getOpenPaths()
+      expect(result).not.toBeNull()
+      expect(result!.paths).toEqual(paths)
+      expect(result!.activeIndex).toBe(1)
+    })
+
+    it('ignores pointer from different workspace', async () => {
+      sessionStorage.setItem(
+        'Comfy.Workspace.Current',
+        JSON.stringify({ type: 'team', id: 'ws-1' })
+      )
+      const { useWorkflowTabState } = await import('./useWorkflowTabState')
+      const { setOpenPaths } = useWorkflowTabState()
+      setOpenPaths(['workflows/test.json'], 0)
+
+      vi.resetModules()
+      sessionStorage.setItem(
+        'Comfy.Workspace.Current',
+        JSON.stringify({ type: 'team', id: 'ws-2' })
+      )
+
+      const { useWorkflowTabState: useWorkflowTabState2 } =
+        await import('./useWorkflowTabState')
+      const { getOpenPaths } = useWorkflowTabState2()
+
+      expect(getOpenPaths()).toBeNull()
+    })
+
+    it('retains paths when staying in same workspace', async () => {
+      sessionStorage.setItem(
+        'Comfy.Workspace.Current',
+        JSON.stringify({ type: 'team', id: 'ws-1' })
+      )
+      const { useWorkflowTabState } = await import('./useWorkflowTabState')
+      const { setOpenPaths, getOpenPaths } = useWorkflowTabState()
+
+      setOpenPaths(['workflows/test.json'], 0)
+
+      // Simulate re-reading (same workspace, same clientId)
+      const result = getOpenPaths()
+      expect(result).not.toBeNull()
+      expect(result!.paths).toEqual(['workflows/test.json'])
+    })
+  })
+})
diff --git a/src/platform/workflow/persistence/composables/useWorkflowTabState.ts b/src/platform/workflow/persistence/composables/useWorkflowTabState.ts
new file mode 100644
index 0000000000..f1eae2b8d4
--- /dev/null
+++ b/src/platform/workflow/persistence/composables/useWorkflowTabState.ts
@@ -0,0 +1,95 @@
+/**
+ * Tab State Management - Per-tab workflow pointers in sessionStorage.
+ *
+ * Uses api.clientId to scope pointers per browser tab.
+ * Includes workspaceId for validation to prevent cross-workspace contamination.
+ */
+
+import type { ActivePathPointer, OpenPathsPointer } from '../base/draftTypes'
+import { getWorkspaceId } from '../base/storageKeys'
+import {
+  readActivePath,
+  readOpenPaths,
+  writeActivePath,
+  writeOpenPaths
+} from '../base/storageIO'
+import { api } from '@/scripts/api'
+
+/**
+ * Gets the current client ID for browser tab identification.
+ * Falls back to initialClientId if clientId is not yet set.
+ */
+function getClientId(): string | null {
+  return api.clientId ?? api.initialClientId ?? null
+}
+
+/**
+ * Composable for managing per-tab workflow state in sessionStorage.
+ */
+export function useWorkflowTabState() {
+  /**
+   * Gets the active workflow path for the current tab.
+   * Returns null if no pointer exists or workspaceId doesn't match.
+   */
+  function getActivePath(): string | null {
+    const clientId = getClientId()
+    const workspaceId = getWorkspaceId()
+    if (!clientId) return null
+
+    const pointer = readActivePath(clientId, workspaceId)
+    return pointer?.path ?? null
+  }
+
+  /**
+   * Sets the active workflow path for the current tab.
+   */
+  function setActivePath(path: string): void {
+    const clientId = getClientId()
+    const workspaceId = getWorkspaceId()
+    if (!clientId) return
+
+    const pointer: ActivePathPointer = {
+      workspaceId,
+      path
+    }
+    writeActivePath(clientId, pointer)
+  }
+
+  /**
+   * Gets the open workflow paths for the current tab.
+   * Returns null if no pointer exists or workspaceId doesn't match.
+   */
+  function getOpenPaths(): { paths: string[]; activeIndex: number } | null {
+    const clientId = getClientId()
+    const workspaceId = getWorkspaceId()
+    if (!clientId) return null
+
+    const pointer = readOpenPaths(clientId, workspaceId)
+    if (!pointer) return null
+
+    return { paths: pointer.paths, activeIndex: pointer.activeIndex }
+  }
+
+  /**
+   * Sets the open workflow paths for the current tab.
+   */
+  function setOpenPaths(paths: string[], activeIndex: number): void {
+    const clientId = getClientId()
+    const workspaceId = getWorkspaceId()
+    if (!clientId) return
+
+    const pointer: OpenPathsPointer = {
+      workspaceId,
+      paths,
+      activeIndex
+    }
+    writeOpenPaths(clientId, pointer)
+  }
+
+  return {
+    getActivePath,
+    setActivePath,
+    getOpenPaths,
+    setOpenPaths
+  }
+}
diff --git a/src/platform/workflow/persistence/migration/migrateV1toV2.test.ts b/src/platform/workflow/persistence/migration/migrateV1toV2.test.ts
new file mode 100644
index 0000000000..40681560a2
--- /dev/null
+++ b/src/platform/workflow/persistence/migration/migrateV1toV2.test.ts
@@ -0,0 +1,242 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { hashPath } from '../base/hashUtil'
+import {
+  cleanupV1Data,
+  getMigrationStatus,
+  isV2MigrationComplete,
+  migrateV1toV2
+} from './migrateV1toV2'
+
+describe('migrateV1toV2', () => {
+  const workspaceId = 'test-workspace'
+
+  beforeEach(() => {
+    vi.resetModules()
+    localStorage.clear()
+    sessionStorage.clear()
+  })
+
+  afterEach(() => {
+    localStorage.clear()
+    sessionStorage.clear()
+  })
+
+  function setV1Data(
+    drafts: Record<
+      string,
+      { data: string; updatedAt: number; name: string; isTemporary: boolean }
+    >,
+    order: string[]
+  ) {
+    localStorage.setItem(
+      `Comfy.Workflow.Drafts:${workspaceId}`,
+      JSON.stringify(drafts)
+    )
+    localStorage.setItem(
+      `Comfy.Workflow.DraftOrder:${workspaceId}`,
+      JSON.stringify(order)
+    )
+  }
+
+  describe('isV2MigrationComplete', () => {
+    it('returns false when no V2 index exists', () => {
+      expect(isV2MigrationComplete(workspaceId)).toBe(false)
+    })
+
+    it('returns true when V2 index exists', () => {
+      localStorage.setItem(
+        `Comfy.Workflow.DraftIndex.v2:${workspaceId}`,
+        JSON.stringify({ v: 2, order: [], entries: {}, updatedAt: Date.now() })
+      )
+      expect(isV2MigrationComplete(workspaceId)).toBe(true)
+    })
+  })
+
+  describe('migrateV1toV2', () => {
+    it('returns -1 if V2 already exists', () => {
+      localStorage.setItem(
+        `Comfy.Workflow.DraftIndex.v2:${workspaceId}`,
+        JSON.stringify({ v: 2, order: [], entries: {}, updatedAt: Date.now() })
+      )
+
+      expect(migrateV1toV2(workspaceId)).toBe(-1)
+    })
+
+    it('creates empty V2 index if no V1 data', () => {
+      expect(migrateV1toV2(workspaceId)).toBe(0)
+
+      const indexJson = localStorage.getItem(
+        `Comfy.Workflow.DraftIndex.v2:${workspaceId}`
+      )
+      expect(indexJson).not.toBeNull()
+
+      const index = JSON.parse(indexJson!)
+      expect(index.v).toBe(2)
+      expect(index.order).toEqual([])
+    })
+
+    it('migrates V1 drafts to V2 format', () => {
+      const v1Drafts = {
+        'workflows/a.json': {
+          data: '{"nodes":[1]}',
+          updatedAt: 1000,
+          name: 'a',
+          isTemporary: true
+        },
+        'workflows/b.json': {
+          data: '{"nodes":[2]}',
+          updatedAt: 2000,
+          name: 'b',
+          isTemporary: false
+        }
+      }
+      setV1Data(v1Drafts, ['workflows/a.json', 'workflows/b.json'])
+
+      const migrated = migrateV1toV2(workspaceId)
+      expect(migrated).toBe(2)
+
+      // Check V2 index
+      const indexJson = localStorage.getItem(
+        `Comfy.Workflow.DraftIndex.v2:${workspaceId}`
+      )
+      const index = JSON.parse(indexJson!)
+      expect(index.order).toHaveLength(2)
+
+      // Check payloads
+      const keyA = hashPath('workflows/a.json')
+      const keyB = hashPath('workflows/b.json')
+
+      const payloadA = localStorage.getItem(
+        `Comfy.Workflow.Draft.v2:${workspaceId}:${keyA}`
+      )
+      const payloadB = localStorage.getItem(
+        `Comfy.Workflow.Draft.v2:${workspaceId}:${keyB}`
+      )
+
+      expect(payloadA).not.toBeNull()
+      expect(payloadB).not.toBeNull()
+
+      expect(JSON.parse(payloadA!).data).toBe('{"nodes":[1]}')
+      expect(JSON.parse(payloadB!).data).toBe('{"nodes":[2]}')
+    })
+
+    it('preserves LRU order during migration', () => {
+      const v1Drafts = {
+        'workflows/first.json': {
+          data: '{}',
+          updatedAt: 1000,
+          name: 'first',
+          isTemporary: true
+        },
+        'workflows/second.json': {
+          data: '{}',
+          updatedAt: 2000,
+          name: 'second',
+          isTemporary: true
+        },
+        'workflows/third.json': {
+          data: '{}',
+          updatedAt: 3000,
+          name: 'third',
+          isTemporary: true
+        }
+      }
+      setV1Data(v1Drafts, [
+        'workflows/first.json',
+        'workflows/second.json',
+        'workflows/third.json'
+      ])
+
+      migrateV1toV2(workspaceId)
+
+      const indexJson = localStorage.getItem(
+        `Comfy.Workflow.DraftIndex.v2:${workspaceId}`
+      )
+      const index = JSON.parse(indexJson!)
+
+      // Order should be preserved (oldest to newest)
+      const expectedOrder = [
+        hashPath('workflows/first.json'),
+        hashPath('workflows/second.json'),
+        hashPath('workflows/third.json')
+      ]
+      expect(index.order).toEqual(expectedOrder)
+    })
+
+    it('keeps V1 data intact after migration', () => {
+      const v1Drafts = {
+        'workflows/test.json': {
+          data: '{}',
+          updatedAt: 1000,
+          name: 'test',
+          isTemporary: true
+        }
+      }
+      setV1Data(v1Drafts, ['workflows/test.json'])
+
+      migrateV1toV2(workspaceId)
+
+      // V1 data should still exist
+      expect(
+        localStorage.getItem(`Comfy.Workflow.Drafts:${workspaceId}`)
+      ).not.toBeNull()
+      expect(
+        localStorage.getItem(`Comfy.Workflow.DraftOrder:${workspaceId}`)
+      ).not.toBeNull()
+    })
+  })
+
+  describe('cleanupV1Data', () => {
+    it('removes V1 keys', () => {
+      setV1Data(
+        {
+          'workflows/test.json': {
+            data: '{}',
+            updatedAt: 1,
+            name: 'test',
+            isTemporary: true
+          }
+        },
+        ['workflows/test.json']
+      )
+
+      cleanupV1Data(workspaceId)
+
+      expect(
+        localStorage.getItem(`Comfy.Workflow.Drafts:${workspaceId}`)
+      ).toBeNull()
+      expect(
+        localStorage.getItem(`Comfy.Workflow.DraftOrder:${workspaceId}`)
+      ).toBeNull()
+    })
+  })
+
+  describe('getMigrationStatus', () => {
+    it('reports correct status', () => {
+      setV1Data(
+        {
+          'workflows/a.json': {
+            data: '{}',
+            updatedAt: 1,
+            name: 'a',
+            isTemporary: true
+          },
+          'workflows/b.json': {
+            data: '{}',
+            updatedAt: 2,
+            name: 'b',
+            isTemporary: true
+          }
+        },
+        ['workflows/a.json', 'workflows/b.json']
+      )
+
+      const status = getMigrationStatus(workspaceId)
+      expect(status.v1Exists).toBe(true)
+      expect(status.v2Exists).toBe(false)
+      expect(status.v1DraftCount).toBe(2)
+      expect(status.v2DraftCount).toBe(0)
+    })
+  })
+})
diff --git a/src/platform/workflow/persistence/migration/migrateV1toV2.ts b/src/platform/workflow/persistence/migration/migrateV1toV2.ts
new file mode 100644
index 0000000000..b5b326a704
--- /dev/null
+++ b/src/platform/workflow/persistence/migration/migrateV1toV2.ts
@@ -0,0 +1,157 @@
+/**
+ * V1 to V2 Migration
+ *
+ * Migrates draft data from V1 blob format to V2 per-draft keys.
+ * Runs once on first load if V2 index doesn't exist.
+ * Keeps V1 data intact for rollback until 2026-07-15.
+ */
+
+import type { DraftIndexV2 } from '../base/draftTypes'
+import { upsertEntry, createEmptyIndex } from '../base/draftCacheV2'
+import { hashPath } from '../base/hashUtil'
+import { getWorkspaceId } from '../base/storageKeys'
+import { readIndex, writeIndex, writePayload } from '../base/storageIO'
+
+/**
+ * V1 draft snapshot structure (from draftCache.ts)
+ */
+interface V1DraftSnapshot {
+  data: string
+  updatedAt: number
+  name: string
+  isTemporary: boolean
+}
+
+/**
+ * V1 storage keys - workspace-scoped blob format
+ */
+const V1_KEYS = {
+  drafts: (workspaceId: string) => `Comfy.Workflow.Drafts:${workspaceId}`,
+  order: (workspaceId: string) => `Comfy.Workflow.DraftOrder:${workspaceId}`
+}
+
+/**
+ * Checks if V2 migration has been completed for the current workspace.
+ */
+export function isV2MigrationComplete(workspaceId: string): boolean {
+  const v2Index = readIndex(workspaceId)
+  return v2Index !== null
+}
+
+/**
+ * Reads V1 drafts from localStorage.
+ */
+function readV1Drafts(
+  workspaceId: string
+): { drafts: Record<string, V1DraftSnapshot>; order: string[] } | null {
+  try {
+    const draftsJson = localStorage.getItem(V1_KEYS.drafts(workspaceId))
+    const orderJson = localStorage.getItem(V1_KEYS.order(workspaceId))
+
+    if (!draftsJson) return null
+
+    const drafts = JSON.parse(draftsJson) as Record<string, V1DraftSnapshot>
+    const order = orderJson ? (JSON.parse(orderJson) as string[]) : []
+
+    return { drafts, order }
+  } catch {
+    return null
+  }
+}
+
+/**
+ * Migrates V1 drafts to V2 format.
+ *
+ * @returns Number of drafts migrated, or -1 if migration not needed/failed
+ */
+export function migrateV1toV2(workspaceId: string = getWorkspaceId()): number {
+  // Check if V2 already exists
+  if (isV2MigrationComplete(workspaceId)) {
+    return -1
+  }
+
+  // Read V1 data
+  const v1Data = readV1Drafts(workspaceId)
+  if (!v1Data) {
+    // No V1 data to migrate - create empty V2 index
+    if (!writeIndex(workspaceId, createEmptyIndex())) return -1
+    return 0
+  }
+
+  // Build V2 index and write payloads
+  let index: DraftIndexV2 = createEmptyIndex()
+  let migrated = 0
+
+  // Process in order (oldest first) to maintain LRU order
+  for (const path of v1Data.order) {
+    const draft = v1Data.drafts[path]
+    if (!draft) continue
+
+    const draftKey = hashPath(path)
+
+    // Write payload
+    const payloadWritten = writePayload(workspaceId, draftKey, {
+      data: draft.data,
+      updatedAt: draft.updatedAt
+    })
+
+    if (!payloadWritten) {
+      console.warn(`[V2 Migration] Failed to write payload for ${path}`)
+      continue
+    }
+
+    // Update index
+    const { index: newIndex } = upsertEntry(index, path, {
+      name: draft.name,
+      isTemporary: draft.isTemporary,
+      updatedAt: draft.updatedAt
+    })
+    index = newIndex
+    migrated++
+  }
+
+  // Write final index
+  if (!writeIndex(workspaceId, index)) {
+    console.error('[V2 Migration] Failed to write index')
+    return -1
+  }
+
+  if (migrated > 0) {
+    console.warn(`[V2 Migration] Migrated ${migrated} drafts from V1 to V2`)
+  }
+  return migrated
+}
+
+/**
+ * Cleans up V1 data after successful migration.
+ * Should NOT be called until 2026-07-15 to allow rollback.
+ */
+export function cleanupV1Data(workspaceId: string = getWorkspaceId()): void {
+  try {
+    localStorage.removeItem(V1_KEYS.drafts(workspaceId))
+    localStorage.removeItem(V1_KEYS.order(workspaceId))
+    console.warn('[V2 Migration] Cleaned up V1 data')
+  } catch {
+    // Ignore cleanup errors
+  }
+}
+
+/**
+ * Gets migration status for debugging.
+ */
+export function getMigrationStatus(workspaceId: string = getWorkspaceId()): {
+  v1Exists: boolean
+  v2Exists: boolean
+  v1DraftCount: number
+  v2DraftCount: number
+} {
+  const v1Data = readV1Drafts(workspaceId)
+  const v2Index = readIndex(workspaceId)
+
+  return {
+    v1Exists: v1Data !== null,
+    v2Exists: v2Index !== null,
+    v1DraftCount: v1Data ? v1Data.order.length : 0,
+    v2DraftCount: v2Index ? v2Index.order.length : 0
+  }
+}
diff --git a/src/platform/workflow/persistence/stores/workflowDraftStore.ts b/src/platform/workflow/persistence/stores/workflowDraftStore.ts
new file mode 100644
index 0000000000..30280e1246
--- /dev/null
+++ b/src/platform/workflow/persistence/stores/workflowDraftStore.ts
@@ -0,0 +1,161 @@
+import { useStorage } from '@vueuse/core'
+import { defineStore } from 'pinia'
+import { computed } from 'vue'
+
+import type {
+  DraftCacheState,
+  WorkflowDraftSnapshot
+} from '@/platform/workflow/persistence/base/draftCache'
+import {
+  MAX_DRAFTS,
+  createDraftCacheState,
+  mostRecentDraftPath,
+  moveDraft as moveDraftEntry,
+  removeDraft as removeDraftEntry,
+  touchEntry,
+  upsertDraft
+} from '@/platform/workflow/persistence/base/draftCache'
+import { api } from '@/scripts/api'
+import { app as comfyApp } from '@/scripts/app'
+
+const DRAFTS_STORAGE_KEY = 'Comfy.Workflow.Drafts'
+const ORDER_STORAGE_KEY = 'Comfy.Workflow.DraftOrder'
+
+interface LoadPersistedWorkflowOptions {
+  workflowName: string | null
+  preferredPath?: string | null
+  fallbackToLatestDraft?: boolean
+}
+
+export const useWorkflowDraftStore = defineStore('workflowDraft', () => {
+  const storedDrafts = useStorage<Record<string, WorkflowDraftSnapshot>>(
+    DRAFTS_STORAGE_KEY,
+    {}
+  )
+  const storedOrder = useStorage<string[]>(ORDER_STORAGE_KEY, [])
+
+  const mostRecentDraft = computed(() => mostRecentDraftPath(storedOrder.value))
+
+  const currentState = (): DraftCacheState =>
+    createDraftCacheState(storedDrafts.value, storedOrder.value)
+
+  const updateState = (state: DraftCacheState) => {
+    storedDrafts.value = state.drafts
+    storedOrder.value = state.order
+  }
+
+  const saveDraft = (path: string, snapshot: WorkflowDraftSnapshot) => {
+    try {
+      updateState(upsertDraft(currentState(), path, snapshot, MAX_DRAFTS))
+    } catch (error) {
+      if (
+        error instanceof DOMException &&
+        error.name === 'QuotaExceededError'
+      ) {
+        const state = currentState()
+        if (state.order.length > 0) {
+          const oldestPath = state.order[0]
+          updateState(removeDraftEntry(state, oldestPath))
+          updateState(upsertDraft(currentState(), path, snapshot, MAX_DRAFTS))
+        } else {
+          throw error
+        }
+      } else {
+        throw error
+      }
+    }
+  }
+
+  const removeDraft = (path: string) => {
+    updateState(removeDraftEntry(currentState(), path))
+  }
+
+  const moveDraft = (oldPath: string, newPath: string, name: string) => {
+    updateState(moveDraftEntry(currentState(), oldPath, newPath, name))
+  }
+
+  const markDraftUsed = (path: string) => {
+    if (!(path in storedDrafts.value)) return
+    storedOrder.value = touchEntry(storedOrder.value, path)
+  }
+
+  const getDraft = (path: string) => storedDrafts.value[path]
+
+  const tryLoadGraph = async (
+    payload: string | null,
+    workflowName: string | null,
+    onFailure?: () => void
+  ) => {
+    if (!payload) return false
+    try {
+      const workflow = JSON.parse(payload)
+      await comfyApp.loadGraphData(
+        workflow,
+        /* clean= */ true,
+        /* restore_view= */ true,
+        workflowName
+      )
+      return true
+    } catch (err) {
+      console.error('Failed to load persisted workflow', err)
+      onFailure?.()
+      return false
+    }
+  }
+
+  const loadDraft = async (path: string) => {
+    const draft = getDraft(path)
+    if (!draft) return false
+    const loaded = await tryLoadGraph(draft.data, draft.name, () => {
+      removeDraft(path)
+    })
+    if (loaded) {
+      markDraftUsed(path)
+    }
+    return loaded
+  }
+
+  const loadPersistedWorkflow = async (
+    options: LoadPersistedWorkflowOptions
+  ): Promise<boolean> => {
+    const {
+      workflowName,
+      preferredPath,
+      fallbackToLatestDraft = false
+    } = options
+
+    if (preferredPath && (await loadDraft(preferredPath))) {
+      return true
+    }
+
+    if (!preferredPath && fallbackToLatestDraft) {
+      const fallbackPath = mostRecentDraft.value
+      if (fallbackPath && (await loadDraft(fallbackPath))) {
+        return true
+      }
+    }
+
+    const clientId = api.initialClientId ?? api.clientId
+    if (clientId) {
+      const sessionPayload = sessionStorage.getItem(`workflow:${clientId}`)
+      if (await tryLoadGraph(sessionPayload, workflowName)) {
+        return true
+      }
+    }
+
+    const localPayload = localStorage.getItem('workflow')
+    return await tryLoadGraph(localPayload, workflowName)
+  }
+
+  return {
+    saveDraft,
+    removeDraft,
+    moveDraft,
+    markDraftUsed,
+    getDraft,
+    loadPersistedWorkflow,
+    reset: () => {
+      updateState(createDraftCacheState())
+    }
+  }
+})
diff --git a/src/platform/workflow/persistence/stores/workflowDraftStoreV2.test.ts b/src/platform/workflow/persistence/stores/workflowDraftStoreV2.test.ts
new file mode 100644
index 0000000000..4e7c9503cb
--- /dev/null
+++ b/src/platform/workflow/persistence/stores/workflowDraftStoreV2.test.ts
@@ -0,0 +1,227 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { MAX_DRAFTS } from '../base/draftTypes'
+import { useWorkflowDraftStoreV2 } from './workflowDraftStoreV2'
+
+vi.mock('@/scripts/api', () => ({
+  api: {
+    clientId: 'test-client',
+    initialClientId: 'test-client'
+  }
+}))
+
+vi.mock('@/scripts/app', () => ({
+  app: {
+    loadGraphData: vi.fn().mockResolvedValue(undefined)
+  }
+}))
+
+describe('workflowDraftStoreV2', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    localStorage.clear()
+    sessionStorage.clear()
+    vi.clearAllMocks()
+  })
+
+  afterEach(() => {
+    localStorage.clear()
+    sessionStorage.clear()
+  })
+
+  describe('saveDraft', () => {
+    it('saves draft to localStorage with separate payload', () => {
+      const store = useWorkflowDraftStoreV2()
+
+      const result = store.saveDraft('workflows/test.json', '{"nodes":[]}', {
+        name: 'test',
+        isTemporary: true
+      })
+
+      expect(result).toBe(true)
+
+      // Verify index exists
+      const indexKey = 'Comfy.Workflow.DraftIndex.v2:personal'
+      const indexJson = localStorage.getItem(indexKey)
+      expect(indexJson).not.toBeNull()
+
+      const index = JSON.parse(indexJson!)
+      expect(index.v).toBe(2)
+      expect(index.order).toHaveLength(1)
+
+      // Verify payload exists separately
+      const payloadKeys = Object.keys(localStorage).filter((k) =>
+        k.startsWith('Comfy.Workflow.Draft.v2:personal:')
+      )
+      expect(payloadKeys).toHaveLength(1)
+    })
+
+    it('updates existing draft', () => {
+      const store = useWorkflowDraftStoreV2()
+
+      store.saveDraft('workflows/test.json', '{"nodes":[]}', {
+        name: 'test',
+        isTemporary: true
+      })
+
+      store.saveDraft('workflows/test.json', '{"nodes":[1,2,3]}', {
+        name: 'test-updated',
+        isTemporary: false
+      })
+
+      const draft = store.getDraft('workflows/test.json')
+      expect(draft).not.toBeNull()
+      expect(draft!.data).toBe('{"nodes":[1,2,3]}')
+      expect(draft!.name).toBe('test-updated')
+      expect(draft!.isTemporary).toBe(false)
+    })
+
+    it('evicts oldest when over limit', () => {
+      const store = useWorkflowDraftStoreV2()
+
+      for (let i = 0; i < MAX_DRAFTS; i++) {
+        store.saveDraft(`workflows/draft${i}.json`, `{"id":${i}}`, {
+          name: `draft${i}`,
+          isTemporary: true
+        })
+      }
+
+      // Save one more
+      store.saveDraft('workflows/new.json', '{"id":"new"}', {
+        name: 'new',
+        isTemporary: true
+      })
+
+      // First draft should be evicted
+      expect(store.getDraft('workflows/draft0.json')).toBeNull()
+      expect(store.getDraft('workflows/new.json')).not.toBeNull()
+    })
+  })
+
+  describe('removeDraft', () => {
+    it('removes draft from index and payload', () => {
+      const store = useWorkflowDraftStoreV2()
+
+      store.saveDraft('workflows/test.json', '{}', {
+        name: 'test',
+        isTemporary: true
+      })
+      expect(store.getDraft('workflows/test.json')).not.toBeNull()
+
+      store.removeDraft('workflows/test.json')
+      expect(store.getDraft('workflows/test.json')).toBeNull()
+
+      // Verify payload is deleted
+      const payloadKeys = Object.keys(localStorage).filter((k) =>
+        k.startsWith('Comfy.Workflow.Draft.v2:personal:')
+      )
+      expect(payloadKeys).toHaveLength(0)
+    })
+  })
+
+  describe('moveDraft', () => {
+    it('moves draft to new path with new name', () => {
+      const store = useWorkflowDraftStoreV2()
+
+      store.saveDraft('workflows/old.json', '{"data":"test"}', {
+        name: 'old',
+        isTemporary: true
+      })
+
+      store.moveDraft('workflows/old.json', 'workflows/new.json', 'new')
+
+      expect(store.getDraft('workflows/old.json')).toBeNull()
+
+      const newDraft = store.getDraft('workflows/new.json')
+      expect(newDraft).not.toBeNull()
+      expect(newDraft!.name).toBe('new')
+      expect(newDraft!.data).toBe('{"data":"test"}')
+    })
+  })
+
+  describe('getMostRecentPath', () => {
+    it('returns most recently saved path', () => {
+      const store = useWorkflowDraftStoreV2()
+
+      store.saveDraft('workflows/a.json', '{}', {
+        name: 'a',
+        isTemporary: true
+      })
+      store.saveDraft('workflows/b.json', '{}', {
+        name: 'b',
+        isTemporary: true
+      })
+
+      expect(store.getMostRecentPath()).toBe('workflows/b.json')
+    })
+
+    it('returns null when no drafts', () => {
+      const store = useWorkflowDraftStoreV2()
+      expect(store.getMostRecentPath()).toBeNull()
+    })
+  })
+
+  describe('loadPersistedWorkflow', () => {
+    it('loads from preferred path when available', async () => {
+      const store = useWorkflowDraftStoreV2()
+
+      store.saveDraft('workflows/test.json', '{"nodes":[]}', {
+        name: 'test',
+        isTemporary: true
+      })
+
+      const result = await store.loadPersistedWorkflow({
+        workflowName: 'test',
+        preferredPath: 'workflows/test.json'
+      })
+
+      expect(result).toBe(true)
+    })
+
+    it('falls back to most recent when preferredPath missing', async () => {
+      const store = useWorkflowDraftStoreV2()
+
+      store.saveDraft('workflows/recent.json', '{"nodes":[]}', {
+        name: 'recent',
+        isTemporary: true
+      })
+
+      const result = await store.loadPersistedWorkflow({
+        workflowName: null,
+        preferredPath: 'workflows/missing.json',
+        fallbackToLatestDraft: true
+      })
+
+      expect(result).toBe(true)
+    })
+
+    it('returns false when no drafts available', async () => {
+      const store = useWorkflowDraftStoreV2()
+
+      const result = await store.loadPersistedWorkflow({
+        workflowName: null,
+        fallbackToLatestDraft: true
+      })
+
+      expect(result).toBe(false)
+    })
+  })
+
+  describe('reset', () => {
+    it('clears in-memory cache', () => {
+      const store = useWorkflowDraftStoreV2()
+
+      store.saveDraft('workflows/test.json', '{}', {
+        name: 'test',
+        isTemporary: true
+      })
+
+      store.reset()
+
+      // Draft should still be loadable from localStorage
+      expect(store.getDraft('workflows/test.json')).not.toBeNull()
+    })
+  })
+})
diff --git a/src/platform/workflow/persistence/stores/workflowDraftStoreV2.ts b/src/platform/workflow/persistence/stores/workflowDraftStoreV2.ts
new file mode 100644
index 0000000000..03adf7a333
--- /dev/null
+++ b/src/platform/workflow/persistence/stores/workflowDraftStoreV2.ts
@@ -0,0 +1,385 @@
+/**
+ * V2 Workflow Draft Store
+ *
+ * Uses per-draft keys in localStorage instead of a single blob.
+ * Handles LRU eviction and quota management.
+ */
+
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+
+import type { DraftIndexV2 } from '../base/draftTypes'
+import { MAX_DRAFTS } from '../base/draftTypes'
+import {
+  createEmptyIndex,
+  getEntryByPath,
+  getMostRecentKey,
+  moveEntry,
+  removeEntry,
+  removeOrphanedEntries,
+  upsertEntry
+} from '../base/draftCacheV2'
+import { hashPath } from '../base/hashUtil'
+import { getWorkspaceId } from '../base/storageKeys'
+import {
+  deleteOrphanPayloads,
+  deletePayload,
+  deletePayloads,
+  getPayloadKeys,
+  isStorageAvailable,
+  markStorageUnavailable,
+  readIndex,
+  readPayload,
+  writeIndex,
+  writePayload
+} from '../base/storageIO'
+import { api } from '@/scripts/api'
+import { app as comfyApp } from '@/scripts/app'
+
+interface DraftMeta {
+  name: string
+  isTemporary: boolean
+}
+
+interface LoadPersistedWorkflowOptions {
+  workflowName: string | null
+  preferredPath?: string | null
+  fallbackToLatestDraft?: boolean
+}
+
+export const useWorkflowDraftStoreV2 = defineStore('workflowDraftV2', () => {
+  // In-memory cache of the index per workspace (synced with localStorage)
+  // Key is workspaceId, value is the cached index
+  const indexCacheByWorkspace = ref<Record<string, DraftIndexV2>>({})
+
+  /**
+   * Gets the current workspace ID fresh (not cached).
+   * This ensures operations use the correct workspace after switches.
+   */
+  function currentWorkspaceId(): string {
+    return getWorkspaceId()
+  }
+
+  /**
+   * Loads the index from localStorage or creates empty.
+   */
+  function loadIndex(): DraftIndexV2 {
+    const workspaceId = currentWorkspaceId()
+
+    if (indexCacheByWorkspace.value[workspaceId]) {
+      return indexCacheByWorkspace.value[workspaceId]
+    }
+
+    const stored = readIndex(workspaceId)
+    if (stored) {
+      // Clean up any index/payload drift
+      const payloadKeys = new Set(getPayloadKeys(workspaceId))
+      const cleaned = removeOrphanedEntries(stored, payloadKeys)
+      indexCacheByWorkspace.value[workspaceId] = cleaned
+
+      // Also clean up orphan payloads
+      const indexKeys = new Set(cleaned.order)
+      deleteOrphanPayloads(workspaceId, indexKeys)
+
+      return cleaned
+    }
+
+    const emptyIndex = createEmptyIndex()
+    indexCacheByWorkspace.value[workspaceId] = emptyIndex
+    return emptyIndex
+  }
+
+  /**
+   * Persists the current index to localStorage.
+   */
+  function persistIndex(index: DraftIndexV2): boolean {
+    const workspaceId = currentWorkspaceId()
+    indexCacheByWorkspace.value[workspaceId] = index
+    return writeIndex(workspaceId, index)
+  }
+
+  /**
+   * Saves a draft (data + metadata).
+   * Writes payload first, then updates index.
+   */
+  function saveDraft(path: string, data: string, meta: DraftMeta): boolean {
+    if (!isStorageAvailable()) return false
+
+    const workspaceId = currentWorkspaceId()
+    const draftKey = hashPath(path)
+    const now = Date.now()
+
+    // Write payload first (before index update)
+    const payloadWritten = writePayload(workspaceId, draftKey, {
+      data,
+      updatedAt: now
+    })
+
+    if (!payloadWritten) {
+      // Quota exceeded - try eviction loop
+      return handleQuotaExceeded(path, data, meta)
+    }
+
+    // Update index
+    const index = loadIndex()
+    const { index: newIndex, evicted } = upsertEntry(
+      index,
+      path,
+      { ...meta, updatedAt: now },
+      MAX_DRAFTS
+    )
+
+    // Delete evicted payloads
+    deletePayloads(workspaceId, evicted)
+
+    // Persist index
+    if (!persistIndex(newIndex)) {
+      // Index write failed - try to recover
+      deletePayload(workspaceId, draftKey)
+      return false
+    }
+
+    return true
+  }
+
+  /**
+   * Handles quota exceeded by evicting oldest drafts until write succeeds.
+   */
+  function handleQuotaExceeded(
+    path: string,
+    data: string,
+    meta: DraftMeta
+  ): boolean {
+    const workspaceId = currentWorkspaceId()
+    const index = loadIndex()
+    const draftKey = hashPath(path)
+
+    // Try evicting oldest entries until we can write
+    let currentIndex = index
+    while (currentIndex.order.length > 0) {
+      const oldestKey = currentIndex.order.find((key) => key !== draftKey)
+      if (!oldestKey) break // Only the target draft remains
+
+      // Evict oldest
+      const oldestEntry = Object.values(currentIndex.entries).find(
+        (e) => hashPath(e.path) === oldestKey
+      )
+      if (!oldestEntry) break
+
+      const result = removeEntry(currentIndex, oldestEntry.path)
+      currentIndex = result.index
+      if (result.removedKey) {
+        deletePayload(workspaceId, result.removedKey)
+      }
+
+      // Try writing again
+      const success = writePayload(workspaceId, draftKey, {
+        data,
+        updatedAt: Date.now()
+      })
+
+      if (success) {
+        // Update index with the new entry
+        const { index: finalIndex } = upsertEntry(
+          currentIndex,
+          path,
+          { ...meta, updatedAt: Date.now() },
+          MAX_DRAFTS
+        )
+        if (!persistIndex(finalIndex)) {
+          deletePayload(workspaceId, draftKey)
+          return false
+        }
+        return true
+      }
+    }
+
+    // All evictions failed - mark storage as unavailable
+    markStorageUnavailable()
+    return false
+  }
+
+  /**
+   * Removes a draft.
+   */
+  function removeDraft(path: string): void {
+    const workspaceId = currentWorkspaceId()
+    const index = loadIndex()
+    const { index: newIndex, removedKey } = removeEntry(index, path)
+
+    if (removedKey) {
+      deletePayload(workspaceId, removedKey)
+      persistIndex(newIndex)
+    }
+  }
+
+  /**
+   * Moves a draft from one path to another (rename).
+   */
+  function moveDraft(oldPath: string, newPath: string, name: string): void {
+    const workspaceId = currentWorkspaceId()
+    const index = loadIndex()
+    const result = moveEntry(index, oldPath, newPath, name)
+
+    if (result) {
+      const oldPayload = readPayload(workspaceId, result.oldKey)
+      if (oldPayload) {
+        const written = writePayload(workspaceId, result.newKey, {
+          data: oldPayload.data,
+          updatedAt: Date.now()
+        })
+        if (!written) return
+
+        if (!persistIndex(result.index)) {
+          deletePayload(workspaceId, result.newKey)
+          return
+        }
+        deletePayload(workspaceId, result.oldKey)
+      }
+    }
+  }
+
+  /**
+   * Gets draft data by path.
+   */
+  function getDraft(
+    path: string
+  ): { data: string; name: string; isTemporary: boolean } | null {
+    const workspaceId = currentWorkspaceId()
+    const index = loadIndex()
+    const entry = getEntryByPath(index, path)
+    if (!entry) return null
+
+    const draftKey = hashPath(path)
+    const payload = readPayload(workspaceId, draftKey)
+    if (!payload) {
+      // Payload missing - clean up index
+      removeDraft(path)
+      return null
+    }
+
+    return {
+      data: payload.data,
+      name: entry.name,
+      isTemporary: entry.isTemporary
+    }
+  }
+
+  /**
+   * Gets the most recent draft path.
+   */
+  function getMostRecentPath(): string | null {
+    const index = loadIndex()
+    const key = getMostRecentKey(index)
+    if (!key) return null
+
+    const entry = index.entries[key]
+    return entry?.path ?? null
+  }
+
+  /**
+   * Tries to load workflow data into the graph.
+   */
+  async function tryLoadGraph(
+    payload: string | null,
+    workflowName: string | null,
+    onFailure?: () => void
+  ): Promise<boolean> {
+    if (!payload) return false
+    try {
+      const workflow = JSON.parse(payload)
+      await comfyApp.loadGraphData(workflow, true, true, workflowName)
+      return true
+    } catch (err) {
+      console.error('Failed to load persisted workflow', err)
+      onFailure?.()
+      return false
+    }
+  }
+
+  /**
+   * Loads a draft into the graph.
+   */
+  async function loadDraft(path: string): Promise<boolean> {
+    const draft = getDraft(path)
+    if (!draft) return false
+
+    const loaded = await tryLoadGraph(draft.data, draft.name, () => {
+      removeDraft(path)
+    })
+
+    return loaded
+  }
+
+  /**
+   * Loads a persisted workflow with fallback chain.
+   */
+  async function loadPersistedWorkflow(
+    options: LoadPersistedWorkflowOptions
+  ): Promise<boolean> {
+    const {
+      workflowName,
+      preferredPath,
+      fallbackToLatestDraft = false
+    } = options
+
+    // 1. Try preferred path
+    if (preferredPath && (await loadDraft(preferredPath))) {
+      return true
+    }
+
+    // 2. Fall back to most recent draft
+    if (fallbackToLatestDraft) {
+      const mostRecent = getMostRecentPath()
+      if (mostRecent && (await loadDraft(mostRecent))) {
+        return true
+      }
+    }
+
+    // Legacy fallbacks are NOT workspace-scoped and must only be used for
+    // personal workspace to prevent cross-workspace data leakage.
+    // These exist only for migration from V1 and should be removed after 2026-07-15.
+    if (currentWorkspaceId() !== 'personal') {
+      return false
+    }
+
+    // 3. Legacy fallback: sessionStorage payload (remove after 2026-07-15)
+    const clientId = api.initialClientId ?? api.clientId
+    if (clientId) {
+      try {
+        const sessionPayload = sessionStorage.getItem(`workflow:${clientId}`)
+        if (await tryLoadGraph(sessionPayload, workflowName)) {
+          return true
+        }
+      } catch {
+        // Ignore storage access errors and continue fallback chain
+      }
+    }
+
+    // 4. Legacy fallback: localStorage payload (remove after 2026-07-15)
+    try {
+      const localPayload = localStorage.getItem('workflow')
+      return await tryLoadGraph(localPayload, workflowName)
+    } catch {
+      return false
+    }
+  }
+
+  /**
+   * Resets the store (clears in-memory cache for current workspace).
+   */
+  function reset(): void {
+    const workspaceId = currentWorkspaceId()
+    delete indexCacheByWorkspace.value[workspaceId]
+  }
+
+  return {
+    saveDraft,
+    removeDraft,
+    moveDraft,
+    getDraft,
+    getMostRecentPath,
+    loadPersistedWorkflow,
+    reset
+  }
+})
diff --git a/src/platform/workflow/sharing/components/AssetSectionList.vue b/src/platform/workflow/sharing/components/AssetSectionList.vue
new file mode 100644
index 0000000000..8690386250
--- /dev/null
+++ b/src/platform/workflow/sharing/components/AssetSectionList.vue
@@ -0,0 +1,92 @@
+<template>
+  <div class="flex flex-col gap-1">
+    <CollapsibleRoot
+      v-for="section in sections"
+      :key="section.id"
+      class="overflow-hidden rounded-sm"
+      :open="expandedSectionId === section.id"
+      @update:open="onSectionOpenChange(section.id, $event)"
+    >
+      <CollapsibleTrigger as-child>
+        <Button
+          :data-testid="`section-header-${section.id}`"
+          :aria-expanded="expandedSectionId === section.id"
+          :aria-controls="`section-content-${section.id}`"
+          variant="secondary"
+          class="w-full justify-between px-6 py-1"
+        >
+          <span>
+            {{ $t(section.labelKey, section.items.length) }}
+          </span>
+          <i
+            :class="
+              cn(
+                'icon-[lucide--chevron-right] size-4 text-muted-foreground transition-transform',
+                expandedSectionId === section.id && 'rotate-90'
+              )
+            "
+          />
+        </Button>
+      </CollapsibleTrigger>
+      <CollapsibleContent
+        :id="`section-content-${section.id}`"
+        :data-testid="`section-content-${section.id}`"
+        class="overflow-hidden data-[state=closed]:animate-collapsible-up data-[state=open]:animate-collapsible-down"
+      >
+        <ul class="max-h-25 overflow-y-auto px-6 pt-0.5 pb-1">
+          <li
+            v-for="item in section.items"
+            :key="item.id"
+            class="flex items-center gap-2 rounded-sm py-1"
+          >
+            <ShareAssetThumbnail
+              :name="item.name"
+              :preview-url="item.preview_url"
+              @thumbnail-error="
+                onThumbnailError($event.name, $event.previewUrl)
+              "
+            />
+            <span class="truncate text-xs text-base-foreground">
+              {{ item.name }}
+            </span>
+            <span
+              v-if="item.in_library"
+              class="ml-auto shrink-0 text-xs text-muted-foreground"
+            >
+              {{ $t('shareWorkflow.inLibrary') }}
+            </span>
+          </li>
+        </ul>
+      </CollapsibleContent>
+    </CollapsibleRoot>
+  </div>
+</template>
+
+<script setup lang="ts">
+import {
+  CollapsibleContent,
+  CollapsibleRoot,
+  CollapsibleTrigger
+} from 'reka-ui'
+
+import type { AssetInfo } from '@/schemas/apiSchema'
+import ShareAssetThumbnail from '@/platform/workflow/sharing/components/ShareAssetThumbnail.vue'
+import { useAssetSections } from '@/platform/workflow/sharing/composables/useAssetSections'
+import Button from '@/components/ui/button/Button.vue'
+import { cn } from '@/utils/tailwindUtil'
+
+const { items } = defineProps<{
+  items: AssetInfo[]
+}>()
+
+const { sections, expandedSectionId, onSectionOpenChange } = useAssetSections(
+  () => items
+)
+
+function onThumbnailError(name: string, previewUrl: string | null | undefined) {
+  console.warn('[share][assets][thumbnail-error]', {
+    name,
+    previewUrl: previewUrl ?? null
+  })
+}
+</script>
diff --git a/src/platform/workflow/sharing/components/OpenSharedWorkflowDialogContent.test.ts b/src/platform/workflow/sharing/components/OpenSharedWorkflowDialogContent.test.ts
new file mode 100644
index 0000000000..3765faf409
--- /dev/null
+++ b/src/platform/workflow/sharing/components/OpenSharedWorkflowDialogContent.test.ts
@@ -0,0 +1,329 @@
+import { flushPromises, mount } from '@vue/test-utils'
+import { createI18n } from 'vue-i18n'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { SharedWorkflowPayload } from '@/platform/workflow/sharing/types/shareTypes'
+import OpenSharedWorkflowDialogContent from '@/platform/workflow/sharing/components/OpenSharedWorkflowDialogContent.vue'
+
+const mockGetSharedWorkflow = vi.fn()
+
+vi.mock('@/platform/workflow/sharing/services/workflowShareService', () => ({
+  SharedWorkflowLoadError: class extends Error {},
+  useWorkflowShareService: () => ({
+    getSharedWorkflow: mockGetSharedWorkflow
+  })
+}))
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      g: { close: 'Close', cancel: 'Cancel' },
+      openSharedWorkflow: {
+        dialogTitle: 'Open shared workflow',
+        copyDescription:
+          'Opening the workflow will create a new copy in your workspace',
+        nonPublicAssetsWarningLine1:
+          'This workflow comes with non-public assets.',
+        nonPublicAssetsWarningLine2:
+          'These will be added to your library when you open the workflow',
+        copyAssetsAndOpen: 'Copy assets & open workflow',
+        openWorkflow: 'Open workflow',
+        openWithoutImporting: 'Open without importing',
+        loadError:
+          'Could not load this shared workflow. Please try again later.'
+      },
+      shareWorkflow: {
+        mediaLabel: '{count} Media File | {count} Media Files',
+        modelsLabel: '{count} Model | {count} Models'
+      }
+    }
+  }
+})
+
+function makePayload(
+  overrides: Partial<SharedWorkflowPayload> = {}
+): SharedWorkflowPayload {
+  return {
+    shareId: 'share-id-1',
+    workflowId: 'workflow-id-1',
+    name: 'Test Workflow',
+    listed: true,
+    publishedAt: new Date('2026-02-20T00:00:00Z'),
+    workflowJson: {
+      nodes: []
+    } as unknown as SharedWorkflowPayload['workflowJson'],
+    assets: [],
+    ...overrides
+  }
+}
+
+function mountComponent(props: Record<string, unknown> = {}) {
+  return mount(OpenSharedWorkflowDialogContent, {
+    global: {
+      plugins: [i18n],
+      stubs: {
+        AssetSectionList: { template: '<div class="asset-list-stub" />' },
+        'asset-section-list': { template: '<div class="asset-list-stub" />' }
+      }
+    },
+    props: {
+      shareId: 'test-share-id',
+      onConfirm: vi.fn(),
+      onOpenWithoutImporting: vi.fn(),
+      onCancel: vi.fn(),
+      ...props
+    }
+  })
+}
+
+describe('OpenSharedWorkflowDialogContent', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  describe('loading state', () => {
+    it('shows skeleton placeholders while loading', () => {
+      mockGetSharedWorkflow.mockReturnValue(new Promise(() => {}))
+      const wrapper = mountComponent()
+
+      expect(
+        wrapper.findAllComponents({ name: 'Skeleton' }).length
+      ).toBeGreaterThan(0)
+    })
+
+    it('shows dialog title in header while loading', () => {
+      mockGetSharedWorkflow.mockReturnValue(new Promise(() => {}))
+      const wrapper = mountComponent()
+      const header = wrapper.find('header h2')
+      expect(header.text()).toBe('Open shared workflow')
+    })
+  })
+
+  describe('error state', () => {
+    it('shows error message when fetch fails', async () => {
+      mockGetSharedWorkflow.mockRejectedValue(new Error('Network error'))
+      const wrapper = mountComponent()
+      await flushPromises()
+
+      expect(wrapper.text()).toContain(
+        'Could not load this shared workflow. Please try again later.'
+      )
+    })
+
+    it('shows close button in error state', async () => {
+      mockGetSharedWorkflow.mockRejectedValue(new Error('Network error'))
+      const wrapper = mountComponent()
+      await flushPromises()
+
+      const footerButtons = wrapper.findAll('footer button')
+      expect(footerButtons).toHaveLength(1)
+      expect(footerButtons[0].text()).toBe('Close')
+    })
+
+    it('calls onCancel when close is clicked in error state', async () => {
+      mockGetSharedWorkflow.mockRejectedValue(new Error('Network error'))
+      const onCancel = vi.fn()
+      const wrapper = mountComponent({ onCancel })
+      await flushPromises()
+
+      const closeButton = wrapper
+        .findAll('footer button')
+        .find((b) => b.text() === 'Close')
+      await closeButton!.trigger('click')
+      expect(onCancel).toHaveBeenCalled()
+    })
+  })
+
+  describe('loaded state - no assets', () => {
+    it('shows workflow name in body', async () => {
+      mockGetSharedWorkflow.mockResolvedValue(
+        makePayload({ name: 'My Workflow' })
+      )
+      const wrapper = mountComponent()
+      await flushPromises()
+
+      expect(wrapper.find('main h2').text()).toBe('My Workflow')
+    })
+
+    it('shows "Open workflow" as primary CTA', async () => {
+      mockGetSharedWorkflow.mockResolvedValue(makePayload())
+      const wrapper = mountComponent()
+      await flushPromises()
+
+      const buttons = wrapper.findAll('footer button')
+      const primaryButton = buttons[buttons.length - 1]
+      expect(primaryButton.text()).toBe('Open workflow')
+    })
+
+    it('does not show "Open without importing" button', async () => {
+      mockGetSharedWorkflow.mockResolvedValue(makePayload())
+      const wrapper = mountComponent()
+      await flushPromises()
+
+      expect(wrapper.text()).not.toContain('Open without importing')
+    })
+
+    it('does not show warning or asset sections', async () => {
+      mockGetSharedWorkflow.mockResolvedValue(makePayload())
+      const wrapper = mountComponent()
+      await flushPromises()
+
+      expect(wrapper.text()).not.toContain('non-public assets')
+    })
+
+    it('calls onConfirm with payload when primary button is clicked', async () => {
+      const payload = makePayload()
+      mockGetSharedWorkflow.mockResolvedValue(payload)
+      const onConfirm = vi.fn()
+      const wrapper = mountComponent({ onConfirm })
+      await flushPromises()
+
+      const buttons = wrapper.findAll('footer button')
+      await buttons[buttons.length - 1].trigger('click')
+      expect(onConfirm).toHaveBeenCalledWith(payload)
+    })
+
+    it('calls onCancel when cancel button is clicked', async () => {
+      mockGetSharedWorkflow.mockResolvedValue(makePayload())
+      const onCancel = vi.fn()
+      const wrapper = mountComponent({ onCancel })
+      await flushPromises()
+
+      const cancelButton = wrapper
+        .findAll('footer button')
+        .find((b) => b.text() === 'Cancel')
+      await cancelButton!.trigger('click')
+      expect(onCancel).toHaveBeenCalled()
+    })
+  })
+
+  describe('loaded state - with assets', () => {
+    const assetsPayload = makePayload({
+      assets: [
+        {
+          id: 'a1',
+          name: 'photo.png',
+          preview_url: '',
+          storage_url: '',
+          model: false,
+          public: false,
+          in_library: false
+        },
+        {
+          id: 'a2',
+          name: 'image.jpg',
+          preview_url: '',
+          storage_url: '',
+          model: false,
+          public: false,
+          in_library: false
+        },
+        {
+          id: 'm1',
+          name: 'model.safetensors',
+          preview_url: '',
+          storage_url: '',
+          model: true,
+          public: false,
+          in_library: false
+        }
+      ]
+    })
+
+    it('shows "Copy assets & open workflow" as primary CTA', async () => {
+      mockGetSharedWorkflow.mockResolvedValue(assetsPayload)
+      const wrapper = mountComponent()
+      await flushPromises()
+
+      const buttons = wrapper.findAll('footer button')
+      const primaryButton = buttons[buttons.length - 1]
+      expect(primaryButton.text()).toBe('Copy assets & open workflow')
+    })
+
+    it('shows non-public assets warning', async () => {
+      mockGetSharedWorkflow.mockResolvedValue(assetsPayload)
+      const wrapper = mountComponent()
+      await flushPromises()
+
+      expect(wrapper.text()).toContain('non-public assets')
+    })
+
+    it('shows "Open without importing" button', async () => {
+      mockGetSharedWorkflow.mockResolvedValue(assetsPayload)
+      const wrapper = mountComponent()
+      await flushPromises()
+
+      const openWithoutImporting = wrapper
+        .findAll('button')
+        .find((b) => b.text() === 'Open without importing')
+      expect(openWithoutImporting).toBeDefined()
+    })
+
+    it('calls onOpenWithoutImporting with payload', async () => {
+      mockGetSharedWorkflow.mockResolvedValue(assetsPayload)
+      const onOpenWithoutImporting = vi.fn()
+      const wrapper = mountComponent({ onOpenWithoutImporting })
+      await flushPromises()
+
+      const button = wrapper
+        .findAll('button')
+        .find((b) => b.text() === 'Open without importing')
+      await button!.trigger('click')
+      expect(onOpenWithoutImporting).toHaveBeenCalledWith(assetsPayload)
+    })
+
+    it('calls onConfirm with payload when primary button is clicked', async () => {
+      mockGetSharedWorkflow.mockResolvedValue(assetsPayload)
+      const onConfirm = vi.fn()
+      const wrapper = mountComponent({ onConfirm })
+      await flushPromises()
+
+      const buttons = wrapper.findAll('footer button')
+      await buttons[buttons.length - 1].trigger('click')
+      expect(onConfirm).toHaveBeenCalledWith(assetsPayload)
+    })
+
+    it('filters out assets already in library', async () => {
+      const mixedPayload = makePayload({
+        assets: [
+          {
+            id: 'a1',
+            name: 'needed.png',
+            preview_url: '',
+            storage_url: '',
+            model: false,
+            public: false,
+            in_library: false
+          },
+          {
+            id: 'a2',
+            name: 'already-have.png',
+            preview_url: '',
+            storage_url: '',
+            model: false,
+            public: false,
+            in_library: true
+          }
+        ]
+      })
+      mockGetSharedWorkflow.mockResolvedValue(mixedPayload)
+      const wrapper = mountComponent()
+      await flushPromises()
+
+      // Should still show assets panel (has 1 non-owned)
+      expect(wrapper.text()).toContain('non-public assets')
+    })
+  })
+
+  describe('fetches with correct shareId', () => {
+    it('passes shareId to getSharedWorkflow', async () => {
+      mockGetSharedWorkflow.mockResolvedValue(makePayload())
+      mountComponent({ shareId: 'my-share-123' })
+      await flushPromises()
+
+      expect(mockGetSharedWorkflow).toHaveBeenCalledWith('my-share-123')
+    })
+  })
+})
diff --git a/src/platform/workflow/sharing/components/OpenSharedWorkflowDialogContent.vue b/src/platform/workflow/sharing/components/OpenSharedWorkflowDialogContent.vue
new file mode 100644
index 0000000000..8b0a5a468c
--- /dev/null
+++ b/src/platform/workflow/sharing/components/OpenSharedWorkflowDialogContent.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="flex w-full flex-col">
+    <header
+      class="flex h-12 items-center justify-between gap-2 border-b border-border-default px-4"
+    >
+      <h2 class="text-sm text-base-foreground">
+        {{ $t('openSharedWorkflow.dialogTitle') }}
+      </h2>
+      <Button size="icon" :aria-label="$t('g.close')" @click="onCancel">
+        <i class="icon-[lucide--x] size-4" />
+      </Button>
+    </header>
+
+    <template v-if="isLoading">
+      <main class="flex gap-8 px-8 pt-4 pb-6">
+        <div class="flex min-w-0 flex-1 flex-col gap-12 py-4">
+          <Skeleton class="h-8 w-3/5" />
+          <Skeleton class="h-4 w-4/5" />
+        </div>
+        <div class="flex w-84 shrink-0 flex-col gap-2 py-4">
+          <Skeleton class="h-4 w-full" />
+          <Skeleton class="h-20 w-full rounded-lg" />
+        </div>
+      </main>
+      <footer
+        class="flex items-center justify-end gap-2.5 border-t border-border-default px-8 py-4"
+      >
+        <Skeleton class="h-10 w-24 rounded-md" />
+        <Skeleton class="h-10 w-40 rounded-md" />
+      </footer>
+    </template>
+
+    <template v-else-if="error">
+      <main class="flex flex-col items-center gap-4 p-8">
+        <i
+          class="icon-[lucide--circle-alert] size-8 text-warning-background"
+          aria-hidden="true"
+        />
+        <p class="m-0 text-center text-sm text-muted-foreground">
+          {{ $t('openSharedWorkflow.loadError') }}
+        </p>
+      </main>
+      <footer
+        class="flex items-center justify-end gap-2.5 border-t border-border-default px-8 py-4"
+      >
+        <Button variant="secondary" size="lg" @click="onCancel">
+          {{ $t('g.close') }}
+        </Button>
+      </footer>
+    </template>
+
+    <template v-else-if="sharedWorkflow">
+      <main :class="cn('flex gap-8 px-8 pt-4 pb-6', !hasAssets && 'flex-col')">
+        <div class="flex min-w-0 flex-1 flex-col gap-12 py-4">
+          <h2 class="m-0 text-2xl font-semibold text-base-foreground">
+            {{ workflowName }}
+          </h2>
+          <p class="m-0 text-sm text-muted-foreground">
+            {{ $t('openSharedWorkflow.copyDescription') }}
+          </p>
+        </div>
+
+        <div v-if="hasAssets" class="flex w-96 shrink-0 flex-col gap-2 py-4">
+          <CollapsibleRoot
+            v-model:open="isWarningExpanded"
+            class="overflow-hidden rounded-lg bg-secondary-background"
+          >
+            <CollapsibleTrigger as-child>
+              <Button
+                variant="secondary"
+                class="w-full justify-between px-4 py-1 text-sm"
+              >
+                <i
+                  class="icon-[lucide--circle-alert] size-4 shrink-0 text-warning-background"
+                  aria-hidden="true"
+                />
+                <span
+                  class="m-0 flex-1 text-left text-sm text-muted-foreground"
+                >
+                  {{ $t('openSharedWorkflow.nonPublicAssetsWarningLine1') }}
+                </span>
+                <i
+                  :class="
+                    cn(
+                      'icon-[lucide--chevron-right] size-4 shrink-0 text-muted-foreground transition-transform',
+                      isWarningExpanded && 'rotate-90'
+                    )
+                  "
+                />
+              </Button>
+            </CollapsibleTrigger>
+
+            <CollapsibleContent
+              class="overflow-hidden data-[state=closed]:animate-collapsible-up data-[state=open]:animate-collapsible-down"
+            >
+              <AssetSectionList :items="nonOwnedAssets" />
+            </CollapsibleContent>
+          </CollapsibleRoot>
+        </div>
+      </main>
+
+      <footer
+        class="flex items-center justify-end gap-2.5 border-t border-border-default px-8 py-4"
+      >
+        <Button variant="secondary" size="lg" @click="onCancel">
+          {{ $t('g.cancel') }}
+        </Button>
+        <Button
+          v-if="hasAssets"
+          variant="secondary"
+          size="lg"
+          @click="onOpenWithoutImporting(sharedWorkflow)"
+        >
+          {{ $t('openSharedWorkflow.openWithoutImporting') }}
+        </Button>
+        <Button variant="primary" size="lg" @click="onConfirm(sharedWorkflow)">
+          {{
+            hasAssets
+              ? $t('openSharedWorkflow.copyAssetsAndOpen')
+              : $t('openSharedWorkflow.openWorkflow')
+          }}
+        </Button>
+      </footer>
+    </template>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useAsyncState } from '@vueuse/core'
+import {
+  CollapsibleContent,
+  CollapsibleRoot,
+  CollapsibleTrigger
+} from 'reka-ui'
+import { computed, ref } from 'vue'
+
+import type { SharedWorkflowPayload } from '@/platform/workflow/sharing/types/shareTypes'
+import AssetSectionList from '@/platform/workflow/sharing/components/AssetSectionList.vue'
+import { useWorkflowShareService } from '@/platform/workflow/sharing/services/workflowShareService'
+import Button from '@/components/ui/button/Button.vue'
+import Skeleton from '@/components/ui/skeleton/Skeleton.vue'
+import { cn } from '@/utils/tailwindUtil'
+
+const { shareId, onConfirm, onOpenWithoutImporting, onCancel } = defineProps<{
+  shareId: string
+  onConfirm: (payload: SharedWorkflowPayload) => void
+  onOpenWithoutImporting: (payload: SharedWorkflowPayload) => void
+  onCancel: () => void
+}>()
+
+const workflowShareService = useWorkflowShareService()
+const isWarningExpanded = ref(true)
+
+const {
+  state: sharedWorkflow,
+  isLoading,
+  error
+} = useAsyncState(() => workflowShareService.getSharedWorkflow(shareId), null)
+
+const nonOwnedAssets = computed(
+  () => sharedWorkflow.value?.assets.filter((a) => !a.in_library) ?? []
+)
+
+const hasAssets = computed(() => nonOwnedAssets.value.length > 0)
+
+const workflowName = computed(() => {
+  if (!sharedWorkflow.value) return ''
+  if (sharedWorkflow.value.name) return sharedWorkflow.value.name
+  const jsonName = (
+    sharedWorkflow.value.workflowJson as Record<string, unknown>
+  ).name
+  if (typeof jsonName === 'string' && jsonName) return jsonName
+  return ''
+})
+</script>
diff --git a/src/platform/workflow/sharing/components/ShareAssetThumbnail.vue b/src/platform/workflow/sharing/components/ShareAssetThumbnail.vue
new file mode 100644
index 0000000000..5048e7a89a
--- /dev/null
+++ b/src/platform/workflow/sharing/components/ShareAssetThumbnail.vue
@@ -0,0 +1,67 @@
+<template>
+  <div
+    class="relative flex size-8 shrink-0 items-center justify-center overflow-hidden rounded-md bg-muted"
+  >
+    <Skeleton
+      v-if="normalizedPreviewUrl && isLoading"
+      class="absolute inset-0"
+    />
+    <img
+      v-if="normalizedPreviewUrl && !error"
+      :src="normalizedPreviewUrl"
+      :alt="name"
+      :class="
+        cn(
+          'size-full object-cover transition-opacity duration-200',
+          isReady ? 'opacity-100' : 'opacity-0'
+        )
+      "
+      @error="
+        $emit('thumbnailError', { name, previewUrl: normalizedPreviewUrl })
+      "
+    />
+    <i
+      v-if="!normalizedPreviewUrl || error"
+      class="icon-[lucide--image] size-4 text-muted-foreground"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useImage } from '@vueuse/core'
+import { computed } from 'vue'
+
+import Skeleton from '@/components/ui/skeleton/Skeleton.vue'
+import { cn } from '@/utils/tailwindUtil'
+
+const { name, previewUrl } = defineProps<{
+  name: string
+  previewUrl: string | null | undefined
+}>()
+
+defineEmits<{
+  thumbnailError: [{ name: string; previewUrl: string | null }]
+}>()
+
+const normalizedPreviewUrl = computed(() => {
+  if (typeof previewUrl !== 'string' || previewUrl.length === 0) return null
+  try {
+    const url = new URL(previewUrl, window.location.origin)
+    if (
+      !url.origin.includes('googleapis') &&
+      url.searchParams.has('filename') &&
+      !url.searchParams.has('res')
+    )
+      url.searchParams.set('res', '256')
+    return url.toString()
+  } catch {
+    return previewUrl
+  }
+})
+
+const imageOptions = computed(() => ({
+  src: normalizedPreviewUrl.value ?? ''
+}))
+
+const { isReady, isLoading, error } = useImage(imageOptions)
+</script>
diff --git a/src/platform/workflow/sharing/components/ShareAssetWarningBox.test.ts b/src/platform/workflow/sharing/components/ShareAssetWarningBox.test.ts
new file mode 100644
index 0000000000..6efd99d2fa
--- /dev/null
+++ b/src/platform/workflow/sharing/components/ShareAssetWarningBox.test.ts
@@ -0,0 +1,268 @@
+import { mount } from '@vue/test-utils'
+import { describe, expect, it } from 'vitest'
+import { nextTick } from 'vue'
+import { createI18n } from 'vue-i18n'
+
+import type { ComponentProps } from 'vue-component-type-helpers'
+
+import ShareAssetWarningBox from '@/platform/workflow/sharing/components/ShareAssetWarningBox.vue'
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      shareWorkflow: {
+        privateAssetsDescription:
+          'Your workflow contains private models and/or media files',
+        mediaLabel: '{count} Media File | {count} Media Files',
+        modelsLabel: '{count} Model | {count} Models',
+        acknowledgeCheckbox: 'I understand these assets...'
+      }
+    }
+  }
+})
+
+describe(ShareAssetWarningBox, () => {
+  function createWrapper(
+    props: Partial<ComponentProps<typeof ShareAssetWarningBox>> = {}
+  ) {
+    return mount(ShareAssetWarningBox, {
+      props: {
+        items: [
+          {
+            id: 'asset-image',
+            name: 'image.png',
+            storage_url: '',
+            preview_url: 'https://example.com/a.jpg',
+            model: false,
+            public: false,
+            in_library: false
+          },
+          {
+            id: 'model-default',
+            name: 'model.safetensors',
+            storage_url: '',
+            preview_url: '',
+            model: true,
+            public: false,
+            in_library: false
+          }
+        ],
+        acknowledged: false,
+        ...props
+      },
+      global: {
+        plugins: [i18n]
+      }
+    })
+  }
+
+  it('renders warning text', () => {
+    const wrapper = createWrapper()
+    expect(wrapper.text()).toContain(
+      'Your workflow contains private models and/or media files'
+    )
+  })
+
+  it('renders media and model collapsible sections', () => {
+    const wrapper = createWrapper()
+
+    expect(wrapper.text()).toContain('1 Media File')
+    expect(wrapper.text()).toContain('1 Model')
+  })
+
+  it('keeps at most one accordion section open at a time', async () => {
+    const wrapper = createWrapper()
+
+    const mediaHeader = wrapper.get('[data-testid="section-header-media"]')
+    const modelsHeader = wrapper.get('[data-testid="section-header-models"]')
+    const mediaChevron = mediaHeader.get('i')
+    const modelsChevron = modelsHeader.get('i')
+
+    expect(mediaHeader.attributes('aria-expanded')).toBe('true')
+    expect(modelsHeader.attributes('aria-expanded')).toBe('false')
+    expect(mediaHeader.attributes('aria-controls')).toBe(
+      'section-content-media'
+    )
+    expect(modelsHeader.attributes('aria-controls')).toBe(
+      'section-content-models'
+    )
+    expect(mediaChevron.classes()).toContain('rotate-90')
+    expect(modelsChevron.classes()).not.toContain('rotate-90')
+
+    await modelsHeader.trigger('click')
+    await nextTick()
+
+    expect(mediaHeader.attributes('aria-expanded')).toBe('false')
+    expect(modelsHeader.attributes('aria-expanded')).toBe('true')
+    expect(mediaChevron.classes()).not.toContain('rotate-90')
+    expect(modelsChevron.classes()).toContain('rotate-90')
+
+    await mediaHeader.trigger('click')
+    await nextTick()
+
+    expect(mediaHeader.attributes('aria-expanded')).toBe('true')
+    expect(modelsHeader.attributes('aria-expanded')).toBe('false')
+    expect(mediaChevron.classes()).toContain('rotate-90')
+    expect(modelsChevron.classes()).not.toContain('rotate-90')
+
+    await mediaHeader.trigger('click')
+    await nextTick()
+
+    expect(mediaHeader.attributes('aria-expanded')).toBe('false')
+    expect(modelsHeader.attributes('aria-expanded')).toBe('false')
+  })
+
+  it('defaults to media section when both sections are available', () => {
+    const wrapper = createWrapper()
+
+    const mediaHeader = wrapper.get('[data-testid="section-header-media"]')
+    const modelsHeader = wrapper.get('[data-testid="section-header-models"]')
+
+    expect(mediaHeader.attributes('aria-expanded')).toBe('true')
+    expect(modelsHeader.attributes('aria-expanded')).toBe('false')
+  })
+
+  it('defaults to models section when media is unavailable', () => {
+    const wrapper = createWrapper({
+      items: [
+        {
+          id: 'model-default',
+          name: 'model.safetensors',
+          storage_url: '',
+          preview_url: '',
+          model: true,
+          public: false,
+          in_library: false
+        }
+      ]
+    })
+
+    expect(wrapper.text()).toContain('1 Model')
+    const modelsHeader = wrapper.get('[data-testid="section-header-models"]')
+
+    expect(modelsHeader.attributes('aria-expanded')).toBe('true')
+  })
+
+  it('allows collapsing the only expanded section when models are unavailable', async () => {
+    const wrapper = createWrapper({
+      items: [
+        {
+          id: 'asset-image',
+          name: 'image.png',
+          storage_url: '',
+          preview_url: 'https://example.com/a.jpg',
+          model: false,
+          public: false,
+          in_library: false
+        }
+      ]
+    })
+
+    const mediaHeader = wrapper.get('[data-testid="section-header-media"]')
+    const mediaChevron = mediaHeader.get('i')
+
+    expect(mediaHeader.attributes('aria-expanded')).toBe('true')
+    expect(mediaChevron.classes()).toContain('rotate-90')
+
+    await mediaHeader.trigger('click')
+    await nextTick()
+
+    expect(mediaHeader.attributes('aria-expanded')).toBe('false')
+    expect(mediaChevron.classes()).not.toContain('rotate-90')
+  })
+
+  it('emits acknowledged update when checkbox is toggled', async () => {
+    const wrapper = createWrapper()
+
+    const checkbox = wrapper.find('input[type="checkbox"]')
+    await checkbox.setValue(true)
+    await nextTick()
+
+    expect(wrapper.emitted('update:acknowledged')).toBeTruthy()
+    expect(wrapper.emitted('update:acknowledged')![0]).toEqual([true])
+  })
+
+  it('displays asset names in the assets section', () => {
+    const wrapper = createWrapper()
+
+    expect(wrapper.text()).toContain('image.png')
+  })
+
+  it('renders thumbnail previews for assets when URLs are available', () => {
+    const wrapper = createWrapper()
+
+    const images = wrapper.findAll('img')
+    expect(images).toHaveLength(1)
+    expect(images[0].attributes('src')).toBe('https://example.com/a.jpg')
+    expect(images[0].attributes('alt')).toBe('image.png')
+  })
+
+  it('renders fallback icon when thumbnail is missing', () => {
+    const wrapper = createWrapper({
+      items: [
+        {
+          id: 'asset-image',
+          name: 'image.png',
+          storage_url: '',
+          preview_url: '',
+          model: false,
+          public: false,
+          in_library: false
+        },
+        {
+          id: 'model-default',
+          name: 'model.safetensors',
+          storage_url: '',
+          preview_url: '',
+          model: true,
+          public: false,
+          in_library: false
+        }
+      ]
+    })
+
+    const fallbackIcons = wrapper
+      .findAll('i')
+      .filter((icon) => icon.classes().includes('icon-[lucide--image]'))
+
+    expect(fallbackIcons).toHaveLength(1)
+  })
+
+  it('hides assets section when no assets provided', () => {
+    const wrapper = createWrapper({
+      items: [
+        {
+          id: 'model-default',
+          name: 'model.safetensors',
+          storage_url: '',
+          preview_url: '',
+          model: true,
+          public: false,
+          in_library: false
+        }
+      ]
+    })
+
+    expect(wrapper.text()).not.toContain('Media File')
+  })
+
+  it('hides models section when no models provided', () => {
+    const wrapper = createWrapper({
+      items: [
+        {
+          id: 'asset-image',
+          name: 'image.png',
+          storage_url: '',
+          preview_url: '',
+          model: false,
+          public: false,
+          in_library: false
+        }
+      ]
+    })
+
+    expect(wrapper.text()).not.toContain('Model')
+  })
+})
diff --git a/src/platform/workflow/sharing/components/ShareAssetWarningBox.vue b/src/platform/workflow/sharing/components/ShareAssetWarningBox.vue
new file mode 100644
index 0000000000..0772ad0db0
--- /dev/null
+++ b/src/platform/workflow/sharing/components/ShareAssetWarningBox.vue
@@ -0,0 +1,71 @@
+<template>
+  <div class="flex flex-col gap-3 rounded-lg">
+    <CollapsibleRoot
+      v-model:open="isWarningExpanded"
+      class="overflow-hidden rounded-lg bg-secondary-background"
+    >
+      <CollapsibleTrigger as-child>
+        <Button
+          variant="secondary"
+          class="w-full justify-between px-4 py-1 text-sm"
+        >
+          <i
+            class="icon-[lucide--circle-alert] size-4 shrink-0 text-warning-background"
+            aria-hidden="true"
+          />
+          <span class="m-0 flex-1 text-left text-sm text-muted-foreground">
+            {{ $t('shareWorkflow.privateAssetsDescription') }}
+          </span>
+
+          <i
+            :class="
+              cn(
+                'icon-[lucide--chevron-right] size-4 shrink-0 text-muted-foreground transition-transform',
+                isWarningExpanded && 'rotate-90'
+              )
+            "
+          />
+        </Button>
+      </CollapsibleTrigger>
+
+      <CollapsibleContent
+        class="overflow-hidden data-[state=closed]:animate-collapsible-up data-[state=open]:animate-collapsible-down"
+      >
+        <AssetSectionList :items />
+      </CollapsibleContent>
+    </CollapsibleRoot>
+
+    <label class="mt-3 flex cursor-pointer items-center gap-2">
+      <input
+        v-model="acknowledged"
+        type="checkbox"
+        class="size-3.5 shrink-0 cursor-pointer accent-primary-background"
+      />
+      <span class="text-sm text-muted-foreground">
+        {{ $t('shareWorkflow.acknowledgeCheckbox') }}
+      </span>
+    </label>
+  </div>
+</template>
+
+<script setup lang="ts">
+import {
+  CollapsibleContent,
+  CollapsibleRoot,
+  CollapsibleTrigger
+} from 'reka-ui'
+import { ref } from 'vue'
+
+import type { AssetInfo } from '@/schemas/apiSchema'
+import AssetSectionList from '@/platform/workflow/sharing/components/AssetSectionList.vue'
+import { cn } from '@/utils/tailwindUtil'
+import Button from '@/components/ui/button/Button.vue'
+
+const { items } = defineProps<{
+  items: AssetInfo[]
+}>()
+
+const acknowledged = defineModel<boolean>('acknowledged')
+
+const isWarningExpanded = ref(true)
+</script>
diff --git a/src/platform/workflow/sharing/components/ShareUrlCopyField.vue b/src/platform/workflow/sharing/components/ShareUrlCopyField.vue
new file mode 100644
index 0000000000..87b4d9a48f
--- /dev/null
+++ b/src/platform/workflow/sharing/components/ShareUrlCopyField.vue
@@ -0,0 +1,42 @@
+<template>
+  <div class="flex items-center gap-2">
+    <Input
+      readonly
+      :model-value="url"
+      :aria-label="$t('shareWorkflow.shareUrlLabel')"
+      class="flex-1"
+      @focus="($event.target as HTMLInputElement).select()"
+    />
+    <Button
+      variant="secondary"
+      size="lg"
+      class="font-normal"
+      @click="handleCopy"
+    >
+      {{
+        copied ? $t('shareWorkflow.linkCopied') : $t('shareWorkflow.copyLink')
+      }}
+      <i class="icon-[lucide--link] size-3.5" aria-hidden="true" />
+    </Button>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { refAutoReset } from '@vueuse/core'
+
+import Button from '@/components/ui/button/Button.vue'
+import Input from '@/components/ui/input/Input.vue'
+import { useCopyToClipboard } from '@/composables/useCopyToClipboard'
+
+const { url } = defineProps<{
+  url: string
+}>()
+
+const { copyToClipboard } = useCopyToClipboard()
+const copied = refAutoReset(false, 2000)
+
+async function handleCopy() {
+  await copyToClipboard(url)
+  copied.value = true
+}
+</script>
diff --git a/src/platform/workflow/sharing/components/ShareWorkflowDialogContent.test.ts b/src/platform/workflow/sharing/components/ShareWorkflowDialogContent.test.ts
new file mode 100644
index 0000000000..56d67f4c5d
--- /dev/null
+++ b/src/platform/workflow/sharing/components/ShareWorkflowDialogContent.test.ts
@@ -0,0 +1,532 @@
+import { flushPromises, mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { nextTick, reactive } from 'vue'
+import { createI18n } from 'vue-i18n'
+
+import ShareWorkflowDialogContent from '@/platform/workflow/sharing/components/ShareWorkflowDialogContent.vue'
+
+const mockWorkflowStore = reactive<{
+  activeWorkflow: {
+    path: string
+    directory: string
+    filename: string
+    isTemporary: boolean
+    isModified: boolean
+    lastModified: number
+  } | null
+}>({
+  activeWorkflow: null
+})
+
+vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
+  useWorkflowStore: () => mockWorkflowStore
+}))
+
+const mockToast = vi.hoisted(() => ({ add: vi.fn() }))
+
+vi.mock('primevue/usetoast', () => ({
+  useToast: () => mockToast
+}))
+
+vi.mock('@formkit/auto-animate/vue', () => ({
+  vAutoAnimate: {}
+}))
+
+const mockFlags = vi.hoisted(() => ({
+  comfyHubUploadEnabled: false,
+  comfyHubProfileGateEnabled: true
+}))
+
+const mockShowPublishDialog = vi.hoisted(() => vi.fn())
+
+vi.mock('@/composables/useFeatureFlags', () => ({
+  useFeatureFlags: () => ({
+    flags: mockFlags
+  })
+}))
+
+vi.mock(
+  '@/platform/workflow/sharing/composables/useComfyHubPublishDialog',
+  () => ({
+    useComfyHubPublishDialog: () => ({
+      show: mockShowPublishDialog
+    })
+  })
+)
+
+vi.mock('@/platform/workflow/core/services/workflowService', () => ({
+  useWorkflowService: () => ({
+    saveWorkflow: vi.fn(),
+    renameWorkflow: vi.fn()
+  })
+}))
+
+const mockShareServiceData = vi.hoisted(() => ({
+  items: [
+    {
+      id: 'test.png',
+      name: 'test.png',
+      preview_url: '',
+      storage_url: '',
+      model: false,
+      public: false,
+      in_library: false
+    },
+    {
+      id: 'model.safetensors',
+      name: 'model.safetensors',
+      preview_url: '',
+      storage_url: '',
+      model: true,
+      public: false,
+      in_library: false
+    }
+  ]
+}))
+
+const mockGetPublishStatus = vi.hoisted(() => vi.fn())
+const mockPublishWorkflow = vi.hoisted(() => vi.fn())
+const mockGetShareableAssets = vi.hoisted(() => vi.fn())
+
+vi.mock('@/platform/workflow/sharing/services/workflowShareService', () => ({
+  useWorkflowShareService: () => ({
+    getPublishStatus: mockGetPublishStatus,
+    publishWorkflow: mockPublishWorkflow,
+    getShareableAssets: mockGetShareableAssets
+  })
+}))
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      g: { close: 'Close', error: 'Error' },
+      shareWorkflow: {
+        unsavedDescription: 'You must save your workflow before sharing.',
+        shareLinkTab: 'Share',
+        publishToHubTab: 'Publish',
+        workflowNameLabel: 'Workflow name',
+        saving: 'Saving...',
+        saveButton: 'Save workflow',
+        createLinkButton: 'Create link',
+        creatingLink: 'Creating link...',
+        checkingAssets: 'Checking assets...',
+        successDescription: 'Anyone with this link...',
+        hasChangesDescription: 'You have made changes...',
+        updateLinkButton: 'Update link',
+        updatingLink: 'Updating link...',
+        publishedOn: 'Published on {date}',
+        mediaLabel: '{count} Media File | {count} Media Files',
+        modelsLabel: '{count} Model | {count} Models',
+        acknowledgeCheckbox: 'I understand these assets...',
+        loadFailed: 'Failed to load publish status'
+      },
+      comfyHubProfile: {
+        introTitle: 'Introducing ComfyHub',
+        createProfileButton: 'Create my profile',
+        startPublishingButton: 'Start publishing'
+      }
+    }
+  }
+})
+
+describe('ShareWorkflowDialogContent', () => {
+  const onClose = vi.fn()
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockPublishWorkflow.mockReset()
+    mockGetShareableAssets.mockReset()
+    mockWorkflowStore.activeWorkflow = {
+      path: 'workflows/test.json',
+      directory: 'workflows',
+      filename: 'test.json',
+      isTemporary: false,
+      isModified: false,
+      lastModified: 1000
+    }
+    mockGetPublishStatus.mockResolvedValue({
+      isPublished: false,
+      shareId: null,
+      shareUrl: null,
+      publishedAt: null
+    })
+    mockFlags.comfyHubUploadEnabled = false
+    mockShareServiceData.items = [
+      {
+        id: 'test.png',
+        name: 'test.png',
+        preview_url: '',
+        storage_url: '',
+        model: false,
+        public: false,
+        in_library: false
+      },
+      {
+        id: 'model.safetensors',
+        name: 'model.safetensors',
+        preview_url: '',
+        storage_url: '',
+        model: true,
+        public: false,
+        in_library: false
+      }
+    ]
+    mockPublishWorkflow.mockResolvedValue({
+      shareId: 'test-123',
+      shareUrl: 'https://comfy.org/shared/test-123',
+      publishedAt: new Date('2026-01-15')
+    })
+    mockGetShareableAssets.mockResolvedValue(mockShareServiceData.items)
+  })
+
+  function createWrapper() {
+    return mount(ShareWorkflowDialogContent, {
+      props: { onClose },
+      global: {
+        plugins: [i18n],
+        stubs: {
+          ComfyHubPublishIntroPanel: {
+            template:
+              '<section data-testid="publish-intro"><button data-testid="publish-intro-cta" @click="$props.onCreateProfile()">Start publishing</button></section>',
+            props: ['onCreateProfile']
+          },
+          'comfy-hub-publish-intro-panel': {
+            template:
+              '<section data-testid="publish-intro"><button data-testid="publish-intro-cta" @click="$props.onCreateProfile()">Start publishing</button></section>',
+            props: ['onCreateProfile']
+          },
+          Input: {
+            template: '<input v-bind="$attrs" />',
+            methods: { focus() {}, select() {} }
+          }
+        }
+      }
+    })
+  }
+
+  it('renders in unsaved state when workflow is modified', async () => {
+    mockWorkflowStore.activeWorkflow = {
+      path: 'workflows/test.json',
+      directory: 'workflows',
+      filename: 'test.json',
+      isTemporary: false,
+      isModified: true,
+      lastModified: 1000
+    }
+    const wrapper = createWrapper()
+    await flushPromises()
+
+    expect(wrapper.text()).toContain(
+      'You must save your workflow before sharing.'
+    )
+    expect(wrapper.text()).toContain('Save workflow')
+  })
+
+  it('renders share-link and publish tabs when comfy hub upload is enabled', async () => {
+    mockFlags.comfyHubUploadEnabled = true
+    const wrapper = createWrapper()
+    await flushPromises()
+
+    expect(wrapper.text()).toContain('Share')
+    expect(wrapper.text()).toContain('Publish')
+    const publishTabPanel = wrapper.find('[data-testid="publish-tab-panel"]')
+    expect(publishTabPanel.exists()).toBe(true)
+    expect(publishTabPanel.attributes('style')).toContain('display: none')
+  })
+
+  it('hides the publish tab when comfy hub upload is disabled', async () => {
+    const wrapper = createWrapper()
+    await flushPromises()
+
+    expect(wrapper.text()).toContain('Share')
+    expect(wrapper.text()).not.toContain('Publish')
+    expect(wrapper.find('[data-testid="publish-intro"]').exists()).toBe(false)
+  })
+
+  it('shows publish intro panel in the share dialog', async () => {
+    mockFlags.comfyHubUploadEnabled = true
+    const wrapper = createWrapper()
+    await flushPromises()
+
+    const publishTab = wrapper
+      .findAll('button')
+      .find((button) => button.text().includes('Publish'))
+
+    expect(publishTab).toBeDefined()
+    await publishTab!.trigger('click')
+    await flushPromises()
+
+    expect(wrapper.find('[data-testid="publish-intro"]').exists()).toBe(true)
+  })
+
+  it('shows start publishing CTA in the publish intro panel', async () => {
+    mockFlags.comfyHubUploadEnabled = true
+    const wrapper = createWrapper()
+    await flushPromises()
+
+    const publishTab = wrapper
+      .findAll('button')
+      .find((button) => button.text().includes('Publish'))
+    expect(publishTab).toBeDefined()
+
+    await publishTab!.trigger('click')
+    await flushPromises()
+
+    expect(wrapper.find('[data-testid="publish-intro-cta"]').text()).toBe(
+      'Start publishing'
+    )
+  })
+
+  it('opens publish dialog from intro cta and closes share dialog', async () => {
+    mockFlags.comfyHubUploadEnabled = true
+    const wrapper = createWrapper()
+    await flushPromises()
+
+    const publishTab = wrapper
+      .findAll('button')
+      .find((button) => button.text().includes('Publish'))
+
+    expect(publishTab).toBeDefined()
+    await publishTab!.trigger('click')
+    await flushPromises()
+
+    await wrapper.find('[data-testid="publish-intro-cta"]').trigger('click')
+    await nextTick()
+
+    expect(onClose).toHaveBeenCalledOnce()
+    expect(mockShowPublishDialog).toHaveBeenCalledOnce()
+  })
+
+  it('disables publish button when acknowledgment is unchecked', async () => {
+    const wrapper = createWrapper()
+    await flushPromises()
+
+    const publishButton = wrapper
+      .findAll('button')
+      .find((button) => button.text().includes('Create link'))
+
+    expect(publishButton?.attributes('disabled')).toBeDefined()
+  })
+
+  it('enables publish button when acknowledgment is checked', async () => {
+    const wrapper = createWrapper()
+    await flushPromises()
+
+    const checkbox = wrapper.find('input[type="checkbox"]')
+    await checkbox.setValue(true)
+    await nextTick()
+
+    const publishButton = wrapper
+      .findAll('button')
+      .find((button) => button.text().includes('Create link'))
+
+    expect(publishButton?.attributes('disabled')).toBeUndefined()
+  })
+
+  it('calls onClose when close button is clicked', async () => {
+    const wrapper = createWrapper()
+    await flushPromises()
+
+    const closeButton = wrapper.find('[aria-label="Close"]')
+    await closeButton.trigger('click')
+
+    expect(onClose).toHaveBeenCalled()
+  })
+
+  it('publishes using acknowledged assets from initial load', async () => {
+    const initialShareableAssets = [
+      {
+        id: 'local-photo-id',
+        name: 'photo.png',
+        preview_url: '',
+        storage_url: '',
+        model: false,
+        public: false,
+        in_library: false
+      },
+      {
+        id: 'local-model-id',
+        name: 'model.safetensors',
+        preview_url: '',
+        storage_url: '',
+        model: true,
+        public: false,
+        in_library: false
+      }
+    ]
+
+    mockGetShareableAssets.mockResolvedValueOnce(initialShareableAssets)
+
+    const wrapper = createWrapper()
+    await flushPromises()
+
+    const checkbox = wrapper.find('input[type="checkbox"]')
+    await checkbox.setValue(true)
+    await nextTick()
+
+    const publishButton = wrapper
+      .findAll('button')
+      .find((button) => button.text().includes('Create link'))
+    expect(publishButton).toBeDefined()
+
+    await publishButton!.trigger('click')
+    await flushPromises()
+
+    expect(mockGetShareableAssets).toHaveBeenCalledTimes(1)
+    expect(mockPublishWorkflow).toHaveBeenCalledWith(
+      'workflows/test.json',
+      initialShareableAssets
+    )
+  })
+
+  it('shows update button when workflow was saved after last publish', async () => {
+    const publishedAt = new Date('2026-01-15T00:00:00Z')
+    const savedAfterPublishMs = publishedAt.getTime() + 60_000
+
+    mockWorkflowStore.activeWorkflow = {
+      path: 'workflows/test.json',
+      directory: 'workflows',
+      filename: 'test.json',
+      isTemporary: false,
+      isModified: false,
+      lastModified: savedAfterPublishMs
+    }
+    mockGetPublishStatus.mockResolvedValue({
+      isPublished: true,
+      shareId: 'abc-123',
+      shareUrl: 'https://comfy.org/shared/abc-123',
+      publishedAt
+    })
+
+    const wrapper = createWrapper()
+    await flushPromises()
+
+    expect(wrapper.text()).toContain('You have made changes...')
+    expect(wrapper.text()).toContain('Update link')
+  })
+
+  it('shows copy URL when workflow has not changed since publish', async () => {
+    const publishedAt = new Date('2026-01-15T00:00:00Z')
+    const savedBeforePublishMs = publishedAt.getTime() - 60_000
+
+    mockWorkflowStore.activeWorkflow = {
+      path: 'workflows/test.json',
+      directory: 'workflows',
+      filename: 'test.json',
+      isTemporary: false,
+      isModified: false,
+      lastModified: savedBeforePublishMs
+    }
+    mockGetPublishStatus.mockResolvedValue({
+      isPublished: true,
+      shareId: 'abc-123',
+      shareUrl: 'https://comfy.org/shared/abc-123',
+      publishedAt
+    })
+
+    const wrapper = createWrapper()
+    await flushPromises()
+
+    expect(wrapper.text()).toContain('Anyone with this link...')
+    expect(wrapper.text()).not.toContain('Update link')
+  })
+
+  describe('error and edge cases', () => {
+    it('renders unsaved state when workflow is temporary', async () => {
+      mockWorkflowStore.activeWorkflow = {
+        path: 'workflows/Unsaved Workflow.json',
+        directory: 'workflows',
+        filename: 'Unsaved Workflow.json',
+        isTemporary: true,
+        isModified: false,
+        lastModified: 1000
+      }
+      const wrapper = createWrapper()
+      await flushPromises()
+
+      expect(wrapper.text()).toContain(
+        'You must save your workflow before sharing.'
+      )
+      expect(wrapper.text()).toContain('Workflow name')
+    })
+
+    it('shows error toast when getPublishStatus rejects', async () => {
+      mockGetPublishStatus.mockRejectedValue(new Error('Server down'))
+
+      const wrapper = createWrapper()
+      await flushPromises()
+
+      expect(wrapper.text()).toContain('Create link')
+      expect(mockToast.add).toHaveBeenCalledWith({
+        severity: 'error',
+        summary: 'Failed to load publish status'
+      })
+    })
+
+    it('shows error toast when publishWorkflow rejects', async () => {
+      mockGetShareableAssets.mockResolvedValue([])
+
+      const wrapper = createWrapper()
+      await flushPromises()
+
+      mockPublishWorkflow.mockRejectedValue(new Error('Publish failed'))
+
+      const publishButton = wrapper
+        .findAll('button')
+        .find((btn) => btn.text().includes('Create link'))
+      expect(publishButton).toBeDefined()
+      await publishButton!.trigger('click')
+      await flushPromises()
+
+      expect(wrapper.text()).not.toContain('Anyone with this link...')
+      expect(mockToast.add).toHaveBeenCalledWith({
+        severity: 'error',
+        summary: 'Error',
+        detail: 'Publish failed',
+        life: 5000
+      })
+    })
+
+    it('renders unsaved state when no active workflow exists', async () => {
+      mockWorkflowStore.activeWorkflow = null
+      const wrapper = createWrapper()
+      await flushPromises()
+
+      expect(wrapper.text()).toContain(
+        'You must save your workflow before sharing.'
+      )
+    })
+
+    it('does not call publishWorkflow when workflow is null during publish', async () => {
+      mockGetShareableAssets.mockResolvedValue([])
+
+      const wrapper = createWrapper()
+      await flushPromises()
+
+      mockWorkflowStore.activeWorkflow = null
+
+      const publishButton = wrapper
+        .findAll('button')
+        .find((btn) => btn.text().includes('Create link'))
+      if (publishButton) {
+        await publishButton.trigger('click')
+        await flushPromises()
+      }
+
+      expect(mockPublishWorkflow).not.toHaveBeenCalled()
+    })
+
+    it('does not switch to publishToHub mode when flag is disabled', async () => {
+      mockFlags.comfyHubUploadEnabled = false
+      const wrapper = createWrapper()
+      await flushPromises()
+
+      expect(wrapper.find('[data-testid="publish-tab-panel"]').exists()).toBe(
+        false
+      )
+      expect(wrapper.text()).not.toContain('Publish')
+    })
+  })
+})
diff --git a/src/platform/workflow/sharing/components/ShareWorkflowDialogContent.vue b/src/platform/workflow/sharing/components/ShareWorkflowDialogContent.vue
new file mode 100644
index 0000000000..ef48689609
--- /dev/null
+++ b/src/platform/workflow/sharing/components/ShareWorkflowDialogContent.vue
@@ -0,0 +1,400 @@
+<template>
+  <div class="flex w-full flex-col">
+    <header
+      class="flex h-12 items-center justify-between gap-2 border-b border-border-default px-4"
+    >
+      <div
+        v-if="showPublishToHubTab"
+        role="tablist"
+        class="flex flex-1 items-center gap-2"
+      >
+        <Button
+          id="tab-share-link"
+          role="tab"
+          :aria-selected="dialogMode === 'shareLink'"
+          :class="tabButtonClass('shareLink')"
+          @click="handleDialogModeChange('shareLink')"
+        >
+          {{ $t('shareWorkflow.shareLinkTab') }}
+        </Button>
+        <Button
+          id="tab-publish"
+          role="tab"
+          :aria-selected="dialogMode === 'publishToHub'"
+          :class="tabButtonClass('publishToHub')"
+          @click="handleDialogModeChange('publishToHub')"
+        >
+          <i class="icon-[lucide--globe] size-4" aria-hidden="true" />
+          {{ $t('shareWorkflow.publishToHubTab') }}
+        </Button>
+      </div>
+      <div v-else class="select-none">
+        {{ $t('shareWorkflow.shareLinkTab') }}
+      </div>
+      <Button size="icon" :aria-label="$t('g.close')" @click="onClose">
+        <i class="icon-[lucide--x] size-4" />
+      </Button>
+    </header>
+
+    <main v-auto-animate class="flex flex-col gap-4 p-4">
+      <div
+        v-show="dialogMode === 'shareLink'"
+        v-auto-animate
+        :role="showPublishToHubTab ? 'tabpanel' : undefined"
+        :aria-labelledby="showPublishToHubTab ? 'tab-share-link' : undefined"
+        class="flex flex-col gap-4"
+      >
+        <template v-if="dialogState === 'loading'">
+          <Skeleton class="h-3 w-4/5" />
+          <Skeleton class="h-3 w-3/5" />
+          <Skeleton class="h-10 w-full" />
+        </template>
+
+        <template v-if="dialogState === 'unsaved'">
+          <p class="m-0 text-sm text-muted-foreground">
+            {{ $t('shareWorkflow.unsavedDescription') }}
+          </p>
+          <label v-if="isTemporary" class="flex flex-col gap-1">
+            <span class="text-sm font-medium text-muted-foreground">
+              {{ $t('shareWorkflow.workflowNameLabel') }}
+            </span>
+            <Input
+              ref="nameInputRef"
+              v-model="workflowName"
+              :disabled="isSaving"
+              @keydown.enter="() => handleSave()"
+            />
+          </label>
+          <Button
+            variant="primary"
+            size="lg"
+            :loading="isSaving"
+            @click="() => handleSave()"
+          >
+            {{
+              isSaving
+                ? $t('shareWorkflow.saving')
+                : $t('shareWorkflow.saveButton')
+            }}
+          </Button>
+        </template>
+
+        <template v-if="dialogState === 'ready' || dialogState === 'stale'">
+          <p
+            v-if="dialogState === 'stale'"
+            class="m-0 text-xs text-muted-foreground"
+          >
+            {{ $t('shareWorkflow.hasChangesDescription') }}
+          </p>
+          <p
+            v-if="isLoadingAssets"
+            class="m-0 text-sm text-muted-foreground italic"
+          >
+            {{ $t('shareWorkflow.checkingAssets') }}
+          </p>
+          <ShareAssetWarningBox
+            v-else-if="requiresAcknowledgment"
+            v-model:acknowledged="acknowledged"
+            :items="assetInfo"
+          />
+          <Button
+            variant="primary"
+            size="lg"
+            :disabled="
+              isPublishing ||
+              isLoadingAssets ||
+              (requiresAcknowledgment && !acknowledged)
+            "
+            @click="() => handlePublish()"
+          >
+            {{ publishButtonLabel }}
+          </Button>
+        </template>
+
+        <template v-if="dialogState === 'shared' && publishResult">
+          <ShareUrlCopyField :url="publishResult.shareUrl" />
+          <div class="flex flex-col gap-1">
+            <p
+              v-if="publishResult.publishedAt"
+              class="m-0 text-xs text-muted-foreground"
+            >
+              {{ $t('shareWorkflow.publishedOn', { date: formattedDate }) }}
+            </p>
+            <p class="m-0 text-xs text-muted-foreground">
+              {{ $t('shareWorkflow.successDescription') }}
+            </p>
+          </div>
+        </template>
+      </div>
+      <div
+        v-if="showPublishToHubTab"
+        v-show="dialogMode === 'publishToHub'"
+        v-auto-animate
+        role="tabpanel"
+        aria-labelledby="tab-publish"
+        data-testid="publish-tab-panel"
+        class="min-h-0"
+      >
+        <ComfyHubPublishIntroPanel
+          data-testid="publish-intro"
+          :on-create-profile="handleOpenPublishDialog"
+          :on-close="onClose"
+          :show-close-button="false"
+        />
+      </div>
+    </main>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { vAutoAnimate } from '@formkit/auto-animate/vue'
+import { useAsyncState } from '@vueuse/core'
+import { useToast } from 'primevue/usetoast'
+import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import ComfyHubPublishIntroPanel from '@/platform/workflow/sharing/components/profile/ComfyHubPublishIntroPanel.vue'
+import ShareAssetWarningBox from '@/platform/workflow/sharing/components/ShareAssetWarningBox.vue'
+import ShareUrlCopyField from '@/platform/workflow/sharing/components/ShareUrlCopyField.vue'
+import Button from '@/components/ui/button/Button.vue'
+import Input from '@/components/ui/input/Input.vue'
+import Skeleton from '@/components/ui/skeleton/Skeleton.vue'
+import { useComfyHubPublishDialog } from '@/platform/workflow/sharing/composables/useComfyHubPublishDialog'
+import type {
+  WorkflowPublishResult,
+  WorkflowPublishStatus
+} from '@/platform/workflow/sharing/types/shareTypes'
+import { useWorkflowShareService } from '@/platform/workflow/sharing/services/workflowShareService'
+import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
+import { useWorkflowService } from '@/platform/workflow/core/services/workflowService'
+import { useFeatureFlags } from '@/composables/useFeatureFlags'
+import { appendJsonExt } from '@/utils/formatUtil'
+import { cn } from '@/utils/tailwindUtil'
+
+const { onClose } = defineProps<{
+  onClose: () => void
+}>()
+
+const { t, locale } = useI18n()
+const toast = useToast()
+const { flags } = useFeatureFlags()
+const publishDialog = useComfyHubPublishDialog()
+const shareService = useWorkflowShareService()
+const workflowStore = useWorkflowStore()
+const workflowService = useWorkflowService()
+
+type DialogState = 'loading' | 'unsaved' | 'ready' | 'shared' | 'stale'
+type DialogMode = 'shareLink' | 'publishToHub'
+
+function resolveDialogStateFromStatus(
+  status: WorkflowPublishStatus,
+  workflow: { lastModified: number }
+): { publishResult: WorkflowPublishResult | null; dialogState: DialogState } {
+  if (!status.isPublished) return { publishResult: null, dialogState: 'ready' }
+  const publishedAtMs = status.publishedAt.getTime()
+  const lastModifiedMs = workflow.lastModified
+  return {
+    publishResult: {
+      shareId: status.shareId,
+      shareUrl: status.shareUrl,
+      publishedAt: status.publishedAt
+    },
+    dialogState: lastModifiedMs > publishedAtMs ? 'stale' : 'shared'
+  }
+}
+
+const dialogState = ref<DialogState>('loading')
+const dialogMode = ref<DialogMode>('shareLink')
+const acknowledged = ref(false)
+const workflowName = ref('')
+const nameInputRef = ref<InstanceType<typeof Input> | null>(null)
+
+function focusNameInput() {
+  nameInputRef.value?.focus()
+  nameInputRef.value?.select()
+}
+
+const isTemporary = computed(
+  () => workflowStore.activeWorkflow?.isTemporary ?? false
+)
+
+watch(dialogState, async (state) => {
+  if (state === 'unsaved' && isTemporary.value) {
+    await nextTick()
+    focusNameInput()
+  }
+})
+
+const {
+  state: assetInfo,
+  isLoading: isLoadingAssets,
+  execute: reloadAssets
+} = useAsyncState(() => shareService.getShareableAssets(), [])
+
+const requiresAcknowledgment = computed(() => assetInfo.value.length > 0)
+const showPublishToHubTab = computed(() => flags.comfyHubUploadEnabled)
+
+function handleOpenPublishDialog() {
+  onClose()
+  publishDialog.show()
+}
+
+function tabButtonClass(mode: DialogMode) {
+  return cn(
+    'cursor-pointer border-none transition-colors',
+    dialogMode.value === mode
+      ? 'bg-secondary-background text-base-foreground'
+      : 'bg-transparent text-muted-foreground hover:bg-secondary-background-hover'
+  )
+}
+
+function handleDialogModeChange(nextMode: DialogMode) {
+  if (nextMode === dialogMode.value) return
+  if (nextMode === 'publishToHub' && !showPublishToHubTab.value) return
+  dialogMode.value = nextMode
+}
+
+watch(showPublishToHubTab, (isVisible) => {
+  if (!isVisible && dialogMode.value === 'publishToHub') {
+    dialogMode.value = 'shareLink'
+  }
+})
+
+const formattedDate = computed(() => {
+  if (!publishResult.value) return ''
+  return publishResult.value.publishedAt.toLocaleDateString(locale.value, {
+    year: 'numeric',
+    month: 'long',
+    day: 'numeric'
+  })
+})
+
+const publishButtonLabel = computed(() => {
+  if (dialogState.value === 'stale') {
+    return isPublishing.value
+      ? t('shareWorkflow.updatingLink')
+      : t('shareWorkflow.updateLinkButton')
+  }
+  return isPublishing.value
+    ? t('shareWorkflow.creatingLink')
+    : t('shareWorkflow.createLinkButton')
+})
+
+function stripJsonExtension(filename: string): string {
+  return filename.replace(/\.json$/i, '')
+}
+
+function buildWorkflowPath(directory: string, filename: string): string {
+  const normalizedDirectory = directory.replace(/\/+$/, '')
+  const normalizedFilename = appendJsonExt(stripJsonExtension(filename))
+
+  return normalizedDirectory
+    ? `${normalizedDirectory}/${normalizedFilename}`
+    : normalizedFilename
+}
+
+async function refreshDialogState() {
+  const workflow = workflowStore.activeWorkflow
+
+  if (!workflow || workflow.isTemporary || workflow.isModified) {
+    dialogState.value = 'unsaved'
+    if (workflow) {
+      workflowName.value = stripJsonExtension(workflow.filename)
+    }
+    return
+  }
+
+  try {
+    const status = await shareService.getPublishStatus(workflow.path)
+    const resolved = resolveDialogStateFromStatus(status, workflow)
+    publishResult.value = resolved.publishResult
+    dialogState.value = resolved.dialogState
+  } catch (error) {
+    console.error('Failed to load publish status:', error)
+    publishResult.value = null
+    dialogState.value = 'ready'
+    toast.add({
+      severity: 'error',
+      summary: t('shareWorkflow.loadFailed')
+    })
+  }
+}
+
+onMounted(() => {
+  void refreshDialogState()
+})
+
+const { isLoading: isSaving, execute: handleSave } = useAsyncState(
+  async () => {
+    const workflow = workflowStore.activeWorkflow
+    if (!workflow) return
+
+    if (workflow.isTemporary) {
+      const name = workflowName.value.trim()
+      if (!name) return
+      const newPath = buildWorkflowPath(workflow.directory, name)
+      await workflowService.renameWorkflow(workflow, newPath)
+      await workflowStore.saveWorkflow(workflow)
+    } else {
+      await workflowService.saveWorkflow(workflow)
+    }
+
+    acknowledged.value = false
+    await reloadAssets()
+
+    await refreshDialogState()
+  },
+  undefined,
+  {
+    immediate: false,
+    onError: (error) => {
+      console.error('Failed to save workflow:', error)
+      toast.add({
+        severity: 'error',
+        summary: t('shareWorkflow.saveFailedTitle'),
+        detail: t('shareWorkflow.saveFailedDescription'),
+        life: 5000
+      })
+    }
+  }
+)
+
+const {
+  state: publishResult,
+  isLoading: isPublishing,
+  execute: handlePublish
+} = useAsyncState(
+  async (): Promise<WorkflowPublishResult | null> => {
+    const workflow = workflowStore.activeWorkflow
+    if (!workflow) return null
+
+    const publishableAssets = assetInfo.value
+
+    if (publishableAssets.length > 0 && !acknowledged.value) {
+      return null
+    }
+
+    const result = await shareService.publishWorkflow(
+      workflow.path,
+      publishableAssets
+    )
+    dialogState.value = 'shared'
+    acknowledged.value = false
+
+    return result
+  },
+  null,
+  {
+    immediate: false,
+    onError: (error) => {
+      console.error('Failed to publish workflow:', error)
+      toast.add({
+        severity: 'error',
+        summary: t('g.error'),
+        detail: error instanceof Error ? error.message : t('g.error'),
+        life: 5000
+      })
+    }
+  }
+)
+</script>
diff --git a/src/platform/workflow/sharing/components/profile/ComfyHubCreateProfileForm.vue b/src/platform/workflow/sharing/components/profile/ComfyHubCreateProfileForm.vue
new file mode 100644
index 0000000000..1570afd255
--- /dev/null
+++ b/src/platform/workflow/sharing/components/profile/ComfyHubCreateProfileForm.vue
@@ -0,0 +1,193 @@
+<template>
+  <form
+    class="flex min-h-0 flex-1 flex-col overflow-hidden bg-base-background"
+    @submit.prevent
+  >
+    <header
+      v-if="showCloseButton"
+      class="flex h-16 items-center justify-between px-6"
+    >
+      <h2 class="text-base font-normal text-base-foreground">
+        {{ $t('comfyHubProfile.createProfileTitle') }}
+      </h2>
+      <Button size="icon" :aria-label="$t('g.close')" @click="onClose">
+        <i class="icon-[lucide--x] size-4" />
+      </Button>
+    </header>
+    <h2 v-else class="px-6 pt-6 text-base font-normal text-base-foreground">
+      {{ $t('comfyHubProfile.createProfileTitle') }}
+    </h2>
+
+    <div class="flex min-h-0 flex-1 flex-col gap-6 overflow-y-auto px-6 py-4">
+      <div class="flex flex-col gap-4">
+        <label for="profile-picture" class="text-sm text-muted-foreground">
+          {{ $t('comfyHubProfile.chooseProfilePicture') }}
+        </label>
+        <label
+          class="flex size-13 cursor-pointer items-center justify-center overflow-hidden rounded-full bg-linear-to-b from-green-600/50 to-green-900"
+        >
+          <input
+            id="profile-picture"
+            type="file"
+            accept="image/*"
+            class="hidden"
+            @change="handleProfileSelect"
+          />
+          <template v-if="profilePreviewUrl">
+            <img
+              :src="profilePreviewUrl"
+              :alt="$t('comfyHubProfile.chooseProfilePicture')"
+              class="size-full rounded-full object-cover"
+            />
+          </template>
+          <template v-else>
+            <span class="text-base text-white">
+              {{ profileInitial }}
+            </span>
+          </template>
+        </label>
+      </div>
+
+      <div class="flex flex-col gap-6">
+        <div class="flex flex-col gap-4">
+          <label for="profile-name" class="text-sm text-muted-foreground">
+            {{ $t('comfyHubProfile.nameLabel') }}
+          </label>
+          <Input
+            id="profile-name"
+            v-model="name"
+            :placeholder="$t('comfyHubProfile.namePlaceholder')"
+          />
+        </div>
+
+        <div class="flex flex-col gap-2">
+          <label for="profile-username" class="text-sm text-muted-foreground">
+            {{ $t('comfyHubProfile.usernameLabel') }}
+          </label>
+          <div class="relative">
+            <span
+              :class="
+                cn(
+                  'pointer-events-none absolute top-1/2 left-4 -translate-y-1/2 text-sm',
+                  username ? 'text-base-foreground' : 'text-muted-foreground'
+                )
+              "
+            >
+              @
+            </span>
+            <Input id="profile-username" v-model="username" class="pl-7" />
+          </div>
+        </div>
+
+        <div class="flex flex-col gap-2">
+          <label
+            for="profile-description"
+            class="text-sm text-muted-foreground"
+          >
+            {{ $t('comfyHubProfile.descriptionLabel') }}
+          </label>
+          <Textarea
+            id="profile-description"
+            v-model="description"
+            :placeholder="$t('comfyHubProfile.descriptionPlaceholder')"
+            class="h-24 resize-none rounded-lg border-none bg-secondary-background p-4 text-sm shadow-none"
+          />
+        </div>
+      </div>
+    </div>
+
+    <footer
+      class="flex items-center justify-end gap-4 border-t border-border-default px-6 py-4"
+    >
+      <Button size="lg" @click="onClose">
+        {{ $t('g.cancel') }}
+      </Button>
+      <Button
+        variant="primary"
+        size="lg"
+        :disabled="!username.trim() || isCreating"
+        @click="handleCreate"
+      >
+        {{
+          isCreating
+            ? $t('comfyHubProfile.creatingProfile')
+            : $t('comfyHubProfile.createProfile')
+        }}
+      </Button>
+    </footer>
+  </form>
+</template>
+
+<script setup lang="ts">
+import { computed, ref } from 'vue'
+import { useToast } from 'primevue/usetoast'
+import { useI18n } from 'vue-i18n'
+import { useObjectUrl } from '@vueuse/core'
+
+import { cn } from '@/utils/tailwindUtil'
+import Button from '@/components/ui/button/Button.vue'
+import Input from '@/components/ui/input/Input.vue'
+import Textarea from '@/components/ui/textarea/Textarea.vue'
+import {
+  isFileTooLarge,
+  MAX_IMAGE_SIZE_MB
+} from '@/platform/workflow/sharing/utils/validateFileSize'
+import { useComfyHubProfileGate } from '@/platform/workflow/sharing/composables/useComfyHubProfileGate'
+import type { ComfyHubProfile } from '@/schemas/apiSchema'
+
+const {
+  onProfileCreated,
+  onClose,
+  showCloseButton = true
+} = defineProps<{
+  onProfileCreated: (profile: ComfyHubProfile) => void
+  onClose: () => void
+  showCloseButton?: boolean
+}>()
+
+const { createProfile } = useComfyHubProfileGate()
+const toast = useToast()
+const { t } = useI18n()
+
+const name = ref('')
+const username = ref('')
+const description = ref('')
+const profilePictureFile = ref<File | null>(null)
+const profilePreviewUrl = useObjectUrl(profilePictureFile)
+const isCreating = ref(false)
+
+const profileInitial = computed(() => {
+  const source = name.value.trim() || username.value.trim()
+  return source ? source[0].toUpperCase() : 'C'
+})
+
+function handleProfileSelect(event: Event) {
+  if (!(event.target instanceof HTMLInputElement)) return
+  const file = event.target.files?.[0]
+  if (!file || isFileTooLarge(file, MAX_IMAGE_SIZE_MB)) return
+  profilePictureFile.value = file
+}
+
+async function handleCreate() {
+  if (isCreating.value) return
+  isCreating.value = true
+  try {
+    const profile = await createProfile({
+      username: username.value.trim(),
+      name: name.value.trim() || undefined,
+      description: description.value.trim() || undefined,
+      profilePicture: profilePictureFile.value ?? undefined
+    })
+    onProfileCreated(profile)
+  } catch (error) {
+    toast.add({
+      severity: 'error',
+      summary: t('g.error'),
+      detail: error instanceof Error ? error.message : t('g.error'),
+      life: 5000
+    })
+  } finally {
+    isCreating.value = false
+  }
+}
+</script>
diff --git a/src/platform/workflow/sharing/components/profile/ComfyHubPublishIntroPanel.vue b/src/platform/workflow/sharing/components/profile/ComfyHubPublishIntroPanel.vue
new file mode 100644
index 0000000000..badb4476b1
--- /dev/null
+++ b/src/platform/workflow/sharing/components/profile/ComfyHubPublishIntroPanel.vue
@@ -0,0 +1,47 @@
+<template>
+  <div class="flex w-full flex-col overflow-hidden bg-base-background">
+    <!-- Close button -->
+    <div v-if="showCloseButton" class="flex justify-end px-2 pt-2">
+      <Button
+        size="icon"
+        class="rounded-full"
+        :aria-label="$t('g.close')"
+        @click="onClose"
+      >
+        <i class="icon-[lucide--x] size-4" />
+      </Button>
+    </div>
+
+    <!-- Content -->
+    <section class="flex flex-col items-center gap-4 px-4 pt-4 pb-6">
+      <h2 class="m-0 text-base font-semibold text-base-foreground">
+        {{ $t('comfyHubProfile.introTitle') }}
+      </h2>
+      <p class="m-0 text-center text-sm text-muted-foreground">
+        {{ $t('comfyHubProfile.introDescription') }}
+      </p>
+      <Button
+        variant="primary"
+        size="lg"
+        class="mt-2 w-full"
+        @click="onCreateProfile"
+      >
+        {{ $t('comfyHubProfile.startPublishingButton') }}
+      </Button>
+    </section>
+  </div>
+</template>
+
+<script setup lang="ts">
+import Button from '@/components/ui/button/Button.vue'
+
+const {
+  onCreateProfile,
+  onClose,
+  showCloseButton = true
+} = defineProps<{
+  onCreateProfile: () => void
+  onClose: () => void
+  showCloseButton?: boolean
+}>()
+</script>
diff --git a/src/platform/workflow/sharing/components/publish/ComfyHubDescribeStep.vue b/src/platform/workflow/sharing/components/publish/ComfyHubDescribeStep.vue
new file mode 100644
index 0000000000..e06bf25c0f
--- /dev/null
+++ b/src/platform/workflow/sharing/components/publish/ComfyHubDescribeStep.vue
@@ -0,0 +1,192 @@
+<template>
+  <div class="flex min-h-0 flex-1 flex-col gap-6 px-6 py-4">
+    <label class="flex flex-col gap-2">
+      <span class="text-sm text-base-foreground">
+        {{ $t('comfyHubPublish.workflowName') }}
+      </span>
+      <Input
+        :model-value="name"
+        :placeholder="$t('comfyHubPublish.workflowNamePlaceholder')"
+        @update:model-value="$emit('update:name', String($event))"
+      />
+    </label>
+
+    <label class="flex flex-col gap-2">
+      <span class="text-sm text-base-foreground">
+        {{ $t('comfyHubPublish.workflowDescription') }}
+      </span>
+      <Textarea
+        :model-value="description"
+        :placeholder="$t('comfyHubPublish.workflowDescriptionPlaceholder')"
+        rows="5"
+        @update:model-value="$emit('update:description', String($event))"
+      />
+    </label>
+
+    <label class="flex flex-col gap-2">
+      <span class="text-sm text-base-foreground">
+        {{ $t('comfyHubPublish.workflowType') }}
+      </span>
+      <Select
+        :model-value="workflowType"
+        @update:model-value="
+          emit('update:workflowType', $event as ComfyHubWorkflowType)
+        "
+      >
+        <SelectTrigger>
+          <SelectValue
+            :placeholder="$t('comfyHubPublish.workflowTypePlaceholder')"
+          />
+        </SelectTrigger>
+        <SelectContent>
+          <SelectItem
+            v-for="option in workflowTypeOptions"
+            :key="option.value"
+            :value="option.value"
+          >
+            {{ option.label }}
+          </SelectItem>
+        </SelectContent>
+      </Select>
+    </label>
+
+    <fieldset class="flex flex-col gap-2">
+      <legend class="text-sm text-base-foreground">
+        {{ $t('comfyHubPublish.tagsDescription') }}
+      </legend>
+      <TagsInput
+        v-slot="{ isEmpty }"
+        always-editing
+        class="bg-secondary-background select-none"
+        :model-value="tags"
+        @update:model-value="$emit('update:tags', $event as string[])"
+      >
+        <TagsInputItem v-for="tag in tags" :key="tag" :value="tag">
+          <TagsInputItemText />
+          <TagsInputItemDelete />
+        </TagsInputItem>
+        <TagsInputInput :is-empty />
+      </TagsInput>
+
+      <TagsInput
+        disabled
+        class="hover-within:bg-transparent bg-transparent p-0 hover:bg-transparent"
+      >
+        <div
+          v-if="displayedSuggestions.length > 0"
+          class="flex basis-full flex-wrap gap-2"
+        >
+          <TagsInputItem
+            v-for="tag in displayedSuggestions"
+            :key="tag"
+            v-auto-animate
+            :value="tag"
+            class="cursor-pointer bg-secondary-background px-2 text-muted-foreground transition-colors select-none hover:bg-secondary-background-selected"
+            @click="addTag(tag)"
+          >
+            <TagsInputItemText />
+          </TagsInputItem>
+        </div>
+        <Button
+          v-if="shouldShowSuggestionToggle"
+          variant="muted-textonly"
+          size="unset"
+          class="hover:bg-unset px-0 text-xs"
+          @click="showAllSuggestions = !showAllSuggestions"
+        >
+          {{
+            $t(
+              showAllSuggestions
+                ? 'comfyHubPublish.showLessTags'
+                : 'comfyHubPublish.showMoreTags'
+            )
+          }}
+        </Button>
+      </TagsInput>
+    </fieldset>
+  </div>
+</template>
+
+<script setup lang="ts">
+import Button from '@/components/ui/button/Button.vue'
+import Input from '@/components/ui/input/Input.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 TagsInput from '@/components/ui/tags-input/TagsInput.vue'
+import TagsInputInput from '@/components/ui/tags-input/TagsInputInput.vue'
+import TagsInputItem from '@/components/ui/tags-input/TagsInputItem.vue'
+import TagsInputItemDelete from '@/components/ui/tags-input/TagsInputItemDelete.vue'
+import TagsInputItemText from '@/components/ui/tags-input/TagsInputItemText.vue'
+import Textarea from '@/components/ui/textarea/Textarea.vue'
+import { COMFY_HUB_TAG_OPTIONS } from '@/platform/workflow/sharing/constants/comfyHubTags'
+import type { ComfyHubWorkflowType } from '@/platform/workflow/sharing/types/comfyHubTypes'
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+import { vAutoAnimate } from '@formkit/auto-animate/vue'
+
+const { tags, workflowType } = defineProps<{
+  name: string
+  description: string
+  workflowType: ComfyHubWorkflowType | ''
+  tags: string[]
+}>()
+
+const emit = defineEmits<{
+  'update:name': [value: string]
+  'update:description': [value: string]
+  'update:workflowType': [value: ComfyHubWorkflowType | '']
+  'update:tags': [value: string[]]
+}>()
+
+const { t } = useI18n()
+
+const workflowTypeOptions = computed(() => [
+  {
+    value: 'imageGeneration',
+    label: t('comfyHubPublish.workflowTypeImageGeneration')
+  },
+  {
+    value: 'videoGeneration',
+    label: t('comfyHubPublish.workflowTypeVideoGeneration')
+  },
+  {
+    value: 'upscaling',
+    label: t('comfyHubPublish.workflowTypeUpscaling')
+  },
+  {
+    value: 'editing',
+    label: t('comfyHubPublish.workflowTypeEditing')
+  }
+])
+
+const INITIAL_TAG_SUGGESTION_COUNT = 10
+
+const showAllSuggestions = ref(false)
+
+const availableSuggestions = computed(() =>
+  COMFY_HUB_TAG_OPTIONS.filter((tag) => !tags.includes(tag))
+)
+
+const displayedSuggestions = computed(() =>
+  showAllSuggestions.value
+    ? availableSuggestions.value
+    : availableSuggestions.value.slice(0, INITIAL_TAG_SUGGESTION_COUNT)
+)
+
+const hasHiddenSuggestions = computed(
+  () =>
+    !showAllSuggestions.value &&
+    availableSuggestions.value.length > INITIAL_TAG_SUGGESTION_COUNT
+)
+
+const shouldShowSuggestionToggle = computed(
+  () => showAllSuggestions.value || hasHiddenSuggestions.value
+)
+
+function addTag(tag: string) {
+  emit('update:tags', [...tags, tag])
+}
+</script>
diff --git a/src/platform/workflow/sharing/components/publish/ComfyHubExamplesStep.vue b/src/platform/workflow/sharing/components/publish/ComfyHubExamplesStep.vue
new file mode 100644
index 0000000000..2621bbeb20
--- /dev/null
+++ b/src/platform/workflow/sharing/components/publish/ComfyHubExamplesStep.vue
@@ -0,0 +1,145 @@
+<template>
+  <div class="flex min-h-0 flex-1 flex-col gap-6">
+    <p class="text-sm">
+      {{
+        $t('comfyHubPublish.examplesDescription', {
+          selected: selectedExampleIds.length,
+          total: MAX_EXAMPLES
+        })
+      }}
+    </p>
+
+    <div class="grid grid-cols-4 gap-2.5 overflow-y-auto">
+      <!-- Upload tile -->
+      <label
+        tabindex="0"
+        role="button"
+        :aria-label="$t('comfyHubPublish.uploadExampleImage')"
+        class="focus-visible:outline-ring flex aspect-square h-25 cursor-pointer flex-col items-center justify-center gap-2 rounded-lg border border-dashed border-border-default text-center transition-colors hover:border-muted-foreground focus-visible:outline-2 focus-visible:outline-offset-2"
+        @dragenter.stop
+        @dragleave.stop
+        @dragover.prevent.stop
+        @drop.prevent.stop="handleFileDrop"
+        @keydown.enter.prevent="fileInputRef?.click()"
+        @keydown.space.prevent="fileInputRef?.click()"
+      >
+        <input
+          ref="fileInputRef"
+          type="file"
+          accept="image/*"
+          multiple
+          class="hidden"
+          @change="handleFileSelect"
+        />
+        <i
+          class="icon-[lucide--plus] size-4 text-muted-foreground"
+          aria-hidden="true"
+        />
+        <span class="sr-only">{{
+          $t('comfyHubPublish.uploadExampleImage')
+        }}</span>
+      </label>
+
+      <!-- Example images -->
+      <Button
+        v-for="(image, index) in exampleImages"
+        :key="image.id"
+        variant="textonly"
+        size="unset"
+        :class="
+          cn(
+            'relative h-25 cursor-pointer overflow-hidden rounded-sm p-0',
+            isSelected(image.id) ? 'ring-ring ring-2' : 'ring-0'
+          )
+        "
+        @click="toggleSelection(image.id)"
+      >
+        <img
+          :src="image.url"
+          :alt="$t('comfyHubPublish.exampleImage', { index: index + 1 })"
+          class="size-full object-cover"
+        />
+        <div
+          v-if="isSelected(image.id)"
+          class="absolute bottom-1.5 left-1.5 flex size-7 items-center justify-center rounded-full bg-primary-background text-sm font-bold text-base-foreground"
+        >
+          {{ selectionIndex(image.id) }}
+        </div>
+      </Button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { v4 as uuidv4 } from 'uuid'
+import { ref } from 'vue'
+
+import Button from '@/components/ui/button/Button.vue'
+import type { ExampleImage } from '@/platform/workflow/sharing/types/comfyHubTypes'
+import {
+  isFileTooLarge,
+  MAX_IMAGE_SIZE_MB
+} from '@/platform/workflow/sharing/utils/validateFileSize'
+import { cn } from '@/utils/tailwindUtil'
+
+const fileInputRef = ref<HTMLInputElement | null>(null)
+
+const MAX_EXAMPLES = 8
+
+const { exampleImages, selectedExampleIds } = defineProps<{
+  exampleImages: ExampleImage[]
+  selectedExampleIds: string[]
+}>()
+
+const emit = defineEmits<{
+  'update:exampleImages': [value: ExampleImage[]]
+  'update:selectedExampleIds': [value: string[]]
+}>()
+
+function isSelected(id: string): boolean {
+  return selectedExampleIds.includes(id)
+}
+
+function selectionIndex(id: string): number {
+  return selectedExampleIds.indexOf(id) + 1
+}
+
+function toggleSelection(id: string) {
+  if (isSelected(id)) {
+    emit(
+      'update:selectedExampleIds',
+      selectedExampleIds.filter((sid) => sid !== id)
+    )
+  } else if (selectedExampleIds.length < MAX_EXAMPLES) {
+    emit('update:selectedExampleIds', [...selectedExampleIds, id])
+  }
+}
+
+function addImages(files: FileList) {
+  const newImages: ExampleImage[] = Array.from(files)
+    .filter((f) => f.type.startsWith('image/'))
+    .filter((f) => !isFileTooLarge(f, MAX_IMAGE_SIZE_MB))
+    .map((file) => ({
+      id: uuidv4(),
+      url: URL.createObjectURL(file),
+      file
+    }))
+
+  if (newImages.length > 0) {
+    emit('update:exampleImages', [...exampleImages, ...newImages])
+  }
+}
+
+function handleFileSelect(event: Event) {
+  if (!(event.target instanceof HTMLInputElement)) return
+  if (event.target.files?.length) {
+    addImages(event.target.files)
+  }
+}
+
+function handleFileDrop(event: DragEvent) {
+  if (event.dataTransfer?.files?.length) {
+    addImages(event.dataTransfer.files)
+  }
+}
+</script>
diff --git a/src/platform/workflow/sharing/components/publish/ComfyHubProfilePromptPanel.vue b/src/platform/workflow/sharing/components/publish/ComfyHubProfilePromptPanel.vue
new file mode 100644
index 0000000000..a818569c53
--- /dev/null
+++ b/src/platform/workflow/sharing/components/publish/ComfyHubProfilePromptPanel.vue
@@ -0,0 +1,32 @@
+<template>
+  <div class="flex min-h-0 flex-1 flex-col gap-4 px-6 py-4">
+    <p class="text-sm text-base-foreground">
+      {{ $t('comfyHubPublish.createProfileToPublish') }}
+    </p>
+
+    <Button
+      variant="textonly"
+      size="unset"
+      class="flex w-64 items-center gap-4 rounded-2xl border border-dashed border-border-default px-6 py-4 hover:bg-secondary-background-hover"
+      @click="emit('requestProfile')"
+    >
+      <div
+        class="flex size-12 items-center justify-center rounded-full border border-dashed border-border-default"
+      >
+        <i class="icon-[lucide--user] size-4 text-muted-foreground" />
+      </div>
+      <span class="inline-flex items-center gap-1 text-sm text-base-foreground">
+        <i class="icon-[lucide--plus] size-4" />
+        {{ $t('comfyHubPublish.createProfileCta') }}
+      </span>
+    </Button>
+  </div>
+</template>
+
+<script setup lang="ts">
+import Button from '@/components/ui/button/Button.vue'
+
+const emit = defineEmits<{
+  requestProfile: []
+}>()
+</script>
diff --git a/src/platform/workflow/sharing/components/publish/ComfyHubPublishDialog.test.ts b/src/platform/workflow/sharing/components/publish/ComfyHubPublishDialog.test.ts
new file mode 100644
index 0000000000..a40253ae8b
--- /dev/null
+++ b/src/platform/workflow/sharing/components/publish/ComfyHubPublishDialog.test.ts
@@ -0,0 +1,139 @@
+import { flushPromises, mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { ref } from 'vue'
+
+import ComfyHubPublishDialog from '@/platform/workflow/sharing/components/publish/ComfyHubPublishDialog.vue'
+
+const mockFetchProfile = vi.hoisted(() => vi.fn())
+const mockGoToStep = vi.hoisted(() => vi.fn())
+const mockGoNext = vi.hoisted(() => vi.fn())
+const mockGoBack = vi.hoisted(() => vi.fn())
+const mockOpenProfileCreationStep = vi.hoisted(() => vi.fn())
+const mockCloseProfileCreationStep = vi.hoisted(() => vi.fn())
+
+vi.mock(
+  '@/platform/workflow/sharing/composables/useComfyHubProfileGate',
+  () => ({
+    useComfyHubProfileGate: () => ({
+      fetchProfile: mockFetchProfile
+    })
+  })
+)
+
+vi.mock(
+  '@/platform/workflow/sharing/composables/useComfyHubPublishWizard',
+  () => ({
+    useComfyHubPublishWizard: () => ({
+      currentStep: ref('finish'),
+      formData: ref({
+        name: '',
+        description: '',
+        workflowType: '',
+        tags: [],
+        thumbnailType: 'image',
+        thumbnailFile: null,
+        comparisonBeforeFile: null,
+        comparisonAfterFile: null,
+        exampleImages: [],
+        selectedExampleIds: []
+      }),
+      isFirstStep: ref(false),
+      isLastStep: ref(true),
+      goToStep: mockGoToStep,
+      goNext: mockGoNext,
+      goBack: mockGoBack,
+      openProfileCreationStep: mockOpenProfileCreationStep,
+      closeProfileCreationStep: mockCloseProfileCreationStep
+    })
+  })
+)
+
+describe('ComfyHubPublishDialog', () => {
+  const onClose = vi.fn()
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockFetchProfile.mockResolvedValue(null)
+  })
+
+  function createWrapper() {
+    return mount(ComfyHubPublishDialog, {
+      props: { onClose },
+      global: {
+        mocks: {
+          $t: (key: string) => key
+        },
+        stubs: {
+          BaseModalLayout: {
+            template:
+              '<div data-testid="base-modal-layout"><slot name="leftPanelHeaderTitle" /><slot name="leftPanel" /><slot name="header" /><slot name="content" /></div>'
+          },
+          ComfyHubPublishNav: {
+            template: '<nav data-testid="publish-nav" />',
+            props: ['currentStep']
+          },
+          'comfy-hub-publish-nav': {
+            template: '<nav data-testid="publish-nav" />',
+            props: ['currentStep']
+          },
+          ComfyHubPublishWizardContent: {
+            template:
+              '<div><button data-testid="require-profile" @click="$props.onRequireProfile()" /><button data-testid="gate-complete" @click="$props.onGateComplete()" /><button data-testid="gate-close" @click="$props.onGateClose()" /></div>',
+            props: [
+              'currentStep',
+              'formData',
+              'isFirstStep',
+              'isLastStep',
+              'onGoNext',
+              'onGoBack',
+              'onRequireProfile',
+              'onGateComplete',
+              'onGateClose'
+            ]
+          }
+        }
+      }
+    })
+  }
+
+  it('starts in publish wizard mode and prefetches profile asynchronously', async () => {
+    createWrapper()
+    await flushPromises()
+
+    expect(mockFetchProfile).toHaveBeenCalledWith()
+  })
+
+  it('switches to profile creation step when final-step publish requires profile', async () => {
+    const wrapper = createWrapper()
+    await flushPromises()
+
+    await wrapper.find('[data-testid="require-profile"]').trigger('click')
+
+    expect(mockOpenProfileCreationStep).toHaveBeenCalledOnce()
+  })
+
+  it('returns to finish state after gate complete and does not auto-close', async () => {
+    const wrapper = createWrapper()
+    await flushPromises()
+
+    await wrapper.find('[data-testid="require-profile"]').trigger('click')
+    await wrapper.find('[data-testid="gate-complete"]').trigger('click')
+
+    expect(mockOpenProfileCreationStep).toHaveBeenCalledOnce()
+    expect(mockCloseProfileCreationStep).toHaveBeenCalledOnce()
+    expect(mockFetchProfile).toHaveBeenCalledWith({ force: true })
+    expect(onClose).not.toHaveBeenCalled()
+  })
+
+  it('returns to finish state when profile gate is closed', async () => {
+    const wrapper = createWrapper()
+    await flushPromises()
+
+    await wrapper.find('[data-testid="require-profile"]').trigger('click')
+    await wrapper.find('[data-testid="gate-close"]').trigger('click')
+
+    expect(mockOpenProfileCreationStep).toHaveBeenCalledOnce()
+    expect(mockCloseProfileCreationStep).toHaveBeenCalledOnce()
+    expect(onClose).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/platform/workflow/sharing/components/publish/ComfyHubPublishDialog.vue b/src/platform/workflow/sharing/components/publish/ComfyHubPublishDialog.vue
new file mode 100644
index 0000000000..045d188869
--- /dev/null
+++ b/src/platform/workflow/sharing/components/publish/ComfyHubPublishDialog.vue
@@ -0,0 +1,94 @@
+<template>
+  <BaseModalLayout
+    :content-title="$t('comfyHubPublish.title')"
+    content-padding="none"
+    left-panel-width="16.5rem"
+    size="md"
+  >
+    <template #leftPanelHeaderTitle>
+      <h2 class="flex-1 text-base font-semibold select-none">
+        {{ $t('comfyHubPublish.title') }}
+      </h2>
+    </template>
+
+    <template #leftPanel>
+      <ComfyHubPublishNav :current-step @step-click="goToStep" />
+    </template>
+
+    <template #header />
+    <template #content>
+      <ComfyHubPublishWizardContent
+        :current-step
+        :form-data
+        :is-first-step
+        :is-last-step
+        :on-update-form-data="updateFormData"
+        :on-go-next="goNext"
+        :on-go-back="goBack"
+        :on-require-profile="handleRequireProfile"
+        :on-gate-complete="handlePublishGateComplete"
+        :on-gate-close="handlePublishGateClose"
+        :on-publish="onClose"
+      />
+    </template>
+  </BaseModalLayout>
+</template>
+
+<script setup lang="ts">
+import { onBeforeUnmount, onMounted, provide } from 'vue'
+
+import BaseModalLayout from '@/components/widget/layout/BaseModalLayout.vue'
+import ComfyHubPublishNav from '@/platform/workflow/sharing/components/publish/ComfyHubPublishNav.vue'
+import ComfyHubPublishWizardContent from '@/platform/workflow/sharing/components/publish/ComfyHubPublishWizardContent.vue'
+import { useComfyHubPublishWizard } from '@/platform/workflow/sharing/composables/useComfyHubPublishWizard'
+import { useComfyHubProfileGate } from '@/platform/workflow/sharing/composables/useComfyHubProfileGate'
+import type { ComfyHubPublishFormData } from '@/platform/workflow/sharing/types/comfyHubTypes'
+import { OnCloseKey } from '@/types/widgetTypes'
+
+const { onClose } = defineProps<{
+  onClose: () => void
+}>()
+
+const { fetchProfile } = useComfyHubProfileGate()
+const {
+  currentStep,
+  formData,
+  isFirstStep,
+  isLastStep,
+  goToStep,
+  goNext,
+  goBack,
+  openProfileCreationStep,
+  closeProfileCreationStep
+} = useComfyHubPublishWizard()
+
+function handlePublishGateComplete() {
+  closeProfileCreationStep()
+  void fetchProfile({ force: true })
+}
+
+function handlePublishGateClose() {
+  closeProfileCreationStep()
+}
+
+function handleRequireProfile() {
+  openProfileCreationStep()
+}
+
+function updateFormData(patch: Partial<ComfyHubPublishFormData>) {
+  formData.value = { ...formData.value, ...patch }
+}
+
+onMounted(() => {
+  // Prefetch profile data in the background so finish-step profile context is ready.
+  void fetchProfile()
+})
+
+onBeforeUnmount(() => {
+  for (const image of formData.value.exampleImages) {
+    URL.revokeObjectURL(image.url)
+  }
+})
+
+provide(OnCloseKey, onClose)
+</script>
diff --git a/src/platform/workflow/sharing/components/publish/ComfyHubPublishFooter.vue b/src/platform/workflow/sharing/components/publish/ComfyHubPublishFooter.vue
new file mode 100644
index 0000000000..71afe4947f
--- /dev/null
+++ b/src/platform/workflow/sharing/components/publish/ComfyHubPublishFooter.vue
@@ -0,0 +1,41 @@
+<template>
+  <footer class="flex shrink items-center justify-between py-2">
+    <div>
+      <Button v-if="!isFirstStep" size="lg" @click="$emit('back')">
+        {{ $t('comfyHubPublish.back') }}
+      </Button>
+    </div>
+    <div class="flex gap-4">
+      <Button v-if="!isLastStep" size="lg" @click="$emit('next')">
+        {{ $t('comfyHubPublish.next') }}
+        <i class="icon-[lucide--chevron-right] size-4" />
+      </Button>
+      <Button
+        v-else
+        variant="primary"
+        size="lg"
+        :disabled="isPublishDisabled"
+        @click="$emit('publish')"
+      >
+        <i class="icon-[lucide--upload] size-4" />
+        {{ $t('comfyHubPublish.publishButton') }}
+      </Button>
+    </div>
+  </footer>
+</template>
+
+<script setup lang="ts">
+import Button from '@/components/ui/button/Button.vue'
+
+defineProps<{
+  isFirstStep: boolean
+  isLastStep: boolean
+  isPublishDisabled?: boolean
+}>()
+
+defineEmits<{
+  back: []
+  next: []
+  publish: []
+}>()
+</script>
diff --git a/src/platform/workflow/sharing/components/publish/ComfyHubPublishNav.vue b/src/platform/workflow/sharing/components/publish/ComfyHubPublishNav.vue
new file mode 100644
index 0000000000..217ab8a20b
--- /dev/null
+++ b/src/platform/workflow/sharing/components/publish/ComfyHubPublishNav.vue
@@ -0,0 +1,122 @@
+<template>
+  <nav class="flex flex-col gap-6 px-3 py-4">
+    <ol class="flex flex-col">
+      <li
+        v-for="step in steps"
+        :key="step.name"
+        v-auto-animate
+        :aria-current="isCurrentStep(step.name) ? 'step' : undefined"
+        :class="
+          cn(
+            isProfileCreationFlow &&
+              step.name === 'finish' &&
+              'rounded-lg bg-secondary-background-hover'
+          )
+        "
+      >
+        <Button
+          variant="textonly"
+          size="unset"
+          :class="
+            cn(
+              'h-10 w-full justify-start rounded-lg px-4 py-3 text-left',
+              isCurrentStep(step.name) &&
+                !(isProfileCreationFlow && step.name === 'finish')
+                ? 'bg-secondary-background-selected'
+                : 'hover:bg-interface-menu-component-surface-hovered'
+            )
+          "
+          @click="$emit('stepClick', step.name)"
+        >
+          <StatusBadge
+            :label="step.number"
+            variant="circle"
+            severity="contrast"
+            :class="
+              cn(
+                'size-5 shrink-0 border bg-transparent font-inter text-xs font-bold',
+                isCurrentStep(step.name)
+                  ? 'border-base-foreground bg-base-foreground text-base-background'
+                  : isCompletedStep(step.name)
+                    ? 'border-base-foreground text-base-foreground'
+                    : 'border-muted-foreground text-muted-foreground'
+              )
+            "
+          />
+          <span class="truncate text-sm text-base-foreground">
+            {{ step.label }}
+          </span>
+        </Button>
+
+        <div
+          v-if="isProfileCreationFlow && step.name === 'finish'"
+          v-auto-animate
+          class="flex h-10 w-full items-center rounded-lg bg-secondary-background-selected pl-11 select-none"
+        >
+          <span class="truncate text-sm text-base-foreground">
+            {{ $t('comfyHubProfile.profileCreationNav') }}
+          </span>
+        </div>
+      </li>
+    </ol>
+  </nav>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+
+import { vAutoAnimate } from '@formkit/auto-animate/vue'
+
+import StatusBadge from '@/components/common/StatusBadge.vue'
+import Button from '@/components/ui/button/Button.vue'
+import type { ComfyHubPublishStep } from '@/platform/workflow/sharing/composables/useComfyHubPublishWizard'
+import { cn } from '@/utils/tailwindUtil'
+import { useI18n } from 'vue-i18n'
+
+type ComfyHubPrimaryStep = Exclude<ComfyHubPublishStep, 'profileCreation'>
+
+const { currentStep } = defineProps<{
+  currentStep: ComfyHubPublishStep
+}>()
+
+defineEmits<{
+  stepClick: [step: ComfyHubPrimaryStep]
+}>()
+
+const { t } = useI18n()
+
+const steps = [
+  {
+    name: 'describe' as const,
+    number: 1,
+    label: t('comfyHubPublish.stepDescribe')
+  },
+  {
+    name: 'examples' as const,
+    number: 2,
+    label: t('comfyHubPublish.stepExamples')
+  },
+  { name: 'finish' as const, number: 3, label: t('comfyHubPublish.stepFinish') }
+]
+
+const isProfileCreationFlow = computed(() => currentStep === 'profileCreation')
+
+const currentStepNumber = computed(() => {
+  if (isProfileCreationFlow.value) {
+    return 3
+  }
+
+  return steps.find((step) => step.name === currentStep)?.number ?? 0
+})
+
+function isCurrentStep(stepName: ComfyHubPrimaryStep) {
+  return currentStep === stepName
+}
+
+function isCompletedStep(stepName: ComfyHubPrimaryStep) {
+  return (
+    (steps.find((step) => step.name === stepName)?.number ?? 0) <
+    currentStepNumber.value
+  )
+}
+</script>
diff --git a/src/platform/workflow/sharing/components/publish/ComfyHubPublishWizardContent.test.ts b/src/platform/workflow/sharing/components/publish/ComfyHubPublishWizardContent.test.ts
new file mode 100644
index 0000000000..a80813e571
--- /dev/null
+++ b/src/platform/workflow/sharing/components/publish/ComfyHubPublishWizardContent.test.ts
@@ -0,0 +1,263 @@
+import { flushPromises, mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { ref } from 'vue'
+
+import ComfyHubPublishWizardContent from './ComfyHubPublishWizardContent.vue'
+import type { ComfyHubPublishFormData } from '@/platform/workflow/sharing/types/comfyHubTypes'
+
+const mockCheckProfile = vi.hoisted(() => vi.fn())
+const mockToastErrorHandler = vi.hoisted(() => vi.fn())
+const mockHasProfile = ref<boolean | null>(true)
+
+vi.mock(
+  '@/platform/workflow/sharing/composables/useComfyHubProfileGate',
+  () => ({
+    useComfyHubProfileGate: () => ({
+      checkProfile: mockCheckProfile,
+      hasProfile: mockHasProfile
+    })
+  })
+)
+
+vi.mock('@/composables/useErrorHandling', () => ({
+  useErrorHandling: () => ({
+    toastErrorHandler: mockToastErrorHandler
+  })
+}))
+
+const mockFlags = vi.hoisted(() => ({
+  comfyHubProfileGateEnabled: true
+}))
+
+vi.mock('@/composables/useFeatureFlags', () => ({
+  useFeatureFlags: () => ({
+    flags: mockFlags
+  })
+}))
+
+function createDefaultFormData(): ComfyHubPublishFormData {
+  return {
+    name: 'Test Workflow',
+    description: '',
+    workflowType: '',
+    tags: [],
+    thumbnailType: 'image',
+    thumbnailFile: null,
+    comparisonBeforeFile: null,
+    comparisonAfterFile: null,
+    exampleImages: [],
+    selectedExampleIds: []
+  }
+}
+
+describe('ComfyHubPublishWizardContent', () => {
+  const onPublish = vi.fn()
+  const onGoNext = vi.fn()
+  const onGoBack = vi.fn()
+  const onUpdateFormData = vi.fn()
+  const onRequireProfile = vi.fn()
+  const onGateComplete = vi.fn()
+  const onGateClose = vi.fn()
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockCheckProfile.mockResolvedValue(true)
+    mockHasProfile.value = true
+    mockFlags.comfyHubProfileGateEnabled = true
+  })
+
+  function createWrapper(
+    overrides: Partial<
+      InstanceType<typeof ComfyHubPublishWizardContent>['$props']
+    > = {}
+  ) {
+    return mount(ComfyHubPublishWizardContent, {
+      props: {
+        currentStep: 'finish',
+        formData: createDefaultFormData(),
+        isFirstStep: false,
+        isLastStep: true,
+        onGoNext,
+        onGoBack,
+        onUpdateFormData,
+        onPublish,
+        onRequireProfile,
+        onGateComplete,
+        onGateClose,
+        ...overrides
+      },
+      global: {
+        mocks: {
+          $t: (key: string) => key
+        },
+        stubs: {
+          ComfyHubCreateProfileForm: {
+            template: '<div data-testid="publish-gate-flow" />',
+            props: ['onProfileCreated', 'onClose', 'showCloseButton']
+          },
+          'comfy-hub-create-profile-form': {
+            template: '<div data-testid="publish-gate-flow" />',
+            props: ['onProfileCreated', 'onClose', 'showCloseButton']
+          },
+          ComfyHubDescribeStep: {
+            template: '<div data-testid="describe-step" />'
+          },
+          ComfyHubExamplesStep: {
+            template: '<div data-testid="examples-step" />'
+          },
+          ComfyHubThumbnailStep: {
+            template: '<div data-testid="thumbnail-step" />'
+          },
+          ComfyHubProfilePromptPanel: {
+            template:
+              '<div data-testid="profile-prompt"><button data-testid="request-profile" @click="$emit(\'request-profile\')" /></div>',
+            emits: ['request-profile']
+          },
+          ComfyHubPublishFooter: {
+            template:
+              '<div data-testid="publish-footer" :data-publish-disabled="isPublishDisabled"><button data-testid="publish-btn" @click="$emit(\'publish\')" /><button data-testid="next-btn" @click="$emit(\'next\')" /><button data-testid="back-btn" @click="$emit(\'back\')" /></div>',
+            props: ['isFirstStep', 'isLastStep', 'isPublishDisabled'],
+            emits: ['publish', 'next', 'back']
+          }
+        }
+      }
+    })
+  }
+
+  describe('handlePublish — double-click guard', () => {
+    it('prevents concurrent publish calls', async () => {
+      let resolveCheck!: (v: boolean) => void
+      mockCheckProfile.mockReturnValue(
+        new Promise<boolean>((resolve) => {
+          resolveCheck = resolve
+        })
+      )
+
+      const wrapper = createWrapper()
+
+      const publishBtn = wrapper.find('[data-testid="publish-btn"]')
+      await publishBtn.trigger('click')
+      await publishBtn.trigger('click')
+
+      resolveCheck(true)
+      await flushPromises()
+
+      expect(mockCheckProfile).toHaveBeenCalledTimes(1)
+      expect(onPublish).toHaveBeenCalledTimes(1)
+    })
+  })
+
+  describe('handlePublish — feature flag bypass', () => {
+    it('calls onPublish directly when profile gate is disabled', async () => {
+      mockFlags.comfyHubProfileGateEnabled = false
+
+      const wrapper = createWrapper()
+      await wrapper.find('[data-testid="publish-btn"]').trigger('click')
+      await flushPromises()
+
+      expect(mockCheckProfile).not.toHaveBeenCalled()
+      expect(onPublish).toHaveBeenCalledOnce()
+    })
+  })
+
+  describe('handlePublish — profile check routing', () => {
+    it('calls onPublish when profile exists', async () => {
+      mockCheckProfile.mockResolvedValue(true)
+
+      const wrapper = createWrapper()
+      await wrapper.find('[data-testid="publish-btn"]').trigger('click')
+      await flushPromises()
+
+      expect(mockCheckProfile).toHaveBeenCalledOnce()
+      expect(onPublish).toHaveBeenCalledOnce()
+      expect(onRequireProfile).not.toHaveBeenCalled()
+    })
+
+    it('calls onRequireProfile when no profile exists', async () => {
+      mockCheckProfile.mockResolvedValue(false)
+
+      const wrapper = createWrapper()
+      await wrapper.find('[data-testid="publish-btn"]').trigger('click')
+      await flushPromises()
+
+      expect(onRequireProfile).toHaveBeenCalledOnce()
+      expect(onPublish).not.toHaveBeenCalled()
+    })
+
+    it('shows toast and aborts when checkProfile throws', async () => {
+      const error = new Error('Network error')
+      mockCheckProfile.mockRejectedValue(error)
+
+      const wrapper = createWrapper()
+      await wrapper.find('[data-testid="publish-btn"]').trigger('click')
+      await flushPromises()
+
+      expect(mockToastErrorHandler).toHaveBeenCalledWith(error)
+      expect(onPublish).not.toHaveBeenCalled()
+      expect(onRequireProfile).not.toHaveBeenCalled()
+    })
+
+    it('resets guard after checkProfile error so retry is possible', async () => {
+      mockCheckProfile.mockRejectedValueOnce(new Error('Network error'))
+
+      const wrapper = createWrapper()
+      const publishBtn = wrapper.find('[data-testid="publish-btn"]')
+
+      await publishBtn.trigger('click')
+      await flushPromises()
+      expect(onPublish).not.toHaveBeenCalled()
+
+      mockCheckProfile.mockResolvedValue(true)
+      await publishBtn.trigger('click')
+      await flushPromises()
+      expect(onPublish).toHaveBeenCalledOnce()
+    })
+  })
+
+  describe('isPublishDisabled', () => {
+    it('disables publish when gate enabled and hasProfile is not true', () => {
+      mockHasProfile.value = null
+      const wrapper = createWrapper()
+
+      const footer = wrapper.find('[data-testid="publish-footer"]')
+      expect(footer.attributes('data-publish-disabled')).toBe('true')
+    })
+
+    it('enables publish when gate enabled and hasProfile is true', () => {
+      mockHasProfile.value = true
+      const wrapper = createWrapper()
+
+      const footer = wrapper.find('[data-testid="publish-footer"]')
+      expect(footer.attributes('data-publish-disabled')).toBe('false')
+    })
+
+    it('enables publish when gate is disabled regardless of profile', () => {
+      mockFlags.comfyHubProfileGateEnabled = false
+      mockHasProfile.value = null
+      const wrapper = createWrapper()
+
+      const footer = wrapper.find('[data-testid="publish-footer"]')
+      expect(footer.attributes('data-publish-disabled')).toBe('false')
+    })
+  })
+
+  describe('profileCreation step rendering', () => {
+    it('shows profile creation form when on profileCreation step', () => {
+      const wrapper = createWrapper({ currentStep: 'profileCreation' })
+      expect(wrapper.find('[data-testid="publish-gate-flow"]').exists()).toBe(
+        true
+      )
+      expect(wrapper.find('[data-testid="publish-footer"]').exists()).toBe(
+        false
+      )
+    })
+
+    it('shows wizard content when not on profileCreation step', () => {
+      const wrapper = createWrapper({ currentStep: 'finish' })
+      expect(wrapper.find('[data-testid="publish-gate-flow"]').exists()).toBe(
+        false
+      )
+      expect(wrapper.find('[data-testid="publish-footer"]').exists()).toBe(true)
+    })
+  })
+})
diff --git a/src/platform/workflow/sharing/components/publish/ComfyHubPublishWizardContent.vue b/src/platform/workflow/sharing/components/publish/ComfyHubPublishWizardContent.vue
new file mode 100644
index 0000000000..a9a0be5e71
--- /dev/null
+++ b/src/platform/workflow/sharing/components/publish/ComfyHubPublishWizardContent.vue
@@ -0,0 +1,143 @@
+<template>
+  <div class="flex min-h-0 flex-1 flex-col">
+    <ComfyHubCreateProfileForm
+      v-if="currentStep === 'profileCreation'"
+      data-testid="publish-gate-flow"
+      :on-profile-created="() => onGateComplete()"
+      :on-close="onGateClose"
+      :show-close-button="false"
+    />
+    <div v-else class="flex min-h-0 flex-1 flex-col px-6 pt-4 pb-2">
+      <div class="flex min-h-0 flex-1 flex-col overflow-y-auto">
+        <ComfyHubDescribeStep
+          v-if="currentStep === 'describe'"
+          :name="formData.name"
+          :description="formData.description"
+          :workflow-type="formData.workflowType"
+          :tags="formData.tags"
+          @update:name="onUpdateFormData({ name: $event })"
+          @update:description="onUpdateFormData({ description: $event })"
+          @update:workflow-type="onUpdateFormData({ workflowType: $event })"
+          @update:tags="onUpdateFormData({ tags: $event })"
+        />
+        <div
+          v-else-if="currentStep === 'examples'"
+          class="flex min-h-0 flex-1 flex-col gap-6 px-6 py-4"
+        >
+          <ComfyHubThumbnailStep
+            :thumbnail-type="formData.thumbnailType"
+            @update:thumbnail-type="onUpdateFormData({ thumbnailType: $event })"
+            @update:thumbnail-file="onUpdateFormData({ thumbnailFile: $event })"
+            @update:comparison-before-file="
+              onUpdateFormData({ comparisonBeforeFile: $event })
+            "
+            @update:comparison-after-file="
+              onUpdateFormData({ comparisonAfterFile: $event })
+            "
+          />
+          <ComfyHubExamplesStep
+            :example-images="formData.exampleImages"
+            :selected-example-ids="formData.selectedExampleIds"
+            @update:example-images="onUpdateFormData({ exampleImages: $event })"
+            @update:selected-example-ids="
+              onUpdateFormData({ selectedExampleIds: $event })
+            "
+          />
+        </div>
+        <ComfyHubProfilePromptPanel
+          v-else-if="currentStep === 'finish'"
+          @request-profile="onRequireProfile"
+        />
+      </div>
+      <ComfyHubPublishFooter
+        :is-first-step
+        :is-last-step
+        :is-publish-disabled
+        @back="onGoBack"
+        @next="onGoNext"
+        @publish="handlePublish"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, ref } from 'vue'
+
+import { useErrorHandling } from '@/composables/useErrorHandling'
+import { useFeatureFlags } from '@/composables/useFeatureFlags'
+import { useComfyHubProfileGate } from '@/platform/workflow/sharing/composables/useComfyHubProfileGate'
+import ComfyHubCreateProfileForm from '@/platform/workflow/sharing/components/profile/ComfyHubCreateProfileForm.vue'
+import type { ComfyHubPublishStep } from '@/platform/workflow/sharing/composables/useComfyHubPublishWizard'
+import type { ComfyHubPublishFormData } from '@/platform/workflow/sharing/types/comfyHubTypes'
+import ComfyHubDescribeStep from './ComfyHubDescribeStep.vue'
+import ComfyHubExamplesStep from './ComfyHubExamplesStep.vue'
+import ComfyHubProfilePromptPanel from './ComfyHubProfilePromptPanel.vue'
+import ComfyHubThumbnailStep from './ComfyHubThumbnailStep.vue'
+import ComfyHubPublishFooter from './ComfyHubPublishFooter.vue'
+
+const {
+  currentStep,
+  formData,
+  isFirstStep,
+  isLastStep,
+  onGoNext,
+  onGoBack,
+  onUpdateFormData,
+  onPublish,
+  onRequireProfile,
+  onGateComplete = () => {},
+  onGateClose = () => {}
+} = defineProps<{
+  currentStep: ComfyHubPublishStep
+  formData: ComfyHubPublishFormData
+  isFirstStep: boolean
+  isLastStep: boolean
+  onGoNext: () => void
+  onGoBack: () => void
+  onUpdateFormData: (patch: Partial<ComfyHubPublishFormData>) => void
+  onPublish: () => void
+  onRequireProfile: () => void
+  onGateComplete?: () => void
+  onGateClose?: () => void
+}>()
+
+const { toastErrorHandler } = useErrorHandling()
+const { flags } = useFeatureFlags()
+const { checkProfile, hasProfile } = useComfyHubProfileGate()
+const isResolvingPublishAccess = ref(false)
+const isPublishDisabled = computed(
+  () => flags.comfyHubProfileGateEnabled && hasProfile.value !== true
+)
+
+async function handlePublish() {
+  if (isResolvingPublishAccess.value) {
+    return
+  }
+
+  if (!flags.comfyHubProfileGateEnabled) {
+    onPublish()
+    return
+  }
+
+  isResolvingPublishAccess.value = true
+  try {
+    let profileExists: boolean
+    try {
+      profileExists = await checkProfile()
+    } catch (error) {
+      toastErrorHandler(error)
+      return
+    }
+
+    if (profileExists) {
+      onPublish()
+      return
+    }
+
+    onRequireProfile()
+  } finally {
+    isResolvingPublishAccess.value = false
+  }
+}
+</script>
diff --git a/src/platform/workflow/sharing/components/publish/ComfyHubThumbnailStep.vue b/src/platform/workflow/sharing/components/publish/ComfyHubThumbnailStep.vue
new file mode 100644
index 0000000000..91eafd7d87
--- /dev/null
+++ b/src/platform/workflow/sharing/components/publish/ComfyHubThumbnailStep.vue
@@ -0,0 +1,391 @@
+<template>
+  <div class="flex min-h-0 flex-1 flex-col gap-6">
+    <fieldset class="flex flex-col gap-2">
+      <legend class="text-sm text-base-foreground">
+        {{ $t('comfyHubPublish.selectAThumbnail') }}
+      </legend>
+      <ToggleGroup
+        type="single"
+        :model-value="thumbnailType"
+        class="grid w-full grid-cols-3 gap-4"
+        @update:model-value="handleThumbnailTypeChange"
+      >
+        <ToggleGroupItem
+          v-for="option in thumbnailOptions"
+          :key="option.value"
+          :value="option.value"
+          class="h-auto w-full rounded-sm bg-node-component-surface p-2 data-[state=on]:bg-muted-background"
+        >
+          <span class="text-center text-sm font-bold text-base-foreground">
+            {{ option.label }}
+          </span>
+        </ToggleGroupItem>
+      </ToggleGroup>
+    </fieldset>
+
+    <div class="flex min-h-0 flex-1 flex-col gap-2">
+      <div class="flex items-center justify-between">
+        <span class="text-sm text-base-foreground">
+          {{ uploadSectionLabel }}
+        </span>
+        <Button
+          v-if="hasThumbnailContent"
+          variant="muted-textonly"
+          size="sm"
+          @click="clearAllPreviews"
+        >
+          {{ $t('g.clear') }}
+        </Button>
+      </div>
+
+      <template v-if="thumbnailType === 'imageComparison'">
+        <div
+          class="grid flex-1 grid-cols-1 grid-rows-1 place-content-center-safe"
+        >
+          <div
+            v-if="hasBothComparisonImages"
+            ref="comparisonPreviewRef"
+            class="relative col-span-full row-span-full cursor-crosshair overflow-hidden rounded-lg"
+          >
+            <img
+              :src="comparisonPreviewUrls.after!"
+              :alt="$t('comfyHubPublish.uploadComparisonAfterPrompt')"
+              class="size-full object-contain"
+            />
+            <img
+              :src="comparisonPreviewUrls.before!"
+              :alt="$t('comfyHubPublish.uploadComparisonBeforePrompt')"
+              class="absolute inset-0 size-full object-contain"
+              :style="{
+                clipPath: `inset(0 ${100 - previewSliderPosition}% 0 0)`
+              }"
+            />
+            <div
+              class="pointer-events-none absolute inset-y-0 w-0.5 bg-white/30 backdrop-blur-sm"
+              :style="{ left: `${previewSliderPosition}%` }"
+            />
+          </div>
+
+          <div
+            :class="
+              cn(
+                'col-span-full row-span-full flex gap-2',
+                hasBothComparisonImages && 'invisible'
+              )
+            "
+          >
+            <label
+              v-for="slot in comparisonSlots"
+              :key="slot.key"
+              :ref="(el) => (comparisonDropRefs[slot.key] = el as HTMLElement)"
+              :class="
+                cn(
+                  'flex max-w-1/2 cursor-pointer flex-col items-center justify-center rounded-lg border border-dashed transition-colors',
+                  comparisonPreviewUrls[slot.key] ? 'self-start' : 'flex-1',
+                  comparisonOverStates[slot.key]
+                    ? 'border-muted-foreground'
+                    : 'border-border-default hover:border-muted-foreground'
+                )
+              "
+              @dragenter.stop
+              @dragleave.stop
+              @dragover.prevent.stop
+              @drop.prevent.stop
+            >
+              <input
+                type="file"
+                accept="image/*"
+                class="hidden"
+                @change="(e) => handleComparisonSelect(e, slot.key)"
+              />
+              <template v-if="comparisonPreviewUrls[slot.key]">
+                <img
+                  :src="comparisonPreviewUrls[slot.key]!"
+                  :alt="slot.label"
+                  class="max-h-full max-w-full object-contain"
+                />
+              </template>
+              <template v-else>
+                <span class="text-sm font-medium text-muted-foreground">
+                  {{ slot.label }}
+                </span>
+                <span class="text-xs text-muted-foreground">
+                  {{ $t('comfyHubPublish.uploadThumbnailHint') }}
+                </span>
+              </template>
+            </label>
+          </div>
+        </div>
+      </template>
+
+      <template v-else>
+        <label
+          ref="singleDropRef"
+          :class="
+            cn(
+              'flex cursor-pointer flex-col items-center justify-center rounded-lg border border-dashed transition-colors',
+              thumbnailPreviewUrl ? 'self-center p-1' : 'flex-1',
+              isOverSingleDrop
+                ? 'border-muted-foreground'
+                : 'border-border-default hover:border-muted-foreground'
+            )
+          "
+          @dragenter.stop
+          @dragleave.stop
+          @dragover.prevent.stop
+          @drop.prevent.stop
+        >
+          <input
+            type="file"
+            :accept="
+              thumbnailType === 'video'
+                ? 'video/*,image/gif,image/webp'
+                : 'image/*'
+            "
+            class="hidden"
+            @change="handleFileSelect"
+          />
+          <template v-if="thumbnailPreviewUrl">
+            <video
+              v-if="isVideoFile"
+              :src="thumbnailPreviewUrl"
+              :aria-label="$t('comfyHubPublish.videoPreview')"
+              class="max-h-full max-w-full object-contain"
+              muted
+              loop
+              autoplay
+            />
+            <img
+              v-else
+              :src="thumbnailPreviewUrl"
+              :alt="$t('comfyHubPublish.thumbnailPreview')"
+              class="max-h-full max-w-full object-contain"
+            />
+          </template>
+          <template v-else>
+            <span class="text-sm text-muted-foreground">
+              {{ $t('comfyHubPublish.uploadPromptClickToBrowse') }}
+            </span>
+            <span class="text-sm text-muted-foreground">
+              {{ uploadDropText }}
+            </span>
+            <span class="text-xs text-muted-foreground">
+              {{ $t('comfyHubPublish.uploadThumbnailHint') }}
+            </span>
+          </template>
+        </label>
+      </template>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import Button from '@/components/ui/button/Button.vue'
+import { ToggleGroup, ToggleGroupItem } from '@/components/ui/toggle-group'
+import { useSliderFromMouse } from '@/platform/workflow/sharing/composables/useSliderFromMouse'
+import type { ThumbnailType } from '@/platform/workflow/sharing/types/comfyHubTypes'
+import {
+  isFileTooLarge,
+  MAX_IMAGE_SIZE_MB,
+  MAX_VIDEO_SIZE_MB
+} from '@/platform/workflow/sharing/utils/validateFileSize'
+import { cn } from '@/utils/tailwindUtil'
+import { useDropZone, useObjectUrl } from '@vueuse/core'
+import { computed, reactive, ref, shallowRef } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+const { thumbnailType = 'image' } = defineProps<{
+  thumbnailType?: ThumbnailType
+}>()
+
+const emit = defineEmits<{
+  'update:thumbnailType': [value: ThumbnailType]
+  'update:thumbnailFile': [value: File | null]
+  'update:comparisonBeforeFile': [value: File | null]
+  'update:comparisonAfterFile': [value: File | null]
+}>()
+
+const { t } = useI18n()
+
+function isThumbnailType(value: string): value is ThumbnailType {
+  return value === 'image' || value === 'video' || value === 'imageComparison'
+}
+
+function handleThumbnailTypeChange(value: unknown) {
+  if (typeof value === 'string' && isThumbnailType(value)) {
+    comparisonBeforeFile.value = null
+    comparisonAfterFile.value = null
+    emit('update:thumbnailFile', null)
+    emit('update:comparisonBeforeFile', null)
+    emit('update:comparisonAfterFile', null)
+    emit('update:thumbnailType', value)
+  }
+}
+
+const uploadSectionLabel = computed(() => {
+  if (thumbnailType === 'video') return t('comfyHubPublish.uploadVideo')
+  if (thumbnailType === 'imageComparison') {
+    return t('comfyHubPublish.uploadComparison')
+  }
+  return t('comfyHubPublish.uploadThumbnail')
+})
+
+const uploadDropText = computed(() =>
+  thumbnailType === 'video'
+    ? t('comfyHubPublish.uploadPromptDropVideo')
+    : t('comfyHubPublish.uploadPromptDropImage')
+)
+
+const thumbnailOptions = [
+  {
+    value: 'image' as const,
+    label: t('comfyHubPublish.thumbnailImage')
+  },
+  {
+    value: 'video' as const,
+    label: t('comfyHubPublish.thumbnailVideo')
+  },
+  {
+    value: 'imageComparison' as const,
+    label: t('comfyHubPublish.thumbnailImageComparison')
+  }
+]
+
+const thumbnailFile = shallowRef<File | null>(null)
+const thumbnailPreviewUrl = useObjectUrl(thumbnailFile)
+const isVideoFile = ref(false)
+
+function setThumbnailPreview(file: File) {
+  const maxSize = file.type.startsWith('video/')
+    ? MAX_VIDEO_SIZE_MB
+    : MAX_IMAGE_SIZE_MB
+  if (isFileTooLarge(file, maxSize)) return
+  thumbnailFile.value = file
+  isVideoFile.value = file.type.startsWith('video/')
+  emit('update:thumbnailFile', file)
+}
+
+const comparisonBeforeFile = shallowRef<File | null>(null)
+const comparisonAfterFile = shallowRef<File | null>(null)
+const comparisonPreviewUrls = reactive({
+  before: useObjectUrl(comparisonBeforeFile),
+  after: useObjectUrl(comparisonAfterFile)
+})
+
+const hasBothComparisonImages = computed(
+  () => !!(comparisonPreviewUrls.before && comparisonPreviewUrls.after)
+)
+
+const comparisonPreviewRef = ref<HTMLElement | null>(null)
+const previewSliderPosition = useSliderFromMouse(comparisonPreviewRef)
+
+const hasThumbnailContent = computed(() => {
+  if (thumbnailType === 'imageComparison') {
+    return !!(comparisonPreviewUrls.before || comparisonPreviewUrls.after)
+  }
+  return !!thumbnailPreviewUrl.value
+})
+
+function clearAllPreviews() {
+  if (thumbnailType === 'imageComparison') {
+    comparisonBeforeFile.value = null
+    comparisonAfterFile.value = null
+    emit('update:comparisonBeforeFile', null)
+    emit('update:comparisonAfterFile', null)
+    return
+  }
+
+  thumbnailFile.value = null
+  emit('update:thumbnailFile', null)
+}
+
+function handleFileSelect(event: Event) {
+  if (!(event.target instanceof HTMLInputElement)) return
+  const file = event.target.files?.[0]
+  if (file) setThumbnailPreview(file)
+}
+
+const singleDropRef = ref<HTMLElement | null>(null)
+
+function isImageType(types: readonly string[]) {
+  return types.some((type) => type.startsWith('image/'))
+}
+
+function isVideoModeMedia(types: readonly string[]) {
+  return types.some(
+    (type) =>
+      type.startsWith('video/') || type === 'image/gif' || type === 'image/webp'
+  )
+}
+
+const { isOverDropZone: isOverSingleDrop } = useDropZone(singleDropRef, {
+  dataTypes: (types: readonly string[]) =>
+    thumbnailType === 'video' ? isVideoModeMedia(types) : isImageType(types),
+  multiple: false,
+  onDrop(files) {
+    const file = files?.[0]
+    if (file) {
+      setThumbnailPreview(file)
+    }
+  }
+})
+
+type ComparisonSlot = 'before' | 'after'
+
+const comparisonSlots = [
+  {
+    key: 'before' as const,
+    label: t('comfyHubPublish.uploadComparisonBeforePrompt')
+  },
+  {
+    key: 'after' as const,
+    label: t('comfyHubPublish.uploadComparisonAfterPrompt')
+  }
+]
+
+const comparisonFiles: Record<ComparisonSlot, typeof comparisonBeforeFile> = {
+  before: comparisonBeforeFile,
+  after: comparisonAfterFile
+}
+
+function setComparisonPreview(file: File, slot: ComparisonSlot) {
+  if (isFileTooLarge(file, MAX_IMAGE_SIZE_MB)) return
+  comparisonFiles[slot].value = file
+  if (slot === 'before') {
+    emit('update:comparisonBeforeFile', file)
+    return
+  }
+  emit('update:comparisonAfterFile', file)
+}
+
+function handleComparisonSelect(event: Event, slot: ComparisonSlot) {
+  if (!(event.target instanceof HTMLInputElement)) return
+  const file = event.target.files?.[0]
+  if (file) setComparisonPreview(file, slot)
+}
+
+const comparisonDropRefs = reactive<Record<ComparisonSlot, HTMLElement | null>>(
+  { before: null, after: null }
+)
+function useComparisonDropZone(slot: ComparisonSlot) {
+  return useDropZone(
+    computed(() => comparisonDropRefs[slot]),
+    {
+      dataTypes: isImageType,
+      multiple: false,
+      onDrop(files) {
+        const file = files?.[0]
+        if (file) setComparisonPreview(file, slot)
+      }
+    }
+  )
+}
+
+const { isOverDropZone: isOverBefore } = useComparisonDropZone('before')
+const { isOverDropZone: isOverAfter } = useComparisonDropZone('after')
+
+const comparisonOverStates = computed(() => ({
+  before: isOverBefore.value,
+  after: isOverAfter.value
+}))
+</script>
diff --git a/src/platform/workflow/sharing/composables/lazyShareDialog.ts b/src/platform/workflow/sharing/composables/lazyShareDialog.ts
new file mode 100644
index 0000000000..6e6f47ecfc
--- /dev/null
+++ b/src/platform/workflow/sharing/composables/lazyShareDialog.ts
@@ -0,0 +1,14 @@
+export function prefetchShareDialog() {
+  importShareDialog().catch((error) => {
+    console.error(error)
+  })
+}
+
+export async function openShareDialog() {
+  const { useShareDialog } = await importShareDialog()
+  useShareDialog().show()
+}
+
+function importShareDialog() {
+  return import('@/platform/workflow/sharing/composables/useShareDialog')
+}
diff --git a/src/platform/workflow/sharing/composables/useAssetSections.ts b/src/platform/workflow/sharing/composables/useAssetSections.ts
new file mode 100644
index 0000000000..a0c55916e3
--- /dev/null
+++ b/src/platform/workflow/sharing/composables/useAssetSections.ts
@@ -0,0 +1,71 @@
+import { partition } from 'es-toolkit'
+import { computed, ref, watch } from 'vue'
+
+import type { AssetInfo } from '@/schemas/apiSchema'
+
+type SectionId = 'media' | 'models'
+
+interface AssetSection {
+  id: SectionId
+  labelKey: string
+  items: AssetInfo[]
+}
+
+export function useAssetSections(items: () => AssetInfo[]) {
+  const sections = computed(() => {
+    const [models, media] = partition(items(), (a) => a.model)
+    const allSections: AssetSection[] = [
+      {
+        id: 'media',
+        labelKey: 'shareWorkflow.mediaLabel',
+        items: media
+      },
+      {
+        id: 'models',
+        labelKey: 'shareWorkflow.modelsLabel',
+        items: models
+      }
+    ]
+    return allSections.filter((s) => s.items.length > 0)
+  })
+
+  const expandedSectionId = ref<SectionId | null>(null)
+
+  function getDefaultExpandedSection(
+    availableSections: AssetSection[]
+  ): SectionId | null {
+    if (availableSections.length === 0) return null
+    return (
+      availableSections.find((s) => s.id === 'media')?.id ??
+      availableSections[0].id
+    )
+  }
+
+  watch(
+    sections,
+    (availableSections) => {
+      const hasExpanded = availableSections.some(
+        (s) => s.id === expandedSectionId.value
+      )
+      if (hasExpanded) return
+      expandedSectionId.value = getDefaultExpandedSection(availableSections)
+    },
+    { immediate: true }
+  )
+
+  function onSectionOpenChange(sectionId: SectionId, open: boolean) {
+    if (open) {
+      expandedSectionId.value = sectionId
+      return
+    }
+    if (expandedSectionId.value === sectionId) {
+      expandedSectionId.value = null
+    }
+  }
+
+  return {
+    sections,
+    expandedSectionId,
+    onSectionOpenChange
+  }
+}
diff --git a/src/platform/workflow/sharing/composables/useComfyHubProfileGate.test.ts b/src/platform/workflow/sharing/composables/useComfyHubProfileGate.test.ts
new file mode 100644
index 0000000000..1ffc99c27d
--- /dev/null
+++ b/src/platform/workflow/sharing/composables/useComfyHubProfileGate.test.ts
@@ -0,0 +1,238 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { ComfyHubProfile } from '@/schemas/apiSchema'
+
+const mockFetchApi = vi.hoisted(() => vi.fn())
+const mockToastErrorHandler = vi.hoisted(() => vi.fn())
+const mockResolvedUserInfo = vi.hoisted(() => ({
+  value: { id: 'user-a' }
+}))
+
+vi.mock('@/scripts/api', () => ({
+  api: {
+    fetchApi: mockFetchApi
+  }
+}))
+
+vi.mock('@/composables/auth/useCurrentUser', () => ({
+  useCurrentUser: () => ({
+    resolvedUserInfo: mockResolvedUserInfo
+  })
+}))
+
+vi.mock('@/composables/useErrorHandling', () => ({
+  useErrorHandling: () => ({
+    toastErrorHandler: mockToastErrorHandler
+  })
+}))
+
+// Must import after vi.mock declarations
+const { useComfyHubProfileGate } = await import('./useComfyHubProfileGate')
+
+const mockProfile: ComfyHubProfile = {
+  username: 'testuser',
+  name: 'Test User',
+  description: 'A test profile'
+}
+
+function mockSuccessResponse(data?: unknown) {
+  return {
+    ok: true,
+    json: async () => data ?? mockProfile
+  } as Response
+}
+
+function mockErrorResponse(status = 500, message = 'Server error') {
+  return {
+    ok: false,
+    status,
+    json: async () => ({ message })
+  } as Response
+}
+
+describe('useComfyHubProfileGate', () => {
+  let gate: ReturnType<typeof useComfyHubProfileGate>
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockResolvedUserInfo.value = { id: 'user-a' }
+
+    // Reset module-level singleton refs
+    gate = useComfyHubProfileGate()
+    gate.hasProfile.value = null
+    gate.profile.value = null
+    gate.isCheckingProfile.value = false
+    gate.isFetchingProfile.value = false
+  })
+
+  describe('fetchProfile', () => {
+    it('returns mapped profile when API responds ok', async () => {
+      mockFetchApi.mockResolvedValue(mockSuccessResponse())
+
+      const profile = await gate.fetchProfile()
+
+      expect(profile).toEqual(mockProfile)
+      expect(gate.hasProfile.value).toBe(true)
+      expect(gate.profile.value).toEqual(mockProfile)
+      expect(mockFetchApi).toHaveBeenCalledWith('/hub/profile')
+    })
+
+    it('returns cached profile when already fetched', async () => {
+      mockFetchApi.mockResolvedValue(mockSuccessResponse())
+
+      await gate.fetchProfile()
+      const profile = await gate.fetchProfile()
+
+      expect(profile).toEqual(mockProfile)
+      expect(mockFetchApi).toHaveBeenCalledTimes(1)
+    })
+
+    it('re-fetches profile when force option is enabled', async () => {
+      mockFetchApi.mockResolvedValue(mockSuccessResponse())
+
+      await gate.fetchProfile()
+      await gate.fetchProfile({ force: true })
+
+      expect(mockFetchApi).toHaveBeenCalledTimes(2)
+    })
+
+    it('returns null when API responds with error', async () => {
+      mockFetchApi.mockResolvedValue(mockErrorResponse(404))
+
+      const profile = await gate.fetchProfile()
+
+      expect(profile).toBeNull()
+      expect(gate.hasProfile.value).toBe(false)
+      expect(gate.profile.value).toBeNull()
+    })
+
+    it('sets isFetchingProfile during fetch', async () => {
+      let resolvePromise: (v: Response) => void
+      mockFetchApi.mockReturnValue(
+        new Promise<Response>((resolve) => {
+          resolvePromise = resolve
+        })
+      )
+
+      const promise = gate.fetchProfile()
+      expect(gate.isFetchingProfile.value).toBe(true)
+
+      resolvePromise!(mockSuccessResponse())
+      await promise
+
+      expect(gate.isFetchingProfile.value).toBe(false)
+    })
+  })
+
+  describe('checkProfile', () => {
+    it('returns true when API responds ok', async () => {
+      mockFetchApi.mockResolvedValue(mockSuccessResponse())
+
+      const result = await gate.checkProfile()
+
+      expect(result).toBe(true)
+      expect(gate.hasProfile.value).toBe(true)
+    })
+
+    it('returns false when API responds with error', async () => {
+      mockFetchApi.mockResolvedValue(mockErrorResponse(404))
+
+      const result = await gate.checkProfile()
+
+      expect(result).toBe(false)
+      expect(gate.hasProfile.value).toBe(false)
+    })
+
+    it('returns cached value without re-fetching', async () => {
+      mockFetchApi.mockResolvedValue(mockSuccessResponse())
+
+      await gate.checkProfile()
+      const result = await gate.checkProfile()
+
+      expect(result).toBe(true)
+      expect(mockFetchApi).toHaveBeenCalledTimes(1)
+    })
+
+    it('clears cached profile state when the authenticated user changes', async () => {
+      mockFetchApi.mockResolvedValue(mockSuccessResponse())
+
+      await gate.checkProfile()
+      mockResolvedUserInfo.value = { id: 'user-b' }
+      await gate.checkProfile()
+
+      expect(mockFetchApi).toHaveBeenCalledTimes(2)
+    })
+  })
+
+  describe('createProfile', () => {
+    it('sends FormData with required username', async () => {
+      mockFetchApi.mockResolvedValue(mockSuccessResponse())
+
+      await gate.createProfile({ username: 'testuser' })
+
+      const [url, options] = mockFetchApi.mock.calls[0]
+      expect(url).toBe('/hub/profile')
+      expect(options.method).toBe('POST')
+
+      const body = options.body as FormData
+      expect(body.get('username')).toBe('testuser')
+    })
+
+    it('includes optional fields when provided', async () => {
+      mockFetchApi.mockResolvedValue(mockSuccessResponse())
+      const coverImage = new File(['img'], 'cover.png')
+      const profilePicture = new File(['img'], 'avatar.png')
+
+      await gate.createProfile({
+        username: 'testuser',
+        name: 'Test User',
+        description: 'Hello',
+        coverImage,
+        profilePicture
+      })
+
+      const body = mockFetchApi.mock.calls[0][1].body as FormData
+      expect(body.get('name')).toBe('Test User')
+      expect(body.get('description')).toBe('Hello')
+      expect(body.get('cover_image')).toBe(coverImage)
+      expect(body.get('profile_picture')).toBe(profilePicture)
+    })
+
+    it('sets profile state on success', async () => {
+      mockFetchApi.mockResolvedValue(mockSuccessResponse())
+
+      await gate.createProfile({ username: 'testuser' })
+
+      expect(gate.hasProfile.value).toBe(true)
+      expect(gate.profile.value).toEqual(mockProfile)
+    })
+
+    it('returns the created profile', async () => {
+      mockFetchApi.mockResolvedValue(
+        mockSuccessResponse({
+          username: 'testuser',
+          name: 'Test User',
+          description: 'A test profile',
+          cover_image_url: 'https://example.com/cover.png',
+          profile_picture_url: 'https://example.com/profile.png'
+        })
+      )
+
+      const profile = await gate.createProfile({ username: 'testuser' })
+
+      expect(profile).toEqual({
+        ...mockProfile,
+        coverImageUrl: 'https://example.com/cover.png',
+        profilePictureUrl: 'https://example.com/profile.png'
+      })
+    })
+
+    it('throws with error message from API response', async () => {
+      mockFetchApi.mockResolvedValue(mockErrorResponse(400, 'Username taken'))
+
+      await expect(gate.createProfile({ username: 'taken' })).rejects.toThrow(
+        'Username taken'
+      )
+    })
+  })
+})
diff --git a/src/platform/workflow/sharing/composables/useComfyHubProfileGate.ts b/src/platform/workflow/sharing/composables/useComfyHubProfileGate.ts
new file mode 100644
index 0000000000..e321b4759f
--- /dev/null
+++ b/src/platform/workflow/sharing/composables/useComfyHubProfileGate.ts
@@ -0,0 +1,143 @@
+import { ref } from 'vue'
+
+import { useCurrentUser } from '@/composables/auth/useCurrentUser'
+import { useErrorHandling } from '@/composables/useErrorHandling'
+import { zHubProfileResponse } from '@/platform/workflow/sharing/schemas/shareSchemas'
+import type { ComfyHubProfile } from '@/schemas/apiSchema'
+import { api } from '@/scripts/api'
+
+// TODO: Migrate to a Pinia store for proper singleton state management
+// User-scoped, session-cached profile state (module-level singleton)
+const hasProfile = ref<boolean | null>(null)
+const isCheckingProfile = ref(false)
+const isFetchingProfile = ref(false)
+const profile = ref<ComfyHubProfile | null>(null)
+const cachedUserId = ref<string | null>(null)
+let inflightFetch: Promise<ComfyHubProfile | null> | null = null
+
+function mapHubProfileResponse(payload: unknown): ComfyHubProfile | null {
+  const result = zHubProfileResponse.safeParse(payload)
+  return result.success ? result.data : null
+}
+
+export function useComfyHubProfileGate() {
+  const { resolvedUserInfo } = useCurrentUser()
+  const { toastErrorHandler } = useErrorHandling()
+
+  function syncCachedProfileWithCurrentUser(): void {
+    const currentUserId = resolvedUserInfo.value?.id ?? null
+    if (cachedUserId.value === currentUserId) {
+      return
+    }
+
+    hasProfile.value = null
+    profile.value = null
+    cachedUserId.value = currentUserId
+  }
+
+  async function performFetch(): Promise<ComfyHubProfile | null> {
+    isFetchingProfile.value = true
+    try {
+      const response = await api.fetchApi('/hub/profile')
+      if (!response.ok) {
+        hasProfile.value = false
+        profile.value = null
+        return null
+      }
+
+      const nextProfile = mapHubProfileResponse(await response.json())
+      if (!nextProfile) {
+        hasProfile.value = false
+        profile.value = null
+        return null
+      }
+      hasProfile.value = true
+      profile.value = nextProfile
+      return nextProfile
+    } catch (error) {
+      toastErrorHandler(error)
+      return null
+    } finally {
+      isFetchingProfile.value = false
+      inflightFetch = null
+    }
+  }
+
+  function fetchProfile(options?: {
+    force?: boolean
+  }): Promise<ComfyHubProfile | null> {
+    syncCachedProfileWithCurrentUser()
+
+    if (!options?.force && profile.value) {
+      return Promise.resolve(profile.value)
+    }
+
+    if (!options?.force && inflightFetch) return inflightFetch
+
+    inflightFetch = performFetch()
+    return inflightFetch
+  }
+
+  async function checkProfile(): Promise<boolean> {
+    syncCachedProfileWithCurrentUser()
+
+    if (hasProfile.value !== null) return hasProfile.value
+    isCheckingProfile.value = true
+    try {
+      const fetchedProfile = await fetchProfile()
+      return fetchedProfile !== null
+    } finally {
+      isCheckingProfile.value = false
+    }
+  }
+
+  async function createProfile(data: {
+    username: string
+    name?: string
+    description?: string
+    coverImage?: File
+    profilePicture?: File
+  }): Promise<ComfyHubProfile> {
+    syncCachedProfileWithCurrentUser()
+
+    const formData = new FormData()
+    formData.append('username', data.username)
+    if (data.name) formData.append('name', data.name)
+    if (data.description) formData.append('description', data.description)
+    if (data.coverImage) formData.append('cover_image', data.coverImage)
+    if (data.profilePicture)
+      formData.append('profile_picture', data.profilePicture)
+
+    const response = await api.fetchApi('/hub/profile', {
+      method: 'POST',
+      body: formData
+    })
+
+    if (!response.ok) {
+      const body: unknown = await response.json().catch(() => ({}))
+      const message =
+        body && typeof body === 'object' && 'message' in body
+          ? String((body as Record<string, unknown>).message)
+          : 'Failed to create profile'
+      throw new Error(message)
+    }
+
+    const createdProfile = mapHubProfileResponse(await response.json())
+    if (!createdProfile) {
+      throw new Error('Invalid profile response from server')
+    }
+    hasProfile.value = true
+    profile.value = createdProfile
+    return createdProfile
+  }
+
+  return {
+    hasProfile,
+    profile,
+    isCheckingProfile,
+    isFetchingProfile,
+    checkProfile,
+    fetchProfile,
+    createProfile
+  }
+}
diff --git a/src/platform/workflow/sharing/composables/useComfyHubPublishDialog.ts b/src/platform/workflow/sharing/composables/useComfyHubPublishDialog.ts
new file mode 100644
index 0000000000..6c80943fe8
--- /dev/null
+++ b/src/platform/workflow/sharing/composables/useComfyHubPublishDialog.ts
@@ -0,0 +1,29 @@
+import ComfyHubPublishDialog from '@/platform/workflow/sharing/components/publish/ComfyHubPublishDialog.vue'
+import { useDialogService } from '@/services/dialogService'
+import { useDialogStore } from '@/stores/dialogStore'
+
+const DIALOG_KEY = 'global-comfyhub-publish'
+
+export function useComfyHubPublishDialog() {
+  const dialogService = useDialogService()
+  const dialogStore = useDialogStore()
+
+  function hide() {
+    dialogStore.closeDialog({ key: DIALOG_KEY })
+  }
+
+  function show() {
+    dialogService.showLayoutDialog({
+      key: DIALOG_KEY,
+      component: ComfyHubPublishDialog,
+      props: {
+        onClose: hide
+      }
+    })
+  }
+
+  return {
+    show,
+    hide
+  }
+}
diff --git a/src/platform/workflow/sharing/composables/useComfyHubPublishWizard.test.ts b/src/platform/workflow/sharing/composables/useComfyHubPublishWizard.test.ts
new file mode 100644
index 0000000000..6acaa164a4
--- /dev/null
+++ b/src/platform/workflow/sharing/composables/useComfyHubPublishWizard.test.ts
@@ -0,0 +1,147 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const mockActiveWorkflow = vi.hoisted(() => ({
+  value: { filename: 'my-workflow.json' } as { filename: string } | null
+}))
+
+vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
+  useWorkflowStore: () => ({
+    get activeWorkflow() {
+      return mockActiveWorkflow.value
+    }
+  })
+}))
+
+const { useComfyHubPublishWizard } = await import('./useComfyHubPublishWizard')
+
+describe('useComfyHubPublishWizard', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockActiveWorkflow.value = { filename: 'my-workflow.json' }
+  })
+
+  describe('createDefaultFormData', () => {
+    it('initialises name from active workflow filename', () => {
+      const { formData } = useComfyHubPublishWizard()
+      expect(formData.value.name).toBe('my-workflow.json')
+    })
+
+    it('defaults name to empty string when no active workflow', () => {
+      mockActiveWorkflow.value = null
+      const { formData } = useComfyHubPublishWizard()
+      expect(formData.value.name).toBe('')
+    })
+
+    it('initialises all other form fields to defaults', () => {
+      const { formData } = useComfyHubPublishWizard()
+      expect(formData.value.description).toBe('')
+      expect(formData.value.workflowType).toBe('')
+      expect(formData.value.tags).toEqual([])
+      expect(formData.value.thumbnailType).toBe('image')
+      expect(formData.value.thumbnailFile).toBeNull()
+      expect(formData.value.comparisonBeforeFile).toBeNull()
+      expect(formData.value.comparisonAfterFile).toBeNull()
+      expect(formData.value.exampleImages).toEqual([])
+      expect(formData.value.selectedExampleIds).toEqual([])
+    })
+  })
+
+  describe('canGoNext', () => {
+    it('returns false on describe step when name is empty', () => {
+      const { canGoNext, formData } = useComfyHubPublishWizard()
+      formData.value.name = ''
+      expect(canGoNext.value).toBe(false)
+    })
+
+    it('returns false on describe step when name is whitespace only', () => {
+      const { canGoNext, formData } = useComfyHubPublishWizard()
+      formData.value.name = '   '
+      expect(canGoNext.value).toBe(false)
+    })
+
+    it('returns true on describe step when name has content', () => {
+      const { canGoNext, formData } = useComfyHubPublishWizard()
+      formData.value.name = 'Valid Name'
+      expect(canGoNext.value).toBe(true)
+    })
+
+    it('returns true on non-describe steps regardless of name', () => {
+      const { canGoNext, goNext, formData } = useComfyHubPublishWizard()
+      formData.value.name = 'something'
+      goNext()
+      formData.value.name = ''
+      expect(canGoNext.value).toBe(true)
+    })
+  })
+
+  describe('step navigation', () => {
+    it('starts on the describe step', () => {
+      const { currentStep, isFirstStep } = useComfyHubPublishWizard()
+      expect(currentStep.value).toBe('describe')
+      expect(isFirstStep.value).toBe(true)
+    })
+
+    it('navigates forward through steps', () => {
+      const { currentStep, goNext } = useComfyHubPublishWizard()
+      expect(currentStep.value).toBe('describe')
+
+      goNext()
+      expect(currentStep.value).toBe('examples')
+
+      goNext()
+      expect(currentStep.value).toBe('finish')
+    })
+
+    it('navigates backward through steps', () => {
+      const { currentStep, goNext, goBack } = useComfyHubPublishWizard()
+      goNext()
+      goNext()
+      expect(currentStep.value).toBe('finish')
+
+      goBack()
+      expect(currentStep.value).toBe('examples')
+
+      goBack()
+      expect(currentStep.value).toBe('describe')
+    })
+
+    it('reports isLastStep correctly on finish step', () => {
+      const { isLastStep, goNext } = useComfyHubPublishWizard()
+      expect(isLastStep.value).toBe(false)
+
+      goNext()
+      expect(isLastStep.value).toBe(false)
+
+      goNext()
+      expect(isLastStep.value).toBe(true)
+    })
+  })
+
+  describe('profile creation step', () => {
+    it('navigates to profileCreation step', () => {
+      const { currentStep, openProfileCreationStep } =
+        useComfyHubPublishWizard()
+      openProfileCreationStep()
+      expect(currentStep.value).toBe('profileCreation')
+    })
+
+    it('reports isProfileCreationStep correctly', () => {
+      const { isProfileCreationStep, openProfileCreationStep } =
+        useComfyHubPublishWizard()
+      expect(isProfileCreationStep.value).toBe(false)
+
+      openProfileCreationStep()
+      expect(isProfileCreationStep.value).toBe(true)
+    })
+
+    it('returns to finish step from profileCreation', () => {
+      const { currentStep, openProfileCreationStep, closeProfileCreationStep } =
+        useComfyHubPublishWizard()
+      openProfileCreationStep()
+      expect(currentStep.value).toBe('profileCreation')
+
+      closeProfileCreationStep()
+      expect(currentStep.value).toBe('finish')
+    })
+  })
+})
diff --git a/src/platform/workflow/sharing/composables/useComfyHubPublishWizard.ts b/src/platform/workflow/sharing/composables/useComfyHubPublishWizard.ts
new file mode 100644
index 0000000000..8602942701
--- /dev/null
+++ b/src/platform/workflow/sharing/composables/useComfyHubPublishWizard.ts
@@ -0,0 +1,69 @@
+import { useStepper } from '@vueuse/core'
+import { computed, ref } from 'vue'
+
+import type { ComfyHubPublishFormData } from '@/platform/workflow/sharing/types/comfyHubTypes'
+import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
+
+const PUBLISH_STEPS = [
+  'describe',
+  'examples',
+  'finish',
+  'profileCreation'
+] as const
+
+export type ComfyHubPublishStep = (typeof PUBLISH_STEPS)[number]
+
+function createDefaultFormData(): ComfyHubPublishFormData {
+  const { activeWorkflow } = useWorkflowStore()
+  return {
+    name: activeWorkflow?.filename ?? '',
+    description: '',
+    workflowType: '',
+    tags: [],
+    thumbnailType: 'image',
+    thumbnailFile: null,
+    comparisonBeforeFile: null,
+    comparisonAfterFile: null,
+    exampleImages: [],
+    selectedExampleIds: []
+  }
+}
+
+export function useComfyHubPublishWizard() {
+  const stepper = useStepper([...PUBLISH_STEPS])
+  const formData = ref<ComfyHubPublishFormData>(createDefaultFormData())
+
+  const canGoNext = computed(() => {
+    if (stepper.isCurrent('describe')) {
+      return formData.value.name.trim().length > 0
+    }
+    return true
+  })
+
+  const isLastStep = computed(() => stepper.isCurrent('finish'))
+  const isProfileCreationStep = computed(() =>
+    stepper.isCurrent('profileCreation')
+  )
+
+  function openProfileCreationStep() {
+    stepper.goTo('profileCreation')
+  }
+
+  function closeProfileCreationStep() {
+    stepper.goTo('finish')
+  }
+
+  return {
+    currentStep: stepper.current,
+    formData,
+    canGoNext,
+    isFirstStep: stepper.isFirst,
+    isLastStep,
+    isProfileCreationStep,
+    goToStep: stepper.goTo,
+    goNext: stepper.goToNext,
+    goBack: stepper.goToPrevious,
+    openProfileCreationStep,
+    closeProfileCreationStep
+  }
+}
diff --git a/src/platform/workflow/sharing/composables/useShareDialog.ts b/src/platform/workflow/sharing/composables/useShareDialog.ts
new file mode 100644
index 0000000000..8cc90a5401
--- /dev/null
+++ b/src/platform/workflow/sharing/composables/useShareDialog.ts
@@ -0,0 +1,36 @@
+import ShareWorkflowDialogContent from '@/platform/workflow/sharing/components/ShareWorkflowDialogContent.vue'
+import { useDialogService } from '@/services/dialogService'
+import { useDialogStore } from '@/stores/dialogStore'
+
+const DIALOG_KEY = 'global-share-workflow'
+
+export function useShareDialog() {
+  const dialogService = useDialogService()
+  const dialogStore = useDialogStore()
+
+  function hide() {
+    dialogStore.closeDialog({ key: DIALOG_KEY })
+  }
+
+  function show() {
+    dialogService.showLayoutDialog({
+      key: DIALOG_KEY,
+      component: ShareWorkflowDialogContent,
+      props: {
+        onClose: hide
+      },
+      dialogComponentProps: {
+        pt: {
+          root: {
+            class: 'rounded-2xl overflow-hidden w-full sm:w-144 max-w-full'
+          }
+        }
+      }
+    })
+  }
+
+  return {
+    show,
+    hide
+  }
+}
diff --git a/src/platform/workflow/sharing/composables/useSharedWorkflowUrlLoader.test.ts b/src/platform/workflow/sharing/composables/useSharedWorkflowUrlLoader.test.ts
new file mode 100644
index 0000000000..3b10cf520c
--- /dev/null
+++ b/src/platform/workflow/sharing/composables/useSharedWorkflowUrlLoader.test.ts
@@ -0,0 +1,367 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { SharedWorkflowPayload } from '@/platform/workflow/sharing/types/shareTypes'
+import { useSharedWorkflowUrlLoader } from '@/platform/workflow/sharing/composables/useSharedWorkflowUrlLoader'
+
+const preservedQueryMocks = vi.hoisted(() => ({
+  clearPreservedQuery: vi.fn(),
+  hydratePreservedQuery: vi.fn(),
+  mergePreservedQueryIntoQuery: vi.fn()
+}))
+
+vi.mock(
+  '@/platform/navigation/preservedQueryManager',
+  () => preservedQueryMocks
+)
+
+let mockQueryParams: Record<string, string | string[] | undefined> = {}
+const mockRouterReplace = vi.fn()
+
+vi.mock('vue-router', () => ({
+  useRoute: vi.fn(() => ({
+    query: mockQueryParams
+  })),
+  useRouter: vi.fn(() => ({
+    replace: mockRouterReplace
+  }))
+}))
+
+const mockImportPublishedAssets = vi.fn()
+
+vi.mock('@/platform/workflow/sharing/services/workflowShareService', () => ({
+  SharedWorkflowLoadError: class extends Error {
+    readonly isRetryable: boolean
+    constructor(message: string, isRetryable: boolean) {
+      super(message)
+      this.name = 'SharedWorkflowLoadError'
+      this.isRetryable = isRetryable
+    }
+  },
+  useWorkflowShareService: () => ({
+    getSharedWorkflow: vi.fn(),
+    importPublishedAssets: mockImportPublishedAssets
+  })
+}))
+
+const mockLoadGraphData = vi.hoisted(() => vi.fn())
+
+vi.mock('@/scripts/app', () => ({
+  app: {
+    loadGraphData: mockLoadGraphData
+  }
+}))
+
+const mockToastAdd = vi.fn()
+vi.mock('primevue/usetoast', () => ({
+  useToast: () => ({
+    add: mockToastAdd
+  })
+}))
+
+vi.mock('vue-i18n', () => ({
+  useI18n: () => ({
+    t: vi.fn((key: string) => {
+      if (key === 'g.error') return 'Error'
+      if (key === 'shareWorkflow.loadFailed') {
+        return 'Failed to load shared workflow'
+      }
+      if (key === 'openSharedWorkflow.dialogTitle') {
+        return 'Open shared workflow'
+      }
+      if (key === 'openSharedWorkflow.importFailed') {
+        return 'Failed to import workflow assets'
+      }
+      return key
+    })
+  })
+}))
+
+const mockShowLayoutDialog = vi.hoisted(() => vi.fn())
+const mockCloseDialog = vi.hoisted(() => vi.fn())
+
+vi.mock('@/services/dialogService', () => ({
+  useDialogService: () => ({
+    showLayoutDialog: mockShowLayoutDialog
+  })
+}))
+
+vi.mock('@/stores/dialogStore', () => ({
+  useDialogStore: () => ({
+    closeDialog: mockCloseDialog
+  })
+}))
+
+function makePayload(
+  overrides: Partial<SharedWorkflowPayload> = {}
+): SharedWorkflowPayload {
+  return {
+    shareId: 'share-id-1',
+    workflowId: 'workflow-id-1',
+    name: 'Test Workflow',
+    listed: true,
+    publishedAt: new Date('2026-02-20T00:00:00Z'),
+    workflowJson: {
+      nodes: []
+    } as unknown as SharedWorkflowPayload['workflowJson'],
+    assets: [],
+    ...overrides
+  }
+}
+
+function resolveDialogWithConfirm(payload: SharedWorkflowPayload) {
+  const call = mockShowLayoutDialog.mock.calls.at(-1)
+  if (!call) throw new Error('showLayoutDialog was not called')
+  const options = call[0]
+  options.props.onConfirm(payload)
+}
+
+function resolveDialogWithOpenOnly(payload: SharedWorkflowPayload) {
+  const call = mockShowLayoutDialog.mock.calls.at(-1)
+  if (!call) throw new Error('showLayoutDialog was not called')
+  const options = call[0]
+  options.props.onOpenWithoutImporting(payload)
+}
+
+function resolveDialogWithCancel() {
+  const call = mockShowLayoutDialog.mock.calls.at(-1)
+  if (!call) throw new Error('showLayoutDialog was not called')
+  const options = call[0]
+  options.props.onCancel()
+}
+
+describe('useSharedWorkflowUrlLoader', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockQueryParams = {}
+    preservedQueryMocks.mergePreservedQueryIntoQuery.mockReturnValue(null)
+  })
+
+  it('does nothing when no share query param is present', async () => {
+    const { loadSharedWorkflowFromUrl } = useSharedWorkflowUrlLoader()
+
+    const loaded = await loadSharedWorkflowFromUrl()
+
+    expect(loaded).toBe('not-present')
+    expect(mockShowLayoutDialog).not.toHaveBeenCalled()
+    expect(mockLoadGraphData).not.toHaveBeenCalled()
+  })
+
+  it('opens dialog immediately with shareId and loads graph on confirm', async () => {
+    mockQueryParams = { share: 'share-id-1' }
+    const payload = makePayload()
+    mockShowLayoutDialog.mockImplementation(() => {
+      expect(mockLoadGraphData).not.toHaveBeenCalled()
+      resolveDialogWithConfirm(payload)
+    })
+
+    const { loadSharedWorkflowFromUrl } = useSharedWorkflowUrlLoader()
+    const loaded = await loadSharedWorkflowFromUrl()
+
+    expect(loaded).toBe('loaded')
+    const dialogCall = mockShowLayoutDialog.mock.calls[0][0]
+    expect(dialogCall.props.shareId).toBe('share-id-1')
+    expect(mockLoadGraphData).toHaveBeenCalledWith(
+      { nodes: [] },
+      true,
+      true,
+      'Test Workflow'
+    )
+    expect(mockRouterReplace).toHaveBeenCalledWith({ query: {} })
+    expect(preservedQueryMocks.clearPreservedQuery).toHaveBeenCalledWith(
+      'share'
+    )
+  })
+
+  it('does not load graph when user cancels dialog', async () => {
+    mockQueryParams = { share: 'share-id-1' }
+    mockShowLayoutDialog.mockImplementation(() => {
+      resolveDialogWithCancel()
+    })
+
+    const { loadSharedWorkflowFromUrl } = useSharedWorkflowUrlLoader()
+    const loaded = await loadSharedWorkflowFromUrl()
+
+    expect(loaded).toBe('cancelled')
+    expect(mockLoadGraphData).not.toHaveBeenCalled()
+    expect(mockRouterReplace).toHaveBeenCalledWith({ query: {} })
+    expect(preservedQueryMocks.clearPreservedQuery).toHaveBeenCalledWith(
+      'share'
+    )
+  })
+
+  it('calls import when non-owned assets exist and user confirms', async () => {
+    mockQueryParams = { share: 'share-id-1' }
+    const payload = makePayload({
+      assets: [
+        {
+          id: 'a1',
+          name: 'img.png',
+          preview_url: '',
+          storage_url: '',
+          model: false,
+          public: false,
+          in_library: false
+        }
+      ]
+    })
+    mockShowLayoutDialog.mockImplementation(() => {
+      resolveDialogWithConfirm(payload)
+    })
+
+    const { loadSharedWorkflowFromUrl } = useSharedWorkflowUrlLoader()
+    await loadSharedWorkflowFromUrl()
+
+    expect(mockImportPublishedAssets).toHaveBeenCalledWith(['a1'])
+  })
+
+  it('does not call import when user chooses open-only', async () => {
+    mockQueryParams = { share: 'share-id-1' }
+    const payload = makePayload({
+      assets: [
+        {
+          id: 'a1',
+          name: 'img.png',
+          preview_url: '',
+          storage_url: '',
+          model: false,
+          public: false,
+          in_library: false
+        }
+      ]
+    })
+    mockShowLayoutDialog.mockImplementation(() => {
+      resolveDialogWithOpenOnly(payload)
+    })
+
+    const { loadSharedWorkflowFromUrl } = useSharedWorkflowUrlLoader()
+    await loadSharedWorkflowFromUrl()
+
+    expect(mockLoadGraphData).toHaveBeenCalled()
+    expect(mockImportPublishedAssets).not.toHaveBeenCalled()
+  })
+
+  it('shows toast on import failure and returns loaded-without-assets', async () => {
+    mockQueryParams = { share: 'share-id-1' }
+    const payload = makePayload({
+      assets: [
+        {
+          id: 'm1',
+          name: 'model.safetensors',
+          preview_url: '',
+          storage_url: '',
+          model: true,
+          public: false,
+          in_library: false
+        }
+      ]
+    })
+    mockImportPublishedAssets.mockRejectedValue(new Error('Import failed'))
+    mockShowLayoutDialog.mockImplementation(() => {
+      resolveDialogWithConfirm(payload)
+    })
+
+    const { loadSharedWorkflowFromUrl } = useSharedWorkflowUrlLoader()
+    const loaded = await loadSharedWorkflowFromUrl()
+
+    expect(loaded).toBe('loaded-without-assets')
+    expect(mockToastAdd).toHaveBeenCalledWith(
+      expect.objectContaining({
+        severity: 'error',
+        detail: 'Failed to import workflow assets'
+      })
+    )
+  })
+
+  it('filters out in_library assets before importing', async () => {
+    mockQueryParams = { share: 'share-id-1' }
+    const payload = makePayload({
+      assets: [
+        {
+          id: 'a1',
+          name: 'needed.png',
+          preview_url: '',
+          storage_url: '',
+          model: false,
+          public: false,
+          in_library: false
+        },
+        {
+          id: 'a2',
+          name: 'already-have.png',
+          preview_url: '',
+          storage_url: '',
+          model: false,
+          public: false,
+          in_library: true
+        }
+      ]
+    })
+    mockShowLayoutDialog.mockImplementation(() => {
+      resolveDialogWithConfirm(payload)
+    })
+
+    const { loadSharedWorkflowFromUrl } = useSharedWorkflowUrlLoader()
+    await loadSharedWorkflowFromUrl()
+
+    expect(mockImportPublishedAssets).toHaveBeenCalledWith(['a1'])
+  })
+
+  it('restores preserved share query before loading', async () => {
+    preservedQueryMocks.mergePreservedQueryIntoQuery.mockReturnValue({
+      share: 'preserved-share-id'
+    })
+    mockShowLayoutDialog.mockImplementation(() => {
+      resolveDialogWithConfirm(makePayload({ shareId: 'preserved-share-id' }))
+    })
+
+    const { loadSharedWorkflowFromUrl } = useSharedWorkflowUrlLoader()
+    await loadSharedWorkflowFromUrl()
+
+    expect(preservedQueryMocks.hydratePreservedQuery).toHaveBeenCalledWith(
+      'share'
+    )
+    expect(mockRouterReplace).toHaveBeenCalledWith({
+      query: { share: 'preserved-share-id' }
+    })
+    const dialogCall = mockShowLayoutDialog.mock.calls[0][0]
+    expect(dialogCall.props.shareId).toBe('preserved-share-id')
+  })
+
+  it('rejects invalid share parameter values', async () => {
+    mockQueryParams = { share: '../../../etc/passwd' }
+
+    const { loadSharedWorkflowFromUrl } = useSharedWorkflowUrlLoader()
+    const loaded = await loadSharedWorkflowFromUrl()
+
+    expect(loaded).toBe('failed')
+    expect(mockShowLayoutDialog).not.toHaveBeenCalled()
+    expect(mockToastAdd).toHaveBeenCalledWith({
+      severity: 'error',
+      summary: 'Error',
+      detail: 'Failed to load shared workflow',
+      life: 3000
+    })
+    expect(mockRouterReplace).toHaveBeenCalledWith({ query: {} })
+    expect(preservedQueryMocks.clearPreservedQuery).toHaveBeenCalledWith(
+      'share'
+    )
+  })
+
+  it('uses fallback name when payload name is empty', async () => {
+    mockQueryParams = { share: 'share-id-1' }
+    const payload = makePayload({ name: '' })
+    mockShowLayoutDialog.mockImplementation(() => {
+      resolveDialogWithConfirm(payload)
+    })
+
+    const { loadSharedWorkflowFromUrl } = useSharedWorkflowUrlLoader()
+    await loadSharedWorkflowFromUrl()
+
+    expect(mockLoadGraphData).toHaveBeenCalledWith(
+      expect.anything(),
+      true,
+      true,
+      'Open shared workflow'
+    )
+  })
+})
diff --git a/src/platform/workflow/sharing/composables/useSharedWorkflowUrlLoader.ts b/src/platform/workflow/sharing/composables/useSharedWorkflowUrlLoader.ts
new file mode 100644
index 0000000000..9013947693
--- /dev/null
+++ b/src/platform/workflow/sharing/composables/useSharedWorkflowUrlLoader.ts
@@ -0,0 +1,186 @@
+import { useToast } from 'primevue/usetoast'
+import { useI18n } from 'vue-i18n'
+import { useRoute, useRouter } from 'vue-router'
+
+import OpenSharedWorkflowDialogContent from '@/platform/workflow/sharing/components/OpenSharedWorkflowDialogContent.vue'
+import type { SharedWorkflowPayload } from '@/platform/workflow/sharing/types/shareTypes'
+import {
+  clearPreservedQuery,
+  hydratePreservedQuery,
+  mergePreservedQueryIntoQuery
+} from '@/platform/navigation/preservedQueryManager'
+import { PRESERVED_QUERY_NAMESPACES } from '@/platform/navigation/preservedQueryNamespaces'
+import { useWorkflowShareService } from '@/platform/workflow/sharing/services/workflowShareService'
+import { app } from '@/scripts/app'
+import { useDialogService } from '@/services/dialogService'
+import { useDialogStore } from '@/stores/dialogStore'
+
+type SharedWorkflowUrlLoadStatus =
+  | 'not-present'
+  | 'loaded'
+  | 'loaded-without-assets'
+  | 'cancelled'
+  | 'failed'
+
+type DialogResult =
+  | { action: 'copy-and-open'; payload: SharedWorkflowPayload }
+  | { action: 'open-only'; payload: SharedWorkflowPayload }
+  | { action: 'cancel' }
+
+export function useSharedWorkflowUrlLoader() {
+  const route = useRoute()
+  const router = useRouter()
+  const toast = useToast()
+  const { t } = useI18n()
+  const workflowShareService = useWorkflowShareService()
+  const dialogService = useDialogService()
+  const dialogStore = useDialogStore()
+  const SHARE_NAMESPACE = PRESERVED_QUERY_NAMESPACES.SHARE
+
+  function isValidParameter(param: string): boolean {
+    return /^[a-zA-Z0-9_.-]+$/.test(param)
+  }
+
+  async function ensureShareQueryFromIntent() {
+    hydratePreservedQuery(SHARE_NAMESPACE)
+    const mergedQuery = mergePreservedQueryIntoQuery(
+      SHARE_NAMESPACE,
+      route.query
+    )
+
+    if (mergedQuery) {
+      await router.replace({ query: mergedQuery })
+    }
+
+    return mergedQuery ?? route.query
+  }
+
+  function cleanupUrlParams() {
+    const newQuery = { ...route.query }
+    delete newQuery.share
+    void router.replace({ query: newQuery })
+  }
+
+  function showOpenSharedWorkflowDialog(
+    shareId: string
+  ): Promise<DialogResult> {
+    const dialogKey = 'open-shared-workflow'
+
+    return new Promise<DialogResult>((resolve) => {
+      dialogService.showLayoutDialog({
+        key: dialogKey,
+        component: OpenSharedWorkflowDialogContent,
+        props: {
+          shareId,
+          onConfirm: (payload: SharedWorkflowPayload) => {
+            resolve({ action: 'copy-and-open', payload })
+            dialogStore.closeDialog({ key: dialogKey })
+          },
+          onOpenWithoutImporting: (payload: SharedWorkflowPayload) => {
+            resolve({ action: 'open-only', payload })
+            dialogStore.closeDialog({ key: dialogKey })
+          },
+          onCancel: () => {
+            resolve({ action: 'cancel' })
+            dialogStore.closeDialog({ key: dialogKey })
+          }
+        },
+        dialogComponentProps: {
+          onClose: () => resolve({ action: 'cancel' }),
+          pt: {
+            root: {
+              class: 'rounded-2xl overflow-hidden w-full sm:w-176 max-w-full'
+            }
+          }
+        }
+      })
+    })
+  }
+
+  async function loadSharedWorkflowFromUrl(): Promise<SharedWorkflowUrlLoadStatus> {
+    const query = await ensureShareQueryFromIntent()
+    const shareParam = query.share
+
+    if (shareParam == null) {
+      return 'not-present'
+    }
+
+    if (typeof shareParam !== 'string') {
+      cleanupUrlParams()
+      clearPreservedQuery(SHARE_NAMESPACE)
+      return 'not-present'
+    }
+
+    if (!isValidParameter(shareParam)) {
+      console.warn(
+        `[useSharedWorkflowUrlLoader] Invalid share parameter format: ${shareParam}`
+      )
+      toast.add({
+        severity: 'error',
+        summary: t('g.error'),
+        detail: t('shareWorkflow.loadFailed'),
+        life: 3000
+      })
+      cleanupUrlParams()
+      clearPreservedQuery(SHARE_NAMESPACE)
+      return 'failed'
+    }
+
+    const result = await showOpenSharedWorkflowDialog(shareParam)
+
+    if (result.action === 'cancel') {
+      cleanupUrlParams()
+      clearPreservedQuery(SHARE_NAMESPACE)
+      return 'cancelled'
+    }
+
+    const { payload } = result
+    const workflowName = payload.name || t('openSharedWorkflow.dialogTitle')
+    const nonOwnedAssets = payload.assets.filter((a) => !a.in_library)
+
+    try {
+      await app.loadGraphData(payload.workflowJson, true, true, workflowName)
+    } catch (error) {
+      console.error(
+        '[useSharedWorkflowUrlLoader] Failed to load workflow graph:',
+        error
+      )
+      toast.add({
+        severity: 'error',
+        summary: t('g.error'),
+        detail: t('shareWorkflow.loadFailed'),
+        life: 5000
+      })
+      return 'failed'
+    }
+
+    if (result.action === 'copy-and-open' && nonOwnedAssets.length > 0) {
+      try {
+        await workflowShareService.importPublishedAssets(
+          nonOwnedAssets.map((a) => a.id)
+        )
+      } catch (importError) {
+        console.error(
+          '[useSharedWorkflowUrlLoader] Failed to import assets:',
+          importError
+        )
+        toast.add({
+          severity: 'error',
+          summary: t('g.error'),
+          detail: t('openSharedWorkflow.importFailed')
+        })
+        cleanupUrlParams()
+        clearPreservedQuery(SHARE_NAMESPACE)
+        return 'loaded-without-assets'
+      }
+    }
+
+    cleanupUrlParams()
+    clearPreservedQuery(SHARE_NAMESPACE)
+    return 'loaded'
+  }
+
+  return {
+    loadSharedWorkflowFromUrl
+  }
+}
diff --git a/src/platform/workflow/sharing/composables/useSliderFromMouse.ts b/src/platform/workflow/sharing/composables/useSliderFromMouse.ts
new file mode 100644
index 0000000000..619ed389bd
--- /dev/null
+++ b/src/platform/workflow/sharing/composables/useSliderFromMouse.ts
@@ -0,0 +1,17 @@
+import type { Ref } from 'vue'
+
+import { useMouseInElement } from '@vueuse/core'
+import { ref, watch } from 'vue'
+
+export function useSliderFromMouse(target: Ref<HTMLElement | null>) {
+  const position = ref(50)
+  const { elementX, elementWidth, isOutside } = useMouseInElement(target)
+
+  watch([elementX, elementWidth, isOutside], ([x, width, outside]) => {
+    if (!outside && width > 0) {
+      position.value = (x / width) * 100
+    }
+  })
+
+  return position
+}
diff --git a/src/platform/workflow/sharing/constants/comfyHubTags.ts b/src/platform/workflow/sharing/constants/comfyHubTags.ts
new file mode 100644
index 0000000000..445abc446b
--- /dev/null
+++ b/src/platform/workflow/sharing/constants/comfyHubTags.ts
@@ -0,0 +1,81 @@
+import { orderBy } from 'es-toolkit/array'
+
+/**
+ * Curated tag options for ComfyHub workflow publishing.
+ * Sourced from https://github.com/Comfy-Org/workflow_templates/blob/main/templates/index.json
+ *
+ * To regenerate: pnpm dlx tsx temp/scripts/extract-comfyhub-tags.ts
+ */
+const COMFY_HUB_TAG_FREQUENCIES = [
+  { tag: 'API', count: 143 },
+  { tag: 'Video', count: 102 },
+  { tag: 'Image', count: 98 },
+  { tag: 'Text to Image', count: 61 },
+  { tag: 'Image to Video', count: 48 },
+  { tag: 'Image Edit', count: 46 },
+  { tag: 'Text to Video', count: 34 },
+  { tag: 'Audio', count: 20 },
+  { tag: '3D', count: 19 },
+  { tag: 'FLF2V', count: 18 },
+  { tag: 'ControlNet', count: 16 },
+  { tag: 'Image Upscale', count: 16 },
+  { tag: 'Product', count: 11 },
+  { tag: 'Text to Audio', count: 10 },
+  { tag: 'Image to 3D', count: 9 },
+  { tag: 'Inpainting', count: 8 },
+  { tag: 'Character Reference', count: 6 },
+  { tag: 'Video to Video', count: 6 },
+  { tag: 'Video Upscale', count: 6 },
+  { tag: 'Mockup', count: 5 },
+  { tag: 'Outpainting', count: 5 },
+  { tag: 'Preprocessor', count: 5 },
+  { tag: 'Relight', count: 5 },
+  { tag: 'Voice Cloning', count: 5 },
+  { tag: 'Brand Design', count: 4 },
+  { tag: 'Fashion', count: 4 },
+  { tag: 'Image to Model', count: 4 },
+  { tag: 'Portrait', count: 4 },
+  { tag: 'Text to Model', count: 4 },
+  { tag: 'Video Edit', count: 4 },
+  { tag: 'Anime', count: 3 },
+  { tag: 'Audio to Audio', count: 3 },
+  { tag: 'Audio to Video', count: 3 },
+  { tag: 'LLM', count: 3 },
+  { tag: 'Motion Control', count: 3 },
+  { tag: 'Music', count: 3 },
+  { tag: 'Style Reference', count: 3 },
+  { tag: 'Style Transfer', count: 3 },
+  { tag: 'Text to Speech', count: 3 },
+  { tag: '3D Model', count: 2 },
+  { tag: 'Audio Editing', count: 2 },
+  { tag: 'Character', count: 2 },
+  { tag: 'Layer Decompose', count: 2 },
+  { tag: 'Lip Sync', count: 2 },
+  { tag: 'Multiple Angles', count: 2 },
+  { tag: 'Remove Background', count: 2 },
+  { tag: 'Text-to-Image', count: 2 },
+  { tag: 'Vector', count: 2 },
+  { tag: 'Brand', count: 1 },
+  { tag: 'Canny', count: 1 },
+  { tag: 'Depth Map', count: 1 },
+  { tag: 'Frame Interpolation', count: 1 },
+  { tag: 'icon', count: 1 },
+  { tag: 'Image Enhancement', count: 1 },
+  { tag: 'Layout Design', count: 1 },
+  { tag: 'Normal Map', count: 1 },
+  { tag: 'OpenPose', count: 1 },
+  { tag: 'Pose transfer', count: 1 },
+  { tag: 'Replacement', count: 1 },
+  { tag: 'Sound Effects', count: 1 },
+  { tag: 'Speech to Text', count: 1 },
+  { tag: 'Text Generation', count: 1 },
+  { tag: 'Turbo', count: 1 },
+  { tag: 'Video Extension', count: 1 },
+  { tag: 'Voice Isolation', count: 1 }
+] as const
+
+export const COMFY_HUB_TAG_OPTIONS = orderBy(
+  COMFY_HUB_TAG_FREQUENCIES,
+  ['count', 'tag'],
+  ['desc', 'asc']
+).map(({ tag }) => tag)
diff --git a/src/platform/workflow/sharing/schemas/shareSchemas.test.ts b/src/platform/workflow/sharing/schemas/shareSchemas.test.ts
new file mode 100644
index 0000000000..39b5269c45
--- /dev/null
+++ b/src/platform/workflow/sharing/schemas/shareSchemas.test.ts
@@ -0,0 +1,54 @@
+import { describe, expect, it } from 'vitest'
+
+import { zSharedWorkflowResponse } from '@/platform/workflow/sharing/schemas/shareSchemas'
+
+function makePayload(name: string) {
+  return {
+    share_id: 'share-1',
+    workflow_id: 'wf-1',
+    name,
+    listed: false,
+    publish_time: null,
+    workflow_json: {},
+    assets: []
+  }
+}
+
+describe('zSharedWorkflowResponse name sanitization', () => {
+  it('strips forward slashes from name', () => {
+    const result = zSharedWorkflowResponse.parse(
+      makePayload('../../malicious/path')
+    )
+    expect(result.name).toBe('.._.._malicious_path')
+  })
+
+  it('strips backslashes from name', () => {
+    const result = zSharedWorkflowResponse.parse(
+      makePayload('..\\..\\malicious\\path')
+    )
+    expect(result.name).toBe('.._.._malicious_path')
+  })
+
+  it('strips colons from name', () => {
+    const result = zSharedWorkflowResponse.parse(makePayload('C:\\evil'))
+    expect(result.name).toBe('C__evil')
+  })
+
+  it('truncates names exceeding 200 characters', () => {
+    const longName = 'a'.repeat(300)
+    const result = zSharedWorkflowResponse.parse(makePayload(longName))
+    expect(result.name).toHaveLength(200)
+  })
+
+  it('preserves safe names unchanged', () => {
+    const result = zSharedWorkflowResponse.parse(
+      makePayload('My Cool Workflow (v2)')
+    )
+    expect(result.name).toBe('My Cool Workflow (v2)')
+  })
+
+  it('trims whitespace from sanitized names', () => {
+    const result = zSharedWorkflowResponse.parse(makePayload('  spaced name  '))
+    expect(result.name).toBe('spaced name')
+  })
+})
diff --git a/src/platform/workflow/sharing/schemas/shareSchemas.ts b/src/platform/workflow/sharing/schemas/shareSchemas.ts
new file mode 100644
index 0000000000..516ef401a3
--- /dev/null
+++ b/src/platform/workflow/sharing/schemas/shareSchemas.ts
@@ -0,0 +1,44 @@
+import { z } from 'zod'
+
+import { zAssetInfo, zComfyHubProfile } from '@/schemas/apiSchema'
+
+export const zPublishRecordResponse = z.object({
+  workflow_id: z.string(),
+  share_id: z.string().nullable(),
+  listed: z.boolean(),
+  publish_time: z.string().nullable(),
+  assets: z.array(zAssetInfo).optional()
+})
+
+/**
+ * Strips path separators and control characters from a workflow name to prevent
+ * path traversal when the name is later used as part of a file path.
+ */
+function sanitizeWorkflowName(name: string): string {
+  return name
+    .replaceAll(/[/\\:]/g, '_')
+    .slice(0, 200)
+    .trim()
+}
+
+export const zSharedWorkflowResponse = z.object({
+  share_id: z.string(),
+  workflow_id: z.string(),
+  name: z.string().transform(sanitizeWorkflowName),
+  listed: z.boolean(),
+  publish_time: z.string().nullable(),
+  workflow_json: z.record(z.string(), z.unknown()),
+  assets: z.array(zAssetInfo)
+})
+
+export const zHubProfileResponse = z.preprocess((data) => {
+  if (!data || typeof data !== 'object') return data
+  const d = data as Record<string, unknown>
+  return {
+    username: d.username,
+    name: d.name,
+    description: d.description,
+    coverImageUrl: d.coverImageUrl ?? d.cover_image_url,
+    profilePictureUrl: d.profilePictureUrl ?? d.profile_picture_url
+  }
+}, zComfyHubProfile)
diff --git a/src/platform/workflow/sharing/services/workflowShareService.test.ts b/src/platform/workflow/sharing/services/workflowShareService.test.ts
new file mode 100644
index 0000000000..49dfc03a73
--- /dev/null
+++ b/src/platform/workflow/sharing/services/workflowShareService.test.ts
@@ -0,0 +1,437 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { AssetInfo } from '@/schemas/apiSchema'
+import { useWorkflowShareService } from '@/platform/workflow/sharing/services/workflowShareService'
+
+const mockApp = vi.hoisted(() => ({
+  rootGraph: {} as object | null,
+  graphToPrompt: vi.fn()
+}))
+
+vi.mock('@/scripts/app', () => ({
+  app: mockApp
+}))
+
+const mockGetShareableAssets = vi.fn()
+const mockFetchApi = vi.fn()
+
+vi.mock(
+  '@/platform/workflow/validation/schemas/workflowSchema',
+  async (importOriginal) => ({
+    ...(await importOriginal()),
+    validateComfyWorkflow: vi.fn(async (json: unknown) => json)
+  })
+)
+
+vi.mock('@/scripts/api', () => ({
+  api: {
+    getShareableAssets: (...args: unknown[]) => mockGetShareableAssets(...args),
+    fetchApi: (...args: unknown[]) => mockFetchApi(...args),
+    apiURL: (route: string) => `/api${route}`,
+    fileURL: (route: string) => route
+  }
+}))
+
+describe(useWorkflowShareService, () => {
+  const mockShareableAssets: AssetInfo[] = [
+    {
+      id: 'asset-1',
+      name: 'asset.png',
+      storage_url: '',
+      preview_url: '',
+      model: false,
+      public: false,
+      in_library: false
+    },
+    {
+      id: 'model-1',
+      name: 'model.safetensors',
+      storage_url: '',
+      preview_url: '',
+      model: true,
+      public: false,
+      in_library: false
+    }
+  ]
+
+  function mockJsonResponse(payload: unknown, ok = true, status = 200) {
+    return {
+      ok,
+      status,
+      json: async () => payload
+    } as Response
+  }
+
+  beforeEach(() => {
+    vi.resetAllMocks()
+    mockApp.rootGraph = {}
+    window.history.replaceState({}, '', '/')
+  })
+
+  it('returns unpublished status for unknown workflow', async () => {
+    mockFetchApi.mockResolvedValue(
+      mockJsonResponse({
+        workflow_id: 'wf-0',
+        publish_time: null,
+        share_id: null,
+        listed: false
+      })
+    )
+
+    const service = useWorkflowShareService()
+    const status = await service.getPublishStatus('unknown-id')
+
+    expect(status.isPublished).toBe(false)
+    expect(status.shareId).toBeNull()
+    expect(status.shareUrl).toBeNull()
+    expect(status.publishedAt).toBeNull()
+  })
+
+  it('publishes a workflow and returns a share URL', async () => {
+    mockFetchApi.mockResolvedValue(
+      mockJsonResponse({
+        workflow_id: 'test-workflow',
+        share_id: 'abc123',
+        publish_time: '2026-02-23T00:00:00Z',
+        listed: false,
+        assets: []
+      })
+    )
+
+    const service = useWorkflowShareService()
+
+    const result = await service.publishWorkflow(
+      'test-workflow',
+      mockShareableAssets
+    )
+
+    expect(result.shareId).toBe('abc123')
+    expect(result.shareUrl).toBe(`${window.location.origin}/?share=abc123`)
+    expect(result.publishedAt).toBeInstanceOf(Date)
+    expect(mockFetchApi).toHaveBeenCalledWith(
+      '/userdata/test-workflow/publish',
+      {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          asset_ids: ['asset-1', 'model-1']
+        })
+      }
+    )
+  })
+
+  it('preserves app subpath when normalizing published share URLs', async () => {
+    window.history.replaceState({}, '', '/comfy/subpath/?foo=bar#section')
+    mockFetchApi.mockResolvedValue(
+      mockJsonResponse({
+        workflow_id: 'test-workflow',
+        share_id: 'subpath-id',
+        publish_time: '2026-02-23T00:00:00Z',
+        listed: false,
+        assets: []
+      })
+    )
+
+    const service = useWorkflowShareService()
+    const result = await service.publishWorkflow(
+      'test-workflow',
+      mockShareableAssets
+    )
+
+    expect(result.shareUrl).toBe(
+      `${window.location.origin}/comfy/subpath/?share=subpath-id`
+    )
+  })
+
+  it('reports published status after publishing', async () => {
+    mockFetchApi.mockResolvedValue(
+      mockJsonResponse({
+        workflow_id: 'wf-1',
+        share_id: 'wf-1',
+        publish_time: '2026-02-23T00:00:00Z',
+        listed: false,
+        assets: []
+      })
+    )
+
+    const service = useWorkflowShareService()
+    const status = await service.getPublishStatus('wf-1')
+
+    expect(status.isPublished).toBe(true)
+    expect(status.shareId).toBe('wf-1')
+    expect(status.shareUrl).toBe(`${window.location.origin}/?share=wf-1`)
+    expect(status.publishedAt).toBeInstanceOf(Date)
+  })
+
+  it('preserves app subpath when normalizing publish status share URLs', async () => {
+    window.history.replaceState({}, '', '/comfy/subpath/')
+    mockFetchApi.mockResolvedValue(
+      mockJsonResponse({
+        workflow_id: 'wf-subpath',
+        share_id: 'wf-subpath',
+        publish_time: '2026-02-23T00:00:00Z',
+        listed: false,
+        assets: []
+      })
+    )
+
+    const service = useWorkflowShareService()
+    const status = await service.getPublishStatus('wf-subpath')
+
+    expect(status.shareUrl).toBe(
+      `${window.location.origin}/comfy/subpath/?share=wf-subpath`
+    )
+  })
+
+  it('returns unpublished when publish record has no share id', async () => {
+    mockFetchApi.mockResolvedValue(
+      mockJsonResponse({
+        workflow_id: 'wf-2',
+        share_id: null,
+        publish_time: '2026-02-23T00:00:00Z',
+        listed: false
+      })
+    )
+
+    const service = useWorkflowShareService()
+    const status = await service.getPublishStatus('wf-2')
+
+    expect(status.isPublished).toBe(false)
+    expect(status.shareId).toBeNull()
+  })
+
+  it('fetches and maps shared workflow payload', async () => {
+    mockFetchApi.mockResolvedValue(
+      mockJsonResponse({
+        share_id: 'share-123',
+        workflow_id: 'wf-123',
+        name: 'Test Workflow',
+        listed: true,
+        publish_time: '2026-02-23T00:00:00Z',
+        workflow_json: { nodes: [] },
+        assets: [
+          {
+            id: 'asset-1',
+            name: 'asset.png',
+            preview_url: 'https://example.com/a.jpg',
+            storage_url: 'storage/a',
+            model: false,
+            public: false,
+            in_library: false
+          }
+        ]
+      })
+    )
+
+    const service = useWorkflowShareService()
+    const shared = await service.getSharedWorkflow('share-123')
+
+    expect(mockFetchApi).toHaveBeenCalledWith('/workflows/published/share-123')
+    expect(shared).toEqual({
+      shareId: 'share-123',
+      workflowId: 'wf-123',
+      name: 'Test Workflow',
+      listed: true,
+      publishedAt: new Date('2026-02-23T00:00:00Z'),
+      workflowJson: { nodes: [] },
+      assets: [
+        {
+          id: 'asset-1',
+          name: 'asset.png',
+          preview_url: 'https://example.com/a.jpg',
+          storage_url: 'storage/a',
+          model: false,
+          public: false,
+          in_library: false
+        }
+      ]
+    })
+  })
+
+  it('throws when shared workflow request fails', async () => {
+    mockFetchApi.mockResolvedValue(mockJsonResponse({}, false, 404))
+
+    const service = useWorkflowShareService()
+
+    await expect(service.getSharedWorkflow('missing')).rejects.toThrow(
+      'Failed to load shared workflow: 404'
+    )
+  })
+
+  it('imports published assets via POST /assets/import', async () => {
+    mockFetchApi.mockResolvedValue(mockJsonResponse({}, true, 200))
+
+    const service = useWorkflowShareService()
+    await service.importPublishedAssets(['pa-1', 'pa-2'])
+
+    expect(mockFetchApi).toHaveBeenCalledWith('/assets/import', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ published_asset_ids: ['pa-1', 'pa-2'] })
+    })
+  })
+
+  it('throws when import request fails', async () => {
+    mockFetchApi.mockResolvedValue(mockJsonResponse({}, false, 400))
+
+    const service = useWorkflowShareService()
+
+    await expect(service.importPublishedAssets(['bad-id'])).rejects.toThrow(
+      'Failed to import assets: 400'
+    )
+  })
+
+  it('throws when shared workflow payload is invalid', async () => {
+    mockFetchApi.mockResolvedValue(
+      mockJsonResponse({ name: 'Invalid', version: 1 })
+    )
+
+    const service = useWorkflowShareService()
+
+    await expect(service.getSharedWorkflow('invalid')).rejects.toThrow(
+      'Failed to load shared workflow: invalid response'
+    )
+  })
+
+  it('treats malformed publish-status payload as unpublished', async () => {
+    mockFetchApi.mockResolvedValue(mockJsonResponse({ is_published: true }))
+
+    const service = useWorkflowShareService()
+    const status = await service.getPublishStatus('wf-4')
+
+    expect(status).toEqual({
+      isPublished: false,
+      shareId: null,
+      shareUrl: null,
+      publishedAt: null
+    })
+  })
+
+  it('returns empty results when no graph exists', async () => {
+    mockApp.rootGraph = null
+
+    const service = useWorkflowShareService()
+    const result = await service.getShareableAssets()
+
+    expect(result).toEqual([])
+    expect(mockApp.graphToPrompt).not.toHaveBeenCalled()
+  })
+
+  it('calls backend API with graph prompt output', async () => {
+    mockApp.graphToPrompt.mockResolvedValue({ output: { '1': {} } })
+    mockGetShareableAssets.mockResolvedValue({ assets: [] })
+
+    const service = useWorkflowShareService()
+    await service.getShareableAssets()
+
+    expect(mockGetShareableAssets).toHaveBeenCalledWith({ '1': {} })
+  })
+
+  it('propagates error when graphToPrompt fails', async () => {
+    mockApp.graphToPrompt.mockRejectedValue(new Error('prompt failed'))
+
+    const service = useWorkflowShareService()
+
+    await expect(service.getShareableAssets()).rejects.toThrow('prompt failed')
+  })
+
+  it('normalizes backend thumbnail field names', async () => {
+    mockApp.graphToPrompt.mockResolvedValue({ output: {} })
+    mockGetShareableAssets.mockResolvedValue({
+      assets: [
+        {
+          id: 'asset-server-1',
+          name: 'server-asset.png',
+          preview_url: 'https://example.com/a.jpg',
+          storage_url: 'storage/a',
+          model: false,
+          public: false,
+          in_library: false
+        },
+        {
+          id: 'model-server-1',
+          name: 'server-model.safetensors',
+          preview_url: 'https://example.com/m.jpg',
+          storage_url: 'storage/m',
+          model: true,
+          public: false,
+          in_library: true
+        }
+      ]
+    })
+
+    const service = useWorkflowShareService()
+    const result = await service.getShareableAssets()
+
+    expect(result).toEqual([
+      {
+        id: 'asset-server-1',
+        name: 'server-asset.png',
+        preview_url: 'https://example.com/a.jpg',
+        storage_url: 'storage/a',
+        model: false,
+        public: false,
+        in_library: false
+      },
+      {
+        id: 'model-server-1',
+        name: 'server-model.safetensors',
+        preview_url: 'https://example.com/m.jpg',
+        storage_url: 'storage/m',
+        model: true,
+        public: false,
+        in_library: true
+      }
+    ])
+  })
+
+  it('returns assets with preview_url intact', async () => {
+    mockApp.graphToPrompt.mockResolvedValue({ output: {} })
+    mockGetShareableAssets.mockResolvedValue({
+      assets: [
+        {
+          id: 'asset-1',
+          name: 'asset.png',
+          preview_url: '/view?filename=asset.png',
+          storage_url: 'storage/asset',
+          model: false,
+          public: false,
+          in_library: false
+        },
+        {
+          id: 'model-1',
+          name: 'model.safetensors',
+          preview_url: '/api/assets/model-thumb',
+          storage_url: 'storage/model',
+          model: true,
+          public: false,
+          in_library: false
+        }
+      ]
+    })
+
+    const service = useWorkflowShareService()
+    const result = await service.getShareableAssets()
+
+    expect(result).toEqual([
+      {
+        id: 'asset-1',
+        name: 'asset.png',
+        preview_url: '/view?filename=asset.png',
+        storage_url: 'storage/asset',
+        model: false,
+        public: false,
+        in_library: false
+      },
+      {
+        id: 'model-1',
+        name: 'model.safetensors',
+        preview_url: '/api/assets/model-thumb',
+        storage_url: 'storage/model',
+        model: true,
+        public: false,
+        in_library: false
+      }
+    ])
+  })
+})
diff --git a/src/platform/workflow/sharing/services/workflowShareService.ts b/src/platform/workflow/sharing/services/workflowShareService.ts
new file mode 100644
index 0000000000..f604d0e790
--- /dev/null
+++ b/src/platform/workflow/sharing/services/workflowShareService.ts
@@ -0,0 +1,207 @@
+import type {
+  SharedWorkflowPayload,
+  WorkflowPublishResult,
+  WorkflowPublishStatus
+} from '@/platform/workflow/sharing/types/shareTypes'
+import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
+import { validateComfyWorkflow } from '@/platform/workflow/validation/schemas/workflowSchema'
+import type { AssetInfo } from '@/schemas/apiSchema'
+import {
+  zPublishRecordResponse,
+  zSharedWorkflowResponse
+} from '@/platform/workflow/sharing/schemas/shareSchemas'
+import { api } from '@/scripts/api'
+import { app } from '@/scripts/app'
+
+class SharedWorkflowLoadError extends Error {
+  readonly status: number | null
+
+  constructor(status: number | null, message?: string) {
+    super(message ?? `Failed to load shared workflow: ${status ?? 'unknown'}`)
+    this.name = 'SharedWorkflowLoadError'
+    this.status = status
+  }
+
+  get isRetryable(): boolean {
+    if (this.status === null) return true
+    return this.status >= 500 || this.status === 408 || this.status === 429
+  }
+}
+
+function decodePublishRecord(payload: unknown) {
+  const result = zPublishRecordResponse.safeParse(payload)
+  if (!result.success) return null
+  const r = result.data
+  return {
+    workflowId: r.workflow_id,
+    shareId: r.share_id ?? undefined,
+    listed: r.listed,
+    publishedAt: parsePublishedAt(r.publish_time),
+    shareUrl: r.share_id ? normalizeShareUrl(r.share_id) : undefined
+  }
+}
+
+function parsePublishedAt(value: string | null | undefined): Date | null {
+  if (!value) return null
+
+  const parsed = new Date(value)
+  return Number.isNaN(parsed.getTime()) ? null : parsed
+}
+
+function normalizeShareUrl(shareId: string): string {
+  const queryString = `share=${encodeURIComponent(shareId)}`
+  if (typeof window === 'undefined' || !window.location?.origin) {
+    return `/?${queryString}`
+  }
+
+  const normalizedUrl = new URL(window.location.href)
+  normalizedUrl.search = queryString
+  normalizedUrl.hash = ''
+  return normalizedUrl.toString()
+}
+
+function decodeSharedWorkflowPayload(
+  payload: unknown
+): SharedWorkflowPayload | null {
+  const result = zSharedWorkflowResponse.safeParse(payload)
+  if (!result.success) return null
+  const r = result.data
+  return {
+    shareId: r.share_id,
+    workflowId: r.workflow_id,
+    name: r.name,
+    listed: r.listed,
+    publishedAt: r.publish_time ? parsePublishedAt(r.publish_time) : null,
+    workflowJson: r.workflow_json as ComfyWorkflowJSON,
+    assets: r.assets
+  }
+}
+
+const UNPUBLISHED = {
+  isPublished: false,
+  shareId: null,
+  shareUrl: null,
+  publishedAt: null
+} as const satisfies WorkflowPublishStatus
+
+export function useWorkflowShareService() {
+  async function publishWorkflow(
+    workflowPath: string,
+    shareableAssets: AssetInfo[]
+  ): Promise<WorkflowPublishResult> {
+    const assetIds = shareableAssets.map((a) => a.id)
+    const response = await api.fetchApi(
+      `/userdata/${encodeURIComponent(workflowPath)}/publish`,
+      {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ asset_ids: assetIds })
+      }
+    )
+
+    if (!response.ok) {
+      throw new Error(`Failed to publish workflow: ${response.status}`)
+    }
+
+    const record = decodePublishRecord(await response.json())
+    if (!record?.shareId || !record.publishedAt) {
+      throw new Error('Failed to publish workflow: invalid response')
+    }
+
+    return {
+      shareId: record.shareId,
+      shareUrl: normalizeShareUrl(record.shareId),
+      publishedAt: record.publishedAt
+    }
+  }
+
+  async function getPublishStatus(
+    workflowPath: string
+  ): Promise<WorkflowPublishStatus> {
+    const response = await api.fetchApi(
+      `/userdata/${encodeURIComponent(workflowPath)}/publish`
+    )
+    if (!response.ok) {
+      if (response.status === 404) return UNPUBLISHED
+      throw new Error(
+        `Failed to fetch publish status: ${response.status} ${response.statusText}`
+      )
+    }
+
+    const json = await response.json()
+    const record = decodePublishRecord(json)
+    if (!record || !record.shareId || !record.publishedAt) return UNPUBLISHED
+
+    return {
+      isPublished: true,
+      shareId: record.shareId,
+      shareUrl: normalizeShareUrl(record.shareId),
+      publishedAt: record.publishedAt
+    }
+  }
+
+  async function getShareableAssets(
+    includingPublic = false
+  ): Promise<AssetInfo[]> {
+    const graph = app.rootGraph
+    if (!graph) return []
+
+    const { output } = await app.graphToPrompt(graph)
+    const { assets } = await api.getShareableAssets(output)
+
+    return includingPublic ? assets : assets.filter((asset) => !asset.public)
+  }
+
+  async function getSharedWorkflow(
+    shareId: string
+  ): Promise<SharedWorkflowPayload> {
+    let response: Response
+    try {
+      response = await api.fetchApi(
+        `/workflows/published/${encodeURIComponent(shareId)}`
+      )
+    } catch {
+      throw new SharedWorkflowLoadError(
+        null,
+        'Failed to load shared workflow: network error'
+      )
+    }
+
+    if (!response.ok) {
+      throw new SharedWorkflowLoadError(response.status)
+    }
+
+    const workflow = decodeSharedWorkflowPayload(await response.json())
+    if (!workflow) {
+      throw new Error('Failed to load shared workflow: invalid response')
+    }
+
+    const validated = await validateComfyWorkflow(workflow.workflowJson)
+    if (!validated) {
+      throw new Error('Failed to load shared workflow: invalid workflow data')
+    }
+    workflow.workflowJson = validated
+
+    return workflow
+  }
+
+  async function importPublishedAssets(assetIds: string[]): Promise<void> {
+    const response = await api.fetchApi('/assets/import', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ published_asset_ids: assetIds })
+    })
+
+    if (!response.ok) {
+      throw new Error(`Failed to import assets: ${response.status}`)
+    }
+  }
+
+  return {
+    publishWorkflow,
+    getPublishStatus,
+    getShareableAssets,
+    getSharedWorkflow,
+    importPublishedAssets
+  }
+}
diff --git a/src/platform/workflow/sharing/types/comfyHubTypes.ts b/src/platform/workflow/sharing/types/comfyHubTypes.ts
new file mode 100644
index 0000000000..f102324565
--- /dev/null
+++ b/src/platform/workflow/sharing/types/comfyHubTypes.ts
@@ -0,0 +1,26 @@
+export type ThumbnailType = 'image' | 'video' | 'imageComparison'
+
+export type ComfyHubWorkflowType =
+  | 'imageGeneration'
+  | 'videoGeneration'
+  | 'upscaling'
+  | 'editing'
+
+export interface ExampleImage {
+  id: string
+  url: string
+  file?: File
+}
+
+export interface ComfyHubPublishFormData {
+  name: string
+  description: string
+  workflowType: ComfyHubWorkflowType | ''
+  tags: string[]
+  thumbnailType: ThumbnailType
+  thumbnailFile: File | null
+  comparisonBeforeFile: File | null
+  comparisonAfterFile: File | null
+  exampleImages: ExampleImage[]
+  selectedExampleIds: string[]
+}
diff --git a/src/platform/workflow/sharing/types/shareTypes.ts b/src/platform/workflow/sharing/types/shareTypes.ts
new file mode 100644
index 0000000000..5dc0fb1781
--- /dev/null
+++ b/src/platform/workflow/sharing/types/shareTypes.ts
@@ -0,0 +1,27 @@
+import type { AssetInfo } from '@/schemas/apiSchema'
+import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
+
+export interface WorkflowPublishResult {
+  publishedAt: Date
+  shareId: string
+  shareUrl: string
+}
+
+export type WorkflowPublishStatus =
+  | { isPublished: false; publishedAt: null; shareId: null; shareUrl: null }
+  | {
+      isPublished: true
+      publishedAt: Date
+      shareId: string
+      shareUrl: string
+    }
+
+export interface SharedWorkflowPayload {
+  assets: AssetInfo[]
+  listed: boolean
+  name: string
+  publishedAt: Date | null
+  shareId: string
+  workflowId: string
+  workflowJson: ComfyWorkflowJSON
+}
diff --git a/src/platform/workflow/sharing/utils/validateFileSize.ts b/src/platform/workflow/sharing/utils/validateFileSize.ts
new file mode 100644
index 0000000000..14c4694e40
--- /dev/null
+++ b/src/platform/workflow/sharing/utils/validateFileSize.ts
@@ -0,0 +1,20 @@
+import { t } from '@/i18n'
+import { useToastStore } from '@/platform/updates/common/toastStore'
+
+export const MAX_IMAGE_SIZE_MB = 10
+export const MAX_VIDEO_SIZE_MB = 50
+
+export function isFileTooLarge(file: File, maxSizeMB: number): boolean {
+  const fileSizeMB = file.size / 1024 / 1024
+  if (fileSizeMB <= maxSizeMB) return false
+
+  useToastStore().add({
+    severity: 'error',
+    summary: t('g.error'),
+    detail: t('toastMessages.fileTooLarge', {
+      size: fileSizeMB.toFixed(1),
+      maxSize: maxSizeMB
+    })
+  })
+  return true
+}
diff --git a/tests-ui/tests/platform/workflow/templates/composables/useTemplateUrlLoader.test.ts b/src/platform/workflow/templates/composables/useTemplateUrlLoader.test.ts
similarity index 97%
rename from tests-ui/tests/platform/workflow/templates/composables/useTemplateUrlLoader.test.ts
rename to src/platform/workflow/templates/composables/useTemplateUrlLoader.test.ts
index 7cd9453f64..4da7999cd5 100644
--- a/tests-ui/tests/platform/workflow/templates/composables/useTemplateUrlLoader.test.ts
+++ b/src/platform/workflow/templates/composables/useTemplateUrlLoader.test.ts
@@ -18,7 +18,7 @@ const preservedQueryMocks = vi.hoisted(() => ({
 }))
 
 // Mock vue-router
-let mockQueryParams: Record<string, string | undefined> = {}
+let mockQueryParams: Record<string, string | string[] | undefined> = {}
 const mockRouterReplace = vi.fn()
 
 vi.mock('vue-router', () => ({
@@ -60,10 +60,10 @@ vi.mock('primevue/usetoast', () => ({
 // Mock i18n
 vi.mock('vue-i18n', () => ({
   useI18n: () => ({
-    t: vi.fn((key: string, params?: any) => {
+    t: vi.fn((key: string, params?: unknown) => {
       if (key === 'g.error') return 'Error'
       if (key === 'templateWorkflows.error.templateNotFound') {
-        return `Template "${params?.templateName}" not found`
+        return `Template "${(params as { templateName?: string })?.templateName}" not found`
       }
       if (key === 'g.errorLoadingTemplate') return 'Failed to load template'
       return key
@@ -152,7 +152,7 @@ describe('useTemplateUrlLoader', () => {
 
   it('handles array query params correctly', () => {
     // Vue Router can return string[] for duplicate params
-    mockQueryParams = { template: ['first', 'second'] as any }
+    mockQueryParams = { template: ['first', 'second'] }
 
     const { loadTemplateFromUrl } = useTemplateUrlLoader()
     void loadTemplateFromUrl()
@@ -333,7 +333,7 @@ describe('useTemplateUrlLoader', () => {
     // Vue Router can return string[] for duplicate params
     mockQueryParams = {
       template: 'flux_simple',
-      mode: ['linear', 'graph'] as any
+      mode: ['linear', 'graph']
     }
 
     const { loadTemplateFromUrl } = useTemplateUrlLoader()
diff --git a/tests-ui/tests/composables/useTemplateWorkflows.test.ts b/src/platform/workflow/templates/composables/useTemplateWorkflows.test.ts
similarity index 94%
rename from tests-ui/tests/composables/useTemplateWorkflows.test.ts
rename to src/platform/workflow/templates/composables/useTemplateWorkflows.test.ts
index 8a78b5a4dd..61c1d59851 100644
--- a/tests-ui/tests/composables/useTemplateWorkflows.test.ts
+++ b/src/platform/workflow/templates/composables/useTemplateWorkflows.test.ts
@@ -49,8 +49,10 @@ vi.mock('@/stores/dialogStore', () => ({
 // Mock fetch
 global.fetch = vi.fn()
 
+type MockWorkflowTemplatesStore = ReturnType<typeof useWorkflowTemplatesStore>
+
 describe('useTemplateWorkflows', () => {
-  let mockWorkflowTemplatesStore: any
+  let mockWorkflowTemplatesStore: MockWorkflowTemplatesStore
 
   beforeEach(() => {
     mockWorkflowTemplatesStore = {
@@ -70,7 +72,8 @@ describe('useTemplateWorkflows', () => {
                   mediaType: 'image',
                   mediaSubtype: 'jpg',
                   sourceModule: 'default',
-                  localizedTitle: 'Template 1'
+                  localizedTitle: 'Template 1',
+                  description: 'Template 1 description'
                 },
                 {
                   name: 'template2',
@@ -91,14 +94,15 @@ describe('useTemplateWorkflows', () => {
                   mediaType: 'image',
                   mediaSubtype: 'jpg',
                   localizedTitle: 'Template 1',
-                  localizedDescription: 'A default template'
+                  localizedDescription: 'A default template',
+                  description: 'Template 1 description'
                 }
               ]
             }
           ]
         }
       ]
-    }
+    } as Partial<MockWorkflowTemplatesStore> as MockWorkflowTemplatesStore
 
     vi.mocked(useWorkflowTemplatesStore).mockReturnValue(
       mockWorkflowTemplatesStore
@@ -107,7 +111,7 @@ describe('useTemplateWorkflows', () => {
     // Mock fetch response
     vi.mocked(fetch).mockResolvedValue({
       json: vi.fn().mockResolvedValue({ workflow: 'data' })
-    } as unknown as Response)
+    } as Partial<Response> as Response)
   })
 
   it('should load templates from store', async () => {
diff --git a/src/platform/workflow/templates/composables/useTemplateWorkflows.ts b/src/platform/workflow/templates/composables/useTemplateWorkflows.ts
index d3bea7fb9b..a5ee9c3b9b 100644
--- a/src/platform/workflow/templates/composables/useTemplateWorkflows.ts
+++ b/src/platform/workflow/templates/composables/useTemplateWorkflows.ts
@@ -121,28 +121,7 @@ export function useTemplateWorkflows() {
         if (!template || !template.sourceModule) return false
 
         // Use the stored source module for loading
-        const actualSourceModule = template.sourceModule
-        json = await fetchTemplateJson(id, actualSourceModule)
-
-        // Use source module for name
-        const workflowName =
-          actualSourceModule === 'default'
-            ? t(`templateWorkflows.template.${id}`, id)
-            : id
-
-        if (isCloud) {
-          useTelemetry()?.trackTemplate({
-            workflow_name: id,
-            template_source: actualSourceModule
-          })
-        }
-
-        dialogStore.closeDialog()
-        await app.loadGraphData(json, true, true, workflowName, {
-          openSource: 'template'
-        })
-
-        return true
+        sourceModule = template.sourceModule
       }
 
       // Regular case for normal categories
diff --git a/src/platform/workflow/templates/repositories/workflowTemplatesStore.ts b/src/platform/workflow/templates/repositories/workflowTemplatesStore.ts
index 9759c029da..c3219f8d03 100644
--- a/src/platform/workflow/templates/repositories/workflowTemplatesStore.ts
+++ b/src/platform/workflow/templates/repositories/workflowTemplatesStore.ts
@@ -1,14 +1,15 @@
-import Fuse from 'fuse.js'
 import { defineStore } from 'pinia'
-import { computed, ref, shallowRef } from 'vue'
+import { computed, ref, shallowRef, watch } from 'vue'
 
 import { i18n, st } from '@/i18n'
 import { isCloud } from '@/platform/distribution/types'
 import { api } from '@/scripts/api'
 import type { NavGroupData, NavItemData } from '@/types/navTypes'
-import { getCategoryIcon } from '@/utils/categoryIcons'
+import { generateCategoryId, getCategoryIcon } from '@/utils/categoryUtil'
 import { normalizeI18nKey } from '@/utils/formatUtil'
 
+import { zLogoIndex } from '../schemas/templateSchema'
+import type { LogoIndex } from '../schemas/templateSchema'
 import type {
   TemplateGroup,
   TemplateInfo,
@@ -32,6 +33,7 @@ export const useWorkflowTemplatesStore = defineStore(
     const customTemplates = shallowRef<{ [moduleName: string]: string[] }>({})
     const coreTemplates = shallowRef<WorkflowTemplates[]>([])
     const englishTemplates = shallowRef<WorkflowTemplates[]>([])
+    const logoIndex = shallowRef<LogoIndex>({})
     const isLoaded = ref(false)
     const knownTemplateNames = ref(new Set<string>())
 
@@ -250,24 +252,6 @@ export const useWorkflowTemplatesStore = defineStore(
       return filteredTemplates
     })
 
-    /**
-     * Fuse.js instance for advanced template searching and filtering
-     */
-    const templateFuse = computed(() => {
-      const fuseOptions = {
-        keys: [
-          { name: 'searchableText', weight: 0.4 },
-          { name: 'title', weight: 0.3 },
-          { name: 'name', weight: 0.2 },
-          { name: 'tags', weight: 0.1 }
-        ],
-        threshold: 0.3,
-        includeScore: true
-      }
-
-      return new Fuse(enhancedTemplates.value, fuseOptions)
-    })
-
     /**
      * Filter templates by category ID using stored filter mappings
      */
@@ -276,9 +260,18 @@ export const useWorkflowTemplatesStore = defineStore(
         return enhancedTemplates.value
       }
 
-      if (categoryId === 'basics') {
+      if (categoryId.startsWith('basics-')) {
         // Filter for templates from categories marked as essential
-        return enhancedTemplates.value.filter((t) => t.isEssential)
+        return enhancedTemplates.value.filter(
+          (t) =>
+            t.isEssential &&
+            t.category?.toLowerCase().replace(/\s+/g, '-') ===
+              categoryId.replace('basics-', '')
+        )
+      }
+
+      if (categoryId === 'popular') {
+        return enhancedTemplates.value
       }
 
       if (categoryId === 'partner-nodes') {
@@ -333,20 +326,34 @@ export const useWorkflowTemplatesStore = defineStore(
         icon: getCategoryIcon('all')
       })
 
-      // 2. Basics (isEssential categories) - always second if it exists
-      const essentialCat = coreTemplates.value.find(
+      // 1.5. Popular categories
+
+      items.push({
+        id: 'popular',
+        label: st('templateWorkflows.category.Popular', 'Popular'),
+        icon: 'icon-[lucide--flame]'
+      })
+
+      // 2. Basics (isEssential categories) - always beneath All Templates if they exist
+      const essentialCats = coreTemplates.value.filter(
         (cat) => cat.isEssential && cat.templates.length > 0
       )
 
-      if (essentialCat) {
-        const categoryTitle = essentialCat.title ?? 'Getting Started'
-        items.push({
-          id: 'basics',
-          label: st(
-            `templateWorkflows.category.${normalizeI18nKey(categoryTitle)}`,
-            categoryTitle
-          ),
-          icon: 'icon-[lucide--graduation-cap]'
+      if (essentialCats.length > 0) {
+        essentialCats.forEach((essentialCat) => {
+          const categoryIcon = essentialCat.icon
+          const categoryTitle = essentialCat.title ?? 'Getting Started'
+          const categoryId = generateCategoryId('basics', essentialCat.title)
+          items.push({
+            id: categoryId,
+            label: st(
+              `templateWorkflows.category.${normalizeI18nKey(categoryTitle)}`,
+              categoryTitle
+            ),
+            icon:
+              categoryIcon ||
+              getCategoryIcon(essentialCat.type || 'getting-started')
+          })
         })
       }
 
@@ -375,7 +382,7 @@ export const useWorkflowTemplatesStore = defineStore(
           const group = categoryGroups.get(categoryGroup)!
 
           // Generate unique ID for this category
-          const categoryId = `${categoryGroup.toLowerCase().replace(/\s+/g, '-')}-${category.title.toLowerCase().replace(/\s+/g, '-')}`
+          const categoryId = generateCategoryId(categoryGroup, category.title)
 
           // Store the filter mapping
           categoryFilters.value.set(categoryId, {
@@ -465,28 +472,32 @@ export const useWorkflowTemplatesStore = defineStore(
       return items
     })
 
+    async function fetchCoreTemplates() {
+      const locale = i18n.global.locale.value
+      const [coreResult, englishResult, logoIndexResult] = await Promise.all([
+        api.getCoreWorkflowTemplates(locale),
+        isCloud && locale !== 'en'
+          ? api.getCoreWorkflowTemplates('en')
+          : Promise.resolve([]),
+        fetchLogoIndex()
+      ])
+
+      coreTemplates.value = coreResult
+      englishTemplates.value = englishResult
+      logoIndex.value = logoIndexResult
+
+      const coreNames = coreTemplates.value.flatMap((category) =>
+        category.templates.map((template) => template.name)
+      )
+      const customNames = Object.values(customTemplates.value).flat()
+      knownTemplateNames.value = new Set([...coreNames, ...customNames])
+    }
+
     async function loadWorkflowTemplates() {
       try {
         if (!isLoaded.value) {
           customTemplates.value = await api.getWorkflowTemplates()
-          const locale = i18n.global.locale.value
-
-          const [coreResult, englishResult] = await Promise.all([
-            api.getCoreWorkflowTemplates(locale),
-            isCloud && locale !== 'en'
-              ? api.getCoreWorkflowTemplates('en')
-              : Promise.resolve([])
-          ])
-
-          coreTemplates.value = coreResult
-          englishTemplates.value = englishResult
-
-          const coreNames = coreTemplates.value.flatMap((category) =>
-            category.templates.map((template) => template.name)
-          )
-          const customNames = Object.values(customTemplates.value).flat()
-          knownTemplateNames.value = new Set([...coreNames, ...customNames])
-
+          await fetchCoreTemplates()
           isLoaded.value = true
         }
       } catch (error) {
@@ -494,6 +505,48 @@ export const useWorkflowTemplatesStore = defineStore(
       }
     }
 
+    watch(
+      () => i18n.global.locale.value,
+      async () => {
+        if (!isLoaded.value) return
+        try {
+          await fetchCoreTemplates()
+        } catch (error) {
+          console.error('Error reloading templates for new locale:', error)
+        }
+      }
+    )
+
+    async function fetchLogoIndex(): Promise<LogoIndex> {
+      try {
+        const response = await fetch(api.fileURL('/templates/index_logo.json'))
+        const contentType = response.headers.get('content-type')
+        if (!contentType?.includes('application/json')) return {}
+        const data = await response.json()
+        const result = zLogoIndex.safeParse(data)
+        return result.success ? result.data : {}
+      } catch {
+        return {}
+      }
+    }
+
+    function getLogoUrl(provider: string): string {
+      const logoPath = logoIndex.value[provider]
+      if (!logoPath) return ''
+
+      // Validate path to prevent directory traversal and ensure safe file extensions
+      const safePathPattern = /^[a-zA-Z0-9_\-./]+\.(png|jpg|jpeg|svg|webp)$/i
+      if (
+        !safePathPattern.test(logoPath) ||
+        logoPath.includes('..') ||
+        logoPath.startsWith('/')
+      ) {
+        return ''
+      }
+
+      return api.fileURL(`/templates/${logoPath}`)
+    }
+
     function getEnglishMetadata(templateName: string): {
       tags?: string[]
       category?: string
@@ -525,13 +578,13 @@ export const useWorkflowTemplatesStore = defineStore(
       groupedTemplates,
       navGroupedTemplates,
       enhancedTemplates,
-      templateFuse,
       filterTemplatesByCategory,
       isLoaded,
       loadWorkflowTemplates,
       knownTemplateNames,
       getTemplateByName,
-      getEnglishMetadata
+      getEnglishMetadata,
+      getLogoUrl
     }
   }
 )
diff --git a/src/platform/workflow/templates/schemas/templateSchema.ts b/src/platform/workflow/templates/schemas/templateSchema.ts
new file mode 100644
index 0000000000..148bd63571
--- /dev/null
+++ b/src/platform/workflow/templates/schemas/templateSchema.ts
@@ -0,0 +1,5 @@
+import { z } from 'zod'
+
+export const zLogoIndex = z.record(z.string(), z.string())
+
+export type LogoIndex = z.infer<typeof zLogoIndex>
diff --git a/src/platform/workflow/templates/types/template.ts b/src/platform/workflow/templates/types/template.ts
index 25a209e854..2d52a56298 100644
--- a/src/platform/workflow/templates/types/template.ts
+++ b/src/platform/workflow/templates/types/template.ts
@@ -1,3 +1,16 @@
+export interface LogoInfo {
+  /** Provider name(s) matching index_logo.json. String for single, array for stacked logos. */
+  provider: string | string[]
+  /** Custom label text. If omitted, defaults to provider names joined with " & " */
+  label?: string
+  /** Gap between stacked logos in pixels. Negative for overlap effect. Default: -6 */
+  gap?: number
+  /** Tailwind positioning classes */
+  position?: string
+  /** Opacity 0-1, default 0.85 */
+  opacity?: number
+}
+
 export interface TemplateInfo {
   name: string
   /**
@@ -32,6 +45,33 @@ export interface TemplateInfo {
    * Templates with this field will be hidden on local installations temporarily.
    */
   requiresCustomNodes?: string[]
+  /**
+   * Manual ranking boost/demotion for "Recommended" sort. Scale 1-10, default 5.
+   * Higher values promote the template, lower values demote it.
+   */
+  searchRank?: number
+  /**
+   * Usage score based on real world usage statistics.
+   * Used for popular templates sort and for "Recommended" sort boost.
+   */
+  usage?: number
+  /**
+   * Manage template's visibility across different distributions by specifying which distributions it should be included on.
+   * If not specified, the template will be included on all distributions.
+   */
+  includeOnDistributions?: TemplateIncludeOnDistributionEnum[]
+  /**
+   * Logo overlays to display on the template thumbnail.
+   */
+  logos?: LogoInfo[]
+}
+
+export enum TemplateIncludeOnDistributionEnum {
+  Cloud = 'cloud',
+  Local = 'local',
+  Desktop = 'desktop',
+  Mac = 'mac',
+  Windows = 'windows'
 }
 
 export interface WorkflowTemplates {
diff --git a/src/platform/workflow/utils/workflowExtractionUtil.ts b/src/platform/workflow/utils/workflowExtractionUtil.ts
index 88a17af5de..f016c655be 100644
--- a/src/platform/workflow/utils/workflowExtractionUtil.ts
+++ b/src/platform/workflow/utils/workflowExtractionUtil.ts
@@ -8,17 +8,18 @@ import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
 import { getOutputAssetMetadata } from '@/platform/assets/schemas/assetMetadataSchema'
 import { getAssetUrl } from '@/platform/assets/utils/assetUrlUtil'
 import { getWorkflowDataFromFile } from '@/scripts/metadata/parser'
+import { getJobWorkflow } from '@/services/jobOutputCache'
 
 /**
- * Extract workflow from AssetItem (async - may need file fetch)
- * Tries metadata first (for output assets), then falls back to extracting from file
- * This supports both output assets (with embedded metadata) and input assets (PNG with workflow)
+ * Extract workflow from AssetItem using jobs API
+ * For output assets: uses jobs API (getJobWorkflow)
+ * For input assets: extracts from file metadata
  *
  * @param asset The asset item to extract workflow from
  * @returns WorkflowSource with workflow and generated filename
  *
  * @example
- * const asset = { name: 'output.png', user_metadata: { workflow: {...} } }
+ * const asset = { name: 'output.png', user_metadata: { jobId: '123' } }
  * const { workflow, filename } = await extractWorkflowFromAsset(asset)
  */
 export async function extractWorkflowFromAsset(asset: AssetItem): Promise<{
@@ -27,17 +28,14 @@ export async function extractWorkflowFromAsset(asset: AssetItem): Promise<{
 }> {
   const baseFilename = asset.name.replace(/\.[^/.]+$/, '.json')
 
-  // Strategy 1: Try metadata first (for output assets)
+  // For output assets: use jobs API (with caching and validation)
   const metadata = getOutputAssetMetadata(asset.user_metadata)
-  if (metadata?.workflow) {
-    return {
-      workflow: metadata.workflow as ComfyWorkflowJSON,
-      filename: baseFilename
-    }
+  if (metadata?.jobId) {
+    const workflow = await getJobWorkflow(metadata.jobId)
+    return { workflow: workflow ?? null, filename: baseFilename }
   }
 
-  // Strategy 2: Try extracting from file (for input assets with embedded workflow)
-  // This supports PNG, WEBP, FLAC, and other formats with metadata
+  // For input assets: extract from file metadata (PNG/WEBP/FLAC with embedded workflow)
   try {
     const fileUrl = getAssetUrl(asset)
     const response = await fetch(fileUrl)
diff --git a/src/platform/workflow/validation/composables/useWorkflowValidation.ts b/src/platform/workflow/validation/composables/useWorkflowValidation.ts
index c6d7c70ca6..064972dc6b 100644
--- a/src/platform/workflow/validation/composables/useWorkflowValidation.ts
+++ b/src/platform/workflow/validation/composables/useWorkflowValidation.ts
@@ -20,18 +20,15 @@ export function useWorkflowValidation() {
     // Collect all logs in an array
     const logs: string[] = []
     // Then validate and fix links if schema validation passed
-    const linkValidation = fixBadLinks(
-      graphData as unknown as ISerialisedGraph,
-      {
-        fix: true,
-        silent,
-        logger: {
-          log: (message: string) => {
-            logs.push(message)
-          }
+    const linkValidation = fixBadLinks(graphData as ISerialisedGraph, {
+      fix: true,
+      silent,
+      logger: {
+        log: (...args: unknown[]) => {
+          logs.push(args.join(' '))
         }
       }
-    )
+    })
 
     if (!silent && logs.length > 0) {
       toastStore.add({
@@ -52,7 +49,7 @@ export function useWorkflowValidation() {
       }
     }
 
-    return linkValidation.graph as unknown as ComfyWorkflowJSON
+    return linkValidation.graph
   }
 
   /**
@@ -80,7 +77,9 @@ export function useWorkflowValidation() {
 
     if (validatedGraphData) {
       try {
-        validatedData = tryFixLinks(validatedGraphData, { silent })
+        validatedData = tryFixLinks(validatedGraphData, {
+          silent
+        }) as ComfyWorkflowJSON
       } catch (err) {
         // Link fixer itself is throwing an error
         console.error(err)
diff --git a/tests-ui/workflows/default_workflow.json b/src/platform/workflow/validation/schemas/__fixtures__/default_workflow.json
similarity index 71%
rename from tests-ui/workflows/default_workflow.json
rename to src/platform/workflow/validation/schemas/__fixtures__/default_workflow.json
index 478894e5a3..b121b6295b 100644
--- a/tests-ui/workflows/default_workflow.json
+++ b/src/platform/workflow/validation/schemas/__fixtures__/default_workflow.json
@@ -5,10 +5,7 @@
     {
       "id": 7,
       "type": "CLIPTextEncode",
-      "pos": [
-        413,
-        389
-      ],
+      "pos": [413, 389],
       "size": {
         "0": 425.27801513671875,
         "1": 180.6060791015625
@@ -27,26 +24,19 @@
         {
           "name": "CONDITIONING",
           "type": "CONDITIONING",
-          "links": [
-            6
-          ],
+          "links": [6],
           "slot_index": 0
         }
       ],
       "properties": {
         "Node name for S&R": "CLIPTextEncode"
       },
-      "widgets_values": [
-        "text, watermark"
-      ]
+      "widgets_values": ["text, watermark"]
     },
     {
       "id": 6,
       "type": "CLIPTextEncode",
-      "pos": [
-        415,
-        186
-      ],
+      "pos": [415, 186],
       "size": {
         "0": 422.84503173828125,
         "1": 164.31304931640625
@@ -65,9 +55,7 @@
         {
           "name": "CONDITIONING",
           "type": "CONDITIONING",
-          "links": [
-            4
-          ],
+          "links": [4],
           "slot_index": 0
         }
       ],
@@ -81,10 +69,7 @@
     {
       "id": 5,
       "type": "EmptyLatentImage",
-      "pos": [
-        473,
-        609
-      ],
+      "pos": [473, 609],
       "size": {
         "0": 315,
         "1": 106
@@ -96,28 +81,19 @@
         {
           "name": "LATENT",
           "type": "LATENT",
-          "links": [
-            2
-          ],
+          "links": [2],
           "slot_index": 0
         }
       ],
       "properties": {
         "Node name for S&R": "EmptyLatentImage"
       },
-      "widgets_values": [
-        512,
-        512,
-        1
-      ]
+      "widgets_values": [512, 512, 1]
     },
     {
       "id": 3,
       "type": "KSampler",
-      "pos": [
-        863,
-        186
-      ],
+      "pos": [863, 186],
       "size": {
         "0": 315,
         "1": 262
@@ -151,9 +127,7 @@
         {
           "name": "LATENT",
           "type": "LATENT",
-          "links": [
-            7
-          ],
+          "links": [7],
           "slot_index": 0
         }
       ],
@@ -173,10 +147,7 @@
     {
       "id": 8,
       "type": "VAEDecode",
-      "pos": [
-        1209,
-        188
-      ],
+      "pos": [1209, 188],
       "size": {
         "0": 210,
         "1": 46
@@ -200,9 +171,7 @@
         {
           "name": "IMAGE",
           "type": "IMAGE",
-          "links": [
-            9
-          ],
+          "links": [9],
           "slot_index": 0
         }
       ],
@@ -213,10 +182,7 @@
     {
       "id": 9,
       "type": "SaveImage",
-      "pos": [
-        1451,
-        189
-      ],
+      "pos": [1451, 189],
       "size": {
         "0": 210,
         "1": 58
@@ -234,17 +200,12 @@
       "properties": {
         "Node name for S&R": "SaveImage"
       },
-      "widgets_values": [
-        "ComfyUI"
-      ]
+      "widgets_values": ["ComfyUI"]
     },
     {
       "id": 4,
       "type": "CheckpointLoaderSimple",
-      "pos": [
-        26,
-        474
-      ],
+      "pos": [26, 474],
       "size": {
         "0": 315,
         "1": 98
@@ -256,120 +217,45 @@
         {
           "name": "MODEL",
           "type": "MODEL",
-          "links": [
-            1
-          ],
+          "links": [1],
           "slot_index": 0
         },
         {
           "name": "CLIP",
           "type": "CLIP",
-          "links": [
-            3,
-            5
-          ],
+          "links": [3, 5],
           "slot_index": 1
         },
         {
           "name": "VAE",
           "type": "VAE",
-          "links": [
-            8
-          ],
+          "links": [8],
           "slot_index": 2
         }
       ],
       "properties": {
         "Node name for S&R": "CheckpointLoaderSimple"
       },
-      "widgets_values": [
-        "3Guofeng3_v32Light.safetensors"
-      ]
+      "widgets_values": ["3Guofeng3_v32Light.safetensors"]
     }
   ],
   "links": [
-    [
-      1,
-      4,
-      0,
-      3,
-      0,
-      "MODEL"
-    ],
-    [
-      2,
-      5,
-      0,
-      3,
-      3,
-      "LATENT"
-    ],
-    [
-      3,
-      4,
-      1,
-      6,
-      0,
-      "CLIP"
-    ],
-    [
-      4,
-      6,
-      0,
-      3,
-      1,
-      "CONDITIONING"
-    ],
-    [
-      5,
-      4,
-      1,
-      7,
-      0,
-      "CLIP"
-    ],
-    [
-      6,
-      7,
-      0,
-      3,
-      2,
-      "CONDITIONING"
-    ],
-    [
-      7,
-      3,
-      0,
-      8,
-      0,
-      "LATENT"
-    ],
-    [
-      8,
-      4,
-      2,
-      8,
-      1,
-      "VAE"
-    ],
-    [
-      9,
-      8,
-      0,
-      9,
-      0,
-      "IMAGE"
-    ]
+    [1, 4, 0, 3, 0, "MODEL"],
+    [2, 5, 0, 3, 3, "LATENT"],
+    [3, 4, 1, 6, 0, "CLIP"],
+    [4, 6, 0, 3, 1, "CONDITIONING"],
+    [5, 4, 1, 7, 0, "CLIP"],
+    [6, 7, 0, 3, 2, "CONDITIONING"],
+    [7, 3, 0, 8, 0, "LATENT"],
+    [8, 4, 2, 8, 1, "VAE"],
+    [9, 8, 0, 9, 0, "IMAGE"]
   ],
   "groups": [],
   "config": {},
   "extra": {
     "ds": {
       "scale": 0.8264462809917354,
-      "offset": [
-        565.6800000000005,
-        -43.919999999999995
-      ]
+      "offset": [565.6800000000005, -43.919999999999995]
     }
   },
   "version": 0.4
diff --git a/tests-ui/workflows/workflow_disconnected.json b/src/platform/workflow/validation/schemas/__fixtures__/workflow_disconnected.json
similarity index 73%
rename from tests-ui/workflows/workflow_disconnected.json
rename to src/platform/workflow/validation/schemas/__fixtures__/workflow_disconnected.json
index ec5dd76a84..ab45e8965a 100644
--- a/tests-ui/workflows/workflow_disconnected.json
+++ b/src/platform/workflow/validation/schemas/__fixtures__/workflow_disconnected.json
@@ -5,10 +5,7 @@
     {
       "id": 7,
       "type": "CLIPTextEncode",
-      "pos": [
-        413,
-        389
-      ],
+      "pos": [413, 389],
       "size": {
         "0": 425.27801513671875,
         "1": 180.6060791015625
@@ -34,17 +31,12 @@
       "properties": {
         "Node name for S&R": "CLIPTextEncode"
       },
-      "widgets_values": [
-        "text, watermark"
-      ]
+      "widgets_values": ["text, watermark"]
     },
     {
       "id": 6,
       "type": "CLIPTextEncode",
-      "pos": [
-        406.3210576748693,
-        165.8590597338342
-      ],
+      "pos": [406.3210576748693, 165.8590597338342],
       "size": {
         "0": 422.84503173828125,
         "1": 164.31304931640625
@@ -63,9 +55,7 @@
         {
           "name": "CONDITIONING",
           "type": "CONDITIONING",
-          "links": [
-            4
-          ],
+          "links": [4],
           "slot_index": 0
         }
       ],
@@ -79,10 +69,7 @@
     {
       "id": 5,
       "type": "EmptyLatentImage",
-      "pos": [
-        473,
-        609
-      ],
+      "pos": [473, 609],
       "size": {
         "0": 315,
         "1": 106
@@ -94,28 +81,19 @@
         {
           "name": "LATENT",
           "type": "LATENT",
-          "links": [
-            2
-          ],
+          "links": [2],
           "slot_index": 0
         }
       ],
       "properties": {
         "Node name for S&R": "EmptyLatentImage"
       },
-      "widgets_values": [
-        512,
-        512,
-        1
-      ]
+      "widgets_values": [512, 512, 1]
     },
     {
       "id": 9,
       "type": "SaveImage",
-      "pos": [
-        1451,
-        189
-      ],
+      "pos": [1451, 189],
       "size": {
         "0": 210,
         "1": 58
@@ -133,17 +111,12 @@
       "properties": {
         "Node name for S&R": "SaveImage"
       },
-      "widgets_values": [
-        "ComfyUI"
-      ]
+      "widgets_values": ["ComfyUI"]
     },
     {
       "id": 4,
       "type": "CheckpointLoaderSimple",
-      "pos": [
-        26,
-        474
-      ],
+      "pos": [26, 474],
       "size": {
         "0": 315,
         "1": 98
@@ -155,43 +128,31 @@
         {
           "name": "MODEL",
           "type": "MODEL",
-          "links": [
-            1
-          ],
+          "links": [1],
           "slot_index": 0
         },
         {
           "name": "CLIP",
           "type": "CLIP",
-          "links": [
-            3,
-            5
-          ],
+          "links": [3, 5],
           "slot_index": 1
         },
         {
           "name": "VAE",
           "type": "VAE",
-          "links": [
-            8
-          ],
+          "links": [8],
           "slot_index": 2
         }
       ],
       "properties": {
         "Node name for S&R": "CheckpointLoaderSimple"
       },
-      "widgets_values": [
-        "3Guofeng3_v32Light.safetensors"
-      ]
+      "widgets_values": ["3Guofeng3_v32Light.safetensors"]
     },
     {
       "id": 3,
       "type": "KSampler",
-      "pos": [
-        863,
-        186
-      ],
+      "pos": [863, 186],
       "size": {
         "0": 315,
         "1": 262
@@ -245,10 +206,7 @@
     {
       "id": 8,
       "type": "VAEDecode",
-      "pos": [
-        1209,
-        188
-      ],
+      "pos": [1209, 188],
       "size": {
         "0": 210,
         "1": 46
@@ -272,9 +230,7 @@
         {
           "name": "IMAGE",
           "type": "IMAGE",
-          "links": [
-            9
-          ],
+          "links": [9],
           "slot_index": 0
         }
       ],
@@ -284,72 +240,18 @@
     }
   ],
   "links": [
-    [
-      1,
-      4,
-      0,
-      3,
-      0,
-      "MODEL"
-    ],
-    [
-      2,
-      5,
-      0,
-      3,
-      3,
-      "LATENT"
-    ],
-    [
-      3,
-      4,
-      1,
-      6,
-      0,
-      "CLIP"
-    ],
-    [
-      4,
-      6,
-      0,
-      3,
-      1,
-      "CONDITIONING"
-    ],
-    [
-      5,
-      4,
-      1,
-      7,
-      0,
-      "CLIP"
-    ],
-    [
-      8,
-      4,
-      2,
-      8,
-      1,
-      "VAE"
-    ],
-    [
-      9,
-      8,
-      0,
-      9,
-      0,
-      "IMAGE"
-    ]
+    [1, 4, 0, 3, 0, "MODEL"],
+    [2, 5, 0, 3, 3, "LATENT"],
+    [3, 4, 1, 6, 0, "CLIP"],
+    [4, 6, 0, 3, 1, "CONDITIONING"],
+    [5, 4, 1, 7, 0, "CLIP"],
+    [8, 4, 2, 8, 1, "VAE"],
+    [9, 8, 0, 9, 0, "IMAGE"]
   ],
   "groups": [
     {
       "title": "Group",
-      "bounding": [
-        489,
-        95,
-        140,
-        80
-      ],
+      "bounding": [489, 95, 140, 80],
       "color": "#3f789e",
       "font_size": 24,
       "locked": false
@@ -359,11 +261,8 @@
   "extra": {
     "ds": {
       "scale": 1.3513057093104008,
-      "offset": [
-        127.07026983402625,
-        138.77779138162384
-      ]
+      "offset": [127.07026983402625, 138.77779138162384]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/tests-ui/workflows/workflow_with_group.json b/src/platform/workflow/validation/schemas/__fixtures__/workflow_with_group.json
similarity index 70%
rename from tests-ui/workflows/workflow_with_group.json
rename to src/platform/workflow/validation/schemas/__fixtures__/workflow_with_group.json
index aeb30df8cd..fc420ba74f 100644
--- a/tests-ui/workflows/workflow_with_group.json
+++ b/src/platform/workflow/validation/schemas/__fixtures__/workflow_with_group.json
@@ -5,10 +5,7 @@
     {
       "id": 7,
       "type": "CLIPTextEncode",
-      "pos": [
-        413,
-        389
-      ],
+      "pos": [413, 389],
       "size": {
         "0": 425.27801513671875,
         "1": 180.6060791015625
@@ -27,26 +24,19 @@
         {
           "name": "CONDITIONING",
           "type": "CONDITIONING",
-          "links": [
-            6
-          ],
+          "links": [6],
           "slot_index": 0
         }
       ],
       "properties": {
         "Node name for S&R": "CLIPTextEncode"
       },
-      "widgets_values": [
-        "text, watermark"
-      ]
+      "widgets_values": ["text, watermark"]
     },
     {
       "id": 6,
       "type": "CLIPTextEncode",
-      "pos": [
-        406.3210576748693,
-        165.8590597338342
-      ],
+      "pos": [406.3210576748693, 165.8590597338342],
       "size": {
         "0": 422.84503173828125,
         "1": 164.31304931640625
@@ -65,9 +55,7 @@
         {
           "name": "CONDITIONING",
           "type": "CONDITIONING",
-          "links": [
-            4
-          ],
+          "links": [4],
           "slot_index": 0
         }
       ],
@@ -81,10 +69,7 @@
     {
       "id": 5,
       "type": "EmptyLatentImage",
-      "pos": [
-        473,
-        609
-      ],
+      "pos": [473, 609],
       "size": {
         "0": 315,
         "1": 106
@@ -96,28 +81,19 @@
         {
           "name": "LATENT",
           "type": "LATENT",
-          "links": [
-            2
-          ],
+          "links": [2],
           "slot_index": 0
         }
       ],
       "properties": {
         "Node name for S&R": "EmptyLatentImage"
       },
-      "widgets_values": [
-        512,
-        512,
-        1
-      ]
+      "widgets_values": [512, 512, 1]
     },
     {
       "id": 3,
       "type": "KSampler",
-      "pos": [
-        863,
-        186
-      ],
+      "pos": [863, 186],
       "size": {
         "0": 315,
         "1": 262
@@ -151,9 +127,7 @@
         {
           "name": "LATENT",
           "type": "LATENT",
-          "links": [
-            7
-          ],
+          "links": [7],
           "slot_index": 0
         }
       ],
@@ -173,10 +147,7 @@
     {
       "id": 8,
       "type": "VAEDecode",
-      "pos": [
-        1209,
-        188
-      ],
+      "pos": [1209, 188],
       "size": {
         "0": 210,
         "1": 46
@@ -200,9 +171,7 @@
         {
           "name": "IMAGE",
           "type": "IMAGE",
-          "links": [
-            9
-          ],
+          "links": [9],
           "slot_index": 0
         }
       ],
@@ -213,10 +182,7 @@
     {
       "id": 9,
       "type": "SaveImage",
-      "pos": [
-        1451,
-        189
-      ],
+      "pos": [1451, 189],
       "size": {
         "0": 210,
         "1": 58
@@ -234,17 +200,12 @@
       "properties": {
         "Node name for S&R": "SaveImage"
       },
-      "widgets_values": [
-        "ComfyUI"
-      ]
+      "widgets_values": ["ComfyUI"]
     },
     {
       "id": 4,
       "type": "CheckpointLoaderSimple",
-      "pos": [
-        26,
-        474
-      ],
+      "pos": [26, 474],
       "size": {
         "0": 315,
         "1": 98
@@ -256,120 +217,43 @@
         {
           "name": "MODEL",
           "type": "MODEL",
-          "links": [
-            1
-          ],
+          "links": [1],
           "slot_index": 0
         },
         {
           "name": "CLIP",
           "type": "CLIP",
-          "links": [
-            3,
-            5
-          ],
+          "links": [3, 5],
           "slot_index": 1
         },
         {
           "name": "VAE",
           "type": "VAE",
-          "links": [
-            8
-          ],
+          "links": [8],
           "slot_index": 2
         }
       ],
       "properties": {
         "Node name for S&R": "CheckpointLoaderSimple"
       },
-      "widgets_values": [
-        "3Guofeng3_v32Light.safetensors"
-      ]
+      "widgets_values": ["3Guofeng3_v32Light.safetensors"]
     }
   ],
   "links": [
-    [
-      1,
-      4,
-      0,
-      3,
-      0,
-      "MODEL"
-    ],
-    [
-      2,
-      5,
-      0,
-      3,
-      3,
-      "LATENT"
-    ],
-    [
-      3,
-      4,
-      1,
-      6,
-      0,
-      "CLIP"
-    ],
-    [
-      4,
-      6,
-      0,
-      3,
-      1,
-      "CONDITIONING"
-    ],
-    [
-      5,
-      4,
-      1,
-      7,
-      0,
-      "CLIP"
-    ],
-    [
-      6,
-      7,
-      0,
-      3,
-      2,
-      "CONDITIONING"
-    ],
-    [
-      7,
-      3,
-      0,
-      8,
-      0,
-      "LATENT"
-    ],
-    [
-      8,
-      4,
-      2,
-      8,
-      1,
-      "VAE"
-    ],
-    [
-      9,
-      8,
-      0,
-      9,
-      0,
-      "IMAGE"
-    ]
+    [1, 4, 0, 3, 0, "MODEL"],
+    [2, 5, 0, 3, 3, "LATENT"],
+    [3, 4, 1, 6, 0, "CLIP"],
+    [4, 6, 0, 3, 1, "CONDITIONING"],
+    [5, 4, 1, 7, 0, "CLIP"],
+    [6, 7, 0, 3, 2, "CONDITIONING"],
+    [7, 3, 0, 8, 0, "LATENT"],
+    [8, 4, 2, 8, 1, "VAE"],
+    [9, 8, 0, 9, 0, "IMAGE"]
   ],
   "groups": [
     {
       "title": "Group",
-      "bounding": [
-        489,
-        95,
-        140,
-        80
-      ],
+      "bounding": [489, 95, 140, 80],
       "color": "#3f789e",
       "font_size": 24,
       "locked": false
@@ -379,11 +263,8 @@
   "extra": {
     "ds": {
       "scale": 1.11678157794248,
-      "offset": [
-        323.87991710157155,
-        235.75066665118254
-      ]
+      "offset": [323.87991710157155, 235.75066665118254]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/tests-ui/tests/comfyWorkflow.test.ts b/src/platform/workflow/validation/schemas/workflowSchema.test.ts
similarity index 74%
rename from tests-ui/tests/comfyWorkflow.test.ts
rename to src/platform/workflow/validation/schemas/workflowSchema.test.ts
index cc10186960..1d687455c5 100644
--- a/tests-ui/tests/comfyWorkflow.test.ts
+++ b/src/platform/workflow/validation/schemas/workflowSchema.test.ts
@@ -1,10 +1,14 @@
 import fs from 'fs'
 import { describe, expect, it } from 'vitest'
 
-import { validateComfyWorkflow } from '@/platform/workflow/validation/schemas/workflowSchema'
+import {
+  buildSubgraphExecutionPaths,
+  validateComfyWorkflow
+} from '@/platform/workflow/validation/schemas/workflowSchema'
+import type { ComfyNode } from '@/platform/workflow/validation/schemas/workflowSchema'
 import { defaultGraph } from '@/scripts/defaultGraph'
 
-const WORKFLOW_DIR = 'tests-ui/workflows'
+const WORKFLOW_DIR = 'src/platform/workflow/validation/schemas/__fixtures__'
 
 describe('parseComfyWorkflow', () => {
   it('parses valid workflow', async () => {
@@ -206,3 +210,67 @@ describe('parseComfyWorkflow', () => {
     })
   })
 })
+
+function node(id: number, type: string): ComfyNode {
+  return { id, type } as ComfyNode
+}
+
+function subgraphDef(id: string, nodes: ComfyNode[]) {
+  return { id, name: id, nodes, inputNode: {}, outputNode: {} }
+}
+
+describe('buildSubgraphExecutionPaths', () => {
+  it('returns empty map when there are no subgraph definitions', () => {
+    expect(buildSubgraphExecutionPaths([node(5, 'SomeNode')], [])).toEqual(
+      new Map()
+    )
+  })
+
+  it('returns empty map when no root node matches a subgraph type', () => {
+    const def = subgraphDef('def-A', [])
+    expect(
+      buildSubgraphExecutionPaths([node(5, 'UnrelatedNode')], [def])
+    ).toEqual(new Map())
+  })
+
+  it('maps a single subgraph instance to its execution path', () => {
+    const def = subgraphDef('def-A', [])
+    const result = buildSubgraphExecutionPaths([node(5, 'def-A')], [def])
+    expect(result.get('def-A')).toEqual(['5'])
+  })
+
+  it('collects multiple instances of the same subgraph type', () => {
+    const def = subgraphDef('def-A', [])
+    const result = buildSubgraphExecutionPaths(
+      [node(5, 'def-A'), node(10, 'def-A')],
+      [def]
+    )
+    expect(result.get('def-A')).toEqual(['5', '10'])
+  })
+
+  it('builds nested execution paths for subgraphs within subgraphs', () => {
+    const innerDef = subgraphDef('def-B', [])
+    const outerDef = subgraphDef('def-A', [node(70, 'def-B')])
+    const result = buildSubgraphExecutionPaths(
+      [node(5, 'def-A')],
+      [outerDef, innerDef]
+    )
+    expect(result.get('def-A')).toEqual(['5'])
+    expect(result.get('def-B')).toEqual(['5:70'])
+  })
+
+  it('does not recurse infinitely on self-referential subgraph definitions', () => {
+    const cyclicDef = subgraphDef('def-A', [node(70, 'def-A')])
+    expect(() =>
+      buildSubgraphExecutionPaths([node(5, 'def-A')], [cyclicDef])
+    ).not.toThrow()
+  })
+
+  it('does not recurse infinitely on mutually cyclic subgraph definitions', () => {
+    const defA = subgraphDef('def-A', [node(70, 'def-B')])
+    const defB = subgraphDef('def-B', [node(80, 'def-A')])
+    expect(() =>
+      buildSubgraphExecutionPaths([node(5, 'def-A')], [defA, defB])
+    ).not.toThrow()
+  })
+})
diff --git a/src/platform/workflow/validation/schemas/workflowSchema.ts b/src/platform/workflow/validation/schemas/workflowSchema.ts
index 558ef819db..20b32bb00b 100644
--- a/src/platform/workflow/validation/schemas/workflowSchema.ts
+++ b/src/platform/workflow/validation/schemas/workflowSchema.ts
@@ -275,7 +275,15 @@ const zExtra = z
     frontendVersion: z.string().optional(),
     linkExtensions: z.array(zComfyLinkExtension).optional(),
     reroutes: z.array(zReroute).optional(),
-    workflowRendererVersion: zRendererType.optional()
+    workflowRendererVersion: zRendererType.optional(),
+    BlueprintDescription: z.string().optional(),
+    BlueprintSearchAliases: z.array(z.string()).optional(),
+    linearData: z
+      .object({
+        inputs: z.array(z.tuple([zNodeId, z.string()])).optional(),
+        outputs: z.array(zNodeId).optional()
+      })
+      .optional()
   })
   .passthrough()
 
@@ -394,6 +402,14 @@ interface SubgraphDefinitionBase<
   id: string
   revision: number
   name: string
+  /** Optional description shown as tooltip when hovering over the subgraph node. */
+  description?: string
+  category?: string
+  essentials_category?: string
+  /** Custom metadata for the subgraph (description, searchAliases, etc.) */
+  extra?: T extends ComfyWorkflow1BaseInput
+    ? z.input<typeof zExtra> | null
+    : z.output<typeof zExtra> | null
 
   inputNode: T extends ComfyWorkflow1BaseInput
     ? z.input<typeof zExportedSubgraphIONode>
@@ -425,6 +441,10 @@ const zSubgraphDefinition = zComfyWorkflow1
     id: z.string().uuid(),
     revision: z.number(),
     name: z.string(),
+    /** Optional description shown as tooltip when hovering over the subgraph node. */
+    description: z.string().optional(),
+    category: z.string().optional(),
+    essentials_category: z.string().optional(),
     inputNode: zExportedSubgraphIONode,
     outputNode: zExportedSubgraphIONode,
 
@@ -452,7 +472,6 @@ const zSubgraphDefinition = zComfyWorkflow1
   .passthrough()
 
 export type ModelFile = z.infer<typeof zModelFile>
-export type ComfyLink = z.infer<typeof zComfyLink>
 export type ComfyLinkObject = z.infer<typeof zComfyLinkObject>
 export type ComfyNode = z.infer<typeof zComfyNode>
 export type Reroute = z.infer<typeof zReroute>
@@ -530,3 +549,46 @@ const zNodeData = z.object({
 
 const zComfyApiWorkflow = z.record(zNodeId, zNodeData)
 export type ComfyApiWorkflow = z.infer<typeof zComfyApiWorkflow>
+
+/**
+ * Builds a map from subgraph definition ID to all execution path prefixes
+ * where that definition is instantiated in the workflow.
+ *
+ * "def-A" → ["5", "10"] for each container node instantiating that subgraph definition.
+ */
+export function buildSubgraphExecutionPaths(
+  rootNodes: ComfyNode[],
+  allSubgraphDefs: unknown[]
+): Map<string, string[]> {
+  const subgraphDefMap = new Map(
+    allSubgraphDefs.filter(isSubgraphDefinition).map((s) => [s.id, s])
+  )
+  const pathMap = new Map<string, string[]>()
+  const visited = new Set<string>()
+
+  const build = (nodes: ComfyNode[], parentPrefix: string) => {
+    for (const n of nodes ?? []) {
+      if (typeof n.type !== 'string' || !subgraphDefMap.has(n.type)) continue
+      const path = parentPrefix ? `${parentPrefix}:${n.id}` : String(n.id)
+      const existing = pathMap.get(n.type)
+      if (existing) {
+        existing.push(path)
+      } else {
+        pathMap.set(n.type, [path])
+      }
+
+      if (visited.has(n.type)) continue
+      visited.add(n.type)
+
+      const innerDef = subgraphDefMap.get(n.type)
+      if (innerDef) {
+        build(innerDef.nodes, path)
+      }
+
+      visited.delete(n.type)
+    }
+  }
+
+  build(rootNodes, '')
+  return pathMap
+}
diff --git a/src/platform/workspace/api/workspaceApi.ts b/src/platform/workspace/api/workspaceApi.ts
new file mode 100644
index 0000000000..a69fc107da
--- /dev/null
+++ b/src/platform/workspace/api/workspaceApi.ts
@@ -0,0 +1,731 @@
+import axios from 'axios'
+
+import { t } from '@/i18n'
+import { api } from '@/scripts/api'
+import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
+
+export type WorkspaceType = 'personal' | 'team'
+export type WorkspaceRole = 'owner' | 'member'
+
+interface Workspace {
+  id: string
+  name: string
+  type: WorkspaceType
+  created_at: string
+  joined_at: string
+}
+
+export interface WorkspaceWithRole extends Workspace {
+  role: WorkspaceRole
+  subscription_tier?: SubscriptionTier
+}
+
+export interface Member {
+  id: string
+  name: string
+  email: string
+  joined_at: string
+  role: WorkspaceRole
+}
+
+interface PaginationInfo {
+  offset: number
+  limit: number
+  total: number
+}
+
+interface ListMembersResponse {
+  members: Member[]
+  pagination: PaginationInfo
+}
+
+export interface ListMembersParams {
+  offset?: number
+  limit?: number
+}
+
+export interface PendingInvite {
+  id: string
+  email: string
+  token: string
+  invited_at: string
+  expires_at: string
+}
+
+interface ListInvitesResponse {
+  invites: PendingInvite[]
+}
+
+interface CreateInviteRequest {
+  email: string
+}
+
+interface AcceptInviteResponse {
+  workspace_id: string
+  workspace_name: string
+}
+
+interface CreateWorkspacePayload {
+  name: string
+}
+
+interface UpdateWorkspacePayload {
+  name: string
+}
+
+interface ListWorkspacesResponse {
+  workspaces: WorkspaceWithRole[]
+}
+
+export type SubscriptionTier =
+  | 'FREE'
+  | 'STANDARD'
+  | 'CREATOR'
+  | 'PRO'
+  | 'FOUNDERS_EDITION'
+export type SubscriptionDuration = 'MONTHLY' | 'ANNUAL'
+type PlanAvailabilityReason =
+  | 'same_plan'
+  | 'incompatible_transition'
+  | 'requires_team'
+  | 'requires_personal'
+  | 'exceeds_max_seats'
+
+interface PlanAvailability {
+  available: boolean
+  reason?: PlanAvailabilityReason
+}
+
+interface PlanSeatSummary {
+  seat_count: number
+  total_cost_cents: number
+  total_credits_cents: number
+}
+
+export interface Plan {
+  slug: string
+  tier: SubscriptionTier
+  duration: SubscriptionDuration
+  price_cents: number
+  credits_cents: number
+  max_seats: number
+  availability: PlanAvailability
+  seat_summary: PlanSeatSummary
+}
+
+interface BillingPlansResponse {
+  current_plan_slug?: string
+  plans: Plan[]
+}
+
+type SubscriptionTransitionType =
+  | 'new_subscription'
+  | 'upgrade'
+  | 'downgrade'
+  | 'duration_change'
+
+interface PreviewSubscribeRequest {
+  plan_slug: string
+}
+
+interface SubscribeRequest {
+  plan_slug: string
+  idempotency_key?: string
+  return_url?: string
+  cancel_url?: string
+}
+
+type SubscribeStatus = 'subscribed' | 'needs_payment_method' | 'pending_payment'
+
+export interface SubscribeResponse {
+  billing_op_id: string
+  status: SubscribeStatus
+  effective_at?: string
+  payment_method_url?: string
+}
+
+interface CancelSubscriptionRequest {
+  idempotency_key?: string
+}
+
+interface CancelSubscriptionResponse {
+  billing_op_id: string
+  cancel_at: string
+}
+
+interface ResubscribeRequest {
+  idempotency_key?: string
+}
+
+interface ResubscribeResponse {
+  billing_op_id: string
+  status: 'active'
+  message?: string
+}
+
+interface PaymentPortalRequest {
+  return_url?: string
+}
+
+interface PaymentPortalResponse {
+  url: string
+}
+
+interface PreviewPlanInfo {
+  slug: string
+  tier: SubscriptionTier
+  duration: SubscriptionDuration
+  price_cents: number
+  credits_cents: number
+  seat_summary: PlanSeatSummary
+  period_start?: string
+  period_end?: string
+}
+
+export interface PreviewSubscribeResponse {
+  allowed: boolean
+  reason?: string
+  transition_type: SubscriptionTransitionType
+  effective_at: string
+  is_immediate: boolean
+  cost_today_cents: number
+  cost_next_period_cents: number
+  credits_today_cents: number
+  credits_next_period_cents: number
+  current_plan?: PreviewPlanInfo
+  new_plan: PreviewPlanInfo
+}
+
+type BillingSubscriptionStatus = 'active' | 'scheduled' | 'ended' | 'canceled'
+
+type BillingStatus =
+  | 'awaiting_payment_method'
+  | 'pending_payment'
+  | 'paid'
+  | 'payment_failed'
+  | 'inactive'
+
+export interface BillingStatusResponse {
+  is_active: boolean
+  subscription_status?: BillingSubscriptionStatus
+  subscription_tier?: SubscriptionTier
+  subscription_duration?: SubscriptionDuration
+  plan_slug?: string
+  billing_status?: BillingStatus
+  has_funds: boolean
+  cancel_at?: string
+  renewal_date?: string
+}
+
+export interface BillingBalanceResponse {
+  amount_micros: number
+  prepaid_balance_micros?: number
+  cloud_credit_balance_micros?: number
+  pending_charges_micros?: number
+  effective_balance_micros?: number
+  currency: string
+}
+
+interface CreateTopupRequest {
+  amount_cents: number
+  idempotency_key?: string
+}
+
+type TopupStatus = 'pending' | 'completed' | 'failed'
+
+interface CreateTopupResponse {
+  billing_op_id: string
+  topup_id: string
+  status: TopupStatus
+  amount_cents: number
+}
+
+type BillingOpStatus = 'pending' | 'succeeded' | 'failed'
+
+export interface BillingOpStatusResponse {
+  id: string
+  status: BillingOpStatus
+  error_message?: string
+  started_at: string
+  completed_at?: string
+}
+
+interface BillingEvent {
+  event_type: string
+  event_id: string
+  params?: Record<string, unknown>
+  createdAt: string
+}
+
+interface BillingEventsResponse {
+  total: number
+  events: BillingEvent[]
+  page: number
+  limit: number
+  totalPages: number
+}
+
+interface GetBillingEventsParams {
+  page?: number
+  limit?: number
+}
+
+class WorkspaceApiError extends Error {
+  constructor(
+    message: string,
+    public readonly status?: number,
+    public readonly code?: string
+  ) {
+    super(message)
+    this.name = 'WorkspaceApiError'
+  }
+}
+
+const workspaceApiClient = axios.create({
+  headers: {
+    'Content-Type': 'application/json'
+  }
+})
+
+async function getAuthHeaderOrThrow() {
+  const authHeader = await useFirebaseAuthStore().getAuthHeader()
+  if (!authHeader) {
+    throw new WorkspaceApiError(
+      t('toastMessages.userNotAuthenticated'),
+      401,
+      'NOT_AUTHENTICATED'
+    )
+  }
+  return authHeader
+}
+
+async function getFirebaseHeaderOrThrow() {
+  const authHeader = await useFirebaseAuthStore().getFirebaseAuthHeader()
+  if (!authHeader) {
+    throw new WorkspaceApiError(
+      t('toastMessages.userNotAuthenticated'),
+      401,
+      'NOT_AUTHENTICATED'
+    )
+  }
+  return authHeader
+}
+
+function handleAxiosError(err: unknown): never {
+  if (axios.isAxiosError(err)) {
+    const status = err.response?.status
+    const message = err.response?.data?.message ?? err.message
+    throw new WorkspaceApiError(message, status)
+  }
+  throw err
+}
+
+export const workspaceApi = {
+  /**
+   * List all workspaces the user has access to
+   * GET /api/workspaces
+   */
+  async list(): Promise<ListWorkspacesResponse> {
+    const headers = await getAuthHeaderOrThrow()
+    try {
+      const response = await workspaceApiClient.get<ListWorkspacesResponse>(
+        api.apiURL('/workspaces'),
+        { headers }
+      )
+      return response.data
+    } catch (err) {
+      handleAxiosError(err)
+    }
+  },
+
+  /**
+   * Create a new workspace
+   * POST /api/workspaces
+   */
+  async create(payload: CreateWorkspacePayload): Promise<WorkspaceWithRole> {
+    const headers = await getAuthHeaderOrThrow()
+    try {
+      const response = await workspaceApiClient.post<WorkspaceWithRole>(
+        api.apiURL('/workspaces'),
+        payload,
+        { headers }
+      )
+      return response.data
+    } catch (err) {
+      handleAxiosError(err)
+    }
+  },
+
+  /**
+   * Update workspace name
+   * PATCH /api/workspaces/:id
+   */
+  async update(
+    workspaceId: string,
+    payload: UpdateWorkspacePayload
+  ): Promise<WorkspaceWithRole> {
+    const headers = await getAuthHeaderOrThrow()
+    try {
+      const response = await workspaceApiClient.patch<WorkspaceWithRole>(
+        api.apiURL(`/workspaces/${workspaceId}`),
+        payload,
+        { headers }
+      )
+      return response.data
+    } catch (err) {
+      handleAxiosError(err)
+    }
+  },
+
+  /**
+   * Delete a workspace (owner only)
+   * DELETE /api/workspaces/:id
+   */
+  async delete(workspaceId: string): Promise<void> {
+    const headers = await getAuthHeaderOrThrow()
+    try {
+      await workspaceApiClient.delete(
+        api.apiURL(`/workspaces/${workspaceId}`),
+        {
+          headers
+        }
+      )
+    } catch (err) {
+      handleAxiosError(err)
+    }
+  },
+
+  /**
+   * Leave the current workspace.
+   * POST /api/workspace/leave
+   */
+  async leave(): Promise<void> {
+    const headers = await getAuthHeaderOrThrow()
+    try {
+      await workspaceApiClient.post(api.apiURL('/workspace/leave'), null, {
+        headers
+      })
+    } catch (err) {
+      handleAxiosError(err)
+    }
+  },
+
+  /**
+   * List workspace members (paginated).
+   * GET /api/workspace/members
+   */
+  async listMembers(params?: ListMembersParams): Promise<ListMembersResponse> {
+    const headers = await getAuthHeaderOrThrow()
+    try {
+      const response = await workspaceApiClient.get<ListMembersResponse>(
+        api.apiURL('/workspace/members'),
+        { headers, params }
+      )
+      return response.data
+    } catch (err) {
+      handleAxiosError(err)
+    }
+  },
+
+  /**
+   * Remove a member from the workspace.
+   * DELETE /api/workspace/members/:userId
+   */
+  async removeMember(userId: string): Promise<void> {
+    const headers = await getAuthHeaderOrThrow()
+    try {
+      await workspaceApiClient.delete(
+        api.apiURL(`/workspace/members/${userId}`),
+        { headers }
+      )
+    } catch (err) {
+      handleAxiosError(err)
+    }
+  },
+
+  /**
+   * List pending invites for the workspace.
+   * GET /api/workspace/invites
+   */
+  async listInvites(): Promise<ListInvitesResponse> {
+    const headers = await getAuthHeaderOrThrow()
+    try {
+      const response = await workspaceApiClient.get<ListInvitesResponse>(
+        api.apiURL('/workspace/invites'),
+        { headers }
+      )
+      return response.data
+    } catch (err) {
+      handleAxiosError(err)
+    }
+  },
+
+  /**
+   * Create an invite for the workspace.
+   * POST /api/workspace/invites
+   */
+  async createInvite(payload: CreateInviteRequest): Promise<PendingInvite> {
+    const headers = await getAuthHeaderOrThrow()
+    try {
+      const response = await workspaceApiClient.post<PendingInvite>(
+        api.apiURL('/workspace/invites'),
+        payload,
+        { headers }
+      )
+      return response.data
+    } catch (err) {
+      handleAxiosError(err)
+    }
+  },
+
+  /**
+   * Revoke a pending invite.
+   * DELETE /api/workspace/invites/:inviteId
+   */
+  async revokeInvite(inviteId: string): Promise<void> {
+    const headers = await getAuthHeaderOrThrow()
+    try {
+      await workspaceApiClient.delete(
+        api.apiURL(`/workspace/invites/${inviteId}`),
+        { headers }
+      )
+    } catch (err) {
+      handleAxiosError(err)
+    }
+  },
+
+  /**
+   * Accept a workspace invite.
+   * POST /api/invites/:token/accept
+   * Uses Firebase auth (user identity) since the user isn't yet a workspace member.
+   */
+  async acceptInvite(token: string): Promise<AcceptInviteResponse> {
+    const headers = await getFirebaseHeaderOrThrow()
+    try {
+      const response = await workspaceApiClient.post<AcceptInviteResponse>(
+        api.apiURL(`/invites/${token}/accept`),
+        null,
+        { headers }
+      )
+      return response.data
+    } catch (err) {
+      handleAxiosError(err)
+    }
+  },
+
+  /**
+   * Get billing status for the current workspace
+   * GET /api/billing/status
+   */
+  async getBillingStatus(): Promise<BillingStatusResponse> {
+    const headers = await getAuthHeaderOrThrow()
+    try {
+      const response = await workspaceApiClient.get<BillingStatusResponse>(
+        api.apiURL('/billing/status'),
+        { headers }
+      )
+      return response.data
+    } catch (err) {
+      handleAxiosError(err)
+    }
+  },
+
+  /**
+   * Get credit balance for the current workspace
+   * GET /api/billing/balance
+   */
+  async getBillingBalance(): Promise<BillingBalanceResponse> {
+    const headers = await getAuthHeaderOrThrow()
+    try {
+      const response = await workspaceApiClient.get<BillingBalanceResponse>(
+        api.apiURL('/billing/balance'),
+        { headers }
+      )
+      return response.data
+    } catch (err) {
+      handleAxiosError(err)
+    }
+  },
+
+  /**
+   * Get available subscription plans
+   * GET /api/billing/plans
+   */
+  async getBillingPlans(): Promise<BillingPlansResponse> {
+    const headers = await getAuthHeaderOrThrow()
+    try {
+      const response = await workspaceApiClient.get<BillingPlansResponse>(
+        api.apiURL('/billing/plans'),
+        { headers }
+      )
+      return response.data
+    } catch (err) {
+      handleAxiosError(err)
+    }
+  },
+
+  /**
+   * Preview subscription change
+   * POST /api/billing/preview-subscribe
+   */
+  async previewSubscribe(planSlug: string): Promise<PreviewSubscribeResponse> {
+    const headers = await getAuthHeaderOrThrow()
+    try {
+      const response = await workspaceApiClient.post<PreviewSubscribeResponse>(
+        api.apiURL('/billing/preview-subscribe'),
+        { plan_slug: planSlug } satisfies PreviewSubscribeRequest,
+        { headers }
+      )
+      return response.data
+    } catch (err) {
+      handleAxiosError(err)
+    }
+  },
+
+  /**
+   * Subscribe to a billing plan
+   * POST /api/billing/subscribe
+   */
+  async subscribe(
+    planSlug: string,
+    returnUrl?: string,
+    cancelUrl?: string
+  ): Promise<SubscribeResponse> {
+    const headers = await getAuthHeaderOrThrow()
+    try {
+      const response = await workspaceApiClient.post<SubscribeResponse>(
+        api.apiURL('/billing/subscribe'),
+        {
+          plan_slug: planSlug,
+          return_url: returnUrl,
+          cancel_url: cancelUrl
+        } satisfies SubscribeRequest,
+        { headers }
+      )
+      return response.data
+    } catch (err) {
+      handleAxiosError(err)
+    }
+  },
+
+  /**
+   * Cancel current subscription
+   * POST /api/billing/subscription/cancel
+   */
+  async cancelSubscription(
+    idempotencyKey?: string
+  ): Promise<CancelSubscriptionResponse> {
+    const headers = await getAuthHeaderOrThrow()
+    try {
+      const response =
+        await workspaceApiClient.post<CancelSubscriptionResponse>(
+          api.apiURL('/billing/subscription/cancel'),
+          {
+            idempotency_key: idempotencyKey
+          } satisfies CancelSubscriptionRequest,
+          { headers }
+        )
+      return response.data
+    } catch (err) {
+      handleAxiosError(err)
+    }
+  },
+
+  /**
+   * Resubscribe (undo cancel) before period ends
+   * POST /api/billing/subscription/resubscribe
+   */
+  async resubscribe(idempotencyKey?: string): Promise<ResubscribeResponse> {
+    const headers = await getAuthHeaderOrThrow()
+    try {
+      const response = await workspaceApiClient.post<ResubscribeResponse>(
+        api.apiURL('/billing/subscription/resubscribe'),
+        { idempotency_key: idempotencyKey } satisfies ResubscribeRequest,
+        { headers }
+      )
+      return response.data
+    } catch (err) {
+      handleAxiosError(err)
+    }
+  },
+
+  /**
+   * Get Stripe payment portal URL for managing payment methods
+   * POST /api/billing/payment-portal
+   */
+  async getPaymentPortalUrl(
+    returnUrl?: string
+  ): Promise<PaymentPortalResponse> {
+    const headers = await getAuthHeaderOrThrow()
+    try {
+      const response = await workspaceApiClient.post<PaymentPortalResponse>(
+        api.apiURL('/billing/payment-portal'),
+        { return_url: returnUrl } satisfies PaymentPortalRequest,
+        { headers }
+      )
+      return response.data
+    } catch (err) {
+      handleAxiosError(err)
+    }
+  },
+
+  /**
+   * Create a credit top-up
+   * POST /api/billing/topup
+   */
+  async createTopup(
+    amountCents: number,
+    idempotencyKey?: string
+  ): Promise<CreateTopupResponse> {
+    const headers = await getAuthHeaderOrThrow()
+    try {
+      const response = await workspaceApiClient.post<CreateTopupResponse>(
+        api.apiURL('/billing/topup'),
+        {
+          amount_cents: amountCents,
+          idempotency_key: idempotencyKey
+        } satisfies CreateTopupRequest,
+        { headers }
+      )
+      return response.data
+    } catch (err) {
+      handleAxiosError(err)
+    }
+  },
+
+  /**
+   * Get billing events
+   * GET /api/billing/events
+   */
+  async getBillingEvents(
+    params?: GetBillingEventsParams
+  ): Promise<BillingEventsResponse> {
+    const headers = await getAuthHeaderOrThrow()
+    try {
+      const response = await workspaceApiClient.get<BillingEventsResponse>(
+        api.apiURL('/billing/events'),
+        { headers, params }
+      )
+      return response.data
+    } catch (err) {
+      handleAxiosError(err)
+    }
+  },
+
+  /**
+   * Get billing operation status
+   * GET /api/billing/ops/:id
+   */
+  async getBillingOpStatus(opId: string): Promise<BillingOpStatusResponse> {
+    const headers = await getAuthHeaderOrThrow()
+    try {
+      const response = await workspaceApiClient.get<BillingOpStatusResponse>(
+        api.apiURL(`/billing/ops/${opId}`),
+        { headers }
+      )
+      return response.data
+    } catch (err) {
+      handleAxiosError(err)
+    }
+  }
+}
diff --git a/src/platform/workspace/auth/WorkspaceAuthGate.test.ts b/src/platform/workspace/auth/WorkspaceAuthGate.test.ts
new file mode 100644
index 0000000000..fc87bfa530
--- /dev/null
+++ b/src/platform/workspace/auth/WorkspaceAuthGate.test.ts
@@ -0,0 +1,206 @@
+import { flushPromises, mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { ref } from 'vue'
+import { createI18n } from 'vue-i18n'
+
+import WorkspaceAuthGate from './WorkspaceAuthGate.vue'
+
+const mockIsInitialized = ref(false)
+const mockCurrentUser = ref<object | null>(null)
+
+vi.mock('@/stores/firebaseAuthStore', () => ({
+  useFirebaseAuthStore: () => ({
+    isInitialized: mockIsInitialized,
+    currentUser: mockCurrentUser
+  })
+}))
+
+const mockRefreshRemoteConfig = vi.fn()
+vi.mock('@/platform/remoteConfig/refreshRemoteConfig', () => ({
+  refreshRemoteConfig: (options: unknown) => mockRefreshRemoteConfig(options)
+}))
+
+const mockTeamWorkspacesEnabled = vi.hoisted(() => ({ value: false }))
+vi.mock('@/composables/useFeatureFlags', () => ({
+  useFeatureFlags: () => ({
+    flags: {
+      get teamWorkspacesEnabled() {
+        return mockTeamWorkspacesEnabled.value
+      }
+    }
+  })
+}))
+
+const mockWorkspaceStoreInitialize = vi.fn()
+const mockWorkspaceStoreInitState = vi.hoisted(() => ({
+  value: 'uninitialized' as string
+}))
+vi.mock('@/platform/workspace/stores/teamWorkspaceStore', () => ({
+  useTeamWorkspaceStore: () => ({
+    get initState() {
+      return mockWorkspaceStoreInitState.value
+    },
+    initialize: mockWorkspaceStoreInitialize
+  })
+}))
+
+const mockIsCloud = vi.hoisted(() => ({ value: true }))
+vi.mock('@/platform/distribution/types', () => ({
+  get isCloud() {
+    return mockIsCloud.value
+  }
+}))
+
+describe('WorkspaceAuthGate', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockIsCloud.value = true
+    mockIsInitialized.value = false
+    mockCurrentUser.value = null
+    mockTeamWorkspacesEnabled.value = false
+    mockWorkspaceStoreInitState.value = 'uninitialized'
+    mockRefreshRemoteConfig.mockResolvedValue(undefined)
+    mockWorkspaceStoreInitialize.mockResolvedValue(undefined)
+  })
+
+  const i18n = createI18n({ legacy: false })
+
+  const mountComponent = () =>
+    mount(WorkspaceAuthGate, {
+      global: { plugins: [i18n] },
+      slots: {
+        default: '<div data-testid="slot-content">App Content</div>'
+      }
+    })
+
+  describe('non-cloud builds', () => {
+    it('renders slot immediately when isCloud is false', async () => {
+      mockIsCloud.value = false
+
+      const wrapper = mountComponent()
+      await flushPromises()
+
+      expect(wrapper.find('[data-testid="slot-content"]').exists()).toBe(true)
+      expect(wrapper.find('[role="status"]').exists()).toBe(false)
+      expect(mockRefreshRemoteConfig).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('cloud builds - unauthenticated user', () => {
+    it('shows spinner while waiting for Firebase auth', () => {
+      mockIsInitialized.value = false
+
+      const wrapper = mountComponent()
+
+      expect(wrapper.find('[role="status"]').exists()).toBe(true)
+      expect(wrapper.find('[data-testid="slot-content"]').exists()).toBe(false)
+    })
+
+    it('renders slot when Firebase initializes with no user', async () => {
+      mockIsInitialized.value = false
+
+      const wrapper = mountComponent()
+      expect(wrapper.find('[role="status"]').exists()).toBe(true)
+
+      mockIsInitialized.value = true
+      mockCurrentUser.value = null
+      await flushPromises()
+
+      expect(wrapper.find('[data-testid="slot-content"]').exists()).toBe(true)
+      expect(mockRefreshRemoteConfig).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('cloud builds - authenticated user', () => {
+    beforeEach(() => {
+      mockIsInitialized.value = true
+      mockCurrentUser.value = { uid: 'user-123' }
+    })
+
+    it('refreshes remote config with auth after Firebase init', async () => {
+      mountComponent()
+      await flushPromises()
+
+      expect(mockRefreshRemoteConfig).toHaveBeenCalledWith({ useAuth: true })
+    })
+
+    it('renders slot when teamWorkspacesEnabled is false', async () => {
+      mockTeamWorkspacesEnabled.value = false
+
+      const wrapper = mountComponent()
+      await flushPromises()
+
+      expect(wrapper.find('[data-testid="slot-content"]').exists()).toBe(true)
+      expect(mockWorkspaceStoreInitialize).not.toHaveBeenCalled()
+    })
+
+    it('initializes workspace store when teamWorkspacesEnabled is true', async () => {
+      mockTeamWorkspacesEnabled.value = true
+
+      const wrapper = mountComponent()
+      await flushPromises()
+
+      expect(mockWorkspaceStoreInitialize).toHaveBeenCalled()
+      expect(wrapper.find('[data-testid="slot-content"]').exists()).toBe(true)
+    })
+
+    it('skips workspace init when store is already initialized', async () => {
+      mockTeamWorkspacesEnabled.value = true
+      mockWorkspaceStoreInitState.value = 'ready'
+
+      const wrapper = mountComponent()
+      await flushPromises()
+
+      expect(mockWorkspaceStoreInitialize).not.toHaveBeenCalled()
+      expect(wrapper.find('[data-testid="slot-content"]').exists()).toBe(true)
+    })
+  })
+
+  describe('error handling - graceful degradation', () => {
+    beforeEach(() => {
+      mockIsInitialized.value = true
+      mockCurrentUser.value = { uid: 'user-123' }
+    })
+
+    it('renders slot when remote config refresh fails', async () => {
+      mockRefreshRemoteConfig.mockRejectedValue(new Error('Network error'))
+
+      const wrapper = mountComponent()
+      await flushPromises()
+
+      expect(wrapper.find('[data-testid="slot-content"]').exists()).toBe(true)
+    })
+
+    it('renders slot when remote config refresh times out', async () => {
+      vi.useFakeTimers()
+      // Never-resolving promise simulates a hanging request
+      mockRefreshRemoteConfig.mockReturnValue(new Promise(() => {}))
+
+      const wrapper = mountComponent()
+      await flushPromises()
+
+      // Still showing spinner before timeout
+      expect(wrapper.find('[role="status"]').exists()).toBe(true)
+
+      // Advance past the 10 second timeout
+      await vi.advanceTimersByTimeAsync(10_001)
+      await flushPromises()
+
+      // Should render slot after timeout (graceful degradation)
+      expect(wrapper.find('[data-testid="slot-content"]').exists()).toBe(true)
+      vi.useRealTimers()
+    })
+
+    it('renders slot when workspace store initialization fails', async () => {
+      mockTeamWorkspacesEnabled.value = true
+      mockWorkspaceStoreInitialize.mockRejectedValue(
+        new Error('Workspace init failed')
+      )
+
+      const wrapper = mountComponent()
+      await flushPromises()
+
+      expect(wrapper.find('[data-testid="slot-content"]').exists()).toBe(true)
+    })
+  })
+})
diff --git a/src/platform/workspace/auth/WorkspaceAuthGate.vue b/src/platform/workspace/auth/WorkspaceAuthGate.vue
new file mode 100644
index 0000000000..438c250c48
--- /dev/null
+++ b/src/platform/workspace/auth/WorkspaceAuthGate.vue
@@ -0,0 +1,129 @@
+<template>
+  <slot v-if="isReady" />
+  <div
+    v-else
+    class="fixed inset-0 z-1100 flex items-center justify-center bg-(--p-mask-background)"
+  >
+    <LogoComfyWaveLoader size="xl" color="yellow" disable-animation />
+  </div>
+</template>
+
+<script setup lang="ts">
+/**
+ * WorkspaceAuthGate - Conditional auth checkpoint for workspace mode.
+ *
+ * This gate ensures proper initialization order for workspace-scoped auth:
+ * 1. Wait for Firebase auth to resolve
+ * 2. Check if teamWorkspacesEnabled feature flag is on
+ * 3. If YES: Initialize workspace token and store before rendering
+ * 4. If NO: Render immediately using existing Firebase auth
+ *
+ * This prevents race conditions where API calls use Firebase tokens
+ * instead of workspace tokens when the workspace feature is enabled.
+ */
+import { promiseTimeout, until } from '@vueuse/core'
+import { storeToRefs } from 'pinia'
+import { onMounted, ref } from 'vue'
+
+import { useFeatureFlags } from '@/composables/useFeatureFlags'
+import { isCloud } from '@/platform/distribution/types'
+import { refreshRemoteConfig } from '@/platform/remoteConfig/refreshRemoteConfig'
+import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
+import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
+import LogoComfyWaveLoader from '@/components/loader/LogoComfyWaveLoader.vue'
+
+const FIREBASE_INIT_TIMEOUT_MS = 16_000
+const CONFIG_REFRESH_TIMEOUT_MS = 10_000
+
+const isReady = ref(!isCloud)
+
+async function initialize(): Promise<void> {
+  if (!isCloud) return
+
+  const authStore = useFirebaseAuthStore()
+  const { isInitialized, currentUser } = storeToRefs(authStore)
+
+  try {
+    // Step 1: Wait for Firebase auth to resolve
+    // This is shared with router guard - both wait for the same thing,
+    // but this gate blocks rendering while router guard blocks navigation
+    if (!isInitialized.value) {
+      await until(isInitialized).toBe(true, {
+        timeout: FIREBASE_INIT_TIMEOUT_MS
+      })
+    }
+
+    // Step 2: If not authenticated, nothing more to do
+    // Unauthenticated users don't have workspace context
+    if (!currentUser.value) {
+      isReady.value = true
+      return
+    }
+
+    // Step 3: Refresh feature flags with auth context
+    // This ensures teamWorkspacesEnabled reflects the authenticated user's state
+    // Timeout prevents hanging if server is slow/unresponsive
+    try {
+      await Promise.race([
+        refreshRemoteConfig({ useAuth: true }),
+        promiseTimeout(CONFIG_REFRESH_TIMEOUT_MS).then(() => {
+          throw new Error('Config refresh timeout')
+        })
+      ])
+    } catch (error) {
+      console.warn(
+        '[WorkspaceAuthGate] Failed to refresh remote config:',
+        error
+      )
+      // Continue - feature flags will use defaults (teamWorkspacesEnabled=false)
+      // App will render with Firebase auth fallback
+    }
+
+    // Step 4: THE CHECKPOINT - Are we in workspace mode?
+    const { flags } = useFeatureFlags()
+    if (!flags.teamWorkspacesEnabled) {
+      // Not in workspace mode - use existing Firebase auth flow
+      // No additional initialization needed
+      isReady.value = true
+      return
+    }
+
+    // Step 5: WORKSPACE MODE - Full initialization
+    await initializeWorkspaceMode()
+  } catch (error) {
+    console.error('[WorkspaceAuthGate] Initialization failed:', error)
+  } finally {
+    // Always render (graceful degradation)
+    // If workspace init failed, API calls fall back to Firebase token
+    isReady.value = true
+  }
+}
+
+async function initializeWorkspaceMode(): Promise<void> {
+  // Initialize the full workspace store which handles:
+  // - Restoring workspace token from session (fast path for refresh)
+  // - Fetching workspace list
+  // - Switching to last used workspace if needed
+  // - Setting active workspace
+  try {
+    const workspaceStore = useTeamWorkspaceStore()
+    if (workspaceStore.initState === 'uninitialized') {
+      await workspaceStore.initialize()
+    }
+  } catch (error) {
+    // Log but don't block - workspace UI features may not work but app will render
+    // API calls will fall back to Firebase token
+    console.warn(
+      '[WorkspaceAuthGate] Failed to initialize workspace store:',
+      error
+    )
+  }
+}
+
+// Initialize on mount. This gate should be placed on the authenticated layout
+// (LayoutDefault) so it mounts fresh after login and unmounts on logout.
+// The router guard ensures only authenticated users reach this layout.
+onMounted(() => {
+  void initialize()
+})
+</script>
diff --git a/src/platform/workspace/components/CurrentUserPopoverWorkspace.vue b/src/platform/workspace/components/CurrentUserPopoverWorkspace.vue
new file mode 100644
index 0000000000..89195d9cb6
--- /dev/null
+++ b/src/platform/workspace/components/CurrentUserPopoverWorkspace.vue
@@ -0,0 +1,369 @@
+<!-- A popover that shows current user information and actions -->
+<template>
+  <div
+    class="current-user-popover -m-3 w-80 rounded-lg border border-border-default bg-base-background p-2 shadow-[1px_1px_8px_0_rgba(0,0,0,0.4)]"
+  >
+    <!-- User Info Section -->
+    <div class="mb-4 flex flex-col items-center px-0 py-3">
+      <UserAvatar
+        class="mb-1"
+        :photo-url="userPhotoUrl"
+        :pt:icon:class="{
+          'text-2xl!': !userPhotoUrl
+        }"
+        size="large"
+      />
+
+      <!-- User Details -->
+      <h3 class="my-0 mb-1 truncate text-base font-bold text-base-foreground">
+        {{ userDisplayName || $t('g.user') }}
+      </h3>
+      <p v-if="userEmail" class="my-0 truncate text-sm text-muted">
+        {{ userEmail }}
+      </p>
+    </div>
+
+    <!-- Workspace Selector -->
+    <div
+      class="flex cursor-pointer items-center justify-between rounded-lg px-4 py-2 hover:bg-secondary-background-hover"
+      @click="toggleWorkspaceSwitcher"
+    >
+      <div class="flex min-w-0 flex-1 items-center gap-2">
+        <WorkspaceProfilePic
+          class="size-6 shrink-0 text-xs"
+          :workspace-name="workspaceName"
+        />
+        <span class="truncate text-sm text-base-foreground">{{
+          workspaceName
+        }}</span>
+      </div>
+      <i class="pi pi-chevron-down shrink-0 text-sm text-muted-foreground" />
+    </div>
+
+    <Popover
+      ref="workspaceSwitcherPopover"
+      append-to="body"
+      :pt="{
+        content: {
+          class: 'p-0'
+        }
+      }"
+    >
+      <WorkspaceSwitcherPopover
+        @select="workspaceSwitcherPopover?.hide()"
+        @create="handleCreateWorkspace"
+      />
+    </Popover>
+
+    <!-- Credits Section -->
+
+    <div class="flex items-center gap-2 px-4 py-2">
+      <i class="icon-[lucide--component] text-sm text-amber-400" />
+      <Skeleton
+        v-if="isLoadingBalance"
+        width="4rem"
+        height="1.25rem"
+        class="w-full"
+      />
+      <span v-else class="text-base font-semibold text-base-foreground">{{
+        displayedCredits
+      }}</span>
+      <i
+        v-tooltip="{ value: $t('credits.unified.tooltip'), showDelay: 300 }"
+        class="mr-auto icon-[lucide--circle-help] cursor-help text-base text-muted-foreground"
+      />
+      <!-- Upgrade to add credits (free tier) -->
+      <Button
+        v-if="isActiveSubscription && permissions.canTopUp && isFreeTier"
+        variant="gradient"
+        size="sm"
+        data-testid="upgrade-to-add-credits-button"
+        @click="handleUpgradeToAddCredits"
+      >
+        {{ $t('subscription.upgradeToAddCredits') }}
+      </Button>
+      <!-- Add Credits (subscribed + personal or workspace owner only, paid tier) -->
+      <Button
+        v-else-if="isActiveSubscription && permissions.canTopUp"
+        variant="secondary"
+        size="sm"
+        class="text-base-foreground"
+        data-testid="add-credits-button"
+        @click="handleTopUp"
+      >
+        {{ $t('subscription.addCredits') }}
+      </Button>
+      <!-- Subscribe/Resubscribe (only when not subscribed or cancelled) -->
+      <SubscribeButton
+        v-if="showSubscribeAction && isPersonalWorkspace"
+        :fluid="false"
+        :label="
+          isCancelled
+            ? $t('subscription.resubscribe')
+            : $t('workspaceSwitcher.subscribe')
+        "
+        size="sm"
+        button-variant="gradient"
+      />
+      <Button
+        v-if="showSubscribeAction && !isPersonalWorkspace"
+        variant="primary"
+        size="sm"
+        @click="handleOpenPlansAndPricing"
+      >
+        {{
+          isCancelled
+            ? $t('subscription.resubscribe')
+            : $t('workspaceSwitcher.subscribe')
+        }}
+      </Button>
+    </div>
+
+    <Divider class="mx-0 my-2" />
+
+    <!-- Plans & Pricing (PERSONAL and OWNER only) -->
+    <div
+      v-if="showPlansAndPricing"
+      class="flex cursor-pointer items-center gap-2 px-4 py-2 hover:bg-secondary-background-hover"
+      data-testid="plans-pricing-menu-item"
+      @click="handleOpenPlansAndPricing"
+    >
+      <i class="icon-[lucide--receipt-text] text-sm text-muted-foreground" />
+      <span class="flex-1 text-sm text-base-foreground">{{
+        $t('subscription.plansAndPricing')
+      }}</span>
+      <span
+        v-if="canUpgrade"
+        class="rounded-full bg-base-foreground px-1.5 py-0.5 text-xs font-bold text-base-background"
+      >
+        {{ $t('subscription.upgrade') }}
+      </span>
+    </div>
+
+    <!-- Manage Plan (PERSONAL and OWNER, only if subscribed) -->
+    <div
+      v-if="showManagePlan"
+      class="flex cursor-pointer items-center gap-2 px-4 py-2 hover:bg-secondary-background-hover"
+      data-testid="manage-plan-menu-item"
+      @click="handleOpenPlanAndCreditsSettings"
+    >
+      <i class="icon-[lucide--file-text] text-sm text-muted-foreground" />
+      <span class="flex-1 text-sm text-base-foreground">{{
+        $t('subscription.managePlan')
+      }}</span>
+    </div>
+
+    <!-- Partner Nodes Pricing (always shown) -->
+    <div
+      class="flex cursor-pointer items-center gap-2 px-4 py-2 hover:bg-secondary-background-hover"
+      data-testid="partner-nodes-menu-item"
+      @click="handleOpenPartnerNodesInfo"
+    >
+      <i class="icon-[lucide--tag] text-sm text-muted-foreground" />
+      <span class="flex-1 text-sm text-base-foreground">{{
+        $t('subscription.partnerNodesCredits')
+      }}</span>
+    </div>
+
+    <Divider class="mx-0 my-2" />
+
+    <!-- Workspace Settings (always shown) -->
+    <div
+      class="flex cursor-pointer items-center gap-2 px-4 py-2 hover:bg-secondary-background-hover"
+      data-testid="workspace-settings-menu-item"
+      @click="handleOpenWorkspaceSettings"
+    >
+      <i class="icon-[lucide--users] text-sm text-muted-foreground" />
+      <span class="flex-1 text-sm text-base-foreground">{{
+        $t('userSettings.workspaceSettings')
+      }}</span>
+    </div>
+
+    <!-- Account Settings (always shown) -->
+    <div
+      class="flex cursor-pointer items-center gap-2 px-4 py-2 hover:bg-secondary-background-hover"
+      data-testid="user-settings-menu-item"
+      @click="handleOpenUserSettings"
+    >
+      <i class="icon-[lucide--settings-2] text-sm text-muted-foreground" />
+      <span class="flex-1 text-sm text-base-foreground">{{
+        $t('userSettings.accountSettings')
+      }}</span>
+    </div>
+
+    <Divider class="mx-0 my-2" />
+
+    <!-- Logout (always shown) -->
+    <div
+      class="flex cursor-pointer items-center gap-2 px-4 py-2 hover:bg-secondary-background-hover"
+      data-testid="logout-menu-item"
+      @click="handleLogout"
+    >
+      <i class="icon-[lucide--log-out] text-sm text-muted-foreground" />
+      <span class="flex-1 text-sm text-base-foreground">{{
+        $t('auth.signOut.signOut')
+      }}</span>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { storeToRefs } from 'pinia'
+import Divider from 'primevue/divider'
+import Popover from 'primevue/popover'
+import Skeleton from 'primevue/skeleton'
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import { formatCreditsFromCents } from '@/base/credits/comfyCredits'
+import UserAvatar from '@/components/common/UserAvatar.vue'
+import WorkspaceProfilePic from '@/platform/workspace/components/WorkspaceProfilePic.vue'
+import WorkspaceSwitcherPopover from '@/platform/workspace/components/WorkspaceSwitcherPopover.vue'
+import Button from '@/components/ui/button/Button.vue'
+import { useCurrentUser } from '@/composables/auth/useCurrentUser'
+
+import { useExternalLink } from '@/composables/useExternalLink'
+import { useBillingContext } from '@/composables/billing/useBillingContext'
+import SubscribeButton from '@/platform/cloud/subscription/components/SubscribeButton.vue'
+import { useSubscriptionDialog } from '@/platform/cloud/subscription/composables/useSubscriptionDialog'
+import { isCloud } from '@/platform/distribution/types'
+import { useTelemetry } from '@/platform/telemetry'
+import { useWorkspaceUI } from '@/platform/workspace/composables/useWorkspaceUI'
+import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
+import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
+import { useDialogService } from '@/services/dialogService'
+
+const workspaceStore = useTeamWorkspaceStore()
+const {
+  initState,
+  workspaceName,
+  isInPersonalWorkspace: isPersonalWorkspace
+} = storeToRefs(workspaceStore)
+const { permissions } = useWorkspaceUI()
+const workspaceSwitcherPopover = ref<InstanceType<typeof Popover> | null>(null)
+
+const emit = defineEmits<{
+  close: []
+}>()
+
+const { buildDocsUrl, docsPaths } = useExternalLink()
+
+const { userDisplayName, userEmail, userPhotoUrl, handleSignOut } =
+  useCurrentUser()
+const settingsDialog = useSettingsDialog()
+const dialogService = useDialogService()
+const {
+  isActiveSubscription,
+  isFreeTier,
+  subscription,
+  balance,
+  isLoading,
+  fetchBalance
+} = useBillingContext()
+
+const isCancelled = computed(() => subscription.value?.isCancelled ?? false)
+const subscriptionDialog = useSubscriptionDialog()
+
+const { locale } = useI18n()
+const isLoadingBalance = isLoading
+
+const displayedCredits = computed(() => {
+  if (initState.value !== 'ready') return ''
+
+  // API field is named _micros but contains cents (naming inconsistency)
+  const cents =
+    balance.value?.effectiveBalanceMicros ?? balance.value?.amountMicros ?? 0
+  return formatCreditsFromCents({
+    cents,
+    locale: locale.value,
+    numberOptions: {
+      minimumFractionDigits: 0,
+      maximumFractionDigits: 2
+    }
+  })
+})
+
+const canUpgrade = computed(() => {
+  // PRO is currently the only/highest tier, so no upgrades available
+  // This will need updating when additional tiers are added
+  return false
+})
+
+const showPlansAndPricing = computed(
+  () => permissions.value.canManageSubscription
+)
+const showManagePlan = computed(
+  () => permissions.value.canManageSubscription && isActiveSubscription.value
+)
+const showSubscribeAction = computed(
+  () =>
+    permissions.value.canManageSubscription &&
+    (!isActiveSubscription.value || isCancelled.value)
+)
+
+const handleOpenUserSettings = () => {
+  settingsDialog.show('user')
+  emit('close')
+}
+
+const handleOpenWorkspaceSettings = () => {
+  settingsDialog.show('workspace')
+  emit('close')
+}
+
+const handleOpenPlansAndPricing = () => {
+  subscriptionDialog.showPricingTable()
+  emit('close')
+}
+
+const handleOpenPlanAndCreditsSettings = () => {
+  if (isCloud) {
+    settingsDialog.show('workspace')
+  } else {
+    settingsDialog.show('credits')
+  }
+
+  emit('close')
+}
+
+const handleUpgradeToAddCredits = () => {
+  subscriptionDialog.showPricingTable()
+  emit('close')
+}
+
+const handleTopUp = () => {
+  // Track purchase credits entry from avatar popover
+  useTelemetry()?.trackAddApiCreditButtonClicked()
+  dialogService.showTopUpCreditsDialog()
+  emit('close')
+}
+
+const handleOpenPartnerNodesInfo = () => {
+  window.open(
+    buildDocsUrl(docsPaths.partnerNodesPricing, { includeLocale: true }),
+    '_blank'
+  )
+  emit('close')
+}
+
+const handleLogout = async () => {
+  await handleSignOut()
+  emit('close')
+}
+
+const handleCreateWorkspace = () => {
+  workspaceSwitcherPopover.value?.hide()
+  dialogService.showCreateWorkspaceDialog()
+  emit('close')
+}
+
+const toggleWorkspaceSwitcher = (event: MouseEvent) => {
+  workspaceSwitcherPopover.value?.toggle(event)
+}
+
+const refreshBalance = () => {
+  void fetchBalance()
+}
+
+defineExpose({ refreshBalance })
+</script>
diff --git a/src/platform/workspace/components/PricingTableWorkspace.vue b/src/platform/workspace/components/PricingTableWorkspace.vue
new file mode 100644
index 0000000000..7b2001a0ea
--- /dev/null
+++ b/src/platform/workspace/components/PricingTableWorkspace.vue
@@ -0,0 +1,514 @@
+<template>
+  <div class="flex flex-col gap-8">
+    <h2 class="m-0 text-center text-xl text-muted-foreground lg:text-2xl">
+      {{ t('subscription.chooseBestPlanWorkspace') }}
+    </h2>
+
+    <div class="flex justify-center">
+      <SelectButton
+        v-model="currentBillingCycle"
+        :options="billingCycleOptions"
+        option-label="label"
+        option-value="value"
+        :allow-empty="false"
+        unstyled
+        :pt="{
+          root: {
+            class: 'flex gap-1 bg-secondary-background rounded-lg p-1.5'
+          },
+          pcToggleButton: {
+            root: ({ context }: ToggleButtonPassThroughMethodOptions) => ({
+              class: [
+                'w-36  h-8 rounded-md transition-colors cursor-pointer border-none outline-none ring-0 text-sm font-medium flex items-center justify-center',
+                context.active
+                  ? 'bg-base-foreground text-base-background'
+                  : 'bg-transparent text-muted-foreground hover:bg-secondary-background-hover'
+              ]
+            }),
+            label: { class: 'flex items-center gap-2 ' }
+          }
+        }"
+      >
+        <template #option="{ option }">
+          <div class="flex items-center gap-2">
+            <span>{{ option.label }}</span>
+            <div
+              v-if="option.value === 'yearly'"
+              class="flex items-center rounded-full bg-primary-background px-1 py-0.5 text-[11px] font-bold text-white"
+            >
+              -20%
+            </div>
+          </div>
+        </template>
+      </SelectButton>
+    </div>
+    <div class="flex flex-col items-stretch gap-6 xl:flex-row">
+      <div
+        v-for="tier in tiers"
+        :key="tier.id"
+        :class="
+          cn(
+            'flex flex-1 flex-col rounded-2xl border border-border-default bg-base-background shadow-[0_0_12px_rgba(0,0,0,0.1)]',
+            tier.isPopular ? 'border-muted-foreground' : ''
+          )
+        "
+      >
+        <div class="flex flex-col gap-8 p-8 pb-0">
+          <div class="flex flex-row items-center justify-between gap-2">
+            <span
+              class="font-inter text-base/normal font-bold text-base-foreground"
+            >
+              {{ tier.name }}
+            </span>
+            <div
+              v-if="tier.isPopular"
+              class="flex h-5 items-center rounded-full bg-base-foreground px-1.5 text-[11px] font-bold tracking-tight text-base-background uppercase"
+            >
+              {{ t('subscription.mostPopular') }}
+            </div>
+          </div>
+          <div class="flex flex-col">
+            <div class="flex flex-col gap-2">
+              <div class="flex flex-row items-baseline gap-2">
+                <span
+                  class="font-inter text-[32px] leading-normal font-semibold text-base-foreground"
+                >
+                  <span
+                    v-show="currentBillingCycle === 'yearly'"
+                    class="text-2xl text-muted-foreground line-through"
+                  >
+                    ${{ getMonthlyPrice(tier) }}
+                  </span>
+                  ${{ getPrice(tier) }}
+                </span>
+                <span class="font-inter text-sm/normal text-base-foreground">
+                  {{ t('subscription.usdPerMonthPerMember') }}
+                </span>
+              </div>
+              <div class="flex items-center gap-2">
+                <span class="text-sm text-muted-foreground">
+                  {{
+                    currentBillingCycle === 'yearly'
+                      ? t('subscription.billedYearly', {
+                          total: `$${getAnnualTotal(tier)}`
+                        })
+                      : t('subscription.billedMonthly')
+                  }}
+                </span>
+              </div>
+            </div>
+          </div>
+
+          <div class="flex flex-1 flex-col gap-4 pb-0">
+            <div class="flex flex-row items-center justify-between">
+              <span class="text-foreground text-sm font-normal">
+                {{ t('subscription.monthlyCreditsPerMemberLabel') }}
+              </span>
+              <div class="flex flex-row items-center gap-1">
+                <i class="icon-[lucide--component] text-sm text-amber-400" />
+                <span
+                  class="font-inter text-sm/normal font-bold text-base-foreground"
+                >
+                  {{ n(getMonthlyCreditsPerMember(tier)) }}
+                </span>
+              </div>
+            </div>
+
+            <div class="flex flex-row items-center justify-between">
+              <span class="text-foreground text-sm font-normal">
+                {{ t('subscription.maxMembersLabel') }}
+              </span>
+              <span
+                class="font-inter text-sm/normal font-bold text-base-foreground"
+              >
+                {{ getMaxMembers(tier) }}
+              </span>
+            </div>
+
+            <div class="flex flex-row items-center justify-between">
+              <span class="text-foreground text-sm font-normal">
+                {{ t('subscription.maxDurationLabel') }}
+              </span>
+              <span
+                class="font-inter text-sm/normal font-bold text-base-foreground"
+              >
+                {{ tier.maxDuration }}
+              </span>
+            </div>
+
+            <div class="flex flex-row items-center justify-between">
+              <span class="text-foreground text-sm font-normal">
+                {{ t('subscription.gpuLabel') }}
+              </span>
+              <i class="pi pi-check text-success-foreground text-xs" />
+            </div>
+
+            <div class="flex flex-row items-center justify-between">
+              <span class="text-foreground text-sm font-normal">
+                {{ t('subscription.addCreditsLabel') }}
+              </span>
+              <i class="pi pi-check text-success-foreground text-xs" />
+            </div>
+
+            <div class="flex flex-row items-center justify-between">
+              <span class="text-foreground text-sm font-normal">
+                {{ t('subscription.customLoRAsLabel') }}
+              </span>
+              <i
+                v-if="tier.customLoRAs"
+                class="pi pi-check text-success-foreground text-xs"
+              />
+              <i v-else class="pi pi-times text-foreground text-xs" />
+            </div>
+
+            <div class="flex flex-col gap-2">
+              <div class="flex flex-row items-start justify-between">
+                <div class="flex flex-col gap-2">
+                  <span class="text-foreground text-sm/relaxed font-normal">
+                    {{ t('subscription.videoEstimateLabel') }}
+                  </span>
+                  <div class="group flex flex-row items-center gap-2 pt-2">
+                    <i
+                      class="pi pi-question-circle text-xs text-muted-foreground group-hover:text-base-foreground"
+                    />
+                    <span
+                      class="cursor-pointer text-sm font-normal text-muted-foreground group-hover:text-base-foreground"
+                      @click="togglePopover"
+                    >
+                      {{ t('subscription.videoEstimateHelp') }}
+                    </span>
+                  </div>
+                </div>
+                <span
+                  class="font-inter text-sm/normal font-bold text-base-foreground"
+                >
+                  ~{{ n(tier.pricing.videoEstimate) }}
+                </span>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="flex flex-col p-8">
+          <Button
+            :variant="getButtonSeverity(tier)"
+            :disabled="isButtonDisabled(tier)"
+            :loading="loadingTier === tier.key"
+            :class="
+              cn(
+                'h-10 w-full',
+                getButtonTextClass(tier),
+                tier.key === 'creator'
+                  ? 'border-transparent bg-base-foreground hover:bg-inverted-background-hover'
+                  : 'border-transparent bg-secondary-background hover:bg-secondary-background-hover focus:bg-secondary-background-selected'
+              )
+            "
+            @click="() => handleSubscribe(tier.key)"
+          >
+            {{ getButtonLabel(tier) }}
+          </Button>
+        </div>
+      </div>
+    </div>
+
+    <!-- Video Estimate Help Popover -->
+    <Popover
+      ref="popover"
+      append-to="body"
+      :auto-z-index="true"
+      :base-z-index="1000"
+      :dismissable="true"
+      :close-on-escape="true"
+      unstyled
+      :pt="{
+        root: {
+          class:
+            'rounded-lg border border-interface-stroke bg-interface-panel-surface shadow-lg p-4 max-w-xs'
+        }
+      }"
+    >
+      <div class="flex flex-col gap-2">
+        <p class="text-sm/normal text-base-foreground">
+          {{ t('subscription.videoEstimateExplanation') }}
+        </p>
+        <a
+          href="https://cloud.comfy.org/?template=video_wan2_2_14B_i2v"
+          target="_blank"
+          rel="noopener noreferrer"
+          class="flex gap-1 text-sm text-azure-600 no-underline hover:text-azure-400"
+        >
+          <span class="underline">
+            {{ t('subscription.videoEstimateTryTemplate') }}
+          </span>
+          <span class="no-underline" v-html="'&rarr;'"></span>
+        </a>
+      </div>
+    </Popover>
+    <!-- Contact and Enterprise Links -->
+    <div class="flex flex-col items-center gap-2">
+      <p class="m-0 text-sm text-text-secondary">
+        {{ $t('subscription.haveQuestions') }}
+      </p>
+      <div class="flex items-center gap-1.5">
+        <Button
+          variant="muted-textonly"
+          class="h-6 p-1 text-sm text-text-secondary hover:text-base-foreground"
+          @click="handleContactUs"
+        >
+          {{ $t('subscription.contactUs') }}
+          <i class="pi pi-comments" />
+        </Button>
+        <span class="text-sm text-text-secondary">{{ $t('g.or') }}</span>
+        <Button
+          variant="muted-textonly"
+          class="h-6 p-1 text-sm text-text-secondary hover:text-base-foreground"
+          @click="handleViewEnterprise"
+        >
+          {{ $t('subscription.viewEnterprise') }}
+          <i class="pi pi-external-link" />
+        </Button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { cn } from '@comfyorg/tailwind-utils'
+import Popover from 'primevue/popover'
+import SelectButton from 'primevue/selectbutton'
+import type { ToggleButtonPassThroughMethodOptions } from 'primevue/togglebutton'
+import { computed, onMounted, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+import { useBillingContext } from '@/composables/billing/useBillingContext'
+import {
+  TIER_PRICING,
+  TIER_TO_KEY
+} from '@/platform/cloud/subscription/constants/tierPricing'
+import type {
+  TierKey,
+  TierPricing
+} from '@/platform/cloud/subscription/constants/tierPricing'
+import type { BillingCycle } from '@/platform/cloud/subscription/utils/subscriptionTierRank'
+import type { Plan } from '@/platform/workspace/api/workspaceApi'
+import type { components } from '@/types/comfyRegistryTypes'
+
+type SubscriptionTier = components['schemas']['SubscriptionTier']
+type CheckoutTierKey = Exclude<TierKey, 'free' | 'founder'>
+
+interface Props {
+  isLoading?: boolean
+  loadingTier?: CheckoutTierKey | null
+}
+
+const { isLoading, loadingTier = null } = defineProps<Props>()
+
+const emit = defineEmits<{
+  subscribe: [payload: { tierKey: CheckoutTierKey; billingCycle: BillingCycle }]
+  resubscribe: []
+}>()
+
+interface BillingCycleOption {
+  label: string
+  value: BillingCycle
+}
+
+interface PricingTierConfig {
+  id: SubscriptionTier
+  key: CheckoutTierKey
+  name: string
+  pricing: TierPricing
+  maxDuration: string
+  customLoRAs: boolean
+  maxMembers: number
+  isPopular?: boolean
+}
+
+const { t, n } = useI18n()
+
+const billingCycleOptions: BillingCycleOption[] = [
+  { label: t('subscription.yearly'), value: 'yearly' },
+  { label: t('subscription.monthly'), value: 'monthly' }
+]
+
+const tiers: PricingTierConfig[] = [
+  {
+    id: 'STANDARD',
+    key: 'standard',
+    name: t('subscription.tiers.standard.name'),
+    pricing: TIER_PRICING.standard,
+    maxDuration: t('subscription.maxDuration.standard'),
+    customLoRAs: false,
+    maxMembers: 1,
+    isPopular: false
+  },
+  {
+    id: 'CREATOR',
+    key: 'creator',
+    name: t('subscription.tiers.creator.name'),
+    pricing: TIER_PRICING.creator,
+    maxDuration: t('subscription.maxDuration.creator'),
+    customLoRAs: true,
+    maxMembers: 5,
+    isPopular: true
+  },
+  {
+    id: 'PRO',
+    key: 'pro',
+    name: t('subscription.tiers.pro.name'),
+    pricing: TIER_PRICING.pro,
+    maxDuration: t('subscription.maxDuration.pro'),
+    customLoRAs: true,
+    maxMembers: 20,
+    isPopular: false
+  }
+]
+const {
+  plans: apiPlans,
+  currentPlanSlug,
+  fetchPlans,
+  subscription,
+  getMaxSeats
+} = useBillingContext()
+
+const isCancelled = computed(() => subscription.value?.isCancelled ?? false)
+
+const popover = ref()
+const currentBillingCycle = ref<BillingCycle>('yearly')
+
+onMounted(() => {
+  void fetchPlans()
+})
+
+function getApiPlanForTier(
+  tierKey: CheckoutTierKey,
+  duration: BillingCycle
+): Plan | undefined {
+  const apiDuration = duration === 'yearly' ? 'ANNUAL' : 'MONTHLY'
+  const apiTier = tierKey.toUpperCase() as Plan['tier']
+  return apiPlans.value.find(
+    (p) => p.tier === apiTier && p.duration === apiDuration
+  )
+}
+
+function getPriceFromApi(tier: PricingTierConfig): number | null {
+  const plan = getApiPlanForTier(tier.key, currentBillingCycle.value)
+  if (!plan) return null
+  const price = plan.price_cents / 100
+  return currentBillingCycle.value === 'yearly' ? price / 12 : price
+}
+
+const currentTierKey = computed<TierKey | null>(() =>
+  subscription.value?.tier ? TIER_TO_KEY[subscription.value.tier] : null
+)
+
+const isYearlySubscription = computed(
+  () => subscription.value?.duration === 'ANNUAL'
+)
+
+const isCurrentPlan = (tierKey: CheckoutTierKey): boolean => {
+  // Use API current_plan_slug if available
+  if (currentPlanSlug.value) {
+    const plan = getApiPlanForTier(tierKey, currentBillingCycle.value)
+    return plan?.slug === currentPlanSlug.value
+  }
+
+  // Fallback to tier-based detection
+  if (!currentTierKey.value) return false
+
+  const selectedIsYearly = currentBillingCycle.value === 'yearly'
+
+  return (
+    currentTierKey.value === tierKey &&
+    isYearlySubscription.value === selectedIsYearly
+  )
+}
+
+const togglePopover = (event: Event) => {
+  popover.value.toggle(event)
+}
+
+const getButtonLabel = (tier: PricingTierConfig): string => {
+  const planName =
+    currentBillingCycle.value === 'yearly'
+      ? t('subscription.tierNameYearly', { name: tier.name })
+      : tier.name
+
+  if (isCurrentPlan(tier.key)) {
+    return isCancelled.value
+      ? t('subscription.resubscribeTo', { plan: planName })
+      : t('subscription.currentPlan')
+  }
+
+  return currentTierKey.value
+    ? t('subscription.changeTo', { plan: planName })
+    : t('subscription.subscribeTo', { plan: planName })
+}
+
+const getButtonSeverity = (
+  tier: PricingTierConfig
+): 'primary' | 'secondary' => {
+  if (isCurrentPlan(tier.key)) {
+    return isCancelled.value ? 'primary' : 'secondary'
+  }
+  if (tier.key === 'creator') return 'primary'
+  return 'secondary'
+}
+
+const isButtonDisabled = (tier: PricingTierConfig): boolean => {
+  if (isLoading) return true
+  if (isCurrentPlan(tier.key)) {
+    // Allow clicking current plan button when cancelled (for resubscribe)
+    return !isCancelled.value
+  }
+  return false
+}
+
+const getButtonTextClass = (tier: PricingTierConfig): string =>
+  tier.key === 'creator'
+    ? 'font-inter text-sm font-bold leading-normal text-base-background'
+    : 'font-inter text-sm font-bold leading-normal text-primary-foreground'
+
+const getPrice = (tier: PricingTierConfig): number =>
+  getPriceFromApi(tier) ?? tier.pricing[currentBillingCycle.value]
+
+const getMonthlyPrice = (tier: PricingTierConfig): number => {
+  const plan = getApiPlanForTier(tier.key, 'monthly')
+  return plan ? plan.price_cents / 100 : tier.pricing.monthly
+}
+
+const getAnnualTotal = (tier: PricingTierConfig): number => {
+  const plan = getApiPlanForTier(tier.key, 'yearly')
+  return plan ? plan.price_cents / 100 : tier.pricing.yearly * 12
+}
+
+const getMaxMembers = (tier: PricingTierConfig): number => getMaxSeats(tier.key)
+
+const getMonthlyCreditsPerMember = (tier: PricingTierConfig): number =>
+  tier.pricing.credits
+
+function handleSubscribe(tierKey: CheckoutTierKey) {
+  if (isLoading) return
+
+  // Handle resubscribe for cancelled subscription on current plan
+  if (isCurrentPlan(tierKey)) {
+    if (isCancelled.value) {
+      emit('resubscribe')
+    }
+    return
+  }
+
+  emit('subscribe', {
+    tierKey,
+    billingCycle: currentBillingCycle.value
+  })
+}
+
+function handleContactUs() {
+  window.open('https://www.comfy.org/discord', '_blank')
+}
+
+function handleViewEnterprise() {
+  window.open('https://www.comfy.org/enterprise', '_blank')
+}
+</script>
diff --git a/src/platform/workspace/components/SubscriptionAddPaymentPreviewWorkspace.vue b/src/platform/workspace/components/SubscriptionAddPaymentPreviewWorkspace.vue
new file mode 100644
index 0000000000..4f5909cc2f
--- /dev/null
+++ b/src/platform/workspace/components/SubscriptionAddPaymentPreviewWorkspace.vue
@@ -0,0 +1,255 @@
+<template>
+  <h2 class="m-0 mb-8 text-center text-xl text-muted-foreground lg:text-2xl">
+    {{ $t('subscription.preview.confirmPayment') }}
+  </h2>
+  <div
+    class="mx-auto flex h-full max-w-[400px] flex-col items-stretch justify-between text-sm"
+  >
+    <div class="">
+      <!-- Plan Header -->
+      <div class="flex flex-col gap-2">
+        <span class="text-sm text-base-foreground">
+          {{ tierName }}
+        </span>
+        <div class="flex items-baseline gap-2">
+          <span class="text-4xl font-semibold text-base-foreground">
+            ${{ displayPrice }}
+          </span>
+          <span class="text-xl text-base-foreground">
+            {{ $t('subscription.usdPerMonthPerMember') }}
+          </span>
+        </div>
+        <span class="text-muted-foreground">
+          {{ $t('subscription.preview.startingToday') }}
+        </span>
+      </div>
+
+      <!-- Credits Section -->
+      <div class="flex flex-col gap-3 pt-16 pb-8">
+        <div class="flex items-center justify-between">
+          <span class="text-base-foreground">
+            {{ $t('subscription.preview.eachMonthCreditsRefill') }}
+          </span>
+          <div class="flex items-center gap-1">
+            <i class="icon-[lucide--component] text-sm text-amber-400" />
+            <span class="font-bold text-base-foreground">
+              {{ displayCredits }}
+            </span>
+            <span class="text-base-foreground">
+              {{ $t('subscription.preview.perMember') }}
+            </span>
+          </div>
+        </div>
+
+        <!-- Expandable Features -->
+        <button
+          class="flex cursor-pointer items-center justify-end gap-1 border-none bg-transparent p-0 text-sm text-muted-foreground hover:text-base-foreground"
+          @click="isFeaturesCollapsed = !isFeaturesCollapsed"
+        >
+          <span>
+            {{
+              isFeaturesCollapsed
+                ? $t('subscription.preview.showMoreFeatures')
+                : $t('subscription.preview.hideFeatures')
+            }}
+          </span>
+          <i
+            :class="
+              cn(
+                'pi text-xs',
+                isFeaturesCollapsed ? 'pi-chevron-down' : 'pi-chevron-up'
+              )
+            "
+          />
+        </button>
+        <div v-show="!isFeaturesCollapsed" class="flex flex-col gap-2 pt-2">
+          <div class="flex items-center justify-between">
+            <span class="text-sm text-base-foreground">
+              {{ $t('subscription.maxDurationLabel') }}
+            </span>
+            <span class="text-sm font-bold text-base-foreground">
+              {{ maxDuration }}
+            </span>
+          </div>
+          <div class="flex items-center justify-between">
+            <span class="text-sm text-base-foreground">
+              {{ $t('subscription.gpuLabel') }}
+            </span>
+            <i class="pi pi-check text-success-foreground text-xs" />
+          </div>
+          <div class="flex items-center justify-between">
+            <span class="text-sm text-base-foreground">
+              {{ $t('subscription.addCreditsLabel') }}
+            </span>
+            <i class="pi pi-check text-success-foreground text-xs" />
+          </div>
+          <div class="flex items-center justify-between">
+            <span class="text-sm text-base-foreground">
+              {{ $t('subscription.customLoRAsLabel') }}
+            </span>
+            <i
+              v-if="hasCustomLoRAs"
+              class="pi pi-check text-success-foreground text-xs"
+            />
+            <i v-else class="pi pi-times text-xs text-muted-foreground" />
+          </div>
+        </div>
+      </div>
+
+      <!-- Total Due Section -->
+      <div class="flex flex-col gap-2 border-t border-border-subtle pt-8">
+        <div class="flex items-center justify-between text-base">
+          <span class="text-base-foreground">
+            {{ $t('subscription.preview.totalDueToday') }}
+          </span>
+          <span class="font-bold text-base-foreground">
+            ${{ totalDueToday }}
+          </span>
+        </div>
+        <span class="text-sm text-muted-foreground">
+          {{
+            $t('subscription.preview.nextPaymentDue', {
+              date: nextPaymentDate
+            })
+          }}
+        </span>
+      </div>
+    </div>
+    <!-- Footer -->
+    <div class="flex flex-col gap-2 pt-8">
+      <!-- Terms Agreement -->
+      <p class="text-center text-xs text-muted-foreground">
+        <i18n-t keypath="subscription.preview.termsAgreement" tag="span">
+          <template #terms>
+            <a
+              href="https://www.comfy.org/terms"
+              target="_blank"
+              rel="noopener noreferrer"
+              class="underline hover:text-base-foreground"
+            >
+              {{ $t('subscription.preview.terms') }}
+            </a>
+          </template>
+          <template #privacy>
+            <a
+              href="https://www.comfy.org/privacy"
+              target="_blank"
+              rel="noopener noreferrer"
+              class="underline hover:text-base-foreground"
+            >
+              {{ $t('subscription.preview.privacyPolicy') }}
+            </a>
+          </template>
+        </i18n-t>
+      </p>
+
+      <!-- Add Credit Card Button -->
+      <Button
+        variant="secondary"
+        size="lg"
+        class="w-full rounded-lg"
+        :loading="isLoading"
+        @click="$emit('addCreditCard')"
+      >
+        {{ $t('subscription.preview.addCreditCard') }}
+      </Button>
+
+      <!-- Back Link -->
+      <Button
+        variant="textonly"
+        class="cursor-pointer text-center text-xs text-muted-foreground transition-colors hover:bg-none hover:text-base-foreground"
+        @click="$emit('back')"
+      >
+        {{ $t('subscription.preview.backToAllPlans') }}
+      </Button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+import {
+  getTierCredits,
+  getTierFeatures,
+  getTierPrice
+} from '@/platform/cloud/subscription/constants/tierPricing'
+import type { TierKey } from '@/platform/cloud/subscription/constants/tierPricing'
+import type { BillingCycle } from '@/platform/cloud/subscription/utils/subscriptionTierRank'
+import type { PreviewSubscribeResponse } from '@/platform/workspace/api/workspaceApi'
+import { cn } from '@/utils/tailwindUtil'
+
+interface Props {
+  tierKey: Exclude<TierKey, 'free' | 'founder'>
+  billingCycle?: BillingCycle
+  isLoading?: boolean
+  previewData?: PreviewSubscribeResponse | null
+}
+
+const {
+  tierKey,
+  billingCycle = 'monthly',
+  isLoading = false,
+  previewData = null
+} = defineProps<Props>()
+
+defineEmits<{
+  addCreditCard: []
+  back: []
+}>()
+
+const { t, n } = useI18n()
+
+const isFeaturesCollapsed = ref(true)
+
+const tierName = computed(() => t(`subscription.tiers.${tierKey}.name`))
+
+const displayPrice = computed(() => {
+  if (previewData?.new_plan) {
+    return (previewData.new_plan.price_cents / 100).toFixed(0)
+  }
+  return getTierPrice(tierKey, billingCycle === 'yearly')
+})
+
+const displayCredits = computed(() => n(getTierCredits(tierKey) ?? 0))
+
+const hasCustomLoRAs = computed(() => getTierFeatures(tierKey).customLoRAs)
+const maxDuration = computed(() => t(`subscription.maxDuration.${tierKey}`))
+
+const totalDueToday = computed(() => {
+  if (previewData) {
+    return (previewData.cost_today_cents / 100).toFixed(2)
+  }
+  const priceValue = getTierPrice(tierKey, billingCycle === 'yearly')
+  if (billingCycle === 'yearly') {
+    return (priceValue * 12).toFixed(2)
+  }
+  return priceValue.toFixed(2)
+})
+
+const nextPaymentDate = computed(() => {
+  if (previewData?.new_plan?.period_end) {
+    return new Date(previewData.new_plan.period_end).toLocaleDateString(
+      'en-US',
+      {
+        month: 'short',
+        day: 'numeric',
+        year: 'numeric'
+      }
+    )
+  }
+  const date = new Date()
+  if (billingCycle === 'yearly') {
+    date.setFullYear(date.getFullYear() + 1)
+  } else {
+    date.setMonth(date.getMonth() + 1)
+  }
+  return date.toLocaleDateString('en-US', {
+    month: 'short',
+    day: 'numeric',
+    year: 'numeric'
+  })
+})
+</script>
diff --git a/src/platform/workspace/components/SubscriptionPanelContentWorkspace.vue b/src/platform/workspace/components/SubscriptionPanelContentWorkspace.vue
new file mode 100644
index 0000000000..656842163e
--- /dev/null
+++ b/src/platform/workspace/components/SubscriptionPanelContentWorkspace.vue
@@ -0,0 +1,638 @@
+<template>
+  <div class="grow overflow-auto pt-6">
+    <!-- Loading state while subscription is being set up -->
+    <div
+      v-if="isSettingUp"
+      class="rounded-2xl border border-interface-stroke p-6"
+    >
+      <div class="flex items-center gap-2 py-4 text-muted-foreground">
+        <i class="pi pi-spin pi-spinner" />
+        <span>{{ $t('billingOperation.subscriptionProcessing') }}</span>
+      </div>
+    </div>
+
+    <template v-else>
+      <!-- Cancelled subscription info card -->
+      <div
+        v-if="isCancelled"
+        class="mb-6 flex gap-1 rounded-2xl border border-warning-background bg-warning-background/20 p-4"
+      >
+        <div
+          class="flex size-8 shrink-0 items-center justify-center rounded-full text-warning-background"
+        >
+          <i class="pi pi-info-circle" />
+        </div>
+        <div class="flex flex-col gap-2">
+          <h2 class="m-0 pt-1.5 text-sm font-bold text-text-primary">
+            {{ $t('subscription.canceledCard.title') }}
+          </h2>
+          <p class="m-0 text-sm text-text-secondary">
+            {{
+              $t('subscription.canceledCard.description', {
+                date: formattedEndDate
+              })
+            }}
+          </p>
+        </div>
+      </div>
+
+      <div class="rounded-2xl border border-interface-stroke p-6">
+        <div>
+          <div
+            class="flex flex-col gap-4 md:flex-row md:items-center md:justify-between md:gap-2"
+          >
+            <!-- OWNER Unsubscribed State -->
+            <template v-if="showSubscribePrompt">
+              <div class="flex flex-col gap-2">
+                <div class="text-sm font-bold text-text-primary">
+                  {{ $t('subscription.workspaceNotSubscribed') }}
+                </div>
+                <div class="text-sm text-text-secondary">
+                  {{ $t('subscription.subscriptionRequiredMessage') }}
+                </div>
+              </div>
+              <Button
+                variant="primary"
+                size="lg"
+                class="ml-auto rounded-lg px-4 py-2 text-sm font-normal"
+                @click="handleSubscribeWorkspace"
+              >
+                {{ $t('subscription.subscribeNow') }}
+              </Button>
+            </template>
+
+            <!-- MEMBER View - read-only, workspace not subscribed -->
+            <template v-else-if="isMemberView">
+              <div class="flex flex-col gap-2">
+                <div class="text-sm font-bold text-text-primary">
+                  {{ $t('subscription.workspaceNotSubscribed') }}
+                </div>
+                <div class="text-sm text-text-secondary">
+                  {{ $t('subscription.contactOwnerToSubscribe') }}
+                </div>
+              </div>
+            </template>
+
+            <!-- Normal Subscribed State (Owner with subscription, or member viewing subscribed workspace) -->
+            <template v-else>
+              <div class="flex flex-col gap-2">
+                <div class="flex items-center gap-2">
+                  <span class="text-sm font-bold text-text-primary">
+                    {{ subscriptionTierName }}
+                  </span>
+                  <StatusBadge
+                    v-if="isCancelled"
+                    :label="$t('subscription.canceled')"
+                    severity="warn"
+                  />
+                </div>
+                <div class="flex items-baseline gap-1 font-inter font-semibold">
+                  <span class="text-2xl">${{ tierPrice }}</span>
+                  <span class="text-base">
+                    {{
+                      isInPersonalWorkspace
+                        ? $t('subscription.usdPerMonth')
+                        : $t('subscription.usdPerMonthPerMember')
+                    }}
+                  </span>
+                </div>
+                <div
+                  v-if="isActiveSubscription"
+                  :class="
+                    cn(
+                      'text-sm',
+                      isCancelled
+                        ? 'text-warning-background'
+                        : 'text-text-secondary'
+                    )
+                  "
+                >
+                  <template v-if="isCancelled">
+                    {{
+                      $t('subscription.expiresDate', {
+                        date: formattedEndDate
+                      })
+                    }}
+                  </template>
+                  <template v-else>
+                    {{
+                      $t('subscription.renewsDate', {
+                        date: formattedRenewalDate
+                      })
+                    }}
+                  </template>
+                </div>
+              </div>
+
+              <div
+                v-if="isActiveSubscription && permissions.canManageSubscription"
+                class="flex flex-wrap gap-2 md:ml-auto"
+              >
+                <!-- Cancelled state: show only Resubscribe button -->
+                <template v-if="isCancelled">
+                  <Button
+                    size="lg"
+                    variant="primary"
+                    class="rounded-lg px-4 text-sm font-normal"
+                    :loading="isResubscribing"
+                    @click="handleResubscribe"
+                  >
+                    {{ $t('subscription.resubscribe') }}
+                  </Button>
+                </template>
+
+                <!-- Active state: show Manage Payment, Upgrade, and menu -->
+                <template v-else>
+                  <Button
+                    v-if="!isFreeTierPlan"
+                    size="lg"
+                    variant="secondary"
+                    class="rounded-lg bg-interface-menu-component-surface-selected px-4 text-sm font-normal text-text-primary"
+                    @click="manageSubscription"
+                  >
+                    {{ $t('subscription.managePayment') }}
+                  </Button>
+                  <Button
+                    size="lg"
+                    variant="primary"
+                    class="rounded-lg px-4 text-sm font-normal text-text-primary"
+                    @click="handleUpgrade"
+                  >
+                    {{ $t('subscription.upgradePlan') }}
+                  </Button>
+                  <Button
+                    v-if="!isFreeTierPlan"
+                    v-tooltip="{ value: $t('g.moreOptions'), showDelay: 300 }"
+                    variant="secondary"
+                    size="lg"
+                    :aria-label="$t('g.moreOptions')"
+                    @click="planMenu?.toggle($event)"
+                  >
+                    <i class="pi pi-ellipsis-h" />
+                  </Button>
+                  <Menu ref="planMenu" :model="planMenuItems" :popup="true" />
+                </template>
+              </div>
+            </template>
+          </div>
+        </div>
+
+        <div class="flex flex-col gap-6 pt-6 lg:flex-row lg:items-stretch">
+          <div class="flex flex-col">
+            <div class="flex h-full flex-col gap-3">
+              <div
+                class="relative flex h-full flex-col justify-between gap-6 rounded-2xl bg-secondary-background p-5"
+              >
+                <Button
+                  variant="muted-textonly"
+                  size="icon-sm"
+                  class="absolute top-4 right-4"
+                  :loading="isLoadingBalance"
+                  @click="handleRefresh"
+                >
+                  <i class="pi pi-sync text-sm text-text-secondary" />
+                </Button>
+
+                <div class="flex flex-col gap-2">
+                  <div class="text-sm text-muted">
+                    {{ $t('subscription.totalCredits') }}
+                  </div>
+                  <Skeleton
+                    v-if="isLoadingBalance"
+                    width="8rem"
+                    height="2rem"
+                  />
+                  <div v-else class="text-2xl font-bold">
+                    {{ showZeroState ? '0' : totalCredits }}
+                  </div>
+                </div>
+
+                <!-- Credit Breakdown -->
+                <table class="text-sm text-muted">
+                  <tbody>
+                    <tr>
+                      <td class="pr-4 text-left align-middle font-bold">
+                        <Skeleton
+                          v-if="isLoadingBalance"
+                          width="5rem"
+                          height="1rem"
+                        />
+                        <span v-else>{{
+                          showZeroState ? '0 / 0' : includedCreditsDisplay
+                        }}</span>
+                      </td>
+                      <td class="align-middle" :title="creditsRemainingLabel">
+                        {{ creditsRemainingLabel }}
+                      </td>
+                    </tr>
+                    <tr>
+                      <td class="pr-4 text-left align-middle font-bold">
+                        <Skeleton
+                          v-if="isLoadingBalance"
+                          width="3rem"
+                          height="1rem"
+                        />
+                        <span v-else>{{
+                          showZeroState ? '0' : prepaidCredits
+                        }}</span>
+                      </td>
+                      <td
+                        class="align-middle"
+                        :title="$t('subscription.creditsYouveAdded')"
+                      >
+                        {{ $t('subscription.creditsYouveAdded') }}
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+
+                <div
+                  v-if="
+                    isActiveSubscription &&
+                    !showZeroState &&
+                    permissions.canTopUp
+                  "
+                  class="flex flex-col gap-3"
+                >
+                  <Button
+                    v-if="isFreeTierPlan"
+                    variant="gradient"
+                    class="min-h-8 w-full rounded-lg p-2 text-sm font-normal"
+                    @click="handleUpgradeToAddCredits"
+                  >
+                    {{ $t('subscription.upgradeToAddCredits') }}
+                  </Button>
+                  <Button
+                    v-else
+                    variant="secondary"
+                    class="min-h-8 rounded-lg bg-interface-menu-component-surface-selected p-2 text-sm font-normal text-text-primary"
+                    @click="handleAddApiCredits"
+                  >
+                    {{ $t('subscription.addCredits') }}
+                  </Button>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <div v-if="isActiveSubscription" class="flex flex-col gap-2">
+            <div class="text-sm text-text-primary">
+              {{ $t('subscription.yourPlanIncludes') }}
+            </div>
+
+            <div class="flex flex-col gap-0">
+              <div
+                v-for="benefit in tierBenefits"
+                :key="benefit.key"
+                class="flex items-center gap-2 py-2"
+              >
+                <i
+                  v-if="benefit.type === 'feature'"
+                  class="pi pi-check text-xs text-text-primary"
+                />
+                <i
+                  v-else-if="benefit.type === 'icon' && benefit.icon"
+                  :class="[benefit.icon, 'text-xs text-text-primary']"
+                />
+                <span
+                  v-else-if="benefit.type === 'metric' && benefit.value"
+                  class="text-sm font-normal whitespace-nowrap text-text-primary"
+                >
+                  {{ benefit.value }}
+                </span>
+                <span class="text-sm text-muted">
+                  {{ benefit.label }}
+                </span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- Members invoice card -->
+      <div
+        v-if="
+          isActiveSubscription &&
+          !isInPersonalWorkspace &&
+          permissions.canManageSubscription
+        "
+        class="mt-6 flex items-center justify-between gap-1 rounded-2xl border border-interface-stroke p-6 text-sm"
+      >
+        <div class="flex flex-col gap-2">
+          <h4 class="m-0 text-sm text-text-primary">
+            {{ $t('subscription.nextMonthInvoice') }}
+          </h4>
+          <span
+            class="cursor-pointer text-muted-foreground underline"
+            @click="manageSubscription"
+          >
+            {{ $t('subscription.invoiceHistory') }}
+          </span>
+        </div>
+        <div class="flex flex-col items-end gap-2">
+          <h4 class="m-0 font-bold">${{ nextMonthInvoice }}</h4>
+          <h5 class="m-0 text-muted-foreground">
+            {{ $t('subscription.memberCount', memberCount) }}
+          </h5>
+        </div>
+      </div>
+
+      <!-- View More Details - Outside main content -->
+      <div
+        v-if="permissions.canManageSubscription"
+        class="flex items-center gap-2 py-6"
+      >
+        <i class="pi pi-external-link text-muted"></i>
+        <a
+          href="https://www.comfy.org/cloud/pricing"
+          target="_blank"
+          rel="noopener noreferrer"
+          class="text-sm text-muted underline hover:opacity-80"
+        >
+          {{ $t('subscription.viewMoreDetailsPlans') }}
+        </a>
+      </div>
+    </template>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { storeToRefs } from 'pinia'
+import Menu from 'primevue/menu'
+import Skeleton from 'primevue/skeleton'
+import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import { useToast } from 'primevue/usetoast'
+
+import StatusBadge from '@/components/common/StatusBadge.vue'
+import Button from '@/components/ui/button/Button.vue'
+import { useBillingContext } from '@/composables/billing/useBillingContext'
+import { useBillingOperationStore } from '@/platform/workspace/stores/billingOperationStore'
+import { useSubscriptionActions } from '@/platform/cloud/subscription/composables/useSubscriptionActions'
+import { useSubscriptionCredits } from '@/platform/cloud/subscription/composables/useSubscriptionCredits'
+import { workspaceApi } from '@/platform/workspace/api/workspaceApi'
+import { useDialogService } from '@/services/dialogService'
+import {
+  DEFAULT_TIER_KEY,
+  TIER_TO_KEY,
+  getTierCredits,
+  getTierPrice
+} from '@/platform/cloud/subscription/constants/tierPricing'
+import { useSubscriptionDialog } from '@/platform/cloud/subscription/composables/useSubscriptionDialog'
+import type { TierBenefit } from '@/platform/cloud/subscription/utils/tierBenefits'
+import { getCommonTierBenefits } from '@/platform/cloud/subscription/utils/tierBenefits'
+import { useWorkspaceUI } from '@/platform/workspace/composables/useWorkspaceUI'
+import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
+import { cn } from '@/utils/tailwindUtil'
+
+const workspaceStore = useTeamWorkspaceStore()
+const { isWorkspaceSubscribed, isInPersonalWorkspace, members } =
+  storeToRefs(workspaceStore)
+const { permissions } = useWorkspaceUI()
+const { t, n } = useI18n()
+const toast = useToast()
+
+const billingOperationStore = useBillingOperationStore()
+const isSettingUp = computed(() => billingOperationStore.isSettingUp)
+
+const {
+  isActiveSubscription,
+  isFreeTier: isFreeTierPlan,
+  subscription,
+  showSubscriptionDialog,
+  manageSubscription,
+  fetchStatus,
+  fetchBalance,
+  getMaxSeats
+} = useBillingContext()
+
+const { showCancelSubscriptionDialog } = useDialogService()
+const { showPricingTable } = useSubscriptionDialog()
+
+const isResubscribing = ref(false)
+
+async function handleResubscribe() {
+  isResubscribing.value = true
+  try {
+    await workspaceApi.resubscribe()
+    toast.add({
+      severity: 'success',
+      summary: t('subscription.resubscribeSuccess'),
+      life: 5000
+    })
+    await Promise.all([fetchStatus(), fetchBalance()])
+  } catch (error) {
+    const message =
+      error instanceof Error ? error.message : 'Failed to resubscribe'
+    toast.add({
+      severity: 'error',
+      summary: t('g.error'),
+      detail: message,
+      life: 5000
+    })
+  } finally {
+    isResubscribing.value = false
+  }
+}
+
+// Only show cancelled state for team workspaces (workspace billing)
+// Personal workspaces use legacy billing which has different cancellation semantics
+const isCancelled = computed(
+  () =>
+    !isInPersonalWorkspace.value && (subscription.value?.isCancelled ?? false)
+)
+
+// Show subscribe prompt to owners without active subscription
+// Don't show if subscription is cancelled (still active until end date)
+const showSubscribePrompt = computed(() => {
+  if (!permissions.value.canManageSubscription) return false
+  if (isCancelled.value) return false
+  if (isInPersonalWorkspace.value) return !isActiveSubscription.value
+  return !isWorkspaceSubscribed.value
+})
+
+// MEMBER view without subscription - members can't manage subscription
+const isMemberView = computed(
+  () =>
+    !permissions.value.canManageSubscription &&
+    !isActiveSubscription.value &&
+    !isWorkspaceSubscribed.value
+)
+
+// Show zero state for credits (no real billing data yet)
+const showZeroState = computed(
+  () => showSubscribePrompt.value || isMemberView.value
+)
+
+// Subscribe workspace - opens the subscription dialog (personal or workspace variant)
+function handleSubscribeWorkspace() {
+  showSubscriptionDialog()
+}
+
+function handleUpgrade() {
+  isFreeTierPlan.value ? showPricingTable() : showSubscriptionDialog()
+}
+
+function handleUpgradeToAddCredits() {
+  showPricingTable()
+}
+const subscriptionTier = computed(() => subscription.value?.tier ?? null)
+const isYearlySubscription = computed(
+  () => subscription.value?.duration === 'ANNUAL'
+)
+
+const formattedRenewalDate = computed(() => {
+  if (!subscription.value?.renewalDate) return ''
+  const renewalDate = new Date(subscription.value.renewalDate)
+  return renewalDate.toLocaleDateString('en-US', {
+    month: 'short',
+    day: 'numeric',
+    year: 'numeric'
+  })
+})
+
+const formattedEndDate = computed(() => {
+  if (!subscription.value?.endDate) return ''
+  const endDate = new Date(subscription.value.endDate)
+  return endDate.toLocaleDateString('en-US', {
+    month: 'short',
+    day: 'numeric',
+    year: 'numeric'
+  })
+})
+
+const subscriptionTierName = computed(() => {
+  const tier = subscriptionTier.value
+  if (!tier) return ''
+  const key = TIER_TO_KEY[tier] ?? 'standard'
+  const baseName = t(`subscription.tiers.${key}.name`)
+  return isYearlySubscription.value
+    ? t('subscription.tierNameYearly', { name: baseName })
+    : baseName
+})
+
+const planMenu = ref<InstanceType<typeof Menu> | null>(null)
+
+const planMenuItems = computed(() => [
+  {
+    label: t('subscription.cancelSubscription'),
+    icon: 'pi pi-times',
+    command: () => {
+      showCancelSubscriptionDialog(subscription.value?.endDate ?? undefined)
+    }
+  }
+])
+
+const tierKey = computed(() => {
+  const tier = subscriptionTier.value
+  if (!tier) return DEFAULT_TIER_KEY
+  return TIER_TO_KEY[tier] ?? DEFAULT_TIER_KEY
+})
+const tierPrice = computed(() =>
+  getTierPrice(tierKey.value, isYearlySubscription.value)
+)
+
+const memberCount = computed(() => members.value.length)
+const nextMonthInvoice = computed(() => memberCount.value * tierPrice.value)
+
+const refillsDate = computed(() => {
+  if (!subscription.value?.renewalDate) return ''
+  const date = new Date(subscription.value.renewalDate)
+  const day = String(date.getDate()).padStart(2, '0')
+  const month = String(date.getMonth() + 1).padStart(2, '0')
+  const year = String(date.getFullYear()).slice(-2)
+  return `${month}/${day}/${year}`
+})
+
+const creditsRemainingLabel = computed(() =>
+  isYearlySubscription.value
+    ? t(
+        'subscription.creditsRemainingThisYear',
+        {
+          date: refillsDate.value
+        },
+        {
+          escapeParameter: false
+        }
+      )
+    : t(
+        'subscription.creditsRemainingThisMonth',
+        {
+          date: refillsDate.value
+        },
+        {
+          escapeParameter: false
+        }
+      )
+)
+
+const planTotalCredits = computed(() => {
+  const credits = getTierCredits(tierKey.value)
+  if (credits === null) return '—'
+  const total = isYearlySubscription.value ? credits * 12 : credits
+  return n(total)
+})
+
+const includedCreditsDisplay = computed(
+  () => `${monthlyBonusCredits.value} / ${planTotalCredits.value}`
+)
+
+const tierBenefits = computed((): TierBenefit[] => {
+  const key = tierKey.value
+  const benefits: TierBenefit[] = []
+
+  if (!isInPersonalWorkspace.value) {
+    benefits.push({
+      key: 'members',
+      type: 'icon',
+      label: t('subscription.membersLabel', { count: getMaxSeats(key) }),
+      icon: 'pi pi-user'
+    })
+  }
+
+  benefits.push(...getCommonTierBenefits(key, t, n))
+  return benefits
+})
+
+const { totalCredits, monthlyBonusCredits, prepaidCredits, isLoadingBalance } =
+  useSubscriptionCredits()
+
+const { handleAddApiCredits, handleRefresh } = useSubscriptionActions()
+
+// Focus-based polling: refresh balance when user returns from Stripe checkout
+const PENDING_TOPUP_KEY = 'pending_topup_timestamp'
+const TOPUP_EXPIRY_MS = 5 * 60 * 1000 // 5 minutes
+
+function handleWindowFocus() {
+  const timestampStr = localStorage.getItem(PENDING_TOPUP_KEY)
+  if (!timestampStr) return
+
+  const timestamp = parseInt(timestampStr, 10)
+
+  // Clear expired tracking (older than 5 minutes)
+  if (Date.now() - timestamp > TOPUP_EXPIRY_MS) {
+    localStorage.removeItem(PENDING_TOPUP_KEY)
+    return
+  }
+
+  // Refresh and clear tracking to prevent repeated calls
+  void handleRefresh()
+  localStorage.removeItem(PENDING_TOPUP_KEY)
+}
+
+onMounted(() => {
+  window.addEventListener('focus', handleWindowFocus)
+  void Promise.all([fetchStatus(), fetchBalance()])
+})
+
+onBeforeUnmount(() => {
+  window.removeEventListener('focus', handleWindowFocus)
+})
+</script>
+
+<style scoped>
+:deep(.bg-comfy-menu-secondary) {
+  background-color: transparent;
+}
+</style>
diff --git a/src/platform/workspace/components/SubscriptionRequiredDialogContentWorkspace.vue b/src/platform/workspace/components/SubscriptionRequiredDialogContentWorkspace.vue
new file mode 100644
index 0000000000..8b36540958
--- /dev/null
+++ b/src/platform/workspace/components/SubscriptionRequiredDialogContentWorkspace.vue
@@ -0,0 +1,340 @@
+<template>
+  <div
+    class="relative flex h-full flex-col gap-8 overflow-y-auto! p-4 pt-8 md:p-16"
+  >
+    <Button
+      v-if="checkoutStep === 'preview'"
+      size="icon"
+      variant="muted-textonly"
+      class="absolute top-2.5 left-2.5 shrink-0 rounded-full text-text-secondary hover:bg-white/10"
+      :aria-label="$t('g.back')"
+      @click="handleBackToPricing"
+    >
+      <i class="pi pi-arrow-left text-xl" />
+    </Button>
+
+    <Button
+      size="icon"
+      variant="muted-textonly"
+      class="absolute top-2.5 right-2.5 shrink-0 rounded-full text-text-secondary hover:bg-white/10"
+      :aria-label="$t('g.close')"
+      @click="handleClose"
+    >
+      <i class="pi pi-times text-xl" />
+    </Button>
+
+    <div v-if="reason === 'out_of_credits'" class="text-center">
+      <h2 class="m-0 text-xl text-muted-foreground lg:text-2xl">
+        {{ $t('credits.topUp.insufficientTitle') }}
+      </h2>
+      <p class="m-0 mt-2 text-sm text-text-secondary">
+        {{ $t('credits.topUp.insufficientMessage') }}
+      </p>
+    </div>
+
+    <!-- Pricing Table Step -->
+    <PricingTableWorkspace
+      v-if="checkoutStep === 'pricing'"
+      class="flex-1"
+      :is-loading="isLoadingPreview || isResubscribing"
+      :loading-tier="loadingTier"
+      @subscribe="handleSubscribeClick"
+      @resubscribe="handleResubscribe"
+    />
+
+    <!-- Subscription Preview Step - New Subscription -->
+    <SubscriptionAddPaymentPreviewWorkspace
+      v-else-if="
+        checkoutStep === 'preview' &&
+        previewData &&
+        previewData.transition_type === 'new_subscription'
+      "
+      :preview-data="previewData"
+      :tier-key="selectedTierKey!"
+      :billing-cycle="selectedBillingCycle"
+      :is-loading="isSubscribing || isPolling"
+      @add-credit-card="handleAddCreditCard"
+      @back="handleBackToPricing"
+    />
+
+    <!-- Subscription Preview Step - Plan Transition -->
+    <SubscriptionTransitionPreviewWorkspace
+      v-else-if="
+        checkoutStep === 'preview' &&
+        previewData &&
+        previewData.transition_type !== 'new_subscription'
+      "
+      :preview-data="previewData"
+      :is-loading="isSubscribing || isPolling"
+      @confirm="handleConfirmTransition"
+      @back="handleBackToPricing"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useToast } from 'primevue/usetoast'
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+import { useBillingContext } from '@/composables/billing/useBillingContext'
+import type { TierKey } from '@/platform/cloud/subscription/constants/tierPricing'
+import type { BillingCycle } from '@/platform/cloud/subscription/utils/subscriptionTierRank'
+import type { PreviewSubscribeResponse } from '@/platform/workspace/api/workspaceApi'
+import { workspaceApi } from '@/platform/workspace/api/workspaceApi'
+import { useBillingOperationStore } from '@/platform/workspace/stores/billingOperationStore'
+import type { SubscriptionDialogReason } from '@/platform/cloud/subscription/composables/useSubscriptionDialog'
+
+import PricingTableWorkspace from './PricingTableWorkspace.vue'
+import SubscriptionAddPaymentPreviewWorkspace from './SubscriptionAddPaymentPreviewWorkspace.vue'
+import SubscriptionTransitionPreviewWorkspace from './SubscriptionTransitionPreviewWorkspace.vue'
+
+type CheckoutStep = 'pricing' | 'preview'
+type CheckoutTierKey = Exclude<TierKey, 'free' | 'founder'>
+
+const { onClose, reason } = defineProps<{
+  onClose: () => void
+  reason?: SubscriptionDialogReason
+}>()
+
+const emit = defineEmits<{
+  close: [subscribed: boolean]
+}>()
+
+const { t } = useI18n()
+const toast = useToast()
+const { subscribe, previewSubscribe, plans, fetchStatus, fetchBalance } =
+  useBillingContext()
+
+const billingOperationStore = useBillingOperationStore()
+const isPolling = computed(() => billingOperationStore.hasPendingOperations)
+
+const checkoutStep = ref<CheckoutStep>('pricing')
+const isLoadingPreview = ref(false)
+const loadingTier = ref<CheckoutTierKey | null>(null)
+const isSubscribing = ref(false)
+const isResubscribing = ref(false)
+const previewData = ref<PreviewSubscribeResponse | null>(null)
+const selectedTierKey = ref<CheckoutTierKey | null>(null)
+const selectedBillingCycle = ref<BillingCycle>('yearly')
+
+function getApiPlanSlug(
+  tierKey: CheckoutTierKey,
+  billingCycle: BillingCycle
+): string | null {
+  const apiDuration = billingCycle === 'yearly' ? 'ANNUAL' : 'MONTHLY'
+  const apiTier = tierKey.toUpperCase()
+  const plan = plans.value.find(
+    (p) => p.tier === apiTier && p.duration === apiDuration
+  )
+  return plan?.slug ?? null
+}
+
+async function handleSubscribeClick(payload: {
+  tierKey: CheckoutTierKey
+  billingCycle: BillingCycle
+}) {
+  const { tierKey, billingCycle } = payload
+
+  isLoadingPreview.value = true
+  loadingTier.value = tierKey
+  selectedTierKey.value = tierKey
+  selectedBillingCycle.value = billingCycle
+
+  try {
+    const planSlug = getApiPlanSlug(tierKey, billingCycle)
+    if (!planSlug) {
+      toast.add({
+        severity: 'error',
+        summary: 'Unable to subscribe',
+        detail: 'This plan is not available',
+        life: 5000
+      })
+      return
+    }
+    const response = await previewSubscribe(planSlug)
+
+    if (!response || !response.allowed) {
+      toast.add({
+        severity: 'error',
+        summary: 'Unable to subscribe',
+        detail: response?.reason || 'This plan is not available',
+        life: 5000
+      })
+      return
+    }
+
+    previewData.value = response
+    checkoutStep.value = 'preview'
+  } catch (error) {
+    const message =
+      error instanceof Error
+        ? error.message
+        : 'Failed to load subscription preview'
+    toast.add({
+      severity: 'error',
+      summary: 'Error',
+      detail: message,
+      life: 5000
+    })
+  } finally {
+    isLoadingPreview.value = false
+    loadingTier.value = null
+  }
+}
+
+function handleBackToPricing() {
+  checkoutStep.value = 'pricing'
+  previewData.value = null
+}
+
+async function handleAddCreditCard() {
+  if (!selectedTierKey.value) return
+
+  isSubscribing.value = true
+  try {
+    const planSlug = getApiPlanSlug(
+      selectedTierKey.value,
+      selectedBillingCycle.value
+    )
+    if (!planSlug) return
+    const response = await subscribe(
+      planSlug,
+      'https://www.comfy.org/payment/success',
+      'https://www.comfy.org/payment/failed'
+    )
+
+    if (!response) return
+
+    if (response.status === 'subscribed') {
+      toast.add({
+        severity: 'success',
+        summary: t('subscription.required.pollingSuccess'),
+        life: 5000
+      })
+      await Promise.all([fetchStatus(), fetchBalance()])
+      emit('close', true)
+    } else if (
+      response.status === 'needs_payment_method' &&
+      response.payment_method_url
+    ) {
+      window.open(response.payment_method_url, '_blank')
+      billingOperationStore.startOperation(
+        response.billing_op_id,
+        'subscription'
+      )
+    } else if (response.status === 'pending_payment') {
+      billingOperationStore.startOperation(
+        response.billing_op_id,
+        'subscription'
+      )
+    }
+  } catch (error) {
+    const message =
+      error instanceof Error ? error.message : 'Failed to subscribe'
+    toast.add({
+      severity: 'error',
+      summary: 'Error',
+      detail: message,
+      life: 5000
+    })
+  } finally {
+    isSubscribing.value = false
+  }
+}
+
+async function handleConfirmTransition() {
+  if (!selectedTierKey.value) return
+
+  isSubscribing.value = true
+  try {
+    const planSlug = getApiPlanSlug(
+      selectedTierKey.value,
+      selectedBillingCycle.value
+    )
+    if (!planSlug) return
+    const response = await subscribe(
+      planSlug,
+      'https://www.comfy.org/payment/success',
+      'https://www.comfy.org/payment/failed'
+    )
+
+    if (!response) return
+
+    if (response.status === 'subscribed') {
+      toast.add({
+        severity: 'success',
+        summary: t('subscription.required.pollingSuccess'),
+        life: 5000
+      })
+      await Promise.all([fetchStatus(), fetchBalance()])
+      emit('close', true)
+    } else if (
+      response.status === 'needs_payment_method' &&
+      response.payment_method_url
+    ) {
+      window.open(response.payment_method_url, '_blank')
+      billingOperationStore.startOperation(
+        response.billing_op_id,
+        'subscription'
+      )
+    } else if (response.status === 'pending_payment') {
+      billingOperationStore.startOperation(
+        response.billing_op_id,
+        'subscription'
+      )
+    }
+  } catch (error) {
+    const message =
+      error instanceof Error ? error.message : 'Failed to update subscription'
+    toast.add({
+      severity: 'error',
+      summary: 'Error',
+      detail: message,
+      life: 5000
+    })
+  } finally {
+    isSubscribing.value = false
+  }
+}
+
+async function handleResubscribe() {
+  isResubscribing.value = true
+  try {
+    await workspaceApi.resubscribe()
+    toast.add({
+      severity: 'success',
+      summary: t('subscription.resubscribeSuccess'),
+      life: 5000
+    })
+    await Promise.all([fetchStatus(), fetchBalance()])
+    emit('close', true)
+  } catch (error) {
+    const message =
+      error instanceof Error ? error.message : 'Failed to resubscribe'
+    toast.add({
+      severity: 'error',
+      summary: 'Error',
+      detail: message,
+      life: 5000
+    })
+  } finally {
+    isResubscribing.value = false
+  }
+}
+
+function handleClose() {
+  onClose()
+}
+</script>
+
+<style scoped>
+.legacy-dialog :deep(.bg-comfy-menu-secondary) {
+  background-color: transparent;
+}
+
+.legacy-dialog :deep(.p-button) {
+  color: white;
+}
+</style>
diff --git a/src/platform/workspace/components/SubscriptionTransitionPreviewWorkspace.vue b/src/platform/workspace/components/SubscriptionTransitionPreviewWorkspace.vue
new file mode 100644
index 0000000000..69e47964be
--- /dev/null
+++ b/src/platform/workspace/components/SubscriptionTransitionPreviewWorkspace.vue
@@ -0,0 +1,264 @@
+<template>
+  <h2 class="m-0 mb-8 text-center text-xl text-muted-foreground lg:text-2xl">
+    {{ $t('subscription.preview.confirmPlanChange') }}
+  </h2>
+  <div
+    class="mx-auto flex h-full flex-col items-stretch justify-between text-sm"
+  >
+    <div>
+      <!-- Plan Comparison Header -->
+      <div class="flex items-center gap-4">
+        <!-- Current Plan -->
+        <div class="flex w-[250px] flex-col gap-1">
+          <span class="text-sm text-base-foreground">
+            {{ currentTierName }}
+          </span>
+          <div class="flex items-baseline gap-1">
+            <span class="text-2xl font-semibold text-base-foreground">
+              ${{ currentDisplayPrice }}
+            </span>
+            <span class="text-sm text-base-foreground">
+              {{ $t('subscription.usdPerMonthPerMember') }}
+            </span>
+          </div>
+          <div class="flex items-center gap-1 text-sm text-muted-foreground">
+            <i class="icon-[lucide--component] text-xs text-amber-400" />
+            <span
+              >{{ currentDisplayCredits }}
+              {{ $t('subscription.perMonth') }}</span
+            >
+          </div>
+          <span class="inline text-sm text-muted-foreground">
+            {{
+              $t('subscription.preview.ends', { date: currentPeriodEndDate })
+            }}
+          </span>
+        </div>
+
+        <!-- Arrow -->
+        <i class="pi pi-arrow-right size-8 text-muted-foreground" />
+
+        <!-- New Plan -->
+        <div class="flex flex-col gap-1">
+          <span class="text-sm font-semibold text-base-foreground">
+            {{ newTierName }}
+          </span>
+          <div class="flex items-baseline gap-1">
+            <span class="text-2xl font-semibold text-base-foreground">
+              ${{ newDisplayPrice }}
+            </span>
+            <span class="text-sm text-base-foreground">
+              {{ $t('subscription.usdPerMonthPerMember') }}
+            </span>
+          </div>
+          <div class="flex items-center gap-1 text-sm text-muted-foreground">
+            <i class="icon-[lucide--component] text-xs text-amber-400" />
+            <span
+              >{{ newDisplayCredits }} {{ $t('subscription.perMonth') }}</span
+            >
+          </div>
+          <span class="text-sm text-muted-foreground">
+            {{ $t('subscription.preview.starting', { date: effectiveDate }) }}
+          </span>
+        </div>
+      </div>
+
+      <!-- Credits Section -->
+      <div class="flex flex-col gap-3 pt-12 pb-6">
+        <div class="flex items-center justify-between">
+          <span class="text-base-foreground">
+            {{ $t('subscription.preview.eachMonthCreditsRefill') }}
+          </span>
+          <div class="flex items-center gap-1">
+            <i class="icon-[lucide--component] text-sm text-amber-400" />
+            <span class="font-bold text-base-foreground">
+              {{ newDisplayCredits }}
+            </span>
+          </div>
+        </div>
+      </div>
+
+      <!-- Proration Section -->
+      <div
+        v-if="showProration"
+        class="flex flex-col gap-2 border-t border-border-subtle py-6"
+      >
+        <div
+          v-if="proratedRefundCents > 0"
+          class="flex items-center justify-between"
+        >
+          <span class="text-muted-foreground">
+            {{
+              $t('subscription.preview.proratedRefund', {
+                plan: currentTierName
+              })
+            }}
+          </span>
+          <span class="text-muted-foreground">-${{ proratedRefund }}</span>
+        </div>
+        <div
+          v-if="proratedChargeCents > 0"
+          class="flex items-center justify-between"
+        >
+          <span class="text-muted-foreground">
+            {{
+              $t('subscription.preview.proratedCharge', { plan: newTierName })
+            }}
+          </span>
+          <span class="text-muted-foreground">${{ proratedCharge }}</span>
+        </div>
+      </div>
+
+      <!-- Total Due Section -->
+      <div class="flex flex-col gap-2 border-t border-border-subtle pt-6">
+        <div class="flex items-center justify-between text-base">
+          <span class="text-base-foreground">
+            {{ $t('subscription.preview.totalDueToday') }}
+          </span>
+          <span class="font-bold text-base-foreground">
+            ${{ totalDueToday }}
+          </span>
+        </div>
+        <span class="text-sm text-muted-foreground">
+          {{
+            $t('subscription.preview.nextPaymentDue', {
+              date: nextPaymentDate
+            })
+          }}
+        </span>
+      </div>
+    </div>
+
+    <!-- Footer -->
+    <div class="flex flex-col gap-2 pt-8">
+      <Button
+        variant="secondary"
+        size="lg"
+        class="w-full rounded-lg"
+        :loading="isLoading"
+        @click="$emit('confirm')"
+      >
+        {{ $t('subscription.preview.confirm') }}
+      </Button>
+
+      <Button
+        variant="textonly"
+        class="cursor-pointer text-center text-xs text-muted-foreground transition-colors hover:bg-none hover:text-base-foreground"
+        @click="$emit('back')"
+      >
+        {{ $t('subscription.preview.backToAllPlans') }}
+      </Button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+import { getTierCredits } from '@/platform/cloud/subscription/constants/tierPricing'
+import type { PreviewSubscribeResponse } from '@/platform/workspace/api/workspaceApi'
+
+interface Props {
+  previewData: PreviewSubscribeResponse
+  isLoading?: boolean
+}
+
+const { previewData, isLoading = false } = defineProps<Props>()
+
+defineEmits<{
+  confirm: []
+  back: []
+}>()
+
+const { t, n } = useI18n()
+
+function formatTierName(tier: string): string {
+  return t(`subscription.tiers.${tier.toLowerCase()}.name`)
+}
+
+function formatDate(dateStr: string): string {
+  return new Date(dateStr).toLocaleDateString('en-US', {
+    month: 'short',
+    day: 'numeric',
+    year: 'numeric'
+  })
+}
+
+const currentTierName = computed(() =>
+  previewData.current_plan ? formatTierName(previewData.current_plan.tier) : ''
+)
+
+const newTierName = computed(() => formatTierName(previewData.new_plan.tier))
+
+const currentDisplayPrice = computed(() =>
+  previewData.current_plan
+    ? (previewData.current_plan.price_cents / 100).toFixed(0)
+    : '0'
+)
+
+const newDisplayPrice = computed(() =>
+  (previewData.new_plan.price_cents / 100).toFixed(0)
+)
+
+const currentDisplayCredits = computed(() => {
+  if (!previewData.current_plan) return n(0)
+  const tierKey = previewData.current_plan.tier.toLowerCase() as
+    | 'standard'
+    | 'creator'
+    | 'pro'
+  return n(getTierCredits(tierKey) ?? 0)
+})
+
+const newDisplayCredits = computed(() => {
+  const tierKey = previewData.new_plan.tier.toLowerCase() as
+    | 'standard'
+    | 'creator'
+    | 'pro'
+  return n(getTierCredits(tierKey) ?? 0)
+})
+
+const currentPeriodEndDate = computed(() =>
+  previewData.current_plan?.period_end
+    ? formatDate(previewData.current_plan.period_end)
+    : ''
+)
+
+const effectiveDate = computed(() => formatDate(previewData.effective_at))
+
+const showProration = computed(() => previewData.is_immediate)
+
+const proratedRefundCents = computed(() => {
+  if (!previewData.current_plan || !previewData.is_immediate) return 0
+  const chargeToday = previewData.cost_today_cents
+  const newPlanCost = previewData.new_plan.price_cents
+  if (chargeToday < newPlanCost) {
+    return newPlanCost - chargeToday
+  }
+  return 0
+})
+
+const proratedRefund = computed(() =>
+  (proratedRefundCents.value / 100).toFixed(2)
+)
+
+const proratedChargeCents = computed(() => {
+  if (!previewData.is_immediate) return 0
+  return previewData.cost_today_cents
+})
+
+const proratedCharge = computed(() =>
+  (proratedChargeCents.value / 100).toFixed(2)
+)
+
+const totalDueToday = computed(() =>
+  (previewData.cost_today_cents / 100).toFixed(2)
+)
+
+const nextPaymentDate = computed(() =>
+  previewData.new_plan.period_end
+    ? formatDate(previewData.new_plan.period_end)
+    : formatDate(previewData.effective_at)
+)
+</script>
diff --git a/src/platform/workspace/components/TopUpCreditsDialogContentWorkspace.vue b/src/platform/workspace/components/TopUpCreditsDialogContentWorkspace.vue
new file mode 100644
index 0000000000..cced9c7d96
--- /dev/null
+++ b/src/platform/workspace/components/TopUpCreditsDialogContentWorkspace.vue
@@ -0,0 +1,295 @@
+<template>
+  <div
+    class="flex min-w-[460px] flex-col rounded-2xl border border-border-default bg-base-background shadow-[1px_1px_8px_0_rgba(0,0,0,0.4)]"
+  >
+    <!-- Header -->
+    <div class="flex items-center justify-between p-8">
+      <h2 class="m-0 text-lg font-bold text-base-foreground">
+        {{
+          isInsufficientCredits
+            ? $t('credits.topUp.addMoreCreditsToRun')
+            : $t('credits.topUp.addMoreCredits')
+        }}
+      </h2>
+      <button
+        class="focus-visible:ring-secondary-foreground cursor-pointer rounded-sm border-none bg-transparent p-0 text-muted-foreground transition-colors hover:text-base-foreground focus-visible:ring-1 focus-visible:outline-none"
+        @click="() => handleClose()"
+      >
+        <i class="icon-[lucide--x] size-6" />
+      </button>
+    </div>
+    <p
+      v-if="isInsufficientCredits"
+      class="m-0 px-8 text-sm text-muted-foreground"
+    >
+      {{ $t('credits.topUp.insufficientWorkflowMessage') }}
+    </p>
+
+    <!-- Preset amount buttons -->
+    <div class="px-8">
+      <h3 class="m-0 text-sm font-normal text-muted-foreground">
+        {{ $t('credits.topUp.selectAmount') }}
+      </h3>
+      <div class="flex gap-2 pt-3">
+        <Button
+          v-for="amount in PRESET_AMOUNTS"
+          :key="amount"
+          :autofocus="amount === 50"
+          variant="secondary"
+          size="lg"
+          :class="
+            cn(
+              'focus-visible:ring-secondary-foreground h-10 w-full text-base font-medium',
+              selectedPreset === amount && 'bg-secondary-background-selected'
+            )
+          "
+          @click="handlePresetClick(amount)"
+        >
+          ${{ amount }}
+        </Button>
+      </div>
+    </div>
+    <!-- Amount (USD) / Credits -->
+    <div class="flex gap-2 px-8 pt-8">
+      <!-- You Pay -->
+      <div class="flex flex-1 flex-col gap-3">
+        <div class="text-sm text-muted-foreground">
+          {{ $t('credits.topUp.youPay') }}
+        </div>
+        <FormattedNumberStepper
+          :model-value="payAmount"
+          :min="0"
+          :max="MAX_AMOUNT"
+          :step="getStepAmount"
+          @update:model-value="handlePayAmountChange"
+          @max-reached="showCeilingWarning = true"
+        >
+          <template #prefix>
+            <span class="shrink-0 text-base font-semibold text-base-foreground"
+              >$</span
+            >
+          </template>
+        </FormattedNumberStepper>
+      </div>
+
+      <!-- You Get -->
+      <div class="flex flex-1 flex-col gap-3">
+        <div class="text-sm text-muted-foreground">
+          {{ $t('credits.topUp.youGet') }}
+        </div>
+        <FormattedNumberStepper
+          v-model="creditsModel"
+          :min="0"
+          :max="usdToCredits(MAX_AMOUNT)"
+          :step="getCreditsStepAmount"
+          @max-reached="showCeilingWarning = true"
+        >
+          <template #prefix>
+            <i class="icon-[lucide--component] size-4 shrink-0 text-gold-500" />
+          </template>
+        </FormattedNumberStepper>
+      </div>
+    </div>
+
+    <!-- Warnings -->
+
+    <p
+      v-if="isBelowMin"
+      class="m-0 flex items-center justify-center gap-1 px-8 pt-4 text-center text-sm text-red-500"
+    >
+      <i class="icon-[lucide--component] size-4" />
+      {{
+        $t('credits.topUp.minRequired', {
+          credits: formatNumber(usdToCredits(MIN_AMOUNT))
+        })
+      }}
+    </p>
+    <p
+      v-if="showCeilingWarning"
+      class="m-0 flex items-center justify-center gap-1 px-8 pt-4 text-center text-sm text-gold-500"
+    >
+      <i class="icon-[lucide--component] size-4" />
+      {{
+        $t('credits.topUp.maxAllowed', {
+          credits: formatNumber(usdToCredits(MAX_AMOUNT))
+        })
+      }}
+      <span>{{ $t('credits.topUp.needMore') }}</span>
+      <a
+        href="https://www.comfy.org/cloud/enterprise"
+        target="_blank"
+        class="ml-1 text-inherit"
+        >{{ $t('credits.topUp.contactUs') }}</a
+      >
+    </p>
+
+    <div class="flex flex-col gap-8 p-8">
+      <Button
+        :disabled="!isValidAmount || loading || isPolling"
+        :loading="loading || isPolling"
+        variant="primary"
+        size="lg"
+        class="h-10 justify-center"
+        @click="handleBuy"
+      >
+        {{ $t('subscription.addCredits') }}
+      </Button>
+      <div class="flex items-center justify-center gap-1">
+        <a
+          :href="pricingUrl"
+          target="_blank"
+          class="flex items-center gap-1 text-sm text-muted-foreground no-underline transition-colors hover:text-base-foreground"
+        >
+          {{ $t('credits.topUp.viewPricing') }}
+          <i class="icon-[lucide--external-link] size-4" />
+        </a>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useToast } from 'primevue/usetoast'
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import { creditsToUsd, usdToCredits } from '@/base/credits/comfyCredits'
+import Button from '@/components/ui/button/Button.vue'
+import FormattedNumberStepper from '@/components/ui/stepper/FormattedNumberStepper.vue'
+import { useBillingContext } from '@/composables/billing/useBillingContext'
+import { useExternalLink } from '@/composables/useExternalLink'
+import { useTelemetry } from '@/platform/telemetry'
+import { clearTopupTracking } from '@/platform/telemetry/topupTracker'
+import { workspaceApi } from '@/platform/workspace/api/workspaceApi'
+import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
+import { useBillingOperationStore } from '@/platform/workspace/stores/billingOperationStore'
+import { useDialogStore } from '@/stores/dialogStore'
+import { cn } from '@/utils/tailwindUtil'
+
+const { isInsufficientCredits = false } = defineProps<{
+  isInsufficientCredits?: boolean
+}>()
+
+const { t } = useI18n()
+const dialogStore = useDialogStore()
+const settingsDialog = useSettingsDialog()
+const telemetry = useTelemetry()
+const toast = useToast()
+const { buildDocsUrl, docsPaths } = useExternalLink()
+const { fetchBalance } = useBillingContext()
+
+const billingOperationStore = useBillingOperationStore()
+const isPolling = computed(() => billingOperationStore.hasPendingOperations)
+
+// Constants
+const PRESET_AMOUNTS = [10, 25, 50, 100]
+const MIN_AMOUNT = 5
+const MAX_AMOUNT = 10000
+
+// State
+const selectedPreset = ref<number | null>(50)
+const payAmount = ref(50)
+const showCeilingWarning = ref(false)
+const loading = ref(false)
+
+// Computed
+const pricingUrl = computed(() =>
+  buildDocsUrl(docsPaths.partnerNodesPricing, { includeLocale: true })
+)
+
+const creditsModel = computed({
+  get: () => usdToCredits(payAmount.value),
+  set: (newCredits: number) => {
+    payAmount.value = Math.round(creditsToUsd(newCredits))
+    selectedPreset.value = null
+  }
+})
+
+const isValidAmount = computed(
+  () => payAmount.value >= MIN_AMOUNT && payAmount.value <= MAX_AMOUNT
+)
+
+const isBelowMin = computed(() => payAmount.value < MIN_AMOUNT)
+
+// Utility functions
+function formatNumber(num: number): string {
+  return num.toLocaleString('en-US')
+}
+
+// Step amount functions
+function getStepAmount(currentAmount: number): number {
+  if (currentAmount < 100) return 5
+  if (currentAmount < 1000) return 50
+  return 100
+}
+
+function getCreditsStepAmount(currentCredits: number): number {
+  const usdAmount = creditsToUsd(currentCredits)
+  return usdToCredits(getStepAmount(usdAmount))
+}
+
+// Event handlers
+function handlePayAmountChange(value: number) {
+  payAmount.value = value
+  selectedPreset.value = null
+  showCeilingWarning.value = false
+}
+
+function handlePresetClick(amount: number) {
+  showCeilingWarning.value = false
+  payAmount.value = amount
+  selectedPreset.value = amount
+}
+
+function handleClose(clearTracking = true) {
+  if (clearTracking) {
+    clearTopupTracking()
+  }
+  dialogStore.closeDialog({ key: 'top-up-credits' })
+}
+
+async function handleBuy() {
+  if (loading.value || !isValidAmount.value) return
+
+  loading.value = true
+  try {
+    telemetry?.trackApiCreditTopupButtonPurchaseClicked(payAmount.value)
+
+    const amountCents = payAmount.value * 100
+    const response = await workspaceApi.createTopup(amountCents)
+
+    if (response.status === 'completed') {
+      toast.add({
+        severity: 'success',
+        summary: t('credits.topUp.purchaseSuccess'),
+        life: 5000
+      })
+      await fetchBalance()
+      handleClose(false)
+      settingsDialog.show('workspace')
+    } else if (response.status === 'pending') {
+      billingOperationStore.startOperation(response.billing_op_id, 'topup')
+    } else {
+      toast.add({
+        severity: 'error',
+        summary: t('credits.topUp.purchaseError'),
+        detail: t('credits.topUp.unknownError'),
+        life: 5000
+      })
+    }
+  } catch (error) {
+    console.error('Purchase failed:', error)
+
+    const errorMessage =
+      error instanceof Error ? error.message : t('credits.topUp.unknownError')
+    toast.add({
+      severity: 'error',
+      summary: t('credits.topUp.purchaseError'),
+      detail: t('credits.topUp.purchaseErrorDetail', { error: errorMessage }),
+      life: 5000
+    })
+  } finally {
+    loading.value = false
+  }
+}
+</script>
diff --git a/src/platform/workspace/components/WorkspaceProfilePic.vue b/src/platform/workspace/components/WorkspaceProfilePic.vue
new file mode 100644
index 0000000000..bc147a61c6
--- /dev/null
+++ b/src/platform/workspace/components/WorkspaceProfilePic.vue
@@ -0,0 +1,43 @@
+<template>
+  <div
+    class="flex size-8 items-center justify-center rounded-md text-base font-semibold text-white"
+    :style="{
+      background: gradient,
+      textShadow: '0 1px 2px rgba(0, 0, 0, 0.2)'
+    }"
+  >
+    {{ letter }}
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+
+const { workspaceName } = defineProps<{
+  workspaceName: string
+}>()
+
+const letter = computed(() => workspaceName?.charAt(0)?.toUpperCase() ?? '?')
+
+const gradient = computed(() => {
+  const seed = letter.value.charCodeAt(0)
+
+  function mulberry32(a: number) {
+    return function () {
+      let t = (a += 0x6d2b79f5)
+      t = Math.imul(t ^ (t >>> 15), t | 1)
+      t ^= t + Math.imul(t ^ (t >>> 7), t | 61)
+      return ((t ^ (t >>> 14)) >>> 0) / 4294967296
+    }
+  }
+
+  const rand = mulberry32(seed)
+
+  const hue1 = Math.floor(rand() * 360)
+  const hue2 = (hue1 + 40 + Math.floor(rand() * 80)) % 360
+  const sat = 65 + Math.floor(rand() * 20)
+  const light = 55 + Math.floor(rand() * 15)
+
+  return `linear-gradient(135deg, hsl(${hue1}, ${sat}%, ${light}%), hsl(${hue2}, ${sat}%, ${light}%))`
+})
+</script>
diff --git a/src/platform/workspace/components/WorkspaceSwitcherPopover.vue b/src/platform/workspace/components/WorkspaceSwitcherPopover.vue
new file mode 100644
index 0000000000..555aff44ed
--- /dev/null
+++ b/src/platform/workspace/components/WorkspaceSwitcherPopover.vue
@@ -0,0 +1,238 @@
+<template>
+  <div class="flex w-80 flex-col overflow-hidden rounded-lg">
+    <div class="flex flex-col overflow-y-auto">
+      <!-- Loading state -->
+      <div v-if="isFetchingWorkspaces" class="flex flex-col gap-2 p-2">
+        <div
+          v-for="i in 2"
+          :key="i"
+          class="flex h-[54px] animate-pulse items-center gap-2 rounded-sm px-2 py-4"
+        >
+          <div class="size-8 rounded-full bg-secondary-background" />
+          <div class="flex flex-1 flex-col gap-1">
+            <div class="h-4 w-24 rounded-sm bg-secondary-background" />
+            <div class="h-3 w-16 rounded-sm bg-secondary-background" />
+          </div>
+        </div>
+      </div>
+
+      <!-- Workspace list -->
+      <template v-else>
+        <template v-for="workspace in availableWorkspaces" :key="workspace.id">
+          <div class="border-b border-border-default p-2">
+            <div
+              :class="
+                cn(
+                  'group flex h-[54px] w-full items-center gap-2 rounded-sm px-2 py-4',
+                  'hover:bg-secondary-background-hover',
+                  isCurrentWorkspace(workspace) && 'bg-secondary-background'
+                )
+              "
+            >
+              <button
+                class="flex flex-1 cursor-pointer items-center gap-2 border-none bg-transparent p-0"
+                @click="handleSelectWorkspace(workspace)"
+              >
+                <WorkspaceProfilePic
+                  class="size-8 text-sm"
+                  :workspace-name="workspace.name"
+                />
+                <div class="flex min-w-0 flex-1 flex-col items-start gap-1">
+                  <div class="flex items-center gap-1.5">
+                    <span class="text-sm text-base-foreground">
+                      {{
+                        workspace.type === 'personal'
+                          ? $t('workspaceSwitcher.personal')
+                          : workspace.name
+                      }}
+                    </span>
+                    <span
+                      v-if="getTierLabel(workspace)"
+                      class="rounded-full bg-base-foreground px-1 py-0.5 text-[10px] font-bold text-base-background uppercase"
+                    >
+                      {{ getTierLabel(workspace) }}
+                    </span>
+                  </div>
+                  <span class="text-xs text-muted-foreground">
+                    {{ getRoleLabel(workspace.role) }}
+                  </span>
+                </div>
+                <i
+                  v-if="isCurrentWorkspace(workspace)"
+                  class="pi pi-check text-sm text-base-foreground"
+                />
+              </button>
+            </div>
+          </div>
+        </template>
+      </template>
+
+      <!-- Create workspace button -->
+      <div class="p-2">
+        <div
+          :class="
+            cn(
+              'flex h-12 w-full items-center gap-2 rounded-sm p-2',
+              canCreateWorkspace
+                ? 'cursor-pointer hover:bg-secondary-background-hover'
+                : 'cursor-default'
+            )
+          "
+          @click="canCreateWorkspace && handleCreateWorkspace()"
+        >
+          <div
+            :class="
+              cn(
+                'flex size-8 items-center justify-center rounded-full bg-secondary-background',
+                !canCreateWorkspace && 'opacity-50'
+              )
+            "
+          >
+            <i class="pi pi-plus text-sm text-muted-foreground" />
+          </div>
+          <div class="flex min-w-0 flex-1 flex-col">
+            <span
+              v-if="canCreateWorkspace"
+              class="text-sm text-muted-foreground"
+            >
+              {{ $t('workspaceSwitcher.createWorkspace') }}
+            </span>
+            <span v-else class="text-sm text-muted-foreground">
+              {{ $t('workspaceSwitcher.maxWorkspacesReached') }}
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { storeToRefs } from 'pinia'
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import WorkspaceProfilePic from '@/platform/workspace/components/WorkspaceProfilePic.vue'
+import { useBillingContext } from '@/composables/billing/useBillingContext'
+import { useWorkspaceSwitch } from '@/platform/workspace/composables/useWorkspaceSwitch'
+import type {
+  SubscriptionTier,
+  WorkspaceRole,
+  WorkspaceType
+} from '@/platform/workspace/api/workspaceApi'
+import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
+import { cn } from '@/utils/tailwindUtil'
+
+interface AvailableWorkspace {
+  id: string
+  name: string
+  type: WorkspaceType
+  role: WorkspaceRole
+  isSubscribed: boolean
+  subscriptionPlan: string | null
+  subscriptionTier: SubscriptionTier | null
+}
+
+const emit = defineEmits<{
+  select: [workspace: AvailableWorkspace]
+  create: []
+}>()
+
+const { t } = useI18n()
+const { switchWithConfirmation } = useWorkspaceSwitch()
+const { subscription } = useBillingContext()
+
+const tierKeyMap: Record<string, string> = {
+  FREE: 'free',
+  STANDARD: 'standard',
+  CREATOR: 'creator',
+  PRO: 'pro',
+  FOUNDER: 'founder',
+  FOUNDERS_EDITION: 'founder'
+}
+
+function formatTierName(
+  tier: string | null | undefined,
+  isYearly: boolean
+): string {
+  if (!tier) return ''
+  const key = tierKeyMap[tier] ?? 'standard'
+  const baseName = t(`subscription.tiers.${key}.name`)
+  return isYearly
+    ? t('subscription.tierNameYearly', { name: baseName })
+    : baseName
+}
+
+const currentSubscriptionTierName = computed(() => {
+  const tier = subscription.value?.tier
+  if (!tier) return ''
+  const isYearly = subscription.value?.duration === 'ANNUAL'
+  return formatTierName(tier, isYearly)
+})
+
+const workspaceStore = useTeamWorkspaceStore()
+const { workspaceId, workspaces, canCreateWorkspace, isFetchingWorkspaces } =
+  storeToRefs(workspaceStore)
+
+const availableWorkspaces = computed<AvailableWorkspace[]>(() =>
+  workspaces.value.map((w) => ({
+    id: w.id,
+    name: w.name,
+    type: w.type,
+    role: w.role,
+    isSubscribed: w.isSubscribed,
+    subscriptionPlan: w.subscriptionPlan,
+    subscriptionTier: w.subscriptionTier
+  }))
+)
+
+function isCurrentWorkspace(workspace: AvailableWorkspace): boolean {
+  return workspace.id === workspaceId.value
+}
+
+function getRoleLabel(role: AvailableWorkspace['role']): string {
+  if (role === 'owner') return t('workspaceSwitcher.roleOwner')
+  if (role === 'member') return t('workspaceSwitcher.roleMember')
+  return ''
+}
+
+function getTierLabel(workspace: AvailableWorkspace): string | null {
+  // For the current/active workspace, use billing context directly
+  // This ensures we always have the most up-to-date subscription info
+  if (isCurrentWorkspace(workspace)) {
+    return currentSubscriptionTierName.value || null
+  }
+
+  // For non-active workspaces, use cached store data
+  if (!workspace.isSubscribed) return null
+
+  if (workspace.subscriptionTier) {
+    return formatTierName(workspace.subscriptionTier, false)
+  }
+
+  if (!workspace.subscriptionPlan) return null
+
+  // Parse plan slug (format: TIER_DURATION, e.g. "CREATOR_MONTHLY", "PRO_YEARLY")
+  const planSlug = workspace.subscriptionPlan
+
+  // Extract tier from plan slug (e.g., "CREATOR_MONTHLY" -> "CREATOR")
+  const tierMatch = Object.keys(tierKeyMap).find((tier) =>
+    planSlug.startsWith(tier)
+  )
+  if (!tierMatch) return null
+
+  const isYearly = planSlug.includes('YEARLY') || planSlug.includes('ANNUAL')
+  return formatTierName(tierMatch, isYearly)
+}
+
+async function handleSelectWorkspace(workspace: AvailableWorkspace) {
+  const success = await switchWithConfirmation(workspace.id)
+  if (success) {
+    emit('select', workspace)
+  }
+}
+
+function handleCreateWorkspace() {
+  emit('create')
+}
+</script>
diff --git a/src/platform/workspace/components/dialogs/CreateWorkspaceDialogContent.vue b/src/platform/workspace/components/dialogs/CreateWorkspaceDialogContent.vue
new file mode 100644
index 0000000000..46345d62bb
--- /dev/null
+++ b/src/platform/workspace/components/dialogs/CreateWorkspaceDialogContent.vue
@@ -0,0 +1,112 @@
+<template>
+  <div
+    class="flex w-full max-w-[400px] flex-col rounded-2xl border border-border-default bg-base-background"
+  >
+    <!-- Header -->
+    <div
+      class="flex h-12 items-center justify-between border-b border-border-default px-4"
+    >
+      <h2 class="m-0 text-sm font-normal text-base-foreground">
+        {{ $t('workspacePanel.createWorkspaceDialog.title') }}
+      </h2>
+      <button
+        class="focus-visible:ring-secondary-foreground cursor-pointer rounded-sm border-none bg-transparent p-0 text-muted-foreground transition-colors hover:text-base-foreground focus-visible:ring-1 focus-visible:outline-none"
+        :aria-label="$t('g.close')"
+        @click="onCancel"
+      >
+        <i class="pi pi-times size-4" />
+      </button>
+    </div>
+
+    <!-- Body -->
+    <div class="flex flex-col gap-4 p-4">
+      <p class="m-0 text-sm text-muted-foreground">
+        {{ $t('workspacePanel.createWorkspaceDialog.message') }}
+      </p>
+      <div class="flex flex-col gap-2">
+        <label class="text-sm text-base-foreground">
+          {{ $t('workspacePanel.createWorkspaceDialog.nameLabel') }}
+        </label>
+        <input
+          v-model="workspaceName"
+          type="text"
+          class="focus:ring-secondary-foreground w-full rounded-lg border border-border-default bg-transparent px-3 py-2 text-sm text-base-foreground placeholder:text-muted-foreground focus:ring-1 focus:outline-none"
+          :placeholder="
+            $t('workspacePanel.createWorkspaceDialog.namePlaceholder')
+          "
+          @keydown.enter="isValidName && onCreate()"
+        />
+      </div>
+    </div>
+
+    <!-- Footer -->
+    <div class="flex items-center justify-end gap-4 p-4">
+      <Button variant="muted-textonly" @click="onCancel">
+        {{ $t('g.cancel') }}
+      </Button>
+      <Button
+        variant="primary"
+        size="lg"
+        :loading
+        :disabled="!isValidName"
+        @click="onCreate"
+      >
+        {{ $t('workspacePanel.createWorkspaceDialog.create') }}
+      </Button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useToast } from 'primevue/usetoast'
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
+import { useDialogStore } from '@/stores/dialogStore'
+
+const { onConfirm } = defineProps<{
+  onConfirm?: (name: string) => void | Promise<void>
+}>()
+
+const { t } = useI18n()
+const dialogStore = useDialogStore()
+const toast = useToast()
+const workspaceStore = useTeamWorkspaceStore()
+const loading = ref(false)
+const workspaceName = ref('')
+
+const isValidName = computed(() => {
+  const name = workspaceName.value.trim()
+  const safeNameRegex = /^[a-zA-Z0-9][a-zA-Z0-9\s\-_'.,()&+]*$/
+  return name.length >= 1 && name.length <= 50 && safeNameRegex.test(name)
+})
+
+function onCancel() {
+  dialogStore.closeDialog({ key: 'create-workspace' })
+}
+
+async function onCreate() {
+  if (!isValidName.value) return
+  loading.value = true
+  try {
+    const name = workspaceName.value.trim()
+    // Call optional callback if provided
+    await onConfirm?.(name)
+    dialogStore.closeDialog({ key: 'create-workspace' })
+    // Create workspace and switch to it (triggers reload internally)
+    await workspaceStore.createWorkspace(name)
+  } catch (error) {
+    console.error('[CreateWorkspaceDialog] Failed to create workspace:', error)
+    toast.add({
+      severity: 'error',
+      summary: t('workspacePanel.toast.failedToCreateWorkspace'),
+      detail: error instanceof Error ? error.message : t('g.unknownError'),
+      life: 5000
+    })
+  } finally {
+    loading.value = false
+  }
+}
+</script>
diff --git a/src/platform/workspace/components/dialogs/DeleteWorkspaceDialogContent.vue b/src/platform/workspace/components/dialogs/DeleteWorkspaceDialogContent.vue
new file mode 100644
index 0000000000..c2e49a1669
--- /dev/null
+++ b/src/platform/workspace/components/dialogs/DeleteWorkspaceDialogContent.vue
@@ -0,0 +1,89 @@
+<template>
+  <div
+    class="flex w-full max-w-[360px] flex-col rounded-2xl border border-border-default bg-base-background"
+  >
+    <!-- Header -->
+    <div
+      class="flex h-12 items-center justify-between border-b border-border-default px-4"
+    >
+      <h2 class="m-0 text-sm font-normal text-base-foreground">
+        {{ $t('workspacePanel.deleteDialog.title') }}
+      </h2>
+      <button
+        class="focus-visible:ring-secondary-foreground cursor-pointer rounded-sm border-none bg-transparent p-0 text-muted-foreground transition-colors hover:text-base-foreground focus-visible:ring-1 focus-visible:outline-none"
+        :aria-label="$t('g.close')"
+        @click="onCancel"
+      >
+        <i class="pi pi-times size-4" />
+      </button>
+    </div>
+
+    <!-- Body -->
+    <div class="p-4">
+      <p class="m-0 text-sm text-muted-foreground">
+        {{
+          workspaceName
+            ? $t('workspacePanel.deleteDialog.messageWithName', {
+                name: workspaceName
+              })
+            : $t('workspacePanel.deleteDialog.message')
+        }}
+      </p>
+    </div>
+
+    <!-- Footer -->
+    <div class="flex items-center justify-end gap-4 p-4">
+      <Button variant="muted-textonly" @click="onCancel">
+        {{ $t('g.cancel') }}
+      </Button>
+      <Button variant="destructive" size="lg" :loading @click="onDelete">
+        {{ $t('g.delete') }}
+      </Button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useToast } from 'primevue/usetoast'
+import { ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
+import { useDialogStore } from '@/stores/dialogStore'
+
+const { workspaceId, workspaceName } = defineProps<{
+  workspaceId?: string
+  workspaceName?: string
+}>()
+
+const { t } = useI18n()
+const toast = useToast()
+const dialogStore = useDialogStore()
+const workspaceStore = useTeamWorkspaceStore()
+const loading = ref(false)
+
+function onCancel() {
+  dialogStore.closeDialog({ key: 'delete-workspace' })
+}
+
+async function onDelete() {
+  loading.value = true
+  try {
+    // Delete workspace (uses workspaceId if provided, otherwise current workspace)
+    await workspaceStore.deleteWorkspace(workspaceId)
+    dialogStore.closeDialog({ key: 'delete-workspace' })
+    window.location.reload()
+  } catch (error) {
+    console.error('[DeleteWorkspaceDialog] Failed to delete workspace:', error)
+    toast.add({
+      severity: 'error',
+      summary: t('workspacePanel.toast.failedToDeleteWorkspace'),
+      detail: error instanceof Error ? error.message : t('g.unknownError'),
+      life: 5000
+    })
+  } finally {
+    loading.value = false
+  }
+}
+</script>
diff --git a/src/platform/workspace/components/dialogs/EditWorkspaceDialogContent.vue b/src/platform/workspace/components/dialogs/EditWorkspaceDialogContent.vue
new file mode 100644
index 0000000000..6e47844636
--- /dev/null
+++ b/src/platform/workspace/components/dialogs/EditWorkspaceDialogContent.vue
@@ -0,0 +1,104 @@
+<template>
+  <div
+    class="flex w-full min-w-[400px] flex-col rounded-2xl border border-border-default bg-base-background"
+  >
+    <!-- Header -->
+    <div
+      class="flex h-12 items-center justify-between border-b border-border-default px-4"
+    >
+      <h2 class="m-0 text-sm font-normal text-base-foreground">
+        {{ $t('workspacePanel.editWorkspaceDialog.title') }}
+      </h2>
+      <button
+        class="focus-visible:ring-secondary-foreground cursor-pointer rounded-sm border-none bg-transparent p-0 text-muted-foreground transition-colors hover:text-base-foreground focus-visible:ring-1 focus-visible:outline-none"
+        :aria-label="$t('g.close')"
+        @click="onCancel"
+      >
+        <i class="pi pi-times size-4" />
+      </button>
+    </div>
+
+    <!-- Body -->
+    <div class="flex flex-col gap-4 p-4">
+      <div class="flex flex-col gap-2">
+        <label class="text-sm text-base-foreground">
+          {{ $t('workspacePanel.editWorkspaceDialog.nameLabel') }}
+        </label>
+        <input
+          v-model="newWorkspaceName"
+          type="text"
+          class="focus:ring-secondary-foreground w-full rounded-lg border border-border-default bg-transparent px-3 py-2 text-sm text-base-foreground placeholder:text-muted-foreground focus:ring-1 focus:outline-none"
+          @keydown.enter="isValidName && onSave()"
+        />
+      </div>
+    </div>
+
+    <!-- Footer -->
+    <div class="flex items-center justify-end gap-4 p-4">
+      <Button variant="muted-textonly" @click="onCancel">
+        {{ $t('g.cancel') }}
+      </Button>
+      <Button
+        variant="primary"
+        size="lg"
+        :loading
+        :disabled="!isValidName"
+        @click="onSave"
+      >
+        {{ $t('workspacePanel.editWorkspaceDialog.save') }}
+      </Button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useToast } from 'primevue/usetoast'
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
+import { useDialogStore } from '@/stores/dialogStore'
+
+const { t } = useI18n()
+const toast = useToast()
+const dialogStore = useDialogStore()
+const workspaceStore = useTeamWorkspaceStore()
+const loading = ref(false)
+const newWorkspaceName = ref(workspaceStore.workspaceName)
+
+const isValidName = computed(() => {
+  const name = newWorkspaceName.value.trim()
+  const safeNameRegex = /^[a-zA-Z0-9][a-zA-Z0-9\s\-_'.,()&+]*$/
+  return name.length >= 1 && name.length <= 50 && safeNameRegex.test(name)
+})
+
+function onCancel() {
+  dialogStore.closeDialog({ key: 'edit-workspace' })
+}
+
+async function onSave() {
+  if (!isValidName.value) return
+  loading.value = true
+  try {
+    await workspaceStore.updateWorkspaceName(newWorkspaceName.value.trim())
+    dialogStore.closeDialog({ key: 'edit-workspace' })
+    toast.add({
+      severity: 'success',
+      summary: t('workspacePanel.toast.workspaceUpdated.title'),
+      detail: t('workspacePanel.toast.workspaceUpdated.message'),
+      life: 5000
+    })
+  } catch (error) {
+    console.error('[EditWorkspaceDialog] Failed to update workspace:', error)
+    toast.add({
+      severity: 'error',
+      summary: t('workspacePanel.toast.failedToUpdateWorkspace'),
+      detail: error instanceof Error ? error.message : t('g.unknownError'),
+      life: 5000
+    })
+  } finally {
+    loading.value = false
+  }
+}
+</script>
diff --git a/src/platform/workspace/components/dialogs/InviteMemberDialogContent.vue b/src/platform/workspace/components/dialogs/InviteMemberDialogContent.vue
new file mode 100644
index 0000000000..69f0a4bac6
--- /dev/null
+++ b/src/platform/workspace/components/dialogs/InviteMemberDialogContent.vue
@@ -0,0 +1,174 @@
+<template>
+  <div
+    class="flex w-full max-w-[512px] flex-col rounded-2xl border border-border-default bg-base-background"
+  >
+    <!-- Header -->
+    <div
+      class="flex h-12 items-center justify-between border-b border-border-default px-4"
+    >
+      <h2 class="m-0 text-sm font-normal text-base-foreground">
+        {{
+          step === 'email'
+            ? $t('workspacePanel.inviteMemberDialog.title')
+            : $t('workspacePanel.inviteMemberDialog.linkStep.title')
+        }}
+      </h2>
+      <button
+        class="focus-visible:ring-secondary-foreground cursor-pointer rounded-sm border-none bg-transparent p-0 text-muted-foreground transition-colors hover:text-base-foreground focus-visible:ring-1 focus-visible:outline-none"
+        :aria-label="$t('g.close')"
+        @click="onCancel"
+      >
+        <i class="pi pi-times size-4" />
+      </button>
+    </div>
+
+    <!-- Body: Email Step -->
+    <template v-if="step === 'email'">
+      <div class="flex flex-col gap-4 p-4">
+        <p class="m-0 text-sm text-muted-foreground">
+          {{ $t('workspacePanel.inviteMemberDialog.message') }}
+        </p>
+        <input
+          v-model="email"
+          type="email"
+          class="focus:ring-secondary-foreground w-full rounded-lg border border-border-default bg-transparent px-3 py-2 text-sm text-base-foreground placeholder:text-muted-foreground focus:ring-1 focus:outline-none"
+          :placeholder="$t('workspacePanel.inviteMemberDialog.placeholder')"
+        />
+      </div>
+
+      <!-- Footer: Email Step -->
+      <div class="flex items-center justify-end gap-4 p-4">
+        <Button variant="muted-textonly" @click="onCancel">
+          {{ $t('g.cancel') }}
+        </Button>
+        <Button
+          variant="primary"
+          size="lg"
+          :loading
+          :disabled="!isValidEmail"
+          @click="onCreateLink"
+        >
+          {{ $t('workspacePanel.inviteMemberDialog.createLink') }}
+        </Button>
+      </div>
+    </template>
+
+    <!-- Body: Link Step -->
+    <template v-else>
+      <div class="flex flex-col gap-4 p-4">
+        <p class="m-0 text-sm text-muted-foreground">
+          {{ $t('workspacePanel.inviteMemberDialog.linkStep.message') }}
+        </p>
+        <p class="m-0 text-sm font-medium text-base-foreground">
+          {{ email }}
+        </p>
+        <div class="relative">
+          <input
+            :value="generatedLink"
+            readonly
+            class="w-full cursor-pointer rounded-lg border border-border-default bg-transparent px-3 py-2 pr-10 text-sm text-base-foreground focus:outline-none"
+            @click="onSelectLink"
+          />
+          <div
+            class="absolute top-2.5 right-3 cursor-pointer"
+            @click="onCopyLink"
+          >
+            <i
+              :class="
+                cn(
+                  'pi size-4',
+                  justCopied ? 'pi-check text-green-500' : 'pi-copy'
+                )
+              "
+            />
+          </div>
+        </div>
+      </div>
+
+      <!-- Footer: Link Step -->
+      <div class="flex items-center justify-end gap-4 p-4">
+        <Button variant="muted-textonly" @click="onCancel">
+          {{ $t('g.cancel') }}
+        </Button>
+        <Button variant="primary" size="lg" @click="onCopyLink">
+          {{ $t('workspacePanel.inviteMemberDialog.linkStep.copyLink') }}
+        </Button>
+      </div>
+    </template>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useToast } from 'primevue/usetoast'
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+import { cn } from '@/utils/tailwindUtil'
+import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
+import { useDialogStore } from '@/stores/dialogStore'
+
+const dialogStore = useDialogStore()
+const toast = useToast()
+const { t } = useI18n()
+const workspaceStore = useTeamWorkspaceStore()
+
+const loading = ref(false)
+const email = ref('')
+const step = ref<'email' | 'link'>('email')
+const generatedLink = ref('')
+const justCopied = ref(false)
+
+const isValidEmail = computed(() => {
+  const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
+  return emailRegex.test(email.value)
+})
+
+function onCancel() {
+  dialogStore.closeDialog({ key: 'invite-member' })
+}
+
+async function onCreateLink() {
+  if (!isValidEmail.value) return
+  loading.value = true
+  try {
+    generatedLink.value = await workspaceStore.createInviteLink(email.value)
+    step.value = 'link'
+  } catch (error) {
+    toast.add({
+      severity: 'error',
+      summary: t('workspacePanel.inviteMemberDialog.linkCopyFailed'),
+      detail: error instanceof Error ? error.message : undefined,
+      life: 3000
+    })
+  } finally {
+    loading.value = false
+  }
+}
+
+async function onCopyLink() {
+  try {
+    await navigator.clipboard.writeText(generatedLink.value)
+    justCopied.value = true
+    setTimeout(() => {
+      justCopied.value = false
+    }, 759)
+    toast.add({
+      severity: 'success',
+      summary: t('workspacePanel.inviteMemberDialog.linkCopied'),
+      life: 2000
+    })
+  } catch {
+    toast.add({
+      severity: 'error',
+      summary: t('workspacePanel.inviteMemberDialog.linkCopyFailed'),
+      life: 3000
+    })
+  }
+}
+
+function onSelectLink(event: Event) {
+  const input = event.target as HTMLInputElement
+  input.select()
+}
+</script>
diff --git a/src/platform/workspace/components/dialogs/InviteMemberUpsellDialogContent.vue b/src/platform/workspace/components/dialogs/InviteMemberUpsellDialogContent.vue
new file mode 100644
index 0000000000..5e6bd17bd3
--- /dev/null
+++ b/src/platform/workspace/components/dialogs/InviteMemberUpsellDialogContent.vue
@@ -0,0 +1,68 @@
+<template>
+  <div
+    class="flex w-full max-w-[512px] flex-col rounded-2xl border border-border-default bg-base-background"
+  >
+    <!-- Header -->
+    <div
+      class="flex h-12 items-center justify-between border-b border-border-default px-4"
+    >
+      <h2 class="m-0 text-sm font-normal text-base-foreground">
+        {{
+          isActiveSubscription
+            ? $t('workspacePanel.inviteUpsellDialog.titleSingleSeat')
+            : $t('workspacePanel.inviteUpsellDialog.titleNotSubscribed')
+        }}
+      </h2>
+      <button
+        class="focus-visible:ring-secondary-foreground cursor-pointer rounded-sm border-none bg-transparent p-0 text-muted-foreground transition-colors hover:text-base-foreground focus-visible:ring-1 focus-visible:outline-none"
+        :aria-label="$t('g.close')"
+        @click="onDismiss"
+      >
+        <i class="pi pi-times size-4" />
+      </button>
+    </div>
+
+    <!-- Body -->
+    <div class="flex flex-col gap-4 p-4">
+      <p class="m-0 text-sm text-muted-foreground">
+        {{
+          isActiveSubscription
+            ? $t('workspacePanel.inviteUpsellDialog.messageSingleSeat')
+            : $t('workspacePanel.inviteUpsellDialog.messageNotSubscribed')
+        }}
+      </p>
+    </div>
+
+    <!-- Footer -->
+    <div class="flex items-center justify-end gap-4 p-4">
+      <Button variant="muted-textonly" @click="onDismiss">
+        {{ $t('g.cancel') }}
+      </Button>
+      <Button variant="primary" size="lg" @click="onUpgrade">
+        {{
+          isActiveSubscription
+            ? $t('workspacePanel.inviteUpsellDialog.upgradeToCreator')
+            : $t('workspacePanel.inviteUpsellDialog.viewPlans')
+        }}
+      </Button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import Button from '@/components/ui/button/Button.vue'
+import { useBillingContext } from '@/composables/billing/useBillingContext'
+import { useDialogStore } from '@/stores/dialogStore'
+
+const dialogStore = useDialogStore()
+const { isActiveSubscription, showSubscriptionDialog } = useBillingContext()
+
+function onDismiss() {
+  dialogStore.closeDialog({ key: 'invite-member-upsell' })
+}
+
+function onUpgrade() {
+  dialogStore.closeDialog({ key: 'invite-member-upsell' })
+  showSubscriptionDialog()
+}
+</script>
diff --git a/src/platform/workspace/components/dialogs/LeaveWorkspaceDialogContent.vue b/src/platform/workspace/components/dialogs/LeaveWorkspaceDialogContent.vue
new file mode 100644
index 0000000000..eeca98b0e8
--- /dev/null
+++ b/src/platform/workspace/components/dialogs/LeaveWorkspaceDialogContent.vue
@@ -0,0 +1,78 @@
+<template>
+  <div
+    class="flex w-full max-w-[360px] flex-col rounded-2xl border border-border-default bg-base-background"
+  >
+    <!-- Header -->
+    <div
+      class="flex h-12 items-center justify-between border-b border-border-default px-4"
+    >
+      <h2 class="m-0 text-sm font-normal text-base-foreground">
+        {{ $t('workspacePanel.leaveDialog.title') }}
+      </h2>
+      <button
+        class="focus-visible:ring-secondary-foreground cursor-pointer rounded-sm border-none bg-transparent p-0 text-muted-foreground transition-colors hover:text-base-foreground focus-visible:ring-1 focus-visible:outline-none"
+        :aria-label="$t('g.close')"
+        @click="onCancel"
+      >
+        <i class="pi pi-times size-4" />
+      </button>
+    </div>
+
+    <!-- Body -->
+    <div class="p-4">
+      <p class="m-0 text-sm text-muted-foreground">
+        {{ $t('workspacePanel.leaveDialog.message') }}
+      </p>
+    </div>
+
+    <!-- Footer -->
+    <div class="flex items-center justify-end gap-4 p-4">
+      <Button variant="muted-textonly" @click="onCancel">
+        {{ $t('g.cancel') }}
+      </Button>
+      <Button variant="destructive" size="lg" :loading @click="onLeave">
+        {{ $t('workspacePanel.leaveDialog.leave') }}
+      </Button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useToast } from 'primevue/usetoast'
+import { ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
+import { useDialogStore } from '@/stores/dialogStore'
+
+const { t } = useI18n()
+const toast = useToast()
+const dialogStore = useDialogStore()
+const workspaceStore = useTeamWorkspaceStore()
+const loading = ref(false)
+
+function onCancel() {
+  dialogStore.closeDialog({ key: 'leave-workspace' })
+}
+
+async function onLeave() {
+  loading.value = true
+  try {
+    // leaveWorkspace() handles switching to personal workspace internally and reloads
+    await workspaceStore.leaveWorkspace()
+    dialogStore.closeDialog({ key: 'leave-workspace' })
+    window.location.reload()
+  } catch (error) {
+    console.error('[LeaveWorkspaceDialog] Failed to leave workspace:', error)
+    toast.add({
+      severity: 'error',
+      summary: t('workspacePanel.toast.failedToLeaveWorkspace'),
+      detail: error instanceof Error ? error.message : t('g.unknownError'),
+      life: 5000
+    })
+  } finally {
+    loading.value = false
+  }
+}
+</script>
diff --git a/src/platform/workspace/components/dialogs/RemoveMemberDialogContent.vue b/src/platform/workspace/components/dialogs/RemoveMemberDialogContent.vue
new file mode 100644
index 0000000000..1cd02f7dd2
--- /dev/null
+++ b/src/platform/workspace/components/dialogs/RemoveMemberDialogContent.vue
@@ -0,0 +1,83 @@
+<template>
+  <div
+    class="flex w-full max-w-[360px] flex-col rounded-2xl border border-border-default bg-base-background"
+  >
+    <!-- Header -->
+    <div
+      class="flex h-12 items-center justify-between border-b border-border-default px-4"
+    >
+      <h2 class="m-0 text-sm font-normal text-base-foreground">
+        {{ $t('workspacePanel.removeMemberDialog.title') }}
+      </h2>
+      <button
+        class="focus-visible:ring-secondary-foreground cursor-pointer rounded-sm border-none bg-transparent p-0 text-muted-foreground transition-colors hover:text-base-foreground focus-visible:ring-1 focus-visible:outline-none"
+        :aria-label="$t('g.close')"
+        @click="onCancel"
+      >
+        <i class="pi pi-times size-4" />
+      </button>
+    </div>
+
+    <!-- Body -->
+    <div class="p-4">
+      <p class="m-0 text-sm text-muted-foreground">
+        {{ $t('workspacePanel.removeMemberDialog.message') }}
+      </p>
+    </div>
+
+    <!-- Footer -->
+    <div class="flex items-center justify-end gap-4 p-4">
+      <Button variant="muted-textonly" @click="onCancel">
+        {{ $t('g.cancel') }}
+      </Button>
+      <Button variant="destructive" size="lg" :loading @click="onRemove">
+        {{ $t('workspacePanel.removeMemberDialog.remove') }}
+      </Button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useToast } from 'primevue/usetoast'
+import { ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
+import { useDialogStore } from '@/stores/dialogStore'
+
+const { memberId } = defineProps<{
+  memberId: string
+}>()
+
+const dialogStore = useDialogStore()
+const workspaceStore = useTeamWorkspaceStore()
+const toast = useToast()
+const { t } = useI18n()
+const loading = ref(false)
+
+function onCancel() {
+  dialogStore.closeDialog({ key: 'remove-member' })
+}
+
+async function onRemove() {
+  loading.value = true
+  try {
+    await workspaceStore.removeMember(memberId)
+    toast.add({
+      severity: 'success',
+      summary: t('workspacePanel.removeMemberDialog.success'),
+      life: 2000
+    })
+    dialogStore.closeDialog({ key: 'remove-member' })
+  } catch {
+    toast.add({
+      severity: 'error',
+      summary: t('workspacePanel.removeMemberDialog.error'),
+      life: 3000
+    })
+  } finally {
+    loading.value = false
+  }
+}
+</script>
diff --git a/src/platform/workspace/components/dialogs/RevokeInviteDialogContent.vue b/src/platform/workspace/components/dialogs/RevokeInviteDialogContent.vue
new file mode 100644
index 0000000000..8bdd4c41dc
--- /dev/null
+++ b/src/platform/workspace/components/dialogs/RevokeInviteDialogContent.vue
@@ -0,0 +1,79 @@
+<template>
+  <div
+    class="flex w-full max-w-[360px] flex-col rounded-2xl border border-border-default bg-base-background"
+  >
+    <!-- Header -->
+    <div
+      class="flex h-12 items-center justify-between border-b border-border-default px-4"
+    >
+      <h2 class="m-0 text-sm font-normal text-base-foreground">
+        {{ $t('workspacePanel.revokeInviteDialog.title') }}
+      </h2>
+      <button
+        class="focus-visible:ring-secondary-foreground cursor-pointer rounded-sm border-none bg-transparent p-0 text-muted-foreground transition-colors hover:text-base-foreground focus-visible:ring-1 focus-visible:outline-none"
+        :aria-label="$t('g.close')"
+        @click="onCancel"
+      >
+        <i class="pi pi-times size-4" />
+      </button>
+    </div>
+
+    <!-- Body -->
+    <div class="p-4">
+      <p class="m-0 text-sm text-muted-foreground">
+        {{ $t('workspacePanel.revokeInviteDialog.message') }}
+      </p>
+    </div>
+
+    <!-- Footer -->
+    <div class="flex items-center justify-end gap-4 p-4">
+      <Button variant="muted-textonly" @click="onCancel">
+        {{ $t('g.cancel') }}
+      </Button>
+      <Button variant="destructive" size="lg" :loading @click="onRevoke">
+        {{ $t('workspacePanel.revokeInviteDialog.revoke') }}
+      </Button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useToast } from 'primevue/usetoast'
+import { ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
+import { useDialogStore } from '@/stores/dialogStore'
+
+const { inviteId } = defineProps<{
+  inviteId: string
+}>()
+
+const dialogStore = useDialogStore()
+const workspaceStore = useTeamWorkspaceStore()
+const toast = useToast()
+const { t } = useI18n()
+const loading = ref(false)
+
+function onCancel() {
+  dialogStore.closeDialog({ key: 'revoke-invite' })
+}
+
+async function onRevoke() {
+  loading.value = true
+  try {
+    await workspaceStore.revokeInvite(inviteId)
+    dialogStore.closeDialog({ key: 'revoke-invite' })
+  } catch (error) {
+    toast.add({
+      severity: 'error',
+      summary: t('g.error'),
+      detail: error instanceof Error ? error.message : undefined,
+      life: 3000
+    })
+  } finally {
+    loading.value = false
+  }
+}
+</script>
diff --git a/src/platform/workspace/components/dialogs/settings/MembersPanelContent.vue b/src/platform/workspace/components/dialogs/settings/MembersPanelContent.vue
new file mode 100644
index 0000000000..6808150533
--- /dev/null
+++ b/src/platform/workspace/components/dialogs/settings/MembersPanelContent.vue
@@ -0,0 +1,563 @@
+<template>
+  <div class="grow overflow-auto pt-6">
+    <div
+      class="border-inter flex size-full flex-col gap-2 rounded-2xl border border-interface-stroke p-6"
+    >
+      <!-- Section Header -->
+      <div class="flex w-full items-center gap-9">
+        <div class="flex min-w-0 flex-1 items-baseline gap-2">
+          <span class="text-base font-semibold text-base-foreground">
+            <template v-if="activeView === 'active'">
+              {{
+                $t('workspacePanel.members.membersCount', {
+                  count:
+                    isSingleSeatPlan || isPersonalWorkspace
+                      ? 1
+                      : members.length,
+                  maxSeats: maxSeats
+                })
+              }}
+            </template>
+            <template v-else-if="permissions.canViewPendingInvites">
+              {{
+                $t(
+                  'workspacePanel.members.pendingInvitesCount',
+                  pendingInvites.length
+                )
+              }}
+            </template>
+          </span>
+        </div>
+        <div
+          v-if="uiConfig.showSearch && !isSingleSeatPlan"
+          class="flex items-start gap-2"
+        >
+          <SearchBox
+            v-model="searchQuery"
+            :placeholder="$t('g.search')"
+            size="lg"
+            class="w-64"
+          />
+        </div>
+      </div>
+
+      <!-- Members Content -->
+      <div class="flex min-h-0 flex-1 flex-col">
+        <!-- Table Header with Tab Buttons and Column Headers -->
+        <div
+          v-if="uiConfig.showMembersList"
+          :class="
+            cn(
+              'grid w-full items-center py-2',
+              isSingleSeatPlan
+                ? 'grid-cols-1 py-0'
+                : activeView === 'pending'
+                  ? uiConfig.pendingGridCols
+                  : uiConfig.headerGridCols
+            )
+          "
+        >
+          <!-- Tab buttons in first column -->
+          <div v-if="!isSingleSeatPlan" class="flex items-center gap-2">
+            <Button
+              :variant="
+                activeView === 'active' ? 'secondary' : 'muted-textonly'
+              "
+              size="md"
+              @click="activeView = 'active'"
+            >
+              {{ $t('workspacePanel.members.tabs.active') }}
+            </Button>
+            <Button
+              v-if="uiConfig.showPendingTab"
+              :variant="
+                activeView === 'pending' ? 'secondary' : 'muted-textonly'
+              "
+              size="md"
+              @click="activeView = 'pending'"
+            >
+              {{
+                $t(
+                  'workspacePanel.members.tabs.pendingCount',
+                  pendingInvites.length
+                )
+              }}
+            </Button>
+          </div>
+          <!-- Date column headers -->
+          <template v-if="activeView === 'pending'">
+            <Button
+              variant="muted-textonly"
+              size="sm"
+              class="justify-start"
+              @click="toggleSort('inviteDate')"
+            >
+              {{ $t('workspacePanel.members.columns.inviteDate') }}
+              <i class="icon-[lucide--chevrons-up-down] size-4" />
+            </Button>
+            <Button
+              variant="muted-textonly"
+              size="sm"
+              class="justify-start"
+              @click="toggleSort('expiryDate')"
+            >
+              {{ $t('workspacePanel.members.columns.expiryDate') }}
+              <i class="icon-[lucide--chevrons-up-down] size-4" />
+            </Button>
+            <div />
+          </template>
+          <template v-else>
+            <template v-if="!isSingleSeatPlan">
+              <Button
+                variant="muted-textonly"
+                size="sm"
+                class="justify-end"
+                @click="toggleSort('joinDate')"
+              >
+                {{ $t('workspacePanel.members.columns.joinDate') }}
+                <i class="icon-[lucide--chevrons-up-down] size-4" />
+              </Button>
+              <!-- Empty cell for action column header (OWNER only) -->
+              <div v-if="permissions.canRemoveMembers" />
+            </template>
+          </template>
+        </div>
+
+        <!-- Members List -->
+        <div class="min-h-0 flex-1 overflow-y-auto">
+          <!-- Active Members -->
+          <template v-if="activeView === 'active'">
+            <!-- Personal Workspace: show only current user -->
+            <template v-if="isPersonalWorkspace">
+              <div
+                :class="
+                  cn(
+                    'grid w-full items-center rounded-lg p-2',
+                    uiConfig.membersGridCols
+                  )
+                "
+              >
+                <div class="flex items-center gap-3">
+                  <UserAvatar
+                    class="size-8"
+                    :photo-url="userPhotoUrl"
+                    :pt:icon:class="{ 'text-xl!': !userPhotoUrl }"
+                  />
+                  <div class="flex min-w-0 flex-1 flex-col gap-1">
+                    <div class="flex items-center gap-2">
+                      <span class="text-sm text-base-foreground">
+                        {{ userDisplayName }}
+                        <span class="text-muted-foreground">
+                          ({{ $t('g.you') }})
+                        </span>
+                      </span>
+                      <span
+                        v-if="uiConfig.showRoleBadge"
+                        class="rounded-full bg-base-foreground px-1 py-0.5 text-[10px] font-bold text-base-background uppercase"
+                      >
+                        {{ $t('workspaceSwitcher.roleOwner') }}
+                      </span>
+                    </div>
+                    <span class="text-sm text-muted-foreground">
+                      {{ userEmail }}
+                    </span>
+                  </div>
+                </div>
+              </div>
+            </template>
+
+            <!-- Team Workspace: sorted list (owner first, current user second, then rest) -->
+            <template v-else>
+              <div
+                v-for="(member, index) in filteredMembers"
+                :key="member.id"
+                :class="
+                  cn(
+                    'grid w-full items-center rounded-lg p-2',
+                    isSingleSeatPlan ? 'grid-cols-1' : uiConfig.membersGridCols,
+                    index % 2 === 1 && 'bg-secondary-background/50'
+                  )
+                "
+              >
+                <div class="flex items-center gap-3">
+                  <UserAvatar
+                    class="size-8"
+                    :photo-url="
+                      isCurrentUser(member) ? userPhotoUrl : undefined
+                    "
+                    :pt:icon:class="{
+                      'text-xl!': !isCurrentUser(member) || !userPhotoUrl
+                    }"
+                  />
+                  <div class="flex min-w-0 flex-1 flex-col gap-1">
+                    <div class="flex items-center gap-2">
+                      <span class="text-sm text-base-foreground">
+                        {{ member.name }}
+                        <span
+                          v-if="isCurrentUser(member)"
+                          class="text-muted-foreground"
+                        >
+                          ({{ $t('g.you') }})
+                        </span>
+                      </span>
+                      <span
+                        v-if="uiConfig.showRoleBadge"
+                        class="rounded-full bg-base-foreground px-1 py-0.5 text-[10px] font-bold text-base-background uppercase"
+                      >
+                        {{ getRoleBadgeLabel(member.role) }}
+                      </span>
+                    </div>
+                    <span class="text-sm text-muted-foreground">
+                      {{ member.email }}
+                    </span>
+                  </div>
+                </div>
+                <!-- Join date -->
+                <span
+                  v-if="uiConfig.showDateColumn && !isSingleSeatPlan"
+                  class="text-right text-sm text-muted-foreground"
+                >
+                  {{ formatDate(member.joinDate) }}
+                </span>
+                <!-- Remove member action (OWNER only, can't remove yourself) -->
+                <div
+                  v-if="permissions.canRemoveMembers && !isSingleSeatPlan"
+                  class="flex items-center justify-end"
+                >
+                  <Button
+                    v-if="!isCurrentUser(member)"
+                    v-tooltip="{
+                      value: $t('g.moreOptions'),
+                      showDelay: 300
+                    }"
+                    variant="muted-textonly"
+                    size="icon"
+                    :aria-label="$t('g.moreOptions')"
+                    @click="showMemberMenu($event, member)"
+                  >
+                    <i class="pi pi-ellipsis-h" />
+                  </Button>
+                </div>
+              </div>
+
+              <!-- Member actions menu (shared for all members) -->
+              <Menu ref="memberMenu" :model="memberMenuItems" :popup="true" />
+            </template>
+          </template>
+
+          <!-- Upsell Banner -->
+          <div
+            v-if="isSingleSeatPlan"
+            class="mt-4 flex items-center justify-center gap-2 rounded-xl border border-border-default bg-secondary-background px-4 py-3"
+          >
+            <p class="text-foreground m-0 text-sm">
+              {{
+                isActiveSubscription
+                  ? $t('workspacePanel.members.upsellBannerUpgrade')
+                  : $t('workspacePanel.members.upsellBannerSubscribe')
+              }}
+            </p>
+            <Button
+              variant="muted-textonly"
+              class="cursor-pointer text-sm underline"
+              @click="showSubscriptionDialog()"
+            >
+              {{ $t('workspacePanel.members.viewPlans') }}
+            </Button>
+          </div>
+
+          <!-- Pending Invites -->
+          <template v-if="activeView === 'pending'">
+            <div
+              v-for="(invite, index) in filteredPendingInvites"
+              :key="invite.id"
+              :class="
+                cn(
+                  'grid w-full items-center rounded-lg p-2',
+                  uiConfig.pendingGridCols,
+                  index % 2 === 1 && 'bg-secondary-background/50'
+                )
+              "
+            >
+              <!-- Invite info -->
+              <div class="flex items-center gap-3">
+                <div
+                  class="flex size-8 shrink-0 items-center justify-center rounded-full bg-secondary-background"
+                >
+                  <span class="text-sm font-bold text-base-foreground">
+                    {{ getInviteInitial(invite.email) }}
+                  </span>
+                </div>
+                <div class="flex min-w-0 flex-1 flex-col gap-1">
+                  <span class="text-sm text-base-foreground">
+                    {{ getInviteDisplayName(invite.email) }}
+                  </span>
+                  <span class="text-sm text-muted-foreground">
+                    {{ invite.email }}
+                  </span>
+                </div>
+              </div>
+              <!-- Invite date -->
+              <span class="text-sm text-muted-foreground">
+                {{ formatDate(invite.inviteDate) }}
+              </span>
+              <!-- Expiry date -->
+              <span class="text-sm text-muted-foreground">
+                {{ formatDate(invite.expiryDate) }}
+              </span>
+              <!-- Actions -->
+              <div class="flex items-center justify-end gap-2">
+                <Button
+                  v-tooltip="{
+                    value: $t('workspacePanel.members.actions.copyLink'),
+                    showDelay: 300
+                  }"
+                  variant="secondary"
+                  size="md"
+                  :aria-label="$t('workspacePanel.members.actions.copyLink')"
+                  @click="handleCopyInviteLink(invite)"
+                >
+                  <i class="icon-[lucide--link] size-4" />
+                </Button>
+                <Button
+                  v-tooltip="{
+                    value: $t('workspacePanel.members.actions.revokeInvite'),
+                    showDelay: 300
+                  }"
+                  variant="secondary"
+                  size="md"
+                  :aria-label="
+                    $t('workspacePanel.members.actions.revokeInvite')
+                  "
+                  @click="handleRevokeInvite(invite)"
+                >
+                  <i class="icon-[lucide--mail-x] size-4" />
+                </Button>
+              </div>
+            </div>
+            <div
+              v-if="filteredPendingInvites.length === 0"
+              class="flex w-full items-center justify-center py-8 text-sm text-muted-foreground"
+            >
+              {{ $t('workspacePanel.members.noInvites') }}
+            </div>
+          </template>
+        </div>
+      </div>
+    </div>
+    <!-- Personal Workspace Message -->
+    <div v-if="isPersonalWorkspace" class="flex items-center">
+      <p class="text-sm text-muted-foreground">
+        {{ $t('workspacePanel.members.personalWorkspaceMessage') }}
+      </p>
+      <button
+        class="cursor-pointer border-none bg-transparent underline"
+        @click="handleCreateWorkspace"
+      >
+        {{ $t('workspacePanel.members.createNewWorkspace') }}
+      </button>
+    </div>
+  </div>
+</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 SearchBox from '@/components/common/SearchBox.vue'
+import UserAvatar from '@/components/common/UserAvatar.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 { 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 { cn } from '@/utils/tailwindUtil'
+
+const { d, 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 searchQuery = ref('')
+const activeView = ref<'active' | 'pending'>('active')
+const sortField = ref<'inviteDate' | 'expiryDate' | 'joinDate'>('inviteDate')
+const sortDirection = ref<'asc' | 'desc'>('desc')
+
+const memberMenu = ref<InstanceType<typeof Menu> | null>(null)
+const selectedMember = ref<WorkspaceMember | null>(null)
+
+function getInviteDisplayName(email: string): string {
+  return email.split('@')[0]
+}
+
+function getInviteInitial(email: string): string {
+  return email.charAt(0).toUpperCase()
+}
+
+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
+  memberMenu.value?.toggle(event)
+}
+
+function isCurrentUser(member: WorkspaceMember): boolean {
+  return member.email.toLowerCase() === userEmail.value?.toLowerCase()
+}
+
+// All members sorted: owners first, current user second, then rest by join date
+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) => {
+    // Owners always come first
+    if (a.role === 'owner' && b.role !== 'owner') return -1
+    if (a.role !== 'owner' && b.role === 'owner') return 1
+
+    // Current user comes second (after owner)
+    const aIsCurrentUser = isCurrentUser(a)
+    const bIsCurrentUser = isCurrentUser(b)
+    if (aIsCurrentUser && !bIsCurrentUser) return -1
+    if (!aIsCurrentUser && bIsCurrentUser) return 1
+
+    // Then sort by join date
+    const aValue = a.joinDate.getTime()
+    const bValue = b.joinDate.getTime()
+    return sortDirection.value === 'asc' ? aValue - bValue : bValue - aValue
+  })
+
+  return result
+})
+
+function getRoleBadgeLabel(role: 'owner' | 'member'): string {
+  return role === 'owner'
+    ? t('workspaceSwitcher.roleOwner')
+    : t('workspaceSwitcher.roleMember')
+}
+
+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'
+  }
+}
+
+function formatDate(date: Date): string {
+  return d(date, { dateStyle: 'medium' })
+}
+
+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'),
+      life: 3000
+    })
+  }
+}
+
+function handleRevokeInvite(invite: PendingInvite) {
+  showRevokeInviteDialog(invite.id)
+}
+
+function handleCreateWorkspace() {
+  showCreateWorkspaceDialog()
+}
+
+function handleRemoveMember(member: WorkspaceMember) {
+  showRemoveMemberDialog(member.id)
+}
+</script>
diff --git a/src/platform/workspace/components/dialogs/settings/WorkspacePanelContent.vue b/src/platform/workspace/components/dialogs/settings/WorkspacePanelContent.vue
new file mode 100644
index 0000000000..3e65977db5
--- /dev/null
+++ b/src/platform/workspace/components/dialogs/settings/WorkspacePanelContent.vue
@@ -0,0 +1,253 @@
+<template>
+  <div class="flex size-full flex-col">
+    <header class="mb-8 flex items-center gap-4">
+      <WorkspaceProfilePic
+        class="size-12 text-3xl!"
+        :workspace-name="workspaceName"
+      />
+      <h1 class="text-3xl text-base-foreground">
+        {{ workspaceName }}
+      </h1>
+    </header>
+    <TabsRoot v-model="activeTab">
+      <div class="flex w-full items-center justify-between">
+        <TabsList class="flex items-center gap-2 pb-1">
+          <TabsTrigger
+            value="plan"
+            :class="
+              cn(
+                tabTriggerBase,
+                activeTab === 'plan' ? tabTriggerActive : tabTriggerInactive
+              )
+            "
+          >
+            {{ $t('workspacePanel.tabs.planCredits') }}
+          </TabsTrigger>
+          <TabsTrigger
+            value="members"
+            :class="
+              cn(
+                tabTriggerBase,
+                activeTab === 'members' ? tabTriggerActive : tabTriggerInactive
+              )
+            "
+          >
+            {{
+              $t('workspacePanel.tabs.membersCount', {
+                count: members.length
+              })
+            }}
+          </TabsTrigger>
+        </TabsList>
+        <div class="flex items-center gap-1">
+          <Button
+            v-if="permissions.canInviteMembers"
+            v-tooltip="
+              inviteTooltip
+                ? { value: inviteTooltip, showDelay: 0 }
+                : { value: $t('workspacePanel.inviteMember'), showDelay: 300 }
+            "
+            variant="secondary"
+            size="lg"
+            :disabled="!isSingleSeatPlan && isInviteLimitReached"
+            :class="
+              !isSingleSeatPlan &&
+              isInviteLimitReached &&
+              'cursor-not-allowed opacity-50'
+            "
+            :aria-label="$t('workspacePanel.inviteMember')"
+            @click="handleInviteMember"
+          >
+            <i class="pi pi-plus text-sm" />
+          </Button>
+          <template v-if="permissions.canAccessWorkspaceMenu">
+            <Button
+              v-tooltip="{ value: $t('g.moreOptions'), showDelay: 300 }"
+              variant="muted-textonly"
+              size="icon"
+              :aria-label="$t('g.moreOptions')"
+              @click="menu?.toggle($event)"
+            >
+              <i class="pi pi-ellipsis-h" />
+            </Button>
+            <Menu ref="menu" :model="menuItems" :popup="true">
+              <template #item="{ item }">
+                <button
+                  v-tooltip="
+                    item.disabled && deleteTooltip
+                      ? { value: deleteTooltip, showDelay: 0 }
+                      : null
+                  "
+                  type="button"
+                  :disabled="!!item.disabled"
+                  :class="
+                    cn(
+                      'flex w-full cursor-pointer items-center gap-2 border-none bg-transparent px-3 py-2',
+                      item.class,
+                      item.disabled && 'pointer-events-auto cursor-not-allowed'
+                    )
+                  "
+                  @click="
+                    item.command?.({
+                      originalEvent: $event,
+                      item
+                    })
+                  "
+                >
+                  <i :class="item.icon" />
+                  <span>{{ item.label }}</span>
+                </button>
+              </template>
+            </Menu>
+          </template>
+        </div>
+      </div>
+
+      <TabsContent value="plan" class="mt-4">
+        <SubscriptionPanelContentWorkspace />
+      </TabsContent>
+      <TabsContent value="members" class="mt-4">
+        <MembersPanelContent :key="workspaceRole" />
+      </TabsContent>
+    </TabsRoot>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { storeToRefs } from 'pinia'
+import Menu from 'primevue/menu'
+import { computed, onMounted, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import { TabsContent, TabsList, TabsRoot, TabsTrigger } from 'reka-ui'
+
+import WorkspaceProfilePic from '@/platform/workspace/components/WorkspaceProfilePic.vue'
+import MembersPanelContent from '@/platform/workspace/components/dialogs/settings/MembersPanelContent.vue'
+import Button from '@/components/ui/button/Button.vue'
+import { useBillingContext } from '@/composables/billing/useBillingContext'
+import { TIER_TO_KEY } from '@/platform/cloud/subscription/constants/tierPricing'
+import SubscriptionPanelContentWorkspace from '@/platform/workspace/components/SubscriptionPanelContentWorkspace.vue'
+import { useWorkspaceUI } from '@/platform/workspace/composables/useWorkspaceUI'
+import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
+import { useDialogService } from '@/services/dialogService'
+import { cn } from '@/utils/tailwindUtil'
+
+const tabTriggerBase =
+  'flex items-center justify-center shrink-0 px-2.5 py-2 text-sm rounded-lg cursor-pointer transition-all duration-200 outline-hidden border-none'
+const tabTriggerActive =
+  'bg-interface-menu-component-surface-hovered text-text-primary font-bold'
+const tabTriggerInactive =
+  'bg-transparent text-text-secondary hover:bg-button-hover-surface focus:bg-button-hover-surface'
+
+const { defaultTab = 'plan' } = defineProps<{
+  defaultTab?: string
+}>()
+
+const { t } = useI18n()
+const {
+  showLeaveWorkspaceDialog,
+  showDeleteWorkspaceDialog,
+  showInviteMemberDialog,
+  showInviteMemberUpsellDialog,
+  showEditWorkspaceDialog
+} = useDialogService()
+const { isActiveSubscription, subscription, getMaxSeats } = useBillingContext()
+
+const isSingleSeatPlan = computed(() => {
+  if (!isActiveSubscription.value) return true
+  const tier = subscription.value?.tier
+  if (!tier) return true
+  const tierKey = TIER_TO_KEY[tier]
+  if (!tierKey) return true
+  return getMaxSeats(tierKey) <= 1
+})
+const workspaceStore = useTeamWorkspaceStore()
+const { workspaceName, members, isInviteLimitReached, isWorkspaceSubscribed } =
+  storeToRefs(workspaceStore)
+const { fetchMembers, fetchPendingInvites } = workspaceStore
+
+const { workspaceRole, permissions, uiConfig } = useWorkspaceUI()
+const activeTab = ref(defaultTab)
+
+const menu = ref<InstanceType<typeof Menu> | null>(null)
+
+function handleLeaveWorkspace() {
+  showLeaveWorkspaceDialog()
+}
+
+function handleDeleteWorkspace() {
+  showDeleteWorkspaceDialog()
+}
+
+function handleEditWorkspace() {
+  showEditWorkspaceDialog()
+}
+
+// Disable delete when workspace has an active subscription (to prevent accidental deletion)
+// Use workspace's own subscription status, not the global isActiveSubscription
+const isDeleteDisabled = computed(
+  () =>
+    uiConfig.value.workspaceMenuAction === 'delete' &&
+    isWorkspaceSubscribed.value
+)
+
+const deleteTooltip = computed(() => {
+  if (!isDeleteDisabled.value) return null
+  const tooltipKey = uiConfig.value.workspaceMenuDisabledTooltip
+  return tooltipKey ? t(tooltipKey) : null
+})
+
+const inviteTooltip = computed(() => {
+  if (isSingleSeatPlan.value) return null
+  if (!isInviteLimitReached.value) return null
+  return t('workspacePanel.inviteLimitReached')
+})
+
+function handleInviteMember() {
+  if (isSingleSeatPlan.value) {
+    showInviteMemberUpsellDialog()
+    return
+  }
+  if (isInviteLimitReached.value) return
+  showInviteMemberDialog()
+}
+
+const menuItems = computed(() => {
+  const items = []
+
+  // Add edit option for owners
+  if (uiConfig.value.showEditWorkspaceMenuItem) {
+    items.push({
+      label: t('workspacePanel.menu.editWorkspace'),
+      icon: 'pi pi-pencil',
+      command: handleEditWorkspace
+    })
+  }
+
+  const action = uiConfig.value.workspaceMenuAction
+  if (action === 'delete') {
+    items.push({
+      label: t('workspacePanel.menu.deleteWorkspace'),
+      icon: 'pi pi-trash',
+      class: isDeleteDisabled.value
+        ? 'text-danger/50 cursor-not-allowed'
+        : 'text-danger',
+      disabled: isDeleteDisabled.value,
+      command: isDeleteDisabled.value ? undefined : handleDeleteWorkspace
+    })
+  } else if (action === 'leave') {
+    items.push({
+      label: t('workspacePanel.menu.leaveWorkspace'),
+      icon: 'pi pi-sign-out',
+      command: handleLeaveWorkspace
+    })
+  }
+
+  return items
+})
+
+onMounted(() => {
+  fetchMembers()
+  fetchPendingInvites()
+})
+</script>
diff --git a/src/platform/workspace/components/toasts/InviteAcceptedToast.vue b/src/platform/workspace/components/toasts/InviteAcceptedToast.vue
new file mode 100644
index 0000000000..6c0fd26d59
--- /dev/null
+++ b/src/platform/workspace/components/toasts/InviteAcceptedToast.vue
@@ -0,0 +1,42 @@
+<template>
+  <Toast group="invite-accepted" position="top-right">
+    <template #message="slotProps">
+      <div class="flex w-full items-center justify-between gap-2">
+        <div class="flex flex-col justify-start">
+          <div class="text-base">
+            {{ slotProps.message.summary }}
+          </div>
+          <div class="text-foreground mt-1 text-sm">
+            {{ slotProps.message.detail.text }} <br />
+            {{ slotProps.message.detail.workspaceName }}
+          </div>
+        </div>
+        <Button
+          size="md"
+          variant="inverted"
+          @click="viewWorkspace(slotProps.message.detail.workspaceId)"
+        >
+          {{ t('workspace.viewWorkspace') }}
+        </Button>
+      </div>
+    </template>
+  </Toast>
+</template>
+
+<script setup lang="ts">
+import { useToast } from 'primevue'
+import Toast from 'primevue/toast'
+import { useI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+import { useWorkspaceSwitch } from '@/platform/workspace/composables/useWorkspaceSwitch'
+
+const { t } = useI18n()
+const toast = useToast()
+const { switchWithConfirmation } = useWorkspaceSwitch()
+
+function viewWorkspace(workspaceId: string) {
+  void switchWithConfirmation(workspaceId)
+  toast.removeGroup('invite-accepted')
+}
+</script>
diff --git a/src/platform/workspace/composables/useInviteUrlLoader.test.ts b/src/platform/workspace/composables/useInviteUrlLoader.test.ts
new file mode 100644
index 0000000000..4c4a20d447
--- /dev/null
+++ b/src/platform/workspace/composables/useInviteUrlLoader.test.ts
@@ -0,0 +1,237 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { useInviteUrlLoader } from './useInviteUrlLoader'
+
+/**
+ * Unit tests for useInviteUrlLoader composable
+ *
+ * Tests the behavior of accepting workspace invites via URL query parameters:
+ * - ?invite=TOKEN accepts the invite and shows success toast
+ * - Invalid/missing token is handled gracefully
+ * - API errors show error toast
+ * - URL is cleaned up after processing
+ * - Preserved query is restored after login redirect
+ */
+
+const preservedQueryMocks = vi.hoisted(() => ({
+  clearPreservedQuery: vi.fn(),
+  hydratePreservedQuery: vi.fn(),
+  mergePreservedQueryIntoQuery: vi.fn()
+}))
+
+vi.mock(
+  '@/platform/navigation/preservedQueryManager',
+  () => preservedQueryMocks
+)
+
+const mockRouteQuery = vi.hoisted(() => ({
+  value: {} as Record<string, string>
+}))
+const mockRouterReplace = vi.hoisted(() => vi.fn())
+
+vi.mock('vue-router', () => ({
+  useRoute: () => ({
+    query: mockRouteQuery.value
+  }),
+  useRouter: () => ({
+    replace: mockRouterReplace
+  })
+}))
+
+const mockToastAdd = vi.hoisted(() => vi.fn())
+vi.mock('primevue/usetoast', () => ({
+  useToast: () => ({
+    add: mockToastAdd
+  })
+}))
+
+vi.mock('vue-i18n', () => ({
+  createI18n: () => ({
+    global: {
+      t: (key: string) => key
+    }
+  }),
+  useI18n: () => ({
+    t: vi.fn((key: string, params?: Record<string, unknown>) => {
+      if (key === 'workspace.inviteAccepted') return 'Invite Accepted'
+      if (key === 'workspace.addedToWorkspace') {
+        return `You have been added to ${params?.workspaceName}`
+      }
+      if (key === 'workspace.inviteFailed') return 'Failed to Accept Invite'
+      if (key === 'g.unknownError') return 'Unknown error'
+      return key
+    })
+  })
+}))
+
+const mockAcceptInvite = vi.hoisted(() => vi.fn())
+vi.mock('../stores/teamWorkspaceStore', () => ({
+  useTeamWorkspaceStore: () => ({
+    acceptInvite: mockAcceptInvite
+  })
+}))
+
+describe('useInviteUrlLoader', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockRouteQuery.value = {}
+    preservedQueryMocks.mergePreservedQueryIntoQuery.mockReturnValue(null)
+  })
+
+  afterEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  describe('loadInviteFromUrl', () => {
+    it('does nothing when no invite param present', async () => {
+      mockRouteQuery.value = {}
+
+      const { loadInviteFromUrl } = useInviteUrlLoader()
+      await loadInviteFromUrl()
+
+      expect(mockAcceptInvite).not.toHaveBeenCalled()
+      expect(mockToastAdd).not.toHaveBeenCalled()
+      expect(mockRouterReplace).not.toHaveBeenCalled()
+    })
+
+    it('restores preserved query and processes invite', async () => {
+      mockRouteQuery.value = {}
+      preservedQueryMocks.mergePreservedQueryIntoQuery.mockReturnValue({
+        invite: 'preserved-token'
+      })
+      mockAcceptInvite.mockResolvedValue({
+        workspaceId: 'ws-123',
+        workspaceName: 'Test Workspace'
+      })
+
+      const { loadInviteFromUrl } = useInviteUrlLoader()
+      await loadInviteFromUrl()
+
+      expect(preservedQueryMocks.hydratePreservedQuery).toHaveBeenCalledWith(
+        'invite'
+      )
+      expect(mockRouterReplace).toHaveBeenCalledWith({
+        query: { invite: 'preserved-token' }
+      })
+      expect(mockAcceptInvite).toHaveBeenCalledWith('preserved-token')
+    })
+
+    it('accepts invite and shows success toast on success', async () => {
+      mockRouteQuery.value = { invite: 'valid-token' }
+      mockAcceptInvite.mockResolvedValue({
+        workspaceId: 'ws-123',
+        workspaceName: 'Test Workspace'
+      })
+
+      const { loadInviteFromUrl } = useInviteUrlLoader()
+      await loadInviteFromUrl()
+
+      expect(mockAcceptInvite).toHaveBeenCalledWith('valid-token')
+      expect(mockToastAdd).toHaveBeenCalledWith({
+        severity: 'success',
+        summary: 'Invite Accepted',
+        detail: {
+          text: 'You have been added to Test Workspace',
+          workspaceId: 'ws-123',
+          workspaceName: 'Test Workspace'
+        },
+        group: 'invite-accepted',
+        closable: true
+      })
+    })
+
+    it('shows error toast when invite acceptance fails', async () => {
+      mockRouteQuery.value = { invite: 'invalid-token' }
+      mockAcceptInvite.mockRejectedValue(new Error('Invalid invite'))
+
+      const { loadInviteFromUrl } = useInviteUrlLoader()
+      await loadInviteFromUrl()
+
+      expect(mockAcceptInvite).toHaveBeenCalledWith('invalid-token')
+      expect(mockToastAdd).toHaveBeenCalledWith({
+        severity: 'error',
+        summary: 'Failed to Accept Invite',
+        detail: 'Invalid invite',
+        life: 5000
+      })
+    })
+
+    it('cleans up URL after processing invite', async () => {
+      mockRouteQuery.value = { invite: 'valid-token', other: 'param' }
+      mockAcceptInvite.mockResolvedValue({
+        workspaceId: 'ws-123',
+        workspaceName: 'Test Workspace'
+      })
+
+      const { loadInviteFromUrl } = useInviteUrlLoader()
+      await loadInviteFromUrl()
+
+      // Should replace with query without invite param
+      expect(mockRouterReplace).toHaveBeenCalledWith({
+        query: { other: 'param' }
+      })
+    })
+
+    it('clears preserved query after processing', async () => {
+      mockRouteQuery.value = { invite: 'valid-token' }
+      mockAcceptInvite.mockResolvedValue({
+        workspaceId: 'ws-123',
+        workspaceName: 'Test Workspace'
+      })
+
+      const { loadInviteFromUrl } = useInviteUrlLoader()
+      await loadInviteFromUrl()
+
+      expect(preservedQueryMocks.clearPreservedQuery).toHaveBeenCalledWith(
+        'invite'
+      )
+    })
+
+    it('clears preserved query even on error', async () => {
+      mockRouteQuery.value = { invite: 'invalid-token' }
+      mockAcceptInvite.mockRejectedValue(new Error('Invalid invite'))
+
+      const { loadInviteFromUrl } = useInviteUrlLoader()
+      await loadInviteFromUrl()
+
+      expect(preservedQueryMocks.clearPreservedQuery).toHaveBeenCalledWith(
+        'invite'
+      )
+    })
+
+    it('sends any token format to backend for validation', async () => {
+      mockRouteQuery.value = { invite: 'any-token-format==' }
+      mockAcceptInvite.mockRejectedValue(new Error('Invalid token'))
+
+      const { loadInviteFromUrl } = useInviteUrlLoader()
+      await loadInviteFromUrl()
+
+      // Token is sent to backend, which validates and rejects
+      expect(mockAcceptInvite).toHaveBeenCalledWith('any-token-format==')
+      expect(mockToastAdd).toHaveBeenCalledWith({
+        severity: 'error',
+        summary: 'Failed to Accept Invite',
+        detail: 'Invalid token',
+        life: 5000
+      })
+    })
+
+    it('ignores empty invite param', async () => {
+      mockRouteQuery.value = { invite: '' }
+
+      const { loadInviteFromUrl } = useInviteUrlLoader()
+      await loadInviteFromUrl()
+
+      expect(mockAcceptInvite).not.toHaveBeenCalled()
+    })
+
+    it('ignores non-string invite param', async () => {
+      mockRouteQuery.value = { invite: ['array', 'value'] as unknown as string }
+
+      const { loadInviteFromUrl } = useInviteUrlLoader()
+      await loadInviteFromUrl()
+
+      expect(mockAcceptInvite).not.toHaveBeenCalled()
+    })
+  })
+})
diff --git a/src/platform/workspace/composables/useInviteUrlLoader.ts b/src/platform/workspace/composables/useInviteUrlLoader.ts
new file mode 100644
index 0000000000..7bc7e8841e
--- /dev/null
+++ b/src/platform/workspace/composables/useInviteUrlLoader.ts
@@ -0,0 +1,112 @@
+import { useToast } from 'primevue/usetoast'
+import { useI18n } from 'vue-i18n'
+import { useRoute, useRouter } from 'vue-router'
+
+import {
+  clearPreservedQuery,
+  hydratePreservedQuery,
+  mergePreservedQueryIntoQuery
+} from '@/platform/navigation/preservedQueryManager'
+import { PRESERVED_QUERY_NAMESPACES } from '@/platform/navigation/preservedQueryNamespaces'
+
+import { useTeamWorkspaceStore } from '../stores/teamWorkspaceStore'
+
+/**
+ * Composable for loading workspace invites from URL query parameters
+ *
+ * Supports URLs like:
+ * - /?invite=TOKEN (accepts workspace invite)
+ *
+ * The invite token is preserved through login redirects via the
+ * preserved query system (sessionStorage), following the same pattern
+ * as the template URL loader.
+ */
+export function useInviteUrlLoader() {
+  const route = useRoute()
+  const router = useRouter()
+  const { t } = useI18n()
+  const toast = useToast()
+  const workspaceStore = useTeamWorkspaceStore()
+  const INVITE_NAMESPACE = PRESERVED_QUERY_NAMESPACES.INVITE
+
+  /**
+   * Hydrates preserved query from sessionStorage and merges into route.
+   * This restores the invite token after login redirects.
+   */
+  const ensureInviteQueryFromIntent = async () => {
+    hydratePreservedQuery(INVITE_NAMESPACE)
+    const mergedQuery = mergePreservedQueryIntoQuery(
+      INVITE_NAMESPACE,
+      route.query
+    )
+
+    if (mergedQuery) {
+      await router.replace({ query: mergedQuery })
+    }
+
+    return mergedQuery ?? route.query
+  }
+
+  /**
+   * Removes invite parameter from URL using Vue Router
+   */
+  const cleanupUrlParams = () => {
+    const newQuery = { ...route.query }
+    delete newQuery.invite
+    void router.replace({ query: newQuery })
+  }
+
+  /**
+   * Loads and accepts workspace invite from URL query parameters if present.
+   * Handles errors internally and shows appropriate user feedback.
+   *
+   * Flow:
+   * 1. Restore preserved query (for post-login redirect)
+   * 2. Check for invite token in route.query
+   * 3. Accept the invite via API (backend validates token)
+   * 4. Show toast notification
+   * 5. Clean up URL and preserved query
+   */
+  const loadInviteFromUrl = async () => {
+    // Restore preserved query from sessionStorage (handles login redirect case)
+    const query = await ensureInviteQueryFromIntent()
+    const inviteParam = query.invite
+    if (!inviteParam || typeof inviteParam !== 'string') {
+      return
+    }
+
+    try {
+      const result = await workspaceStore.acceptInvite(inviteParam)
+
+      toast.add({
+        severity: 'success',
+        summary: t('workspace.inviteAccepted'),
+        detail: {
+          text: t(
+            'workspace.addedToWorkspace',
+            { workspaceName: result.workspaceName },
+            { escapeParameter: false }
+          ),
+          workspaceName: result.workspaceName,
+          workspaceId: result.workspaceId
+        },
+        group: 'invite-accepted',
+        closable: true
+      })
+    } catch (error) {
+      toast.add({
+        severity: 'error',
+        summary: t('workspace.inviteFailed'),
+        detail: error instanceof Error ? error.message : t('g.unknownError'),
+        life: 5000
+      })
+    } finally {
+      cleanupUrlParams()
+      clearPreservedQuery(INVITE_NAMESPACE)
+    }
+  }
+
+  return {
+    loadInviteFromUrl
+  }
+}
diff --git a/src/platform/workspace/composables/useWorkspaceBilling.ts b/src/platform/workspace/composables/useWorkspaceBilling.ts
new file mode 100644
index 0000000000..cceceee8c6
--- /dev/null
+++ b/src/platform/workspace/composables/useWorkspaceBilling.ts
@@ -0,0 +1,319 @@
+import { computed, onBeforeUnmount, ref, shallowRef } from 'vue'
+
+import { useBillingPlans } from '@/platform/cloud/subscription/composables/useBillingPlans'
+import { useSubscriptionDialog } from '@/platform/cloud/subscription/composables/useSubscriptionDialog'
+import type {
+  BillingBalanceResponse,
+  BillingStatusResponse,
+  PreviewSubscribeResponse,
+  SubscribeResponse
+} from '@/platform/workspace/api/workspaceApi'
+import { workspaceApi } from '@/platform/workspace/api/workspaceApi'
+import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
+
+import type {
+  BalanceInfo,
+  BillingActions,
+  BillingState,
+  SubscriptionInfo
+} from '../../../composables/billing/types'
+
+/**
+ * Adapter for workspace-scoped billing via /billing/* endpoints.
+ * Used for team workspaces.
+ * @internal - Use useBillingContext() instead of importing directly.
+ */
+export function useWorkspaceBilling(): BillingState & BillingActions {
+  const billingPlans = useBillingPlans()
+  const workspaceStore = useTeamWorkspaceStore()
+
+  const isInitialized = ref(false)
+  const isLoading = ref(false)
+  const error = ref<string | null>(null)
+
+  const statusData = shallowRef<BillingStatusResponse | null>(null)
+  const balanceData = shallowRef<BillingBalanceResponse | null>(null)
+
+  const isActiveSubscription = computed(
+    () => statusData.value?.is_active ?? false
+  )
+  const isFreeTier = computed(
+    () => statusData.value?.subscription_tier === 'FREE'
+  )
+
+  const subscription = computed<SubscriptionInfo | null>(() => {
+    const status = statusData.value
+    if (!status) return null
+
+    return {
+      isActive: status.is_active,
+      tier: status.subscription_tier ?? null,
+      duration: status.subscription_duration ?? null,
+      planSlug: status.plan_slug ?? null,
+      renewalDate: status.renewal_date ?? null,
+      endDate: status.cancel_at ?? null,
+      isCancelled: status.subscription_status === 'canceled',
+      hasFunds: status.has_funds
+    }
+  })
+
+  const balance = computed<BalanceInfo | null>(() => {
+    const data = balanceData.value
+    if (!data) return null
+
+    return {
+      amountMicros: data.amount_micros,
+      currency: data.currency,
+      effectiveBalanceMicros: data.effective_balance_micros,
+      prepaidBalanceMicros: data.prepaid_balance_micros,
+      cloudCreditBalanceMicros: data.cloud_credit_balance_micros
+    }
+  })
+
+  const plans = computed(() => billingPlans.plans.value)
+  const currentPlanSlug = computed(
+    () => statusData.value?.plan_slug ?? billingPlans.currentPlanSlug.value
+  )
+
+  const pendingCancelOpId = ref<string | null>(null)
+  let cancelPollTimeout: number | null = null
+
+  const stopCancelPolling = () => {
+    if (cancelPollTimeout !== null) {
+      window.clearTimeout(cancelPollTimeout)
+      cancelPollTimeout = null
+    }
+  }
+
+  async function pollCancelStatus(opId: string): Promise<void> {
+    stopCancelPolling()
+
+    const maxAttempts = 30
+    let attempt = 0
+    const poll = async () => {
+      if (pendingCancelOpId.value !== opId) return
+
+      try {
+        const response = await workspaceApi.getBillingOpStatus(opId)
+        if (response.status === 'succeeded') {
+          pendingCancelOpId.value = null
+          stopCancelPolling()
+          await fetchStatus()
+          workspaceStore.updateActiveWorkspace({
+            isSubscribed: false
+          })
+          return
+        }
+
+        if (response.status === 'failed') {
+          pendingCancelOpId.value = null
+          stopCancelPolling()
+          throw new Error(
+            response.error_message ?? 'Failed to cancel subscription'
+          )
+        }
+
+        attempt += 1
+        if (attempt >= maxAttempts) {
+          pendingCancelOpId.value = null
+          stopCancelPolling()
+          await fetchStatus()
+          return
+        }
+      } catch (err) {
+        pendingCancelOpId.value = null
+        stopCancelPolling()
+        throw err
+      }
+
+      cancelPollTimeout = window.setTimeout(
+        () => {
+          void poll()
+        },
+        Math.min(1000 * 2 ** attempt, 5000)
+      )
+    }
+
+    await poll()
+  }
+
+  async function initialize(): Promise<void> {
+    if (isInitialized.value) return
+
+    isLoading.value = true
+    error.value = null
+    try {
+      await Promise.all([fetchStatus(), fetchBalance(), fetchPlans()])
+      // Re-fetch balance if free tier credits were just lazily granted
+      if (isFreeTier.value && balance.value?.amountMicros === 0) {
+        await fetchBalance()
+      }
+      isInitialized.value = true
+    } catch (err) {
+      error.value =
+        err instanceof Error ? err.message : 'Failed to initialize billing'
+      throw err
+    } finally {
+      isLoading.value = false
+    }
+  }
+
+  async function fetchStatus(): Promise<void> {
+    isLoading.value = true
+    error.value = null
+    try {
+      statusData.value = await workspaceApi.getBillingStatus()
+    } catch (err) {
+      error.value =
+        err instanceof Error ? err.message : 'Failed to fetch billing status'
+      throw err
+    } finally {
+      isLoading.value = false
+    }
+  }
+
+  async function fetchBalance(): Promise<void> {
+    isLoading.value = true
+    error.value = null
+    try {
+      balanceData.value = await workspaceApi.getBillingBalance()
+    } catch (err) {
+      error.value =
+        err instanceof Error ? err.message : 'Failed to fetch balance'
+      throw err
+    } finally {
+      isLoading.value = false
+    }
+  }
+
+  async function subscribe(
+    planSlug: string,
+    returnUrl?: string,
+    cancelUrl?: string
+  ): Promise<SubscribeResponse> {
+    isLoading.value = true
+    error.value = null
+    try {
+      const response = await workspaceApi.subscribe(
+        planSlug,
+        returnUrl,
+        cancelUrl
+      )
+
+      // Refresh status and balance after subscription
+      await Promise.all([fetchStatus(), fetchBalance()])
+
+      return response
+    } catch (err) {
+      error.value = err instanceof Error ? err.message : 'Failed to subscribe'
+      throw err
+    } finally {
+      isLoading.value = false
+    }
+  }
+
+  async function previewSubscribe(
+    planSlug: string
+  ): Promise<PreviewSubscribeResponse | null> {
+    isLoading.value = true
+    error.value = null
+    try {
+      return await workspaceApi.previewSubscribe(planSlug)
+    } catch (err) {
+      error.value =
+        err instanceof Error ? err.message : 'Failed to preview subscription'
+      throw err
+    } finally {
+      isLoading.value = false
+    }
+  }
+
+  async function manageSubscription(): Promise<void> {
+    isLoading.value = true
+    error.value = null
+    try {
+      const returnUrl = window.location.href
+      const response = await workspaceApi.getPaymentPortalUrl(returnUrl)
+      if (response.url) {
+        window.open(response.url, '_blank')
+      }
+    } catch (err) {
+      error.value =
+        err instanceof Error ? err.message : 'Failed to open billing portal'
+      throw err
+    } finally {
+      isLoading.value = false
+    }
+  }
+
+  async function cancelSubscription(): Promise<void> {
+    isLoading.value = true
+    error.value = null
+    try {
+      const response = await workspaceApi.cancelSubscription()
+      pendingCancelOpId.value = response.billing_op_id
+      await pollCancelStatus(response.billing_op_id)
+    } catch (err) {
+      error.value =
+        err instanceof Error ? err.message : 'Failed to cancel subscription'
+      throw err
+    } finally {
+      isLoading.value = false
+    }
+  }
+
+  async function fetchPlans(): Promise<void> {
+    isLoading.value = true
+    error.value = null
+    try {
+      await billingPlans.fetchPlans()
+      if (billingPlans.error.value) {
+        error.value = billingPlans.error.value
+      }
+    } finally {
+      isLoading.value = false
+    }
+  }
+
+  const subscriptionDialog = useSubscriptionDialog()
+
+  async function requireActiveSubscription(): Promise<void> {
+    await fetchStatus()
+    if (!isActiveSubscription.value) {
+      subscriptionDialog.show()
+    }
+  }
+
+  function showSubscriptionDialog(): void {
+    subscriptionDialog.show()
+  }
+
+  onBeforeUnmount(() => {
+    stopCancelPolling()
+  })
+
+  return {
+    // State
+    isInitialized,
+    subscription,
+    balance,
+    plans,
+    currentPlanSlug,
+    isLoading,
+    error,
+    isActiveSubscription,
+    isFreeTier,
+
+    // Actions
+    initialize,
+    fetchStatus,
+    fetchBalance,
+    subscribe,
+    previewSubscribe,
+    manageSubscription,
+    cancelSubscription,
+    fetchPlans,
+    requireActiveSubscription,
+    showSubscriptionDialog
+  }
+}
diff --git a/src/platform/workspace/composables/useWorkspaceSwitch.test.ts b/src/platform/workspace/composables/useWorkspaceSwitch.test.ts
new file mode 100644
index 0000000000..b3a76bcafc
--- /dev/null
+++ b/src/platform/workspace/composables/useWorkspaceSwitch.test.ts
@@ -0,0 +1,161 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { useWorkspaceSwitch } from '@/platform/workspace/composables/useWorkspaceSwitch'
+import type { WorkspaceWithRole } from '@/platform/workspace/api/workspaceApi'
+
+const mockSwitchWorkspace = vi.hoisted(() => vi.fn())
+const mockActiveWorkspace = vi.hoisted(() => ({
+  value: null as WorkspaceWithRole | null
+}))
+
+vi.mock('@/platform/workspace/stores/teamWorkspaceStore', () => ({
+  useTeamWorkspaceStore: () => ({
+    switchWorkspace: mockSwitchWorkspace
+  })
+}))
+
+vi.mock('pinia', () => ({
+  storeToRefs: () => ({
+    activeWorkspace: mockActiveWorkspace
+  })
+}))
+
+const mockModifiedWorkflows = vi.hoisted(
+  () => [] as Array<{ isModified: boolean }>
+)
+
+vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
+  useWorkflowStore: () => ({
+    get modifiedWorkflows() {
+      return mockModifiedWorkflows
+    }
+  })
+}))
+
+const mockConfirm = vi.hoisted(() => vi.fn())
+
+vi.mock('@/services/dialogService', () => ({
+  useDialogService: () => ({
+    confirm: mockConfirm
+  })
+}))
+
+vi.mock('vue-i18n', () => ({
+  useI18n: () => ({
+    t: (key: string) => key
+  })
+}))
+
+describe('useWorkspaceSwitch', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockActiveWorkspace.value = {
+      id: 'workspace-1',
+      name: 'Test Workspace',
+      type: 'personal',
+      role: 'owner',
+      created_at: '2026-01-01T00:00:00Z',
+      joined_at: '2026-01-01T00:00:00Z'
+    }
+    mockModifiedWorkflows.length = 0
+  })
+
+  afterEach(() => {
+    vi.unstubAllGlobals()
+  })
+
+  describe('hasUnsavedChanges', () => {
+    it('returns true when there are modified workflows', () => {
+      mockModifiedWorkflows.push({ isModified: true })
+      const { hasUnsavedChanges } = useWorkspaceSwitch()
+
+      expect(hasUnsavedChanges()).toBe(true)
+    })
+
+    it('returns true when multiple workflows are modified', () => {
+      mockModifiedWorkflows.push({ isModified: true }, { isModified: true })
+      const { hasUnsavedChanges } = useWorkspaceSwitch()
+
+      expect(hasUnsavedChanges()).toBe(true)
+    })
+
+    it('returns false when no workflows are modified', () => {
+      mockModifiedWorkflows.length = 0
+      const { hasUnsavedChanges } = useWorkspaceSwitch()
+
+      expect(hasUnsavedChanges()).toBe(false)
+    })
+  })
+
+  describe('switchWithConfirmation', () => {
+    it('returns true immediately if switching to the same workspace', async () => {
+      const { switchWithConfirmation } = useWorkspaceSwitch()
+
+      const result = await switchWithConfirmation('workspace-1')
+
+      expect(result).toBe(true)
+      expect(mockSwitchWorkspace).not.toHaveBeenCalled()
+      expect(mockConfirm).not.toHaveBeenCalled()
+    })
+
+    it('switches directly without dialog when no unsaved changes', async () => {
+      mockModifiedWorkflows.length = 0
+      mockSwitchWorkspace.mockResolvedValue(undefined)
+      const { switchWithConfirmation } = useWorkspaceSwitch()
+
+      const result = await switchWithConfirmation('workspace-2')
+
+      expect(result).toBe(true)
+      expect(mockConfirm).not.toHaveBeenCalled()
+      expect(mockSwitchWorkspace).toHaveBeenCalledWith('workspace-2')
+    })
+
+    it('shows confirmation dialog when there are unsaved changes', async () => {
+      mockModifiedWorkflows.push({ isModified: true })
+      mockConfirm.mockResolvedValue(true)
+      mockSwitchWorkspace.mockResolvedValue(undefined)
+      const { switchWithConfirmation } = useWorkspaceSwitch()
+
+      await switchWithConfirmation('workspace-2')
+
+      expect(mockConfirm).toHaveBeenCalledWith({
+        title: 'workspace.unsavedChanges.title',
+        message: 'workspace.unsavedChanges.message',
+        type: 'dirtyClose'
+      })
+    })
+
+    it('returns false if user cancels the confirmation dialog', async () => {
+      mockModifiedWorkflows.push({ isModified: true })
+      mockConfirm.mockResolvedValue(false)
+      const { switchWithConfirmation } = useWorkspaceSwitch()
+
+      const result = await switchWithConfirmation('workspace-2')
+
+      expect(result).toBe(false)
+      expect(mockSwitchWorkspace).not.toHaveBeenCalled()
+    })
+
+    it('calls switchWorkspace after user confirms', async () => {
+      mockModifiedWorkflows.push({ isModified: true })
+      mockConfirm.mockResolvedValue(true)
+      mockSwitchWorkspace.mockResolvedValue(undefined)
+      const { switchWithConfirmation } = useWorkspaceSwitch()
+
+      const result = await switchWithConfirmation('workspace-2')
+
+      expect(result).toBe(true)
+      expect(mockSwitchWorkspace).toHaveBeenCalledWith('workspace-2')
+    })
+
+    it('returns false if switchWorkspace throws an error', async () => {
+      mockModifiedWorkflows.length = 0
+      mockSwitchWorkspace.mockRejectedValue(new Error('Switch failed'))
+      const { switchWithConfirmation } = useWorkspaceSwitch()
+
+      const result = await switchWithConfirmation('workspace-2')
+
+      expect(result).toBe(false)
+    })
+  })
+})
diff --git a/src/platform/workspace/composables/useWorkspaceSwitch.ts b/src/platform/workspace/composables/useWorkspaceSwitch.ts
new file mode 100644
index 0000000000..e8983ce41e
--- /dev/null
+++ b/src/platform/workspace/composables/useWorkspaceSwitch.ts
@@ -0,0 +1,49 @@
+import { storeToRefs } from 'pinia'
+import { useI18n } from 'vue-i18n'
+
+import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
+import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
+import { useDialogService } from '@/services/dialogService'
+
+export function useWorkspaceSwitch() {
+  const { t } = useI18n()
+  const workspaceStore = useTeamWorkspaceStore()
+  const { activeWorkspace } = storeToRefs(workspaceStore)
+  const workflowStore = useWorkflowStore()
+  const dialogService = useDialogService()
+
+  function hasUnsavedChanges(): boolean {
+    return workflowStore.modifiedWorkflows.length > 0
+  }
+
+  async function switchWithConfirmation(workspaceId: string): Promise<boolean> {
+    if (activeWorkspace.value?.id === workspaceId) {
+      return true
+    }
+
+    if (hasUnsavedChanges()) {
+      const confirmed = await dialogService.confirm({
+        title: t('workspace.unsavedChanges.title'),
+        message: t('workspace.unsavedChanges.message'),
+        type: 'dirtyClose'
+      })
+
+      if (!confirmed) {
+        return false
+      }
+    }
+
+    try {
+      await workspaceStore.switchWorkspace(workspaceId)
+      // Note: switchWorkspace triggers page reload internally
+      return true
+    } catch {
+      return false
+    }
+  }
+
+  return {
+    hasUnsavedChanges,
+    switchWithConfirmation
+  }
+}
diff --git a/src/platform/workspace/composables/useWorkspaceUI.ts b/src/platform/workspace/composables/useWorkspaceUI.ts
new file mode 100644
index 0000000000..ab88c7798b
--- /dev/null
+++ b/src/platform/workspace/composables/useWorkspaceUI.ts
@@ -0,0 +1,170 @@
+import { computed } from 'vue'
+import { createSharedComposable } from '@vueuse/core'
+
+import type { WorkspaceRole, WorkspaceType } from '../api/workspaceApi'
+import { useTeamWorkspaceStore } from '../stores/teamWorkspaceStore'
+
+/** Permission flags for workspace actions */
+interface WorkspacePermissions {
+  canViewOtherMembers: boolean
+  canViewPendingInvites: boolean
+  canInviteMembers: boolean
+  canManageInvites: boolean
+  canRemoveMembers: boolean
+  canLeaveWorkspace: boolean
+  canAccessWorkspaceMenu: boolean
+  canManageSubscription: boolean
+  canTopUp: boolean
+}
+
+/** UI configuration for workspace role */
+interface WorkspaceUIConfig {
+  showMembersList: boolean
+  showPendingTab: boolean
+  showSearch: boolean
+  showDateColumn: boolean
+  showRoleBadge: boolean
+  membersGridCols: string
+  pendingGridCols: string
+  headerGridCols: string
+  showEditWorkspaceMenuItem: boolean
+  workspaceMenuAction: 'leave' | 'delete' | null
+  workspaceMenuDisabledTooltip: string | null
+}
+
+function getPermissions(
+  type: WorkspaceType,
+  role: WorkspaceRole
+): WorkspacePermissions {
+  if (type === 'personal') {
+    return {
+      canViewOtherMembers: false,
+      canViewPendingInvites: false,
+      canInviteMembers: false,
+      canManageInvites: false,
+      canRemoveMembers: false,
+      canLeaveWorkspace: false,
+      canAccessWorkspaceMenu: false,
+      canManageSubscription: true,
+      canTopUp: true
+    }
+  }
+
+  if (role === 'owner') {
+    return {
+      canViewOtherMembers: true,
+      canViewPendingInvites: true,
+      canInviteMembers: true,
+      canManageInvites: true,
+      canRemoveMembers: true,
+      canLeaveWorkspace: true,
+      canAccessWorkspaceMenu: true,
+      canManageSubscription: true,
+      canTopUp: true
+    }
+  }
+
+  // member role
+  return {
+    canViewOtherMembers: true,
+    canViewPendingInvites: false,
+    canInviteMembers: false,
+    canManageInvites: false,
+    canRemoveMembers: false,
+    canLeaveWorkspace: true,
+    canAccessWorkspaceMenu: true,
+    canManageSubscription: false,
+    canTopUp: false
+  }
+}
+
+function getUIConfig(
+  type: WorkspaceType,
+  role: WorkspaceRole
+): WorkspaceUIConfig {
+  if (type === 'personal') {
+    return {
+      showMembersList: false,
+      showPendingTab: false,
+      showSearch: false,
+      showDateColumn: false,
+      showRoleBadge: false,
+      membersGridCols: 'grid-cols-1',
+      pendingGridCols: 'grid-cols-[50%_20%_20%_10%]',
+      headerGridCols: 'grid-cols-1',
+      showEditWorkspaceMenuItem: false,
+      workspaceMenuAction: null,
+      workspaceMenuDisabledTooltip: null
+    }
+  }
+
+  if (role === 'owner') {
+    return {
+      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:
+        'workspacePanel.menu.deleteWorkspaceDisabledTooltip'
+    }
+  }
+
+  // member role
+  return {
+    showMembersList: true,
+    showPendingTab: false,
+    showSearch: true,
+    showDateColumn: true,
+    showRoleBadge: true,
+    membersGridCols: 'grid-cols-[1fr_auto]',
+    pendingGridCols: 'grid-cols-[50%_20%_20%_10%]',
+    headerGridCols: 'grid-cols-[1fr_auto]',
+    showEditWorkspaceMenuItem: false,
+    workspaceMenuAction: 'leave',
+    workspaceMenuDisabledTooltip: null
+  }
+}
+
+/**
+ * Internal implementation of UI configuration composable.
+ */
+function useWorkspaceUIInternal() {
+  const store = useTeamWorkspaceStore()
+
+  const workspaceType = computed<WorkspaceType>(
+    () => store.activeWorkspace?.type ?? 'personal'
+  )
+
+  const workspaceRole = computed<WorkspaceRole>(
+    () => store.activeWorkspace?.role ?? 'owner'
+  )
+
+  const permissions = computed<WorkspacePermissions>(() =>
+    getPermissions(workspaceType.value, workspaceRole.value)
+  )
+
+  const uiConfig = computed<WorkspaceUIConfig>(() =>
+    getUIConfig(workspaceType.value, workspaceRole.value)
+  )
+
+  return {
+    // Permissions and config
+    permissions,
+    uiConfig,
+    workspaceType,
+    workspaceRole
+  }
+}
+
+/**
+ * UI configuration composable derived from workspace state.
+ * Controls what UI elements are visible/enabled based on role and workspace type.
+ * Uses createSharedComposable to ensure tab state is shared across components.
+ */
+export const useWorkspaceUI = createSharedComposable(useWorkspaceUIInternal)
diff --git a/src/platform/workspace/stores/billingOperationStore.test.ts b/src/platform/workspace/stores/billingOperationStore.test.ts
new file mode 100644
index 0000000000..8e79e59b76
--- /dev/null
+++ b/src/platform/workspace/stores/billingOperationStore.test.ts
@@ -0,0 +1,506 @@
+import { setActivePinia, createPinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi, afterEach } from 'vitest'
+
+import type { BillingOpStatusResponse } from '@/platform/workspace/api/workspaceApi'
+
+const mockFetchStatus = vi.fn()
+const mockFetchBalance = vi.fn()
+
+vi.mock('@/composables/billing/useBillingContext', () => ({
+  useBillingContext: () => ({
+    fetchStatus: mockFetchStatus,
+    fetchBalance: mockFetchBalance
+  })
+}))
+
+const mockToastAdd = vi.fn()
+const mockToastRemove = vi.fn()
+
+vi.mock('@/platform/updates/common/toastStore', () => ({
+  useToastStore: () => ({
+    add: mockToastAdd,
+    remove: mockToastRemove
+  })
+}))
+
+vi.mock('@/platform/workspace/api/workspaceApi', () => ({
+  workspaceApi: {
+    getBillingOpStatus: vi.fn()
+  }
+}))
+
+vi.mock('@/i18n', () => ({
+  t: (key: string) => key
+}))
+
+vi.mock('@/platform/settings/composables/useSettingsDialog', () => ({
+  useSettingsDialog: () => ({
+    show: vi.fn(),
+    hide: vi.fn(),
+    showAbout: vi.fn()
+  })
+}))
+
+vi.mock('@/stores/dialogStore', () => ({
+  useDialogStore: () => ({
+    closeDialog: vi.fn()
+  })
+}))
+
+import { workspaceApi } from '@/platform/workspace/api/workspaceApi'
+
+import { useBillingOperationStore } from './billingOperationStore'
+
+describe('billingOperationStore', () => {
+  beforeEach(() => {
+    setActivePinia(createPinia())
+    vi.clearAllMocks()
+    vi.useFakeTimers()
+  })
+
+  afterEach(() => {
+    vi.useRealTimers()
+  })
+
+  describe('startOperation', () => {
+    it('creates a pending operation', () => {
+      vi.mocked(workspaceApi.getBillingOpStatus).mockResolvedValue({
+        id: 'op-1',
+        status: 'pending',
+        started_at: new Date().toISOString()
+      })
+
+      const store = useBillingOperationStore()
+      store.startOperation('op-1', 'subscription')
+
+      expect(store.operations.size).toBe(1)
+      const operation = store.getOperation('op-1')
+      expect(operation).toBeDefined()
+      expect(operation?.status).toBe('pending')
+      expect(operation?.type).toBe('subscription')
+      expect(store.hasPendingOperations).toBe(true)
+    })
+
+    it('does not create duplicate operations', () => {
+      vi.mocked(workspaceApi.getBillingOpStatus).mockResolvedValue({
+        id: 'op-1',
+        status: 'pending',
+        started_at: new Date().toISOString()
+      })
+
+      const store = useBillingOperationStore()
+      store.startOperation('op-1', 'subscription')
+      store.startOperation('op-1', 'topup')
+
+      expect(store.operations.size).toBe(1)
+      expect(store.getOperation('op-1')?.type).toBe('subscription')
+    })
+
+    it('shows immediate processing toast for subscription operations', () => {
+      vi.mocked(workspaceApi.getBillingOpStatus).mockResolvedValue({
+        id: 'op-1',
+        status: 'pending',
+        started_at: new Date().toISOString()
+      })
+
+      const store = useBillingOperationStore()
+      store.startOperation('op-1', 'subscription')
+
+      expect(mockToastAdd).toHaveBeenCalledWith({
+        severity: 'info',
+        summary: 'billingOperation.subscriptionProcessing',
+        group: 'billing-operation'
+      })
+    })
+
+    it('shows immediate processing toast for topup operations', () => {
+      vi.mocked(workspaceApi.getBillingOpStatus).mockResolvedValue({
+        id: 'op-1',
+        status: 'pending',
+        started_at: new Date().toISOString()
+      })
+
+      const store = useBillingOperationStore()
+      store.startOperation('op-1', 'topup')
+
+      expect(mockToastAdd).toHaveBeenCalledWith({
+        severity: 'info',
+        summary: 'billingOperation.topupProcessing',
+        group: 'billing-operation'
+      })
+    })
+  })
+
+  describe('polling success', () => {
+    it('updates status and shows toast on success', async () => {
+      vi.mocked(workspaceApi.getBillingOpStatus).mockResolvedValue({
+        id: 'op-1',
+        status: 'succeeded',
+        started_at: new Date().toISOString(),
+        completed_at: new Date().toISOString()
+      })
+
+      const store = useBillingOperationStore()
+      store.startOperation('op-1', 'subscription')
+
+      await vi.advanceTimersByTimeAsync(0)
+
+      const operation = store.getOperation('op-1')
+      expect(operation?.status).toBe('succeeded')
+      expect(store.hasPendingOperations).toBe(false)
+
+      expect(mockFetchStatus).toHaveBeenCalled()
+      expect(mockFetchBalance).toHaveBeenCalled()
+
+      expect(mockToastAdd).toHaveBeenCalledWith({
+        severity: 'success',
+        summary: 'billingOperation.subscriptionSuccess',
+        life: 5000
+      })
+    })
+
+    it('shows topup success message for topup operations', async () => {
+      vi.mocked(workspaceApi.getBillingOpStatus).mockResolvedValue({
+        id: 'op-1',
+        status: 'succeeded',
+        started_at: new Date().toISOString()
+      })
+
+      const store = useBillingOperationStore()
+      store.startOperation('op-1', 'topup')
+
+      await vi.advanceTimersByTimeAsync(0)
+
+      expect(mockToastAdd).toHaveBeenCalledWith({
+        severity: 'success',
+        summary: 'billingOperation.topupSuccess',
+        life: 5000
+      })
+    })
+
+    it('removes the received toast when operation succeeds', async () => {
+      vi.mocked(workspaceApi.getBillingOpStatus).mockResolvedValue({
+        id: 'op-1',
+        status: 'succeeded',
+        started_at: new Date().toISOString()
+      })
+
+      const store = useBillingOperationStore()
+      store.startOperation('op-1', 'subscription')
+
+      const receivedToast = mockToastAdd.mock.calls[0][0]
+
+      await vi.advanceTimersByTimeAsync(0)
+
+      expect(mockToastRemove).toHaveBeenCalledWith(receivedToast)
+    })
+  })
+
+  describe('polling failure', () => {
+    it('updates status and shows error toast on failure', async () => {
+      const errorMessage = 'Payment declined'
+      vi.mocked(workspaceApi.getBillingOpStatus).mockResolvedValue({
+        id: 'op-1',
+        status: 'failed',
+        error_message: errorMessage,
+        started_at: new Date().toISOString()
+      })
+
+      const store = useBillingOperationStore()
+      store.startOperation('op-1', 'subscription')
+
+      await vi.advanceTimersByTimeAsync(0)
+
+      const operation = store.getOperation('op-1')
+      expect(operation?.status).toBe('failed')
+      expect(operation?.errorMessage).toBe(errorMessage)
+      expect(store.hasPendingOperations).toBe(false)
+
+      expect(mockToastAdd).toHaveBeenCalledWith({
+        severity: 'error',
+        summary: 'billingOperation.subscriptionFailed',
+        detail: errorMessage,
+        life: 5000
+      })
+    })
+
+    it('uses default message when no error_message in response', async () => {
+      vi.mocked(workspaceApi.getBillingOpStatus).mockResolvedValue({
+        id: 'op-1',
+        status: 'failed',
+        started_at: new Date().toISOString()
+      })
+
+      const store = useBillingOperationStore()
+      store.startOperation('op-1', 'topup')
+
+      await vi.advanceTimersByTimeAsync(0)
+
+      expect(mockToastAdd).toHaveBeenCalledWith({
+        severity: 'error',
+        summary: 'billingOperation.topupFailed',
+        detail: undefined,
+        life: 5000
+      })
+    })
+  })
+
+  describe('polling timeout', () => {
+    it('times out after 2 minutes and shows error toast', async () => {
+      vi.mocked(workspaceApi.getBillingOpStatus).mockResolvedValue({
+        id: 'op-1',
+        status: 'pending',
+        started_at: new Date().toISOString()
+      })
+
+      const store = useBillingOperationStore()
+      store.startOperation('op-1', 'subscription')
+
+      await vi.advanceTimersByTimeAsync(0)
+
+      await vi.advanceTimersByTimeAsync(121_000)
+      await vi.runAllTimersAsync()
+
+      const operation = store.getOperation('op-1')
+      expect(operation?.status).toBe('timeout')
+      expect(store.hasPendingOperations).toBe(false)
+
+      expect(mockToastAdd).toHaveBeenCalledWith({
+        severity: 'error',
+        summary: 'billingOperation.subscriptionTimeout',
+        life: 5000
+      })
+    })
+
+    it('shows topup timeout message for topup operations', async () => {
+      vi.mocked(workspaceApi.getBillingOpStatus).mockResolvedValue({
+        id: 'op-1',
+        status: 'pending',
+        started_at: new Date().toISOString()
+      })
+
+      const store = useBillingOperationStore()
+      store.startOperation('op-1', 'topup')
+
+      await vi.advanceTimersByTimeAsync(121_000)
+      await vi.runAllTimersAsync()
+
+      expect(mockToastAdd).toHaveBeenCalledWith({
+        severity: 'error',
+        summary: 'billingOperation.topupTimeout',
+        life: 5000
+      })
+    })
+  })
+
+  describe('exponential backoff', () => {
+    it('uses exponential backoff for polling intervals', async () => {
+      vi.mocked(workspaceApi.getBillingOpStatus).mockResolvedValue({
+        id: 'op-1',
+        status: 'pending',
+        started_at: new Date().toISOString()
+      })
+
+      const store = useBillingOperationStore()
+      store.startOperation('op-1', 'subscription')
+
+      await vi.advanceTimersByTimeAsync(0)
+      expect(workspaceApi.getBillingOpStatus).toHaveBeenCalledTimes(1)
+
+      await vi.advanceTimersByTimeAsync(1500)
+      expect(workspaceApi.getBillingOpStatus).toHaveBeenCalledTimes(2)
+
+      await vi.advanceTimersByTimeAsync(2250)
+      expect(workspaceApi.getBillingOpStatus).toHaveBeenCalledTimes(3)
+    })
+
+    it('caps polling interval at 8 seconds', async () => {
+      vi.mocked(workspaceApi.getBillingOpStatus).mockResolvedValue({
+        id: 'op-1',
+        status: 'pending',
+        started_at: new Date().toISOString()
+      })
+
+      const store = useBillingOperationStore()
+      store.startOperation('op-1', 'subscription')
+
+      await vi.advanceTimersByTimeAsync(60_000)
+
+      const callCountBefore = vi.mocked(workspaceApi.getBillingOpStatus).mock
+        .calls.length
+
+      await vi.advanceTimersByTimeAsync(8000)
+
+      expect(
+        vi.mocked(workspaceApi.getBillingOpStatus).mock.calls.length
+      ).toBeGreaterThan(callCountBefore)
+    })
+  })
+
+  describe('network errors', () => {
+    it('continues polling on network errors', async () => {
+      vi.mocked(workspaceApi.getBillingOpStatus)
+        .mockRejectedValueOnce(new Error('Network error'))
+        .mockRejectedValueOnce(new Error('Network error'))
+        .mockResolvedValueOnce({
+          id: 'op-1',
+          status: 'succeeded',
+          started_at: new Date().toISOString()
+        } satisfies BillingOpStatusResponse)
+
+      const store = useBillingOperationStore()
+      store.startOperation('op-1', 'subscription')
+
+      await vi.advanceTimersByTimeAsync(0)
+      expect(store.getOperation('op-1')?.status).toBe('pending')
+
+      await vi.advanceTimersByTimeAsync(1500)
+      expect(store.getOperation('op-1')?.status).toBe('pending')
+
+      await vi.advanceTimersByTimeAsync(2250)
+      expect(store.getOperation('op-1')?.status).toBe('succeeded')
+    })
+  })
+
+  describe('clearOperation', () => {
+    it('removes operation from the store', async () => {
+      vi.mocked(workspaceApi.getBillingOpStatus).mockResolvedValue({
+        id: 'op-1',
+        status: 'succeeded',
+        started_at: new Date().toISOString()
+      })
+
+      const store = useBillingOperationStore()
+      store.startOperation('op-1', 'subscription')
+
+      await vi.advanceTimersByTimeAsync(0)
+
+      expect(store.operations.size).toBe(1)
+
+      store.clearOperation('op-1')
+
+      expect(store.operations.size).toBe(0)
+      expect(store.getOperation('op-1')).toBeUndefined()
+    })
+  })
+
+  describe('multiple operations', () => {
+    it('can track multiple operations concurrently', async () => {
+      vi.mocked(workspaceApi.getBillingOpStatus).mockImplementation(
+        async (opId: string) => ({
+          id: opId,
+          status: 'pending' as const,
+          started_at: new Date().toISOString()
+        })
+      )
+
+      const store = useBillingOperationStore()
+      store.startOperation('op-1', 'subscription')
+      store.startOperation('op-2', 'topup')
+
+      expect(store.operations.size).toBe(2)
+      expect(store.hasPendingOperations).toBe(true)
+
+      vi.mocked(workspaceApi.getBillingOpStatus).mockImplementation(
+        async (opId: string) => ({
+          id: opId,
+          status:
+            opId === 'op-1' ? ('succeeded' as const) : ('pending' as const),
+          started_at: new Date().toISOString()
+        })
+      )
+
+      await vi.advanceTimersByTimeAsync(1500)
+
+      expect(store.getOperation('op-1')?.status).toBe('succeeded')
+      expect(store.getOperation('op-2')?.status).toBe('pending')
+      expect(store.hasPendingOperations).toBe(true)
+    })
+  })
+
+  describe('isSettingUp', () => {
+    it('returns true when there is a pending subscription operation', () => {
+      vi.mocked(workspaceApi.getBillingOpStatus).mockResolvedValue({
+        id: 'op-1',
+        status: 'pending',
+        started_at: new Date().toISOString()
+      })
+
+      const store = useBillingOperationStore()
+      store.startOperation('op-1', 'subscription')
+
+      expect(store.isSettingUp).toBe(true)
+    })
+
+    it('returns false when there is no pending subscription operation', async () => {
+      vi.mocked(workspaceApi.getBillingOpStatus).mockResolvedValue({
+        id: 'op-1',
+        status: 'succeeded',
+        started_at: new Date().toISOString()
+      })
+
+      const store = useBillingOperationStore()
+      store.startOperation('op-1', 'subscription')
+
+      await vi.advanceTimersByTimeAsync(0)
+
+      expect(store.isSettingUp).toBe(false)
+    })
+
+    it('returns false when only topup operations are pending', () => {
+      vi.mocked(workspaceApi.getBillingOpStatus).mockResolvedValue({
+        id: 'op-1',
+        status: 'pending',
+        started_at: new Date().toISOString()
+      })
+
+      const store = useBillingOperationStore()
+      store.startOperation('op-1', 'topup')
+
+      expect(store.isSettingUp).toBe(false)
+    })
+  })
+
+  describe('isAddingCredits', () => {
+    it('returns true when there is a pending topup operation', () => {
+      vi.mocked(workspaceApi.getBillingOpStatus).mockResolvedValue({
+        id: 'op-1',
+        status: 'pending',
+        started_at: new Date().toISOString()
+      })
+
+      const store = useBillingOperationStore()
+      store.startOperation('op-1', 'topup')
+
+      expect(store.isAddingCredits).toBe(true)
+    })
+
+    it('returns false when there is no pending topup operation', async () => {
+      vi.mocked(workspaceApi.getBillingOpStatus).mockResolvedValue({
+        id: 'op-1',
+        status: 'succeeded',
+        started_at: new Date().toISOString()
+      })
+
+      const store = useBillingOperationStore()
+      store.startOperation('op-1', 'topup')
+
+      await vi.advanceTimersByTimeAsync(0)
+
+      expect(store.isAddingCredits).toBe(false)
+    })
+
+    it('returns false when only subscription operations are pending', () => {
+      vi.mocked(workspaceApi.getBillingOpStatus).mockResolvedValue({
+        id: 'op-1',
+        status: 'pending',
+        started_at: new Date().toISOString()
+      })
+
+      const store = useBillingOperationStore()
+      store.startOperation('op-1', 'subscription')
+
+      expect(store.isAddingCredits).toBe(false)
+    })
+  })
+})
diff --git a/src/platform/workspace/stores/billingOperationStore.ts b/src/platform/workspace/stores/billingOperationStore.ts
new file mode 100644
index 0000000000..fdb5a0a068
--- /dev/null
+++ b/src/platform/workspace/stores/billingOperationStore.ts
@@ -0,0 +1,244 @@
+import type { ToastMessageOptions } from 'primevue/toast'
+import { defineStore } from 'pinia'
+import { computed, ref } from 'vue'
+
+import { useBillingContext } from '@/composables/billing/useBillingContext'
+import { t } from '@/i18n'
+import { useToastStore } from '@/platform/updates/common/toastStore'
+import { workspaceApi } from '@/platform/workspace/api/workspaceApi'
+import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
+import { useDialogStore } from '@/stores/dialogStore'
+
+const INITIAL_INTERVAL_MS = 1000
+const MAX_INTERVAL_MS = 8000
+const BACKOFF_MULTIPLIER = 1.5
+const TIMEOUT_MS = 120_000 // 2 minutes
+
+type OperationType = 'subscription' | 'topup'
+type OperationStatus = 'pending' | 'succeeded' | 'failed' | 'timeout'
+
+interface BillingOperation {
+  opId: string
+  type: OperationType
+  status: OperationStatus
+  errorMessage: string | null
+  startedAt: number
+}
+
+export const useBillingOperationStore = defineStore('billingOperation', () => {
+  const operations = ref<Map<string, BillingOperation>>(new Map())
+  const timeouts = new Map<string, ReturnType<typeof setTimeout>>()
+  const intervals = new Map<string, number>()
+  const receivedToasts = new Map<string, ToastMessageOptions>()
+
+  const hasPendingOperations = computed(() =>
+    [...operations.value.values()].some((op) => op.status === 'pending')
+  )
+
+  const isSettingUp = computed(() =>
+    [...operations.value.values()].some(
+      (op) => op.status === 'pending' && op.type === 'subscription'
+    )
+  )
+
+  const isAddingCredits = computed(() =>
+    [...operations.value.values()].some(
+      (op) => op.status === 'pending' && op.type === 'topup'
+    )
+  )
+
+  function getOperation(opId: string) {
+    return operations.value.get(opId)
+  }
+
+  function startOperation(opId: string, type: OperationType) {
+    if (operations.value.has(opId)) return
+
+    const operation: BillingOperation = {
+      opId,
+      type,
+      status: 'pending',
+      errorMessage: null,
+      startedAt: Date.now()
+    }
+
+    operations.value = new Map(operations.value).set(opId, operation)
+    intervals.set(opId, INITIAL_INTERVAL_MS)
+
+    // Show immediate feedback toast (persists until operation completes)
+    const messageKey =
+      type === 'subscription'
+        ? 'billingOperation.subscriptionProcessing'
+        : 'billingOperation.topupProcessing'
+
+    const toastMessage: ToastMessageOptions = {
+      severity: 'info',
+      summary: t(messageKey),
+      group: 'billing-operation'
+    }
+    receivedToasts.set(opId, toastMessage)
+    useToastStore().add(toastMessage)
+
+    void poll(opId)
+  }
+
+  async function poll(opId: string) {
+    const operation = operations.value.get(opId)
+    if (!operation || operation.status !== 'pending') return
+
+    if (Date.now() - operation.startedAt > TIMEOUT_MS) {
+      handleTimeout(opId)
+      return
+    }
+
+    try {
+      const response = await workspaceApi.getBillingOpStatus(opId)
+
+      if (response.status === 'succeeded') {
+        await handleSuccess(opId)
+        return
+      }
+
+      if (response.status === 'failed') {
+        handleFailure(opId, response.error_message ?? null)
+        return
+      }
+
+      scheduleNextPoll(opId)
+    } catch {
+      if (Date.now() - operation.startedAt > TIMEOUT_MS) {
+        handleTimeout(opId)
+        return
+      }
+      scheduleNextPoll(opId)
+    }
+  }
+
+  function scheduleNextPoll(opId: string) {
+    const currentInterval = intervals.get(opId) ?? INITIAL_INTERVAL_MS
+    const nextInterval = Math.min(
+      currentInterval * BACKOFF_MULTIPLIER,
+      MAX_INTERVAL_MS
+    )
+    intervals.set(opId, nextInterval)
+
+    const timeoutId = setTimeout(() => void poll(opId), nextInterval)
+    timeouts.set(opId, timeoutId)
+  }
+
+  async function handleSuccess(opId: string) {
+    const operation = operations.value.get(opId)
+    if (!operation) return
+
+    updateOperationStatus(opId, 'succeeded', null)
+    cleanup(opId)
+
+    const billingContext = useBillingContext()
+    await Promise.all([
+      billingContext.fetchStatus(),
+      billingContext.fetchBalance()
+    ])
+
+    // Close any open billing dialogs and show settings
+    const dialogStore = useDialogStore()
+    dialogStore.closeDialog({ key: 'subscription-required' })
+    dialogStore.closeDialog({ key: 'top-up-credits' })
+    useSettingsDialog().show('workspace')
+
+    const toastStore = useToastStore()
+    const messageKey =
+      operation.type === 'subscription'
+        ? 'billingOperation.subscriptionSuccess'
+        : 'billingOperation.topupSuccess'
+
+    toastStore.add({
+      severity: 'success',
+      summary: t(messageKey),
+      life: 5000
+    })
+  }
+
+  function handleFailure(opId: string, errorMessage: string | null) {
+    const operation = operations.value.get(opId)
+    if (!operation) return
+
+    const defaultMessage =
+      operation.type === 'subscription'
+        ? t('billingOperation.subscriptionFailed')
+        : t('billingOperation.topupFailed')
+
+    updateOperationStatus(opId, 'failed', errorMessage ?? defaultMessage)
+    cleanup(opId)
+
+    useToastStore().add({
+      severity: 'error',
+      summary: defaultMessage,
+      detail: errorMessage ?? undefined,
+      life: 5000
+    })
+  }
+
+  function handleTimeout(opId: string) {
+    const operation = operations.value.get(opId)
+    if (!operation) return
+
+    const message =
+      operation.type === 'subscription'
+        ? t('billingOperation.subscriptionTimeout')
+        : t('billingOperation.topupTimeout')
+
+    updateOperationStatus(opId, 'timeout', message)
+    cleanup(opId)
+
+    useToastStore().add({
+      severity: 'error',
+      summary: message,
+      life: 5000
+    })
+  }
+
+  function updateOperationStatus(
+    opId: string,
+    status: OperationStatus,
+    errorMessage: string | null
+  ) {
+    const operation = operations.value.get(opId)
+    if (!operation) return
+
+    const updated = { ...operation, status, errorMessage }
+    operations.value = new Map(operations.value).set(opId, updated)
+  }
+
+  function cleanup(opId: string) {
+    const timeoutId = timeouts.get(opId)
+    if (timeoutId) {
+      clearTimeout(timeoutId)
+      timeouts.delete(opId)
+    }
+    intervals.delete(opId)
+
+    // Remove the "received" toast
+    const receivedToast = receivedToasts.get(opId)
+    if (receivedToast) {
+      useToastStore().remove(receivedToast)
+      receivedToasts.delete(opId)
+    }
+  }
+
+  function clearOperation(opId: string) {
+    cleanup(opId)
+    const newMap = new Map(operations.value)
+    newMap.delete(opId)
+    operations.value = newMap
+  }
+
+  return {
+    operations,
+    hasPendingOperations,
+    isSettingUp,
+    isAddingCredits,
+    getOperation,
+    startOperation,
+    clearOperation
+  }
+})
diff --git a/src/platform/workspace/stores/teamWorkspaceStore.test.ts b/src/platform/workspace/stores/teamWorkspaceStore.test.ts
new file mode 100644
index 0000000000..0baf59288e
--- /dev/null
+++ b/src/platform/workspace/stores/teamWorkspaceStore.test.ts
@@ -0,0 +1,978 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { sortWorkspaces, useTeamWorkspaceStore } from './teamWorkspaceStore'
+
+// Mock workspaceAuthStore
+const mockWorkspaceAuthStore = vi.hoisted(() => ({
+  currentWorkspace: null as {
+    id: string
+    name: string
+    type: 'personal' | 'team'
+    role: 'owner' | 'member'
+  } | null,
+  workspaceToken: null as string | null,
+  isLoading: false,
+  error: null as Error | null,
+  isAuthenticated: false,
+  init: vi.fn(),
+  destroy: vi.fn(),
+  initializeFromSession: vi.fn(),
+  switchWorkspace: vi.fn(),
+  refreshToken: vi.fn(),
+  getWorkspaceAuthHeader: vi.fn(),
+  clearWorkspaceContext: vi.fn()
+}))
+
+vi.mock('@/platform/workspace/stores/workspaceAuthStore', () => ({
+  useWorkspaceAuthStore: () => mockWorkspaceAuthStore
+}))
+
+// Mock workspaceApi
+const mockWorkspaceApi = vi.hoisted(() => ({
+  list: vi.fn(),
+  create: vi.fn(),
+  update: vi.fn(),
+  delete: vi.fn(),
+  leave: vi.fn(),
+  listMembers: vi.fn(),
+  removeMember: vi.fn(),
+  listInvites: vi.fn(),
+  createInvite: vi.fn(),
+  revokeInvite: vi.fn(),
+  acceptInvite: vi.fn(),
+  accessBillingPortal: vi.fn()
+}))
+
+const mockWorkspaceApiError = vi.hoisted(
+  () =>
+    class WorkspaceApiError extends Error {
+      constructor(
+        message: string,
+        public readonly status?: number,
+        public readonly code?: string
+      ) {
+        super(message)
+        this.name = 'WorkspaceApiError'
+      }
+    }
+)
+
+vi.mock('../api/workspaceApi', () => ({
+  workspaceApi: mockWorkspaceApi,
+  WorkspaceApiError: mockWorkspaceApiError
+}))
+
+// Mock localStorage
+const mockLocalStorage = vi.hoisted(() => {
+  const store: Record<string, string> = {}
+  return {
+    getItem: vi.fn((_key: string): string | null => store[_key] ?? null),
+    setItem: vi.fn((key: string, value: string) => {
+      store[key] = value
+    }),
+    removeItem: vi.fn((key: string) => {
+      delete store[key]
+    }),
+    clear: vi.fn(() => {
+      Object.keys(store).forEach((key) => delete store[key])
+    })
+  }
+})
+
+// Mock window.location.reload
+const mockReload = vi.fn()
+Object.defineProperty(window, 'location', {
+  value: { reload: mockReload, origin: 'http://localhost' },
+  writable: true
+})
+
+// Test data
+const mockPersonalWorkspace = {
+  id: 'ws-personal-123',
+  name: 'Personal',
+  type: 'personal' as const,
+  role: 'owner' as const,
+  created_at: '2026-01-01T00:00:00Z',
+  joined_at: '2026-01-01T00:00:00Z'
+}
+
+const mockTeamWorkspace = {
+  id: 'ws-team-456',
+  name: 'Team Alpha',
+  type: 'team' as const,
+  role: 'owner' as const,
+  created_at: '2026-02-01T00:00:00Z',
+  joined_at: '2026-02-01T00:00:00Z'
+}
+
+const mockMemberWorkspace = {
+  id: 'ws-team-789',
+  name: 'Team Beta',
+  type: 'team' as const,
+  role: 'member' as const,
+  created_at: '2026-03-01T00:00:00Z',
+  joined_at: '2026-03-01T00:00:00Z'
+}
+
+describe('useTeamWorkspaceStore', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    vi.clearAllMocks()
+    vi.stubGlobal('localStorage', mockLocalStorage)
+    sessionStorage.clear()
+
+    // Reset workspaceAuthStore mock state
+    mockWorkspaceAuthStore.currentWorkspace = null
+    mockWorkspaceAuthStore.workspaceToken = null
+    mockWorkspaceAuthStore.isLoading = false
+    mockWorkspaceAuthStore.error = null
+    mockWorkspaceAuthStore.isAuthenticated = false
+    mockWorkspaceAuthStore.initializeFromSession.mockReturnValue(false)
+    mockWorkspaceAuthStore.switchWorkspace.mockResolvedValue(undefined)
+
+    // Default mock responses
+    mockWorkspaceApi.list.mockResolvedValue({
+      workspaces: [mockPersonalWorkspace, mockTeamWorkspace]
+    })
+    mockLocalStorage.getItem.mockReturnValue(null)
+  })
+
+  afterEach(() => {
+    vi.unstubAllGlobals()
+  })
+
+  describe('initial state', () => {
+    it('has correct initial state values', () => {
+      const store = useTeamWorkspaceStore()
+
+      expect(store.initState).toBe('uninitialized')
+      expect(store.workspaces).toEqual([])
+      expect(store.activeWorkspaceId).toBeNull()
+      expect(store.error).toBeNull()
+      expect(store.isCreating).toBe(false)
+      expect(store.isDeleting).toBe(false)
+      expect(store.isSwitching).toBe(false)
+      expect(store.isFetchingWorkspaces).toBe(false)
+    })
+
+    it('computed properties return correct defaults', () => {
+      const store = useTeamWorkspaceStore()
+
+      expect(store.activeWorkspace).toBeNull()
+      expect(store.personalWorkspace).toBeNull()
+      expect(store.isInPersonalWorkspace).toBe(false)
+      expect(store.sharedWorkspaces).toEqual([])
+      expect(store.ownedWorkspacesCount).toBe(0)
+      expect(store.canCreateWorkspace).toBe(true)
+      expect(store.members).toEqual([])
+      expect(store.pendingInvites).toEqual([])
+    })
+  })
+
+  describe('initialize', () => {
+    it('fetches workspaces and sets active workspace to personal by default', async () => {
+      const store = useTeamWorkspaceStore()
+
+      await store.initialize()
+
+      expect(mockWorkspaceApi.list).toHaveBeenCalledTimes(1)
+      expect(store.initState).toBe('ready')
+      expect(store.workspaces).toHaveLength(2)
+      expect(store.activeWorkspaceId).toBe(mockPersonalWorkspace.id)
+      expect(mockWorkspaceAuthStore.switchWorkspace).toHaveBeenCalledWith(
+        mockPersonalWorkspace.id
+      )
+    })
+
+    it('restores workspace from session if valid', async () => {
+      mockWorkspaceAuthStore.initializeFromSession.mockReturnValue(true)
+      mockWorkspaceAuthStore.currentWorkspace = mockTeamWorkspace
+
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      expect(store.activeWorkspaceId).toBe(mockTeamWorkspace.id)
+      expect(mockWorkspaceAuthStore.switchWorkspace).not.toHaveBeenCalled()
+    })
+
+    it('falls back to localStorage if no session', async () => {
+      mockLocalStorage.getItem.mockReturnValue(mockTeamWorkspace.id)
+
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      expect(store.activeWorkspaceId).toBe(mockTeamWorkspace.id)
+    })
+
+    it('falls back to personal if stored workspace not in list', async () => {
+      mockLocalStorage.getItem.mockReturnValue('non-existent-workspace')
+
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      expect(store.activeWorkspaceId).toBe(mockPersonalWorkspace.id)
+    })
+
+    it('sets error state when workspaces fetch fails after retries', async () => {
+      vi.useFakeTimers()
+      mockWorkspaceApi.list.mockRejectedValue(new Error('Network error'))
+
+      const store = useTeamWorkspaceStore()
+
+      // Start initialization and catch rejections to prevent unhandled promise warning
+      let initError: unknown = null
+      const initPromise = store.initialize().catch((e: unknown) => {
+        initError = e
+      })
+
+      // Fast-forward through all retry delays (1s, 2s, 4s)
+      await vi.advanceTimersByTimeAsync(1000)
+      await vi.advanceTimersByTimeAsync(2000)
+      await vi.advanceTimersByTimeAsync(4000)
+
+      await initPromise
+
+      expect(initError).toBeInstanceOf(Error)
+      expect((initError as Error).message).toBe('Network error')
+      expect(store.initState).toBe('error')
+      expect(store.error).toBeInstanceOf(Error)
+      // Should have been called 4 times (initial + 3 retries)
+      expect(mockWorkspaceApi.list).toHaveBeenCalledTimes(4)
+
+      vi.useRealTimers()
+    })
+
+    it('does not reinitialize if already initialized', async () => {
+      const store = useTeamWorkspaceStore()
+
+      await store.initialize()
+      await store.initialize()
+
+      expect(mockWorkspaceApi.list).toHaveBeenCalledTimes(1)
+    })
+
+    it('throws when no workspaces available', async () => {
+      mockWorkspaceApi.list.mockResolvedValue({ workspaces: [] })
+
+      const store = useTeamWorkspaceStore()
+
+      await expect(store.initialize()).rejects.toThrow(
+        'No workspaces available'
+      )
+      expect(store.initState).toBe('error')
+    })
+
+    it('continues initialization even if token exchange fails', async () => {
+      mockWorkspaceAuthStore.switchWorkspace.mockRejectedValue(
+        new Error('Token exchange failed')
+      )
+
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      expect(store.initState).toBe('ready')
+      expect(store.activeWorkspaceId).toBe(mockPersonalWorkspace.id)
+    })
+  })
+
+  describe('switchWorkspace', () => {
+    it('does nothing if switching to current workspace', async () => {
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      const currentId = store.activeWorkspaceId
+      await store.switchWorkspace(currentId!)
+
+      expect(mockReload).not.toHaveBeenCalled()
+    })
+
+    it('clears context and reloads for valid workspace', async () => {
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      await store.switchWorkspace(mockTeamWorkspace.id)
+
+      expect(mockWorkspaceAuthStore.clearWorkspaceContext).toHaveBeenCalled()
+      expect(mockReload).toHaveBeenCalled()
+    })
+
+    it('sets isSwitching flag during operation', async () => {
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      expect(store.isSwitching).toBe(false)
+
+      const switchPromise = store.switchWorkspace(mockTeamWorkspace.id)
+      expect(store.isSwitching).toBe(true)
+
+      await switchPromise
+    })
+
+    it('refreshes workspace list if target not found', async () => {
+      const newWorkspace = {
+        id: 'ws-new-999',
+        name: 'New Workspace',
+        type: 'team' as const,
+        role: 'member' as const,
+        created_at: '2026-04-01T00:00:00Z',
+        joined_at: '2026-04-01T00:00:00Z'
+      }
+
+      mockWorkspaceApi.list
+        .mockResolvedValueOnce({
+          workspaces: [mockPersonalWorkspace, mockTeamWorkspace]
+        })
+        .mockResolvedValueOnce({
+          workspaces: [mockPersonalWorkspace, mockTeamWorkspace, newWorkspace]
+        })
+
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      await store.switchWorkspace(newWorkspace.id)
+
+      expect(mockWorkspaceApi.list).toHaveBeenCalledTimes(2)
+      expect(mockReload).toHaveBeenCalled()
+    })
+
+    it('throws if workspace not found after refresh', async () => {
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      await expect(
+        store.switchWorkspace('non-existent-workspace')
+      ).rejects.toThrow('Workspace not found or access denied')
+
+      expect(store.isSwitching).toBe(false)
+    })
+  })
+
+  describe('createWorkspace', () => {
+    it('creates workspace and triggers reload', async () => {
+      const newWorkspace = {
+        id: 'ws-new-created',
+        name: 'Created Workspace',
+        type: 'team' as const,
+        role: 'owner' as const,
+        created_at: '2026-05-01T00:00:00Z',
+        joined_at: '2026-05-01T00:00:00Z'
+      }
+      mockWorkspaceApi.create.mockResolvedValue(newWorkspace)
+
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      const result = await store.createWorkspace('Created Workspace')
+
+      expect(mockWorkspaceApi.create).toHaveBeenCalledWith({
+        name: 'Created Workspace'
+      })
+      expect(result.id).toBe(newWorkspace.id)
+      expect(store.workspaces).toContainEqual(
+        expect.objectContaining({ id: newWorkspace.id })
+      )
+      expect(mockWorkspaceAuthStore.clearWorkspaceContext).toHaveBeenCalled()
+      expect(mockReload).toHaveBeenCalled()
+    })
+
+    it('sets isCreating flag during operation', async () => {
+      let resolveCreate: (value: unknown) => void
+      const createPromise = new Promise((resolve) => {
+        resolveCreate = resolve
+      })
+      mockWorkspaceApi.create.mockReturnValue(createPromise)
+
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      expect(store.isCreating).toBe(false)
+
+      const resultPromise = store.createWorkspace('New Workspace')
+      expect(store.isCreating).toBe(true)
+
+      resolveCreate!({
+        id: 'ws-new',
+        name: 'New Workspace',
+        type: 'team',
+        role: 'owner',
+        created_at: '2026-06-01T00:00:00Z',
+        joined_at: '2026-06-01T00:00:00Z'
+      })
+      await resultPromise
+    })
+
+    it('resets isCreating on error', async () => {
+      mockWorkspaceApi.create.mockRejectedValue(new Error('Creation failed'))
+
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      await expect(store.createWorkspace('New Workspace')).rejects.toThrow(
+        'Creation failed'
+      )
+      expect(store.isCreating).toBe(false)
+    })
+  })
+
+  describe('deleteWorkspace', () => {
+    it('deletes non-active workspace without reload', async () => {
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      expect(store.activeWorkspaceId).toBe(mockPersonalWorkspace.id)
+
+      await store.deleteWorkspace(mockTeamWorkspace.id)
+
+      expect(mockWorkspaceApi.delete).toHaveBeenCalledWith(mockTeamWorkspace.id)
+      expect(store.workspaces).not.toContainEqual(
+        expect.objectContaining({ id: mockTeamWorkspace.id })
+      )
+      expect(mockReload).not.toHaveBeenCalled()
+    })
+
+    it('deletes active workspace and reloads to personal', async () => {
+      mockWorkspaceAuthStore.initializeFromSession.mockReturnValue(true)
+      mockWorkspaceAuthStore.currentWorkspace = mockTeamWorkspace
+
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      expect(store.activeWorkspaceId).toBe(mockTeamWorkspace.id)
+
+      await store.deleteWorkspace()
+
+      expect(mockWorkspaceApi.delete).toHaveBeenCalledWith(mockTeamWorkspace.id)
+      expect(mockWorkspaceAuthStore.clearWorkspaceContext).toHaveBeenCalled()
+      expect(mockReload).toHaveBeenCalled()
+    })
+
+    it('throws when trying to delete personal workspace', async () => {
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      await expect(
+        store.deleteWorkspace(mockPersonalWorkspace.id)
+      ).rejects.toThrow('Cannot delete personal workspace')
+    })
+
+    it('throws when workspace not found', async () => {
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      await expect(store.deleteWorkspace('non-existent')).rejects.toThrow(
+        'Workspace not found'
+      )
+    })
+  })
+
+  describe('renameWorkspace', () => {
+    it('updates workspace name locally', async () => {
+      mockWorkspaceApi.update.mockResolvedValue({
+        ...mockTeamWorkspace,
+        name: 'Renamed Workspace'
+      })
+
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      await store.renameWorkspace(mockTeamWorkspace.id, 'Renamed Workspace')
+
+      expect(mockWorkspaceApi.update).toHaveBeenCalledWith(
+        mockTeamWorkspace.id,
+        { name: 'Renamed Workspace' }
+      )
+
+      const updated = store.workspaces.find(
+        (w) => w.id === mockTeamWorkspace.id
+      )
+      expect(updated?.name).toBe('Renamed Workspace')
+    })
+  })
+
+  describe('leaveWorkspace', () => {
+    it('leaves workspace and reloads to personal', async () => {
+      mockWorkspaceAuthStore.initializeFromSession.mockReturnValue(true)
+      mockWorkspaceAuthStore.currentWorkspace = mockMemberWorkspace
+      mockWorkspaceApi.list.mockResolvedValue({
+        workspaces: [mockPersonalWorkspace, mockMemberWorkspace]
+      })
+
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      await store.leaveWorkspace()
+
+      expect(mockWorkspaceApi.leave).toHaveBeenCalled()
+      expect(mockWorkspaceAuthStore.clearWorkspaceContext).toHaveBeenCalled()
+      expect(mockReload).toHaveBeenCalled()
+    })
+
+    it('throws when trying to leave personal workspace', async () => {
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      await expect(store.leaveWorkspace()).rejects.toThrow(
+        'Cannot leave personal workspace'
+      )
+    })
+  })
+
+  describe('computed properties', () => {
+    it('activeWorkspace returns correct workspace', async () => {
+      mockWorkspaceAuthStore.initializeFromSession.mockReturnValue(true)
+      mockWorkspaceAuthStore.currentWorkspace = mockTeamWorkspace
+
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      expect(store.activeWorkspace?.id).toBe(mockTeamWorkspace.id)
+      expect(store.activeWorkspace?.name).toBe(mockTeamWorkspace.name)
+    })
+
+    it('personalWorkspace returns personal workspace', async () => {
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      expect(store.personalWorkspace?.id).toBe(mockPersonalWorkspace.id)
+      expect(store.personalWorkspace?.type).toBe('personal')
+    })
+
+    it('isInPersonalWorkspace returns true when in personal', async () => {
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      expect(store.isInPersonalWorkspace).toBe(true)
+    })
+
+    it('isInPersonalWorkspace returns false when in team', async () => {
+      mockWorkspaceAuthStore.initializeFromSession.mockReturnValue(true)
+      mockWorkspaceAuthStore.currentWorkspace = mockTeamWorkspace
+
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      expect(store.isInPersonalWorkspace).toBe(false)
+    })
+
+    it('sharedWorkspaces excludes personal workspace', async () => {
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      expect(store.sharedWorkspaces).toHaveLength(1)
+      expect(store.sharedWorkspaces[0].id).toBe(mockTeamWorkspace.id)
+    })
+
+    it('ownedWorkspacesCount counts owned workspaces', async () => {
+      mockWorkspaceApi.list.mockResolvedValue({
+        workspaces: [
+          mockPersonalWorkspace,
+          mockTeamWorkspace,
+          mockMemberWorkspace
+        ]
+      })
+
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      expect(store.ownedWorkspacesCount).toBe(2)
+    })
+
+    it('canCreateWorkspace respects limit', async () => {
+      const manyWorkspaces = Array.from({ length: 10 }, (_, i) => ({
+        id: `ws-owned-${i}`,
+        name: `Owned ${i}`,
+        type: 'team' as const,
+        role: 'owner' as const,
+        created_at: `2026-${String(i + 1).padStart(2, '0')}-01T00:00:00Z`,
+        joined_at: `2026-${String(i + 1).padStart(2, '0')}-01T00:00:00Z`
+      }))
+
+      mockWorkspaceApi.list.mockResolvedValue({
+        workspaces: [mockPersonalWorkspace, ...manyWorkspaces]
+      })
+
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      expect(store.ownedWorkspacesCount).toBe(11)
+      expect(store.canCreateWorkspace).toBe(false)
+    })
+  })
+
+  describe('member actions', () => {
+    it('fetchMembers updates active workspace members', async () => {
+      const mockMembers = [
+        {
+          id: 'user-1',
+          name: 'User One',
+          email: 'one@test.com',
+          joined_at: '2024-01-01T00:00:00Z'
+        },
+        {
+          id: 'user-2',
+          name: 'User Two',
+          email: 'two@test.com',
+          joined_at: '2024-01-02T00:00:00Z'
+        }
+      ]
+      mockWorkspaceApi.listMembers.mockResolvedValue({
+        members: mockMembers,
+        pagination: { offset: 0, limit: 50, total: 2 }
+      })
+      mockWorkspaceAuthStore.initializeFromSession.mockReturnValue(true)
+      mockWorkspaceAuthStore.currentWorkspace = mockTeamWorkspace
+
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      const result = await store.fetchMembers()
+
+      expect(result).toHaveLength(2)
+      expect(store.members).toHaveLength(2)
+      expect(store.members[0].name).toBe('User One')
+    })
+
+    it('fetchMembers returns empty for personal workspace', async () => {
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      const result = await store.fetchMembers()
+
+      expect(result).toEqual([])
+      expect(mockWorkspaceApi.listMembers).not.toHaveBeenCalled()
+    })
+
+    it('removeMember removes from local list', async () => {
+      const mockMembers = [
+        {
+          id: 'user-1',
+          name: 'User One',
+          email: 'one@test.com',
+          joined_at: '2024-01-01T00:00:00Z'
+        },
+        {
+          id: 'user-2',
+          name: 'User Two',
+          email: 'two@test.com',
+          joined_at: '2024-01-02T00:00:00Z'
+        }
+      ]
+      mockWorkspaceApi.listMembers.mockResolvedValue({
+        members: mockMembers,
+        pagination: { offset: 0, limit: 50, total: 2 }
+      })
+      mockWorkspaceAuthStore.initializeFromSession.mockReturnValue(true)
+      mockWorkspaceAuthStore.currentWorkspace = mockTeamWorkspace
+
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+      await store.fetchMembers()
+
+      expect(store.members).toHaveLength(2)
+
+      await store.removeMember('user-1')
+
+      expect(mockWorkspaceApi.removeMember).toHaveBeenCalledWith('user-1')
+      expect(store.members).toHaveLength(1)
+      expect(store.members[0].id).toBe('user-2')
+    })
+  })
+
+  describe('invite actions', () => {
+    it('fetchPendingInvites updates active workspace invites', async () => {
+      const mockInvites = [
+        {
+          id: 'inv-1',
+          email: 'invite@test.com',
+          token: 'token-abc',
+          invited_at: '2024-01-01T00:00:00Z',
+          expires_at: '2024-01-08T00:00:00Z'
+        }
+      ]
+      mockWorkspaceApi.listInvites.mockResolvedValue({ invites: mockInvites })
+      mockWorkspaceAuthStore.initializeFromSession.mockReturnValue(true)
+      mockWorkspaceAuthStore.currentWorkspace = mockTeamWorkspace
+
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      const result = await store.fetchPendingInvites()
+
+      expect(result).toHaveLength(1)
+      expect(store.pendingInvites).toHaveLength(1)
+      expect(store.pendingInvites[0].email).toBe('invite@test.com')
+    })
+
+    it('createInvite adds to local list', async () => {
+      const newInvite = {
+        id: 'inv-new',
+        email: 'new@test.com',
+        token: 'token-new',
+        invited_at: '2024-01-01T00:00:00Z',
+        expires_at: '2024-01-08T00:00:00Z'
+      }
+      mockWorkspaceApi.createInvite.mockResolvedValue(newInvite)
+      mockWorkspaceAuthStore.initializeFromSession.mockReturnValue(true)
+      mockWorkspaceAuthStore.currentWorkspace = mockTeamWorkspace
+
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      const result = await store.createInvite('new@test.com')
+
+      expect(mockWorkspaceApi.createInvite).toHaveBeenCalledWith({
+        email: 'new@test.com'
+      })
+      expect(result.email).toBe('new@test.com')
+      expect(store.pendingInvites).toContainEqual(
+        expect.objectContaining({ email: 'new@test.com' })
+      )
+    })
+
+    it('revokeInvite removes from local list', async () => {
+      const mockInvites = [
+        {
+          id: 'inv-1',
+          email: 'one@test.com',
+          token: 'token-1',
+          invited_at: '2024-01-01T00:00:00Z',
+          expires_at: '2024-01-08T00:00:00Z'
+        },
+        {
+          id: 'inv-2',
+          email: 'two@test.com',
+          token: 'token-2',
+          invited_at: '2024-01-01T00:00:00Z',
+          expires_at: '2024-01-08T00:00:00Z'
+        }
+      ]
+      mockWorkspaceApi.listInvites.mockResolvedValue({ invites: mockInvites })
+      mockWorkspaceAuthStore.initializeFromSession.mockReturnValue(true)
+      mockWorkspaceAuthStore.currentWorkspace = mockTeamWorkspace
+
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+      await store.fetchPendingInvites()
+
+      await store.revokeInvite('inv-1')
+
+      expect(mockWorkspaceApi.revokeInvite).toHaveBeenCalledWith('inv-1')
+      expect(store.pendingInvites).toHaveLength(1)
+      expect(store.pendingInvites[0].id).toBe('inv-2')
+    })
+
+    it('acceptInvite refreshes workspace list', async () => {
+      mockWorkspaceApi.acceptInvite.mockResolvedValue({
+        workspace_id: 'ws-joined',
+        workspace_name: 'Joined Workspace'
+      })
+
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      const result = await store.acceptInvite('invite-token')
+
+      expect(mockWorkspaceApi.acceptInvite).toHaveBeenCalledWith('invite-token')
+      expect(result.workspaceId).toBe('ws-joined')
+      expect(result.workspaceName).toBe('Joined Workspace')
+      expect(mockWorkspaceApi.list).toHaveBeenCalledTimes(2)
+    })
+  })
+
+  describe('invite link helpers', () => {
+    it('getInviteLink returns link for existing invite', async () => {
+      const mockInvites = [
+        {
+          id: 'inv-1',
+          email: 'test@test.com',
+          token: 'secret-token',
+          invited_at: '2024-01-01T00:00:00Z',
+          expires_at: '2024-01-08T00:00:00Z'
+        }
+      ]
+      mockWorkspaceApi.listInvites.mockResolvedValue({ invites: mockInvites })
+      mockWorkspaceAuthStore.initializeFromSession.mockReturnValue(true)
+      mockWorkspaceAuthStore.currentWorkspace = mockTeamWorkspace
+
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+      await store.fetchPendingInvites()
+
+      const link = store.getInviteLink('inv-1')
+
+      expect(link).toContain('?invite=secret-token')
+    })
+
+    it('getInviteLink returns null for non-existent invite', async () => {
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      const link = store.getInviteLink('non-existent')
+
+      expect(link).toBeNull()
+    })
+
+    it('createInviteLink creates invite and returns link', async () => {
+      const newInvite = {
+        id: 'inv-new',
+        email: 'new@test.com',
+        token: 'new-token',
+        invited_at: '2024-01-01T00:00:00Z',
+        expires_at: '2024-01-08T00:00:00Z'
+      }
+      mockWorkspaceApi.createInvite.mockResolvedValue(newInvite)
+      mockWorkspaceAuthStore.initializeFromSession.mockReturnValue(true)
+      mockWorkspaceAuthStore.currentWorkspace = mockTeamWorkspace
+
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      const link = await store.createInviteLink('new@test.com')
+
+      expect(link).toContain('?invite=new-token')
+    })
+  })
+
+  describe('cleanup', () => {
+    it('destroy calls workspaceAuthStore.destroy', async () => {
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+
+      store.destroy()
+
+      expect(mockWorkspaceAuthStore.destroy).toHaveBeenCalled()
+    })
+  })
+
+  describe('totalMemberSlots and isInviteLimitReached', () => {
+    it('calculates total slots from members and invites', async () => {
+      const mockMembers = [
+        {
+          id: 'user-1',
+          name: 'User One',
+          email: 'one@test.com',
+          joined_at: '2024-01-01T00:00:00Z'
+        }
+      ]
+      const mockInvites = [
+        {
+          id: 'inv-1',
+          email: 'invite@test.com',
+          token: 'token-1',
+          invited_at: '2024-01-01T00:00:00Z',
+          expires_at: '2024-01-08T00:00:00Z'
+        },
+        {
+          id: 'inv-2',
+          email: 'invite2@test.com',
+          token: 'token-2',
+          invited_at: '2024-01-01T00:00:00Z',
+          expires_at: '2024-01-08T00:00:00Z'
+        }
+      ]
+      mockWorkspaceApi.listMembers.mockResolvedValue({
+        members: mockMembers,
+        pagination: { offset: 0, limit: 50, total: 1 }
+      })
+      mockWorkspaceApi.listInvites.mockResolvedValue({ invites: mockInvites })
+      mockWorkspaceAuthStore.initializeFromSession.mockReturnValue(true)
+      mockWorkspaceAuthStore.currentWorkspace = mockTeamWorkspace
+
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+      await store.fetchMembers()
+      await store.fetchPendingInvites()
+
+      expect(store.totalMemberSlots).toBe(3)
+      expect(store.isInviteLimitReached).toBe(false)
+    })
+
+    it('isInviteLimitReached returns true at 50 slots', async () => {
+      const mockMembers = Array.from({ length: 48 }, (_, i) => ({
+        id: `user-${i}`,
+        name: `User ${i}`,
+        email: `user${i}@test.com`,
+        joined_at: '2024-01-01T00:00:00Z'
+      }))
+      const mockInvites = [
+        {
+          id: 'inv-1',
+          email: 'invite1@test.com',
+          token: 'token-1',
+          invited_at: '2024-01-01T00:00:00Z',
+          expires_at: '2024-01-08T00:00:00Z'
+        },
+        {
+          id: 'inv-2',
+          email: 'invite2@test.com',
+          token: 'token-2',
+          invited_at: '2024-01-01T00:00:00Z',
+          expires_at: '2024-01-08T00:00:00Z'
+        }
+      ]
+      mockWorkspaceApi.listMembers.mockResolvedValue({
+        members: mockMembers,
+        pagination: { offset: 0, limit: 50, total: 48 }
+      })
+      mockWorkspaceApi.listInvites.mockResolvedValue({ invites: mockInvites })
+      mockWorkspaceAuthStore.initializeFromSession.mockReturnValue(true)
+      mockWorkspaceAuthStore.currentWorkspace = mockTeamWorkspace
+
+      const store = useTeamWorkspaceStore()
+      await store.initialize()
+      await store.fetchMembers()
+      await store.fetchPendingInvites()
+
+      expect(store.totalMemberSlots).toBe(50)
+      expect(store.isInviteLimitReached).toBe(true)
+    })
+  })
+})
+
+describe('sortWorkspaces', () => {
+  it('places personal first, then sorts ascending by created_at for owners and joined_at for members', () => {
+    const input = [
+      {
+        created_at: '2026-06-01T00:00:00Z',
+        id: 'w-team-new-owner',
+        joined_at: '2026-01-01T00:00:00Z',
+        name: 'Newest Owner Team',
+        role: 'owner' as const,
+        type: 'team' as const
+      },
+      {
+        created_at: '2026-12-01T00:00:00Z',
+        id: 'w-personal',
+        joined_at: '2026-12-01T00:00:00Z',
+        name: 'Personal Workspace',
+        role: 'owner' as const,
+        type: 'personal' as const
+      },
+      {
+        created_at: '2026-01-01T00:00:00Z',
+        id: 'w-team-member',
+        joined_at: '2026-04-01T00:00:00Z',
+        name: 'Member Team',
+        role: 'member' as const,
+        type: 'team' as const
+      },
+      {
+        created_at: '2026-02-01T00:00:00Z',
+        id: 'w-team-old-owner',
+        joined_at: '2026-09-01T00:00:00Z',
+        name: 'Oldest Owner Team',
+        role: 'owner' as const,
+        type: 'team' as const
+      }
+    ]
+
+    expect(sortWorkspaces(input).map((w) => w.id)).toEqual([
+      'w-personal',
+      'w-team-old-owner',
+      'w-team-member',
+      'w-team-new-owner'
+    ])
+  })
+})
diff --git a/src/platform/workspace/stores/teamWorkspaceStore.ts b/src/platform/workspace/stores/teamWorkspaceStore.ts
new file mode 100644
index 0000000000..27e4e1ee6c
--- /dev/null
+++ b/src/platform/workspace/stores/teamWorkspaceStore.ts
@@ -0,0 +1,693 @@
+import { defineStore } from 'pinia'
+import { computed, ref, shallowRef } from 'vue'
+
+import { WORKSPACE_STORAGE_KEYS } from '@/platform/workspace/workspaceConstants'
+import { clearPreservedQuery } from '@/platform/navigation/preservedQueryManager'
+import { PRESERVED_QUERY_NAMESPACES } from '@/platform/navigation/preservedQueryNamespaces'
+import { useWorkspaceAuthStore } from '@/platform/workspace/stores/workspaceAuthStore'
+
+import type {
+  ListMembersParams,
+  Member,
+  PendingInvite as ApiPendingInvite,
+  SubscriptionTier,
+  WorkspaceWithRole
+} from '../api/workspaceApi'
+import { workspaceApi } from '../api/workspaceApi'
+
+export interface WorkspaceMember {
+  id: string
+  name: string
+  email: string
+  joinDate: Date
+  role: 'owner' | 'member'
+}
+
+export interface PendingInvite {
+  id: string
+  email: string
+  token: string
+  inviteDate: Date
+  expiryDate: Date
+}
+
+type SubscriptionPlan = string | null
+
+interface WorkspaceState extends WorkspaceWithRole {
+  isSubscribed: boolean
+  subscriptionPlan: SubscriptionPlan
+  subscriptionTier: SubscriptionTier | null
+  members: WorkspaceMember[]
+  pendingInvites: PendingInvite[]
+}
+
+type InitState = 'uninitialized' | 'loading' | 'ready' | 'error'
+
+function mapApiMemberToWorkspaceMember(member: Member): WorkspaceMember {
+  return {
+    id: member.id,
+    name: member.name,
+    email: member.email,
+    joinDate: new Date(member.joined_at),
+    role: member.role
+  }
+}
+
+function mapApiInviteToPendingInvite(invite: ApiPendingInvite): PendingInvite {
+  return {
+    id: invite.id,
+    email: invite.email,
+    token: invite.token,
+    inviteDate: new Date(invite.invited_at),
+    expiryDate: new Date(invite.expires_at)
+  }
+}
+
+function createWorkspaceState(workspace: WorkspaceWithRole): WorkspaceState {
+  return {
+    ...workspace,
+    // Personal workspaces use user-scoped subscription from useSubscription()
+    isSubscribed:
+      workspace.type === 'personal' || !!workspace.subscription_tier,
+    subscriptionPlan: null,
+    subscriptionTier: workspace.subscription_tier ?? null,
+    members: [],
+    pendingInvites: []
+  }
+}
+
+export function sortWorkspaces<T extends WorkspaceWithRole>(list: T[]): T[] {
+  return [...list].sort((a, b) => {
+    if (a.type === 'personal') return -1
+    if (b.type === 'personal') return 1
+    const dateA = a.role === 'owner' ? a.created_at : a.joined_at
+    const dateB = b.role === 'owner' ? b.created_at : b.joined_at
+    return dateA.localeCompare(dateB)
+  })
+}
+
+function getLastWorkspaceId(): string | null {
+  try {
+    return localStorage.getItem(WORKSPACE_STORAGE_KEYS.LAST_WORKSPACE_ID)
+  } catch {
+    return null
+  }
+}
+
+function setLastWorkspaceId(workspaceId: string): void {
+  try {
+    localStorage.setItem(WORKSPACE_STORAGE_KEYS.LAST_WORKSPACE_ID, workspaceId)
+  } catch {
+    console.warn('Failed to persist last workspace ID to localStorage')
+  }
+}
+
+const MAX_OWNED_WORKSPACES = 10
+const MAX_WORKSPACE_MEMBERS = 50
+const MAX_INIT_RETRIES = 3
+const BASE_RETRY_DELAY_MS = 1000
+
+export const useTeamWorkspaceStore = defineStore('teamWorkspace', () => {
+  const initState = ref<InitState>('uninitialized')
+  const workspaces = shallowRef<WorkspaceState[]>([])
+  const activeWorkspaceId = ref<string | null>(null)
+  const error = ref<Error | null>(null)
+
+  const isCreating = ref(false)
+  const isDeleting = ref(false)
+  const isSwitching = ref(false)
+  const isFetchingWorkspaces = ref(false)
+
+  const activeWorkspace = computed(
+    () => workspaces.value.find((w) => w.id === activeWorkspaceId.value) ?? null
+  )
+
+  const personalWorkspace = computed(
+    () => workspaces.value.find((w) => w.type === 'personal') ?? null
+  )
+
+  const isInPersonalWorkspace = computed(
+    () => activeWorkspace.value?.type === 'personal'
+  )
+
+  const sharedWorkspaces = computed(() =>
+    workspaces.value.filter((w) => w.type !== 'personal')
+  )
+
+  const ownedWorkspacesCount = computed(
+    () => workspaces.value.filter((w) => w.role === 'owner').length
+  )
+
+  const canCreateWorkspace = computed(
+    () => ownedWorkspacesCount.value < MAX_OWNED_WORKSPACES
+  )
+
+  const members = computed<WorkspaceMember[]>(
+    () => activeWorkspace.value?.members ?? []
+  )
+
+  const pendingInvites = computed<PendingInvite[]>(
+    () => activeWorkspace.value?.pendingInvites ?? []
+  )
+
+  const totalMemberSlots = computed(
+    () => members.value.length + pendingInvites.value.length
+  )
+
+  const isInviteLimitReached = computed(
+    () => totalMemberSlots.value >= MAX_WORKSPACE_MEMBERS
+  )
+
+  const workspaceId = computed(() => activeWorkspace.value?.id ?? null)
+
+  const workspaceName = computed(() => activeWorkspace.value?.name ?? '')
+
+  const isWorkspaceSubscribed = computed(
+    () => activeWorkspace.value?.isSubscribed ?? false
+  )
+
+  const subscriptionPlan = computed(
+    () => activeWorkspace.value?.subscriptionPlan ?? null
+  )
+
+  function updateWorkspace(
+    workspaceId: string,
+    updates: Partial<WorkspaceState>
+  ) {
+    const index = workspaces.value.findIndex((w) => w.id === workspaceId)
+    if (index === -1) return
+
+    const current = workspaces.value[index]
+    const updated = { ...current, ...updates }
+    workspaces.value = [
+      ...workspaces.value.slice(0, index),
+      updated,
+      ...workspaces.value.slice(index + 1)
+    ]
+  }
+
+  function updateActiveWorkspace(updates: Partial<WorkspaceState>) {
+    if (!activeWorkspaceId.value) return
+    updateWorkspace(activeWorkspaceId.value, updates)
+  }
+
+  /**
+   * Initialize the workspace store.
+   * Fetches workspaces and resolves the active workspace from session/localStorage.
+   * Delegates token management to workspaceAuthStore.
+   * Retries on transient failures with exponential backoff.
+   * Call once on app boot.
+   */
+  async function initialize(): Promise<void> {
+    if (initState.value !== 'uninitialized') return
+
+    initState.value = 'loading'
+    isFetchingWorkspaces.value = true
+    error.value = null
+
+    const workspaceAuthStore = useWorkspaceAuthStore()
+
+    for (let attempt = 0; attempt <= MAX_INIT_RETRIES; attempt++) {
+      try {
+        // 1. Try to restore workspace context from session (page refresh case)
+        const hasValidSession = workspaceAuthStore.initializeFromSession()
+
+        if (hasValidSession && workspaceAuthStore.currentWorkspace) {
+          // Valid session exists - fetch workspace list and verify access
+          const response = await workspaceApi.list()
+          workspaces.value = sortWorkspaces(
+            response.workspaces.map(createWorkspaceState)
+          )
+
+          if (workspaces.value.length === 0) {
+            throw new Error('No workspaces available')
+          }
+
+          // Verify session workspace exists in fetched list
+          const sessionWorkspaceId = workspaceAuthStore.currentWorkspace.id
+          const sessionWorkspaceExists = workspaces.value.some(
+            (w) => w.id === sessionWorkspaceId
+          )
+
+          if (sessionWorkspaceExists) {
+            activeWorkspaceId.value = sessionWorkspaceId
+            initState.value = 'ready'
+            isFetchingWorkspaces.value = false
+            return
+          }
+
+          // Session workspace not found (deleted/access revoked) - fallback to default
+          workspaceAuthStore.clearWorkspaceContext()
+
+          const personal = workspaces.value.find((w) => w.type === 'personal')
+          const fallbackWorkspaceId = personal?.id ?? workspaces.value[0].id
+
+          try {
+            await workspaceAuthStore.switchWorkspace(fallbackWorkspaceId)
+          } catch {
+            console.error(
+              '[teamWorkspaceStore] Token exchange failed during fallback'
+            )
+          }
+
+          activeWorkspaceId.value = fallbackWorkspaceId
+          setLastWorkspaceId(fallbackWorkspaceId)
+          initState.value = 'ready'
+          isFetchingWorkspaces.value = false
+          return
+        }
+
+        // 2. No valid session - fetch workspaces and pick default
+        const response = await workspaceApi.list()
+        workspaces.value = sortWorkspaces(
+          response.workspaces.map(createWorkspaceState)
+        )
+
+        if (workspaces.value.length === 0) {
+          throw new Error('No workspaces available')
+        }
+
+        // 3. Determine target workspace (priority: localStorage > personal)
+        let targetWorkspaceId: string | null = null
+
+        const lastId = getLastWorkspaceId()
+        if (lastId && workspaces.value.some((w) => w.id === lastId)) {
+          targetWorkspaceId = lastId
+        }
+
+        if (!targetWorkspaceId) {
+          const personal = workspaces.value.find((w) => w.type === 'personal')
+          targetWorkspaceId = personal?.id ?? workspaces.value[0].id
+        }
+
+        // 4. Exchange Firebase token for workspace token
+        try {
+          await workspaceAuthStore.switchWorkspace(targetWorkspaceId)
+        } catch {
+          // Log but don't fail initialization - API calls will fall back to Firebase token
+          console.error(
+            '[teamWorkspaceStore] Token exchange failed during init'
+          )
+        }
+
+        // 5. Set active workspace
+        activeWorkspaceId.value = targetWorkspaceId
+        setLastWorkspaceId(targetWorkspaceId)
+
+        initState.value = 'ready'
+        isFetchingWorkspaces.value = false
+        return
+      } catch (e) {
+        const isNoWorkspacesError =
+          e instanceof Error && e.message === 'No workspaces available'
+
+        // Don't retry on permanent errors (no workspaces available)
+        if (isNoWorkspacesError || attempt >= MAX_INIT_RETRIES) {
+          error.value = e instanceof Error ? e : new Error('Unknown error')
+          initState.value = 'error'
+          isFetchingWorkspaces.value = false
+          throw e
+        }
+
+        // Retry with exponential backoff for transient errors
+        const delay = BASE_RETRY_DELAY_MS * Math.pow(2, attempt)
+        const errorMessage = e instanceof Error ? e.message : String(e)
+        console.warn(
+          `[teamWorkspaceStore] Init failed (attempt ${attempt + 1}/${MAX_INIT_RETRIES + 1}), retrying in ${delay}ms: ${errorMessage}`
+        )
+        await new Promise((resolve) => setTimeout(resolve, delay))
+      }
+    }
+
+    isFetchingWorkspaces.value = false
+  }
+
+  /**
+   * Re-fetch workspaces from API without changing active workspace.
+   */
+  async function refreshWorkspaces(): Promise<void> {
+    isFetchingWorkspaces.value = true
+    try {
+      const response = await workspaceApi.list()
+      workspaces.value = sortWorkspaces(
+        response.workspaces.map(createWorkspaceState)
+      )
+    } finally {
+      isFetchingWorkspaces.value = false
+    }
+  }
+
+  /**
+   * Switch to a different workspace.
+   * Clears workspace context and reloads the page.
+   */
+  async function switchWorkspace(workspaceId: string): Promise<void> {
+    if (workspaceId === activeWorkspaceId.value) return
+
+    const workspaceAuthStore = useWorkspaceAuthStore()
+
+    isSwitching.value = true
+
+    try {
+      // Verify workspace exists in our list (user has access)
+      const workspace = workspaces.value.find((w) => w.id === workspaceId)
+      if (!workspace) {
+        // Workspace not in list - try refetching in case it was added
+        await refreshWorkspaces()
+        const refreshedWorkspace = workspaces.value.find(
+          (w) => w.id === workspaceId
+        )
+        if (!refreshedWorkspace) {
+          throw new Error('Workspace not found or access denied')
+        }
+      }
+
+      // Clear current workspace context and persist new workspace ID
+      workspaceAuthStore.clearWorkspaceContext()
+      setLastWorkspaceId(workspaceId)
+
+      // Reload to reinitialize with new workspace
+      window.location.reload()
+      // Code after this won't run (page reloads)
+    } catch (e) {
+      isSwitching.value = false
+      throw e
+    }
+  }
+
+  /**
+   * Create a new workspace and switch to it.
+   */
+  async function createWorkspace(name: string): Promise<WorkspaceState> {
+    const workspaceAuthStore = useWorkspaceAuthStore()
+
+    isCreating.value = true
+
+    try {
+      const newWorkspace = await workspaceApi.create({ name })
+      const workspaceState = createWorkspaceState(newWorkspace)
+
+      // Add to local list
+      workspaces.value = [...workspaces.value, workspaceState]
+
+      // Clear context and switch to new workspace
+      workspaceAuthStore.clearWorkspaceContext()
+      // Clear any preserved invite query to prevent stale invites from being
+      // processed after the reload (prevents owner adding themselves as member)
+      clearPreservedQuery(PRESERVED_QUERY_NAMESPACES.INVITE)
+      setLastWorkspaceId(newWorkspace.id)
+      window.location.reload()
+
+      // Code after this won't run (page reloads)
+      return workspaceState
+    } catch (e) {
+      isCreating.value = false
+      throw e
+    }
+  }
+
+  /**
+   * Delete a workspace.
+   * If deleting active workspace, switches to personal.
+   */
+  async function deleteWorkspace(workspaceId?: string): Promise<void> {
+    const targetId = workspaceId ?? activeWorkspaceId.value
+    if (!targetId) throw new Error('No workspace to delete')
+
+    const workspace = workspaces.value.find((w) => w.id === targetId)
+    if (!workspace) throw new Error('Workspace not found')
+    if (workspace.type === 'personal') {
+      throw new Error('Cannot delete personal workspace')
+    }
+
+    const workspaceAuthStore = useWorkspaceAuthStore()
+
+    isDeleting.value = true
+
+    try {
+      await workspaceApi.delete(targetId)
+
+      if (targetId === activeWorkspaceId.value) {
+        // Deleted active workspace - go to personal
+        const personal = personalWorkspace.value
+        workspaceAuthStore.clearWorkspaceContext()
+        if (personal) {
+          setLastWorkspaceId(personal.id)
+        }
+        window.location.reload()
+        // Code after this won't run (page reloads)
+      } else {
+        // Deleted non-active workspace - just update local list
+        workspaces.value = workspaces.value.filter((w) => w.id !== targetId)
+        isDeleting.value = false
+      }
+    } catch (e) {
+      isDeleting.value = false
+      throw e
+    }
+  }
+
+  /**
+   * Rename a workspace. No reload needed.
+   */
+  async function renameWorkspace(
+    workspaceId: string,
+    newName: string
+  ): Promise<void> {
+    const updated = await workspaceApi.update(workspaceId, { name: newName })
+    updateWorkspace(workspaceId, { name: updated.name })
+  }
+
+  /**
+   * Update workspace name (convenience for current workspace).
+   */
+  async function updateWorkspaceName(name: string): Promise<void> {
+    if (!activeWorkspaceId.value) {
+      throw new Error('No active workspace')
+    }
+    await renameWorkspace(activeWorkspaceId.value, name)
+  }
+
+  /**
+   * Leave the current workspace.
+   * Switches to personal workspace after leaving.
+   */
+  async function leaveWorkspace(): Promise<void> {
+    const current = activeWorkspace.value
+    if (!current || current.type === 'personal') {
+      throw new Error('Cannot leave personal workspace')
+    }
+
+    const workspaceAuthStore = useWorkspaceAuthStore()
+
+    await workspaceApi.leave()
+
+    // Go to personal workspace
+    const personal = personalWorkspace.value
+    workspaceAuthStore.clearWorkspaceContext()
+    if (personal) {
+      setLastWorkspaceId(personal.id)
+    }
+    window.location.reload()
+    // Code after this won't run (page reloads)
+  }
+
+  /**
+   * Fetch members for the current workspace.
+   */
+  async function fetchMembers(
+    params?: ListMembersParams
+  ): Promise<WorkspaceMember[]> {
+    if (!activeWorkspaceId.value) return []
+    if (activeWorkspace.value?.type === 'personal') return []
+
+    const response = await workspaceApi.listMembers(params)
+    const members = response.members.map(mapApiMemberToWorkspaceMember)
+    updateActiveWorkspace({ members })
+    return members
+  }
+
+  /**
+   * Remove a member from the current workspace.
+   */
+  async function removeMember(userId: string): Promise<void> {
+    await workspaceApi.removeMember(userId)
+    const current = activeWorkspace.value
+    if (current) {
+      updateActiveWorkspace({
+        members: current.members.filter((m) => m.id !== userId)
+      })
+    }
+  }
+
+  /**
+   * Fetch pending invites for the current workspace.
+   */
+  async function fetchPendingInvites(): Promise<PendingInvite[]> {
+    if (!activeWorkspaceId.value) return []
+    if (activeWorkspace.value?.type === 'personal') return []
+
+    const response = await workspaceApi.listInvites()
+    const invites = response.invites.map(mapApiInviteToPendingInvite)
+    updateActiveWorkspace({ pendingInvites: invites })
+    return invites
+  }
+
+  /**
+   * Create an invite for the current workspace.
+   */
+  async function createInvite(email: string): Promise<PendingInvite> {
+    const response = await workspaceApi.createInvite({ email })
+    const invite = mapApiInviteToPendingInvite(response)
+
+    const current = activeWorkspace.value
+    if (current) {
+      updateActiveWorkspace({
+        pendingInvites: [...current.pendingInvites, invite]
+      })
+    }
+
+    return invite
+  }
+
+  /**
+   * Revoke a pending invite.
+   */
+  async function revokeInvite(inviteId: string): Promise<void> {
+    await workspaceApi.revokeInvite(inviteId)
+    const current = activeWorkspace.value
+    if (current) {
+      updateActiveWorkspace({
+        pendingInvites: current.pendingInvites.filter((i) => i.id !== inviteId)
+      })
+    }
+  }
+
+  /**
+   * Accept a workspace invite.
+   * Returns workspace info so UI can offer "View Workspace" button.
+   */
+  async function acceptInvite(
+    token: string
+  ): Promise<{ workspaceId: string; workspaceName: string }> {
+    const response = await workspaceApi.acceptInvite(token)
+
+    // Refresh workspace list to include newly joined workspace
+    await refreshWorkspaces()
+
+    return {
+      workspaceId: response.workspace_id,
+      workspaceName: response.workspace_name
+    }
+  }
+
+  function buildInviteLink(token: string): string {
+    const baseUrl = window.location.origin
+    return `${baseUrl}?invite=${encodeURIComponent(token)}`
+  }
+
+  /**
+   * Get the invite link for a pending invite.
+   */
+  function getInviteLink(inviteId: string): string | null {
+    const invite = activeWorkspace.value?.pendingInvites.find(
+      (i) => i.id === inviteId
+    )
+    return invite ? buildInviteLink(invite.token) : null
+  }
+
+  /**
+   * Create an invite link for a given email.
+   */
+  async function createInviteLink(email: string): Promise<string> {
+    const invite = await createInvite(email)
+    return buildInviteLink(invite.token)
+  }
+
+  /**
+   * Copy an invite link to clipboard.
+   */
+  async function copyInviteLink(inviteId: string): Promise<string> {
+    const invite = activeWorkspace.value?.pendingInvites.find(
+      (i) => i.id === inviteId
+    )
+    if (!invite) {
+      throw new Error('Invite not found')
+    }
+    const inviteLink = buildInviteLink(invite.token)
+    await navigator.clipboard.writeText(inviteLink)
+    return inviteLink
+  }
+
+  //TODO: when billing lands update this
+  function subscribeWorkspace(plan: SubscriptionPlan = 'PRO_MONTHLY') {
+    console.warn(plan, 'Billing endpoint has not been added yet.')
+  }
+
+  /**
+   * Clean up store resources.
+   * Delegates to workspaceAuthStore for token cleanup.
+   */
+  function destroy(): void {
+    const workspaceAuthStore = useWorkspaceAuthStore()
+    workspaceAuthStore.destroy()
+  }
+
+  return {
+    // State
+    initState,
+    workspaces,
+    activeWorkspaceId,
+    error,
+    isCreating,
+    isDeleting,
+    isSwitching,
+    isFetchingWorkspaces,
+
+    // Computed
+    activeWorkspace,
+    personalWorkspace,
+    isInPersonalWorkspace,
+    sharedWorkspaces,
+    ownedWorkspacesCount,
+    canCreateWorkspace,
+    members,
+    pendingInvites,
+    totalMemberSlots,
+    isInviteLimitReached,
+    workspaceId,
+    workspaceName,
+    isWorkspaceSubscribed,
+    subscriptionPlan,
+
+    // Initialization & Cleanup
+    initialize,
+    destroy,
+    refreshWorkspaces,
+
+    // Workspace Actions
+    switchWorkspace,
+    createWorkspace,
+    deleteWorkspace,
+    renameWorkspace,
+    updateWorkspaceName,
+    leaveWorkspace,
+
+    // Member Actions
+    fetchMembers,
+    removeMember,
+
+    // Invite Actions
+    fetchPendingInvites,
+    createInvite,
+    revokeInvite,
+    acceptInvite,
+    getInviteLink,
+    createInviteLink,
+    copyInviteLink,
+
+    // Subscription
+    subscribeWorkspace,
+    updateActiveWorkspace
+  }
+})
diff --git a/src/platform/workspace/stores/useWorkspaceAuth.test.ts b/src/platform/workspace/stores/useWorkspaceAuth.test.ts
new file mode 100644
index 0000000000..b1da96efd2
--- /dev/null
+++ b/src/platform/workspace/stores/useWorkspaceAuth.test.ts
@@ -0,0 +1,672 @@
+import { createPinia, setActivePinia, storeToRefs } from 'pinia'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import {
+  useWorkspaceAuthStore,
+  WorkspaceAuthError
+} from '@/platform/workspace/stores/workspaceAuthStore'
+
+import { WORKSPACE_STORAGE_KEYS } from '@/platform/workspace/workspaceConstants'
+
+const mockGetIdToken = vi.fn()
+
+vi.mock('@/stores/firebaseAuthStore', () => ({
+  useFirebaseAuthStore: () => ({
+    getIdToken: mockGetIdToken
+  })
+}))
+
+vi.mock('@/scripts/api', () => ({
+  api: {
+    apiURL: (route: string) => `https://api.example.com/api${route}`
+  }
+}))
+
+vi.mock('@/i18n', () => ({
+  t: (key: string) => key
+}))
+
+const mockTeamWorkspacesEnabled = vi.hoisted(() => ({ value: true }))
+
+vi.mock('@/composables/useFeatureFlags', () => ({
+  useFeatureFlags: () => ({
+    flags: {
+      get teamWorkspacesEnabled() {
+        return mockTeamWorkspacesEnabled.value
+      }
+    }
+  })
+}))
+
+const mockWorkspace = {
+  id: 'workspace-123',
+  name: 'Test Workspace',
+  type: 'team' as const
+}
+
+const mockWorkspaceWithRole = {
+  ...mockWorkspace,
+  role: 'owner' as const
+}
+
+const mockTokenResponse = {
+  token: 'workspace-token-abc',
+  expires_at: new Date(Date.now() + 3600 * 1000).toISOString(),
+  workspace: mockWorkspace,
+  role: 'owner' as const,
+  permissions: ['owner:*']
+}
+
+describe('useWorkspaceAuthStore', () => {
+  beforeEach(() => {
+    setActivePinia(createPinia())
+    vi.clearAllMocks()
+    vi.useFakeTimers()
+    sessionStorage.clear()
+  })
+
+  afterEach(() => {
+    vi.useRealTimers()
+  })
+
+  describe('initial state', () => {
+    it('has correct initial state values', () => {
+      const store = useWorkspaceAuthStore()
+      const {
+        currentWorkspace,
+        workspaceToken,
+        isAuthenticated,
+        isLoading,
+        error
+      } = storeToRefs(store)
+
+      expect(currentWorkspace.value).toBeNull()
+      expect(workspaceToken.value).toBeNull()
+      expect(isAuthenticated.value).toBe(false)
+      expect(isLoading.value).toBe(false)
+      expect(error.value).toBeNull()
+    })
+  })
+
+  describe('initializeFromSession', () => {
+    it('returns true and populates state when valid session data exists', () => {
+      const futureExpiry = Date.now() + 3600 * 1000
+      sessionStorage.setItem(
+        WORKSPACE_STORAGE_KEYS.CURRENT_WORKSPACE,
+        JSON.stringify(mockWorkspaceWithRole)
+      )
+      sessionStorage.setItem(WORKSPACE_STORAGE_KEYS.TOKEN, 'valid-token')
+      sessionStorage.setItem(
+        WORKSPACE_STORAGE_KEYS.EXPIRES_AT,
+        futureExpiry.toString()
+      )
+
+      const store = useWorkspaceAuthStore()
+      const { currentWorkspace, workspaceToken } = storeToRefs(store)
+
+      const result = store.initializeFromSession()
+
+      expect(result).toBe(true)
+      expect(currentWorkspace.value).toEqual(mockWorkspaceWithRole)
+      expect(workspaceToken.value).toBe('valid-token')
+    })
+
+    it('returns false when sessionStorage is empty', () => {
+      const store = useWorkspaceAuthStore()
+
+      const result = store.initializeFromSession()
+
+      expect(result).toBe(false)
+    })
+
+    it('returns false and clears storage when token is expired', () => {
+      const pastExpiry = Date.now() - 1000
+      sessionStorage.setItem(
+        WORKSPACE_STORAGE_KEYS.CURRENT_WORKSPACE,
+        JSON.stringify(mockWorkspaceWithRole)
+      )
+      sessionStorage.setItem(WORKSPACE_STORAGE_KEYS.TOKEN, 'expired-token')
+      sessionStorage.setItem(
+        WORKSPACE_STORAGE_KEYS.EXPIRES_AT,
+        pastExpiry.toString()
+      )
+
+      const store = useWorkspaceAuthStore()
+
+      const result = store.initializeFromSession()
+
+      expect(result).toBe(false)
+      expect(
+        sessionStorage.getItem(WORKSPACE_STORAGE_KEYS.CURRENT_WORKSPACE)
+      ).toBeNull()
+      expect(sessionStorage.getItem(WORKSPACE_STORAGE_KEYS.TOKEN)).toBeNull()
+      expect(
+        sessionStorage.getItem(WORKSPACE_STORAGE_KEYS.EXPIRES_AT)
+      ).toBeNull()
+    })
+
+    it('returns false and clears storage when data is malformed', () => {
+      sessionStorage.setItem(
+        WORKSPACE_STORAGE_KEYS.CURRENT_WORKSPACE,
+        'invalid-json{'
+      )
+      sessionStorage.setItem(WORKSPACE_STORAGE_KEYS.TOKEN, 'some-token')
+      sessionStorage.setItem(WORKSPACE_STORAGE_KEYS.EXPIRES_AT, 'not-a-number')
+
+      const store = useWorkspaceAuthStore()
+
+      const result = store.initializeFromSession()
+
+      expect(result).toBe(false)
+      expect(
+        sessionStorage.getItem(WORKSPACE_STORAGE_KEYS.CURRENT_WORKSPACE)
+      ).toBeNull()
+      expect(sessionStorage.getItem(WORKSPACE_STORAGE_KEYS.TOKEN)).toBeNull()
+      expect(
+        sessionStorage.getItem(WORKSPACE_STORAGE_KEYS.EXPIRES_AT)
+      ).toBeNull()
+    })
+
+    it('returns false when partial session data exists (missing token)', () => {
+      sessionStorage.setItem(
+        WORKSPACE_STORAGE_KEYS.CURRENT_WORKSPACE,
+        JSON.stringify(mockWorkspaceWithRole)
+      )
+      sessionStorage.setItem(
+        WORKSPACE_STORAGE_KEYS.EXPIRES_AT,
+        (Date.now() + 3600 * 1000).toString()
+      )
+
+      const store = useWorkspaceAuthStore()
+
+      const result = store.initializeFromSession()
+
+      expect(result).toBe(false)
+    })
+  })
+
+  describe('switchWorkspace', () => {
+    it('successfully exchanges Firebase token for workspace token', async () => {
+      mockGetIdToken.mockResolvedValue('firebase-token-xyz')
+      vi.stubGlobal(
+        'fetch',
+        vi.fn().mockResolvedValue({
+          ok: true,
+          json: () => Promise.resolve(mockTokenResponse)
+        })
+      )
+
+      const store = useWorkspaceAuthStore()
+      const { currentWorkspace, workspaceToken, isAuthenticated } =
+        storeToRefs(store)
+
+      await store.switchWorkspace('workspace-123')
+
+      expect(currentWorkspace.value).toEqual(mockWorkspaceWithRole)
+      expect(workspaceToken.value).toBe('workspace-token-abc')
+      expect(isAuthenticated.value).toBe(true)
+    })
+
+    it('stores workspace data in sessionStorage', async () => {
+      mockGetIdToken.mockResolvedValue('firebase-token-xyz')
+      vi.stubGlobal(
+        'fetch',
+        vi.fn().mockResolvedValue({
+          ok: true,
+          json: () => Promise.resolve(mockTokenResponse)
+        })
+      )
+
+      const store = useWorkspaceAuthStore()
+
+      await store.switchWorkspace('workspace-123')
+
+      expect(
+        sessionStorage.getItem(WORKSPACE_STORAGE_KEYS.CURRENT_WORKSPACE)
+      ).toBe(JSON.stringify(mockWorkspaceWithRole))
+      expect(sessionStorage.getItem(WORKSPACE_STORAGE_KEYS.TOKEN)).toBe(
+        'workspace-token-abc'
+      )
+      expect(
+        sessionStorage.getItem(WORKSPACE_STORAGE_KEYS.EXPIRES_AT)
+      ).toBeTruthy()
+    })
+
+    it('sets isLoading to true during operation', async () => {
+      mockGetIdToken.mockResolvedValue('firebase-token-xyz')
+      let resolveResponse: (value: unknown) => void
+      const responsePromise = new Promise((resolve) => {
+        resolveResponse = resolve
+      })
+      vi.stubGlobal('fetch', vi.fn().mockReturnValue(responsePromise))
+
+      const store = useWorkspaceAuthStore()
+      const { isLoading } = storeToRefs(store)
+
+      const switchPromise = store.switchWorkspace('workspace-123')
+      expect(isLoading.value).toBe(true)
+
+      resolveResponse!({
+        ok: true,
+        json: () => Promise.resolve(mockTokenResponse)
+      })
+      await switchPromise
+
+      expect(isLoading.value).toBe(false)
+    })
+
+    it('throws WorkspaceAuthError with code NOT_AUTHENTICATED when Firebase token unavailable', async () => {
+      mockGetIdToken.mockResolvedValue(undefined)
+
+      const store = useWorkspaceAuthStore()
+      const { error } = storeToRefs(store)
+
+      await expect(store.switchWorkspace('workspace-123')).rejects.toThrow(
+        WorkspaceAuthError
+      )
+
+      expect(error.value).toBeInstanceOf(WorkspaceAuthError)
+      expect((error.value as WorkspaceAuthError).code).toBe('NOT_AUTHENTICATED')
+    })
+
+    it('throws WorkspaceAuthError with code ACCESS_DENIED on 403 response', async () => {
+      mockGetIdToken.mockResolvedValue('firebase-token-xyz')
+      vi.stubGlobal(
+        'fetch',
+        vi.fn().mockResolvedValue({
+          ok: false,
+          status: 403,
+          statusText: 'Forbidden',
+          json: () => Promise.resolve({ message: 'Access denied' })
+        })
+      )
+
+      const store = useWorkspaceAuthStore()
+      const { error } = storeToRefs(store)
+
+      await expect(store.switchWorkspace('workspace-123')).rejects.toThrow(
+        WorkspaceAuthError
+      )
+
+      expect(error.value).toBeInstanceOf(WorkspaceAuthError)
+      expect((error.value as WorkspaceAuthError).code).toBe('ACCESS_DENIED')
+    })
+
+    it('throws WorkspaceAuthError with code WORKSPACE_NOT_FOUND on 404 response', async () => {
+      mockGetIdToken.mockResolvedValue('firebase-token-xyz')
+      vi.stubGlobal(
+        'fetch',
+        vi.fn().mockResolvedValue({
+          ok: false,
+          status: 404,
+          statusText: 'Not Found',
+          json: () => Promise.resolve({ message: 'Workspace not found' })
+        })
+      )
+
+      const store = useWorkspaceAuthStore()
+      const { error } = storeToRefs(store)
+
+      await expect(store.switchWorkspace('workspace-123')).rejects.toThrow(
+        WorkspaceAuthError
+      )
+
+      expect(error.value).toBeInstanceOf(WorkspaceAuthError)
+      expect((error.value as WorkspaceAuthError).code).toBe(
+        'WORKSPACE_NOT_FOUND'
+      )
+    })
+
+    it('throws WorkspaceAuthError with code INVALID_FIREBASE_TOKEN on 401 response', async () => {
+      mockGetIdToken.mockResolvedValue('firebase-token-xyz')
+      vi.stubGlobal(
+        'fetch',
+        vi.fn().mockResolvedValue({
+          ok: false,
+          status: 401,
+          statusText: 'Unauthorized',
+          json: () => Promise.resolve({ message: 'Invalid token' })
+        })
+      )
+
+      const store = useWorkspaceAuthStore()
+      const { error } = storeToRefs(store)
+
+      await expect(store.switchWorkspace('workspace-123')).rejects.toThrow(
+        WorkspaceAuthError
+      )
+
+      expect(error.value).toBeInstanceOf(WorkspaceAuthError)
+      expect((error.value as WorkspaceAuthError).code).toBe(
+        'INVALID_FIREBASE_TOKEN'
+      )
+    })
+
+    it('throws WorkspaceAuthError with code TOKEN_EXCHANGE_FAILED on other errors', async () => {
+      mockGetIdToken.mockResolvedValue('firebase-token-xyz')
+      vi.stubGlobal(
+        'fetch',
+        vi.fn().mockResolvedValue({
+          ok: false,
+          status: 500,
+          statusText: 'Internal Server Error',
+          json: () => Promise.resolve({ message: 'Server error' })
+        })
+      )
+
+      const store = useWorkspaceAuthStore()
+      const { error } = storeToRefs(store)
+
+      await expect(store.switchWorkspace('workspace-123')).rejects.toThrow(
+        WorkspaceAuthError
+      )
+
+      expect(error.value).toBeInstanceOf(WorkspaceAuthError)
+      expect((error.value as WorkspaceAuthError).code).toBe(
+        'TOKEN_EXCHANGE_FAILED'
+      )
+    })
+
+    it('sends correct request to API', async () => {
+      mockGetIdToken.mockResolvedValue('firebase-token-xyz')
+      const mockFetch = vi.fn().mockResolvedValue({
+        ok: true,
+        json: () => Promise.resolve(mockTokenResponse)
+      })
+      vi.stubGlobal('fetch', mockFetch)
+
+      const store = useWorkspaceAuthStore()
+
+      await store.switchWorkspace('workspace-123')
+
+      expect(mockFetch).toHaveBeenCalledWith(
+        'https://api.example.com/api/auth/token',
+        {
+          method: 'POST',
+          headers: {
+            Authorization: 'Bearer firebase-token-xyz',
+            'Content-Type': 'application/json'
+          },
+          body: JSON.stringify({ workspace_id: 'workspace-123' })
+        }
+      )
+    })
+  })
+
+  describe('clearWorkspaceContext', () => {
+    it('clears all state refs', async () => {
+      mockGetIdToken.mockResolvedValue('firebase-token-xyz')
+      vi.stubGlobal(
+        'fetch',
+        vi.fn().mockResolvedValue({
+          ok: true,
+          json: () => Promise.resolve(mockTokenResponse)
+        })
+      )
+
+      const store = useWorkspaceAuthStore()
+      const { currentWorkspace, workspaceToken, error, isAuthenticated } =
+        storeToRefs(store)
+
+      await store.switchWorkspace('workspace-123')
+      expect(isAuthenticated.value).toBe(true)
+
+      store.clearWorkspaceContext()
+
+      expect(currentWorkspace.value).toBeNull()
+      expect(workspaceToken.value).toBeNull()
+      expect(error.value).toBeNull()
+      expect(isAuthenticated.value).toBe(false)
+    })
+
+    it('clears sessionStorage', async () => {
+      sessionStorage.setItem(
+        WORKSPACE_STORAGE_KEYS.CURRENT_WORKSPACE,
+        JSON.stringify(mockWorkspaceWithRole)
+      )
+      sessionStorage.setItem(WORKSPACE_STORAGE_KEYS.TOKEN, 'some-token')
+      sessionStorage.setItem(WORKSPACE_STORAGE_KEYS.EXPIRES_AT, '12345')
+
+      const store = useWorkspaceAuthStore()
+
+      store.clearWorkspaceContext()
+
+      expect(
+        sessionStorage.getItem(WORKSPACE_STORAGE_KEYS.CURRENT_WORKSPACE)
+      ).toBeNull()
+      expect(sessionStorage.getItem(WORKSPACE_STORAGE_KEYS.TOKEN)).toBeNull()
+      expect(
+        sessionStorage.getItem(WORKSPACE_STORAGE_KEYS.EXPIRES_AT)
+      ).toBeNull()
+    })
+  })
+
+  describe('getWorkspaceAuthHeader', () => {
+    it('returns null when no workspace token', () => {
+      const store = useWorkspaceAuthStore()
+
+      const header = store.getWorkspaceAuthHeader()
+
+      expect(header).toBeNull()
+    })
+
+    it('returns proper Authorization header when workspace token exists', async () => {
+      mockGetIdToken.mockResolvedValue('firebase-token-xyz')
+      vi.stubGlobal(
+        'fetch',
+        vi.fn().mockResolvedValue({
+          ok: true,
+          json: () => Promise.resolve(mockTokenResponse)
+        })
+      )
+
+      const store = useWorkspaceAuthStore()
+
+      await store.switchWorkspace('workspace-123')
+      const header = store.getWorkspaceAuthHeader()
+
+      expect(header).toEqual({
+        Authorization: 'Bearer workspace-token-abc'
+      })
+    })
+  })
+
+  describe('token refresh scheduling', () => {
+    it('schedules token refresh 5 minutes before expiry', async () => {
+      mockGetIdToken.mockResolvedValue('firebase-token-xyz')
+      const expiresInMs = 3600 * 1000
+      const tokenResponseWithFutureExpiry = {
+        ...mockTokenResponse,
+        expires_at: new Date(Date.now() + expiresInMs).toISOString()
+      }
+      const mockFetch = vi.fn().mockResolvedValue({
+        ok: true,
+        json: () => Promise.resolve(tokenResponseWithFutureExpiry)
+      })
+      vi.stubGlobal('fetch', mockFetch)
+
+      const store = useWorkspaceAuthStore()
+
+      await store.switchWorkspace('workspace-123')
+
+      expect(mockFetch).toHaveBeenCalledTimes(1)
+
+      const refreshBufferMs = 5 * 60 * 1000
+      const refreshDelay = expiresInMs - refreshBufferMs
+
+      vi.advanceTimersByTime(refreshDelay - 1)
+      expect(mockFetch).toHaveBeenCalledTimes(1)
+
+      await vi.advanceTimersByTimeAsync(1)
+
+      expect(mockFetch).toHaveBeenCalledTimes(2)
+    })
+
+    it('clears context when refresh fails with ACCESS_DENIED', async () => {
+      mockGetIdToken.mockResolvedValue('firebase-token-xyz')
+      const expiresInMs = 3600 * 1000
+      const tokenResponseWithFutureExpiry = {
+        ...mockTokenResponse,
+        expires_at: new Date(Date.now() + expiresInMs).toISOString()
+      }
+      const mockFetch = vi
+        .fn()
+        .mockResolvedValueOnce({
+          ok: true,
+          json: () => Promise.resolve(tokenResponseWithFutureExpiry)
+        })
+        .mockResolvedValueOnce({
+          ok: false,
+          status: 403,
+          statusText: 'Forbidden',
+          json: () => Promise.resolve({ message: 'Access denied' })
+        })
+      vi.stubGlobal('fetch', mockFetch)
+
+      const store = useWorkspaceAuthStore()
+      const { currentWorkspace, workspaceToken } = storeToRefs(store)
+
+      await store.switchWorkspace('workspace-123')
+      expect(workspaceToken.value).toBe('workspace-token-abc')
+
+      const refreshBufferMs = 5 * 60 * 1000
+      const refreshDelay = expiresInMs - refreshBufferMs
+
+      vi.advanceTimersByTime(refreshDelay)
+      await vi.waitFor(() => {
+        expect(currentWorkspace.value).toBeNull()
+      })
+
+      expect(workspaceToken.value).toBeNull()
+    })
+  })
+
+  describe('refreshToken', () => {
+    it('does nothing when no current workspace', async () => {
+      const mockFetch = vi.fn()
+      vi.stubGlobal('fetch', mockFetch)
+
+      const store = useWorkspaceAuthStore()
+
+      await store.refreshToken()
+
+      expect(mockFetch).not.toHaveBeenCalled()
+    })
+
+    it('refreshes token for current workspace', async () => {
+      mockGetIdToken.mockResolvedValue('firebase-token-xyz')
+      const mockFetch = vi.fn().mockResolvedValue({
+        ok: true,
+        json: () => Promise.resolve(mockTokenResponse)
+      })
+      vi.stubGlobal('fetch', mockFetch)
+
+      const store = useWorkspaceAuthStore()
+      const { workspaceToken } = storeToRefs(store)
+
+      await store.switchWorkspace('workspace-123')
+      expect(mockFetch).toHaveBeenCalledTimes(1)
+
+      mockFetch.mockResolvedValue({
+        ok: true,
+        json: () =>
+          Promise.resolve({
+            ...mockTokenResponse,
+            token: 'refreshed-token'
+          })
+      })
+
+      await store.refreshToken()
+      expect(mockFetch).toHaveBeenCalledTimes(2)
+      expect(workspaceToken.value).toBe('refreshed-token')
+    })
+  })
+
+  describe('isAuthenticated computed', () => {
+    it('returns true when both workspace and token are present', async () => {
+      mockGetIdToken.mockResolvedValue('firebase-token-xyz')
+      vi.stubGlobal(
+        'fetch',
+        vi.fn().mockResolvedValue({
+          ok: true,
+          json: () => Promise.resolve(mockTokenResponse)
+        })
+      )
+
+      const store = useWorkspaceAuthStore()
+      const { isAuthenticated } = storeToRefs(store)
+
+      await store.switchWorkspace('workspace-123')
+
+      expect(isAuthenticated.value).toBe(true)
+    })
+
+    it('returns false when workspace is null', () => {
+      const store = useWorkspaceAuthStore()
+      const { isAuthenticated } = storeToRefs(store)
+
+      expect(isAuthenticated.value).toBe(false)
+    })
+
+    it('returns false when currentWorkspace is set but workspaceToken is null', async () => {
+      mockGetIdToken.mockResolvedValue(null)
+
+      const store = useWorkspaceAuthStore()
+      const { currentWorkspace, workspaceToken, isAuthenticated } =
+        storeToRefs(store)
+
+      currentWorkspace.value = mockWorkspaceWithRole
+      workspaceToken.value = null
+
+      expect(isAuthenticated.value).toBe(false)
+    })
+  })
+
+  describe('feature flag disabled', () => {
+    beforeEach(() => {
+      mockTeamWorkspacesEnabled.value = false
+    })
+
+    afterEach(() => {
+      mockTeamWorkspacesEnabled.value = true
+    })
+
+    it('initializeFromSession returns false when flag disabled', () => {
+      const futureExpiry = Date.now() + 3600 * 1000
+      sessionStorage.setItem(
+        WORKSPACE_STORAGE_KEYS.CURRENT_WORKSPACE,
+        JSON.stringify(mockWorkspaceWithRole)
+      )
+      sessionStorage.setItem(WORKSPACE_STORAGE_KEYS.TOKEN, 'valid-token')
+      sessionStorage.setItem(
+        WORKSPACE_STORAGE_KEYS.EXPIRES_AT,
+        futureExpiry.toString()
+      )
+
+      const store = useWorkspaceAuthStore()
+      const { currentWorkspace, workspaceToken } = storeToRefs(store)
+
+      const result = store.initializeFromSession()
+
+      expect(result).toBe(false)
+      expect(currentWorkspace.value).toBeNull()
+      expect(workspaceToken.value).toBeNull()
+    })
+
+    it('switchWorkspace is a no-op when flag disabled', async () => {
+      mockGetIdToken.mockResolvedValue('firebase-token-xyz')
+      const mockFetch = vi.fn()
+      vi.stubGlobal('fetch', mockFetch)
+
+      const store = useWorkspaceAuthStore()
+      const { currentWorkspace, workspaceToken, isLoading } = storeToRefs(store)
+
+      await store.switchWorkspace('workspace-123')
+
+      expect(mockFetch).not.toHaveBeenCalled()
+      expect(currentWorkspace.value).toBeNull()
+      expect(workspaceToken.value).toBeNull()
+      expect(isLoading.value).toBe(false)
+    })
+  })
+})
diff --git a/src/platform/workspace/stores/workspaceAuthStore.ts b/src/platform/workspace/stores/workspaceAuthStore.ts
new file mode 100644
index 0000000000..e2083f4bd2
--- /dev/null
+++ b/src/platform/workspace/stores/workspaceAuthStore.ts
@@ -0,0 +1,375 @@
+import { defineStore } from 'pinia'
+import { computed, ref, shallowRef } from 'vue'
+import { z } from 'zod'
+import { fromZodError } from 'zod-validation-error'
+
+import { t } from '@/i18n'
+import {
+  TOKEN_REFRESH_BUFFER_MS,
+  WORKSPACE_STORAGE_KEYS
+} from '@/platform/workspace/workspaceConstants'
+import { api } from '@/scripts/api'
+import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
+import type { AuthHeader } from '@/types/authTypes'
+import type { WorkspaceWithRole } from '@/platform/workspace/workspaceTypes'
+import { useFeatureFlags } from '@/composables/useFeatureFlags'
+
+const WorkspaceWithRoleSchema = z.object({
+  id: z.string(),
+  name: z.string(),
+  type: z.enum(['personal', 'team']),
+  role: z.enum(['owner', 'member'])
+})
+
+const WorkspaceTokenResponseSchema = z.object({
+  token: z.string(),
+  expires_at: z.string(),
+  workspace: z.object({
+    id: z.string(),
+    name: z.string(),
+    type: z.enum(['personal', 'team'])
+  }),
+  role: z.enum(['owner', 'member']),
+  permissions: z.array(z.string())
+})
+
+export class WorkspaceAuthError extends Error {
+  constructor(
+    message: string,
+    public readonly code?: string
+  ) {
+    super(message)
+    this.name = 'WorkspaceAuthError'
+  }
+}
+
+export const useWorkspaceAuthStore = defineStore('workspaceAuth', () => {
+  const { flags } = useFeatureFlags()
+
+  // State
+  const currentWorkspace = shallowRef<WorkspaceWithRole | null>(null)
+  const workspaceToken = ref<string | null>(null)
+  const isLoading = ref(false)
+  const error = ref<Error | null>(null)
+
+  // Timer state
+  let refreshTimerId: ReturnType<typeof setTimeout> | null = null
+
+  // Request ID to prevent stale refresh operations from overwriting newer workspace contexts
+  let refreshRequestId = 0
+
+  // Getters
+  const isAuthenticated = computed(
+    () => currentWorkspace.value !== null && workspaceToken.value !== null
+  )
+
+  // Private helpers
+  function stopRefreshTimer(): void {
+    if (refreshTimerId !== null) {
+      clearTimeout(refreshTimerId)
+      refreshTimerId = null
+    }
+  }
+
+  function scheduleTokenRefresh(expiresAt: number): void {
+    stopRefreshTimer()
+    const now = Date.now()
+    const refreshAt = expiresAt - TOKEN_REFRESH_BUFFER_MS
+    const delay = Math.max(0, refreshAt - now)
+
+    refreshTimerId = setTimeout(() => {
+      void refreshToken()
+    }, delay)
+  }
+
+  function persistToSession(
+    workspace: WorkspaceWithRole,
+    token: string,
+    expiresAt: number
+  ): void {
+    try {
+      sessionStorage.setItem(
+        WORKSPACE_STORAGE_KEYS.CURRENT_WORKSPACE,
+        JSON.stringify(workspace)
+      )
+      sessionStorage.setItem(WORKSPACE_STORAGE_KEYS.TOKEN, token)
+      sessionStorage.setItem(
+        WORKSPACE_STORAGE_KEYS.EXPIRES_AT,
+        expiresAt.toString()
+      )
+    } catch {
+      console.warn('Failed to persist workspace context to sessionStorage')
+    }
+  }
+
+  function clearSessionStorage(): void {
+    try {
+      sessionStorage.removeItem(WORKSPACE_STORAGE_KEYS.CURRENT_WORKSPACE)
+      sessionStorage.removeItem(WORKSPACE_STORAGE_KEYS.TOKEN)
+      sessionStorage.removeItem(WORKSPACE_STORAGE_KEYS.EXPIRES_AT)
+    } catch {
+      console.warn('Failed to clear workspace context from sessionStorage')
+    }
+  }
+
+  // Actions
+  function init(): void {
+    initializeFromSession()
+  }
+
+  function destroy(): void {
+    stopRefreshTimer()
+  }
+
+  function initializeFromSession(): boolean {
+    if (!flags.teamWorkspacesEnabled) {
+      return false
+    }
+
+    try {
+      const workspaceJson = sessionStorage.getItem(
+        WORKSPACE_STORAGE_KEYS.CURRENT_WORKSPACE
+      )
+      const token = sessionStorage.getItem(WORKSPACE_STORAGE_KEYS.TOKEN)
+      const expiresAtStr = sessionStorage.getItem(
+        WORKSPACE_STORAGE_KEYS.EXPIRES_AT
+      )
+
+      if (!workspaceJson || !token || !expiresAtStr) {
+        return false
+      }
+
+      const expiresAt = parseInt(expiresAtStr, 10)
+      if (isNaN(expiresAt) || expiresAt <= Date.now()) {
+        clearSessionStorage()
+        return false
+      }
+
+      const parsedWorkspace = JSON.parse(workspaceJson)
+      const parseResult = WorkspaceWithRoleSchema.safeParse(parsedWorkspace)
+
+      if (!parseResult.success) {
+        clearSessionStorage()
+        return false
+      }
+
+      currentWorkspace.value = parseResult.data
+      workspaceToken.value = token
+      error.value = null
+
+      scheduleTokenRefresh(expiresAt)
+      return true
+    } catch {
+      clearSessionStorage()
+      return false
+    }
+  }
+
+  async function switchWorkspace(workspaceId: string): Promise<void> {
+    if (!flags.teamWorkspacesEnabled) {
+      return
+    }
+
+    // Only increment request ID when switching to a different workspace
+    // This invalidates stale refresh operations for the old workspace
+    // but allows refresh operations for the same workspace to complete
+    if (currentWorkspace.value?.id !== workspaceId) {
+      refreshRequestId++
+    }
+
+    isLoading.value = true
+    error.value = null
+
+    try {
+      const firebaseAuthStore = useFirebaseAuthStore()
+      const firebaseToken = await firebaseAuthStore.getIdToken()
+      if (!firebaseToken) {
+        throw new WorkspaceAuthError(
+          t('workspaceAuth.errors.notAuthenticated'),
+          'NOT_AUTHENTICATED'
+        )
+      }
+
+      const response = await fetch(api.apiURL('/auth/token'), {
+        method: 'POST',
+        headers: {
+          Authorization: `Bearer ${firebaseToken}`,
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({ workspace_id: workspaceId })
+      })
+
+      if (!response.ok) {
+        const errorData = await response.json().catch(() => ({}))
+        const message = errorData.message || response.statusText
+
+        if (response.status === 401) {
+          throw new WorkspaceAuthError(
+            t('workspaceAuth.errors.invalidFirebaseToken'),
+            'INVALID_FIREBASE_TOKEN'
+          )
+        }
+        if (response.status === 403) {
+          throw new WorkspaceAuthError(
+            t('workspaceAuth.errors.accessDenied'),
+            'ACCESS_DENIED'
+          )
+        }
+        if (response.status === 404) {
+          throw new WorkspaceAuthError(
+            t('workspaceAuth.errors.workspaceNotFound'),
+            'WORKSPACE_NOT_FOUND'
+          )
+        }
+
+        throw new WorkspaceAuthError(
+          t('workspaceAuth.errors.tokenExchangeFailed', { error: message }),
+          'TOKEN_EXCHANGE_FAILED'
+        )
+      }
+
+      const rawData = await response.json()
+      const parseResult = WorkspaceTokenResponseSchema.safeParse(rawData)
+
+      if (!parseResult.success) {
+        throw new WorkspaceAuthError(
+          t('workspaceAuth.errors.tokenExchangeFailed', {
+            error: fromZodError(parseResult.error).message
+          }),
+          'TOKEN_EXCHANGE_FAILED'
+        )
+      }
+
+      const data = parseResult.data
+      const expiresAt = new Date(data.expires_at).getTime()
+
+      if (isNaN(expiresAt)) {
+        throw new WorkspaceAuthError(
+          t('workspaceAuth.errors.tokenExchangeFailed', {
+            error: 'Invalid expiry timestamp'
+          }),
+          'TOKEN_EXCHANGE_FAILED'
+        )
+      }
+
+      const workspaceWithRole: WorkspaceWithRole = {
+        ...data.workspace,
+        role: data.role
+      }
+
+      currentWorkspace.value = workspaceWithRole
+      workspaceToken.value = data.token
+
+      persistToSession(workspaceWithRole, data.token, expiresAt)
+      scheduleTokenRefresh(expiresAt)
+    } catch (err) {
+      error.value = err instanceof Error ? err : new Error(String(err))
+      throw error.value
+    } finally {
+      isLoading.value = false
+    }
+  }
+
+  async function refreshToken(): Promise<void> {
+    if (!currentWorkspace.value) {
+      return
+    }
+
+    const workspaceId = currentWorkspace.value.id
+    // Capture the current request ID to detect if workspace context changed during refresh
+    const capturedRequestId = refreshRequestId
+    const maxRetries = 3
+    const baseDelayMs = 1000
+
+    for (let attempt = 0; attempt <= maxRetries; attempt++) {
+      // Check if workspace context changed since refresh started (user switched workspaces)
+      if (capturedRequestId !== refreshRequestId) {
+        console.warn(
+          'Aborting stale token refresh: workspace context changed during refresh'
+        )
+        return
+      }
+
+      try {
+        await switchWorkspace(workspaceId)
+        return
+      } catch (err) {
+        const isAuthError = err instanceof WorkspaceAuthError
+
+        const isPermanentError =
+          isAuthError &&
+          (err.code === 'ACCESS_DENIED' ||
+            err.code === 'WORKSPACE_NOT_FOUND' ||
+            err.code === 'INVALID_FIREBASE_TOKEN' ||
+            err.code === 'NOT_AUTHENTICATED')
+
+        if (isPermanentError) {
+          // Only clear context if this refresh is still for the current workspace
+          if (capturedRequestId === refreshRequestId) {
+            console.error('Workspace access revoked or auth invalid:', err)
+            clearWorkspaceContext()
+          }
+          return
+        }
+
+        const isTransientError =
+          isAuthError && err.code === 'TOKEN_EXCHANGE_FAILED'
+
+        if (isTransientError && attempt < maxRetries) {
+          const delay = baseDelayMs * Math.pow(2, attempt)
+          console.warn(
+            `Token refresh failed (attempt ${attempt + 1}/${maxRetries + 1}), retrying in ${delay}ms:`,
+            err
+          )
+          await new Promise((resolve) => setTimeout(resolve, delay))
+          continue
+        }
+
+        // Only clear context if this refresh is still for the current workspace
+        if (capturedRequestId === refreshRequestId) {
+          console.error('Failed to refresh workspace token after retries:', err)
+          clearWorkspaceContext()
+        }
+      }
+    }
+  }
+
+  function getWorkspaceAuthHeader(): AuthHeader | null {
+    if (!workspaceToken.value) {
+      return null
+    }
+    return {
+      Authorization: `Bearer ${workspaceToken.value}`
+    }
+  }
+
+  function clearWorkspaceContext(): void {
+    // Increment request ID to invalidate any in-flight stale refresh operations
+    refreshRequestId++
+    stopRefreshTimer()
+    currentWorkspace.value = null
+    workspaceToken.value = null
+    error.value = null
+    clearSessionStorage()
+  }
+
+  return {
+    // State
+    currentWorkspace,
+    workspaceToken,
+    isLoading,
+    error,
+
+    // Getters
+    isAuthenticated,
+
+    // Actions
+    init,
+    destroy,
+    initializeFromSession,
+    switchWorkspace,
+    refreshToken,
+    getWorkspaceAuthHeader,
+    clearWorkspaceContext
+  }
+})
diff --git a/src/platform/workspace/workspaceConstants.ts b/src/platform/workspace/workspaceConstants.ts
new file mode 100644
index 0000000000..b56c1644d8
--- /dev/null
+++ b/src/platform/workspace/workspaceConstants.ts
@@ -0,0 +1,10 @@
+export const WORKSPACE_STORAGE_KEYS = {
+  // sessionStorage keys (cleared on browser close)
+  CURRENT_WORKSPACE: 'Comfy.Workspace.Current',
+  TOKEN: 'Comfy.Workspace.Token',
+  EXPIRES_AT: 'Comfy.Workspace.ExpiresAt',
+  // localStorage key (persists across browser sessions)
+  LAST_WORKSPACE_ID: 'Comfy.Workspace.LastWorkspaceId'
+} as const
+
+export const TOKEN_REFRESH_BUFFER_MS = 5 * 60 * 1000
diff --git a/src/platform/workspace/workspaceTypes.ts b/src/platform/workspace/workspaceTypes.ts
new file mode 100644
index 0000000000..30774aef3b
--- /dev/null
+++ b/src/platform/workspace/workspaceTypes.ts
@@ -0,0 +1,6 @@
+export interface WorkspaceWithRole {
+  id: string
+  name: string
+  type: 'personal' | 'team'
+  role: 'owner' | 'member'
+}
diff --git a/src/renderer/core/canvas/canvasStore.ts b/src/renderer/core/canvas/canvasStore.ts
index bfc54c1db5..c9e9fe531f 100644
--- a/src/renderer/core/canvas/canvasStore.ts
+++ b/src/renderer/core/canvas/canvasStore.ts
@@ -3,13 +3,17 @@ import { defineStore } from 'pinia'
 import { computed, markRaw, ref, shallowRef } from 'vue'
 import type { Raw } from 'vue'
 
+import { useAppMode } from '@/composables/useAppMode'
+
 import type { Point, Positionable } from '@/lib/litegraph/src/interfaces'
 import type {
   LGraph,
   LGraphCanvas,
   LGraphGroup,
-  LGraphNode
+  LGraphNode,
+  SubgraphNode
 } from '@/lib/litegraph/src/litegraph'
+import { promoteRecommendedWidgets } from '@/core/graph/subgraph/promotionUtils'
 import { app } from '@/scripts/app'
 import { isLGraphGroup, isLGraphNode, isReroute } from '@/utils/litegraphUtil'
 
@@ -40,7 +44,13 @@ export const useCanvasStore = defineStore('canvas', () => {
   // Reactive scale percentage that syncs with app.canvas.ds.scale
   const appScalePercentage = ref(100)
 
-  const linearMode = ref(false)
+  const { isAppMode, setMode } = useAppMode()
+  const linearMode = computed({
+    get: () => isAppMode.value,
+    set: (val: boolean) => {
+      setMode(val ? 'app' : 'graph')
+    }
+  })
 
   // Set up scale synchronization when canvas is available
   let originalOnChanged: ((scale: number, offset: Point) => void) | undefined =
@@ -128,6 +138,13 @@ export const useCanvasStore = defineStore('canvas', () => {
       useEventListener(newCanvas.canvas, 'subgraph-opened', () => {
         isInSubgraph.value = true
       })
+
+      useEventListener(
+        newCanvas.canvas,
+        'subgraph-converted',
+        (e: CustomEvent<{ subgraphNode: SubgraphNode }>) =>
+          promoteRecommendedWidgets(e.detail.subgraphNode)
+      )
     },
     { immediate: true }
   )
diff --git a/src/renderer/core/canvas/links/linkConnectorAdapter.ts b/src/renderer/core/canvas/links/linkConnectorAdapter.ts
index b7937faf2b..1e8e312ef3 100644
--- a/src/renderer/core/canvas/links/linkConnectorAdapter.ts
+++ b/src/renderer/core/canvas/links/linkConnectorAdapter.ts
@@ -1,3 +1,5 @@
+import type { SlotLayout } from '@/renderer/core/layout/types'
+import type { Point } from '@/lib/litegraph/src/interfaces'
 import type { LGraph } from '@/lib/litegraph/src/LGraph'
 import type { NodeId } from '@/lib/litegraph/src/LGraphNode'
 import type { RerouteId } from '@/lib/litegraph/src/Reroute'
@@ -72,7 +74,11 @@ export class LinkConnectorAdapter {
   beginFromInput(
     nodeId: NodeId,
     inputIndex: number,
-    opts?: { moveExisting?: boolean; fromRerouteId?: RerouteId }
+    opts?: {
+      fromRerouteId?: RerouteId
+      layout?: SlotLayout
+      moveExisting?: boolean
+    }
   ): void {
     const node = this.network.getNodeById(nodeId)
     const input = node?.inputs?.[inputIndex]
@@ -81,7 +87,10 @@ export class LinkConnectorAdapter {
     const fromReroute = this.network.getReroute(opts?.fromRerouteId)
 
     if (opts?.moveExisting) {
-      this.linkConnector.moveInputLink(this.network, input)
+      const startPoint: Point | undefined = opts.layout
+        ? [opts.layout.position.x, opts.layout.position.y]
+        : undefined
+      this.linkConnector.moveInputLink(this.network, input, { startPoint })
     } else {
       this.linkConnector.dragNewFromInput(
         this.network,
diff --git a/src/renderer/core/canvas/litegraph/litegraphLinkAdapter.ts b/src/renderer/core/canvas/litegraph/litegraphLinkAdapter.ts
index ecae73ae77..af46e84c0b 100644
--- a/src/renderer/core/canvas/litegraph/litegraphLinkAdapter.ts
+++ b/src/renderer/core/canvas/litegraph/litegraphLinkAdapter.ts
@@ -68,6 +68,7 @@ export class LitegraphLinkAdapter {
       case LinkDirection.DOWN:
         return 'down'
       case LinkDirection.CENTER:
+      case LinkDirection.NONE:
         return 'none'
       default:
         return 'right'
diff --git a/src/renderer/core/canvas/litegraph/slotCalculations.ts b/src/renderer/core/canvas/litegraph/slotCalculations.ts
index 8b66b68a87..32560441eb 100644
--- a/src/renderer/core/canvas/litegraph/slotCalculations.ts
+++ b/src/renderer/core/canvas/litegraph/slotCalculations.ts
@@ -45,7 +45,7 @@ export interface SlotPositionContext {
  * @param slot The input slot index
  * @returns Position of the input slot center in graph coordinates
  */
-export function calculateInputSlotPos(
+function calculateInputSlotPos(
   context: SlotPositionContext,
   slot: number
 ): Point {
@@ -93,7 +93,7 @@ export function calculateInputSlotPosFromSlot(
  * @param slot The output slot index
  * @returns Position of the output slot center in graph coordinates
  */
-export function calculateOutputSlotPos(
+function calculateOutputSlotPos(
   context: SlotPositionContext,
   slot: number
 ): Point {
@@ -138,38 +138,41 @@ export function getSlotPosition(
   slotIndex: number,
   isInput: boolean
 ): Point {
-  // Try to get precise position from slot layout (DOM-registered)
-  const slotKey = getSlotKey(String(node.id), slotIndex, isInput)
-  const slotLayout = layoutStore.getSlotLayout(slotKey)
-  if (slotLayout) {
-    return [slotLayout.position.x, slotLayout.position.y]
-  }
-
-  // Fallback: derive position from node layout tree and slot model
-  const nodeLayout = layoutStore.getNodeLayoutRef(String(node.id)).value
-
-  if (nodeLayout) {
-    // Create context from layout tree data
-    const context: SlotPositionContext = {
-      nodeX: nodeLayout.position.x,
-      nodeY: nodeLayout.position.y,
-      nodeWidth: nodeLayout.size.width,
-      nodeHeight: nodeLayout.size.height,
-      collapsed: node.flags.collapsed || false,
-      collapsedWidth: node._collapsed_width,
-      slotStartY: node.constructor.slot_start_y,
-      inputs: node.inputs,
-      outputs: node.outputs,
-      widgets: node.widgets
+  // Only use DOM-registered slot positions when Vue nodes mode is enabled
+  if (LiteGraph.vueNodesMode) {
+    // Try to get precise position from slot layout (DOM-registered)
+    const slotKey = getSlotKey(String(node.id), slotIndex, isInput)
+    const slotLayout = layoutStore.getSlotLayout(slotKey)
+    if (slotLayout) {
+      return [slotLayout.position.x, slotLayout.position.y]
     }
 
-    // Use helper to calculate position
-    return isInput
-      ? calculateInputSlotPos(context, slotIndex)
-      : calculateOutputSlotPos(context, slotIndex)
+    // Fallback: derive position from node layout tree and slot model
+    const nodeLayout = layoutStore.getNodeLayoutRef(String(node.id)).value
+
+    if (nodeLayout) {
+      // Create context from layout tree data
+      const context: SlotPositionContext = {
+        nodeX: nodeLayout.position.x,
+        nodeY: nodeLayout.position.y,
+        nodeWidth: nodeLayout.size.width,
+        nodeHeight: nodeLayout.size.height,
+        collapsed: node.flags.collapsed || false,
+        collapsedWidth: node._collapsed_width,
+        slotStartY: node.constructor.slot_start_y,
+        inputs: node.inputs,
+        outputs: node.outputs,
+        widgets: node.widgets
+      }
+
+      // Use helper to calculate position
+      return isInput
+        ? calculateInputSlotPos(context, slotIndex)
+        : calculateOutputSlotPos(context, slotIndex)
+    }
   }
 
-  // Fallback: calculate directly from node properties if layout not available
+  // Fallback: calculate directly from node properties (legacy litegraph behavior)
   const context: SlotPositionContext = {
     nodeX: node.pos[0],
     nodeY: node.pos[1],
diff --git a/tests-ui/tests/renderer/core/canvas/useCanvasInteractions.test.ts b/src/renderer/core/canvas/useCanvasInteractions.test.ts
similarity index 65%
rename from tests-ui/tests/renderer/core/canvas/useCanvasInteractions.test.ts
rename to src/renderer/core/canvas/useCanvasInteractions.test.ts
index b1287a2e75..f73d717b70 100644
--- a/tests-ui/tests/renderer/core/canvas/useCanvasInteractions.test.ts
+++ b/src/renderer/core/canvas/useCanvasInteractions.test.ts
@@ -104,7 +104,7 @@ describe('useCanvasInteractions', () => {
 
     it('should return early when canvas is null', () => {
       const { getCanvas } = useCanvasStore()
-      vi.mocked(getCanvas).mockReturnValue(null as unknown as LGraphCanvas) // TODO: Fix misaligned types
+      vi.mocked(getCanvas).mockReturnValue(null!)
       const { handlePointer } = useCanvasInteractions()
 
       const mockEvent = createMockPointerEvent(1)
@@ -155,5 +155,72 @@ describe('useCanvasInteractions', () => {
       expect(mockEvent.preventDefault).not.toHaveBeenCalled()
       expect(mockEvent.stopPropagation).not.toHaveBeenCalled()
     })
+    it('should forward wheel events to canvas when capture element is NOT focused', () => {
+      const { get } = useSettingStore()
+      vi.mocked(get).mockReturnValue('legacy')
+
+      const captureElement = document.createElement('div')
+      captureElement.setAttribute('data-capture-wheel', 'true')
+      const textarea = document.createElement('textarea')
+      captureElement.appendChild(textarea)
+      document.body.appendChild(captureElement)
+
+      const { handleWheel } = useCanvasInteractions()
+      const mockEvent = createMockWheelEvent()
+      Object.defineProperty(mockEvent, 'target', { value: textarea })
+
+      handleWheel(mockEvent)
+
+      expect(mockEvent.preventDefault).toHaveBeenCalled()
+      expect(mockEvent.stopPropagation).toHaveBeenCalled()
+
+      document.body.removeChild(captureElement)
+    })
+
+    it('should NOT forward wheel events when capture element IS focused', () => {
+      const { get } = useSettingStore()
+      vi.mocked(get).mockReturnValue('legacy')
+
+      const captureElement = document.createElement('div')
+      captureElement.setAttribute('data-capture-wheel', 'true')
+      const textarea = document.createElement('textarea')
+      captureElement.appendChild(textarea)
+      document.body.appendChild(captureElement)
+      textarea.focus()
+
+      const { handleWheel } = useCanvasInteractions()
+      const mockEvent = createMockWheelEvent()
+      Object.defineProperty(mockEvent, 'target', { value: textarea })
+
+      handleWheel(mockEvent)
+
+      expect(mockEvent.preventDefault).not.toHaveBeenCalled()
+      expect(mockEvent.stopPropagation).not.toHaveBeenCalled()
+
+      document.body.removeChild(captureElement)
+    })
+
+    it('should forward ctrl+wheel to canvas when capture element IS focused in standard mode', () => {
+      const { get } = useSettingStore()
+      vi.mocked(get).mockReturnValue('standard')
+
+      const captureElement = document.createElement('div')
+      captureElement.setAttribute('data-capture-wheel', 'true')
+      const textarea = document.createElement('textarea')
+      captureElement.appendChild(textarea)
+      document.body.appendChild(captureElement)
+      textarea.focus()
+
+      const { handleWheel } = useCanvasInteractions()
+      const mockEvent = createMockWheelEvent(true)
+      Object.defineProperty(mockEvent, 'target', { value: textarea })
+
+      handleWheel(mockEvent)
+
+      expect(mockEvent.preventDefault).toHaveBeenCalled()
+      expect(mockEvent.stopPropagation).toHaveBeenCalled()
+
+      document.body.removeChild(captureElement)
+    })
   })
 })
diff --git a/src/renderer/core/canvas/useCanvasInteractions.ts b/src/renderer/core/canvas/useCanvasInteractions.ts
index 5d9804e13a..b93d4ff150 100644
--- a/src/renderer/core/canvas/useCanvasInteractions.ts
+++ b/src/renderer/core/canvas/useCanvasInteractions.ts
@@ -26,19 +26,31 @@ export function useCanvasInteractions() {
     () => !(canvasStore.canvas?.read_only ?? false)
   )
 
+  /**
+   * Returns true if the wheel event target is inside an element that should
+   * capture wheel events AND that element (or a descendant) currently has focus.
+   *
+   * This allows two-finger panning to continue over inputs until the user has
+   * actively focused the widget, at which point the widget can consume scroll.
+   */
+  const wheelCapturedByFocusedElement = (event: WheelEvent): boolean => {
+    const target = event.target as HTMLElement | null
+    const captureElement = target?.closest('[data-capture-wheel="true"]')
+    const active = document.activeElement as Element | null
+
+    return !!(captureElement && active && captureElement.contains(active))
+  }
+
+  const shouldForwardWheelEvent = (event: WheelEvent): boolean =>
+    !wheelCapturedByFocusedElement(event) ||
+    (isStandardNavMode.value && (event.ctrlKey || event.metaKey))
+
   /**
    * Handles wheel events from UI components that should be forwarded to canvas
    * when appropriate (e.g., Ctrl+wheel for zoom in standard mode)
    */
   const handleWheel = (event: WheelEvent) => {
-    // Check if the wheel event is from an element that wants to capture wheel events
-    const target = event.target as HTMLElement
-    const captureElement = target?.closest('[data-capture-wheel="true"]')
-
-    if (captureElement) {
-      // Element wants to capture wheel events, don't forward to canvas
-      return
-    }
+    if (!shouldForwardWheelEvent(event)) return
 
     // In standard mode, Ctrl+wheel should go to canvas for zoom
     if (isStandardNavMode.value && (event.ctrlKey || event.metaKey)) {
@@ -87,14 +99,8 @@ export function useCanvasInteractions() {
   const forwardEventToCanvas = (
     event: WheelEvent | PointerEvent | MouseEvent
   ) => {
-    // Check if the wheel event is from an element that wants to capture wheel events
-    const target = event.target as HTMLElement
-    const captureElement = target?.closest('[data-capture-wheel="true"]')
-
-    if (captureElement) {
-      // Element wants to capture wheel events, don't forward to canvas
-      return
-    }
+    // Honor wheel capture only when the element is focused
+    if (event instanceof WheelEvent && !shouldForwardWheelEvent(event)) return
 
     const canvasEl = app.canvas?.canvas
     if (!canvasEl) return
diff --git a/src/renderer/core/layout/__tests__/TransformPane.test.ts b/src/renderer/core/layout/__tests__/TransformPane.test.ts
index 64952a629a..b51c05e239 100644
--- a/src/renderer/core/layout/__tests__/TransformPane.test.ts
+++ b/src/renderer/core/layout/__tests__/TransformPane.test.ts
@@ -2,8 +2,8 @@ import { mount } from '@vue/test-utils'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { computed, nextTick } from 'vue'
 
-import type { LGraphCanvas } from '@/lib/litegraph/src/LGraphCanvas'
 import { useTransformState } from '@/renderer/core/layout/transform/useTransformState'
+import { createMockCanvas } from '@/utils/__tests__/litegraphTestUtils'
 
 import TransformPane from '../transform/TransformPane.vue'
 
@@ -29,8 +29,8 @@ vi.mock('@/renderer/core/layout/transform/useTransformState', () => {
   }
 })
 
-function createMockCanvas(): LGraphCanvas {
-  return {
+function createMockLGraphCanvas() {
+  return createMockCanvas({
     canvas: {
       addEventListener: vi.fn(),
       removeEventListener: vi.fn()
@@ -39,7 +39,7 @@ function createMockCanvas(): LGraphCanvas {
       offset: [0, 0],
       scale: 1
     }
-  } as unknown as LGraphCanvas
+  })
 }
 
 describe('TransformPane', () => {
@@ -52,7 +52,7 @@ describe('TransformPane', () => {
 
   describe('component mounting', () => {
     it('should mount successfully with minimal props', () => {
-      const mockCanvas = createMockCanvas()
+      const mockCanvas = createMockLGraphCanvas()
       const wrapper = mount(TransformPane, {
         props: {
           canvas: mockCanvas
@@ -69,7 +69,7 @@ describe('TransformPane', () => {
         transformOrigin: '0 0'
       }
 
-      const mockCanvas = createMockCanvas()
+      const mockCanvas = createMockLGraphCanvas()
       const wrapper = mount(TransformPane, {
         props: {
           canvas: mockCanvas
@@ -83,7 +83,7 @@ describe('TransformPane', () => {
     })
 
     it('should render slot content', () => {
-      const mockCanvas = createMockCanvas()
+      const mockCanvas = createMockLGraphCanvas()
       const wrapper = mount(TransformPane, {
         props: {
           canvas: mockCanvas
@@ -100,7 +100,7 @@ describe('TransformPane', () => {
 
   describe('RAF synchronization', () => {
     it('should call syncWithCanvas during RAF updates', async () => {
-      const mockCanvas = createMockCanvas()
+      const mockCanvas = createMockLGraphCanvas()
       mount(TransformPane, {
         props: {
           canvas: mockCanvas
@@ -119,7 +119,7 @@ describe('TransformPane', () => {
 
   describe('canvas event listeners', () => {
     it('should add event listeners to canvas on mount', async () => {
-      const mockCanvas = createMockCanvas()
+      const mockCanvas = createMockLGraphCanvas()
       mount(TransformPane, {
         props: {
           canvas: mockCanvas
@@ -151,7 +151,7 @@ describe('TransformPane', () => {
     })
 
     it('should remove event listeners on unmount', async () => {
-      const mockCanvas = createMockCanvas()
+      const mockCanvas = createMockLGraphCanvas()
       const wrapper = mount(TransformPane, {
         props: {
           canvas: mockCanvas
@@ -186,7 +186,7 @@ describe('TransformPane', () => {
 
   describe('interaction state management', () => {
     it('should apply interacting class during interactions', async () => {
-      const mockCanvas = createMockCanvas()
+      const mockCanvas = createMockLGraphCanvas()
       const wrapper = mount(TransformPane, {
         props: {
           canvas: mockCanvas
@@ -204,7 +204,7 @@ describe('TransformPane', () => {
     })
 
     it('should handle pointer events for node delegation', async () => {
-      const mockCanvas = createMockCanvas()
+      const mockCanvas = createMockLGraphCanvas()
       const wrapper = mount(TransformPane, {
         props: {
           canvas: mockCanvas
@@ -225,7 +225,7 @@ describe('TransformPane', () => {
 
   describe('transform state integration', () => {
     it('should provide transform utilities to child components', () => {
-      const mockCanvas = createMockCanvas()
+      const mockCanvas = createMockLGraphCanvas()
       mount(TransformPane, {
         props: {
           canvas: mockCanvas
diff --git a/tests-ui/tests/renderer/core/layout/layoutStore.test.ts b/src/renderer/core/layout/store/layoutStore.test.ts
similarity index 88%
rename from tests-ui/tests/renderer/core/layout/layoutStore.test.ts
rename to src/renderer/core/layout/store/layoutStore.test.ts
index ff7ee1fa06..eb4a15aa51 100644
--- a/tests-ui/tests/renderer/core/layout/layoutStore.test.ts
+++ b/src/renderer/core/layout/store/layoutStore.test.ts
@@ -1,9 +1,14 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { LiteGraph } from '@/lib/litegraph/src/litegraph'
+import { getSlotKey } from '@/renderer/core/layout/slots/slotIdentifier'
 import { layoutStore } from '@/renderer/core/layout/store/layoutStore'
 import { LayoutSource } from '@/renderer/core/layout/types'
-import type { LayoutChange, NodeLayout } from '@/renderer/core/layout/types'
+import type {
+  LayoutChange,
+  NodeLayout,
+  SlotLayout
+} from '@/renderer/core/layout/types'
 
 describe('layoutStore CRDT operations', () => {
   beforeEach(() => {
@@ -406,4 +411,49 @@ describe('layoutStore CRDT operations', () => {
       LiteGraph.NODE_TITLE_HEIGHT = originalTitleHeight
     }
   })
+
+  it.for([
+    { type: 'input' as const, isInput: true },
+    { type: 'output' as const, isInput: false }
+  ])(
+    'should preserve $type slot layouts when deleting a node',
+    ({ type, isInput }) => {
+      const nodeId = 'slot-persist-node'
+      const layout = createTestNode(nodeId)
+
+      layoutStore.applyOperation({
+        type: 'createNode',
+        entity: 'node',
+        nodeId,
+        layout,
+        timestamp: Date.now(),
+        source: LayoutSource.External,
+        actor: 'test'
+      })
+
+      const slotKey = getSlotKey(nodeId, 0, isInput)
+      const slotLayout: SlotLayout = {
+        nodeId,
+        index: 0,
+        type,
+        position: { x: 110, y: 120 },
+        bounds: { x: 105, y: 115, width: 10, height: 10 }
+      }
+      layoutStore.batchUpdateSlotLayouts([{ key: slotKey, layout: slotLayout }])
+      expect(layoutStore.getSlotLayout(slotKey)).toEqual(slotLayout)
+
+      layoutStore.applyOperation({
+        type: 'deleteNode',
+        entity: 'node',
+        nodeId,
+        previousLayout: layout,
+        timestamp: Date.now(),
+        source: LayoutSource.External,
+        actor: 'test'
+      })
+
+      // Slot layout must survive so Vue-patched components can still drag links
+      expect(layoutStore.getSlotLayout(slotKey)).toEqual(slotLayout)
+    }
+  )
 })
diff --git a/src/renderer/core/layout/store/layoutStore.ts b/src/renderer/core/layout/store/layoutStore.ts
index 786be06256..d5bab8031e 100644
--- a/src/renderer/core/layout/store/layoutStore.ts
+++ b/src/renderer/core/layout/store/layoutStore.ts
@@ -141,6 +141,24 @@ class LayoutStoreImpl implements LayoutStore {
   // Vue resizing state to prevent drag from activating during resize
   public isResizingVueNodes = ref(false)
 
+  /**
+   * Flag indicating slot positions are pending sync after graph reconfiguration.
+   * When true, link rendering should be skipped to avoid drawing with stale positions.
+   */
+  private _pendingSlotSync = false
+
+  get pendingSlotSync(): boolean {
+    return this._pendingSlotSync
+  }
+
+  get hasSlotLayouts(): boolean {
+    return this.slotLayouts.size > 0
+  }
+
+  setPendingSlotSync(value: boolean): void {
+    this._pendingSlotSync = value
+  }
+
   constructor() {
     // Initialize Yjs data structures
     this.ynodes = this.ydoc.getMap('nodes')
@@ -499,23 +517,6 @@ class LayoutStoreImpl implements LayoutStore {
     }
   }
 
-  /**
-   * Delete all slot layouts for a node
-   */
-  deleteNodeSlotLayouts(nodeId: NodeId): void {
-    const keysToDelete: string[] = []
-    for (const [key, layout] of this.slotLayouts) {
-      if (layout.nodeId === nodeId) {
-        keysToDelete.push(key)
-      }
-    }
-    for (const key of keysToDelete) {
-      this.slotLayouts.delete(key)
-      // Remove from spatial index
-      this.slotSpatialIndex.remove(key)
-    }
-  }
-
   /**
    * Clear all slot layouts and their spatial index (O(1) operations)
    * Used when switching rendering modes (Vue ↔ LiteGraph)
@@ -1103,13 +1104,10 @@ class LayoutStoreImpl implements LayoutStore {
     // During undo/redo, Vue components may still hold references to the old ref.
     // If we delete the trigger, Vue won't be notified when the node is re-created.
     // The trigger will be called in finalizeOperation to notify Vue of the change.
-
+    // We also intentionally do NOT delete slot layouts here for the same reason,
+    // and cleanup is handled by onUnmounted in useSlotElementTracking.
     // Remove from spatial index
     this.spatialIndex.remove(operation.nodeId)
-
-    // Clean up associated slot layouts
-    this.deleteNodeSlotLayouts(operation.nodeId)
-
     // Clean up associated links
     const linksToDelete = this.findLinksConnectedToNode(operation.nodeId)
 
diff --git a/src/renderer/core/layout/sync/useLayoutSync.ts b/src/renderer/core/layout/sync/useLayoutSync.ts
index 221fe64eb9..06449a1cc1 100644
--- a/src/renderer/core/layout/sync/useLayoutSync.ts
+++ b/src/renderer/core/layout/sync/useLayoutSync.ts
@@ -50,8 +50,12 @@ export function useLayoutSync() {
           liteNode.size[0] !== layout.size.width ||
           liteNode.size[1] !== layout.size.height
         ) {
-          // Use setSize() to trigger onResize callback
-          liteNode.setSize([layout.size.width, layout.size.height])
+          // Update internal size directly (like position above) to avoid
+          // the size setter writing back to layoutStore with Canvas source,
+          // which would create a feedback loop through handleLayoutChange.
+          liteNode.size[0] = layout.size.width
+          liteNode.size[1] = layout.size.height
+          liteNode.onResize?.(liteNode.size)
         }
       }
 
diff --git a/src/renderer/core/layout/transform/TransformPane.vue b/src/renderer/core/layout/transform/TransformPane.vue
index cf542bb895..26bf9c6b93 100644
--- a/src/renderer/core/layout/transform/TransformPane.vue
+++ b/src/renderer/core/layout/transform/TransformPane.vue
@@ -3,7 +3,7 @@
     data-testid="transform-pane"
     :class="
       cn(
-        'absolute inset-0 w-full h-full pointer-events-none',
+        'pointer-events-none absolute inset-0 size-full',
         isInteracting ? 'transform-pane--interacting' : 'will-change-auto'
       )
     "
diff --git a/tests-ui/tests/composables/graph/useTransformSettling.test.ts b/src/renderer/core/layout/transform/useTransformSettling.test.ts
similarity index 100%
rename from tests-ui/tests/composables/graph/useTransformSettling.test.ts
rename to src/renderer/core/layout/transform/useTransformSettling.test.ts
diff --git a/tests-ui/tests/composables/element/useTransformState.test.ts b/src/renderer/core/layout/transform/useTransformState.test.ts
similarity index 93%
rename from tests-ui/tests/composables/element/useTransformState.test.ts
rename to src/renderer/core/layout/transform/useTransformState.test.ts
index 76f0181dd3..655c8ef469 100644
--- a/tests-ui/tests/composables/element/useTransformState.test.ts
+++ b/src/renderer/core/layout/transform/useTransformState.test.ts
@@ -33,7 +33,7 @@ describe('useTransformState', () => {
   beforeEach(() => {
     transformState.syncWithCanvas({
       ds: { offset: [0, 0] }
-    } as unknown as LGraphCanvas)
+    } as LGraphCanvas)
   })
 
   describe('initial state', () => {
@@ -62,7 +62,7 @@ describe('useTransformState', () => {
       mockCanvas.ds.offset = [100, 50]
       mockCanvas.ds.scale = 2
 
-      syncWithCanvas(mockCanvas as any)
+      syncWithCanvas(mockCanvas as LGraphCanvas)
 
       expect(camera.x).toBe(100)
       expect(camera.y).toBe(50)
@@ -72,7 +72,7 @@ describe('useTransformState', () => {
     it('should handle null canvas gracefully', () => {
       const { syncWithCanvas, camera } = transformState
 
-      syncWithCanvas(null as any)
+      syncWithCanvas(null! as LGraphCanvas)
 
       // Should remain at initial values
       expect(camera.x).toBe(0)
@@ -84,7 +84,7 @@ describe('useTransformState', () => {
       const { syncWithCanvas, camera } = transformState
       const canvasWithoutDs = { canvas: {} }
 
-      syncWithCanvas(canvasWithoutDs as any)
+      syncWithCanvas(canvasWithoutDs as LGraphCanvas)
 
       // Should remain at initial values
       expect(camera.x).toBe(0)
@@ -99,7 +99,7 @@ describe('useTransformState', () => {
       mockCanvas.ds.offset = [150, 75]
       mockCanvas.ds.scale = 0.5
 
-      syncWithCanvas(mockCanvas as any)
+      syncWithCanvas(mockCanvas as LGraphCanvas)
 
       expect(transformStyle.value).toEqual({
         transform: 'scale(0.5) translate(150px, 75px)',
@@ -114,7 +114,7 @@ describe('useTransformState', () => {
       const mockCanvas = createMockCanvasContext()
       mockCanvas.ds.offset = [100, 50]
       mockCanvas.ds.scale = 2
-      transformState.syncWithCanvas(mockCanvas as any)
+      transformState.syncWithCanvas(mockCanvas as LGraphCanvas)
     })
 
     describe('canvasToScreen', () => {
@@ -176,7 +176,7 @@ describe('useTransformState', () => {
       const mockCanvas = createMockCanvasContext()
       mockCanvas.ds.offset = [100, 50]
       mockCanvas.ds.scale = 2
-      transformState.syncWithCanvas(mockCanvas as any)
+      transformState.syncWithCanvas(mockCanvas as LGraphCanvas)
     })
 
     it('should calculate correct screen bounds for a node', () => {
@@ -201,7 +201,7 @@ describe('useTransformState', () => {
       const mockCanvas = createMockCanvasContext()
       mockCanvas.ds.offset = [0, 0]
       mockCanvas.ds.scale = 1
-      transformState.syncWithCanvas(mockCanvas as any)
+      transformState.syncWithCanvas(mockCanvas as LGraphCanvas)
     })
 
     const viewport = { width: 1000, height: 600 }
@@ -257,14 +257,14 @@ describe('useTransformState', () => {
 
       // Test with very low zoom
       mockCanvas.ds.scale = 0.05
-      syncWithCanvas(mockCanvas as any)
+      syncWithCanvas(mockCanvas as LGraphCanvas)
 
       // Node at edge should still be visible due to increased margin
       expect(isNodeInViewport([1100, 100], [200, 100], viewport)).toBe(true)
 
       // Test with high zoom
       mockCanvas.ds.scale = 4
-      syncWithCanvas(mockCanvas as any)
+      syncWithCanvas(mockCanvas as LGraphCanvas)
 
       // Margin should be tighter
       expect(isNodeInViewport([1100, 100], [200, 100], viewport)).toBe(false)
@@ -276,7 +276,7 @@ describe('useTransformState', () => {
       const mockCanvas = createMockCanvasContext()
       mockCanvas.ds.offset = [100, 50]
       mockCanvas.ds.scale = 2
-      transformState.syncWithCanvas(mockCanvas as any)
+      transformState.syncWithCanvas(mockCanvas as LGraphCanvas)
     })
 
     it('should calculate viewport bounds in canvas coordinates', () => {
@@ -322,7 +322,7 @@ describe('useTransformState', () => {
 
       // Very small zoom
       mockCanvas.ds.scale = 0.001
-      syncWithCanvas(mockCanvas as any)
+      syncWithCanvas(mockCanvas as LGraphCanvas)
 
       const point1 = canvasToScreen({ x: 1000, y: 1000 })
       expect(point1.x).toBeCloseTo(1)
@@ -330,7 +330,7 @@ describe('useTransformState', () => {
 
       // Very large zoom
       mockCanvas.ds.scale = 100
-      syncWithCanvas(mockCanvas as any)
+      syncWithCanvas(mockCanvas as LGraphCanvas)
 
       const point2 = canvasToScreen({ x: 1, y: 1 })
       expect(point2.x).toBe(100)
@@ -343,7 +343,7 @@ describe('useTransformState', () => {
 
       // Scale of 0 gets converted to 1 by || operator
       mockCanvas.ds.scale = 0
-      syncWithCanvas(mockCanvas as any)
+      syncWithCanvas(mockCanvas as LGraphCanvas)
 
       // Should use scale of 1 due to camera.z || 1 in implementation
       const result = screenToCanvas({ x: 100, y: 100 })
diff --git a/src/renderer/core/layout/types.ts b/src/renderer/core/layout/types.ts
index 4332059f5e..2ca796e79b 100644
--- a/src/renderer/core/layout/types.ts
+++ b/src/renderer/core/layout/types.ts
@@ -302,7 +302,6 @@ export interface LayoutStore {
   deleteLinkLayout(linkId: LinkId): void
   deleteLinkSegmentLayout(linkId: LinkId, rerouteId: RerouteId | null): void
   deleteSlotLayout(key: string): void
-  deleteNodeSlotLayouts(nodeId: NodeId): void
   deleteRerouteLayout(rerouteId: RerouteId): void
   clearAllSlotLayouts(): void
 
diff --git a/tests-ui/tests/renderer/core/layout/utils/layoutMath.test.ts b/src/renderer/core/layout/utils/layoutMath.test.ts
similarity index 100%
rename from tests-ui/tests/renderer/core/layout/utils/layoutMath.test.ts
rename to src/renderer/core/layout/utils/layoutMath.test.ts
diff --git a/tests-ui/tests/renderer/core/layout/utils/layoutUtils.test.ts b/src/renderer/core/layout/utils/layoutUtils.test.ts
similarity index 100%
rename from tests-ui/tests/renderer/core/layout/utils/layoutUtils.test.ts
rename to src/renderer/core/layout/utils/layoutUtils.test.ts
diff --git a/tests-ui/tests/renderer/core/layout/utils/mappers.test.ts b/src/renderer/core/layout/utils/mappers.test.ts
similarity index 95%
rename from tests-ui/tests/renderer/core/layout/utils/mappers.test.ts
rename to src/renderer/core/layout/utils/mappers.test.ts
index a4ab0cd6b5..59078bd9c1 100644
--- a/tests-ui/tests/renderer/core/layout/utils/mappers.test.ts
+++ b/src/renderer/core/layout/utils/mappers.test.ts
@@ -3,9 +3,9 @@ import * as Y from 'yjs'
 
 import {
   NODE_LAYOUT_DEFAULTS,
-  type NodeLayoutMap,
   yNodeToLayout
 } from '@/renderer/core/layout/utils/mappers'
+import type { NodeLayoutMap } from '@/renderer/core/layout/utils/mappers'
 
 describe('mappers', () => {
   it('yNodeToLayout reads from Yjs-attached map', () => {
diff --git a/tests-ui/tests/utils/spatial/QuadTree.test.ts b/src/renderer/core/spatial/QuadTree.test.ts
similarity index 98%
rename from tests-ui/tests/utils/spatial/QuadTree.test.ts
rename to src/renderer/core/spatial/QuadTree.test.ts
index 31831159a9..daa44bbb71 100644
--- a/tests-ui/tests/utils/spatial/QuadTree.test.ts
+++ b/src/renderer/core/spatial/QuadTree.test.ts
@@ -1,6 +1,7 @@
 import { beforeEach, describe, expect, it } from 'vitest'
 
-import { type Bounds, QuadTree } from '@/renderer/core/spatial/QuadTree'
+import { QuadTree } from '@/renderer/core/spatial/QuadTree'
+import type { Bounds } from '@/renderer/core/spatial/QuadTree'
 
 describe('QuadTree', () => {
   let quadTree: QuadTree<string>
diff --git a/tests-ui/tests/renderer/thumbnail/composables/useWorkflowThumbnail.test.ts b/src/renderer/core/thumbnail/useWorkflowThumbnail.test.ts
similarity index 97%
rename from tests-ui/tests/renderer/thumbnail/composables/useWorkflowThumbnail.test.ts
rename to src/renderer/core/thumbnail/useWorkflowThumbnail.test.ts
index 39f8de56a7..4f7ea6ef62 100644
--- a/tests-ui/tests/renderer/thumbnail/composables/useWorkflowThumbnail.test.ts
+++ b/src/renderer/core/thumbnail/useWorkflowThumbnail.test.ts
@@ -3,6 +3,9 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import type { ComfyWorkflow } from '@/platform/workflow/management/stores/workflowStore'
 import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
+import { createGraphThumbnail } from '@/renderer/core/thumbnail/graphThumbnailRenderer'
+import { useWorkflowThumbnail } from '@/renderer/core/thumbnail/useWorkflowThumbnail'
+import { api } from '@/scripts/api'
 
 vi.mock('@/renderer/core/thumbnail/graphThumbnailRenderer', () => ({
   createGraphThumbnail: vi.fn()
@@ -19,12 +22,6 @@ vi.mock('@/scripts/api', () => ({
   }
 }))
 
-const { useWorkflowThumbnail } =
-  await import('@/renderer/core/thumbnail/useWorkflowThumbnail')
-const { createGraphThumbnail } =
-  await import('@/renderer/core/thumbnail/graphThumbnailRenderer')
-const { api } = await import('@/scripts/api')
-
 describe('useWorkflowThumbnail', () => {
   let workflowStore: ReturnType<typeof useWorkflowStore>
 
diff --git a/src/renderer/extensions/linearMode/AppInput.vue b/src/renderer/extensions/linearMode/AppInput.vue
new file mode 100644
index 0000000000..7b56dbb6f8
--- /dev/null
+++ b/src/renderer/extensions/linearMode/AppInput.vue
@@ -0,0 +1,62 @@
+<script setup lang="ts">
+import { remove } from 'es-toolkit'
+import { computed } from 'vue'
+
+import type { NodeId } from '@/lib/litegraph/src/LGraphNode'
+import { useAppModeStore } from '@/stores/appModeStore'
+import { cn } from '@/utils/tailwindUtil'
+
+const { id, name } = defineProps<{
+  id: string
+  enable: boolean
+  name: string
+}>()
+
+const appModeStore = useAppModeStore()
+const isPromoted = computed(() => appModeStore.selectedInputs.some(matchesThis))
+
+function matchesThis([nodeId, widgetName]: [NodeId, string]) {
+  return id == nodeId && name === widgetName
+}
+function togglePromotion() {
+  if (isPromoted.value) remove(appModeStore.selectedInputs, matchesThis)
+  else appModeStore.selectedInputs.push([id, name])
+}
+</script>
+<template>
+  <div
+    v-if="enable"
+    class="pointer-events-auto relative col-span-2 flex cursor-pointer flex-row gap-1"
+    @pointerdown.capture.stop.prevent="togglePromotion"
+    @click.capture.stop.prevent
+    @pointerup.capture.stop.prevent
+    @pointermove.capture.stop.prevent
+    @contextmenu.capture.stop.prevent
+  >
+    <div
+      :class="
+        cn(
+          'm-1 size-4 self-center rounded-sm border border-primary-background',
+          isPromoted && 'flex items-center bg-primary-background'
+        )
+      "
+    >
+      <i
+        v-if="isPromoted"
+        class="bg-primary-foreground place-center icon-[lucide--check]"
+      />
+    </div>
+    <div
+      :class="
+        cn(
+          'pointer-events-none grid flex-1 grid-cols-2 items-stretch rounded-lg ring-primary-background',
+          isPromoted && 'ring-2'
+        )
+      "
+    >
+      <slot />
+    </div>
+    <div class="absolute size-full rounded-lg hover:bg-primary-background/10" />
+  </div>
+  <slot v-else />
+</template>
diff --git a/src/renderer/extensions/linearMode/AppOutput.vue b/src/renderer/extensions/linearMode/AppOutput.vue
new file mode 100644
index 0000000000..33b7fa559c
--- /dev/null
+++ b/src/renderer/extensions/linearMode/AppOutput.vue
@@ -0,0 +1,51 @@
+<script setup lang="ts">
+import { remove } from 'es-toolkit'
+import { computed } from 'vue'
+
+import type { NodeId } from '@/lib/litegraph/src/LGraphNode'
+import { useAppModeStore } from '@/stores/appModeStore'
+import { cn } from '@/utils/tailwindUtil'
+
+const { id } = defineProps<{ id: string }>()
+
+const appModeStore = useAppModeStore()
+const isPromoted = computed(() =>
+  appModeStore.selectedOutputs.some(matchesThis)
+)
+
+function matchesThis(nodeId: NodeId) {
+  return id == nodeId
+}
+function togglePromotion() {
+  if (isPromoted.value) remove(appModeStore.selectedOutputs, matchesThis)
+  else appModeStore.selectedOutputs.push(id)
+}
+</script>
+<template>
+  <div
+    :class="
+      cn(
+        'pointer-events-auto absolute size-full rounded-2xl ring-5 ring-warning-background/50',
+        isPromoted && 'ring-warning-background'
+      )
+    "
+    @click.capture.stop.prevent
+    @pointerup.capture.stop.prevent
+    @pointermove.capture.stop.prevent
+    @pointerdown.capture.stop="togglePromotion"
+    @contextmenu.capture.stop.prevent
+  >
+    <div class="absolute top-0 right-0 size-8">
+      <div
+        v-if="isPromoted"
+        class="absolute -top-1/2 -right-1/2 size-full rounded-lg bg-warning-background p-2"
+      >
+        <i class="bg-text-foreground icon-[lucide--check] size-full" />
+      </div>
+      <div
+        v-else
+        class="absolute -top-1/2 -right-1/2 size-full rounded-lg bg-component-node-background ring-4 ring-warning-background/50 ring-inset"
+      />
+    </div>
+  </div>
+</template>
diff --git a/src/renderer/extensions/linearMode/DropZone.vue b/src/renderer/extensions/linearMode/DropZone.vue
new file mode 100644
index 0000000000..349534c33e
--- /dev/null
+++ b/src/renderer/extensions/linearMode/DropZone.vue
@@ -0,0 +1,75 @@
+<script setup lang="ts">
+import { useDropZone } from '@vueuse/core'
+import { ref } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+const props = defineProps<{
+  onDragOver?: (e: DragEvent) => boolean
+  onDragDrop?: (e: DragEvent) => Promise<boolean> | boolean
+  dropIndicator?: {
+    iconClass?: string
+    imageUrl?: string
+    label?: string
+    onClick?: (e: MouseEvent) => void
+  }
+}>()
+
+const dropZoneRef = ref<HTMLElement | null>(null)
+const canAcceptDrop = ref(false)
+
+const { isOverDropZone } = useDropZone(dropZoneRef, {
+  onDrop: (_files, event) => {
+    // Stop propagation to prevent global handlers from creating a new node
+    event?.stopPropagation()
+
+    if (props.onDragDrop && event) {
+      props.onDragDrop(event)
+    }
+    canAcceptDrop.value = false
+  },
+  onOver: (_, event) => {
+    if (props.onDragOver && event) {
+      canAcceptDrop.value = props.onDragOver(event)
+    }
+  },
+  onLeave: () => {
+    canAcceptDrop.value = false
+  }
+})
+</script>
+<template>
+  <div
+    v-if="onDragOver && onDragDrop"
+    ref="dropZoneRef"
+    :class="
+      cn(
+        'rounded-lg ring-primary-500 ring-inset',
+        canAcceptDrop && isOverDropZone && 'bg-primary-500/10 ring-4'
+      )
+    "
+  >
+    <slot />
+    <div
+      v-if="dropIndicator"
+      :class="
+        cn(
+          'm-3 flex h-25 flex-col items-center justify-center gap-2 rounded-lg border border-dashed border-border-subtle py-2',
+          dropIndicator?.onClick && 'cursor-pointer'
+        )
+      "
+      @click.prevent="dropIndicator?.onClick?.($event)"
+    >
+      <img
+        v-if="dropIndicator?.imageUrl"
+        class="h-23"
+        :src="dropIndicator?.imageUrl"
+      />
+      <template v-else>
+        <span v-if="dropIndicator.label" v-text="dropIndicator.label" />
+        <i v-if="dropIndicator.iconClass" :class="dropIndicator.iconClass" />
+      </template>
+    </div>
+  </div>
+  <slot v-else />
+</template>
diff --git a/src/renderer/extensions/linearMode/ImagePreview.vue b/src/renderer/extensions/linearMode/ImagePreview.vue
new file mode 100644
index 0000000000..3cb6c6a5b9
--- /dev/null
+++ b/src/renderer/extensions/linearMode/ImagePreview.vue
@@ -0,0 +1,52 @@
+<script setup lang="ts">
+import { ref, useTemplateRef } from 'vue'
+
+import ZoomPane from '@/components/ui/ZoomPane.vue'
+import { cn } from '@/utils/tailwindUtil'
+
+defineOptions({ inheritAttrs: false })
+
+const { src } = defineProps<{
+  src: string
+  mobile?: boolean
+}>()
+
+const imageRef = useTemplateRef('imageRef')
+const width = ref('')
+const height = ref('')
+</script>
+<template>
+  <ZoomPane
+    v-if="!mobile"
+    v-slot="slotProps"
+    :class="cn('w-full flex-1', $attrs.class as string)"
+  >
+    <img
+      ref="imageRef"
+      :src
+      v-bind="slotProps"
+      class="size-full object-contain"
+      @load="
+        () => {
+          if (!imageRef) return
+          width = `${imageRef.naturalWidth}`
+          height = `${imageRef.naturalHeight}`
+        }
+      "
+    />
+  </ZoomPane>
+  <img
+    v-else
+    ref="imageRef"
+    class="grow object-contain contain-size"
+    :src
+    @load="
+      () => {
+        if (!imageRef) return
+        width = `${imageRef.naturalWidth}`
+        height = `${imageRef.naturalHeight}`
+      }
+    "
+  />
+  <span class="self-center md:z-10" v-text="`${width} x ${height}`" />
+</template>
diff --git a/src/renderer/extensions/linearMode/LatentPreview.vue b/src/renderer/extensions/linearMode/LatentPreview.vue
new file mode 100644
index 0000000000..8e03e9f972
--- /dev/null
+++ b/src/renderer/extensions/linearMode/LatentPreview.vue
@@ -0,0 +1,7 @@
+<template>
+  <div class="flex min-h-0 w-full flex-1 items-center justify-center">
+    <div
+      class="skeleton-shimmer aspect-square size-[min(50vw,50vh)] rounded-lg"
+    />
+  </div>
+</template>
diff --git a/src/renderer/extensions/linearMode/LinearArrange.vue b/src/renderer/extensions/linearMode/LinearArrange.vue
new file mode 100644
index 0000000000..7a913ff055
--- /dev/null
+++ b/src/renderer/extensions/linearMode/LinearArrange.vue
@@ -0,0 +1,83 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+import { storeToRefs } from 'pinia'
+
+import Button from '@/components/ui/button/Button.vue'
+import { useAppMode } from '@/composables/useAppMode'
+import { flattenNodeOutput } from '@/renderer/extensions/linearMode/flattenNodeOutput'
+import MediaOutputPreview from '@/renderer/extensions/linearMode/MediaOutputPreview.vue'
+import { useAppModeStore } from '@/stores/appModeStore'
+import { useNodeOutputStore } from '@/stores/nodeOutputStore'
+import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
+
+const { t } = useI18n()
+const { setMode } = useAppMode()
+const appModeStore = useAppModeStore()
+const { hasOutputs } = storeToRefs(appModeStore)
+const nodeOutputStore = useNodeOutputStore()
+const { nodeIdToNodeLocatorId } = useWorkflowStore()
+
+const existingOutput = computed(() => {
+  for (const nodeId of appModeStore.selectedOutputs) {
+    const locatorId = nodeIdToNodeLocatorId(nodeId)
+    const nodeOutput = nodeOutputStore.nodeOutputs[locatorId]
+    if (!nodeOutput) continue
+    const results = flattenNodeOutput([nodeId, nodeOutput])
+    if (results.length > 0) return results[0]
+  }
+  return undefined
+})
+</script>
+
+<template>
+  <MediaOutputPreview
+    v-if="existingOutput"
+    :output="existingOutput"
+    class="px-12 py-24"
+  />
+  <div
+    v-else-if="hasOutputs"
+    role="article"
+    data-testid="arrange-preview"
+    class="mx-auto flex h-full w-3/4 flex-col items-center justify-center gap-6 p-8"
+  >
+    <div
+      class="flex h-4/5 w-full flex-col items-center justify-center rounded-2xl border-2 border-dashed border-warning-background p-12"
+    >
+      <p class="mb-0 font-bold text-base-foreground">
+        {{ t('linearMode.arrange.outputs') }}
+      </p>
+      <p class="text-center">{{ t('linearMode.arrange.resultsLabel') }}</p>
+    </div>
+  </div>
+  <div
+    v-else
+    role="article"
+    data-testid="arrange-no-outputs"
+    class="mx-auto flex h-full w-lg flex-col items-center justify-center gap-6 p-8 text-center"
+  >
+    <p class="m-0 text-base-foreground">
+      {{ t('linearMode.arrange.noOutputs') }}
+    </p>
+
+    <div class="flex w-lg flex-col gap-1 text-[14px] text-muted-foreground">
+      <p class="mt-0 p-0">{{ t('linearMode.arrange.switchToOutputs') }}</p>
+
+      <i18n-t keypath="linearMode.arrange.connectAtLeastOne" tag="div">
+        <template #atLeastOne>
+          <span class="font-bold italic">
+            {{ t('linearMode.arrange.atLeastOne') }}
+          </span>
+        </template>
+      </i18n-t>
+
+      <p class="mt-0 p-0">{{ t('linearMode.arrange.outputExamples') }}</p>
+    </div>
+    <div class="flex flex-row gap-2">
+      <Button variant="primary" size="lg" @click="setMode('builder:outputs')">
+        {{ t('linearMode.arrange.switchToOutputsButton') }}
+      </Button>
+    </div>
+  </div>
+</template>
diff --git a/src/renderer/extensions/linearMode/LinearControls.vue b/src/renderer/extensions/linearMode/LinearControls.vue
new file mode 100644
index 0000000000..4d0d667789
--- /dev/null
+++ b/src/renderer/extensions/linearMode/LinearControls.vue
@@ -0,0 +1,350 @@
+<script setup lang="ts">
+import { useEventListener, useTimeout } from '@vueuse/core'
+import { partition, remove, takeWhile } from 'es-toolkit'
+import { storeToRefs } from 'pinia'
+import { computed, ref, shallowRef } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import Loader from '@/components/loader/Loader.vue'
+import ScrubableNumberInput from '@/components/common/ScrubableNumberInput.vue'
+import Popover from '@/components/ui/Popover.vue'
+import Button from '@/components/ui/button/Button.vue'
+import { extractVueNodeData } from '@/composables/graph/useGraphNodeManager'
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
+import { LGraphEventMode } from '@/lib/litegraph/src/types/globalEnums'
+import { useBillingContext } from '@/composables/billing/useBillingContext'
+import { appendCloudResParam } from '@/platform/distribution/cloudPreviewUtil'
+import SubscribeToRunButton from '@/platform/cloud/subscription/components/SubscribeToRun.vue'
+import { useSettingStore } from '@/platform/settings/settingStore'
+import { useTelemetry } from '@/platform/telemetry'
+import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
+import DropZone from '@/renderer/extensions/linearMode/DropZone.vue'
+import NodeWidgets from '@/renderer/extensions/vueNodes/components/NodeWidgets.vue'
+import { api } from '@/scripts/api'
+import { app } from '@/scripts/app'
+import { useCommandStore } from '@/stores/commandStore'
+import { useExecutionErrorStore } from '@/stores/executionErrorStore'
+import { useQueueSettingsStore } from '@/stores/queueStore'
+import { cn } from '@/utils/tailwindUtil'
+import { useAppMode } from '@/composables/useAppMode'
+import { useAppModeStore } from '@/stores/appModeStore'
+import { resolveNode } from '@/utils/litegraphUtil'
+const { t } = useI18n()
+const commandStore = useCommandStore()
+const executionErrorStore = useExecutionErrorStore()
+const { batchCount } = storeToRefs(useQueueSettingsStore())
+const settingStore = useSettingStore()
+const { isActiveSubscription } = useBillingContext()
+const workflowStore = useWorkflowStore()
+const { isBuilderMode } = useAppMode()
+const appModeStore = useAppModeStore()
+const { hasOutputs } = storeToRefs(appModeStore)
+
+const props = defineProps<{
+  toastTo?: string | HTMLElement
+  mobile?: boolean
+}>()
+
+defineEmits<{ navigateOutputs: [] }>()
+
+//NOTE: due to batching, will never be greater than 2
+const pendingJobQueues = ref(0)
+const { ready: jobToastTimeout, start: resetJobToastTimeout } = useTimeout(
+  8000,
+  { controls: true, immediate: false }
+)
+
+const graphNodes = shallowRef<LGraphNode[]>(app.rootGraph.nodes)
+useEventListener(
+  app.rootGraph.events,
+  'configured',
+  () => (graphNodes.value = app.rootGraph.nodes)
+)
+
+const mappedSelections = computed(() => {
+  let unprocessedInputs = [...appModeStore.selectedInputs]
+  //FIXME strict typing here
+  const processedInputs: ReturnType<typeof nodeToNodeData>[] = []
+  while (unprocessedInputs.length) {
+    const nodeId = unprocessedInputs[0][0]
+    const inputGroup = takeWhile(
+      unprocessedInputs,
+      ([id]) => id === nodeId
+    ).map(([, widgetName]) => widgetName)
+    unprocessedInputs = unprocessedInputs.slice(inputGroup.length)
+    const node = resolveNode(nodeId)
+    if (node?.mode !== LGraphEventMode.ALWAYS) continue
+
+    const nodeData = nodeToNodeData(node)
+    remove(nodeData.widgets ?? [], (w) => !inputGroup.includes(w.name))
+    processedInputs.push(nodeData)
+  }
+  return processedInputs
+})
+
+function getDropIndicator(node: LGraphNode) {
+  if (node.type !== 'LoadImage') return undefined
+
+  const filename = node.widgets?.[0]?.value
+  const resultItem = { type: 'input', filename: `${filename}` }
+
+  const buildImageUrl = () => {
+    if (!filename) return undefined
+    const params = new URLSearchParams(resultItem)
+    appendCloudResParam(params, resultItem.filename)
+    return api.apiURL(`/view?${params}${app.getPreviewFormatParam()}`)
+  }
+
+  return {
+    iconClass: 'icon-[lucide--image]',
+    imageUrl: buildImageUrl(),
+    label: t('linearMode.dragAndDropImage'),
+    onClick: () => node.widgets?.[1]?.callback?.(undefined)
+  }
+}
+
+function nodeToNodeData(node: LGraphNode) {
+  const dropIndicator = getDropIndicator(node)
+  const nodeData = extractVueNodeData(node)
+  remove(nodeData.widgets ?? [], (w) => w.slotMetadata?.linked ?? false)
+  for (const widget of nodeData.widgets ?? []) widget.slotMetadata = undefined
+
+  return {
+    ...nodeData,
+    //note lastNodeErrors uses exeuctionid, node.id is execution for root
+    hasErrors: !!executionErrorStore.lastNodeErrors?.[node.id],
+
+    dropIndicator,
+    onDragDrop: node.onDragDrop,
+    onDragOver: node.onDragOver
+  }
+}
+const partitionedNodes = computed(() => {
+  const parts = partition(
+    graphNodes.value
+      .filter((node) => node.mode === 0 && node.widgets?.length)
+      .map(nodeToNodeData)
+      .reverse(),
+    (node) => ['MarkdownNote', 'Note'].includes(node.type)
+  )
+  for (const noteNode of parts[0]) {
+    for (const widget of noteNode.widgets ?? [])
+      widget.options = { ...widget.options, read_only: true }
+  }
+  return parts
+})
+
+//TODO: refactor out of this file.
+//code length is small, but changes should propagate
+async function runButtonClick(e: Event) {
+  try {
+    pendingJobQueues.value += 1
+    resetJobToastTimeout()
+    const isShiftPressed = 'shiftKey' in e && e.shiftKey
+    const commandId = isShiftPressed
+      ? 'Comfy.QueuePromptFront'
+      : 'Comfy.QueuePrompt'
+
+    if (batchCount.value > 1) {
+      useTelemetry()?.trackUiButtonClicked({
+        button_id: 'queue_run_multiple_batches_submitted'
+      })
+    }
+    await commandStore.execute(commandId, {
+      metadata: {
+        subscribe_to_run: false,
+        trigger_source: 'linear'
+      }
+    })
+  } finally {
+    //TODO: Error state indicator for failed queue?
+    pendingJobQueues.value -= 1
+  }
+}
+
+defineExpose({ runButtonClick })
+</script>
+<template>
+  <div
+    v-if="!isBuilderMode && hasOutputs"
+    class="flex h-full min-w-80 flex-col"
+    v-bind="$attrs"
+  >
+    <section
+      v-if="!mobile"
+      data-testid="linear-workflow-info"
+      class="flex h-12 items-center gap-2 border-x border-border-subtle bg-comfy-menu-bg px-4 py-2 contain-size"
+    >
+      <span
+        class="truncate font-bold"
+        v-text="workflowStore.activeWorkflow?.filename"
+      />
+      <div class="flex-1" />
+      <Popover
+        v-if="partitionedNodes[0].length"
+        align="end"
+        class="z-100 max-h-(--reka-popover-content-available-height) overflow-x-clip overflow-y-auto"
+        side="bottom"
+        :side-offset="-8"
+      >
+        <template #button>
+          <Button variant="muted-textonly">
+            <i class="icon-[lucide--info]" />
+          </Button>
+        </template>
+        <div>
+          <template
+            v-for="(nodeData, index) in partitionedNodes[0]"
+            :key="nodeData.id"
+          >
+            <div
+              v-if="index !== 0"
+              class="w-full border-t border-border-subtle"
+            />
+            <NodeWidgets
+              :node-data
+              class="max-w-100 gap-y-3 rounded-lg py-3 *:has-[textarea]:h-50 **:[.col-span-2]:grid-cols-1"
+            />
+          </template>
+        </div>
+      </Popover>
+      <Button v-if="false"> {{ t('menuLabels.publish') }} </Button>
+    </section>
+    <div
+      class="flex h-full flex-col gap-2 border-x border-(--interface-stroke) bg-comfy-menu-bg px-2 md:border-y"
+    >
+      <section
+        data-testid="linear-widgets"
+        class="grow overflow-y-auto contain-size"
+      >
+        <template
+          v-for="(nodeData, index) of appModeStore.selectedInputs.length
+            ? mappedSelections
+            : partitionedNodes[0]"
+          :key="nodeData.id"
+        >
+          <div
+            v-if="index !== 0 && !appModeStore.selectedInputs.length"
+            class="w-full border-t border-node-component-border"
+          />
+          <DropZone
+            :on-drag-over="nodeData.onDragOver"
+            :on-drag-drop="nodeData.onDragDrop"
+            :drop-indicator="mobile ? undefined : nodeData.dropIndicator"
+            class="text-muted-foreground"
+          >
+            <NodeWidgets
+              :node-data
+              :class="
+                cn(
+                  'gap-y-3 rounded-lg py-3 *:has-[textarea]:h-50 **:[.col-span-2]:grid-cols-1 **:[.h-7]:h-10',
+                  nodeData.hasErrors &&
+                    'ring-2 ring-node-stroke-error ring-inset'
+                )
+              "
+            />
+          </DropZone>
+        </template>
+      </section>
+      <Teleport
+        v-if="!jobToastTimeout || pendingJobQueues > 0"
+        defer
+        :disabled="mobile"
+        :to="toastTo"
+      >
+        <div
+          class="flex h-10 items-center gap-2 rounded-lg bg-base-foreground p-1 pr-2 text-base-background md:h-8 md:bg-secondary-background md:text-base-foreground"
+        >
+          <template v-if="pendingJobQueues === 0">
+            <i
+              class="icon-[lucide--check] size-5 not-md:bg-success-background"
+            />
+            <span class="mr-auto" v-text="t('queue.jobAddedToQueue')" />
+            <Button
+              v-if="mobile"
+              variant="inverted"
+              @click="$emit('navigateOutputs')"
+            >
+              {{ t('linearMode.viewJob') }}
+            </Button>
+          </template>
+          <template v-else>
+            <Loader size="sm" />
+            <span v-text="t('queue.jobQueueing')" />
+          </template>
+        </div>
+      </Teleport>
+      <section
+        v-if="mobile"
+        data-testid="linear-run-button"
+        class="border-t border-node-component-border p-4 pb-6"
+      >
+        <SubscribeToRunButton
+          v-if="!isActiveSubscription"
+          class="mt-4 w-full"
+        />
+        <div v-else class="mt-4 flex">
+          <Popover side="top" @open-auto-focus.prevent>
+            <template #button>
+              <Button size="lg" class="-mr-3 pr-7">
+                <i v-if="batchCount == 1" class="icon-[lucide--chevron-down]" />
+                <div v-else class="tabular-nums" v-text="`${batchCount}x`" />
+              </Button>
+            </template>
+            <div
+              class="m-1 mb-2 text-node-component-slot-text"
+              v-text="t('linearMode.runCount')"
+            />
+            <ScrubableNumberInput
+              v-model="batchCount"
+              :aria-label="t('linearMode.runCount')"
+              :min="1"
+              :max="settingStore.get('Comfy.QueueButton.BatchCountLimit')"
+              class="h-10 min-w-40"
+            />
+          </Popover>
+          <Button
+            variant="primary"
+            class="grow"
+            size="lg"
+            @click="runButtonClick"
+          >
+            <i class="icon-[lucide--play]" />
+            {{ t('menu.run') }}
+          </Button>
+        </div>
+      </section>
+      <section
+        v-else
+        data-testid="linear-run-button"
+        class="border-t border-node-component-border p-4 pb-6"
+      >
+        <div
+          class="m-1 mb-2 text-node-component-slot-text"
+          v-text="t('linearMode.runCount')"
+        />
+        <ScrubableNumberInput
+          v-model="batchCount"
+          :aria-label="t('linearMode.runCount')"
+          :min="1"
+          :max="settingStore.get('Comfy.QueueButton.BatchCountLimit')"
+          class="h-7 min-w-40"
+        />
+        <SubscribeToRunButton
+          v-if="!isActiveSubscription"
+          class="mt-4 w-full"
+        />
+        <Button
+          v-else
+          variant="primary"
+          class="mt-4 w-full text-sm"
+          size="lg"
+          @click="runButtonClick"
+        >
+          <i class="icon-[lucide--play]" />
+          {{ t('menu.run') }}
+        </Button>
+      </section>
+    </div>
+  </div>
+</template>
diff --git a/src/renderer/extensions/linearMode/LinearFeedback.vue b/src/renderer/extensions/linearMode/LinearFeedback.vue
new file mode 100644
index 0000000000..b625dbd219
--- /dev/null
+++ b/src/renderer/extensions/linearMode/LinearFeedback.vue
@@ -0,0 +1,42 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import TypeformPopoverButton from '@/components/ui/TypeformPopoverButton.vue'
+import { useSettingStore } from '@/platform/settings/settingStore'
+import { cn } from '@/utils/tailwindUtil'
+
+const { side, widgetId } = defineProps<{
+  side: 'left' | 'right'
+  widgetId: string
+}>()
+
+const { t } = useI18n()
+const settingStore = useSettingStore()
+const sidebarOnLeft = computed(
+  () => settingStore.get('Comfy.Sidebar.Location') === 'left'
+)
+const visible = computed(() => sidebarOnLeft.value === (side === 'left'))
+</script>
+<template>
+  <div
+    :class="
+      cn(
+        'flex items-center gap-2 self-end px-4 pb-4 text-nowrap text-base-foreground',
+        side === 'right' && 'flex-row-reverse',
+        !visible && 'invisible'
+      )
+    "
+    :aria-hidden="!visible || undefined"
+  >
+    <TypeformPopoverButton
+      :active="visible"
+      :data-tf-widget="widgetId"
+      :align="side === 'left' ? 'start' : 'end'"
+    />
+    <div class="flex flex-col text-sm text-muted-foreground">
+      <span>{{ t('linearMode.beta') }}</span>
+      <span>{{ t('linearMode.giveFeedback') }}</span>
+    </div>
+  </div>
+</template>
diff --git a/src/renderer/extensions/linearMode/LinearPreview.vue b/src/renderer/extensions/linearMode/LinearPreview.vue
new file mode 100644
index 0000000000..2d17bacc77
--- /dev/null
+++ b/src/renderer/extensions/linearMode/LinearPreview.vue
@@ -0,0 +1,175 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import { downloadFile } from '@/base/common/downloadUtil'
+import Popover from '@/components/ui/Popover.vue'
+import Button from '@/components/ui/button/Button.vue'
+import { useAppMode } from '@/composables/useAppMode'
+import { useMediaAssetActions } from '@/platform/assets/composables/useMediaAssetActions'
+import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
+import { extractWorkflowFromAsset } from '@/platform/workflow/utils/workflowExtractionUtil'
+import ImagePreview from '@/renderer/extensions/linearMode/ImagePreview.vue'
+import LatentPreview from '@/renderer/extensions/linearMode/LatentPreview.vue'
+import LinearWelcome from '@/renderer/extensions/linearMode/LinearWelcome.vue'
+import LinearArrange from '@/renderer/extensions/linearMode/LinearArrange.vue'
+import LinearFeedback from '@/renderer/extensions/linearMode/LinearFeedback.vue'
+import MediaOutputPreview from '@/renderer/extensions/linearMode/MediaOutputPreview.vue'
+import OutputHistory from '@/renderer/extensions/linearMode/OutputHistory.vue'
+import { useOutputHistory } from '@/renderer/extensions/linearMode/useOutputHistory'
+import type { OutputSelection } from '@/renderer/extensions/linearMode/linearModeTypes'
+import { app } from '@/scripts/app'
+import { useCommandStore } from '@/stores/commandStore'
+import { useExecutionStore } from '@/stores/executionStore'
+import { useQueueStore } from '@/stores/queueStore'
+import type { ResultItemImpl } from '@/stores/queueStore'
+
+const { t } = useI18n()
+const commandStore = useCommandStore()
+const executionStore = useExecutionStore()
+const mediaActions = useMediaAssetActions()
+const queueStore = useQueueStore()
+const { isBuilderMode, isArrangeMode } = useAppMode()
+const { allOutputs } = useOutputHistory()
+const { runButtonClick, mobile, typeformWidgetId } = defineProps<{
+  runButtonClick?: (e: Event) => void
+  mobile?: boolean
+  typeformWidgetId?: string
+}>()
+
+const selectedItem = ref<AssetItem>()
+const selectedOutput = ref<ResultItemImpl>()
+const canShowPreview = ref(true)
+const latentPreview = ref<string>()
+
+function handleSelection(sel: OutputSelection) {
+  selectedItem.value = sel.asset
+  selectedOutput.value = sel.output
+  canShowPreview.value = sel.canShowPreview
+  latentPreview.value = sel.latentPreviewUrl
+}
+
+function downloadAsset(item?: AssetItem) {
+  for (const output of allOutputs(item))
+    downloadFile(output.url, output.filename)
+}
+
+async function loadWorkflow(item: AssetItem | undefined) {
+  if (!item) return
+  const { workflow } = await extractWorkflowFromAsset(item)
+  if (!workflow) return
+
+  if (workflow.id !== app.rootGraph.id) return app.loadGraphData(workflow)
+  //update graph to new version, set old to top of undo queue
+  const changeTracker = useWorkflowStore().activeWorkflow?.changeTracker
+  if (!changeTracker) return app.loadGraphData(workflow)
+  changeTracker.redoQueue = []
+  await changeTracker.updateState([workflow], changeTracker.undoQueue)
+}
+
+async function rerun(e: Event) {
+  if (!runButtonClick) return
+  await loadWorkflow(selectedItem.value)
+  runButtonClick(e)
+}
+</script>
+<template>
+  <section
+    v-if="selectedItem || selectedOutput || !executionStore.isIdle"
+    data-testid="linear-output-info"
+    class="flex w-full flex-wrap justify-center gap-2 p-4 text-sm tabular-nums md:z-10"
+  >
+    <template v-if="selectedItem">
+      <Button size="md" @click="rerun">
+        {{ t('linearMode.rerun') }}
+        <i class="icon-[lucide--refresh-cw]" />
+      </Button>
+      <Button size="md" @click="() => loadWorkflow(selectedItem)">
+        {{ t('linearMode.reuseParameters') }}
+        <i class="icon-[lucide--list-restart]" />
+      </Button>
+      <div class="mx-1 border-r border-border-subtle" />
+    </template>
+    <Button
+      v-if="selectedOutput"
+      v-tooltip.top="t('g.download')"
+      size="icon"
+      :aria-label="t('g.download')"
+      @click="
+        () => {
+          if (selectedOutput?.url) downloadFile(selectedOutput.url)
+        }
+      "
+    >
+      <i class="icon-[lucide--download]" />
+    </Button>
+    <Button
+      v-if="!executionStore.isIdle && !selectedItem"
+      variant="destructive"
+      @click="commandStore.execute('Comfy.Interrupt')"
+    >
+      <i class="icon-[lucide--x]" />
+      {{ t('linearMode.cancelThisRun') }}
+    </Button>
+    <Popover
+      v-if="selectedItem"
+      :entries="[
+        ...(allOutputs(selectedItem).length > 1
+          ? [
+              {
+                icon: 'icon-[lucide--download]',
+                label: t('linearMode.downloadAll', {
+                  count: allOutputs(selectedItem).length
+                }),
+                command: () => downloadAsset(selectedItem)
+              },
+              { separator: true }
+            ]
+          : []),
+        {
+          icon: 'icon-[lucide--trash-2]',
+          label: t('queue.jobMenu.deleteAsset'),
+          command: () => mediaActions.deleteAssets(selectedItem!)
+        }
+      ]"
+    />
+  </section>
+  <ImagePreview
+    v-if="canShowPreview && latentPreview"
+    :mobile
+    :src="latentPreview"
+  />
+  <MediaOutputPreview
+    v-else-if="selectedOutput"
+    :output="selectedOutput"
+    :mobile
+  />
+  <LatentPreview v-else-if="queueStore.runningTasks.length > 0" />
+  <LinearArrange v-else-if="isArrangeMode" />
+  <LinearWelcome v-else />
+  <div
+    v-if="!mobile"
+    class="grid grid-cols-[auto_minmax(0,1fr)_auto] items-center"
+  >
+    <LinearFeedback
+      v-if="typeformWidgetId"
+      side="left"
+      :widget-id="typeformWidgetId"
+    />
+    <OutputHistory
+      v-if="!isBuilderMode"
+      class="z-10 min-w-0"
+      @update-selection="handleSelection"
+    />
+    <LinearFeedback
+      v-if="typeformWidgetId"
+      side="right"
+      :widget-id="typeformWidgetId"
+    />
+  </div>
+  <OutputHistory
+    v-else-if="!isBuilderMode"
+    @update-selection="handleSelection"
+  />
+</template>
diff --git a/src/renderer/extensions/linearMode/LinearProgressBar.vue b/src/renderer/extensions/linearMode/LinearProgressBar.vue
new file mode 100644
index 0000000000..67ce37dc0a
--- /dev/null
+++ b/src/renderer/extensions/linearMode/LinearProgressBar.vue
@@ -0,0 +1,45 @@
+<script setup lang="ts">
+import { useQueueProgress } from '@/composables/queue/useQueueProgress'
+import { useQueueStore } from '@/stores/queueStore'
+import { cn } from '@/utils/tailwindUtil'
+
+defineOptions({ inheritAttrs: false })
+
+const {
+  class: className,
+  overallOpacity = 1,
+  activeOpacity = 1,
+  rounded = false
+} = defineProps<{
+  class?: string
+  overallOpacity?: number
+  activeOpacity?: number
+  rounded?: boolean
+}>()
+
+const { totalPercent, currentNodePercent } = useQueueProgress()
+const queueStore = useQueueStore()
+</script>
+<template>
+  <div
+    :class="
+      cn(
+        'relative h-2 bg-secondary-background transition-opacity',
+        queueStore.runningTasks.length === 0 && 'opacity-0',
+        rounded && 'rounded-sm',
+        className
+      )
+    "
+  >
+    <div
+      class="absolute inset-0 h-full bg-interface-panel-job-progress-primary transition-[width]"
+      :class="cn(rounded && 'rounded-sm')"
+      :style="{ width: `${totalPercent}%`, opacity: overallOpacity }"
+    />
+    <div
+      class="absolute inset-0 h-full bg-interface-panel-job-progress-secondary transition-[width]"
+      :class="cn(rounded && 'rounded-sm')"
+      :style="{ width: `${currentNodePercent}%`, opacity: activeOpacity }"
+    />
+  </div>
+</template>
diff --git a/src/renderer/extensions/linearMode/LinearWelcome.vue b/src/renderer/extensions/linearMode/LinearWelcome.vue
new file mode 100644
index 0000000000..02d6a7a674
--- /dev/null
+++ b/src/renderer/extensions/linearMode/LinearWelcome.vue
@@ -0,0 +1,79 @@
+<script setup lang="ts">
+import { useI18n } from 'vue-i18n'
+import { useAppMode } from '@/composables/useAppMode'
+import { useWorkflowTemplateSelectorDialog } from '@/composables/useWorkflowTemplateSelectorDialog'
+import { useAppModeStore } from '@/stores/appModeStore'
+import Button from '@/components/ui/button/Button.vue'
+import { storeToRefs } from 'pinia'
+
+const { t } = useI18n()
+const { setMode } = useAppMode()
+const appModeStore = useAppModeStore()
+const { hasOutputs, hasNodes } = storeToRefs(appModeStore)
+const templateSelectorDialog = useWorkflowTemplateSelectorDialog()
+</script>
+
+<template>
+  <div
+    role="article"
+    data-testid="linear-welcome"
+    class="mx-auto flex h-full max-w-lg flex-col items-center justify-center gap-6 p-8 text-center"
+  >
+    <div class="flex flex-col gap-2">
+      <h2 class="text-3xl font-semibold text-muted-foreground">
+        {{ t('linearMode.welcome.title') }}
+      </h2>
+    </div>
+
+    <div class="flex max-w-md flex-col gap-3 text-[14px] text-muted-foreground">
+      <p class="mt-0">{{ t('linearMode.welcome.message') }}</p>
+      <p class="mt-0">{{ t('linearMode.welcome.controls') }}</p>
+      <p class="mt-0">{{ t('linearMode.welcome.sharing') }}</p>
+    </div>
+    <div v-if="hasOutputs" class="flex flex-row gap-2 text-[14px]">
+      <p class="mt-0 text-base-foreground">
+        <i18n-t keypath="linearMode.welcome.getStarted" tag="span">
+          <template #runButton>
+            <span
+              class="mx-0.5 inline-flex -translate-y-0.5 transform cursor-default items-center rounded-sm bg-primary-background px-3.5 py-0.5 text-xxs font-medium text-base-foreground"
+            >
+              {{ t('menu.run') }}
+            </span>
+          </template>
+        </i18n-t>
+      </p>
+    </div>
+    <template v-else>
+      <p v-if="!hasNodes" class="mt-0 max-w-md text-sm text-base-foreground">
+        {{ t('linearMode.emptyWorkflowExplanation') }}
+      </p>
+      <div class="flex flex-row gap-2">
+        <Button variant="textonly" size="lg" @click="setMode('graph')">
+          {{ t('linearMode.backToWorkflow') }}
+        </Button>
+        <Button
+          v-if="!hasNodes"
+          variant="secondary"
+          size="lg"
+          @click="templateSelectorDialog.show('appbuilder')"
+        >
+          {{ t('linearMode.loadTemplate') }}
+        </Button>
+        <Button
+          v-else
+          variant="primary"
+          size="lg"
+          @click="appModeStore.enterBuilder()"
+        >
+          <i class="icon-[lucide--hammer]" />
+          {{ t('linearMode.welcome.buildApp') }}
+          <div
+            class="absolute -top-2 -right-2 rounded-full bg-base-foreground px-1 text-xxs text-base-background"
+          >
+            {{ t('g.experimental') }}
+          </div>
+        </Button>
+      </div>
+    </template>
+  </div>
+</template>
diff --git a/src/renderer/extensions/linearMode/MediaOutputPreview.vue b/src/renderer/extensions/linearMode/MediaOutputPreview.vue
new file mode 100644
index 0000000000..b1964224a7
--- /dev/null
+++ b/src/renderer/extensions/linearMode/MediaOutputPreview.vue
@@ -0,0 +1,55 @@
+<script setup lang="ts">
+import { defineAsyncComponent, useAttrs } from 'vue'
+
+import ImagePreview from '@/renderer/extensions/linearMode/ImagePreview.vue'
+import VideoPreview from '@/renderer/extensions/linearMode/VideoPreview.vue'
+import { getMediaType } from '@/renderer/extensions/linearMode/mediaTypes'
+import type { ResultItemImpl } from '@/stores/queueStore'
+import { cn } from '@/utils/tailwindUtil'
+
+const Preview3d = defineAsyncComponent(
+  () => import('@/renderer/extensions/linearMode/Preview3d.vue')
+)
+
+defineOptions({ inheritAttrs: false })
+
+const { output } = defineProps<{
+  output: ResultItemImpl
+  mobile?: boolean
+}>()
+
+const attrs = useAttrs()
+</script>
+<template>
+  <ImagePreview
+    v-if="getMediaType(output) === 'images'"
+    :class="attrs.class as string"
+    :mobile
+    :src="output.url"
+  />
+  <VideoPreview
+    v-else-if="getMediaType(output) === 'video'"
+    :src="output.url"
+    :class="
+      cn('flex-1 object-contain md:p-3 md:contain-size', attrs.class as string)
+    "
+  />
+  <audio
+    v-else-if="getMediaType(output) === 'audio'"
+    :class="cn('m-auto w-full', attrs.class as string)"
+    controls
+    :src="output.url"
+  />
+  <article
+    v-else-if="getMediaType(output) === 'text'"
+    :class="
+      cn('m-auto my-12 w-full max-w-lg overflow-y-auto', attrs.class as string)
+    "
+    v-text="output.url"
+  />
+  <Preview3d
+    v-else-if="getMediaType(output) === '3d'"
+    :class="attrs.class as string"
+    :model-url="output.url"
+  />
+</template>
diff --git a/src/renderer/extensions/linearMode/MobileDisplay.vue b/src/renderer/extensions/linearMode/MobileDisplay.vue
new file mode 100644
index 0000000000..d529c416c0
--- /dev/null
+++ b/src/renderer/extensions/linearMode/MobileDisplay.vue
@@ -0,0 +1,228 @@
+<script setup lang="ts">
+import type { MenuItem } from 'primevue/menuitem'
+import { useFullscreen, usePointerSwipe } from '@vueuse/core'
+import { computed, ref, useTemplateRef } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import DropdownMenu from '@/components/common/DropdownMenu.vue'
+import AssetsSidebarTab from '@/components/sidebar/tabs/AssetsSidebarTab.vue'
+import CurrentUserButton from '@/components/topbar/CurrentUserButton.vue'
+import Button from '@/components/ui/button/Button.vue'
+import Popover from '@/components/ui/Popover.vue'
+import { useCurrentUser } from '@/composables/auth/useCurrentUser'
+import { useWorkflowService } from '@/platform/workflow/core/services/workflowService'
+import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
+import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import LinearControls from '@/renderer/extensions/linearMode/LinearControls.vue'
+import LinearPreview from '@/renderer/extensions/linearMode/LinearPreview.vue'
+import { useColorPaletteService } from '@/services/colorPaletteService'
+import { useQueueStore } from '@/stores/queueStore'
+import { useMenuItemStore } from '@/stores/menuItemStore'
+import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
+import { cn } from '@/utils/tailwindUtil'
+
+const tabs = [
+  ['linearMode.mobileControls', 'icon-[lucide--play]'],
+  ['nodeHelpPage.outputs', 'icon-[comfy--image-ai-edit]'],
+  ['sideToolbar.assets', 'icon-[lucide--images]']
+]
+
+const canvasStore = useCanvasStore()
+const colorPaletteService = useColorPaletteService()
+const colorPaletteStore = useColorPaletteStore()
+const { isLoggedIn } = useCurrentUser()
+const { t } = useI18n()
+const { commandIdToMenuItem } = useMenuItemStore()
+const queueStore = useQueueStore()
+const workflowService = useWorkflowService()
+const workflowStore = useWorkflowStore()
+const { toggle: toggleFullscreen } = useFullscreen(undefined, {
+  autoExit: true
+})
+
+const activeIndex = ref(2)
+const sliderPaneRef = useTemplateRef('sliderPaneRef')
+const sliderWidth = computed(() => sliderPaneRef.value?.offsetWidth)
+
+const { distanceX, isSwiping } = usePointerSwipe(sliderPaneRef, {
+  disableTextSelect: true,
+  onSwipeEnd() {
+    if (
+      !sliderWidth.value ||
+      Math.abs(distanceX.value) / sliderWidth.value < 0.4
+    )
+      return
+    if (distanceX.value < 0)
+      activeIndex.value = Math.max(activeIndex.value - 1, 0)
+    else activeIndex.value = Math.min(activeIndex.value + 1, tabs.length - 1)
+  }
+})
+
+const translate = computed(() => {
+  const slideOffset =
+    isSwiping.value && sliderWidth.value
+      ? distanceX.value / sliderWidth.value
+      : 0
+  const totalOffset = slideOffset + activeIndex.value
+  return `${totalOffset * -100}vw`
+})
+
+function onClick(index: number) {
+  if (Math.abs(distanceX.value) > 30) return
+  activeIndex.value = index
+}
+
+const workflowsEntries = computed(() => {
+  return workflowStore.openWorkflows.map((w) => ({
+    label: w.filename,
+    icon: w.activeState?.extra?.linearMode
+      ? 'icon-[lucide--panels-top-left] bg-primary-background'
+      : undefined,
+    command: () => workflowService.openWorkflow(w)
+  }))
+})
+
+const menuEntries = computed<MenuItem[]>(() => [
+  {
+    label: t('linearMode.appModeToolbar.apps'),
+    icon: 'icon-[lucide--panels-top-left]'
+  },
+  {
+    ...commandIdToMenuItem('Comfy.BrowseTemplates'),
+    label: t('sideToolbar.templates'),
+    icon: 'icon-[comfy--template]'
+  },
+  { separator: true },
+  {
+    label: t('icon.file'),
+    items: [
+      commandIdToMenuItem('Comfy.RenameWorkflow'),
+      commandIdToMenuItem('Comfy.DuplicateWorkflow'),
+      { separator: true },
+      commandIdToMenuItem('Comfy.SaveWorkflow'),
+      commandIdToMenuItem('Comfy.SaveWorkflowAs'),
+      { separator: true },
+      commandIdToMenuItem('Comfy.ExportWorkflow'),
+      commandIdToMenuItem('Comfy.ExportWorkflowAPI')
+    ]
+  },
+  {
+    label: t('g.edit'),
+    items: [
+      commandIdToMenuItem('Comfy.Undo'),
+      commandIdToMenuItem('Comfy.Redo'),
+      { separator: true },
+      commandIdToMenuItem('Comfy.RefreshNodeDefinitions'),
+      commandIdToMenuItem('Comfy.Memory.UnloadModels'),
+      commandIdToMenuItem('Comfy.Memory.UnloadModelsAndExecutionCache')
+    ]
+  },
+  {
+    label: t('linearMode.enterNodeGraph'),
+    icon: 'icon-[comfy--workflow]',
+    new: true,
+    command: () => (canvasStore.linearMode = false)
+  },
+  { separator: true },
+  {
+    label: t('menu.theme'),
+    items: colorPaletteStore.palettes.map((palette) => ({
+      label: palette.name,
+      icon:
+        colorPaletteStore.activePaletteId === palette.id
+          ? 'icon-[lucide--check]'
+          : '',
+      command: () => colorPaletteService.loadColorPalette(palette.id)
+    }))
+  },
+  { separator: true },
+  {
+    ...commandIdToMenuItem('Comfy.ShowSettingsDialog'),
+    label: t('menu.settings')
+  },
+  { ...commandIdToMenuItem('Comfy.ToggleHelpCenter'), label: t('menu.help') },
+  {
+    label: t('menu.fullscreen'),
+    icon: 'icon-[lucide--fullscreen]',
+    command: toggleFullscreen
+  }
+])
+</script>
+<template>
+  <section class="absolute flex size-full flex-col bg-secondary-background">
+    <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" />
+      <Popover
+        :entries="workflowsEntries"
+        class="w-(--reka-popover-content-available-width)"
+        :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"
+          >
+            <i
+              class="icon-[lucide--panels-top-left] shrink-0 bg-primary-background"
+            />
+            <span
+              class="size-full truncate contain-size"
+              v-text="workflowStore.activeWorkflow?.filename"
+            />
+            <i
+              class="icon-[lucide--chevron-down] shrink-0 bg-muted-foreground"
+            />
+          </div>
+        </template>
+      </Popover>
+      <CurrentUserButton v-if="isLoggedIn" :show-arrow="false" />
+    </header>
+    <div class="size-full rounded-b-4xl contain-content">
+      <div
+        :class="
+          cn('relative size-full', !isSwiping && 'transition-[translate]')
+        "
+        :style="{ translate }"
+      >
+        <div class="absolute h-full w-screen overflow-y-auto contain-size">
+          <LinearControls mobile @navigate-outputs="activeIndex = 1" />
+        </div>
+        <div
+          class="absolute top-0 left-[100vw] flex h-full w-screen flex-col bg-base-background"
+        >
+          <LinearPreview mobile />
+        </div>
+        <AssetsSidebarTab
+          class="absolute top-0 left-[200vw] h-full w-screen bg-base-background"
+        />
+      </div>
+    </div>
+    <div
+      ref="sliderPaneRef"
+      class="flex h-22 w-full items-center justify-around gap-4 bg-secondary-background p-4"
+    >
+      <Button
+        v-for="([label, icon], index) in tabs"
+        :key="label"
+        :variant="index === activeIndex ? 'secondary' : 'muted-textonly'"
+        class="h-14 grow flex-col"
+        @click="onClick(index)"
+      >
+        <div class="relative size-4">
+          <i :class="cn('size-4', icon)" />
+          <div
+            v-if="
+              index === 1 &&
+              (queueStore.runningTasks.length > 0 ||
+                queueStore.pendingTasks.length > 0)
+            "
+            class="absolute -top-1 -right-1 size-2 animate-pulse rounded-full bg-primary-background"
+          />
+        </div>
+        {{ t(label) }}
+      </Button>
+    </div>
+  </section>
+</template>
diff --git a/src/renderer/extensions/linearMode/OutputHistory.vue b/src/renderer/extensions/linearMode/OutputHistory.vue
new file mode 100644
index 0000000000..17b02941d8
--- /dev/null
+++ b/src/renderer/extensions/linearMode/OutputHistory.vue
@@ -0,0 +1,357 @@
+<script setup lang="ts">
+import {
+  useEventListener,
+  useInfiniteScroll,
+  useResizeObserver
+} from '@vueuse/core'
+import type { ComponentPublicInstance } from 'vue'
+import {
+  computed,
+  nextTick,
+  ref,
+  toValue,
+  useTemplateRef,
+  watch,
+  watchEffect
+} from 'vue'
+
+import { CanvasPointer } from '@/lib/litegraph/src/CanvasPointer'
+import OutputHistoryActiveQueueItem from '@/renderer/extensions/linearMode/OutputHistoryActiveQueueItem.vue'
+import OutputHistoryItem from '@/renderer/extensions/linearMode/OutputHistoryItem.vue'
+import { useLinearOutputStore } from '@/renderer/extensions/linearMode/linearOutputStore'
+import type {
+  OutputSelection,
+  SelectionValue
+} from '@/renderer/extensions/linearMode/linearModeTypes'
+import OutputPreviewItem from '@/renderer/extensions/linearMode/OutputPreviewItem.vue'
+import { useOutputHistory } from '@/renderer/extensions/linearMode/useOutputHistory'
+import { useQueueStore } from '@/stores/queueStore'
+import { cn } from '@/utils/tailwindUtil'
+
+const { outputs, allOutputs, selectFirstHistory } = useOutputHistory()
+const queueStore = useQueueStore()
+const store = useLinearOutputStore()
+
+const emit = defineEmits<{
+  updateSelection: [selection: OutputSelection]
+}>()
+
+const queueCount = computed(
+  () => queueStore.runningTasks.length + queueStore.pendingTasks.length
+)
+
+const itemClass = cn(
+  'shrink-0 cursor-pointer rounded-lg border-2 border-transparent p-1 outline-none',
+  'relative data-[state=checked]:border-interface-panel-job-progress-border'
+)
+
+const hasActiveContent = computed(
+  () => store.activeWorkflowInProgressItems.length > 0
+)
+
+const visibleHistory = computed(() =>
+  outputs.media.value.filter((a) => allOutputs(a).length > 0)
+)
+
+const selectableItems = computed(() => {
+  const items: SelectionValue[] = []
+  if (
+    queueCount.value > 0 &&
+    store.activeWorkflowInProgressItems.length === 0
+  ) {
+    items.push({ id: 'slot:pending', kind: 'inProgress', itemId: 'pending' })
+  }
+  for (const item of store.activeWorkflowInProgressItems) {
+    items.push({
+      id: `slot:${item.id}`,
+      kind: 'inProgress',
+      itemId: item.id
+    })
+  }
+  for (const asset of outputs.media.value) {
+    const outs = allOutputs(asset)
+    for (let k = 0; k < outs.length; k++) {
+      items.push({
+        id: `history:${asset.id}:${k}`,
+        kind: 'history',
+        assetId: asset.id,
+        key: k
+      })
+    }
+  }
+  return items
+})
+
+const selectionMap = computed(
+  () => new Map(selectableItems.value.map((v) => [v.id, v]))
+)
+
+const selectedValue = computed(() => {
+  if (!store.selectedId) return undefined
+  return selectionMap.value.get(store.selectedId)
+})
+
+function itemAttrs(id: string) {
+  const selected = store.selectedId === id
+  return {
+    'data-state': selected ? 'checked' : 'unchecked',
+    tabindex: selected ? 0 : -1
+  }
+}
+
+const selectedItemEl = ref<Element | null>(null)
+
+function selectedRef(id: string) {
+  return store.selectedId === id
+    ? (el: Element | ComponentPublicInstance | null) => {
+        selectedItemEl.value = el instanceof Element ? el : null
+      }
+    : undefined
+}
+
+function doEmit() {
+  const sel = selectedValue.value
+  if (!sel) {
+    emit('updateSelection', { canShowPreview: true })
+    return
+  }
+  if (sel.kind === 'inProgress') {
+    const item = store.activeWorkflowInProgressItems.find(
+      (i) => i.id === sel.itemId
+    )
+    if (!item || item.state === 'skeleton') {
+      emit('updateSelection', { canShowPreview: true })
+    } else if (item.state === 'latent') {
+      emit('updateSelection', {
+        canShowPreview: true,
+        latentPreviewUrl: item.latentPreviewUrl
+      })
+    } else {
+      emit('updateSelection', {
+        output: item.output,
+        canShowPreview: true
+      })
+    }
+    return
+  }
+  const asset = outputs.media.value.find((a) => a.id === sel.assetId)
+  const output = asset ? allOutputs(asset)[sel.key] : undefined
+  const isFirst = outputs.media.value[0]?.id === sel.assetId
+  emit('updateSelection', {
+    asset,
+    output,
+    canShowPreview: isFirst
+  })
+}
+
+watchEffect(doEmit)
+
+// Keep history selection stable on media changes
+watch(
+  () => outputs.media.value,
+  (newAssets, oldAssets) => {
+    if (
+      newAssets.length === oldAssets.length ||
+      (oldAssets.length === 0 && newAssets.length !== 1)
+    )
+      return
+
+    if (store.selectedId?.startsWith('slot:')) return
+
+    const sv = store.selectedId
+      ? selectionMap.value.get(store.selectedId)
+      : undefined
+
+    if (!sv || sv.kind !== 'history') {
+      selectFirstHistory()
+      return
+    }
+
+    const wasFirst = sv.assetId === oldAssets[0]?.id
+    if (wasFirst || !newAssets.some((a) => a.id === sv.assetId)) {
+      selectFirstHistory()
+    }
+  }
+)
+
+const outputsRef = useTemplateRef('outputsRef')
+
+// Track scrollWidth so we can compensate when items are prepended on the left.
+let lastScrollWidth = 0
+useResizeObserver(outputsRef, () => {
+  lastScrollWidth = outputsRef.value?.scrollWidth ?? 0
+})
+watch(
+  [
+    () => store.activeWorkflowInProgressItems.length,
+    () => visibleHistory.value[0]?.id,
+    queueCount
+  ],
+  () => {
+    const el = outputsRef.value
+    if (!el || el.scrollLeft === 0) {
+      lastScrollWidth = el?.scrollWidth ?? 0
+      return
+    }
+    nextTick(() => {
+      const delta = el.scrollWidth - lastScrollWidth
+      if (delta !== 0) el.scrollLeft += delta
+      lastScrollWidth = el.scrollWidth
+    })
+  }
+)
+
+useInfiniteScroll(outputsRef, outputs.loadMore, {
+  canLoadMore: () => outputs.hasMore.value
+})
+
+function navigateToAdjacent(direction: 1 | -1) {
+  const items = selectableItems.value
+  if (items.length === 0) return
+  const currentId = store.selectedId
+  const idx = currentId ? items.findIndex((i) => i.id === currentId) : -1
+  const nextIdx =
+    idx === -1 ? 0 : Math.max(0, Math.min(items.length - 1, idx + direction))
+  store.select(items[nextIdx].id)
+  nextTick(() => {
+    selectedItemEl.value?.scrollIntoView({
+      block: 'nearest',
+      inline: 'nearest'
+    })
+  })
+}
+
+const pointer = new CanvasPointer(document.body)
+let scrollOffset = 0
+useEventListener(
+  document.body,
+  'wheel',
+  function (e: WheelEvent) {
+    if (!e.ctrlKey && !e.metaKey) return
+    e.preventDefault()
+    e.stopPropagation()
+
+    if (!pointer.isTrackpadGesture(e)) {
+      if (e.deltaY > 0) navigateToAdjacent(1)
+      else navigateToAdjacent(-1)
+      return
+    }
+    scrollOffset += e.deltaY
+    while (scrollOffset >= 60) {
+      scrollOffset -= 60
+      navigateToAdjacent(1)
+    }
+    while (scrollOffset <= -60) {
+      scrollOffset += 60
+      navigateToAdjacent(-1)
+    }
+  },
+  { capture: true, passive: false }
+)
+
+useEventListener(
+  outputsRef,
+  'wheel',
+  function (e: WheelEvent) {
+    if (e.ctrlKey || e.metaKey || e.deltaY === 0) return
+    e.preventDefault()
+    if (outputsRef.value) outputsRef.value.scrollLeft += e.deltaY
+  },
+  { passive: false }
+)
+
+const keyHandlers: Record<string, 1 | -1> = {
+  ArrowUp: -1,
+  ArrowDown: 1,
+  ArrowLeft: -1,
+  ArrowRight: 1
+}
+useEventListener(document.body, 'keydown', (e: KeyboardEvent) => {
+  if (
+    !(e.key in keyHandlers) ||
+    e.target instanceof HTMLTextAreaElement ||
+    e.target instanceof HTMLInputElement
+  )
+    return
+
+  e.preventDefault()
+  e.stopPropagation()
+  navigateToAdjacent(keyHandlers[e.key])
+})
+</script>
+<template>
+  <div role="group" class="min-w-0 px-4 pb-4">
+    <article
+      ref="outputsRef"
+      data-testid="linear-outputs"
+      class="min-w-0 overflow-x-auto overflow-y-clip py-3"
+    >
+      <div class="mx-auto flex h-21 w-fit items-start gap-0.5">
+        <div
+          v-if="queueCount > 0 || hasActiveContent"
+          :class="
+            cn(
+              'sticky left-0 z-10 flex shrink-0 items-start gap-0.5',
+              'md:bg-comfy-menu-secondary-bg bg-comfy-menu-bg'
+            )
+          "
+        >
+          <OutputHistoryActiveQueueItem
+            v-if="queueCount > 1"
+            class="mr-3"
+            :queue-count="queueCount"
+          />
+
+          <div
+            v-if="
+              queueCount > 0 && store.activeWorkflowInProgressItems.length === 0
+            "
+            :ref="selectedRef('slot:pending')"
+            v-bind="itemAttrs('slot:pending')"
+            :class="itemClass"
+            @click="store.select('slot:pending')"
+          >
+            <OutputPreviewItem />
+          </div>
+
+          <div
+            v-for="item in store.activeWorkflowInProgressItems"
+            :key="`${item.id}-${item.state}`"
+            :ref="selectedRef(`slot:${item.id}`)"
+            v-bind="itemAttrs(`slot:${item.id}`)"
+            :class="itemClass"
+            @click="store.select(`slot:${item.id}`)"
+          >
+            <OutputPreviewItem
+              v-if="item.state !== 'image' || !item.output"
+              :latent-preview="item.latentPreviewUrl"
+            />
+            <OutputHistoryItem v-else :output="item.output" />
+          </div>
+
+          <div
+            v-if="hasActiveContent && visibleHistory.length > 0"
+            class="mx-4 h-12 shrink-0 border-l border-border-default"
+          />
+        </div>
+
+        <template v-for="(asset, aIdx) in visibleHistory" :key="asset.id">
+          <div
+            v-if="aIdx > 0"
+            class="mx-4 h-12 shrink-0 border-l border-border-default"
+          />
+          <div
+            v-for="(output, key) in toValue(allOutputs(asset))"
+            :key
+            :ref="selectedRef(`history:${asset.id}:${key}`)"
+            v-bind="itemAttrs(`history:${asset.id}:${key}`)"
+            :class="itemClass"
+            @click="store.select(`history:${asset.id}:${key}`)"
+          >
+            <OutputHistoryItem :output="output" />
+          </div>
+        </template>
+      </div>
+    </article>
+  </div>
+</template>
diff --git a/src/renderer/extensions/linearMode/OutputHistoryActiveQueueItem.test.ts b/src/renderer/extensions/linearMode/OutputHistoryActiveQueueItem.test.ts
new file mode 100644
index 0000000000..7798cec702
--- /dev/null
+++ b/src/renderer/extensions/linearMode/OutputHistoryActiveQueueItem.test.ts
@@ -0,0 +1,42 @@
+import { shallowMount } from '@vue/test-utils'
+import { describe, expect, it, vi } from 'vitest'
+
+import OutputHistoryActiveQueueItem from './OutputHistoryActiveQueueItem.vue'
+
+vi.mock('vue-i18n', () => ({
+  useI18n: () => ({ t: (key: string) => key })
+}))
+
+vi.mock('@/stores/commandStore', () => ({
+  useCommandStore: () => ({
+    execute: vi.fn()
+  })
+}))
+
+function mountComponent(queueCount: number) {
+  return shallowMount(OutputHistoryActiveQueueItem, {
+    props: { queueCount }
+  })
+}
+
+describe('OutputHistoryActiveQueueItem', () => {
+  it('shows badge when queueCount is 1', () => {
+    const wrapper = mountComponent(1)
+    const badge = wrapper.find('[aria-hidden="true"]')
+    expect(badge.exists()).toBe(true)
+    expect(badge.text()).toBe('1')
+  })
+
+  it('shows badge with correct count when queueCount is 3', () => {
+    const wrapper = mountComponent(3)
+    const badge = wrapper.find('[aria-hidden="true"]')
+    expect(badge.exists()).toBe(true)
+    expect(badge.text()).toBe('3')
+  })
+
+  it('hides badge when queueCount is 0', () => {
+    const wrapper = mountComponent(0)
+    const badge = wrapper.find('[aria-hidden="true"]')
+    expect(badge.exists()).toBe(false)
+  })
+})
diff --git a/src/renderer/extensions/linearMode/OutputHistoryActiveQueueItem.vue b/src/renderer/extensions/linearMode/OutputHistoryActiveQueueItem.vue
new file mode 100644
index 0000000000..b37a57c3b3
--- /dev/null
+++ b/src/renderer/extensions/linearMode/OutputHistoryActiveQueueItem.vue
@@ -0,0 +1,57 @@
+<script setup lang="ts">
+import { useI18n } from 'vue-i18n'
+
+import Loader from '@/components/loader/Loader.vue'
+import Popover from '@/components/ui/Popover.vue'
+import Button from '@/components/ui/button/Button.vue'
+import { useCommandStore } from '@/stores/commandStore'
+
+const { queueCount } = defineProps<{
+  queueCount: number
+}>()
+
+const { t } = useI18n()
+const commandStore = useCommandStore()
+
+function clearQueue(close: () => void) {
+  void commandStore.execute('Comfy.ClearPendingTasks')
+  close()
+}
+</script>
+<template>
+  <div
+    class="relative shrink-0 border-2 border-transparent p-1"
+    data-testid="linear-job"
+  >
+    <Popover side="top" :show-arrow="false" @focus-outside.prevent>
+      <template #button>
+        <Button
+          v-tooltip.top="t('linearMode.queue.clickToClear')"
+          :aria-label="t('linearMode.queue.clickToClear')"
+          variant="textonly"
+          size="unset"
+          class="flex size-10 items-center justify-center rounded-sm bg-secondary-background"
+        >
+          <Loader size="sm" class="text-muted-foreground" />
+        </Button>
+      </template>
+      <template #default="{ close }">
+        <Button
+          :disabled="queueCount === 0"
+          variant="textonly"
+          class="px-4 text-sm text-destructive-background"
+          @click="clearQueue(close)"
+        >
+          <i class="icon-[lucide--list-x]" />
+          {{ t('linearMode.queue.clear') }}
+        </Button>
+      </template>
+    </Popover>
+    <div
+      v-if="queueCount > 0"
+      aria-hidden="true"
+      class="absolute top-0 right-0 flex h-4 min-w-4 items-center justify-center rounded-full bg-primary-background text-xs text-text-primary"
+      v-text="queueCount"
+    />
+  </div>
+</template>
diff --git a/src/renderer/extensions/linearMode/OutputHistoryItem.vue b/src/renderer/extensions/linearMode/OutputHistoryItem.vue
new file mode 100644
index 0000000000..364b74e0eb
--- /dev/null
+++ b/src/renderer/extensions/linearMode/OutputHistoryItem.vue
@@ -0,0 +1,38 @@
+<script setup lang="ts">
+import {
+  getMediaType,
+  mediaTypes
+} from '@/renderer/extensions/linearMode/mediaTypes'
+import type { ResultItemImpl } from '@/stores/queueStore'
+import { cn } from '@/utils/tailwindUtil'
+
+import VideoPlayOverlay from '@/platform/assets/components/VideoPlayOverlay.vue'
+
+const { output } = defineProps<{
+  output: ResultItemImpl
+}>()
+</script>
+<template>
+  <img
+    v-if="getMediaType(output) === 'images'"
+    class="block size-10 rounded-sm bg-secondary-background object-cover"
+    loading="lazy"
+    width="40"
+    height="40"
+    :src="output.url"
+  />
+  <template v-else-if="getMediaType(output) === 'video'">
+    <video
+      class="pointer-events-none block size-10 rounded-sm bg-secondary-background object-cover"
+      preload="metadata"
+      width="40"
+      height="40"
+      :src="output.url"
+    />
+    <VideoPlayOverlay size="sm" />
+  </template>
+  <i
+    v-else
+    :class="cn(mediaTypes[getMediaType(output)]?.iconClass, 'block size-10')"
+  />
+</template>
diff --git a/src/renderer/extensions/linearMode/OutputPreviewItem.vue b/src/renderer/extensions/linearMode/OutputPreviewItem.vue
new file mode 100644
index 0000000000..7f252726e5
--- /dev/null
+++ b/src/renderer/extensions/linearMode/OutputPreviewItem.vue
@@ -0,0 +1,18 @@
+<script setup lang="ts">
+import LinearProgressBar from '@/renderer/extensions/linearMode/LinearProgressBar.vue'
+
+const { latentPreview } = defineProps<{
+  latentPreview?: string
+}>()
+</script>
+<template>
+  <div class="w-10">
+    <img
+      v-if="latentPreview"
+      class="block size-10 rounded-sm object-cover"
+      :src="latentPreview"
+    />
+    <div v-else class="skeleton-shimmer size-10 rounded-sm" />
+    <LinearProgressBar class="mt-1 h-1 w-10" rounded />
+  </div>
+</template>
diff --git a/src/renderer/extensions/linearMode/Preview3d.vue b/src/renderer/extensions/linearMode/Preview3d.vue
new file mode 100644
index 0000000000..2c4f02d861
--- /dev/null
+++ b/src/renderer/extensions/linearMode/Preview3d.vue
@@ -0,0 +1,56 @@
+<script setup lang="ts">
+import { ref, useTemplateRef, watch } from 'vue'
+
+import Load3DControls from '@/components/load3d/Load3DControls.vue'
+import AnimationControls from '@/components/load3d/controls/AnimationControls.vue'
+import { useLoad3dViewer } from '@/composables/useLoad3dViewer'
+
+const { modelUrl } = defineProps<{
+  modelUrl: string
+}>()
+
+const containerRef = useTemplateRef('containerRef')
+
+const viewer = ref(useLoad3dViewer())
+
+watch([containerRef, () => modelUrl], async () => {
+  if (!containerRef.value || !modelUrl) return
+
+  await viewer.value.initializeStandaloneViewer(containerRef.value, modelUrl)
+})
+
+//TODO: refactor to add control buttons
+</script>
+<template>
+  <div
+    ref="containerRef"
+    class="relative size-full self-center md:w-[calc(100%-150px)]"
+    @mouseenter="viewer.handleMouseEnter"
+    @mouseleave="viewer.handleMouseLeave"
+    @resize="viewer.handleResize"
+  >
+    <div class="pointer-events-none absolute top-0 left-0 size-full">
+      <Load3DControls
+        v-model:scene-config="viewer"
+        v-model:model-config="viewer"
+        v-model:camera-config="viewer"
+        v-model:light-config="viewer"
+        :is-splat-model="viewer.isSplatModel"
+        :is-ply-model="viewer.isPlyModel"
+        :has-skeleton="viewer.hasSkeleton"
+        @update-background-image="viewer.handleBackgroundImageUpdate"
+        @export-model="viewer.exportModel"
+      />
+      <AnimationControls
+        v-if="viewer.animations && viewer.animations.length > 0"
+        v-model:animations="viewer.animations"
+        v-model:playing="viewer.playing"
+        v-model:selected-speed="viewer.selectedSpeed"
+        v-model:selected-animation="viewer.selectedAnimation"
+        v-model:animation-progress="viewer.animationProgress"
+        v-model:animation-duration="viewer.animationDuration"
+        @seek="viewer.handleSeek"
+      />
+    </div>
+  </div>
+</template>
diff --git a/src/renderer/extensions/linearMode/VideoPreview.vue b/src/renderer/extensions/linearMode/VideoPreview.vue
new file mode 100644
index 0000000000..76bf6c053d
--- /dev/null
+++ b/src/renderer/extensions/linearMode/VideoPreview.vue
@@ -0,0 +1,27 @@
+<script setup lang="ts">
+import { ref, useTemplateRef } from 'vue'
+
+const { src } = defineProps<{
+  src: string
+}>()
+
+const videoRef = useTemplateRef('videoRef')
+const width = ref('')
+const height = ref('')
+</script>
+<template>
+  <video
+    ref="videoRef"
+    :src
+    controls
+    v-bind="$attrs"
+    @loadedmetadata="
+      () => {
+        if (!videoRef) return
+        width = `${videoRef.videoWidth}`
+        height = `${videoRef.videoHeight}`
+      }
+    "
+  />
+  <span class="z-10 self-center" v-text="`${width} x ${height}`" />
+</template>
diff --git a/src/renderer/extensions/linearMode/flattenNodeOutput.test.ts b/src/renderer/extensions/linearMode/flattenNodeOutput.test.ts
new file mode 100644
index 0000000000..9233d01eb5
--- /dev/null
+++ b/src/renderer/extensions/linearMode/flattenNodeOutput.test.ts
@@ -0,0 +1,85 @@
+import { describe, expect, it } from 'vitest'
+
+import { flattenNodeOutput } from '@/renderer/extensions/linearMode/flattenNodeOutput'
+import type { NodeExecutionOutput } from '@/schemas/apiSchema'
+
+function makeOutput(
+  overrides: Partial<NodeExecutionOutput> = {}
+): NodeExecutionOutput {
+  return { ...overrides }
+}
+
+describe(flattenNodeOutput, () => {
+  it('returns empty array for output with no known media types', () => {
+    const result = flattenNodeOutput(['1', makeOutput({ text: 'hello' })])
+    expect(result).toEqual([])
+  })
+
+  it('flattens images into ResultItemImpl instances', () => {
+    const output = makeOutput({
+      images: [
+        { filename: 'a.png', subfolder: '', type: 'output' },
+        { filename: 'b.png', subfolder: 'sub', type: 'output' }
+      ]
+    })
+
+    const result = flattenNodeOutput(['42', output])
+
+    expect(result).toHaveLength(2)
+    expect(result[0].filename).toBe('a.png')
+    expect(result[0].nodeId).toBe('42')
+    expect(result[0].mediaType).toBe('images')
+    expect(result[1].filename).toBe('b.png')
+    expect(result[1].subfolder).toBe('sub')
+  })
+
+  it('flattens audio outputs', () => {
+    const output = makeOutput({
+      audio: [{ filename: 'sound.wav', subfolder: '', type: 'output' }]
+    })
+
+    const result = flattenNodeOutput([7, output])
+
+    expect(result).toHaveLength(1)
+    expect(result[0].mediaType).toBe('audio')
+    expect(result[0].nodeId).toBe(7)
+  })
+
+  it('flattens multiple media types in a single output', () => {
+    const output = makeOutput({
+      images: [{ filename: 'img.png', subfolder: '', type: 'output' }],
+      video: [{ filename: 'vid.mp4', subfolder: '', type: 'output' }]
+    })
+
+    const result = flattenNodeOutput(['1', output])
+
+    expect(result).toHaveLength(2)
+    const types = result.map((r) => r.mediaType)
+    expect(types).toContain('images')
+    expect(types).toContain('video')
+  })
+
+  it('handles gifs and 3d output types', () => {
+    const output = makeOutput({
+      gifs: [
+        { filename: 'anim.gif', subfolder: '', type: 'output' }
+      ] as NodeExecutionOutput['gifs'],
+      '3d': [
+        { filename: 'model.glb', subfolder: '', type: 'output' }
+      ] as NodeExecutionOutput['3d']
+    })
+
+    const result = flattenNodeOutput(['5', output])
+
+    expect(result).toHaveLength(2)
+    const types = result.map((r) => r.mediaType)
+    expect(types).toContain('gifs')
+    expect(types).toContain('3d')
+  })
+
+  it('ignores empty arrays', () => {
+    const output = makeOutput({ images: [], audio: [] })
+    const result = flattenNodeOutput(['1', output])
+    expect(result).toEqual([])
+  })
+})
diff --git a/src/renderer/extensions/linearMode/flattenNodeOutput.ts b/src/renderer/extensions/linearMode/flattenNodeOutput.ts
new file mode 100644
index 0000000000..ba51e515fc
--- /dev/null
+++ b/src/renderer/extensions/linearMode/flattenNodeOutput.ts
@@ -0,0 +1,20 @@
+import type { NodeExecutionOutput, ResultItem } from '@/schemas/apiSchema'
+import { ResultItemImpl } from '@/stores/queueStore'
+
+export function flattenNodeOutput([nodeId, nodeOutput]: [
+  string | number,
+  NodeExecutionOutput
+]): ResultItemImpl[] {
+  const knownOutputs: Record<string, ResultItem[]> = {}
+  if (nodeOutput.audio) knownOutputs.audio = nodeOutput.audio
+  if (nodeOutput.images) knownOutputs.images = nodeOutput.images
+  if (nodeOutput.video) knownOutputs.video = nodeOutput.video
+  if (nodeOutput.gifs) knownOutputs.gifs = nodeOutput.gifs as ResultItem[]
+  if (nodeOutput['3d']) knownOutputs['3d'] = nodeOutput['3d'] as ResultItem[]
+
+  return Object.entries(knownOutputs).flatMap(([mediaType, outputs]) =>
+    outputs.map(
+      (output) => new ResultItemImpl({ ...output, mediaType, nodeId })
+    )
+  )
+}
diff --git a/src/renderer/extensions/linearMode/linearModeTypes.ts b/src/renderer/extensions/linearMode/linearModeTypes.ts
new file mode 100644
index 0000000000..6b2d910253
--- /dev/null
+++ b/src/renderer/extensions/linearMode/linearModeTypes.ts
@@ -0,0 +1,21 @@
+import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import type { ResultItemImpl } from '@/stores/queueStore'
+
+export interface InProgressItem {
+  id: string
+  jobId: string
+  state: 'skeleton' | 'latent' | 'image'
+  latentPreviewUrl?: string
+  output?: ResultItemImpl
+}
+
+export interface OutputSelection {
+  asset?: AssetItem
+  output?: ResultItemImpl
+  canShowPreview: boolean
+  latentPreviewUrl?: string
+}
+
+export type SelectionValue =
+  | { id: string; kind: 'inProgress'; itemId: string }
+  | { id: string; kind: 'history'; assetId: string; key: number }
diff --git a/src/renderer/extensions/linearMode/linearOutputStore.test.ts b/src/renderer/extensions/linearMode/linearOutputStore.test.ts
new file mode 100644
index 0000000000..c83e1080be
--- /dev/null
+++ b/src/renderer/extensions/linearMode/linearOutputStore.test.ts
@@ -0,0 +1,754 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { ref } from 'vue'
+
+import { useLinearOutputStore } from '@/renderer/extensions/linearMode/linearOutputStore'
+import type { ExecutedWsMessage } from '@/schemas/apiSchema'
+import { ResultItemImpl } from '@/stores/queueStore'
+
+const activeJobIdRef = ref<string | null>(null)
+const previewsRef = ref<Record<string, { url: string; nodeId?: string }>>({})
+const isAppModeRef = ref(true)
+const activeWorkflowPathRef = ref<string>('workflows/test-workflow.json')
+const jobIdToWorkflowPathRef = ref(new Map<string, string>())
+const selectedOutputsRef = ref<string[]>([])
+
+const { apiTarget } = vi.hoisted(() => ({
+  apiTarget: new EventTarget()
+}))
+
+vi.mock('@/composables/useAppMode', () => ({
+  useAppMode: () => ({
+    isAppMode: isAppModeRef
+  })
+}))
+
+vi.mock('@/stores/appModeStore', () => ({
+  useAppModeStore: () => ({
+    get selectedOutputs() {
+      return selectedOutputsRef.value
+    }
+  })
+}))
+
+vi.mock('@/stores/executionStore', () => ({
+  useExecutionStore: () => ({
+    get activeJobId() {
+      return activeJobIdRef.value
+    },
+    get jobIdToSessionWorkflowPath() {
+      return jobIdToWorkflowPathRef.value
+    }
+  })
+}))
+
+vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
+  useWorkflowStore: () => ({
+    get activeWorkflow() {
+      return { path: activeWorkflowPathRef.value }
+    }
+  })
+}))
+
+vi.mock('@/stores/jobPreviewStore', () => ({
+  useJobPreviewStore: () => ({
+    get nodePreviewsByPromptId() {
+      return previewsRef.value
+    }
+  })
+}))
+
+vi.mock('@/scripts/api', () => ({
+  api: Object.assign(apiTarget, {
+    apiURL: (path: string) => path
+  })
+}))
+
+vi.mock('@/renderer/extensions/linearMode/flattenNodeOutput', () => ({
+  flattenNodeOutput: ([nodeId, output]: [
+    string | number,
+    Record<string, unknown>
+  ]) => {
+    if (!output.images) return []
+    return (output.images as Array<Record<string, string>>).map(
+      (img) =>
+        new ResultItemImpl({
+          ...img,
+          nodeId: String(nodeId),
+          mediaType: 'images'
+        })
+    )
+  }
+}))
+
+function setJobWorkflowPath(jobId: string, path: string) {
+  const next = new Map(jobIdToWorkflowPathRef.value)
+  next.set(jobId, path)
+  jobIdToWorkflowPathRef.value = next
+}
+
+function makeExecutedDetail(
+  promptId: string,
+  images: Array<Record<string, string>> = [
+    { filename: 'out.png', subfolder: '', type: 'output' }
+  ],
+  nodeId = '1'
+): ExecutedWsMessage {
+  return {
+    prompt_id: promptId,
+    node: nodeId,
+    display_node: nodeId,
+    output: { images }
+  } as ExecutedWsMessage
+}
+
+describe('linearOutputStore', () => {
+  beforeEach(() => {
+    setActivePinia(createPinia())
+    activeJobIdRef.value = null
+    previewsRef.value = {}
+    isAppModeRef.value = true
+    activeWorkflowPathRef.value = 'workflows/test-workflow.json'
+    jobIdToWorkflowPathRef.value = new Map()
+    selectedOutputsRef.value = []
+  })
+
+  it('creates a skeleton item when a job starts', () => {
+    const store = useLinearOutputStore()
+    store.onJobStart('job-1')
+
+    expect(store.inProgressItems).toHaveLength(1)
+    expect(store.inProgressItems[0].state).toBe('skeleton')
+    expect(store.inProgressItems[0].jobId).toBe('job-1')
+  })
+
+  it('auto-selects skeleton on first job start when no selection', () => {
+    const store = useLinearOutputStore()
+    store.onJobStart('job-1')
+
+    expect(store.selectedId).toBe(`slot:${store.inProgressItems[0].id}`)
+  })
+
+  it('transitions to latent on preview', () => {
+    vi.useFakeTimers()
+    const store = useLinearOutputStore()
+    store.onJobStart('job-1')
+
+    const itemId = store.inProgressItems[0].id
+    store.onLatentPreview('job-1', 'blob:preview')
+    vi.advanceTimersByTime(16)
+
+    expect(store.inProgressItems[0].state).toBe('latent')
+    expect(store.inProgressItems[0].latentPreviewUrl).toBe('blob:preview')
+    expect(store.selectedId).toBe(`slot:${itemId}`)
+    vi.useRealTimers()
+  })
+
+  it('ignores latent preview for other jobs', () => {
+    const store = useLinearOutputStore()
+    store.onJobStart('job-1')
+
+    store.onLatentPreview('job-other', 'blob:preview')
+
+    expect(store.inProgressItems[0].state).toBe('skeleton')
+  })
+
+  it('transitions to image on executed event', () => {
+    const store = useLinearOutputStore()
+    store.onJobStart('job-1')
+
+    store.onNodeExecuted('job-1', makeExecutedDetail('job-1'))
+
+    const imageItems = store.inProgressItems.filter((i) => i.state === 'image')
+    expect(imageItems).toHaveLength(1)
+    expect(imageItems[0].output).toBeDefined()
+  })
+
+  it('does not create trailing skeleton after executed output', () => {
+    const store = useLinearOutputStore()
+    store.onJobStart('job-1')
+
+    store.onNodeExecuted('job-1', makeExecutedDetail('job-1'))
+
+    expect(store.inProgressItems).toHaveLength(1)
+    expect(store.inProgressItems[0].state).toBe('image')
+  })
+
+  it('handles multi-output executed events', () => {
+    const store = useLinearOutputStore()
+    store.onJobStart('job-1')
+
+    store.onNodeExecuted(
+      'job-1',
+      makeExecutedDetail('job-1', [
+        { filename: 'a.png', subfolder: '', type: 'output' },
+        { filename: 'b.png', subfolder: '', type: 'output' }
+      ])
+    )
+
+    const imageItems = store.inProgressItems.filter((i) => i.state === 'image')
+    expect(imageItems).toHaveLength(2)
+  })
+
+  it('removes slots when job ends without image outputs', () => {
+    const store = useLinearOutputStore()
+    store.onJobStart('job-1')
+    expect(store.inProgressItems).toHaveLength(1)
+
+    store.onJobComplete('job-1')
+
+    expect(store.inProgressItems).toHaveLength(0)
+    expect(store.pendingResolve.size).toBe(0)
+  })
+
+  it('adds to pendingResolve when job completes with images', () => {
+    const store = useLinearOutputStore()
+    store.onJobStart('job-1')
+
+    store.onNodeExecuted('job-1', makeExecutedDetail('job-1'))
+
+    store.onJobComplete('job-1')
+
+    expect(store.inProgressItems.length).toBeGreaterThan(0)
+    expect(store.pendingResolve.has('job-1')).toBe(true)
+  })
+
+  it('removes items when history resolves', () => {
+    const store = useLinearOutputStore()
+    store.onJobStart('job-1')
+
+    store.onNodeExecuted('job-1', makeExecutedDetail('job-1'))
+
+    store.onJobComplete('job-1')
+    expect(store.inProgressItems.length).toBeGreaterThan(0)
+
+    store.resolveIfReady('job-1', true)
+
+    expect(store.inProgressItems).toHaveLength(0)
+    expect(store.pendingResolve.has('job-1')).toBe(false)
+  })
+
+  it('does not resolve if history has not arrived', () => {
+    const store = useLinearOutputStore()
+    store.onJobStart('job-1')
+
+    store.onNodeExecuted('job-1', makeExecutedDetail('job-1'))
+
+    store.onJobComplete('job-1')
+
+    store.resolveIfReady('job-1', false)
+
+    expect(store.inProgressItems.length).toBeGreaterThan(0)
+    expect(store.pendingResolve.has('job-1')).toBe(true)
+  })
+
+  it('does not auto-select when user is browsing history', () => {
+    const store = useLinearOutputStore()
+
+    // User manually selects a history item (browsing)
+    store.select('history:asset-2:0')
+
+    store.onJobStart('job-1')
+
+    // Should NOT yank to in-progress — user is browsing
+    expect(store.selectedId).toBe('history:asset-2:0')
+
+    store.onLatentPreview('job-1', 'blob:preview')
+
+    // Still should NOT yank
+    expect(store.selectedId).toBe('history:asset-2:0')
+  })
+
+  it('auto-selects on new job when following latest', () => {
+    const store = useLinearOutputStore()
+
+    // selectAsLatest simulates "following the latest output"
+    store.selectAsLatest('history:asset-1:0')
+
+    store.onJobStart('job-1')
+
+    // Following latest → auto-select new skeleton
+    expect(store.selectedId?.startsWith('slot:')).toBe(true)
+  })
+
+  it('does not auto-select on new job when browsing history', () => {
+    const store = useLinearOutputStore()
+    store.onJobStart('job-1')
+
+    // User manually browses to an older output
+    store.select('history:asset-1:0')
+
+    store.onJobStart('job-2')
+
+    // Should NOT auto-select — user is browsing
+    expect(store.selectedId).toBe('history:asset-1:0')
+  })
+
+  it('falls back selection when selected item is removed', () => {
+    const store = useLinearOutputStore()
+    store.onJobStart('job-1')
+    const firstId = `slot:${store.inProgressItems[0].id}`
+    expect(store.selectedId).toBe(firstId)
+
+    store.onJobComplete('job-1')
+
+    // Skeleton removed, no images, should clear selection
+    expect(store.selectedId).toBeNull()
+  })
+
+  it('creates skeleton on-demand when latent arrives after execute', () => {
+    vi.useFakeTimers()
+    const store = useLinearOutputStore()
+    store.onJobStart('job-1')
+    store.onNodeExecuted('job-1', makeExecutedDetail('job-1'))
+
+    // No skeleton after execute
+    expect(
+      store.inProgressItems.filter((i) => i.state === 'skeleton')
+    ).toHaveLength(0)
+
+    // Next node sends latent preview — skeleton created on demand
+    store.onLatentPreview('job-1', 'blob:next')
+    vi.advanceTimersByTime(16)
+
+    expect(store.inProgressItems[0].state).toBe('latent')
+    expect(store.inProgressItems[0].latentPreviewUrl).toBe('blob:next')
+    expect(store.inProgressItems).toHaveLength(2)
+    vi.useRealTimers()
+  })
+
+  it('handles execute without prior skeleton (no latent preview)', () => {
+    const store = useLinearOutputStore()
+    store.onJobStart('job-1')
+
+    // First node executes (consumes initial skeleton)
+    store.onNodeExecuted('job-1', makeExecutedDetail('job-1'))
+    expect(store.inProgressItems).toHaveLength(1)
+
+    // Second node executes directly (no latent, no skeleton)
+    store.onNodeExecuted(
+      'job-1',
+      makeExecutedDetail('job-1', [
+        { filename: 'b.png', subfolder: '', type: 'output' }
+      ])
+    )
+
+    const images = store.inProgressItems.filter((i) => i.state === 'image')
+    expect(images).toHaveLength(2)
+  })
+
+  it('does not fall back selection to stale items from other jobs', () => {
+    const store = useLinearOutputStore()
+
+    // Job 1 starts but is never completed (simulates watcher bug)
+    store.onJobStart('job-1')
+    store.onNodeExecuted('job-1', makeExecutedDetail('job-1'))
+
+    // Job 2 starts directly
+    store.onJobStart('job-2')
+    store.onNodeExecuted('job-2', makeExecutedDetail('job-2'))
+    store.onJobComplete('job-2')
+
+    // Resolve job-2
+    store.resolveIfReady('job-2', true)
+
+    // Should clear to null for history takeover, NOT fall back to job-1
+    expect(store.selectedId).toBeNull()
+  })
+
+  it('transitions to latent via previews watcher', async () => {
+    vi.useFakeTimers()
+    const { nextTick } = await import('vue')
+    const store = useLinearOutputStore()
+
+    activeJobIdRef.value = 'job-1'
+    await nextTick()
+
+    expect(store.inProgressItems).toHaveLength(1)
+    expect(store.inProgressItems[0].state).toBe('skeleton')
+
+    // Simulate jobPreviewStore update
+    previewsRef.value = {
+      'job-1': { url: 'blob:preview-1', nodeId: 'node-1' }
+    }
+    await nextTick()
+    vi.advanceTimersByTime(16)
+
+    expect(store.inProgressItems[0].state).toBe('latent')
+    expect(store.inProgressItems[0].latentPreviewUrl).toBe('blob:preview-1')
+    vi.useRealTimers()
+  })
+
+  it('completes previous job on direct job transition', async () => {
+    const { nextTick } = await import('vue')
+    const store = useLinearOutputStore()
+
+    activeJobIdRef.value = 'job-1'
+    await nextTick()
+
+    store.onNodeExecuted('job-1', makeExecutedDetail('job-1'))
+
+    // Direct transition: job-1 → job-2 (no null in between)
+    activeJobIdRef.value = 'job-2'
+    await nextTick()
+
+    // job-1 should have been completed
+    expect(store.pendingResolve.has('job-1')).toBe(true)
+    // job-2 should have started
+    expect(store.inProgressItems.some((i) => i.jobId === 'job-2')).toBe(true)
+  })
+
+  it('two sequential runs: selection clears after each resolve', () => {
+    const store = useLinearOutputStore()
+
+    // Run 1: 3 outputs
+    store.onJobStart('job-1')
+    store.onNodeExecuted('job-1', makeExecutedDetail('job-1'))
+    store.onNodeExecuted(
+      'job-1',
+      makeExecutedDetail('job-1', [
+        { filename: 'b.png', subfolder: '', type: 'output' }
+      ])
+    )
+    store.onNodeExecuted(
+      'job-1',
+      makeExecutedDetail('job-1', [
+        { filename: 'c.png', subfolder: '', type: 'output' }
+      ])
+    )
+
+    const run1Images = store.inProgressItems.filter((i) => i.state === 'image')
+    expect(run1Images).toHaveLength(3)
+
+    store.onJobComplete('job-1')
+    store.resolveIfReady('job-1', true)
+    expect(store.selectedId).toBeNull()
+    expect(store.inProgressItems).toHaveLength(0)
+
+    // Simulate OutputHistory selecting run 1's first output (following latest)
+    store.selectAsLatest('history:asset-run1:0')
+
+    // Run 2: 3 outputs
+    store.onJobStart('job-2')
+    store.onNodeExecuted('job-2', makeExecutedDetail('job-2'))
+    store.onNodeExecuted(
+      'job-2',
+      makeExecutedDetail('job-2', [
+        { filename: 'e.png', subfolder: '', type: 'output' }
+      ])
+    )
+    store.onNodeExecuted(
+      'job-2',
+      makeExecutedDetail('job-2', [
+        { filename: 'f.png', subfolder: '', type: 'output' }
+      ])
+    )
+
+    const run2Images = store.inProgressItems.filter((i) => i.state === 'image')
+    expect(run2Images).toHaveLength(3)
+    // Selection on run 2's latest output, not run 1's
+    expect(store.selectedId).toBe(`slot:${run2Images[0].id}`)
+
+    store.onJobComplete('job-2')
+    store.resolveIfReady('job-2', true)
+
+    // Must be null for history takeover — not a stale item
+    expect(store.selectedId).toBeNull()
+    expect(store.inProgressItems).toHaveLength(0)
+  })
+
+  it('keeps items visible across multiple resolveIfReady calls until loaded', () => {
+    const store = useLinearOutputStore()
+    store.onJobStart('job-1')
+    store.onNodeExecuted('job-1', makeExecutedDetail('job-1'))
+    store.onNodeExecuted(
+      'job-1',
+      makeExecutedDetail('job-1', [
+        { filename: 'b.png', subfolder: '', type: 'output' }
+      ])
+    )
+    store.onJobComplete('job-1')
+
+    // History asset exists but outputs not loaded yet (async)
+    store.resolveIfReady('job-1', false)
+    expect(store.inProgressItems).toHaveLength(2)
+    expect(store.pendingResolve.has('job-1')).toBe(true)
+
+    // Still not loaded on next check
+    store.resolveIfReady('job-1', false)
+    expect(store.inProgressItems).toHaveLength(2)
+
+    // Outputs finally loaded
+    store.resolveIfReady('job-1', true)
+    expect(store.inProgressItems).toHaveLength(0)
+    expect(store.pendingResolve.has('job-1')).toBe(false)
+  })
+
+  it('does not remove in-progress items while history outputs are loading', () => {
+    const store = useLinearOutputStore()
+    store.onJobStart('job-1')
+    store.onNodeExecuted('job-1', makeExecutedDetail('job-1'))
+    store.onNodeExecuted(
+      'job-1',
+      makeExecutedDetail('job-1', [
+        { filename: 'b.png', subfolder: '', type: 'output' }
+      ])
+    )
+    store.onNodeExecuted(
+      'job-1',
+      makeExecutedDetail('job-1', [
+        { filename: 'c.png', subfolder: '', type: 'output' }
+      ])
+    )
+    store.onJobComplete('job-1')
+
+    const itemCount = store.inProgressItems.length
+    expect(itemCount).toBe(3)
+
+    // History asset arrived but allOutputs() returns [] (still loading).
+    // Caller passes false — items must stay visible to prevent a gap
+    // where neither in-progress nor history items are rendered.
+    store.resolveIfReady('job-1', false)
+    expect(store.inProgressItems).toHaveLength(itemCount)
+
+    // Once allOutputs() loads, caller passes true — safe to resolve
+    store.resolveIfReady('job-1', true)
+    expect(store.inProgressItems).toHaveLength(0)
+  })
+
+  it('discards latent previews for already-executed nodes', () => {
+    vi.useFakeTimers()
+    const store = useLinearOutputStore()
+    store.onJobStart('job-1')
+
+    // Node 1 sends latent then executes
+    store.onLatentPreview('job-1', 'blob:node1-latent', '1')
+    vi.advanceTimersByTime(16)
+    store.onNodeExecuted('job-1', makeExecutedDetail('job-1', undefined, '1'))
+
+    // Stale latent for node 1 arrives after it already executed
+    store.onLatentPreview('job-1', 'blob:node1-stale', '1')
+    vi.advanceTimersByTime(16)
+
+    // Should not create a new latent item for the executed node
+    expect(
+      store.inProgressItems.filter((i) => i.state === 'latent')
+    ).toHaveLength(0)
+    vi.useRealTimers()
+  })
+
+  it('accepts latent previews for new nodes after prior node executed', () => {
+    vi.useFakeTimers()
+    const store = useLinearOutputStore()
+    store.onJobStart('job-1')
+
+    // Node 1 executes
+    store.onNodeExecuted('job-1', makeExecutedDetail('job-1', undefined, '1'))
+
+    // Node 2 sends latent preview — should be accepted
+    store.onLatentPreview('job-1', 'blob:node2-latent', '2')
+    vi.advanceTimersByTime(16)
+
+    expect(
+      store.inProgressItems.filter((i) => i.state === 'latent')
+    ).toHaveLength(1)
+    expect(store.inProgressItems[0].latentPreviewUrl).toBe('blob:node2-latent')
+    vi.useRealTimers()
+  })
+
+  it('cancels pending RAF when a node executes', () => {
+    vi.useFakeTimers()
+    const store = useLinearOutputStore()
+    store.onJobStart('job-1')
+
+    // Latent preview scheduled in RAF
+    store.onLatentPreview('job-1', 'blob:node1-latent')
+    // Node executes before RAF fires — should cancel it
+    store.onNodeExecuted('job-1', makeExecutedDetail('job-1', undefined, '1'))
+    vi.advanceTimersByTime(16)
+
+    // Only the image item, no latent
+    expect(
+      store.inProgressItems.filter((i) => i.state === 'latent')
+    ).toHaveLength(0)
+    expect(
+      store.inProgressItems.filter((i) => i.state === 'image')
+    ).toHaveLength(1)
+    vi.useRealTimers()
+  })
+
+  it('discards latent previews arriving after job completion', () => {
+    vi.useFakeTimers()
+    const store = useLinearOutputStore()
+    store.onJobStart('job-1')
+    store.onNodeExecuted('job-1', makeExecutedDetail('job-1'))
+
+    // Latent preview scheduled in RAF before job completes
+    store.onLatentPreview('job-1', 'blob:late')
+    store.onJobComplete('job-1')
+
+    // RAF fires after completion — should be cancelled
+    vi.advanceTimersByTime(16)
+
+    // No new latent items should have been created
+    expect(
+      store.inProgressItems.filter((i) => i.state === 'latent')
+    ).toHaveLength(0)
+    vi.useRealTimers()
+  })
+
+  it('discards latent previews for completed job after RAF', () => {
+    vi.useFakeTimers()
+    const store = useLinearOutputStore()
+    store.onJobStart('job-1')
+    store.onNodeExecuted('job-1', makeExecutedDetail('job-1'))
+    store.onJobComplete('job-1')
+
+    // Late preview arrives after job already completed
+    store.onLatentPreview('job-1', 'blob:very-late')
+    vi.advanceTimersByTime(16)
+
+    expect(
+      store.inProgressItems.filter((i) => i.state === 'latent')
+    ).toHaveLength(0)
+    vi.useRealTimers()
+  })
+
+  it('ignores executed events for other jobs', () => {
+    const store = useLinearOutputStore()
+    store.onJobStart('job-1')
+
+    store.onNodeExecuted('job-other', makeExecutedDetail('job-other'))
+
+    expect(store.inProgressItems.every((i) => i.state === 'skeleton')).toBe(
+      true
+    )
+  })
+
+  it('resets state when leaving app mode', async () => {
+    const { nextTick } = await import('vue')
+    const store = useLinearOutputStore()
+
+    store.onJobStart('job-1')
+    store.onNodeExecuted('job-1', makeExecutedDetail('job-1'))
+    store.select('slot:some-id')
+    expect(store.inProgressItems.length).toBeGreaterThan(0)
+
+    isAppModeRef.value = false
+    await nextTick()
+
+    expect(store.inProgressItems).toHaveLength(0)
+    expect(store.selectedId).toBeNull()
+    expect(store.pendingResolve.size).toBe(0)
+  })
+
+  it('does not show in-progress items from another workflow', () => {
+    const store = useLinearOutputStore()
+
+    // Job-1 submitted from workflow-a
+    activeWorkflowPathRef.value = 'workflows/app-a.json'
+    setJobWorkflowPath('job-1', 'workflows/app-a.json')
+    store.onJobStart('job-1')
+
+    // User switches to workflow-b: job-1 should NOT appear
+    activeWorkflowPathRef.value = 'workflows/app-b.json'
+    expect(store.activeWorkflowInProgressItems).toHaveLength(0)
+
+    // Back on workflow-a: job-1 should appear
+    activeWorkflowPathRef.value = 'workflows/app-a.json'
+    expect(store.activeWorkflowInProgressItems).toHaveLength(1)
+    expect(store.activeWorkflowInProgressItems[0].jobId).toBe('job-1')
+  })
+
+  it('uses executionStore path map for workflow scoping', () => {
+    const store = useLinearOutputStore()
+
+    // Simulate storeJob populating executionStore.jobIdToSessionWorkflowPath
+    setJobWorkflowPath('job-1', 'workflows/app-a.json')
+    setJobWorkflowPath('job-2', 'workflows/app-a.json')
+
+    // User switches to workflow-b before execution starts
+    activeWorkflowPathRef.value = 'workflows/app-b.json'
+
+    store.onJobStart('job-1')
+    store.onJobStart('job-2')
+
+    // On workflow-b: neither job should appear
+    expect(store.activeWorkflowInProgressItems).toHaveLength(0)
+
+    // On workflow-a: both jobs should appear
+    activeWorkflowPathRef.value = 'workflows/app-a.json'
+    expect(store.activeWorkflowInProgressItems).toHaveLength(2)
+  })
+
+  it('scopes in-progress items per workflow with concurrent jobs', () => {
+    vi.useFakeTimers()
+    const store = useLinearOutputStore()
+
+    // Job-1 on workflow-a (dog)
+    activeWorkflowPathRef.value = 'workflows/app-a.json'
+    setJobWorkflowPath('job-1', 'workflows/app-a.json')
+    store.onJobStart('job-1')
+    store.onLatentPreview('job-1', 'blob:dog')
+    vi.advanceTimersByTime(16)
+
+    // User switches to workflow-b, runs job-2
+    activeWorkflowPathRef.value = 'workflows/app-b.json'
+    setJobWorkflowPath('job-2', 'workflows/app-b.json')
+
+    // Job-1 finishes, job-2 starts
+    store.onJobComplete('job-1')
+    store.onJobStart('job-2')
+    store.onLatentPreview('job-2', 'blob:landscape')
+    vi.advanceTimersByTime(16)
+
+    // On workflow-b: should only see job-2 (landscape), NOT job-1 (dog)
+    const items = store.activeWorkflowInProgressItems
+    expect(items).toHaveLength(1)
+    expect(items[0].jobId).toBe('job-2')
+    expect(items[0].latentPreviewUrl).toBe('blob:landscape')
+    vi.useRealTimers()
+  })
+
+  it('skips output items for nodes not in selectedOutputs', () => {
+    selectedOutputsRef.value = ['2']
+    const store = useLinearOutputStore()
+    store.onJobStart('job-1')
+
+    // Node 1 executes — not in selectedOutputs, should be skipped
+    store.onNodeExecuted('job-1', makeExecutedDetail('job-1', undefined, '1'))
+
+    // Skeleton should still be there (not consumed by non-output node)
+    expect(
+      store.inProgressItems.filter((i) => i.state === 'image')
+    ).toHaveLength(0)
+
+    // Node 2 executes — in selectedOutputs, should create image item
+    store.onNodeExecuted(
+      'job-1',
+      makeExecutedDetail(
+        'job-1',
+        [{ filename: 'out.png', subfolder: '', type: 'output' }],
+        '2'
+      )
+    )
+
+    const imageItems = store.inProgressItems.filter((i) => i.state === 'image')
+    expect(imageItems).toHaveLength(1)
+    expect(imageItems[0].output?.nodeId).toBe('2')
+  })
+
+  it('ignores execution events when not in app mode', async () => {
+    const { nextTick } = await import('vue')
+    const store = useLinearOutputStore()
+
+    isAppModeRef.value = false
+    await nextTick()
+
+    // Watcher-driven job start should be ignored
+    activeJobIdRef.value = 'job-1'
+    await nextTick()
+
+    expect(store.inProgressItems).toHaveLength(0)
+  })
+})
diff --git a/src/renderer/extensions/linearMode/linearOutputStore.ts b/src/renderer/extensions/linearMode/linearOutputStore.ts
new file mode 100644
index 0000000000..fdc03387b6
--- /dev/null
+++ b/src/renderer/extensions/linearMode/linearOutputStore.ts
@@ -0,0 +1,313 @@
+import { defineStore } from 'pinia'
+import { computed, ref, shallowRef, watch } from 'vue'
+
+import { useAppMode } from '@/composables/useAppMode'
+import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
+import { flattenNodeOutput } from '@/renderer/extensions/linearMode/flattenNodeOutput'
+import type { InProgressItem } from '@/renderer/extensions/linearMode/linearModeTypes'
+import type { ResultItemImpl } from '@/stores/queueStore'
+import type { ExecutedWsMessage } from '@/schemas/apiSchema'
+import { api } from '@/scripts/api'
+import { useAppModeStore } from '@/stores/appModeStore'
+import { useExecutionStore } from '@/stores/executionStore'
+import { useJobPreviewStore } from '@/stores/jobPreviewStore'
+
+export const useLinearOutputStore = defineStore('linearOutput', () => {
+  const { isAppMode } = useAppMode()
+  const appModeStore = useAppModeStore()
+  const executionStore = useExecutionStore()
+  const jobPreviewStore = useJobPreviewStore()
+  const workflowStore = useWorkflowStore()
+
+  const inProgressItems = ref<InProgressItem[]>([])
+  const resolvedOutputsCache = new Map<string, ResultItemImpl[]>()
+  const selectedId = ref<string | null>(null)
+  const isFollowing = ref(true)
+  const trackedJobId = ref<string | null>(null)
+  const pendingResolve = ref(new Set<string>())
+  const executedNodeIds = new Set<string>()
+
+  const activeWorkflowInProgressItems = computed(() => {
+    const path = workflowStore.activeWorkflow?.path
+    if (!path) return []
+    const all = inProgressItems.value
+    return all.filter(
+      (i) => executionStore.jobIdToSessionWorkflowPath.get(i.jobId) === path
+    )
+  })
+
+  let nextSeq = 0
+
+  function makeItemId(jobId: string): string {
+    return `job-${jobId}-${nextSeq++}`
+  }
+
+  function replaceItem(
+    id: string,
+    updater: (item: InProgressItem) => InProgressItem
+  ) {
+    inProgressItems.value = inProgressItems.value.map((i) =>
+      i.id === id ? updater(i) : i
+    )
+  }
+
+  // --- Actions ---
+
+  const currentSkeletonId = shallowRef<string | null>(null)
+
+  function onJobStart(jobId: string) {
+    executedNodeIds.clear()
+
+    const item: InProgressItem = {
+      id: makeItemId(jobId),
+      jobId,
+      state: 'skeleton'
+    }
+    currentSkeletonId.value = item.id
+    inProgressItems.value = [item, ...inProgressItems.value]
+
+    trackedJobId.value = jobId
+    autoSelect(`slot:${item.id}`)
+  }
+
+  let raf: number | null = null
+  function onLatentPreview(jobId: string, url: string, nodeId?: string) {
+    if (nodeId && executedNodeIds.has(nodeId)) return
+
+    // Issue in Firefox where it doesnt seem to always re-render, wrapping in RAF fixes it
+    if (raf) cancelAnimationFrame(raf)
+    raf = requestAnimationFrame(() => {
+      const existing = inProgressItems.value.find(
+        (i) => i.id === currentSkeletonId.value && i.jobId === jobId
+      )
+
+      if (existing) {
+        const wasEmpty = existing.state === 'skeleton'
+        replaceItem(existing.id, (i) => ({
+          ...i,
+          state: 'latent',
+          latentPreviewUrl: url
+        }))
+        if (wasEmpty) autoSelect(`slot:${existing.id}`)
+        return
+      }
+
+      // Only create on-demand for the tracked job
+      if (jobId !== trackedJobId.value) return
+
+      const item: InProgressItem = {
+        id: makeItemId(jobId),
+        jobId,
+        state: 'latent',
+        latentPreviewUrl: url
+      }
+      currentSkeletonId.value = item.id
+      inProgressItems.value = [item, ...inProgressItems.value]
+      autoSelect(`slot:${item.id}`)
+    })
+  }
+
+  function onNodeExecuted(jobId: string, detail: ExecutedWsMessage) {
+    const nodeId = String(detail.display_node || detail.node)
+    executedNodeIds.add(nodeId)
+    if (raf) {
+      cancelAnimationFrame(raf)
+      raf = null
+    }
+    const newOutputs = flattenNodeOutput([nodeId, detail.output])
+    if (newOutputs.length === 0) return
+
+    // Skip output items for nodes not flagged as output nodes
+    const outputNodeIds = appModeStore.selectedOutputs
+    if (
+      outputNodeIds.length > 0 &&
+      !outputNodeIds.some((id) => String(id) === String(nodeId))
+    )
+      return
+
+    const skeletonItem = inProgressItems.value.find(
+      (i) => i.id === currentSkeletonId.value && i.jobId === jobId
+    )
+
+    if (skeletonItem) {
+      const imageItem: InProgressItem = {
+        ...skeletonItem,
+        state: 'image',
+        output: newOutputs[0],
+        latentPreviewUrl: undefined
+      }
+      autoSelect(`slot:${imageItem.id}`)
+
+      const extras: InProgressItem[] = newOutputs.slice(1).map((o) => ({
+        id: makeItemId(jobId),
+        jobId,
+        state: 'image' as const,
+        output: o
+      }))
+
+      const idx = inProgressItems.value.indexOf(skeletonItem)
+      const arr = [...inProgressItems.value]
+      arr.splice(idx, 1, imageItem, ...extras)
+      currentSkeletonId.value = null
+      inProgressItems.value = arr
+      return
+    }
+
+    // No skeleton — create image items directly (only for tracked job)
+    if (jobId !== trackedJobId.value) return
+
+    const newItems: InProgressItem[] = newOutputs.map((o) => ({
+      id: makeItemId(jobId),
+      jobId,
+      state: 'image' as const,
+      output: o
+    }))
+    autoSelect(`slot:${newItems[0].id}`)
+    inProgressItems.value = [...newItems, ...inProgressItems.value]
+  }
+
+  function onJobComplete(jobId: string) {
+    if (raf) {
+      cancelAnimationFrame(raf)
+      raf = null
+    }
+    currentSkeletonId.value = null
+    if (trackedJobId.value === jobId) {
+      trackedJobId.value = null
+    }
+
+    const hasImages = inProgressItems.value.some(
+      (i) => i.jobId === jobId && i.state === 'image'
+    )
+
+    if (hasImages) {
+      // Remove non-image items (skeletons, latents), keep images for absorption
+      inProgressItems.value = inProgressItems.value.filter(
+        (i) => i.jobId !== jobId || i.state === 'image'
+      )
+      pendingResolve.value = new Set([...pendingResolve.value, jobId])
+    } else {
+      removeJobItems(jobId)
+    }
+  }
+
+  function removeJobItems(jobId: string) {
+    const removed = inProgressItems.value.filter((i) => i.jobId === jobId)
+    inProgressItems.value = inProgressItems.value.filter(
+      (i) => i.jobId !== jobId
+    )
+
+    if (
+      selectedId.value &&
+      removed.some((i) => `slot:${i.id}` === selectedId.value)
+    ) {
+      selectedId.value = null
+    }
+  }
+
+  function resolveIfReady(jobId: string, historyLoaded: boolean) {
+    if (!pendingResolve.value.has(jobId)) return
+    if (!historyLoaded) return
+
+    const next = new Set(pendingResolve.value)
+    next.delete(jobId)
+    pendingResolve.value = next
+
+    removeJobItems(jobId)
+  }
+
+  function select(id: string | null) {
+    selectedId.value = id
+    isFollowing.value = false
+  }
+
+  function selectAsLatest(id: string | null) {
+    selectedId.value = id
+    isFollowing.value = true
+  }
+
+  function autoSelect(slotId: string) {
+    const sel = selectedId.value
+    if (!sel || sel.startsWith('slot:') || isFollowing.value) {
+      selectedId.value = slotId
+      isFollowing.value = true
+      return
+    }
+    // User is browsing history — don't yank
+  }
+
+  // --- Event bindings (only active in app mode) ---
+
+  function handleExecuted({ detail }: CustomEvent<ExecutedWsMessage>) {
+    const jobId = detail.prompt_id
+    if (jobId !== executionStore.activeJobId) return
+    onNodeExecuted(jobId, detail)
+  }
+
+  function reset() {
+    if (raf) {
+      cancelAnimationFrame(raf)
+      raf = null
+    }
+    executedNodeIds.clear()
+    inProgressItems.value = []
+    selectedId.value = null
+    isFollowing.value = true
+    trackedJobId.value = null
+    currentSkeletonId.value = null
+    pendingResolve.value = new Set()
+  }
+
+  watch(
+    () => executionStore.activeJobId,
+    (jobId, oldJobId) => {
+      if (!isAppMode.value) return
+      if (oldJobId && oldJobId !== jobId) {
+        onJobComplete(oldJobId)
+      }
+      if (jobId) {
+        onJobStart(jobId)
+      }
+    }
+  )
+
+  watch(
+    () => jobPreviewStore.nodePreviewsByPromptId,
+    (previews) => {
+      if (!isAppMode.value) return
+      const jobId = executionStore.activeJobId
+      if (!jobId) return
+      const preview = previews[jobId]
+      if (preview) onLatentPreview(jobId, preview.url, preview.nodeId)
+    },
+    { deep: true }
+  )
+
+  watch(
+    isAppMode,
+    (active, wasActive) => {
+      if (active) {
+        api.addEventListener('executed', handleExecuted)
+      } else if (wasActive) {
+        api.removeEventListener('executed', handleExecuted)
+        reset()
+      }
+    },
+    { immediate: true }
+  )
+
+  return {
+    activeWorkflowInProgressItems,
+    resolvedOutputsCache,
+    selectedId,
+    pendingResolve,
+    select,
+    selectAsLatest,
+    resolveIfReady,
+    inProgressItems,
+    onJobStart,
+    onLatentPreview,
+    onNodeExecuted,
+    onJobComplete
+  }
+})
diff --git a/src/renderer/extensions/linearMode/mediaTypes.ts b/src/renderer/extensions/linearMode/mediaTypes.ts
new file mode 100644
index 0000000000..dce04f6d05
--- /dev/null
+++ b/src/renderer/extensions/linearMode/mediaTypes.ts
@@ -0,0 +1,34 @@
+import { t } from '@/i18n'
+
+import type { ResultItemImpl } from '@/stores/queueStore'
+
+type StatItem = { content?: string; iconClass?: string }
+export const mediaTypes: Record<string, StatItem> = {
+  '3d': {
+    content: t('sideToolbar.mediaAssets.filter3D'),
+    iconClass: 'icon-[lucide--box]'
+  },
+  audio: {
+    content: t('sideToolbar.mediaAssets.filterAudio'),
+    iconClass: 'icon-[lucide--audio-lines]'
+  },
+  images: {
+    content: t('sideToolbar.mediaAssets.filterImage'),
+    iconClass: 'icon-[lucide--image]'
+  },
+  text: {
+    content: t('sideToolbar.mediaAssets.filterText'),
+    iconClass: 'icon-[lucide--text]'
+  },
+  video: {
+    content: t('sideToolbar.mediaAssets.filterVideo'),
+    iconClass: 'icon-[lucide--video]'
+  }
+}
+
+export function getMediaType(output?: ResultItemImpl) {
+  if (!output) return ''
+  if (output.isVideo) return 'video'
+  if (output.isImage) return 'images'
+  return output.mediaType
+}
diff --git a/src/renderer/extensions/linearMode/useOutputHistory.test.ts b/src/renderer/extensions/linearMode/useOutputHistory.test.ts
new file mode 100644
index 0000000000..bd514cdc55
--- /dev/null
+++ b/src/renderer/extensions/linearMode/useOutputHistory.test.ts
@@ -0,0 +1,381 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { nextTick, ref } from 'vue'
+
+import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import type { InProgressItem } from '@/renderer/extensions/linearMode/linearModeTypes'
+import { useOutputHistory } from '@/renderer/extensions/linearMode/useOutputHistory'
+import { useAppModeStore } from '@/stores/appModeStore'
+import { ResultItemImpl } from '@/stores/queueStore'
+
+const mediaRef = ref<AssetItem[]>([])
+const pendingResolveRef = ref(new Set<string>())
+const inProgressItemsRef = ref<InProgressItem[]>([])
+const selectedIdRef = ref<string | null>(null)
+const activeWorkflowPathRef = ref<string>('workflows/test.json')
+const jobIdToPathRef = ref(new Map<string, string>())
+
+const selectAsLatestFn = vi.fn()
+const resolveIfReadyFn = vi.fn()
+const resolvedOutputsCacheRef = new Map<string, ResultItemImpl[]>()
+
+vi.mock('@/platform/assets/composables/media/useMediaAssets', () => ({
+  useMediaAssets: () => ({
+    media: mediaRef,
+    loading: ref(false),
+    error: ref(null),
+    fetchMediaList: vi.fn().mockResolvedValue([]),
+    refresh: vi.fn().mockResolvedValue([]),
+    loadMore: vi.fn(),
+    hasMore: ref(false),
+    isLoadingMore: ref(false)
+  })
+}))
+
+vi.mock('@/renderer/extensions/linearMode/linearOutputStore', () => ({
+  useLinearOutputStore: () => ({
+    get pendingResolve() {
+      return pendingResolveRef.value
+    },
+    get inProgressItems() {
+      return inProgressItemsRef.value
+    },
+    get selectedId() {
+      return selectedIdRef.value
+    },
+    resolvedOutputsCache: resolvedOutputsCacheRef,
+    selectAsLatest: selectAsLatestFn,
+    resolveIfReady: resolveIfReadyFn
+  })
+}))
+
+vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
+  useWorkflowStore: () => ({
+    get activeWorkflow() {
+      return { path: activeWorkflowPathRef.value }
+    }
+  })
+}))
+
+vi.mock('@/stores/executionStore', () => ({
+  useExecutionStore: () => ({
+    get jobIdToSessionWorkflowPath() {
+      return jobIdToPathRef.value
+    }
+  })
+}))
+
+const { jobDetailResults } = vi.hoisted(() => ({
+  jobDetailResults: new Map<string, unknown>()
+}))
+
+vi.mock('@/services/jobOutputCache', () => ({
+  getJobDetail: (jobId: string) =>
+    Promise.resolve(jobDetailResults.get(jobId) ?? undefined)
+}))
+
+vi.mock('@/renderer/extensions/linearMode/flattenNodeOutput', () => ({
+  flattenNodeOutput: ([nodeId, output]: [
+    string | number,
+    Record<string, unknown>
+  ]) => {
+    if (!output.images) return []
+    return (output.images as Array<Record<string, string>>).map(
+      (img) =>
+        new ResultItemImpl({
+          ...img,
+          nodeId: String(nodeId),
+          mediaType: 'images'
+        })
+    )
+  }
+}))
+
+function makeAsset(
+  id: string,
+  jobId: string,
+  opts?: { allOutputs?: ResultItemImpl[]; outputCount?: number }
+): AssetItem {
+  return {
+    id,
+    name: `${id}.png`,
+    tags: [],
+    user_metadata: {
+      jobId,
+      nodeId: '1',
+      subfolder: '',
+      ...(opts?.allOutputs ? { allOutputs: opts.allOutputs } : {}),
+      ...(opts?.outputCount !== undefined
+        ? { outputCount: opts.outputCount }
+        : {})
+    }
+  }
+}
+
+function makeResult(filename: string, nodeId: string = '1'): ResultItemImpl {
+  return new ResultItemImpl({
+    filename,
+    subfolder: '',
+    type: 'output',
+    nodeId,
+    mediaType: 'images'
+  })
+}
+
+describe(useOutputHistory, () => {
+  beforeEach(() => {
+    setActivePinia(createPinia())
+    mediaRef.value = []
+    pendingResolveRef.value = new Set()
+    inProgressItemsRef.value = []
+    selectedIdRef.value = null
+    activeWorkflowPathRef.value = 'workflows/test.json'
+    jobIdToPathRef.value = new Map()
+    resolvedOutputsCacheRef.clear()
+    jobDetailResults.clear()
+    selectAsLatestFn.mockReset()
+    resolveIfReadyFn.mockReset()
+  })
+
+  describe('sessionMedia filtering', () => {
+    it('filters assets to match active workflow path', () => {
+      jobIdToPathRef.value = new Map([
+        ['job-1', 'workflows/test.json'],
+        ['job-2', 'workflows/other.json']
+      ])
+      mediaRef.value = [makeAsset('a1', 'job-1'), makeAsset('a2', 'job-2')]
+
+      const { outputs } = useOutputHistory()
+
+      expect(outputs.media.value).toHaveLength(1)
+      expect(outputs.media.value[0].id).toBe('a1')
+    })
+
+    it('returns empty when no workflow is active', () => {
+      activeWorkflowPathRef.value = ''
+      jobIdToPathRef.value = new Map([['job-1', 'workflows/test.json']])
+      mediaRef.value = [makeAsset('a1', 'job-1')]
+
+      const { outputs } = useOutputHistory()
+
+      expect(outputs.media.value).toHaveLength(0)
+    })
+
+    it('updates when active workflow changes', async () => {
+      jobIdToPathRef.value = new Map([
+        ['job-1', 'workflows/a.json'],
+        ['job-2', 'workflows/b.json']
+      ])
+      mediaRef.value = [makeAsset('a1', 'job-1'), makeAsset('a2', 'job-2')]
+
+      activeWorkflowPathRef.value = 'workflows/a.json'
+      const { outputs } = useOutputHistory()
+
+      expect(outputs.media.value).toHaveLength(1)
+      expect(outputs.media.value[0].id).toBe('a1')
+
+      activeWorkflowPathRef.value = 'workflows/b.json'
+      await nextTick()
+
+      expect(outputs.media.value).toHaveLength(1)
+      expect(outputs.media.value[0].id).toBe('a2')
+    })
+  })
+
+  describe('allOutputs', () => {
+    it('returns empty for undefined item', () => {
+      const { allOutputs } = useOutputHistory()
+
+      expect(allOutputs()).toEqual([])
+      expect(allOutputs(undefined)).toEqual([])
+    })
+
+    it('returns outputs from metadata allOutputs when count matches', () => {
+      const results = [makeResult('a.png'), makeResult('b.png')]
+      const asset = makeAsset('a1', 'job-1', {
+        allOutputs: results,
+        outputCount: 2
+      })
+
+      const { allOutputs } = useOutputHistory()
+      const outputs = allOutputs(asset)
+
+      expect(outputs).toHaveLength(2)
+      // Should be reversed
+      expect(outputs[0].filename).toBe('b.png')
+      expect(outputs[1].filename).toBe('a.png')
+    })
+
+    it('filters outputs to selected output nodes only', () => {
+      const results = [
+        makeResult('a.png', '1'),
+        makeResult('b.png', '2'),
+        makeResult('c.png', '3')
+      ]
+      const asset = makeAsset('a1', 'job-1', {
+        allOutputs: results,
+        outputCount: 3
+      })
+
+      const appModeStore = useAppModeStore()
+      appModeStore.selectedOutputs.push('2')
+
+      const { allOutputs } = useOutputHistory()
+      const outputs = allOutputs(asset)
+
+      expect(outputs).toHaveLength(1)
+      expect(outputs[0].filename).toBe('b.png')
+    })
+
+    it('returns all outputs when no output nodes are selected', () => {
+      const results = [makeResult('a.png', '1'), makeResult('b.png', '2')]
+      const asset = makeAsset('a1', 'job-1', {
+        allOutputs: results,
+        outputCount: 2
+      })
+
+      const { allOutputs } = useOutputHistory()
+      const outputs = allOutputs(asset)
+
+      expect(outputs).toHaveLength(2)
+    })
+
+    it('returns consistent filtered outputs across repeated calls', () => {
+      const results = [makeResult('a.png', '1'), makeResult('b.png', '2')]
+      const asset = makeAsset('a1', 'job-1', {
+        allOutputs: results,
+        outputCount: 2
+      })
+
+      const appModeStore = useAppModeStore()
+      appModeStore.selectedOutputs.push('2')
+
+      const { allOutputs } = useOutputHistory()
+      const first = allOutputs(asset)
+      const second = allOutputs(asset)
+
+      expect(first).toEqual(second)
+      expect(first).toHaveLength(1)
+      expect(first[0].filename).toBe('b.png')
+    })
+
+    it('returns in-progress outputs for pending resolve jobs', () => {
+      pendingResolveRef.value = new Set(['job-1'])
+      inProgressItemsRef.value = [
+        {
+          id: 'item-1',
+          jobId: 'job-1',
+          state: 'image',
+          output: makeResult('a.png')
+        },
+        {
+          id: 'item-2',
+          jobId: 'job-1',
+          state: 'image',
+          output: makeResult('b.png')
+        }
+      ]
+      const asset = makeAsset('a1', 'job-1')
+
+      const { allOutputs } = useOutputHistory()
+      const outputs = allOutputs(asset)
+
+      expect(outputs).toHaveLength(2)
+      expect(outputs[0].filename).toBe('a.png')
+      expect(outputs[1].filename).toBe('b.png')
+    })
+
+    it('fetches full job detail for multi-output jobs', async () => {
+      jobDetailResults.set('job-1', {
+        outputs: {
+          '1': {
+            images: [
+              { filename: 'a.png', subfolder: '', type: 'output' },
+              { filename: 'b.png', subfolder: '', type: 'output' },
+              { filename: 'c.png', subfolder: '', type: 'output' }
+            ]
+          }
+        }
+      })
+      const asset = makeAsset('a1', 'job-1')
+
+      const { allOutputs } = useOutputHistory()
+
+      expect(allOutputs(asset)).toEqual([])
+
+      await nextTick()
+      await nextTick()
+
+      const resolved = allOutputs(asset)
+      expect(resolved).toHaveLength(3)
+      expect(resolved[0].filename).toBe('c.png')
+    })
+  })
+
+  describe('watchEffect resolve loop', () => {
+    it('resolves pending jobs when history outputs load', async () => {
+      const results = [makeResult('a.png')]
+      const asset = makeAsset('a1', 'job-1', {
+        allOutputs: results,
+        outputCount: 1
+      })
+      jobIdToPathRef.value = new Map([['job-1', 'workflows/test.json']])
+      pendingResolveRef.value = new Set(['job-1'])
+      mediaRef.value = [asset]
+      selectedIdRef.value = null
+
+      useOutputHistory()
+      await nextTick()
+
+      expect(resolveIfReadyFn).toHaveBeenCalledWith('job-1', true)
+      expect(selectAsLatestFn).toHaveBeenCalledWith('history:a1:0')
+    })
+
+    it('does not select first history when a selection exists', async () => {
+      const results = [makeResult('a.png')]
+      const asset = makeAsset('a1', 'job-1', {
+        allOutputs: results,
+        outputCount: 1
+      })
+      jobIdToPathRef.value = new Map([['job-1', 'workflows/test.json']])
+      pendingResolveRef.value = new Set(['job-1'])
+      mediaRef.value = [asset]
+      selectedIdRef.value = 'history:existing:0'
+
+      useOutputHistory()
+      await nextTick()
+
+      expect(resolveIfReadyFn).toHaveBeenCalledWith('job-1', true)
+      expect(selectAsLatestFn).not.toHaveBeenCalled()
+    })
+
+    it('skips jobs with no matching asset in media', async () => {
+      pendingResolveRef.value = new Set(['job-missing'])
+      mediaRef.value = []
+
+      useOutputHistory()
+      await nextTick()
+
+      expect(resolveIfReadyFn).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('selectFirstHistory', () => {
+    it('selects first media item', () => {
+      jobIdToPathRef.value = new Map([['job-1', 'workflows/test.json']])
+      mediaRef.value = [makeAsset('a1', 'job-1')]
+
+      const { selectFirstHistory } = useOutputHistory()
+      selectFirstHistory()
+
+      expect(selectAsLatestFn).toHaveBeenCalledWith('history:a1:0')
+    })
+
+    it('selects null when no media', () => {
+      const { selectFirstHistory } = useOutputHistory()
+      selectFirstHistory()
+
+      expect(selectAsLatestFn).toHaveBeenCalledWith(null)
+    })
+  })
+})
diff --git a/src/renderer/extensions/linearMode/useOutputHistory.ts b/src/renderer/extensions/linearMode/useOutputHistory.ts
new file mode 100644
index 0000000000..a93130d74e
--- /dev/null
+++ b/src/renderer/extensions/linearMode/useOutputHistory.ts
@@ -0,0 +1,144 @@
+import { useAsyncState } from '@vueuse/core'
+import { computed, ref, watchEffect } from 'vue'
+
+import type { IAssetsProvider } from '@/platform/assets/composables/media/IAssetsProvider'
+import { useMediaAssets } from '@/platform/assets/composables/media/useMediaAssets'
+import { getOutputAssetMetadata } from '@/platform/assets/schemas/assetMetadataSchema'
+import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
+import { flattenNodeOutput } from '@/renderer/extensions/linearMode/flattenNodeOutput'
+import { useLinearOutputStore } from '@/renderer/extensions/linearMode/linearOutputStore'
+import { getJobDetail } from '@/services/jobOutputCache'
+import { useAppModeStore } from '@/stores/appModeStore'
+import { useExecutionStore } from '@/stores/executionStore'
+import type { ResultItemImpl } from '@/stores/queueStore'
+
+export function useOutputHistory(): {
+  outputs: IAssetsProvider
+  allOutputs: (item?: AssetItem) => ResultItemImpl[]
+  selectFirstHistory: () => void
+} {
+  const backingOutputs = useMediaAssets('output')
+  void backingOutputs.fetchMediaList()
+  const linearStore = useLinearOutputStore()
+  const workflowStore = useWorkflowStore()
+  const executionStore = useExecutionStore()
+  const appModeStore = useAppModeStore()
+
+  function filterByOutputNodes(items: ResultItemImpl[]): ResultItemImpl[] {
+    const nodeIds = appModeStore.selectedOutputs
+    if (!nodeIds.length) return items
+    return items.filter((r) =>
+      nodeIds.some((id) => String(id) === String(r.nodeId))
+    )
+  }
+
+  const sessionMedia = computed(() => {
+    const path = workflowStore.activeWorkflow?.path
+    if (!path) return []
+
+    const pathMap = executionStore.jobIdToSessionWorkflowPath
+
+    return backingOutputs.media.value.filter((asset) => {
+      const m = getOutputAssetMetadata(asset?.user_metadata)
+      return m ? pathMap.get(m.jobId) === path : false
+    })
+  })
+
+  const outputs: IAssetsProvider = {
+    ...backingOutputs,
+    media: sessionMedia,
+    hasMore: ref(false),
+    isLoadingMore: ref(false),
+    loadMore: async () => {}
+  }
+
+  const resolvedCache = linearStore.resolvedOutputsCache
+  const asyncRefs = new Map<
+    string,
+    ReturnType<typeof useAsyncState<ResultItemImpl[]>>['state']
+  >()
+
+  function allOutputs(item?: AssetItem): ResultItemImpl[] {
+    if (!item?.id) return []
+
+    const cached = resolvedCache.get(item.id)
+    if (cached) return filterByOutputNodes(cached)
+
+    const user_metadata = getOutputAssetMetadata(item.user_metadata)
+    if (!user_metadata) return []
+
+    // For recently completed jobs still pending resolve, derive order from
+    // the in-progress items which are in correct execution order.
+    if (linearStore.pendingResolve.has(user_metadata.jobId)) {
+      const ordered = linearStore.inProgressItems
+        .filter((i) => i.jobId === user_metadata.jobId && i.output)
+        .map((i) => i.output!)
+      if (ordered.length > 0) {
+        resolvedCache.set(item.id, ordered)
+        return filterByOutputNodes(ordered)
+      }
+    }
+
+    // Use metadata when all outputs are present. The /jobs list endpoint
+    // only returns preview_output (single item), so outputCount may exceed
+    // allOutputs.length for multi-output jobs.
+    if (
+      user_metadata.allOutputs?.length &&
+      (!user_metadata.outputCount ||
+        user_metadata.outputCount <= user_metadata.allOutputs.length)
+    ) {
+      const reversed = user_metadata.allOutputs.toReversed()
+      resolvedCache.set(item.id, reversed)
+      return filterByOutputNodes(reversed)
+    }
+
+    // Async fallback for multi-output jobs — fetch full /jobs/{id} detail.
+    // This can be hit if the user executes the job then switches tabs.
+    const existing = asyncRefs.get(item.id)
+    if (existing) return filterByOutputNodes(existing.value)
+
+    const itemId = item.id
+    const outputRef = useAsyncState(
+      getJobDetail(user_metadata.jobId).then((jobDetail) => {
+        if (!jobDetail?.outputs) return []
+        const results = Object.entries(jobDetail.outputs)
+          .flatMap(flattenNodeOutput)
+          .toReversed()
+        resolvedCache.set(itemId, results)
+        return results
+      }),
+      []
+    ).state
+    asyncRefs.set(item.id, outputRef)
+    return filterByOutputNodes(outputRef.value)
+  }
+
+  function selectFirstHistory() {
+    const first = outputs.media.value[0]
+    if (first) {
+      linearStore.selectAsLatest(`history:${first.id}:0`)
+    } else {
+      linearStore.selectAsLatest(null)
+    }
+  }
+
+  // Resolve in-progress items when history outputs are loaded.
+  watchEffect(() => {
+    if (linearStore.pendingResolve.size === 0) return
+    for (const jobId of linearStore.pendingResolve) {
+      const asset = outputs.media.value.find((a) => {
+        const m = getOutputAssetMetadata(a?.user_metadata)
+        return m?.jobId === jobId
+      })
+      if (!asset) continue
+      const loaded = allOutputs(asset).length > 0
+      if (loaded) {
+        linearStore.resolveIfReady(jobId, true)
+        if (!linearStore.selectedId) selectFirstHistory()
+      }
+    }
+  })
+
+  return { outputs, allOutputs, selectFirstHistory }
+}
diff --git a/src/renderer/extensions/minimap/MiniMap.vue b/src/renderer/extensions/minimap/MiniMap.vue
index 5df12291bf..090af13ca3 100644
--- a/src/renderer/extensions/minimap/MiniMap.vue
+++ b/src/renderer/extensions/minimap/MiniMap.vue
@@ -2,7 +2,12 @@
   <div
     v-if="visible && initialized"
     ref="minimapRef"
-    class="minimap-main-container absolute right-0 bottom-[54px] z-1000 flex"
+    :class="
+      cn(
+        'minimap-main-container absolute right-0 bottom-[54px] z-1000 flex',
+        isMobile ? 'flex-col' : 'flex-row'
+      )
+    "
   >
     <MiniMapPanel
       v-if="showOptionsPanel"
@@ -12,6 +17,7 @@
       :show-groups="showGroups"
       :render-bypass="renderBypass"
       :render-error="renderError"
+      :is-mobile="isMobile"
       @update-option="updateOption"
     />
 
@@ -70,14 +76,18 @@
 </template>
 
 <script setup lang="ts">
+import { breakpointsTailwind, useBreakpoints } from '@vueuse/core'
 import { onMounted, onUnmounted, ref, useTemplateRef } from 'vue'
 
 import Button from '@/components/ui/button/Button.vue'
 import { useMinimap } from '@/renderer/extensions/minimap/composables/useMinimap'
 import { useCommandStore } from '@/stores/commandStore'
+import { cn } from '@/utils/tailwindUtil'
 
 import MiniMapPanel from './MiniMapPanel.vue'
 
+const isMobile = useBreakpoints(breakpointsTailwind).smaller('md')
+
 const commandStore = useCommandStore()
 const minimapRef = ref<HTMLDivElement>()
 const containerRef = useTemplateRef<HTMLDivElement>('containerRef')
diff --git a/src/renderer/extensions/minimap/MiniMapPanel.vue b/src/renderer/extensions/minimap/MiniMapPanel.vue
index 35430319ab..8d3f97ed6c 100644
--- a/src/renderer/extensions/minimap/MiniMapPanel.vue
+++ b/src/renderer/extensions/minimap/MiniMapPanel.vue
@@ -1,6 +1,11 @@
 <template>
   <div
-    class="minimap-panel mr-2 flex flex-col gap-2 bg-comfy-menu-bg p-3 text-sm shadow-interface"
+    :class="
+      cn(
+        'minimap-panel flex flex-col gap-2 bg-comfy-menu-bg p-3 text-sm shadow-interface',
+        isMobile ? 'mb-2' : 'mr-2'
+      )
+    "
     :style="panelStyles"
   >
     <div class="flex items-center gap-2">
@@ -79,16 +84,19 @@
 
 <script setup lang="ts">
 import Checkbox from 'primevue/checkbox'
+import type { CSSProperties, Ref } from 'vue'
 
 import type { MinimapSettingsKey } from '@/renderer/extensions/minimap/types'
+import { cn } from '@/utils/tailwindUtil'
 
 defineProps<{
-  panelStyles: any
+  panelStyles: CSSProperties
   nodeColors: boolean
   showLinks: boolean
   showGroups: boolean
   renderBypass: boolean
   renderError: boolean
+  isMobile: Ref<boolean> | boolean
 }>()
 
 defineEmits<{
diff --git a/tests-ui/tests/composables/useMinimap.test.ts b/src/renderer/extensions/minimap/composables/useMinimap.test.ts
similarity index 75%
rename from tests-ui/tests/composables/useMinimap.test.ts
rename to src/renderer/extensions/minimap/composables/useMinimap.test.ts
index e33b46c535..5d15bccc2e 100644
--- a/tests-ui/tests/composables/useMinimap.test.ts
+++ b/src/renderer/extensions/minimap/composables/useMinimap.test.ts
@@ -1,6 +1,50 @@
+import type { Mock } from 'vitest'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { nextTick, shallowRef } from 'vue'
 
+import {
+  createMockCanvas2DContext,
+  createMockMinimapCanvas
+} from '@/utils/__tests__/litegraphTestUtils'
+
+interface MockNode {
+  id: string
+  pos: number[]
+  size: number[]
+  color?: string
+  constructor?: { color: string }
+  outputs?: { links: string[] }[] | null
+}
+
+interface MockGraph {
+  _nodes: MockNode[]
+  links: Record<string, { id: string; target_id: string }>
+  getNodeById: Mock
+  setDirtyCanvas: Mock
+  onNodeAdded: ((node: MockNode) => void) | null
+  onNodeRemoved: ((node: MockNode) => void) | null
+  onConnectionChange: ((node: MockNode) => void) | null
+}
+
+interface MockCanvas {
+  graph: MockGraph
+  canvas: {
+    width: number
+    height: number
+    clientWidth: number
+    clientHeight: number
+  }
+  ds: {
+    scale: number
+    offset: [number, number]
+  }
+  setDirty: Mock
+}
+
+interface MockContainerElement {
+  getBoundingClientRect: Mock
+}
+
 const flushPromises = () => new Promise((resolve) => setTimeout(resolve, 0))
 
 const triggerRAF = async () => {
@@ -39,15 +83,15 @@ vi.mock('@vueuse/core', () => {
       }
     }),
     useThrottleFn: vi.fn((callback) => {
-      return (...args: any[]) => {
+      return (...args: unknown[]) => {
         return callback(...args)
       }
     })
   }
 })
 
-let mockCanvas: any
-let mockGraph: any
+let moduleMockCanvas: MockCanvas = null!
+let moduleMockGraph: MockGraph = null!
 
 const setupMocks = () => {
   const mockNodes = [
@@ -72,7 +116,7 @@ const setupMocks = () => {
     }
   ]
 
-  mockGraph = {
+  moduleMockGraph = {
     _nodes: mockNodes,
     links: {
       link1: {
@@ -87,8 +131,8 @@ const setupMocks = () => {
     onConnectionChange: null
   }
 
-  mockCanvas = {
-    graph: mockGraph,
+  moduleMockCanvas = {
+    graph: moduleMockGraph,
     canvas: {
       width: 1000,
       height: 800,
@@ -105,8 +149,11 @@ const setupMocks = () => {
 
 setupMocks()
 
-const defaultCanvasStore = {
-  canvas: mockCanvas,
+const defaultCanvasStore: {
+  canvas: MockCanvas | null
+  getCanvas: () => MockCanvas | null
+} = {
+  canvas: moduleMockCanvas,
   getCanvas: () => defaultCanvasStore.canvas
 }
 
@@ -142,7 +189,7 @@ vi.mock('@/scripts/api', () => ({
 vi.mock('@/scripts/app', () => ({
   app: {
     canvas: {
-      graph: mockGraph
+      graph: moduleMockGraph
     }
   }
 }))
@@ -153,21 +200,26 @@ vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
   }))
 }))
 
-const { useMinimap } =
-  await import('@/renderer/extensions/minimap/composables/useMinimap')
-const { api } = await import('@/scripts/api')
+vi.mock('@/stores/executionStore', () => ({
+  useExecutionStore: vi.fn().mockReturnValue({
+    nodeProgressStates: {}
+  })
+}))
+
+import { useMinimap } from '@/renderer/extensions/minimap/composables/useMinimap'
+import { api } from '@/scripts/api'
 
 describe('useMinimap', () => {
-  let mockCanvas: any
-  let mockGraph: any
-  let mockCanvasElement: any
-  let mockContainerElement: any
-  let mockContext2D: any
+  let moduleMockCanvasElement: HTMLCanvasElement
+  let mockContainerElement: MockContainerElement
+  let mockContext2D: CanvasRenderingContext2D
 
   async function createAndInitializeMinimap() {
     const minimap = useMinimap({
-      containerRefMaybe: shallowRef(mockContainerElement),
-      canvasRefMaybe: shallowRef(mockCanvasElement)
+      containerRefMaybe: shallowRef(
+        mockContainerElement as Partial<HTMLDivElement> as HTMLDivElement
+      ),
+      canvasRefMaybe: shallowRef(moduleMockCanvasElement)
     })
     await minimap.init()
     await nextTick()
@@ -181,28 +233,15 @@ describe('useMinimap', () => {
     mockPause.mockClear()
     mockResume.mockClear()
 
-    mockContext2D = {
-      clearRect: vi.fn(),
-      fillRect: vi.fn(),
-      strokeRect: vi.fn(),
-      beginPath: vi.fn(),
-      moveTo: vi.fn(),
-      lineTo: vi.fn(),
-      stroke: vi.fn(),
-      arc: vi.fn(),
-      fill: vi.fn(),
-      fillStyle: '',
-      strokeStyle: '',
-      lineWidth: 0
-    }
+    mockContext2D = createMockCanvas2DContext()
 
-    mockCanvasElement = {
-      getContext: vi.fn().mockReturnValue(mockContext2D),
-      width: 250,
-      height: 200,
-      clientWidth: 250,
-      clientHeight: 200
-    }
+    moduleMockCanvasElement = createMockMinimapCanvas({
+      getContext: vi
+        .fn()
+        .mockImplementation((contextId) =>
+          contextId === '2d' ? mockContext2D : null
+        ) as HTMLCanvasElement['getContext']
+    })
 
     const mockRect = {
       left: 100,
@@ -241,7 +280,7 @@ describe('useMinimap', () => {
       }
     ]
 
-    mockGraph = {
+    moduleMockGraph = {
       _nodes: mockNodes,
       links: {
         link1: {
@@ -256,8 +295,8 @@ describe('useMinimap', () => {
       onConnectionChange: null
     }
 
-    mockCanvas = {
-      graph: mockGraph,
+    moduleMockCanvas = {
+      graph: moduleMockGraph,
       canvas: {
         width: 1000,
         height: 800,
@@ -271,7 +310,7 @@ describe('useMinimap', () => {
       setDirty: vi.fn()
     }
 
-    defaultCanvasStore.canvas = mockCanvas
+    defaultCanvasStore.canvas = moduleMockCanvas
 
     defaultSettingStore.get = vi.fn().mockReturnValue(true)
     defaultSettingStore.set = vi.fn().mockResolvedValue(undefined)
@@ -338,9 +377,9 @@ describe('useMinimap', () => {
 
       await minimap.init()
 
-      expect(mockGraph.onNodeAdded).toBeDefined()
-      expect(mockGraph.onNodeRemoved).toBeDefined()
-      expect(mockGraph.onConnectionChange).toBeDefined()
+      expect(moduleMockGraph.onNodeAdded).toBeDefined()
+      expect(moduleMockGraph.onNodeRemoved).toBeDefined()
+      expect(moduleMockGraph.onConnectionChange).toBeDefined()
     })
 
     it('should handle visibility from settings', async () => {
@@ -377,18 +416,20 @@ describe('useMinimap', () => {
         onConnectionChange: vi.fn()
       }
 
-      mockGraph.onNodeAdded = originalCallbacks.onNodeAdded
-      mockGraph.onNodeRemoved = originalCallbacks.onNodeRemoved
-      mockGraph.onConnectionChange = originalCallbacks.onConnectionChange
+      moduleMockGraph.onNodeAdded = originalCallbacks.onNodeAdded
+      moduleMockGraph.onNodeRemoved = originalCallbacks.onNodeRemoved
+      moduleMockGraph.onConnectionChange = originalCallbacks.onConnectionChange
 
       const minimap = await createAndInitializeMinimap()
 
       await minimap.init()
       minimap.destroy()
 
-      expect(mockGraph.onNodeAdded).toBe(originalCallbacks.onNodeAdded)
-      expect(mockGraph.onNodeRemoved).toBe(originalCallbacks.onNodeRemoved)
-      expect(mockGraph.onConnectionChange).toBe(
+      expect(moduleMockGraph.onNodeAdded).toBe(originalCallbacks.onNodeAdded)
+      expect(moduleMockGraph.onNodeRemoved).toBe(
+        originalCallbacks.onNodeRemoved
+      )
+      expect(moduleMockGraph.onConnectionChange).toBe(
         originalCallbacks.onConnectionChange
       )
     })
@@ -421,7 +462,7 @@ describe('useMinimap', () => {
     it('should verify context is obtained during render', async () => {
       const minimap = await createAndInitializeMinimap()
 
-      const getContextSpy = vi.spyOn(mockCanvasElement, 'getContext')
+      const getContextSpy = vi.spyOn(moduleMockCanvasElement, 'getContext')
 
       await minimap.init()
 
@@ -429,10 +470,12 @@ describe('useMinimap', () => {
       minimap.renderMinimap()
 
       // Force a render by triggering a graph change
-      mockGraph._nodes.push({
+      moduleMockGraph._nodes.push({
         id: 'new-node',
         pos: [150, 150],
-        size: [100, 50]
+        size: [100, 50],
+        constructor: { color: '#666' },
+        outputs: []
       })
 
       // Trigger RAF to process changes
@@ -452,15 +495,15 @@ describe('useMinimap', () => {
       minimap.renderMinimap()
 
       // Force a render by modifying a node position
-      mockGraph._nodes[0].pos = [50, 50]
+      moduleMockGraph._nodes[0].pos = [50, 50]
 
       // Trigger RAF to process changes
       await triggerRAF()
       await nextTick()
 
       const renderingOccurred =
-        mockContext2D.clearRect.mock.calls.length > 0 ||
-        mockContext2D.fillRect.mock.calls.length > 0
+        vi.mocked(mockContext2D.clearRect).mock.calls.length > 0 ||
+        vi.mocked(mockContext2D.fillRect).mock.calls.length > 0
 
       if (!renderingOccurred) {
         console.log('Minimap visible:', minimap.visible.value)
@@ -469,12 +512,15 @@ describe('useMinimap', () => {
         console.log('Graph exists:', !!defaultCanvasStore.canvas?.graph)
         console.log(
           'clearRect calls:',
-          mockContext2D.clearRect.mock.calls.length
+          vi.mocked(mockContext2D.clearRect).mock.calls.length
+        )
+        console.log(
+          'fillRect calls:',
+          vi.mocked(mockContext2D.fillRect).mock.calls.length
         )
-        console.log('fillRect calls:', mockContext2D.fillRect.mock.calls.length)
         console.log(
           'getContext calls:',
-          mockCanvasElement.getContext.mock.calls.length
+          vi.mocked(moduleMockCanvasElement.getContext).mock.calls.length
         )
       }
 
@@ -482,7 +528,11 @@ describe('useMinimap', () => {
     })
 
     it('should not render when context is null', async () => {
-      mockCanvasElement.getContext = vi.fn().mockReturnValue(null)
+      moduleMockCanvasElement = createMockMinimapCanvas({
+        getContext: vi
+          .fn()
+          .mockImplementation(() => null) as HTMLCanvasElement['getContext']
+      })
 
       const minimap = await createAndInitializeMinimap()
 
@@ -491,12 +541,18 @@ describe('useMinimap', () => {
 
       expect(mockContext2D.clearRect).not.toHaveBeenCalled()
 
-      mockCanvasElement.getContext = vi.fn().mockReturnValue(mockContext2D)
+      moduleMockCanvasElement = createMockMinimapCanvas({
+        getContext: vi
+          .fn()
+          .mockImplementation((contextId) =>
+            contextId === '2d' ? mockContext2D : null
+          ) as HTMLCanvasElement['getContext']
+      })
     })
 
     it('should handle empty graph', async () => {
-      const originalNodes = [...mockGraph._nodes]
-      mockGraph._nodes = []
+      const originalNodes = [...moduleMockGraph._nodes]
+      moduleMockGraph._nodes = []
 
       const minimap = await createAndInitializeMinimap()
 
@@ -513,7 +569,7 @@ describe('useMinimap', () => {
       // The key test is that it doesn't crash and properly initializes
       expect(mockContext2D.clearRect).toHaveBeenCalled()
 
-      mockGraph._nodes = originalNodes
+      moduleMockGraph._nodes = originalNodes
     })
   })
 
@@ -530,7 +586,7 @@ describe('useMinimap', () => {
       minimap.handlePointerDown(pointerEvent)
 
       expect(mockContainerElement.getBoundingClientRect).toHaveBeenCalled()
-      expect(mockCanvas.setDirty).toHaveBeenCalledWith(true, true)
+      expect(moduleMockCanvas.setDirty).toHaveBeenCalledWith(true, true)
     })
 
     it('should handle pointer move while dragging (mouse)', async () => {
@@ -550,8 +606,8 @@ describe('useMinimap', () => {
       })
       minimap.handlePointerMove(pointerMoveEvent)
 
-      expect(mockCanvas.setDirty).toHaveBeenCalledWith(true, true)
-      expect(mockCanvas.ds.offset).toBeDefined()
+      expect(moduleMockCanvas.setDirty).toHaveBeenCalledWith(true, true)
+      expect(moduleMockCanvas.ds.offset).toBeDefined()
     })
 
     it('should handle pointer up to stop dragging (mouse)', async () => {
@@ -566,7 +622,7 @@ describe('useMinimap', () => {
 
       minimap.handlePointerUp()
 
-      mockCanvas.setDirty.mockClear()
+      moduleMockCanvas.setDirty.mockClear()
 
       const pointerMoveEvent = new PointerEvent('pointermove', {
         clientX: 200,
@@ -575,7 +631,7 @@ describe('useMinimap', () => {
       })
       minimap.handlePointerMove(pointerMoveEvent)
 
-      expect(mockCanvas.setDirty).not.toHaveBeenCalled()
+      expect(moduleMockCanvas.setDirty).not.toHaveBeenCalled()
     })
 
     it('should handle pointer down and start dragging (touch)', async () => {
@@ -590,7 +646,7 @@ describe('useMinimap', () => {
       minimap.handlePointerDown(pointerEvent)
 
       expect(mockContainerElement.getBoundingClientRect).toHaveBeenCalled()
-      expect(mockCanvas.setDirty).toHaveBeenCalledWith(true, true)
+      expect(moduleMockCanvas.setDirty).toHaveBeenCalledWith(true, true)
     })
 
     it('should handle pointer move while dragging (touch)', async () => {
@@ -610,8 +666,8 @@ describe('useMinimap', () => {
       })
       minimap.handlePointerMove(pointerMoveEvent)
 
-      expect(mockCanvas.setDirty).toHaveBeenCalledWith(true, true)
-      expect(mockCanvas.ds.offset).toBeDefined()
+      expect(moduleMockCanvas.setDirty).toHaveBeenCalledWith(true, true)
+      expect(moduleMockCanvas.ds.offset).toBeDefined()
     })
 
     it('should handle pointer move while dragging (pen)', async () => {
@@ -631,14 +687,14 @@ describe('useMinimap', () => {
       })
       minimap.handlePointerMove(pointerMoveEvent)
 
-      expect(mockCanvas.setDirty).toHaveBeenCalledWith(true, true)
-      expect(mockCanvas.ds.offset).toBeDefined()
+      expect(moduleMockCanvas.setDirty).toHaveBeenCalledWith(true, true)
+      expect(moduleMockCanvas.ds.offset).toBeDefined()
     })
 
     it('should not move when not dragging with pointer', async () => {
       const minimap = await createAndInitializeMinimap()
 
-      mockCanvas.setDirty.mockClear()
+      moduleMockCanvas.setDirty.mockClear()
 
       const pointerMoveEvent = new PointerEvent('pointermove', {
         clientX: 200,
@@ -647,7 +703,7 @@ describe('useMinimap', () => {
       })
       minimap.handlePointerMove(pointerMoveEvent)
 
-      expect(mockCanvas.setDirty).not.toHaveBeenCalled()
+      expect(moduleMockCanvas.setDirty).not.toHaveBeenCalled()
     })
 
     it('should handle pointer up to stop dragging (touch)', async () => {
@@ -662,7 +718,7 @@ describe('useMinimap', () => {
 
       minimap.handlePointerUp()
 
-      mockCanvas.setDirty.mockClear()
+      moduleMockCanvas.setDirty.mockClear()
 
       const pointerMoveEvent = new PointerEvent('pointermove', {
         clientX: 200,
@@ -671,7 +727,7 @@ describe('useMinimap', () => {
       })
       minimap.handlePointerMove(pointerMoveEvent)
 
-      expect(mockCanvas.setDirty).not.toHaveBeenCalled()
+      expect(moduleMockCanvas.setDirty).not.toHaveBeenCalled()
     })
   })
 
@@ -695,8 +751,8 @@ describe('useMinimap', () => {
       minimap.handleWheel(wheelEvent)
 
       expect(preventDefault).toHaveBeenCalled()
-      expect(mockCanvas.ds.scale).toBeCloseTo(1.1)
-      expect(mockCanvas.setDirty).toHaveBeenCalledWith(true, true)
+      expect(moduleMockCanvas.ds.scale).toBeCloseTo(1.1)
+      expect(moduleMockCanvas.setDirty).toHaveBeenCalledWith(true, true)
     })
 
     it('should handle wheel zoom out', async () => {
@@ -718,8 +774,8 @@ describe('useMinimap', () => {
       minimap.handleWheel(wheelEvent)
 
       expect(preventDefault).toHaveBeenCalled()
-      expect(mockCanvas.ds.scale).toBeCloseTo(0.9)
-      expect(mockCanvas.setDirty).toHaveBeenCalledWith(true, true)
+      expect(moduleMockCanvas.ds.scale).toBeCloseTo(0.9)
+      expect(moduleMockCanvas.setDirty).toHaveBeenCalledWith(true, true)
     })
 
     it('should respect zoom limits', async () => {
@@ -727,7 +783,7 @@ describe('useMinimap', () => {
 
       await minimap.init()
 
-      mockCanvas.ds.scale = 0.1
+      moduleMockCanvas.ds.scale = 0.1
 
       const wheelEvent = new WheelEvent('wheel', {
         deltaY: 100,
@@ -742,7 +798,7 @@ describe('useMinimap', () => {
 
       minimap.handleWheel(wheelEvent)
 
-      expect(mockCanvas.ds.scale).toBe(0.1)
+      expect(moduleMockCanvas.ds.scale).toBe(0.1)
     })
 
     it('should update container rect if needed', async () => {
@@ -790,15 +846,17 @@ describe('useMinimap', () => {
 
       await minimap.init()
 
-      mockCanvas.canvas.clientWidth = 1200
-      mockCanvas.canvas.clientHeight = 900
+      moduleMockCanvas.canvas.clientWidth = 1200
+      moduleMockCanvas.canvas.clientHeight = 900
 
-      const resizeHandler = (window.addEventListener as any).mock.calls.find(
-        (call: any) => call[0] === 'resize'
-      )?.[1]
+      const resizeHandler = vi
+        .mocked(window.addEventListener)
+        .mock.calls.find((call) => call[0] === 'resize')?.[1] as
+        | EventListener
+        | undefined
 
       if (resizeHandler) {
-        resizeHandler()
+        resizeHandler(new Event('resize'))
       }
 
       await nextTick()
@@ -817,12 +875,13 @@ describe('useMinimap', () => {
         id: 'node3',
         pos: [300, 200],
         size: [100, 100],
-        constructor: { color: '#666' }
+        constructor: { color: '#666' },
+        outputs: []
       }
 
-      mockGraph._nodes.push(newNode)
-      if (mockGraph.onNodeAdded) {
-        mockGraph.onNodeAdded(newNode)
+      moduleMockGraph._nodes.push(newNode)
+      if (moduleMockGraph.onNodeAdded) {
+        moduleMockGraph.onNodeAdded(newNode)
       }
 
       await new Promise((resolve) => setTimeout(resolve, 600))
@@ -833,11 +892,11 @@ describe('useMinimap', () => {
 
       await minimap.init()
 
-      const removedNode = mockGraph._nodes[0]
-      mockGraph._nodes.splice(0, 1)
+      const removedNode = moduleMockGraph._nodes[0]
+      moduleMockGraph._nodes.splice(0, 1)
 
-      if (mockGraph.onNodeRemoved) {
-        mockGraph.onNodeRemoved(removedNode)
+      if (moduleMockGraph.onNodeRemoved) {
+        moduleMockGraph.onNodeRemoved(removedNode)
       }
 
       await new Promise((resolve) => setTimeout(resolve, 600))
@@ -848,8 +907,8 @@ describe('useMinimap', () => {
 
       await minimap.init()
 
-      if (mockGraph.onConnectionChange) {
-        mockGraph.onConnectionChange(mockGraph._nodes[0])
+      if (moduleMockGraph.onConnectionChange) {
+        moduleMockGraph.onConnectionChange(moduleMockGraph._nodes[0])
       }
 
       await new Promise((resolve) => setTimeout(resolve, 600))
@@ -870,7 +929,7 @@ describe('useMinimap', () => {
 
   describe('edge cases', () => {
     it('should handle missing node outputs', async () => {
-      mockGraph._nodes[0].outputs = null
+      moduleMockGraph._nodes[0].outputs = null
       const minimap = await createAndInitializeMinimap()
 
       await expect(minimap.init()).resolves.not.toThrow()
@@ -878,8 +937,8 @@ describe('useMinimap', () => {
     })
 
     it('should handle invalid link references', async () => {
-      mockGraph.links.link1.target_id = 'invalid-node'
-      mockGraph.getNodeById.mockReturnValue(null)
+      moduleMockGraph.links.link1.target_id = 'invalid-node'
+      moduleMockGraph.getNodeById.mockReturnValue(null)
 
       const minimap = await createAndInitializeMinimap()
 
@@ -898,16 +957,13 @@ describe('useMinimap', () => {
     })
 
     it('should handle nodes without color', async () => {
-      mockGraph._nodes[0].color = undefined
+      moduleMockGraph._nodes[0].color = undefined
 
       const minimap = await createAndInitializeMinimap()
 
       await minimap.init()
 
-      const renderMinimap = (minimap as any).renderMinimap
-      if (renderMinimap) {
-        renderMinimap()
-      }
+      minimap.renderMinimap()
 
       expect(mockContext2D.fillRect).toHaveBeenCalled()
       expect(mockContext2D.fillStyle).toBeDefined()
diff --git a/src/renderer/extensions/minimap/composables/useMinimap.ts b/src/renderer/extensions/minimap/composables/useMinimap.ts
index 0529737ed6..e7525dda32 100644
--- a/src/renderer/extensions/minimap/composables/useMinimap.ts
+++ b/src/renderer/extensions/minimap/composables/useMinimap.ts
@@ -5,6 +5,7 @@ import type { ShallowRef } from 'vue'
 import type { LGraph } from '@/lib/litegraph/src/litegraph'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
+import { useExecutionStore } from '@/stores/executionStore'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 
 import type { MinimapCanvas, MinimapSettingsKey } from '../types'
@@ -201,6 +202,18 @@ export function useMinimap({
     }
   })
 
+  const executionStore = useExecutionStore()
+  watch(
+    () => executionStore.nodeProgressStates,
+    () => {
+      if (visible.value) {
+        renderer.forceFullRedraw()
+        renderer.updateMinimap(viewport.updateBounds, viewport.updateViewport)
+      }
+    },
+    { deep: true }
+  )
+
   const toggle = async () => {
     visible.value = !visible.value
     await settingStore.set('Comfy.Minimap.Visible', visible.value)
diff --git a/tests-ui/tests/renderer/extensions/minimap/composables/useMinimapGraph.test.ts b/src/renderer/extensions/minimap/composables/useMinimapGraph.test.ts
similarity index 82%
rename from tests-ui/tests/renderer/extensions/minimap/composables/useMinimapGraph.test.ts
rename to src/renderer/extensions/minimap/composables/useMinimapGraph.test.ts
index 835f38e71b..10f9931e1a 100644
--- a/tests-ui/tests/renderer/extensions/minimap/composables/useMinimapGraph.test.ts
+++ b/src/renderer/extensions/minimap/composables/useMinimapGraph.test.ts
@@ -1,15 +1,28 @@
 import { useThrottleFn } from '@vueuse/core'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { ref } from 'vue'
+import type { Ref } from 'vue'
 
 import type { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph'
 import { useMinimapGraph } from '@/renderer/extensions/minimap/composables/useMinimapGraph'
 import { api } from '@/scripts/api'
+import {
+  createMockLGraph,
+  createMockLGraphNode,
+  createMockLLink,
+  createMockLinks
+} from '@/utils/__tests__/litegraphTestUtils'
 
 vi.mock('@vueuse/core', () => ({
   useThrottleFn: vi.fn((fn) => fn)
 }))
 
+vi.mock('@/stores/executionStore', () => ({
+  useExecutionStore: vi.fn().mockReturnValue({
+    nodeProgressStates: {}
+  })
+}))
+
 vi.mock('@/scripts/api', () => ({
   api: {
     addEventListener: vi.fn(),
@@ -24,23 +37,23 @@ describe('useMinimapGraph', () => {
   beforeEach(() => {
     vi.clearAllMocks()
 
-    mockGraph = {
+    mockGraph = createMockLGraph({
       id: 'test-graph-123',
       _nodes: [
-        { id: '1', pos: [100, 100], size: [150, 80] },
-        { id: '2', pos: [300, 200], size: [120, 60] }
+        createMockLGraphNode({ id: '1', pos: [100, 100], size: [150, 80] }),
+        createMockLGraphNode({ id: '2', pos: [300, 200], size: [120, 60] })
       ],
-      links: { link1: { id: 'link1' } },
+      links: createMockLinks([createMockLLink({ id: 1 })]),
       onNodeAdded: vi.fn(),
       onNodeRemoved: vi.fn(),
       onConnectionChange: vi.fn()
-    } as any
+    })
 
     onGraphChangedMock = vi.fn()
   })
 
   it('should initialize with empty state', () => {
-    const graphRef = ref(mockGraph as any)
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
     const graphManager = useMinimapGraph(graphRef, onGraphChangedMock)
 
     expect(graphManager.updateFlags.value).toEqual({
@@ -52,7 +65,7 @@ describe('useMinimapGraph', () => {
   })
 
   it('should setup event listeners on init', () => {
-    const graphRef = ref(mockGraph as any)
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
     const graphManager = useMinimapGraph(graphRef, onGraphChangedMock)
 
     graphManager.init()
@@ -72,7 +85,7 @@ describe('useMinimapGraph', () => {
     mockGraph.onNodeRemoved = originalOnNodeRemoved
     mockGraph.onConnectionChange = originalOnConnectionChange
 
-    const graphRef = ref(mockGraph as any)
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
     const graphManager = useMinimapGraph(graphRef, onGraphChangedMock)
 
     graphManager.setupEventListeners()
@@ -91,7 +104,7 @@ describe('useMinimapGraph', () => {
   })
 
   it('should prevent duplicate event listener setup', () => {
-    const graphRef = ref(mockGraph as any)
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
     const graphManager = useMinimapGraph(graphRef, onGraphChangedMock)
 
     // Store original callbacks for comparison
@@ -127,7 +140,7 @@ describe('useMinimapGraph', () => {
     mockGraph.onNodeRemoved = originalOnNodeRemoved
     mockGraph.onConnectionChange = originalOnConnectionChange
 
-    const graphRef = ref(mockGraph as any)
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
     const graphManager = useMinimapGraph(graphRef, onGraphChangedMock)
 
     graphManager.setupEventListeners()
@@ -140,24 +153,14 @@ describe('useMinimapGraph', () => {
   })
 
   it('should handle cleanup for never-setup graph', () => {
-    const consoleErrorSpy = vi
-      .spyOn(console, 'error')
-      .mockImplementation(() => {})
-
-    const graphRef = ref(mockGraph as any)
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
     const graphManager = useMinimapGraph(graphRef, onGraphChangedMock)
 
-    graphManager.cleanupEventListeners()
-
-    expect(consoleErrorSpy).toHaveBeenCalledWith(
-      'Attempted to cleanup event listeners for graph that was never set up'
-    )
-
-    consoleErrorSpy.mockRestore()
+    expect(() => graphManager.cleanupEventListeners()).not.toThrow()
   })
 
   it('should detect node position changes', () => {
-    const graphRef = ref(mockGraph as any)
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
     const graphManager = useMinimapGraph(graphRef, onGraphChangedMock)
 
     // First check - cache initial state
@@ -177,14 +180,18 @@ describe('useMinimapGraph', () => {
   })
 
   it('should detect node count changes', () => {
-    const graphRef = ref(mockGraph as any)
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
     const graphManager = useMinimapGraph(graphRef, onGraphChangedMock)
 
     // Cache initial state
     graphManager.checkForChanges()
 
     // Add a node
-    mockGraph._nodes.push({ id: '3', pos: [400, 300], size: [100, 50] } as any)
+    mockGraph._nodes.push({
+      id: '3',
+      pos: [400, 300],
+      size: [100, 50]
+    } as Partial<LGraphNode> as LGraphNode)
 
     const hasChanges = graphManager.checkForChanges()
     expect(hasChanges).toBe(true)
@@ -193,17 +200,17 @@ describe('useMinimapGraph', () => {
   })
 
   it('should detect connection changes', () => {
-    const graphRef = ref(mockGraph as any)
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
     const graphManager = useMinimapGraph(graphRef, onGraphChangedMock)
 
     // Cache initial state
     graphManager.checkForChanges()
 
     // Change connections
-    mockGraph.links = new Map([
-      [1, { id: 1 }],
-      [2, { id: 2 }]
-    ]) as any
+    mockGraph.links = createMockLinks([
+      createMockLLink({ id: 1 }),
+      createMockLLink({ id: 2 })
+    ])
 
     const hasChanges = graphManager.checkForChanges()
     expect(hasChanges).toBe(true)
@@ -214,7 +221,7 @@ describe('useMinimapGraph', () => {
     const originalOnNodeRemoved = vi.fn()
     mockGraph.onNodeRemoved = originalOnNodeRemoved
 
-    const graphRef = ref(mockGraph as any)
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
     const graphManager = useMinimapGraph(graphRef, onGraphChangedMock)
 
     graphManager.setupEventListeners()
@@ -227,7 +234,7 @@ describe('useMinimapGraph', () => {
   })
 
   it('should destroy properly', () => {
-    const graphRef = ref(mockGraph as any)
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
     const graphManager = useMinimapGraph(graphRef, onGraphChangedMock)
 
     graphManager.init()
@@ -241,7 +248,7 @@ describe('useMinimapGraph', () => {
   })
 
   it('should clear cache', () => {
-    const graphRef = ref(mockGraph as any)
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
     const graphManager = useMinimapGraph(graphRef, onGraphChangedMock)
 
     // Populate cache
@@ -256,7 +263,7 @@ describe('useMinimapGraph', () => {
   })
 
   it('should handle null graph gracefully', () => {
-    const graphRef = ref(null as any)
+    const graphRef = ref(null) as Ref<LGraph | null>
     const graphManager = useMinimapGraph(graphRef, onGraphChangedMock)
 
     expect(() => graphManager.setupEventListeners()).not.toThrow()
@@ -265,7 +272,7 @@ describe('useMinimapGraph', () => {
   })
 
   it('should clean up removed nodes from cache', () => {
-    const graphRef = ref(mockGraph as any)
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
     const graphManager = useMinimapGraph(graphRef, onGraphChangedMock)
 
     // Cache initial state
@@ -283,7 +290,7 @@ describe('useMinimapGraph', () => {
     const throttledFn = vi.fn()
     vi.mocked(useThrottleFn).mockReturnValue(throttledFn)
 
-    const graphRef = ref(mockGraph as any)
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
     const graphManager = useMinimapGraph(graphRef, onGraphChangedMock)
 
     graphManager.setupEventListeners()
diff --git a/src/renderer/extensions/minimap/composables/useMinimapGraph.ts b/src/renderer/extensions/minimap/composables/useMinimapGraph.ts
index 54d6320fd7..9d7b620d38 100644
--- a/src/renderer/extensions/minimap/composables/useMinimapGraph.ts
+++ b/src/renderer/extensions/minimap/composables/useMinimapGraph.ts
@@ -102,9 +102,7 @@ export function useMinimapGraph(
 
     const originalCallbacks = originalCallbacksMap.get(g.id)
     if (!originalCallbacks) {
-      console.error(
-        'Attempted to cleanup event listeners for graph that was never set up'
-      )
+      // Graph was never set up (e.g., minimap destroyed before init) - nothing to clean up
       return
     }
 
diff --git a/tests-ui/tests/renderer/extensions/minimap/composables/useMinimapInteraction.test.ts b/src/renderer/extensions/minimap/composables/useMinimapInteraction.test.ts
similarity index 91%
rename from tests-ui/tests/renderer/extensions/minimap/composables/useMinimapInteraction.test.ts
rename to src/renderer/extensions/minimap/composables/useMinimapInteraction.test.ts
index 342ec9bdcf..2380d6abf2 100644
--- a/tests-ui/tests/renderer/extensions/minimap/composables/useMinimapInteraction.test.ts
+++ b/src/renderer/extensions/minimap/composables/useMinimapInteraction.test.ts
@@ -1,5 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { ref } from 'vue'
+import type { Ref } from 'vue'
 
 import { useMinimapInteraction } from '@/renderer/extensions/minimap/composables/useMinimapInteraction'
 import type { MinimapCanvas } from '@/renderer/extensions/minimap/types'
@@ -19,7 +20,7 @@ describe('useMinimapInteraction', () => {
         width: 250,
         height: 200
       })
-    } as any
+    } as Partial<HTMLDivElement> as HTMLDivElement
 
     mockCanvas = {
       ds: {
@@ -27,7 +28,7 @@ describe('useMinimapInteraction', () => {
         offset: [0, 0]
       },
       setDirty: vi.fn()
-    } as any
+    } as Partial<MinimapCanvas> as MinimapCanvas
 
     centerViewOnMock = vi.fn<(worldX: number, worldY: number) => void>()
   })
@@ -36,7 +37,7 @@ describe('useMinimapInteraction', () => {
     const containerRef = ref(mockContainer)
     const boundsRef = ref({ minX: 0, minY: 0, width: 500, height: 400 })
     const scaleRef = ref(0.5)
-    const canvasRef = ref(mockCanvas as any)
+    const canvasRef = ref(mockCanvas) as Ref<MinimapCanvas | null>
 
     const interaction = useMinimapInteraction(
       containerRef,
@@ -61,7 +62,7 @@ describe('useMinimapInteraction', () => {
     const containerRef = ref(mockContainer)
     const boundsRef = ref({ minX: 0, minY: 0, width: 500, height: 400 })
     const scaleRef = ref(0.5)
-    const canvasRef = ref(mockCanvas as any)
+    const canvasRef = ref(mockCanvas) as Ref<MinimapCanvas | null>
 
     const interaction = useMinimapInteraction(
       containerRef,
@@ -89,7 +90,7 @@ describe('useMinimapInteraction', () => {
     const containerRef = ref(mockContainer)
     const boundsRef = ref({ minX: 0, minY: 0, width: 500, height: 400 })
     const scaleRef = ref(0.5)
-    const canvasRef = ref(mockCanvas as any)
+    const canvasRef = ref(mockCanvas) as Ref<MinimapCanvas | null>
 
     const interaction = useMinimapInteraction(
       containerRef,
@@ -117,7 +118,7 @@ describe('useMinimapInteraction', () => {
     const containerRef = ref(mockContainer)
     const boundsRef = ref({ minX: 0, minY: 0, width: 500, height: 400 })
     const scaleRef = ref(0.5)
-    const canvasRef = ref(mockCanvas as any)
+    const canvasRef = ref(mockCanvas) as Ref<MinimapCanvas | null>
 
     const interaction = useMinimapInteraction(
       containerRef,
@@ -163,7 +164,7 @@ describe('useMinimapInteraction', () => {
     const containerRef = ref(mockContainer)
     const boundsRef = ref({ minX: 0, minY: 0, width: 500, height: 400 })
     const scaleRef = ref(0.5)
-    const canvasRef = ref(mockCanvas as any)
+    const canvasRef = ref(mockCanvas) as Ref<MinimapCanvas | null>
 
     const interaction = useMinimapInteraction(
       containerRef,
@@ -189,7 +190,7 @@ describe('useMinimapInteraction', () => {
     const containerRef = ref(mockContainer)
     const boundsRef = ref({ minX: 0, minY: 0, width: 500, height: 400 })
     const scaleRef = ref(0.5)
-    const canvasRef = ref(mockCanvas as any)
+    const canvasRef = ref(mockCanvas) as Ref<MinimapCanvas | null>
 
     const interaction = useMinimapInteraction(
       containerRef,
@@ -220,7 +221,7 @@ describe('useMinimapInteraction', () => {
     const containerRef = ref(mockContainer)
     const boundsRef = ref({ minX: 0, minY: 0, width: 500, height: 400 })
     const scaleRef = ref(0.5)
-    const canvasRef = ref(mockCanvas as any)
+    const canvasRef = ref(mockCanvas) as Ref<MinimapCanvas | null>
 
     const interaction = useMinimapInteraction(
       containerRef,
@@ -250,7 +251,7 @@ describe('useMinimapInteraction', () => {
     const containerRef = ref(mockContainer)
     const boundsRef = ref({ minX: 0, minY: 0, width: 500, height: 400 })
     const scaleRef = ref(0.5)
-    const canvasRef = ref(mockCanvas as any)
+    const canvasRef = ref(mockCanvas) as Ref<MinimapCanvas | null>
 
     const interaction = useMinimapInteraction(
       containerRef,
@@ -283,7 +284,7 @@ describe('useMinimapInteraction', () => {
     const containerRef = ref<HTMLDivElement | null>(null)
     const boundsRef = ref({ minX: 0, minY: 0, width: 500, height: 400 })
     const scaleRef = ref(0.5)
-    const canvasRef = ref(mockCanvas as any)
+    const canvasRef = ref(mockCanvas) as Ref<MinimapCanvas | null>
 
     const interaction = useMinimapInteraction(
       containerRef,
@@ -306,7 +307,7 @@ describe('useMinimapInteraction', () => {
     const containerRef = ref(mockContainer)
     const boundsRef = ref({ minX: 0, minY: 0, width: 500, height: 400 })
     const scaleRef = ref(0.5)
-    const canvasRef = ref(null as any)
+    const canvasRef = ref(null) as Ref<MinimapCanvas | null>
 
     const interaction = useMinimapInteraction(
       containerRef,
diff --git a/tests-ui/tests/renderer/extensions/minimap/composables/useMinimapRenderer.test.ts b/src/renderer/extensions/minimap/composables/useMinimapRenderer.test.ts
similarity index 90%
rename from tests-ui/tests/renderer/extensions/minimap/composables/useMinimapRenderer.test.ts
rename to src/renderer/extensions/minimap/composables/useMinimapRenderer.test.ts
index a5202059d6..0546d395b1 100644
--- a/tests-ui/tests/renderer/extensions/minimap/composables/useMinimapRenderer.test.ts
+++ b/src/renderer/extensions/minimap/composables/useMinimapRenderer.test.ts
@@ -1,5 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { ref, shallowRef } from 'vue'
+import type { Ref } from 'vue'
 
 import type { LGraph } from '@/lib/litegraph/src/litegraph'
 import { useMinimapRenderer } from '@/renderer/extensions/minimap/composables/useMinimapRenderer'
@@ -19,21 +20,23 @@ describe('useMinimapRenderer', () => {
     vi.clearAllMocks()
 
     mockContext = {
-      clearRect: vi.fn()
-    } as any
+      clearRect: vi.fn(),
+      save: vi.fn(),
+      restore: vi.fn()
+    } as Partial<CanvasRenderingContext2D> as CanvasRenderingContext2D
 
     mockCanvas = {
       getContext: vi.fn().mockReturnValue(mockContext)
-    } as any
+    } as Partial<HTMLCanvasElement> as HTMLCanvasElement
 
     mockGraph = {
       _nodes: [{ id: '1', pos: [0, 0], size: [100, 100] }]
-    } as any
+    } as Partial<LGraph> as LGraph
   })
 
   it('should initialize with full redraw needed', () => {
     const canvasRef = shallowRef<HTMLCanvasElement | null>(mockCanvas)
-    const graphRef = ref(mockGraph as any)
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
     const boundsRef = ref({ minX: 0, minY: 0, width: 100, height: 100 })
     const scaleRef = ref(1)
     const updateFlagsRef = ref<UpdateFlags>({
@@ -66,9 +69,9 @@ describe('useMinimapRenderer', () => {
   })
 
   it('should handle empty graph with fast path', () => {
-    const emptyGraph = { _nodes: [] } as any
+    const emptyGraph = { _nodes: [] } as Partial<LGraph> as LGraph
     const canvasRef = ref(mockCanvas)
-    const graphRef = ref(emptyGraph)
+    const graphRef = ref(emptyGraph) as Ref<LGraph | null>
     const boundsRef = ref({ minX: 0, minY: 0, width: 100, height: 100 })
     const scaleRef = ref(1)
     const updateFlagsRef = ref<UpdateFlags>({
@@ -102,11 +105,9 @@ describe('useMinimapRenderer', () => {
     expect(vi.mocked(renderMinimapToCanvas)).not.toHaveBeenCalled()
   })
 
-  it('should only render when redraw is needed', async () => {
-    const { renderMinimapToCanvas } =
-      await import('@/renderer/extensions/minimap/minimapCanvasRenderer')
+  it('should only render when redraw is needed', () => {
     const canvasRef = ref(mockCanvas)
-    const graphRef = ref(mockGraph as any)
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
     const boundsRef = ref({ minX: 0, minY: 0, width: 100, height: 100 })
     const scaleRef = ref(1)
     const updateFlagsRef = ref<UpdateFlags>({
@@ -153,7 +154,7 @@ describe('useMinimapRenderer', () => {
     const updateViewport = vi.fn()
 
     const canvasRef = ref(mockCanvas)
-    const graphRef = ref(mockGraph as any)
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
     const boundsRef = ref({ minX: 0, minY: 0, width: 100, height: 100 })
     const scaleRef = ref(1)
     const updateFlagsRef = ref<UpdateFlags>({
@@ -192,7 +193,7 @@ describe('useMinimapRenderer', () => {
 
   it('should force full redraw when requested', () => {
     const canvasRef = ref(mockCanvas)
-    const graphRef = ref(mockGraph as any)
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
     const boundsRef = ref({ minX: 0, minY: 0, width: 100, height: 100 })
     const scaleRef = ref(1)
     const updateFlagsRef = ref<UpdateFlags>({
@@ -231,7 +232,7 @@ describe('useMinimapRenderer', () => {
 
   it('should handle null canvas gracefully', () => {
     const canvasRef = shallowRef<HTMLCanvasElement | null>(null)
-    const graphRef = ref(mockGraph as any)
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
     const boundsRef = ref({ minX: 0, minY: 0, width: 100, height: 100 })
     const scaleRef = ref(1)
     const updateFlagsRef = ref<UpdateFlags>({
diff --git a/tests-ui/tests/renderer/extensions/minimap/composables/useMinimapSettings.test.ts b/src/renderer/extensions/minimap/composables/useMinimapSettings.test.ts
similarity index 59%
rename from tests-ui/tests/renderer/extensions/minimap/composables/useMinimapSettings.test.ts
rename to src/renderer/extensions/minimap/composables/useMinimapSettings.test.ts
index b74ec9ff3b..44d2d0f57f 100644
--- a/tests-ui/tests/renderer/extensions/minimap/composables/useMinimapSettings.test.ts
+++ b/src/renderer/extensions/minimap/composables/useMinimapSettings.test.ts
@@ -1,23 +1,29 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { useMinimapSettings } from '@/renderer/extensions/minimap/composables/useMinimapSettings'
-import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
+
+type MockSettingStore = ReturnType<typeof useSettingStore>
+
+const mockUseColorPaletteStore = vi.hoisted(() => vi.fn())
 
 vi.mock('@/platform/settings/settingStore')
-vi.mock('@/stores/workspace/colorPaletteStore')
+vi.mock('@/stores/workspace/colorPaletteStore', () => ({
+  useColorPaletteStore: mockUseColorPaletteStore
+}))
 
 describe('useMinimapSettings', () => {
   beforeEach(() => {
-    setActivePinia(createPinia())
+    setActivePinia(createTestingPinia({ stubActions: false }))
     vi.clearAllMocks()
   })
 
   it('should return all minimap settings as computed refs', () => {
     const mockSettingStore = {
       get: vi.fn((key: string) => {
-        const settings: Record<string, any> = {
+        const settings: Record<string, unknown> = {
           'Comfy.Minimap.NodeColors': true,
           'Comfy.Minimap.ShowLinks': false,
           'Comfy.Minimap.ShowGroups': true,
@@ -28,10 +34,17 @@ describe('useMinimapSettings', () => {
       })
     }
 
-    vi.mocked(useSettingStore).mockReturnValue(mockSettingStore as any)
-    vi.mocked(useColorPaletteStore).mockReturnValue({
-      completedActivePalette: { light_theme: false }
-    } as any)
+    vi.mocked(useSettingStore).mockReturnValue(
+      mockSettingStore as Partial<MockSettingStore> as MockSettingStore
+    )
+    mockUseColorPaletteStore.mockReturnValue({
+      completedActivePalette: {
+        id: 'test',
+        name: 'Test Palette',
+        colors: {},
+        light_theme: false
+      }
+    })
 
     const settings = useMinimapSettings()
 
@@ -44,13 +57,18 @@ describe('useMinimapSettings', () => {
 
   it('should generate container styles based on theme', () => {
     const mockColorPaletteStore = {
-      completedActivePalette: { light_theme: false }
+      completedActivePalette: {
+        id: 'test',
+        name: 'Test Palette',
+        colors: {},
+        light_theme: false
+      }
     }
 
-    vi.mocked(useSettingStore).mockReturnValue({ get: vi.fn() } as any)
-    vi.mocked(useColorPaletteStore).mockReturnValue(
-      mockColorPaletteStore as any
-    )
+    vi.mocked(useSettingStore).mockReturnValue({
+      get: vi.fn()
+    } as Partial<MockSettingStore> as MockSettingStore)
+    mockUseColorPaletteStore.mockReturnValue(mockColorPaletteStore)
 
     const settings = useMinimapSettings()
     const styles = settings.containerStyles.value
@@ -63,13 +81,18 @@ describe('useMinimapSettings', () => {
 
   it('should generate light theme container styles', () => {
     const mockColorPaletteStore = {
-      completedActivePalette: { light_theme: true }
+      completedActivePalette: {
+        id: 'test',
+        name: 'Test Palette',
+        colors: {},
+        light_theme: true
+      }
     }
 
-    vi.mocked(useSettingStore).mockReturnValue({ get: vi.fn() } as any)
-    vi.mocked(useColorPaletteStore).mockReturnValue(
-      mockColorPaletteStore as any
-    )
+    vi.mocked(useSettingStore).mockReturnValue({
+      get: vi.fn()
+    } as Partial<MockSettingStore> as MockSettingStore)
+    mockUseColorPaletteStore.mockReturnValue(mockColorPaletteStore)
 
     const settings = useMinimapSettings()
     const styles = settings.containerStyles.value
@@ -82,13 +105,18 @@ describe('useMinimapSettings', () => {
 
   it('should generate panel styles based on theme', () => {
     const mockColorPaletteStore = {
-      completedActivePalette: { light_theme: false }
+      completedActivePalette: {
+        id: 'test',
+        name: 'Test Palette',
+        colors: {},
+        light_theme: false
+      }
     }
 
-    vi.mocked(useSettingStore).mockReturnValue({ get: vi.fn() } as any)
-    vi.mocked(useColorPaletteStore).mockReturnValue(
-      mockColorPaletteStore as any
-    )
+    vi.mocked(useSettingStore).mockReturnValue({
+      get: vi.fn()
+    } as Partial<MockSettingStore> as MockSettingStore)
+    mockUseColorPaletteStore.mockReturnValue(mockColorPaletteStore)
 
     const settings = useMinimapSettings()
     const styles = settings.panelStyles.value
@@ -107,10 +135,17 @@ describe('useMinimapSettings', () => {
     })
     const mockSettingStore = { get: mockGet }
 
-    vi.mocked(useSettingStore).mockReturnValue(mockSettingStore as any)
-    vi.mocked(useColorPaletteStore).mockReturnValue({
-      completedActivePalette: { light_theme: false }
-    } as any)
+    vi.mocked(useSettingStore).mockReturnValue(
+      mockSettingStore as Partial<MockSettingStore> as MockSettingStore
+    )
+    mockUseColorPaletteStore.mockReturnValue({
+      completedActivePalette: {
+        id: 'test',
+        name: 'Test Palette',
+        colors: {},
+        light_theme: false
+      }
+    })
 
     const settings = useMinimapSettings()
 
diff --git a/tests-ui/tests/renderer/extensions/minimap/composables/useMinimapViewport.test.ts b/src/renderer/extensions/minimap/composables/useMinimapViewport.test.ts
similarity index 78%
rename from tests-ui/tests/renderer/extensions/minimap/composables/useMinimapViewport.test.ts
rename to src/renderer/extensions/minimap/composables/useMinimapViewport.test.ts
index de50afc8ac..60437cc641 100644
--- a/tests-ui/tests/renderer/extensions/minimap/composables/useMinimapViewport.test.ts
+++ b/src/renderer/extensions/minimap/composables/useMinimapViewport.test.ts
@@ -1,12 +1,27 @@
 import { useRafFn } from '@vueuse/core'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { ref } from 'vue'
+import type { Ref } from 'vue'
 
 import type { LGraph } from '@/lib/litegraph/src/litegraph'
+import {
+  calculateMinimapScale,
+  calculateNodeBounds,
+  enforceMinimumBounds
+} from '@/renderer/core/spatial/boundsCalculator'
 import { useMinimapViewport } from '@/renderer/extensions/minimap/composables/useMinimapViewport'
 import type { MinimapCanvas } from '@/renderer/extensions/minimap/types'
 
 vi.mock('@vueuse/core')
+vi.mock('@/renderer/core/canvas/canvasStore', () => ({
+  useCanvasStore: vi.fn()
+}))
+
+vi.mock('@/stores/executionStore', () => ({
+  useExecutionStore: vi.fn().mockReturnValue({
+    nodeProgressStates: {}
+  })
+}))
 vi.mock('@/renderer/core/spatial/boundsCalculator', () => ({
   calculateNodeBounds: vi.fn(),
   calculateMinimapScale: vi.fn(),
@@ -39,7 +54,7 @@ describe('useMinimapViewport', () => {
         { pos: [100, 100], size: [150, 80] },
         { pos: [300, 200], size: [120, 60] }
       ]
-    } as any
+    } as Partial<LGraph> as LGraph
 
     vi.mocked(useRafFn, { partial: true }).mockReturnValue({
       resume: vi.fn(),
@@ -48,8 +63,8 @@ describe('useMinimapViewport', () => {
   })
 
   it('should initialize with default bounds', () => {
-    const canvasRef = ref(mockCanvas as any)
-    const graphRef = ref(mockGraph as any)
+    const canvasRef = ref(mockCanvas) as Ref<MinimapCanvas | null>
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
 
     const viewport = useMinimapViewport(canvasRef, graphRef, 250, 200)
 
@@ -65,10 +80,7 @@ describe('useMinimapViewport', () => {
     expect(viewport.scale.value).toBe(1)
   })
 
-  it('should calculate graph bounds from nodes', async () => {
-    const { calculateNodeBounds, enforceMinimumBounds } =
-      await import('@/renderer/core/spatial/boundsCalculator')
-
+  it('should calculate graph bounds from nodes', () => {
     vi.mocked(calculateNodeBounds).mockReturnValue({
       minX: 100,
       minY: 100,
@@ -80,8 +92,8 @@ describe('useMinimapViewport', () => {
 
     vi.mocked(enforceMinimumBounds).mockImplementation((bounds) => bounds)
 
-    const canvasRef = ref(mockCanvas as any)
-    const graphRef = ref(mockGraph as any)
+    const canvasRef = ref(mockCanvas) as Ref<MinimapCanvas | null>
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
 
     const viewport = useMinimapViewport(canvasRef, graphRef, 250, 200)
 
@@ -91,14 +103,13 @@ describe('useMinimapViewport', () => {
     expect(enforceMinimumBounds).toHaveBeenCalled()
   })
 
-  it('should handle empty graph', async () => {
-    const { calculateNodeBounds } =
-      await import('@/renderer/core/spatial/boundsCalculator')
-
+  it('should handle empty graph', () => {
     vi.mocked(calculateNodeBounds).mockReturnValue(null)
 
-    const canvasRef = ref(mockCanvas as any)
-    const graphRef = ref({ _nodes: [] } as any)
+    const canvasRef = ref(mockCanvas) as Ref<MinimapCanvas | null>
+    const graphRef = ref({
+      _nodes: []
+    } as Partial<LGraph> as LGraph) as Ref<LGraph | null>
 
     const viewport = useMinimapViewport(canvasRef, graphRef, 250, 200)
 
@@ -115,8 +126,8 @@ describe('useMinimapViewport', () => {
   })
 
   it('should update canvas dimensions', () => {
-    const canvasRef = ref(mockCanvas as any)
-    const graphRef = ref(mockGraph as any)
+    const canvasRef = ref(mockCanvas) as Ref<MinimapCanvas | null>
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
 
     const viewport = useMinimapViewport(canvasRef, graphRef, 250, 200)
 
@@ -128,11 +139,7 @@ describe('useMinimapViewport', () => {
     })
   })
 
-  it('should calculate viewport transform', async () => {
-    const { calculateNodeBounds, enforceMinimumBounds, calculateMinimapScale } =
-      await import('@/renderer/core/spatial/boundsCalculator')
-
-    // Mock the bounds calculation
+  it('should calculate viewport transform', () => {
     vi.mocked(calculateNodeBounds).mockReturnValue({
       minX: 0,
       minY: 0,
@@ -145,8 +152,8 @@ describe('useMinimapViewport', () => {
     vi.mocked(enforceMinimumBounds).mockImplementation((bounds) => bounds)
     vi.mocked(calculateMinimapScale).mockReturnValue(0.5)
 
-    const canvasRef = ref(mockCanvas as any)
-    const graphRef = ref(mockGraph as any)
+    const canvasRef = ref(mockCanvas) as Ref<MinimapCanvas | null>
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
 
     const viewport = useMinimapViewport(canvasRef, graphRef, 250, 200)
 
@@ -181,8 +188,8 @@ describe('useMinimapViewport', () => {
   })
 
   it('should center view on world coordinates', () => {
-    const canvasRef = ref(mockCanvas as any)
-    const graphRef = ref(mockGraph as any)
+    const canvasRef = ref(mockCanvas) as Ref<MinimapCanvas | null>
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
 
     const viewport = useMinimapViewport(canvasRef, graphRef, 250, 200)
 
@@ -209,8 +216,8 @@ describe('useMinimapViewport', () => {
       pause: stopSyncMock
     })
 
-    const canvasRef = ref(mockCanvas as any)
-    const graphRef = ref(mockGraph as any)
+    const canvasRef = ref(mockCanvas) as Ref<MinimapCanvas | null>
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
 
     const viewport = useMinimapViewport(canvasRef, graphRef, 250, 200)
 
@@ -222,8 +229,8 @@ describe('useMinimapViewport', () => {
   })
 
   it('should handle null canvas gracefully', () => {
-    const canvasRef = ref(null as any)
-    const graphRef = ref(mockGraph as any)
+    const canvasRef = ref(null) as Ref<MinimapCanvas | null>
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
 
     const viewport = useMinimapViewport(canvasRef, graphRef, 250, 200)
 
@@ -233,10 +240,7 @@ describe('useMinimapViewport', () => {
     expect(() => viewport.centerViewOn(100, 100)).not.toThrow()
   })
 
-  it('should calculate scale correctly', async () => {
-    const { calculateMinimapScale, calculateNodeBounds, enforceMinimumBounds } =
-      await import('@/renderer/core/spatial/boundsCalculator')
-
+  it('should calculate scale correctly', () => {
     const testBounds = {
       minX: 0,
       minY: 0,
@@ -250,8 +254,8 @@ describe('useMinimapViewport', () => {
     vi.mocked(enforceMinimumBounds).mockImplementation((bounds) => bounds)
     vi.mocked(calculateMinimapScale).mockReturnValue(0.4)
 
-    const canvasRef = ref(mockCanvas as any)
-    const graphRef = ref(mockGraph as any)
+    const canvasRef = ref(mockCanvas) as Ref<MinimapCanvas | null>
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
 
     const viewport = useMinimapViewport(canvasRef, graphRef, 250, 200)
 
@@ -268,8 +272,8 @@ describe('useMinimapViewport', () => {
       configurable: true
     })
 
-    const canvasRef = ref(mockCanvas as any)
-    const graphRef = ref(mockGraph as any)
+    const canvasRef = ref(mockCanvas) as Ref<MinimapCanvas | null>
+    const graphRef = ref(mockGraph) as Ref<LGraph | null>
 
     const viewport = useMinimapViewport(canvasRef, graphRef, 250, 200)
 
diff --git a/src/renderer/extensions/minimap/data/LayoutStoreDataSource.ts b/src/renderer/extensions/minimap/data/LayoutStoreDataSource.ts
index c0daf7030f..725c268132 100644
--- a/src/renderer/extensions/minimap/data/LayoutStoreDataSource.ts
+++ b/src/renderer/extensions/minimap/data/LayoutStoreDataSource.ts
@@ -1,8 +1,11 @@
 import { layoutStore } from '@/renderer/core/layout/store/layoutStore'
+import { useExecutionStore } from '@/stores/executionStore'
 
 import type { MinimapNodeData } from '../types'
 import { AbstractMinimapDataSource } from './AbstractMinimapDataSource'
 
+let executionStore: ReturnType<typeof useExecutionStore> | null = null
+
 /**
  * Layout Store data source implementation
  */
@@ -11,12 +14,19 @@ export class LayoutStoreDataSource extends AbstractMinimapDataSource {
     const allNodes = layoutStore.getAllNodes().value
     if (allNodes.size === 0) return []
 
+    if (!executionStore) {
+      executionStore = useExecutionStore()
+    }
+    const nodeProgressStates = executionStore.nodeLocationProgressStates
+
     const nodes: MinimapNodeData[] = []
 
     for (const [nodeId, layout] of allNodes) {
       // Find corresponding LiteGraph node for additional properties
       const graphNode = this.graph?._nodes?.find((n) => String(n.id) === nodeId)
 
+      const executionState = nodeProgressStates[nodeId]?.state ?? null
+
       nodes.push({
         id: nodeId,
         x: layout.position.x,
@@ -25,7 +35,8 @@ export class LayoutStoreDataSource extends AbstractMinimapDataSource {
         height: layout.size.height,
         bgcolor: graphNode?.bgcolor,
         mode: graphNode?.mode,
-        hasErrors: graphNode?.has_errors
+        hasErrors: graphNode?.has_errors,
+        executionState
       })
     }
 
diff --git a/src/renderer/extensions/minimap/data/LiteGraphDataSource.ts b/src/renderer/extensions/minimap/data/LiteGraphDataSource.ts
index 8e1048e750..8374f86a55 100644
--- a/src/renderer/extensions/minimap/data/LiteGraphDataSource.ts
+++ b/src/renderer/extensions/minimap/data/LiteGraphDataSource.ts
@@ -1,3 +1,5 @@
+import { useExecutionStore } from '@/stores/executionStore'
+
 import type { MinimapNodeData } from '../types'
 import { AbstractMinimapDataSource } from './AbstractMinimapDataSource'
 
@@ -8,16 +10,25 @@ export class LiteGraphDataSource extends AbstractMinimapDataSource {
   getNodes(): MinimapNodeData[] {
     if (!this.graph?._nodes) return []
 
-    return this.graph._nodes.map((node) => ({
-      id: String(node.id),
-      x: node.pos[0],
-      y: node.pos[1],
-      width: node.size[0],
-      height: node.size[1],
-      bgcolor: node.bgcolor,
-      mode: node.mode,
-      hasErrors: node.has_errors
-    }))
+    const executionStore = useExecutionStore()
+    const nodeProgressStates = executionStore.nodeProgressStates
+
+    return this.graph._nodes.map((node) => {
+      const nodeId = String(node.id)
+      const executionState = nodeProgressStates[nodeId]?.state ?? null
+
+      return {
+        id: nodeId,
+        x: node.pos[0],
+        y: node.pos[1],
+        width: node.size[0],
+        height: node.size[1],
+        bgcolor: node.bgcolor,
+        mode: node.mode,
+        hasErrors: node.has_errors,
+        executionState
+      }
+    })
   }
 
   getNodeCount(): number {
diff --git a/tests-ui/tests/minimap/MinimapDataSource.test.ts b/src/renderer/extensions/minimap/data/MinimapDataSource.test.ts
similarity index 95%
rename from tests-ui/tests/minimap/MinimapDataSource.test.ts
rename to src/renderer/extensions/minimap/data/MinimapDataSource.test.ts
index eff6ba771b..51ab1c7383 100644
--- a/tests-ui/tests/minimap/MinimapDataSource.test.ts
+++ b/src/renderer/extensions/minimap/data/MinimapDataSource.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it, vi } from 'vitest'
-import { type ComputedRef, computed } from 'vue'
+import { computed } from 'vue'
+import type { ComputedRef } from 'vue'
 
 import type { NodeId } from '@/lib/litegraph/src/LGraphNode'
 import type { LGraph, LGraphNode, LLink } from '@/lib/litegraph/src/litegraph'
@@ -14,6 +15,13 @@ vi.mock('@/renderer/core/layout/store/layoutStore', () => ({
   }
 }))
 
+// Mock useExecutionStore
+vi.mock('@/stores/executionStore', () => ({
+  useExecutionStore: vi.fn().mockReturnValue({
+    nodeProgressStates: {}
+  })
+}))
+
 // Helper to create mock links that satisfy LGraph['links'] type
 function createMockLinks(): LGraph['links'] {
   const map = new Map<number, LLink>()
diff --git a/tests-ui/tests/renderer/extensions/minimap/minimapCanvasRenderer.test.ts b/src/renderer/extensions/minimap/minimapCanvasRenderer.test.ts
similarity index 82%
rename from tests-ui/tests/renderer/extensions/minimap/minimapCanvasRenderer.test.ts
rename to src/renderer/extensions/minimap/minimapCanvasRenderer.test.ts
index 25d0058cd7..9141a3ba3d 100644
--- a/tests-ui/tests/renderer/extensions/minimap/minimapCanvasRenderer.test.ts
+++ b/src/renderer/extensions/minimap/minimapCanvasRenderer.test.ts
@@ -1,17 +1,33 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
+import type { LGraph } from '@/lib/litegraph/src/litegraph'
 import { LGraphEventMode } from '@/lib/litegraph/src/litegraph'
-import type { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph'
 import { renderMinimapToCanvas } from '@/renderer/extensions/minimap/minimapCanvasRenderer'
 import type { MinimapRenderContext } from '@/renderer/extensions/minimap/types'
-import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
 import { adjustColor } from '@/utils/colorUtil'
+import {
+  createMockLGraph,
+  createMockLGraphNode,
+  createMockLinks,
+  createMockLLink,
+  createMockNodeOutputSlot
+} from '@/utils/__tests__/litegraphTestUtils'
+
+const mockUseColorPaletteStore = vi.hoisted(() => vi.fn())
+vi.mock('@/stores/workspace/colorPaletteStore', () => ({
+  useColorPaletteStore: mockUseColorPaletteStore
+}))
 
-vi.mock('@/stores/workspace/colorPaletteStore')
 vi.mock('@/utils/colorUtil', () => ({
   adjustColor: vi.fn((color: string) => color + '_adjusted')
 }))
 
+vi.mock('@/stores/executionStore', () => ({
+  useExecutionStore: vi.fn().mockReturnValue({
+    nodeProgressStates: {}
+  })
+}))
+
 describe('minimapCanvasRenderer', () => {
   let mockCanvas: HTMLCanvasElement
   let mockContext: CanvasRenderingContext2D
@@ -32,16 +48,18 @@ describe('minimapCanvasRenderer', () => {
       fill: vi.fn(),
       fillStyle: '',
       strokeStyle: '',
-      lineWidth: 1
-    } as any
+      lineWidth: 1,
+      save: vi.fn(),
+      restore: vi.fn()
+    } as Partial<CanvasRenderingContext2D> as CanvasRenderingContext2D
 
     mockCanvas = {
       getContext: vi.fn().mockReturnValue(mockContext)
-    } as any
+    } as Partial<HTMLCanvasElement> as HTMLCanvasElement
 
-    mockGraph = {
+    mockGraph = createMockLGraph({
       _nodes: [
-        {
+        createMockLGraphNode({
           id: '1',
           pos: [100, 100],
           size: [150, 80],
@@ -49,8 +67,8 @@ describe('minimapCanvasRenderer', () => {
           mode: LGraphEventMode.ALWAYS,
           has_errors: false,
           outputs: []
-        },
-        {
+        }),
+        createMockLGraphNode({
           id: '2',
           pos: [300, 200],
           size: [120, 60],
@@ -58,16 +76,21 @@ describe('minimapCanvasRenderer', () => {
           mode: LGraphEventMode.BYPASS,
           has_errors: true,
           outputs: []
-        }
-      ] as unknown as LGraphNode[],
+        })
+      ],
       _groups: [],
-      links: {},
+      links: {} as typeof mockGraph.links,
       getNodeById: vi.fn()
-    } as any
+    })
 
-    vi.mocked(useColorPaletteStore).mockReturnValue({
-      completedActivePalette: { light_theme: false }
-    } as any)
+    mockUseColorPaletteStore.mockReturnValue({
+      completedActivePalette: {
+        id: 'test',
+        name: 'Test Palette',
+        colors: {},
+        light_theme: false
+      }
+    })
   })
 
   it('should clear canvas and render nodes', () => {
@@ -203,7 +226,9 @@ describe('minimapCanvasRenderer', () => {
         size: [400, 300],
         color: '#0000FF'
       }
-    ] as any
+    ] as Partial<
+      (typeof mockGraph._groups)[number]
+    >[] as typeof mockGraph._groups
 
     const context: MinimapRenderContext = {
       bounds: { minX: 0, minY: 0, width: 500, height: 400 },
@@ -233,17 +258,17 @@ describe('minimapCanvasRenderer', () => {
     }
 
     mockGraph._nodes[0].outputs = [
-      {
-        links: [1]
-      }
-    ] as any
+      createMockNodeOutputSlot({
+        name: 'output',
+        type: 'number',
+        links: [1],
+        boundingRect: new Float64Array([0, 0, 10, 10])
+      })
+    ]
 
-    // Create a hybrid Map/Object for links as LiteGraph expects
-    const linksMap = new Map([[1, { id: 1, target_id: 2 }]])
-    const links = Object.assign(linksMap, {
-      1: { id: 1, target_id: 2 }
-    })
-    mockGraph.links = links as any
+    mockGraph.links = createMockLinks([
+      createMockLLink({ id: 1, target_id: 2, origin_slot: 0, target_slot: 0 })
+    ])
 
     mockGraph.getNodeById = vi.fn().mockReturnValue(targetNode)
 
@@ -275,9 +300,14 @@ describe('minimapCanvasRenderer', () => {
   })
 
   it('should handle light theme colors', () => {
-    vi.mocked(useColorPaletteStore).mockReturnValue({
-      completedActivePalette: { light_theme: true }
-    } as any)
+    mockUseColorPaletteStore.mockReturnValue({
+      completedActivePalette: {
+        id: 'test',
+        name: 'Test Palette',
+        colors: {},
+        light_theme: true
+      }
+    })
 
     const context: MinimapRenderContext = {
       bounds: { minX: 0, minY: 0, width: 500, height: 400 },
diff --git a/src/renderer/extensions/minimap/minimapCanvasRenderer.ts b/src/renderer/extensions/minimap/minimapCanvasRenderer.ts
index 3e547ce689..ee1ff83180 100644
--- a/src/renderer/extensions/minimap/minimapCanvasRenderer.ts
+++ b/src/renderer/extensions/minimap/minimapCanvasRenderer.ts
@@ -26,6 +26,8 @@ function getMinimapColors() {
     groupColorDefault: isLightTheme ? '#283640' : '#B3C1CB',
     bypassColor: isLightTheme ? '#DBDBDB' : '#4B184B',
     errorColor: '#FF0000',
+    runningColor: '#00FF00',
+    successColor: '#239B23',
     isLightTheme
   }
 }
@@ -103,10 +105,19 @@ function renderNodes(
   const nodes = dataSource.getNodes()
   if (nodes.length === 0) return
 
+  ctx.save()
+
   // Group nodes by color for batch rendering (performance optimization)
   const nodesByColor = new Map<
     string,
-    Array<{ x: number; y: number; w: number; h: number; hasErrors?: boolean }>
+    Array<{
+      x: number
+      y: number
+      w: number
+      h: number
+      hasErrors?: boolean
+      executionState?: 'pending' | 'running' | 'finished' | 'error' | null
+    }>
   >()
 
   for (const node of nodes) {
@@ -121,7 +132,14 @@ function renderNodes(
       nodesByColor.set(color, [])
     }
 
-    nodesByColor.get(color)!.push({ x, y, w, h, hasErrors: node.hasErrors })
+    nodesByColor.get(color)!.push({
+      x,
+      y,
+      w,
+      h,
+      hasErrors: node.hasErrors,
+      executionState: node.executionState
+    })
   }
 
   // Batch render nodes by color
@@ -132,18 +150,29 @@ function renderNodes(
     }
   }
 
-  // Render error outlines if needed
-  if (context.settings.renderError) {
-    ctx.strokeStyle = colors.errorColor
-    ctx.lineWidth = 0.3
-    for (const nodes of nodesByColor.values()) {
-      for (const node of nodes) {
-        if (node.hasErrors) {
-          ctx.strokeRect(node.x, node.y, node.w, node.h)
-        }
+  ctx.lineWidth = 0.3
+  for (const nodes of nodesByColor.values()) {
+    for (const node of nodes) {
+      if (node.hasErrors && context.settings.renderError) {
+        ctx.strokeStyle = colors.errorColor
+        ctx.strokeRect(node.x, node.y, node.w, node.h)
+      } else if (node.executionState === 'running') {
+        ctx.strokeStyle = colors.runningColor
+        ctx.strokeRect(node.x, node.y, node.w, node.h)
+      } else if (node.executionState === 'finished') {
+        ctx.strokeStyle = colors.successColor
+        ctx.strokeRect(node.x, node.y, node.w, node.h)
+      } else if (
+        node.executionState === 'error' &&
+        context.settings.renderError
+      ) {
+        ctx.strokeStyle = colors.errorColor
+        ctx.strokeRect(node.x, node.y, node.w, node.h)
       }
     }
   }
+
+  ctx.restore()
 }
 
 /**
diff --git a/src/renderer/extensions/minimap/types.ts b/src/renderer/extensions/minimap/types.ts
index b458718ea8..d23200a2e9 100644
--- a/src/renderer/extensions/minimap/types.ts
+++ b/src/renderer/extensions/minimap/types.ts
@@ -80,6 +80,7 @@ export interface MinimapNodeData {
   bgcolor?: string
   mode?: number
   hasErrors?: boolean
+  executionState?: 'pending' | 'running' | 'finished' | 'error' | null
 }
 
 /**
diff --git a/src/renderer/extensions/vueNodes/VideoPreview.test.ts b/src/renderer/extensions/vueNodes/VideoPreview.test.ts
new file mode 100644
index 0000000000..eca76f8a77
--- /dev/null
+++ b/src/renderer/extensions/vueNodes/VideoPreview.test.ts
@@ -0,0 +1,106 @@
+import { createTestingPinia } from '@pinia/testing'
+import { mount } from '@vue/test-utils'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { nextTick } from 'vue'
+import { createI18n } from 'vue-i18n'
+import type { ComponentProps } from 'vue-component-type-helpers'
+
+import VideoPreview from '@/renderer/extensions/vueNodes/VideoPreview.vue'
+
+vi.mock('@/base/common/downloadUtil', () => ({
+  downloadFile: vi.fn()
+}))
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      g: {
+        downloadVideo: 'Download video',
+        removeVideo: 'Remove video',
+        viewVideoOfTotal: 'View video {index} of {total}',
+        videoPreview:
+          'Video preview - Use arrow keys to navigate between videos',
+        errorLoadingVideo: 'Error loading video',
+        failedToDownloadVideo: 'Failed to download video',
+        calculatingDimensions: 'Calculating dimensions',
+        videoFailedToLoad: 'Video failed to load',
+        loading: 'Loading'
+      }
+    }
+  }
+})
+
+describe('VideoPreview', () => {
+  const defaultProps: ComponentProps<typeof VideoPreview> = {
+    imageUrls: [
+      '/api/view?filename=test1.mp4&type=output',
+      '/api/view?filename=test2.mp4&type=output'
+    ]
+  }
+
+  afterEach(() => {
+    vi.clearAllMocks()
+  })
+
+  function mountVideoPreview(
+    props: Partial<ComponentProps<typeof VideoPreview>> = {}
+  ) {
+    return mount(VideoPreview, {
+      props: { ...defaultProps, ...props } as ComponentProps<
+        typeof VideoPreview
+      >,
+      global: {
+        plugins: [createTestingPinia({ createSpy: vi.fn }), i18n],
+        stubs: {
+          Skeleton: true
+        }
+      }
+    })
+  }
+
+  describe('batch cycling with identical URLs', () => {
+    it('should not enter persistent loading state when cycling through identical videos', async () => {
+      const sameUrl = '/api/view?filename=test.mp4&type=output'
+      const wrapper = mountVideoPreview({
+        imageUrls: [sameUrl, sameUrl, sameUrl]
+      })
+
+      // Simulate initial video load
+      await wrapper.find('video').trigger('loadeddata')
+      await nextTick()
+      expect(wrapper.find('[aria-busy="true"]').exists()).toBe(false)
+
+      // Click second navigation dot to cycle to identical URL
+      const dots = wrapper.findAll('[aria-label^="View video"]')
+      await dots[1].trigger('click')
+      await nextTick()
+
+      // Should NOT be in loading state since URL didn't change
+      expect(wrapper.find('[aria-busy="true"]').exists()).toBe(false)
+    })
+
+    it('should show loader when cycling to a different URL', async () => {
+      const wrapper = mountVideoPreview({
+        imageUrls: [
+          '/api/view?filename=a.mp4&type=output',
+          '/api/view?filename=b.mp4&type=output'
+        ]
+      })
+
+      // Simulate initial video load
+      await wrapper.find('video').trigger('loadeddata')
+      await nextTick()
+      expect(wrapper.find('[aria-busy="true"]').exists()).toBe(false)
+
+      // Click second dot — different URL
+      const dots = wrapper.findAll('[aria-label^="View video"]')
+      await dots[1].trigger('click')
+      await nextTick()
+
+      // Should be in loading state since URL changed
+      expect(wrapper.find('[aria-busy="true"]').exists()).toBe(true)
+    })
+  })
+})
diff --git a/src/renderer/extensions/vueNodes/VideoPreview.vue b/src/renderer/extensions/vueNodes/VideoPreview.vue
index 06f72d6bf9..0e4d04a9ab 100644
--- a/src/renderer/extensions/vueNodes/VideoPreview.vue
+++ b/src/renderer/extensions/vueNodes/VideoPreview.vue
@@ -7,7 +7,7 @@
     <!-- Video Wrapper -->
     <div
       ref="videoWrapperEl"
-      class="relative h-full w-full grow overflow-hidden rounded-[5px] bg-node-component-surface"
+      class="relative flex flex-1 overflow-hidden rounded-[5px] bg-transparent"
       tabindex="0"
       role="region"
       :aria-label="$t('g.videoPreview')"
@@ -20,11 +20,14 @@
       <!-- Error State -->
       <div
         v-if="videoError"
-        class="flex size-full flex-col items-center justify-center bg-smoke-800/50 text-center text-white py-8"
+        role="alert"
+        class="flex flex-auto flex-col items-center justify-center bg-muted-background py-8 text-center text-base-foreground"
       >
-        <i class="mb-2 icon-[lucide--video-off] h-12 w-12 text-smoke-400" />
-        <p class="text-sm text-smoke-300">{{ $t('g.videoFailedToLoad') }}</p>
-        <p class="mt-1 text-xs text-smoke-400">
+        <i class="mb-2 icon-[lucide--video-off] size-12 text-base-foreground" />
+        <p class="text-sm text-base-foreground">
+          {{ $t('g.videoFailedToLoad') }}
+        </p>
+        <p class="mt-1 text-xs text-base-foreground">
           {{ getVideoFilename(currentVideoUrl) }}
         </p>
       </div>
@@ -62,7 +65,7 @@
           :aria-label="$t('g.downloadVideo')"
           @click="handleDownload"
         >
-          <i class="icon-[lucide--download] h-4 w-4" />
+          <i class="icon-[lucide--download] size-4" />
         </button>
 
         <!-- Close Button -->
@@ -72,14 +75,14 @@
           :aria-label="$t('g.removeVideo')"
           @click="handleRemove"
         >
-          <i class="icon-[lucide--x] h-4 w-4" />
+          <i class="icon-[lucide--x] size-4" />
         </button>
       </div>
 
       <!-- Multiple Videos Navigation -->
       <div
         v-if="hasMultipleVideos"
-        class="absolute right-2 bottom-2 left-2 flex justify-center gap-1"
+        class="absolute inset-x-2 bottom-2 flex justify-center gap-1"
       >
         <button
           v-for="(_, index) in imageUrls"
@@ -118,7 +121,7 @@ import { computed, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import { downloadFile } from '@/base/common/downloadUtil'
-import { useNodeOutputStore } from '@/stores/imagePreviewStore'
+import { useNodeOutputStore } from '@/stores/nodeOutputStore'
 import { cn } from '@/utils/tailwindUtil'
 
 interface VideoPreviewProps {
@@ -153,7 +156,15 @@ const hasMultipleVideos = computed(() => props.imageUrls.length > 1)
 // Watch for URL changes and reset state
 watch(
   () => props.imageUrls,
-  (newUrls) => {
+  (newUrls, oldUrls) => {
+    // Only reset state if URLs actually changed (not just array reference)
+    const urlsChanged =
+      !oldUrls ||
+      newUrls.length !== oldUrls.length ||
+      newUrls.some((url, i) => url !== oldUrls[i])
+
+    if (!urlsChanged) return
+
     // Reset current index if it's out of bounds
     if (currentIndex.value >= newUrls.length) {
       currentIndex.value = 0
@@ -164,7 +175,7 @@ watch(
     videoError.value = false
     showLoader.value = newUrls.length > 0
   },
-  { deep: true, immediate: true }
+  { immediate: true }
 )
 
 // Event handlers
@@ -204,11 +215,15 @@ const handleRemove = () => {
 }
 
 const setCurrentIndex = (index: number) => {
+  if (currentIndex.value === index) return
   if (index >= 0 && index < props.imageUrls.length) {
+    const urlChanged = props.imageUrls[index] !== currentVideoUrl.value
     currentIndex.value = index
-    actualDimensions.value = null
-    showLoader.value = true
     videoError.value = false
+    if (urlChanged) {
+      actualDimensions.value = null
+      showLoader.value = true
+    }
   }
 }
 
@@ -230,12 +245,13 @@ const handleFocusOut = (event: FocusEvent) => {
   }
 }
 
-const getNavigationDotClass = (index: number) => {
-  return [
-    'w-2 h-2 rounded-full transition-all duration-200 border-0 cursor-pointer',
-    index === currentIndex.value ? 'bg-white' : 'bg-white/50 hover:bg-white/80'
-  ]
-}
+const getNavigationDotClass = (index: number) =>
+  cn(
+    'size-2 cursor-pointer rounded-full border-0 transition-all duration-200',
+    index === currentIndex.value
+      ? 'bg-base-foreground'
+      : 'bg-base-foreground/50 hover:bg-base-foreground/80'
+  )
 
 const handleKeyDown = (event: KeyboardEvent) => {
   if (props.imageUrls.length <= 1) return
diff --git a/src/renderer/extensions/vueNodes/components/AudioPreview.vue b/src/renderer/extensions/vueNodes/components/AudioPreview.vue
new file mode 100644
index 0000000000..8d13b16863
--- /dev/null
+++ b/src/renderer/extensions/vueNodes/components/AudioPreview.vue
@@ -0,0 +1,19 @@
+<template>
+  <div v-if="audioUrls.length > 0" class="flex flex-col gap-2 px-2">
+    <audio
+      v-for="(url, index) in audioUrls"
+      :key="index"
+      :src="url"
+      controls
+      class="w-full"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+interface AudioPreviewProps {
+  readonly audioUrls: readonly string[]
+}
+
+defineProps<AudioPreviewProps>()
+</script>
diff --git a/tests-ui/tests/renderer/extensions/vueNodes/components/ImagePreview.test.ts b/src/renderer/extensions/vueNodes/components/ImagePreview.test.ts
similarity index 72%
rename from tests-ui/tests/renderer/extensions/vueNodes/components/ImagePreview.test.ts
rename to src/renderer/extensions/vueNodes/components/ImagePreview.test.ts
index 583bc1856d..b781dc6fda 100644
--- a/tests-ui/tests/renderer/extensions/vueNodes/components/ImagePreview.test.ts
+++ b/src/renderer/extensions/vueNodes/components/ImagePreview.test.ts
@@ -29,6 +29,8 @@ const i18n = createI18n({
         failedToDownloadImage: 'Failed to download image',
         calculatingDimensions: 'Calculating dimensions',
         imageFailedToLoad: 'Image failed to load',
+        imageDoesNotExist: 'Image does not exist',
+        unknownFile: 'Unknown file',
         loading: 'Loading'
       }
     }
@@ -308,4 +310,114 @@ describe('ImagePreview', () => {
     expect(imgElement.exists()).toBe(true)
     expect(imgElement.attributes('alt')).toBe('Node output 2')
   })
+
+  describe('batch cycling with identical URLs', () => {
+    it('should not enter persistent loading state when cycling through identical images', async () => {
+      vi.useFakeTimers()
+      try {
+        const sameUrl = '/api/view?filename=test.png&type=output'
+        const wrapper = mountImagePreview({
+          imageUrls: [sameUrl, sameUrl, sameUrl]
+        })
+
+        // Simulate initial image load
+        await wrapper.find('img').trigger('load')
+        await nextTick()
+        expect(wrapper.find('[aria-busy="true"]').exists()).toBe(false)
+
+        // Click second navigation dot to cycle
+        const dots = wrapper.findAll('.w-2.h-2.rounded-full')
+        await dots[1].trigger('click')
+        await nextTick()
+
+        // Advance past the delayed loader timeout
+        await vi.advanceTimersByTimeAsync(300)
+        await nextTick()
+
+        // Should NOT be in loading state since URL didn't change
+        expect(wrapper.find('[aria-busy="true"]').exists()).toBe(false)
+      } finally {
+        vi.useRealTimers()
+      }
+    })
+  })
+
+  describe('URL change detection', () => {
+    it('should NOT reset loading state when imageUrls prop is reassigned with identical URLs', async () => {
+      vi.useFakeTimers()
+      try {
+        const urls = ['/api/view?filename=test.png&type=output']
+        const wrapper = mountImagePreview({ imageUrls: urls })
+
+        // Simulate image load completing
+        const img = wrapper.find('img')
+        await img.trigger('load')
+        await nextTick()
+
+        // Verify loader is hidden after load
+        expect(wrapper.find('[aria-busy="true"]').exists()).toBe(false)
+
+        // Reassign with new array reference but same content
+        await wrapper.setProps({ imageUrls: [...urls] })
+        await nextTick()
+
+        // Advance past the 250ms delayed loader timeout
+        await vi.advanceTimersByTimeAsync(300)
+        await nextTick()
+
+        // Loading state should NOT have been reset - aria-busy should still be false
+        // because the URLs are identical (just a new array reference)
+        expect(wrapper.find('[aria-busy="true"]').exists()).toBe(false)
+      } finally {
+        vi.useRealTimers()
+      }
+    })
+
+    it('should reset loading state when imageUrls prop changes to different URLs', async () => {
+      vi.useFakeTimers()
+      try {
+        const urls = ['/api/view?filename=test.png&type=output']
+        const wrapper = mountImagePreview({ imageUrls: urls })
+
+        // Simulate image load completing
+        const img = wrapper.find('img')
+        await img.trigger('load')
+        await nextTick()
+
+        // Verify loader is hidden
+        expect(wrapper.find('[aria-busy="true"]').exists()).toBe(false)
+
+        // Change to different URL
+        await wrapper.setProps({
+          imageUrls: ['/api/view?filename=different.png&type=output']
+        })
+        await nextTick()
+
+        // Advance past the 250ms delayed loader timeout
+        await vi.advanceTimersByTimeAsync(300)
+        await nextTick()
+
+        expect(wrapper.find('[aria-busy="true"]').exists()).toBe(true)
+      } finally {
+        vi.useRealTimers()
+      }
+    })
+
+    it('should handle empty to non-empty URL transitions correctly', async () => {
+      const wrapper = mountImagePreview({ imageUrls: [] })
+
+      // No preview initially
+      expect(wrapper.find('.image-preview').exists()).toBe(false)
+
+      // Add URLs
+      await wrapper.setProps({
+        imageUrls: ['/api/view?filename=test.png&type=output']
+      })
+      await nextTick()
+
+      // Preview should appear
+      expect(wrapper.find('.image-preview').exists()).toBe(true)
+      expect(wrapper.find('img').exists()).toBe(true)
+    })
+  })
 })
diff --git a/src/renderer/extensions/vueNodes/components/ImagePreview.vue b/src/renderer/extensions/vueNodes/components/ImagePreview.vue
index 538a5a5d34..f8b8fb5ed2 100644
--- a/src/renderer/extensions/vueNodes/components/ImagePreview.vue
+++ b/src/renderer/extensions/vueNodes/components/ImagePreview.vue
@@ -1,13 +1,13 @@
 <template>
   <div
     v-if="imageUrls.length > 0"
-    class="image-preview group relative flex size-full min-h-16 min-w-16 flex-col px-2 justify-center"
+    class="image-preview group relative flex size-full min-h-55 min-w-16 flex-col justify-center px-2"
     @keydown="handleKeyDown"
   >
     <!-- Image Wrapper -->
     <div
       ref="imageWrapperEl"
-      class="h-full w-full overflow-hidden rounded-[5px] bg-muted-background relative"
+      class="relative flex min-h-0 w-full flex-1 overflow-hidden rounded-[5px] bg-transparent"
       tabindex="0"
       role="img"
       :aria-label="$t('g.imagePreview')"
@@ -21,11 +21,9 @@
       <div
         v-if="imageError"
         role="alert"
-        class="flex size-full flex-col items-center justify-center bg-muted-background text-center text-base-foreground py-8"
+        class="flex size-full flex-1 flex-col items-center justify-around self-center py-8 text-center text-base-foreground"
       >
-        <i
-          class="mb-2 icon-[lucide--image-off] h-12 w-12 text-base-foreground"
-        />
+        <i class="mb-2 icon-[lucide--image-off] size-12 text-base-foreground" />
         <p class="text-sm text-base-foreground">
           {{ $t('g.imageFailedToLoad') }}
         </p>
@@ -40,10 +38,9 @@
       <!-- Main Image -->
       <img
         v-if="!imageError"
-        ref="currentImageEl"
         :src="currentImageUrl"
         :alt="imageAltText"
-        class="block size-full object-contain pointer-events-none"
+        class="pointer-events-none absolute inset-0 block size-full object-contain"
         @load="handleImageLoad"
         @error="handleImageError"
       />
@@ -61,7 +58,7 @@
           :aria-label="$t('g.editOrMaskImage')"
           @click="handleEditMask"
         >
-          <i-comfy:mask class="h-4 w-4" />
+          <i-comfy:mask class="size-4" />
         </button>
 
         <!-- Download Button -->
@@ -71,7 +68,7 @@
           :aria-label="$t('g.downloadImage')"
           @click="handleDownload"
         >
-          <i class="icon-[lucide--download] h-4 w-4" />
+          <i class="icon-[lucide--download] size-4" />
         </button>
 
         <!-- Close Button -->
@@ -81,7 +78,7 @@
           :aria-label="$t('g.removeImage')"
           @click="handleRemove"
         >
-          <i class="icon-[lucide--x] h-4 w-4" />
+          <i class="icon-[lucide--x] size-4" />
         </button>
       </div>
     </div>
@@ -99,7 +96,10 @@
       </span>
     </div>
     <!-- Multiple Images Navigation -->
-    <div v-if="hasMultipleImages" class="flex justify-center gap-1 pt-4">
+    <div
+      v-if="hasMultipleImages"
+      class="flex flex-wrap justify-center gap-1 pt-4"
+    >
       <button
         v-for="(_, index) in imageUrls"
         :key="index"
@@ -125,9 +125,9 @@ import { computed, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import { downloadFile } from '@/base/common/downloadUtil'
+import { useMaskEditor } from '@/composables/maskeditor/useMaskEditor'
 import { app } from '@/scripts/app'
-import { useCommandStore } from '@/stores/commandStore'
-import { useNodeOutputStore } from '@/stores/imagePreviewStore'
+import { useNodeOutputStore } from '@/stores/nodeOutputStore'
 
 interface ImagePreviewProps {
   /** Array of image URLs to display */
@@ -139,7 +139,7 @@ interface ImagePreviewProps {
 const props = defineProps<ImagePreviewProps>()
 
 const { t } = useI18n()
-const commandStore = useCommandStore()
+const maskEditor = useMaskEditor()
 const nodeOutputStore = useNodeOutputStore()
 
 const actionButtonClass =
@@ -153,7 +153,6 @@ const actualDimensions = ref<string | null>(null)
 const imageError = ref(false)
 const showLoader = ref(false)
 
-const currentImageEl = ref<HTMLImageElement>()
 const imageWrapperEl = ref<HTMLDivElement>()
 
 const { start: startDelayedLoader, stop: stopDelayedLoader } = useTimeoutFn(
@@ -173,7 +172,15 @@ const imageAltText = computed(() => `Node output ${currentIndex.value + 1}`)
 // Watch for URL changes and reset state
 watch(
   () => props.imageUrls,
-  (newUrls) => {
+  (newUrls, oldUrls) => {
+    // Only reset state if URLs actually changed (not just array reference)
+    const urlsChanged =
+      !oldUrls ||
+      newUrls.length !== oldUrls.length ||
+      newUrls.some((url, i) => url !== oldUrls[i])
+
+    if (!urlsChanged) return
+
     // Reset current index if it's out of bounds
     if (currentIndex.value >= newUrls.length) {
       currentIndex.value = 0
@@ -185,7 +192,7 @@ watch(
     imageError.value = false
     if (newUrls.length > 0) startDelayedLoader()
   },
-  { deep: true, immediate: true }
+  { immediate: true }
 )
 
 // Event handlers
@@ -198,6 +205,10 @@ const handleImageLoad = (event: Event) => {
   if (img.naturalWidth && img.naturalHeight) {
     actualDimensions.value = `${img.naturalWidth} x ${img.naturalHeight}`
   }
+
+  if (props.nodeId) {
+    nodeOutputStore.syncLegacyNodeImgs(props.nodeId, img, currentIndex.value)
+  }
 }
 
 const handleImageError = () => {
@@ -207,19 +218,11 @@ const handleImageError = () => {
   actualDimensions.value = null
 }
 
-// In vueNodes mode, we need to set them manually before opening the mask editor.
-const setupNodeForMaskEditor = () => {
-  if (!props.nodeId || !currentImageEl.value) return
-  const node = app.rootGraph?.getNodeById(props.nodeId)
-  if (!node) return
-  node.imageIndex = currentIndex.value
-  node.imgs = [currentImageEl.value]
-  app.canvas?.select(node)
-}
-
 const handleEditMask = () => {
-  setupNodeForMaskEditor()
-  void commandStore.execute('Comfy.MaskEditor.OpenMaskEditor')
+  if (!props.nodeId) return
+  const node = app.rootGraph?.getNodeById(Number(props.nodeId))
+  if (!node) return
+  maskEditor.openMaskEditor(node)
 }
 
 const handleDownload = () => {
@@ -238,15 +241,24 @@ const handleDownload = () => {
 
 const handleRemove = () => {
   if (!props.nodeId) return
+  const node = app.rootGraph?.getNodeById(Number(props.nodeId))
   nodeOutputStore.removeNodeOutputs(props.nodeId)
+  if (node) {
+    node.imgs = undefined
+    const imageWidget = node.widgets?.find((w) => w.name === 'image')
+    if (imageWidget) {
+      imageWidget.value = ''
+    }
+  }
 }
 
 const setCurrentIndex = (index: number) => {
   if (currentIndex.value === index) return
   if (index >= 0 && index < props.imageUrls.length) {
+    const urlChanged = props.imageUrls[index] !== currentImageUrl.value
     currentIndex.value = index
-    startDelayedLoader()
     imageError.value = false
+    if (urlChanged) startDelayedLoader()
   }
 }
 
@@ -310,10 +322,11 @@ const handleKeyDown = (event: KeyboardEvent) => {
 }
 
 const getImageFilename = (url: string): string => {
+  if (!url) return t('g.imageDoesNotExist')
   try {
-    return new URL(url).searchParams.get('filename') || 'Unknown file'
+    return new URL(url).searchParams.get('filename') || t('g.unknownFile')
   } catch {
-    return 'Invalid URL'
+    return t('g.imageDoesNotExist')
   }
 }
 </script>
diff --git a/src/renderer/extensions/vueNodes/components/InputSlot.vue b/src/renderer/extensions/vueNodes/components/InputSlot.vue
index 43aa36ad68..81e03ef01e 100644
--- a/src/renderer/extensions/vueNodes/components/InputSlot.vue
+++ b/src/renderer/extensions/vueNodes/components/InputSlot.vue
@@ -5,9 +5,9 @@
     v-tooltip.left="tooltipConfig"
     :class="
       cn(
-        'lg-slot lg-slot--input flex items-center group rounded-r-lg m-0',
+        'lg-slot lg-slot--input group m-0 flex items-center rounded-r-lg',
         'cursor-crosshair',
-        props.dotOnly ? 'lg-slot--dot-only' : 'pr-6',
+        dotOnly ? 'lg-slot--dot-only' : 'pr-6',
         {
           'lg-slot--connected': props.connected,
           'lg-slot--compatible': props.compatible,
@@ -22,8 +22,9 @@
       ref="connectionDotRef"
       :class="
         cn(
-          '-translate-x-1/2 w-3',
-          hasSlotError && 'ring-2 ring-error ring-offset-0 rounded-full'
+          'w-3 -translate-x-1/2',
+          hasError &&
+            'before:pointer-events-none before:absolute before:size-4 before:rounded-full before:ring-2 before:ring-error before:ring-offset-0'
         )
       "
       :slot-data
@@ -33,21 +34,20 @@
     />
 
     <!-- Slot Name -->
-    <div class="h-full flex items-center min-w-0">
+    <div class="flex h-full min-w-0 items-center">
       <span
-        v-if="!dotOnly"
+        v-if="!props.dotOnly && !hasNoLabel"
         :class="
           cn(
             'truncate text-node-component-slot-text',
-            hasSlotError && 'text-error font-medium'
+            hasError && 'font-medium text-error'
           )
         "
       >
         {{
           slotData.label ||
           slotData.localized_name ||
-          slotData.name ||
-          `Input ${index}`
+          (slotData.name ?? `Input ${index}`)
         }}
       </span>
     </div>
@@ -65,35 +65,31 @@ import { getSlotKey } from '@/renderer/core/layout/slots/slotIdentifier'
 import { useNodeTooltips } from '@/renderer/extensions/vueNodes/composables/useNodeTooltips'
 import { useSlotElementTracking } from '@/renderer/extensions/vueNodes/composables/useSlotElementTracking'
 import { useSlotLinkInteraction } from '@/renderer/extensions/vueNodes/composables/useSlotLinkInteraction'
-import { useExecutionStore } from '@/stores/executionStore'
 import { cn } from '@/utils/tailwindUtil'
 
 import SlotConnectionDot from './SlotConnectionDot.vue'
 
 interface InputSlotProps {
+  slotData: INodeSlot
+  compatible?: boolean
+  connected?: boolean
+  dotOnly?: boolean
+  hasError?: boolean
+  index: number
   nodeType?: string
   nodeId?: string
-  slotData: INodeSlot
-  index: number
-  connected?: boolean
-  compatible?: boolean
-  dotOnly?: boolean
   socketless?: boolean
 }
 
 const props = defineProps<InputSlotProps>()
 
-const executionStore = useExecutionStore()
-
-const hasSlotError = computed(() => {
-  const nodeErrors = executionStore.lastNodeErrors?.[props.nodeId ?? '']
-  if (!nodeErrors) return false
-
-  const slotName = props.slotData.name
-  return nodeErrors.errors.some(
-    (error) => error.extra_info?.input_name === slotName
-  )
-})
+const hasNoLabel = computed(
+  () =>
+    !props.slotData.label &&
+    !props.slotData.localized_name &&
+    props.slotData.name === ''
+)
+const dotOnly = computed(() => props.dotOnly || hasNoLabel.value)
 
 const renderError = ref<string | null>(null)
 const { toastErrorHandler } = useErrorHandling()
diff --git a/tests-ui/tests/renderer/extensions/vueNodes/components/NodeHeader.subgraph.test.ts b/src/renderer/extensions/vueNodes/components/LGraphNode.subgraph.test.ts
similarity index 73%
rename from tests-ui/tests/renderer/extensions/vueNodes/components/NodeHeader.subgraph.test.ts
rename to src/renderer/extensions/vueNodes/components/LGraphNode.subgraph.test.ts
index 0f7ca7aefa..12e7c890c5 100644
--- a/tests-ui/tests/renderer/extensions/vueNodes/components/NodeHeader.subgraph.test.ts
+++ b/src/renderer/extensions/vueNodes/components/LGraphNode.subgraph.test.ts
@@ -7,11 +7,11 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import type {
   LGraph,
-  LGraphNode,
+  LGraphNode as LGLGraphNode,
   SubgraphNode
 } from '@/lib/litegraph/src/litegraph'
 import type { VueNodeData } from '@/composables/graph/useGraphNodeManager'
-import NodeHeader from '@/renderer/extensions/vueNodes/components/NodeHeader.vue'
+import LGraphNode from '@/renderer/extensions/vueNodes/components/LGraphNode.vue'
 import { getNodeByLocatorId } from '@/utils/graphTraversalUtil'
 
 const mockApp: { rootGraph?: Partial<LGraph> } = vi.hoisted(() => ({}))
@@ -56,7 +56,7 @@ vi.mock('@/i18n', () => ({
   }
 }))
 
-describe('NodeHeader - Subgraph Functionality', () => {
+describe('Vue Node - Subgraph Functionality', () => {
   // Helper to setup common mocks
   const setupMocks = async (isSubgraph = true, hasGraph = true) => {
     if (hasGraph) mockApp.rootGraph = {}
@@ -64,7 +64,7 @@ describe('NodeHeader - Subgraph Functionality', () => {
 
     vi.mocked(getNodeByLocatorId).mockReturnValue({
       isSubgraphNode: (): this is SubgraphNode => isSubgraph
-    } as LGraphNode)
+    } as LGLGraphNode)
   }
 
   beforeEach(() => {
@@ -89,8 +89,8 @@ describe('NodeHeader - Subgraph Functionality', () => {
     flags: {}
   })
 
-  const createWrapper = (props = {}) => {
-    return mount(NodeHeader, {
+  const createWrapper = (props: { nodeData: VueNodeData }) => {
+    return mount(LGraphNode, {
       props,
       global: {
         plugins: [createTestingPinia({ createSpy: vi.fn })],
@@ -106,8 +106,7 @@ describe('NodeHeader - Subgraph Functionality', () => {
     await setupMocks(true) // isSubgraph = true
 
     const wrapper = createWrapper({
-      nodeData: createMockNodeData('test-node-1'),
-      readonly: false
+      nodeData: createMockNodeData('test-node-1')
     })
 
     await wrapper.vm.$nextTick()
@@ -120,8 +119,7 @@ describe('NodeHeader - Subgraph Functionality', () => {
     await setupMocks(false) // isSubgraph = false
 
     const wrapper = createWrapper({
-      nodeData: createMockNodeData('test-node-1'),
-      readonly: false
+      nodeData: createMockNodeData('test-node-1')
     })
 
     await wrapper.vm.$nextTick()
@@ -130,29 +128,11 @@ describe('NodeHeader - Subgraph Functionality', () => {
     expect(subgraphButton.exists()).toBe(false)
   })
 
-  it('should emit enter-subgraph event when button is clicked', async () => {
-    await setupMocks(true) // isSubgraph = true
-
-    const wrapper = createWrapper({
-      nodeData: createMockNodeData('test-node-1'),
-      readonly: false
-    })
-
-    await wrapper.vm.$nextTick()
-
-    const subgraphButton = wrapper.find('[data-testid="subgraph-enter-button"]')
-    await subgraphButton.trigger('click')
-
-    expect(wrapper.emitted('enter-subgraph')).toBeTruthy()
-    expect(wrapper.emitted('enter-subgraph')).toHaveLength(1)
-  })
-
   it('should handle subgraph context correctly', async () => {
     await setupMocks(true) // isSubgraph = true
 
     const wrapper = createWrapper({
-      nodeData: createMockNodeData('test-node-1', 'subgraph-id'),
-      readonly: false
+      nodeData: createMockNodeData('test-node-1', 'subgraph-id')
     })
 
     await wrapper.vm.$nextTick()
@@ -167,26 +147,11 @@ describe('NodeHeader - Subgraph Functionality', () => {
     expect(subgraphButton.exists()).toBe(true)
   })
 
-  it('should handle missing graph gracefully', async () => {
-    await setupMocks(true, false) // isSubgraph = true, hasGraph = false
-
-    const wrapper = createWrapper({
-      nodeData: createMockNodeData('test-node-1'),
-      readonly: false
-    })
-
-    await wrapper.vm.$nextTick()
-
-    const subgraphButton = wrapper.find('[data-testid="subgraph-enter-button"]')
-    expect(subgraphButton.exists()).toBe(false)
-  })
-
   it('should prevent event propagation on double click', async () => {
     await setupMocks(true) // isSubgraph = true
 
     const wrapper = createWrapper({
-      nodeData: createMockNodeData('test-node-1'),
-      readonly: false
+      nodeData: createMockNodeData('test-node-1')
     })
 
     await wrapper.vm.$nextTick()
diff --git a/tests-ui/tests/renderer/extensions/vueNodes/components/LGraphNode.test.ts b/src/renderer/extensions/vueNodes/components/LGraphNode.test.ts
similarity index 85%
rename from tests-ui/tests/renderer/extensions/vueNodes/components/LGraphNode.test.ts
rename to src/renderer/extensions/vueNodes/components/LGraphNode.test.ts
index c1ae140940..674dfba39c 100644
--- a/tests-ui/tests/renderer/extensions/vueNodes/components/LGraphNode.test.ts
+++ b/src/renderer/extensions/vueNodes/components/LGraphNode.test.ts
@@ -8,9 +8,10 @@ import { createI18n } from 'vue-i18n'
 import type { VueNodeData } from '@/composables/graph/useGraphNodeManager'
 import LGraphNode from '@/renderer/extensions/vueNodes/components/LGraphNode.vue'
 import { useVueElementTracking } from '@/renderer/extensions/vueNodes/composables/useVueNodeResizeTracking'
+import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import { setActivePinia } from 'pinia'
 
 const mockData = vi.hoisted(() => ({
-  mockNodeIds: new Set<string>(),
   mockExecuting: false
 }))
 
@@ -25,17 +26,6 @@ vi.mock('@/renderer/core/layout/transform/useTransformState', () => {
   }
 })
 
-vi.mock('@/renderer/core/canvas/canvasStore', () => {
-  const getCanvas = vi.fn()
-  const useCanvasStore = () => ({
-    getCanvas,
-    selectedNodeIds: computed(() => mockData.mockNodeIds)
-  })
-  return {
-    useCanvasStore
-  }
-})
-
 vi.mock(
   '@/renderer/extensions/vueNodes/composables/useNodeEventHandlers',
   () => {
@@ -76,7 +66,7 @@ vi.mock(
       executing: computed(() => mockData.mockExecuting),
       progress: computed(() => undefined),
       progressPercentage: computed(() => undefined),
-      progressState: computed(() => undefined as any),
+      progressState: computed(() => undefined),
       executionState: computed(() => 'idle' as const)
     }))
   })
@@ -89,12 +79,15 @@ vi.mock('@/renderer/extensions/vueNodes/preview/useNodePreviewState', () => ({
   }))
 }))
 
-vi.mock('../interactions/resize/useNodeResize', () => ({
-  useNodeResize: vi.fn(() => ({
-    startResize: vi.fn(),
-    isResizing: computed(() => false)
-  }))
-}))
+vi.mock(
+  '@/renderer/extensions/vueNodes/interactions/resize/useNodeResize',
+  () => ({
+    useNodeResize: vi.fn(() => ({
+      startResize: vi.fn(),
+      isResizing: computed(() => false)
+    }))
+  })
+)
 
 const i18n = createI18n({
   legacy: false,
@@ -105,17 +98,16 @@ const i18n = createI18n({
     }
   }
 })
+
+const pinia = createTestingPinia({
+  createSpy: vi.fn
+})
+
 function mountLGraphNode(props: ComponentProps<typeof LGraphNode>) {
   return mount(LGraphNode, {
     props,
     global: {
-      plugins: [
-        createTestingPinia({
-          createSpy: vi.fn
-        }),
-        i18n
-      ],
-
+      plugins: [pinia, i18n],
       stubs: {
         NodeHeader: true,
         NodeSlots: true,
@@ -142,8 +134,11 @@ const mockNodeData: VueNodeData = {
 describe('LGraphNode', () => {
   beforeEach(() => {
     vi.resetAllMocks()
-    mockData.mockNodeIds = new Set()
     mockData.mockExecuting = false
+
+    setActivePinia(pinia)
+    const canvasStore = useCanvasStore()
+    canvasStore.selectedNodeIds.clear()
   })
 
   it('should call resize tracking composable with node ID', () => {
@@ -169,12 +164,7 @@ describe('LGraphNode', () => {
     const wrapper = mount(LGraphNode, {
       props: { nodeData: mockNodeData },
       global: {
-        plugins: [
-          createTestingPinia({
-            createSpy: vi.fn
-          }),
-          i18n
-        ],
+        plugins: [pinia, i18n],
         stubs: {
           NodeSlots: true,
           NodeWidgets: true,
@@ -187,10 +177,14 @@ describe('LGraphNode', () => {
     expect(wrapper.text()).toContain('Test Node')
   })
 
-  it('should apply selected styling when selected prop is true', () => {
-    mockData.mockNodeIds = new Set(['test-node-123'])
+  it('should apply selected styling when selected prop is true', async () => {
+    const canvasStore = useCanvasStore()
+    canvasStore.selectedNodeIds.clear()
+    canvasStore.selectedNodeIds.add('test-node-123')
+
     const wrapper = mountLGraphNode({ nodeData: mockNodeData })
-    expect(wrapper.classes()).toContain('outline-2')
+
+    expect(wrapper.classes()).toContain('outline-3')
     expect(wrapper.classes()).toContain('outline-node-component-outline')
   })
 
@@ -212,7 +206,7 @@ describe('LGraphNode', () => {
 
     expect(wrapper.element.style.getPropertyValue('--node-height')).toBe('')
     expect(wrapper.element.style.getPropertyValue('--node-height-x')).toBe(
-      '100px'
+      '130px'
     )
   })
 
@@ -225,7 +219,7 @@ describe('LGraphNode', () => {
     })
 
     expect(wrapper.element.style.getPropertyValue('--node-height')).toBe(
-      '100px'
+      '130px'
     )
     expect(wrapper.element.style.getPropertyValue('--node-height-x')).toBe('')
   })
diff --git a/src/renderer/extensions/vueNodes/components/LGraphNode.vue b/src/renderer/extensions/vueNodes/components/LGraphNode.vue
index 9de9672602..70f978a2b4 100644
--- a/src/renderer/extensions/vueNodes/components/LGraphNode.vue
+++ b/src/renderer/extensions/vueNodes/components/LGraphNode.vue
@@ -9,30 +9,28 @@
     :data-node-id="nodeData.id"
     :class="
       cn(
-        'bg-component-node-background lg-node absolute text-sm',
-        'contain-style contain-layout min-w-[225px] min-h-(--node-height) w-(--node-width)',
+        'group/node lg-node absolute bg-node-component-header-surface text-sm',
+        'min-h-(--node-height) w-(--node-width) min-w-[225px] contain-layout contain-style',
         shapeClass,
-        'touch-none flex flex-col',
-        'border-1 border-solid border-component-node-border',
+        'flex touch-none flex-col',
+        'border border-solid border-component-node-border',
         // hover (only when node should handle events)
         shouldHandleNodePointerEvents &&
-          'hover:ring-7 ring-node-component-ring',
-        'outline-transparent outline-2 focus-visible:outline-node-component-outline',
+          'ring-node-component-ring hover:ring-7',
+        'outline-3 outline-transparent focus-visible:outline-node-component-outline',
         borderClass,
         outlineClass,
         cursorClass,
         {
-          [`${beforeShapeClass} before:pointer-events-none before:absolute before:bg-bypass/60 before:inset-0`]:
+          [`${beforeShapeClass} before:pointer-events-none before:absolute before:inset-0 before:bg-bypass/60`]:
             bypassed,
           [`${beforeShapeClass} before:pointer-events-none before:absolute before:inset-0`]:
             muted,
-          'ring-4 ring-primary-500 bg-primary-500/10': isDraggingOver
+          'bg-primary-500/10 ring-4 ring-primary-500': isDraggingOver
         },
-
-        shouldHandleNodePointerEvents
+        shouldHandleNodePointerEvents && !nodeData.flags?.ghost
           ? 'pointer-events-auto'
-          : 'pointer-events-none',
-        !isCollapsed && ' pb-1'
+          : 'pointer-events-none'
       )
     "
     :style="[
@@ -40,7 +38,8 @@
         transform: `translate(${position.x ?? 0}px, ${(position.y ?? 0) - LiteGraph.NODE_TITLE_HEIGHT}px)`,
         zIndex: zIndex,
         opacity: nodeOpacity,
-        '--component-node-background': nodeBodyBackgroundColor
+        '--component-node-background': applyLightThemeColor(nodeData.bgcolor),
+        backgroundColor: applyLightThemeColor(nodeData?.color)
       }
     ]"
     v-bind="remainingPointerHandlers"
@@ -51,9 +50,17 @@
     @dragleave="handleDragLeave"
     @drop.stop.prevent="handleDrop"
   >
+    <AppOutput
+      v-if="
+        lgraphNode?.constructor?.nodeData?.output_node &&
+        isSelectOutputsMode &&
+        nodeData.mode === LGraphEventMode.ALWAYS
+      "
+      :id="nodeData.id"
+    />
     <div
       v-if="displayHeader"
-      class="flex flex-col justify-center items-center relative"
+      class="relative flex flex-col items-center justify-center"
     >
       <template v-if="isCollapsed">
         <SlotConnectionDot
@@ -71,9 +78,9 @@
       <NodeHeader
         :node-data="nodeData"
         :collapsed="isCollapsed"
+        :price-badges="badges.pricing"
         @collapse="handleCollapse"
         @update:title="handleHeaderTitleUpdate"
-        @enter-subgraph="handleEnterSubgraph"
       />
     </div>
 
@@ -81,7 +88,7 @@
       v-if="isCollapsed && executing && progress !== undefined"
       :class="
         cn(
-          'absolute inset-x-4 -bottom-[1px] translate-y-1/2 rounded-full',
+          'absolute inset-x-4 -bottom-px translate-y-1/2 rounded-full',
           progressClasses
         )
       "
@@ -89,7 +96,7 @@
     />
 
     <template v-if="!isCollapsed">
-      <div class="relative mb-1">
+      <div class="relative">
         <!-- Progress bar for executing state -->
         <div
           v-if="executing && progress !== undefined"
@@ -105,42 +112,172 @@
       </div>
 
       <div
-        class="flex flex-1 flex-col gap-1 pb-2"
+        class="flex flex-1 flex-col gap-1 rounded-b-2xl bg-component-node-background pt-1 pb-3"
         :data-testid="`node-body-${nodeData.id}`"
       >
         <NodeSlots :node-data="nodeData" />
 
         <NodeWidgets v-if="nodeData.widgets?.length" :node-data="nodeData" />
 
-        <div v-if="hasCustomContent" class="min-h-0 flex-1 flex">
-          <NodeContent :node-data="nodeData" :media="nodeMedia" />
+        <div v-if="hasCustomContent" class="flex min-h-0 flex-1 flex-col">
+          <NodeContent
+            v-if="nodeMedia"
+            :node-data="nodeData"
+            :media="nodeMedia"
+          />
+          <NodeContent
+            v-for="preview in promotedPreviews"
+            :key="`${preview.interiorNodeId}-${preview.widgetName}`"
+            :node-data="nodeData"
+            :media="preview"
+          />
         </div>
         <!-- Live mid-execution preview images -->
-        <div v-if="shouldShowPreviewImg" class="min-h-0 flex-1 px-4">
-          <LivePreview :image-url="latestPreviewUrl || null" />
-        </div>
+        <LivePreview
+          v-if="shouldShowPreviewImg"
+          :image-url="latestPreviewUrl"
+        />
+        <NodeBadges v-bind="badges" :pricing="undefined" class="mt-auto" />
       </div>
     </template>
-
-    <!-- Resize handle (bottom-right only) -->
     <div
-      v-if="!isCollapsed"
-      role="button"
-      :aria-label="t('g.resizeFromBottomRight')"
-      :class="cn(baseResizeHandleClasses, 'right-0 bottom-0 cursor-se-resize')"
-      @pointerdown.stop="handleResizePointerDown"
-    />
+      v-if="
+        (hasAnyError && showErrorsTabEnabled) ||
+        lgraphNode?.isSubgraphNode() ||
+        showAdvancedState ||
+        showAdvancedInputsButton
+      "
+      :class="
+        cn(
+          '-z-1 flex h-7 w-full divide-x divide-component-node-border overflow-hidden rounded-t-none rounded-b-2xl text-xs',
+          !isCollapsed && '-mt-5 h-12'
+        )
+      "
+    >
+      <Button
+        v-if="lgraphNode?.isSubgraphNode()"
+        variant="textonly"
+        :class="
+          cn(
+            'h-full flex-1 rounded-none',
+            hasAnyError &&
+              showErrorsTabEnabled &&
+              !nodeData.color &&
+              'bg-node-component-header-surface',
+            isCollapsed ? 'py-2' : 'pt-7 pb-2'
+          )
+        "
+        data-testid="subgraph-enter-button"
+        @click.stop="handleEnterSubgraph"
+      >
+        <span class="truncate">{{
+          hasAnyError && showErrorsTabEnabled
+            ? t('g.enter')
+            : t('g.enterSubgraph')
+        }}</span>
+        <i class="icon-[comfy--workflow] size-4 shrink-0" />
+      </Button>
+
+      <Button
+        v-if="hasAnyError && showErrorsTabEnabled"
+        variant="textonly"
+        :class="
+          cn(
+            'h-full flex-1 rounded-none bg-error hover:bg-destructive-background-hover',
+            isCollapsed ? 'py-2' : 'pt-7 pb-2'
+          )
+        "
+        @click.stop="useRightSidePanelStore().openPanel('errors')"
+      >
+        <span class="truncate">{{ t('g.error') }}</span>
+        <i class="icon-[lucide--info] size-4 shrink-0" />
+      </Button>
+
+      <!-- Advanced inputs (non-subgraph nodes only) -->
+      <Button
+        v-if="
+          !lgraphNode?.isSubgraphNode() &&
+          (showAdvancedState || showAdvancedInputsButton)
+        "
+        variant="textonly"
+        :class="
+          cn('h-full flex-1 rounded-none', isCollapsed ? 'py-2' : 'pt-7 pb-2')
+        "
+        @click.stop="showAdvancedState = !showAdvancedState"
+      >
+        <template v-if="showAdvancedState">
+          <span class="truncate">{{
+            t('rightSidePanel.hideAdvancedInputsButton')
+          }}</span>
+          <i class="icon-[lucide--chevron-up] size-4 shrink-0" />
+        </template>
+        <template v-else>
+          <span class="truncate">{{
+            t('rightSidePanel.showAdvancedInputsButton')
+          }}</span>
+          <i class="icon-[lucide--settings-2] size-4 shrink-0" />
+        </template>
+      </Button>
+    </div>
+    <template
+      v-if="!isCollapsed && nodeData.resizable !== false && !isSelectMode"
+    >
+      <div
+        v-for="handle in RESIZE_HANDLES"
+        :key="handle.corner"
+        role="button"
+        :aria-label="t(handle.i18nKey)"
+        :class="
+          cn(
+            baseResizeHandleClasses,
+            handle.positionClasses,
+            handle.cursorClass,
+            'group-hover/node:opacity-100'
+          )
+        "
+        @pointerdown.stop="handleResizePointerDown($event, handle.corner)"
+      >
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 12 12"
+          :class="cn('absolute size-2/5', handle.svgPositionClasses)"
+          :style="
+            handle.svgTransform ? { transform: handle.svgTransform } : undefined
+          "
+        >
+          <path
+            d="M11 1L1 11M11 6L6 11"
+            stroke="var(--color-muted-foreground)"
+            stroke-width="0.975"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+          />
+        </svg>
+      </div>
+    </template>
   </div>
 </template>
 
 <script setup lang="ts">
 import { storeToRefs } from 'pinia'
-import { computed, nextTick, onErrorCaptured, onMounted, ref, watch } from 'vue'
+import {
+  computed,
+  customRef,
+  nextTick,
+  onErrorCaptured,
+  onMounted,
+  onUnmounted,
+  ref,
+  watch
+} from 'vue'
 import { useI18n } from 'vue-i18n'
 
+import Button from '@/components/ui/button/Button.vue'
 import type { VueNodeData } from '@/composables/graph/useGraphNodeManager'
 import { showNodeOptions } from '@/composables/graph/useMoreOptionsMenu'
+import { useAppMode } from '@/composables/useAppMode'
 import { useErrorHandling } from '@/composables/useErrorHandling'
+import { hasUnpromotedWidgets } from '@/core/graph/subgraph/unpromotedWidgetUtils'
 import { st } from '@/i18n'
 import {
   LGraphCanvas,
@@ -148,16 +285,22 @@ import {
   LiteGraph,
   RenderShape
 } from '@/lib/litegraph/src/litegraph'
+import { SubgraphNode } from '@/lib/litegraph/src/subgraph/SubgraphNode'
 import { TitleMode } from '@/lib/litegraph/src/types/globalEnums'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { useTelemetry } from '@/platform/telemetry'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import { useCanvasInteractions } from '@/renderer/core/canvas/useCanvasInteractions'
 import { layoutStore } from '@/renderer/core/layout/store/layoutStore'
+import { usePromotedPreviews } from '@/composables/node/usePromotedPreviews'
+import NodeBadges from '@/renderer/extensions/vueNodes/components/NodeBadges.vue'
+import { LayoutSource } from '@/renderer/core/layout/types'
+import AppOutput from '@/renderer/extensions/linearMode/AppOutput.vue'
 import SlotConnectionDot from '@/renderer/extensions/vueNodes/components/SlotConnectionDot.vue'
 import { useNodeEventHandlers } from '@/renderer/extensions/vueNodes/composables/useNodeEventHandlers'
 import { useNodePointerInteractions } from '@/renderer/extensions/vueNodes/composables/useNodePointerInteractions'
 import { useNodeZIndex } from '@/renderer/extensions/vueNodes/composables/useNodeZIndex'
+import { usePartitionedBadges } from '@/renderer/extensions/vueNodes/composables/usePartitionedBadges'
 import { useVueElementTracking } from '@/renderer/extensions/vueNodes/composables/useVueNodeResizeTracking'
 import { useNodeExecutionState } from '@/renderer/extensions/vueNodes/execution/useNodeExecutionState'
 import { useNodeDrag } from '@/renderer/extensions/vueNodes/layout/useNodeDrag'
@@ -166,16 +309,21 @@ import { useNodePreviewState } from '@/renderer/extensions/vueNodes/preview/useN
 import { nonWidgetedInputs } from '@/renderer/extensions/vueNodes/utils/nodeDataUtils'
 import { applyLightThemeColor } from '@/renderer/extensions/vueNodes/utils/nodeStyleUtils'
 import { app } from '@/scripts/app'
-import { useExecutionStore } from '@/stores/executionStore'
-import { useNodeOutputStore } from '@/stores/imagePreviewStore'
-import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
+import { useExecutionErrorStore } from '@/stores/executionErrorStore'
+import { useNodeOutputStore } from '@/stores/nodeOutputStore'
+import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore'
 import { isTransparent } from '@/utils/colorUtil'
+import { isVideoOutput } from '@/utils/litegraphUtil'
 import {
   getLocatorIdFromNodeData,
   getNodeByLocatorId
 } from '@/utils/graphTraversalUtil'
 import { cn } from '@/utils/tailwindUtil'
 
+import type { CompassCorners } from '@/lib/litegraph/src/interfaces'
+import { useLayoutMutations } from '@/renderer/core/layout/operations/layoutMutations'
+
+import { RESIZE_HANDLES } from '../interactions/resize/resizeHandleConfig'
 import { useNodeResize } from '../interactions/resize/useNodeResize'
 import LivePreview from './LivePreview.vue'
 import NodeContent from './NodeContent.vue'
@@ -193,6 +341,9 @@ const { nodeData, error = null } = defineProps<LGraphNodeProps>()
 
 const { t } = useI18n()
 
+const { isSelectMode, isSelectOutputsMode } = useAppMode()
+const settingStore = useSettingStore()
+
 const { handleNodeCollapse, handleNodeTitleUpdate, handleNodeRightClick } =
   useNodeEventHandlers()
 const { bringNodeToFront } = useNodeZIndex()
@@ -206,9 +357,9 @@ const isSelected = computed(() => {
 
 const nodeLocatorId = computed(() => getLocatorIdFromNodeData(nodeData))
 const { executing, progress } = useNodeExecutionState(nodeLocatorId)
-const executionStore = useExecutionStore()
+const executionErrorStore = useExecutionErrorStore()
 const hasExecutionError = computed(
-  () => executionStore.lastExecutionErrorNodeId === nodeData.id
+  () => executionErrorStore.lastExecutionErrorNodeId === nodeData.id
 )
 
 const hasAnyError = computed((): boolean => {
@@ -216,10 +367,17 @@ const hasAnyError = computed((): boolean => {
     hasExecutionError.value ||
     nodeData.hasErrors ||
     error ||
-    (executionStore.lastNodeErrors?.[nodeData.id]?.errors.length ?? 0) > 0
+    executionErrorStore.getNodeErrors(nodeLocatorId.value) ||
+    (lgraphNode.value &&
+      (executionErrorStore.isContainerWithInternalError(lgraphNode.value) ||
+        executionErrorStore.isContainerWithMissingNode(lgraphNode.value)))
   )
 })
 
+const showErrorsTabEnabled = computed(() =>
+  settingStore.get('Comfy.RightSidePanel.ShowErrorsTab')
+)
+
 const displayHeader = computed(() => nodeData.titleMode !== TitleMode.NO_TITLE)
 
 const isCollapsed = computed(() => nodeData.flags?.collapsed ?? false)
@@ -228,21 +386,10 @@ const bypassed = computed(
 )
 const muted = computed((): boolean => nodeData.mode === LGraphEventMode.NEVER)
 
-const nodeBodyBackgroundColor = computed(() => {
-  const colorPaletteStore = useColorPaletteStore()
-
-  if (!nodeData.bgcolor) {
-    return ''
-  }
-
-  return applyLightThemeColor(
-    nodeData.bgcolor,
-    Boolean(colorPaletteStore.completedActivePalette.light_theme)
-  )
-})
-
 const nodeOpacity = computed(() => {
-  const globalOpacity = useSettingStore().get('Comfy.Node.Opacity') ?? 1
+  const globalOpacity = settingStore.get('Comfy.Node.Opacity') ?? 1
+
+  if (nodeData.flags?.ghost) return globalOpacity * 0.3
 
   // For muted/bypassed nodes, apply the 0.5 multiplier on top of global opacity
   if (bypassed.value || muted.value) {
@@ -272,6 +419,7 @@ const { position, size, zIndex } = useNodeLayout(() => nodeData.id)
 const { pointerHandlers } = useNodePointerInteractions(() => nodeData.id)
 const { onPointerdown, ...remainingPointerHandlers } = pointerHandlers
 const { startDrag } = useNodeDrag()
+const badges = usePartitionedBadges(nodeData)
 
 async function nodeOnPointerdown(event: PointerEvent) {
   if (event.altKey && lgraphNode.value) {
@@ -300,15 +448,8 @@ const handleContextMenu = (event: MouseEvent) => {
   showNodeOptions(event)
 }
 
-onMounted(() => {
-  initSizeStyles()
-})
-
 /**
- * Set initial DOM size from layout store, but respect intrinsic content minimum.
- * Important: nodes can mount in a collapsed state, and the collapse watcher won't
- * run initially. Match the collapsed runtime behavior by writing to the correct
- * CSS variables on mount.
+ * Set initial DOM size from layout store.
  */
 function initSizeStyles() {
   const el = nodeContainerRef.value
@@ -316,15 +457,56 @@ function initSizeStyles() {
   if (!el) return
 
   const suffix = isCollapsed.value ? '-x' : ''
+  const fullHeight = height + LiteGraph.NODE_TITLE_HEIGHT
 
   el.style.setProperty(`--node-width${suffix}`, `${width}px`)
-  el.style.setProperty(`--node-height${suffix}`, `${height}px`)
+  el.style.setProperty(`--node-height${suffix}`, `${fullHeight}px`)
 }
 
+/**
+ * Handle external size changes (e.g., from extensions calling node.setSize()).
+ * Updates CSS variables when layoutStore changes from Canvas/External source.
+ */
+function handleLayoutChange(change: {
+  source: LayoutSource
+  nodeIds: string[]
+}) {
+  // Only handle Canvas or External source (extensions calling setSize)
+  if (
+    change.source !== LayoutSource.Canvas &&
+    change.source !== LayoutSource.External
+  )
+    return
+
+  if (!change.nodeIds.includes(nodeData.id)) return
+  if (layoutStore.isResizingVueNodes.value) return
+  if (isCollapsed.value) return
+
+  const el = nodeContainerRef.value
+  if (!el) return
+
+  const newSize = size.value
+  const fullHeight = newSize.height + LiteGraph.NODE_TITLE_HEIGHT
+  el.style.setProperty('--node-width', `${newSize.width}px`)
+  el.style.setProperty('--node-height', `${fullHeight}px`)
+}
+
+let unsubscribeLayoutChange: (() => void) | null = null
+
+onMounted(() => {
+  initSizeStyles()
+  unsubscribeLayoutChange = layoutStore.onChange(handleLayoutChange)
+})
+
+onUnmounted(() => {
+  unsubscribeLayoutChange?.()
+})
+
 const baseResizeHandleClasses =
-  'absolute h-3 w-3 opacity-0 pointer-events-auto focus-visible:outline focus-visible:outline-2 focus-visible:outline-white/40'
+  'absolute h-5 w-5 opacity-0 pointer-events-auto focus-visible:outline focus-visible:outline-2 focus-visible:outline-white/40'
 
 const MIN_NODE_WIDTH = 225
+const mutations = useLayoutMutations()
 
 const { startResize } = useNodeResize((result, element) => {
   if (isCollapsed.value) return
@@ -335,13 +517,23 @@ const { startResize } = useNodeResize((result, element) => {
   // Apply size directly to DOM element - ResizeObserver will pick this up
   element.style.setProperty('--node-width', `${clampedWidth}px`)
   element.style.setProperty('--node-height', `${result.size.height}px`)
+
+  // Update position for non-SE corner resizing
+  if (result.position) {
+    mutations.setSource(LayoutSource.Vue)
+    mutations.moveNode(nodeData.id, result.position)
+  }
 })
 
-const handleResizePointerDown = (event: PointerEvent) => {
+const handleResizePointerDown = (
+  event: PointerEvent,
+  corner: CompassCorners
+) => {
   if (event.button !== 0) return
   if (!shouldHandleNodePointerEvents.value) return
   if (nodeData.flags?.pinned) return
-  startResize(event)
+  if (nodeData.resizable === false) return
+  startResize(event, corner)
 }
 
 watch(isCollapsed, (collapsed) => {
@@ -359,7 +551,7 @@ watch(isCollapsed, (collapsed) => {
 
 // Check if node has custom content (like image/video outputs)
 const hasCustomContent = computed(() => {
-  // Show custom content if node has media outputs
+  if (promotedPreviews.value.length > 0) return true
   return !!nodeMedia.value && nodeMedia.value.urls.length > 0
 })
 
@@ -374,7 +566,7 @@ const { latestPreviewUrl, shouldShowPreviewImg } = useNodePreviewState(
 )
 
 const borderClass = computed(() => {
-  if (hasAnyError.value) return 'border-node-stroke-error'
+  if (hasAnyError.value) return 'border-node-stroke-error bg-error'
   //FIXME need a better way to detecting transparency
   if (
     !displayHeader.value &&
@@ -473,22 +665,81 @@ const lgraphNode = computed(() => {
   return getNodeByLocatorId(app.rootGraph, locatorId)
 })
 
+// TODO: Surface subgraph info more cleanly in VueNodeData instead of
+// reaching through lgraphNode for promoted preview resolution.
+const { promotedPreviews } = usePromotedPreviews(lgraphNode)
+
+const showAdvancedInputsButton = computed(() => {
+  const node = lgraphNode.value
+  if (!node) return false
+
+  // For subgraph nodes: check for unpromoted widgets
+  if (node instanceof SubgraphNode) {
+    return hasUnpromotedWidgets(node)
+  }
+
+  // For regular nodes: show button if there are advanced widgets and they're currently hidden
+  const hasAdvancedWidgets = nodeData.widgets?.some((w) => w.options?.advanced)
+  const alwaysShowAdvanced = settingStore.get(
+    'Comfy.Node.AlwaysShowAdvancedWidgets'
+  )
+  return hasAdvancedWidgets && !alwaysShowAdvanced
+})
+
+const showAdvancedState = customRef((track, trigger) => {
+  let internalState = false
+
+  const node = lgraphNode.value
+  if (node && !(node instanceof SubgraphNode)) {
+    internalState = !!node.showAdvanced
+  }
+
+  return {
+    get() {
+      track()
+      return internalState
+    },
+    set(value: boolean) {
+      const node = lgraphNode.value
+      if (!node) return
+
+      if (node instanceof SubgraphNode) {
+        // Do not modify internalState for subgraph nodes
+        const rightSidePanelStore = useRightSidePanelStore()
+        if (value) {
+          rightSidePanelStore.focusSection('advanced-inputs')
+        } else {
+          rightSidePanelStore.closePanel()
+        }
+      } else {
+        node.showAdvanced = value
+        internalState = value
+      }
+      trigger()
+    }
+  }
+})
+
+const hasVideoInput = computed(() => {
+  return (
+    lgraphNode.value?.inputs?.some((input) => input.type === 'VIDEO') ?? false
+  )
+})
+
 const nodeMedia = computed(() => {
   const newOutputs = nodeOutputs.nodeOutputs[nodeOutputLocatorId.value]
   const node = lgraphNode.value
 
-  if (!node || !newOutputs?.images?.length) return undefined
+  if (!node || !newOutputs?.images?.length || node.hideOutputImages)
+    return undefined
 
   const urls = nodeOutputs.getNodeImageUrls(node)
   if (!urls?.length) return undefined
 
-  // Determine media type from previewMediaType or fallback to input slot types
-  // Note: Despite the field name "images", videos are also included in outputs
-  // TODO: fix the backend to return videos using the videos key instead of the images key
-  const hasVideoInput = node.inputs?.some((input) => input.type === 'VIDEO')
   const type =
+    isVideoOutput(newOutputs) ||
     node.previewMediaType === 'video' ||
-    (!node.previewMediaType && hasVideoInput)
+    (!node.previewMediaType && hasVideoInput.value)
       ? 'video'
       : 'image'
 
diff --git a/src/renderer/extensions/vueNodes/components/LGraphNodePreview.vue b/src/renderer/extensions/vueNodes/components/LGraphNodePreview.vue
index da7423850b..8bcdf4c650 100644
--- a/src/renderer/extensions/vueNodes/components/LGraphNodePreview.vue
+++ b/src/renderer/extensions/vueNodes/components/LGraphNodePreview.vue
@@ -3,18 +3,18 @@
     :data-node-id="nodeData.id"
     :class="
       cn(
-        'bg-component-node-background lg-node pb-1 contain-style contain-layout w-[350px] rounded-2xl touch-none flex flex-col border-1 border-solid outline-transparent outline-2 border-node-stroke',
+        'lg-node flex w-[350px] touch-none flex-col rounded-2xl border border-solid border-node-stroke bg-component-node-background pb-1 outline-2 outline-transparent contain-layout contain-style',
         position
       )
     "
   >
     <div
-      class="flex flex-col justify-center items-center relative pointer-events-none"
+      class="pointer-events-none relative flex flex-col items-center justify-center"
     >
       <NodeHeader :node-data="nodeData" />
     </div>
     <div
-      class="flex flex-1 flex-col gap-1 pb-2 pointer-events-none"
+      class="pointer-events-none flex flex-1 flex-col gap-1 pb-2"
       :data-testid="`node-body-${nodeData.id}`"
     >
       <NodeSlots :node-data="nodeData" />
@@ -36,6 +36,7 @@ import type {
   INodeInputSlot,
   INodeOutputSlot
 } from '@/lib/litegraph/src/interfaces'
+import type { IWidgetOptions } from '@/lib/litegraph/src/types/widgets'
 import { RenderShape } from '@/lib/litegraph/src/litegraph'
 import NodeHeader from '@/renderer/extensions/vueNodes/components/NodeHeader.vue'
 import NodeSlots from '@/renderer/extensions/vueNodes/components/NodeSlots.vue'
@@ -56,6 +57,7 @@ const nodeData = computed<VueNodeData>(() => {
   const widgets = Object.entries(nodeDef.inputs || {})
     .filter(([_, input]) => widgetStore.inputIsWidget(input))
     .map(([name, input]) => ({
+      nodeId: '-1',
       name,
       type: input.widgetType || input.type,
       value:
@@ -69,8 +71,11 @@ const nodeData = computed<VueNodeData>(() => {
       options: {
         hidden: input.hidden,
         advanced: input.advanced,
-        values: input.type === 'COMBO' ? input.options : undefined // For combo widgets
-      }
+        values:
+          input.type === 'COMBO' && Array.isArray(input.options)
+            ? input.options
+            : undefined
+      } satisfies IWidgetOptions
     }))
 
   const inputs: INodeInputSlot[] = Object.entries(nodeDef.inputs || {})
diff --git a/tests-ui/tests/renderer/extensions/vueNodes/components/LivePreview.test.ts b/src/renderer/extensions/vueNodes/components/LivePreview.test.ts
similarity index 100%
rename from tests-ui/tests/renderer/extensions/vueNodes/components/LivePreview.test.ts
rename to src/renderer/extensions/vueNodes/components/LivePreview.test.ts
diff --git a/src/renderer/extensions/vueNodes/components/LivePreview.vue b/src/renderer/extensions/vueNodes/components/LivePreview.vue
index a4b090b19d..f088637cde 100644
--- a/src/renderer/extensions/vueNodes/components/LivePreview.vue
+++ b/src/renderer/extensions/vueNodes/components/LivePreview.vue
@@ -1,30 +1,20 @@
 <template>
-  <div v-if="imageUrl" class="flex h-full min-h-16 w-full min-w-16 flex-col">
-    <!-- Image Container -->
+  <template v-if="imageUrl">
     <div
-      class="relative h-88 w-full grow overflow-hidden rounded-[5px] bg-node-component-surface"
+      v-if="imageError"
+      class="text-pure-white flex size-full flex-col items-center justify-center text-center"
     >
-      <!-- Error State -->
-      <div
-        v-if="imageError"
-        class="text-pure-white flex h-full w-full flex-col items-center justify-center text-center"
-      >
-        <i-lucide:image-off class="mb-1 size-8 text-smoke-500" />
-        <p class="text-xs text-smoke-400">{{ $t('g.imageFailedToLoad') }}</p>
-      </div>
-
-      <!-- Main Image -->
-      <img
-        v-else
-        :src="imageUrl"
-        :alt="$t('g.liveSamplingPreview')"
-        class="pointer-events-none h-full w-full object-contain object-center"
-        @load="handleImageLoad"
-        @error="handleImageError"
-      />
+      <i-lucide:image-off class="mb-1 size-8 text-smoke-500" />
+      <p class="text-xs text-smoke-400">{{ $t('g.imageFailedToLoad') }}</p>
     </div>
-
-    <!-- Image Dimensions -->
+    <img
+      v-else
+      :src="imageUrl"
+      :alt="$t('g.liveSamplingPreview')"
+      class="pointer-events-none min-h-55 w-full flex-1 object-contain contain-size"
+      @load="handleImageLoad"
+      @error="handleImageError"
+    />
     <div class="text-node-component-header-text mt-1 text-center text-xs">
       {{
         imageError
@@ -32,15 +22,14 @@
           : actualDimensions || $t('g.calculatingDimensions')
       }}
     </div>
-  </div>
+  </template>
 </template>
 
 <script setup lang="ts">
 import { ref, watch } from 'vue'
 
 interface LivePreviewProps {
-  /** Image URL to display */
-  imageUrl: string | null
+  imageUrl: string
 }
 
 const props = defineProps<LivePreviewProps>()
diff --git a/src/renderer/extensions/vueNodes/components/NodeBadge.vue b/src/renderer/extensions/vueNodes/components/NodeBadge.vue
index 064eac26d1..be14d193e8 100644
--- a/src/renderer/extensions/vueNodes/components/NodeBadge.vue
+++ b/src/renderer/extensions/vueNodes/components/NodeBadge.vue
@@ -1,11 +1,12 @@
 <template>
   <div
     v-if="text"
-    class="min-w-max rounded-sm bg-node-component-surface px-1 py-0.5 text-xs flex items-center gap-1"
+    class="flex min-w-max items-center gap-1 rounded-sm bg-node-component-surface px-1 py-0.5 text-xs"
     :style="{
       color: fgColor,
       backgroundColor: bgColor
     }"
+    @click="(e) => onClick?.(e)"
   >
     {{ text }}
     <i v-if="cssIcon" :class="cn(cssIcon)" />
@@ -20,6 +21,7 @@ export interface NodeBadgeProps {
   fgColor?: LGraphBadge['fgColor']
   bgColor?: LGraphBadge['bgColor']
   cssIcon?: string
+  onClick?: (e: MouseEvent) => void
 }
 
 const {
diff --git a/src/renderer/extensions/vueNodes/components/NodeBadges.vue b/src/renderer/extensions/vueNodes/components/NodeBadges.vue
new file mode 100644
index 0000000000..79598519f3
--- /dev/null
+++ b/src/renderer/extensions/vueNodes/components/NodeBadges.vue
@@ -0,0 +1,55 @@
+<script setup lang="ts">
+import NodeBadge from '@/renderer/extensions/vueNodes/components/NodeBadge.vue'
+import type { NodeBadgeProps } from '@/renderer/extensions/vueNodes/components/NodeBadge.vue'
+
+defineProps<{
+  hasComfyBadge: boolean
+  core: NodeBadgeProps[]
+  extension: NodeBadgeProps[]
+}>()
+</script>
+<template>
+  <div
+    v-if="hasComfyBadge || core.length || extension.length"
+    class="flex h-5 w-full gap-2 px-2 text-muted-foreground"
+  >
+    <div
+      v-if="hasComfyBadge"
+      class="flex size-6 items-center justify-center rounded-full bg-component-node-widget-background"
+    >
+      <i class="icon-[comfy--comfy-c] size-3" />
+    </div>
+    <div
+      v-if="core.length"
+      class="flex h-6 items-center justify-center overflow-clip rounded-full bg-component-node-widget-background"
+    >
+      <template v-for="(badge, index) of core" :key="badge.text">
+        <div
+          v-if="index !== 0"
+          class="mr-0.5 h-4 border-r border-muted-foreground pr-0.5"
+        />
+        <NodeBadge
+          bg-color="transparent"
+          v-bind="badge"
+          class="h-6 first:pl-2 last:pr-2"
+        />
+      </template>
+    </div>
+    <div
+      v-if="extension.length"
+      class="flex h-6 items-center justify-center overflow-clip rounded-full bg-component-node-widget-background"
+    >
+      <template v-for="(badge, index) of extension" :key="badge.text">
+        <div
+          v-if="index !== 0"
+          class="mr-0.5 h-4 border-r border-muted-foreground pr-0.5"
+        />
+        <NodeBadge
+          bg-color="transparent"
+          v-bind="badge"
+          class="h-6 first:pl-2 last:pr-2"
+        />
+      </template>
+    </div>
+  </div>
+</template>
diff --git a/src/renderer/extensions/vueNodes/components/NodeContent.vue b/src/renderer/extensions/vueNodes/components/NodeContent.vue
index ed92251454..7bed771916 100644
--- a/src/renderer/extensions/vueNodes/components/NodeContent.vue
+++ b/src/renderer/extensions/vueNodes/components/NodeContent.vue
@@ -2,20 +2,25 @@
   <div v-if="renderError" class="node-error p-2 text-sm text-red-500">
     {{ st('nodeErrors.content', 'Node Content Error') }}
   </div>
-  <div v-else class="lg-node-content flex grow flex-col">
+  <div v-else class="lg-node-content flex flex-auto grow flex-col">
     <!-- Default slot for custom content -->
     <slot>
       <VideoPreview
         v-if="hasMedia && media?.type === 'video'"
         :image-urls="media.urls"
         :node-id="nodeId"
-        class="mt-2"
+        class="mt-2 flex-auto"
+      />
+      <AudioPreview
+        v-else-if="hasMedia && media?.type === 'audio'"
+        :audio-urls="media.urls"
+        class="mt-2 flex-auto"
       />
       <ImagePreview
         v-else-if="hasMedia && media?.type === 'image'"
         :image-urls="media.urls"
         :node-id="nodeId"
-        class="mt-2"
+        class="mt-2 flex-auto"
       />
     </slot>
   </div>
@@ -29,12 +34,13 @@ import { useErrorHandling } from '@/composables/useErrorHandling'
 import { st } from '@/i18n'
 
 import VideoPreview from '../VideoPreview.vue'
+import AudioPreview from './AudioPreview.vue'
 import ImagePreview from './ImagePreview.vue'
 
 interface NodeContentProps {
   nodeData?: VueNodeData
   media?: {
-    type: 'image' | 'video'
+    type: 'image' | 'video' | 'audio'
     urls: string[]
   }
 }
diff --git a/src/renderer/extensions/vueNodes/components/NodeHeader.test.ts b/src/renderer/extensions/vueNodes/components/NodeHeader.test.ts
index 0c755116bf..e5bb312246 100644
--- a/src/renderer/extensions/vueNodes/components/NodeHeader.test.ts
+++ b/src/renderer/extensions/vueNodes/components/NodeHeader.test.ts
@@ -1,5 +1,6 @@
+import { createTestingPinia } from '@pinia/testing'
 import { mount } from '@vue/test-utils'
-import { createPinia, setActivePinia } from 'pinia'
+import { setActivePinia } from 'pinia'
 import PrimeVue from 'primevue/config'
 import InputText from 'primevue/inputtext'
 import { describe, expect, it, vi } from 'vitest'
@@ -29,7 +30,7 @@ const makeNodeData = (overrides: Partial<VueNodeData> = {}): VueNodeData => ({
 })
 
 const setupMockStores = () => {
-  const pinia = createPinia()
+  const pinia = createTestingPinia({ stubActions: false })
   setActivePinia(pinia)
 
   const settingStore = useSettingStore()
@@ -154,7 +155,7 @@ describe('NodeHeader.vue', () => {
     // Edit and confirm (EditableText uses blur or enter to emit)
     const input = wrapper.get('[data-testid="node-title-input"]')
     await input.setValue('My Custom Sampler')
-    await input.trigger('keyup.enter')
+    await input.trigger('keydown.enter')
     await input.trigger('blur')
 
     // NodeHeader should emit update:title with trimmed value
@@ -169,7 +170,7 @@ describe('NodeHeader.vue', () => {
     await wrapper.get('[data-testid="node-header-1"]').trigger('dblclick')
     const input = wrapper.get('[data-testid="node-title-input"]')
     await input.setValue('Should Not Save')
-    await input.trigger('keyup.escape')
+    await input.trigger('keydown.escape')
 
     // Should not emit update:title
     expect(wrapper.emitted('update:title')).toBeFalsy()
diff --git a/src/renderer/extensions/vueNodes/components/NodeHeader.vue b/src/renderer/extensions/vueNodes/components/NodeHeader.vue
index fe99c5d620..5cbab50b28 100644
--- a/src/renderer/extensions/vueNodes/components/NodeHeader.vue
+++ b/src/renderer/extensions/vueNodes/components/NodeHeader.vue
@@ -6,18 +6,17 @@
     v-else
     :class="
       cn(
-        'lg-node-header text-sm py-2 pl-2 pr-3 w-full min-w-0',
-        'text-node-component-header bg-node-component-header-surface',
+        'lg-node-header w-full min-w-0 py-2 pr-3 pl-2 text-sm',
+        'text-node-component-header',
         headerShapeClass
       )
     "
-    :style="headerStyle"
     :data-testid="`node-header-${nodeData?.id || ''}`"
     @dblclick="handleDoubleClick"
   >
-    <div class="flex items-center justify-between gap-2.5 min-w-0">
+    <div class="flex min-w-0 items-center justify-between gap-2.5">
       <!-- Collapse/Expand Button -->
-      <div class="relative grow-1 flex items-center gap-2.5 min-w-0 flex-1">
+      <div class="relative mr-auto flex min-w-0 shrink items-center gap-2.5">
         <div class="flex shrink-0 items-center px-0.5">
           <Button
             size="icon-sm"
@@ -38,17 +37,13 @@
             />
           </Button>
         </div>
-
-        <div v-if="isSubgraphNode" class="icon-[comfy--workflow] size-4" />
-        <div v-if="isApiNode" class="icon-[lucide--component] size-4" />
-
         <!-- Node Title -->
         <div
           v-tooltip.top="tooltipConfig"
           class="flex min-w-0 flex-1 items-center gap-2"
           data-testid="node-title"
         >
-          <div class="truncate min-w-0 flex-1">
+          <div class="flex-1 truncate">
             <EditableText
               :model-value="displayTitle"
               :is-editing="isEditing"
@@ -60,38 +55,37 @@
         </div>
       </div>
 
-      <div class="flex shrink-0 items-center justify-between gap-2">
-        <NodeBadge
-          v-for="badge of nodeBadges"
-          :key="badge.text"
-          v-bind="badge"
-        />
-        <NodeBadge v-if="statusBadge" v-bind="statusBadge" />
-        <i-comfy:pin
-          v-if="isPinned"
-          class="size-5"
-          data-testid="node-pin-indicator"
-        />
-        <Button
-          v-if="isSubgraphNode"
-          v-tooltip.top="enterSubgraphTooltipConfig"
-          variant="textonly"
-          size="sm"
-          data-testid="subgraph-enter-button"
-          class="text-node-component-header h-5 px-0.5"
-          @click.stop="handleEnterSubgraph"
-          @dblclick.stop
+      <template v-for="badge in priceBadges ?? []" :key="badge.required">
+        <span
+          :class="
+            cn(
+              'flex h-5 shrink-0 items-center bg-component-node-widget-background p-1 text-xs',
+              badge.rest ? 'rounded-l-full pr-1' : 'rounded-full'
+            )
+          "
         >
-          <span>{{ $t('g.edit') }}</span>
-          <i class="icon-[lucide--scaling] size-5" />
-        </Button>
-      </div>
+          <i class="icon-[lucide--component] h-full bg-amber-400" />
+          <span class="truncate" v-text="badge.required" />
+        </span>
+        <span
+          v-if="badge.rest"
+          class="-ml-2.5 max-w-max min-w-0 grow basis-0 truncate rounded-r-full bg-component-node-widget-background"
+        >
+          <span class="pr-2" v-text="badge.rest" />
+        </span>
+      </template>
+      <NodeBadge v-if="statusBadge" v-bind="statusBadge" />
+      <i
+        v-if="isPinned"
+        class="icon-[comfy--pin] size-5"
+        data-testid="node-pin-indicator"
+      />
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { computed, onErrorCaptured, ref, toValue, watch } from 'vue'
+import { computed, onErrorCaptured, ref, watch } from 'vue'
 
 import EditableText from '@/components/common/EditableText.vue'
 import Button from '@/components/ui/button/Button.vue'
@@ -99,17 +93,9 @@ import type { VueNodeData } from '@/composables/graph/useGraphNodeManager'
 import { useErrorHandling } from '@/composables/useErrorHandling'
 import { st } from '@/i18n'
 import { LGraphEventMode, RenderShape } from '@/lib/litegraph/src/litegraph'
-import { useSettingStore } from '@/platform/settings/settingStore'
 import NodeBadge from '@/renderer/extensions/vueNodes/components/NodeBadge.vue'
 import { useNodeTooltips } from '@/renderer/extensions/vueNodes/composables/useNodeTooltips'
-import { applyLightThemeColor } from '@/renderer/extensions/vueNodes/utils/nodeStyleUtils'
-import { app } from '@/scripts/app'
-import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
-import { normalizeI18nKey } from '@/utils/formatUtil'
-import {
-  getLocatorIdFromNodeData,
-  getNodeByLocatorId
-} from '@/utils/graphTraversalUtil'
+import { resolveNodeDisplayName } from '@/utils/nodeTitleUtil'
 import { cn } from '@/utils/tailwindUtil'
 
 import type { NodeBadgeProps } from './NodeBadge.vue'
@@ -117,6 +103,7 @@ import type { NodeBadgeProps } from './NodeBadge.vue'
 interface NodeHeaderProps {
   nodeData?: VueNodeData
   collapsed?: boolean
+  priceBadges?: { required: string; rest?: string }[]
 }
 
 const { nodeData, collapsed } = defineProps<NodeHeaderProps>()
@@ -124,7 +111,6 @@ const { nodeData, collapsed } = defineProps<NodeHeaderProps>()
 const emit = defineEmits<{
   collapse: []
   'update:title': [newTitle: string]
-  'enter-subgraph': []
 }>()
 
 // Error boundary implementation
@@ -152,34 +138,13 @@ const tooltipConfig = computed(() => {
   return createTooltipConfig(description)
 })
 
-const enterSubgraphTooltipConfig = computed(() => {
-  return createTooltipConfig(st('enterSubgraph', 'Enter Subgraph'))
-})
-
-const headerStyle = computed(() => {
-  const colorPaletteStore = useColorPaletteStore()
-
-  const opacity = useSettingStore().get('Comfy.Node.Opacity') ?? 1
-
-  if (!nodeData?.color) {
-    return { backgroundColor: '', opacity }
-  }
-
-  const headerColor = applyLightThemeColor(
-    nodeData.color,
-    Boolean(colorPaletteStore.completedActivePalette.light_theme)
-  )
-
-  return { backgroundColor: headerColor, opacity }
-})
-
 const resolveTitle = (info: VueNodeData | undefined) => {
-  const title = (info?.title ?? '').trim()
-  if (title.length > 0) return title
-
-  const nodeType = (info?.type ?? '').trim() || 'Untitled'
-  const key = `nodeDefs.${normalizeI18nKey(nodeType)}.display_name`
-  return st(key, nodeType)
+  const untitledLabel = st('g.untitled', 'Untitled')
+  return resolveNodeDisplayName(info ?? null, {
+    emptyLabel: untitledLabel,
+    untitledLabel,
+    st
+  })
 }
 
 // Local state for title to provide immediate feedback
@@ -198,11 +163,7 @@ const statusBadge = computed((): NodeBadgeProps | undefined =>
       : undefined
 )
 
-const nodeBadges = computed<NodeBadgeProps[]>(() =>
-  [...(nodeData?.badges ?? [])].map(toValue)
-)
 const isPinned = computed(() => Boolean(nodeData?.flags?.pinned))
-const isApiNode = computed(() => Boolean(nodeData?.apiNode))
 
 const headerShapeClass = computed(() => {
   if (collapsed) {
@@ -225,22 +186,6 @@ const headerShapeClass = computed(() => {
   }
 })
 
-// Subgraph detection
-const isSubgraphNode = computed(() => {
-  if (!nodeData?.id) return false
-
-  // Get the underlying LiteGraph node
-  const graph = app.rootGraph
-  if (!graph) return false
-
-  const locatorId = getLocatorIdFromNodeData(nodeData)
-
-  const litegraphNode = getNodeByLocatorId(graph, locatorId)
-
-  // Use the official type guard method
-  return litegraphNode?.isSubgraphNode() ?? false
-})
-
 // Watch for external changes to the node title or type
 watch(
   () => [nodeData?.title, nodeData?.type] as const,
@@ -273,8 +218,4 @@ const handleTitleEdit = (newTitle: string) => {
 const handleTitleCancel = () => {
   isEditing.value = false
 }
-
-const handleEnterSubgraph = () => {
-  emit('enter-subgraph')
-}
 </script>
diff --git a/src/renderer/extensions/vueNodes/components/NodeSlots.test.ts b/src/renderer/extensions/vueNodes/components/NodeSlots.test.ts
index 6f3c75adfe..a8991f9f8f 100644
--- a/src/renderer/extensions/vueNodes/components/NodeSlots.test.ts
+++ b/src/renderer/extensions/vueNodes/components/NodeSlots.test.ts
@@ -1,6 +1,6 @@
 /* eslint-disable vue/one-component-per-file */
+import { createTestingPinia } from '@pinia/testing'
 import { mount } from '@vue/test-utils'
-import { createPinia } from 'pinia'
 import { describe, expect, it } from 'vitest'
 import { defineComponent } from 'vue'
 import type { PropType } from 'vue'
@@ -84,7 +84,7 @@ const mountSlots = (nodeData: VueNodeData, readonly = false) => {
   })
   return mount(NodeSlots, {
     global: {
-      plugins: [i18n, createPinia()],
+      plugins: [i18n, createTestingPinia({ stubActions: false })],
       stubs: {
         InputSlot: InputSlotStub,
         OutputSlot: OutputSlotStub
diff --git a/src/renderer/extensions/vueNodes/components/NodeSlots.vue b/src/renderer/extensions/vueNodes/components/NodeSlots.vue
index 106ba5613f..c25f999257 100644
--- a/src/renderer/extensions/vueNodes/components/NodeSlots.vue
+++ b/src/renderer/extensions/vueNodes/components/NodeSlots.vue
@@ -2,14 +2,14 @@
   <div v-if="renderError" class="node-error p-2 text-sm text-red-500">
     {{ st('nodeErrors.slots', 'Node Slots Error') }}
   </div>
-  <div v-else :class="cn('flex justify-between min-w-0', unifiedWrapperClass)">
+  <div v-else :class="cn('flex min-w-0 justify-between', unifiedWrapperClass)">
     <div
       v-if="filteredInputs.length"
-      :class="cn('flex flex-col min-w-0', unifiedDotsClass)"
+      :class="cn('flex min-w-0 flex-col', unifiedDotsClass)"
     >
       <InputSlot
         v-for="(input, index) in filteredInputs"
-        :key="`input-${index}`"
+        :key="`input-${input.name}`"
         :slot-data="input"
         :node-type="nodeData?.type || ''"
         :node-id="nodeData?.id != null ? String(nodeData.id) : ''"
@@ -19,11 +19,11 @@
 
     <div
       v-if="nodeData?.outputs?.length"
-      :class="cn('ml-auto flex flex-col min-w-0', unifiedDotsClass)"
+      :class="cn('ml-auto flex min-w-0 flex-col', unifiedDotsClass)"
     >
       <OutputSlot
         v-for="(output, index) in nodeData.outputs"
-        :key="`output-${index}`"
+        :key="`output-${output.name}`"
         :slot-data="output"
         :node-type="nodeData?.type || ''"
         :node-id="nodeData?.id != null ? String(nodeData.id) : ''"
@@ -68,13 +68,13 @@ const filteredInputs = computed(() => [
 const unifiedWrapperClass = computed((): string =>
   cn(
     unified &&
-      'absolute inset-0 items-center pointer-events-none opacity-0 z-30'
+      'pointer-events-none absolute inset-0 z-30 items-center opacity-0'
   )
 )
 const unifiedDotsClass = computed((): string =>
   cn(
     unified &&
-      'grid grid-cols-1 grid-rows-1 gap-0 [&>*]:row-span-full [&>*]:col-span-full place-items-center'
+      'grid grid-cols-1 grid-rows-1 place-items-center gap-0 *:col-span-full *:row-span-full'
   )
 )
 
diff --git a/tests-ui/renderer/extensions/vueNodes/components/NodeWidgets.test.ts b/src/renderer/extensions/vueNodes/components/NodeWidgets.test.ts
similarity index 96%
rename from tests-ui/renderer/extensions/vueNodes/components/NodeWidgets.test.ts
rename to src/renderer/extensions/vueNodes/components/NodeWidgets.test.ts
index 78f6c370a6..2174004779 100644
--- a/tests-ui/renderer/extensions/vueNodes/components/NodeWidgets.test.ts
+++ b/src/renderer/extensions/vueNodes/components/NodeWidgets.test.ts
@@ -13,15 +13,12 @@ describe('NodeWidgets', () => {
   const createMockWidget = (
     overrides: Partial<SafeWidgetData> = {}
   ): SafeWidgetData => ({
+    nodeId: 'test_node',
     name: 'test_widget',
     type: 'combo',
-    value: 'test_value',
-    options: {
-      values: ['option1', 'option2']
-    },
+    options: undefined,
     callback: undefined,
     spec: undefined,
-    label: undefined,
     isDOMWidget: false,
     slotMetadata: undefined,
     ...overrides
diff --git a/src/renderer/extensions/vueNodes/components/NodeWidgets.vue b/src/renderer/extensions/vueNodes/components/NodeWidgets.vue
index 9975ec8640..da22dc81d6 100644
--- a/src/renderer/extensions/vueNodes/components/NodeWidgets.vue
+++ b/src/renderer/extensions/vueNodes/components/NodeWidgets.vue
@@ -6,14 +6,15 @@
     v-else
     :class="
       cn(
-        'lg-node-widgets grid grid-cols-[min-content_minmax(80px,max-content)_minmax(125px,auto)] flex-1 gap-y-1 pr-3',
+        'lg-node-widgets grid grid-cols-[min-content_minmax(80px,min-content)_minmax(125px,1fr)] gap-y-1 pr-3',
         shouldHandleNodePointerEvents
           ? 'pointer-events-auto'
           : 'pointer-events-none'
       )
     "
     :style="{
-      'grid-template-rows': gridTemplateRows
+      'grid-template-rows': gridTemplateRows,
+      flex: gridTemplateRows.includes('auto') ? 1 : undefined
     }"
     @pointerdown.capture="handleBringToFront"
     @pointerdown="handleWidgetPointerEvent"
@@ -25,14 +26,14 @@
       :key="`widget-${index}-${widget.name}`"
     >
       <div
-        v-if="!widget.simplified.options?.hidden"
+        v-if="!widget.hidden && (!widget.advanced || showAdvanced)"
         class="lg-node-widget group col-span-full grid grid-cols-subgrid items-stretch"
       >
         <!-- Widget Input Slot Dot -->
         <div
           :class="
             cn(
-              'z-10 w-3 opacity-0 transition-opacity duration-150 group-hover:opacity-100 flex items-stretch',
+              'z-10 flex w-3 items-stretch opacity-0 transition-opacity duration-150 group-hover:opacity-100',
               widget.slotMetadata?.linked && 'opacity-100'
             )
           "
@@ -45,22 +46,35 @@
               boundingRect: [0, 0, 0, 0]
             }"
             :node-id="nodeData?.id != null ? String(nodeData.id) : ''"
+            :has-error="widget.hasError"
             :index="widget.slotMetadata.index"
             :socketless="widget.simplified.spec?.socketless"
             dot-only
           />
         </div>
         <!-- Widget Component -->
-        <component
-          :is="widget.vueComponent"
-          v-model="widget.value"
-          v-tooltip.left="widget.tooltipConfig"
-          :widget="widget.simplified"
-          :node-id="nodeData?.id != null ? String(nodeData.id) : ''"
-          :node-type="nodeType"
-          class="col-span-2"
-          @update:model-value="widget.updateHandler"
-        />
+        <AppInput
+          :id="widget.id"
+          :name="widget.name"
+          :enable="canSelectInputs && !widget.simplified.options?.disabled"
+        >
+          <component
+            :is="widget.vueComponent"
+            v-model="widget.value"
+            v-tooltip.left="widget.tooltipConfig"
+            :widget="widget.simplified"
+            :node-id="nodeData?.id != null ? String(nodeData.id) : ''"
+            :node-type="nodeType"
+            :class="
+              cn(
+                'col-span-2',
+                widget.hasError && 'font-bold text-node-stroke-error'
+              )
+            "
+            @update:model-value="widget.updateHandler"
+            @contextmenu="widget.handleContextMenu"
+          />
+        </AppInput>
       </div>
     </template>
   </div>
@@ -75,10 +89,17 @@ import type {
   VueNodeData,
   WidgetSlotMetadata
 } from '@/composables/graph/useGraphNodeManager'
+import { useAppMode } from '@/composables/useAppMode'
+import { showNodeOptions } from '@/composables/graph/useMoreOptionsMenu'
 import { useErrorHandling } from '@/composables/useErrorHandling'
 import { st } from '@/i18n'
+import { LGraphEventMode } from '@/lib/litegraph/src/types/globalEnums'
+import { useSettingStore } from '@/platform/settings/settingStore'
 import { useCanvasInteractions } from '@/renderer/core/canvas/useCanvasInteractions'
+import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import AppInput from '@/renderer/extensions/linearMode/AppInput.vue'
 import { useNodeTooltips } from '@/renderer/extensions/vueNodes/composables/useNodeTooltips'
+import { useNodeEventHandlers } from '@/renderer/extensions/vueNodes/composables/useNodeEventHandlers'
 import { useNodeZIndex } from '@/renderer/extensions/vueNodes/composables/useNodeZIndex'
 import WidgetDOM from '@/renderer/extensions/vueNodes/widgets/components/WidgetDOM.vue'
 // Import widget components directly
@@ -88,6 +109,12 @@ import {
   shouldExpand,
   shouldRenderAsVue
 } from '@/renderer/extensions/vueNodes/widgets/registry/widgetRegistry'
+import {
+  stripGraphPrefix,
+  useWidgetValueStore
+} from '@/stores/widgetValueStore'
+import { usePromotionStore } from '@/stores/promotionStore'
+import { useExecutionErrorStore } from '@/stores/executionErrorStore'
 import type { SimplifiedWidget, WidgetValue } from '@/types/simplifiedWidget'
 import { cn } from '@/utils/tailwindUtil'
 
@@ -101,7 +128,11 @@ const { nodeData } = defineProps<NodeWidgetsProps>()
 
 const { shouldHandleNodePointerEvents, forwardEventToCanvas } =
   useCanvasInteractions()
+const { isSelectInputsMode } = useAppMode()
+const canvasStore = useCanvasStore()
 const { bringNodeToFront } = useNodeZIndex()
+const promotionStore = usePromotionStore()
+const executionErrorStore = useExecutionErrorStore()
 
 function handleWidgetPointerEvent(event: PointerEvent) {
   if (shouldHandleNodePointerEvents.value) return
@@ -115,6 +146,8 @@ function handleBringToFront() {
   }
 }
 
+const { handleNodeRightClick } = useNodeEventHandlers()
+
 // Error boundary implementation
 const renderError = ref<string | null>(null)
 
@@ -126,73 +159,136 @@ onErrorCaptured((error) => {
   return false
 })
 
+const canSelectInputs = computed(
+  () => isSelectInputsMode.value && nodeData?.mode === LGraphEventMode.ALWAYS
+)
 const nodeType = computed(() => nodeData?.type || '')
+const settingStore = useSettingStore()
+const showAdvanced = computed(
+  () =>
+    nodeData?.showAdvanced ||
+    settingStore.get('Comfy.Node.AlwaysShowAdvancedWidgets')
+)
 const { getWidgetTooltip, createTooltipConfig } = useNodeTooltips(
   nodeType.value
 )
+const widgetValueStore = useWidgetValueStore()
 
 interface ProcessedWidget {
+  advanced: boolean
+  handleContextMenu: (e: PointerEvent) => void
+  hasLayoutSize: boolean
+  hasError: boolean
+  hidden: boolean
+  id: string
   name: string
-  type: string
-  vueComponent: Component
   simplified: SimplifiedWidget
-  value: WidgetValue
-  updateHandler: (value: WidgetValue) => void
   tooltipConfig: TooltipOptions
+  type: string
+  updateHandler: (value: WidgetValue) => void
+  value: WidgetValue
+  vueComponent: Component
   slotMetadata?: WidgetSlotMetadata
 }
 
 const processedWidgets = computed((): ProcessedWidget[] => {
   if (!nodeData?.widgets) return []
+  const nodeErrors = executionErrorStore.lastNodeErrors?.[nodeData.id ?? '']
+  const graphId = canvasStore.canvas?.graph?.rootGraph.id
 
+  const nodeId = nodeData.id
   const { widgets } = nodeData
   const result: ProcessedWidget[] = []
 
   for (const widget of widgets) {
     if (!shouldRenderAsVue(widget)) continue
 
+    const isPromotedView = !!widget.nodeId
+
     const vueComponent =
-      getComponent(widget.type, widget.name) ||
+      getComponent(widget.type) ||
       (widget.isDOMWidget ? WidgetDOM : WidgetLegacy)
 
-    const { slotMetadata, options } = widget
+    const { slotMetadata } = widget
 
-    // Core feature: Disable Vue widgets when their input slots are connected
-    // This prevents conflicting input sources - when a slot is linked to another
-    // node's output, the widget should be read-only to avoid data conflicts
-    const widgetOptions = slotMetadata?.linked
-      ? { ...options, disabled: true }
-      : options
+    // Get metadata from store (registered during BaseWidget.setNodeId)
+    const bareWidgetId = stripGraphPrefix(
+      widget.storeNodeId ?? widget.nodeId ?? nodeId
+    )
+    const storeWidgetName = widget.storeName ?? widget.name
+    const widgetState = graphId
+      ? widgetValueStore.getWidget(graphId, bareWidgetId, storeWidgetName)
+      : undefined
+
+    // Get value from store (falls back to undefined if not registered)
+    const value = widgetState?.value as WidgetValue
+
+    // Build options from store state, with disabled override for
+    // slot-linked widgets or widgets with disabled state (e.g. display-only)
+    const storeOptions = widgetState?.options ?? {}
+    const isDisabled = slotMetadata?.linked || widgetState?.disabled
+    const widgetOptions = isDisabled
+      ? { ...storeOptions, disabled: true }
+      : storeOptions
+
+    const borderStyle =
+      graphId &&
+      !isPromotedView &&
+      promotionStore.isPromotedByAny(graphId, String(bareWidgetId), widget.name)
+        ? 'ring ring-component-node-widget-promoted'
+        : widget.options?.advanced
+          ? 'ring ring-component-node-widget-advanced'
+          : undefined
 
     const simplified: SimplifiedWidget = {
       name: widget.name,
       type: widget.type,
-      value: widget.value,
-      borderStyle: widget.borderStyle,
+      value,
+      borderStyle,
       callback: widget.callback,
       controlWidget: widget.controlWidget,
-      label: widget.label,
-      nodeType: widget.nodeType,
+      label: widgetState?.label,
       options: widgetOptions,
       spec: widget.spec
     }
 
-    function updateHandler(value: WidgetValue) {
-      // Update the widget value directly
-      widget.value = value
-
-      widget.callback?.(value)
+    function updateHandler(newValue: WidgetValue) {
+      // Update value in store
+      if (widgetState) widgetState.value = newValue
+      // Invoke LiteGraph callback wrapper (handles triggerDraw, etc.)
+      widget.callback?.(newValue)
     }
 
     const tooltipText = getWidgetTooltip(widget)
     const tooltipConfig = createTooltipConfig(tooltipText)
+    const handleContextMenu = (e: PointerEvent) => {
+      e.preventDefault()
+      e.stopPropagation()
+      handleNodeRightClick(e, nodeId)
+      showNodeOptions(
+        e,
+        widget.name,
+        widget.nodeId !== undefined
+          ? String(stripGraphPrefix(widget.nodeId))
+          : undefined
+      )
+    }
 
     result.push({
+      advanced: widget.options?.advanced ?? false,
+      handleContextMenu,
+      hasLayoutSize: widget.hasLayoutSize ?? false,
+      hasError:
+        nodeErrors?.errors?.some(
+          (error) => error.extra_info?.input_name === widget.name
+        ) ?? false,
+      hidden: widget.options?.hidden ?? false,
+      id: String(bareWidgetId),
       name: widget.name,
       type: widget.type,
       vueComponent,
       simplified,
-      value: widget.value,
+      value,
       updateHandler,
       tooltipConfig,
       slotMetadata
@@ -203,10 +299,9 @@ const processedWidgets = computed((): ProcessedWidget[] => {
 })
 
 const gridTemplateRows = computed((): string => {
-  if (!nodeData?.widgets) return ''
-  const processedNames = new Set(toValue(processedWidgets).map((w) => w.name))
-  return nodeData.widgets
-    .filter((w) => processedNames.has(w.name) && !w.options?.hidden)
+  // Use processedWidgets directly since it already has store-based hidden/advanced
+  return toValue(processedWidgets)
+    .filter((w) => !w.hidden && (!w.advanced || showAdvanced.value))
     .map((w) =>
       shouldExpand(w.type) || w.hasLayoutSize ? 'auto' : 'min-content'
     )
diff --git a/src/renderer/extensions/vueNodes/components/OutputSlot.vue b/src/renderer/extensions/vueNodes/components/OutputSlot.vue
index 9a7506130f..2b9fab2813 100644
--- a/src/renderer/extensions/vueNodes/components/OutputSlot.vue
+++ b/src/renderer/extensions/vueNodes/components/OutputSlot.vue
@@ -1,10 +1,17 @@
 <template>
   <div v-if="renderError" class="node-error p-1 text-xs text-red-500">⚠️</div>
   <div v-else v-tooltip.right="tooltipConfig" :class="slotWrapperClass">
-    <div class="relative h-full flex items-center min-w-0">
+    <div class="relative flex h-full min-w-0 items-center">
       <!-- Slot Name -->
-      <span v-if="!dotOnly" class="truncate text-node-component-slot-text">
-        {{ slotData.localized_name || slotData.name || `Output ${index}` }}
+      <span
+        v-if="!props.dotOnly && !hasNoLabel"
+        class="truncate text-node-component-slot-text"
+      >
+        {{
+          slotData.label ||
+          slotData.localized_name ||
+          (slotData.name ?? `Output ${index}`)
+        }}
       </span>
     </div>
     <!-- Connection Dot -->
@@ -20,9 +27,11 @@
 <script setup lang="ts">
 import { computed, onErrorCaptured, ref, watchEffect } from 'vue'
 import type { ComponentPublicInstance } from 'vue'
+import { useI18n } from 'vue-i18n'
 
 import { useErrorHandling } from '@/composables/useErrorHandling'
 import type { INodeSlot } from '@/lib/litegraph/src/litegraph'
+import { RenderShape } from '@/lib/litegraph/src/types/globalEnums'
 import { useSlotLinkDragUIState } from '@/renderer/core/canvas/links/slotLinkDragUIState'
 import { getSlotKey } from '@/renderer/core/layout/slots/slotIdentifier'
 import { useNodeTooltips } from '@/renderer/extensions/vueNodes/composables/useNodeTooltips'
@@ -44,6 +53,13 @@ interface OutputSlotProps {
 
 const props = defineProps<OutputSlotProps>()
 
+const { t } = useI18n()
+
+const hasNoLabel = computed(
+  () => !props.slotData.localized_name && props.slotData.name === ''
+)
+const dotOnly = computed(() => props.dotOnly || hasNoLabel.value)
+
 // Error boundary implementation
 const renderError = ref<string | null>(null)
 
@@ -57,7 +73,11 @@ const tooltipConfig = computed(() => {
   const slotName = props.slotData.name || ''
   const tooltipText = getOutputSlotTooltip(props.index)
   const fallbackText = tooltipText || `Output: ${slotName}`
-  return createTooltipConfig(fallbackText)
+  const iterativeSuffix =
+    props.slotData.shape === RenderShape.GRID
+      ? ` ${t('vueNodesSlot.iterative')}`
+      : ''
+  return createTooltipConfig(fallbackText + iterativeSuffix)
 })
 
 onErrorCaptured((error) => {
@@ -77,9 +97,9 @@ const shouldDim = computed(() => {
 
 const slotWrapperClass = computed(() =>
   cn(
-    'lg-slot lg-slot--output flex items-center justify-end group rounded-l-lg h-6',
+    'lg-slot lg-slot--output group flex h-6 items-center justify-end rounded-l-lg',
     'cursor-crosshair',
-    props.dotOnly ? 'lg-slot--dot-only justify-center' : 'pl-6',
+    dotOnly.value ? 'lg-slot--dot-only justify-center' : 'pl-6',
     {
       'lg-slot--connected': props.connected,
       'lg-slot--compatible': props.compatible,
diff --git a/src/renderer/extensions/vueNodes/components/SlotConnectionDot.test.ts b/src/renderer/extensions/vueNodes/components/SlotConnectionDot.test.ts
new file mode 100644
index 0000000000..d0524d2cfe
--- /dev/null
+++ b/src/renderer/extensions/vueNodes/components/SlotConnectionDot.test.ts
@@ -0,0 +1,41 @@
+import { mount } from '@vue/test-utils'
+import { describe, expect, it } from 'vitest'
+
+import type { INodeSlot } from '@/lib/litegraph/src/litegraph'
+import { RenderShape } from '@/lib/litegraph/src/types/globalEnums'
+
+import SlotConnectionDot from './SlotConnectionDot.vue'
+
+const defaultSlot: INodeSlot = {
+  name: 'output',
+  type: 'IMAGE',
+  boundingRect: [0, 0, 0, 0]
+}
+
+function mountDot(slotData?: INodeSlot) {
+  return mount(SlotConnectionDot, {
+    props: { slotData }
+  })
+}
+
+describe('SlotConnectionDot', () => {
+  it('renders circle shape by default', () => {
+    const wrapper = mountDot(defaultSlot)
+
+    const dot = wrapper.find('.slot-dot')
+    expect(dot.classes()).toContain('rounded-full')
+    expect(dot.element.tagName).toBe('DIV')
+  })
+
+  it('renders rounded square for GRID shape', () => {
+    const wrapper = mountDot({
+      ...defaultSlot,
+      shape: RenderShape.GRID
+    })
+
+    const dot = wrapper.find('.slot-dot')
+    expect(dot.classes()).toContain('rounded-[1px]')
+    expect(dot.classes()).not.toContain('rounded-full')
+    expect(dot.element.tagName).toBe('DIV')
+  })
+})
diff --git a/src/renderer/extensions/vueNodes/components/SlotConnectionDot.vue b/src/renderer/extensions/vueNodes/components/SlotConnectionDot.vue
index 3921128b02..4f74083f21 100644
--- a/src/renderer/extensions/vueNodes/components/SlotConnectionDot.vue
+++ b/src/renderer/extensions/vueNodes/components/SlotConnectionDot.vue
@@ -3,6 +3,7 @@ import { computed, useTemplateRef } from 'vue'
 
 import { getSlotColor } from '@/constants/slotColors'
 import type { INodeSlot } from '@/lib/litegraph/src/litegraph'
+import { RenderShape } from '@/lib/litegraph/src/types/globalEnums'
 import { cn } from '@/utils/tailwindUtil'
 import type { ClassValue } from '@/utils/tailwindUtil'
 
@@ -13,31 +14,45 @@ const props = defineProps<{
   multi?: boolean
 }>()
 
+const clipPath = computed(() => {
+  switch (props.slotData?.shape) {
+    case 6:
+      return 'url(#square)'
+    case 7:
+      return 'url(#hollow)'
+    default:
+      return undefined
+  }
+})
+
 const slotElRef = useTemplateRef('slot-el')
 
-function getTypes() {
+const types = computed(() => {
   if (props.hasError) return ['var(--color-error)']
   //TODO Support connected/disconnected colors?
   if (!props.slotData) return [getSlotColor()]
+  if (props.slotData.type === '*') return ['']
   const typesSet = new Set(
     `${props.slotData.type}`.split(',').map(getSlotColor)
   )
   return [...typesSet].slice(0, 3)
-}
-const types = getTypes()
+})
 
 defineExpose({
   slotElRef
 })
 
+const isListShape = computed(() => props.slotData?.shape === RenderShape.GRID)
+
 const slotClass = computed(() =>
   cn(
-    'bg-slate-300 rounded-full slot-dot',
+    'slot-dot bg-slate-300',
+    isListShape.value ? 'rounded-[1px]' : 'rounded-full',
     'transition-all duration-150',
     'border border-solid border-node-component-slot-dot-outline',
     props.multi
-      ? 'w-3 h-6'
-      : 'size-3 cursor-crosshair group-hover/slot:[--node-component-slot-dot-outline-opacity-mult:5] group-hover/slot:scale-125'
+      ? 'h-6 w-3'
+      : 'size-3 cursor-crosshair group-hover/slot:scale-125 group-hover/slot:[--node-component-slot-dot-outline-opacity-mult:5]'
   )
 )
 </script>
@@ -46,32 +61,71 @@ const slotClass = computed(() =>
   <div
     :class="
       cn(
-        'after:absolute after:inset-y-0 after:w-5/2 relative size-6 flex items-center justify-center group/slot',
+        'group/slot relative flex size-6 items-center justify-center after:absolute after:inset-y-0 after:w-5/2',
         props.class
       )
     "
   >
     <div
-      v-if="types.length === 1"
+      v-if="types.length === 1 && (slotData?.shape == undefined || isListShape)"
       ref="slot-el"
-      :style="{ backgroundColor: types[0] }"
+      :style="{ backgroundColor: types.length === 1 ? types[0] : undefined }"
       :class="slotClass"
     />
-    <div
+    <svg
       v-else
       ref="slot-el"
-      :style="{
-        '--type1': types[0],
-        '--type2': types[1],
-        '--type3': types[2]
-      }"
       :class="slotClass"
+      viewBox="0 0 100 100"
+      xmlns="http://www.w3.org/2000/svg"
     >
-      <i-comfy:node-slot2
-        v-if="types.length === 2"
-        class="size-full -translate-y-1/2"
+      <defs>
+        <clipPath id="square">
+          <rect x="20" y="20" width="60" height="60" />
+        </clipPath>
+        <clipPath id="hollow">
+          <path
+            d="M-50 50
+           A100 100 0 0 1 150 50
+           A100 100 0 0 1 -50 50
+           M30 50
+           A20 20 0 0 0 70 50
+           A20 20 0 0 0 30 50"
+          />
+        </clipPath>
+      </defs>
+      <circle
+        v-if="types.length === 1"
+        :clip-path
+        cx="50"
+        cy="50"
+        r="50"
+        :fill="types[0]"
       />
-      <i-comfy:node-slot3 v-else class="size-full -translate-y-1/2" />
-    </div>
+      <g v-else-if="types.length === 2" :clip-path stroke-width="4">
+        <path d="M0 50 A 50 50 0 0 1 100 50" :fill="types[0]" />
+        <path d="M100 50 A 50 50 0 0 1 0 50" :fill="types[1]" />
+        <path d="M0 50L100 50" stroke="var(--inner-stroke, black)" />
+        <path
+          d="M50 2A48 48 0 0 1 50 98A48 48 0 0 1 50 2"
+          fill="transparent"
+          stroke="var(--outer-stroke, transparent)"
+        />
+      </g>
+      <g v-else :clip-path stroke-width="4">
+        <path d="M0 50A50 50 0 0 0 75 93L50 50" :fill="types[0]" />
+        <path d="M75 93A50 50 0 0 0 75 7L50 50" :fill="types[1]" />
+        <path d="M75 7A50 50 0 0 0 0 50L50 50" :fill="types[2]" />
+        <path
+          d="M50 50L0 50M50 50L75 93M50 50L75 7"
+          stroke="var(--inner-stroke, black)"
+        />
+        <path
+          d="M50 2A48 48 0 0 1 50 98A48 48 0 0 1 50 2"
+          fill="transparent"
+          stroke="var(--outer-stroke, transparent)"
+        />
+      </g>
+    </svg>
   </div>
 </template>
diff --git a/tests-ui/tests/renderer/extensions/vueNodes/composables/useNodeEventHandlers.test.ts b/src/renderer/extensions/vueNodes/composables/useNodeEventHandlers.test.ts
similarity index 98%
rename from tests-ui/tests/renderer/extensions/vueNodes/composables/useNodeEventHandlers.test.ts
rename to src/renderer/extensions/vueNodes/composables/useNodeEventHandlers.test.ts
index 5ddc6f2273..7973d1f5e2 100644
--- a/tests-ui/tests/renderer/extensions/vueNodes/composables/useNodeEventHandlers.test.ts
+++ b/src/renderer/extensions/vueNodes/composables/useNodeEventHandlers.test.ts
@@ -4,11 +4,7 @@ import { computed, shallowRef } from 'vue'
 import { useGraphNodeManager } from '@/composables/graph/useGraphNodeManager'
 import type { GraphNodeManager } from '@/composables/graph/useGraphNodeManager'
 import { useVueNodeLifecycle } from '@/composables/graph/useVueNodeLifecycle'
-import type {
-  LGraph,
-  LGraphCanvas,
-  LGraphNode
-} from '@/lib/litegraph/src/litegraph'
+import type { LGraphCanvas, LGraphNode } from '@/lib/litegraph/src/litegraph'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import { useLayoutMutations } from '@/renderer/core/layout/operations/layoutMutations'
 import { useNodeEventHandlers } from '@/renderer/extensions/vueNodes/composables/useNodeEventHandlers'
@@ -64,7 +60,7 @@ vi.mock('@/composables/graph/useGraphNodeManager', () => {
 })
 
 vi.mock('@/composables/graph/useVueNodeLifecycle', () => {
-  const nodeManager = useGraphNodeManager(undefined as unknown as LGraph)
+  const nodeManager = useGraphNodeManager(null!)
   return {
     useVueNodeLifecycle: vi.fn(() => ({
       nodeManager
diff --git a/src/renderer/extensions/vueNodes/composables/useNodeEventHandlers.ts b/src/renderer/extensions/vueNodes/composables/useNodeEventHandlers.ts
index abed566ec1..df80284cfb 100644
--- a/src/renderer/extensions/vueNodes/composables/useNodeEventHandlers.ts
+++ b/src/renderer/extensions/vueNodes/composables/useNodeEventHandlers.ts
@@ -93,6 +93,11 @@ function useNodeEventHandlersIndividual() {
 
     // Update the node title in LiteGraph for persistence
     node.title = newTitle
+
+    // If this is a subgraph node, sync the subgraph name for breadcrumb reactivity
+    if (node.isSubgraphNode?.()) {
+      node.subgraph.name = newTitle
+    }
   }
 
   /**
diff --git a/src/renderer/extensions/vueNodes/composables/useNodeTooltips.ts b/src/renderer/extensions/vueNodes/composables/useNodeTooltips.ts
index f81844f945..d57df547f2 100644
--- a/src/renderer/extensions/vueNodes/composables/useNodeTooltips.ts
+++ b/src/renderer/extensions/vueNodes/composables/useNodeTooltips.ts
@@ -12,6 +12,11 @@ import { useNodeDefStore } from '@/stores/nodeDefStore'
 import { normalizeI18nKey } from '@/utils/formatUtil'
 import { cn } from '@/utils/tailwindUtil'
 
+// PrimeVue adds this internal property to elements with tooltips
+interface PrimeVueTooltipElement extends Element {
+  $_ptooltipId?: string
+}
+
 /**
  * Hide all visible tooltips by dispatching mouseleave events
  *
@@ -41,7 +46,7 @@ const hideTooltipsGlobally = () => {
     // Find the target element that owns this tooltip
     const targetElements = document.querySelectorAll('[data-pd-tooltip="true"]')
     for (const targetEl of targetElements) {
-      if ((targetEl as any).$_ptooltipId === tooltipId) {
+      if ((targetEl as PrimeVueTooltipElement).$_ptooltipId === tooltipId) {
         ;(targetEl as HTMLElement).dispatchEvent(
           new MouseEvent('mouseleave', { bubbles: true })
         )
@@ -170,7 +175,7 @@ export function useNodeTooltips(nodeType: MaybeRef<string>) {
           class: cn(
             context.top && 'border-t-node-component-tooltip-border',
             context.bottom && 'border-b-node-component-tooltip-border',
-            context.left && 'border-l-node-component-tooltip-border ',
+            context.left && 'border-l-node-component-tooltip-border',
             context.right && 'border-r-node-component-tooltip-border'
           )
         })
diff --git a/tests-ui/tests/renderer/extensions/vueNodes/composables/useNodeZIndex.test.ts b/src/renderer/extensions/vueNodes/composables/useNodeZIndex.test.ts
similarity index 100%
rename from tests-ui/tests/renderer/extensions/vueNodes/composables/useNodeZIndex.test.ts
rename to src/renderer/extensions/vueNodes/composables/useNodeZIndex.test.ts
diff --git a/src/renderer/extensions/vueNodes/composables/usePartitionedBadges.ts b/src/renderer/extensions/vueNodes/composables/usePartitionedBadges.ts
new file mode 100644
index 0000000000..ee194dc266
--- /dev/null
+++ b/src/renderer/extensions/vueNodes/composables/usePartitionedBadges.ts
@@ -0,0 +1,138 @@
+import { trim } from 'es-toolkit'
+import { computed, toValue } from 'vue'
+
+import type { VueNodeData } from '@/composables/graph/useGraphNodeManager'
+import { useNodePricing } from '@/composables/node/useNodePricing'
+import { usePriceBadge } from '@/composables/node/usePriceBadge'
+import { useSettingStore } from '@/platform/settings/settingStore'
+import type { NodeBadgeProps } from '@/renderer/extensions/vueNodes/components/NodeBadge.vue'
+import { app } from '@/scripts/app'
+import { useWidgetValueStore } from '@/stores/widgetValueStore'
+import { useNodeDefStore } from '@/stores/nodeDefStore'
+import { NodeBadgeMode } from '@/types/nodeSource'
+
+function splitAroundFirstSpace(text: string): [string, string | undefined] {
+  const index = text.indexOf(' ')
+  if (index === -1) return [text, undefined]
+  return [text.slice(0, index), text.slice(index + 1)]
+}
+
+export function usePartitionedBadges(nodeData: VueNodeData) {
+  // Use per-node pricing revision to re-compute badges only when this node's pricing updates
+  const {
+    getRelevantWidgetNames,
+    hasDynamicPricing,
+    getInputGroupPrefixes,
+    getInputNames,
+    getNodeRevisionRef
+  } = useNodePricing()
+
+  const { isCreditsBadge } = usePriceBadge()
+  const settingStore = useSettingStore()
+
+  // Cache pricing metadata (won't change during node lifetime)
+  const isDynamicPricing = computed(() =>
+    nodeData?.apiNode ? hasDynamicPricing(nodeData.type) : false
+  )
+  const relevantPricingWidgets = computed(() =>
+    nodeData?.apiNode ? getRelevantWidgetNames(nodeData.type) : []
+  )
+  const inputGroupPrefixes = computed(() =>
+    nodeData?.apiNode ? getInputGroupPrefixes(nodeData.type) : []
+  )
+  const relevantInputNames = computed(() =>
+    nodeData?.apiNode ? getInputNames(nodeData.type) : []
+  )
+  const unpartitionedBadges = computed<NodeBadgeProps[]>(() => {
+    // For ALL API nodes: access per-node revision ref to detect when async pricing evaluation completes
+    // This is needed even for static pricing because JSONata 2.x evaluation is async
+    if (nodeData?.apiNode && nodeData?.id != null) {
+      // Access per-node revision ref to establish dependency (each node has its own ref)
+      void getNodeRevisionRef(nodeData.id).value
+
+      // For dynamic pricing, also track widget values and input connections
+      if (isDynamicPricing.value) {
+        // Access only the widget values that affect pricing (from widgetValueStore)
+        const relevantNames = relevantPricingWidgets.value
+        const widgetStore = useWidgetValueStore()
+        const graphId = app.canvas?.graph?.rootGraph.id
+        if (relevantNames.length > 0 && nodeData?.id != null) {
+          for (const name of relevantNames) {
+            // Access value from store to create reactive dependency
+            if (!graphId) continue
+            void widgetStore.getWidget(graphId, nodeData.id, name)?.value
+          }
+        }
+        // Access input connections for regular inputs
+        const inputNames = relevantInputNames.value
+        if (inputNames.length > 0) {
+          nodeData?.inputs?.forEach((inp) => {
+            if (inp.name && inputNames.includes(inp.name)) {
+              void inp.link // Access link to create reactive dependency
+            }
+          })
+        }
+        // Access input connections for input_groups (e.g., autogrow inputs)
+        const groupPrefixes = inputGroupPrefixes.value
+        if (groupPrefixes.length > 0) {
+          nodeData?.inputs?.forEach((inp) => {
+            if (
+              groupPrefixes.some((prefix) => inp.name?.startsWith(prefix + '.'))
+            ) {
+              void inp.link // Access link to create reactive dependency
+            }
+          })
+        }
+      }
+    }
+    return [...(nodeData?.badges ?? [])].map(toValue)
+  })
+  const nodeDef = useNodeDefStore().nodeDefsByName[nodeData.type]
+  return computed(() => {
+    const displaySource = settingStore.get(
+      'Comfy.NodeBadge.NodeSourceBadgeMode'
+    )
+    const isCoreNode =
+      nodeDef?.isCoreNode && displaySource === NodeBadgeMode.ShowAll
+    const core: NodeBadgeProps[] = []
+    const extension: NodeBadgeProps[] = []
+    const pricing: { required: string; rest?: string }[] = []
+    if (
+      settingStore.get('Comfy.NodeBadge.NodeLifeCycleBadgeMode') !==
+      NodeBadgeMode.None
+    ) {
+      const lifecycleText = nodeDef?.nodeLifeCycleBadgeText ?? ''
+      const trimmed = trim(lifecycleText, ['[', ']'])
+      if (trimmed) core.push({ text: trimmed })
+    }
+    if (
+      settingStore.get('Comfy.NodeBadge.NodeIdBadgeMode') !== NodeBadgeMode.None
+    )
+      core.push({ text: `#${nodeData.id}` })
+    const sourceText = nodeDef?.nodeSource?.badgeText
+    if (
+      !nodeDef?.isCoreNode &&
+      displaySource !== NodeBadgeMode.None &&
+      sourceText
+    )
+      core.push({ text: sourceText })
+
+    for (const badge of unpartitionedBadges.value.slice(1)) {
+      if (!badge.text) continue
+
+      if (isCreditsBadge(badge)) {
+        const [required, rest] = splitAroundFirstSpace(badge.text)
+        pricing.push({ required, rest })
+        continue
+      }
+      extension.push(badge)
+    }
+
+    return {
+      hasComfyBadge: isCoreNode && pricing.length === 0,
+      core,
+      extension,
+      pricing
+    }
+  })
+}
diff --git a/src/renderer/extensions/vueNodes/composables/useSlotElementTracking.test.ts b/src/renderer/extensions/vueNodes/composables/useSlotElementTracking.test.ts
new file mode 100644
index 0000000000..4872c8f35d
--- /dev/null
+++ b/src/renderer/extensions/vueNodes/composables/useSlotElementTracking.test.ts
@@ -0,0 +1,134 @@
+import { mount } from '@vue/test-utils'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { defineComponent, nextTick, ref } from 'vue'
+
+import { getSlotKey } from '@/renderer/core/layout/slots/slotIdentifier'
+import { layoutStore } from '@/renderer/core/layout/store/layoutStore'
+import { LayoutSource } from '@/renderer/core/layout/types'
+import type { SlotLayout } from '@/renderer/core/layout/types'
+import { useNodeSlotRegistryStore } from '@/renderer/extensions/vueNodes/stores/nodeSlotRegistryStore'
+
+import {
+  flushScheduledSlotLayoutSync,
+  useSlotElementTracking
+} from './useSlotElementTracking'
+
+const mockGraph = vi.hoisted(() => ({ _nodes: [] as unknown[] }))
+
+vi.mock('@/scripts/app', () => ({
+  app: { canvas: { graph: mockGraph, setDirty: vi.fn() } }
+}))
+
+vi.mock('@/composables/element/useCanvasPositionConversion', () => ({
+  useSharedCanvasPositionConversion: () => ({
+    clientPosToCanvasPos: ([x, y]: [number, number]) => [x, y]
+  })
+}))
+
+const NODE_ID = 'test-node'
+const SLOT_INDEX = 0
+
+function createWrapperComponent(type: 'input' | 'output') {
+  return defineComponent({
+    setup() {
+      const el = ref<HTMLElement | null>(null)
+      useSlotElementTracking({
+        nodeId: NODE_ID,
+        index: SLOT_INDEX,
+        type,
+        element: el
+      })
+      return { el }
+    },
+    // No template ref — el starts null so the immediate watcher doesn't fire
+    // before the stop handle is assigned
+    template: '<div />'
+  })
+}
+
+/**
+ * Mount the wrapper, set the element ref, and wait for slot registration.
+ */
+async function mountAndRegisterSlot(type: 'input' | 'output') {
+  const wrapper = mount(createWrapperComponent(type))
+  wrapper.vm.el = document.createElement('div')
+  await nextTick()
+  flushScheduledSlotLayoutSync()
+  return wrapper
+}
+
+describe('useSlotElementTracking', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    layoutStore.initializeFromLiteGraph([])
+    layoutStore.applyOperation({
+      type: 'createNode',
+      entity: 'node',
+      nodeId: NODE_ID,
+      layout: {
+        id: NODE_ID,
+        position: { x: 0, y: 0 },
+        size: { width: 200, height: 100 },
+        zIndex: 0,
+        visible: true,
+        bounds: { x: 0, y: 0, width: 200, height: 100 }
+      },
+      timestamp: Date.now(),
+      source: LayoutSource.External,
+      actor: 'test'
+    })
+    mockGraph._nodes = [{ id: 1 }]
+  })
+
+  it.each([
+    { type: 'input' as const, isInput: true },
+    { type: 'output' as const, isInput: false }
+  ])('cleans up $type slot layout on unmount', async ({ type, isInput }) => {
+    const wrapper = await mountAndRegisterSlot(type)
+
+    const slotKey = getSlotKey(NODE_ID, SLOT_INDEX, isInput)
+    const registryStore = useNodeSlotRegistryStore()
+    expect(registryStore.getNode(NODE_ID)?.slots.has(slotKey)).toBe(true)
+    expect(layoutStore.getSlotLayout(slotKey)).not.toBeNull()
+
+    wrapper.unmount()
+
+    expect(layoutStore.getSlotLayout(slotKey)).toBeNull()
+    expect(registryStore.getNode(NODE_ID)).toBeUndefined()
+  })
+
+  it('clears pendingSlotSync when slot layouts already exist', () => {
+    // Seed a slot layout (simulates slot layouts persisting through undo/redo)
+    const slotKey = getSlotKey(NODE_ID, SLOT_INDEX, true)
+    const slotLayout: SlotLayout = {
+      nodeId: NODE_ID,
+      index: 0,
+      type: 'input',
+      position: { x: 0, y: 0 },
+      bounds: { x: 0, y: 0, width: 10, height: 10 }
+    }
+    layoutStore.batchUpdateSlotLayouts([{ key: slotKey, layout: slotLayout }])
+
+    // Simulate what app.ts onConfigure does: set pending, then flush
+    layoutStore.setPendingSlotSync(true)
+    expect(layoutStore.pendingSlotSync).toBe(true)
+
+    // No slots were scheduled (undo/redo — onMounted didn't fire),
+    // but slot layouts already exist. Flush should clear the flag.
+    flushScheduledSlotLayoutSync()
+
+    expect(layoutStore.pendingSlotSync).toBe(false)
+  })
+
+  it('keeps pendingSlotSync when graph has nodes but no slot layouts', () => {
+    // No slot layouts exist (simulates initial mount before Vue registers slots)
+    layoutStore.setPendingSlotSync(true)
+
+    flushScheduledSlotLayoutSync()
+
+    // Should remain pending — waiting for Vue components to mount
+    expect(layoutStore.pendingSlotSync).toBe(true)
+  })
+})
diff --git a/src/renderer/extensions/vueNodes/composables/useSlotElementTracking.ts b/src/renderer/extensions/vueNodes/composables/useSlotElementTracking.ts
index c92fc8c921..aa840527c1 100644
--- a/src/renderer/extensions/vueNodes/composables/useSlotElementTracking.ts
+++ b/src/renderer/extensions/vueNodes/composables/useSlotElementTracking.ts
@@ -12,6 +12,7 @@ import { useSharedCanvasPositionConversion } from '@/composables/element/useCanv
 import { LiteGraph } from '@/lib/litegraph/src/litegraph'
 import { getSlotKey } from '@/renderer/core/layout/slots/slotIdentifier'
 import { layoutStore } from '@/renderer/core/layout/store/layoutStore'
+import { app } from '@/scripts/app'
 import type { SlotLayout } from '@/renderer/core/layout/types'
 import {
   isPointEqual,
@@ -31,13 +32,31 @@ function scheduleSlotLayoutSync(nodeId: string) {
   raf.schedule()
 }
 
-function flushScheduledSlotLayoutSync() {
-  if (pendingNodes.size === 0) return
+export function flushScheduledSlotLayoutSync() {
+  if (pendingNodes.size === 0) {
+    // No pending nodes - check if we should wait for Vue components to mount
+    const graph = app.canvas?.graph
+    const hasNodes = graph && graph._nodes && graph._nodes.length > 0
+    if (hasNodes && !layoutStore.hasSlotLayouts) {
+      // Graph has nodes but no slot layouts yet - Vue hasn't mounted.
+      // Keep flag set so late mounts can re-assert via scheduleSlotLayoutSync()
+      return
+    }
+    // Either no nodes (nothing to wait for) or slot layouts already exist
+    // (undo/redo preserved them). Clear the flag so links can render.
+    layoutStore.setPendingSlotSync(false)
+    app.canvas?.setDirty(true, true)
+    return
+  }
   const conv = useSharedCanvasPositionConversion()
   for (const nodeId of Array.from(pendingNodes)) {
     pendingNodes.delete(nodeId)
     syncNodeSlotLayoutsFromDOM(nodeId, conv)
   }
+  // Clear the pending sync flag - slots are now synced
+  layoutStore.setPendingSlotSync(false)
+  // Trigger canvas redraw now that links can render with correct positions
+  app.canvas?.setDirty(true, true)
 }
 
 export function syncNodeSlotLayoutsFromDOM(
@@ -183,6 +202,14 @@ export function useSlotElementTracking(options: {
         // Register slot
         const slotKey = getSlotKey(nodeId, index, type === 'input')
 
+        // Defensive cleanup: remove stale entry if it exists with different element
+        // This handles edge cases where Vue component reuse prevents proper unmount
+        const existingEntry = node.slots.get(slotKey)
+        if (existingEntry && existingEntry.el !== el) {
+          delete existingEntry.el.dataset.slotKey
+          layoutStore.deleteSlotLayout(slotKey)
+        }
+
         el.dataset.slotKey = slotKey
         node.slots.set(slotKey, { el, index, type })
 
diff --git a/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.ts b/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.ts
index 6e11902d80..6d4bdf187d 100644
--- a/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.ts
+++ b/src/renderer/extensions/vueNodes/composables/useSlotLinkInteraction.ts
@@ -671,7 +671,8 @@ export function useSlotLinkInteraction({
       })
     } else {
       activeAdapter.beginFromInput(localNodeId, index, {
-        moveExisting: shouldMoveExistingInput
+        moveExisting: shouldMoveExistingInput,
+        layout
       })
     }
 
diff --git a/src/renderer/extensions/vueNodes/composables/useVueNodeResizeTracking.ts b/src/renderer/extensions/vueNodes/composables/useVueNodeResizeTracking.ts
index 4d4e274d3c..07c60a4b1e 100644
--- a/src/renderer/extensions/vueNodes/composables/useVueNodeResizeTracking.ts
+++ b/src/renderer/extensions/vueNodes/composables/useVueNodeResizeTracking.ts
@@ -8,9 +8,11 @@
  * Supports different element types (nodes, slots, widgets, etc.) with
  * customizable data attributes and update handlers.
  */
-import { getCurrentInstance, onMounted, onUnmounted, toValue } from 'vue'
+import { getCurrentInstance, onMounted, onUnmounted, toValue, watch } from 'vue'
 import type { MaybeRefOrGetter } from 'vue'
 
+import { useDocumentVisibility } from '@vueuse/core'
+
 import { useSharedCanvasPositionConversion } from '@/composables/element/useCanvasPositionConversion'
 import { LiteGraph } from '@/lib/litegraph/src/litegraph'
 import { layoutStore } from '@/renderer/core/layout/store/layoutStore'
@@ -59,9 +61,37 @@ const trackingConfigs: Map<string, ElementTrackingConfig> = new Map([
   ]
 ])
 
+// Elements whose ResizeObserver fired while the tab was hidden
+const deferredElements = new Set<HTMLElement>()
+const visibility = useDocumentVisibility()
+
+watch(visibility, (state) => {
+  if (state !== 'visible' || deferredElements.size === 0) return
+
+  // Re-observe deferred elements to trigger fresh measurements
+  for (const element of deferredElements) {
+    if (element.isConnected) {
+      resizeObserver.observe(element)
+    }
+  }
+  deferredElements.clear()
+})
+
 // Single ResizeObserver instance for all Vue elements
 const resizeObserver = new ResizeObserver((entries) => {
   if (useCanvasStore().linearMode) return
+
+  // Skip measurements when tab is hidden — bounding rects are unreliable
+  if (visibility.value === 'hidden') {
+    for (const entry of entries) {
+      if (entry.target instanceof HTMLElement) {
+        deferredElements.add(entry.target)
+        resizeObserver.unobserve(entry.target)
+      }
+    }
+    return
+  }
+
   // Canvas is ready when this code runs; no defensive guards needed.
   const conv = useSharedCanvasPositionConversion()
   // Group updates by type, then flush via each config's handler
diff --git a/src/renderer/extensions/vueNodes/interactions/resize/resizeHandleConfig.ts b/src/renderer/extensions/vueNodes/interactions/resize/resizeHandleConfig.ts
new file mode 100644
index 0000000000..f1be2bd21f
--- /dev/null
+++ b/src/renderer/extensions/vueNodes/interactions/resize/resizeHandleConfig.ts
@@ -0,0 +1,45 @@
+import type { CompassCorners } from '@/lib/litegraph/src/interfaces'
+
+interface ResizeHandle {
+  readonly corner: CompassCorners
+  readonly positionClasses: string
+  readonly cursorClass: string
+  readonly i18nKey: string
+  readonly svgPositionClasses: string
+  readonly svgTransform: string
+}
+
+export const RESIZE_HANDLES: ResizeHandle[] = [
+  {
+    corner: 'SE',
+    positionClasses: '-right-1 -bottom-1',
+    cursorClass: 'cursor-se-resize',
+    i18nKey: 'g.resizeFromBottomRight',
+    svgPositionClasses: 'top-1 left-1',
+    svgTransform: ''
+  },
+  {
+    corner: 'NE',
+    positionClasses: '-right-1 -top-1',
+    cursorClass: 'cursor-ne-resize',
+    i18nKey: 'g.resizeFromTopRight',
+    svgPositionClasses: 'bottom-1 left-1',
+    svgTransform: 'scaleY(-1)'
+  },
+  {
+    corner: 'SW',
+    positionClasses: '-left-1 -bottom-1',
+    cursorClass: 'cursor-sw-resize',
+    i18nKey: 'g.resizeFromBottomLeft',
+    svgPositionClasses: 'top-1 right-1',
+    svgTransform: 'scaleX(-1)'
+  },
+  {
+    corner: 'NW',
+    positionClasses: '-left-1 -top-1',
+    cursorClass: 'cursor-nw-resize',
+    i18nKey: 'g.resizeFromTopLeft',
+    svgPositionClasses: 'bottom-1 right-1',
+    svgTransform: 'scale(-1, -1)'
+  }
+] as const
diff --git a/src/renderer/extensions/vueNodes/interactions/resize/useNodeResize.test.ts b/src/renderer/extensions/vueNodes/interactions/resize/useNodeResize.test.ts
new file mode 100644
index 0000000000..f33aaa3cc4
--- /dev/null
+++ b/src/renderer/extensions/vueNodes/interactions/resize/useNodeResize.test.ts
@@ -0,0 +1,273 @@
+import type { MockInstance } from 'vitest'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { CompassCorners } from '@/lib/litegraph/src/interfaces'
+
+import type { ResizeCallbackPayload } from './useNodeResize'
+
+type ResizeCallback = (
+  payload: ResizeCallbackPayload,
+  element: HTMLElement
+) => void
+
+// Capture pointermove/pointerup handlers registered via useEventListener
+const eventHandlers = vi.hoisted(() => ({
+  pointermove: null as ((e: PointerEvent) => void) | null,
+  pointerup: null as ((e: PointerEvent) => void) | null
+}))
+
+vi.mock('@vueuse/core', () => ({
+  useEventListener: vi.fn(
+    (eventName: string, handler: (...args: unknown[]) => void) => {
+      if (eventName === 'pointermove' || eventName === 'pointerup') {
+        eventHandlers[eventName] = handler as (e: PointerEvent) => void
+      }
+      return vi.fn()
+    }
+  )
+}))
+
+vi.mock('@/renderer/core/layout/transform/useTransformState', () => ({
+  useTransformState: () => ({
+    camera: { x: 0, y: 0, z: 1 }
+  })
+}))
+
+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)
+  })
+}))
+
+vi.mock('@/renderer/extensions/vueNodes/composables/useShiftKeySync', () => ({
+  useShiftKeySync: () => ({
+    trackShiftKey: vi.fn(() => vi.fn())
+  })
+}))
+
+vi.mock('@/renderer/core/layout/store/layoutStore', () => ({
+  layoutStore: {
+    isResizingVueNodes: { value: false },
+    getNodeLayoutRef: vi.fn(() => ({
+      value: {
+        position: { x: 100, y: 200 },
+        size: { width: 300, height: 400 }
+      }
+    }))
+  }
+}))
+
+function createMockNodeElement(
+  width = 300,
+  height = 400,
+  minContentHeight = 150
+): HTMLElement {
+  const element = document.createElement('div')
+  element.setAttribute('data-node-id', 'test-node')
+  element.style.setProperty('min-width', '225px')
+  element.getBoundingClientRect = () => {
+    // When --node-height is '0px', return the content-driven minimum height
+    const nodeHeight = element.style.getPropertyValue('--node-height')
+    const h = nodeHeight === '0px' ? minContentHeight : height
+    return {
+      width,
+      height: h,
+      x: 0,
+      y: 0,
+      top: 0,
+      left: 0,
+      right: width,
+      bottom: h,
+      toJSON: () => {}
+    } as DOMRect
+  }
+  return element
+}
+
+function createMockHandle(nodeElement: HTMLElement): HTMLElement {
+  const handle = document.createElement('div')
+  nodeElement.appendChild(handle)
+  handle.setPointerCapture = vi.fn()
+  handle.releasePointerCapture = vi.fn()
+  return handle
+}
+
+function createPointerEvent(
+  type: string,
+  overrides: Partial<PointerEvent> = {}
+): PointerEvent {
+  return {
+    type,
+    clientX: 0,
+    clientY: 0,
+    pointerId: 1,
+    shiftKey: false,
+    currentTarget: null,
+    preventDefault: vi.fn(),
+    stopPropagation: vi.fn(),
+    ...overrides
+  } as Partial<PointerEvent> as PointerEvent
+}
+
+function startResizeAt(
+  startResize: (event: PointerEvent, corner: CompassCorners) => void,
+  handle: HTMLElement,
+  corner: CompassCorners,
+  clientX = 500,
+  clientY = 500
+) {
+  const downEvent = createPointerEvent('pointerdown', {
+    currentTarget: handle,
+    clientX,
+    clientY
+  } as Partial<PointerEvent>)
+  startResize(downEvent, corner)
+}
+
+function simulateMove(
+  deltaX: number,
+  deltaY: number,
+  startX = 500,
+  startY = 500
+) {
+  const moveEvent = createPointerEvent('pointermove', {
+    clientX: startX + deltaX,
+    clientY: startY + deltaY
+  })
+  eventHandlers.pointermove?.(moveEvent)
+}
+
+describe('useNodeResize', () => {
+  let callback: ResizeCallback & MockInstance<ResizeCallback>
+  let nodeElement: HTMLElement
+  let handle: HTMLElement
+
+  beforeEach(async () => {
+    vi.clearAllMocks()
+    eventHandlers.pointermove = null
+    eventHandlers.pointerup = null
+
+    callback = vi.fn<ResizeCallback>()
+    nodeElement = createMockNodeElement()
+    handle = createMockHandle(nodeElement)
+
+    // Need fresh import after mocks are set up
+    const { useNodeResize } = await import('./useNodeResize')
+    const { startResize } = useNodeResize(callback)
+
+    // Store startResize for access in tests
+    ;(globalThis as Record<string, unknown>).__testStartResize = startResize
+  })
+
+  function getStartResize() {
+    return (globalThis as Record<string, unknown>).__testStartResize as (
+      event: PointerEvent,
+      corner: CompassCorners
+    ) => void
+  }
+
+  describe('SE corner (default)', () => {
+    it('increases size when dragging right and down', () => {
+      startResizeAt(getStartResize(), handle, 'SE')
+      simulateMove(50, 30)
+
+      expect(callback).toHaveBeenCalledWith(
+        expect.objectContaining({
+          size: { width: 350, height: 430 }
+        }),
+        nodeElement
+      )
+    })
+
+    it('does not include position in payload', () => {
+      startResizeAt(getStartResize(), handle, 'SE')
+      simulateMove(50, 30)
+
+      const payload: ResizeCallbackPayload = callback.mock.calls[0][0]
+      expect(payload.position).toBeUndefined()
+    })
+
+    it('clamps width to minimum', () => {
+      startResizeAt(getStartResize(), handle, 'SE')
+      simulateMove(-200, 0)
+
+      const payload: ResizeCallbackPayload = callback.mock.calls[0][0]
+      expect(payload.size.width).toBe(225)
+    })
+  })
+
+  describe('NE corner', () => {
+    it('increases width right, decreases height upward, shifts y position', () => {
+      startResizeAt(getStartResize(), handle, 'NE')
+      simulateMove(50, -30)
+
+      const payload: ResizeCallbackPayload = callback.mock.calls[0][0]
+      expect(payload.size).toEqual({ width: 350, height: 430 })
+      expect(payload.position).toEqual({ x: 100, y: 170 })
+    })
+
+    it('clamps height to content minimum and fixes bottom edge', () => {
+      startResizeAt(getStartResize(), handle, 'NE')
+      simulateMove(0, 500)
+
+      const payload: ResizeCallbackPayload = callback.mock.calls[0][0]
+      // minContentHeight = 150, so height clamps to 150
+      expect(payload.size.height).toBe(150)
+      // y = startY + startHeight - minContentHeight = 200 + 400 - 150 = 450
+      expect(payload.position!.y).toBe(450)
+    })
+  })
+
+  describe('SW corner', () => {
+    it('decreases width leftward, increases height downward, shifts x position', () => {
+      startResizeAt(getStartResize(), handle, 'SW')
+      simulateMove(-50, 30)
+
+      const payload: ResizeCallbackPayload = callback.mock.calls[0][0]
+      expect(payload.size).toEqual({ width: 350, height: 430 })
+      expect(payload.position).toEqual({ x: 50, y: 200 })
+    })
+
+    it('clamps width to minimum and fixes right edge', () => {
+      startResizeAt(getStartResize(), handle, 'SW')
+      simulateMove(200, 0)
+
+      const payload: ResizeCallbackPayload = callback.mock.calls[0][0]
+      expect(payload.size.width).toBe(225)
+      expect(payload.position!.x).toBe(175)
+    })
+  })
+
+  describe('NW corner', () => {
+    it('decreases width leftward, decreases height upward, shifts both x and y', () => {
+      startResizeAt(getStartResize(), handle, 'NW')
+      simulateMove(-50, -30)
+
+      const payload: ResizeCallbackPayload = callback.mock.calls[0][0]
+      expect(payload.size).toEqual({ width: 350, height: 430 })
+      expect(payload.position).toEqual({ x: 50, y: 170 })
+    })
+
+    it('clamps width to minimum and fixes right edge', () => {
+      startResizeAt(getStartResize(), handle, 'NW')
+      simulateMove(200, 0)
+
+      const payload: ResizeCallbackPayload = callback.mock.calls[0][0]
+      expect(payload.size.width).toBe(225)
+      expect(payload.position!.x).toBe(175)
+    })
+
+    it('clamps height to content minimum and fixes bottom edge', () => {
+      startResizeAt(getStartResize(), handle, 'NW')
+      simulateMove(0, 500)
+
+      const payload: ResizeCallbackPayload = callback.mock.calls[0][0]
+      // minContentHeight = 150, so height clamps to 150
+      expect(payload.size.height).toBe(150)
+      // y = startY + startHeight - minContentHeight = 200 + 400 - 150 = 450
+      expect(payload.position!.y).toBe(450)
+    })
+  })
+})
diff --git a/src/renderer/extensions/vueNodes/interactions/resize/useNodeResize.ts b/src/renderer/extensions/vueNodes/interactions/resize/useNodeResize.ts
index 75749e8121..89a5ccfeff 100644
--- a/src/renderer/extensions/vueNodes/interactions/resize/useNodeResize.ts
+++ b/src/renderer/extensions/vueNodes/interactions/resize/useNodeResize.ts
@@ -1,21 +1,24 @@
 import { useEventListener } from '@vueuse/core'
 import { ref } from 'vue'
 
+import type { CompassCorners } from '@/lib/litegraph/src/interfaces'
 import type { Point, Size } from '@/renderer/core/layout/types'
 import { layoutStore } from '@/renderer/core/layout/store/layoutStore'
 import { useNodeSnap } from '@/renderer/extensions/vueNodes/composables/useNodeSnap'
 import { useShiftKeySync } from '@/renderer/extensions/vueNodes/composables/useShiftKeySync'
 import { useTransformState } from '@/renderer/core/layout/transform/useTransformState'
 
-interface ResizeCallbackPayload {
+export interface ResizeCallbackPayload {
   size: Size
+  position?: Point
 }
 
 /**
- * Composable for node resizing functionality (bottom-right corner only)
+ * Composable for node resizing functionality from any corner.
  *
  * Provides resize handle interaction that integrates with the layout system.
- * Handles pointer capture, coordinate calculations, and size constraints.
+ * Handles pointer capture, coordinate calculations, size constraints,
+ * and position adjustments for non-SE corners.
  */
 export function useNodeResize(
   resizeCallback: (payload: ResizeCallbackPayload, element: HTMLElement) => void
@@ -25,14 +28,16 @@ export function useNodeResize(
   const isResizing = ref(false)
   const resizeStartPointer = ref<Point | null>(null)
   const resizeStartSize = ref<Size | null>(null)
+  const resizeStartPosition = ref<Point | null>(null)
+  const resizeCorner = ref<CompassCorners>('SE')
 
   // Snap-to-grid functionality
-  const { shouldSnap, applySnapToSize } = useNodeSnap()
+  const { shouldSnap, applySnapToPosition, applySnapToSize } = useNodeSnap()
 
   // Shift key sync for LiteGraph canvas preview
   const { trackShiftKey } = useShiftKeySync()
 
-  const startResize = (event: PointerEvent) => {
+  const startResize = (event: PointerEvent, corner: CompassCorners = 'SE') => {
     event.preventDefault()
     event.stopPropagation()
 
@@ -42,6 +47,9 @@ export function useNodeResize(
     const nodeElement = target.closest('[data-node-id]')
     if (!(nodeElement instanceof HTMLElement)) return
 
+    const nodeId = nodeElement.dataset.nodeId
+    if (!nodeId) return
+
     const rect = nodeElement.getBoundingClientRect()
     const scale = transformState.camera.z
 
@@ -50,6 +58,16 @@ 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 nodeLayout = layoutStore.getNodeLayoutRef(nodeId).value
+    const startPosition: Point = nodeLayout
+      ? { ...nodeLayout.position }
+      : { x: 0, y: 0 }
+
     // Track shift key state and sync to canvas for snap preview
     const stopShiftSync = trackShiftKey(event)
 
@@ -61,12 +79,15 @@ export function useNodeResize(
     isResizing.value = true
     resizeStartPointer.value = { x: event.clientX, y: event.clientY }
     resizeStartSize.value = startSize
+    resizeStartPosition.value = startPosition
+    resizeCorner.value = corner
 
     const handlePointerMove = (moveEvent: PointerEvent) => {
       if (
         !isResizing.value ||
         !resizeStartPointer.value ||
-        !resizeStartSize.value
+        !resizeStartSize.value ||
+        !resizeStartPosition.value
       ) {
         return
       }
@@ -77,40 +98,127 @@ export function useNodeResize(
       const deltaY =
         (moveEvent.clientY - resizeStartPointer.value.y) / (scale || 1)
 
-      let newSize: Size = {
-        width: resizeStartSize.value.width + deltaX,
-        height: resizeStartSize.value.height + deltaY
+      const activeCorner = resizeCorner.value
+      let newWidth: number
+      let newHeight: number
+      let newX = resizeStartPosition.value.x
+      let newY = resizeStartPosition.value.y
+
+      switch (activeCorner) {
+        case 'NE':
+          newY = resizeStartPosition.value.y + deltaY
+          newWidth = resizeStartSize.value.width + deltaX
+          newHeight = resizeStartSize.value.height - deltaY
+          break
+        case 'SW':
+          newX = resizeStartPosition.value.x + deltaX
+          newWidth = resizeStartSize.value.width - deltaX
+          newHeight = resizeStartSize.value.height + deltaY
+          break
+        case 'NW':
+          newX = resizeStartPosition.value.x + deltaX
+          newY = resizeStartPosition.value.y + deltaY
+          newWidth = resizeStartSize.value.width - deltaX
+          newHeight = resizeStartSize.value.height - deltaY
+          break
+        default: // SE
+          newWidth = resizeStartSize.value.width + deltaX
+          newHeight = resizeStartSize.value.height + deltaY
+          break
       }
 
-      // Apply snap if shift is held
+      // Apply snap-to-grid
       if (shouldSnap(moveEvent)) {
-        newSize = applySnapToSize(newSize)
+        // Snap position first for N/W corners, then compensate size
+        if (activeCorner.includes('N') || activeCorner.includes('W')) {
+          const originalX = newX
+          const originalY = newY
+          const snapped = applySnapToPosition({ x: newX, y: newY })
+          newX = snapped.x
+          newY = snapped.y
+
+          if (activeCorner.includes('N')) {
+            newHeight += originalY - newY
+          }
+          if (activeCorner.includes('W')) {
+            newWidth += originalX - newX
+          }
+        }
+
+        const snappedSize = applySnapToSize({
+          width: newWidth,
+          height: newHeight
+        })
+        newWidth = snappedSize.width
+        newHeight = snappedSize.height
       }
 
-      const nodeElement = target.closest('[data-node-id]')
-      if (nodeElement instanceof HTMLElement) {
-        resizeCallback({ size: newSize }, nodeElement)
+      // Enforce minimum size with position compensation (matching litegraph)
+      const minWidth =
+        parseFloat(nodeElement.style.getPropertyValue('min-width') || '0') ||
+        225
+      if (newWidth < minWidth) {
+        if (activeCorner.includes('W')) {
+          newX =
+            resizeStartPosition.value.x + resizeStartSize.value.width - minWidth
+        }
+        newWidth = minWidth
       }
+      if (newHeight < minContentHeight) {
+        if (activeCorner.includes('N')) {
+          newY =
+            resizeStartPosition.value.y +
+            resizeStartSize.value.height -
+            minContentHeight
+        }
+        newHeight = minContentHeight
+      }
+
+      const payload: ResizeCallbackPayload = {
+        size: { width: newWidth, height: newHeight }
+      }
+
+      // Only include position for non-SE corners
+      if (activeCorner !== 'SE') {
+        payload.position = { x: newX, y: newY }
+      }
+
+      const targetNodeElement = target.closest('[data-node-id]')
+      if (targetNodeElement instanceof HTMLElement) {
+        resizeCallback(payload, targetNodeElement)
+      }
+    }
+
+    const cleanup = () => {
+      if (!isResizing.value) return
+      isResizing.value = false
+      layoutStore.isResizingVueNodes.value = false
+      resizeStartPointer.value = null
+      resizeStartSize.value = null
+      resizeStartPosition.value = null
+
+      // Stop tracking shift key state
+      stopShiftSync()
+
+      stopMoveListen()
+      stopUpListen()
+      stopCancelListen()
     }
 
     const handlePointerUp = (upEvent: PointerEvent) => {
       if (isResizing.value) {
-        isResizing.value = false
-        layoutStore.isResizingVueNodes.value = false
-        resizeStartPointer.value = null
-        resizeStartSize.value = null
-
-        // Stop tracking shift key state
-        stopShiftSync()
-
-        target.releasePointerCapture(upEvent.pointerId)
-        stopMoveListen()
-        stopUpListen()
+        try {
+          target.releasePointerCapture(upEvent.pointerId)
+        } catch {
+          // Pointer capture may already be released
+        }
+        cleanup()
       }
     }
 
     const stopMoveListen = useEventListener('pointermove', handlePointerMove)
     const stopUpListen = useEventListener('pointerup', handlePointerUp)
+    const stopCancelListen = useEventListener('pointercancel', cleanup)
   }
 
   return {
diff --git a/src/renderer/extensions/vueNodes/layout/ensureCorrectLayoutScale.ts b/src/renderer/extensions/vueNodes/layout/ensureCorrectLayoutScale.ts
index 42ebdfcca2..3ab1256b04 100644
--- a/src/renderer/extensions/vueNodes/layout/ensureCorrectLayoutScale.ts
+++ b/src/renderer/extensions/vueNodes/layout/ensureCorrectLayoutScale.ts
@@ -4,11 +4,11 @@ import { createBounds } from '@/lib/litegraph/src/measure'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { layoutStore } from '@/renderer/core/layout/store/layoutStore'
 import { useLayoutMutations } from '@/renderer/core/layout/operations/layoutMutations'
+import { LayoutSource } from '@/renderer/core/layout/types'
 import type { NodeBoundsUpdate } from '@/renderer/core/layout/types'
 import { app as comfyApp } from '@/scripts/app'
 import type { SubgraphInputNode } from '@/lib/litegraph/src/subgraph/SubgraphInputNode'
 import type { SubgraphOutputNode } from '@/lib/litegraph/src/subgraph/SubgraphOutputNode'
-import { LiteGraph } from '@/lib/litegraph/src/litegraph'
 
 const SCALE_FACTOR = 1.2
 
@@ -67,9 +67,7 @@ export function ensureCorrectLayoutScale(
 
     const scaledWidth = lgNode.width * scaleFactor
 
-    const scaledHeight = needsUpscale
-      ? lgNode.size[1] * scaleFactor + LiteGraph.NODE_TITLE_HEIGHT
-      : (lgNode.size[1] - LiteGraph.NODE_TITLE_HEIGHT) * scaleFactor
+    const scaledHeight = lgNode.size[1] * scaleFactor
 
     // Directly update LiteGraph node to ensure immediate consistency
     // Dont need to reference vue directly because the pos and dims are already in yjs
@@ -93,6 +91,7 @@ export function ensureCorrectLayoutScale(
   }
 
   if (onActiveGraph && yjsMoveNodeUpdates.length > 0) {
+    layoutStore.setSource(LayoutSource.Canvas)
     layoutStore.batchUpdateNodeBounds(yjsMoveNodeUpdates)
   }
 
diff --git a/src/renderer/extensions/vueNodes/preview/useNodePreviewState.ts b/src/renderer/extensions/vueNodes/preview/useNodePreviewState.ts
index d97a99c150..88dba2aaac 100644
--- a/src/renderer/extensions/vueNodes/preview/useNodePreviewState.ts
+++ b/src/renderer/extensions/vueNodes/preview/useNodePreviewState.ts
@@ -3,7 +3,7 @@ import { computed, toValue } from 'vue'
 import type { MaybeRefOrGetter, Ref } from 'vue'
 
 import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
-import { useNodeOutputStore } from '@/stores/imagePreviewStore'
+import { useNodeOutputStore } from '@/stores/nodeOutputStore'
 
 export const useNodePreviewState = (
   nodeIdMaybe: MaybeRefOrGetter<string>,
@@ -28,7 +28,7 @@ export const useNodePreviewState = (
 
   const latestPreviewUrl = computed(() => {
     const urls = previewUrls.value
-    return urls?.length ? urls.at(-1) : ''
+    return urls?.length ? urls.at(-1)! : ''
   })
 
   const shouldShowPreviewImg = computed(() => {
diff --git a/src/renderer/extensions/vueNodes/utils/nodeStyleUtils.ts b/src/renderer/extensions/vueNodes/utils/nodeStyleUtils.ts
index 143684d137..57a0b97177 100644
--- a/src/renderer/extensions/vueNodes/utils/nodeStyleUtils.ts
+++ b/src/renderer/extensions/vueNodes/utils/nodeStyleUtils.ts
@@ -1,14 +1,13 @@
+import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
 import { adjustColor } from '@/utils/colorUtil'
 
 /**
  * Applies light theme color adjustments to a color
  */
-export function applyLightThemeColor(
-  color: string,
-  isLightTheme: boolean
-): string {
-  if (!color || !isLightTheme) {
-    return color
-  }
+export function applyLightThemeColor(color?: string): string {
+  if (!color) return ''
+
+  if (!useColorPaletteStore().completedActivePalette.light_theme) return color
+
   return adjustColor(color, { lightness: 0.5 })
 }
diff --git a/src/renderer/extensions/vueNodes/widgets/components/BatchNavigation.vue b/src/renderer/extensions/vueNodes/widgets/components/BatchNavigation.vue
new file mode 100644
index 0000000000..d12fcd7337
--- /dev/null
+++ b/src/renderer/extensions/vueNodes/widgets/components/BatchNavigation.vue
@@ -0,0 +1,38 @@
+<template>
+  <div v-if="count > 1" class="flex items-center gap-1">
+    <span class="mr-1 text-muted-foreground">
+      <slot name="label" />
+    </span>
+    <Button
+      variant="muted-textonly"
+      size="icon-sm"
+      :disabled="index === 0"
+      data-testid="batch-prev"
+      @click="index--"
+    >
+      <i class="icon-[lucide--chevron-left]" />
+    </Button>
+    <span data-testid="batch-counter">
+      {{ $t('batch.index', { current: index + 1, total: count }) }}
+    </span>
+    <Button
+      variant="muted-textonly"
+      size="icon-sm"
+      :disabled="index === count - 1"
+      data-testid="batch-next"
+      @click="index++"
+    >
+      <i class="icon-[lucide--chevron-right]" />
+    </Button>
+  </div>
+</template>
+
+<script setup lang="ts">
+import Button from '@/components/ui/button/Button.vue'
+
+const index = defineModel<number>({ required: true })
+
+defineProps<{
+  count: number
+}>()
+</script>
diff --git a/src/renderer/extensions/vueNodes/widgets/components/ValueControlPopover.vue b/src/renderer/extensions/vueNodes/widgets/components/ValueControlPopover.vue
index 095d64aba0..a4d8bbaabb 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/ValueControlPopover.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/ValueControlPopover.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import Popover from 'primevue/popover'
 import RadioButton from 'primevue/radiobutton'
-import { computed, ref } from 'vue'
+import Button from '@/components/ui/button/Button.vue'
+import { computed } from 'vue'
 
 import { useSettingStore } from '@/platform/settings/settingStore'
 import type { ControlOptions } from '@/types/simplifiedWidget'
@@ -14,14 +14,8 @@ type ControlOption = {
   title: string
 }
 
-const popover = ref()
 const settingStore = useSettingStore()
 
-const toggle = (event: Event) => {
-  popover.value.toggle(event)
-}
-defineExpose({ toggle })
-
 const controlOptions: ControlOption[] = [
   {
     mode: 'fixed',
@@ -57,70 +51,65 @@ const controlMode = defineModel<ControlOptions>()
 </script>
 
 <template>
-  <Popover
-    ref="popover"
-    class="bg-interface-panel-surface border border-interface-stroke rounded-lg"
-  >
-    <div class="w-113 max-w-md p-4 space-y-4">
-      <div class="text-sm text-muted-foreground leading-tight">
-        {{ $t('widgets.valueControl.header.prefix') }}
-        <span class="text-base-foreground font-medium">
-          {{
-            widgetControlMode === 'before'
-              ? $t('widgets.valueControl.header.before')
-              : $t('widgets.valueControl.header.after')
-          }}
-        </span>
-        {{ $t('widgets.valueControl.header.postfix') }}
-      </div>
+  <div class="w-113 max-w-md space-y-4 p-4">
+    <div class="text-sm/tight text-muted-foreground">
+      {{ $t('widgets.valueControl.header.prefix') }}
+      <span class="font-medium text-base-foreground">
+        {{
+          widgetControlMode === 'before'
+            ? $t('widgets.valueControl.header.before')
+            : $t('widgets.valueControl.header.after')
+        }}
+      </span>
+      {{ $t('widgets.valueControl.header.postfix') }}
+    </div>
 
-      <div class="space-y-2">
-        <div
-          v-for="option in controlOptions"
-          :key="option.mode"
-          class="flex items-center justify-between py-2 gap-7"
-        >
-          <div class="flex items-center gap-2 flex-1 min-w-0">
-            <div
-              class="flex items-center justify-center w-8 h-8 rounded-lg flex-shrink-0 bg-secondary-background border border-border-subtle"
+    <div class="space-y-2">
+      <Button
+        v-for="option in controlOptions"
+        :key="option.mode"
+        as="label"
+        variant="textonly"
+        size="lg"
+        class="flex h-[unset] w-full items-center justify-between gap-7 py-2 text-left"
+        :for="option.mode"
+      >
+        <div class="flex min-w-0 flex-1 items-center gap-2 text-wrap">
+          <div
+            class="flex size-8 shrink-0 items-center justify-center rounded-lg border border-border-subtle bg-secondary-background"
+          >
+            <i
+              v-if="option.icon"
+              :class="option.icon"
+              class="text-base text-base-foreground"
+            />
+            <span
+              v-if="option.text"
+              class="text-xs font-normal text-base-foreground"
             >
-              <i
-                v-if="option.icon"
-                :class="option.icon"
-                class="text-base text-base-foreground"
-              />
-              <span
-                v-if="option.text"
-                class="text-xs font-normal text-base-foreground"
-              >
-                {{ option.text }}
-              </span>
-            </div>
-
-            <div class="flex flex-col gap-0.5 min-w-0 flex-1">
-              <div
-                class="text-sm font-normal text-base-foreground leading-tight"
-              >
-                <span>
-                  {{ $t(`widgets.valueControl.${option.title}`) }}
-                </span>
-              </div>
-              <div
-                class="text-sm font-normal text-muted-foreground leading-tight"
-              >
-                {{ $t(`widgets.valueControl.${option.description}`) }}
-              </div>
-            </div>
+              {{ option.text }}
+            </span>
           </div>
 
-          <RadioButton
-            v-model="controlMode"
-            class="flex-shrink-0"
-            :input-id="option.mode"
-            :value="option.mode"
-          />
+          <div class="flex min-w-0 flex-1 flex-col gap-0.5">
+            <div class="text-sm/tight font-normal text-base-foreground">
+              <span>
+                {{ $t(`widgets.valueControl.${option.title}`) }}
+              </span>
+            </div>
+            <div class="text-sm/tight font-normal text-muted-foreground">
+              {{ $t(`widgets.valueControl.${option.description}`) }}
+            </div>
+          </div>
         </div>
-      </div>
+
+        <RadioButton
+          v-model="controlMode"
+          class="shrink"
+          :input-id="option.mode"
+          :value="option.mode"
+        />
+      </Button>
     </div>
-  </Popover>
+  </div>
 </template>
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetAudioUI.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetAudioUI.vue
deleted file mode 100644
index 7b46670d21..0000000000
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetAudioUI.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-<template>
-  <div
-    class="w-full col-span-2 widget-expands grid grid-cols-[minmax(80px,max-content)_minmax(125px,auto)] gap-y-3 p-3"
-  >
-    <WidgetSelect v-model="modelValue" :widget class="col-span-2" />
-    <AudioPreviewPlayer
-      class="col-span-2"
-      :audio-url="audioUrlFromWidget"
-      :readonly="readonly"
-      :hide-when-empty="isOutputNodeRef"
-      :show-options-button="true"
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed } from 'vue'
-
-import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
-import { app } from '@/scripts/app'
-import type { SimplifiedWidget } from '@/types/simplifiedWidget'
-import { isOutputNode } from '@/utils/nodeFilterUtil'
-
-import { getAudioUrlFromPath } from '../utils/audioUtils'
-import WidgetSelect from './WidgetSelect.vue'
-import AudioPreviewPlayer from './audio/AudioPreviewPlayer.vue'
-
-const props = defineProps<{
-  widget: SimplifiedWidget<string | undefined>
-  readonly?: boolean
-  nodeId: string
-}>()
-
-const modelValue = defineModel<string>('modelValue')
-
-defineEmits<{
-  'update:modelValue': [value: string]
-}>()
-
-// Get litegraph node
-const litegraphNode = computed(() => {
-  if (!props.nodeId || !app.canvas.graph) return null
-  return app.canvas.graph.getNodeById(props.nodeId) as LGraphNode | null
-})
-
-// Check if this is an output node (PreviewAudio, SaveAudio, etc)
-const isOutputNodeRef = computed(() => {
-  const node = litegraphNode.value
-  if (!node) return false
-  return isOutputNode(node)
-})
-
-const audioFilePath = computed(() => props.widget.value as string)
-
-// Computed audio URL from widget value (for input files)
-const audioUrlFromWidget = computed(() => {
-  const path = audioFilePath.value
-  if (!path) return ''
-  return getAudioUrlFromPath(path, 'input')
-})
-</script>
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetButton.test.ts b/src/renderer/extensions/vueNodes/widgets/components/WidgetButton.test.ts
index 79b3596cc4..4ff51ce96f 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetButton.test.ts
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetButton.test.ts
@@ -2,21 +2,27 @@ import { mount } from '@vue/test-utils'
 import { describe, expect, it, vi } from 'vitest'
 
 import Button from '@/components/ui/button/Button.vue'
+import type { IWidgetOptions } from '@/lib/litegraph/src/types/widgets'
 import WidgetButton from '@/renderer/extensions/vueNodes/widgets/components/WidgetButton.vue'
 import type { SimplifiedWidget } from '@/types/simplifiedWidget'
 
+import { createMockWidget } from './widgetTestUtils'
+
+type ButtonWidgetOptions = IWidgetOptions & {
+  variant?: string
+  label?: string
+}
+
+const BUTTON_DEFAULTS = {
+  value: undefined,
+  type: 'button',
+  name: 'test_button'
+} as const
+
 describe('WidgetButton Interactions', () => {
-  const createMockWidget = (
-    options: Record<string, unknown> = {},
-    callback?: () => void,
-    name: string = 'test_button'
-  ): SimplifiedWidget<void> => ({
-    name,
-    type: 'button',
-    value: undefined,
-    options,
-    callback
-  })
+  const createButtonWidget = (
+    overrides: Partial<SimplifiedWidget<void, ButtonWidgetOptions>> = {}
+  ) => createMockWidget<void>({ ...BUTTON_DEFAULTS, ...overrides })
 
   const mountComponent = (widget: SimplifiedWidget<void>, readonly = false) => {
     return mount(WidgetButton, {
@@ -39,7 +45,7 @@ describe('WidgetButton Interactions', () => {
   describe('Click Handling', () => {
     it('calls callback when button is clicked', async () => {
       const mockCallback = vi.fn()
-      const widget = createMockWidget({}, mockCallback)
+      const widget = createButtonWidget({ callback: mockCallback })
       const wrapper = mountComponent(widget)
 
       await clickButton(wrapper)
@@ -48,7 +54,7 @@ describe('WidgetButton Interactions', () => {
     })
 
     it('handles missing callback gracefully', async () => {
-      const widget = createMockWidget({}, undefined)
+      const widget = createButtonWidget()
       const wrapper = mountComponent(widget)
 
       // Should not throw error when clicking without callback
@@ -57,7 +63,7 @@ describe('WidgetButton Interactions', () => {
 
     it('calls callback multiple times when clicked multiple times', async () => {
       const mockCallback = vi.fn()
-      const widget = createMockWidget({}, mockCallback)
+      const widget = createButtonWidget({ callback: mockCallback })
       const wrapper = mountComponent(widget)
 
       const numClicks = 8
@@ -72,7 +78,7 @@ describe('WidgetButton Interactions', () => {
 
   describe('Component Rendering', () => {
     it('renders button component', () => {
-      const widget = createMockWidget()
+      const widget = createButtonWidget()
       const wrapper = mountComponent(widget)
 
       const button = wrapper.findComponent({ name: 'Button' })
@@ -80,14 +86,14 @@ describe('WidgetButton Interactions', () => {
     })
 
     it('renders widget text when name is provided', () => {
-      const widget = createMockWidget()
+      const widget = createButtonWidget()
       const wrapper = mountComponent(widget)
 
       expect(wrapper.text()).toBe('test_button')
     })
 
     it('sets button size to sm', () => {
-      const widget = createMockWidget()
+      const widget = createButtonWidget()
       const wrapper = mountComponent(widget)
 
       const button = wrapper.findComponent({ name: 'Button' })
@@ -95,10 +101,9 @@ describe('WidgetButton Interactions', () => {
     })
 
     it('passes widget options to button component', () => {
-      const buttonOptions = {
-        variant: 'secondary'
-      }
-      const widget = createMockWidget(buttonOptions)
+      const widget = createButtonWidget({
+        options: { variant: 'secondary' }
+      })
       const wrapper = mountComponent(widget)
 
       const button = wrapper.findComponent({ name: 'Button' })
@@ -108,15 +113,20 @@ describe('WidgetButton Interactions', () => {
 
   describe('Widget Options', () => {
     it('handles button with label', () => {
-      const widget = createMockWidget({ label: 'Click Me' }, undefined, 'btn')
-      widget.label = 'Click Me'
+      const widget = createButtonWidget({
+        name: 'btn',
+        label: 'Click Me',
+        options: { label: 'Click Me' }
+      })
       const wrapper = mountComponent(widget)
 
       expect(wrapper.text()).toBe('Click Me')
     })
 
     it('handles button with iconClass', () => {
-      const widget = createMockWidget({ iconClass: 'pi pi-star' })
+      const widget = createButtonWidget({
+        options: { iconClass: 'pi pi-star' }
+      })
       const wrapper = mountComponent(widget)
 
       const icon = wrapper.find('i.pi.pi-star')
@@ -124,8 +134,10 @@ describe('WidgetButton Interactions', () => {
     })
 
     it('handles button with both label and iconClass', () => {
-      const widget = createMockWidget({ iconClass: 'pi pi-save' })
-      widget.label = 'Save'
+      const widget = createButtonWidget({
+        label: 'Save',
+        options: { iconClass: 'pi pi-save' }
+      })
       const wrapper = mountComponent(widget)
 
       expect(wrapper.text()).toBe('Save')
@@ -136,7 +148,7 @@ describe('WidgetButton Interactions', () => {
     it.for(['secondary', 'primary', 'inverted', 'textonly'] as const)(
       'handles button variant: %s',
       (variant) => {
-        const widget = createMockWidget({ variant })
+        const widget = createButtonWidget({ options: { variant } })
         const wrapper = mountComponent(widget)
         const button = wrapper.findComponent({ name: 'Button' })
         expect(button.props('variant')).toBe(variant)
@@ -146,7 +158,7 @@ describe('WidgetButton Interactions', () => {
 
   describe('Edge Cases', () => {
     it('handles widget with no options', () => {
-      const widget = createMockWidget()
+      const widget = createButtonWidget()
       const wrapper = mountComponent(widget)
 
       const button = wrapper.findComponent({ name: 'Button' })
@@ -157,7 +169,7 @@ describe('WidgetButton Interactions', () => {
       const mockCallback = vi.fn(() => {
         throw new Error('Callback error')
       })
-      const widget = createMockWidget({}, mockCallback)
+      const widget = createButtonWidget({ callback: mockCallback })
       const wrapper = mountComponent(widget)
 
       // Should not break the component when callback throws
@@ -167,7 +179,7 @@ describe('WidgetButton Interactions', () => {
 
     it('handles rapid consecutive clicks', async () => {
       const mockCallback = vi.fn()
-      const widget = createMockWidget({}, mockCallback)
+      const widget = createButtonWidget({ callback: mockCallback })
       const wrapper = mountComponent(widget)
 
       // Simulate rapid clicks
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetButton.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetButton.vue
index 8609202f4b..a7933dca8d 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetButton.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetButton.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex flex-col gap-1">
     <Button
-      class="text-base-foreground w-full border-0 bg-component-node-widget-background p-2"
+      class="w-full border-0 bg-component-node-widget-background p-2 text-base-foreground"
       :aria-label="widget.label"
       size="sm"
       variant="textonly"
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetChart.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetChart.vue
index cadd4754bf..6efa95fa40 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetChart.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetChart.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="flex flex-col gap-1">
-    <div class="max-h-[48rem] rounded border p-4">
+    <div class="max-h-192 rounded-sm border p-4">
       <Chart
         :type="chartType"
         :data="chartData"
@@ -16,10 +16,12 @@ import type { ChartData } from 'chart.js'
 import Chart from 'primevue/chart'
 import { computed } from 'vue'
 
+import type { IWidgetOptions } from '@/lib/litegraph/src/types/widgets'
 import type { ChartInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
 import type { SimplifiedWidget } from '@/types/simplifiedWidget'
 
-type ChartWidgetOptions = NonNullable<ChartInputSpec['options']>
+type ChartWidgetOptions = NonNullable<ChartInputSpec['options']> &
+  IWidgetOptions
 
 const value = defineModel<ChartData>({ required: true })
 
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetColorPicker.test.ts b/src/renderer/extensions/vueNodes/widgets/components/WidgetColorPicker.test.ts
index 32a937f89a..1d20580ef8 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetColorPicker.test.ts
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetColorPicker.test.ts
@@ -7,20 +7,22 @@ import { describe, expect, it } from 'vitest'
 import type { SimplifiedWidget } from '@/types/simplifiedWidget'
 
 import WidgetColorPicker from './WidgetColorPicker.vue'
+import { createMockWidget } from './widgetTestUtils'
 import WidgetLayoutField from './layout/WidgetLayoutField.vue'
 
 describe('WidgetColorPicker Value Binding', () => {
-  const createMockWidget = (
+  const createColorWidget = (
     value: string = '#000000',
     options: Partial<ColorPickerProps> = {},
     callback?: (value: string) => void
-  ): SimplifiedWidget<string> => ({
-    name: 'test_color_picker',
-    type: 'color',
-    value,
-    options,
-    callback
-  })
+  ) =>
+    createMockWidget<string>({
+      value,
+      name: 'test_color_picker',
+      type: 'color',
+      options,
+      callback
+    })
 
   const mountComponent = (
     widget: SimplifiedWidget<string>,
@@ -54,7 +56,7 @@ describe('WidgetColorPicker Value Binding', () => {
 
   describe('Vue Event Emission', () => {
     it('emits Vue event when color changes', async () => {
-      const widget = createMockWidget('#ff0000')
+      const widget = createColorWidget('#ff0000')
       const wrapper = mountComponent(widget, '#ff0000')
 
       const emitted = await setColorPickerValue(wrapper, '#00ff00')
@@ -64,7 +66,7 @@ describe('WidgetColorPicker Value Binding', () => {
     })
 
     it('handles different color formats', async () => {
-      const widget = createMockWidget('#ffffff')
+      const widget = createColorWidget('#ffffff')
       const wrapper = mountComponent(widget, '#ffffff')
 
       const emitted = await setColorPickerValue(wrapper, '#123abc')
@@ -74,7 +76,7 @@ describe('WidgetColorPicker Value Binding', () => {
     })
 
     it('handles missing callback gracefully', async () => {
-      const widget = createMockWidget('#000000', {}, undefined)
+      const widget = createColorWidget('#000000', {}, undefined)
       const wrapper = mountComponent(widget, '#000000')
 
       const emitted = await setColorPickerValue(wrapper, '#ff00ff')
@@ -85,7 +87,7 @@ describe('WidgetColorPicker Value Binding', () => {
     })
 
     it('normalizes bare hex without # to #hex on emit', async () => {
-      const widget = createMockWidget('ff0000')
+      const widget = createColorWidget('ff0000')
       const wrapper = mountComponent(widget, 'ff0000')
 
       const emitted = await setColorPickerValue(wrapper, '00ff00')
@@ -95,7 +97,7 @@ describe('WidgetColorPicker Value Binding', () => {
 
     it('normalizes rgb() strings to #hex on emit', async (context) => {
       context.skip('needs diagnosis')
-      const widget = createMockWidget('#000000')
+      const widget = createColorWidget('#000000')
       const wrapper = mountComponent(widget, '#000000')
 
       const emitted = await setColorPickerValue(wrapper, 'rgb(255, 0, 0)')
@@ -104,7 +106,7 @@ describe('WidgetColorPicker Value Binding', () => {
     })
 
     it('normalizes hsb() strings to #hex on emit', async () => {
-      const widget = createMockWidget('#000000', { format: 'hsb' })
+      const widget = createColorWidget('#000000', { format: 'hsb' })
       const wrapper = mountComponent(widget, '#000000')
 
       const emitted = await setColorPickerValue(wrapper, 'hsb(120, 100, 100)')
@@ -113,7 +115,7 @@ describe('WidgetColorPicker Value Binding', () => {
     })
 
     it('normalizes HSB object values to #hex on emit', async () => {
-      const widget = createMockWidget('#000000', { format: 'hsb' })
+      const widget = createColorWidget('#000000', { format: 'hsb' })
       const wrapper = mountComponent(widget, '#000000')
 
       const emitted = await setColorPickerValue(wrapper, {
@@ -128,7 +130,7 @@ describe('WidgetColorPicker Value Binding', () => {
 
   describe('Component Rendering', () => {
     it('renders color picker component', () => {
-      const widget = createMockWidget('#ff0000')
+      const widget = createColorWidget('#ff0000')
       const wrapper = mountComponent(widget, '#ff0000')
 
       const colorPicker = wrapper.findComponent({ name: 'ColorPicker' })
@@ -137,20 +139,20 @@ describe('WidgetColorPicker Value Binding', () => {
 
     it('normalizes display to a single leading #', () => {
       // Case 1: model value already includes '#'
-      let widget = createMockWidget('#ff0000')
+      let widget = createColorWidget('#ff0000')
       let wrapper = mountComponent(widget, '#ff0000')
       let colorText = wrapper.find('[data-testid="widget-color-text"]')
       expect.soft(colorText.text()).toBe('#ff0000')
 
       // Case 2: model value missing '#'
-      widget = createMockWidget('ff0000')
+      widget = createColorWidget('ff0000')
       wrapper = mountComponent(widget, 'ff0000')
       colorText = wrapper.find('[data-testid="widget-color-text"]')
       expect.soft(colorText.text()).toBe('#ff0000')
     })
 
     it('renders layout field wrapper', () => {
-      const widget = createMockWidget('#ff0000')
+      const widget = createColorWidget('#ff0000')
       const wrapper = mountComponent(widget, '#ff0000')
 
       const layoutField = wrapper.findComponent({ name: 'WidgetLayoutField' })
@@ -158,7 +160,7 @@ describe('WidgetColorPicker Value Binding', () => {
     })
 
     it('displays current color value as text', () => {
-      const widget = createMockWidget('#ff0000')
+      const widget = createColorWidget('#ff0000')
       const wrapper = mountComponent(widget, '#ff0000')
 
       const colorText = wrapper.find('[data-testid="widget-color-text"]')
@@ -166,7 +168,7 @@ describe('WidgetColorPicker Value Binding', () => {
     })
 
     it('updates color text when value changes', async () => {
-      const widget = createMockWidget('#ff0000')
+      const widget = createColorWidget('#ff0000')
       const wrapper = mountComponent(widget, '#ff0000')
 
       await setColorPickerValue(wrapper, '#00ff00')
@@ -178,7 +180,7 @@ describe('WidgetColorPicker Value Binding', () => {
     })
 
     it('uses default color when no value provided', () => {
-      const widget = createMockWidget('')
+      const widget = createColorWidget('')
       const wrapper = mountComponent(widget, '')
 
       const colorPicker = wrapper.findComponent({ name: 'ColorPicker' })
@@ -199,7 +201,7 @@ describe('WidgetColorPicker Value Binding', () => {
       ]
 
       for (const color of validHexColors) {
-        const widget = createMockWidget(color)
+        const widget = createColorWidget(color)
         const wrapper = mountComponent(widget, color)
 
         const colorText = wrapper.find('[data-testid="widget-color-text"]')
@@ -208,7 +210,7 @@ describe('WidgetColorPicker Value Binding', () => {
     })
 
     it('handles short hex colors', () => {
-      const widget = createMockWidget('#fff')
+      const widget = createColorWidget('#fff')
       const wrapper = mountComponent(widget, '#fff')
 
       const colorText = wrapper.find('[data-testid="widget-color-text"]')
@@ -220,7 +222,7 @@ describe('WidgetColorPicker Value Binding', () => {
         format: 'hex' as const,
         inline: true
       }
-      const widget = createMockWidget('#ff0000', colorOptions)
+      const widget = createColorWidget('#ff0000', colorOptions)
       const wrapper = mountComponent(widget, '#ff0000')
 
       const colorPicker = wrapper.findComponent({ name: 'ColorPicker' })
@@ -231,7 +233,7 @@ describe('WidgetColorPicker Value Binding', () => {
 
   describe('Widget Layout Integration', () => {
     it('passes widget to layout field', () => {
-      const widget = createMockWidget('#ff0000')
+      const widget = createColorWidget('#ff0000')
       const wrapper = mountComponent(widget, '#ff0000')
 
       const layoutField = wrapper.findComponent({ name: 'WidgetLayoutField' })
@@ -239,7 +241,7 @@ describe('WidgetColorPicker Value Binding', () => {
     })
 
     it('maintains proper component structure', () => {
-      const widget = createMockWidget('#ff0000')
+      const widget = createColorWidget('#ff0000')
       const wrapper = mountComponent(widget, '#ff0000')
 
       // Should have layout field containing label with color picker and text
@@ -257,7 +259,7 @@ describe('WidgetColorPicker Value Binding', () => {
 
   describe('Edge Cases', () => {
     it('handles empty color value', () => {
-      const widget = createMockWidget('')
+      const widget = createColorWidget('')
       const wrapper = mountComponent(widget, '')
 
       const colorPicker = wrapper.findComponent({ name: 'ColorPicker' })
@@ -265,7 +267,7 @@ describe('WidgetColorPicker Value Binding', () => {
     })
 
     it('handles invalid color formats gracefully', async () => {
-      const widget = createMockWidget('invalid-color')
+      const widget = createColorWidget('invalid-color')
       const wrapper = mountComponent(widget, 'invalid-color')
 
       const colorText = wrapper.find('[data-testid="widget-color-text"]')
@@ -277,7 +279,7 @@ describe('WidgetColorPicker Value Binding', () => {
     })
 
     it('handles widget with no options', () => {
-      const widget = createMockWidget('#ff0000')
+      const widget = createColorWidget('#ff0000')
       const wrapper = mountComponent(widget, '#ff0000')
 
       const colorPicker = wrapper.findComponent({ name: 'ColorPicker' })
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetColorPicker.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetColorPicker.vue
index b87f6b6164..41982d1f6b 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetColorPicker.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetColorPicker.vue
@@ -3,13 +3,13 @@
   <WidgetLayoutField :widget="widget">
     <label
       :class="
-        cn(WidgetInputBaseClass, 'flex items-center gap-2 w-full px-4 py-2')
+        cn(WidgetInputBaseClass, 'flex w-full items-center gap-2 px-4 py-2')
       "
     >
       <ColorPicker
         v-model="localValue"
         v-bind="filteredProps"
-        class="h-4 w-8 overflow-hidden !rounded-full border-none"
+        class="h-4 w-8 overflow-hidden rounded-full! border-none"
         :aria-label="widget.name"
         :pt="{
           preview: '!w-full !h-full !border-none'
@@ -17,7 +17,7 @@
         @update:model-value="onPickerUpdate"
       />
       <span
-        class="text-xs truncate min-w-[4ch]"
+        class="min-w-[4ch] truncate text-xs"
         data-testid="widget-color-text"
         >{{ toHexFromFormat(localValue, format) }}</span
       >
@@ -38,10 +38,12 @@ import {
   filterWidgetProps
 } from '@/utils/widgetPropFilter'
 
+import type { IWidgetOptions } from '@/lib/litegraph/src/types/widgets'
+
 import { WidgetInputBaseClass } from './layout'
 import WidgetLayoutField from './layout/WidgetLayoutField.vue'
 
-type WidgetOptions = { format?: ColorFormat } & Record<string, unknown>
+type WidgetOptions = IWidgetOptions & { format?: ColorFormat }
 
 const props = defineProps<{
   widget: SimplifiedWidget<string, WidgetOptions>
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetDOM.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetDOM.vue
index 897cc50599..a53f09f071 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetDOM.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetDOM.vue
@@ -1,8 +1,11 @@
 <script setup lang="ts">
+import { whenever } from '@vueuse/core'
 import { onMounted, ref } from 'vue'
 
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import type { DOMWidget } from '@/scripts/domWidget'
 import { isDOMWidget } from '@/scripts/domWidget'
+import { resolveWidgetFromHostNode } from '@/renderer/extensions/vueNodes/widgets/utils/resolvePromotedWidget'
 import type { SimplifiedWidget } from '@/types/simplifiedWidget'
 
 // Button widgets don't have a v-model value, they trigger actions
@@ -13,16 +16,37 @@ const props = defineProps<{
 
 const domEl = ref<HTMLElement>()
 
-const { canvas } = useCanvasStore()
-onMounted(() => {
+const canvasStore = useCanvasStore()
+const { canvas } = canvasStore
+
+function findDOMWidget(): DOMWidget<HTMLElement, object | string> | undefined {
+  const hostNode = canvas?.graph?.getNodeById(props.nodeId) ?? undefined
+  const resolved = resolveWidgetFromHostNode(hostNode, props.widget.name)
+  if (resolved && isDOMWidget(resolved.widget)) return resolved.widget
+
+  return undefined
+}
+
+function mountWidgetElement() {
   if (!domEl.value) return
-  const node = canvas?.graph?.getNodeById(props.nodeId) ?? undefined
-  if (!node) return
-  const widget = node.widgets?.find((w) => w.name === props.widget.name)
-  if (!widget || !isDOMWidget(widget)) return
+  const widget = findDOMWidget()
+  if (!widget) return
+  if (domEl.value.contains(widget.element)) return
   domEl.value.replaceChildren(widget.element)
+}
+
+onMounted(() => {
+  mountWidgetElement()
 })
+
+whenever(() => !canvasStore.linearMode, mountWidgetElement)
 </script>
 <template>
-  <div ref="domEl" />
+  <div
+    ref="domEl"
+    class="flex flex-col *:flex-1"
+    @pointerdown.stop
+    @pointermove.stop
+    @pointerup.stop
+  />
 </template>
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetGalleria.test.ts b/src/renderer/extensions/vueNodes/widgets/components/WidgetGalleria.test.ts
index 399edb5144..9410c65934 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetGalleria.test.ts
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetGalleria.test.ts
@@ -9,6 +9,7 @@ import type { SimplifiedWidget } from '@/types/simplifiedWidget'
 
 import WidgetGalleria from './WidgetGalleria.vue'
 import type { GalleryImage, GalleryValue } from './WidgetGalleria.vue'
+import { createMockWidget } from './widgetTestUtils'
 
 const i18n = createI18n({
   legacy: false,
@@ -45,16 +46,16 @@ const TEST_IMAGE_OBJECTS: readonly GalleryImage[] = Object.freeze([
 ])
 
 // Helper functions outside describe blocks for better clarity
-function createMockWidget(
+function createGalleriaWidget(
   value: GalleryValue = [],
   options: Partial<GalleriaProps> = {}
-): SimplifiedWidget<GalleryValue> {
-  return {
+) {
+  return createMockWidget<GalleryValue>({
+    value,
     name: 'test_galleria',
     type: 'array',
-    value,
     options
-  }
+  })
 }
 
 function mountComponent(
@@ -85,7 +86,7 @@ function createGalleriaWrapper(
   images: GalleryValue,
   options: Partial<GalleriaProps> = {}
 ) {
-  const widget = createMockWidget(images, options)
+  const widget = createGalleriaWidget(images, options)
   return mountComponent(widget, images)
 }
 
@@ -101,7 +102,7 @@ describe('WidgetGalleria Image Display', () => {
     })
 
     it('displays empty gallery when no images provided', () => {
-      const widget = createMockWidget([])
+      const widget = createGalleriaWidget([])
       const wrapper = mountComponent(widget, [])
 
       const galleria = wrapper.findComponent({ name: 'Galleria' })
@@ -109,7 +110,7 @@ describe('WidgetGalleria Image Display', () => {
     })
 
     it('handles null or undefined value gracefully', () => {
-      const widget = createMockWidget([])
+      const widget = createGalleriaWidget([])
       const wrapper = mountComponent(widget, [])
 
       const galleria = wrapper.findComponent({ name: 'Galleria' })
@@ -119,7 +120,7 @@ describe('WidgetGalleria Image Display', () => {
 
   describe('String Array Input', () => {
     it('converts string array to image objects', () => {
-      const widget = createMockWidget([...TEST_IMAGES_SMALL])
+      const widget = createGalleriaWidget([...TEST_IMAGES_SMALL])
       const wrapper = mountComponent(widget, [...TEST_IMAGES_SMALL])
 
       const galleria = wrapper.findComponent({ name: 'Galleria' })
@@ -134,7 +135,7 @@ describe('WidgetGalleria Image Display', () => {
     })
 
     it('handles single string image', () => {
-      const widget = createMockWidget([...TEST_IMAGES_SINGLE])
+      const widget = createGalleriaWidget([...TEST_IMAGES_SINGLE])
       const wrapper = mountComponent(widget, [...TEST_IMAGES_SINGLE])
 
       const galleria = wrapper.findComponent({ name: 'Galleria' })
@@ -151,7 +152,7 @@ describe('WidgetGalleria Image Display', () => {
 
   describe('Object Array Input', () => {
     it('preserves image objects as-is', () => {
-      const widget = createMockWidget([...TEST_IMAGE_OBJECTS])
+      const widget = createGalleriaWidget([...TEST_IMAGE_OBJECTS])
       const wrapper = mountComponent(widget, [...TEST_IMAGE_OBJECTS])
 
       const galleria = wrapper.findComponent({ name: 'Galleria' })
@@ -166,7 +167,7 @@ describe('WidgetGalleria Image Display', () => {
         { itemImageSrc: 'https://example.com/image2.jpg' },
         { thumbnailImageSrc: 'https://example.com/thumb3.jpg' }
       ]
-      const widget = createMockWidget(images)
+      const widget = createGalleriaWidget(images)
       const wrapper = mountComponent(widget, images)
 
       const galleria = wrapper.findComponent({ name: 'Galleria' })
@@ -227,7 +228,7 @@ describe('WidgetGalleria Image Display', () => {
 
     it('respects widget option to hide navigation buttons', () => {
       const images = createImageStrings(3)
-      const widget = createMockWidget(images, { showItemNavigators: false })
+      const widget = createGalleriaWidget(images, { showItemNavigators: false })
       const wrapper = mountComponent(widget, images)
 
       const galleria = wrapper.findComponent({ name: 'Galleria' })
@@ -236,7 +237,7 @@ describe('WidgetGalleria Image Display', () => {
 
     it('shows navigation buttons when explicitly enabled for multiple images', () => {
       const images = createImageStrings(3)
-      const widget = createMockWidget(images, { showItemNavigators: true })
+      const widget = createGalleriaWidget(images, { showItemNavigators: true })
       const wrapper = mountComponent(widget, images)
 
       const galleria = wrapper.findComponent({ name: 'Galleria' })
@@ -247,7 +248,7 @@ describe('WidgetGalleria Image Display', () => {
   describe('Widget Options Handling', () => {
     it('passes through valid widget options', () => {
       const images = createImageStrings(2)
-      const widget = createMockWidget(images, {
+      const widget = createGalleriaWidget(images, {
         circular: true,
         autoPlay: true,
         transitionInterval: 3000
@@ -262,7 +263,7 @@ describe('WidgetGalleria Image Display', () => {
 
     it('applies custom styling props', () => {
       const images = createImageStrings(2)
-      const widget = createMockWidget(images)
+      const widget = createGalleriaWidget(images)
       const wrapper = mountComponent(widget, images)
 
       const galleria = wrapper.findComponent({ name: 'Galleria' })
@@ -274,7 +275,7 @@ describe('WidgetGalleria Image Display', () => {
   describe('Active Index Management', () => {
     it('initializes with zero active index', () => {
       const images = createImageStrings(3)
-      const widget = createMockWidget(images)
+      const widget = createGalleriaWidget(images)
       const wrapper = mountComponent(widget, images)
 
       const galleria = wrapper.findComponent({ name: 'Galleria' })
@@ -283,14 +284,14 @@ describe('WidgetGalleria Image Display', () => {
 
     it('can update active index', async () => {
       const images = createImageStrings(3)
-      const widget = createMockWidget(images)
+      const widget = createGalleriaWidget(images)
       const wrapper = mountComponent(widget, images)
 
       const galleria = wrapper.findComponent({ name: 'Galleria' })
       await galleria.vm.$emit('update:activeIndex', 2)
 
       // Check that the internal activeIndex ref was updated
-      const vm = wrapper.vm as any
+      const vm = wrapper.vm as typeof wrapper.vm & { activeIndex: number }
       expect(vm.activeIndex).toBe(2)
     })
   })
@@ -304,7 +305,7 @@ describe('WidgetGalleria Image Display', () => {
         },
         { src: 'https://example.com/only-src.jpg' }
       ]
-      const widget = createMockWidget(images)
+      const widget = createGalleriaWidget(images)
       const wrapper = mountComponent(widget, images)
 
       // The template logic should prioritize itemImageSrc > src > fallback to the item itself
@@ -320,7 +321,7 @@ describe('WidgetGalleria Image Display', () => {
         },
         { src: 'https://example.com/only-src.jpg' }
       ]
-      const widget = createMockWidget(images)
+      const widget = createGalleriaWidget(images)
       const wrapper = mountComponent(widget, images)
 
       // The template logic should prioritize thumbnailImageSrc > src > fallback to the item itself
@@ -331,7 +332,7 @@ describe('WidgetGalleria Image Display', () => {
 
   describe('Edge Cases', () => {
     it('handles empty array gracefully', () => {
-      const widget = createMockWidget([])
+      const widget = createGalleriaWidget([])
       const wrapper = mountComponent(widget, [])
 
       const galleria = wrapper.findComponent({ name: 'Galleria' })
@@ -347,7 +348,7 @@ describe('WidgetGalleria Image Display', () => {
         null, // Null value
         undefined // Undefined value
       ]
-      const widget = createMockWidget(malformedImages as string[])
+      const widget = createGalleriaWidget(malformedImages as string[])
       const wrapper = mountComponent(widget, malformedImages as string[])
 
       const galleria = wrapper.findComponent({ name: 'Galleria' })
@@ -358,7 +359,7 @@ describe('WidgetGalleria Image Display', () => {
 
     it('handles very large image arrays', () => {
       const largeImageArray = createImageStrings(100)
-      const widget = createMockWidget(largeImageArray)
+      const widget = createGalleriaWidget(largeImageArray)
       const wrapper = mountComponent(widget, largeImageArray)
 
       const galleria = wrapper.findComponent({ name: 'Galleria' })
@@ -374,7 +375,7 @@ describe('WidgetGalleria Image Display', () => {
         { itemImageSrc: 'https://example.com/object.jpg' },
         'https://example.com/another-string.jpg'
       ]
-      const widget = createMockWidget(mixedArray as string[])
+      const widget = createGalleriaWidget(mixedArray as string[])
 
       // The component expects consistent typing, but let's test it handles mixed input
       expect(() => mountComponent(widget, mixedArray as string[])).not.toThrow()
@@ -382,7 +383,7 @@ describe('WidgetGalleria Image Display', () => {
 
     it('handles invalid URL strings', () => {
       const invalidUrls = ['not-a-url', '', ' ', 'http://', 'ftp://invalid']
-      const widget = createMockWidget(invalidUrls)
+      const widget = createGalleriaWidget(invalidUrls)
       const wrapper = mountComponent(widget, invalidUrls)
 
       const galleria = wrapper.findComponent({ name: 'Galleria' })
@@ -393,7 +394,7 @@ describe('WidgetGalleria Image Display', () => {
   describe('Styling and Layout', () => {
     it('applies max-width constraint', () => {
       const images = createImageStrings(2)
-      const widget = createMockWidget(images)
+      const widget = createGalleriaWidget(images)
       const wrapper = mountComponent(widget, images)
 
       const galleria = wrapper.findComponent({ name: 'Galleria' })
@@ -403,7 +404,7 @@ describe('WidgetGalleria Image Display', () => {
 
     it('applies passthrough props for thumbnails', () => {
       const images = createImageStrings(3)
-      const widget = createMockWidget(images)
+      const widget = createGalleriaWidget(images)
       const wrapper = mountComponent(widget, images)
 
       const galleria = wrapper.findComponent({ name: 'Galleria' })
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetGalleria.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetGalleria.vue
index e32acb7817..2cb49c533b 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetGalleria.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetGalleria.vue
@@ -33,14 +33,14 @@
         />
       </template>
       <template #thumbnail="{ item }">
-        <div class="h-full w-full p-1">
+        <div class="size-full p-1">
           <img
             :src="item?.thumbnailImageSrc || item?.src || ''"
             :alt="
               item?.alt ||
               `${t('g.galleryThumbnail')} ${galleryImages.findIndex((img) => img === item) + 1} of ${galleryImages.length}`
             "
-            class="h-full w-full rounded-lg object-cover"
+            class="size-full rounded-lg object-cover"
           />
         </div>
       </template>
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetImageCompare.test.ts b/src/renderer/extensions/vueNodes/widgets/components/WidgetImageCompare.test.ts
index e1eb34e1b9..e67eda8b0c 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetImageCompare.test.ts
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetImageCompare.test.ts
@@ -5,17 +5,19 @@ import type { SimplifiedWidget } from '@/types/simplifiedWidget'
 
 import WidgetImageCompare from './WidgetImageCompare.vue'
 import type { ImageCompareValue } from './WidgetImageCompare.vue'
+import { createMockWidget } from './widgetTestUtils'
 
 describe('WidgetImageCompare Display', () => {
-  const createMockWidget = (
+  const createImageCompareWidget = (
     value: ImageCompareValue | string,
-    options: SimplifiedWidget['options'] = {}
-  ): SimplifiedWidget<ImageCompareValue | string> => ({
-    name: 'test_imagecompare',
-    type: 'object',
-    value,
-    options
-  })
+    options: SimplifiedWidget<ImageCompareValue | string>['options'] = {}
+  ) =>
+    createMockWidget<ImageCompareValue | string>({
+      value,
+      name: 'test_imagecompare',
+      type: 'object',
+      options
+    })
 
   const mountComponent = (
     widget: SimplifiedWidget<ImageCompareValue | string>,
@@ -24,7 +26,12 @@ describe('WidgetImageCompare Display', () => {
     return mount(WidgetImageCompare, {
       global: {
         mocks: {
-          $t: (key: string) => key
+          $t: (key: string, params?: Record<string, unknown>) => {
+            if (key === 'batch.index' && params) {
+              return `${params.current} / ${params.total}`
+            }
+            return key
+          }
         }
       },
       props: {
@@ -37,16 +44,16 @@ describe('WidgetImageCompare Display', () => {
   describe('Component Rendering', () => {
     it('renders with proper structure and styling when images are provided', () => {
       const value: ImageCompareValue = {
-        before: 'https://example.com/before.jpg',
-        after: 'https://example.com/after.jpg'
+        beforeImages: ['https://example.com/before.jpg'],
+        afterImages: ['https://example.com/after.jpg']
       }
-      const widget = createMockWidget(value)
+      const widget = createImageCompareWidget(value)
       const wrapper = mountComponent(widget)
 
       const images = wrapper.findAll('img')
       expect(images).toHaveLength(2)
 
-      // In the new implementation: after image is first (background), before image is second (overlay)
+      // After image is first (background), before image is second (overlay)
       expect(images[0].attributes('src')).toBe('https://example.com/after.jpg')
       expect(images[1].attributes('src')).toBe('https://example.com/before.jpg')
 
@@ -60,12 +67,14 @@ describe('WidgetImageCompare Display', () => {
     it('handles alt text correctly - custom, default, and empty', () => {
       // Test custom alt text
       const customAltValue: ImageCompareValue = {
-        before: 'https://example.com/before.jpg',
-        after: 'https://example.com/after.jpg',
+        beforeImages: ['https://example.com/before.jpg'],
+        afterImages: ['https://example.com/after.jpg'],
         beforeAlt: 'Original design',
         afterAlt: 'Updated design'
       }
-      const customWrapper = mountComponent(createMockWidget(customAltValue))
+      const customWrapper = mountComponent(
+        createImageCompareWidget(customAltValue)
+      )
       const customImages = customWrapper.findAll('img')
       // DOM order: [after, before]
       expect(customImages[0].attributes('alt')).toBe('Updated design')
@@ -73,22 +82,26 @@ describe('WidgetImageCompare Display', () => {
 
       // Test default alt text
       const defaultAltValue: ImageCompareValue = {
-        before: 'https://example.com/before.jpg',
-        after: 'https://example.com/after.jpg'
+        beforeImages: ['https://example.com/before.jpg'],
+        afterImages: ['https://example.com/after.jpg']
       }
-      const defaultWrapper = mountComponent(createMockWidget(defaultAltValue))
+      const defaultWrapper = mountComponent(
+        createImageCompareWidget(defaultAltValue)
+      )
       const defaultImages = defaultWrapper.findAll('img')
       expect(defaultImages[0].attributes('alt')).toBe('After image')
       expect(defaultImages[1].attributes('alt')).toBe('Before image')
 
       // Test empty string alt text (falls back to default)
       const emptyAltValue: ImageCompareValue = {
-        before: 'https://example.com/before.jpg',
-        after: 'https://example.com/after.jpg',
+        beforeImages: ['https://example.com/before.jpg'],
+        afterImages: ['https://example.com/after.jpg'],
         beforeAlt: '',
         afterAlt: ''
       }
-      const emptyWrapper = mountComponent(createMockWidget(emptyAltValue))
+      const emptyWrapper = mountComponent(
+        createImageCompareWidget(emptyAltValue)
+      )
       const emptyImages = emptyWrapper.findAll('img')
       expect(emptyImages[0].attributes('alt')).toBe('After image')
       expect(emptyImages[1].attributes('alt')).toBe('Before image')
@@ -96,12 +109,10 @@ describe('WidgetImageCompare Display', () => {
 
     it('handles partial image URLs gracefully', () => {
       // Only before image provided
-      const beforeOnlyValue: ImageCompareValue = {
-        before: 'https://example.com/before.jpg',
-        after: ''
-      }
       const beforeOnlyWrapper = mountComponent(
-        createMockWidget(beforeOnlyValue)
+        createImageCompareWidget({
+          beforeImages: ['https://example.com/before.jpg']
+        })
       )
       const beforeOnlyImages = beforeOnlyWrapper.findAll('img')
       expect(beforeOnlyImages).toHaveLength(1)
@@ -110,11 +121,11 @@ describe('WidgetImageCompare Display', () => {
       )
 
       // Only after image provided
-      const afterOnlyValue: ImageCompareValue = {
-        before: '',
-        after: 'https://example.com/after.jpg'
-      }
-      const afterOnlyWrapper = mountComponent(createMockWidget(afterOnlyValue))
+      const afterOnlyWrapper = mountComponent(
+        createImageCompareWidget({
+          afterImages: ['https://example.com/after.jpg']
+        })
+      )
       const afterOnlyImages = afterOnlyWrapper.findAll('img')
       expect(afterOnlyImages).toHaveLength(1)
       expect(afterOnlyImages[0].attributes('src')).toBe(
@@ -126,7 +137,7 @@ describe('WidgetImageCompare Display', () => {
   describe('String Value Input', () => {
     it('handles string value as before image only', () => {
       const value = 'https://example.com/single.jpg'
-      const widget = createMockWidget(value)
+      const widget = createImageCompareWidget(value)
       const wrapper = mountComponent(widget)
 
       const images = wrapper.findAll('img')
@@ -139,10 +150,10 @@ describe('WidgetImageCompare Display', () => {
   describe('Readonly Mode', () => {
     it('renders normally in readonly mode', () => {
       const value: ImageCompareValue = {
-        before: 'https://example.com/before.jpg',
-        after: 'https://example.com/after.jpg'
+        beforeImages: ['https://example.com/before.jpg'],
+        afterImages: ['https://example.com/after.jpg']
       }
-      const widget = createMockWidget(value)
+      const widget = createImageCompareWidget(value)
       const wrapper = mountComponent(widget, true)
 
       const images = wrapper.findAll('img')
@@ -152,7 +163,7 @@ describe('WidgetImageCompare Display', () => {
 
   describe('Edge Cases', () => {
     it('shows no images message when widget value is empty string', () => {
-      const widget = createMockWidget('')
+      const widget = createImageCompareWidget('')
       const wrapper = mountComponent(widget)
 
       const images = wrapper.findAll('img')
@@ -160,9 +171,12 @@ describe('WidgetImageCompare Display', () => {
       expect(wrapper.text()).toContain('imageCompare.noImages')
     })
 
-    it('shows no images message when both URLs are empty', () => {
-      const value: ImageCompareValue = { before: '', after: '' }
-      const widget = createMockWidget(value)
+    it('shows no images message when both arrays are empty', () => {
+      const value: ImageCompareValue = {
+        beforeImages: [],
+        afterImages: []
+      }
+      const widget = createImageCompareWidget(value)
       const wrapper = mountComponent(widget)
 
       const images = wrapper.findAll('img')
@@ -172,7 +186,7 @@ describe('WidgetImageCompare Display', () => {
 
     it('shows no images message for empty object value', () => {
       const value: ImageCompareValue = {} as ImageCompareValue
-      const widget = createMockWidget(value)
+      const widget = createImageCompareWidget(value)
       const wrapper = mountComponent(widget)
 
       const images = wrapper.findAll('img')
@@ -181,42 +195,40 @@ describe('WidgetImageCompare Display', () => {
     })
 
     it('handles special content - long URLs, special characters, and long alt text', () => {
-      // Test very long URLs
       const longUrl = 'https://example.com/' + 'a'.repeat(1000) + '.jpg'
-      const longUrlValue: ImageCompareValue = {
-        before: longUrl,
-        after: longUrl
-      }
-      const longUrlWrapper = mountComponent(createMockWidget(longUrlValue))
+      const longUrlWrapper = mountComponent(
+        createImageCompareWidget({
+          beforeImages: [longUrl],
+          afterImages: [longUrl]
+        })
+      )
       const longUrlImages = longUrlWrapper.findAll('img')
       expect(longUrlImages[0].attributes('src')).toBe(longUrl)
       expect(longUrlImages[1].attributes('src')).toBe(longUrl)
 
-      // Test special characters in URLs
       const specialUrl =
         'https://example.com/path with spaces & symbols!@#$.jpg'
-      const specialUrlValue: ImageCompareValue = {
-        before: specialUrl,
-        after: specialUrl
-      }
       const specialUrlWrapper = mountComponent(
-        createMockWidget(specialUrlValue)
+        createImageCompareWidget({
+          beforeImages: [specialUrl],
+          afterImages: [specialUrl]
+        })
       )
       const specialUrlImages = specialUrlWrapper.findAll('img')
       expect(specialUrlImages[0].attributes('src')).toBe(specialUrl)
       expect(specialUrlImages[1].attributes('src')).toBe(specialUrl)
 
-      // Test very long alt text
       const longAlt =
         'Very long alt text that exceeds normal length: ' +
         'description '.repeat(50)
-      const longAltValue: ImageCompareValue = {
-        before: 'https://example.com/before.jpg',
-        after: 'https://example.com/after.jpg',
-        beforeAlt: longAlt,
-        afterAlt: longAlt
-      }
-      const longAltWrapper = mountComponent(createMockWidget(longAltValue))
+      const longAltWrapper = mountComponent(
+        createImageCompareWidget({
+          beforeImages: ['https://example.com/before.jpg'],
+          afterImages: ['https://example.com/after.jpg'],
+          beforeAlt: longAlt,
+          afterAlt: longAlt
+        })
+      )
       const longAltImages = longAltWrapper.findAll('img')
       expect(longAltImages[0].attributes('alt')).toBe(longAlt)
       expect(longAltImages[1].attributes('alt')).toBe(longAlt)
@@ -226,16 +238,14 @@ describe('WidgetImageCompare Display', () => {
   describe('Template Structure', () => {
     it('correctly renders after image as background and before image as overlay', () => {
       const value: ImageCompareValue = {
-        before: 'https://example.com/before.jpg',
-        after: 'https://example.com/after.jpg'
+        beforeImages: ['https://example.com/before.jpg'],
+        afterImages: ['https://example.com/after.jpg']
       }
-      const widget = createMockWidget(value)
+      const widget = createImageCompareWidget(value)
       const wrapper = mountComponent(widget)
 
       const images = wrapper.findAll('img')
-      // After image is rendered first as background
       expect(images[0].attributes('src')).toBe('https://example.com/after.jpg')
-      // Before image is rendered second as overlay with clipPath
       expect(images[1].attributes('src')).toBe('https://example.com/before.jpg')
       expect(images[1].classes()).toContain('absolute')
     })
@@ -243,26 +253,26 @@ describe('WidgetImageCompare Display', () => {
 
   describe('Integration', () => {
     it('works with various URL types - data URLs and blob URLs', () => {
-      // Test data URLs
       const dataUrl =
         'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8/5+hHgAHggJ/PchI7wAAAABJRU5ErkJggg=='
-      const dataUrlValue: ImageCompareValue = {
-        before: dataUrl,
-        after: dataUrl
-      }
-      const dataUrlWrapper = mountComponent(createMockWidget(dataUrlValue))
+      const dataUrlWrapper = mountComponent(
+        createImageCompareWidget({
+          beforeImages: [dataUrl],
+          afterImages: [dataUrl]
+        })
+      )
       const dataUrlImages = dataUrlWrapper.findAll('img')
       expect(dataUrlImages[0].attributes('src')).toBe(dataUrl)
       expect(dataUrlImages[1].attributes('src')).toBe(dataUrl)
 
-      // Test blob URLs
       const blobUrl =
         'blob:http://example.com/12345678-1234-1234-1234-123456789012'
-      const blobUrlValue: ImageCompareValue = {
-        before: blobUrl,
-        after: blobUrl
-      }
-      const blobUrlWrapper = mountComponent(createMockWidget(blobUrlValue))
+      const blobUrlWrapper = mountComponent(
+        createImageCompareWidget({
+          beforeImages: [blobUrl],
+          afterImages: [blobUrl]
+        })
+      )
       const blobUrlImages = blobUrlWrapper.findAll('img')
       expect(blobUrlImages[0].attributes('src')).toBe(blobUrl)
       expect(blobUrlImages[1].attributes('src')).toBe(blobUrl)
@@ -272,10 +282,10 @@ describe('WidgetImageCompare Display', () => {
   describe('Slider Element', () => {
     it('renders slider divider when images are present', () => {
       const value: ImageCompareValue = {
-        before: 'https://example.com/before.jpg',
-        after: 'https://example.com/after.jpg'
+        beforeImages: ['https://example.com/before.jpg'],
+        afterImages: ['https://example.com/after.jpg']
       }
-      const widget = createMockWidget(value)
+      const widget = createImageCompareWidget(value)
       const wrapper = mountComponent(widget)
 
       const slider = wrapper.find('[role="presentation"]')
@@ -284,11 +294,149 @@ describe('WidgetImageCompare Display', () => {
     })
 
     it('does not render slider when no images', () => {
-      const widget = createMockWidget('')
+      const widget = createImageCompareWidget('')
       const wrapper = mountComponent(widget)
 
       const slider = wrapper.find('[role="presentation"]')
       expect(slider.exists()).toBe(false)
     })
   })
+
+  describe('Batch Navigation', () => {
+    const beforeImages = [
+      'https://example.com/a1.jpg',
+      'https://example.com/a2.jpg',
+      'https://example.com/a3.jpg'
+    ]
+    const afterImages = [
+      'https://example.com/b1.jpg',
+      'https://example.com/b2.jpg'
+    ]
+
+    it('shows batch nav when either side has multiple images', () => {
+      const value: ImageCompareValue = { beforeImages, afterImages }
+      const wrapper = mountComponent(createImageCompareWidget(value))
+
+      expect(wrapper.find('[data-testid="batch-nav"]').exists()).toBe(true)
+
+      const beforeBatch = wrapper.find('[data-testid="before-batch"]')
+      const afterBatch = wrapper.find('[data-testid="after-batch"]')
+      expect(beforeBatch.find('[data-testid="batch-counter"]').text()).toBe(
+        '1 / 3'
+      )
+      expect(afterBatch.find('[data-testid="batch-counter"]').text()).toBe(
+        '1 / 2'
+      )
+    })
+
+    it('hides batch nav for single images', () => {
+      const value: ImageCompareValue = {
+        beforeImages: ['https://example.com/a1.jpg'],
+        afterImages: ['https://example.com/b1.jpg']
+      }
+      const wrapper = mountComponent(createImageCompareWidget(value))
+
+      expect(wrapper.find('[data-testid="batch-nav"]').exists()).toBe(false)
+    })
+
+    it('hides batch nav when no batch arrays are provided', () => {
+      const wrapper = mountComponent(
+        createImageCompareWidget({} as ImageCompareValue)
+      )
+
+      expect(wrapper.find('[data-testid="batch-nav"]').exists()).toBe(false)
+    })
+
+    it('navigates before images with prev/next buttons', async () => {
+      const value: ImageCompareValue = { beforeImages, afterImages }
+      const wrapper = mountComponent(createImageCompareWidget(value))
+      const beforeBatch = wrapper.find('[data-testid="before-batch"]')
+
+      // Initially shows first before image
+      expect(wrapper.findAll('img')[1].attributes('src')).toBe(
+        'https://example.com/a1.jpg'
+      )
+
+      // Click next on before
+      await beforeBatch.find('[data-testid="batch-next"]').trigger('click')
+      expect(wrapper.findAll('img')[1].attributes('src')).toBe(
+        'https://example.com/a2.jpg'
+      )
+      expect(beforeBatch.find('[data-testid="batch-counter"]').text()).toBe(
+        '2 / 3'
+      )
+
+      // Click next again
+      await beforeBatch.find('[data-testid="batch-next"]').trigger('click')
+      expect(wrapper.findAll('img')[1].attributes('src')).toBe(
+        'https://example.com/a3.jpg'
+      )
+      expect(beforeBatch.find('[data-testid="batch-counter"]').text()).toBe(
+        '3 / 3'
+      )
+
+      // Next button should be disabled at last index
+      expect(
+        beforeBatch.find('[data-testid="batch-next"]').attributes('disabled')
+      ).toBeDefined()
+
+      // Click prev
+      await beforeBatch.find('[data-testid="batch-prev"]').trigger('click')
+      expect(wrapper.findAll('img')[1].attributes('src')).toBe(
+        'https://example.com/a2.jpg'
+      )
+    })
+
+    it('navigates after images independently from before images', async () => {
+      const value: ImageCompareValue = { beforeImages, afterImages }
+      const wrapper = mountComponent(createImageCompareWidget(value))
+      const afterBatch = wrapper.find('[data-testid="after-batch"]')
+
+      // Navigate after to index 1
+      await afterBatch.find('[data-testid="batch-next"]').trigger('click')
+      expect(afterBatch.find('[data-testid="batch-counter"]').text()).toBe(
+        '2 / 2'
+      )
+
+      // After image should be b2, before image should still be a1
+      const images = wrapper.findAll('img')
+      expect(images[0].attributes('src')).toBe('https://example.com/b2.jpg')
+      expect(images[1].attributes('src')).toBe('https://example.com/a1.jpg')
+    })
+
+    it('disables prev button at first index', () => {
+      const value: ImageCompareValue = { beforeImages, afterImages }
+      const wrapper = mountComponent(createImageCompareWidget(value))
+
+      expect(
+        wrapper
+          .find('[data-testid="before-batch"]')
+          .find('[data-testid="batch-prev"]')
+          .attributes('disabled')
+      ).toBeDefined()
+      expect(
+        wrapper
+          .find('[data-testid="after-batch"]')
+          .find('[data-testid="batch-prev"]')
+          .attributes('disabled')
+      ).toBeDefined()
+    })
+
+    it('only shows controls for the side with multiple images', () => {
+      const value: ImageCompareValue = {
+        beforeImages,
+        afterImages: ['https://example.com/b1.jpg']
+      }
+      const wrapper = mountComponent(createImageCompareWidget(value))
+
+      expect(wrapper.find('[data-testid="batch-nav"]').exists()).toBe(true)
+      expect(
+        wrapper
+          .find('[data-testid="before-batch"]')
+          .find('[data-testid="batch-counter"]')
+          .exists()
+      ).toBe(true)
+      expect(wrapper.find('[data-testid="after-batch"]').exists()).toBe(false)
+    })
+  })
 })
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetImageCompare.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetImageCompare.vue
index 8cb80341a8..c6df3f3332 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetImageCompare.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetImageCompare.vue
@@ -1,6 +1,33 @@
 <template>
-  <div ref="containerRef" class="relative size-full min-h-32 overflow-hidden">
-    <div v-if="beforeImage || afterImage">
+  <div class="flex size-full min-h-32 flex-col overflow-hidden">
+    <div
+      v-if="showBatchNav"
+      class="flex shrink-0 justify-between px-2 py-1 text-xs"
+      data-testid="batch-nav"
+    >
+      <BatchNavigation
+        v-model="beforeIndex"
+        :count="beforeBatchCount"
+        data-testid="before-batch"
+      >
+        <template #label>{{ $t('imageCompare.batchLabelA') }}</template>
+      </BatchNavigation>
+      <div v-if="beforeBatchCount <= 1" />
+
+      <BatchNavigation
+        v-model="afterIndex"
+        :count="afterBatchCount"
+        data-testid="after-batch"
+      >
+        <template #label>{{ $t('imageCompare.batchLabelB') }}</template>
+      </BatchNavigation>
+    </div>
+
+    <div
+      v-if="beforeImage || afterImage"
+      ref="containerRef"
+      class="relative min-h-0 flex-1"
+    >
       <img
         v-if="afterImage"
         :src="afterImage"
@@ -25,7 +52,7 @@
       />
     </div>
 
-    <div v-else class="flex size-full items-center justify-center">
+    <div v-else class="flex min-h-0 flex-1 items-center justify-center">
       {{ $t('imageCompare.noImages') }}
     </div>
   </div>
@@ -37,9 +64,11 @@ import { computed, ref, watch } from 'vue'
 
 import type { SimplifiedWidget } from '@/types/simplifiedWidget'
 
+import BatchNavigation from './BatchNavigation.vue'
+
 export interface ImageCompareValue {
-  before: string
-  after: string
+  beforeImages?: string[]
+  afterImages?: string[]
   beforeAlt?: string
   afterAlt?: string
   initialPosition?: number
@@ -52,6 +81,8 @@ const props = defineProps<{
 
 const containerRef = ref<HTMLElement | null>(null)
 const sliderPosition = ref(50)
+const beforeIndex = ref(0)
+const afterIndex = ref(0)
 
 const { elementX, elementWidth, isOutside } = useMouseInElement(containerRef)
 
@@ -61,26 +92,66 @@ watch([elementX, elementWidth, isOutside], ([x, width, outside]) => {
   }
 })
 
+function isSingleImage(
+  value: ImageCompareValue | string | undefined
+): value is string {
+  return typeof value === 'string'
+}
+
+const parsedValue = computed(() => {
+  const value = props.widget.value
+  return isSingleImage(value) ? null : value
+})
+
+const beforeBatchCount = computed(
+  () => parsedValue.value?.beforeImages?.length ?? 0
+)
+
+const afterBatchCount = computed(
+  () => parsedValue.value?.afterImages?.length ?? 0
+)
+
+const showBatchNav = computed(
+  () => beforeBatchCount.value > 1 || afterBatchCount.value > 1
+)
+
+// Reset indices when batch data changes
+watch(
+  () => parsedValue.value?.beforeImages,
+  () => {
+    beforeIndex.value = 0
+  }
+)
+
+watch(
+  () => parsedValue.value?.afterImages,
+  () => {
+    afterIndex.value = 0
+  }
+)
+
 const beforeImage = computed(() => {
   const value = props.widget.value
-  return typeof value === 'string' ? value : value?.before || ''
+  if (isSingleImage(value)) return value
+  return value?.beforeImages?.[beforeIndex.value] ?? ''
 })
 
 const afterImage = computed(() => {
   const value = props.widget.value
-  return typeof value === 'string' ? '' : value?.after || ''
+  if (isSingleImage(value)) return ''
+  return value?.afterImages?.[afterIndex.value] ?? ''
 })
 
 const beforeAlt = computed(() => {
   const value = props.widget.value
-  return typeof value === 'object' && value?.beforeAlt
+  return !isSingleImage(value) && value?.beforeAlt
     ? value.beforeAlt
     : 'Before image'
 })
 
 const afterAlt = computed(() => {
   const value = props.widget.value
-  return typeof value === 'object' && value?.afterAlt
+  return !isSingleImage(value) && value?.afterAlt
     ? value.afterAlt
     : 'After image'
 })
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumber.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumber.vue
index 007d3adf2a..aad5fac009 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumber.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumber.vue
@@ -6,6 +6,7 @@ import type {
   SimplifiedWidget
 } from '@/types/simplifiedWidget'
 
+import WidgetInputNumberGradientSlider from './WidgetInputNumberGradientSlider.vue'
 import WidgetInputNumberInput from './WidgetInputNumberInput.vue'
 import WidgetInputNumberSlider from './WidgetInputNumberSlider.vue'
 import WidgetWithControl from './WidgetWithControl.vue'
@@ -16,28 +17,33 @@ const props = defineProps<{
 
 const modelValue = defineModel<number>({ default: 0 })
 
-const hasControlAfterGenerate = computed(() => {
-  return !!props.widget.controlWidget
+const controlWidget = computed<SimplifiedControlWidget<number> | null>(() =>
+  props.widget.controlWidget
+    ? (props.widget as SimplifiedControlWidget<number>)
+    : null
+)
+
+const widgetComponent = computed(() => {
+  switch (props.widget.type) {
+    case 'gradientslider':
+      return WidgetInputNumberGradientSlider
+    case 'slider':
+      return WidgetInputNumberSlider
+    default:
+      return WidgetInputNumberInput
+  }
 })
 </script>
 
 <template>
   <WidgetWithControl
-    v-if="hasControlAfterGenerate"
+    v-if="controlWidget"
     v-model="modelValue"
-    :widget="widget as SimplifiedControlWidget<number>"
-    :component="
-      widget.type === 'slider'
-        ? WidgetInputNumberSlider
-        : WidgetInputNumberInput
-    "
+    :widget="controlWidget"
+    :component="widgetComponent"
   />
   <component
-    :is="
-      widget.type === 'slider'
-        ? WidgetInputNumberSlider
-        : WidgetInputNumberInput
-    "
+    :is="widgetComponent"
     v-else
     v-model="modelValue"
     :widget="widget"
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumberGradientSlider.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumberGradientSlider.vue
new file mode 100644
index 0000000000..d31d49e2e5
--- /dev/null
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumberGradientSlider.vue
@@ -0,0 +1,93 @@
+<template>
+  <WidgetLayoutField :widget="widget">
+    <div :class="cn(WidgetInputBaseClass, 'flex items-center gap-2 pr-2 pl-3')">
+      <GradientSlider
+        v-model="modelValue"
+        :stops="gradientStops"
+        :min="widget.options?.min ?? 0"
+        :max="widget.options?.max ?? 100"
+        :step="stepValue"
+        :disabled="widget.options?.disabled"
+        :aria-label="widget.name"
+        class="min-w-0 flex-1"
+      />
+      <InputNumber
+        :key="timesEmptied"
+        :model-value="modelValue"
+        v-bind="filteredProps"
+        :step="stepValue"
+        :min-fraction-digits="precision"
+        :max-fraction-digits="precision"
+        :aria-label="widget.name"
+        size="small"
+        pt:pc-input-text:root="min-w-[4ch] bg-transparent border-none text-center truncate"
+        class="w-16 shrink-0"
+        :pt="numberPt"
+        @update:model-value="handleNumberInputUpdate"
+      />
+    </div>
+  </WidgetLayoutField>
+</template>
+
+<script setup lang="ts">
+import InputNumber from 'primevue/inputnumber'
+import { computed, ref } from 'vue'
+
+import GradientSlider from '@/components/gradientslider/GradientSlider.vue'
+import type { ColorStop } from '@/lib/litegraph/src/interfaces'
+import type { IWidgetGradientSliderOptions } from '@/lib/litegraph/src/types/widgets'
+import type { SimplifiedWidget } from '@/types/simplifiedWidget'
+import { cn } from '@/utils/tailwindUtil'
+import {
+  STANDARD_EXCLUDED_PROPS,
+  filterWidgetProps
+} from '@/utils/widgetPropFilter'
+
+import { useNumberStepCalculation } from '../composables/useNumberStepCalculation'
+import { useNumberWidgetButtonPt } from '../composables/useNumberWidgetButtonPt'
+import { WidgetInputBaseClass } from './layout'
+import WidgetLayoutField from './layout/WidgetLayoutField.vue'
+
+const DEFAULT_GRADIENT_STOPS: ColorStop[] = [
+  { offset: 0, color: [0, 0, 0] },
+  { offset: 1, color: [255, 255, 255] }
+]
+
+const { widget } = defineProps<{
+  widget: SimplifiedWidget<number, IWidgetGradientSliderOptions>
+}>()
+
+const modelValue = defineModel<number>({ default: 0 })
+
+const timesEmptied = ref(0)
+
+const handleNumberInputUpdate = (newValue: number | undefined) => {
+  if (newValue !== undefined) {
+    modelValue.value = newValue
+    return
+  }
+  timesEmptied.value += 1
+}
+
+const gradientStops = computed<ColorStop[]>(() => {
+  const stops = widget.options?.gradient_stops
+  if (stops && stops.length >= 2) return stops
+  return DEFAULT_GRADIENT_STOPS
+})
+
+const filteredProps = computed(() =>
+  filterWidgetProps(widget.options, STANDARD_EXCLUDED_PROPS)
+)
+
+const precision = computed(() => {
+  const p = widget.options?.precision
+  return typeof p === 'number' && p >= 0 ? p : undefined
+})
+
+const stepValue = useNumberStepCalculation(widget.options, precision, true)
+
+const numberPt = useNumberWidgetButtonPt({
+  roundedLeft: true,
+  roundedRight: true
+})
+</script>
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumberInput.test.ts b/src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumberInput.test.ts
index 6fbadb5172..53d3b92692 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumberInput.test.ts
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumberInput.test.ts
@@ -1,33 +1,35 @@
-import { mount } from '@vue/test-utils'
-import PrimeVue from 'primevue/config'
-import InputNumber from 'primevue/inputnumber'
 import { describe, expect, it } from 'vitest'
+import { mount } from '@vue/test-utils'
+import { createI18n } from 'vue-i18n'
 
 import type { SimplifiedWidget } from '@/types/simplifiedWidget'
 
 import WidgetInputNumberInput from './WidgetInputNumberInput.vue'
+import { createMockWidget } from './widgetTestUtils'
 
-function createMockWidget(
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en'
+})
+
+function createNumberInputWidget(
   value: number = 0,
   type: 'int' | 'float' = 'int',
   options: SimplifiedWidget['options'] = {},
   callback?: (value: number) => void
 ): SimplifiedWidget<number> {
-  return {
+  return createMockWidget<number>({
+    value,
     name: 'test_input_number',
     type,
-    value,
     options,
     callback
-  }
+  })
 }
 
 function mountComponent(widget: SimplifiedWidget<number>, modelValue: number) {
   return mount(WidgetInputNumberInput, {
-    global: {
-      plugins: [PrimeVue],
-      components: { InputNumber }
-    },
+    global: { plugins: [i18n] },
     props: {
       widget,
       modelValue
@@ -36,13 +38,13 @@ function mountComponent(widget: SimplifiedWidget<number>, modelValue: number) {
 }
 
 function getNumberInput(wrapper: ReturnType<typeof mount>) {
-  const input = wrapper.get<HTMLInputElement>('input[inputmode="numeric"]')
+  const input = wrapper.get<HTMLInputElement>('input[inputmode="decimal"]')
   return input.element
 }
 
 describe('WidgetInputNumberInput Value Binding', () => {
   it('displays initial value in input field', () => {
-    const widget = createMockWidget(42, 'int')
+    const widget = createNumberInputWidget(42, 'int')
     const wrapper = mountComponent(widget, 42)
 
     const input = getNumberInput(wrapper)
@@ -50,10 +52,10 @@ describe('WidgetInputNumberInput Value Binding', () => {
   })
 
   it('emits update:modelValue when value changes', async () => {
-    const widget = createMockWidget(10, 'int')
+    const widget = createNumberInputWidget(10, 'int')
     const wrapper = mountComponent(widget, 10)
 
-    const inputNumber = wrapper.findComponent(InputNumber)
+    const inputNumber = wrapper
     await inputNumber.vm.$emit('update:modelValue', 20)
 
     const emitted = wrapper.emitted('update:modelValue')
@@ -62,7 +64,7 @@ describe('WidgetInputNumberInput Value Binding', () => {
   })
 
   it('handles negative values', () => {
-    const widget = createMockWidget(-5, 'int')
+    const widget = createNumberInputWidget(-5, 'int')
     const wrapper = mountComponent(widget, -5)
 
     const input = getNumberInput(wrapper)
@@ -70,7 +72,7 @@ describe('WidgetInputNumberInput Value Binding', () => {
   })
 
   it('handles decimal values for float type', () => {
-    const widget = createMockWidget(3.14, 'float')
+    const widget = createNumberInputWidget(3.14, 'float')
     const wrapper = mountComponent(widget, 3.14)
 
     const input = getNumberInput(wrapper)
@@ -78,78 +80,9 @@ describe('WidgetInputNumberInput Value Binding', () => {
   })
 })
 
-describe('WidgetInputNumberInput Component Rendering', () => {
-  it('renders InputNumber component with show-buttons', () => {
-    const widget = createMockWidget(5, 'int')
-    const wrapper = mountComponent(widget, 5)
-
-    const inputNumber = wrapper.findComponent(InputNumber)
-    expect(inputNumber.exists()).toBe(true)
-    expect(inputNumber.props('showButtons')).toBe(true)
-  })
-
-  it('sets button layout to horizontal', () => {
-    const widget = createMockWidget(5, 'int')
-    const wrapper = mountComponent(widget, 5)
-
-    const inputNumber = wrapper.findComponent(InputNumber)
-    expect(inputNumber.props('buttonLayout')).toBe('horizontal')
-  })
-
-  it('sets size to small', () => {
-    const widget = createMockWidget(5, 'int')
-    const wrapper = mountComponent(widget, 5)
-
-    const inputNumber = wrapper.findComponent(InputNumber)
-    expect(inputNumber.props('size')).toBe('small')
-  })
-})
-
-describe('WidgetInputNumberInput Step Value', () => {
-  it('defaults to 0 for unrestricted stepping', () => {
-    const widget = createMockWidget(5, 'int')
-    const wrapper = mountComponent(widget, 5)
-
-    const inputNumber = wrapper.findComponent(InputNumber)
-    expect(inputNumber.props('step')).toBe(0)
-  })
-
-  it('uses step2 value when provided', () => {
-    const widget = createMockWidget(5, 'int', { step2: 0.5 })
-    const wrapper = mountComponent(widget, 5)
-
-    const inputNumber = wrapper.findComponent(InputNumber)
-    expect(inputNumber.props('step')).toBe(0.5)
-  })
-
-  it('calculates step from precision for precision 0', () => {
-    const widget = createMockWidget(5, 'int', { precision: 0 })
-    const wrapper = mountComponent(widget, 5)
-
-    const inputNumber = wrapper.findComponent(InputNumber)
-    expect(inputNumber.props('step')).toBe(1)
-  })
-
-  it('calculates step from precision for precision 1', () => {
-    const widget = createMockWidget(5, 'float', { precision: 1 })
-    const wrapper = mountComponent(widget, 5)
-
-    const inputNumber = wrapper.findComponent(InputNumber)
-    expect(inputNumber.props('step')).toBe(0.1)
-  })
-
-  it('calculates step from precision for precision 2', () => {
-    const widget = createMockWidget(5, 'float', { precision: 2 })
-    const wrapper = mountComponent(widget, 5)
-
-    const inputNumber = wrapper.findComponent(InputNumber)
-    expect(inputNumber.props('step')).toBe(0.01)
-  })
-})
-
 describe('WidgetInputNumberInput Grouping Behavior', () => {
   it('displays numbers without commas by default for int widgets', () => {
-    const widget = createMockWidget(1000, 'int')
+    const widget = createNumberInputWidget(1000, 'int')
     const wrapper = mountComponent(widget, 1000)
 
     const input = getNumberInput(wrapper)
@@ -158,7 +91,7 @@ describe('WidgetInputNumberInput Grouping Behavior', () => {
   })
 
   it('displays numbers without commas by default for float widgets', () => {
-    const widget = createMockWidget(1000.5, 'float')
+    const widget = createNumberInputWidget(1000.5, 'float')
     const wrapper = mountComponent(widget, 1000.5)
 
     const input = getNumberInput(wrapper)
@@ -167,7 +100,7 @@ describe('WidgetInputNumberInput Grouping Behavior', () => {
   })
 
   it('displays numbers with commas when grouping enabled', () => {
-    const widget = createMockWidget(1000, 'int', { useGrouping: true })
+    const widget = createNumberInputWidget(1000, 'int', { useGrouping: true })
     const wrapper = mountComponent(widget, 1000)
 
     const input = getNumberInput(wrapper)
@@ -176,7 +109,7 @@ describe('WidgetInputNumberInput Grouping Behavior', () => {
   })
 
   it('displays numbers without commas when grouping explicitly disabled', () => {
-    const widget = createMockWidget(1000, 'int', { useGrouping: false })
+    const widget = createNumberInputWidget(1000, 'int', { useGrouping: false })
     const wrapper = mountComponent(widget, 1000)
 
     const input = getNumberInput(wrapper)
@@ -185,7 +118,9 @@ describe('WidgetInputNumberInput Grouping Behavior', () => {
   })
 
   it('displays numbers without commas when useGrouping option is undefined', () => {
-    const widget = createMockWidget(1000, 'int', { useGrouping: undefined })
+    const widget = createNumberInputWidget(1000, 'int', {
+      useGrouping: undefined
+    })
     const wrapper = mountComponent(widget, 1000)
 
     const input = getNumberInput(wrapper)
@@ -199,41 +134,37 @@ describe('WidgetInputNumberInput Large Integer Precision Handling', () => {
   const UNSAFE_LARGE_INTEGER = 18446744073709552000 // Example seed value that exceeds safe range
 
   it('shows buttons for safe integer values', () => {
-    const widget = createMockWidget(1000, 'int')
+    const widget = createNumberInputWidget(1000, 'int')
     const wrapper = mountComponent(widget, 1000)
 
-    const inputNumber = wrapper.findComponent(InputNumber)
-    expect(inputNumber.props('showButtons')).toBe(true)
+    expect(wrapper.findAll('button').length).toBe(2)
   })
 
   it('shows buttons for values at safe integer limit', () => {
-    const widget = createMockWidget(SAFE_INTEGER_MAX, 'int')
+    const widget = createNumberInputWidget(SAFE_INTEGER_MAX, 'int')
     const wrapper = mountComponent(widget, SAFE_INTEGER_MAX)
 
-    const inputNumber = wrapper.findComponent(InputNumber)
-    expect(inputNumber.props('showButtons')).toBe(true)
+    expect(wrapper.findAll('button').length).toBe(2)
   })
 
   it('hides buttons for unsafe large integer values', () => {
-    const widget = createMockWidget(UNSAFE_LARGE_INTEGER, 'int')
+    const widget = createNumberInputWidget(UNSAFE_LARGE_INTEGER, 'int')
     const wrapper = mountComponent(widget, UNSAFE_LARGE_INTEGER)
 
-    const inputNumber = wrapper.findComponent(InputNumber)
-    expect(inputNumber.props('showButtons')).toBe(false)
+    expect(wrapper.findAll('button').length).toBe(0)
   })
 
   it('hides buttons for unsafe negative integer values', () => {
     const unsafeNegative = -UNSAFE_LARGE_INTEGER
-    const widget = createMockWidget(unsafeNegative, 'int')
+    const widget = createNumberInputWidget(unsafeNegative, 'int')
     const wrapper = mountComponent(widget, unsafeNegative)
 
-    const inputNumber = wrapper.findComponent(InputNumber)
-    expect(inputNumber.props('showButtons')).toBe(false)
+    expect(wrapper.findAll('button').length).toBe(0)
   })
 
   it('shows tooltip for disabled buttons due to precision limits', (context) => {
     context.skip('needs diagnosis')
-    const widget = createMockWidget(UNSAFE_LARGE_INTEGER, 'int')
+    const widget = createNumberInputWidget(UNSAFE_LARGE_INTEGER, 'int')
     const wrapper = mountComponent(widget, UNSAFE_LARGE_INTEGER)
 
     // Check that tooltip wrapper div exists
@@ -242,7 +173,7 @@ describe('WidgetInputNumberInput Large Integer Precision Handling', () => {
   })
 
   it('does not show tooltip for safe integer values', () => {
-    const widget = createMockWidget(1000, 'int')
+    const widget = createNumberInputWidget(1000, 'int')
     const wrapper = mountComponent(widget, 1000)
 
     // For safe values, tooltip should not be set (computed returns null)
@@ -250,88 +181,55 @@ describe('WidgetInputNumberInput Large Integer Precision Handling', () => {
     expect(tooltipDiv.attributes('v-tooltip')).toBeUndefined()
   })
 
-  it('handles edge case of zero value', () => {
-    const widget = createMockWidget(0, 'int')
-    const wrapper = mountComponent(widget, 0)
+  it('handles floating point values correctly', () => {
+    const widget = createNumberInputWidget(1000.5, 'float')
+    const wrapper = mountComponent(widget, 1000.5)
 
-    const inputNumber = wrapper.findComponent(InputNumber)
-    expect(inputNumber.props('showButtons')).toBe(true)
+    expect(wrapper.findAll('button').length).toBe(2)
   })
 
-  it('correctly identifies safe vs unsafe integers using Number.isSafeInteger', () => {
-    // Test the JavaScript behavior our component relies on
-    expect(Number.isSafeInteger(SAFE_INTEGER_MAX)).toBe(true)
-    expect(Number.isSafeInteger(SAFE_INTEGER_MAX + 1)).toBe(false)
-    expect(Number.isSafeInteger(UNSAFE_LARGE_INTEGER)).toBe(false)
-    expect(Number.isSafeInteger(-SAFE_INTEGER_MAX)).toBe(true)
-    expect(Number.isSafeInteger(-SAFE_INTEGER_MAX - 1)).toBe(false)
-  })
-
-  it('handles floating point values correctly', (context) => {
-    context.skip('needs diagnosis')
-
-    const safeFloat = 1000.5
-    const widget = createMockWidget(safeFloat, 'float')
-    const wrapper = mountComponent(widget, safeFloat)
-
-    const inputNumber = wrapper.findComponent(InputNumber)
-    expect(inputNumber.props('showButtons')).toBe(true)
-  })
-
-  it('hides buttons for unsafe floating point values', (context) => {
-    context.skip('needs diagnosis')
-
+  it('hides buttons for unsafe floating point values', () => {
     const unsafeFloat = UNSAFE_LARGE_INTEGER + 0.5
-    const widget = createMockWidget(unsafeFloat, 'float')
+    const widget = createNumberInputWidget(unsafeFloat, 'float')
     const wrapper = mountComponent(widget, unsafeFloat)
 
-    const inputNumber = wrapper.findComponent(InputNumber)
-    expect(inputNumber.props('showButtons')).toBe(false)
+    expect(wrapper.findAll('button').length).toBe(0)
   })
 })
 
 describe('WidgetInputNumberInput Edge Cases for Precision Handling', () => {
   it('handles null/undefined model values gracefully', () => {
-    const widget = createMockWidget(0, 'int')
-    // Mount with undefined as modelValue
+    const widget = createNumberInputWidget(0, 'int')
     const wrapper = mount(WidgetInputNumberInput, {
-      global: {
-        plugins: [PrimeVue],
-        components: { InputNumber }
-      },
+      global: { plugins: [i18n] },
       props: {
         widget,
-        modelValue: undefined as any
-      }
+        modelValue: undefined
+      } as { widget: SimplifiedWidget<number>; modelValue: number | undefined }
     })
 
-    const inputNumber = wrapper.findComponent(InputNumber)
-    expect(inputNumber.props('showButtons')).toBe(true) // Should default to safe behavior
+    expect(wrapper.findAll('button').length).toBe(2)
   })
 
   it('handles NaN values gracefully', (context) => {
     context.skip('needs diagnosis')
-    const widget = createMockWidget(NaN, 'int')
+    const widget = createNumberInputWidget(NaN, 'int')
     const wrapper = mountComponent(widget, NaN)
 
-    const inputNumber = wrapper.findComponent(InputNumber)
-    // NaN is not a safe integer, so buttons should be hidden
-    expect(inputNumber.props('showButtons')).toBe(false)
+    expect(wrapper.findAll('button').length).toBe(0)
   })
 
   it('handles Infinity values', () => {
-    const widget = createMockWidget(Infinity, 'int')
+    const widget = createNumberInputWidget(Infinity, 'int')
     const wrapper = mountComponent(widget, Infinity)
 
-    const inputNumber = wrapper.findComponent(InputNumber)
-    expect(inputNumber.props('showButtons')).toBe(false)
+    expect(wrapper.findAll('button').length).toBe(0)
   })
 
   it('handles negative Infinity values', () => {
-    const widget = createMockWidget(-Infinity, 'int')
+    const widget = createNumberInputWidget(-Infinity, 'int')
     const wrapper = mountComponent(widget, -Infinity)
 
-    const inputNumber = wrapper.findComponent(InputNumber)
-    expect(inputNumber.props('showButtons')).toBe(false)
+    expect(wrapper.findAll('button').length).toBe(0)
   })
 })
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumberInput.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumberInput.vue
index fb6be5cb8d..3728e78f9b 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumberInput.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumberInput.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts">
-import InputNumber from 'primevue/inputnumber'
 import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
 
+import ScrubableNumberInput from '@/components/common/ScrubableNumberInput.vue'
+import { evaluateInput } from '@/lib/litegraph/src/utils/widget'
 import type { SimplifiedWidget } from '@/types/simplifiedWidget'
 import { cn } from '@/utils/tailwindUtil'
 import {
@@ -12,15 +14,65 @@ import {
 import { WidgetInputBaseClass } from './layout'
 import WidgetLayoutField from './layout/WidgetLayoutField.vue'
 
+const { locale } = useI18n()
+
 const props = defineProps<{
   widget: SimplifiedWidget<number>
+  rootClass?: string
 }>()
 
+function formatNumber(value: number, options?: Intl.NumberFormatOptions) {
+  return new Intl.NumberFormat(locale.value, options).format(value)
+}
+
+const decimalSeparator = computed(() =>
+  formatNumber(1.1).replace(/\p{Number}/gu, '')
+)
+const groupSeparator = computed(() =>
+  formatNumber(11111).replace(/\p{Number}/gu, '')
+)
+function unformatValue(value: string) {
+  return value
+    .replaceAll(groupSeparator.value, '')
+    .replaceAll(decimalSeparator.value, '.')
+}
+
 const modelValue = defineModel<number>({ default: 0 })
 
-const filteredProps = computed(() =>
-  filterWidgetProps(props.widget.options, INPUT_EXCLUDED_PROPS)
-)
+const formattedValue = computed(() => {
+  const value = modelValue.value
+  if ((value as unknown) === '' || !isFinite(value)) return `${value}`
+
+  const options: Intl.NumberFormatOptions = {
+    useGrouping: useGrouping.value
+  }
+  if (precision.value !== undefined) {
+    options.minimumFractionDigits = precision.value
+    options.maximumFractionDigits = precision.value
+  }
+  return formatNumber(value, options)
+})
+
+function parseWidgetValue(raw: string): number | undefined {
+  return evaluateInput(unformatValue(raw))
+}
+
+interface NumericWidgetOptions {
+  min: number
+  max: number
+  step?: number
+  step2?: number
+  precision?: number
+  disabled?: boolean
+  useGrouping?: boolean
+}
+
+const filteredProps = computed(() => {
+  const filtered = filterWidgetProps(props.widget.options, INPUT_EXCLUDED_PROPS)
+  return filtered as Partial<NumericWidgetOptions>
+})
+
+const isDisabled = computed(() => props.widget.options?.disabled ?? false)
 
 // Get the precision value for proper number formatting
 const precision = computed(() => {
@@ -38,7 +90,7 @@ const stepValue = computed(() => {
   // Use step / 10 for custom large step values (> 10) to match litegraph behavior
   // This is important for extensions like Impact Pack that use custom step values (e.g., 640)
   // We skip default step values (1, 10) to avoid affecting normal widgets
-  const step = props.widget.options?.step
+  const step = props.widget.options?.step as number | undefined
   if (step !== undefined && step > 10) {
     return Number(step) / 10
   }
@@ -69,64 +121,72 @@ const buttonsDisabled = computed(() => {
   )
 })
 
+function updateValueBy(delta: number) {
+  const max = filteredProps.value.max ?? Number.MAX_VALUE
+  const min = filteredProps.value.min ?? -Number.MAX_VALUE
+  modelValue.value = Math.min(max, Math.max(min, modelValue.value + delta))
+}
+
 const buttonTooltip = computed(() => {
   if (buttonsDisabled.value) {
     return 'Increment/decrement disabled: value exceeds JavaScript precision limit (±2^53)'
   }
   return null
 })
+
+const sliderWidth = computed(() => {
+  const { max, min, step } = filteredProps.value
+  if (
+    min === undefined ||
+    max === undefined ||
+    step === undefined ||
+    (max - min) / step >= 100
+  )
+    return 0
+  const ratio = (modelValue.value - min) / (max - min)
+  return (ratio * 100).toFixed(0)
+})
+
+const inputAriaAttrs = computed(() => ({
+  'aria-valuenow': modelValue.value,
+  'aria-valuemin': filteredProps.value.min,
+  'aria-valuemax': filteredProps.value.max,
+  role: 'spinbutton',
+  tabindex: 0
+}))
 </script>
 
 <template>
-  <WidgetLayoutField :widget>
-    <InputNumber
+  <WidgetLayoutField :widget :root-class="props.rootClass">
+    <ScrubableNumberInput
       v-model="modelValue"
       v-tooltip="buttonTooltip"
-      v-bind="filteredProps"
-      fluid
-      button-layout="horizontal"
-      size="small"
-      variant="outlined"
-      :step="stepValue"
-      :min-fraction-digits="precision"
-      :max-fraction-digits="precision"
-      :use-grouping="useGrouping"
-      :class="cn(WidgetInputBaseClass, 'grow text-xs')"
       :aria-label="widget.name"
-      :show-buttons="!buttonsDisabled"
-      :pt="{
-        root: {
-          class: cn(
-            '[&>input]:bg-transparent [&>input]:border-0',
-            '[&>input]:truncate [&>input]:min-w-[4ch]',
-            $slots.default && '[&>input]:pr-7'
-          )
-        },
-        decrementButton: {
-          class: 'w-8 border-0'
-        },
-        incrementButton: {
-          class: 'w-8 border-0'
-        }
-      }"
+      :min="filteredProps.min"
+      :max="filteredProps.max"
+      :step="stepValue"
+      :display-value="formattedValue"
+      :disabled="isDisabled"
+      :hide-buttons="buttonsDisabled"
+      :parse-value="parseWidgetValue"
+      :input-attrs="inputAriaAttrs"
+      :class="cn(WidgetInputBaseClass, 'relative flex h-7 grow text-xs')"
+      @keydown.up.prevent="updateValueBy(stepValue)"
+      @keydown.down.prevent="updateValueBy(-stepValue)"
+      @keydown.page-up.prevent="updateValueBy(10 * stepValue)"
+      @keydown.page-down.prevent="updateValueBy(-10 * stepValue)"
     >
-      <template #incrementicon>
-        <span class="pi pi-plus text-sm" />
+      <template #background>
+        <div
+          class="pointer-events-none absolute size-full overflow-clip rounded-lg"
+        >
+          <div
+            class="size-full bg-primary-background/15"
+            :style="{ width: `${sliderWidth}%` }"
+          />
+        </div>
       </template>
-      <template #decrementicon>
-        <span class="pi pi-minus text-sm" />
-      </template>
-    </InputNumber>
-    <div class="absolute top-5 right-8 h-4 w-7 -translate-y-4/5 flex">
       <slot />
-    </div>
+    </ScrubableNumberInput>
   </WidgetLayoutField>
 </template>
-
-<style scoped>
-:deep(.p-inputnumber-input) {
-  height: 1.625rem;
-  margin: 1px 0;
-  box-shadow: none;
-}
-</style>
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumberSlider.test.ts b/src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumberSlider.test.ts
index 324ecda61a..4d254d31bc 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumberSlider.test.ts
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumberSlider.test.ts
@@ -7,19 +7,20 @@ import Slider from '@/components/ui/slider/Slider.vue'
 import type { SimplifiedWidget } from '@/types/simplifiedWidget'
 
 import WidgetInputNumberSlider from './WidgetInputNumberSlider.vue'
+import { createMockWidget } from './widgetTestUtils'
 
-function createMockWidget(
+function createSliderWidget(
   value: number = 5,
   options: SimplifiedWidget['options'] = {},
   callback?: (value: number) => void
 ): SimplifiedWidget<number> {
-  return {
+  return createMockWidget<number>({
+    value,
     name: 'test_slider',
     type: 'float',
-    value,
     options: { min: 0, max: 100, step: 1, precision: 0, ...options },
     callback
-  }
+  })
 }
 
 function mountComponent(
@@ -53,7 +54,7 @@ function getNumberInput(wrapper: ReturnType<typeof mount>) {
 describe('WidgetInputNumberSlider Value Binding', () => {
   describe('Props and Values', () => {
     it('passes modelValue to slider component', () => {
-      const widget = createMockWidget(5)
+      const widget = createSliderWidget(5)
       const wrapper = mountComponent(widget, 5)
 
       const slider = wrapper.findComponent({ name: 'Slider' })
@@ -61,10 +62,10 @@ describe('WidgetInputNumberSlider Value Binding', () => {
     })
 
     it('handles different initial values', () => {
-      const widget1 = createMockWidget(5)
+      const widget1 = createSliderWidget(5)
       const wrapper1 = mountComponent(widget1, 5)
 
-      const widget2 = createMockWidget(10)
+      const widget2 = createSliderWidget(10)
       const wrapper2 = mountComponent(widget2, 10)
 
       const slider1 = wrapper1.findComponent({ name: 'Slider' })
@@ -77,21 +78,21 @@ describe('WidgetInputNumberSlider Value Binding', () => {
 
   describe('Component Rendering', () => {
     it('renders slider component', () => {
-      const widget = createMockWidget(5)
+      const widget = createSliderWidget(5)
       const wrapper = mountComponent(widget, 5)
 
       expect(wrapper.findComponent({ name: 'Slider' }).exists()).toBe(true)
     })
 
     it('renders input field', () => {
-      const widget = createMockWidget(5)
+      const widget = createSliderWidget(5)
       const wrapper = mountComponent(widget, 5)
 
       expect(wrapper.find('input[inputmode="numeric"]').exists()).toBe(true)
     })
 
     it('displays initial value in input field', () => {
-      const widget = createMockWidget(42)
+      const widget = createSliderWidget(42)
       const wrapper = mountComponent(widget, 42)
 
       const input = getNumberInput(wrapper)
@@ -101,7 +102,7 @@ describe('WidgetInputNumberSlider Value Binding', () => {
 
   describe('Widget Options', () => {
     it('passes widget options to PrimeVue components', () => {
-      const widget = createMockWidget(5, { min: -10, max: 50 })
+      const widget = createSliderWidget(5, { min: -10, max: 50 })
       const wrapper = mountComponent(widget, 5)
 
       const slider = wrapper.findComponent({ name: 'Slider' })
@@ -110,7 +111,7 @@ describe('WidgetInputNumberSlider Value Binding', () => {
     })
 
     it('handles negative value ranges', () => {
-      const widget = createMockWidget(0, { min: -100, max: 100 })
+      const widget = createSliderWidget(0, { min: -100, max: 100 })
       const wrapper = mountComponent(widget, 0)
 
       const slider = wrapper.findComponent({ name: 'Slider' })
@@ -120,7 +121,7 @@ describe('WidgetInputNumberSlider Value Binding', () => {
 
     describe('Step Size', () => {
       it('should default to 1', () => {
-        const widget = createMockWidget(5)
+        const widget = createSliderWidget(5)
         const wrapper = mountComponent(widget, 5)
 
         const slider = wrapper.findComponent({ name: 'Slider' })
@@ -128,7 +129,7 @@ describe('WidgetInputNumberSlider Value Binding', () => {
       })
 
       it('should get the step2 value if present', () => {
-        const widget = createMockWidget(5, { step2: 0.01 })
+        const widget = createSliderWidget(5, { step2: 0.01 })
         const wrapper = mountComponent(widget, 5)
 
         const slider = wrapper.findComponent({ name: 'Slider' })
@@ -136,7 +137,7 @@ describe('WidgetInputNumberSlider Value Binding', () => {
       })
 
       it('should be 1 for precision 0', () => {
-        const widget = createMockWidget(5, { precision: 0 })
+        const widget = createSliderWidget(5, { precision: 0 })
         const wrapper = mountComponent(widget, 5)
 
         const slider = wrapper.findComponent({ name: 'Slider' })
@@ -144,7 +145,7 @@ describe('WidgetInputNumberSlider Value Binding', () => {
       })
 
       it('should be .1 for precision 1', () => {
-        const widget = createMockWidget(5, { precision: 1 })
+        const widget = createSliderWidget(5, { precision: 1 })
         const wrapper = mountComponent(widget, 5)
 
         const slider = wrapper.findComponent({ name: 'Slider' })
@@ -152,7 +153,7 @@ describe('WidgetInputNumberSlider Value Binding', () => {
       })
 
       it('should be .00001 for precision 5', () => {
-        const widget = createMockWidget(5, { precision: 5 })
+        const widget = createSliderWidget(5, { precision: 5 })
         const wrapper = mountComponent(widget, 5)
 
         const slider = wrapper.findComponent({ name: 'Slider' })
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumberSlider.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumberSlider.vue
index a7f1463552..83622f4bc9 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumberSlider.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumberSlider.vue
@@ -1,10 +1,10 @@
 <template>
   <WidgetLayoutField :widget="widget">
-    <div :class="cn(WidgetInputBaseClass, 'flex items-center gap-2 pl-3 pr-2')">
+    <div :class="cn(WidgetInputBaseClass, 'flex items-center gap-2 pr-2 pl-3')">
       <Slider
         :model-value="[modelValue]"
         v-bind="filteredProps"
-        class="flex-grow text-xs"
+        class="grow text-xs"
         :step="stepValue"
         :aria-label="widget.name"
         @update:model-value="updateLocalValue"
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetInputText.stories.ts b/src/renderer/extensions/vueNodes/widgets/components/WidgetInputText.stories.ts
new file mode 100644
index 0000000000..6e15ece0dc
--- /dev/null
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetInputText.stories.ts
@@ -0,0 +1,172 @@
+import type {
+  ComponentPropsAndSlots,
+  Meta,
+  StoryObj
+} from '@storybook/vue3-vite'
+import { computed, ref, toRefs } from 'vue'
+
+import type { SimplifiedWidget } from '@/types/simplifiedWidget'
+
+import WidgetInputText from './WidgetInputText.vue'
+
+interface StoryArgs extends ComponentPropsAndSlots<typeof WidgetInputText> {
+  readOnly: boolean
+  disabled: boolean
+  invalid: boolean
+  placeholder: string
+}
+
+const meta: Meta<StoryArgs> = {
+  title: 'Widgets/WidgetInputText',
+  component: WidgetInputText,
+  tags: ['autodocs'],
+  parameters: { layout: 'centered' },
+  argTypes: {
+    size: {
+      control: 'select',
+      options: ['medium', 'large']
+    },
+    readOnly: { control: 'boolean' },
+    disabled: { control: 'boolean' },
+    invalid: { control: 'boolean' },
+    loading: { control: 'boolean' },
+    placeholder: { control: 'text' }
+  },
+  args: {
+    size: 'medium',
+    readOnly: false,
+    disabled: false,
+    invalid: false,
+    loading: false,
+    placeholder: ''
+  },
+  decorators: [
+    (story) => ({
+      components: { story },
+      template:
+        '<div class="grid grid-cols-[auto_1fr] gap-1 w-80"><story /></div>'
+    })
+  ]
+}
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const Default: Story = {
+  render: (args) => ({
+    components: { WidgetInputText },
+    setup() {
+      const { size, readOnly, disabled, invalid, loading, placeholder } =
+        toRefs(args)
+      const value = ref('Hello world')
+      const widget = computed<SimplifiedWidget<string>>(() => ({
+        name: 'text',
+        type: 'STRING',
+        value: '',
+        options: {
+          read_only: readOnly.value,
+          disabled: disabled.value,
+          ...(placeholder.value ? { placeholder: placeholder.value } : {})
+        }
+      }))
+      return { value, widget, size, invalid, loading }
+    },
+    template:
+      '<WidgetInputText :widget="widget" :size="size" :invalid="invalid" :loading="loading" v-model="value" />'
+  })
+}
+
+export const Disabled: Story = {
+  args: { disabled: true },
+  render: (args) => ({
+    components: { WidgetInputText },
+    setup() {
+      const { disabled } = toRefs(args)
+      const value = ref('This text is disabled')
+      const widget = computed<SimplifiedWidget<string>>(() => ({
+        name: 'locked',
+        type: 'STRING',
+        value: '',
+        options: { disabled: disabled.value }
+      }))
+      return { value, widget }
+    },
+    template: '<WidgetInputText :widget="widget" v-model="value" />'
+  })
+}
+
+export const Invalid: Story = {
+  args: { invalid: true },
+  render: (args) => ({
+    components: { WidgetInputText },
+    setup() {
+      const { invalid } = toRefs(args)
+      const value = ref('Invalid input value')
+      const widget: SimplifiedWidget<string> = {
+        name: 'text',
+        type: 'STRING',
+        value: ''
+      }
+      return { value, widget, invalid }
+    },
+    template:
+      '<WidgetInputText :widget="widget" :invalid="invalid" v-model="value" />'
+  })
+}
+
+export const Status: Story = {
+  args: { loading: true },
+  render: (args) => ({
+    components: { WidgetInputText },
+    setup() {
+      const { loading } = toRefs(args)
+      const value = ref('Loading...')
+      const widget: SimplifiedWidget<string> = {
+        name: 'text',
+        type: 'STRING',
+        value: ''
+      }
+      return { value, widget, loading }
+    },
+    template:
+      '<WidgetInputText :widget="widget" :loading="loading" v-model="value" />'
+  })
+}
+
+export const WithPlaceholder: Story = {
+  args: { placeholder: 'Enter your prompt here...' },
+  render: (args) => ({
+    components: { WidgetInputText },
+    setup() {
+      const { placeholder } = toRefs(args)
+      const value = ref('')
+      const widget = computed<SimplifiedWidget<string>>(() => ({
+        name: 'prompt',
+        type: 'STRING',
+        value: '',
+        options: {
+          ...(placeholder.value ? { placeholder: placeholder.value } : {})
+        }
+      }))
+      return { value, widget }
+    },
+    template: '<WidgetInputText :widget="widget" v-model="value" />'
+  })
+}
+
+export const WithLabel: Story = {
+  render: () => ({
+    components: { WidgetInputText },
+    setup() {
+      const value = ref('Some value')
+      const widget: SimplifiedWidget<string> = {
+        name: 'seed',
+        type: 'STRING',
+        value: '',
+        label: 'Random Seed'
+      }
+      return { value, widget }
+    },
+    template: '<WidgetInputText :widget="widget" v-model="value" />'
+  })
+}
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetInputText.test.ts b/src/renderer/extensions/vueNodes/widgets/components/WidgetInputText.test.ts
index 599f85306f..9ffae1b1a8 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetInputText.test.ts
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetInputText.test.ts
@@ -5,22 +5,24 @@ import type { InputTextProps } from 'primevue/inputtext'
 import Textarea from 'primevue/textarea'
 import { describe, expect, it } from 'vitest'
 
+import type { IWidgetOptions } from '@/lib/litegraph/src/types/widgets'
 import type { SimplifiedWidget } from '@/types/simplifiedWidget'
 
 import WidgetInputText from './WidgetInputText.vue'
+import { createMockWidget } from './widgetTestUtils'
 
 describe('WidgetInputText Value Binding', () => {
-  const createMockWidget = (
+  const createInputTextWidget = (
     value: string = 'default',
-    options: Partial<InputTextProps> = {},
+    options: Partial<InputTextProps> & IWidgetOptions = {},
     callback?: (value: string) => void
-  ): SimplifiedWidget<string> => ({
-    name: 'test_input',
-    type: 'string',
-    value,
-    options,
-    callback
-  })
+  ) =>
+    createMockWidget<string>({
+      value,
+      name: 'test_input',
+      options,
+      callback
+    })
 
   const mountComponent = (
     widget: SimplifiedWidget<string>,
@@ -56,7 +58,7 @@ describe('WidgetInputText Value Binding', () => {
 
   describe('Vue Event Emission', () => {
     it('emits Vue event when input value changes on blur', async () => {
-      const widget = createMockWidget('hello')
+      const widget = createInputTextWidget('hello')
       const wrapper = mountComponent(widget, 'hello')
 
       await setInputValueAndTrigger(wrapper, 'world', 'blur')
@@ -67,7 +69,7 @@ describe('WidgetInputText Value Binding', () => {
     })
 
     it('emits Vue event when enter key is pressed', async () => {
-      const widget = createMockWidget('initial')
+      const widget = createInputTextWidget('initial')
       const wrapper = mountComponent(widget, 'initial')
 
       await setInputValueAndTrigger(wrapper, 'new value', 'keydown.enter')
@@ -78,7 +80,7 @@ describe('WidgetInputText Value Binding', () => {
     })
 
     it('handles empty string values', async () => {
-      const widget = createMockWidget('something')
+      const widget = createInputTextWidget('something')
       const wrapper = mountComponent(widget, 'something')
 
       await setInputValueAndTrigger(wrapper, '')
@@ -89,7 +91,7 @@ describe('WidgetInputText Value Binding', () => {
     })
 
     it('handles special characters correctly', async () => {
-      const widget = createMockWidget('normal')
+      const widget = createInputTextWidget('normal')
       const wrapper = mountComponent(widget, 'normal')
 
       const specialText = 'special @#$%^&*()[]{}|\\:";\'<>?,./'
@@ -101,7 +103,7 @@ describe('WidgetInputText Value Binding', () => {
     })
 
     it('handles missing callback gracefully', async () => {
-      const widget = createMockWidget('test', {}, undefined)
+      const widget = createInputTextWidget('test', {}, undefined)
       const wrapper = mountComponent(widget, 'test')
 
       await setInputValueAndTrigger(wrapper, 'new value')
@@ -115,7 +117,7 @@ describe('WidgetInputText Value Binding', () => {
 
   describe('User Interactions', () => {
     it('emits update:modelValue on blur', async () => {
-      const widget = createMockWidget('original')
+      const widget = createInputTextWidget('original')
       const wrapper = mountComponent(widget, 'original')
 
       await setInputValueAndTrigger(wrapper, 'updated')
@@ -126,7 +128,7 @@ describe('WidgetInputText Value Binding', () => {
     })
 
     it('emits update:modelValue on enter key', async () => {
-      const widget = createMockWidget('start')
+      const widget = createInputTextWidget('start')
       const wrapper = mountComponent(widget, 'start')
 
       await setInputValueAndTrigger(wrapper, 'finish', 'keydown.enter')
@@ -139,7 +141,7 @@ describe('WidgetInputText Value Binding', () => {
 
   describe('Component Rendering', () => {
     it('always renders InputText component', () => {
-      const widget = createMockWidget('test value')
+      const widget = createInputTextWidget('test value')
       const wrapper = mountComponent(widget, 'test value')
 
       // WidgetInputText always uses InputText, not Textarea
@@ -154,7 +156,7 @@ describe('WidgetInputText Value Binding', () => {
 
   describe('Edge Cases', () => {
     it('handles very long strings', async () => {
-      const widget = createMockWidget('short')
+      const widget = createInputTextWidget('short')
       const wrapper = mountComponent(widget, 'short')
 
       const longString = 'a'.repeat(10000)
@@ -166,7 +168,7 @@ describe('WidgetInputText Value Binding', () => {
     })
 
     it('handles unicode characters', async () => {
-      const widget = createMockWidget('ascii')
+      const widget = createInputTextWidget('ascii')
       const wrapper = mountComponent(widget, 'ascii')
 
       const unicodeText = '🎨 Unicode: αβγ 中文 العربية 🚀'
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetInputText.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetInputText.vue
index eff22f1efc..aed2ad5956 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetInputText.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetInputText.vue
@@ -1,13 +1,28 @@
 <template>
-  <WidgetLayoutField :widget="widget">
-    <InputText
-      v-model="modelValue"
-      v-bind="filteredProps"
-      :class="cn(WidgetInputBaseClass, 'w-full text-xs py-2 px-4')"
-      :aria-label="widget.name"
-      size="small"
-      :pt="{ root: 'truncate min-w-[4ch]' }"
-    />
+  <WidgetLayoutField :widget="layoutWidget">
+    <div class="relative">
+      <Loader
+        v-if="loading"
+        size="sm"
+        class="absolute top-1/2 left-3 z-10 -translate-y-1/2 text-component-node-foreground"
+      />
+      <InputText
+        v-model="modelValue"
+        v-bind="filteredProps"
+        :class="
+          cn(
+            WidgetInputBaseClass,
+            'w-full px-4 hover:bg-component-node-widget-background-hovered',
+            size === 'large' ? 'py-3 text-sm' : 'py-2 text-xs',
+            loading && 'pl-9'
+          )
+        "
+        :aria-label="widget.name"
+        :readonly="isReadOnly"
+        size="small"
+        :pt="{ root: 'truncate min-w-[4ch]' }"
+      />
+    </div>
   </WidgetLayoutField>
 </template>
 
@@ -15,6 +30,7 @@
 import InputText from 'primevue/inputtext'
 import { computed } from 'vue'
 
+import Loader from '@/components/loader/Loader.vue'
 import type { SimplifiedWidget } from '@/types/simplifiedWidget'
 import { cn } from '@/utils/tailwindUtil'
 import {
@@ -25,13 +41,34 @@ import {
 import { WidgetInputBaseClass } from './layout'
 import WidgetLayoutField from './layout/WidgetLayoutField.vue'
 
-const props = defineProps<{
+const {
+  widget,
+  size = 'medium',
+  invalid = false,
+  loading = false
+} = defineProps<{
   widget: SimplifiedWidget<string>
+  size?: 'medium' | 'large'
+  invalid?: boolean
+  loading?: boolean
 }>()
 
 const modelValue = defineModel<string>({ default: '' })
 
 const filteredProps = computed(() =>
-  filterWidgetProps(props.widget.options, INPUT_EXCLUDED_PROPS)
+  filterWidgetProps(widget.options, INPUT_EXCLUDED_PROPS)
 )
+
+const isReadOnly = computed(() =>
+  Boolean(widget.options?.read_only || widget.options?.disabled)
+)
+
+const layoutWidget = computed(() => ({
+  name: widget.name,
+  label: widget.label,
+  borderStyle: cn(
+    widget.borderStyle,
+    invalid && 'border border-destructive-background'
+  )
+}))
 </script>
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetLegacy.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetLegacy.vue
index 64b673519a..00cb708c36 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetLegacy.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetLegacy.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useResizeObserver } from '@vueuse/core'
+import { useResizeObserver, whenever } from '@vueuse/core'
 import { onBeforeUnmount, onMounted, ref, watch } from 'vue'
 
 import { useChainCallback } from '@/composables/functional/useChainCallback'
@@ -9,31 +9,46 @@ import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
 import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import { augmentToCanvasPointerEvent } from '@/renderer/extensions/vueNodes/utils/eventUtils'
+import { resolveWidgetFromHostNode } from '@/renderer/extensions/vueNodes/widgets/utils/resolvePromotedWidget'
 import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
 import type { SimplifiedWidget } from '@/types/simplifiedWidget'
 
 const props = defineProps<{
   widget: SimplifiedWidget<void>
+  nodeId: string
 }>()
 
 const canvasEl = ref()
 const containerHeight = ref(20)
 
-const canvas: LGraphCanvas = useCanvasStore().canvas as LGraphCanvas
+const canvasStore = useCanvasStore()
+const canvas: LGraphCanvas = canvasStore.canvas as LGraphCanvas
 let node: LGraphNode | undefined
 let widgetInstance: IBaseWidget | undefined
 let pointer: CanvasPointer | undefined
 const scaleFactor = 2
 
-onMounted(() => {
-  node =
-    canvas?.graph?.getNodeById(
-      canvasEl.value.parentElement.attributes['node-id'].value
-    ) ?? undefined
-  if (!node) return
-  widgetInstance = node.widgets?.find((w) => w.name === props.widget.name)
-  if (!widgetInstance) return
-  canvasEl.value.width *= scaleFactor
+function findLegacyWidget():
+  | {
+      node: LGraphNode
+      widget: IBaseWidget
+    }
+  | undefined {
+  const hostNode = canvas?.graph?.getNodeById(props.nodeId) ?? undefined
+  return resolveWidgetFromHostNode(hostNode, props.widget.name)
+}
+
+function bindWidget() {
+  if (widgetInstance) widgetInstance.triggerDraw = () => {}
+
+  const resolved = findLegacyWidget()
+  if (!resolved) {
+    widgetInstance = undefined
+    node = undefined
+    return
+  }
+  node = resolved.node
+  widgetInstance = resolved.widget
   if (!widgetInstance.triggerDraw)
     widgetInstance.callback = useChainCallback(
       widgetInstance.callback,
@@ -42,6 +57,13 @@ onMounted(() => {
       }
     )
   widgetInstance.triggerDraw = draw
+  draw()
+}
+
+onMounted(() => {
+  canvasEl.value.width *= scaleFactor
+  bindWidget()
+  if (!widgetInstance) return
   useResizeObserver(canvasEl.value.parentElement, draw)
   watch(() => useColorPaletteStore().activePaletteId, draw)
   pointer = new CanvasPointer(canvasEl.value)
@@ -50,6 +72,9 @@ onBeforeUnmount(() => {
   if (widgetInstance) widgetInstance.triggerDraw = () => {}
 })
 
+whenever(() => !canvasStore.linearMode, bindWidget)
+watch(() => canvasStore.currentGraph, bindWidget)
+
 function draw() {
   if (!widgetInstance || !node) return
   const width = canvasEl.value.parentElement.clientWidth
@@ -104,10 +129,10 @@ function handleMove(e: PointerEvent) {
   >
     <canvas
       ref="canvasEl"
-      class="absolute mt-[-13px] w-full cursor-crosshair"
-      @pointerdown="handleDown"
-      @pointerup="handleUp"
-      @pointermove="handleMove"
+      class="absolute w-full cursor-crosshair"
+      @pointerdown.stop="handleDown"
+      @pointerup.stop="handleUp"
+      @pointermove.stop="handleMove"
     />
   </div>
 </template>
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetMarkdown.test.ts b/src/renderer/extensions/vueNodes/widgets/components/WidgetMarkdown.test.ts
index ee788cc4db..918acae80b 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetMarkdown.test.ts
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetMarkdown.test.ts
@@ -9,6 +9,7 @@ import enMessages from '@/locales/en/main.json'
 import type { SimplifiedWidget } from '@/types/simplifiedWidget'
 
 import WidgetMarkdown from './WidgetMarkdown.vue'
+import { createMockWidget } from './widgetTestUtils'
 
 // Mock the markdown renderer utility
 vi.mock('@/utils/markdownRendererUtil', () => ({
@@ -24,17 +25,18 @@ vi.mock('@/utils/markdownRendererUtil', () => ({
 }))
 
 describe('WidgetMarkdown Dual Mode Display', () => {
-  const createMockWidget = (
+  const createMarkdownWidget = (
     value: string = '# Default Heading\nSome **bold** text.',
-    options: Record<string, unknown> = {},
+    options: SimplifiedWidget<string>['options'] = {},
     callback?: (value: string) => void
-  ): SimplifiedWidget<string> => ({
-    name: 'test_markdown',
-    type: 'string',
-    value,
-    options,
-    callback
-  })
+  ) =>
+    createMockWidget<string>({
+      value,
+      name: 'test_markdown',
+      type: 'string',
+      options,
+      callback
+    })
 
   const mountComponent = (
     widget: SimplifiedWidget<string>,
@@ -83,7 +85,7 @@ describe('WidgetMarkdown Dual Mode Display', () => {
   describe('Display Mode', () => {
     it('renders markdown content as HTML in display mode', () => {
       const markdown = '# Heading\nSome **bold** and *italic* text.'
-      const widget = createMockWidget(markdown)
+      const widget = createMarkdownWidget(markdown)
       const wrapper = mountComponent(widget, markdown)
 
       const displayDiv = wrapper.find('.comfy-markdown-content')
@@ -97,7 +99,7 @@ describe('WidgetMarkdown Dual Mode Display', () => {
       context.skip(
         'Something in the logic in these tests is definitely off. needs diagnosis'
       )
-      const widget = createMockWidget('# Test')
+      const widget = createMarkdownWidget('# Test')
       const wrapper = mountComponent(widget, '# Test')
 
       expect(wrapper.find('.comfy-markdown-content').exists()).toBe(true)
@@ -105,7 +107,7 @@ describe('WidgetMarkdown Dual Mode Display', () => {
     })
 
     it('handles empty markdown content', () => {
-      const widget = createMockWidget('')
+      const widget = createMarkdownWidget('')
       const wrapper = mountComponent(widget, '')
 
       const displayDiv = wrapper.find('.comfy-markdown-content')
@@ -117,7 +119,7 @@ describe('WidgetMarkdown Dual Mode Display', () => {
   describe('Edit Mode Toggle', () => {
     it('switches to edit mode when clicked', async (context) => {
       context.skip('markdown editor not disappearing. needs diagnosis')
-      const widget = createMockWidget('# Test')
+      const widget = createMarkdownWidget('# Test')
       const wrapper = mountComponent(widget, '# Test')
 
       expect(wrapper.find('.comfy-markdown-content').exists()).toBe(true)
@@ -129,7 +131,7 @@ describe('WidgetMarkdown Dual Mode Display', () => {
     })
 
     it('does not switch to edit mode when already editing', async () => {
-      const widget = createMockWidget('# Test')
+      const widget = createMarkdownWidget('# Test')
       const wrapper = mountComponent(widget, '# Test')
 
       // First click to enter edit mode
@@ -143,7 +145,7 @@ describe('WidgetMarkdown Dual Mode Display', () => {
 
     it('switches back to display mode on textarea blur', async (context) => {
       context.skip('textarea not disappearing. needs diagnosis')
-      const widget = createMockWidget('# Test')
+      const widget = createMarkdownWidget('# Test')
       const wrapper = mountComponent(widget, '# Test')
 
       await clickToEdit(wrapper)
@@ -158,7 +160,7 @@ describe('WidgetMarkdown Dual Mode Display', () => {
   describe('Edit Mode', () => {
     it('displays textarea with current value when editing', async () => {
       const markdown = '# Original Content'
-      const widget = createMockWidget(markdown)
+      const widget = createMarkdownWidget(markdown)
       const wrapper = mountComponent(widget, markdown)
 
       await clickToEdit(wrapper)
@@ -172,7 +174,7 @@ describe('WidgetMarkdown Dual Mode Display', () => {
       context.skip(
         'Props or styling are not as described in the test. needs diagnosis'
       )
-      const widget = createMockWidget('# Test')
+      const widget = createMarkdownWidget('# Test')
       const wrapper = mountComponent(widget, '# Test')
 
       await clickToEdit(wrapper)
@@ -187,7 +189,7 @@ describe('WidgetMarkdown Dual Mode Display', () => {
     })
 
     it('stops click and keydown event propagation in edit mode', async () => {
-      const widget = createMockWidget('# Test')
+      const widget = createMarkdownWidget('# Test')
       const wrapper = mountComponent(widget, '# Test')
 
       await clickToEdit(wrapper)
@@ -206,11 +208,65 @@ describe('WidgetMarkdown Dual Mode Display', () => {
       expect(clickSpy).not.toHaveBeenCalled()
       expect(keydownSpy).not.toHaveBeenCalled()
     })
+
+    describe('Pointer Event Propagation', () => {
+      it('stops pointerdown propagation to prevent node drag during text selection', async () => {
+        const widget = createMarkdownWidget('# Test')
+        const wrapper = mountComponent(widget, '# Test')
+
+        await clickToEdit(wrapper)
+
+        const textarea = wrapper.find('textarea')
+        expect(textarea.exists()).toBe(true)
+
+        const parentPointerdownHandler = vi.fn()
+        const wrapperEl = wrapper.element as HTMLElement
+        wrapperEl.addEventListener('pointerdown', parentPointerdownHandler)
+
+        await textarea.trigger('pointerdown')
+
+        expect(parentPointerdownHandler).not.toHaveBeenCalled()
+      })
+
+      it('stops pointermove propagation during text selection', async () => {
+        const widget = createMarkdownWidget('# Test')
+        const wrapper = mountComponent(widget, '# Test')
+
+        await clickToEdit(wrapper)
+
+        const textarea = wrapper.find('textarea')
+
+        const parentPointermoveHandler = vi.fn()
+        const wrapperEl = wrapper.element as HTMLElement
+        wrapperEl.addEventListener('pointermove', parentPointermoveHandler)
+
+        await textarea.trigger('pointermove')
+
+        expect(parentPointermoveHandler).not.toHaveBeenCalled()
+      })
+
+      it('stops pointerup propagation after text selection', async () => {
+        const widget = createMarkdownWidget('# Test')
+        const wrapper = mountComponent(widget, '# Test')
+
+        await clickToEdit(wrapper)
+
+        const textarea = wrapper.find('textarea')
+
+        const parentPointerupHandler = vi.fn()
+        const wrapperEl = wrapper.element as HTMLElement
+        wrapperEl.addEventListener('pointerup', parentPointerupHandler)
+
+        await textarea.trigger('pointerup')
+
+        expect(parentPointerupHandler).not.toHaveBeenCalled()
+      })
+    })
   })
 
   describe('Value Updates', () => {
     it('emits update:modelValue when textarea content changes', async () => {
-      const widget = createMockWidget('# Original')
+      const widget = createMarkdownWidget('# Original')
       const wrapper = mountComponent(widget, '# Original')
 
       await clickToEdit(wrapper)
@@ -225,7 +281,7 @@ describe('WidgetMarkdown Dual Mode Display', () => {
     })
 
     it('renders updated HTML after value change and blur', async () => {
-      const widget = createMockWidget('# Original')
+      const widget = createMarkdownWidget('# Original')
       const wrapper = mountComponent(widget, '# Original')
 
       await clickToEdit(wrapper)
@@ -241,7 +297,7 @@ describe('WidgetMarkdown Dual Mode Display', () => {
     })
 
     it('emits update:modelValue for callback handling at parent level', async () => {
-      const widget = createMockWidget('# Test', {})
+      const widget = createMarkdownWidget('# Test', {})
       const wrapper = mountComponent(widget, '# Test')
 
       await clickToEdit(wrapper)
@@ -257,7 +313,7 @@ describe('WidgetMarkdown Dual Mode Display', () => {
     })
 
     it('handles missing callback gracefully', async () => {
-      const widget = createMockWidget('# Test', {}, undefined)
+      const widget = createMarkdownWidget('# Test', {}, undefined)
       const wrapper = mountComponent(widget, '# Test')
 
       await clickToEdit(wrapper)
@@ -280,7 +336,7 @@ describe('WidgetMarkdown Dual Mode Display', () => {
 This paragraph has **bold** and *italic* text.
 Another line with more content.`
 
-      const widget = createMockWidget(complexMarkdown)
+      const widget = createMarkdownWidget(complexMarkdown)
       const wrapper = mountComponent(widget, complexMarkdown)
 
       const displayDiv = wrapper.find('.comfy-markdown-content')
@@ -292,7 +348,7 @@ Another line with more content.`
 
     it('handles line breaks in markdown', () => {
       const markdownWithBreaks = 'Line 1\nLine 2\nLine 3'
-      const widget = createMockWidget(markdownWithBreaks)
+      const widget = createMarkdownWidget(markdownWithBreaks)
       const wrapper = mountComponent(widget, markdownWithBreaks)
 
       const displayDiv = wrapper.find('.comfy-markdown-content')
@@ -301,7 +357,7 @@ Another line with more content.`
 
     it('handles empty or whitespace-only markdown', () => {
       const whitespaceMarkdown = '   \n\n   '
-      const widget = createMockWidget(whitespaceMarkdown)
+      const widget = createMarkdownWidget(whitespaceMarkdown)
       const wrapper = mountComponent(widget, whitespaceMarkdown)
 
       const displayDiv = wrapper.find('.comfy-markdown-content')
@@ -312,7 +368,7 @@ Another line with more content.`
   describe('Edge Cases', () => {
     it('handles very long markdown content', async () => {
       const longMarkdown = '# Heading\n' + 'Lorem ipsum '.repeat(1000)
-      const widget = createMockWidget(longMarkdown)
+      const widget = createMarkdownWidget(longMarkdown)
       const wrapper = mountComponent(widget, longMarkdown)
 
       // Should render without issues
@@ -328,7 +384,7 @@ Another line with more content.`
 
     it('handles special characters in markdown', async () => {
       const specialChars = '# Special: @#$%^&*()[]{}|\\:";\'<>?,./'
-      const widget = createMockWidget(specialChars)
+      const widget = createMarkdownWidget(specialChars)
       const wrapper = mountComponent(widget, specialChars)
 
       await clickToEdit(wrapper)
@@ -338,7 +394,7 @@ Another line with more content.`
 
     it('handles unicode characters', async () => {
       const unicode = '# Unicode: 🎨 αβγ 中文 العربية 🚀'
-      const widget = createMockWidget(unicode)
+      const widget = createMarkdownWidget(unicode)
       const wrapper = mountComponent(widget, unicode)
 
       await clickToEdit(wrapper)
@@ -354,7 +410,7 @@ Another line with more content.`
     })
 
     it('handles rapid edit mode toggling', async () => {
-      const widget = createMockWidget('# Test')
+      const widget = createMarkdownWidget('# Test')
       const wrapper = mountComponent(widget, '# Test')
 
       // Rapid toggling
@@ -371,7 +427,7 @@ Another line with more content.`
 
   describe('Focus Management', () => {
     it('creates textarea reference when entering edit mode', async () => {
-      const widget = createMockWidget('# Test')
+      const widget = createMarkdownWidget('# Test')
       const wrapper = mountComponent(widget, '# Test')
       const vm = wrapper.vm as InstanceType<typeof WidgetMarkdown>
 
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetMarkdown.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetMarkdown.vue
index 28247859ed..e8af8be950 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetMarkdown.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetMarkdown.vue
@@ -4,6 +4,8 @@
     <div
       class="comfy-markdown-content size-full min-h-[60px] overflow-y-auto rounded-lg text-sm"
       :class="isEditing === false ? 'visible' : 'invisible'"
+      tabindex="0"
+      data-capture-wheel="true"
       v-html="renderedHtml"
     />
 
@@ -21,6 +23,9 @@
         }
       }"
       data-capture-wheel="true"
+      @pointerdown.capture.stop
+      @pointermove.capture.stop
+      @pointerup.capture.stop
       @click.stop
       @keydown.stop
     />
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetRecordAudio.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetRecordAudio.vue
index aa0fc4df32..7a0a7bdcf3 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetRecordAudio.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetRecordAudio.vue
@@ -1,8 +1,8 @@
 <template>
-  <div class="relative">
+  <div class="relative" @pointerdown.stop>
     <div class="mb-4">
       <Button
-        class="text-base-foreground w-full border-0 bg-secondary-background hover:bg-secondary-background-hover"
+        class="w-full border-0 bg-secondary-background text-base-foreground hover:bg-secondary-background-hover"
         :disabled="isRecording || readonly"
         @click="handleStartRecording"
       >
@@ -12,11 +12,11 @@
     </div>
     <div
       v-if="isRecording || isPlaying || recordedURL"
-      class="flex h-14 w-full items-center gap-4 rounded-lg px-4 bg-node-component-surface text-text-secondary"
+      class="flex h-14 w-full min-w-0 items-center gap-2 rounded-lg bg-node-component-surface px-3 text-text-secondary"
     >
       <!-- Recording Status -->
-      <div class="flex min-w-30 items-center gap-2">
-        <span class="min-w-20 text-xs">
+      <div class="flex shrink-0 items-center gap-1">
+        <span class="text-xs">
           {{
             isRecording
               ? t('g.listening', 'Listening...')
@@ -27,11 +27,11 @@
                   : ''
           }}
         </span>
-        <span class="min-w-10 text-sm">{{ formatTime(timer) }}</span>
+        <span class="text-sm">{{ formatTime(timer) }}</span>
       </div>
 
       <!-- Waveform Visualization -->
-      <div class="flex h-8 flex-1 items-center gap-2 overflow-x-clip">
+      <div class="flex h-8 min-w-0 flex-1 items-center gap-2 overflow-hidden">
         <div
           v-for="(bar, index) in waveformBars"
           :key="index"
@@ -45,7 +45,7 @@
       <button
         v-if="isRecording"
         :title="t('g.stopRecording', 'Stop Recording')"
-        class="flex size-8 animate-pulse items-center justify-center rounded-full border-0 bg-smoke-500/33 transition-colors"
+        class="flex size-8 shrink-0 animate-pulse items-center justify-center rounded-full border-0 bg-smoke-500/33 transition-colors"
         @click="handleStopRecording"
       >
         <div class="size-2.5 rounded-sm bg-danger-100" />
@@ -54,19 +54,19 @@
       <button
         v-else-if="!isRecording && recordedURL && !isPlaying"
         :title="t('g.playRecording') || 'Play Recording'"
-        class="flex size-8 items-center justify-center rounded-full border-0 bg-smoke-500/33 transition-colors"
+        class="flex size-8 shrink-0 items-center justify-center rounded-full border-0 bg-smoke-500/33 transition-colors"
         @click="handlePlayRecording"
       >
-        <i class="text-text-secondary icon-[lucide--play] size-4" />
+        <i class="icon-[lucide--play] size-4 text-text-secondary" />
       </button>
 
       <button
         v-else-if="isPlaying"
         :title="t('g.stopPlayback') || 'Stop Playback'"
-        class="flex size-8 items-center justify-center rounded-full border-0 bg-smoke-500/33 transition-colors"
+        class="flex size-8 shrink-0 items-center justify-center rounded-full border-0 bg-smoke-500/33 transition-colors"
         @click="handleStopPlayback"
       >
-        <i class="text-text-secondary icon-[lucide--square] size-4" />
+        <i class="icon-[lucide--square] size-4 text-text-secondary" />
       </button>
     </div>
     <audio
@@ -85,8 +85,8 @@
 import { useIntervalFn } from '@vueuse/core'
 import { Button } from 'primevue'
 import { computed, onMounted, onUnmounted, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
 
-import { t } from '@/i18n'
 import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
 import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
 import { useToastStore } from '@/platform/updates/common/toastStore'
@@ -98,6 +98,8 @@ import { useAudioRecorder } from '../composables/audio/useAudioRecorder'
 import { useAudioWaveform } from '../composables/audio/useAudioWaveform'
 import { formatTime } from '../utils/audioUtils'
 
+const { t } = useI18n()
+
 const props = defineProps<{
   readonly?: boolean
   nodeId: string
diff --git a/tests-ui/tests/renderer/extensions/vueNodes/widgets/components/WidgetSelect.asset-mode.test.ts b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelect.asset-mode.test.ts
similarity index 52%
rename from tests-ui/tests/renderer/extensions/vueNodes/widgets/components/WidgetSelect.asset-mode.test.ts
rename to src/renderer/extensions/vueNodes/widgets/components/WidgetSelect.asset-mode.test.ts
index 82224c7104..8116aa6735 100644
--- a/tests-ui/tests/renderer/extensions/vueNodes/widgets/components/WidgetSelect.asset-mode.test.ts
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelect.asset-mode.test.ts
@@ -2,48 +2,41 @@ import { createTestingPinia } from '@pinia/testing'
 import { flushPromises, mount } from '@vue/test-utils'
 import PrimeVue from 'primevue/config'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-import type { SimplifiedWidget } from '@/types/simplifiedWidget'
+import { createI18n } from 'vue-i18n'
 
 import WidgetSelect from '@/renderer/extensions/vueNodes/widgets/components/WidgetSelect.vue'
+import { createMockWidget } from './widgetTestUtils'
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: { en: {} }
+})
 
 // Mock modules
-vi.mock('@/platform/distribution/types', () => ({
-  isCloud: true
-}))
-
 vi.mock('@/platform/assets/services/assetService', () => ({
   assetService: {
-    isAssetBrowserEligible: vi.fn(() => true)
+    shouldUseAssetBrowser: vi.fn(() => true),
+    isAssetAPIEnabled: vi.fn(() => true)
   }
 }))
 
-const mockSettingStoreGet = vi.fn()
-
-vi.mock('@/platform/settings/settingStore', () => ({
-  useSettingStore: vi.fn(() => ({
-    get: mockSettingStoreGet
-  }))
-}))
-
 // Import after mocks are defined
 import { assetService } from '@/platform/assets/services/assetService'
-const mockAssetServiceEligible = vi.mocked(assetService.isAssetBrowserEligible)
+const mockShouldUseAssetBrowser = vi.mocked(assetService.shouldUseAssetBrowser)
 
 describe('WidgetSelect asset mode', () => {
-  const createWidget = (): SimplifiedWidget<string | undefined> => ({
-    name: 'ckpt_name',
-    type: 'combo',
-    value: undefined,
-    options: {
-      values: []
-    }
-  })
+  const createWidget = () =>
+    createMockWidget<string | undefined>({
+      value: undefined,
+      name: 'ckpt_name',
+      type: 'combo',
+      options: { values: [] }
+    })
 
   beforeEach(() => {
     vi.clearAllMocks()
-    mockAssetServiceEligible.mockReturnValue(true)
-    mockSettingStoreGet.mockReturnValue(true) // Default to true for UseAssetAPI
+    mockShouldUseAssetBrowser.mockReturnValue(true)
   })
 
   // Helper to mount with common setup
@@ -55,7 +48,7 @@ describe('WidgetSelect asset mode', () => {
         nodeType: 'CheckpointLoaderSimple'
       },
       global: {
-        plugins: [PrimeVue, createTestingPinia()]
+        plugins: [PrimeVue, createTestingPinia(), i18n]
       }
     })
   }
@@ -69,17 +62,8 @@ describe('WidgetSelect asset mode', () => {
     ).toBe(true)
   })
 
-  it('uses default widget when UseAssetAPI setting is false', () => {
-    mockSettingStoreGet.mockReturnValue(false)
-    const wrapper = mountWidget()
-
-    expect(
-      wrapper.findComponent({ name: 'WidgetSelectDefault' }).exists()
-    ).toBe(true)
-  })
-
-  it('uses default widget when node is not eligible', () => {
-    mockAssetServiceEligible.mockReturnValue(false)
+  it('uses default widget when shouldUseAssetBrowser returns false', () => {
+    mockShouldUseAssetBrowser.mockReturnValue(false)
     const wrapper = mountWidget()
 
     expect(
diff --git a/tests-ui/renderer/extensions/vueNodes/widgets/components/WidgetSelect.test.ts b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelect.test.ts
similarity index 69%
rename from tests-ui/renderer/extensions/vueNodes/widgets/components/WidgetSelect.test.ts
rename to src/renderer/extensions/vueNodes/widgets/components/WidgetSelect.test.ts
index 4d52d47e26..75e47cdbb9 100644
--- a/tests-ui/renderer/extensions/vueNodes/widgets/components/WidgetSelect.test.ts
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelect.test.ts
@@ -1,67 +1,61 @@
 import { createTestingPinia } from '@pinia/testing'
 import { mount } from '@vue/test-utils'
 import PrimeVue from 'primevue/config'
-import Select from 'primevue/select'
 import type { SelectProps } from 'primevue/select'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
 
+import SelectPlus from '@/components/primevueOverride/SelectPlus.vue'
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: { en: {} }
+})
 import type { ComboInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
 import type { SimplifiedWidget } from '@/types/simplifiedWidget'
-
 import WidgetSelect from '@/renderer/extensions/vueNodes/widgets/components/WidgetSelect.vue'
 import WidgetSelectDefault from '@/renderer/extensions/vueNodes/widgets/components/WidgetSelectDefault.vue'
 import WidgetSelectDropdown from '@/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.vue'
+import { createMockWidget } from './widgetTestUtils'
 
-// Mock state for distribution and settings
-const mockDistributionState = vi.hoisted(() => ({ isCloud: false }))
-const mockSettingStoreGet = vi.hoisted(() => vi.fn(() => false))
-const mockIsAssetBrowserEligible = vi.hoisted(() => vi.fn(() => false))
-
-vi.mock('@/platform/distribution/types', () => ({
-  get isCloud() {
-    return mockDistributionState.isCloud
-  }
-}))
-
-vi.mock('@/platform/settings/settingStore', () => ({
-  useSettingStore: vi.fn(() => ({
-    get: mockSettingStoreGet
-  }))
-}))
+// Mock state for asset service
+const mockShouldUseAssetBrowser = vi.hoisted(() => vi.fn(() => false))
+const mockIsAssetAPIEnabled = vi.hoisted(() => vi.fn(() => false))
 
 vi.mock('@/platform/assets/services/assetService', () => ({
   assetService: {
-    isAssetBrowserEligible: mockIsAssetBrowserEligible
+    shouldUseAssetBrowser: mockShouldUseAssetBrowser,
+    isAssetAPIEnabled: mockIsAssetAPIEnabled
   }
 }))
 
 describe('WidgetSelect Value Binding', () => {
   beforeEach(() => {
-    // Reset all mocks before each test
-    mockDistributionState.isCloud = false
-    mockSettingStoreGet.mockReturnValue(false)
-    mockIsAssetBrowserEligible.mockReturnValue(false)
+    mockShouldUseAssetBrowser.mockReturnValue(false)
+    mockIsAssetAPIEnabled.mockReturnValue(false)
     vi.clearAllMocks()
   })
 
-  const createMockWidget = (
+  const createSelectWidget = (
     value: string = 'option1',
     options: Partial<
       SelectProps & { values?: string[]; return_index?: boolean }
     > = {},
     callback?: (value: string | undefined) => void,
     spec?: ComboInputSpec
-  ): SimplifiedWidget<string | undefined> => ({
-    name: 'test_select',
-    type: 'combo',
-    value,
-    options: {
-      values: ['option1', 'option2', 'option3'],
-      ...options
-    },
-    callback,
-    spec
-  })
+  ) =>
+    createMockWidget<string | undefined>({
+      value,
+      name: 'test_select',
+      type: 'combo',
+      options: {
+        values: ['option1', 'option2', 'option3'],
+        ...options
+      },
+      callback,
+      spec
+    })
 
   const mountComponent = (
     widget: SimplifiedWidget<string | undefined>,
@@ -75,8 +69,8 @@ describe('WidgetSelect Value Binding', () => {
         readonly
       },
       global: {
-        plugins: [PrimeVue, createTestingPinia()],
-        components: { Select }
+        plugins: [PrimeVue, createTestingPinia(), i18n],
+        components: { SelectPlus }
       }
     })
   }
@@ -85,14 +79,14 @@ describe('WidgetSelect Value Binding', () => {
     wrapper: ReturnType<typeof mount>,
     value: string
   ) => {
-    const select = wrapper.findComponent({ name: 'Select' })
+    const select = wrapper.findComponent({ name: 'SelectPlus' })
     await select.setValue(value)
     return wrapper.emitted('update:modelValue')
   }
 
   describe('Vue Event Emission', () => {
     it('emits Vue event when selection changes', async () => {
-      const widget = createMockWidget('option1')
+      const widget = createSelectWidget('option1')
       const wrapper = mountComponent(widget, 'option1')
 
       const emitted = await setSelectValueAndEmit(wrapper, 'option2')
@@ -102,7 +96,7 @@ describe('WidgetSelect Value Binding', () => {
     })
 
     it('emits string value for different options', async () => {
-      const widget = createMockWidget('option1')
+      const widget = createSelectWidget('option1')
       const wrapper = mountComponent(widget, 'option1')
 
       const emitted = await setSelectValueAndEmit(wrapper, 'option3')
@@ -114,7 +108,7 @@ describe('WidgetSelect Value Binding', () => {
 
     it('handles custom option values', async () => {
       const customOptions = ['custom_a', 'custom_b', 'custom_c']
-      const widget = createMockWidget('custom_a', { values: customOptions })
+      const widget = createSelectWidget('custom_a', { values: customOptions })
       const wrapper = mountComponent(widget, 'custom_a')
 
       const emitted = await setSelectValueAndEmit(wrapper, 'custom_b')
@@ -124,7 +118,7 @@ describe('WidgetSelect Value Binding', () => {
     })
 
     it('handles missing callback gracefully', async () => {
-      const widget = createMockWidget('option1', {}, undefined)
+      const widget = createSelectWidget('option1', {}, undefined)
       const wrapper = mountComponent(widget, 'option1')
 
       const emitted = await setSelectValueAndEmit(wrapper, 'option2')
@@ -135,7 +129,7 @@ describe('WidgetSelect Value Binding', () => {
     })
 
     it('handles value changes gracefully', async () => {
-      const widget = createMockWidget('option1')
+      const widget = createSelectWidget('option1')
       const wrapper = mountComponent(widget, 'option1')
 
       const emitted = await setSelectValueAndEmit(wrapper, 'option2')
@@ -147,20 +141,20 @@ describe('WidgetSelect Value Binding', () => {
 
   describe('Option Handling', () => {
     it('handles empty options array', async () => {
-      const widget = createMockWidget('', { values: [] })
+      const widget = createSelectWidget('', { values: [] })
       const wrapper = mountComponent(widget, '')
 
-      const select = wrapper.findComponent({ name: 'Select' })
+      const select = wrapper.findComponent({ name: 'SelectPlus' })
       expect(select.props('options')).toEqual([])
     })
 
     it('handles single option', async () => {
-      const widget = createMockWidget('only_option', {
+      const widget = createSelectWidget('only_option', {
         values: ['only_option']
       })
       const wrapper = mountComponent(widget, 'only_option')
 
-      const select = wrapper.findComponent({ name: 'Select' })
+      const select = wrapper.findComponent({ name: 'SelectPlus' })
       const options = select.props('options')
       expect(options).toHaveLength(1)
       expect(options[0]).toEqual('only_option')
@@ -172,7 +166,7 @@ describe('WidgetSelect Value Binding', () => {
         'option@#$%',
         'option/with\\slashes'
       ]
-      const widget = createMockWidget(specialOptions[0], {
+      const widget = createSelectWidget(specialOptions[0], {
         values: specialOptions
       })
       const wrapper = mountComponent(widget, specialOptions[0])
@@ -186,7 +180,7 @@ describe('WidgetSelect Value Binding', () => {
 
   describe('Edge Cases', () => {
     it('handles selection of non-existent option gracefully', async () => {
-      const widget = createMockWidget('option1')
+      const widget = createSelectWidget('option1')
       const wrapper = mountComponent(widget, 'option1')
 
       const emitted = await setSelectValueAndEmit(
@@ -201,7 +195,7 @@ describe('WidgetSelect Value Binding', () => {
 
     it('handles numeric string options correctly', async () => {
       const numericOptions = ['1', '2', '10', '100']
-      const widget = createMockWidget('1', { values: numericOptions })
+      const widget = createSelectWidget('1', { values: numericOptions })
       const wrapper = mountComponent(widget, '1')
 
       const emitted = await setSelectValueAndEmit(wrapper, '100')
@@ -219,7 +213,7 @@ describe('WidgetSelect Value Binding', () => {
         name: 'test_select',
         image_upload: true
       }
-      const widget = createMockWidget('option1', {}, undefined, spec)
+      const widget = createSelectWidget('option1', {}, undefined, spec)
       const wrapper = mount(WidgetSelect, {
         props: {
           widget,
@@ -227,8 +221,8 @@ describe('WidgetSelect Value Binding', () => {
           nodeType: 'CheckpointLoaderSimple'
         },
         global: {
-          plugins: [PrimeVue, createTestingPinia()],
-          components: { Select }
+          plugins: [PrimeVue, createTestingPinia(), i18n],
+          components: { SelectPlus }
         }
       })
 
@@ -238,7 +232,7 @@ describe('WidgetSelect Value Binding', () => {
     })
 
     it('does not pass node-type prop to WidgetSelectDefault', () => {
-      const widget = createMockWidget('option1')
+      const widget = createSelectWidget('option1')
       const wrapper = mount(WidgetSelect, {
         props: {
           widget,
@@ -246,8 +240,8 @@ describe('WidgetSelect Value Binding', () => {
           nodeType: 'KSampler'
         },
         global: {
-          plugins: [PrimeVue, createTestingPinia()],
-          components: { Select }
+          plugins: [PrimeVue, createTestingPinia(), i18n],
+          components: { SelectPlus }
         }
       })
 
@@ -257,12 +251,10 @@ describe('WidgetSelect Value Binding', () => {
   })
 
   describe('Asset mode detection', () => {
-    it('enables asset mode when all conditions are met', () => {
-      mockDistributionState.isCloud = true
-      mockSettingStoreGet.mockReturnValue(true)
-      mockIsAssetBrowserEligible.mockReturnValue(true)
+    it('enables asset mode when shouldUseAssetBrowser returns true', () => {
+      mockShouldUseAssetBrowser.mockReturnValue(true)
 
-      const widget = createMockWidget('test.safetensors')
+      const widget = createSelectWidget('test.safetensors')
       const wrapper = mount(WidgetSelect, {
         props: {
           widget,
@@ -270,18 +262,18 @@ describe('WidgetSelect Value Binding', () => {
           nodeType: 'CheckpointLoaderSimple'
         },
         global: {
-          plugins: [PrimeVue, createTestingPinia()],
-          components: { Select }
+          plugins: [PrimeVue, createTestingPinia(), i18n],
+          components: { SelectPlus }
         }
       })
 
       expect(wrapper.findComponent(WidgetSelectDropdown).exists()).toBe(true)
     })
 
-    it('disables asset mode when conditions are not met', () => {
-      mockDistributionState.isCloud = false
+    it('disables asset mode when shouldUseAssetBrowser returns false', () => {
+      mockShouldUseAssetBrowser.mockReturnValue(false)
 
-      const widget = createMockWidget('test.safetensors')
+      const widget = createSelectWidget('test.safetensors')
       const wrapper = mount(WidgetSelect, {
         props: {
           widget,
@@ -289,8 +281,8 @@ describe('WidgetSelect Value Binding', () => {
           nodeType: 'CheckpointLoaderSimple'
         },
         global: {
-          plugins: [PrimeVue, createTestingPinia()],
-          components: { Select }
+          plugins: [PrimeVue, createTestingPinia(), i18n],
+          components: { SelectPlus }
         }
       })
 
@@ -305,7 +297,7 @@ describe('WidgetSelect Value Binding', () => {
         name: 'test_select',
         image_upload: true
       }
-      const widget = createMockWidget('option1', {}, undefined, spec)
+      const widget = createSelectWidget('option1', {}, undefined, spec)
       const wrapper = mountComponent(widget, 'option1')
 
       expect(wrapper.findComponent(WidgetSelectDropdown).exists()).toBe(true)
@@ -319,7 +311,7 @@ describe('WidgetSelect Value Binding', () => {
         name: 'test_select',
         audio_upload: true
       }
-      const widget = createMockWidget('clip.wav', {}, undefined, spec)
+      const widget = createSelectWidget('clip.wav', {}, undefined, spec)
       const wrapper = mountComponent(widget, 'clip.wav')
       const dropdown = wrapper.findComponent(WidgetSelectDropdown)
 
@@ -328,8 +320,26 @@ describe('WidgetSelect Value Binding', () => {
       expect(dropdown.props('allowUpload')).toBe(false)
     })
 
+    it('uses dropdown variant for mesh uploads via spec', () => {
+      const spec: ComboInputSpec = {
+        type: 'COMBO',
+        name: 'model_file',
+        mesh_upload: true,
+        upload_subfolder: '3d'
+      }
+      const widget = createSelectWidget('model.glb', {}, undefined, spec)
+      const wrapper = mountComponent(widget, 'model.glb')
+      const dropdown = wrapper.findComponent(WidgetSelectDropdown)
+
+      expect(dropdown.exists()).toBe(true)
+      expect(dropdown.props('assetKind')).toBe('mesh')
+      expect(dropdown.props('allowUpload')).toBe(true)
+      expect(dropdown.props('uploadFolder')).toBe('input')
+      expect(dropdown.props('uploadSubfolder')).toBe('3d')
+    })
+
     it('keeps default select when no spec or media hints are present', () => {
-      const widget = createMockWidget('plain', {
+      const widget = createSelectWidget('plain', {
         values: ['plain', 'text']
       })
       const wrapper = mountComponent(widget, 'plain')
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetSelect.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelect.vue
index e4cc487829..42e9e9da4d 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetSelect.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelect.vue
@@ -7,6 +7,7 @@
     :asset-kind="assetKind"
     :allow-upload="allowUpload"
     :upload-folder="uploadFolder"
+    :upload-subfolder="uploadSubfolder"
     :is-asset-mode="isAssetMode"
     :default-layout-mode="defaultLayoutMode"
   />
@@ -23,8 +24,6 @@
 import { computed } from 'vue'
 
 import { assetService } from '@/platform/assets/services/assetService'
-import { isCloud } from '@/platform/distribution/types'
-import { useSettingStore } from '@/platform/settings/settingStore'
 import WidgetSelectDefault from '@/renderer/extensions/vueNodes/widgets/components/WidgetSelectDefault.vue'
 import WidgetSelectDropdown from '@/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.vue'
 import WidgetWithControl from '@/renderer/extensions/vueNodes/widgets/components/WidgetWithControl.vue'
@@ -58,13 +57,15 @@ const specDescriptor = computed<{
   kind: AssetKind
   allowUpload: boolean
   folder: ResultItemType | undefined
+  subfolder: string | undefined
 }>(() => {
   const spec = comboSpec.value
   if (!spec) {
     return {
       kind: 'unknown',
       allowUpload: false,
-      folder: undefined
+      folder: undefined,
+      subfolder: undefined
     }
   }
 
@@ -73,7 +74,9 @@ const specDescriptor = computed<{
     animated_image_upload,
     video_upload,
     image_folder,
-    audio_upload
+    audio_upload,
+    mesh_upload,
+    upload_subfolder
   } = spec
 
   let kind: AssetKind = 'unknown'
@@ -83,34 +86,34 @@ const specDescriptor = computed<{
     kind = 'image'
   } else if (audio_upload) {
     kind = 'audio'
+  } else if (mesh_upload) {
+    kind = 'mesh'
   }
+
   // TODO: add support for models (checkpoints, VAE, LoRAs, etc.) -- get widgetType from spec
 
   const allowUpload =
     image_upload === true ||
     animated_image_upload === true ||
     video_upload === true ||
-    audio_upload === true
+    audio_upload === true ||
+    mesh_upload === true
+
+  const folder = mesh_upload ? 'input' : image_folder
+
   return {
     kind,
     allowUpload,
-    folder: image_folder
+    folder,
+    subfolder: upload_subfolder
   }
 })
 
-const isAssetMode = computed(() => {
-  if (isCloud) {
-    const settingStore = useSettingStore()
-    const isUsingAssetAPI = settingStore.get('Comfy.Assets.UseAssetAPI')
-    const isEligible =
-      assetService.isAssetBrowserEligible(props.nodeType, props.widget.name) ||
-      props.widget.type === 'asset'
-
-    return isUsingAssetAPI && isEligible
-  }
-
-  return false
-})
+const isAssetMode = computed(
+  () =>
+    assetService.shouldUseAssetBrowser(props.nodeType, props.widget.name) ||
+    (assetService.isAssetAPIEnabled() && props.widget.type === 'asset')
+)
 
 const assetKind = computed(() => specDescriptor.value.kind)
 const isDropdownUIWidget = computed(
@@ -120,6 +123,7 @@ const allowUpload = computed(() => specDescriptor.value.allowUpload)
 const uploadFolder = computed<ResultItemType>(() => {
   return specDescriptor.value.folder ?? 'input'
 })
+const uploadSubfolder = computed(() => specDescriptor.value.subfolder)
 const defaultLayoutMode = computed<LayoutMode>(() => {
   return isAssetMode.value ? 'list' : 'grid'
 })
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDefault.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDefault.vue
index e996c944e8..2803b57708 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDefault.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDefault.vue
@@ -1,10 +1,10 @@
 <template>
   <WidgetLayoutField :widget>
-    <Select
+    <SelectPlus
       v-model="modelValue"
       :invalid
       :filter="selectOptions.length > 4"
-      :auto-filter-focus="selectOptions.length > 4"
+      auto-filter-focus
       :options="selectOptions"
       v-bind="combinedProps"
       :class="cn(WidgetInputBaseClass, 'w-full text-xs')"
@@ -13,21 +13,27 @@
       :pt="{
         option: 'text-xs',
         dropdown: 'w-8',
-        label: cn('truncate min-w-[4ch]', $slots.default && 'mr-5'),
+        label: cn('min-w-[4ch] truncate', $slots.default && 'mr-5'),
         overlay: 'w-fit min-w-full'
       }"
       data-capture-wheel="true"
-    />
-    <div class="absolute top-5 right-8 h-4 w-7 -translate-y-4/5 flex">
+    >
+      <template #dropdownicon>
+        <i
+          class="icon-[lucide--chevron-down] size-4 text-component-node-foreground-secondary"
+        />
+      </template>
+    </SelectPlus>
+    <div class="absolute top-5 right-8 flex h-4 w-7 -translate-y-4/5">
       <slot />
     </div>
   </WidgetLayoutField>
 </template>
 
 <script setup lang="ts">
-import Select from 'primevue/select'
 import { computed } from 'vue'
 
+import SelectPlus from '@/components/primevueOverride/SelectPlus.vue'
 import { useTransformCompatOverlayProps } from '@/composables/useTransformCompatOverlayProps'
 import type { SimplifiedWidget } from '@/types/simplifiedWidget'
 import { cn } from '@/utils/tailwindUtil'
@@ -47,7 +53,8 @@ const props = defineProps<Props>()
 
 const modelValue = defineModel<string | undefined>({
   default(props: Props) {
-    return props.widget.options?.values?.[0] || ''
+    const values = props.widget.options?.values
+    return (Array.isArray(values) ? values[0] : undefined) ?? ''
   }
 })
 
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.test.ts b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.test.ts
new file mode 100644
index 0000000000..6d37d81079
--- /dev/null
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.test.ts
@@ -0,0 +1,458 @@
+import { createTestingPinia } from '@pinia/testing'
+import { mount } from '@vue/test-utils'
+import type { VueWrapper } from '@vue/test-utils'
+import PrimeVue from 'primevue/config'
+import { computed } from 'vue'
+import type { ComponentPublicInstance } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
+import type { FormDropdownItem } from '@/renderer/extensions/vueNodes/widgets/components/form/dropdown/types'
+import type { ComboInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
+import type { SimplifiedWidget } from '@/types/simplifiedWidget'
+
+import WidgetSelectDropdown from '@/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.vue'
+import { createMockWidget } from './widgetTestUtils'
+
+const mockAssetsData = vi.hoisted(() => ({ items: [] as AssetItem[] }))
+vi.mock(
+  '@/renderer/extensions/vueNodes/widgets/composables/useAssetWidgetData',
+  () => ({
+    useAssetWidgetData: () => ({
+      category: computed(() => 'checkpoints'),
+      assets: computed(() => mockAssetsData.items),
+      isLoading: computed(() => false),
+      error: computed(() => null)
+    })
+  })
+)
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: { en: {} }
+})
+
+interface WidgetSelectDropdownInstance extends ComponentPublicInstance {
+  inputItems: FormDropdownItem[]
+  outputItems: FormDropdownItem[]
+  dropdownItems: FormDropdownItem[]
+  filterSelected: string
+  updateSelectedItems: (selectedSet: Set<string>) => void
+}
+
+describe('WidgetSelectDropdown custom label mapping', () => {
+  const createSelectDropdownWidget = (
+    value: string = 'img_001.png',
+    options: {
+      values?: string[]
+      getOptionLabel?: (value?: string | null) => string
+    } = {},
+    spec?: ComboInputSpec
+  ) =>
+    createMockWidget<string | undefined>({
+      value,
+      name: 'test_image_select',
+      type: 'combo',
+      options: {
+        values: ['img_001.png', 'photo_abc.jpg', 'hash789.png'],
+        ...options
+      },
+      spec
+    })
+
+  const mountComponent = (
+    widget: SimplifiedWidget<string | undefined>,
+    modelValue: string | undefined,
+    assetKind: 'image' | 'video' | 'audio' = 'image'
+  ): VueWrapper<WidgetSelectDropdownInstance> => {
+    return mount(WidgetSelectDropdown, {
+      props: {
+        widget,
+        modelValue,
+        assetKind,
+        allowUpload: true,
+        uploadFolder: 'input'
+      },
+      global: {
+        plugins: [PrimeVue, createTestingPinia(), i18n]
+      }
+    }) as unknown as VueWrapper<WidgetSelectDropdownInstance>
+  }
+
+  describe('when custom labels are not provided', () => {
+    it('uses values as labels when no mapping provided', () => {
+      const widget = createSelectDropdownWidget('img_001.png')
+      const wrapper = mountComponent(widget, 'img_001.png')
+
+      const inputItems = wrapper.vm.inputItems
+      expect(inputItems).toHaveLength(3)
+      expect(inputItems[0].name).toBe('img_001.png')
+      expect(inputItems[0].label).toBe('img_001.png')
+      expect(inputItems[1].name).toBe('photo_abc.jpg')
+      expect(inputItems[1].label).toBe('photo_abc.jpg')
+      expect(inputItems[2].name).toBe('hash789.png')
+      expect(inputItems[2].label).toBe('hash789.png')
+    })
+  })
+
+  describe('when custom labels are provided via getOptionLabel', () => {
+    it('displays custom labels while preserving original values', () => {
+      const getOptionLabel = vi.fn((value?: string | null) => {
+        if (!value) return 'No file'
+        const mapping: Record<string, string> = {
+          'img_001.png': 'Vacation Photo',
+          'photo_abc.jpg': 'Family Portrait',
+          'hash789.png': 'Sunset Beach'
+        }
+        return mapping[value] || value
+      })
+
+      const widget = createSelectDropdownWidget('img_001.png', {
+        getOptionLabel
+      })
+      const wrapper = mountComponent(widget, 'img_001.png')
+
+      const inputItems = wrapper.vm.inputItems
+      expect(inputItems).toHaveLength(3)
+      expect(inputItems[0].name).toBe('img_001.png')
+      expect(inputItems[0].label).toBe('Vacation Photo')
+      expect(inputItems[1].name).toBe('photo_abc.jpg')
+      expect(inputItems[1].label).toBe('Family Portrait')
+      expect(inputItems[2].name).toBe('hash789.png')
+      expect(inputItems[2].label).toBe('Sunset Beach')
+
+      expect(getOptionLabel).toHaveBeenCalledWith('img_001.png')
+      expect(getOptionLabel).toHaveBeenCalledWith('photo_abc.jpg')
+      expect(getOptionLabel).toHaveBeenCalledWith('hash789.png')
+    })
+
+    it('emits original values when items with custom labels are selected', async () => {
+      const getOptionLabel = vi.fn((value?: string | null) => {
+        if (!value) return 'No file'
+        return `Custom: ${value}`
+      })
+
+      const widget = createSelectDropdownWidget('img_001.png', {
+        getOptionLabel
+      })
+      const wrapper = mountComponent(widget, 'img_001.png')
+
+      // Simulate selecting an item
+      const selectedSet = new Set(['input-1']) // index 1 = photo_abc.jpg
+      wrapper.vm.updateSelectedItems(selectedSet)
+
+      // Should emit the original value, not the custom label
+      expect(wrapper.emitted('update:modelValue')).toBeDefined()
+      expect(wrapper.emitted('update:modelValue')![0]).toEqual([
+        'photo_abc.jpg'
+      ])
+    })
+
+    it('falls back to original value when label mapping fails', () => {
+      const getOptionLabel = vi.fn((value?: string | null) => {
+        if (value === 'photo_abc.jpg') {
+          throw new Error('Mapping failed')
+        }
+        return `Labeled: ${value}`
+      })
+
+      const consoleErrorSpy = vi
+        .spyOn(console, 'error')
+        .mockImplementation(() => {})
+
+      const widget = createSelectDropdownWidget('img_001.png', {
+        getOptionLabel
+      })
+      const wrapper = mountComponent(widget, 'img_001.png')
+
+      const inputItems = wrapper.vm.inputItems
+      expect(inputItems[0].name).toBe('img_001.png')
+      expect(inputItems[0].label).toBe('Labeled: img_001.png')
+      expect(inputItems[1].name).toBe('photo_abc.jpg')
+      expect(inputItems[1].label).toBe('photo_abc.jpg')
+      expect(inputItems[2].name).toBe('hash789.png')
+      expect(inputItems[2].label).toBe('Labeled: hash789.png')
+
+      expect(consoleErrorSpy).toHaveBeenCalled()
+      consoleErrorSpy.mockRestore()
+    })
+
+    it('falls back to original value when label mapping returns empty string', () => {
+      const getOptionLabel = vi.fn((value?: string | null) => {
+        if (value === 'photo_abc.jpg') {
+          return ''
+        }
+        return `Labeled: ${value}`
+      })
+
+      const widget = createSelectDropdownWidget('img_001.png', {
+        getOptionLabel
+      })
+      const wrapper = mountComponent(widget, 'img_001.png')
+
+      const inputItems = wrapper.vm.inputItems
+      expect(inputItems[0].name).toBe('img_001.png')
+      expect(inputItems[0].label).toBe('Labeled: img_001.png')
+      expect(inputItems[1].name).toBe('photo_abc.jpg')
+      expect(inputItems[1].label).toBe('photo_abc.jpg')
+      expect(inputItems[2].name).toBe('hash789.png')
+      expect(inputItems[2].label).toBe('Labeled: hash789.png')
+    })
+
+    it('falls back to original value when label mapping returns undefined', () => {
+      const getOptionLabel = vi.fn((value?: string | null) => {
+        if (value === 'hash789.png') {
+          return undefined as unknown as string
+        }
+        return `Labeled: ${value}`
+      })
+
+      const widget = createSelectDropdownWidget('img_001.png', {
+        getOptionLabel
+      })
+      const wrapper = mountComponent(widget, 'img_001.png')
+
+      const inputItems = wrapper.vm.inputItems
+      expect(inputItems[0].name).toBe('img_001.png')
+      expect(inputItems[0].label).toBe('Labeled: img_001.png')
+      expect(inputItems[1].name).toBe('photo_abc.jpg')
+      expect(inputItems[1].label).toBe('Labeled: photo_abc.jpg')
+      expect(inputItems[2].name).toBe('hash789.png')
+      expect(inputItems[2].label).toBe('hash789.png')
+    })
+  })
+
+  describe('output items with custom label mapping', () => {
+    it('applies custom label mapping to output items from queue history', () => {
+      const getOptionLabel = vi.fn((value?: string | null) => {
+        if (!value) return 'No file'
+        return `Output: ${value}`
+      })
+
+      const widget = createSelectDropdownWidget('img_001.png', {
+        getOptionLabel
+      })
+      const wrapper = mountComponent(widget, 'img_001.png')
+
+      const outputItems = wrapper.vm.outputItems
+      expect(outputItems).toBeDefined()
+      expect(Array.isArray(outputItems)).toBe(true)
+    })
+  })
+
+  describe('missing value handling for template-loaded nodes', () => {
+    it('creates a fallback item in "all" filter when modelValue is not in available items', () => {
+      const widget = createSelectDropdownWidget('template_image.png', {
+        values: ['img_001.png', 'photo_abc.jpg']
+      })
+      const wrapper = mountComponent(widget, 'template_image.png')
+
+      const inputItems = wrapper.vm.inputItems
+      expect(inputItems).toHaveLength(2)
+      expect(
+        inputItems.some((item) => item.name === 'template_image.png')
+      ).toBe(false)
+
+      // The missing value should be accessible via dropdownItems when filter is 'all' (default)
+      const dropdownItems = wrapper.vm.dropdownItems
+      expect(
+        dropdownItems.some((item) => item.name === 'template_image.png')
+      ).toBe(true)
+      expect(dropdownItems[0].name).toBe('template_image.png')
+      expect(dropdownItems[0].id).toBe('missing-template_image.png')
+    })
+
+    it('does not include fallback item when filter is "inputs"', async () => {
+      const widget = createSelectDropdownWidget('template_image.png', {
+        values: ['img_001.png', 'photo_abc.jpg']
+      })
+      const wrapper = mountComponent(widget, 'template_image.png')
+
+      wrapper.vm.filterSelected = 'inputs'
+      await wrapper.vm.$nextTick()
+
+      const dropdownItems = wrapper.vm.dropdownItems
+      expect(dropdownItems).toHaveLength(2)
+      expect(
+        dropdownItems.every((item) => !String(item.id).startsWith('missing-'))
+      ).toBe(true)
+    })
+
+    it('does not include fallback item when filter is "outputs"', async () => {
+      const widget = createSelectDropdownWidget('template_image.png', {
+        values: ['img_001.png', 'photo_abc.jpg']
+      })
+      const wrapper = mountComponent(widget, 'template_image.png')
+
+      wrapper.vm.filterSelected = 'outputs'
+      await wrapper.vm.$nextTick()
+
+      const dropdownItems = wrapper.vm.dropdownItems
+      expect(dropdownItems).toHaveLength(wrapper.vm.outputItems.length)
+      expect(
+        dropdownItems.every((item) => !String(item.id).startsWith('missing-'))
+      ).toBe(true)
+    })
+
+    it('does not create a fallback item when modelValue exists in available items', () => {
+      const widget = createSelectDropdownWidget('img_001.png', {
+        values: ['img_001.png', 'photo_abc.jpg']
+      })
+      const wrapper = mountComponent(widget, 'img_001.png')
+
+      const dropdownItems = wrapper.vm.dropdownItems
+      expect(dropdownItems).toHaveLength(2)
+      expect(
+        dropdownItems.every((item) => !String(item.id).startsWith('missing-'))
+      ).toBe(true)
+    })
+
+    it('does not create a fallback item when modelValue is undefined', () => {
+      const widget = createSelectDropdownWidget(
+        undefined as unknown as string,
+        {
+          values: ['img_001.png', 'photo_abc.jpg']
+        }
+      )
+      const wrapper = mountComponent(widget, undefined)
+
+      const dropdownItems = wrapper.vm.dropdownItems
+      expect(dropdownItems).toHaveLength(2)
+      expect(
+        dropdownItems.every((item) => !String(item.id).startsWith('missing-'))
+      ).toBe(true)
+    })
+  })
+})
+
+describe('WidgetSelectDropdown cloud asset mode (COM-14333)', () => {
+  interface CloudModeInstance extends ComponentPublicInstance {
+    dropdownItems: FormDropdownItem[]
+    displayItems: FormDropdownItem[]
+    selectedSet: Set<string>
+  }
+
+  const createTestAsset = (
+    id: string,
+    name: string,
+    preview_url: string
+  ): AssetItem => ({
+    id,
+    name,
+    preview_url,
+    tags: []
+  })
+
+  const createCloudModeWidget = (
+    value: string = 'model.safetensors'
+  ): SimplifiedWidget<string | undefined> => ({
+    name: 'test_model_select',
+    type: 'combo',
+    value,
+    options: {
+      values: [],
+      nodeType: 'CheckpointLoaderSimple'
+    }
+  })
+
+  const mountCloudComponent = (
+    widget: SimplifiedWidget<string | undefined>,
+    modelValue: string | undefined
+  ): VueWrapper<CloudModeInstance> => {
+    return mount(WidgetSelectDropdown, {
+      props: {
+        widget,
+        modelValue,
+        assetKind: 'model',
+        isAssetMode: true,
+        nodeType: 'CheckpointLoaderSimple'
+      },
+      global: {
+        plugins: [PrimeVue, createTestingPinia(), i18n]
+      }
+    }) as unknown as VueWrapper<CloudModeInstance>
+  }
+
+  beforeEach(() => {
+    mockAssetsData.items = []
+  })
+
+  it('does not include missing items in cloud asset mode dropdown', () => {
+    mockAssetsData.items = [
+      createTestAsset(
+        'asset-1',
+        'existing_model.safetensors',
+        'https://example.com/preview.jpg'
+      )
+    ]
+
+    const widget = createCloudModeWidget('missing_model.safetensors')
+    const wrapper = mountCloudComponent(widget, 'missing_model.safetensors')
+
+    const dropdownItems = wrapper.vm.dropdownItems
+    expect(dropdownItems).toHaveLength(1)
+    expect(dropdownItems[0].name).toBe('existing_model.safetensors')
+    expect(
+      dropdownItems.some((item) => item.name === 'missing_model.safetensors')
+    ).toBe(false)
+  })
+
+  it('shows only available cloud assets in dropdown', () => {
+    mockAssetsData.items = [
+      createTestAsset(
+        'asset-1',
+        'model_a.safetensors',
+        'https://example.com/a.jpg'
+      ),
+      createTestAsset(
+        'asset-2',
+        'model_b.safetensors',
+        'https://example.com/b.jpg'
+      )
+    ]
+
+    const widget = createCloudModeWidget('model_a.safetensors')
+    const wrapper = mountCloudComponent(widget, 'model_a.safetensors')
+
+    const dropdownItems = wrapper.vm.dropdownItems
+    expect(dropdownItems).toHaveLength(2)
+    expect(dropdownItems.map((item) => item.name)).toEqual([
+      'model_a.safetensors',
+      'model_b.safetensors'
+    ])
+  })
+
+  it('returns empty dropdown when no cloud assets available', () => {
+    mockAssetsData.items = []
+
+    const widget = createCloudModeWidget('missing_model.safetensors')
+    const wrapper = mountCloudComponent(widget, 'missing_model.safetensors')
+
+    const dropdownItems = wrapper.vm.dropdownItems
+    expect(dropdownItems).toHaveLength(0)
+  })
+
+  it('includes missing cloud asset in displayItems for input field visibility', () => {
+    mockAssetsData.items = [
+      createTestAsset(
+        'asset-1',
+        'existing_model.safetensors',
+        'https://example.com/preview.jpg'
+      )
+    ]
+
+    const widget = createCloudModeWidget('missing_model.safetensors')
+    const wrapper = mountCloudComponent(widget, 'missing_model.safetensors')
+
+    const displayItems = wrapper.vm.displayItems
+    expect(displayItems).toHaveLength(2)
+    expect(displayItems[0].name).toBe('missing_model.safetensors')
+    expect(displayItems[0].id).toBe('missing-missing_model.safetensors')
+    expect(displayItems[1].name).toBe('existing_model.safetensors')
+
+    const selectedSet = wrapper.vm.selectedSet
+    expect(selectedSet.has('missing-missing_model.safetensors')).toBe(true)
+  })
+})
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.vue
index f460390a23..a4f81983f3 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.vue
@@ -1,17 +1,31 @@
 <script setup lang="ts">
 import { capitalize } from 'es-toolkit'
 import { computed, provide, ref, toRef, watch } from 'vue'
+import { useI18n } from 'vue-i18n'
 
 import { useTransformCompatOverlayProps } from '@/composables/useTransformCompatOverlayProps'
-import { t } from '@/i18n'
+import { appendCloudResParam } from '@/platform/distribution/cloudPreviewUtil'
+import { SUPPORTED_EXTENSIONS_ACCEPT } from '@/extensions/core/load3d/constants'
+import { useAssetFilterOptions } from '@/platform/assets/composables/useAssetFilterOptions'
+import {
+  filterItemByBaseModels,
+  filterItemByOwnership
+} from '@/platform/assets/utils/assetFilterUtils'
+import {
+  getAssetBaseModels,
+  getAssetDisplayName,
+  getAssetFilename
+} from '@/platform/assets/utils/assetMetadataUtils'
 import { useToastStore } from '@/platform/updates/common/toastStore'
 import FormDropdown from '@/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdown.vue'
+import type {
+  FilterOption,
+  OwnershipOption
+} from '@/platform/assets/types/filterTypes'
 import { AssetKindKey } from '@/renderer/extensions/vueNodes/widgets/components/form/dropdown/types'
 import type {
-  DropdownItem,
-  FilterOption,
-  LayoutMode,
-  SelectedKey
+  FormDropdownItem,
+  LayoutMode
 } from '@/renderer/extensions/vueNodes/widgets/components/form/dropdown/types'
 import WidgetLayoutField from '@/renderer/extensions/vueNodes/widgets/components/layout/WidgetLayoutField.vue'
 import { useAssetWidgetData } from '@/renderer/extensions/vueNodes/widgets/composables/useAssetWidgetData'
@@ -32,6 +46,7 @@ interface Props {
   assetKind?: AssetKind
   allowUpload?: boolean
   uploadFolder?: ResultItemType
+  uploadSubfolder?: string
   isAssetMode?: boolean
   defaultLayoutMode?: LayoutMode
 }
@@ -45,10 +60,12 @@ provide(
 
 const modelValue = defineModel<string | undefined>({
   default(props: Props) {
-    return props.widget.options?.values?.[0] || ''
+    const values = props.widget.options?.values
+    return (Array.isArray(values) ? values[0] : undefined) ?? ''
   }
 })
 
+const { t } = useI18n()
 const toastStore = useToastStore()
 const queueStore = useQueueStore()
 
@@ -60,8 +77,10 @@ const combinedProps = computed(() => ({
 }))
 
 const getAssetData = () => {
-  if (props.isAssetMode && props.nodeType) {
-    return useAssetWidgetData(toRef(() => props.nodeType))
+  const nodeType: string | undefined =
+    props.widget.options?.nodeType ?? props.nodeType
+  if (props.isAssetMode && nodeType) {
+    return useAssetWidgetData(toRef(nodeType))
   }
   return null
 }
@@ -71,50 +90,64 @@ const filterSelected = ref('all')
 const filterOptions = computed<FilterOption[]>(() => {
   if (props.isAssetMode) {
     const categoryName = assetData?.category.value ?? 'All'
-    return [{ id: 'all', name: capitalize(categoryName) }]
+    return [{ name: capitalize(categoryName), value: 'all' }]
   }
   return [
-    { id: 'all', name: 'All' },
-    { id: 'inputs', name: 'Inputs' },
-    { id: 'outputs', name: 'Outputs' }
+    { name: 'All', value: 'all' },
+    { name: 'Inputs', value: 'inputs' },
+    { name: 'Outputs', value: 'outputs' }
   ]
 })
 
-const selectedSet = ref<Set<SelectedKey>>(new Set())
+const ownershipSelected = ref<OwnershipOption>('all')
+const showOwnershipFilter = computed(() => props.isAssetMode)
+
+const { ownershipOptions, availableBaseModels } = useAssetFilterOptions(
+  () => assetData?.assets.value ?? []
+)
+
+const baseModelSelected = ref<Set<string>>(new Set())
+const showBaseModelFilter = computed(() => props.isAssetMode)
+const baseModelOptions = computed<FilterOption[]>(() => {
+  if (!props.isAssetMode || !assetData) return []
+  return availableBaseModels.value
+})
+
+const selectedSet = ref<Set<string>>(new Set())
 
 /**
  * Transforms a value using getOptionLabel if available.
- * Falls back to the original value if getOptionLabel is not provided or throws an error.
+ * Falls back to the original value if getOptionLabel is not provided,
+ * returns undefined/null, or throws an error.
  */
 function getDisplayLabel(value: string): string {
   const getOptionLabel = props.widget.options?.getOptionLabel
   if (!getOptionLabel) return value
 
   try {
-    return getOptionLabel(value)
+    return getOptionLabel(value) || value
   } catch (e) {
     console.error('Failed to map value:', e)
     return value
   }
 }
 
-const inputItems = computed<DropdownItem[]>(() => {
+const inputItems = computed<FormDropdownItem[]>(() => {
   const values = props.widget.options?.values || []
 
   if (!Array.isArray(values)) {
     return []
   }
 
-  return values.map((value: string, index: number) => ({
+  return values.map((value, index) => ({
     id: `input-${index}`,
-    mediaSrc: getMediaUrl(value, 'input'),
-    name: value,
-    label: getDisplayLabel(value),
-    metadata: ''
+    preview_url: getMediaUrl(String(value), 'input'),
+    name: String(value),
+    label: getDisplayLabel(String(value))
   }))
 })
-const outputItems = computed<DropdownItem[]>(() => {
-  if (!['image', 'video'].includes(props.assetKind ?? '')) return []
+const outputItems = computed<FormDropdownItem[]>(() => {
+  if (!['image', 'video', 'mesh'].includes(props.assetKind ?? '')) return []
 
   const outputs = new Set<string>()
 
@@ -123,7 +156,8 @@ const outputItems = computed<DropdownItem[]>(() => {
     task.flatOutputs.forEach((output) => {
       const isTargetType =
         (props.assetKind === 'image' && output.mediaType === 'images') ||
-        (props.assetKind === 'video' && output.mediaType === 'video')
+        (props.assetKind === 'video' && output.mediaType === 'video') ||
+        (props.assetKind === 'mesh' && output.is3D)
 
       if (output.type === 'output' && isTargetType) {
         const path = output.subfolder
@@ -138,21 +172,101 @@ const outputItems = computed<DropdownItem[]>(() => {
 
   return Array.from(outputs).map((output) => ({
     id: `output-${output}`,
-    mediaSrc: getMediaUrl(output.replace(' [output]', ''), 'output'),
+    preview_url: getMediaUrl(output.replace(' [output]', ''), 'output'),
     name: output,
-    label: getDisplayLabel(output),
-    metadata: ''
+    label: getDisplayLabel(output)
   }))
 })
 
-const allItems = computed<DropdownItem[]>(() => {
+/**
+ * Creates a fallback item for the current modelValue when it doesn't exist
+ * in the available items list. This handles cases like template-loaded nodes
+ * where the saved value may not exist in the current server environment.
+ * Works for both local mode (inputItems/outputItems) and cloud mode (assetData).
+ */
+const missingValueItem = computed<FormDropdownItem | undefined>(() => {
+  const currentValue = modelValue.value
+  if (!currentValue) return undefined
+
+  // Check in cloud mode assets
   if (props.isAssetMode && assetData) {
-    return assetData.dropdownItems.value
+    const existsInAssets = assetData.assets.value.some(
+      (asset) => getAssetFilename(asset) === currentValue
+    )
+    if (existsInAssets) return undefined
+
+    return {
+      id: `missing-${currentValue}`,
+      preview_url: '',
+      name: currentValue,
+      label: getDisplayLabel(currentValue)
+    }
+  }
+
+  // Check in local mode inputs/outputs
+  const existsInInputs = inputItems.value.some(
+    (item) => item.name === currentValue
+  )
+  const existsInOutputs = outputItems.value.some(
+    (item) => item.name === currentValue
+  )
+
+  if (existsInInputs || existsInOutputs) return undefined
+
+  const isOutput = currentValue.endsWith(' [output]')
+  const strippedValue = isOutput
+    ? currentValue.replace(' [output]', '')
+    : currentValue
+
+  return {
+    id: `missing-${currentValue}`,
+    preview_url: getMediaUrl(strippedValue, isOutput ? 'output' : 'input'),
+    name: currentValue,
+    label: getDisplayLabel(currentValue)
   }
-  return [...inputItems.value, ...outputItems.value]
 })
 
-const dropdownItems = computed<DropdownItem[]>(() => {
+/**
+ * Transforms AssetItem[] to FormDropdownItem[] for cloud mode.
+ * Uses getAssetFilename for display name, asset.name for label.
+ */
+const assetItems = computed<FormDropdownItem[]>(() => {
+  if (!props.isAssetMode || !assetData) return []
+  return assetData.assets.value.map((asset) => ({
+    id: asset.id,
+    name: getAssetFilename(asset),
+    label: getAssetDisplayName(asset),
+    preview_url: asset.preview_url,
+    is_immutable: asset.is_immutable,
+    base_models: getAssetBaseModels(asset)
+  }))
+})
+
+const ownershipFilteredAssetItems = computed<FormDropdownItem[]>(() =>
+  filterItemByOwnership(assetItems.value, ownershipSelected.value)
+)
+
+const baseModelFilteredAssetItems = computed<FormDropdownItem[]>(() =>
+  filterItemByBaseModels(
+    ownershipFilteredAssetItems.value,
+    baseModelSelected.value
+  )
+)
+
+const allItems = computed<FormDropdownItem[]>(() => {
+  if (props.isAssetMode && assetData) {
+    // Cloud assets not in user's library shouldn't appear as search results (COM-14333).
+    // Unlike local mode, cloud users can't access files they don't own.
+    return baseModelFilteredAssetItems.value
+  }
+  return [
+    ...(missingValueItem.value ? [missingValueItem.value] : []),
+    ...inputItems.value,
+    ...outputItems.value
+  ]
+})
+
+const dropdownItems = computed<FormDropdownItem[]>(() => {
   if (props.isAssetMode) {
     return allItems.value
   }
@@ -164,10 +278,21 @@ const dropdownItems = computed<DropdownItem[]>(() => {
       return outputItems.value
     case 'all':
     default:
-      return [...inputItems.value, ...outputItems.value]
+      return allItems.value
   }
 })
 
+/**
+ * Items used for display in the input field. In cloud mode, includes
+ * missing items so users can see their selected value even if not in library.
+ */
+const displayItems = computed<FormDropdownItem[]>(() => {
+  if (props.isAssetMode && assetData && missingValueItem.value) {
+    return [missingValueItem.value, ...baseModelFilteredAssetItems.value]
+  }
+  return dropdownItems.value
+})
+
 const mediaPlaceholder = computed(() => {
   const options = props.widget.options
 
@@ -182,6 +307,8 @@ const mediaPlaceholder = computed(() => {
       return t('widgets.uploadSelect.placeholderVideo')
     case 'audio':
       return t('widgets.uploadSelect.placeholderAudio')
+    case 'mesh':
+      return t('widgets.uploadSelect.placeholderMesh')
     case 'model':
       return t('widgets.uploadSelect.placeholderModel')
     case 'unknown':
@@ -206,6 +333,8 @@ const acceptTypes = computed(() => {
       return 'video/*'
     case 'audio':
       return 'audio/*'
+    case 'mesh':
+      return SUPPORTED_EXTENSIONS_ACCEPT
     default:
       return undefined // model or unknown
   }
@@ -214,24 +343,26 @@ const acceptTypes = computed(() => {
 const layoutMode = ref<LayoutMode>(props.defaultLayoutMode ?? 'grid')
 
 watch(
-  [modelValue, dropdownItems],
-  ([currentValue, _dropdownItems]) => {
+  [modelValue, displayItems],
+  ([currentValue]) => {
     if (currentValue === undefined) {
       selectedSet.value.clear()
       return
     }
 
-    const item = dropdownItems.value.find((item) => item.name === currentValue)
-    if (item) {
+    const item = displayItems.value.find((item) => item.name === currentValue)
+    if (!item) {
       selectedSet.value.clear()
-      selectedSet.value.add(item.id)
+      return
     }
+    selectedSet.value.clear()
+    selectedSet.value.add(item.id)
   },
   { immediate: true }
 )
 
-function updateSelectedItems(selectedItems: Set<SelectedKey>) {
-  let id: SelectedKey | undefined = undefined
+function updateSelectedItems(selectedItems: Set<string>) {
+  let id: string | undefined = undefined
   if (selectedItems.size > 0) {
     id = selectedItems.values().next().value!
   }
@@ -247,7 +378,6 @@ function updateSelectedItems(selectedItems: Set<SelectedKey>) {
   modelValue.value = name
 }
 
-// Upload file function (copied from useNodeImageUpload.ts)
 const uploadFile = async (
   file: File,
   isPasted: boolean = false,
@@ -256,6 +386,8 @@ const uploadFile = async (
   const body = new FormData()
   body.append('image', file)
   if (isPasted) body.append('subfolder', 'pasted')
+  else if (props.uploadSubfolder)
+    body.append('subfolder', props.uploadSubfolder)
   if (formFields.type) body.append('type', formFields.type)
 
   const resp = await api.fetchApi('/upload/image', {
@@ -279,7 +411,6 @@ const uploadFile = async (
   return data.subfolder ? `${data.subfolder}/${data.name}` : data.name
 }
 
-// Handle multiple file uploads
 const uploadFiles = async (files: File[]): Promise<string[]> => {
   const folder = props.uploadFolder ?? 'input'
   const uploadPromises = files.map((file) =>
@@ -303,9 +434,9 @@ async function handleFilesUpdate(files: File[]) {
 
     // 2. Update widget options to include new files
     // This simulates what addToComboValues does but for SimplifiedWidget
-    if (props.widget.options?.values) {
+    const values = props.widget.options?.values
+    if (Array.isArray(values)) {
       uploadedPaths.forEach((path) => {
-        const values = props.widget.options!.values as string[]
         if (!values.includes(path)) {
           values.push(path)
         }
@@ -330,7 +461,9 @@ function getMediaUrl(
   type: 'input' | 'output' = 'input'
 ): string {
   if (!['image', 'video'].includes(props.assetKind ?? '')) return ''
-  return `/api/view?filename=${encodeURIComponent(filename)}&type=${type}`
+  const params = new URLSearchParams({ filename, type })
+  appendCloudResParam(params, filename)
+  return `/api/view?${params}`
 }
 </script>
 
@@ -340,12 +473,19 @@ function getMediaUrl(
       v-model:selected="selectedSet"
       v-model:filter-selected="filterSelected"
       v-model:layout-mode="layoutMode"
+      v-model:ownership-selected="ownershipSelected"
+      v-model:base-model-selected="baseModelSelected"
       :items="dropdownItems"
+      :display-items="displayItems"
       :placeholder="mediaPlaceholder"
       :multiple="false"
-      :uploadable="uploadable"
+      :uploadable
       :accept="acceptTypes"
-      :filter-options="filterOptions"
+      :filter-options
+      :show-ownership-filter
+      :ownership-options
+      :show-base-model-filter
+      :base-model-options
       v-bind="combinedProps"
       class="w-full"
       @update:selected="updateSelectedItems"
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetTextarea.stories.ts b/src/renderer/extensions/vueNodes/widgets/components/WidgetTextarea.stories.ts
new file mode 100644
index 0000000000..b0e8916396
--- /dev/null
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetTextarea.stories.ts
@@ -0,0 +1,130 @@
+import type {
+  ComponentPropsAndSlots,
+  Meta,
+  StoryObj
+} from '@storybook/vue3-vite'
+import { computed, provide, ref, toRefs } from 'vue'
+
+import type { SimplifiedWidget } from '@/types/simplifiedWidget'
+import { HideLayoutFieldKey } from '@/types/widgetTypes'
+
+import WidgetTextarea from './WidgetTextarea.vue'
+
+interface StoryArgs extends ComponentPropsAndSlots<typeof WidgetTextarea> {
+  readOnly: boolean
+  disabled: boolean
+}
+
+const meta: Meta<StoryArgs> = {
+  title: 'Widgets/WidgetTextarea',
+  component: WidgetTextarea,
+  tags: ['autodocs'],
+  parameters: {
+    layout: 'centered',
+    docs: {
+      description: {
+        component: [
+          'Multi-line text input with optional label.',
+          'Captures wheel, pointer, and context menu events to prevent canvas interference.',
+          'Shows a copy-to-clipboard button on hover.'
+        ].join(' ')
+      }
+    }
+  },
+  argTypes: {
+    readOnly: { control: 'boolean' },
+    disabled: { control: 'boolean' }
+  },
+  args: {
+    readOnly: false,
+    disabled: false
+  },
+  decorators: [
+    (story) => ({
+      components: { story },
+      template: '<div class="w-80 h-40"><story /></div>'
+    })
+  ]
+}
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const Default: Story = {
+  render: (args) => ({
+    components: { WidgetTextarea },
+    setup() {
+      const { readOnly, disabled } = toRefs(args)
+      const value = ref('A multi-line text area for entering prompts.')
+      const widget = computed<SimplifiedWidget<string>>(() => ({
+        name: 'prompt',
+        type: 'STRING',
+        value: '',
+        label: 'Prompt',
+        options: {
+          read_only: readOnly.value,
+          disabled: disabled.value
+        }
+      }))
+      return { value, widget }
+    },
+    template:
+      '<WidgetTextarea :widget="widget" v-model="value" placeholder="Enter prompt..." />'
+  })
+}
+
+export const Disabled: Story = {
+  args: { disabled: true },
+  render: (args) => ({
+    components: { WidgetTextarea },
+    setup() {
+      const { disabled } = toRefs(args)
+      const value = ref('This textarea is disabled via widget options.')
+      const widget = computed<SimplifiedWidget<string>>(() => ({
+        name: 'locked',
+        type: 'STRING',
+        value: '',
+        label: 'Locked Field',
+        options: { disabled: disabled.value }
+      }))
+      return { value, widget }
+    },
+    template: '<WidgetTextarea :widget="widget" v-model="value" />'
+  })
+}
+
+export const HiddenLabel: Story = {
+  render: () => ({
+    components: { WidgetTextarea },
+    setup() {
+      provide(HideLayoutFieldKey, true)
+      const value = ref('Label is hidden via HideLayoutFieldKey injection.')
+      const widget: SimplifiedWidget<string> = {
+        name: 'notes',
+        type: 'STRING',
+        value: '',
+        label: 'Notes'
+      }
+      return { value, widget }
+    },
+    template: '<WidgetTextarea :widget="widget" v-model="value" />'
+  })
+}
+
+export const WithPlaceholder: Story = {
+  render: () => ({
+    components: { WidgetTextarea },
+    setup() {
+      const value = ref('')
+      const widget: SimplifiedWidget<string> = {
+        name: 'negative',
+        type: 'STRING',
+        value: '',
+        label: 'Negative Prompt'
+      }
+      return { value, widget }
+    },
+    template:
+      '<WidgetTextarea :widget="widget" v-model="value" placeholder="Describe what to avoid..." />'
+  })
+}
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetTextarea.test.ts b/src/renderer/extensions/vueNodes/widgets/components/WidgetTextarea.test.ts
index e15f329449..1f017afc31 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetTextarea.test.ts
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetTextarea.test.ts
@@ -1,24 +1,30 @@
 import { mount } from '@vue/test-utils'
-import PrimeVue from 'primevue/config'
-import Textarea from 'primevue/textarea'
-import { describe, expect, it } from 'vitest'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import type { SimplifiedWidget } from '@/types/simplifiedWidget'
 
 import WidgetTextarea from './WidgetTextarea.vue'
+import { createMockWidget } from './widgetTestUtils'
 
-function createMockWidget(
+const mockCopyToClipboard = vi.hoisted(() => vi.fn())
+
+vi.mock('@/composables/useCopyToClipboard', () => ({
+  useCopyToClipboard: vi.fn().mockReturnValue({
+    copyToClipboard: mockCopyToClipboard
+  })
+}))
+
+function createTextareaWidget(
   value: string = 'default text',
-  options: SimplifiedWidget['options'] = {},
+  options: SimplifiedWidget<string>['options'] = {},
   callback?: (value: string) => void
-): SimplifiedWidget<string> {
-  return {
-    name: 'test_textarea',
-    type: 'string',
+) {
+  return createMockWidget<string>({
     value,
+    name: 'test_textarea',
     options,
     callback
-  }
+  })
 }
 
 function mountComponent(
@@ -28,15 +34,16 @@ function mountComponent(
   placeholder?: string
 ) {
   return mount(WidgetTextarea, {
-    global: {
-      plugins: [PrimeVue],
-      components: { Textarea }
-    },
     props: {
       widget,
       modelValue,
       readonly,
       placeholder
+    },
+    global: {
+      mocks: {
+        $t: (msg: string) => msg
+      }
     }
   })
 }
@@ -60,7 +67,7 @@ async function setTextareaValueAndTrigger(
 describe('WidgetTextarea Value Binding', () => {
   describe('Vue Event Emission', () => {
     it('emits Vue event when textarea value changes on blur', async () => {
-      const widget = createMockWidget('hello')
+      const widget = createTextareaWidget('hello')
       const wrapper = mountComponent(widget, 'hello')
 
       await setTextareaValueAndTrigger(wrapper, 'world', 'blur')
@@ -71,7 +78,7 @@ describe('WidgetTextarea Value Binding', () => {
     })
 
     it('emits Vue event when textarea value changes on input', async () => {
-      const widget = createMockWidget('initial')
+      const widget = createTextareaWidget('initial')
       const wrapper = mountComponent(widget, 'initial')
 
       await setTextareaValueAndTrigger(wrapper, 'new content', 'input')
@@ -82,7 +89,7 @@ describe('WidgetTextarea Value Binding', () => {
     })
 
     it('handles empty string values', async () => {
-      const widget = createMockWidget('something')
+      const widget = createTextareaWidget('something')
       const wrapper = mountComponent(widget, 'something')
 
       await setTextareaValueAndTrigger(wrapper, '')
@@ -93,7 +100,7 @@ describe('WidgetTextarea Value Binding', () => {
     })
 
     it('handles multiline text correctly', async () => {
-      const widget = createMockWidget('single line')
+      const widget = createTextareaWidget('single line')
       const wrapper = mountComponent(widget, 'single line')
 
       const multilineText = 'Line 1\nLine 2\nLine 3'
@@ -105,7 +112,7 @@ describe('WidgetTextarea Value Binding', () => {
     })
 
     it('handles special characters correctly', async () => {
-      const widget = createMockWidget('normal')
+      const widget = createTextareaWidget('normal')
       const wrapper = mountComponent(widget, 'normal')
 
       const specialText = 'special @#$%^&*()[]{}|\\:";\'<>?,./'
@@ -117,7 +124,7 @@ describe('WidgetTextarea Value Binding', () => {
     })
 
     it('handles missing callback gracefully', async () => {
-      const widget = createMockWidget('test', {}, undefined)
+      const widget = createTextareaWidget('test', {}, undefined)
       const wrapper = mountComponent(widget, 'test')
 
       await setTextareaValueAndTrigger(wrapper, 'new value')
@@ -131,7 +138,7 @@ describe('WidgetTextarea Value Binding', () => {
 
   describe('User Interactions', () => {
     it('emits update:modelValue on blur', async () => {
-      const widget = createMockWidget('original')
+      const widget = createTextareaWidget('original')
       const wrapper = mountComponent(widget, 'original')
 
       await setTextareaValueAndTrigger(wrapper, 'updated')
@@ -142,7 +149,7 @@ describe('WidgetTextarea Value Binding', () => {
     })
 
     it('emits update:modelValue on input', async () => {
-      const widget = createMockWidget('start')
+      const widget = createTextareaWidget('start')
       const wrapper = mountComponent(widget, 'start')
 
       await setTextareaValueAndTrigger(wrapper, 'finish', 'input')
@@ -155,7 +162,7 @@ describe('WidgetTextarea Value Binding', () => {
 
   describe('Component Rendering', () => {
     it('renders textarea component', () => {
-      const widget = createMockWidget('test value')
+      const widget = createTextareaWidget('test value')
       const wrapper = mountComponent(widget, 'test value')
 
       const textarea = wrapper.find('textarea')
@@ -163,7 +170,7 @@ describe('WidgetTextarea Value Binding', () => {
     })
 
     it('displays initial value in textarea', () => {
-      const widget = createMockWidget('initial content')
+      const widget = createTextareaWidget('initial content')
       const wrapper = mountComponent(widget, 'initial content')
 
       const textarea = wrapper.find('textarea')
@@ -176,7 +183,7 @@ describe('WidgetTextarea Value Binding', () => {
     })
 
     it('uses widget name as placeholder when no placeholder provided', () => {
-      const widget = createMockWidget('test')
+      const widget = createTextareaWidget('test')
       const wrapper = mountComponent(widget, 'test')
 
       const textareaLabel = wrapper.find('label')
@@ -184,7 +191,7 @@ describe('WidgetTextarea Value Binding', () => {
     })
 
     it('uses provided placeholder when specified', () => {
-      const widget = createMockWidget('test')
+      const widget = createTextareaWidget('test')
       const wrapper = mountComponent(
         widget,
         'test',
@@ -196,10 +203,45 @@ describe('WidgetTextarea Value Binding', () => {
       expect(textarea.attributes('placeholder')).toBe('Custom placeholder')
     })
   })
+  describe('Copy Button Behavior', () => {
+    beforeEach(() => {
+      mockCopyToClipboard.mockClear()
+    })
+
+    it('hides copy button when not read-only', async () => {
+      const widget = createTextareaWidget('test')
+      const wrapper = mountComponent(widget, 'test', false)
+
+      const button = wrapper.find('button')
+      expect(button.exists()).toBe(false)
+    })
+
+    it('copy button has invisible class by default when read-only', () => {
+      const widget = createTextareaWidget('test', { read_only: true })
+      const wrapper = mountComponent(widget, 'test', true)
+
+      const button = wrapper.find('button')
+      expect(button.exists()).toBe(true)
+      expect(button.classes()).toContain('invisible')
+    })
+
+    it('copy button has group-hover:visible class when read-only, and copies on click', async () => {
+      const widget = createTextareaWidget('test value', { read_only: true })
+      const wrapper = mountComponent(widget, 'test value', true)
+
+      const button = wrapper.find('button')
+      expect(button.exists()).toBe(true)
+      expect(button.classes()).toContain('group-hover:visible')
+
+      await button.trigger('click')
+
+      expect(mockCopyToClipboard).toHaveBeenCalledWith('test value')
+    })
+  })
 
   describe('Edge Cases', () => {
     it('handles very long text', async () => {
-      const widget = createMockWidget('short')
+      const widget = createTextareaWidget('short')
       const wrapper = mountComponent(widget, 'short')
 
       const longText = 'a'.repeat(10000)
@@ -211,7 +253,7 @@ describe('WidgetTextarea Value Binding', () => {
     })
 
     it('handles unicode characters', async () => {
-      const widget = createMockWidget('ascii')
+      const widget = createTextareaWidget('ascii')
       const wrapper = mountComponent(widget, 'ascii')
 
       const unicodeText = '🎨 Unicode: αβγ 中文 العربية 🚀'
@@ -223,7 +265,7 @@ describe('WidgetTextarea Value Binding', () => {
     })
 
     it('handles text with tabs and spaces', async () => {
-      const widget = createMockWidget('normal')
+      const widget = createTextareaWidget('normal')
       const wrapper = mountComponent(widget, 'normal')
 
       const formattedText = '\tIndented line\n  Spaced line\n\t\tDouble indent'
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetTextarea.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetTextarea.vue
index 25876f5395..4023deaa33 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetTextarea.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetTextarea.vue
@@ -1,38 +1,61 @@
 <template>
-  <FloatLabel
-    variant="in"
+  <div
     :class="
       cn(
-        'rounded-lg space-y-1 focus-within:ring focus-within:ring-component-node-widget-background-highlighted transition-all',
+        'group relative rounded-lg transition-all focus-within:ring focus-within:ring-component-node-widget-background-highlighted hover:bg-component-node-widget-background-hovered',
         widget.borderStyle
       )
     "
   >
+    <label
+      v-if="!hideLayoutField"
+      :for="id"
+      class="pointer-events-none absolute top-1.5 left-3 z-10 text-xxs text-muted-foreground"
+    >
+      {{ displayName }}
+    </label>
     <Textarea
       v-bind="filteredProps"
       :id
       v-model="modelValue"
-      :class="cn(WidgetInputBaseClass, 'size-full text-xs resize-none')"
+      :class="
+        cn(
+          WidgetInputBaseClass,
+          'size-full resize-none text-xs',
+          !hideLayoutField && 'pt-5'
+        )
+      "
       :placeholder
-      :readonly="widget.options?.read_only"
-      :disabled="widget.options?.read_only"
-      fluid
+      :readonly="isReadOnly"
       data-capture-wheel="true"
       @pointerdown.capture.stop
       @pointermove.capture.stop
       @pointerup.capture.stop
       @contextmenu.capture.stop
     />
-    <label :for="id">{{ displayName }}</label>
-  </FloatLabel>
+    <Button
+      v-if="isReadOnly"
+      variant="textonly"
+      size="icon"
+      class="invisible absolute top-1.5 right-1.5 z-10 group-focus-within:visible group-hover:visible hover:bg-base-foreground/10"
+      :title="$t('g.copyToClipboard')"
+      :aria-label="$t('g.copyToClipboard')"
+      @click="handleCopy"
+      @pointerdown.capture.stop
+    >
+      <i class="icon-[lucide--copy] size-4 text-component-node-foreground" />
+    </Button>
+  </div>
 </template>
 
 <script setup lang="ts">
-import FloatLabel from 'primevue/floatlabel'
-import Textarea from 'primevue/textarea'
 import { computed, useId } from 'vue'
 
+import Button from '@/components/ui/button/Button.vue'
+import Textarea from '@/components/ui/textarea/Textarea.vue'
+import { useCopyToClipboard } from '@/composables/useCopyToClipboard'
 import type { SimplifiedWidget } from '@/types/simplifiedWidget'
+import { useHideLayoutField } from '@/types/widgetTypes'
 import { cn } from '@/utils/tailwindUtil'
 import {
   INPUT_EXCLUDED_PROPS,
@@ -48,10 +71,21 @@ const { widget, placeholder = '' } = defineProps<{
 
 const modelValue = defineModel<string>({ default: '' })
 
+const hideLayoutField = useHideLayoutField()
+const { copyToClipboard } = useCopyToClipboard()
+
 const filteredProps = computed(() =>
   filterWidgetProps(widget.options, INPUT_EXCLUDED_PROPS)
 )
 
 const displayName = computed(() => widget.label || widget.name)
 const id = useId()
+
+const isReadOnly = computed(() =>
+  Boolean(widget.options?.read_only || widget.options?.disabled)
+)
+
+function handleCopy() {
+  copyToClipboard(modelValue.value)
+}
 </script>
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetToggleSwitch.test.ts b/src/renderer/extensions/vueNodes/widgets/components/WidgetToggleSwitch.test.ts
index 7e7a876484..ccc7194df8 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetToggleSwitch.test.ts
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetToggleSwitch.test.ts
@@ -1,25 +1,44 @@
 import { mount } from '@vue/test-utils'
 import PrimeVue from 'primevue/config'
 import ToggleSwitch from 'primevue/toggleswitch'
-import type { ToggleSwitchProps } from 'primevue/toggleswitch'
+import { createI18n } from 'vue-i18n'
 import { describe, expect, it } from 'vitest'
 
+import { ToggleGroup, ToggleGroupItem } from '@/components/ui/toggle-group'
+import type { IWidgetOptions } from '@/lib/litegraph/src/types/widgets'
 import type { SimplifiedWidget } from '@/types/simplifiedWidget'
 
 import WidgetToggleSwitch from './WidgetToggleSwitch.vue'
+import { createMockWidget } from './widgetTestUtils'
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      widgets: {
+        boolean: {
+          true: 'true',
+          false: 'false'
+        }
+      }
+    }
+  }
+})
 
 describe('WidgetToggleSwitch Value Binding', () => {
-  const createMockWidget = (
+  const createToggleWidget = (
     value: boolean = false,
-    options: Partial<ToggleSwitchProps> = {},
+    options: IWidgetOptions = {},
     callback?: (value: boolean) => void
-  ): SimplifiedWidget<boolean> => ({
-    name: 'test_toggle',
-    type: 'boolean',
-    value,
-    options,
-    callback
-  })
+  ) =>
+    createMockWidget<boolean>({
+      value,
+      name: 'test_toggle',
+      type: 'boolean',
+      options,
+      callback
+    })
 
   const mountComponent = (
     widget: SimplifiedWidget<boolean>,
@@ -33,15 +52,15 @@ describe('WidgetToggleSwitch Value Binding', () => {
         readonly
       },
       global: {
-        plugins: [PrimeVue],
-        components: { ToggleSwitch }
+        plugins: [PrimeVue, i18n],
+        components: { ToggleSwitch, ToggleGroup, ToggleGroupItem }
       }
     })
   }
 
   describe('Vue Event Emission', () => {
     it('emits Vue event when toggled from false to true', async () => {
-      const widget = createMockWidget(false)
+      const widget = createToggleWidget(false)
       const wrapper = mountComponent(widget, false)
 
       const toggle = wrapper.findComponent({ name: 'ToggleSwitch' })
@@ -53,7 +72,7 @@ describe('WidgetToggleSwitch Value Binding', () => {
     })
 
     it('emits Vue event when toggled from true to false', async () => {
-      const widget = createMockWidget(true)
+      const widget = createToggleWidget(true)
       const wrapper = mountComponent(widget, true)
 
       const toggle = wrapper.findComponent({ name: 'ToggleSwitch' })
@@ -65,15 +84,13 @@ describe('WidgetToggleSwitch Value Binding', () => {
     })
 
     it('handles value changes gracefully', async () => {
-      const widget = createMockWidget(false)
+      const widget = createToggleWidget(false)
       const wrapper = mountComponent(widget, false)
 
-      // Should not throw when changing values
       const toggle = wrapper.findComponent({ name: 'ToggleSwitch' })
       await toggle.setValue(true)
       await toggle.setValue(false)
 
-      // Should emit events for all changes
       const emitted = wrapper.emitted('update:modelValue')
       expect(emitted).toHaveLength(2)
       expect(emitted![0]).toContain(true)
@@ -83,7 +100,7 @@ describe('WidgetToggleSwitch Value Binding', () => {
 
   describe('Component Rendering', () => {
     it('renders toggle switch component', () => {
-      const widget = createMockWidget(false)
+      const widget = createToggleWidget(false)
       const wrapper = mountComponent(widget, false)
 
       expect(wrapper.findComponent({ name: 'ToggleSwitch' }).exists()).toBe(
@@ -92,7 +109,7 @@ describe('WidgetToggleSwitch Value Binding', () => {
     })
 
     it('displays correct initial state for false', () => {
-      const widget = createMockWidget(false)
+      const widget = createToggleWidget(false)
       const wrapper = mountComponent(widget, false)
 
       const toggle = wrapper.findComponent({ name: 'ToggleSwitch' })
@@ -100,7 +117,7 @@ describe('WidgetToggleSwitch Value Binding', () => {
     })
 
     it('displays correct initial state for true', () => {
-      const widget = createMockWidget(true)
+      const widget = createToggleWidget(true)
       const wrapper = mountComponent(widget, true)
 
       const toggle = wrapper.findComponent({ name: 'ToggleSwitch' })
@@ -110,17 +127,15 @@ describe('WidgetToggleSwitch Value Binding', () => {
 
   describe('Multiple Value Changes', () => {
     it('handles rapid toggling correctly', async () => {
-      const widget = createMockWidget(false)
+      const widget = createToggleWidget(false)
       const wrapper = mountComponent(widget, false)
 
       const toggle = wrapper.findComponent({ name: 'ToggleSwitch' })
 
-      // Rapid toggle sequence
       await toggle.setValue(true)
       await toggle.setValue(false)
       await toggle.setValue(true)
 
-      // Should have emitted 3 Vue events with correct values
       const emitted = wrapper.emitted('update:modelValue')
       expect(emitted).toHaveLength(3)
       expect(emitted![0]).toContain(true)
@@ -129,12 +144,11 @@ describe('WidgetToggleSwitch Value Binding', () => {
     })
 
     it('maintains state consistency during multiple changes', async () => {
-      const widget = createMockWidget(false)
+      const widget = createToggleWidget(false)
       const wrapper = mountComponent(widget, false)
 
       const toggle = wrapper.findComponent({ name: 'ToggleSwitch' })
 
-      // Multiple state changes
       await toggle.setValue(true)
       await toggle.setValue(false)
       await toggle.setValue(true)
@@ -142,11 +156,146 @@ describe('WidgetToggleSwitch Value Binding', () => {
 
       const emitted = wrapper.emitted('update:modelValue')
       expect(emitted).toHaveLength(4)
-      // Verify alternating pattern
       expect(emitted![0]).toContain(true)
       expect(emitted![1]).toContain(false)
       expect(emitted![2]).toContain(true)
       expect(emitted![3]).toContain(false)
     })
   })
+
+  describe('Label Display (label_on/label_off)', () => {
+    it('renders ToggleGroup when labels are provided', () => {
+      const widget = createToggleWidget(false, { on: 'inside', off: 'outside' })
+      const wrapper = mountComponent(widget, false)
+
+      expect(wrapper.findComponent({ name: 'ToggleGroupRoot' }).exists()).toBe(
+        true
+      )
+      expect(wrapper.findComponent({ name: 'ToggleSwitch' }).exists()).toBe(
+        false
+      )
+    })
+
+    it('renders ToggleSwitch when no labels are provided', () => {
+      const widget = createToggleWidget(false, {})
+      const wrapper = mountComponent(widget, false)
+
+      expect(wrapper.findComponent({ name: 'ToggleSwitch' }).exists()).toBe(
+        true
+      )
+      expect(wrapper.findComponent({ name: 'ToggleGroupRoot' }).exists()).toBe(
+        false
+      )
+    })
+
+    it('displays both on and off labels in ToggleGroup', () => {
+      const widget = createToggleWidget(false, { on: 'inside', off: 'outside' })
+      const wrapper = mountComponent(widget, false)
+
+      expect(wrapper.text()).toContain('inside')
+      expect(wrapper.text()).toContain('outside')
+    })
+
+    it('selects correct option based on boolean value (false)', () => {
+      const widget = createToggleWidget(false, {
+        on: 'enabled',
+        off: 'disabled'
+      })
+      const wrapper = mountComponent(widget, false)
+
+      const toggleGroup = wrapper.findComponent({ name: 'ToggleGroupRoot' })
+      expect(toggleGroup.props('modelValue')).toBe('off')
+    })
+
+    it('selects correct option based on boolean value (true)', () => {
+      const widget = createToggleWidget(true, {
+        on: 'enabled',
+        off: 'disabled'
+      })
+      const wrapper = mountComponent(widget, true)
+
+      const toggleGroup = wrapper.findComponent({ name: 'ToggleGroupRoot' })
+      expect(toggleGroup.props('modelValue')).toBe('on')
+    })
+
+    it('emits true when "on" option is clicked', async () => {
+      const widget = createToggleWidget(false, {
+        on: 'enabled',
+        off: 'disabled'
+      })
+      const wrapper = mountComponent(widget, false)
+
+      const buttons = wrapper.findAll('button')
+      const onButton = buttons.find((b) => b.text() === 'enabled')
+      await onButton!.trigger('click')
+
+      const emitted = wrapper.emitted('update:modelValue')
+      expect(emitted).toBeDefined()
+      expect(emitted![0]).toContain(true)
+    })
+
+    it('emits false when "off" option is clicked', async () => {
+      const widget = createToggleWidget(true, {
+        on: 'enabled',
+        off: 'disabled'
+      })
+      const wrapper = mountComponent(widget, true)
+
+      const buttons = wrapper.findAll('button')
+      const offButton = buttons.find((b) => b.text() === 'disabled')
+      await offButton!.trigger('click')
+
+      const emitted = wrapper.emitted('update:modelValue')
+      expect(emitted).toBeDefined()
+      expect(emitted![0]).toContain(false)
+    })
+
+    it('falls back to i18n defaults when only partial options provided', () => {
+      const widgetOnOnly = createToggleWidget(true, { on: 'active' })
+      const wrapperOn = mountComponent(widgetOnOnly, true)
+      expect(wrapperOn.text()).toContain('active')
+      expect(wrapperOn.text()).toContain('false')
+
+      const widgetOffOnly = createToggleWidget(false, { off: 'inactive' })
+      const wrapperOff = mountComponent(widgetOffOnly, false)
+      expect(wrapperOff.text()).toContain('inactive')
+      expect(wrapperOff.text()).toContain('true')
+    })
+
+    it('treats empty string labels as explicit values', () => {
+      const widget = createToggleWidget(false, { on: '', off: 'disabled' })
+      const wrapper = mountComponent(widget, false)
+
+      expect(wrapper.findComponent({ name: 'ToggleGroupRoot' }).exists()).toBe(
+        true
+      )
+      expect(wrapper.findComponent({ name: 'ToggleSwitch' }).exists()).toBe(
+        false
+      )
+      expect(wrapper.text()).not.toContain('true')
+    })
+
+    it('disables ToggleGroup when read_only option is set', () => {
+      const widget = createToggleWidget(false, {
+        on: 'yes',
+        off: 'no',
+        read_only: true
+      })
+      const wrapper = mountComponent(widget, false)
+
+      const toggleGroup = wrapper.findComponent({ name: 'ToggleGroupRoot' })
+      expect(toggleGroup.props('disabled')).toBe(true)
+    })
+
+    it('does not emit when clicking already-selected option', async () => {
+      const widget = createToggleWidget(false, { on: 'yes', off: 'no' })
+      const wrapper = mountComponent(widget, false)
+
+      const buttons = wrapper.findAll('button')
+      const offButton = buttons.find((b) => b.text() === 'no')
+      await offButton!.trigger('click')
+
+      expect(wrapper.emitted('update:modelValue')).toBeUndefined()
+    })
+  })
 })
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetToggleSwitch.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetToggleSwitch.vue
index b902b6655e..9aab71160e 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetToggleSwitch.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetToggleSwitch.vue
@@ -1,33 +1,79 @@
 <template>
   <WidgetLayoutField :widget>
-    <ToggleSwitch
-      v-model="modelValue"
-      v-bind="filteredProps"
-      class="ml-auto block"
-      :aria-label="widget.name"
-    />
+    <!-- Use ToggleGroup when explicit labels are provided -->
+    <ToggleGroup
+      v-if="hasLabels"
+      type="single"
+      :model-value="modelValue ? 'on' : 'off'"
+      :disabled="Boolean(widget.options?.read_only)"
+      :class="
+        cn(
+          WidgetInputBaseClass,
+          'flex w-full min-w-0 items-center justify-center gap-1 p-1'
+        )
+      "
+      @update:model-value="(v) => handleOptionChange(v as string)"
+    >
+      <ToggleGroupItem value="off" size="sm">
+        {{ widget.options?.off ?? t('widgets.boolean.false') }}
+      </ToggleGroupItem>
+      <ToggleGroupItem value="on" size="sm">
+        {{ widget.options?.on ?? t('widgets.boolean.true') }}
+      </ToggleGroupItem>
+    </ToggleGroup>
+
+    <!-- Use ToggleSwitch for implicit boolean states -->
+    <div
+      v-else
+      :class="cn('flex w-fit items-center gap-2', hideLayoutField || 'ml-auto')"
+    >
+      <ToggleSwitch
+        v-model="modelValue"
+        v-bind="filteredProps"
+        :aria-label="widget.name"
+      />
+    </div>
   </WidgetLayoutField>
 </template>
 
 <script setup lang="ts">
 import ToggleSwitch from 'primevue/toggleswitch'
 import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
 
+import { ToggleGroup, ToggleGroupItem } from '@/components/ui/toggle-group'
+import type { IWidgetOptions } from '@/lib/litegraph/src/types/widgets'
 import type { SimplifiedWidget } from '@/types/simplifiedWidget'
+import { useHideLayoutField } from '@/types/widgetTypes'
+import { cn } from '@/utils/tailwindUtil'
 import {
   STANDARD_EXCLUDED_PROPS,
   filterWidgetProps
 } from '@/utils/widgetPropFilter'
 
+import { WidgetInputBaseClass } from './layout'
 import WidgetLayoutField from './layout/WidgetLayoutField.vue'
 
 const { widget } = defineProps<{
-  widget: SimplifiedWidget<boolean>
+  widget: SimplifiedWidget<boolean, IWidgetOptions>
 }>()
 
 const modelValue = defineModel<boolean>()
 
+const hideLayoutField = useHideLayoutField()
+const { t } = useI18n()
+
 const filteredProps = computed(() =>
   filterWidgetProps(widget.options, STANDARD_EXCLUDED_PROPS)
 )
+
+const hasLabels = computed(() => {
+  return widget.options?.on != null || widget.options?.off != null
+})
+
+function handleOptionChange(value: string | undefined) {
+  if (value) {
+    modelValue.value = value === 'on'
+  }
+}
 </script>
diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetWithControl.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetWithControl.vue
index 4c2b42b855..89eed58847 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/WidgetWithControl.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/WidgetWithControl.vue
@@ -2,6 +2,7 @@
 import { computed, defineAsyncComponent, ref, watch } from 'vue'
 import type { Component } from 'vue'
 
+import Popover from '@/components/ui/Popover.vue'
 import Button from '@/components/ui/button/Button.vue'
 import type {
   SimplifiedControlWidget,
@@ -19,8 +20,6 @@ const props = defineProps<{
 
 const modelValue = defineModel<T>()
 
-const popover = ref()
-
 const controlModel = ref(props.widget.controlWidget.value)
 
 const controlButtonIcon = computed(() => {
@@ -37,24 +36,24 @@ const controlButtonIcon = computed(() => {
 })
 
 watch(controlModel, props.widget.controlWidget.update)
-
-const togglePopover = (event: Event) => {
-  popover.value.toggle(event)
-}
 </script>
-
 <template>
   <div class="relative grid grid-cols-subgrid">
     <component :is="component" v-bind="$attrs" v-model="modelValue" :widget>
-      <Button
-        variant="textonly"
-        size="sm"
-        class="h-4 w-7 self-center rounded-xl bg-blue-100/30 p-0"
-        @pointerdown.stop.prevent="togglePopover"
-      >
-        <i :class="`${controlButtonIcon} text-blue-100 text-xs size-3.5`" />
-      </Button>
+      <Popover>
+        <template #button>
+          <Button
+            variant="textonly"
+            size="sm"
+            class="h-4 w-7 self-center rounded-xl bg-primary-background/30 p-0 hover:bg-primary-background-hover/30"
+          >
+            <i
+              :class="`${controlButtonIcon} w-full text-xs text-primary-background`"
+            />
+          </Button>
+        </template>
+        <ValueControlPopover v-model="controlModel" />
+      </Popover>
     </component>
-    <ValueControlPopover ref="popover" v-model="controlModel" />
   </div>
 </template>
diff --git a/src/renderer/extensions/vueNodes/widgets/components/audio/AudioPreviewPlayer.test.ts b/src/renderer/extensions/vueNodes/widgets/components/audio/AudioPreviewPlayer.test.ts
new file mode 100644
index 0000000000..365c738ec1
--- /dev/null
+++ b/src/renderer/extensions/vueNodes/widgets/components/audio/AudioPreviewPlayer.test.ts
@@ -0,0 +1,86 @@
+import { mount } from '@vue/test-utils'
+import { describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+import Button from '@/components/ui/button/Button.vue'
+import AudioPreviewPlayer from '@/renderer/extensions/vueNodes/widgets/components/audio/AudioPreviewPlayer.vue'
+
+const mockToastAdd = vi.fn()
+
+vi.mock('primevue/usetoast', () => ({
+  useToast: () => ({ add: mockToastAdd })
+}))
+
+vi.mock('@/base/common/downloadUtil', () => ({
+  downloadFile: vi.fn()
+}))
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: { en: {} }
+})
+
+function mountPlayer(modelValue?: string) {
+  return mount(AudioPreviewPlayer, {
+    props: {
+      modelValue,
+      hideWhenEmpty: false
+    },
+    global: {
+      plugins: [i18n],
+      components: { Button },
+      stubs: {
+        TieredMenu: true,
+        Slider: true
+      }
+    }
+  })
+}
+
+function findDownloadButton(wrapper: ReturnType<typeof mountPlayer>) {
+  return wrapper.find('[aria-label="g.downloadAudio"]')
+}
+
+describe('AudioPreviewPlayer', () => {
+  describe('download button', () => {
+    it('shows download button when audio is loaded', () => {
+      const wrapper = mountPlayer('http://example.com/audio.mp3')
+
+      expect(findDownloadButton(wrapper).exists()).toBe(true)
+    })
+
+    it('hides download button when no audio is loaded', () => {
+      const wrapper = mountPlayer()
+
+      expect(findDownloadButton(wrapper).exists()).toBe(false)
+    })
+
+    it('calls downloadFile when download button is clicked', async () => {
+      const { downloadFile } = await import('@/base/common/downloadUtil')
+
+      const wrapper = mountPlayer('http://example.com/audio.mp3')
+      await findDownloadButton(wrapper).trigger('click')
+
+      expect(downloadFile).toHaveBeenCalledWith('http://example.com/audio.mp3')
+    })
+
+    it('shows toast on download failure', async () => {
+      const { downloadFile } = await import('@/base/common/downloadUtil')
+      vi.mocked(downloadFile).mockImplementation(() => {
+        throw new Error('download failed')
+      })
+
+      const wrapper = mountPlayer('http://example.com/audio.mp3')
+      await findDownloadButton(wrapper).trigger('click')
+
+      expect(mockToastAdd).toHaveBeenCalledWith(
+        expect.objectContaining({
+          severity: 'error'
+        })
+      )
+
+      vi.mocked(downloadFile).mockReset()
+    })
+  })
+})
diff --git a/src/renderer/extensions/vueNodes/widgets/components/audio/AudioPreviewPlayer.vue b/src/renderer/extensions/vueNodes/widgets/components/audio/AudioPreviewPlayer.vue
index bf69add86c..c6f3cac331 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/audio/AudioPreviewPlayer.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/audio/AudioPreviewPlayer.vue
@@ -1,17 +1,13 @@
 <template>
-  <div class="relative">
+  <div class="relative" @pointerdown.stop>
     <div
-      v-if="!hidden"
-      :class="
-        cn(
-          'bg-component-node-widget-background box-border flex gap-4 items-center justify-start relative rounded-lg w-full h-16 px-4 py-0',
-          { hidden: hideWhenEmpty && !hasAudio }
-        )
-      "
+      v-if="!hideWhenEmpty || modelValue"
+      class="relative box-border flex h-16 w-full items-center justify-start gap-4 rounded-lg bg-component-node-widget-background px-4 py-0"
     >
       <!-- Hidden audio element -->
       <audio
         ref="audioRef"
+        :src="modelValue"
         @loadedmetadata="handleLoadedMetadata"
         @timeupdate="handleTimeUpdate"
         @ended="handleEnded"
@@ -20,11 +16,11 @@
       <!-- Left Actions -->
       <div class="relative flex shrink-0 items-center justify-start gap-2">
         <!-- Play/Pause Button -->
-        <div
-          role="button"
-          :tabindex="0"
+        <Button
+          variant="textonly"
+          size="unset"
           :aria-label="$t('g.playPause')"
-          class="flex size-6 cursor-pointer items-center justify-center rounded hover:bg-interface-menu-component-surface-hovered"
+          class="size-6 rounded-sm"
           @click="togglePlayPause"
         >
           <i
@@ -32,7 +28,7 @@
             class="text-secondary icon-[lucide--play] size-4"
           />
           <i v-else class="text-secondary icon-[lucide--pause] size-4" />
-        </div>
+        </Button>
 
         <!-- Time Display -->
         <div class="text-sm font-normal text-nowrap text-base-foreground">
@@ -61,11 +57,11 @@
       <!-- Right Actions -->
       <div class="relative flex shrink-0 items-center justify-start gap-2">
         <!-- Volume Button -->
-        <div
-          role="button"
-          :tabindex="0"
+        <Button
+          variant="textonly"
+          size="unset"
           :aria-label="$t('g.volume')"
-          class="flex size-6 cursor-pointer items-center justify-center rounded hover:bg-interface-menu-component-surface-hovered"
+          class="size-6 rounded-sm"
           @click="toggleMute"
         >
           <i
@@ -77,19 +73,32 @@
             class="text-secondary icon-[lucide--volume-1] size-4"
           />
           <i v-else class="text-secondary icon-[lucide--volume-x] size-4" />
-        </div>
+        </Button>
+
+        <!-- Download Button -->
+        <Button
+          v-if="modelValue"
+          size="icon-sm"
+          variant="textonly"
+          :aria-label="$t('g.downloadAudio')"
+          :title="$t('g.downloadAudio')"
+          class="size-6 hover:bg-interface-menu-component-surface-hovered"
+          @click="handleDownload"
+        >
+          <i class="text-secondary icon-[lucide--download] size-4" />
+        </Button>
 
         <!-- Options Button -->
-        <div
+        <Button
           v-if="showOptionsButton"
-          role="button"
-          :tabindex="0"
+          variant="textonly"
+          size="unset"
           :aria-label="$t('g.moreOptions')"
-          class="flex size-6 cursor-pointer items-center justify-center rounded hover:bg-interface-menu-component-surface-hovered"
+          class="size-6 rounded-sm"
           @click="toggleOptionsMenu"
         >
           <i class="text-secondary icon-[lucide--more-vertical] size-4" />
-        </div>
+        </Button>
       </div>
 
       <!-- Options Menu -->
@@ -99,7 +108,7 @@
         popup
         class="audio-player-menu"
         :pt:root:class="
-          cn('bg-component-node-widget-background border-component-node-border')
+          cn('border-component-node-border bg-component-node-widget-background')
         "
         :pt:submenu:class="cn('bg-component-node-widget-background')"
       >
@@ -137,42 +146,34 @@
 <script setup lang="ts">
 import Slider from 'primevue/slider'
 import TieredMenu from 'primevue/tieredmenu'
-import { computed, nextTick, onUnmounted, ref, watch } from 'vue'
+import { computed, ref, useTemplateRef } from 'vue'
 import { useI18n } from 'vue-i18n'
+import { whenever } from '@vueuse/core'
 
-import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
-import { api } from '@/scripts/api'
-import { app } from '@/scripts/app'
-import { useNodeOutputStore } from '@/stores/imagePreviewStore'
-import { getLocatorIdFromNodeData } from '@/utils/graphTraversalUtil'
-import { isOutputNode } from '@/utils/nodeFilterUtil'
+import { useToast } from 'primevue/usetoast'
+
+import { downloadFile } from '@/base/common/downloadUtil'
+import Button from '@/components/ui/button/Button.vue'
 import { cn } from '@/utils/tailwindUtil'
 
-import { formatTime, getResourceURL } from '../../utils/audioUtils'
+import { formatTime } from '../../utils/audioUtils'
 
 const { t } = useI18n()
+const toast = useToast()
 
-const props = withDefaults(
-  defineProps<{
-    hideWhenEmpty?: boolean
-    showOptionsButton?: boolean
-    nodeId?: string
-    audioUrl?: string
-  }>(),
-  {
-    hideWhenEmpty: true
-  }
-)
+const { hideWhenEmpty = true, showOptionsButton } = defineProps<{
+  hideWhenEmpty?: boolean
+  showOptionsButton?: boolean
+}>()
 
 // Refs
-const audioRef = ref<HTMLAudioElement>()
+const audioRef = useTemplateRef('audioRef')
 const optionsMenu = ref()
 const isPlaying = ref(false)
 const isMuted = ref(false)
 const volume = ref(1)
 const currentTime = ref(0)
 const duration = ref(0)
-const hasAudio = ref(false)
 const playbackRate = ref(1)
 
 // Computed
@@ -180,61 +181,11 @@ const progressPercentage = computed(() => {
   if (!duration.value || duration.value === 0) return 0
   return (currentTime.value / duration.value) * 100
 })
+const modelValue = defineModel<string>()
 
 const showVolumeTwo = computed(() => !isMuted.value && volume.value > 0.5)
 const showVolumeOne = computed(() => isMuted.value && volume.value > 0)
 
-const litegraphNode = computed(() => {
-  if (!props.nodeId || !app.canvas.graph) return null
-  return app.canvas.graph.getNodeById(props.nodeId) as LGraphNode | null
-})
-
-const hidden = computed(() => {
-  if (!litegraphNode.value) return false
-  // dont show if its a LoadAudio and we have nodeId
-  const isLoadAudio =
-    litegraphNode.value.constructor?.comfyClass === 'LoadAudio'
-  return isLoadAudio && !!props.nodeId
-})
-
-// Check if this is an output node
-const isOutputNodeRef = computed(() => {
-  const node = litegraphNode.value
-  return !!node && isOutputNode(node)
-})
-
-const nodeLocatorId = computed(() => {
-  const node = litegraphNode.value
-  if (!node) return null
-  return getLocatorIdFromNodeData(node)
-})
-
-const nodeOutputStore = useNodeOutputStore()
-
-// Computed audio URL from node output (for output nodes)
-const audioUrlFromOutput = computed(() => {
-  if (!isOutputNodeRef.value || !nodeLocatorId.value) return ''
-
-  const nodeOutput = nodeOutputStore.nodeOutputs[nodeLocatorId.value]
-  if (!nodeOutput?.audio || nodeOutput.audio.length === 0) return ''
-
-  const audio = nodeOutput.audio[0]
-  if (!audio.filename) return ''
-
-  return api.apiURL(
-    getResourceURL(
-      audio.subfolder || '',
-      audio.filename,
-      audio.type || 'output'
-    )
-  )
-})
-
-// Combined audio URL (output takes precedence for output nodes)
-const finalAudioUrl = computed(() => {
-  return audioUrlFromOutput.value || props.audioUrl || ''
-})
-
 // Playback controls
 const togglePlayPause = () => {
   if (!audioRef.value || !audioRef.value.src) {
@@ -249,6 +200,20 @@ const togglePlayPause = () => {
   isPlaying.value = !isPlaying.value
 }
 
+const handleDownload = () => {
+  if (!modelValue.value) return
+  try {
+    downloadFile(modelValue.value)
+  } catch {
+    toast.add({
+      severity: 'error',
+      summary: t('g.error'),
+      detail: t('g.failedToDownloadFile'),
+      life: 3000
+    })
+  }
+}
+
 const toggleMute = () => {
   if (audioRef.value) {
     isMuted.value = !isMuted.value
@@ -335,36 +300,15 @@ const menuItems = computed(() => [
   }
 ])
 
-// Load audio from URL
-const loadAudioFromUrl = (url: string) => {
-  if (!audioRef.value) return
-  isPlaying.value = false
-  audioRef.value.pause()
-  audioRef.value.src = url
-  void audioRef.value.load()
-  hasAudio.value = !!url
-}
-
-// Watch for finalAudioUrl changes
-watch(
-  finalAudioUrl,
-  (newUrl) => {
-    if (newUrl) {
-      void nextTick(() => {
-        loadAudioFromUrl(newUrl)
-      })
-    }
+whenever(
+  modelValue,
+  () => {
+    isPlaying.value = false
+    audioRef.value?.pause()
+    void audioRef.value?.load()
   },
   { immediate: true }
 )
-
-// Cleanup
-onUnmounted(() => {
-  if (audioRef.value) {
-    audioRef.value.pause()
-    audioRef.value.src = ''
-  }
-})
 </script>
 
 <style scoped>
diff --git a/src/renderer/extensions/vueNodes/widgets/components/form/FormSearchInput.vue b/src/renderer/extensions/vueNodes/widgets/components/form/FormSearchInput.vue
new file mode 100644
index 0000000000..8a6f329a6c
--- /dev/null
+++ b/src/renderer/extensions/vueNodes/widgets/components/form/FormSearchInput.vue
@@ -0,0 +1,106 @@
+<script setup lang="ts">
+import { refDebounced } from '@vueuse/core'
+import { ref, toRef, toValue, watch } from 'vue'
+import type { HTMLAttributes, MaybeRefOrGetter } from 'vue'
+
+import { cn } from '@/utils/tailwindUtil'
+
+const {
+  searcher = async () => {},
+  updateKey,
+  autofocus = false,
+  class: customClass
+} = defineProps<{
+  searcher?: (
+    query: string,
+    onCleanup: (cleanupFn: () => void) => void
+  ) => Promise<void>
+  updateKey?: MaybeRefOrGetter<unknown>
+  autofocus?: boolean
+  class?: HTMLAttributes['class']
+}>()
+
+const searchQuery = defineModel<string>({ default: '' })
+
+const isQuerying = ref(false)
+const debouncedSearchQuery = refDebounced(searchQuery, 250, {
+  maxWait: 1000
+})
+watch(searchQuery, (value) => {
+  isQuerying.value = value !== debouncedSearchQuery.value
+})
+const updateKeyRef = toRef(() => toValue(updateKey))
+
+watch(
+  [debouncedSearchQuery, updateKeyRef],
+  (_, __, onCleanup) => {
+    let isCleanup = false
+    let cleanupFn: undefined | (() => void)
+    onCleanup(() => {
+      isCleanup = true
+      cleanupFn?.()
+    })
+
+    searcher(debouncedSearchQuery.value, (cb) => (cleanupFn = cb))
+      .catch((error) => {
+        console.error('[SidePanelSearch] searcher failed', error)
+      })
+      .finally(() => {
+        if (!isCleanup) isQuerying.value = false
+      })
+  },
+  { immediate: true }
+)
+
+function handleFocus(event: FocusEvent) {
+  const target = event.target
+  if (target instanceof HTMLInputElement) {
+    target.select()
+  }
+}
+</script>
+
+<template>
+  <label
+    :class="
+      cn(
+        'group',
+        'rounded-lg bg-component-node-widget-background transition-all duration-150',
+        'flex flex-1 items-center',
+        'border-0 text-base-foreground',
+        'focus-within:ring focus-within:ring-component-node-widget-background-highlighted/80',
+        customClass
+      )
+    "
+  >
+    <i
+      :class="
+        cn(
+          'ml-2 size-4 shrink-0 transition-colors duration-150',
+          isQuerying
+            ? 'icon-[lucide--loader-circle] animate-spin'
+            : 'icon-[lucide--search]',
+          searchQuery?.trim() !== ''
+            ? 'text-base-foreground'
+            : 'text-muted-foreground group-focus-within:text-base-foreground group-hover:text-base-foreground'
+        )
+      "
+    />
+    <input
+      v-model="searchQuery"
+      type="text"
+      class="mx-2 my-1.5 h-5 w-full min-w-0 border-0 bg-transparent ring-0 outline-0"
+      :placeholder="$t('g.searchPlaceholder', { subject: '' })"
+      :autofocus
+      @focus="handleFocus"
+    />
+    <button
+      v-if="searchQuery.trim().length > 0"
+      class="m-0 flex shrink-0 items-center justify-center border-0 bg-transparent p-0 pr-3 pl-1 text-muted-foreground ring-0 outline-0 transition-all duration-150 hover:scale-108 hover:text-base-foreground"
+      :aria-label="$t('g.clear')"
+      @click="searchQuery = ''"
+    >
+      <i :class="cn('icon-[lucide--delete] size-4 cursor-pointer')" />
+    </button>
+  </label>
+</template>
diff --git a/src/renderer/extensions/vueNodes/widgets/components/form/FormSelectButton.test.ts b/src/renderer/extensions/vueNodes/widgets/components/form/FormSelectButton.test.ts
index 088a3f92ec..bf9ec58b01 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/form/FormSelectButton.test.ts
+++ b/src/renderer/extensions/vueNodes/widgets/components/form/FormSelectButton.test.ts
@@ -8,7 +8,7 @@ describe('FormSelectButton Core Component', () => {
   // Type-safe helper for mounting component
   const mountComponent = (
     modelValue: string | null | undefined = null,
-    options: (string | number | Record<string, any>)[] = [],
+    options: unknown[] = [],
     props: Record<string, unknown> = {}
   ) => {
     return mount(FormSelectButton, {
@@ -17,7 +17,11 @@ describe('FormSelectButton Core Component', () => {
       },
       props: {
         modelValue,
-        options: options as any,
+        options: options as (
+          | string
+          | number
+          | { label: string; value: string | number }
+        )[],
         ...props
       }
     })
@@ -89,7 +93,7 @@ describe('FormSelectButton Core Component', () => {
       expect(button.classes()).toContain('h-6')
       expect(button.classes()).toContain('px-5')
       expect(button.classes()).toContain('py-[5px]')
-      expect(button.classes()).toContain('rounded')
+      expect(button.classes()).toContain('rounded-sm')
       expect(button.classes()).toContain('text-center')
       expect(button.classes()).toContain('text-xs')
       expect(button.classes()).toContain('font-normal')
@@ -474,7 +478,7 @@ describe('FormSelectButton Core Component', () => {
     })
 
     it('handles mixed type options safely', () => {
-      const mixedOptions: any[] = [
+      const mixedOptions: unknown[] = [
         'string',
         123,
         { label: 'Object', value: 'obj' }
diff --git a/src/renderer/extensions/vueNodes/widgets/components/form/FormSelectButton.vue b/src/renderer/extensions/vueNodes/widgets/components/form/FormSelectButton.vue
index cca84a353c..65670fbf1d 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/form/FormSelectButton.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/form/FormSelectButton.vue
@@ -1,10 +1,7 @@
 <template>
   <div
     :class="
-      cn(
-        WidgetInputBaseClass,
-        'p-1 inline-flex justify-center items-center gap-1'
-      )
+      cn(WidgetInputBaseClass, 'flex w-full min-w-0 items-center gap-1 p-1')
     "
   >
     <button
@@ -12,15 +9,15 @@
       :key="getOptionValue(option, index)"
       :class="
         cn(
-          'flex-1 h-6 px-5 py-[5px] rounded flex justify-center items-center gap-1 transition-all duration-150 ease-in-out truncate min-w-[4ch]',
-          'bg-transparent border-none',
+          'flex h-6 min-w-0 flex-1 items-center justify-center gap-1 truncate rounded-sm px-5 py-[5px] transition-all duration-150 ease-in-out',
+          'border-none bg-transparent',
           'text-center text-xs font-normal',
           {
             'bg-interface-menu-component-surface-selected':
               isSelected(index) && !disabled,
             'hover:bg-interface-menu-component-surface-selected/50':
               !isSelected(index) && !disabled,
-            'opacity-50 cursor-not-allowed': disabled,
+            'cursor-not-allowed opacity-50': disabled,
             'cursor-pointer': !disabled
           },
           isSelected(index) && !disabled
@@ -61,11 +58,13 @@ interface Emits {
   'update:modelValue': [value: ModelValue]
 }
 
-const props = withDefaults(defineProps<Props>(), {
-  disabled: false,
-  optionLabel: 'label',
-  optionValue: 'value'
-})
+const {
+  modelValue,
+  options,
+  optionLabel = 'label',
+  optionValue = 'value',
+  disabled
+} = defineProps<Props>()
 
 const emit = defineEmits<Emits>()
 
@@ -75,40 +74,42 @@ const getOptionValue = (option: T, index: number): ModelValue => {
     return option as ModelValue
   }
 
-  const valueField = props.optionValue
+  const valueField = optionValue
+  const optionRecord = option as Record<string, unknown>
   const value =
-    (option as any)[valueField] ??
+    optionRecord[valueField] ??
     option.value ??
-    (option as any).name ??
+    optionRecord.name ??
     option.label ??
     index
-  return value
+  return value as ModelValue
 }
 
 // for display with PrimeVue compatibility
 const getOptionLabel = (option: T): string => {
   if (typeof option === 'object' && option !== null) {
-    const labelField = props.optionLabel
-    return (
-      (option as any)[labelField] ??
-      option.label ??
-      (option as any).name ??
-      option.value ??
-      String(option)
+    const labelField = optionLabel
+    const optionRecord = option as Record<string, unknown>
+    return String(
+      optionRecord[labelField] ??
+        option.label ??
+        optionRecord.name ??
+        option.value ??
+        option
     )
   }
   return String(option)
 }
 
 const isSelected = (index: number): boolean => {
-  const optionValue = getOptionValue(props.options[index], index)
-  return String(optionValue) === String(props.modelValue ?? '')
+  const optVal = getOptionValue(options[index], index)
+  return String(optVal) === String(modelValue ?? '')
 }
 
 const handleSelect = (index: number) => {
-  if (props.disabled) return
+  if (disabled) return
 
-  const optionValue = getOptionValue(props.options[index], index)
-  emit('update:modelValue', optionValue)
+  const optVal = getOptionValue(options[index], index)
+  emit('update:modelValue', optVal)
 }
 </script>
diff --git a/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdown.vue b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdown.vue
index 670c054a43..12c30a1ab8 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdown.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdown.vue
@@ -1,25 +1,25 @@
 <script setup lang="ts">
-import { refDebounced } from '@vueuse/core'
 import Popover from 'primevue/popover'
-import { computed, ref, useTemplateRef, watch } from 'vue'
+import { computed, ref, useTemplateRef } from 'vue'
+import { useI18n } from 'vue-i18n'
 
-import { t } from '@/i18n'
 import { useToastStore } from '@/platform/updates/common/toastStore'
 
+import type {
+  FilterOption,
+  OwnershipFilterOption,
+  OwnershipOption
+} from '@/platform/assets/types/filterTypes'
+
 import FormDropdownInput from './FormDropdownInput.vue'
 import FormDropdownMenu from './FormDropdownMenu.vue'
 import { defaultSearcher, getDefaultSortOptions } from './shared'
-import type {
-  DropdownItem,
-  FilterOption,
-  LayoutMode,
-  OptionId,
-  SelectedKey,
-  SortOption
-} from './types'
+import type { FormDropdownItem, LayoutMode, SortOption } from './types'
 
 interface Props {
-  items: DropdownItem[]
+  items: FormDropdownItem[]
+  /** Items used for display in the input field. Falls back to items if not provided. */
+  displayItems?: FormDropdownItem[]
   placeholder?: string
   /**
    * If true, allows multiple selections. If a number is provided,
@@ -32,98 +32,86 @@ interface Props {
   accept?: string
   filterOptions?: FilterOption[]
   sortOptions?: SortOption[]
+  showOwnershipFilter?: boolean
+  ownershipOptions?: OwnershipFilterOption[]
+  showBaseModelFilter?: boolean
+  baseModelOptions?: FilterOption[]
   isSelected?: (
-    selected: Set<SelectedKey>,
-    item: DropdownItem,
+    selected: Set<string>,
+    item: FormDropdownItem,
     index: number
   ) => boolean
   searcher?: (
     query: string,
-    items: DropdownItem[],
+    items: FormDropdownItem[],
     onCleanup: (cleanupFn: () => void) => void
-  ) => Promise<DropdownItem[]>
+  ) => Promise<FormDropdownItem[]>
 }
 
-const props = withDefaults(defineProps<Props>(), {
-  placeholder: t('widgets.uploadSelect.placeholder'),
-  multiple: false,
-  uploadable: false,
-  disabled: false,
-  filterOptions: () => [],
-  sortOptions: () => getDefaultSortOptions(),
-  isSelected: (selected, item, _index) => selected.has(item.id),
-  searcher: defaultSearcher
-})
+const { t } = useI18n()
 
-const selected = defineModel<Set<SelectedKey>>('selected', {
-  default: new Set()
+const {
+  placeholder,
+  multiple = false,
+  uploadable = false,
+  disabled = false,
+  accept,
+  filterOptions = [],
+  sortOptions = getDefaultSortOptions(),
+  showOwnershipFilter,
+  ownershipOptions,
+  showBaseModelFilter,
+  baseModelOptions,
+  isSelected = (selected, item, _index) => selected.has(item.id),
+  searcher = defaultSearcher,
+  items
+} = defineProps<Props>()
+
+const placeholderText = computed(
+  () => placeholder ?? t('widgets.uploadSelect.placeholder')
+)
+
+const selected = defineModel<Set<string>>('selected', {
+  default: () => new Set()
 })
-const filterSelected = defineModel<OptionId>('filterSelected', { default: '' })
-const sortSelected = defineModel<OptionId>('sortSelected', {
+const filterSelected = defineModel<string>('filterSelected', { default: '' })
+const sortSelected = defineModel<string>('sortSelected', {
   default: 'default'
 })
 const layoutMode = defineModel<LayoutMode>('layoutMode', {
   default: 'grid'
 })
-const files = defineModel<File[]>('files', { default: [] })
+const files = defineModel<File[]>('files', { default: () => [] })
 const searchQuery = defineModel<string>('searchQuery', { default: '' })
-
-const debouncedSearchQuery = refDebounced(searchQuery, 700, {
-  maxWait: 700
+const ownershipSelected = defineModel<OwnershipOption>('ownershipSelected', {
+  default: 'all'
 })
-const isQuerying = ref(false)
+const baseModelSelected = defineModel<Set<string>>('baseModelSelected', {
+  default: () => new Set()
+})
+
 const toastStore = useToastStore()
 const popoverRef = ref<InstanceType<typeof Popover>>()
 const triggerRef = useTemplateRef('triggerRef')
 const isOpen = ref(false)
 
 const maxSelectable = computed(() => {
-  if (props.multiple === true) return Infinity
-  if (typeof props.multiple === 'number') return props.multiple
+  if (multiple === true) return Infinity
+  if (typeof multiple === 'number') return multiple
   return 1
 })
 
-const filteredItems = ref<DropdownItem[]>([])
+const itemsKey = computed(() => items.map((item) => item.id).join('|'))
 
-watch(searchQuery, (value) => {
-  isQuerying.value = value !== debouncedSearchQuery.value
-})
-
-watch(
-  [debouncedSearchQuery, () => props.items],
-  (_, __, onCleanup) => {
-    let isCleanup = false
-    let cleanupFn: undefined | (() => void)
-    onCleanup(() => {
-      isCleanup = true
-      cleanupFn?.()
-    })
-
-    void props
-      .searcher(
-        debouncedSearchQuery.value,
-        props.items,
-        (cb) => (cleanupFn = cb)
-      )
-      .then((result) => {
-        if (!isCleanup) filteredItems.value = result
-      })
-      .finally(() => {
-        if (!isCleanup) isQuerying.value = false
-      })
-  },
-  { immediate: true }
-)
+const filteredItems = ref<FormDropdownItem[]>([])
 
 const defaultSorter = computed<SortOption['sorter']>(() => {
-  const sorter = props.sortOptions.find(
-    (option) => option.id === 'default'
-  )?.sorter
-  return sorter || (({ items }) => items.slice())
+  const sorter = sortOptions.find((option) => option.id === 'default')?.sorter
+  return sorter || (({ items: i }) => i.slice())
 })
 const selectedSorter = computed<SortOption['sorter']>(() => {
   if (sortSelected.value === 'default') return defaultSorter.value
-  const sorter = props.sortOptions.find(
+  const sorter = sortOptions.find(
     (option) => option.id === sortSelected.value
   )?.sorter
   return sorter || defaultSorter.value
@@ -132,12 +120,12 @@ const sortedItems = computed(() => {
   return selectedSorter.value({ items: filteredItems.value }) || []
 })
 
-function internalIsSelected(item: DropdownItem, index: number): boolean {
-  return props.isSelected?.(selected.value, item, index) ?? false
+function internalIsSelected(item: FormDropdownItem, index: number): boolean {
+  return isSelected(selected.value, item, index)
 }
 
 const toggleDropdown = (event: Event) => {
-  if (props.disabled) return
+  if (disabled) return
   if (popoverRef.value && triggerRef.value) {
     popoverRef.value.toggle(event, triggerRef.value)
     isOpen.value = !isOpen.value
@@ -152,17 +140,17 @@ const closeDropdown = () => {
 }
 
 function handleFileChange(event: Event) {
-  if (props.disabled) return
-  const input = event.target as HTMLInputElement
-  if (input.files) {
-    files.value = Array.from(input.files)
+  if (disabled) return
+  const target = event.target
+  if (!(target instanceof HTMLInputElement)) return
+  if (target.files) {
+    files.value = Array.from(target.files)
   }
-  // Clear the input value to allow re-selecting the same file
-  input.value = ''
+  target.value = ''
 }
 
-function handleSelection(item: DropdownItem, index: number) {
-  if (props.disabled) return
+function handleSelection(item: FormDropdownItem, index: number) {
+  if (disabled) return
   const sel = selected.value
   if (internalIsSelected(item, index)) {
     sel.delete(item.id)
@@ -173,7 +161,7 @@ function handleSelection(item: DropdownItem, index: number) {
       sel.clear()
       sel.add(item.id)
     } else {
-      toastStore.addAlert(`Maximum selection limit reached`)
+      toastStore.addAlert(t('widgets.uploadSelect.maxSelectionReached'))
       return
     }
   }
@@ -183,20 +171,36 @@ function handleSelection(item: DropdownItem, index: number) {
     closeDropdown()
   }
 }
+
+async function customSearcher(
+  query: string,
+  onCleanup: (cleanupFn: () => void) => void
+) {
+  let isCleanup = false
+  let cleanupFn: undefined | (() => void)
+  onCleanup(() => {
+    isCleanup = true
+    cleanupFn?.()
+  })
+  await searcher(query, items, (cb) => (cleanupFn = cb)).then((results) => {
+    if (!isCleanup) filteredItems.value = results
+  })
+}
 </script>
 
 <template>
   <div ref="triggerRef">
     <FormDropdownInput
-      :files="files"
-      :is-open="isOpen"
-      :placeholder="placeholder"
-      :items="items"
-      :max-selectable="maxSelectable"
-      :selected="selected"
-      :uploadable="uploadable"
-      :disabled="disabled"
-      :accept="accept"
+      :files
+      :is-open
+      :placeholder="placeholderText"
+      :items
+      :display-items
+      :max-selectable
+      :selected
+      :uploadable
+      :disabled
+      :accept
       @select-click="toggleDropdown"
       @file-change="handleFileChange"
     />
@@ -220,13 +224,20 @@ function handleSelection(item: DropdownItem, index: number) {
         v-model:layout-mode="layoutMode"
         v-model:sort-selected="sortSelected"
         v-model:search-query="searchQuery"
-        :filter-options="filterOptions"
-        :sort-options="sortOptions"
-        :disabled="disabled"
-        :is-querying="isQuerying"
+        v-model:ownership-selected="ownershipSelected"
+        v-model:base-model-selected="baseModelSelected"
+        :filter-options
+        :sort-options
+        :show-ownership-filter
+        :ownership-options
+        :show-base-model-filter
+        :base-model-options
+        :disabled
+        :searcher="customSearcher"
         :items="sortedItems"
         :is-selected="internalIsSelected"
-        :max-selectable="maxSelectable"
+        :max-selectable
+        :update-key="itemsKey"
         @close="closeDropdown"
         @item-click="handleSelection"
       />
diff --git a/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownInput.vue b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownInput.vue
index 24f89995dc..e2356394ed 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownInput.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownInput.vue
@@ -4,23 +4,32 @@ import { computed } from 'vue'
 import { cn } from '@/utils/tailwindUtil'
 
 import { WidgetInputBaseClass } from '../../layout'
-import type { DropdownItem, SelectedKey } from './types'
+import type { FormDropdownItem } from './types'
 
 interface Props {
   isOpen?: boolean
   placeholder?: string
-  items: DropdownItem[]
-  selected: Set<SelectedKey>
+  items: FormDropdownItem[]
+  /** Items used for display in the input field. Falls back to items if not provided. */
+  displayItems?: FormDropdownItem[]
+  selected: Set<string>
   maxSelectable: number
   uploadable: boolean
   disabled: boolean
   accept?: string
 }
 
-const props = withDefaults(defineProps<Props>(), {
-  isOpen: false,
-  placeholder: 'Select...'
-})
+const {
+  isOpen,
+  placeholder = 'Select...',
+  items,
+  displayItems,
+  selected,
+  maxSelectable,
+  uploadable,
+  disabled,
+  accept
+} = defineProps<Props>()
 
 const emit = defineEmits<{
   (e: 'select-click', event: MouseEvent): void
@@ -28,15 +37,16 @@ const emit = defineEmits<{
 }>()
 
 const selectedItems = computed(() => {
-  return props.items.filter((item) => props.selected.has(item.id))
+  const itemsToSearch = displayItems ?? items
+  return itemsToSearch.filter((item) => selected.has(item.id))
 })
 
 const theButtonStyle = computed(() =>
   cn(
-    'border-0 bg-component-node-widget-background outline-none text-text-secondary',
-    props.disabled
+    'border-0 bg-component-node-widget-background text-text-secondary outline-none',
+    disabled
       ? 'cursor-not-allowed'
-      : 'hover:bg-component-node-widget-background-hovered cursor-pointer',
+      : 'cursor-pointer hover:bg-component-node-widget-background-hovered',
     selectedItems.value.length > 0 && 'text-text-primary'
   )
 )
@@ -46,16 +56,15 @@ const theButtonStyle = computed(() =>
   <div
     :class="
       cn(WidgetInputBaseClass, 'flex text-base leading-none', {
-        'opacity-50 cursor-not-allowed !outline-zinc-300/10': disabled
+        'cursor-not-allowed opacity-50 outline-node-component-border': disabled
       })
     "
   >
-    <!-- Dropdown -->
     <button
       :class="
         cn(
           theButtonStyle,
-          'flex justify-between items-center flex-1 min-w-0 h-8',
+          'flex h-8 min-w-0 flex-1 items-center justify-between',
           {
             'rounded-l-lg': uploadable,
             'rounded-lg': !uploadable
@@ -64,7 +73,7 @@ const theButtonStyle = computed(() =>
       "
       @click="emit('select-click', $event)"
     >
-      <span class="min-w-0 flex-1 px-1 py-2 text-left truncate">
+      <span class="min-w-0 flex-1 truncate px-1 py-2 text-left">
         <span v-if="!selectedItems.length">
           {{ placeholder }}
         </span>
@@ -76,20 +85,19 @@ const theButtonStyle = computed(() =>
         class="icon-[lucide--chevron-down]"
         :class="
           cn(
-            'mr-2 size-4 transition-transform duration-200 flex-shrink-0 text-component-node-foreground-secondary',
+            'mr-2 size-4 shrink-0 text-component-node-foreground-secondary transition-transform duration-200',
             isOpen && 'rotate-180'
           )
         "
       />
     </button>
-    <!-- Open File -->
     <label
       v-if="uploadable"
       :class="
         cn(
           theButtonStyle,
           'relative',
-          'size-8 flex justify-center items-center border-l rounded-r-lg border-zinc-300/10'
+          'flex size-8 items-center justify-center rounded-r-lg border-l border-node-component-border'
         )
       "
     >
diff --git a/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenu.test.ts b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenu.test.ts
new file mode 100644
index 0000000000..22818c8436
--- /dev/null
+++ b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenu.test.ts
@@ -0,0 +1,113 @@
+import { mount } from '@vue/test-utils'
+import { describe, expect, it } from 'vitest'
+import { nextTick } from 'vue'
+
+import FormDropdownMenu from './FormDropdownMenu.vue'
+import type { FormDropdownItem, LayoutMode } from './types'
+
+function createItem(id: string, name: string): FormDropdownItem {
+  return {
+    id,
+    preview_url: '',
+    name,
+    label: name
+  }
+}
+
+describe('FormDropdownMenu', () => {
+  const defaultProps = {
+    items: [createItem('1', 'Item 1'), createItem('2', 'Item 2')],
+    isSelected: () => false,
+    filterOptions: [],
+    sortOptions: []
+  }
+
+  it('renders empty state when no items', async () => {
+    const wrapper = mount(FormDropdownMenu, {
+      props: {
+        ...defaultProps,
+        items: []
+      },
+      global: {
+        stubs: {
+          FormDropdownMenuFilter: true,
+          FormDropdownMenuActions: true,
+          VirtualGrid: true
+        },
+        mocks: {
+          $t: (key: string) => key
+        }
+      }
+    })
+
+    await nextTick()
+
+    const emptyIcon = wrapper.find('.icon-\\[lucide--circle-off\\]')
+    expect(emptyIcon.exists()).toBe(true)
+  })
+
+  it('renders VirtualGrid when items exist', async () => {
+    const wrapper = mount(FormDropdownMenu, {
+      props: defaultProps,
+      global: {
+        stubs: {
+          FormDropdownMenuFilter: true,
+          FormDropdownMenuActions: true,
+          VirtualGrid: true
+        }
+      }
+    })
+
+    await nextTick()
+
+    const virtualGrid = wrapper.findComponent({ name: 'VirtualGrid' })
+    expect(virtualGrid.exists()).toBe(true)
+  })
+
+  it('transforms items to include key property for VirtualGrid', async () => {
+    const items = [createItem('1', 'Item 1'), createItem('2', 'Item 2')]
+    const wrapper = mount(FormDropdownMenu, {
+      props: {
+        ...defaultProps,
+        items
+      },
+      global: {
+        stubs: {
+          FormDropdownMenuFilter: true,
+          FormDropdownMenuActions: true,
+          VirtualGrid: true
+        }
+      }
+    })
+
+    await nextTick()
+
+    const virtualGrid = wrapper.findComponent({ name: 'VirtualGrid' })
+    const virtualItems = virtualGrid.props('items')
+
+    expect(virtualItems).toHaveLength(2)
+    expect(virtualItems[0]).toHaveProperty('key', '1')
+    expect(virtualItems[1]).toHaveProperty('key', '2')
+  })
+
+  it('uses single column layout for list modes', async () => {
+    const wrapper = mount(FormDropdownMenu, {
+      props: {
+        ...defaultProps,
+        layoutMode: 'list' as LayoutMode
+      },
+      global: {
+        stubs: {
+          FormDropdownMenuFilter: true,
+          FormDropdownMenuActions: true,
+          VirtualGrid: true
+        }
+      }
+    })
+
+    await nextTick()
+
+    const virtualGrid = wrapper.findComponent({ name: 'VirtualGrid' })
+    expect(virtualGrid.props('maxColumns')).toBe(1)
+  })
+})
diff --git a/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenu.vue b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenu.vue
index 7d0bfa5024..8d12c47e7a 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenu.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenu.vue
@@ -1,96 +1,162 @@
 <script setup lang="ts">
-import { cn } from '@/utils/tailwindUtil'
+import type { CSSProperties, MaybeRefOrGetter } from 'vue'
+import { computed } from 'vue'
+
+import VirtualGrid from '@/components/common/VirtualGrid.vue'
+
+import type {
+  FilterOption,
+  OwnershipFilterOption,
+  OwnershipOption
+} from '@/platform/assets/types/filterTypes'
 
 import FormDropdownMenuActions from './FormDropdownMenuActions.vue'
 import FormDropdownMenuFilter from './FormDropdownMenuFilter.vue'
 import FormDropdownMenuItem from './FormDropdownMenuItem.vue'
-import type {
-  DropdownItem,
-  FilterOption,
-  LayoutMode,
-  OptionId,
-  SortOption
-} from './types'
+import type { FormDropdownItem, LayoutMode, SortOption } from './types'
 
 interface Props {
-  items: DropdownItem[]
-  isSelected: (item: DropdownItem, index: number) => boolean
-  isQuerying: boolean
+  items: FormDropdownItem[]
+  isSelected: (item: FormDropdownItem, index: number) => boolean
   filterOptions: FilterOption[]
   sortOptions: SortOption[]
+  searcher?: (
+    query: string,
+    onCleanup: (cleanupFn: () => void) => void
+  ) => Promise<void>
+  updateKey?: MaybeRefOrGetter<unknown>
+  showOwnershipFilter?: boolean
+  ownershipOptions?: OwnershipFilterOption[]
+  showBaseModelFilter?: boolean
+  baseModelOptions?: FilterOption[]
 }
 
-defineProps<Props>()
+const {
+  items,
+  isSelected,
+  filterOptions,
+  sortOptions,
+  searcher,
+  updateKey,
+  showOwnershipFilter,
+  ownershipOptions,
+  showBaseModelFilter,
+  baseModelOptions
+} = defineProps<Props>()
 const emit = defineEmits<{
-  (e: 'item-click', item: DropdownItem, index: number): void
+  (e: 'item-click', item: FormDropdownItem, index: number): void
 }>()
 
-// Define models for two-way binding
-const filterSelected = defineModel<OptionId>('filterSelected')
+const filterSelected = defineModel<string>('filterSelected')
 const layoutMode = defineModel<LayoutMode>('layoutMode')
-const sortSelected = defineModel<OptionId>('sortSelected')
+const sortSelected = defineModel<string>('sortSelected')
 const searchQuery = defineModel<string>('searchQuery')
+const ownershipSelected = defineModel<OwnershipOption>('ownershipSelected')
+const baseModelSelected = defineModel<Set<string>>('baseModelSelected')
 
-// Handle item selection
+type LayoutConfig = {
+  maxColumns: number
+  itemHeight: number
+  itemWidth: number
+  gap: string
+}
+
+const LAYOUT_CONFIGS: Record<LayoutMode, LayoutConfig> = {
+  grid: {
+    maxColumns: 4,
+    itemHeight: 120,
+    itemWidth: 89,
+    gap: 'var(--spacing-4) var(--spacing-2)'
+  },
+  list: {
+    maxColumns: 1,
+    itemHeight: 64,
+    itemWidth: 380,
+    gap: 'var(--spacing-2)'
+  },
+  'list-small': {
+    maxColumns: 1,
+    itemHeight: 40,
+    itemWidth: 380,
+    gap: 'var(--spacing-1)'
+  }
+}
+
+const layoutConfig = computed<LayoutConfig>(
+  () => LAYOUT_CONFIGS[layoutMode.value ?? 'grid']
+)
+
+const gridStyle = computed<CSSProperties>(() => ({
+  display: 'grid',
+  gap: layoutConfig.value.gap,
+  padding: '1rem',
+  width: '100%'
+}))
+
+type VirtualDropdownItem = FormDropdownItem & { key: string }
+const virtualItems = computed<VirtualDropdownItem[]>(() =>
+  items.map((item) => ({
+    ...item,
+    key: String(item.id)
+  }))
+)
 </script>
 
 <template>
   <div
-    class="flex max-h-[640px] w-103 flex-col rounded-lg bg-component-node-background pt-4 outline outline-offset-[-1px] outline-node-component-border"
+    class="flex h-[640px] w-103 flex-col rounded-lg bg-component-node-background pt-4 outline -outline-offset-1 outline-node-component-border"
   >
-    <!-- Filter -->
     <FormDropdownMenuFilter
       v-if="filterOptions.length > 0"
       v-model:filter-selected="filterSelected"
-      :filter-options="filterOptions"
+      :filter-options
     />
-    <!-- Actions -->
     <FormDropdownMenuActions
       v-model:layout-mode="layoutMode"
       v-model:sort-selected="sortSelected"
       v-model:search-query="searchQuery"
-      :sort-options="sortOptions"
-      :is-querying="isQuerying"
+      v-model:ownership-selected="ownershipSelected"
+      v-model:base-model-selected="baseModelSelected"
+      :sort-options
+      :searcher
+      :update-key
+      :show-ownership-filter
+      :ownership-options
+      :show-base-model-filter
+      :base-model-options
     />
-    <!-- List -->
-    <div class="relative flex h-full mt-2 overflow-y-scroll">
-      <div
-        :class="
-          cn(
-            'h-full max-h-full grid gap-x-2 gap-y-4 overflow-y-auto px-4 pt-4 pb-4 w-full',
-            {
-              'grid-cols-4': layoutMode === 'grid',
-              'grid-cols-1 gap-y-2': layoutMode === 'list',
-              'grid-cols-1 gap-y-1': layoutMode === 'list-small'
-            }
-          )
-        "
-      >
-        <div class="pointer-events-none absolute inset-x-3 top-0 z-10 h-5" />
-        <div
-          v-if="items.length === 0"
-          class="h-50 col-span-full flex items-center justify-center"
-        >
-          <i
-            :title="$t('g.noItems')"
-            :aria-label="$t('g.noItems')"
-            class="icon-[lucide--circle-off] size-30 text-zinc-500/20"
-          />
-        </div>
-        <!-- Item -->
+    <div
+      v-if="items.length === 0"
+      class="flex h-50 items-center justify-center"
+    >
+      <i
+        :title="$t('g.noItems')"
+        :aria-label="$t('g.noItems')"
+        class="icon-[lucide--circle-off] size-30 text-muted-foreground/20"
+      />
+    </div>
+    <VirtualGrid
+      v-else
+      :key="layoutMode"
+      :items="virtualItems"
+      :grid-style
+      :max-columns="layoutConfig.maxColumns"
+      :default-item-height="layoutConfig.itemHeight"
+      :default-item-width="layoutConfig.itemWidth"
+      :buffer-rows="2"
+      class="mt-2 min-h-0 flex-1"
+    >
+      <template #item="{ item, index }">
         <FormDropdownMenuItem
-          v-for="(item, index) in items"
-          :key="item.id"
-          :index="index"
+          :index
           :selected="isSelected(item, index)"
-          :media-src="item.mediaSrc"
+          :preview-url="item.preview_url ?? ''"
           :name="item.name"
           :label="item.label"
-          :metadata="item.metadata"
           :layout="layoutMode"
           @click="emit('item-click', item, index)"
         />
-      </div>
-    </div>
+      </template>
+    </VirtualGrid>
   </div>
 </template>
diff --git a/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuActions.vue b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuActions.vue
index b5f602793b..e1c3a783ce 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuActions.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuActions.vue
@@ -1,26 +1,50 @@
 <script setup lang="ts">
+import type { MaybeRefOrGetter } from 'vue'
+
 import Popover from 'primevue/popover'
 import { ref, useTemplateRef } from 'vue'
+import { useI18n } from 'vue-i18n'
 
+import Button from '@/components/ui/button/Button.vue'
+import type {
+  FilterOption,
+  OwnershipFilterOption,
+  OwnershipOption
+} from '@/platform/assets/types/filterTypes'
 import { cn } from '@/utils/tailwindUtil'
 
-import type { LayoutMode, OptionId, SortOption } from './types'
+import FormSearchInput from '../FormSearchInput.vue'
+import type { LayoutMode, SortOption } from './types'
+
+const { t } = useI18n()
 
 defineProps<{
-  isQuerying: boolean
+  searcher?: (
+    query: string,
+    onCleanup: (cleanupFn: () => void) => void
+  ) => Promise<void>
   sortOptions: SortOption[]
+  updateKey?: MaybeRefOrGetter<unknown>
+  showOwnershipFilter?: boolean
+  ownershipOptions?: OwnershipFilterOption[]
+  showBaseModelFilter?: boolean
+  baseModelOptions?: FilterOption[]
 }>()
 
 const layoutMode = defineModel<LayoutMode>('layoutMode')
 const searchQuery = defineModel<string>('searchQuery')
-const sortSelected = defineModel<OptionId>('sortSelected')
+const sortSelected = defineModel<string>('sortSelected')
+const ownershipSelected = defineModel<OwnershipOption>('ownershipSelected', {
+  default: 'all'
+})
+const baseModelSelected = defineModel<Set<string>>('baseModelSelected', {
+  default: new Set()
+})
 
 const actionButtonStyle = cn(
-  'h-8 bg-zinc-500/20 rounded-lg outline outline-1 outline-offset-[-1px] outline-node-component-border transition-all duration-150'
+  'h-8 rounded-lg bg-zinc-500/20 outline-1 -outline-offset-1 outline-node-component-border transition-all duration-150'
 )
 
-const resetInputStyle = 'bg-transparent border-0 outline-0 ring-0 text-left'
-
 const layoutSwitchItemStyle =
   'size-6 flex justify-center items-center rounded-sm cursor-pointer transition-all duration-150 hover:scale-108 hover:text-base-foreground active:scale-95'
 
@@ -31,7 +55,7 @@ const isSortPopoverOpen = ref(false)
 function toggleSortPopover(event: Event) {
   if (!sortPopoverRef.value || !sortTriggerRef.value) return
   isSortPopoverOpen.value = !isSortPopoverOpen.value
-  sortPopoverRef.value.toggle(event, sortTriggerRef.value)
+  sortPopoverRef.value.toggle(event, sortTriggerRef.value.$el)
 }
 function closeSortPopover() {
   isSortPopoverOpen.value = false
@@ -42,46 +66,67 @@ function handleSortSelected(item: SortOption) {
   sortSelected.value = item.id
   closeSortPopover()
 }
+
+const ownershipPopoverRef = useTemplateRef('ownershipPopoverRef')
+const ownershipTriggerRef = useTemplateRef('ownershipTriggerRef')
+const isOwnershipPopoverOpen = ref(false)
+
+function toggleOwnershipPopover(event: Event) {
+  if (!ownershipPopoverRef.value || !ownershipTriggerRef.value) return
+  isOwnershipPopoverOpen.value = !isOwnershipPopoverOpen.value
+  ownershipPopoverRef.value.toggle(event, ownershipTriggerRef.value.$el)
+}
+function closeOwnershipPopover() {
+  isOwnershipPopoverOpen.value = false
+  ownershipPopoverRef.value?.hide()
+}
+
+function handleOwnershipSelected(item: OwnershipFilterOption) {
+  ownershipSelected.value = item.value
+  closeOwnershipPopover()
+}
+
+const baseModelPopoverRef = useTemplateRef('baseModelPopoverRef')
+const baseModelTriggerRef = useTemplateRef('baseModelTriggerRef')
+const isBaseModelPopoverOpen = ref(false)
+
+function toggleBaseModelPopover(event: Event) {
+  if (!baseModelPopoverRef.value || !baseModelTriggerRef.value) return
+  isBaseModelPopoverOpen.value = !isBaseModelPopoverOpen.value
+  baseModelPopoverRef.value.toggle(event, baseModelTriggerRef.value.$el)
+}
+
+function toggleBaseModelSelection(item: FilterOption) {
+  const current = new Set(baseModelSelected.value)
+  baseModelSelected.value = current.has(item.value)
+    ? new Set([...current].filter((v) => v !== item.value))
+    : new Set([...current, item.value])
+}
 </script>
 
 <template>
   <div class="text-secondary flex gap-2 px-4">
-    <!-- TODO: Replace with a common Search input -->
-    <label
+    <FormSearchInput
+      v-model="searchQuery"
+      :searcher
+      :update-key
       :class="
         cn(
           actionButtonStyle,
-          'flex-1 flex px-2 items-center text-base leading-none cursor-text',
-          searchQuery?.trim() !== '' ? 'text-base-foreground' : '',
           'hover:outline-component-node-widget-background-highlighted/80',
-          'focus-within:outline-component-node-widget-background-highlighted/80'
+          'focus-within:ring-0 focus-within:outline-component-node-widget-background-highlighted/80'
         )
       "
-    >
-      <i
-        v-if="isQuerying"
-        class="mr-2 icon-[lucide--loader-circle] size-4 animate-spin"
-      />
-      <i v-else class="mr-2 icon-[lucide--search] size-4" />
-      <input
-        v-model="searchQuery"
-        type="text"
-        autofocus
-        :class="resetInputStyle"
-        :placeholder="$t('g.search')"
-      />
-    </label>
+    />
 
-    <!-- Sort Select -->
-    <button
+    <Button
       ref="sortTriggerRef"
+      variant="textonly"
+      size="icon"
       :class="
         cn(
-          resetInputStyle,
           actionButtonStyle,
-          'relative w-8 flex justify-center items-center cursor-pointer',
-          'hover:outline-component-node-widget-background-highlighted',
-          'active:!scale-95'
+          'relative w-8 hover:outline-component-node-widget-background-highlighted active:scale-95'
         )
       "
       @click="toggleSortPopover"
@@ -91,8 +136,7 @@ function handleSortSelected(item: SortOption) {
         class="absolute top-[-2px] left-[-2px] size-2 rounded-full bg-component-node-widget-background-highlighted"
       />
       <i class="icon-[lucide--arrow-up-down] size-4" />
-    </button>
-    <!-- Sort Popover -->
+    </Button>
     <Popover
       ref="sortPopoverRef"
       :dismissable="true"
@@ -111,22 +155,18 @@ function handleSortSelected(item: SortOption) {
       <div
         :class="
           cn(
-            'flex flex-col gap-2 p-2 min-w-32',
+            'flex min-w-32 flex-col gap-2 p-2',
             'bg-component-node-background',
-            'rounded-lg outline outline-offset-[-1px] outline-component-node-border'
+            'rounded-lg outline -outline-offset-1 outline-component-node-border'
           )
         "
       >
-        <button
+        <Button
           v-for="item of sortOptions"
           :key="item.name"
-          :class="
-            cn(
-              resetInputStyle,
-              'flex justify-between items-center h-6 cursor-pointer',
-              'hover:!text-blue-500'
-            )
-          "
+          variant="textonly"
+          size="unset"
+          :class="cn('flex h-6 items-center justify-between text-left')"
           @click="handleSortSelected(item)"
         >
           <span>{{ item.name }}</span>
@@ -134,47 +174,177 @@ function handleSortSelected(item: SortOption) {
             v-if="sortSelected === item.id"
             class="icon-[lucide--check] size-4"
           />
-        </button>
+        </Button>
+      </div>
+    </Popover>
+
+    <Button
+      v-if="showOwnershipFilter && ownershipOptions?.length"
+      ref="ownershipTriggerRef"
+      :aria-label="t('assetBrowser.ownership')"
+      :title="t('assetBrowser.ownership')"
+      variant="textonly"
+      size="icon"
+      :class="
+        cn(
+          actionButtonStyle,
+          'relative w-8 hover:outline-component-node-widget-background-highlighted active:scale-95'
+        )
+      "
+      @click="toggleOwnershipPopover"
+    >
+      <div
+        v-if="ownershipSelected !== 'all'"
+        class="absolute top-[-2px] left-[-2px] size-2 rounded-full bg-component-node-widget-background-highlighted"
+      />
+      <i class="icon-[lucide--user] size-4" />
+    </Button>
+    <Popover
+      ref="ownershipPopoverRef"
+      :dismissable="true"
+      :close-on-escape="true"
+      unstyled
+      :pt="{
+        root: {
+          class: 'absolute z-50'
+        },
+        content: {
+          class: ['bg-transparent border-none p-0 pt-2 rounded-lg shadow-lg']
+        }
+      }"
+      @hide="isOwnershipPopoverOpen = false"
+    >
+      <div
+        :class="
+          cn(
+            'flex min-w-32 flex-col gap-2 p-2',
+            'bg-component-node-background',
+            'rounded-lg outline -outline-offset-1 outline-component-node-border'
+          )
+        "
+      >
+        <Button
+          v-for="item of ownershipOptions"
+          :key="item.value"
+          variant="textonly"
+          size="unset"
+          :class="cn('flex h-6 items-center justify-between text-left')"
+          @click="handleOwnershipSelected(item)"
+        >
+          <span>{{ item.name }}</span>
+          <i
+            v-if="ownershipSelected === item.value"
+            class="icon-[lucide--check] size-4"
+          />
+        </Button>
+      </div>
+    </Popover>
+
+    <Button
+      v-if="showBaseModelFilter && baseModelOptions?.length"
+      ref="baseModelTriggerRef"
+      :aria-label="t('assetBrowser.baseModel')"
+      :title="t('assetBrowser.baseModel')"
+      variant="textonly"
+      size="icon"
+      :class="
+        cn(
+          actionButtonStyle,
+          'relative w-8 hover:outline-component-node-widget-background-highlighted active:scale-95'
+        )
+      "
+      @click="toggleBaseModelPopover"
+    >
+      <div
+        v-if="baseModelSelected.size > 0"
+        class="absolute top-[-2px] left-[-2px] size-2 rounded-full bg-component-node-widget-background-highlighted"
+      />
+      <i class="icon-[comfy--ai-model] size-4" />
+    </Button>
+    <Popover
+      ref="baseModelPopoverRef"
+      :dismissable="true"
+      :close-on-escape="true"
+      unstyled
+      :pt="{
+        root: {
+          class: 'absolute z-50'
+        },
+        content: {
+          class: ['bg-transparent border-none p-0 pt-2 rounded-lg shadow-lg']
+        }
+      }"
+      @hide="isBaseModelPopoverOpen = false"
+    >
+      <div
+        :class="
+          cn(
+            'flex min-w-32 flex-col gap-2 p-2',
+            'bg-component-node-background',
+            'rounded-lg outline -outline-offset-1 outline-component-node-border'
+          )
+        "
+      >
+        <Button
+          v-for="item of baseModelOptions"
+          :key="item.value"
+          variant="textonly"
+          size="unset"
+          :class="cn('flex h-6 items-center justify-between text-left')"
+          @click="toggleBaseModelSelection(item)"
+        >
+          <span>{{ item.name }}</span>
+          <i
+            v-if="baseModelSelected.has(item.value)"
+            class="icon-[lucide--check] size-4"
+          />
+        </Button>
+        <span class="h-0 w-full border-b border-border-default" />
+        <Button
+          variant="textonly"
+          size="unset"
+          :class="cn('flex h-6 items-center justify-between text-left')"
+          @click="baseModelSelected = new Set()"
+        >
+          {{ t('g.clearFilters') }}
+        </Button>
       </div>
     </Popover>
 
-    <!-- Layout Switch -->
     <div
       :class="
         cn(
           actionButtonStyle,
-          'flex justify-center items-center p-1 gap-1 hover:outline-component-node-widget-background-highlighted'
+          'flex items-center justify-center gap-1 p-1 hover:outline-component-node-widget-background-highlighted'
         )
       "
     >
-      <button
+      <Button
+        variant="textonly"
+        size="unset"
         :class="
           cn(
-            resetInputStyle,
             layoutSwitchItemStyle,
-            layoutMode === 'list'
-              ? 'bg-neutral-500/50 text-base-foreground'
-              : ''
+            layoutMode === 'list' && 'bg-neutral-500/50 text-base-foreground'
           )
         "
         @click="layoutMode = 'list'"
       >
         <i class="icon-[lucide--list] size-4" />
-      </button>
-      <button
+      </Button>
+      <Button
+        variant="textonly"
+        size="unset"
         :class="
           cn(
-            resetInputStyle,
             layoutSwitchItemStyle,
-            layoutMode === 'grid'
-              ? 'bg-neutral-500/50 text-base-foreground'
-              : ''
+            layoutMode === 'grid' && 'bg-neutral-500/50 text-base-foreground'
           )
         "
         @click="layoutMode = 'grid'"
       >
         <i class="icon-[lucide--layout-grid] size-4" />
-      </button>
+      </Button>
     </div>
   </div>
 </template>
diff --git a/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuFilter.vue b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuFilter.vue
index 73819cd509..aba537a3aa 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuFilter.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuFilter.vue
@@ -3,40 +3,38 @@ import { computed } from 'vue'
 
 import Button from '@/components/ui/button/Button.vue'
 import { useModelUpload } from '@/platform/assets/composables/useModelUpload'
+import type { FilterOption } from '@/platform/assets/types/filterTypes'
 import { cn } from '@/utils/tailwindUtil'
 
-import type { FilterOption, OptionId } from './types'
-
 const { filterOptions } = defineProps<{
   filterOptions: FilterOption[]
 }>()
 
-const filterSelected = defineModel<OptionId>('filterSelected')
+const filterSelected = defineModel<string>('filterSelected')
 
 const { isUploadButtonEnabled, showUploadDialog } = useModelUpload()
 
-// TODO: Add real check to differentiate between the Model dialogs and Load Image
 const singleFilterOption = computed(() => filterOptions.length === 1)
 </script>
 
 <template>
-  <div class="text-secondary mb-4 flex gap-1 px-4 justify-start">
+  <div class="text-secondary mb-4 flex justify-start gap-1 px-4">
     <button
       v-for="option in filterOptions"
-      :key="option.id"
+      :key="option.value"
       type="button"
       :disabled="singleFilterOption"
       :class="
         cn(
-          'px-4 py-2 rounded-md inline-flex justify-center items-center select-none appearance-none border-0 text-base-foreground',
+          'inline-flex appearance-none items-center justify-center rounded-md border-0 px-4 py-2 text-base-foreground select-none',
           !singleFilterOption &&
-            'transition-all duration-150 hover:text-base-foreground hover:bg-interface-menu-component-surface-hovered cursor-pointer active:scale-95',
-          !singleFilterOption && filterSelected === option.id
-            ? '!bg-interface-menu-component-surface-selected text-base-foreground'
+            'cursor-pointer transition-all duration-150 hover:bg-interface-menu-component-surface-hovered hover:text-base-foreground active:scale-95',
+          !singleFilterOption && filterSelected === option.value
+            ? 'bg-interface-menu-component-surface-selected! text-base-foreground'
             : 'bg-transparent'
         )
       "
-      @click="filterSelected = option.id"
+      @click="filterSelected = option.value"
     >
       {{ option.name }}
     </button>
diff --git a/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuItem.vue b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuItem.vue
index 0ba2161f9e..ba43401d9a 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuItem.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdownMenuItem.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { computed, inject, ref } from 'vue'
 
-import LazyImage from '@/components/common/LazyImage.vue'
 import { cn } from '@/utils/tailwindUtil'
 
 import { AssetKindKey } from './types'
@@ -10,10 +9,9 @@ import type { LayoutMode } from './types'
 interface Props {
   index: number
   selected: boolean
-  mediaSrc: string
+  previewUrl: string
   name: string
   label?: string
-  metadata?: string
   layout?: LayoutMode
 }
 
@@ -57,13 +55,13 @@ function handleVideoLoad(event: Event) {
   <div
     :class="
       cn(
-        'flex gap-1 select-none group/item cursor-pointer bg-component-node-widget-background',
-        'transition-all duration-150',
+        'group/item flex cursor-pointer gap-1 bg-component-node-widget-background select-none',
+        'transition-[transform,box-shadow,background-color] duration-150',
         {
           'flex-col text-center': layout === 'grid',
-          'flex-row text-left max-h-16 rounded-lg hover:scale-102 active:scale-98':
+          'max-h-16 flex-row rounded-lg text-left hover:scale-102 active:scale-98':
             layout === 'list',
-          'flex-row text-left hover:bg-component-node-widget-background-hovered rounded-lg':
+          'flex-row rounded-lg text-left hover:bg-component-node-widget-background-hovered':
             layout === 'list-small',
           // selection
           'ring-2 ring-component-node-widget-background-highlighted':
@@ -79,10 +77,10 @@ function handleVideoLoad(event: Event) {
       :class="
         cn(
           'relative',
-          'w-full aspect-square overflow-hidden outline-1 outline-offset-[-1px] outline-interface-stroke',
-          'transition-all duration-150',
+          'aspect-square w-full overflow-hidden outline-1 -outline-offset-1 outline-interface-stroke',
+          'transition-[transform,box-shadow] duration-150',
           {
-            'min-w-16 max-w-16 rounded-l-lg': layout === 'list',
+            'max-w-16 min-w-16 rounded-l-lg': layout === 'list',
             'rounded-sm group-hover/item:scale-108 group-active/item:scale-95':
               layout === 'grid',
             // selection
@@ -95,30 +93,31 @@ function handleVideoLoad(event: Event) {
       <!-- Selected Icon -->
       <div
         v-if="selected"
-        class="absolute top-1 left-1 size-4 rounded-full border-1 border-base-foreground bg-primary-background"
+        class="absolute top-1 left-1 size-4 rounded-full border border-base-foreground bg-primary-background"
       >
         <i
-          class="icon-[lucide--check] size-3 translate-y-[-0.5px] text-base-foreground bold"
+          class="bold icon-[lucide--check] size-3 translate-y-[-0.5px] text-base-foreground"
         />
       </div>
       <video
-        v-if="mediaSrc && isVideo"
-        :src="mediaSrc"
+        v-if="previewUrl && isVideo"
+        :src="previewUrl"
         class="size-full object-cover"
         preload="metadata"
         muted
         @loadeddata="handleVideoLoad"
       />
-      <LazyImage
-        v-else-if="mediaSrc"
-        :src="mediaSrc"
+      <img
+        v-else-if="previewUrl"
+        :src="previewUrl"
         :alt="name"
-        image-class="size-full object-cover"
+        draggable="false"
+        class="size-full object-cover"
         @load="handleImageLoad"
       />
       <div
         v-else
-        class="size-full bg-gradient-to-tr from-blue-400 via-teal-500 to-green-400"
+        class="size-full bg-linear-to-tr from-blue-400 via-teal-500 to-green-400"
       />
     </div>
     <!-- Name -->
@@ -126,8 +125,8 @@ function handleVideoLoad(event: Event) {
       :class="
         cn('flex gap-1', {
           'flex-col': layout === 'grid',
-          'flex-col px-4 py-1 w-full justify-center min-w-0': layout === 'list',
-          'flex-row p-2 items-center justify-between w-full':
+          'w-full min-w-0 flex-col justify-center px-4 py-1': layout === 'list',
+          'w-full flex-row items-center justify-between p-2':
             layout === 'list-small'
         })
       "
@@ -136,7 +135,7 @@ function handleVideoLoad(event: Event) {
         v-tooltip="layout === 'grid' ? (label ?? name) : undefined"
         :class="
           cn(
-            'block text-xs line-clamp-2 break-words overflow-hidden',
+            'line-clamp-2 block overflow-hidden text-xs wrap-break-word',
             'transition-colors duration-150',
             // selection
             !!selected && 'text-base-foreground'
@@ -146,9 +145,9 @@ function handleVideoLoad(event: Event) {
         {{ label ?? name }}
       </span>
       <!-- Meta Data -->
-      <span class="text-secondary block text-xs">{{
-        metadata || actualDimensions
-      }}</span>
+      <span v-if="actualDimensions" class="text-secondary block text-xs">
+        {{ actualDimensions }}
+      </span>
     </div>
   </div>
 </template>
diff --git a/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/shared.test.ts b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/shared.test.ts
new file mode 100644
index 0000000000..d3bb88f3ad
--- /dev/null
+++ b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/shared.test.ts
@@ -0,0 +1,150 @@
+import { describe, expect, it } from 'vitest'
+
+import { defaultSearcher, getDefaultSortOptions } from './shared'
+import type { FormDropdownItem } from './types'
+
+function createItem(name: string, label?: string): FormDropdownItem {
+  return {
+    id: name,
+    preview_url: '',
+    name,
+    label
+  }
+}
+
+describe('defaultSearcher', () => {
+  const items: FormDropdownItem[] = [
+    createItem('apple.png'),
+    createItem('banana.jpg'),
+    createItem('cherry.gif')
+  ]
+
+  it('returns all items when query is empty', async () => {
+    const result = await defaultSearcher('', items)
+    expect(result).toEqual(items)
+  })
+
+  it('returns all items when query is whitespace', async () => {
+    const result = await defaultSearcher('   ', items)
+    expect(result).toEqual(items)
+  })
+
+  it('filters items by single word', async () => {
+    const result = await defaultSearcher('apple', items)
+    expect(result).toHaveLength(1)
+    expect(result[0].name).toBe('apple.png')
+  })
+
+  it('filters items case-insensitively', async () => {
+    const result = await defaultSearcher('APPLE', items)
+    expect(result).toHaveLength(1)
+    expect(result[0].name).toBe('apple.png')
+  })
+
+  it('filters items by multiple words (AND logic)', async () => {
+    const result = await defaultSearcher('a png', items)
+    expect(result).toHaveLength(1)
+    expect(result[0].name).toBe('apple.png')
+  })
+
+  it('returns empty array when no matches', async () => {
+    const result = await defaultSearcher('xyz', items)
+    expect(result).toHaveLength(0)
+  })
+})
+
+describe('getDefaultSortOptions', () => {
+  const sortOptions = getDefaultSortOptions()
+
+  describe('Default sorter', () => {
+    const defaultSorter = sortOptions.find((o) => o.id === 'default')!.sorter
+
+    it('returns items in original order', () => {
+      const items = [createItem('z'), createItem('a'), createItem('m')]
+      const result = defaultSorter({ items })
+      expect(result.map((i) => i.name)).toEqual(['z', 'a', 'm'])
+    })
+
+    it('does not mutate original array', () => {
+      const items = [createItem('z'), createItem('a')]
+      const result = defaultSorter({ items })
+      expect(result).not.toBe(items)
+    })
+  })
+
+  describe('A-Z sorter', () => {
+    const azSorter = sortOptions.find((o) => o.id === 'name-asc')!.sorter
+
+    it('sorts items alphabetically by name', () => {
+      const items = [
+        createItem('cherry'),
+        createItem('apple'),
+        createItem('banana')
+      ]
+      const result = azSorter({ items })
+      expect(result.map((i) => i.name)).toEqual(['apple', 'banana', 'cherry'])
+    })
+
+    it('sorts items alphabetically by label when available', () => {
+      const items = [
+        createItem('file_c.png', 'Cherry'),
+        createItem('file_a.png', 'Apple'),
+        createItem('file_b.png', 'Banana')
+      ]
+      const result = azSorter({ items })
+      expect(result.map((i) => i.name)).toEqual([
+        'file_a.png',
+        'file_b.png',
+        'file_c.png'
+      ])
+    })
+
+    it('uses natural sort for numeric values', () => {
+      const items = [
+        createItem('img_10.png'),
+        createItem('img_2.png'),
+        createItem('img_1.png'),
+        createItem('img_20.png')
+      ]
+      const result = azSorter({ items })
+      expect(result.map((i) => i.name)).toEqual([
+        'img_1.png',
+        'img_2.png',
+        'img_10.png',
+        'img_20.png'
+      ])
+    })
+
+    it('is case-insensitive', () => {
+      const items = [
+        createItem('Banana'),
+        createItem('apple'),
+        createItem('CHERRY')
+      ]
+      const result = azSorter({ items })
+      expect(result.map((i) => i.name)).toEqual(['apple', 'Banana', 'CHERRY'])
+    })
+
+    it('falls back to name when label is undefined', () => {
+      const items = [
+        createItem('z_file.png', 'Alpha'),
+        createItem('a_file.png'),
+        createItem('m_file.png', 'Beta')
+      ]
+      const result = azSorter({ items })
+      // 'a_file.png' (no label, uses name), 'Alpha', 'Beta'
+      expect(result.map((i) => i.name)).toEqual([
+        'a_file.png',
+        'z_file.png',
+        'm_file.png'
+      ])
+    })
+
+    it('does not mutate original array', () => {
+      const items = [createItem('z'), createItem('a')]
+      const result = azSorter({ items })
+      expect(result).not.toBe(items)
+      expect(items[0].name).toBe('z')
+    })
+  })
+})
diff --git a/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/shared.ts b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/shared.ts
index 1c8efeac7f..4717b8870c 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/shared.ts
+++ b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/shared.ts
@@ -1,6 +1,13 @@
-import type { DropdownItem, SortOption } from './types'
+import { t } from '@/i18n'
+import type { AssetSortOption } from '@/platform/assets/types/filterTypes'
+import { sortAssets } from '@/platform/assets/utils/assetSortUtils'
 
-export async function defaultSearcher(query: string, items: DropdownItem[]) {
+import type { FormDropdownItem, SortOption } from './types'
+
+export async function defaultSearcher(
+  query: string,
+  items: FormDropdownItem[]
+) {
   if (query.trim() === '') return items
   const words = query.trim().toLowerCase().split(' ')
   return items.filter((item) => {
@@ -9,20 +16,23 @@ export async function defaultSearcher(query: string, items: DropdownItem[]) {
   })
 }
 
-export function getDefaultSortOptions(): SortOption[] {
+/**
+ * Create a SortOption that delegates to the shared sortAssets utility
+ */
+function createSortOption(
+  id: AssetSortOption,
+  name: string
+): SortOption<AssetSortOption> {
+  return {
+    id,
+    name,
+    sorter: ({ items }) => sortAssets(items, id)
+  }
+}
+
+export function getDefaultSortOptions(): SortOption<AssetSortOption>[] {
   return [
-    {
-      name: 'Default',
-      id: 'default',
-      sorter: ({ items }) => items.slice()
-    },
-    {
-      name: 'A-Z',
-      id: 'a-z',
-      sorter: ({ items }) =>
-        items.slice().sort((a, b) => {
-          return a.name.localeCompare(b.name)
-        })
-    }
+    createSortOption('default', t('assetBrowser.sortDefault')),
+    createSortOption('name-asc', t('assetBrowser.sortAZ'))
   ]
 }
diff --git a/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/types.ts b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/types.ts
index 6b493bd30d..1c84805bb2 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/types.ts
+++ b/src/renderer/extensions/vueNodes/widgets/components/form/dropdown/types.ts
@@ -2,25 +2,28 @@ import type { ComputedRef, InjectionKey } from 'vue'
 
 import type { AssetKind } from '@/types/widgetTypes'
 
-export type OptionId = string | number | symbol
-export type SelectedKey = OptionId
-
-export interface DropdownItem {
-  id: SelectedKey
-  mediaSrc: string // URL for image, video, or other media
+/**
+ * Minimal interface for items in FormDropdown.
+ * Both AssetItem (from cloud API) and local file items satisfy this contract.
+ */
+export interface FormDropdownItem {
+  id: string
+  /** Display name shown in the dropdown */
   name: string
+  /** Original/alternate label (e.g., original filename) */
   label?: string
-  metadata: string
-}
-export interface SortOption {
-  id: OptionId
-  name: string
-  sorter: (ctx: { items: readonly DropdownItem[] }) => DropdownItem[]
+  /** Preview image/video URL */
+  preview_url?: string
+  /** Whether the item is immutable (public model) - used for ownership filtering */
+  is_immutable?: boolean
+  /** Base models this item is compatible with - used for base model filtering */
+  base_models?: string[]
 }
 
-export interface FilterOption {
-  id: OptionId
+export interface SortOption<TId extends string = string> {
+  id: TId
   name: string
+  sorter: (ctx: { items: readonly FormDropdownItem[] }) => FormDropdownItem[]
 }
 
 export type LayoutMode = 'list' | 'grid' | 'list-small'
diff --git a/src/renderer/extensions/vueNodes/widgets/components/layout/WidgetLayoutField.vue b/src/renderer/extensions/vueNodes/widgets/components/layout/WidgetLayoutField.vue
index 696e37a45a..5a1fa7af9b 100644
--- a/src/renderer/extensions/vueNodes/widgets/components/layout/WidgetLayoutField.vue
+++ b/src/renderer/extensions/vueNodes/widgets/components/layout/WidgetLayoutField.vue
@@ -1,24 +1,29 @@
 <script setup lang="ts">
-import { inject } from 'vue'
-
 import type { SimplifiedWidget } from '@/types/simplifiedWidget'
+import { useHideLayoutField } from '@/types/widgetTypes'
 import { cn } from '@/utils/tailwindUtil'
 
-defineProps<{
+const { rootClass } = defineProps<{
   widget: Pick<
     SimplifiedWidget<string | number | undefined>,
     'name' | 'label' | 'borderStyle'
   >
+  rootClass?: string
 }>()
 
-const hideLayoutField = inject<boolean>('hideLayoutField', false)
+const hideLayoutField = useHideLayoutField()
 </script>
 
 <template>
   <div
-    class="grid grid-cols-subgrid min-w-0 justify-between gap-1 text-node-component-slot-text"
+    :class="
+      cn(
+        'grid min-w-0 grid-cols-subgrid justify-between gap-1 text-node-component-slot-text',
+        rootClass
+      )
+    "
   >
-    <div v-if="!hideLayoutField" class="truncate content-center-safe">
+    <div v-if="!hideLayoutField" class="content-center-safe truncate">
       <template v-if="widget.name">
         {{ widget.label || widget.name }}
       </template>
@@ -28,7 +33,7 @@ const hideLayoutField = inject<boolean>('hideLayoutField', false)
       <div
         :class="
           cn(
-            'cursor-default min-w-0 rounded-lg focus-within:ring focus-within:ring-component-node-widget-background-highlighted transition-all',
+            'min-w-0 cursor-default rounded-lg transition-all focus-within:ring focus-within:ring-component-node-widget-background-highlighted',
             widget.borderStyle
           )
         "
diff --git a/src/renderer/extensions/vueNodes/widgets/components/widgetTestUtils.ts b/src/renderer/extensions/vueNodes/widgets/components/widgetTestUtils.ts
new file mode 100644
index 0000000000..191bdbc444
--- /dev/null
+++ b/src/renderer/extensions/vueNodes/widgets/components/widgetTestUtils.ts
@@ -0,0 +1,12 @@
+import type { SimplifiedWidget, WidgetValue } from '@/types/simplifiedWidget'
+
+export function createMockWidget<T extends WidgetValue = string>(
+  overrides: Partial<SimplifiedWidget<T>> & { value: T }
+): SimplifiedWidget<T> {
+  return {
+    name: 'test_widget',
+    type: 'string',
+    options: {},
+    ...overrides
+  }
+}
diff --git a/tests-ui/tests/composables/useAssetWidgetData.desktop.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useAssetWidgetData.desktop.test.ts
similarity index 80%
rename from tests-ui/tests/composables/useAssetWidgetData.desktop.test.ts
rename to src/renderer/extensions/vueNodes/widgets/composables/useAssetWidgetData.desktop.test.ts
index 2410f09645..f8ac6a7e05 100644
--- a/tests-ui/tests/composables/useAssetWidgetData.desktop.test.ts
+++ b/src/renderer/extensions/vueNodes/widgets/composables/useAssetWidgetData.desktop.test.ts
@@ -12,9 +12,10 @@ const mockGetCategoryForNodeType = vi.fn()
 
 vi.mock('@/stores/assetsStore', () => ({
   useAssetsStore: () => ({
-    modelAssetsByNodeType: new Map(),
-    modelLoadingByNodeType: new Map(),
-    modelErrorByNodeType: new Map(),
+    getAssets: () => [],
+    isModelLoading: () => false,
+    getError: () => undefined,
+    hasAssetKey: () => false,
     updateModelsForNodeType: mockUpdateModelsForNodeType
   })
 }))
@@ -28,12 +29,10 @@ vi.mock('@/stores/modelToNodeStore', () => ({
 describe('useAssetWidgetData (desktop/isCloud=false)', () => {
   it('returns empty/default values without calling stores', () => {
     const nodeType = ref('CheckpointLoaderSimple')
-    const { category, assets, dropdownItems, isLoading, error } =
-      useAssetWidgetData(nodeType)
+    const { category, assets, isLoading, error } = useAssetWidgetData(nodeType)
 
     expect(category.value).toBeUndefined()
     expect(assets.value).toEqual([])
-    expect(dropdownItems.value).toEqual([])
     expect(isLoading.value).toBe(false)
     expect(error.value).toBeNull()
     expect(mockUpdateModelsForNodeType).not.toHaveBeenCalled()
diff --git a/tests-ui/tests/composables/useAssetWidgetData.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useAssetWidgetData.test.ts
similarity index 75%
rename from tests-ui/tests/composables/useAssetWidgetData.test.ts
rename to src/renderer/extensions/vueNodes/widgets/composables/useAssetWidgetData.test.ts
index 9c54564f1a..4ba8c95e87 100644
--- a/tests-ui/tests/composables/useAssetWidgetData.test.ts
+++ b/src/renderer/extensions/vueNodes/widgets/composables/useAssetWidgetData.test.ts
@@ -8,17 +8,19 @@ vi.mock('@/platform/distribution/types', () => ({
   isCloud: true
 }))
 
-const mockModelAssetsByNodeType = new Map<string, AssetItem[]>()
-const mockModelLoadingByNodeType = new Map<string, boolean>()
-const mockModelErrorByNodeType = new Map<string, Error | null>()
+const mockAssetsByKey = new Map<string, AssetItem[]>()
+const mockLoadingByKey = new Map<string, boolean>()
+const mockErrorByKey = new Map<string, Error | undefined>()
+const mockInitializedKeys = new Set<string>()
 const mockUpdateModelsForNodeType = vi.fn()
 const mockGetCategoryForNodeType = vi.fn()
 
 vi.mock('@/stores/assetsStore', () => ({
   useAssetsStore: () => ({
-    modelAssetsByNodeType: mockModelAssetsByNodeType,
-    modelLoadingByNodeType: mockModelLoadingByNodeType,
-    modelErrorByNodeType: mockModelErrorByNodeType,
+    getAssets: (key: string) => mockAssetsByKey.get(key) ?? [],
+    isModelLoading: (key: string) => mockLoadingByKey.get(key) ?? false,
+    getError: (key: string) => mockErrorByKey.get(key),
+    hasAssetKey: (key: string) => mockInitializedKeys.has(key),
     updateModelsForNodeType: mockUpdateModelsForNodeType
   })
 }))
@@ -32,9 +34,10 @@ vi.mock('@/stores/modelToNodeStore', () => ({
 describe('useAssetWidgetData (cloud mode, isCloud=true)', () => {
   beforeEach(() => {
     vi.clearAllMocks()
-    mockModelAssetsByNodeType.clear()
-    mockModelLoadingByNodeType.clear()
-    mockModelErrorByNodeType.clear()
+    mockAssetsByKey.clear()
+    mockLoadingByKey.clear()
+    mockErrorByKey.clear()
+    mockInitializedKeys.clear()
     mockGetCategoryForNodeType.mockReturnValue(undefined)
 
     mockUpdateModelsForNodeType.mockImplementation(
@@ -61,7 +64,7 @@ describe('useAssetWidgetData (cloud mode, isCloud=true)', () => {
     }
   })
 
-  it('fetches assets and transforms to dropdown items', async () => {
+  it('fetches assets for a given node type', async () => {
     const mockAssets: AssetItem[] = [
       createMockAsset(
         'asset-1',
@@ -76,15 +79,15 @@ describe('useAssetWidgetData (cloud mode, isCloud=true)', () => {
 
     mockUpdateModelsForNodeType.mockImplementation(
       async (_nodeType: string): Promise<AssetItem[]> => {
-        mockModelAssetsByNodeType.set(_nodeType, mockAssets)
-        mockModelLoadingByNodeType.set(_nodeType, false)
+        mockInitializedKeys.add(_nodeType)
+        mockAssetsByKey.set(_nodeType, mockAssets)
+        mockLoadingByKey.set(_nodeType, false)
         return mockAssets
       }
     )
 
     const nodeType = ref('CheckpointLoaderSimple')
-    const { category, assets, dropdownItems, isLoading } =
-      useAssetWidgetData(nodeType)
+    const { category, assets, isLoading } = useAssetWidgetData(nodeType)
 
     await nextTick()
     await vi.waitFor(() => !isLoading.value)
@@ -94,13 +97,10 @@ describe('useAssetWidgetData (cloud mode, isCloud=true)', () => {
     )
     expect(category.value).toBe('checkpoints')
     expect(assets.value).toEqual(mockAssets)
-
-    expect(dropdownItems.value).toHaveLength(2)
-    const item = dropdownItems.value[0]
-    expect(item.id).toBe('asset-1')
-    expect(item.name).toBe('models/beautiful_model.safetensors')
-    expect(item.label).toBe('Beautiful Model')
-    expect(item.mediaSrc).toBe('/api/preview/asset-1')
+    expect(assets.value).toHaveLength(2)
+    expect(assets.value[0].id).toBe('asset-1')
+    expect(assets.value[0].name).toBe('Beautiful Model')
+    expect(assets.value[0].preview_url).toBe('/api/preview/asset-1')
   })
 
   it('handles API errors gracefully', async () => {
@@ -108,9 +108,10 @@ describe('useAssetWidgetData (cloud mode, isCloud=true)', () => {
 
     mockUpdateModelsForNodeType.mockImplementation(
       async (_nodeType: string): Promise<AssetItem[]> => {
-        mockModelErrorByNodeType.set(_nodeType, mockError)
-        mockModelAssetsByNodeType.set(_nodeType, [])
-        mockModelLoadingByNodeType.set(_nodeType, false)
+        mockInitializedKeys.add(_nodeType)
+        mockErrorByKey.set(_nodeType, mockError)
+        mockAssetsByKey.set(_nodeType, [])
+        mockLoadingByKey.set(_nodeType, false)
         return []
       }
     )
@@ -130,8 +131,9 @@ describe('useAssetWidgetData (cloud mode, isCloud=true)', () => {
 
     mockUpdateModelsForNodeType.mockImplementation(
       async (_nodeType: string): Promise<AssetItem[]> => {
-        mockModelAssetsByNodeType.set(_nodeType, [])
-        mockModelLoadingByNodeType.set(_nodeType, false)
+        mockInitializedKeys.add(_nodeType)
+        mockAssetsByKey.set(_nodeType, [])
+        mockLoadingByKey.set(_nodeType, false)
         return []
       }
     )
@@ -154,8 +156,9 @@ describe('useAssetWidgetData (cloud mode, isCloud=true)', () => {
       mockGetCategoryForNodeType.mockReturnValue('checkpoints')
       mockUpdateModelsForNodeType.mockImplementation(
         async (_nodeType: string): Promise<AssetItem[]> => {
-          mockModelAssetsByNodeType.set(_nodeType, mockAssets)
-          mockModelLoadingByNodeType.set(_nodeType, false)
+          mockInitializedKeys.add(_nodeType)
+          mockAssetsByKey.set(_nodeType, mockAssets)
+          mockLoadingByKey.set(_nodeType, false)
           return mockAssets
         }
       )
@@ -182,8 +185,9 @@ describe('useAssetWidgetData (cloud mode, isCloud=true)', () => {
       mockGetCategoryForNodeType.mockReturnValue('loras')
       mockUpdateModelsForNodeType.mockImplementation(
         async (_nodeType: string): Promise<AssetItem[]> => {
-          mockModelAssetsByNodeType.set(_nodeType, mockAssets)
-          mockModelLoadingByNodeType.set(_nodeType, false)
+          mockInitializedKeys.add(_nodeType)
+          mockAssetsByKey.set(_nodeType, mockAssets)
+          mockLoadingByKey.set(_nodeType, false)
           return mockAssets
         }
       )
@@ -209,8 +213,9 @@ describe('useAssetWidgetData (cloud mode, isCloud=true)', () => {
       mockGetCategoryForNodeType.mockReturnValue('checkpoints')
       mockUpdateModelsForNodeType.mockImplementation(
         async (_nodeType: string): Promise<AssetItem[]> => {
-          mockModelAssetsByNodeType.set(_nodeType, mockAssets)
-          mockModelLoadingByNodeType.set(_nodeType, false)
+          mockInitializedKeys.add(_nodeType)
+          mockAssetsByKey.set(_nodeType, mockAssets)
+          mockLoadingByKey.set(_nodeType, false)
           return mockAssets
         }
       )
@@ -229,7 +234,7 @@ describe('useAssetWidgetData (cloud mode, isCloud=true)', () => {
     })
 
     it('handles undefined node type gracefully', async () => {
-      const { category, assets, dropdownItems, isLoading, error } =
+      const { category, assets, isLoading, error } =
         useAssetWidgetData(undefined)
 
       await nextTick()
@@ -237,7 +242,6 @@ describe('useAssetWidgetData (cloud mode, isCloud=true)', () => {
       expect(mockUpdateModelsForNodeType).not.toHaveBeenCalled()
       expect(category.value).toBeUndefined()
       expect(assets.value).toEqual([])
-      expect(dropdownItems.value).toEqual([])
       expect(isLoading.value).toBe(false)
       expect(error.value).toBeNull()
     })
diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useAssetWidgetData.ts b/src/renderer/extensions/vueNodes/widgets/composables/useAssetWidgetData.ts
index b03f1dac93..7ea3df54f4 100644
--- a/src/renderer/extensions/vueNodes/widgets/composables/useAssetWidgetData.ts
+++ b/src/renderer/extensions/vueNodes/widgets/composables/useAssetWidgetData.ts
@@ -1,9 +1,8 @@
 import { computed, toValue, watch } from 'vue'
 import type { MaybeRefOrGetter } from 'vue'
 
-import { isCloud } from '@/platform/distribution/types'
 import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
-import type { DropdownItem } from '@/renderer/extensions/vueNodes/widgets/components/form/dropdown/types'
+import { isCloud } from '@/platform/distribution/types'
 import { useAssetsStore } from '@/stores/assetsStore'
 import { useModelToNodeStore } from '@/stores/modelToNodeStore'
 
@@ -34,34 +33,17 @@ export function useAssetWidgetData(
 
     const assets = computed<AssetItem[]>(() => {
       const resolvedType = toValue(nodeType)
-      return resolvedType
-        ? (assetsStore.modelAssetsByNodeType.get(resolvedType) ?? [])
-        : []
+      return resolvedType ? (assetsStore.getAssets(resolvedType) ?? []) : []
     })
 
     const isLoading = computed(() => {
       const resolvedType = toValue(nodeType)
-      return resolvedType
-        ? (assetsStore.modelLoadingByNodeType.get(resolvedType) ?? false)
-        : false
+      return resolvedType ? assetsStore.isModelLoading(resolvedType) : false
     })
 
     const error = computed<Error | null>(() => {
       const resolvedType = toValue(nodeType)
-      return resolvedType
-        ? (assetsStore.modelErrorByNodeType.get(resolvedType) ?? null)
-        : null
-    })
-
-    const dropdownItems = computed<DropdownItem[]>(() => {
-      return assets.value.map((asset) => ({
-        id: asset.id,
-        name:
-          (asset.user_metadata?.filename as string | undefined) ?? asset.name,
-        label: asset.name,
-        mediaSrc: asset.preview_url ?? '',
-        metadata: ''
-      }))
+      return resolvedType ? (assetsStore.getError(resolvedType) ?? null) : null
     })
 
     watch(
@@ -71,9 +53,10 @@ export function useAssetWidgetData(
           return
         }
 
-        const hasData = assetsStore.modelAssetsByNodeType.has(currentNodeType)
+        const isLoading = assetsStore.isModelLoading(currentNodeType)
+        const hasBeenInitialized = assetsStore.hasAssetKey(currentNodeType)
 
-        if (!hasData) {
+        if (!isLoading && !hasBeenInitialized) {
           await assetsStore.updateModelsForNodeType(currentNodeType)
         }
       },
@@ -83,7 +66,6 @@ export function useAssetWidgetData(
     return {
       category,
       assets,
-      dropdownItems,
       isLoading,
       error
     }
@@ -91,8 +73,7 @@ export function useAssetWidgetData(
 
   return {
     category: computed(() => undefined),
-    assets: computed(() => []),
-    dropdownItems: computed(() => []),
+    assets: computed<AssetItem[]>(() => []),
     isLoading: computed(() => false),
     error: computed(() => null)
   }
diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useBoundingBoxWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useBoundingBoxWidget.ts
new file mode 100644
index 0000000000..007df7bc53
--- /dev/null
+++ b/src/renderer/extensions/vueNodes/widgets/composables/useBoundingBoxWidget.ts
@@ -0,0 +1,101 @@
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type {
+  IBaseWidget,
+  IBoundingBoxWidget,
+  IImageCropWidget,
+  INumericWidget
+} from '@/lib/litegraph/src/types/widgets'
+import type { Bounds } from '@/renderer/core/layout/types'
+import type {
+  BoundingBoxInputSpec,
+  InputSpec as InputSpecV2
+} from '@/schemas/nodeDef/nodeDefSchemaV2'
+import type { ComfyWidgetConstructorV2 } from '@/scripts/widgets'
+
+function isBoundingBoxLikeWidget(
+  widget: IBaseWidget
+): widget is IBoundingBoxWidget | IImageCropWidget {
+  return widget.type === 'boundingbox' || widget.type === 'imagecrop'
+}
+
+function isNumericWidget(widget: IBaseWidget): widget is INumericWidget {
+  return widget.type === 'number'
+}
+
+export const useBoundingBoxWidget = (): ComfyWidgetConstructorV2 => {
+  return (
+    node: LGraphNode,
+    inputSpec: InputSpecV2
+  ): IBoundingBoxWidget | IImageCropWidget => {
+    const spec = inputSpec as BoundingBoxInputSpec
+    const { name, component } = spec
+    const defaultValue: Bounds = spec.default ?? {
+      x: 0,
+      y: 0,
+      width: 512,
+      height: 512
+    }
+
+    const widgetType = component === 'ImageCrop' ? 'imagecrop' : 'boundingbox'
+
+    const fields: (keyof Bounds)[] = ['x', 'y', 'width', 'height']
+    const subWidgets: INumericWidget[] = []
+
+    const rawWidget = node.addWidget(
+      widgetType,
+      name,
+      { ...defaultValue },
+      () => {
+        for (let i = 0; i < fields.length; i++) {
+          const field = fields[i]
+          const subWidget = subWidgets[i]
+          if (subWidget) {
+            subWidget.value = widget.value[field]
+          }
+        }
+      },
+      {
+        serialize: true,
+        canvasOnly: false
+      }
+    )
+
+    if (!isBoundingBoxLikeWidget(rawWidget)) {
+      throw new Error(`Unexpected widget type: ${rawWidget.type}`)
+    }
+
+    const widget = rawWidget
+
+    for (const field of fields) {
+      const subWidget = node.addWidget(
+        'number',
+        field,
+        defaultValue[field],
+        function (this: INumericWidget, v: number) {
+          this.value = Math.round(v)
+          widget.value[field] = this.value
+          widget.callback?.(widget.value)
+        },
+        {
+          min: field === 'width' || field === 'height' ? 1 : 0,
+          max: 8192,
+          step: 10,
+          step2: 1,
+          precision: 0,
+          serialize: false,
+          canvasOnly: true
+        }
+      )
+
+      if (!isNumericWidget(subWidget)) {
+        throw new Error(`Unexpected widget type: ${subWidget.type}`)
+      }
+
+      subWidgets.push(subWidget)
+    }
+
+    widget.linkedWidgets = subWidgets
+
+    return widget
+  }
+}
diff --git a/tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useComboWidget.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useComboWidget.test.ts
similarity index 93%
rename from tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useComboWidget.test.ts
rename to src/renderer/extensions/vueNodes/widgets/composables/useComboWidget.test.ts
index 54a1013352..2244b8b89f 100644
--- a/tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useComboWidget.test.ts
+++ b/src/renderer/extensions/vueNodes/widgets/composables/useComboWidget.test.ts
@@ -74,7 +74,8 @@ vi.mock('@/i18n', () => ({
 
 vi.mock('@/platform/assets/services/assetService', () => ({
   assetService: {
-    isAssetBrowserEligible: vi.fn(() => false)
+    isAssetBrowserEligible: vi.fn(() => false),
+    shouldUseAssetBrowser: vi.fn(() => false)
   }
 }))
 
@@ -135,6 +136,7 @@ describe('useComboWidget', () => {
     vi.clearAllMocks()
     mockSettingStoreGet.mockReturnValue(false)
     vi.mocked(assetService.isAssetBrowserEligible).mockReturnValue(false)
+    vi.mocked(assetService.shouldUseAssetBrowser).mockReturnValue(false)
     vi.mocked(useAssetBrowserDialog).mockClear()
     mockDistributionState.isCloud = false
     mockAssetsStoreState.inputAssets = []
@@ -165,8 +167,8 @@ describe('useComboWidget', () => {
 
   it('should create normal combo widget when asset API is disabled', () => {
     mockDistributionState.isCloud = true
-    mockSettingStoreGet.mockReturnValue(false) // Asset API disabled
-    vi.mocked(assetService.isAssetBrowserEligible).mockReturnValue(true) // Widget is eligible
+    mockSettingStoreGet.mockReturnValue(false)
+    vi.mocked(assetService.shouldUseAssetBrowser).mockReturnValue(false)
 
     const constructor = useComboWidget()
     const mockWidget = createMockWidget()
@@ -187,14 +189,12 @@ describe('useComboWidget', () => {
       expect.any(Function),
       { values: ['model1.safetensors', 'model2.safetensors'] }
     )
-    expect(mockSettingStoreGet).toHaveBeenCalledWith('Comfy.Assets.UseAssetAPI')
     expect(widget).toBe(mockWidget)
   })
 
   it('should create asset browser widget when API enabled', () => {
     mockDistributionState.isCloud = true
-    mockSettingStoreGet.mockReturnValue(true)
-    vi.mocked(assetService.isAssetBrowserEligible).mockReturnValue(true)
+    vi.mocked(assetService.shouldUseAssetBrowser).mockReturnValue(true)
 
     const constructor = useComboWidget()
     const mockWidget = createMockWidget({
@@ -215,10 +215,10 @@ describe('useComboWidget', () => {
       'asset',
       'ckpt_name',
       'model1.safetensors',
-      expect.any(Function)
+      expect.any(Function),
+      expect.any(Object)
     )
-    expect(mockSettingStoreGet).toHaveBeenCalledWith('Comfy.Assets.UseAssetAPI')
-    expect(vi.mocked(assetService.isAssetBrowserEligible)).toHaveBeenCalledWith(
+    expect(vi.mocked(assetService.shouldUseAssetBrowser)).toHaveBeenCalledWith(
       'CheckpointLoaderSimple',
       'ckpt_name'
     )
@@ -227,8 +227,7 @@ describe('useComboWidget', () => {
 
   it('should create asset browser widget when default value provided without options', () => {
     mockDistributionState.isCloud = true
-    mockSettingStoreGet.mockReturnValue(true)
-    vi.mocked(assetService.isAssetBrowserEligible).mockReturnValue(true)
+    vi.mocked(assetService.shouldUseAssetBrowser).mockReturnValue(true)
 
     const constructor = useComboWidget()
     const mockWidget = createMockWidget({
@@ -250,16 +249,15 @@ describe('useComboWidget', () => {
       'asset',
       'ckpt_name',
       'fallback.safetensors',
-      expect.any(Function)
+      expect.any(Function),
+      expect.any(Object)
     )
-    expect(mockSettingStoreGet).toHaveBeenCalledWith('Comfy.Assets.UseAssetAPI')
     expect(widget).toBe(mockWidget)
   })
 
   it('should show Select model when asset widget has undefined current value', () => {
     mockDistributionState.isCloud = true
-    mockSettingStoreGet.mockReturnValue(true)
-    vi.mocked(assetService.isAssetBrowserEligible).mockReturnValue(true)
+    vi.mocked(assetService.shouldUseAssetBrowser).mockReturnValue(true)
 
     const constructor = useComboWidget()
     const mockWidget = createMockWidget({
@@ -280,9 +278,9 @@ describe('useComboWidget', () => {
       'asset',
       'ckpt_name',
       'Select model', // Should fallback to this instead of undefined
-      expect.any(Function)
+      expect.any(Function),
+      expect.any(Object)
     )
-    expect(mockSettingStoreGet).toHaveBeenCalledWith('Comfy.Assets.UseAssetAPI')
     expect(widget).toBe(mockWidget)
   })
 
diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useComboWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useComboWidget.ts
index 770d5b9da2..81267e9f3a 100644
--- a/src/renderer/extensions/vueNodes/widgets/composables/useComboWidget.ts
+++ b/src/renderer/extensions/vueNodes/widgets/composables/useComboWidget.ts
@@ -3,16 +3,11 @@ import { ref } from 'vue'
 import MultiSelectWidget from '@/components/graph/widgets/MultiSelectWidget.vue'
 import { t } from '@/i18n'
 import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
-import { isAssetWidget, isComboWidget } from '@/lib/litegraph/src/litegraph'
+import { isComboWidget } from '@/lib/litegraph/src/litegraph'
 import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
-import { useAssetBrowserDialog } from '@/platform/assets/composables/useAssetBrowserDialog'
-import {
-  assetFilenameSchema,
-  assetItemSchema
-} from '@/platform/assets/schemas/assetSchema'
 import { assetService } from '@/platform/assets/services/assetService'
+import { createAssetWidget } from '@/platform/assets/utils/createAssetWidget'
 import { isCloud } from '@/platform/distribution/types'
-import { useSettingStore } from '@/platform/settings/settingStore'
 import type {
   ComboInputSpec,
   InputSpec
@@ -70,10 +65,14 @@ const addMultiSelectWidget = (
   // TODO: Add remote support to multi-select widget
   // https://github.com/Comfy-Org/ComfyUI_frontend/issues/3003
   if (inputSpec.control_after_generate) {
+    const defaultType =
+      typeof inputSpec.control_after_generate === 'string'
+        ? inputSpec.control_after_generate
+        : 'fixed'
     widget.linkedWidgets = addValueControlWidgets(
       node,
       widget,
-      'fixed',
+      defaultType,
       undefined,
       transformInputSpecV2ToV1(inputSpec)
     )
@@ -82,67 +81,21 @@ const addMultiSelectWidget = (
   return widget
 }
 
-const createAssetBrowserWidget = (
+function createAssetBrowserWidget(
   node: LGraphNode,
   inputSpec: ComboInputSpec,
   defaultValue: string | undefined
-): IBaseWidget => {
-  const currentValue = defaultValue
-  const displayLabel = currentValue ?? t('widgets.selectModel')
-  const assetBrowserDialog = useAssetBrowserDialog()
-
-  const widget = node.addWidget(
-    'asset',
-    inputSpec.name,
-    displayLabel,
-    async function (this: IBaseWidget) {
-      if (!isAssetWidget(widget)) {
-        throw new Error(`Expected asset widget but received ${widget.type}`)
-      }
-      await assetBrowserDialog.show({
-        nodeType: node.comfyClass || '',
-        inputName: inputSpec.name,
-        currentValue: widget.value,
-        onAssetSelected: (asset) => {
-          const validatedAsset = assetItemSchema.safeParse(asset)
-
-          if (!validatedAsset.success) {
-            console.error(
-              'Invalid asset item:',
-              validatedAsset.error.errors,
-              'Received:',
-              asset
-            )
-            return
-          }
-
-          const filename = validatedAsset.data.user_metadata?.filename
-          const validatedFilename = assetFilenameSchema.safeParse(filename)
-
-          if (!validatedFilename.success) {
-            console.error(
-              'Invalid asset filename:',
-              validatedFilename.error.errors,
-              'for asset:',
-              validatedAsset.data.id
-            )
-            return
-          }
-
-          const oldValue = widget.value
-          this.value = validatedFilename.data
-          node.onWidgetChanged?.(
-            widget.name,
-            validatedFilename.data,
-            oldValue,
-            widget
-          )
-        }
-      })
+): IBaseWidget {
+  return createAssetWidget({
+    node,
+    widgetName: inputSpec.name,
+    nodeTypeForBrowser: node.comfyClass ?? '',
+    inputNameForBrowser: inputSpec.name,
+    defaultValue,
+    onValueChange: (widget, newValue, oldValue) => {
+      node.onWidgetChanged?.(widget.name, newValue, oldValue, widget)
     }
-  )
-
-  return widget
+  })
 }
 
 const createInputMappingWidget = (
@@ -201,10 +154,14 @@ const createInputMappingWidget = (
     if (!isComboWidget(widget)) {
       throw new Error(`Expected combo widget but received ${widget.type}`)
     }
+    const defaultType =
+      typeof inputSpec.control_after_generate === 'string'
+        ? inputSpec.control_after_generate
+        : 'randomize'
     widget.linkedWidgets = addValueControlWidgets(
       node,
       widget,
-      undefined,
+      defaultType,
       undefined,
       transformInputSpecV2ToV1(inputSpec)
     )
@@ -220,14 +177,7 @@ const addComboWidget = (
   const defaultValue = getDefaultValue(inputSpec)
 
   if (isCloud) {
-    const settingStore = useSettingStore()
-    const isUsingAssetAPI = settingStore.get('Comfy.Assets.UseAssetAPI')
-    const isEligible = assetService.isAssetBrowserEligible(
-      node.comfyClass,
-      inputSpec.name
-    )
-
-    if (isUsingAssetAPI && isEligible) {
+    if (assetService.shouldUseAssetBrowser(node.comfyClass, inputSpec.name)) {
       return createAssetBrowserWidget(node, inputSpec, defaultValue)
     }
 
@@ -276,10 +226,14 @@ const addComboWidget = (
       throw new Error(`Expected combo widget but received ${widget.type}`)
     }
 
+    const defaultType =
+      typeof inputSpec.control_after_generate === 'string'
+        ? inputSpec.control_after_generate
+        : 'randomize'
     widget.linkedWidgets = addValueControlWidgets(
       node,
       widget,
-      undefined,
+      defaultType,
       undefined,
       transformInputSpecV2ToV1(inputSpec)
     )
diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useCurveWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useCurveWidget.ts
new file mode 100644
index 0000000000..42e3b30006
--- /dev/null
+++ b/src/renderer/extensions/vueNodes/widgets/composables/useCurveWidget.ts
@@ -0,0 +1,30 @@
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type { ICurveWidget } from '@/lib/litegraph/src/types/widgets'
+import type {
+  CurveInputSpec,
+  InputSpec as InputSpecV2
+} from '@/schemas/nodeDef/nodeDefSchemaV2'
+import type { ComfyWidgetConstructorV2 } from '@/scripts/widgets'
+
+export const useCurveWidget = (): ComfyWidgetConstructorV2 => {
+  return (node: LGraphNode, inputSpec: InputSpecV2): ICurveWidget => {
+    const spec = inputSpec as CurveInputSpec
+    const defaultValue = spec.default ?? [
+      [0, 0],
+      [1, 1]
+    ]
+
+    const rawWidget = node.addWidget(
+      'curve',
+      spec.name,
+      [...defaultValue],
+      () => {}
+    )
+
+    if (rawWidget.type !== 'curve') {
+      throw new Error(`Unexpected widget type: ${rawWidget.type}`)
+    }
+
+    return rawWidget as ICurveWidget
+  }
+}
diff --git a/tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useFloatWidget.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useFloatWidget.test.ts
similarity index 90%
rename from tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useFloatWidget.test.ts
rename to src/renderer/extensions/vueNodes/widgets/composables/useFloatWidget.test.ts
index a2274104c5..788aa0518e 100644
--- a/tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useFloatWidget.test.ts
+++ b/src/renderer/extensions/vueNodes/widgets/composables/useFloatWidget.test.ts
@@ -1,5 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
+import type { INumericWidget } from '@/lib/litegraph/src/types/widgets'
 import { _for_testing } from '@/renderer/extensions/vueNodes/widgets/composables/useFloatWidget'
 
 vi.mock('@/scripts/widgets', () => ({
@@ -16,14 +17,17 @@ const { onFloatValueChange } = _for_testing
 
 describe('useFloatWidget', () => {
   describe('onFloatValueChange', () => {
-    let widget: any
+    let widget: INumericWidget
 
     beforeEach(() => {
       // Reset the widget before each test
       widget = {
+        type: 'number',
+        name: 'test_widget',
+        y: 0,
         options: {},
         value: 0
-      }
+      } as Partial<INumericWidget> as INumericWidget
     })
 
     it('should not round values when round option is not set', () => {
diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useFloatWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useFloatWidget.ts
index 6595f3015e..0d5ee3a959 100644
--- a/src/renderer/extensions/vueNodes/widgets/composables/useFloatWidget.ts
+++ b/src/renderer/extensions/vueNodes/widgets/composables/useFloatWidget.ts
@@ -43,11 +43,13 @@ export const useFloatWidget = () => {
 
     const display_type = inputSpec.display
     const widgetType =
-      sliderEnabled && display_type == 'slider'
-        ? 'slider'
-        : display_type == 'knob'
-          ? 'knob'
-          : 'number'
+      display_type == 'gradientslider'
+        ? 'gradientslider'
+        : sliderEnabled && display_type == 'slider'
+          ? 'slider'
+          : display_type == 'knob'
+            ? 'knob'
+            : 'number'
 
     const step = inputSpec.step ?? 0.5
     const precision =
@@ -72,7 +74,10 @@ export const useFloatWidget = () => {
         /** @deprecated Use step2 instead. The 10x value is a legacy implementation. */
         step: step * 10.0,
         step2: step,
-        precision
+        precision,
+        ...(inputSpec.gradient_stops
+          ? { gradient_stops: inputSpec.gradient_stops }
+          : {})
       }
     )
 
diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useImageCompareWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useImageCompareWidget.ts
index a985585e5a..28a21367be 100644
--- a/src/renderer/extensions/vueNodes/widgets/composables/useImageCompareWidget.ts
+++ b/src/renderer/extensions/vueNodes/widgets/composables/useImageCompareWidget.ts
@@ -15,6 +15,10 @@ export const useImageCompareWidget = (): ComfyWidgetConstructorV2 => {
       ...options
     }) as IImageCompareWidget
 
+    // widget.serialize controls workflow persistence; widget.options.serialize
+    // controls prompt (API) serialization — only disable the former.
+    widget.serialize = false
+
     return widget
   }
 }
diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useImagePreviewWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useImagePreviewWidget.ts
index 929aa96dee..bf7fd1064a 100644
--- a/src/renderer/extensions/vueNodes/widgets/composables/useImagePreviewWidget.ts
+++ b/src/renderer/extensions/vueNodes/widgets/composables/useImagePreviewWidget.ts
@@ -4,6 +4,7 @@ import type {
   IBaseWidget,
   IWidgetOptions
 } from '@/lib/litegraph/src/types/widgets'
+import type { DrawWidgetOptions } from '@/lib/litegraph/src/widgets/BaseWidget'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
@@ -43,12 +44,51 @@ function scheduleDeferredImageRender() {
   })
 }
 
-const renderPreview = (
+const TWO_PI = Math.PI * 2
+const SPINNER_ARC_LENGTH = Math.PI * 1.5
+
+function renderUploadSpinner(
   ctx: CanvasRenderingContext2D,
   node: LGraphNode,
   shiftY: number,
   computedHeight: number | undefined
+) {
+  const dw = node.size[0]
+  const dh = computedHeight ?? 220
+  const centerX = dw / 2
+  const centerY = shiftY + dh / 2
+  const radius = 16
+  const angle = ((Date.now() % 1000) / 1000) * TWO_PI
+
+  ctx.save()
+  ctx.strokeStyle = LiteGraph.NODE_TEXT_COLOR
+  ctx.lineWidth = 3
+  ctx.lineCap = 'round'
+  ctx.beginPath()
+  ctx.arc(centerX, centerY, radius, angle, angle + SPINNER_ARC_LENGTH)
+  ctx.stroke()
+  ctx.restore()
+
+  // Schedule next frame to keep spinner animating continuously.
+  // Only runs while node.isUploading is true (checked by caller).
+  node.graph?.setDirtyCanvas(true)
+}
+
+const renderPreview = (
+  ctx: CanvasRenderingContext2D,
+  node: LGraphNode,
+  shiftY: number,
+  computedHeight: number | undefined,
+  imgs: HTMLImageElement[],
+  width: number
 ) => {
+  if (!node.size) return
+
+  if (node.isUploading) {
+    renderUploadSpinner(ctx, node, shiftY, computedHeight)
+    return
+  }
+
   const canvas = useCanvasStore().getCanvas()
   const mouse = canvas.graph_mouse
 
@@ -62,7 +102,8 @@ const renderPreview = (
     node.pointerDown = null
   }
 
-  const imgs = node.imgs ?? []
+  if (imgs.length === 0) return
+
   let { imageIndex } = node
   const numImages = imgs.length
   if (numImages === 1 && !imageIndex) {
@@ -73,7 +114,7 @@ const renderPreview = (
   const settingStore = useSettingStore()
   const allowImageSizeDraw = settingStore.get('Comfy.Node.AllowImageSizeDraw')
   const IMAGE_TEXT_SIZE_TEXT_HEIGHT = allowImageSizeDraw ? 15 : 0
-  const dw = node.size[0]
+  const dw = width
   const dh = computedHeight ? computedHeight - IMAGE_TEXT_SIZE_TEXT_HEIGHT : 0
 
   if (imageIndex == null) {
@@ -319,8 +360,29 @@ class ImagePreviewWidget extends BaseWidget {
     this.serialize = false
   }
 
-  override drawWidget(ctx: CanvasRenderingContext2D): void {
-    renderPreview(ctx, this.node, this.y, this.computedHeight)
+  override drawWidget(
+    ctx: CanvasRenderingContext2D,
+    options: DrawWidgetOptions
+  ): void {
+    const imgs = options.previewImages ?? this.node.imgs ?? []
+    renderPreview(
+      ctx,
+      this.node,
+      this.y,
+      this.computedHeight,
+      imgs,
+      options.width
+    )
+  }
+
+  override createCopyForNode(node: LGraphNode): this {
+    const copy = new ImagePreviewWidget(
+      node,
+      this.name,
+      this.options as IWidgetOptions<string | object>
+    ) as this
+    copy.value = this.value
+    return copy
   }
 
   override onPointerDown(pointer: CanvasPointer, node: LGraphNode): boolean {
@@ -368,7 +430,8 @@ export const useImagePreviewWidget = () => {
   ) => {
     return node.addCustomWidget(
       new ImagePreviewWidget(node, inputSpec.name, {
-        serialize: false
+        serialize: false,
+        canvasOnly: true
       })
     )
   }
diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useImageUploadWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useImageUploadWidget.ts
index 78f9d0c97d..b1ebd90815 100644
--- a/src/renderer/extensions/vueNodes/widgets/composables/useImageUploadWidget.ts
+++ b/src/renderer/extensions/vueNodes/widgets/composables/useImageUploadWidget.ts
@@ -1,13 +1,12 @@
 import { useNodeImage, useNodeVideo } from '@/composables/node/useNodeImage'
 import { useNodeImageUpload } from '@/composables/node/useNodeImageUpload'
-import { useValueTransform } from '@/composables/useValueTransform'
 import { t } from '@/i18n'
 import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
 import type { IComboWidget } from '@/lib/litegraph/src/types/widgets'
-import type { ResultItem, ResultItemType } from '@/schemas/apiSchema'
+import type { ResultItemType } from '@/schemas/apiSchema'
 import type { InputSpec } from '@/schemas/nodeDefSchema'
 import type { ComfyWidgetConstructor } from '@/scripts/widgets'
-import { useNodeOutputStore } from '@/stores/imagePreviewStore'
+import { useNodeOutputStore } from '@/stores/nodeOutputStore'
 import { isImageUploadInput } from '@/types/nodeDefAugmentation'
 import { createAnnotatedPath } from '@/utils/createAnnotatedPath'
 import { addToComboValues } from '@/utils/litegraphUtil'
@@ -15,17 +14,14 @@ import { addToComboValues } from '@/utils/litegraphUtil'
 const ACCEPTED_IMAGE_TYPES = 'image/png,image/jpeg,image/webp'
 const ACCEPTED_VIDEO_TYPES = 'video/webm,video/mp4'
 
-type InternalFile = string | ResultItem
-type InternalValue = InternalFile | InternalFile[]
-type ExposedValue = string | string[]
-
 const isImageFile = (file: File) => file.type.startsWith('image/')
 const isVideoFile = (file: File) => file.type.startsWith('video/')
 
-const findFileComboWidget = (node: LGraphNode, inputName: string) =>
-  node.widgets!.find((w) => w.name === inputName) as IComboWidget & {
-    value: ExposedValue
-  }
+const findFileComboWidget = (
+  node: LGraphNode,
+  inputName: string
+): IComboWidget | undefined =>
+  node.widgets?.find((w): w is IComboWidget => w.name === inputName)
 
 export const useImageUploadWidget = () => {
   const widgetConstructor: ComfyWidgetConstructor = (
@@ -51,36 +47,40 @@ export const useImageUploadWidget = () => {
 
     const fileFilter = isVideo ? isVideoFile : isImageFile
     const fileComboWidget = findFileComboWidget(node, imageInputName)
-    const initialFile = `${fileComboWidget.value}`
-    const formatPath = (value: InternalFile) =>
+    if (!fileComboWidget) {
+      throw new Error(`Widget "${imageInputName}" not found on node`)
+    }
+    const formatPath = (value: string) =>
       createAnnotatedPath(value, { rootFolder: image_folder })
 
-    const transform = (internalValue: InternalValue): ExposedValue => {
-      if (!internalValue) return initialFile
-      if (Array.isArray(internalValue))
-        return allow_batch
-          ? internalValue.map(formatPath)
-          : formatPath(internalValue[0])
-      return formatPath(internalValue)
-    }
-
-    Object.defineProperty(
-      fileComboWidget,
-      'value',
-      useValueTransform(transform, initialFile)
-    )
-
     // Setup file upload handling
+    let rollback: (() => void) | undefined
     const { openFileSelection } = useNodeImageUpload(node, {
       allow_batch,
       fileFilter,
       accept,
       folder,
+      onUploadStart: (files) => {
+        if (files.length > 0) {
+          const prev = fileComboWidget.value
+          fileComboWidget.value = files[0].name
+          rollback = () => {
+            fileComboWidget.value = prev
+          }
+        }
+      },
+      onUploadError: () => {
+        rollback?.()
+        rollback = undefined
+      },
       onUploadComplete: (output) => {
-        output.forEach((path) => addToComboValues(fileComboWidget, path))
+        rollback = undefined
+        const annotated = output.map(formatPath)
+        annotated.forEach((path) => {
+          addToComboValues(fileComboWidget, path)
+        })
 
-        // Create a NEW array to ensure Vue reactivity detects the change
-        const newValue = allow_batch ? [...output] : output[0]
+        const newValue = allow_batch ? annotated : annotated[0]
 
         // @ts-expect-error litegraph combo value type does not support arrays yet
         fileComboWidget.value = newValue
@@ -103,7 +103,8 @@ export const useImageUploadWidget = () => {
 
     // Add our own callback to the combo widget to render an image when it changes
     fileComboWidget.callback = function () {
-      nodeOutputStore.setNodeOutputs(node, fileComboWidget.value, {
+      node.imgs = undefined
+      nodeOutputStore.setNodeOutputs(node, String(fileComboWidget.value), {
         isAnimated
       })
       node.graph?.setDirtyCanvas(true)
@@ -113,7 +114,7 @@ export const useImageUploadWidget = () => {
     // The value isn't set immediately so we need to wait a moment
     // No change callbacks seem to be fired on initial setting of the value
     requestAnimationFrame(() => {
-      nodeOutputStore.setNodeOutputs(node, fileComboWidget.value, {
+      nodeOutputStore.setNodeOutputs(node, String(fileComboWidget.value), {
         isAnimated
       })
       showPreview({ block: false })
diff --git a/tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useIntWidget.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useIntWidget.test.ts
similarity index 89%
rename from tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useIntWidget.test.ts
rename to src/renderer/extensions/vueNodes/widgets/composables/useIntWidget.test.ts
index 8f12840263..8a32d55fac 100644
--- a/tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useIntWidget.test.ts
+++ b/src/renderer/extensions/vueNodes/widgets/composables/useIntWidget.test.ts
@@ -1,5 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
+import type { INumericWidget } from '@/lib/litegraph/src/types/widgets'
 import { _for_testing } from '@/renderer/extensions/vueNodes/widgets/composables/useIntWidget'
 
 vi.mock('@/scripts/widgets', () => ({
@@ -16,14 +17,17 @@ const { onValueChange } = _for_testing
 
 describe('useIntWidget', () => {
   describe('onValueChange', () => {
-    let widget: any
+    let widget: INumericWidget
 
     beforeEach(() => {
       // Reset the widget before each test
       widget = {
+        type: 'number',
+        name: 'test_widget',
+        y: 0,
         options: {},
         value: 0
-      }
+      } as Partial<INumericWidget> as INumericWidget
     })
 
     it('should round values based on step size', () => {
diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useIntWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useIntWidget.ts
index 0c257c15b1..f307aa0e14 100644
--- a/src/renderer/extensions/vueNodes/widgets/composables/useIntWidget.ts
+++ b/src/renderer/extensions/vueNodes/widgets/composables/useIntWidget.ts
@@ -72,10 +72,14 @@ export const useIntWidget = () => {
       ['seed', 'noise_seed'].includes(inputSpec.name)
 
     if (controlAfterGenerate) {
+      const defaultType =
+        typeof inputSpec.control_after_generate === 'string'
+          ? inputSpec.control_after_generate
+          : 'randomize'
       const controlWidget = addValueControlWidget(
         node,
         widget,
-        'randomize',
+        defaultType,
         undefined,
         undefined,
         transformInputSpecV2ToV1(inputSpec)
diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useMarkdownWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useMarkdownWidget.ts
index c54d13bdfe..694baf86e4 100644
--- a/src/renderer/extensions/vueNodes/widgets/composables/useMarkdownWidget.ts
+++ b/src/renderer/extensions/vueNodes/widgets/composables/useMarkdownWidget.ts
@@ -7,11 +7,15 @@ import TiptapTableRow from '@tiptap/extension-table-row'
 import TiptapStarterKit from '@tiptap/starter-kit'
 import { Markdown as TiptapMarkdown } from 'tiptap-markdown'
 
+import { resolveNodeRootGraphId } from '@/lib/litegraph/src/litegraph'
 import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
 import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
 import { app } from '@/scripts/app'
 import type { ComfyWidgetConstructorV2 } from '@/scripts/widgets'
+import { useWidgetValueStore } from '@/stores/widgetValueStore'
 
+// TODO: This widget manually syncs with widgetValueStore via getValue/setValue.
+// Consolidate with useStringWidget into shared helpers (domWidgetHelpers.ts).
 function addMarkdownWidget(
   node: LGraphNode,
   name: string,
@@ -36,6 +40,8 @@ function addMarkdownWidget(
     editable: false
   })
 
+  const widgetStore = useWidgetValueStore()
+
   const inputEl = editor.options.element as HTMLElement
   inputEl.classList.add('comfy-markdown')
   const textarea = document.createElement('textarea')
@@ -43,16 +49,28 @@ function addMarkdownWidget(
 
   const widget = node.addDOMWidget(name, 'MARKDOWN', inputEl, {
     getValue(): string {
-      return textarea.value
+      const graphId = resolveNodeRootGraphId(node, app.rootGraph.id)
+      const storedValue = widgetStore.getWidget(graphId, node.id, name)?.value
+      return typeof storedValue === 'string' ? storedValue : textarea.value
     },
     setValue(v: string) {
       textarea.value = v
       editor.commands.setContent(v)
+      const graphId = resolveNodeRootGraphId(node, app.rootGraph.id)
+      const widgetState = widgetStore.getWidget(graphId, node.id, name)
+      if (widgetState) widgetState.value = v
     }
   })
-  widget.inputEl = inputEl
+  widget.element = inputEl
   widget.options.minNodeSize = [400, 200]
 
+  inputEl.addEventListener('input', (event) => {
+    if (event.target instanceof HTMLTextAreaElement) {
+      widget.value = event.target.value
+    }
+    widget.callback?.(widget.value)
+  })
+
   inputEl.addEventListener('dblclick', () => {
     inputEl.classList.add('editing')
     setTimeout(() => {
diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useNumberWidgetButtonPt.ts b/src/renderer/extensions/vueNodes/widgets/composables/useNumberWidgetButtonPt.ts
index 90a45335b6..9cbe080c37 100644
--- a/src/renderer/extensions/vueNodes/widgets/composables/useNumberWidgetButtonPt.ts
+++ b/src/renderer/extensions/vueNodes/widgets/composables/useNumberWidgetButtonPt.ts
@@ -1,9 +1,9 @@
 import { cn } from '@comfyorg/tailwind-utils'
 
 const sharedButtonClasses = cn(
-  'inline-flex items-center justify-center border-0 bg-transparent text-inherit transition-colors duration-150 ease-in-out ',
+  'inline-flex items-center justify-center border-0 bg-transparent text-inherit transition-colors duration-150 ease-in-out',
   'hover:bg-node-component-surface-hovered active:bg-node-component-surface-selected',
-  'disabled:bg-node-component-disabled disabled:text-node-icon-disabled disabled:cursor-not-allowed'
+  'disabled:cursor-not-allowed disabled:bg-node-component-disabled disabled:text-node-icon-disabled'
 )
 
 export function useNumberWidgetButtonPt(options?: {
diff --git a/src/renderer/extensions/vueNodes/widgets/composables/usePainterWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/usePainterWidget.ts
new file mode 100644
index 0000000000..ed12bd281b
--- /dev/null
+++ b/src/renderer/extensions/vueNodes/widgets/composables/usePainterWidget.ts
@@ -0,0 +1,16 @@
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+import type { InputSpec as InputSpecV2 } from '@/schemas/nodeDef/nodeDefSchemaV2'
+import type { ComfyWidgetConstructorV2 } from '@/scripts/widgets'
+
+export const usePainterWidget = (): ComfyWidgetConstructorV2 => {
+  return (node: LGraphNode, inputSpec: InputSpecV2): IBaseWidget => {
+    return node.addWidget(
+      'painter',
+      inputSpec.name,
+      (inputSpec.default as string) ?? '',
+      null,
+      { serialize: true, canvasOnly: false }
+    ) as IBaseWidget
+  }
+}
diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useProgressTextWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useProgressTextWidget.ts
index d3e412b85c..90c6cbf926 100644
--- a/src/renderer/extensions/vueNodes/widgets/composables/useProgressTextWidget.ts
+++ b/src/renderer/extensions/vueNodes/widgets/composables/useProgressTextWidget.ts
@@ -1,12 +1,13 @@
-import { ref } from 'vue'
-
 import TextPreviewWidget from '@/components/graph/widgets/TextPreviewWidget.vue'
+import { resolveNodeRootGraphId } from '@/lib/litegraph/src/litegraph'
 import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
 import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
 import { ComponentWidgetImpl, addWidget } from '@/scripts/domWidget'
 import type { ComponentWidgetStandardProps } from '@/scripts/domWidget'
+import { app } from '@/scripts/app'
 import type { ComfyWidgetConstructorV2 } from '@/scripts/widgets'
 import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+import { useWidgetValueStore } from '@/stores/widgetValueStore'
 
 type TextPreviewCustomProps = Omit<
   InstanceType<typeof TextPreviewWidget>['$props'],
@@ -24,7 +25,6 @@ export function useTextPreviewWidget(
     node: LGraphNode,
     inputSpec: InputSpec
   ): IBaseWidget {
-    const widgetValue = ref<string>('')
     const widget = new ComponentWidgetImpl<
       string | object,
       TextPreviewCustomProps
@@ -37,9 +37,22 @@ export function useTextPreviewWidget(
         nodeId: node.id
       },
       options: {
-        getValue: () => widgetValue.value,
+        getValue: () =>
+          useWidgetValueStore().getWidget(
+            resolveNodeRootGraphId(node, app.rootGraph.id),
+            node.id,
+            inputSpec.name
+          )?.value ?? '',
         setValue: (value: string | object) => {
-          widgetValue.value = typeof value === 'string' ? value : String(value)
+          const graphId = resolveNodeRootGraphId(node, app.rootGraph.id)
+          const widgetState = useWidgetValueStore().getWidget(
+            graphId,
+            node.id,
+            inputSpec.name
+          )
+          if (widgetState)
+            widgetState.value =
+              typeof value === 'string' ? value : String(value)
         },
         getMinHeight: () => options.minHeight ?? 42 + PADDING,
         serialize: false,
@@ -47,6 +60,7 @@ export function useTextPreviewWidget(
       },
       type: inputSpec.type
     })
+    widget.serialize = false
     addWidget(node, widget)
     return widget
   }
diff --git a/tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget.test.ts
similarity index 90%
rename from tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget.test.ts
rename to src/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget.test.ts
index 9a45d83ad3..9e86ccda08 100644
--- a/tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget.test.ts
+++ b/src/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget.test.ts
@@ -2,29 +2,31 @@ import axios from 'axios'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 import type { IWidget } from '@/lib/litegraph/src/litegraph'
-import { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import { api } from '@/scripts/api'
 import { useRemoteWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget'
 import type { RemoteWidgetConfig } from '@/schemas/nodeDefSchema'
+import { createMockLGraphNode } from '@/utils/__tests__/litegraphTestUtils'
 
-const createMockNode = (overrides: Partial<LGraphNode> = {}): LGraphNode => {
-  const node = new LGraphNode('TestNode')
-  Object.assign(node, overrides)
-  return node
+function createMockWidget(overrides: Partial<IWidget> = {}): IWidget {
+  return {
+    name: 'test_widget',
+    type: 'text',
+    value: '',
+    options: {},
+    ...overrides
+  } as Partial<IWidget> as IWidget
 }
 
-const createMockWidget = (overrides = {}): IWidget =>
-  ({ ...overrides }) as unknown as IWidget
-
 const mockCloudAuth = vi.hoisted(() => ({
   isCloud: false,
   authHeader: null as { Authorization: string } | null
 }))
 
 vi.mock('axios', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('axios')>()
+  const actual = await importOriginal<typeof axios>()
   return {
     default: {
-      ...actual.default,
+      ...actual,
       get: vi.fn()
     }
   }
@@ -36,22 +38,16 @@ vi.mock('@/platform/distribution/types', () => ({
   }
 }))
 
-vi.mock('@/stores/firebaseAuthStore', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@/stores/firebaseAuthStore')>()
+vi.mock('@/stores/firebaseAuthStore', async () => {
   return {
-    ...actual,
     useFirebaseAuthStore: vi.fn(() => ({
       getAuthHeader: vi.fn(() => Promise.resolve(mockCloudAuth.authHeader))
     }))
   }
 })
 
-vi.mock('@/platform/settings/settingStore', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@/platform/settings/settingStore')>()
+vi.mock('@/platform/settings/settingStore', async () => {
   return {
-    ...actual,
     useSettingStore: () => ({
       settings: {}
     })
@@ -72,7 +68,10 @@ function createMockConfig(overrides = {}): RemoteWidgetConfig {
 const createMockOptions = (inputOverrides = {}) => ({
   remoteConfig: createMockConfig(inputOverrides),
   defaultValue: DEFAULT_VALUE,
-  node: createMockNode(),
+  node: createMockLGraphNode({
+    addWidget: vi.fn(() => createMockWidget()),
+    onRemoved: undefined
+  }),
   widget: createMockWidget()
 })
 
@@ -504,12 +503,14 @@ describe('useRemoteWidget', () => {
     })
 
     it('should handle rapid cache clearing during fetch', async () => {
-      let resolvePromise: (value: any) => void
-      const delayedPromise = new Promise((resolve) => {
-        resolvePromise = resolve
-      })
+      let resolvePromise: (value: { data: unknown; status?: number }) => void
+      const delayedPromise = new Promise<{ data: unknown; status?: number }>(
+        (resolve) => {
+          resolvePromise = resolve
+        }
+      )
 
-      vi.mocked(axios.get).mockImplementationOnce(() => delayedPromise as any)
+      vi.mocked(axios.get).mockImplementationOnce(() => delayedPromise)
 
       const hook = useRemoteWidget(createMockOptions())
       hook.getValue()
@@ -525,17 +526,20 @@ describe('useRemoteWidget', () => {
     })
 
     it('should handle widget destroyed during fetch', async () => {
-      let resolvePromise: (value: any) => void
-      const delayedPromise = new Promise((resolve) => {
-        resolvePromise = resolve
-      })
+      let resolvePromise: (value: { data: unknown; status?: number }) => void
+      const delayedPromise = new Promise<{ data: unknown; status?: number }>(
+        (resolve) => {
+          resolvePromise = resolve
+        }
+      )
 
-      vi.mocked(axios.get).mockImplementationOnce(() => delayedPromise as any)
+      vi.mocked(axios.get).mockImplementationOnce(() => delayedPromise)
 
-      let hook = useRemoteWidget(createMockOptions())
+      let hook: ReturnType<typeof useRemoteWidget> | null =
+        useRemoteWidget(createMockOptions())
       const fetchPromise = hook.getValue()
 
-      hook = null as any
+      hook = null
 
       resolvePromise!({ data: ['delayed data'] })
       await fetchPromise
@@ -588,19 +592,19 @@ describe('useRemoteWidget', () => {
 
   describe('auto-refresh on task completion', () => {
     it('should add auto-refresh toggle widget', () => {
-      const mockNode = {
+      const mockNode = createMockLGraphNode({
         addWidget: vi.fn(),
         widgets: []
-      }
-      const mockWidget = {
+      })
+      const mockWidget = createMockWidget({
         refresh: vi.fn()
-      }
+      })
 
       useRemoteWidget({
         remoteConfig: createMockConfig(),
         defaultValue: DEFAULT_VALUE,
-        node: mockNode as any,
-        widget: mockWidget as any
+        node: mockNode,
+        widget: mockWidget
       })
 
       // Should add auto-refresh toggle widget
@@ -616,22 +620,21 @@ describe('useRemoteWidget', () => {
     })
 
     it('should register event listener when enabled', async () => {
-      const { api } = await import('@/scripts/api')
       const addEventListenerSpy = vi.spyOn(api, 'addEventListener')
 
-      const mockNode = {
+      const mockNode = createMockLGraphNode({
         addWidget: vi.fn(),
         widgets: []
-      }
-      const mockWidget = {
+      })
+      const mockWidget = createMockWidget({
         refresh: vi.fn()
-      }
+      })
 
       useRemoteWidget({
         remoteConfig: createMockConfig(),
         defaultValue: DEFAULT_VALUE,
-        node: mockNode as any,
-        widget: mockWidget as any
+        node: mockNode,
+        widget: mockWidget
       })
 
       // Event listener should be registered immediately
@@ -642,7 +645,6 @@ describe('useRemoteWidget', () => {
     })
 
     it('should refresh widget when workflow completes successfully', async () => {
-      const { api } = await import('@/scripts/api')
       let executionSuccessHandler: (() => void) | undefined
 
       vi.spyOn(api, 'addEventListener').mockImplementation((event, handler) => {
@@ -651,16 +653,16 @@ describe('useRemoteWidget', () => {
         }
       })
 
-      const mockNode = {
+      const mockNode = createMockLGraphNode({
         addWidget: vi.fn(),
         widgets: []
-      }
-      const mockWidget = {} as any
+      })
+      const mockWidget = createMockWidget({})
 
       useRemoteWidget({
         remoteConfig: createMockConfig(),
         defaultValue: DEFAULT_VALUE,
-        node: mockNode as any,
+        node: mockNode,
         widget: mockWidget
       })
 
@@ -668,8 +670,9 @@ describe('useRemoteWidget', () => {
       const refreshSpy = vi.spyOn(mockWidget, 'refresh')
 
       // Get the toggle callback and enable auto-refresh
-      const toggleCallback = mockNode.addWidget.mock.calls.find(
-        (call) => call[0] === 'toggle'
+      const addWidgetMock = mockNode.addWidget as ReturnType<typeof vi.fn>
+      const toggleCallback = addWidgetMock.mock.calls.find(
+        (call: unknown[]) => call[0] === 'toggle'
       )?.[3]
       toggleCallback?.(true)
 
@@ -680,7 +683,6 @@ describe('useRemoteWidget', () => {
     })
 
     it('should not refresh when toggle is disabled', async () => {
-      const { api } = await import('@/scripts/api')
       let executionSuccessHandler: (() => void) | undefined
 
       vi.spyOn(api, 'addEventListener').mockImplementation((event, handler) => {
@@ -689,16 +691,16 @@ describe('useRemoteWidget', () => {
         }
       })
 
-      const mockNode = {
+      const mockNode = createMockLGraphNode({
         addWidget: vi.fn(),
         widgets: []
-      }
-      const mockWidget = {} as any
+      })
+      const mockWidget = createMockWidget({})
 
       useRemoteWidget({
         remoteConfig: createMockConfig(),
         defaultValue: DEFAULT_VALUE,
-        node: mockNode as any,
+        node: mockNode,
         widget: mockWidget
       })
 
@@ -713,7 +715,6 @@ describe('useRemoteWidget', () => {
     })
 
     it('should cleanup event listener on node removal', async () => {
-      const { api } = await import('@/scripts/api')
       let executionSuccessHandler: (() => void) | undefined
 
       vi.spyOn(api, 'addEventListener').mockImplementation((event, handler) => {
@@ -724,20 +725,20 @@ describe('useRemoteWidget', () => {
 
       const removeEventListenerSpy = vi.spyOn(api, 'removeEventListener')
 
-      const mockNode = {
+      const mockNode = createMockLGraphNode({
         addWidget: vi.fn(),
         widgets: [],
-        onRemoved: undefined as any
-      }
-      const mockWidget = {
+        onRemoved: undefined
+      })
+      const mockWidget = createMockWidget({
         refresh: vi.fn()
-      }
+      })
 
       useRemoteWidget({
         remoteConfig: createMockConfig(),
         defaultValue: DEFAULT_VALUE,
-        node: mockNode as any,
-        widget: mockWidget as any
+        node: mockNode,
+        widget: mockWidget
       })
 
       // Simulate node removal
diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget.ts
index 7655727521..3367999680 100644
--- a/src/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget.ts
+++ b/src/renderer/extensions/vueNodes/widgets/composables/useRemoteWidget.ts
@@ -32,7 +32,7 @@ async function getAuthHeaders() {
   return {}
 }
 
-const dataCache = new Map<string, CacheEntry<any>>()
+const dataCache = new Map<string, CacheEntry<unknown>>()
 
 const createCacheKey = (config: RemoteWidgetConfig): string => {
   const { route, query_params = {}, refresh = 0 } = config
@@ -49,7 +49,9 @@ const getBackoff = (retryCount: number) =>
   Math.min(1000 * Math.pow(2, retryCount), 512)
 
 const isInitialized = (entry: CacheEntry<unknown> | undefined) =>
-  entry?.data && entry?.timestamp && entry.timestamp > 0
+  entry?.data !== undefined &&
+  entry?.timestamp !== undefined &&
+  entry.timestamp > 0
 
 const isStale = (entry: CacheEntry<unknown> | undefined, ttl: number) =>
   entry?.timestamp && Date.now() - entry.timestamp >= ttl
@@ -128,9 +130,11 @@ export function useRemoteWidget<
     return !isLoaded && isInitialized(dataCache.get(cacheKey))
   }
 
-  const onFirstLoad = (data: T[]) => {
+  const onFirstLoad = (data: T | T[]) => {
     isLoaded = true
-    widget.value = data[0]
+    const nextValue =
+      Array.isArray(data) && data.length > 0 ? data[0] : undefined
+    widget.value = nextValue ?? (Array.isArray(data) ? defaultValue : data)
     widget.callback?.(widget.value)
     node.graph?.setDirtyCanvas(true)
   }
@@ -138,13 +142,16 @@ export function useRemoteWidget<
   const fetchValue = async () => {
     const entry = dataCache.get(cacheKey)
 
-    if (isFailed(entry)) return entry!.data
+    if (isFailed(entry)) return entry!.data as T
 
     const isValid =
       isInitialized(entry) && (isPermanent || !isStale(entry, refresh))
-    if (isValid || isBackingOff(entry) || isFetching(entry)) return entry!.data
+    if (isValid || isBackingOff(entry) || isFetching(entry))
+      return entry!.data as T
 
-    const currentEntry: CacheEntry<T> = entry || { data: defaultValue }
+    const currentEntry: CacheEntry<T> = (entry as
+      | CacheEntry<T>
+      | undefined) || { data: defaultValue }
     dataCache.set(cacheKey, currentEntry)
 
     try {
diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useStringWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useStringWidget.ts
index 1ace7e9e2a..b3ef7bd6ba 100644
--- a/src/renderer/extensions/vueNodes/widgets/composables/useStringWidget.ts
+++ b/src/renderer/extensions/vueNodes/widgets/composables/useStringWidget.ts
@@ -1,36 +1,51 @@
 import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import { resolveNodeRootGraphId } from '@/lib/litegraph/src/litegraph'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { isStringInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
 import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
 import { app } from '@/scripts/app'
 import type { ComfyWidgetConstructorV2 } from '@/scripts/widgets'
+import { useWidgetValueStore } from '@/stores/widgetValueStore'
 
 const TRACKPAD_DETECTION_THRESHOLD = 50
 
+// TODO: This widget manually syncs with widgetValueStore via getValue/setValue.
+// Consolidate with useMarkdownWidget into shared helpers (domWidgetHelpers.ts).
 function addMultilineWidget(
   node: LGraphNode,
   name: string,
   opts: { defaultVal: string; placeholder?: string }
 ) {
+  const widgetStore = useWidgetValueStore()
   const inputEl = document.createElement('textarea')
   inputEl.className = 'comfy-multiline-input'
+  inputEl.dataset.testid = 'dom-widget-textarea'
   inputEl.value = opts.defaultVal
   inputEl.placeholder = opts.placeholder || name
   inputEl.spellcheck = useSettingStore().get('Comfy.TextareaWidget.Spellcheck')
 
   const widget = node.addDOMWidget(name, 'customtext', inputEl, {
     getValue(): string {
-      return inputEl.value
+      const graphId = resolveNodeRootGraphId(node, app.rootGraph.id)
+      const widgetState = widgetStore.getWidget(graphId, node.id, name)
+
+      return (widgetState?.value as string) ?? inputEl.value
     },
     setValue(v: string) {
       inputEl.value = v
+      const graphId = resolveNodeRootGraphId(node, app.rootGraph.id)
+      const widgetState = widgetStore.getWidget(graphId, node.id, name)
+      if (widgetState) widgetState.value = v
     }
   })
 
-  widget.inputEl = inputEl
+  widget.element = inputEl
   widget.options.minNodeSize = [400, 200]
 
-  inputEl.addEventListener('input', () => {
+  inputEl.addEventListener('input', (event) => {
+    if (event.target instanceof HTMLTextAreaElement) {
+      widget.value = event.target.value
+    }
     widget.callback?.(widget.value)
   })
 
diff --git a/tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useWidgetRenderer.test.ts b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetRenderer.test.ts
similarity index 63%
rename from tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useWidgetRenderer.test.ts
rename to src/renderer/extensions/vueNodes/widgets/composables/useWidgetRenderer.test.ts
index c500615824..3e679a0cc6 100644
--- a/tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useWidgetRenderer.test.ts
+++ b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetRenderer.test.ts
@@ -11,7 +11,6 @@ import {
 import type { SafeWidgetData } from '@/composables/graph/useGraphNodeManager'
 
 const {
-  WidgetAudioUI,
   WidgetButton,
   WidgetColorPicker,
   WidgetInputNumber,
@@ -44,75 +43,75 @@ describe('widgetRegistry', () => {
     // Test number type mappings
     describe('number types', () => {
       it('should map int types to slider widget', () => {
-        expect(getComponent('int', 'bar')).toBe(WidgetInputNumber)
-        expect(getComponent('INT', 'bar')).toBe(WidgetInputNumber)
+        expect(getComponent('int')).toBe(WidgetInputNumber)
+        expect(getComponent('INT')).toBe(WidgetInputNumber)
       })
 
       it('should map float types to slider widget', () => {
-        expect(getComponent('float', 'cfg')).toBe(WidgetInputNumber)
-        expect(getComponent('FLOAT', 'cfg')).toBe(WidgetInputNumber)
-        expect(getComponent('number', 'cfg')).toBe(WidgetInputNumber)
-        expect(getComponent('slider', 'cfg')).toBe(WidgetInputNumber)
+        expect(getComponent('float')).toBe(WidgetInputNumber)
+        expect(getComponent('FLOAT')).toBe(WidgetInputNumber)
+        expect(getComponent('number')).toBe(WidgetInputNumber)
+        expect(getComponent('slider')).toBe(WidgetInputNumber)
       })
     })
 
     // Test text type mappings
     describe('text types', () => {
       it('should map text variations to input text widget', () => {
-        expect(getComponent('text', 'text')).toBe(WidgetInputText)
-        expect(getComponent('string', 'text')).toBe(WidgetInputText)
-        expect(getComponent('STRING', 'text')).toBe(WidgetInputText)
+        expect(getComponent('text')).toBe(WidgetInputText)
+        expect(getComponent('string')).toBe(WidgetInputText)
+        expect(getComponent('STRING')).toBe(WidgetInputText)
       })
 
       it('should map multiline text types to textarea widget', () => {
-        expect(getComponent('multiline', 'text')).toBe(WidgetTextarea)
-        expect(getComponent('textarea', 'text')).toBe(WidgetTextarea)
-        expect(getComponent('TEXTAREA', 'text')).toBe(WidgetTextarea)
-        expect(getComponent('customtext', 'text')).toBe(WidgetTextarea)
+        expect(getComponent('multiline')).toBe(WidgetTextarea)
+        expect(getComponent('textarea')).toBe(WidgetTextarea)
+        expect(getComponent('TEXTAREA')).toBe(WidgetTextarea)
+        expect(getComponent('customtext')).toBe(WidgetTextarea)
       })
 
       it('should map markdown to markdown widget', () => {
-        expect(getComponent('MARKDOWN', 'text')).toBe(WidgetMarkdown)
-        expect(getComponent('markdown', 'text')).toBe(WidgetMarkdown)
+        expect(getComponent('MARKDOWN')).toBe(WidgetMarkdown)
+        expect(getComponent('markdown')).toBe(WidgetMarkdown)
       })
     })
 
     // Test selection type mappings
     describe('selection types', () => {
       it('should map combo types to select widget', () => {
-        expect(getComponent('combo', 'image')).toBe(WidgetSelect)
-        expect(getComponent('COMBO', 'video')).toBe(WidgetSelect)
+        expect(getComponent('combo')).toBe(WidgetSelect)
+        expect(getComponent('COMBO')).toBe(WidgetSelect)
       })
     })
 
     // Test boolean type mappings
     describe('boolean types', () => {
       it('should map boolean types to toggle switch widget', () => {
-        expect(getComponent('toggle', 'image')).toBe(WidgetToggleSwitch)
-        expect(getComponent('boolean', 'image')).toBe(WidgetToggleSwitch)
-        expect(getComponent('BOOLEAN', 'image')).toBe(WidgetToggleSwitch)
+        expect(getComponent('toggle')).toBe(WidgetToggleSwitch)
+        expect(getComponent('boolean')).toBe(WidgetToggleSwitch)
+        expect(getComponent('BOOLEAN')).toBe(WidgetToggleSwitch)
       })
     })
 
     // Test advanced widget mappings
     describe('advanced widgets', () => {
       it('should map color types to color picker widget', () => {
-        expect(getComponent('color', 'color')).toBe(WidgetColorPicker)
-        expect(getComponent('COLOR', 'color')).toBe(WidgetColorPicker)
+        expect(getComponent('color')).toBe(WidgetColorPicker)
+        expect(getComponent('COLOR')).toBe(WidgetColorPicker)
       })
 
       it('should map button types to button widget', () => {
-        expect(getComponent('button', '')).toBe(WidgetButton)
-        expect(getComponent('BUTTON', '')).toBe(WidgetButton)
+        expect(getComponent('button')).toBe(WidgetButton)
+        expect(getComponent('BUTTON')).toBe(WidgetButton)
       })
     })
 
     // Test fallback behavior
     describe('fallback behavior', () => {
       it('should return null for unknown types', () => {
-        expect(getComponent('unknown', 'unknown')).toBe(null)
-        expect(getComponent('custom_widget', 'custom_widget')).toBe(null)
-        expect(getComponent('', '')).toBe(null)
+        expect(getComponent('unknown')).toBe(null)
+        expect(getComponent('custom_widget')).toBe(null)
+        expect(getComponent('')).toBe(null)
       })
     })
   })
@@ -124,7 +123,7 @@ describe('widgetRegistry', () => {
     })
 
     it('should return false for widgets without a type', () => {
-      const widget = { options: {} }
+      const widget = {}
       expect(shouldRenderAsVue(widget)).toBe(false)
     })
 
@@ -137,7 +136,7 @@ describe('widgetRegistry', () => {
     it('should respect options while checking type', () => {
       const widget: Partial<SafeWidgetData> = {
         type: 'text',
-        options: { precision: 5 }
+        options: { canvasOnly: false }
       }
       expect(shouldRenderAsVue(widget)).toBe(true)
     })
@@ -176,16 +175,10 @@ describe('widgetRegistry', () => {
 
     it('should handle case sensitivity correctly through aliases', () => {
       // Test that both lowercase and uppercase work
-      expect(getComponent('string', '')).toBe(WidgetInputText)
-      expect(getComponent('STRING', '')).toBe(WidgetInputText)
-      expect(getComponent('combo', '')).toBe(WidgetSelect)
-      expect(getComponent('COMBO', '')).toBe(WidgetSelect)
-    })
-
-    it('should handle combo additional widgets', () => {
-      // Test that both lowercase and uppercase work
-      expect(getComponent('combo', 'audio')).toBe(WidgetAudioUI)
-      expect(getComponent('combo', 'image')).toBe(WidgetSelect)
+      expect(getComponent('string')).toBe(WidgetInputText)
+      expect(getComponent('STRING')).toBe(WidgetInputText)
+      expect(getComponent('combo')).toBe(WidgetSelect)
+      expect(getComponent('COMBO')).toBe(WidgetSelect)
     })
   })
 })
diff --git a/src/renderer/extensions/vueNodes/widgets/registry/widgetRegistry.ts b/src/renderer/extensions/vueNodes/widgets/registry/widgetRegistry.ts
index 14ea96daa3..e7635e3a6c 100644
--- a/src/renderer/extensions/vueNodes/widgets/registry/widgetRegistry.ts
+++ b/src/renderer/extensions/vueNodes/widgets/registry/widgetRegistry.ts
@@ -48,15 +48,23 @@ const WidgetRecordAudio = defineAsyncComponent(
 const AudioPreviewPlayer = defineAsyncComponent(
   () => import('../components/audio/AudioPreviewPlayer.vue')
 )
-const WidgetAudioUI = defineAsyncComponent(
-  () => import('../components/WidgetAudioUI.vue')
-)
 const Load3D = defineAsyncComponent(
   () => import('@/components/load3d/Load3D.vue')
 )
+const WidgetImageCrop = defineAsyncComponent(
+  () => import('@/components/imagecrop/WidgetImageCrop.vue')
+)
+const WidgetBoundingBox = defineAsyncComponent(
+  () => import('@/components/boundingbox/WidgetBoundingBox.vue')
+)
+const WidgetCurve = defineAsyncComponent(
+  () => import('@/components/curve/WidgetCurve.vue')
+)
+const WidgetPainter = defineAsyncComponent(
+  () => import('@/components/painter/WidgetPainter.vue')
+)
 
 export const FOR_TESTING = {
-  WidgetAudioUI,
   WidgetButton,
   WidgetColorPicker,
   WidgetInputNumber,
@@ -91,7 +99,7 @@ const coreWidgetDefinitions: Array<[string, WidgetDefinition]> = [
     'float',
     {
       component: WidgetInputNumber,
-      aliases: ['FLOAT', 'number', 'slider'],
+      aliases: ['FLOAT', 'number', 'slider', 'gradientslider'],
       essential: true
     }
   ],
@@ -157,13 +165,41 @@ const coreWidgetDefinitions: Array<[string, WidgetDefinition]> = [
       essential: false
     }
   ],
-  ['load3D', { component: Load3D, aliases: ['LOAD_3D'], essential: false }]
+  ['load3D', { component: Load3D, aliases: ['LOAD_3D'], essential: false }],
+  [
+    'imagecrop',
+    {
+      component: WidgetImageCrop,
+      aliases: ['IMAGECROP'],
+      essential: false
+    }
+  ],
+  [
+    'boundingbox',
+    {
+      component: WidgetBoundingBox,
+      aliases: ['BOUNDING_BOX'],
+      essential: false
+    }
+  ],
+  [
+    'curve',
+    {
+      component: WidgetCurve,
+      aliases: ['CURVE'],
+      essential: false
+    }
+  ],
+  [
+    'painter',
+    {
+      component: WidgetPainter,
+      aliases: ['PAINTER'],
+      essential: false
+    }
+  ]
 ]
 
-const getComboWidgetAdditions = (): Map<string, Component> => {
-  return new Map([['audio', WidgetAudioUI]])
-}
-
 // Build lookup maps
 const widgets = new Map<string, WidgetDefinition>()
 const aliasMap = new Map<string, string>()
@@ -178,13 +214,7 @@ for (const [type, def] of coreWidgetDefinitions) {
 // Utility functions
 const getCanonicalType = (type: string): string => aliasMap.get(type) || type
 
-export const getComponent = (type: string, name: string): Component | null => {
-  if (type == 'combo') {
-    const comboAdditions = getComboWidgetAdditions()
-    if (comboAdditions.has(name)) {
-      return comboAdditions.get(name) || null
-    }
-  }
+export const getComponent = (type: string): Component | null => {
   const canonicalType = getCanonicalType(type)
   return widgets.get(canonicalType)?.component || null
 }
@@ -198,7 +228,13 @@ export const shouldRenderAsVue = (widget: Partial<SafeWidgetData>): boolean => {
   return !widget.options?.canvasOnly && !!widget.type
 }
 
-const EXPANDING_TYPES = ['textarea', 'markdown', 'load3D'] as const
+const EXPANDING_TYPES = [
+  'textarea',
+  'markdown',
+  'load3D',
+  'curve',
+  'painter'
+] as const
 
 export function shouldExpand(type: string): boolean {
   const canonicalType = getCanonicalType(type)
diff --git a/src/renderer/extensions/vueNodes/widgets/utils/audioUtils.ts b/src/renderer/extensions/vueNodes/widgets/utils/audioUtils.ts
index 12e7fdf4f5..a596d5c749 100644
--- a/src/renderer/extensions/vueNodes/widgets/utils/audioUtils.ts
+++ b/src/renderer/extensions/vueNodes/widgets/utils/audioUtils.ts
@@ -1,5 +1,4 @@
 import type { ResultItemType } from '@/schemas/apiSchema'
-import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
 
 /**
@@ -13,17 +12,6 @@ export function formatTime(seconds: number): string {
   return `${mins}:${secs.toString().padStart(2, '0')}`
 }
 
-/**
- * Get full audio URL from path
- */
-export function getAudioUrlFromPath(
-  path: string,
-  type: ResultItemType = 'input'
-): string {
-  const [subfolder, filename] = splitFilePath(path)
-  return api.apiURL(getResourceURL(subfolder, filename, type))
-}
-
 export function getResourceURL(
   subfolder: string,
   filename: string,
diff --git a/src/renderer/extensions/vueNodes/widgets/utils/resolvePromotedWidget.test.ts b/src/renderer/extensions/vueNodes/widgets/utils/resolvePromotedWidget.test.ts
new file mode 100644
index 0000000000..83bf815daa
--- /dev/null
+++ b/src/renderer/extensions/vueNodes/widgets/utils/resolvePromotedWidget.test.ts
@@ -0,0 +1,173 @@
+import { describe, expect, it } from 'vitest'
+
+import type { PromotedWidgetView } from '@/core/graph/subgraph/promotedWidgetTypes'
+import { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type { SubgraphNode } from '@/lib/litegraph/src/subgraph/SubgraphNode'
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+import { resolveWidgetFromHostNode } from '@/renderer/extensions/vueNodes/widgets/utils/resolvePromotedWidget'
+
+class TestNode extends LGraphNode {
+  constructor(widgets: IBaseWidget[]) {
+    super('TestNode')
+    this.widgets = widgets
+  }
+}
+
+class TestSubgraphNode extends TestNode {
+  constructor(
+    widgets: IBaseWidget[],
+    innerNodesById: Record<string, LGraphNode> = {}
+  ) {
+    super(widgets)
+    this.subgraph = {
+      getNodeById: (nodeId: string) => innerNodesById[nodeId]
+    } as SubgraphNode['subgraph']
+  }
+
+  override isSubgraphNode(): this is SubgraphNode {
+    return true
+  }
+
+  readonly subgraph: SubgraphNode['subgraph']
+}
+
+type TestPromotedWidget = IBaseWidget &
+  Pick<PromotedWidgetView, 'sourceNodeId' | 'sourceWidgetName'>
+
+function createWidget(name: string): IBaseWidget {
+  return {
+    name,
+    type: 'text',
+    y: 0,
+    options: {}
+  }
+}
+
+function createPromotedWidget(
+  name: string,
+  sourceNodeId: string,
+  sourceWidgetName: string
+): TestPromotedWidget {
+  return {
+    ...createWidget(name),
+    sourceNodeId,
+    sourceWidgetName
+  }
+}
+
+function createHostNode(
+  widgets: IBaseWidget[],
+  options: {
+    isSubgraphNode?: boolean
+    innerNodesById?: Record<string, LGraphNode>
+  } = {}
+): LGraphNode {
+  const { isSubgraphNode = false, innerNodesById = {} } = options
+  return isSubgraphNode
+    ? new TestSubgraphNode(widgets, innerNodesById)
+    : new TestNode(widgets)
+}
+
+describe('resolveWidgetFromHostNode', () => {
+  it('returns host node widget for non-promoted widgets', () => {
+    const widget = createWidget('text_widget')
+    const hostNode = createHostNode([widget])
+
+    const resolved = resolveWidgetFromHostNode(hostNode, widget.name)
+
+    expect(resolved).toEqual({ node: hostNode, widget })
+  })
+
+  it('resolves promoted widget to the interior node widget', () => {
+    const innerWidget = createWidget('inner_text')
+    const innerNode = createHostNode([innerWidget])
+    const promotedWidget = createPromotedWidget(
+      'promoted_text',
+      '42',
+      'inner_text'
+    )
+    const hostNode = createHostNode([promotedWidget], {
+      isSubgraphNode: true,
+      innerNodesById: { '42': innerNode }
+    })
+
+    const resolved = resolveWidgetFromHostNode(hostNode, promotedWidget.name)
+
+    expect(resolved).toEqual({ node: innerNode, widget: innerWidget })
+  })
+
+  it('resolves nested promoted widget chain to deepest interior widget', () => {
+    const innerWidget = createWidget('inner_text')
+    const innerNode = createHostNode([innerWidget])
+
+    const middleNode = createHostNode([], {
+      isSubgraphNode: true,
+      innerNodesById: { '100': innerNode }
+    })
+    const middlePromotedWidget = {
+      ...createPromotedWidget('inner_text', '100', 'inner_text'),
+      node: middleNode
+    } as TestPromotedWidget & { node: LGraphNode }
+    middleNode.widgets = [middlePromotedWidget]
+
+    const outerPromotedWidget = createPromotedWidget(
+      'outer_text',
+      '42',
+      'inner_text'
+    )
+    const hostNode = createHostNode([outerPromotedWidget], {
+      isSubgraphNode: true,
+      innerNodesById: { '42': middleNode }
+    })
+
+    const resolved = resolveWidgetFromHostNode(
+      hostNode,
+      outerPromotedWidget.name
+    )
+
+    expect(resolved).toEqual({ node: innerNode, widget: innerWidget })
+  })
+
+  it('returns undefined when promoted interior node is missing', () => {
+    const promotedWidget = createPromotedWidget(
+      'promoted_text',
+      '42',
+      'inner_text'
+    )
+    const hostNode = createHostNode([promotedWidget], {
+      isSubgraphNode: true
+    })
+
+    const resolved = resolveWidgetFromHostNode(hostNode, promotedWidget.name)
+
+    expect(resolved).toBeUndefined()
+  })
+
+  it('returns undefined when promoted interior widget is missing', () => {
+    const innerNode = createHostNode([])
+    const promotedWidget = createPromotedWidget(
+      'promoted_text',
+      '42',
+      'inner_text'
+    )
+    const hostNode = createHostNode([promotedWidget], {
+      isSubgraphNode: true,
+      innerNodesById: { '42': innerNode }
+    })
+
+    const resolved = resolveWidgetFromHostNode(hostNode, promotedWidget.name)
+
+    expect(resolved).toBeUndefined()
+  })
+
+  it('treats promoted-shaped widgets on non-subgraph nodes as local widgets', () => {
+    const widget = createPromotedWidget('promoted_text', '42', 'inner_text')
+    const hostNode = createHostNode([widget], {
+      isSubgraphNode: false
+    })
+
+    const resolved = resolveWidgetFromHostNode(hostNode, widget.name)
+
+    expect(resolved).toEqual({ node: hostNode, widget })
+  })
+})
diff --git a/src/renderer/extensions/vueNodes/widgets/utils/resolvePromotedWidget.ts b/src/renderer/extensions/vueNodes/widgets/utils/resolvePromotedWidget.ts
new file mode 100644
index 0000000000..27c295bae2
--- /dev/null
+++ b/src/renderer/extensions/vueNodes/widgets/utils/resolvePromotedWidget.ts
@@ -0,0 +1,30 @@
+import { isPromotedWidgetView } from '@/core/graph/subgraph/promotedWidgetTypes'
+import { resolvePromotedWidgetSource } from '@/core/graph/subgraph/resolvePromotedWidgetSource'
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+
+type ResolvedWidget = {
+  node: LGraphNode
+  widget: IBaseWidget
+}
+
+export function resolveWidgetFromHostNode(
+  hostNode: LGraphNode | undefined,
+  widgetName: string
+): ResolvedWidget | undefined {
+  if (!hostNode) return undefined
+
+  const widget = hostNode.widgets?.find((entry) => entry.name === widgetName)
+  if (!widget) return undefined
+
+  const sourceWidget = resolvePromotedWidgetSource(hostNode, widget)
+  if (sourceWidget) return sourceWidget
+
+  if (isPromotedWidgetView(widget) && hostNode.isSubgraphNode())
+    return undefined
+
+  return {
+    node: hostNode,
+    widget
+  }
+}
diff --git a/src/renderer/glsl/glslUtils.test.ts b/src/renderer/glsl/glslUtils.test.ts
new file mode 100644
index 0000000000..a2f7958f42
--- /dev/null
+++ b/src/renderer/glsl/glslUtils.test.ts
@@ -0,0 +1,77 @@
+import { describe, expect, it } from 'vitest'
+
+import {
+  detectOutputCount,
+  detectPassCount,
+  hasVersionDirective
+} from '@/renderer/glsl/glslUtils'
+
+describe('detectOutputCount', () => {
+  it('returns 1 when no fragColor declarations found', () => {
+    expect(detectOutputCount('void main() { gl_FragColor = vec4(1); }')).toBe(1)
+  })
+
+  it('returns 1 for fragColor0 only', () => {
+    expect(detectOutputCount('fragColor0 = vec4(1.0);')).toBe(1)
+  })
+
+  it('returns 2 for fragColor0 and fragColor1', () => {
+    expect(
+      detectOutputCount('fragColor0 = vec4(1.0);\nfragColor1 = vec4(0.0);')
+    ).toBe(2)
+  })
+
+  it('returns 4 for all four outputs', () => {
+    const src = `
+      fragColor0 = vec4(1.0);
+      fragColor1 = vec4(0.5);
+      fragColor2 = vec4(0.3);
+      fragColor3 = vec4(0.0);
+    `
+    expect(detectOutputCount(src)).toBe(4)
+  })
+
+  it('caps at 4 even if higher indices appear', () => {
+    expect(detectOutputCount('fragColor5 = vec4(1.0);')).toBe(4)
+  })
+
+  it('handles non-sequential output indices', () => {
+    expect(
+      detectOutputCount('fragColor0 = vec4(1.0); fragColor3 = vec4(0.0);')
+    ).toBe(4)
+  })
+})
+
+describe('detectPassCount', () => {
+  it('returns 1 when no pragma found', () => {
+    expect(detectPassCount('void main() {}')).toBe(1)
+  })
+
+  it('parses #pragma passes N', () => {
+    expect(detectPassCount('#pragma passes 5\nvoid main() {}')).toBe(5)
+  })
+
+  it('returns at least 1 even with #pragma passes 0', () => {
+    expect(detectPassCount('#pragma passes 0')).toBe(1)
+  })
+
+  it('handles extra whitespace in pragma', () => {
+    expect(detectPassCount('#pragma   passes   10')).toBe(10)
+  })
+})
+
+describe('hasVersionDirective', () => {
+  it('returns true for #version 300 es', () => {
+    expect(hasVersionDirective('#version 300 es\nprecision highp float;')).toBe(
+      true
+    )
+  })
+
+  it('returns false for desktop GLSL', () => {
+    expect(hasVersionDirective('#version 330 core\nvoid main() {}')).toBe(false)
+  })
+
+  it('returns false for no version directive', () => {
+    expect(hasVersionDirective('void main() { }')).toBe(false)
+  })
+})
diff --git a/src/renderer/glsl/glslUtils.ts b/src/renderer/glsl/glslUtils.ts
new file mode 100644
index 0000000000..eb2a02d2e1
--- /dev/null
+++ b/src/renderer/glsl/glslUtils.ts
@@ -0,0 +1,32 @@
+/**
+ * Detect how many fragColor outputs are used in a GLSL shader source.
+ * Mirrors backend _detect_output_count() in nodes_glsl.py.
+ */
+export function detectOutputCount(source: string): number {
+  const matches = source.match(/fragColor(\d+)/g)
+  if (!matches) return 1
+
+  let maxIndex = 0
+  for (const match of matches) {
+    const index = parseInt(match.replace('fragColor', ''), 10)
+    if (index > maxIndex) maxIndex = index
+  }
+  return Math.min(maxIndex + 1, 4)
+}
+
+/**
+ * Parse `#pragma passes N` to get multi-pass count.
+ * Mirrors backend _detect_pass_count() in nodes_glsl.py.
+ */
+export function detectPassCount(source: string): number {
+  const match = source.match(/#pragma\s+passes\s+(\d+)/)
+  if (match) return Math.max(1, parseInt(match[1], 10))
+  return 1
+}
+
+/**
+ * Check if a shader source string contains a GLSL ES 3.00 version directive.
+ */
+export function hasVersionDirective(source: string): boolean {
+  return /^#version\s+300\s+es\s*$/m.test(source)
+}
diff --git a/src/renderer/glsl/useGLSLRenderer.ts b/src/renderer/glsl/useGLSLRenderer.ts
new file mode 100644
index 0000000000..d6cb02698f
--- /dev/null
+++ b/src/renderer/glsl/useGLSLRenderer.ts
@@ -0,0 +1,428 @@
+import { onScopeDispose } from 'vue'
+
+import { detectPassCount } from '@/renderer/glsl/glslUtils'
+
+const VERTEX_SHADER_SOURCE = `#version 300 es
+out vec2 v_texCoord;
+void main() {
+    vec2 verts[3] = vec2[](vec2(-1, -1), vec2(3, -1), vec2(-1, 3));
+    v_texCoord = verts[gl_VertexID] * 0.5 + 0.5;
+    gl_Position = vec4(verts[gl_VertexID], 0, 1);
+}
+`
+
+const MAX_PASSES = 32
+
+export interface GLSLRendererConfig {
+  maxInputs: number
+  maxFloatUniforms: number
+  maxIntUniforms: number
+}
+
+const DEFAULT_CONFIG: GLSLRendererConfig = {
+  maxInputs: 5,
+  maxFloatUniforms: 5,
+  maxIntUniforms: 5
+}
+
+interface CompileResult {
+  success: boolean
+  log: string
+}
+
+function compileShader(
+  gl: WebGL2RenderingContext,
+  type: GLenum,
+  source: string
+): WebGLShader {
+  const shader = gl.createShader(type)
+  if (!shader) throw new Error('Failed to create shader')
+
+  gl.shaderSource(shader, source)
+  gl.compileShader(shader)
+
+  if (!gl.getShaderParameter(shader, gl.COMPILE_STATUS)) {
+    const log = gl.getShaderInfoLog(shader) ?? 'Compilation failed'
+    gl.deleteShader(shader)
+    throw new Error(log)
+  }
+  return shader
+}
+
+export function useGLSLRenderer(config: GLSLRendererConfig = DEFAULT_CONFIG) {
+  const { maxInputs, maxFloatUniforms, maxIntUniforms } = config
+
+  const uniformNames = [
+    'u_resolution',
+    'u_pass',
+    'u_prevPass',
+    ...Array.from({ length: maxInputs }, (_, i) => `u_image${i}`),
+    ...Array.from({ length: maxFloatUniforms }, (_, i) => `u_float${i}`),
+    ...Array.from({ length: maxIntUniforms }, (_, i) => `u_int${i}`)
+  ]
+
+  let canvas: OffscreenCanvas | null = null
+  let gl: WebGL2RenderingContext | null = null
+  let vertexShader: WebGLShader | null = null
+  let program: WebGLProgram | null = null
+  let fragmentShader: WebGLShader | null = null
+  let pingPongFBOs: [WebGLFramebuffer, WebGLFramebuffer] | null = null
+  let pingPongTextures: [WebGLTexture, WebGLTexture] | null = null
+  let fallbackTexture: WebGLTexture | null = null
+  const inputTextures: (WebGLTexture | null)[] = Array.from<null>({
+    length: maxInputs
+  }).fill(null)
+  const uniformLocations = new Map<string, WebGLUniformLocation | null>()
+  let passCount = 1
+  let disposed = false
+
+  function initPingPongFBOs(
+    ctx: WebGL2RenderingContext,
+    width: number,
+    height: number
+  ): void {
+    const fbos: WebGLFramebuffer[] = []
+    const textures: WebGLTexture[] = []
+
+    try {
+      for (let i = 0; i < 2; i++) {
+        const tex = ctx.createTexture()
+        if (!tex) throw new Error('Failed to create ping-pong texture')
+        ctx.bindTexture(ctx.TEXTURE_2D, tex)
+        ctx.texImage2D(
+          ctx.TEXTURE_2D,
+          0,
+          ctx.RGBA8,
+          width,
+          height,
+          0,
+          ctx.RGBA,
+          ctx.UNSIGNED_BYTE,
+          null
+        )
+        ctx.texParameteri(ctx.TEXTURE_2D, ctx.TEXTURE_MIN_FILTER, ctx.LINEAR)
+        ctx.texParameteri(ctx.TEXTURE_2D, ctx.TEXTURE_MAG_FILTER, ctx.LINEAR)
+        ctx.texParameteri(ctx.TEXTURE_2D, ctx.TEXTURE_WRAP_S, ctx.CLAMP_TO_EDGE)
+        ctx.texParameteri(ctx.TEXTURE_2D, ctx.TEXTURE_WRAP_T, ctx.CLAMP_TO_EDGE)
+
+        const fbo = ctx.createFramebuffer()
+        if (!fbo) throw new Error('Failed to create ping-pong framebuffer')
+        ctx.bindFramebuffer(ctx.FRAMEBUFFER, fbo)
+        ctx.framebufferTexture2D(
+          ctx.FRAMEBUFFER,
+          ctx.COLOR_ATTACHMENT0,
+          ctx.TEXTURE_2D,
+          tex,
+          0
+        )
+        const status = ctx.checkFramebufferStatus(ctx.FRAMEBUFFER)
+        if (status !== ctx.FRAMEBUFFER_COMPLETE)
+          throw new Error(`Ping-pong framebuffer incomplete: ${status}`)
+
+        fbos.push(fbo)
+        textures.push(tex)
+      }
+    } catch (error) {
+      for (const fbo of fbos) ctx.deleteFramebuffer(fbo)
+      for (const tex of textures) ctx.deleteTexture(tex)
+      ctx.bindFramebuffer(ctx.FRAMEBUFFER, null)
+      ctx.bindTexture(ctx.TEXTURE_2D, null)
+      throw error
+    }
+
+    ctx.bindFramebuffer(ctx.FRAMEBUFFER, null)
+    ctx.bindTexture(ctx.TEXTURE_2D, null)
+
+    pingPongFBOs = fbos as [WebGLFramebuffer, WebGLFramebuffer]
+    pingPongTextures = textures as [WebGLTexture, WebGLTexture]
+  }
+
+  function destroyPingPongFBOs(): void {
+    if (!gl) return
+    if (pingPongFBOs) {
+      for (const fbo of pingPongFBOs) gl.deleteFramebuffer(fbo)
+      pingPongFBOs = null
+    }
+    if (pingPongTextures) {
+      for (const tex of pingPongTextures) gl.deleteTexture(tex)
+      pingPongTextures = null
+    }
+  }
+
+  function cacheUniformLocations(): void {
+    if (!program || !gl) return
+    for (const name of uniformNames) {
+      uniformLocations.set(name, gl.getUniformLocation(program, name))
+    }
+  }
+
+  function getFallbackTexture(): WebGLTexture {
+    if (!gl) throw new Error('Renderer not initialized')
+    if (!fallbackTexture) {
+      const tex = gl.createTexture()
+      if (!tex) throw new Error('Failed to create fallback texture')
+      fallbackTexture = tex
+      gl.bindTexture(gl.TEXTURE_2D, fallbackTexture)
+      gl.texImage2D(
+        gl.TEXTURE_2D,
+        0,
+        gl.RGBA,
+        1,
+        1,
+        0,
+        gl.RGBA,
+        gl.UNSIGNED_BYTE,
+        new Uint8Array([0, 0, 0, 255])
+      )
+    }
+    return fallbackTexture
+  }
+
+  function init(width: number, height: number): boolean {
+    if (disposed) return false
+
+    try {
+      canvas = new OffscreenCanvas(width, height)
+      const ctx = canvas.getContext('webgl2', {
+        alpha: true,
+        premultipliedAlpha: false,
+        preserveDrawingBuffer: true
+      })
+      if (!ctx) return false
+
+      gl = ctx
+      gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, true)
+      vertexShader = compileShader(gl, gl.VERTEX_SHADER, VERTEX_SHADER_SOURCE)
+      initPingPongFBOs(gl, width, height)
+      return true
+    } catch {
+      dispose()
+      return false
+    }
+  }
+
+  function compileFragment(source: string): CompileResult {
+    if (disposed || !gl) return { success: false, log: 'Engine disposed' }
+
+    passCount = Math.min(detectPassCount(source), MAX_PASSES)
+
+    if (fragmentShader) {
+      gl.deleteShader(fragmentShader)
+      fragmentShader = null
+    }
+    if (program) {
+      gl.deleteProgram(program)
+      program = null
+    }
+    uniformLocations.clear()
+
+    try {
+      fragmentShader = compileShader(gl, gl.FRAGMENT_SHADER, source)
+    } catch (e: unknown) {
+      const msg = e instanceof Error ? e.message : String(e)
+      return { success: false, log: msg }
+    }
+
+    const prog = gl.createProgram()
+    if (!prog) return { success: false, log: 'Failed to create program' }
+
+    gl.attachShader(prog, vertexShader!)
+    gl.attachShader(prog, fragmentShader)
+    gl.linkProgram(prog)
+
+    if (!gl.getProgramParameter(prog, gl.LINK_STATUS)) {
+      const log = gl.getProgramInfoLog(prog) ?? 'Link failed'
+      gl.deleteProgram(prog)
+      return { success: false, log }
+    }
+
+    program = prog
+    cacheUniformLocations()
+    return { success: true, log: '' }
+  }
+
+  function setResolution(width: number, height: number): void {
+    if (disposed || !gl || !canvas) return
+    if (canvas.width !== width || canvas.height !== height) {
+      canvas.width = width
+      canvas.height = height
+      gl.viewport(0, 0, width, height)
+      destroyPingPongFBOs()
+      initPingPongFBOs(gl, width, height)
+    }
+  }
+
+  function setFloatUniform(index: number, value: number): void {
+    if (disposed || !program || !gl) return
+    const loc = uniformLocations.get(`u_float${index}`)
+    if (loc != null) {
+      gl.useProgram(program)
+      gl.uniform1f(loc, value)
+    }
+  }
+
+  function setIntUniform(index: number, value: number): void {
+    if (disposed || !program || !gl) return
+    const loc = uniformLocations.get(`u_int${index}`)
+    if (loc != null) {
+      gl.useProgram(program)
+      gl.uniform1i(loc, value)
+    }
+  }
+
+  function bindInputImage(
+    index: number,
+    image: HTMLImageElement | ImageBitmap
+  ): void {
+    if (disposed || !gl) return
+    if (index < 0 || index >= maxInputs) {
+      throw new Error(
+        `Input index ${index} out of range (max ${maxInputs - 1})`
+      )
+    }
+
+    if (inputTextures[index]) {
+      gl.deleteTexture(inputTextures[index])
+      inputTextures[index] = null
+    }
+
+    const texture = gl.createTexture()
+    if (!texture) return
+
+    gl.activeTexture(gl.TEXTURE0 + index)
+    gl.bindTexture(gl.TEXTURE_2D, texture)
+    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE)
+    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE)
+    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR)
+    gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR)
+    gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, image)
+
+    inputTextures[index] = texture
+  }
+
+  function render(): void {
+    if (disposed || !program || !pingPongFBOs || !gl || !canvas) return
+
+    gl.useProgram(program)
+
+    const resLoc = uniformLocations.get('u_resolution')
+    if (resLoc != null) {
+      gl.uniform2f(resLoc, canvas.width, canvas.height)
+    }
+
+    for (let i = 0; i < maxInputs; i++) {
+      const loc = uniformLocations.get(`u_image${i}`)
+      if (loc != null) {
+        gl.activeTexture(gl.TEXTURE0 + i)
+        gl.bindTexture(gl.TEXTURE_2D, inputTextures[i] ?? getFallbackTexture())
+        gl.uniform1i(loc, i)
+      }
+    }
+
+    const prevPassUnit = maxInputs
+    const prevPassLoc = uniformLocations.get('u_prevPass')
+
+    for (let pass = 0; pass < passCount; pass++) {
+      const passLoc = uniformLocations.get('u_pass')
+      if (passLoc != null) gl.uniform1i(passLoc, pass)
+
+      const isLastPass = pass === passCount - 1
+      const writeIdx = pass % 2
+      const readIdx = 1 - writeIdx
+
+      if (isLastPass) {
+        gl.bindFramebuffer(gl.FRAMEBUFFER, null)
+      } else {
+        gl.bindFramebuffer(gl.FRAMEBUFFER, pingPongFBOs[writeIdx])
+      }
+
+      // Note: u_prevPass uses ping-pong FBOs rather than overwriting the input
+      // texture in-place as the backend does for single-input iteration.
+      if (pass > 0 && prevPassLoc != null) {
+        gl.activeTexture(gl.TEXTURE0 + prevPassUnit)
+        gl.bindTexture(gl.TEXTURE_2D, pingPongTextures![readIdx])
+        gl.uniform1i(prevPassLoc, prevPassUnit)
+      }
+
+      // Ping-pong FBOs have a single color attachment, so intermediate
+      // passes always target COLOR_ATTACHMENT0. MRT is only possible on
+      // the default framebuffer (last pass).
+      if (isLastPass) {
+        gl.drawBuffers([gl.BACK])
+      } else {
+        gl.drawBuffers([gl.COLOR_ATTACHMENT0])
+      }
+
+      gl.drawArrays(gl.TRIANGLES, 0, 3)
+    }
+  }
+
+  function readPixels(): ImageData {
+    if (!gl || !canvas) throw new Error('Renderer not initialized')
+    const w = canvas.width
+    const h = canvas.height
+    const pixels = new Uint8ClampedArray(w * h * 4)
+
+    gl.pixelStorei(gl.PACK_ROW_LENGTH, 0)
+    gl.readPixels(0, 0, w, h, gl.RGBA, gl.UNSIGNED_BYTE, pixels)
+
+    return new ImageData(pixels, w, h)
+  }
+
+  async function toBlob(): Promise<Blob> {
+    if (!canvas) throw new Error('Renderer not initialized')
+    return canvas.convertToBlob({ type: 'image/jpeg', quality: 0.92 })
+  }
+
+  function dispose(): void {
+    if (disposed) return
+    disposed = true
+    if (!gl) return
+
+    for (const tex of inputTextures) {
+      if (tex) gl.deleteTexture(tex)
+    }
+    inputTextures.fill(null)
+
+    if (fallbackTexture) {
+      gl.deleteTexture(fallbackTexture)
+      fallbackTexture = null
+    }
+
+    destroyPingPongFBOs()
+
+    if (fragmentShader) {
+      gl.deleteShader(fragmentShader)
+      fragmentShader = null
+    }
+    if (vertexShader) {
+      gl.deleteShader(vertexShader)
+      vertexShader = null
+    }
+
+    if (program) {
+      gl.deleteProgram(program)
+      program = null
+    }
+
+    uniformLocations.clear()
+
+    const ext = gl.getExtension('WEBGL_lose_context')
+    ext?.loseContext()
+  }
+
+  onScopeDispose(dispose)
+
+  return {
+    init,
+    compileFragment,
+    setResolution,
+    setFloatUniform,
+    setIntUniform,
+    bindInputImage,
+    render,
+    readPixels,
+    toBlob,
+    dispose
+  }
+}
diff --git a/src/router.ts b/src/router.ts
index 5ca66c9535..538364c740 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -8,16 +8,20 @@ import {
 import type { RouteLocationNormalized } from 'vue-router'
 
 import { useFeatureFlags } from '@/composables/useFeatureFlags'
-import { isCloud } from '@/platform/distribution/types'
+import { isCloud, isDesktop } from '@/platform/distribution/types'
+import { useTelemetry } from '@/platform/telemetry'
 import { useDialogService } from '@/services/dialogService'
 import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
 import { useUserStore } from '@/stores/userStore'
-import { isElectron } from '@/utils/envUtil'
 import LayoutDefault from '@/views/layouts/LayoutDefault.vue'
 
 import { installPreservedQueryTracker } from '@/platform/navigation/preservedQueryTracker'
 import { PRESERVED_QUERY_NAMESPACES } from '@/platform/navigation/preservedQueryNamespaces'
-import { cloudOnboardingRoutes } from './platform/cloud/onboarding/onboardingCloudRoutes'
+
+const cloudOnboardingRoutes = isCloud
+  ? (await import('./platform/cloud/onboarding/onboardingCloudRoutes'))
+      .cloudOnboardingRoutes
+  : []
 
 const isFileProtocol = window.location.protocol === 'file:'
 
@@ -29,13 +33,21 @@ const isFileProtocol = window.location.protocol === 'file:'
  *   to support deployments like http://mysite.com/ComfyUI/
  */
 function getBasePath(): string {
-  if (isElectron()) return '/'
+  if (isDesktop) return '/'
   if (isCloud) return import.meta.env?.BASE_URL || '/'
   return window.location.pathname
 }
 
 const basePath = getBasePath()
 
+function trackPageView(): void {
+  if (!isCloud || typeof window === 'undefined') return
+
+  useTelemetry()?.trackPageView(document.title, {
+    path: window.location.href
+  })
+}
+
 const router = createRouter({
   history: isFileProtocol
     ? createWebHashHistory()
@@ -86,9 +98,21 @@ installPreservedQueryTracker(router, [
   {
     namespace: PRESERVED_QUERY_NAMESPACES.TEMPLATE,
     keys: ['template', 'source', 'mode']
+  },
+  {
+    namespace: PRESERVED_QUERY_NAMESPACES.SHARE,
+    keys: ['share']
+  },
+  {
+    namespace: PRESERVED_QUERY_NAMESPACES.INVITE,
+    keys: ['invite']
   }
 ])
 
+router.afterEach(() => {
+  trackPageView()
+})
+
 if (isCloud) {
   const { flags } = useFeatureFlags()
   const PUBLIC_ROUTE_NAMES = new Set([
@@ -149,27 +173,38 @@ if (isCloud) {
       return next()
     }
 
+    const query =
+      to.fullPath === '/'
+        ? undefined
+        : { previousFullPath: encodeURIComponent(to.fullPath) }
+
     // Check if route requires authentication
     if (to.meta.requiresAuth && !isLoggedIn) {
-      return next({ name: 'cloud-login' })
+      return next({
+        name: 'cloud-login',
+        query
+      })
     }
 
     // Handle other protected routes
     if (!isLoggedIn) {
       // For Electron, use dialog
-      if (isElectron()) {
+      if (isDesktop) {
         const dialogService = useDialogService()
         const loginSuccess = await dialogService.showSignInDialog()
         return loginSuccess ? next() : next(false)
       }
 
       // For web, redirect to login
-      return next({ name: 'cloud-login' })
+      return next({
+        name: 'cloud-login',
+        query
+      })
     }
 
     // User is logged in - check if they need onboarding (when enabled)
     // For root path, check actual user status to handle waitlisted users
-    if (!isElectron() && isLoggedIn && to.path === '/') {
+    if (!isDesktop && isLoggedIn && to.path === '/') {
       if (!flags.onboardingSurveyEnabled) {
         return next()
       }
diff --git a/src/schemas/apiSchema.ts b/src/schemas/apiSchema.ts
index 83c9890a8b..20856b9b01 100644
--- a/src/schemas/apiSchema.ts
+++ b/src/schemas/apiSchema.ts
@@ -1,22 +1,21 @@
 import { z } from 'zod'
 
 import { LinkMarkerShape } from '@/lib/litegraph/src/litegraph'
-import {
-  zComfyWorkflow,
-  zNodeId
-} from '@/platform/workflow/validation/schemas/workflowSchema'
+import { zNodeId } from '@/platform/workflow/validation/schemas/workflowSchema'
 import { colorPalettesSchema } from '@/schemas/colorPaletteSchema'
-import { zKeybinding } from '@/schemas/keyBindingSchema'
+import { zKeybinding } from '@/platform/keybindings/types'
 import { NodeBadgeMode } from '@/types/nodeSource'
 import { LinkReleaseTriggerAction } from '@/types/searchBoxTypes'
 
 const zNodeType = z.string()
-export const zQueueIndex = z.number()
-export const zPromptId = z.string()
-export type PromptId = z.infer<typeof zPromptId>
+const zJobId = z.string()
+export type JobId = z.infer<typeof zJobId>
 export const resultItemType = z.enum(['input', 'output', 'temp'])
 export type ResultItemType = z.infer<typeof resultItemType>
 
+const zCustomNodesI18n = z.record(z.string(), z.unknown())
+export type CustomNodesI18n = z.infer<typeof zCustomNodesI18n>
+
 const zResultItem = z.object({
   filename: z.string().optional(),
   subfolder: z.string().optional(),
@@ -35,6 +34,9 @@ const zOutputs = z
 
 export type NodeExecutionOutput = z.infer<typeof zOutputs>
 
+export type NodeOutputWith<T extends Record<string, unknown>> =
+  NodeExecutionOutput & T
+
 // WS messages
 const zStatusWsMessageStatus = z.object({
   exec_info: z.object({
@@ -50,7 +52,7 @@ const zStatusWsMessage = z.object({
 const zProgressWsMessage = z.object({
   value: z.number().int(),
   max: z.number().int(),
-  prompt_id: zPromptId,
+  prompt_id: zJobId,
   node: zNodeId
 })
 
@@ -59,21 +61,21 @@ const zNodeProgressState = z.object({
   max: z.number(),
   state: z.enum(['pending', 'running', 'finished', 'error']),
   node_id: zNodeId,
-  prompt_id: zPromptId,
+  prompt_id: zJobId,
   display_node_id: zNodeId.optional(),
   parent_node_id: zNodeId.optional(),
   real_node_id: zNodeId.optional()
 })
 
 const zProgressStateWsMessage = z.object({
-  prompt_id: zPromptId,
+  prompt_id: zJobId,
   nodes: z.record(zNodeId, zNodeProgressState)
 })
 
 const zExecutingWsMessage = z.object({
   node: zNodeId,
   display_node: zNodeId,
-  prompt_id: zPromptId
+  prompt_id: zJobId
 })
 
 const zExecutedWsMessage = zExecutingWsMessage.extend({
@@ -82,7 +84,7 @@ const zExecutedWsMessage = zExecutingWsMessage.extend({
 })
 
 const zExecutionWsMessageBase = z.object({
-  prompt_id: zPromptId,
+  prompt_id: zJobId,
   timestamp: z.number().int()
 })
 
@@ -135,6 +137,30 @@ const zLogRawResponse = z.object({
 
 const zFeatureFlagsWsMessage = z.record(z.string(), z.any())
 
+const zAssetDownloadWsMessage = z.object({
+  task_id: z.string(),
+  asset_name: z.string(),
+  bytes_total: z.number(),
+  bytes_downloaded: z.number(),
+  progress: z.number(),
+  status: z.enum(['created', 'running', 'completed', 'failed']),
+  asset_id: z.string().optional(),
+  error: z.string().optional()
+})
+
+const zAssetExportWsMessage = z.object({
+  task_id: z.string(),
+  export_name: z.string().optional(),
+  assets_total: z.number(),
+  assets_attempted: z.number(),
+  assets_failed: z.number(),
+  bytes_total: z.number(),
+  bytes_processed: z.number(),
+  progress: z.number(),
+  status: z.enum(['created', 'running', 'completed', 'failed']),
+  error: z.string().optional()
+})
+
 export type StatusWsMessageStatus = z.infer<typeof zStatusWsMessageStatus>
 export type StatusWsMessage = z.infer<typeof zStatusWsMessage>
 export type ProgressWsMessage = z.infer<typeof zProgressWsMessage>
@@ -154,140 +180,15 @@ export type ProgressTextWsMessage = z.infer<typeof zProgressTextWsMessage>
 export type NodeProgressState = z.infer<typeof zNodeProgressState>
 export type ProgressStateWsMessage = z.infer<typeof zProgressStateWsMessage>
 export type FeatureFlagsWsMessage = z.infer<typeof zFeatureFlagsWsMessage>
+export type AssetDownloadWsMessage = z.infer<typeof zAssetDownloadWsMessage>
+export type AssetExportWsMessage = z.infer<typeof zAssetExportWsMessage>
 // End of ws messages
 
 export type NotificationWsMessage = z.infer<typeof zNotificationWsMessage>
 
-const zPromptInputItem = z.object({
-  inputs: z.record(z.string(), z.any()),
-  class_type: zNodeType
-})
-
-const zPromptInputs = z.record(zPromptInputItem)
-
-const zExtraPngInfo = z
-  .object({
-    workflow: zComfyWorkflow
-  })
-  .passthrough()
-
-export const zExtraData = z
-  .object({
-    /** extra_pnginfo can be missing is backend execution gets a validation error. */
-    extra_pnginfo: zExtraPngInfo.optional(),
-    client_id: z.string().optional(),
-    // Cloud/Adapters: creation time in milliseconds when available
-    create_time: z.number().int().optional()
-  })
-  // Allow backend/adapters/extensions to add arbitrary metadata
-  .passthrough()
-const zOutputsToExecute = z.array(zNodeId)
-
-const zExecutionStartMessage = z.tuple([
-  z.literal('execution_start'),
-  zExecutionStartWsMessage
-])
-
-const zExecutionSuccessMessage = z.tuple([
-  z.literal('execution_success'),
-  zExecutionSuccessWsMessage
-])
-
-const zExecutionCachedMessage = z.tuple([
-  z.literal('execution_cached'),
-  zExecutionCachedWsMessage
-])
-
-const zExecutionInterruptedMessage = z.tuple([
-  z.literal('execution_interrupted'),
-  zExecutionInterruptedWsMessage
-])
-
-const zExecutionErrorMessage = z.tuple([
-  z.literal('execution_error'),
-  zExecutionErrorWsMessage
-])
-
-const zStatusMessage = z.union([
-  zExecutionStartMessage,
-  zExecutionSuccessMessage,
-  zExecutionCachedMessage,
-  zExecutionInterruptedMessage,
-  zExecutionErrorMessage
-])
-
-export const zStatus = z.object({
-  status_str: z.enum(['success', 'error']),
-  completed: z.boolean(),
-  messages: z.array(zStatusMessage)
-})
-
-const zTaskPrompt = z.tuple([
-  zQueueIndex,
-  zPromptId,
-  zPromptInputs,
-  zExtraData,
-  zOutputsToExecute
-])
-
-const zRunningTaskItem = z.object({
-  taskType: z.literal('Running'),
-  prompt: zTaskPrompt,
-  // @Deprecated
-  remove: z.object({
-    name: z.literal('Cancel'),
-    cb: z.function()
-  })
-})
-
-const zPendingTaskItem = z.object({
-  taskType: z.literal('Pending'),
-  prompt: zTaskPrompt
-})
-
 export const zTaskOutput = z.record(zNodeId, zOutputs)
-
-const zNodeOutputsMeta = z.object({
-  node_id: zNodeId,
-  display_node: zNodeId,
-  prompt_id: zPromptId.optional(),
-  read_node_id: zNodeId.optional()
-})
-
-export const zTaskMeta = z.record(zNodeId, zNodeOutputsMeta)
-
-const zHistoryTaskItem = z.object({
-  taskType: z.literal('History'),
-  prompt: zTaskPrompt,
-  status: zStatus.optional(),
-  outputs: zTaskOutput,
-  meta: zTaskMeta.optional()
-})
-
-const zTaskItem = z.union([
-  zRunningTaskItem,
-  zPendingTaskItem,
-  zHistoryTaskItem
-])
-
-const zTaskType = z.union([
-  z.literal('Running'),
-  z.literal('Pending'),
-  z.literal('History')
-])
-
-export type TaskType = z.infer<typeof zTaskType>
-export type TaskPrompt = z.infer<typeof zTaskPrompt>
-export type TaskStatus = z.infer<typeof zStatus>
 export type TaskOutput = z.infer<typeof zTaskOutput>
 
-// `/queue`
-export type RunningTaskItem = z.infer<typeof zRunningTaskItem>
-export type PendingTaskItem = z.infer<typeof zPendingTaskItem>
-// `/history`
-export type HistoryTaskItem = z.infer<typeof zHistoryTaskItem>
-export type TaskItem = z.infer<typeof zTaskItem>
-
 const zEmbeddingsResponse = z.array(z.string())
 const zExtensionsResponse = z.array(z.string())
 const zError = z.object({
@@ -317,6 +218,12 @@ const zPromptResponse = z.object({
   error: z.union([z.string(), zError])
 })
 
+const zPromptError = z.object({
+  type: z.string(),
+  message: z.string(),
+  details: z.string()
+})
+
 const zDeviceStats = z.object({
   name: z.string(),
   type: z.string(),
@@ -341,7 +248,9 @@ const zSystemStats = z.object({
     // Cloud-specific fields
     cloud_version: z.string().optional(),
     comfyui_frontend_version: z.string().optional(),
-    workflow_templates_version: z.string().optional()
+    workflow_templates_version: z.string().optional(),
+    installed_templates_version: z.string().optional(),
+    required_templates_version: z.string().optional()
   }),
   devices: z.array(zDeviceStats)
 })
@@ -387,6 +296,7 @@ const zSettings = z.object({
   'Comfy.Canvas.BackgroundImage': z.string().optional(),
   'Comfy.ConfirmClear': z.boolean(),
   'Comfy.DevMode': z.boolean(),
+  'Comfy.UI.TabBarLayout': z.enum(['Default', 'Integrated']),
   'Comfy.Workflow.ShowMissingNodesWarning': z.boolean(),
   'Comfy.Workflow.ShowMissingModelsWarning': z.boolean(),
   'Comfy.Workflow.WarnBlueprintOverwrite': z.boolean(),
@@ -400,12 +310,14 @@ const zSettings = z.object({
   'Comfy.Graph.CanvasInfo': z.boolean(),
   'Comfy.Graph.CanvasMenu': z.boolean(),
   'Comfy.Graph.CtrlShiftZoom': z.boolean(),
+  'Comfy.Graph.DeduplicateSubgraphNodeIds': z.boolean(),
   'Comfy.Graph.LiveSelection': z.boolean(),
   'Comfy.Graph.LinkMarkers': z.nativeEnum(LinkMarkerShape),
   'Comfy.Graph.ZoomSpeed': z.number(),
   'Comfy.Group.DoubleClickTitleToEdit': z.boolean(),
   'Comfy.GroupSelectedNodes.Padding': z.number(),
   'Comfy.Locale': z.string(),
+  'Comfy.NodeLibrary.NewDesign': z.boolean(),
   'Comfy.NodeLibrary.Bookmarks': z.array(z.string()),
   'Comfy.NodeLibrary.Bookmarks.V2': z.array(z.string()),
   'Comfy.NodeLibrary.BookmarksCustomization': z.record(
@@ -417,7 +329,11 @@ const zSettings = z.object({
   'Comfy.ModelLibrary.AutoLoadAll': z.boolean(),
   'Comfy.ModelLibrary.NameFormat': z.enum(['filename', 'title']),
   'Comfy.NodeSearchBoxImpl.NodePreview': z.boolean(),
-  'Comfy.NodeSearchBoxImpl': z.enum(['default', 'simple']),
+  'Comfy.NodeSearchBoxImpl': z.enum([
+    'default',
+    'v1 (legacy)',
+    'litegraph (legacy)'
+  ]),
   'Comfy.NodeSearchBoxImpl.ShowCategory': z.boolean(),
   'Comfy.NodeSearchBoxImpl.ShowIdName': z.boolean(),
   'Comfy.NodeSearchBoxImpl.ShowNodeFrequency': z.boolean(),
@@ -427,6 +343,7 @@ const zSettings = z.object({
   'Comfy.Node.MiddleClickRerouteNode': z.boolean(),
   'Comfy.Node.ShowDeprecated': z.boolean(),
   'Comfy.Node.ShowExperimental': z.boolean(),
+  'Comfy.NodeReplacement.Enabled': z.boolean(),
   'Comfy.Pointer.ClickBufferTime': z.number(),
   'Comfy.Pointer.ClickDrift': z.number(),
   'Comfy.Pointer.DoubleClickTime': z.number(),
@@ -455,6 +372,8 @@ const zSettings = z.object({
   'Comfy.Notification.ShowVersionUpdates': z.boolean(),
   'Comfy.QueueButton.BatchCountLimit': z.number(),
   'Comfy.Queue.MaxHistoryItems': z.number(),
+  'Comfy.Queue.History.Expanded': z.boolean(),
+  'Comfy.WorkflowActions.SeenItems': z.array(z.string()),
   'Comfy.Keybinding.UnsetBindings': z.array(zKeybinding),
   'Comfy.Keybinding.NewBindings': z.array(zKeybinding),
   'Comfy.Extension.Disabled': z.array(z.string()),
@@ -491,6 +410,8 @@ const zSettings = z.object({
   'Comfy.VueNodes.Enabled': z.boolean(),
   'Comfy.VueNodes.AutoScaleLayout': z.boolean(),
   'Comfy.Assets.UseAssetAPI': z.boolean(),
+  'Comfy.Queue.QPOV2': z.boolean(),
+  'Comfy.Queue.ShowRunProgressBar': z.boolean(),
   'Comfy-Desktop.AutoUpdate': z.boolean(),
   'Comfy-Desktop.SendStatistics': z.boolean(),
   'Comfy-Desktop.WindowStyle': z.string(),
@@ -526,6 +447,8 @@ const zSettings = z.object({
   'Comfy.Templates.SelectedRunsOn': z.array(z.string()),
   'Comfy.Templates.SortBy': z.enum([
     'default',
+    'recommended',
+    'popular',
     'alphabetical',
     'newest',
     'vram-low-to-high',
@@ -537,12 +460,16 @@ const zSettings = z.object({
   'single.setting': z.any(),
   'LiteGraph.Node.DefaultPadding': z.boolean(),
   'LiteGraph.Pointer.TrackpadGestures': z.boolean(),
-  'Comfy.VersionCompatibility.DisableWarnings': z.boolean()
+  'Comfy.VersionCompatibility.DisableWarnings': z.boolean(),
+  'Comfy.RightSidePanel.IsOpen': z.boolean(),
+  'Comfy.RightSidePanel.ShowErrorsTab': z.boolean(),
+  'Comfy.Node.AlwaysShowAdvancedWidgets': z.boolean()
 })
 
 export type EmbeddingsResponse = z.infer<typeof zEmbeddingsResponse>
 export type ExtensionsResponse = z.infer<typeof zExtensionsResponse>
 export type PromptResponse = z.infer<typeof zPromptResponse>
+export type PromptError = z.infer<typeof zPromptError>
 export type NodeError = z.infer<typeof zNodeError>
 export type Settings = z.infer<typeof zSettings>
 export type DeviceStats = z.infer<typeof zDeviceStats>
@@ -553,3 +480,31 @@ export type UserDataFullInfo = z.infer<typeof zUserDataFullInfo>
 export type TerminalSize = z.infer<typeof zTerminalSize>
 export type LogEntry = z.infer<typeof zLogEntry>
 export type LogsRawResponse = z.infer<typeof zLogRawResponse>
+
+export const zComfyHubProfile = z.object({
+  username: z.string(),
+  name: z.string().optional(),
+  description: z.string().optional(),
+  coverImageUrl: z.string().nullish(),
+  profilePictureUrl: z.string().nullish()
+})
+
+export type ComfyHubProfile = z.infer<typeof zComfyHubProfile>
+
+export const zAssetInfo = z.object({
+  id: z.string(),
+  name: z.string(),
+  preview_url: z.string(),
+  storage_url: z.string(),
+  model: z.boolean(),
+  public: z.boolean(),
+  in_library: z.boolean()
+})
+
+export type AssetInfo = z.infer<typeof zAssetInfo>
+
+export const zShareableAssetsResponse = z.object({
+  assets: z.array(zAssetInfo)
+})
+
+export type ShareableAssetsResponse = z.infer<typeof zShareableAssetsResponse>
diff --git a/tests-ui/tests/nodeDef.test.ts b/src/schemas/nodeDef/migration.test.ts
similarity index 100%
rename from tests-ui/tests/nodeDef.test.ts
rename to src/schemas/nodeDef/migration.test.ts
diff --git a/src/schemas/nodeDef/nodeDefSchemaV2.ts b/src/schemas/nodeDef/nodeDefSchemaV2.ts
index 9e319c1639..b0be538af1 100644
--- a/src/schemas/nodeDef/nodeDefSchemaV2.ts
+++ b/src/schemas/nodeDef/nodeDefSchemaV2.ts
@@ -64,6 +64,21 @@ const zImageCompareInputSpec = zBaseInputOptions.extend({
   options: z.record(z.unknown()).optional()
 })
 
+const zBoundingBoxInputSpec = zBaseInputOptions.extend({
+  type: z.literal('BOUNDING_BOX'),
+  name: z.string(),
+  isOptional: z.boolean().optional(),
+  component: z.enum(['ImageCrop']).optional(),
+  default: z
+    .object({
+      x: z.number(),
+      y: z.number(),
+      width: z.number(),
+      height: z.number()
+    })
+    .optional()
+})
+
 const zMarkdownInputSpec = zBaseInputOptions.extend({
   type: z.literal('MARKDOWN'),
   name: z.string(),
@@ -111,6 +126,15 @@ const zTextareaInputSpec = zBaseInputOptions.extend({
     .optional()
 })
 
+const zCurvePoint = z.tuple([z.number(), z.number()])
+
+const zCurveInputSpec = zBaseInputOptions.extend({
+  type: z.literal('CURVE'),
+  name: z.string(),
+  isOptional: z.boolean().optional(),
+  default: z.array(zCurvePoint).optional()
+})
+
 const zCustomInputSpec = zBaseInputOptions.extend({
   type: z.string(),
   name: z.string(),
@@ -126,10 +150,12 @@ const zInputSpec = z.union([
   zColorInputSpec,
   zImageInputSpec,
   zImageCompareInputSpec,
+  zBoundingBoxInputSpec,
   zMarkdownInputSpec,
   zChartInputSpec,
   zGalleriaInputSpec,
   zTextareaInputSpec,
+  zCurveInputSpec,
   zCustomInputSpec
 ])
 
@@ -158,6 +184,7 @@ export const zComfyNodeDef = z.object({
   python_module: z.string(),
   deprecated: z.boolean().optional(),
   experimental: z.boolean().optional(),
+  dev_only: z.boolean().optional(),
   api_node: z.boolean().optional()
 })
 
@@ -169,9 +196,11 @@ type StringInputSpec = z.infer<typeof zStringInputSpec>
 export type ComboInputSpec = z.infer<typeof zComboInputSpec>
 export type ColorInputSpec = z.infer<typeof zColorInputSpec>
 export type ImageCompareInputSpec = z.infer<typeof zImageCompareInputSpec>
+export type BoundingBoxInputSpec = z.infer<typeof zBoundingBoxInputSpec>
 export type ChartInputSpec = z.infer<typeof zChartInputSpec>
 export type GalleriaInputSpec = z.infer<typeof zGalleriaInputSpec>
 export type TextareaInputSpec = z.infer<typeof zTextareaInputSpec>
+export type CurveInputSpec = z.infer<typeof zCurveInputSpec>
 export type CustomInputSpec = z.infer<typeof zCustomInputSpec>
 
 export type InputSpec = z.infer<typeof zInputSpec>
diff --git a/src/schemas/nodeDefSchema.ts b/src/schemas/nodeDefSchema.ts
index bb36da2284..2fdfeeada9 100644
--- a/src/schemas/nodeDefSchema.ts
+++ b/src/schemas/nodeDefSchema.ts
@@ -2,6 +2,7 @@ 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({
@@ -42,7 +43,7 @@ const zNumericInputOptions = zBaseInputOptions.extend({
   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']).optional()
+  display: z.enum(['slider', 'number', 'knob', 'gradientslider']).optional()
 })
 
 export const zIntInputOptions = zNumericInputOptions.extend({
@@ -50,11 +51,21 @@ 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.boolean().optional()
+  control_after_generate: z
+    .union([z.boolean(), z.enum(CONTROL_OPTIONS)])
+    .optional()
 })
 
 export const zFloatInputOptions = zNumericInputOptions.extend({
-  round: z.union([z.number(), z.literal(false)]).optional()
+  round: z.union([z.number(), z.literal(false)]).optional(),
+  gradient_stops: z
+    .array(
+      z.object({
+        offset: z.number(),
+        color: z.tuple([z.number(), z.number(), z.number()])
+      })
+    )
+    .optional()
 })
 
 export const zBooleanInputOptions = zBaseInputOptions.extend({
@@ -74,12 +85,16 @@ export const zStringInputOptions = zBaseInputOptions.extend({
 })
 
 export const zComboInputOptions = zBaseInputOptions.extend({
-  control_after_generate: z.boolean().optional(),
+  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(),
@@ -143,6 +158,20 @@ export function isComboInputSpec(
   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.
  *
@@ -197,6 +226,50 @@ 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(),
@@ -209,10 +282,12 @@ export const zComfyNodeDef = z.object({
   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.
@@ -224,7 +299,22 @@ export const zComfyNodeDef = z.object({
    * 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()
+  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({
diff --git a/tests-ui/tests/apiTypes.test.ts b/src/schemas/nodeDefSchema.validation.test.ts
similarity index 94%
rename from tests-ui/tests/apiTypes.test.ts
rename to src/schemas/nodeDefSchema.validation.test.ts
index 1b6d4ee6f5..707eabd3e4 100644
--- a/tests-ui/tests/apiTypes.test.ts
+++ b/src/schemas/nodeDefSchema.validation.test.ts
@@ -1,9 +1,7 @@
 import { describe, expect, it } from 'vitest'
 
-import {
-  type ComfyNodeDef,
-  validateComfyNodeDef
-} from '@/schemas/nodeDefSchema'
+import { validateComfyNodeDef } from '@/schemas/nodeDefSchema'
+import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'
 
 const EXAMPLE_NODE_DEF: ComfyNodeDef = {
   input: {
diff --git a/tests-ui/tests/api.featureFlags.test.ts b/src/scripts/api.featureFlags.test.ts
similarity index 72%
rename from tests-ui/tests/api.featureFlags.test.ts
rename to src/scripts/api.featureFlags.test.ts
index 9900a2adec..9af2571614 100644
--- a/tests-ui/tests/api.featureFlags.test.ts
+++ b/src/scripts/api.featureFlags.test.ts
@@ -1,10 +1,20 @@
+import type { Mock } from 'vitest'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { computed, nextTick } from 'vue'
 
 import { api } from '@/scripts/api'
 
+interface MockWebSocket {
+  readyState: number
+  send: Mock
+  close: Mock
+  addEventListener: Mock
+  removeEventListener: Mock
+}
+
 describe('API Feature Flags', () => {
-  let mockWebSocket: any
-  const wsEventHandlers: { [key: string]: (event: any) => void } = {}
+  let mockWebSocket: MockWebSocket
+  const wsEventHandlers: { [key: string]: (event: unknown) => void } = {}
 
   beforeEach(() => {
     // Use fake timers
@@ -16,7 +26,7 @@ describe('API Feature Flags', () => {
       send: vi.fn(),
       close: vi.fn(),
       addEventListener: vi.fn(
-        (event: string, handler: (event: any) => void) => {
+        (event: string, handler: (event: unknown) => void) => {
           wsEventHandlers[event] = handler
         }
       ),
@@ -29,7 +39,7 @@ describe('API Feature Flags', () => {
     })
 
     // Reset API state
-    api.serverFeatureFlags = {}
+    api.serverFeatureFlags.value = {}
 
     // Mock getClientFeatureFlags to return test feature flags
     vi.spyOn(api, 'getClientFeatureFlags').mockReturnValue({
@@ -93,7 +103,7 @@ describe('API Feature Flags', () => {
       await initPromise
 
       // Check that server features were stored
-      expect(api.serverFeatureFlags).toEqual({
+      expect(api.serverFeatureFlags.value).toEqual({
         supports_preview_metadata: true,
         async_execution: true,
         supported_formats: ['webp', 'jpeg', 'png'],
@@ -135,14 +145,14 @@ describe('API Feature Flags', () => {
       await initPromise
 
       // Server features should remain empty
-      expect(api.serverFeatureFlags).toEqual({})
+      expect(api.serverFeatureFlags.value).toEqual({})
     })
   })
 
   describe('Feature checking methods', () => {
     beforeEach(() => {
       // Set up some test features
-      api.serverFeatureFlags = {
+      api.serverFeatureFlags.value = {
         supports_preview_metadata: true,
         async_execution: false,
         capabilities: ['isolated_nodes', 'dynamic_models']
@@ -199,12 +209,61 @@ describe('API Feature Flags', () => {
   describe('Integration with preview messages', () => {
     it('should affect preview message handling based on feature support', () => {
       // Test with metadata support
-      api.serverFeatureFlags = { supports_preview_metadata: true }
+      api.serverFeatureFlags.value = { supports_preview_metadata: true }
       expect(api.serverSupportsFeature('supports_preview_metadata')).toBe(true)
 
       // Test without metadata support
-      api.serverFeatureFlags = {}
+      api.serverFeatureFlags.value = {}
       expect(api.serverSupportsFeature('supports_preview_metadata')).toBe(false)
     })
   })
+
+  describe('Reactivity', () => {
+    it('should trigger computed updates when serverFeatureFlags changes', async () => {
+      api.serverFeatureFlags.value = {}
+
+      const flag = computed(() =>
+        api.getServerFeature('supports_preview_metadata', false)
+      )
+      expect(flag.value).toBe(false)
+
+      api.serverFeatureFlags.value = { supports_preview_metadata: true }
+      await nextTick()
+
+      expect(flag.value).toBe(true)
+    })
+  })
+
+  describe('Dev override via localStorage', () => {
+    afterEach(() => {
+      localStorage.clear()
+    })
+
+    it('getServerFeature returns localStorage override over server value', () => {
+      api.serverFeatureFlags.value = { some_flag: false }
+      localStorage.setItem('ff:some_flag', 'true')
+
+      expect(api.getServerFeature('some_flag')).toBe(true)
+    })
+
+    it('serverSupportsFeature returns localStorage override over server value', () => {
+      api.serverFeatureFlags.value = { some_flag: false }
+      localStorage.setItem('ff:some_flag', 'true')
+
+      expect(api.serverSupportsFeature('some_flag')).toBe(true)
+    })
+
+    it('getServerFeature falls through when no override is set', () => {
+      api.serverFeatureFlags.value = { some_flag: 'server_value' }
+
+      expect(api.getServerFeature('some_flag')).toBe('server_value')
+    })
+
+    it('getServerFeature override works with numeric values', () => {
+      api.serverFeatureFlags.value = { max_upload_size: 100 }
+      localStorage.setItem('ff:max_upload_size', '999')
+
+      expect(api.getServerFeature('max_upload_size')).toBe(999)
+    })
+  })
 })
diff --git a/tests-ui/tests/api.fetchApi.test.ts b/src/scripts/api.fetchApi.test.ts
similarity index 100%
rename from tests-ui/tests/api.fetchApi.test.ts
rename to src/scripts/api.fetchApi.test.ts
diff --git a/tests-ui/tests/api.folderPaths.test.ts b/src/scripts/api.folderPaths.test.ts
similarity index 100%
rename from tests-ui/tests/api.folderPaths.test.ts
rename to src/scripts/api.folderPaths.test.ts
diff --git a/src/scripts/api.ts b/src/scripts/api.ts
index 268aef8a2b..ebe23e4264 100644
--- a/src/scripts/api.ts
+++ b/src/scripts/api.ts
@@ -2,21 +2,33 @@ import { promiseTimeout, until } from '@vueuse/core'
 import axios from 'axios'
 import { get } from 'es-toolkit/compat'
 import { trimEnd } from 'es-toolkit'
+import { ref } from 'vue'
 
 import defaultClientFeatureFlags from '@/config/clientFeatureFlags.json' with { type: 'json' }
+import { getDevOverride } from '@/utils/devFeatureFlagOverride'
 import type {
   ModelFile,
   ModelFolderInfo
 } from '@/platform/assets/schemas/assetSchema'
 import { isCloud } from '@/platform/distribution/types'
 import { useToastStore } from '@/platform/updates/common/toastStore'
-import { type WorkflowTemplates } from '@/platform/workflow/templates/types/template'
+import type { ShareableAssetsResponse } from '@/schemas/apiSchema'
+import { zShareableAssetsResponse } from '@/schemas/apiSchema'
+import type { IFuseOptions } from 'fuse.js'
+import type {
+  TemplateIncludeOnDistributionEnum,
+  TemplateInfo,
+  WorkflowTemplates
+} from '@/platform/workflow/templates/types/template'
 import type {
   ComfyApiWorkflow,
   ComfyWorkflowJSON,
   NodeId
 } from '@/platform/workflow/validation/schemas/workflowSchema'
 import type {
+  AssetDownloadWsMessage,
+  AssetExportWsMessage,
+  CustomNodesI18n,
   EmbeddingsResponse,
   ExecutedWsMessage,
   ExecutingWsMessage,
@@ -27,29 +39,34 @@ import type {
   ExecutionSuccessWsMessage,
   ExtensionsResponse,
   FeatureFlagsWsMessage,
-  HistoryTaskItem,
   LogsRawResponse,
   LogsWsMessage,
   NotificationWsMessage,
-  PendingTaskItem,
+  PreviewMethod,
   ProgressStateWsMessage,
   ProgressTextWsMessage,
   ProgressWsMessage,
   PromptResponse,
-  RunningTaskItem,
   Settings,
   StatusWsMessage,
   StatusWsMessageStatus,
   SystemStats,
   User,
-  UserDataFullInfo,
-  PreviewMethod
+  UserDataFullInfo
 } from '@/schemas/apiSchema'
+import type {
+  JobDetail,
+  JobListItem
+} from '@/platform/remote/comfyui/jobs/jobTypes'
 import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'
 import type { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
 import type { AuthHeader } from '@/types/authTypes'
 import type { NodeExecutionId } from '@/types/nodeIdentification'
-import { fetchHistory } from '@/platform/remote/comfyui/history'
+import {
+  fetchHistory,
+  fetchJobDetail,
+  fetchQueue
+} from '@/platform/remote/comfyui/jobs/fetchJobs'
 
 interface QueuePromptRequestBody {
   client_id: string
@@ -120,12 +137,16 @@ interface QueuePromptOptions {
 /** Dictionary of Frontend-generated API calls */
 interface FrontendApiCalls {
   graphChanged: ComfyWorkflowJSON
-  promptQueued: { number: number; batchCount: number }
+  promptQueueing: { requestId: number; batchCount: number; number?: number }
+  promptQueued: { number: number; batchCount: number; requestId?: number }
   graphCleared: never
   reconnecting: never
   reconnected: never
 }
 
+export type PromptQueueingEventPayload = FrontendApiCalls['promptQueueing']
+export type PromptQueuedEventPayload = FrontendApiCalls['promptQueued']
+
 /** Dictionary of calls originating from ComfyUI core */
 interface BackendApiCalls {
   progress: ProgressWsMessage
@@ -141,18 +162,20 @@ interface BackendApiCalls {
   logs: LogsWsMessage
   /** Binary preview/progress data */
   b_preview: Blob
-  /** Binary preview with metadata (node_id, prompt_id) */
+  /** Binary preview with metadata (node_id, job_id) */
   b_preview_with_metadata: {
     blob: Blob
     nodeId: string
     parentNodeId: string
     displayNodeId: string
     realNodeId: string
-    promptId: string
+    jobId: string
   }
   progress_text: ProgressTextWsMessage
   progress_state: ProgressStateWsMessage
   feature_flags: FeatureFlagsWsMessage
+  asset_download: AssetDownloadWsMessage
+  asset_export: AssetExportWsMessage
 }
 
 /** Dictionary of all api calls */
@@ -219,8 +242,15 @@ type ComplexApiEvents = keyof NeverNever<ApiEventTypes>
 
 export type GlobalSubgraphData = {
   name: string
-  info: { node_pack: string }
+  info: {
+    node_pack: string
+    category?: string
+    search_aliases?: string[]
+    requiresCustomNodes?: string[]
+    includeOnDistributions?: TemplateIncludeOnDistributionEnum[]
+  }
   data: string | Promise<string>
+  essentials_category?: string
 }
 
 function addHeaderEntry(headers: HeadersInit, key: string, value: string) {
@@ -279,7 +309,7 @@ export class PromptExecutionError extends Error {
 }
 
 export class ComfyApi extends EventTarget {
-  #registered = new Set()
+  private _registered = new Set()
   api_host: string
   api_base: string
   /**
@@ -314,7 +344,7 @@ export class ComfyApi extends EventTarget {
   /**
    * Feature flags received from the backend server.
    */
-  serverFeatureFlags: Record<string, unknown> = {}
+  serverFeatureFlags = ref<Record<string, unknown>>({})
 
   /**
    * The auth token for the comfy org account if the user is logged in.
@@ -436,7 +466,7 @@ export class ComfyApi extends EventTarget {
   ) {
     // Type assertion: strictFunctionTypes.  So long as we emit events in a type-safe fashion, this is safe.
     super.addEventListener(type, callback as EventListener, options)
-    this.#registered.add(type)
+    this._registered.add(type)
   }
 
   override removeEventListener<TEvent extends keyof ApiEvents>(
@@ -447,6 +477,23 @@ export class ComfyApi extends EventTarget {
     super.removeEventListener(type, callback as EventListener, options)
   }
 
+  addCustomEventListener(
+    type: string,
+    callback: ((event: CustomEvent<unknown>) => void) | null,
+    options?: AddEventListenerOptions | boolean
+  ) {
+    super.addEventListener(type, callback as EventListener, options)
+    this._registered.add(type)
+  }
+
+  removeCustomEventListener(
+    type: string,
+    callback: ((event: CustomEvent<unknown>) => void) | null,
+    options?: EventListenerOptions | boolean
+  ) {
+    super.removeEventListener(type, callback as EventListener, options)
+  }
+
   /**
    * Dispatches a custom event.
    * Provides type safety for the contravariance issue with EventTarget (last checked TS 5.6).
@@ -477,7 +524,7 @@ export class ComfyApi extends EventTarget {
   /**
    * Poll status  for colab and other things that don't support websockets.
    */
-  #pollQueue() {
+  private _pollQueue() {
     setInterval(async () => {
       try {
         const resp = await this.fetchApi('/prompt')
@@ -509,10 +556,11 @@ export class ComfyApi extends EventTarget {
     }
 
     // Get auth token and set cloud params if available
+    // Uses workspace token (if enabled) or Firebase token
     if (isCloud) {
       try {
         const authStore = await this.getAuthStore()
-        const authToken = await authStore?.getIdToken()
+        const authToken = await authStore?.getAuthToken()
         if (authToken) {
           params.set('token', authToken)
         }
@@ -552,7 +600,7 @@ export class ComfyApi extends EventTarget {
     this.socket.addEventListener('error', () => {
       if (this.socket) this.socket.close()
       if (!isReconnect && !opened) {
-        this.#pollQueue()
+        this._pollQueue()
       }
     })
 
@@ -622,7 +670,7 @@ export class ComfyApi extends EventTarget {
                 displayNodeId: metadata.display_node_id,
                 parentNodeId: metadata.parent_node_id,
                 realNodeId: metadata.real_node_id,
-                promptId: metadata.prompt_id
+                jobId: metadata.prompt_id
               })
 
               // Also dispatch legacy b_preview for backward compatibility
@@ -668,14 +716,15 @@ export class ComfyApi extends EventTarget {
               break
             case 'feature_flags':
               // Store server feature flags
-              this.serverFeatureFlags = msg.data
+              this.serverFeatureFlags.value = msg.data
               console.log(
                 'Server feature flags received:',
-                this.serverFeatureFlags
+                this.serverFeatureFlags.value
               )
+              this.dispatchCustomEvent('feature_flags', msg.data)
               break
             default:
-              if (this.#registered.has(msg.type)) {
+              if (this._registered.has(msg.type)) {
                 // Fallback for custom types - calls super direct.
                 super.dispatchEvent(
                   new CustomEvent(msg.type, { detail: msg.data })
@@ -807,12 +856,49 @@ export class ComfyApi extends EventTarget {
     })
 
     if (res.status !== 200) {
-      throw new PromptExecutionError(await res.json())
+      const text = await res.text()
+      let errorResponse
+      try {
+        errorResponse = JSON.parse(text)
+      } catch {
+        errorResponse = {
+          error: {
+            type: 'server_error',
+            message: `${res.status} ${res.statusText}`,
+            details: text
+          }
+        }
+      }
+      throw new PromptExecutionError(errorResponse)
     }
 
     return await res.json()
   }
 
+  /**
+   * Gets the list of assets and models referenced by a prompt that would
+   * need user consent before sharing.
+   */
+  async getShareableAssets(
+    prompt: ComfyApiWorkflow,
+    options?: { owned?: boolean }
+  ): Promise<ShareableAssetsResponse> {
+    const body: Record<string, unknown> = { workflow_api_json: prompt }
+    if (options?.owned !== undefined) {
+      body.owned = options.owned
+    }
+    const res = await this.fetchApi('/assets/from-workflow', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(body)
+    })
+    if (res.status !== 200) {
+      throw new Error(`Failed to fetch shareable assets: ${res.status}`)
+    }
+    const data = await res.json()
+    return zShareableAssetsResponse.parse(data)
+  }
+
   /**
    * Gets a list of model folder keys (eg ['checkpoints', 'loras', ...])
    * @returns The list of model folder keys
@@ -886,53 +972,13 @@ export class ComfyApi extends EventTarget {
    * @returns The currently running and queued items
    */
   async getQueue(): Promise<{
-    Running: RunningTaskItem[]
-    Pending: PendingTaskItem[]
+    Running: JobListItem[]
+    Pending: JobListItem[]
   }> {
     try {
-      const res = await this.fetchApi('/queue')
-      const data = await res.json()
-      // Normalize queue tuple shape across backends:
-      // - Backend (V1): [idx, prompt_id, inputs, extra_data(object), outputs_to_execute(array)]
-      // - Cloud:        [idx, prompt_id, inputs, outputs_to_execute(array), metadata(object{create_time})]
-      const normalizeQueuePrompt = (prompt: any): any => {
-        if (!Array.isArray(prompt)) return prompt
-        // Ensure 5-tuple
-        const p = prompt.slice(0, 5)
-        const fourth = p[3]
-        const fifth = p[4]
-        // Cloud shape: 4th is array, 5th is metadata object
-        if (
-          Array.isArray(fourth) &&
-          fifth &&
-          typeof fifth === 'object' &&
-          !Array.isArray(fifth)
-        ) {
-          const meta: any = fifth
-          const extraData = { ...meta }
-          return [p[0], p[1], p[2], extraData, fourth]
-        }
-        // V1 shape already: return as-is
-        return p
-      }
-      return {
-        // Running action uses a different endpoint for cancelling
-        Running: data.queue_running.map((prompt: any) => {
-          const np = normalizeQueuePrompt(prompt)
-          return {
-            taskType: 'Running',
-            prompt: np,
-            // prompt[1] is the prompt id
-            remove: { name: 'Cancel', cb: () => api.interrupt(np[1]) }
-          }
-        }),
-        Pending: data.queue_pending.map((prompt: any) => ({
-          taskType: 'Pending',
-          prompt: normalizeQueuePrompt(prompt)
-        }))
-      }
+      return await fetchQueue(this.fetchApi.bind(this))
     } catch (error) {
-      console.error(error)
+      console.error('Failed to fetch queue:', error)
       return { Running: [], Pending: [] }
     }
   }
@@ -944,7 +990,7 @@ export class ComfyApi extends EventTarget {
   async getHistory(
     max_items: number = 200,
     options?: { offset?: number }
-  ): Promise<{ History: HistoryTaskItem[] }> {
+  ): Promise<JobListItem[]> {
     try {
       return await fetchHistory(
         this.fetchApi.bind(this),
@@ -953,10 +999,19 @@ export class ComfyApi extends EventTarget {
       )
     } catch (error) {
       console.error(error)
-      return { History: [] }
+      return []
     }
   }
 
+  /**
+   * Gets detailed job info including outputs and workflow
+   * @param jobId The job ID
+   * @returns Full job details or undefined if not found
+   */
+  async getJobDetail(jobId: string): Promise<JobDetail | undefined> {
+    return fetchJobDetail(this.fetchApi.bind(this), jobId)
+  }
+
   /**
    * Gets system & device stats
    * @returns System stats such as python version, OS, per device info
@@ -971,7 +1026,7 @@ export class ComfyApi extends EventTarget {
    * @param {*} type The endpoint to post to
    * @param {*} body Optional POST data
    */
-  async #postItem(type: string, body: any) {
+  private async _postItem(type: string, body?: Record<string, unknown>) {
     try {
       await this.fetchApi('/' + type, {
         method: 'POST',
@@ -991,7 +1046,7 @@ export class ComfyApi extends EventTarget {
    * @param {number} id The id of the item to delete
    */
   async deleteItem(type: string, id: string) {
-    await this.#postItem(type, { delete: [id] })
+    await this._postItem(type, { delete: [id] })
   }
 
   /**
@@ -999,18 +1054,18 @@ export class ComfyApi extends EventTarget {
    * @param {string} type The type of list to clear, queue or history
    */
   async clearItems(type: string) {
-    await this.#postItem(type, { clear: true })
+    await this._postItem(type, { clear: true })
   }
 
   /**
-   * Interrupts the execution of the running prompt. If runningPromptId is provided,
+   * Interrupts the execution of the running job. If runningJobId is provided,
    * it is included in the payload as a helpful hint to the backend.
-   * @param {string | null} [runningPromptId] Optional Running Prompt ID to interrupt
+   * @param {string | null} [runningJobId] Optional Running Job ID to interrupt
    */
-  async interrupt(runningPromptId: string | null) {
-    await this.#postItem(
+  async interrupt(runningJobId: string | null) {
+    await this._postItem(
       'interrupt',
-      runningPromptId ? { prompt_id: runningPromptId } : undefined
+      runningJobId ? { prompt_id: runningJobId } : undefined
     )
   }
 
@@ -1061,7 +1116,7 @@ export class ComfyApi extends EventTarget {
   /**
    * Stores a dictionary of settings for the current user
    */
-  async storeSettings(settings: Settings) {
+  async storeSettings(settings: Partial<Settings>) {
     return this.fetchApi(`/settings`, {
       method: 'POST',
       body: JSON.stringify(settings)
@@ -1094,7 +1149,7 @@ export class ComfyApi extends EventTarget {
    */
   async storeUserData(
     file: string,
-    data: any,
+    data: unknown,
     options: RequestInit & {
       overwrite?: boolean
       stringify?: boolean
@@ -1111,7 +1166,7 @@ export class ComfyApi extends EventTarget {
       `/userdata/${encodeURIComponent(file)}?overwrite=${options.overwrite}&full_info=${options.full_info}`,
       {
         method: 'POST',
-        body: options?.stringify ? JSON.stringify(data) : data,
+        body: options?.stringify ? JSON.stringify(data) : (data as BodyInit),
         ...options
       }
     )
@@ -1170,9 +1225,16 @@ export class ComfyApi extends EventTarget {
 
   async getGlobalSubgraphData(id: string): Promise<string> {
     const resp = await api.fetchApi('/global_subgraphs/' + id)
-    if (resp.status !== 200) return ''
+    if (resp.status !== 200) {
+      throw new Error(
+        `Failed to fetch global subgraph '${id}': ${resp.status} ${resp.statusText}`
+      )
+    }
     const subgraph: GlobalSubgraphData = await resp.json()
-    return subgraph?.data ?? ''
+    if (!subgraph?.data) {
+      throw new Error(`Global subgraph '${id}' returned empty data`)
+    }
+    return subgraph.data as string
   }
   async getGlobalSubgraphs(): Promise<Record<string, GlobalSubgraphData>> {
     const resp = await api.fetchApi('/global_subgraphs')
@@ -1271,7 +1333,7 @@ export class ComfyApi extends EventTarget {
    *
    * @returns The custom nodes i18n data
    */
-  async getCustomNodesI18n(): Promise<Record<string, any>> {
+  async getCustomNodesI18n(): Promise<CustomNodesI18n> {
     return (await axios.get(this.apiURL('/i18n'))).data
   }
 
@@ -1281,7 +1343,9 @@ export class ComfyApi extends EventTarget {
    * @returns true if the feature is supported, false otherwise
    */
   serverSupportsFeature(featureName: string): boolean {
-    return get(this.serverFeatureFlags, featureName) === true
+    const override = getDevOverride<boolean>(featureName)
+    if (override !== undefined) return override
+    return get(this.serverFeatureFlags.value, featureName) === true
   }
 
   /**
@@ -1291,7 +1355,9 @@ export class ComfyApi extends EventTarget {
    * @returns The feature value or default
    */
   getServerFeature<T = unknown>(featureName: string, defaultValue?: T): T {
-    return get(this.serverFeatureFlags, featureName, defaultValue) as T
+    const override = getDevOverride<T>(featureName)
+    if (override !== undefined) return override
+    return get(this.serverFeatureFlags.value, featureName, defaultValue) as T
   }
 
   /**
@@ -1299,7 +1365,25 @@ export class ComfyApi extends EventTarget {
    * @returns Copy of all server feature flags
    */
   getServerFeatures(): Record<string, unknown> {
-    return { ...this.serverFeatureFlags }
+    return { ...this.serverFeatureFlags.value }
+  }
+
+  async getFuseOptions(): Promise<IFuseOptions<TemplateInfo> | null> {
+    try {
+      const res = await axios.get(
+        this.fileURL('/templates/fuse_options.json'),
+        {
+          headers: {
+            'Content-Type': 'application/json'
+          }
+        }
+      )
+      const contentType = res.headers['content-type']
+      return contentType?.includes('application/json') ? res.data : null
+    } catch (error) {
+      console.error('Error loading fuse options:', error)
+      return null
+    }
   }
 }
 
diff --git a/src/scripts/app.getNodeDefs.test.ts b/src/scripts/app.getNodeDefs.test.ts
new file mode 100644
index 0000000000..ed89b3a519
--- /dev/null
+++ b/src/scripts/app.getNodeDefs.test.ts
@@ -0,0 +1,92 @@
+import { beforeEach, describe, expect, test, vi } from 'vitest'
+
+import { st } from '@/i18n'
+import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema'
+import { api } from '@/scripts/api'
+import { app as comfyApp } from '@/scripts/app'
+
+vi.mock('@/scripts/api', () => ({
+  api: {
+    getNodeDefs: vi.fn(),
+    apiURL: vi.fn((path: string) => path),
+    addEventListener: vi.fn(),
+    getUserData: vi.fn(),
+    storeUserData: vi.fn()
+  }
+}))
+
+vi.mock('@/i18n', () => ({
+  st: vi.fn((_key: string, fallback: string) => fallback),
+  t: vi.fn((key: string) => key),
+  te: vi.fn(() => false)
+}))
+
+describe('ComfyApp.getNodeDefs', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  test('should use object info display_name when available', async () => {
+    const mockNodeDefs: Record<string, ComfyNodeDefV1> = {
+      TestNode: {
+        name: 'TestNode',
+        display_name: 'Custom Display Name',
+        category: 'test',
+        description: 'Test description',
+        input: {},
+        output: [],
+        output_node: false,
+        python_module: 'test.module'
+      }
+    }
+
+    vi.mocked(api.getNodeDefs).mockResolvedValue(mockNodeDefs)
+
+    const result = await comfyApp.getNodeDefs()
+
+    expect(result.TestNode.display_name).toBe('Custom Display Name')
+  })
+
+  test('should fall back to name when display_name is missing', async () => {
+    const mockNodeDefs: Record<string, ComfyNodeDefV1> = {
+      TestNode: {
+        name: 'TestNode',
+        display_name: '',
+        category: 'test',
+        description: 'Test description',
+        input: {},
+        output: [],
+        output_node: false,
+        python_module: 'test.module'
+      }
+    }
+
+    vi.mocked(api.getNodeDefs).mockResolvedValue(mockNodeDefs)
+
+    const result = await comfyApp.getNodeDefs()
+
+    expect(result.TestNode.display_name).toBe('TestNode')
+  })
+
+  test('should prioritize translation over object info display_name', async () => {
+    const mockNodeDefs: Record<string, ComfyNodeDefV1> = {
+      TestNode: {
+        name: 'TestNode',
+        display_name: 'Object Info Display Name',
+        category: 'test',
+        description: 'Test description',
+        input: {},
+        output: [],
+        output_node: false,
+        python_module: 'test.module'
+      }
+    }
+
+    vi.mocked(api.getNodeDefs).mockResolvedValue(mockNodeDefs)
+    vi.mocked(st).mockReturnValue('Translated Display Name')
+
+    const result = await comfyApp.getNodeDefs()
+
+    expect(result.TestNode.display_name).toBe('Translated Display Name')
+  })
+})
diff --git a/src/scripts/app.test.ts b/src/scripts/app.test.ts
new file mode 100644
index 0000000000..8929407ecb
--- /dev/null
+++ b/src/scripts/app.test.ts
@@ -0,0 +1,315 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type {
+  LGraph,
+  LGraphCanvas,
+  LGraphNode
+} from '@/lib/litegraph/src/litegraph'
+import { ComfyApp } from './app'
+import { createNode } from '@/utils/litegraphUtil'
+import {
+  pasteAudioNode,
+  pasteAudioNodes,
+  pasteImageNode,
+  pasteImageNodes,
+  pasteVideoNode,
+  pasteVideoNodes
+} from '@/composables/usePaste'
+import { getWorkflowDataFromFile } from '@/scripts/metadata/parser'
+
+vi.mock('@/utils/litegraphUtil', () => ({
+  createNode: vi.fn(),
+  isImageNode: vi.fn(),
+  isVideoNode: vi.fn(),
+  isAudioNode: vi.fn(),
+  executeWidgetsCallback: vi.fn(),
+  fixLinkInputSlots: vi.fn()
+}))
+
+vi.mock('@/composables/usePaste', () => ({
+  pasteAudioNode: vi.fn(),
+  pasteAudioNodes: vi.fn(),
+  pasteImageNode: vi.fn(),
+  pasteImageNodes: vi.fn(),
+  pasteVideoNode: vi.fn(),
+  pasteVideoNodes: vi.fn()
+}))
+
+vi.mock('@/scripts/metadata/parser', () => ({
+  getWorkflowDataFromFile: vi.fn()
+}))
+
+vi.mock('@/platform/updates/common/toastStore', () => ({
+  useToastStore: vi.fn(() => ({
+    addAlert: vi.fn(),
+    add: vi.fn(),
+    remove: vi.fn()
+  }))
+}))
+
+function createMockNode(options: { [K in keyof LGraphNode]?: any } = {}) {
+  return {
+    id: 1,
+    pos: [0, 0],
+    size: [200, 100],
+    type: 'LoadImage',
+    connect: vi.fn(),
+    getBounding: vi.fn(() => new Float64Array([0, 0, 200, 100])),
+    ...options
+  } as LGraphNode
+}
+
+function createMockCanvas(): Partial<LGraphCanvas> {
+  const mockGraph: Partial<LGraph> = {
+    change: vi.fn()
+  }
+
+  return {
+    graph: mockGraph as LGraph,
+    selectItems: vi.fn()
+  }
+}
+
+function createTestFile(name: string, type: string): File {
+  return new File([''], name, { type })
+}
+
+describe('ComfyApp', () => {
+  let app: ComfyApp
+  let mockCanvas: LGraphCanvas
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    app = new ComfyApp()
+    mockCanvas = createMockCanvas() as LGraphCanvas
+    app.canvas = mockCanvas as LGraphCanvas
+  })
+
+  describe('handleFileList', () => {
+    it('should create image nodes for each file in the list', async () => {
+      const mockNode1 = createMockNode({ id: 1 })
+      const mockNode2 = createMockNode({ id: 2 })
+      const mockBatchNode = createMockNode({ id: 3, type: 'BatchImagesNode' })
+
+      vi.mocked(pasteImageNodes).mockResolvedValue([mockNode1, mockNode2])
+      vi.mocked(createNode).mockResolvedValue(mockBatchNode)
+
+      const file1 = createTestFile('test1.png', 'image/png')
+      const file2 = createTestFile('test2.jpg', 'image/jpeg')
+      const files = [file1, file2]
+
+      await app.handleFileList(files)
+
+      expect(pasteImageNodes).toHaveBeenCalledWith(mockCanvas, files)
+      expect(createNode).toHaveBeenCalledWith(mockCanvas, 'BatchImagesNode')
+      expect(mockCanvas.selectItems).toHaveBeenCalledWith([
+        mockNode1,
+        mockNode2,
+        mockBatchNode
+      ])
+      expect(mockNode1.connect).toHaveBeenCalledWith(0, mockBatchNode, 0)
+      expect(mockNode2.connect).toHaveBeenCalledWith(0, mockBatchNode, 1)
+    })
+
+    it('should select single image node without batch node', async () => {
+      const mockNode1 = createMockNode({ id: 1 })
+      vi.mocked(pasteImageNodes).mockResolvedValue([mockNode1])
+
+      const file = createTestFile('test.png', 'image/png')
+
+      await app.handleFileList([file])
+
+      expect(createNode).not.toHaveBeenCalled()
+      expect(mockCanvas.selectItems).toHaveBeenCalledWith([mockNode1])
+      expect(mockNode1.connect).not.toHaveBeenCalled()
+    })
+
+    it('should handle empty file list', async () => {
+      await app.handleFileList([])
+
+      expect(pasteImageNodes).not.toHaveBeenCalled()
+      expect(createNode).not.toHaveBeenCalled()
+    })
+
+    it('should not process unsupported file types', async () => {
+      const invalidFile = createTestFile('test.pdf', 'application/pdf')
+
+      await app.handleFileList([invalidFile])
+
+      expect(pasteImageNodes).not.toHaveBeenCalled()
+      expect(createNode).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('handleAudioFileList', () => {
+    it('should create audio nodes and select them', async () => {
+      const mockNode1 = createMockNode({ id: 1, type: 'LoadAudio' })
+      const mockNode2 = createMockNode({ id: 2, type: 'LoadAudio' })
+      vi.mocked(pasteAudioNodes).mockResolvedValue([mockNode1, mockNode2])
+
+      const file1 = createTestFile('test1.mp3', 'audio/mpeg')
+      const file2 = createTestFile('test2.wav', 'audio/wav')
+
+      await app.handleAudioFileList([file1, file2])
+
+      expect(pasteAudioNodes).toHaveBeenCalledWith(mockCanvas, [file1, file2])
+      expect(mockCanvas.selectItems).toHaveBeenCalledWith([
+        mockNode1,
+        mockNode2
+      ])
+    })
+
+    it('should not select when no nodes created', async () => {
+      vi.mocked(pasteAudioNodes).mockResolvedValue([])
+
+      await app.handleAudioFileList([createTestFile('test.mp3', 'audio/mpeg')])
+
+      expect(mockCanvas.selectItems).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('handleVideoFileList', () => {
+    it('should create video nodes and select them', async () => {
+      const mockNode1 = createMockNode({ id: 1, type: 'LoadVideo' })
+      const mockNode2 = createMockNode({ id: 2, type: 'LoadVideo' })
+      vi.mocked(pasteVideoNodes).mockResolvedValue([mockNode1, mockNode2])
+
+      const file1 = createTestFile('test1.mp4', 'video/mp4')
+      const file2 = createTestFile('test2.webm', 'video/webm')
+
+      await app.handleVideoFileList([file1, file2])
+
+      expect(pasteVideoNodes).toHaveBeenCalledWith(mockCanvas, [file1, file2])
+      expect(mockCanvas.selectItems).toHaveBeenCalledWith([
+        mockNode1,
+        mockNode2
+      ])
+    })
+
+    it('should not select when no nodes created', async () => {
+      vi.mocked(pasteVideoNodes).mockResolvedValue([])
+
+      await app.handleVideoFileList([createTestFile('test.mp4', 'video/mp4')])
+
+      expect(mockCanvas.selectItems).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('positionBatchNodes', () => {
+    it('should position batch node to the right of first node', () => {
+      const mockNode1 = createMockNode({
+        pos: [100, 200],
+        getBounding: vi.fn(() => new Float64Array([100, 200, 300, 400]))
+      })
+      const mockBatchNode = createMockNode({ pos: [0, 0] })
+
+      app.positionBatchNodes([mockNode1], mockBatchNode)
+
+      expect(mockBatchNode.pos).toEqual([500, 230])
+    })
+
+    it('should stack multiple image nodes vertically', () => {
+      const mockNode1 = createMockNode({
+        pos: [100, 200],
+        type: 'LoadImage',
+        getBounding: vi.fn(() => new Float64Array([100, 200, 300, 400]))
+      })
+      const mockNode2 = createMockNode({ pos: [0, 0], type: 'LoadImage' })
+      const mockNode3 = createMockNode({ pos: [0, 0], type: 'LoadImage' })
+      const mockBatchNode = createMockNode({ pos: [0, 0] })
+
+      app.positionBatchNodes([mockNode1, mockNode2, mockNode3], mockBatchNode)
+
+      expect(mockNode1.pos).toEqual([100, 200])
+      expect(mockNode2.pos).toEqual([100, 594])
+      expect(mockNode3.pos).toEqual([100, 963])
+    })
+
+    it('should call graph change once for all nodes', () => {
+      const mockNode1 = createMockNode({
+        getBounding: vi.fn(() => new Float64Array([100, 200, 300, 400]))
+      })
+      const mockBatchNode = createMockNode()
+
+      app.positionBatchNodes([mockNode1], mockBatchNode)
+
+      expect(mockCanvas.graph?.change).toHaveBeenCalledTimes(1)
+    })
+  })
+
+  describe('handleFile', () => {
+    it('should handle image files by creating LoadImage node', async () => {
+      vi.mocked(getWorkflowDataFromFile).mockResolvedValue({})
+
+      const mockNode = createMockNode()
+      vi.mocked(createNode).mockResolvedValue(mockNode)
+
+      const imageFile = createTestFile('test.png', 'image/png')
+
+      await app.handleFile(imageFile)
+
+      expect(createNode).toHaveBeenCalledWith(mockCanvas, 'LoadImage')
+      expect(pasteImageNode).toHaveBeenCalledWith(
+        mockCanvas,
+        expect.any(DataTransferItemList),
+        mockNode
+      )
+    })
+
+    it('should handle audio files by creating LoadAudio node', async () => {
+      vi.mocked(getWorkflowDataFromFile).mockResolvedValue({})
+
+      const mockNode = createMockNode({ type: 'LoadAudio' })
+      vi.mocked(createNode).mockResolvedValue(mockNode)
+
+      const audioFile = createTestFile('test.mp3', 'audio/mpeg')
+
+      await app.handleFile(audioFile)
+
+      expect(createNode).toHaveBeenCalledWith(mockCanvas, 'LoadAudio')
+      expect(pasteAudioNode).toHaveBeenCalledWith(
+        mockCanvas,
+        expect.any(DataTransferItemList),
+        mockNode
+      )
+    })
+
+    it('should handle video files by creating LoadVideo node', async () => {
+      vi.mocked(getWorkflowDataFromFile).mockResolvedValue({})
+
+      const mockNode = createMockNode({ type: 'LoadVideo' })
+      vi.mocked(createNode).mockResolvedValue(mockNode)
+
+      const videoFile = createTestFile('test.mp4', 'video/mp4')
+
+      await app.handleFile(videoFile)
+
+      expect(createNode).toHaveBeenCalledWith(mockCanvas, 'LoadVideo')
+      expect(pasteVideoNode).toHaveBeenCalledWith(
+        mockCanvas,
+        expect.any(DataTransferItemList),
+        mockNode
+      )
+    })
+
+    it('should handle image files with non-workflow metadata by creating LoadImage node', async () => {
+      vi.mocked(getWorkflowDataFromFile).mockResolvedValue({
+        Software: 'gnome-screenshot'
+      })
+
+      const mockNode = createMockNode()
+      vi.mocked(createNode).mockResolvedValue(mockNode)
+
+      const imageFile = createTestFile('screenshot.png', 'image/png')
+
+      await app.handleFile(imageFile)
+
+      expect(createNode).toHaveBeenCalledWith(mockCanvas, 'LoadImage')
+      expect(pasteImageNode).toHaveBeenCalledWith(
+        mockCanvas,
+        expect.any(DataTransferItemList),
+        mockNode
+      )
+    })
+  })
+})
diff --git a/src/scripts/app.ts b/src/scripts/app.ts
index cd75be7f76..95eda43a4d 100644
--- a/src/scripts/app.ts
+++ b/src/scripts/app.ts
@@ -5,7 +5,9 @@ import { reactive, unref } from 'vue'
 import { shallowRef } from 'vue'
 
 import { useCanvasPositionConversion } from '@/composables/element/useCanvasPositionConversion'
-import { registerProxyWidgets } from '@/core/graph/subgraph/proxyWidget'
+import { layoutStore } from '@/renderer/core/layout/store/layoutStore'
+import { flushScheduledSlotLayoutSync } from '@/renderer/extensions/vueNodes/composables/useSlotElementTracking'
+
 import { st, t } from '@/i18n'
 import type { IContextMenuValue } from '@/lib/litegraph/src/interfaces'
 import {
@@ -22,18 +24,23 @@ import { useTelemetry } from '@/platform/telemetry'
 import type { WorkflowOpenSource } from '@/platform/telemetry/types'
 import { useToastStore } from '@/platform/updates/common/toastStore'
 import { useWorkflowService } from '@/platform/workflow/core/services/workflowService'
+import type { PendingWarnings } from '@/platform/workflow/management/stores/comfyWorkflow'
 import { ComfyWorkflow } from '@/platform/workflow/management/stores/workflowStore'
 import { useWorkflowValidation } from '@/platform/workflow/validation/composables/useWorkflowValidation'
+import type {
+  ComfyApiWorkflow,
+  ComfyWorkflowJSON,
+  ModelFile,
+  NodeId
+} from '@/platform/workflow/validation/schemas/workflowSchema'
 import {
-  type ComfyApiWorkflow,
-  type ComfyWorkflowJSON,
-  type ModelFile,
-  type NodeId,
-  isSubgraphDefinition
+  isSubgraphDefinition,
+  buildSubgraphExecutionPaths
 } from '@/platform/workflow/validation/schemas/workflowSchema'
 import type {
   ExecutionErrorWsMessage,
   NodeError,
+  NodeExecutionOutput,
   ResultItem
 } from '@/schemas/apiSchema'
 import {
@@ -47,7 +54,7 @@ import {
   DOMWidgetImpl
 } from '@/scripts/domWidget'
 import { useDialogService } from '@/services/dialogService'
-import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
+import { useMissingNodesDialog } from '@/composables/useMissingNodesDialog'
 import { useExtensionService } from '@/services/extensionService'
 import { useLitegraphService } from '@/services/litegraphService'
 import { useSubgraphService } from '@/services/subgraphService'
@@ -55,30 +62,43 @@ import { useApiKeyAuthStore } from '@/stores/apiKeyAuthStore'
 import { useCommandStore } from '@/stores/commandStore'
 import { useDomWidgetStore } from '@/stores/domWidgetStore'
 import { useExecutionStore } from '@/stores/executionStore'
+import { useExecutionErrorStore } from '@/stores/executionErrorStore'
 import { useExtensionStore } from '@/stores/extensionStore'
 import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
-import { useNodeOutputStore } from '@/stores/imagePreviewStore'
-import { KeyComboImpl, useKeybindingStore } from '@/stores/keybindingStore'
+import { useNodeOutputStore } from '@/stores/nodeOutputStore'
+import { useJobPreviewStore } from '@/stores/jobPreviewStore'
+import { KeyComboImpl } from '@/platform/keybindings/keyCombo'
+import { useKeybindingStore } from '@/platform/keybindings/keybindingStore'
 import { useModelStore } from '@/stores/modelStore'
 import { SYSTEM_NODE_DEFS, useNodeDefStore } from '@/stores/nodeDefStore'
+import { useNodeReplacementStore } from '@/platform/nodeReplacement/nodeReplacementStore'
 import { useSubgraphStore } from '@/stores/subgraphStore'
 import { useWidgetStore } from '@/stores/widgetStore'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
 import type { ComfyExtension, MissingNodeType } from '@/types/comfy'
-import { type ExtensionManager } from '@/types/extensionTypes'
+import type { ExtensionManager } from '@/types/extensionTypes'
 import type { NodeExecutionId } from '@/types/nodeIdentification'
 import { graphToPrompt } from '@/utils/executionUtil'
+import { getCnrIdFromProperties } from '@/workbench/extensions/manager/utils/missingNodeErrorUtil'
+import { rescanAndSurfaceMissingNodes } from '@/platform/nodeReplacement/missingNodeScan'
 import { anyItemOverlapsRect } from '@/utils/mathUtil'
-import { collectAllNodes, forEachNode } from '@/utils/graphTraversalUtil'
 import {
+  collectAllNodes,
+  forEachNode,
   getNodeByExecutionId,
   triggerCallbackOnAllNodes
 } from '@/utils/graphTraversalUtil'
 import {
   executeWidgetsCallback,
+  createNode,
   fixLinkInputSlots,
-  isImageNode
+  isImageNode,
+  isVideoNode
 } from '@/utils/litegraphUtil'
+import {
+  createSharedObjectUrl,
+  releaseSharedObjectUrl
+} from '@/utils/objectUrlUtil'
 import {
   findLegacyRerouteNodes,
   noNativeReroutes
@@ -94,12 +114,26 @@ import { ComfyAppMenu } from './ui/menu/index'
 import { clone } from './utils'
 import { type ComfyWidgetConstructor } from './widgets'
 import { ensureCorrectLayoutScale } from '@/renderer/extensions/vueNodes/layout/ensureCorrectLayoutScale'
-import { extractFileFromDragEvent } from '@/utils/eventUtils'
+import {
+  extractFilesFromDragEvent,
+  hasAudioType,
+  hasImageType,
+  hasVideoType,
+  isMediaFile
+} from '@/utils/eventUtils'
 import { getWorkflowDataFromFile } from '@/scripts/metadata/parser'
+import {
+  pasteAudioNode,
+  pasteAudioNodes,
+  pasteImageNode,
+  pasteImageNodes,
+  pasteVideoNode,
+  pasteVideoNodes
+} from '@/composables/usePaste'
 
 export const ANIM_PREVIEW_WIDGET = '$$comfy_animation_preview'
 
-function sanitizeNodeName(string: string) {
+export function sanitizeNodeName(string: string) {
   let entityMap = {
     '&': '',
     '<': '',
@@ -118,7 +152,7 @@ type Clipspace = {
   widgets?: Pick<IBaseWidget, 'type' | 'name' | 'value'>[] | null
   imgs?: HTMLImageElement[] | null
   original_imgs?: HTMLImageElement[] | null
-  images?: any[] | null
+  images?: ResultItem[] | null
   selectedIndex: number
   img_paste_mode: string
   paintedIndex: number
@@ -132,8 +166,10 @@ export class ComfyApp {
   private queueItems: {
     number: number
     batchCount: number
+    requestId: number
     queueNodeIds?: NodeExecutionId[]
   }[] = []
+  private nextQueueRequestId = 1
   /**
    * If the queue is currently being processed
    */
@@ -152,17 +188,15 @@ export class ComfyApp {
   vueAppReady: boolean
   api: ComfyApi
   ui: ComfyUI
-  // @ts-expect-error fixme ts strict error
-  extensionManager: ExtensionManager
-  // @ts-expect-error fixme ts strict error
-  _nodeOutputs: Record<string, any>
+  extensionManager!: ExtensionManager
+  private _nodeOutputs!: Record<string, NodeExecutionOutput>
   nodePreviewImages: Record<string, string[]>
 
   private rootGraphInternal: LGraph | undefined
 
   // TODO: Migrate internal usage to the
   /** @deprecated Use {@link rootGraph} instead */
-  get graph(): unknown {
+  get graph() {
     return this.rootGraphInternal!
   }
 
@@ -173,8 +207,7 @@ export class ComfyApp {
     return this.rootGraphInternal!
   }
 
-  // @ts-expect-error fixme ts strict error
-  canvas: LGraphCanvas
+  canvas!: LGraphCanvas
   dragOverNode: LGraphNode | null = null
   readonly canvasElRef = shallowRef<HTMLCanvasElement>()
   get canvasEl() {
@@ -186,8 +219,7 @@ export class ComfyApp {
   get configuringGraph() {
     return this.configuringGraphLevel > 0
   }
-  // @ts-expect-error fixme ts strict error
-  ctx: CanvasRenderingContext2D
+  ctx!: CanvasRenderingContext2D
   bodyTop: HTMLElement
   bodyLeft: HTMLElement
   bodyRight: HTMLElement
@@ -204,18 +236,18 @@ export class ComfyApp {
 
   /**
    * The node errors from the previous execution.
-   * @deprecated Use useExecutionStore().lastNodeErrors instead
+   * @deprecated Use app.extensionManager.lastNodeErrors instead
    */
   get lastNodeErrors(): Record<NodeId, NodeError> | null {
-    return useExecutionStore().lastNodeErrors
+    return useExecutionErrorStore().lastNodeErrors
   }
 
   /**
    * The error from the previous execution.
-   * @deprecated Use useExecutionStore().lastExecutionError instead
+   * @deprecated Use app.extensionManager.lastExecutionError instead
    */
   get lastExecutionError(): ExecutionErrorWsMessage | null {
-    return useExecutionStore().lastExecutionError
+    return useExecutionErrorStore().lastExecutionError
   }
 
   /**
@@ -490,18 +522,17 @@ export class ComfyApp {
             }
           }
         }
-        if (ComfyApp.clipspace.widgets) {
+        if (ComfyApp.clipspace.widgets && node.widgets) {
           ComfyApp.clipspace.widgets.forEach(({ type, name, value }) => {
-            // @ts-expect-error fixme ts strict error
-            const prop = Object.values(node.widgets).find(
+            const prop = node.widgets?.find(
               (obj) => obj.type === type && obj.name === name
             )
             if (prop && prop.type != 'button') {
+              const valueObj = value as Record<string, unknown> | undefined
               if (
                 prop.type != 'image' &&
                 typeof prop.value == 'string' &&
-                // @ts-expect-error Custom widget value
-                value.filename
+                valueObj?.filename
               ) {
                 const resultItem = value as ResultItem
                 prop.value =
@@ -539,16 +570,45 @@ export class ComfyApp {
         // If you drag multiple files it will call it multiple times with the same file
         if (await n?.onDragDrop?.(event)) return
 
-        const fileMaybe = await extractFileFromDragEvent(event)
-        if (!fileMaybe) return
+        const files = await extractFilesFromDragEvent(event)
+        if (files.length === 0) return
 
         const workspace = useWorkspaceStore()
         try {
           workspace.spinner = true
-          await this.handleFile(fileMaybe, 'file_drop')
+          const imageFiles = files.filter(hasImageType)
+          const audioFiles = files.filter(hasAudioType)
+          const videoFiles = files.filter(hasVideoType)
+          const totalMedia =
+            imageFiles.length + audioFiles.length + videoFiles.length
+          const hasMultipleMedia = totalMedia > 1
+
+          if (hasMultipleMedia) {
+            if (imageFiles.length > 0) {
+              await this.handleFileList(imageFiles)
+            }
+            if (audioFiles.length > 0) {
+              await this.handleAudioFileList(audioFiles)
+            }
+            if (videoFiles.length > 0) {
+              await this.handleVideoFileList(videoFiles)
+            }
+            for (const file of files.filter((f) => !isMediaFile(f))) {
+              await this.handleFile(file, 'file_drop', {
+                deferWarnings: true
+              })
+            }
+          } else {
+            for (const file of files) {
+              await this.handleFile(file, 'file_drop', {
+                deferWarnings: true
+              })
+            }
+          }
         } finally {
           workspace.spinner = false
         }
+        useWorkflowService().showPendingWarnings()
       } catch (error: unknown) {
         useToastStore().addAlert(t('toastMessages.dropFileError', { error }))
       }
@@ -616,20 +676,6 @@ export class ComfyApp {
           e.stopImmediatePropagation()
           return
         }
-
-        // Ctrl+C Copy
-        if (e.key === 'c' && (e.metaKey || e.ctrlKey)) {
-          return
-        }
-
-        // Ctrl+V Paste
-        if (
-          (e.key === 'v' || e.key == 'V') &&
-          (e.metaKey || e.ctrlKey) &&
-          !e.shiftKey
-        ) {
-          return
-        }
       }
 
       // Fall through to Litegraph defaults
@@ -684,12 +730,11 @@ export class ComfyApp {
           'Payment Required: Please add credits to your account to use this node.'
         )
       ) {
-        const { isActiveSubscription } = useSubscription()
-        if (isActiveSubscription.value) {
-          useDialogService().showTopUpCreditsDialog({
-            isInsufficientCredits: true
-          })
-        }
+        useDialogService().showTopUpCreditsDialog({
+          isInsufficientCredits: true
+        })
+      } else if (useSettingStore().get('Comfy.RightSidePanel.ShowErrorsTab')) {
+        useExecutionErrorStore().showErrorOverlay()
       } else {
         useDialogService().showExecutionErrorDialog(detail)
       }
@@ -698,12 +743,13 @@ export class ComfyApp {
 
     api.addEventListener('b_preview_with_metadata', ({ detail }) => {
       // Enhanced preview with explicit node context
-      const { blob, displayNodeId } = detail
+      const { blob, displayNodeId, jobId } = detail
       const { setNodePreviewsByExecutionId, revokePreviewsByExecutionId } =
         useNodeOutputStore()
+      const blobUrl = createSharedObjectUrl(blob)
+      useJobPreviewStore().setPreviewUrl(jobId, blobUrl, displayNodeId)
       // Ensure clean up if `executing` event is missed.
       revokePreviewsByExecutionId(displayNodeId)
-      const blobUrl = URL.createObjectURL(blob)
       // Preview cleanup is handled in progress_state event to support multiple concurrent previews
       const nodeParents = displayNodeId.split(':')
       for (let i = 1; i <= nodeParents.length; i++) {
@@ -711,6 +757,11 @@ export class ComfyApp {
           blobUrl
         ])
       }
+      releaseSharedObjectUrl(blobUrl)
+    })
+
+    api.addEventListener('feature_flags', () => {
+      void useNodeReplacementStore().load()
     })
 
     api.init()
@@ -733,17 +784,31 @@ export class ComfyApp {
   private addAfterConfigureHandler(graph: LGraph) {
     const { onConfigure } = graph
     graph.onConfigure = function (...args) {
-      fixLinkInputSlots(this)
+      // Set pending sync flag to suppress link rendering until slots are synced
+      if (LiteGraph.vueNodesMode) {
+        layoutStore.setPendingSlotSync(true)
+      }
 
-      // Fire callbacks before the onConfigure, this is used by widget inputs to setup the config
-      triggerCallbackOnAllNodes(this, 'onGraphConfigured')
+      try {
+        fixLinkInputSlots(this)
 
-      const r = onConfigure?.apply(this, args)
+        // Fire callbacks before the onConfigure, this is used by widget inputs to setup the config
+        triggerCallbackOnAllNodes(this, 'onGraphConfigured')
 
-      // Fire after onConfigure, used by primitives to generate widget using input nodes config
-      triggerCallbackOnAllNodes(this, 'onAfterGraphConfigured')
+        const r = onConfigure?.apply(this, args)
 
-      return r
+        // Fire after onConfigure, used by primitives to generate widget using input nodes config
+        triggerCallbackOnAllNodes(this, 'onAfterGraphConfigured')
+
+        return r
+      } finally {
+        // Flush pending slot layout syncs to fix link alignment after undo/redo
+        // Using finally ensures links aren't permanently suppressed if an error occurs
+        if (LiteGraph.vueNodesMode) {
+          flushScheduledSlotLayoutSync()
+          app.canvas?.setDirty(true, true)
+        }
+      }
     }
   }
 
@@ -751,16 +816,11 @@ export class ComfyApp {
    * Set up the app on the page
    */
   async setup(canvasEl: HTMLCanvasElement) {
-    // @ts-expect-error fixme ts strict error
-    this.bodyTop = document.getElementById('comfyui-body-top')
-    // @ts-expect-error fixme ts strict error
-    this.bodyLeft = document.getElementById('comfyui-body-left')
-    // @ts-expect-error fixme ts strict error
-    this.bodyRight = document.getElementById('comfyui-body-right')
-    // @ts-expect-error fixme ts strict error
-    this.bodyBottom = document.getElementById('comfyui-body-bottom')
-    // @ts-expect-error fixme ts strict error
-    this.canvasContainer = document.getElementById('graph-canvas-container')
+    this.bodyTop = document.getElementById('comfyui-body-top')!
+    this.bodyLeft = document.getElementById('comfyui-body-left')!
+    this.bodyRight = document.getElementById('comfyui-body-right')!
+    this.bodyBottom = document.getElementById('comfyui-body-bottom')!
+    this.canvasContainer = document.getElementById('graph-canvas-container')!
 
     this.canvasElRef.value = canvasEl
 
@@ -797,8 +857,7 @@ export class ComfyApp {
     // Make canvas states reactive so we can observe changes on them.
     this.canvas.state = reactive(this.canvas.state)
 
-    // @ts-expect-error fixme ts strict error
-    this.ctx = canvasEl.getContext('2d')
+    this.ctx = canvasEl.getContext('2d')!
 
     LiteGraph.alt_drag_do_clone_nodes = true
     LiteGraph.macGesturesRequireMac = false
@@ -853,8 +912,6 @@ export class ComfyApp {
       }
     )
 
-    registerProxyWidgets(this.canvas)
-
     this.rootGraph.start()
 
     // Ensure the canvas fills the window
@@ -886,8 +943,7 @@ export class ComfyApp {
     const { width, height } = canvas.getBoundingClientRect()
     canvas.width = Math.round(width * scale)
     canvas.height = Math.round(height * scale)
-    // @ts-expect-error fixme ts strict error
-    canvas.getContext('2d').scale(scale, scale)
+    canvas.getContext('2d')?.scale(scale, scale)
     this.canvas?.draw(true, true)
   }
 
@@ -929,27 +985,31 @@ export class ComfyApp {
     const nodeDefArray: ComfyNodeDefV1[] = Object.values(allNodeDefs)
     useExtensionService().invokeExtensions(
       'beforeRegisterVueAppNodeDefs',
-      nodeDefArray,
-      this
+      nodeDefArray
     )
     nodeDefStore.updateNodeDefs(nodeDefArray)
   }
 
   async getNodeDefs(): Promise<Record<string, ComfyNodeDefV1>> {
-    const translateNodeDef = (def: ComfyNodeDefV1): ComfyNodeDefV1 => ({
-      ...def,
-      display_name: st(
-        `nodeDefs.${def.name}.display_name`,
-        def.display_name ?? def.name
-      ),
-      description: def.description
-        ? st(`nodeDefs.${def.name}.description`, def.description)
-        : '',
-      category: def.category
-        .split('/')
-        .map((category: string) => st(`nodeCategories.${category}`, category))
-        .join('/')
-    })
+    const translateNodeDef = (def: ComfyNodeDefV1): ComfyNodeDefV1 => {
+      // Use object info display_name as fallback before using name
+      const objectInfoDisplayName = def.display_name || def.name
+
+      return {
+        ...def,
+        display_name: st(
+          `nodeDefs.${def.name}.display_name`,
+          objectInfoDisplayName
+        ),
+        description: def.description
+          ? st(`nodeDefs.${def.name}.description`, def.description)
+          : '',
+        category: def.category
+          .split('/')
+          .map((category: string) => st(`nodeCategories.${category}`, category))
+          .join('/')
+      }
+    }
 
     return _.mapValues(await api.getNodeDefs(), (def) => translateNodeDef(def))
   }
@@ -975,21 +1035,22 @@ export class ComfyApp {
     await useExtensionService().invokeExtensionsAsync('addCustomNodeDefs', defs)
 
     // Register a node for each definition
-    for (const nodeId in defs) {
-      this.registerNodeDef(nodeId, defs[nodeId])
-    }
+    await Promise.all(
+      Object.keys(defs).map((nodeId) =>
+        this.registerNodeDef(nodeId, defs[nodeId])
+      )
+    )
   }
 
-  // @ts-expect-error fixme ts strict error
-  loadTemplateData(templateData) {
+  loadTemplateData(templateData: {
+    templates?: { name?: string; data?: string }[]
+  }): void {
     if (!templateData?.templates) {
       return
     }
 
     const old = localStorage.getItem('litegrapheditor_clipboard')
 
-    var maxY, nodeBottom, node
-
     for (const template of templateData.templates) {
       if (!template?.data) {
         continue
@@ -1005,42 +1066,34 @@ export class ComfyApp {
       }
 
       // Move mouse position down to paste the next template below
-
-      maxY = false
+      let maxY: number | undefined
 
       for (const i in app.canvas.selected_nodes) {
-        node = app.canvas.selected_nodes[i]
-
-        nodeBottom = node.pos[1] + node.size[1]
-
-        // @ts-expect-error fixme ts strict error
-        if (maxY === false || nodeBottom > maxY) {
+        const node = app.canvas.selected_nodes[i]
+        const nodeBottom = node.pos[1] + node.size[1]
+        if (maxY === undefined || nodeBottom > maxY) {
           maxY = nodeBottom
         }
       }
 
-      // @ts-expect-error fixme ts strict error
-      app.canvas.graph_mouse[1] = maxY + 50
+      if (maxY !== undefined) {
+        app.canvas.graph_mouse[1] = maxY + 50
+      }
     }
 
-    // @ts-expect-error fixme ts strict error
-    localStorage.setItem('litegrapheditor_clipboard', old)
+    if (old !== null) {
+      localStorage.setItem('litegrapheditor_clipboard', old)
+    }
   }
 
   private showMissingNodesError(missingNodeTypes: MissingNodeType[]) {
+    // Remove modal once Node Replacement is implemented in TabErrors.
     if (useSettingStore().get('Comfy.Workflow.ShowMissingNodesWarning')) {
-      useDialogService().showLoadWorkflowWarning({ missingNodeTypes })
+      useMissingNodesDialog().show({ missingNodeTypes })
     }
-  }
 
-  // @ts-expect-error fixme ts strict error
-  private showMissingModelsError(missingModels, paths) {
-    if (useSettingStore().get('Comfy.Workflow.ShowMissingModelsWarning')) {
-      useDialogService().showMissingModelsWarning({
-        missingModels,
-        paths
-      })
-    }
+    const executionErrorStore = useExecutionErrorStore()
+    executionErrorStore.surfaceMissingNodes(missingNodeTypes)
   }
 
   async loadGraphData(
@@ -1053,13 +1106,15 @@ export class ComfyApp {
       showMissingModelsDialog?: boolean
       checkForRerouteMigration?: boolean
       openSource?: WorkflowOpenSource
+      deferWarnings?: boolean
     } = {}
   ) {
     const {
       showMissingNodesDialog = true,
       showMissingModelsDialog = true,
       checkForRerouteMigration = false,
-      openSource
+      openSource,
+      deferWarnings = false
     } = options
     useWorkflowService().beforeLoadNewGraph()
 
@@ -1116,37 +1171,46 @@ export class ComfyApp {
 
     const embeddedModels: ModelFile[] = []
 
+    const nodeReplacementStore = useNodeReplacementStore()
+    await nodeReplacementStore.load()
     const collectMissingNodesAndModels = (
       nodes: ComfyWorkflowJSON['nodes'],
-      path: string = ''
+      pathPrefix: string = '',
+      displayName: string = ''
     ) => {
       if (!Array.isArray(nodes)) {
         console.warn(
           'Workflow nodes data is missing or invalid, skipping node processing',
-          { nodes, path }
+          { nodes, pathPrefix }
         )
         return
       }
       for (let n of nodes) {
-        // Patch T2IAdapterLoader to ControlNetLoader since they are the same node now
-        if (n.type == 'T2IAdapterLoader') n.type = 'ControlNetLoader'
-        if (n.type == 'ConditioningAverage ') n.type = 'ConditioningAverage' //typo fix
-        if (n.type == 'SDV_img2vid_Conditioning')
-          n.type = 'SVD_img2vid_Conditioning' //typo fix
-        if (n.type == 'Load3DAnimation') n.type = 'Load3D' // Animation node merged into Load3D
-        if (n.type == 'Preview3DAnimation') n.type = 'Preview3D' // Animation node merged into Load3D
-
         // Find missing node types
         if (!(n.type in LiteGraph.registered_node_types)) {
-          // Include context about subgraph location if applicable
-          if (path) {
-            missingNodeTypes.push({
-              type: n.type,
-              hint: `in subgraph '${path}'`
-            })
-          } else {
-            missingNodeTypes.push(n.type)
-          }
+          const replacement = nodeReplacementStore.getReplacementFor(n.type)
+
+          // To access missing node information in the error tab
+          // we collect the cnr_id and execution_id here.
+          const cnrId = getCnrIdFromProperties(
+            n.properties as Record<string, unknown> | undefined
+          )
+
+          const executionId = pathPrefix
+            ? `${pathPrefix}:${n.id}`
+            : String(n.id)
+
+          missingNodeTypes.push({
+            type: n.type,
+            nodeId: executionId,
+            cnrId,
+            ...(displayName && {
+              hint: t('g.inSubgraph', { name: displayName })
+            }),
+            isReplaceable: replacement !== null,
+            replacement: replacement ?? undefined
+          })
+
           n.type = sanitizeNodeName(n.type)
         }
 
@@ -1161,14 +1225,25 @@ export class ComfyApp {
     // Process nodes at the top level
     collectMissingNodesAndModels(graphData.nodes)
 
+    // Build map: subgraph definition UUID → full execution path prefix.
+    // Handles arbitrary nesting depth (e.g. root node 11 → "11", node 14 in sg 11 → "11:14").
+    const subgraphContainerIdMap = buildSubgraphExecutionPaths(
+      graphData.nodes,
+      graphData.definitions?.subgraphs ?? []
+    )
+
     // Process nodes in subgraphs
     if (graphData.definitions?.subgraphs) {
       for (const subgraph of graphData.definitions.subgraphs) {
         if (isSubgraphDefinition(subgraph)) {
-          collectMissingNodesAndModels(
-            subgraph.nodes,
-            subgraph.name || subgraph.id
-          )
+          const paths = subgraphContainerIdMap.get(subgraph.id) ?? []
+          for (const pathPrefix of paths) {
+            collectMissingNodesAndModels(
+              subgraph.nodes,
+              pathPrefix,
+              subgraph.name || subgraph.id
+            )
+          }
         }
       }
     }
@@ -1190,9 +1265,6 @@ export class ComfyApp {
       await modelStore.loadModelFolders()
       for (const m of uniqueModels) {
         const modelFolder = await modelStore.getLoadedModelFolder(m.directory)
-        // @ts-expect-error
-        if (!modelFolder) m.directory_invalid = true
-
         const modelsAvailable = modelFolder?.models
         const modelExists =
           modelsAvailable &&
@@ -1203,6 +1275,37 @@ export class ComfyApp {
       }
     }
 
+    const canvasVisible = !!(this.canvasEl.width && this.canvasEl.height)
+    const fitView = () => {
+      if (
+        restore_view &&
+        useSettingStore().get('Comfy.EnableWorkflowViewRestore')
+      ) {
+        // Always fit view for templates to ensure they're visible on load
+        if (openSource === 'template') {
+          useLitegraphService().fitView()
+        } else if (graphData.extra?.ds) {
+          this.canvas.ds.offset = graphData.extra.ds.offset
+          this.canvas.ds.scale = graphData.extra.ds.scale
+
+          // Fit view if no nodes visible in restored viewport
+          this.canvas.ds.computeVisibleArea(this.canvas.viewport)
+          if (
+            this.canvas.visible_area.width &&
+            this.canvas.visible_area.height &&
+            !anyItemOverlapsRect(
+              this.rootGraph._nodes,
+              this.canvas.visible_area
+            )
+          ) {
+            requestAnimationFrame(() => useLitegraphService().fitView())
+          }
+        } else {
+          useLitegraphService().fitView()
+        }
+      }
+    }
+
     try {
       // @ts-expect-error Discrepancies between zod and litegraph - in progress
       this.rootGraph.configure(graphData)
@@ -1223,28 +1326,7 @@ export class ComfyApp {
         )
       }
 
-      if (
-        restore_view &&
-        useSettingStore().get('Comfy.EnableWorkflowViewRestore')
-      ) {
-        if (graphData.extra?.ds) {
-          this.canvas.ds.offset = graphData.extra.ds.offset
-          this.canvas.ds.scale = graphData.extra.ds.scale
-
-          // Fit view if no nodes visible in restored viewport
-          this.canvas.ds.computeVisibleArea(this.canvas.viewport)
-          if (
-            !anyItemOverlapsRect(
-              this.rootGraph._nodes,
-              this.canvas.visible_area
-            )
-          ) {
-            requestAnimationFrame(() => useLitegraphService().fitView())
-          }
-        } else {
-          useLitegraphService().fitView()
-        }
-      }
+      if (canvasVisible) fitView()
     } catch (error) {
       useDialogService().showErrorDialog(error, {
         title: t('errorDialog.loadWorkflowTitle'),
@@ -1285,17 +1367,18 @@ export class ComfyApp {
               }
             }
           }
-          if (reset_invalid_values) {
-            if (widget.type == 'combo') {
-              if (
-                // @ts-expect-error fixme ts strict error
-                !widget.options.values.includes(widget.value as string) &&
-                // @ts-expect-error fixme ts strict error
-                widget.options.values.length > 0
-              ) {
-                // @ts-expect-error fixme ts strict error
-                widget.value = widget.options.values[0]
-              }
+          if (widget.type == 'combo') {
+            const values = widget.options.values as
+              | (string | number | boolean)[]
+              | undefined
+            if (
+              values &&
+              values.length > 0 &&
+              (widget.value == null ||
+                (reset_invalid_values &&
+                  !values.includes(widget.value as string | number | boolean)))
+            ) {
+              widget.value = values[0]
             }
           }
         }
@@ -1304,13 +1387,6 @@ export class ComfyApp {
       useExtensionService().invokeExtensions('loadedGraphNode', node)
     })
 
-    if (missingNodeTypes.length && showMissingNodesDialog) {
-      this.showMissingNodesError(missingNodeTypes)
-    }
-    if (missingModels.length && showMissingModelsDialog) {
-      const paths = await api.getFolderPaths()
-      this.showMissingModelsError(missingModels, paths)
-    }
     await useExtensionService().invokeExtensionsAsync(
       'afterConfigureGraph',
       missingNodeTypes
@@ -1329,6 +1405,34 @@ export class ComfyApp {
       workflow,
       this.rootGraph.serialize() as unknown as ComfyWorkflowJSON
     )
+
+    // If the canvas was not visible and we're a fresh load, resize the canvas and fit the view
+    // This fixes switching from app mode to a new graph mode workflow (e.g. load template)
+    if (!canvasVisible && (!workflow || typeof workflow === 'string')) {
+      this.canvas.resize()
+      requestAnimationFrame(() => fitView())
+    }
+
+    // Store pending warnings on the workflow for deferred display
+    const activeWf = useWorkspaceStore().workflow.activeWorkflow
+    if (activeWf) {
+      const warnings: PendingWarnings = {}
+      if (missingNodeTypes.length && showMissingNodesDialog) {
+        warnings.missingNodeTypes = missingNodeTypes
+      }
+      if (missingModels.length && showMissingModelsDialog) {
+        const paths = await api.getFolderPaths()
+        warnings.missingModels = { missingModels: missingModels, paths }
+      }
+      if (warnings.missingNodeTypes || warnings.missingModels) {
+        activeWf.pendingWarnings = warnings
+      }
+    }
+
+    if (!deferWarnings) {
+      useWorkflowService().showPendingWarnings()
+    }
+
     requestAnimationFrame(() => {
       this.canvas.setDirty(true, true)
     })
@@ -1345,7 +1449,12 @@ export class ComfyApp {
     batchCount: number = 1,
     queueNodeIds?: NodeExecutionId[]
   ): Promise<boolean> {
-    this.queueItems.push({ number, batchCount, queueNodeIds })
+    const requestId = this.nextQueueRequestId++
+    this.queueItems.push({ number, batchCount, queueNodeIds, requestId })
+    api.dispatchCustomEvent('promptQueueing', {
+      requestId,
+      batchCount
+    })
 
     // Only have one action process the items so each one gets a unique seed correctly
     if (this.processingQueue) {
@@ -1354,25 +1463,36 @@ export class ComfyApp {
 
     this.processingQueue = true
     const executionStore = useExecutionStore()
-    executionStore.lastNodeErrors = null
+    const executionErrorStore = useExecutionErrorStore()
+    executionErrorStore.clearAllErrors()
 
-    let comfyOrgAuthToken = await useFirebaseAuthStore().getIdToken()
-    let comfyOrgApiKey = useApiKeyAuthStore().getApiKey()
+    // Get auth token for backend nodes - uses workspace token if enabled, otherwise Firebase token
+    const comfyOrgAuthToken = await useFirebaseAuthStore().getAuthToken()
+    const comfyOrgApiKey = useApiKeyAuthStore().getApiKey()
 
     try {
       while (this.queueItems.length) {
-        const { number, batchCount, queueNodeIds } = this.queueItems.pop()!
+        const { number, batchCount, queueNodeIds, requestId } =
+          this.queueItems.pop()!
+        let queuedCount = 0
         const previewMethod = useSettingStore().get(
           'Comfy.Execution.PreviewMethod'
         )
 
+        const isPartialExecution = !!queueNodeIds?.length
         for (let i = 0; i < batchCount; i++) {
           // Allow widgets to run callbacks before a prompt has been queued
           // e.g. random seed before every gen
           forEachNode(this.rootGraph, (node) => {
-            for (const widget of node.widgets ?? []) widget.beforeQueued?.()
+            for (const widget of node.widgets ?? []) {
+              widget.beforeQueued?.({ isPartialExecution })
+            }
           })
 
+          // Capture workflow before await — activeWorkflow may change if the
+          // user switches tabs while the request is in flight.
+          const queuedWorkflow = useWorkspaceStore().workflow
+            .activeWorkflow as ComfyWorkflow
           const p = await this.graphToPrompt(this.rootGraph)
           const queuedNodes = collectAllNodes(this.rootGraph)
           try {
@@ -1384,47 +1504,98 @@ export class ComfyApp {
             })
             delete api.authToken
             delete api.apiKey
-            executionStore.lastNodeErrors = res.node_errors ?? null
-            if (executionStore.lastNodeErrors?.length) {
+            executionErrorStore.lastNodeErrors = res.node_errors ?? null
+            if (executionErrorStore.lastNodeErrors?.length) {
               this.canvas.draw(true, true)
             } else {
               try {
                 if (res.prompt_id) {
-                  executionStore.storePrompt({
+                  executionStore.storeJob({
                     id: res.prompt_id,
                     nodes: Object.keys(p.output),
-                    workflow: useWorkspaceStore().workflow
-                      .activeWorkflow as ComfyWorkflow
+                    workflow: queuedWorkflow
                   })
                 }
               } catch (error) {}
             }
           } catch (error: unknown) {
-            useDialogService().showErrorDialog(error, {
-              title: t('errorDialog.promptExecutionError'),
-              reportType: 'promptExecutionError'
-            })
+            if (
+              error instanceof PromptExecutionError &&
+              typeof error.response.error === 'object' &&
+              error.response.error?.type === 'missing_node_type'
+            ) {
+              // Re-scan the full graph instead of using the server's single-node response.
+              rescanAndSurfaceMissingNodes(this.rootGraph)
+            } else if (
+              !useSettingStore().get('Comfy.RightSidePanel.ShowErrorsTab') ||
+              !(error instanceof PromptExecutionError)
+            ) {
+              useDialogService().showErrorDialog(error, {
+                title: t('errorDialog.promptExecutionError'),
+                reportType: 'promptExecutionError'
+              })
+            }
             console.error(error)
 
             if (error instanceof PromptExecutionError) {
-              executionStore.lastNodeErrors = error.response.node_errors ?? null
+              executionErrorStore.lastNodeErrors =
+                error.response.node_errors ?? null
+
+              // Store prompt-level error separately only when no node-specific errors exist,
+              // because node errors already carry the full context. Prompt-level errors
+              // (e.g. prompt_no_outputs, no_prompt) lack node IDs and need their own path.
+              const nodeErrors = error.response.node_errors
+              const hasNodeErrors =
+                nodeErrors && Object.keys(nodeErrors).length > 0
+
+              if (!hasNodeErrors) {
+                const respError = error.response.error
+                if (respError && typeof respError === 'object') {
+                  executionErrorStore.lastPromptError = {
+                    type: respError.type,
+                    message: respError.message,
+                    details: respError.details ?? ''
+                  }
+                } else if (typeof respError === 'string') {
+                  executionErrorStore.lastPromptError = {
+                    type: 'error',
+                    message: respError,
+                    details: ''
+                  }
+                }
+              }
+
+              if (useSettingStore().get('Comfy.RightSidePanel.ShowErrorsTab')) {
+                executionErrorStore.showErrorOverlay()
+              }
               this.canvas.draw(true, true)
             }
             break
           }
 
+          queuedCount++
+
           // Allow widgets to run callbacks after a prompt has been queued
           // e.g. random seed after every gen
-          executeWidgetsCallback(queuedNodes, 'afterQueued')
+          executeWidgetsCallback(queuedNodes, 'afterQueued', {
+            isPartialExecution
+          })
           this.canvas.draw(true, true)
           await this.ui.queue.update()
         }
+
+        if (queuedCount > 0) {
+          api.dispatchCustomEvent('promptQueued', {
+            number,
+            batchCount: queuedCount,
+            requestId
+          })
+        }
       }
     } finally {
       this.processingQueue = false
     }
-    api.dispatchCustomEvent('promptQueued', { number, batchCount })
-    return !executionStore.lastNodeErrors
+    return !executionErrorStore.lastNodeErrors
   }
 
   showErrorOnFileLoad(file: File) {
@@ -1437,18 +1608,46 @@ export class ComfyApp {
    * Loads workflow data from the specified file
    * @param {File} file
    */
-  async handleFile(file: File, openSource?: WorkflowOpenSource) {
+  async handleFile(
+    file: File,
+    openSource?: WorkflowOpenSource,
+    options?: { deferWarnings?: boolean }
+  ) {
     const fileName = file.name.replace(/\.\w+$/, '') // Strip file extension
     const workflowData = await getWorkflowDataFromFile(file)
-    if (!workflowData) {
+    const { workflow, prompt, parameters, templates } = workflowData ?? {}
+
+    if (!(workflow || prompt || parameters || templates)) {
+      const mediaNodeTypes: Record<string, [string, typeof pasteImageNode]> = {
+        image: ['LoadImage', pasteImageNode],
+        audio: ['LoadAudio', pasteAudioNode],
+        video: ['LoadVideo', pasteVideoNode]
+      }
+
+      const mediaType = Object.keys(mediaNodeTypes).find((t) =>
+        file.type.startsWith(t)
+      )
+      if (mediaType) {
+        const [nodeType, pasteFn] = mediaNodeTypes[mediaType]
+        const transfer = new DataTransfer()
+        transfer.items.add(file)
+        const node = await createNode(this.canvas, nodeType)
+        await pasteFn(this.canvas, transfer.items, node)
+        return
+      }
+
       this.showErrorOnFileLoad(file)
       return
     }
 
-    const { workflow, prompt, parameters, templates } = workflowData
-
-    if (templates) {
-      this.loadTemplateData({ templates })
+    if (
+      templates &&
+      typeof templates === 'object' &&
+      Array.isArray(templates)
+    ) {
+      this.loadTemplateData({
+        templates: templates as { name?: string; data?: string }[]
+      })
     }
 
     // Check workflow first - it should take priority over parameters
@@ -1466,7 +1665,8 @@ export class ComfyApp {
           !Array.isArray(workflowObj)
         ) {
           await this.loadGraphData(workflowObj, true, true, fileName, {
-            openSource
+            openSource,
+            deferWarnings: options?.deferWarnings
           })
           return
         } else {
@@ -1497,11 +1697,9 @@ export class ComfyApp {
     }
 
     // Use parameters strictly as the final fallback
-    if (parameters) {
-      // Note: Not putting this in `importA1111` as it is mostly not used
-      // by external callers, and `importA1111` has no access to `app`.
+    if (parameters && typeof parameters === 'string') {
       useWorkflowService().beforeLoadNewGraph()
-      importA1111(this.graph, parameters)
+      importA1111(this.rootGraph, parameters)
       useWorkflowService().afterLoadNewGraph(
         fileName,
         this.rootGraph.serialize() as unknown as ComfyWorkflowJSON
@@ -1512,6 +1710,87 @@ export class ComfyApp {
     this.showErrorOnFileLoad(file)
   }
 
+  /**
+   * Loads multiple files, connects to a batch node, and selects them
+   * @param {FileList} fileList
+   */
+  async handleFileList(fileList: File[]) {
+    if (fileList.length === 0) return
+    if (!fileList[0].type.startsWith('image')) return
+
+    const imageNodes = await pasteImageNodes(this.canvas, fileList)
+    if (imageNodes.length === 0) return
+
+    if (imageNodes.length > 1) {
+      const batchImagesNode = await createNode(this.canvas, 'BatchImagesNode')
+      if (!batchImagesNode) return
+
+      this.positionBatchNodes(imageNodes, batchImagesNode)
+      this.canvas.selectItems([...imageNodes, batchImagesNode])
+
+      imageNodes.forEach((imageNode, index) => {
+        imageNode.connect(0, batchImagesNode, index)
+      })
+    } else {
+      this.canvas.selectItems(imageNodes)
+    }
+  }
+
+  async handleAudioFileList(fileList: File[]) {
+    const audioNodes = await pasteAudioNodes(this.canvas, fileList)
+    if (audioNodes.length === 0) return
+
+    this.positionNodes(audioNodes)
+    this.canvas.selectItems(audioNodes)
+  }
+
+  async handleVideoFileList(fileList: File[]) {
+    const videoNodes = await pasteVideoNodes(this.canvas, fileList)
+    if (videoNodes.length === 0) return
+
+    this.positionNodes(videoNodes)
+    this.canvas.selectItems(videoNodes)
+  }
+
+  /**
+   * Positions batched nodes in drag and drop
+   * @param nodes
+   * @param batchNode
+   */
+  positionNodes(nodes: LGraphNode[]): void {
+    if (nodes.length <= 1) return
+
+    const [x, y] = nodes[0].getBounding()
+    const nodeHeight = 150
+
+    nodes.forEach((node, index) => {
+      if (index > 0) {
+        node.pos = [x, y + nodeHeight * index + 25 * (index + 1)]
+      }
+    })
+
+    this.canvas.graph?.change()
+  }
+
+  positionBatchNodes(nodes: LGraphNode[], batchNode: LGraphNode): void {
+    const [x, y, width] = nodes[0].getBounding()
+    batchNode.pos = [x + width + 100, y + 30]
+
+    // Retrieving Node Height is inconsistent
+    let height = 0
+    if (nodes[0].type === 'LoadImage') {
+      height = 344
+    }
+
+    nodes.forEach((node, index) => {
+      if (index > 0) {
+        node.pos = [x, y + height * index + 25 * (index + 1)]
+      }
+    })
+
+    this.canvas.graph?.change()
+  }
+
   // @deprecated
   isApiJson(data: unknown): data is ComfyApiWorkflow {
     if (!_.isObject(data) || Array.isArray(data)) {
@@ -1552,35 +1831,40 @@ export class ComfyApp {
       app.rootGraph.add(node)
     }
 
-    //TODO: Investigate repeat of for loop. Can compress?
-    for (const id of ids) {
+    const processNodeInputs = (id: string) => {
       const data = apiData[id]
       const node = app.rootGraph.getNodeById(id)
+      if (!node) return
+
       for (const input in data.inputs ?? {}) {
         const value = data.inputs[input]
         if (value instanceof Array) {
           const [fromId, fromSlot] = value
           const fromNode = app.rootGraph.getNodeById(fromId)
-          // @ts-expect-error fixme ts strict error
-          let toSlot = node.inputs?.findIndex((inp) => inp.name === input)
-          if (toSlot == null || toSlot === -1) {
+          if (!fromNode) continue
+
+          let toSlot = node.inputs?.findIndex((inp) => inp.name === input) ?? -1
+          if (toSlot === -1) {
             try {
-              // Target has no matching input, most likely a converted widget
-              // @ts-expect-error fixme ts strict error
               const widget = node.widgets?.find((w) => w.name === input)
-              // @ts-expect-error
-              if (widget && node.convertWidgetToInput?.(widget)) {
-                // @ts-expect-error fixme ts strict error
-                toSlot = node.inputs?.length - 1
+              const convertFn = (
+                node as LGraphNode & {
+                  convertWidgetToInput?: (w: IBaseWidget) => boolean
+                }
+              ).convertWidgetToInput
+              if (widget && convertFn?.(widget)) {
+                // Re-find the target slot by name after conversion
+                toSlot =
+                  node.inputs?.findIndex((inp) => inp.name === input) ?? -1
               }
-            } catch (error) {}
+            } catch (_error) {
+              // Ignore conversion errors
+            }
           }
-          if (toSlot != null || toSlot !== -1) {
-            // @ts-expect-error fixme ts strict error
+          if (toSlot !== -1) {
             fromNode.connect(fromSlot, node, toSlot)
           }
         } else {
-          // @ts-expect-error fixme ts strict error
           const widget = node.widgets?.find((w) => w.name === input)
           if (widget) {
             widget.value = value
@@ -1589,45 +1873,10 @@ export class ComfyApp {
         }
       }
     }
+
+    for (const id of ids) processNodeInputs(id)
     app.rootGraph.arrange()
-
-    for (const id of ids) {
-      const data = apiData[id]
-      const node = app.rootGraph.getNodeById(id)
-      for (const input in data.inputs ?? {}) {
-        const value = data.inputs[input]
-        if (value instanceof Array) {
-          const [fromId, fromSlot] = value
-          const fromNode = app.rootGraph.getNodeById(fromId)
-          // @ts-expect-error fixme ts strict error
-          let toSlot = node.inputs?.findIndex((inp) => inp.name === input)
-          if (toSlot == null || toSlot === -1) {
-            try {
-              // Target has no matching input, most likely a converted widget
-              // @ts-expect-error fixme ts strict error
-              const widget = node.widgets?.find((w) => w.name === input)
-              // @ts-expect-error
-              if (widget && node.convertWidgetToInput?.(widget)) {
-                // @ts-expect-error fixme ts strict error
-                toSlot = node.inputs?.length - 1
-              }
-            } catch (error) {}
-          }
-          if (toSlot != null || toSlot !== -1) {
-            // @ts-expect-error fixme ts strict error
-            fromNode.connect(fromSlot, node, toSlot)
-          }
-        } else {
-          // @ts-expect-error fixme ts strict error
-          const widget = node.widgets?.find((w) => w.name === input)
-          if (widget) {
-            widget.value = value
-            widget.callback?.(value)
-          }
-        }
-      }
-    }
-
+    for (const id of ids) processNodeInputs(id)
     app.rootGraph.arrange()
 
     useWorkflowService().afterLoadNewGraph(
@@ -1684,6 +1933,7 @@ export class ComfyApp {
       this.registerNodeDef(nodeId, defs[nodeId])
     }
     // Refresh combo widgets in all nodes including those in subgraphs
+    const nodeOutputStore = useNodeOutputStore()
     forEachNode(this.rootGraph, (node) => {
       const def = defs[node.type]
       // Allow primitive nodes to handle refresh
@@ -1716,6 +1966,12 @@ export class ComfyApp {
           }
         }
       }
+
+      // Re-trigger previews on media nodes (e.g. LoadImage)
+      // to bust browser cache when files are edited externally
+      if (isImageNode(node) || isVideoNode(node)) {
+        nodeOutputStore.refreshNodeOutputs(node)
+      }
     })
 
     await useExtensionService().invokeExtensionsAsync(
@@ -1741,9 +1997,8 @@ export class ComfyApp {
   clean() {
     const nodeOutputStore = useNodeOutputStore()
     nodeOutputStore.resetAllOutputsAndPreviews()
-    const executionStore = useExecutionStore()
-    executionStore.lastNodeErrors = null
-    executionStore.lastExecutionError = null
+    const executionErrorStore = useExecutionErrorStore()
+    executionErrorStore.clearAllErrors()
 
     useDomWidgetStore().clear()
 
diff --git a/src/scripts/changeTracker.ts b/src/scripts/changeTracker.ts
index fa09ad49af..0d7d87c8e3 100644
--- a/src/scripts/changeTracker.ts
+++ b/src/scripts/changeTracker.ts
@@ -2,6 +2,7 @@ import _ from 'es-toolkit/compat'
 import * as jsondiffpatch from 'jsondiffpatch'
 import log from 'loglevel'
 
+import type { CanvasPointerEvent } from '@/lib/litegraph/src/litegraph'
 import { LGraphCanvas, LiteGraph } from '@/lib/litegraph/src/litegraph'
 import {
   ComfyWorkflow,
@@ -10,7 +11,7 @@ import {
 import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
 import type { ExecutedWsMessage } from '@/schemas/apiSchema'
 import { useExecutionStore } from '@/stores/executionStore'
-import { useNodeOutputStore } from '@/stores/imagePreviewStore'
+import { useNodeOutputStore } from '@/stores/nodeOutputStore'
 import { useSubgraphNavigationStore } from '@/stores/subgraphNavigationStore'
 
 import { api } from './api'
@@ -40,7 +41,7 @@ export class ChangeTracker {
   _restoringState: boolean = false
 
   ds?: { scale: number; offset: [number, number] }
-  nodeOutputs?: Record<string, any>
+  nodeOutputs?: Record<string, ExecutedWsMessage['output']>
 
   private subgraphState?: {
     navigation: string[]
@@ -76,6 +77,7 @@ export class ChangeTracker {
       scale: app.canvas.ds.scale,
       offset: [app.canvas.ds.offset[0], app.canvas.ds.offset[1]]
     }
+    this.nodeOutputs = useNodeOutputStore().snapshotOutputs()
     const navigation = useSubgraphNavigationStore().exportState()
     // Always store the navigation state, even if empty (root level)
     this.subgraphState = { navigation }
@@ -303,11 +305,11 @@ export class ChangeTracker {
     const prompt = LGraphCanvas.prototype.prompt
     LGraphCanvas.prototype.prompt = function (
       title: string,
-      value: any,
-      callback: (v: any) => void,
-      event: any
+      value: string | number,
+      callback: (v: string) => void,
+      event: CanvasPointerEvent
     ) {
-      const extendedCallback = (v: any) => {
+      const extendedCallback = (v: string) => {
         callback(v)
         checkState()
       }
@@ -338,7 +340,7 @@ export class ChangeTracker {
     api.addEventListener('executed', (e: CustomEvent<ExecutedWsMessage>) => {
       const detail = e.detail
       const workflow =
-        useExecutionStore().queuedPrompts[detail.prompt_id]?.workflow
+        useExecutionStore().queuedJobs[detail.prompt_id]?.workflow
       const changeTracker = workflow?.changeTracker
       if (!changeTracker) return
       changeTracker.nodeOutputs ??= {}
diff --git a/src/scripts/domWidget.test.ts b/src/scripts/domWidget.test.ts
new file mode 100644
index 0000000000..20d02ccdbf
--- /dev/null
+++ b/src/scripts/domWidget.test.ts
@@ -0,0 +1,195 @@
+import { beforeEach, describe, expect, test, vi } from 'vitest'
+
+import { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import { ComponentWidgetImpl, DOMWidgetImpl } from '@/scripts/domWidget'
+
+const isPromotedByAnyMock = vi.hoisted(() => vi.fn())
+
+// Mock dependencies
+vi.mock('@/stores/domWidgetStore', () => ({
+  useDomWidgetStore: () => ({
+    unregisterWidget: vi.fn()
+  })
+}))
+
+vi.mock('@/stores/promotionStore', () => ({
+  usePromotionStore: () => ({
+    isPromotedByAny: isPromotedByAnyMock
+  })
+}))
+
+vi.mock('@/utils/formatUtil', () => ({
+  generateUUID: () => 'test-uuid'
+}))
+
+type MockCanvasContext = Pick<
+  CanvasRenderingContext2D,
+  | 'beginPath'
+  | 'rect'
+  | 'fill'
+  | 'save'
+  | 'restore'
+  | 'strokeRect'
+  | 'fillStyle'
+  | 'strokeStyle'
+>
+
+function createMockContext(): MockCanvasContext {
+  return {
+    beginPath: vi.fn(),
+    rect: vi.fn(),
+    fill: vi.fn(),
+    save: vi.fn(),
+    restore: vi.fn(),
+    strokeRect: vi.fn(),
+    fillStyle: '#000',
+    strokeStyle: '#000'
+  }
+}
+
+describe('DOMWidget Y Position Preservation', () => {
+  test('BaseDOMWidgetImpl createCopyForNode preserves Y position', () => {
+    const mockNode = new LGraphNode('test-node')
+    const originalWidget = new ComponentWidgetImpl({
+      node: mockNode,
+      name: 'test-widget',
+      component: { template: '<div></div>' },
+      inputSpec: { name: 'test', type: 'string' },
+      options: {}
+    })
+
+    // Set a specific Y position
+    originalWidget.y = 66
+
+    const newNode = new LGraphNode('new-node')
+    const clonedWidget = originalWidget.createCopyForNode(newNode)
+
+    // Verify Y position is preserved
+    expect(clonedWidget.y).toBe(66)
+    expect(clonedWidget.node).toBe(newNode)
+    expect(clonedWidget.name).toBe('test-widget')
+  })
+
+  test('DOMWidgetImpl createCopyForNode preserves Y position', () => {
+    const mockNode = new LGraphNode('test-node')
+    const mockElement = document.createElement('div')
+
+    const originalWidget = new DOMWidgetImpl({
+      node: mockNode,
+      name: 'test-dom-widget',
+      type: 'test',
+      element: mockElement,
+      options: {}
+    })
+
+    // Set a specific Y position
+    originalWidget.y = 42
+
+    const newNode = new LGraphNode('new-node')
+    const clonedWidget = originalWidget.createCopyForNode(newNode)
+
+    // Verify Y position is preserved
+    expect(clonedWidget.y).toBe(42)
+    expect(clonedWidget.node).toBe(newNode)
+    expect(clonedWidget.element).toBe(mockElement)
+    expect(clonedWidget.name).toBe('test-dom-widget')
+  })
+
+  test('Y position defaults to 0 when not set', () => {
+    const mockNode = new LGraphNode('test-node')
+    const originalWidget = new ComponentWidgetImpl({
+      node: mockNode,
+      name: 'test-widget',
+      component: { template: '<div></div>' },
+      inputSpec: { name: 'test', type: 'string' },
+      options: {}
+    })
+
+    // Don't explicitly set Y (should be 0 by default)
+    const newNode = new LGraphNode('new-node')
+    const clonedWidget = originalWidget.createCopyForNode(newNode)
+
+    // Verify Y position is preserved (should be 0)
+    expect(clonedWidget.y).toBe(0)
+  })
+})
+
+describe('DOMWidget draw promotion behavior', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  test('draws promoted outline for visible promoted widgets', () => {
+    isPromotedByAnyMock.mockReturnValue(true)
+
+    const node = new LGraphNode('test-node')
+    const rootGraph = { id: 'root-graph-id' }
+    node.graph = { rootGraph } as never
+    const onDraw = vi.fn()
+
+    const widget = new DOMWidgetImpl({
+      node,
+      name: 'seed',
+      type: 'text',
+      element: document.createElement('div'),
+      options: { onDraw }
+    })
+    const ctx = createMockContext()
+
+    widget.draw(ctx as CanvasRenderingContext2D, node, 200, 30, 40)
+
+    expect(isPromotedByAnyMock).toHaveBeenCalledWith(
+      'root-graph-id',
+      '-1',
+      'seed'
+    )
+    expect(ctx.strokeRect).toHaveBeenCalledOnce()
+    expect(onDraw).toHaveBeenCalledWith(widget)
+  })
+
+  test('does not draw promoted outline when widget is not promoted', () => {
+    isPromotedByAnyMock.mockReturnValue(false)
+
+    const node = new LGraphNode('test-node')
+    const rootGraph = { id: 'root-graph-id' }
+    node.graph = { rootGraph } as never
+    const onDraw = vi.fn()
+
+    const widget = new DOMWidgetImpl({
+      node,
+      name: 'seed',
+      type: 'text',
+      element: document.createElement('div'),
+      options: { onDraw }
+    })
+    const ctx = createMockContext()
+
+    widget.draw(ctx as CanvasRenderingContext2D, node, 200, 30, 40)
+
+    expect(ctx.strokeRect).not.toHaveBeenCalled()
+    expect(onDraw).toHaveBeenCalledWith(widget)
+  })
+
+  test('skips promotion lookup when widget is hidden', () => {
+    const node = new LGraphNode('test-node')
+    const rootGraph = { id: 'root-graph-id' }
+    node.graph = { rootGraph } as never
+    const onDraw = vi.fn()
+
+    const widget = new DOMWidgetImpl({
+      node,
+      name: 'seed',
+      type: 'text',
+      element: document.createElement('div'),
+      options: { onDraw }
+    })
+    widget.hidden = true
+    const ctx = createMockContext()
+
+    widget.draw(ctx as CanvasRenderingContext2D, node, 200, 30, 40)
+
+    expect(isPromotedByAnyMock).not.toHaveBeenCalled()
+    expect(ctx.strokeRect).not.toHaveBeenCalled()
+    expect(onDraw).toHaveBeenCalledWith(widget)
+  })
+})
diff --git a/src/scripts/domWidget.ts b/src/scripts/domWidget.ts
index a1b57496dc..38979bb81b 100644
--- a/src/scripts/domWidget.ts
+++ b/src/scripts/domWidget.ts
@@ -13,6 +13,7 @@ import type {
 } from '@/lib/litegraph/src/types/widgets'
 import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
 import { useDomWidgetStore } from '@/stores/domWidgetStore'
+import { usePromotionStore } from '@/stores/promotionStore'
 import { generateUUID } from '@/utils/formatUtil'
 
 export interface BaseDOMWidget<
@@ -124,6 +125,7 @@ abstract class BaseDOMWidgetImpl<V extends object | string>
   declare readonly name: string
   declare readonly options: DOMWidgetOptions<V>
   declare callback?: (value: V) => void
+  readonly promotionStore = usePromotionStore()
 
   readonly id: string
 
@@ -153,7 +155,7 @@ abstract class BaseDOMWidgetImpl<V extends object | string>
   }
 
   isVisible(): boolean {
-    return !['hidden'].includes(this.type) && this.node.isWidgetVisible(this)
+    return !this.hidden && this.node.isWidgetVisible(this)
   }
 
   override draw(
@@ -164,7 +166,9 @@ abstract class BaseDOMWidgetImpl<V extends object | string>
     widget_height: number,
     lowQuality?: boolean
   ): void {
-    if (this.options.hideOnZoom && lowQuality && this.isVisible()) {
+    const isVisible = this.isVisible()
+
+    if (this.options.hideOnZoom && lowQuality && isVisible) {
       // Draw a placeholder rectangle
       const originalFillStyle = ctx.fillStyle
       ctx.beginPath()
@@ -177,7 +181,25 @@ abstract class BaseDOMWidgetImpl<V extends object | string>
       )
       ctx.fill()
       ctx.fillStyle = originalFillStyle
-    } else if (this.promoted && this.isVisible()) {
+    } else {
+      if (!isVisible) {
+        this.options.onDraw?.(this)
+        return
+      }
+
+      const graphId = this.node.graph?.rootGraph.id
+      const isPromoted =
+        graphId &&
+        this.promotionStore.isPromotedByAny(
+          graphId,
+          String(this.node.id),
+          this.name
+        )
+      if (!isPromoted) {
+        this.options.onDraw?.(this)
+        return
+      }
+
       ctx.save()
       const adjustedMargin = this.margin - 1
       ctx.beginPath()
diff --git a/tests-ui/tests/scripts/metadata/gltf.test.ts b/src/scripts/metadata/gltf.test.ts
similarity index 98%
rename from tests-ui/tests/scripts/metadata/gltf.test.ts
rename to src/scripts/metadata/gltf.test.ts
index d5cdef4138..cead271807 100644
--- a/tests-ui/tests/scripts/metadata/gltf.test.ts
+++ b/src/scripts/metadata/gltf.test.ts
@@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest'
 
 import { ASCII, GltfSizeBytes } from '@/types/metadataTypes'
 
-import { getGltfBinaryMetadata } from '../../../../src/scripts/metadata/gltf'
+import { getGltfBinaryMetadata } from './gltf'
 
 describe('GLTF binary metadata parser', () => {
   const createGLTFFileStructure = () => {
diff --git a/src/scripts/metadata/isobmff.ts b/src/scripts/metadata/isobmff.ts
index a9a7f88265..e50a101699 100644
--- a/src/scripts/metadata/isobmff.ts
+++ b/src/scripts/metadata/isobmff.ts
@@ -72,7 +72,11 @@ const findIsobmffBoxByType = (
   return null
 }
 
-const extractJson = (data: Uint8Array, start: number, end: number): any => {
+const extractJson = (
+  data: Uint8Array,
+  start: number,
+  end: number
+): ComfyWorkflowJSON | ComfyApiWorkflow | null => {
   let jsonStart = start
   while (jsonStart < end && data[jsonStart] !== ASCII.OPEN_BRACE) {
     jsonStart++
@@ -133,7 +137,7 @@ const extractMetadataValueFromDataBox = (
     lowerKeyName === ComfyMetadataTags.PROMPT.toLowerCase() ||
     lowerKeyName === ComfyMetadataTags.WORKFLOW.toLowerCase()
   ) {
-    return extractJson(data, valueStart, dataBoxEnd) || null
+    return extractJson(data, valueStart, dataBoxEnd)
   }
   return null
 }
diff --git a/src/scripts/metadata/parser.ts b/src/scripts/metadata/parser.ts
index f11b9bef76..ee4f881b66 100644
--- a/src/scripts/metadata/parser.ts
+++ b/src/scripts/metadata/parser.ts
@@ -5,6 +5,7 @@ import { getDataFromJSON } from '@/scripts/metadata/json'
 import { getMp3Metadata } from '@/scripts/metadata/mp3'
 import { getOggMetadata } from '@/scripts/metadata/ogg'
 import { getSvgMetadata } from '@/scripts/metadata/svg'
+import type { ComfyMetadata } from '@/types/metadataTypes'
 import {
   getAvifMetadata,
   getWebpMetadata,
@@ -15,7 +16,7 @@ import {
 
 export async function getWorkflowDataFromFile(
   file: File
-): Promise<Record<string, string | object> | undefined> {
+): Promise<ComfyMetadata | Record<string, string | object> | undefined> {
   if (file.type === 'image/png') {
     return await getPngMetadata(file)
   }
@@ -43,7 +44,7 @@ export async function getWorkflowDataFromFile(
     return { workflow, prompt }
   }
   if (file.type === 'video/webm') {
-    return (await getFromWebmFile(file)) as unknown as Record<string, object>
+    return await getFromWebmFile(file)
   }
   if (
     file.name?.endsWith('.mp4') ||
@@ -53,16 +54,13 @@ export async function getWorkflowDataFromFile(
     file.type === 'video/quicktime' ||
     file.type === 'video/x-m4v'
   ) {
-    return (await getFromIsobmffFile(file)) as unknown as Record<string, object>
+    return await getFromIsobmffFile(file)
   }
   if (file.type === 'image/svg+xml' || file.name?.endsWith('.svg')) {
-    return (await getSvgMetadata(file)) as unknown as Record<string, object>
+    return await getSvgMetadata(file)
   }
   if (file.type === 'model/gltf-binary' || file.name?.endsWith('.glb')) {
-    return (await getGltfBinaryMetadata(file)) as unknown as Record<
-      string,
-      object
-    >
+    return await getGltfBinaryMetadata(file)
   }
   if (file.name?.endsWith('.latent') || file.name?.endsWith('.safetensors')) {
     return await getLatentMetadata(file)
diff --git a/tests-ui/tests/scripts/metadata/ply.test.ts b/src/scripts/metadata/ply.test.ts
similarity index 100%
rename from tests-ui/tests/scripts/metadata/ply.test.ts
rename to src/scripts/metadata/ply.test.ts
diff --git a/src/scripts/metadata/png.test.ts b/src/scripts/metadata/png.test.ts
new file mode 100644
index 0000000000..dcc47bf049
--- /dev/null
+++ b/src/scripts/metadata/png.test.ts
@@ -0,0 +1,245 @@
+import { describe, expect, it } from 'vitest'
+
+import { getFromPngBuffer } from './png'
+
+function createPngWithChunk(
+  chunkType: string,
+  keyword: string,
+  content: string,
+  options: {
+    compressionFlag?: number
+    compressionMethod?: number
+    languageTag?: string
+    translatedKeyword?: string
+  } = {}
+): ArrayBuffer {
+  const {
+    compressionFlag = 0,
+    compressionMethod = 0,
+    languageTag = '',
+    translatedKeyword = ''
+  } = options
+
+  const signature = new Uint8Array([
+    0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a
+  ])
+  const typeBytes = new TextEncoder().encode(chunkType)
+  const keywordBytes = new TextEncoder().encode(keyword)
+  const contentBytes = new TextEncoder().encode(content)
+
+  let chunkData: Uint8Array
+  if (chunkType === 'iTXt') {
+    const langBytes = new TextEncoder().encode(languageTag)
+    const transBytes = new TextEncoder().encode(translatedKeyword)
+    const totalLength =
+      keywordBytes.length +
+      1 +
+      2 +
+      langBytes.length +
+      1 +
+      transBytes.length +
+      1 +
+      contentBytes.length
+
+    chunkData = new Uint8Array(totalLength)
+    let pos = 0
+    chunkData.set(keywordBytes, pos)
+    pos += keywordBytes.length
+    chunkData[pos++] = 0
+    chunkData[pos++] = compressionFlag
+    chunkData[pos++] = compressionMethod
+    chunkData.set(langBytes, pos)
+    pos += langBytes.length
+    chunkData[pos++] = 0
+    chunkData.set(transBytes, pos)
+    pos += transBytes.length
+    chunkData[pos++] = 0
+    chunkData.set(contentBytes, pos)
+  } else {
+    chunkData = new Uint8Array(keywordBytes.length + 1 + contentBytes.length)
+    chunkData.set(keywordBytes, 0)
+    chunkData[keywordBytes.length] = 0
+    chunkData.set(contentBytes, keywordBytes.length + 1)
+  }
+
+  const lengthBytes = new Uint8Array(4)
+  new DataView(lengthBytes.buffer).setUint32(0, chunkData.length, false)
+
+  const crc = new Uint8Array(4)
+
+  const iendType = new TextEncoder().encode('IEND')
+  const iendLength = new Uint8Array(4)
+  const iendCrc = new Uint8Array(4)
+
+  const total = signature.length + 4 + 4 + chunkData.length + 4 + 4 + 4 + 0 + 4
+  const result = new Uint8Array(total)
+
+  let offset = 0
+  result.set(signature, offset)
+  offset += signature.length
+
+  result.set(lengthBytes, offset)
+  offset += 4
+  result.set(typeBytes, offset)
+  offset += 4
+  result.set(chunkData, offset)
+  offset += chunkData.length
+  result.set(crc, offset)
+  offset += 4
+
+  result.set(iendLength, offset)
+  offset += 4
+  result.set(iendType, offset)
+  offset += 4
+  result.set(iendCrc, offset)
+
+  return result.buffer
+}
+
+describe('getFromPngBuffer', () => {
+  it('returns empty object for invalid PNG', async () => {
+    const invalidData = new ArrayBuffer(8)
+    const result = await getFromPngBuffer(invalidData)
+    expect(result).toEqual({})
+  })
+
+  it('parses tEXt chunk', async () => {
+    const workflow = '{"nodes":[]}'
+    const buffer = createPngWithChunk('tEXt', 'workflow', workflow)
+    const result = await getFromPngBuffer(buffer)
+    expect(result['workflow']).toBe(workflow)
+  })
+
+  it('parses comf chunk', async () => {
+    const prompt = '{"1":{"class_type":"Test"}}'
+    const buffer = createPngWithChunk('comf', 'prompt', prompt)
+    const result = await getFromPngBuffer(buffer)
+    expect(result['prompt']).toBe(prompt)
+  })
+
+  it('parses uncompressed iTXt chunk', async () => {
+    const workflow = '{"nodes":[{"id":1}]}'
+    const buffer = createPngWithChunk('iTXt', 'workflow', workflow, {
+      compressionFlag: 0,
+      compressionMethod: 0
+    })
+    const result = await getFromPngBuffer(buffer)
+    expect(result['workflow']).toBe(workflow)
+  })
+
+  it('parses iTXt chunk with language tag and translated keyword', async () => {
+    const workflow = '{"test":"value"}'
+    const buffer = createPngWithChunk('iTXt', 'workflow', workflow, {
+      compressionFlag: 0,
+      languageTag: 'en',
+      translatedKeyword: 'Workflow'
+    })
+    const result = await getFromPngBuffer(buffer)
+    expect(result['workflow']).toBe(workflow)
+  })
+
+  it('parses compressed iTXt chunk', async () => {
+    const workflow = '{"nodes":[{"id":1,"type":"KSampler"}]}'
+    const contentBytes = new TextEncoder().encode(workflow)
+
+    const stream = new CompressionStream('deflate')
+    const writer = stream.writable.getWriter()
+    await writer.write(contentBytes)
+    await writer.close()
+
+    const reader = stream.readable.getReader()
+    const chunks: Uint8Array[] = []
+    while (true) {
+      const { done, value } = await reader.read()
+      if (done) break
+      chunks.push(value)
+    }
+    const compressedBytes = new Uint8Array(
+      chunks.reduce((acc, c) => acc + c.length, 0)
+    )
+    let pos = 0
+    for (const chunk of chunks) {
+      compressedBytes.set(chunk, pos)
+      pos += chunk.length
+    }
+
+    const buffer = createPngWithCompressedITXt(
+      'workflow',
+      compressedBytes,
+      '',
+      ''
+    )
+    const result = await getFromPngBuffer(buffer)
+    expect(result['workflow']).toBe(workflow)
+  })
+})
+
+function createPngWithCompressedITXt(
+  keyword: string,
+  compressedContent: Uint8Array,
+  languageTag: string,
+  translatedKeyword: string
+): ArrayBuffer {
+  const signature = new Uint8Array([
+    0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a
+  ])
+  const typeBytes = new TextEncoder().encode('iTXt')
+  const keywordBytes = new TextEncoder().encode(keyword)
+  const langBytes = new TextEncoder().encode(languageTag)
+  const transBytes = new TextEncoder().encode(translatedKeyword)
+
+  const totalLength =
+    keywordBytes.length +
+    1 +
+    2 +
+    langBytes.length +
+    1 +
+    transBytes.length +
+    1 +
+    compressedContent.length
+
+  const chunkData = new Uint8Array(totalLength)
+  let pos = 0
+  chunkData.set(keywordBytes, pos)
+  pos += keywordBytes.length
+  chunkData[pos++] = 0
+  chunkData[pos++] = 1
+  chunkData[pos++] = 0
+  chunkData.set(langBytes, pos)
+  pos += langBytes.length
+  chunkData[pos++] = 0
+  chunkData.set(transBytes, pos)
+  pos += transBytes.length
+  chunkData[pos++] = 0
+  chunkData.set(compressedContent, pos)
+
+  const lengthBytes = new Uint8Array(4)
+  new DataView(lengthBytes.buffer).setUint32(0, chunkData.length, false)
+
+  const crc = new Uint8Array(4)
+  const iendType = new TextEncoder().encode('IEND')
+  const iendLength = new Uint8Array(4)
+  const iendCrc = new Uint8Array(4)
+
+  const total = signature.length + 4 + 4 + chunkData.length + 4 + 4 + 4 + 0 + 4
+  const result = new Uint8Array(total)
+
+  let offset = 0
+  result.set(signature, offset)
+  offset += signature.length
+  result.set(lengthBytes, offset)
+  offset += 4
+  result.set(typeBytes, offset)
+  offset += 4
+  result.set(chunkData, offset)
+  offset += chunkData.length
+  result.set(crc, offset)
+  offset += 4
+  result.set(iendLength, offset)
+  offset += 4
+  result.set(iendType, offset)
+  offset += 4
+  result.set(iendCrc, offset)
+
+  return result.buffer
+}
diff --git a/src/scripts/metadata/png.ts b/src/scripts/metadata/png.ts
index 2e911796a9..2d47effcb2 100644
--- a/src/scripts/metadata/png.ts
+++ b/src/scripts/metadata/png.ts
@@ -1,26 +1,58 @@
-/** @knipIgnoreUnusedButUsedByCustomNodes */
-export function getFromPngBuffer(buffer: ArrayBuffer): Record<string, string> {
-  // Get the PNG data as a Uint8Array
+async function decompressZlib(
+  data: Uint8Array<ArrayBuffer>
+): Promise<Uint8Array<ArrayBuffer>> {
+  const stream = new DecompressionStream('deflate')
+  const writer = stream.writable.getWriter()
+  try {
+    await writer.write(data)
+    await writer.close()
+  } finally {
+    writer.releaseLock()
+  }
+
+  const reader = stream.readable.getReader()
+  const chunks: Uint8Array<ArrayBuffer>[] = []
+  let totalLength = 0
+
+  try {
+    while (true) {
+      const { done, value } = await reader.read()
+      if (done) break
+      chunks.push(value)
+      totalLength += value.length
+    }
+  } finally {
+    reader.releaseLock()
+  }
+
+  const result = new Uint8Array(totalLength)
+  let offset = 0
+  for (const chunk of chunks) {
+    result.set(chunk, offset)
+    offset += chunk.length
+  }
+  return result
+}
+
+export async function getFromPngBuffer(
+  buffer: ArrayBuffer
+): Promise<Record<string, string>> {
   const pngData = new Uint8Array(buffer)
   const dataView = new DataView(pngData.buffer)
 
-  // Check that the PNG signature is present
   if (dataView.getUint32(0) !== 0x89504e47) {
     console.error('Not a valid PNG file')
     return {}
   }
 
-  // Start searching for chunks after the PNG signature
   let offset = 8
-  let txt_chunks: Record<string, string> = {}
-  // Loop through the chunks in the PNG file
+  const txt_chunks: Record<string, string> = {}
+
   while (offset < pngData.length) {
-    // Get the length of the chunk
     const length = dataView.getUint32(offset)
-    // Get the chunk type
     const type = String.fromCharCode(...pngData.slice(offset + 4, offset + 8))
-    if (type === 'tEXt' || type == 'comf' || type === 'iTXt') {
-      // Get the keyword
+
+    if (type === 'tEXt' || type === 'comf' || type === 'iTXt') {
       let keyword_end = offset + 8
       while (pngData[keyword_end] !== 0) {
         keyword_end++
@@ -28,11 +60,48 @@ export function getFromPngBuffer(buffer: ArrayBuffer): Record<string, string> {
       const keyword = String.fromCharCode(
         ...pngData.slice(offset + 8, keyword_end)
       )
-      // Get the text
-      const contentArraySegment = pngData.slice(
-        keyword_end + 1,
-        offset + 8 + length
-      )
+
+      let textStart = keyword_end + 1
+      let isCompressed = false
+      let compressionMethod = 0
+
+      if (type === 'iTXt') {
+        const chunkEnd = offset + 8 + length
+        isCompressed = pngData[textStart] === 1
+        compressionMethod = pngData[textStart + 1]
+        textStart += 2
+
+        while (pngData[textStart] !== 0 && textStart < chunkEnd) {
+          textStart++
+        }
+        if (textStart < chunkEnd) textStart++
+
+        while (pngData[textStart] !== 0 && textStart < chunkEnd) {
+          textStart++
+        }
+        if (textStart < chunkEnd) textStart++
+      }
+
+      let contentArraySegment = pngData.slice(textStart, offset + 8 + length)
+
+      if (isCompressed) {
+        if (compressionMethod === 0) {
+          try {
+            contentArraySegment = await decompressZlib(contentArraySegment)
+          } catch (e) {
+            console.error(`Failed to decompress iTXt chunk "${keyword}":`, e)
+            offset += 12 + length
+            continue
+          }
+        } else {
+          console.warn(
+            `Unsupported compression method ${compressionMethod} for iTXt chunk "${keyword}"`
+          )
+          offset += 12 + length
+          continue
+        }
+      }
+
       const contentJson = new TextDecoder('utf-8').decode(contentArraySegment)
       txt_chunks[keyword] = contentJson
     }
@@ -42,14 +111,21 @@ export function getFromPngBuffer(buffer: ArrayBuffer): Record<string, string> {
   return txt_chunks
 }
 
-export function getFromPngFile(file: File) {
-  return new Promise<Record<string, string>>((r) => {
+export async function getFromPngFile(
+  file: File
+): Promise<Record<string, string>> {
+  return new Promise<Record<string, string>>((resolve, reject) => {
     const reader = new FileReader()
-    reader.onload = (event) => {
-      // @ts-expect-error fixme ts strict error
-      r(getFromPngBuffer(event.target.result as ArrayBuffer))
+    reader.onload = async (event) => {
+      const buffer = event.target?.result
+      if (!(buffer instanceof ArrayBuffer)) {
+        reject(new Error('Failed to read file as ArrayBuffer'))
+        return
+      }
+      const result = await getFromPngBuffer(buffer)
+      resolve(result)
     }
-
+    reader.onerror = () => reject(reader.error)
     reader.readAsArrayBuffer(file)
   })
 }
diff --git a/src/scripts/pnginfo.ts b/src/scripts/pnginfo.ts
index 97c6a9320f..d0b6ee3e4d 100644
--- a/src/scripts/pnginfo.ts
+++ b/src/scripts/pnginfo.ts
@@ -1,4 +1,5 @@
-import { LiteGraph } from '@/lib/litegraph/src/litegraph'
+import { LGraph, LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph'
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
 
 import { api } from './api'
 import { getFromAvifFile } from './metadata/avif'
@@ -18,14 +19,16 @@ export function getAvifMetadata(file: File): Promise<Record<string, string>> {
   return getFromAvifFile(file)
 }
 
-// @ts-expect-error fixme ts strict error
-function parseExifData(exifData) {
+function parseExifData(exifData: Uint8Array) {
   // Check for the correct TIFF header (0x4949 for little-endian or 0x4D4D for big-endian)
   const isLittleEndian = String.fromCharCode(...exifData.slice(0, 2)) === 'II'
 
   // Function to read 16-bit and 32-bit integers from binary data
-  // @ts-expect-error fixme ts strict error
-  function readInt(offset, isLittleEndian, length) {
+  function readInt(
+    offset: number,
+    isLittleEndian: boolean,
+    length: 2 | 4
+  ): number {
     let arr = exifData.slice(offset, offset + length)
     if (length === 2) {
       return new DataView(arr.buffer, arr.byteOffset, arr.byteLength).getUint16(
@@ -38,17 +41,16 @@ function parseExifData(exifData) {
         isLittleEndian
       )
     }
+    return 0
   }
 
   // Read the offset to the first IFD (Image File Directory)
   const ifdOffset = readInt(4, isLittleEndian, 4)
 
-  // @ts-expect-error fixme ts strict error
-  function parseIFD(offset) {
+  function parseIFD(offset: number): Record<number, string | undefined> {
     const numEntries = readInt(offset, isLittleEndian, 2)
-    const result = {}
+    const result: Record<number, string | undefined> = {}
 
-    // @ts-expect-error fixme ts strict error
     for (let i = 0; i < numEntries; i++) {
       const entryOffset = offset + 2 + i * 12
       const tag = readInt(entryOffset, isLittleEndian, 2)
@@ -61,12 +63,10 @@ function parseExifData(exifData) {
       if (type === 2) {
         // ASCII string
         value = new TextDecoder('utf-8').decode(
-          // @ts-expect-error fixme ts strict error
           exifData.subarray(valueOffset, valueOffset + numValues - 1)
         )
       }
 
-      // @ts-expect-error fixme ts strict error
       result[tag] = value
     }
 
@@ -78,13 +78,11 @@ function parseExifData(exifData) {
   return ifdData
 }
 
-// @ts-expect-error fixme ts strict error
-export function getWebpMetadata(file) {
+export function getWebpMetadata(file: File) {
   return new Promise<Record<string, string>>((r) => {
     const reader = new FileReader()
     reader.onload = (event) => {
-      // @ts-expect-error fixme ts strict error
-      const webp = new Uint8Array(event.target.result as ArrayBuffer)
+      const webp = new Uint8Array(event.target?.result as ArrayBuffer)
       const dataView = new DataView(webp.buffer)
 
       // Check that the WEBP signature is present
@@ -99,7 +97,7 @@ export function getWebpMetadata(file) {
 
       // Start searching for chunks after the WEBP signature
       let offset = 12
-      let txt_chunks = {}
+      const txt_chunks: Record<string, string> = {}
       // Loop through the chunks in the WEBP file
       while (offset < webp.length) {
         const chunk_length = dataView.getUint32(offset + 4, true)
@@ -116,19 +114,19 @@ export function getWebpMetadata(file) {
           let data = parseExifData(
             webp.slice(offset + 8, offset + 8 + chunk_length)
           )
-          for (var key in data) {
-            // @ts-expect-error fixme ts strict error
-            const value = data[key] as string
+          for (const key in data) {
+            const value = data[Number(key)]
             if (typeof value === 'string') {
               const index = value.indexOf(':')
-              // @ts-expect-error fixme ts strict error
               txt_chunks[value.slice(0, index)] = value.slice(index + 1)
             }
           }
           break
         }
 
-        offset += 8 + chunk_length
+        // RIFF spec requires odd-sized chunks to be padded with a single byte
+        // https://developers.google.com/speed/webp/docs/riff_container#riff_file_format
+        offset += 8 + chunk_length + (chunk_length % 2)
       }
 
       r(txt_chunks)
@@ -161,26 +159,42 @@ export function getLatentMetadata(file: File): Promise<Record<string, string>> {
   })
 }
 
-// @ts-expect-error fixme ts strict error
-export async function importA1111(graph, parameters) {
+interface NodeConnection {
+  node: LGraphNode
+  index: number
+}
+
+interface LoraEntry {
+  name: string
+  weight: number
+}
+
+export async function importA1111(
+  graph: LGraph,
+  parameters: string
+): Promise<void> {
   const p = parameters.lastIndexOf('\nSteps:')
   if (p > -1) {
     const embeddings = await api.getEmbeddings()
-    const opts = parameters
+    const matchResult = parameters
       .substr(p)
       .split('\n')[1]
       .match(
         new RegExp('\\s*([^:]+:\\s*([^"\\{].*?|".*?"|\\{.*?\\}))\\s*(,|$)', 'g')
       )
-      // @ts-expect-error fixme ts strict error
-      .reduce((p, n) => {
+    if (!matchResult) return
+
+    const opts: Record<string, string> = matchResult.reduce(
+      (acc: Record<string, string>, n: string) => {
         const s = n.split(':')
         if (s[1].endsWith(',')) {
           s[1] = s[1].substr(0, s[1].length - 1)
         }
-        p[s[0].trim().toLowerCase()] = s[1].trim()
-        return p
-      }, {})
+        acc[s[0].trim().toLowerCase()] = s[1].trim()
+        return acc
+      },
+      {}
+    )
     const p2 = parameters.lastIndexOf('\nNegative prompt:', p)
     if (p2 > -1) {
       let positive = parameters.substr(0, p2).trim()
@@ -194,25 +208,45 @@ export async function importA1111(graph, parameters) {
       const imageNode = LiteGraph.createNode('EmptyLatentImage')
       const vaeNode = LiteGraph.createNode('VAEDecode')
       const saveNode = LiteGraph.createNode('SaveImage')
-      // @ts-expect-error fixme ts strict error
-      let hrSamplerNode = null
-      let hrSteps = null
 
-      // @ts-expect-error fixme ts strict error
-      const ceil64 = (v) => Math.ceil(v / 64) * 64
-
-      // @ts-expect-error fixme ts strict error
-      const getWidget = (node, name) => {
-        // @ts-expect-error fixme ts strict error
-        return node.widgets.find((w) => w.name === name)
+      if (
+        !ckptNode ||
+        !clipSkipNode ||
+        !positiveNode ||
+        !negativeNode ||
+        !samplerNode ||
+        !imageNode ||
+        !vaeNode ||
+        !saveNode
+      ) {
+        console.error('Failed to create required nodes for A1111 import')
+        return
       }
 
-      // @ts-expect-error fixme ts strict error
-      const setWidgetValue = (node, name, value, isOptionPrefix?) => {
+      let hrSamplerNode: LGraphNode | null = null
+      let hrSteps: string | null = null
+
+      const ceil64 = (v: number) => Math.ceil(v / 64) * 64
+
+      function getWidget(
+        node: LGraphNode | null,
+        name: string
+      ): IBaseWidget | undefined {
+        return node?.widgets?.find((w) => w.name === name)
+      }
+
+      function setWidgetValue(
+        node: LGraphNode | null,
+        name: string,
+        value: string | number,
+        isOptionPrefix?: boolean
+      ): void {
         const w = getWidget(node, name)
+        if (!w) return
+
         if (isOptionPrefix) {
-          // @ts-expect-error fixme ts strict error
-          const o = w.options.values.find((w) => w.startsWith(value))
+          const values = w.options.values as string[] | undefined
+          const o = values?.find((v) => v.startsWith(String(value)))
           if (o) {
             w.value = o
           } else {
@@ -224,25 +258,28 @@ export async function importA1111(graph, parameters) {
         }
       }
 
-      // @ts-expect-error fixme ts strict error
-      const createLoraNodes = (clipNode, text, prevClip, prevModel) => {
-        // @ts-expect-error fixme ts strict error
-        const loras = []
-        // @ts-expect-error fixme ts strict error
-        text = text.replace(/<lora:([^:]+:[^>]+)>/g, function (m, c) {
+      function createLoraNodes(
+        clipNode: LGraphNode,
+        text: string,
+        prevClip: NodeConnection,
+        prevModel: NodeConnection,
+        targetSamplerNode: LGraphNode
+      ): { text: string; prevModel: NodeConnection; prevClip: NodeConnection } {
+        const loras: LoraEntry[] = []
+        text = text.replace(/<lora:([^:]+:[^>]+)>/g, (_m, c: string) => {
           const s = c.split(':')
           const weight = parseFloat(s[1])
           if (isNaN(weight)) {
-            console.warn('Invalid LORA', m)
+            console.warn('Invalid LORA', _m)
           } else {
             loras.push({ name: s[0], weight })
           }
           return ''
         })
 
-        // @ts-expect-error fixme ts strict error
         for (const l of loras) {
           const loraNode = LiteGraph.createNode('LoraLoader')
+          if (!loraNode) continue
           graph.add(loraNode)
           setWidgetValue(loraNode, 'lora_name', l.name, true)
           setWidgetValue(loraNode, 'strength_model', l.weight)
@@ -254,8 +291,7 @@ export async function importA1111(graph, parameters) {
         }
 
         prevClip.node.connect(1, clipNode, 0)
-        prevModel.node.connect(0, samplerNode, 0)
-        // @ts-expect-error fixme ts strict error
+        prevModel.node.connect(0, targetSamplerNode, 0)
         if (hrSamplerNode) {
           prevModel.node.connect(0, hrSamplerNode, 0)
         }
@@ -263,8 +299,7 @@ export async function importA1111(graph, parameters) {
         return { text, prevModel, prevClip }
       }
 
-      // @ts-expect-error fixme ts strict error
-      const replaceEmbeddings = (text) => {
+      function replaceEmbeddings(text: string): string {
         if (!embeddings.length) return text
         return text.replaceAll(
           new RegExp(
@@ -279,8 +314,7 @@ export async function importA1111(graph, parameters) {
         )
       }
 
-      // @ts-expect-error fixme ts strict error
-      const popOpt = (name) => {
+      function popOpt(name: string): string | undefined {
         const v = opts[name]
         delete opts[name]
         return v
@@ -296,43 +330,29 @@ export async function importA1111(graph, parameters) {
       graph.add(vaeNode)
       graph.add(saveNode)
 
-      // @ts-expect-error fixme ts strict error
       ckptNode.connect(1, clipSkipNode, 0)
-      // @ts-expect-error fixme ts strict error
       clipSkipNode.connect(0, positiveNode, 0)
-      // @ts-expect-error fixme ts strict error
       clipSkipNode.connect(0, negativeNode, 0)
-      // @ts-expect-error fixme ts strict error
       ckptNode.connect(0, samplerNode, 0)
-      // @ts-expect-error fixme ts strict error
       positiveNode.connect(0, samplerNode, 1)
-      // @ts-expect-error fixme ts strict error
       negativeNode.connect(0, samplerNode, 2)
-      // @ts-expect-error fixme ts strict error
       imageNode.connect(0, samplerNode, 3)
-      // @ts-expect-error fixme ts strict error
       vaeNode.connect(0, saveNode, 0)
-      // @ts-expect-error fixme ts strict error
       samplerNode.connect(0, vaeNode, 0)
-      // @ts-expect-error fixme ts strict error
       ckptNode.connect(2, vaeNode, 1)
 
-      const handlers = {
-        // @ts-expect-error fixme ts strict error
-        model(v) {
+      const handlers: Record<string, (v: string) => void> = {
+        model(v: string) {
           setWidgetValue(ckptNode, 'ckpt_name', v, true)
         },
         vae() {},
-        // @ts-expect-error fixme ts strict error
-        'cfg scale'(v) {
+        'cfg scale'(v: string) {
           setWidgetValue(samplerNode, 'cfg', +v)
         },
-        // @ts-expect-error fixme ts strict error
-        'clip skip'(v) {
-          setWidgetValue(clipSkipNode, 'stop_at_clip_layer', -v)
+        'clip skip'(v: string) {
+          setWidgetValue(clipSkipNode, 'stop_at_clip_layer', -Number(v))
         },
-        // @ts-expect-error fixme ts strict error
-        sampler(v) {
+        sampler(v: string) {
           let name = v.toLowerCase().replace('++', 'pp').replaceAll(' ', '_')
           if (name.includes('karras')) {
             name = name.replace('karras', '').replace(/_+$/, '')
@@ -341,45 +361,44 @@ export async function importA1111(graph, parameters) {
             setWidgetValue(samplerNode, 'scheduler', 'normal')
           }
           const w = getWidget(samplerNode, 'sampler_name')
-          const o = w.options.values.find(
-            // @ts-expect-error fixme ts strict error
-            (w) => w === name || w === 'sample_' + name
-          )
+          const values = w?.options.values as string[] | undefined
+          const o = values?.find((v) => v === name || v === 'sample_' + name)
           if (o) {
             setWidgetValue(samplerNode, 'sampler_name', o)
           }
         },
-        // @ts-expect-error fixme ts strict error
-        size(v) {
+        size(v: string) {
           const wxh = v.split('x')
           const w = ceil64(+wxh[0])
           const h = ceil64(+wxh[1])
           const hrUp = popOpt('hires upscale')
           const hrSz = popOpt('hires resize')
-          hrSteps = popOpt('hires steps')
+          hrSteps = popOpt('hires steps') ?? null
           let hrMethod = popOpt('hires upscaler')
 
           setWidgetValue(imageNode, 'width', w)
           setWidgetValue(imageNode, 'height', h)
 
           if (hrUp || hrSz) {
-            let uw, uh
+            let uw: number, uh: number
             if (hrUp) {
-              uw = w * hrUp
-              uh = h * hrUp
-            } else {
+              uw = w * Number(hrUp)
+              uh = h * Number(hrUp)
+            } else if (hrSz) {
               const s = hrSz.split('x')
               uw = +s[0]
               uh = +s[1]
+            } else {
+              return
             }
 
-            let upscaleNode
-            let latentNode
+            let upscaleNode: LGraphNode | null
+            let latentNode: LGraphNode | null
 
-            if (hrMethod.startsWith('Latent')) {
+            if (hrMethod?.startsWith('Latent')) {
               latentNode = upscaleNode = LiteGraph.createNode('LatentUpscale')
+              if (!upscaleNode) return
               graph.add(upscaleNode)
-              // @ts-expect-error fixme ts strict error
               samplerNode.connect(0, upscaleNode, 0)
 
               switch (hrMethod) {
@@ -390,37 +409,40 @@ export async function importA1111(graph, parameters) {
               setWidgetValue(upscaleNode, 'upscale_method', hrMethod, true)
             } else {
               const decode = LiteGraph.createNode('VAEDecodeTiled')
+              if (!decode) return
               graph.add(decode)
-              // @ts-expect-error fixme ts strict error
               samplerNode.connect(0, decode, 0)
-              // @ts-expect-error fixme ts strict error
               ckptNode.connect(2, decode, 1)
 
               const upscaleLoaderNode =
                 LiteGraph.createNode('UpscaleModelLoader')
+              if (!upscaleLoaderNode) return
               graph.add(upscaleLoaderNode)
-              setWidgetValue(upscaleLoaderNode, 'model_name', hrMethod, true)
+              setWidgetValue(
+                upscaleLoaderNode,
+                'model_name',
+                hrMethod ?? '',
+                true
+              )
 
               const modelUpscaleNode = LiteGraph.createNode(
                 'ImageUpscaleWithModel'
               )
+              if (!modelUpscaleNode) return
               graph.add(modelUpscaleNode)
-              // @ts-expect-error fixme ts strict error
               decode.connect(0, modelUpscaleNode, 1)
-              // @ts-expect-error fixme ts strict error
               upscaleLoaderNode.connect(0, modelUpscaleNode, 0)
 
               upscaleNode = LiteGraph.createNode('ImageScale')
+              if (!upscaleNode) return
               graph.add(upscaleNode)
-              // @ts-expect-error fixme ts strict error
               modelUpscaleNode.connect(0, upscaleNode, 0)
 
-              const vaeEncodeNode = (latentNode =
-                LiteGraph.createNode('VAEEncodeTiled'))
+              const vaeEncodeNode = LiteGraph.createNode('VAEEncodeTiled')
+              if (!vaeEncodeNode) return
+              latentNode = vaeEncodeNode
               graph.add(vaeEncodeNode)
-              // @ts-expect-error fixme ts strict error
               upscaleNode.connect(0, vaeEncodeNode, 0)
-              // @ts-expect-error fixme ts strict error
               ckptNode.connect(2, vaeEncodeNode, 1)
             }
 
@@ -428,33 +450,28 @@ export async function importA1111(graph, parameters) {
             setWidgetValue(upscaleNode, 'height', ceil64(uh))
 
             hrSamplerNode = LiteGraph.createNode('KSampler')
+            if (!hrSamplerNode || !latentNode) return
             graph.add(hrSamplerNode)
-            // @ts-expect-error fixme ts strict error
             ckptNode.connect(0, hrSamplerNode, 0)
-            // @ts-expect-error fixme ts strict error
             positiveNode.connect(0, hrSamplerNode, 1)
-            // @ts-expect-error fixme ts strict error
             negativeNode.connect(0, hrSamplerNode, 2)
-            // @ts-expect-error fixme ts strict error
             latentNode.connect(0, hrSamplerNode, 3)
-            // @ts-expect-error fixme ts strict error
             hrSamplerNode.connect(0, vaeNode, 0)
           }
         },
-        // @ts-expect-error fixme ts strict error
-        steps(v) {
+        steps(v: string) {
           setWidgetValue(samplerNode, 'steps', +v)
         },
-        // @ts-expect-error fixme ts strict error
-        seed(v) {
+        seed(v: string) {
           setWidgetValue(samplerNode, 'seed', +v)
         }
       }
 
       for (const opt in opts) {
-        if (opt in handlers) {
-          // @ts-expect-error fixme ts strict error
-          handlers[opt](popOpt(opt))
+        const handler = handlers[opt]
+        if (handler) {
+          const value = popOpt(opt)
+          if (value !== undefined) handler(value)
         }
       }
 
@@ -462,27 +479,29 @@ export async function importA1111(graph, parameters) {
         setWidgetValue(
           hrSamplerNode,
           'steps',
-          hrSteps ? +hrSteps : getWidget(samplerNode, 'steps').value
+          hrSteps
+            ? +hrSteps
+            : (getWidget(samplerNode, 'steps')?.value as number)
         )
         setWidgetValue(
           hrSamplerNode,
           'cfg',
-          getWidget(samplerNode, 'cfg').value
+          getWidget(samplerNode, 'cfg')?.value as number
         )
         setWidgetValue(
           hrSamplerNode,
           'scheduler',
-          getWidget(samplerNode, 'scheduler').value
+          getWidget(samplerNode, 'scheduler')?.value as string
         )
         setWidgetValue(
           hrSamplerNode,
           'sampler_name',
-          getWidget(samplerNode, 'sampler_name').value
+          getWidget(samplerNode, 'sampler_name')?.value as string
         )
         setWidgetValue(
           hrSamplerNode,
           'denoise',
-          +(popOpt('denoising strength') || '1')
+          +(popOpt('denoising strength') ?? '1')
         )
       }
 
@@ -490,10 +509,17 @@ export async function importA1111(graph, parameters) {
         positiveNode,
         positive,
         { node: clipSkipNode, index: 0 },
-        { node: ckptNode, index: 0 }
+        { node: ckptNode, index: 0 },
+        samplerNode
       )
       positive = n.text
-      n = createLoraNodes(negativeNode, negative, n.prevClip, n.prevModel)
+      n = createLoraNodes(
+        negativeNode,
+        negative,
+        n.prevClip,
+        n.prevModel,
+        samplerNode
+      )
       negative = n.text
 
       setWidgetValue(positiveNode, 'text', replaceEmbeddings(positive))
diff --git a/src/scripts/ui.ts b/src/scripts/ui.ts
index 6a428c974e..1d51661988 100644
--- a/src/scripts/ui.ts
+++ b/src/scripts/ui.ts
@@ -1,8 +1,10 @@
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { WORKFLOW_ACCEPT_STRING } from '@/platform/workflow/core/types/formats'
-import { type StatusWsMessageStatus, type TaskItem } from '@/schemas/apiSchema'
-import { useDialogService } from '@/services/dialogService'
+import { type StatusWsMessageStatus } from '@/schemas/apiSchema'
+import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
 import { isCloud } from '@/platform/distribution/types'
+import { extractWorkflow } from '@/platform/remote/comfyui/jobs/fetchJobs'
+import type { JobListItem } from '@/platform/remote/comfyui/jobs/jobTypes'
 import { useTelemetry } from '@/platform/telemetry'
 import { useLitegraphService } from '@/services/litegraphService'
 import { useCommandStore } from '@/stores/commandStore'
@@ -28,7 +30,7 @@ type Props = {
   style?: Partial<CSSStyleDeclaration>
   for?: string
   textContent?: string
-  [key: string]: any
+  [key: string]: unknown
 }
 
 type Children = Element[] | Element | string | string[]
@@ -230,19 +232,26 @@ function dragElement(dragEl): () => void {
 }
 
 class ComfyList {
-  #type
-  #text
-  #reverse
+  private _type
+  private _text
+  private _reverse
   element: HTMLDivElement
   button?: HTMLButtonElement
 
   // @ts-expect-error fixme ts strict error
   constructor(text, type?, reverse?) {
-    this.#text = text
-    this.#type = type || text.toLowerCase()
-    this.#reverse = reverse || false
+    this._text = text
+    this._type = type || text.toLowerCase()
+    this._reverse = reverse || false
     this.element = $el('div.comfy-list') as HTMLDivElement
     this.element.style.display = 'none'
+
+    console.warn(
+      '[ComfyUI] The legacy queue/history menu is deprecated. ' +
+        'Core functionality in this menu may break at any time. ' +
+        'Issues and feature requests related to the legacy menu will not be addressed. ' +
+        'To switch to the new menu: Settings → search "Use new menu" → change from "Disabled" to "Top".'
+    )
   }
 
   get visible() {
@@ -250,7 +259,10 @@ class ComfyList {
   }
 
   async load() {
-    const items = await api.getItems(this.#type)
+    const items =
+      this._type === 'history'
+        ? { history: await api.getHistory() }
+        : await api.getQueue()
     this.element.replaceChildren(
       ...Object.keys(items).flatMap((section) => [
         $el('h4', {
@@ -258,31 +270,31 @@ class ComfyList {
         }),
         $el('div.comfy-list-items', [
           // @ts-expect-error fixme ts strict error
-          ...(this.#reverse ? items[section].reverse() : items[section]).map(
-            (item: TaskItem) => {
+          ...(this._reverse ? items[section].reverse() : items[section]).map(
+            (item: JobListItem) => {
               // Allow items to specify a custom remove action (e.g. for interrupt current prompt)
               const removeAction =
-                'remove' in item
-                  ? item.remove
+                section === 'Running'
+                  ? {
+                      name: 'Cancel',
+                      cb: () => api.interrupt(item.id)
+                    }
                   : {
                       name: 'Delete',
-                      cb: () => api.deleteItem(this.#type, item.prompt[1])
+                      cb: () => api.deleteItem(this._type, item.id)
                     }
-              return $el('div', { textContent: item.prompt[0] + ': ' }, [
+              return $el('div', { textContent: item.priority + ': ' }, [
                 $el('button', {
                   textContent: 'Load',
                   onclick: async () => {
-                    await app.loadGraphData(
-                      // @ts-expect-error fixme ts strict error
-                      item.prompt[3].extra_pnginfo.workflow,
-                      true,
-                      false
-                    )
-                    if ('outputs' in item) {
+                    const job = await api.getJobDetail(item.id)
+                    if (!job) return
+                    const workflow = await extractWorkflow(job)
+                    await app.loadGraphData(workflow, true, false)
+                    if ('outputs' in job && job.outputs) {
                       app.nodeOutputs = {}
-                      for (const [key, value] of Object.entries(item.outputs)) {
-                        const realKey = item['meta']?.[key]?.display_node ?? key
-                        app.nodeOutputs[realKey] = value
+                      for (const [key, value] of Object.entries(job.outputs)) {
+                        app.nodeOutputs[key] = value
                       }
                     }
                   }
@@ -301,9 +313,9 @@ class ComfyList {
       ]),
       $el('div.comfy-list-actions', [
         $el('button', {
-          textContent: 'Clear ' + this.#text,
+          textContent: 'Clear ' + this._text,
           onclick: async () => {
-            await api.clearItems(this.#type)
+            await api.clearItems(this._type)
             await this.load()
           }
         }),
@@ -329,7 +341,7 @@ class ComfyList {
   hide() {
     this.element.style.display = 'none'
     // @ts-expect-error fixme ts strict error
-    this.button.textContent = 'View ' + this.#text
+    this.button.textContent = 'View ' + this._text
   }
 
   toggle() {
@@ -459,7 +471,7 @@ export class ComfyUI {
               $el('button.comfy-settings-btn', {
                 textContent: '⚙️',
                 onclick: () => {
-                  useDialogService().showSettingsDialog()
+                  useSettingsDialog().show()
                 }
               }),
               $el('button.comfy-close-menu-btn', {
diff --git a/src/scripts/ui/components/asyncDialog.ts b/src/scripts/ui/components/asyncDialog.ts
index 1da1a5a4ef..30518d237c 100644
--- a/src/scripts/ui/components/asyncDialog.ts
+++ b/src/scripts/ui/components/asyncDialog.ts
@@ -1,28 +1,28 @@
 import { $el } from '../../ui'
 import { ComfyDialog } from '../dialog'
 
-export class ComfyAsyncDialog extends ComfyDialog<HTMLDialogElement> {
-  // @ts-expect-error fixme ts strict error
-  #resolve: (value: any) => void
+type DialogAction<T> = string | { value?: T; text: string }
 
-  constructor(actions?: Array<string | { value?: any; text: string }>) {
+export class ComfyAsyncDialog<
+  T = string | null
+> extends ComfyDialog<HTMLDialogElement> {
+  private _resolve: (value: T | null) => void = () => {}
+
+  constructor(actions?: Array<DialogAction<T>>) {
     super(
       'dialog.comfy-dialog.comfyui-dialog',
-      // @ts-expect-error fixme ts strict error
       actions?.map((opt) => {
-        if (typeof opt === 'string') {
-          opt = { text: opt }
-        }
+        const action = typeof opt === 'string' ? { text: opt } : opt
         return $el('button.comfyui-button', {
           type: 'button',
-          textContent: opt.text,
-          onclick: () => this.close(opt.value ?? opt.text)
-        })
+          textContent: action.text,
+          onclick: () => this.close((action.value ?? action.text) as T)
+        }) as HTMLButtonElement
       })
     )
   }
 
-  override show(html: string | HTMLElement | HTMLElement[]) {
+  override show(html: string | HTMLElement | HTMLElement[]): Promise<T | null> {
     this.element.addEventListener('close', () => {
       this.close()
     })
@@ -30,11 +30,11 @@ export class ComfyAsyncDialog extends ComfyDialog<HTMLDialogElement> {
     super.show(html)
 
     return new Promise((resolve) => {
-      this.#resolve = resolve
+      this._resolve = resolve
     })
   }
 
-  showModal(html: string | HTMLElement | HTMLElement[]) {
+  showModal(html: string | HTMLElement | HTMLElement[]): Promise<T | null> {
     this.element.addEventListener('close', () => {
       this.close()
     })
@@ -43,26 +43,26 @@ export class ComfyAsyncDialog extends ComfyDialog<HTMLDialogElement> {
     this.element.showModal()
 
     return new Promise((resolve) => {
-      this.#resolve = resolve
+      this._resolve = resolve
     })
   }
 
-  override close(result = null) {
-    this.#resolve(result)
+  override close(result: T | null = null) {
+    this._resolve(result)
     this.element.close()
     super.close()
   }
 
-  static async prompt({
+  static async prompt<U = string>({
     title = null,
     message,
     actions
   }: {
     title: string | null
     message: string
-    actions: Array<string | { value?: any; text: string }>
-  }) {
-    const dialog = new ComfyAsyncDialog(actions)
+    actions: Array<DialogAction<U>>
+  }): Promise<U | null> {
+    const dialog = new ComfyAsyncDialog<U>(actions)
     const content = [$el('span', message)]
     if (title) {
       content.unshift($el('h3', title))
diff --git a/src/scripts/ui/components/button.ts b/src/scripts/ui/components/button.ts
index 7a4aae6b67..7d3bc116cd 100644
--- a/src/scripts/ui/components/button.ts
+++ b/src/scripts/ui/components/button.ts
@@ -21,8 +21,8 @@ type ComfyButtonProps = {
 }
 
 export class ComfyButton implements ComfyComponent<HTMLElement> {
-  #over = 0
-  #popupOpen = false
+  private _over = 0
+  private _popupOpen = false
   isOver = false
   iconElement = $el('i.mdi')
   contentElement = $el('span')
@@ -123,7 +123,7 @@ export class ComfyButton implements ComfyComponent<HTMLElement> {
     this.element.addEventListener('click', (e) => {
       if (this.popup) {
         // we are either a touch device or triggered by click not hover
-        if (!this.#over) {
+        if (!this._over) {
           this.popup.toggle()
         }
       }
@@ -157,7 +157,7 @@ export class ComfyButton implements ComfyComponent<HTMLElement> {
       internalClasses.push('disabled')
     }
     if (this.popup) {
-      if (this.#popupOpen) {
+      if (this._popupOpen) {
         internalClasses.push('popup-open')
       } else {
         internalClasses.push('popup-closed')
@@ -172,16 +172,16 @@ export class ComfyButton implements ComfyComponent<HTMLElement> {
     if (mode === 'hover') {
       for (const el of [this.element, this.popup.element]) {
         el.addEventListener('mouseenter', () => {
-          this.popup.open = !!++this.#over
+          this.popup.open = !!++this._over
         })
         el.addEventListener('mouseleave', () => {
-          this.popup.open = !!--this.#over
+          this.popup.open = !!--this._over
         })
       }
     }
 
     popup.addEventListener('change', () => {
-      this.#popupOpen = popup.open
+      this._popupOpen = popup.open
       this.updateClasses()
     })
 
diff --git a/src/scripts/ui/components/popup.ts b/src/scripts/ui/components/popup.ts
index 04bb38149c..3896a075dd 100644
--- a/src/scripts/ui/components/popup.ts
+++ b/src/scripts/ui/components/popup.ts
@@ -54,9 +54,9 @@ export class ComfyPopup extends EventTarget {
     this.open = prop(this, 'open', false, (v, o) => {
       if (v === o) return
       if (v) {
-        this.#show()
+        this._show()
       } else {
-        this.#hide()
+        this._hide()
       }
     })
   }
@@ -65,24 +65,24 @@ export class ComfyPopup extends EventTarget {
     this.open = !this.open
   }
 
-  #hide() {
+  private _hide() {
     this.element.classList.remove('open')
     window.removeEventListener('resize', this.update)
-    window.removeEventListener('click', this.#clickHandler, { capture: true })
-    window.removeEventListener('keydown', this.#escHandler, { capture: true })
+    window.removeEventListener('click', this._clickHandler, { capture: true })
+    window.removeEventListener('keydown', this._escHandler, { capture: true })
 
     this.dispatchEvent(new CustomEvent('close'))
     this.dispatchEvent(new CustomEvent('change'))
   }
 
-  #show() {
+  private _show() {
     this.element.classList.add('open')
     this.update()
 
     window.addEventListener('resize', this.update)
-    window.addEventListener('click', this.#clickHandler, { capture: true })
+    window.addEventListener('click', this._clickHandler, { capture: true })
     if (this.closeOnEscape) {
-      window.addEventListener('keydown', this.#escHandler, { capture: true })
+      window.addEventListener('keydown', this._escHandler, { capture: true })
     }
 
     this.dispatchEvent(new CustomEvent('open'))
@@ -90,7 +90,7 @@ export class ComfyPopup extends EventTarget {
   }
 
   // @ts-expect-error fixme ts strict error
-  #escHandler = (e) => {
+  private _escHandler = (e) => {
     if (e.key === 'Escape') {
       this.open = false
       e.preventDefault()
@@ -99,7 +99,7 @@ export class ComfyPopup extends EventTarget {
   }
 
   // @ts-expect-error fixme ts strict error
-  #clickHandler = (e) => {
+  private _clickHandler = (e) => {
     /** @type {any} */
     const target = e.target
     if (
diff --git a/src/scripts/ui/dialog.ts b/src/scripts/ui/dialog.ts
index 23d43c2bd3..51070ea852 100644
--- a/src/scripts/ui/dialog.ts
+++ b/src/scripts/ui/dialog.ts
@@ -4,13 +4,12 @@ export class ComfyDialog<
   T extends HTMLElement = HTMLElement
 > extends EventTarget {
   element: T
-  // @ts-expect-error fixme ts strict error
-  textElement: HTMLElement
-  #buttons: HTMLButtonElement[] | null
+  textElement!: HTMLElement
+  private _buttons: HTMLButtonElement[] | null
 
-  constructor(type = 'div', buttons = null) {
+  constructor(type = 'div', buttons: HTMLButtonElement[] | null = null) {
     super()
-    this.#buttons = buttons
+    this._buttons = buttons
     this.element = $el(type + '.comfy-modal', { parent: document.body }, [
       $el('div.comfy-modal-content', [
         $el('p', { $: (p) => (this.textElement = p) }),
@@ -21,7 +20,7 @@ export class ComfyDialog<
 
   createButtons() {
     return (
-      this.#buttons ?? [
+      this._buttons ?? [
         $el('button', {
           type: 'button',
           textContent: 'Close',
@@ -35,8 +34,7 @@ export class ComfyDialog<
     this.element.style.display = 'none'
   }
 
-  // @ts-expect-error fixme ts strict error
-  show(html) {
+  show(html: string | HTMLElement | HTMLElement[]): void {
     if (typeof html === 'string') {
       this.textElement.innerHTML = html
     } else {
diff --git a/src/scripts/ui/draggableList.ts b/src/scripts/ui/draggableList.ts
index 895d153b7a..124f5a46a4 100644
--- a/src/scripts/ui/draggableList.ts
+++ b/src/scripts/ui/draggableList.ts
@@ -72,6 +72,8 @@ export class DraggableList extends EventTarget {
     this.off.push(this.on(document, 'mouseup', this.dragEnd))
     // @ts-expect-error fixme ts strict error
     this.off.push(this.on(document, 'touchend', this.dragEnd))
+    // @ts-expect-error fixme ts strict error
+    this.off.push(this.on(document, 'pointercancel', this.dragEnd))
   }
 
   getAllItems() {
@@ -113,6 +115,8 @@ export class DraggableList extends EventTarget {
 
   // @ts-expect-error fixme ts strict error
   dragStart(e) {
+    if (e.button > 0) return
+
     if (e.target.classList.contains(this.handleClass)) {
       this.draggableItem = e.target.closest(this.itemSelector)
     }
@@ -310,18 +314,22 @@ export class DraggableList extends EventTarget {
   unsetDraggableItem() {
     this.draggableItem.style = null
     this.draggableItem.classList.remove('is-draggable')
-    this.draggableItem.classList.add('is-idle')
     this.draggableItem = null
   }
 
   unsetItemState() {
-    this.getIdleItems().forEach((item) => {
-      // @ts-expect-error fixme ts strict error
+    this.getIdleItems().forEach((item: HTMLElement) => {
       delete item.dataset.isAbove
-      // @ts-expect-error fixme ts strict error
       delete item.dataset.isToggled
-      // @ts-expect-error fixme ts strict error
       item.style.transform = ''
+
+      // Defer re-adding is-idle (which enables CSS transitions) until after
+      // the browser paints items in their final positions. Without this,
+      // the transition animates the stale drag transform.
+      item.classList.remove('is-idle')
+      requestAnimationFrame(() => {
+        item.classList.add('is-idle')
+      })
     })
   }
 
diff --git a/src/scripts/ui/menu/menu.css b/src/scripts/ui/menu/menu.css
index 6013312322..afb4f4e474 100644
--- a/src/scripts/ui/menu/menu.css
+++ b/src/scripts/ui/menu/menu.css
@@ -116,5 +116,3 @@
   padding: 4px 10px;
   border-radius: 0;
 }
-
-
diff --git a/src/scripts/widgets.ts b/src/scripts/widgets.ts
index 50dabe011f..517e6f0e83 100644
--- a/src/scripts/widgets.ts
+++ b/src/scripts/widgets.ts
@@ -8,6 +8,8 @@ import type {
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { dynamicWidgets } from '@/core/graph/widgets/dynamicWidgets'
 import { useBooleanWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useBooleanWidget'
+import { useBoundingBoxWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useBoundingBoxWidget'
+import { useCurveWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useCurveWidget'
 import { useChartWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useChartWidget'
 import { useColorWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useColorWidget'
 import { useComboWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useComboWidget'
@@ -17,6 +19,7 @@ import { useImageCompareWidget } from '@/renderer/extensions/vueNodes/widgets/co
 import { useImageUploadWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useImageUploadWidget'
 import { useIntWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useIntWidget'
 import { useMarkdownWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useMarkdownWidget'
+import { usePainterWidget } from '@/renderer/extensions/vueNodes/widgets/composables/usePainterWidget'
 import { useStringWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useStringWidget'
 import { useTextareaWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useTextareaWidget'
 import { transformInputSpecV1ToV2 } from '@/schemas/nodeDef/migration'
@@ -139,6 +142,9 @@ export function addValueControlWidgets(
     'Allows the linked widget to be changed automatically, for example randomizing the noise seed.'
   valueControl[IS_CONTROL_WIDGET] = true
   updateControlWidgetLabel(valueControl)
+  Object.defineProperty(valueControl, 'disabled', {
+    get: () => targetWidget.computedDisabled
+  })
   const widgets: [IComboWidget, ...IStringWidget[]] = [valueControl]
 
   const isCombo = isComboWidget(targetWidget)
@@ -160,6 +166,9 @@ export function addValueControlWidgets(
     updateControlWidgetLabel(comboFilter)
     comboFilter.tooltip =
       "Allows for filtering the list of values when changing the value via the control generate mode. Allows for RegEx matches in the format /abc/ to only filter to values containing 'abc'."
+    Object.defineProperty(comboFilter, 'disabled', {
+      get: () => targetWidget.computedDisabled
+    })
 
     widgets.push(comboFilter)
   }
@@ -266,8 +275,8 @@ export function addValueControlWidgets(
     }
   }
 
-  valueControl.beforeQueued = () => {
-    if (controlValueRunBefore()) {
+  valueControl.beforeQueued = ({ isPartialExecution } = {}) => {
+    if (!isPartialExecution && controlValueRunBefore()) {
       // Don't run on first execution
       if (valueControl[HAS_EXECUTED]) {
         applyWidgetControl()
@@ -276,8 +285,8 @@ export function addValueControlWidgets(
     valueControl[HAS_EXECUTED] = true
   }
 
-  valueControl.afterQueued = () => {
-    if (!controlValueRunBefore()) {
+  valueControl.afterQueued = ({ isPartialExecution } = {}) => {
+    if (!isPartialExecution && !controlValueRunBefore()) {
       applyWidgetControl()
     }
   }
@@ -295,9 +304,12 @@ export const ComfyWidgets = {
   IMAGEUPLOAD: useImageUploadWidget(),
   COLOR: transformWidgetConstructorV2ToV1(useColorWidget()),
   IMAGECOMPARE: transformWidgetConstructorV2ToV1(useImageCompareWidget()),
+  BOUNDING_BOX: transformWidgetConstructorV2ToV1(useBoundingBoxWidget()),
   CHART: transformWidgetConstructorV2ToV1(useChartWidget()),
   GALLERIA: transformWidgetConstructorV2ToV1(useGalleriaWidget()),
+  PAINTER: transformWidgetConstructorV2ToV1(usePainterWidget()),
   TEXTAREA: transformWidgetConstructorV2ToV1(useTextareaWidget()),
+  CURVE: transformWidgetConstructorV2ToV1(useCurveWidget()),
   ...dynamicWidgets
 } as const
 
diff --git a/src/services/README.md b/src/services/README.md
index 12226587ab..f01a6e8daa 100644
--- a/src/services/README.md
+++ b/src/services/README.md
@@ -61,42 +61,43 @@ The following table lists ALL services in the system as of 2025-09-01:
 
 ### Main Services
 
-| Service | Description | Category |
-|---------|-------------|----------|
-| audioService.ts | Manages audio recording and WAV encoding functionality | Media |
-| autoQueueService.ts | Manages automatic queue execution | Execution |
-| colorPaletteService.ts | Handles color palette management and customization | UI |
-| comfyManagerService.ts | Manages ComfyUI application packages and updates | Manager |
-| comfyRegistryService.ts | Handles registration and discovery of ComfyUI extensions | Registry |
-| customerEventsService.ts | Handles customer event tracking and audit logs | Analytics |
-| dialogService.ts | Provides dialog and modal management | UI |
-| extensionService.ts | Manages extension registration and lifecycle | Extensions |
-| keybindingService.ts | Handles keyboard shortcuts and keybindings | Input |
-| litegraphService.ts | Provides utilities for working with the LiteGraph library | Graph |
-| load3dService.ts | Manages 3D model loading and visualization | 3D |
-| mediaCacheService.ts | Manages media file caching with blob storage and cleanup | Media |
-| newUserService.ts | Handles new user initialization and onboarding | System |
-| nodeHelpService.ts | Provides node documentation and help | Nodes |
-| nodeOrganizationService.ts | Handles node organization and categorization | Nodes |
-| nodeSearchService.ts | Implements node search functionality | Search |
-| releaseService.ts | Manages application release information and updates | System |
-| subgraphService.ts | Handles subgraph operations and navigation | Graph |
-| workflowService.ts | Handles workflow operations (save, load, execute) | Workflows |
+| Service                    | Description                                               | Category   |
+| -------------------------- | --------------------------------------------------------- | ---------- |
+| audioService.ts            | Manages audio recording and WAV encoding functionality    | Media      |
+| autoQueueService.ts        | Manages automatic queue execution                         | Execution  |
+| colorPaletteService.ts     | Handles color palette management and customization        | UI         |
+| comfyManagerService.ts     | Manages ComfyUI application packages and updates          | Manager    |
+| comfyRegistryService.ts    | Handles registration and discovery of ComfyUI extensions  | Registry   |
+| customerEventsService.ts   | Handles customer event tracking and audit logs            | Analytics  |
+| dialogService.ts           | Provides dialog and modal management                      | UI         |
+| extensionService.ts        | Manages extension registration and lifecycle              | Extensions |
+| litegraphService.ts        | Provides utilities for working with the LiteGraph library | Graph      |
+| load3dService.ts           | Manages 3D model loading and visualization                | 3D         |
+| mediaCacheService.ts       | Manages media file caching with blob storage and cleanup  | Media      |
+| newUserService.ts          | Handles new user initialization and onboarding            | System     |
+| nodeHelpService.ts         | Provides node documentation and help                      | Nodes      |
+| nodeOrganizationService.ts | Handles node organization and categorization              | Nodes      |
+| nodeSearchService.ts       | Implements node search functionality                      | Search     |
+| releaseService.ts          | Manages application release information and updates       | System     |
+| subgraphService.ts         | Handles subgraph operations and navigation                | Graph      |
+| workflowService.ts         | Handles workflow operations (save, load, execute)         | Workflows  |
 
 ### Gateway Services
+
 Located in `services/gateway/`:
 
-| Service | Description |
-|---------|-------------|
+| Service                  | Description                            |
+| ------------------------ | -------------------------------------- |
 | registrySearchGateway.ts | Gateway for registry search operations |
 
 ### Provider Services
+
 Located in `services/providers/`:
 
-| Service | Description |
-|---------|-------------|
-| algoliaSearchProvider.ts | Implements search functionality using Algolia |
-| registrySearchProvider.ts | Provides registry search capabilities |
+| Service                   | Description                                   |
+| ------------------------- | --------------------------------------------- |
+| algoliaSearchProvider.ts  | Implements search functionality using Algolia |
+| registrySearchProvider.ts | Provides registry search capabilities         |
 
 ## Service Development Guidelines
 
@@ -135,7 +136,8 @@ export class NodeSearchService {
       id: 'input',
       name: 'Input Type',
       invokeSequence: 'i',
-      getItemOptions: (node) => Object.values(node.inputs).map((input) => input.type),
+      getItemOptions: (node) =>
+        Object.values(node.inputs).map((input) => input.type),
       fuseOptions
     })
     // Additional filters initialized similarly...
@@ -195,15 +197,15 @@ export function useNodeSearchService(initialData: ComfyNodeDefImpl[]) {
 
 ### Service Pattern Comparison
 
-| Aspect | Class-Based Services | Composable-Style Services | Bootstrap Services | Shared State Services |
-|--------|---------------------|---------------------------|-------------------|---------------------|
-| **Count** | 4 services | 18+ services | 1 service | 1 service |
-| **Export Pattern** | `export class ServiceName` | `export function useServiceName()` | `export function setupX()` | `export function serviceFactory()` |
-| **Instantiation** | `new ServiceName(data)` | `useServiceName()` | Direct function call | Direct function call |
-| **Best For** | Complex data structures, search algorithms, expensive initialization | Vue integration, API calls, reactive state | One-time app initialization | Singleton-like shared state |
-| **State Management** | Encapsulated private/public properties | External stores + reactive refs | Event listeners, side effects | Module-level state |
-| **Vue Integration** | Manual integration needed | Native reactivity support | N/A | Varies |
-| **Examples** | `NodeSearchService`, `Load3dService` | `workflowService`, `dialogService` | `autoQueueService` | `newUserService` |
+| Aspect               | Class-Based Services                                                 | Composable-Style Services                  | Bootstrap Services            | Shared State Services              |
+| -------------------- | -------------------------------------------------------------------- | ------------------------------------------ | ----------------------------- | ---------------------------------- |
+| **Count**            | 4 services                                                           | 18+ services                               | 1 service                     | 1 service                          |
+| **Export Pattern**   | `export class ServiceName`                                           | `export function useServiceName()`         | `export function setupX()`    | `export function serviceFactory()` |
+| **Instantiation**    | `new ServiceName(data)`                                              | `useServiceName()`                         | Direct function call          | Direct function call               |
+| **Best For**         | Complex data structures, search algorithms, expensive initialization | Vue integration, API calls, reactive state | One-time app initialization   | Singleton-like shared state        |
+| **State Management** | Encapsulated private/public properties                               | External stores + reactive refs            | Event listeners, side effects | Module-level state                 |
+| **Vue Integration**  | Manual integration needed                                            | Native reactivity support                  | N/A                           | Varies                             |
+| **Examples**         | `NodeSearchService`, `Load3dService`                                 | `workflowService`, `dialogService`         | `autoQueueService`            | `newUserService`                   |
 
 ### Decision Criteria
 
@@ -218,6 +220,7 @@ When choosing between these approaches, consider:
 7. **Singleton Behavior**: Shared state services provide module-level state that persists across multiple function calls
 
 **Current Usage Patterns:**
+
 - **Class-based services (4)**: Complex data processing, search algorithms, expensive initialization
 - **Composable-style services (18+)**: UI interactions, API calls, store integration, reactive state management
 - **Bootstrap services (1)**: One-time application initialization and event handler setup
@@ -280,8 +283,8 @@ export function useCachedService() {
 
     // Perform new request
     const requestPromise = fetch(`/api/${key}`)
-      .then(response => response.json())
-      .then(data => {
+      .then((response) => response.json())
+      .then((data) => {
         cache.set(key, data)
         pendingRequests.delete(key)
         return data
@@ -303,9 +306,13 @@ export function useNodeFactory() {
     // Create node based on type and configuration
     switch (type) {
       case 'basic':
-        return { /* basic node implementation */ }
+        return {
+          /* basic node implementation */
+        }
       case 'complex':
-        return { /* complex node implementation */ }
+        return {
+          /* complex node implementation */
+        }
       default:
         throw new Error(`Unknown node type: ${type}`)
     }
@@ -318,11 +325,7 @@ export function useNodeFactory() {
 ### Facade Pattern
 
 ```typescript
-export function useWorkflowService(
-  apiService,
-  graphService,
-  storageService
-) {
+export function useWorkflowService(apiService, graphService, storageService) {
   // Provides a simple interface to complex subsystems
   async function saveWorkflow(name: string) {
     const graphData = graphService.serializeGraph()
@@ -341,19 +344,24 @@ Services in ComfyUI can be tested effectively using different approaches dependi
 ### Testing Class-Based Services
 
 **Setup Requirements:**
+
 ```typescript
 // Manual instantiation required
-const mockData = [/* test data */]
+const mockData = [
+  /* test data */
+]
 const service = new NodeSearchService(mockData)
 ```
 
 **Characteristics:**
+
 - Requires constructor argument preparation
 - State is encapsulated within the class instance
 - Direct method calls on the instance
 - Good isolation - each test gets a fresh instance
 
 **Example:**
+
 ```typescript
 describe('NodeSearchService', () => {
   let service: NodeSearchService
@@ -379,18 +387,21 @@ describe('NodeSearchService', () => {
 ### Testing Composable-Style Services
 
 **Setup Requirements:**
+
 ```typescript
 // Direct function call, no instantiation
 const { saveWorkflow, loadWorkflow } = useWorkflowService()
 ```
 
 **Characteristics:**
+
 - No instantiation needed
 - Integrates naturally with Vue Test Utils
 - Easy mocking of reactive dependencies
 - External store dependencies need mocking
 
 **Example:**
+
 ```typescript
 describe('useWorkflowService', () => {
   beforeEach(() => {
@@ -422,6 +433,7 @@ describe('useWorkflowService', () => {
 ### Testing Bootstrap Services
 
 **Focus on Setup Behavior:**
+
 ```typescript
 describe('autoQueueService', () => {
   beforeEach(() => {
@@ -442,7 +454,10 @@ describe('autoQueueService', () => {
   test('should setup event listeners', () => {
     setupAutoQueueHandler()
 
-    expect(mockApi.addEventListener).toHaveBeenCalledWith('graphChanged', expect.any(Function))
+    expect(mockApi.addEventListener).toHaveBeenCalledWith(
+      'graphChanged',
+      expect.any(Function)
+    )
   })
 
   test('should handle graph changes when auto-queue enabled', () => {
@@ -460,6 +475,7 @@ describe('autoQueueService', () => {
 ### Testing Shared State Services
 
 **Focus on Shared State Behavior:**
+
 ```typescript
 describe('newUserService', () => {
   beforeEach(() => {
@@ -493,6 +509,7 @@ describe('newUserService', () => {
 ### Common Testing Patterns
 
 **Mocking External Dependencies:**
+
 ```typescript
 // Mock stores
 vi.mock('@/stores/settingStore', () => ({
@@ -518,6 +535,7 @@ vi.mock('vue', () => ({
 ```
 
 **Async Testing:**
+
 ```typescript
 test('should handle async operations', async () => {
   const service = useMyService()
@@ -527,10 +545,7 @@ test('should handle async operations', async () => {
 
 test('should handle concurrent requests', async () => {
   const service = useMyService()
-  const promises = [
-    service.loadData('key1'),
-    service.loadData('key2')
-  ]
+  const promises = [service.loadData('key1'), service.loadData('key2')]
 
   const results = await Promise.all(promises)
   expect(results).toHaveLength(2)
@@ -538,6 +553,7 @@ test('should handle concurrent requests', async () => {
 ```
 
 **Error Handling:**
+
 ```typescript
 test('should handle service errors gracefully', async () => {
   const service = useMyService()
@@ -567,5 +583,6 @@ test('should provide meaningful error messages', async () => {
 5. **Test Async Properly**: Use `async/await` and proper promise handling
 
 For more detailed information about the service layer pattern and its applications, refer to:
+
 - [Service Layer Pattern](https://en.wikipedia.org/wiki/Service_layer_pattern)
-- [Service-Orientation](https://en.wikipedia.org/wiki/Service-orientation)
\ No newline at end of file
+- [Service-Orientation](https://en.wikipedia.org/wiki/Service-orientation)
diff --git a/tests-ui/tests/audioService.test.ts b/src/services/audioService.test.ts
similarity index 97%
rename from tests-ui/tests/audioService.test.ts
rename to src/services/audioService.test.ts
index 81fc46d9b2..b5bf672c38 100644
--- a/tests-ui/tests/audioService.test.ts
+++ b/src/services/audioService.test.ts
@@ -1,9 +1,7 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-import {
-  type AudioRecordingError,
-  useAudioService
-} from '@/services/audioService'
+import { useAudioService } from '@/services/audioService'
+import type { AudioRecordingError } from '@/services/audioService'
 
 const mockRegister = vi.hoisted(() => vi.fn())
 const mockConnect = vi.hoisted(() => vi.fn())
@@ -106,7 +104,7 @@ describe('useAudioService', () => {
       const mockTrack2 = { stop: vi.fn() }
       const mockStream = {
         getTracks: vi.fn().mockReturnValue([mockTrack1, mockTrack2])
-      } as unknown as MediaStream
+      } as Partial<MediaStream> as MediaStream
 
       service.stopAllTracks(mockStream)
 
@@ -122,7 +120,7 @@ describe('useAudioService', () => {
     it('should handle stream with no tracks', () => {
       const mockStream = {
         getTracks: vi.fn().mockReturnValue([])
-      } as unknown as MediaStream
+      } as Partial<MediaStream> as MediaStream
 
       expect(() => service.stopAllTracks(mockStream)).not.toThrow()
       expect(mockStream.getTracks).toHaveBeenCalledTimes(1)
@@ -137,7 +135,7 @@ describe('useAudioService', () => {
       }
       const mockStream = {
         getTracks: vi.fn().mockReturnValue([mockTrack1, mockTrack2])
-      } as unknown as MediaStream
+      } as Partial<MediaStream> as MediaStream
 
       expect(() => service.stopAllTracks(mockStream)).toThrow()
       expect(mockTrack1.stop).toHaveBeenCalledTimes(1)
diff --git a/src/services/autoQueueService.ts b/src/services/autoQueueService.ts
index ffbc5dede4..6a62a9f0ec 100644
--- a/src/services/autoQueueService.ts
+++ b/src/services/autoQueueService.ts
@@ -1,6 +1,7 @@
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
 import {
+  isInstantRunningMode,
   useQueuePendingTaskCountStore,
   useQueueSettingsStore
 } from '@/stores/queueStore'
@@ -29,7 +30,7 @@ export function setupAutoQueueHandler() {
       internalCount = queueCountStore.count
       if (!internalCount && !app.lastExecutionError) {
         if (
-          queueSettingsStore.mode === 'instant' ||
+          isInstantRunningMode(queueSettingsStore.mode) ||
           (queueSettingsStore.mode === 'change' && graphHasChanged)
         ) {
           graphHasChanged = false
diff --git a/src/services/colorPaletteService.ts b/src/services/colorPaletteService.ts
index 8a9fa52c66..cf0c1e0bcf 100644
--- a/src/services/colorPaletteService.ts
+++ b/src/services/colorPaletteService.ts
@@ -107,8 +107,7 @@ export const useColorPaletteService = () => {
     for (const dataType of nodeDefStore.nodeDataTypes) {
       const cssVar = `color-datatype-${dataType}`
 
-      const valueMaybe =
-        linkColorPalette[dataType as unknown as keyof Colors['node_slot']]
+      const valueMaybe = linkColorPalette[dataType as keyof Colors['node_slot']]
       if (valueMaybe) {
         rootStyle.setProperty(`--${cssVar}`, valueMaybe)
       } else {
@@ -161,22 +160,25 @@ export const useColorPaletteService = () => {
     }
     app.canvas._pattern = undefined
 
-    for (const [key, value] of Object.entries(palette)) {
-      if (Object.prototype.hasOwnProperty.call(LiteGraph, key)) {
-        if (key === 'NODE_DEFAULT_SHAPE' && typeof value === 'string') {
-          console.warn(
-            `litegraph_base.NODE_DEFAULT_SHAPE only accepts [${[
-              LiteGraph.BOX_SHAPE,
-              LiteGraph.ROUND_SHAPE,
-              LiteGraph.CARD_SHAPE
-            ].join(', ')}] but got ${value}`
-          )
-          LiteGraph.NODE_DEFAULT_SHAPE = LiteGraph.ROUND_SHAPE
-        } else {
-          ;(LiteGraph as any)[key] = value
-        }
-      }
+    if (typeof palette.NODE_DEFAULT_SHAPE === 'string')
+      console.warn(
+        `litegraph_base.NODE_DEFAULT_SHAPE only accepts [${[
+          LiteGraph.BOX_SHAPE,
+          LiteGraph.ROUND_SHAPE,
+          LiteGraph.CARD_SHAPE
+        ].join(', ')}] but got ${palette.NODE_DEFAULT_SHAPE}`
+      )
+
+    const default_shape =
+      typeof palette.NODE_DEFAULT_SHAPE === 'string'
+        ? LiteGraph.ROUND_SHAPE
+        : palette.NODE_DEFAULT_SHAPE
+    const sanitizedPalette: Partial<typeof LiteGraph> = {
+      ...palette,
+      NODE_DEFAULT_SHAPE: default_shape
     }
+
+    Object.assign(LiteGraph, sanitizedPalette)
   }
 
   /**
@@ -185,7 +187,7 @@ export const useColorPaletteService = () => {
    * @param schema - The Zod schema object to analyze.
    * @returns Array of optional key names.
    */
-  const getOptionalKeys = (schema: z.ZodObject<any, any>) => {
+  const getOptionalKeys = (schema: z.ZodObject<z.ZodRawShape>) => {
     const optionalKeys: string[] = []
     const shape = schema.shape
 
@@ -222,10 +224,7 @@ export const useColorPaletteService = () => {
 
     const backgroundImage = settingStore.get('Comfy.Canvas.BackgroundImage')
     if (backgroundImage) {
-      rootStyle.setProperty(
-        '--bg-img',
-        `url('${backgroundImage}') no-repeat center /cover`
-      )
+      rootStyle.setProperty('--bg-img', `url('${backgroundImage}')`)
     } else {
       rootStyle.removeProperty('--bg-img')
     }
diff --git a/tests-ui/tests/services/customerEventsService.test.ts b/src/services/customerEventsService.test.ts
similarity index 99%
rename from tests-ui/tests/services/customerEventsService.test.ts
rename to src/services/customerEventsService.test.ts
index abc54332ab..bf1c6b1002 100644
--- a/tests-ui/tests/services/customerEventsService.test.ts
+++ b/src/services/customerEventsService.test.ts
@@ -31,8 +31,8 @@ vi.mock('@/stores/firebaseAuthStore', () => ({
   useFirebaseAuthStore: vi.fn(() => mockFirebaseAuthStore)
 }))
 
-vi.mock('vue-i18n', () => ({
-  useI18n: vi.fn(() => mockI18n)
+vi.mock('@/i18n', () => ({
+  d: mockI18n.d
 }))
 
 vi.mock('@/utils/typeGuardUtil', () => ({
diff --git a/src/services/customerEventsService.ts b/src/services/customerEventsService.ts
index 830b2fc2d1..326596de81 100644
--- a/src/services/customerEventsService.ts
+++ b/src/services/customerEventsService.ts
@@ -1,9 +1,9 @@
 import type { AxiosError, AxiosResponse } from 'axios'
 import axios from 'axios'
 import { ref, watch } from 'vue'
-import { useI18n } from 'vue-i18n'
 
 import { getComfyApiBaseUrl } from '@/config/comfyApi'
+import { d } from '@/i18n'
 import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
 import type { components, operations } from '@/types/comfyRegistryTypes'
 import { isAbortError } from '@/utils/typeGuardUtil'
@@ -33,7 +33,6 @@ const customerApiClient = axios.create({
 export const useCustomerEventsService = () => {
   const isLoading = ref(false)
   const error = ref<string | null>(null)
-  const { d } = useI18n()
 
   watch(
     () => getComfyApiBaseUrl(),
@@ -122,7 +121,7 @@ export const useCustomerEventsService = () => {
       .join(' ')
   }
 
-  function formatJsonValue(value: any) {
+  function formatJsonValue(value: unknown) {
     if (typeof value === 'number') {
       // Format numbers with commas and decimals if needed
       return value.toLocaleString()
diff --git a/src/services/dialogService.ts b/src/services/dialogService.ts
index c8a97d7173..a6d7249c55 100644
--- a/src/services/dialogService.ts
+++ b/src/services/dialogService.ts
@@ -1,40 +1,33 @@
 import { merge } from 'es-toolkit/compat'
 import type { Component } from 'vue'
 
-import ApiNodesSignInContent from '@/components/dialog/content/ApiNodesSignInContent.vue'
-import MissingNodesContent from '@/components/dialog/content/MissingNodesContent.vue'
-import MissingNodesFooter from '@/components/dialog/content/MissingNodesFooter.vue'
-import MissingNodesHeader from '@/components/dialog/content/MissingNodesHeader.vue'
 import ConfirmationDialogContent from '@/components/dialog/content/ConfirmationDialogContent.vue'
 import ErrorDialogContent from '@/components/dialog/content/ErrorDialogContent.vue'
-import MissingModelsWarning from '@/components/dialog/content/MissingModelsWarning.vue'
 import PromptDialogContent from '@/components/dialog/content/PromptDialogContent.vue'
-import SignInContent from '@/components/dialog/content/SignInContent.vue'
-import TopUpCreditsDialogContent from '@/components/dialog/content/TopUpCreditsDialogContent.vue'
-import UpdatePasswordContent from '@/components/dialog/content/UpdatePasswordContent.vue'
-import ComfyOrgHeader from '@/components/dialog/header/ComfyOrgHeader.vue'
-import SettingDialogHeader from '@/components/dialog/header/SettingDialogHeader.vue'
+import TopUpCreditsDialogContentLegacy from '@/components/dialog/content/TopUpCreditsDialogContentLegacy.vue'
+import TopUpCreditsDialogContentWorkspace from '@/platform/workspace/components/TopUpCreditsDialogContentWorkspace.vue'
 import { t } from '@/i18n'
 import { useTelemetry } from '@/platform/telemetry'
 import { isCloud } from '@/platform/distribution/types'
-import { useSubscription } from '@/platform/cloud/subscription/composables/useSubscription'
-import SettingDialogContent from '@/platform/settings/components/SettingDialogContent.vue'
-import type { ExecutionErrorWsMessage } from '@/schemas/apiSchema'
+import { useBillingContext } from '@/composables/billing/useBillingContext'
 import { useDialogStore } from '@/stores/dialogStore'
 import type {
   DialogComponentProps,
   ShowDialogOptions
 } from '@/stores/dialogStore'
-import ManagerProgressDialogContent from '@/workbench/extensions/manager/components/ManagerProgressDialogContent.vue'
-import ManagerProgressFooter from '@/workbench/extensions/manager/components/ManagerProgressFooter.vue'
-import ManagerProgressHeader from '@/workbench/extensions/manager/components/ManagerProgressHeader.vue'
-import ManagerDialogContent from '@/workbench/extensions/manager/components/manager/ManagerDialogContent.vue'
-import ManagerHeader from '@/workbench/extensions/manager/components/manager/ManagerHeader.vue'
-import NodeConflictDialogContent from '@/workbench/extensions/manager/components/manager/NodeConflictDialogContent.vue'
-import NodeConflictFooter from '@/workbench/extensions/manager/components/manager/NodeConflictFooter.vue'
-import NodeConflictHeader from '@/workbench/extensions/manager/components/manager/NodeConflictHeader.vue'
-import type { ConflictDetectionResult } from '@/workbench/extensions/manager/types/conflictDetectionTypes'
+
 import type { ComponentAttrs } from 'vue-component-type-helpers'
+import type { SubscriptionDialogReason } from '@/platform/cloud/subscription/composables/useSubscriptionDialog'
+
+// Lazy loaders for dialogs - components are loaded on first use
+const lazyApiNodesSignInContent = () =>
+  import('@/components/dialog/content/ApiNodesSignInContent.vue')
+const lazySignInContent = () =>
+  import('@/components/dialog/content/SignInContent.vue')
+const lazyUpdatePasswordContent = () =>
+  import('@/components/dialog/content/UpdatePasswordContent.vue')
+const lazyComfyOrgHeader = () =>
+  import('@/components/dialog/header/ComfyOrgHeader.vue')
 
 export type ConfirmationDialogType =
   | 'default'
@@ -43,78 +36,24 @@ export type ConfirmationDialogType =
   | 'delete'
   | 'dirtyClose'
   | 'reinstall'
+  | 'info'
+
+/**
+ * Minimal interface for execution error dialogs.
+ * Satisfied by both ExecutionErrorWsMessage (WebSocket) and ExecutionError (Jobs API).
+ */
+export interface ExecutionErrorDialogInput {
+  exception_type: string
+  exception_message: string
+  node_id: string | number
+  node_type: string
+  traceback: string[]
+}
 
 export const useDialogService = () => {
   const dialogStore = useDialogStore()
 
-  function showLoadWorkflowWarning(
-    props: ComponentAttrs<typeof MissingNodesContent>
-  ) {
-    dialogStore.showDialog({
-      key: 'global-missing-nodes',
-      headerComponent: MissingNodesHeader,
-      footerComponent: MissingNodesFooter,
-      component: MissingNodesContent,
-      dialogComponentProps: {
-        closable: true,
-        pt: {
-          root: { class: 'bg-base-background border-border-default' },
-          header: { class: '!p-0 !m-0' },
-          content: { class: '!p-0 overflow-y-hidden' },
-          footer: { class: '!p-0' },
-          pcCloseButton: {
-            root: {
-              class: '!w-7 !h-7 !border-none !outline-none !p-2 !m-1.5'
-            }
-          }
-        }
-      },
-      props
-    })
-  }
-
-  function showMissingModelsWarning(
-    props: ComponentAttrs<typeof MissingModelsWarning>
-  ) {
-    dialogStore.showDialog({
-      key: 'global-missing-models-warning',
-      component: MissingModelsWarning,
-      props
-    })
-  }
-
-  function showSettingsDialog(
-    panel?:
-      | 'about'
-      | 'keybinding'
-      | 'extension'
-      | 'server-config'
-      | 'user'
-      | 'credits'
-      | 'subscription'
-  ) {
-    const props = panel ? { props: { defaultPanel: panel } } : undefined
-
-    dialogStore.showDialog({
-      key: 'global-settings',
-      headerComponent: SettingDialogHeader,
-      component: SettingDialogContent,
-      ...props
-    })
-  }
-
-  function showAboutDialog() {
-    dialogStore.showDialog({
-      key: 'global-settings',
-      headerComponent: SettingDialogHeader,
-      component: SettingDialogContent,
-      props: {
-        defaultPanel: 'about'
-      }
-    })
-  }
-
-  function showExecutionErrorDialog(executionError: ExecutionErrorWsMessage) {
+  function showExecutionErrorDialog(executionError: ExecutionErrorDialogInput) {
     const props: ComponentAttrs<typeof ErrorDialogContent> = {
       error: {
         exceptionType: executionError.exception_type,
@@ -140,32 +79,6 @@ export const useDialogService = () => {
     })
   }
 
-  function showManagerDialog(
-    props: ComponentAttrs<typeof ManagerDialogContent> = {}
-  ) {
-    dialogStore.showDialog({
-      key: 'global-manager',
-      component: ManagerDialogContent,
-      headerComponent: ManagerHeader,
-      dialogComponentProps: {
-        closable: true,
-        pt: {
-          pcCloseButton: {
-            root: {
-              class: 'bg-dialog-surface w-9 h-9 p-1.5 rounded-full text-white'
-            }
-          },
-          header: { class: 'py-0! px-6 m-0! h-[68px]' },
-          content: {
-            class: 'p-0! h-full w-[90vw] max-w-full flex-1 overflow-hidden'
-          },
-          root: { class: 'manager-dialog' }
-        }
-      },
-      props
-    })
-  }
-
   function parseError(error: Error) {
     const filename =
       'fileName' in error
@@ -229,30 +142,6 @@ export const useDialogService = () => {
     })
   }
 
-  function showManagerProgressDialog(options?: {
-    props?: InstanceType<typeof ManagerProgressDialogContent>['$props']
-  }) {
-    return dialogStore.showDialog({
-      key: 'global-manager-progress-dialog',
-      component: ManagerProgressDialogContent,
-      headerComponent: ManagerProgressHeader,
-      footerComponent: ManagerProgressFooter,
-      props: options?.props,
-      priority: 2,
-      dialogComponentProps: {
-        closable: false,
-        modal: false,
-        position: 'bottom',
-        pt: {
-          root: { class: 'w-[80%] max-w-2xl mx-auto border-none' },
-          content: { class: 'p-0!' },
-          header: { class: 'p-0! border-none' },
-          footer: { class: 'p-0! border-none' }
-        }
-      }
-    })
-  }
-
   /**
    * Shows a dialog requiring sign in for API nodes
    * @returns Promise that resolves to true if user clicks login, false if cancelled
@@ -260,6 +149,9 @@ export const useDialogService = () => {
   async function showApiNodesSignInDialog(
     apiNodeNames: string[]
   ): Promise<boolean> {
+    const [{ default: ApiNodesSignInContent }, { default: ComfyOrgHeader }] =
+      await Promise.all([lazyApiNodesSignInContent(), lazyComfyOrgHeader()])
+
     return new Promise<boolean>((resolve) => {
       dialogStore.showDialog({
         key: 'api-nodes-signin',
@@ -282,6 +174,9 @@ export const useDialogService = () => {
   }
 
   async function showSignInDialog(): Promise<boolean> {
+    const [{ default: SignInContent }, { default: ComfyOrgHeader }] =
+      await Promise.all([lazySignInContent(), lazyComfyOrgHeader()])
+
     return new Promise<boolean>((resolve) => {
       dialogStore.showDialog({
         key: 'global-signin',
@@ -377,21 +272,34 @@ export const useDialogService = () => {
     })
   }
 
-  function showTopUpCreditsDialog(options?: {
+  async function showTopUpCreditsDialog(options?: {
     isInsufficientCredits?: boolean
   }) {
-    const { isActiveSubscription } = useSubscription()
-    if (!isActiveSubscription.value) return
+    const { isActiveSubscription, isFreeTier, type } = useBillingContext()
+    if (!isActiveSubscription.value || isFreeTier.value) {
+      await showSubscriptionRequiredDialog({
+        reason: options?.isInsufficientCredits
+          ? 'out_of_credits'
+          : 'top_up_blocked'
+      })
+      return
+    }
+
+    const component =
+      type.value === 'workspace'
+        ? TopUpCreditsDialogContentWorkspace
+        : TopUpCreditsDialogContentLegacy
 
     return dialogStore.showDialog({
       key: 'top-up-credits',
-      component: TopUpCreditsDialogContent,
+      component,
       props: options,
       dialogComponentProps: {
         headless: true,
         pt: {
           header: { class: 'p-0! hidden' },
-          content: { class: 'p-0! m-0!' }
+          content: { class: 'p-0! m-0! rounded-2xl' },
+          root: { class: 'rounded-2xl' }
         }
       }
     })
@@ -400,7 +308,10 @@ export const useDialogService = () => {
   /**
    * Shows a dialog for updating the current user's password.
    */
-  function showUpdatePasswordDialog() {
+  async function showUpdatePasswordDialog() {
+    const [{ default: UpdatePasswordContent }, { default: ComfyOrgHeader }] =
+      await Promise.all([lazyUpdatePasswordContent(), lazyComfyOrgHeader()])
+
     return dialogStore.showDialog({
       key: 'global-update-password',
       component: UpdatePasswordContent,
@@ -430,36 +341,16 @@ export const useDialogService = () => {
     }
   }
 
-  function toggleManagerDialog(
-    props?: ComponentAttrs<typeof ManagerDialogContent>
-  ) {
-    if (dialogStore.isDialogOpen('global-manager')) {
-      dialogStore.closeDialog({ key: 'global-manager' })
-    } else {
-      showManagerDialog(props)
-    }
-  }
-
-  function toggleManagerProgressDialog(
-    props?: ComponentAttrs<typeof ManagerProgressDialogContent>
-  ) {
-    if (dialogStore.isDialogOpen('global-manager-progress-dialog')) {
-      dialogStore.closeDialog({ key: 'global-manager-progress-dialog' })
-    } else {
-      showManagerProgressDialog({ props })
-    }
-  }
-
-  function showLayoutDialog(options: {
+  function showLayoutDialog<C extends Component>(options: {
     key: string
-    component: Component
-    props: { onClose: () => void }
+    component: C
+    props: ComponentAttrs<C>
     dialogComponentProps?: DialogComponentProps
   }) {
     const layoutDefaultProps: DialogComponentProps = {
       headless: true,
       modal: true,
-      closable: false,
+      closable: true,
       pt: {
         root: {
           class: 'rounded-2xl overflow-hidden'
@@ -482,55 +373,36 @@ export const useDialogService = () => {
     })
   }
 
-  function showNodeConflictDialog(
-    options: {
-      showAfterWhatsNew?: boolean
-      conflictedPackages?: ConflictDetectionResult[]
-      dialogComponentProps?: DialogComponentProps
-      buttonText?: string
-      onButtonClick?: () => void
-    } = {}
+  function showSmallLayoutDialog(
+    options: Omit<ShowDialogOptions, 'dialogComponentProps'> & {
+      dialogComponentProps?: Omit<DialogComponentProps, 'pt'>
+    }
   ) {
-    const {
-      dialogComponentProps,
-      buttonText,
-      onButtonClick,
-      showAfterWhatsNew,
-      conflictedPackages
-    } = options
+    const { dialogComponentProps: callerProps, ...rest } = options
 
     return dialogStore.showDialog({
-      key: 'global-node-conflict',
-      headerComponent: NodeConflictHeader,
-      footerComponent: NodeConflictFooter,
-      component: NodeConflictDialogContent,
+      ...rest,
       dialogComponentProps: {
         closable: true,
         pt: {
+          root: { class: 'bg-base-background border-border-default' },
           header: { class: '!p-0 !m-0' },
           content: { class: '!p-0 overflow-y-hidden' },
           footer: { class: '!p-0' },
           pcCloseButton: {
             root: {
-              class:
-                '!w-7 !h-7 !border-none !outline-none !p-2 !m-1.5 bg-dialog-surface text-white'
+              class: '!w-7 !h-7 !border-none !outline-none !p-2 !m-1.5'
             }
           }
         },
-        ...dialogComponentProps
-      },
-      props: {
-        showAfterWhatsNew,
-        conflictedPackages
-      },
-      footerProps: {
-        buttonText,
-        onButtonClick
+        ...callerProps
       }
     })
   }
 
-  async function showSubscriptionRequiredDialog() {
+  async function showSubscriptionRequiredDialog(options?: {
+    reason?: SubscriptionDialogReason
+  }) {
     if (!isCloud || !window.__CONFIG__?.subscription_required) {
       return
     }
@@ -538,17 +410,149 @@ export const useDialogService = () => {
     const { useSubscriptionDialog } =
       await import('@/platform/cloud/subscription/composables/useSubscriptionDialog')
     const { show } = useSubscriptionDialog()
-    show()
+    show(options)
+  }
+
+  // Workspace dialogs - dynamically imported to avoid bundling when feature flag is off
+  const workspaceDialogPt = {
+    headless: true,
+    pt: {
+      header: { class: 'p-0! hidden' },
+      content: { class: 'p-0! m-0! rounded-2xl' },
+      root: { class: 'rounded-2xl' }
+    }
+  } as const
+
+  async function showDeleteWorkspaceDialog(options?: {
+    workspaceId?: string
+    workspaceName?: string
+  }) {
+    const { default: component } =
+      await import('@/platform/workspace/components/dialogs/DeleteWorkspaceDialogContent.vue')
+    return dialogStore.showDialog({
+      key: 'delete-workspace',
+      component,
+      props: options,
+      dialogComponentProps: workspaceDialogPt
+    })
+  }
+
+  async function showCreateWorkspaceDialog(
+    onConfirm?: (name: string) => void | Promise<void>
+  ) {
+    const { default: component } =
+      await import('@/platform/workspace/components/dialogs/CreateWorkspaceDialogContent.vue')
+    return dialogStore.showDialog({
+      key: 'create-workspace',
+      component,
+      props: { onConfirm },
+      dialogComponentProps: {
+        ...workspaceDialogPt
+      }
+    })
+  }
+
+  async function showLeaveWorkspaceDialog() {
+    const { default: component } =
+      await import('@/platform/workspace/components/dialogs/LeaveWorkspaceDialogContent.vue')
+    return dialogStore.showDialog({
+      key: 'leave-workspace',
+      component,
+      dialogComponentProps: workspaceDialogPt
+    })
+  }
+
+  async function showEditWorkspaceDialog() {
+    const { default: component } =
+      await import('@/platform/workspace/components/dialogs/EditWorkspaceDialogContent.vue')
+    return dialogStore.showDialog({
+      key: 'edit-workspace',
+      component,
+      dialogComponentProps: {
+        ...workspaceDialogPt
+      }
+    })
+  }
+
+  async function showRemoveMemberDialog(memberId: string) {
+    const { default: component } =
+      await import('@/platform/workspace/components/dialogs/RemoveMemberDialogContent.vue')
+    return dialogStore.showDialog({
+      key: 'remove-member',
+      component,
+      props: { memberId },
+      dialogComponentProps: workspaceDialogPt
+    })
+  }
+
+  async function showInviteMemberDialog() {
+    const { default: component } =
+      await import('@/platform/workspace/components/dialogs/InviteMemberDialogContent.vue')
+    return dialogStore.showDialog({
+      key: 'invite-member',
+      component,
+      dialogComponentProps: {
+        ...workspaceDialogPt
+      }
+    })
+  }
+
+  async function showInviteMemberUpsellDialog() {
+    const { default: component } =
+      await import('@/platform/workspace/components/dialogs/InviteMemberUpsellDialogContent.vue')
+    return dialogStore.showDialog({
+      key: 'invite-member-upsell',
+      component,
+      dialogComponentProps: {
+        ...workspaceDialogPt
+      }
+    })
+  }
+
+  async function showRevokeInviteDialog(inviteId: string) {
+    const { default: component } =
+      await import('@/platform/workspace/components/dialogs/RevokeInviteDialogContent.vue')
+    return dialogStore.showDialog({
+      key: 'revoke-invite',
+      component,
+      props: { inviteId },
+      dialogComponentProps: workspaceDialogPt
+    })
+  }
+
+  function showBillingComingSoonDialog() {
+    return dialogStore.showDialog({
+      key: 'billing-coming-soon',
+      title: t('subscription.billingComingSoon.title'),
+      component: ConfirmationDialogContent,
+      props: {
+        message: t('subscription.billingComingSoon.message'),
+        type: 'info' as ConfirmationDialogType,
+        onConfirm: () => {}
+      },
+      dialogComponentProps: {
+        pt: {
+          root: { class: 'max-w-[360px]' }
+        }
+      }
+    })
+  }
+
+  async function showCancelSubscriptionDialog(cancelAt?: string) {
+    const { default: component } =
+      await import('@/components/dialog/content/subscription/CancelSubscriptionDialogContent.vue')
+    return dialogStore.showDialog({
+      key: 'cancel-subscription',
+      component,
+      props: { cancelAt },
+      dialogComponentProps: {
+        ...workspaceDialogPt
+      }
+    })
   }
 
   return {
-    showLoadWorkflowWarning,
-    showMissingModelsWarning,
-    showSettingsDialog,
-    showAboutDialog,
     showExecutionErrorDialog,
-    showManagerDialog,
-    showManagerProgressDialog,
     showApiNodesSignInDialog,
     showSignInDialog,
     showSubscriptionRequiredDialog,
@@ -558,9 +562,17 @@ export const useDialogService = () => {
     prompt,
     showErrorDialog,
     confirm,
-    toggleManagerDialog,
-    toggleManagerProgressDialog,
     showLayoutDialog,
-    showNodeConflictDialog
+    showSmallLayoutDialog,
+    showDeleteWorkspaceDialog,
+    showCreateWorkspaceDialog,
+    showLeaveWorkspaceDialog,
+    showEditWorkspaceDialog,
+    showRemoveMemberDialog,
+    showRevokeInviteDialog,
+    showInviteMemberDialog,
+    showInviteMemberUpsellDialog,
+    showBillingComingSoonDialog,
+    showCancelSubscriptionDialog
   }
 }
diff --git a/src/services/extensionService.ts b/src/services/extensionService.ts
index 75b159e11e..57213b897d 100644
--- a/src/services/extensionService.ts
+++ b/src/services/extensionService.ts
@@ -3,15 +3,17 @@ import { useErrorHandling } from '@/composables/useErrorHandling'
 import { legacyMenuCompat } from '@/lib/litegraph/src/contextMenuCompat'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { api } from '@/scripts/api'
-import { app } from '@/scripts/app'
 import { useCommandStore } from '@/stores/commandStore'
 import { useExtensionStore } from '@/stores/extensionStore'
-import { KeybindingImpl, useKeybindingStore } from '@/stores/keybindingStore'
+import { KeybindingImpl } from '@/platform/keybindings/keybinding'
+import { useKeybindingStore } from '@/platform/keybindings/keybindingStore'
 import { useMenuItemStore } from '@/stores/menuItemStore'
 import { useWidgetStore } from '@/stores/widgetStore'
 import { useBottomPanelStore } from '@/stores/workspace/bottomPanelStore'
 import type { ComfyExtension } from '@/types/comfy'
 import type { AuthUserInfo } from '@/types/authTypes'
+import { app } from '@/scripts/app'
+import type { ComfyApp } from '@/scripts/app'
 
 export const useExtensionService = () => {
   const extensionStore = useExtensionStore()
@@ -135,18 +137,40 @@ export const useExtensionService = () => {
     }
   }
 
+  type RemoveLastAppParam<T> = T extends (
+    ...args: [...infer Rest, ComfyApp]
+  ) => infer R
+    ? (...args: Rest) => R
+    : T
+
+  type KnownExtensionMethods = Exclude<keyof ComfyExtension, number | symbol> &
+    string
+
+  type ComfyExtensionMethod<T extends KnownExtensionMethods> =
+    ComfyExtension[T] extends (...args: unknown[]) => unknown
+      ? ComfyExtension[T]
+      : (...args: unknown[]) => unknown
+
+  type ComfyExtensionParamsWithoutApp<T extends KnownExtensionMethods> =
+    RemoveLastAppParam<ComfyExtensionMethod<T>>
   /**
    * Invoke an extension callback
    * @param {keyof ComfyExtension} method The extension callback to execute
-   * @param  {any[]} args Any arguments to pass to the callback
+   * @param  {unknown[]} args Any arguments to pass to the callback
    * @returns
    */
-  const invokeExtensions = (method: keyof ComfyExtension, ...args: any[]) => {
-    const results: any[] = []
+  const invokeExtensions = <T extends KnownExtensionMethods>(
+    method: T,
+    ...args: Parameters<ComfyExtensionParamsWithoutApp<T>>
+  ) => {
+    const results: ReturnType<ComfyExtensionMethod<T>>[] = []
     for (const ext of extensionStore.enabledExtensions) {
       if (method in ext) {
         try {
-          results.push(ext[method](...args, app))
+          const fn = ext[method]
+          if (typeof fn === 'function') {
+            results.push(fn.call(ext, ...args, app))
+          }
         } catch (error) {
           console.error(
             `Error calling extension '${ext.name}' method '${method}'`,
@@ -164,23 +188,28 @@ export const useExtensionService = () => {
    * Invoke an async extension callback
    * Each callback will be invoked concurrently
    * @param {string} method The extension callback to execute
-   * @param  {...any} args Any arguments to pass to the callback
+   * @param  {...unknown} args Any arguments to pass to the callback
    * @returns
    */
-  const invokeExtensionsAsync = async (
-    method: keyof ComfyExtension,
-    ...args: any[]
+  const invokeExtensionsAsync = async <T extends KnownExtensionMethods>(
+    method: T,
+    ...args: Parameters<ComfyExtensionParamsWithoutApp<T>>
   ) => {
     return await Promise.all(
       extensionStore.enabledExtensions.map(async (ext) => {
         if (method in ext) {
           try {
+            const fn = ext[method]
+            if (typeof fn !== 'function') {
+              return
+            }
+
             // Set current extension name for legacy compatibility tracking
             if (method === 'setup') {
               legacyMenuCompat.setCurrentExtension(ext.name)
             }
 
-            const result = await ext[method](...args, app)
+            const result = await fn.call(ext, ...args, app)
 
             // Clear current extension after setup
             if (method === 'setup') {
diff --git a/tests-ui/tests/services/registrySearchGateway.test.ts b/src/services/gateway/registrySearchGateway.test.ts
similarity index 99%
rename from tests-ui/tests/services/registrySearchGateway.test.ts
rename to src/services/gateway/registrySearchGateway.test.ts
index e51b164d10..511a5a978c 100644
--- a/tests-ui/tests/services/registrySearchGateway.test.ts
+++ b/src/services/gateway/registrySearchGateway.test.ts
@@ -9,8 +9,8 @@ vi.mock('@/services/providers/algoliaSearchProvider')
 vi.mock('@/services/providers/registrySearchProvider')
 
 describe('useRegistrySearchGateway', () => {
-  let consoleWarnSpy: any
-  let consoleInfoSpy: any
+  let consoleWarnSpy: ReturnType<typeof vi.spyOn>
+  let consoleInfoSpy: ReturnType<typeof vi.spyOn>
 
   beforeEach(() => {
     vi.clearAllMocks()
diff --git a/src/services/jobOutputCache.test.ts b/src/services/jobOutputCache.test.ts
new file mode 100644
index 0000000000..d512582cad
--- /dev/null
+++ b/src/services/jobOutputCache.test.ts
@@ -0,0 +1,368 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { extractWorkflow } from '@/platform/remote/comfyui/jobs/fetchJobs'
+import { api } from '@/scripts/api'
+import type {
+  JobDetail,
+  JobListItem
+} from '@/platform/remote/comfyui/jobs/jobTypes'
+import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
+import {
+  findActiveIndex,
+  getJobDetail,
+  getJobWorkflow,
+  getOutputsForTask
+} from '@/services/jobOutputCache'
+import { ResultItemImpl, TaskItemImpl } from '@/stores/queueStore'
+
+vi.mock('@/platform/remote/comfyui/jobs/fetchJobs', () => ({
+  fetchJobDetail: vi.fn(),
+  extractWorkflow: vi.fn()
+}))
+
+vi.mock('@/scripts/api', () => ({
+  api: {
+    getJobDetail: vi.fn(),
+    apiURL: vi.fn((path: string) => `/api${path}`),
+    addEventListener: vi.fn(),
+    removeEventListener: vi.fn()
+  }
+}))
+
+function createResultItem(url: string, supportsPreview = true): ResultItemImpl {
+  const item = new ResultItemImpl({
+    filename: url,
+    subfolder: '',
+    type: 'output',
+    nodeId: 'node-1',
+    mediaType: supportsPreview ? 'images' : 'unknown'
+  })
+  Object.defineProperty(item, 'url', { get: () => url })
+  Object.defineProperty(item, 'supportsPreview', { get: () => supportsPreview })
+  return item
+}
+
+function createMockJob(id: string, outputsCount = 1): JobListItem {
+  return {
+    id,
+    status: 'completed',
+    create_time: Date.now(),
+    preview_output: null,
+    outputs_count: outputsCount,
+    priority: 0
+  }
+}
+
+function createTask(
+  preview?: ResultItemImpl,
+  allOutputs?: ResultItemImpl[],
+  outputsCount = 1
+): TaskItemImpl {
+  const job = createMockJob(
+    `task-${Math.random().toString(36).slice(2)}`,
+    outputsCount
+  )
+  const flatOutputs = allOutputs ?? (preview ? [preview] : [])
+  return new TaskItemImpl(job, {}, flatOutputs)
+}
+
+// Generate unique IDs per test to avoid cache collisions
+let testCounter = 0
+function uniqueId(prefix: string): string {
+  return `${prefix}-${++testCounter}-${Date.now()}`
+}
+
+describe('jobOutputCache', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  describe('findActiveIndex', () => {
+    it('returns index of matching URL', () => {
+      const items = [
+        createResultItem('a'),
+        createResultItem('b'),
+        createResultItem('c')
+      ]
+
+      expect(findActiveIndex(items, 'b')).toBe(1)
+    })
+
+    it('returns 0 when URL not found', () => {
+      const items = [createResultItem('a'), createResultItem('b')]
+
+      expect(findActiveIndex(items, 'missing')).toBe(0)
+    })
+
+    it('returns 0 when URL is undefined', () => {
+      const items = [createResultItem('a'), createResultItem('b')]
+
+      expect(findActiveIndex(items, undefined)).toBe(0)
+    })
+  })
+
+  describe('getOutputsForTask', () => {
+    it('returns previewable outputs directly when no lazy load needed', async () => {
+      const outputs = [createResultItem('p-1'), createResultItem('p-2')]
+      const task = createTask(undefined, outputs, 1)
+
+      const result = await getOutputsForTask(task)
+
+      expect(result).toEqual(outputs)
+    })
+
+    it('lazy loads when outputsCount > 1', async () => {
+      const previewOutput = createResultItem('preview')
+      const fullOutputs = [
+        createResultItem('full-1'),
+        createResultItem('full-2')
+      ]
+
+      const job = createMockJob(uniqueId('task'), 3)
+      const task = new TaskItemImpl(job, {}, [previewOutput])
+      const loadedTask = new TaskItemImpl(job, {}, fullOutputs)
+      task.loadFullOutputs = vi.fn().mockResolvedValue(loadedTask)
+
+      const result = await getOutputsForTask(task)
+
+      expect(result).toEqual(fullOutputs)
+      expect(task.loadFullOutputs).toHaveBeenCalled()
+    })
+
+    it('caches loaded tasks', async () => {
+      const fullOutputs = [createResultItem('full-1')]
+
+      const job = createMockJob(uniqueId('task'), 3)
+      const task = new TaskItemImpl(job, {}, [createResultItem('preview')])
+      const loadedTask = new TaskItemImpl(job, {}, fullOutputs)
+      task.loadFullOutputs = vi.fn().mockResolvedValue(loadedTask)
+
+      // First call should load
+      await getOutputsForTask(task)
+      expect(task.loadFullOutputs).toHaveBeenCalledTimes(1)
+
+      // Second call should use cache
+      await getOutputsForTask(task)
+      expect(task.loadFullOutputs).toHaveBeenCalledTimes(1)
+    })
+
+    it('falls back to preview outputs on load error', async () => {
+      const previewOutput = createResultItem('preview')
+
+      const job = createMockJob(uniqueId('task'), 3)
+      const task = new TaskItemImpl(job, {}, [previewOutput])
+      task.loadFullOutputs = vi
+        .fn()
+        .mockRejectedValue(new Error('Network error'))
+
+      const result = await getOutputsForTask(task)
+
+      expect(result).toEqual([previewOutput])
+    })
+
+    it('returns null when request is superseded', async () => {
+      const job1 = createMockJob(uniqueId('task'), 3)
+      const job2 = createMockJob(uniqueId('task'), 3)
+
+      const task1 = new TaskItemImpl(job1, {}, [createResultItem('preview-1')])
+      const task2 = new TaskItemImpl(job2, {}, [createResultItem('preview-2')])
+
+      const loadedTask1 = new TaskItemImpl(job1, {}, [
+        createResultItem('full-1')
+      ])
+      const loadedTask2 = new TaskItemImpl(job2, {}, [
+        createResultItem('full-2')
+      ])
+
+      // Task1 loads slowly, task2 loads quickly
+      task1.loadFullOutputs = vi.fn().mockImplementation(
+        () =>
+          new Promise((resolve) => {
+            setTimeout(() => resolve(loadedTask1), 50)
+          })
+      )
+      task2.loadFullOutputs = vi.fn().mockResolvedValue(loadedTask2)
+
+      // Start task1, then immediately start task2
+      const promise1 = getOutputsForTask(task1)
+      const promise2 = getOutputsForTask(task2)
+
+      const [result1, result2] = await Promise.all([promise1, promise2])
+
+      // Task2 should succeed, task1 should return null (superseded)
+      expect(result1).toBeNull()
+      expect(result2).toEqual([createResultItem('full-2')])
+    })
+  })
+
+  describe('getPreviewableOutputsFromJobDetail', () => {
+    it('returns empty array when job detail or outputs are missing', async () => {
+      const { getPreviewableOutputsFromJobDetail } =
+        await import('@/services/jobOutputCache')
+
+      expect(getPreviewableOutputsFromJobDetail(undefined)).toEqual([])
+
+      const jobDetail: JobDetail = {
+        id: 'job-empty',
+        status: 'completed',
+        create_time: Date.now(),
+        priority: 0
+      }
+
+      expect(getPreviewableOutputsFromJobDetail(jobDetail)).toEqual([])
+    })
+
+    it('maps previewable outputs and skips animated/text entries', async () => {
+      const { getPreviewableOutputsFromJobDetail } =
+        await import('@/services/jobOutputCache')
+      const jobDetail: JobDetail = {
+        id: 'job-previewable',
+        status: 'completed',
+        create_time: Date.now(),
+        priority: 0,
+        outputs: {
+          'node-1': {
+            images: [
+              { filename: 'image.png', subfolder: '', type: 'output' },
+              { filename: 'image.webp', subfolder: '', type: 'temp' }
+            ],
+            animated: [true],
+            text: 'hello'
+          },
+          'node-2': {
+            video: [{ filename: 'clip.mp4', subfolder: '', type: 'output' }],
+            audio: [{ filename: 'sound.mp3', subfolder: '', type: 'output' }]
+          }
+        }
+      }
+
+      const result = getPreviewableOutputsFromJobDetail(jobDetail)
+
+      expect(result).toHaveLength(4)
+      expect(result.map((item) => item.filename).sort()).toEqual(
+        ['image.png', 'image.webp', 'clip.mp4', 'sound.mp3'].sort()
+      )
+
+      const image = result.find((item) => item.filename === 'image.png')
+      const video = result.find((item) => item.filename === 'clip.mp4')
+      const { ResultItemImpl: ResultItemImplClass } =
+        await import('@/stores/queueStore')
+
+      expect(image).toBeInstanceOf(ResultItemImplClass)
+      expect(image?.nodeId).toBe('node-1')
+      expect(image?.mediaType).toBe('images')
+      expect(video?.nodeId).toBe('node-2')
+      expect(video?.mediaType).toBe('video')
+    })
+
+    it('filters non-previewable outputs and non-object items', async () => {
+      const { getPreviewableOutputsFromJobDetail } =
+        await import('@/services/jobOutputCache')
+      const jobDetail: JobDetail = {
+        id: 'job-filter',
+        status: 'completed',
+        create_time: Date.now(),
+        priority: 0,
+        outputs: {
+          'node-3': {
+            images: [{ filename: 'valid.png', subfolder: '', type: 'output' }],
+            text: ['not-object'],
+            unknown: [{ filename: 'data.bin', subfolder: '', type: 'output' }]
+          }
+        }
+      }
+
+      const result = getPreviewableOutputsFromJobDetail(jobDetail)
+
+      expect(result.map((item) => item.filename)).toEqual(['valid.png'])
+    })
+  })
+
+  describe('getJobDetail', () => {
+    it('fetches and caches job detail', async () => {
+      const jobId = uniqueId('job')
+
+      const mockDetail: JobDetail = {
+        id: jobId,
+        status: 'completed',
+        create_time: Date.now(),
+        priority: 0,
+        outputs: {}
+      }
+      vi.mocked(api.getJobDetail).mockResolvedValue(mockDetail)
+
+      const result = await getJobDetail(jobId)
+
+      expect(result).toEqual(mockDetail)
+      expect(api.getJobDetail).toHaveBeenCalledWith(jobId)
+    })
+
+    it('returns cached job detail on subsequent calls', async () => {
+      const jobId = uniqueId('job')
+
+      const mockDetail: JobDetail = {
+        id: jobId,
+        status: 'completed',
+        create_time: Date.now(),
+        priority: 0,
+        outputs: {}
+      }
+      vi.mocked(api.getJobDetail).mockResolvedValue(mockDetail)
+
+      // First call
+      await getJobDetail(jobId)
+      expect(api.getJobDetail).toHaveBeenCalledTimes(1)
+
+      // Second call should use cache
+      const result = await getJobDetail(jobId)
+      expect(result).toEqual(mockDetail)
+      expect(api.getJobDetail).toHaveBeenCalledTimes(1)
+    })
+
+    it('returns undefined on fetch error', async () => {
+      const jobId = uniqueId('job-error')
+
+      vi.mocked(api.getJobDetail).mockRejectedValue(new Error('Network error'))
+
+      const result = await getJobDetail(jobId)
+
+      expect(result).toBeUndefined()
+    })
+  })
+
+  describe('getJobWorkflow', () => {
+    it('fetches job detail and extracts workflow', async () => {
+      const jobId = uniqueId('job-wf')
+
+      const mockDetail: JobDetail = {
+        id: jobId,
+        status: 'completed',
+        create_time: Date.now(),
+        priority: 0,
+        outputs: {}
+      }
+      const mockWorkflow = { version: 1 } as Partial<ComfyWorkflowJSON>
+
+      vi.mocked(api.getJobDetail).mockResolvedValue(mockDetail)
+      vi.mocked(extractWorkflow).mockResolvedValue(
+        mockWorkflow as ComfyWorkflowJSON
+      )
+
+      const result = await getJobWorkflow(jobId)
+
+      expect(result).toEqual(mockWorkflow)
+      expect(extractWorkflow).toHaveBeenCalledWith(mockDetail)
+    })
+
+    it('returns undefined when job detail not found', async () => {
+      const jobId = uniqueId('missing')
+
+      vi.mocked(api.getJobDetail).mockResolvedValue(undefined)
+      vi.mocked(extractWorkflow).mockResolvedValue(undefined)
+
+      const result = await getJobWorkflow(jobId)
+
+      expect(result).toBeUndefined()
+    })
+  })
+})
diff --git a/src/services/jobOutputCache.ts b/src/services/jobOutputCache.ts
new file mode 100644
index 0000000000..e9d38169a9
--- /dev/null
+++ b/src/services/jobOutputCache.ts
@@ -0,0 +1,174 @@
+/**
+ * @fileoverview Job output cache for caching and managing job data
+ * @module services/jobOutputCache
+ *
+ * Centralizes job output and detail caching with LRU eviction.
+ * Provides helpers for working with previewable outputs and workflows.
+ */
+
+import QuickLRU from '@alloc/quick-lru'
+
+import type { JobDetail } from '@/platform/remote/comfyui/jobs/jobTypes'
+import { extractWorkflow } from '@/platform/remote/comfyui/jobs/fetchJobs'
+import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
+import { resultItemType } from '@/schemas/apiSchema'
+import type { ResultItem, TaskOutput } from '@/schemas/apiSchema'
+import { api } from '@/scripts/api'
+import { ResultItemImpl } from '@/stores/queueStore'
+import type { TaskItemImpl } from '@/stores/queueStore'
+
+const MAX_TASK_CACHE_SIZE = 50
+const MAX_JOB_DETAIL_CACHE_SIZE = 50
+
+const taskCache = new QuickLRU<string, TaskItemImpl>({
+  maxSize: MAX_TASK_CACHE_SIZE
+})
+const jobDetailCache = new QuickLRU<string, JobDetail>({
+  maxSize: MAX_JOB_DETAIL_CACHE_SIZE
+})
+
+// Track latest request to dedupe stale responses
+let latestTaskRequestId: string | null = null
+
+// ===== Task Output Caching =====
+
+export function findActiveIndex(
+  items: readonly ResultItemImpl[],
+  url?: string
+): number {
+  return ResultItemImpl.findByUrl(items, url)
+}
+
+/**
+ * Gets previewable outputs for a task, with lazy loading, caching, and request deduping.
+ * Returns null if a newer request superseded this one while loading.
+ */
+export async function getOutputsForTask(
+  task: TaskItemImpl
+): Promise<ResultItemImpl[] | null> {
+  const requestId = String(task.jobId)
+  latestTaskRequestId = requestId
+
+  const outputsCount = task.outputsCount ?? 0
+  const needsLazyLoad = outputsCount > 1
+
+  if (!needsLazyLoad) {
+    return [...task.previewableOutputs]
+  }
+
+  const cached = taskCache.get(requestId)
+  if (cached) {
+    return [...cached.previewableOutputs]
+  }
+
+  try {
+    const loadedTask = await task.loadFullOutputs()
+
+    // Check if request was superseded while loading
+    if (latestTaskRequestId !== requestId) {
+      return null
+    }
+
+    taskCache.set(requestId, loadedTask)
+    return [...loadedTask.previewableOutputs]
+  } catch (error) {
+    console.warn('Failed to load full outputs, using preview:', error)
+    return [...task.previewableOutputs]
+  }
+}
+
+function getPreviewableOutputs(outputs?: TaskOutput): ResultItemImpl[] {
+  if (!outputs) return []
+  const resultItems = Object.entries(outputs).flatMap(([nodeId, nodeOutputs]) =>
+    Object.entries(nodeOutputs)
+      .filter(([mediaType, _]) => mediaType !== 'animated')
+      .flatMap(([mediaType, items]) => {
+        if (!Array.isArray(items)) {
+          return []
+        }
+
+        return items.filter(isResultItemLike).map(
+          (item) =>
+            new ResultItemImpl({
+              ...item,
+              nodeId,
+              mediaType
+            })
+        )
+      })
+  )
+
+  return ResultItemImpl.filterPreviewable(resultItems)
+}
+
+function isResultItemLike(item: unknown): item is ResultItem {
+  if (!item || typeof item !== 'object' || Array.isArray(item)) {
+    return false
+  }
+
+  const candidate = item as Record<string, unknown>
+
+  if (
+    candidate.filename !== undefined &&
+    typeof candidate.filename !== 'string'
+  ) {
+    return false
+  }
+
+  if (
+    candidate.subfolder !== undefined &&
+    typeof candidate.subfolder !== 'string'
+  ) {
+    return false
+  }
+
+  if (
+    candidate.type !== undefined &&
+    !resultItemType.safeParse(candidate.type).success
+  ) {
+    return false
+  }
+
+  if (
+    candidate.filename === undefined &&
+    candidate.subfolder === undefined &&
+    candidate.type === undefined
+  ) {
+    return false
+  }
+
+  return true
+}
+
+export function getPreviewableOutputsFromJobDetail(
+  jobDetail?: JobDetail
+): ResultItemImpl[] {
+  return getPreviewableOutputs(jobDetail?.outputs)
+}
+
+// ===== Job Detail Caching =====
+
+export async function getJobDetail(
+  jobId: string
+): Promise<JobDetail | undefined> {
+  const cached = jobDetailCache.get(jobId)
+  if (cached) return cached
+
+  try {
+    const detail = await api.getJobDetail(jobId)
+    if (detail) {
+      jobDetailCache.set(jobId, detail)
+    }
+    return detail
+  } catch (error) {
+    console.warn('Failed to fetch job detail:', error)
+    return undefined
+  }
+}
+
+export async function getJobWorkflow(
+  jobId: string
+): Promise<ComfyWorkflowJSON | undefined> {
+  const detail = await getJobDetail(jobId)
+  return await extractWorkflow(detail)
+}
diff --git a/src/services/litegraphService.ts b/src/services/litegraphService.ts
index e7e35458ab..92205ab442 100644
--- a/src/services/litegraphService.ts
+++ b/src/services/litegraphService.ts
@@ -1,12 +1,15 @@
 import _ from 'es-toolkit/compat'
 
-import { downloadFile } from '@/base/common/downloadUtil'
+import { downloadFile, openFileInNewTab } from '@/base/common/downloadUtil'
 import { useSelectedLiteGraphItems } from '@/composables/canvas/useSelectedLiteGraphItems'
 import { useSubgraphOperations } from '@/composables/graph/useSubgraphOperations'
 import { useNodeAnimatedImage } from '@/composables/node/useNodeAnimatedImage'
 import { useNodeCanvasImagePreview } from '@/composables/node/useNodeCanvasImagePreview'
 import { useNodeImage, useNodeVideo } from '@/composables/node/useNodeImage'
-import { addWidgetPromotionOptions } from '@/core/graph/subgraph/proxyWidgetUtils'
+import {
+  addWidgetPromotionOptions,
+  isPreviewPseudoWidget
+} from '@/core/graph/subgraph/promotionUtils'
 import { applyDynamicInputs } from '@/core/graph/widgets/dynamicWidgets'
 import { st, t } from '@/i18n'
 import {
@@ -19,6 +22,8 @@ import {
   createBounds
 } from '@/lib/litegraph/src/litegraph'
 import type {
+  CreateNodeOptions,
+  GraphAddOptions,
   IContextMenuValue,
   Point,
   Subgraph
@@ -29,12 +34,15 @@ import type {
   ISerialisableNodeOutput,
   ISerialisedNode
 } from '@/lib/litegraph/src/types/serialisation'
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { useToastStore } from '@/platform/updates/common/toastStore'
 import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
 import type { NodeId } from '@/platform/workflow/validation/schemas/workflowSchema'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import { useDialogService } from '@/services/dialogService'
+import { resolveSubgraphPseudoWidgetCache } from '@/services/subgraphPseudoWidgetCache'
+import type { SubgraphPseudoWidgetCache } from '@/services/subgraphPseudoWidgetCache'
 import { transformInputSpecV2ToV1 } from '@/schemas/nodeDef/migration'
 import type {
   ComfyNodeDef as ComfyNodeDefV2,
@@ -47,15 +55,19 @@ import { isComponentWidget, isDOMWidget } from '@/scripts/domWidget'
 import { $el } from '@/scripts/ui'
 import { useDomWidgetStore } from '@/stores/domWidgetStore'
 import { useExecutionStore } from '@/stores/executionStore'
-import { useNodeOutputStore } from '@/stores/imagePreviewStore'
+import { useNodeOutputStore } from '@/stores/nodeOutputStore'
 import { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+import { usePromotionStore } from '@/stores/promotionStore'
 import { useSubgraphStore } from '@/stores/subgraphStore'
+import { useFavoritedWidgetsStore } from '@/stores/workspace/favoritedWidgetsStore'
 import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore'
 import { useWidgetStore } from '@/stores/widgetStore'
 import { normalizeI18nKey } from '@/utils/formatUtil'
 import {
+  isAnimatedOutput,
   isImageNode,
   isVideoNode,
+  isVideoOutput,
   migrateWidgetsValues
 } from '@/utils/litegraphUtil'
 import { getOrderedInputSpecs } from '@/workbench/utils/nodeDefOrderingUtil'
@@ -70,6 +82,49 @@ export interface HasInitialMinSize {
 export const CONFIG = Symbol()
 export const GET_CONFIG = Symbol()
 
+export function getExtraOptionsForWidget(
+  node: LGraphNode,
+  widget: IBaseWidget
+) {
+  const options: IContextMenuValue[] = []
+  const input = node.inputs.find((inp) => inp.widget?.name === widget.name)
+
+  if (input) {
+    options.unshift({
+      content: `${t('contextMenu.RenameWidget')}: ${widget.label ?? widget.name}`,
+      callback: async () => {
+        const newLabel = await useDialogService().prompt({
+          title: t('g.rename'),
+          message: t('g.enterNewNamePrompt'),
+          defaultValue: widget.label,
+          placeholder: widget.name
+        })
+        if (newLabel === null) return
+        widget.label = newLabel || undefined
+        input.label = newLabel || undefined
+        widget.callback?.(widget.value)
+        useCanvasStore().canvas?.setDirty(true)
+      }
+    })
+  }
+
+  const favoritedWidgetsStore = useFavoritedWidgetsStore()
+  const isFavorited = favoritedWidgetsStore.isFavorited(node, widget.name)
+  options.unshift({
+    content: isFavorited
+      ? `${t('contextMenu.UnfavoriteWidget')}: ${widget.label ?? widget.name}`
+      : `${t('contextMenu.FavoriteWidget')}: ${widget.label ?? widget.name}`,
+    callback: () => {
+      favoritedWidgetsStore.toggleFavorite(node, widget.name)
+    }
+  })
+
+  if (node.graph && !node.graph.isRootGraph) {
+    addWidgetPromotionOptions(options, widget, node)
+  }
+  return options
+}
+
 /**
  * Service that augments litegraph with ComfyUI specific functionality.
  */
@@ -79,6 +134,30 @@ export const useLitegraphService = () => {
   const widgetStore = useWidgetStore()
   const canvasStore = useCanvasStore()
   const { toggleSelectedNodesMode } = useSelectedLiteGraphItems()
+  const subgraphPseudoWidgetCache = new WeakMap<
+    SubgraphNode,
+    SubgraphPseudoWidgetCache<LGraphNode, IBaseWidget>
+  >()
+
+  function invalidateSubgraphPseudoWidgetCache(node: SubgraphNode) {
+    subgraphPseudoWidgetCache.delete(node)
+  }
+
+  function getPseudoWidgetPreviewTargets(node: SubgraphNode): LGraphNode[] {
+    const promotionStore = usePromotionStore()
+    const promotions = promotionStore.getPromotionsRef(
+      node.rootGraph.id,
+      node.id
+    )
+    const resolved = resolveSubgraphPseudoWidgetCache({
+      cache: subgraphPseudoWidgetCache.get(node) ?? null,
+      promotions,
+      getNodeById: (nodeId) => node.subgraph.getNodeById(nodeId) ?? undefined,
+      isPreviewPseudoWidget
+    })
+    subgraphPseudoWidgetCache.set(node, resolved.cache)
+    return resolved.nodes
+  }
 
   /**
    * @internal The key for the node definition in the i18n file.
@@ -117,7 +196,7 @@ export const useLitegraphService = () => {
       const state =
         useExecutionStore().nodeLocationProgressStates[nodeLocatorId]?.state
       if (state === 'running') {
-        return { color: '#0f0' }
+        return { color: '#0f0', lineWidth: 3 }
       }
     }
     node.strokeStyles['dragOver'] = function (this: LGraphNode) {
@@ -127,7 +206,7 @@ export const useLitegraphService = () => {
     }
     node.strokeStyles['executionError'] = function (this: LGraphNode) {
       if (app.lastExecutionError?.node_id == this.id) {
-        return { color: '#f0f', lineWidth: 2 }
+        return { color: '#f0f', lineWidth: 3 }
       }
     }
   }
@@ -260,7 +339,7 @@ export const useLitegraphService = () => {
       static comfyClass: string
       static override title: string
       static override category: string
-      static nodeData: ComfyNodeDefV1 & ComfyNodeDefV2
+      static override nodeData: ComfyNodeDefV1 & ComfyNodeDefV2
 
       _initialMinSize = { width: 1, height: 1 }
 
@@ -269,6 +348,7 @@ export const useLitegraphService = () => {
 
         // Set up event listener for promoted widget registration
         subgraph.events.addEventListener('widget-promoted', (event) => {
+          invalidateSubgraphPseudoWidgetCache(this)
           const { widget } = event.detail
           // Only handle DOM widgets
           if (!isDOMWidget(widget) && !isComponentWidget(widget)) return
@@ -288,6 +368,7 @@ export const useLitegraphService = () => {
 
         // Set up event listener for promoted widget removal
         subgraph.events.addEventListener('widget-demoted', (event) => {
+          invalidateSubgraphPseudoWidgetCache(this)
           const { widget } = event.detail
           // Only handle DOM widgets
           if (!isDOMWidget(widget) && !isComponentWidget(widget)) return
@@ -393,7 +474,7 @@ export const useLitegraphService = () => {
       static comfyClass: string
       static override title: string
       static override category: string
-      static nodeData: ComfyNodeDefV1 & ComfyNodeDefV2
+      static override nodeData: ComfyNodeDefV1 & ComfyNodeDefV2
 
       _initialMinSize = { width: 1, height: 1 }
 
@@ -495,6 +576,13 @@ export const useLitegraphService = () => {
     // because `registerNodeType` will overwrite the assignments.
     node.category = nodeDef.category
     node.title = nodeDef.display_name || nodeDef.name
+
+    // Set skip_list for dev-only nodes based on current DevMode setting
+    // This ensures nodes registered after initial load respect the current setting
+    if (nodeDef.dev_only) {
+      const settingStore = useSettingStore()
+      node.skip_list = !settingStore.get('Comfy.DevMode')
+    }
   }
 
   /**
@@ -599,7 +687,7 @@ export const useLitegraphService = () => {
               callback: () => {
                 const url = new URL(img.src)
                 url.searchParams.delete('preview')
-                window.open(url, '_blank')
+                void openFileInNewTab(url.toString())
               }
             },
             ...getCopyImageOption(img),
@@ -670,30 +758,8 @@ export const useLitegraphService = () => {
       }
       const [x, y] = canvas.graph_mouse
       const overWidget = this.getWidgetOnPos(x, y, true)
-      if (overWidget) {
-        const input = this.inputs.find(
-          (inp) => inp.widget?.name === overWidget.name
-        )
-        if (input)
-          options.unshift({
-            content: `${t('contextMenu.RenameWidget')}: ${overWidget.label ?? overWidget.name}`,
-            callback: async () => {
-              const newLabel = await useDialogService().prompt({
-                title: t('g.rename'),
-                message: t('g.enterNewName') + ':',
-                defaultValue: overWidget.label,
-                placeholder: overWidget.name
-              })
-              if (newLabel === null) return
-              overWidget.label = newLabel || undefined
-              input.label = newLabel || undefined
-              useCanvasStore().canvas?.setDirty(true)
-            }
-          })
-        if (this.graph && !this.graph.isRootGraph) {
-          addWidgetPromotionOptions(options, overWidget, this)
-        }
-      }
+      if (overWidget)
+        options.unshift(...getExtraOptionsForWidget(this, overWidget))
       return []
     }
   }
@@ -723,17 +789,9 @@ export const useLitegraphService = () => {
     if (isNewOutput) this.images = output.images
 
     if (isNewOutput || isNewPreview) {
-      this.animatedImages = output?.animated?.find(Boolean)
+      this.animatedImages = isAnimatedOutput(output)
 
-      const isAnimatedWebp =
-        this.animatedImages &&
-        output?.images?.some((img) => img.filename?.includes('webp'))
-      const isAnimatedPng =
-        this.animatedImages &&
-        output?.images?.some((img) => img.filename?.includes('png'))
-      const isVideo =
-        (this.animatedImages && !isAnimatedWebp && !isAnimatedPng) ||
-        isVideoNode(this)
+      const isVideo = isVideoOutput(output) || isVideoNode(this)
       if (isVideo) {
         useNodeVideo(this, callback).showPreview()
       } else {
@@ -769,6 +827,15 @@ export const useLitegraphService = () => {
     }
     node.prototype.onDrawBackground = function () {
       updatePreviews(this)
+
+      if (this instanceof SubgraphNode) {
+        const parentGraph = this.graph
+        for (const interiorNode of getPseudoWidgetPreviewTargets(this)) {
+          updatePreviews(interiorNode, () => {
+            parentGraph?.setDirtyCanvas(true)
+          })
+        }
+      }
     }
   }
 
@@ -819,8 +886,9 @@ export const useLitegraphService = () => {
 
   function addNodeOnGraph(
     nodeDef: ComfyNodeDefV1 | ComfyNodeDefV2,
-    options: Record<string, any> = {}
-  ): LGraphNode {
+    options: CreateNodeOptions = {},
+    addOptions?: GraphAddOptions
+  ): LGraphNode | null {
     options.pos ??= getCanvasCenter()
 
     if (nodeDef.name.startsWith(useSubgraphStore().typePrefix)) {
@@ -849,16 +917,19 @@ export const useLitegraphService = () => {
     )
 
     const graph = useWorkflowStore().activeSubgraph ?? app.graph
+    if (!graph || !node) return null
 
-    // @ts-expect-error fixme ts strict error
-    graph.add(node)
-    // @ts-expect-error fixme ts strict error
+    graph.add(node, addOptions)
     return node
   }
 
   function getCanvasCenter(): Point {
     const dpi = Math.max(window.devicePixelRatio ?? 1, 1)
-    const [x, y, w, h] = app.canvas.ds.visible_area
+    const visibleArea = app.canvas?.ds?.visible_area
+    if (!visibleArea) {
+      return [0, 0]
+    }
+    const [x, y, w, h] = visibleArea
     return [x + w / dpi / 2, y + h / dpi / 2]
   }
 
@@ -905,6 +976,7 @@ export const useLitegraphService = () => {
     addNodeOnGraph,
     addNodeInput,
     getCanvasCenter,
+    getExtraOptionsForWidget,
     goToNode,
     resetView,
     fitView,
diff --git a/src/services/load3dService.ts b/src/services/load3dService.ts
index 6e569ab85a..93ce8cc262 100644
--- a/src/services/load3dService.ts
+++ b/src/services/load3dService.ts
@@ -1,13 +1,86 @@
+/**
+ * Load3D Service - provides access to Load3D instances
+ *
+ * This service uses lazy imports to avoid pulling THREE.js into the main bundle.
+ * The nodeToLoad3dMap is accessed lazily - it will only be available after
+ * the load3d extension has been loaded.
+ */
 import { toRaw } from 'vue'
-import * as SkeletonUtils from 'three/examples/jsm/utils/SkeletonUtils'
 
-import { nodeToLoad3dMap } from '@/composables/useLoad3d'
-import { useLoad3dViewer } from '@/composables/useLoad3dViewer'
 import type Load3d from '@/extensions/core/load3d/Load3d'
 import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
 import type { NodeId } from '@/platform/workflow/validation/schemas/workflowSchema'
+import type { Object3D } from 'three'
 
-const viewerInstances = new Map<NodeId, any>()
+// Type for the useLoad3dViewer composable function
+// Using explicit type to avoid import() type annotations (lint rule)
+type UseLoad3dViewerFn = (node?: LGraphNode) => {
+  initializeViewer: (containerRef: HTMLElement, source: Load3d) => Promise<void>
+  initializeStandaloneViewer: (
+    containerRef: HTMLElement,
+    modelUrl: string
+  ) => Promise<void>
+  cleanup: () => void
+  handleResize: () => void
+  handleMouseEnter: () => void
+  handleMouseLeave: () => void
+  applyChanges: () => Promise<boolean>
+  restoreInitialState: () => void
+  refreshViewport: () => void
+  exportModel: (format: string) => Promise<void>
+  handleBackgroundImageUpdate: (file: File | null) => Promise<void>
+  handleModelDrop: (file: File) => Promise<void>
+  handleSeek: (progress: number) => void
+  needApplyChanges: { value: boolean }
+}
+
+// Type for SkeletonUtils module
+type SkeletonUtilsModule = { clone: (source: Object3D) => Object3D }
+
+// Cache for lazy-loaded modules
+let cachedNodeToLoad3dMap: Map<LGraphNode, Load3d> | null = null
+let cachedUseLoad3dViewer: UseLoad3dViewerFn | null = null
+let cachedSkeletonUtils: SkeletonUtilsModule | null = null
+
+// Sync accessor - returns null if module not yet loaded
+function getNodeToLoad3dMapSync(): Map<LGraphNode, Load3d> | null {
+  return cachedNodeToLoad3dMap
+}
+
+// Async loader for nodeToLoad3dMap - also caches for sync access
+async function loadNodeToLoad3dMap(): Promise<Map<LGraphNode, Load3d>> {
+  if (!cachedNodeToLoad3dMap) {
+    const module = await import('@/composables/useLoad3d')
+    cachedNodeToLoad3dMap = module.nodeToLoad3dMap
+  }
+  return cachedNodeToLoad3dMap
+}
+
+async function loadUseLoad3dViewer() {
+  if (!cachedUseLoad3dViewer) {
+    const module = await import('@/composables/useLoad3dViewer')
+    cachedUseLoad3dViewer = module.useLoad3dViewer
+  }
+  return cachedUseLoad3dViewer
+}
+
+async function loadSkeletonUtils() {
+  if (!cachedSkeletonUtils) {
+    cachedSkeletonUtils = await import('three/examples/jsm/utils/SkeletonUtils')
+  }
+  return cachedSkeletonUtils
+}
+
+// Type definitions for Load3D node
+interface SceneConfig {
+  backgroundImage?: string
+}
+
+interface Load3DNode extends LGraphNode {
+  syncLoad3dConfig?: () => void
+}
+
+const viewerInstances = new Map<NodeId, ReturnType<UseLoad3dViewerFn>>()
 
 export class Load3dService {
   private static instance: Load3dService
@@ -21,14 +94,30 @@ export class Load3dService {
     return Load3dService.instance
   }
 
+  /**
+   * Get Load3d instance for a node (synchronous).
+   * Returns null if the load3d module hasn't been loaded yet.
+   */
   getLoad3d(node: LGraphNode): Load3d | null {
     const rawNode = toRaw(node)
+    const map = getNodeToLoad3dMapSync()
+    if (!map) return null
+    return map.get(rawNode) || null
+  }
 
-    return nodeToLoad3dMap.get(rawNode) || null
+  /**
+   * Get Load3d instance for a node (async, loads module if needed).
+   */
+  async getLoad3dAsync(node: LGraphNode): Promise<Load3d | null> {
+    const rawNode = toRaw(node)
+    const map = await loadNodeToLoad3dMap()
+    return map.get(rawNode) || null
   }
 
   getNodeByLoad3d(load3d: Load3d): LGraphNode | null {
-    for (const [node, instance] of nodeToLoad3dMap) {
+    const map = getNodeToLoad3dMapSync()
+    if (!map) return null
+    for (const [node, instance] of map) {
       if (instance === load3d) {
         return node
       }
@@ -38,30 +127,54 @@ export class Load3dService {
 
   removeLoad3d(node: LGraphNode) {
     const rawNode = toRaw(node)
+    const map = getNodeToLoad3dMapSync()
+    if (!map) return
 
-    const instance = nodeToLoad3dMap.get(rawNode)
+    const instance = map.get(rawNode)
 
     if (instance) {
       instance.remove()
-
-      nodeToLoad3dMap.delete(rawNode)
+      map.delete(rawNode)
     }
   }
 
   clear() {
-    for (const [node] of nodeToLoad3dMap) {
+    const map = getNodeToLoad3dMapSync()
+    if (!map) return
+    for (const [node] of map) {
       this.removeLoad3d(node)
     }
   }
 
-  getOrCreateViewer(node: LGraphNode) {
+  /**
+   * Get or create viewer (async, loads module if needed).
+   * Use this for initial viewer creation.
+   */
+  async getOrCreateViewer(node: LGraphNode) {
     if (!viewerInstances.has(node.id)) {
+      const useLoad3dViewer = await loadUseLoad3dViewer()
       viewerInstances.set(node.id, useLoad3dViewer(node))
     }
 
     return viewerInstances.get(node.id)
   }
 
+  /**
+   * Get or create viewer (sync version).
+   * Only works after useLoad3dViewer has been loaded.
+   * Returns null if module not yet loaded - use async version instead.
+   */
+  getOrCreateViewerSync<T extends UseLoad3dViewerFn>(
+    node: LGraphNode,
+    useLoad3dViewer: T
+  ): ReturnType<T> {
+    if (!viewerInstances.has(node.id)) {
+      viewerInstances.set(node.id, useLoad3dViewer(node))
+    }
+
+    return viewerInstances.get(node.id) as ReturnType<T>
+  }
+
   removeViewer(node: LGraphNode) {
     const viewer = viewerInstances.get(node.id)
 
@@ -89,6 +202,7 @@ export class Load3dService {
         }
       } else {
         // Use SkeletonUtils.clone for proper skeletal animation support
+        const SkeletonUtils = await loadSkeletonUtils()
         const modelClone = SkeletonUtils.clone(sourceModel)
 
         target.getModelManager().currentModel = modelClone
@@ -139,7 +253,9 @@ export class Load3dService {
       .getCurrentBackgroundInfo()
     if (sourceBackgroundInfo.type === 'image') {
       const sourceNode = this.getNodeByLoad3d(source)
-      const sceneConfig = sourceNode?.properties?.['Scene Config'] as any
+      const sceneConfig = sourceNode?.properties?.['Scene Config'] as
+        | SceneConfig
+        | undefined
       const backgroundPath = sceneConfig?.backgroundImage
       if (backgroundPath) {
         await target.setBackgroundImage(backgroundPath)
@@ -173,14 +289,16 @@ export class Load3dService {
   }
 
   async handleViewerClose(node: LGraphNode) {
-    const viewer = useLoad3dService().getOrCreateViewer(node)
+    const viewer = await useLoad3dService().getOrCreateViewer(node)
+    if (!viewer) return
 
     if (viewer.needApplyChanges.value) {
       await viewer.applyChanges()
 
       // Sync configuration back to the node's UI
-      if ((node as any).syncLoad3dConfig) {
-        ;(node as any).syncLoad3dConfig()
+      const load3DNode = node as Load3DNode
+      if (load3DNode.syncLoad3dConfig) {
+        load3DNode.syncLoad3dConfig()
       }
     }
 
diff --git a/tests-ui/tests/services/mediaCacheService.test.ts b/src/services/mediaCacheService.test.ts
similarity index 91%
rename from tests-ui/tests/services/mediaCacheService.test.ts
rename to src/services/mediaCacheService.test.ts
index 8f58559ca1..1ecc0658fd 100644
--- a/tests-ui/tests/services/mediaCacheService.test.ts
+++ b/src/services/mediaCacheService.test.ts
@@ -1,13 +1,13 @@
 import { describe, expect, it, vi } from 'vitest'
 
-import { useMediaCache } from '../../../src/services/mediaCacheService'
+import { useMediaCache } from './mediaCacheService'
 
 // Mock fetch
 global.fetch = vi.fn()
 global.URL = {
   createObjectURL: vi.fn(() => 'blob:mock-url'),
   revokeObjectURL: vi.fn()
-} as any
+} as Partial<typeof URL> as typeof URL
 
 describe('mediaCacheService', () => {
   describe('URL reference counting', () => {
diff --git a/src/services/newUserService.ts b/src/services/newUserService.ts
deleted file mode 100644
index fff9eb72cf..0000000000
--- a/src/services/newUserService.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import type { useSettingStore } from '@/platform/settings/settingStore'
-
-let pendingCallbacks: Array<() => Promise<void>> = []
-let isNewUserDetermined = false
-let isNewUserCached: boolean | null = null
-
-export const newUserService = () => {
-  function checkIsNewUser(
-    settingStore: ReturnType<typeof useSettingStore>
-  ): boolean {
-    const isNewUserSettings =
-      Object.keys(settingStore.settingValues).length === 0 ||
-      !settingStore.get('Comfy.TutorialCompleted')
-    const hasNoWorkflow = !localStorage.getItem('workflow')
-    const hasNoPreviousWorkflow = !localStorage.getItem(
-      'Comfy.PreviousWorkflow'
-    )
-
-    return isNewUserSettings && hasNoWorkflow && hasNoPreviousWorkflow
-  }
-
-  async function registerInitCallback(callback: () => Promise<void>) {
-    if (isNewUserDetermined) {
-      if (isNewUserCached) {
-        try {
-          await callback()
-        } catch (error) {
-          console.error('New user initialization callback failed:', error)
-        }
-      }
-    } else {
-      pendingCallbacks.push(callback)
-    }
-  }
-
-  async function initializeIfNewUser(
-    settingStore: ReturnType<typeof useSettingStore>
-  ) {
-    if (isNewUserDetermined) return
-
-    isNewUserCached = checkIsNewUser(settingStore)
-    isNewUserDetermined = true
-
-    if (!isNewUserCached) {
-      pendingCallbacks = []
-      return
-    }
-
-    await settingStore.set(
-      'Comfy.InstalledVersion',
-      __COMFYUI_FRONTEND_VERSION__
-    )
-
-    for (const callback of pendingCallbacks) {
-      try {
-        await callback()
-      } catch (error) {
-        console.error('New user initialization callback failed:', error)
-      }
-    }
-
-    pendingCallbacks = []
-  }
-
-  function isNewUser(): boolean | null {
-    return isNewUserDetermined ? isNewUserCached : null
-  }
-
-  return {
-    registerInitCallback,
-    initializeIfNewUser,
-    isNewUser
-  }
-}
diff --git a/tests-ui/tests/services/nodeOrganizationService.test.ts b/src/services/nodeOrganizationService.test.ts
similarity index 98%
rename from tests-ui/tests/services/nodeOrganizationService.test.ts
rename to src/services/nodeOrganizationService.test.ts
index dfc389b148..756440441f 100644
--- a/tests-ui/tests/services/nodeOrganizationService.test.ts
+++ b/src/services/nodeOrganizationService.test.ts
@@ -5,7 +5,7 @@ import { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
 import { NodeSourceType } from '@/types/nodeSource'
 
 describe('nodeOrganizationService', () => {
-  const createMockNodeDef = (overrides: any = {}) => {
+  const createMockNodeDef = (overrides: Partial<ComfyNodeDefImpl> = {}) => {
     const mockNodeDef = {
       name: 'TestNode',
       display_name: 'Test Node',
@@ -273,7 +273,7 @@ describe('nodeOrganizationService', () => {
       it('should handle unknown source type', () => {
         const nodeDef = createMockNodeDef({
           nodeSource: {
-            type: 'unknown' as any,
+            type: 'unknown' as NodeSourceType,
             className: 'unknown',
             displayText: 'Unknown',
             badgeText: '?'
diff --git a/src/services/nodeOrganizationService.ts b/src/services/nodeOrganizationService.ts
index be641610df..dc3ca1d17c 100644
--- a/src/services/nodeOrganizationService.ts
+++ b/src/services/nodeOrganizationService.ts
@@ -1,18 +1,37 @@
+import type { EssentialsCategory } from '@/constants/essentialsNodes'
+import { ESSENTIALS_NODES } from '@/constants/essentialsNodes'
+import { t } from '@/i18n'
 import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
 import { buildNodeDefTree } from '@/stores/nodeDefStore'
 import type {
   NodeGroupingStrategy,
   NodeOrganizationOptions,
-  NodeSortStrategy
+  NodeSection,
+  NodeSortStrategy,
+  TabId
 } from '@/types/nodeOrganizationTypes'
 import { NodeSourceType } from '@/types/nodeSource'
 import type { TreeNode } from '@/types/treeExplorerTypes'
-import { sortedTree } from '@/utils/treeUtil'
+import { sortedTree, unwrapTreeRoot } from '@/utils/treeUtil'
 
 const DEFAULT_ICON = 'pi pi-sort'
 
+function categoryPathExtractor(nodeDef: ComfyNodeDefImpl): string[] {
+  const category = nodeDef.category || ''
+  const categoryParts = category ? category.split('/') : []
+  return [...categoryParts, nodeDef.name]
+}
+
+function isBlueprint(node: ComfyNodeDefImpl): boolean {
+  return (
+    node.nodeSource.type === NodeSourceType.Blueprint ||
+    !!node.python_module?.startsWith('blueprint')
+  )
+}
+
 export const DEFAULT_GROUPING_ID = 'category' as const
 export const DEFAULT_SORTING_ID = 'original' as const
+export const DEFAULT_TAB_ID = 'all' as const
 
 class NodeOrganizationService {
   private readonly groupingStrategies: NodeGroupingStrategy[] = [
@@ -21,11 +40,7 @@ class NodeOrganizationService {
       label: 'sideToolbar.nodeLibraryTab.groupStrategies.category',
       icon: 'pi pi-folder',
       description: 'sideToolbar.nodeLibraryTab.groupStrategies.categoryDesc',
-      getNodePath: (nodeDef: ComfyNodeDefImpl) => {
-        const category = nodeDef.category || ''
-        const categoryParts = category ? category.split('/') : []
-        return [...categoryParts, nodeDef.name]
-      }
+      getNodePath: categoryPathExtractor
     },
     {
       id: 'module',
@@ -112,6 +127,203 @@ class NodeOrganizationService {
     return this.sortingStrategies.find((strategy) => strategy.id === id)
   }
 
+  organizeNodesByTab(
+    nodes: ComfyNodeDefImpl[],
+    tabId: TabId = DEFAULT_TAB_ID
+  ): NodeSection[] {
+    switch (tabId) {
+      case 'essentials':
+        return this.organizeEssentials(nodes)
+      case 'blueprints':
+        return this.organizeBlueprints(nodes)
+      case 'all':
+      default:
+        return this.organizeAll(nodes)
+    }
+  }
+
+  private organizeEssentials(nodes: ComfyNodeDefImpl[]): NodeSection[] {
+    const essentialNodes = nodes.filter(
+      (nodeDef) => !!nodeDef.essentials_category
+    )
+    const tree = buildNodeDefTree(essentialNodes, {
+      pathExtractor: (nodeDef) => {
+        const folder = nodeDef.essentials_category || ''
+        return folder ? [folder, nodeDef.name] : [nodeDef.name]
+      }
+    })
+    this.sortEssentialsFolders(tree)
+    return [{ tree }]
+  }
+
+  private sortEssentialsFolders(tree: TreeNode): void {
+    if (!tree.children) return
+    for (const folder of tree.children) {
+      if (!folder.children) continue
+      const order = ESSENTIALS_NODES[folder.label as EssentialsCategory]
+      if (!order) continue
+      const orderLen = order.length
+      folder.children.sort((a, b) => {
+        const ai = order.indexOf(a.data?.name ?? a.label ?? '')
+        const bi = order.indexOf(b.data?.name ?? b.label ?? '')
+        return (ai === -1 ? orderLen : ai) - (bi === -1 ? orderLen : bi)
+      })
+    }
+  }
+
+  private organizeBlueprints(nodes: ComfyNodeDefImpl[]): NodeSection[] {
+    const { myBlueprints, comfyBlueprints } = this.partitionBlueprints(nodes)
+    return [
+      {
+        title: 'sideToolbar.nodeLibraryTab.sections.myBlueprints',
+        tree: unwrapTreeRoot(
+          buildNodeDefTree(myBlueprints, {
+            pathExtractor: categoryPathExtractor
+          })
+        )
+      },
+      {
+        title: 'sideToolbar.nodeLibraryTab.sections.comfyBlueprints',
+        tree: unwrapTreeRoot(
+          buildNodeDefTree(comfyBlueprints, {
+            pathExtractor: categoryPathExtractor
+          })
+        )
+      }
+    ]
+  }
+
+  private organizeAll(nodes: ComfyNodeDefImpl[]): NodeSection[] {
+    const {
+      myBlueprints,
+      comfyBlueprints,
+      partnerNodes,
+      comfyNodes,
+      extensions
+    } = this.classifyNodes(nodes)
+
+    const blueprintTree = this.buildBlueprintTree(
+      myBlueprints,
+      comfyBlueprints,
+      categoryPathExtractor
+    )
+
+    const sections: NodeSection[] = []
+
+    if (blueprintTree.children?.length) {
+      sections.push({ category: 'blueprints', tree: blueprintTree })
+    }
+    if (partnerNodes.length > 0) {
+      sections.push({
+        category: 'partnerNodes',
+        tree: unwrapTreeRoot(
+          buildNodeDefTree(partnerNodes, {
+            pathExtractor: categoryPathExtractor
+          })
+        )
+      })
+    }
+    if (comfyNodes.length > 0) {
+      sections.push({
+        category: 'comfyNodes',
+        tree: buildNodeDefTree(comfyNodes, {
+          pathExtractor: categoryPathExtractor
+        })
+      })
+    }
+    if (extensions.length > 0) {
+      sections.push({
+        category: 'extensions',
+        tree: buildNodeDefTree(extensions, {
+          pathExtractor: categoryPathExtractor
+        })
+      })
+    }
+
+    return sections
+  }
+
+  private partitionBlueprints(nodes: ComfyNodeDefImpl[]): {
+    myBlueprints: ComfyNodeDefImpl[]
+    comfyBlueprints: ComfyNodeDefImpl[]
+  } {
+    const myBlueprints: ComfyNodeDefImpl[] = []
+    const comfyBlueprints: ComfyNodeDefImpl[] = []
+    for (const node of nodes) {
+      if (!isBlueprint(node)) continue
+      if (node.isGlobal) comfyBlueprints.push(node)
+      else myBlueprints.push(node)
+    }
+    return { myBlueprints, comfyBlueprints }
+  }
+
+  private classifyNodes(nodes: ComfyNodeDefImpl[]): {
+    myBlueprints: ComfyNodeDefImpl[]
+    comfyBlueprints: ComfyNodeDefImpl[]
+    partnerNodes: ComfyNodeDefImpl[]
+    comfyNodes: ComfyNodeDefImpl[]
+    extensions: ComfyNodeDefImpl[]
+  } {
+    const myBlueprints: ComfyNodeDefImpl[] = []
+    const comfyBlueprints: ComfyNodeDefImpl[] = []
+    const partnerNodes: ComfyNodeDefImpl[] = []
+    const comfyNodes: ComfyNodeDefImpl[] = []
+    const extensions: ComfyNodeDefImpl[] = []
+
+    for (const node of nodes) {
+      if (isBlueprint(node)) {
+        if (node.isGlobal) comfyBlueprints.push(node)
+        else myBlueprints.push(node)
+      } else if (node.api_node || node.category?.startsWith('api node')) {
+        partnerNodes.push(node)
+      } else if (
+        node.nodeSource.type === NodeSourceType.Core ||
+        node.nodeSource.type === NodeSourceType.Essentials
+      ) {
+        comfyNodes.push(node)
+      } else {
+        extensions.push(node)
+      }
+    }
+
+    return {
+      myBlueprints,
+      comfyBlueprints,
+      partnerNodes,
+      comfyNodes,
+      extensions
+    }
+  }
+
+  private buildBlueprintTree(
+    myBlueprints: ComfyNodeDefImpl[],
+    comfyBlueprints: ComfyNodeDefImpl[],
+    pathExtractor: (nodeDef: ComfyNodeDefImpl) => string[]
+  ): TreeNode {
+    const children: TreeNode[] = []
+    if (myBlueprints.length > 0) {
+      const tree = unwrapTreeRoot(
+        buildNodeDefTree(myBlueprints, { pathExtractor })
+      )
+      children.push({
+        key: 'root/my-blueprints',
+        label: t('sideToolbar.nodeLibraryTab.sections.myBlueprints'),
+        children: tree.children
+      })
+    }
+    if (comfyBlueprints.length > 0) {
+      const tree = unwrapTreeRoot(
+        buildNodeDefTree(comfyBlueprints, { pathExtractor })
+      )
+      children.push({
+        key: 'root/comfy-blueprints',
+        label: t('sideToolbar.nodeLibraryTab.sections.comfyBlueprints'),
+        children: tree.children
+      })
+    }
+    return { key: 'root', label: '', children }
+  }
+
   organizeNodes(
     nodes: ComfyNodeDefImpl[],
     options: NodeOrganizationOptions = {}
@@ -131,9 +343,9 @@ class NodeOrganizationService {
     }
 
     const sortedNodes =
-      sortingStrategy.id !== 'original'
-        ? [...nodes].sort(sortingStrategy.compare)
-        : nodes
+      sortingStrategy.id === 'original'
+        ? nodes
+        : [...nodes].sort(sortingStrategy.compare)
 
     const tree = buildNodeDefTree(sortedNodes, {
       pathExtractor: groupingStrategy.getNodePath
diff --git a/src/services/nodeSearchService.test.ts b/src/services/nodeSearchService.test.ts
new file mode 100644
index 0000000000..26d7e4d315
--- /dev/null
+++ b/src/services/nodeSearchService.test.ts
@@ -0,0 +1,173 @@
+import { describe, expect, it } from 'vitest'
+
+import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'
+import { NodeSearchService } from '@/services/nodeSearchService'
+import { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+
+const EXAMPLE_NODE_DEFS: ComfyNodeDefImpl[] = (
+  [
+    {
+      input: {
+        required: {
+          ckpt_name: [['model1.safetensors', 'model2.ckpt'], {}]
+        }
+      },
+      output: ['MODEL', 'CLIP', 'VAE'],
+      output_is_list: [false, false, false],
+      output_name: ['MODEL', 'CLIP', 'VAE'],
+      name: 'CheckpointLoaderSimple',
+      display_name: 'Load Checkpoint',
+      description: '',
+      python_module: 'nodes',
+      category: 'loaders',
+      output_node: false
+    },
+    {
+      input: {
+        required: {
+          samples: ['LATENT'],
+          batch_index: [
+            'INT',
+            {
+              default: 0,
+              min: 0,
+              max: 63
+            }
+          ],
+          length: [
+            'INT',
+            {
+              default: 1,
+              min: 1,
+              max: 64
+            }
+          ]
+        }
+      },
+      output: ['LATENT'],
+      output_is_list: [false],
+      output_name: ['LATENT'],
+      name: 'LatentFromBatch',
+      display_name: 'Latent From Batch',
+      description: '',
+      python_module: 'nodes',
+      category: 'latent/batch',
+      output_node: false
+    }
+  ] as ComfyNodeDef[]
+).map((nodeDef: ComfyNodeDef) => {
+  const def = new ComfyNodeDefImpl(nodeDef)
+  def['postProcessSearchScores'] = (s) => s
+  return def
+})
+
+const NODE_DEFS_WITH_SEARCH_ALIASES: ComfyNodeDefImpl[] = (
+  [
+    {
+      input: { required: {} },
+      output: ['MODEL'],
+      output_is_list: [false],
+      output_name: ['MODEL'],
+      name: 'CheckpointLoaderSimple',
+      display_name: 'Load Checkpoint',
+      description: '',
+      python_module: 'nodes',
+      category: 'loaders',
+      output_node: false,
+      search_aliases: ['ckpt', 'model loader', 'checkpoint']
+    },
+    {
+      input: { required: {} },
+      output: ['IMAGE'],
+      output_is_list: [false],
+      output_name: ['IMAGE'],
+      name: 'LoadImage',
+      display_name: 'Load Image',
+      description: '',
+      python_module: 'nodes',
+      category: 'loaders',
+      output_node: false,
+      search_aliases: ['img', 'picture']
+    },
+    {
+      input: { required: {} },
+      output: ['LATENT'],
+      output_is_list: [false],
+      output_name: ['LATENT'],
+      name: 'VAEEncode',
+      display_name: 'VAE Encode',
+      description: '',
+      python_module: 'nodes',
+      category: 'latent',
+      output_node: false
+      // No search_aliases
+    }
+  ] as ComfyNodeDef[]
+).map((nodeDef: ComfyNodeDef) => {
+  const def = new ComfyNodeDefImpl(nodeDef)
+  def['postProcessSearchScores'] = (s) => s
+  return def
+})
+
+describe('nodeSearchService', () => {
+  it('searches with input filter', () => {
+    const service = new NodeSearchService(EXAMPLE_NODE_DEFS)
+    const inputFilter = service.inputTypeFilter
+    expect(
+      service.searchNode('L', [{ filterDef: inputFilter, value: 'LATENT' }])
+    ).toHaveLength(1)
+    // Wildcard should match all.
+    expect(
+      service.searchNode('L', [{ filterDef: inputFilter, value: '*' }])
+    ).toHaveLength(2)
+    expect(service.searchNode('L')).toHaveLength(2)
+  })
+
+  describe('search_aliases', () => {
+    it('finds nodes by search_aliases', () => {
+      const service = new NodeSearchService(NODE_DEFS_WITH_SEARCH_ALIASES)
+      // Search by alias
+      const ckptResults = service.searchNode('ckpt')
+      expect(ckptResults).toHaveLength(1)
+      expect(ckptResults[0].name).toBe('CheckpointLoaderSimple')
+    })
+
+    it('finds nodes by partial alias match', () => {
+      const service = new NodeSearchService(NODE_DEFS_WITH_SEARCH_ALIASES)
+      // Search by partial alias "model" should match "model loader" alias
+      const modelResults = service.searchNode('model')
+      expect(modelResults.length).toBeGreaterThanOrEqual(1)
+      expect(
+        modelResults.some((r) => r.name === 'CheckpointLoaderSimple')
+      ).toBe(true)
+    })
+
+    it('finds nodes by display_name when no alias matches', () => {
+      const service = new NodeSearchService(NODE_DEFS_WITH_SEARCH_ALIASES)
+      // "VAE" should match by display_name since there are no aliases
+      const vaeResults = service.searchNode('VAE')
+      expect(vaeResults).toHaveLength(1)
+      expect(vaeResults[0].name).toBe('VAEEncode')
+    })
+
+    it('finds nodes by both alias and display_name', () => {
+      const service = new NodeSearchService(NODE_DEFS_WITH_SEARCH_ALIASES)
+      // "img" should match LoadImage by alias
+      const imgResults = service.searchNode('img')
+      expect(imgResults).toHaveLength(1)
+      expect(imgResults[0].name).toBe('LoadImage')
+
+      // "Load" should match both checkpoint and image loaders by display_name
+      const loadResults = service.searchNode('Load')
+      expect(loadResults.length).toBeGreaterThanOrEqual(2)
+    })
+
+    it('handles nodes without search_aliases', () => {
+      const service = new NodeSearchService(NODE_DEFS_WITH_SEARCH_ALIASES)
+      // Ensure nodes without aliases are still searchable by name/display_name
+      const encodeResults = service.searchNode('Encode')
+      expect(encodeResults).toHaveLength(1)
+      expect(encodeResults[0].name).toBe('VAEEncode')
+    })
+  })
+})
diff --git a/src/services/nodeSearchService.ts b/src/services/nodeSearchService.ts
index d54c97e1fb..75dccf2687 100644
--- a/src/services/nodeSearchService.ts
+++ b/src/services/nodeSearchService.ts
@@ -14,7 +14,7 @@ export class NodeSearchService {
   constructor(data: ComfyNodeDefImpl[]) {
     this.nodeFuseSearch = new FuseSearch(data, {
       fuseOptions: {
-        keys: ['name', 'display_name'],
+        keys: ['name', 'display_name', 'search_aliases'],
         includeScore: true,
         threshold: 0.3,
         shouldSort: false,
diff --git a/tests-ui/tests/services/algoliaSearchProvider.test.ts b/src/services/providers/algoliaSearchProvider.test.ts
similarity index 88%
rename from tests-ui/tests/services/algoliaSearchProvider.test.ts
rename to src/services/providers/algoliaSearchProvider.test.ts
index 39dfae3486..7daffbb5ab 100644
--- a/tests-ui/tests/services/algoliaSearchProvider.test.ts
+++ b/src/services/providers/algoliaSearchProvider.test.ts
@@ -1,20 +1,34 @@
+import type { Mock } from 'vitest'
 import { liteClient as algoliasearch } from 'algoliasearch/dist/lite/builds/browser'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
+import type { components } from '@/types/comfyRegistryTypes'
 import { useAlgoliaSearchProvider } from '@/services/providers/algoliaSearchProvider'
 import { SortableAlgoliaField } from '@/workbench/extensions/manager/types/comfyManagerTypes'
 
+type RegistryNodePack = components['schemas']['Node']
+
+type GlobalWithAlgolia = typeof globalThis & {
+  __ALGOLIA_APP_ID__: string
+  __ALGOLIA_API_KEY__: string
+}
+
 // Mock global Algolia constants
-;(global as any).__ALGOLIA_APP_ID__ = 'test-app-id'
-;(global as any).__ALGOLIA_API_KEY__ = 'test-api-key'
+const globalWithAlgolia = globalThis as GlobalWithAlgolia
+globalWithAlgolia.__ALGOLIA_APP_ID__ = 'test-app-id'
+globalWithAlgolia.__ALGOLIA_API_KEY__ = 'test-api-key'
 
 // Mock algoliasearch
 vi.mock('algoliasearch/dist/lite/builds/browser', () => ({
   liteClient: vi.fn()
 }))
 
+interface MockSearchClient {
+  search: Mock
+}
+
 describe('useAlgoliaSearchProvider', () => {
-  let mockSearchClient: any
+  let mockSearchClient: MockSearchClient
 
   beforeEach(() => {
     vi.clearAllMocks()
@@ -24,7 +38,11 @@ describe('useAlgoliaSearchProvider', () => {
       search: vi.fn()
     }
 
-    vi.mocked(algoliasearch).mockReturnValue(mockSearchClient)
+    vi.mocked(algoliasearch).mockReturnValue(
+      mockSearchClient as Partial<
+        ReturnType<typeof algoliasearch>
+      > as ReturnType<typeof algoliasearch>
+    )
   })
 
   afterEach(() => {
@@ -252,7 +270,7 @@ describe('useAlgoliaSearchProvider', () => {
   })
 
   describe('getSortValue', () => {
-    const testPack = {
+    const testPack: Partial<RegistryNodePack> = {
       id: '1',
       name: 'Test Pack',
       downloads: 100,
@@ -279,7 +297,10 @@ describe('useAlgoliaSearchProvider', () => {
 
       const createdTimestamp = new Date('2024-01-01T10:00:00Z').getTime()
       expect(
-        provider.getSortValue(testPack as any, SortableAlgoliaField.Created)
+        provider.getSortValue(
+          testPack as RegistryNodePack,
+          SortableAlgoliaField.Created
+        )
       ).toBe(createdTimestamp)
 
       const updatedTimestamp = new Date('2024-01-15T10:00:00Z').getTime()
@@ -289,23 +310,35 @@ describe('useAlgoliaSearchProvider', () => {
     })
 
     it('should handle missing values', () => {
-      const incompletePack = { id: '1', name: 'Incomplete' }
+      const incompletePack: Partial<RegistryNodePack> = {
+        id: '1',
+        name: 'Incomplete'
+      }
       const provider = useAlgoliaSearchProvider()
 
       expect(
-        provider.getSortValue(incompletePack, SortableAlgoliaField.Downloads)
+        provider.getSortValue(
+          incompletePack as RegistryNodePack,
+          SortableAlgoliaField.Downloads
+        )
       ).toBe(0)
       expect(
-        provider.getSortValue(incompletePack, SortableAlgoliaField.Publisher)
+        provider.getSortValue(
+          incompletePack as RegistryNodePack,
+          SortableAlgoliaField.Publisher
+        )
       ).toBe('')
       expect(
         provider.getSortValue(
-          incompletePack as any,
+          incompletePack as RegistryNodePack,
           SortableAlgoliaField.Created
         )
       ).toBe(0)
       expect(
-        provider.getSortValue(incompletePack, SortableAlgoliaField.Updated)
+        provider.getSortValue(
+          incompletePack as RegistryNodePack,
+          SortableAlgoliaField.Updated
+        )
       ).toBe(0)
     })
   })
diff --git a/tests-ui/tests/services/registrySearchProvider.test.ts b/src/services/providers/registrySearchProvider.test.ts
similarity index 66%
rename from tests-ui/tests/services/registrySearchProvider.test.ts
rename to src/services/providers/registrySearchProvider.test.ts
index fe25018ade..db9c6a6e04 100644
--- a/tests-ui/tests/services/registrySearchProvider.test.ts
+++ b/src/services/providers/registrySearchProvider.test.ts
@@ -11,17 +11,34 @@ vi.mock('@/stores/comfyRegistryStore', () => ({
 describe('useComfyRegistrySearchProvider', () => {
   const mockSearchCall = vi.fn()
   const mockSearchClear = vi.fn()
+  const mockListAllPacksCall = vi.fn()
+  const mockListAllPacksClear = vi.fn()
+
+  const createMockStore = (
+    params: Partial<ReturnType<typeof useComfyRegistryStore>> = {}
+  ) => {
+    return {
+      search: {
+        call: mockSearchCall,
+        clear: mockSearchClear,
+        cancel: vi.fn()
+      },
+      listAllPacks: {
+        call: mockListAllPacksCall,
+        clear: mockListAllPacksClear,
+        cancel: vi.fn()
+      },
+      ...params
+    } as Partial<ReturnType<typeof useComfyRegistryStore>> as ReturnType<
+      typeof useComfyRegistryStore
+    >
+  }
 
   beforeEach(() => {
     vi.clearAllMocks()
 
     // Setup store mock
-    vi.mocked(useComfyRegistryStore).mockReturnValue({
-      search: {
-        call: mockSearchCall,
-        clear: mockSearchClear
-      }
-    } as any)
+    vi.mocked(useComfyRegistryStore).mockReturnValue(createMockStore())
   })
 
   describe('searchPacks', () => {
@@ -111,14 +128,85 @@ describe('useComfyRegistrySearchProvider', () => {
       expect(result.nodePacks).toEqual([])
       expect(result.querySuggestions).toEqual([])
     })
+
+    it('should use listAllPacks for empty query', async () => {
+      const mockResults = {
+        nodes: [
+          { id: '1', name: 'Pack 1' },
+          { id: '2', name: 'Pack 2' }
+        ]
+      }
+      mockListAllPacksCall.mockResolvedValue(mockResults)
+
+      const provider = useComfyRegistrySearchProvider()
+      const result = await provider.searchPacks('', {
+        pageSize: 20,
+        pageNumber: 0
+      })
+
+      expect(mockListAllPacksCall).toHaveBeenCalledWith({
+        limit: 20,
+        page: 1
+      })
+      expect(mockSearchCall).not.toHaveBeenCalled()
+      expect(result.nodePacks).toEqual(mockResults.nodes)
+      expect(result.querySuggestions).toEqual([])
+    })
+
+    it('should use listAllPacks for whitespace-only query', async () => {
+      const mockResults = {
+        nodes: [{ id: '1', name: 'Pack 1' }]
+      }
+      mockListAllPacksCall.mockResolvedValue(mockResults)
+
+      const provider = useComfyRegistrySearchProvider()
+      const result = await provider.searchPacks('   ', {
+        pageSize: 10,
+        pageNumber: 0
+      })
+
+      expect(mockListAllPacksCall).toHaveBeenCalledWith({
+        limit: 10,
+        page: 1
+      })
+      expect(mockSearchCall).not.toHaveBeenCalled()
+      expect(result.nodePacks).toEqual(mockResults.nodes)
+    })
+
+    it('should handle empty results from listAllPacks', async () => {
+      mockListAllPacksCall.mockResolvedValue({ nodes: [] })
+
+      const provider = useComfyRegistrySearchProvider()
+      const result = await provider.searchPacks('', {
+        pageSize: 10,
+        pageNumber: 0
+      })
+
+      expect(result.nodePacks).toEqual([])
+      expect(result.querySuggestions).toEqual([])
+    })
+
+    it('should handle null results from listAllPacks', async () => {
+      mockListAllPacksCall.mockResolvedValue(null)
+
+      const provider = useComfyRegistrySearchProvider()
+      const result = await provider.searchPacks('', {
+        pageSize: 10,
+        pageNumber: 0
+      })
+
+      expect(result.nodePacks).toEqual([])
+      expect(result.querySuggestions).toEqual([])
+    })
   })
 
   describe('clearSearchCache', () => {
-    it('should delegate to store search.clear', () => {
+    it('should clear both search and listAllPacks caches', () => {
       const provider = useComfyRegistrySearchProvider()
       provider.clearSearchCache()
 
       expect(mockSearchClear).toHaveBeenCalled()
+      expect(mockListAllPacksClear).toHaveBeenCalled()
     })
   })
 
diff --git a/src/services/providers/registrySearchProvider.ts b/src/services/providers/registrySearchProvider.ts
index a2cede14a4..d9f334205c 100644
--- a/src/services/providers/registrySearchProvider.ts
+++ b/src/services/providers/registrySearchProvider.ts
@@ -25,33 +25,45 @@ export const useComfyRegistrySearchProvider = (): NodePackSearchProvider => {
   ): Promise<SearchPacksResult> => {
     const { pageSize, pageNumber, restrictSearchableAttributes } = params
 
-    // Determine search mode based on searchable attributes
+    // For empty queries, use the cached listAllPacks endpoint instead of search
+    if (!query || query.trim() === '') {
+      const listParams = {
+        limit: pageSize,
+        page: pageNumber + 1 // Registry API uses 1-based pagination
+        // Note: omitting 'latest' parameter defaults to cached result
+      }
+
+      const listResult = await registryStore.listAllPacks.call(listParams)
+      const nodePacks = listResult?.nodes ?? []
+
+      return {
+        nodePacks,
+        querySuggestions: []
+      }
+    }
+
+    // For non-empty queries, use the search endpoint
     const isNodeSearch = restrictSearchableAttributes?.includes('comfy_nodes')
 
     const searchParams = {
       search: isNodeSearch ? undefined : query,
       comfy_node_search: isNodeSearch ? query : undefined,
       limit: pageSize,
-      page: pageNumber + 1 // Registry API uses 1-based pagination
+      page: pageNumber + 1
     }
 
     const searchResult = await registryStore.search.call(searchParams)
-
-    if (!searchResult || !searchResult.nodes) {
-      return {
-        nodePacks: [],
-        querySuggestions: []
-      }
-    }
+    const nodePacks = searchResult?.nodes ?? []
 
     return {
-      nodePacks: searchResult.nodes,
+      nodePacks,
       querySuggestions: [] // Registry doesn't support query suggestions
     }
   }
 
   const clearSearchCache = () => {
     registryStore.search.clear()
+    registryStore.listAllPacks.clear()
   }
 
   const getSortValue = (
diff --git a/src/services/subgraphPseudoWidgetCache.test.ts b/src/services/subgraphPseudoWidgetCache.test.ts
new file mode 100644
index 0000000000..00465d4b6d
--- /dev/null
+++ b/src/services/subgraphPseudoWidgetCache.test.ts
@@ -0,0 +1,167 @@
+import { describe, expect, it, vi } from 'vitest'
+
+import { resolveSubgraphPseudoWidgetCache } from '@/services/subgraphPseudoWidgetCache'
+import type {
+  SubgraphPseudoWidget,
+  SubgraphPseudoWidgetCache,
+  SubgraphPseudoWidgetNode,
+  SubgraphPromotionEntry
+} from '@/services/subgraphPseudoWidgetCache'
+
+interface TestWidget extends SubgraphPseudoWidget {
+  isPseudo?: boolean
+}
+
+interface TestNode extends SubgraphPseudoWidgetNode<TestWidget> {
+  widgets?: TestWidget[]
+}
+
+function widget(name: string, isPseudo = false): TestWidget {
+  return { name, isPseudo }
+}
+
+function node(id: string, widgets: TestWidget[] = []): TestNode {
+  return { id, widgets }
+}
+
+describe('resolveSubgraphPseudoWidgetCache', () => {
+  it('builds update targets from pseudo widget promotions', () => {
+    const interiorNode = node('n1', [widget('preview', true)])
+    const getNodeById = vi.fn((id: string) =>
+      id === 'n1' ? interiorNode : undefined
+    )
+    const promotions: readonly SubgraphPromotionEntry[] = [
+      { interiorNodeId: 'n1', widgetName: 'preview' }
+    ]
+
+    const result = resolveSubgraphPseudoWidgetCache<TestNode, TestWidget>({
+      cache: null,
+      promotions,
+      getNodeById,
+      isPreviewPseudoWidget: (candidate) => candidate.isPseudo === true
+    })
+
+    expect(result.nodes).toEqual([interiorNode])
+    expect(result.cache.entries).toHaveLength(1)
+    expect(getNodeById).toHaveBeenCalledWith('n1')
+  })
+
+  it('keeps $$ fallback behavior when the backing widget is missing', () => {
+    const interiorNode = node('n1', [widget('other')])
+    const promotions: readonly SubgraphPromotionEntry[] = [
+      { interiorNodeId: 'n1', widgetName: '$$canvas-image-preview' }
+    ]
+
+    const result = resolveSubgraphPseudoWidgetCache<TestNode, TestWidget>({
+      cache: null,
+      promotions,
+      getNodeById: (id) => (id === 'n1' ? interiorNode : undefined),
+      isPreviewPseudoWidget: (candidate) => candidate.isPseudo === true
+    })
+
+    expect(result.nodes).toEqual([interiorNode])
+  })
+
+  it('reuses cache when promotions and node identities are unchanged', () => {
+    const interiorNode = node('n1', [widget('preview', true)])
+    const promotions: readonly SubgraphPromotionEntry[] = [
+      { interiorNodeId: 'n1', widgetName: 'preview' }
+    ]
+    const base = resolveSubgraphPseudoWidgetCache<TestNode, TestWidget>({
+      cache: null,
+      promotions,
+      getNodeById: (id) => (id === 'n1' ? interiorNode : undefined),
+      isPreviewPseudoWidget: (candidate) => candidate.isPseudo === true
+    })
+    const getNodeById = vi.fn((id: string) =>
+      id === 'n1' ? interiorNode : undefined
+    )
+
+    const result = resolveSubgraphPseudoWidgetCache<TestNode, TestWidget>({
+      cache: base.cache,
+      promotions,
+      getNodeById,
+      isPreviewPseudoWidget: (candidate) => candidate.isPseudo === true
+    })
+
+    expect(result.cache).toBe(base.cache)
+    expect(result.nodes).toBe(base.nodes)
+    expect(getNodeById).toHaveBeenCalledTimes(1)
+  })
+
+  it('rebuilds cache when promotions reference changes', () => {
+    const interiorNode = node('n1', [widget('preview', true)])
+    const promotionsA: readonly SubgraphPromotionEntry[] = [
+      { interiorNodeId: 'n1', widgetName: 'preview' }
+    ]
+    const base = resolveSubgraphPseudoWidgetCache<TestNode, TestWidget>({
+      cache: null,
+      promotions: promotionsA,
+      getNodeById: (id) => (id === 'n1' ? interiorNode : undefined),
+      isPreviewPseudoWidget: (candidate) => candidate.isPseudo === true
+    })
+    const promotionsB: readonly SubgraphPromotionEntry[] = [
+      { interiorNodeId: 'n1', widgetName: 'preview' }
+    ]
+
+    const result = resolveSubgraphPseudoWidgetCache<TestNode, TestWidget>({
+      cache: base.cache,
+      promotions: promotionsB,
+      getNodeById: (id) => (id === 'n1' ? interiorNode : undefined),
+      isPreviewPseudoWidget: (candidate) => candidate.isPseudo === true
+    })
+
+    expect(result.cache).not.toBe(base.cache)
+  })
+
+  it('falls back to rebuild when a cached node reference goes stale', () => {
+    const oldNode = node('n1', [widget('preview', true)])
+    const promotions: readonly SubgraphPromotionEntry[] = [
+      { interiorNodeId: 'n1', widgetName: 'preview' }
+    ]
+    const initial = resolveSubgraphPseudoWidgetCache<TestNode, TestWidget>({
+      cache: null,
+      promotions,
+      getNodeById: () => oldNode,
+      isPreviewPseudoWidget: (candidate) => candidate.isPseudo === true
+    })
+    const newNode = node('n1', [widget('preview', true)])
+
+    const result = resolveSubgraphPseudoWidgetCache<TestNode, TestWidget>({
+      cache: initial.cache,
+      promotions,
+      getNodeById: () => newNode,
+      isPreviewPseudoWidget: (candidate) => candidate.isPseudo === true
+    })
+
+    expect(result.cache).not.toBe(initial.cache)
+    expect(result.nodes).toEqual([newNode])
+  })
+
+  it('drops cached entries when node no longer resolves', () => {
+    const promotions: readonly SubgraphPromotionEntry[] = [
+      { interiorNodeId: 'missing', widgetName: '$$canvas-image-preview' }
+    ]
+    const cache: SubgraphPseudoWidgetCache<TestNode, TestWidget> = {
+      promotions,
+      entries: [
+        {
+          interiorNodeId: 'missing',
+          widgetName: '$$canvas-image-preview',
+          node: node('missing')
+        }
+      ],
+      nodes: [node('missing')]
+    }
+
+    const result = resolveSubgraphPseudoWidgetCache<TestNode, TestWidget>({
+      cache,
+      promotions,
+      getNodeById: () => undefined,
+      isPreviewPseudoWidget: (candidate) => candidate.isPseudo === true
+    })
+
+    expect(result.nodes).toEqual([])
+    expect(result.cache.entries).toEqual([])
+  })
+})
diff --git a/src/services/subgraphPseudoWidgetCache.ts b/src/services/subgraphPseudoWidgetCache.ts
new file mode 100644
index 0000000000..92d2abf2ab
--- /dev/null
+++ b/src/services/subgraphPseudoWidgetCache.ts
@@ -0,0 +1,120 @@
+export interface SubgraphPromotionEntry {
+  interiorNodeId: string
+  widgetName: string
+}
+
+export interface SubgraphPseudoWidget {
+  name: string
+}
+
+export interface SubgraphPseudoWidgetNode<
+  TWidget extends SubgraphPseudoWidget
+> {
+  id: string | number
+  widgets?: TWidget[]
+}
+
+interface SubgraphPseudoWidgetCacheEntry<
+  TNode extends SubgraphPseudoWidgetNode<TWidget>,
+  TWidget extends SubgraphPseudoWidget
+> {
+  interiorNodeId: string
+  widgetName: string
+  node: TNode
+}
+
+export interface SubgraphPseudoWidgetCache<
+  TNode extends SubgraphPseudoWidgetNode<TWidget>,
+  TWidget extends SubgraphPseudoWidget
+> {
+  promotions: readonly SubgraphPromotionEntry[]
+  entries: SubgraphPseudoWidgetCacheEntry<TNode, TWidget>[]
+  nodes: TNode[]
+}
+
+interface ResolveSubgraphPseudoWidgetCacheArgs<
+  TNode extends SubgraphPseudoWidgetNode<TWidget>,
+  TWidget extends SubgraphPseudoWidget
+> {
+  cache: SubgraphPseudoWidgetCache<TNode, TWidget> | null
+  promotions: readonly SubgraphPromotionEntry[]
+  getNodeById: (nodeId: string) => TNode | undefined
+  isPreviewPseudoWidget: (widget: TWidget) => boolean
+}
+
+interface ResolveSubgraphPseudoWidgetCacheResult<
+  TNode extends SubgraphPseudoWidgetNode<TWidget>,
+  TWidget extends SubgraphPseudoWidget
+> {
+  cache: SubgraphPseudoWidgetCache<TNode, TWidget>
+  nodes: TNode[]
+}
+
+function isPseudoPromotion<TWidget extends SubgraphPseudoWidget>(
+  widgetName: string,
+  widgets: TWidget[] | undefined,
+  isPreviewPseudoWidget: (widget: TWidget) => boolean
+): boolean {
+  const widget = widgets?.find((candidate) => candidate.name === widgetName)
+  if (widget) return isPreviewPseudoWidget(widget)
+  return widgetName.startsWith('$$')
+}
+
+function isCacheStillValid<
+  TNode extends SubgraphPseudoWidgetNode<TWidget>,
+  TWidget extends SubgraphPseudoWidget
+>(
+  cache: SubgraphPseudoWidgetCache<TNode, TWidget>,
+  getNodeById: (nodeId: string) => TNode | undefined,
+  isPreviewPseudoWidget: (widget: TWidget) => boolean
+): boolean {
+  return cache.entries.every((entry) => {
+    const currentNode = getNodeById(entry.interiorNodeId)
+    if (!currentNode || currentNode !== entry.node) return false
+    return isPseudoPromotion(
+      entry.widgetName,
+      currentNode.widgets,
+      isPreviewPseudoWidget
+    )
+  })
+}
+
+export function resolveSubgraphPseudoWidgetCache<
+  TNode extends SubgraphPseudoWidgetNode<TWidget>,
+  TWidget extends SubgraphPseudoWidget
+>(
+  args: ResolveSubgraphPseudoWidgetCacheArgs<TNode, TWidget>
+): ResolveSubgraphPseudoWidgetCacheResult<TNode, TWidget> {
+  const { cache, promotions, getNodeById, isPreviewPseudoWidget } = args
+
+  if (
+    cache &&
+    cache.promotions === promotions &&
+    isCacheStillValid(cache, getNodeById, isPreviewPseudoWidget)
+  )
+    return { cache, nodes: cache.nodes }
+
+  const entries = promotions.flatMap((promotion) => {
+    const node = getNodeById(promotion.interiorNodeId)
+    if (!node) return []
+    if (
+      !isPseudoPromotion(
+        promotion.widgetName,
+        node.widgets,
+        isPreviewPseudoWidget
+      )
+    )
+      return []
+    return [{ ...promotion, node }]
+  })
+
+  const nextCache: SubgraphPseudoWidgetCache<TNode, TWidget> = {
+    promotions,
+    entries,
+    nodes: entries.map((entry) => entry.node)
+  }
+  return {
+    cache: nextCache,
+    nodes: nextCache.nodes
+  }
+}
diff --git a/src/services/subgraphService.ts b/src/services/subgraphService.ts
index 3a9f1f7c70..068d3ed37c 100644
--- a/src/services/subgraphService.ts
+++ b/src/services/subgraphService.ts
@@ -49,7 +49,7 @@ export const useSubgraphService = () => {
       output_tooltips: [],
       name: id,
       display_name: name,
-      description: `Subgraph node for ${name}`,
+      description: exportedSubgraph.description || `Subgraph node for ${name}`,
       category: 'subgraph',
       output_node: false,
       python_module: 'nodes'
diff --git a/tests-ui/tests/services/newUserService.test.ts b/src/services/useNewUserService.test.ts
similarity index 84%
rename from tests-ui/tests/services/newUserService.test.ts
rename to src/services/useNewUserService.test.ts
index e940a785bd..1fd590b21a 100644
--- a/tests-ui/tests/services/newUserService.test.ts
+++ b/src/services/useNewUserService.test.ts
@@ -7,6 +7,12 @@ const mockLocalStorage = vi.hoisted(() => ({
   clear: vi.fn()
 }))
 
+const mockSettingStore = vi.hoisted(() => ({
+  settingValues: {} as Record<string, unknown>,
+  get: vi.fn(),
+  set: vi.fn()
+}))
+
 Object.defineProperty(window, 'localStorage', {
   value: mockLocalStorage,
   writable: true
@@ -16,31 +22,26 @@ vi.mock('@/config/version', () => ({
   __COMFYUI_FRONTEND_VERSION__: '1.24.0'
 }))
 
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: () => mockSettingStore
+}))
+
 //@ts-expect-error Define global for the test
 global.__COMFYUI_FRONTEND_VERSION__ = '1.24.0'
 
-describe('newUserService', () => {
-  let service: ReturnType<
-    typeof import('@/services/newUserService').newUserService
-  >
-  let mockSettingStore: any
-  let newUserService: typeof import('@/services/newUserService').newUserService
+import { useNewUserService } from '@/services/useNewUserService'
 
-  beforeEach(async () => {
+describe('useNewUserService', () => {
+  let service: ReturnType<typeof useNewUserService>
+
+  beforeEach(() => {
     vi.clearAllMocks()
+    mockSettingStore.settingValues = {}
+    mockSettingStore.get.mockReset()
+    mockSettingStore.set.mockReset()
 
-    vi.resetModules()
-
-    const module = await import('@/services/newUserService')
-    newUserService = module.newUserService
-
-    service = newUserService()
-
-    mockSettingStore = {
-      settingValues: {},
-      get: vi.fn(),
-      set: vi.fn()
-    }
+    service = useNewUserService()
+    service.reset()
 
     mockLocalStorage.getItem.mockReturnValue(null)
   })
@@ -54,7 +55,7 @@ describe('newUserService', () => {
       })
       mockLocalStorage.getItem.mockReturnValue(null)
 
-      await service.initializeIfNewUser(mockSettingStore)
+      await service.initializeIfNewUser()
 
       expect(service.isNewUser()).toBe(true)
     })
@@ -69,7 +70,7 @@ describe('newUserService', () => {
 
       mockLocalStorage.getItem.mockReturnValue(null)
 
-      await service.initializeIfNewUser(mockSettingStore)
+      await service.initializeIfNewUser()
 
       expect(service.isNewUser()).toBe(true)
     })
@@ -82,7 +83,7 @@ describe('newUserService', () => {
       })
       mockLocalStorage.getItem.mockReturnValue(null)
 
-      await service.initializeIfNewUser(mockSettingStore)
+      await service.initializeIfNewUser()
 
       expect(service.isNewUser()).toBe(false)
     })
@@ -98,7 +99,7 @@ describe('newUserService', () => {
         return null
       })
 
-      await service.initializeIfNewUser(mockSettingStore)
+      await service.initializeIfNewUser()
 
       expect(service.isNewUser()).toBe(false)
     })
@@ -114,7 +115,7 @@ describe('newUserService', () => {
         return null
       })
 
-      await service.initializeIfNewUser(mockSettingStore)
+      await service.initializeIfNewUser()
 
       expect(service.isNewUser()).toBe(false)
     })
@@ -127,7 +128,7 @@ describe('newUserService', () => {
       })
       mockLocalStorage.getItem.mockReturnValue(null)
 
-      await service.initializeIfNewUser(mockSettingStore)
+      await service.initializeIfNewUser()
 
       expect(service.isNewUser()).toBe(true)
     })
@@ -143,7 +144,7 @@ describe('newUserService', () => {
       })
       mockLocalStorage.getItem.mockReturnValue(null)
 
-      await service.initializeIfNewUser(mockSettingStore)
+      await service.initializeIfNewUser()
 
       expect(service.isNewUser()).toBe(false)
     })
@@ -160,7 +161,7 @@ describe('newUserService', () => {
         return null
       })
 
-      await service.initializeIfNewUser(mockSettingStore)
+      await service.initializeIfNewUser()
 
       expect(service.isNewUser()).toBe(false)
     })
@@ -177,7 +178,7 @@ describe('newUserService', () => {
       })
       mockLocalStorage.getItem.mockReturnValue(null)
 
-      await service.initializeIfNewUser(mockSettingStore)
+      await service.initializeIfNewUser()
       expect(service.isNewUser()).toBe(true)
 
       await service.registerInitCallback(mockCallback)
@@ -207,7 +208,7 @@ describe('newUserService', () => {
       })
       mockLocalStorage.getItem.mockReturnValue(null)
 
-      await service.initializeIfNewUser(mockSettingStore)
+      await service.initializeIfNewUser()
 
       await service.registerInitCallback(mockCallback)
 
@@ -228,7 +229,7 @@ describe('newUserService', () => {
       })
       mockLocalStorage.getItem.mockReturnValue(null)
 
-      await service.initializeIfNewUser(mockSettingStore)
+      await service.initializeIfNewUser()
 
       expect(mockSettingStore.set).toHaveBeenCalledWith(
         'Comfy.InstalledVersion',
@@ -244,7 +245,7 @@ describe('newUserService', () => {
       })
       mockLocalStorage.getItem.mockReturnValue(null)
 
-      await service.initializeIfNewUser(mockSettingStore)
+      await service.initializeIfNewUser()
 
       expect(mockSettingStore.set).not.toHaveBeenCalled()
     })
@@ -263,7 +264,7 @@ describe('newUserService', () => {
       })
       mockLocalStorage.getItem.mockReturnValue(null)
 
-      await service.initializeIfNewUser(mockSettingStore)
+      await service.initializeIfNewUser()
 
       expect(mockCallback1).toHaveBeenCalledTimes(1)
       expect(mockCallback2).toHaveBeenCalledTimes(1)
@@ -281,7 +282,7 @@ describe('newUserService', () => {
       })
       mockLocalStorage.getItem.mockReturnValue(null)
 
-      await service.initializeIfNewUser(mockSettingStore)
+      await service.initializeIfNewUser()
 
       expect(mockCallback).not.toHaveBeenCalled()
     })
@@ -299,7 +300,7 @@ describe('newUserService', () => {
       })
       mockLocalStorage.getItem.mockReturnValue(null)
 
-      await service.initializeIfNewUser(mockSettingStore)
+      await service.initializeIfNewUser()
 
       expect(consoleSpy).toHaveBeenCalledWith(
         'New user initialization callback failed:',
@@ -316,10 +317,10 @@ describe('newUserService', () => {
       })
       mockLocalStorage.getItem.mockReturnValue(null)
 
-      await service.initializeIfNewUser(mockSettingStore)
+      await service.initializeIfNewUser()
       expect(mockSettingStore.set).toHaveBeenCalledTimes(1)
 
-      await service.initializeIfNewUser(mockSettingStore)
+      await service.initializeIfNewUser()
       expect(mockSettingStore.set).toHaveBeenCalledTimes(1)
     })
 
@@ -331,15 +332,12 @@ describe('newUserService', () => {
       })
       mockLocalStorage.getItem.mockReturnValue(null)
 
-      // Before initialization, isNewUser should return null
       expect(service.isNewUser()).toBeNull()
 
-      await service.initializeIfNewUser(mockSettingStore)
+      await service.initializeIfNewUser()
 
-      // After initialization, isNewUser should return true for a new user
       expect(service.isNewUser()).toBe(true)
 
-      // Should set the installed version for new users
       expect(mockSettingStore.set).toHaveBeenCalledWith(
         'Comfy.InstalledVersion',
         expect.any(String)
@@ -357,7 +355,7 @@ describe('newUserService', () => {
       mockSettingStore.get.mockReturnValue(undefined)
       mockLocalStorage.getItem.mockReturnValue(null)
 
-      await service.initializeIfNewUser(mockSettingStore)
+      await service.initializeIfNewUser()
 
       expect(service.isNewUser()).toBe(true)
     })
@@ -372,7 +370,7 @@ describe('newUserService', () => {
       })
       mockLocalStorage.getItem.mockReturnValue(null)
 
-      await service.initializeIfNewUser(mockSettingStore)
+      await service.initializeIfNewUser()
 
       expect(service.isNewUser()).toBe(true)
     })
@@ -388,7 +386,7 @@ describe('newUserService', () => {
       })
       mockLocalStorage.getItem.mockReturnValue(null)
 
-      await service.initializeIfNewUser(mockSettingStore)
+      await service.initializeIfNewUser()
 
       await service.registerInitCallback(mockCallback1)
       await service.registerInitCallback(mockCallback2)
@@ -399,9 +397,9 @@ describe('newUserService', () => {
   })
 
   describe('state sharing between instances', () => {
-    it('should share state between multiple service instances', async () => {
-      const service1 = newUserService()
-      const service2 = newUserService()
+    it('should share state between multiple service calls', async () => {
+      const service1 = useNewUserService()
+      const service2 = useNewUserService()
 
       mockSettingStore.settingValues = {}
       mockSettingStore.get.mockImplementation((key: string) => {
@@ -410,15 +408,15 @@ describe('newUserService', () => {
       })
       mockLocalStorage.getItem.mockReturnValue(null)
 
-      await service1.initializeIfNewUser(mockSettingStore)
+      await service1.initializeIfNewUser()
 
       expect(service2.isNewUser()).toBe(true)
       expect(service1.isNewUser()).toBe(service2.isNewUser())
     })
 
-    it('should execute callbacks registered on different instances', async () => {
-      const service1 = newUserService()
-      const service2 = newUserService()
+    it('should execute callbacks registered on different service calls', async () => {
+      const service1 = useNewUserService()
+      const service2 = useNewUserService()
 
       const mockCallback1 = vi.fn().mockResolvedValue(undefined)
       const mockCallback2 = vi.fn().mockResolvedValue(undefined)
@@ -433,7 +431,7 @@ describe('newUserService', () => {
       })
       mockLocalStorage.getItem.mockReturnValue(null)
 
-      await service1.initializeIfNewUser(mockSettingStore)
+      await service1.initializeIfNewUser()
 
       expect(mockCallback1).toHaveBeenCalledTimes(1)
       expect(mockCallback2).toHaveBeenCalledTimes(1)
diff --git a/src/services/useNewUserService.ts b/src/services/useNewUserService.ts
new file mode 100644
index 0000000000..093c273bd2
--- /dev/null
+++ b/src/services/useNewUserService.ts
@@ -0,0 +1,82 @@
+import { ref, shallowRef } from 'vue'
+import { createSharedComposable } from '@vueuse/core'
+import { useSettingStore } from '@/platform/settings/settingStore'
+
+function _useNewUserService() {
+  const settingStore = useSettingStore()
+  const pendingCallbacks = shallowRef<Array<() => Promise<void>>>([])
+  const isNewUserDetermined = ref(false)
+  const isNewUserCached = ref<boolean | null>(null)
+
+  function reset() {
+    pendingCallbacks.value = []
+    isNewUserDetermined.value = false
+    isNewUserCached.value = null
+  }
+
+  function checkIsNewUser(): boolean {
+    const isNewUserSettings =
+      Object.keys(settingStore.settingValues).length === 0 ||
+      !settingStore.get('Comfy.TutorialCompleted')
+    const hasNoWorkflow = !localStorage.getItem('workflow')
+    const hasNoPreviousWorkflow = !localStorage.getItem(
+      'Comfy.PreviousWorkflow'
+    )
+
+    return isNewUserSettings && hasNoWorkflow && hasNoPreviousWorkflow
+  }
+
+  async function registerInitCallback(callback: () => Promise<void>) {
+    if (isNewUserDetermined.value) {
+      if (isNewUserCached.value) {
+        try {
+          await callback()
+        } catch (error) {
+          console.error('New user initialization callback failed:', error)
+        }
+      }
+    } else {
+      pendingCallbacks.value = [...pendingCallbacks.value, callback]
+    }
+  }
+
+  async function initializeIfNewUser() {
+    if (isNewUserDetermined.value) return
+
+    isNewUserCached.value = checkIsNewUser()
+    isNewUserDetermined.value = true
+
+    if (!isNewUserCached.value) {
+      pendingCallbacks.value = []
+      return
+    }
+
+    await settingStore.set(
+      'Comfy.InstalledVersion',
+      __COMFYUI_FRONTEND_VERSION__
+    )
+
+    for (const callback of pendingCallbacks.value) {
+      try {
+        await callback()
+      } catch (error) {
+        console.error('New user initialization callback failed:', error)
+      }
+    }
+
+    pendingCallbacks.value = []
+  }
+
+  function isNewUser(): boolean | null {
+    return isNewUserDetermined.value ? isNewUserCached.value : null
+  }
+
+  return {
+    registerInitCallback,
+    initializeIfNewUser,
+    isNewUser,
+    reset
+  }
+}
+
+export const useNewUserService = createSharedComposable(_useNewUserService)
diff --git a/src/stores/README.md b/src/stores/README.md
index a24a106e57..22603239b0 100644
--- a/src/stores/README.md
+++ b/src/stores/README.md
@@ -18,6 +18,7 @@ Stores in ComfyUI use [Pinia](https://pinia.vuejs.org/), Vue's official state ma
 Stores provide a way to maintain global application state that can be accessed from any component, regardless of where those components are in the component hierarchy. This solves the problem of "prop drilling" (passing data down through multiple levels of components) and allows components that aren't directly related to share and modify the same state.
 
 For example, without global state:
+
 ```
                   App
                    │
@@ -32,6 +33,7 @@ For example, without global state:
 In this structure, if the `UserMenu` component needs to update something that affects `NodeProperties`, the data would need to be passed up to `App` and then down again, through all intermediate components.
 
 With Pinia stores, components can directly access and update the shared state:
+
 ```
     ┌─────────────────┐
     │                 │
@@ -100,64 +102,63 @@ The following diagram illustrates the store architecture and data flow:
 
 ## Core Stores
 
-The following table lists ALL 46 store instances in the system as of 2025-09-01:
+The following table lists ALL 46 store instances in the system as of 2026-01-29:
 
 ### Main Stores
 
-| File | Store | Description | Category |
-|------|-------|-------------|----------|
-| aboutPanelStore.ts | useAboutPanelStore | Manages the About panel state and badges | UI |
-| apiKeyAuthStore.ts | useApiKeyAuthStore | Handles API key authentication | Auth |
-| comfyManagerStore.ts | useComfyManagerStore | Manages ComfyUI application state | Core |
-| comfyManagerStore.ts | useManagerProgressDialogStore | Manages manager progress dialog state | UI |
-| comfyRegistryStore.ts | useComfyRegistryStore | Handles extensions registry | Registry |
-| commandStore.ts | useCommandStore | Manages commands and command execution | Core |
-| dialogStore.ts | useDialogStore | Controls dialog/modal display and state | UI |
-| domWidgetStore.ts | useDomWidgetStore | Manages DOM widget state | Widgets |
-| electronDownloadStore.ts | useElectronDownloadStore | Handles Electron-specific download operations | Platform |
-| executionStore.ts | useExecutionStore | Tracks workflow execution state | Execution |
-| extensionStore.ts | useExtensionStore | Manages extension registration and state | Extensions |
-| firebaseAuthStore.ts | useFirebaseAuthStore | Handles Firebase authentication | Auth |
-| graphStore.ts | useTitleEditorStore | Manages title editing for nodes and groups | UI |
-| graphStore.ts | useCanvasStore | Manages the graph canvas state and interactions | Core |
-| helpCenterStore.ts | useHelpCenterStore | Manages help center visibility and state | UI |
-| imagePreviewStore.ts | useNodeOutputStore | Manages node outputs and execution results | Media |
-| keybindingStore.ts | useKeybindingStore | Manages keyboard shortcuts | Input |
-| maintenanceTaskStore.ts | useMaintenanceTaskStore | Handles system maintenance tasks | System |
-| menuItemStore.ts | useMenuItemStore | Handles menu items and their state | UI |
-| modelStore.ts | useModelStore | Manages AI models information | Models |
-| modelToNodeStore.ts | useModelToNodeStore | Maps models to compatible nodes | Models |
-| nodeBookmarkStore.ts | useNodeBookmarkStore | Manages node bookmarks and favorites | Nodes |
-| nodeDefStore.ts | useNodeDefStore | Manages node definitions and schemas | Nodes |
-| nodeDefStore.ts | useNodeFrequencyStore | Tracks node usage frequency | Nodes |
-| queueStore.ts | useQueueStore | Manages execution queue and task history | Execution |
-| queueStore.ts | useQueuePendingTaskCountStore | Tracks pending task counts | Execution |
-| queueStore.ts | useQueueSettingsStore | Manages queue execution settings | Execution |
-| releaseStore.ts | useReleaseStore | Manages application release information | System |
-| serverConfigStore.ts | useServerConfigStore | Handles server configuration | Config |
-| settingStore.ts | useSettingStore | Manages application settings | Config |
-| subgraphNavigationStore.ts | useSubgraphNavigationStore | Handles subgraph navigation state | Navigation |
-| systemStatsStore.ts | useSystemStatsStore | Tracks system performance statistics | System |
-| toastStore.ts | useToastStore | Manages toast notifications | UI |
-| userFileStore.ts | useUserFileStore | Manages user file operations | Files |
-| userStore.ts | useUserStore | Manages user data and preferences | User |
-| versionCompatibilityStore.ts | useVersionCompatibilityStore | Manages frontend/backend version compatibility warnings | Core |
-| widgetStore.ts | useWidgetStore | Manages widget configurations | Widgets |
-| workflowStore.ts | useWorkflowStore | Handles workflow data and operations | Workflows |
-| workflowStore.ts | useWorkflowBookmarkStore | Manages workflow bookmarks and favorites | Workflows |
-| workflowTemplatesStore.ts | useWorkflowTemplatesStore | Manages workflow templates | Workflows |
-| workspaceStore.ts | useWorkspaceStore | Manages overall workspace state | Workspace |
+| File                         | Store                         | Description                                             | Category   |
+| ---------------------------- | ----------------------------- | ------------------------------------------------------- | ---------- |
+| aboutPanelStore.ts           | useAboutPanelStore            | Manages the About panel state and badges                | UI         |
+| apiKeyAuthStore.ts           | useApiKeyAuthStore            | Handles API key authentication                          | Auth       |
+| comfyManagerStore.ts         | useComfyManagerStore          | Manages ComfyUI application state                       | Core       |
+| comfyRegistryStore.ts        | useComfyRegistryStore         | Handles extensions registry                             | Registry   |
+| commandStore.ts              | useCommandStore               | Manages commands and command execution                  | Core       |
+| dialogStore.ts               | useDialogStore                | Controls dialog/modal display and state                 | UI         |
+| domWidgetStore.ts            | useDomWidgetStore             | Manages DOM widget state                                | Widgets    |
+| electronDownloadStore.ts     | useElectronDownloadStore      | Handles Electron-specific download operations           | Platform   |
+| executionStore.ts            | useExecutionStore             | Tracks workflow execution state                         | Execution  |
+| extensionStore.ts            | useExtensionStore             | Manages extension registration and state                | Extensions |
+| firebaseAuthStore.ts         | useFirebaseAuthStore          | Handles Firebase authentication                         | Auth       |
+| graphStore.ts                | useTitleEditorStore           | Manages title editing for nodes and groups              | UI         |
+| graphStore.ts                | useCanvasStore                | Manages the graph canvas state and interactions         | Core       |
+| helpCenterStore.ts           | useHelpCenterStore            | Manages help center visibility and state                | UI         |
+| nodeOutputStore.ts           | useNodeOutputStore            | Manages node outputs and execution results              | Media      |
+| maintenanceTaskStore.ts      | useMaintenanceTaskStore       | Handles system maintenance tasks                        | System     |
+| menuItemStore.ts             | useMenuItemStore              | Handles menu items and their state                      | UI         |
+| modelStore.ts                | useModelStore                 | Manages AI models information                           | Models     |
+| modelToNodeStore.ts          | useModelToNodeStore           | Maps models to compatible nodes                         | Models     |
+| nodeBookmarkStore.ts         | useNodeBookmarkStore          | Manages node bookmarks and favorites                    | Nodes      |
+| nodeDefStore.ts              | useNodeDefStore               | Manages node definitions and schemas                    | Nodes      |
+| nodeDefStore.ts              | useNodeFrequencyStore         | Tracks node usage frequency                             | Nodes      |
+| queueStore.ts                | useQueueStore                 | Manages execution queue and task history                | Execution  |
+| queueStore.ts                | useQueuePendingTaskCountStore | Tracks pending task counts                              | Execution  |
+| queueStore.ts                | useQueueSettingsStore         | Manages queue execution settings                        | Execution  |
+| releaseStore.ts              | useReleaseStore               | Manages application release information                 | System     |
+| serverConfigStore.ts         | useServerConfigStore          | Handles server configuration                            | Config     |
+| settingStore.ts              | useSettingStore               | Manages application settings                            | Config     |
+| subgraphNavigationStore.ts   | useSubgraphNavigationStore    | Handles subgraph navigation state                       | Navigation |
+| systemStatsStore.ts          | useSystemStatsStore           | Tracks system performance statistics                    | System     |
+| toastStore.ts                | useToastStore                 | Manages toast notifications                             | UI         |
+| userFileStore.ts             | useUserFileStore              | Manages user file operations                            | Files      |
+| userStore.ts                 | useUserStore                  | Manages user data and preferences                       | User       |
+| versionCompatibilityStore.ts | useVersionCompatibilityStore  | Manages frontend/backend version compatibility warnings | Core       |
+| widgetStore.ts               | useWidgetStore                | Manages widget configurations                           | Widgets    |
+| workflowStore.ts             | useWorkflowStore              | Handles workflow data and operations                    | Workflows  |
+| workflowStore.ts             | useWorkflowBookmarkStore      | Manages workflow bookmarks and favorites                | Workflows  |
+| workflowTemplatesStore.ts    | useWorkflowTemplatesStore     | Manages workflow templates                              | Workflows  |
+| workspaceStore.ts            | useWorkspaceStore             | Manages overall workspace state                         | Workspace  |
 
 ### Workspace Stores
+
 Located in `stores/workspace/`:
 
-| File | Store | Description | Category |
-|------|-------|-------------|----------|
-| bottomPanelStore.ts | useBottomPanelStore | Controls bottom panel visibility and state | UI |
-| colorPaletteStore.ts | useColorPaletteStore | Manages color palette configurations | UI |
-| nodeHelpStore.ts | useNodeHelpStore | Handles node help and documentation display | UI |
-| searchBoxStore.ts | useSearchBoxStore | Manages search box functionality | UI |
-| sidebarTabStore.ts | useSidebarTabStore | Controls sidebar tab states and navigation | UI |
+| File                 | Store                | Description                                 | Category |
+| -------------------- | -------------------- | ------------------------------------------- | -------- |
+| bottomPanelStore.ts  | useBottomPanelStore  | Controls bottom panel visibility and state  | UI       |
+| colorPaletteStore.ts | useColorPaletteStore | Manages color palette configurations        | UI       |
+| nodeHelpStore.ts     | useNodeHelpStore     | Handles node help and documentation display | UI       |
+| searchBoxStore.ts    | useSearchBoxStore    | Manages search box functionality            | UI       |
+| sidebarTabStore.ts   | useSidebarTabStore   | Controls sidebar tab states and navigation  | UI       |
 
 ## Store Development Guidelines
 
@@ -386,4 +387,4 @@ describe('useExampleStore', () => {
 })
 ```
 
-For more information on Pinia, refer to the [Pinia documentation](https://pinia.vuejs.org/introduction.html).
\ No newline at end of file
+For more information on Pinia, refer to the [Pinia documentation](https://pinia.vuejs.org/introduction.html).
diff --git a/src/stores/aboutPanelStore.ts b/src/stores/aboutPanelStore.ts
index f2f0829c34..b21991b4b4 100644
--- a/src/stores/aboutPanelStore.ts
+++ b/src/stores/aboutPanelStore.ts
@@ -2,9 +2,9 @@ import { defineStore } from 'pinia'
 import { computed } from 'vue'
 
 import { useExternalLink } from '@/composables/useExternalLink'
-import { isCloud } from '@/platform/distribution/types'
+import { isCloud, isDesktop } from '@/platform/distribution/types'
 import type { AboutPageBadge } from '@/types/comfy'
-import { electronAPI, isElectron } from '@/utils/envUtil'
+import { electronAPI } from '@/utils/envUtil'
 import { formatCommitHash } from '@/utils/formatUtil'
 
 import { useExtensionStore } from './extensionStore'
@@ -18,13 +18,27 @@ export const useAboutPanelStore = defineStore('aboutPanel', () => {
   const coreVersion = computed(
     () => systemStatsStore?.systemStats?.system?.comfyui_version ?? ''
   )
+  const templatesVersion = computed(
+    () =>
+      systemStatsStore?.systemStats?.system?.installed_templates_version ?? ''
+  )
+  const requiredTemplatesVersion = computed(
+    () =>
+      systemStatsStore?.systemStats?.system?.required_templates_version ?? ''
+  )
+  const isTemplatesOutdated = computed(
+    () =>
+      templatesVersion.value !== '' &&
+      requiredTemplatesVersion.value !== '' &&
+      templatesVersion.value !== requiredTemplatesVersion.value
+  )
 
   const coreBadges = computed<AboutPageBadge[]>(() => [
     // In electron, the ComfyUI is packaged without the git repo,
     // so the python server's API doesn't have the version info.
     {
       label: `ComfyUI ${
-        isElectron()
+        isDesktop
           ? 'v' + electronAPI().getComfyUIVersion()
           : formatCommitHash(coreVersion.value)
       }`,
@@ -36,6 +50,18 @@ export const useAboutPanelStore = defineStore('aboutPanel', () => {
       url: staticUrls.githubFrontend,
       icon: 'pi pi-github'
     },
+    ...(templatesVersion.value
+      ? [
+          {
+            label: `Templates v${templatesVersion.value}`,
+            url: 'https://pypi.org/project/comfyui-workflow-templates/',
+            icon: 'pi pi-book',
+            ...(isTemplatesOutdated.value
+              ? { severity: 'danger' as const }
+              : {})
+          }
+        ]
+      : []),
     {
       label: 'Discord',
       url: staticUrls.discord,
diff --git a/src/stores/appModeStore.test.ts b/src/stores/appModeStore.test.ts
new file mode 100644
index 0000000000..50db79ee46
--- /dev/null
+++ b/src/stores/appModeStore.test.ts
@@ -0,0 +1,309 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { nextTick } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { LGraphNode, NodeId } from '@/lib/litegraph/src/LGraphNode'
+import type { LoadedComfyWorkflow } from '@/platform/workflow/management/stores/comfyWorkflow'
+import { ComfyWorkflow as ComfyWorkflowClass } from '@/platform/workflow/management/stores/comfyWorkflow'
+import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
+import { app } from '@/scripts/app'
+import type { ChangeTracker } from '@/scripts/changeTracker'
+import { createMockChangeTracker } from '@/utils/__tests__/litegraphTestUtils'
+
+const mockEmptyWorkflowDialog = vi.hoisted(() => {
+  let lastOptions: { onEnterBuilder: () => void; onDismiss: () => void }
+  return {
+    show: vi.fn((options: typeof lastOptions) => {
+      lastOptions = options
+    }),
+    get lastOptions() {
+      return lastOptions
+    }
+  }
+})
+
+vi.mock('@/scripts/app', () => ({
+  app: {
+    rootGraph: { extra: {}, nodes: [{ id: 1 }] }
+  }
+}))
+
+const mockResolveNode = vi.hoisted(() =>
+  vi.fn<(id: NodeId) => LGraphNode | undefined>(() => undefined)
+)
+vi.mock('@/utils/litegraphUtil', async (importOriginal) => ({
+  ...(await importOriginal()),
+  resolveNode: mockResolveNode
+}))
+
+vi.mock('@/renderer/core/canvas/canvasStore', () => ({
+  useCanvasStore: () => ({
+    getCanvas: () => ({ read_only: false })
+  })
+}))
+
+vi.mock('@/components/builder/useEmptyWorkflowDialog', () => ({
+  useEmptyWorkflowDialog: () => mockEmptyWorkflowDialog
+}))
+
+import { useAppModeStore } from './appModeStore'
+
+function createBuilderWorkflow(
+  activeMode: string = 'builder:inputs'
+): LoadedComfyWorkflow {
+  const workflow = new ComfyWorkflowClass({
+    path: 'workflows/test.json',
+    modified: Date.now(),
+    size: 100
+  })
+  workflow.changeTracker = createMockChangeTracker()
+  workflow.content = '{}'
+  workflow.originalContent = '{}'
+  workflow.activeMode = activeMode as LoadedComfyWorkflow['activeMode']
+  return workflow as LoadedComfyWorkflow
+}
+
+describe('appModeStore', () => {
+  let workflowStore: ReturnType<typeof useWorkflowStore>
+  let store: ReturnType<typeof useAppModeStore>
+
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    vi.mocked(app.rootGraph).extra = {}
+    mockResolveNode.mockReturnValue(undefined)
+    vi.mocked(app.rootGraph).nodes = [{ id: 1 } as LGraphNode]
+    workflowStore = useWorkflowStore()
+    store = useAppModeStore()
+    vi.clearAllMocks()
+  })
+
+  describe('enterBuilder', () => {
+    it('navigates to builder:arrange when in app mode with outputs', () => {
+      workflowStore.activeWorkflow = createBuilderWorkflow('app')
+      store.selectedOutputs.push(1)
+
+      store.enterBuilder()
+
+      expect(workflowStore.activeWorkflow!.activeMode).toBe('builder:arrange')
+    })
+
+    it('navigates to builder:inputs when in app mode without outputs', () => {
+      workflowStore.activeWorkflow = createBuilderWorkflow('app')
+
+      store.enterBuilder()
+
+      expect(workflowStore.activeWorkflow!.activeMode).toBe('builder:inputs')
+    })
+
+    it('navigates to builder:inputs when in graph mode with outputs', () => {
+      workflowStore.activeWorkflow = createBuilderWorkflow('graph')
+      store.selectedOutputs.push(1)
+
+      store.enterBuilder()
+
+      expect(workflowStore.activeWorkflow!.activeMode).toBe('builder:inputs')
+    })
+
+    it('navigates to builder:inputs when in graph mode without outputs', () => {
+      workflowStore.activeWorkflow = createBuilderWorkflow('graph')
+
+      store.enterBuilder()
+
+      expect(workflowStore.activeWorkflow!.activeMode).toBe('builder:inputs')
+    })
+
+    it('shows empty workflow dialog when graph has no nodes', () => {
+      vi.mocked(app.rootGraph).nodes = []
+      workflowStore.activeWorkflow = createBuilderWorkflow('graph')
+
+      store.enterBuilder()
+
+      expect(mockEmptyWorkflowDialog.show).toHaveBeenCalledWith(
+        expect.objectContaining({
+          onEnterBuilder: expect.any(Function),
+          onDismiss: expect.any(Function)
+        })
+      )
+      expect(workflowStore.activeWorkflow!.activeMode).toBe('graph')
+    })
+  })
+
+  describe('empty workflow dialog callbacks', () => {
+    function getDialogOptions(nodes: LGraphNode[] = []) {
+      vi.mocked(app.rootGraph).nodes = nodes
+      workflowStore.activeWorkflow = createBuilderWorkflow('graph')
+      store.enterBuilder()
+      return mockEmptyWorkflowDialog.lastOptions
+    }
+
+    it('onDismiss sets graph mode', () => {
+      const options = getDialogOptions()
+
+      // Move to builder so onDismiss must actually transition back
+      workflowStore.activeWorkflow!.activeMode = 'builder:inputs'
+
+      options.onDismiss()
+
+      expect(workflowStore.activeWorkflow!.activeMode).toBe('graph')
+    })
+
+    it('onEnterBuilder enters builder when nodes exist', () => {
+      const options = getDialogOptions([{ id: 1 } as LGraphNode])
+
+      options.onEnterBuilder()
+
+      expect(workflowStore.activeWorkflow!.activeMode).toBe('builder:inputs')
+    })
+
+    it('onEnterBuilder shows dialog again when no nodes', () => {
+      const options = getDialogOptions()
+
+      mockEmptyWorkflowDialog.show.mockClear()
+      options.onEnterBuilder()
+
+      expect(mockEmptyWorkflowDialog.show).toHaveBeenCalled()
+    })
+  })
+
+  describe('loadSelections pruning', () => {
+    function mockNode(id: number) {
+      return { id }
+    }
+
+    function workflowWithLinearData(
+      inputs: [number, string][],
+      outputs: number[]
+    ) {
+      const workflow = createBuilderWorkflow('app')
+      workflow.changeTracker = createMockChangeTracker({
+        activeState: {
+          last_node_id: 0,
+          last_link_id: 0,
+          nodes: [],
+          links: [],
+          groups: [],
+          config: {},
+          version: 0.4,
+          extra: { linearData: { inputs, outputs } }
+        }
+      } as unknown as Partial<ChangeTracker>)
+      return workflow
+    }
+
+    it('removes inputs referencing deleted nodes on load', async () => {
+      const node1 = mockNode(1)
+      mockResolveNode.mockImplementation((id) =>
+        id == 1 ? (node1 as unknown as LGraphNode) : undefined
+      )
+
+      workflowStore.activeWorkflow = workflowWithLinearData(
+        [
+          [1, 'prompt'],
+          [99, 'width']
+        ],
+        []
+      )
+      await nextTick()
+
+      expect(store.selectedInputs).toEqual([[1, 'prompt']])
+    })
+
+    it('keeps inputs for existing nodes even if widget is missing', async () => {
+      const node1 = mockNode(1)
+      mockResolveNode.mockImplementation((id) =>
+        id == 1 ? (node1 as unknown as LGraphNode) : undefined
+      )
+
+      workflowStore.activeWorkflow = workflowWithLinearData(
+        [
+          [1, 'prompt'],
+          [1, 'deleted_widget']
+        ],
+        []
+      )
+      await nextTick()
+
+      expect(store.selectedInputs).toEqual([
+        [1, 'prompt'],
+        [1, 'deleted_widget']
+      ])
+    })
+
+    it('removes outputs referencing deleted nodes on load', async () => {
+      const node1 = mockNode(1)
+      mockResolveNode.mockImplementation((id) =>
+        id == 1 ? (node1 as unknown as LGraphNode) : undefined
+      )
+
+      workflowStore.activeWorkflow = workflowWithLinearData([], [1, 99])
+      await nextTick()
+
+      expect(store.selectedOutputs).toEqual([1])
+    })
+
+    it('hasOutputs is false when all output nodes are deleted', async () => {
+      mockResolveNode.mockReturnValue(undefined)
+
+      workflowStore.activeWorkflow = workflowWithLinearData([], [10, 20])
+      await nextTick()
+
+      expect(store.selectedOutputs).toEqual([])
+      expect(store.hasOutputs).toBe(false)
+    })
+  })
+
+  describe('linearData sync watcher', () => {
+    it('writes linearData to rootGraph.extra when in builder mode', async () => {
+      workflowStore.activeWorkflow = createBuilderWorkflow()
+      await nextTick()
+
+      store.selectedOutputs.push(1)
+      await nextTick()
+
+      expect(app.rootGraph.extra.linearData).toEqual({
+        inputs: [],
+        outputs: [1]
+      })
+    })
+
+    it('does not write linearData when not in builder mode', async () => {
+      workflowStore.activeWorkflow = createBuilderWorkflow('graph')
+      await nextTick()
+
+      store.selectedOutputs.push(1)
+      await nextTick()
+
+      expect(app.rootGraph.extra.linearData).toBeUndefined()
+    })
+
+    it('does not write when rootGraph is null', async () => {
+      workflowStore.activeWorkflow = createBuilderWorkflow()
+      await nextTick()
+
+      const originalRootGraph = app.rootGraph
+      Object.defineProperty(app, 'rootGraph', { value: null, writable: true })
+
+      store.selectedOutputs.push(1)
+      await nextTick()
+
+      Object.defineProperty(app, 'rootGraph', {
+        value: originalRootGraph,
+        writable: true
+      })
+    })
+
+    it('reflects input changes in linearData', async () => {
+      workflowStore.activeWorkflow = createBuilderWorkflow()
+      await nextTick()
+
+      store.selectedInputs.push([42, 'prompt'])
+      await nextTick()
+
+      expect(app.rootGraph.extra.linearData).toEqual({
+        inputs: [[42, 'prompt']],
+        outputs: []
+      })
+    })
+  })
+})
diff --git a/src/stores/appModeStore.ts b/src/stores/appModeStore.ts
new file mode 100644
index 0000000000..645fa7b58e
--- /dev/null
+++ b/src/stores/appModeStore.ts
@@ -0,0 +1,129 @@
+import { defineStore } from 'pinia'
+import { reactive, computed, watch } from 'vue'
+
+import { useEmptyWorkflowDialog } from '@/components/builder/useEmptyWorkflowDialog'
+import { useAppMode } from '@/composables/useAppMode'
+import type { NodeId } from '@/lib/litegraph/src/LGraphNode'
+import type { LinearData } from '@/platform/workflow/management/stores/comfyWorkflow'
+import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
+import { app } from '@/scripts/app'
+import { resolveNode } from '@/utils/litegraphUtil'
+
+export const useAppModeStore = defineStore('appMode', () => {
+  const { getCanvas } = useCanvasStore()
+  const workflowStore = useWorkflowStore()
+  const { mode, setMode, isBuilderMode, isSelectMode } = useAppMode()
+  const emptyWorkflowDialog = useEmptyWorkflowDialog()
+
+  const selectedInputs = reactive<[NodeId, string][]>([])
+  const selectedOutputs = reactive<NodeId[]>([])
+  const hasOutputs = computed(() => !!selectedOutputs.length)
+  const hasNodes = computed(() => {
+    // Nodes are not reactive, so trigger recomputation when workflow changes
+    void workflowStore.activeWorkflow
+    void mode.value
+    return !!app.rootGraph?.nodes?.length
+  })
+
+  function loadSelections(data: Partial<LinearData> | undefined) {
+    const rawInputs = data?.inputs ?? []
+    const rawOutputs = data?.outputs ?? []
+
+    // Prune entries referencing nodes deleted in workflow mode.
+    // Only check node existence, not widgets — dynamic widgets can
+    // hide/show other widgets so a missing widget does not mean stale data.
+    const inputs = app.rootGraph
+      ? rawInputs.filter(([nodeId]) => resolveNode(nodeId))
+      : rawInputs
+    const outputs = app.rootGraph
+      ? rawOutputs.filter((nodeId) => resolveNode(nodeId))
+      : rawOutputs
+
+    selectedInputs.splice(0, selectedInputs.length, ...inputs)
+    selectedOutputs.splice(0, selectedOutputs.length, ...outputs)
+  }
+
+  function resetSelectedToWorkflow() {
+    const { activeWorkflow } = workflowStore
+    if (!activeWorkflow) return
+
+    loadSelections(activeWorkflow.changeTracker?.activeState?.extra?.linearData)
+  }
+
+  watch(
+    () => workflowStore.activeWorkflow,
+    (newWorkflow) => {
+      if (newWorkflow) {
+        loadSelections(
+          newWorkflow.changeTracker?.activeState?.extra?.linearData
+        )
+      } else {
+        loadSelections(undefined)
+      }
+    },
+    { immediate: true }
+  )
+
+  watch(
+    () =>
+      isBuilderMode.value
+        ? { inputs: selectedInputs, outputs: selectedOutputs }
+        : null,
+    (data) => {
+      if (!data) return
+      const graph = app.rootGraph
+      if (!graph) return
+      const extra = (graph.extra ??= {})
+      extra.linearData = {
+        inputs: [...data.inputs],
+        outputs: [...data.outputs]
+      }
+    },
+    { deep: true }
+  )
+
+  let unwatch: () => void | undefined
+  watch(isSelectMode, (inSelect) => {
+    const { state } = getCanvas()
+    if (!state) return
+    state.readOnly = inSelect
+    unwatch?.()
+    if (inSelect)
+      unwatch = watch(
+        () => state.readOnly,
+        () => (state.readOnly = true)
+      )
+  })
+
+  function enterBuilder() {
+    if (!hasNodes.value) {
+      emptyWorkflowDialog.show({
+        onEnterBuilder: () => enterBuilder(),
+        onDismiss: () => setMode('graph')
+      })
+      return
+    }
+
+    setMode(
+      mode.value === 'app' && hasOutputs.value
+        ? 'builder:arrange'
+        : 'builder:inputs'
+    )
+  }
+
+  async function exitBuilder() {
+    resetSelectedToWorkflow()
+    setMode('graph')
+  }
+
+  return {
+    enterBuilder,
+    exitBuilder,
+    hasNodes,
+    hasOutputs,
+    resetSelectedToWorkflow,
+    selectedInputs,
+    selectedOutputs
+  }
+})
diff --git a/src/stores/assetDownloadStore.test.ts b/src/stores/assetDownloadStore.test.ts
new file mode 100644
index 0000000000..fd428c36eb
--- /dev/null
+++ b/src/stores/assetDownloadStore.test.ts
@@ -0,0 +1,315 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { TaskResponse } from '@/platform/tasks/services/taskService'
+import { taskService } from '@/platform/tasks/services/taskService'
+import type { AssetDownloadWsMessage } from '@/schemas/apiSchema'
+import { useAssetDownloadStore } from '@/stores/assetDownloadStore'
+
+type DownloadEventHandler = (e: CustomEvent<AssetDownloadWsMessage>) => void
+
+const eventHandler = vi.hoisted(() => {
+  const state: { current: DownloadEventHandler | null } = { current: null }
+  return state
+})
+
+vi.mock('@/scripts/api', () => ({
+  api: {
+    addEventListener: vi.fn((_event: string, handler: DownloadEventHandler) => {
+      eventHandler.current = handler
+    }),
+    removeEventListener: vi.fn()
+  }
+}))
+
+vi.mock('@/platform/tasks/services/taskService', () => ({
+  taskService: {
+    getTask: vi.fn()
+  }
+}))
+
+function createDownloadMessage(
+  overrides: Partial<AssetDownloadWsMessage> = {}
+): AssetDownloadWsMessage {
+  return {
+    task_id: 'task-123',
+    asset_id: 'asset-456',
+    asset_name: 'model.safetensors',
+    bytes_total: 1000,
+    bytes_downloaded: 500,
+    progress: 50,
+    status: 'running',
+    ...overrides
+  }
+}
+
+function dispatch(msg: AssetDownloadWsMessage) {
+  if (!eventHandler.current) {
+    throw new Error(
+      'Event handler not registered. Call useAssetDownloadStore() first.'
+    )
+  }
+  eventHandler.current(new CustomEvent('asset_download', { detail: msg }))
+}
+
+describe('useAssetDownloadStore', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    vi.useFakeTimers({ shouldAdvanceTime: false })
+    vi.resetAllMocks()
+    eventHandler.current = null
+  })
+
+  afterEach(() => {
+    vi.useRealTimers()
+  })
+
+  describe('handleAssetDownload', () => {
+    it('tracks running downloads', () => {
+      const store = useAssetDownloadStore()
+
+      dispatch(createDownloadMessage())
+
+      expect(store.activeDownloads).toHaveLength(1)
+      expect(store.activeDownloads[0].taskId).toBe('task-123')
+      expect(store.activeDownloads[0].progress).toBe(50)
+    })
+
+    it('moves download to finished when completed', () => {
+      const store = useAssetDownloadStore()
+
+      dispatch(createDownloadMessage({ status: 'running' }))
+      expect(store.activeDownloads).toHaveLength(1)
+
+      dispatch(createDownloadMessage({ status: 'completed', progress: 100 }))
+
+      expect(store.activeDownloads).toHaveLength(0)
+      expect(store.finishedDownloads).toHaveLength(1)
+      expect(store.finishedDownloads[0].status).toBe('completed')
+    })
+
+    it('moves download to finished when failed', () => {
+      const store = useAssetDownloadStore()
+
+      dispatch(createDownloadMessage({ status: 'running' }))
+      dispatch(
+        createDownloadMessage({ status: 'failed', error: 'Network error' })
+      )
+
+      expect(store.activeDownloads).toHaveLength(0)
+      expect(store.finishedDownloads).toHaveLength(1)
+      expect(store.finishedDownloads[0].status).toBe('failed')
+      expect(store.finishedDownloads[0].error).toBe('Network error')
+    })
+
+    it('ignores duplicate terminal state messages', () => {
+      const store = useAssetDownloadStore()
+
+      dispatch(createDownloadMessage({ status: 'completed', progress: 100 }))
+      dispatch(createDownloadMessage({ status: 'completed', progress: 100 }))
+
+      expect(store.finishedDownloads).toHaveLength(1)
+    })
+  })
+
+  describe('trackDownload', () => {
+    it('associates task with model type for completion tracking', () => {
+      const store = useAssetDownloadStore()
+
+      store.trackDownload('task-123', 'checkpoints', 'model.safetensors')
+      dispatch(createDownloadMessage({ status: 'completed', progress: 100 }))
+
+      expect(store.lastCompletedDownload).toMatchObject({
+        taskId: 'task-123',
+        modelType: 'checkpoints'
+      })
+    })
+
+    it('handles out-of-order messages where completed arrives before progress', () => {
+      const store = useAssetDownloadStore()
+
+      store.trackDownload('task-123', 'checkpoints', 'model.safetensors')
+
+      dispatch(createDownloadMessage({ status: 'completed', progress: 100 }))
+
+      dispatch(createDownloadMessage({ status: 'running', progress: 50 }))
+
+      expect(store.activeDownloads).toHaveLength(0)
+      expect(store.finishedDownloads).toHaveLength(1)
+      expect(store.finishedDownloads[0].status).toBe('completed')
+      expect(store.lastCompletedDownload?.modelType).toBe('checkpoints')
+    })
+  })
+
+  describe('stale download polling', () => {
+    function createTaskResponse(
+      overrides: Partial<TaskResponse> = {}
+    ): TaskResponse {
+      return {
+        id: 'task-123',
+        idempotency_key: 'key-123',
+        task_name: 'task:download_file',
+        payload: {},
+        status: 'completed',
+        create_time: new Date().toISOString(),
+        update_time: new Date().toISOString(),
+        result: {
+          success: true,
+          asset_id: 'asset-456',
+          filename: 'model.safetensors',
+          bytes_downloaded: 1000
+        },
+        ...overrides
+      }
+    }
+
+    it('polls and completes stale downloads', async () => {
+      const store = useAssetDownloadStore()
+
+      vi.mocked(taskService.getTask).mockResolvedValue(createTaskResponse())
+
+      dispatch(createDownloadMessage({ status: 'running' }))
+      expect(store.activeDownloads).toHaveLength(1)
+
+      await vi.advanceTimersByTimeAsync(45_000)
+
+      expect(taskService.getTask).toHaveBeenCalledWith('task-123')
+      expect(store.activeDownloads).toHaveLength(0)
+      expect(store.finishedDownloads[0].status).toBe('completed')
+    })
+
+    it('polls and marks failed downloads', async () => {
+      const store = useAssetDownloadStore()
+
+      vi.mocked(taskService.getTask).mockResolvedValue(
+        createTaskResponse({
+          status: 'failed',
+          error_message: 'Download failed',
+          result: { success: false, error: 'Network error' }
+        })
+      )
+
+      dispatch(createDownloadMessage({ status: 'running' }))
+      await vi.advanceTimersByTimeAsync(45_000)
+
+      expect(store.activeDownloads).toHaveLength(0)
+      expect(store.finishedDownloads[0].status).toBe('failed')
+      expect(store.finishedDownloads[0].error).toBe('Download failed')
+    })
+
+    it('does not complete if task still running', async () => {
+      const store = useAssetDownloadStore()
+
+      vi.mocked(taskService.getTask).mockResolvedValue(
+        createTaskResponse({ status: 'running', result: undefined })
+      )
+
+      dispatch(createDownloadMessage({ status: 'running' }))
+      await vi.advanceTimersByTimeAsync(45_000)
+
+      expect(taskService.getTask).toHaveBeenCalled()
+      expect(store.activeDownloads).toHaveLength(1)
+    })
+
+    it('continues tracking on polling error', async () => {
+      const store = useAssetDownloadStore()
+
+      vi.mocked(taskService.getTask).mockRejectedValue(new Error('Not found'))
+      dispatch(createDownloadMessage({ status: 'running' }))
+
+      await vi.advanceTimersByTimeAsync(45_000)
+
+      expect(store.activeDownloads).toHaveLength(1)
+    })
+  })
+
+  describe('clearFinishedDownloads', () => {
+    it('removes all finished downloads', () => {
+      const store = useAssetDownloadStore()
+
+      dispatch(createDownloadMessage({ status: 'completed', progress: 100 }))
+      expect(store.finishedDownloads).toHaveLength(1)
+
+      store.clearFinishedDownloads()
+
+      expect(store.finishedDownloads).toHaveLength(0)
+    })
+  })
+
+  describe('session download tracking', () => {
+    it('counts unacknowledged completed downloads with asset IDs', () => {
+      const store = useAssetDownloadStore()
+
+      dispatch(
+        createDownloadMessage({
+          status: 'completed',
+          progress: 100,
+          asset_id: 'asset-456'
+        })
+      )
+
+      expect(store.sessionDownloadCount).toBe(1)
+    })
+
+    it('does not count completed downloads without asset IDs', () => {
+      const store = useAssetDownloadStore()
+
+      dispatch(
+        createDownloadMessage({
+          status: 'completed',
+          progress: 100,
+          asset_id: undefined
+        })
+      )
+
+      expect(store.sessionDownloadCount).toBe(0)
+    })
+
+    it('does not count failed downloads', () => {
+      const store = useAssetDownloadStore()
+
+      dispatch(
+        createDownloadMessage({
+          status: 'failed',
+          asset_id: 'asset-456'
+        })
+      )
+
+      expect(store.sessionDownloadCount).toBe(0)
+    })
+
+    it('isDownloadedThisSession returns true for unacknowledged downloads', () => {
+      const store = useAssetDownloadStore()
+
+      dispatch(
+        createDownloadMessage({
+          status: 'completed',
+          progress: 100,
+          asset_id: 'asset-456'
+        })
+      )
+
+      expect(store.isDownloadedThisSession('asset-456')).toBe(true)
+      expect(store.isDownloadedThisSession('other-asset')).toBe(false)
+    })
+
+    it('acknowledgeAsset decrements session count', () => {
+      const store = useAssetDownloadStore()
+
+      dispatch(
+        createDownloadMessage({
+          status: 'completed',
+          progress: 100,
+          asset_id: 'asset-456'
+        })
+      )
+      expect(store.sessionDownloadCount).toBe(1)
+
+      store.acknowledgeAsset('asset-456')
+
+      expect(store.sessionDownloadCount).toBe(0)
+      expect(store.isDownloadedThisSession('asset-456')).toBe(false)
+    })
+  })
+})
diff --git a/src/stores/assetDownloadStore.ts b/src/stores/assetDownloadStore.ts
new file mode 100644
index 0000000000..054f28a775
--- /dev/null
+++ b/src/stores/assetDownloadStore.ts
@@ -0,0 +1,202 @@
+import { useIntervalFn } from '@vueuse/core'
+import { defineStore } from 'pinia'
+import { computed, ref, watch } from 'vue'
+
+import { taskService } from '@/platform/tasks/services/taskService'
+import type { AssetDownloadWsMessage } from '@/schemas/apiSchema'
+import { api } from '@/scripts/api'
+
+export interface AssetDownload {
+  taskId: string
+  assetName: string
+  bytesTotal: number
+  bytesDownloaded: number
+  progress: number
+  status: 'created' | 'running' | 'completed' | 'failed'
+  lastUpdate: number
+  assetId?: string
+  error?: string
+  modelType?: string
+  acknowledged?: boolean
+}
+
+interface CompletedDownload {
+  taskId: string
+  modelType: string
+  timestamp: number
+}
+const STALE_THRESHOLD_MS = 10_000
+const POLL_INTERVAL_MS = 10_000
+
+function generateDownloadTrackingPlaceholder(
+  taskId: string,
+  modelType: string,
+  assetName: string
+): AssetDownload {
+  return {
+    taskId,
+    modelType,
+    assetName,
+    bytesTotal: 0,
+    bytesDownloaded: 0,
+    progress: 0,
+    status: 'created',
+    lastUpdate: Date.now()
+  }
+}
+
+export const useAssetDownloadStore = defineStore('assetDownload', () => {
+  const downloads = ref<Map<string, AssetDownload>>(new Map())
+  const lastCompletedDownload = ref<CompletedDownload | null>(null)
+
+  const downloadList = computed(() => Array.from(downloads.value.values()))
+  const activeDownloads = computed(() =>
+    downloadList.value.filter(
+      (d) => d.status === 'created' || d.status === 'running'
+    )
+  )
+  const finishedDownloads = computed(() =>
+    downloadList.value.filter(
+      (d) => d.status === 'completed' || d.status === 'failed'
+    )
+  )
+  const unacknowledgedDownloads = computed(() =>
+    finishedDownloads.value.filter(
+      (d) => d.status === 'completed' && d.assetId && !d.acknowledged
+    )
+  )
+  const sessionDownloadCount = computed(
+    () => unacknowledgedDownloads.value.length
+  )
+  const hasActiveDownloads = computed(() => activeDownloads.value.length > 0)
+  const hasDownloads = computed(() => downloads.value.size > 0)
+
+  function isDownloadedThisSession(assetId: string): boolean {
+    return unacknowledgedDownloads.value.some((d) => d.assetId === assetId)
+  }
+
+  function acknowledgeAsset(assetId: string) {
+    for (const download of downloads.value.values()) {
+      if (download.assetId === assetId) {
+        download.acknowledged = true
+      }
+    }
+  }
+
+  function trackDownload(taskId: string, modelType: string, assetName: string) {
+    if (downloads.value.has(taskId)) return
+
+    downloads.value.set(
+      taskId,
+      generateDownloadTrackingPlaceholder(taskId, modelType, assetName)
+    )
+  }
+
+  function handleAssetDownload(e: CustomEvent<AssetDownloadWsMessage>) {
+    const data = e.detail
+    const existing = downloads.value.get(data.task_id)
+
+    // Skip if already in terminal state
+    if (existing?.status === 'completed' || existing?.status === 'failed') {
+      return
+    }
+
+    const download: AssetDownload = {
+      taskId: data.task_id,
+      assetId: data.asset_id,
+      assetName: data.asset_name,
+      bytesTotal: data.bytes_total,
+      bytesDownloaded: data.bytes_downloaded,
+      progress: data.progress,
+      status: data.status,
+      error: data.error,
+      lastUpdate: Date.now(),
+      modelType: existing?.modelType
+    }
+
+    downloads.value.set(data.task_id, download)
+
+    if (data.status === 'completed' && download.modelType) {
+      lastCompletedDownload.value = {
+        taskId: data.task_id,
+        modelType: download.modelType,
+        timestamp: Date.now()
+      }
+    }
+  }
+
+  async function pollStaleDownloads() {
+    const now = Date.now()
+    const staleDownloads = activeDownloads.value.filter(
+      (d) => now - d.lastUpdate >= STALE_THRESHOLD_MS
+    )
+
+    if (staleDownloads.length === 0) return
+
+    async function pollSingleDownload(download: AssetDownload) {
+      try {
+        const task = await taskService.getTask(download.taskId)
+
+        if (task.status === 'completed' || task.status === 'failed') {
+          const result = task.result
+          handleAssetDownload(
+            new CustomEvent('asset_download', {
+              detail: {
+                task_id: download.taskId,
+                asset_id: result?.asset_id ?? download.assetId,
+                asset_name: result?.filename ?? download.assetName,
+                bytes_total: download.bytesTotal,
+                bytes_downloaded:
+                  result?.bytes_downloaded ?? download.bytesTotal,
+                progress: task.status === 'completed' ? 100 : download.progress,
+                status: task.status,
+                error: task.error_message ?? result?.error
+              }
+            })
+          )
+        }
+      } catch {
+        // Task not ready or not found
+      }
+    }
+
+    await Promise.all(staleDownloads.map(pollSingleDownload))
+  }
+
+  const { pause, resume } = useIntervalFn(
+    () => void pollStaleDownloads(),
+    POLL_INTERVAL_MS,
+    { immediate: false }
+  )
+
+  watch(
+    hasActiveDownloads,
+    (hasActive) => {
+      if (hasActive) resume()
+      else pause()
+    },
+    { immediate: true }
+  )
+
+  api.addEventListener('asset_download', handleAssetDownload)
+
+  function clearFinishedDownloads() {
+    for (const download of finishedDownloads.value) {
+      downloads.value.delete(download.taskId)
+    }
+  }
+
+  return {
+    activeDownloads,
+    finishedDownloads,
+    hasActiveDownloads,
+    hasDownloads,
+    downloadList,
+    lastCompletedDownload,
+    sessionDownloadCount,
+    trackDownload,
+    clearFinishedDownloads,
+    isDownloadedThisSession,
+    acknowledgeAsset
+  }
+})
diff --git a/src/stores/assetExportStore.ts b/src/stores/assetExportStore.ts
new file mode 100644
index 0000000000..a8fe9ada53
--- /dev/null
+++ b/src/stores/assetExportStore.ts
@@ -0,0 +1,199 @@
+import { useIntervalFn } from '@vueuse/core'
+import { defineStore } from 'pinia'
+import { computed, ref, watch } from 'vue'
+
+import { assetService } from '@/platform/assets/services/assetService'
+import { useToastStore } from '@/platform/updates/common/toastStore'
+import { taskService } from '@/platform/tasks/services/taskService'
+import type { AssetExportWsMessage } from '@/schemas/apiSchema'
+import { api } from '@/scripts/api'
+import { t } from '@/i18n'
+
+export interface AssetExport {
+  taskId: string
+  exportName: string
+  assetsTotal: number
+  assetsAttempted: number
+  assetsFailed: number
+  bytesTotal: number
+  bytesProcessed: number
+  progress: number
+  status: 'created' | 'running' | 'completed' | 'failed'
+  error?: string
+  downloadError?: string
+  lastUpdate: number
+  downloadTriggered: boolean
+}
+
+const STALE_THRESHOLD_MS = 10_000
+const POLL_INTERVAL_MS = 10_000
+
+export const useAssetExportStore = defineStore('assetExport', () => {
+  const exports = ref<Map<string, AssetExport>>(new Map())
+
+  const exportList = computed(() => Array.from(exports.value.values()))
+  const activeExports = computed(() =>
+    exportList.value.filter(
+      (e) => e.status === 'created' || e.status === 'running'
+    )
+  )
+  const finishedExports = computed(() =>
+    exportList.value.filter(
+      (e) => e.status === 'completed' || e.status === 'failed'
+    )
+  )
+  const hasActiveExports = computed(() => activeExports.value.length > 0)
+  const hasExports = computed(() => exports.value.size > 0)
+
+  function trackExport(taskId: string) {
+    if (exports.value.has(taskId)) return
+
+    exports.value.set(taskId, {
+      taskId,
+      exportName: '',
+      assetsTotal: 0,
+      assetsAttempted: 0,
+      assetsFailed: 0,
+      bytesTotal: 0,
+      bytesProcessed: 0,
+      progress: 0,
+      status: 'created',
+      lastUpdate: Date.now(),
+      downloadTriggered: false
+    })
+  }
+
+  async function triggerDownload(exp: AssetExport, force = false) {
+    if (!force && (exp.downloadTriggered || !exp.exportName)) return
+    exp.downloadTriggered = true
+
+    try {
+      exp.downloadError = undefined
+      const { url } = await assetService.getExportDownloadUrl(exp.exportName)
+      const link = document.createElement('a')
+      link.href = url
+      link.download = exp.exportName
+      link.style.display = 'none'
+      link.target = '_blank'
+      link.rel = 'noopener noreferrer'
+      document.body.appendChild(link)
+      link.click()
+      document.body.removeChild(link)
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error)
+      exp.downloadError = message
+      exp.downloadTriggered = false
+
+      useToastStore().add({
+        severity: 'error',
+        summary: t('exportToast.downloadFailed', {
+          name: exp.exportName
+        }),
+        detail: message
+      })
+    }
+  }
+
+  function handleAssetExport(data: AssetExportWsMessage) {
+    const existing = exports.value.get(data.task_id)
+
+    if (
+      (existing?.status === 'completed' || existing?.status === 'failed') &&
+      existing?.downloadTriggered
+    ) {
+      return
+    }
+
+    const exp: AssetExport = {
+      taskId: data.task_id,
+      exportName: data.export_name ?? existing?.exportName ?? '',
+      assetsTotal: data.assets_total,
+      assetsAttempted: data.assets_attempted,
+      assetsFailed: data.assets_failed,
+      bytesTotal: data.bytes_total,
+      bytesProcessed: data.bytes_processed,
+      progress: data.progress,
+      status: data.status,
+      error: data.error,
+      lastUpdate: Date.now(),
+      downloadTriggered: existing?.downloadTriggered ?? false
+    }
+
+    exports.value.set(data.task_id, exp)
+
+    if (data.status === 'completed') {
+      void triggerDownload(exp)
+    }
+  }
+
+  async function pollStaleExports() {
+    const now = Date.now()
+    const staleExports = activeExports.value.filter(
+      (e) => now - e.lastUpdate >= STALE_THRESHOLD_MS
+    )
+
+    if (staleExports.length === 0) return
+
+    async function pollSingleExport(exp: AssetExport) {
+      try {
+        const task = await taskService.getTask(exp.taskId)
+
+        if (task.status === 'completed' || task.status === 'failed') {
+          const result = task.result as Record<string, unknown> | undefined
+          handleAssetExport({
+            task_id: exp.taskId,
+            export_name: (result?.export_name as string) ?? exp.exportName,
+            assets_total: (result?.assets_total as number) ?? exp.assetsTotal,
+            assets_attempted:
+              (result?.assets_attempted as number) ?? exp.assetsAttempted,
+            assets_failed:
+              (result?.assets_failed as number) ?? exp.assetsFailed,
+            bytes_total: exp.bytesTotal,
+            bytes_processed: exp.bytesTotal,
+            progress: task.status === 'completed' ? 1 : exp.progress,
+            status: task.status as 'completed' | 'failed',
+            error: task.error_message ?? (result?.error as string)
+          })
+        }
+      } catch {
+        // Task not ready or not found
+      }
+    }
+
+    await Promise.all(staleExports.map(pollSingleExport))
+  }
+
+  const { pause, resume } = useIntervalFn(
+    () => void pollStaleExports(),
+    POLL_INTERVAL_MS,
+    { immediate: false }
+  )
+
+  watch(
+    hasActiveExports,
+    (hasActive) => {
+      if (hasActive) resume()
+      else pause()
+    },
+    { immediate: true }
+  )
+
+  api.addEventListener('asset_export', (e) => handleAssetExport(e.detail))
+
+  function clearFinishedExports() {
+    for (const exp of finishedExports.value) {
+      exports.value.delete(exp.taskId)
+    }
+  }
+
+  return {
+    activeExports,
+    finishedExports,
+    hasActiveExports,
+    hasExports,
+    exportList,
+    trackExport,
+    triggerDownload,
+    clearFinishedExports
+  }
+})
diff --git a/src/stores/assetsStore.test.ts b/src/stores/assetsStore.test.ts
new file mode 100644
index 0000000000..7fbfc102cf
--- /dev/null
+++ b/src/stores/assetsStore.test.ts
@@ -0,0 +1,853 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { nextTick, watch } from 'vue'
+
+import { useAssetsStore } from '@/stores/assetsStore'
+import { api } from '@/scripts/api'
+import type { JobListItem } from '@/platform/remote/comfyui/jobs/jobTypes'
+import { assetService } from '@/platform/assets/services/assetService'
+
+// Mock the api module
+vi.mock('@/scripts/api', () => ({
+  api: {
+    getHistory: vi.fn(),
+    internalURL: vi.fn((path) => `http://localhost:3000${path}`),
+    apiURL: vi.fn((path) => `http://localhost:3000/api${path}`),
+    addEventListener: vi.fn(),
+    removeEventListener: vi.fn(),
+    user: 'test-user'
+  }
+}))
+
+// Mock the asset service
+vi.mock('@/platform/assets/services/assetService', () => ({
+  assetService: {
+    getAssetsByTag: vi.fn(),
+    getAssetsForNodeType: vi.fn()
+  }
+}))
+
+// Mock distribution type - hoisted so it can be changed per test
+const mockIsCloud = vi.hoisted(() => ({ value: false }))
+vi.mock('@/platform/distribution/types', () => ({
+  get isCloud() {
+    return mockIsCloud.value
+  }
+}))
+
+// Mock modelToNodeStore with proper node providers and category lookups
+vi.mock('@/stores/modelToNodeStore', () => ({
+  useModelToNodeStore: () => ({
+    getAllNodeProviders: vi.fn((category: string) => {
+      const providers: Record<
+        string,
+        Array<{ nodeDef: { name: string }; key: string }>
+      > = {
+        checkpoints: [
+          { nodeDef: { name: 'CheckpointLoaderSimple' }, key: 'ckpt_name' },
+          { nodeDef: { name: 'ImageOnlyCheckpointLoader' }, key: 'ckpt_name' }
+        ],
+        loras: [
+          { nodeDef: { name: 'LoraLoader' }, key: 'lora_name' },
+          { nodeDef: { name: 'LoraLoaderModelOnly' }, key: 'lora_name' }
+        ],
+        vae: [{ nodeDef: { name: 'VAELoader' }, key: 'vae_name' }]
+      }
+      return providers[category] ?? []
+    }),
+    getCategoryForNodeType: vi.fn((nodeType: string) => {
+      const nodeToCategory: Record<string, string> = {
+        CheckpointLoaderSimple: 'checkpoints',
+        ImageOnlyCheckpointLoader: 'checkpoints',
+        LoraLoader: 'loras',
+        LoraLoaderModelOnly: 'loras',
+        VAELoader: 'vae'
+      }
+      return nodeToCategory[nodeType]
+    }),
+    getNodeProvider: vi.fn(),
+    registerDefaults: vi.fn()
+  })
+}))
+
+// Mock TaskItemImpl
+vi.mock('@/stores/queueStore', () => ({
+  TaskItemImpl: class {
+    public flatOutputs: Array<{
+      supportsPreview: boolean
+      filename: string
+      subfolder: string
+      type: string
+      url: string
+    }>
+    public previewOutput:
+      | {
+          supportsPreview: boolean
+          filename: string
+          subfolder: string
+          type: string
+          url: string
+        }
+      | undefined
+    public jobId: string
+
+    constructor(public job: JobListItem) {
+      this.jobId = job.id
+      this.flatOutputs = [
+        {
+          supportsPreview: true,
+          filename: 'test.png',
+          subfolder: '',
+          type: 'output',
+          url: 'http://test.com/test.png'
+        }
+      ]
+      this.previewOutput = this.flatOutputs[0]
+    }
+
+    get previewableOutputs() {
+      return this.flatOutputs.filter((o) => o.supportsPreview)
+    }
+  }
+}))
+
+// Mock asset mappers - add unique timestamps
+vi.mock('@/platform/assets/composables/media/assetMappers', () => ({
+  mapInputFileToAssetItem: vi.fn((name, index, type) => ({
+    id: `${type}-${index}`,
+    name,
+    size: 0,
+    created_at: new Date(Date.now() - index * 1000).toISOString(),
+    tags: [type],
+    preview_url: `http://test.com/${name}`
+  })),
+  mapTaskOutputToAssetItem: vi.fn((task, output) => {
+    const index = parseInt(task.jobId.split('_')[1]) || 0
+    return {
+      id: task.jobId,
+      name: output.filename,
+      size: 0,
+      created_at: new Date(Date.now() - index * 1000).toISOString(),
+      tags: ['output'],
+      preview_url: output.url,
+      user_metadata: {}
+    }
+  })
+}))
+
+describe('assetsStore - Refactored (Option A)', () => {
+  let store: ReturnType<typeof useAssetsStore>
+
+  // Helper function to create mock job items
+  const createMockJobItem = (index: number): JobListItem => ({
+    id: `prompt_${index}`,
+    status: 'completed',
+    create_time: 1000 + index,
+    update_time: 1000 + index,
+    last_state_update: 1000 + index,
+    priority: 1000 + index,
+    preview_output: {
+      filename: `output_${index}.png`,
+      subfolder: '',
+      type: 'output',
+      nodeId: 'node_1',
+      mediaType: 'images'
+    }
+  })
+
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    store = useAssetsStore()
+    vi.clearAllMocks()
+  })
+
+  describe('Initial Load', () => {
+    it('should load initial history items', async () => {
+      const mockHistory = Array.from({ length: 10 }, (_, i) =>
+        createMockJobItem(i)
+      )
+      vi.mocked(api.getHistory).mockResolvedValue(mockHistory)
+
+      await store.updateHistory()
+
+      expect(api.getHistory).toHaveBeenCalledWith(200, { offset: 0 })
+      expect(store.historyAssets).toHaveLength(10)
+      expect(store.hasMoreHistory).toBe(false) // Less than BATCH_SIZE
+      expect(store.historyLoading).toBe(false)
+      expect(store.historyError).toBe(null)
+    })
+
+    it('should set hasMoreHistory to true when batch is full', async () => {
+      const mockHistory = Array.from({ length: 200 }, (_, i) =>
+        createMockJobItem(i)
+      )
+      vi.mocked(api.getHistory).mockResolvedValue(mockHistory)
+
+      await store.updateHistory()
+
+      expect(store.historyAssets).toHaveLength(200)
+      expect(store.hasMoreHistory).toBe(true) // Exactly BATCH_SIZE
+    })
+
+    it('should handle errors during initial load', async () => {
+      const error = new Error('Failed to fetch')
+      vi.mocked(api.getHistory).mockRejectedValue(error)
+
+      await store.updateHistory()
+
+      expect(store.historyAssets).toHaveLength(0)
+      expect(store.historyError).toBe(error)
+      expect(store.historyLoading).toBe(false)
+    })
+  })
+
+  describe('Pagination', () => {
+    it('should accumulate items when loading more', async () => {
+      // First batch - full BATCH_SIZE
+      const firstBatch = Array.from({ length: 200 }, (_, i) =>
+        createMockJobItem(i)
+      )
+      vi.mocked(api.getHistory).mockResolvedValueOnce(firstBatch)
+
+      await store.updateHistory()
+      expect(store.historyAssets).toHaveLength(200)
+      expect(store.hasMoreHistory).toBe(true)
+
+      // Second batch - different items
+      const secondBatch = Array.from({ length: 200 }, (_, i) =>
+        createMockJobItem(200 + i)
+      )
+      vi.mocked(api.getHistory).mockResolvedValueOnce(secondBatch)
+
+      await store.loadMoreHistory()
+
+      expect(api.getHistory).toHaveBeenCalledWith(200, { offset: 200 })
+      expect(store.historyAssets).toHaveLength(400) // Accumulated
+      expect(store.hasMoreHistory).toBe(true)
+    })
+
+    it('should prevent duplicate items during pagination', async () => {
+      // First batch - full BATCH_SIZE
+      const firstBatch = Array.from({ length: 200 }, (_, i) =>
+        createMockJobItem(i)
+      )
+      vi.mocked(api.getHistory).mockResolvedValueOnce(firstBatch)
+
+      await store.updateHistory()
+      expect(store.historyAssets).toHaveLength(200)
+
+      // Second batch with some duplicates
+      const secondBatch = [
+        createMockJobItem(2), // Duplicate
+        createMockJobItem(5), // Duplicate
+        ...Array.from({ length: 198 }, (_, i) => createMockJobItem(200 + i)) // New
+      ]
+      vi.mocked(api.getHistory).mockResolvedValueOnce(secondBatch)
+
+      await store.loadMoreHistory()
+
+      // Should only add new items (198 new, 2 duplicates filtered)
+      expect(store.historyAssets).toHaveLength(398)
+
+      // Verify no duplicates
+      const assetIds = store.historyAssets.map((a) => a.id)
+      const uniqueAssetIds = new Set(assetIds)
+      expect(uniqueAssetIds.size).toBe(store.historyAssets.length)
+    })
+
+    it('should stop loading when no more items', async () => {
+      // First batch - less than BATCH_SIZE
+      const firstBatch = Array.from({ length: 50 }, (_, i) =>
+        createMockJobItem(i)
+      )
+      vi.mocked(api.getHistory).mockResolvedValueOnce(firstBatch)
+
+      await store.updateHistory()
+      expect(store.hasMoreHistory).toBe(false)
+
+      // Try to load more - should return early
+      await store.loadMoreHistory()
+
+      // Should only have been called once (initial load)
+      expect(api.getHistory).toHaveBeenCalledTimes(1)
+    })
+
+    it('should handle race conditions with concurrent loads', async () => {
+      // Setup initial state with full batch
+      const initialBatch = Array.from({ length: 200 }, (_, i) =>
+        createMockJobItem(i)
+      )
+      vi.mocked(api.getHistory).mockResolvedValueOnce(initialBatch)
+      await store.updateHistory()
+      expect(store.hasMoreHistory).toBe(true)
+
+      // Clear mock to count only loadMore calls
+      vi.mocked(api.getHistory).mockClear()
+
+      // Setup slow API response
+      let resolveLoadMore: (value: JobListItem[]) => void
+      const loadMorePromise = new Promise<JobListItem[]>((resolve) => {
+        resolveLoadMore = resolve
+      })
+      vi.mocked(api.getHistory).mockReturnValueOnce(loadMorePromise)
+
+      // Start first loadMore
+      const firstLoad = store.loadMoreHistory()
+
+      // Try concurrent load - should be ignored
+      const secondLoad = store.loadMoreHistory()
+
+      // Resolve
+      const secondBatch = Array.from({ length: 200 }, (_, i) =>
+        createMockJobItem(200 + i)
+      )
+      resolveLoadMore!(secondBatch)
+
+      await Promise.all([firstLoad, secondLoad])
+
+      // Only one API call
+      expect(api.getHistory).toHaveBeenCalledTimes(1)
+    })
+
+    it('should respect MAX_HISTORY_ITEMS limit', async () => {
+      const BATCH_COUNT = 6 // 6 × 200 = 1200 items
+
+      // Initial load
+      const firstBatch = Array.from({ length: 200 }, (_, i) =>
+        createMockJobItem(i)
+      )
+      vi.mocked(api.getHistory).mockResolvedValueOnce(firstBatch)
+      await store.updateHistory()
+
+      // Load additional batches
+      for (let batch = 1; batch < BATCH_COUNT; batch++) {
+        const items = Array.from({ length: 200 }, (_, i) =>
+          createMockJobItem(batch * 200 + i)
+        )
+        vi.mocked(api.getHistory).mockResolvedValueOnce(items)
+        await store.loadMoreHistory()
+      }
+
+      // Should be capped at MAX_HISTORY_ITEMS (1000)
+      expect(store.historyAssets).toHaveLength(1000)
+    })
+  })
+
+  describe('Sorting', () => {
+    it('should maintain date sorting after pagination', async () => {
+      // First batch
+      const firstBatch = Array.from({ length: 200 }, (_, i) =>
+        createMockJobItem(i)
+      )
+      vi.mocked(api.getHistory).mockResolvedValueOnce(firstBatch)
+
+      await store.updateHistory()
+
+      // Second batch
+      const secondBatch = Array.from({ length: 200 }, (_, i) =>
+        createMockJobItem(200 + i)
+      )
+      vi.mocked(api.getHistory).mockResolvedValueOnce(secondBatch)
+
+      await store.loadMoreHistory()
+
+      // Verify sorting (newest first - lower index = newer)
+      for (let i = 1; i < store.historyAssets.length; i++) {
+        const prevDate = new Date(store.historyAssets[i - 1].created_at ?? 0)
+        const currDate = new Date(store.historyAssets[i].created_at ?? 0)
+        expect(prevDate.getTime()).toBeGreaterThanOrEqual(currDate.getTime())
+      }
+    })
+  })
+
+  describe('Error Handling', () => {
+    it('should preserve existing data when loadMore fails', async () => {
+      // First successful load - full batch
+      const firstBatch = Array.from({ length: 200 }, (_, i) =>
+        createMockJobItem(i)
+      )
+      vi.mocked(api.getHistory).mockResolvedValueOnce(firstBatch)
+
+      await store.updateHistory()
+      expect(store.historyAssets).toHaveLength(200)
+
+      // Second load fails
+      const error = new Error('Network error')
+      vi.mocked(api.getHistory).mockRejectedValueOnce(error)
+
+      await store.loadMoreHistory()
+
+      // Should keep existing data
+      expect(store.historyAssets).toHaveLength(200)
+      expect(store.historyError).toBe(error)
+      expect(store.isLoadingMore).toBe(false)
+    })
+
+    it('should clear error state on successful retry', async () => {
+      // First load succeeds
+      const firstBatch = Array.from({ length: 200 }, (_, i) =>
+        createMockJobItem(i)
+      )
+      vi.mocked(api.getHistory).mockResolvedValueOnce(firstBatch)
+
+      await store.updateHistory()
+
+      // Second load fails
+      const error = new Error('Network error')
+      vi.mocked(api.getHistory).mockRejectedValueOnce(error)
+
+      await store.loadMoreHistory()
+      expect(store.historyError).toBe(error)
+
+      // Third load succeeds
+      const thirdBatch = Array.from({ length: 200 }, (_, i) =>
+        createMockJobItem(200 + i)
+      )
+      vi.mocked(api.getHistory).mockResolvedValueOnce(thirdBatch)
+
+      await store.loadMoreHistory()
+
+      // Error should be cleared
+      expect(store.historyError).toBe(null)
+      expect(store.historyAssets).toHaveLength(400)
+    })
+
+    it('should handle errors with proper loading state', async () => {
+      const error = new Error('API error')
+      vi.mocked(api.getHistory).mockRejectedValue(error)
+
+      await store.updateHistory()
+
+      expect(store.historyLoading).toBe(false)
+      expect(store.historyError).toBe(error)
+    })
+  })
+
+  describe('Memory Management', () => {
+    it('should cleanup when exceeding MAX_HISTORY_ITEMS', async () => {
+      // Load 1200 items (exceeds 1000 limit)
+      const batches = 6
+
+      for (let batch = 0; batch < batches; batch++) {
+        const items = Array.from({ length: 200 }, (_, i) =>
+          createMockJobItem(batch * 200 + i)
+        )
+        vi.mocked(api.getHistory).mockResolvedValueOnce(items)
+
+        if (batch === 0) {
+          await store.updateHistory()
+        } else {
+          await store.loadMoreHistory()
+        }
+      }
+
+      // Should be limited to 1000
+      expect(store.historyAssets).toHaveLength(1000)
+
+      // All items should be unique (Set cleanup works)
+      const assetIds = store.historyAssets.map((a) => a.id)
+      const uniqueAssetIds = new Set(assetIds)
+      expect(uniqueAssetIds.size).toBe(1000)
+    })
+
+    it('should maintain correct state after cleanup', async () => {
+      // Load items beyond limit
+      for (let batch = 0; batch < 6; batch++) {
+        const items = Array.from({ length: 200 }, (_, i) =>
+          createMockJobItem(batch * 200 + i)
+        )
+        vi.mocked(api.getHistory).mockResolvedValueOnce(items)
+
+        if (batch === 0) {
+          await store.updateHistory()
+        } else {
+          await store.loadMoreHistory()
+        }
+      }
+
+      expect(store.historyAssets).toHaveLength(1000)
+
+      // Should still maintain sorting
+      for (let i = 1; i < store.historyAssets.length; i++) {
+        const prevDate = new Date(store.historyAssets[i - 1].created_at ?? 0)
+        const currDate = new Date(store.historyAssets[i].created_at ?? 0)
+        expect(prevDate.getTime()).toBeGreaterThanOrEqual(currDate.getTime())
+      }
+    })
+  })
+
+  describe('jobDetailView Support', () => {
+    it('should include outputCount and allOutputs in user_metadata', async () => {
+      const mockHistory = Array.from({ length: 5 }, (_, i) =>
+        createMockJobItem(i)
+      )
+      vi.mocked(api.getHistory).mockResolvedValue(mockHistory)
+
+      await store.updateHistory()
+
+      // Check first asset
+      const asset = store.historyAssets[0]
+      expect(asset.user_metadata).toBeDefined()
+      expect(asset.user_metadata).toHaveProperty('outputCount')
+      expect(asset.user_metadata).toHaveProperty('allOutputs')
+      expect(Array.isArray(asset.user_metadata!.allOutputs)).toBe(true)
+    })
+  })
+})
+
+describe('assetsStore - Model Assets Cache (Cloud)', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    mockIsCloud.value = true
+    vi.clearAllMocks()
+  })
+
+  afterEach(() => {
+    mockIsCloud.value = false
+  })
+
+  const createMockAsset = (id: string, tags: string[] = ['models']) => ({
+    id,
+    name: `asset-${id}`,
+    size: 100,
+    created_at: new Date().toISOString(),
+    tags,
+    preview_url: `http://test.com/${id}`
+  })
+
+  describe('getAssets cache invalidation', () => {
+    it('should invalidate cache before mutating assets during batch loading', async () => {
+      const store = useAssetsStore()
+      const nodeType = 'CheckpointLoaderSimple'
+
+      const firstBatch = Array.from({ length: 500 }, (_, i) =>
+        createMockAsset(`asset-${i}`)
+      )
+      const secondBatch = Array.from({ length: 100 }, (_, i) =>
+        createMockAsset(`asset-${500 + i}`)
+      )
+
+      let callCount = 0
+      vi.mocked(assetService.getAssetsForNodeType).mockImplementation(
+        async () => {
+          callCount++
+          return callCount === 1 ? firstBatch : secondBatch
+        }
+      )
+
+      await store.updateModelsForNodeType(nodeType)
+
+      // Wait for background batch loading to complete
+      await vi.waitFor(() => {
+        expect(
+          vi.mocked(assetService.getAssetsForNodeType)
+        ).toHaveBeenCalledTimes(2)
+      })
+
+      const assets = store.getAssets(nodeType)
+      expect(assets).toHaveLength(600)
+    })
+
+    it('should not return stale cached array after background batch completes', async () => {
+      const store = useAssetsStore()
+      const nodeType = 'LoraLoader'
+
+      // First batch must be exactly MODEL_BATCH_SIZE (500) to trigger hasMore
+      const firstBatch = Array.from({ length: 500 }, (_, i) =>
+        createMockAsset(`first-${i}`)
+      )
+      const secondBatch = [createMockAsset('new-asset')]
+
+      let callCount = 0
+      vi.mocked(assetService.getAssetsForNodeType).mockImplementation(
+        async () => {
+          callCount++
+          return callCount === 1 ? firstBatch : secondBatch
+        }
+      )
+
+      await store.updateModelsForNodeType(nodeType)
+
+      // Wait for background batch loading to complete
+      await vi.waitFor(() => {
+        expect(
+          vi.mocked(assetService.getAssetsForNodeType)
+        ).toHaveBeenCalledTimes(2)
+      })
+
+      const assets = store.getAssets(nodeType)
+      expect(assets).toHaveLength(501)
+      expect(assets.map((a) => a.id)).toContain('new-asset')
+    })
+
+    it('should return cached array on subsequent getAssets calls', async () => {
+      const store = useAssetsStore()
+      const nodeType = 'CheckpointLoaderSimple'
+      const assets = [createMockAsset('cache-test-1')]
+
+      vi.mocked(assetService.getAssetsForNodeType).mockResolvedValue(assets)
+      await store.updateModelsForNodeType(nodeType)
+
+      const firstCall = store.getAssets(nodeType)
+      const secondCall = store.getAssets(nodeType)
+
+      expect(secondCall).toBe(firstCall)
+      expect(firstCall).toHaveLength(1)
+    })
+  })
+
+  describe('concurrent request handling', () => {
+    it('should short-circuit concurrent calls to prevent duplicate work', async () => {
+      const store = useAssetsStore()
+      const nodeType = 'CheckpointLoaderSimple'
+      const firstBatch = Array.from({ length: 5 }, (_, i) =>
+        createMockAsset(`first-${i}`)
+      )
+
+      vi.mocked(assetService.getAssetsForNodeType).mockResolvedValue(firstBatch)
+
+      // Start two concurrent requests for the same category
+      const firstRequest = store.updateModelsForNodeType(nodeType)
+      const secondRequest = store.updateModelsForNodeType(nodeType)
+      await Promise.all([firstRequest, secondRequest])
+
+      // Second request should be short-circuited, only one API call made
+      expect(
+        vi.mocked(assetService.getAssetsForNodeType)
+      ).toHaveBeenCalledTimes(1)
+      expect(store.getAssets(nodeType)).toHaveLength(5)
+    })
+
+    it('should allow new request after previous completes', async () => {
+      const store = useAssetsStore()
+      const nodeType = 'CheckpointLoaderSimple'
+      const firstBatch = [createMockAsset('first-1')]
+      const secondBatch = [
+        createMockAsset('second-1'),
+        createMockAsset('second-2')
+      ]
+
+      vi.mocked(assetService.getAssetsForNodeType).mockResolvedValueOnce(
+        firstBatch
+      )
+      await store.updateModelsForNodeType(nodeType)
+      expect(store.getAssets(nodeType)).toHaveLength(1)
+
+      // After first completes, a new request should work
+      vi.mocked(assetService.getAssetsForNodeType).mockResolvedValueOnce(
+        secondBatch
+      )
+      store.invalidateCategory('checkpoints')
+      await store.updateModelsForNodeType(nodeType)
+
+      expect(store.getAssets(nodeType)).toHaveLength(2)
+      expect(
+        vi.mocked(assetService.getAssetsForNodeType)
+      ).toHaveBeenCalledTimes(2)
+    })
+  })
+
+  describe('shallowReactive state reactivity', () => {
+    it('should trigger reactivity on isModelLoading change', async () => {
+      const store = useAssetsStore()
+      const nodeType = 'CheckpointLoaderSimple'
+
+      const loadingStates: boolean[] = []
+      watch(
+        () => store.isModelLoading(nodeType),
+        (val) => loadingStates.push(val),
+        { immediate: true }
+      )
+
+      vi.mocked(assetService.getAssetsForNodeType).mockResolvedValue([])
+      await store.updateModelsForNodeType(nodeType)
+      await nextTick()
+
+      expect(loadingStates).toContain(true)
+      expect(loadingStates).toContain(false)
+    })
+  })
+
+  describe('category-keyed cache', () => {
+    it('should share cache between node types of the same category', async () => {
+      const store = useAssetsStore()
+      const assets = [createMockAsset('shared-1'), createMockAsset('shared-2')]
+
+      vi.mocked(assetService.getAssetsForNodeType).mockResolvedValue(assets)
+
+      await store.updateModelsForNodeType('CheckpointLoaderSimple')
+
+      expect(store.getAssets('CheckpointLoaderSimple')).toHaveLength(2)
+      expect(store.getAssets('ImageOnlyCheckpointLoader')).toHaveLength(2)
+      expect(
+        vi.mocked(assetService.getAssetsForNodeType)
+      ).toHaveBeenCalledTimes(1)
+    })
+
+    it('should return empty array for unknown node types', () => {
+      const store = useAssetsStore()
+      expect(store.getAssets('UnknownNodeType')).toEqual([])
+    })
+
+    it('should not fetch for unknown node types', async () => {
+      const store = useAssetsStore()
+      await store.updateModelsForNodeType('UnknownNodeType')
+      expect(
+        vi.mocked(assetService.getAssetsForNodeType)
+      ).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('invalidateCategory', () => {
+    it('should clear cache for a category', async () => {
+      const store = useAssetsStore()
+      const assets = [createMockAsset('asset-1'), createMockAsset('asset-2')]
+
+      vi.mocked(assetService.getAssetsForNodeType).mockResolvedValue(assets)
+      await store.updateModelsForNodeType('CheckpointLoaderSimple')
+      expect(store.getAssets('CheckpointLoaderSimple')).toHaveLength(2)
+
+      store.invalidateCategory('checkpoints')
+
+      expect(store.getAssets('CheckpointLoaderSimple')).toEqual([])
+      expect(store.hasAssetKey('CheckpointLoaderSimple')).toBe(false)
+    })
+
+    it('should allow refetch after invalidation', async () => {
+      const store = useAssetsStore()
+      const initialAssets = [createMockAsset('initial-1')]
+      const refreshedAssets = [
+        createMockAsset('refreshed-1'),
+        createMockAsset('refreshed-2')
+      ]
+
+      vi.mocked(assetService.getAssetsForNodeType).mockResolvedValueOnce(
+        initialAssets
+      )
+      await store.updateModelsForNodeType('LoraLoader')
+      expect(store.getAssets('LoraLoader')).toHaveLength(1)
+
+      store.invalidateCategory('loras')
+
+      vi.mocked(assetService.getAssetsForNodeType).mockResolvedValueOnce(
+        refreshedAssets
+      )
+      await store.updateModelsForNodeType('LoraLoader')
+
+      expect(store.getAssets('LoraLoader')).toHaveLength(2)
+    })
+
+    it('should invalidate tag-based caches', async () => {
+      const store = useAssetsStore()
+      const assets = [createMockAsset('tag-asset-1')]
+
+      vi.mocked(assetService.getAssetsByTag).mockResolvedValue(assets)
+      await store.updateModelsForTag('models')
+      expect(store.getAssets('tag:models')).toHaveLength(1)
+
+      store.invalidateCategory('tag:models')
+
+      expect(store.getAssets('tag:models')).toEqual([])
+    })
+  })
+
+  describe('hasCategory', () => {
+    it('should return true for loaded categories', async () => {
+      const store = useAssetsStore()
+      const assets = [createMockAsset('asset-1')]
+
+      vi.mocked(assetService.getAssetsForNodeType).mockResolvedValue(assets)
+      await store.updateModelsForNodeType('CheckpointLoaderSimple')
+
+      expect(store.hasCategory('checkpoints')).toBe(true)
+    })
+
+    it('should return true for tag-based category when tag: prefix is not used', async () => {
+      const store = useAssetsStore()
+      const assets = [createMockAsset('asset-1')]
+
+      vi.mocked(assetService.getAssetsByTag).mockResolvedValue(assets)
+      await store.updateModelsForTag('models')
+
+      // hasCategory('models') checks for both 'models' and 'tag:models'
+      expect(store.hasCategory('models')).toBe(true)
+    })
+
+    it('should return false for unloaded categories', () => {
+      const store = useAssetsStore()
+
+      expect(store.hasCategory('checkpoints')).toBe(false)
+      expect(store.hasCategory('unknown-category')).toBe(false)
+    })
+
+    it('should return false after category is invalidated', async () => {
+      const store = useAssetsStore()
+      const assets = [createMockAsset('asset-1')]
+
+      vi.mocked(assetService.getAssetsForNodeType).mockResolvedValue(assets)
+      await store.updateModelsForNodeType('CheckpointLoaderSimple')
+
+      expect(store.hasCategory('checkpoints')).toBe(true)
+
+      store.invalidateCategory('checkpoints')
+
+      expect(store.hasCategory('checkpoints')).toBe(false)
+    })
+  })
+
+  describe('invalidateModelsForCategory', () => {
+    it('should clear cache for category and trigger refetch on next access', async () => {
+      const store = useAssetsStore()
+      const initialAssets = [createMockAsset('initial-1')]
+      const refreshedAssets = [
+        createMockAsset('refreshed-1'),
+        createMockAsset('refreshed-2')
+      ]
+
+      vi.mocked(assetService.getAssetsForNodeType).mockResolvedValueOnce(
+        initialAssets
+      )
+      await store.updateModelsForNodeType('CheckpointLoaderSimple')
+      expect(store.getAssets('CheckpointLoaderSimple')).toHaveLength(1)
+
+      store.invalidateModelsForCategory('checkpoints')
+
+      // Cache should be cleared
+      expect(store.hasCategory('checkpoints')).toBe(false)
+      expect(store.getAssets('CheckpointLoaderSimple')).toEqual([])
+
+      // Next fetch should get fresh data
+      vi.mocked(assetService.getAssetsForNodeType).mockResolvedValueOnce(
+        refreshedAssets
+      )
+      await store.updateModelsForNodeType('CheckpointLoaderSimple')
+      expect(store.getAssets('CheckpointLoaderSimple')).toHaveLength(2)
+    })
+
+    it('should clear tag-based caches', async () => {
+      const store = useAssetsStore()
+      const tagAssets = [createMockAsset('tag-1'), createMockAsset('tag-2')]
+
+      vi.mocked(assetService.getAssetsByTag).mockResolvedValue(tagAssets)
+      await store.updateModelsForTag('checkpoints')
+      await store.updateModelsForTag('models')
+
+      expect(store.getAssets('tag:checkpoints')).toHaveLength(2)
+      expect(store.getAssets('tag:models')).toHaveLength(2)
+
+      store.invalidateModelsForCategory('checkpoints')
+
+      expect(store.getAssets('tag:checkpoints')).toEqual([])
+      expect(store.getAssets('tag:models')).toEqual([])
+    })
+
+    it('should handle unknown categories gracefully', () => {
+      const store = useAssetsStore()
+
+      expect(() =>
+        store.invalidateModelsForCategory('unknown-category')
+      ).not.toThrow()
+    })
+  })
+})
diff --git a/src/stores/assetsStore.ts b/src/stores/assetsStore.ts
index 634c08a412..bea1c556f2 100644
--- a/src/stores/assetsStore.ts
+++ b/src/stores/assetsStore.ts
@@ -1,17 +1,21 @@
-import { useAsyncState } from '@vueuse/core'
+import { useAsyncState, whenever } from '@vueuse/core'
+import { difference } from 'es-toolkit'
 import { defineStore } from 'pinia'
-import { computed, shallowReactive, ref } from 'vue'
+import { computed, reactive, ref, shallowReactive } from 'vue'
 import {
   mapInputFileToAssetItem,
   mapTaskOutputToAssetItem
 } from '@/platform/assets/composables/media/assetMappers'
 import type { AssetItem } 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'
-import type { TaskItem } from '@/schemas/apiSchema'
+import type { JobListItem } from '@/platform/remote/comfyui/jobs/jobTypes'
 import { api } from '@/scripts/api'
 
 import { TaskItemImpl } from './queueStore'
+import { useAssetDownloadStore } from './assetDownloadStore'
+import { useModelToNodeStore } from './modelToNodeStore'
 
 const INPUT_LIMIT = 100
 
@@ -45,27 +49,18 @@ async function fetchInputFilesFromCloud(): Promise<AssetItem[]> {
 }
 
 /**
- * Convert history task items to asset items
+ * Convert history job items to asset items
  */
-function mapHistoryToAssets(historyItems: TaskItem[]): AssetItem[] {
+function mapHistoryToAssets(historyItems: JobListItem[]): AssetItem[] {
   const assetItems: AssetItem[] = []
 
-  for (const item of historyItems) {
-    // Type guard for HistoryTaskItem which has status and outputs
-    if (item.taskType !== 'History') {
+  for (const job of historyItems) {
+    // Only process completed jobs with preview output
+    if (job.status !== 'completed' || !job.preview_output) {
       continue
     }
 
-    if (!item.outputs || !item.status || item.status?.status_str === 'error') {
-      continue
-    }
-
-    const task = new TaskItemImpl(
-      'History',
-      item.prompt,
-      item.status,
-      item.outputs
-    )
+    const task = new TaskItemImpl(job)
 
     if (!task.previewOutput) {
       continue
@@ -73,11 +68,10 @@ function mapHistoryToAssets(historyItems: TaskItem[]): AssetItem[] {
 
     const assetItem = mapTaskOutputToAssetItem(task, task.previewOutput)
 
-    const supportedOutputs = task.flatOutputs.filter((o) => o.supportsPreview)
     assetItem.user_metadata = {
       ...assetItem.user_metadata,
-      outputCount: supportedOutputs.length,
-      allOutputs: supportedOutputs
+      outputCount: job.outputs_count,
+      allOutputs: task.previewableOutputs
     }
 
     assetItems.push(assetItem)
@@ -85,7 +79,8 @@ function mapHistoryToAssets(historyItems: TaskItem[]): AssetItem[] {
 
   return assetItems.sort(
     (a, b) =>
-      new Date(b.created_at).getTime() - new Date(a.created_at).getTime()
+      new Date(b.created_at ?? 0).getTime() -
+      new Date(a.created_at ?? 0).getTime()
   )
 }
 
@@ -93,6 +88,24 @@ const BATCH_SIZE = 200
 const MAX_HISTORY_ITEMS = 1000 // Maximum items to keep in memory
 
 export const useAssetsStore = defineStore('assets', () => {
+  const assetDownloadStore = useAssetDownloadStore()
+  const modelToNodeStore = useModelToNodeStore()
+
+  // Track assets currently being deleted (for loading overlay)
+  const deletingAssetIds = shallowReactive(new Set<string>())
+
+  const setAssetDeleting = (assetId: string, isDeleting: boolean) => {
+    if (isDeleting) {
+      deletingAssetIds.add(assetId)
+    } else {
+      deletingAssetIds.delete(assetId)
+    }
+  }
+
+  const isAssetDeleting = (assetId: string): boolean => {
+    return deletingAssetIds.has(assetId)
+  }
+
   // Pagination state
   const historyOffset = ref(0)
   const hasMoreHistory = ref(true)
@@ -137,8 +150,8 @@ export const useAssetsStore = defineStore('assets', () => {
       offset: historyOffset.value
     })
 
-    // Convert TaskItems to AssetItems
-    const newAssets = mapHistoryToAssets(history.History)
+    // Convert JobListItems to AssetItems
+    const newAssets = mapHistoryToAssets(history)
 
     if (loadMore) {
       // Filter out duplicates and insert in sorted order
@@ -149,9 +162,9 @@ export const useAssetsStore = defineStore('assets', () => {
         loadedIds.add(asset.id)
 
         // Find insertion index to maintain sorted order (newest first)
-        const assetTime = new Date(asset.created_at).getTime()
+        const assetTime = new Date(asset.created_at ?? 0).getTime()
         const insertIndex = allHistoryItems.value.findIndex(
-          (item) => new Date(item.created_at).getTime() < assetTime
+          (item) => new Date(item.created_at ?? 0).getTime() < assetTime
         )
 
         if (insertIndex === -1) {
@@ -170,7 +183,7 @@ export const useAssetsStore = defineStore('assets', () => {
 
     // Update pagination state
     historyOffset.value += BATCH_SIZE
-    hasMoreHistory.value = history.History.length === BATCH_SIZE
+    hasMoreHistory.value = history.length === BATCH_SIZE
 
     if (allHistoryItems.value.length > MAX_HISTORY_ITEMS) {
       const removed = allHistoryItems.value.slice(MAX_HISTORY_ITEMS)
@@ -255,96 +268,454 @@ export const useAssetsStore = defineStore('assets', () => {
     return inputAssetsByFilename.value.get(filename)?.name ?? filename
   }
 
+  const MODEL_BATCH_SIZE = 500
+
+  interface ModelPaginationState {
+    assets: Map<string, AssetItem>
+    offset: number
+    hasMore: boolean
+    isLoading: boolean
+    error?: Error
+  }
+
   /**
-   * Model assets cached by node type (e.g., 'CheckpointLoaderSimple', 'LoraLoader')
-   * Used by multiple loader nodes to avoid duplicate fetches
+   * Model assets cached by category (e.g., 'checkpoints', 'loras')
+   * Multiple node types sharing the same category share the same cache entry.
+   * Public API accepts nodeType for backwards compatibility but translates
+   * to category internally using modelToNodeStore.getCategoryForNodeType().
    * Cloud-only feature - empty Maps in desktop builds
    */
   const getModelState = () => {
     if (isCloud) {
-      const modelAssetsByNodeType = shallowReactive(
-        new Map<string, AssetItem[]>()
-      )
-      const modelLoadingByNodeType = shallowReactive(new Map<string, boolean>())
-      const modelErrorByNodeType = shallowReactive(
-        new Map<string, Error | null>()
-      )
+      const modelStateByCategory = ref(new Map<string, ModelPaginationState>())
 
-      const stateByNodeType = shallowReactive(
-        new Map<string, ReturnType<typeof useAsyncState<AssetItem[]>>>()
-      )
+      const assetsArrayCache = new Map<
+        string,
+        { source: Map<string, AssetItem>; array: AssetItem[] }
+      >()
+
+      const pendingRequestByCategory = new Map<string, ModelPaginationState>()
+
+      function createState(
+        existingAssets?: Map<string, AssetItem>
+      ): ModelPaginationState {
+        const assets = new Map(existingAssets)
+        return reactive({
+          assets,
+          offset: 0,
+          hasMore: true,
+          isLoading: true
+        })
+      }
+
+      function isStale(category: string, state: ModelPaginationState): boolean {
+        const committed = modelStateByCategory.value.get(category)
+        const pending = pendingRequestByCategory.get(category)
+        return committed !== state && pending !== state
+      }
+
+      const EMPTY_ASSETS: AssetItem[] = []
 
       /**
-       * Fetch and cache model assets for a specific node type
-       * Uses VueUse's useAsyncState for automatic loading/error tracking
-       * @param nodeType The node type to fetch assets for (e.g., 'CheckpointLoaderSimple')
-       * @returns Promise resolving to the fetched assets
+       * Resolve a key to a category. Handles both nodeType and tag:xxx formats.
+       * @param key Either a nodeType (e.g., 'CheckpointLoaderSimple') or tag key (e.g., 'tag:models')
+       * @returns The category or undefined if not resolvable
        */
-      async function updateModelsForNodeType(
-        nodeType: string
-      ): Promise<AssetItem[]> {
-        if (!stateByNodeType.has(nodeType)) {
-          stateByNodeType.set(
-            nodeType,
-            useAsyncState(
-              () => assetService.getAssetsForNodeType(nodeType),
-              [],
-              {
-                immediate: false,
-                resetOnExecute: false,
-                onError: (err) => {
-                  console.error(
-                    `Error fetching model assets for ${nodeType}:`,
-                    err
-                  )
+      function resolveCategory(key: string): string | undefined {
+        if (key.startsWith('tag:')) {
+          return key
+        }
+        return modelToNodeStore.getCategoryForNodeType(key)
+      }
+
+      /**
+       * Get assets by nodeType or tag key.
+       * Translates nodeType to category internally for cache lookup.
+       * @param key Either a nodeType (e.g., 'CheckpointLoaderSimple') or tag key (e.g., 'tag:models')
+       */
+      function getAssets(key: string): AssetItem[] {
+        const category = resolveCategory(key)
+        if (!category) return EMPTY_ASSETS
+
+        const state = modelStateByCategory.value.get(category)
+        const assetsMap = state?.assets
+        if (!assetsMap) return EMPTY_ASSETS
+
+        const cached = assetsArrayCache.get(category)
+        if (cached && cached.source === assetsMap) {
+          return cached.array
+        }
+
+        const array = Array.from(assetsMap.values())
+        assetsArrayCache.set(category, { source: assetsMap, array })
+        return array
+      }
+
+      function isLoading(key: string): boolean {
+        const category = resolveCategory(key)
+        if (!category) return false
+        return modelStateByCategory.value.get(category)?.isLoading ?? false
+      }
+
+      function getError(key: string): Error | undefined {
+        const category = resolveCategory(key)
+        if (!category) return undefined
+        return modelStateByCategory.value.get(category)?.error
+      }
+
+      function hasMore(key: string): boolean {
+        const category = resolveCategory(key)
+        if (!category) return false
+        return modelStateByCategory.value.get(category)?.hasMore ?? false
+      }
+
+      function hasAssetKey(key: string): boolean {
+        const category = resolveCategory(key)
+        if (!category) return false
+        return modelStateByCategory.value.has(category)
+      }
+
+      /**
+       * Check if a category exists in the cache.
+       * Checks both direct category keys and tag-prefixed keys.
+       * @param category The category to check (e.g., 'checkpoints', 'loras')
+       */
+      function hasCategory(category: string): boolean {
+        return (
+          modelStateByCategory.value.has(category) ||
+          modelStateByCategory.value.has(`tag:${category}`)
+        )
+      }
+
+      /**
+       * Internal helper to fetch and cache assets for a category.
+       * Loads first batch immediately, then progressively loads remaining batches.
+       * Keeps existing data visible until new data is successfully fetched.
+       *
+       * Concurrent calls for the same category are short-circuited: if a request
+       * is already in progress (tracked via pendingRequestByCategory), subsequent
+       * calls return immediately to avoid redundant work.
+       */
+      async function updateModelsForCategory(
+        category: string,
+        fetcher: (options: PaginationOptions) => Promise<AssetItem[]>
+      ): Promise<void> {
+        // Short-circuit if a request for this category is already in progress
+        if (pendingRequestByCategory.has(category)) {
+          return
+        }
+
+        const existingState = modelStateByCategory.value.get(category)
+        const state = createState(existingState?.assets)
+
+        const seenIds = new Set<string>()
+
+        const hasExistingData = modelStateByCategory.value.has(category)
+        if (hasExistingData) {
+          pendingRequestByCategory.set(category, state)
+        } else {
+          // Also track in pending map for initial loads to prevent concurrent calls
+          pendingRequestByCategory.set(category, state)
+          modelStateByCategory.value.set(category, state)
+        }
+
+        async function loadBatches(): Promise<void> {
+          while (state.hasMore) {
+            try {
+              const newAssets = await fetcher({
+                limit: MODEL_BATCH_SIZE,
+                offset: state.offset
+              })
+
+              if (isStale(category, state)) return
+
+              const isFirstBatch = state.offset === 0
+              if (isFirstBatch) {
+                assetsArrayCache.delete(category)
+                if (hasExistingData) {
+                  pendingRequestByCategory.delete(category)
+                  modelStateByCategory.value.set(category, state)
                 }
               }
-            )
+
+              // Merge new assets into existing map and track seen IDs
+              for (const asset of newAssets) {
+                seenIds.add(asset.id)
+                state.assets.set(asset.id, asset)
+              }
+              state.assets = new Map(state.assets)
+
+              state.offset += newAssets.length
+              state.hasMore = newAssets.length === MODEL_BATCH_SIZE
+
+              if (isFirstBatch) {
+                state.isLoading = false
+              }
+
+              if (state.hasMore) {
+                await new Promise((resolve) => setTimeout(resolve, 50))
+              }
+            } catch (err) {
+              if (isStale(category, state)) return
+              console.error(`Error loading batch for ${category}:`, err)
+
+              state.error = err instanceof Error ? err : new Error(String(err))
+              state.hasMore = false
+              state.isLoading = false
+              pendingRequestByCategory.delete(category)
+
+              return
+            }
+          }
+
+          const staleIds = [...state.assets.keys()].filter(
+            (id) => !seenIds.has(id)
           )
+          for (const id of staleIds) {
+            state.assets.delete(id)
+          }
+          assetsArrayCache.delete(category)
+          pendingRequestByCategory.delete(category)
         }
 
-        const state = stateByNodeType.get(nodeType)!
+        await loadBatches()
+      }
 
-        modelLoadingByNodeType.set(nodeType, true)
-        modelErrorByNodeType.set(nodeType, null)
+      /**
+       * Fetch and cache model assets for a specific node type.
+       * Translates nodeType to category internally - multiple node types
+       * sharing the same category will share the same cache entry.
+       * @param nodeType The node type to fetch assets for (e.g., 'CheckpointLoaderSimple')
+       */
+      async function updateModelsForNodeType(nodeType: string): Promise<void> {
+        const category = modelToNodeStore.getCategoryForNodeType(nodeType)
+        if (!category) return
+
+        // Use category as cache key but fetch using nodeType for API compatibility
+        await updateModelsForCategory(category, (opts) =>
+          assetService.getAssetsForNodeType(nodeType, opts)
+        )
+      }
+
+      /**
+       * Fetch and cache model assets for a specific tag
+       * @param tag The tag to fetch assets for (e.g., 'models')
+       */
+      async function updateModelsForTag(tag: string): Promise<void> {
+        const category = `tag:${tag}`
+        await updateModelsForCategory(category, (opts) =>
+          assetService.getAssetsByTag(tag, true, opts)
+        )
+      }
+
+      /**
+       * Invalidate the cache for a specific category.
+       * Forces a refetch on next access.
+       * @param category The category to invalidate (e.g., 'checkpoints', 'loras')
+       */
+      function invalidateCategory(category: string): void {
+        modelStateByCategory.value.delete(category)
+        assetsArrayCache.delete(category)
+        pendingRequestByCategory.delete(category)
+      }
+
+      /**
+       * Optimistically update an asset in the cache
+       * @param assetId The asset ID to update
+       * @param updates Partial asset data to merge
+       * @param cacheKey Optional cache key to target (nodeType or 'tag:xxx')
+       */
+      function updateAssetInCache(
+        assetId: string,
+        updates: Partial<AssetItem>,
+        cacheKey?: string
+      ) {
+        const category = cacheKey ? resolveCategory(cacheKey) : undefined
+        if (cacheKey && !category) return
+
+        const categoriesToCheck = category
+          ? [category]
+          : Array.from(modelStateByCategory.value.keys())
+
+        for (const cat of categoriesToCheck) {
+          const state = modelStateByCategory.value.get(cat)
+          if (!state?.assets) continue
+
+          const existingAsset = state.assets.get(assetId)
+          if (existingAsset) {
+            const updatedAsset = { ...existingAsset, ...updates }
+            state.assets.set(assetId, updatedAsset)
+            assetsArrayCache.delete(cat)
+            if (cacheKey) return
+          }
+        }
+      }
+
+      /**
+       * Update asset metadata with optimistic cache update
+       * @param asset The asset to update
+       * @param userMetadata The user_metadata to save
+       * @param cacheKey Optional cache key to target for optimistic update
+       */
+      async function updateAssetMetadata(
+        asset: AssetItem,
+        userMetadata: Record<string, unknown>,
+        cacheKey?: string
+      ) {
+        const originalMetadata = asset.user_metadata
+        updateAssetInCache(asset.id, { user_metadata: userMetadata }, cacheKey)
 
         try {
-          await state.execute()
-          const assets = state.state.value
-          modelAssetsByNodeType.set(nodeType, assets)
-          modelErrorByNodeType.set(
-            nodeType,
-            state.error.value instanceof Error ? state.error.value : null
+          const updatedAsset = await assetService.updateAsset(asset.id, {
+            user_metadata: userMetadata
+          })
+          updateAssetInCache(asset.id, updatedAsset, cacheKey)
+        } catch (error) {
+          console.error('Failed to update asset metadata:', error)
+          updateAssetInCache(
+            asset.id,
+            { user_metadata: originalMetadata },
+            cacheKey
           )
-          return assets
-        } finally {
-          modelLoadingByNodeType.set(nodeType, state.isLoading.value)
         }
       }
 
+      /**
+       * Update asset tags using add/remove endpoints
+       * @param asset The asset to update (used to read current tags)
+       * @param newTags The desired tags array
+       * @param cacheKey Optional cache key to target for optimistic update
+       */
+      async function updateAssetTags(
+        asset: AssetItem,
+        newTags: string[],
+        cacheKey?: string
+      ) {
+        const originalTags = asset.tags
+        const tagsToAdd = difference(newTags, originalTags)
+        const tagsToRemove = difference(originalTags, newTags)
+
+        if (tagsToAdd.length === 0 && tagsToRemove.length === 0) return
+
+        updateAssetInCache(asset.id, { tags: newTags }, cacheKey)
+
+        try {
+          const removeResult =
+            tagsToRemove.length > 0
+              ? await assetService.removeAssetTags(asset.id, tagsToRemove)
+              : undefined
+
+          const addResult =
+            tagsToAdd.length > 0
+              ? await assetService.addAssetTags(asset.id, tagsToAdd)
+              : undefined
+
+          const finalTags = (addResult ?? removeResult)?.total_tags
+          if (finalTags) {
+            updateAssetInCache(asset.id, { tags: finalTags }, cacheKey)
+          }
+        } catch (error) {
+          console.error('Failed to update asset tags:', error)
+          updateAssetInCache(asset.id, { tags: originalTags }, cacheKey)
+        }
+      }
+
+      /**
+       * Invalidate model caches for a given category (e.g., 'checkpoints', 'loras')
+       * Clears the category cache and tag-based caches so next access triggers refetch
+       * @param category The model category to invalidate (e.g., 'checkpoints')
+       */
+      function invalidateModelsForCategory(category: string): void {
+        invalidateCategory(category)
+        invalidateCategory(`tag:${category}`)
+        invalidateCategory('tag:models')
+      }
+
       return {
-        modelAssetsByNodeType,
-        modelLoadingByNodeType,
-        modelErrorByNodeType,
-        updateModelsForNodeType
+        getAssets,
+        isLoading,
+        getError,
+        hasMore,
+        hasAssetKey,
+        hasCategory,
+        updateModelsForNodeType,
+        updateModelsForTag,
+        invalidateCategory,
+        updateAssetMetadata,
+        updateAssetTags,
+        invalidateModelsForCategory
       }
     }
 
+    const emptyAssets: AssetItem[] = []
     return {
-      modelAssetsByNodeType: shallowReactive(new Map<string, AssetItem[]>()),
-      modelLoadingByNodeType: shallowReactive(new Map<string, boolean>()),
-      modelErrorByNodeType: shallowReactive(new Map<string, Error | null>()),
-      updateModelsForNodeType: async () => []
+      getAssets: () => emptyAssets,
+      isLoading: () => false,
+      getError: () => undefined,
+      hasMore: () => false,
+      hasAssetKey: () => false,
+      hasCategory: () => false,
+      updateModelsForNodeType: async () => {},
+      invalidateCategory: () => {},
+      updateModelsForTag: async () => {},
+      updateAssetMetadata: async () => {},
+      updateAssetTags: async () => {},
+      invalidateModelsForCategory: () => {}
     }
   }
 
   const {
-    modelAssetsByNodeType,
-    modelLoadingByNodeType,
-    modelErrorByNodeType,
-    updateModelsForNodeType
+    getAssets,
+    isLoading: isModelLoading,
+    getError,
+    hasMore,
+    hasAssetKey,
+    hasCategory,
+    updateModelsForNodeType,
+    updateModelsForTag,
+    invalidateCategory,
+    updateAssetMetadata,
+    updateAssetTags,
+    invalidateModelsForCategory
   } = getModelState()
 
+  // Watch for completed downloads and refresh model caches
+  whenever(
+    () => assetDownloadStore.lastCompletedDownload,
+    async (latestDownload) => {
+      const { modelType } = latestDownload
+
+      const providers = modelToNodeStore
+        .getAllNodeProviders(modelType)
+        .filter((provider) => provider.nodeDef?.name)
+
+      const nodeTypeUpdates = providers.map((provider) =>
+        updateModelsForNodeType(provider.nodeDef.name).then(
+          () => provider.nodeDef.name
+        )
+      )
+
+      // Also update by tag in case modal was opened with assetType
+      const tagUpdates = [
+        updateModelsForTag(modelType),
+        updateModelsForTag('models')
+      ]
+
+      const results = await Promise.allSettled([
+        ...nodeTypeUpdates,
+        ...tagUpdates
+      ])
+
+      for (const result of results) {
+        if (result.status === 'rejected') {
+          console.error(
+            `Failed to refresh model cache for provider: ${result.reason}`
+          )
+        }
+      }
+    }
+  )
+
   return {
     // States
     inputAssets,
@@ -356,6 +727,11 @@ export const useAssetsStore = defineStore('assets', () => {
     hasMoreHistory,
     isLoadingMore,
 
+    // Deletion tracking
+    deletingAssetIds,
+    setAssetDeleting,
+    isAssetDeleting,
+
     // Actions
     updateInputs,
     updateHistory,
@@ -365,10 +741,20 @@ export const useAssetsStore = defineStore('assets', () => {
     inputAssetsByFilename,
     getInputName,
 
-    // Model assets
-    modelAssetsByNodeType,
-    modelLoadingByNodeType,
-    modelErrorByNodeType,
-    updateModelsForNodeType
+    // Model assets - accessors
+    getAssets,
+    isModelLoading,
+    getError,
+    hasMore,
+    hasAssetKey,
+    hasCategory,
+
+    // Model assets - actions
+    updateModelsForNodeType,
+    updateModelsForTag,
+    invalidateCategory,
+    updateAssetMetadata,
+    updateAssetTags,
+    invalidateModelsForCategory
   }
 })
diff --git a/src/stores/bootstrapStore.test.ts b/src/stores/bootstrapStore.test.ts
new file mode 100644
index 0000000000..1fb36413c9
--- /dev/null
+++ b/src/stores/bootstrapStore.test.ts
@@ -0,0 +1,117 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { ref } from 'vue'
+
+import { useSettingStore } from '@/platform/settings/settingStore'
+
+import { useBootstrapStore } from './bootstrapStore'
+
+vi.mock('@/scripts/api', () => ({
+  api: {
+    init: vi.fn().mockResolvedValue(undefined),
+    getNodeDefs: vi.fn().mockResolvedValue({ TestNode: { name: 'TestNode' } }),
+    getCustomNodesI18n: vi.fn().mockResolvedValue({}),
+    getUserConfig: vi.fn().mockResolvedValue({})
+  }
+}))
+
+vi.mock('@/i18n', () => ({
+  mergeCustomNodesI18n: vi.fn()
+}))
+
+const mockIsSettingsReady = ref(false)
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: vi.fn(() => ({
+    load: vi.fn(() => {
+      mockIsSettingsReady.value = true
+    }),
+    get isReady() {
+      return mockIsSettingsReady.value
+    },
+    isLoading: ref(false),
+    error: ref(undefined)
+  }))
+}))
+
+vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
+  useWorkflowStore: vi.fn(() => ({
+    loadWorkflows: vi.fn(),
+    syncWorkflows: vi.fn().mockResolvedValue(undefined)
+  }))
+}))
+
+const mockNeedsLogin = ref(false)
+vi.mock('@/stores/userStore', () => ({
+  useUserStore: vi.fn(() => ({
+    initialize: vi.fn().mockResolvedValue(undefined),
+    needsLogin: mockNeedsLogin
+  }))
+}))
+
+const mockIsFirebaseInitialized = ref(false)
+vi.mock('@/stores/firebaseAuthStore', () => ({
+  useFirebaseAuthStore: vi.fn(() => ({
+    isInitialized: mockIsFirebaseInitialized
+  }))
+}))
+
+const mockDistributionTypes = vi.hoisted(() => ({
+  isCloud: false
+}))
+vi.mock('@/platform/distribution/types', () => mockDistributionTypes)
+
+describe('bootstrapStore', () => {
+  beforeEach(() => {
+    mockIsSettingsReady.value = false
+    mockIsFirebaseInitialized.value = false
+    mockNeedsLogin.value = false
+    mockDistributionTypes.isCloud = false
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    vi.clearAllMocks()
+  })
+
+  it('initializes with all flags false', () => {
+    const store = useBootstrapStore()
+    const settingStore = useSettingStore()
+    expect(settingStore.isReady).toBe(false)
+    expect(store.isI18nReady).toBe(false)
+  })
+
+  it('starts store bootstrap (settings, i18n)', async () => {
+    const store = useBootstrapStore()
+    const settingStore = useSettingStore()
+    void store.startStoreBootstrap()
+
+    await vi.waitFor(() => {
+      expect(settingStore.isReady).toBe(true)
+      expect(store.isI18nReady).toBe(true)
+    })
+  })
+
+  describe('cloud mode', () => {
+    beforeEach(() => {
+      mockDistributionTypes.isCloud = true
+    })
+
+    it('waits for Firebase auth before loading i18n and settings', async () => {
+      const store = useBootstrapStore()
+      const settingStore = useSettingStore()
+      const bootstrapPromise = store.startStoreBootstrap()
+
+      // Bootstrap is blocked waiting for firebase
+      expect(store.isI18nReady).toBe(false)
+      expect(settingStore.isReady).toBe(false)
+
+      // Unblock by initializing firebase
+      mockIsFirebaseInitialized.value = true
+      await bootstrapPromise
+
+      await vi.waitFor(() => {
+        expect(store.isI18nReady).toBe(true)
+        expect(settingStore.isReady).toBe(true)
+      })
+    })
+  })
+})
diff --git a/src/stores/bootstrapStore.ts b/src/stores/bootstrapStore.ts
new file mode 100644
index 0000000000..5b27f2ead8
--- /dev/null
+++ b/src/stores/bootstrapStore.ts
@@ -0,0 +1,59 @@
+import { until, useAsyncState } from '@vueuse/core'
+import { defineStore, storeToRefs } from 'pinia'
+
+import { isCloud } from '@/platform/distribution/types'
+import { useSettingStore } from '@/platform/settings/settingStore'
+import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
+import { api } from '@/scripts/api'
+import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
+import { useUserStore } from '@/stores/userStore'
+
+export const useBootstrapStore = defineStore('bootstrap', () => {
+  const settingStore = useSettingStore()
+  const workflowStore = useWorkflowStore()
+
+  const {
+    isReady: isI18nReady,
+    error: i18nError,
+    execute: loadI18n
+  } = useAsyncState(
+    async () => {
+      const { mergeCustomNodesI18n } = await import('@/i18n')
+      const i18nData = await api.getCustomNodesI18n()
+      mergeCustomNodesI18n(i18nData)
+    },
+    undefined,
+    { immediate: false }
+  )
+
+  let storesLoaded = false
+
+  function loadAuthenticatedStores() {
+    if (storesLoaded) return
+    storesLoaded = true
+    void settingStore.load()
+    void workflowStore.loadWorkflows()
+  }
+
+  async function startStoreBootstrap() {
+    const userStore = useUserStore()
+    await userStore.initialize()
+
+    if (isCloud) {
+      const { isInitialized } = storeToRefs(useFirebaseAuthStore())
+      await until(isInitialized).toBe(true)
+    }
+
+    const { needsLogin } = storeToRefs(userStore)
+    await until(needsLogin).toBe(false)
+
+    void loadI18n()
+    loadAuthenticatedStores()
+  }
+
+  return {
+    isI18nReady,
+    i18nError,
+    startStoreBootstrap
+  }
+})
diff --git a/tests-ui/tests/store/comfyRegistryStore.test.ts b/src/stores/comfyRegistryStore.test.ts
similarity index 95%
rename from tests-ui/tests/store/comfyRegistryStore.test.ts
rename to src/stores/comfyRegistryStore.test.ts
index fa2c86ab73..6cd1f73d3a 100644
--- a/tests-ui/tests/store/comfyRegistryStore.test.ts
+++ b/src/stores/comfyRegistryStore.test.ts
@@ -1,4 +1,5 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { ref } from 'vue'
 
@@ -83,7 +84,7 @@ describe('useComfyRegistryStore', () => {
   }
 
   beforeEach(() => {
-    setActivePinia(createPinia())
+    setActivePinia(createTestingPinia({ stubActions: false }))
     vi.clearAllMocks()
     mockRegistryService = {
       isLoading: ref(false),
@@ -126,7 +127,9 @@ describe('useComfyRegistryStore', () => {
     }
 
     vi.mocked(useComfyRegistryService).mockReturnValue(
-      mockRegistryService as any
+      mockRegistryService as Partial<
+        ReturnType<typeof useComfyRegistryService>
+      > as ReturnType<typeof useComfyRegistryService>
     )
   })
 
@@ -176,7 +179,7 @@ describe('useComfyRegistryStore', () => {
     const store = useComfyRegistryStore()
     vi.spyOn(store.getPackById, 'call').mockResolvedValueOnce(null)
 
-    const result = await store.getPackById.call(null as any)
+    const result = await store.getPackById.call(null!)
 
     expect(result).toBeNull()
     expect(mockRegistryService.getPackById).not.toHaveBeenCalled()
diff --git a/src/stores/commandStore.ts b/src/stores/commandStore.ts
index ade180d373..27e032114f 100644
--- a/src/stores/commandStore.ts
+++ b/src/stores/commandStore.ts
@@ -2,11 +2,10 @@ import { defineStore } from 'pinia'
 import { computed, ref } from 'vue'
 
 import { useErrorHandling } from '@/composables/useErrorHandling'
+import type { KeybindingImpl } from '@/platform/keybindings/keybinding'
+import { useKeybindingStore } from '@/platform/keybindings/keybindingStore'
 import type { ComfyExtension } from '@/types/comfy'
 
-import { useKeybindingStore } from './keybindingStore'
-import type { KeybindingImpl } from './keybindingStore'
-
 export interface ComfyCommand {
   id: string
   function: (metadata?: Record<string, unknown>) => void | Promise<void>
diff --git a/tests-ui/tests/store/dialogStore.test.ts b/src/stores/dialogStore.test.ts
similarity index 97%
rename from tests-ui/tests/store/dialogStore.test.ts
rename to src/stores/dialogStore.test.ts
index 3d21ff695b..67cfa3788b 100644
--- a/tests-ui/tests/store/dialogStore.test.ts
+++ b/src/stores/dialogStore.test.ts
@@ -1,4 +1,5 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it } from 'vitest'
 import { defineComponent } from 'vue'
 
@@ -11,7 +12,7 @@ const MockComponent = defineComponent({
 
 describe('dialogStore', () => {
   beforeEach(() => {
-    setActivePinia(createPinia())
+    setActivePinia(createTestingPinia({ stubActions: false }))
   })
 
   describe('priority system', () => {
diff --git a/src/stores/dialogStore.ts b/src/stores/dialogStore.ts
index 333af1a0b7..6742b5459c 100644
--- a/src/stores/dialogStore.ts
+++ b/src/stores/dialogStore.ts
@@ -37,7 +37,7 @@ interface CustomDialogComponentProps {
 export type DialogComponentProps = ComponentAttrs<typeof GlobalDialog> &
   CustomDialogComponentProps
 
-interface DialogInstance<
+export interface DialogInstance<
   H extends Component = Component,
   B extends Component = Component,
   F extends Component = Component
diff --git a/tests-ui/tests/domWidgetStore.test.ts b/src/stores/domWidgetStore.test.ts
similarity index 93%
rename from tests-ui/tests/domWidgetStore.test.ts
rename to src/stores/domWidgetStore.test.ts
index 21a83f7c6b..100b8fe400 100644
--- a/tests-ui/tests/domWidgetStore.test.ts
+++ b/src/stores/domWidgetStore.test.ts
@@ -1,7 +1,9 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it } from 'vitest'
 
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
 import { useDomWidgetStore } from '@/stores/domWidgetStore'
+import { createTestingPinia } from '@pinia/testing'
 
 // Mock DOM widget for testing
 const createMockDOMWidget = (id: string) => {
@@ -14,7 +16,7 @@ const createMockDOMWidget = (id: string) => {
       title: 'Test Node',
       pos: [0, 0],
       size: [200, 100]
-    } as any,
+    } as Partial<LGraphNode> as LGraphNode,
     name: 'test_widget',
     type: 'text',
     value: 'test',
@@ -22,7 +24,7 @@ const createMockDOMWidget = (id: string) => {
     y: 0,
     margin: 10,
     isVisible: () => true,
-    containerNode: undefined as any
+    containerNode: undefined
   }
 }
 
@@ -30,7 +32,7 @@ describe('domWidgetStore', () => {
   let store: ReturnType<typeof useDomWidgetStore>
 
   beforeEach(() => {
-    setActivePinia(createPinia())
+    setActivePinia(createTestingPinia({ stubActions: false }))
     store = useDomWidgetStore()
   })
 
diff --git a/src/stores/domWidgetStore.ts b/src/stores/domWidgetStore.ts
index 82c0292d35..a479bf42ec 100644
--- a/src/stores/domWidgetStore.ts
+++ b/src/stores/domWidgetStore.ts
@@ -6,8 +6,15 @@ import { computed, markRaw, ref } from 'vue'
 import type { Raw } from 'vue'
 
 import type { PositionConfig } from '@/composables/element/useAbsolutePosition'
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
 import type { BaseDOMWidget } from '@/scripts/domWidget'
 
+interface PositionOverride {
+  node: Raw<LGraphNode>
+  widget: Raw<IBaseWidget>
+}
+
 export interface DomWidgetState extends PositionConfig {
   // Raw widget instance
   widget: Raw<BaseDOMWidget<object | string>>
@@ -16,6 +23,8 @@ export interface DomWidgetState extends PositionConfig {
   zIndex: number
   /** If the widget belongs to the current graph/subgraph. */
   active: boolean
+  /** Override positioning to render on a different node (e.g. SubgraphNode). */
+  positionOverride?: PositionOverride
 }
 
 export const useDomWidgetStore = defineStore('domWidget', () => {
@@ -28,10 +37,7 @@ export const useDomWidgetStore = defineStore('domWidget', () => {
     [...widgetStates.value.values()].filter((state) => !state.active)
   )
 
-  // Register a widget with the store
-  const registerWidget = <V extends object | string>(
-    widget: BaseDOMWidget<V>
-  ) => {
+  function registerWidget<V extends object | string>(widget: BaseDOMWidget<V>) {
     widgetStates.value.set(widget.id, {
       widget: markRaw(widget) as unknown as Raw<BaseDOMWidget<object | string>>,
       visible: true,
@@ -43,29 +49,49 @@ export const useDomWidgetStore = defineStore('domWidget', () => {
     })
   }
 
-  // Unregister a widget from the store
-  const unregisterWidget = (widgetId: string) => {
+  function unregisterWidget(widgetId: string) {
     widgetStates.value.delete(widgetId)
   }
 
-  const activateWidget = (widgetId: string) => {
+  function activateWidget(widgetId: string) {
     const state = widgetStates.value.get(widgetId)
     if (state) state.active = true
   }
 
-  const deactivateWidget = (widgetId: string) => {
+  function deactivateWidget(widgetId: string) {
     const state = widgetStates.value.get(widgetId)
     if (state) state.active = false
   }
 
-  const setWidget = (widget: BaseDOMWidget) => {
+  function setWidget(widget: BaseDOMWidget) {
     const state = widgetStates.value.get(widget.id)
     if (!state) return
     state.active = true
     state.widget = widget
   }
 
-  const clear = () => {
+  function setPositionOverride(widgetId: string, override: PositionOverride) {
+    const state = widgetStates.value.get(widgetId)
+    if (!state) return
+    const current = state.positionOverride
+    if (
+      current &&
+      current.node === override.node &&
+      current.widget === override.widget
+    )
+      return
+    state.positionOverride = {
+      node: markRaw(override.node),
+      widget: markRaw(override.widget)
+    }
+  }
+
+  function clearPositionOverride(widgetId: string) {
+    const state = widgetStates.value.get(widgetId)
+    if (state) state.positionOverride = undefined
+  }
+
+  function clear() {
     widgetStates.value.clear()
   }
 
@@ -78,6 +104,8 @@ export const useDomWidgetStore = defineStore('domWidget', () => {
     activateWidget,
     deactivateWidget,
     setWidget,
+    setPositionOverride,
+    clearPositionOverride,
     clear
   }
 })
diff --git a/src/stores/electronDownloadStore.ts b/src/stores/electronDownloadStore.ts
index 012897766b..fbf2965534 100644
--- a/src/stores/electronDownloadStore.ts
+++ b/src/stores/electronDownloadStore.ts
@@ -3,7 +3,8 @@ import type { DownloadState } from '@comfyorg/comfyui-electron-types'
 import { defineStore } from 'pinia'
 import { computed, ref } from 'vue'
 
-import { electronAPI, isElectron } from '@/utils/envUtil'
+import { isDesktop } from '@/platform/distribution/types'
+import { electronAPI } from '@/utils/envUtil'
 
 export interface ElectronDownload extends Pick<
   DownloadState,
@@ -17,35 +18,34 @@ export interface ElectronDownload extends Pick<
 /** Electron downloads store handler */
 export const useElectronDownloadStore = defineStore('downloads', () => {
   const downloads = ref<ElectronDownload[]>([])
-  const { DownloadManager } = electronAPI()
+  const DownloadManager = isDesktop ? electronAPI().DownloadManager : undefined
 
   const findByUrl = (url: string) =>
     downloads.value.find((download) => url === download.url)
 
   const initialize = async () => {
-    if (isElectron()) {
-      const allDownloads = await DownloadManager.getAllDownloads()
+    if (!isDesktop || !DownloadManager) return
 
-      for (const download of allDownloads) {
-        downloads.value.push(download)
+    const allDownloads = await DownloadManager.getAllDownloads()
+
+    for (const download of allDownloads) {
+      downloads.value.push(download)
+    }
+
+    DownloadManager.onDownloadProgress((data) => {
+      if (!findByUrl(data.url)) {
+        downloads.value.push(data)
       }
 
-      // ToDO: replace with ElectronDownload type
-      DownloadManager.onDownloadProgress((data) => {
-        if (!findByUrl(data.url)) {
-          downloads.value.push(data)
-        }
+      const download = findByUrl(data.url)
 
-        const download = findByUrl(data.url)
-
-        if (download) {
-          download.progress = data.progress
-          download.status = data.status
-          download.filename = data.filename
-          download.savePath = data.savePath
-        }
-      })
-    }
+      if (download) {
+        download.progress = data.progress
+        download.status = data.status
+        download.filename = data.filename
+        download.savePath = data.savePath
+      }
+    })
   }
 
   void initialize()
@@ -58,10 +58,10 @@ export const useElectronDownloadStore = defineStore('downloads', () => {
     url: string
     savePath: string
     filename: string
-  }) => DownloadManager.startDownload(url, savePath, filename)
-  const pause = (url: string) => DownloadManager.pauseDownload(url)
-  const resume = (url: string) => DownloadManager.resumeDownload(url)
-  const cancel = (url: string) => DownloadManager.cancelDownload(url)
+  }) => DownloadManager!.startDownload(url, savePath, filename)
+  const pause = (url: string) => DownloadManager!.pauseDownload(url)
+  const resume = (url: string) => DownloadManager!.resumeDownload(url)
+  const cancel = (url: string) => DownloadManager!.cancelDownload(url)
 
   return {
     downloads,
diff --git a/src/stores/executionErrorStore.test.ts b/src/stores/executionErrorStore.test.ts
new file mode 100644
index 0000000000..f6c166e74a
--- /dev/null
+++ b/src/stores/executionErrorStore.test.ts
@@ -0,0 +1,159 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { MissingNodeType } from '@/types/comfy'
+
+// Mock dependencies
+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)
+  }))
+}))
+
+import { useExecutionErrorStore } from './executionErrorStore'
+
+describe('executionErrorStore — missing node operations', () => {
+  beforeEach(() => {
+    setActivePinia(createPinia())
+  })
+
+  describe('setMissingNodeTypes', () => {
+    it('sets missingNodesError with provided types', () => {
+      const store = useExecutionErrorStore()
+      const types: MissingNodeType[] = [
+        { type: 'NodeA', nodeId: '1', isReplaceable: false }
+      ]
+      store.setMissingNodeTypes(types)
+
+      expect(store.missingNodesError).not.toBeNull()
+      expect(store.missingNodesError?.nodeTypes).toHaveLength(1)
+      expect(store.hasMissingNodes).toBe(true)
+    })
+
+    it('clears missingNodesError when given empty array', () => {
+      const store = useExecutionErrorStore()
+      store.setMissingNodeTypes([
+        { type: 'NodeA', nodeId: '1', isReplaceable: false }
+      ])
+      expect(store.missingNodesError).not.toBeNull()
+
+      store.setMissingNodeTypes([])
+      expect(store.missingNodesError).toBeNull()
+      expect(store.hasMissingNodes).toBe(false)
+    })
+
+    it('deduplicates string entries by value', () => {
+      const store = useExecutionErrorStore()
+      store.setMissingNodeTypes([
+        'NodeA',
+        'NodeA',
+        'NodeB'
+      ] as MissingNodeType[])
+
+      expect(store.missingNodesError?.nodeTypes).toHaveLength(2)
+    })
+
+    it('deduplicates object entries by nodeId when present', () => {
+      const store = useExecutionErrorStore()
+      store.setMissingNodeTypes([
+        { type: 'NodeA', nodeId: '1', isReplaceable: false },
+        { type: 'NodeA', nodeId: '1', isReplaceable: false },
+        { type: 'NodeA', nodeId: '2', isReplaceable: false }
+      ])
+
+      // Same nodeId='1' deduplicated, nodeId='2' kept
+      expect(store.missingNodesError?.nodeTypes).toHaveLength(2)
+    })
+
+    it('deduplicates object entries by type when nodeId is absent', () => {
+      const store = useExecutionErrorStore()
+      store.setMissingNodeTypes([
+        { type: 'NodeA', isReplaceable: false },
+        { type: 'NodeA', isReplaceable: true }
+      ] as MissingNodeType[])
+
+      // Same type, no nodeId → deduplicated
+      expect(store.missingNodesError?.nodeTypes).toHaveLength(1)
+    })
+
+    it('keeps distinct nodeIds even when type is the same', () => {
+      const store = useExecutionErrorStore()
+      store.setMissingNodeTypes([
+        { type: 'NodeA', nodeId: '1', isReplaceable: false },
+        { type: 'NodeA', nodeId: '2', isReplaceable: false },
+        { type: 'NodeA', nodeId: '3', isReplaceable: false }
+      ])
+
+      expect(store.missingNodesError?.nodeTypes).toHaveLength(3)
+    })
+  })
+
+  describe('removeMissingNodesByType', () => {
+    it('removes matching types from the missing nodes list', () => {
+      const store = useExecutionErrorStore()
+      store.setMissingNodeTypes([
+        { type: 'NodeA', nodeId: '1', isReplaceable: false },
+        { type: 'NodeB', nodeId: '2', isReplaceable: false },
+        { type: 'NodeC', nodeId: '3', isReplaceable: false }
+      ])
+
+      store.removeMissingNodesByType(['NodeA', 'NodeC'])
+
+      expect(store.missingNodesError?.nodeTypes).toHaveLength(1)
+      const remaining = store.missingNodesError?.nodeTypes[0]
+      expect(typeof remaining !== 'string' && remaining?.type).toBe('NodeB')
+    })
+
+    it('clears missingNodesError when all types are removed', () => {
+      const store = useExecutionErrorStore()
+      store.setMissingNodeTypes([
+        { type: 'NodeA', nodeId: '1', isReplaceable: false }
+      ])
+
+      store.removeMissingNodesByType(['NodeA'])
+
+      expect(store.missingNodesError).toBeNull()
+      expect(store.hasMissingNodes).toBe(false)
+    })
+
+    it('does nothing when missingNodesError is null', () => {
+      const store = useExecutionErrorStore()
+      expect(store.missingNodesError).toBeNull()
+
+      // Should not throw
+      store.removeMissingNodesByType(['NodeA'])
+      expect(store.missingNodesError).toBeNull()
+    })
+
+    it('does nothing when removing non-existent types', () => {
+      const store = useExecutionErrorStore()
+      store.setMissingNodeTypes([
+        { type: 'NodeA', nodeId: '1', isReplaceable: false }
+      ])
+
+      store.removeMissingNodesByType(['NonExistent'])
+
+      expect(store.missingNodesError?.nodeTypes).toHaveLength(1)
+    })
+
+    it('handles removing from string entries', () => {
+      const store = useExecutionErrorStore()
+      store.setMissingNodeTypes([
+        'StringNodeA',
+        'StringNodeB'
+      ] as MissingNodeType[])
+
+      store.removeMissingNodesByType(['StringNodeA'])
+
+      expect(store.missingNodesError?.nodeTypes).toHaveLength(1)
+    })
+  })
+})
diff --git a/src/stores/executionErrorStore.ts b/src/stores/executionErrorStore.ts
new file mode 100644
index 0000000000..dbe6935d44
--- /dev/null
+++ b/src/stores/executionErrorStore.ts
@@ -0,0 +1,428 @@
+import { defineStore } from 'pinia'
+import { computed, ref, watch } from 'vue'
+
+import { st } from '@/i18n'
+import { isCloud } from '@/platform/distribution/types'
+import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import { useSettingStore } from '@/platform/settings/settingStore'
+import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
+import { app } from '@/scripts/app'
+import type {
+  ExecutionErrorWsMessage,
+  NodeError,
+  PromptError
+} from '@/schemas/apiSchema'
+import type { NodeId } from '@/platform/workflow/validation/schemas/workflowSchema'
+import type { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph'
+import {
+  getAncestorExecutionIds,
+  getParentExecutionIds
+} from '@/types/nodeIdentification'
+import type { NodeExecutionId, NodeLocatorId } from '@/types/nodeIdentification'
+import type { MissingNodeType } from '@/types/comfy'
+import {
+  executionIdToNodeLocatorId,
+  forEachNode,
+  getNodeByExecutionId,
+  getExecutionIdByNode
+} from '@/utils/graphTraversalUtil'
+
+interface MissingNodesError {
+  message: string
+  nodeTypes: MissingNodeType[]
+}
+
+function clearAllNodeErrorFlags(rootGraph: LGraph): void {
+  forEachNode(rootGraph, (node) => {
+    node.has_errors = false
+    if (node.inputs) {
+      for (const slot of node.inputs) {
+        slot.hasErrors = false
+      }
+    }
+  })
+}
+
+function markNodeSlotErrors(node: LGraphNode, nodeError: NodeError): void {
+  if (!node.inputs) return
+  for (const error of nodeError.errors) {
+    const slotName = error.extra_info?.input_name
+    if (!slotName) continue
+    const slot = node.inputs.find((s) => s.name === slotName)
+    if (slot) slot.hasErrors = true
+  }
+}
+
+function applyNodeError(
+  rootGraph: LGraph,
+  executionId: NodeExecutionId,
+  nodeError: NodeError
+): void {
+  const node = getNodeByExecutionId(rootGraph, executionId)
+  if (!node) return
+
+  node.has_errors = true
+  markNodeSlotErrors(node, nodeError)
+
+  for (const parentId of getParentExecutionIds(executionId)) {
+    const parentNode = getNodeByExecutionId(rootGraph, parentId)
+    if (parentNode) parentNode.has_errors = true
+  }
+}
+
+/** Execution error state: node errors, runtime errors, prompt errors, and missing nodes. */
+export const useExecutionErrorStore = defineStore('executionError', () => {
+  const workflowStore = useWorkflowStore()
+  const canvasStore = useCanvasStore()
+
+  const lastNodeErrors = ref<Record<NodeId, NodeError> | null>(null)
+  const lastExecutionError = ref<ExecutionErrorWsMessage | null>(null)
+  const lastPromptError = ref<PromptError | null>(null)
+  const missingNodesError = ref<MissingNodesError | null>(null)
+
+  const isErrorOverlayOpen = ref(false)
+
+  function showErrorOverlay() {
+    isErrorOverlayOpen.value = true
+  }
+
+  function dismissErrorOverlay() {
+    isErrorOverlayOpen.value = false
+  }
+
+  /** Clear all error state. Called at execution start. */
+  function clearAllErrors() {
+    lastExecutionError.value = null
+    lastPromptError.value = null
+    lastNodeErrors.value = null
+    missingNodesError.value = null
+    isErrorOverlayOpen.value = false
+  }
+
+  /** Clear only prompt-level errors. Called during resetExecutionState. */
+  function clearPromptError() {
+    lastPromptError.value = null
+  }
+
+  /** Set missing node types and open the error overlay if the Errors tab is enabled. */
+  function surfaceMissingNodes(types: MissingNodeType[]) {
+    setMissingNodeTypes(types)
+    if (useSettingStore().get('Comfy.RightSidePanel.ShowErrorsTab')) {
+      showErrorOverlay()
+    }
+  }
+
+  /** Remove specific node types from the missing nodes list (e.g. after replacement). */
+  function removeMissingNodesByType(typesToRemove: string[]) {
+    if (!missingNodesError.value) return
+    const removeSet = new Set(typesToRemove)
+    const remaining = missingNodesError.value.nodeTypes.filter((node) => {
+      const nodeType = typeof node === 'string' ? node : node.type
+      return !removeSet.has(nodeType)
+    })
+    setMissingNodeTypes(remaining)
+  }
+
+  function setMissingNodeTypes(types: MissingNodeType[]) {
+    if (!types.length) {
+      missingNodesError.value = null
+      return
+    }
+    const seen = new Set<string>()
+    const uniqueTypes = types.filter((node) => {
+      // For string entries (group nodes), deduplicate by the string itself.
+      // For object entries, prefer nodeId so multiple instances of the same
+      // type are kept as separate rows; fall back to type if nodeId is absent.
+      const isString = typeof node === 'string'
+      let key: string
+      if (isString) {
+        key = node
+      } else if (node.nodeId != null) {
+        key = String(node.nodeId)
+      } else {
+        key = node.type
+      }
+      if (seen.has(key)) return false
+      seen.add(key)
+      return true
+    })
+    missingNodesError.value = {
+      message: isCloud
+        ? st(
+            'rightSidePanel.missingNodePacks.unsupportedTitle',
+            'Unsupported Node Packs'
+          )
+        : st('rightSidePanel.missingNodePacks.title', 'Missing Node Packs'),
+      nodeTypes: uniqueTypes
+    }
+  }
+
+  const lastExecutionErrorNodeLocatorId = computed(() => {
+    const err = lastExecutionError.value
+    if (!err) return null
+    return executionIdToNodeLocatorId(app.rootGraph, String(err.node_id))
+  })
+
+  const lastExecutionErrorNodeId = computed(() => {
+    const locator = lastExecutionErrorNodeLocatorId.value
+    if (!locator) return null
+    const localId = workflowStore.nodeLocatorIdToNodeId(locator)
+    return localId != null ? String(localId) : null
+  })
+
+  /** Whether a runtime execution error is present */
+  const hasExecutionError = computed(() => !!lastExecutionError.value)
+
+  /** Whether a prompt-level error is present (e.g. invalid_prompt, prompt_no_outputs) */
+  const hasPromptError = computed(() => !!lastPromptError.value)
+
+  /** Whether any node validation errors are present */
+  const hasNodeError = computed(
+    () => !!lastNodeErrors.value && Object.keys(lastNodeErrors.value).length > 0
+  )
+
+  /** Whether any missing node types are present in the current workflow */
+  const hasMissingNodes = computed(() => !!missingNodesError.value)
+
+  /** Whether any error (node validation, runtime execution, prompt-level, or missing nodes) is present */
+  const hasAnyError = computed(
+    () =>
+      hasExecutionError.value ||
+      hasPromptError.value ||
+      hasNodeError.value ||
+      hasMissingNodes.value
+  )
+
+  const allErrorExecutionIds = computed<string[]>(() => {
+    const ids: string[] = []
+    if (lastNodeErrors.value) {
+      ids.push(...Object.keys(lastNodeErrors.value))
+    }
+    if (lastExecutionError.value) {
+      const nodeId = lastExecutionError.value.node_id
+      if (nodeId !== null && nodeId !== undefined) {
+        ids.push(String(nodeId))
+      }
+    }
+    return ids
+  })
+
+  /** Count of prompt-level errors (0 or 1) */
+  const promptErrorCount = computed(() => (lastPromptError.value ? 1 : 0))
+
+  /** Count of all individual node validation errors */
+  const nodeErrorCount = computed(() => {
+    if (!lastNodeErrors.value) return 0
+    let count = 0
+    for (const nodeError of Object.values(lastNodeErrors.value)) {
+      count += nodeError.errors.length
+    }
+    return count
+  })
+
+  /** Count of runtime execution errors (0 or 1) */
+  const executionErrorCount = computed(() => (lastExecutionError.value ? 1 : 0))
+
+  /** Count of missing node errors (0 or 1) */
+  const missingNodeCount = computed(() => (missingNodesError.value ? 1 : 0))
+
+  /** Total count of all individual errors */
+  const totalErrorCount = computed(
+    () =>
+      promptErrorCount.value +
+      nodeErrorCount.value +
+      executionErrorCount.value +
+      missingNodeCount.value
+  )
+
+  /** Graph node IDs (as strings) that have errors in the current graph scope. */
+  const activeGraphErrorNodeIds = computed<Set<string>>(() => {
+    const ids = new Set<string>()
+    if (!app.rootGraph) return ids
+
+    // Fall back to rootGraph when currentGraph hasn't been initialized yet
+    const activeGraph = canvasStore.currentGraph ?? app.rootGraph
+
+    if (lastNodeErrors.value) {
+      for (const executionId of Object.keys(lastNodeErrors.value)) {
+        const graphNode = getNodeByExecutionId(app.rootGraph, executionId)
+        if (graphNode?.graph === activeGraph) {
+          ids.add(String(graphNode.id))
+        }
+      }
+    }
+
+    if (lastExecutionError.value) {
+      const execNodeId = String(lastExecutionError.value.node_id)
+      const graphNode = getNodeByExecutionId(app.rootGraph, execNodeId)
+      if (graphNode?.graph === activeGraph) {
+        ids.add(String(graphNode.id))
+      }
+    }
+
+    return ids
+  })
+
+  /**
+   * Set of all execution ID prefixes derived from missing node execution IDs,
+   * including the missing nodes themselves.
+   *
+   * Example: missing node at "65:70:63" → Set { "65", "65:70", "65:70:63" }
+   */
+  const missingAncestorExecutionIds = computed<Set<NodeExecutionId>>(() => {
+    const ids = new Set<NodeExecutionId>()
+    const error = missingNodesError.value
+    if (!error) return ids
+
+    for (const nodeType of error.nodeTypes) {
+      if (typeof nodeType === 'string') continue
+      if (nodeType.nodeId == null) continue
+      for (const id of getAncestorExecutionIds(String(nodeType.nodeId))) {
+        ids.add(id)
+      }
+    }
+
+    return ids
+  })
+
+  const activeMissingNodeGraphIds = computed<Set<string>>(() => {
+    const ids = new Set<string>()
+    if (!app.rootGraph) return ids
+
+    const activeGraph = canvasStore.currentGraph ?? app.rootGraph
+
+    for (const executionId of missingAncestorExecutionIds.value) {
+      const graphNode = getNodeByExecutionId(app.rootGraph, executionId)
+      if (graphNode?.graph === activeGraph) {
+        ids.add(String(graphNode.id))
+      }
+    }
+
+    return ids
+  })
+
+  /** Map of node errors indexed by locator ID. */
+  const nodeErrorsByLocatorId = computed<Record<NodeLocatorId, NodeError>>(
+    () => {
+      if (!lastNodeErrors.value) return {}
+
+      const map: Record<NodeLocatorId, NodeError> = {}
+
+      for (const [executionId, nodeError] of Object.entries(
+        lastNodeErrors.value
+      )) {
+        const locatorId = executionIdToNodeLocatorId(app.rootGraph, executionId)
+        if (locatorId) {
+          map[locatorId] = nodeError
+        }
+      }
+
+      return map
+    }
+  )
+
+  /** Get node errors by locator ID. */
+  const getNodeErrors = (
+    nodeLocatorId: NodeLocatorId
+  ): NodeError | undefined => {
+    return nodeErrorsByLocatorId.value[nodeLocatorId]
+  }
+
+  /** Check if a specific slot has validation errors. */
+  const slotHasError = (
+    nodeLocatorId: NodeLocatorId,
+    slotName: string
+  ): boolean => {
+    const nodeError = getNodeErrors(nodeLocatorId)
+    if (!nodeError) return false
+
+    return nodeError.errors.some((e) => e.extra_info?.input_name === slotName)
+  }
+
+  /**
+   * Set of all execution ID prefixes derived from active error nodes,
+   * including the error nodes themselves.
+   *
+   * Example: error at "65:70:63" → Set { "65", "65:70", "65:70:63" }
+   */
+  const errorAncestorExecutionIds = computed<Set<NodeExecutionId>>(() => {
+    const ids = new Set<NodeExecutionId>()
+    for (const executionId of allErrorExecutionIds.value) {
+      for (const id of getAncestorExecutionIds(executionId)) {
+        ids.add(id)
+      }
+    }
+    return ids
+  })
+
+  /** True if the node has errors inside it at any nesting depth. */
+  function isContainerWithInternalError(node: LGraphNode): boolean {
+    if (!app.rootGraph) return false
+    const execId = getExecutionIdByNode(app.rootGraph, node)
+    if (!execId) return false
+    return errorAncestorExecutionIds.value.has(execId)
+  }
+
+  /** True if the node has a missing node inside it at any nesting depth. */
+  function isContainerWithMissingNode(node: LGraphNode): boolean {
+    if (!app.rootGraph) return false
+    const execId = getExecutionIdByNode(app.rootGraph, node)
+    if (!execId) return false
+    return missingAncestorExecutionIds.value.has(execId)
+  }
+
+  watch(lastNodeErrors, () => {
+    const rootGraph = app.rootGraph
+    if (!rootGraph) return
+
+    clearAllNodeErrorFlags(rootGraph)
+
+    if (!lastNodeErrors.value) return
+
+    for (const [executionId, nodeError] of Object.entries(
+      lastNodeErrors.value
+    )) {
+      applyNodeError(rootGraph, executionId, nodeError)
+    }
+  })
+
+  return {
+    // Raw state
+    lastNodeErrors,
+    lastExecutionError,
+    lastPromptError,
+    missingNodesError,
+
+    // Clearing
+    clearAllErrors,
+    clearPromptError,
+
+    // Overlay UI
+    isErrorOverlayOpen,
+    showErrorOverlay,
+    dismissErrorOverlay,
+
+    // Derived state
+    hasExecutionError,
+    hasPromptError,
+    hasNodeError,
+    hasMissingNodes,
+    hasAnyError,
+    allErrorExecutionIds,
+    totalErrorCount,
+    lastExecutionErrorNodeId,
+    activeGraphErrorNodeIds,
+    activeMissingNodeGraphIds,
+
+    // Missing node actions
+    setMissingNodeTypes,
+    surfaceMissingNodes,
+    removeMissingNodesByType,
+
+    // Lookup helpers
+    getNodeErrors,
+    slotHasError,
+    isContainerWithInternalError,
+    isContainerWithMissingNode
+  }
+})
diff --git a/tests-ui/tests/store/executionStore.test.ts b/src/stores/executionStore.test.ts
similarity index 62%
rename from tests-ui/tests/store/executionStore.test.ts
rename to src/stores/executionStore.test.ts
index 89d4ff2189..d5db59b21a 100644
--- a/tests-ui/tests/store/executionStore.test.ts
+++ b/src/stores/executionStore.test.ts
@@ -1,25 +1,29 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { app } from '@/scripts/app'
-import { useExecutionStore } from '@/stores/executionStore'
-
-import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
 import {
   createTestSubgraph,
   createTestSubgraphNode
-} from '../litegraph/subgraph/fixtures/subgraphHelpers'
+} from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers'
+import { useExecutionStore } from '@/stores/executionStore'
+import { useExecutionErrorStore } from '@/stores/executionErrorStore'
+import { executionIdToNodeLocatorId } from '@/utils/graphTraversalUtil'
 
 // Create mock functions that will be shared
 const mockNodeExecutionIdToNodeLocatorId = vi.fn()
 const mockNodeIdToNodeLocatorId = vi.fn()
 const mockNodeLocatorIdToNodeExecutionId = vi.fn()
 
+import type * as WorkflowStoreModule from '@/platform/workflow/management/stores/workflowStore'
+import { createMockLGraphNode } from '@/utils/__tests__/litegraphTestUtils'
+import { createTestingPinia } from '@pinia/testing'
+
 // Mock the workflowStore
 vi.mock('@/platform/workflow/management/stores/workflowStore', async () => {
-  const { ComfyWorkflow } = await vi.importActual<
-    typeof import('@/platform/workflow/management/stores/workflowStore')
-  >('@/platform/workflow/management/stores/workflowStore')
+  const { ComfyWorkflow } = await vi.importActual<typeof WorkflowStoreModule>(
+    '@/platform/workflow/management/stores/workflowStore'
+  )
   return {
     ComfyWorkflow,
     useWorkflowStore: vi.fn(() => ({
@@ -63,7 +67,7 @@ describe('useExecutionStore - NodeLocatorId conversions', () => {
     mockNodeIdToNodeLocatorId.mockReset()
     mockNodeLocatorIdToNodeExecutionId.mockReset()
 
-    setActivePinia(createPinia())
+    setActivePinia(createTestingPinia({ stubActions: false }))
     store = useExecutionStore()
   })
 
@@ -75,29 +79,28 @@ describe('useExecutionStore - NodeLocatorId conversions', () => {
         nodes: []
       }
 
-      const mockNode = {
+      const mockNode = createMockLGraphNode({
         id: 123,
         isSubgraphNode: () => true,
         subgraph: mockSubgraph
-      } as any
-
+      })
       // Mock app.rootGraph.getNodeById to return the mock node
       vi.mocked(app.rootGraph.getNodeById).mockReturnValue(mockNode)
 
-      const result = store.executionIdToNodeLocatorId('123:456')
+      const result = executionIdToNodeLocatorId(app.rootGraph, '123:456')
 
       expect(result).toBe('a1b2c3d4-e5f6-7890-abcd-ef1234567890:456')
     })
 
     it('should convert simple node ID to NodeLocatorId', () => {
-      const result = store.executionIdToNodeLocatorId('123')
+      const result = executionIdToNodeLocatorId(app.rootGraph, '123')
 
       // For simple node IDs, it should return the ID as-is
       expect(result).toBe('123')
     })
 
     it('should handle numeric node IDs', () => {
-      const result = store.executionIdToNodeLocatorId(123)
+      const result = executionIdToNodeLocatorId(app.rootGraph, 123)
 
       // For numeric IDs, it should convert to string and return as-is
       expect(result).toBe('123')
@@ -107,7 +110,9 @@ describe('useExecutionStore - NodeLocatorId conversions', () => {
       // Mock app.rootGraph.getNodeById to return null (node not found)
       vi.mocked(app.rootGraph.getNodeById).mockReturnValue(null)
 
-      expect(store.executionIdToNodeLocatorId('999:456')).toBe(undefined)
+      expect(executionIdToNodeLocatorId(app.rootGraph, '999:456')).toBe(
+        undefined
+      )
     })
   })
 
@@ -136,15 +141,57 @@ describe('useExecutionStore - NodeLocatorId conversions', () => {
   })
 })
 
-describe('useExecutionStore - Node Error Lookups', () => {
+describe('useExecutionStore - reconcileInitializingJobs', () => {
   let store: ReturnType<typeof useExecutionStore>
 
   beforeEach(() => {
     vi.clearAllMocks()
-    setActivePinia(createPinia())
+    setActivePinia(createTestingPinia({ stubActions: false }))
     store = useExecutionStore()
   })
 
+  it('should remove job IDs not present in active jobs', () => {
+    store.initializingJobIds = new Set(['job-1', 'job-2', 'job-3'])
+
+    store.reconcileInitializingJobs(new Set(['job-1']))
+
+    expect(store.initializingJobIds).toEqual(new Set(['job-1']))
+  })
+
+  it('should be a no-op when all initializing IDs are active', () => {
+    store.initializingJobIds = new Set(['job-1', 'job-2'])
+
+    store.reconcileInitializingJobs(new Set(['job-1', 'job-2', 'job-3']))
+
+    expect(store.initializingJobIds).toEqual(new Set(['job-1', 'job-2']))
+  })
+
+  it('should be a no-op when there are no initializing jobs', () => {
+    store.initializingJobIds = new Set()
+
+    store.reconcileInitializingJobs(new Set(['job-1']))
+
+    expect(store.initializingJobIds).toEqual(new Set())
+  })
+
+  it('should clear all initializing IDs when no active jobs exist', () => {
+    store.initializingJobIds = new Set(['job-1', 'job-2'])
+
+    store.reconcileInitializingJobs(new Set())
+
+    expect(store.initializingJobIds).toEqual(new Set())
+  })
+})
+
+describe('useExecutionErrorStore - Node Error Lookups', () => {
+  let store: ReturnType<typeof useExecutionErrorStore>
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    store = useExecutionErrorStore()
+  })
+
   describe('getNodeErrors', () => {
     it('should return undefined when no errors exist', () => {
       const result = store.getNodeErrors('123')
@@ -181,11 +228,11 @@ describe('useExecutionStore - Node Error Lookups', () => {
         nodes: []
       }
 
-      const mockNode = {
+      const mockNode = createMockLGraphNode({
         id: 123,
         isSubgraphNode: () => true,
         subgraph: mockSubgraph
-      } as any
+      })
 
       vi.mocked(app.rootGraph.getNodeById).mockReturnValue(mockNode)
 
@@ -309,20 +356,19 @@ describe('useExecutionStore - executingNode with subgraphs', () => {
 
   beforeEach(() => {
     vi.clearAllMocks()
-    setActivePinia(createPinia())
+    setActivePinia(createTestingPinia({ stubActions: false }))
     store = useExecutionStore()
   })
 
   it('should find executing node in root graph', () => {
-    const mockNode = {
+    const mockNode = createMockLGraphNode({
       id: '123',
       title: 'Test Node',
       type: 'TestNode'
-    } as LGraphNode
+    })
 
     vi.mocked(app.rootGraph.getNodeById).mockReturnValue(mockNode)
 
-    // Simulate node execution starting
     store.nodeProgressStates = {
       '123': {
         state: 'running',
@@ -338,25 +384,21 @@ describe('useExecutionStore - executingNode with subgraphs', () => {
   })
 
   it('should find executing node in subgraph using execution ID', () => {
-    const mockNodeInSubgraph = {
+    const mockNodeInSubgraph = createMockLGraphNode({
       id: '789',
       title: 'Nested Node',
       type: 'NestedNode'
-    } as LGraphNode
+    })
 
-    // Create a real subgraph with the test helper
     const testSubgraph = createTestSubgraph({
       id: 'sub-uuid'
     })
-    // Add the mock node to the subgraph
     testSubgraph.add(mockNodeInSubgraph)
 
-    // Create a subgraph node using the helper
     const mockSubgraphNode = createTestSubgraphNode(testSubgraph, {
       id: '456'
     })
 
-    // Mock the subgraph's getNodeById to return our mock node
     vi.spyOn(testSubgraph, 'getNodeById').mockImplementation(
       (id: string | number | null | undefined) =>
         id === '789' ? mockNodeInSubgraph : null
@@ -376,7 +418,6 @@ describe('useExecutionStore - executingNode with subgraphs', () => {
       }
     }
 
-    // The executingNode should resolve to the nested node
     expect(store.executingNode).toBe(mockNodeInSubgraph)
   })
 
@@ -403,3 +444,100 @@ describe('useExecutionStore - executingNode with subgraphs', () => {
     expect(store.executingNode).toBeNull()
   })
 })
+
+describe('useExecutionErrorStore - setMissingNodeTypes', () => {
+  let store: ReturnType<typeof useExecutionErrorStore>
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    store = useExecutionErrorStore()
+  })
+
+  it('clears missingNodesError when called with an empty array', () => {
+    store.setMissingNodeTypes([{ type: 'NodeA' }])
+    store.setMissingNodeTypes([])
+    expect(store.missingNodesError).toBeNull()
+  })
+
+  it('hasMissingNodes is false when error is null', () => {
+    store.setMissingNodeTypes([])
+    expect(store.hasMissingNodes).toBe(false)
+  })
+
+  it('hasMissingNodes is true after setting non-empty types', () => {
+    store.setMissingNodeTypes([{ type: 'NodeA' }])
+    expect(store.hasMissingNodes).toBe(true)
+  })
+
+  it('deduplicates string entries by value', () => {
+    store.setMissingNodeTypes(['GroupNode', 'GroupNode', 'OtherGroup'])
+    expect(store.missingNodesError?.nodeTypes).toHaveLength(2)
+    expect(store.missingNodesError?.nodeTypes).toEqual([
+      'GroupNode',
+      'OtherGroup'
+    ])
+  })
+
+  it('keeps a single string entry unchanged', () => {
+    store.setMissingNodeTypes(['GroupNode'])
+    expect(store.missingNodesError?.nodeTypes).toHaveLength(1)
+  })
+
+  it('deduplicates object entries with the same nodeId', () => {
+    store.setMissingNodeTypes([
+      { type: 'NodeA', nodeId: 1 },
+      { type: 'NodeA', nodeId: 1 }
+    ])
+    expect(store.missingNodesError?.nodeTypes).toHaveLength(1)
+  })
+
+  it('keeps object entries with different nodeIds even if same type', () => {
+    store.setMissingNodeTypes([
+      { type: 'NodeA', nodeId: 1 },
+      { type: 'NodeA', nodeId: 2 }
+    ])
+    expect(store.missingNodesError?.nodeTypes).toHaveLength(2)
+  })
+
+  it('deduplicates object entries by type when nodeId is absent', () => {
+    store.setMissingNodeTypes([{ type: 'NodeB' }, { type: 'NodeB' }])
+    expect(store.missingNodesError?.nodeTypes).toHaveLength(1)
+  })
+
+  it('keeps distinct types when nodeId is absent', () => {
+    store.setMissingNodeTypes([{ type: 'NodeB' }, { type: 'NodeC' }])
+    expect(store.missingNodesError?.nodeTypes).toHaveLength(2)
+  })
+
+  it('treats absent nodeId the same as type-only key (falls back to type)', () => {
+    store.setMissingNodeTypes([{ type: 'NodeD' }, { type: 'NodeD' }])
+    expect(store.missingNodesError?.nodeTypes).toHaveLength(1)
+  })
+
+  it('handles a mix of string and object entries correctly', () => {
+    store.setMissingNodeTypes([
+      'GroupNode',
+      'GroupNode', // string dup
+      { type: 'NodeA', nodeId: 1 },
+      { type: 'NodeA', nodeId: 1 }, // object dup by nodeId
+      { type: 'NodeA', nodeId: 2 }, // same type, different nodeId → kept
+      { type: 'NodeB' },
+      { type: 'NodeB' } // object dup by type
+    ])
+    // Unique: 'GroupNode', {NodeA,1}, {NodeA,2}, {NodeB} → 4
+    expect(store.missingNodesError?.nodeTypes).toHaveLength(4)
+  })
+
+  it('stores a non-empty message string in missingNodesError', () => {
+    store.setMissingNodeTypes([{ type: 'NodeA' }])
+    expect(typeof store.missingNodesError?.message).toBe('string')
+    expect(store.missingNodesError!.message.length).toBeGreaterThan(0)
+  })
+
+  it('stores the deduplicated nodeTypes array in missingNodesError', () => {
+    const input = [{ type: 'NodeA' }, { type: 'NodeB' }]
+    store.setMissingNodeTypes(input)
+    expect(store.missingNodesError?.nodeTypes).toEqual(input)
+  })
+})
diff --git a/src/stores/executionStore.ts b/src/stores/executionStore.ts
index 57b52bf67b..046c80d26a 100644
--- a/src/stores/executionStore.ts
+++ b/src/stores/executionStore.ts
@@ -1,8 +1,7 @@
 import { defineStore } from 'pinia'
-import { computed, ref, watch } from 'vue'
+import { computed, ref, shallowRef } from 'vue'
 
 import { useNodeProgressText } from '@/composables/node/useNodeProgressText'
-import type { LGraph, Subgraph } from '@/lib/litegraph/src/litegraph'
 import { isCloud } from '@/platform/distribution/types'
 import { useTelemetry } from '@/platform/telemetry'
 import type { ComfyWorkflow } from '@/platform/workflow/management/stores/workflowStore'
@@ -16,7 +15,6 @@ import type {
   ExecutionInterruptedWsMessage,
   ExecutionStartWsMessage,
   ExecutionSuccessWsMessage,
-  NodeError,
   NodeProgressState,
   NotificationWsMessage,
   ProgressStateWsMessage,
@@ -25,12 +23,17 @@ import type {
 } from '@/schemas/apiSchema'
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
-import { useNodeOutputStore } from '@/stores/imagePreviewStore'
+import { useNodeOutputStore } from '@/stores/nodeOutputStore'
+import { useJobPreviewStore } from '@/stores/jobPreviewStore'
+import { useExecutionErrorStore } from '@/stores/executionErrorStore'
 import type { NodeLocatorId } from '@/types/nodeIdentification'
-import { createNodeLocatorId } from '@/types/nodeIdentification'
-import { forEachNode, getNodeByExecutionId } from '@/utils/graphTraversalUtil'
+import { classifyCloudValidationError } from '@/utils/executionErrorUtil'
+import {
+  executionIdToNodeLocatorId,
+  getNodeByExecutionId
+} from '@/utils/graphTraversalUtil'
 
-interface QueuedPrompt {
+interface QueuedJob {
   /**
    * The nodes that are queued to be executed. The key is the node id and the
    * value is a boolean indicating if the node has been executed.
@@ -42,84 +45,32 @@ interface QueuedPrompt {
   workflow?: ComfyWorkflow
 }
 
-const subgraphNodeIdToSubgraph = (id: string, graph: LGraph | Subgraph) => {
-  const node = graph.getNodeById(id)
-  if (node?.isSubgraphNode()) return node.subgraph
-}
-
-/**
- * Recursively get the subgraph objects for the given subgraph instance IDs
- * @param currentGraph The current graph
- * @param subgraphNodeIds The instance IDs
- * @param subgraphs The subgraphs
- * @returns The subgraphs that correspond to each of the instance IDs.
- */
-function getSubgraphsFromInstanceIds(
-  currentGraph: LGraph | Subgraph,
-  subgraphNodeIds: string[],
-  subgraphs: Subgraph[] = []
-): Subgraph[] | undefined {
-  // Last segment is the node portion; nothing to do.
-  if (subgraphNodeIds.length === 1) return subgraphs
-
-  const currentPart = subgraphNodeIds.shift()
-  if (currentPart === undefined) return subgraphs
-
-  const subgraph = subgraphNodeIdToSubgraph(currentPart, currentGraph)
-  if (!subgraph) {
-    console.warn(`Subgraph not found: ${currentPart}`)
-    return undefined
-  }
-
-  subgraphs.push(subgraph)
-  return getSubgraphsFromInstanceIds(subgraph, subgraphNodeIds, subgraphs)
-}
-
-/**
- * Convert execution context node IDs to NodeLocatorIds
- * @param nodeId The node ID from execution context (could be execution ID)
- * @returns The NodeLocatorId
- */
-function executionIdToNodeLocatorId(
-  nodeId: string | number
-): NodeLocatorId | undefined {
-  const nodeIdStr = String(nodeId)
-
-  if (!nodeIdStr.includes(':')) {
-    // It's a top-level node ID
-    return nodeIdStr
-  }
-
-  // It's an execution node ID
-  const parts = nodeIdStr.split(':')
-  const localNodeId = parts[parts.length - 1]
-  const subgraphs = getSubgraphsFromInstanceIds(app.rootGraph, parts)
-  if (!subgraphs) return undefined
-  const nodeLocatorId = createNodeLocatorId(subgraphs.at(-1)!.id, localNodeId)
-  return nodeLocatorId
-}
-
 export const useExecutionStore = defineStore('execution', () => {
   const workflowStore = useWorkflowStore()
   const canvasStore = useCanvasStore()
+  const executionErrorStore = useExecutionErrorStore()
 
   const clientId = ref<string | null>(null)
-  const activePromptId = ref<string | null>(null)
-  const queuedPrompts = ref<Record<NodeId, QueuedPrompt>>({})
-  const lastNodeErrors = ref<Record<NodeId, NodeError> | null>(null)
-  const lastExecutionError = ref<ExecutionErrorWsMessage | null>(null)
+  const activeJobId = ref<string | null>(null)
+  const queuedJobs = ref<Record<NodeId, QueuedJob>>({})
   // This is the progress of all nodes in the currently executing workflow
   const nodeProgressStates = ref<Record<string, NodeProgressState>>({})
-  const nodeProgressStatesByPrompt = ref<
+  const nodeProgressStatesByJob = ref<
     Record<string, Record<string, NodeProgressState>>
   >({})
 
   /**
-   * Map of prompt_id to workflow ID for quick lookup across the app.
+   * Map of job ID to workflow ID for quick lookup across the app.
    */
-  const promptIdToWorkflowId = ref<Map<string, string>>(new Map())
+  const jobIdToWorkflowId = ref<Map<string, string>>(new Map())
 
-  const initializingPromptIds = ref<Set<string>>(new Set())
+  /**
+   * Map of job ID to workflow file path in the current session.
+   * Only populated for jobs that are queued in this browser tab.
+   */
+  const jobIdToSessionWorkflowPath = shallowRef<Map<string, string>>(new Map())
+
+  const initializingJobIds = ref<Set<string>>(new Set())
 
   const mergeExecutionProgressStates = (
     currentState: NodeProgressState | undefined,
@@ -160,7 +111,7 @@ export const useExecutionStore = defineStore('execution', () => {
       const parts = String(state.display_node_id).split(':')
       for (let i = 0; i < parts.length; i++) {
         const executionId = parts.slice(0, i + 1).join(':')
-        const locatorId = executionIdToNodeLocatorId(executionId)
+        const locatorId = executionIdToNodeLocatorId(app.rootGraph, executionId)
         if (!locatorId) continue
 
         result[locatorId] = mergeExecutionProgressStates(
@@ -193,13 +144,7 @@ export const useExecutionStore = defineStore('execution', () => {
   const executingNode = computed(() => {
     if (!executingNodeId.value) return null
 
-    // Use getNodeByExecutionId to find nodes even in subgraphs
-    // executingNodeId may be a simple ID like "123" or a hierarchical ID like "123:456"
-    const node = getNodeByExecutionId(
-      app.rootGraph,
-      String(executingNodeId.value)
-    )
-    return node ?? null
+    return getNodeByExecutionId(app.rootGraph, String(executingNodeId.value))
   })
 
   // This is the progress of the currently executing node (for backward compatibility)
@@ -210,42 +155,29 @@ export const useExecutionStore = defineStore('execution', () => {
       : null
   )
 
-  const activePrompt = computed<QueuedPrompt | undefined>(
-    () => queuedPrompts.value[activePromptId.value ?? '']
+  const activeJob = computed<QueuedJob | undefined>(
+    () => queuedJobs.value[activeJobId.value ?? '']
   )
 
   const totalNodesToExecute = computed<number>(() => {
-    if (!activePrompt.value) return 0
-    return Object.values(activePrompt.value.nodes).length
+    if (!activeJob.value) return 0
+    return Object.values(activeJob.value.nodes).length
   })
 
-  const isIdle = computed<boolean>(() => !activePromptId.value)
+  const isIdle = computed<boolean>(() => !activeJobId.value)
 
   const nodesExecuted = computed<number>(() => {
-    if (!activePrompt.value) return 0
-    return Object.values(activePrompt.value.nodes).filter(Boolean).length
+    if (!activeJob.value) return 0
+    return Object.values(activeJob.value.nodes).filter(Boolean).length
   })
 
   const executionProgress = computed<number>(() => {
-    if (!activePrompt.value) return 0
+    if (!activeJob.value) return 0
     const total = totalNodesToExecute.value
     const done = nodesExecuted.value
     return total > 0 ? done / total : 0
   })
 
-  const lastExecutionErrorNodeLocatorId = computed(() => {
-    const err = lastExecutionError.value
-    if (!err) return null
-    return executionIdToNodeLocatorId(String(err.node_id))
-  })
-
-  const lastExecutionErrorNodeId = computed(() => {
-    const locator = lastExecutionErrorNodeLocatorId.value
-    if (!locator) return null
-    const localId = workflowStore.nodeLocatorIdToNodeId(locator)
-    return localId != null ? String(localId) : null
-  })
-
   function bindExecutionEvents() {
     api.addEventListener('notification', handleNotification)
     api.addEventListener('execution_start', handleExecutionStart)
@@ -277,66 +209,72 @@ export const useExecutionStore = defineStore('execution', () => {
   }
 
   function handleExecutionStart(e: CustomEvent<ExecutionStartWsMessage>) {
-    lastExecutionError.value = null
-    activePromptId.value = e.detail.prompt_id
-    queuedPrompts.value[activePromptId.value] ??= { nodes: {} }
-    clearInitializationByPromptId(activePromptId.value)
+    executionErrorStore.clearAllErrors()
+    activeJobId.value = e.detail.prompt_id
+    queuedJobs.value[activeJobId.value] ??= { nodes: {} }
+    clearInitializationByJobId(activeJobId.value)
+
+    // Ensure path mapping exists — execution_start can arrive via WebSocket
+    // before the HTTP response from queuePrompt triggers storeJob.
+    if (!jobIdToSessionWorkflowPath.value.has(activeJobId.value)) {
+      const path = queuedJobs.value[activeJobId.value]?.workflow?.path
+      if (path) ensureSessionWorkflowPath(activeJobId.value, path)
+    }
   }
 
   function handleExecutionCached(e: CustomEvent<ExecutionCachedWsMessage>) {
-    if (!activePrompt.value) return
+    if (!activeJob.value) return
     for (const n of e.detail.nodes) {
-      activePrompt.value.nodes[n] = true
+      activeJob.value.nodes[n] = true
     }
   }
 
   function handleExecutionInterrupted(
     e: CustomEvent<ExecutionInterruptedWsMessage>
   ) {
-    const pid = e.detail.prompt_id
-    if (activePromptId.value)
-      clearInitializationByPromptId(activePromptId.value)
-    resetExecutionState(pid)
+    const jobId = e.detail.prompt_id
+    if (activeJobId.value) clearInitializationByJobId(activeJobId.value)
+    resetExecutionState(jobId)
   }
 
   function handleExecuted(e: CustomEvent<ExecutedWsMessage>) {
-    if (!activePrompt.value) return
-    activePrompt.value.nodes[e.detail.node] = true
+    if (!activeJob.value) return
+    activeJob.value.nodes[e.detail.node] = true
   }
 
   function handleExecutionSuccess(e: CustomEvent<ExecutionSuccessWsMessage>) {
-    if (isCloud && activePromptId.value) {
+    if (isCloud && activeJobId.value) {
       useTelemetry()?.trackExecutionSuccess({
-        jobId: activePromptId.value
+        jobId: activeJobId.value
       })
     }
-    const pid = e.detail.prompt_id
-    resetExecutionState(pid)
+    const jobId = e.detail.prompt_id
+    resetExecutionState(jobId)
   }
 
   function handleExecuting(e: CustomEvent<NodeId | null>): void {
     // Clear the current node progress when a new node starts executing
     _executingNodeProgress.value = null
 
-    if (!activePrompt.value) return
+    if (!activeJob.value) return
 
     // Update the executing nodes list
     if (typeof e.detail !== 'string') {
-      if (activePromptId.value) {
-        delete queuedPrompts.value[activePromptId.value]
+      if (activeJobId.value) {
+        delete queuedJobs.value[activeJobId.value]
       }
-      activePromptId.value = null
+      activeJobId.value = null
     }
   }
 
   function handleProgressState(e: CustomEvent<ProgressStateWsMessage>) {
-    const { nodes, prompt_id: pid } = e.detail
+    const { nodes, prompt_id: jobId } = e.detail
 
     // Revoke previews for nodes that are starting to execute
-    const previousForPrompt = nodeProgressStatesByPrompt.value[pid] || {}
+    const previousForJob = nodeProgressStatesByJob.value[jobId] || {}
     for (const nodeId in nodes) {
       const nodeState = nodes[nodeId]
-      if (nodeState.state === 'running' && !previousForPrompt[nodeId]) {
+      if (nodeState.state === 'running' && !previousForJob[nodeId]) {
         // This node just started executing, revoke its previews
         // Note that we're doing the *actual* node id instead of the display node id
         // here intentionally. That way, we don't clear the preview every time a new node
@@ -347,9 +285,9 @@ export const useExecutionStore = defineStore('execution', () => {
     }
 
     // Update the progress states for all nodes
-    nodeProgressStatesByPrompt.value = {
-      ...nodeProgressStatesByPrompt.value,
-      [pid]: nodes
+    nodeProgressStatesByJob.value = {
+      ...nodeProgressStatesByJob.value,
+      [jobId]: nodes
     }
     nodeProgressStates.value = nodes
 
@@ -379,7 +317,6 @@ export const useExecutionStore = defineStore('execution', () => {
   }
 
   function handleExecutionError(e: CustomEvent<ExecutionErrorWsMessage>) {
-    lastExecutionError.value = e.detail
     if (isCloud) {
       useTelemetry()?.trackExecutionError({
         jobId: e.detail.prompt_id,
@@ -387,16 +324,58 @@ export const useExecutionStore = defineStore('execution', () => {
         nodeType: e.detail.node_type,
         error: e.detail.exception_message
       })
+
+      // Cloud wraps validation errors (400) in exception_message as embedded JSON.
+      if (handleCloudValidationError(e.detail)) return
     }
-    const pid = e.detail?.prompt_id
-    // Clear initialization for errored prompt if present
-    if (e.detail?.prompt_id) clearInitializationByPromptId(e.detail.prompt_id)
-    resetExecutionState(pid)
+
+    // Service-level errors (e.g. "Job has stagnated") have no associated node.
+    // Route them as job errors
+    if (handleServiceLevelError(e.detail)) return
+
+    // OSS path / Cloud fallback (real runtime errors)
+    executionErrorStore.lastExecutionError = e.detail
+    clearInitializationByJobId(e.detail.prompt_id)
+    resetExecutionState(e.detail.prompt_id)
+  }
+
+  function handleServiceLevelError(detail: ExecutionErrorWsMessage): boolean {
+    const nodeId = detail.node_id
+    if (nodeId !== null && nodeId !== undefined && String(nodeId) !== '')
+      return false
+
+    clearInitializationByJobId(detail.prompt_id)
+    resetExecutionState(detail.prompt_id)
+    executionErrorStore.lastPromptError = {
+      type: detail.exception_type ?? 'error',
+      message: detail.exception_type
+        ? `${detail.exception_type}: ${detail.exception_message}`
+        : (detail.exception_message ?? ''),
+      details: detail.traceback?.join('\n') ?? ''
+    }
+    return true
+  }
+
+  function handleCloudValidationError(
+    detail: ExecutionErrorWsMessage
+  ): boolean {
+    const result = classifyCloudValidationError(detail.exception_message)
+    if (!result) return false
+
+    clearInitializationByJobId(detail.prompt_id)
+    resetExecutionState(detail.prompt_id)
+
+    if (result.kind === 'nodeErrors') {
+      executionErrorStore.lastNodeErrors = result.nodeErrors
+    } else {
+      executionErrorStore.lastPromptError = result.promptError
+    }
+    return true
   }
 
   /**
    * Notification handler used for frontend/cloud initialization tracking.
-   * Marks a prompt as initializing when cloud notifies it is waiting for a machine.
+   * Marks a job as initializing when cloud notifies it is waiting for a machine.
    */
   function handleNotification(e: CustomEvent<NotificationWsMessage>) {
     const payload = e.detail
@@ -405,43 +384,62 @@ export const useExecutionStore = defineStore('execution', () => {
     if (!id) return
     // Until cloud implements a proper message
     if (text.includes('Waiting for a machine')) {
-      const next = new Set(initializingPromptIds.value)
+      const next = new Set(initializingJobIds.value)
       next.add(id)
-      initializingPromptIds.value = next
+      initializingJobIds.value = next
     }
   }
 
-  function clearInitializationByPromptId(promptId: string | null) {
-    if (!promptId) return
-    if (!initializingPromptIds.value.has(promptId)) return
-    const next = new Set(initializingPromptIds.value)
-    next.delete(promptId)
-    initializingPromptIds.value = next
+  function clearInitializationByJobId(jobId: string | null) {
+    if (!jobId) return
+    if (!initializingJobIds.value.has(jobId)) return
+    const next = new Set(initializingJobIds.value)
+    next.delete(jobId)
+    initializingJobIds.value = next
   }
 
-  function isPromptInitializing(
-    promptId: string | number | undefined
-  ): boolean {
-    if (!promptId) return false
-    return initializingPromptIds.value.has(String(promptId))
+  function clearInitializationByJobIds(jobIds: string[]) {
+    if (!jobIds.length) return
+    const current = initializingJobIds.value
+    const toRemove = jobIds.filter((id) => current.has(id))
+    if (!toRemove.length) return
+    const next = new Set(current)
+    for (const id of toRemove) {
+      next.delete(id)
+    }
+    initializingJobIds.value = next
+  }
+
+  function reconcileInitializingJobs(activeJobIds: Set<string>) {
+    const orphaned = [...initializingJobIds.value].filter(
+      (id) => !activeJobIds.has(id)
+    )
+    clearInitializationByJobIds(orphaned)
+  }
+
+  function isJobInitializing(jobId: string | number | undefined): boolean {
+    if (!jobId) return false
+    return initializingJobIds.value.has(String(jobId))
   }
 
   /**
    * Reset execution-related state after a run completes or is stopped.
    */
-  function resetExecutionState(pid?: string | null) {
+  function resetExecutionState(jobIdParam?: string | null) {
     nodeProgressStates.value = {}
-    const promptId = pid ?? activePromptId.value ?? null
-    if (promptId) {
-      const map = { ...nodeProgressStatesByPrompt.value }
-      delete map[promptId]
-      nodeProgressStatesByPrompt.value = map
+    const jobId = jobIdParam ?? activeJobId.value ?? null
+    if (jobId) {
+      const map = { ...nodeProgressStatesByJob.value }
+      delete map[jobId]
+      nodeProgressStatesByJob.value = map
+      useJobPreviewStore().clearPreview(jobId)
     }
-    if (activePromptId.value) {
-      delete queuedPrompts.value[activePromptId.value]
+    if (activeJobId.value) {
+      delete queuedJobs.value[activeJobId.value]
     }
-    activePromptId.value = null
+    activeJobId.value = null
     _executingNodeProgress.value = null
+    executionErrorStore.clearPromptError()
   }
 
   function getNodeIdIfExecuting(nodeId: string | number) {
@@ -463,7 +461,7 @@ export const useExecutionStore = defineStore('execution', () => {
     useNodeProgressText().showTextPreview(node, text)
   }
 
-  function storePrompt({
+  function storeJob({
     nodes,
     id,
     workflow
@@ -472,31 +470,46 @@ export const useExecutionStore = defineStore('execution', () => {
     id: string
     workflow: ComfyWorkflow
   }) {
-    queuedPrompts.value[id] ??= { nodes: {} }
-    const queuedPrompt = queuedPrompts.value[id]
-    queuedPrompt.nodes = {
+    queuedJobs.value[id] ??= { nodes: {} }
+    const queuedJob = queuedJobs.value[id]
+    queuedJob.nodes = {
       ...nodes.reduce((p: Record<string, boolean>, n) => {
         p[n] = false
         return p
       }, {}),
-      ...queuedPrompt.nodes
+      ...queuedJob.nodes
     }
-    queuedPrompt.workflow = workflow
+    queuedJob.workflow = workflow
     const wid = workflow?.activeState?.id ?? workflow?.initialState?.id
     if (wid) {
-      promptIdToWorkflowId.value.set(String(id), String(wid))
+      jobIdToWorkflowId.value.set(String(id), String(wid))
+    }
+    if (workflow?.path) {
+      ensureSessionWorkflowPath(String(id), workflow.path)
     }
   }
 
+  // ~0.65 MB at capacity (32 char GUID key + 50 char path value)
+  const MAX_SESSION_PATH_ENTRIES = 4000
+
+  function ensureSessionWorkflowPath(jobId: string, path: string) {
+    if (jobIdToSessionWorkflowPath.value.get(jobId) === path) return
+    const next = new Map(jobIdToSessionWorkflowPath.value)
+    next.set(jobId, path)
+    while (next.size > MAX_SESSION_PATH_ENTRIES) {
+      const oldest = next.keys().next().value
+      if (oldest !== undefined) next.delete(oldest)
+      else break
+    }
+    jobIdToSessionWorkflowPath.value = next
+  }
+
   /**
-   * Register or update a mapping from prompt_id to workflow ID.
+   * Register or update a mapping from job ID to workflow ID.
    */
-  function registerPromptWorkflowIdMapping(
-    promptId: string,
-    workflowId: string
-  ) {
-    if (!promptId || !workflowId) return
-    promptIdToWorkflowId.value.set(String(promptId), String(workflowId))
+  function registerJobWorkflowIdMapping(jobId: string, workflowId: string) {
+    if (!jobId || !workflowId) return
+    jobIdToWorkflowId.value.set(String(jobId), String(workflowId))
   }
 
   /**
@@ -511,11 +524,9 @@ export const useExecutionStore = defineStore('execution', () => {
     return executionId
   }
 
-  const runningPromptIds = computed<string[]>(() => {
+  const runningJobIds = computed<string[]>(() => {
     const result: string[] = []
-    for (const [pid, nodes] of Object.entries(
-      nodeProgressStatesByPrompt.value
-    )) {
+    for (const [pid, nodes] of Object.entries(nodeProgressStatesByJob.value)) {
       if (Object.values(nodes).some((n) => n.state === 'running')) {
         result.push(pid)
       }
@@ -524,114 +535,17 @@ export const useExecutionStore = defineStore('execution', () => {
   })
 
   const runningWorkflowCount = computed<number>(
-    () => runningPromptIds.value.length
+    () => runningJobIds.value.length
   )
 
-  /** Map of node errors indexed by locator ID. */
-  const nodeErrorsByLocatorId = computed<Record<NodeLocatorId, NodeError>>(
-    () => {
-      if (!lastNodeErrors.value) return {}
-
-      const map: Record<NodeLocatorId, NodeError> = {}
-
-      for (const [executionId, nodeError] of Object.entries(
-        lastNodeErrors.value
-      )) {
-        const locatorId = executionIdToNodeLocatorId(executionId)
-        if (locatorId) {
-          map[locatorId] = nodeError
-        }
-      }
-
-      return map
-    }
-  )
-
-  /** Get node errors by locator ID. */
-  const getNodeErrors = (
-    nodeLocatorId: NodeLocatorId
-  ): NodeError | undefined => {
-    return nodeErrorsByLocatorId.value[nodeLocatorId]
-  }
-
-  /** Check if a specific slot has validation errors. */
-  const slotHasError = (
-    nodeLocatorId: NodeLocatorId,
-    slotName: string
-  ): boolean => {
-    const nodeError = getNodeErrors(nodeLocatorId)
-    if (!nodeError) return false
-
-    return nodeError.errors.some((e) => e.extra_info?.input_name === slotName)
-  }
-
-  /**
-   * Update node and slot error flags when validation errors change.
-   * Propagates errors up subgraph chains.
-   */
-  watch(lastNodeErrors, () => {
-    if (!app.rootGraph) return
-
-    // Clear all error flags
-    forEachNode(app.rootGraph, (node) => {
-      node.has_errors = false
-      if (node.inputs) {
-        for (const slot of node.inputs) {
-          slot.hasErrors = false
-        }
-      }
-    })
-
-    if (!lastNodeErrors.value) return
-
-    // Set error flags on nodes and slots
-    for (const [executionId, nodeError] of Object.entries(
-      lastNodeErrors.value
-    )) {
-      const node = getNodeByExecutionId(app.rootGraph, executionId)
-      if (!node) continue
-
-      node.has_errors = true
-
-      // Mark input slots with errors
-      if (node.inputs) {
-        for (const error of nodeError.errors) {
-          const slotName = error.extra_info?.input_name
-          if (!slotName) continue
-
-          const slot = node.inputs.find((s) => s.name === slotName)
-          if (slot) {
-            slot.hasErrors = true
-          }
-        }
-      }
-
-      // Propagate errors to parent subgraph nodes
-      const parts = executionId.split(':')
-      for (let i = parts.length - 1; i > 0; i--) {
-        const parentExecutionId = parts.slice(0, i).join(':')
-        const parentNode = getNodeByExecutionId(
-          app.rootGraph,
-          parentExecutionId
-        )
-        if (parentNode) {
-          parentNode.has_errors = true
-        }
-      }
-    }
-  })
-
   return {
     isIdle,
     clientId,
-    activePromptId,
-    queuedPrompts,
-    lastNodeErrors,
-    lastExecutionError,
-    lastExecutionErrorNodeId,
+    activeJobId,
+    queuedJobs,
     executingNodeId,
     executingNodeIds,
-    activePrompt,
+    activeJob,
     totalNodesToExecute,
     nodesExecuted,
     executionProgress,
@@ -639,24 +553,25 @@ export const useExecutionStore = defineStore('execution', () => {
     executingNodeProgress,
     nodeProgressStates,
     nodeLocationProgressStates,
-    nodeProgressStatesByPrompt,
-    runningPromptIds,
+    nodeProgressStatesByJob,
+    runningJobIds,
     runningWorkflowCount,
-    initializingPromptIds,
-    isPromptInitializing,
+    initializingJobIds,
+    isJobInitializing,
+    clearInitializationByJobId,
+    clearInitializationByJobIds,
+    reconcileInitializingJobs,
     bindExecutionEvents,
     unbindExecutionEvents,
-    storePrompt,
-    registerPromptWorkflowIdMapping,
+    storeJob,
+    registerJobWorkflowIdMapping,
     uniqueExecutingNodeIdStrings,
     // Raw executing progress data for backward compatibility in ComfyApp.
     _executingNodeProgress,
     // NodeLocatorId conversion helpers
-    executionIdToNodeLocatorId,
     nodeLocatorIdToExecutionId,
-    promptIdToWorkflowId,
-    // Node error lookup helpers
-    getNodeErrors,
-    slotHasError
+    jobIdToWorkflowId,
+    jobIdToSessionWorkflowPath,
+    ensureSessionWorkflowPath
   }
 })
diff --git a/tests-ui/tests/store/firebaseAuthStore.test.ts b/src/stores/firebaseAuthStore.test.ts
similarity index 81%
rename from tests-ui/tests/store/firebaseAuthStore.test.ts
rename to src/stores/firebaseAuthStore.test.ts
index 4e29fdaea7..9196f71c95 100644
--- a/tests-ui/tests/store/firebaseAuthStore.test.ts
+++ b/src/stores/firebaseAuthStore.test.ts
@@ -1,11 +1,28 @@
 import { FirebaseError } from 'firebase/app'
+import type { User, UserCredential } from 'firebase/auth'
 import * as firebaseAuth from 'firebase/auth'
-import { createPinia, setActivePinia } from 'pinia'
+import { setActivePinia } from 'pinia'
+import type { Mock } from 'vitest'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import * as vuefire from 'vuefire'
 
 import { useDialogService } from '@/services/dialogService'
 import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
+import { createTestingPinia } from '@pinia/testing'
+
+// Hoisted mocks for dynamic imports
+const { mockDistributionTypes } = vi.hoisted(() => ({
+  mockDistributionTypes: {
+    isCloud: true,
+    isDesktop: true
+  }
+}))
+
+type MockUser = Omit<User, 'getIdToken'> & {
+  getIdToken: Mock
+}
+
+type MockAuth = Record<string, unknown>
 
 // Mock fetch
 const mockFetch = vi.fn()
@@ -51,7 +68,7 @@ vi.mock('vue-i18n', () => ({
 }))
 
 vi.mock('firebase/auth', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('firebase/auth')>()
+  const actual = await importOriginal<typeof firebaseAuth>()
   return {
     ...actual,
     signInWithEmailAndPassword: vi.fn(),
@@ -82,39 +99,55 @@ vi.mock('@/stores/toastStore', () => ({
 // Mock useDialogService
 vi.mock('@/services/dialogService')
 
+// Mock apiKeyAuthStore
+const mockApiKeyGetAuthHeader = vi.fn().mockReturnValue(null)
+vi.mock('@/stores/apiKeyAuthStore', () => ({
+  useApiKeyAuthStore: () => ({
+    getAuthHeader: mockApiKeyGetAuthHeader,
+    getApiKey: vi.fn(),
+    currentUser: null,
+    isAuthenticated: false,
+    storeApiKey: vi.fn(),
+    clearStoredApiKey: vi.fn()
+  })
+}))
+
 describe('useFirebaseAuthStore', () => {
   let store: ReturnType<typeof useFirebaseAuthStore>
-  let authStateCallback: (user: any) => void
-  let idTokenCallback: (user: any) => void
+  let authStateCallback: (user: User | null) => void
+  let idTokenCallback: (user: User | null) => void
 
-  const mockAuth = {
+  const mockAuth: MockAuth = {
     /* mock Auth object */
   }
 
-  const mockUser = {
+  const mockUser: MockUser = {
     uid: 'test-user-id',
     email: 'test@example.com',
     getIdToken: vi.fn().mockResolvedValue('mock-id-token')
-  }
+  } as Partial<User> as MockUser
 
   beforeEach(() => {
     vi.resetAllMocks()
 
     // Setup dialog service mock
     vi.mocked(useDialogService, { partial: true }).mockReturnValue({
-      showSettingsDialog: vi.fn(),
       showErrorDialog: vi.fn()
     })
 
     // Mock useFirebaseAuth to return our mock auth object
-    vi.mocked(vuefire.useFirebaseAuth).mockReturnValue(mockAuth as any)
+    vi.mocked(vuefire.useFirebaseAuth).mockReturnValue(
+      mockAuth as Partial<
+        ReturnType<typeof vuefire.useFirebaseAuth>
+      > as ReturnType<typeof vuefire.useFirebaseAuth>
+    )
 
     // Mock onAuthStateChanged to capture the callback and simulate initial auth state
     vi.mocked(firebaseAuth.onAuthStateChanged).mockImplementation(
       (_, callback) => {
-        authStateCallback = callback as (user: any) => void
+        authStateCallback = callback as (user: User | null) => void
         // Call the callback with our mock user
-        ;(callback as (user: any) => void)(mockUser)
+        ;(callback as (user: User | null) => void)(mockUser)
         // Return an unsubscribe function
         return vi.fn()
       }
@@ -138,32 +171,36 @@ describe('useFirebaseAuthStore', () => {
     })
 
     // Initialize Pinia
-    setActivePinia(createPinia())
+    setActivePinia(createTestingPinia({ stubActions: false }))
     store = useFirebaseAuthStore()
 
     // Reset and set up getIdToken mock
     mockUser.getIdToken.mockReset()
     mockUser.getIdToken.mockResolvedValue('mock-id-token')
+
+    // Default: no API key auth
+    mockApiKeyGetAuthHeader.mockReturnValue(null)
   })
 
   describe('token refresh events', () => {
     beforeEach(async () => {
       vi.resetModules()
-      vi.doMock('@/platform/distribution/types', () => ({
-        isCloud: true,
-        isDesktop: true
-      }))
+      vi.mock('@/platform/distribution/types', () => mockDistributionTypes)
 
       vi.mocked(firebaseAuth.onIdTokenChanged).mockImplementation(
         (_auth, callback) => {
-          idTokenCallback = callback as (user: any) => void
+          idTokenCallback = callback as (user: User | null) => void
           return vi.fn()
         }
       )
 
-      vi.mocked(vuefire.useFirebaseAuth).mockReturnValue(mockAuth as any)
+      vi.mocked(vuefire.useFirebaseAuth).mockReturnValue(
+        mockAuth as Partial<
+          ReturnType<typeof vuefire.useFirebaseAuth>
+        > as ReturnType<typeof vuefire.useFirebaseAuth>
+      )
 
-      setActivePinia(createPinia())
+      setActivePinia(createTestingPinia({ stubActions: false }))
       const storeModule = await import('@/stores/firebaseAuthStore')
       store = storeModule.useFirebaseAuthStore()
     })
@@ -180,14 +217,14 @@ describe('useFirebaseAuthStore', () => {
     })
 
     it('should not increment when ID token event is for a different user UID', () => {
-      const otherUser = { uid: 'other-user-id' }
+      const otherUser = { uid: 'other-user-id' } as Partial<User> as User
       idTokenCallback?.(mockUser)
       idTokenCallback?.(otherUser)
       expect(store.tokenRefreshTrigger).toBe(0)
     })
 
     it('should increment after switching to a new UID and receiving a second event for that UID', () => {
-      const otherUser = { uid: 'other-user-id' }
+      const otherUser = { uid: 'other-user-id' } as Partial<User> as User
       idTokenCallback?.(mockUser)
       idTokenCallback?.(otherUser)
       idTokenCallback?.(otherUser)
@@ -226,7 +263,7 @@ describe('useFirebaseAuthStore', () => {
     // Now, succeed on next attempt
     vi.mocked(firebaseAuth.signInWithEmailAndPassword).mockResolvedValueOnce({
       user: mockUser
-    } as any)
+    } as Partial<UserCredential> as UserCredential)
 
     await store.login('test@example.com', 'correct-password')
   })
@@ -235,7 +272,7 @@ describe('useFirebaseAuthStore', () => {
     it('should login with valid credentials', async () => {
       const mockUserCredential = { user: mockUser }
       vi.mocked(firebaseAuth.signInWithEmailAndPassword).mockResolvedValue(
-        mockUserCredential as any
+        mockUserCredential as Partial<UserCredential> as UserCredential
       )
 
       const result = await store.login('test@example.com', 'password')
@@ -271,7 +308,7 @@ describe('useFirebaseAuthStore', () => {
       // Set up multiple login promises
       const mockUserCredential = { user: mockUser }
       vi.mocked(firebaseAuth.signInWithEmailAndPassword).mockResolvedValue(
-        mockUserCredential as any
+        mockUserCredential as Partial<UserCredential> as UserCredential
       )
 
       const loginPromise1 = store.login('user1@example.com', 'password1')
@@ -289,7 +326,7 @@ describe('useFirebaseAuthStore', () => {
     it('should register a new user', async () => {
       const mockUserCredential = { user: mockUser }
       vi.mocked(firebaseAuth.createUserWithEmailAndPassword).mockResolvedValue(
-        mockUserCredential as any
+        mockUserCredential as Partial<UserCredential> as UserCredential
       )
 
       const result = await store.register('new@example.com', 'password')
@@ -366,7 +403,7 @@ describe('useFirebaseAuthStore', () => {
       // Setup mock for login
       const mockUserCredential = { user: mockUser }
       vi.mocked(firebaseAuth.signInWithEmailAndPassword).mockResolvedValue(
-        mockUserCredential as any
+        mockUserCredential as Partial<UserCredential> as UserCredential
       )
 
       // Login
@@ -442,14 +479,6 @@ describe('useFirebaseAuthStore', () => {
       // This test reproduces the issue where getAuthHeader fails due to network errors
       // when Firebase Auth tries to refresh tokens offline
 
-      // Mock useApiKeyAuthStore to return null (no API key fallback)
-      const mockApiKeyStore = {
-        getAuthHeader: vi.fn().mockReturnValue(null)
-      }
-      vi.doMock('@/stores/apiKeyAuthStore', () => ({
-        useApiKeyAuthStore: () => mockApiKeyStore
-      }))
-
       // Setup user with network error on token refresh
       mockUser.getIdToken.mockReset()
       const networkError = new FirebaseError(
@@ -468,7 +497,7 @@ describe('useFirebaseAuthStore', () => {
       it('should sign in with Google', async () => {
         const mockUserCredential = { user: mockUser }
         vi.mocked(firebaseAuth.signInWithPopup).mockResolvedValue(
-          mockUserCredential as any
+          mockUserCredential as Partial<UserCredential> as UserCredential
         )
 
         const result = await store.loginWithGoogle()
@@ -501,7 +530,7 @@ describe('useFirebaseAuthStore', () => {
       it('should sign in with Github', async () => {
         const mockUserCredential = { user: mockUser }
         vi.mocked(firebaseAuth.signInWithPopup).mockResolvedValue(
-          mockUserCredential as any
+          mockUserCredential as Partial<UserCredential> as UserCredential
         )
 
         const result = await store.loginWithGithub()
@@ -533,7 +562,7 @@ describe('useFirebaseAuthStore', () => {
     it('should handle concurrent social login attempts correctly', async () => {
       const mockUserCredential = { user: mockUser }
       vi.mocked(firebaseAuth.signInWithPopup).mockResolvedValue(
-        mockUserCredential as any
+        mockUserCredential as Partial<UserCredential> as UserCredential
       )
 
       const googleLoginPromise = store.loginWithGoogle()
@@ -615,4 +644,46 @@ describe('useFirebaseAuthStore', () => {
       await expect(store.accessBillingPortal()).rejects.toThrow()
     })
   })
+
+  describe('createCustomer', () => {
+    it('should succeed with API key auth when no Firebase user is present', async () => {
+      authStateCallback(null)
+      mockApiKeyGetAuthHeader.mockReturnValue({ 'X-API-KEY': 'test-api-key' })
+
+      const result = await store.createCustomer()
+
+      expect(mockFetch).toHaveBeenCalledWith(
+        expect.stringContaining('/customers'),
+        expect.objectContaining({
+          method: 'POST',
+          headers: expect.objectContaining({
+            'X-API-KEY': 'test-api-key'
+          })
+        })
+      )
+      expect(result).toEqual({ id: 'test-customer-id' })
+    })
+
+    it('should use Firebase token when Firebase user is present', async () => {
+      const result = await store.createCustomer()
+
+      expect(mockFetch).toHaveBeenCalledWith(
+        expect.stringContaining('/customers'),
+        expect.objectContaining({
+          method: 'POST',
+          headers: expect.objectContaining({
+            Authorization: 'Bearer mock-id-token'
+          })
+        })
+      )
+      expect(result).toEqual({ id: 'test-customer-id' })
+    })
+
+    it('should throw when no auth method is available', async () => {
+      authStateCallback(null)
+      mockApiKeyGetAuthHeader.mockReturnValue(null)
+
+      await expect(store.createCustomer()).rejects.toThrow()
+    })
+  })
 })
diff --git a/src/stores/firebaseAuthStore.ts b/src/stores/firebaseAuthStore.ts
index 9f30398870..bdc3569bcb 100644
--- a/src/stores/firebaseAuthStore.ts
+++ b/src/stores/firebaseAuthStore.ts
@@ -5,7 +5,6 @@ import {
   GoogleAuthProvider,
   browserLocalPersistence,
   createUserWithEmailAndPassword,
-  deleteUser,
   getAdditionalUserInfo,
   onAuthStateChanged,
   onIdTokenChanged,
@@ -23,12 +22,14 @@ import { useFirebaseAuth } from 'vuefire'
 
 import { getComfyApiBaseUrl } from '@/config/comfyApi'
 import { t } from '@/i18n'
+import { WORKSPACE_STORAGE_KEYS } from '@/platform/workspace/workspaceConstants'
 import { isCloud } from '@/platform/distribution/types'
 import { useTelemetry } from '@/platform/telemetry'
 import { useDialogService } from '@/services/dialogService'
 import { useApiKeyAuthStore } from '@/stores/apiKeyAuthStore'
 import type { AuthHeader } from '@/types/authTypes'
 import type { operations } from '@/types/comfyRegistryTypes'
+import { useFeatureFlags } from '@/composables/useFeatureFlags'
 
 type CreditPurchaseResponse =
   operations['InitiateCreditPurchase']['responses']['201']['content']['application/json']
@@ -56,6 +57,8 @@ export class FirebaseAuthStoreError extends Error {
 }
 
 export const useFirebaseAuthStore = defineStore('firebaseAuth', () => {
+  const { flags } = useFeatureFlags()
+
   // State
   const loading = ref(false)
   const currentUser = ref<User | null>(null)
@@ -107,6 +110,15 @@ export const useFirebaseAuthStore = defineStore('firebaseAuth', () => {
     isInitialized.value = true
     if (user === null) {
       lastTokenUserId.value = null
+
+      // Clear workspace sessionStorage on logout to prevent stale tokens
+      try {
+        sessionStorage.removeItem(WORKSPACE_STORAGE_KEYS.CURRENT_WORKSPACE)
+        sessionStorage.removeItem(WORKSPACE_STORAGE_KEYS.TOKEN)
+        sessionStorage.removeItem(WORKSPACE_STORAGE_KEYS.EXPIRES_AT)
+      } catch {
+        // Ignore sessionStorage errors (e.g., in private browsing mode)
+      }
     }
 
     // Reset balance when auth state changes
@@ -152,16 +164,34 @@ export const useFirebaseAuthStore = defineStore('firebaseAuth', () => {
   /**
    * Retrieves the appropriate authentication header for API requests.
    * Checks for authentication in the following order:
-   * 1. Firebase authentication token (if user is logged in)
-   * 2. API key (if stored in the browser's credential manager)
+   * 1. Workspace token (if team_workspaces_enabled and user has active workspace context)
+   * 2. Firebase authentication token (if user is logged in)
+   * 3. API key (if stored in the browser's credential manager)
    *
    * @returns {Promise<AuthHeader | null>}
-   *   - A LoggedInAuthHeader with Bearer token if Firebase authenticated
+   *   - A LoggedInAuthHeader with Bearer token (workspace or Firebase)
    *   - An ApiKeyAuthHeader with X-API-KEY if API key exists
-   *   - null if neither authentication method is available
+   *   - null if no authentication method is available
    */
   const getAuthHeader = async (): Promise<AuthHeader | null> => {
-    // If available, set header with JWT used to identify the user to Firebase service
+    if (flags.teamWorkspacesEnabled) {
+      const workspaceToken = sessionStorage.getItem(
+        WORKSPACE_STORAGE_KEYS.TOKEN
+      )
+      const expiresAt = sessionStorage.getItem(
+        WORKSPACE_STORAGE_KEYS.EXPIRES_AT
+      )
+
+      if (workspaceToken && expiresAt) {
+        const expiryTime = parseInt(expiresAt, 10)
+        if (Date.now() < expiryTime) {
+          return {
+            Authorization: `Bearer ${workspaceToken}`
+          }
+        }
+      }
+    }
+
     const token = await getIdToken()
     if (token) {
       return {
@@ -169,10 +199,43 @@ export const useFirebaseAuthStore = defineStore('firebaseAuth', () => {
       }
     }
 
-    // If not authenticated with Firebase, try falling back to API key if available
     return useApiKeyAuthStore().getAuthHeader()
   }
 
+  /**
+   * Returns Firebase auth header for user-scoped endpoints (e.g., /customers/*).
+   * Use this for endpoints that need user identity, not workspace context.
+   */
+  const getFirebaseAuthHeader = async (): Promise<AuthHeader | null> => {
+    const token = await getIdToken()
+    return token ? { Authorization: `Bearer ${token}` } : null
+  }
+
+  /**
+   * Returns the raw auth token (not wrapped in a header object).
+   * Priority: workspace token > Firebase token.
+   * Use this for WebSocket connections and backend node auth.
+   */
+  const getAuthToken = async (): Promise<string | undefined> => {
+    if (flags.teamWorkspacesEnabled) {
+      const workspaceToken = sessionStorage.getItem(
+        WORKSPACE_STORAGE_KEYS.TOKEN
+      )
+      const expiresAt = sessionStorage.getItem(
+        WORKSPACE_STORAGE_KEYS.EXPIRES_AT
+      )
+
+      if (workspaceToken && expiresAt) {
+        const expiryTime = parseInt(expiresAt, 10)
+        if (Date.now() < expiryTime) {
+          return workspaceToken
+        }
+      }
+    }
+
+    return await getIdToken()
+  }
+
   const fetchBalance = async (): Promise<GetCustomerBalanceResponse | null> => {
     isFetchingBalance.value = true
     try {
@@ -286,7 +349,8 @@ export const useFirebaseAuthStore = defineStore('firebaseAuth', () => {
     if (isCloud) {
       useTelemetry()?.trackAuth({
         method: 'email',
-        is_new_user: false
+        is_new_user: false,
+        user_id: result.user.uid
       })
     }
 
@@ -306,7 +370,8 @@ export const useFirebaseAuthStore = defineStore('firebaseAuth', () => {
     if (isCloud) {
       useTelemetry()?.trackAuth({
         method: 'email',
-        is_new_user: true
+        is_new_user: true,
+        user_id: result.user.uid
       })
     }
 
@@ -324,7 +389,8 @@ export const useFirebaseAuthStore = defineStore('firebaseAuth', () => {
       const isNewUser = additionalUserInfo?.isNewUser ?? false
       useTelemetry()?.trackAuth({
         method: 'google',
-        is_new_user: isNewUser
+        is_new_user: isNewUser,
+        user_id: result.user.uid
       })
     }
 
@@ -342,7 +408,8 @@ export const useFirebaseAuthStore = defineStore('firebaseAuth', () => {
       const isNewUser = additionalUserInfo?.isNewUser ?? false
       useTelemetry()?.trackAuth({
         method: 'github',
-        is_new_user: isNewUser
+        is_new_user: isNewUser,
+        user_id: result.user.uid
       })
     }
 
@@ -365,14 +432,6 @@ export const useFirebaseAuthStore = defineStore('firebaseAuth', () => {
     await updatePassword(currentUser.value, newPassword)
   }
 
-  /** Delete the current user account */
-  const _deleteAccount = async (): Promise<void> => {
-    if (!currentUser.value) {
-      throw new FirebaseAuthStoreError(t('toastMessages.userNotAuthenticated'))
-    }
-    await deleteUser(currentUser.value)
-  }
-
   const addCredits = async (
     requestBodyContent: CreditPurchasePayload
   ): Promise<CreditPurchaseResponse> => {
@@ -421,16 +480,14 @@ export const useFirebaseAuthStore = defineStore('firebaseAuth', () => {
       throw new FirebaseAuthStoreError(t('toastMessages.userNotAuthenticated'))
     }
 
-    const requestBody = targetTier ? { target_tier: targetTier } : undefined
-
     const response = await fetch(buildApiUrl('/customers/billing'), {
       method: 'POST',
       headers: {
         ...authHeader,
         'Content-Type': 'application/json'
       },
-      ...(requestBody && {
-        body: JSON.stringify(requestBody)
+      ...(targetTier && {
+        body: JSON.stringify({ target_tier: targetTier })
       })
     })
 
@@ -474,7 +531,8 @@ export const useFirebaseAuthStore = defineStore('firebaseAuth', () => {
     accessBillingPortal,
     sendPasswordReset,
     updatePassword: _updatePassword,
-    deleteAccount: _deleteAccount,
-    getAuthHeader
+    getAuthHeader,
+    getFirebaseAuthHeader,
+    getAuthToken
   }
 })
diff --git a/src/stores/helpCenterStore.ts b/src/stores/helpCenterStore.ts
index 40d202b8fe..159f091a32 100644
--- a/src/stores/helpCenterStore.ts
+++ b/src/stores/helpCenterStore.ts
@@ -1,14 +1,21 @@
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
 
+export type HelpCenterTriggerLocation = 'sidebar' | 'topbar'
+
 export const useHelpCenterStore = defineStore('helpCenter', () => {
   const isVisible = ref(false)
+  const triggerLocation = ref<HelpCenterTriggerLocation>('sidebar')
 
-  const toggle = () => {
+  const toggle = (location: HelpCenterTriggerLocation = 'sidebar') => {
+    if (!isVisible.value) {
+      triggerLocation.value = location
+    }
     isVisible.value = !isVisible.value
   }
 
-  const show = () => {
+  const show = (location: HelpCenterTriggerLocation = 'sidebar') => {
+    triggerLocation.value = location
     isVisible.value = true
   }
 
@@ -18,6 +25,7 @@ export const useHelpCenterStore = defineStore('helpCenter', () => {
 
   return {
     isVisible,
+    triggerLocation,
     toggle,
     show,
     hide
diff --git a/src/stores/jobPreviewStore.test.ts b/src/stores/jobPreviewStore.test.ts
new file mode 100644
index 0000000000..b10ff84d04
--- /dev/null
+++ b/src/stores/jobPreviewStore.test.ts
@@ -0,0 +1,102 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { ref } from 'vue'
+
+import { useJobPreviewStore } from '@/stores/jobPreviewStore'
+import { releaseSharedObjectUrl } from '@/utils/objectUrlUtil'
+
+const previewMethodRef = ref('latent2rgb')
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: () => ({
+    get: (key: string) => {
+      if (key === 'Comfy.Execution.PreviewMethod') return previewMethodRef.value
+      return undefined
+    }
+  })
+}))
+
+vi.mock('@/utils/objectUrlUtil', () => ({
+  retainSharedObjectUrl: vi.fn(),
+  releaseSharedObjectUrl: vi.fn()
+}))
+
+describe('jobPreviewStore', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    setActivePinia(createPinia())
+    previewMethodRef.value = 'latent2rgb'
+  })
+
+  it('stores preview with nodeId', () => {
+    const store = useJobPreviewStore()
+    store.setPreviewUrl('prompt-1', 'blob:url-1', 'node-5')
+
+    expect(store.nodePreviewsByPromptId['prompt-1']).toEqual({
+      url: 'blob:url-1',
+      nodeId: 'node-5'
+    })
+  })
+
+  it('stores preview without nodeId', () => {
+    const store = useJobPreviewStore()
+    store.setPreviewUrl('prompt-1', 'blob:url-1')
+
+    expect(store.nodePreviewsByPromptId['prompt-1']).toEqual({
+      url: 'blob:url-1',
+      nodeId: undefined
+    })
+  })
+
+  it('derives previewsByPromptId as url-only map', () => {
+    const store = useJobPreviewStore()
+    store.setPreviewUrl('p1', 'blob:a', 'node-1')
+    store.setPreviewUrl('p2', 'blob:b', 'node-2')
+
+    expect(store.previewsByPromptId).toEqual({
+      p1: 'blob:a',
+      p2: 'blob:b'
+    })
+  })
+
+  it('clears a single preview', () => {
+    const store = useJobPreviewStore()
+    store.setPreviewUrl('p1', 'blob:a', 'node-1')
+    store.setPreviewUrl('p2', 'blob:b', 'node-2')
+
+    store.clearPreview('p1')
+
+    expect(store.nodePreviewsByPromptId['p1']).toBeUndefined()
+    expect(store.nodePreviewsByPromptId['p2']).toBeDefined()
+    expect(store.previewsByPromptId).toEqual({ p2: 'blob:b' })
+  })
+
+  it('clears all previews', () => {
+    const store = useJobPreviewStore()
+    store.setPreviewUrl('p1', 'blob:a', 'node-1')
+    store.setPreviewUrl('p2', 'blob:b', 'node-2')
+
+    store.clearAllPreviews()
+
+    expect(store.nodePreviewsByPromptId).toEqual({})
+    expect(store.previewsByPromptId).toEqual({})
+  })
+
+  it('skips duplicate url', () => {
+    const store = useJobPreviewStore()
+    store.setPreviewUrl('p1', 'blob:a', 'node-1')
+
+    store.setPreviewUrl('p1', 'blob:a', 'node-1')
+
+    expect(releaseSharedObjectUrl).not.toHaveBeenCalled()
+  })
+
+  it('ignores setPreviewUrl when previews are disabled', () => {
+    previewMethodRef.value = 'none'
+    const store = useJobPreviewStore()
+
+    store.setPreviewUrl('p1', 'blob:a', 'node-1')
+
+    expect(store.nodePreviewsByPromptId).toEqual({})
+  })
+})
diff --git a/src/stores/jobPreviewStore.ts b/src/stores/jobPreviewStore.ts
new file mode 100644
index 0000000000..f7dbe3c374
--- /dev/null
+++ b/src/stores/jobPreviewStore.ts
@@ -0,0 +1,78 @@
+import { defineStore } from 'pinia'
+import { computed, readonly, ref, watch } from 'vue'
+
+import { useSettingStore } from '@/platform/settings/settingStore'
+import {
+  releaseSharedObjectUrl,
+  retainSharedObjectUrl
+} from '@/utils/objectUrlUtil'
+
+type PromptPreviewMap = Record<string, string>
+interface NodePromptPreview {
+  url: string
+  nodeId?: string
+}
+
+export const useJobPreviewStore = defineStore('jobPreview', () => {
+  const settingStore = useSettingStore()
+  const nodePreviewsByPromptId = ref<Record<string, NodePromptPreview>>({})
+
+  const previewMethod = computed(() =>
+    settingStore.get('Comfy.Execution.PreviewMethod')
+  )
+  const isPreviewEnabled = computed(() => previewMethod.value !== 'none')
+
+  const previewsByPromptId = computed(() => {
+    const result: PromptPreviewMap = {}
+    for (const [k, v] of Object.entries(nodePreviewsByPromptId.value)) {
+      result[k] = v.url
+    }
+    return result
+  })
+
+  function setPreviewUrl(
+    promptId: string | undefined,
+    url: string,
+    nodeId?: string
+  ) {
+    if (!promptId || !isPreviewEnabled.value) return
+    const current = nodePreviewsByPromptId.value[promptId]
+    if (current?.url === url) return
+    if (current) releaseSharedObjectUrl(current.url)
+    retainSharedObjectUrl(url)
+    nodePreviewsByPromptId.value = {
+      ...nodePreviewsByPromptId.value,
+      [promptId]: { url, nodeId }
+    }
+  }
+
+  function clearPreview(promptId: string | undefined) {
+    if (!promptId) return
+    const current = nodePreviewsByPromptId.value[promptId]
+    if (!current) return
+    releaseSharedObjectUrl(current.url)
+    const next = { ...nodePreviewsByPromptId.value }
+    delete next[promptId]
+    nodePreviewsByPromptId.value = next
+  }
+
+  function clearAllPreviews() {
+    for (const { url } of Object.values(nodePreviewsByPromptId.value)) {
+      releaseSharedObjectUrl(url)
+    }
+    nodePreviewsByPromptId.value = {}
+  }
+
+  watch(isPreviewEnabled, (enabled) => {
+    if (!enabled) clearAllPreviews()
+  })
+
+  return {
+    nodePreviewsByPromptId: readonly(nodePreviewsByPromptId),
+    previewsByPromptId,
+    isPreviewEnabled,
+    setPreviewUrl,
+    clearPreview,
+    clearAllPreviews
+  }
+})
diff --git a/src/stores/maskEditorStore.ts b/src/stores/maskEditorStore.ts
index d2140e845e..741446ffb3 100644
--- a/src/stores/maskEditorStore.ts
+++ b/src/stores/maskEditorStore.ts
@@ -1,6 +1,7 @@
 import { defineStore } from 'pinia'
 import { computed, ref, watch } from 'vue'
 import _ from 'es-toolkit/compat'
+import type { TgpuRoot } from 'typegpu'
 
 import {
   BrushShape,
@@ -71,10 +72,25 @@ export const useMaskEditorStore = defineStore('maskEditor', () => {
 
   const canvasHistory = useCanvasHistory(20)
 
-  const tgpuRoot = ref<any>(null)
+  const tgpuRoot = ref<TgpuRoot | null>(null)
 
   const colorInput = ref<HTMLInputElement | null>(null)
 
+  // GPU texture recreation signals
+  /**
+   * GPU texture data must use ArrayBuffer (not SharedArrayBuffer) for compatibility
+   * with WebGPU's device.queue.writeTexture API. SharedArrayBuffer is not accepted
+   * by the WebGPU specification and will cause runtime errors.
+   *
+   * @see https://gpuweb.github.io/gpuweb/#dom-gpuqueue-writetexture
+   */
+  type GPUCompatibleArray = Uint8ClampedArray & { buffer: ArrayBuffer }
+  const gpuTexturesNeedRecreation = ref<boolean>(false)
+  const gpuTextureWidth = ref<number>(0)
+  const gpuTextureHeight = ref<number>(0)
+  const pendingGPUMaskData = ref<GPUCompatibleArray | null>(null)
+  const pendingGPURgbData = ref<GPUCompatibleArray | null>(null)
+
   watch(maskCanvas, (canvas) => {
     if (canvas) {
       maskCtx.value = canvas.getContext('2d', { willReadFrequently: true })
@@ -208,6 +224,13 @@ export const useMaskEditorStore = defineStore('maskEditor', () => {
     panOffset.value = { x: 0, y: 0 }
     cursorPoint.value = { x: 0, y: 0 }
     maskOpacity.value = 0.8
+
+    // Reset GPU recreation flags
+    gpuTexturesNeedRecreation.value = false
+    gpuTextureWidth.value = 0
+    gpuTextureHeight.value = 0
+    pendingGPUMaskData.value = null
+    pendingGPURgbData.value = null
   }
 
   return {
@@ -254,6 +277,13 @@ export const useMaskEditorStore = defineStore('maskEditor', () => {
 
     tgpuRoot,
 
+    // GPU texture recreation signals
+    gpuTexturesNeedRecreation,
+    gpuTextureWidth,
+    gpuTextureHeight,
+    pendingGPUMaskData,
+    pendingGPURgbData,
+
     colorInput,
 
     setBrushSize,
diff --git a/src/stores/menuItemStore.ts b/src/stores/menuItemStore.ts
index 0a24769a1d..51a14eaa97 100644
--- a/src/stores/menuItemStore.ts
+++ b/src/stores/menuItemStore.ts
@@ -1,16 +1,26 @@
+import { whenever } from '@vueuse/core'
 import { defineStore } from 'pinia'
 import type { MenuItem } from 'primevue/menuitem'
 import { ref } from 'vue'
 
 import { CORE_MENU_COMMANDS } from '@/constants/coreMenuCommands'
+import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
 import type { ComfyExtension } from '@/types/comfy'
 
 import { useCommandStore } from './commandStore'
 
 export const useMenuItemStore = defineStore('menuItem', () => {
+  const canvasStore = useCanvasStore()
   const commandStore = useCommandStore()
   const menuItems = ref<MenuItem[]>([])
   const menuItemHasActiveStateChildren = ref<Record<string, boolean>>({})
+  const hasSeenLinear = ref(false)
+
+  whenever(
+    () => canvasStore.linearMode,
+    () => (hasSeenLinear.value = true),
+    { immediate: true, once: true }
+  )
 
   const registerMenuGroup = (path: string[], items: MenuItem[]) => {
     let currentLevel = menuItems.value
@@ -55,21 +65,20 @@ export const useMenuItemStore = defineStore('menuItem', () => {
       )
     }
   }
+  function commandIdToMenuItem(commandId: string, path?: string[]): MenuItem {
+    const command = commandStore.getCommand(commandId)
+    return {
+      command: () => commandStore.execute(command.id),
+      label: command.menubarLabel,
+      icon: command.icon,
+      tooltip: command.tooltip,
+      comfyCommand: command,
+      parentPath: path?.join('.')
+    }
+  }
 
   const registerCommands = (path: string[], commandIds: string[]) => {
-    const items = commandIds
-      .map((commandId) => commandStore.getCommand(commandId))
-      .map(
-        (command) =>
-          ({
-            command: () => commandStore.execute(command.id),
-            label: command.menubarLabel,
-            icon: command.icon,
-            tooltip: command.tooltip,
-            comfyCommand: command,
-            parentPath: path.join('.')
-          }) as MenuItem
-      )
+    const items = commandIds.map((id) => commandIdToMenuItem(id, path))
     registerMenuGroup(path, items)
   }
 
@@ -103,6 +112,8 @@ export const useMenuItemStore = defineStore('menuItem', () => {
     registerCommands,
     loadExtensionMenuCommands,
     registerCoreMenuCommands,
-    menuItemHasActiveStateChildren
+    menuItemHasActiveStateChildren,
+    hasSeenLinear,
+    commandIdToMenuItem
   }
 })
diff --git a/tests-ui/tests/store/modelStore.test.ts b/src/stores/modelStore.test.ts
similarity index 97%
rename from tests-ui/tests/store/modelStore.test.ts
rename to src/stores/modelStore.test.ts
index c9ed82e55d..2bc6f6ab38 100644
--- a/tests-ui/tests/store/modelStore.test.ts
+++ b/src/stores/modelStore.test.ts
@@ -1,4 +1,5 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { assetService } from '@/platform/assets/services/assetService'
@@ -89,7 +90,7 @@ describe('useModelStore', () => {
   let store: ReturnType<typeof useModelStore>
 
   beforeEach(async () => {
-    setActivePinia(createPinia())
+    setActivePinia(createTestingPinia({ stubActions: false }))
     vi.resetAllMocks()
   })
 
diff --git a/src/stores/modelStore.ts b/src/stores/modelStore.ts
index 16015a9d25..32fcec3b63 100644
--- a/src/stores/modelStore.ts
+++ b/src/stores/modelStore.ts
@@ -7,14 +7,19 @@ import { useSettingStore } from '@/platform/settings/settingStore'
 import { api } from '@/scripts/api'
 
 /** (Internal helper) finds a value in a metadata object from any of a list of keys. */
-function _findInMetadata(metadata: any, ...keys: string[]): string | null {
+function _findInMetadata(
+  metadata: Record<string, string | null>,
+  ...keys: string[]
+): string | null {
   for (const key of keys) {
     if (key in metadata) {
-      return metadata[key]
+      const value = metadata[key]
+      return value || null
     }
     for (const k in metadata) {
       if (k.endsWith(key)) {
-        return metadata[k]
+        const value = metadata[k]
+        return value || null
       }
     }
   }
diff --git a/tests-ui/tests/store/modelToNodeStore.test.ts b/src/stores/modelToNodeStore.test.ts
similarity index 78%
rename from tests-ui/tests/store/modelToNodeStore.test.ts
rename to src/stores/modelToNodeStore.test.ts
index c79af19b51..66dd5b3635 100644
--- a/tests-ui/tests/store/modelToNodeStore.test.ts
+++ b/src/stores/modelToNodeStore.test.ts
@@ -1,4 +1,5 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema'
@@ -22,12 +23,27 @@ const EXPECTED_DEFAULT_TYPES = [
   'audio_encoders',
   'model_patches',
   'animatediff_models',
-  'animatediff_motion_lora'
+  'animatediff_motion_lora',
+  'chatterbox/chatterbox',
+  'chatterbox/chatterbox_turbo',
+  'chatterbox/chatterbox_multilingual',
+  'chatterbox/chatterbox_vc',
+  'latent_upscale_models',
+  'sam2',
+  'sams',
+  'ultralytics',
+  'depthanything',
+  'ipadapter',
+  'segformer_b2_clothes',
+  'segformer_b3_clothes',
+  'segformer_b3_fashion',
+  'nlf',
+  'FlashVSR',
+  'FlashVSR-v1.1'
 ] as const
 
 type NodeDefStoreType = ReturnType<typeof useNodeDefStore>
 
-// Create minimal but valid ComfyNodeDefImpl for testing
 function createMockNodeDef(name: string): ComfyNodeDefImpl {
   const def: ComfyNodeDefV1 = {
     name,
@@ -60,15 +76,26 @@ const MOCK_NODE_NAMES = [
   'AudioEncoderLoader',
   'ModelPatchLoader',
   'ADE_LoadAnimateDiffModel',
-  'ADE_AnimateDiffLoRALoader'
+  'ADE_AnimateDiffLoRALoader',
+  'FL_ChatterboxTTS',
+  'FL_ChatterboxTurboTTS',
+  'FL_ChatterboxMultilingualTTS',
+  'FL_ChatterboxVC',
+  'LatentUpscaleModelLoader',
+  'DownloadAndLoadSAM2Model',
+  'SAMLoader',
+  'UltralyticsDetectorProvider',
+  'DownloadAndLoadDepthAnythingV2Model',
+  'IPAdapterModelLoader',
+  'LS_LoadSegformerModel',
+  'LoadNLFModel',
+  'FlashVSRNode'
 ] as const
 
 const mockNodeDefsByName = Object.fromEntries(
   MOCK_NODE_NAMES.map((name) => [name, createMockNodeDef(name)])
 )
 
-// Mock nodeDefStore dependency - modelToNodeStore relies on this for registration
-// Most tests expect this to be populated; tests that need empty state can override
 vi.mock('@/stores/nodeDefStore', async (importOriginal) => {
   const original = await importOriginal<NodeDefStoreType>()
 
@@ -82,7 +109,7 @@ vi.mock('@/stores/nodeDefStore', async (importOriginal) => {
 
 describe('useModelToNodeStore', () => {
   beforeEach(() => {
-    setActivePinia(createPinia())
+    setActivePinia(createTestingPinia({ stubActions: false }))
     vi.clearAllMocks()
   })
 
@@ -108,7 +135,6 @@ describe('useModelToNodeStore', () => {
 
       const provider = modelToNodeStore.getNodeProvider('checkpoints')
       expect(provider).toBeDefined()
-      // After asserting provider is defined, we can safely access its properties
       expect(provider?.nodeDef?.name).toBe('CheckpointLoaderSimple')
       expect(provider?.key).toBe('ckpt_name')
     })
@@ -124,7 +150,6 @@ describe('useModelToNodeStore', () => {
       modelToNodeStore.registerDefaults()
 
       const provider = modelToNodeStore.getNodeProvider('checkpoints')
-      // Using optional chaining for safety since getNodeProvider() can return undefined
       expect(provider?.nodeDef?.name).toBe('CheckpointLoaderSimple')
     })
 
@@ -134,6 +159,59 @@ describe('useModelToNodeStore', () => {
       const provider = modelToNodeStore.getNodeProvider('checkpoints')
       expect(provider).toBeDefined()
     })
+
+    it('should fallback to top-level folder for hierarchical model types', () => {
+      const modelToNodeStore = useModelToNodeStore()
+      modelToNodeStore.registerDefaults()
+
+      const provider = modelToNodeStore.getNodeProvider('checkpoints/subfolder')
+      expect(provider).toBeDefined()
+      expect(provider?.nodeDef?.name).toBe('CheckpointLoaderSimple')
+    })
+
+    it('should return undefined for hierarchical type with unregistered top-level', () => {
+      const modelToNodeStore = useModelToNodeStore()
+      modelToNodeStore.registerDefaults()
+
+      expect(
+        modelToNodeStore.getNodeProvider('UnknownType/subfolder')
+      ).toBeUndefined()
+    })
+
+    it('should return provider for chatterbox nodes with empty key', () => {
+      const modelToNodeStore = useModelToNodeStore()
+      modelToNodeStore.registerDefaults()
+
+      const provider = modelToNodeStore.getNodeProvider(
+        'chatterbox/chatterbox_vc'
+      )
+      expect(provider).toBeDefined()
+      expect(provider?.nodeDef?.name).toBe('FL_ChatterboxVC')
+      expect(provider?.key).toBe('')
+    })
+
+    it.each([
+      ['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) => {
+        const modelToNodeStore = useModelToNodeStore()
+        modelToNodeStore.registerDefaults()
+
+        const provider = modelToNodeStore.getNodeProvider(modelType)
+        expect(provider?.nodeDef?.name).toBe(expectedNodeName)
+        expect(provider?.key).toBe(expectedKey)
+      }
+    )
   })
 
   describe('getAllNodeProviders', () => {
@@ -183,13 +261,24 @@ describe('useModelToNodeStore', () => {
       const providers = modelToNodeStore.getAllNodeProviders('checkpoints')
       expect(providers.length).toBeGreaterThan(0)
     })
+
+    it('should fallback to top-level folder for hierarchical model types', () => {
+      const modelToNodeStore = useModelToNodeStore()
+      modelToNodeStore.registerDefaults()
+
+      const providers = modelToNodeStore.getAllNodeProviders(
+        'checkpoints/subfolder'
+      )
+      expect(providers).toHaveLength(2)
+      expect(providers[0].nodeDef.name).toBe('CheckpointLoaderSimple')
+    })
   })
 
   describe('registerNodeProvider', () => {
     it('should not register provider when nodeDef is undefined', () => {
       const modelToNodeStore = useModelToNodeStore()
       const providerWithoutNodeDef = new ModelNodeProvider(
-        undefined as any,
+        undefined!,
         'custom_key'
       )
 
@@ -214,7 +303,6 @@ describe('useModelToNodeStore', () => {
 
       const retrieved = modelToNodeStore.getNodeProvider('custom_type')
       expect(retrieved).toStrictEqual(customProvider)
-      // Optional chaining for consistency with getNodeProvider() return type
       expect(retrieved?.key).toBe('custom_key')
     })
 
@@ -263,7 +351,6 @@ describe('useModelToNodeStore', () => {
 
       const provider = modelToNodeStore.getNodeProvider('test_type')
       expect(provider).toBeDefined()
-      // After asserting provider is defined, we can safely access its properties
       expect(provider!.nodeDef.name).toBe('UNETLoader')
       expect(provider!.key).toBe('test_param')
     })
@@ -329,8 +416,7 @@ describe('useModelToNodeStore', () => {
     })
 
     it('should not register when nodeDefStore is empty', () => {
-      // Create fresh Pinia for this test to avoid state persistence
-      setActivePinia(createPinia())
+      setActivePinia(createTestingPinia({ stubActions: false }))
 
       vi.mocked(useNodeDefStore, { partial: true }).mockReturnValue({
         nodeDefsByName: {}
@@ -339,7 +425,6 @@ describe('useModelToNodeStore', () => {
       modelToNodeStore.registerDefaults()
       expect(modelToNodeStore.getNodeProvider('checkpoints')).toBeUndefined()
 
-      // Restore original mock for subsequent tests
       vi.mocked(useNodeDefStore, { partial: true }).mockReturnValue({
         nodeDefsByName: mockNodeDefsByName
       })
@@ -354,8 +439,7 @@ describe('useModelToNodeStore', () => {
     })
 
     it('should return empty Record when nodeDefStore is empty', () => {
-      // Create fresh Pinia for this test to avoid state persistence
-      setActivePinia(createPinia())
+      setActivePinia(createTestingPinia({ stubActions: false }))
 
       vi.mocked(useNodeDefStore, { partial: true }).mockReturnValue({
         nodeDefsByName: {}
@@ -365,7 +449,6 @@ describe('useModelToNodeStore', () => {
       const result = modelToNodeStore.getRegisteredNodeTypes()
       expect(result).toStrictEqual({})
 
-      // Restore original mock for subsequent tests
       vi.mocked(useNodeDefStore, { partial: true }).mockReturnValue({
         nodeDefsByName: mockNodeDefsByName
       })
@@ -456,16 +539,11 @@ describe('useModelToNodeStore', () => {
       const modelToNodeStore = useModelToNodeStore()
       modelToNodeStore.registerDefaults()
 
-      // These should not throw but return undefined
+      expect(modelToNodeStore.getCategoryForNodeType(null!)).toBeUndefined()
       expect(
-        modelToNodeStore.getCategoryForNodeType(null as any)
-      ).toBeUndefined()
-      expect(
-        modelToNodeStore.getCategoryForNodeType(undefined as any)
-      ).toBeUndefined()
-      expect(
-        modelToNodeStore.getCategoryForNodeType(123 as any)
+        modelToNodeStore.getCategoryForNodeType(undefined!)
       ).toBeUndefined()
+      expect(modelToNodeStore.getCategoryForNodeType('123')).toBeUndefined()
     })
 
     it('should be case-sensitive for node type matching', () => {
@@ -490,5 +568,16 @@ describe('useModelToNodeStore', () => {
       expect(modelToNodeStore.getNodeProvider('')).toBeUndefined()
       expect(modelToNodeStore.getAllNodeProviders('')).toEqual([])
     })
+
+    it('should handle invalid input types gracefully', () => {
+      const modelToNodeStore = useModelToNodeStore()
+      modelToNodeStore.registerDefaults()
+
+      expect(modelToNodeStore.getNodeProvider(null)).toBeUndefined()
+      expect(modelToNodeStore.getNodeProvider(undefined)).toBeUndefined()
+      expect(modelToNodeStore.getNodeProvider(123)).toBeUndefined()
+      expect(modelToNodeStore.getAllNodeProviders(null)).toEqual([])
+      expect(modelToNodeStore.getAllNodeProviders(undefined)).toEqual([])
+    })
   })
 })
diff --git a/src/stores/modelToNodeStore.ts b/src/stores/modelToNodeStore.ts
index cc9a911c88..3699678642 100644
--- a/src/stores/modelToNodeStore.ts
+++ b/src/stores/modelToNodeStore.ts
@@ -9,7 +9,7 @@ export class ModelNodeProvider {
   /** The node definition to use for this model. */
   public nodeDef: ComfyNodeDefImpl
 
-  /** The node input key for where to inside the model name. */
+  /** The node input key for where to insert the model name. */
   public key: string
 
   constructor(nodeDef: ComfyNodeDefImpl, key: string) {
@@ -73,23 +73,53 @@ export const useModelToNodeStore = defineStore('modelToNode', () => {
     return nodeTypeToCategory.value[nodeType]
   }
 
+  /**
+   * Find providers for modelType with hierarchical fallback.
+   * Tries exact match first, then falls back to top-level segment (e.g., "parent/child" → "parent").
+   * Note: Only falls back one level; "a/b/c" tries "a/b/c" then "a", not "a/b".
+   */
+  function findProvidersWithFallback(
+    modelType: string
+  ): ModelNodeProvider[] | undefined {
+    if (!modelType || typeof modelType !== 'string') {
+      return undefined
+    }
+
+    const exactMatch = modelToNodeMap.value[modelType]
+    if (exactMatch && exactMatch.length > 0) return exactMatch
+
+    const topLevel = modelType.split('/')[0]
+    if (topLevel === modelType) return undefined
+
+    const fallback = modelToNodeMap.value[topLevel]
+
+    if (fallback && fallback.length > 0) return fallback
+
+    return undefined
+  }
+
   /**
    * Get the node provider for the given model type name.
+   * Supports hierarchical lookups: if "parent/child" has no match, falls back to "parent".
    * @param modelType The name of the model type to get the node provider for.
    * @returns The node provider for the given model type name.
    */
-  function getNodeProvider(modelType: string): ModelNodeProvider | undefined {
+  function getNodeProvider(modelType: unknown): ModelNodeProvider | undefined {
+    if (typeof modelType !== 'string') return undefined
     registerDefaults()
-    return modelToNodeMap.value[modelType]?.[0]
+    return findProvidersWithFallback(modelType)?.[0]
   }
+
   /**
    * Get the list of all valid node providers for the given model type name.
+   * Supports hierarchical lookups: if "parent/child" has no match, falls back to "parent".
    * @param modelType The name of the model type to get the node providers for.
    * @returns The list of all valid node providers for the given model type name.
    */
-  function getAllNodeProviders(modelType: string): ModelNodeProvider[] {
+  function getAllNodeProviders(modelType: unknown): ModelNodeProvider[] {
+    if (typeof modelType !== 'string') return []
     registerDefaults()
-    return modelToNodeMap.value[modelType] ?? []
+    return findProvidersWithFallback(modelType) ?? []
   }
   /**
    * Register a node provider for the given model type name.
@@ -153,6 +183,207 @@ export const useModelToNodeStore = defineStore('modelToNode', () => {
       'ADE_AnimateDiffLoRALoader',
       'name'
     )
+
+    // Chatterbox TTS nodes: empty key means the node auto-loads models without
+    // a widget selector (createModelNodeFromAsset skips widget assignment)
+    quickRegister('chatterbox/chatterbox', 'FL_ChatterboxTTS', '')
+    quickRegister('chatterbox/chatterbox_turbo', 'FL_ChatterboxTurboTTS', '')
+    quickRegister(
+      'chatterbox/chatterbox_multilingual',
+      'FL_ChatterboxMultilingualTTS',
+      ''
+    )
+    quickRegister('chatterbox/chatterbox_vc', 'FL_ChatterboxVC', '')
+
+    // Latent upscale models (ComfyUI core - nodes_hunyuan.py)
+    quickRegister(
+      'latent_upscale_models',
+      'LatentUpscaleModelLoader',
+      'model_name'
+    )
+
+    // SAM/SAM2 segmentation models (comfyui-segment-anything-2, comfyui-impact-pack)
+    quickRegister('sam2', 'DownloadAndLoadSAM2Model', 'model')
+    quickRegister('sams', 'SAMLoader', 'model_name')
+
+    // Ultralytics detection models (comfyui-impact-subpack)
+    // Note: ultralytics/bbox and ultralytics/segm fall back to this via hierarchical lookup
+    quickRegister('ultralytics', 'UltralyticsDetectorProvider', 'model_name')
+
+    // DepthAnything models (comfyui-depthanythingv2)
+    quickRegister(
+      'depthanything',
+      'DownloadAndLoadDepthAnythingV2Model',
+      'model'
+    )
+
+    // IP-Adapter models (comfyui_ipadapter_plus)
+    quickRegister('ipadapter', 'IPAdapterModelLoader', 'ipadapter_file')
+
+    // Segformer clothing/fashion segmentation models (comfyui_layerstyle)
+    quickRegister('segformer_b2_clothes', 'LS_LoadSegformerModel', 'model_name')
+    quickRegister('segformer_b3_clothes', 'LS_LoadSegformerModel', 'model_name')
+    quickRegister('segformer_b3_fashion', 'LS_LoadSegformerModel', 'model_name')
+
+    // NLF pose estimation models (ComfyUI-WanVideoWrapper)
+    quickRegister('nlf', 'LoadNLFModel', 'nlf_model')
+
+    // FlashVSR video super-resolution (ComfyUI-FlashVSR_Ultra_Fast)
+    // Empty key means the node auto-loads models without a widget selector
+    quickRegister('FlashVSR', 'FlashVSRNode', '')
+    quickRegister('FlashVSR-v1.1', 'FlashVSRNode', '')
+
+    // SEEDVR2 video upscaling (comfyui-seedvr2)
+    quickRegister('SEEDVR2', 'SeedVR2LoadDiTModel', 'model')
+
+    // Qwen VL vision-language models (comfyui-qwen-vl)
+    // Register each specific path to avoid LLM fallback catching unrelated models
+    // (e.g., LLM/llava-* should NOT map to AILab_QwenVL)
+    quickRegister(
+      'LLM/Qwen-VL/Qwen2.5-VL-3B-Instruct',
+      'AILab_QwenVL',
+      'model_name'
+    )
+    quickRegister(
+      'LLM/Qwen-VL/Qwen2.5-VL-7B-Instruct',
+      'AILab_QwenVL',
+      'model_name'
+    )
+    quickRegister(
+      'LLM/Qwen-VL/Qwen3-VL-2B-Instruct',
+      'AILab_QwenVL',
+      'model_name'
+    )
+    quickRegister(
+      'LLM/Qwen-VL/Qwen3-VL-2B-Thinking',
+      'AILab_QwenVL',
+      'model_name'
+    )
+    quickRegister(
+      'LLM/Qwen-VL/Qwen3-VL-4B-Instruct',
+      'AILab_QwenVL',
+      'model_name'
+    )
+    quickRegister(
+      'LLM/Qwen-VL/Qwen3-VL-4B-Thinking',
+      'AILab_QwenVL',
+      'model_name'
+    )
+    quickRegister(
+      'LLM/Qwen-VL/Qwen3-VL-8B-Instruct',
+      'AILab_QwenVL',
+      'model_name'
+    )
+    quickRegister(
+      'LLM/Qwen-VL/Qwen3-VL-8B-Thinking',
+      'AILab_QwenVL',
+      'model_name'
+    )
+    quickRegister(
+      'LLM/Qwen-VL/Qwen3-VL-32B-Instruct',
+      'AILab_QwenVL',
+      'model_name'
+    )
+    quickRegister(
+      'LLM/Qwen-VL/Qwen3-VL-32B-Thinking',
+      'AILab_QwenVL',
+      'model_name'
+    )
+    quickRegister(
+      'LLM/Qwen-VL/Qwen3-0.6B',
+      'AILab_QwenVL_PromptEnhancer',
+      'model_name'
+    )
+    quickRegister(
+      'LLM/Qwen-VL/Qwen3-4B-Instruct-2507',
+      'AILab_QwenVL_PromptEnhancer',
+      'model_name'
+    )
+    quickRegister('LLM/checkpoints', 'LoadChatGLM3', 'chatglm3_checkpoint')
+
+    // Qwen3 TTS speech models (ComfyUI-FunBox)
+    // Top-level 'qwen-tts' catches all qwen-tts/* subdirs via hierarchical fallback
+    quickRegister('qwen-tts', 'FB_Qwen3TTSVoiceClone', 'model_choice')
+
+    // DepthAnything V3 models (comfyui-depthanythingv2)
+    quickRegister(
+      'depthanything3',
+      'DownloadAndLoadDepthAnythingV3Model',
+      'model'
+    )
+
+    // LivePortrait face animation models (comfyui-liveportrait)
+    quickRegister('liveportrait', 'DownloadAndLoadLivePortraitModels', '')
+
+    // MimicMotion video generation models (ComfyUI-MimicMotionWrapper)
+    quickRegister('mimicmotion', 'DownloadAndLoadMimicMotionModel', 'model')
+    quickRegister('dwpose', 'MimicMotionGetPoses', '')
+
+    // Face parsing segmentation models (comfyui_face_parsing)
+    quickRegister('face_parsing', 'FaceParsingModelLoader(FaceParsing)', '')
+
+    // Kolors image generation models (ComfyUI-KolorsWrapper)
+    // Top-level 'diffusers' catches diffusers/Kolors/* subdirs
+    quickRegister('diffusers', 'DownloadAndLoadKolorsModel', 'model')
+
+    // CLIP models for HunyuanVideo (clip/clip-vit-large-patch14 subdir)
+    quickRegister('clip', 'CLIPVisionLoader', 'clip_name')
+
+    // RIFE video frame interpolation (ComfyUI-RIFE)
+    quickRegister('rife', 'RIFE VFI', 'ckpt_name')
+
+    // SAM3 3D segmentation models (comfyui-sam3)
+    quickRegister('sam3', 'LoadSAM3Model', 'model_path')
+
+    // UltraShape 3D model generation
+    quickRegister('UltraShape', 'UltraShapeLoadModel', 'checkpoint')
+
+    // SHaRP depth estimation
+    quickRegister('sharp', 'LoadSharpModel', 'checkpoint_path')
+
+    // ONNX upscale models (used by OnnxDetectionModelLoader and upscale nodes)
+    quickRegister('onnx', 'UpscaleModelLoader', 'model_name')
+
+    // Detection models (vitpose, yolo)
+    quickRegister('detection', 'OnnxDetectionModelLoader', 'yolo_model')
+
+    // HunyuanVideo text encoders (ComfyUI-HunyuanVideoWrapper)
+    quickRegister(
+      'LLM/llava-llama-3-8b-text-encoder-tokenizer',
+      'DownloadAndLoadHyVideoTextEncoder',
+      'llm_model'
+    )
+    quickRegister(
+      'LLM/llava-llama-3-8b-v1_1-transformers',
+      'DownloadAndLoadHyVideoTextEncoder',
+      'llm_model'
+    )
+
+    // CogVideoX models (comfyui-cogvideoxwrapper)
+    quickRegister('CogVideo/GGUF', 'DownloadAndLoadCogVideoGGUFModel', 'model')
+    quickRegister(
+      'CogVideo/ControlNet',
+      'DownloadAndLoadCogVideoControlNet',
+      'model'
+    )
+
+    // DynamiCrafter models (ComfyUI-DynamiCrafterWrapper)
+    quickRegister(
+      'checkpoints/dynamicrafter',
+      'DownloadAndLoadDynamiCrafterModel',
+      'model'
+    )
+    quickRegister(
+      'checkpoints/dynamicrafter/controlnet',
+      'DownloadAndLoadDynamiCrafterCNModel',
+      'model'
+    )
+
+    // LayerStyle models (ComfyUI_LayerStyle_Advance)
+    quickRegister('BEN', 'LS_LoadBenModel', 'model')
+    quickRegister('BiRefNet/pth', 'LS_LoadBiRefNetModel', 'model')
+    quickRegister('onnx/human-parts', 'LS_HumanPartsUltra', '')
+    quickRegister('lama', 'LaMa', 'lama_model')
   }
 
   return {
diff --git a/src/stores/nodeBookmarkStore.ts b/src/stores/nodeBookmarkStore.ts
index 7ddabdd777..75ba717ed4 100644
--- a/src/stores/nodeBookmarkStore.ts
+++ b/src/stores/nodeBookmarkStore.ts
@@ -53,7 +53,7 @@ export const useNodeBookmarkStore = defineStore('nodeBookmark', () => {
         const parts = bookmark.split('/')
         const name = parts.pop() ?? ''
         const category = parts.join('/')
-        const srcNodeDef = nodeDefStore.nodeDefsByName[name]
+        const srcNodeDef = nodeDefStore.allNodeDefsByName[name]
         if (!srcNodeDef) {
           return null
         }
diff --git a/tests-ui/tests/store/nodeDefStore.test.ts b/src/stores/nodeDefStore.test.ts
similarity index 80%
rename from tests-ui/tests/store/nodeDefStore.test.ts
rename to src/stores/nodeDefStore.test.ts
index 071565a6c5..666c8bdb01 100644
--- a/tests-ui/tests/store/nodeDefStore.test.ts
+++ b/src/stores/nodeDefStore.test.ts
@@ -1,14 +1,16 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it } from 'vitest'
 
 import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'
-import { type NodeDefFilter, useNodeDefStore } from '@/stores/nodeDefStore'
+import { useNodeDefStore } from '@/stores/nodeDefStore'
+import type { NodeDefFilter } from '@/stores/nodeDefStore'
 
 describe('useNodeDefStore', () => {
   let store: ReturnType<typeof useNodeDefStore>
 
   beforeEach(() => {
-    setActivePinia(createPinia())
+    setActivePinia(createTestingPinia({ stubActions: false }))
     store = useNodeDefStore()
   })
 
@@ -277,6 +279,58 @@ describe('useNodeDefStore', () => {
     })
   })
 
+  describe('allNodeDefsByName', () => {
+    it('should include all node defs by name', () => {
+      const node1 = createMockNodeDef({ name: 'Node1' })
+      const node2 = createMockNodeDef({ name: 'Node2' })
+
+      store.updateNodeDefs([node1, node2])
+
+      expect(store.allNodeDefsByName).toHaveProperty('Node1')
+      expect(store.allNodeDefsByName).toHaveProperty('Node2')
+      expect(store.allNodeDefsByName['Node1'].name).toBe('Node1')
+      expect(store.allNodeDefsByName['Node2'].name).toBe('Node2')
+    })
+
+    it('should include deprecated and experimental nodes', () => {
+      const normal = createMockNodeDef({ name: 'Normal' })
+      const deprecated = createMockNodeDef({
+        name: 'Deprecated',
+        deprecated: true
+      })
+      const experimental = createMockNodeDef({
+        name: 'Experimental',
+        experimental: true
+      })
+
+      store.updateNodeDefs([normal, deprecated, experimental])
+
+      expect(store.allNodeDefsByName).toHaveProperty('Normal')
+      expect(store.allNodeDefsByName).toHaveProperty('Deprecated')
+      expect(store.allNodeDefsByName).toHaveProperty('Experimental')
+    })
+
+    it('should include nodes filtered out of visibleNodeDefs', () => {
+      const normal = createMockNodeDef({
+        name: 'Normal',
+        deprecated: false
+      })
+      const deprecated = createMockNodeDef({
+        name: 'Deprecated',
+        deprecated: true
+      })
+
+      store.updateNodeDefs([normal, deprecated])
+
+      // visibleNodeDefs filters out deprecated by default
+      expect(store.visibleNodeDefs).toHaveLength(1)
+
+      // allNodeDefsByName includes all
+      expect(store.allNodeDefsByName).toHaveProperty('Normal')
+      expect(store.allNodeDefsByName).toHaveProperty('Deprecated')
+    })
+  })
+
   describe('performance', () => {
     it('should perform single traversal for multiple filters', () => {
       let filterCallCount = 0
diff --git a/src/stores/nodeDefStore.ts b/src/stores/nodeDefStore.ts
index 8498659419..e43267f50c 100644
--- a/src/stores/nodeDefStore.ts
+++ b/src/stores/nodeDefStore.ts
@@ -1,9 +1,12 @@
 import axios from 'axios'
 import _ from 'es-toolkit/compat'
 import { defineStore } from 'pinia'
-import { computed, ref } from 'vue'
+import { computed, ref, watchEffect } from 'vue'
 
-import { isProxyWidget } from '@/core/graph/subgraph/proxyWidget'
+import { t } from '@/i18n'
+import { isPromotedWidgetView } from '@/core/graph/subgraph/promotedWidgetTypes'
+import { resolvePromotedWidgetSource } from '@/core/graph/subgraph/resolvePromotedWidgetSource'
+import { LiteGraph } from '@/lib/litegraph/src/litegraph'
 import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
 import { transformNodeDefV1ToV2 } from '@/schemas/nodeDef/migration'
 import type {
@@ -14,11 +17,14 @@ import type {
 import type {
   ComfyInputsSpec as ComfyInputSpecV1,
   ComfyNodeDef as ComfyNodeDefV1,
-  ComfyOutputTypesSpec as ComfyOutputSpecV1
+  ComfyOutputTypesSpec as ComfyOutputSpecV1,
+  PriceBadge
 } from '@/schemas/nodeDefSchema'
+import { useSettingStore } from '@/platform/settings/settingStore'
 import { NodeSearchService } from '@/services/nodeSearchService'
 import { useSubgraphStore } from '@/stores/subgraphStore'
-import { NodeSourceType, getNodeSource } from '@/types/nodeSource'
+import { ESSENTIALS_CATEGORY_CANONICAL } from '@/constants/essentialsNodes'
+import { CORE_NODE_MODULES, getNodeSource } from '@/types/nodeSource'
 import type { NodeSource } from '@/types/nodeSource'
 import type { TreeNode } from '@/types/treeExplorerTypes'
 import type { FuseSearchable, SearchAuxScore } from '@/utils/fuseUtil'
@@ -35,11 +41,13 @@ export class ComfyNodeDefImpl
    * needs to write to it to assign a node to a custom folder.
    */
   category: string
+  readonly main_category?: string
   readonly python_module: string
   readonly description: string
   readonly help: string
   readonly deprecated: boolean
   readonly experimental: boolean
+  readonly dev_only: boolean
   readonly output_node: boolean
   readonly api_node: boolean
   /**
@@ -66,11 +74,27 @@ export class ComfyNodeDefImpl
    * Order of inputs for each category (required, optional, hidden)
    */
   readonly input_order?: Record<string, string[]>
+  /**
+   * Price badge definition for API nodes.
+   * Contains a JSONata expression to calculate pricing based on widget values
+   * and input connectivity.
+   */
+  readonly price_badge?: PriceBadge
+  /**
+   * Alternative names for search. Useful for synonyms, abbreviations,
+   * or old names after renaming a node.
+   */
+  readonly search_aliases?: string[]
+  /** Category for the Essentials tab. If set, the node appears in Essentials. */
+  readonly essentials_category?: string
+  /** Whether the blueprint is a global/installed blueprint (not user-created). */
+  readonly isGlobal?: boolean
+  readonly isCoreNode: boolean
 
   // V2 fields
   readonly inputs: Record<string, InputSpecV2>
   readonly outputs: OutputSpecV2[]
-  readonly hidden?: Record<string, any>
+  readonly hidden?: Record<string, boolean>
 
   // ComfyNodeDefImpl fields
   readonly nodeSource: NodeSource
@@ -79,7 +103,7 @@ export class ComfyNodeDefImpl
    * @internal
    * Migrate default input options to forceInput.
    */
-  static #migrateDefaultInput(nodeDef: ComfyNodeDefV1): ComfyNodeDefV1 {
+  private static _migrateDefaultInput(nodeDef: ComfyNodeDefV1): ComfyNodeDefV1 {
     const def = _.cloneDeep(nodeDef)
     def.input ??= {}
     // For required inputs, now we have the input socket always present. Specifying
@@ -108,7 +132,7 @@ export class ComfyNodeDefImpl
   }
 
   constructor(def: ComfyNodeDefV1) {
-    const obj = ComfyNodeDefImpl.#migrateDefaultInput(def)
+    const obj = ComfyNodeDefImpl._migrateDefaultInput(def)
 
     /**
      * Assign extra fields to `this` for compatibility with group node feature.
@@ -120,12 +144,14 @@ export class ComfyNodeDefImpl
     this.name = obj.name
     this.display_name = obj.display_name
     this.category = obj.category
+    this.main_category = obj.main_category
     this.python_module = obj.python_module
     this.description = obj.description
     this.help = obj.help ?? ''
     this.deprecated = obj.deprecated ?? obj.category === ''
     this.experimental =
       obj.experimental ?? obj.category.startsWith('_for_testing')
+    this.dev_only = obj.dev_only ?? false
     this.output_node = obj.output_node
     this.api_node = !!obj.api_node
     this.input = obj.input ?? {}
@@ -134,6 +160,16 @@ export class ComfyNodeDefImpl
     this.output_name = obj.output_name
     this.output_tooltips = obj.output_tooltips
     this.input_order = obj.input_order
+    this.price_badge = obj.price_badge
+    this.essentials_category = obj.essentials_category
+      ? (ESSENTIALS_CATEGORY_CANONICAL.get(
+          obj.essentials_category.toLowerCase()
+        ) ?? obj.essentials_category)
+      : undefined
+    this.isGlobal = obj.isGlobal
+    this.isCoreNode = CORE_NODE_MODULES.includes(
+      this.python_module.split('.')[0]
+    )
 
     // Initialize V2 fields
     const defV2 = transformNodeDefV1ToV2(obj)
@@ -142,7 +178,7 @@ export class ComfyNodeDefImpl
     this.hidden = defV2.hidden
 
     // Initialize node source
-    this.nodeSource = getNodeSource(obj.python_module)
+    this.nodeSource = getNodeSource(obj.python_module, this.essentials_category)
   }
 
   get nodePath(): string {
@@ -159,13 +195,10 @@ export class ComfyNodeDefImpl
     return [scores[0], -nodeFrequency, ...scores.slice(1)]
   }
 
-  get isCoreNode(): boolean {
-    return this.nodeSource.type === NodeSourceType.Core
-  }
-
   get nodeLifeCycleBadgeText(): string {
     if (this.deprecated) return '[DEPR]'
     if (this.experimental) return '[BETA]'
+    if (this.dev_only) return '[DEV]'
     return ''
   }
 }
@@ -291,17 +324,33 @@ export interface NodeDefFilter {
 }
 
 export const useNodeDefStore = defineStore('nodeDef', () => {
+  const settingStore = useSettingStore()
+
   const nodeDefsByName = ref<Record<string, ComfyNodeDefImpl>>({})
   const nodeDefsByDisplayName = ref<Record<string, ComfyNodeDefImpl>>({})
   const showDeprecated = ref(false)
   const showExperimental = ref(false)
+  const showDevOnly = computed(() => settingStore.get('Comfy.DevMode'))
   const nodeDefFilters = ref<NodeDefFilter[]>([])
 
+  // Update skip_list on all registered node types when dev mode changes
+  // This ensures LiteGraph's getNodeTypesCategories/getNodeTypesInCategory
+  // correctly filter dev-only nodes from the right-click context menu
+  watchEffect(() => {
+    const devModeEnabled = showDevOnly.value
+    for (const nodeType of Object.values(LiteGraph.registered_node_types)) {
+      if (nodeType.nodeData?.dev_only) {
+        nodeType.skip_list = !devModeEnabled
+      }
+    }
+  })
+
   const nodeDefs = computed(() => {
     const subgraphStore = useSubgraphStore()
+    // Blueprints first for discoverability in the node library sidebar
     return [
-      ...Object.values(nodeDefsByName.value),
-      ...subgraphStore.subgraphBlueprints
+      ...subgraphStore.subgraphBlueprints,
+      ...Object.values(nodeDefsByName.value)
     ]
   })
   const nodeDataTypes = computed(() => {
@@ -316,6 +365,14 @@ export const useNodeDefStore = defineStore('nodeDef', () => {
     }
     return types
   })
+  const allNodeDefsByName = computed(() => {
+    const map: Record<string, ComfyNodeDefImpl> = {}
+    for (const nodeDef of nodeDefs.value) {
+      map[nodeDef.name] = nodeDef
+    }
+    return map
+  })
+
   const visibleNodeDefs = computed(() => {
     return nodeDefs.value.filter((nodeDef) =>
       nodeDefFilters.value.every((filter) => filter.predicate(nodeDef))
@@ -366,14 +423,12 @@ export const useNodeDefStore = defineStore('nodeDef', () => {
       return nodeDef.inputs[widgetName]
     }
     const widget = node.widgets?.find((w) => w.name === widgetName)
-    //TODO: resolve spec for linked
-    if (!widget || !isProxyWidget(widget)) return undefined
+    if (!widget || !isPromotedWidgetView(widget)) return undefined
 
-    const { nodeId, widgetName: subWidgetName } = widget._overlay
-    const subNode = node.subgraph.getNodeById(nodeId)
-    if (!subNode) return undefined
+    const sourceWidget = resolvePromotedWidgetSource(node, widget)
+    if (!sourceWidget) return undefined
 
-    return getInputSpecForWidget(subNode, subWidgetName)
+    return getInputSpecForWidget(sourceWidget.node, sourceWidget.widget.name)
   }
 
   /**
@@ -399,27 +454,33 @@ export const useNodeDefStore = defineStore('nodeDef', () => {
     // Deprecated nodes filter
     registerNodeDefFilter({
       id: 'core.deprecated',
-      name: 'Hide Deprecated Nodes',
-      description: 'Hides nodes marked as deprecated unless explicitly enabled',
+      name: t('nodeFilters.hideDeprecated'),
+      description: t('nodeFilters.hideDeprecatedDescription'),
       predicate: (nodeDef) => showDeprecated.value || !nodeDef.deprecated
     })
 
     // Experimental nodes filter
     registerNodeDefFilter({
       id: 'core.experimental',
-      name: 'Hide Experimental Nodes',
-      description:
-        'Hides nodes marked as experimental unless explicitly enabled',
+      name: t('nodeFilters.hideExperimental'),
+      description: t('nodeFilters.hideExperimentalDescription'),
       predicate: (nodeDef) => showExperimental.value || !nodeDef.experimental
     })
 
+    // Dev-only nodes filter
+    registerNodeDefFilter({
+      id: 'core.dev_only',
+      name: t('nodeFilters.hideDevOnly'),
+      description: t('nodeFilters.hideDevOnlyDescription'),
+      predicate: (nodeDef) => showDevOnly.value || !nodeDef.dev_only
+    })
+
     // Subgraph nodes filter
     // Filter out litegraph typed subgraphs, saved blueprints are added in separately
     registerNodeDefFilter({
       id: 'core.subgraph',
-      name: 'Hide Subgraph Nodes',
-      description:
-        'Temporarily hides subgraph nodes from node library and search',
+      name: t('nodeFilters.hideSubgraph'),
+      description: t('nodeFilters.hideSubgraphDescription'),
       predicate: (nodeDef) => {
         // Hide subgraph nodes (identified by category='subgraph' and python_module='nodes')
         return !(
@@ -435,8 +496,10 @@ export const useNodeDefStore = defineStore('nodeDef', () => {
   return {
     nodeDefsByName,
     nodeDefsByDisplayName,
+    allNodeDefsByName,
     showDeprecated,
     showExperimental,
+    showDevOnly,
     nodeDefFilters,
 
     nodeDefs,
diff --git a/src/stores/nodeOutputStore.test.ts b/src/stores/nodeOutputStore.test.ts
new file mode 100644
index 0000000000..a8d1785480
--- /dev/null
+++ b/src/stores/nodeOutputStore.test.ts
@@ -0,0 +1,308 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+import { LiteGraph } from '@/lib/litegraph/src/litegraph'
+import type { ExecutedWsMessage } from '@/schemas/apiSchema'
+import { app } from '@/scripts/app'
+import { useNodeOutputStore } from '@/stores/nodeOutputStore'
+import * as litegraphUtil from '@/utils/litegraphUtil'
+
+vi.mock('@/utils/litegraphUtil', () => ({
+  isAnimatedOutput: vi.fn(),
+  isVideoNode: vi.fn()
+}))
+
+const mockGetNodeById = vi.fn()
+
+vi.mock('@/scripts/app', () => ({
+  app: {
+    getPreviewFormatParam: vi.fn(() => '&format=test_webp'),
+    rootGraph: {
+      getNodeById: (...args: unknown[]) => mockGetNodeById(...args)
+    },
+    nodeOutputs: {} as Record<string, unknown>,
+    nodePreviewImages: {} as Record<string, string[]>
+  }
+}))
+
+const createMockNode = (overrides: Record<string, unknown> = {}): LGraphNode =>
+  ({
+    id: 1,
+    type: 'TestNode',
+    ...overrides
+  }) as Partial<LGraphNode> as LGraphNode
+
+const createMockOutputs = (
+  images?: ExecutedWsMessage['output']['images']
+): ExecutedWsMessage['output'] => ({ images })
+
+vi.mock('@/utils/graphTraversalUtil', () => ({
+  executionIdToNodeLocatorId: vi.fn((_rootGraph: unknown, id: string) => id)
+}))
+
+vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
+  useWorkflowStore: vi.fn(() => ({
+    nodeIdToNodeLocatorId: vi.fn((id: string | number) => String(id)),
+    nodeToNodeLocatorId: vi.fn((node: { id: number }) => String(node.id))
+  }))
+}))
+
+describe('nodeOutputStore setNodeOutputsByExecutionId with merge', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    vi.clearAllMocks()
+    app.nodeOutputs = {}
+    app.nodePreviewImages = {}
+  })
+
+  it('should update reactive nodeOutputs.value when merging outputs', () => {
+    const store = useNodeOutputStore()
+    const executionId = '1'
+
+    const initialOutput = createMockOutputs([{ filename: 'a.png' }])
+    store.setNodeOutputsByExecutionId(executionId, initialOutput)
+
+    expect(app.nodeOutputs[executionId]?.images).toHaveLength(1)
+    expect(store.nodeOutputs[executionId]?.images).toHaveLength(1)
+
+    const newOutput = createMockOutputs([{ filename: 'b.png' }])
+    store.setNodeOutputsByExecutionId(executionId, newOutput, { merge: true })
+
+    expect(app.nodeOutputs[executionId]?.images).toHaveLength(2)
+    expect(store.nodeOutputs[executionId]?.images).toHaveLength(2)
+  })
+
+  it('should assign to reactive ref after merge for Vue reactivity', () => {
+    const store = useNodeOutputStore()
+    const executionId = '1'
+
+    const initialOutput = createMockOutputs([{ filename: 'a.png' }])
+    store.setNodeOutputsByExecutionId(executionId, initialOutput)
+
+    const newOutput = createMockOutputs([{ filename: 'b.png' }])
+
+    store.setNodeOutputsByExecutionId(executionId, newOutput, { merge: true })
+
+    expect(store.nodeOutputs[executionId]).toStrictEqual(
+      app.nodeOutputs[executionId]
+    )
+    expect(store.nodeOutputs[executionId]?.images).toHaveLength(2)
+  })
+
+  it('should create a new object reference on merge so Vue detects the change', () => {
+    const store = useNodeOutputStore()
+    const executionId = '1'
+
+    const initialOutput = createMockOutputs([{ filename: 'a.png' }])
+    store.setNodeOutputsByExecutionId(executionId, initialOutput)
+
+    const refBefore = store.nodeOutputs[executionId]
+
+    const newOutput = createMockOutputs([{ filename: 'b.png' }])
+    store.setNodeOutputsByExecutionId(executionId, newOutput, { merge: true })
+
+    const refAfter = store.nodeOutputs[executionId]
+
+    expect(refAfter).not.toBe(refBefore)
+    expect(refAfter?.images).toHaveLength(2)
+  })
+})
+
+describe('nodeOutputStore restoreOutputs', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    vi.clearAllMocks()
+    app.nodeOutputs = {}
+    app.nodePreviewImages = {}
+  })
+
+  it('should keep reactivity after restoreOutputs followed by setNodeOutputsByExecutionId', () => {
+    const store = useNodeOutputStore()
+
+    // Simulate execution: set outputs for node "4" (e.g., PreviewImage)
+    const executionOutput = createMockOutputs([
+      { filename: 'ComfyUI_00001.png', subfolder: '', type: 'temp' }
+    ])
+    const savedOutputs: Record<string, ExecutedWsMessage['output']> = {
+      '4': executionOutput
+    }
+
+    // Simulate undo: restoreOutputs makes app.nodeOutputs and the ref
+    // share the same underlying object if not handled correctly.
+    store.restoreOutputs(savedOutputs)
+
+    expect(store.nodeOutputs['4']).toStrictEqual(executionOutput)
+    expect(store.nodeOutputs['3']).toBeUndefined()
+
+    // Simulate widget callback setting outputs for node "3" (e.g., LoadImage)
+    const widgetOutput = createMockOutputs([
+      { filename: 'example.png', subfolder: '', type: 'input' }
+    ])
+    store.setNodeOutputsByExecutionId('3', widgetOutput)
+
+    // The reactive store must reflect the new output.
+    // Before the fix, the raw write to app.nodeOutputs would mutate the
+    // proxy's target before the proxy write, causing Vue to skip the
+    // reactivity update.
+    expect(store.nodeOutputs['3']).toStrictEqual(widgetOutput)
+    expect(app.nodeOutputs['3']).toStrictEqual(widgetOutput)
+  })
+})
+
+describe('nodeOutputStore getPreviewParam', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    vi.clearAllMocks()
+    vi.mocked(litegraphUtil.isAnimatedOutput).mockReturnValue(false)
+    vi.mocked(litegraphUtil.isVideoNode).mockReturnValue(false)
+  })
+
+  it('should return empty string if output is animated', () => {
+    const store = useNodeOutputStore()
+    vi.mocked(litegraphUtil.isAnimatedOutput).mockReturnValue(true)
+    const node = createMockNode()
+    const outputs = createMockOutputs([{ filename: 'img.png' }])
+    expect(store.getPreviewParam(node, outputs)).toBe('')
+    expect(vi.mocked(app).getPreviewFormatParam).not.toHaveBeenCalled()
+  })
+
+  it('should return empty string if isVideoNode returns true', () => {
+    const store = useNodeOutputStore()
+    vi.mocked(litegraphUtil.isVideoNode).mockReturnValue(true)
+    const node = createMockNode()
+    const outputs = createMockOutputs([{ filename: 'img.png' }])
+    expect(store.getPreviewParam(node, outputs)).toBe('')
+    expect(vi.mocked(app).getPreviewFormatParam).not.toHaveBeenCalled()
+  })
+
+  it('should return empty string if outputs.images is undefined', () => {
+    const store = useNodeOutputStore()
+    const node = createMockNode()
+    const outputs: ExecutedWsMessage['output'] = {}
+    expect(store.getPreviewParam(node, outputs)).toBe('')
+    expect(vi.mocked(app).getPreviewFormatParam).not.toHaveBeenCalled()
+  })
+
+  it('should return empty string if outputs.images is empty', () => {
+    const store = useNodeOutputStore()
+    const node = createMockNode()
+    const outputs = createMockOutputs([])
+    expect(store.getPreviewParam(node, outputs)).toBe('')
+    expect(vi.mocked(app).getPreviewFormatParam).not.toHaveBeenCalled()
+  })
+
+  it('should return empty string if outputs.images contains SVG images', () => {
+    const store = useNodeOutputStore()
+    const node = createMockNode()
+    const outputs = createMockOutputs([{ filename: 'img.svg' }])
+    expect(store.getPreviewParam(node, outputs)).toBe('')
+    expect(vi.mocked(app).getPreviewFormatParam).not.toHaveBeenCalled()
+  })
+
+  it('should return format param for standard image outputs', () => {
+    const store = useNodeOutputStore()
+    const node = createMockNode()
+    const outputs = createMockOutputs([{ filename: 'img.png' }])
+    expect(store.getPreviewParam(node, outputs)).toBe('&format=test_webp')
+    expect(vi.mocked(app).getPreviewFormatParam).toHaveBeenCalledTimes(1)
+  })
+
+  it('should return format param for multiple standard images', () => {
+    const store = useNodeOutputStore()
+    const node = createMockNode()
+    const outputs = createMockOutputs([
+      { filename: 'img1.png' },
+      { filename: 'img2.jpg' }
+    ])
+    expect(store.getPreviewParam(node, outputs)).toBe('&format=test_webp')
+    expect(vi.mocked(app).getPreviewFormatParam).toHaveBeenCalledTimes(1)
+  })
+})
+
+describe('nodeOutputStore syncLegacyNodeImgs', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    vi.clearAllMocks()
+    LiteGraph.vueNodesMode = false
+  })
+
+  it('should not sync when vueNodesMode is disabled', () => {
+    const store = useNodeOutputStore()
+    const mockNode = createMockNode({ id: 1 })
+    const mockImg = document.createElement('img')
+
+    mockGetNodeById.mockReturnValue(mockNode)
+
+    store.syncLegacyNodeImgs(1, mockImg, 0)
+
+    expect(mockNode.imgs).toBeUndefined()
+    expect(mockNode.imageIndex).toBeUndefined()
+  })
+
+  it('should sync node.imgs when vueNodesMode is enabled', () => {
+    LiteGraph.vueNodesMode = true
+    const store = useNodeOutputStore()
+    const mockNode = createMockNode({ id: 1 })
+    const mockImg = document.createElement('img')
+
+    mockGetNodeById.mockReturnValue(mockNode)
+
+    store.syncLegacyNodeImgs(1, mockImg, 0)
+
+    expect(mockNode.imgs).toEqual([mockImg])
+    expect(mockNode.imageIndex).toBe(0)
+  })
+
+  it('should sync with correct activeIndex', () => {
+    LiteGraph.vueNodesMode = true
+    const store = useNodeOutputStore()
+    const mockNode = createMockNode({ id: 42 })
+    const mockImg = document.createElement('img')
+
+    mockGetNodeById.mockReturnValue(mockNode)
+
+    store.syncLegacyNodeImgs(42, mockImg, 3)
+
+    expect(mockNode.imgs).toEqual([mockImg])
+    expect(mockNode.imageIndex).toBe(3)
+  })
+
+  it('should handle string nodeId', () => {
+    LiteGraph.vueNodesMode = true
+    const store = useNodeOutputStore()
+    const mockNode = createMockNode({ id: 123 })
+    const mockImg = document.createElement('img')
+
+    mockGetNodeById.mockReturnValue(mockNode)
+
+    store.syncLegacyNodeImgs('123', mockImg, 0)
+
+    expect(mockGetNodeById).toHaveBeenCalledWith(123)
+    expect(mockNode.imgs).toEqual([mockImg])
+  })
+
+  it('should not throw when node is not found', () => {
+    LiteGraph.vueNodesMode = true
+    const store = useNodeOutputStore()
+    const mockImg = document.createElement('img')
+
+    mockGetNodeById.mockReturnValue(undefined)
+
+    expect(() => store.syncLegacyNodeImgs(999, mockImg, 0)).not.toThrow()
+  })
+
+  it('should default activeIndex to 0', () => {
+    LiteGraph.vueNodesMode = true
+    const store = useNodeOutputStore()
+    const mockNode = createMockNode({ id: 1 })
+    const mockImg = document.createElement('img')
+
+    mockGetNodeById.mockReturnValue(mockNode)
+
+    store.syncLegacyNodeImgs(1, mockImg)
+
+    expect(mockNode.imageIndex).toBe(0)
+  })
+})
diff --git a/src/stores/imagePreviewStore.ts b/src/stores/nodeOutputStore.ts
similarity index 74%
rename from src/stores/imagePreviewStore.ts
rename to src/stores/nodeOutputStore.ts
index ee8ae759bd..aa576717e2 100644
--- a/src/stores/imagePreviewStore.ts
+++ b/src/stores/nodeOutputStore.ts
@@ -3,18 +3,25 @@ import { defineStore } from 'pinia'
 import { ref } from 'vue'
 
 import type { LGraphNode, SubgraphNode } from '@/lib/litegraph/src/litegraph'
+import { LiteGraph } from '@/lib/litegraph/src/litegraph'
 import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
 import type {
   ExecutedWsMessage,
   ResultItem,
   ResultItemType
 } from '@/schemas/apiSchema'
+import { appendCloudResParam } from '@/platform/distribution/cloudPreviewUtil'
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
-import { useExecutionStore } from '@/stores/executionStore'
+import { clone } from '@/scripts/utils'
 import type { NodeLocatorId } from '@/types/nodeIdentification'
 import { parseFilePath } from '@/utils/formatUtil'
-import { isVideoNode } from '@/utils/litegraphUtil'
+import { isAnimatedOutput, isVideoNode } from '@/utils/litegraphUtil'
+import {
+  releaseSharedObjectUrl,
+  retainSharedObjectUrl
+} from '@/utils/objectUrlUtil'
+import { executionIdToNodeLocatorId } from '@/utils/graphTraversalUtil'
 
 const PREVIEW_REVOKE_DELAY_MS = 400
 
@@ -38,9 +45,8 @@ interface SetOutputOptions {
 
 export const useNodeOutputStore = defineStore('nodeOutput', () => {
   const { nodeIdToNodeLocatorId, nodeToNodeLocatorId } = useWorkflowStore()
-  const { executionIdToNodeLocatorId } = useExecutionStore()
   const scheduledRevoke: Record<NodeLocatorId, { stop: () => void }> = {}
-  const latestOutput = ref<string[]>([])
+  const latestPreview = ref<string[]>([])
 
   function scheduleRevoke(locator: NodeLocatorId, cb: () => void) {
     scheduledRevoke[locator]?.stop()
@@ -79,7 +85,7 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => {
     outputs: ExecutedWsMessage['output']
   ): boolean => {
     // If animated webp/png or video outputs, return false
-    if (node.animatedImages || isVideoNode(node)) return false
+    if (isAnimatedOutput(outputs) || isVideoNode(node)) return false
 
     // If no images, return false
     if (!outputs?.images?.length) return false
@@ -114,10 +120,12 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => {
 
     const rand = app.getRandParam()
     const previewParam = getPreviewParam(node, outputs)
+    const isImage = isImageOutputs(node, outputs)
 
     return outputs.images.map((image) => {
-      const imgUrlPart = new URLSearchParams(image)
-      return api.apiURL(`/view?${imgUrlPart}${previewParam}${rand}`)
+      const params = new URLSearchParams(image)
+      if (isImage) appendCloudResParam(params, image.filename)
+      return api.apiURL(`/view?${params}${previewParam}${rand}`)
     })
   }
 
@@ -130,12 +138,17 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => {
     outputs: ExecutedWsMessage['output'] | ResultItem,
     options: SetOutputOptions = {}
   ) {
+    // Skip if outputs is null/undefined - preserve existing output
+    // This can happen when backend returns null for cached/deduplicated nodes
+    // (e.g., two LoadImage nodes selecting the same image)
+    if (outputs == null) return
+
     if (options.merge) {
       const existingOutput = app.nodeOutputs[nodeLocatorId]
       if (existingOutput && outputs) {
         for (const k in outputs) {
           const existingValue = existingOutput[k]
-          const newValue = (outputs as Record<NodeLocatorId, any>)[k]
+          const newValue = (outputs as Record<NodeLocatorId, unknown>)[k]
 
           if (Array.isArray(existingValue) && Array.isArray(newValue)) {
             existingOutput[k] = existingValue.concat(newValue)
@@ -143,17 +156,11 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => {
             existingOutput[k] = newValue
           }
         }
+        nodeOutputs.value[nodeLocatorId] = { ...existingOutput }
         return
       }
     }
 
-    //TODO:Preview params and deduplication
-    latestOutput.value =
-      (outputs as ExecutedWsMessage['output'])?.images?.map((image) => {
-        const imgUrlPart = new URLSearchParams(image)
-        const rand = app.getRandParam()
-        return api.apiURL(`/view?${imgUrlPart}${rand}`)
-      }) ?? []
     app.nodeOutputs[nodeLocatorId] = outputs
     nodeOutputs.value[nodeLocatorId] = outputs
   }
@@ -198,7 +205,7 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => {
     outputs: ExecutedWsMessage['output'] | ResultItem,
     options: SetOutputOptions = {}
   ) {
-    const nodeLocatorId = executionIdToNodeLocatorId(executionId)
+    const nodeLocatorId = executionIdToNodeLocatorId(app.rootGraph, executionId)
     if (!nodeLocatorId) return
 
     setOutputsByLocatorId(nodeLocatorId, outputs, options)
@@ -215,13 +222,22 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => {
     executionId: string,
     previewImages: string[]
   ) {
-    const nodeLocatorId = executionIdToNodeLocatorId(executionId)
+    const nodeLocatorId = executionIdToNodeLocatorId(app.rootGraph, executionId)
     if (!nodeLocatorId) return
+    const existingPreviews = app.nodePreviewImages[nodeLocatorId]
     if (scheduledRevoke[nodeLocatorId]) {
       scheduledRevoke[nodeLocatorId].stop()
       delete scheduledRevoke[nodeLocatorId]
     }
-    latestOutput.value = previewImages
+    if (existingPreviews?.[Symbol.iterator]) {
+      for (const url of existingPreviews) {
+        releaseSharedObjectUrl(url)
+      }
+    }
+    for (const url of previewImages) {
+      retainSharedObjectUrl(url)
+    }
+    latestPreview.value = previewImages
     app.nodePreviewImages[nodeLocatorId] = previewImages
     nodePreviewImages.value[nodeLocatorId] = previewImages
   }
@@ -238,10 +254,19 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => {
     previewImages: string[]
   ) {
     const nodeLocatorId = nodeIdToNodeLocatorId(nodeId)
+    const existingPreviews = app.nodePreviewImages[nodeLocatorId]
     if (scheduledRevoke[nodeLocatorId]) {
       scheduledRevoke[nodeLocatorId].stop()
       delete scheduledRevoke[nodeLocatorId]
     }
+    if (existingPreviews?.[Symbol.iterator]) {
+      for (const url of existingPreviews) {
+        releaseSharedObjectUrl(url)
+      }
+    }
+    for (const url of previewImages) {
+      retainSharedObjectUrl(url)
+    }
     app.nodePreviewImages[nodeLocatorId] = previewImages
     nodePreviewImages.value[nodeLocatorId] = previewImages
   }
@@ -253,7 +278,7 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => {
    * @param executionId - The execution ID
    */
   function revokePreviewsByExecutionId(executionId: string) {
-    const nodeLocatorId = executionIdToNodeLocatorId(executionId)
+    const nodeLocatorId = executionIdToNodeLocatorId(app.rootGraph, executionId)
     if (!nodeLocatorId) return
     scheduleRevoke(nodeLocatorId, () =>
       revokePreviewsByLocatorId(nodeLocatorId)
@@ -271,7 +296,7 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => {
     if (!previews?.[Symbol.iterator]) return
 
     for (const url of previews) {
-      URL.revokeObjectURL(url)
+      releaseSharedObjectUrl(url)
     }
 
     delete app.nodePreviewImages[nodeLocatorId]
@@ -288,7 +313,7 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => {
       if (!previews?.[Symbol.iterator]) continue
 
       for (const url of previews) {
-        URL.revokeObjectURL(url)
+        releaseSharedObjectUrl(url)
       }
     }
     app.nodePreviewImages = {}
@@ -300,9 +325,10 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => {
    * Does not recurse to contents of nested subgraphs.
    */
   function revokeSubgraphPreviews(subgraphNode: SubgraphNode) {
-    const graphId = subgraphNode.graph.isRootGraph
-      ? ''
-      : subgraphNode.graph.id + ':'
+    const { graph } = subgraphNode
+    if (!graph) return
+
+    const graphId = graph.isRootGraph ? '' : graph.id + ':'
     revokePreviewsByLocatorId(graphId + subgraphNode.id)
     for (const node of subgraphNode.subgraph.nodes) {
       revokePreviewsByLocatorId(subgraphNode.subgraph.id + node.id)
@@ -326,6 +352,12 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => {
 
     // Clear preview images
     if (app.nodePreviewImages[nodeLocatorId]) {
+      const previews = app.nodePreviewImages[nodeLocatorId]
+      if (previews?.[Symbol.iterator]) {
+        for (const url of previews) {
+          releaseSharedObjectUrl(url)
+        }
+      }
       delete app.nodePreviewImages[nodeLocatorId]
       delete nodePreviewImages.value[nodeLocatorId]
     }
@@ -333,11 +365,15 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => {
     return hadOutputs
   }
 
+  function snapshotOutputs(): Record<string, ExecutedWsMessage['output']> {
+    return clone(app.nodeOutputs)
+  }
+
   function restoreOutputs(
     outputs: Record<string, ExecutedWsMessage['output']>
   ) {
     app.nodeOutputs = outputs
-    nodeOutputs.value = outputs
+    nodeOutputs.value = { ...outputs }
   }
 
   function updateNodeImages(node: LGraphNode) {
@@ -360,12 +396,48 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => {
     }
   }
 
+  function refreshNodeOutputs(node: LGraphNode) {
+    const locatorId = nodeToNodeLocatorId(node)
+    if (!locatorId) return
+
+    const outputs = app.nodeOutputs[locatorId]
+    if (!outputs) return
+
+    nodeOutputs.value[locatorId] = { ...outputs }
+  }
+
   function resetAllOutputsAndPreviews() {
     app.nodeOutputs = {}
     nodeOutputs.value = {}
     revokeAllPreviews()
   }
 
+  /**
+   * Sync legacy node.imgs property for backwards compatibility.
+   *
+   * In Vue Nodes mode, legacy systems (Copy Image, Open Image, Save Image,
+   * Open in Mask Editor) rely on `node.imgs` containing HTMLImageElement
+   * references. Since Vue handles image rendering, we need to sync the
+   * already-loaded element from the Vue component to the node.
+   *
+   * @param nodeId - The node ID
+   * @param element - The loaded HTMLImageElement from the Vue component
+   * @param activeIndex - The current image index (for multi-image outputs)
+   */
+  function syncLegacyNodeImgs(
+    nodeId: string | number,
+    element: HTMLImageElement,
+    activeIndex: number = 0
+  ) {
+    if (!LiteGraph.vueNodesMode) return
+
+    const node = app.rootGraph?.getNodeById(Number(nodeId))
+    if (!node) return
+
+    node.imgs = [element]
+    node.imageIndex = activeIndex
+  }
+
   return {
     // Getters
     getNodeOutputs,
@@ -379,18 +451,21 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => {
     setNodePreviewsByExecutionId,
     setNodePreviewsByNodeId,
     updateNodeImages,
+    refreshNodeOutputs,
+    syncLegacyNodeImgs,
 
     // Cleanup
     revokePreviewsByExecutionId,
     revokeAllPreviews,
     revokeSubgraphPreviews,
     removeNodeOutputs,
+    snapshotOutputs,
     restoreOutputs,
     resetAllOutputsAndPreviews,
 
     // State
     nodeOutputs,
     nodePreviewImages,
-    latestOutput
+    latestPreview
   }
 })
diff --git a/src/stores/promotionStore.test.ts b/src/stores/promotionStore.test.ts
new file mode 100644
index 0000000000..ab103e1ea1
--- /dev/null
+++ b/src/stores/promotionStore.test.ts
@@ -0,0 +1,310 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it } from 'vitest'
+
+import type { NodeId } from '@/lib/litegraph/src/LGraphNode'
+import type { UUID } from '@/lib/litegraph/src/utils/uuid'
+
+import { usePromotionStore } from './promotionStore'
+
+describe(usePromotionStore, () => {
+  let store: ReturnType<typeof usePromotionStore>
+  const graphA = 'graph-a' as UUID
+  const graphB = 'graph-b' as UUID
+  const nodeId = 1 as NodeId
+
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    store = usePromotionStore()
+  })
+
+  describe('getPromotions', () => {
+    it('returns empty array for unknown node', () => {
+      expect(store.getPromotions(graphA, nodeId)).toEqual([])
+    })
+
+    it('returns entries after setPromotions', () => {
+      const entries = [
+        { interiorNodeId: '10', widgetName: 'seed' },
+        { interiorNodeId: '11', widgetName: 'steps' }
+      ]
+      store.setPromotions(graphA, nodeId, entries)
+      expect(store.getPromotions(graphA, nodeId)).toEqual(entries)
+    })
+
+    it('returns a defensive copy', () => {
+      store.setPromotions(graphA, nodeId, [
+        { interiorNodeId: '10', widgetName: 'seed' }
+      ])
+
+      const result = store.getPromotions(graphA, nodeId)
+      result.push({ interiorNodeId: '11', widgetName: 'steps' })
+
+      expect(store.getPromotions(graphA, nodeId)).toEqual([
+        { interiorNodeId: '10', widgetName: 'seed' }
+      ])
+    })
+  })
+
+  describe('isPromoted', () => {
+    it('returns false when nothing is promoted', () => {
+      expect(store.isPromoted(graphA, nodeId, '10', 'seed')).toBe(false)
+    })
+
+    it('returns true for a promoted entry', () => {
+      store.promote(graphA, nodeId, '10', 'seed')
+      expect(store.isPromoted(graphA, nodeId, '10', 'seed')).toBe(true)
+    })
+
+    it('returns false for a different widget on the same node', () => {
+      store.promote(graphA, nodeId, '10', 'seed')
+      expect(store.isPromoted(graphA, nodeId, '10', 'steps')).toBe(false)
+    })
+  })
+
+  describe('isPromotedByAny', () => {
+    const nodeA = 1 as NodeId
+    const nodeB = 2 as NodeId
+
+    it('returns false when nothing is promoted', () => {
+      expect(store.isPromotedByAny(graphA, '10', 'seed')).toBe(false)
+    })
+
+    it('returns true when promoted by one parent', () => {
+      store.promote(graphA, nodeA, '10', 'seed')
+      expect(store.isPromotedByAny(graphA, '10', 'seed')).toBe(true)
+    })
+
+    it('returns true when promoted by multiple parents', () => {
+      store.promote(graphA, nodeA, '10', 'seed')
+      store.promote(graphA, nodeB, '10', 'seed')
+      expect(store.isPromotedByAny(graphA, '10', 'seed')).toBe(true)
+    })
+
+    it('returns false after demoting from all parents', () => {
+      store.promote(graphA, nodeA, '10', 'seed')
+      store.promote(graphA, nodeB, '10', 'seed')
+      store.demote(graphA, nodeA, '10', 'seed')
+      store.demote(graphA, nodeB, '10', 'seed')
+      expect(store.isPromotedByAny(graphA, '10', 'seed')).toBe(false)
+    })
+
+    it('returns true when still promoted by one parent after partial demote', () => {
+      store.promote(graphA, nodeA, '10', 'seed')
+      store.promote(graphA, nodeB, '10', 'seed')
+      store.demote(graphA, nodeA, '10', 'seed')
+      expect(store.isPromotedByAny(graphA, '10', 'seed')).toBe(true)
+    })
+
+    it('returns false for different widget on same node', () => {
+      store.promote(graphA, nodeA, '10', 'seed')
+      expect(store.isPromotedByAny(graphA, '10', 'steps')).toBe(false)
+    })
+  })
+
+  describe('setPromotions', () => {
+    it('replaces existing entries', () => {
+      store.promote(graphA, nodeId, '10', 'seed')
+      store.setPromotions(graphA, nodeId, [
+        { interiorNodeId: '11', widgetName: 'steps' }
+      ])
+      expect(store.isPromoted(graphA, nodeId, '10', 'seed')).toBe(false)
+      expect(store.isPromoted(graphA, nodeId, '11', 'steps')).toBe(true)
+    })
+
+    it('clears entries when set to empty array', () => {
+      store.promote(graphA, nodeId, '10', 'seed')
+      store.setPromotions(graphA, nodeId, [])
+      expect(store.getPromotions(graphA, nodeId)).toEqual([])
+    })
+
+    it('preserves order', () => {
+      const entries = [
+        { interiorNodeId: '10', widgetName: 'seed' },
+        { interiorNodeId: '11', widgetName: 'steps' },
+        { interiorNodeId: '12', widgetName: 'cfg' }
+      ]
+      store.setPromotions(graphA, nodeId, entries)
+      expect(store.getPromotions(graphA, nodeId)).toEqual(entries)
+    })
+  })
+
+  describe('promote', () => {
+    it('adds a new entry', () => {
+      store.promote(graphA, nodeId, '10', 'seed')
+      expect(store.getPromotions(graphA, nodeId)).toHaveLength(1)
+    })
+
+    it('does not duplicate existing entries', () => {
+      store.promote(graphA, nodeId, '10', 'seed')
+      store.promote(graphA, nodeId, '10', 'seed')
+      expect(store.getPromotions(graphA, nodeId)).toHaveLength(1)
+    })
+
+    it('appends to existing entries', () => {
+      store.promote(graphA, nodeId, '10', 'seed')
+      store.promote(graphA, nodeId, '11', 'steps')
+      expect(store.getPromotions(graphA, nodeId)).toHaveLength(2)
+    })
+  })
+
+  describe('demote', () => {
+    it('removes an existing entry', () => {
+      store.promote(graphA, nodeId, '10', 'seed')
+      store.demote(graphA, nodeId, '10', 'seed')
+      expect(store.getPromotions(graphA, nodeId)).toEqual([])
+    })
+
+    it('is a no-op for non-existent entries', () => {
+      store.promote(graphA, nodeId, '10', 'seed')
+      store.demote(graphA, nodeId, '99', 'nonexistent')
+      expect(store.getPromotions(graphA, nodeId)).toHaveLength(1)
+    })
+
+    it('preserves other entries', () => {
+      store.promote(graphA, nodeId, '10', 'seed')
+      store.promote(graphA, nodeId, '11', 'steps')
+      store.demote(graphA, nodeId, '10', 'seed')
+      expect(store.getPromotions(graphA, nodeId)).toEqual([
+        { interiorNodeId: '11', widgetName: 'steps' }
+      ])
+    })
+  })
+
+  describe('movePromotion', () => {
+    it('moves an entry from one index to another', () => {
+      store.promote(graphA, nodeId, '10', 'seed')
+      store.promote(graphA, nodeId, '11', 'steps')
+      store.promote(graphA, nodeId, '12', 'cfg')
+      store.movePromotion(graphA, nodeId, 0, 2)
+      expect(store.getPromotions(graphA, nodeId)).toEqual([
+        { interiorNodeId: '11', widgetName: 'steps' },
+        { interiorNodeId: '12', widgetName: 'cfg' },
+        { interiorNodeId: '10', widgetName: 'seed' }
+      ])
+    })
+
+    it('is a no-op for out-of-bounds indices', () => {
+      store.promote(graphA, nodeId, '10', 'seed')
+      store.movePromotion(graphA, nodeId, 0, 5)
+      expect(store.getPromotions(graphA, nodeId)).toEqual([
+        { interiorNodeId: '10', widgetName: 'seed' }
+      ])
+    })
+
+    it('is a no-op when fromIndex equals toIndex', () => {
+      store.promote(graphA, nodeId, '10', 'seed')
+      store.promote(graphA, nodeId, '11', 'steps')
+      store.movePromotion(graphA, nodeId, 1, 1)
+      expect(store.getPromotions(graphA, nodeId)).toEqual([
+        { interiorNodeId: '10', widgetName: 'seed' },
+        { interiorNodeId: '11', widgetName: 'steps' }
+      ])
+    })
+  })
+
+  describe('ref-counted isPromotedByAny', () => {
+    const nodeA = 1 as NodeId
+    const nodeB = 2 as NodeId
+
+    it('tracks across setPromotions calls', () => {
+      store.setPromotions(graphA, nodeA, [
+        { interiorNodeId: '10', widgetName: 'seed' }
+      ])
+      expect(store.isPromotedByAny(graphA, '10', 'seed')).toBe(true)
+
+      store.setPromotions(graphA, nodeB, [
+        { interiorNodeId: '10', widgetName: 'seed' }
+      ])
+      expect(store.isPromotedByAny(graphA, '10', 'seed')).toBe(true)
+
+      // Remove from A — still promoted by B
+      store.setPromotions(graphA, nodeA, [])
+      expect(store.isPromotedByAny(graphA, '10', 'seed')).toBe(true)
+
+      // Remove from B — now gone
+      store.setPromotions(graphA, nodeB, [])
+      expect(store.isPromotedByAny(graphA, '10', 'seed')).toBe(false)
+    })
+
+    it('handles replacement via setPromotions correctly', () => {
+      store.setPromotions(graphA, nodeA, [
+        { interiorNodeId: '10', widgetName: 'seed' },
+        { interiorNodeId: '11', widgetName: 'steps' }
+      ])
+      expect(store.isPromotedByAny(graphA, '10', 'seed')).toBe(true)
+      expect(store.isPromotedByAny(graphA, '11', 'steps')).toBe(true)
+
+      // Replace with different entries
+      store.setPromotions(graphA, nodeA, [
+        { interiorNodeId: '11', widgetName: 'steps' },
+        { interiorNodeId: '12', widgetName: 'cfg' }
+      ])
+      expect(store.isPromotedByAny(graphA, '10', 'seed')).toBe(false)
+      expect(store.isPromotedByAny(graphA, '11', 'steps')).toBe(true)
+      expect(store.isPromotedByAny(graphA, '12', 'cfg')).toBe(true)
+    })
+
+    it('stays consistent through movePromotion', () => {
+      store.promote(graphA, nodeA, '10', 'seed')
+      store.promote(graphA, nodeA, '11', 'steps')
+      store.movePromotion(graphA, nodeA, 0, 1)
+      expect(store.isPromotedByAny(graphA, '10', 'seed')).toBe(true)
+      expect(store.isPromotedByAny(graphA, '11', 'steps')).toBe(true)
+    })
+  })
+
+  describe('multi-node isolation', () => {
+    const nodeA = 1 as NodeId
+    const nodeB = 2 as NodeId
+
+    it('keeps promotions separate per subgraph node', () => {
+      store.promote(graphA, nodeA, '10', 'seed')
+      store.promote(graphA, nodeB, '20', 'cfg')
+
+      expect(store.getPromotions(graphA, nodeA)).toEqual([
+        { interiorNodeId: '10', widgetName: 'seed' }
+      ])
+      expect(store.getPromotions(graphA, nodeB)).toEqual([
+        { interiorNodeId: '20', widgetName: 'cfg' }
+      ])
+    })
+
+    it('demoting from one node does not affect another', () => {
+      store.promote(graphA, nodeA, '10', 'seed')
+      store.promote(graphA, nodeB, '10', 'seed')
+      store.demote(graphA, nodeA, '10', 'seed')
+
+      expect(store.isPromoted(graphA, nodeA, '10', 'seed')).toBe(false)
+      expect(store.isPromoted(graphA, nodeB, '10', 'seed')).toBe(true)
+    })
+  })
+
+  describe('graph isolation', () => {
+    it('isolates promotions by graph id', () => {
+      store.promote(graphA, nodeId, '10', 'seed')
+      store.promote(graphB, nodeId, '20', 'steps')
+
+      expect(store.getPromotions(graphA, nodeId)).toEqual([
+        { interiorNodeId: '10', widgetName: 'seed' }
+      ])
+      expect(store.getPromotions(graphB, nodeId)).toEqual([
+        { interiorNodeId: '20', widgetName: 'steps' }
+      ])
+    })
+
+    it('clearGraph only removes one graph namespace', () => {
+      store.promote(graphA, nodeId, '10', 'seed')
+      store.promote(graphB, nodeId, '20', 'steps')
+
+      store.clearGraph(graphA)
+
+      expect(store.getPromotions(graphA, nodeId)).toEqual([])
+      expect(store.getPromotions(graphB, nodeId)).toEqual([
+        { interiorNodeId: '20', widgetName: 'steps' }
+      ])
+      expect(store.isPromotedByAny(graphA, '10', 'seed')).toBe(false)
+      expect(store.isPromotedByAny(graphB, '20', 'steps')).toBe(true)
+    })
+  })
+})
diff --git a/src/stores/promotionStore.ts b/src/stores/promotionStore.ts
new file mode 100644
index 0000000000..7eb65c63d1
--- /dev/null
+++ b/src/stores/promotionStore.ts
@@ -0,0 +1,186 @@
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+
+import type { NodeId } from '@/lib/litegraph/src/LGraphNode'
+import type { UUID } from '@/lib/litegraph/src/utils/uuid'
+
+interface PromotionEntry {
+  interiorNodeId: string
+  widgetName: string
+}
+
+export const usePromotionStore = defineStore('promotion', () => {
+  const graphPromotions = ref(new Map<UUID, Map<NodeId, PromotionEntry[]>>())
+  const graphRefCounts = ref(new Map<UUID, Map<string, number>>())
+
+  function _getPromotionsForGraph(
+    graphId: UUID
+  ): Map<NodeId, PromotionEntry[]> {
+    const promotions = graphPromotions.value.get(graphId)
+    if (promotions) return promotions
+
+    const nextPromotions = new Map<NodeId, PromotionEntry[]>()
+    graphPromotions.value.set(graphId, nextPromotions)
+    return nextPromotions
+  }
+
+  function _getRefCountsForGraph(graphId: UUID): Map<string, number> {
+    const refCounts = graphRefCounts.value.get(graphId)
+    if (refCounts) return refCounts
+
+    const nextRefCounts = new Map<string, number>()
+    graphRefCounts.value.set(graphId, nextRefCounts)
+    return nextRefCounts
+  }
+
+  function _makeKey(interiorNodeId: string, widgetName: string): string {
+    return `${interiorNodeId}:${widgetName}`
+  }
+
+  function _incrementKeys(graphId: UUID, entries: PromotionEntry[]): void {
+    const refCounts = _getRefCountsForGraph(graphId)
+    for (const e of entries) {
+      const key = _makeKey(e.interiorNodeId, e.widgetName)
+      refCounts.set(key, (refCounts.get(key) ?? 0) + 1)
+    }
+  }
+
+  function _decrementKeys(graphId: UUID, entries: PromotionEntry[]): void {
+    const refCounts = _getRefCountsForGraph(graphId)
+    for (const e of entries) {
+      const key = _makeKey(e.interiorNodeId, e.widgetName)
+      const count = (refCounts.get(key) ?? 1) - 1
+      if (count <= 0) {
+        refCounts.delete(key)
+      } else {
+        refCounts.set(key, count)
+      }
+    }
+  }
+
+  function getPromotionsRef(
+    graphId: UUID,
+    subgraphNodeId: NodeId
+  ): PromotionEntry[] {
+    return _getPromotionsForGraph(graphId).get(subgraphNodeId) ?? []
+  }
+
+  function getPromotions(
+    graphId: UUID,
+    subgraphNodeId: NodeId
+  ): PromotionEntry[] {
+    return [...getPromotionsRef(graphId, subgraphNodeId)]
+  }
+
+  function isPromoted(
+    graphId: UUID,
+    subgraphNodeId: NodeId,
+    interiorNodeId: string,
+    widgetName: string
+  ): boolean {
+    return getPromotionsRef(graphId, subgraphNodeId).some(
+      (e) => e.interiorNodeId === interiorNodeId && e.widgetName === widgetName
+    )
+  }
+
+  function isPromotedByAny(
+    graphId: UUID,
+    interiorNodeId: string,
+    widgetName: string
+  ): boolean {
+    const refCounts = _getRefCountsForGraph(graphId)
+    return (refCounts.get(_makeKey(interiorNodeId, widgetName)) ?? 0) > 0
+  }
+
+  function setPromotions(
+    graphId: UUID,
+    subgraphNodeId: NodeId,
+    entries: PromotionEntry[]
+  ): void {
+    const promotions = _getPromotionsForGraph(graphId)
+    const oldEntries = promotions.get(subgraphNodeId) ?? []
+    _decrementKeys(graphId, oldEntries)
+    _incrementKeys(graphId, entries)
+
+    if (entries.length === 0) {
+      promotions.delete(subgraphNodeId)
+    } else {
+      promotions.set(subgraphNodeId, [...entries])
+    }
+  }
+
+  function promote(
+    graphId: UUID,
+    subgraphNodeId: NodeId,
+    interiorNodeId: string,
+    widgetName: string
+  ): void {
+    if (isPromoted(graphId, subgraphNodeId, interiorNodeId, widgetName)) return
+    const entries = getPromotionsRef(graphId, subgraphNodeId)
+    setPromotions(graphId, subgraphNodeId, [
+      ...entries,
+      { interiorNodeId, widgetName }
+    ])
+  }
+
+  function demote(
+    graphId: UUID,
+    subgraphNodeId: NodeId,
+    interiorNodeId: string,
+    widgetName: string
+  ): void {
+    const entries = getPromotionsRef(graphId, subgraphNodeId)
+    setPromotions(
+      graphId,
+      subgraphNodeId,
+      entries.filter(
+        (e) =>
+          !(e.interiorNodeId === interiorNodeId && e.widgetName === widgetName)
+      )
+    )
+  }
+
+  function movePromotion(
+    graphId: UUID,
+    subgraphNodeId: NodeId,
+    fromIndex: number,
+    toIndex: number
+  ): void {
+    const promotions = _getPromotionsForGraph(graphId)
+    const currentEntries = promotions.get(subgraphNodeId)
+    if (!currentEntries?.length) return
+
+    const entries = [...currentEntries]
+    if (
+      fromIndex < 0 ||
+      fromIndex >= entries.length ||
+      toIndex < 0 ||
+      toIndex >= entries.length ||
+      fromIndex === toIndex
+    )
+      return
+
+    const [entry] = entries.splice(fromIndex, 1)
+    entries.splice(toIndex, 0, entry)
+
+    // Reordering does not change membership, so ref-counts remain valid.
+    promotions.set(subgraphNodeId, entries)
+  }
+
+  function clearGraph(graphId: UUID): void {
+    graphPromotions.value.delete(graphId)
+    graphRefCounts.value.delete(graphId)
+  }
+
+  return {
+    getPromotionsRef,
+    getPromotions,
+    isPromoted,
+    isPromotedByAny,
+    setPromotions,
+    promote,
+    demote,
+    movePromotion,
+    clearGraph
+  }
+})
diff --git a/src/stores/queueStore.loadWorkflow.test.ts b/src/stores/queueStore.loadWorkflow.test.ts
new file mode 100644
index 0000000000..965c16127c
--- /dev/null
+++ b/src/stores/queueStore.loadWorkflow.test.ts
@@ -0,0 +1,139 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type {
+  JobDetail,
+  JobListItem
+} from '@/platform/remote/comfyui/jobs/jobTypes'
+import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
+import type { ComfyApp } from '@/scripts/app'
+import { TaskItemImpl } from '@/stores/queueStore'
+import * as jobOutputCache from '@/services/jobOutputCache'
+
+vi.mock('@/services/extensionService', () => ({
+  useExtensionService: vi.fn(() => ({
+    invokeExtensions: vi.fn()
+  }))
+}))
+
+const mockWorkflow: ComfyWorkflowJSON = {
+  last_node_id: 5,
+  last_link_id: 3,
+  nodes: [],
+  links: [],
+  groups: [],
+  config: {},
+  extra: {},
+  version: 0.4
+}
+
+// Mock job detail response (matches actual /jobs/{id} API response structure)
+// workflow is nested at: workflow.extra_data.extra_pnginfo.workflow
+const mockJobDetail = {
+  id: 'test-job-id',
+  status: 'completed' as const,
+  create_time: Date.now(),
+  update_time: Date.now(),
+  workflow: {
+    extra_data: {
+      extra_pnginfo: {
+        workflow: mockWorkflow
+      }
+    }
+  },
+  outputs: {
+    '1': { images: [{ filename: 'test.png', subfolder: '', type: 'output' }] }
+  }
+}
+
+function createHistoryJob(id: string): JobListItem {
+  const now = Date.now()
+  return {
+    id,
+    status: 'completed',
+    create_time: now,
+    priority: now
+  }
+}
+
+function createRunningJob(id: string): JobListItem {
+  const now = Date.now()
+  return {
+    id,
+    status: 'in_progress',
+    create_time: now,
+    priority: now
+  }
+}
+
+describe('TaskItemImpl.loadWorkflow - workflow fetching', () => {
+  let mockApp: ComfyApp
+  let mockFetchApi: ReturnType<typeof vi.fn>
+
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    vi.clearAllMocks()
+
+    mockFetchApi = vi.fn()
+    mockApp = {
+      loadGraphData: vi.fn(),
+      nodeOutputs: {},
+      api: {
+        fetchApi: mockFetchApi
+      }
+    } as unknown as ComfyApp
+  })
+
+  it('should fetch workflow from API for history tasks', async () => {
+    const job = createHistoryJob('test-job-id')
+    const task = new TaskItemImpl(job)
+
+    vi.spyOn(jobOutputCache, 'getJobDetail').mockResolvedValue(
+      mockJobDetail as JobDetail
+    )
+
+    await task.loadWorkflow(mockApp)
+
+    expect(jobOutputCache.getJobDetail).toHaveBeenCalledWith('test-job-id')
+    expect(mockApp.loadGraphData).toHaveBeenCalledWith(mockWorkflow)
+  })
+
+  it('should not load workflow when fetch returns undefined', async () => {
+    const job = createHistoryJob('test-job-id')
+    const task = new TaskItemImpl(job)
+
+    vi.spyOn(jobOutputCache, 'getJobDetail').mockResolvedValue(undefined)
+
+    await task.loadWorkflow(mockApp)
+
+    expect(jobOutputCache.getJobDetail).toHaveBeenCalled()
+    expect(mockApp.loadGraphData).not.toHaveBeenCalled()
+  })
+
+  it('should only fetch for history tasks, not running tasks', async () => {
+    const job = createRunningJob('test-job-id')
+    const runningTask = new TaskItemImpl(job)
+
+    vi.spyOn(jobOutputCache, 'getJobDetail').mockResolvedValue(
+      mockJobDetail as JobDetail
+    )
+
+    await runningTask.loadWorkflow(mockApp)
+
+    expect(jobOutputCache.getJobDetail).not.toHaveBeenCalled()
+    expect(mockApp.loadGraphData).not.toHaveBeenCalled()
+  })
+
+  it('should handle fetch errors gracefully by returning undefined', async () => {
+    const job = createHistoryJob('test-job-id')
+    const task = new TaskItemImpl(job)
+
+    vi.spyOn(jobOutputCache, 'getJobDetail').mockResolvedValue(undefined)
+
+    await task.loadWorkflow(mockApp)
+
+    expect(jobOutputCache.getJobDetail).toHaveBeenCalled()
+    expect(mockApp.loadGraphData).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/stores/queueStore.test.ts b/src/stores/queueStore.test.ts
new file mode 100644
index 0000000000..b0c819a42f
--- /dev/null
+++ b/src/stores/queueStore.test.ts
@@ -0,0 +1,913 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+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 { TaskItemImpl, useQueueStore } from '@/stores/queueStore'
+
+// Fixture factory for JobListItem
+function createJob(
+  id: string,
+  status: JobListItem['status'],
+  createTime: number = Date.now(),
+  priority?: number
+): JobListItem {
+  return {
+    id,
+    status,
+    create_time: createTime,
+    update_time: createTime,
+    last_state_update: createTime,
+    priority: priority ?? createTime
+  }
+}
+
+function createRunningJob(createTime: number, id: string): JobListItem {
+  return createJob(id, 'in_progress', createTime)
+}
+
+function createPendingJob(createTime: number, id: string): JobListItem {
+  return createJob(id, 'pending', createTime)
+}
+
+function createHistoryJob(createTime: number, id: string): JobListItem {
+  return createJob(id, 'completed', createTime)
+}
+
+const createTaskOutput = (
+  nodeId: string = 'node-1',
+  images: {
+    type?: 'output' | 'input' | 'temp'
+    filename?: string
+    subfolder?: string
+  }[] = []
+): TaskOutput => ({
+  [nodeId]: {
+    images
+  }
+})
+
+type QueueResponse = { Running: JobListItem[]; Pending: JobListItem[] }
+type QueueResolver = (value: QueueResponse) => void
+
+// Mock API
+vi.mock('@/scripts/api', () => ({
+  api: {
+    getQueue: vi.fn(),
+    getHistory: vi.fn(),
+    clearItems: vi.fn(),
+    deleteItem: vi.fn(),
+    apiURL: vi.fn((path) => `/api${path}`),
+    addEventListener: vi.fn(),
+    removeEventListener: vi.fn()
+  }
+}))
+
+describe('TaskItemImpl', () => {
+  it('should remove animated property from outputs during construction', () => {
+    const job = createHistoryJob(0, 'job-id')
+    const taskItem = new TaskItemImpl(job, {
+      'node-1': {
+        images: [{ filename: 'test.png', type: 'output', subfolder: '' }],
+        animated: [false]
+      }
+    })
+
+    // Check that animated property was removed
+    expect('animated' in taskItem.outputs['node-1']).toBe(false)
+
+    expect(taskItem.outputs['node-1'].images).toBeDefined()
+    expect(taskItem.outputs['node-1'].images?.[0]?.filename).toBe('test.png')
+  })
+
+  it('should handle outputs without animated property', () => {
+    const job = createHistoryJob(0, 'job-id')
+    const taskItem = new TaskItemImpl(job, {
+      'node-1': {
+        images: [{ filename: 'test.png', type: 'output', subfolder: '' }]
+      }
+    })
+
+    expect(taskItem.outputs['node-1'].images).toBeDefined()
+    expect(taskItem.outputs['node-1'].images?.[0]?.filename).toBe('test.png')
+  })
+
+  it('should recognize webm video from core', () => {
+    const job = createHistoryJob(0, 'job-id')
+    const taskItem = new TaskItemImpl(job, {
+      'node-1': {
+        video: [{ filename: 'test.webm', type: 'output', subfolder: '' }]
+      }
+    })
+
+    const output = taskItem.flatOutputs[0]
+
+    expect(output.htmlVideoType).toBe('video/webm')
+    expect(output.isVideo).toBe(true)
+    expect(output.isVhsFormat).toBe(false)
+    expect(output.isImage).toBe(false)
+  })
+
+  // https://github.com/Kosinkadink/ComfyUI-VideoHelperSuite/blob/0a75c7958fe320efcb052f1d9f8451fd20c730a8/videohelpersuite/nodes.py#L578-L590
+  it('should recognize webm video from VHS', () => {
+    const job = createHistoryJob(0, 'job-id')
+    const taskItem = new TaskItemImpl(job, {
+      'node-1': {
+        gifs: [
+          {
+            filename: 'test.webm',
+            type: 'output',
+            subfolder: '',
+            format: 'video/webm',
+            frame_rate: 30
+          }
+        ]
+      }
+    })
+
+    const output = taskItem.flatOutputs[0]
+
+    expect(output.htmlVideoType).toBe('video/webm')
+    expect(output.isVideo).toBe(true)
+    expect(output.isVhsFormat).toBe(true)
+    expect(output.isImage).toBe(false)
+  })
+
+  it('should recognize mp4 video from core', () => {
+    const job = createHistoryJob(0, 'job-id')
+    const taskItem = new TaskItemImpl(job, {
+      'node-1': {
+        images: [
+          {
+            filename: 'test.mp4',
+            type: 'output',
+            subfolder: ''
+          }
+        ],
+        animated: [true]
+      }
+    })
+
+    const output = taskItem.flatOutputs[0]
+
+    expect(output.htmlVideoType).toBe('video/mp4')
+    expect(output.isVideo).toBe(true)
+    expect(output.isImage).toBe(false)
+  })
+
+  describe('audio format detection', () => {
+    const audioFormats = [
+      { extension: 'mp3', mimeType: 'audio/mpeg' },
+      { extension: 'wav', mimeType: 'audio/wav' },
+      { extension: 'ogg', mimeType: 'audio/ogg' },
+      { extension: 'flac', mimeType: 'audio/flac' }
+    ]
+
+    audioFormats.forEach(({ extension, mimeType }) => {
+      it(`should recognize ${extension} audio`, () => {
+        const job = createHistoryJob(0, 'job-id')
+        const taskItem = new TaskItemImpl(job, {
+          'node-1': {
+            audio: [
+              {
+                filename: `test.${extension}`,
+                type: 'output',
+                subfolder: ''
+              }
+            ]
+          }
+        })
+
+        const output = taskItem.flatOutputs[0]
+
+        expect(output.htmlAudioType).toBe(mimeType)
+        expect(output.isAudio).toBe(true)
+        expect(output.isVideo).toBe(false)
+        expect(output.isImage).toBe(false)
+        expect(output.supportsPreview).toBe(true)
+      })
+    })
+  })
+
+  describe('error extraction getters', () => {
+    it('errorMessage returns undefined when no execution_error', () => {
+      const job = createHistoryJob(0, 'job-id')
+      const taskItem = new TaskItemImpl(job)
+      expect(taskItem.errorMessage).toBeUndefined()
+    })
+
+    it('errorMessage returns the exception_message from execution_error', () => {
+      const job: JobListItem = {
+        ...createHistoryJob(0, 'job-id'),
+        status: 'failed',
+        execution_error: {
+          node_id: 'node-1',
+          node_type: 'KSampler',
+          exception_message: 'GPU out of memory',
+          exception_type: 'RuntimeError',
+          traceback: ['line 1', 'line 2'],
+          current_inputs: {},
+          current_outputs: {}
+        }
+      }
+      const taskItem = new TaskItemImpl(job)
+      expect(taskItem.errorMessage).toBe('GPU out of memory')
+    })
+
+    it('executionError returns undefined when no execution_error', () => {
+      const job = createHistoryJob(0, 'job-id')
+      const taskItem = new TaskItemImpl(job)
+      expect(taskItem.executionError).toBeUndefined()
+    })
+
+    it('executionError returns the full error object from execution_error', () => {
+      const errorDetail = {
+        node_id: 'node-1',
+        node_type: 'KSampler',
+        executed: ['node-0'],
+        exception_message: 'Invalid dimensions',
+        exception_type: 'ValueError',
+        traceback: ['traceback line'],
+        current_inputs: { input1: 'value' },
+        current_outputs: {}
+      }
+      const job: JobListItem = {
+        ...createHistoryJob(0, 'job-id'),
+        status: 'failed',
+        execution_error: errorDetail
+      }
+      const taskItem = new TaskItemImpl(job)
+      expect(taskItem.executionError).toEqual(errorDetail)
+    })
+  })
+})
+
+describe('useQueueStore', () => {
+  let store: ReturnType<typeof useQueueStore>
+
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    store = useQueueStore()
+    vi.clearAllMocks()
+  })
+
+  const mockGetQueue = vi.mocked(api.getQueue)
+  const mockGetHistory = vi.mocked(api.getHistory)
+  const mockClearItems = vi.mocked(api.clearItems)
+  const mockDeleteItem = vi.mocked(api.deleteItem)
+
+  describe('initial state', () => {
+    it('should have empty state on initialization', () => {
+      expect(store.runningTasks).toEqual([])
+      expect(store.pendingTasks).toEqual([])
+      expect(store.historyTasks).toEqual([])
+      expect(store.isLoading).toBe(false)
+      expect(store.maxHistoryItems).toBe(64)
+    })
+
+    it('should have empty computed tasks', () => {
+      expect(store.tasks).toEqual([])
+      expect(store.flatTasks).toEqual([])
+      expect(store.hasPendingTasks).toBe(false)
+      expect(store.lastJobHistoryPriority).toBe(-1)
+    })
+  })
+
+  describe('update() - basic functionality', () => {
+    it('should load running and pending tasks from API', async () => {
+      const runningJob = createRunningJob(1, 'run-1')
+      const pendingJob1 = createPendingJob(2, 'pend-1')
+      const pendingJob2 = createPendingJob(3, 'pend-2')
+
+      // API returns pre-sorted data (newest first)
+      mockGetQueue.mockResolvedValue({
+        Running: [runningJob],
+        Pending: [pendingJob2, pendingJob1] // Pre-sorted by create_time desc
+      })
+      mockGetHistory.mockResolvedValue([])
+
+      await store.update()
+
+      expect(store.runningTasks).toHaveLength(1)
+      expect(store.pendingTasks).toHaveLength(2)
+      expect(store.runningTasks[0].jobId).toBe('run-1')
+      expect(store.pendingTasks[0].jobId).toBe('pend-2')
+      expect(store.pendingTasks[1].jobId).toBe('pend-1')
+    })
+
+    it('should load history tasks from API', async () => {
+      const historyJob1 = createHistoryJob(5, 'hist-1')
+      const historyJob2 = createHistoryJob(4, 'hist-2')
+
+      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
+      mockGetHistory.mockResolvedValue([historyJob1, historyJob2])
+
+      await store.update()
+
+      expect(store.historyTasks).toHaveLength(2)
+      expect(store.historyTasks[0].jobId).toBe('hist-1')
+      expect(store.historyTasks[1].jobId).toBe('hist-2')
+    })
+
+    it('should set loading state correctly', async () => {
+      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
+      mockGetHistory.mockResolvedValue([])
+
+      expect(store.isLoading).toBe(false)
+
+      const updatePromise = store.update()
+      expect(store.isLoading).toBe(true)
+
+      await updatePromise
+      expect(store.isLoading).toBe(false)
+    })
+
+    it('should clear loading state even if API fails', async () => {
+      mockGetQueue.mockRejectedValue(new Error('API error'))
+      mockGetHistory.mockResolvedValue([])
+
+      await expect(store.update()).rejects.toThrow('API error')
+      expect(store.isLoading).toBe(false)
+    })
+  })
+
+  describe('update() - sorting', () => {
+    it('should sort tasks by job.priority descending', async () => {
+      const job1 = createHistoryJob(1, 'hist-1')
+      const job2 = createHistoryJob(5, 'hist-2')
+      const job3 = createHistoryJob(3, 'hist-3')
+
+      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
+      mockGetHistory.mockResolvedValue([job1, job2, job3])
+
+      await store.update()
+
+      expect(store.historyTasks[0].job.priority).toBe(5)
+      expect(store.historyTasks[1].job.priority).toBe(3)
+      expect(store.historyTasks[2].job.priority).toBe(1)
+    })
+
+    it('should preserve API sort order for pending tasks', async () => {
+      const pend1 = createPendingJob(10, 'pend-1')
+      const pend2 = createPendingJob(15, 'pend-2')
+      const pend3 = createPendingJob(12, 'pend-3')
+
+      // API returns pre-sorted data (newest first)
+      mockGetQueue.mockResolvedValue({
+        Running: [],
+        Pending: [pend2, pend3, pend1] // Pre-sorted by create_time desc
+      })
+      mockGetHistory.mockResolvedValue([])
+
+      await store.update()
+
+      expect(store.pendingTasks[0].job.priority).toBe(15)
+      expect(store.pendingTasks[1].job.priority).toBe(12)
+      expect(store.pendingTasks[2].job.priority).toBe(10)
+    })
+  })
+
+  describe('update() - queue index collision (THE BUG FIX)', () => {
+    it('should NOT confuse different prompts with same job.priority', async () => {
+      const hist1 = createHistoryJob(50, 'prompt-uuid-aaa')
+
+      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
+      mockGetHistory.mockResolvedValue([hist1])
+
+      await store.update()
+      expect(store.historyTasks).toHaveLength(1)
+      expect(store.historyTasks[0].jobId).toBe('prompt-uuid-aaa')
+
+      const hist2 = createHistoryJob(51, 'prompt-uuid-bbb')
+      mockGetHistory.mockResolvedValue([hist2])
+
+      await store.update()
+
+      expect(store.historyTasks).toHaveLength(1)
+      expect(store.historyTasks[0].jobId).toBe('prompt-uuid-bbb')
+      expect(store.historyTasks[0].job.priority).toBe(51)
+    })
+
+    it('should correctly reconcile when job.priority is reused', async () => {
+      const hist1 = createHistoryJob(100, 'first-prompt-at-100')
+      const hist2 = createHistoryJob(99, 'prompt-at-99')
+
+      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
+      mockGetHistory.mockResolvedValue([hist1, hist2])
+
+      await store.update()
+      expect(store.historyTasks).toHaveLength(2)
+
+      const hist3 = createHistoryJob(101, 'second-prompt-at-101')
+      mockGetHistory.mockResolvedValue([hist3, hist2])
+
+      await store.update()
+
+      expect(store.historyTasks).toHaveLength(2)
+      const jobIds = store.historyTasks.map((t) => t.jobId)
+      expect(jobIds).toContain('second-prompt-at-101')
+      expect(jobIds).toContain('prompt-at-99')
+      expect(jobIds).not.toContain('first-prompt-at-100')
+    })
+
+    it('should handle multiple job.priority collisions simultaneously', async () => {
+      const hist1 = createHistoryJob(10, 'old-at-10')
+      const hist2 = createHistoryJob(20, 'old-at-20')
+      const hist3 = createHistoryJob(30, 'keep-at-30')
+
+      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
+      mockGetHistory.mockResolvedValue([hist3, hist2, hist1])
+
+      await store.update()
+      expect(store.historyTasks).toHaveLength(3)
+
+      const newHist1 = createHistoryJob(31, 'new-at-31')
+      const newHist2 = createHistoryJob(32, 'new-at-32')
+      mockGetHistory.mockResolvedValue([newHist2, newHist1, hist3])
+
+      await store.update()
+
+      expect(store.historyTasks).toHaveLength(3)
+      const jobIds = store.historyTasks.map((t) => t.jobId)
+      expect(jobIds).toEqual(['new-at-32', 'new-at-31', 'keep-at-30'])
+    })
+  })
+
+  describe('update() - history reconciliation', () => {
+    it('should keep existing items still on server (by jobId)', async () => {
+      const hist1 = createHistoryJob(10, 'existing-1')
+      const hist2 = createHistoryJob(9, 'existing-2')
+
+      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
+      mockGetHistory.mockResolvedValue([hist1, hist2])
+
+      await store.update()
+      expect(store.historyTasks).toHaveLength(2)
+
+      const hist3 = createHistoryJob(11, 'new-1')
+      mockGetHistory.mockResolvedValue([hist3, hist1, hist2])
+
+      await store.update()
+
+      expect(store.historyTasks).toHaveLength(3)
+      expect(store.historyTasks.map((t) => t.jobId)).toContain('existing-1')
+      expect(store.historyTasks.map((t) => t.jobId)).toContain('existing-2')
+      expect(store.historyTasks.map((t) => t.jobId)).toContain('new-1')
+    })
+
+    it('should remove items no longer on server', async () => {
+      const hist1 = createHistoryJob(10, 'remove-me')
+      const hist2 = createHistoryJob(9, 'keep-me')
+
+      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
+      mockGetHistory.mockResolvedValue([hist1, hist2])
+
+      await store.update()
+      expect(store.historyTasks).toHaveLength(2)
+
+      mockGetHistory.mockResolvedValue([hist2])
+
+      await store.update()
+
+      expect(store.historyTasks).toHaveLength(1)
+      expect(store.historyTasks[0].jobId).toBe('keep-me')
+    })
+
+    it('should add new items from server', async () => {
+      const hist1 = createHistoryJob(5, 'old-1')
+
+      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
+      mockGetHistory.mockResolvedValue([hist1])
+
+      await store.update()
+
+      const hist2 = createHistoryJob(6, 'new-1')
+      const hist3 = createHistoryJob(7, 'new-2')
+      mockGetHistory.mockResolvedValue([hist3, hist2, hist1])
+
+      await store.update()
+
+      expect(store.historyTasks).toHaveLength(3)
+      expect(store.historyTasks.map((t) => t.jobId)).toContain('new-1')
+      expect(store.historyTasks.map((t) => t.jobId)).toContain('new-2')
+    })
+
+    it('should recreate TaskItemImpl when outputs_count changes', async () => {
+      // Initial load without outputs_count
+      const jobWithoutOutputsCount = createHistoryJob(10, 'job-1')
+      delete jobWithoutOutputsCount.outputs_count
+
+      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
+      mockGetHistory.mockResolvedValue([jobWithoutOutputsCount])
+
+      await store.update()
+      expect(store.historyTasks).toHaveLength(1)
+      const initialTask = store.historyTasks[0]
+      expect(initialTask.outputsCount).toBeUndefined()
+
+      // Second load with outputs_count now populated
+      const jobWithOutputsCount = {
+        ...createHistoryJob(10, 'job-1'),
+        outputs_count: 2
+      }
+      mockGetHistory.mockResolvedValue([jobWithOutputsCount])
+
+      await store.update()
+
+      // Should have recreated the TaskItemImpl with new outputs_count
+      expect(store.historyTasks).toHaveLength(1)
+      const updatedTask = store.historyTasks[0]
+      expect(updatedTask.outputsCount).toBe(2)
+      // Should be a different instance
+      expect(updatedTask).not.toBe(initialTask)
+    })
+
+    it('should reuse TaskItemImpl when outputs_count unchanged', async () => {
+      const job = {
+        ...createHistoryJob(10, 'job-1'),
+        outputs_count: 2
+      }
+
+      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
+      mockGetHistory.mockResolvedValue([job])
+
+      await store.update()
+      const initialTask = store.historyTasks[0]
+      const initialHistoryTasks = store.historyTasks
+
+      // Same job with same outputs_count
+      mockGetHistory.mockResolvedValue([{ ...job }])
+
+      await store.update()
+
+      // Should reuse the same instance
+      expect(store.historyTasks[0]).toBe(initialTask)
+      // Should preserve array identity when history is unchanged
+      expect(store.historyTasks).toBe(initialHistoryTasks)
+    })
+  })
+
+  describe('update() - maxHistoryItems limit', () => {
+    it('should enforce maxHistoryItems limit', async () => {
+      store.maxHistoryItems = 3
+
+      const jobs = Array.from({ length: 5 }, (_, i) =>
+        createHistoryJob(10 - i, `hist-${i}`)
+      )
+
+      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
+      mockGetHistory.mockResolvedValue(jobs)
+
+      await store.update()
+
+      expect(store.historyTasks).toHaveLength(3)
+      expect(store.historyTasks[0].job.priority).toBe(10)
+      expect(store.historyTasks[1].job.priority).toBe(9)
+      expect(store.historyTasks[2].job.priority).toBe(8)
+    })
+
+    it('should respect maxHistoryItems when combining new and existing', async () => {
+      store.maxHistoryItems = 5
+
+      const initial = Array.from({ length: 3 }, (_, i) =>
+        createHistoryJob(10 + i, `existing-${i}`)
+      )
+
+      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
+      mockGetHistory.mockResolvedValue(initial)
+
+      await store.update()
+      expect(store.historyTasks).toHaveLength(3)
+
+      const newJobs = Array.from({ length: 4 }, (_, i) =>
+        createHistoryJob(20 + i, `new-${i}`)
+      )
+      mockGetHistory.mockResolvedValue([...newJobs, ...initial])
+
+      await store.update()
+
+      expect(store.historyTasks).toHaveLength(5)
+      expect(store.historyTasks[0].job.priority).toBe(23)
+    })
+
+    it('should handle maxHistoryItems = 0', async () => {
+      store.maxHistoryItems = 0
+
+      const jobs = [createHistoryJob(10, 'hist-1')]
+
+      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
+      mockGetHistory.mockResolvedValue(jobs)
+
+      await store.update()
+
+      expect(store.historyTasks).toHaveLength(0)
+    })
+
+    it('should handle maxHistoryItems = 1', async () => {
+      store.maxHistoryItems = 1
+
+      const jobs = [
+        createHistoryJob(10, 'hist-1'),
+        createHistoryJob(9, 'hist-2')
+      ]
+
+      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
+      mockGetHistory.mockResolvedValue(jobs)
+
+      await store.update()
+
+      expect(store.historyTasks).toHaveLength(1)
+      expect(store.historyTasks[0].job.priority).toBe(10)
+    })
+
+    it('should dynamically adjust when maxHistoryItems changes', async () => {
+      store.maxHistoryItems = 10
+
+      const jobs = Array.from({ length: 15 }, (_, i) =>
+        createHistoryJob(20 - i, `hist-${i}`)
+      )
+
+      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
+      mockGetHistory.mockResolvedValue(jobs)
+
+      await store.update()
+      expect(store.historyTasks).toHaveLength(10)
+
+      store.maxHistoryItems = 5
+      mockGetHistory.mockResolvedValue(jobs)
+
+      await store.update()
+      expect(store.historyTasks).toHaveLength(5)
+    })
+  })
+
+  describe('computed properties', () => {
+    it('tasks should combine pending, running, and history in correct order', async () => {
+      const running = createRunningJob(5, 'run-1')
+      const pending1 = createPendingJob(6, 'pend-1')
+      const pending2 = createPendingJob(7, 'pend-2')
+      const hist1 = createHistoryJob(3, 'hist-1')
+      const hist2 = createHistoryJob(4, 'hist-2')
+
+      mockGetQueue.mockResolvedValue({
+        Running: [running],
+        Pending: [pending1, pending2]
+      })
+      mockGetHistory.mockResolvedValue([hist2, hist1])
+
+      await store.update()
+
+      expect(store.tasks).toHaveLength(5)
+      expect(store.tasks[0].taskType).toBe('Pending')
+      expect(store.tasks[1].taskType).toBe('Pending')
+      expect(store.tasks[2].taskType).toBe('Running')
+      expect(store.tasks[3].taskType).toBe('History')
+      expect(store.tasks[4].taskType).toBe('History')
+    })
+
+    it('hasPendingTasks should be true when pending tasks exist', async () => {
+      mockGetQueue.mockResolvedValue({
+        Running: [],
+        Pending: [createPendingJob(1, 'pend-1')]
+      })
+      mockGetHistory.mockResolvedValue([])
+
+      await store.update()
+      expect(store.hasPendingTasks).toBe(true)
+    })
+
+    it('hasPendingTasks should be false when no pending tasks', async () => {
+      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
+      mockGetHistory.mockResolvedValue([])
+
+      await store.update()
+      expect(store.hasPendingTasks).toBe(false)
+    })
+
+    it('lastJobHistoryPriority should return highest job priority', async () => {
+      const hist1 = createHistoryJob(10, 'hist-1')
+      const hist2 = createHistoryJob(25, 'hist-2')
+      const hist3 = createHistoryJob(15, 'hist-3')
+
+      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
+      mockGetHistory.mockResolvedValue([hist1, hist2, hist3])
+
+      await store.update()
+      expect(store.lastJobHistoryPriority).toBe(25)
+    })
+
+    it('lastJobHistoryPriority should be -1 when no history', async () => {
+      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
+      mockGetHistory.mockResolvedValue([])
+
+      await store.update()
+      expect(store.lastJobHistoryPriority).toBe(-1)
+    })
+  })
+
+  describe('clear()', () => {
+    beforeEach(async () => {
+      mockGetQueue.mockResolvedValue({
+        Running: [createRunningJob(1, 'run-1')],
+        Pending: [createPendingJob(2, 'pend-1')]
+      })
+      mockGetHistory.mockResolvedValue([createHistoryJob(3, 'hist-1')])
+      await store.update()
+    })
+
+    it('should clear both queue and history by default', async () => {
+      mockClearItems.mockResolvedValue(undefined)
+      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
+      mockGetHistory.mockResolvedValue([])
+
+      await store.clear()
+
+      expect(mockClearItems).toHaveBeenCalledTimes(2)
+      expect(mockClearItems).toHaveBeenCalledWith('queue')
+      expect(mockClearItems).toHaveBeenCalledWith('history')
+      expect(store.runningTasks).toHaveLength(0)
+      expect(store.pendingTasks).toHaveLength(0)
+      expect(store.historyTasks).toHaveLength(0)
+    })
+
+    it('should clear only queue when specified', async () => {
+      mockClearItems.mockResolvedValue(undefined)
+      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
+      mockGetHistory.mockResolvedValue([createHistoryJob(3, 'hist-1')])
+
+      await store.clear(['queue'])
+
+      expect(mockClearItems).toHaveBeenCalledTimes(1)
+      expect(mockClearItems).toHaveBeenCalledWith('queue')
+      expect(store.historyTasks).toHaveLength(1)
+    })
+
+    it('should clear only history when specified', async () => {
+      mockClearItems.mockResolvedValue(undefined)
+      mockGetQueue.mockResolvedValue({
+        Running: [createRunningJob(1, 'run-1')],
+        Pending: [createPendingJob(2, 'pend-1')]
+      })
+      mockGetHistory.mockResolvedValue([])
+
+      await store.clear(['history'])
+
+      expect(mockClearItems).toHaveBeenCalledTimes(1)
+      expect(mockClearItems).toHaveBeenCalledWith('history')
+      expect(store.runningTasks).toHaveLength(1)
+      expect(store.pendingTasks).toHaveLength(1)
+    })
+
+    it('should do nothing when empty array passed', async () => {
+      await store.clear([])
+
+      expect(mockClearItems).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('delete()', () => {
+    it('should delete task from queue', async () => {
+      const job = createPendingJob(1, 'pend-1')
+      const task = new TaskItemImpl(job)
+
+      mockDeleteItem.mockResolvedValue(undefined)
+      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
+      mockGetHistory.mockResolvedValue([])
+
+      await store.delete(task)
+
+      expect(mockDeleteItem).toHaveBeenCalledWith('queue', 'pend-1')
+    })
+
+    it('should delete task from history', async () => {
+      const job = createHistoryJob(1, 'hist-1')
+      const task = new TaskItemImpl(job, createTaskOutput())
+
+      mockDeleteItem.mockResolvedValue(undefined)
+      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
+      mockGetHistory.mockResolvedValue([])
+
+      await store.delete(task)
+
+      expect(mockDeleteItem).toHaveBeenCalledWith('history', 'hist-1')
+    })
+
+    it('should refresh store after deletion', async () => {
+      const job = createPendingJob(1, 'pend-1')
+      const task = new TaskItemImpl(job)
+
+      mockDeleteItem.mockResolvedValue(undefined)
+      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
+      mockGetHistory.mockResolvedValue([])
+
+      await store.delete(task)
+
+      expect(mockGetQueue).toHaveBeenCalled()
+      expect(mockGetHistory).toHaveBeenCalled()
+    })
+  })
+
+  describe('update deduplication', () => {
+    it('should discard stale responses when newer request completes first', async () => {
+      let resolveFirst: QueueResolver
+      let resolveSecond: QueueResolver
+
+      const firstQueuePromise = new Promise<QueueResponse>((resolve) => {
+        resolveFirst = resolve
+      })
+      const secondQueuePromise = new Promise<QueueResponse>((resolve) => {
+        resolveSecond = resolve
+      })
+
+      mockGetHistory.mockResolvedValue([])
+
+      mockGetQueue
+        .mockReturnValueOnce(firstQueuePromise)
+        .mockReturnValueOnce(secondQueuePromise)
+
+      const firstUpdate = store.update()
+      const secondUpdate = store.update()
+
+      resolveSecond!({ Running: [], Pending: [createPendingJob(2, 'new-job')] })
+      await secondUpdate
+
+      expect(store.pendingTasks).toHaveLength(1)
+      expect(store.pendingTasks[0].jobId).toBe('new-job')
+
+      resolveFirst!({
+        Running: [],
+        Pending: [createPendingJob(1, 'stale-job')]
+      })
+      await firstUpdate
+
+      expect(store.pendingTasks).toHaveLength(1)
+      expect(store.pendingTasks[0].jobId).toBe('new-job')
+    })
+
+    it('should set isLoading to false only for the latest request', async () => {
+      let resolveFirst: QueueResolver
+      let resolveSecond: QueueResolver
+
+      const firstQueuePromise = new Promise<QueueResponse>((resolve) => {
+        resolveFirst = resolve
+      })
+      const secondQueuePromise = new Promise<QueueResponse>((resolve) => {
+        resolveSecond = resolve
+      })
+
+      mockGetHistory.mockResolvedValue([])
+
+      mockGetQueue
+        .mockReturnValueOnce(firstQueuePromise)
+        .mockReturnValueOnce(secondQueuePromise)
+
+      const firstUpdate = store.update()
+      expect(store.isLoading).toBe(true)
+
+      const secondUpdate = store.update()
+      expect(store.isLoading).toBe(true)
+
+      resolveSecond!({ Running: [], Pending: [] })
+      await secondUpdate
+
+      expect(store.isLoading).toBe(false)
+
+      resolveFirst!({ Running: [], Pending: [] })
+      await firstUpdate
+
+      expect(store.isLoading).toBe(false)
+    })
+
+    it('should handle stale request failure without affecting latest state', async () => {
+      let resolveSecond: QueueResolver
+
+      const secondQueuePromise = new Promise<QueueResponse>((resolve) => {
+        resolveSecond = resolve
+      })
+
+      mockGetHistory.mockResolvedValue([])
+
+      mockGetQueue
+        .mockRejectedValueOnce(new Error('stale network error'))
+        .mockReturnValueOnce(secondQueuePromise)
+
+      const firstUpdate = store.update()
+      const secondUpdate = store.update()
+
+      resolveSecond!({ Running: [], Pending: [createPendingJob(2, 'new-job')] })
+      await secondUpdate
+
+      expect(store.pendingTasks).toHaveLength(1)
+      expect(store.pendingTasks[0].jobId).toBe('new-job')
+      expect(store.isLoading).toBe(false)
+
+      await expect(firstUpdate).rejects.toThrow('stale network error')
+
+      expect(store.pendingTasks).toHaveLength(1)
+      expect(store.pendingTasks[0].jobId).toBe('new-job')
+      expect(store.isLoading).toBe(false)
+    })
+  })
+})
diff --git a/src/stores/queueStore.ts b/src/stores/queueStore.ts
index c7e17c1a05..b5a2af67d6 100644
--- a/src/stores/queueStore.ts
+++ b/src/stores/queueStore.ts
@@ -2,33 +2,28 @@ import _ from 'es-toolkit/compat'
 import { defineStore } from 'pinia'
 import { computed, ref, shallowRef, toRaw, toValue } from 'vue'
 
-import { isCloud } from '@/platform/distribution/types'
-import { reconcileHistory } from '@/platform/remote/comfyui/history/reconciliation'
-import { getWorkflowFromHistory } from '@/platform/workflow/cloud'
+import { extractWorkflow } from '@/platform/remote/comfyui/jobs/fetchJobs'
 import type {
-  ComfyWorkflowJSON,
-  NodeId
-} from '@/platform/workflow/validation/schemas/workflowSchema'
+  APITaskType,
+  JobListItem,
+  TaskType
+} from '@/platform/remote/comfyui/jobs/jobTypes'
+import type { NodeId } from '@/platform/workflow/validation/schemas/workflowSchema'
 import type {
-  HistoryTaskItem,
   ResultItem,
   StatusWsMessageStatus,
-  TaskItem,
-  TaskOutput,
-  TaskPrompt,
-  TaskStatus,
-  TaskType
+  TaskOutput
 } from '@/schemas/apiSchema'
+import { appendCloudResParam } from '@/platform/distribution/cloudPreviewUtil'
 import { api } from '@/scripts/api'
 import type { ComfyApp } from '@/scripts/app'
 import { useExtensionService } from '@/services/extensionService'
-import { useNodeOutputStore } from '@/stores/imagePreviewStore'
+import { getJobDetail } from '@/services/jobOutputCache'
+import { useNodeOutputStore } from '@/stores/nodeOutputStore'
 import { useExecutionStore } from '@/stores/executionStore'
+import { useSettingStore } from '@/platform/settings/settingStore'
 import { getMediaTypeFromFilename } from '@/utils/formatUtil'
 
-// Task type used in the API.
-type APITaskType = 'queue' | 'history'
-
 enum TaskItemDisplayStatus {
   Running = 'Running',
   Pending = 'Pending',
@@ -37,6 +32,13 @@ enum TaskItemDisplayStatus {
   Cancelled = 'Cancelled'
 }
 
+interface ResultItemInit extends ResultItem {
+  nodeId: NodeId
+  mediaType: string
+  format?: string
+  frame_rate?: number
+}
+
 export class ResultItemImpl {
   filename: string
   subfolder: string
@@ -50,7 +52,7 @@ export class ResultItemImpl {
   format?: string
   frame_rate?: number
 
-  constructor(obj: Record<string, any>) {
+  constructor(obj: ResultItemInit) {
     this.filename = obj.filename ?? ''
     this.subfolder = obj.subfolder ?? ''
     this.type = obj.type ?? ''
@@ -90,6 +92,13 @@ export class ResultItemImpl {
     return api.apiURL('/view?' + this.urlParams)
   }
 
+  get previewUrl(): string {
+    if (!this.isImage) return this.url
+    const params = new URLSearchParams(this.urlParams)
+    appendCloudResParam(params, this.filename)
+    return api.apiURL('/view?' + params)
+  }
+
   get urlWithTimestamp(): string {
     return `${this.url}&t=${+new Date()}`
   }
@@ -105,6 +114,9 @@ export class ResultItemImpl {
     if (this.isMp4) {
       return 'video/mp4'
     }
+    if (this.filename.endsWith('.mov')) {
+      return 'video/quicktime'
+    }
 
     if (this.isVhsFormat) {
       if (this.format?.endsWith('webm')) {
@@ -133,14 +145,6 @@ export class ResultItemImpl {
     return undefined
   }
 
-  get isGif(): boolean {
-    return this.filename.endsWith('.gif')
-  }
-
-  get isWebp(): boolean {
-    return this.filename.endsWith('.webp')
-  }
-
   get isWebm(): boolean {
     return this.filename.endsWith('.webm')
   }
@@ -150,11 +154,11 @@ export class ResultItemImpl {
   }
 
   get isVideoBySuffix(): boolean {
-    return this.isWebm || this.isMp4
+    return getMediaTypeFromFilename(this.filename) === 'video'
   }
 
   get isImageBySuffix(): boolean {
-    return this.isGif || this.isWebp
+    return getMediaTypeFromFilename(this.filename) === 'image'
   }
 
   get isMp3(): boolean {
@@ -174,7 +178,7 @@ export class ResultItemImpl {
   }
 
   get isAudioBySuffix(): boolean {
-    return this.isMp3 || this.isWav || this.isOgg || this.isFlac
+    return getMediaTypeFromFilename(this.filename) === 'audio'
   }
 
   get isVideo(): boolean {
@@ -211,32 +215,44 @@ export class ResultItemImpl {
   get supportsPreview(): boolean {
     return this.isImage || this.isVideo || this.isAudio || this.is3D
   }
+
+  static filterPreviewable(
+    outputs: readonly ResultItemImpl[]
+  ): ResultItemImpl[] {
+    return outputs.filter((o) => o.supportsPreview)
+  }
+
+  static findByUrl(items: readonly ResultItemImpl[], url?: string): number {
+    if (!url) return 0
+    const idx = items.findIndex((o) => o.url === url)
+    return idx >= 0 ? idx : 0
+  }
 }
 
 export class TaskItemImpl {
-  readonly taskType: TaskType
-  readonly prompt: TaskPrompt
-  readonly status?: TaskStatus
+  readonly job: JobListItem
   readonly outputs: TaskOutput
   readonly flatOutputs: ReadonlyArray<ResultItemImpl>
 
   constructor(
-    taskType: TaskType,
-    prompt: TaskPrompt,
-    status?: TaskStatus,
+    job: JobListItem,
     outputs?: TaskOutput,
     flatOutputs?: ReadonlyArray<ResultItemImpl>
   ) {
-    this.taskType = taskType
-    this.prompt = prompt
-    this.status = status
+    this.job = job
+    // If no outputs provided but job has preview_output, create synthetic outputs
+    // using the real nodeId and mediaType from the backend response
+    const effectiveOutputs =
+      outputs ??
+      (job.preview_output
+        ? {
+            [job.preview_output.nodeId]: {
+              [job.preview_output.mediaType]: [job.preview_output]
+            }
+          }
+        : {})
     // Remove animated outputs from the outputs object
-    // outputs.animated is an array of boolean values that indicates if the images
-    // array in the result are animated or not.
-    // The queueStore does not use this information.
-    // It is part of the legacy API response. We should redesign the backend API.
-    // https://github.com/Comfy-Org/ComfyUI_frontend/issues/2739
-    this.outputs = _.mapValues(outputs ?? {}, (nodeOutputs) =>
+    this.outputs = _.mapValues(effectiveOutputs, (nodeOutputs) =>
       _.omit(nodeOutputs, 'animated')
     )
     this.flatOutputs = flatOutputs ?? this.calculateFlatOutputs()
@@ -260,15 +276,31 @@ export class TaskItemImpl {
     )
   }
 
+  /** All outputs that support preview (images, videos, audio, 3D) */
+  get previewableOutputs(): readonly ResultItemImpl[] {
+    return ResultItemImpl.filterPreviewable(this.flatOutputs)
+  }
+
   get previewOutput(): ResultItemImpl | undefined {
+    const previewable = this.previewableOutputs
+    // Prefer saved media files over the temp previews
     return (
-      this.flatOutputs.find(
-        // Prefer saved media files over the temp previews
-        (output) => output.type === 'output' && output.supportsPreview
-      ) ?? this.flatOutputs.find((output) => output.supportsPreview)
+      previewable.find((output) => output.type === 'output') ?? previewable[0]
     )
   }
 
+  // Derive taskType from job status
+  get taskType(): TaskType {
+    switch (this.job.status) {
+      case 'in_progress':
+        return 'Running'
+      case 'pending':
+        return 'Pending'
+      default:
+        return 'History'
+    }
+  }
+
   get apiTaskType(): APITaskType {
     switch (this.taskType) {
       case 'Running':
@@ -280,65 +312,42 @@ export class TaskItemImpl {
   }
 
   get key() {
-    return this.promptId + this.displayStatus
+    return this.jobId + this.displayStatus
   }
 
-  get queueIndex() {
-    return this.prompt[0]
+  get jobId() {
+    return this.job.id
   }
 
-  get promptId() {
-    return this.prompt[1]
+  get outputsCount(): number | undefined {
+    return this.job.outputs_count ?? undefined
   }
 
-  get promptInputs() {
-    return this.prompt[2]
+  get status() {
+    return this.job.status
   }
 
-  get extraData() {
-    return this.prompt[3]
+  get errorMessage(): string | undefined {
+    return this.job.execution_error?.exception_message ?? undefined
   }
 
-  get outputsToExecute() {
-    return this.prompt[4]
+  get executionError() {
+    return this.job.execution_error ?? undefined
   }
 
-  get extraPngInfo() {
-    return this.extraData.extra_pnginfo
+  get workflowId(): string | undefined {
+    return this.job.workflow_id ?? undefined
   }
 
-  get clientId() {
-    return this.extraData.client_id
+  get createTime(): number {
+    return this.job.create_time
   }
 
-  get workflow(): ComfyWorkflowJSON | undefined {
-    return this.extraPngInfo?.workflow
-  }
-
-  get messages() {
-    return this.status?.messages || []
-  }
-
-  /**
-   * Server-provided creation time in milliseconds, when available.
-   *
-   * Sources:
-   * - Queue: 5th tuple element may be a metadata object with { create_time }.
-   * - History (Cloud V2): Adapter injects create_time into prompt[3].extra_data.
-   */
-  get createTime(): number | undefined {
-    const extra = (this.extraData as any) || {}
-    const fromExtra =
-      typeof extra.create_time === 'number' ? extra.create_time : undefined
-    if (typeof fromExtra === 'number') return fromExtra
-
-    return undefined
-  }
-
-  get interrupted() {
-    return _.some(
-      this.messages,
-      (message) => message[0] === 'execution_interrupted'
+  get interrupted(): boolean {
+    return (
+      this.job.status === 'failed' &&
+      this.job.execution_error?.exception_type ===
+        'InterruptProcessingException'
     )
   }
 
@@ -351,42 +360,26 @@ export class TaskItemImpl {
   }
 
   get displayStatus(): TaskItemDisplayStatus {
-    switch (this.taskType) {
-      case 'Running':
+    switch (this.job.status) {
+      case 'in_progress':
         return TaskItemDisplayStatus.Running
-      case 'Pending':
+      case 'pending':
         return TaskItemDisplayStatus.Pending
-      case 'History':
-        if (this.interrupted) return TaskItemDisplayStatus.Cancelled
-
-        switch (this.status!.status_str) {
-          case 'success':
-            return TaskItemDisplayStatus.Completed
-          case 'error':
-            return TaskItemDisplayStatus.Failed
-        }
+      case 'completed':
+        return TaskItemDisplayStatus.Completed
+      case 'failed':
+        return TaskItemDisplayStatus.Failed
+      case 'cancelled':
+        return TaskItemDisplayStatus.Cancelled
     }
   }
 
   get executionStartTimestamp() {
-    const message = this.messages.find(
-      (message) => message[0] === 'execution_start'
-    )
-    return message ? message[1].timestamp : undefined
+    return this.job.execution_start_time ?? undefined
   }
 
   get executionEndTimestamp() {
-    const messages = this.messages.filter((message) =>
-      [
-        'execution_success',
-        'execution_interrupted',
-        'execution_error'
-      ].includes(message[0])
-    )
-    if (!messages.length) {
-      return undefined
-    }
-    return _.max(messages.map((message) => message[1].timestamp))
+    return this.job.execution_end_time ?? undefined
   }
 
   get executionTime() {
@@ -402,28 +395,48 @@ export class TaskItemImpl {
       : undefined
   }
 
-  public async loadWorkflow(app: ComfyApp) {
-    let workflowData = this.workflow
+  /**
+   * Loads full outputs for tasks that only have preview data
+   * Returns a new TaskItemImpl with full outputs and execution status
+   */
+  public async loadFullOutputs(): Promise<TaskItemImpl> {
+    // Only load for history tasks (caller checks outputsCount > 1)
+    if (!this.isHistory) {
+      return this
+    }
+    const jobDetail = await getJobDetail(this.jobId)
 
-    if (isCloud && !workflowData && this.isHistory) {
-      workflowData = await getWorkflowFromHistory(
-        (url) => app.api.fetchApi(url),
-        this.promptId
-      )
+    if (!jobDetail?.outputs) {
+      return this
     }
 
+    // Create new TaskItemImpl with full outputs
+    return new TaskItemImpl(this.job, jobDetail.outputs)
+  }
+
+  public async loadWorkflow(app: ComfyApp) {
+    if (!this.isHistory) {
+      return
+    }
+
+    // Single fetch for both workflow and outputs (with caching)
+    const jobDetail = await getJobDetail(this.jobId)
+
+    const workflowData = await extractWorkflow(jobDetail)
     if (!workflowData) {
       return
     }
 
     await app.loadGraphData(toRaw(workflowData))
 
-    if (!this.outputs) {
+    // Use full outputs from job detail, or fall back to existing outputs
+    const outputsToLoad = jobDetail?.outputs ?? this.outputs
+    if (!outputsToLoad) {
       return
     }
 
     const nodeOutputsStore = useNodeOutputStore()
-    const rawOutputs = toRaw(this.outputs)
+    const rawOutputs = toRaw(outputsToLoad)
     for (const nodeExecutionId in rawOutputs) {
       nodeOutputsStore.setNodeOutputsByExecutionId(
         nodeExecutionId,
@@ -444,15 +457,10 @@ export class TaskItemImpl {
     return this.flatOutputs.map(
       (output: ResultItemImpl, i: number) =>
         new TaskItemImpl(
-          this.taskType,
-          [
-            this.queueIndex,
-            `${this.promptId}-${i}`,
-            this.promptInputs,
-            this.extraData,
-            this.outputsToExecute
-          ],
-          this.status,
+          {
+            ...this.job,
+            id: `${this.jobId}-${i}`
+          },
           {
             [output.nodeId]: {
               [output.mediaType]: [output]
@@ -462,41 +470,21 @@ export class TaskItemImpl {
         )
     )
   }
-
-  public toTaskItem(): TaskItem {
-    const item: HistoryTaskItem = {
-      taskType: 'History',
-      prompt: this.prompt,
-      status: this.status!,
-      outputs: this.outputs
-    }
-    return item
-  }
 }
 
-const sortNewestFirst = (a: TaskItemImpl, b: TaskItemImpl) =>
-  b.queueIndex - a.queueIndex
-
-const toTaskItemImpls = (tasks: TaskItem[]): TaskItemImpl[] =>
-  tasks.map(
-    (task) =>
-      new TaskItemImpl(
-        task.taskType,
-        task.prompt,
-        'status' in task ? task.status : undefined,
-        'outputs' in task ? task.outputs : undefined
-      )
-  )
-
 export const useQueueStore = defineStore('queue', () => {
   // Use shallowRef because TaskItemImpl instances are immutable and arrays are
   // replaced entirely (not mutated), so deep reactivity would waste performance
   const runningTasks = shallowRef<TaskItemImpl[]>([])
   const pendingTasks = shallowRef<TaskItemImpl[]>([])
   const historyTasks = shallowRef<TaskItemImpl[]>([])
+  const hasFetchedHistorySnapshot = ref(false)
   const maxHistoryItems = ref(64)
   const isLoading = ref(false)
 
+  // Scoped per-store instance; incremented to dedupe concurrent update() calls
+  let updateRequestId = 0
+
   const tasks = computed<TaskItemImpl[]>(
     () =>
       [
@@ -510,13 +498,17 @@ export const useQueueStore = defineStore('queue', () => {
     tasks.value.flatMap((task: TaskItemImpl) => task.flatten())
   )
 
-  const lastHistoryQueueIndex = computed<number>(() =>
-    historyTasks.value.length ? historyTasks.value[0].queueIndex : -1
+  const lastJobHistoryPriority = computed<number>(() =>
+    historyTasks.value.length ? historyTasks.value[0].job.priority : -1
   )
 
   const hasPendingTasks = computed<boolean>(() => pendingTasks.value.length > 0)
+  const activeJobsCount = computed(
+    () => pendingTasks.value.length + runningTasks.value.length
+  )
 
   const update = async () => {
+    const requestId = ++updateRequestId
     isLoading.value = true
     try {
       const [queue, history] = await Promise.all([
@@ -524,42 +516,72 @@ export const useQueueStore = defineStore('queue', () => {
         api.getHistory(maxHistoryItems.value)
       ])
 
-      runningTasks.value = toTaskItemImpls(queue.Running).sort(sortNewestFirst)
-      pendingTasks.value = toTaskItemImpls(queue.Pending).sort(sortNewestFirst)
+      if (requestId !== updateRequestId) return
+
+      // 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 promptIdString = String(task.promptId)
-        const workflowId = task.workflow?.id
-        if (workflowId && promptIdString) {
-          executionStore.registerPromptWorkflowIdMapping(
-            promptIdString,
-            workflowId
-          )
+        const jobIdString = String(task.jobId)
+        const workflowId = task.workflowId
+        if (workflowId && jobIdString) {
+          executionStore.registerJobWorkflowIdMapping(jobIdString, workflowId)
         }
       })
 
-      const items = reconcileHistory(
-        history.History,
-        currentHistory.map((impl) => impl.toTaskItem()),
-        toValue(maxHistoryItems),
-        toValue(lastHistoryQueueIndex)
-      )
+      // 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)
+      }
+
+      // 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))
 
       // Reuse existing TaskItemImpl instances or create new
-      const existingByPromptId = new Map(
-        currentHistory.map((impl) => [impl.promptId, impl])
+      // Must recreate if outputs_count changed (e.g., API started returning it)
+      const existingByJobId = new Map(
+        currentHistory.map((impl) => [impl.jobId, impl])
       )
 
-      historyTasks.value = items.map(
-        (item) =>
-          existingByPromptId.get(item.prompt[1]) ?? toTaskItemImpls([item])[0]
-      )
+      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
+      }
+      hasFetchedHistorySnapshot.value = true
     } finally {
-      isLoading.value = false
+      // Only clear loading if this is the latest request.
+      // A stale request completing (success or error) should not touch loading state
+      // since a newer request is responsible for it.
+      if (requestId === updateRequestId) {
+        isLoading.value = false
+      }
     }
   }
 
@@ -574,7 +596,7 @@ export const useQueueStore = defineStore('queue', () => {
   }
 
   const deleteTask = async (task: TaskItemImpl) => {
-    await api.deleteItem(task.apiTaskType, task.promptId)
+    await api.deleteItem(task.apiTaskType, task.jobId)
     await update()
   }
 
@@ -582,13 +604,15 @@ export const useQueueStore = defineStore('queue', () => {
     runningTasks,
     pendingTasks,
     historyTasks,
+    hasFetchedHistorySnapshot,
     maxHistoryItems,
     isLoading,
 
     tasks,
     flatTasks,
-    lastHistoryQueueIndex,
+    lastJobHistoryPriority,
     hasPendingTasks,
+    activeJobsCount,
 
     update,
     clear,
@@ -610,7 +634,20 @@ export const useQueuePendingTaskCountStore = defineStore(
   }
 )
 
-export type AutoQueueMode = 'disabled' | 'instant' | 'change'
+export type AutoQueueMode =
+  | 'disabled'
+  | 'change'
+  | 'instant-idle'
+  | 'instant-running'
+
+export const isInstantMode = (
+  mode: AutoQueueMode
+): mode is 'instant-idle' | 'instant-running' =>
+  mode === 'instant-idle' || mode === 'instant-running'
+
+export const isInstantRunningMode = (
+  mode: AutoQueueMode
+): mode is 'instant-running' => mode === 'instant-running'
 
 export const useQueueSettingsStore = defineStore('queueSettingsStore', {
   state: () => ({
@@ -620,7 +657,12 @@ export const useQueueSettingsStore = defineStore('queueSettingsStore', {
 })
 
 export const useQueueUIStore = defineStore('queueUIStore', () => {
-  const isOverlayExpanded = ref(false)
+  const settingStore = useSettingStore()
+
+  const isOverlayExpanded = computed({
+    get: () => settingStore.get('Comfy.Queue.History.Expanded'),
+    set: (value) => settingStore.set('Comfy.Queue.History.Expanded', value)
+  })
 
   function toggleOverlay() {
     isOverlayExpanded.value = !isOverlayExpanded.value
diff --git a/tests-ui/tests/store/serverConfigStore.test.ts b/src/stores/serverConfigStore.test.ts
similarity index 91%
rename from tests-ui/tests/store/serverConfigStore.test.ts
rename to src/stores/serverConfigStore.test.ts
index dd25c5b648..dda26cfae5 100644
--- a/tests-ui/tests/store/serverConfigStore.test.ts
+++ b/src/stores/serverConfigStore.test.ts
@@ -1,7 +1,8 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it } from 'vitest'
 
-import type { ServerConfig } from '@/constants/serverConfig'
+import type { ServerConfig, ServerConfigValue } from '@/constants/serverConfig'
 import type { FormItem } from '@/platform/settings/types'
 import { useServerConfigStore } from '@/stores/serverConfigStore'
 
@@ -14,7 +15,7 @@ describe('useServerConfigStore', () => {
   let store: ReturnType<typeof useServerConfigStore>
 
   beforeEach(() => {
-    setActivePinia(createPinia())
+    setActivePinia(createTestingPinia({ stubActions: false }))
     store = useServerConfigStore()
   })
 
@@ -27,7 +28,7 @@ describe('useServerConfigStore', () => {
   })
 
   it('should load server configs with default values', () => {
-    const configs: ServerConfig<any>[] = [
+    const configs: ServerConfig<ServerConfigValue>[] = [
       {
         ...dummyFormItem,
         id: 'test.config1',
@@ -49,7 +50,7 @@ describe('useServerConfigStore', () => {
   })
 
   it('should load server configs with provided values', () => {
-    const configs: ServerConfig<any>[] = [
+    const configs: ServerConfig<ServerConfigValue>[] = [
       {
         ...dummyFormItem,
         id: 'test.config1',
@@ -67,7 +68,7 @@ describe('useServerConfigStore', () => {
   })
 
   it('should organize configs by category', () => {
-    const configs: ServerConfig<any>[] = [
+    const configs: ServerConfig<ServerConfigValue>[] = [
       {
         ...dummyFormItem,
         id: 'test.config1',
@@ -96,7 +97,7 @@ describe('useServerConfigStore', () => {
   })
 
   it('should generate server config values excluding defaults', () => {
-    const configs: ServerConfig<any>[] = [
+    const configs: ServerConfig<ServerConfigValue>[] = [
       {
         ...dummyFormItem,
         id: 'test.config1',
@@ -120,12 +121,12 @@ describe('useServerConfigStore', () => {
   })
 
   it('should generate launch arguments with custom getValue function', () => {
-    const configs: ServerConfig<any>[] = [
+    const configs: ServerConfig<ServerConfigValue>[] = [
       {
         ...dummyFormItem,
         id: 'test.config1',
         defaultValue: 'default1',
-        getValue: (value: string) => ({ customArg: value })
+        getValue: (value: ServerConfigValue) => ({ customArg: value })
       },
       {
         ...dummyFormItem,
@@ -145,7 +146,7 @@ describe('useServerConfigStore', () => {
   })
 
   it('should not include default values in launch arguments', () => {
-    const configs: ServerConfig<any>[] = [
+    const configs: ServerConfig<ServerConfigValue>[] = [
       {
         ...dummyFormItem,
         id: 'test.config1',
@@ -169,7 +170,7 @@ describe('useServerConfigStore', () => {
   })
 
   it('should not include nullish values in launch arguments', () => {
-    const configs: ServerConfig<any>[] = [
+    const configs: ServerConfig<ServerConfigValue>[] = [
       { ...dummyFormItem, id: 'test.config1', defaultValue: 'default1' },
       { ...dummyFormItem, id: 'test.config2', defaultValue: 'default2' },
       { ...dummyFormItem, id: 'test.config3', defaultValue: 'default3' },
diff --git a/tests-ui/tests/store/subgraphNavigationStore.test.ts b/src/stores/subgraphNavigationStore.test.ts
similarity index 80%
rename from tests-ui/tests/store/subgraphNavigationStore.test.ts
rename to src/stores/subgraphNavigationStore.test.ts
index d7753bb0c8..6741778dcc 100644
--- a/tests-ui/tests/store/subgraphNavigationStore.test.ts
+++ b/src/stores/subgraphNavigationStore.test.ts
@@ -1,4 +1,5 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { nextTick } from 'vue'
 
@@ -6,6 +7,9 @@ import { useWorkflowStore } from '@/platform/workflow/management/stores/workflow
 import type { ComfyWorkflow } from '@/platform/workflow/management/stores/workflowStore'
 import { app } from '@/scripts/app'
 import { useSubgraphNavigationStore } from '@/stores/subgraphNavigationStore'
+import { createMockChangeTracker } from '@/utils/__tests__/litegraphTestUtils'
+
+import type { Subgraph } from '@/lib/litegraph/src/LGraph'
 
 vi.mock('@/scripts/app', () => {
   const mockCanvas = {
@@ -36,7 +40,7 @@ vi.mock('@/scripts/app', () => {
 
 vi.mock('@/renderer/core/canvas/canvasStore', () => ({
   useCanvasStore: () => ({
-    getCanvas: () => (app as any).canvas
+    getCanvas: () => app.canvas
   })
 }))
 
@@ -46,7 +50,7 @@ vi.mock('@/utils/graphTraversalUtil', () => ({
 
 describe('useSubgraphNavigationStore', () => {
   beforeEach(() => {
-    setActivePinia(createPinia())
+    setActivePinia(createTestingPinia({ stubActions: false }))
   })
 
   it('should not clear navigation stack when workflow internal state changes', async () => {
@@ -61,7 +65,8 @@ describe('useSubgraphNavigationStore', () => {
     } as ComfyWorkflow
 
     // Set the active workflow (cast to bypass TypeScript check in test)
-    workflowStore.activeWorkflow = mockWorkflow as any
+    workflowStore.activeWorkflow =
+      mockWorkflow as typeof workflowStore.activeWorkflow
 
     // Simulate being in a subgraph by restoring state
     navigationStore.restoreState(['subgraph-1', 'subgraph-2'])
@@ -70,7 +75,9 @@ describe('useSubgraphNavigationStore', () => {
 
     // Simulate a change to the workflow's internal state
     // (e.g., changeTracker.activeState being reassigned)
-    mockWorkflow.changeTracker = { activeState: {} } as any
+    mockWorkflow.changeTracker = {
+      activeState: {}
+    } as typeof mockWorkflow.changeTracker
 
     // The navigation stack should NOT be cleared because the path hasn't changed
     expect(navigationStore.exportState()).toHaveLength(2)
@@ -85,14 +92,15 @@ describe('useSubgraphNavigationStore', () => {
     const workflow1 = {
       path: 'workflow1.json',
       filename: 'workflow1.json',
-      changeTracker: {
+      changeTracker: createMockChangeTracker({
         restore: vi.fn(),
         store: vi.fn()
-      }
-    } as unknown as ComfyWorkflow
+      })
+    } as Partial<ComfyWorkflow> as ComfyWorkflow
 
     // Set the active workflow
-    workflowStore.activeWorkflow = workflow1 as any
+    workflowStore.activeWorkflow =
+      workflow1 as typeof workflowStore.activeWorkflow
 
     // Simulate the restore process that happens when loading a workflow
     // Since subgraphState is private, we'll simulate the effect by directly restoring navigation
@@ -106,13 +114,14 @@ describe('useSubgraphNavigationStore', () => {
     const workflow2 = {
       path: 'workflow2.json',
       filename: 'workflow2.json',
-      changeTracker: {
+      changeTracker: createMockChangeTracker({
         restore: vi.fn(),
         store: vi.fn()
-      }
-    } as unknown as ComfyWorkflow
+      })
+    } as Partial<ComfyWorkflow> as ComfyWorkflow
 
-    workflowStore.activeWorkflow = workflow2 as any
+    workflowStore.activeWorkflow =
+      workflow2 as typeof workflowStore.activeWorkflow
 
     // Simulate the restore process for workflow2
     // Since subgraphState is private, we'll simulate the effect by directly restoring navigation
@@ -122,7 +131,8 @@ describe('useSubgraphNavigationStore', () => {
     expect(navigationStore.exportState()).toHaveLength(0)
 
     // Switch back to workflow1
-    workflowStore.activeWorkflow = workflow1 as any
+    workflowStore.activeWorkflow =
+      workflow1 as typeof workflowStore.activeWorkflow
 
     // Simulate the restore process for workflow1 again
     // Since subgraphState is private, we'll simulate the effect by directly restoring navigation
@@ -141,13 +151,13 @@ describe('useSubgraphNavigationStore', () => {
     // Create mock subgraph and graph structure
     const mockSubgraph = {
       id: 'subgraph-1',
-      rootGraph: (app as any).graph,
+      rootGraph: app.graph,
       _nodes: [],
       nodes: []
-    }
+    } as Partial<Subgraph> as Subgraph
 
     // Add the subgraph to the graph's subgraphs map
-    ;(app as any).graph.subgraphs.set('subgraph-1', mockSubgraph)
+    app.graph.subgraphs.set('subgraph-1', mockSubgraph)
 
     // First set an active workflow
     const mockWorkflow = {
@@ -155,13 +165,14 @@ describe('useSubgraphNavigationStore', () => {
       filename: 'test-workflow.json'
     } as ComfyWorkflow
 
-    workflowStore.activeWorkflow = mockWorkflow as any
+    workflowStore.activeWorkflow =
+      mockWorkflow as typeof workflowStore.activeWorkflow
 
     // Mock findSubgraphPathById to return the correct path
     vi.mocked(findSubgraphPathById).mockReturnValue(['subgraph-1'])
 
     // Set canvas.subgraph and trigger update to set activeSubgraph
-    ;(app as any).canvas.subgraph = mockSubgraph
+    app.canvas.subgraph = mockSubgraph
     workflowStore.updateActiveGraph()
 
     // Wait for Vue's reactivity to process the change
@@ -172,7 +183,7 @@ describe('useSubgraphNavigationStore', () => {
     expect(navigationStore.exportState()).toEqual(['subgraph-1'])
 
     // Clear canvas.subgraph and trigger update (simulating navigating back to root)
-    ;(app as any).canvas.subgraph = null
+    app.canvas.subgraph = undefined
     workflowStore.updateActiveGraph()
 
     // Wait for Vue's reactivity to process the change
diff --git a/tests-ui/tests/store/subgraphNavigationStore.viewport.test.ts b/src/stores/subgraphNavigationStore.viewport.test.ts
similarity index 88%
rename from tests-ui/tests/store/subgraphNavigationStore.viewport.test.ts
rename to src/stores/subgraphNavigationStore.viewport.test.ts
index 6dbf85a6b9..2e7243f669 100644
--- a/tests-ui/tests/store/subgraphNavigationStore.viewport.test.ts
+++ b/src/stores/subgraphNavigationStore.viewport.test.ts
@@ -1,12 +1,18 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { nextTick } from 'vue'
 
+import type { LGraph, Subgraph } from '@/lib/litegraph/src/litegraph'
 import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
 import type { ComfyWorkflow } from '@/platform/workflow/management/stores/workflowStore'
 import { app } from '@/scripts/app'
 import { useSubgraphNavigationStore } from '@/stores/subgraphNavigationStore'
 
+const { mockSetDirty } = vi.hoisted(() => ({
+  mockSetDirty: vi.fn()
+}))
+
 vi.mock('@/scripts/app', () => {
   const mockCanvas = {
     subgraph: null,
@@ -18,7 +24,7 @@ vi.mock('@/scripts/app', () => {
         offset: [0, 0]
       }
     },
-    setDirty: vi.fn()
+    setDirty: mockSetDirty
   }
 
   return {
@@ -37,22 +43,22 @@ vi.mock('@/scripts/app', () => {
 // Mock canvasStore
 vi.mock('@/renderer/core/canvas/canvasStore', () => ({
   useCanvasStore: () => ({
-    getCanvas: () => (app as any).canvas
+    getCanvas: () => app.canvas
   })
 }))
 
 // Get reference to mock canvas
-const mockCanvas = app.canvas as any
+const mockCanvas = app.canvas
 
 describe('useSubgraphNavigationStore - Viewport Persistence', () => {
   beforeEach(() => {
-    setActivePinia(createPinia())
+    setActivePinia(createTestingPinia({ stubActions: false }))
     // Reset canvas state
     mockCanvas.ds.scale = 1
     mockCanvas.ds.offset = [0, 0]
     mockCanvas.ds.state.scale = 1
     mockCanvas.ds.state.offset = [0, 0]
-    mockCanvas.setDirty.mockClear()
+    mockSetDirty.mockClear()
   })
 
   describe('saveViewport', () => {
@@ -98,7 +104,7 @@ describe('useSubgraphNavigationStore - Viewport Persistence', () => {
 
       // Mock being in a subgraph
       const mockSubgraph = { id: 'sub-456' }
-      workflowStore.activeSubgraph = mockSubgraph as any
+      workflowStore.activeSubgraph = mockSubgraph as Subgraph
 
       // Set viewport state
       mockCanvas.ds.state.scale = 3
@@ -158,7 +164,7 @@ describe('useSubgraphNavigationStore - Viewport Persistence', () => {
       // Reset canvas
       mockCanvas.ds.scale = 1
       mockCanvas.ds.offset = [0, 0]
-      mockCanvas.setDirty.mockClear()
+      mockSetDirty.mockClear()
 
       // Try to restore non-existent viewport
       navigationStore.restoreViewport('non-existent')
@@ -166,7 +172,7 @@ describe('useSubgraphNavigationStore - Viewport Persistence', () => {
       // Canvas should not change
       expect(mockCanvas.ds.scale).toBe(1)
       expect(mockCanvas.ds.offset).toEqual([0, 0])
-      expect(mockCanvas.setDirty).not.toHaveBeenCalled()
+      expect(mockSetDirty).not.toHaveBeenCalled()
     })
   })
 
@@ -181,7 +187,7 @@ describe('useSubgraphNavigationStore - Viewport Persistence', () => {
         nodes: [],
         subgraphs: new Map(),
         getNodeById: vi.fn()
-      }
+      } as Partial<LGraph> as LGraph
       const subgraph1 = {
         id: 'sub1',
         rootGraph: mockRootGraph,
@@ -194,7 +200,7 @@ describe('useSubgraphNavigationStore - Viewport Persistence', () => {
       mockCanvas.ds.state.offset = [100, 100]
 
       // Navigate to subgraph
-      workflowStore.activeSubgraph = subgraph1 as any
+      workflowStore.activeSubgraph = subgraph1 as Partial<Subgraph> as Subgraph
       await nextTick()
 
       // Root viewport should have been saved automatically
@@ -239,10 +245,14 @@ describe('useSubgraphNavigationStore - Viewport Persistence', () => {
       const workflow1 = { path: 'workflow1.json' } as ComfyWorkflow
       const workflow2 = { path: 'workflow2.json' } as ComfyWorkflow
 
-      workflowStore.activeWorkflow = workflow1 as any
+      workflowStore.activeWorkflow = workflow1 as ReturnType<
+        typeof useWorkflowStore
+      >['activeWorkflow']
       await nextTick()
 
-      workflowStore.activeWorkflow = workflow2 as any
+      workflowStore.activeWorkflow = workflow2 as ReturnType<
+        typeof useWorkflowStore
+      >['activeWorkflow']
       await nextTick()
 
       // Cache should be preserved (LRU will manage memory)
diff --git a/src/stores/subgraphStore.test.ts b/src/stores/subgraphStore.test.ts
new file mode 100644
index 0000000000..c79e4f67bf
--- /dev/null
+++ b/src/stores/subgraphStore.test.ts
@@ -0,0 +1,695 @@
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema'
+import type { GlobalSubgraphData } from '@/scripts/api'
+import type { ExportedSubgraph } from '@/lib/litegraph/src/types/serialisation'
+import { TemplateIncludeOnDistributionEnum } from '@/platform/workflow/templates/types/template'
+import { api } from '@/scripts/api'
+import { app as comfyApp } from '@/scripts/app'
+import { useLitegraphService } from '@/services/litegraphService'
+import { useNodeDefStore } from '@/stores/nodeDefStore'
+import { useSubgraphStore } from '@/stores/subgraphStore'
+
+import {
+  createTestSubgraph,
+  createTestSubgraphNode
+} from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers'
+import { createTestingPinia } from '@pinia/testing'
+
+const mockDistributionTypes = vi.hoisted(() => ({
+  isCloud: false,
+  isDesktop: false
+}))
+vi.mock('@/platform/distribution/types', () => mockDistributionTypes)
+
+// Mock telemetry to break circular dependency (telemetry → workflowStore → app → telemetry)
+vi.mock('@/platform/telemetry', () => ({
+  useTelemetry: () => null
+}))
+
+// Add mock for api at the top of the file
+vi.mock('@/scripts/api', () => ({
+  api: {
+    getUserData: vi.fn(),
+    storeUserData: vi.fn(),
+    listUserDataFullInfo: vi.fn(),
+    getGlobalSubgraphs: vi.fn(),
+    apiURL: vi.fn(),
+    addEventListener: vi.fn()
+  }
+}))
+vi.mock('@/services/dialogService', () => ({
+  useDialogService: vi.fn(() => ({
+    prompt: () => 'testname',
+    confirm: () => true
+  }))
+}))
+vi.mock('@/renderer/core/canvas/canvasStore', () => ({
+  useCanvasStore: vi.fn(() => ({
+    getCanvas: () => comfyApp.canvas
+  }))
+}))
+
+// Mock comfyApp globally for the store setup
+vi.mock('@/scripts/app', () => ({
+  app: {
+    canvas: {
+      _deserializeItems: vi.fn((i) => i),
+      ds: { visible_area: [0, 0, 0, 0] },
+      selected_nodes: null
+    },
+    loadGraphData: vi.fn()
+  }
+}))
+
+const mockGraph = {
+  nodes: [{ type: '123' }],
+  definitions: { subgraphs: [{ id: '123' }] }
+}
+
+describe('useSubgraphStore', () => {
+  let store: ReturnType<typeof useSubgraphStore>
+  async function mockFetch(
+    filenames: Record<string, unknown>,
+    globalSubgraphs: Record<string, GlobalSubgraphData> = {}
+  ) {
+    vi.mocked(api.listUserDataFullInfo).mockResolvedValue(
+      Object.keys(filenames).map((filename) => ({
+        path: filename,
+        modified: new Date().getTime(),
+        size: 1 // size !== -1 for remote workflows
+      }))
+    )
+    vi.mocked(api).getUserData = vi.fn((f) =>
+      Promise.resolve({
+        status: 200,
+        text: () => Promise.resolve(JSON.stringify(filenames[f.slice(10)]))
+      } as Response)
+    )
+    vi.mocked(api.getGlobalSubgraphs).mockResolvedValue(globalSubgraphs)
+    return await store.fetchSubgraphs()
+  }
+
+  beforeEach(() => {
+    mockDistributionTypes.isCloud = false
+    mockDistributionTypes.isDesktop = false
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    store = useSubgraphStore()
+    vi.clearAllMocks()
+  })
+
+  it('should allow publishing of a subgraph', async () => {
+    //mock canvas to provide a minimal subgraphNode
+    const subgraph = createTestSubgraph()
+    const subgraphNode = createTestSubgraphNode(subgraph)
+    const graph = subgraphNode.graph!
+    graph.add(subgraphNode)
+    vi.mocked(comfyApp.canvas).selectedItems = new Set([subgraphNode])
+    vi.mocked(comfyApp.canvas)._serializeItems = vi.fn(() => {
+      const serializedSubgraph = {
+        ...subgraph.serialize(),
+        links: [],
+        groups: [],
+        version: 1
+      } as Partial<ExportedSubgraph> as ExportedSubgraph
+      return {
+        nodes: [subgraphNode.serialize()],
+        subgraphs: [serializedSubgraph]
+      }
+    })
+    //mock saving of file
+    vi.mocked(api.storeUserData).mockResolvedValue({
+      status: 200,
+      json: () =>
+        Promise.resolve({
+          path: 'subgraphs/testname.json',
+          modified: Date.now(),
+          size: 2
+        })
+    } as Response)
+    await mockFetch({ 'testname.json': mockGraph })
+    //Dialogue service already mocked
+    await store.publishSubgraph()
+    expect(api.storeUserData).toHaveBeenCalled()
+  })
+  it('should display published nodes in the node library', async () => {
+    await mockFetch({ 'test.json': mockGraph })
+    expect(
+      useNodeDefStore().nodeDefs.filter(
+        (d) => d.category === 'Subgraph Blueprints/User'
+      )
+    ).toHaveLength(1)
+  })
+  it('should allow subgraphs to be edited', async () => {
+    await mockFetch({ 'test.json': mockGraph })
+    await store.editBlueprint(store.typePrefix + 'test')
+    //check active graph
+    expect(comfyApp.loadGraphData).toHaveBeenCalled()
+  })
+  it('should allow subgraphs to be added to graph', async () => {
+    //mock
+    await mockFetch({ 'test.json': mockGraph })
+    const res = useLitegraphService().addNodeOnGraph({
+      name: 'SubgraphBlueprint.test'
+    } as ComfyNodeDefV1)
+    expect(res).toBeTruthy()
+  })
+  it('should identify user blueprints as non-global', async () => {
+    await mockFetch({ 'test.json': mockGraph })
+    expect(store.isGlobalBlueprint('test')).toBe(false)
+  })
+  it('should identify global blueprints loaded from getGlobalSubgraphs', async () => {
+    await mockFetch(
+      {},
+      {
+        global_test: {
+          name: 'Global Test Blueprint',
+          info: { node_pack: 'comfy_essentials' },
+          data: JSON.stringify(mockGraph)
+        }
+      }
+    )
+    expect(store.isGlobalBlueprint('global_test')).toBe(true)
+  })
+  it('should return false for non-existent blueprints', async () => {
+    await mockFetch({ 'test.json': mockGraph })
+    expect(store.isGlobalBlueprint('nonexistent')).toBe(false)
+  })
+
+  describe('blueprint badge display', () => {
+    it('should set isGlobal flag on global blueprints', async () => {
+      await mockFetch(
+        {},
+        {
+          global_bp: {
+            name: 'Global Blueprint',
+            info: { node_pack: 'some-uuid-string' },
+            data: JSON.stringify(mockGraph)
+          }
+        }
+      )
+      const nodeDef = useNodeDefStore().nodeDefs.find(
+        (d) => d.name === 'SubgraphBlueprint.global_bp'
+      )
+      expect(nodeDef).toBeDefined()
+      expect(nodeDef?.isGlobal).toBe(true)
+    })
+
+    it('should not set isGlobal flag on user blueprints', async () => {
+      await mockFetch({ 'user-blueprint.json': mockGraph })
+      const nodeDef = useNodeDefStore().nodeDefs.find(
+        (d) => d.name === 'SubgraphBlueprint.user-blueprint'
+      )
+      expect(nodeDef).toBeDefined()
+      expect(nodeDef?.isGlobal).toBeUndefined()
+    })
+
+    it('should use blueprint python_module for global blueprints to show Blueprint badge', async () => {
+      await mockFetch(
+        {},
+        {
+          global_bp: {
+            name: 'Global Blueprint',
+            info: { node_pack: 'comfyui-ltx-video-0fbc55c6-long-uuid' },
+            data: JSON.stringify(mockGraph)
+          }
+        }
+      )
+      const nodeDef = useNodeDefStore().nodeDefs.find(
+        (d) => d.name === 'SubgraphBlueprint.global_bp'
+      )
+      expect(nodeDef).toBeDefined()
+      expect(nodeDef?.python_module).toBe('blueprint')
+      expect(nodeDef?.nodeSource.displayText).toBe('Blueprint')
+    })
+  })
+
+  it('should handle global blueprint with empty data gracefully', async () => {
+    const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
+    await mockFetch(
+      {},
+      {
+        broken_blueprint: {
+          name: 'Broken Blueprint',
+          info: { node_pack: 'test_pack' },
+          data: ''
+        }
+      }
+    )
+    expect(consoleSpy).toHaveBeenCalledWith(
+      'Failed to load subgraph blueprint',
+      expect.any(Error)
+    )
+    expect(store.subgraphBlueprints).toHaveLength(0)
+    consoleSpy.mockRestore()
+  })
+
+  it('should handle global blueprint with rejected data promise gracefully', async () => {
+    const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
+    await mockFetch(
+      {},
+      {
+        failing_blueprint: {
+          name: 'Failing Blueprint',
+          info: { node_pack: 'test_pack' },
+          data: Promise.reject(new Error('Network error')) as unknown as string
+        }
+      }
+    )
+    expect(consoleSpy).toHaveBeenCalledWith(
+      'Failed to load subgraph blueprint',
+      expect.any(Error)
+    )
+    expect(store.subgraphBlueprints).toHaveLength(0)
+    consoleSpy.mockRestore()
+  })
+
+  it('should load valid global blueprints even when others fail', async () => {
+    const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
+    await mockFetch(
+      {},
+      {
+        broken: {
+          name: 'Broken',
+          info: { node_pack: 'test_pack' },
+          data: ''
+        },
+        valid: {
+          name: 'Valid Blueprint',
+          info: { node_pack: 'test_pack' },
+          data: JSON.stringify(mockGraph)
+        }
+      }
+    )
+    expect(consoleSpy).toHaveBeenCalled()
+    expect(store.subgraphBlueprints).toHaveLength(1)
+    consoleSpy.mockRestore()
+  })
+
+  describe('search_aliases support', () => {
+    it('should include search_aliases from workflow extra', async () => {
+      const mockGraphWithAliases = {
+        nodes: [{ type: '123' }],
+        definitions: {
+          subgraphs: [{ id: '123' }]
+        },
+        extra: {
+          BlueprintSearchAliases: ['alias1', 'alias2', 'my workflow']
+        }
+      }
+      await mockFetch({ 'test-with-aliases.json': mockGraphWithAliases })
+
+      const nodeDef = useNodeDefStore().nodeDefs.find(
+        (d) => d.name === 'SubgraphBlueprint.test-with-aliases'
+      )
+      expect(nodeDef).toBeDefined()
+      expect(nodeDef?.search_aliases).toEqual([
+        'alias1',
+        'alias2',
+        'my workflow'
+      ])
+    })
+
+    it('should include search_aliases from global blueprint info', async () => {
+      await mockFetch(
+        {},
+        {
+          global_with_aliases: {
+            name: 'Global With Aliases',
+            info: {
+              node_pack: 'comfy_essentials',
+              search_aliases: ['global alias', 'test alias']
+            },
+            data: JSON.stringify(mockGraph)
+          }
+        }
+      )
+
+      const nodeDef = useNodeDefStore().nodeDefs.find(
+        (d) => d.name === 'SubgraphBlueprint.global_with_aliases'
+      )
+      expect(nodeDef).toBeDefined()
+      expect(nodeDef?.search_aliases).toEqual(['global alias', 'test alias'])
+    })
+
+    it('should not have search_aliases if not provided', async () => {
+      await mockFetch({ 'test.json': mockGraph })
+
+      const nodeDef = useNodeDefStore().nodeDefs.find(
+        (d) => d.name === 'SubgraphBlueprint.test'
+      )
+      expect(nodeDef).toBeDefined()
+      expect(nodeDef?.search_aliases).toBeUndefined()
+    })
+
+    it('should include description from workflow extra', async () => {
+      const mockGraphWithDescription = {
+        nodes: [{ type: '123' }],
+        definitions: {
+          subgraphs: [{ id: '123' }]
+        },
+        extra: {
+          BlueprintDescription: 'This is a test blueprint'
+        }
+      }
+      await mockFetch({
+        'test-with-description.json': mockGraphWithDescription
+      })
+
+      const nodeDef = useNodeDefStore().nodeDefs.find(
+        (d) => d.name === 'SubgraphBlueprint.test-with-description'
+      )
+      expect(nodeDef).toBeDefined()
+      expect(nodeDef?.description).toBe('This is a test blueprint')
+    })
+
+    it('should not duplicate metadata in both workflow extra and subgraph extra when publishing', async () => {
+      const subgraph = createTestSubgraph()
+      const subgraphNode = createTestSubgraphNode(subgraph)
+      const graph = subgraphNode.graph!
+      graph.add(subgraphNode)
+
+      // Set metadata on the subgraph's extra (as the commands do)
+      subgraph.extra = {
+        BlueprintDescription: 'Test description',
+        BlueprintSearchAliases: ['alias1', 'alias2']
+      }
+
+      vi.mocked(comfyApp.canvas).selectedItems = new Set([subgraphNode])
+      vi.mocked(comfyApp.canvas)._serializeItems = vi.fn(() => {
+        const serializedSubgraph = {
+          ...subgraph.serialize(),
+          links: [],
+          groups: [],
+          version: 1
+        } as Partial<ExportedSubgraph> as ExportedSubgraph
+        return {
+          nodes: [subgraphNode.serialize()],
+          subgraphs: [serializedSubgraph]
+        }
+      })
+
+      let savedWorkflowData: Record<string, unknown> | null = null
+      vi.mocked(api.storeUserData).mockImplementation(async (_path, data) => {
+        savedWorkflowData = JSON.parse(data as string)
+        return {
+          status: 200,
+          json: () =>
+            Promise.resolve({
+              path: 'subgraphs/testname.json',
+              modified: Date.now(),
+              size: 2
+            })
+        } as Response
+      })
+
+      await mockFetch({ 'testname.json': mockGraph })
+      await store.publishSubgraph()
+
+      expect(savedWorkflowData).not.toBeNull()
+
+      // Metadata should be in top-level extra
+      expect(savedWorkflowData!.extra).toEqual({
+        BlueprintDescription: 'Test description',
+        BlueprintSearchAliases: ['alias1', 'alias2']
+      })
+
+      // Metadata should NOT be in subgraph's extra
+      const definitions = savedWorkflowData!.definitions as {
+        subgraphs: Array<{ extra?: Record<string, unknown> }>
+      }
+      const subgraphExtra = definitions.subgraphs[0]?.extra
+      expect(subgraphExtra?.BlueprintDescription).toBeUndefined()
+      expect(subgraphExtra?.BlueprintSearchAliases).toBeUndefined()
+    })
+  })
+
+  describe('subgraph definition category', () => {
+    it('should use category from subgraph definition as default', async () => {
+      const mockGraphWithCategory = {
+        nodes: [{ type: '123' }],
+        definitions: {
+          subgraphs: [{ id: '123', category: 'Image Processing' }]
+        }
+      }
+      await mockFetch(
+        {},
+        {
+          categorized: {
+            name: 'Categorized Blueprint',
+            info: { node_pack: 'test_pack' },
+            data: JSON.stringify(mockGraphWithCategory)
+          }
+        }
+      )
+
+      const nodeDef = useNodeDefStore().nodeDefs.find(
+        (d) => d.name === 'SubgraphBlueprint.categorized'
+      )
+      expect(nodeDef).toBeDefined()
+      expect(nodeDef?.category).toBe('Subgraph Blueprints/Image Processing')
+    })
+
+    it('should use User override for user blueprints even with definition category', async () => {
+      const mockGraphWithCategory = {
+        nodes: [{ type: '123' }],
+        definitions: {
+          subgraphs: [{ id: '123', category: 'Image Processing' }]
+        }
+      }
+      await mockFetch({ 'user-bp.json': mockGraphWithCategory })
+
+      const nodeDef = useNodeDefStore().nodeDefs.find(
+        (d) => d.name === 'SubgraphBlueprint.user-bp'
+      )
+      expect(nodeDef).toBeDefined()
+      expect(nodeDef?.category).toBe('Subgraph Blueprints/User')
+    })
+
+    it('should fallback to bare Subgraph Blueprints when no category anywhere', async () => {
+      await mockFetch(
+        {},
+        {
+          no_cat_global: {
+            name: 'No Category Global',
+            info: { node_pack: 'test_pack' },
+            data: JSON.stringify(mockGraph)
+          }
+        }
+      )
+
+      const nodeDef = useNodeDefStore().nodeDefs.find(
+        (d) => d.name === 'SubgraphBlueprint.no_cat_global'
+      )
+      expect(nodeDef).toBeDefined()
+      expect(nodeDef?.category).toBe('Subgraph Blueprints')
+    })
+
+    it('should let overrides take precedence over definition category', async () => {
+      const mockGraphWithCategory = {
+        nodes: [{ type: '123' }],
+        definitions: {
+          subgraphs: [{ id: '123', category: 'Image Processing' }]
+        }
+      }
+      await mockFetch(
+        {},
+        {
+          bp_override: {
+            name: 'Override Blueprint',
+            info: {
+              node_pack: 'test_pack',
+              category: 'Custom Category'
+            },
+            data: JSON.stringify(mockGraphWithCategory)
+          }
+        }
+      )
+
+      const nodeDef = useNodeDefStore().nodeDefs.find(
+        (d) => d.name === 'SubgraphBlueprint.bp_override'
+      )
+      expect(nodeDef).toBeDefined()
+      expect(nodeDef?.category).toBe('Subgraph Blueprints/Custom Category')
+    })
+  })
+
+  describe('essentials_category passthrough', () => {
+    it('should prefer GlobalSubgraphData essentials_category over definition fallback', async () => {
+      const graphWithEssentials = {
+        ...mockGraph,
+        definitions: {
+          subgraphs: [
+            {
+              ...mockGraph.definitions?.subgraphs?.[0],
+              essentials_category: 'Image Tools'
+            }
+          ]
+        }
+      }
+      await mockFetch(
+        {},
+        {
+          bp_precedence: {
+            name: 'Precedence Blueprint',
+            info: { node_pack: 'test_pack' },
+            data: JSON.stringify(graphWithEssentials),
+            essentials_category: 'Video Generation'
+          }
+        }
+      )
+      const nodeDef = useNodeDefStore().nodeDefs.find(
+        (d) => d.name === 'SubgraphBlueprint.bp_precedence'
+      )
+      expect(nodeDef?.essentials_category).toBe('video generation')
+    })
+
+    it('should pass essentials_category from GlobalSubgraphData to node def', async () => {
+      await mockFetch(
+        {},
+        {
+          bp_essentials: {
+            name: 'Test Essentials Blueprint',
+            info: { node_pack: 'test_pack', category: 'Test Category' },
+            data: JSON.stringify(mockGraph),
+            essentials_category: 'Image Generation'
+          }
+        }
+      )
+      const nodeDef = useNodeDefStore().nodeDefs.find(
+        (d) => d.name === 'SubgraphBlueprint.bp_essentials'
+      )
+      expect(nodeDef).toBeDefined()
+      expect(nodeDef?.essentials_category).toBe('image generation')
+    })
+
+    it('should extract essentials_category from subgraph definition as fallback', async () => {
+      const graphWithEssentials = {
+        ...mockGraph,
+        definitions: {
+          subgraphs: [
+            {
+              ...mockGraph.definitions?.subgraphs?.[0],
+              essentials_category: 'Image Tools'
+            }
+          ]
+        }
+      }
+      await mockFetch(
+        {},
+        {
+          bp_fallback: {
+            name: 'Fallback Blueprint',
+            info: { node_pack: 'test_pack' },
+            data: JSON.stringify(graphWithEssentials)
+          }
+        }
+      )
+      const nodeDef = useNodeDefStore().nodeDefs.find(
+        (d) => d.name === 'SubgraphBlueprint.bp_fallback'
+      )
+      expect(nodeDef).toBeDefined()
+      expect(nodeDef?.essentials_category).toBe('image tools')
+    })
+
+    it('should normalize title-cased essentials_category to canonical form', async () => {
+      await mockFetch(
+        {},
+        {
+          bp_3d: {
+            name: 'Test 3D Blueprint',
+            info: { node_pack: 'test_pack', category: 'Test Category' },
+            data: JSON.stringify(mockGraph),
+            essentials_category: '3d'
+          }
+        }
+      )
+      const nodeDef = useNodeDefStore().nodeDefs.find(
+        (d) => d.name === 'SubgraphBlueprint.bp_3d'
+      )
+      expect(nodeDef).toBeDefined()
+      expect(nodeDef?.essentials_category).toBe('3D')
+    })
+  })
+
+  describe('global blueprint filtering', () => {
+    function globalBlueprint(
+      overrides: Partial<GlobalSubgraphData['info']> = {}
+    ): GlobalSubgraphData {
+      return {
+        name: 'Filtered Blueprint',
+        info: { node_pack: 'test_pack', ...overrides },
+        data: JSON.stringify(mockGraph)
+      }
+    }
+
+    it('should exclude blueprints with requiresCustomNodes on non-cloud', async () => {
+      await mockFetch(
+        {},
+        {
+          bp: globalBlueprint({ requiresCustomNodes: ['custom-node-pack'] })
+        }
+      )
+      expect(store.isGlobalBlueprint('bp')).toBe(false)
+    })
+
+    it('should include blueprints with requiresCustomNodes on cloud', async () => {
+      mockDistributionTypes.isCloud = true
+      await mockFetch(
+        {},
+        {
+          bp: globalBlueprint({ requiresCustomNodes: ['custom-node-pack'] })
+        }
+      )
+      expect(store.isGlobalBlueprint('bp')).toBe(true)
+    })
+
+    it('should include blueprints with empty requiresCustomNodes everywhere', async () => {
+      await mockFetch({}, { bp: globalBlueprint({ requiresCustomNodes: [] }) })
+      expect(store.isGlobalBlueprint('bp')).toBe(true)
+    })
+
+    it('should exclude blueprints whose includeOnDistributions does not match', async () => {
+      await mockFetch(
+        {},
+        {
+          bp: globalBlueprint({
+            includeOnDistributions: [TemplateIncludeOnDistributionEnum.Cloud]
+          })
+        }
+      )
+      expect(store.isGlobalBlueprint('bp')).toBe(false)
+    })
+
+    it('should include blueprints whose includeOnDistributions matches current distribution', async () => {
+      await mockFetch(
+        {},
+        {
+          bp: globalBlueprint({
+            includeOnDistributions: [TemplateIncludeOnDistributionEnum.Local]
+          })
+        }
+      )
+      expect(store.isGlobalBlueprint('bp')).toBe(true)
+    })
+
+    it('should include blueprints on desktop when includeOnDistributions has desktop', async () => {
+      mockDistributionTypes.isDesktop = true
+      await mockFetch(
+        {},
+        {
+          bp: globalBlueprint({
+            includeOnDistributions: [TemplateIncludeOnDistributionEnum.Desktop]
+          })
+        }
+      )
+      expect(store.isGlobalBlueprint('bp')).toBe(true)
+    })
+
+    it('should include blueprints with no filtering fields', async () => {
+      await mockFetch({}, { bp: globalBlueprint() })
+      expect(store.isGlobalBlueprint('bp')).toBe(true)
+    })
+  })
+})
diff --git a/src/stores/subgraphStore.ts b/src/stores/subgraphStore.ts
index 3c0456f2e3..2c6c4784c4 100644
--- a/src/stores/subgraphStore.ts
+++ b/src/stores/subgraphStore.ts
@@ -6,11 +6,9 @@ import { SubgraphNode } from '@/lib/litegraph/src/litegraph'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { useToastStore } from '@/platform/updates/common/toastStore'
 import { useWorkflowService } from '@/platform/workflow/core/services/workflowService'
-import type { LoadedComfyWorkflow } from '@/platform/workflow/management/stores/workflowStore'
-import {
-  ComfyWorkflow,
-  useWorkflowStore
-} from '@/platform/workflow/management/stores/workflowStore'
+import type { LoadedComfyWorkflow } from '@/platform/workflow/management/stores/comfyWorkflow'
+import { ComfyWorkflow } from '@/platform/workflow/management/stores/comfyWorkflow'
+import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
 import type {
   ComfyNode,
   ComfyWorkflowJSON,
@@ -22,10 +20,12 @@ import type {
   ComfyNodeDef as ComfyNodeDefV1,
   InputSpec
 } from '@/schemas/nodeDefSchema'
+import { isCloud, isDesktop } from '@/platform/distribution/types'
+import { TemplateIncludeOnDistributionEnum } from '@/platform/workflow/templates/types/template'
 import { api } from '@/scripts/api'
 import type { GlobalSubgraphData } from '@/scripts/api'
 import { useDialogService } from '@/services/dialogService'
-import { useExecutionStore } from '@/stores/executionStore'
+import { useExecutionErrorStore } from '@/stores/executionErrorStore'
 import { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
 import type { UserFile } from '@/stores/userFileStore'
 
@@ -79,7 +79,7 @@ export const useSubgraphStore = defineStore('subgraph', () => {
           dependent_outputs: []
         }
       }
-      useExecutionStore().lastNodeErrors = errors
+      useExecutionErrorStore().lastNodeErrors = errors
       useCanvasStore().getCanvas().draw(true, true)
       throw new Error(
         'The root graph of a subgraph blueprint must consist of only a single subgraph node'
@@ -95,16 +95,48 @@ export const useSubgraphStore = defineStore('subgraph', () => {
         if (!(await confirmOverwrite(this.filename))) return this
         this.hasPromptedSave = true
       }
+      // Extract metadata from subgraph.extra to workflow.extra before saving
+      this.extractMetadataToWorkflowExtra()
       const ret = await super.save()
-      useSubgraphStore().updateDef(await this.load())
+      // Force reload to update initialState with saved metadata
+      registerNodeDef(await this.load({ force: true }), {
+        category: 'Subgraph Blueprints/User'
+      })
       return ret
     }
 
+    /**
+     * Moves all properties (except workflowRendererVersion) from subgraph.extra
+     * to workflow.extra, then removes from subgraph.extra to avoid duplication.
+     */
+    private extractMetadataToWorkflowExtra(): void {
+      if (!this.activeState) return
+      const subgraph = this.activeState.definitions?.subgraphs?.[0]
+      if (!subgraph?.extra) return
+
+      const sgExtra = subgraph.extra as Record<string, unknown>
+      const workflowExtra = (this.activeState.extra ??= {}) as Record<
+        string,
+        unknown
+      >
+
+      for (const key of Object.keys(sgExtra)) {
+        if (key === 'workflowRendererVersion') continue
+        workflowExtra[key] = sgExtra[key]
+        delete sgExtra[key]
+      }
+    }
+
     override async saveAs(path: string) {
       this.validateSubgraph()
       this.hasPromptedSave = true
+      // Extract metadata from subgraph.extra to workflow.extra before saving
+      this.extractMetadataToWorkflowExtra()
       const ret = await super.saveAs(path)
-      useSubgraphStore().updateDef(await this.load())
+      // Force reload to update initialState with saved metadata
+      registerNodeDef(await this.load({ force: true }), {
+        category: 'Subgraph Blueprints/User'
+      })
       return ret
     }
     override async load({ force = false }: { force?: boolean } = {}): Promise<
@@ -121,12 +153,23 @@ export const useSubgraphStore = defineStore('subgraph', () => {
           'Loaded subgraph blueprint does not contain valid subgraph'
         )
       sg.name = st.nodes[0].title = this.filename
+
+      // Copy blueprint metadata from workflow extra to subgraph extra
+      // so it's available when editing via canvas.subgraph.extra
+      if (st.extra) {
+        const sgExtra = (sg.extra ??= {}) as Record<string, unknown>
+        for (const [key, value] of Object.entries(st.extra)) {
+          if (key === 'workflowRendererVersion') continue
+          sgExtra[key] = value
+        }
+      }
+
       return loaded
     }
     override async promptSave(): Promise<string | null> {
       return await useDialogService().prompt({
         title: t('subgraphStore.saveBlueprint'),
-        message: t('subgraphStore.blueprintName') + ':',
+        message: t('subgraphStore.blueprintNamePrompt'),
         defaultValue: this.filename
       })
     }
@@ -151,42 +194,72 @@ export const useSubgraphStore = defineStore('subgraph', () => {
       options.path = SubgraphBlueprint.basePath + options.path
       const bp = await new SubgraphBlueprint(options, true).load()
       useWorkflowStore().attachWorkflow(bp)
-      registerNodeDef(bp)
+      registerNodeDef(bp, { category: 'Subgraph Blueprints/User' })
     }
     async function loadInstalledBlueprints() {
       async function loadGlobalBlueprint([k, v]: [string, GlobalSubgraphData]) {
+        const data = await v.data
+        if (typeof data !== 'string' || data.trim().length === 0) {
+          throw new Error(
+            `Global blueprint '${v.name}' (${k}) returned empty content`
+          )
+        }
         const path = SubgraphBlueprint.basePath + v.name + '.json'
         const blueprint = new SubgraphBlueprint({
           path,
           modified: Date.now(),
           size: -1
         })
-        blueprint.originalContent = blueprint.content = await v.data
+        blueprint.originalContent = blueprint.content = data
         blueprint.filename = v.name
         useWorkflowStore().attachWorkflow(blueprint)
         const loaded = await blueprint.load()
+        const category = v.info.category
+          ? `Subgraph Blueprints/${v.info.category}`
+          : undefined
         registerNodeDef(
           loaded,
           {
-            python_module: v.info.node_pack,
-            display_name: v.name
+            display_name: v.name,
+            ...(category && { category }),
+            ...(v.essentials_category && {
+              essentials_category: v.essentials_category
+            }),
+            search_aliases: v.info.search_aliases,
+            isGlobal: true
           },
           k
         )
       }
       const subgraphs = await api.getGlobalSubgraphs()
-      await Promise.allSettled(
-        Object.entries(subgraphs).map(loadGlobalBlueprint)
-      )
+      const currentDistribution: TemplateIncludeOnDistributionEnum = isCloud
+        ? TemplateIncludeOnDistributionEnum.Cloud
+        : isDesktop
+          ? TemplateIncludeOnDistributionEnum.Desktop
+          : TemplateIncludeOnDistributionEnum.Local
+      const filteredEntries = Object.entries(subgraphs).filter(([, v]) => {
+        if (!isCloud && (v.info.requiresCustomNodes?.length ?? 0) > 0)
+          return false
+        if (
+          (v.info.includeOnDistributions?.length ?? 0) > 0 &&
+          !v.info.includeOnDistributions!.includes(currentDistribution)
+        )
+          return false
+        return true
+      })
+      return Promise.allSettled(filteredEntries.map(loadGlobalBlueprint))
     }
 
     const userSubs = (
       await api.listUserDataFullInfo(SubgraphBlueprint.basePath)
     ).filter((f) => f.path.endsWith('.json'))
-    const settled = await Promise.allSettled([
-      ...userSubs.map(loadBlueprint),
-      loadInstalledBlueprints()
+    const [globalResult, ...userResults] = await Promise.allSettled([
+      loadInstalledBlueprints(),
+      ...userSubs.map(loadBlueprint)
     ])
+    const globalResults =
+      globalResult.status === 'fulfilled' ? globalResult.value : []
+    const settled = [...globalResults, ...userResults]
 
     const errors = settled.filter((i) => 'reason' in i).map((i) => i.reason)
     errors.forEach((e) => console.error('Failed to load subgraph blueprint', e))
@@ -215,9 +288,17 @@ export const useSubgraphStore = defineStore('subgraph', () => {
         [`${i.type}`, undefined] satisfies InputSpec
       ])
     )
-    let description = 'User generated subgraph blueprint'
-    if (workflow.initialState.extra?.BlueprintDescription)
-      description = `${workflow.initialState.extra.BlueprintDescription}`
+    const workflowExtra = workflow.initialState.extra
+    const description =
+      workflowExtra?.BlueprintDescription ?? 'User generated subgraph blueprint'
+    const search_aliases = workflowExtra?.BlueprintSearchAliases
+    const subgraphDefCategory =
+      workflow.initialState.definitions?.subgraphs?.[0]?.category
+    const subgraphDefEssentialsCategory =
+      workflow.initialState.definitions?.subgraphs?.[0]?.essentials_category
+    const category = subgraphDefCategory
+      ? `Subgraph Blueprints/${subgraphDefCategory}`
+      : 'Subgraph Blueprints'
     const nodedefv1: ComfyNodeDefV1 = {
       input: { required: inputs },
       output: subgraphNode.outputs.map((o) => `${o.type}`),
@@ -225,16 +306,18 @@ export const useSubgraphStore = defineStore('subgraph', () => {
       name: typePrefix + name,
       display_name: name,
       description,
-      category: 'Subgraph Blueprints',
+      category,
       output_node: false,
       python_module: 'blueprint',
+      search_aliases,
+      essentials_category: subgraphDefEssentialsCategory,
       ...overrides
     }
     const nodeDefImpl = new ComfyNodeDefImpl(nodedefv1)
     subgraphDefCache.value.set(name, nodeDefImpl)
     subgraphCache[name] = workflow
   }
-  async function publishSubgraph() {
+  async function publishSubgraph(providedName?: string) {
     const canvas = canvasStore.getCanvas()
     const subgraphNode = [...canvas.selectedItems][0]
     if (
@@ -249,22 +332,25 @@ export const useSubgraphStore = defineStore('subgraph', () => {
     if (nodes.length != 1) {
       throw new TypeError('Must have single SubgraphNode selected to publish')
     }
+
     //create minimal workflow
     const workflowData = {
       revision: 0,
       last_node_id: subgraphNode.id,
       last_link_id: 0,
       nodes,
-      links: [],
+      links: [] as never[],
       version: 0.4,
       definitions: { subgraphs }
     }
     //prompt name
-    const name = await useDialogService().prompt({
-      title: t('subgraphStore.saveBlueprint'),
-      message: t('subgraphStore.blueprintName') + ':',
-      defaultValue: subgraphNode.title
-    })
+    const name =
+      providedName ??
+      (await useDialogService().prompt({
+        title: t('subgraphStore.saveBlueprint'),
+        message: t('subgraphStore.blueprintNamePrompt'),
+        defaultValue: subgraphNode.title
+      }))
     if (!name) return
     if (subgraphDefCache.value.has(name) && !(await confirmOverwrite(name)))
       //User has chosen not to overwrite.
@@ -284,7 +370,6 @@ export const useSubgraphStore = defineStore('subgraph', () => {
     await workflow.save()
     //add to files list?
     useWorkflowStore().attachWorkflow(loadedWorkflow)
-    registerNodeDef(loadedWorkflow)
     useToastStore().add({
       severity: 'success',
       summary: t('subgraphStore.publishSuccess'),
@@ -292,9 +377,6 @@ export const useSubgraphStore = defineStore('subgraph', () => {
       life: 4000
     })
   }
-  function updateDef(blueprint: LoadedComfyWorkflow) {
-    registerNodeDef(blueprint)
-  }
   async function editBlueprint(nodeType: string) {
     const name = nodeType.slice(typePrefix.length)
     if (!(name in subgraphCache))
@@ -315,9 +397,17 @@ export const useSubgraphStore = defineStore('subgraph', () => {
   }
   async function deleteBlueprint(nodeType: string) {
     const name = nodeType.slice(typePrefix.length)
-    if (!(name in subgraphCache))
-      //As loading is blocked on in startup, this can likely be changed to invalid type
-      throw new Error('not yet loaded')
+    if (!(name in subgraphCache)) throw new Error('not yet loaded')
+
+    if (isGlobalBlueprint(name)) {
+      useToastStore().add({
+        severity: 'warn',
+        summary: t('subgraphStore.cannotDeleteGlobal'),
+        life: 4000
+      })
+      return
+    }
+
     if (
       !(await useDialogService().confirm({
         title: t('subgraphStore.confirmDeleteTitle'),
@@ -338,15 +428,20 @@ export const useSubgraphStore = defineStore('subgraph', () => {
     return workflow instanceof SubgraphBlueprint
   }
 
+  function isGlobalBlueprint(name: string): boolean {
+    const nodeDef = subgraphDefCache.value.get(name)
+    return nodeDef !== undefined && nodeDef.isGlobal === true
+  }
+
   return {
     deleteBlueprint,
     editBlueprint,
     fetchSubgraphs,
     getBlueprint,
+    isGlobalBlueprint,
     isSubgraphBlueprint,
     publishSubgraph,
     subgraphBlueprints,
-    typePrefix,
-    updateDef
+    typePrefix
   }
 })
diff --git a/tests-ui/tests/store/systemStatsStore.test.ts b/src/stores/systemStatsStore.test.ts
similarity index 91%
rename from tests-ui/tests/store/systemStatsStore.test.ts
rename to src/stores/systemStatsStore.test.ts
index 49653c7804..289667958c 100644
--- a/tests-ui/tests/store/systemStatsStore.test.ts
+++ b/src/stores/systemStatsStore.test.ts
@@ -1,9 +1,12 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
+import type { SystemStats } from '@/schemas/apiSchema'
 import { api } from '@/scripts/api'
 import { useSystemStatsStore } from '@/stores/systemStatsStore'
-import { isElectron } from '@/utils/envUtil'
+
+const mockData = vi.hoisted(() => ({ isDesktop: false }))
 
 // Mock the API
 vi.mock('@/scripts/api', () => ({
@@ -12,20 +15,20 @@ vi.mock('@/scripts/api', () => ({
   }
 }))
 
-// Mock the envUtil
-vi.mock('@/utils/envUtil', () => ({
-  isElectron: vi.fn()
+vi.mock('@/platform/distribution/types', () => ({
+  get isDesktop() {
+    return mockData.isDesktop
+  },
+  isCloud: false
 }))
 
-vi.mock('@/platform/distribution/types', () => ({ isCloud: false }))
-
 describe('useSystemStatsStore', () => {
   let store: ReturnType<typeof useSystemStatsStore>
 
   beforeEach(() => {
     // Mock API to prevent automatic fetch on store creation
-    vi.mocked(api.getSystemStats).mockResolvedValue(null as any)
-    setActivePinia(createPinia())
+    vi.mocked(api.getSystemStats).mockResolvedValue(null!)
+    setActivePinia(createTestingPinia({ stubActions: false }))
     store = useSystemStatsStore()
     vi.clearAllMocks()
   })
@@ -89,8 +92,8 @@ describe('useSystemStatsStore', () => {
     })
 
     it('should set loading state correctly', async () => {
-      let resolvePromise: (value: any) => void = () => {}
-      const promise = new Promise<any>((resolve) => {
+      let resolvePromise: (value: SystemStats) => void = () => {}
+      const promise = new Promise<SystemStats>((resolve) => {
         resolvePromise = resolve
       })
       vi.mocked(api.getSystemStats).mockReturnValue(promise)
@@ -98,7 +101,7 @@ describe('useSystemStatsStore', () => {
       const fetchPromise = store.refetchSystemStats()
       expect(store.isLoading).toBe(true)
 
-      resolvePromise({})
+      resolvePromise({} as SystemStats)
       await fetchPromise
 
       expect(store.isLoading).toBe(false)
@@ -152,16 +155,16 @@ describe('useSystemStatsStore', () => {
           argv: [],
           ram_total: 16000000000,
           ram_free: 8000000000
-        } as any,
+        } as Partial<SystemStats['system']> as SystemStats['system'],
         devices: []
       }
 
       expect(store.getFormFactor()).toBe('other')
     })
 
-    describe('desktop environment (Electron)', () => {
+    describe('desktop environment', () => {
       beforeEach(() => {
-        vi.mocked(isElectron).mockReturnValue(true)
+        mockData.isDesktop = true
       })
 
       it('should return "desktop-windows" for Windows desktop', () => {
@@ -237,9 +240,9 @@ describe('useSystemStatsStore', () => {
       })
     })
 
-    describe('git environment (non-Electron)', () => {
+    describe('git environment (non-desktop)', () => {
       beforeEach(() => {
-        vi.mocked(isElectron).mockReturnValue(false)
+        mockData.isDesktop = false
       })
 
       it('should return "git-windows" for Windows git', () => {
@@ -317,7 +320,7 @@ describe('useSystemStatsStore', () => {
 
     describe('case insensitive OS detection', () => {
       beforeEach(() => {
-        vi.mocked(isElectron).mockReturnValue(false)
+        mockData.isDesktop = false
       })
 
       it('should handle uppercase OS names', () => {
diff --git a/src/stores/systemStatsStore.ts b/src/stores/systemStatsStore.ts
index 38b57b66d4..830cc4d2c7 100644
--- a/src/stores/systemStatsStore.ts
+++ b/src/stores/systemStatsStore.ts
@@ -1,10 +1,9 @@
 import { useAsyncState } from '@vueuse/core'
 import { defineStore } from 'pinia'
 
-import { isCloud } from '@/platform/distribution/types'
+import { isCloud, isDesktop } from '@/platform/distribution/types'
 import type { SystemStats } from '@/schemas/apiSchema'
 import { api } from '@/scripts/api'
-import { isElectron } from '@/utils/envUtil'
 
 export const useSystemStatsStore = defineStore('systemStats', () => {
   const fetchSystemStatsData = async () => {
@@ -40,7 +39,6 @@ export const useSystemStatsStore = defineStore('systemStats', () => {
     }
 
     const os = systemStats.value.system.os.toLowerCase()
-    const isDesktop = isElectron()
 
     if (isDesktop) {
       if (os.includes('windows')) {
diff --git a/src/stores/templateRankingStore.test.ts b/src/stores/templateRankingStore.test.ts
new file mode 100644
index 0000000000..12e7950fad
--- /dev/null
+++ b/src/stores/templateRankingStore.test.ts
@@ -0,0 +1,136 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { useTemplateRankingStore } from '@/stores/templateRankingStore'
+
+// Mock axios
+vi.mock('axios', () => ({
+  default: {
+    get: vi.fn()
+  }
+}))
+
+describe('templateRankingStore', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    vi.clearAllMocks()
+  })
+
+  describe('computeFreshness', () => {
+    it('returns 1.0 for brand new template (today)', () => {
+      const store = useTemplateRankingStore()
+      const today = new Date().toISOString().split('T')[0]
+      const freshness = store.computeFreshness(today)
+      expect(freshness).toBeCloseTo(1.0, 1)
+    })
+
+    it('returns ~0.5 for 90-day old template', () => {
+      const store = useTemplateRankingStore()
+      const ninetyDaysAgo = new Date(Date.now() - 90 * 24 * 60 * 60 * 1000)
+        .toISOString()
+        .split('T')[0]
+      const freshness = store.computeFreshness(ninetyDaysAgo)
+      expect(freshness).toBeCloseTo(0.5, 1)
+    })
+
+    it('returns 0.1 minimum for very old template', () => {
+      const store = useTemplateRankingStore()
+      const freshness = store.computeFreshness('2020-01-01')
+      expect(freshness).toBe(0.1)
+    })
+
+    it('returns 0.5 for undefined date', () => {
+      const store = useTemplateRankingStore()
+      expect(store.computeFreshness(undefined)).toBe(0.5)
+    })
+
+    it('returns 0.5 for invalid date', () => {
+      const store = useTemplateRankingStore()
+      expect(store.computeFreshness('not-a-date')).toBe(0.5)
+    })
+  })
+
+  describe('computeDefaultScore', () => {
+    it('uses default searchRank of 5 when not provided', () => {
+      const store = useTemplateRankingStore()
+      // Set largestUsageScore to avoid NaN when usage is 0
+      store.largestUsageScore = 100
+      const score = store.computeDefaultScore('2024-01-01', undefined, 0)
+      // With no usage score loaded, usage = 0
+      // internal = 5/10 = 0.5, freshness ~0.1 (old date)
+      // score = 0 * 0.5 + 0.5 * 0.3 + 0.1 * 0.2 = 0.15 + 0.02 = 0.17
+      expect(score).toBeCloseTo(0.17, 1)
+    })
+
+    it('high searchRank (10) boosts score', () => {
+      const store = useTemplateRankingStore()
+      store.largestUsageScore = 100
+      const lowRank = store.computeDefaultScore('2024-01-01', 1, 0)
+      const highRank = store.computeDefaultScore('2024-01-01', 10, 0)
+      expect(highRank).toBeGreaterThan(lowRank)
+    })
+
+    it('low searchRank (1) demotes score', () => {
+      const store = useTemplateRankingStore()
+      store.largestUsageScore = 100
+      const neutral = store.computeDefaultScore('2024-01-01', 5, 0)
+      const demoted = store.computeDefaultScore('2024-01-01', 1, 0)
+      expect(demoted).toBeLessThan(neutral)
+    })
+
+    it('searchRank difference is significant', () => {
+      const store = useTemplateRankingStore()
+      store.largestUsageScore = 100
+      const rank1 = store.computeDefaultScore('2024-01-01', 1, 0)
+      const rank10 = store.computeDefaultScore('2024-01-01', 10, 0)
+      // Difference should be 0.9 * 0.3 = 0.27 (30% weight, 0.9 range)
+      expect(rank10 - rank1).toBeCloseTo(0.27, 2)
+    })
+  })
+
+  describe('computePopularScore', () => {
+    it('does not use searchRank', () => {
+      const store = useTemplateRankingStore()
+      store.largestUsageScore = 100
+      // Popular score ignores searchRank - just usage + freshness
+      const score1 = store.computePopularScore('2024-01-01', 0)
+      const score2 = store.computePopularScore('2024-01-01', 0)
+      expect(score1).toBe(score2)
+    })
+
+    it('newer templates score higher', () => {
+      const store = useTemplateRankingStore()
+      store.largestUsageScore = 100
+      const today = new Date().toISOString().split('T')[0]
+      const oldScore = store.computePopularScore('2020-01-01', 0)
+      const newScore = store.computePopularScore(today, 0)
+      expect(newScore).toBeGreaterThan(oldScore)
+    })
+  })
+
+  describe('searchRank edge cases', () => {
+    it('handles searchRank of 0 (should still work, treated as very low)', () => {
+      const store = useTemplateRankingStore()
+      store.largestUsageScore = 100
+      const score = store.computeDefaultScore('2024-01-01', 0, 0)
+      expect(score).toBeGreaterThanOrEqual(0)
+    })
+
+    it('handles searchRank above 10 (clamping not enforced, but works)', () => {
+      const store = useTemplateRankingStore()
+      store.largestUsageScore = 100
+      const rank10 = store.computeDefaultScore('2024-01-01', 10, 0)
+      const rank15 = store.computeDefaultScore('2024-01-01', 15, 0)
+      expect(rank15).toBeGreaterThan(rank10)
+    })
+
+    it('handles negative searchRank', () => {
+      const store = useTemplateRankingStore()
+      store.largestUsageScore = 100
+      const score = store.computeDefaultScore('2024-01-01', -5, 0)
+      // Should still compute, just negative contribution from searchRank
+      expect(typeof score).toBe('number')
+    })
+  })
+})
diff --git a/src/stores/templateRankingStore.ts b/src/stores/templateRankingStore.ts
new file mode 100644
index 0000000000..a0dc68d8eb
--- /dev/null
+++ b/src/stores/templateRankingStore.ts
@@ -0,0 +1,66 @@
+/**
+ * Store for template ranking scores.
+ * Loads pre-computed usage scores from static JSON.
+ * Internal ranks come from template.searchRank in index.json.
+ * See docs/TEMPLATE_RANKING.md for details.
+ */
+
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+
+export const useTemplateRankingStore = defineStore('templateRanking', () => {
+  const largestUsageScore = ref<number>()
+
+  const normalizeUsageScore = (usage: number): number => {
+    return usage / (largestUsageScore.value ?? usage)
+  }
+
+  /**
+   * Compute freshness score based on template date.
+   * Returns 1.0 for brand new, decays to 0.1 over ~6 months.
+   */
+  const computeFreshness = (dateStr: string | undefined): number => {
+    if (!dateStr) return 0.5 // Default for templates without dates
+
+    const date = new Date(dateStr)
+    if (isNaN(date.getTime())) return 0.5
+
+    const daysSinceAdded = (Date.now() - date.getTime()) / (1000 * 60 * 60 * 24)
+    return Math.max(0.1, 1.0 / (1 + daysSinceAdded / 90))
+  }
+
+  /**
+   * Compute composite score for "default" sort.
+   * Formula: usage × 0.5 + internal × 0.3 + freshness × 0.2
+   */
+  const computeDefaultScore = (
+    dateStr: string | undefined,
+    searchRank: number | undefined,
+    usage: number = 0
+  ): number => {
+    const internal = (searchRank ?? 5) / 10 // Normalize 1-10 to 0-1
+    const freshness = computeFreshness(dateStr)
+
+    return normalizeUsageScore(usage) * 0.5 + internal * 0.3 + freshness * 0.2
+  }
+
+  /**
+   * Compute composite score for "popular" sort.
+   * Formula: usage × 0.9 + freshness × 0.1
+   */
+  const computePopularScore = (
+    dateStr: string | undefined,
+    usage: number = 0
+  ): number => {
+    const freshness = computeFreshness(dateStr)
+
+    return normalizeUsageScore(usage) * 0.9 + freshness * 0.1
+  }
+
+  return {
+    largestUsageScore,
+    computeFreshness,
+    computeDefaultScore,
+    computePopularScore
+  }
+})
diff --git a/tests-ui/tests/store/userFileStore.test.ts b/src/stores/userFileStore.test.ts
similarity index 97%
rename from tests-ui/tests/store/userFileStore.test.ts
rename to src/stores/userFileStore.test.ts
index dad0d3fa14..b94bd983be 100644
--- a/tests-ui/tests/store/userFileStore.test.ts
+++ b/src/stores/userFileStore.test.ts
@@ -1,4 +1,5 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { api } from '@/scripts/api'
@@ -19,7 +20,7 @@ describe('useUserFileStore', () => {
   let store: ReturnType<typeof useUserFileStore>
 
   beforeEach(() => {
-    setActivePinia(createPinia())
+    setActivePinia(createTestingPinia({ stubActions: false }))
     store = useUserFileStore()
     vi.resetAllMocks()
   })
diff --git a/src/stores/userFileStore.ts b/src/stores/userFileStore.ts
index f2742f3e3a..92c2d14a24 100644
--- a/src/stores/userFileStore.ts
+++ b/src/stores/userFileStore.ts
@@ -8,6 +8,19 @@ import { getPathDetails } from '@/utils/formatUtil'
 import { syncEntities } from '@/utils/syncUtil'
 import { buildTree } from '@/utils/treeUtil'
 
+/**
+ * Normalizes a timestamp value that may be either a number (milliseconds)
+ * or an ISO 8601 string (from Go's time.Time JSON serialization) into
+ * a consistent millisecond timestamp.
+ */
+function normalizeTimestamp(value: number | string): number {
+  if (typeof value === 'string') {
+    const ms = new Date(value).getTime()
+    return Number.isNaN(ms) ? Date.now() : ms
+  }
+  return value
+}
+
 /**
  * Represents a file in the user's data directory.
  */
@@ -140,7 +153,7 @@ export class UserFile {
     // https://github.com/comfyanonymous/ComfyUI/pull/5446
     const updatedFile = (await resp.json()) as string | UserDataFullInfo
     if (typeof updatedFile === 'object') {
-      this.lastModified = updatedFile.modified
+      this.lastModified = normalizeTimestamp(updatedFile.modified)
       this.size = updatedFile.size
     }
     this.originalContent = this.content
@@ -175,7 +188,7 @@ export class UserFile {
     // https://github.com/comfyanonymous/ComfyUI/pull/5446
     const updatedFile = (await resp.json()) as string | UserDataFullInfo
     if (typeof updatedFile === 'object') {
-      this.lastModified = updatedFile.modified
+      this.lastModified = normalizeTimestamp(updatedFile.modified)
       this.size = updatedFile.size
     }
     return this
diff --git a/src/stores/widgetValueStore.test.ts b/src/stores/widgetValueStore.test.ts
new file mode 100644
index 0000000000..2bcff9f096
--- /dev/null
+++ b/src/stores/widgetValueStore.test.ts
@@ -0,0 +1,179 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it } from 'vitest'
+
+import type { UUID } from '@/lib/litegraph/src/utils/uuid'
+import type { WidgetState } from './widgetValueStore'
+import { useWidgetValueStore } from './widgetValueStore'
+
+function widget<T>(
+  nodeId: string,
+  name: string,
+  type: string,
+  value: T,
+  extra: Partial<
+    Omit<WidgetState<T>, 'nodeId' | 'name' | 'type' | 'value'>
+  > = {}
+): WidgetState<T> {
+  return { nodeId, name, type, value, options: {}, ...extra }
+}
+
+describe('useWidgetValueStore', () => {
+  const graphA = 'graph-a' as UUID
+  const graphB = 'graph-b' as UUID
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+  })
+
+  describe('widgetState.value access', () => {
+    it('getWidget returns undefined for unregistered widget', () => {
+      const store = useWidgetValueStore()
+      expect(store.getWidget(graphA, 'missing', 'widget')).toBeUndefined()
+    })
+
+    it('widgetState.value can be read and written directly', () => {
+      const store = useWidgetValueStore()
+      const state = store.registerWidget(
+        graphA,
+        widget('node-1', 'seed', 'number', 100)
+      )
+      expect(state.value).toBe(100)
+
+      state.value = 200
+      expect(store.getWidget(graphA, 'node-1', 'seed')?.value).toBe(200)
+    })
+
+    it('stores different value types', () => {
+      const store = useWidgetValueStore()
+      store.registerWidget(graphA, widget('node-1', 'text', 'string', 'hello'))
+      store.registerWidget(graphA, widget('node-1', 'number', 'number', 42))
+      store.registerWidget(graphA, widget('node-1', 'boolean', 'toggle', true))
+      store.registerWidget(
+        graphA,
+        widget('node-1', 'array', 'combo', [1, 2, 3])
+      )
+
+      expect(store.getWidget(graphA, 'node-1', 'text')?.value).toBe('hello')
+      expect(store.getWidget(graphA, 'node-1', 'number')?.value).toBe(42)
+      expect(store.getWidget(graphA, 'node-1', 'boolean')?.value).toBe(true)
+      expect(store.getWidget(graphA, 'node-1', 'array')?.value).toEqual([
+        1, 2, 3
+      ])
+    })
+  })
+
+  describe('widget registration', () => {
+    it('registers a widget with minimal properties', () => {
+      const store = useWidgetValueStore()
+      const state = store.registerWidget(
+        graphA,
+        widget('node-1', 'seed', 'number', 12345)
+      )
+
+      expect(state.nodeId).toBe('node-1')
+      expect(state.name).toBe('seed')
+      expect(state.type).toBe('number')
+      expect(state.value).toBe(12345)
+      expect(state.disabled).toBeUndefined()
+      expect(state.serialize).toBeUndefined()
+      expect(state.options).toEqual({})
+    })
+
+    it('registers a widget with all properties', () => {
+      const store = useWidgetValueStore()
+      const state = store.registerWidget(
+        graphA,
+        widget('node-1', 'prompt', 'string', 'test', {
+          label: 'Prompt Text',
+          disabled: true,
+          serialize: false,
+          options: { multiline: true }
+        })
+      )
+
+      expect(state.label).toBe('Prompt Text')
+      expect(state.disabled).toBe(true)
+      expect(state.serialize).toBe(false)
+      expect(state.options).toEqual({ multiline: true })
+    })
+  })
+
+  describe('widget getters', () => {
+    it('getWidget returns widget state', () => {
+      const store = useWidgetValueStore()
+      store.registerWidget(graphA, widget('node-1', 'seed', 'number', 100))
+
+      const state = store.getWidget(graphA, 'node-1', 'seed')
+      expect(state).toBeDefined()
+      expect(state?.name).toBe('seed')
+      expect(state?.value).toBe(100)
+    })
+
+    it('getWidget returns undefined for missing widget', () => {
+      const store = useWidgetValueStore()
+      expect(store.getWidget(graphA, 'missing', 'widget')).toBeUndefined()
+    })
+
+    it('getNodeWidgets returns all widgets for a node', () => {
+      const store = useWidgetValueStore()
+      store.registerWidget(graphA, widget('node-1', 'seed', 'number', 1))
+      store.registerWidget(graphA, widget('node-1', 'steps', 'number', 20))
+      store.registerWidget(graphA, widget('node-2', 'cfg', 'number', 7))
+
+      const widgets = store.getNodeWidgets(graphA, 'node-1')
+      expect(widgets).toHaveLength(2)
+      expect(widgets.map((w) => w.name).sort()).toEqual(['seed', 'steps'])
+    })
+  })
+
+  describe('direct property mutation', () => {
+    it('disabled can be set directly via getWidget', () => {
+      const store = useWidgetValueStore()
+      const state = store.registerWidget(
+        graphA,
+        widget('node-1', 'seed', 'number', 100)
+      )
+
+      state.disabled = true
+      expect(store.getWidget(graphA, 'node-1', 'seed')?.disabled).toBe(true)
+    })
+
+    it('label can be set directly via getWidget', () => {
+      const store = useWidgetValueStore()
+      const state = store.registerWidget(
+        graphA,
+        widget('node-1', 'seed', 'number', 100)
+      )
+
+      state.label = 'Random Seed'
+      expect(store.getWidget(graphA, 'node-1', 'seed')?.label).toBe(
+        'Random Seed'
+      )
+
+      state.label = undefined
+      expect(store.getWidget(graphA, 'node-1', 'seed')?.label).toBeUndefined()
+    })
+  })
+
+  describe('graph isolation', () => {
+    it('isolates widget states by graph', () => {
+      const store = useWidgetValueStore()
+      store.registerWidget(graphA, widget('node-1', 'seed', 'number', 1))
+      store.registerWidget(graphB, widget('node-1', 'seed', 'number', 2))
+
+      expect(store.getWidget(graphA, 'node-1', 'seed')?.value).toBe(1)
+      expect(store.getWidget(graphB, 'node-1', 'seed')?.value).toBe(2)
+    })
+
+    it('clearGraph only removes one graph namespace', () => {
+      const store = useWidgetValueStore()
+      store.registerWidget(graphA, widget('node-1', 'seed', 'number', 1))
+      store.registerWidget(graphB, widget('node-1', 'seed', 'number', 2))
+
+      store.clearGraph(graphA)
+
+      expect(store.getWidget(graphA, 'node-1', 'seed')).toBeUndefined()
+      expect(store.getWidget(graphB, 'node-1', 'seed')?.value).toBe(2)
+    })
+  })
+})
diff --git a/src/stores/widgetValueStore.ts b/src/stores/widgetValueStore.ts
new file mode 100644
index 0000000000..4ee14bbd47
--- /dev/null
+++ b/src/stores/widgetValueStore.ts
@@ -0,0 +1,89 @@
+import { defineStore } from 'pinia'
+import { reactive, ref } from 'vue'
+
+import type { NodeId } from '@/lib/litegraph/src/LGraphNode'
+import type { UUID } from '@/lib/litegraph/src/utils/uuid'
+import type {
+  IBaseWidget,
+  IWidgetOptions
+} from '@/lib/litegraph/src/types/widgets'
+
+/**
+ * Widget state is keyed by `nodeId:widgetName` without graph context.
+ * This is intentional: nodes viewed at different subgraph depths share
+ * the same widget state, enabling synchronized values across the hierarchy.
+ */
+type WidgetKey = `${NodeId}:${string}`
+
+/**
+ * Strips graph/subgraph prefixes from a scoped node ID to get the bare node ID.
+ * e.g., "graph1:subgraph2:42" → "42"
+ */
+export function stripGraphPrefix(scopedId: NodeId | string): NodeId {
+  return String(scopedId).replace(/^(.*:)+/, '') as NodeId
+}
+
+export interface WidgetState<
+  TValue = unknown,
+  TType extends string = string,
+  TOptions extends IWidgetOptions = IWidgetOptions
+> extends Pick<
+  IBaseWidget<TValue, TType, TOptions>,
+  'name' | 'type' | 'value' | 'options' | 'label' | 'serialize' | 'disabled'
+> {
+  nodeId: NodeId
+}
+
+export const useWidgetValueStore = defineStore('widgetValue', () => {
+  const graphWidgetStates = ref(new Map<UUID, Map<WidgetKey, WidgetState>>())
+
+  function getWidgetStateMap(graphId: UUID): Map<WidgetKey, WidgetState> {
+    const widgetStates = graphWidgetStates.value.get(graphId)
+    if (widgetStates) return widgetStates
+
+    const nextWidgetStates = reactive(new Map<WidgetKey, WidgetState>())
+    graphWidgetStates.value.set(graphId, nextWidgetStates)
+    return nextWidgetStates
+  }
+
+  function makeKey(nodeId: NodeId, widgetName: string): WidgetKey {
+    return `${nodeId}:${widgetName}`
+  }
+
+  function registerWidget<TValue = unknown>(
+    graphId: UUID,
+    state: WidgetState<TValue>
+  ): WidgetState<TValue> {
+    const widgetStates = getWidgetStateMap(graphId)
+    const key = makeKey(state.nodeId, state.name)
+    widgetStates.set(key, state)
+    return widgetStates.get(key) as WidgetState<TValue>
+  }
+
+  function getNodeWidgets(graphId: UUID, nodeId: NodeId): WidgetState[] {
+    const widgetStates = getWidgetStateMap(graphId)
+    const prefix = `${nodeId}:`
+    return [...widgetStates]
+      .filter(([key]) => key.startsWith(prefix))
+      .map(([, state]) => state)
+  }
+
+  function getWidget(
+    graphId: UUID,
+    nodeId: NodeId,
+    widgetName: string
+  ): WidgetState | undefined {
+    return getWidgetStateMap(graphId).get(makeKey(nodeId, widgetName))
+  }
+
+  function clearGraph(graphId: UUID): void {
+    graphWidgetStates.value.delete(graphId)
+  }
+
+  return {
+    registerWidget,
+    getWidget,
+    getNodeWidgets,
+    clearGraph
+  }
+})
diff --git a/src/stores/workspace/assetsSidebarBadgeStore.test.ts b/src/stores/workspace/assetsSidebarBadgeStore.test.ts
new file mode 100644
index 0000000000..824b999246
--- /dev/null
+++ b/src/stores/workspace/assetsSidebarBadgeStore.test.ts
@@ -0,0 +1,187 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { nextTick } from 'vue'
+import { beforeEach, describe, expect, it } from 'vitest'
+
+import type { JobListItem } from '@/platform/remote/comfyui/jobs/jobTypes'
+import { TaskItemImpl, useQueueStore } from '@/stores/queueStore'
+import { useAssetsSidebarBadgeStore } from '@/stores/workspace/assetsSidebarBadgeStore'
+import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
+
+const createHistoryTask = ({
+  id,
+  outputsCount,
+  hasPreview = true
+}: {
+  id: string
+  outputsCount?: number
+  hasPreview?: boolean
+}) =>
+  new TaskItemImpl({
+    id,
+    status: 'completed',
+    create_time: Date.now(),
+    priority: 1,
+    outputs_count: outputsCount,
+    preview_output: hasPreview
+      ? {
+          filename: `${id}.png`,
+          subfolder: '',
+          type: 'output',
+          nodeId: '1',
+          mediaType: 'images'
+        }
+      : undefined
+  } as JobListItem)
+
+describe('useAssetsSidebarBadgeStore', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+  })
+
+  it('does not count initial fetched history when store starts before hydration', async () => {
+    const queueStore = useQueueStore()
+    const assetsSidebarBadgeStore = useAssetsSidebarBadgeStore()
+
+    queueStore.historyTasks = [
+      createHistoryTask({ id: 'job-1', outputsCount: 2 })
+    ]
+    await nextTick()
+    expect(assetsSidebarBadgeStore.unseenAddedAssetsCount).toBe(0)
+
+    queueStore.hasFetchedHistorySnapshot = true
+    await nextTick()
+    expect(assetsSidebarBadgeStore.unseenAddedAssetsCount).toBe(0)
+  })
+
+  it('counts new history items after baseline hydration while assets tab is closed', async () => {
+    const queueStore = useQueueStore()
+    queueStore.historyTasks = [
+      createHistoryTask({ id: 'job-1', outputsCount: 2 })
+    ]
+    queueStore.hasFetchedHistorySnapshot = true
+
+    const assetsSidebarBadgeStore = useAssetsSidebarBadgeStore()
+    await nextTick()
+
+    expect(assetsSidebarBadgeStore.unseenAddedAssetsCount).toBe(0)
+
+    queueStore.historyTasks = [
+      createHistoryTask({ id: 'job-2', hasPreview: true }),
+      ...queueStore.historyTasks
+    ]
+    await nextTick()
+
+    expect(assetsSidebarBadgeStore.unseenAddedAssetsCount).toBe(1)
+  })
+
+  it('does not count preview fallback when server outputsCount is zero', async () => {
+    const queueStore = useQueueStore()
+    queueStore.historyTasks = [
+      createHistoryTask({ id: 'job-1', outputsCount: 2 })
+    ]
+    queueStore.hasFetchedHistorySnapshot = true
+
+    const assetsSidebarBadgeStore = useAssetsSidebarBadgeStore()
+    await nextTick()
+
+    expect(assetsSidebarBadgeStore.unseenAddedAssetsCount).toBe(0)
+
+    queueStore.historyTasks = [
+      createHistoryTask({ id: 'job-2', outputsCount: 0, hasPreview: true }),
+      ...queueStore.historyTasks
+    ]
+    await nextTick()
+
+    expect(assetsSidebarBadgeStore.unseenAddedAssetsCount).toBe(0)
+  })
+
+  it('adds only delta when a seen job gains more outputs', async () => {
+    const queueStore = useQueueStore()
+    const assetsSidebarBadgeStore = useAssetsSidebarBadgeStore()
+
+    queueStore.historyTasks = [
+      createHistoryTask({ id: 'job-1', hasPreview: true })
+    ]
+    queueStore.hasFetchedHistorySnapshot = true
+    await nextTick()
+
+    expect(assetsSidebarBadgeStore.unseenAddedAssetsCount).toBe(0)
+
+    queueStore.historyTasks = [
+      createHistoryTask({ id: 'job-1', outputsCount: 3 })
+    ]
+    await nextTick()
+
+    expect(assetsSidebarBadgeStore.unseenAddedAssetsCount).toBe(2)
+  })
+
+  it('treats a reappearing job as unseen after it aged out of history', async () => {
+    const queueStore = useQueueStore()
+    const assetsSidebarBadgeStore = useAssetsSidebarBadgeStore()
+
+    queueStore.historyTasks = [
+      createHistoryTask({ id: 'job-1', outputsCount: 2 })
+    ]
+    queueStore.hasFetchedHistorySnapshot = true
+    await nextTick()
+
+    expect(assetsSidebarBadgeStore.unseenAddedAssetsCount).toBe(0)
+
+    queueStore.historyTasks = [
+      createHistoryTask({ id: 'job-2', outputsCount: 1 })
+    ]
+    await nextTick()
+
+    expect(assetsSidebarBadgeStore.unseenAddedAssetsCount).toBe(1)
+
+    queueStore.historyTasks = [
+      createHistoryTask({ id: 'job-1', outputsCount: 1 }),
+      createHistoryTask({ id: 'job-2', outputsCount: 1 })
+    ]
+    await nextTick()
+
+    expect(assetsSidebarBadgeStore.unseenAddedAssetsCount).toBe(2)
+  })
+
+  it('clears and suppresses count while assets tab is open', async () => {
+    const queueStore = useQueueStore()
+    const sidebarTabStore = useSidebarTabStore()
+    const assetsSidebarBadgeStore = useAssetsSidebarBadgeStore()
+
+    queueStore.historyTasks = [
+      createHistoryTask({ id: 'job-1', outputsCount: 2 })
+    ]
+    queueStore.hasFetchedHistorySnapshot = true
+    await nextTick()
+    expect(assetsSidebarBadgeStore.unseenAddedAssetsCount).toBe(0)
+
+    queueStore.historyTasks = [
+      createHistoryTask({ id: 'job-2', outputsCount: 4 }),
+      ...queueStore.historyTasks
+    ]
+    await nextTick()
+    expect(assetsSidebarBadgeStore.unseenAddedAssetsCount).toBe(4)
+
+    sidebarTabStore.activeSidebarTabId = 'assets'
+    await nextTick()
+    expect(assetsSidebarBadgeStore.unseenAddedAssetsCount).toBe(0)
+
+    queueStore.historyTasks = [
+      createHistoryTask({ id: 'job-3', outputsCount: 4 }),
+      ...queueStore.historyTasks
+    ]
+    await nextTick()
+    expect(assetsSidebarBadgeStore.unseenAddedAssetsCount).toBe(0)
+
+    sidebarTabStore.activeSidebarTabId = 'node-library'
+    await nextTick()
+
+    queueStore.historyTasks = [
+      createHistoryTask({ id: 'job-4', outputsCount: 1 }),
+      ...queueStore.historyTasks
+    ]
+    await nextTick()
+    expect(assetsSidebarBadgeStore.unseenAddedAssetsCount).toBe(1)
+  })
+})
diff --git a/src/stores/workspace/assetsSidebarBadgeStore.ts b/src/stores/workspace/assetsSidebarBadgeStore.ts
new file mode 100644
index 0000000000..97cfc90236
--- /dev/null
+++ b/src/stores/workspace/assetsSidebarBadgeStore.ts
@@ -0,0 +1,99 @@
+import { defineStore } from 'pinia'
+import { ref, watch } from 'vue'
+
+import type { TaskItemImpl } from '@/stores/queueStore'
+import { useQueueStore } from '@/stores/queueStore'
+import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
+
+const getAddedAssetCount = (task: TaskItemImpl): number => {
+  if (typeof task.outputsCount === 'number') {
+    return Math.max(task.outputsCount, 0)
+  }
+
+  return task.previewOutput ? 1 : 0
+}
+
+export const useAssetsSidebarBadgeStore = defineStore(
+  'assetsSidebarBadge',
+  () => {
+    const queueStore = useQueueStore()
+    const sidebarTabStore = useSidebarTabStore()
+
+    const unseenAddedAssetsCount = ref(0)
+    const countedHistoryAssetsByJobId = ref(new Map<string, number>())
+    const hasInitializedHistory = ref(false)
+
+    const markCurrentHistoryAsSeen = () => {
+      countedHistoryAssetsByJobId.value = new Map(
+        queueStore.historyTasks.map((task) => [
+          task.jobId,
+          getAddedAssetCount(task)
+        ])
+      )
+    }
+
+    watch(
+      () =>
+        [
+          queueStore.historyTasks,
+          queueStore.hasFetchedHistorySnapshot
+        ] as const,
+      ([historyTasks, hasFetchedHistorySnapshot]) => {
+        if (!hasFetchedHistorySnapshot) {
+          return
+        }
+
+        if (!hasInitializedHistory.value) {
+          hasInitializedHistory.value = true
+          markCurrentHistoryAsSeen()
+          return
+        }
+
+        const isAssetsTabOpen = sidebarTabStore.activeSidebarTabId === 'assets'
+        const previousCountedAssetsByJobId = countedHistoryAssetsByJobId.value
+        const nextCountedAssetsByJobId = new Map<string, number>()
+
+        for (const task of historyTasks) {
+          const jobId = task.jobId
+          if (!jobId) {
+            continue
+          }
+
+          const countedAssets = previousCountedAssetsByJobId.get(jobId) ?? 0
+          const currentAssets = getAddedAssetCount(task)
+          const hasSeenJob = previousCountedAssetsByJobId.has(jobId)
+
+          if (!isAssetsTabOpen && !hasSeenJob) {
+            unseenAddedAssetsCount.value += currentAssets
+          } else if (!isAssetsTabOpen && currentAssets > countedAssets) {
+            unseenAddedAssetsCount.value += currentAssets - countedAssets
+          }
+
+          nextCountedAssetsByJobId.set(
+            jobId,
+            Math.max(countedAssets, currentAssets)
+          )
+        }
+
+        countedHistoryAssetsByJobId.value = nextCountedAssetsByJobId
+      },
+      { immediate: true }
+    )
+
+    watch(
+      () => sidebarTabStore.activeSidebarTabId,
+      (activeSidebarTabId) => {
+        if (activeSidebarTabId !== 'assets') {
+          return
+        }
+
+        unseenAddedAssetsCount.value = 0
+        markCurrentHistoryAsSeen()
+      }
+    )
+
+    return {
+      unseenAddedAssetsCount
+    }
+  }
+)
diff --git a/tests-ui/tests/store/bottomPanelStore.test.ts b/src/stores/workspace/bottomPanelStore.test.ts
similarity index 92%
rename from tests-ui/tests/store/bottomPanelStore.test.ts
rename to src/stores/workspace/bottomPanelStore.test.ts
index 7d9a2406e2..eb0d1ae0be 100644
--- a/tests-ui/tests/store/bottomPanelStore.test.ts
+++ b/src/stores/workspace/bottomPanelStore.test.ts
@@ -1,4 +1,5 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { useBottomPanelStore } from '@/stores/workspace/bottomPanelStore'
@@ -47,13 +48,17 @@ vi.mock('@/stores/commandStore', () => ({
   })
 }))
 
-vi.mock('@/utils/envUtil', () => ({
-  isElectron: () => false
+const mockData = vi.hoisted(() => ({ isDesktop: false }))
+
+vi.mock('@/platform/distribution/types', () => ({
+  get isDesktop() {
+    return mockData.isDesktop
+  }
 }))
 
 describe('useBottomPanelStore', () => {
   beforeEach(() => {
-    setActivePinia(createPinia())
+    setActivePinia(createTestingPinia({ stubActions: false }))
   })
 
   it('should initialize with empty panels', () => {
diff --git a/src/stores/workspace/bottomPanelStore.ts b/src/stores/workspace/bottomPanelStore.ts
index 017c2e0b29..78d353a7a9 100644
--- a/src/stores/workspace/bottomPanelStore.ts
+++ b/src/stores/workspace/bottomPanelStore.ts
@@ -2,14 +2,11 @@ import { defineStore } from 'pinia'
 import { computed, ref } from 'vue'
 
 import { useShortcutsTab } from '@/composables/bottomPanelTabs/useShortcutsTab'
-import {
-  useCommandTerminalTab,
-  useLogsTerminalTab
-} from '@/composables/bottomPanelTabs/useTerminalTabs'
+
+import { isDesktop } from '@/platform/distribution/types'
 import { useCommandStore } from '@/stores/commandStore'
 import type { ComfyExtension } from '@/types/comfy'
 import type { BottomPanelExtension } from '@/types/extensionTypes'
-import { isElectron } from '@/utils/envUtil'
 
 type PanelType = 'terminal' | 'shortcuts'
 
@@ -75,8 +72,18 @@ export const useBottomPanelStore = defineStore('bottomPanel', () => {
   }
 
   const toggleBottomPanel = () => {
-    // Legacy method - toggles terminal panel
-    togglePanel('terminal')
+    // Toggles the terminal panel if available, otherwise falls back to shortcuts
+    // Terminal tabs are loaded asynchronously, so may not be available immediately
+    const terminalPanel = panels.value.terminal
+    if (terminalPanel.tabs.length > 0) {
+      togglePanel('terminal')
+    } else {
+      // Terminal tabs not loaded yet - fall back to shortcuts panel
+      // If no panel is open, open shortcuts
+      // If shortcuts is already open, close it
+      // If another panel is open (shouldn't happen), switch to shortcuts
+      togglePanel('shortcuts')
+    }
   }
 
   const setActiveTab = (tabId: string) => {
@@ -121,12 +128,23 @@ export const useBottomPanelStore = defineStore('bottomPanel', () => {
     })
   }
 
-  const registerCoreBottomPanelTabs = () => {
-    registerBottomPanelTab(useLogsTerminalTab())
-    if (isElectron()) {
-      registerBottomPanelTab(useCommandTerminalTab())
-    }
+  const registerCoreBottomPanelTabs = async () => {
+    // Register shortcuts tabs first (synchronous, always available)
     useShortcutsTab().forEach(registerBottomPanelTab)
+
+    // Use __DISTRIBUTION__ directly for proper dead code elimination
+    if (__DISTRIBUTION__ !== 'cloud') {
+      try {
+        const { useLogsTerminalTab, useCommandTerminalTab } =
+          await import('@/composables/bottomPanelTabs/useTerminalTabs')
+        registerBottomPanelTab(useLogsTerminalTab())
+        if (isDesktop) {
+          registerBottomPanelTab(useCommandTerminalTab())
+        }
+      } catch (error) {
+        console.error('Failed to load terminal tabs:', error)
+      }
+    }
   }
 
   const registerExtensionBottomPanelTabs = (extension: ComfyExtension) => {
diff --git a/src/stores/workspace/favoritedWidgetsStore.ts b/src/stores/workspace/favoritedWidgetsStore.ts
new file mode 100644
index 0000000000..c852f2baaa
--- /dev/null
+++ b/src/stores/workspace/favoritedWidgetsStore.ts
@@ -0,0 +1,365 @@
+import { defineStore } from 'pinia'
+import { computed, ref, watch } from 'vue'
+
+import { st } from '@/i18n'
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+import type { LGraphNode, NodeId } from '@/lib/litegraph/src/litegraph'
+import { app } from '@/scripts/app'
+import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
+import type { NodeLocatorId } from '@/types/nodeIdentification'
+import { getNodeByLocatorId } from '@/utils/graphTraversalUtil'
+import { resolveNodeDisplayName } from '@/utils/nodeTitleUtil'
+import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+
+/**
+ * Unique identifier for a favorited widget.
+ * Combines node locator ID and widget name to locate a widget in the graph.
+ */
+interface FavoritedWidgetId {
+  /** The node locator ID in the graph */
+  nodeLocatorId: NodeLocatorId
+  /** The widget name on the node */
+  widgetName: string
+}
+
+/**
+ * A favorited widget with its resolved runtime instance.
+ * The widget instance may be null if the node or widget no longer exists.
+ */
+interface FavoritedWidget extends FavoritedWidgetId {
+  /** The resolved node instance (null if node was deleted) */
+  node: LGraphNode | null
+  /** The resolved widget instance (null if widget no longer exists) */
+  widget: IBaseWidget | null
+  /** Display label for the favorited item */
+  label: string
+}
+
+export interface ValidFavoritedWidget extends FavoritedWidget {
+  node: LGraphNode
+  widget: IBaseWidget
+}
+
+/**
+ * Storage format for persisted favorited widgets.
+ * Stored in workflow.extra.favoritedWidgets.
+ */
+interface FavoritedWidgetStorage {
+  /** Array of favorited widget identifiers */
+  favorites: FavoritedWidgetId[]
+}
+
+/**
+ * Store for managing favorited/starred widgets.
+ *
+ * Favorited widgets can be accessed and edited from the right side panel
+ * without needing to select the corresponding node. This store manages:
+ * - Persisting favorited widget IDs per workflow
+ * - Resolving widget IDs to actual widget instances
+ * - Handling cases where nodes/widgets are deleted
+ *
+ * Design decisions:
+ * - Scope: Per-workflow (not global user preference)
+ * - Identifier: node locator ID + widget.name
+ * - Persistence: Stored in workflow.extra.favoritedWidgets (serialized with workflow)
+ * - Future: Can be extended for Linear Mode
+ */
+export const useFavoritedWidgetsStore = defineStore('favoritedWidgets', () => {
+  const workflowStore = useWorkflowStore()
+  const canvasStore = useCanvasStore()
+
+  /** In-memory array of favorited widget IDs, ordered for display */
+  const favoritedIds = ref<string[]>([])
+
+  /**
+   * Generate a unique string key for a favorited widget ID.
+   */
+  function getFavoriteKey(id: FavoritedWidgetId): string {
+    return JSON.stringify([id.nodeLocatorId, id.widgetName])
+  }
+
+  /**
+   * Parse a favorite key back into a FavoritedWidgetId.
+   */
+  function parseFavoriteKey(key: string): FavoritedWidgetId | null {
+    try {
+      const [nodeLocatorId, widgetName] = JSON.parse(key) as [string, string]
+      if (!nodeLocatorId || !widgetName) return null
+      return { nodeLocatorId, widgetName }
+    } catch {
+      const separatorIndex = key.indexOf(':')
+      if (separatorIndex === -1) return null
+      const nodeLocatorId = key.slice(0, separatorIndex)
+      const widgetName = key.slice(separatorIndex + 1)
+      if (!nodeLocatorId || !widgetName) return null
+      return { nodeLocatorId, widgetName }
+    }
+  }
+
+  function normalizeFavoritedId(
+    id: FavoritedWidgetId | { nodeId?: unknown; widgetName?: unknown } | null
+  ): FavoritedWidgetId | null {
+    if (!id || !id.widgetName) return null
+
+    if ('nodeLocatorId' in id && id.nodeLocatorId) {
+      return {
+        nodeLocatorId: String(id.nodeLocatorId),
+        widgetName: String(id.widgetName)
+      }
+    }
+
+    if ('nodeId' in id && id.nodeId !== undefined) {
+      return {
+        nodeLocatorId: workflowStore.nodeIdToNodeLocatorId(id.nodeId as NodeId),
+        widgetName: String(id.widgetName)
+      }
+    }
+
+    return null
+  }
+
+  function createFavoriteId(
+    node: LGraphNode,
+    widgetName: string
+  ): FavoritedWidgetId {
+    return {
+      nodeLocatorId: workflowStore.nodeToNodeLocatorId(node),
+      widgetName
+    }
+  }
+
+  /**
+   * Load favorited widgets from the current workflow's extra data.
+   */
+  function loadFromWorkflow() {
+    const graph = app.rootGraph
+    if (!graph) {
+      favoritedIds.value = []
+      return
+    }
+
+    try {
+      const storedData = graph.extra?.favoritedWidgets as
+        | FavoritedWidgetStorage
+        | undefined
+
+      if (storedData?.favorites) {
+        const normalized = storedData.favorites
+          .map((fav) => normalizeFavoritedId(fav))
+          .filter((fav): fav is FavoritedWidgetId => fav !== null)
+        favoritedIds.value = normalized.map(getFavoriteKey)
+      } else {
+        favoritedIds.value = []
+      }
+    } catch (error) {
+      console.error('Failed to load favorited widgets from workflow:', error)
+      favoritedIds.value = []
+    }
+  }
+
+  /**
+   * Save favorited widgets to the current workflow's extra data.
+   * Marks the workflow as modified.
+   */
+  function saveToWorkflow() {
+    const graph = app.rootGraph
+    if (!graph) return
+
+    try {
+      const favorites: FavoritedWidgetId[] = favoritedIds.value
+        .map(parseFavoriteKey)
+        .filter((id): id is FavoritedWidgetId => id !== null)
+
+      const data: FavoritedWidgetStorage = { favorites }
+
+      // Ensure extra object exists
+      graph.extra ??= {}
+      graph.extra.favoritedWidgets = data
+
+      // Mark the workflow as modified
+      canvasStore.canvas?.setDirty(true, true)
+    } catch (error) {
+      console.error('Failed to save favorited widgets to workflow:', error)
+    }
+  }
+
+  /**
+   * Resolve a favorited widget ID to its actual widget instance.
+   * Returns null if the node or widget no longer exists.
+   */
+  function resolveWidget(id: FavoritedWidgetId): FavoritedWidget {
+    const graph = app.rootGraph
+    if (!graph) {
+      return {
+        ...id,
+        node: null,
+        widget: null,
+        label: `${id.widgetName} (graph not loaded)`
+      }
+    }
+
+    const node = getNodeByLocatorId(graph, id.nodeLocatorId)
+    if (!node) {
+      return {
+        ...id,
+        node: null,
+        widget: null,
+        label: `${id.widgetName} (node deleted)`
+      }
+    }
+
+    const widget = node.widgets?.find((w) => w.name === id.widgetName)
+    if (!widget) {
+      return {
+        ...id,
+        node,
+        widget: null,
+        label: `${id.widgetName} (widget not found)`
+      }
+    }
+
+    const fallbackNodeTitle = st('rightSidePanel.fallbackNodeTitle', 'Node')
+    const nodeTitle = resolveNodeDisplayName(node, {
+      emptyLabel: fallbackNodeTitle,
+      untitledLabel: fallbackNodeTitle,
+      st
+    })
+    const widgetLabel = widget.label || widget.name
+    return {
+      ...id,
+      node,
+      widget,
+      label: `${nodeTitle} / ${widgetLabel}`
+    }
+  }
+
+  /**
+   * Get all favorited widgets with their resolved instances.
+   * Widgets that no longer exist will have null node/widget properties.
+   */
+  const favoritedWidgets = computed((): FavoritedWidget[] => {
+    return favoritedIds.value
+      .map(parseFavoriteKey)
+      .filter((id): id is FavoritedWidgetId => id !== null)
+      .map(resolveWidget)
+  })
+
+  /**
+   * Get only the valid favorited widgets (where both node and widget exist).
+   */
+  const validFavoritedWidgets = computed((): ValidFavoritedWidget[] => {
+    return favoritedWidgets.value.filter(
+      (fw) => fw.node !== null && fw.widget !== null
+    ) as ValidFavoritedWidget[]
+  })
+
+  /**
+   * Check if a widget is favorited.
+   */
+  function isFavorited(node: LGraphNode, widgetName: string): boolean {
+    return favoritedIds.value.includes(
+      getFavoriteKey(createFavoriteId(node, widgetName))
+    )
+  }
+
+  /**
+   * Add a widget to favorites.
+   */
+  function addFavorite(node: LGraphNode, widgetName: string) {
+    const key = getFavoriteKey(createFavoriteId(node, widgetName))
+    if (favoritedIds.value.includes(key)) return
+
+    favoritedIds.value.push(key)
+    saveToWorkflow()
+  }
+
+  /**
+   * Remove a widget from favorites.
+   */
+  function removeFavorite(node: LGraphNode, widgetName: string) {
+    const key = getFavoriteKey(createFavoriteId(node, widgetName))
+    const index = favoritedIds.value.indexOf(key)
+    if (index === -1) return
+
+    favoritedIds.value.splice(index, 1)
+    saveToWorkflow()
+  }
+
+  /**
+   * Toggle a widget's favorite status.
+   */
+  function toggleFavorite(node: LGraphNode, widgetName: string) {
+    if (isFavorited(node, widgetName)) {
+      removeFavorite(node, widgetName)
+    } else {
+      addFavorite(node, widgetName)
+    }
+  }
+
+  /**
+   * Clear all favorites for the current workflow.
+   */
+  function clearFavorites() {
+    favoritedIds.value = []
+    saveToWorkflow()
+  }
+
+  /**
+   * Remove invalid favorites (where node or widget no longer exists).
+   * Useful for cleanup after loading a workflow.
+   */
+  function pruneInvalidFavorites() {
+    const validKeys = validFavoritedWidgets.value.map((fw) =>
+      getFavoriteKey({
+        nodeLocatorId: fw.nodeLocatorId,
+        widgetName: fw.widgetName
+      })
+    )
+    const validSet = new Set(validKeys)
+
+    const filteredIds = favoritedIds.value.filter((key) => validSet.has(key))
+
+    if (filteredIds.length !== favoritedIds.value.length) {
+      favoritedIds.value = filteredIds
+      saveToWorkflow()
+    }
+  }
+
+  /**
+   * Reorder favorites based on the provided array of widgets.
+   * Used when dragging and dropping favorites to reorder them.
+   */
+  function reorderFavorites(reorderedWidgets: ValidFavoritedWidget[]) {
+    favoritedIds.value = reorderedWidgets.map((fw) =>
+      getFavoriteKey({
+        nodeLocatorId: fw.nodeLocatorId,
+        widgetName: fw.widgetName
+      })
+    )
+    saveToWorkflow()
+  }
+
+  // Watch for workflow changes and reload favorites from workflow.extra
+  watch(
+    () => workflowStore.activeWorkflow?.path,
+    () => {
+      loadFromWorkflow()
+    },
+    { immediate: true }
+  )
+
+  return {
+    // State
+    favoritedWidgets,
+    validFavoritedWidgets,
+
+    // Actions
+    isFavorited,
+    addFavorite,
+    removeFavorite,
+    toggleFavorite,
+    clearFavorites,
+    pruneInvalidFavorites,
+    reorderFavorites
+  }
+})
diff --git a/src/stores/workspace/nodeHelpStore.test.ts b/src/stores/workspace/nodeHelpStore.test.ts
new file mode 100644
index 0000000000..edfb078c33
--- /dev/null
+++ b/src/stores/workspace/nodeHelpStore.test.ts
@@ -0,0 +1,51 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it } from 'vitest'
+
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+import { useNodeHelpStore } from '@/stores/workspace/nodeHelpStore'
+
+describe('nodeHelpStore', () => {
+  const mockCoreNode = {
+    name: 'TestNode',
+    display_name: 'Test Node',
+    description: 'A test node',
+    inputs: {},
+    outputs: [],
+    python_module: 'comfy.test_node'
+  }
+
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+  })
+
+  it('should initialize with empty state', () => {
+    const nodeHelpStore = useNodeHelpStore()
+    expect(nodeHelpStore.currentHelpNode).toBeNull()
+    expect(nodeHelpStore.isHelpOpen).toBe(false)
+  })
+
+  it('should open help for a node', () => {
+    const nodeHelpStore = useNodeHelpStore()
+
+    nodeHelpStore.openHelp(
+      mockCoreNode as Partial<ComfyNodeDefImpl> as ComfyNodeDefImpl
+    )
+
+    expect(nodeHelpStore.currentHelpNode).toStrictEqual(mockCoreNode)
+    expect(nodeHelpStore.isHelpOpen).toBe(true)
+  })
+
+  it('should close help', () => {
+    const nodeHelpStore = useNodeHelpStore()
+
+    nodeHelpStore.openHelp(
+      mockCoreNode as Partial<ComfyNodeDefImpl> as ComfyNodeDefImpl
+    )
+    expect(nodeHelpStore.isHelpOpen).toBe(true)
+
+    nodeHelpStore.closeHelp()
+    expect(nodeHelpStore.currentHelpNode).toBeNull()
+    expect(nodeHelpStore.isHelpOpen).toBe(false)
+  })
+})
diff --git a/src/stores/workspace/nodeHelpStore.ts b/src/stores/workspace/nodeHelpStore.ts
index a04d6d8295..4e67650405 100644
--- a/src/stores/workspace/nodeHelpStore.ts
+++ b/src/stores/workspace/nodeHelpStore.ts
@@ -1,18 +1,11 @@
 import { defineStore } from 'pinia'
-import { computed, ref, watch } from 'vue'
+import { computed, ref } from 'vue'
 
-import { i18n } from '@/i18n'
-import { nodeHelpService } from '@/services/nodeHelpService'
 import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
-import { renderMarkdownToHtml } from '@/utils/markdownRendererUtil'
-import { getNodeHelpBaseUrl } from '@/workbench/utils/nodeHelpUtil'
 
 export const useNodeHelpStore = defineStore('nodeHelp', () => {
   const currentHelpNode = ref<ComfyNodeDefImpl | null>(null)
   const isHelpOpen = computed(() => currentHelpNode.value !== null)
-  const helpContent = ref<string>('')
-  const isLoading = ref<boolean>(false)
-  const errorMsg = ref<string | null>(null)
 
   function openHelp(nodeDef: ComfyNodeDefImpl) {
     currentHelpNode.value = nodeDef
@@ -22,48 +15,10 @@ export const useNodeHelpStore = defineStore('nodeHelp', () => {
     currentHelpNode.value = null
   }
 
-  // Base URL for relative assets in node docs markdown
-  const baseUrl = computed(() => {
-    const node = currentHelpNode.value
-    if (!node) return ''
-    return getNodeHelpBaseUrl(node)
-  })
-
-  // Watch for help node changes and fetch its docs markdown
-  watch(
-    () => currentHelpNode.value,
-    async (node) => {
-      helpContent.value = ''
-      errorMsg.value = null
-
-      if (node) {
-        isLoading.value = true
-        try {
-          const locale = i18n.global.locale.value || 'en'
-          helpContent.value = await nodeHelpService.fetchNodeHelp(node, locale)
-        } catch (e: any) {
-          errorMsg.value = e.message
-          helpContent.value = node.description || ''
-        } finally {
-          isLoading.value = false
-        }
-      }
-    },
-    { immediate: true }
-  )
-
-  const renderedHelpHtml = computed(() => {
-    return renderMarkdownToHtml(helpContent.value, baseUrl.value)
-  })
-
   return {
     currentHelpNode,
     isHelpOpen,
     openHelp,
-    closeHelp,
-    baseUrl,
-    renderedHelpHtml,
-    isLoading,
-    error: errorMsg
+    closeHelp
   }
 })
diff --git a/src/stores/workspace/rightSidePanelStore.ts b/src/stores/workspace/rightSidePanelStore.ts
index 0fb10a0b56..e5ed9f776d 100644
--- a/src/stores/workspace/rightSidePanelStore.ts
+++ b/src/stores/workspace/rightSidePanelStore.ts
@@ -1,18 +1,55 @@
 import { defineStore } from 'pinia'
-import { computed, ref } from 'vue'
+import { computed, ref, watch } from 'vue'
 
-export type RightSidePanelTab = 'parameters' | 'settings' | 'info' | 'subgraph'
+import { useSettingStore } from '@/platform/settings/settingStore'
+
+export type RightSidePanelTab =
+  | 'parameters'
+  | 'nodes'
+  | 'settings'
+  | 'info'
+  | 'subgraph'
+  | 'errors'
+
+type RightSidePanelSection = 'advanced-inputs' | string
 
 /**
  * Store for managing the right side panel state.
  * This panel displays properties and settings for selected nodes.
  */
 export const useRightSidePanelStore = defineStore('rightSidePanel', () => {
-  const isOpen = ref(false)
+  const settingStore = useSettingStore()
+
+  const isLegacyMenu = computed(
+    () => settingStore.get('Comfy.UseNewMenu') === 'Disabled'
+  )
+
+  const isOpen = computed({
+    get: () =>
+      !isLegacyMenu.value && settingStore.get('Comfy.RightSidePanel.IsOpen'),
+    set: (value: boolean) =>
+      settingStore.set('Comfy.RightSidePanel.IsOpen', value)
+  })
   const activeTab = ref<RightSidePanelTab>('parameters')
   const isEditingSubgraph = computed(() => activeTab.value === 'subgraph')
+  const focusedSection = ref<RightSidePanelSection | null>(null)
+  /**
+   * Graph node ID to focus in the errors tab.
+   * Set by SectionWidgets when the user clicks "See Error", consumed and
+   * cleared by TabErrors after expanding the relevant error group.
+   */
+  const focusedErrorNodeId = ref<string | null>(null)
+  const searchQuery = ref('')
+
+  // Auto-close panel when switching to legacy menu mode
+  watch(isLegacyMenu, (legacy) => {
+    if (legacy) {
+      void settingStore.set('Comfy.RightSidePanel.IsOpen', false)
+    }
+  })
 
   function openPanel(tab?: RightSidePanelTab) {
+    if (isLegacyMenu.value) return
     isOpen.value = true
     if (tab) {
       activeTab.value = tab
@@ -27,12 +64,34 @@ export const useRightSidePanelStore = defineStore('rightSidePanel', () => {
     isOpen.value = !isOpen.value
   }
 
+  /**
+   * Focus on a specific section in the right side panel.
+   * This will open the panel, switch to the parameters tab, and signal
+   * the component to expand and scroll to the section.
+   */
+  function focusSection(section: RightSidePanelSection) {
+    openPanel('parameters')
+    focusedSection.value = section
+  }
+
+  /**
+   * Clear the focused section after it has been handled.
+   */
+  function clearFocusedSection() {
+    focusedSection.value = null
+  }
+
   return {
     isOpen,
     activeTab,
     isEditingSubgraph,
+    focusedSection,
+    focusedErrorNodeId,
+    searchQuery,
     openPanel,
     closePanel,
-    togglePanel
+    togglePanel,
+    focusSection,
+    clearFocusedSection
   }
 })
diff --git a/tests-ui/tests/store/searchBoxStore.test.ts b/src/stores/workspace/searchBoxStore.test.ts
similarity index 87%
rename from tests-ui/tests/store/searchBoxStore.test.ts
rename to src/stores/workspace/searchBoxStore.test.ts
index 10a3ab7d47..022c8fc72a 100644
--- a/tests-ui/tests/store/searchBoxStore.test.ts
+++ b/src/stores/workspace/searchBoxStore.test.ts
@@ -1,4 +1,5 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import type NodeSearchBoxPopover from '@/components/searchbox/NodeSearchBoxPopover.vue'
@@ -19,22 +20,22 @@ vi.mock('@/platform/settings/settingStore', () => ({
 }))
 
 function createMockPopover(): InstanceType<typeof NodeSearchBoxPopover> {
-  return { showSearchBox: vi.fn() } satisfies Partial<
+  return { showSearchBox: vi.fn() } as Partial<
     InstanceType<typeof NodeSearchBoxPopover>
-  > as unknown as InstanceType<typeof NodeSearchBoxPopover>
+  > as InstanceType<typeof NodeSearchBoxPopover>
 }
 
 function createMockSettingStore(): ReturnType<typeof useSettingStore> {
   return {
     get: vi.fn()
-  } satisfies Partial<
-    ReturnType<typeof useSettingStore>
-  > as unknown as ReturnType<typeof useSettingStore>
+  } as Partial<ReturnType<typeof useSettingStore>> as ReturnType<
+    typeof useSettingStore
+  >
 }
 
 describe('useSearchBoxStore', () => {
   beforeEach(() => {
-    setActivePinia(createPinia())
+    setActivePinia(createTestingPinia({ stubActions: false }))
 
     vi.restoreAllMocks()
   })
@@ -64,7 +65,7 @@ describe('useSearchBoxStore', () => {
 
   describe('when user has legacy search box enabled', () => {
     beforeEach(() => {
-      vi.mocked(mockSettingStore.get).mockReturnValue('legacy')
+      vi.mocked(mockSettingStore.get).mockReturnValue('litegraph (legacy)')
     })
 
     it('should show new search box is disabled', () => {
@@ -103,7 +104,7 @@ describe('useSearchBoxStore', () => {
 
   describe('when user configures popover reference', () => {
     beforeEach(() => {
-      vi.mocked(mockSettingStore.get).mockReturnValue('legacy')
+      vi.mocked(mockSettingStore.get).mockReturnValue('litegraph (legacy)')
     })
 
     it('should enable legacy search when popover is set', () => {
diff --git a/src/stores/workspace/searchBoxStore.ts b/src/stores/workspace/searchBoxStore.ts
index f5acff936f..a498f3b570 100644
--- a/src/stores/workspace/searchBoxStore.ts
+++ b/src/stores/workspace/searchBoxStore.ts
@@ -10,10 +10,14 @@ export const useSearchBoxStore = defineStore('searchBox', () => {
   const settingStore = useSettingStore()
   const { x, y } = useMouse()
 
-  const newSearchBoxEnabled = computed(
+  const useSearchBoxV2 = computed(
     () => settingStore.get('Comfy.NodeSearchBoxImpl') === 'default'
   )
 
+  const newSearchBoxEnabled = computed(
+    () => settingStore.get('Comfy.NodeSearchBoxImpl') !== 'litegraph (legacy)'
+  )
+
   const popoverRef = shallowRef<InstanceType<
     typeof NodeSearchBoxPopover
   > | null>(null)
@@ -42,6 +46,7 @@ export const useSearchBoxStore = defineStore('searchBox', () => {
   }
 
   return {
+    useSearchBoxV2,
     newSearchBoxEnabled,
     setPopoverRef,
     toggleVisible,
diff --git a/src/stores/workspace/sidebarTabStore.test.ts b/src/stores/workspace/sidebarTabStore.test.ts
new file mode 100644
index 0000000000..cef96df72b
--- /dev/null
+++ b/src/stores/workspace/sidebarTabStore.test.ts
@@ -0,0 +1,163 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { nextTick, ref } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
+
+const { mockGetSetting, mockRegisterCommand, mockRegisterCommands } =
+  vi.hoisted(() => ({
+    mockGetSetting: vi.fn(),
+    mockRegisterCommand: vi.fn(),
+    mockRegisterCommands: vi.fn()
+  }))
+
+vi.mock('@/platform/settings/settingStore', () => ({
+  useSettingStore: () => ({
+    get: mockGetSetting
+  })
+}))
+
+vi.mock('@/stores/commandStore', () => ({
+  useCommandStore: () => ({
+    registerCommand: mockRegisterCommand,
+    commands: []
+  })
+}))
+
+vi.mock('@/stores/menuItemStore', () => ({
+  useMenuItemStore: () => ({
+    registerCommands: mockRegisterCommands
+  })
+}))
+
+vi.mock('@/i18n', () => ({
+  t: (key: string) => key,
+  te: () => false
+}))
+
+vi.mock('@/composables/sidebarTabs/useAssetsSidebarTab', () => ({
+  useAssetsSidebarTab: () => ({
+    id: 'assets',
+    title: 'assets',
+    type: 'vue',
+    component: {}
+  })
+}))
+
+vi.mock('@/composables/sidebarTabs/useJobHistorySidebarTab', () => ({
+  useJobHistorySidebarTab: () => ({
+    id: 'job-history',
+    title: 'job-history',
+    type: 'vue',
+    component: {}
+  })
+}))
+
+vi.mock('@/composables/sidebarTabs/useNodeLibrarySidebarTab', () => ({
+  useNodeLibrarySidebarTab: () => ({
+    id: 'node-library',
+    title: 'node-library',
+    type: 'vue',
+    component: {}
+  })
+}))
+
+vi.mock('@/composables/sidebarTabs/useModelLibrarySidebarTab', () => ({
+  useModelLibrarySidebarTab: () => ({
+    id: 'model-library',
+    title: 'model-library',
+    type: 'vue',
+    component: {}
+  })
+}))
+
+vi.mock(
+  '@/platform/workflow/management/composables/useWorkflowsSidebarTab',
+  () => ({
+    useWorkflowsSidebarTab: () => ({
+      id: 'workflows',
+      title: 'workflows',
+      type: 'vue',
+      component: {}
+    })
+  })
+)
+
+vi.mock('@/platform/workflow/management/composables/useAppsSidebarTab', () => ({
+  useAppsSidebarTab: () => ({
+    id: 'apps',
+    title: 'apps',
+    type: 'vue',
+    component: {}
+  })
+}))
+
+describe('useSidebarTabStore', () => {
+  beforeEach(() => {
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    mockGetSetting.mockReset()
+    mockRegisterCommand.mockClear()
+    mockRegisterCommands.mockClear()
+  })
+
+  it('registers the job history tab when QPO V2 is enabled', () => {
+    mockGetSetting.mockImplementation((key: string) =>
+      key === 'Comfy.Queue.QPOV2' ? true : undefined
+    )
+
+    const store = useSidebarTabStore()
+    store.registerCoreSidebarTabs()
+
+    expect(store.sidebarTabs.map((tab) => tab.id)).toEqual([
+      'job-history',
+      'assets',
+      'node-library',
+      'model-library',
+      'workflows',
+      'apps'
+    ])
+    expect(mockRegisterCommand).toHaveBeenCalledTimes(6)
+  })
+
+  it('does not register the job history tab when QPO V2 is disabled', () => {
+    mockGetSetting.mockImplementation((key: string) =>
+      key === 'Comfy.Queue.QPOV2' ? false : undefined
+    )
+
+    const store = useSidebarTabStore()
+    store.registerCoreSidebarTabs()
+
+    expect(store.sidebarTabs.map((tab) => tab.id)).toEqual([
+      'assets',
+      'node-library',
+      'model-library',
+      'workflows',
+      'apps'
+    ])
+    expect(mockRegisterCommand).toHaveBeenCalledTimes(5)
+  })
+
+  it('prepends the job history tab when QPO V2 is toggled on', async () => {
+    const qpoV2Enabled = ref(false)
+    mockGetSetting.mockImplementation((key: string) =>
+      key === 'Comfy.Queue.QPOV2' ? qpoV2Enabled.value : undefined
+    )
+
+    const store = useSidebarTabStore()
+    store.registerCoreSidebarTabs()
+
+    qpoV2Enabled.value = true
+    await nextTick()
+
+    expect(store.sidebarTabs.map((tab) => tab.id)).toEqual([
+      'job-history',
+      'assets',
+      'node-library',
+      'model-library',
+      'workflows',
+      'apps'
+    ])
+    expect(mockRegisterCommand).toHaveBeenCalledTimes(6)
+  })
+})
diff --git a/src/stores/workspace/sidebarTabStore.ts b/src/stores/workspace/sidebarTabStore.ts
index 1a73ee725e..662d967544 100644
--- a/src/stores/workspace/sidebarTabStore.ts
+++ b/src/stores/workspace/sidebarTabStore.ts
@@ -1,11 +1,13 @@
 import { defineStore } from 'pinia'
-import { computed, ref } from 'vue'
+import { computed, ref, watch } from 'vue'
 
 import { useAssetsSidebarTab } from '@/composables/sidebarTabs/useAssetsSidebarTab'
+import { useJobHistorySidebarTab } from '@/composables/sidebarTabs/useJobHistorySidebarTab'
 import { useModelLibrarySidebarTab } from '@/composables/sidebarTabs/useModelLibrarySidebarTab'
 import { useNodeLibrarySidebarTab } from '@/composables/sidebarTabs/useNodeLibrarySidebarTab'
 import { t, te } from '@/i18n'
 import { useSettingStore } from '@/platform/settings/settingStore'
+import { useAppsSidebarTab } from '@/platform/workflow/management/composables/useAppsSidebarTab'
 import { useWorkflowsSidebarTab } from '@/platform/workflow/management/composables/useWorkflowsSidebarTab'
 import { useCommandStore } from '@/stores/commandStore'
 import { useMenuItemStore } from '@/stores/menuItemStore'
@@ -26,8 +28,13 @@ export const useSidebarTabStore = defineStore('sidebarTab', () => {
     activeSidebarTabId.value = activeSidebarTabId.value === tabId ? null : tabId
   }
 
-  const registerSidebarTab = (tab: SidebarTabExtension) => {
-    sidebarTabs.value = [...sidebarTabs.value, tab]
+  const registerSidebarTab = (
+    tab: SidebarTabExtension,
+    options?: { prepend?: boolean }
+  ) => {
+    sidebarTabs.value = options?.prepend
+      ? [tab, ...sidebarTabs.value]
+      : [...sidebarTabs.value, tab]
 
     // Generate label in format "Toggle X Sidebar"
     const labelFunction = () => {
@@ -45,7 +52,8 @@ export const useSidebarTabStore = defineStore('sidebarTab', () => {
         'node-library': 'sideToolbar.nodeLibrary',
         'model-library': 'sideToolbar.modelLibrary',
         workflows: 'sideToolbar.workflows',
-        assets: 'sideToolbar.assets'
+        assets: 'sideToolbar.assets',
+        'job-history': 'queue.jobHistory'
       }
 
       const key = menubarLabelKeys[tab.id]
@@ -95,6 +103,9 @@ export const useSidebarTabStore = defineStore('sidebarTab', () => {
       const newSidebarTabs = [...sidebarTabs.value]
       newSidebarTabs.splice(index, 1)
       sidebarTabs.value = newSidebarTabs
+      if (activeSidebarTabId.value === id) {
+        activeSidebarTabId.value = null
+      }
     }
   }
 
@@ -102,10 +113,30 @@ export const useSidebarTabStore = defineStore('sidebarTab', () => {
    * Register the core sidebar tabs.
    */
   const registerCoreSidebarTabs = () => {
+    const settingStore = useSettingStore()
+    const jobHistoryTabId = 'job-history'
+    const syncJobHistoryTab = (enabled: boolean) => {
+      const hasJobHistoryTab = sidebarTabs.value.some(
+        (tab) => tab.id === jobHistoryTabId
+      )
+      if (enabled && !hasJobHistoryTab) {
+        registerSidebarTab(useJobHistorySidebarTab(), { prepend: true })
+      } else if (!enabled && hasJobHistoryTab) {
+        unregisterSidebarTab(jobHistoryTabId)
+      }
+    }
+
+    syncJobHistoryTab(settingStore.get('Comfy.Queue.QPOV2'))
+    watch(
+      () => settingStore.get('Comfy.Queue.QPOV2'),
+      (enabled) => syncJobHistoryTab(enabled)
+    )
+
     registerSidebarTab(useAssetsSidebarTab())
     registerSidebarTab(useNodeLibrarySidebarTab())
     registerSidebarTab(useModelLibrarySidebarTab())
     registerSidebarTab(useWorkflowsSidebarTab())
+    registerSidebarTab(useAppsSidebarTab())
 
     const menuStore = useMenuItemStore()
 
diff --git a/src/stores/workspaceStore.ts b/src/stores/workspaceStore.ts
index 4b5b03df6b..01c4110753 100644
--- a/src/stores/workspaceStore.ts
+++ b/src/stores/workspaceStore.ts
@@ -1,3 +1,4 @@
+import { useMagicKeys } from '@vueuse/core'
 import { defineStore } from 'pinia'
 import { computed, ref } from 'vue'
 
@@ -11,14 +12,15 @@ import type { SidebarTabExtension, ToastManager } from '@/types/extensionTypes'
 
 import { useApiKeyAuthStore } from './apiKeyAuthStore'
 import { useCommandStore } from './commandStore'
+import { useExecutionErrorStore } from './executionErrorStore'
 import { useFirebaseAuthStore } from './firebaseAuthStore'
 import { useQueueSettingsStore } from './queueStore'
 import { useBottomPanelStore } from './workspace/bottomPanelStore'
 import { useSidebarTabStore } from './workspace/sidebarTabStore'
 
-export const useWorkspaceStore = defineStore('workspace', () => {
+function workspaceStoreSetup() {
   const spinner = ref(false)
-  const shiftDown = ref(false)
+  const { shift: shiftDown } = useMagicKeys()
   /**
    * Whether the workspace is in focus mode.
    * When in focus mode, only the graph editor is visible.
@@ -36,7 +38,8 @@ export const useWorkspaceStore = defineStore('workspace', () => {
     settings: useSettingStore().settingsById,
     // Allow generic key access to settings as custom nodes may add their
     // own settings which is not tracked by the `Setting` schema.
-    get: (key: string) => useSettingStore().get(key as keyof Settings),
+    get: <T = unknown>(key: string): T | undefined =>
+      useSettingStore().get(key as keyof Settings) as T | undefined,
     set: (key: string, value: unknown) =>
       useSettingStore().set(key as keyof Settings, value)
   }))
@@ -84,6 +87,8 @@ export const useWorkspaceStore = defineStore('workspace', () => {
     return sidebarTab.value.sidebarTabs
   }
 
+  const executionErrorStore = useExecutionErrorStore()
+
   return {
     spinner,
     shiftDown,
@@ -102,8 +107,14 @@ export const useWorkspaceStore = defineStore('workspace', () => {
     bottomPanel,
     user: partialUserStore,
 
+    // Execution error state (read-only, exposed for custom extensions)
+    lastNodeErrors: computed(() => executionErrorStore.lastNodeErrors),
+    lastExecutionError: computed(() => executionErrorStore.lastExecutionError),
+
     registerSidebarTab,
     unregisterSidebarTab,
     getSidebarTabs
   }
-})
+}
+
+export const useWorkspaceStore = defineStore('workspace', workspaceStoreSetup)
diff --git a/src/storybook/mocks/useJobActions.ts b/src/storybook/mocks/useJobActions.ts
new file mode 100644
index 0000000000..7ff122d7d0
--- /dev/null
+++ b/src/storybook/mocks/useJobActions.ts
@@ -0,0 +1,47 @@
+import { computed, ref, toValue } from 'vue'
+import type { MaybeRefOrGetter } from 'vue'
+
+import type { JobAction } from '../../composables/queue/useJobActions'
+import type { JobListItem } from '../../composables/queue/useJobList'
+import { isActiveJobState } from '../../utils/queueUtil'
+
+const actionsByJobId = ref<Record<string, JobAction[]>>({})
+const cancelAction: JobAction = {
+  icon: 'icon-[lucide--x]',
+  label: 'Cancel',
+  variant: 'destructive'
+}
+
+export function setMockJobActions(actions: Record<string, JobAction[]>) {
+  actionsByJobId.value = actions
+}
+
+export function useJobActions(
+  job?: MaybeRefOrGetter<JobListItem | null | undefined>
+) {
+  const jobRef = computed(() => (job ? (toValue(job) ?? null) : null))
+
+  const canCancelJob = computed(() => {
+    const currentJob = jobRef.value
+    if (!currentJob) {
+      return false
+    }
+
+    const configuredActions = actionsByJobId.value[currentJob.id]
+    if (configuredActions) {
+      return configuredActions.length > 0
+    }
+
+    return currentJob.showClear !== false && isActiveJobState(currentJob.state)
+  })
+
+  async function runCancelJob() {
+    return undefined
+  }
+
+  return {
+    cancelAction,
+    canCancelJob,
+    runCancelJob
+  }
+}
diff --git a/src/storybook/mocks/useJobList.ts b/src/storybook/mocks/useJobList.ts
new file mode 100644
index 0000000000..f873a5d37b
--- /dev/null
+++ b/src/storybook/mocks/useJobList.ts
@@ -0,0 +1,63 @@
+import { computed, ref } from 'vue'
+
+import type { TaskItemImpl } from '../../stores/queueStore'
+import type {
+  JobGroup,
+  JobListItem,
+  JobSortMode,
+  JobTab
+} from '../../composables/queue/useJobList'
+
+const jobItems = ref<JobListItem[]>([])
+
+function buildGroupedJobItems(): JobGroup[] {
+  return [
+    {
+      key: 'storybook',
+      label: 'Storybook',
+      items: jobItems.value
+    }
+  ]
+}
+
+const groupedJobItems = computed<JobGroup[]>(buildGroupedJobItems)
+
+export const jobTabs = ['All', 'Completed', 'Failed'] as const
+export const jobSortModes = ['mostRecent', 'totalGenerationTime'] as const
+
+const selectedJobTab = ref<JobTab>('All')
+const selectedWorkflowFilter = ref<'all' | 'current'>('all')
+const selectedSortMode = ref<JobSortMode>('mostRecent')
+const searchQuery = ref('')
+const currentNodeName = ref('KSampler')
+function buildEmptyTasks(): TaskItemImpl[] {
+  return []
+}
+
+const allTasksSorted = computed<TaskItemImpl[]>(buildEmptyTasks)
+const filteredTasks = computed<TaskItemImpl[]>(buildEmptyTasks)
+
+function buildHasFailedJobs() {
+  return jobItems.value.some((item) => item.state === 'failed')
+}
+
+const hasFailedJobs = computed(buildHasFailedJobs)
+
+export function setMockJobItems(items: JobListItem[]) {
+  jobItems.value = items
+}
+
+export function useJobList() {
+  return {
+    selectedJobTab,
+    selectedWorkflowFilter,
+    selectedSortMode,
+    searchQuery,
+    hasFailedJobs,
+    allTasksSorted,
+    filteredTasks,
+    jobItems,
+    groupedJobItems,
+    currentNodeName
+  }
+}
diff --git a/src/types/algoliaTypes.ts b/src/types/algoliaTypes.ts
index de42fb78a4..92b39b6310 100644
--- a/src/types/algoliaTypes.ts
+++ b/src/types/algoliaTypes.ts
@@ -72,7 +72,7 @@ export interface NodesIndexSuggestion {
     exact_nb_hits: number
     facets: {
       exact_matches: Record<string, number>
-      analytics: Record<string, any>
+      analytics: Record<string, unknown>
     }
   }
   objectID: RegistryNodePack['id']
diff --git a/src/types/comfy.ts b/src/types/comfy.ts
index 436e504eff..7249f64718 100644
--- a/src/types/comfy.ts
+++ b/src/types/comfy.ts
@@ -3,9 +3,10 @@ import type {
   Positionable
 } from '@/lib/litegraph/src/interfaces'
 import type { LGraphCanvas, LGraphNode } from '@/lib/litegraph/src/litegraph'
+import type { NodeReplacement } from '@/platform/nodeReplacement/types'
 import type { SettingParams } from '@/platform/settings/types'
 import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
-import type { Keybinding } from '@/schemas/keyBindingSchema'
+import type { Keybinding } from '@/platform/keybindings/types'
 import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'
 import type { ComfyApp } from '@/scripts/app'
 import type { ComfyWidgetConstructor } from '@/scripts/widgets'
@@ -19,6 +20,7 @@ export interface AboutPageBadge {
   label: string
   url: string
   icon: string
+  severity?: 'danger' | 'warn'
 }
 
 type MenuCommandGroup = {
@@ -88,11 +90,15 @@ export type MissingNodeType =
   // Primarily used by group nodes.
   | {
       type: string
+      nodeId?: string | number
+      cnrId?: string
       hint?: string
       action?: {
         text: string
         callback: () => void
       }
+      isReplaceable?: boolean
+      replacement?: NodeReplacement
     }
 
 export interface ComfyExtension {
@@ -134,18 +140,15 @@ export interface ComfyExtension {
   actionBarButtons?: ActionBarButton[]
   /**
    * Allows any initialisation, e.g. loading resources. Called after the canvas is created but before nodes are added
-   * @param app The ComfyUI app instance
    */
   init?(app: ComfyApp): Promise<void> | void
   /**
    * Allows any additional setup, called after the application is fully set up and running
-   * @param app The ComfyUI app instance
    */
   setup?(app: ComfyApp): Promise<void> | void
   /**
    * Called before nodes are registered with the graph
    * @param defs The collection of node definitions, add custom ones or edit existing ones
-   * @param app The ComfyUI app instance
    */
   addCustomNodeDefs?(
     defs: Record<string, ComfyNodeDef>,
@@ -155,7 +158,6 @@ export interface ComfyExtension {
   // getCustomWidgets.
   /**
    * Allows the extension to add custom widgets
-   * @param app The ComfyUI app instance
    * @returns An array of {[widget name]: widget data}
    */
   getCustomWidgets?(app: ComfyApp): Promise<Widgets> | Widgets
@@ -185,7 +187,7 @@ export interface ComfyExtension {
    * Allows the extension to add additional handling to the node before it is registered with **LGraph**
    * @param nodeType The node class (not an instance)
    * @param nodeData The original node object info config object
-   * @param app The ComfyUI app instance
+   * @param app The app instance
    */
   beforeRegisterNodeDef?(
     nodeType: typeof LGraphNode,
@@ -198,15 +200,13 @@ export interface ComfyExtension {
    * Modifications is expected to be made in place.
    *
    * @param defs The node definitions
-   * @param app The ComfyUI app instance
+   * @param app The app instance
    */
   beforeRegisterVueAppNodeDefs?(defs: ComfyNodeDef[], app: ComfyApp): void
 
   /**
    * Allows the extension to register additional nodes with LGraph after standard nodes are added.
    * Custom node classes should extend **LGraphNode**.
-   *
-   * @param app The ComfyUI app instance
    */
   registerCustomNodes?(app: ComfyApp): Promise<void> | void
   /**
@@ -214,13 +214,13 @@ export interface ComfyExtension {
    * If you break something in the backend and want to patch workflows in the frontend
    * This is the place to do this
    * @param node The node that has been loaded
-   * @param app The ComfyUI app instance
+   * @param app The app instance
    */
   loadedGraphNode?(node: LGraphNode, app: ComfyApp): void
   /**
    * Allows the extension to run code after the constructor of the node
    * @param node The node that has been created
-   * @param app The ComfyUI app instance
+   * @param app The app instance
    */
   nodeCreated?(node: LGraphNode, app: ComfyApp): void
 
@@ -228,18 +228,22 @@ export interface ComfyExtension {
    * Allows the extension to modify the graph data before it is configured.
    * @param graphData The graph data
    * @param missingNodeTypes The missing node types
+   * @param app The app instance
    */
   beforeConfigureGraph?(
     graphData: ComfyWorkflowJSON,
-    missingNodeTypes: MissingNodeType[]
+    missingNodeTypes: MissingNodeType[],
+    app: ComfyApp
   ): Promise<void> | void
 
   /**
    * Allows the extension to run code after the graph is configured.
    * @param missingNodeTypes The missing node types
+   * @param app The app instance
    */
   afterConfigureGraph?(
-    missingNodeTypes: MissingNodeType[]
+    missingNodeTypes: MissingNodeType[],
+    app: ComfyApp
   ): Promise<void> | void
 
   /**
@@ -261,5 +265,5 @@ export interface ComfyExtension {
    */
   onAuthUserLogout?(): Promise<void> | void
 
-  [key: string]: any
+  [key: string]: unknown
 }
diff --git a/src/types/extensionTypes.ts b/src/types/extensionTypes.ts
index 7061a9b158..7c9c71b2ce 100644
--- a/src/types/extensionTypes.ts
+++ b/src/types/extensionTypes.ts
@@ -1,5 +1,7 @@
 import type { Component } from 'vue'
 
+import type { NodeId } from '@/platform/workflow/validation/schemas/workflowSchema'
+import type { ExecutionErrorWsMessage, NodeError } from '@/schemas/apiSchema'
 import type { useDialogService } from '@/services/dialogService'
 import type { ComfyCommand } from '@/stores/commandStore'
 
@@ -111,6 +113,10 @@ export interface ExtensionManager {
     get: <T = unknown>(id: string) => T | undefined
     set: <T = unknown>(id: string, value: T) => void
   }
+
+  // Execution error state (read-only)
+  lastNodeErrors: Record<NodeId, NodeError> | null
+  lastExecutionError: ExecutionErrorWsMessage | null
 }
 
 export interface CommandManager {
diff --git a/src/types/index.ts b/src/types/index.ts
index 25f8e20900..947c9b3ad2 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -64,6 +64,17 @@ export type {
   ToastMessageOptions
 }
 
+interface CapturedMessages {
+  clientFeatureFlags: { type: string; data: Record<string, unknown> } | null
+  serverFeatureFlags: Record<string, unknown> | null
+}
+
+interface AppReadiness {
+  featureFlagsReceived: boolean
+  apiInitialized: boolean
+  appInitialized: boolean
+}
+
 declare global {
   interface Window {
     /** For use by extensions and in the browser console. Where possible, import `app` from '@/scripts/app' instead. */
@@ -71,5 +82,11 @@ declare global {
 
     /** For use by extensions and in the browser console. Where possible, import `app` and access via `app.graph` instead. */
     graph?: unknown
+
+    /** For use in tests to capture WebSocket messages */
+    __capturedMessages?: CapturedMessages
+
+    /** For use in tests to track app initialization state */
+    __appReadiness?: AppReadiness
   }
 }
diff --git a/src/types/litegraph-augmentation.d.ts b/src/types/litegraph-augmentation.d.ts
index 0b283b1586..8ee82a1d42 100644
--- a/src/types/litegraph-augmentation.d.ts
+++ b/src/types/litegraph-augmentation.d.ts
@@ -5,7 +5,10 @@ import type {
   LLink,
   Size
 } from '@/lib/litegraph/src/litegraph'
-import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+import type {
+  IBaseWidget,
+  TWidgetValue
+} from '@/lib/litegraph/src/types/widgets'
 import type { NodeId } from '@/platform/workflow/validation/schemas/workflowSchema'
 import type { NodeExecutionOutput } from '@/schemas/apiSchema'
 import type { ComfyNodeDef as ComfyNodeDefV2 } from '@/schemas/nodeDef/nodeDefSchemaV2'
@@ -42,10 +45,14 @@ declare module '@/lib/litegraph/src/types/widgets' {
     hidden?: boolean
   }
 
+  interface WidgetCallbackOptions {
+    isPartialExecution?: boolean
+  }
+
   interface IBaseWidget {
     onRemove?(): void
-    beforeQueued?(): unknown
-    afterQueued?(): unknown
+    beforeQueued?(options?: WidgetCallbackOptions): unknown
+    afterQueued?(options?: WidgetCallbackOptions): unknown
     serializeValue?(node: LGraphNode, index: number): Promise<unknown> | unknown
 
     /**
@@ -168,8 +175,12 @@ declare module '@/lib/litegraph/src/litegraph' {
     videoContainer?: HTMLElement
     /** Whether the node's preview media is loading */
     isLoading?: boolean
+    /** Whether a file is being uploaded to this node */
+    isUploading?: boolean
     /** The content type of the node's preview media */
     previewMediaType?: 'image' | 'video' | 'audio' | 'model'
+    /** If true, output images are stored but not rendered below the node */
+    hideOutputImages?: boolean
 
     preview: string[]
     /** Index of the currently selected image on a multi-image node such as Preview Image */
@@ -210,6 +221,6 @@ declare module '@/lib/litegraph/src/litegraph' {
    * used by litegraph internally. We should remove the dependency on it later.
    */
   interface LGraphNode {
-    widgets_values?: unknown[]
+    widgets_values?: TWidgetValue[]
   }
 }
diff --git a/src/types/navTypes.ts b/src/types/navTypes.ts
index ec17c5cecf..d38865ab68 100644
--- a/src/types/navTypes.ts
+++ b/src/types/navTypes.ts
@@ -2,6 +2,7 @@ export interface NavItemData {
   id: string
   label: string
   icon: string
+  badge?: string | number
 }
 
 export interface NavGroupData {
diff --git a/tests-ui/tests/types/nodeIdentification.test.ts b/src/types/nodeIdentification.test.ts
similarity index 72%
rename from tests-ui/tests/types/nodeIdentification.test.ts
rename to src/types/nodeIdentification.test.ts
index 5b2a94325a..20d0215414 100644
--- a/tests-ui/tests/types/nodeIdentification.test.ts
+++ b/src/types/nodeIdentification.test.ts
@@ -2,14 +2,17 @@ import { describe, expect, it } from 'vitest'
 
 import type { NodeId } from '@/platform/workflow/validation/schemas/workflowSchema'
 import {
-  type NodeLocatorId,
+  compareExecutionId,
   createNodeExecutionId,
   createNodeLocatorId,
+  getAncestorExecutionIds,
+  getParentExecutionIds,
   isNodeExecutionId,
   isNodeLocatorId,
   parseNodeExecutionId,
   parseNodeLocatorId
 } from '@/types/nodeIdentification'
+import type { NodeLocatorId } from '@/types/nodeIdentification'
 
 describe('nodeIdentification', () => {
   describe('NodeLocatorId', () => {
@@ -204,4 +207,71 @@ describe('nodeIdentification', () => {
       expect(parsed).toEqual(nodeIds)
     })
   })
+
+  describe('getAncestorExecutionIds', () => {
+    it('returns only itself for a root node', () => {
+      expect(getAncestorExecutionIds('65')).toEqual(['65'])
+    })
+
+    it('returns all ancestors including self for nested IDs', () => {
+      expect(getAncestorExecutionIds('65:70')).toEqual(['65', '65:70'])
+      expect(getAncestorExecutionIds('65:70:63')).toEqual([
+        '65',
+        '65:70',
+        '65:70:63'
+      ])
+    })
+  })
+
+  describe('getParentExecutionIds', () => {
+    it('returns empty for a root node', () => {
+      expect(getParentExecutionIds('65')).toEqual([])
+    })
+
+    it('returns all ancestors excluding self for nested IDs', () => {
+      expect(getParentExecutionIds('65:70')).toEqual(['65'])
+      expect(getParentExecutionIds('65:70:63')).toEqual(['65', '65:70'])
+    })
+  })
+
+  describe('compareExecutionId', () => {
+    it('sorts simple numeric IDs in ascending order', () => {
+      expect(compareExecutionId('1', '2')).toBeLessThan(0)
+      expect(compareExecutionId('2', '1')).toBeGreaterThan(0)
+      expect(compareExecutionId('5', '5')).toBe(0)
+    })
+
+    it('compares nested IDs left-to-right by segment', () => {
+      // "1" < "1:20" < "2" < "10:11:12" as documented
+      expect(compareExecutionId('1', '1:20')).toBeLessThan(0)
+      expect(compareExecutionId('1:20', '2')).toBeLessThan(0)
+      expect(compareExecutionId('2', '10:11:12')).toBeLessThan(0)
+    })
+
+    it('treats a shorter ID as having trailing segment 0 when comparing', () => {
+      // "5" vs "5:0" → first segments equal, second: 0 vs 0 → equal
+      expect(compareExecutionId('5', '5:0')).toBe(0)
+      // "5" vs "5:1" → second segment 0 < 1
+      expect(compareExecutionId('5', '5:1')).toBeLessThan(0)
+    })
+
+    it('handles undefined inputs by treating them as empty string (segment 0)', () => {
+      expect(compareExecutionId(undefined, '1')).toBeLessThan(0)
+      expect(compareExecutionId('1', undefined)).toBeGreaterThan(0)
+      expect(compareExecutionId(undefined, undefined)).toBe(0)
+    })
+
+    it('handles empty string inputs', () => {
+      expect(compareExecutionId('', '1')).toBeLessThan(0)
+      expect(compareExecutionId('1', '')).toBeGreaterThan(0)
+      expect(compareExecutionId('', '')).toBe(0)
+    })
+
+    it('treats non-numeric segments as 0 via NaN guard', () => {
+      // Number('foo') → NaN → treated as 0
+      expect(compareExecutionId('foo', '1')).toBeLessThan(0)
+      expect(compareExecutionId('foo', '0')).toBe(0)
+      expect(compareExecutionId('1:foo', '1:0')).toBe(0)
+    })
+  })
 })
diff --git a/src/types/nodeIdentification.ts b/src/types/nodeIdentification.ts
index d9a299c398..eb29525001 100644
--- a/src/types/nodeIdentification.ts
+++ b/src/types/nodeIdentification.ts
@@ -121,3 +121,51 @@ export function parseNodeExecutionId(id: string): NodeId[] | null {
 export function createNodeExecutionId(nodeIds: NodeId[]): NodeExecutionId {
   return nodeIds.join(':')
 }
+
+/**
+ * Returns all ancestor execution IDs for a given execution ID, including itself.
+ *
+ * Example: "65:70:63" → ["65", "65:70", "65:70:63"]
+ */
+export function getAncestorExecutionIds(
+  executionId: string | NodeExecutionId
+): NodeExecutionId[] {
+  const parts = executionId.split(':')
+  return Array.from({ length: parts.length }, (_, i) =>
+    parts.slice(0, i + 1).join(':')
+  )
+}
+
+/**
+ * Returns all ancestor execution IDs for a given execution ID, excluding itself.
+ *
+ * Example: "65:70:63" → ["65", "65:70"]
+ */
+export function getParentExecutionIds(
+  executionId: string | NodeExecutionId
+): NodeExecutionId[] {
+  return getAncestorExecutionIds(executionId).slice(0, -1)
+}
+
+/**
+ * Compare two NodeExecutionIds for ascending numeric sort order.
+ * Splits each ID by ":" and compares segments numerically left to right.
+ *
+ * Example order: "1" < "1:20" < "2" < "10:11:12"
+ */
+export function compareExecutionId(
+  a: string | undefined,
+  b: string | undefined
+): number {
+  const parse = (id: string | undefined) => (id ?? '').split(':').map(Number)
+  const idA = parse(a)
+  const idB = parse(b)
+  for (let i = 0; i < Math.max(idA.length, idB.length); i++) {
+    const segA = idA[i] ?? 0
+    const segB = idB[i] ?? 0
+    const diff =
+      (Number.isNaN(segA) ? 0 : segA) - (Number.isNaN(segB) ? 0 : segB)
+    if (diff !== 0) return diff
+  }
+  return 0
+}
diff --git a/src/types/nodeOrganizationTypes.ts b/src/types/nodeOrganizationTypes.ts
index c6abb06057..3f10e65c40 100644
--- a/src/types/nodeOrganizationTypes.ts
+++ b/src/types/nodeOrganizationTypes.ts
@@ -1,7 +1,9 @@
 import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+import type { TreeNode } from '@/types/treeExplorerTypes'
 
 export type GroupingStrategyId = 'category' | 'module' | 'source'
 export type SortingStrategyId = 'original' | 'alphabetical'
+export type TabId = 'essentials' | 'all' | 'blueprints'
 
 /**
  * Strategy for grouping nodes into tree structure
@@ -42,3 +44,25 @@ export interface NodeOrganizationOptions {
   groupBy?: string
   sortBy?: string
 }
+
+export type NodeCategoryId =
+  | 'blueprints'
+  | 'partnerNodes'
+  | 'comfyNodes'
+  | 'extensions'
+
+export const NODE_CATEGORY_LABELS: Record<NodeCategoryId, string> = {
+  blueprints: 'sideToolbar.nodeLibraryTab.sections.subgraphBlueprints',
+  partnerNodes: 'sideToolbar.nodeLibraryTab.sections.partnerNodes',
+  comfyNodes: 'sideToolbar.nodeLibraryTab.sections.comfyNodes',
+  extensions: 'sideToolbar.nodeLibraryTab.sections.extensions'
+}
+
+export interface NodeSection {
+  /** Filter category identifier */
+  category?: NodeCategoryId
+  /** Section title (i18n key) for tabs that don't use category-based labels */
+  title?: string
+  /** Tree of nodes in this section */
+  tree: TreeNode
+}
diff --git a/tests-ui/tests/nodeSource.test.ts b/src/types/nodeSource.test.ts
similarity index 64%
rename from tests-ui/tests/nodeSource.test.ts
rename to src/types/nodeSource.test.ts
index cbdb9f0e89..270e7518fd 100644
--- a/tests-ui/tests/nodeSource.test.ts
+++ b/src/types/nodeSource.test.ts
@@ -72,4 +72,39 @@ describe('getNodeSource', () => {
       badgeText: '?'
     })
   })
+
+  describe('essentials nodes', () => {
+    it('should identify essentials nodes when essentials_category is set', () => {
+      const result = getNodeSource('nodes.some_module', 'Image')
+      expect(result.type).toBe(NodeSourceType.Essentials)
+      expect(result.className).toBe('comfy-essentials')
+    })
+
+    it('should identify essentials nodes from custom_nodes module', () => {
+      const result = getNodeSource(
+        'custom_nodes.ComfyUI-Example@1.0.0',
+        'Video'
+      )
+      expect(result.type).toBe(NodeSourceType.Essentials)
+      expect(result.className).toBe('comfy-essentials')
+      expect(result.displayText).toBe('Example')
+    })
+
+    it('should not identify nodes without essentials_category as essentials', () => {
+      const result = getNodeSource('nodes.some_module', undefined)
+      expect(result.type).toBe(NodeSourceType.Core)
+    })
+  })
+
+  describe('blueprint nodes', () => {
+    it('should identify blueprint nodes', () => {
+      const result = getNodeSource('blueprint.my_blueprint')
+      expect(result).toEqual({
+        type: NodeSourceType.Blueprint,
+        className: 'blueprint',
+        displayText: 'Blueprint',
+        badgeText: 'bp'
+      })
+    })
+  })
 })
diff --git a/src/types/nodeSource.ts b/src/types/nodeSource.ts
index 9dce4ae310..a6931509e3 100644
--- a/src/types/nodeSource.ts
+++ b/src/types/nodeSource.ts
@@ -2,8 +2,10 @@ 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
@@ -19,18 +21,30 @@ const UNKNOWN_NODE_SOURCE: NodeSource = {
   badgeText: '?'
 }
 
-const shortenNodeName = (name: string) => {
+function shortenNodeName(name: string) {
   return name
     .replace(/^(ComfyUI-|ComfyUI_|Comfy-|Comfy_)/, '')
     .replace(/(-ComfyUI|_ComfyUI|-Comfy|_Comfy)$/, '')
 }
 
-export const getNodeSource = (python_module?: string): NodeSource => {
+export function getNodeSource(
+  python_module?: string,
+  essentials_category?: string
+): NodeSource {
   if (!python_module) {
     return UNKNOWN_NODE_SOURCE
   }
   const modules = python_module.split('.')
-  if (['nodes', 'comfy_extras', 'comfy_api_nodes'].includes(modules[0])) {
+  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',
@@ -46,8 +60,9 @@ export const getNodeSource = (python_module?: string): NodeSource => {
     }
   } else if (modules[0] === 'custom_nodes') {
     const moduleName = modules[1]
-    // Custom nodes installed via ComfyNodeRegistry will be in the format of
-    // custom_nodes.<custom node name>@<version>
+    if (!moduleName) {
+      return UNKNOWN_NODE_SOURCE
+    }
     const customNodeName = moduleName.split('@')[0]
     const displayName = shortenNodeName(customNodeName)
     return {
diff --git a/src/types/simplifiedWidget.ts b/src/types/simplifiedWidget.ts
index 40b74f98b8..4e0f486662 100644
--- a/src/types/simplifiedWidget.ts
+++ b/src/types/simplifiedWidget.ts
@@ -3,6 +3,7 @@
  * Removes all DOM manipulation and positioning concerns
  */
 import type { InputSpec as InputSpecV2 } from '@/schemas/nodeDef/nodeDefSchemaV2'
+import type { IWidgetOptions } from '@/lib/litegraph/src/types/widgets'
 
 /** Valid types for widget values */
 export type WidgetValue =
@@ -15,7 +16,7 @@ export type WidgetValue =
   | void
   | File[]
 
-const CONTROL_OPTIONS = [
+export const CONTROL_OPTIONS = [
   'fixed',
   'increment',
   'decrement',
@@ -39,7 +40,7 @@ export type SafeControlWidget = {
 
 export interface SimplifiedWidget<
   T extends WidgetValue = WidgetValue,
-  O = Record<string, any>
+  O extends IWidgetOptions = IWidgetOptions
 > {
   /** Display name of the widget */
   name: string
@@ -68,7 +69,7 @@ export interface SimplifiedWidget<
   nodeType?: string
 
   /** Optional serialization method for custom value handling */
-  serializeValue?: () => any
+  serializeValue?: () => unknown
 
   /** Optional input specification backing this widget */
   spec?: InputSpecV2
@@ -78,7 +79,7 @@ export interface SimplifiedWidget<
 
 export interface SimplifiedControlWidget<
   T extends WidgetValue = WidgetValue,
-  O = Record<string, any>
+  O extends IWidgetOptions = IWidgetOptions
 > extends SimplifiedWidget<T, O> {
   controlWidget: SafeControlWidget
 }
diff --git a/src/types/treeExplorerTypes.ts b/src/types/treeExplorerTypes.ts
index 316a8fb175..cc7bedb0a4 100644
--- a/src/types/treeExplorerTypes.ts
+++ b/src/types/treeExplorerTypes.ts
@@ -1,13 +1,21 @@
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
+import type { NodeCategoryId } from '@/types/nodeOrganizationTypes'
 import type { MenuItem } from 'primevue/menuitem'
 import type { TreeNode as PrimeVueTreeNode } from 'primevue/treenode'
-import type { InjectionKey, ModelRef } from 'vue'
+import type { InjectionKey, ModelRef, Ref } from 'vue'
 
 export interface TreeNode extends PrimeVueTreeNode {
   label: string
   children?: this[]
 }
 
-export interface TreeExplorerNode<T = any> extends TreeNode {
+export interface NodeLibrarySection<T = unknown> {
+  category?: NodeCategoryId
+  title?: string
+  root: RenderedTreeExplorerNode<T>
+}
+
+export interface TreeExplorerNode<T = unknown> extends TreeNode {
   data?: T
   children?: this[]
   icon?: string
@@ -46,7 +54,7 @@ export interface TreeExplorerNode<T = any> extends TreeNode {
   /** Function to handle dropping a node */
   handleDrop?: (
     this: TreeExplorerNode<T>,
-    data: TreeExplorerDragAndDropData
+    data: TreeExplorerDragAndDropData<T>
   ) => void | Promise<void>
   /** Function to handle clicking a node */
   handleClick?: (
@@ -58,10 +66,12 @@ export interface TreeExplorerNode<T = any> extends TreeNode {
   /** Extra context menu items */
   contextMenuItems?:
     | MenuItem[]
-    | ((targetNode: RenderedTreeExplorerNode) => MenuItem[])
+    | ((targetNode: RenderedTreeExplorerNode<T>) => MenuItem[])
 }
 
-export interface RenderedTreeExplorerNode<T = any> extends TreeExplorerNode<T> {
+export interface RenderedTreeExplorerNode<
+  T = unknown
+> extends TreeExplorerNode<T> {
   children?: this[]
   icon: string
   type: 'folder' | 'node'
@@ -73,7 +83,7 @@ export interface RenderedTreeExplorerNode<T = any> extends TreeExplorerNode<T> {
   isEditingLabel?: boolean
 }
 
-export type TreeExplorerDragAndDropData<T = any> = {
+export type TreeExplorerDragAndDropData<T = unknown> = {
   type: 'tree-explorer-node'
   data: RenderedTreeExplorerNode<T>
 }
@@ -85,3 +95,7 @@ export const InjectKeyHandleEditLabelFunction: InjectionKey<
 export const InjectKeyExpandedKeys: InjectionKey<
   ModelRef<Record<string, boolean>>
 > = Symbol()
+
+export const InjectKeyContextMenuNode: InjectionKey<
+  Ref<RenderedTreeExplorerNode<ComfyNodeDefImpl> | null>
+> = Symbol()
diff --git a/src/types/widgetTypes.ts b/src/types/widgetTypes.ts
index ed6cb20c9a..c2a7bc0252 100644
--- a/src/types/widgetTypes.ts
+++ b/src/types/widgetTypes.ts
@@ -1,5 +1,17 @@
+import { inject } from 'vue'
 import type { InjectionKey } from 'vue'
 
-export type AssetKind = 'image' | 'video' | 'audio' | 'model' | 'unknown'
+export type AssetKind =
+  | 'image'
+  | 'video'
+  | 'audio'
+  | 'model'
+  | 'mesh'
+  | 'unknown'
 
 export const OnCloseKey: InjectionKey<() => void> = Symbol()
+
+export const HideLayoutFieldKey: InjectionKey<boolean> = Symbol()
+export function useHideLayoutField(): boolean {
+  return inject(HideLayoutFieldKey, false)
+}
diff --git a/src/types/workflowMenuItem.ts b/src/types/workflowMenuItem.ts
new file mode 100644
index 0000000000..cd4cf31b07
--- /dev/null
+++ b/src/types/workflowMenuItem.ts
@@ -0,0 +1,20 @@
+import type { OverlayIconProps } from '@/components/common/OverlayIcon.vue'
+
+export type WorkflowMenuItem = WorkflowMenuSeparator | WorkflowMenuAction
+
+interface WorkflowMenuSeparator {
+  separator: true
+}
+
+export interface WorkflowMenuAction {
+  separator?: false
+  visible?: boolean
+  id: string
+  label: string
+  icon?: string
+  command?: () => void
+  disabled?: boolean
+  badge?: string
+  isNew?: boolean
+  overlayIcon?: OverlayIconProps
+}
diff --git a/src/utils/__tests__/eventUtils.test.ts b/src/utils/__tests__/eventUtils.test.ts
index 2fc51ac677..e861dc497e 100644
--- a/src/utils/__tests__/eventUtils.test.ts
+++ b/src/utils/__tests__/eventUtils.test.ts
@@ -1,36 +1,101 @@
-import { extractFileFromDragEvent } from '@/utils/eventUtils'
+import { extractFilesFromDragEvent } from '@/utils/eventUtils'
 import { describe, expect, it } from 'vitest'
 
 describe('eventUtils', () => {
-  describe('extractFileFromDragEvent', () => {
-    it('should handle drops with no data', async () => {
-      const actual = await extractFileFromDragEvent(new FakeDragEvent('drop'))
-      expect(actual).toBe(undefined)
+  describe('extractFilesFromDragEvent', () => {
+    it('should return empty array when no dataTransfer', async () => {
+      const actual = await extractFilesFromDragEvent(new FakeDragEvent('drop'))
+      expect(actual).toEqual([])
     })
 
-    it('should handle drops with dataTransfer but no files', async () => {
-      const actual = await extractFileFromDragEvent(
+    it('should return empty array when dataTransfer has no files', async () => {
+      const actual = await extractFilesFromDragEvent(
         new FakeDragEvent('drop', { dataTransfer: new DataTransfer() })
       )
-      expect(actual).toBe(undefined)
+      expect(actual).toEqual([])
     })
 
-    it('should handle drops with dataTransfer with files', async () => {
-      const fileWithWorkflowMaybeWhoKnows = new File(
-        [new Uint8Array()],
-        'fake_workflow.json',
-        {
-          type: 'application/json'
-        }
+    it('should return single file from dataTransfer', async () => {
+      const file = new File([new Uint8Array()], 'workflow.json', {
+        type: 'application/json'
+      })
+      const dataTransfer = new DataTransfer()
+      dataTransfer.items.add(file)
+
+      const actual = await extractFilesFromDragEvent(
+        new FakeDragEvent('drop', { dataTransfer })
       )
+      expect(actual).toEqual([file])
+    })
+
+    it('should return multiple files from dataTransfer', async () => {
+      const file1 = new File([new Uint8Array()], 'workflow1.json', {
+        type: 'application/json'
+      })
+      const file2 = new File([new Uint8Array()], 'workflow2.json', {
+        type: 'application/json'
+      })
+      const dataTransfer = new DataTransfer()
+      dataTransfer.items.add(file1)
+      dataTransfer.items.add(file2)
+
+      const actual = await extractFilesFromDragEvent(
+        new FakeDragEvent('drop', { dataTransfer })
+      )
+      expect(actual).toEqual([file1, file2])
+    })
+
+    it('should filter out bmp files', async () => {
+      const jsonFile = new File([new Uint8Array()], 'workflow.json', {
+        type: 'application/json'
+      })
+      const bmpFile = new File([new Uint8Array()], 'image.bmp', {
+        type: 'image/bmp'
+      })
+      const dataTransfer = new DataTransfer()
+      dataTransfer.items.add(jsonFile)
+      dataTransfer.items.add(bmpFile)
+
+      const actual = await extractFilesFromDragEvent(
+        new FakeDragEvent('drop', { dataTransfer })
+      )
+      expect(actual).toEqual([jsonFile])
+    })
+
+    it('should return multiple image files from dataTransfer', async () => {
+      const imageFile1 = new File([new Uint8Array()], 'image1.png', {
+        type: 'image/png'
+      })
+      const imageFile2 = new File([new Uint8Array()], 'image2.jpg', {
+        type: 'image/jpeg'
+      })
 
       const dataTransfer = new DataTransfer()
-      dataTransfer.items.add(fileWithWorkflowMaybeWhoKnows)
+      dataTransfer.items.add(imageFile1)
+      dataTransfer.items.add(imageFile2)
 
-      const event = new FakeDragEvent('drop', { dataTransfer })
+      const actual = await extractFilesFromDragEvent(
+        new FakeDragEvent('drop', { dataTransfer })
+      )
+      expect(actual).toEqual([imageFile1, imageFile2])
+    })
 
-      const actual = await extractFileFromDragEvent(event)
-      expect(actual).toBe(fileWithWorkflowMaybeWhoKnows)
+    it('should return multiple non-image files from dataTransfer', async () => {
+      const file1 = new File([new Uint8Array()], 'file1.txt', {
+        type: 'text/plain'
+      })
+      const file2 = new File([new Uint8Array()], 'file2.txt', {
+        type: 'text/plain'
+      })
+
+      const dataTransfer = new DataTransfer()
+      dataTransfer.items.add(file1)
+      dataTransfer.items.add(file2)
+
+      const actual = await extractFilesFromDragEvent(
+        new FakeDragEvent('drop', { dataTransfer })
+      )
+      expect(actual).toEqual([file1, file2])
     })
 
     // Skip until we can setup MSW
@@ -38,14 +103,14 @@ describe('eventUtils', () => {
       const urlWithWorkflow = 'https://fakewebsite.notreal/fake_workflow.json'
 
       const dataTransfer = new DataTransfer()
-
       dataTransfer.setData('text/uri-list', urlWithWorkflow)
       dataTransfer.setData('text/x-moz-url', urlWithWorkflow)
 
-      const event = new FakeDragEvent('drop', { dataTransfer })
-
-      const actual = await extractFileFromDragEvent(event)
-      expect(actual).toBeInstanceOf(File)
+      const actual = await extractFilesFromDragEvent(
+        new FakeDragEvent('drop', { dataTransfer })
+      )
+      expect(actual.length).toBe(1)
+      expect(actual[0]).toBeInstanceOf(File)
     })
   })
 })
diff --git a/src/utils/__tests__/litegraphTestUtils.ts b/src/utils/__tests__/litegraphTestUtils.ts
new file mode 100644
index 0000000000..0603d0908b
--- /dev/null
+++ b/src/utils/__tests__/litegraphTestUtils.ts
@@ -0,0 +1,308 @@
+import type {
+  INodeInputSlot,
+  INodeOutputSlot,
+  Positionable
+} from '@/lib/litegraph/src/interfaces'
+import { Rectangle } from '@/lib/litegraph/src/infrastructure/Rectangle'
+import type {
+  CanvasPointerEvent,
+  LGraph,
+  LGraphCanvas,
+  LGraphGroup,
+  LinkNetwork,
+  LLink
+} from '@/lib/litegraph/src/litegraph'
+import { LGraphEventMode, LGraphNode } from '@/lib/litegraph/src/litegraph'
+import { vi } from 'vitest'
+import type { ChangeTracker } from '@/scripts/changeTracker'
+
+/**
+ * Creates a mock LGraphNode with minimal required properties
+ */
+export function createMockLGraphNode(
+  overrides: Partial<LGraphNode> | Record<string, unknown> = {}
+): LGraphNode {
+  const partial: Partial<LGraphNode> = {
+    id: 1,
+    pos: [0, 0],
+    size: [100, 100],
+    title: 'Test Node',
+    mode: LGraphEventMode.ALWAYS,
+    ...(overrides as Partial<LGraphNode>)
+  }
+  return partial as Partial<LGraphNode> as LGraphNode
+}
+
+/**
+ * Creates a mock Positionable object
+ */
+export function createMockPositionable(
+  overrides: Partial<Positionable> = {}
+): Positionable {
+  const partial: Partial<Positionable> = {
+    id: 1,
+    pos: [0, 0],
+    ...overrides
+  }
+  return partial as Partial<Positionable> as Positionable
+}
+
+/**
+ * Creates a mock LGraphGroup with minimal required properties
+ */
+export function createMockLGraphGroup(
+  overrides: Partial<LGraphGroup> = {}
+): LGraphGroup {
+  const partial: Partial<LGraphGroup> = {
+    id: 1,
+    pos: [0, 0],
+    boundingRect: new Rectangle(0, 0, 100, 100),
+    ...overrides
+  }
+  return partial as Partial<LGraphGroup> as LGraphGroup
+}
+
+/**
+ * Creates a mock SubgraphNode with sub-nodes
+ */
+export function createMockSubgraphNode(
+  subNodes: LGraphNode[],
+  overrides: Partial<LGraphNode> | Record<string, unknown> = {}
+): LGraphNode {
+  const baseNode = createMockLGraphNode(overrides)
+  return Object.assign(baseNode, {
+    isSubgraphNode: () => true,
+    subgraph: {
+      nodes: subNodes
+    }
+  })
+}
+
+/**
+ * Creates a mock LGraphCanvas with minimal required properties for testing
+ */
+export function createMockCanvas(
+  overrides: Partial<LGraphCanvas> | Record<string, unknown> = {}
+): LGraphCanvas {
+  return {
+    setDirty: vi.fn(),
+    state: {
+      selectionChanged: false
+    },
+    ...(overrides as Partial<LGraphCanvas>)
+  } as LGraphCanvas
+}
+
+/**
+ * Creates a mock LGraph with trigger function
+ */
+export function createMockLGraph(overrides: Partial<LGraph> = {}): LGraph {
+  return {
+    trigger: vi.fn(),
+    ...overrides
+  } as LGraph
+}
+
+/**
+ * Creates a mock CanvasPointerEvent
+ */
+export function createMockCanvasPointerEvent(
+  canvasX: number,
+  canvasY: number,
+  overrides: Partial<CanvasPointerEvent> = {}
+): CanvasPointerEvent {
+  return {
+    canvasX,
+    canvasY,
+    ...overrides
+  } as CanvasPointerEvent
+}
+
+/**
+ * Creates a mock CanvasRenderingContext2D
+ */
+export function createMockCanvasRenderingContext2D(
+  overrides: Partial<CanvasRenderingContext2D> = {}
+): CanvasRenderingContext2D {
+  const partial: Partial<CanvasRenderingContext2D> = {
+    measureText: vi.fn(() => ({ width: 10 }) as TextMetrics),
+    ...overrides
+  }
+  return partial as CanvasRenderingContext2D
+}
+
+/**
+ * Creates a mock LinkNetwork
+ */
+export function createMockLinkNetwork(
+  overrides: Partial<LinkNetwork> = {}
+): LinkNetwork {
+  return {
+    ...overrides
+  } as LinkNetwork
+}
+
+/**
+ * Creates a mock INodeInputSlot
+ */
+export function createMockNodeInputSlot(
+  overrides: Partial<INodeInputSlot> = {}
+): INodeInputSlot {
+  return {
+    ...overrides
+  } as INodeInputSlot
+}
+
+/**
+ * Creates a mock INodeOutputSlot
+ */
+export function createMockNodeOutputSlot(
+  overrides: Partial<INodeOutputSlot> = {}
+): INodeOutputSlot {
+  return {
+    ...overrides
+  } as INodeOutputSlot
+}
+
+/**
+ * Creates a real LGraphNode instance (not a lightweight mock) with its boundingRect
+ * property represented as a Float64Array for testing position methods.
+ *
+ * Use createMockLGraphNodeWithArrayBoundingRect when:
+ * - Tests rely on Float64Array boundingRect behavior
+ * - Tests call position-related methods like updateArea()
+ * - Tests need actual LGraphNode implementation details
+ *
+ * Use createMockLGraphNode when:
+ * - Tests only need simple/mock-only behavior
+ * - Tests don't depend on boundingRect being a Float64Array
+ * - A lightweight mock with minimal properties is sufficient
+ *
+ * @param name - The node name/type to pass to the LGraphNode constructor
+ * @returns A fully constructed LGraphNode instance with Float64Array boundingRect
+ */
+export function createMockLGraphNodeWithArrayBoundingRect(
+  name: string
+): LGraphNode {
+  const node = new LGraphNode(name)
+  // The actual node has a Float64Array boundingRect, we just need to type it correctly
+  return node
+}
+
+/**
+ * Creates a mock FileList from an array of files
+ */
+export function createMockFileList(files: File[]): FileList {
+  const fileList = Object.assign(
+    {
+      length: files.length,
+      item: (index: number) => files[index] ?? null,
+      [Symbol.iterator]: function* () {
+        yield* files
+      }
+    },
+    files
+  )
+  return fileList as FileList
+}
+
+/**
+ * Creates a mock ChangeTracker for workflow testing
+ * The ChangeTracker requires a proper ComfyWorkflowJSON structure
+ */
+export function createMockChangeTracker(
+  overrides: Partial<ChangeTracker> = {}
+): ChangeTracker {
+  const partial = {
+    activeState: {
+      last_node_id: 0,
+      last_link_id: 0,
+      nodes: [],
+      links: [],
+      groups: [],
+      config: {},
+      version: 0.4
+    },
+    undoQueue: [],
+    redoQueue: [],
+    changeCount: 0,
+    checkState: vi.fn(),
+    reset: vi.fn(),
+    restore: vi.fn(),
+    store: vi.fn(),
+    ...overrides
+  }
+  return partial as Partial<ChangeTracker> as ChangeTracker
+}
+
+/**
+ * Creates a mock MinimapCanvas for minimap testing
+ */
+export function createMockMinimapCanvas(
+  overrides: Partial<HTMLCanvasElement> = {}
+): HTMLCanvasElement {
+  const mockGetContext = vi.fn()
+  mockGetContext.mockImplementation((contextId: string) =>
+    contextId === '2d' ? createMockCanvas2DContext() : null
+  )
+
+  const partial: Partial<HTMLCanvasElement> = {
+    width: 200,
+    height: 200,
+    clientWidth: 200,
+    clientHeight: 200,
+    getContext: mockGetContext as HTMLCanvasElement['getContext'],
+    ...overrides
+  }
+  return partial as HTMLCanvasElement
+}
+
+/**
+ * Creates a mock CanvasRenderingContext2D for canvas testing
+ */
+export function createMockCanvas2DContext(
+  overrides: Partial<CanvasRenderingContext2D> = {}
+): CanvasRenderingContext2D {
+  const partial: Partial<CanvasRenderingContext2D> = {
+    clearRect: vi.fn(),
+    fillRect: vi.fn(),
+    strokeRect: vi.fn(),
+    beginPath: vi.fn(),
+    moveTo: vi.fn(),
+    lineTo: vi.fn(),
+    stroke: vi.fn(),
+    arc: vi.fn(),
+    fill: vi.fn(),
+    fillStyle: '',
+    strokeStyle: '',
+    lineWidth: 1,
+    save: vi.fn(),
+    restore: vi.fn(),
+    ...overrides
+  }
+  return partial as CanvasRenderingContext2D
+}
+
+export function createMockLLink(overrides: Partial<LLink> = {}): LLink {
+  const partial: Partial<LLink> = {
+    id: 1,
+    type: '*',
+    origin_id: 1,
+    origin_slot: 0,
+    target_id: 2,
+    target_slot: 0,
+    _pos: [0, 0],
+    ...overrides
+  }
+  return partial as LLink
+}
+
+export function createMockLinks(links: LLink[]): LGraph['links'] {
+  const map = new Map<number, LLink>()
+  const record: Record<number, LLink> = {}
+  for (const link of links) {
+    map.set(link.id, link)
+    record[link.id] = link
+  }
+  return Object.assign(map, record) as LGraph['links']
+}
diff --git a/src/utils/categoryIcons.ts b/src/utils/categoryIcons.ts
deleted file mode 100644
index 9c202df07f..0000000000
--- a/src/utils/categoryIcons.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Maps category IDs to their corresponding Lucide icon classes
- */
-export const getCategoryIcon = (categoryId: string): string => {
-  const iconMap: Record<string, string> = {
-    // Main categories
-    all: 'icon-[lucide--list]',
-    'getting-started': 'icon-[lucide--graduation-cap]',
-
-    // Generation types
-    'generation-image': 'icon-[lucide--image]',
-    image: 'icon-[lucide--image]',
-    'generation-video': 'icon-[lucide--film]',
-    video: 'icon-[lucide--film]',
-    'generation-3d': 'icon-[lucide--box]',
-    '3d': 'icon-[lucide--box]',
-    'generation-audio': 'icon-[lucide--volume-2]',
-    audio: 'icon-[lucide--volume-2]',
-    'generation-llm': 'icon-[lucide--message-square-text]',
-
-    // API and models
-    'api-nodes': 'icon-[lucide--hand-coins]',
-    'closed-models': 'icon-[lucide--hand-coins]',
-
-    // LLMs and AI
-    llm: 'icon-[lucide--message-square-text]',
-    llms: 'icon-[lucide--message-square-text]',
-    'llm-api': 'icon-[lucide--message-square-text]',
-
-    // Performance and hardware
-    'small-models': 'icon-[lucide--zap]',
-    performance: 'icon-[lucide--zap]',
-    'mac-compatible': 'icon-[lucide--command]',
-    'runs-on-mac': 'icon-[lucide--command]',
-
-    // Training
-    'lora-training': 'icon-[lucide--dumbbell]',
-    training: 'icon-[lucide--dumbbell]',
-
-    // Extensions and tools
-    extensions: 'icon-[lucide--puzzle]',
-    tools: 'icon-[lucide--wrench]',
-
-    // Fallbacks for common patterns
-    upscaling: 'icon-[lucide--maximize-2]',
-    controlnet: 'icon-[lucide--sliders-horizontal]',
-    'area-composition': 'icon-[lucide--layout-grid]'
-  }
-
-  // Return mapped icon or fallback to folder
-  return iconMap[categoryId.toLowerCase()] || 'icon-[lucide--folder]'
-}
diff --git a/src/utils/categoryUtil.test.ts b/src/utils/categoryUtil.test.ts
new file mode 100644
index 0000000000..dede54c0e9
--- /dev/null
+++ b/src/utils/categoryUtil.test.ts
@@ -0,0 +1,87 @@
+import { describe, expect, it } from 'vitest'
+
+import {
+  generateCategoryId,
+  getCategoryIcon,
+  getProviderBorderStyle,
+  getProviderIcon
+} from './categoryUtil'
+
+describe('getCategoryIcon', () => {
+  it('returns mapped icon for known category', () => {
+    expect(getCategoryIcon('all')).toBe('icon-[lucide--list]')
+    expect(getCategoryIcon('image')).toBe('icon-[lucide--image]')
+    expect(getCategoryIcon('video')).toBe('icon-[lucide--film]')
+  })
+
+  it('returns folder icon for unknown category', () => {
+    expect(getCategoryIcon('unknown-category')).toBe('icon-[lucide--folder]')
+  })
+
+  it('is case insensitive', () => {
+    expect(getCategoryIcon('ALL')).toBe('icon-[lucide--list]')
+    expect(getCategoryIcon('Image')).toBe('icon-[lucide--image]')
+  })
+})
+
+describe('getProviderIcon', () => {
+  it('returns icon class for simple provider name', () => {
+    expect(getProviderIcon('BFL')).toBe('icon-[comfy--bfl]')
+    expect(getProviderIcon('OpenAI')).toBe('icon-[comfy--openai]')
+  })
+
+  it('converts spaces to hyphens', () => {
+    expect(getProviderIcon('Stability AI')).toBe('icon-[comfy--stability-ai]')
+    expect(getProviderIcon('Moonvalley Marey')).toBe(
+      'icon-[comfy--moonvalley-marey]'
+    )
+  })
+
+  it('converts to lowercase', () => {
+    expect(getProviderIcon('GEMINI')).toBe('icon-[comfy--gemini]')
+  })
+})
+
+describe('getProviderBorderStyle', () => {
+  it('returns solid color for single-color providers', () => {
+    expect(getProviderBorderStyle('BFL')).toBe('#ffffff')
+    expect(getProviderBorderStyle('OpenAI')).toBe('#B6B6B6')
+    expect(getProviderBorderStyle('Bria')).toBe('#B6B6B6')
+  })
+
+  it('returns gradient for dual-color providers', () => {
+    expect(getProviderBorderStyle('Gemini')).toBe(
+      'linear-gradient(90deg, #3186FF, #FABC12)'
+    )
+    expect(getProviderBorderStyle('Stability AI')).toBe(
+      'linear-gradient(90deg, #9D39FF, #E80000)'
+    )
+  })
+
+  it('returns fallback color for unknown providers', () => {
+    expect(getProviderBorderStyle('Unknown Provider')).toBe('#525252')
+  })
+
+  it('handles provider names with spaces', () => {
+    expect(getProviderBorderStyle('Stability AI')).toBe(
+      'linear-gradient(90deg, #9D39FF, #E80000)'
+    )
+    expect(getProviderBorderStyle('Moonvalley Marey')).toBe('#DAD9C5')
+  })
+})
+
+describe('generateCategoryId', () => {
+  it('generates category ID from group and title', () => {
+    expect(generateCategoryId('Generation', 'Image')).toBe('generation-image')
+  })
+
+  it('converts spaces to hyphens', () => {
+    expect(generateCategoryId('API Nodes', 'Open Source')).toBe(
+      'api-nodes-open-source'
+    )
+  })
+
+  it('converts to lowercase', () => {
+    expect(generateCategoryId('GENERATION', 'VIDEO')).toBe('generation-video')
+  })
+})
diff --git a/src/utils/categoryUtil.ts b/src/utils/categoryUtil.ts
new file mode 100644
index 0000000000..598b3cf572
--- /dev/null
+++ b/src/utils/categoryUtil.ts
@@ -0,0 +1,135 @@
+/**
+ * Maps category IDs to their corresponding Lucide icon classes
+ */
+export const getCategoryIcon = (categoryId: string): string => {
+  const iconMap: Record<string, string> = {
+    // Main categories
+    all: 'icon-[lucide--list]',
+    'getting-started': 'icon-[lucide--graduation-cap]',
+
+    // Generation types
+    'generation-image': 'icon-[lucide--image]',
+    image: 'icon-[lucide--image]',
+    'generation-video': 'icon-[lucide--film]',
+    video: 'icon-[lucide--film]',
+    'generation-3d': 'icon-[lucide--box]',
+    '3d': 'icon-[lucide--box]',
+    'generation-audio': 'icon-[lucide--volume-2]',
+    audio: 'icon-[lucide--volume-2]',
+    'generation-llm': 'icon-[lucide--message-square-text]',
+
+    // API and models
+    'api-nodes': 'icon-[lucide--hand-coins]',
+    'closed-models': 'icon-[lucide--hand-coins]',
+
+    // LLMs and AI
+    llm: 'icon-[lucide--message-square-text]',
+    llms: 'icon-[lucide--message-square-text]',
+    'llm-api': 'icon-[lucide--message-square-text]',
+
+    // Performance and hardware
+    'small-models': 'icon-[lucide--zap]',
+    performance: 'icon-[lucide--zap]',
+    'mac-compatible': 'icon-[lucide--command]',
+    'runs-on-mac': 'icon-[lucide--command]',
+
+    // Training
+    'lora-training': 'icon-[lucide--dumbbell]',
+    training: 'icon-[lucide--dumbbell]',
+
+    // Extensions and tools
+    extensions: 'icon-[lucide--puzzle]',
+    tools: 'icon-[lucide--wrench]',
+
+    // Fallbacks for common patterns
+    upscaling: 'icon-[lucide--maximize-2]',
+    controlnet: 'icon-[lucide--sliders-horizontal]',
+    'area-composition': 'icon-[lucide--layout-grid]'
+  }
+
+  // Return mapped icon or fallback to folder
+  return iconMap[categoryId.toLowerCase()] || 'icon-[lucide--folder]'
+}
+
+/**
+ * Provider brand colors extracted from SVG icons.
+ * Each entry can be a single color or [color1, color2] for gradient.
+ */
+const PROVIDER_COLORS: Record<string, string | [string, string]> = {
+  bfl: '#ffffff',
+  bria: '#B6B6B6',
+  bytedance: ['#00C8D2', '#325AB4'],
+  gemini: ['#3186FF', '#FABC12'],
+  grok: '#B6B6B6',
+  hitpaw: '#B6B6B6',
+  ideogram: '#B6B6B6',
+  kling: ['#0BF2F9', '#FFF959'],
+  ltxv: '#B6B6B6',
+  luma: ['#004EFF', '#00FFFF'],
+  magnific: ['#EA5A3D', '#F1A64A'],
+  meshy: ['#67B700', '#FA418C'],
+  minimax: ['#E2167E', '#FE603C'],
+  'moonvalley-marey': '#DAD9C5',
+  openai: '#B6B6B6',
+  pixverse: ['#B465E6', '#E8632A'],
+  recraft: '#B6B6B6',
+  rodin: '#F7F7F7',
+  runway: '#B6B6B6',
+  sora: ['#6BB6FE', '#ffffff'],
+  'stability-ai': ['#9D39FF', '#E80000'],
+  tencent: ['#004BE5', '#00B3FE'],
+  topaz: '#B6B6B6',
+  tripo: ['#F6D85A', '#B6B6B6'],
+  veo: ['#4285F4', '#EB4335'],
+  vidu: ['#047FFE', '#40EDD8'],
+  wan: ['#6156EC', '#F4F3FD'],
+  wavespeed: '#B6B6B6'
+}
+
+/**
+ * Extracts the provider name from a node category path.
+ * e.g. "api/image/BFL" -> "BFL"
+ */
+export function getProviderName(category: string): string {
+  return category.split('/').at(-1) ?? ''
+}
+
+/**
+ * Returns the icon class for an API node provider (e.g., BFL, OpenAI, Stability AI)
+ * @param providerName - The provider name from the node category
+ * @returns The icon class string (e.g., 'icon-[comfy--bfl]')
+ */
+export function getProviderIcon(providerName: string): string {
+  const iconKey = providerName.toLowerCase().replaceAll(/\s+/g, '-')
+  return `icon-[comfy--${iconKey}]`
+}
+
+/**
+ * Returns the border color(s) for an API node provider badge.
+ * @param providerName - The provider name from the node category
+ * @returns CSS color string or gradient definition
+ */
+export function getProviderBorderStyle(providerName: string): string {
+  const iconKey = providerName.toLowerCase().replaceAll(/\s+/g, '-')
+  const colors = PROVIDER_COLORS[iconKey]
+
+  if (!colors) {
+    return '#525252' // neutral-600 fallback
+  }
+
+  if (Array.isArray(colors)) {
+    return `linear-gradient(90deg, ${colors[0]}, ${colors[1]})`
+  }
+
+  return colors
+}
+
+/**
+ * Generates a unique category ID from a category group and title
+ */
+export function generateCategoryId(
+  categoryGroup: string,
+  categoryTitle: string
+) {
+  return `${categoryGroup.toLowerCase().replace(/\s+/g, '-')}-${categoryTitle.toLowerCase().replace(/\s+/g, '-')}`
+}
diff --git a/tests-ui/tests/colorUtil.test.ts b/src/utils/colorUtil.test.ts
similarity index 96%
rename from tests-ui/tests/colorUtil.test.ts
rename to src/utils/colorUtil.test.ts
index 0f21d5d15e..36d8458970 100644
--- a/tests-ui/tests/colorUtil.test.ts
+++ b/src/utils/colorUtil.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it, vi } from 'vitest'
 
+import type { ColorAdjustOptions } from '@/utils/colorUtil'
 import {
   adjustColor,
   hexToRgb,
@@ -22,13 +23,16 @@ interface ColorTestCase {
 type ColorFormat = 'hex' | 'rgb' | 'rgba' | 'hsl' | 'hsla'
 
 vi.mock('es-toolkit/compat', () => ({
-  memoize: (fn: any) => fn
+  memoize: <T extends (...args: unknown[]) => unknown>(fn: T) => fn
 }))
 
 const targetOpacity = 0.5
 const targetLightness = 0.5
 
-const assertColorVariationsMatch = (variations: string[], adjustment: any) => {
+const assertColorVariationsMatch = (
+  variations: string[],
+  adjustment: ColorAdjustOptions
+) => {
   for (let i = 0; i < variations.length - 1; i++) {
     expect(adjustColor(variations[i], adjustment)).toBe(
       adjustColor(variations[i + 1], adjustment)
diff --git a/src/utils/devFeatureFlagOverride.test.ts b/src/utils/devFeatureFlagOverride.test.ts
new file mode 100644
index 0000000000..739921846c
--- /dev/null
+++ b/src/utils/devFeatureFlagOverride.test.ts
@@ -0,0 +1,60 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+
+import { getDevOverride } from '@/utils/devFeatureFlagOverride'
+
+describe('getDevOverride', () => {
+  afterEach(() => {
+    localStorage.clear()
+    vi.restoreAllMocks()
+  })
+
+  it('returns undefined when no override is set', () => {
+    expect(getDevOverride('some_flag')).toBeUndefined()
+  })
+
+  it('returns parsed boolean true', () => {
+    localStorage.setItem('ff:some_flag', 'true')
+    expect(getDevOverride<boolean>('some_flag')).toBe(true)
+  })
+
+  it('returns parsed boolean false', () => {
+    localStorage.setItem('ff:some_flag', 'false')
+    expect(getDevOverride<boolean>('some_flag')).toBe(false)
+  })
+
+  it('returns parsed number', () => {
+    localStorage.setItem('ff:max_upload_size', '209715200')
+    expect(getDevOverride<number>('max_upload_size')).toBe(209715200)
+  })
+
+  it('returns parsed string', () => {
+    localStorage.setItem('ff:some_flag', '"hello"')
+    expect(getDevOverride<string>('some_flag')).toBe('hello')
+  })
+
+  it('returns parsed object', () => {
+    localStorage.setItem('ff:complex', '{"nested": true}')
+    expect(getDevOverride<Record<string, boolean>>('complex')).toEqual({
+      nested: true
+    })
+  })
+
+  it('uses ff: prefix for localStorage keys', () => {
+    localStorage.setItem('some_flag', 'true')
+    expect(getDevOverride('some_flag')).toBeUndefined()
+
+    localStorage.setItem('ff:some_flag', 'true')
+    expect(getDevOverride('some_flag')).toBe(true)
+  })
+
+  it('returns undefined and warns on invalid JSON', () => {
+    const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    localStorage.setItem('ff:bad', 'True')
+
+    expect(getDevOverride('bad')).toBeUndefined()
+    expect(warnSpy).toHaveBeenCalledWith(
+      '[ff] Invalid JSON for override "bad":',
+      'True'
+    )
+  })
+})
diff --git a/src/utils/devFeatureFlagOverride.ts b/src/utils/devFeatureFlagOverride.ts
new file mode 100644
index 0000000000..d6d1a44740
--- /dev/null
+++ b/src/utils/devFeatureFlagOverride.ts
@@ -0,0 +1,26 @@
+const FF_PREFIX = 'ff:'
+
+/**
+ * Gets a dev-time feature flag override from localStorage.
+ * Stripped from production builds via import.meta.env.DEV tree-shaking.
+ *
+ * Returns undefined (not null) as the "no override" sentinel because
+ * null is a valid JSON value — JSON.parse('null') returns null.
+ * Using undefined avoids ambiguity between "no override set" and
+ * "override explicitly set to null".
+ *
+ * Usage in browser console:
+ *   localStorage.setItem('ff:team_workspaces_enabled', 'true')
+ *   localStorage.removeItem('ff:team_workspaces_enabled')
+ */
+export function getDevOverride<T>(flagKey: string): T | undefined {
+  if (!import.meta.env.DEV) return undefined
+  const raw = localStorage.getItem(`${FF_PREFIX}${flagKey}`)
+  if (raw === null) return undefined
+  try {
+    return JSON.parse(raw) as T
+  } catch {
+    console.warn(`[ff] Invalid JSON for override "${flagKey}":`, raw)
+    return undefined
+  }
+}
diff --git a/src/utils/envUtil.ts b/src/utils/envUtil.ts
index d31efdec7d..38edaec1fb 100644
--- a/src/utils/envUtil.ts
+++ b/src/utils/envUtil.ts
@@ -1,11 +1,18 @@
 import type { ElectronAPI } from '@comfyorg/comfyui-electron-types'
 
-export function isElectron() {
-  return 'electronAPI' in window && window.electronAPI !== undefined
+import { isDesktop } from '@/platform/distribution/types'
+
+/**
+ * Extend Window interface to include electronAPI
+ * Used by desktop-ui app storybook stories
+ * @public
+ */
+export type ElectronWindow = typeof window & {
+  electronAPI?: ElectronAPI
 }
 
 export function electronAPI() {
-  return (window as any).electronAPI as ElectronAPI
+  return (window as ElectronWindow).electronAPI as ElectronAPI
 }
 
 export function showNativeSystemMenu() {
@@ -13,5 +20,5 @@ export function showNativeSystemMenu() {
 }
 
 export function isNativeWindow() {
-  return isElectron() && !!window.navigator.windowControlsOverlay?.visible
+  return isDesktop && !!window.navigator.windowControlsOverlay?.visible
 }
diff --git a/src/utils/errorReportUtil.ts b/src/utils/errorReportUtil.ts
index 33fd3d2362..5d105ee634 100644
--- a/src/utils/errorReportUtil.ts
+++ b/src/utils/errorReportUtil.ts
@@ -66,7 +66,7 @@ ${systemStats.devices
   .join('\n')}
 ## Logs
 \`\`\`
-${error.serverLogs}
+${typeof error.serverLogs === 'string' ? error.serverLogs : JSON.stringify(error.serverLogs, null, 2)}
 \`\`\`
 ## Attached Workflow
 Please make sure that workflow does not contain any sensitive information such as API keys or passwords.
diff --git a/src/utils/eventUtils.test.ts b/src/utils/eventUtils.test.ts
new file mode 100644
index 0000000000..01ecbf0db9
--- /dev/null
+++ b/src/utils/eventUtils.test.ts
@@ -0,0 +1,56 @@
+import { describe, expect, it } from 'vitest'
+import {
+  hasAudioType,
+  hasImageType,
+  hasVideoType,
+  isMediaFile
+} from './eventUtils'
+
+describe('hasImageType', () => {
+  it('should return true for image types', () => {
+    expect(hasImageType({ type: 'image/png' } as File)).toBe(true)
+    expect(hasImageType({ type: 'image/jpeg' } as File)).toBe(true)
+  })
+
+  it('should return false for non-image types', () => {
+    expect(hasImageType({ type: 'audio/mpeg' } as File)).toBe(false)
+    expect(hasImageType({ type: 'video/mp4' } as File)).toBe(false)
+  })
+})
+
+describe('hasAudioType', () => {
+  it('should return true for audio types', () => {
+    expect(hasAudioType({ type: 'audio/mpeg' } as File)).toBe(true)
+    expect(hasAudioType({ type: 'audio/wav' } as File)).toBe(true)
+  })
+
+  it('should return false for non-audio types', () => {
+    expect(hasAudioType({ type: 'image/png' } as File)).toBe(false)
+    expect(hasAudioType({ type: 'video/mp4' } as File)).toBe(false)
+  })
+})
+
+describe('hasVideoType', () => {
+  it('should return true for video types', () => {
+    expect(hasVideoType({ type: 'video/mp4' } as File)).toBe(true)
+    expect(hasVideoType({ type: 'video/webm' } as File)).toBe(true)
+  })
+
+  it('should return false for non-video types', () => {
+    expect(hasVideoType({ type: 'audio/mpeg' } as File)).toBe(false)
+    expect(hasVideoType({ type: 'image/png' } as File)).toBe(false)
+  })
+})
+
+describe('isMediaFile', () => {
+  it('should return true for image, audio, and video types', () => {
+    expect(isMediaFile({ type: 'image/png' } as File)).toBe(true)
+    expect(isMediaFile({ type: 'audio/mpeg' } as File)).toBe(true)
+    expect(isMediaFile({ type: 'video/mp4' } as File)).toBe(true)
+  })
+
+  it('should return false for non-media types', () => {
+    expect(isMediaFile({ type: 'text/plain' } as File)).toBe(false)
+    expect(isMediaFile({ type: 'application/json' } as File)).toBe(false)
+  })
+})
diff --git a/src/utils/eventUtils.ts b/src/utils/eventUtils.ts
index 133ccd709b..5621d7ad2c 100644
--- a/src/utils/eventUtils.ts
+++ b/src/utils/eventUtils.ts
@@ -1,27 +1,42 @@
-export async function extractFileFromDragEvent(
+export async function extractFilesFromDragEvent(
   event: DragEvent
-): Promise<File | undefined> {
-  if (!event.dataTransfer) return
+): Promise<File[]> {
+  if (!event.dataTransfer) return []
 
   // Dragging from Chrome->Firefox there is a file but its a bmp, so ignore that
-  if (
-    event.dataTransfer.files.length &&
-    event.dataTransfer.files[0].type !== 'image/bmp'
-  ) {
-    return event.dataTransfer.files[0]
-  }
+  const files = Array.from(event.dataTransfer.files).filter(
+    (file) => file.type !== 'image/bmp'
+  )
+
+  if (files.length > 0) return files
 
   // Try loading the first URI in the transfer list
   const validTypes = ['text/uri-list', 'text/x-moz-url']
   const match = [...event.dataTransfer.types].find((t) =>
     validTypes.includes(t)
   )
-  if (!match) return
+  if (!match) return []
 
   const uri = event.dataTransfer.getData(match)?.split('\n')?.[0]
-  if (!uri) return
+  if (!uri) return []
 
   const response = await fetch(uri)
   const blob = await response.blob()
-  return new File([blob], uri, { type: blob.type })
+  return [new File([blob], uri, { type: blob.type })]
+}
+
+export function hasImageType({ type }: File): boolean {
+  return type.startsWith('image')
+}
+
+export function hasAudioType({ type }: File): boolean {
+  return type.startsWith('audio')
+}
+
+export function hasVideoType({ type }: File): boolean {
+  return type.startsWith('video')
+}
+
+export function isMediaFile(file: File): boolean {
+  return hasImageType(file) || hasAudioType(file) || hasVideoType(file)
 }
diff --git a/tests-ui/tests/utils/executableGroupNodeChildDTO.test.ts b/src/utils/executableGroupNodeChildDTO.test.ts
similarity index 89%
rename from tests-ui/tests/utils/executableGroupNodeChildDTO.test.ts
rename to src/utils/executableGroupNodeChildDTO.test.ts
index 6b2fb3ffa8..7665b7b331 100644
--- a/tests-ui/tests/utils/executableGroupNodeChildDTO.test.ts
+++ b/src/utils/executableGroupNodeChildDTO.test.ts
@@ -7,6 +7,7 @@ import type {
   LGraphNode
 } from '@/lib/litegraph/src/litegraph'
 import { ExecutableGroupNodeChildDTO } from '@/utils/executableGroupNodeChildDTO'
+import { createMockLGraphNode } from './__tests__/litegraphTestUtils'
 
 describe('ExecutableGroupNodeChildDTO', () => {
   let mockNode: LGraphNode
@@ -16,18 +17,18 @@ describe('ExecutableGroupNodeChildDTO', () => {
 
   beforeEach(() => {
     // Create mock nodes
-    mockNode = {
+    mockNode = createMockLGraphNode({
       id: '3', // Simple node ID for most tests
       graph: {},
       getInputNode: vi.fn(),
       getInputLink: vi.fn(),
       inputs: []
-    } as any
+    })
 
-    mockInputNode = {
+    mockInputNode = createMockLGraphNode({
       id: '1',
       graph: {}
-    } as any
+    })
 
     // Create the nodesByExecutionId map
     mockNodesByExecutionId = new Map()
@@ -38,7 +39,7 @@ describe('ExecutableGroupNodeChildDTO', () => {
   describe('resolveInput', () => {
     it('should resolve input from external node (node outside the group)', () => {
       // Setup: Group node child with ID '10:3'
-      const groupNodeChild = {
+      const groupNodeChild = createMockLGraphNode({
         id: '10:3',
         graph: {},
         getInputNode: vi.fn().mockReturnValue(mockInputNode),
@@ -46,7 +47,7 @@ describe('ExecutableGroupNodeChildDTO', () => {
           origin_slot: 0
         }),
         inputs: []
-      } as any
+      })
 
       // External node with ID '1'
       const externalNodeDto = {
@@ -75,19 +76,19 @@ describe('ExecutableGroupNodeChildDTO', () => {
 
     it('should resolve input from internal node (node inside the same group)', () => {
       // Setup: Group node child with ID '10:3'
-      const groupNodeChild = {
+      const groupNodeChild = createMockLGraphNode({
         id: '10:3',
         graph: {},
         getInputNode: vi.fn(),
         getInputLink: vi.fn(),
         inputs: []
-      } as any
+      })
 
       // Internal node with ID '10:2'
-      const internalInputNode = {
+      const internalInputNode = createMockLGraphNode({
         id: '10:2',
         graph: {}
-      } as LGraphNode
+      })
 
       const internalNodeDto = {
         id: '2',
@@ -97,10 +98,10 @@ describe('ExecutableGroupNodeChildDTO', () => {
       // Internal nodes are stored with just their index
       mockNodesByExecutionId.set('2', internalNodeDto)
 
-      groupNodeChild.getInputNode.mockReturnValue(internalInputNode)
-      groupNodeChild.getInputLink.mockReturnValue({
+      vi.mocked(groupNodeChild.getInputNode).mockReturnValue(internalInputNode)
+      vi.mocked(groupNodeChild.getInputLink).mockReturnValue({
         origin_slot: 1
-      })
+      } as ReturnType<LGraphNode['getInputLink']>)
 
       const dto = new ExecutableGroupNodeChildDTO(
         groupNodeChild,
@@ -172,7 +173,7 @@ describe('ExecutableGroupNodeChildDTO', () => {
 
     it('should throw error for group nodes inside subgraphs (unsupported)', () => {
       // Setup: Group node child inside a subgraph (execution ID has more than 2 segments)
-      const nestedGroupNode = {
+      const nestedGroupNode = createMockLGraphNode({
         id: '1:2:3', // subgraph:groupnode:innernode
         graph: {},
         getInputNode: vi.fn().mockReturnValue(mockInputNode),
@@ -180,7 +181,7 @@ describe('ExecutableGroupNodeChildDTO', () => {
           origin_slot: 0
         }),
         inputs: []
-      } as any
+      })
 
       // Create DTO with deeply nested path to simulate group node inside subgraph
       const dto = new ExecutableGroupNodeChildDTO(
diff --git a/src/utils/executionErrorUtil.test.ts b/src/utils/executionErrorUtil.test.ts
new file mode 100644
index 0000000000..68aafcfda1
--- /dev/null
+++ b/src/utils/executionErrorUtil.test.ts
@@ -0,0 +1,190 @@
+import { describe, expect, it } from 'vitest'
+
+import {
+  isCloudValidationError,
+  tryExtractValidationError,
+  classifyCloudValidationError
+} from '@/utils/executionErrorUtil'
+
+describe('executionErrorUtil', () => {
+  describe('isCloudValidationError', () => {
+    it('should return true when object has error field', () => {
+      expect(isCloudValidationError({ error: 'some error' })).toBe(true)
+    })
+
+    it('should return true when object has node_errors field', () => {
+      expect(isCloudValidationError({ node_errors: {} })).toBe(true)
+    })
+
+    it('should return true when object has both fields', () => {
+      expect(isCloudValidationError({ error: 'err', node_errors: {} })).toBe(
+        true
+      )
+    })
+
+    it('should return false for null', () => {
+      expect(isCloudValidationError(null)).toBe(false)
+    })
+
+    it('should return false for non-object', () => {
+      expect(isCloudValidationError('string')).toBe(false)
+    })
+
+    it('should return false for object without error or node_errors', () => {
+      expect(isCloudValidationError({ foo: 'bar' })).toBe(false)
+    })
+  })
+
+  describe('tryExtractValidationError', () => {
+    it('should extract JSON from a message with embedded validation error', () => {
+      const embedded = JSON.stringify({
+        error: {
+          type: 'prompt_no_outputs',
+          message: 'No outputs',
+          details: ''
+        },
+        node_errors: {}
+      })
+      const message = `Failed to send prompt request: status 400: ${embedded}`
+
+      const result = tryExtractValidationError(message)
+
+      expect(result).not.toBeNull()
+      expect(result?.error).toEqual({
+        type: 'prompt_no_outputs',
+        message: 'No outputs',
+        details: ''
+      })
+    })
+
+    it('should return null when message has no JSON', () => {
+      expect(tryExtractValidationError('plain error message')).toBeNull()
+    })
+
+    it('should return null when JSON is not a validation error shape', () => {
+      const message = 'error: {"foo": "bar"}'
+      expect(tryExtractValidationError(message)).toBeNull()
+    })
+
+    it('should return null when JSON is malformed', () => {
+      const message = 'error: {invalid json'
+      expect(tryExtractValidationError(message)).toBeNull()
+    })
+  })
+
+  describe('classifyCloudValidationError', () => {
+    it('should classify node errors when node_errors is present', () => {
+      const nodeErrors = {
+        '11:1': {
+          errors: [
+            {
+              type: 'required_input_missing',
+              message: 'Required input is missing',
+              details: 'clip',
+              extra_info: { input_name: 'clip' }
+            }
+          ],
+          dependent_outputs: ['9'],
+          class_type: 'CLIPTextEncode'
+        }
+      }
+      const embedded = JSON.stringify({
+        error: {
+          type: 'prompt_outputs_failed_validation',
+          message: 'Prompt outputs failed validation',
+          details: ''
+        },
+        node_errors: nodeErrors
+      })
+      const message = `Failed to send prompt request: status 400: ${embedded}`
+
+      const result = classifyCloudValidationError(message)
+
+      expect(result).not.toBeNull()
+      expect(result?.kind).toBe('nodeErrors')
+      if (result?.kind === 'nodeErrors') {
+        expect(result.nodeErrors['11:1'].class_type).toBe('CLIPTextEncode')
+      }
+    })
+
+    it('should classify prompt error when error is an object and no node_errors', () => {
+      const embedded = JSON.stringify({
+        error: {
+          type: 'prompt_no_outputs',
+          message: 'Prompt has no outputs',
+          details: ''
+        }
+      })
+      const message = `Failed: ${embedded}`
+
+      const result = classifyCloudValidationError(message)
+
+      expect(result).not.toBeNull()
+      expect(result?.kind).toBe('promptError')
+      if (result?.kind === 'promptError') {
+        expect(result.promptError.type).toBe('prompt_no_outputs')
+        expect(result.promptError.message).toBe('Prompt has no outputs')
+      }
+    })
+
+    it('should classify prompt error when error is a string', () => {
+      const embedded = JSON.stringify({ error: 'Something went wrong' })
+      const message = `Failed: ${embedded}`
+
+      const result = classifyCloudValidationError(message)
+
+      expect(result).not.toBeNull()
+      expect(result?.kind).toBe('promptError')
+      if (result?.kind === 'promptError') {
+        expect(result.promptError.type).toBe('error')
+        expect(result.promptError.message).toBe('Something went wrong')
+      }
+    })
+
+    it('should return null when message has no embedded JSON', () => {
+      expect(classifyCloudValidationError('plain error')).toBeNull()
+    })
+
+    it('should return null when embedded JSON has no error or node_errors', () => {
+      const message = 'error: {"foo": "bar"}'
+      expect(classifyCloudValidationError(message)).toBeNull()
+    })
+
+    it('should return null when error field is neither object nor string', () => {
+      const embedded = JSON.stringify({ error: 123 })
+      const message = `Failed: ${embedded}`
+
+      expect(classifyCloudValidationError(message)).toBeNull()
+    })
+
+    it('should prefer node_errors over error when both present', () => {
+      const embedded = JSON.stringify({
+        error: { type: 'validation', message: 'fail', details: '' },
+        node_errors: {
+          '5': {
+            errors: [{ type: 'err', message: 'bad', details: '' }],
+            dependent_outputs: [],
+            class_type: 'KSampler'
+          }
+        }
+      })
+      const message = `Failed: ${embedded}`
+
+      const result = classifyCloudValidationError(message)
+
+      expect(result?.kind).toBe('nodeErrors')
+    })
+
+    it('should treat empty node_errors as prompt error', () => {
+      const embedded = JSON.stringify({
+        error: { type: 'no_prompt', message: 'No prompt', details: '' },
+        node_errors: {}
+      })
+      const message = `Failed: ${embedded}`
+
+      const result = classifyCloudValidationError(message)
+
+      expect(result?.kind).toBe('promptError')
+    })
+  })
+})
diff --git a/src/utils/executionErrorUtil.ts b/src/utils/executionErrorUtil.ts
new file mode 100644
index 0000000000..c2e3ae44e9
--- /dev/null
+++ b/src/utils/executionErrorUtil.ts
@@ -0,0 +1,92 @@
+import type { NodeId } from '@/platform/workflow/validation/schemas/workflowSchema'
+import type { NodeError, PromptError } from '@/schemas/apiSchema'
+
+/**
+ * The standard prompt validation response shape (`{ error, node_errors }`).
+ * In cloud, this is embedded as JSON inside `execution_error.exception_message`
+ * because prompts are queued asynchronously and errors arrive via WebSocket
+ * rather than as direct HTTP responses.
+ */
+interface CloudValidationError {
+  error?: { type?: string; message?: string; details?: string } | string
+  node_errors?: Record<NodeId, NodeError>
+}
+
+export function isCloudValidationError(
+  value: unknown
+): value is CloudValidationError {
+  return (
+    value !== null &&
+    typeof value === 'object' &&
+    ('error' in value || 'node_errors' in value)
+  )
+}
+
+/**
+ * Extracts a prompt validation response embedded in an exception message string.
+ *
+ * Cloud example `exception_message`:
+ *   "Failed to send prompt request: ... 400: {\"error\":{...},\"node_errors\":{...}}"
+ *
+ * This function finds the first '{' and parses the trailing JSON.
+ */
+export function tryExtractValidationError(
+  exceptionMessage: string
+): CloudValidationError | null {
+  const jsonStart = exceptionMessage.indexOf('{')
+  const jsonEnd = exceptionMessage.lastIndexOf('}')
+  if (jsonStart === -1 || jsonEnd === -1) return null
+
+  try {
+    const parsed: unknown = JSON.parse(
+      exceptionMessage.substring(jsonStart, jsonEnd + 1)
+    )
+    return isCloudValidationError(parsed) ? parsed : null
+  } catch {
+    return null
+  }
+}
+
+type CloudValidationResult =
+  | { kind: 'nodeErrors'; nodeErrors: Record<NodeId, NodeError> }
+  | { kind: 'promptError'; promptError: PromptError }
+
+/**
+ * Classifies an embedded cloud validation error from `exception_message`
+ * as either node-level errors or a prompt-level error.
+ *
+ * Returns `null` if the message does not contain a recognizable validation error.
+ */
+export function classifyCloudValidationError(
+  exceptionMessage: string
+): CloudValidationResult | null {
+  const extracted = tryExtractValidationError(exceptionMessage)
+  if (!extracted) return null
+
+  const { error, node_errors } = extracted
+  const hasNodeErrors = node_errors && Object.keys(node_errors).length > 0
+
+  if (hasNodeErrors) {
+    return { kind: 'nodeErrors', nodeErrors: node_errors }
+  }
+
+  if (error && typeof error === 'object') {
+    return {
+      kind: 'promptError',
+      promptError: {
+        type: error.type ?? 'error',
+        message: error.message ?? '',
+        details: error.details ?? ''
+      }
+    }
+  }
+
+  if (typeof error === 'string') {
+    return {
+      kind: 'promptError',
+      promptError: { type: 'error', message: error, details: '' }
+    }
+  }
+
+  return null
+}
diff --git a/src/utils/executionUtil.ts b/src/utils/executionUtil.ts
index 3f7f982c4f..a57d60822f 100644
--- a/src/utils/executionUtil.ts
+++ b/src/utils/executionUtil.ts
@@ -63,11 +63,18 @@ export const graphToPrompt = async (
       ? new ExecutableGroupNodeDTO(node, [], nodeDtoMap)
       : new ExecutableNodeDTO(node, [], nodeDtoMap)
 
+    nodeDtoMap.set(dto.id, dto)
+
+    if (
+      node.mode === LGraphEventMode.NEVER ||
+      node.mode === LGraphEventMode.BYPASS
+    ) {
+      continue
+    }
+
     for (const innerNode of dto.getInnerNodes()) {
       nodeDtoMap.set(innerNode.id, innerNode)
     }
-
-    nodeDtoMap.set(dto.id, dto)
   }
 
   const output: ComfyApiWorkflow = {}
@@ -85,7 +92,9 @@ export const graphToPrompt = async (
     const inputs: ComfyApiWorkflow[string]['inputs'] = {}
     const { widgets } = node
 
-    // Store all widget values
+    // Store all widget values in the API prompt.
+    // Note: widget.options.serialize controls prompt inclusion (checked here).
+    // widget.serialize controls workflow persistence (checked by LGraphNode).
     if (widgets) {
       for (const [i, widget] of widgets.entries()) {
         if (!widget.name || widget.options?.serialize === false) continue
@@ -99,9 +108,9 @@ export const graphToPrompt = async (
         // The backend automatically unwraps the object to an array during
         // execution.
         inputs[widget.name] = Array.isArray(widgetValue)
-          ? {
-              __value__: widgetValue
-            }
+          ? widget.type === 'curve'
+            ? { __type__: 'CURVE', __value__: widgetValue }
+            : { __value__: widgetValue }
           : widgetValue
       }
     }
diff --git a/src/utils/fuseUtil.ts b/src/utils/fuseUtil.ts
index 6969bbe06a..ddfbaa9a47 100644
--- a/src/utils/fuseUtil.ts
+++ b/src/utils/fuseUtil.ts
@@ -75,8 +75,12 @@ export interface FuseSearchable {
   postProcessSearchScores: (scores: SearchAuxScore) => SearchAuxScore
 }
 
-function isFuseSearchable(item: any): item is FuseSearchable {
-  return 'postProcessSearchScores' in item
+function isFuseSearchable(item: unknown): item is FuseSearchable {
+  return (
+    typeof item === 'object' &&
+    item !== null &&
+    'postProcessSearchScores' in item
+  )
 }
 
 /**
diff --git a/tests-ui/tests/utils/graphTraversalUtil.test.ts b/src/utils/graphTraversalUtil.test.ts
similarity index 98%
rename from tests-ui/tests/utils/graphTraversalUtil.test.ts
rename to src/utils/graphTraversalUtil.test.ts
index 2af5a6ee95..604ba81382 100644
--- a/tests-ui/tests/utils/graphTraversalUtil.test.ts
+++ b/src/utils/graphTraversalUtil.test.ts
@@ -1,3 +1,4 @@
+// oxlint-disable no-misused-spread
 import { describe, expect, it, vi } from 'vitest'
 
 import type {
@@ -27,6 +28,7 @@ import {
   triggerCallbackOnAllNodes,
   visitGraphNodes
 } from '@/utils/graphTraversalUtil'
+import { createMockLGraphNode } from './__tests__/litegraphTestUtils'
 
 // Mock node factory
 function createMockNode(
@@ -38,13 +40,13 @@ function createMockNode(
     graph?: LGraph
   } = {}
 ): LGraphNode {
-  const node = {
+  const node = createMockLGraphNode({
     id,
     isSubgraphNode: options.isSubgraph ? () => true : undefined,
     subgraph: options.subgraph,
     onExecutionStart: options.callback,
     graph: options.graph
-  } as unknown as LGraphNode
+  }) satisfies Partial<LGraphNode> as LGraphNode
   options.graph?.nodes?.push(node)
   return node
 }
@@ -57,7 +59,7 @@ function createMockGraph(nodes: LGraphNode[]): LGraph {
     isRootGraph: true,
     getNodeById: (id: string | number) =>
       nodes.find((n) => String(n.id) === String(id)) || null
-  } as unknown as LGraph
+  } satisfies Partial<LGraph> as LGraph
 }
 
 // Mock subgraph factory
@@ -74,7 +76,7 @@ function createMockSubgraph(
     rootGraph,
     getNodeById: (nodeId: string | number) =>
       nodes.find((n) => String(n.id) === String(nodeId)) || null
-  } as unknown as Subgraph
+  } satisfies Partial<Subgraph> as Subgraph
   return graph
 }
 
@@ -95,8 +97,8 @@ describe('graphTraversalUtil', () => {
 
       it('should return null for invalid input', () => {
         expect(parseExecutionId('')).toBeNull()
-        expect(parseExecutionId(null as any)).toBeNull()
-        expect(parseExecutionId(undefined as any)).toBeNull()
+        expect(parseExecutionId(null!)).toBeNull()
+        expect(parseExecutionId(undefined!)).toBeNull()
       })
     })
 
@@ -414,7 +416,7 @@ describe('graphTraversalUtil', () => {
 
         // Add a title property to each node
         forEachNode(graph, (node) => {
-          ;(node as any).title = `Node ${node.id}`
+          node.title = `Node ${node.id}`
         })
 
         expect(nodes[0]).toHaveProperty('title', 'Node 1')
@@ -652,7 +654,7 @@ describe('graphTraversalUtil', () => {
       it('should return root graph from subgraph', () => {
         const rootGraph = createMockGraph([])
         const subgraph = createMockSubgraph('sub-uuid', [])
-        ;(subgraph as any).rootGraph = rootGraph
+        ;(subgraph as Subgraph & { rootGraph: LGraph }).rootGraph = rootGraph
 
         expect(getRootGraph(subgraph)).toBe(rootGraph)
       })
@@ -661,9 +663,10 @@ describe('graphTraversalUtil', () => {
         const rootGraph = createMockGraph([])
         const midSubgraph = createMockSubgraph('mid-uuid', [])
         const deepSubgraph = createMockSubgraph('deep-uuid', [])
-
-        ;(midSubgraph as any).rootGraph = rootGraph
-        ;(deepSubgraph as any).rootGraph = midSubgraph
+        ;(midSubgraph as Subgraph & { rootGraph: LGraph }).rootGraph = rootGraph
+        ;(
+          deepSubgraph as Subgraph & { rootGraph: LGraph | Subgraph }
+        ).rootGraph = midSubgraph
 
         expect(getRootGraph(deepSubgraph)).toBe(rootGraph)
       })
@@ -725,7 +728,7 @@ describe('graphTraversalUtil', () => {
         const graph = createMockGraph(nodes)
 
         forEachSubgraphNode(graph, subgraphId, (node) => {
-          ;(node as any).title = 'Updated Title'
+          node.title = 'Updated Title'
         })
 
         expect(nodes[0]).toHaveProperty('title', 'Updated Title')
diff --git a/src/utils/graphTraversalUtil.ts b/src/utils/graphTraversalUtil.ts
index 2339338f71..adc4112573 100644
--- a/src/utils/graphTraversalUtil.ts
+++ b/src/utils/graphTraversalUtil.ts
@@ -4,7 +4,10 @@ import type {
   Subgraph
 } from '@/lib/litegraph/src/litegraph'
 import type { NodeExecutionId, NodeLocatorId } from '@/types/nodeIdentification'
-import { parseNodeLocatorId } from '@/types/nodeIdentification'
+import {
+  createNodeLocatorId,
+  parseNodeLocatorId
+} from '@/types/nodeIdentification'
 
 import { isSubgraphIoNode } from './typeGuardUtil'
 
@@ -274,6 +277,28 @@ export function findSubgraphPathById(
   return null
 }
 
+/**
+ * Gets the root parent node associated with a hierarchical execution ID.
+ * Both Group Nodes and Subgraph Nodes use hierarchical IDs (e.g. "rootId:childId:...").
+ * The root parent is always located in the rootGraph.
+ *
+ * @param rootGraph - The root graph to search from
+ * @param executionId - The execution ID (e.g., "123:456")
+ * @returns The root parent node if found, null otherwise
+ */
+export function getRootParentNode(
+  rootGraph: LGraph,
+  executionId: string
+): LGraphNode | null {
+  const parts = parseExecutionId(executionId)
+  if (!parts || parts.length < 2) return null
+
+  const parentId = parts[0]
+  if (!rootGraph) return null
+
+  return rootGraph.getNodeById(Number(parentId)) || null
+}
+
 /**
  * Get a node by its execution ID from anywhere in the graph hierarchy.
  * Execution IDs use hierarchical format like "123:456:789" for nested nodes.
@@ -306,6 +331,35 @@ export function getNodeByExecutionId(
   return targetGraph.getNodeById(localNodeId) || null
 }
 
+/**
+ * Returns the execution ID for a node relative to the root graph.
+ *
+ * Root-level nodes return their ID directly (e.g. "42").
+ * Nodes inside subgraphs return a colon-separated chain (e.g. "65:70:63").
+ *
+ * @param rootGraph - The root graph to resolve from
+ * @param node - The node whose execution ID to compute
+ * @returns The execution ID string, or null if the node has no graph
+ */
+export function getExecutionIdByNode(
+  rootGraph: LGraph,
+  node: LGraphNode
+): NodeExecutionId | null {
+  if (!node.graph) return null
+
+  if (node.graph === rootGraph || node.graph.isRootGraph) {
+    return String(node.id)
+  }
+
+  const parentPath = findPartialExecutionPathToGraph(
+    node.graph as LGraph,
+    rootGraph
+  )
+  if (parentPath === undefined) return null
+
+  return `${parentPath}:${node.id}`
+}
+
 /**
  * Get a node by its locator ID from anywhere in the graph hierarchy.
  * Locator IDs use UUID format like "uuid:nodeId" for subgraph nodes.
@@ -337,6 +391,36 @@ export function getNodeByLocatorId(
   return targetSubgraph.getNodeById(localNodeId) || null
 }
 
+/**
+ * Convert execution context node IDs to NodeLocatorIds.
+ * Uses traverseSubgraphPath to resolve the subgraph chain.
+ *
+ * @param rootGraph - The root graph to resolve against
+ * @param nodeId - The node ID from execution context (could be execution ID like "123:456:789")
+ * @returns The NodeLocatorId, or undefined if resolution fails
+ */
+export function executionIdToNodeLocatorId(
+  rootGraph: LGraph,
+  nodeId: string | number
+): NodeLocatorId | undefined {
+  const nodeIdStr = String(nodeId)
+
+  if (!nodeIdStr.includes(':')) {
+    // It's a top-level node ID
+    return nodeIdStr
+  }
+
+  // It's an execution node ID — resolve subgraph path
+  const parts = nodeIdStr.split(':')
+  const localNodeId = parts.at(-1)!
+  const subgraphPath = parts.slice(0, -1)
+
+  const targetGraph = traverseSubgraphPath(rootGraph, subgraphPath)
+  if (!targetGraph) return undefined
+
+  return createNodeLocatorId(targetGraph.id, localNodeId)
+}
+
 /**
  * Finds the root graph from any graph in the hierarchy.
  *
diff --git a/tests-ui/tests/utils/hostWhitelist.test.ts b/src/utils/hostWhitelist.test.ts
similarity index 100%
rename from tests-ui/tests/utils/hostWhitelist.test.ts
rename to src/utils/hostWhitelist.test.ts
diff --git a/src/utils/linkFixer.ts b/src/utils/linkFixer.ts
index 64fdd598f1..065934224d 100644
--- a/src/utils/linkFixer.ts
+++ b/src/utils/linkFixer.ts
@@ -24,6 +24,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+import type { INodeOutputSlot } from '@/lib/litegraph/src/interfaces'
 import type { NodeId } from '@/lib/litegraph/src/LGraphNode'
 import type { SerialisedLLinkArray } from '@/lib/litegraph/src/LLink'
 import type { LGraph, LGraphNode, LLink } from '@/lib/litegraph/src/litegraph'
@@ -79,12 +80,12 @@ export function fixBadLinks(
   options: {
     fix?: boolean
     silent?: boolean
-    logger?: { log: (...args: any[]) => void }
+    logger?: { log: (...args: unknown[]) => void }
   } = {}
 ): BadLinksData {
   const { fix = false, silent = false, logger: _logger = console } = options
   const logger = {
-    log: (...args: any[]) => {
+    log: (...args: unknown[]) => {
       if (!silent) {
         _logger.log(...args)
       }
@@ -166,7 +167,9 @@ export function fixBadLinks(
         patchedNode['outputs']![slot]!['links'].push(linkId)
         if (fix) {
           node.outputs = node.outputs || []
-          node.outputs[slot] = node.outputs[slot] || ({} as any)
+          node.outputs[slot] =
+            node.outputs[slot] ||
+            ({} satisfies Partial<INodeOutputSlot> as INodeOutputSlot)
           node.outputs[slot]!.links = node.outputs[slot]!.links || []
           node.outputs[slot]!.links!.push(linkId)
         }
@@ -428,7 +431,7 @@ export function fixBadLinks(
           (l) =>
             l &&
             (l[0] === data.deletedLinks[i] ||
-              (l as any).id === data.deletedLinks[i])
+              ('id' in l && l.id === data.deletedLinks[i]))
         )
         if (idx === -1) {
           logger.log(`INDEX NOT FOUND for #${data.deletedLinks[i]}`)
diff --git a/src/utils/litegraphUtil.test.ts b/src/utils/litegraphUtil.test.ts
new file mode 100644
index 0000000000..0dc52e1bde
--- /dev/null
+++ b/src/utils/litegraphUtil.test.ts
@@ -0,0 +1,442 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { LiteGraph } from '@/lib/litegraph/src/litegraph'
+import type {
+  LGraph,
+  LGraphCanvas,
+  LGraphNode
+} from '@/lib/litegraph/src/litegraph'
+import type { ISerialisedGraph } from '@/lib/litegraph/src/types/serialisation'
+import type { IWidget } from '@/lib/litegraph/src/types/widgets'
+import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
+import type { ExecutedWsMessage } from '@/schemas/apiSchema'
+import {
+  compressWidgetInputSlots,
+  createNode,
+  isAnimatedOutput,
+  isVideoOutput,
+  migrateWidgetsValues,
+  resolveNode
+} from '@/utils/litegraphUtil'
+
+vi.mock('@/lib/litegraph/src/litegraph', async (importOriginal) => ({
+  ...(await importOriginal()),
+  LiteGraph: {
+    createNode: vi.fn()
+  }
+}))
+
+vi.mock('@/scripts/app', () => ({
+  app: { rootGraph: null }
+}))
+
+vi.mock('@/platform/updates/common/toastStore', () => ({
+  useToastStore: vi.fn(() => ({
+    addAlert: vi.fn(),
+    add: vi.fn(),
+    remove: vi.fn()
+  }))
+}))
+
+vi.mock('@/i18n', () => ({
+  t: vi.fn((key: string) => key)
+}))
+
+function createMockCanvas(overrides: Partial<LGraphCanvas> = {}): LGraphCanvas {
+  const mockGraph = {
+    add: vi.fn((node) => node),
+    change: vi.fn()
+  } as Partial<LGraph> as LGraph
+  const mockCanvas: Partial<LGraphCanvas> = {
+    graph_mouse: [100, 200],
+    graph: mockGraph,
+    ...overrides
+  }
+  return mockCanvas as LGraphCanvas
+}
+
+describe('createNode', () => {
+  beforeEach(vi.clearAllMocks)
+
+  it('should create a node successfully', async () => {
+    const mockNode = { pos: [0, 0] }
+    vi.mocked(LiteGraph.createNode).mockReturnValue(mockNode as LGraphNode)
+
+    const mockCanvas = createMockCanvas()
+    const result = await createNode(mockCanvas, 'LoadImage')
+
+    expect(LiteGraph.createNode).toHaveBeenCalledWith('LoadImage')
+    expect(mockNode.pos).toEqual([100, 200])
+    expect(mockCanvas.graph!.add).toHaveBeenCalledWith(mockNode)
+    expect(mockCanvas.graph!.change).toHaveBeenCalled()
+    expect(result).toBe(mockNode)
+  })
+
+  it('should return null when name is empty', async () => {
+    const mockCanvas = createMockCanvas()
+    const result = await createNode(mockCanvas, '')
+
+    expect(LiteGraph.createNode).not.toHaveBeenCalled()
+    expect(result).toBeNull()
+  })
+
+  it('should handle graph being null', async () => {
+    const mockNode = { pos: [0, 0] }
+    const mockCanvas = createMockCanvas({ graph: null })
+    vi.mocked(LiteGraph.createNode).mockReturnValue(mockNode as LGraphNode)
+
+    const result = await createNode(mockCanvas, 'LoadImage')
+
+    expect(mockNode.pos).toEqual([0, 0])
+    expect(result).toBeNull()
+  })
+  it('should set position based on canvas graph_mouse', async () => {
+    const mockCanvas = createMockCanvas({ graph_mouse: [250, 350] })
+    const mockNode = { pos: [0, 0] }
+    vi.mocked(LiteGraph.createNode).mockReturnValue(mockNode as LGraphNode)
+
+    await createNode(mockCanvas, 'LoadAudio')
+
+    expect(mockNode.pos).toEqual([250, 350])
+  })
+})
+
+describe('migrateWidgetsValues', () => {
+  it('should remove widget values for forceInput inputs', () => {
+    const inputDefs: Record<string, InputSpec> = {
+      normalInput: {
+        type: 'INT',
+        name: 'normalInput'
+      },
+      forceInputField: {
+        type: 'STRING',
+        name: 'forceInputField',
+        forceInput: true
+      },
+      anotherNormal: {
+        type: 'FLOAT',
+        name: 'anotherNormal'
+      }
+    }
+
+    const widgets = [
+      { name: 'normalInput', type: 'number' },
+      { name: 'anotherNormal', type: 'number' }
+    ] as Partial<IWidget>[] as IWidget[]
+
+    const widgetValues = [42, 'dummy value', 3.14]
+
+    const result = migrateWidgetsValues(inputDefs, widgets, widgetValues)
+    expect(result).toEqual([42, 3.14])
+  })
+
+  it('should return original values if lengths do not match', () => {
+    const inputDefs: Record<string, InputSpec> = {
+      input1: {
+        type: 'INT',
+        name: 'input1',
+        forceInput: true
+      }
+    }
+
+    const widgets: IWidget[] = []
+    const widgetValues = [42, 'extra value']
+
+    const result = migrateWidgetsValues(inputDefs, widgets, widgetValues)
+    expect(result).toEqual(widgetValues)
+  })
+
+  it('should handle empty widgets and values', () => {
+    const inputDefs: Record<string, InputSpec> = {}
+    const widgets: IWidget[] = []
+    const widgetValues: unknown[] = []
+
+    const result = migrateWidgetsValues(inputDefs, widgets, widgetValues)
+    expect(result).toEqual([])
+  })
+
+  it('should preserve order of non-forceInput widget values', () => {
+    const inputDefs: Record<string, InputSpec> = {
+      first: {
+        type: 'INT',
+        name: 'first'
+      },
+      forced: {
+        type: 'STRING',
+        name: 'forced',
+        forceInput: true
+      },
+      last: {
+        type: 'FLOAT',
+        name: 'last'
+      }
+    }
+
+    const widgets = [
+      { name: 'first', type: 'number' },
+      { name: 'last', type: 'number' }
+    ] as Partial<IWidget>[] as IWidget[]
+
+    const widgetValues = ['first value', 'dummy', 'last value']
+
+    const result = migrateWidgetsValues(inputDefs, widgets, widgetValues)
+    expect(result).toEqual(['first value', 'last value'])
+  })
+  it('should correctly handle seed with unexpected value', () => {
+    const inputDefs: Record<string, InputSpec> = {
+      normalInput: {
+        type: 'INT',
+        name: 'normalInput',
+        control_after_generate: true
+      },
+      forceInputField: {
+        type: 'STRING',
+        name: 'forceInputField',
+        forceInput: true
+      }
+    }
+
+    const widgets = [
+      { name: 'normalInput', type: 'number' },
+      { name: 'control_after_generate', type: 'string' }
+    ] as Partial<IWidget>[] as IWidget[]
+
+    const widgetValues = [42, 'fixed', 'unexpected widget value']
+
+    const result = migrateWidgetsValues(inputDefs, widgets, widgetValues)
+    expect(result).toEqual([42, 'fixed'])
+  })
+})
+
+function createOutput(
+  overrides: Partial<ExecutedWsMessage['output']> = {}
+): ExecutedWsMessage['output'] {
+  return { ...overrides }
+}
+
+describe('isAnimatedOutput', () => {
+  it('returns false for undefined output', () => {
+    expect(isAnimatedOutput(undefined)).toBe(false)
+  })
+
+  it('returns false when animated array is missing', () => {
+    expect(isAnimatedOutput(createOutput())).toBe(false)
+  })
+
+  it('returns false when all animated values are false', () => {
+    expect(isAnimatedOutput(createOutput({ animated: [false, false] }))).toBe(
+      false
+    )
+  })
+
+  it('returns true when any animated value is true', () => {
+    expect(isAnimatedOutput(createOutput({ animated: [false, true] }))).toBe(
+      true
+    )
+  })
+})
+
+describe('isVideoOutput', () => {
+  it('returns false for non-animated output', () => {
+    expect(
+      isVideoOutput(
+        createOutput({
+          animated: [false],
+          images: [{ filename: 'video.webm' }]
+        })
+      )
+    ).toBe(false)
+  })
+
+  it('returns false for animated webp output', () => {
+    expect(
+      isVideoOutput(
+        createOutput({
+          animated: [true],
+          images: [{ filename: 'anim.webp' }]
+        })
+      )
+    ).toBe(false)
+  })
+
+  it('returns false for animated png output', () => {
+    expect(
+      isVideoOutput(
+        createOutput({
+          animated: [true],
+          images: [{ filename: 'anim.png' }]
+        })
+      )
+    ).toBe(false)
+  })
+
+  it('returns true for animated webm output', () => {
+    expect(
+      isVideoOutput(
+        createOutput({
+          animated: [true],
+          images: [{ filename: 'output.webm' }]
+        })
+      )
+    ).toBe(true)
+  })
+
+  it('returns true for animated mp4 output', () => {
+    expect(
+      isVideoOutput(
+        createOutput({
+          animated: [true],
+          images: [{ filename: 'output.mp4' }]
+        })
+      )
+    ).toBe(true)
+  })
+
+  it('returns true for animated output with no images array', () => {
+    expect(isVideoOutput(createOutput({ animated: [true] }))).toBe(true)
+  })
+
+  it('does not false-positive on filenames containing webp as substring', () => {
+    expect(
+      isVideoOutput(
+        createOutput({
+          animated: [true],
+          images: [{ filename: 'my_webp_file.mp4' }]
+        })
+      )
+    ).toBe(true)
+  })
+})
+
+describe('compressWidgetInputSlots', () => {
+  it('should remove unconnected widget input slots', () => {
+    // Using partial mock - only including properties needed for test
+    const graph = {
+      nodes: [
+        {
+          id: 1,
+          type: 'foo',
+          pos: [0, 0],
+          size: [100, 100],
+          flags: {},
+          order: 0,
+          mode: 0,
+          inputs: [
+            { widget: { name: 'foo' }, link: null, type: 'INT', name: 'foo' },
+            { widget: { name: 'bar' }, link: 2, type: 'INT', name: 'bar' },
+            { widget: { name: 'baz' }, link: null, type: 'INT', name: 'baz' }
+          ],
+          outputs: []
+        }
+      ],
+      links: [[2, 1, 0, 1, 0, 'INT']]
+    } as Partial<ISerialisedGraph> as ISerialisedGraph
+
+    compressWidgetInputSlots(graph)
+
+    expect(graph.nodes[0].inputs).toEqual([
+      { widget: { name: 'bar' }, link: 2, type: 'INT', name: 'bar' }
+    ])
+  })
+
+  it('should update link target slots correctly', () => {
+    const graph = {
+      nodes: [
+        {
+          id: 1,
+          type: 'foo',
+          pos: [0, 0],
+          size: [100, 100],
+          flags: {},
+          order: 0,
+          mode: 0,
+          inputs: [
+            { widget: { name: 'foo' }, link: null, type: 'INT', name: 'foo' },
+            { widget: { name: 'bar' }, link: 2, type: 'INT', name: 'bar' },
+            { widget: { name: 'baz' }, link: 3, type: 'INT', name: 'baz' }
+          ],
+          outputs: []
+        }
+      ],
+      links: [
+        [2, 1, 0, 1, 1, 'INT'],
+        [3, 1, 0, 1, 2, 'INT']
+      ]
+    } as Partial<ISerialisedGraph> as ISerialisedGraph
+
+    compressWidgetInputSlots(graph)
+
+    expect(graph.nodes[0].inputs).toEqual([
+      { widget: { name: 'bar' }, link: 2, type: 'INT', name: 'bar' },
+      { widget: { name: 'baz' }, link: 3, type: 'INT', name: 'baz' }
+    ])
+
+    expect(graph.links).toEqual([
+      [2, 1, 0, 1, 0, 'INT'],
+      [3, 1, 0, 1, 1, 'INT']
+    ])
+  })
+
+  it('should handle graphs with no nodes gracefully', () => {
+    // Using partial mock - only including properties needed for test
+    const graph = {
+      nodes: [],
+      links: []
+    } as Partial<ISerialisedGraph> as ISerialisedGraph
+
+    compressWidgetInputSlots(graph)
+
+    expect(graph.nodes).toEqual([])
+    expect(graph.links).toEqual([])
+  })
+})
+
+describe('resolveNode', () => {
+  function mockGraph(
+    nodeList: Partial<LGraphNode>[],
+    subgraphs?: Map<string, LGraph>
+  ) {
+    const nodesById: Record<string, LGraphNode> = {}
+    for (const n of nodeList) {
+      nodesById[String(n.id)] = n as LGraphNode
+    }
+    return {
+      nodes: nodeList as LGraphNode[],
+      getNodeById(id: unknown) {
+        return id != null ? (nodesById[String(id)] ?? null) : null
+      },
+      subgraphs: subgraphs ?? new Map()
+    } as unknown as LGraph
+  }
+
+  it('returns undefined when graph is nullish', () => {
+    expect(resolveNode(1, null)).toBeUndefined()
+    expect(resolveNode(1, undefined)).toBeUndefined()
+  })
+
+  it('finds a node in the main graph', () => {
+    const node = { id: 5 } as LGraphNode
+    const graph = mockGraph([node])
+    expect(resolveNode(5, graph)).toBe(node)
+  })
+
+  it('finds a node in a subgraph', () => {
+    const subNode = { id: 10 } as LGraphNode
+    const subgraph = mockGraph([subNode])
+    const graph = mockGraph([], new Map([['sg-1', subgraph]]))
+    expect(resolveNode(10, graph)).toBe(subNode)
+  })
+
+  it('returns undefined when node is not found anywhere', () => {
+    const graph = mockGraph([{ id: 1 } as LGraphNode])
+    expect(resolveNode(999, graph)).toBeUndefined()
+  })
+
+  it('prefers main graph over subgraph', () => {
+    const mainNode = { id: 1, title: 'main' } as LGraphNode
+    const subNode = { id: 1, title: 'sub' } as LGraphNode
+    const subgraph = mockGraph([subNode])
+    const graph = mockGraph([mainNode], new Map([['sg-1', subgraph]]))
+    expect(resolveNode(1, graph)).toBe(mainNode)
+  })
+})
diff --git a/src/utils/litegraphUtil.ts b/src/utils/litegraphUtil.ts
index 898b3ef237..2a05397383 100644
--- a/src/utils/litegraphUtil.ts
+++ b/src/utils/litegraphUtil.ts
@@ -1,9 +1,12 @@
 import _ from 'es-toolkit/compat'
 
 import type { ColorOption, LGraph } from '@/lib/litegraph/src/litegraph'
+import type { ExecutedWsMessage } from '@/schemas/apiSchema'
 import {
+  LGraphCanvas,
   LGraphGroup,
   LGraphNode,
+  LiteGraph,
   Reroute,
   isColorable
 } from '@/lib/litegraph/src/litegraph'
@@ -14,9 +17,14 @@ import type {
 } from '@/lib/litegraph/src/types/serialisation'
 import type {
   IBaseWidget,
-  IComboWidget
+  IComboWidget,
+  WidgetCallbackOptions
 } from '@/lib/litegraph/src/types/widgets'
+import type { NodeId } from '@/lib/litegraph/src/LGraphNode'
 import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
+import { useToastStore } from '@/platform/updates/common/toastStore'
+import { app } from '@/scripts/app'
+import { t } from '@/i18n'
 
 type ImageNode = LGraphNode & { imgs: HTMLImageElement[] | undefined }
 type VideoNode = LGraphNode & {
@@ -24,6 +32,38 @@ type VideoNode = LGraphNode & {
   imgs: HTMLVideoElement[] | undefined
 }
 
+/**
+ * Extract & Promisify Litegraph.createNode to allow for positioning
+ * @param canvas
+ * @param name
+ */
+export async function createNode(
+  canvas: LGraphCanvas,
+  name: string
+): Promise<LGraphNode | null> {
+  if (!name) {
+    return null
+  }
+
+  const {
+    graph,
+    graph_mouse: [posX, posY]
+  } = canvas
+  const newNode = LiteGraph.createNode(name)
+  await new Promise((r) => setTimeout(r, 0))
+
+  if (newNode && graph) {
+    newNode.pos = [posX, posY]
+    const addedNode = graph.add(newNode) ?? null
+
+    if (addedNode) graph.change()
+    return addedNode
+  } else {
+    useToastStore().addAlert(t('assetBrowser.failedToCreateNode'))
+    return null
+  }
+}
+
 export function isImageNode(node: LGraphNode | undefined): node is ImageNode {
   if (!node) return false
   return (
@@ -37,6 +77,32 @@ export function isVideoNode(node: LGraphNode | undefined): node is VideoNode {
   return node.previewMediaType === 'video' || !!node.videoContainer
 }
 
+/**
+ * Check if output data indicates animated content (animated webp/png or video).
+ */
+export function isAnimatedOutput(
+  output: ExecutedWsMessage['output'] | undefined
+): boolean {
+  return !!output?.animated?.find(Boolean)
+}
+
+/**
+ * Check if output data indicates video content (animated but not webp/png).
+ */
+export function isVideoOutput(
+  output: ExecutedWsMessage['output'] | undefined
+): boolean {
+  if (!isAnimatedOutput(output)) return false
+
+  const isAnimatedWebp = output?.images?.some((img) =>
+    img.filename?.endsWith('.webp')
+  )
+  const isAnimatedPng = output?.images?.some((img) =>
+    img.filename?.endsWith('.png')
+  )
+  return !isAnimatedWebp && !isAnimatedPng
+}
+
 export function isAudioNode(node: LGraphNode | undefined): boolean {
   return !!node && node.previewMediaType === 'audio'
 }
@@ -83,11 +149,12 @@ export const getItemsColorOption = (items: unknown[]): ColorOption | null => {
 
 export function executeWidgetsCallback(
   nodes: LGraphNode[],
-  callbackName: 'onRemove' | 'beforeQueued' | 'afterQueued'
+  callbackName: 'onRemove' | 'beforeQueued' | 'afterQueued',
+  options?: WidgetCallbackOptions
 ) {
   for (const node of nodes) {
     for (const widget of node.widgets ?? []) {
-      widget[callbackName]?.()
+      widget[callbackName]?.(options)
     }
   }
 }
@@ -112,23 +179,17 @@ export function migrateWidgetsValues<TWidgetValue>(
   const originalWidgetsInputs = Object.values(inputDefs).filter(
     (input) => widgetNames.has(input.name) || input.forceInput
   )
-  // Count the number of original widgets inputs.
-  const numOriginalWidgets = _.sum(
-    originalWidgetsInputs.map((input) =>
-      // If the input has control, it will have 2 widgets.
-      input.control_after_generate ||
-      ['seed', 'noise_seed'].includes(input.name)
-        ? 2
-        : 1
-    )
+
+  const widgetIndexHasForceInput = originalWidgetsInputs.flatMap((input) =>
+    input.control_after_generate
+      ? [!!input.forceInput, false]
+      : [!!input.forceInput]
   )
 
-  if (numOriginalWidgets === widgetsValues?.length) {
-    return _.zip(originalWidgetsInputs, widgetsValues)
-      .filter(([input]) => !input?.forceInput)
-      .map(([_, value]) => value as TWidgetValue)
-  }
-  return widgetsValues
+  if (widgetIndexHasForceInput.length !== widgetsValues?.length)
+    return widgetsValues
+
+  return widgetsValues.filter((_, index) => !widgetIndexHasForceInput[index])
 }
 
 /**
@@ -241,6 +302,24 @@ function compressSubgraphWidgetInputSlots(
   }
 }
 
+export function getLinkTypeColor(typeName: string): string {
+  return LGraphCanvas.link_type_colors[typeName] ?? LiteGraph.LINK_COLOR
+}
+
+export function resolveNode(
+  nodeId: NodeId,
+  graph: LGraph | null | undefined = app.rootGraph
+): LGraphNode | undefined {
+  if (!graph) return undefined
+  const found = graph.getNodeById(nodeId)
+  if (found) return found
+  for (const sg of graph.subgraphs.values()) {
+    const node = sg.getNodeById(nodeId)
+    if (node) return node
+  }
+  return undefined
+}
+
 export function isLoad3dNode(node: LGraphNode) {
   return (
     node &&
diff --git a/tests-ui/tests/utils/markdownRendererUtil.test.ts b/src/utils/markdownRendererUtil.test.ts
similarity index 100%
rename from tests-ui/tests/utils/markdownRendererUtil.test.ts
rename to src/utils/markdownRendererUtil.test.ts
diff --git a/tests-ui/tests/utils/mathUtil.test.ts b/src/utils/mathUtil.test.ts
similarity index 100%
rename from tests-ui/tests/utils/mathUtil.test.ts
rename to src/utils/mathUtil.test.ts
diff --git a/tests-ui/tests/utils/migration/workflows/reroute/legacy/branching.json b/src/utils/migration/__fixtures__/reroute/legacy/branching.json
similarity index 69%
rename from tests-ui/tests/utils/migration/workflows/reroute/legacy/branching.json
rename to src/utils/migration/__fixtures__/reroute/legacy/branching.json
index 7fb12d62fa..1202caa455 100644
--- a/tests-ui/tests/utils/migration/workflows/reroute/legacy/branching.json
+++ b/src/utils/migration/__fixtures__/reroute/legacy/branching.json
@@ -5,14 +5,8 @@
     {
       "id": 12,
       "type": "VAEDecode",
-      "pos": [
-        620,
-        260
-      ],
-      "size": [
-        210,
-        46
-      ],
+      "pos": [620, 260],
+      "size": [210, 46],
       "flags": {},
       "order": 4,
       "mode": 0,
@@ -43,14 +37,8 @@
     {
       "id": 4,
       "type": "CheckpointLoaderSimple",
-      "pos": [
-        47.948699951171875,
-        239.2628173828125
-      ],
-      "size": [
-        315,
-        98
-      ],
+      "pos": [47.948699951171875, 239.2628173828125],
+      "size": [315, 98],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -72,30 +60,19 @@
           "name": "VAE",
           "type": "VAE",
           "slot_index": 2,
-          "links": [
-            13,
-            31
-          ]
+          "links": [13, 31]
         }
       ],
       "properties": {
         "Node name for S&R": "CheckpointLoaderSimple"
       },
-      "widgets_values": [
-        "v1-5-pruned-emaonly.safetensors"
-      ]
+      "widgets_values": ["v1-5-pruned-emaonly.safetensors"]
     },
     {
       "id": 13,
       "type": "Reroute",
-      "pos": [
-        510,
-        280
-      ],
-      "size": [
-        75,
-        26
-      ],
+      "pos": [510, 280],
+      "size": [75, 26],
       "flags": {},
       "order": 2,
       "mode": 0,
@@ -111,9 +88,7 @@
           "name": "",
           "type": "VAE",
           "slot_index": 0,
-          "links": [
-            21
-          ]
+          "links": [21]
         }
       ],
       "properties": {
@@ -124,14 +99,8 @@
     {
       "id": 25,
       "type": "Reroute",
-      "pos": [
-        404.7915344238281,
-        280.9454650878906
-      ],
-      "size": [
-        75,
-        26
-      ],
+      "pos": [404.7915344238281, 280.9454650878906],
+      "size": [75, 26],
       "flags": {},
       "order": 1,
       "mode": 0,
@@ -146,10 +115,7 @@
         {
           "name": "",
           "type": "VAE",
-          "links": [
-            32,
-            33
-          ]
+          "links": [32, 33]
         }
       ],
       "properties": {
@@ -160,14 +126,8 @@
     {
       "id": 27,
       "type": "Reroute",
-      "pos": [
-        514,
-        386
-      ],
-      "size": [
-        75,
-        26
-      ],
+      "pos": [514, 386],
+      "size": [75, 26],
       "flags": {},
       "order": 3,
       "mode": 0,
@@ -182,9 +142,7 @@
         {
           "name": "",
           "type": "VAE",
-          "links": [
-            34
-          ]
+          "links": [34]
         }
       ],
       "properties": {
@@ -195,14 +153,8 @@
     {
       "id": 26,
       "type": "VAEDecode",
-      "pos": [
-        625,
-        373
-      ],
-      "size": [
-        210,
-        46
-      ],
+      "pos": [625, 373],
+      "size": [210, 46],
       "flags": {},
       "order": 5,
       "mode": 0,
@@ -232,57 +184,19 @@
     }
   ],
   "links": [
-    [
-      21,
-      13,
-      0,
-      12,
-      1,
-      "VAE"
-    ],
-    [
-      31,
-      4,
-      2,
-      25,
-      0,
-      "*"
-    ],
-    [
-      32,
-      25,
-      0,
-      13,
-      0,
-      "*"
-    ],
-    [
-      33,
-      25,
-      0,
-      27,
-      0,
-      "*"
-    ],
-    [
-      34,
-      27,
-      0,
-      26,
-      1,
-      "VAE"
-    ]
+    [21, 13, 0, 12, 1, "VAE"],
+    [31, 4, 2, 25, 0, "*"],
+    [32, 25, 0, 13, 0, "*"],
+    [33, 25, 0, 27, 0, "*"],
+    [34, 27, 0, 26, 1, "VAE"]
   ],
   "groups": [],
   "config": {},
   "extra": {
     "ds": {
       "scale": 2.3195551508147507,
-      "offset": [
-        96.55985005696607,
-        -41.449812921703376
-      ]
+      "offset": [96.55985005696607, -41.449812921703376]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/tests-ui/tests/utils/migration/workflows/reroute/legacy/floating.json b/src/utils/migration/__fixtures__/reroute/legacy/floating.json
similarity index 72%
rename from tests-ui/tests/utils/migration/workflows/reroute/legacy/floating.json
rename to src/utils/migration/__fixtures__/reroute/legacy/floating.json
index b31cd13e2a..c1f973702a 100644
--- a/tests-ui/tests/utils/migration/workflows/reroute/legacy/floating.json
+++ b/src/utils/migration/__fixtures__/reroute/legacy/floating.json
@@ -5,14 +5,8 @@
     {
       "id": 4,
       "type": "CheckpointLoaderSimple",
-      "pos": [
-        47.948699951171875,
-        239.2628173828125
-      ],
-      "size": [
-        315,
-        98
-      ],
+      "pos": [47.948699951171875, 239.2628173828125],
+      "size": [315, 98],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -34,10 +28,7 @@
           "name": "VAE",
           "type": "VAE",
           "slot_index": 2,
-          "links": [
-            13,
-            31
-          ]
+          "links": [13, 31]
         }
       ],
       "properties": {
@@ -45,21 +36,13 @@
         "ver": "0.3.26",
         "Node name for S&R": "CheckpointLoaderSimple"
       },
-      "widgets_values": [
-        "v1-5-pruned-emaonly.safetensors"
-      ]
+      "widgets_values": ["v1-5-pruned-emaonly.safetensors"]
     },
     {
       "id": 13,
       "type": "Reroute",
-      "pos": [
-        510,
-        280
-      ],
-      "size": [
-        75,
-        26
-      ],
+      "pos": [510, 280],
+      "size": [75, 26],
       "flags": {},
       "order": 1,
       "mode": 0,
@@ -75,9 +58,7 @@
           "name": "",
           "type": "*",
           "slot_index": 0,
-          "links": [
-            21
-          ]
+          "links": [21]
         }
       ],
       "properties": {
@@ -88,14 +69,8 @@
     {
       "id": 12,
       "type": "VAEDecode",
-      "pos": [
-        620,
-        260
-      ],
-      "size": [
-        210,
-        46
-      ],
+      "pos": [620, 260],
+      "size": [210, 46],
       "flags": {},
       "order": 5,
       "mode": 0,
@@ -128,14 +103,8 @@
     {
       "id": 25,
       "type": "Reroute",
-      "pos": [
-        401.49267578125,
-        278.96600341796875
-      ],
-      "size": [
-        75,
-        26
-      ],
+      "pos": [401.49267578125, 278.96600341796875],
+      "size": [75, 26],
       "flags": {},
       "order": 4,
       "mode": 0,
@@ -161,14 +130,8 @@
     {
       "id": 28,
       "type": "Reroute",
-      "pos": [
-        401.874267578125,
-        354.56207275390625
-      ],
-      "size": [
-        75,
-        26
-      ],
+      "pos": [401.874267578125, 354.56207275390625],
+      "size": [75, 26],
       "flags": {},
       "order": 2,
       "mode": 0,
@@ -194,14 +157,8 @@
     {
       "id": 30,
       "type": "Reroute",
-      "pos": [
-        533.9331665039062,
-        433.1788330078125
-      ],
-      "size": [
-        75,
-        26
-      ],
+      "pos": [533.9331665039062, 433.1788330078125],
+      "size": [75, 26],
       "flags": {},
       "order": 6,
       "mode": 0,
@@ -227,14 +184,8 @@
     {
       "id": 29,
       "type": "Reroute",
-      "pos": [
-        535.5305786132812,
-        350.32513427734375
-      ],
-      "size": [
-        75,
-        26
-      ],
+      "pos": [535.5305786132812, 350.32513427734375],
+      "size": [75, 26],
       "flags": {},
       "order": 7,
       "mode": 0,
@@ -260,14 +211,8 @@
     {
       "id": 31,
       "type": "Reroute",
-      "pos": [
-        405.2763671875,
-        431.85943603515625
-      ],
-      "size": [
-        75,
-        26
-      ],
+      "pos": [405.2763671875, 431.85943603515625],
+      "size": [75, 26],
       "flags": {},
       "order": 3,
       "mode": 0,
@@ -282,10 +227,7 @@
         {
           "name": "",
           "type": "*",
-          "links": [
-            37,
-            38
-          ]
+          "links": [37, 38]
         }
       ],
       "properties": {
@@ -295,49 +237,18 @@
     }
   ],
   "links": [
-    [
-      21,
-      13,
-      0,
-      12,
-      1,
-      "VAE"
-    ],
-    [
-      31,
-      4,
-      2,
-      25,
-      0,
-      "*"
-    ],
-    [
-      37,
-      31,
-      0,
-      30,
-      0,
-      "*"
-    ],
-    [
-      38,
-      31,
-      0,
-      29,
-      0,
-      "*"
-    ]
+    [21, 13, 0, 12, 1, "VAE"],
+    [31, 4, 2, 25, 0, "*"],
+    [37, 31, 0, 30, 0, "*"],
+    [38, 31, 0, 29, 0, "*"]
   ],
   "groups": [],
   "config": {},
   "extra": {
     "ds": {
       "scale": 1.2526143885641918,
-      "offset": [
-        449.14488520559655,
-        200.06933385457722
-      ]
+      "offset": [449.14488520559655, 200.06933385457722]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/tests-ui/tests/utils/migration/workflows/reroute/legacy/floating_branch.json b/src/utils/migration/__fixtures__/reroute/legacy/floating_branch.json
similarity index 70%
rename from tests-ui/tests/utils/migration/workflows/reroute/legacy/floating_branch.json
rename to src/utils/migration/__fixtures__/reroute/legacy/floating_branch.json
index fbbe2f2f52..df4ebe5522 100644
--- a/tests-ui/tests/utils/migration/workflows/reroute/legacy/floating_branch.json
+++ b/src/utils/migration/__fixtures__/reroute/legacy/floating_branch.json
@@ -5,14 +5,8 @@
     {
       "id": 33,
       "type": "Reroute",
-      "pos": [
-        492.768310546875,
-        274.761962890625
-      ],
-      "size": [
-        75,
-        26
-      ],
+      "pos": [492.768310546875, 274.761962890625],
+      "size": [75, 26],
       "flags": {},
       "order": 2,
       "mode": 0,
@@ -27,9 +21,7 @@
         {
           "name": "",
           "type": "VAE",
-          "links": [
-            40
-          ]
+          "links": [40]
         }
       ],
       "properties": {
@@ -40,14 +32,8 @@
     {
       "id": 32,
       "type": "Reroute",
-      "pos": [
-        362.8304138183594,
-        275.12872314453125
-      ],
-      "size": [
-        75,
-        26
-      ],
+      "pos": [362.8304138183594, 275.12872314453125],
+      "size": [75, 26],
       "flags": {},
       "order": 1,
       "mode": 0,
@@ -62,10 +48,7 @@
         {
           "name": "",
           "type": "VAE",
-          "links": [
-            41,
-            42
-          ]
+          "links": [41, 42]
         }
       ],
       "properties": {
@@ -76,14 +59,8 @@
     {
       "id": 4,
       "type": "CheckpointLoaderSimple",
-      "pos": [
-        -0.6348835229873657,
-        238.0631866455078
-      ],
-      "size": [
-        315,
-        98
-      ],
+      "pos": [-0.6348835229873657, 238.0631866455078],
+      "size": [315, 98],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -105,9 +82,7 @@
           "name": "VAE",
           "type": "VAE",
           "slot_index": 2,
-          "links": [
-            39
-          ]
+          "links": [39]
         }
       ],
       "properties": {
@@ -115,21 +90,13 @@
         "ver": "0.3.26",
         "Node name for S&R": "CheckpointLoaderSimple"
       },
-      "widgets_values": [
-        "v1-5-pruned-emaonly.safetensors"
-      ]
+      "widgets_values": ["v1-5-pruned-emaonly.safetensors"]
     },
     {
       "id": 12,
       "type": "VAEDecode",
-      "pos": [
-        611.6028442382812,
-        254.6018524169922
-      ],
-      "size": [
-        210,
-        46
-      ],
+      "pos": [611.6028442382812, 254.6018524169922],
+      "size": [210, 46],
       "flags": {},
       "order": 4,
       "mode": 0,
@@ -162,14 +129,8 @@
     {
       "id": 34,
       "type": "Reroute",
-      "pos": [
-        490.8152770996094,
-        364.4836730957031
-      ],
-      "size": [
-        75,
-        26
-      ],
+      "pos": [490.8152770996094, 364.4836730957031],
+      "size": [75, 26],
       "flags": {},
       "order": 3,
       "mode": 0,
@@ -194,38 +155,10 @@
     }
   ],
   "links": [
-    [
-      39,
-      4,
-      2,
-      32,
-      0,
-      "*"
-    ],
-    [
-      40,
-      33,
-      0,
-      12,
-      1,
-      "VAE"
-    ],
-    [
-      41,
-      32,
-      0,
-      33,
-      0,
-      "*"
-    ],
-    [
-      42,
-      32,
-      0,
-      34,
-      0,
-      "*"
-    ]
+    [39, 4, 2, 32, 0, "*"],
+    [40, 33, 0, 12, 1, "VAE"],
+    [41, 32, 0, 33, 0, "*"],
+    [42, 32, 0, 34, 0, "*"]
   ],
   "floatingLinks": [
     {
@@ -242,12 +175,9 @@
   "extra": {
     "ds": {
       "scale": 1.6672297511789418,
-      "offset": [
-        262.0504372113823,
-        124.35120995663942
-      ]
+      "offset": [262.0504372113823, 124.35120995663942]
     },
     "linkExtensions": []
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/tests-ui/tests/utils/migration/workflows/reroute/legacy/single_connected.json b/src/utils/migration/__fixtures__/reroute/legacy/single_connected.json
similarity index 72%
rename from tests-ui/tests/utils/migration/workflows/reroute/legacy/single_connected.json
rename to src/utils/migration/__fixtures__/reroute/legacy/single_connected.json
index 5559743aca..89e4c4a3b3 100644
--- a/tests-ui/tests/utils/migration/workflows/reroute/legacy/single_connected.json
+++ b/src/utils/migration/__fixtures__/reroute/legacy/single_connected.json
@@ -5,14 +5,8 @@
     {
       "id": 12,
       "type": "VAEDecode",
-      "pos": [
-        620,
-        260
-      ],
-      "size": [
-        210,
-        46
-      ],
+      "pos": [620, 260],
+      "size": [210, 46],
       "flags": {},
       "order": 2,
       "mode": 0,
@@ -43,14 +37,8 @@
     {
       "id": 13,
       "type": "Reroute",
-      "pos": [
-        510,
-        280
-      ],
-      "size": [
-        75,
-        26
-      ],
+      "pos": [510, 280],
+      "size": [75, 26],
       "flags": {},
       "order": 1,
       "mode": 0,
@@ -66,9 +54,7 @@
           "name": "",
           "type": "VAE",
           "slot_index": 0,
-          "links": [
-            21
-          ]
+          "links": [21]
         }
       ],
       "properties": {
@@ -79,14 +65,8 @@
     {
       "id": 4,
       "type": "CheckpointLoaderSimple",
-      "pos": [
-        160,
-        240
-      ],
-      "size": [
-        315,
-        98
-      ],
+      "pos": [160, 240],
+      "size": [315, 98],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -108,47 +88,26 @@
           "name": "VAE",
           "type": "VAE",
           "slot_index": 2,
-          "links": [
-            13
-          ]
+          "links": [13]
         }
       ],
       "properties": {
         "Node name for S&R": "CheckpointLoaderSimple"
       },
-      "widgets_values": [
-        "v1-5-pruned-emaonly.safetensors"
-      ]
+      "widgets_values": ["v1-5-pruned-emaonly.safetensors"]
     }
   ],
   "links": [
-    [
-      13,
-      4,
-      2,
-      13,
-      0,
-      "*"
-    ],
-    [
-      21,
-      13,
-      0,
-      12,
-      1,
-      "VAE"
-    ]
+    [13, 4, 2, 13, 0, "*"],
+    [21, 13, 0, 12, 1, "VAE"]
   ],
   "groups": [],
   "config": {},
   "extra": {
     "ds": {
       "scale": 2.7130434782608694,
-      "offset": [
-        -35,
-        -40.86698717948718
-      ]
+      "offset": [-35, -40.86698717948718]
     }
   },
   "version": 0.4
-}
\ No newline at end of file
+}
diff --git a/tests-ui/tests/utils/migration/workflows/reroute/native/branching.json b/src/utils/migration/__fixtures__/reroute/native/branching.json
similarity index 100%
rename from tests-ui/tests/utils/migration/workflows/reroute/native/branching.json
rename to src/utils/migration/__fixtures__/reroute/native/branching.json
diff --git a/tests-ui/tests/utils/migration/workflows/reroute/native/floating.json b/src/utils/migration/__fixtures__/reroute/native/floating.json
similarity index 100%
rename from tests-ui/tests/utils/migration/workflows/reroute/native/floating.json
rename to src/utils/migration/__fixtures__/reroute/native/floating.json
diff --git a/tests-ui/tests/utils/migration/workflows/reroute/native/floating_branch.json b/src/utils/migration/__fixtures__/reroute/native/floating_branch.json
similarity index 100%
rename from tests-ui/tests/utils/migration/workflows/reroute/native/floating_branch.json
rename to src/utils/migration/__fixtures__/reroute/native/floating_branch.json
diff --git a/tests-ui/tests/utils/migration/workflows/reroute/native/single_connected.json b/src/utils/migration/__fixtures__/reroute/native/single_connected.json
similarity index 100%
rename from tests-ui/tests/utils/migration/workflows/reroute/native/single_connected.json
rename to src/utils/migration/__fixtures__/reroute/native/single_connected.json
diff --git a/tests-ui/tests/utils/migration/migrateReroute.test.ts b/src/utils/migration/migrateReroute.test.ts
similarity index 90%
rename from tests-ui/tests/utils/migration/migrateReroute.test.ts
rename to src/utils/migration/migrateReroute.test.ts
index ce7b62a2e7..a6fa00bf6a 100644
--- a/tests-ui/tests/utils/migration/migrateReroute.test.ts
+++ b/src/utils/migration/migrateReroute.test.ts
@@ -22,7 +22,7 @@ describe('migrateReroute', () => {
     ])('should correctly migrate %s', async (fileName) => {
       // Load the legacy workflow
       const legacyWorkflow = loadWorkflow(
-        `workflows/reroute/legacy/${fileName}`
+        `__fixtures__/reroute/legacy/${fileName}`
       )
 
       // Migrate the workflow
@@ -31,7 +31,7 @@ describe('migrateReroute', () => {
       // Compare with snapshot
       await expect(
         JSON.stringify(migratedWorkflow, null, 2)
-      ).toMatchFileSnapshot(`workflows/reroute/native/${fileName}`)
+      ).toMatchFileSnapshot(`__fixtures__/reroute/native/${fileName}`)
     })
   })
 })
diff --git a/src/utils/migration/migrateReroute.ts b/src/utils/migration/migrateReroute.ts
index 07ba18dc3a..0d60a426d1 100644
--- a/src/utils/migration/migrateReroute.ts
+++ b/src/utils/migration/migrateReroute.ts
@@ -54,7 +54,7 @@ class ConversionContext {
   /** Reroutes that has at least a valid link pass through it */
   validReroutes: Set<Reroute>
 
-  #rerouteIdCounter = 0
+  private _rerouteIdCounter = 0
 
   constructor(public workflow: WorkflowJSON04) {
     this.nodeById = _.keyBy(workflow.nodes.map(_.cloneDeep), 'id')
@@ -76,7 +76,7 @@ class ConversionContext {
       pos: getNodeCenter(node),
       linkIds: []
     }))
-    this.#rerouteIdCounter = reroutes.length + 1
+    this._rerouteIdCounter = reroutes.length + 1
 
     this.rerouteByNodeId = _.keyBy(reroutes, 'nodeId')
     this.rerouteById = _.keyBy(reroutes, 'id')
@@ -88,7 +88,7 @@ class ConversionContext {
   /**
    * Gets the chain of reroute nodes leading to the given node
    */
-  #getRerouteChain(node: RerouteNode): RerouteNode[] {
+  private _getRerouteChain(node: RerouteNode): RerouteNode[] {
     const nodes: RerouteNode[] = []
     let currentNode: RerouteNode = node
     while (currentNode?.type === 'Reroute') {
@@ -106,7 +106,7 @@ class ConversionContext {
     return nodes
   }
 
-  #connectRerouteChain(rerouteNodes: RerouteNode[]): Reroute[] {
+  private _connectRerouteChain(rerouteNodes: RerouteNode[]): Reroute[] {
     const reroutes = rerouteNodes.map((node) => this.rerouteByNodeId[node.id])
     for (const reroute of reroutes) {
       this.validReroutes.add(reroute)
@@ -121,7 +121,7 @@ class ConversionContext {
     return reroutes
   }
 
-  #createNewLink(
+  private _createNewLink(
     startingLink: ComfyLinkObject,
     endingLink: ComfyLinkObject,
     rerouteNodes: RerouteNode[]
@@ -136,7 +136,7 @@ class ConversionContext {
       parentId: reroute.id
     })
 
-    const reroutes = this.#connectRerouteChain(rerouteNodes)
+    const reroutes = this._connectRerouteChain(rerouteNodes)
     for (const reroute of reroutes) {
       reroute.linkIds ??= []
       reroute.linkIds.push(endingLink.id)
@@ -153,11 +153,11 @@ class ConversionContext {
     }
   }
 
-  #createNewInputFloatingLink(
+  private _createNewInputFloatingLink(
     endingLink: ComfyLinkObject,
     rerouteNodes: RerouteNode[]
   ): ComfyLinkObject {
-    const reroutes = this.#connectRerouteChain(rerouteNodes)
+    const reroutes = this._connectRerouteChain(rerouteNodes)
     for (const reroute of reroutes) {
       if (!reroute.linkIds?.length) {
         reroute.floating = {
@@ -166,7 +166,7 @@ class ConversionContext {
       }
     }
     return {
-      id: this.#rerouteIdCounter++,
+      id: this._rerouteIdCounter++,
       origin_id: -1,
       origin_slot: -1,
       target_id: endingLink.target_id,
@@ -176,11 +176,11 @@ class ConversionContext {
     }
   }
 
-  #createNewOutputFloatingLink(
+  private _createNewOutputFloatingLink(
     startingLink: ComfyLinkObject,
     rerouteNodes: RerouteNode[]
   ): ComfyLinkObject {
-    const reroutes = this.#connectRerouteChain(rerouteNodes)
+    const reroutes = this._connectRerouteChain(rerouteNodes)
     for (const reroute of reroutes) {
       if (!reroute.linkIds?.length) {
         reroute.floating = {
@@ -190,7 +190,7 @@ class ConversionContext {
     }
 
     return {
-      id: this.#rerouteIdCounter++,
+      id: this._rerouteIdCounter++,
       origin_id: startingLink.origin_id,
       origin_slot: startingLink.origin_slot,
       target_id: -1,
@@ -200,7 +200,7 @@ class ConversionContext {
     }
   }
 
-  #reconnectLinks(nodes: ComfyNode[], links: ComfyLinkObject[]): void {
+  private _reconnectLinks(nodes: ComfyNode[], links: ComfyLinkObject[]): void {
     // Remove all existing links on sockets
     for (const node of nodes) {
       for (const input of node.inputs ?? []) {
@@ -245,18 +245,18 @@ class ConversionContext {
       const endingRerouteNode = this.nodeById[
         endingLink.origin_id
       ] as RerouteNode
-      const rerouteNodes = this.#getRerouteChain(endingRerouteNode)
+      const rerouteNodes = this._getRerouteChain(endingRerouteNode)
       const startingLink =
         this.linkById[
           rerouteNodes[rerouteNodes.length - 1]?.inputs?.[0]?.link ?? -1
         ]
       if (startingLink) {
         // Valid link found, create a new link
-        links.push(this.#createNewLink(startingLink, endingLink, rerouteNodes))
+        links.push(this._createNewLink(startingLink, endingLink, rerouteNodes))
       } else {
         // Floating link found, create a new floating link
         floatingLinks.push(
-          this.#createNewInputFloatingLink(endingLink, rerouteNodes)
+          this._createNewInputFloatingLink(endingLink, rerouteNodes)
         )
       }
     }
@@ -270,14 +270,14 @@ class ConversionContext {
       })
 
     for (const rerouteNode of floatingEndingRerouteNodes) {
-      const rerouteNodes = this.#getRerouteChain(rerouteNode)
+      const rerouteNodes = this._getRerouteChain(rerouteNode)
       const startingLink =
         this.linkById[
           rerouteNodes[rerouteNodes.length - 1]?.inputs?.[0]?.link ?? -1
         ]
       if (startingLink) {
         floatingLinks.push(
-          this.#createNewOutputFloatingLink(startingLink, rerouteNodes)
+          this._createNewOutputFloatingLink(startingLink, rerouteNodes)
         )
       }
     }
@@ -285,7 +285,7 @@ class ConversionContext {
     const nodes = Object.values(this.nodeById).filter(
       (node) => node.type !== 'Reroute'
     )
-    this.#reconnectLinks(nodes, links)
+    this._reconnectLinks(nodes, links)
 
     return {
       ...this.workflow,
diff --git a/tests-ui/tests/utils/nodeDefUtil.test.ts b/src/utils/nodeDefUtil.test.ts
similarity index 100%
rename from tests-ui/tests/utils/nodeDefUtil.test.ts
rename to src/utils/nodeDefUtil.test.ts
diff --git a/tests-ui/tests/utils/nodeFilterUtil.test.ts b/src/utils/nodeFilterUtil.test.ts
similarity index 93%
rename from tests-ui/tests/utils/nodeFilterUtil.test.ts
rename to src/utils/nodeFilterUtil.test.ts
index 871f66109d..0e6149c0d1 100644
--- a/tests-ui/tests/utils/nodeFilterUtil.test.ts
+++ b/src/utils/nodeFilterUtil.test.ts
@@ -11,7 +11,7 @@ describe('nodeFilterUtil', () => {
   ): LGraphNode => {
     // Create a custom class with the nodeData static property
     class MockNode extends LGraphNode {
-      static nodeData = isOutputNode ? { output_node: true } : {}
+      static override nodeData = isOutputNode ? { output_node: true } : {}
     }
 
     const node = new MockNode('')
@@ -71,11 +71,11 @@ describe('nodeFilterUtil', () => {
     })
 
     it('should handle nodes with undefined output_node', () => {
-      class MockNodeWithOtherData extends LGraphNode {
-        static nodeData = { someOtherProperty: true }
+      class MockNodeWithEmptyData extends LGraphNode {
+        static override nodeData = {}
       }
 
-      const node = new MockNodeWithOtherData('')
+      const node = new MockNodeWithEmptyData('')
       node.id = 1
 
       const result = filterOutputNodes([node])
diff --git a/src/utils/nodeTitleUtil.ts b/src/utils/nodeTitleUtil.ts
new file mode 100644
index 0000000000..a631cec10b
--- /dev/null
+++ b/src/utils/nodeTitleUtil.ts
@@ -0,0 +1,28 @@
+import { normalizeI18nKey } from '@/utils/formatUtil'
+
+type NodeTitleInfo = {
+  title?: string | number | null
+  type?: string | number | null
+}
+
+type StaticTranslate = (key: string, fallbackMessage: string) => string
+
+type ResolveNodeDisplayNameOptions = {
+  emptyLabel: string
+  untitledLabel: string
+  st: StaticTranslate
+}
+
+export function resolveNodeDisplayName(
+  node: NodeTitleInfo | null | undefined,
+  options: ResolveNodeDisplayNameOptions
+): string {
+  if (!node) return options.emptyLabel
+
+  const title = (node.title ?? '').toString().trim()
+  if (title.length > 0) return title
+
+  const nodeType = (node.type ?? '').toString().trim() || options.untitledLabel
+  const key = `nodeDefs.${normalizeI18nKey(nodeType)}.display_name`
+  return options.st(key, nodeType)
+}
diff --git a/src/utils/objectUrlUtil.ts b/src/utils/objectUrlUtil.ts
new file mode 100644
index 0000000000..b934997aed
--- /dev/null
+++ b/src/utils/objectUrlUtil.ts
@@ -0,0 +1,27 @@
+const objectUrlRefCounts = new Map<string, number>()
+
+const isBlobUrl = (url: string) => url.startsWith('blob:')
+
+export function createSharedObjectUrl(blob: Blob): string {
+  const url = URL.createObjectURL(blob)
+  objectUrlRefCounts.set(url, 1)
+  return url
+}
+
+export function retainSharedObjectUrl(url: string | undefined): void {
+  if (!url || !isBlobUrl(url)) return
+  objectUrlRefCounts.set(url, (objectUrlRefCounts.get(url) ?? 0) + 1)
+}
+
+export function releaseSharedObjectUrl(url: string | undefined): void {
+  if (!url || !isBlobUrl(url)) return
+
+  const currentCount = objectUrlRefCounts.get(url)
+  if (currentCount === undefined || currentCount <= 1) {
+    objectUrlRefCounts.delete(url)
+    URL.revokeObjectURL(url)
+    return
+  }
+
+  objectUrlRefCounts.set(url, currentCount - 1)
+}
diff --git a/tests-ui/tests/utils/packUtils.test.ts b/src/utils/packUtils.test.ts
similarity index 100%
rename from tests-ui/tests/utils/packUtils.test.ts
rename to src/utils/packUtils.test.ts
diff --git a/src/utils/queueDisplay.ts b/src/utils/queueDisplay.ts
index e0e0bce18d..fa33c4bdd7 100644
--- a/src/utils/queueDisplay.ts
+++ b/src/utils/queueDisplay.ts
@@ -4,7 +4,7 @@ import { formatDuration } from '@/utils/formatUtil'
 import { clampPercentInt, formatPercent0 } from '@/utils/numberUtil'
 
 export type BuildJobDisplayCtx = {
-  t: (k: string, v?: Record<string, any>) => string
+  t: (k: string, v?: Record<string, unknown>) => string
   locale: string
   formatClockTimeFn: (ts: number, locale: string) => string
   isActive: boolean
@@ -43,8 +43,8 @@ export const iconForJobState = (state: JobState): string => {
 
 const buildTitle = (task: TaskItemImpl, t: (k: string) => string): string => {
   const prefix = t('g.job')
-  const shortId = String(task.promptId ?? '').split('-')[0]
-  const idx = task.queueIndex
+  const shortId = String(task.jobId ?? '').split('-')[0]
+  const idx = task.job.priority
   if (typeof idx === 'number') return `${prefix} #${idx}`
   if (shortId) return `${prefix} ${shortId}`
   return prefix
diff --git a/src/utils/queueUtil.ts b/src/utils/queueUtil.ts
index cf9f47b6b8..81931012d4 100644
--- a/src/utils/queueUtil.ts
+++ b/src/utils/queueUtil.ts
@@ -1,6 +1,15 @@
 import type { TaskItemImpl } from '@/stores/queueStore'
 import type { JobState } from '@/types/queue'
 
+/**
+ * Checks if a job state represents an active (in-progress) job.
+ */
+export function isActiveJobState(state: JobState): boolean {
+  return (
+    state === 'pending' || state === 'initialization' || state === 'running'
+  )
+}
+
 /**
  * Map a task to a UI job state, including initialization override.
  *
diff --git a/tests-ui/tests/utils/serachAndReplace.test.ts b/src/utils/searchAndReplace.test.ts
similarity index 100%
rename from tests-ui/tests/utils/serachAndReplace.test.ts
rename to src/utils/searchAndReplace.test.ts
diff --git a/src/utils/syncUtil.ts b/src/utils/syncUtil.ts
index c60583b9bc..f694746039 100644
--- a/src/utils/syncUtil.ts
+++ b/src/utils/syncUtil.ts
@@ -1,4 +1,5 @@
 import { api } from '@/scripts/api'
+import type { UserDataFullInfo } from '@/schemas/apiSchema'
 
 /**
  * Sync entities from the API to the entityByPath map.
@@ -11,8 +12,8 @@ import { api } from '@/scripts/api'
 export async function syncEntities<T>(
   dir: string,
   entityByPath: Record<string, T>,
-  createEntity: (file: any) => T,
-  updateEntity: (entity: T, file: any) => void,
+  createEntity: (file: UserDataFullInfo & { path: string }) => T,
+  updateEntity: (entity: T, file: UserDataFullInfo & { path: string }) => void,
   exclude: (file: T) => boolean = () => false
 ) {
   const files = (await api.listUserDataFullInfo(dir)).map((file) => ({
diff --git a/src/utils/textTickerUtils.test.ts b/src/utils/textTickerUtils.test.ts
new file mode 100644
index 0000000000..3fa2592f9f
--- /dev/null
+++ b/src/utils/textTickerUtils.test.ts
@@ -0,0 +1,58 @@
+import { describe, expect, it } from 'vitest'
+
+import { splitTextAtWordBoundary } from '@/utils/textTickerUtils'
+
+describe('splitTextAtWordBoundary', () => {
+  it('returns full text when ratio >= 1 (fits in one line)', () => {
+    expect(splitTextAtWordBoundary('Load Checkpoint', 1)).toEqual([
+      'Load Checkpoint',
+      ''
+    ])
+    expect(splitTextAtWordBoundary('Load Checkpoint', 1.5)).toEqual([
+      'Load Checkpoint',
+      ''
+    ])
+  })
+
+  it('splits at last word boundary before estimated break', () => {
+    // "Load Checkpoint Loader" = 22 chars, ratio 0.5 → estimate at char 11
+    // lastIndexOf(' ', 11) → 15? No: "Load Checkpoint Loader"
+    //                                  0123456789...
+    // ' ' at index 4 and 15
+    // lastIndexOf(' ', 11) → 4
+    expect(splitTextAtWordBoundary('Load Checkpoint Loader', 0.5)).toEqual([
+      'Load',
+      'Checkpoint Loader'
+    ])
+  })
+
+  it('splits longer text proportionally', () => {
+    // ratio 0.7 → estimate at char 15
+    // lastIndexOf(' ', 15) → 15 (the space between "Checkpoint" and "Loader")
+    expect(splitTextAtWordBoundary('Load Checkpoint Loader', 0.7)).toEqual([
+      'Load Checkpoint',
+      'Loader'
+    ])
+  })
+
+  it('returns full text when no word boundary found', () => {
+    expect(splitTextAtWordBoundary('Superlongwordwithoutspaces', 0.5)).toEqual([
+      'Superlongwordwithoutspaces',
+      ''
+    ])
+  })
+
+  it('handles single word text', () => {
+    expect(splitTextAtWordBoundary('Checkpoint', 0.5)).toEqual([
+      'Checkpoint',
+      ''
+    ])
+  })
+
+  it('handles ratio near zero', () => {
+    expect(splitTextAtWordBoundary('Load Checkpoint Loader', 0.1)).toEqual([
+      'Load Checkpoint Loader',
+      ''
+    ])
+  })
+})
diff --git a/src/utils/textTickerUtils.ts b/src/utils/textTickerUtils.ts
new file mode 100644
index 0000000000..4846507660
--- /dev/null
+++ b/src/utils/textTickerUtils.ts
@@ -0,0 +1,10 @@
+export function splitTextAtWordBoundary(
+  text: string,
+  ratio: number
+): [string, string] {
+  if (ratio >= 1) return [text, '']
+  const estimate = Math.floor(text.length * ratio)
+  const breakIndex = text.lastIndexOf(' ', estimate)
+  if (breakIndex <= 0) return [text, '']
+  return [text.substring(0, breakIndex), text.substring(breakIndex + 1)]
+}
diff --git a/tests-ui/tests/utils/treeUtilTest.test.ts b/src/utils/treeUtil.test.ts
similarity index 100%
rename from tests-ui/tests/utils/treeUtilTest.test.ts
rename to src/utils/treeUtil.test.ts
diff --git a/src/utils/treeUtil.ts b/src/utils/treeUtil.ts
index 21f1e45d67..373281ad0f 100644
--- a/src/utils/treeUtil.ts
+++ b/src/utils/treeUtil.ts
@@ -39,6 +39,21 @@ export function buildTree<T>(items: T[], key: (item: T) => string[]): TreeNode {
   return root
 }
 
+/**
+ * If a tree root has exactly one non-leaf child folder, promote that
+ * folder's children up to the root level, removing the redundant layer.
+ */
+export function unwrapTreeRoot(tree: TreeNode): TreeNode {
+  if (
+    tree.children?.length === 1 &&
+    !tree.children[0].leaf &&
+    (tree.children[0].children?.length ?? 0) > 0
+  ) {
+    return { ...tree, children: tree.children[0].children }
+  }
+  return tree
+}
+
 export function flattenTree<T>(tree: TreeNode): T[] {
   const result: T[] = []
   const stack: TreeNode[] = [tree]
diff --git a/tests-ui/tests/utils/typeGuardUtil.test.ts b/src/utils/typeGuardUtil.test.ts
similarity index 58%
rename from tests-ui/tests/utils/typeGuardUtil.test.ts
rename to src/utils/typeGuardUtil.test.ts
index 9c06892713..9a58655b2d 100644
--- a/tests-ui/tests/utils/typeGuardUtil.test.ts
+++ b/src/utils/typeGuardUtil.test.ts
@@ -1,43 +1,42 @@
 import { describe, expect, it } from 'vitest'
 
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
 import { isSubgraphIoNode } from '@/utils/typeGuardUtil'
 
+type NodeConstructor = { comfyClass?: string }
+
+function createMockNode(nodeConstructor?: NodeConstructor): LGraphNode {
+  return { constructor: nodeConstructor } as Partial<LGraphNode> as LGraphNode
+}
+
 describe('typeGuardUtil', () => {
   describe('isSubgraphIoNode', () => {
     it('should identify SubgraphInputNode as IO node', () => {
-      const node = {
-        constructor: { comfyClass: 'SubgraphInputNode' }
-      } as any
+      const node = createMockNode({ comfyClass: 'SubgraphInputNode' })
 
       expect(isSubgraphIoNode(node)).toBe(true)
     })
 
     it('should identify SubgraphOutputNode as IO node', () => {
-      const node = {
-        constructor: { comfyClass: 'SubgraphOutputNode' }
-      } as any
+      const node = createMockNode({ comfyClass: 'SubgraphOutputNode' })
 
       expect(isSubgraphIoNode(node)).toBe(true)
     })
 
     it('should not identify regular nodes as IO nodes', () => {
-      const node = {
-        constructor: { comfyClass: 'CLIPTextEncode' }
-      } as any
+      const node = createMockNode({ comfyClass: 'CLIPTextEncode' })
 
       expect(isSubgraphIoNode(node)).toBe(false)
     })
 
     it('should handle nodes without constructor', () => {
-      const node = {} as any
+      const node = createMockNode(undefined)
 
       expect(isSubgraphIoNode(node)).toBe(false)
     })
 
     it('should handle nodes without comfyClass', () => {
-      const node = {
-        constructor: {}
-      } as any
+      const node = createMockNode({})
 
       expect(isSubgraphIoNode(node)).toBe(false)
     })
diff --git a/src/utils/widgetPropFilter.ts b/src/utils/widgetPropFilter.ts
index af2bac794f..f66a8e8bd3 100644
--- a/src/utils/widgetPropFilter.ts
+++ b/src/utils/widgetPropFilter.ts
@@ -17,7 +17,8 @@ export const STANDARD_EXCLUDED_PROPS = [
 export const INPUT_EXCLUDED_PROPS = [
   ...STANDARD_EXCLUDED_PROPS,
   'inputClass',
-  'inputStyle'
+  'inputStyle',
+  'read_only'
 ] as const
 
 export const PANEL_EXCLUDED_PROPS = [
@@ -55,13 +56,13 @@ export const BADGE_EXCLUDED_PROPS = [
  * @param excludeList - List of property names to exclude
  * @returns Filtered props object
  */
-export function filterWidgetProps<T extends Record<string, any>>(
+export function filterWidgetProps<T extends object>(
   props: T | undefined,
   excludeList: readonly string[]
 ): Partial<T> {
   if (!props) return {}
 
-  const filtered: Record<string, any> = {}
+  const filtered: Record<string, unknown> = {}
   for (const [key, value] of Object.entries(props)) {
     if (!excludeList.includes(key)) {
       filtered[key] = value
diff --git a/src/utils/widgetUtil.test.ts b/src/utils/widgetUtil.test.ts
new file mode 100644
index 0000000000..122d063af8
--- /dev/null
+++ b/src/utils/widgetUtil.test.ts
@@ -0,0 +1,39 @@
+import { describe, expect, it } from 'vitest'
+
+import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
+
+import { getWidgetDefaultValue } from '@/utils/widgetUtil'
+
+describe('getWidgetDefaultValue', () => {
+  it('returns undefined for undefined spec', () => {
+    expect(getWidgetDefaultValue(undefined)).toBeUndefined()
+  })
+
+  it('returns explicit default when provided', () => {
+    const spec = { type: 'INT', default: 42 } as InputSpec
+    expect(getWidgetDefaultValue(spec)).toBe(42)
+  })
+
+  it.for([
+    { type: 'INT', expected: 0 },
+    { type: 'FLOAT', expected: 0 },
+    { type: 'BOOLEAN', expected: false },
+    { type: 'STRING', expected: '' }
+  ])(
+    'returns $expected for $type type without default',
+    ({ type, expected }) => {
+      const spec = { type } as InputSpec
+      expect(getWidgetDefaultValue(spec)).toBe(expected)
+    }
+  )
+
+  it('returns first option for array options without default', () => {
+    const spec = { type: 'COMBO', options: ['a', 'b', 'c'] } as InputSpec
+    expect(getWidgetDefaultValue(spec)).toBe('a')
+  })
+
+  it('returns undefined for unknown type without options', () => {
+    const spec = { type: 'CUSTOM' } as InputSpec
+    expect(getWidgetDefaultValue(spec)).toBeUndefined()
+  })
+})
diff --git a/src/utils/widgetUtil.ts b/src/utils/widgetUtil.ts
new file mode 100644
index 0000000000..e8f712fbc7
--- /dev/null
+++ b/src/utils/widgetUtil.ts
@@ -0,0 +1,77 @@
+import { isPromotedWidgetView } from '@/core/graph/subgraph/promotedWidgetTypes'
+import { resolvePromotedWidgetSource } from '@/core/graph/subgraph/resolvePromotedWidgetSource'
+import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
+import type { SubgraphNode } from '@/lib/litegraph/src/subgraph/SubgraphNode'
+import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
+
+export type WidgetValue = boolean | number | string | object | undefined
+
+export function getWidgetDefaultValue(
+  spec: InputSpec | undefined
+): WidgetValue {
+  if (!spec) return undefined
+
+  if (spec.default !== undefined) return spec.default as WidgetValue
+
+  switch (spec.type) {
+    case 'INT':
+    case 'FLOAT':
+      return 0
+    case 'BOOLEAN':
+      return false
+    case 'STRING':
+      return ''
+    default:
+      if (Array.isArray(spec.options) && spec.options.length > 0) {
+        return spec.options[0] as WidgetValue
+      }
+      return undefined
+  }
+}
+
+/**
+ * Renames a widget and its corresponding input.
+ * Handles both regular widgets and promoted widget views in subgraphs.
+ *
+ * @param widget The widget to rename
+ * @param node The node containing the widget
+ * @param newLabel The new label for the widget (empty string or undefined to clear)
+ * @param parents Optional array of parent SubgraphNodes (for promoted widgets)
+ * @returns true if the rename was successful, false otherwise
+ */
+export function renameWidget(
+  widget: IBaseWidget,
+  node: LGraphNode,
+  newLabel: string,
+  parents?: SubgraphNode[]
+): boolean {
+  if (isPromotedWidgetView(widget) && parents?.length) {
+    const sourceWidget = resolvePromotedWidgetSource(node, widget)
+    if (!sourceWidget) {
+      console.error('Could not resolve source widget for promoted widget')
+      return false
+    }
+
+    const originalWidget = sourceWidget.widget
+    const interiorNode = sourceWidget.node
+
+    originalWidget.label = newLabel || undefined
+
+    const interiorInput = interiorNode.inputs?.find(
+      (inp) => inp.widget?.name === originalWidget.name
+    )
+    if (interiorInput) {
+      interiorInput.label = newLabel || undefined
+    }
+  }
+
+  const input = node.inputs?.find((inp) => inp.widget?.name === widget.name)
+
+  widget.label = newLabel || undefined
+  if (input) {
+    input.label = newLabel || undefined
+  }
+
+  return true
+}
diff --git a/src/views/GraphView.vue b/src/views/GraphView.vue
index 58b428afdc..811a57c336 100644
--- a/src/views/GraphView.vue
+++ b/src/views/GraphView.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="comfyui-body grid h-full w-full overflow-hidden">
+  <div class="comfyui-body grid size-full overflow-hidden">
     <div id="comfyui-body-top" class="comfyui-body-top" />
     <div id="comfyui-body-bottom" class="comfyui-body-bottom" />
     <div id="comfyui-body-left" class="comfyui-body-left" />
@@ -13,16 +13,25 @@
       <GraphCanvas @ready="onGraphReady" />
     </div>
     <LinearView v-if="linearMode" />
+    <template v-if="isBuilderMode">
+      <BuilderToolbar />
+      <BuilderMenu />
+      <BuilderFooterToolbar />
+    </template>
   </div>
 
   <GlobalToast />
+  <InviteAcceptedToast />
   <RerouteMigrationToast />
-  <UnloadWindowConfirmDialog v-if="!isElectron()" />
+  <ModelImportProgressDialog />
+  <AssetExportProgressDialog />
+  <ManagerProgressToast />
+  <UnloadWindowConfirmDialog v-if="!isDesktop" />
   <MenuHamburger />
 </template>
 
 <script setup lang="ts">
-import { useEventListener } from '@vueuse/core'
+import { useEventListener, useIntervalFn } from '@vueuse/core'
 import { storeToRefs } from 'pinia'
 import type { ToastMessageOptions } from 'primevue/toast'
 import { useToast } from 'primevue/usetoast'
@@ -42,14 +51,19 @@ import MenuHamburger from '@/components/MenuHamburger.vue'
 import UnloadWindowConfirmDialog from '@/components/dialog/UnloadWindowConfirmDialog.vue'
 import GraphCanvas from '@/components/graph/GraphCanvas.vue'
 import GlobalToast from '@/components/toast/GlobalToast.vue'
+import InviteAcceptedToast from '@/platform/workspace/components/toasts/InviteAcceptedToast.vue'
 import RerouteMigrationToast from '@/components/toast/RerouteMigrationToast.vue'
 import { useBrowserTabTitle } from '@/composables/useBrowserTabTitle'
 import { useCoreCommands } from '@/composables/useCoreCommands'
+import { useQueuePolling } from '@/platform/remote/comfyui/useQueuePolling'
 import { useErrorHandling } from '@/composables/useErrorHandling'
 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 { isCloud } from '@/platform/distribution/types'
+import AssetExportProgressDialog from '@/platform/assets/components/AssetExportProgressDialog.vue'
+import ModelImportProgressDialog from '@/platform/assets/components/ModelImportProgressDialog.vue'
+import { isCloud, isDesktop } from '@/platform/distribution/types'
 import { useSettingStore } from '@/platform/settings/settingStore'
 import { useTelemetry } from '@/platform/telemetry'
 import { useFrontendVersionMismatchWarning } from '@/platform/updates/common/useFrontendVersionMismatchWarning'
@@ -59,7 +73,8 @@ import type { StatusWsMessageStatus } from '@/schemas/apiSchema'
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
 import { setupAutoQueueHandler } from '@/services/autoQueueService'
-import { useKeybindingService } from '@/services/keybindingService'
+import { useKeybindingService } from '@/platform/keybindings/keybindingService'
+import { useAppMode } from '@/composables/useAppMode'
 import { useAssetsStore } from '@/stores/assetsStore'
 import { useCommandStore } from '@/stores/commandStore'
 import { useExecutionStore } from '@/stores/executionStore'
@@ -75,9 +90,12 @@ import { useServerConfigStore } from '@/stores/serverConfigStore'
 import { useBottomPanelStore } from '@/stores/workspace/bottomPanelStore'
 import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
 import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
-import { useWorkspaceStore } from '@/stores/workspaceStore'
-import { electronAPI, isElectron } from '@/utils/envUtil'
+import { electronAPI } from '@/utils/envUtil'
+import BuilderFooterToolbar from '@/components/builder/BuilderFooterToolbar.vue'
+import BuilderMenu from '@/components/builder/BuilderMenu.vue'
+import BuilderToolbar from '@/components/builder/BuilderToolbar.vue'
 import LinearView from '@/views/LinearView.vue'
+import ManagerProgressToast from '@/workbench/extensions/manager/components/ManagerProgressToast.vue'
 
 setupAutoQueueHandler()
 useProgressFavicon()
@@ -92,14 +110,18 @@ const queueStore = useQueueStore()
 const assetsStore = useAssetsStore()
 const versionCompatibilityStore = useVersionCompatibilityStore()
 const graphCanvasContainerRef = ref<HTMLDivElement | null>(null)
+const { isBuilderMode } = useAppMode()
 const { linearMode } = storeToRefs(useCanvasStore())
 
+watch(linearMode, (isLinear) => {
+  if (isLinear) {
+    useSidebarTabStore().activeSidebarTabId = null
+  }
+})
+
 const telemetry = useTelemetry()
 const firebaseAuthStore = useFirebaseAuthStore()
 let hasTrackedLogin = false
-let visibilityListener: (() => void) | null = null
-let tabCountInterval: number | null = null
-let tabCountChannel: BroadcastChannel | null = null
 
 watch(
   () => colorPaletteStore.completedActivePalette,
@@ -111,7 +133,7 @@ watch(
       document.body.classList.add(DARK_THEME_CLASS)
     }
 
-    if (isElectron()) {
+    if (isDesktop) {
       electronAPI().changeTheme({
         color: 'rgba(0, 0, 0, 0)',
         symbolColor: newTheme.colors.comfy_base['input-text']
@@ -121,18 +143,16 @@ watch(
   { immediate: true }
 )
 
-if (isElectron()) {
+if (isDesktop) {
   watch(
     () => queueStore.tasks,
     (newTasks, oldTasks) => {
       // Report tasks that previously running but are now completed (i.e. in history)
       const oldRunningTaskIds = new Set(
-        oldTasks.filter((task) => task.isRunning).map((task) => task.promptId)
+        oldTasks.filter((task) => task.isRunning).map((task) => task.jobId)
       )
       newTasks
-        .filter(
-          (task) => oldRunningTaskIds.has(task.promptId) && task.isHistory
-        )
+        .filter((task) => oldRunningTaskIds.has(task.jobId) && task.isHistory)
         .forEach((task) => {
           electronAPI().Events.incrementUserProperty(
             `execution:${task.displayStatus.toLowerCase()}`,
@@ -193,16 +213,14 @@ watchEffect(() => {
   queueStore.maxHistoryItems = settingStore.get('Comfy.Queue.MaxHistoryItems')
 })
 
-const init = () => {
-  const coreCommands = useCoreCommands()
-  useCommandStore().registerCommands(coreCommands)
-  useMenuItemStore().registerCoreMenuCommands()
-  useKeybindingService().registerCoreKeybindings()
-  useSidebarTabStore().registerCoreSidebarTabs()
-  useBottomPanelStore().registerCoreBottomPanelTabs()
-  app.extensionManager = useWorkspaceStore()
-}
+const coreCommands = useCoreCommands()
+useCommandStore().registerCommands(coreCommands)
+useMenuItemStore().registerCoreMenuCommands()
+useKeybindingService().registerCoreKeybindings()
+useSidebarTabStore().registerCoreSidebarTabs()
+void useBottomPanelStore().registerCoreBottomPanelTabs()
 
+useQueuePolling()
 const queuePendingTaskCountStore = useQueuePendingTaskCountStore()
 const sidebarTabStore = useSidebarTabStore()
 
@@ -211,7 +229,7 @@ const onStatus = async (e: CustomEvent<StatusWsMessageStatus>) => {
   await queueStore.update()
   // Only update assets if the assets sidebar is currently open
   // When sidebar is closed, AssetsSidebarTab.vue will refresh on mount
-  if (sidebarTabStore.activeSidebarTabId === 'assets') {
+  if (sidebarTabStore.activeSidebarTabId === 'assets' || linearMode.value) {
     await assetsStore.updateHistory()
   }
 }
@@ -220,7 +238,7 @@ const onExecutionSuccess = async () => {
   await queueStore.update()
   // Only update assets if the assets sidebar is currently open
   // When sidebar is closed, AssetsSidebarTab.vue will refresh on mount
-  if (sidebarTabStore.activeSidebarTabId === 'assets') {
+  if (sidebarTabStore.activeSidebarTabId === 'assets' || linearMode.value) {
     await assetsStore.updateHistory()
   }
 }
@@ -248,15 +266,15 @@ const onReconnected = () => {
   }
 }
 
+useEventListener(api, 'status', onStatus)
+useEventListener(api, 'execution_success', onExecutionSuccess)
+useEventListener(api, 'reconnecting', onReconnecting)
+useEventListener(api, 'reconnected', onReconnected)
+
 onMounted(() => {
-  api.addEventListener('status', onStatus)
-  api.addEventListener('execution_success', onExecutionSuccess)
-  api.addEventListener('reconnecting', onReconnecting)
-  api.addEventListener('reconnected', onReconnected)
   executionStore.bindExecutionEvents()
 
   try {
-    init()
     // Relocate the legacy menu container to the graph canvas container so it is below other elements
     graphCanvasContainerRef.value?.prepend(app.ui.menuContainer)
   } catch (e) {
@@ -265,27 +283,7 @@ onMounted(() => {
 })
 
 onBeforeUnmount(() => {
-  api.removeEventListener('status', onStatus)
-  api.removeEventListener('execution_success', onExecutionSuccess)
-  api.removeEventListener('reconnecting', onReconnecting)
-  api.removeEventListener('reconnected', onReconnected)
   executionStore.unbindExecutionEvents()
-
-  // Clean up page visibility listener
-  if (visibilityListener) {
-    document.removeEventListener('visibilitychange', visibilityListener)
-    visibilityListener = null
-  }
-
-  // Clean up tab count tracking
-  if (tabCountInterval) {
-    window.clearInterval(tabCountInterval)
-    tabCountInterval = null
-  }
-  if (tabCountChannel) {
-    tabCountChannel.close()
-    tabCountChannel = null
-  }
 })
 
 useEventListener(window, 'keydown', useKeybindingService().keybindHandler)
@@ -311,18 +309,17 @@ const onGraphReady = () => {
     }
 
     // Set up page visibility tracking (cloud only)
-    if (isCloud && telemetry && !visibilityListener) {
-      visibilityListener = () => {
+    if (isCloud && telemetry) {
+      useEventListener(document, 'visibilitychange', () => {
         telemetry.trackPageVisibilityChanged({
           visibility_state: document.visibilityState as 'visible' | 'hidden'
         })
-      }
-      document.addEventListener('visibilitychange', visibilityListener)
+      })
     }
 
     // Set up tab count tracking (cloud only)
-    if (isCloud && telemetry && !tabCountInterval) {
-      tabCountChannel = new BroadcastChannel('comfyui-tab-count')
+    if (isCloud && telemetry) {
+      const tabCountChannel = new BroadcastChannel('comfyui-tab-count')
       const activeTabs = new Map<string, number>()
       const currentTabId = crypto.randomUUID()
 
@@ -337,7 +334,7 @@ const onGraphReady = () => {
       }
 
       // 5-minute heartbeat interval
-      tabCountInterval = window.setInterval(() => {
+      useIntervalFn(() => {
         const now = Date.now()
 
         // Clean up stale tabs (no heartbeat for 45 seconds)
@@ -348,7 +345,10 @@ const onGraphReady = () => {
         })
 
         // Broadcast our heartbeat
-        tabCountChannel?.postMessage({ type: 'heartbeat', tabId: currentTabId })
+        tabCountChannel.postMessage({
+          type: 'heartbeat',
+          tabId: currentTabId
+        })
 
         // Track tab count (include current tab)
         const tabCount = activeTabs.size + 1
@@ -365,7 +365,7 @@ const onGraphReady = () => {
 
     // Load server config
     wrapWithErrorHandling(useServerConfigStore().loadServerConfig)(
-      SERVER_CONFIG_ITEMS,
+      SERVER_CONFIG_ITEMS as ServerConfig<ServerConfigValue>[],
       settingStore.get('Comfy.Server.ServerConfigValues')
     )
 
diff --git a/src/views/LinearView.vue b/src/views/LinearView.vue
index 4ce74a4d09..bf8b6b8ff4 100644
--- a/src/views/LinearView.vue
+++ b/src/views/LinearView.vue
@@ -1,193 +1,208 @@
 <script setup lang="ts">
-import { storeToRefs } from 'pinia'
+import { breakpointsTailwind, unrefElement, useBreakpoints } from '@vueuse/core'
+import type { MaybeElement } from '@vueuse/core'
 import Splitter from 'primevue/splitter'
 import SplitterPanel from 'primevue/splitterpanel'
-import { computed } from 'vue'
+import { storeToRefs } from 'pinia'
+import { computed, useTemplateRef } from 'vue'
 
+import AppBuilder from '@/components/builder/AppBuilder.vue'
+import AppModeToolbar from '@/components/appMode/AppModeToolbar.vue'
 import ExtensionSlot from '@/components/common/ExtensionSlot.vue'
-import CurrentUserButton from '@/components/topbar/CurrentUserButton.vue'
-import LoginButton from '@/components/topbar/LoginButton.vue'
 import TopbarBadges from '@/components/topbar/TopbarBadges.vue'
+import TopbarSubscribeButton from '@/components/topbar/TopbarSubscribeButton.vue'
 import WorkflowTabs from '@/components/topbar/WorkflowTabs.vue'
-import Button from '@/components/ui/button/Button.vue'
-import { useCurrentUser } from '@/composables/auth/useCurrentUser'
+import { useSettingStore } from '@/platform/settings/settingStore'
+import { cn } from '@/utils/tailwindUtil'
+import LinearControls from '@/renderer/extensions/linearMode/LinearControls.vue'
+import LinearPreview from '@/renderer/extensions/linearMode/LinearPreview.vue'
+import LinearProgressBar from '@/renderer/extensions/linearMode/LinearProgressBar.vue'
+import MobileDisplay from '@/renderer/extensions/linearMode/MobileDisplay.vue'
+import { useWorkspaceStore } from '@/stores/workspaceStore'
+import { useAppMode } from '@/composables/useAppMode'
+import { useStablePrimeVueSplitterSizer } from '@/composables/useStablePrimeVueSplitterSizer'
 import {
-  isValidWidgetValue,
-  safeWidgetMapper
-} from '@/composables/graph/useGraphNodeManager'
-import { useAssetsSidebarTab } from '@/composables/sidebarTabs/useAssetsSidebarTab'
-import { t } from '@/i18n'
-import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
-import { useTelemetry } from '@/platform/telemetry'
-import { useWorkflowService } from '@/platform/workflow/core/services/workflowService'
-import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
-import NodeWidgets from '@/renderer/extensions/vueNodes/components/NodeWidgets.vue'
-import WidgetInputNumberInput from '@/renderer/extensions/vueNodes/widgets/components/WidgetInputNumber.vue'
-import { app } from '@/scripts/app'
-import { useCommandStore } from '@/stores/commandStore'
-import { useNodeOutputStore } from '@/stores/imagePreviewStore'
-import { useQueueSettingsStore } from '@/stores/queueStore'
-import { isElectron } from '@/utils/envUtil'
+  BUILDER_MIN_SIZE,
+  CENTER_PANEL_SIZE,
+  SIDEBAR_MIN_SIZE,
+  SIDE_PANEL_SIZE
+} from '@/constants/splitterConstants'
+import { useAppModeStore } from '@/stores/appModeStore'
 
-const nodeOutputStore = useNodeOutputStore()
-const commandStore = useCommandStore()
-const nodeDatas = computed(() => {
-  function nodeToNodeData(node: LGraphNode) {
-    const mapper = safeWidgetMapper(node, new Map())
-    const widgets =
-      node.widgets?.map((widget) => {
-        const safeWidget = mapper(widget)
-        safeWidget.callback = function (value) {
-          if (!isValidWidgetValue(value)) return
-          widget.value = value ?? undefined
-          return widget.callback?.(widget.value)
-        }
-        return safeWidget
-      }) ?? []
-    //Only widgets is actually used
-    return {
-      id: `${node.id}`,
-      title: node.title,
-      type: node.type,
-      mode: 0,
-      selected: false,
-      executing: false,
-      widgets
-    }
-  }
-  return app.rootGraph.nodes
-    .filter((node) => node.mode === 0 && node.widgets?.length)
-    .map(nodeToNodeData)
+const settingStore = useSettingStore()
+const workspaceStore = useWorkspaceStore()
+const { isBuilderMode, isArrangeMode } = useAppMode()
+const appModeStore = useAppModeStore()
+const { hasOutputs } = storeToRefs(appModeStore)
+
+const mobileDisplay = useBreakpoints(breakpointsTailwind).smaller('md')
+
+const activeTab = computed(() => workspaceStore.sidebarTab.activeSidebarTab)
+const sidebarOnLeft = computed(
+  () => settingStore.get('Comfy.Sidebar.Location') === 'left'
+)
+const showLeftBuilder = computed(
+  () => !sidebarOnLeft.value && isArrangeMode.value
+)
+const showRightBuilder = computed(
+  () => sidebarOnLeft.value && isArrangeMode.value
+)
+const hasLeftPanel = computed(
+  () =>
+    isArrangeMode.value ||
+    (sidebarOnLeft.value && activeTab.value) ||
+    (!sidebarOnLeft.value && !isBuilderMode.value && hasOutputs.value)
+)
+const hasRightPanel = computed(
+  () =>
+    isArrangeMode.value ||
+    (sidebarOnLeft.value && !isBuilderMode.value && hasOutputs.value) ||
+    (!sidebarOnLeft.value && activeTab.value)
+)
+
+function sidePanelMinSize(isBuilder: boolean, isHidden: boolean) {
+  if (isBuilder) return BUILDER_MIN_SIZE
+  if (isHidden) return undefined
+  return SIDEBAR_MIN_SIZE
+}
+
+// Remount splitter when panel structure changes so initializePanels()
+// properly sets flexBasis for the current set of panels.
+const splitterKey = computed(() => {
+  const left = hasLeftPanel.value ? 'L' : ''
+  const right = hasRightPanel.value ? 'R' : ''
+  return isArrangeMode.value ? 'arrange' : `app-${left}${right}`
 })
-const { isLoggedIn } = useCurrentUser()
-const isDesktop = isElectron()
 
-const batchCountWidget = {
-  options: { step2: 1, precision: 1, min: 1, max: 100 },
-  value: 1,
-  name: t('Number of generations'),
-  type: 'number'
-}
+const leftPanelRef = useTemplateRef<MaybeElement>('leftPanel')
+const rightPanelRef = useTemplateRef<MaybeElement>('rightPanel')
 
-const { batchCount } = storeToRefs(useQueueSettingsStore())
+const { onResizeEnd } = useStablePrimeVueSplitterSizer(
+  [
+    { ref: leftPanelRef, storageKey: 'Comfy.LinearView.LeftPanelWidth' },
+    { ref: rightPanelRef, storageKey: 'Comfy.LinearView.RightPanelWidth' }
+  ],
+  [activeTab, splitterKey]
+)
 
-//TODO: refactor out of this file.
-//code length is small, but changes should propagate
-async function runButtonClick(e: Event) {
-  const isShiftPressed = 'shiftKey' in e && e.shiftKey
-  const commandId = isShiftPressed
-    ? 'Comfy.QueuePromptFront'
-    : 'Comfy.QueuePrompt'
+const TYPEFORM_WIDGET_ID = 'gmVqFi8l'
 
-  useTelemetry()?.trackUiButtonClicked({
-    button_id: 'queue_run_linear'
-  })
-  if (batchCount.value > 1) {
-    useTelemetry()?.trackUiButtonClicked({
-      button_id: 'queue_run_multiple_batches_submitted'
-    })
-  }
-  await commandStore.execute(commandId, {
-    metadata: {
-      subscribe_to_run: false,
-      trigger_source: 'button'
-    }
-  })
-}
-function openFeedback() {
-  //TODO: Does not link to a linear specific feedback section
-  window.open(
-    'https://support.comfy.org/hc/en-us/requests/new?ticket_form_id=40026345549204',
-    '_blank',
-    'noopener,noreferrer'
-  )
-}
+const bottomLeftRef = useTemplateRef('bottomLeftRef')
+const bottomRightRef = useTemplateRef('bottomRightRef')
+const linearWorkflowRef = useTemplateRef('linearWorkflowRef')
 </script>
 <template>
-  <div class="absolute w-full h-full">
-    <div class="workflow-tabs-container pointer-events-auto h-9.5 w-full">
+  <MobileDisplay v-if="mobileDisplay" />
+  <div v-else class="absolute size-full">
+    <div
+      class="workflow-tabs-container pointer-events-auto h-(--workflow-tabs-height) w-full border-b border-interface-stroke shadow-interface"
+    >
       <div class="flex h-full items-center">
         <WorkflowTabs />
         <TopbarBadges />
+        <TopbarSubscribeButton />
       </div>
     </div>
     <Splitter
-      class="h-[calc(100%-38px)] w-full bg-comfy-menu-secondary-bg"
-      :pt="{ gutter: { class: 'bg-transparent w-4 -mx-3' } }"
+      :key="splitterKey"
+      class="bg-comfy-menu-secondary-bg h-[calc(100%-var(--workflow-tabs-height))] w-full border-none"
+      @resizestart="$event.originalEvent.preventDefault()"
+      @resizeend="onResizeEnd"
     >
-      <SplitterPanel :size="1" class="min-w-min bg-comfy-menu-bg">
+      <SplitterPanel
+        v-if="hasLeftPanel"
+        ref="leftPanel"
+        :size="SIDE_PANEL_SIZE"
+        :min-size="
+          sidePanelMinSize(showLeftBuilder, showRightBuilder && !activeTab)
+        "
+        :style="
+          showRightBuilder && !activeTab ? { display: 'none' } : undefined
+        "
+        :class="
+          cn(
+            'arrange-panel overflow-hidden outline-none',
+            showLeftBuilder ? 'min-w-78 bg-comfy-menu-bg' : 'min-w-78'
+          )
+        "
+      >
+        <AppBuilder v-if="showLeftBuilder" />
         <div
-          class="sidebar-content-container h-full w-full overflow-x-hidden overflow-y-auto border-r-1 border-node-component-border"
+          v-else-if="sidebarOnLeft && activeTab"
+          class="size-full overflow-x-hidden border-r border-border-subtle"
         >
-          <ExtensionSlot :extension="useAssetsSidebarTab()" />
+          <ExtensionSlot :extension="activeTab" />
         </div>
+        <LinearControls
+          v-else-if="!isArrangeMode"
+          ref="linearWorkflowRef"
+          :toast-to="unrefElement(bottomLeftRef) ?? undefined"
+        />
       </SplitterPanel>
       <SplitterPanel
-        :size="98"
-        class="flex flex-row overflow-y-auto flex-wrap min-w-min gap-4 m-4"
+        id="linearCenterPanel"
+        :size="CENTER_PANEL_SIZE"
+        class="relative flex min-w-[20vw] flex-col gap-4 text-muted-foreground outline-none"
       >
-        <img
-          v-for="previewUrl in nodeOutputStore.latestOutput"
-          :key="previewUrl"
-          class="pointer-events-none object-contain flex-1 max-h-full"
-          :src="previewUrl"
+        <LinearProgressBar
+          class="absolute top-0 left-0 z-21 w-[calc(100%+16px)]"
         />
-        <img
-          v-if="nodeOutputStore.latestOutput.length === 0"
-          class="pointer-events-none object-contain flex-1 max-h-full brightness-50 opacity-10"
-          src="/assets/images/comfy-logo-mono.svg"
+        <LinearPreview
+          :run-button-click="linearWorkflowRef?.runButtonClick"
+          :typeform-widget-id="TYPEFORM_WIDGET_ID"
         />
-      </SplitterPanel>
-      <SplitterPanel :size="1" class="flex flex-col gap-1 p-1 min-w-min">
-        <div
-          class="actionbar-container flex h-12 items-center rounded-lg border border-[var(--interface-stroke)] p-2 gap-2 bg-comfy-menu-bg justify-end"
-        >
-          <Button variant="secondary" @click="openFeedback">
-            {{ t('g.feedback') }}
-          </Button>
-          <Button
-            variant="secondary"
-            class="min-w-max"
-            @click="useCanvasStore().linearMode = false"
-          >
-            {{ t('linearMode.openWorkflow') }}
-            <i class="icon-[comfy--workflow]" />
-          </Button>
-          <Button
-            variant="inverted"
-            @click="useWorkflowService().exportWorkflow('workflow', 'workflow')"
-          >
-            {{ t('linearMode.share') }}
-          </Button>
-          <CurrentUserButton v-if="isLoggedIn" />
-          <LoginButton v-else-if="isDesktop" />
+        <div class="absolute top-4 left-4 z-21">
+          <AppModeToolbar v-if="!isBuilderMode" />
         </div>
+        <div ref="bottomLeftRef" class="absolute bottom-7 left-4 z-20" />
+        <div ref="bottomRightRef" class="absolute right-4 bottom-7 z-20" />
+      </SplitterPanel>
+      <SplitterPanel
+        v-if="hasRightPanel"
+        ref="rightPanel"
+        :size="SIDE_PANEL_SIZE"
+        :min-size="
+          sidePanelMinSize(showRightBuilder, showLeftBuilder && !activeTab)
+        "
+        :style="showLeftBuilder && !activeTab ? { display: 'none' } : undefined"
+        :class="
+          cn(
+            'arrange-panel overflow-hidden outline-none',
+            showRightBuilder ? 'min-w-78 bg-comfy-menu-bg' : 'min-w-78'
+          )
+        "
+      >
+        <AppBuilder v-if="showRightBuilder" />
+        <LinearControls
+          v-else-if="sidebarOnLeft && !isArrangeMode"
+          ref="linearWorkflowRef"
+          :toast-to="unrefElement(bottomRightRef) ?? undefined"
+        />
         <div
-          class="rounded-lg border p-2 gap-2 h-full border-[var(--interface-stroke)] bg-comfy-menu-bg flex flex-col"
+          v-else-if="activeTab"
+          class="h-full overflow-x-hidden border-l border-border-subtle"
         >
-          <div
-            class="grow-1 flex justify-start flex-col overflow-y-auto contain-size *:max-h-100"
-          >
-            <NodeWidgets
-              v-for="nodeData of nodeDatas"
-              :key="nodeData.id"
-              :node-data
-              class="border-b-1 border-node-component-border pt-1 pb-2 last:border-none"
-            />
-          </div>
-          <div class="p-4 pb-0 border-t border-node-component-border">
-            <WidgetInputNumberInput
-              v-model="batchCount"
-              :widget="batchCountWidget"
-              class="*:[.min-w-56]:basis-0"
-            />
-            <Button class="w-full mt-4" @click="runButtonClick">
-              <i class="icon-[lucide--play]" />
-              {{ t('menu.run') }}
-            </Button>
-          </div>
+          <ExtensionSlot :extension="activeTab" />
         </div>
       </SplitterPanel>
     </Splitter>
   </div>
 </template>
+
+<style scoped>
+:deep(.p-splitter-gutter) {
+  pointer-events: auto;
+}
+
+:deep(.p-splitter-gutter:hover),
+:deep(.p-splitter-gutter[data-p-gutter-resizing='true']) {
+  transition: background-color 0.2s ease 300ms;
+  background-color: var(--p-primary-color);
+}
+
+/* Hide gutter next to hidden arrange panels */
+:deep(.arrange-panel[style*='display: none'] + .p-splitter-gutter),
+:deep(.p-splitter-gutter + .arrange-panel[style*='display: none']) {
+  display: none;
+}
+</style>
diff --git a/src/views/layouts/LayoutDefault.vue b/src/views/layouts/LayoutDefault.vue
index cbe0e34083..fbc3f39021 100644
--- a/src/views/layouts/LayoutDefault.vue
+++ b/src/views/layouts/LayoutDefault.vue
@@ -1,11 +1,15 @@
 <template>
-  <main class="relative h-full w-full overflow-hidden">
-    <router-view />
-  </main>
+  <WorkspaceAuthGate>
+    <main class="relative size-full overflow-hidden">
+      <router-view />
+    </main>
+  </WorkspaceAuthGate>
 </template>
 
 <script setup lang="ts">
 import { useFavicon } from '@vueuse/core'
 
+import WorkspaceAuthGate from '@/platform/workspace/auth/WorkspaceAuthGate.vue'
+
 useFavicon('/assets/favicon.ico')
 </script>
diff --git a/src/views/templates/BaseViewTemplate.vue b/src/views/templates/BaseViewTemplate.vue
index 786cd77ac6..b6b245cf40 100644
--- a/src/views/templates/BaseViewTemplate.vue
+++ b/src/views/templates/BaseViewTemplate.vue
@@ -22,7 +22,8 @@
 <script setup lang="ts">
 import { nextTick, onMounted, ref } from 'vue'
 
-import { electronAPI, isElectron, isNativeWindow } from '@/utils/envUtil'
+import { electronAPI, isNativeWindow } from '@/utils/envUtil'
+import { isDesktop } from '@/platform/distribution/types'
 
 const { dark = false } = defineProps<{
   dark?: boolean
@@ -40,7 +41,7 @@ const lightTheme = {
 
 const topMenuRef = ref<HTMLDivElement | null>(null)
 onMounted(async () => {
-  if (isElectron()) {
+  if (isDesktop) {
     await nextTick()
 
     electronAPI().changeTheme({
diff --git a/src/workbench/extensions/manager/components/ManagerProgressDialogContent.test.ts b/src/workbench/extensions/manager/components/ManagerProgressDialogContent.test.ts
deleted file mode 100644
index b53e0fbece..0000000000
--- a/src/workbench/extensions/manager/components/ManagerProgressDialogContent.test.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-import type { VueWrapper } from '@vue/test-utils'
-import { mount } from '@vue/test-utils'
-import { createPinia } from 'pinia'
-import Button from '@/components/ui/button/Button.vue'
-import PrimeVue from 'primevue/config'
-import Panel from 'primevue/panel'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { nextTick } from 'vue'
-import { createI18n } from 'vue-i18n'
-
-import enMessages from '@/locales/en/main.json' with { type: 'json' }
-
-import ManagerProgressDialogContent from './ManagerProgressDialogContent.vue'
-
-type ComponentInstance = InstanceType<typeof ManagerProgressDialogContent> & {
-  lastPanelRef: HTMLElement | null
-  onLogsAdded: () => void
-  handleScroll: (e: { target: HTMLElement }) => void
-  isUserScrolling: boolean
-  resetUserScrolling: () => void
-  collapsedPanels: Record<number, boolean>
-  togglePanel: (index: number) => void
-}
-
-const mockCollapse = vi.fn()
-
-const defaultMockTaskLogs = [
-  { taskName: 'Task 1', logs: ['Log 1', 'Log 2'] },
-  { taskName: 'Task 2', logs: ['Log 3', 'Log 4'] }
-]
-
-vi.mock('@/workbench/extensions/manager/stores/comfyManagerStore', () => ({
-  useComfyManagerStore: vi.fn(() => ({
-    taskLogs: [...defaultMockTaskLogs],
-    succeededTasksLogs: [...defaultMockTaskLogs],
-    failedTasksLogs: [...defaultMockTaskLogs],
-    managerQueue: { historyCount: 2 },
-    isLoading: false
-  })),
-  useManagerProgressDialogStore: vi.fn(() => ({
-    isExpanded: true,
-    activeTabIndex: 0,
-    getActiveTabIndex: vi.fn(() => 0),
-    setActiveTabIndex: vi.fn(),
-    toggle: vi.fn(),
-    collapse: mockCollapse,
-    expand: vi.fn()
-  }))
-}))
-
-describe('ManagerProgressDialogContent', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    mockCollapse.mockReset()
-  })
-
-  const mountComponent = ({
-    props = {}
-  }: Record<string, any> = {}): VueWrapper<ComponentInstance> => {
-    const i18n = createI18n({
-      legacy: false,
-      locale: 'en',
-      messages: { en: enMessages }
-    })
-
-    return mount(ManagerProgressDialogContent, {
-      props: {
-        ...props
-      },
-      global: {
-        plugins: [PrimeVue, createPinia(), i18n],
-        components: {
-          Panel,
-          Button
-        }
-      }
-    }) as VueWrapper<ComponentInstance>
-  }
-
-  it('renders the correct number of panels', async () => {
-    const wrapper = mountComponent()
-    await nextTick()
-    expect(wrapper.findAllComponents(Panel).length).toBe(2)
-  })
-
-  it('expands the last panel by default', async () => {
-    const wrapper = mountComponent()
-    await nextTick()
-    expect(wrapper.vm.collapsedPanels[1]).toBeFalsy()
-  })
-
-  it('toggles panel expansion when toggle method is called', async () => {
-    const wrapper = mountComponent()
-    await nextTick()
-
-    // Initial state - first panel should be collapsed
-    expect(wrapper.vm.collapsedPanels[0]).toBeFalsy()
-
-    wrapper.vm.togglePanel(0)
-    await nextTick()
-
-    // After toggle - first panel should be expanded
-    expect(wrapper.vm.collapsedPanels[0]).toBe(true)
-
-    wrapper.vm.togglePanel(0)
-    await nextTick()
-
-    expect(wrapper.vm.collapsedPanels[0]).toBeFalsy()
-  })
-
-  it('displays the correct status for each panel', async () => {
-    const wrapper = mountComponent()
-    await nextTick()
-
-    // Expand all panels to see status text
-    const panels = wrapper.findAllComponents(Panel)
-    for (let i = 0; i < panels.length; i++) {
-      if (!wrapper.vm.collapsedPanels[i]) {
-        wrapper.vm.togglePanel(i)
-        await nextTick()
-      }
-    }
-
-    const panelsText = wrapper
-      .findAllComponents(Panel)
-      .map((panel) => panel.text())
-
-    expect(panelsText[0]).toContain('Completed ✓')
-    expect(panelsText[1]).toContain('Completed ✓')
-  })
-
-  it('auto-scrolls to bottom when new logs are added', async () => {
-    const wrapper = mountComponent()
-    await nextTick()
-
-    const mockScrollElement = document.createElement('div')
-    Object.defineProperty(mockScrollElement, 'scrollHeight', { value: 200 })
-    Object.defineProperty(mockScrollElement, 'clientHeight', { value: 100 })
-    Object.defineProperty(mockScrollElement, 'scrollTop', {
-      value: 0,
-      writable: true
-    })
-
-    wrapper.vm.lastPanelRef = mockScrollElement
-
-    wrapper.vm.onLogsAdded()
-    await nextTick()
-
-    // Check if scrollTop is set to scrollHeight (scrolled to bottom)
-    expect(mockScrollElement.scrollTop).toBe(200)
-  })
-
-  it('does not auto-scroll when user is manually scrolling', async () => {
-    const wrapper = mountComponent()
-    await nextTick()
-
-    const mockScrollElement = document.createElement('div')
-    Object.defineProperty(mockScrollElement, 'scrollHeight', { value: 200 })
-    Object.defineProperty(mockScrollElement, 'clientHeight', { value: 100 })
-    Object.defineProperty(mockScrollElement, 'scrollTop', {
-      value: 50,
-      writable: true
-    })
-
-    wrapper.vm.lastPanelRef = mockScrollElement
-
-    wrapper.vm.handleScroll({ target: mockScrollElement })
-    await nextTick()
-
-    expect(wrapper.vm.isUserScrolling).toBe(true)
-
-    // Now trigger the log update
-    wrapper.vm.onLogsAdded()
-    await nextTick()
-
-    // Check that scrollTop is not changed (should still be 50)
-    expect(mockScrollElement.scrollTop).toBe(50)
-  })
-
-  it('calls collapse method when component is unmounted', async () => {
-    const wrapper = mountComponent()
-    await nextTick()
-    wrapper.unmount()
-    expect(mockCollapse).toHaveBeenCalled()
-  })
-})
diff --git a/src/workbench/extensions/manager/components/ManagerProgressDialogContent.vue b/src/workbench/extensions/manager/components/ManagerProgressDialogContent.vue
deleted file mode 100644
index 14280dfad7..0000000000
--- a/src/workbench/extensions/manager/components/ManagerProgressDialogContent.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <div
-    class="overflow-hidden transition-all duration-300"
-    :class="{
-      'max-h-[500px]': isExpanded,
-      'm-0 max-h-0 p-0': !isExpanded
-    }"
-  >
-    <div
-      ref="sectionsContainerRef"
-      class="scroll-container max-h-[450px] overflow-y-auto px-6 py-4"
-      :style="{
-        scrollbarWidth: 'thin',
-        scrollbarColor: 'rgba(156, 163, 175, 0.5) transparent'
-      }"
-      :class="{
-        'max-h-[450px]': isExpanded,
-        'max-h-0': !isExpanded
-      }"
-    >
-      <div v-for="(log, index) in focusedLogs" :key="index">
-        <Panel
-          :expanded="collapsedPanels[index] === true"
-          toggleable
-          class="shadow-elevation-1 mt-2 rounded-lg"
-        >
-          <template #header>
-            <div class="flex w-full items-center justify-between py-2">
-              <div class="flex flex-col text-sm leading-normal font-medium">
-                <span>{{ log.taskName }}</span>
-                <span class="text-muted">
-                  {{
-                    isInProgress(index)
-                      ? $t('g.inProgress')
-                      : $t('g.completed') + ' ✓'
-                  }}
-                </span>
-              </div>
-            </div>
-          </template>
-          <template #toggleicon>
-            <Button
-              variant="textonly"
-              class="text-neutral-300"
-              @click="togglePanel(index)"
-            >
-              <i
-                :class="
-                  collapsedPanels[index]
-                    ? 'pi pi-chevron-right'
-                    : 'pi pi-chevron-down'
-                "
-              />
-            </Button>
-          </template>
-          <div
-            :ref="
-              index === focusedLogs.length - 1
-                ? (el) => (lastPanelRef = el as HTMLElement)
-                : undefined
-            "
-            class="h-64 overflow-y-auto rounded-lg bg-black"
-            :class="{
-              'h-64': index !== focusedLogs.length - 1,
-              grow: index === focusedLogs.length - 1
-            }"
-            @scroll="handleScroll"
-          >
-            <div class="h-full">
-              <div
-                v-for="(logLine, logIndex) in log.logs"
-                :key="logIndex"
-                class="text-muted"
-              >
-                <pre class="break-words whitespace-pre-wrap">{{ logLine }}</pre>
-              </div>
-            </div>
-          </div>
-        </Panel>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { useScroll, whenever } from '@vueuse/core'
-import Panel from 'primevue/panel'
-import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
-
-import Button from '@/components/ui/button/Button.vue'
-import {
-  useComfyManagerStore,
-  useManagerProgressDialogStore
-} from '@/workbench/extensions/manager/stores/comfyManagerStore'
-
-const comfyManagerStore = useComfyManagerStore()
-const progressDialogContent = useManagerProgressDialogStore()
-
-const isInProgress = (index: number) => {
-  const log = focusedLogs.value[index]
-  if (!log) return false
-
-  // Check if this task is in the running or pending queue
-  const taskQueue = comfyManagerStore.taskQueue
-  if (!taskQueue) return false
-
-  const allQueueTasks = [
-    ...(taskQueue.running_queue || []),
-    ...(taskQueue.pending_queue || [])
-  ]
-
-  return allQueueTasks.some((task) => task.ui_id === log.taskId)
-}
-
-const focusedLogs = computed(() => {
-  if (progressDialogContent.getActiveTabIndex() === 0) {
-    return comfyManagerStore.succeededTasksLogs
-  }
-  return comfyManagerStore.failedTasksLogs
-})
-const isExpanded = computed(() => progressDialogContent.isExpanded)
-const isCollapsed = computed(() => !isExpanded.value)
-
-const collapsedPanels = ref<Record<number, boolean>>({})
-const togglePanel = (index: number) => {
-  collapsedPanels.value[index] = !collapsedPanels.value[index]
-}
-
-const sectionsContainerRef = ref<HTMLElement | null>(null)
-const { y: scrollY } = useScroll(sectionsContainerRef, {
-  eventListenerOptions: {
-    passive: true
-  }
-})
-
-const lastPanelRef = ref<HTMLElement | null>(null)
-const isUserScrolling = ref(false)
-const lastPanelLogs = computed(() => focusedLogs.value?.at(-1)?.logs)
-
-const isAtBottom = (el: HTMLElement | null) => {
-  if (!el) return false
-  const threshold = 20
-  return Math.abs(el.scrollHeight - el.scrollTop - el.clientHeight) < threshold
-}
-
-const scrollLastPanelToBottom = () => {
-  if (!lastPanelRef.value || isUserScrolling.value) return
-  lastPanelRef.value.scrollTop = lastPanelRef.value.scrollHeight
-}
-const scrollContentToBottom = () => {
-  scrollY.value = sectionsContainerRef.value?.scrollHeight ?? 0
-}
-
-const resetUserScrolling = () => {
-  isUserScrolling.value = false
-}
-const handleScroll = (e: Event) => {
-  const target = e.target as HTMLElement
-  if (target !== lastPanelRef.value) return
-
-  isUserScrolling.value = !isAtBottom(target)
-}
-
-const onLogsAdded = () => {
-  // If user is scrolling manually, don't automatically scroll to bottom
-  if (isUserScrolling.value) return
-
-  scrollLastPanelToBottom()
-}
-
-whenever(lastPanelLogs, onLogsAdded, { flush: 'post', deep: true })
-whenever(() => isExpanded.value, scrollContentToBottom)
-whenever(isCollapsed, resetUserScrolling)
-
-onMounted(() => {
-  scrollContentToBottom()
-})
-
-onBeforeUnmount(() => {
-  progressDialogContent.collapse()
-})
-</script>
diff --git a/src/workbench/extensions/manager/components/ManagerProgressFooter.vue b/src/workbench/extensions/manager/components/ManagerProgressFooter.vue
deleted file mode 100644
index f8fe0052d6..0000000000
--- a/src/workbench/extensions/manager/components/ManagerProgressFooter.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-<template>
-  <div
-    class="flex w-full items-center justify-between px-6 py-2 shadow-lg"
-    :class="{
-      'rounded-t-none': progressDialogContent.isExpanded,
-      'rounded-lg': !progressDialogContent.isExpanded
-    }"
-  >
-    <div class="flex items-center text-base leading-none">
-      <div class="flex items-center">
-        <template v-if="isInProgress">
-          <DotSpinner duration="1s" class="mr-2" />
-          <span>{{ currentTaskName }}</span>
-        </template>
-        <template v-else-if="isRestartCompleted">
-          <span class="mr-2">🎉</span>
-          <span>{{ currentTaskName }}</span>
-        </template>
-        <template v-else>
-          <span class="mr-2">✅</span>
-          <span>{{ $t('manager.restartToApplyChanges') }}</span>
-        </template>
-      </div>
-    </div>
-    <div class="flex items-center gap-4">
-      <span v-if="isInProgress" class="text-sm text-neutral-700">
-        {{ completedTasksCount }} {{ $t('g.progressCountOf') }}
-        {{ totalTasksCount }}
-      </span>
-      <div class="flex items-center">
-        <Button
-          v-if="!isInProgress && !isRestartCompleted"
-          variant="secondary"
-          class="mr-4 rounded-full border-2 border-base-foreground px-3 text-base-foreground hover:bg-secondary-background-hover"
-          @click="handleRestart"
-        >
-          {{ $t('manager.applyChanges') }}
-        </Button>
-        <Button
-          v-else-if="!isRestartCompleted"
-          variant="muted-textonly"
-          size="sm"
-          class="rounded-full font-bold"
-          :aria-label="
-            $t(
-              progressDialogContent.isExpanded
-                ? 'contextMenu.Collapse'
-                : 'contextMenu.Expand'
-            )
-          "
-          @click.stop="progressDialogContent.toggle"
-        >
-          <i
-            :class="
-              progressDialogContent.isExpanded
-                ? 'pi pi-chevron-up'
-                : 'pi pi-chevron-down'
-            "
-          />
-        </Button>
-        <Button
-          variant="muted-textonly"
-          size="sm"
-          class="rounded-full font-bold"
-          :aria-label="$t('g.close')"
-          @click.stop="closeDialog"
-        >
-          <i class="pi pi-times" />
-        </Button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { useEventListener } from '@vueuse/core'
-import { computed, ref } from 'vue'
-import { useI18n } from 'vue-i18n'
-
-import DotSpinner from '@/components/common/DotSpinner.vue'
-import Button from '@/components/ui/button/Button.vue'
-import { useSettingStore } from '@/platform/settings/settingStore'
-import { useWorkflowService } from '@/platform/workflow/core/services/workflowService'
-import { api } from '@/scripts/api'
-import { useCommandStore } from '@/stores/commandStore'
-import { useDialogStore } from '@/stores/dialogStore'
-import { useConflictDetection } from '@/workbench/extensions/manager/composables/useConflictDetection'
-import { useComfyManagerService } from '@/workbench/extensions/manager/services/comfyManagerService'
-import {
-  useComfyManagerStore,
-  useManagerProgressDialogStore
-} from '@/workbench/extensions/manager/stores/comfyManagerStore'
-
-const { t } = useI18n()
-const dialogStore = useDialogStore()
-const progressDialogContent = useManagerProgressDialogStore()
-const comfyManagerStore = useComfyManagerStore()
-const settingStore = useSettingStore()
-const { runFullConflictAnalysis } = useConflictDetection()
-
-// State management for restart process
-const isRestarting = ref<boolean>(false)
-const isRestartCompleted = ref<boolean>(false)
-
-const isInProgress = computed(
-  () => comfyManagerStore.isProcessingTasks || isRestarting.value
-)
-
-const completedTasksCount = computed(() => {
-  return (
-    comfyManagerStore.succeededTasksIds.length +
-    comfyManagerStore.failedTasksIds.length
-  )
-})
-
-const totalTasksCount = computed(() => {
-  const completedTasks = Object.keys(comfyManagerStore.taskHistory).length
-  const taskQueue = comfyManagerStore.taskQueue
-  const queuedTasks = taskQueue
-    ? (taskQueue.running_queue?.length || 0) +
-      (taskQueue.pending_queue?.length || 0)
-    : 0
-  return completedTasks + queuedTasks
-})
-
-const closeDialog = () => {
-  dialogStore.closeDialog({ key: 'global-manager-progress-dialog' })
-}
-
-const fallbackTaskName = t('manager.installingDependencies')
-const currentTaskName = computed(() => {
-  if (isRestarting.value) {
-    return t('manager.restartingBackend')
-  }
-  if (isRestartCompleted.value) {
-    return t('manager.extensionsSuccessfullyInstalled')
-  }
-  if (!comfyManagerStore.taskLogs.length) return fallbackTaskName
-  const task = comfyManagerStore.taskLogs.at(-1)
-  return task?.taskName ?? fallbackTaskName
-})
-
-const handleRestart = async () => {
-  // Store original toast setting value
-  const originalToastSetting = settingStore.get(
-    'Comfy.Toast.DisableReconnectingToast'
-  )
-
-  try {
-    await settingStore.set('Comfy.Toast.DisableReconnectingToast', true)
-
-    isRestarting.value = true
-
-    const onReconnect = async () => {
-      try {
-        comfyManagerStore.setStale()
-
-        await useCommandStore().execute('Comfy.RefreshNodeDefinitions')
-
-        await useWorkflowService().reloadCurrentWorkflow()
-
-        // Run conflict detection in background after restart completion
-        void runFullConflictAnalysis()
-      } finally {
-        await settingStore.set(
-          'Comfy.Toast.DisableReconnectingToast',
-          originalToastSetting
-        )
-
-        isRestarting.value = false
-        isRestartCompleted.value = true
-
-        setTimeout(() => {
-          closeDialog()
-          comfyManagerStore.resetTaskState()
-        }, 3000)
-      }
-    }
-
-    useEventListener(api, 'reconnected', onReconnect, { once: true })
-
-    await useComfyManagerService().rebootComfyUI()
-  } catch (error) {
-    // If restart fails, restore settings and reset state
-    await settingStore.set(
-      'Comfy.Toast.DisableReconnectingToast',
-      originalToastSetting
-    )
-    isRestarting.value = false
-    isRestartCompleted.value = false
-    closeDialog() // Close dialog on error
-    throw error
-  }
-}
-</script>
diff --git a/src/workbench/extensions/manager/components/ManagerProgressHeader.vue b/src/workbench/extensions/manager/components/ManagerProgressHeader.vue
deleted file mode 100644
index 686d43436e..0000000000
--- a/src/workbench/extensions/manager/components/ManagerProgressHeader.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div
-    v-if="progressDialogContent.isExpanded"
-    class="flex items-center px-4 py-2"
-  >
-    <TabMenu
-      v-model:active-index="activeTabIndex"
-      :model="tabs"
-      class="w-full border-none"
-      :pt="{
-        menu: { class: 'border-none' },
-        menuitem: { class: 'font-medium' },
-        action: { class: 'px-4 py-2' }
-      }"
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-import TabMenu from 'primevue/tabmenu'
-import { computed } from 'vue'
-import { useI18n } from 'vue-i18n'
-
-import {
-  useComfyManagerStore,
-  useManagerProgressDialogStore
-} from '@/workbench/extensions/manager/stores/comfyManagerStore'
-
-const progressDialogContent = useManagerProgressDialogStore()
-const comfyManagerStore = useComfyManagerStore()
-const activeTabIndex = computed({
-  get: () => progressDialogContent.getActiveTabIndex(),
-  set: (value) => progressDialogContent.setActiveTabIndex(value)
-})
-const { t } = useI18n()
-const tabs = computed(() => [
-  { label: t('manager.installationQueue') },
-  {
-    label: t('manager.failed', {
-      count: comfyManagerStore.failedTasksIds.length
-    })
-  }
-])
-</script>
diff --git a/src/workbench/extensions/manager/components/ManagerProgressToast.vue b/src/workbench/extensions/manager/components/ManagerProgressToast.vue
new file mode 100644
index 0000000000..f205920f4c
--- /dev/null
+++ b/src/workbench/extensions/manager/components/ManagerProgressToast.vue
@@ -0,0 +1,307 @@
+<script setup lang="ts">
+import { useScroll, whenever } from '@vueuse/core'
+import Panel from 'primevue/panel'
+import TabMenu from 'primevue/tabmenu'
+import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import DotSpinner from '@/components/common/DotSpinner.vue'
+import HoneyToast from '@/components/honeyToast/HoneyToast.vue'
+import Button from '@/components/ui/button/Button.vue'
+import { useApplyChanges } from '@/workbench/extensions/manager/composables/useApplyChanges'
+import { useComfyManagerStore } from '@/workbench/extensions/manager/stores/comfyManagerStore'
+
+const { t } = useI18n()
+const comfyManagerStore = useComfyManagerStore()
+const { isRestarting, isRestartCompleted, applyChanges } = useApplyChanges()
+
+const isExpanded = ref(false)
+const activeTabIndex = ref(0)
+
+const tabs = computed(() => [
+  { label: t('manager.installationQueue') },
+  {
+    label: t('manager.failed', {
+      count: comfyManagerStore.failedTasksIds.length
+    })
+  }
+])
+
+const focusedLogs = computed(() => {
+  if (activeTabIndex.value === 0) {
+    return comfyManagerStore.succeededTasksLogs
+  }
+  return comfyManagerStore.failedTasksLogs
+})
+
+const visible = computed(() => comfyManagerStore.taskLogs.length > 0)
+
+const isInProgress = computed(
+  () => comfyManagerStore.isProcessingTasks || isRestarting.value
+)
+
+const isTaskInProgress = (index: number) => {
+  const log = focusedLogs.value[index]
+  if (!log) return false
+
+  const taskQueue = comfyManagerStore.taskQueue
+  if (!taskQueue) return false
+
+  const allQueueTasks = [
+    ...(taskQueue.running_queue || []),
+    ...(taskQueue.pending_queue || [])
+  ]
+
+  return allQueueTasks.some((task) => task.ui_id === log.taskId)
+}
+
+const completedTasksCount = computed(() => {
+  return (
+    comfyManagerStore.succeededTasksIds.length +
+    comfyManagerStore.failedTasksIds.length
+  )
+})
+
+const totalTasksCount = computed(() => {
+  const completedTasks = Object.keys(comfyManagerStore.taskHistory).length
+  const taskQueue = comfyManagerStore.taskQueue
+  const queuedTasks = taskQueue
+    ? (taskQueue.running_queue?.length || 0) +
+      (taskQueue.pending_queue?.length || 0)
+    : 0
+  return completedTasks + queuedTasks
+})
+
+const currentTaskName = computed(() => {
+  if (isRestarting.value) {
+    return t('manager.restartingBackend')
+  }
+  if (isRestartCompleted.value) {
+    return t('manager.extensionsSuccessfullyInstalled')
+  }
+  if (!comfyManagerStore.taskLogs.length)
+    return t('manager.installingDependencies')
+  const task = comfyManagerStore.taskLogs.at(-1)
+  return task?.taskName ?? t('manager.installingDependencies')
+})
+
+const collapsedPanels = ref<Record<number, boolean>>({})
+function togglePanel(index: number) {
+  collapsedPanels.value[index] = !collapsedPanels.value[index]
+}
+
+const sectionsContainerRef = ref<HTMLElement | null>(null)
+const { y: scrollY } = useScroll(sectionsContainerRef, {
+  eventListenerOptions: { passive: true }
+})
+
+const lastPanelRef = ref<HTMLElement | null>(null)
+const isUserScrolling = ref(false)
+const lastPanelLogs = computed(() => focusedLogs.value?.at(-1)?.logs)
+
+function isAtBottom(el: HTMLElement | null) {
+  if (!el) return false
+  const threshold = 20
+  return Math.abs(el.scrollHeight - el.scrollTop - el.clientHeight) < threshold
+}
+
+function scrollLastPanelToBottom() {
+  if (!lastPanelRef.value || isUserScrolling.value) return
+  lastPanelRef.value.scrollTop = lastPanelRef.value.scrollHeight
+}
+
+function scrollContentToBottom() {
+  scrollY.value = sectionsContainerRef.value?.scrollHeight ?? 0
+}
+
+function resetUserScrolling() {
+  isUserScrolling.value = false
+}
+
+function handleScroll(e: Event) {
+  const target = e.target as HTMLElement
+  if (target !== lastPanelRef.value) return
+  isUserScrolling.value = !isAtBottom(target)
+}
+
+function onLogsAdded() {
+  if (isUserScrolling.value) return
+  scrollLastPanelToBottom()
+}
+
+whenever(lastPanelLogs, onLogsAdded, { flush: 'post', deep: true })
+whenever(() => isExpanded.value, scrollContentToBottom)
+whenever(() => !isExpanded.value, resetUserScrolling)
+
+function closeToast() {
+  comfyManagerStore.resetTaskState()
+  isExpanded.value = false
+}
+
+async function handleRestart() {
+  try {
+    await applyChanges(closeToast)
+  } catch (err) {
+    console.error('[ManagerProgressToast] Restart failed:', err)
+  }
+}
+
+onMounted(() => {
+  scrollContentToBottom()
+})
+
+onBeforeUnmount(() => {
+  isExpanded.value = false
+})
+</script>
+
+<template>
+  <HoneyToast v-model:expanded="isExpanded" :visible>
+    <template #default>
+      <div v-if="isExpanded" class="flex items-center px-4 py-2">
+        <TabMenu
+          v-model:active-index="activeTabIndex"
+          :model="tabs"
+          class="w-full border-none"
+          :pt="{
+            menu: { class: 'border-none' },
+            menuitem: { class: 'font-medium' },
+            action: { class: 'px-4 py-2' }
+          }"
+        />
+      </div>
+
+      <div
+        ref="sectionsContainerRef"
+        class="scroll-container max-h-[450px] overflow-y-auto px-6 py-4"
+        :style="{
+          scrollbarWidth: 'thin',
+          scrollbarColor: 'rgba(156, 163, 175, 0.5) transparent'
+        }"
+      >
+        <div v-for="(log, index) in focusedLogs" :key="index">
+          <Panel
+            :expanded="collapsedPanels[index] === true"
+            toggleable
+            class="shadow-elevation-1 mt-2 rounded-lg"
+          >
+            <template #header>
+              <div class="flex w-full items-center justify-between py-2">
+                <div class="flex flex-col text-sm/normal font-medium">
+                  <span>{{ log.taskName }}</span>
+                  <span class="text-muted">
+                    {{
+                      isTaskInProgress(index)
+                        ? t('g.inProgress')
+                        : t('g.completedWithCheckmark')
+                    }}
+                  </span>
+                </div>
+              </div>
+            </template>
+            <template #toggleicon>
+              <Button
+                variant="textonly"
+                class="text-neutral-300"
+                @click="togglePanel(index)"
+              >
+                <i
+                  :class="
+                    collapsedPanels[index]
+                      ? 'pi pi-chevron-right'
+                      : 'pi pi-chevron-down'
+                  "
+                />
+              </Button>
+            </template>
+            <div
+              :ref="
+                index === focusedLogs.length - 1
+                  ? (el) => (lastPanelRef = el as HTMLElement)
+                  : undefined
+              "
+              class="h-64 overflow-y-auto rounded-lg bg-black"
+              :class="{
+                'h-64': index !== focusedLogs.length - 1,
+                grow: index === focusedLogs.length - 1
+              }"
+              @scroll="handleScroll"
+            >
+              <div class="h-full">
+                <div
+                  v-for="(logLine, logIndex) in log.logs"
+                  :key="logIndex"
+                  class="text-muted"
+                >
+                  <pre class="wrap-break-word whitespace-pre-wrap">{{
+                    logLine
+                  }}</pre>
+                </div>
+              </div>
+            </div>
+          </Panel>
+        </div>
+      </div>
+    </template>
+
+    <template #footer="{ toggle }">
+      <div class="flex w-full items-center justify-between px-6 py-2 shadow-lg">
+        <div class="flex items-center text-base leading-none">
+          <div class="flex items-center">
+            <template v-if="isInProgress">
+              <DotSpinner duration="1s" class="mr-2" />
+              <span>{{ currentTaskName }}</span>
+            </template>
+            <template v-else-if="isRestartCompleted">
+              <span class="mr-2">🎉</span>
+              <span>{{ currentTaskName }}</span>
+            </template>
+            <template v-else>
+              <span class="mr-2">✅</span>
+              <span>{{ t('manager.restartToApplyChanges') }}</span>
+            </template>
+          </div>
+        </div>
+        <div class="flex items-center gap-4">
+          <span v-if="isInProgress" class="text-sm text-muted-foreground">
+            {{ completedTasksCount }} {{ t('g.progressCountOf') }}
+            {{ totalTasksCount }}
+          </span>
+          <div class="flex items-center">
+            <Button
+              v-if="!isInProgress && !isRestartCompleted"
+              variant="secondary"
+              class="mr-4 rounded-full border-2 border-base-foreground px-3 text-base-foreground hover:bg-secondary-background-hover"
+              @click="handleRestart"
+            >
+              {{ t('manager.applyChanges') }}
+            </Button>
+            <Button
+              v-else-if="!isRestartCompleted"
+              variant="muted-textonly"
+              size="sm"
+              class="rounded-full font-bold"
+              :aria-label="
+                t(isExpanded ? 'contextMenu.Collapse' : 'contextMenu.Expand')
+              "
+              @click.stop="toggle"
+            >
+              <i
+                :class="isExpanded ? 'pi pi-chevron-up' : 'pi pi-chevron-down'"
+              />
+            </Button>
+            <Button
+              variant="muted-textonly"
+              size="sm"
+              class="rounded-full font-bold"
+              :aria-label="t('g.close')"
+              @click.stop="closeToast"
+            >
+              <i class="pi pi-times" />
+            </Button>
+          </div>
+        </div>
+      </div>
+    </template>
+  </HoneyToast>
+</template>
diff --git a/src/workbench/extensions/manager/components/manager/ImportFailedNodeContent.vue b/src/workbench/extensions/manager/components/manager/ImportFailedNodeContent.vue
new file mode 100644
index 0000000000..064df4932e
--- /dev/null
+++ b/src/workbench/extensions/manager/components/manager/ImportFailedNodeContent.vue
@@ -0,0 +1,70 @@
+<template>
+  <div class="flex w-[490px] flex-col border-t border-border-default">
+    <div class="flex size-full flex-col gap-4 p-4">
+      <!-- Error Details -->
+      <div v-if="importFailedPackages.length > 0" class="flex flex-col gap-3">
+        <div
+          v-for="pkg in importFailedPackages"
+          :key="pkg.packageId"
+          class="flex scrollbar-custom max-h-60 flex-col gap-2 overflow-x-hidden overflow-y-auto"
+          role="region"
+          :aria-label="`Error traceback for ${pkg.packageId}`"
+          tabindex="0"
+        >
+          <!-- Error Message -->
+          <div
+            v-if="pkg.traceback || pkg.errorMessage"
+            class="rounded-md bg-secondary-background p-4 font-mono text-xs"
+          >
+            {{ pkg.traceback || pkg.errorMessage }}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+
+import type { ConflictDetectionResult } from '@/workbench/extensions/manager/types/conflictDetectionTypes'
+
+const { conflictedPackages } = defineProps<{
+  conflictedPackages: ConflictDetectionResult[]
+}>()
+
+interface ImportFailedPackage {
+  packageId: string
+  packageName: string
+  errorMessage: string
+  traceback: string
+}
+
+const importFailedPackages = computed((): ImportFailedPackage[] => {
+  return conflictedPackages
+    .filter((pkg) =>
+      pkg.conflicts.some((conflict) => conflict.type === 'import_failed')
+    )
+    .map((pkg) => {
+      const importFailedConflict = pkg.conflicts.find(
+        (conflict) => conflict.type === 'import_failed'
+      )
+      if (!importFailedConflict) {
+        return {
+          packageId: pkg.package_id,
+          packageName: pkg.package_name,
+          errorMessage: 'Unknown import error',
+          traceback: ''
+        }
+      }
+
+      return {
+        packageId: pkg.package_id,
+        packageName: pkg.package_name,
+        errorMessage:
+          importFailedConflict.current_value || 'Unknown import error',
+        traceback: importFailedConflict.required_value || ''
+      }
+    })
+})
+</script>
diff --git a/src/workbench/extensions/manager/components/manager/ImportFailedNodeFooter.vue b/src/workbench/extensions/manager/components/manager/ImportFailedNodeFooter.vue
new file mode 100644
index 0000000000..84b4dd6e40
--- /dev/null
+++ b/src/workbench/extensions/manager/components/manager/ImportFailedNodeFooter.vue
@@ -0,0 +1,43 @@
+<template>
+  <div class="flex w-full items-center justify-between px-3 pb-4">
+    <div class="flex w-full items-start justify-end gap-2 pr-1">
+      <Button variant="secondary" @click="handleCopyError">
+        {{ $t('importFailed.copyError') }}
+      </Button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+
+import Button from '@/components/ui/button/Button.vue'
+import { useCopyToClipboard } from '@/composables/useCopyToClipboard'
+import type { ConflictDetectionResult } from '@/workbench/extensions/manager/types/conflictDetectionTypes'
+
+const { conflictedPackages = [] } = defineProps<{
+  conflictedPackages?: ConflictDetectionResult[]
+}>()
+
+const { copyToClipboard } = useCopyToClipboard()
+
+const formatErrorText = computed(() => {
+  const errorParts: string[] = []
+
+  conflictedPackages.forEach((pkg) => {
+    const importFailedConflict = pkg.conflicts.find(
+      (conflict) => conflict.type === 'import_failed'
+    )
+
+    if (importFailedConflict?.required_value) {
+      errorParts.push(importFailedConflict.required_value)
+    }
+  })
+
+  return errorParts.join('\n\n')
+})
+
+const handleCopyError = () => {
+  copyToClipboard(formatErrorText.value)
+}
+</script>
diff --git a/src/workbench/extensions/manager/components/manager/ImportFailedNodeHeader.vue b/src/workbench/extensions/manager/components/manager/ImportFailedNodeHeader.vue
new file mode 100644
index 0000000000..b21b315a37
--- /dev/null
+++ b/src/workbench/extensions/manager/components/manager/ImportFailedNodeHeader.vue
@@ -0,0 +1,12 @@
+<template>
+  <div class="flex w-full items-center justify-between p-4">
+    <div class="flex items-center gap-2">
+      <i class="icon-[lucide--triangle-alert] text-warning-background" />
+      <p class="m-0 text-sm">
+        {{ $t('importFailed.title') }}
+      </p>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts"></script>
diff --git a/src/workbench/extensions/manager/components/manager/ManagerDialog.vue b/src/workbench/extensions/manager/components/manager/ManagerDialog.vue
new file mode 100644
index 0000000000..8bdf696a0b
--- /dev/null
+++ b/src/workbench/extensions/manager/components/manager/ManagerDialog.vue
@@ -0,0 +1,602 @@
+<template>
+  <BaseModalLayout
+    v-model:right-panel-open="isRightPanelOpen"
+    :content-title="$t('manager.discoverCommunityContent')"
+    :right-panel-title="$t('manager.nodePackInfo')"
+    class="manager-dialog"
+  >
+    <template #leftPanelHeaderTitle>
+      <i class="icon-[comfy--extensions-blocks]" />
+      <h2 class="text-neutral text-base">{{ $t('manager.title') }}</h2>
+    </template>
+    <template #leftPanel>
+      <LeftSidePanel v-model="selectedNavId" :nav-items="navItems" />
+    </template>
+
+    <template #header>
+      <div class="flex w-full items-center justify-between gap-2">
+        <div class="flex items-center gap-2">
+          <SingleSelect
+            v-model="searchMode"
+            class="min-w-34"
+            :options="filterOptions"
+          />
+          <AutoCompletePlus
+            v-model.lazy="searchQuery"
+            :suggestions="suggestions"
+            :placeholder="$t('manager.searchPlaceholder')"
+            :complete-on-focus="false"
+            :delay="8"
+            option-label="query"
+            class="w-full max-w-lg min-w-md"
+            :pt="{
+              root: { class: 'relative' },
+              pcInputText: {
+                root: {
+                  autofocus: true,
+                  class:
+                    'w-full h-10 rounded-lg bg-comfy-input text-comfy-input-foreground border-none outline-none text-sm'
+                }
+              },
+              overlay: {
+                class:
+                  'bg-comfy-input rounded-lg mt-1 shadow-lg border border-border-default'
+              },
+              list: { class: 'p-1' },
+              option: {
+                class:
+                  'px-3 py-2 rounded hover:bg-button-hover-surface cursor-pointer text-sm'
+              },
+              loader: { style: 'display: none' }
+            }"
+            :show-empty-message="false"
+            @complete="stubTrue"
+            @option-select="onOptionSelect"
+          >
+            <template #dropdownicon>
+              <i
+                class="pi pi-search absolute top-1/2 left-3 -translate-y-1/2 text-muted-foreground"
+              />
+            </template>
+          </AutoCompletePlus>
+        </div>
+        <PackInstallButton
+          v-if="isMissingTab && missingNodePacks.length > 0"
+          :disabled="isMissingLoading || !!missingError"
+          :node-packs="missingNodePacks"
+          size="lg"
+          :label="$t('manager.installAllMissingNodes')"
+        />
+        <PackUpdateButton
+          v-if="isUpdateAvailableTab && hasUpdateAvailable"
+          :node-packs="enabledUpdateAvailableNodePacks"
+          :has-disabled-update-packs="hasDisabledUpdatePacks"
+          size="lg"
+        />
+      </div>
+    </template>
+
+    <template #contentFilter>
+      <!-- Conflict Warning Banner -->
+      <div
+        v-if="shouldShowManagerBanner"
+        class="relative mx-6 mt-3 mb-4 flex items-center gap-6 rounded-lg bg-yellow-500/20 p-4"
+      >
+        <i
+          class="icon-[lucide--triangle-alert] text-lg text-warning-background"
+        />
+        <div class="flex flex-1 flex-col gap-2">
+          <p class="m-0 text-sm font-bold">
+            {{ $t('manager.conflicts.warningBanner.title') }}
+          </p>
+          <p class="m-0 text-xs">
+            {{ $t('manager.conflicts.warningBanner.message') }}
+          </p>
+          <p
+            class="m-0 cursor-pointer text-sm font-bold"
+            @click="onClickWarningLink"
+          >
+            {{ $t('manager.conflicts.warningBanner.button') }}
+          </p>
+        </div>
+        <Button
+          class="absolute top-0 right-0"
+          variant="textonly"
+          size="icon"
+          @click="dismissWarningBanner"
+        >
+          <i class="pi pi-times text-xs text-base-foreground"></i>
+        </Button>
+      </div>
+
+      <!-- Sort Options -->
+      <div class="flex justify-end px-6 pb-4">
+        <SingleSelect
+          v-model="sortField"
+          :label="$t('g.sort')"
+          :options="availableSortOptions"
+          class="w-48"
+        >
+          <template #icon>
+            <i class="icon-[lucide--arrow-up-down] text-muted-foreground" />
+          </template>
+        </SingleSelect>
+      </div>
+    </template>
+
+    <template #content>
+      <div v-if="isLoading" class="size-full scrollbar-hide overflow-auto">
+        <GridSkeleton :grid-style="GRID_STYLE" :skeleton-card-count />
+      </div>
+      <NoResultsPlaceholder
+        v-else-if="displayPacks.length === 0"
+        :title="emptyStateTitle"
+        :message="emptyStateMessage"
+      />
+      <div v-else class="size-full" @click="handleGridContainerClick">
+        <VirtualGrid
+          id="results-grid"
+          :items="resultsWithKeys"
+          :buffer-rows="4"
+          :grid-style="GRID_STYLE"
+          @approach-end="onApproachEnd"
+        >
+          <template #item="{ item }">
+            <PackCard
+              :node-pack="item"
+              :is-selected="
+                selectedNodePacks.some((pack) => pack.id === item.id)
+              "
+              @click.stop="(event: MouseEvent) => selectNodePack(item, event)"
+            />
+          </template>
+        </VirtualGrid>
+      </div>
+    </template>
+
+    <template #rightPanel>
+      <InfoPanel
+        v-if="!hasMultipleSelections && selectedNodePack"
+        :node-pack="selectedNodePack"
+      />
+      <InfoPanelMultiItem v-else :node-packs="selectedNodePacks" />
+    </template>
+  </BaseModalLayout>
+</template>
+
+<script setup lang="ts">
+import { until, whenever } from '@vueuse/core'
+import { merge, stubTrue } from 'es-toolkit/compat'
+import type { AutoCompleteOptionSelectEvent } from 'primevue/autocomplete'
+import {
+  computed,
+  onBeforeUnmount,
+  onMounted,
+  onUnmounted,
+  provide,
+  ref,
+  watch,
+  watchEffect
+} from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
+import VirtualGrid from '@/components/common/VirtualGrid.vue'
+import SingleSelect from '@/components/input/SingleSelect.vue'
+import AutoCompletePlus from '@/components/primevueOverride/AutoCompletePlus.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 { useExternalLink } from '@/composables/useExternalLink'
+import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
+import { useComfyRegistryStore } from '@/stores/comfyRegistryStore'
+import type { components } from '@/types/comfyRegistryTypes'
+import type { NavGroupData, NavItemData } from '@/types/navTypes'
+import { OnCloseKey } from '@/types/widgetTypes'
+import PackInstallButton from '@/workbench/extensions/manager/components/manager/button/PackInstallButton.vue'
+import PackUpdateButton from '@/workbench/extensions/manager/components/manager/button/PackUpdateButton.vue'
+import InfoPanel from '@/workbench/extensions/manager/components/manager/infoPanel/InfoPanel.vue'
+import InfoPanelMultiItem from '@/workbench/extensions/manager/components/manager/infoPanel/InfoPanelMultiItem.vue'
+import PackCard from '@/workbench/extensions/manager/components/manager/packCard/PackCard.vue'
+import GridSkeleton from '@/workbench/extensions/manager/components/manager/skeleton/GridSkeleton.vue'
+import { useMissingNodes } from '@/workbench/extensions/manager/composables/nodePack/useMissingNodes'
+import { useUpdateAvailableNodes } from '@/workbench/extensions/manager/composables/nodePack/useUpdateAvailableNodes'
+import { useConflictAcknowledgment } from '@/workbench/extensions/manager/composables/useConflictAcknowledgment'
+import { useManagerDisplayPacks } from '@/workbench/extensions/manager/composables/useManagerDisplayPacks'
+import { useManagerStatePersistence } from '@/workbench/extensions/manager/composables/useManagerStatePersistence'
+import { useRegistrySearch } from '@/workbench/extensions/manager/composables/useRegistrySearch'
+import { useConflictDetectionStore } from '@/workbench/extensions/manager/stores/conflictDetectionStore'
+import { useLegacySearchTip } from '@/workbench/extensions/manager/composables/useLegacySearchTip'
+import { useManagerState } from '@/workbench/extensions/manager/composables/useManagerState'
+import { useComfyManagerStore } from '@/workbench/extensions/manager/stores/comfyManagerStore'
+import { ManagerTab } from '@/workbench/extensions/manager/types/comfyManagerTypes'
+
+const { initialTab, initialPackId, onClose } = defineProps<{
+  initialTab?: ManagerTab
+  initialPackId?: string
+  onClose: () => void
+}>()
+
+provide(OnCloseKey, onClose)
+
+const { t } = useI18n()
+const { buildDocsUrl } = useExternalLink()
+const comfyManagerStore = useComfyManagerStore()
+const { getPackById } = useComfyRegistryStore()
+const conflictAcknowledgment = useConflictAcknowledgment()
+const conflictDetectionStore = useConflictDetectionStore()
+const { isNewManagerUI } = useManagerState()
+const workflowStore = useWorkflowStore()
+const persistedState = useManagerStatePersistence()
+const initialState = persistedState.loadStoredState()
+
+const GRID_STYLE = {
+  display: 'grid',
+  gridTemplateColumns: 'repeat(auto-fill, minmax(14rem, 1fr))',
+  gap: '1rem',
+  padding: '0.5rem'
+} as const
+
+const {
+  shouldShowManagerBanner,
+  dismissWarningBanner,
+  dismissRedDotNotification
+} = conflictAcknowledgment
+
+// Missing nodes composable
+const {
+  missingNodePacks,
+  isLoading: isMissingLoading,
+  error: missingError
+} = useMissingNodes()
+
+// Update available nodes composable
+const {
+  hasUpdateAvailable,
+  enabledUpdateAvailableNodePacks,
+  hasDisabledUpdatePacks
+} = useUpdateAvailableNodes()
+
+// Get the current workflow name for the nav item
+const workflowName = computed(
+  () => workflowStore.activeWorkflow?.filename ?? t('manager.inWorkflow')
+)
+
+// Navigation items for LeftSidePanel
+const navItems = computed<(NavItemData | NavGroupData)[]>(() => [
+  {
+    id: ManagerTab.All,
+    label: t('manager.nav.allExtensions'),
+    icon: 'icon-[lucide--list]'
+  },
+  {
+    id: ManagerTab.NotInstalled,
+    label: t('manager.nav.notInstalled'),
+    icon: 'icon-[lucide--globe]'
+  },
+  {
+    title: t('manager.nav.installedSection'),
+    items: [
+      {
+        id: ManagerTab.AllInstalled,
+        label: t('manager.nav.allInstalled'),
+        icon: 'icon-[lucide--download]'
+      },
+      {
+        id: ManagerTab.UpdateAvailable,
+        label: t('manager.nav.updatesAvailable'),
+        icon: 'icon-[lucide--refresh-cw]'
+      },
+      {
+        id: ManagerTab.Conflicting,
+        label: t('manager.nav.conflicting'),
+        icon: 'icon-[lucide--triangle-alert]',
+        badge: conflictDetectionStore.conflictedPackages.length || undefined
+      }
+    ]
+  },
+  {
+    title: t('manager.nav.inWorkflowSection'),
+    items: [
+      {
+        id: ManagerTab.Workflow,
+        label: t('manager.nav.allInWorkflow', {
+          workflowName: workflowName.value
+        }),
+        icon: 'icon-[lucide--share-2]'
+      },
+      {
+        id: ManagerTab.Missing,
+        label: t('manager.nav.missingNodes'),
+        icon: 'icon-[lucide--triangle-alert]'
+      }
+    ]
+  }
+])
+
+const initialTabId = initialTab ?? initialState.selectedTabId ?? ManagerTab.All
+const selectedNavId = ref<string | null>(initialTabId)
+
+// Helper to find a nav item by id in the nested structure
+const findNavItemById = (
+  items: (NavItemData | NavGroupData)[],
+  id: string | null
+): NavItemData | undefined => {
+  for (const item of items) {
+    if ('items' in item) {
+      const found = item.items.find((subItem) => subItem.id === id)
+      if (found) return found
+    } else if (item.id === id) {
+      return item
+    }
+  }
+  return undefined
+}
+
+const selectedTab = computed(() =>
+  findNavItemById(navItems.value, selectedNavId.value)
+)
+
+const {
+  searchQuery,
+  pageNumber,
+  isLoading: isSearchLoading,
+  searchResults,
+  searchMode,
+  sortField,
+  suggestions,
+  sortOptions
+} = useRegistrySearch({
+  initialSortField: initialState.sortField,
+  initialSearchMode:
+    initialPackId && initialTabId !== ManagerTab.Missing
+      ? 'packs'
+      : initialState.searchMode,
+  initialSearchQuery:
+    initialTabId === ManagerTab.Missing
+      ? ''
+      : (initialPackId ?? initialState.searchQuery)
+})
+pageNumber.value = 0
+
+const { isLegacyManagerSearch } = useLegacySearchTip(
+  searchQuery,
+  isNewManagerUI
+)
+
+const filterOptions = computed(() => [
+  { name: t('manager.filter.nodePack'), value: 'packs' },
+  { name: t('g.nodes'), value: 'nodes' }
+])
+
+const availableSortOptions = computed(() => {
+  if (!sortOptions.value) return []
+  return sortOptions.value.map((field) => ({
+    name: field.label,
+    value: field.id
+  }))
+})
+
+const onOptionSelect = (event: AutoCompleteOptionSelectEvent) => {
+  searchQuery.value = event.value.query
+}
+
+const onApproachEnd = () => {
+  pageNumber.value++
+}
+
+const isInitialLoad = computed(
+  () => searchResults.value.length === 0 && searchQuery.value === ''
+)
+
+// Use the new composable for tab-based display packs
+const {
+  displayPacks,
+  isLoading: isTabLoading,
+  workflowPacks
+} = useManagerDisplayPacks(selectedNavId, searchResults, searchQuery, sortField)
+
+// Tab helpers for template
+const isUpdateAvailableTab = computed(
+  () => selectedTab.value?.id === ManagerTab.UpdateAvailable
+)
+const isMissingTab = computed(
+  () => selectedTab.value?.id === ManagerTab.Missing
+)
+
+// Map of tab IDs to their empty state i18n key suffixes
+const tabEmptyStateKeys: Partial<Record<ManagerTab, string>> = {
+  [ManagerTab.AllInstalled]: 'allInstalled',
+  [ManagerTab.UpdateAvailable]: 'updateAvailable',
+  [ManagerTab.Conflicting]: 'conflicting',
+  [ManagerTab.Workflow]: 'workflow',
+  [ManagerTab.Missing]: 'missing'
+}
+
+// Empty state messages based on current tab and search state
+const emptyStateTitle = computed(() => {
+  if (comfyManagerStore.error) return t('manager.errorConnecting')
+  if (searchQuery.value) return t('manager.noResultsFound')
+
+  const tabId = selectedTab.value?.id as ManagerTab | undefined
+  const emptyStateKey = tabId ? tabEmptyStateKeys[tabId] : undefined
+
+  return emptyStateKey
+    ? t(`manager.emptyState.${emptyStateKey}.title`)
+    : t('manager.noResultsFound')
+})
+
+const emptyStateMessage = computed(() => {
+  if (comfyManagerStore.error) return t('manager.tryAgainLater')
+  if (searchQuery.value) {
+    const baseMessage = t('manager.tryDifferentSearch')
+    if (isLegacyManagerSearch.value) {
+      return `${baseMessage}\n\n${t('manager.legacyManagerSearchTip')}`
+    }
+    return baseMessage
+  }
+
+  const tabId = selectedTab.value?.id as ManagerTab | undefined
+  const emptyStateKey = tabId ? tabEmptyStateKeys[tabId] : undefined
+
+  return emptyStateKey
+    ? t(`manager.emptyState.${emptyStateKey}.message`)
+    : t('manager.tryDifferentSearch')
+})
+
+const onClickWarningLink = () => {
+  window.open(
+    buildDocsUrl('/troubleshooting/custom-node-issues', {
+      includeLocale: true
+    }),
+    '_blank'
+  )
+}
+
+const isLoading = computed(() => {
+  if (isSearchLoading.value) return searchResults.value.length === 0
+  if (isTabLoading.value) return true
+  return isInitialLoad.value
+})
+
+const resultsWithKeys = computed(
+  () =>
+    displayPacks.value.map((item) => ({
+      ...item,
+      key: item.id || item.name
+    })) as (components['schemas']['Node'] & { key: string })[]
+)
+
+const selectedNodePacks = ref<components['schemas']['Node'][]>([])
+const selectedNodePack = computed<components['schemas']['Node'] | null>(() =>
+  selectedNodePacks.value.length === 1 ? selectedNodePacks.value[0] : null
+)
+const isRightPanelOpen = ref(false)
+
+watch(
+  () => selectedNodePacks.value.length,
+  (length, oldLength) => {
+    if (length > 0 && oldLength === 0) {
+      isRightPanelOpen.value = true
+    }
+  }
+)
+
+// Auto-select the pack matching initialPackId once
+if (initialPackId) {
+  until(resultsWithKeys)
+    .toMatch((packs) => packs.some((p) => p.id === initialPackId))
+    .then((packs) => {
+      const target = packs.find((p) => p.id === initialPackId)
+      if (target && selectedNodePacks.value.length === 0) {
+        selectedNodePacks.value = [target]
+        isRightPanelOpen.value = true
+      }
+    })
+}
+
+const getLoadingCount = () => {
+  switch (selectedTab.value?.id) {
+    case ManagerTab.AllInstalled:
+      return comfyManagerStore.installedPacksIds?.size
+    case ManagerTab.Workflow:
+      return workflowPacks.value?.length
+    case ManagerTab.Missing:
+      return workflowPacks.value?.filter?.(
+        (pack) => !comfyManagerStore.isPackInstalled(pack.id)
+      )?.length
+    default:
+      return searchResults.value.length
+  }
+}
+
+const skeletonCardCount = computed(() => {
+  const loadingCount = getLoadingCount()
+  if (loadingCount) return loadingCount
+  return 16
+})
+
+const selectNodePack = (
+  nodePack: components['schemas']['Node'],
+  event: MouseEvent
+) => {
+  if (event.shiftKey || event.ctrlKey || event.metaKey) {
+    const index = selectedNodePacks.value.findIndex(
+      (pack) => pack.id === nodePack.id
+    )
+
+    if (index === -1) {
+      selectedNodePacks.value = [...selectedNodePacks.value, nodePack]
+    } else {
+      selectedNodePacks.value = selectedNodePacks.value.filter(
+        (pack) => pack.id !== nodePack.id
+      )
+    }
+  } else {
+    selectedNodePacks.value = [nodePack]
+  }
+}
+
+const unSelectItems = () => {
+  selectedNodePacks.value = []
+}
+const handleGridContainerClick = (event: MouseEvent) => {
+  const targetElement = event.target as HTMLElement
+  if (targetElement && !targetElement.closest('[data-virtual-grid-item]')) {
+    unSelectItems()
+  }
+}
+
+const hasMultipleSelections = computed(() => selectedNodePacks.value.length > 1)
+
+const lastFetchedPackId = ref<string | null>(null)
+
+whenever(selectedNodePack, async () => {
+  getPackById.cancel()
+  const pack = selectedNodePack.value
+  if (!pack?.id) return
+  if (hasMultipleSelections.value) return
+  if (lastFetchedPackId.value === pack.id) return
+  const data = await getPackById.call(pack.id)
+  if (data?.id === pack.id) {
+    lastFetchedPackId.value = pack.id
+    const mergedPack = merge({}, pack, data)
+    const packIndex = selectedNodePacks.value.findIndex(
+      (p) => p.id === mergedPack.id
+    )
+    if (packIndex !== -1) {
+      selectedNodePacks.value.splice(packIndex, 1, mergedPack)
+    }
+  }
+})
+
+let gridContainer: HTMLElement | null = null
+onMounted(() => {
+  gridContainer = document.getElementById('results-grid')
+})
+watch([searchQuery, selectedNavId], () => {
+  gridContainer ??= document.getElementById('results-grid')
+  if (gridContainer) {
+    pageNumber.value = 0
+    gridContainer.scrollTop = 0
+  }
+  unSelectItems()
+})
+
+watchEffect(() => {
+  dismissRedDotNotification()
+})
+
+onBeforeUnmount(() => {
+  persistedState.persistState({
+    selectedTabId: (selectedTab.value?.id as ManagerTab) ?? ManagerTab.All,
+    searchQuery: searchQuery.value,
+    searchMode: searchMode.value,
+    sortField: sortField.value
+  })
+})
+
+onUnmounted(() => {
+  getPackById.cancel()
+})
+</script>
diff --git a/src/workbench/extensions/manager/components/manager/ManagerDialogContent.vue b/src/workbench/extensions/manager/components/manager/ManagerDialogContent.vue
deleted file mode 100644
index d961c026af..0000000000
--- a/src/workbench/extensions/manager/components/manager/ManagerDialogContent.vue
+++ /dev/null
@@ -1,552 +0,0 @@
-<template>
-  <div
-    class="mx-auto flex h-full flex-col overflow-hidden"
-    :aria-label="$t('manager.title')"
-  >
-    <ContentDivider :width="0.3" />
-    <Button
-      v-if="isSmallScreen"
-      variant="secondary"
-      size="icon"
-      :class="
-        cn(
-          'absolute top-1/2 z-10 -translate-y-1/2',
-          isSideNavOpen ? 'left-[12rem]' : 'left-2'
-        )
-      "
-      @click="toggleSideNav"
-    >
-      <i
-        :class="isSideNavOpen ? 'pi pi-chevron-left' : 'pi pi-chevron-right'"
-      />
-    </Button>
-    <div class="relative flex flex-1 overflow-hidden">
-      <ManagerNavSidebar
-        v-if="isSideNavOpen"
-        v-model:selected-tab="selectedTab"
-        :tabs="tabs"
-      />
-      <div
-        class="flex-1 overflow-auto bg-base-background"
-        :class="{
-          'transition-all duration-300': isSmallScreen
-        }"
-      >
-        <div class="flex h-full flex-col px-6">
-          <!-- Conflict Warning Banner -->
-          <div
-            v-if="shouldShowManagerBanner"
-            class="relative mt-3 mb-4 flex items-center gap-6 rounded-lg bg-yellow-500/20 p-4"
-          >
-            <i class="pi pi-exclamation-triangle text-lg text-yellow-600"></i>
-            <div class="flex flex-1 flex-col gap-2">
-              <p class="m-0 text-sm font-bold">
-                {{ $t('manager.conflicts.warningBanner.title') }}
-              </p>
-              <p class="m-0 text-xs">
-                {{ $t('manager.conflicts.warningBanner.message') }}
-              </p>
-              <p
-                class="m-0 cursor-pointer text-sm font-bold"
-                @click="onClickWarningLink"
-              >
-                {{ $t('manager.conflicts.warningBanner.button') }}
-              </p>
-            </div>
-            <Button
-              class="absolute top-0 right-0"
-              variant="textonly"
-              size="icon"
-              @click="dismissWarningBanner"
-            >
-              <i class="pi pi-times text-xs text-base-foreground"></i>
-            </Button>
-          </div>
-          <RegistrySearchBar
-            v-model:search-query="searchQuery"
-            v-model:search-mode="searchMode"
-            v-model:sort-field="sortField"
-            :search-results="searchResults"
-            :suggestions="suggestions"
-            :is-missing-tab="isMissingTab"
-            :sort-options="sortOptions"
-            :is-update-available-tab="isUpdateAvailableTab"
-          />
-          <div class="flex-1 overflow-auto">
-            <div
-              v-if="isLoading"
-              class="h-full scrollbar-hide w-full overflow-auto"
-            >
-              <GridSkeleton :grid-style="GRID_STYLE" :skeleton-card-count />
-            </div>
-            <NoResultsPlaceholder
-              v-else-if="searchResults.length === 0"
-              :title="
-                comfyManagerStore.error
-                  ? $t('manager.errorConnecting')
-                  : $t('manager.noResultsFound')
-              "
-              :message="
-                comfyManagerStore.error
-                  ? $t('manager.tryAgainLater')
-                  : $t('manager.tryDifferentSearch')
-              "
-            />
-            <div v-else class="h-full" @click="handleGridContainerClick">
-              <VirtualGrid
-                id="results-grid"
-                :items="resultsWithKeys"
-                :buffer-rows="4"
-                :grid-style="GRID_STYLE"
-                @approach-end="onApproachEnd"
-              >
-                <template #item="{ item }">
-                  <PackCard
-                    :node-pack="item"
-                    :is-selected="
-                      selectedNodePacks.some((pack) => pack.id === item.id)
-                    "
-                    @click.stop="
-                      (event: MouseEvent) => selectNodePack(item, event)
-                    "
-                  />
-                </template>
-              </VirtualGrid>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="z-20 flex w-[clamp(250px,33%,306px)] border-l-0">
-        <ContentDivider orientation="vertical" :width="0.2" />
-        <div class="isolate flex w-full flex-col">
-          <InfoPanel
-            v-if="!hasMultipleSelections && selectedNodePack"
-            :node-pack="selectedNodePack"
-          />
-          <InfoPanelMultiItem v-else :node-packs="selectedNodePacks" />
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { whenever } from '@vueuse/core'
-import { merge } from 'es-toolkit/compat'
-import {
-  computed,
-  onBeforeUnmount,
-  onMounted,
-  onUnmounted,
-  ref,
-  watch,
-  watchEffect
-} from 'vue'
-import { useI18n } from 'vue-i18n'
-
-import ContentDivider from '@/components/common/ContentDivider.vue'
-import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
-import VirtualGrid from '@/components/common/VirtualGrid.vue'
-import Button from '@/components/ui/button/Button.vue'
-import { useResponsiveCollapse } from '@/composables/element/useResponsiveCollapse'
-import { useExternalLink } from '@/composables/useExternalLink'
-import { useComfyRegistryStore } from '@/stores/comfyRegistryStore'
-import type { components } from '@/types/comfyRegistryTypes'
-import { cn } from '@/utils/tailwindUtil'
-import ManagerNavSidebar from '@/workbench/extensions/manager/components/manager/ManagerNavSidebar.vue'
-import InfoPanel from '@/workbench/extensions/manager/components/manager/infoPanel/InfoPanel.vue'
-import InfoPanelMultiItem from '@/workbench/extensions/manager/components/manager/infoPanel/InfoPanelMultiItem.vue'
-import PackCard from '@/workbench/extensions/manager/components/manager/packCard/PackCard.vue'
-import RegistrySearchBar from '@/workbench/extensions/manager/components/manager/registrySearchBar/RegistrySearchBar.vue'
-import GridSkeleton from '@/workbench/extensions/manager/components/manager/skeleton/GridSkeleton.vue'
-import { useInstalledPacks } from '@/workbench/extensions/manager/composables/nodePack/useInstalledPacks'
-import { usePackUpdateStatus } from '@/workbench/extensions/manager/composables/nodePack/usePackUpdateStatus'
-import { useWorkflowPacks } from '@/workbench/extensions/manager/composables/nodePack/useWorkflowPacks'
-import { useConflictAcknowledgment } from '@/workbench/extensions/manager/composables/useConflictAcknowledgment'
-import { useManagerStatePersistence } from '@/workbench/extensions/manager/composables/useManagerStatePersistence'
-import { useRegistrySearch } from '@/workbench/extensions/manager/composables/useRegistrySearch'
-import { useComfyManagerStore } from '@/workbench/extensions/manager/stores/comfyManagerStore'
-import type { TabItem } from '@/workbench/extensions/manager/types/comfyManagerTypes'
-import { ManagerTab } from '@/workbench/extensions/manager/types/comfyManagerTypes'
-
-const { initialTab } = defineProps<{
-  initialTab?: ManagerTab
-}>()
-
-const { t } = useI18n()
-const { buildDocsUrl } = useExternalLink()
-const comfyManagerStore = useComfyManagerStore()
-const { getPackById } = useComfyRegistryStore()
-const conflictAcknowledgment = useConflictAcknowledgment()
-const persistedState = useManagerStatePersistence()
-const initialState = persistedState.loadStoredState()
-
-const GRID_STYLE = {
-  display: 'grid',
-  gridTemplateColumns: 'repeat(auto-fill, minmax(17rem, 1fr))',
-  padding: '0.5rem',
-  gap: '1.5rem'
-} as const
-
-const {
-  isSmallScreen,
-  isOpen: isSideNavOpen,
-  toggle: toggleSideNav
-} = useResponsiveCollapse()
-
-// Use conflict acknowledgment state from composable
-const {
-  shouldShowManagerBanner,
-  dismissWarningBanner,
-  dismissRedDotNotification
-} = conflictAcknowledgment
-
-const tabs = ref<TabItem[]>([
-  { id: ManagerTab.All, label: t('g.all'), icon: 'pi-list' },
-  { id: ManagerTab.Installed, label: t('g.installed'), icon: 'pi-box' },
-  {
-    id: ManagerTab.Workflow,
-    label: t('manager.inWorkflow'),
-    icon: 'pi-folder'
-  },
-  {
-    id: ManagerTab.Missing,
-    label: t('g.missing'),
-    icon: 'pi-exclamation-circle'
-  },
-  {
-    id: ManagerTab.UpdateAvailable,
-    label: t('g.updateAvailable'),
-    icon: 'pi-sync'
-  }
-])
-
-const initialTabId = initialTab ?? initialState.selectedTabId
-const selectedTab = ref<TabItem>(
-  tabs.value.find((tab) => tab.id === initialTabId) || tabs.value[0]
-)
-
-const {
-  searchQuery,
-  pageNumber,
-  isLoading: isSearchLoading,
-  searchResults,
-  searchMode,
-  sortField,
-  suggestions,
-  sortOptions
-} = useRegistrySearch({
-  initialSortField: initialState.sortField,
-  initialSearchMode: initialState.searchMode,
-  initialSearchQuery: initialState.searchQuery
-})
-pageNumber.value = 0
-const onApproachEnd = () => {
-  pageNumber.value++
-}
-
-const isInitialLoad = computed(
-  () => searchResults.value.length === 0 && searchQuery.value === ''
-)
-
-const isEmptySearch = computed(() => searchQuery.value === '')
-const displayPacks = ref<components['schemas']['Node'][]>([])
-
-const {
-  startFetchInstalled,
-  filterInstalledPack,
-  installedPacks,
-  isLoading: isLoadingInstalled,
-  isReady: installedPacksReady
-} = useInstalledPacks()
-
-const {
-  startFetchWorkflowPacks,
-  filterWorkflowPack,
-  workflowPacks,
-  isLoading: isLoadingWorkflow,
-  isReady: workflowPacksReady
-} = useWorkflowPacks()
-
-const filterMissingPacks = (packs: components['schemas']['Node'][]) =>
-  packs.filter((pack) => !comfyManagerStore.isPackInstalled(pack.id))
-
-const isUpdateAvailableTab = computed(
-  () => selectedTab.value?.id === ManagerTab.UpdateAvailable
-)
-const isInstalledTab = computed(
-  () => selectedTab.value?.id === ManagerTab.Installed
-)
-const isMissingTab = computed(
-  () => selectedTab.value?.id === ManagerTab.Missing
-)
-const isWorkflowTab = computed(
-  () => selectedTab.value?.id === ManagerTab.Workflow
-)
-const isAllTab = computed(() => selectedTab.value?.id === ManagerTab.All)
-
-const isOutdatedPack = (pack: components['schemas']['Node']) => {
-  const { isUpdateAvailable } = usePackUpdateStatus(pack)
-  return isUpdateAvailable.value === true
-}
-const filterOutdatedPacks = (packs: components['schemas']['Node'][]) =>
-  packs.filter(isOutdatedPack)
-
-watch(
-  [isUpdateAvailableTab, installedPacks],
-  async () => {
-    if (!isUpdateAvailableTab.value) return
-
-    if (!isEmptySearch.value) {
-      displayPacks.value = filterOutdatedPacks(installedPacks.value)
-    } else if (
-      !installedPacks.value.length &&
-      !installedPacksReady.value &&
-      !isLoadingInstalled.value
-    ) {
-      await startFetchInstalled()
-    } else {
-      displayPacks.value = filterOutdatedPacks(installedPacks.value)
-    }
-  },
-  { immediate: true }
-)
-
-watch(
-  [isInstalledTab, installedPacks],
-  async () => {
-    if (!isInstalledTab.value) return
-
-    if (!isEmptySearch.value) {
-      displayPacks.value = filterInstalledPack(searchResults.value)
-    } else if (
-      !installedPacks.value.length &&
-      !installedPacksReady.value &&
-      !isLoadingInstalled.value
-    ) {
-      await startFetchInstalled()
-    } else {
-      displayPacks.value = installedPacks.value
-    }
-  },
-  { immediate: true }
-)
-
-watch(
-  [isMissingTab, isWorkflowTab, workflowPacks, installedPacks],
-  async () => {
-    if (!isWorkflowTab.value && !isMissingTab.value) return
-
-    if (!isEmptySearch.value) {
-      displayPacks.value = isMissingTab.value
-        ? filterMissingPacks(filterWorkflowPack(searchResults.value))
-        : filterWorkflowPack(searchResults.value)
-    } else if (
-      !workflowPacks.value.length &&
-      !isLoadingWorkflow.value &&
-      !workflowPacksReady.value
-    ) {
-      await startFetchWorkflowPacks()
-      if (isMissingTab.value) {
-        await startFetchInstalled()
-      }
-    } else {
-      displayPacks.value = isMissingTab.value
-        ? filterMissingPacks(workflowPacks.value)
-        : workflowPacks.value
-    }
-  },
-  { immediate: true }
-)
-
-watch([isAllTab, searchResults], () => {
-  if (!isAllTab.value) return
-  displayPacks.value = searchResults.value
-})
-
-const onClickWarningLink = () => {
-  window.open(
-    buildDocsUrl('/troubleshooting/custom-node-issues', {
-      includeLocale: true
-    }),
-    '_blank'
-  )
-}
-
-const onResultsChange = () => {
-  switch (selectedTab.value?.id) {
-    case ManagerTab.Installed:
-      displayPacks.value = isEmptySearch.value
-        ? installedPacks.value
-        : filterInstalledPack(searchResults.value)
-      break
-    case ManagerTab.Workflow:
-      displayPacks.value = isEmptySearch.value
-        ? workflowPacks.value
-        : filterWorkflowPack(searchResults.value)
-      break
-    case ManagerTab.Missing:
-      if (!isEmptySearch.value) {
-        displayPacks.value = filterMissingPacks(
-          filterWorkflowPack(searchResults.value)
-        )
-      }
-      break
-    case ManagerTab.UpdateAvailable:
-      displayPacks.value = isEmptySearch.value
-        ? filterOutdatedPacks(installedPacks.value)
-        : filterOutdatedPacks(searchResults.value)
-      break
-    default:
-      displayPacks.value = searchResults.value
-  }
-}
-
-watch(searchResults, onResultsChange, { flush: 'post' })
-watch(() => comfyManagerStore.installedPacksIds, onResultsChange)
-
-const isLoading = computed(() => {
-  if (isSearchLoading.value) return searchResults.value.length === 0
-  if (selectedTab.value?.id === ManagerTab.Installed) {
-    return isLoadingInstalled.value
-  }
-  if (
-    selectedTab.value?.id === ManagerTab.Workflow ||
-    selectedTab.value?.id === ManagerTab.Missing
-  ) {
-    return isLoadingWorkflow.value
-  }
-  return isInitialLoad.value
-})
-
-const resultsWithKeys = computed(
-  () =>
-    displayPacks.value.map((item) => ({
-      ...item,
-      key: item.id || item.name
-    })) as (components['schemas']['Node'] & { key: string })[]
-)
-
-const selectedNodePacks = ref<components['schemas']['Node'][]>([])
-const selectedNodePack = computed<components['schemas']['Node'] | null>(() =>
-  selectedNodePacks.value.length === 1 ? selectedNodePacks.value[0] : null
-)
-
-const getLoadingCount = () => {
-  switch (selectedTab.value?.id) {
-    case ManagerTab.Installed:
-      return comfyManagerStore.installedPacksIds?.size
-    case ManagerTab.Workflow:
-      return workflowPacks.value?.length
-    case ManagerTab.Missing:
-      return workflowPacks.value?.filter?.(
-        (pack) => !comfyManagerStore.isPackInstalled(pack.id)
-      )?.length
-    default:
-      return searchResults.value.length
-  }
-}
-
-const skeletonCardCount = computed(() => {
-  const loadingCount = getLoadingCount()
-  if (loadingCount) return loadingCount
-  return isSmallScreen.value ? 12 : 16
-})
-
-const selectNodePack = (
-  nodePack: components['schemas']['Node'],
-  event: MouseEvent
-) => {
-  // Handle multi-select with Shift or Ctrl/Cmd key
-  if (event.shiftKey || event.ctrlKey || event.metaKey) {
-    const index = selectedNodePacks.value.findIndex(
-      (pack) => pack.id === nodePack.id
-    )
-
-    if (index === -1) {
-      // Add to selection if not already selected
-      selectedNodePacks.value.push(nodePack)
-    } else {
-      // Remove from selection if already selected
-      selectedNodePacks.value.splice(index, 1)
-    }
-  } else {
-    // Single select behavior
-    selectedNodePacks.value = [nodePack]
-  }
-}
-
-const unSelectItems = () => {
-  selectedNodePacks.value = []
-}
-const handleGridContainerClick = (event: MouseEvent) => {
-  const targetElement = event.target as HTMLElement
-  if (targetElement && !targetElement.closest('[data-virtual-grid-item]')) {
-    unSelectItems()
-  }
-}
-
-const hasMultipleSelections = computed(() => selectedNodePacks.value.length > 1)
-
-// Track the last pack ID for which we've fetched full registry data
-const lastFetchedPackId = ref<string | null>(null)
-
-// Whenever a single pack is selected, fetch its full info once
-whenever(selectedNodePack, async () => {
-  // Cancel any in-flight requests from previously selected node pack
-  getPackById.cancel()
-  // If only a single node pack is selected, fetch full node pack info from registry
-  const pack = selectedNodePack.value
-  if (!pack?.id) return
-  if (hasMultipleSelections.value) return
-  // Only fetch if we haven't already for this pack
-  if (lastFetchedPackId.value === pack.id) return
-  const data = await getPackById.call(pack.id)
-  // If selected node hasn't changed since request, merge registry & Algolia data
-  if (data?.id === pack.id) {
-    lastFetchedPackId.value = pack.id
-    const mergedPack = merge({}, pack, data)
-    // Update the pack in current selection without changing selection state
-    const packIndex = selectedNodePacks.value.findIndex(
-      (p) => p.id === mergedPack.id
-    )
-    if (packIndex !== -1) {
-      selectedNodePacks.value.splice(packIndex, 1, mergedPack)
-    }
-    // Replace pack in displayPacks so that children receive a fresh prop reference
-    const idx = displayPacks.value.findIndex((p) => p.id === mergedPack.id)
-    if (idx !== -1) {
-      displayPacks.value.splice(idx, 1, mergedPack)
-    }
-  }
-})
-
-let gridContainer: HTMLElement | null = null
-onMounted(() => {
-  gridContainer = document.getElementById('results-grid')
-})
-watch([searchQuery, selectedTab], () => {
-  gridContainer ??= document.getElementById('results-grid')
-  if (gridContainer) {
-    pageNumber.value = 0
-    gridContainer.scrollTop = 0
-  }
-})
-
-watchEffect(() => {
-  dismissRedDotNotification()
-})
-
-onBeforeUnmount(() => {
-  persistedState.persistState({
-    selectedTabId: selectedTab.value?.id,
-    searchQuery: searchQuery.value,
-    searchMode: searchMode.value,
-    sortField: sortField.value
-  })
-})
-
-onUnmounted(() => {
-  getPackById.cancel()
-})
-</script>
diff --git a/src/workbench/extensions/manager/components/manager/ManagerHeader.test.ts b/src/workbench/extensions/manager/components/manager/ManagerHeader.test.ts
deleted file mode 100644
index 11449f199d..0000000000
--- a/src/workbench/extensions/manager/components/manager/ManagerHeader.test.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { mount } from '@vue/test-utils'
-import { createPinia } from 'pinia'
-import PrimeVue from 'primevue/config'
-import { describe, expect, it } from 'vitest'
-import { createI18n } from 'vue-i18n'
-
-import enMessages from '@/locales/en/main.json' with { type: 'json' }
-
-import ManagerHeader from './ManagerHeader.vue'
-
-const i18n = createI18n({
-  legacy: false,
-  locale: 'en',
-  messages: {
-    en: enMessages
-  }
-})
-
-describe('ManagerHeader', () => {
-  const createWrapper = () => {
-    return mount(ManagerHeader, {
-      global: {
-        plugins: [createPinia(), PrimeVue, i18n]
-      }
-    })
-  }
-
-  it('renders the component title', () => {
-    const wrapper = createWrapper()
-
-    expect(wrapper.find('h2').text()).toBe(
-      enMessages.manager.discoverCommunityContent
-    )
-  })
-
-  it('has proper structure with flex container', () => {
-    const wrapper = createWrapper()
-
-    const flexContainer = wrapper.find('.flex.items-center')
-    expect(flexContainer.exists()).toBe(true)
-
-    const title = flexContainer.find('h2')
-    expect(title.exists()).toBe(true)
-  })
-})
diff --git a/src/workbench/extensions/manager/components/manager/ManagerHeader.vue b/src/workbench/extensions/manager/components/manager/ManagerHeader.vue
deleted file mode 100644
index dbffd6c459..0000000000
--- a/src/workbench/extensions/manager/components/manager/ManagerHeader.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
-  <div class="w-full">
-    <div class="flex items-center">
-      <h2 class="text-left text-lg font-normal">
-        {{ $t('manager.discoverCommunityContent') }}
-      </h2>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts"></script>
diff --git a/src/workbench/extensions/manager/components/manager/ManagerNavSidebar.vue b/src/workbench/extensions/manager/components/manager/ManagerNavSidebar.vue
deleted file mode 100644
index 571b22ecf5..0000000000
--- a/src/workbench/extensions/manager/components/manager/ManagerNavSidebar.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<template>
-  <aside
-    class="z-5 flex w-3/12 max-w-[250px] translate-x-0 transition-transform duration-300 ease-in-out"
-  >
-    <ScrollPanel class="flex-1">
-      <Listbox
-        v-model="selectedTab"
-        :options="tabs"
-        option-label="label"
-        list-style="max-height:unset"
-        class="w-full border-0 bg-transparent shadow-none"
-        :pt="{
-          list: { class: 'p-3 gap-2' },
-          option: { class: 'px-4 py-2 text-lg rounded-lg' },
-          optionGroup: { class: 'p-0 text-left text-inherit' }
-        }"
-      >
-        <template #option="slotProps">
-          <div class="flex items-center text-left">
-            <i :class="['pi', slotProps.option.icon, 'mr-2 text-sm']" />
-            <span class="text-sm">{{ slotProps.option.label }}</span>
-          </div>
-        </template>
-      </Listbox>
-    </ScrollPanel>
-    <ContentDivider orientation="vertical" :width="0.3" />
-  </aside>
-</template>
-
-<script setup lang="ts">
-import Listbox from 'primevue/listbox'
-import ScrollPanel from 'primevue/scrollpanel'
-
-import ContentDivider from '@/components/common/ContentDivider.vue'
-import type { TabItem } from '@/workbench/extensions/manager/types/comfyManagerTypes'
-
-defineProps<{
-  tabs: TabItem[]
-}>()
-
-const selectedTab = defineModel<TabItem>('selectedTab')
-</script>
diff --git a/tests-ui/tests/components/dialog/content/manager/NodeConflictDialogContent.test.ts b/src/workbench/extensions/manager/components/manager/NodeConflictDialogContent.test.ts
similarity index 89%
rename from tests-ui/tests/components/dialog/content/manager/NodeConflictDialogContent.test.ts
rename to src/workbench/extensions/manager/components/manager/NodeConflictDialogContent.test.ts
index b5b072482d..af3c1530b8 100644
--- a/tests-ui/tests/components/dialog/content/manager/NodeConflictDialogContent.test.ts
+++ b/src/workbench/extensions/manager/components/manager/NodeConflictDialogContent.test.ts
@@ -1,11 +1,28 @@
 import { mount } from '@vue/test-utils'
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import Button from '@/components/ui/button/Button.vue'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { computed, ref } from 'vue'
 
 import NodeConflictDialogContent from '@/workbench/extensions/manager/components/manager/NodeConflictDialogContent.vue'
-import type { ConflictDetectionResult } from '@/workbench/extensions/manager/types/conflictDetectionTypes'
+import type {
+  ConflictDetail,
+  ConflictDetectionResult
+} from '@/workbench/extensions/manager/types/conflictDetectionTypes'
+
+// Type for component VM
+interface NodeConflictDialogVM {
+  importFailedExpanded: boolean
+  conflictsExpanded: boolean
+  extensionsExpanded: boolean
+  allConflictDetails: ConflictDetail[]
+  importFailedConflicts: string[]
+}
+
+function getVM(wrapper: ReturnType<typeof mount>): NodeConflictDialogVM {
+  return wrapper.vm as Partial<NodeConflictDialogVM> as NodeConflictDialogVM
+}
 
 // Mock getConflictMessage utility
 vi.mock('@/utils/conflictMessageUtil', () => ({
@@ -44,11 +61,11 @@ vi.mock(
 )
 
 describe('NodeConflictDialogContent', () => {
-  let pinia: ReturnType<typeof createPinia>
+  let pinia: ReturnType<typeof createTestingPinia>
 
   beforeEach(() => {
     vi.clearAllMocks()
-    pinia = createPinia()
+    pinia = createTestingPinia({ stubActions: false })
     setActivePinia(pinia)
     // Reset mock data
     mockConflictData.value = []
@@ -245,7 +262,7 @@ describe('NodeConflictDialogContent', () => {
       await conflictsHeader.trigger('click')
 
       // Should be expanded now
-      const conflictItems = wrapper.findAll('.conflict-list-item')
+      const conflictItems = wrapper.findAll('[aria-label*="Conflict:"]')
       expect(conflictItems.length).toBeGreaterThan(0)
     })
 
@@ -287,25 +304,28 @@ describe('NodeConflictDialogContent', () => {
       await importFailedHeader.trigger('click')
 
       // Verify import failed panel is open
-      expect((wrapper.vm as any).importFailedExpanded).toBe(true)
-      expect((wrapper.vm as any).conflictsExpanded).toBe(false)
-      expect((wrapper.vm as any).extensionsExpanded).toBe(false)
+      const vm1 = getVM(wrapper)
+      expect(vm1.importFailedExpanded).toBe(true)
+      expect(vm1.conflictsExpanded).toBe(false)
+      expect(vm1.extensionsExpanded).toBe(false)
 
       // Open conflicts panel
       await conflictsHeader.trigger('click')
 
       // Verify conflicts panel is open and others are closed
-      expect((wrapper.vm as any).importFailedExpanded).toBe(false)
-      expect((wrapper.vm as any).conflictsExpanded).toBe(true)
-      expect((wrapper.vm as any).extensionsExpanded).toBe(false)
+      const vm2 = getVM(wrapper)
+      expect(vm2.importFailedExpanded).toBe(false)
+      expect(vm2.conflictsExpanded).toBe(true)
+      expect(vm2.extensionsExpanded).toBe(false)
 
       // Open extensions panel
       await extensionsHeader.trigger('click')
 
       // Verify extensions panel is open and others are closed
-      expect((wrapper.vm as any).importFailedExpanded).toBe(false)
-      expect((wrapper.vm as any).conflictsExpanded).toBe(false)
-      expect((wrapper.vm as any).extensionsExpanded).toBe(true)
+      const vm3 = getVM(wrapper)
+      expect(vm3.importFailedExpanded).toBe(false)
+      expect(vm3.conflictsExpanded).toBe(false)
+      expect(vm3.extensionsExpanded).toBe(true)
     })
   })
 
@@ -324,7 +344,7 @@ describe('NodeConflictDialogContent', () => {
       await conflictsHeader.trigger('click')
 
       // Should display conflict messages (excluding import_failed)
-      const conflictItems = wrapper.findAll('.conflict-list-item')
+      const conflictItems = wrapper.findAll('[aria-label*="Conflict:"]')
       expect(conflictItems).toHaveLength(3) // 2 from Package1 + 1 from Package2
     })
 
@@ -338,7 +358,9 @@ describe('NodeConflictDialogContent', () => {
       await importFailedHeader.trigger('click')
 
       // Should display only import failed package
-      const importFailedItems = wrapper.findAll('.conflict-list-item')
+      const importFailedItems = wrapper.findAll(
+        '[aria-label*="Import failed package:"]'
+      )
       expect(importFailedItems).toHaveLength(1)
       expect(importFailedItems[0].text()).toContain('Test Package 3')
     })
@@ -448,10 +470,12 @@ describe('NodeConflictDialogContent', () => {
       const wrapper = createWrapper()
 
       // Verify that import_failed conflicts are filtered out from main conflicts
-      const vm = wrapper.vm as any
+      const vm = getVM(wrapper)
       expect(vm.allConflictDetails).toHaveLength(3) // Should not include import_failed
       expect(
-        vm.allConflictDetails.every((c: any) => c.type !== 'import_failed')
+        vm.allConflictDetails.every(
+          (c: ConflictDetail) => c.type !== 'import_failed'
+        )
       ).toBe(true)
     })
 
@@ -460,7 +484,7 @@ describe('NodeConflictDialogContent', () => {
       const wrapper = createWrapper()
 
       // Verify that only import_failed packages are extracted
-      const vm = wrapper.vm as any
+      const vm = getVM(wrapper)
       expect(vm.importFailedConflicts).toHaveLength(1)
       expect(vm.importFailedConflicts[0]).toBe('Test Package 3')
     })
diff --git a/src/workbench/extensions/manager/components/manager/NodeConflictDialogContent.vue b/src/workbench/extensions/manager/components/manager/NodeConflictDialogContent.vue
index c7eda7f090..2fdb82e9b1 100644
--- a/src/workbench/extensions/manager/components/manager/NodeConflictDialogContent.vue
+++ b/src/workbench/extensions/manager/components/manager/NodeConflictDialogContent.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="flex w-138 flex-col">
     <ContentDivider :width="1" />
-    <div class="flex h-full w-full flex-col gap-2 px-4 py-6">
+    <div class="flex size-full flex-col gap-2 px-4 py-6">
       <!-- Description -->
       <div v-if="showAfterWhatsNew">
-        <p class="m-0 mb-4 text-sm leading-4 text-base-foreground">
+        <p class="m-0 mb-4 text-sm/4 text-base-foreground">
           {{ $t('manager.conflicts.description') }}
           <br /><br />
           {{ $t('manager.conflicts.info') }}
@@ -50,7 +50,8 @@
           <div
             v-for="(packageName, i) in importFailedConflicts"
             :key="i"
-            class="conflict-list-item flex h-6 shrink-0 items-center justify-between px-4"
+            :aria-label="`Import failed package: ${packageName}`"
+            class="flex min-h-6 shrink-0 items-center justify-between px-4 py-1 hover:bg-node-component-surface-hovered"
           >
             <span class="text-xs text-muted">
               {{ packageName }}
@@ -98,7 +99,8 @@
           <div
             v-for="(conflict, i) in allConflictDetails"
             :key="i"
-            class="conflict-list-item flex h-6 shrink-0 items-center justify-between px-4"
+            :aria-label="`Conflict: ${getConflictMessage(conflict, t)}`"
+            class="flex min-h-6 shrink-0 items-center justify-between px-4 py-1 hover:bg-node-component-surface-hovered"
           >
             <span class="text-xs text-muted">{{
               getConflictMessage(conflict, t)
@@ -146,7 +148,7 @@
           <div
             v-for="conflictResult in conflictData"
             :key="conflictResult.package_id"
-            class="conflict-list-item flex h-6 shrink-0 items-center justify-between px-4"
+            class="flex min-h-6 shrink-0 items-center justify-between px-4 py-1 hover:bg-node-component-surface-hovered"
           >
             <span class="text-xs text-muted">
               {{ conflictResult.package_name }}
@@ -236,8 +238,3 @@ const toggleExtensionsPanel = () => {
   importFailedExpanded.value = false
 }
 </script>
-<style scoped>
-.conflict-list-item:hover {
-  background-color: rgb(0 122 255 / 0.2);
-}
-</style>
diff --git a/src/workbench/extensions/manager/components/manager/NodeConflictFooter.vue b/src/workbench/extensions/manager/components/manager/NodeConflictFooter.vue
index 842bcb576d..a448b72dac 100644
--- a/src/workbench/extensions/manager/components/manager/NodeConflictFooter.vue
+++ b/src/workbench/extensions/manager/components/manager/NodeConflictFooter.vue
@@ -11,12 +11,12 @@
         {{ $t('manager.conflicts.conflictInfoTitle') }}
       </Button>
       <Button
-        v-if="props.buttonText"
+        v-if="buttonText"
         variant="secondary"
         size="sm"
         @click="handleButtonClick"
       >
-        {{ props.buttonText }}
+        {{ buttonText }}
       </Button>
     </div>
   </div>
@@ -31,10 +31,7 @@ interface Props {
   buttonText?: string
   onButtonClick?: () => void
 }
-const props = withDefaults(defineProps<Props>(), {
-  buttonText: undefined,
-  onButtonClick: undefined
-})
+const { buttonText, onButtonClick } = defineProps<Props>()
 const { buildDocsUrl } = useExternalLink()
 const dialogStore = useDialogStore()
 const handleConflictInfoClick = () => {
@@ -49,8 +46,8 @@ const handleButtonClick = () => {
   // Close the conflict dialog
   dialogStore.closeDialog({ key: 'global-node-conflict' })
   // Execute the custom button action if provided
-  if (props.onButtonClick) {
-    props.onButtonClick()
+  if (onButtonClick) {
+    onButtonClick()
   }
 }
 </script>
diff --git a/src/workbench/extensions/manager/components/manager/NodeConflictHeader.vue b/src/workbench/extensions/manager/components/manager/NodeConflictHeader.vue
index 368a1229fb..979b9830a8 100644
--- a/src/workbench/extensions/manager/components/manager/NodeConflictHeader.vue
+++ b/src/workbench/extensions/manager/components/manager/NodeConflictHeader.vue
@@ -2,7 +2,7 @@
   <div class="flex h-12 w-full items-center justify-between pl-6">
     <div class="flex items-center gap-2">
       <!-- Warning Icon -->
-      <i class="pi pi-exclamation-triangle text-lg"></i>
+      <i class="icon-[lucide--triangle-alert] text-warning-background" />
       <!-- Title -->
       <p class="text-base font-bold">
         {{ $t('manager.conflicts.title') }}
diff --git a/src/workbench/extensions/manager/components/manager/PackStatusMessage.vue b/src/workbench/extensions/manager/components/manager/PackStatusMessage.vue
index 25c9019e9b..5eb82d27ac 100644
--- a/src/workbench/extensions/manager/components/manager/PackStatusMessage.vue
+++ b/src/workbench/extensions/manager/components/manager/PackStatusMessage.vue
@@ -1,7 +1,7 @@
 <template>
   <Message
     :severity="statusSeverity"
-    class="flex w-fit items-center rounded-xl p-0 break-words"
+    class="flex w-fit items-center rounded-xl p-0 wrap-break-word"
     :pt="{
       text: { class: 'text-xs' },
       content: { class: 'px-2 py-0.5' }
diff --git a/src/workbench/extensions/manager/components/manager/PackVersionBadge.test.ts b/src/workbench/extensions/manager/components/manager/PackVersionBadge.test.ts
index d57b25f1fc..c17bfb6b80 100644
--- a/src/workbench/extensions/manager/components/manager/PackVersionBadge.test.ts
+++ b/src/workbench/extensions/manager/components/manager/PackVersionBadge.test.ts
@@ -1,6 +1,6 @@
 import type { VueWrapper } from '@vue/test-utils'
 import { mount } from '@vue/test-utils'
-import { createPinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
 import PrimeVue from 'primevue/config'
 import Tooltip from 'primevue/tooltip'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
@@ -75,7 +75,7 @@ describe('PackVersionBadge', () => {
 
   const mountComponent = ({
     props = {}
-  }: Record<string, any> = {}): VueWrapper => {
+  }: { props?: Record<string, unknown> } = {}): VueWrapper => {
     const i18n = createI18n({
       legacy: false,
       locale: 'en',
@@ -89,7 +89,7 @@ describe('PackVersionBadge', () => {
         ...props
       },
       global: {
-        plugins: [PrimeVue, createPinia(), i18n],
+        plugins: [PrimeVue, createTestingPinia({ stubActions: false }), i18n],
         directives: {
           tooltip: Tooltip
         },
diff --git a/src/workbench/extensions/manager/components/manager/PackVersionBadge.vue b/src/workbench/extensions/manager/components/manager/PackVersionBadge.vue
index 3d22daaeb6..a648fed05f 100644
--- a/src/workbench/extensions/manager/components/manager/PackVersionBadge.vue
+++ b/src/workbench/extensions/manager/components/manager/PackVersionBadge.vue
@@ -27,9 +27,14 @@
 
     <Popover
       ref="popoverRef"
+      append-to="body"
       :pt="{
+        root: {
+          class: 'before:hidden after:hidden [&_.p-popover-arrow]:hidden'
+        },
         content: { class: 'p-0 shadow-lg' }
       }"
+      @show="fixPopoverIntoViewport"
     >
       <PackVersionSelectorPopover
         :installed-version="installedVersion"
@@ -44,7 +49,7 @@
 <script setup lang="ts">
 import Popover from 'primevue/popover'
 import { valid as validSemver } from 'semver'
-import { computed, ref, watch } from 'vue'
+import { computed, nextTick, ref, watch } from 'vue'
 
 import type { components } from '@/types/comfyRegistryTypes'
 import PackVersionSelectorPopover from '@/workbench/extensions/manager/components/manager/PackVersionSelectorPopover.vue'
@@ -65,6 +70,7 @@ const {
 
 const { isUpdateAvailable } = usePackUpdateStatus(() => nodePack)
 const popoverRef = ref()
+const lastTargetEl = ref<HTMLElement | null>(null)
 
 const managerStore = useComfyManagerStore()
 
@@ -87,6 +93,7 @@ const installedVersion = computed(() => {
 })
 
 const toggleVersionSelector = (event: Event) => {
+  lastTargetEl.value = event.currentTarget as HTMLElement
   popoverRef.value.toggle(event)
 }
 
@@ -94,6 +101,59 @@ const closeVersionSelector = () => {
   popoverRef.value.hide()
 }
 
+const fixPopoverIntoViewport = async () => {
+  await nextTick()
+
+  const popoverEl: HTMLElement | undefined =
+    popoverRef.value?.container ?? popoverRef.value?.$el
+  const targetEl = lastTargetEl.value
+  if (!popoverEl || !targetEl) return
+
+  requestAnimationFrame(() => {
+    const boundaryEl =
+      targetEl.closest('.p-dialog') ??
+      targetEl.closest('.manager-dialog') ??
+      targetEl.closest('[role="dialog"]') ??
+      document.documentElement
+
+    const boundary = boundaryEl.getBoundingClientRect()
+    const targetRect = targetEl.getBoundingClientRect()
+
+    popoverEl.style.transform = ''
+
+    const rect = popoverEl.getBoundingClientRect()
+
+    const M = 8 // keep away from dialog edge
+    const GAP = 10
+
+    const spaceBelow = boundary.bottom - targetRect.bottom
+    const spaceAbove = targetRect.top - boundary.top
+
+    // Decide side (below by default; flip to above if needed)
+    const placeAbove = spaceBelow < rect.height + GAP && spaceAbove > spaceBelow
+
+    // 1) Top with a GAP (prevents covering trigger)
+    let top = placeAbove
+      ? targetRect.top - rect.height - GAP
+      : targetRect.bottom + GAP
+
+    // Clamp vertically
+    top = Math.min(top, boundary.bottom - rect.height - M)
+    top = Math.max(top, boundary.top + M)
+
+    // 2) Left (align to trigger, then clamp)
+    let left = targetRect.left
+    left = Math.min(left, boundary.right - rect.width - M)
+    left = Math.max(left, boundary.left + M)
+
+    // Apply position
+    popoverEl.style.top = `${Math.round(top)}px`
+    popoverEl.style.left = `${Math.round(left)}px`
+
+    popoverEl.classList.toggle('p-popover-flipped', placeAbove)
+  })
+}
+
 // If the card is unselected, automatically close the version selector popover
 watch(
   () => isSelected,
diff --git a/src/workbench/extensions/manager/components/manager/PackVersionSelectorPopover.test.ts b/src/workbench/extensions/manager/components/manager/PackVersionSelectorPopover.test.ts
index 6c4976f916..6d27459ed2 100644
--- a/src/workbench/extensions/manager/components/manager/PackVersionSelectorPopover.test.ts
+++ b/src/workbench/extensions/manager/components/manager/PackVersionSelectorPopover.test.ts
@@ -1,6 +1,6 @@
 import type { VueWrapper } from '@vue/test-utils'
 import { mount } from '@vue/test-utils'
-import { createPinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
 import Button from '@/components/ui/button/Button.vue'
 import PrimeVue from 'primevue/config'
 import Listbox from 'primevue/listbox'
@@ -17,6 +17,14 @@ import enMessages from '@/locales/en/main.json' with { type: 'json' }
 
 import PackVersionSelectorPopover from './PackVersionSelectorPopover.vue'
 
+interface PackVersionSelectorVM {
+  getVersionCompatibility: (version: string) => unknown
+}
+
+function getVM(wrapper: VueWrapper): PackVersionSelectorVM {
+  return wrapper.vm as Partial<PackVersionSelectorVM> as PackVersionSelectorVM
+}
+
 // Default mock versions for reference
 const defaultMockVersions = [
   {
@@ -55,6 +63,8 @@ const mockNodePack = {
 const mockGetPackVersions = vi.fn()
 const mockInstallPack = vi.fn().mockResolvedValue(undefined)
 const mockCheckNodeCompatibility = vi.fn()
+const mockIsPackInstalled = vi.fn(() => false)
+const mockGetInstalledPackVersion = vi.fn(() => undefined)
 
 // Mock the registry service
 vi.mock('@/services/comfyRegistryService', () => ({
@@ -70,8 +80,8 @@ vi.mock('@/workbench/extensions/manager/stores/comfyManagerStore', () => ({
       call: mockInstallPack,
       clear: vi.fn()
     },
-    isPackInstalled: vi.fn(() => false),
-    getInstalledPackVersion: vi.fn(() => undefined)
+    isPackInstalled: mockIsPackInstalled,
+    getInstalledPackVersion: mockGetInstalledPackVersion
   }))
 }))
 
@@ -98,11 +108,13 @@ describe('PackVersionSelectorPopover', () => {
     mockCheckNodeCompatibility
       .mockReset()
       .mockReturnValue({ hasConflict: false, conflicts: [] })
+    mockIsPackInstalled.mockReset().mockReturnValue(false)
+    mockGetInstalledPackVersion.mockReset().mockReturnValue(undefined)
   })
 
   const mountComponent = ({
     props = {}
-  }: Record<string, any> = {}): VueWrapper => {
+  }: { props?: Record<string, unknown> } = {}): VueWrapper => {
     const i18n = createI18n({
       legacy: false,
       locale: 'en',
@@ -115,7 +127,7 @@ describe('PackVersionSelectorPopover', () => {
         ...props
       },
       global: {
-        plugins: [PrimeVue, createPinia(), i18n],
+        plugins: [PrimeVue, createTestingPinia({ stubActions: false }), i18n],
         components: {
           Listbox,
           VerifiedIcon,
@@ -411,7 +423,7 @@ describe('PackVersionSelectorPopover', () => {
       expect(mockCheckNodeCompatibility).toHaveBeenCalled()
 
       // The warning icon should be shown for incompatible versions
-      const warningIcons = wrapper.findAll('.pi-exclamation-triangle')
+      const warningIcons = wrapper.findAll('.icon-\\[lucide--triangle-alert\\]')
       expect(warningIcons.length).toBeGreaterThan(0)
     })
 
@@ -477,7 +489,7 @@ describe('PackVersionSelectorPopover', () => {
       mockCheckNodeCompatibility.mockClear()
 
       // Trigger compatibility check by accessing getVersionCompatibility
-      const vm = wrapper.vm as any
+      const vm = getVM(wrapper)
       vm.getVersionCompatibility('1.0.0')
 
       // Verify that checkNodeCompatibility was called with correct data
@@ -536,7 +548,7 @@ describe('PackVersionSelectorPopover', () => {
       expect(mockCheckNodeCompatibility).toHaveBeenCalled()
 
       // The warning icon should be shown for version incompatible packages
-      const warningIcons = wrapper.findAll('.pi-exclamation-triangle')
+      const warningIcons = wrapper.findAll('.icon-\\[lucide--triangle-alert\\]')
       expect(warningIcons.length).toBeGreaterThan(0)
     })
 
@@ -565,7 +577,7 @@ describe('PackVersionSelectorPopover', () => {
       })
       await waitForPromises()
 
-      const vm = wrapper.vm as any
+      const vm = getVM(wrapper)
 
       // Clear previous calls from component mounting/rendering
       mockCheckNodeCompatibility.mockClear()
@@ -662,7 +674,7 @@ describe('PackVersionSelectorPopover', () => {
       await wrapper.vm.$nextTick()
 
       // The warning icon should be shown for banned packages in the dropdown options
-      const warningIcons = wrapper.findAll('.pi-exclamation-triangle')
+      const warningIcons = wrapper.findAll('.icon-\\[lucide--triangle-alert\\]')
       expect(warningIcons.length).toBeGreaterThan(0)
     })
 
@@ -705,7 +717,7 @@ describe('PackVersionSelectorPopover', () => {
       expect(mockCheckNodeCompatibility).toHaveBeenCalled()
 
       // The warning icon should be shown for security pending packages
-      const warningIcons = wrapper.findAll('.pi-exclamation-triangle')
+      const warningIcons = wrapper.findAll('.icon-\\[lucide--triangle-alert\\]')
       expect(warningIcons.length).toBeGreaterThan(0)
     })
   })
diff --git a/src/workbench/extensions/manager/components/manager/PackVersionSelectorPopover.vue b/src/workbench/extensions/manager/components/manager/PackVersionSelectorPopover.vue
index 46a45abc5a..39010a9e41 100644
--- a/src/workbench/extensions/manager/components/manager/PackVersionSelectorPopover.vue
+++ b/src/workbench/extensions/manager/components/manager/PackVersionSelectorPopover.vue
@@ -9,7 +9,7 @@
       v-if="isLoadingVersions || isQueueing"
       class="flex flex-col items-center py-4 text-center text-muted"
     >
-      <ProgressSpinner class="mb-2 h-8 w-8" />
+      <ProgressSpinner class="mb-2 size-8" />
       {{ $t('manager.loadingVersions') }}
     </div>
     <div v-else-if="versionOptions.length === 0" class="py-2">
@@ -25,6 +25,7 @@
       v-model="selectedVersion"
       option-label="label"
       option-value="value"
+      option-disabled="isInstalled"
       :options="processedVersionOptions"
       :highlight-on-select="false"
       class="max-h-[50vh] w-full rounded-md border-none shadow-none"
@@ -45,7 +46,7 @@
                   value: slotProps.option.conflictMessage,
                   showDelay: 300
                 }"
-                class="pi pi-exclamation-triangle text-yellow-500"
+                class="icon-[lucide--triangle-alert] text-warning-background"
               />
               <VerifiedIcon v-else :size="20" class="relative right-0.5" />
             </template>
@@ -71,7 +72,7 @@
       <Button
         variant="secondary"
         class="rounded-lg bg-secondary-background px-4 py-2.5 text-sm text-base-foreground"
-        :disabled="isQueueing"
+        :disabled="isInstallDisabled"
         @click="handleSubmit"
       >
         {{ $t('g.install') }}
@@ -136,8 +137,10 @@ const managerStore = useComfyManagerStore()
 const { checkNodeCompatibility } = useConflictDetection()
 
 const isQueueing = ref(false)
-
 const selectedVersion = ref<string>(SelectedVersionValues.LATEST)
+const isInstallDisabled = computed(
+  () => isQueueing.value || isVersionInstalled(selectedVersion.value)
+)
 onMounted(() => {
   const initialVersion =
     getInitialSelectedVersion() ?? SelectedVersionValues.LATEST
@@ -299,16 +302,25 @@ const isOptionSelected = (optionValue: string) => {
   }
   return false
 }
-// Checks if an option is selected, treating 'latest' as an alias for the actual latest version number.
+const isVersionInstalled = (version: string) => {
+  const installed = nodePack.id
+    ? managerStore.getInstalledPackVersion(nodePack.id)
+    : undefined
+  if (!installed) return false
+  if (version === 'latest')
+    return installed === nodePack.latest_version?.version
+  return version === installed
+}
+
 const processedVersionOptions = computed(() => {
   return versionOptions.value.map((option) => {
     const compatibility = getVersionCompatibility(option.value)
-    const isSelected = isOptionSelected(option.value)
     return {
       ...option,
       hasConflict: compatibility.hasConflict,
       conflictMessage: compatibility.conflictMessage,
-      isSelected: isSelected
+      isSelected: isOptionSelected(option.value),
+      isInstalled: isVersionInstalled(option.value)
     }
   })
 })
diff --git a/src/workbench/extensions/manager/components/manager/button/PackEnableToggle.test.ts b/src/workbench/extensions/manager/components/manager/button/PackEnableToggle.test.ts
index 80e8417f20..34e50fc563 100644
--- a/src/workbench/extensions/manager/components/manager/button/PackEnableToggle.test.ts
+++ b/src/workbench/extensions/manager/components/manager/button/PackEnableToggle.test.ts
@@ -1,6 +1,6 @@
 import type { VueWrapper } from '@vue/test-utils'
 import { mount } from '@vue/test-utils'
-import { createPinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
 import PrimeVue from 'primevue/config'
 import ToggleSwitch from 'primevue/toggleswitch'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
@@ -17,7 +17,7 @@ vi.mock('es-toolkit/compat', async () => {
   const actual = await vi.importActual('es-toolkit/compat')
   return {
     ...actual,
-    debounce: <T extends (...args: any[]) => any>(fn: T) => fn
+    debounce: <T extends (...args: unknown[]) => unknown>(fn: T) => fn
   }
 })
 
@@ -61,7 +61,10 @@ describe('PackEnableToggle', () => {
   const mountComponent = ({
     props = {},
     installedPacks = {}
-  }: Record<string, any> = {}): VueWrapper => {
+  }: {
+    props?: Record<string, unknown>
+    installedPacks?: Record<string, unknown>
+  } = {}): VueWrapper => {
     const i18n = createI18n({
       legacy: false,
       locale: 'en',
@@ -73,7 +76,9 @@ describe('PackEnableToggle', () => {
       enablePack: mockEnablePack,
       disablePack: mockDisablePack,
       installedPacks
-    } as any)
+    } as Partial<ReturnType<typeof useComfyManagerStore>> as ReturnType<
+      typeof useComfyManagerStore
+    >)
 
     return mount(PackEnableToggle, {
       props: {
@@ -81,7 +86,7 @@ describe('PackEnableToggle', () => {
         ...props
       },
       global: {
-        plugins: [PrimeVue, createPinia(), i18n]
+        plugins: [PrimeVue, createTestingPinia({ stubActions: false }), i18n]
       }
     })
   }
@@ -192,9 +197,9 @@ describe('PackEnableToggle', () => {
       const wrapper = mountComponent()
 
       // Check if warning icon exists
-      const warningIcon = wrapper.find('.pi-exclamation-triangle')
+      const warningIcon = wrapper.find('.icon-\\[lucide--triangle-alert\\]')
       expect(warningIcon.exists()).toBe(true)
-      expect(warningIcon.classes()).toContain('text-yellow-500')
+      expect(warningIcon.classes()).toContain('text-warning-background')
     })
 
     it('should not show warning icon when package has no conflicts', () => {
@@ -204,7 +209,7 @@ describe('PackEnableToggle', () => {
       const wrapper = mountComponent()
 
       // Check if warning icon does not exist
-      const warningIcon = wrapper.find('.pi-exclamation-triangle')
+      const warningIcon = wrapper.find('.icon-\\[lucide--triangle-alert\\]')
       expect(warningIcon.exists()).toBe(false)
     })
   })
diff --git a/src/workbench/extensions/manager/components/manager/button/PackEnableToggle.vue b/src/workbench/extensions/manager/components/manager/button/PackEnableToggle.vue
index 82805e6c27..100388b29a 100644
--- a/src/workbench/extensions/manager/components/manager/button/PackEnableToggle.vue
+++ b/src/workbench/extensions/manager/components/manager/button/PackEnableToggle.vue
@@ -6,10 +6,12 @@
         value: $t('manager.conflicts.warningTooltip'),
         showDelay: 300
       }"
-      class="flex h-6 w-6 cursor-pointer items-center justify-center"
+      class="flex size-6 cursor-pointer items-center justify-center"
       @click="showConflictModal(true)"
     >
-      <i class="pi pi-exclamation-triangle text-xl text-yellow-500"></i>
+      <i
+        class="icon-[lucide--triangle-alert] text-xl text-warning-background"
+      />
     </div>
     <ToggleSwitch
       v-if="!canToggleDirectly"
@@ -34,10 +36,11 @@ import ToggleSwitch from 'primevue/toggleswitch'
 import { computed, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
-import { useDialogService } from '@/services/dialogService'
 import type { components } from '@/types/comfyRegistryTypes'
 import { useConflictAcknowledgment } from '@/workbench/extensions/manager/composables/useConflictAcknowledgment'
+import { useImportFailedDetection } from '@/workbench/extensions/manager/composables/useImportFailedDetection'
 import { useComfyManagerStore } from '@/workbench/extensions/manager/stores/comfyManagerStore'
+import { useNodeConflictDialog } from '@/workbench/extensions/manager/composables/useNodeConflictDialog'
 import { useConflictDetectionStore } from '@/workbench/extensions/manager/stores/conflictDetectionStore'
 import type { components as ManagerComponents } from '@/workbench/extensions/manager/types/generatedManagerTypes'
 
@@ -51,8 +54,9 @@ const { t } = useI18n()
 const { isPackEnabled, enablePack, disablePack, installedPacks } =
   useComfyManagerStore()
 const { getConflictsForPackageByID } = useConflictDetectionStore()
-const { showNodeConflictDialog } = useDialogService()
+const { show: showNodeConflictDialog } = useNodeConflictDialog()
 const { acknowledgmentState, markConflictsAsSeen } = useConflictAcknowledgment()
+const { showImportFailedDialog } = useImportFailedDetection(nodePack.id || '')
 
 const isLoading = ref(false)
 
@@ -81,23 +85,36 @@ const canToggleDirectly = computed(() => {
 const showConflictModal = (skipModalDismissed: boolean) => {
   let modal_dismissed = acknowledgmentState.value.modal_dismissed
   if (skipModalDismissed) modal_dismissed = false
+
   if (packageConflict.value && !modal_dismissed) {
-    showNodeConflictDialog({
-      conflictedPackages: [packageConflict.value],
-      buttonText: !isEnabled.value
-        ? t('manager.conflicts.enableAnyway')
-        : t('manager.conflicts.understood'),
-      onButtonClick: async () => {
-        if (!isEnabled.value) {
-          await handleEnable()
+    // Check if there's an import failed conflict first
+    const hasImportFailed = packageConflict.value.conflicts.some(
+      (conflict) => conflict.type === 'import_failed'
+    )
+    if (hasImportFailed) {
+      // Show import failed dialog instead of general conflict dialog
+      showImportFailedDialog(() => {
+        markConflictsAsSeen()
+      })
+    } else {
+      // Show general conflict dialog for other types of conflicts
+      showNodeConflictDialog({
+        conflictedPackages: [packageConflict.value],
+        buttonText: !isEnabled.value
+          ? t('manager.conflicts.enableAnyway')
+          : t('manager.conflicts.understood'),
+        onButtonClick: async () => {
+          if (!isEnabled.value) {
+            await handleEnable()
+          }
+        },
+        dialogComponentProps: {
+          onClose: () => {
+            markConflictsAsSeen()
+          }
         }
-      },
-      dialogComponentProps: {
-        onClose: () => {
-          markConflictsAsSeen()
-        }
-      }
-    })
+      })
+    }
   }
 }
 
diff --git a/src/workbench/extensions/manager/components/manager/button/PackInstallButton.vue b/src/workbench/extensions/manager/components/manager/button/PackInstallButton.vue
index de49fd6e4a..620c71f133 100644
--- a/src/workbench/extensions/manager/components/manager/button/PackInstallButton.vue
+++ b/src/workbench/extensions/manager/components/manager/button/PackInstallButton.vue
@@ -1,19 +1,20 @@
 <template>
   <Button
-    variant="secondary"
+    variant="primary"
     :size
     :disabled="isLoading || isInstalling"
     @click="installAllPacks"
   >
     <i
       v-if="hasConflict && !isInstalling && !isLoading"
-      class="pi pi-exclamation-triangle text-yellow-500"
+      class="icon-[lucide--triangle-alert] text-warning-background"
     />
     <DotSpinner
       v-else-if="isLoading || isInstalling"
       duration="1s"
       :size="size === 'sm' ? 12 : 16"
     />
+    <i v-else class="icon-[lucide--download]" />
     <span>{{ computedLabel }}</span>
   </Button>
 </template>
@@ -25,22 +26,16 @@ import { useI18n } from 'vue-i18n'
 import DotSpinner from '@/components/common/DotSpinner.vue'
 import Button from '@/components/ui/button/Button.vue'
 import type { ButtonVariants } from '@/components/ui/button/button.variants'
-import { useDialogService } from '@/services/dialogService'
 import type { components } from '@/types/comfyRegistryTypes'
-import { useConflictDetection } from '@/workbench/extensions/manager/composables/useConflictDetection'
-import { useComfyManagerStore } from '@/workbench/extensions/manager/stores/comfyManagerStore'
-import type {
-  ConflictDetail,
-  ConflictDetectionResult
-} from '@/workbench/extensions/manager/types/conflictDetectionTypes'
-import type { components as ManagerComponents } from '@/workbench/extensions/manager/types/generatedManagerTypes'
+import type { ConflictDetail } from '@/workbench/extensions/manager/types/conflictDetectionTypes'
+import { usePackInstall } from '@/workbench/extensions/manager/composables/nodePack/usePackInstall'
 
 type NodePack = components['schemas']['Node']
 
 const {
   nodePacks,
   isLoading = false,
-  label = 'Install',
+  label,
   size = 'sm',
   hasConflict,
   conflictInfo
@@ -53,86 +48,13 @@ const {
   conflictInfo?: ConflictDetail[]
 }>()
 
-const managerStore = useComfyManagerStore()
-const { showNodeConflictDialog } = useDialogService()
 const { t } = useI18n()
 
-// Check if any of the packs are currently being installed
-const isInstalling = computed(() => {
-  if (!nodePacks?.length) return false
-  return nodePacks.some((pack) => managerStore.isPackInstalling(pack.id))
-})
-
-const createPayload = (installItem: NodePack) => {
-  if (!installItem.id) {
-    throw new Error('Node ID is required for installation')
-  }
-
-  const isUnclaimedPack = installItem.publisher?.name === 'Unclaimed'
-  const versionToInstall = isUnclaimedPack
-    ? ('nightly' as ManagerComponents['schemas']['SelectedVersion'])
-    : (installItem.latest_version?.version ??
-      ('latest' as ManagerComponents['schemas']['SelectedVersion']))
-
-  return {
-    id: installItem.id,
-    repository: installItem.repository ?? '',
-    channel: 'dev' as ManagerComponents['schemas']['ManagerChannel'],
-    mode: 'cache' as ManagerComponents['schemas']['ManagerDatabaseSource'],
-    selected_version: versionToInstall,
-    version: versionToInstall
-  }
-}
-
-const installPack = (item: NodePack) =>
-  managerStore.installPack.call(createPayload(item))
-
-const installAllPacks = async () => {
-  if (!nodePacks?.length) return
-
-  if (hasConflict && conflictInfo) {
-    // Check each package individually for conflicts
-    const { checkNodeCompatibility } = useConflictDetection()
-    const conflictedPackages: ConflictDetectionResult[] = nodePacks
-      .map((pack) => {
-        const compatibilityCheck = checkNodeCompatibility(pack)
-        return {
-          package_id: pack.id || '',
-          package_name: pack.name || '',
-          has_conflict: compatibilityCheck.hasConflict,
-          conflicts: compatibilityCheck.conflicts,
-          is_compatible: !compatibilityCheck.hasConflict
-        }
-      })
-      .filter((result) => result.has_conflict) // Only show packages with conflicts
-
-    showNodeConflictDialog({
-      conflictedPackages,
-      buttonText: t('manager.conflicts.installAnyway'),
-      onButtonClick: async () => {
-        // Proceed with installation of uninstalled packages
-        const uninstalledPacks = nodePacks.filter(
-          (pack) => !managerStore.isPackInstalled(pack.id)
-        )
-        if (!uninstalledPacks.length) return
-        await performInstallation(uninstalledPacks)
-      }
-    })
-    return
-  }
-
-  // No conflicts or conflicts acknowledged - proceed with installation
-  const uninstalledPacks = nodePacks.filter(
-    (pack) => !managerStore.isPackInstalled(pack.id)
-  )
-  if (!uninstalledPacks.length) return
-  await performInstallation(uninstalledPacks)
-}
-
-const performInstallation = async (packs: NodePack[]) => {
-  await Promise.all(packs.map(installPack))
-  managerStore.installPack.clear()
-}
+const { isInstalling, installAllPacks } = usePackInstall(
+  () => nodePacks,
+  () => hasConflict,
+  () => conflictInfo
+)
 
 const computedLabel = computed(() =>
   isInstalling.value
diff --git a/src/workbench/extensions/manager/components/manager/button/PackTryUpdateButton.vue b/src/workbench/extensions/manager/components/manager/button/PackTryUpdateButton.vue
index 218aaf35ff..2012595602 100644
--- a/src/workbench/extensions/manager/components/manager/button/PackTryUpdateButton.vue
+++ b/src/workbench/extensions/manager/components/manager/button/PackTryUpdateButton.vue
@@ -1,7 +1,7 @@
 <template>
   <Button
     v-tooltip.top="$t('manager.tryUpdateTooltip')"
-    variant="textonly"
+    variant="primary"
     :size
     :disabled="isUpdating"
     @click="tryUpdate"
@@ -11,6 +11,7 @@
       duration="1s"
       :size="size === 'sm' ? 12 : 16"
     />
+    <i v-else class="icon-[lucide--refresh-cw]" />
     <span>{{ isUpdating ? t('g.updating') : t('manager.tryUpdate') }}</span>
   </Button>
 </template>
diff --git a/src/workbench/extensions/manager/components/manager/button/PackUninstallButton.vue b/src/workbench/extensions/manager/components/manager/button/PackUninstallButton.vue
index 7ff3e42aa0..cac261f917 100644
--- a/src/workbench/extensions/manager/components/manager/button/PackUninstallButton.vue
+++ b/src/workbench/extensions/manager/components/manager/button/PackUninstallButton.vue
@@ -1,10 +1,6 @@
 <template>
-  <Button
-    variant="textonly"
-    :size
-    class="border border-red-500"
-    @click="uninstallItems"
-  >
+  <Button variant="destructive" :size @click="uninstallItems">
+    <i class="icon-[lucide--trash-2]" />
     {{
       nodePacks.length > 1
         ? t('manager.uninstallSelected')
diff --git a/src/workbench/extensions/manager/components/manager/button/PackUpdateButton.vue b/src/workbench/extensions/manager/components/manager/button/PackUpdateButton.vue
index 8057cc3c6f..05f7bc59c4 100644
--- a/src/workbench/extensions/manager/components/manager/button/PackUpdateButton.vue
+++ b/src/workbench/extensions/manager/components/manager/button/PackUpdateButton.vue
@@ -3,14 +3,16 @@
     v-tooltip.top="
       hasDisabledUpdatePacks ? $t('manager.disabledNodesWontUpdate') : null
     "
-    variant="textonly"
-    class="border"
-    size="sm"
+    variant="primary"
+    :size
     :disabled="isUpdating"
     @click="updateAllPacks"
   >
     <DotSpinner v-if="isUpdating" duration="1s" :size="12" />
-    <span>{{ $t('manager.updateAll') }}</span>
+    <i v-else class="icon-[lucide--refresh-cw]" />
+    <span>{{
+      nodePacks.length > 1 ? $t('manager.updateAll') : $t('manager.update')
+    }}</span>
   </Button>
 </template>
 
@@ -19,14 +21,20 @@ import { ref } from 'vue'
 
 import DotSpinner from '@/components/common/DotSpinner.vue'
 import Button from '@/components/ui/button/Button.vue'
+import type { ButtonVariants } from '@/components/ui/button/button.variants'
 import type { components } from '@/types/comfyRegistryTypes'
 import { useComfyManagerStore } from '@/workbench/extensions/manager/stores/comfyManagerStore'
 
 type NodePack = components['schemas']['Node']
 
-const { nodePacks, hasDisabledUpdatePacks } = defineProps<{
+const {
+  nodePacks,
+  hasDisabledUpdatePacks,
+  size = 'sm'
+} = defineProps<{
   nodePacks: NodePack[]
   hasDisabledUpdatePacks?: boolean
+  size?: ButtonVariants['size']
 }>()
 
 const isUpdating = ref<boolean>(false)
diff --git a/src/workbench/extensions/manager/components/manager/infoPanel/InfoPanel.vue b/src/workbench/extensions/manager/components/manager/infoPanel/InfoPanel.vue
index 9f25902cd2..edd4ab7861 100644
--- a/src/workbench/extensions/manager/components/manager/infoPanel/InfoPanel.vue
+++ b/src/workbench/extensions/manager/components/manager/infoPanel/InfoPanel.vue
@@ -1,62 +1,110 @@
 <template>
   <template v-if="nodePack">
-    <div class="relative z-40 flex h-full flex-col overflow-hidden">
-      <div class="top-0 z-10 w-full px-6 pt-6">
-        <InfoPanelHeader
-          :node-packs="[nodePack]"
-          :has-conflict="hasCompatibilityIssues"
-        >
-          <template v-if="canTryNightlyUpdate" #install-button>
-            <div class="flex w-full justify-center gap-2">
-              <PackTryUpdateButton :node-pack="nodePack" size="md" />
-              <PackUninstallButton :node-packs="[nodePack]" size="md" />
-            </div>
+    <div
+      ref="scrollContainer"
+      class="flex scrollbar-custom h-full flex-col overflow-y-auto"
+    >
+      <PropertiesAccordionItem v-if="!importFailed" :class="accordionClass">
+        <template #label>
+          <span class="font-inter text-xs uppercase">
+            {{ t('manager.actions') }}
+          </span>
+        </template>
+        <div class="flex flex-col gap-1 px-4">
+          <template v-if="canTryNightlyUpdate">
+            <PackTryUpdateButton :node-pack="nodePack" size="md" />
+            <PackUninstallButton :node-packs="[nodePack]" size="md" />
           </template>
-        </InfoPanelHeader>
-      </div>
-      <div
-        ref="scrollContainer"
-        class="scrollbar-hide flex-1 overflow-y-auto p-6 pt-2 text-sm"
-      >
-        <div class="mb-6">
-          <MetadataRow
-            v-if="!importFailed && isPackInstalled(nodePack.id)"
-            :label="t('manager.filter.enabled')"
-            class="flex"
-            style="align-items: center"
-          >
-            <PackEnableToggle
-              :node-pack="nodePack"
-              :has-conflict="hasCompatibilityIssues"
+          <template v-else-if="isUpdateAvailable">
+            <PackUpdateButton :node-packs="[nodePack]" size="md" />
+            <PackUninstallButton :node-packs="[nodePack]" size="md" />
+          </template>
+          <template v-else-if="isAllInstalled">
+            <PackUninstallButton :node-packs="[nodePack]" size="md" />
+          </template>
+          <template v-else>
+            <PackInstallButton
+              :node-packs="[nodePack]"
+              size="md"
+              :has-conflict="hasCompatibilityIssues || hasConflictInfo"
+              :conflict-info="conflictInfo"
             />
-          </MetadataRow>
-          <MetadataRow
-            v-for="item in infoItems"
-            v-show="item.value !== undefined && item.value !== null"
-            :key="item.key"
-            :label="item.label"
-            :value="item.value"
-          />
-          <MetadataRow :label="t('g.status')">
-            <PackStatusMessage
-              :status-type="
-                nodePack.status as components['schemas']['NodeVersionStatus']
-              "
-              :has-compatibility-issues="hasCompatibilityIssues"
-            />
-          </MetadataRow>
-          <MetadataRow :label="t('manager.version')">
-            <PackVersionBadge :node-pack="nodePack" :is-selected="true" />
-          </MetadataRow>
+          </template>
         </div>
-        <div class="mb-6 overflow-hidden">
-          <InfoTabs
+      </PropertiesAccordionItem>
+
+      <PropertiesAccordionItem :class="accordionClass">
+        <template #label>
+          <span class="font-inter text-xs uppercase">
+            {{ t('manager.basicInfo') }}
+          </span>
+        </template>
+        <ModelInfoField :label="t('g.name')">
+          <span class="text-muted-foreground">{{ nodePack.name }}</span>
+        </ModelInfoField>
+        <ModelInfoField
+          v-if="!importFailed && isPackInstalled(nodePack.id)"
+          :label="t('manager.filter.enabled')"
+        >
+          <PackEnableToggle
             :node-pack="nodePack"
-            :has-compatibility-issues="hasCompatibilityIssues"
-            :conflict-result="conflictResult"
+            :has-conflict="hasCompatibilityIssues"
           />
+        </ModelInfoField>
+        <ModelInfoField
+          v-for="item in infoItems"
+          v-show="item.value !== undefined && item.value !== null"
+          :key="item.key"
+          :label="item.label"
+        >
+          <span class="text-muted-foreground">{{ item.value }}</span>
+        </ModelInfoField>
+        <ModelInfoField :label="t('g.status')">
+          <PackStatusMessage
+            :status-type="
+              nodePack.status as components['schemas']['NodeVersionStatus']
+            "
+            :has-compatibility-issues="hasCompatibilityIssues"
+          />
+        </ModelInfoField>
+        <ModelInfoField :label="t('manager.version')">
+          <PackVersionBadge :node-pack="nodePack" :is-selected="true" />
+        </ModelInfoField>
+      </PropertiesAccordionItem>
+
+      <PropertiesAccordionItem :class="accordionClass">
+        <template #label>
+          <span class="font-inter text-xs uppercase">
+            {{ t('g.description') }}
+          </span>
+        </template>
+        <DescriptionTabPanel :node-pack="nodePack" />
+      </PropertiesAccordionItem>
+
+      <PropertiesAccordionItem
+        v-if="hasCompatibilityIssues"
+        :class="accordionClass"
+      >
+        <template #label>
+          <span class="font-inter text-xs uppercase">
+            ⚠️ {{ importFailed ? t('g.error') : t('g.warning') }}
+          </span>
+        </template>
+        <div class="px-4 py-2">
+          <WarningTabPanel :conflict-result="conflictResult" />
         </div>
-      </div>
+      </PropertiesAccordionItem>
+
+      <PropertiesAccordionItem :class="accordionClass">
+        <template #label>
+          <span class="font-inter text-xs uppercase">
+            {{ t('g.nodes') }}
+          </span>
+        </template>
+        <div class="px-4 py-2">
+          <NodesTabPanel :node-pack="nodePack" :node-names="nodeNames" />
+        </div>
+      </PropertiesAccordionItem>
     </div>
   </template>
   <template v-else>
@@ -67,26 +115,34 @@
 </template>
 
 <script setup lang="ts">
-import { useScroll, whenever } from '@vueuse/core'
+import { whenever } from '@vueuse/core'
 import { computed, provide, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
+import PropertiesAccordionItem from '@/components/rightSidePanel/layout/PropertiesAccordionItem.vue'
+import ModelInfoField from '@/platform/assets/components/modelInfo/ModelInfoField.vue'
 import type { components } from '@/types/comfyRegistryTypes'
+import { cn } from '@/utils/tailwindUtil'
 import PackStatusMessage from '@/workbench/extensions/manager/components/manager/PackStatusMessage.vue'
 import PackVersionBadge from '@/workbench/extensions/manager/components/manager/PackVersionBadge.vue'
 import PackEnableToggle from '@/workbench/extensions/manager/components/manager/button/PackEnableToggle.vue'
+import PackInstallButton from '@/workbench/extensions/manager/components/manager/button/PackInstallButton.vue'
 import PackTryUpdateButton from '@/workbench/extensions/manager/components/manager/button/PackTryUpdateButton.vue'
 import PackUninstallButton from '@/workbench/extensions/manager/components/manager/button/PackUninstallButton.vue'
-import InfoPanelHeader from '@/workbench/extensions/manager/components/manager/infoPanel/InfoPanelHeader.vue'
-import InfoTabs from '@/workbench/extensions/manager/components/manager/infoPanel/InfoTabs.vue'
-import MetadataRow from '@/workbench/extensions/manager/components/manager/infoPanel/MetadataRow.vue'
+import PackUpdateButton from '@/workbench/extensions/manager/components/manager/button/PackUpdateButton.vue'
+import DescriptionTabPanel from '@/workbench/extensions/manager/components/manager/infoPanel/tabs/DescriptionTabPanel.vue'
+import NodesTabPanel from '@/workbench/extensions/manager/components/manager/infoPanel/tabs/NodesTabPanel.vue'
+import WarningTabPanel from '@/workbench/extensions/manager/components/manager/infoPanel/tabs/WarningTabPanel.vue'
 import { usePackUpdateStatus } from '@/workbench/extensions/manager/composables/nodePack/usePackUpdateStatus'
 import { useConflictDetection } from '@/workbench/extensions/manager/composables/useConflictDetection'
 import { useImportFailedDetection } from '@/workbench/extensions/manager/composables/useImportFailedDetection'
 import { useComfyManagerStore } from '@/workbench/extensions/manager/stores/comfyManagerStore'
 import { useConflictDetectionStore } from '@/workbench/extensions/manager/stores/conflictDetectionStore'
 import { IsInstallingKey } from '@/workbench/extensions/manager/types/comfyManagerTypes'
-import type { ConflictDetectionResult } from '@/workbench/extensions/manager/types/conflictDetectionTypes'
+import type {
+  ConflictDetail,
+  ConflictDetectionResult
+} from '@/workbench/extensions/manager/types/conflictDetectionTypes'
 import { ImportFailedKey } from '@/workbench/extensions/manager/types/importFailedTypes'
 
 interface InfoItem {
@@ -101,7 +157,12 @@ const { nodePack } = defineProps<{
 
 const scrollContainer = ref<HTMLElement | null>(null)
 
-const { isPackInstalled } = useComfyManagerStore()
+const accordionClass = cn(
+  'border-t border-border-default bg-modal-panel-background'
+)
+
+const managerStore = useComfyManagerStore()
+const { isPackInstalled } = managerStore
 const isInstalled = computed(() => isPackInstalled(nodePack.id))
 const isInstalling = ref(false)
 provide(IsInstallingKey, isInstalling)
@@ -109,9 +170,20 @@ whenever(isInstalled, () => {
   isInstalling.value = false
 })
 
-const { canTryNightlyUpdate } = usePackUpdateStatus(() => nodePack)
+const { canTryNightlyUpdate, isUpdateAvailable } = usePackUpdateStatus(
+  () => nodePack
+)
+
+const isAllInstalled = computed(() => isPackInstalled(nodePack.id))
 
 const { checkNodeCompatibility } = useConflictDetection()
+
+const conflictInfo = computed<ConflictDetail[]>(() => {
+  const compatibility = checkNodeCompatibility(nodePack)
+  return compatibility.conflicts ?? []
+})
+
+const hasConflictInfo = computed(() => conflictInfo.value.length > 0)
 const { getConflictsForPackageByID } = useConflictDetectionStore()
 
 const { t, d, n } = useI18n()
@@ -152,6 +224,12 @@ provide(ImportFailedKey, {
   showImportFailedDialog
 })
 
+const nodeNames = computed(() => {
+  // @ts-expect-error comfy_nodes is an Algolia-specific field
+  const { comfy_nodes } = nodePack
+  return comfy_nodes ?? []
+})
+
 const infoItems = computed<InfoItem[]>(() => [
   {
     key: 'publisher',
@@ -174,20 +252,11 @@ const infoItems = computed<InfoItem[]>(() => [
   }
 ])
 
-const { y } = useScroll(scrollContainer, {
-  eventListenerOptions: {
-    passive: true
-  }
-})
-const onNodePackChange = () => {
-  y.value = 0
-}
-
 whenever(
   () => nodePack.id,
   (nodePackId, oldNodePackId) => {
-    if (nodePackId !== oldNodePackId) {
-      onNodePackChange()
+    if (nodePackId !== oldNodePackId && scrollContainer.value) {
+      scrollContainer.value.scrollTop = 0
     }
   },
   { immediate: true }
diff --git a/src/workbench/extensions/manager/components/manager/infoPanel/InfoPanelHeader.vue b/src/workbench/extensions/manager/components/manager/infoPanel/InfoPanelHeader.vue
deleted file mode 100644
index c1be524e9c..0000000000
--- a/src/workbench/extensions/manager/components/manager/infoPanel/InfoPanelHeader.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-<template>
-  <div v-if="nodePacks?.length" class="flex flex-col items-center">
-    <slot name="thumbnail">
-      <PackIcon :node-pack="nodePacks[0]" width="204" height="106" />
-    </slot>
-    <h2
-      class="mt-4 mb-2 text-center text-2xl font-bold"
-      style="word-break: break-all"
-    >
-      <slot name="title">
-        <span class="inline-block text-base">{{ nodePacks[0].name }}</span>
-      </slot>
-    </h2>
-    <div
-      v-if="!importFailed"
-      class="mt-2 mb-4 flex w-full max-w-xs justify-center"
-    >
-      <slot name="install-button">
-        <PackUninstallButton
-          v-if="isAllInstalled"
-          v-bind="$attrs"
-          size="md"
-          :node-packs="nodePacks"
-        />
-        <PackInstallButton
-          v-else
-          v-bind="$attrs"
-          size="md"
-          :node-packs="nodePacks"
-          :has-conflict="hasConflict || computedHasConflict"
-          :conflict-info="conflictInfo"
-        />
-      </slot>
-    </div>
-  </div>
-  <div v-else class="flex flex-col items-center">
-    <NoResultsPlaceholder
-      :message="$t('manager.status.unknown')"
-      :title="$t('manager.tryAgainLater')"
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed, inject, ref, watch } from 'vue'
-
-import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
-import type { components } from '@/types/comfyRegistryTypes'
-import PackInstallButton from '@/workbench/extensions/manager/components/manager/button/PackInstallButton.vue'
-import PackUninstallButton from '@/workbench/extensions/manager/components/manager/button/PackUninstallButton.vue'
-import PackIcon from '@/workbench/extensions/manager/components/manager/packIcon/PackIcon.vue'
-import { useConflictDetection } from '@/workbench/extensions/manager/composables/useConflictDetection'
-import { useComfyManagerStore } from '@/workbench/extensions/manager/stores/comfyManagerStore'
-import type { ConflictDetail } from '@/workbench/extensions/manager/types/conflictDetectionTypes'
-import { ImportFailedKey } from '@/workbench/extensions/manager/types/importFailedTypes'
-
-const { nodePacks, hasConflict } = defineProps<{
-  nodePacks: components['schemas']['Node'][]
-  hasConflict?: boolean
-}>()
-
-const managerStore = useComfyManagerStore()
-
-// Inject import failed context from parent
-const importFailedContext = inject(ImportFailedKey)
-const importFailed = importFailedContext?.importFailed
-
-const isAllInstalled = ref(false)
-watch(
-  [() => nodePacks, () => managerStore.installedPacks],
-  () => {
-    isAllInstalled.value = nodePacks.every((nodePack) =>
-      managerStore.isPackInstalled(nodePack.id)
-    )
-  },
-  { immediate: true }
-)
-
-// Add conflict detection for install button dialog
-const { checkNodeCompatibility } = useConflictDetection()
-
-// Compute conflict info for all node packs
-const conflictInfo = computed<ConflictDetail[]>(() => {
-  if (!nodePacks?.length) return []
-
-  const allConflicts: ConflictDetail[] = []
-  for (const nodePack of nodePacks) {
-    const compatibilityCheck = checkNodeCompatibility(nodePack)
-    if (compatibilityCheck.conflicts) {
-      allConflicts.push(...compatibilityCheck.conflicts)
-    }
-  }
-  return allConflicts
-})
-
-const computedHasConflict = computed(() => conflictInfo.value.length > 0)
-</script>
diff --git a/src/workbench/extensions/manager/components/manager/infoPanel/InfoPanelMultiItem.vue b/src/workbench/extensions/manager/components/manager/infoPanel/InfoPanelMultiItem.vue
index 6e292dcf61..dd1faf0f78 100644
--- a/src/workbench/extensions/manager/components/manager/infoPanel/InfoPanelMultiItem.vue
+++ b/src/workbench/extensions/manager/components/manager/infoPanel/InfoPanelMultiItem.vue
@@ -1,64 +1,67 @@
 <template>
-  <div v-if="nodePacks?.length" class="flex h-full flex-col">
-    <div class="flex-1 overflow-auto p-6">
-      <InfoPanelHeader :node-packs>
-        <template #thumbnail>
-          <PackIconStacked :node-packs="nodePacks" />
-        </template>
-        <template #title>
-          <div class="mt-5">
-            <span class="mr-2 inline-block text-base text-blue-500">{{
-              nodePacks.length
-            }}</span>
-            <span class="text-base">{{ $t('manager.packsSelected') }}</span>
-          </div>
-        </template>
-        <template #install-button>
-          <!-- Mixed: Don't show any button -->
-          <div v-if="isMixed" class="text-sm text-neutral-500">
-            {{ $t('manager.mixedSelectionMessage') }}
-          </div>
-          <!-- All installed: Show update (if nightly) and uninstall buttons -->
-          <div
-            v-else-if="isAllInstalled"
-            class="flex w-full justify-center gap-2"
-          >
-            <Button
-              v-if="hasNightlyPacks"
-              v-tooltip.top="$t('manager.tryUpdateTooltip')"
-              variant="textonly"
-              size="md"
-              :disabled="isUpdatingSelected"
-              @click="updateSelectedNightlyPacks"
-            >
-              <DotSpinner v-if="isUpdatingSelected" duration="1s" :size="16" />
-              <span>{{ updateSelectedLabel }}</span>
-            </Button>
-            <PackUninstallButton size="md" :node-packs="installedPacks" />
-          </div>
-          <!-- None installed: Show install button -->
-          <PackInstallButton
-            v-else-if="isNoneInstalled"
+  <div
+    v-if="nodePacks?.length"
+    class="flex scrollbar-custom h-full flex-col overflow-y-auto"
+  >
+    <PropertiesAccordionItem :class="accordionClass">
+      <template #label>
+        <span class="font-inter text-xs uppercase">
+          {{ t('manager.actions') }}
+        </span>
+      </template>
+      <div class="flex flex-col gap-1 px-4">
+        <!-- Mixed: Don't show any button -->
+        <div v-if="isMixed" class="text-sm text-neutral-500">
+          {{ $t('manager.mixedSelectionMessage') }}
+        </div>
+        <!-- All installed: Show update (if nightly) and uninstall buttons -->
+        <template v-else-if="isAllInstalled">
+          <Button
+            v-if="hasNightlyPacks"
+            v-tooltip.top="$t('manager.tryUpdateTooltip')"
+            variant="textonly"
             size="md"
-            :node-packs="notInstalledPacks"
-            :has-conflict="hasConflicts"
-            :conflict-info="conflictInfo"
-          />
+            :disabled="isUpdatingSelected"
+            @click="updateSelectedNightlyPacks"
+          >
+            <DotSpinner v-if="isUpdatingSelected" duration="1s" :size="16" />
+            <span>{{ updateSelectedLabel }}</span>
+          </Button>
+          <PackUninstallButton size="md" :node-packs="installedPacks" />
         </template>
-      </InfoPanelHeader>
-      <div class="mb-6">
-        <MetadataRow :label="$t('g.status')">
-          <PackStatusMessage
-            :status-type="overallStatus"
-            :has-compatibility-issues="hasConflicts"
-          />
-        </MetadataRow>
-        <MetadataRow
-          :label="$t('manager.totalNodes')"
-          :value="totalNodesCount"
+        <!-- None installed: Show install button -->
+        <PackInstallButton
+          v-else-if="isNoneInstalled"
+          size="md"
+          :node-packs="notInstalledPacks"
+          :has-conflict="hasConflicts"
+          :conflict-info="conflictInfo"
         />
       </div>
-    </div>
+    </PropertiesAccordionItem>
+
+    <PropertiesAccordionItem :class="accordionClass">
+      <template #label>
+        <span class="font-inter text-xs uppercase">
+          {{ t('manager.basicInfo') }}
+        </span>
+      </template>
+      <ModelInfoField :label="t('manager.selected')">
+        <span>
+          <span class="font-bold text-blue-500">{{ nodePacks.length }}</span>
+          {{ t('manager.packsSelected') }}
+        </span>
+      </ModelInfoField>
+      <ModelInfoField :label="t('g.status')">
+        <PackStatusMessage
+          :status-type="overallStatus"
+          :has-compatibility-issues="hasConflicts"
+        />
+      </ModelInfoField>
+      <ModelInfoField :label="t('manager.totalNodes')">
+        <span class="text-muted-foreground">{{ totalNodesCount }}</span>
+      </ModelInfoField>
+    </PropertiesAccordionItem>
   </div>
   <div v-else class="mx-8 mt-4 flex-1 overflow-hidden text-sm">
     {{ $t('manager.infoPanelEmpty') }}
@@ -71,15 +74,15 @@ import { computed, onUnmounted, provide, ref, toRef } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import DotSpinner from '@/components/common/DotSpinner.vue'
+import PropertiesAccordionItem from '@/components/rightSidePanel/layout/PropertiesAccordionItem.vue'
 import Button from '@/components/ui/button/Button.vue'
+import ModelInfoField from '@/platform/assets/components/modelInfo/ModelInfoField.vue'
 import { useComfyRegistryStore } from '@/stores/comfyRegistryStore'
 import type { components } from '@/types/comfyRegistryTypes'
+import { cn } from '@/utils/tailwindUtil'
 import PackStatusMessage from '@/workbench/extensions/manager/components/manager/PackStatusMessage.vue'
 import PackInstallButton from '@/workbench/extensions/manager/components/manager/button/PackInstallButton.vue'
 import PackUninstallButton from '@/workbench/extensions/manager/components/manager/button/PackUninstallButton.vue'
-import InfoPanelHeader from '@/workbench/extensions/manager/components/manager/infoPanel/InfoPanelHeader.vue'
-import MetadataRow from '@/workbench/extensions/manager/components/manager/infoPanel/MetadataRow.vue'
-import PackIconStacked from '@/workbench/extensions/manager/components/manager/packIcon/PackIconStacked.vue'
 import { usePacksSelection } from '@/workbench/extensions/manager/composables/nodePack/usePacksSelection'
 import { usePacksStatus } from '@/workbench/extensions/manager/composables/nodePack/usePacksStatus'
 import { useConflictDetection } from '@/workbench/extensions/manager/composables/useConflictDetection'
@@ -92,6 +95,11 @@ const { nodePacks } = defineProps<{
 }>()
 
 const { t } = useI18n()
+
+const accordionClass = cn(
+  'border-t border-border-default bg-modal-panel-background'
+)
+
 const managerStore = useComfyManagerStore()
 const nodePacksRef = toRef(() => nodePacks)
 
diff --git a/src/workbench/extensions/manager/components/manager/infoPanel/InfoTabs.vue b/src/workbench/extensions/manager/components/manager/infoPanel/InfoTabs.vue
deleted file mode 100644
index 29ae4f986d..0000000000
--- a/src/workbench/extensions/manager/components/manager/infoPanel/InfoTabs.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-<template>
-  <div class="overflow-hidden">
-    <Tabs :value="activeTab">
-      <TabList class="scrollbar-hide overflow-x-auto">
-        <Tab
-          v-if="hasCompatibilityIssues"
-          value="warning"
-          class="mr-6 p-2 font-inter"
-        >
-          <div class="flex items-center gap-1">
-            <span>⚠️</span>
-            {{ importFailed ? $t('g.error') : $t('g.warning') }}
-          </div>
-        </Tab>
-        <Tab value="description" class="mr-6 p-2 font-inter">
-          {{ $t('g.description') }}
-        </Tab>
-        <Tab value="nodes" class="p-2 font-inter">
-          {{ $t('g.nodes') }}
-        </Tab>
-      </TabList>
-      <TabPanels class="overflow-auto px-2 py-4">
-        <TabPanel
-          v-if="hasCompatibilityIssues"
-          value="warning"
-          class="bg-transparent"
-        >
-          <WarningTabPanel
-            :node-pack="nodePack"
-            :conflict-result="conflictResult"
-          />
-        </TabPanel>
-        <TabPanel value="description">
-          <DescriptionTabPanel :node-pack="nodePack" />
-        </TabPanel>
-        <TabPanel value="nodes">
-          <NodesTabPanel :node-pack="nodePack" :node-names="nodeNames" />
-        </TabPanel>
-      </TabPanels>
-    </Tabs>
-  </div>
-</template>
-
-<script setup lang="ts">
-import Tab from 'primevue/tab'
-import TabList from 'primevue/tablist'
-import TabPanel from 'primevue/tabpanel'
-import TabPanels from 'primevue/tabpanels'
-import Tabs from 'primevue/tabs'
-import { computed, inject, ref, watchEffect } from 'vue'
-
-import type { components } from '@/types/comfyRegistryTypes'
-import DescriptionTabPanel from '@/workbench/extensions/manager/components/manager/infoPanel/tabs/DescriptionTabPanel.vue'
-import NodesTabPanel from '@/workbench/extensions/manager/components/manager/infoPanel/tabs/NodesTabPanel.vue'
-import WarningTabPanel from '@/workbench/extensions/manager/components/manager/infoPanel/tabs/WarningTabPanel.vue'
-import type { ConflictDetectionResult } from '@/workbench/extensions/manager/types/conflictDetectionTypes'
-import { ImportFailedKey } from '@/workbench/extensions/manager/types/importFailedTypes'
-
-const { nodePack, hasCompatibilityIssues, conflictResult } = defineProps<{
-  nodePack: components['schemas']['Node']
-  hasCompatibilityIssues?: boolean
-  conflictResult?: ConflictDetectionResult | null
-}>()
-
-// Inject import failed context from parent
-const importFailedContext = inject(ImportFailedKey)
-const importFailed = importFailedContext?.importFailed
-
-const nodeNames = computed(() => {
-  // @ts-expect-error comfy_nodes is an Algolia-specific field
-  const { comfy_nodes } = nodePack
-  return comfy_nodes ?? []
-})
-
-const activeTab = ref('description')
-
-// Watch for compatibility issues and automatically switch to warning tab
-watchEffect(
-  () => {
-    if (hasCompatibilityIssues) {
-      activeTab.value = 'warning'
-    } else if (activeTab.value === 'warning') {
-      // If currently on warning tab but no issues, switch to description
-      activeTab.value = 'description'
-    }
-  },
-  { flush: 'post' }
-)
-</script>
diff --git a/src/workbench/extensions/manager/components/manager/infoPanel/InfoTextSection.vue b/src/workbench/extensions/manager/components/manager/infoPanel/InfoTextSection.vue
deleted file mode 100644
index 3307a140e1..0000000000
--- a/src/workbench/extensions/manager/components/manager/infoPanel/InfoTextSection.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-  <div class="flex flex-col gap-4 text-sm">
-    <div v-for="(section, index) in sections" :key="index" class="mb-4">
-      <div class="mb-3">
-        {{ section.title }}
-      </div>
-      <div class="break-words text-muted">
-        <a
-          v-if="section.isUrl"
-          :href="section.text"
-          target="_blank"
-          rel="noopener noreferrer"
-          class="flex items-center gap-2"
-        >
-          <i v-if="isGitHubLink(section.text)" class="pi pi-github text-base" />
-          <span class="break-all">{{ section.text }}</span>
-        </a>
-        <MarkdownText v-else :text="section.text" class="text-muted" />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import MarkdownText from '@/workbench/extensions/manager/components/manager/infoPanel/MarkdownText.vue'
-
-export interface TextSection {
-  title: string
-  text: string
-  isUrl?: boolean
-}
-
-defineProps<{
-  sections: TextSection[]
-}>()
-
-const isGitHubLink = (url: string): boolean => url.includes('github.com')
-</script>
diff --git a/src/workbench/extensions/manager/components/manager/infoPanel/MarkdownText.vue b/src/workbench/extensions/manager/components/manager/infoPanel/MarkdownText.vue
index 53377f3a6d..1b85b1c9fe 100644
--- a/src/workbench/extensions/manager/components/manager/infoPanel/MarkdownText.vue
+++ b/src/workbench/extensions/manager/components/manager/infoPanel/MarkdownText.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <div v-if="!hasMarkdown" class="break-words" v-text="text" />
-    <div v-else class="break-words">
+    <div v-if="!hasMarkdown" class="wrap-break-word" v-text="text" />
+    <div v-else class="wrap-break-word">
       <template v-for="(segment, index) in parsedSegments" :key="index">
         <a
           v-if="segment.type === 'link' && 'url' in segment"
@@ -16,7 +16,7 @@
         <em v-else-if="segment.type === 'italic'">{{ segment.text }}</em>
         <code
           v-else-if="segment.type === 'code'"
-          class="rounded px-1 py-0.5 text-xs"
+          class="rounded-sm px-1 py-0.5 text-xs"
           >{{ segment.text }}</code
         >
         <span v-else>{{ segment.text }}</span>
diff --git a/src/workbench/extensions/manager/components/manager/infoPanel/MetadataRow.vue b/src/workbench/extensions/manager/components/manager/infoPanel/MetadataRow.vue
deleted file mode 100644
index 56436b9f0c..0000000000
--- a/src/workbench/extensions/manager/components/manager/infoPanel/MetadataRow.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<template>
-  <div class="flex py-1.5 text-xs">
-    <div class="w-1/3 truncate pr-2 text-muted">{{ label }}</div>
-    <div class="w-2/3">
-      <slot>{{ value }}</slot>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-const { value = 'N/A', label } = defineProps<{
-  label: string
-  value?: string | number
-}>()
-</script>
diff --git a/src/workbench/extensions/manager/components/manager/infoPanel/tabs/DescriptionTabPanel.test.ts b/src/workbench/extensions/manager/components/manager/infoPanel/tabs/DescriptionTabPanel.test.ts
index 93e6d0ee80..07b2a36ae0 100644
--- a/src/workbench/extensions/manager/components/manager/infoPanel/tabs/DescriptionTabPanel.test.ts
+++ b/src/workbench/extensions/manager/components/manager/infoPanel/tabs/DescriptionTabPanel.test.ts
@@ -15,13 +15,6 @@ const i18n = createI18n({
   }
 })
 
-const TRANSLATIONS = {
-  description: 'Description',
-  repository: 'Repository',
-  license: 'License',
-  noDescription: 'No description available'
-}
-
 describe('DescriptionTabPanel', () => {
   const mountComponent = (props: {
     nodePack: Partial<components['schemas']['Node']>
@@ -34,16 +27,6 @@ describe('DescriptionTabPanel', () => {
     })
   }
 
-  const getSectionByTitle = (
-    wrapper: ReturnType<typeof mountComponent>,
-    title: string
-  ) => {
-    const sections = wrapper
-      .findComponent({ name: 'InfoTextSection' })
-      .props('sections')
-    return sections.find((s: any) => s.title === title)
-  }
-
   const createNodePack = (
     overrides: Partial<components['schemas']['Node']> = {}
   ) => ({
@@ -134,37 +117,36 @@ describe('DescriptionTabPanel', () => {
     licenseTests.forEach((test) => {
       it(test.name, () => {
         const wrapper = mountComponent({ nodePack: test.nodePack })
-        const licenseSection = getSectionByTitle(wrapper, TRANSLATIONS.license)
-        expect(licenseSection).toBeDefined()
-        expect(licenseSection.text).toBe(test.expected.text)
-        expect(licenseSection.isUrl).toBe(test.expected.isUrl)
+        if (test.expected.isUrl) {
+          const link = wrapper
+            .findAll('a')
+            .find((a) => a.text().includes(test.expected.text))
+          expect(link).toBeDefined()
+          expect(link!.attributes('href')).toBe(test.expected.text)
+        } else {
+          expect(wrapper.text()).toContain(test.expected.text)
+        }
       })
     })
   })
 
   describe('description sections', () => {
-    it('shows description section', () => {
+    it('shows description text', () => {
       const wrapper = mountComponent({
         nodePack: createNodePack()
       })
-      const descriptionSection = getSectionByTitle(
-        wrapper,
-        TRANSLATIONS.description
-      )
-      expect(descriptionSection).toBeDefined()
-      expect(descriptionSection.text).toBe('Test description')
+      expect(wrapper.text()).toContain('Test description')
     })
 
-    it('shows repository section when available', () => {
+    it('shows repository link when available', () => {
       const wrapper = mountComponent({
         nodePack: createNodePack({
           repository: 'https://github.com/user/repo'
         })
       })
-      const repoSection = getSectionByTitle(wrapper, TRANSLATIONS.repository)
-      expect(repoSection).toBeDefined()
-      expect(repoSection.text).toBe('https://github.com/user/repo')
-      expect(repoSection.isUrl).toBe(true)
+      const repoLink = wrapper.find('a[href="https://github.com/user/repo"]')
+      expect(repoLink.exists()).toBe(true)
+      expect(repoLink.attributes('target')).toBe('_blank')
     })
 
     it('shows fallback text when description is missing', () => {
@@ -173,7 +155,7 @@ describe('DescriptionTabPanel', () => {
           description: undefined
         }
       })
-      expect(wrapper.find('p').text()).toBe(TRANSLATIONS.noDescription)
+      expect(wrapper.text()).toContain('No description available')
     })
   })
 })
diff --git a/src/workbench/extensions/manager/components/manager/infoPanel/tabs/DescriptionTabPanel.vue b/src/workbench/extensions/manager/components/manager/infoPanel/tabs/DescriptionTabPanel.vue
index e6b203cd8b..c1c8651cb5 100644
--- a/src/workbench/extensions/manager/components/manager/infoPanel/tabs/DescriptionTabPanel.vue
+++ b/src/workbench/extensions/manager/components/manager/infoPanel/tabs/DescriptionTabPanel.vue
@@ -1,24 +1,57 @@
 <template>
-  <div class="overflow-hidden">
-    <InfoTextSection
-      v-if="nodePack?.description"
-      :sections="descriptionSections"
-    />
-    <p v-else class="text-sm text-muted italic">
-      {{ $t('manager.noDescription') }}
-    </p>
-    <div v-if="nodePack?.latest_version?.dependencies?.length">
-      <p class="mb-1">
-        {{ $t('manager.dependencies') }}
-      </p>
+  <div>
+    <ModelInfoField :label="t('g.description')">
+      <MarkdownText
+        v-if="nodePack.description"
+        :text="nodePack.description"
+        class="text-muted-foreground"
+      />
+      <span v-else class="text-muted-foreground italic">
+        {{ t('manager.noDescription') }}
+      </span>
+    </ModelInfoField>
+    <ModelInfoField v-if="nodePack.repository" :label="t('manager.repository')">
+      <a
+        :href="nodePack.repository"
+        target="_blank"
+        rel="noopener noreferrer"
+        class="hover:text-foreground inline-flex items-center gap-1.5 text-muted-foreground no-underline transition-colors"
+      >
+        <i
+          v-if="isGitHubLink(nodePack.repository)"
+          class="pi pi-github text-base"
+        />
+        <span class="break-all">{{ nodePack.repository }}</span>
+        <i class="icon-[lucide--external-link] size-4 shrink-0" />
+      </a>
+    </ModelInfoField>
+    <ModelInfoField v-if="licenseInfo" :label="t('manager.license')">
+      <a
+        v-if="licenseInfo.isUrl"
+        :href="licenseInfo.text"
+        target="_blank"
+        rel="noopener noreferrer"
+        class="hover:text-foreground inline-flex items-center gap-1.5 text-muted-foreground no-underline transition-colors"
+      >
+        <span class="break-all">{{ licenseInfo.text }}</span>
+        <i class="icon-[lucide--external-link] size-4 shrink-0" />
+      </a>
+      <span v-else class="break-all text-muted-foreground">
+        {{ licenseInfo.text }}
+      </span>
+    </ModelInfoField>
+    <ModelInfoField
+      v-if="nodePack.latest_version?.dependencies?.length"
+      :label="t('manager.dependencies')"
+    >
       <div
         v-for="(dep, index) in nodePack.latest_version.dependencies"
         :key="index"
-        class="break-words text-muted"
+        class="wrap-break-word text-muted-foreground"
       >
         {{ dep }}
       </div>
-    </div>
+    </ModelInfoField>
   </div>
 </template>
 
@@ -26,10 +59,10 @@
 import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 
+import ModelInfoField from '@/platform/assets/components/modelInfo/ModelInfoField.vue'
 import type { components } from '@/types/comfyRegistryTypes'
 import { isValidUrl } from '@/utils/formatUtil'
-import InfoTextSection from '@/workbench/extensions/manager/components/manager/infoPanel/InfoTextSection.vue'
-import type { TextSection } from '@/workbench/extensions/manager/components/manager/infoPanel/InfoTextSection.vue'
+import MarkdownText from '@/workbench/extensions/manager/components/manager/infoPanel/MarkdownText.vue'
 
 const { t } = useI18n()
 
@@ -37,6 +70,8 @@ const { nodePack } = defineProps<{
   nodePack: components['schemas']['Node']
 }>()
 
+const isGitHubLink = (url: string): boolean => url.includes('github.com')
+
 const isLicenseFile = (filename: string): boolean => {
   // Match LICENSE, LICENSE.md, LICENSE.txt (case insensitive)
   const licensePattern = /^license(\.md|\.txt)?$/i
@@ -57,8 +92,13 @@ const createLicenseUrl = (filename: string, repoUrl: string): string => {
   return `${baseRepoUrl}/blob/main/${licenseFile}`
 }
 
+interface LicenseObject {
+  file?: string
+  text?: string
+}
+
 const parseLicenseObject = (
-  licenseObj: any
+  licenseObj: LicenseObject
 ): { text: string; isUrl: boolean } => {
   const licenseFile = licenseObj.file || licenseObj.text
 
@@ -118,33 +158,8 @@ const formatLicense = (
   }
 }
 
-const descriptionSections = computed<TextSection[]>(() => {
-  const sections: TextSection[] = [
-    {
-      title: t('g.description'),
-      text: nodePack.description || t('manager.noDescription')
-    }
-  ]
-
-  if (nodePack.repository) {
-    sections.push({
-      title: t('manager.repository'),
-      text: nodePack.repository,
-      isUrl: isValidUrl(nodePack.repository)
-    })
-  }
-
-  if (nodePack.license) {
-    const licenseInfo = formatLicense(nodePack.license)
-    if (licenseInfo && licenseInfo.text) {
-      sections.push({
-        title: t('manager.license'),
-        text: licenseInfo.text,
-        isUrl: licenseInfo.isUrl
-      })
-    }
-  }
-
-  return sections
+const licenseInfo = computed(() => {
+  if (!nodePack.license) return null
+  return formatLicense(nodePack.license)
 })
 </script>
diff --git a/src/workbench/extensions/manager/components/manager/infoPanel/tabs/NodesTabPanel.vue b/src/workbench/extensions/manager/components/manager/infoPanel/tabs/NodesTabPanel.vue
index 3f0c5db20e..dfd3285b40 100644
--- a/src/workbench/extensions/manager/components/manager/infoPanel/tabs/NodesTabPanel.vue
+++ b/src/workbench/extensions/manager/components/manager/infoPanel/tabs/NodesTabPanel.vue
@@ -1,17 +1,13 @@
 <template>
-  <div class="flex flex-col gap-4 text-sm">
+  <div class="flex flex-col gap-1 text-sm">
     <template v-if="mappedNodeDefs?.length">
-      <div
-        v-for="nodeDef in mappedNodeDefs"
-        :key="createNodeDefKey(nodeDef)"
-        class="rounded-lg border p-4"
-      >
-        <div class="[zoom:0.6]">
-          <NodePreview
-            :node-def="nodeDef"
-            position="relative"
-            class="min-w-full! text-[.625rem]!"
-          />
+      <div class="flex flex-col gap-2">
+        <div
+          v-for="nodeDef in mappedNodeDefs"
+          :key="createNodeDefKey(nodeDef)"
+          class="scale-75"
+        >
+          <NodePreview :node-def="nodeDef" class="min-w-full!" />
         </div>
       </div>
     </template>
diff --git a/src/workbench/extensions/manager/components/manager/infoPanel/tabs/WarningTabPanel.vue b/src/workbench/extensions/manager/components/manager/infoPanel/tabs/WarningTabPanel.vue
index f673318dab..2023dff279 100644
--- a/src/workbench/extensions/manager/components/manager/infoPanel/tabs/WarningTabPanel.vue
+++ b/src/workbench/extensions/manager/components/manager/infoPanel/tabs/WarningTabPanel.vue
@@ -1,43 +1,37 @@
 <template>
   <div class="flex flex-col gap-3">
-    <button
-      v-if="importFailedInfo"
-      class="inline-flex cursor-pointer items-center justify-end gap-1 border-none bg-transparent outline-none"
-      @click="showImportFailedDialog"
-    >
-      <i class="pi pi-code text-base"></i>
-      <span class="text-sm text-base-foreground">{{
-        t('serverStart.openLogs')
-      }}</span>
-    </button>
     <div
       v-for="(conflict, index) in conflictResult?.conflicts || []"
       :key="index"
-      class="rounded-md bg-yellow-800/20 p-3"
+      class="rounded-md bg-secondary-background/60"
     >
-      <div class="flex items-center justify-between">
-        <div class="flex-1 text-sm break-words">
+      <!-- Import failed conflicts show detailed error message -->
+      <template v-if="conflict.type === 'import_failed'">
+        <div
+          v-if="conflict.required_value"
+          class="overflow-x-hidden rounded-sm"
+        >
+          <p class="m-0 font-mono text-xs break-all text-muted-foreground">
+            {{ conflict.required_value }}
+          </p>
+        </div>
+      </template>
+
+      <!-- Other conflict types use standard message -->
+      <template v-else>
+        <div class="text-sm wrap-break-word">
           {{ getConflictMessage(conflict, $t) }}
         </div>
-      </div>
+      </template>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { computed } from 'vue'
-
-import { t } from '@/i18n'
-import type { components } from '@/types/comfyRegistryTypes'
-import { useImportFailedDetection } from '@/workbench/extensions/manager/composables/useImportFailedDetection'
 import type { ConflictDetectionResult } from '@/workbench/extensions/manager/types/conflictDetectionTypes'
 import { getConflictMessage } from '@/workbench/extensions/manager/utils/conflictMessageUtil'
 
-const { nodePack, conflictResult } = defineProps<{
-  nodePack: components['schemas']['Node']
+const { conflictResult } = defineProps<{
   conflictResult: ConflictDetectionResult | null | undefined
 }>()
-const packageId = computed(() => nodePack?.id || '')
-const { importFailedInfo, showImportFailedDialog } =
-  useImportFailedDetection(packageId)
 </script>
diff --git a/src/workbench/extensions/manager/components/manager/packBanner/PackBanner.vue b/src/workbench/extensions/manager/components/manager/packBanner/PackBanner.vue
index cce839e226..bed348671d 100644
--- a/src/workbench/extensions/manager/components/manager/packBanner/PackBanner.vue
+++ b/src/workbench/extensions/manager/components/manager/packBanner/PackBanner.vue
@@ -1,15 +1,15 @@
 <template>
-  <div class="aspect-7/3 w-full overflow-hidden">
+  <div class="z-0 aspect-7/3 w-full overflow-hidden">
     <!-- default banner show -->
-    <div v-if="showDefaultBanner" class="h-full w-full">
+    <div v-if="showDefaultBanner" class="size-full">
       <img
         :src="DEFAULT_BANNER"
         :alt="$t('g.defaultBanner')"
-        class="h-full w-full object-cover"
+        class="size-full object-cover"
       />
     </div>
     <!-- banner_url or icon show -->
-    <div v-else class="relative h-full w-full">
+    <div v-else class="relative size-full">
       <!-- blur background -->
       <div
         v-if="imgSrc"
@@ -25,8 +25,8 @@
         :alt="nodePack.name + ' banner'"
         :class="
           isImageError
-            ? 'relative w-full h-full object-cover z-10'
-            : 'relative w-full h-full object-contain z-10'
+            ? 'relative z-10 size-full object-cover'
+            : 'relative z-10 size-full object-contain'
         "
         @error="isImageError = true"
       />
diff --git a/tests-ui/tests/components/dialog/content/manager/packCard/PackCard.test.ts b/src/workbench/extensions/manager/components/manager/packCard/PackCard.test.ts
similarity index 75%
rename from tests-ui/tests/components/dialog/content/manager/packCard/PackCard.test.ts
rename to src/workbench/extensions/manager/components/manager/packCard/PackCard.test.ts
index 3e51167390..29af937f5a 100644
--- a/tests-ui/tests/components/dialog/content/manager/packCard/PackCard.test.ts
+++ b/src/workbench/extensions/manager/components/manager/packCard/PackCard.test.ts
@@ -1,6 +1,5 @@
+import { createTestingPinia } from '@pinia/testing'
 import { mount } from '@vue/test-utils'
-import { createPinia, setActivePinia } from 'pinia'
-import Card from 'primevue/card'
 import ProgressSpinner from 'primevue/progressspinner'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
@@ -10,15 +9,23 @@ import type {
   RegistryPack
 } from '@/workbench/extensions/manager/types/comfyManagerTypes'
 
+const translateMock = vi.hoisted(() =>
+  vi.fn((key: string, choice?: number) =>
+    typeof choice === 'number' ? `${key}-${choice}` : key
+  )
+)
+const dateMock = vi.hoisted(() => vi.fn(() => '2024. 1. 1.'))
+const storageMap = vi.hoisted(() => new Map<string, unknown>())
+
 // Mock dependencies
 vi.mock('vue-i18n', () => ({
   useI18n: vi.fn(() => ({
-    d: vi.fn(() => '2024. 1. 1.'),
-    t: vi.fn((key: string) => key)
+    d: dateMock,
+    t: translateMock
   })),
   createI18n: vi.fn(() => ({
     global: {
-      t: vi.fn((key: string) => key),
+      t: translateMock,
       te: vi.fn(() => true)
     }
   }))
@@ -39,16 +46,17 @@ vi.mock('@/stores/workspace/colorPaletteStore', () => ({
   }))
 }))
 
-vi.mock('@vueuse/core', async () => {
-  const { ref } = await import('vue')
-  return {
-    whenever: vi.fn(),
-    useStorage: vi.fn((_key, defaultValue) => {
-      return ref(defaultValue)
-    }),
-    createSharedComposable: vi.fn((fn) => fn)
-  }
-})
+vi.mock('@vueuse/core', () => ({
+  whenever: vi.fn(),
+  useStorage: vi.fn((key: string, defaultValue: unknown) => {
+    if (!storageMap.has(key)) storageMap.set(key, defaultValue)
+    return storageMap.get(key)
+  }),
+  createSharedComposable: vi.fn((fn) => {
+    let cached: ReturnType<typeof fn>
+    return (...args: Parameters<typeof fn>) => (cached ??= fn(...args))
+  })
+}))
 
 vi.mock('@/config', () => ({
   default: {
@@ -66,12 +74,9 @@ vi.mock('@/stores/systemStatsStore', () => ({
 }))
 
 describe('PackCard', () => {
-  let pinia: ReturnType<typeof createPinia>
-
   beforeEach(() => {
     vi.clearAllMocks()
-    pinia = createPinia()
-    setActivePinia(pinia)
+    storageMap.clear()
   })
 
   const createWrapper = (props: {
@@ -81,9 +86,8 @@ describe('PackCard', () => {
     const wrapper = mount(PackCard, {
       props,
       global: {
-        plugins: [pinia],
+        plugins: [createTestingPinia({ stubActions: false })],
         components: {
-          Card,
           ProgressSpinner
         },
         stubs: {
@@ -114,7 +118,7 @@ describe('PackCard', () => {
     it('should render package card with basic information', () => {
       const wrapper = createWrapper({ nodePack: mockNodePack })
 
-      expect(wrapper.find('.p-card').exists()).toBe(true)
+      expect(wrapper.exists()).toBe(true)
       expect(wrapper.text()).toContain('Test Package')
       expect(wrapper.text()).toContain('Test package description')
       expect(wrapper.text()).toContain('Test Author')
@@ -126,22 +130,22 @@ describe('PackCard', () => {
       expect(wrapper.text()).toContain('2024. 1. 1.')
     })
 
-    it('should apply selected class when isSelected is true', () => {
+    it('should apply selected ring when isSelected is true', () => {
       const wrapper = createWrapper({
         nodePack: mockNodePack,
         isSelected: true
       })
 
-      expect(wrapper.find('.selected-card').exists()).toBe(true)
+      expect(wrapper.find('.ring-3').exists()).toBe(true)
     })
 
-    it('should not apply selected class when isSelected is false', () => {
+    it('should not apply selected ring when isSelected is false', () => {
       const wrapper = createWrapper({
         nodePack: mockNodePack,
         isSelected: false
       })
 
-      expect(wrapper.find('.selected-card').exists()).toBe(false)
+      expect(wrapper.find('.ring-3').exists()).toBe(false)
     })
   })
 
@@ -150,7 +154,7 @@ describe('PackCard', () => {
       const wrapper = createWrapper({ nodePack: mockNodePack })
 
       expect(wrapper.exists()).toBe(true)
-      expect(wrapper.find('.p-card').exists()).toBe(true)
+      expect(wrapper.find('.rounded-lg').exists()).toBe(true)
     })
   })
 
@@ -187,6 +191,18 @@ describe('PackCard', () => {
       // Should still render without errors
       expect(wrapper.exists()).toBe(true)
     })
+
+    it('should use localized singular/plural nodes label', () => {
+      const packWithNodes = {
+        ...mockNodePack,
+        comfy_nodes: ['node-a']
+      } as MergedNodePack
+
+      const wrapper = createWrapper({ nodePack: packWithNodes })
+
+      expect(wrapper.text()).toContain('g.nodesCount-1')
+      expect(translateMock).toHaveBeenCalledWith('g.nodesCount', 1)
+    })
   })
 
   describe('component structure', () => {
diff --git a/src/workbench/extensions/manager/components/manager/packCard/PackCard.vue b/src/workbench/extensions/manager/components/manager/packCard/PackCard.vue
index 6900e71dfc..f142284bc7 100644
--- a/src/workbench/extensions/manager/components/manager/packCard/PackCard.vue
+++ b/src/workbench/extensions/manager/components/manager/packCard/PackCard.vue
@@ -1,43 +1,39 @@
 <template>
-  <Card
-    class="shadow-elevation-3 inline-flex size-full flex-col items-start justify-between overflow-hidden rounded-lg transition-all duration-200"
-    :class="{
-      'selected-card': isSelected,
-      'opacity-60': isDisabled
-    }"
-    :pt="{
-      body: { class: 'p-0 flex flex-col w-full h-full rounded-lg gap-0' },
-      content: { class: 'flex-1 flex flex-col rounded-lg min-h-0' },
-      title: { class: 'w-full h-full rounded-t-lg cursor-pointer' },
-      footer: {
-        class: 'p-0 m-0 flex flex-col gap-0',
-        style: {
-          borderTop: isLightTheme ? '1px solid #f4f4f4' : '1px solid #2C2C2C'
-        }
-      }
-    }"
+  <div
+    :class="
+      cn(
+        'flex size-full cursor-pointer flex-col overflow-hidden rounded-lg bg-modal-card-background transition-colors duration-200 select-none',
+        isSelected
+          ? 'ring-3 ring-modal-card-border-highlighted'
+          : 'hover:bg-modal-card-background-hovered',
+        isDisabled && 'opacity-60'
+      )
+    "
   >
-    <template #title>
+    <!-- Banner -->
+    <div class="w-full rounded-t-lg">
       <PackBanner :node-pack="nodePack" />
-    </template>
-    <template #content>
-      <div class="h-full w-full px-4 pt-4 pb-3">
-        <div class="flex h-full w-full flex-col gap-y-1">
+    </div>
+
+    <!-- Content -->
+    <div class="flex min-h-0 flex-1 flex-col rounded-lg">
+      <div class="size-full px-3 py-2">
+        <div class="flex size-full flex-col gap-y-1">
           <span
-            class="truncate overflow-hidden text-sm font-bold text-ellipsis"
+            class="truncate overflow-hidden text-xs font-bold text-ellipsis"
           >
             {{ nodePack.name }}
           </span>
           <p
             v-if="nodePack.description"
-            class="my-0 mb-1 line-clamp-3 min-h-12 flex-1 overflow-hidden text-xs leading-4 font-medium break-words text-muted"
+            class="my-0 mb-1 line-clamp-3 min-h-12 flex-1 overflow-hidden text-xs/4 font-medium wrap-break-word text-muted"
           >
             {{ nodePack.description }}
           </p>
           <div class="flex flex-col gap-y-2">
             <div class="flex flex-1 items-center gap-2">
-              <div v-if="nodesCount" class="p-2 pl-0 text-xs">
-                {{ nodesCount }} {{ $t('g.nodes') }}
+              <div v-if="nodesLabel" class="p-2 pl-0 text-xs">
+                {{ nodesLabel }}
               </div>
               <PackVersionBadge
                 :node-pack="nodePack"
@@ -55,7 +51,7 @@
             <div class="flex">
               <span
                 v-if="publisherName"
-                class="max-w-40 truncate text-xs leading-3 font-medium text-muted"
+                class="max-w-40 truncate text-xs/3 font-medium text-muted"
               >
                 {{ publisherName }}
               </span>
@@ -63,19 +59,20 @@
           </div>
         </div>
       </div>
-    </template>
-    <template #footer>
+    </div>
+
+    <!-- Footer -->
+    <div class="border-t border-border-default">
       <PackCardFooter :node-pack="nodePack" :is-installing="isInstalling" />
-    </template>
-  </Card>
+    </div>
+  </div>
 </template>
 
 <script setup lang="ts">
-import Card from 'primevue/card'
 import { computed, provide } from 'vue'
 import { useI18n } from 'vue-i18n'
 
-import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
+import { cn } from '@/utils/tailwindUtil'
 import PackVersionBadge from '@/workbench/extensions/manager/components/manager/PackVersionBadge.vue'
 import PackBanner from '@/workbench/extensions/manager/components/manager/packBanner/PackBanner.vue'
 import PackCardFooter from '@/workbench/extensions/manager/components/manager/packCard/PackCardFooter.vue'
@@ -94,12 +91,7 @@ const { nodePack, isSelected = false } = defineProps<{
   isSelected?: boolean
 }>()
 
-const { d } = useI18n()
-
-const colorPaletteStore = useColorPaletteStore()
-const isLightTheme = computed(
-  () => colorPaletteStore.completedActivePalette.light_theme
-)
+const { d, t } = useI18n()
 
 const { isPackInstalled, isPackEnabled, isPackInstalling } =
   useComfyManagerStore()
@@ -115,6 +107,9 @@ const isDisabled = computed(
 const nodesCount = computed(() =>
   isMergedNodePack(nodePack) ? nodePack.comfy_nodes?.length : undefined
 )
+const nodesLabel = computed(() =>
+  nodesCount.value ? t('g.nodesCount', nodesCount.value) : ''
+)
 const publisherName = computed(() => {
   if (!nodePack) return null
 
@@ -130,22 +125,3 @@ const formattedLatestVersionDate = computed(() => {
   })
 })
 </script>
-
-<style scoped>
-.selected-card {
-  position: relative;
-}
-
-.selected-card::after {
-  content: '';
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  border: 4px solid var(--p-primary-color);
-  border-radius: 0.5rem;
-  pointer-events: none;
-  z-index: 100;
-}
-</style>
diff --git a/src/workbench/extensions/manager/components/manager/packCard/PackCardFooter.test.ts b/src/workbench/extensions/manager/components/manager/packCard/PackCardFooter.test.ts
index 950f8f6477..9f6e1d5a64 100644
--- a/src/workbench/extensions/manager/components/manager/packCard/PackCardFooter.test.ts
+++ b/src/workbench/extensions/manager/components/manager/packCard/PackCardFooter.test.ts
@@ -1,6 +1,6 @@
 import type { VueWrapper } from '@vue/test-utils'
 import { mount } from '@vue/test-utils'
-import { createPinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
 import PrimeVue from 'primevue/config'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { ref } from 'vue'
@@ -73,7 +73,7 @@ describe('PackCardFooter', () => {
         ...props
       },
       global: {
-        plugins: [PrimeVue, createPinia(), i18n],
+        plugins: [PrimeVue, createTestingPinia({ stubActions: false }), i18n],
         provide: {
           [IsInstallingKey]: ref(false)
         }
diff --git a/src/workbench/extensions/manager/components/manager/packCard/PackCardFooter.vue b/src/workbench/extensions/manager/components/manager/packCard/PackCardFooter.vue
index ae8bb351c7..095e3865e9 100644
--- a/src/workbench/extensions/manager/components/manager/packCard/PackCardFooter.vue
+++ b/src/workbench/extensions/manager/components/manager/packCard/PackCardFooter.vue
@@ -1,11 +1,12 @@
 <template>
   <div
-    class="flex min-h-12 items-center justify-between px-4 py-2 text-xs leading-3 font-medium text-muted"
+    class="flex min-h-12 items-center justify-between px-4 py-2 text-xs/3 font-medium text-muted"
   >
     <div v-if="nodePack.downloads" class="flex items-center gap-1.5">
       <i class="pi pi-download text-muted"></i>
       <span>{{ formattedDownloads }}</span>
     </div>
+    <div v-else></div>
     <PackInstallButton
       v-if="!isInstalled"
       :node-packs="[nodePack]"
diff --git a/src/workbench/extensions/manager/components/manager/packIcon/PackIcon.vue b/src/workbench/extensions/manager/components/manager/packIcon/PackIcon.vue
deleted file mode 100644
index d1375ff2fb..0000000000
--- a/src/workbench/extensions/manager/components/manager/packIcon/PackIcon.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-<template>
-  <div class="aspect-[2/1] w-full max-w-[204] overflow-hidden rounded-lg">
-    <!-- default banner show -->
-    <div v-if="showDefaultBanner" class="h-full w-full">
-      <img
-        :src="DEFAULT_BANNER"
-        :alt="$t('g.defaultBanner')"
-        class="h-full w-full object-cover"
-      />
-    </div>
-    <!-- banner_url or icon show -->
-    <div v-else class="relative h-full w-full">
-      <!-- blur background -->
-      <div
-        v-if="imgSrc"
-        class="absolute inset-0 bg-cover bg-center bg-no-repeat"
-        :style="{
-          backgroundImage: `url(${imgSrc})`,
-          filter: 'blur(10px)'
-        }"
-      ></div>
-      <!-- image -->
-      <img
-        :src="isImageError ? DEFAULT_BANNER : imgSrc"
-        :alt="nodePack.name + ' banner'"
-        :class="
-          isImageError
-            ? 'relative w-full h-full object-cover z-10'
-            : 'relative w-full h-full object-contain z-10'
-        "
-        @error="isImageError = true"
-      />
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed, ref } from 'vue'
-
-import type { components } from '@/types/comfyRegistryTypes'
-
-const DEFAULT_BANNER = '/assets/images/fallback-gradient-avatar.svg'
-
-const { nodePack } = defineProps<{
-  nodePack: components['schemas']['Node']
-}>()
-
-const isImageError = ref(false)
-
-const showDefaultBanner = computed(() => !nodePack.banner_url && !nodePack.icon)
-const imgSrc = computed(() => nodePack.banner_url || nodePack.icon)
-</script>
diff --git a/src/workbench/extensions/manager/components/manager/packIcon/PackIconStacked.vue b/src/workbench/extensions/manager/components/manager/packIcon/PackIconStacked.vue
deleted file mode 100644
index 0427dfe58b..0000000000
--- a/src/workbench/extensions/manager/components/manager/packIcon/PackIconStacked.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-<template>
-  <div class="relative h-[104px] w-[224px] shadow-xl">
-    <div
-      v-for="(pack, index) in nodePacks.slice(0, maxVisible)"
-      :key="pack.id"
-      class="absolute h-[90px] w-[210px]"
-      :style="{
-        bottom: `${index * offset}px`,
-        right: `${index * offset}px`,
-        zIndex: maxVisible - index
-      }"
-    >
-      <div class="rounded-lg border p-0.5 shadow-lg">
-        <PackIcon :node-pack="pack" />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { components } from '@/types/comfyRegistryTypes'
-import PackIcon from '@/workbench/extensions/manager/components/manager/packIcon/PackIcon.vue'
-
-const {
-  nodePacks,
-  maxVisible = 3,
-  offset = 8
-} = defineProps<{
-  nodePacks: components['schemas']['Node'][]
-  maxVisible?: number
-  offset?: number
-}>()
-</script>
diff --git a/src/workbench/extensions/manager/components/manager/registrySearchBar/RegistrySearchBar.vue b/src/workbench/extensions/manager/components/manager/registrySearchBar/RegistrySearchBar.vue
deleted file mode 100644
index dbb1150d62..0000000000
--- a/src/workbench/extensions/manager/components/manager/registrySearchBar/RegistrySearchBar.vue
+++ /dev/null
@@ -1,130 +0,0 @@
-<template>
-  <div class="relative w-full p-6">
-    <div class="flex h-12 items-center justify-between gap-1">
-      <div class="flex w-5/12 items-center">
-        <AutoComplete
-          v-model.lazy="searchQuery"
-          :suggestions="suggestions || []"
-          :placeholder="$t('manager.searchPlaceholder')"
-          :complete-on-focus="false"
-          :delay="8"
-          option-label="query"
-          class="w-full"
-          :pt="{
-            pcInputText: {
-              root: {
-                autofocus: true,
-                class: 'w-full rounded-2xl'
-              }
-            },
-            loader: {
-              style: 'display: none'
-            }
-          }"
-          :show-empty-message="false"
-          @complete="stubTrue"
-          @option-select="onOptionSelect"
-        />
-      </div>
-      <PackInstallButton
-        v-if="isMissingTab && missingNodePacks.length > 0"
-        :disabled="isLoading || !!error"
-        :node-packs="missingNodePacks"
-        :label="$t('manager.installAllMissingNodes')"
-      />
-      <PackUpdateButton
-        v-if="isUpdateAvailableTab && hasUpdateAvailable"
-        :node-packs="enabledUpdateAvailableNodePacks"
-        :has-disabled-update-packs="hasDisabledUpdatePacks"
-      />
-    </div>
-    <div class="mt-3 flex text-sm">
-      <div class="ml-1 flex gap-6">
-        <SearchFilterDropdown
-          v-model:model-value="searchMode"
-          :options="filterOptions"
-          :label="$t('g.filter')"
-        />
-        <SearchFilterDropdown
-          v-model:model-value="sortField"
-          :options="availableSortOptions"
-          :label="$t('g.sort')"
-        />
-      </div>
-      <div class="ml-6 flex items-center gap-4">
-        <small v-if="hasResults" class="text-color-secondary">
-          {{ $t('g.resultsCount', { count: searchResults?.length || 0 }) }}
-        </small>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { stubTrue } from 'es-toolkit/compat'
-import type { AutoCompleteOptionSelectEvent } from 'primevue/autocomplete'
-import AutoComplete from 'primevue/autocomplete'
-import { computed } from 'vue'
-import { useI18n } from 'vue-i18n'
-
-import type { components } from '@/types/comfyRegistryTypes'
-import type {
-  QuerySuggestion,
-  SearchMode,
-  SortableField
-} from '@/types/searchServiceTypes'
-import PackInstallButton from '@/workbench/extensions/manager/components/manager/button/PackInstallButton.vue'
-import PackUpdateButton from '@/workbench/extensions/manager/components/manager/button/PackUpdateButton.vue'
-import SearchFilterDropdown from '@/workbench/extensions/manager/components/manager/registrySearchBar/SearchFilterDropdown.vue'
-import { useMissingNodes } from '@/workbench/extensions/manager/composables/nodePack/useMissingNodes'
-import { useUpdateAvailableNodes } from '@/workbench/extensions/manager/composables/nodePack/useUpdateAvailableNodes'
-import { SortableAlgoliaField } from '@/workbench/extensions/manager/types/comfyManagerTypes'
-import type { SearchOption } from '@/workbench/extensions/manager/types/comfyManagerTypes'
-
-const { searchResults, sortOptions } = defineProps<{
-  searchResults?: components['schemas']['Node'][]
-  suggestions?: QuerySuggestion[]
-  sortOptions?: SortableField[]
-  isMissingTab?: boolean
-  isUpdateAvailableTab?: boolean
-}>()
-
-const searchQuery = defineModel<string>('searchQuery')
-const searchMode = defineModel<SearchMode>('searchMode', { default: 'packs' })
-const sortField = defineModel<string>('sortField', {
-  default: SortableAlgoliaField.Downloads
-})
-
-const { t } = useI18n()
-
-// Get missing node packs from workflow with loading and error states
-const { missingNodePacks, isLoading, error } = useMissingNodes()
-
-// Use the composable to get update available nodes
-const {
-  hasUpdateAvailable,
-  enabledUpdateAvailableNodePacks,
-  hasDisabledUpdatePacks
-} = useUpdateAvailableNodes()
-
-const hasResults = computed(
-  () => searchQuery.value?.trim() && searchResults?.length
-)
-
-const availableSortOptions = computed<SearchOption<string>[]>(() => {
-  if (!sortOptions) return []
-  return sortOptions.map((field) => ({
-    id: field.id,
-    label: field.label
-  }))
-})
-const filterOptions: SearchOption<SearchMode>[] = [
-  { id: 'packs', label: t('manager.filter.nodePack') },
-  { id: 'nodes', label: t('g.nodes') }
-]
-
-// When a dropdown query suggestion is selected, update the search query
-const onOptionSelect = (event: AutoCompleteOptionSelectEvent) => {
-  searchQuery.value = event.value.query
-}
-</script>
diff --git a/src/workbench/extensions/manager/components/manager/registrySearchBar/SearchFilterDropdown.vue b/src/workbench/extensions/manager/components/manager/registrySearchBar/SearchFilterDropdown.vue
deleted file mode 100644
index 973820c728..0000000000
--- a/src/workbench/extensions/manager/components/manager/registrySearchBar/SearchFilterDropdown.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template>
-  <div class="flex items-center gap-1">
-    <span class="text-muted">{{ label }}:</span>
-    <Dropdown
-      :model-value="modelValue"
-      :options="options"
-      option-label="label"
-      option-value="id"
-      class="min-w-[6rem] border-none bg-transparent shadow-none"
-      :pt="{
-        input: { class: 'py-0 px-1 border-none' },
-        trigger: { class: 'hidden' },
-        panel: { class: 'shadow-md' },
-        item: { class: 'py-2 px-3 text-sm' }
-      }"
-      @update:model-value="$emit('update:modelValue', $event)"
-    />
-  </div>
-</template>
-
-<script setup lang="ts" generic="T">
-// oxlint-disable-next-line no-restricted-imports -- TODO: Migrate to Select component
-import Dropdown from 'primevue/dropdown'
-
-import type { SearchOption } from '@/workbench/extensions/manager/types/comfyManagerTypes'
-
-defineProps<{
-  options: SearchOption<T>[]
-  label: string
-  modelValue: T
-}>()
-
-defineEmits<{
-  'update:modelValue': [value: T]
-}>()
-</script>
diff --git a/src/workbench/extensions/manager/components/manager/skeleton/PackCardGridSkeleton.test.ts b/src/workbench/extensions/manager/components/manager/skeleton/PackCardGridSkeleton.test.ts
index 1df7162d9a..dfcbc2a9b4 100644
--- a/src/workbench/extensions/manager/components/manager/skeleton/PackCardGridSkeleton.test.ts
+++ b/src/workbench/extensions/manager/components/manager/skeleton/PackCardGridSkeleton.test.ts
@@ -1,10 +1,11 @@
 import type { VueWrapper } from '@vue/test-utils'
 import { mount } from '@vue/test-utils'
-import { createPinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
 import PrimeVue from 'primevue/config'
 import { describe, expect, it } from 'vitest'
 import { nextTick } from 'vue'
 import { createI18n } from 'vue-i18n'
+import type { ComponentProps } from 'vue-component-type-helpers'
 
 import enMessages from '@/locales/en/main.json' with { type: 'json' }
 
@@ -12,9 +13,11 @@ import GridSkeleton from './GridSkeleton.vue'
 import PackCardSkeleton from './PackCardSkeleton.vue'
 
 describe('GridSkeleton', () => {
-  const mountComponent = ({
+  function mountComponent({
     props = {}
-  }: Record<string, any> = {}): VueWrapper => {
+  }: {
+    props?: Partial<ComponentProps<typeof GridSkeleton>>
+  } = {}): VueWrapper {
     const i18n = createI18n({
       legacy: false,
       locale: 'en',
@@ -32,7 +35,7 @@ describe('GridSkeleton', () => {
         ...props
       },
       global: {
-        plugins: [PrimeVue, createPinia(), i18n],
+        plugins: [PrimeVue, createTestingPinia({ stubActions: false }), i18n],
         stubs: {
           PackCardSkeleton: true
         }
diff --git a/src/workbench/extensions/manager/components/manager/skeleton/PackCardSkeleton.vue b/src/workbench/extensions/manager/components/manager/skeleton/PackCardSkeleton.vue
index 24e0180d88..8808d2bce0 100644
--- a/src/workbench/extensions/manager/components/manager/skeleton/PackCardSkeleton.vue
+++ b/src/workbench/extensions/manager/components/manager/skeleton/PackCardSkeleton.vue
@@ -6,7 +6,7 @@
     <!-- Card header - flush with top, approximately 15% of height -->
     <div class="flex w-full items-center justify-between px-4 py-3">
       <div class="flex items-center">
-        <div class="flex h-6 w-6 items-center justify-center">
+        <div class="flex size-6 items-center justify-center">
           <Skeleton shape="circle" width="1.5rem" height="1.5rem" />
         </div>
         <Skeleton width="5rem" height="1rem" class="ml-2" />
diff --git a/tests-ui/tests/composables/useMissingNodes.test.ts b/src/workbench/extensions/manager/composables/nodePack/useMissingNodes.test.ts
similarity index 88%
rename from tests-ui/tests/composables/useMissingNodes.test.ts
rename to src/workbench/extensions/manager/composables/nodePack/useMissingNodes.test.ts
index 04a4e5ffd0..a5da7d5245 100644
--- a/tests-ui/tests/composables/useMissingNodes.test.ts
+++ b/src/workbench/extensions/manager/composables/nodePack/useMissingNodes.test.ts
@@ -2,18 +2,22 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { nextTick, ref } from 'vue'
 
 import type { LGraphNode, LGraph } from '@/lib/litegraph/src/litegraph'
+import type { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
 import { useNodeDefStore } from '@/stores/nodeDefStore'
 import { collectAllNodes } from '@/utils/graphTraversalUtil'
 import { useMissingNodes } from '@/workbench/extensions/manager/composables/nodePack/useMissingNodes'
 import { useWorkflowPacks } from '@/workbench/extensions/manager/composables/nodePack/useWorkflowPacks'
+import type { WorkflowPack } from '@/workbench/extensions/manager/composables/nodePack/useWorkflowPacks'
 import { useComfyManagerStore } from '@/workbench/extensions/manager/stores/comfyManagerStore'
+import { createMockLGraphNode } from '@/utils/__tests__/litegraphTestUtils'
 
 vi.mock('@vueuse/core', async () => {
-  const actual =
-    await vi.importActual<typeof import('@vueuse/core')>('@vueuse/core')
+  const actual = await vi.importActual('@vueuse/core')
   return {
     ...actual,
-    createSharedComposable: <Fn extends (...args: any[]) => any>(fn: Fn) => fn
+    createSharedComposable: <Fn extends (...args: unknown[]) => unknown>(
+      fn: Fn
+    ) => fn
   }
 })
 
@@ -82,11 +86,11 @@ describe('useMissingNodes', () => {
     // Default setup: pack-3 is installed, others are not
     mockIsPackInstalled.mockImplementation((id: string) => id === 'pack-3')
 
-    // @ts-expect-error - Mocking partial ComfyManagerStore for testing.
-    // We only need isPackInstalled method for these tests.
     mockUseComfyManagerStore.mockReturnValue({
       isPackInstalled: mockIsPackInstalled
-    })
+    } as Partial<ReturnType<typeof useComfyManagerStore>> as ReturnType<
+      typeof useComfyManagerStore
+    >)
 
     mockUseWorkflowPacks.mockReturnValue({
       workflowPacks: ref([]),
@@ -98,11 +102,11 @@ describe('useMissingNodes', () => {
     })
 
     // Reset node def store mock
-    // @ts-expect-error - Mocking partial NodeDefStore for testing.
-    // We only need nodeDefsByName for these tests.
     mockUseNodeDefStore.mockReturnValue({
       nodeDefsByName: {}
-    })
+    } as Partial<ReturnType<typeof useNodeDefStore>> as ReturnType<
+      typeof useNodeDefStore
+    >)
 
     // Reset app.rootGraph.nodes
     mockApp.rootGraph = { nodes: [] }
@@ -250,7 +254,7 @@ describe('useMissingNodes', () => {
 
   describe('reactivity', () => {
     it('updates when workflow packs change', async () => {
-      const workflowPacksRef = ref([])
+      const workflowPacksRef = ref<WorkflowPack[]>([])
       mockUseWorkflowPacks.mockReturnValue({
         workflowPacks: workflowPacksRef,
         isLoading: ref(false),
@@ -266,8 +270,9 @@ describe('useMissingNodes', () => {
       expect(missingNodePacks.value).toEqual([])
 
       // Update workflow packs
-      // @ts-expect-error - mockWorkflowPacks is a simplified version without full WorkflowPack interface.
-      workflowPacksRef.value = mockWorkflowPacks
+
+      workflowPacksRef.value =
+        mockWorkflowPacks as Partial<WorkflowPack>[] as WorkflowPack[]
       await nextTick()
 
       // Should update missing packs (2 missing since pack-3 is installed)
@@ -303,7 +308,7 @@ describe('useMissingNodes', () => {
 
   describe('missing core nodes detection', () => {
     const createMockNode = (type: string, packId?: string, version?: string) =>
-      ({
+      createMockLGraphNode({
         type,
         properties: { cnr_id: packId, ver: version },
         id: 1,
@@ -315,7 +320,7 @@ describe('useMissingNodes', () => {
         mode: 0,
         inputs: [],
         outputs: []
-      }) as unknown as LGraphNode
+      })
 
     it('identifies missing core nodes not in nodeDefStore', () => {
       const coreNode1 = createMockNode('CoreNode1', 'comfy-core', '1.2.0')
@@ -324,13 +329,16 @@ describe('useMissingNodes', () => {
       // Mock collectAllNodes to return only the filtered nodes (missing core nodes)
       mockCollectAllNodes.mockReturnValue([coreNode1, coreNode2])
 
+      const namedNode = {
+        name: 'RegisteredNode'
+      } as Partial<ComfyNodeDefImpl> as ComfyNodeDefImpl
       mockUseNodeDefStore.mockReturnValue({
         nodeDefsByName: {
-          // @ts-expect-error - Creating minimal mock of ComfyNodeDefImpl for testing.
-          // Only including required properties for our test assertions.
-          RegisteredNode: { name: 'RegisteredNode' }
+          RegisteredNode: namedNode
         }
-      })
+      } as Partial<ReturnType<typeof useNodeDefStore>> as ReturnType<
+        typeof useNodeDefStore
+      >)
 
       const { missingCoreNodes } = useMissingNodes()
 
@@ -348,10 +356,11 @@ describe('useMissingNodes', () => {
       // Mock collectAllNodes to return these nodes
       mockCollectAllNodes.mockReturnValue([node120, node130, nodeNoVer])
 
-      // @ts-expect-error - Mocking partial NodeDefStore for testing.
       mockUseNodeDefStore.mockReturnValue({
         nodeDefsByName: {}
-      })
+      } as Partial<ReturnType<typeof useNodeDefStore>> as ReturnType<
+        typeof useNodeDefStore
+      >)
 
       const { missingCoreNodes } = useMissingNodes()
 
@@ -367,10 +376,11 @@ describe('useMissingNodes', () => {
       // Mock collectAllNodes to return only the filtered nodes (core nodes only)
       mockCollectAllNodes.mockReturnValue([coreNode])
 
-      // @ts-expect-error - Mocking partial NodeDefStore for testing.
       mockUseNodeDefStore.mockReturnValue({
         nodeDefsByName: {}
-      })
+      } as Partial<ReturnType<typeof useNodeDefStore>> as ReturnType<
+        typeof useNodeDefStore
+      >)
 
       const { missingCoreNodes } = useMissingNodes()
 
@@ -385,13 +395,16 @@ describe('useMissingNodes', () => {
 
       mockUseNodeDefStore.mockReturnValue({
         nodeDefsByName: {
-          // @ts-expect-error - Creating minimal mock of ComfyNodeDefImpl for testing.
-          // Only including required properties for our test assertions.
-          RegisteredNode1: { name: 'RegisteredNode1' },
-          // @ts-expect-error - Creating minimal mock of ComfyNodeDefImpl for testing.
-          RegisteredNode2: { name: 'RegisteredNode2' }
+          RegisteredNode1: {
+            name: 'RegisteredNode1'
+          } as Partial<ComfyNodeDefImpl> as ComfyNodeDefImpl,
+          RegisteredNode2: {
+            name: 'RegisteredNode2'
+          } as Partial<ComfyNodeDefImpl> as ComfyNodeDefImpl
         }
-      })
+      } as Partial<ReturnType<typeof useNodeDefStore>> as ReturnType<
+        typeof useNodeDefStore
+      >)
 
       const { missingCoreNodes } = useMissingNodes()
 
@@ -405,9 +418,7 @@ describe('useMissingNodes', () => {
       packId?: string,
       version?: string
     ): LGraphNode =>
-      // @ts-expect-error - Creating a partial mock of LGraphNode for testing.
-      // We only need specific properties for our tests, not the full LGraphNode interface.
-      ({
+      createMockLGraphNode({
         type,
         properties: { cnr_id: packId, ver: version },
         id: 1,
@@ -442,10 +453,11 @@ describe('useMissingNodes', () => {
       ])
 
       // Mock none of the nodes as registered
-      // @ts-expect-error - Mocking partial NodeDefStore for testing.
       mockUseNodeDefStore.mockReturnValue({
         nodeDefsByName: {}
-      })
+      } as Partial<ReturnType<typeof useNodeDefStore>> as ReturnType<
+        typeof useNodeDefStore
+      >)
 
       const { missingCoreNodes } = useMissingNodes()
 
@@ -483,10 +495,13 @@ describe('useMissingNodes', () => {
 
       mockUseNodeDefStore.mockReturnValue({
         nodeDefsByName: {
-          // @ts-expect-error - Creating minimal mock of ComfyNodeDefImpl for testing.
-          RegisteredCore: { name: 'RegisteredCore' }
+          RegisteredCore: {
+            name: 'RegisteredCore'
+          } as Partial<ComfyNodeDefImpl> as ComfyNodeDefImpl
         }
-      })
+      } as Partial<ReturnType<typeof useNodeDefStore>> as ReturnType<
+        typeof useNodeDefStore
+      >)
 
       let capturedFilterFunction: ((node: LGraphNode) => boolean) | undefined
 
@@ -562,12 +577,12 @@ describe('useMissingNodes', () => {
         nodes: [subgraphMissingNode, subgraphRegisteredNode]
       }
 
-      const mockSubgraphNode = {
+      const mockSubgraphNode = createMockLGraphNode({
         isSubgraphNode: () => true,
         subgraph: mockSubgraph,
         type: 'SubgraphContainer',
         properties: { cnr_id: 'custom-pack' }
-      } as unknown as LGraphNode
+      })
 
       const mockMainGraph = {
         nodes: [mainMissingNode, mockSubgraphNode]
@@ -577,10 +592,13 @@ describe('useMissingNodes', () => {
 
       mockUseNodeDefStore.mockReturnValue({
         nodeDefsByName: {
-          // @ts-expect-error - Creating minimal mock of ComfyNodeDefImpl for testing.
-          SubgraphRegistered: { name: 'SubgraphRegistered' }
+          SubgraphRegistered: {
+            name: 'SubgraphRegistered'
+          } as Partial<ComfyNodeDefImpl> as ComfyNodeDefImpl
         }
-      })
+      } as Partial<ReturnType<typeof useNodeDefStore>> as ReturnType<
+        typeof useNodeDefStore
+      >)
 
       const { missingCoreNodes } = useMissingNodes()
 
diff --git a/src/workbench/extensions/manager/composables/nodePack/useMissingNodes.ts b/src/workbench/extensions/manager/composables/nodePack/useMissingNodes.ts
index 96f1d4403d..24daee3090 100644
--- a/src/workbench/extensions/manager/composables/nodePack/useMissingNodes.ts
+++ b/src/workbench/extensions/manager/composables/nodePack/useMissingNodes.ts
@@ -14,7 +14,6 @@ import { useComfyManagerStore } from '@/workbench/extensions/manager/stores/comf
 
 /**
  * Composable to find missing NodePacks from workflow
- * Uses the same filtering approach as ManagerDialogContent.vue
  * Automatically fetches workflow pack data when initialized
  * This is a shared singleton composable - all components use the same instance
  */
@@ -25,7 +24,6 @@ export const useMissingNodes = createSharedComposable(() => {
   const { workflowPacks, isLoading, error, startFetchWorkflowPacks } =
     useWorkflowPacks()
 
-  // Same filtering logic as ManagerDialogContent.vue
   const filterMissingPacks = (packs: components['schemas']['Node'][]) =>
     packs.filter((pack) => !comfyManagerStore.isPackInstalled(pack.id))
 
diff --git a/src/workbench/extensions/manager/composables/nodePack/usePackInstall.ts b/src/workbench/extensions/manager/composables/nodePack/usePackInstall.ts
new file mode 100644
index 0000000000..db0e14fb18
--- /dev/null
+++ b/src/workbench/extensions/manager/composables/nodePack/usePackInstall.ts
@@ -0,0 +1,116 @@
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import type { components } from '@/types/comfyRegistryTypes'
+import type { components as ManagerComponents } from '@/workbench/extensions/manager/types/generatedManagerTypes'
+import { useConflictDetection } from '@/workbench/extensions/manager/composables/useConflictDetection'
+import { useNodeConflictDialog } from '@/workbench/extensions/manager/composables/useNodeConflictDialog'
+import { useComfyManagerStore } from '@/workbench/extensions/manager/stores/comfyManagerStore'
+import type { ConflictDetail } from '@/workbench/extensions/manager/types/conflictDetectionTypes'
+
+type NodePack = components['schemas']['Node']
+
+export function usePackInstall(
+  getNodePacks: () => NodePack[],
+  getHasConflict?: () => boolean | undefined,
+  getConflictInfo?: () => ConflictDetail[] | undefined
+) {
+  const managerStore = useComfyManagerStore()
+  const { show: showNodeConflictDialog } = useNodeConflictDialog()
+  const { checkNodeCompatibility } = useConflictDetection()
+  const { t } = useI18n()
+
+  // Check if any of the packs are currently being installed
+  const isInstalling = computed(() => {
+    const nodePacks = getNodePacks()
+    if (!nodePacks?.length) return false
+    return nodePacks.some((pack) => managerStore.isPackInstalling(pack.id))
+  })
+
+  const createPayload = (installItem: NodePack) => {
+    if (!installItem.id) {
+      throw new Error(t('manager.packInstall.nodeIdRequired'))
+    }
+
+    const isUnclaimedPack = installItem.publisher?.name === 'Unclaimed'
+    const versionToInstall = isUnclaimedPack
+      ? ('nightly' as ManagerComponents['schemas']['SelectedVersion'])
+      : (installItem.latest_version?.version ??
+        ('latest' as ManagerComponents['schemas']['SelectedVersion']))
+
+    return {
+      id: installItem.id,
+      repository: installItem.repository ?? '',
+      channel: 'dev' as ManagerComponents['schemas']['ManagerChannel'],
+      mode: 'cache' as ManagerComponents['schemas']['ManagerDatabaseSource'],
+      selected_version: versionToInstall,
+      version: versionToInstall
+    }
+  }
+
+  const installPack = (item: NodePack) =>
+    managerStore.installPack.call(createPayload(item))
+
+  const performInstallation = async (packs: NodePack[]) => {
+    try {
+      const results = await Promise.allSettled(packs.map(installPack))
+      const failures = results.filter(
+        (r): r is PromiseRejectedResult => r.status === 'rejected'
+      )
+      if (failures.length) {
+        console.error(
+          '[usePackInstall] Some installations failed:',
+          failures.map((f) => f.reason)
+        )
+      }
+    } finally {
+      managerStore.installPack.clear()
+    }
+  }
+
+  const installAllPacks = async () => {
+    const nodePacks = getNodePacks()
+    if (!nodePacks?.length) return
+
+    const hasConflict = getHasConflict?.()
+    const conflictInfo = getConflictInfo?.()
+
+    if (hasConflict) {
+      if (!conflictInfo) return
+
+      const conflictedPackages = nodePacks
+        .map((pack) => {
+          const compatibilityCheck = checkNodeCompatibility(pack)
+          return {
+            package_id: pack.id || '',
+            package_name: pack.name || '',
+            has_conflict: compatibilityCheck.hasConflict,
+            conflicts: compatibilityCheck.conflicts,
+            is_compatible: !compatibilityCheck.hasConflict
+          }
+        })
+        .filter((result) => result.has_conflict)
+
+      showNodeConflictDialog({
+        conflictedPackages,
+        buttonText: t('manager.conflicts.installAnyway'),
+        onButtonClick: async () => {
+          const uninstalledPacks = nodePacks.filter(
+            (pack) => !managerStore.isPackInstalled(pack.id)
+          )
+          if (!uninstalledPacks.length) return
+          await performInstallation(uninstalledPacks)
+        }
+      })
+      return
+    }
+
+    const uninstalledPacks = nodePacks.filter(
+      (pack) => !managerStore.isPackInstalled(pack.id)
+    )
+    if (!uninstalledPacks.length) return
+    await performInstallation(uninstalledPacks)
+  }
+
+  return { isInstalling, installAllPacks, performInstallation }
+}
diff --git a/src/workbench/extensions/manager/composables/nodePack/usePackUpdateStatus.ts b/src/workbench/extensions/manager/composables/nodePack/usePackUpdateStatus.ts
index 5286169a6b..b65baf89a7 100644
--- a/src/workbench/extensions/manager/composables/nodePack/usePackUpdateStatus.ts
+++ b/src/workbench/extensions/manager/composables/nodePack/usePackUpdateStatus.ts
@@ -1,7 +1,7 @@
-import { toValue } from '@vueuse/core'
-import { compare, valid } from 'semver'
 import type { MaybeRefOrGetter } from 'vue'
-import { computed } from 'vue'
+import { computed, toValue } from 'vue'
+
+import { compare, valid } from 'semver'
 
 import type { components } from '@/types/comfyRegistryTypes'
 import { useComfyManagerStore } from '@/workbench/extensions/manager/stores/comfyManagerStore'
diff --git a/tests-ui/tests/composables/nodePack/usePacksSelection.test.ts b/src/workbench/extensions/manager/composables/nodePack/usePacksSelection.test.ts
similarity index 98%
rename from tests-ui/tests/composables/nodePack/usePacksSelection.test.ts
rename to src/workbench/extensions/manager/composables/nodePack/usePacksSelection.test.ts
index c38fc9c334..807cbeb386 100644
--- a/tests-ui/tests/composables/nodePack/usePacksSelection.test.ts
+++ b/src/workbench/extensions/manager/composables/nodePack/usePacksSelection.test.ts
@@ -1,4 +1,5 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { ref } from 'vue'
 
@@ -36,7 +37,7 @@ describe('usePacksSelection', () => {
 
   beforeEach(() => {
     vi.clearAllMocks()
-    const pinia = createPinia()
+    const pinia = createTestingPinia({ stubActions: false })
     setActivePinia(pinia)
 
     managerStore = useComfyManagerStore()
@@ -323,7 +324,7 @@ describe('usePacksSelection', () => {
   describe('edge cases', () => {
     it('should handle packs with undefined ids', () => {
       const nodePacks = ref<NodePack[]>([
-        { ...createMockPack('pack1'), id: undefined as any },
+        { ...createMockPack('pack1'), id: undefined },
         createMockPack('pack2')
       ])
 
diff --git a/tests-ui/tests/composables/nodePack/usePacksStatus.test.ts b/src/workbench/extensions/manager/composables/nodePack/usePacksStatus.test.ts
similarity index 98%
rename from tests-ui/tests/composables/nodePack/usePacksStatus.test.ts
rename to src/workbench/extensions/manager/composables/nodePack/usePacksStatus.test.ts
index 2fbabb3fbf..d630e5eb89 100644
--- a/tests-ui/tests/composables/nodePack/usePacksStatus.test.ts
+++ b/src/workbench/extensions/manager/composables/nodePack/usePacksStatus.test.ts
@@ -1,4 +1,5 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { ref } from 'vue'
 
@@ -48,7 +49,7 @@ describe('usePacksStatus', () => {
 
   beforeEach(() => {
     vi.clearAllMocks()
-    setActivePinia(createPinia())
+    setActivePinia(createTestingPinia({ stubActions: false }))
     conflictDetectionStore = useConflictDetectionStore()
   })
 
@@ -107,7 +108,7 @@ describe('usePacksStatus', () => {
 
     it('should handle packs without ids', () => {
       const nodePacks = ref<NodePack[]>([
-        { ...createMockPack('pack1'), id: undefined as any },
+        { ...createMockPack('pack1'), id: undefined },
         createMockPack('pack2')
       ])
 
diff --git a/tests-ui/tests/composables/useUpdateAvailableNodes.test.ts b/src/workbench/extensions/manager/composables/nodePack/useUpdateAvailableNodes.test.ts
similarity index 52%
rename from tests-ui/tests/composables/useUpdateAvailableNodes.test.ts
rename to src/workbench/extensions/manager/composables/nodePack/useUpdateAvailableNodes.test.ts
index c15b96ef6f..6d8e11de08 100644
--- a/tests-ui/tests/composables/useUpdateAvailableNodes.test.ts
+++ b/src/workbench/extensions/manager/composables/nodePack/useUpdateAvailableNodes.test.ts
@@ -39,6 +39,32 @@ const mockUseComfyManagerStore = vi.mocked(useComfyManagerStore)
 const mockSemverCompare = vi.mocked(compare)
 const mockSemverValid = vi.mocked(valid)
 
+type InstalledPacksReturn = ReturnType<typeof useInstalledPacks>
+type ManagerStoreReturn = ReturnType<typeof useComfyManagerStore>
+
+function createMockInstalledPacksReturn(
+  overrides: Partial<InstalledPacksReturn> = {}
+): InstalledPacksReturn {
+  return {
+    installedPacks: ref([]),
+    isLoading: ref(false),
+    isReady: ref(false),
+    error: ref(null),
+    startFetchInstalled: vi.fn(),
+    installedPacksWithVersions: ref([]),
+    filterInstalledPack: vi.fn(),
+    ...overrides
+  } as Partial<InstalledPacksReturn> as InstalledPacksReturn
+}
+
+function createMockManagerStoreReturn(
+  overrides: Partial<ManagerStoreReturn> = {}
+): ManagerStoreReturn {
+  return {
+    ...overrides
+  } as Partial<ManagerStoreReturn> as ManagerStoreReturn
+}
+
 describe('useUpdateAvailableNodes', () => {
   const mockInstalledPacks = [
     {
@@ -103,34 +129,29 @@ describe('useUpdateAvailableNodes', () => {
       return 0
     })
 
-    mockUseComfyManagerStore.mockReturnValue({
-      isPackInstalled: mockIsPackInstalled,
-      getInstalledPackVersion: mockGetInstalledPackVersion,
-      isPackEnabled: mockIsPackEnabled
-    } as unknown as ReturnType<typeof useComfyManagerStore>)
+    mockUseComfyManagerStore.mockReturnValue(
+      createMockManagerStoreReturn({
+        isPackInstalled: mockIsPackInstalled,
+        getInstalledPackVersion: mockGetInstalledPackVersion,
+        isPackEnabled: mockIsPackEnabled
+      })
+    )
 
-    mockUseInstalledPacks.mockReturnValue({
-      installedPacks: ref([]),
-      isLoading: ref(false),
-      isReady: ref(false),
-      error: ref(null),
-      startFetchInstalled: mockStartFetchInstalled,
-      installedPacksWithVersions: ref([]),
-      filterInstalledPack: vi.fn()
-    } as unknown as ReturnType<typeof useInstalledPacks>)
+    mockUseInstalledPacks.mockReturnValue(
+      createMockInstalledPacksReturn({
+        startFetchInstalled: mockStartFetchInstalled
+      })
+    )
   })
 
   describe('core filtering logic', () => {
     it('identifies outdated packs correctly', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref(mockInstalledPacks),
-        isLoading: ref(false),
-        isReady: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled,
-        installedPacksWithVersions: ref([]),
-        filterInstalledPack: vi.fn()
-      } as unknown as ReturnType<typeof useInstalledPacks>)
+      mockUseInstalledPacks.mockReturnValue(
+        createMockInstalledPacksReturn({
+          installedPacks: ref(mockInstalledPacks),
+          startFetchInstalled: mockStartFetchInstalled
+        })
+      )
 
       const { updateAvailableNodePacks } = useUpdateAvailableNodes()
 
@@ -140,15 +161,12 @@ describe('useUpdateAvailableNodes', () => {
     })
 
     it('excludes up-to-date packs', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([mockInstalledPacks[1]]), // pack-2: up to date
-        isLoading: ref(false),
-        isReady: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled,
-        installedPacksWithVersions: ref([]),
-        filterInstalledPack: vi.fn()
-      } as unknown as ReturnType<typeof useInstalledPacks>)
+      mockUseInstalledPacks.mockReturnValue(
+        createMockInstalledPacksReturn({
+          installedPacks: ref([mockInstalledPacks[1]]), // pack-2: up to date
+          startFetchInstalled: mockStartFetchInstalled
+        })
+      )
 
       const { updateAvailableNodePacks } = useUpdateAvailableNodes()
 
@@ -156,15 +174,12 @@ describe('useUpdateAvailableNodes', () => {
     })
 
     it('excludes nightly packs from updates', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([mockInstalledPacks[2]]), // pack-3: nightly
-        isLoading: ref(false),
-        isReady: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled,
-        installedPacksWithVersions: ref([]),
-        filterInstalledPack: vi.fn()
-      } as unknown as ReturnType<typeof useInstalledPacks>)
+      mockUseInstalledPacks.mockReturnValue(
+        createMockInstalledPacksReturn({
+          installedPacks: ref([mockInstalledPacks[2]]), // pack-3: nightly
+          startFetchInstalled: mockStartFetchInstalled
+        })
+      )
 
       const { updateAvailableNodePacks } = useUpdateAvailableNodes()
 
@@ -172,15 +187,12 @@ describe('useUpdateAvailableNodes', () => {
     })
 
     it('excludes packs with no latest version', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([mockInstalledPacks[3]]), // pack-4: no latest version
-        isLoading: ref(false),
-        isReady: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled,
-        installedPacksWithVersions: ref([]),
-        filterInstalledPack: vi.fn()
-      } as unknown as ReturnType<typeof useInstalledPacks>)
+      mockUseInstalledPacks.mockReturnValue(
+        createMockInstalledPacksReturn({
+          installedPacks: ref([mockInstalledPacks[3]]), // pack-4: no latest version
+          startFetchInstalled: mockStartFetchInstalled
+        })
+      )
 
       const { updateAvailableNodePacks } = useUpdateAvailableNodes()
 
@@ -189,15 +201,12 @@ describe('useUpdateAvailableNodes', () => {
 
     it('excludes uninstalled packs', () => {
       mockIsPackInstalled.mockReturnValue(false)
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref(mockInstalledPacks),
-        isLoading: ref(false),
-        isReady: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled,
-        installedPacksWithVersions: ref([]),
-        filterInstalledPack: vi.fn()
-      } as unknown as ReturnType<typeof useInstalledPacks>)
+      mockUseInstalledPacks.mockReturnValue(
+        createMockInstalledPacksReturn({
+          installedPacks: ref(mockInstalledPacks),
+          startFetchInstalled: mockStartFetchInstalled
+        })
+      )
 
       const { updateAvailableNodePacks } = useUpdateAvailableNodes()
 
@@ -213,15 +222,12 @@ describe('useUpdateAvailableNodes', () => {
 
   describe('hasUpdateAvailable computed', () => {
     it('returns true when updates are available', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([mockInstalledPacks[0]]), // pack-1: outdated
-        isLoading: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled,
-        isReady: ref(false),
-        installedPacksWithVersions: ref([]),
-        filterInstalledPack: vi.fn()
-      } as unknown as ReturnType<typeof useInstalledPacks>)
+      mockUseInstalledPacks.mockReturnValue(
+        createMockInstalledPacksReturn({
+          installedPacks: ref([mockInstalledPacks[0]]), // pack-1: outdated
+          startFetchInstalled: mockStartFetchInstalled
+        })
+      )
 
       const { hasUpdateAvailable } = useUpdateAvailableNodes()
 
@@ -229,15 +235,12 @@ describe('useUpdateAvailableNodes', () => {
     })
 
     it('returns false when no updates are available', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([mockInstalledPacks[1]]), // pack-2: up to date
-        isLoading: ref(false),
-        isReady: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled,
-        installedPacksWithVersions: ref([]),
-        filterInstalledPack: vi.fn()
-      } as unknown as ReturnType<typeof useInstalledPacks>)
+      mockUseInstalledPacks.mockReturnValue(
+        createMockInstalledPacksReturn({
+          installedPacks: ref([mockInstalledPacks[1]]), // pack-2: up to date
+          startFetchInstalled: mockStartFetchInstalled
+        })
+      )
 
       const { hasUpdateAvailable } = useUpdateAvailableNodes()
 
@@ -253,15 +256,12 @@ describe('useUpdateAvailableNodes', () => {
     })
 
     it('does not fetch when packs already exist', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref(mockInstalledPacks),
-        isLoading: ref(false),
-        isReady: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled,
-        installedPacksWithVersions: ref([]),
-        filterInstalledPack: vi.fn()
-      } as unknown as ReturnType<typeof useInstalledPacks>)
+      mockUseInstalledPacks.mockReturnValue(
+        createMockInstalledPacksReturn({
+          installedPacks: ref(mockInstalledPacks),
+          startFetchInstalled: mockStartFetchInstalled
+        })
+      )
 
       useUpdateAvailableNodes()
 
@@ -269,15 +269,12 @@ describe('useUpdateAvailableNodes', () => {
     })
 
     it('does not fetch when already loading', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([]),
-        isLoading: ref(true),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled,
-        isReady: ref(false),
-        installedPacksWithVersions: ref([]),
-        filterInstalledPack: vi.fn()
-      } as unknown as ReturnType<typeof useInstalledPacks>)
+      mockUseInstalledPacks.mockReturnValue(
+        createMockInstalledPacksReturn({
+          isLoading: ref(true),
+          startFetchInstalled: mockStartFetchInstalled
+        })
+      )
 
       useUpdateAvailableNodes()
 
@@ -287,15 +284,12 @@ describe('useUpdateAvailableNodes', () => {
 
   describe('state management', () => {
     it('exposes loading state from useInstalledPacks', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([]),
-        isLoading: ref(true),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled,
-        isReady: ref(false),
-        installedPacksWithVersions: ref([]),
-        filterInstalledPack: vi.fn()
-      } as unknown as ReturnType<typeof useInstalledPacks>)
+      mockUseInstalledPacks.mockReturnValue(
+        createMockInstalledPacksReturn({
+          isLoading: ref(true),
+          startFetchInstalled: mockStartFetchInstalled
+        })
+      )
 
       const { isLoading } = useUpdateAvailableNodes()
 
@@ -304,15 +298,12 @@ describe('useUpdateAvailableNodes', () => {
 
     it('exposes error state from useInstalledPacks', () => {
       const testError = 'Failed to fetch installed packs'
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([]),
-        isLoading: ref(false),
-        error: ref(testError),
-        startFetchInstalled: mockStartFetchInstalled,
-        isReady: ref(false),
-        installedPacksWithVersions: ref([]),
-        filterInstalledPack: vi.fn()
-      } as unknown as ReturnType<typeof useInstalledPacks>)
+      mockUseInstalledPacks.mockReturnValue(
+        createMockInstalledPacksReturn({
+          error: ref(testError),
+          startFetchInstalled: mockStartFetchInstalled
+        })
+      )
 
       const { error } = useUpdateAvailableNodes()
 
@@ -323,15 +314,12 @@ describe('useUpdateAvailableNodes', () => {
   describe('reactivity', () => {
     it('updates when installed packs change', async () => {
       const installedPacksRef = ref<components['schemas']['Node'][]>([])
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: installedPacksRef,
-        isLoading: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled,
-        isReady: ref(false),
-        installedPacksWithVersions: ref([]),
-        filterInstalledPack: vi.fn()
-      } as unknown as ReturnType<typeof useInstalledPacks>)
+      mockUseInstalledPacks.mockReturnValue(
+        createMockInstalledPacksReturn({
+          installedPacks: installedPacksRef,
+          startFetchInstalled: mockStartFetchInstalled
+        })
+      )
 
       const { updateAvailableNodePacks, hasUpdateAvailable } =
         useUpdateAvailableNodes()
@@ -352,15 +340,12 @@ describe('useUpdateAvailableNodes', () => {
 
   describe('version comparison logic', () => {
     it('calls compareVersions with correct parameters', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([mockInstalledPacks[0]]), // pack-1
-        isLoading: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled,
-        isReady: ref(false),
-        installedPacksWithVersions: ref([]),
-        filterInstalledPack: vi.fn()
-      } as unknown as ReturnType<typeof useInstalledPacks>)
+      mockUseInstalledPacks.mockReturnValue(
+        createMockInstalledPacksReturn({
+          installedPacks: ref([mockInstalledPacks[0]]), // pack-1
+          startFetchInstalled: mockStartFetchInstalled
+        })
+      )
 
       const { updateAvailableNodePacks } = useUpdateAvailableNodes()
 
@@ -371,15 +356,12 @@ describe('useUpdateAvailableNodes', () => {
     })
 
     it('calls semver.valid to check nightly versions', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([mockInstalledPacks[2]]), // pack-3: nightly
-        isLoading: ref(false),
-        isReady: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled,
-        installedPacksWithVersions: ref([]),
-        filterInstalledPack: vi.fn()
-      } as unknown as ReturnType<typeof useInstalledPacks>)
+      mockUseInstalledPacks.mockReturnValue(
+        createMockInstalledPacksReturn({
+          installedPacks: ref([mockInstalledPacks[2]]), // pack-3: nightly
+          startFetchInstalled: mockStartFetchInstalled
+        })
+      )
 
       const { updateAvailableNodePacks } = useUpdateAvailableNodes()
 
@@ -390,15 +372,12 @@ describe('useUpdateAvailableNodes', () => {
     })
 
     it('calls isPackInstalled for each pack', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref(mockInstalledPacks),
-        isLoading: ref(false),
-        isReady: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled,
-        installedPacksWithVersions: ref([]),
-        filterInstalledPack: vi.fn()
-      } as unknown as ReturnType<typeof useInstalledPacks>)
+      mockUseInstalledPacks.mockReturnValue(
+        createMockInstalledPacksReturn({
+          installedPacks: ref(mockInstalledPacks),
+          startFetchInstalled: mockStartFetchInstalled
+        })
+      )
 
       const { updateAvailableNodePacks } = useUpdateAvailableNodes()
 
@@ -419,15 +398,12 @@ describe('useUpdateAvailableNodes', () => {
         return id !== 'pack-1'
       })
 
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([mockInstalledPacks[0], mockInstalledPacks[1]]),
-        isLoading: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled,
-        isReady: ref(false),
-        installedPacksWithVersions: ref([]),
-        filterInstalledPack: vi.fn()
-      } as unknown as ReturnType<typeof useInstalledPacks>)
+      mockUseInstalledPacks.mockReturnValue(
+        createMockInstalledPacksReturn({
+          installedPacks: ref([mockInstalledPacks[0], mockInstalledPacks[1]]),
+          startFetchInstalled: mockStartFetchInstalled
+        })
+      )
 
       const { updateAvailableNodePacks, enabledUpdateAvailableNodePacks } =
         useUpdateAvailableNodes()
@@ -441,15 +417,12 @@ describe('useUpdateAvailableNodes', () => {
     })
 
     it('returns all packs when all are enabled', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([mockInstalledPacks[0]]), // pack-1: outdated
-        isLoading: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled,
-        isReady: ref(false),
-        installedPacksWithVersions: ref([]),
-        filterInstalledPack: vi.fn()
-      } as unknown as ReturnType<typeof useInstalledPacks>)
+      mockUseInstalledPacks.mockReturnValue(
+        createMockInstalledPacksReturn({
+          installedPacks: ref([mockInstalledPacks[0]]), // pack-1: outdated
+          startFetchInstalled: mockStartFetchInstalled
+        })
+      )
 
       const { updateAvailableNodePacks, enabledUpdateAvailableNodePacks } =
         useUpdateAvailableNodes()
@@ -467,15 +440,12 @@ describe('useUpdateAvailableNodes', () => {
         return id !== 'pack-1'
       })
 
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([mockInstalledPacks[0]]), // pack-1: outdated
-        isLoading: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled,
-        isReady: ref(false),
-        installedPacksWithVersions: ref([]),
-        filterInstalledPack: vi.fn()
-      } as unknown as ReturnType<typeof useInstalledPacks>)
+      mockUseInstalledPacks.mockReturnValue(
+        createMockInstalledPacksReturn({
+          installedPacks: ref([mockInstalledPacks[0]]), // pack-1: outdated
+          startFetchInstalled: mockStartFetchInstalled
+        })
+      )
 
       const { hasDisabledUpdatePacks } = useUpdateAvailableNodes()
 
@@ -483,15 +453,12 @@ describe('useUpdateAvailableNodes', () => {
     })
 
     it('returns false when all packs with updates are enabled', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([mockInstalledPacks[0]]), // pack-1: outdated
-        isLoading: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled,
-        isReady: ref(false),
-        installedPacksWithVersions: ref([]),
-        filterInstalledPack: vi.fn()
-      } as unknown as ReturnType<typeof useInstalledPacks>)
+      mockUseInstalledPacks.mockReturnValue(
+        createMockInstalledPacksReturn({
+          installedPacks: ref([mockInstalledPacks[0]]), // pack-1: outdated
+          startFetchInstalled: mockStartFetchInstalled
+        })
+      )
 
       const { hasDisabledUpdatePacks } = useUpdateAvailableNodes()
 
@@ -499,15 +466,12 @@ describe('useUpdateAvailableNodes', () => {
     })
 
     it('returns false when no packs have updates', () => {
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([mockInstalledPacks[1]]), // pack-2: up to date
-        isLoading: ref(false),
-        isReady: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled,
-        installedPacksWithVersions: ref([]),
-        filterInstalledPack: vi.fn()
-      } as unknown as ReturnType<typeof useInstalledPacks>)
+      mockUseInstalledPacks.mockReturnValue(
+        createMockInstalledPacksReturn({
+          installedPacks: ref([mockInstalledPacks[1]]), // pack-2: up to date
+          startFetchInstalled: mockStartFetchInstalled
+        })
+      )
 
       const { hasDisabledUpdatePacks } = useUpdateAvailableNodes()
 
@@ -519,15 +483,12 @@ describe('useUpdateAvailableNodes', () => {
     it('returns false when only disabled packs have updates', () => {
       mockIsPackEnabled.mockReturnValue(false) // All packs disabled
 
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([mockInstalledPacks[0]]), // pack-1: outdated
-        isLoading: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled,
-        isReady: ref(false),
-        installedPacksWithVersions: ref([]),
-        filterInstalledPack: vi.fn()
-      } as unknown as ReturnType<typeof useInstalledPacks>)
+      mockUseInstalledPacks.mockReturnValue(
+        createMockInstalledPacksReturn({
+          installedPacks: ref([mockInstalledPacks[0]]), // pack-1: outdated
+          startFetchInstalled: mockStartFetchInstalled
+        })
+      )
 
       const { hasUpdateAvailable } = useUpdateAvailableNodes()
 
@@ -540,15 +501,12 @@ describe('useUpdateAvailableNodes', () => {
         return id === 'pack-1'
       })
 
-      mockUseInstalledPacks.mockReturnValue({
-        installedPacks: ref([mockInstalledPacks[0]]), // pack-1: outdated
-        isLoading: ref(false),
-        error: ref(null),
-        startFetchInstalled: mockStartFetchInstalled,
-        isReady: ref(false),
-        installedPacksWithVersions: ref([]),
-        filterInstalledPack: vi.fn()
-      } as unknown as ReturnType<typeof useInstalledPacks>)
+      mockUseInstalledPacks.mockReturnValue(
+        createMockInstalledPacksReturn({
+          installedPacks: ref([mockInstalledPacks[0]]), // pack-1: outdated
+          startFetchInstalled: mockStartFetchInstalled
+        })
+      )
 
       const { hasUpdateAvailable } = useUpdateAvailableNodes()
 
diff --git a/src/workbench/extensions/manager/composables/nodePack/useUpdateAvailableNodes.ts b/src/workbench/extensions/manager/composables/nodePack/useUpdateAvailableNodes.ts
index c18fcdf610..fd6f74e1db 100644
--- a/src/workbench/extensions/manager/composables/nodePack/useUpdateAvailableNodes.ts
+++ b/src/workbench/extensions/manager/composables/nodePack/useUpdateAvailableNodes.ts
@@ -7,7 +7,6 @@ import { useComfyManagerStore } from '@/workbench/extensions/manager/stores/comf
 
 /**
  * Composable to find NodePacks that have updates available
- * Uses the same filtering approach as ManagerDialogContent.vue
  * Automatically fetches installed pack data when initialized
  */
 export const useUpdateAvailableNodes = () => {
@@ -34,7 +33,6 @@ export const useUpdateAvailableNodes = () => {
     return compare(latestVersion, installedVersion) > 0
   }
 
-  // Same filtering logic as ManagerDialogContent.vue
   const filterOutdatedPacks = (packs: components['schemas']['Node'][]) =>
     packs.filter(isOutdatedPack)
 
diff --git a/src/workbench/extensions/manager/composables/nodePack/useWorkflowPacks.ts b/src/workbench/extensions/manager/composables/nodePack/useWorkflowPacks.ts
index e2580ee8de..5fa3fcf385 100644
--- a/src/workbench/extensions/manager/composables/nodePack/useWorkflowPacks.ts
+++ b/src/workbench/extensions/manager/composables/nodePack/useWorkflowPacks.ts
@@ -1,3 +1,4 @@
+import { createSharedComposable } from '@vueuse/core'
 import { computed, onUnmounted, ref } from 'vue'
 
 import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
@@ -9,9 +10,8 @@ import { useSystemStatsStore } from '@/stores/systemStatsStore'
 import type { components } from '@/types/comfyRegistryTypes'
 import { mapAllNodes } from '@/utils/graphTraversalUtil'
 import { useNodePacks } from '@/workbench/extensions/manager/composables/nodePack/useNodePacks'
-import type { UseNodePacksOptions } from '@/workbench/extensions/manager/types/comfyManagerTypes'
 
-type WorkflowPack = {
+export type WorkflowPack = {
   id:
     | ComfyWorkflowJSON['nodes'][number]['properties']['cnr_id']
     | ComfyWorkflowJSON['nodes'][number]['properties']['aux_id']
@@ -22,9 +22,10 @@ const CORE_NODES_PACK_NAME = 'comfy-core'
 
 /**
  * Handles parsing node pack metadata from nodes on the graph and fetching the
- * associated node packs from the registry
+ * associated node packs from the registry.
+ * This is a shared singleton composable - all components use the same instance.
  */
-export const useWorkflowPacks = (options: UseNodePacksOptions = {}) => {
+const _useWorkflowPacks = () => {
   const nodeDefStore = useNodeDefStore()
   const systemStatsStore = useSystemStatsStore()
   const { inferPackFromNodeName } = useComfyRegistryStore()
@@ -129,7 +130,7 @@ export const useWorkflowPacks = (options: UseNodePacksOptions = {}) => {
   )
 
   const { startFetch, cleanup, error, isLoading, nodePacks, isReady } =
-    useNodePacks(workflowPacksIds, options)
+    useNodePacks(workflowPacksIds)
 
   const isIdInWorkflow = (packId: string) =>
     workflowPacksIds.value.includes(packId)
@@ -153,3 +154,5 @@ export const useWorkflowPacks = (options: UseNodePacksOptions = {}) => {
     filterWorkflowPack
   }
 }
+
+export const useWorkflowPacks = createSharedComposable(_useWorkflowPacks)
diff --git a/src/workbench/extensions/manager/composables/useApplyChanges.ts b/src/workbench/extensions/manager/composables/useApplyChanges.ts
new file mode 100644
index 0000000000..9d3495071c
--- /dev/null
+++ b/src/workbench/extensions/manager/composables/useApplyChanges.ts
@@ -0,0 +1,118 @@
+import { createSharedComposable, useEventListener } from '@vueuse/core'
+import { ref } from 'vue'
+
+import { useSettingStore } from '@/platform/settings/settingStore'
+import { useWorkflowService } from '@/platform/workflow/core/services/workflowService'
+import { api } from '@/scripts/api'
+import { useCommandStore } from '@/stores/commandStore'
+import { useConflictDetection } from '@/workbench/extensions/manager/composables/useConflictDetection'
+import { useComfyManagerService } from '@/workbench/extensions/manager/services/comfyManagerService'
+import { useComfyManagerStore } from '@/workbench/extensions/manager/stores/comfyManagerStore'
+
+export const useApplyChanges = createSharedComposable(() => {
+  const comfyManagerStore = useComfyManagerStore()
+  const settingStore = useSettingStore()
+  const { runFullConflictAnalysis } = useConflictDetection()
+
+  const isRestarting = ref(false)
+  const isRestartCompleted = ref(false)
+
+  async function applyChanges(onClose?: () => void) {
+    if (isRestarting.value) return
+
+    isRestarting.value = true
+    isRestartCompleted.value = false
+
+    const originalToastSetting = settingStore.get(
+      'Comfy.Toast.DisableReconnectingToast'
+    )
+    const onReconnect = async () => {
+      try {
+        comfyManagerStore.setStale()
+        await useCommandStore().execute('Comfy.RefreshNodeDefinitions')
+        await useWorkflowService().reloadCurrentWorkflow()
+        runFullConflictAnalysis().catch((err) => {
+          console.error('[useApplyChanges] Conflict analysis failed:', err)
+        })
+      } catch (err) {
+        console.error('[useApplyChanges] Post-reconnect tasks failed:', err)
+      } finally {
+        try {
+          await settingStore.set(
+            'Comfy.Toast.DisableReconnectingToast',
+            originalToastSetting
+          )
+        } catch (err) {
+          console.error(
+            '[useApplyChanges] Failed to restore reconnect toast setting:',
+            err
+          )
+        }
+        isRestarting.value = false
+        isRestartCompleted.value = true
+
+        setTimeout(() => {
+          onClose?.()
+        }, 3000)
+      }
+    }
+
+    let hasReconnected = false
+    const stopReconnectListener = useEventListener(
+      api,
+      'reconnected',
+      () => {
+        clearTimeout(reconnectTimeout)
+        hasReconnected = true
+        void onReconnect()
+      },
+      { once: true }
+    )
+
+    const RECONNECT_TIMEOUT_MS = 120_000 // 2 minutes
+    let reconnectTimeout: ReturnType<typeof setTimeout> | undefined
+
+    try {
+      await settingStore.set('Comfy.Toast.DisableReconnectingToast', true)
+      await useComfyManagerService().rebootComfyUI()
+      reconnectTimeout = setTimeout(async () => {
+        if (hasReconnected) return
+        stopReconnectListener()
+        try {
+          await settingStore.set(
+            'Comfy.Toast.DisableReconnectingToast',
+            originalToastSetting
+          )
+        } catch (err) {
+          console.error(
+            '[useApplyChanges] Failed to restore reconnect toast setting:',
+            err
+          )
+        }
+        isRestarting.value = false
+        isRestartCompleted.value = false
+        console.error('[useApplyChanges] Reconnect timed out')
+      }, RECONNECT_TIMEOUT_MS)
+    } catch (error) {
+      stopReconnectListener()
+      try {
+        await settingStore.set(
+          'Comfy.Toast.DisableReconnectingToast',
+          originalToastSetting
+        )
+      } catch (restoreErr) {
+        console.error(
+          '[useApplyChanges] Failed to restore reconnect toast setting:',
+          restoreErr
+        )
+      } finally {
+        isRestarting.value = false
+        isRestartCompleted.value = false
+        onClose?.()
+      }
+      throw error
+    }
+  }
+
+  return { isRestarting, isRestartCompleted, applyChanges }
+})
diff --git a/tests-ui/tests/composables/useConflictAcknowledgment.test.ts b/src/workbench/extensions/manager/composables/useConflictAcknowledgment.test.ts
similarity index 97%
rename from tests-ui/tests/composables/useConflictAcknowledgment.test.ts
rename to src/workbench/extensions/manager/composables/useConflictAcknowledgment.test.ts
index 43f25da9e6..dbd7a5f257 100644
--- a/tests-ui/tests/composables/useConflictAcknowledgment.test.ts
+++ b/src/workbench/extensions/manager/composables/useConflictAcknowledgment.test.ts
@@ -1,10 +1,11 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 describe('useConflictAcknowledgment', () => {
   beforeEach(() => {
     // Set up Pinia for each test
-    setActivePinia(createPinia())
+    setActivePinia(createTestingPinia({ stubActions: false }))
     // Clear localStorage before each test
     localStorage.clear()
     // Reset modules to ensure fresh state
diff --git a/src/workbench/extensions/manager/composables/useConflictAcknowledgment.ts b/src/workbench/extensions/manager/composables/useConflictAcknowledgment.ts
index 0abec73e40..d79b5086e7 100644
--- a/src/workbench/extensions/manager/composables/useConflictAcknowledgment.ts
+++ b/src/workbench/extensions/manager/composables/useConflictAcknowledgment.ts
@@ -15,7 +15,7 @@ const STORAGE_KEYS = {
 /**
  * Interface for conflict acknowledgment state
  */
-interface ConflictAcknowledgmentState {
+export interface ConflictAcknowledgmentState {
   modal_dismissed: boolean
   red_dot_dismissed: boolean
   warning_banner_dismissed: boolean
diff --git a/tests-ui/tests/composables/useConflictDetection.test.ts b/src/workbench/extensions/manager/composables/useConflictDetection.test.ts
similarity index 87%
rename from tests-ui/tests/composables/useConflictDetection.test.ts
rename to src/workbench/extensions/manager/composables/useConflictDetection.test.ts
index 70b512bdf9..fca5e7de69 100644
--- a/tests-ui/tests/composables/useConflictDetection.test.ts
+++ b/src/workbench/extensions/manager/composables/useConflictDetection.test.ts
@@ -1,4 +1,5 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { computed, ref } from 'vue'
 
@@ -7,6 +8,7 @@ import { useSystemStatsStore } from '@/stores/systemStatsStore'
 import type { components } from '@/types/comfyRegistryTypes'
 import { useInstalledPacks } from '@/workbench/extensions/manager/composables/nodePack/useInstalledPacks'
 import { useConflictAcknowledgment } from '@/workbench/extensions/manager/composables/useConflictAcknowledgment'
+import type { ConflictAcknowledgmentState } from '@/workbench/extensions/manager/composables/useConflictAcknowledgment'
 import { useConflictDetection } from '@/workbench/extensions/manager/composables/useConflictDetection'
 import { useComfyManagerService } from '@/workbench/extensions/manager/services/comfyManagerService'
 import { useComfyManagerStore } from '@/workbench/extensions/manager/stores/comfyManagerStore'
@@ -114,19 +116,23 @@ vi.mock('@/workbench/extensions/manager/composables/useManagerState', () => ({
 }))
 
 describe('useConflictDetection', () => {
-  let pinia: ReturnType<typeof createPinia>
+  let pinia: ReturnType<typeof createTestingPinia>
 
   const mockComfyManagerService = {
     getImportFailInfoBulk: vi.fn(),
     isLoading: ref(false),
     error: ref<string | null>(null)
-  } as unknown as ReturnType<typeof useComfyManagerService>
+  } as Partial<ReturnType<typeof useComfyManagerService>> as ReturnType<
+    typeof useComfyManagerService
+  >
 
   const mockRegistryService = {
     getBulkNodeVersions: vi.fn(),
     isLoading: ref(false),
     error: ref<string | null>(null)
-  } as unknown as ReturnType<typeof useComfyRegistryService>
+  } as Partial<ReturnType<typeof useComfyRegistryService>> as ReturnType<
+    typeof useComfyRegistryService
+  >
 
   // Create a ref that can be modified in tests
   const mockInstalledPacksWithVersions = ref<{ id: string; version: string }[]>(
@@ -142,35 +148,43 @@ describe('useConflictDetection', () => {
     isReady: ref(false),
     isLoading: ref(false),
     error: ref<unknown>(null)
-  } as unknown as ReturnType<typeof useInstalledPacks>
+  } as Partial<ReturnType<typeof useInstalledPacks>> as ReturnType<
+    typeof useInstalledPacks
+  >
 
   const mockManagerStore = {
     isPackEnabled: vi.fn()
-  } as unknown as ReturnType<typeof useComfyManagerStore>
+  } as Partial<ReturnType<typeof useComfyManagerStore>> as ReturnType<
+    typeof useComfyManagerStore
+  >
 
   // Create refs that can be used to control computed properties
-  const mockConflictedPackages = ref<ConflictDetectionResult[]>([])
+  let mockConflictedPackages: ConflictDetectionResult[] = []
 
   const mockConflictStore = {
-    hasConflicts: computed(() =>
-      mockConflictedPackages.value.some((p) => p.has_conflict)
-    ),
-    conflictedPackages: mockConflictedPackages,
-    bannedPackages: computed(() =>
-      mockConflictedPackages.value.filter((p) =>
+    get hasConflicts() {
+      return mockConflictedPackages.some((p) => p.has_conflict)
+    },
+    get conflictedPackages() {
+      return mockConflictedPackages
+    },
+    get bannedPackages() {
+      return mockConflictedPackages.filter((p) =>
         p.conflicts?.some((c) => c.type === 'banned')
       )
-    ),
-    securityPendingPackages: computed(() =>
-      mockConflictedPackages.value.filter((p) =>
+    },
+    get securityPendingPackages() {
+      return mockConflictedPackages.filter((p) =>
         p.conflicts?.some((c) => c.type === 'pending')
       )
-    ),
+    },
     setConflictedPackages: vi.fn(),
     clearConflicts: vi.fn()
-  } as unknown as ReturnType<typeof useConflictDetectionStore>
+  } as Partial<ReturnType<typeof useConflictDetectionStore>> as ReturnType<
+    typeof useConflictDetectionStore
+  >
 
-  const mockIsInitialized = ref(true)
+  const mockIsInitialized = true
   const mockSystemStatsStore = {
     systemStats: {
       system: {
@@ -198,30 +212,30 @@ describe('useConflictDetection', () => {
       ]
     },
     isInitialized: mockIsInitialized,
-    $state: {} as never,
-    $patch: vi.fn(),
-    $reset: vi.fn(),
-    $subscribe: vi.fn(),
-    $onAction: vi.fn(),
-    $dispose: vi.fn(),
-    $id: 'systemStats',
+
     _customProperties: new Set<string>()
-  } as unknown as ReturnType<typeof useSystemStatsStore>
+  } as Partial<ReturnType<typeof useSystemStatsStore>> as ReturnType<
+    typeof useSystemStatsStore
+  >
 
   const mockAcknowledgment = {
     checkComfyUIVersionChange: vi.fn(),
-    acknowledgmentState: computed(() => ({})),
+    acknowledgmentState: computed(
+      () => ({}) as Partial<ConflictAcknowledgmentState>
+    ),
     shouldShowConflictModal: computed(() => false),
     shouldShowRedDot: computed(() => false),
     shouldShowManagerBanner: computed(() => false),
     dismissRedDotNotification: vi.fn(),
     dismissWarningBanner: vi.fn(),
     markConflictsAsSeen: vi.fn()
-  } as unknown as ReturnType<typeof useConflictAcknowledgment>
+  } as Partial<ReturnType<typeof useConflictAcknowledgment>> as ReturnType<
+    typeof useConflictAcknowledgment
+  >
 
   beforeEach(() => {
     vi.clearAllMocks()
-    pinia = createPinia()
+    pinia = createTestingPinia({ stubActions: false })
     setActivePinia(pinia)
 
     // Setup mocks
@@ -248,7 +262,7 @@ describe('useConflictDetection', () => {
     // Reset the installedPacksWithVersions data
     mockInstalledPacksWithVersions.value = []
     // Reset conflicted packages
-    mockConflictedPackages.value = []
+    mockConflictedPackages = []
   })
 
   afterEach(() => {
@@ -410,10 +424,10 @@ describe('useConflictDetection', () => {
         mockComfyManagerService.getImportFailInfoBulk
       ).mockResolvedValue({
         'fail-pack': {
-          msg: 'Import error',
+          error: 'Import error',
           name: 'fail-pack',
           path: '/path/to/pack'
-        } as any // The actual API returns different structure than types
+        } as { error?: string; traceback?: string } | null // The actual API returns different structure than types
       })
 
       // Mock registry response for the package
@@ -428,7 +442,7 @@ describe('useConflictDetection', () => {
       // Import failure should match the actual implementation
       expect(result.results[0].conflicts).toContainEqual({
         type: 'import_failed',
-        current_value: 'installed',
+        current_value: 'Import error',
         required_value: 'Import error'
       })
     })
@@ -436,7 +450,7 @@ describe('useConflictDetection', () => {
 
   describe('computed properties', () => {
     it('should expose conflict status from store', () => {
-      mockConflictedPackages.value = [
+      mockConflictedPackages = [
         {
           package_id: 'test',
           package_name: 'Test',
@@ -449,8 +463,8 @@ describe('useConflictDetection', () => {
       useConflictDetection()
 
       // The hasConflicts computed should be true since we have a conflict
-      expect(mockConflictedPackages.value).toHaveLength(1)
-      expect(mockConflictedPackages.value[0].has_conflict).toBe(true)
+      expect(mockConflictedPackages).toHaveLength(1)
+      expect(mockConflictedPackages[0].has_conflict).toBe(true)
     })
   })
 
diff --git a/src/workbench/extensions/manager/composables/useConflictDetection.ts b/src/workbench/extensions/manager/composables/useConflictDetection.ts
index 43a6fd3d20..ee97546717 100644
--- a/src/workbench/extensions/manager/composables/useConflictDetection.ts
+++ b/src/workbench/extensions/manager/composables/useConflictDetection.ts
@@ -19,6 +19,7 @@ import type {
   ConflictDetail,
   ConflictDetectionResponse,
   ConflictDetectionResult,
+  ImportFailureMap,
   Node,
   NodeRequirements,
   SystemEnvironment
@@ -336,7 +337,7 @@ export function useConflictDetection() {
    * Gets installed packages and checks each one for import failures using bulk API.
    * @returns Promise that resolves to import failure data
    */
-  async function fetchImportFailInfo(): Promise<Record<string, any>> {
+  async function fetchImportFailInfo(): Promise<ImportFailureMap> {
     try {
       const comfyManagerService = useComfyManagerService()
 
@@ -362,7 +363,7 @@ export function useConflictDetection() {
 
       if (bulkResult) {
         // Filter out null values (packages without import failures)
-        const importFailures: Record<string, any> = {}
+        const importFailures: ImportFailureMap = {}
 
         Object.entries(bulkResult).forEach(([packageId, failInfo]) => {
           if (failInfo !== null) {
@@ -389,7 +390,7 @@ export function useConflictDetection() {
    * @returns Array of conflict detection results for failed imports
    */
   function detectImportFailConflicts(
-    importFailInfo: Record<string, { msg: string; name: string; path: string }>
+    importFailInfo: ImportFailureMap
   ): ConflictDetectionResult[] {
     const results: ConflictDetectionResult[] = []
     if (!importFailInfo || typeof importFailInfo !== 'object') {
@@ -398,33 +399,29 @@ export function useConflictDetection() {
 
     // Process import failures
     for (const [packageId, failureInfo] of Object.entries(importFailInfo)) {
-      if (failureInfo && typeof failureInfo === 'object') {
-        // Extract error information from Manager API response
-        const errorMsg = failureInfo.msg || 'Unknown import error'
-        const modulePath = failureInfo.path || ''
+      if (!failureInfo || typeof failureInfo !== 'object') continue
 
-        results.push({
-          package_id: packageId,
-          package_name: packageId,
-          has_conflict: true,
-          conflicts: [
-            {
-              type: 'import_failed',
-              current_value: 'installed',
-              required_value: failureInfo.msg
-            }
-          ],
-          is_compatible: false
-        })
+      const errorMsg = failureInfo.error || 'Unknown import error'
+      const fullErrorInfo = failureInfo.traceback || errorMsg
 
-        console.warn(
-          `[ConflictDetection] Python import failure detected for ${packageId}:`,
+      results.push({
+        package_id: packageId,
+        package_name: packageId,
+        has_conflict: true,
+        conflicts: [
           {
-            path: modulePath,
-            error: errorMsg
+            type: 'import_failed',
+            current_value: errorMsg,
+            required_value: fullErrorInfo
           }
-        )
-      }
+        ],
+        is_compatible: false
+      })
+
+      console.warn(
+        `[ConflictDetection] Python import failure detected for ${packageId}:`,
+        errorMsg
+      )
     }
 
     return results
diff --git a/tests-ui/tests/composables/useImportFailedDetection.test.ts b/src/workbench/extensions/manager/composables/useImportFailedDetection.test.ts
similarity index 60%
rename from tests-ui/tests/composables/useImportFailedDetection.test.ts
rename to src/workbench/extensions/manager/composables/useImportFailedDetection.test.ts
index 5a6614ca0e..a89309d281 100644
--- a/tests-ui/tests/composables/useImportFailedDetection.test.ts
+++ b/src/workbench/extensions/manager/composables/useImportFailedDetection.test.ts
@@ -1,18 +1,34 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { computed, ref } from 'vue'
 
-import * as dialogService from '@/services/dialogService'
 import { useImportFailedDetection } from '@/workbench/extensions/manager/composables/useImportFailedDetection'
-import * as comfyManagerStore from '@/workbench/extensions/manager/stores/comfyManagerStore'
-import * as conflictDetectionStore from '@/workbench/extensions/manager/stores/conflictDetectionStore'
 
-// Mock the stores and services
-vi.mock('@/workbench/extensions/manager/stores/comfyManagerStore')
-vi.mock('@/workbench/extensions/manager/stores/conflictDetectionStore')
-vi.mock('@/services/dialogService')
-vi.mock('vue-i18n', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('vue-i18n')>()
+const mockIsPackInstalled = vi.fn()
+const mockGetConflictsForPackageByID = vi.fn()
+const mockShow = vi.fn()
+
+vi.mock('@/workbench/extensions/manager/stores/comfyManagerStore', () => ({
+  useComfyManagerStore: () => ({
+    isPackInstalled: mockIsPackInstalled
+  })
+}))
+vi.mock('@/workbench/extensions/manager/stores/conflictDetectionStore', () => ({
+  useConflictDetectionStore: () => ({
+    getConflictsForPackageByID: mockGetConflictsForPackageByID
+  })
+}))
+vi.mock(
+  '@/workbench/extensions/manager/composables/useImportFailedNodeDialog',
+  () => ({
+    useImportFailedNodeDialog: () => ({
+      show: mockShow
+    })
+  })
+)
+vi.mock('vue-i18n', async () => {
+  const actual = await vi.importActual('vue-i18n')
   return {
     ...actual,
     useI18n: () => ({
@@ -22,42 +38,13 @@ vi.mock('vue-i18n', async (importOriginal) => {
 })
 
 describe('useImportFailedDetection', () => {
-  let mockComfyManagerStore: ReturnType<
-    typeof comfyManagerStore.useComfyManagerStore
-  >
-  let mockConflictDetectionStore: ReturnType<
-    typeof conflictDetectionStore.useConflictDetectionStore
-  >
-  let mockDialogService: ReturnType<typeof dialogService.useDialogService>
-
   beforeEach(() => {
-    setActivePinia(createPinia())
-
-    mockComfyManagerStore = {
-      isPackInstalled: vi.fn()
-    } as unknown as ReturnType<typeof comfyManagerStore.useComfyManagerStore>
-
-    mockConflictDetectionStore = {
-      getConflictsForPackageByID: vi.fn()
-    } as unknown as ReturnType<
-      typeof conflictDetectionStore.useConflictDetectionStore
-    >
-
-    mockDialogService = {
-      showErrorDialog: vi.fn()
-    } as unknown as ReturnType<typeof dialogService.useDialogService>
-
-    vi.mocked(comfyManagerStore.useComfyManagerStore).mockReturnValue(
-      mockComfyManagerStore
-    )
-    vi.mocked(conflictDetectionStore.useConflictDetectionStore).mockReturnValue(
-      mockConflictDetectionStore
-    )
-    vi.mocked(dialogService.useDialogService).mockReturnValue(mockDialogService)
+    setActivePinia(createTestingPinia({ stubActions: false }))
+    vi.clearAllMocks()
   })
 
   it('should return false for importFailed when package is not installed', () => {
-    vi.mocked(mockComfyManagerStore.isPackInstalled).mockReturnValue(false)
+    mockIsPackInstalled.mockReturnValue(false)
 
     const { importFailed } = useImportFailedDetection('test-package')
 
@@ -65,10 +52,8 @@ describe('useImportFailedDetection', () => {
   })
 
   it('should return false for importFailed when no conflicts exist', () => {
-    vi.mocked(mockComfyManagerStore.isPackInstalled).mockReturnValue(true)
-    vi.mocked(
-      mockConflictDetectionStore.getConflictsForPackageByID
-    ).mockReturnValue(undefined)
+    mockIsPackInstalled.mockReturnValue(true)
+    mockGetConflictsForPackageByID.mockReturnValue(undefined)
 
     const { importFailed } = useImportFailedDetection('test-package')
 
@@ -76,10 +61,8 @@ describe('useImportFailedDetection', () => {
   })
 
   it('should return false for importFailed when conflicts exist but no import_failed type', () => {
-    vi.mocked(mockComfyManagerStore.isPackInstalled).mockReturnValue(true)
-    vi.mocked(
-      mockConflictDetectionStore.getConflictsForPackageByID
-    ).mockReturnValue({
+    mockIsPackInstalled.mockReturnValue(true)
+    mockGetConflictsForPackageByID.mockReturnValue({
       package_id: 'test-package',
       package_name: 'Test Package',
       has_conflict: true,
@@ -104,10 +87,8 @@ describe('useImportFailedDetection', () => {
   })
 
   it('should return true for importFailed when import_failed conflicts exist', () => {
-    vi.mocked(mockComfyManagerStore.isPackInstalled).mockReturnValue(true)
-    vi.mocked(
-      mockConflictDetectionStore.getConflictsForPackageByID
-    ).mockReturnValue({
+    mockIsPackInstalled.mockReturnValue(true)
+    mockGetConflictsForPackageByID.mockReturnValue({
       package_id: 'test-package',
       package_name: 'Test Package',
       has_conflict: true,
@@ -133,10 +114,8 @@ describe('useImportFailedDetection', () => {
 
   it('should work with computed ref packageId', () => {
     const packageId = ref('test-package')
-    vi.mocked(mockComfyManagerStore.isPackInstalled).mockReturnValue(true)
-    vi.mocked(
-      mockConflictDetectionStore.getConflictsForPackageByID
-    ).mockReturnValue({
+    mockIsPackInstalled.mockReturnValue(true)
+    mockGetConflictsForPackageByID.mockReturnValue({
       package_id: 'test-package',
       package_name: 'Test Package',
       has_conflict: true,
@@ -158,9 +137,7 @@ describe('useImportFailedDetection', () => {
 
     // Change packageId
     packageId.value = 'another-package'
-    vi.mocked(
-      mockConflictDetectionStore.getConflictsForPackageByID
-    ).mockReturnValue(undefined)
+    mockGetConflictsForPackageByID.mockReturnValue(undefined)
 
     expect(importFailed.value).toBe(false)
   })
@@ -179,10 +156,8 @@ describe('useImportFailedDetection', () => {
       }
     ]
 
-    vi.mocked(mockComfyManagerStore.isPackInstalled).mockReturnValue(true)
-    vi.mocked(
-      mockConflictDetectionStore.getConflictsForPackageByID
-    ).mockReturnValue({
+    mockIsPackInstalled.mockReturnValue(true)
+    mockGetConflictsForPackageByID.mockReturnValue({
       package_id: 'test-package',
       package_name: 'Test Package',
       has_conflict: true,
@@ -211,10 +186,8 @@ describe('useImportFailedDetection', () => {
       }
     ]
 
-    vi.mocked(mockComfyManagerStore.isPackInstalled).mockReturnValue(true)
-    vi.mocked(
-      mockConflictDetectionStore.getConflictsForPackageByID
-    ).mockReturnValue({
+    mockIsPackInstalled.mockReturnValue(true)
+    mockGetConflictsForPackageByID.mockReturnValue({
       package_id: 'test-package',
       package_name: 'Test Package',
       has_conflict: true,
@@ -226,13 +199,22 @@ describe('useImportFailedDetection', () => {
 
     showImportFailedDialog()
 
-    expect(mockDialogService.showErrorDialog).toHaveBeenCalledWith(
-      expect.any(Error),
-      {
-        title: 'manager.failedToInstall',
-        reportType: 'importFailedError'
+    expect(mockShow).toHaveBeenCalledWith({
+      conflictedPackages: expect.arrayContaining([
+        expect.objectContaining({
+          package_id: 'test-package',
+          package_name: 'Test Package',
+          conflicts: expect.arrayContaining([
+            expect.objectContaining({
+              type: 'import_failed'
+            })
+          ])
+        })
+      ]),
+      dialogComponentProps: {
+        onClose: undefined
       }
-    )
+    })
   })
 
   it('should handle null packageId', () => {
diff --git a/src/workbench/extensions/manager/composables/useImportFailedDetection.ts b/src/workbench/extensions/manager/composables/useImportFailedDetection.ts
index affd47c3ac..55da784e52 100644
--- a/src/workbench/extensions/manager/composables/useImportFailedDetection.ts
+++ b/src/workbench/extensions/manager/composables/useImportFailedDetection.ts
@@ -1,11 +1,13 @@
 import { computed, unref } from 'vue'
 import type { ComputedRef } from 'vue'
-import { useI18n } from 'vue-i18n'
 
-import { useDialogService } from '@/services/dialogService'
+import { useImportFailedNodeDialog } from '@/workbench/extensions/manager/composables/useImportFailedNodeDialog'
 import { useComfyManagerStore } from '@/workbench/extensions/manager/stores/comfyManagerStore'
 import { useConflictDetectionStore } from '@/workbench/extensions/manager/stores/conflictDetectionStore'
-import type { ConflictDetail } from '@/workbench/extensions/manager/types/conflictDetectionTypes'
+import type {
+  ConflictDetail,
+  ConflictDetectionResult
+} from '@/workbench/extensions/manager/types/conflictDetectionTypes'
 
 /**
  * Extracting import failed conflicts from conflict list
@@ -24,22 +26,18 @@ function extractImportFailedConflicts(conflicts?: ConflictDetail[] | null) {
  * Creating import failed dialog
  */
 function createImportFailedDialog() {
-  const { t } = useI18n()
-  const { showErrorDialog } = useDialogService()
+  const { show } = useImportFailedNodeDialog()
 
-  return (importFailedInfo: ConflictDetail[] | null) => {
-    if (importFailedInfo) {
-      const errorMessage =
-        importFailedInfo
-          .map((conflict) => conflict.required_value)
-          .filter(Boolean)
-          .join('\n') || t('manager.importFailedGenericError')
-
-      const error = new Error(errorMessage)
-
-      showErrorDialog(error, {
-        title: t('manager.failedToInstall'),
-        reportType: 'importFailedError'
+  return (
+    conflictedPackages: ConflictDetectionResult[] | null,
+    onClose?: () => void
+  ) => {
+    if (conflictedPackages && conflictedPackages.length > 0) {
+      void show({
+        conflictedPackages,
+        dialogComponentProps: {
+          onClose
+        }
       })
     }
   }
@@ -74,13 +72,16 @@ export function useImportFailedDetection(
     return importFailedInfo.value !== null
   })
 
-  const showImportFailedDialog = createImportFailedDialog()
+  const openDialog = createImportFailedDialog()
 
   return {
     importFailedInfo,
     importFailed,
-    showImportFailedDialog: () =>
-      showImportFailedDialog(importFailedInfo.value),
+    showImportFailedDialog: (onClose?: () => void) => {
+      if (conflicts.value) {
+        openDialog([conflicts.value], onClose)
+      }
+    },
     isInstalled
   }
 }
diff --git a/src/workbench/extensions/manager/composables/useImportFailedNodeDialog.ts b/src/workbench/extensions/manager/composables/useImportFailedNodeDialog.ts
new file mode 100644
index 0000000000..35e56ed199
--- /dev/null
+++ b/src/workbench/extensions/manager/composables/useImportFailedNodeDialog.ts
@@ -0,0 +1,43 @@
+import { useDialogService } from '@/services/dialogService'
+import type { DialogComponentProps } from '@/stores/dialogStore'
+import { useDialogStore } from '@/stores/dialogStore'
+import ImportFailedNodeContent from '@/workbench/extensions/manager/components/manager/ImportFailedNodeContent.vue'
+import ImportFailedNodeFooter from '@/workbench/extensions/manager/components/manager/ImportFailedNodeFooter.vue'
+import ImportFailedNodeHeader from '@/workbench/extensions/manager/components/manager/ImportFailedNodeHeader.vue'
+import type { ConflictDetectionResult } from '@/workbench/extensions/manager/types/conflictDetectionTypes'
+
+const DIALOG_KEY = 'global-import-failed'
+
+export function useImportFailedNodeDialog() {
+  const { showSmallLayoutDialog } = useDialogService()
+  const dialogStore = useDialogStore()
+
+  function hide() {
+    dialogStore.closeDialog({ key: DIALOG_KEY })
+  }
+
+  function show(
+    options: {
+      conflictedPackages?: ConflictDetectionResult[]
+      dialogComponentProps?: Omit<DialogComponentProps, 'pt'>
+    } = {}
+  ) {
+    const { dialogComponentProps, conflictedPackages = [] } = options
+
+    showSmallLayoutDialog({
+      key: DIALOG_KEY,
+      headerComponent: ImportFailedNodeHeader,
+      footerComponent: ImportFailedNodeFooter,
+      component: ImportFailedNodeContent,
+      dialogComponentProps,
+      props: {
+        conflictedPackages
+      },
+      footerProps: {
+        conflictedPackages
+      }
+    })
+  }
+
+  return { show, hide }
+}
diff --git a/src/workbench/extensions/manager/composables/useLegacySearchTip.test.ts b/src/workbench/extensions/manager/composables/useLegacySearchTip.test.ts
new file mode 100644
index 0000000000..bb008c6259
--- /dev/null
+++ b/src/workbench/extensions/manager/composables/useLegacySearchTip.test.ts
@@ -0,0 +1,126 @@
+import type { Ref } from 'vue'
+import { beforeEach, describe, expect, it } from 'vitest'
+import { nextTick, ref } from 'vue'
+
+import { useLegacySearchTip } from './useLegacySearchTip'
+
+describe('useLegacySearchTip', () => {
+  let searchQuery: Ref<string>
+  let isNewManagerUI: Ref<boolean>
+
+  beforeEach(() => {
+    searchQuery = ref('')
+    isNewManagerUI = ref(true)
+  })
+
+  describe('isLegacyManagerSearch', () => {
+    it('returns true when searching "manager" in new manager UI', async () => {
+      const { isLegacyManagerSearch } = useLegacySearchTip(
+        searchQuery,
+        isNewManagerUI
+      )
+
+      searchQuery.value = 'manager'
+      await nextTick()
+
+      expect(isLegacyManagerSearch.value).toBe(true)
+    })
+
+    it('returns true when searching "comfyui-manager"', async () => {
+      const { isLegacyManagerSearch } = useLegacySearchTip(
+        searchQuery,
+        isNewManagerUI
+      )
+
+      searchQuery.value = 'comfyui-manager'
+      await nextTick()
+
+      expect(isLegacyManagerSearch.value).toBe(true)
+    })
+
+    it('returns true when searching "comfyui manager" (space variant)', async () => {
+      const { isLegacyManagerSearch } = useLegacySearchTip(
+        searchQuery,
+        isNewManagerUI
+      )
+
+      searchQuery.value = 'comfyui manager'
+      await nextTick()
+
+      expect(isLegacyManagerSearch.value).toBe(true)
+    })
+
+    it('returns true when keyword is part of larger query', async () => {
+      const { isLegacyManagerSearch } = useLegacySearchTip(
+        searchQuery,
+        isNewManagerUI
+      )
+
+      searchQuery.value = 'where is manager'
+      await nextTick()
+
+      expect(isLegacyManagerSearch.value).toBe(true)
+    })
+
+    it('matches case-insensitively', async () => {
+      const { isLegacyManagerSearch } = useLegacySearchTip(
+        searchQuery,
+        isNewManagerUI
+      )
+
+      searchQuery.value = 'MANAGER'
+      await nextTick()
+
+      expect(isLegacyManagerSearch.value).toBe(true)
+    })
+
+    it('returns false when query is empty', async () => {
+      const { isLegacyManagerSearch } = useLegacySearchTip(
+        searchQuery,
+        isNewManagerUI
+      )
+
+      searchQuery.value = ''
+      await nextTick()
+
+      expect(isLegacyManagerSearch.value).toBe(false)
+    })
+
+    it('returns false when query is whitespace only', async () => {
+      const { isLegacyManagerSearch } = useLegacySearchTip(
+        searchQuery,
+        isNewManagerUI
+      )
+
+      searchQuery.value = '   '
+      await nextTick()
+
+      expect(isLegacyManagerSearch.value).toBe(false)
+    })
+
+    it('returns false when searching unrelated terms', async () => {
+      const { isLegacyManagerSearch } = useLegacySearchTip(
+        searchQuery,
+        isNewManagerUI
+      )
+
+      searchQuery.value = 'controlnet'
+      await nextTick()
+
+      expect(isLegacyManagerSearch.value).toBe(false)
+    })
+
+    it('returns false when isNewManagerUI is false', async () => {
+      isNewManagerUI.value = false
+      const { isLegacyManagerSearch } = useLegacySearchTip(
+        searchQuery,
+        isNewManagerUI
+      )
+
+      searchQuery.value = 'manager'
+      await nextTick()
+
+      expect(isLegacyManagerSearch.value).toBe(false)
+    })
+  })
+})
diff --git a/src/workbench/extensions/manager/composables/useLegacySearchTip.ts b/src/workbench/extensions/manager/composables/useLegacySearchTip.ts
new file mode 100644
index 0000000000..0cab1e9613
--- /dev/null
+++ b/src/workbench/extensions/manager/composables/useLegacySearchTip.ts
@@ -0,0 +1,25 @@
+import type { Ref } from 'vue'
+import { computed } from 'vue'
+
+const LEGACY_MANAGER_KEYWORDS = [
+  'manager',
+  'comfyui-manager',
+  'manager comfyui',
+  'comfyui manager'
+] as const
+
+export function useLegacySearchTip(
+  searchQuery: Ref<string>,
+  isNewManagerUI: Ref<boolean>
+) {
+  const isLegacyManagerSearch = computed(() => {
+    if (!isNewManagerUI.value) return false
+    const query = searchQuery.value.toLowerCase().trim()
+    if (!query) return false
+    return LEGACY_MANAGER_KEYWORDS.some((keyword) => query.includes(keyword))
+  })
+
+  return {
+    isLegacyManagerSearch
+  }
+}
diff --git a/src/workbench/extensions/manager/composables/useManagerDialog.ts b/src/workbench/extensions/manager/composables/useManagerDialog.ts
new file mode 100644
index 0000000000..93e2656054
--- /dev/null
+++ b/src/workbench/extensions/manager/composables/useManagerDialog.ts
@@ -0,0 +1,32 @@
+import { useDialogService } from '@/services/dialogService'
+import { useDialogStore } from '@/stores/dialogStore'
+import type { ManagerTab } from '@/workbench/extensions/manager/types/comfyManagerTypes'
+import ManagerDialog from '@/workbench/extensions/manager/components/manager/ManagerDialog.vue'
+
+const DIALOG_KEY = 'global-manager'
+
+export function useManagerDialog() {
+  const dialogService = useDialogService()
+  const dialogStore = useDialogStore()
+
+  function hide() {
+    dialogStore.closeDialog({ key: DIALOG_KEY })
+  }
+
+  function show(initialTab?: ManagerTab, initialPackId?: string) {
+    dialogService.showLayoutDialog({
+      key: DIALOG_KEY,
+      component: ManagerDialog,
+      props: {
+        onClose: hide,
+        initialTab,
+        initialPackId
+      }
+    })
+  }
+
+  return {
+    show,
+    hide
+  }
+}
diff --git a/src/workbench/extensions/manager/composables/useManagerDisplayPacks.ts b/src/workbench/extensions/manager/composables/useManagerDisplayPacks.ts
new file mode 100644
index 0000000000..fe725ba1cc
--- /dev/null
+++ b/src/workbench/extensions/manager/composables/useManagerDisplayPacks.ts
@@ -0,0 +1,217 @@
+import { whenever } from '@vueuse/core'
+import { orderBy } from 'es-toolkit/compat'
+import { compare, valid } from 'semver'
+import type { Ref } from 'vue'
+import { computed } from 'vue'
+
+import { useRegistrySearchGateway } from '@/services/gateway/registrySearchGateway'
+import type { components } from '@/types/comfyRegistryTypes'
+import { useInstalledPacks } from '@/workbench/extensions/manager/composables/nodePack/useInstalledPacks'
+import { useWorkflowPacks } from '@/workbench/extensions/manager/composables/nodePack/useWorkflowPacks'
+import { useComfyManagerStore } from '@/workbench/extensions/manager/stores/comfyManagerStore'
+import { useConflictDetectionStore } from '@/workbench/extensions/manager/stores/conflictDetectionStore'
+import { ManagerTab } from '@/workbench/extensions/manager/types/comfyManagerTypes'
+
+type NodePack = components['schemas']['Node']
+
+export function useManagerDisplayPacks(
+  selectedTabId: Ref<string | null>,
+  searchResults: Ref<NodePack[]>,
+  searchQuery: Ref<string>,
+  sortField: Ref<string>
+) {
+  const comfyManagerStore = useComfyManagerStore()
+  const conflictDetectionStore = useConflictDetectionStore()
+  const { getSortValue, getSortableFields } = useRegistrySearchGateway()
+
+  const {
+    startFetchInstalled,
+    filterInstalledPack,
+    installedPacks,
+    isLoading: isLoadingInstalled,
+    isReady: installedPacksReady
+  } = useInstalledPacks()
+
+  const {
+    startFetchWorkflowPacks,
+    filterWorkflowPack,
+    workflowPacks,
+    isLoading: isLoadingWorkflow,
+    isReady: workflowPacksReady
+  } = useWorkflowPacks()
+
+  const tabType = computed(() => selectedTabId.value as ManagerTab | null)
+  const isEmptySearch = computed(() => searchQuery.value === '')
+
+  // Sorting function for packs not from searchResults
+  const sortPacks = (packs: NodePack[]) => {
+    if (!sortField.value || packs.length === 0) return packs
+
+    const sortableFields = getSortableFields()
+    const fieldConfig = sortableFields.find((f) => f.id === sortField.value)
+    const direction = fieldConfig?.direction || 'desc'
+
+    return orderBy(
+      packs,
+      [(pack) => getSortValue(pack, sortField.value)],
+      [direction]
+    )
+  }
+
+  // Filter functions
+  const filterNotInstalled = (packs: NodePack[]) =>
+    packs.filter((p) => !comfyManagerStore.isPackInstalled(p.id))
+
+  const filterConflicting = (packs: NodePack[]) =>
+    packs.filter(
+      (p) =>
+        !!p.id &&
+        conflictDetectionStore.conflictedPackages.some(
+          (c) => c.package_id === p.id
+        )
+    )
+
+  const filterOutdated = (packs: NodePack[]) =>
+    packs.filter((p) => {
+      const installedVersion = comfyManagerStore.getInstalledPackVersion(
+        p.id ?? ''
+      )
+      const latestVersion = p.latest_version?.version
+      if (
+        !comfyManagerStore.isPackInstalled(p.id) ||
+        !installedVersion ||
+        !latestVersion ||
+        !valid(installedVersion) // nightly builds
+      ) {
+        return false
+      }
+      return compare(latestVersion, installedVersion) > 0
+    })
+
+  // Data fetching triggers using whenever
+  const needsInstalledPacks = computed(() =>
+    [
+      ManagerTab.AllInstalled,
+      ManagerTab.UpdateAvailable,
+      ManagerTab.Conflicting
+    ].includes(tabType.value as ManagerTab)
+  )
+
+  const needsWorkflowPacks = computed(() =>
+    [ManagerTab.Workflow, ManagerTab.Missing].includes(
+      tabType.value as ManagerTab
+    )
+  )
+
+  whenever(
+    () =>
+      needsInstalledPacks.value &&
+      !installedPacksReady.value &&
+      !isLoadingInstalled.value,
+    () => startFetchInstalled()
+  )
+
+  whenever(
+    () =>
+      needsWorkflowPacks.value &&
+      !workflowPacksReady.value &&
+      !isLoadingWorkflow.value,
+    () => startFetchWorkflowPacks()
+  )
+
+  // For Missing tab, also need installed packs to determine what's missing
+  whenever(
+    () =>
+      tabType.value === ManagerTab.Missing &&
+      !installedPacksReady.value &&
+      !isLoadingInstalled.value,
+    () => startFetchInstalled()
+  )
+
+  // Single computed for display packs - replaces 7 watches
+  const displayPacks = computed(() => {
+    const tab = tabType.value
+    const hasSearch = !isEmptySearch.value
+
+    switch (tab) {
+      case ManagerTab.All:
+        return searchResults.value
+
+      case ManagerTab.NotInstalled:
+        return filterNotInstalled(searchResults.value)
+
+      case ManagerTab.AllInstalled:
+        return hasSearch
+          ? filterInstalledPack(searchResults.value)
+          : sortPacks(installedPacks.value)
+
+      case ManagerTab.UpdateAvailable:
+        return sortPacks(
+          filterOutdated(
+            hasSearch
+              ? filterInstalledPack(searchResults.value)
+              : installedPacks.value
+          )
+        )
+
+      case ManagerTab.Conflicting:
+        return sortPacks(
+          filterConflicting(
+            hasSearch
+              ? filterInstalledPack(searchResults.value)
+              : installedPacks.value
+          )
+        )
+
+      case ManagerTab.Workflow: {
+        return hasSearch
+          ? filterWorkflowPack(searchResults.value)
+          : sortPacks(workflowPacks.value)
+      }
+
+      case ManagerTab.Missing: {
+        const base = hasSearch
+          ? filterWorkflowPack(searchResults.value)
+          : workflowPacks.value
+        return sortPacks(filterNotInstalled(base))
+      }
+
+      default:
+        return searchResults.value
+    }
+  })
+
+  // Loading state - single computed
+  const isLoading = computed(() => {
+    const tab = tabType.value
+    if (
+      [
+        ManagerTab.AllInstalled,
+        ManagerTab.UpdateAvailable,
+        ManagerTab.Conflicting
+      ].includes(tab as ManagerTab)
+    ) {
+      return isLoadingInstalled.value
+    }
+    if ([ManagerTab.Workflow, ManagerTab.Missing].includes(tab as ManagerTab)) {
+      return isLoadingWorkflow.value
+    }
+    return false
+  })
+
+  const missingNodePacks = computed(() =>
+    filterNotInstalled(workflowPacks.value)
+  )
+
+  return {
+    displayPacks,
+    isLoading,
+    isLoadingInstalled,
+    isLoadingWorkflow,
+    installedPacks,
+    workflowPacks,
+    filterInstalledPack,
+    filterWorkflowPack,
+    missingNodePacks
+  }
+}
diff --git a/tests-ui/tests/composables/useManagerQueue.test.ts b/src/workbench/extensions/manager/composables/useManagerQueue.test.ts
similarity index 82%
rename from tests-ui/tests/composables/useManagerQueue.test.ts
rename to src/workbench/extensions/manager/composables/useManagerQueue.test.ts
index 502867b8bc..67a2f19e40 100644
--- a/tests-ui/tests/composables/useManagerQueue.test.ts
+++ b/src/workbench/extensions/manager/composables/useManagerQueue.test.ts
@@ -1,16 +1,10 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { Ref } from 'vue'
 import { ref } from 'vue'
 
 import { useManagerQueue } from '@/workbench/extensions/manager/composables/useManagerQueue'
 import type { components } from '@/workbench/extensions/manager/types/generatedManagerTypes'
 
-// Mock dialog service
-vi.mock('@/services/dialogService', () => ({
-  useDialogService: () => ({
-    showManagerProgressDialog: vi.fn()
-  })
-}))
-
 // Mock the app API
 vi.mock('@/scripts/app', () => ({
   app: {
@@ -29,9 +23,11 @@ type ManagerTaskHistory = Record<
 type ManagerTaskQueue = components['schemas']['TaskStateMessage']
 
 describe('useManagerQueue', () => {
-  let taskHistory: any
-  let taskQueue: any
-  let installedPacks: any
+  let taskHistory: Ref<ManagerTaskHistory>
+  let taskQueue: Ref<ManagerTaskQueue>
+  let installedPacks: Ref<
+    Record<string, components['schemas']['ManagerPackInstalled']>
+  >
 
   const createManagerQueue = () => {
     taskHistory = ref<ManagerTaskHistory>({})
@@ -74,14 +70,28 @@ describe('useManagerQueue', () => {
         {
           ui_id: 'task1',
           client_id: 'test-client-id',
-          task_name: 'Installing pack1'
+          kind: 'install',
+          params: {
+            id: 'pack1',
+            version: '1.0.0',
+            selected_version: '1.0.0',
+            mode: 'remote' as const,
+            channel: 'default' as const
+          }
         }
       ]
       taskQueue.value.pending_queue = [
         {
           ui_id: 'task2',
           client_id: 'test-client-id',
-          task_name: 'Installing pack2'
+          kind: 'install',
+          params: {
+            id: 'pack2',
+            version: '1.0.0',
+            selected_version: '1.0.0',
+            mode: 'remote' as const,
+            channel: 'default' as const
+          }
         }
       ]
 
@@ -108,12 +118,18 @@ describe('useManagerQueue', () => {
         task1: {
           ui_id: 'task1',
           client_id: 'test-client-id',
-          status: { status_str: 'success', completed: true }
+          kind: 'install',
+          timestamp: '2024-01-01T00:00:00Z',
+          result: 'success',
+          status: { status_str: 'success', completed: true, messages: [] }
         },
         task2: {
           ui_id: 'task2',
           client_id: 'test-client-id',
-          status: { status_str: 'success', completed: true }
+          kind: 'install',
+          timestamp: '2024-01-01T00:00:00Z',
+          result: 'success',
+          status: { status_str: 'success', completed: true, messages: [] }
         }
       }
 
@@ -205,12 +221,12 @@ describe('useManagerQueue', () => {
     it('handles empty installed_packs gracefully', () => {
       const queue = createManagerQueue()
 
-      const mockState: any = {
+      const mockState = {
         history: {},
         running_queue: [],
         pending_queue: [],
-        installed_packs: undefined
-      }
+        installed_packs: undefined!
+      } satisfies Partial<ManagerTaskQueue> as ManagerTaskQueue
 
       // Just call the function - if it throws, the test will fail automatically
       queue.updateTaskState(mockState)
diff --git a/src/workbench/extensions/manager/composables/useManagerQueue.ts b/src/workbench/extensions/manager/composables/useManagerQueue.ts
index 3886b40bf8..124311e3f2 100644
--- a/src/workbench/extensions/manager/composables/useManagerQueue.ts
+++ b/src/workbench/extensions/manager/composables/useManagerQueue.ts
@@ -4,7 +4,6 @@ import type { Ref } from 'vue'
 import { computed, ref } from 'vue'
 
 import { app } from '@/scripts/app'
-import { useDialogService } from '@/services/dialogService'
 import { normalizePackKeys } from '@/utils/packUtils'
 import type { components } from '@/workbench/extensions/manager/types/generatedManagerTypes'
 
@@ -25,10 +24,8 @@ const MANAGER_WS_TASK_STARTED_NAME = 'cm-task-started'
 export const useManagerQueue = (
   taskHistory: Ref<ManagerTaskHistory>,
   taskQueue: Ref<ManagerTaskQueue>,
-  installedPacks: Ref<Record<string, any>>
+  installedPacks: Ref<Record<string, unknown>>
 ) => {
-  const { showManagerProgressDialog } = useDialogService()
-
   // Task queue state (read-only from server)
   const maxHistoryItems = ref(64)
   const isLoading = ref(false)
@@ -113,15 +110,6 @@ export const useManagerQueue = (
     (event: CustomEvent<ManagerWsTaskDoneMsg>) => {
       if (event?.type === MANAGER_WS_TASK_DONE_NAME && event.detail?.state) {
         updateTaskState(event.detail.state)
-
-        // If no more tasks are running/pending, hide the progress dialog
-        if (allTasksDone.value) {
-          setTimeout(() => {
-            if (allTasksDone.value) {
-              showManagerProgressDialog()
-            }
-          }, 1000) // Small delay to let users see completion
-        }
       }
     }
   )
@@ -133,9 +121,6 @@ export const useManagerQueue = (
     (event: CustomEvent<ManagerWsTaskStartedMsg>) => {
       if (event?.type === MANAGER_WS_TASK_STARTED_NAME && event.detail?.state) {
         updateTaskState(event.detail.state)
-
-        // Show progress dialog when a task starts
-        showManagerProgressDialog()
       }
     }
   )
diff --git a/src/workbench/extensions/manager/composables/useManagerState.test.ts b/src/workbench/extensions/manager/composables/useManagerState.test.ts
new file mode 100644
index 0000000000..d14fbb2fcf
--- /dev/null
+++ b/src/workbench/extensions/manager/composables/useManagerState.test.ts
@@ -0,0 +1,431 @@
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { api } from '@/scripts/api'
+import { useSystemStatsStore } from '@/stores/systemStatsStore'
+import {
+  ManagerUIState,
+  useManagerState
+} from '@/workbench/extensions/manager/composables/useManagerState'
+
+// Mock dependencies that are not stores
+vi.mock('@/scripts/api', () => ({
+  api: {
+    getClientFeatureFlags: vi.fn(),
+    getServerFeature: vi.fn(),
+    getSystemStats: vi.fn()
+  }
+}))
+
+vi.mock('@/composables/useFeatureFlags', () => {
+  const featureFlag = vi.fn()
+  return {
+    useFeatureFlags: vi.fn(() => ({
+      flags: { supportsManagerV4: false },
+      featureFlag
+    }))
+  }
+})
+
+vi.mock('@/platform/settings/composables/useSettingsDialog', () => ({
+  useSettingsDialog: vi.fn(() => ({
+    show: vi.fn(),
+    hide: vi.fn(),
+    showAbout: vi.fn()
+  }))
+}))
+
+vi.mock('@/stores/commandStore', () => ({
+  useCommandStore: vi.fn(() => ({
+    execute: vi.fn()
+  }))
+}))
+
+vi.mock('@/platform/updates/common/toastStore', () => {
+  const add = vi.fn()
+  return {
+    useToastStore: vi.fn(() => ({
+      add
+    }))
+  }
+})
+
+vi.mock('@/workbench/extensions/manager/composables/useManagerDialog', () => {
+  const show = vi.fn()
+  const hide = vi.fn()
+  return {
+    useManagerDialog: vi.fn(() => ({
+      show,
+      hide
+    }))
+  }
+})
+
+describe('useManagerState', () => {
+  let systemStatsStore: ReturnType<typeof useSystemStatsStore>
+
+  beforeEach(() => {
+    // Create a fresh testing pinia and activate it for each test
+    setActivePinia(
+      createTestingPinia({
+        stubActions: false,
+        createSpy: vi.fn
+      })
+    )
+
+    // Initialize stores
+    systemStatsStore = useSystemStatsStore()
+
+    // Reset all mocks
+    vi.resetAllMocks()
+
+    // Set default mock returns
+    vi.mocked(api.getClientFeatureFlags).mockReturnValue({})
+    vi.mocked(api.getServerFeature).mockReturnValue(undefined)
+  })
+
+  describe('managerUIState property', () => {
+    it('should return DISABLED state when --enable-manager is NOT present', () => {
+      // Set up store state
+      systemStatsStore.$patch({
+        systemStats: {
+          system: {
+            os: 'Test OS',
+            python_version: '3.10',
+            embedded_python: false,
+            comfyui_version: '1.0.0',
+            pytorch_version: '2.0.0',
+            argv: ['python', 'main.py'], // No --enable-manager flag
+            ram_total: 16000000000,
+            ram_free: 8000000000
+          },
+          devices: []
+        },
+        isInitialized: true
+      })
+
+      const managerState = useManagerState()
+      expect(managerState.managerUIState.value).toBe(ManagerUIState.DISABLED)
+    })
+
+    it('should return LEGACY_UI state when --enable-manager-legacy-ui is present', () => {
+      // Set up store state
+      systemStatsStore.$patch({
+        systemStats: {
+          system: {
+            os: 'Test OS',
+            python_version: '3.10',
+            embedded_python: false,
+            comfyui_version: '1.0.0',
+            pytorch_version: '2.0.0',
+            argv: [
+              'python',
+              'main.py',
+              '--enable-manager',
+              '--enable-manager-legacy-ui'
+            ],
+            ram_total: 16000000000,
+            ram_free: 8000000000
+          },
+          devices: []
+        },
+        isInitialized: true
+      })
+
+      const managerState = useManagerState()
+      expect(managerState.managerUIState.value).toBe(ManagerUIState.LEGACY_UI)
+    })
+
+    it('should return NEW_UI state when client and server both support v4', () => {
+      // Set up store state
+      systemStatsStore.$patch({
+        systemStats: {
+          system: {
+            os: 'Test OS',
+            python_version: '3.10',
+            embedded_python: false,
+            comfyui_version: '1.0.0',
+            pytorch_version: '2.0.0',
+            argv: ['python', 'main.py', '--enable-manager'],
+            ram_total: 16000000000,
+            ram_free: 8000000000
+          },
+          devices: []
+        },
+        isInitialized: true
+      })
+
+      vi.mocked(api.getClientFeatureFlags).mockReturnValue({
+        supports_manager_v4_ui: true
+      })
+      vi.mocked(api.getServerFeature).mockReturnValue(true)
+
+      const managerState = useManagerState()
+      expect(managerState.managerUIState.value).toBe(ManagerUIState.NEW_UI)
+    })
+
+    it('should return LEGACY_UI state when server supports v4 but client does not', () => {
+      // Set up store state
+      systemStatsStore.$patch({
+        systemStats: {
+          system: {
+            os: 'Test OS',
+            python_version: '3.10',
+            embedded_python: false,
+            comfyui_version: '1.0.0',
+            pytorch_version: '2.0.0',
+            argv: ['python', 'main.py', '--enable-manager'],
+            ram_total: 16000000000,
+            ram_free: 8000000000
+          },
+          devices: []
+        },
+        isInitialized: true
+      })
+
+      vi.mocked(api.getClientFeatureFlags).mockReturnValue({
+        supports_manager_v4_ui: false
+      })
+      vi.mocked(api.getServerFeature).mockReturnValue(true)
+
+      const managerState = useManagerState()
+      expect(managerState.managerUIState.value).toBe(ManagerUIState.LEGACY_UI)
+    })
+
+    it('should return LEGACY_UI state when server does not support v4', () => {
+      // Set up store state
+      systemStatsStore.$patch({
+        systemStats: {
+          system: {
+            os: 'Test OS',
+            python_version: '3.10',
+            embedded_python: false,
+            comfyui_version: '1.0.0',
+            pytorch_version: '2.0.0',
+            argv: ['python', 'main.py', '--enable-manager'],
+            ram_total: 16000000000,
+            ram_free: 8000000000
+          },
+          devices: []
+        },
+        isInitialized: true
+      })
+
+      vi.mocked(api.getClientFeatureFlags).mockReturnValue({})
+      vi.mocked(api.getServerFeature).mockReturnValue(false)
+
+      const managerState = useManagerState()
+      expect(managerState.managerUIState.value).toBe(ManagerUIState.LEGACY_UI)
+    })
+
+    it('should return NEW_UI state when server feature flags are undefined', () => {
+      // Set up store state
+      systemStatsStore.$patch({
+        systemStats: {
+          system: {
+            os: 'Test OS',
+            python_version: '3.10',
+            embedded_python: false,
+            comfyui_version: '1.0.0',
+            pytorch_version: '2.0.0',
+            argv: ['python', 'main.py', '--enable-manager'],
+            ram_total: 16000000000,
+            ram_free: 8000000000
+          },
+          devices: []
+        },
+        isInitialized: true
+      })
+
+      vi.mocked(api.getClientFeatureFlags).mockReturnValue({})
+      vi.mocked(api.getServerFeature).mockReturnValue(undefined)
+
+      const managerState = useManagerState()
+      // When server feature flags haven't loaded yet, default to NEW_UI
+      expect(managerState.managerUIState.value).toBe(ManagerUIState.NEW_UI)
+    })
+
+    it('should handle null systemStats gracefully', () => {
+      // Set up store state
+      systemStatsStore.$patch({
+        systemStats: null,
+        isInitialized: true
+      })
+
+      vi.mocked(api.getClientFeatureFlags).mockReturnValue({
+        supports_manager_v4_ui: true
+      })
+      vi.mocked(api.getServerFeature).mockReturnValue(true)
+
+      const managerState = useManagerState()
+      // When systemStats is null, we can't check for --enable-manager flag, so manager is disabled
+      expect(managerState.managerUIState.value).toBe(ManagerUIState.DISABLED)
+    })
+  })
+
+  describe('helper properties', () => {
+    it('isManagerEnabled should return true when state is not DISABLED', () => {
+      // Set up store state
+      systemStatsStore.$patch({
+        systemStats: {
+          system: {
+            os: 'Test OS',
+            python_version: '3.10',
+            embedded_python: false,
+            comfyui_version: '1.0.0',
+            pytorch_version: '2.0.0',
+            argv: ['python', 'main.py', '--enable-manager'],
+            ram_total: 16000000000,
+            ram_free: 8000000000
+          },
+          devices: []
+        },
+        isInitialized: true
+      })
+
+      vi.mocked(api.getClientFeatureFlags).mockReturnValue({
+        supports_manager_v4_ui: true
+      })
+      vi.mocked(api.getServerFeature).mockReturnValue(true)
+
+      const managerState = useManagerState()
+      expect(managerState.isManagerEnabled.value).toBe(true)
+    })
+
+    it('isManagerEnabled should return false when state is DISABLED', () => {
+      // Set up store state
+      systemStatsStore.$patch({
+        systemStats: {
+          system: {
+            os: 'Test OS',
+            python_version: '3.10',
+            embedded_python: false,
+            comfyui_version: '1.0.0',
+            pytorch_version: '2.0.0',
+            argv: ['python', 'main.py'], // No --enable-manager flag
+            ram_total: 16000000000,
+            ram_free: 8000000000
+          },
+          devices: []
+        },
+        isInitialized: true
+      })
+
+      const managerState = useManagerState()
+      expect(managerState.isManagerEnabled.value).toBe(false)
+    })
+
+    it('isNewManagerUI should return true when state is NEW_UI', () => {
+      // Set up store state
+      systemStatsStore.$patch({
+        systemStats: {
+          system: {
+            os: 'Test OS',
+            python_version: '3.10',
+            embedded_python: false,
+            comfyui_version: '1.0.0',
+            pytorch_version: '2.0.0',
+            argv: ['python', 'main.py', '--enable-manager'],
+            ram_total: 16000000000,
+            ram_free: 8000000000
+          },
+          devices: []
+        },
+        isInitialized: true
+      })
+
+      vi.mocked(api.getClientFeatureFlags).mockReturnValue({
+        supports_manager_v4_ui: true
+      })
+      vi.mocked(api.getServerFeature).mockReturnValue(true)
+
+      const managerState = useManagerState()
+      expect(managerState.isNewManagerUI.value).toBe(true)
+    })
+
+    it('isLegacyManagerUI should return true when state is LEGACY_UI', () => {
+      // Set up store state
+      systemStatsStore.$patch({
+        systemStats: {
+          system: {
+            os: 'Test OS',
+            python_version: '3.10',
+            embedded_python: false,
+            comfyui_version: '1.0.0',
+            pytorch_version: '2.0.0',
+            argv: [
+              'python',
+              'main.py',
+              '--enable-manager',
+              '--enable-manager-legacy-ui'
+            ],
+            ram_total: 16000000000,
+            ram_free: 8000000000
+          },
+          devices: []
+        },
+        isInitialized: true
+      })
+
+      const managerState = useManagerState()
+      expect(managerState.isLegacyManagerUI.value).toBe(true)
+    })
+
+    it('shouldShowInstallButton should return true only for NEW_UI', () => {
+      // Set up store state
+      systemStatsStore.$patch({
+        systemStats: {
+          system: {
+            os: 'Test OS',
+            python_version: '3.10',
+            embedded_python: false,
+            comfyui_version: '1.0.0',
+            pytorch_version: '2.0.0',
+            argv: ['python', 'main.py', '--enable-manager'],
+            ram_total: 16000000000,
+            ram_free: 8000000000
+          },
+          devices: []
+        },
+        isInitialized: true
+      })
+
+      vi.mocked(api.getClientFeatureFlags).mockReturnValue({
+        supports_manager_v4_ui: true
+      })
+      vi.mocked(api.getServerFeature).mockReturnValue(true)
+
+      const managerState = useManagerState()
+      expect(managerState.shouldShowInstallButton.value).toBe(true)
+    })
+
+    it('shouldShowManagerButtons should return true when not DISABLED', () => {
+      // Set up store state
+      systemStatsStore.$patch({
+        systemStats: {
+          system: {
+            os: 'Test OS',
+            python_version: '3.10',
+            embedded_python: false,
+            comfyui_version: '1.0.0',
+            pytorch_version: '2.0.0',
+            argv: ['python', 'main.py', '--enable-manager'],
+            ram_total: 16000000000,
+            ram_free: 8000000000
+          },
+          devices: []
+        },
+        isInitialized: true
+      })
+
+      vi.mocked(api.getClientFeatureFlags).mockReturnValue({
+        supports_manager_v4_ui: true
+      })
+      vi.mocked(api.getServerFeature).mockReturnValue(true)
+
+      const managerState = useManagerState()
+      expect(managerState.shouldShowManagerButtons.value).toBe(true)
+    })
+  })
+})
diff --git a/src/workbench/extensions/manager/composables/useManagerState.ts b/src/workbench/extensions/manager/composables/useManagerState.ts
index f8b7e095b8..34903489a4 100644
--- a/src/workbench/extensions/manager/composables/useManagerState.ts
+++ b/src/workbench/extensions/manager/composables/useManagerState.ts
@@ -4,10 +4,11 @@ import { computed, readonly } from 'vue'
 import { t } from '@/i18n'
 import { useToastStore } from '@/platform/updates/common/toastStore'
 import { api } from '@/scripts/api'
-import { useDialogService } from '@/services/dialogService'
+import { useSettingsDialog } from '@/platform/settings/composables/useSettingsDialog'
 import { useCommandStore } from '@/stores/commandStore'
 import { useSystemStatsStore } from '@/stores/systemStatsStore'
-import { ManagerTab } from '@/workbench/extensions/manager/types/comfyManagerTypes'
+import { useManagerDialog } from '@/workbench/extensions/manager/composables/useManagerDialog'
+import type { ManagerTab } from '@/workbench/extensions/manager/types/comfyManagerTypes'
 
 export enum ManagerUIState {
   DISABLED = 'disabled',
@@ -19,6 +20,7 @@ export function useManagerState() {
   const systemStatsStore = useSystemStatsStore()
   const { systemStats, isInitialized: systemInitialized } =
     storeToRefs(systemStatsStore)
+  const managerDialog = useManagerDialog()
 
   /**
    * The current manager UI state.
@@ -141,17 +143,18 @@ export function useManagerState() {
    */
   const openManager = async (options?: {
     initialTab?: ManagerTab
+    initialPackId?: string
     legacyCommand?: string
     showToastOnLegacyError?: boolean
     isLegacyOnly?: boolean
   }): Promise<void> => {
     const state = managerUIState.value
-    const dialogService = useDialogService()
+    const settingsDialog = useSettingsDialog()
     const commandStore = useCommandStore()
 
     switch (state) {
       case ManagerUIState.DISABLED:
-        dialogService.showSettingsDialog('extension')
+        settingsDialog.show('extension')
         break
 
       case ManagerUIState.LEGACY_UI: {
@@ -171,7 +174,7 @@ export function useManagerState() {
           }
           // Fallback to extensions panel if not showing toast
           if (options?.showToastOnLegacyError === false) {
-            dialogService.showSettingsDialog('extension')
+            settingsDialog.show('extension')
           }
         }
         break
@@ -179,18 +182,14 @@ export function useManagerState() {
 
       case ManagerUIState.NEW_UI:
         if (options?.isLegacyOnly) {
-          // Legacy command is not available in NEW_UI mode
           useToastStore().add({
             severity: 'error',
             summary: t('g.error'),
             detail: t('manager.legacyMenuNotAvailable'),
             life: 3000
           })
-          dialogService.showManagerDialog({ initialTab: ManagerTab.All })
         } else {
-          dialogService.showManagerDialog(
-            options?.initialTab ? { initialTab: options.initialTab } : undefined
-          )
+          managerDialog.show(options?.initialTab, options?.initialPackId)
         }
         break
     }
diff --git a/src/workbench/extensions/manager/composables/useNodeConflictDialog.ts b/src/workbench/extensions/manager/composables/useNodeConflictDialog.ts
new file mode 100644
index 0000000000..1eda5916db
--- /dev/null
+++ b/src/workbench/extensions/manager/composables/useNodeConflictDialog.ts
@@ -0,0 +1,54 @@
+import { useDialogService } from '@/services/dialogService'
+import type { DialogComponentProps } from '@/stores/dialogStore'
+import { useDialogStore } from '@/stores/dialogStore'
+import NodeConflictDialogContent from '@/workbench/extensions/manager/components/manager/NodeConflictDialogContent.vue'
+import NodeConflictFooter from '@/workbench/extensions/manager/components/manager/NodeConflictFooter.vue'
+import NodeConflictHeader from '@/workbench/extensions/manager/components/manager/NodeConflictHeader.vue'
+import type { ConflictDetectionResult } from '@/workbench/extensions/manager/types/conflictDetectionTypes'
+
+const DIALOG_KEY = 'global-node-conflict'
+
+export function useNodeConflictDialog() {
+  const { showSmallLayoutDialog } = useDialogService()
+  const dialogStore = useDialogStore()
+
+  function hide() {
+    dialogStore.closeDialog({ key: DIALOG_KEY })
+  }
+
+  function show(
+    options: {
+      showAfterWhatsNew?: boolean
+      conflictedPackages?: ConflictDetectionResult[]
+      dialogComponentProps?: Omit<DialogComponentProps, 'pt'>
+      buttonText?: string
+      onButtonClick?: () => void
+    } = {}
+  ) {
+    const {
+      dialogComponentProps,
+      buttonText,
+      onButtonClick,
+      showAfterWhatsNew,
+      conflictedPackages
+    } = options
+
+    showSmallLayoutDialog({
+      key: DIALOG_KEY,
+      headerComponent: NodeConflictHeader,
+      footerComponent: NodeConflictFooter,
+      component: NodeConflictDialogContent,
+      dialogComponentProps,
+      props: {
+        showAfterWhatsNew,
+        conflictedPackages
+      },
+      footerProps: {
+        buttonText,
+        onButtonClick
+      }
+    })
+  }
+
+  return { show, hide }
+}
diff --git a/src/workbench/extensions/manager/composables/useRegistrySearch.ts b/src/workbench/extensions/manager/composables/useRegistrySearch.ts
index c6dc9e90ee..9ec27cb340 100644
--- a/src/workbench/extensions/manager/composables/useRegistrySearch.ts
+++ b/src/workbench/extensions/manager/composables/useRegistrySearch.ts
@@ -89,8 +89,11 @@ export function useRegistrySearch(
     isLoading.value = false
   }
 
-  const onQueryChange = () => updateSearchResults({ append: false })
-  const onPageChange = () => updateSearchResults({ append: true })
+  const onQueryChange = () => void updateSearchResults({ append: false })
+  const onPageChange = () => {
+    if (pageNumber.value === 0) return
+    void updateSearchResults({ append: true })
+  }
 
   watch([sortField, searchMode], onQueryChange)
   watch(pageNumber, onPageChange)
diff --git a/src/workbench/extensions/manager/services/comfyManagerService.ts b/src/workbench/extensions/manager/services/comfyManagerService.ts
index 4b0f25ae5f..f58878ab21 100644
--- a/src/workbench/extensions/manager/services/comfyManagerService.ts
+++ b/src/workbench/extensions/manager/services/comfyManagerService.ts
@@ -156,7 +156,7 @@ export const useComfyManagerService = () => {
   const getImportFailInfo = async (signal?: AbortSignal) => {
     const errorContext = 'Fetching import failure information'
 
-    return executeRequest<any>(
+    return executeRequest<Record<string, unknown>>(
       () => managerApiClient.get(ManagerRoute.IMPORT_FAIL_INFO, { signal }),
       { errorContext }
     )
diff --git a/tests-ui/tests/store/comfyManagerStore.test.ts b/src/workbench/extensions/manager/stores/comfyManagerStore.test.ts
similarity index 98%
rename from tests-ui/tests/store/comfyManagerStore.test.ts
rename to src/workbench/extensions/manager/stores/comfyManagerStore.test.ts
index d131a0fc9d..8509d8c3aa 100644
--- a/tests-ui/tests/store/comfyManagerStore.test.ts
+++ b/src/workbench/extensions/manager/stores/comfyManagerStore.test.ts
@@ -1,4 +1,5 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { nextTick, ref } from 'vue'
 
@@ -17,12 +18,6 @@ vi.mock('@/workbench/extensions/manager/services/comfyManagerService', () => ({
   useComfyManagerService: vi.fn()
 }))
 
-vi.mock('@/services/dialogService', () => ({
-  useDialogService: () => ({
-    showManagerProgressDialog: vi.fn()
-  })
-}))
-
 vi.mock('@/workbench/extensions/manager/composables/useManagerQueue', () => {
   const enqueueTaskMock = vi.fn()
 
@@ -78,7 +73,7 @@ describe('useComfyManagerStore', () => {
   }
 
   beforeEach(() => {
-    setActivePinia(createPinia())
+    setActivePinia(createTestingPinia({ stubActions: false }))
     vi.clearAllMocks()
     mockManagerService = {
       isLoading: ref(false),
diff --git a/src/workbench/extensions/manager/stores/comfyManagerStore.ts b/src/workbench/extensions/manager/stores/comfyManagerStore.ts
index 06097cbe73..c6ae8a8e3a 100644
--- a/src/workbench/extensions/manager/stores/comfyManagerStore.ts
+++ b/src/workbench/extensions/manager/stores/comfyManagerStore.ts
@@ -2,13 +2,13 @@ import { useEventListener, whenever } from '@vueuse/core'
 import { defineStore } from 'pinia'
 import { v4 as uuidv4 } from 'uuid'
 import { ref, watch } from 'vue'
-import { useI18n } from 'vue-i18n'
 
+import { t } from '@/i18n'
 import { useCachedRequest } from '@/composables/useCachedRequest'
 import { useServerLogs } from '@/composables/useServerLogs'
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
-import { useDialogService } from '@/services/dialogService'
+
 import { normalizePackKeys } from '@/utils/packUtils'
 import { useManagerQueue } from '@/workbench/extensions/manager/composables/useManagerQueue'
 import { useComfyManagerService } from '@/workbench/extensions/manager/services/comfyManagerService'
@@ -30,9 +30,7 @@ type UpdateAllPacksParams = components['schemas']['UpdateAllPacksParams']
  * Store for state of installed node packs
  */
 export const useComfyManagerStore = defineStore('comfyManager', () => {
-  const { t } = useI18n()
   const managerService = useComfyManagerService()
-  const { showManagerProgressDialog } = useDialogService()
 
   const installedPacks = ref<InstalledPacksResponse>({})
   const enabledPacksIds = ref<Set<string>>(new Set())
@@ -60,14 +58,18 @@ export const useComfyManagerStore = defineStore('comfyManager', () => {
   const managerQueue = useManagerQueue(taskHistory, taskQueue, installedPacks)
 
   // Listen for task completion events to clean up installing state
-  useEventListener(app.api, 'cm-task-completed', (event: any) => {
-    const taskId = event.detail?.ui_id
-    if (taskId && taskIdToPackId.value.has(taskId)) {
-      const packId = taskIdToPackId.value.get(taskId)!
-      installingPacksIds.value.delete(packId)
-      taskIdToPackId.value.delete(taskId)
+  useEventListener(
+    app.api,
+    'cm-task-completed',
+    (event: CustomEvent<{ ui_id?: string }>) => {
+      const taskId = event.detail?.ui_id
+      if (taskId && taskIdToPackId.value.has(taskId)) {
+        const packId = taskIdToPackId.value.get(taskId)!
+        installingPacksIds.value.delete(packId)
+        taskIdToPackId.value.delete(taskId)
+      }
     }
-  })
+  )
 
   const setStale = () => {
     isStale.value = true
@@ -204,8 +206,6 @@ export const useComfyManagerStore = defineStore('comfyManager', () => {
     })
 
     try {
-      // Show progress dialog immediately when task is queued
-      showManagerProgressDialog()
       managerQueue.isProcessing.value = true
 
       // Prepare logging hook
@@ -392,44 +392,3 @@ export const useComfyManagerStore = defineStore('comfyManager', () => {
     enablePack
   }
 })
-
-/**
- * Store for state of the manager progress dialog content.
- * The dialog itself is managed by the dialog store. This store is used to
- * manage the visibility of the dialog's content, header, footer.
- */
-export const useManagerProgressDialogStore = defineStore(
-  'managerProgressDialog',
-  () => {
-    const isExpanded = ref(false)
-    const activeTabIndex = ref(0)
-
-    const setActiveTabIndex = (index: number) => {
-      activeTabIndex.value = index
-    }
-
-    const getActiveTabIndex = () => {
-      return activeTabIndex.value
-    }
-
-    const toggle = () => {
-      isExpanded.value = !isExpanded.value
-    }
-
-    const collapse = () => {
-      isExpanded.value = false
-    }
-
-    const expand = () => {
-      isExpanded.value = true
-    }
-    return {
-      isExpanded,
-      toggle,
-      collapse,
-      expand,
-      setActiveTabIndex,
-      getActiveTabIndex
-    }
-  }
-)
diff --git a/tests-ui/tests/stores/conflictDetectionStore.test.ts b/src/workbench/extensions/manager/stores/conflictDetectionStore.test.ts
similarity index 98%
rename from tests-ui/tests/stores/conflictDetectionStore.test.ts
rename to src/workbench/extensions/manager/stores/conflictDetectionStore.test.ts
index 7c74ea6c1d..0b5c1e0e1c 100644
--- a/tests-ui/tests/stores/conflictDetectionStore.test.ts
+++ b/src/workbench/extensions/manager/stores/conflictDetectionStore.test.ts
@@ -1,4 +1,5 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import { setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it } from 'vitest'
 
 import { useConflictDetectionStore } from '@/workbench/extensions/manager/stores/conflictDetectionStore'
@@ -6,7 +7,7 @@ import type { ConflictDetectionResult } from '@/workbench/extensions/manager/typ
 
 describe('useConflictDetectionStore', () => {
   beforeEach(() => {
-    setActivePinia(createPinia())
+    setActivePinia(createTestingPinia({ stubActions: false }))
   })
 
   const mockConflictedPackages: ConflictDetectionResult[] = [
diff --git a/src/workbench/extensions/manager/types/comfyManagerTypes.ts b/src/workbench/extensions/manager/types/comfyManagerTypes.ts
index c536197198..b009ec64d7 100644
--- a/src/workbench/extensions/manager/types/comfyManagerTypes.ts
+++ b/src/workbench/extensions/manager/types/comfyManagerTypes.ts
@@ -14,16 +14,12 @@ export const IsInstallingKey: InjectionKey<Ref<boolean>> =
 
 export enum ManagerTab {
   All = 'all',
-  Installed = 'installed',
+  NotInstalled = 'notInstalled',
+  AllInstalled = 'allInstalled',
+  UpdateAvailable = 'updateAvailable',
+  Conflicting = 'conflicting',
   Workflow = 'workflow',
-  Missing = 'missing',
-  UpdateAvailable = 'updateAvailable'
-}
-
-export interface TabItem {
-  id: ManagerTab
-  label: string
-  icon: string
+  Missing = 'missing'
 }
 
 export type TaskLog = {
@@ -37,11 +33,6 @@ export interface UseNodePacksOptions {
   maxConcurrent?: number
 }
 
-export interface SearchOption<T> {
-  id: T
-  label: string
-}
-
 export enum SortableAlgoliaField {
   Downloads = 'total_install',
   Created = 'create_time',
diff --git a/src/workbench/extensions/manager/types/conflictDetectionTypes.ts b/src/workbench/extensions/manager/types/conflictDetectionTypes.ts
index ab7efe08a4..58c626e525 100644
--- a/src/workbench/extensions/manager/types/conflictDetectionTypes.ts
+++ b/src/workbench/extensions/manager/types/conflictDetectionTypes.ts
@@ -78,3 +78,16 @@ export interface ConflictDetectionResponse {
   results: ConflictDetectionResult[]
   detected_system_environment?: Partial<SystemEnvironment>
 }
+
+/**
+ * Detailed information about a Python import failure
+ */
+interface ImportFailureDetail {
+  error?: string
+  traceback?: string
+}
+
+/**
+ * Map of package IDs to their import failure information
+ */
+export type ImportFailureMap = Record<string, ImportFailureDetail | null>
diff --git a/src/workbench/extensions/manager/utils/conflictMessageUtil.ts b/src/workbench/extensions/manager/utils/conflictMessageUtil.ts
index c175760b54..3f7ace6c30 100644
--- a/src/workbench/extensions/manager/utils/conflictMessageUtil.ts
+++ b/src/workbench/extensions/manager/utils/conflictMessageUtil.ts
@@ -10,7 +10,7 @@ import type { ConflictDetail } from '@/workbench/extensions/manager/types/confli
  */
 export function getConflictMessage(
   conflict: ConflictDetail,
-  t: (key: string, params?: Record<string, any>) => string
+  t: (key: string, params?: Record<string, unknown>) => string
 ): string {
   const messageKey = `manager.conflicts.conflictMessages.${conflict.type}`
 
@@ -53,7 +53,7 @@ export function getConflictMessage(
  */
 export function getJoinedConflictMessages(
   conflicts: ConflictDetail[],
-  t: (key: string, params?: Record<string, any>) => string,
+  t: (key: string, params?: Record<string, unknown>) => string,
   separator = '; '
 ): string {
   return conflicts
diff --git a/tests-ui/tests/utils/conflictUtils.test.ts b/src/workbench/extensions/manager/utils/conflictUtils.test.ts
similarity index 100%
rename from tests-ui/tests/utils/conflictUtils.test.ts
rename to src/workbench/extensions/manager/utils/conflictUtils.test.ts
diff --git a/tests-ui/tests/workbench/extensions/manager/utils/graphHasMissingNodes.test.ts b/src/workbench/extensions/manager/utils/graphHasMissingNodes.test.ts
similarity index 96%
rename from tests-ui/tests/workbench/extensions/manager/utils/graphHasMissingNodes.test.ts
rename to src/workbench/extensions/manager/utils/graphHasMissingNodes.test.ts
index 2badaa7cc3..d987e72310 100644
--- a/tests-ui/tests/workbench/extensions/manager/utils/graphHasMissingNodes.test.ts
+++ b/src/workbench/extensions/manager/utils/graphHasMissingNodes.test.ts
@@ -86,10 +86,7 @@ describe('graphHasMissingNodes', () => {
   })
 
   it('ignores nodes without a type', () => {
-    const graph = createGraph([
-      createNode(undefined),
-      createNode(null as unknown as string)
-    ])
+    const graph = createGraph([createNode(undefined), createNode(null!)])
 
     expect(graphHasMissingNodes(graph, {})).toBe(false)
   })
diff --git a/src/workbench/extensions/manager/utils/missingNodeErrorUtil.test.ts b/src/workbench/extensions/manager/utils/missingNodeErrorUtil.test.ts
new file mode 100644
index 0000000000..242d46c233
--- /dev/null
+++ b/src/workbench/extensions/manager/utils/missingNodeErrorUtil.test.ts
@@ -0,0 +1,70 @@
+import { describe, expect, it } from 'vitest'
+
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+
+import {
+  getCnrIdFromProperties,
+  getCnrIdFromNode
+} from './missingNodeErrorUtil'
+
+describe('getCnrIdFromProperties', () => {
+  it('returns cnr_id when present', () => {
+    expect(getCnrIdFromProperties({ cnr_id: 'my-pack' })).toBe('my-pack')
+  })
+
+  it('returns aux_id when cnr_id is absent', () => {
+    expect(getCnrIdFromProperties({ aux_id: 'my-aux-pack' })).toBe(
+      'my-aux-pack'
+    )
+  })
+
+  it('prefers cnr_id over aux_id', () => {
+    expect(
+      getCnrIdFromProperties({ cnr_id: 'primary', aux_id: 'secondary' })
+    ).toBe('primary')
+  })
+
+  it('returns undefined when neither is present', () => {
+    expect(getCnrIdFromProperties({})).toBeUndefined()
+  })
+
+  it('returns undefined for null properties', () => {
+    expect(getCnrIdFromProperties(null)).toBeUndefined()
+  })
+
+  it('returns undefined for undefined properties', () => {
+    expect(getCnrIdFromProperties(undefined)).toBeUndefined()
+  })
+
+  it('returns undefined when cnr_id is not a string', () => {
+    expect(getCnrIdFromProperties({ cnr_id: 123 })).toBeUndefined()
+  })
+})
+
+describe('getCnrIdFromNode', () => {
+  it('returns cnr_id from node properties', () => {
+    const node = {
+      properties: { cnr_id: 'node-pack' }
+    } as unknown as LGraphNode
+    expect(getCnrIdFromNode(node)).toBe('node-pack')
+  })
+
+  it('returns aux_id when cnr_id is absent', () => {
+    const node = {
+      properties: { aux_id: 'node-aux-pack' }
+    } as unknown as LGraphNode
+    expect(getCnrIdFromNode(node)).toBe('node-aux-pack')
+  })
+
+  it('prefers cnr_id over aux_id in node properties', () => {
+    const node = {
+      properties: { cnr_id: 'primary', aux_id: 'secondary' }
+    } as unknown as LGraphNode
+    expect(getCnrIdFromNode(node)).toBe('primary')
+  })
+
+  it('returns undefined when node has no cnr_id or aux_id', () => {
+    const node = { properties: {} } as unknown as LGraphNode
+    expect(getCnrIdFromNode(node)).toBeUndefined()
+  })
+})
diff --git a/src/workbench/extensions/manager/utils/missingNodeErrorUtil.ts b/src/workbench/extensions/manager/utils/missingNodeErrorUtil.ts
new file mode 100644
index 0000000000..99cb381659
--- /dev/null
+++ b/src/workbench/extensions/manager/utils/missingNodeErrorUtil.ts
@@ -0,0 +1,27 @@
+import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
+
+/**
+ * Extracts the custom node registry ID (cnr_id or aux_id) from a raw
+ * properties bag.
+ *
+ * @param properties - The properties object to inspect
+ * @returns The cnrId string, or undefined if not found
+ */
+export function getCnrIdFromProperties(
+  properties: Record<string, unknown> | undefined | null
+): string | undefined {
+  if (typeof properties?.cnr_id === 'string') return properties.cnr_id
+  if (typeof properties?.aux_id === 'string') return properties.aux_id
+  return undefined
+}
+
+/**
+ * Extracts the custom node registry ID (cnr_id or aux_id) from a node's properties.
+ * Returns undefined if neither property is present.
+ *
+ * @param node - The graph node to inspect
+ * @returns The cnrId string, or undefined if not found
+ */
+export function getCnrIdFromNode(node: LGraphNode): string | undefined {
+  return getCnrIdFromProperties(node.properties as Record<string, unknown>)
+}
diff --git a/tests-ui/tests/utils/systemCompatibility.test.ts b/src/workbench/extensions/manager/utils/systemCompatibility.test.ts
similarity index 100%
rename from tests-ui/tests/utils/systemCompatibility.test.ts
rename to src/workbench/extensions/manager/utils/systemCompatibility.test.ts
diff --git a/tests-ui/tests/utils/versionUtil.test.ts b/src/workbench/extensions/manager/utils/versionUtil.test.ts
similarity index 82%
rename from tests-ui/tests/utils/versionUtil.test.ts
rename to src/workbench/extensions/manager/utils/versionUtil.test.ts
index d1127368aa..c0d6270d9f 100644
--- a/tests-ui/tests/utils/versionUtil.test.ts
+++ b/src/workbench/extensions/manager/utils/versionUtil.test.ts
@@ -1,15 +1,16 @@
-import { describe, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 import {
   checkVersionCompatibility,
   getFrontendVersion
 } from '@/workbench/extensions/manager/utils/versionUtil'
 
-// Mock config module
+const mockConfig = vi.hoisted((): { app_version: string | undefined } => ({
+  app_version: '1.24.0-1'
+}))
+
 vi.mock('@/config', () => ({
-  default: {
-    app_version: '1.24.0-1'
-  }
+  default: mockConfig
 }))
 
 describe('versionUtil', () => {
@@ -26,7 +27,7 @@ describe('versionUtil', () => {
     it('should return null when current version is null', () => {
       const result = checkVersionCompatibility(
         'comfyui_version',
-        null as any,
+        null!,
         '>=1.0.0'
       )
       expect(result).toBeNull()
@@ -50,7 +51,7 @@ describe('versionUtil', () => {
       const result = checkVersionCompatibility(
         'comfyui_version',
         '1.0.0',
-        null as any
+        null!
       )
       expect(result).toBeNull()
     })
@@ -266,79 +267,40 @@ describe('versionUtil', () => {
   })
 
   describe('getFrontendVersion', () => {
+    let originalEnv: string | undefined
+
+    beforeEach(() => {
+      originalEnv = import.meta.env.VITE_APP_VERSION
+      mockConfig.app_version = '1.24.0-1'
+    })
+
+    afterEach(() => {
+      if (originalEnv !== undefined) {
+        import.meta.env.VITE_APP_VERSION = originalEnv
+      } else {
+        delete import.meta.env.VITE_APP_VERSION
+      }
+    })
+
     it('should return app_version from config when available', () => {
       const version = getFrontendVersion()
       expect(version).toBe('1.24.0-1')
     })
 
-    it('should fallback to VITE_APP_VERSION when app_version is not available', async () => {
-      // Save original environment
-      const originalEnv = import.meta.env.VITE_APP_VERSION
-
-      // Mock config without app_version
-      vi.doMock('@/config', () => ({
-        default: {}
-      }))
-
-      // Set VITE_APP_VERSION
+    it('should fallback to VITE_APP_VERSION when app_version is not available', () => {
+      mockConfig.app_version = undefined
       import.meta.env.VITE_APP_VERSION = '2.0.0'
 
-      // Clear module cache to force re-import
-      vi.resetModules()
-
-      // Import fresh module
-      const versionUtil =
-        await import('@/workbench/extensions/manager/utils/versionUtil')
-
-      const version = versionUtil.getFrontendVersion()
+      const version = getFrontendVersion()
       expect(version).toBe('2.0.0')
-
-      // Restore original env
-      import.meta.env.VITE_APP_VERSION = originalEnv
-
-      // Reset mocks for next test
-      vi.resetModules()
-      vi.doMock('@/config', () => ({
-        default: {
-          app_version: '1.24.0-1'
-        }
-      }))
     })
 
-    it('should return undefined when no version is available', async () => {
-      // Save original environment
-      const originalEnv = import.meta.env.VITE_APP_VERSION
-
-      // Mock config without app_version
-      vi.doMock('@/config', () => ({
-        default: {}
-      }))
-
-      // Clear VITE_APP_VERSION
+    it('should return undefined when no version is available', () => {
+      mockConfig.app_version = undefined
       delete import.meta.env.VITE_APP_VERSION
 
-      // Clear module cache to force re-import
-      vi.resetModules()
-
-      // Import fresh module
-      const versionUtil =
-        await import('@/workbench/extensions/manager/utils/versionUtil')
-
-      const version = versionUtil.getFrontendVersion()
+      const version = getFrontendVersion()
       expect(version).toBeUndefined()
-
-      // Restore original env
-      if (originalEnv !== undefined) {
-        import.meta.env.VITE_APP_VERSION = originalEnv
-      }
-
-      // Reset mocks for next test
-      vi.resetModules()
-      vi.doMock('@/config', () => ({
-        default: {
-          app_version: '1.24.0-1'
-        }
-      }))
     })
   })
 })
diff --git a/tests-ui/utils/modelMetadataUtil.test.ts b/src/workbench/utils/modelMetadataUtil.test.ts
similarity index 100%
rename from tests-ui/utils/modelMetadataUtil.test.ts
rename to src/workbench/utils/modelMetadataUtil.test.ts
diff --git a/tests-ui/tests/utils/nodeDefOrderingUtil.test.ts b/src/workbench/utils/nodeDefOrderingUtil.test.ts
similarity index 100%
rename from tests-ui/tests/utils/nodeDefOrderingUtil.test.ts
rename to src/workbench/utils/nodeDefOrderingUtil.test.ts
diff --git a/tailwind.config.ts b/tailwind.config.ts
deleted file mode 100644
index ae57cde6a6..0000000000
--- a/tailwind.config.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import baseConfig from '@comfyorg/design-system/tailwind-config'
-
-export default {
-  ...baseConfig,
-  content: ['./index.html', './src/**/*.{vue,js,ts,jsx,tsx}']
-}
diff --git a/tests-ui/CLAUDE.md b/tests-ui/CLAUDE.md
deleted file mode 100644
index 10e5d660bb..0000000000
--- a/tests-ui/CLAUDE.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Unit Testing Guidelines
-
-## Running Tests
-- Single file: `pnpm test:unit -- <filename>`
-- All tests: `pnpm test:unit`
-- Wrong Examples:
-  - Still runs all tests: `pnpm test:unit <filename>`
-
-## Testing Approach
-
-- Write tests for new features
-- Run single tests for performance
-- Follow existing test patterns
-
-## Test Structure
-
-- Check @tests-ui/README.md for guidelines
-- Use existing test utilities
-- Mock external dependencies
-
-## Mocking
-- Read: https://vitest.dev/api/mock.html
-- Critical: Always prefer vitest mock functions over writing verbose manual mocks
diff --git a/tests-ui/fixtures/historyFixtures.ts b/tests-ui/fixtures/historyFixtures.ts
deleted file mode 100644
index 3a930a1add..0000000000
--- a/tests-ui/fixtures/historyFixtures.ts
+++ /dev/null
@@ -1,380 +0,0 @@
-/**
- * @fileoverview Test fixtures for history tests.
- */
-import type { HistoryResponseV2 } from '@/platform/remote/comfyui/history/types/historyV2Types'
-import type { HistoryTaskItem } from '@/schemas/apiSchema'
-
-/**
- * V1 API raw response format (object with prompt IDs as keys)
- */
-export const historyV1RawResponse: Record<
-  string,
-  Omit<HistoryTaskItem, 'taskType'>
-> = {
-  'complete-item-id': {
-    prompt: [
-      24,
-      'complete-item-id',
-      {},
-      {
-        client_id: 'test-client',
-        extra_pnginfo: {
-          workflow: {
-            id: '44f0c9f9-b5a7-48de-99fc-7e80c1570241',
-            revision: 0,
-            last_node_id: 9,
-            last_link_id: 9,
-            nodes: [],
-            links: [],
-            groups: [],
-            config: {},
-            extra: {},
-            version: 0.4
-          }
-        }
-      },
-      ['9']
-    ],
-    outputs: {
-      '9': {
-        images: [
-          {
-            filename: 'test.png',
-            subfolder: '',
-            type: 'output'
-          }
-        ]
-      }
-    },
-    status: {
-      status_str: 'success',
-      completed: true,
-      messages: [
-        [
-          'execution_start',
-          { prompt_id: 'complete-item-id', timestamp: 1234567890 }
-        ],
-        [
-          'execution_success',
-          { prompt_id: 'complete-item-id', timestamp: 1234567900 }
-        ]
-      ]
-    },
-    meta: {
-      '9': {
-        node_id: '9',
-        display_node: '9'
-      }
-    }
-  },
-  'no-status-id': {
-    prompt: [
-      23,
-      'no-status-id',
-      {},
-      {
-        client_id: 'inference'
-      },
-      ['10']
-    ],
-    outputs: {
-      '10': {
-        images: []
-      }
-    },
-    status: undefined,
-    meta: {
-      '10': {
-        node_id: '10',
-        display_node: '10'
-      }
-    }
-  }
-}
-
-/**
- * V2 response with multiple edge cases:
- * - Item 0: Complete with all fields
- * - Item 1: Missing optional status field
- * - Item 2: Missing optional meta field
- * - Item 3: Multiple output nodes
- */
-export const historyV2Fixture: HistoryResponseV2 = {
-  history: [
-    {
-      prompt_id: 'complete-item-id',
-      prompt: {
-        priority: 24,
-        prompt_id: 'complete-item-id',
-        extra_data: {
-          client_id: 'test-client',
-          extra_pnginfo: {
-            workflow: {
-              id: '44f0c9f9-b5a7-48de-99fc-7e80c1570241',
-              revision: 0,
-              last_node_id: 9,
-              last_link_id: 9,
-              nodes: [],
-              links: [],
-              groups: [],
-              config: {},
-              extra: {},
-              version: 0.4
-            }
-          }
-        }
-      },
-      outputs: {
-        '9': {
-          images: [
-            {
-              filename: 'test.png',
-              subfolder: '',
-              type: 'output'
-            }
-          ]
-        }
-      },
-      status: {
-        status_str: 'success',
-        completed: true,
-        messages: [
-          [
-            'execution_start',
-            { prompt_id: 'complete-item-id', timestamp: 1234567890 }
-          ],
-          [
-            'execution_success',
-            { prompt_id: 'complete-item-id', timestamp: 1234567900 }
-          ]
-        ]
-      },
-      meta: {
-        '9': {
-          node_id: '9',
-          display_node: '9'
-        }
-      }
-    },
-    {
-      prompt_id: 'no-status-id',
-      prompt: {
-        priority: 23,
-        prompt_id: 'no-status-id',
-        extra_data: {
-          client_id: 'inference'
-        }
-      },
-      outputs: {
-        '10': {
-          images: []
-        }
-      },
-      meta: {
-        '10': {
-          node_id: '10',
-          display_node: '10'
-        }
-      }
-    },
-    {
-      prompt_id: 'no-meta-id',
-      prompt: {
-        priority: 22,
-        prompt_id: 'no-meta-id',
-        extra_data: {
-          client_id: 'web-ui'
-        }
-      },
-      outputs: {
-        '11': {
-          audio: []
-        }
-      },
-      status: {
-        status_str: 'error',
-        completed: false,
-        messages: []
-      }
-    },
-    {
-      prompt_id: 'multi-output-id',
-      prompt: {
-        priority: 21,
-        prompt_id: 'multi-output-id',
-        extra_data: {
-          client_id: 'batch-processor'
-        }
-      },
-      outputs: {
-        '3': {
-          images: [{ filename: 'img1.png', type: 'output', subfolder: '' }]
-        },
-        '9': {
-          images: [{ filename: 'img2.png', type: 'output', subfolder: '' }]
-        },
-        '12': {
-          video: [{ filename: 'video.mp4', type: 'output', subfolder: '' }]
-        }
-      },
-      status: {
-        status_str: 'success',
-        completed: true,
-        messages: []
-      },
-      meta: {
-        '3': { node_id: '3', display_node: '3' },
-        '9': { node_id: '9', display_node: '9' },
-        '12': { node_id: '12', display_node: '12' }
-      }
-    }
-  ]
-}
-
-/**
- * Expected V1 transformation of historyV2Fixture
- * Priority is now synthetic based on execution_success timestamp:
- * - complete-item-id: has timestamp → priority 1 (only one with timestamp)
- * - no-status-id: no status → priority 0
- * - no-meta-id: empty messages → priority 0
- * - multi-output-id: empty messages → priority 0
- */
-export const expectedV1Fixture: HistoryTaskItem[] = [
-  {
-    taskType: 'History',
-    prompt: [
-      1,
-      'complete-item-id',
-      {},
-      {
-        client_id: 'test-client',
-        extra_pnginfo: {
-          workflow: {
-            id: '44f0c9f9-b5a7-48de-99fc-7e80c1570241',
-            revision: 0,
-            last_node_id: 9,
-            last_link_id: 9,
-            nodes: [],
-            links: [],
-            groups: [],
-            config: {},
-            extra: {},
-            version: 0.4
-          }
-        }
-      },
-      ['9']
-    ],
-    outputs: {
-      '9': {
-        images: [
-          {
-            filename: 'test.png',
-            subfolder: '',
-            type: 'output'
-          }
-        ]
-      }
-    },
-    status: {
-      status_str: 'success',
-      completed: true,
-      messages: [
-        [
-          'execution_start',
-          { prompt_id: 'complete-item-id', timestamp: 1234567890 }
-        ],
-        [
-          'execution_success',
-          { prompt_id: 'complete-item-id', timestamp: 1234567900 }
-        ]
-      ]
-    },
-    meta: {
-      '9': {
-        node_id: '9',
-        display_node: '9'
-      }
-    }
-  },
-  {
-    taskType: 'History',
-    prompt: [
-      0,
-      'no-status-id',
-      {},
-      {
-        client_id: 'inference'
-      },
-      ['10']
-    ],
-    outputs: {
-      '10': {
-        images: []
-      }
-    },
-    status: undefined,
-    meta: {
-      '10': {
-        node_id: '10',
-        display_node: '10'
-      }
-    }
-  },
-  {
-    taskType: 'History',
-    prompt: [
-      0,
-      'no-meta-id',
-      {},
-      {
-        client_id: 'web-ui'
-      },
-      ['11']
-    ],
-    outputs: {
-      '11': {
-        audio: []
-      }
-    },
-    status: {
-      status_str: 'error',
-      completed: false,
-      messages: []
-    },
-    meta: undefined
-  },
-  {
-    taskType: 'History',
-    prompt: [
-      0,
-      'multi-output-id',
-      {},
-      {
-        client_id: 'batch-processor'
-      },
-      ['3', '9', '12']
-    ],
-    outputs: {
-      '3': {
-        images: [{ filename: 'img1.png', type: 'output', subfolder: '' }]
-      },
-      '9': {
-        images: [{ filename: 'img2.png', type: 'output', subfolder: '' }]
-      },
-      '12': {
-        video: [{ filename: 'video.mp4', type: 'output', subfolder: '' }]
-      }
-    },
-    status: {
-      status_str: 'success',
-      completed: true,
-      messages: []
-    },
-    meta: {
-      '3': { node_id: '3', display_node: '3' },
-      '9': { node_id: '9', display_node: '9' },
-      '12': { node_id: '12', display_node: '12' }
-    }
-  }
-]
diff --git a/tests-ui/fixtures/historySortingFixtures.ts b/tests-ui/fixtures/historySortingFixtures.ts
deleted file mode 100644
index a7b630667e..0000000000
--- a/tests-ui/fixtures/historySortingFixtures.ts
+++ /dev/null
@@ -1,258 +0,0 @@
-/**
- * @fileoverview Test fixtures for history V2 timestamp-based sorting
- */
-import type { HistoryResponseV2 } from '@/platform/remote/comfyui/history/types/historyV2Types'
-
-export const historyV2WithMissingTimestamp: HistoryResponseV2 = {
-  history: [
-    {
-      prompt_id: 'item-timestamp-1000',
-      prompt: {
-        priority: 0,
-        prompt_id: 'item-timestamp-1000',
-        extra_data: {
-          client_id: 'test-client'
-        }
-      },
-      outputs: {
-        '1': {
-          images: [{ filename: 'test1.png', type: 'output', subfolder: '' }]
-        }
-      },
-      status: {
-        status_str: 'success',
-        completed: true,
-        messages: [
-          [
-            'execution_success',
-            { prompt_id: 'item-timestamp-1000', timestamp: 1000 }
-          ]
-        ]
-      }
-    },
-    {
-      prompt_id: 'item-timestamp-2000',
-      prompt: {
-        priority: 0,
-        prompt_id: 'item-timestamp-2000',
-        extra_data: {
-          client_id: 'test-client'
-        }
-      },
-      outputs: {
-        '2': {
-          images: [{ filename: 'test2.png', type: 'output', subfolder: '' }]
-        }
-      },
-      status: {
-        status_str: 'success',
-        completed: true,
-        messages: [
-          [
-            'execution_success',
-            { prompt_id: 'item-timestamp-2000', timestamp: 2000 }
-          ]
-        ]
-      }
-    },
-    {
-      prompt_id: 'item-no-timestamp',
-      prompt: {
-        priority: 0,
-        prompt_id: 'item-no-timestamp',
-        extra_data: {
-          client_id: 'test-client'
-        }
-      },
-      outputs: {
-        '3': {
-          images: [{ filename: 'test3.png', type: 'output', subfolder: '' }]
-        }
-      },
-      status: {
-        status_str: 'success',
-        completed: true,
-        messages: []
-      }
-    }
-  ]
-}
-
-export const historyV2FiveItemsSorting: HistoryResponseV2 = {
-  history: [
-    {
-      prompt_id: 'item-timestamp-3000',
-      prompt: {
-        priority: 0,
-        prompt_id: 'item-timestamp-3000',
-        extra_data: { client_id: 'test-client' }
-      },
-      outputs: {
-        '1': {
-          images: [{ filename: 'test1.png', type: 'output', subfolder: '' }]
-        }
-      },
-      status: {
-        status_str: 'success',
-        completed: true,
-        messages: [
-          [
-            'execution_success',
-            { prompt_id: 'item-timestamp-3000', timestamp: 3000 }
-          ]
-        ]
-      }
-    },
-    {
-      prompt_id: 'item-timestamp-1000',
-      prompt: {
-        priority: 0,
-        prompt_id: 'item-timestamp-1000',
-        extra_data: { client_id: 'test-client' }
-      },
-      outputs: {
-        '2': {
-          images: [{ filename: 'test2.png', type: 'output', subfolder: '' }]
-        }
-      },
-      status: {
-        status_str: 'success',
-        completed: true,
-        messages: [
-          [
-            'execution_success',
-            { prompt_id: 'item-timestamp-1000', timestamp: 1000 }
-          ]
-        ]
-      }
-    },
-    {
-      prompt_id: 'item-timestamp-5000',
-      prompt: {
-        priority: 0,
-        prompt_id: 'item-timestamp-5000',
-        extra_data: { client_id: 'test-client' }
-      },
-      outputs: {
-        '3': {
-          images: [{ filename: 'test3.png', type: 'output', subfolder: '' }]
-        }
-      },
-      status: {
-        status_str: 'success',
-        completed: true,
-        messages: [
-          [
-            'execution_success',
-            { prompt_id: 'item-timestamp-5000', timestamp: 5000 }
-          ]
-        ]
-      }
-    },
-    {
-      prompt_id: 'item-timestamp-2000',
-      prompt: {
-        priority: 0,
-        prompt_id: 'item-timestamp-2000',
-        extra_data: { client_id: 'test-client' }
-      },
-      outputs: {
-        '4': {
-          images: [{ filename: 'test4.png', type: 'output', subfolder: '' }]
-        }
-      },
-      status: {
-        status_str: 'success',
-        completed: true,
-        messages: [
-          [
-            'execution_success',
-            { prompt_id: 'item-timestamp-2000', timestamp: 2000 }
-          ]
-        ]
-      }
-    },
-    {
-      prompt_id: 'item-timestamp-4000',
-      prompt: {
-        priority: 0,
-        prompt_id: 'item-timestamp-4000',
-        extra_data: { client_id: 'test-client' }
-      },
-      outputs: {
-        '5': {
-          images: [{ filename: 'test5.png', type: 'output', subfolder: '' }]
-        }
-      },
-      status: {
-        status_str: 'success',
-        completed: true,
-        messages: [
-          [
-            'execution_success',
-            { prompt_id: 'item-timestamp-4000', timestamp: 4000 }
-          ]
-        ]
-      }
-    }
-  ]
-}
-
-export const historyV2MultipleNoTimestamp: HistoryResponseV2 = {
-  history: [
-    {
-      prompt_id: 'item-no-timestamp-1',
-      prompt: {
-        priority: 0,
-        prompt_id: 'item-no-timestamp-1',
-        extra_data: { client_id: 'test-client' }
-      },
-      outputs: {
-        '1': {
-          images: [{ filename: 'test1.png', type: 'output', subfolder: '' }]
-        }
-      },
-      status: {
-        status_str: 'success',
-        completed: true,
-        messages: []
-      }
-    },
-    {
-      prompt_id: 'item-no-timestamp-2',
-      prompt: {
-        priority: 0,
-        prompt_id: 'item-no-timestamp-2',
-        extra_data: { client_id: 'test-client' }
-      },
-      outputs: {
-        '2': {
-          images: [{ filename: 'test2.png', type: 'output', subfolder: '' }]
-        }
-      },
-      status: {
-        status_str: 'success',
-        completed: true,
-        messages: []
-      }
-    },
-    {
-      prompt_id: 'item-no-timestamp-3',
-      prompt: {
-        priority: 0,
-        prompt_id: 'item-no-timestamp-3',
-        extra_data: { client_id: 'test-client' }
-      },
-      outputs: {
-        '3': {
-          images: [{ filename: 'test3.png', type: 'output', subfolder: '' }]
-        }
-      },
-      status: {
-        status_str: 'success',
-        completed: true,
-        messages: []
-      }
-    }
-  ]
-}
diff --git a/tests-ui/tests/base/common/downloadUtil.test.ts b/tests-ui/tests/base/common/downloadUtil.test.ts
deleted file mode 100644
index 8684c8e1c4..0000000000
--- a/tests-ui/tests/base/common/downloadUtil.test.ts
+++ /dev/null
@@ -1,199 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-import { downloadFile } from '@/base/common/downloadUtil'
-
-let mockIsCloud = false
-
-vi.mock('@/platform/distribution/types', () => ({
-  get isCloud() {
-    return mockIsCloud
-  }
-}))
-
-// Global stubs
-const createObjectURLSpy = vi
-  .spyOn(URL, 'createObjectURL')
-  .mockReturnValue('blob:mock-url')
-const revokeObjectURLSpy = vi
-  .spyOn(URL, 'revokeObjectURL')
-  .mockImplementation(() => {})
-
-describe('downloadUtil', () => {
-  let mockLink: HTMLAnchorElement
-  let fetchMock: ReturnType<typeof vi.fn>
-
-  beforeEach(() => {
-    mockIsCloud = false
-    fetchMock = vi.fn()
-    vi.stubGlobal('fetch', fetchMock)
-    createObjectURLSpy.mockClear().mockReturnValue('blob:mock-url')
-    revokeObjectURLSpy.mockClear().mockImplementation(() => {})
-    // Create a mock anchor element
-    mockLink = {
-      href: '',
-      download: '',
-      click: vi.fn(),
-      style: { display: '' }
-    } as unknown as HTMLAnchorElement
-
-    // Spy on DOM methods
-    vi.spyOn(document, 'createElement').mockReturnValue(mockLink)
-    vi.spyOn(document.body, 'appendChild').mockImplementation(() => mockLink)
-    vi.spyOn(document.body, 'removeChild').mockImplementation(() => mockLink)
-  })
-
-  afterEach(() => {
-    vi.unstubAllGlobals()
-  })
-
-  describe('downloadFile', () => {
-    it('should create and trigger download with basic URL', () => {
-      const testUrl = 'https://example.com/image.png'
-
-      downloadFile(testUrl)
-
-      expect(document.createElement).toHaveBeenCalledWith('a')
-      expect(mockLink.href).toBe(testUrl)
-      expect(mockLink.download).toBe('download.png') // Default filename
-      expect(document.body.appendChild).toHaveBeenCalledWith(mockLink)
-      expect(mockLink.click).toHaveBeenCalled()
-      expect(document.body.removeChild).toHaveBeenCalledWith(mockLink)
-      expect(fetchMock).not.toHaveBeenCalled()
-      expect(createObjectURLSpy).not.toHaveBeenCalled()
-    })
-
-    it('should use custom filename when provided', () => {
-      const testUrl = 'https://example.com/image.png'
-      const customFilename = 'my-custom-image.png'
-
-      downloadFile(testUrl, customFilename)
-
-      expect(mockLink.href).toBe(testUrl)
-      expect(mockLink.download).toBe(customFilename)
-      expect(fetchMock).not.toHaveBeenCalled()
-      expect(createObjectURLSpy).not.toHaveBeenCalled()
-    })
-
-    it('should extract filename from URL query parameters', () => {
-      const testUrl =
-        'https://example.com/api/file?filename=extracted-image.jpg&other=param'
-
-      downloadFile(testUrl)
-
-      expect(mockLink.href).toBe(testUrl)
-      expect(mockLink.download).toBe('extracted-image.jpg')
-      expect(createObjectURLSpy).not.toHaveBeenCalled()
-    })
-
-    it('should use default filename when URL has no filename parameter', () => {
-      const testUrl = 'https://example.com/api/file?other=param'
-
-      downloadFile(testUrl)
-
-      expect(mockLink.href).toBe(testUrl)
-      expect(mockLink.download).toBe('download.png')
-      expect(createObjectURLSpy).not.toHaveBeenCalled()
-    })
-
-    it('should handle invalid URLs gracefully', () => {
-      const invalidUrl = 'not-a-valid-url'
-
-      downloadFile(invalidUrl)
-
-      expect(mockLink.href).toBe(invalidUrl)
-      expect(mockLink.download).toBe('download.png')
-      expect(mockLink.click).toHaveBeenCalled()
-      expect(fetchMock).not.toHaveBeenCalled()
-      expect(createObjectURLSpy).not.toHaveBeenCalled()
-    })
-
-    it('should prefer custom filename over extracted filename', () => {
-      const testUrl =
-        'https://example.com/api/file?filename=extracted-image.jpg'
-      const customFilename = 'custom-override.png'
-
-      downloadFile(testUrl, customFilename)
-
-      expect(mockLink.download).toBe(customFilename)
-      expect(createObjectURLSpy).not.toHaveBeenCalled()
-    })
-
-    it('should handle URLs with empty filename parameter', () => {
-      const testUrl = 'https://example.com/api/file?filename='
-
-      downloadFile(testUrl)
-
-      expect(mockLink.download).toBe('download.png')
-      expect(createObjectURLSpy).not.toHaveBeenCalled()
-    })
-
-    it('should handle relative URLs by using window.location.origin', () => {
-      const relativeUrl = '/api/file?filename=relative-image.png'
-
-      downloadFile(relativeUrl)
-
-      expect(mockLink.href).toBe(relativeUrl)
-      expect(mockLink.download).toBe('relative-image.png')
-      expect(fetchMock).not.toHaveBeenCalled()
-      expect(createObjectURLSpy).not.toHaveBeenCalled()
-    })
-
-    it('should clean up DOM elements after download', () => {
-      const testUrl = 'https://example.com/image.png'
-
-      downloadFile(testUrl)
-
-      // Verify the element was added and then removed
-      expect(document.body.appendChild).toHaveBeenCalledWith(mockLink)
-      expect(document.body.removeChild).toHaveBeenCalledWith(mockLink)
-      expect(fetchMock).not.toHaveBeenCalled()
-      expect(createObjectURLSpy).not.toHaveBeenCalled()
-    })
-
-    it('streams downloads via blob when running in cloud', async () => {
-      mockIsCloud = true
-      const testUrl = 'https://storage.googleapis.com/bucket/file.bin'
-      const blob = new Blob(['test'])
-      const blobFn = vi.fn().mockResolvedValue(blob)
-      fetchMock.mockResolvedValue({
-        ok: true,
-        status: 200,
-        blob: blobFn
-      } as unknown as Response)
-
-      downloadFile(testUrl)
-
-      expect(fetchMock).toHaveBeenCalledWith(testUrl)
-      const fetchPromise = fetchMock.mock.results[0].value as Promise<Response>
-      await fetchPromise
-      const blobPromise = blobFn.mock.results[0].value as Promise<Blob>
-      await blobPromise
-      await Promise.resolve()
-      expect(blobFn).toHaveBeenCalled()
-      expect(createObjectURLSpy).toHaveBeenCalledWith(blob)
-      expect(revokeObjectURLSpy).toHaveBeenCalledWith('blob:mock-url')
-      expect(mockLink.click).toHaveBeenCalled()
-    })
-
-    it('logs an error when cloud fetch fails', async () => {
-      mockIsCloud = true
-      const testUrl = 'https://storage.googleapis.com/bucket/missing.bin'
-      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
-      fetchMock.mockResolvedValue({
-        ok: false,
-        status: 404,
-        blob: vi.fn()
-      } as unknown as Response)
-
-      downloadFile(testUrl)
-
-      expect(fetchMock).toHaveBeenCalledWith(testUrl)
-      const fetchPromise = fetchMock.mock.results[0].value as Promise<Response>
-      await fetchPromise
-      await Promise.resolve()
-      expect(consoleSpy).toHaveBeenCalled()
-      expect(createObjectURLSpy).not.toHaveBeenCalled()
-      consoleSpy.mockRestore()
-    })
-  })
-})
diff --git a/tests-ui/tests/components/TopMenuSection.test.ts b/tests-ui/tests/components/TopMenuSection.test.ts
deleted file mode 100644
index b4d11efea5..0000000000
--- a/tests-ui/tests/components/TopMenuSection.test.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import { createTestingPinia } from '@pinia/testing'
-import { mount } from '@vue/test-utils'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { computed } from 'vue'
-import { createI18n } from 'vue-i18n'
-
-import TopMenuSection from '@/components/TopMenuSection.vue'
-import CurrentUserButton from '@/components/topbar/CurrentUserButton.vue'
-import LoginButton from '@/components/topbar/LoginButton.vue'
-import { isElectron } from '@/utils/envUtil'
-
-const mockData = vi.hoisted(() => ({ isLoggedIn: false }))
-
-vi.mock('@/composables/auth/useCurrentUser', () => ({
-  useCurrentUser: () => {
-    return {
-      isLoggedIn: computed(() => mockData.isLoggedIn)
-    }
-  }
-}))
-
-vi.mock('@/utils/envUtil')
-vi.mock('@/stores/firebaseAuthStore', () => ({
-  useFirebaseAuthStore: vi.fn(() => ({
-    currentUser: null,
-    loading: false
-  }))
-}))
-
-function createWrapper() {
-  const i18n = createI18n({
-    legacy: false,
-    locale: 'en',
-    messages: {
-      en: {
-        sideToolbar: {
-          queueProgressOverlay: {
-            viewJobHistory: 'View job history',
-            expandCollapsedQueue: 'Expand collapsed queue'
-          }
-        }
-      }
-    }
-  })
-
-  return mount(TopMenuSection, {
-    global: {
-      plugins: [createTestingPinia({ createSpy: vi.fn }), i18n],
-      stubs: {
-        SubgraphBreadcrumb: true,
-        QueueProgressOverlay: true,
-        CurrentUserButton: true,
-        LoginButton: true
-      },
-      directives: {
-        tooltip: () => {}
-      }
-    }
-  })
-}
-
-describe('TopMenuSection', () => {
-  beforeEach(() => {
-    vi.resetAllMocks()
-  })
-
-  describe('authentication state', () => {
-    describe('when user is logged in', () => {
-      beforeEach(() => {
-        mockData.isLoggedIn = true
-      })
-
-      it('should display CurrentUserButton and not display LoginButton', () => {
-        const wrapper = createWrapper()
-        expect(wrapper.findComponent(CurrentUserButton).exists()).toBe(true)
-        expect(wrapper.findComponent(LoginButton).exists()).toBe(false)
-      })
-    })
-
-    describe('when user is not logged in', () => {
-      beforeEach(() => {
-        mockData.isLoggedIn = false
-      })
-
-      describe('on desktop platform', () => {
-        it('should display LoginButton and not display CurrentUserButton', () => {
-          vi.mocked(isElectron).mockReturnValue(true)
-          const wrapper = createWrapper()
-          expect(wrapper.findComponent(LoginButton).exists()).toBe(true)
-          expect(wrapper.findComponent(CurrentUserButton).exists()).toBe(false)
-        })
-      })
-
-      describe('on web platform', () => {
-        it('should not display CurrentUserButton and not display LoginButton', () => {
-          const wrapper = createWrapper()
-          expect(wrapper.findComponent(CurrentUserButton).exists()).toBe(false)
-          expect(wrapper.findComponent(LoginButton).exists()).toBe(false)
-        })
-      })
-    })
-  })
-})
diff --git a/tests-ui/tests/components/dialog/footer/ManagerProgressFooter.test.ts b/tests-ui/tests/components/dialog/footer/ManagerProgressFooter.test.ts
deleted file mode 100644
index 024e025b83..0000000000
--- a/tests-ui/tests/components/dialog/footer/ManagerProgressFooter.test.ts
+++ /dev/null
@@ -1,486 +0,0 @@
-import { mount } from '@vue/test-utils'
-import { createPinia, setActivePinia } from 'pinia'
-import PrimeVue from 'primevue/config'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { nextTick } from 'vue'
-import { createI18n } from 'vue-i18n'
-
-import { useSettingStore } from '@/platform/settings/settingStore'
-import { useCommandStore } from '@/stores/commandStore'
-import { useDialogStore } from '@/stores/dialogStore'
-import ManagerProgressFooter from '@/workbench/extensions/manager/components/ManagerProgressFooter.vue'
-import { useComfyManagerService } from '@/workbench/extensions/manager/services/comfyManagerService'
-import {
-  useComfyManagerStore,
-  useManagerProgressDialogStore
-} from '@/workbench/extensions/manager/stores/comfyManagerStore'
-import type { TaskLog } from '@/workbench/extensions/manager/types/comfyManagerTypes'
-
-// Mock modules
-vi.mock('@/workbench/extensions/manager/stores/comfyManagerStore')
-vi.mock('@/stores/dialogStore')
-vi.mock('@/platform/settings/settingStore')
-vi.mock('@/stores/commandStore')
-vi.mock('@/workbench/extensions/manager/services/comfyManagerService')
-vi.mock(
-  '@/workbench/extensions/manager/composables/useConflictDetection',
-  () => ({
-    useConflictDetection: vi.fn(() => ({
-      conflictedPackages: { value: [] },
-      runFullConflictAnalysis: vi.fn().mockResolvedValue(undefined)
-    }))
-  })
-)
-
-// Mock useEventListener to capture the event handler
-let reconnectHandler: (() => void) | null = null
-vi.mock('@vueuse/core', async () => {
-  const actual = await vi.importActual('@vueuse/core')
-  return {
-    ...actual,
-    useEventListener: vi.fn(
-      (_target: any, event: string, handler: any, _options: any) => {
-        if (event === 'reconnected') {
-          reconnectHandler = handler
-        }
-      }
-    )
-  }
-})
-vi.mock('@/platform/workflow/core/services/workflowService', () => ({
-  useWorkflowService: vi.fn(() => ({
-    reloadCurrentWorkflow: vi.fn().mockResolvedValue(undefined)
-  }))
-}))
-vi.mock('@/stores/workspace/colorPaletteStore', () => ({
-  useColorPaletteStore: vi.fn(() => ({
-    completedActivePalette: {
-      light_theme: false
-    }
-  }))
-}))
-
-// Helper function to mount component with required setup
-const mountComponent = (options: { captureError?: boolean } = {}) => {
-  const pinia = createPinia()
-  setActivePinia(pinia)
-
-  const i18n = createI18n({
-    legacy: false,
-    locale: 'en',
-    messages: {
-      en: {
-        g: {
-          close: 'Close',
-          progressCountOf: 'of'
-        },
-        contextMenu: {
-          Collapse: 'Collapse',
-          Expand: 'Expand'
-        },
-        manager: {
-          clickToFinishSetup: 'Click',
-          applyChanges: 'Apply Changes',
-          toFinishSetup: 'to finish setup',
-          restartingBackend: 'Restarting backend to apply changes...',
-          extensionsSuccessfullyInstalled:
-            'Extension(s) successfully installed and are ready to use!',
-          restartToApplyChanges: 'To apply changes, please restart ComfyUI',
-          installingDependencies: 'Installing dependencies...'
-        }
-      }
-    }
-  })
-
-  const config: any = {
-    global: {
-      plugins: [pinia, PrimeVue, i18n]
-    }
-  }
-
-  // Add error handler for tests that expect errors
-  if (options.captureError) {
-    config.global.config = {
-      errorHandler: () => {
-        // Suppress error in test
-      }
-    }
-  }
-
-  return mount(ManagerProgressFooter, config)
-}
-
-describe('ManagerProgressFooter', () => {
-  const mockTaskLogs: TaskLog[] = []
-
-  const mockComfyManagerStore = {
-    taskLogs: mockTaskLogs,
-    allTasksDone: true,
-    isProcessingTasks: false,
-    succeededTasksIds: [] as string[],
-    failedTasksIds: [] as string[],
-    taskHistory: {} as Record<string, any>,
-    taskQueue: null,
-    resetTaskState: vi.fn(),
-    clearLogs: vi.fn(),
-    setStale: vi.fn(),
-    // Add other required properties
-    isLoading: { value: false },
-    error: { value: null },
-    statusMessage: { value: 'DONE' },
-    installedPacks: {},
-    installedPacksIds: new Set(),
-    isPackInstalled: vi.fn(),
-    isPackEnabled: vi.fn(),
-    getInstalledPackVersion: vi.fn(),
-    refreshInstalledList: vi.fn(),
-    installPack: vi.fn(),
-    uninstallPack: vi.fn(),
-    updatePack: vi.fn(),
-    updateAllPacks: vi.fn(),
-    disablePack: vi.fn(),
-    enablePack: vi.fn()
-  }
-
-  const mockDialogStore = {
-    closeDialog: vi.fn(),
-    // Add other required properties
-    dialogStack: { value: [] },
-    showDialog: vi.fn(),
-    $id: 'dialog',
-    $state: {} as any,
-    $patch: vi.fn(),
-    $reset: vi.fn(),
-    $subscribe: vi.fn(),
-    $dispose: vi.fn(),
-    $onAction: vi.fn()
-  }
-
-  const mockSettingStore = {
-    get: vi.fn().mockReturnValue(false),
-    set: vi.fn(),
-    // Add other required properties
-    settingValues: { value: {} },
-    settingsById: { value: {} },
-    exists: vi.fn(),
-    getDefaultValue: vi.fn(),
-    loadSettingValues: vi.fn(),
-    updateValue: vi.fn(),
-    $id: 'setting',
-    $state: {} as any,
-    $patch: vi.fn(),
-    $reset: vi.fn(),
-    $subscribe: vi.fn(),
-    $dispose: vi.fn(),
-    $onAction: vi.fn()
-  }
-
-  const mockProgressDialogStore = {
-    isExpanded: false,
-    toggle: vi.fn(),
-    collapse: vi.fn(),
-    expand: vi.fn()
-  }
-
-  const mockCommandStore = {
-    execute: vi.fn().mockResolvedValue(undefined)
-  }
-
-  const mockComfyManagerService = {
-    rebootComfyUI: vi.fn().mockResolvedValue(null)
-  }
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    // Create new pinia instance for each test
-    const pinia = createPinia()
-    setActivePinia(pinia)
-
-    // Reset task logs
-    mockTaskLogs.length = 0
-    mockComfyManagerStore.taskLogs = mockTaskLogs
-    // Reset event handler
-    reconnectHandler = null
-
-    vi.mocked(useComfyManagerStore).mockReturnValue(
-      mockComfyManagerStore as any
-    )
-    vi.mocked(useDialogStore).mockReturnValue(mockDialogStore as any)
-    vi.mocked(useSettingStore).mockReturnValue(mockSettingStore as any)
-    vi.mocked(useManagerProgressDialogStore).mockReturnValue(
-      mockProgressDialogStore as any
-    )
-    vi.mocked(useCommandStore).mockReturnValue(mockCommandStore as any)
-    vi.mocked(useComfyManagerService).mockReturnValue(
-      mockComfyManagerService as any
-    )
-  })
-
-  describe('State 1: Queue Running', () => {
-    it('should display loading spinner and progress counter when queue is running', async () => {
-      // Setup queue running state
-      mockComfyManagerStore.isProcessingTasks = true
-      mockComfyManagerStore.succeededTasksIds = ['1', '2']
-      mockComfyManagerStore.failedTasksIds = []
-      mockComfyManagerStore.taskHistory = {
-        '1': { taskName: 'Installing pack1' },
-        '2': { taskName: 'Installing pack2' },
-        '3': { taskName: 'Installing pack3' }
-      }
-      mockTaskLogs.push(
-        { taskName: 'Installing pack1', taskId: '1', logs: [] },
-        { taskName: 'Installing pack2', taskId: '2', logs: [] },
-        { taskName: 'Installing pack3', taskId: '3', logs: [] }
-      )
-
-      const wrapper = mountComponent()
-
-      // Check loading spinner exists (DotSpinner component)
-      expect(wrapper.find('.inline-flex').exists()).toBe(true)
-
-      // Check current task name is displayed
-      expect(wrapper.text()).toContain('Installing pack3')
-
-      // Check progress counter (completed: 2 of 3)
-      expect(wrapper.text()).toMatch(/2.*of.*3/)
-
-      // Check expand/collapse button exists
-      const expandButton = wrapper.find('[aria-label="Expand"]')
-      expect(expandButton.exists()).toBe(true)
-
-      // Check Apply Changes button is NOT shown
-      expect(wrapper.text()).not.toContain('Apply Changes')
-    })
-
-    it('should toggle expansion when expand button is clicked', async () => {
-      mockComfyManagerStore.isProcessingTasks = true
-      mockTaskLogs.push({ taskName: 'Installing', taskId: '1', logs: [] })
-
-      const wrapper = mountComponent()
-
-      const expandButton = wrapper.find('[aria-label="Expand"]')
-      await expandButton.trigger('click')
-
-      expect(mockProgressDialogStore.toggle).toHaveBeenCalled()
-    })
-  })
-
-  describe('State 2: Tasks Completed (Waiting for Restart)', () => {
-    it('should display check mark and Apply Changes button when all tasks are done', async () => {
-      // Setup tasks completed state
-      mockComfyManagerStore.isProcessingTasks = false
-      mockTaskLogs.push(
-        { taskName: 'Installed pack1', taskId: '1', logs: [] },
-        { taskName: 'Installed pack2', taskId: '2', logs: [] }
-      )
-      mockComfyManagerStore.allTasksDone = true
-
-      const wrapper = mountComponent()
-
-      // Check check mark emoji
-      expect(wrapper.text()).toContain('✅')
-
-      // Check restart message
-      expect(wrapper.text()).toContain(
-        'To apply changes, please restart ComfyUI'
-      )
-      expect(wrapper.text()).toContain('Apply Changes')
-
-      // Check Apply Changes button exists
-      const applyButton = wrapper
-        .findAll('button')
-        .find((btn) => btn.text().includes('Apply Changes'))
-      expect(applyButton).toBeTruthy()
-
-      // Check no progress counter
-      expect(wrapper.text()).not.toMatch(/\d+.*of.*\d+/)
-    })
-  })
-
-  describe('State 3: Restarting', () => {
-    it('should display restarting message and spinner during restart', async () => {
-      // Setup completed state first
-      mockComfyManagerStore.isProcessingTasks = false
-      mockComfyManagerStore.allTasksDone = true
-
-      const wrapper = mountComponent()
-
-      // Click Apply Changes to trigger restart
-      const applyButton = wrapper
-        .findAll('button')
-        .find((btn) => btn.text().includes('Apply Changes'))
-      await applyButton?.trigger('click')
-
-      // Wait for state update
-      await nextTick()
-
-      // Check restarting message
-      expect(wrapper.text()).toContain('Restarting backend to apply changes...')
-
-      // Check loading spinner during restart
-      expect(wrapper.find('.inline-flex').exists()).toBe(true)
-
-      // Check Apply Changes button is hidden
-      expect(wrapper.text()).not.toContain('Apply Changes')
-    })
-  })
-
-  describe('State 4: Restart Completed', () => {
-    it('should display success message and auto-close after 3 seconds', async () => {
-      vi.useFakeTimers()
-
-      // Setup completed state
-      mockComfyManagerStore.isProcessingTasks = false
-      mockComfyManagerStore.allTasksDone = true
-
-      const wrapper = mountComponent()
-
-      // Trigger restart
-      const applyButton = wrapper
-        .findAll('button')
-        .find((btn) => btn.text().includes('Apply Changes'))
-      await applyButton?.trigger('click')
-
-      // Wait for event listener to be set up
-      await nextTick()
-
-      // Trigger the reconnect handler directly
-      if (reconnectHandler) {
-        await reconnectHandler()
-      }
-
-      // Wait for restart completed state
-      await nextTick()
-
-      // Check success message
-      expect(wrapper.text()).toContain('🎉')
-      expect(wrapper.text()).toContain(
-        'Extension(s) successfully installed and are ready to use!'
-      )
-
-      // Check dialog closes after 3 seconds
-      vi.advanceTimersByTime(3000)
-
-      await nextTick()
-
-      expect(mockDialogStore.closeDialog).toHaveBeenCalledWith({
-        key: 'global-manager-progress-dialog'
-      })
-      expect(mockComfyManagerStore.resetTaskState).toHaveBeenCalled()
-
-      vi.useRealTimers()
-    })
-  })
-
-  describe('Common Features', () => {
-    it('should always display close button', async () => {
-      const wrapper = mountComponent()
-
-      const closeButton = wrapper.find('[aria-label="Close"]')
-      expect(closeButton.exists()).toBe(true)
-    })
-
-    it('should close dialog when close button is clicked', async () => {
-      const wrapper = mountComponent()
-
-      const closeButton = wrapper.find('[aria-label="Close"]')
-      await closeButton.trigger('click')
-
-      expect(mockDialogStore.closeDialog).toHaveBeenCalledWith({
-        key: 'global-manager-progress-dialog'
-      })
-    })
-  })
-
-  describe('Toast Management', () => {
-    it('should suppress reconnection toasts during restart', async () => {
-      mockComfyManagerStore.isProcessingTasks = false
-      mockComfyManagerStore.allTasksDone = true
-      mockSettingStore.get.mockReturnValue(false) // Original setting
-
-      const wrapper = mountComponent()
-
-      // Click Apply Changes
-      const applyButton = wrapper
-        .findAll('button')
-        .find((btn) => btn.text().includes('Apply Changes'))
-      await applyButton?.trigger('click')
-
-      // Check toast setting was disabled
-      expect(mockSettingStore.set).toHaveBeenCalledWith(
-        'Comfy.Toast.DisableReconnectingToast',
-        true
-      )
-    })
-
-    it('should restore toast settings after restart completes', async () => {
-      mockComfyManagerStore.isProcessingTasks = false
-      mockComfyManagerStore.allTasksDone = true
-      mockSettingStore.get.mockReturnValue(false) // Original setting
-
-      const wrapper = mountComponent()
-
-      // Click Apply Changes
-      const applyButton = wrapper
-        .findAll('button')
-        .find((btn) => btn.text().includes('Apply Changes'))
-      await applyButton?.trigger('click')
-
-      // Wait for event listener to be set up
-      await nextTick()
-
-      // Trigger the reconnect handler directly
-      if (reconnectHandler) {
-        await reconnectHandler()
-      }
-
-      // Wait for settings restoration
-      await nextTick()
-
-      expect(mockSettingStore.set).toHaveBeenCalledWith(
-        'Comfy.Toast.DisableReconnectingToast',
-        false // Restored to original
-      )
-    })
-  })
-
-  describe('Error Handling', () => {
-    it('should restore state and close dialog on restart error', async () => {
-      mockComfyManagerStore.isProcessingTasks = false
-      mockComfyManagerStore.allTasksDone = true
-
-      // Mock restart to throw error
-      mockComfyManagerService.rebootComfyUI.mockRejectedValue(
-        new Error('Restart failed')
-      )
-
-      const wrapper = mountComponent({ captureError: true })
-
-      // Click Apply Changes
-      const applyButton = wrapper
-        .findAll('button')
-        .find((btn) => btn.text().includes('Apply Changes'))
-
-      expect(applyButton).toBeTruthy()
-
-      // The component throws the error but Vue Test Utils catches it
-      // We need to check if the error handling logic was executed
-      await applyButton!.trigger('click').catch(() => {
-        // Error is expected, ignore it
-      })
-
-      // Wait for error handling
-      await nextTick()
-
-      // Check dialog was closed on error
-      expect(mockDialogStore.closeDialog).toHaveBeenCalled()
-      // Check toast settings were restored
-      expect(mockSettingStore.set).toHaveBeenCalledWith(
-        'Comfy.Toast.DisableReconnectingToast',
-        false
-      )
-      // Check that the error handler was called
-      expect(mockComfyManagerService.rebootComfyUI).toHaveBeenCalled()
-    })
-  })
-})
diff --git a/tests-ui/tests/components/queue/useJobErrorReporting.test.ts b/tests-ui/tests/components/queue/useJobErrorReporting.test.ts
deleted file mode 100644
index abd444dbe7..0000000000
--- a/tests-ui/tests/components/queue/useJobErrorReporting.test.ts
+++ /dev/null
@@ -1,193 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { computed, ref } from 'vue'
-import type { ComputedRef } from 'vue'
-
-import type { ExecutionErrorWsMessage } from '@/schemas/apiSchema'
-import type { TaskItemImpl } from '@/stores/queueStore'
-import type {
-  JobErrorDialogService,
-  UseJobErrorReportingOptions
-} from '@/components/queue/job/useJobErrorReporting'
-import * as jobErrorReporting from '@/components/queue/job/useJobErrorReporting'
-
-const createExecutionErrorMessage = (
-  overrides: Partial<ExecutionErrorWsMessage> = {}
-): ExecutionErrorWsMessage => ({
-  prompt_id: 'prompt',
-  timestamp: 100,
-  node_id: 'node-1',
-  node_type: 'KSampler',
-  executed: [],
-  exception_message: 'default failure',
-  exception_type: 'RuntimeError',
-  traceback: ['Trace line'],
-  current_inputs: {},
-  current_outputs: {},
-  ...overrides
-})
-
-const createTaskWithMessages = (
-  messages: Array<[string, unknown]> | undefined = []
-): TaskItemImpl =>
-  ({
-    status: {
-      status_str: 'error',
-      completed: false,
-      messages
-    }
-  }) as TaskItemImpl
-
-describe('extractExecutionError', () => {
-  it('returns null when task has no execution error messages', () => {
-    expect(jobErrorReporting.extractExecutionError(null)).toBeNull()
-    expect(
-      jobErrorReporting.extractExecutionError({
-        status: undefined
-      } as TaskItemImpl)
-    ).toBeNull()
-    expect(
-      jobErrorReporting.extractExecutionError({
-        status: {
-          status_str: 'error',
-          completed: false,
-          messages: {} as unknown as Array<[string, unknown]>
-        }
-      } as TaskItemImpl)
-    ).toBeNull()
-    expect(
-      jobErrorReporting.extractExecutionError(createTaskWithMessages([]))
-    ).toBeNull()
-    expect(
-      jobErrorReporting.extractExecutionError(
-        createTaskWithMessages([
-          ['execution_start', { prompt_id: 'prompt', timestamp: 1 }]
-        ] as Array<[string, unknown]>)
-      )
-    ).toBeNull()
-  })
-
-  it('returns detail and message for execution_error entries', () => {
-    const detail = createExecutionErrorMessage({ exception_message: 'Kaboom' })
-    const result = jobErrorReporting.extractExecutionError(
-      createTaskWithMessages([
-        ['execution_success', { prompt_id: 'prompt', timestamp: 2 }],
-        ['execution_error', detail]
-      ] as Array<[string, unknown]>)
-    )
-    expect(result).toEqual({
-      detail,
-      message: 'Kaboom'
-    })
-  })
-
-  it('falls back to an empty message when the tuple lacks detail', () => {
-    const result = jobErrorReporting.extractExecutionError(
-      createTaskWithMessages([
-        ['execution_error'] as unknown as [string, ExecutionErrorWsMessage]
-      ])
-    )
-    expect(result).toEqual({ detail: undefined, message: '' })
-  })
-})
-
-describe('useJobErrorReporting', () => {
-  let taskState = ref<TaskItemImpl | null>(null)
-  let taskForJob: ComputedRef<TaskItemImpl | null>
-  let copyToClipboard: UseJobErrorReportingOptions['copyToClipboard']
-  let showExecutionErrorDialog: JobErrorDialogService['showExecutionErrorDialog']
-  let showErrorDialog: JobErrorDialogService['showErrorDialog']
-  let dialog: JobErrorDialogService
-  let composable: ReturnType<typeof jobErrorReporting.useJobErrorReporting>
-
-  beforeEach(() => {
-    taskState = ref<TaskItemImpl | null>(null)
-    taskForJob = computed(() => taskState.value)
-    copyToClipboard = vi.fn()
-    showExecutionErrorDialog = vi.fn()
-    showErrorDialog = vi.fn()
-    dialog = {
-      showExecutionErrorDialog,
-      showErrorDialog
-    }
-    composable = jobErrorReporting.useJobErrorReporting({
-      taskForJob,
-      copyToClipboard,
-      dialog
-    })
-  })
-
-  afterEach(() => {
-    vi.restoreAllMocks()
-  })
-
-  it('exposes a computed message that reflects the current task error', () => {
-    taskState.value = createTaskWithMessages([
-      [
-        'execution_error',
-        createExecutionErrorMessage({ exception_message: 'First failure' })
-      ]
-    ])
-    expect(composable.errorMessageValue.value).toBe('First failure')
-
-    taskState.value = createTaskWithMessages([
-      [
-        'execution_error',
-        createExecutionErrorMessage({ exception_message: 'Second failure' })
-      ]
-    ])
-    expect(composable.errorMessageValue.value).toBe('Second failure')
-  })
-
-  it('only calls the copy handler when a message exists', () => {
-    taskState.value = createTaskWithMessages([
-      [
-        'execution_error',
-        createExecutionErrorMessage({ exception_message: 'Clipboard failure' })
-      ]
-    ])
-    composable.copyErrorMessage()
-    expect(copyToClipboard).toHaveBeenCalledTimes(1)
-    expect(copyToClipboard).toHaveBeenCalledWith('Clipboard failure')
-
-    vi.mocked(copyToClipboard).mockClear()
-    taskState.value = createTaskWithMessages([])
-    composable.copyErrorMessage()
-    expect(copyToClipboard).not.toHaveBeenCalled()
-  })
-
-  it('prefers the detailed execution dialog when detail is available', () => {
-    const detail = createExecutionErrorMessage({
-      exception_message: 'Detailed failure'
-    })
-    taskState.value = createTaskWithMessages([['execution_error', detail]])
-    composable.reportJobError()
-    expect(showExecutionErrorDialog).toHaveBeenCalledTimes(1)
-    expect(showExecutionErrorDialog).toHaveBeenCalledWith(detail)
-    expect(showErrorDialog).not.toHaveBeenCalled()
-  })
-
-  it('shows a fallback dialog when only a message is available', () => {
-    const message = 'Queue job error'
-    taskState.value = createTaskWithMessages([])
-    const valueSpy = vi
-      .spyOn(composable.errorMessageValue, 'value', 'get')
-      .mockReturnValue(message)
-
-    expect(composable.errorMessageValue.value).toBe(message)
-    composable.reportJobError()
-    expect(showExecutionErrorDialog).not.toHaveBeenCalled()
-    expect(showErrorDialog).toHaveBeenCalledTimes(1)
-    const [errorArg, optionsArg] = vi.mocked(showErrorDialog).mock.calls[0]
-    expect(errorArg).toBeInstanceOf(Error)
-    expect(errorArg.message).toBe(message)
-    expect(optionsArg).toEqual({ reportType: 'queueJobError' })
-    valueSpy.mockRestore()
-  })
-
-  it('does nothing when no error could be extracted', () => {
-    taskState.value = createTaskWithMessages([])
-    composable.reportJobError()
-    expect(showExecutionErrorDialog).not.toHaveBeenCalled()
-    expect(showErrorDialog).not.toHaveBeenCalled()
-  })
-})
diff --git a/tests-ui/tests/components/sidebar/nodeLibrary/NodeHelpPage.test.ts b/tests-ui/tests/components/sidebar/nodeLibrary/NodeHelpPage.test.ts
deleted file mode 100644
index 356ea8f200..0000000000
--- a/tests-ui/tests/components/sidebar/nodeLibrary/NodeHelpPage.test.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-import { flushPromises, mount } from '@vue/test-utils'
-import { computed, ref } from 'vue'
-import { beforeEach, describe, expect, test, vi } from 'vitest'
-
-import NodeHelpPage from '@/components/sidebar/tabs/nodeLibrary/NodeHelpPage.vue'
-import { useSelectionState } from '@/composables/graph/useSelectionState'
-import { useNodeHelpStore } from '@/stores/workspace/nodeHelpStore'
-
-vi.mock('@/composables/graph/useSelectionState')
-vi.mock('@/stores/workspace/nodeHelpStore')
-
-const baseNode = {
-  nodePath: 'NodeA',
-  display_name: 'Node A',
-  description: '',
-  inputs: {},
-  outputs: []
-}
-
-describe('NodeHelpPage', () => {
-  const selection = ref<any | null>(null)
-  let openHelp: ReturnType<typeof vi.fn>
-
-  const mountPage = () =>
-    mount(NodeHelpPage, {
-      props: { node: baseNode as any },
-      global: {
-        mocks: {
-          $t: (key: string) => key
-        },
-        stubs: {
-          ProgressSpinner: true,
-          Button: true
-        }
-      }
-    })
-
-  beforeEach(() => {
-    vi.resetAllMocks()
-    selection.value = null
-    openHelp = vi.fn()
-
-    vi.mocked(useSelectionState).mockReturnValue({
-      nodeDef: computed(() => selection.value)
-    } as any)
-
-    vi.mocked(useNodeHelpStore).mockReturnValue({
-      renderedHelpHtml: ref('<p>help</p>'),
-      isLoading: ref(false),
-      error: ref(null),
-      isHelpOpen: true,
-      currentHelpNode: { nodePath: 'NodeA' },
-      openHelp,
-      closeHelp: vi.fn()
-    } as any)
-  })
-
-  test('opens help for a newly selected node while help is open', async () => {
-    const wrapper = mountPage()
-
-    selection.value = { nodePath: 'NodeB' }
-    await flushPromises()
-
-    expect(openHelp).toHaveBeenCalledWith({ nodePath: 'NodeB' })
-
-    wrapper.unmount()
-  })
-
-  test('does not reopen help when the same node stays selected', async () => {
-    const wrapper = mountPage()
-
-    selection.value = { nodePath: 'NodeA' }
-    await flushPromises()
-
-    expect(openHelp).not.toHaveBeenCalled()
-
-    wrapper.unmount()
-  })
-
-  test('does not react to selection when help is closed', async () => {
-    vi.mocked(useNodeHelpStore).mockReturnValueOnce({
-      renderedHelpHtml: ref('<p>help</p>'),
-      isLoading: ref(false),
-      error: ref(null),
-      isHelpOpen: false,
-      currentHelpNode: null,
-      openHelp,
-      closeHelp: vi.fn()
-    } as any)
-
-    const wrapper = mountPage()
-
-    selection.value = { nodePath: 'NodeB' }
-    await flushPromises()
-
-    expect(openHelp).not.toHaveBeenCalled()
-
-    wrapper.unmount()
-  })
-})
diff --git a/tests-ui/tests/composables/graph/useSelectionState.test.ts b/tests-ui/tests/composables/graph/useSelectionState.test.ts
deleted file mode 100644
index cf0e4bd841..0000000000
--- a/tests-ui/tests/composables/graph/useSelectionState.test.ts
+++ /dev/null
@@ -1,271 +0,0 @@
-import { createPinia, setActivePinia } from 'pinia'
-import { beforeEach, describe, expect, test, vi } from 'vitest'
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-
-import { useSelectionState } from '@/composables/graph/useSelectionState'
-import { useNodeLibrarySidebarTab } from '@/composables/sidebarTabs/useNodeLibrarySidebarTab'
-import { LGraphEventMode } from '@/lib/litegraph/src/litegraph'
-import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
-import { useNodeDefStore } from '@/stores/nodeDefStore'
-import { useNodeHelpStore } from '@/stores/workspace/nodeHelpStore'
-import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
-import { isImageNode, isLGraphNode } from '@/utils/litegraphUtil'
-import { filterOutputNodes } from '@/utils/nodeFilterUtil'
-
-// Test interfaces
-interface TestNodeConfig {
-  type?: string
-  mode?: LGraphEventMode
-  flags?: { collapsed?: boolean }
-  pinned?: boolean
-  removable?: boolean
-}
-
-interface TestNode {
-  type: string
-  mode: LGraphEventMode
-  flags?: { collapsed?: boolean }
-  pinned?: boolean
-  removable?: boolean
-  isSubgraphNode: () => boolean
-}
-
-type MockedItem = TestNode | { type: string; isNode: boolean }
-
-// Mock all stores
-vi.mock('@/renderer/core/canvas/canvasStore', () => ({
-  useCanvasStore: vi.fn()
-}))
-
-vi.mock('@/stores/nodeDefStore', () => ({
-  useNodeDefStore: vi.fn()
-}))
-
-vi.mock('@/stores/workspace/sidebarTabStore', () => ({
-  useSidebarTabStore: vi.fn()
-}))
-
-vi.mock('@/stores/workspace/nodeHelpStore', () => ({
-  useNodeHelpStore: vi.fn()
-}))
-
-vi.mock('@/composables/sidebarTabs/useNodeLibrarySidebarTab', () => ({
-  useNodeLibrarySidebarTab: vi.fn()
-}))
-
-vi.mock('@/utils/litegraphUtil', () => ({
-  isLGraphNode: vi.fn(),
-  isImageNode: vi.fn()
-}))
-
-vi.mock('@/utils/nodeFilterUtil', () => ({
-  filterOutputNodes: vi.fn()
-}))
-
-const createTestNode = (config: TestNodeConfig = {}): TestNode => {
-  return {
-    type: config.type || 'TestNode',
-    mode: config.mode || LGraphEventMode.ALWAYS,
-    flags: config.flags,
-    pinned: config.pinned,
-    removable: config.removable,
-    isSubgraphNode: () => false
-  }
-}
-
-// Mock comment/connection objects
-const mockComment = { type: 'comment', isNode: false }
-const mockConnection = { type: 'connection', isNode: false }
-
-describe('useSelectionState', () => {
-  // Mock store instances
-  let mockSelectedItems: Ref<MockedItem[]>
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    setActivePinia(createPinia())
-
-    // Setup mock canvas store with proper ref
-    mockSelectedItems = ref([])
-    vi.mocked(useCanvasStore).mockReturnValue({
-      selectedItems: mockSelectedItems,
-      // Add minimal required properties for the store
-      $id: 'canvas',
-      $state: {} as any,
-      $patch: vi.fn(),
-      $reset: vi.fn(),
-      $subscribe: vi.fn(),
-      $onAction: vi.fn(),
-      $dispose: vi.fn(),
-      _customProperties: new Set(),
-      _p: {} as any
-    } as any)
-
-    // Setup mock node def store
-    vi.mocked(useNodeDefStore).mockReturnValue({
-      fromLGraphNode: vi.fn((node: TestNode) => {
-        if (node?.type === 'TestNode') {
-          return { nodePath: 'test.TestNode', name: 'TestNode' }
-        }
-        return null
-      }),
-      // Add minimal required properties for the store
-      $id: 'nodeDef',
-      $state: {} as any,
-      $patch: vi.fn(),
-      $reset: vi.fn(),
-      $subscribe: vi.fn(),
-      $onAction: vi.fn(),
-      $dispose: vi.fn(),
-      _customProperties: new Set(),
-      _p: {} as any
-    } as any)
-
-    // Setup mock sidebar tab store
-    const mockToggleSidebarTab = vi.fn()
-    vi.mocked(useSidebarTabStore).mockReturnValue({
-      activeSidebarTabId: null,
-      toggleSidebarTab: mockToggleSidebarTab,
-      // Add minimal required properties for the store
-      $id: 'sidebarTab',
-      $state: {} as any,
-      $patch: vi.fn(),
-      $reset: vi.fn(),
-      $subscribe: vi.fn(),
-      $onAction: vi.fn(),
-      $dispose: vi.fn(),
-      _customProperties: new Set(),
-      _p: {} as any
-    } as any)
-
-    // Setup mock node help store
-    const mockOpenHelp = vi.fn()
-    const mockCloseHelp = vi.fn()
-    const mockNodeHelpStore = {
-      isHelpOpen: false,
-      currentHelpNode: null,
-      openHelp: mockOpenHelp,
-      closeHelp: mockCloseHelp,
-      // Add minimal required properties for the store
-      $id: 'nodeHelp',
-      $state: {} as any,
-      $patch: vi.fn(),
-      $reset: vi.fn(),
-      $subscribe: vi.fn(),
-      $onAction: vi.fn(),
-      $dispose: vi.fn(),
-      _customProperties: new Set(),
-      _p: {} as any
-    }
-    vi.mocked(useNodeHelpStore).mockReturnValue(mockNodeHelpStore as any)
-
-    // Setup mock composables
-    vi.mocked(useNodeLibrarySidebarTab).mockReturnValue({
-      id: 'node-library-tab',
-      title: 'Node Library',
-      type: 'custom',
-      render: () => null
-    } as any)
-
-    // Setup mock utility functions
-    vi.mocked(isLGraphNode).mockImplementation((item: unknown) => {
-      const typedItem = item as { isNode?: boolean }
-      return typedItem?.isNode !== false
-    })
-    vi.mocked(isImageNode).mockImplementation((node: unknown) => {
-      const typedNode = node as { type?: string }
-      return typedNode?.type === 'ImageNode'
-    })
-    vi.mocked(filterOutputNodes).mockImplementation(
-      (nodes: TestNode[]) => nodes.filter((n) => n.type === 'OutputNode') as any
-    )
-  })
-
-  describe('Selection Detection', () => {
-    test('should return false when nothing selected', () => {
-      const { hasAnySelection } = useSelectionState()
-      expect(hasAnySelection.value).toBe(false)
-    })
-
-    test('should return true when items selected', () => {
-      // Update the mock data before creating the composable
-      const node1 = createTestNode()
-      const node2 = createTestNode()
-      mockSelectedItems.value = [node1, node2]
-
-      const { hasAnySelection } = useSelectionState()
-      expect(hasAnySelection.value).toBe(true)
-    })
-  })
-
-  describe('Node Type Filtering', () => {
-    test('should pick only LGraphNodes from mixed selections', () => {
-      // Update the mock data before creating the composable
-      const graphNode = createTestNode()
-      mockSelectedItems.value = [graphNode, mockComment, mockConnection]
-
-      const { selectedNodes } = useSelectionState()
-      expect(selectedNodes.value).toHaveLength(1)
-      expect(selectedNodes.value[0]).toEqual(graphNode)
-    })
-  })
-
-  describe('Node State Computation', () => {
-    test('should detect bypassed nodes', () => {
-      // Update the mock data before creating the composable
-      const bypassedNode = createTestNode({ mode: LGraphEventMode.BYPASS })
-      mockSelectedItems.value = [bypassedNode]
-
-      const { selectedNodes } = useSelectionState()
-      const isBypassed = selectedNodes.value.some(
-        (n) => n.mode === LGraphEventMode.BYPASS
-      )
-      expect(isBypassed).toBe(true)
-    })
-
-    test('should detect pinned/collapsed states', () => {
-      // Update the mock data before creating the composable
-      const pinnedNode = createTestNode({ pinned: true })
-      const collapsedNode = createTestNode({ flags: { collapsed: true } })
-      mockSelectedItems.value = [pinnedNode, collapsedNode]
-
-      const { selectedNodes } = useSelectionState()
-      const isPinned = selectedNodes.value.some((n) => n.pinned === true)
-      const isCollapsed = selectedNodes.value.some(
-        (n) => n.flags?.collapsed === true
-      )
-      const isBypassed = selectedNodes.value.some(
-        (n) => n.mode === LGraphEventMode.BYPASS
-      )
-      expect(isPinned).toBe(true)
-      expect(isCollapsed).toBe(true)
-      expect(isBypassed).toBe(false)
-    })
-
-    test('should provide non-reactive state computation', () => {
-      // Update the mock data before creating the composable
-      const node = createTestNode({ pinned: true })
-      mockSelectedItems.value = [node]
-
-      const { selectedNodes } = useSelectionState()
-      const isPinned = selectedNodes.value.some((n) => n.pinned === true)
-      const isCollapsed = selectedNodes.value.some(
-        (n) => n.flags?.collapsed === true
-      )
-      const isBypassed = selectedNodes.value.some(
-        (n) => n.mode === LGraphEventMode.BYPASS
-      )
-
-      expect(isPinned).toBe(true)
-      expect(isCollapsed).toBe(false)
-      expect(isBypassed).toBe(false)
-
-      // Test with empty selection using new composable instance
-      mockSelectedItems.value = []
-      const { selectedNodes: newSelectedNodes } = useSelectionState()
-      const newIsPinned = newSelectedNodes.value.some((n) => n.pinned === true)
-      expect(newIsPinned).toBe(false)
-    })
-  })
-})
diff --git a/tests-ui/tests/composables/node/useNodePricing.test.ts b/tests-ui/tests/composables/node/useNodePricing.test.ts
deleted file mode 100644
index a619f5a191..0000000000
--- a/tests-ui/tests/composables/node/useNodePricing.test.ts
+++ /dev/null
@@ -1,2442 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import { formatCreditsFromUsd } from '@/base/credits/comfyCredits'
-import { useNodePricing } from '@/composables/node/useNodePricing'
-import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
-import type { IComboWidget } from '@/lib/litegraph/src/types/widgets'
-
-// Helper function to create a mock node
-function createMockNode(
-  nodeTypeName: string,
-  widgets: Array<{ name: string; value: any }> = [],
-  isApiNode = true,
-  inputs: Array<{
-    name: string
-    connected?: boolean
-    useLinksArray?: boolean
-  }> = []
-): LGraphNode {
-  const mockWidgets = widgets.map(({ name, value }) => ({
-    name,
-    value,
-    type: 'combo'
-  })) as IComboWidget[]
-
-  const mockInputs =
-    inputs.length > 0
-      ? inputs.map(({ name, connected, useLinksArray }) =>
-          useLinksArray
-            ? { name, links: connected ? [1] : [] }
-            : { name, link: connected ? 1 : null }
-        )
-      : undefined
-
-  const node: any = {
-    id: Math.random().toString(),
-    widgets: mockWidgets,
-    constructor: {
-      nodeData: {
-        name: nodeTypeName,
-        api_node: isApiNode
-      }
-    }
-  }
-
-  if (mockInputs) {
-    node.inputs = mockInputs
-    // Provide the common helpers some frontend code may call
-    node.findInputSlot = function (portName: string) {
-      return this.inputs?.findIndex((i: any) => i.name === portName) ?? -1
-    }
-    node.isInputConnected = function (idx: number) {
-      const port = this.inputs?.[idx]
-      if (!port) return false
-      if (typeof port.link !== 'undefined') return port.link != null
-      if (Array.isArray(port.links)) return port.links.length > 0
-      return false
-    }
-  }
-
-  return node as LGraphNode
-}
-
-describe('useNodePricing', () => {
-  describe('static pricing', () => {
-    it('should return static price for FluxProCannyNode', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('FluxProCannyNode')
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.05))
-    })
-
-    it('should return static price for StabilityStableImageUltraNode', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('StabilityStableImageUltraNode')
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.08))
-    })
-
-    it('should return empty string for non-API nodes', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('RegularNode', [], false)
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe('')
-    })
-
-    it('should return empty string for unknown node types', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('UnknownAPINode')
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe('')
-    })
-  })
-
-  describe('dynamic pricing - Flux2ProImageNode', () => {
-    it('should return precise price for text-to-image 1024x1024 (no refs)', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('Flux2ProImageNode', [
-        { name: 'width', value: 1024 },
-        { name: 'height', value: 1024 }
-      ])
-
-      // 1024x1024 => 1 MP => $0.03
-      expect(getNodeDisplayPrice(node)).toBe(creditsLabel(0.03))
-    })
-
-    it('should return minimum estimate when refs are connected (1024x1024)', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode(
-        'Flux2ProImageNode',
-        [
-          { name: 'width', value: 1024 },
-          { name: 'height', value: 1024 }
-        ],
-        true,
-        // connect the 'images' input
-        [{ name: 'images', connected: true }]
-      )
-
-      // 1024x1024 => 1 MP output = $0.03, min input add = $0.015 => ~$0.045 min
-      expect(getNodeDisplayPrice(node)).toBe(
-        creditsRangeLabel(0.045, 0.15, { approximate: true })
-      )
-    })
-
-    it('should show fallback when width/height are missing', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('Flux2ProImageNode', [])
-      expect(getNodeDisplayPrice(node)).toBe(creditsRangeLabel(0.03, 0.15))
-    })
-  })
-
-  describe('dynamic pricing - KlingTextToVideoNode', () => {
-    it('should return high price for kling-v2-1-master model', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('KlingTextToVideoNode', [
-        { name: 'mode', value: 'standard / 5s / v2-1-master' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(1.4))
-    })
-
-    it('should return high price for kling-v2-master model', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('KlingTextToVideoNode', [
-        { name: 'mode', value: 'standard / 5s / v2-master' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(1.4))
-    })
-
-    it('should return low price for kling-v2-turbo model', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('KlingTextToVideoNode', [
-        { name: 'mode', value: 'pro / 5s / v2-5-turbo' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.35))
-    })
-
-    it('should return high price for kling-v2-turbo model', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('KlingTextToVideoNode', [
-        { name: 'mode', value: 'pro / 10s / v2-5-turbo' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.7))
-    })
-
-    it('should return standard price for kling-v1-6 model', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('KlingTextToVideoNode', [
-        { name: 'mode', value: 'standard / 5s / v1-6' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.28))
-    })
-
-    it('should return range when mode widget is missing', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('KlingTextToVideoNode', [])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(
-        creditsRangeLabel(0.14, 2.8, {
-          note: '(varies with model, mode & duration)'
-        })
-      )
-    })
-  })
-
-  describe('dynamic pricing - KlingImage2VideoNode', () => {
-    it('should return high price for kling-v2-master model', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('KlingImage2VideoNode', [
-        { name: 'model_name', value: 'v2-master' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(1.4))
-    })
-
-    it('should return high price for kling-v2-1-master model', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('KlingImage2VideoNode', [
-        { name: 'model_name', value: 'v2-1-master' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(1.4))
-    })
-
-    it('should return high price for kling-v2-5-turbo model', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('KlingImage2VideoNode', [
-        { name: 'model_name', value: 'v2-5-turbo' },
-        { name: 'mode', value: 'pro mode / 10s duration / kling-v2-5-turbo' },
-        { name: 'duration', value: '10' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.7))
-    })
-
-    it('should return standard price for kling-v1-6 model', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('KlingImage2VideoNode', [
-        { name: 'model_name', value: 'v1-6' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.28))
-    })
-
-    it('should return range when model_name widget is missing', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('KlingImage2VideoNode', [])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(
-        creditsRangeLabel(0.14, 2.8, {
-          note: '(varies with model, mode & duration)'
-        })
-      )
-    })
-  })
-
-  describe('dynamic pricing - OpenAIDalle3', () => {
-    it('should return $0.04 for 1024x1024 standard quality', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIDalle3', [
-        { name: 'size', value: '1024x1024' },
-        { name: 'quality', value: 'standard' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.04))
-    })
-
-    it('should return $0.08 for 1024x1024 hd quality', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIDalle3', [
-        { name: 'size', value: '1024x1024' },
-        { name: 'quality', value: 'hd' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.08))
-    })
-
-    it('should return $0.08 for 1792x1024 standard quality', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIDalle3', [
-        { name: 'size', value: '1792x1024' },
-        { name: 'quality', value: 'standard' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.08))
-    })
-
-    it('should return $0.16 for 1792x1024 hd quality', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIDalle3', [
-        { name: 'size', value: '1792x1024' },
-        { name: 'quality', value: 'hd' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.12))
-    })
-
-    it('should return $0.08 for 1024x1792 standard quality', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIDalle3', [
-        { name: 'size', value: '1024x1792' },
-        { name: 'quality', value: 'standard' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.08))
-    })
-
-    it('should return $0.16 for 1024x1792 hd quality', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIDalle3', [
-        { name: 'size', value: '1024x1792' },
-        { name: 'quality', value: 'hd' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.12))
-    })
-
-    it('should return range when widgets are missing', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIDalle3', [])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(
-        creditsRangeLabel(0.04, 0.12, { note: '(varies with size & quality)' })
-      )
-    })
-
-    it('should return range when size widget is missing', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIDalle3', [
-        { name: 'quality', value: 'hd' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(
-        creditsRangeLabel(0.04, 0.12, { note: '(varies with size & quality)' })
-      )
-    })
-
-    it('should return range when quality widget is missing', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIDalle3', [
-        { name: 'size', value: '1024x1024' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(
-        creditsRangeLabel(0.04, 0.12, { note: '(varies with size & quality)' })
-      )
-    })
-  })
-  // ============================== OpenAIVideoSora2 ==============================
-  describe('dynamic pricing - OpenAIVideoSora2', () => {
-    it('should require model, duration & size when widgets are missing', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIVideoSora2', [])
-      expect(getNodeDisplayPrice(node)).toBe('Set model, duration & size')
-    })
-
-    it('should require duration when duration is invalid or zero', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const nodeNaN = createMockNode('OpenAIVideoSora2', [
-        { name: 'model', value: 'sora-2-pro' },
-        { name: 'duration', value: 'oops' },
-        { name: 'size', value: '720x1280' }
-      ])
-      expect(getNodeDisplayPrice(nodeNaN)).toBe('Set model, duration & size')
-
-      const nodeZero = createMockNode('OpenAIVideoSora2', [
-        { name: 'model', value: 'sora-2-pro' },
-        { name: 'duration', value: 0 },
-        { name: 'size', value: '720x1280' }
-      ])
-      expect(getNodeDisplayPrice(nodeZero)).toBe('Set model, duration & size')
-    })
-
-    it('should require size when size is missing', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIVideoSora2', [
-        { name: 'model', value: 'sora-2-pro' },
-        { name: 'duration', value: 8 }
-      ])
-      expect(getNodeDisplayPrice(node)).toBe('Set model, duration & size')
-    })
-
-    it('should compute pricing for sora-2-pro with 1024x1792', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIVideoSora2', [
-        { name: 'model', value: 'sora-2-pro' },
-        { name: 'duration', value: 8 },
-        { name: 'size', value: '1024x1792' }
-      ])
-      expect(getNodeDisplayPrice(node)).toBe(creditsLabel(4.0)) // 0.5 * 8
-    })
-
-    it('should compute pricing for sora-2-pro with 720x1280', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIVideoSora2', [
-        { name: 'model', value: 'sora-2-pro' },
-        { name: 'duration', value: 12 },
-        { name: 'size', value: '720x1280' }
-      ])
-      expect(getNodeDisplayPrice(node)).toBe(creditsLabel(3.6)) // 0.3 * 12
-    })
-
-    it('should reject unsupported size for sora-2-pro', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIVideoSora2', [
-        { name: 'model', value: 'sora-2-pro' },
-        { name: 'duration', value: 8 },
-        { name: 'size', value: '640x640' }
-      ])
-      expect(getNodeDisplayPrice(node)).toBe(
-        'Invalid size. Must be 720x1280, 1280x720, 1024x1792, or 1792x1024.'
-      )
-    })
-
-    it('should compute pricing for sora-2 (720x1280 only)', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIVideoSora2', [
-        { name: 'model', value: 'sora-2' },
-        { name: 'duration', value: 10 },
-        { name: 'size', value: '720x1280' }
-      ])
-      expect(getNodeDisplayPrice(node)).toBe(creditsLabel(1.0)) // 0.1 * 10
-    })
-
-    it('should reject non-720 sizes for sora-2', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIVideoSora2', [
-        { name: 'model', value: 'sora-2' },
-        { name: 'duration', value: 8 },
-        { name: 'size', value: '1024x1792' }
-      ])
-      expect(getNodeDisplayPrice(node)).toBe(
-        'sora-2 supports only 720x1280 or 1280x720'
-      )
-    })
-    it('should accept duration_s alias for duration', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIVideoSora2', [
-        { name: 'model', value: 'sora-2-pro' },
-        { name: 'duration_s', value: 4 },
-        { name: 'size', value: '1792x1024' }
-      ])
-      expect(getNodeDisplayPrice(node)).toBe(creditsLabel(2.0)) // 0.5 * 4
-    })
-
-    it('should be case-insensitive for model and size', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIVideoSora2', [
-        { name: 'model', value: 'SoRa-2-PrO' },
-        { name: 'duration', value: 12 },
-        { name: 'size', value: '1280x720' }
-      ])
-      expect(getNodeDisplayPrice(node)).toBe(creditsLabel(3.6)) // 0.3 * 12
-    })
-  })
-
-  // ============================== MinimaxHailuoVideoNode ==============================
-  describe('dynamic pricing - MinimaxHailuoVideoNode', () => {
-    it('should return $0.28 for 6s duration and 768P resolution', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('MinimaxHailuoVideoNode', [
-        { name: 'duration', value: '6' },
-        { name: 'resolution', value: '768P' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.28))
-    })
-
-    it('should return $0.60 for 10s duration and 768P resolution', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('MinimaxHailuoVideoNode', [
-        { name: 'duration', value: '10' },
-        { name: 'resolution', value: '768P' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.56))
-    })
-
-    it('should return $0.49 for 6s duration and 1080P resolution', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('MinimaxHailuoVideoNode', [
-        { name: 'duration', value: '6' },
-        { name: 'resolution', value: '1080P' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.49))
-    })
-
-    it('should return range when duration widget is missing', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('MinimaxHailuoVideoNode', [])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(
-        creditsRangeLabel(0.28, 0.56, {
-          note: '(varies with resolution & duration)'
-        })
-      )
-    })
-  })
-
-  describe('dynamic pricing - OpenAIDalle2', () => {
-    it('should return $0.02 for 1024x1024 size', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIDalle2', [
-        { name: 'size', value: '1024x1024' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.02))
-    })
-
-    it('should return $0.018 for 512x512 size', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIDalle2', [
-        { name: 'size', value: '512x512' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.018))
-    })
-
-    it('should return $0.016 for 256x256 size', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIDalle2', [
-        { name: 'size', value: '256x256' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.016))
-    })
-
-    it('should return range when size widget is missing', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIDalle2', [])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(
-        creditsRangeLabel(0.016, 0.02, {
-          suffix: ' x n/Run',
-          note: '(varies with size & n)'
-        })
-      )
-    })
-  })
-
-  describe('dynamic pricing - OpenAIGPTImage1', () => {
-    it('should return high price range for high quality', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIGPTImage1', [
-        { name: 'quality', value: 'high' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsRangeLabel(0.167, 0.3))
-    })
-
-    it('should return medium price range for medium quality', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIGPTImage1', [
-        { name: 'quality', value: 'medium' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsRangeLabel(0.046, 0.07))
-    })
-
-    it('should return low price range for low quality', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIGPTImage1', [
-        { name: 'quality', value: 'low' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsRangeLabel(0.011, 0.02))
-    })
-
-    it('should return range when quality widget is missing', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIGPTImage1', [])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(
-        creditsRangeLabel(0.011, 0.3, {
-          suffix: ' x n/Run',
-          note: '(varies with quality & n)'
-        })
-      )
-    })
-  })
-
-  describe('dynamic pricing - IdeogramV3', () => {
-    it('should return correct prices for IdeogramV3 node', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-
-      const testCases = [
-        {
-          rendering_speed: 'Quality',
-          character_image: false,
-          expected: creditsLabel(0.13)
-        },
-        {
-          rendering_speed: 'Quality',
-          character_image: true,
-          expected: creditsLabel(0.29)
-        },
-        {
-          rendering_speed: 'Default',
-          character_image: false,
-          expected: creditsLabel(0.09)
-        },
-        {
-          rendering_speed: 'Default',
-          character_image: true,
-          expected: creditsLabel(0.21)
-        },
-        {
-          rendering_speed: 'Turbo',
-          character_image: false,
-          expected: creditsLabel(0.04)
-        },
-        {
-          rendering_speed: 'Turbo',
-          character_image: true,
-          expected: creditsLabel(0.14)
-        }
-      ]
-
-      testCases.forEach(({ rendering_speed, character_image, expected }) => {
-        const node = createMockNode(
-          'IdeogramV3',
-          [{ name: 'rendering_speed', value: rendering_speed }],
-          true,
-          [{ name: 'character_image', connected: character_image }]
-        )
-        expect(getNodeDisplayPrice(node)).toBe(expected)
-      })
-    })
-
-    it('should return range when rendering_speed widget is missing', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('IdeogramV3', [])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(
-        creditsRangeLabel(0.04, 0.11, {
-          suffix: ' x num_images/Run',
-          note: '(varies with rendering speed & num_images)'
-        })
-      )
-    })
-
-    it('should multiply price by num_images for Quality rendering speed', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('IdeogramV3', [
-        { name: 'rendering_speed', value: 'Quality' },
-        { name: 'num_images', value: 3 }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.39)) // 0.09 * 3 * 1.43
-    })
-
-    it('should multiply price by num_images for Turbo rendering speed', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('IdeogramV3', [
-        { name: 'rendering_speed', value: 'Turbo' },
-        { name: 'num_images', value: 5 }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.21)) // 0.03 * 5 * 1.43
-    })
-  })
-
-  describe('dynamic pricing - VeoVideoGenerationNode', () => {
-    it('should return $5.00 for 10s duration', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('VeoVideoGenerationNode', [
-        { name: 'duration_seconds', value: '10' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(5.0))
-    })
-
-    it('should return $2.50 for 5s duration', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('VeoVideoGenerationNode', [
-        { name: 'duration_seconds', value: '5' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(2.5))
-    })
-
-    it('should return range when duration widget is missing', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('VeoVideoGenerationNode', [])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(
-        creditsRangeLabel(2.5, 5.0, { note: '(varies with duration)' })
-      )
-    })
-  })
-
-  describe('dynamic pricing - Veo3VideoGenerationNode', () => {
-    it('should return $0.80 for veo-3.0-fast-generate-001 without audio', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('Veo3VideoGenerationNode', [
-        { name: 'model', value: 'veo-3.0-fast-generate-001' },
-        { name: 'generate_audio', value: false }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.8))
-    })
-
-    it('should return $1.20 for veo-3.0-fast-generate-001 with audio', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('Veo3VideoGenerationNode', [
-        { name: 'model', value: 'veo-3.0-fast-generate-001' },
-        { name: 'generate_audio', value: true }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(1.2))
-    })
-
-    it('should return $1.60 for veo-3.0-generate-001 without audio', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('Veo3VideoGenerationNode', [
-        { name: 'model', value: 'veo-3.0-generate-001' },
-        { name: 'generate_audio', value: false }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(1.6))
-    })
-
-    it('should return $3.20 for veo-3.0-generate-001 with audio', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('Veo3VideoGenerationNode', [
-        { name: 'model', value: 'veo-3.0-generate-001' },
-        { name: 'generate_audio', value: true }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(3.2))
-    })
-
-    it('should return range when widgets are missing', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('Veo3VideoGenerationNode', [])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(
-        creditsRangeLabel(0.8, 3.2, {
-          note: 'varies with model & audio generation'
-        })
-      )
-    })
-
-    it('should return range when only model widget is present', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('Veo3VideoGenerationNode', [
-        { name: 'model', value: 'veo-3.0-generate-001' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(
-        creditsRangeLabel(0.8, 3.2, {
-          note: 'varies with model & audio generation'
-        })
-      )
-    })
-
-    it('should return range when only generate_audio widget is present', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('Veo3VideoGenerationNode', [
-        { name: 'generate_audio', value: true }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(
-        creditsRangeLabel(0.8, 3.2, {
-          note: 'varies with model & audio generation'
-        })
-      )
-    })
-  })
-
-  describe('dynamic pricing - LumaVideoNode', () => {
-    it('should return $2.19 for ray-flash-2 4K 5s', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('LumaVideoNode', [
-        { name: 'model', value: 'ray-flash-2' },
-        { name: 'resolution', value: '4K' },
-        { name: 'duration', value: '5s' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(3.13))
-    })
-
-    it('should return $6.37 for ray-2 4K 5s', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('LumaVideoNode', [
-        { name: 'model', value: 'ray-2' },
-        { name: 'resolution', value: '4K' },
-        { name: 'duration', value: '5s' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(9.11))
-    })
-
-    it('should return $0.35 for ray-1-6 model', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('LumaVideoNode', [
-        { name: 'model', value: 'ray-1-6' },
-        { name: 'resolution', value: '1080p' },
-        { name: 'duration', value: '5s' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.5))
-    })
-
-    it('should return range when widgets are missing', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('LumaVideoNode', [])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(
-        creditsRangeLabel(0.2, 16.4, {
-          note: 'varies with model, resolution & duration'
-        })
-      )
-    })
-  })
-
-  describe('dynamic pricing - PixverseTextToVideoNode', () => {
-    it('should return range for 5s 1080p quality', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('PixverseTextToVideoNode', [
-        { name: 'duration', value: '5s' },
-        { name: 'quality', value: '1080p' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(
-        creditsRangeLabel(0.45, 1.2, {
-          note: 'varies with duration, quality & motion mode'
-        })
-      )
-    })
-
-    it('should return range for 5s 540p normal quality', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('PixverseTextToVideoNode', [
-        { name: 'duration', value: '5s' },
-        { name: 'quality', value: '540p' },
-        { name: 'motion_mode', value: 'normal' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(
-        creditsRangeLabel(0.45, 1.2, {
-          note: 'varies with duration, quality & motion mode'
-        })
-      )
-    })
-
-    it('should return range when widgets are missing', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('PixverseTextToVideoNode', [])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(
-        creditsRangeLabel(0.45, 1.2, {
-          note: 'varies with duration, quality & motion mode'
-        })
-      )
-    })
-  })
-
-  describe('dynamic pricing - KlingDualCharacterVideoEffectNode', () => {
-    it('should return range for v2-master 5s mode', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('KlingDualCharacterVideoEffectNode', [
-        { name: 'mode', value: 'standard / 5s / v2-master' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(
-        creditsRangeLabel(0.14, 2.8, {
-          note: '(varies with model, mode & duration)'
-        })
-      )
-    })
-
-    it('should return range for v1-6 5s mode', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('KlingDualCharacterVideoEffectNode', [
-        { name: 'mode', value: 'standard / 5s / v1-6' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(
-        creditsRangeLabel(0.14, 2.8, {
-          note: '(varies with model, mode & duration)'
-        })
-      )
-    })
-
-    it('should return range when mode widget is missing', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('KlingDualCharacterVideoEffectNode', [])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(
-        creditsRangeLabel(0.14, 2.8, {
-          note: '(varies with model, mode & duration)'
-        })
-      )
-    })
-  })
-
-  describe('dynamic pricing - KlingSingleImageVideoEffectNode', () => {
-    it('should return $0.28 for fuzzyfuzzy effect', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('KlingSingleImageVideoEffectNode', [
-        { name: 'effect_scene', value: 'fuzzyfuzzy' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.28))
-    })
-
-    it('should return $0.49 for dizzydizzy effect', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('KlingSingleImageVideoEffectNode', [
-        { name: 'effect_scene', value: 'dizzydizzy' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.49))
-    })
-
-    it('should return range when effect_scene widget is missing', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('KlingSingleImageVideoEffectNode', [])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(
-        creditsRangeLabel(0.28, 0.49, { note: '(varies with effect scene)' })
-      )
-    })
-  })
-
-  describe('error handling', () => {
-    it('should gracefully handle errors in dynamic pricing functions', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      // Create a node with malformed widget data that could cause errors
-      const node = {
-        id: 'test-node',
-        widgets: null, // This could cause errors when accessing .find()
-        constructor: {
-          nodeData: {
-            name: 'KlingTextToVideoNode',
-            api_node: true
-          }
-        }
-      } as unknown as LGraphNode
-
-      // Should not throw an error and return empty string as fallback
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(
-        creditsRangeLabel(0.14, 2.8, {
-          note: '(varies with model, mode & duration)'
-        })
-      )
-    })
-
-    it('should handle completely broken widget structure', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      // Create a node with no widgets property at all
-      const node = {
-        id: 'test-node',
-        // No widgets property
-        constructor: {
-          nodeData: {
-            name: 'OpenAIDalle3',
-            api_node: true
-          }
-        }
-      } as unknown as LGraphNode
-
-      // Should gracefully fall back to the default range
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(
-        creditsRangeLabel(0.04, 0.12, { note: '(varies with size & quality)' })
-      )
-    })
-  })
-
-  describe('helper methods', () => {
-    describe('getNodePricingConfig', () => {
-      it('should return pricing config for known API nodes', () => {
-        const { getNodePricingConfig } = useNodePricing()
-        const node = createMockNode('KlingTextToVideoNode')
-
-        const config = getNodePricingConfig(node)
-        expect(config).toBeDefined()
-        expect(typeof config.displayPrice).toBe('function')
-      })
-
-      it('should return undefined for unknown nodes', () => {
-        const { getNodePricingConfig } = useNodePricing()
-        const node = createMockNode('UnknownNode')
-
-        const config = getNodePricingConfig(node)
-        expect(config).toBeUndefined()
-      })
-    })
-
-    describe('getRelevantWidgetNames', () => {
-      it('should return correct widget names for KlingTextToVideoNode', () => {
-        const { getRelevantWidgetNames } = useNodePricing()
-
-        const widgetNames = getRelevantWidgetNames('KlingTextToVideoNode')
-        expect(widgetNames).toEqual(['mode', 'model_name', 'duration'])
-      })
-
-      it('should return correct widget names for KlingImage2VideoNode', () => {
-        const { getRelevantWidgetNames } = useNodePricing()
-
-        const widgetNames = getRelevantWidgetNames('KlingImage2VideoNode')
-        expect(widgetNames).toEqual(['mode', 'model_name', 'duration'])
-      })
-
-      it('should return correct widget names for OpenAIDalle3', () => {
-        const { getRelevantWidgetNames } = useNodePricing()
-
-        const widgetNames = getRelevantWidgetNames('OpenAIDalle3')
-        expect(widgetNames).toEqual(['size', 'quality'])
-      })
-
-      it('should return correct widget names for VeoVideoGenerationNode', () => {
-        const { getRelevantWidgetNames } = useNodePricing()
-
-        const widgetNames = getRelevantWidgetNames('VeoVideoGenerationNode')
-        expect(widgetNames).toEqual(['duration_seconds'])
-      })
-
-      it('should return correct widget names for Veo3VideoGenerationNode', () => {
-        const { getRelevantWidgetNames } = useNodePricing()
-
-        const widgetNames = getRelevantWidgetNames('Veo3VideoGenerationNode')
-        expect(widgetNames).toEqual(['model', 'generate_audio'])
-      })
-
-      it('should return correct widget names for LumaVideoNode', () => {
-        const { getRelevantWidgetNames } = useNodePricing()
-
-        const widgetNames = getRelevantWidgetNames('LumaVideoNode')
-        expect(widgetNames).toEqual(['model', 'resolution', 'duration'])
-      })
-
-      it('should return correct widget names for KlingSingleImageVideoEffectNode', () => {
-        const { getRelevantWidgetNames } = useNodePricing()
-
-        const widgetNames = getRelevantWidgetNames(
-          'KlingSingleImageVideoEffectNode'
-        )
-        expect(widgetNames).toEqual(['effect_scene'])
-      })
-
-      it('should return empty array for unknown node types', () => {
-        const { getRelevantWidgetNames } = useNodePricing()
-
-        const widgetNames = getRelevantWidgetNames('UnknownNode')
-        expect(widgetNames).toEqual([])
-      })
-
-      describe('Ideogram nodes with num_images parameter', () => {
-        it('should return correct widget names for IdeogramV1', () => {
-          const { getRelevantWidgetNames } = useNodePricing()
-
-          const widgetNames = getRelevantWidgetNames('IdeogramV1')
-          expect(widgetNames).toEqual(['num_images', 'turbo'])
-        })
-
-        it('should return correct widget names for IdeogramV2', () => {
-          const { getRelevantWidgetNames } = useNodePricing()
-
-          const widgetNames = getRelevantWidgetNames('IdeogramV2')
-          expect(widgetNames).toEqual(['num_images', 'turbo'])
-        })
-
-        it('should return correct widget names for IdeogramV3', () => {
-          const { getRelevantWidgetNames } = useNodePricing()
-
-          const widgetNames = getRelevantWidgetNames('IdeogramV3')
-          expect(widgetNames).toEqual([
-            'rendering_speed',
-            'num_images',
-            'character_image'
-          ])
-        })
-      })
-
-      describe('Recraft nodes with n parameter', () => {
-        it('should return correct widget names for RecraftTextToImageNode', () => {
-          const { getRelevantWidgetNames } = useNodePricing()
-
-          const widgetNames = getRelevantWidgetNames('RecraftTextToImageNode')
-          expect(widgetNames).toEqual(['n'])
-        })
-
-        it('should return correct widget names for RecraftTextToVectorNode', () => {
-          const { getRelevantWidgetNames } = useNodePricing()
-
-          const widgetNames = getRelevantWidgetNames('RecraftTextToVectorNode')
-          expect(widgetNames).toEqual(['n'])
-        })
-      })
-    })
-
-    describe('Ideogram nodes dynamic pricing', () => {
-      it('should calculate dynamic pricing for IdeogramV1 based on num_images value', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('IdeogramV1', [
-          { name: 'num_images', value: 3 }
-        ])
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(creditsLabel(0.26)) // 0.06 * 3 * 1.43
-      })
-
-      it('should calculate dynamic pricing for IdeogramV2 based on num_images value', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('IdeogramV2', [
-          { name: 'num_images', value: 4 }
-        ])
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(creditsLabel(0.46)) // 0.08 * 4 * 1.43
-      })
-
-      it('should fall back to static display when num_images widget is missing for IdeogramV1', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('IdeogramV1', [])
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(
-          creditsRangeLabel(0.03, 0.09, { suffix: ' x num_images/Run' })
-        )
-      })
-
-      it('should fall back to static display when num_images widget is missing for IdeogramV2', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('IdeogramV2', [])
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(
-          creditsRangeLabel(0.07, 0.11, { suffix: ' x num_images/Run' })
-        )
-      })
-
-      it('should handle edge case when num_images value is 1 for IdeogramV1', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('IdeogramV1', [
-          { name: 'num_images', value: 1 }
-        ])
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(creditsLabel(0.09)) // 0.06 * 1 * 1.43 (turbo=false by default)
-      })
-    })
-
-    describe('Recraft nodes dynamic pricing', () => {
-      it('should calculate dynamic pricing for RecraftTextToImageNode based on n value', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('RecraftTextToImageNode', [
-          { name: 'n', value: 3 }
-        ])
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(creditsLabel(0.12)) // 0.04 * 3
-      })
-
-      it('should calculate dynamic pricing for RecraftTextToVectorNode based on n value', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('RecraftTextToVectorNode', [
-          { name: 'n', value: 2 }
-        ])
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(creditsLabel(0.16)) // 0.08 * 2
-      })
-
-      it('should fall back to static display when n widget is missing', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('RecraftTextToImageNode', [])
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(creditsLabel(0.04, { suffix: ' x n/Run' }))
-      })
-
-      it('should handle edge case when n value is 1', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('RecraftImageInpaintingNode', [
-          { name: 'n', value: 1 }
-        ])
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(creditsLabel(0.04)) // 0.04 * 1
-      })
-    })
-  })
-
-  describe('OpenAI nodes dynamic pricing with n parameter', () => {
-    it('should calculate dynamic pricing for OpenAIDalle2 based on size and n', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIDalle2', [
-        { name: 'size', value: '1024x1024' },
-        { name: 'n', value: 3 }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.06)) // 0.02 * 3
-    })
-
-    it('should calculate dynamic pricing for OpenAIGPTImage1 based on quality and n', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIGPTImage1', [
-        { name: 'quality', value: 'low' },
-        { name: 'n', value: 2 }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsRangeLabel(0.011, 0.02, { suffix: ' x 2/Run' }))
-    })
-
-    it('should fall back to static display when n widget is missing for OpenAIDalle2', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('OpenAIDalle2', [
-        { name: 'size', value: '512x512' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.018)) // n defaults to 1
-    })
-  })
-
-  describe('KlingImageGenerationNode dynamic pricing with n parameter', () => {
-    it('should calculate dynamic pricing for text-to-image with kling-v1', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('KlingImageGenerationNode', [
-        { name: 'model_name', value: 'kling-v1' },
-        { name: 'n', value: 4 }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.014)) // 0.0035 * 4
-    })
-
-    it('should calculate dynamic pricing for text-to-image with kling-v1-5', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      // Mock node without image input (text-to-image mode)
-      const node = createMockNode('KlingImageGenerationNode', [
-        { name: 'model_name', value: 'kling-v1-5' },
-        { name: 'n', value: 2 }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.028)) // For kling-v1-5 text-to-image: 0.014 * 2
-    })
-
-    it('should fall back to static display when model widget is missing', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('KlingImageGenerationNode', [])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(
-        creditsRangeLabel(0.0035, 0.028, {
-          suffix: ' x n/Run',
-          note: '(varies with modality & model)'
-        })
-      )
-    })
-  })
-
-  describe('New Recraft nodes dynamic pricing', () => {
-    it('should calculate dynamic pricing for RecraftGenerateImageNode', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('RecraftGenerateImageNode', [
-        { name: 'n', value: 3 }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.12)) // 0.04 * 3
-    })
-
-    it('should calculate dynamic pricing for RecraftVectorizeImageNode', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('RecraftVectorizeImageNode', [
-        { name: 'n', value: 5 }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.05)) // 0.01 * 5
-    })
-
-    it('should calculate dynamic pricing for RecraftGenerateVectorImageNode', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('RecraftGenerateVectorImageNode', [
-        { name: 'n', value: 2 }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.16)) // 0.08 * 2
-    })
-  })
-
-  describe('Widget names for reactive updates', () => {
-    it('should include n parameter for OpenAI nodes', () => {
-      const { getRelevantWidgetNames } = useNodePricing()
-
-      expect(getRelevantWidgetNames('OpenAIDalle2')).toEqual(['size', 'n'])
-      expect(getRelevantWidgetNames('OpenAIGPTImage1')).toEqual([
-        'quality',
-        'n'
-      ])
-    })
-
-    it('should include n parameter for Kling and new Recraft nodes', () => {
-      const { getRelevantWidgetNames } = useNodePricing()
-
-      expect(getRelevantWidgetNames('KlingImageGenerationNode')).toEqual([
-        'modality',
-        'model_name',
-        'n'
-      ])
-      expect(getRelevantWidgetNames('RecraftVectorizeImageNode')).toEqual(['n'])
-      expect(getRelevantWidgetNames('RecraftGenerateImageNode')).toEqual(['n'])
-      expect(getRelevantWidgetNames('RecraftGenerateVectorImageNode')).toEqual([
-        'n'
-      ])
-      expect(
-        getRelevantWidgetNames('RecraftGenerateColorFromImageNode')
-      ).toEqual(['n'])
-    })
-
-    it('should include relevant widget names for new nodes', () => {
-      const { getRelevantWidgetNames } = useNodePricing()
-
-      expect(getRelevantWidgetNames('RunwayImageToVideoNodeGen3a')).toEqual([
-        'duration'
-      ])
-      expect(getRelevantWidgetNames('RunwayImageToVideoNodeGen4')).toEqual([
-        'duration'
-      ])
-      expect(getRelevantWidgetNames('RunwayFirstLastFrameNode')).toEqual([
-        'duration'
-      ])
-      expect(getRelevantWidgetNames('TripoTextToModelNode')).toEqual([
-        'model_version',
-        'quad',
-        'style',
-        'texture',
-        'pbr',
-        'texture_quality',
-        'geometry_quality'
-      ])
-      expect(getRelevantWidgetNames('TripoImageToModelNode')).toEqual([
-        'model_version',
-        'quad',
-        'style',
-        'texture',
-        'pbr',
-        'texture_quality',
-        'geometry_quality'
-      ])
-    })
-  })
-
-  describe('New API nodes pricing', () => {
-    describe('RunwayML nodes', () => {
-      it('should return static price for RunwayTextToImageNode', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('RunwayTextToImageNode')
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(creditsLabel(0.11))
-      })
-
-      it('should calculate dynamic pricing for RunwayImageToVideoNodeGen3a', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('RunwayImageToVideoNodeGen3a', [
-          { name: 'duration', value: 10 }
-        ])
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(creditsLabel(0.0715 * 10))
-      })
-
-      it('should return fallback for RunwayImageToVideoNodeGen3a without duration', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('RunwayImageToVideoNodeGen3a', [])
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(creditsLabel(0.0715, { suffix: '/second' }))
-      })
-
-      it('should handle zero duration for RunwayImageToVideoNodeGen3a', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('RunwayImageToVideoNodeGen3a', [
-          { name: 'duration', value: 0 }
-        ])
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(creditsLabel(0.0)) // 0.05 * 0 = 0
-      })
-
-      it('should handle NaN duration for RunwayImageToVideoNodeGen3a', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('RunwayImageToVideoNodeGen3a', [
-          { name: 'duration', value: 'invalid' }
-        ])
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(creditsLabel(0.0715 * 5))
-      })
-    })
-
-    describe('Rodin nodes', () => {
-      it('should return base price for Rodin3D_Regular', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('Rodin3D_Regular')
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(creditsLabel(0.4))
-      })
-
-      it('should return addon price for Rodin3D_Detail', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('Rodin3D_Detail')
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(creditsLabel(0.4))
-      })
-
-      it('should return addon price for Rodin3D_Smooth', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('Rodin3D_Smooth')
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(creditsLabel(0.4))
-      })
-    })
-
-    describe('Tripo nodes', () => {
-      it('should return v2.5 standard pricing for TripoTextToModelNode', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('TripoTextToModelNode', [
-          { name: 'model_version', value: 'v2.5' },
-          { name: 'quad', value: false },
-          { name: 'style', value: 'any style' },
-          { name: 'texture', value: false },
-          { name: 'texture_quality', value: 'standard' }
-        ])
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(creditsLabel(0.15)) // any style, no quad, no texture
-      })
-
-      it('should return v2.5 detailed pricing for TripoTextToModelNode', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('TripoTextToModelNode', [
-          { name: 'model_version', value: 'v2.5' },
-          { name: 'quad', value: true },
-          { name: 'style', value: 'any style' },
-          { name: 'texture', value: false },
-          { name: 'texture_quality', value: 'detailed' }
-        ])
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(creditsLabel(0.3)) // any style, quad, no texture, detailed
-      })
-
-      it('should return v2.0 detailed pricing for TripoImageToModelNode', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('TripoImageToModelNode', [
-          { name: 'model_version', value: 'v2.0' },
-          { name: 'quad', value: true },
-          { name: 'style', value: 'any style' },
-          { name: 'texture', value: false },
-          { name: 'texture_quality', value: 'detailed' }
-        ])
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(creditsLabel(0.4)) // any style, quad, no texture, detailed
-      })
-
-      it('should return legacy pricing for TripoTextToModelNode', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('TripoTextToModelNode', [
-          { name: 'model_version', value: 'v2.0' },
-          { name: 'quad', value: false },
-          { name: 'style', value: 'none' },
-          { name: 'texture', value: false },
-          { name: 'texture_quality', value: 'standard' }
-        ])
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(creditsLabel(0.1)) // none style, no quad, no texture
-      })
-
-      it('should return static price for TripoRefineNode', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('TripoRefineNode')
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(creditsLabel(0.3))
-      })
-
-      it('should return fallback for TripoTextToModelNode without model', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('TripoTextToModelNode', [])
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(
-          creditsRangeLabel(0.1, 0.65, {
-            note: 'varies with quad, style, texture & quality'
-          })
-        )
-      })
-
-      it('should return texture-based pricing for TripoTextureNode', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const standardNode = createMockNode('TripoTextureNode', [
-          { name: 'texture_quality', value: 'standard' }
-        ])
-        const detailedNode = createMockNode('TripoTextureNode', [
-          { name: 'texture_quality', value: 'detailed' }
-        ])
-
-        expect(getNodeDisplayPrice(standardNode)).toBe(creditsLabel(0.1))
-        expect(getNodeDisplayPrice(detailedNode)).toBe(creditsLabel(0.2))
-      })
-
-      it('should handle various Tripo parameter combinations', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-
-        // Test different parameter combinations
-        const testCases = [
-          {
-            model_version: 'v3.0',
-            quad: false,
-            style: 'none',
-            texture: false,
-            expected: creditsLabel(0.1)
-          },
-          {
-            model_version: 'v3.0',
-            quad: false,
-            style: 'any style',
-            texture: false,
-            expected: creditsLabel(0.15)
-          },
-          {
-            model_version: 'v3.0',
-            quad: true,
-            style: 'any style',
-            texture: false,
-            expected: creditsLabel(0.2)
-          },
-          {
-            model_version: 'v3.0',
-            quad: true,
-            style: 'any style',
-            texture: true,
-            expected: creditsLabel(0.3)
-          }
-        ]
-
-        testCases.forEach(({ quad, style, texture, expected }) => {
-          const node = createMockNode('TripoTextToModelNode', [
-            { name: 'model_version', value: 'v2.0' },
-            { name: 'quad', value: quad },
-            { name: 'style', value: style },
-            { name: 'texture', value: texture },
-            { name: 'texture_quality', value: 'standard' }
-          ])
-          expect(getNodeDisplayPrice(node)).toBe(expected)
-        })
-      })
-
-      it('should return static price for TripoRetargetNode', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('TripoRetargetNode')
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(creditsLabel(0.1))
-      })
-
-      it('should return dynamic pricing for TripoMultiviewToModelNode', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-
-        // Test basic case - no style, no quad, no texture
-        const basicNode = createMockNode('TripoMultiviewToModelNode', [
-          { name: 'model_version', value: 'v3.0' },
-          { name: 'quad', value: false },
-          { name: 'style', value: 'none' },
-          { name: 'texture', value: false },
-          { name: 'texture_quality', value: 'standard' }
-        ])
-        expect(getNodeDisplayPrice(basicNode)).toBe(creditsLabel(0.2))
-
-        // Test high-end case - any style, quad, texture, detailed
-        const highEndNode = createMockNode('TripoMultiviewToModelNode', [
-          { name: 'model_version', value: 'v3.0' },
-          { name: 'quad', value: true },
-          { name: 'style', value: 'stylized' },
-          { name: 'texture', value: true },
-          { name: 'texture_quality', value: 'detailed' }
-        ])
-        expect(getNodeDisplayPrice(highEndNode)).toBe(creditsLabel(0.5))
-      })
-
-      it('should return fallback for TripoMultiviewToModelNode without widgets', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('TripoMultiviewToModelNode', [])
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(
-          creditsRangeLabel(0.1, 0.65, {
-            note: '(varies with quad, style, texture & quality)'
-          })
-        )
-      })
-    })
-
-    describe('Gemini and OpenAI Chat nodes', () => {
-      it('should return specific pricing for supported Gemini models', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-
-        const testCases = [
-          {
-            model: 'gemini-2.5-pro-preview-05-06',
-            expected: creditsListLabel([0.00125, 0.01], {
-              suffix: ' per 1K tokens'
-            })
-          },
-          {
-            model: 'gemini-2.5-pro',
-            expected: creditsListLabel([0.00125, 0.01], {
-              suffix: ' per 1K tokens'
-            })
-          },
-          {
-            model: 'gemini-3-pro-preview',
-            expected: creditsListLabel([0.002, 0.012], {
-              suffix: ' per 1K tokens'
-            })
-          },
-          {
-            model: 'gemini-2.5-flash-preview-04-17',
-            expected: creditsListLabel([0.0003, 0.0025], {
-              suffix: ' per 1K tokens'
-            })
-          },
-          {
-            model: 'gemini-2.5-flash',
-            expected: creditsListLabel([0.0003, 0.0025], {
-              suffix: ' per 1K tokens'
-            })
-          },
-          { model: 'unknown-gemini-model', expected: 'Token-based' }
-        ]
-
-        testCases.forEach(({ model, expected }) => {
-          const node = createMockNode('GeminiNode', [
-            { name: 'model', value: model }
-          ])
-          expect(getNodeDisplayPrice(node)).toBe(expected)
-        })
-      })
-
-      it('should return per-second pricing for Gemini Veo models', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('GeminiNode', [
-          { name: 'model', value: 'veo-2.0-generate-001' }
-        ])
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(creditsLabel(0.5, { suffix: '/second' }))
-      })
-
-      it('should return fallback for GeminiNode without model widget', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('GeminiNode', [])
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe('Token-based')
-      })
-
-      it('should return token-based pricing for OpenAIChatNode', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('OpenAIChatNode', [
-          { name: 'model', value: 'unknown-model' }
-        ])
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe('Token-based')
-      })
-
-      it('should return correct pricing for all exposed OpenAI models', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-
-        const testCases = [
-          {
-            model: 'o4-mini',
-            expected: creditsListLabel([0.0011, 0.0044], {
-              suffix: ' per 1K tokens'
-            })
-          },
-          {
-            model: 'o1-pro',
-            expected: creditsListLabel([0.15, 0.6], {
-              suffix: ' per 1K tokens'
-            })
-          },
-          {
-            model: 'o1',
-            expected: creditsListLabel([0.015, 0.06], {
-              suffix: ' per 1K tokens'
-            })
-          },
-          {
-            model: 'o3-mini',
-            expected: creditsListLabel([0.0011, 0.0044], {
-              suffix: ' per 1K tokens'
-            })
-          },
-          {
-            model: 'o3',
-            expected: creditsListLabel([0.01, 0.04], {
-              suffix: ' per 1K tokens'
-            })
-          },
-          {
-            model: 'gpt-4o',
-            expected: creditsListLabel([0.0025, 0.01], {
-              suffix: ' per 1K tokens'
-            })
-          },
-          {
-            model: 'gpt-4.1-nano',
-            expected: creditsListLabel([0.0001, 0.0004], {
-              suffix: ' per 1K tokens'
-            })
-          },
-          {
-            model: 'gpt-4.1-mini',
-            expected: creditsListLabel([0.0004, 0.0016], {
-              suffix: ' per 1K tokens'
-            })
-          },
-          {
-            model: 'gpt-4.1',
-            expected: creditsListLabel([0.002, 0.008], {
-              suffix: ' per 1K tokens'
-            })
-          },
-          {
-            model: 'gpt-5-nano',
-            expected: creditsListLabel([0.00005, 0.0004], {
-              suffix: ' per 1K tokens'
-            })
-          },
-          {
-            model: 'gpt-5-mini',
-            expected: creditsListLabel([0.00025, 0.002], {
-              suffix: ' per 1K tokens'
-            })
-          },
-          {
-            model: 'gpt-5',
-            expected: creditsListLabel([0.00125, 0.01], {
-              suffix: ' per 1K tokens'
-            })
-          }
-        ]
-
-        testCases.forEach(({ model, expected }) => {
-          const node = createMockNode('OpenAIChatNode', [
-            { name: 'model', value: model }
-          ])
-          expect(getNodeDisplayPrice(node)).toBe(expected)
-        })
-      })
-
-      it('should handle model ordering correctly (specific before general)', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-
-        // Test that more specific patterns are matched before general ones
-        const testCases = [
-          {
-            model: 'gpt-4.1-nano-test',
-            expected: creditsListLabel([0.0001, 0.0004], {
-              suffix: ' per 1K tokens'
-            })
-          },
-          {
-            model: 'gpt-4.1-mini-test',
-            expected: creditsListLabel([0.0004, 0.0016], {
-              suffix: ' per 1K tokens'
-            })
-          },
-          {
-            model: 'gpt-4.1-test',
-            expected: creditsListLabel([0.002, 0.008], {
-              suffix: ' per 1K tokens'
-            })
-          },
-          {
-            model: 'o1-pro-test',
-            expected: creditsListLabel([0.15, 0.6], {
-              suffix: ' per 1K tokens'
-            })
-          },
-          {
-            model: 'o1-test',
-            expected: creditsListLabel([0.015, 0.06], {
-              suffix: ' per 1K tokens'
-            })
-          },
-          {
-            model: 'o3-mini-test',
-            expected: creditsListLabel([0.0011, 0.0044], {
-              suffix: ' per 1K tokens'
-            })
-          },
-          { model: 'unknown-model', expected: 'Token-based' }
-        ]
-
-        testCases.forEach(({ model, expected }) => {
-          const node = createMockNode('OpenAIChatNode', [
-            { name: 'model', value: model }
-          ])
-          expect(getNodeDisplayPrice(node)).toBe(expected)
-        })
-      })
-
-      it('should return fallback for OpenAIChatNode without model widget', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('OpenAIChatNode', [])
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe('Token-based')
-      })
-
-      it('should return static price for GeminiImageNode', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('GeminiImageNode')
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(
-          creditsLabel(0.039, {
-            approximate: true,
-            suffix: '/Image (1K)'
-          })
-        )
-      })
-    })
-
-    describe('Additional RunwayML edge cases', () => {
-      it('should handle edge cases for RunwayML duration-based pricing', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-
-        // Test edge cases
-        const RATE_PER_SECOND = 0.0715
-        const testCases = [
-          { duration: 0, expected: creditsLabel(0) },
-          { duration: 1, expected: creditsLabel(RATE_PER_SECOND) },
-          { duration: 30, expected: creditsLabel(RATE_PER_SECOND * 30) }
-        ]
-
-        testCases.forEach(({ duration, expected }) => {
-          const node = createMockNode('RunwayImageToVideoNodeGen3a', [
-            { name: 'duration', value: duration }
-          ])
-          expect(getNodeDisplayPrice(node)).toBe(expected)
-        })
-      })
-
-      it('should handle invalid duration values gracefully', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('RunwayImageToVideoNodeGen3a', [
-          { name: 'duration', value: 'invalid-string' }
-        ])
-        // When Number('invalid-string') returns NaN, it falls back to 5 seconds
-        expect(getNodeDisplayPrice(node)).toBe(creditsLabel(0.0715 * 5))
-      })
-
-      it('should handle missing duration widget gracefully', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const nodes = [
-          'RunwayImageToVideoNodeGen3a',
-          'RunwayImageToVideoNodeGen4',
-          'RunwayFirstLastFrameNode'
-        ]
-
-        nodes.forEach((nodeType) => {
-          const node = createMockNode(nodeType, [])
-          expect(getNodeDisplayPrice(node)).toBe(
-            creditsLabel(0.0715, { suffix: '/second' })
-          )
-        })
-      })
-    })
-
-    describe('Complete Rodin node coverage', () => {
-      it('should return correct pricing for all Rodin variants', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-
-        const testCases = [
-          { nodeType: 'Rodin3D_Regular', expected: creditsLabel(0.4) },
-          { nodeType: 'Rodin3D_Sketch', expected: creditsLabel(0.4) },
-          { nodeType: 'Rodin3D_Detail', expected: creditsLabel(0.4) },
-          { nodeType: 'Rodin3D_Smooth', expected: creditsLabel(0.4) }
-        ]
-
-        testCases.forEach(({ nodeType, expected }) => {
-          const node = createMockNode(nodeType)
-          expect(getNodeDisplayPrice(node)).toBe(expected)
-        })
-      })
-    })
-
-    describe('Comprehensive Tripo edge case testing', () => {
-      it('should handle TripoImageToModelNode with various parameter combinations', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-
-        const testCases = [
-          {
-            quad: false,
-            style: 'none',
-            texture: false,
-            expected: creditsLabel(0.2)
-          },
-          {
-            quad: false,
-            style: 'none',
-            texture: true,
-            expected: creditsLabel(0.3)
-          },
-          {
-            quad: true,
-            style: 'any style',
-            texture: true,
-            textureQuality: 'detailed',
-            expected: creditsLabel(0.5)
-          },
-          {
-            quad: false,
-            style: 'any style',
-            texture: true,
-            textureQuality: 'standard',
-            expected: creditsLabel(0.35)
-          }
-        ]
-
-        testCases.forEach(
-          ({ quad, style, texture, textureQuality, expected }) => {
-            const widgets = [
-              { name: 'model_version', value: 'v3.0' },
-              { name: 'quad', value: quad },
-              { name: 'style', value: style },
-              { name: 'texture', value: texture }
-            ]
-            if (textureQuality) {
-              widgets.push({ name: 'texture_quality', value: textureQuality })
-            }
-            const node = createMockNode('TripoImageToModelNode', widgets)
-            expect(getNodeDisplayPrice(node)).toBe(expected)
-          }
-        )
-      })
-
-      it('should return correct fallback for TripoImageToModelNode', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('TripoImageToModelNode', [])
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(
-          creditsRangeLabel(0.1, 0.65, {
-            note: 'varies with quad, style, texture & quality'
-          })
-        )
-      })
-
-      it('should handle missing texture quality widget', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('TripoTextToModelNode', [])
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(
-          creditsRangeLabel(0.1, 0.65, {
-            note: 'varies with quad, style, texture & quality'
-          })
-        )
-      })
-
-      it('should handle missing model version widget', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-        const node = createMockNode('TripoTextToModelNode', [
-          { name: 'texture_quality', value: 'detailed' }
-        ])
-
-        const price = getNodeDisplayPrice(node)
-        expect(price).toBe(
-          creditsRangeLabel(0.1, 0.65, {
-            note: 'varies with quad, style, texture & quality'
-          })
-        )
-      })
-
-      it('should return correct pricing for exposed ByteDance models', () => {
-        const { getNodeDisplayPrice } = useNodePricing()
-
-        const testCases = [
-          {
-            node_name: 'ByteDanceImageNode',
-            model: 'seedream-3-0-t2i-250415',
-            expected: creditsLabel(0.03)
-          },
-          {
-            node_name: 'ByteDanceImageEditNode',
-            model: 'seededit-3-0-i2i-250628',
-            expected: creditsLabel(0.03)
-          }
-        ]
-
-        testCases.forEach(({ node_name, model, expected }) => {
-          const node = createMockNode(node_name, [
-            { name: 'model', value: model }
-          ])
-          expect(getNodeDisplayPrice(node)).toBe(expected)
-        })
-      })
-    })
-  })
-
-  describe('dynamic pricing - ByteDanceSeedreamNode', () => {
-    it('should return $0.03 x images/Run', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('ByteDanceSeedreamNode', [
-        { name: 'model', value: 'seedream-4-0-250828' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(
-        creditsLabel(0.03, {
-          suffix: ' x images/Run',
-          approximate: true
-        })
-      )
-    })
-  })
-
-  describe('dynamic pricing - ByteDance Seedance video nodes', () => {
-    it('should return base 10s range for PRO 1080p on ByteDanceTextToVideoNode', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('ByteDanceTextToVideoNode', [
-        { name: 'model', value: 'seedance-1-0-pro' },
-        { name: 'duration', value: '10' },
-        { name: 'resolution', value: '1080p' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsRangeLabel(1.18, 1.22))
-    })
-
-    it('should scale to half for 5s PRO 1080p on ByteDanceTextToVideoNode', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('ByteDanceTextToVideoNode', [
-        { name: 'model', value: 'seedance-1-0-pro' },
-        { name: 'duration', value: '5' },
-        { name: 'resolution', value: '1080p' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsRangeLabel(0.59, 0.61))
-    })
-
-    it('should scale for 8s PRO 480p on ByteDanceImageToVideoNode', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('ByteDanceImageToVideoNode', [
-        { name: 'model', value: 'seedance-1-0-pro' },
-        { name: 'duration', value: '8' },
-        { name: 'resolution', value: '480p' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsRangeLabel(0.23 * 0.8, 0.24 * 0.8))
-    })
-
-    it('should scale correctly for 12s PRO 720p on ByteDanceFirstLastFrameNode', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('ByteDanceFirstLastFrameNode', [
-        { name: 'model', value: 'seedance-1-0-pro' },
-        { name: 'duration', value: '10' },
-        { name: 'resolution', value: '720p' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsRangeLabel(0.51, 0.56))
-    })
-
-    it('should collapse to a single value when min and max round equal for LITE 480p 3s on ByteDanceImageReferenceNode', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('ByteDanceImageReferenceNode', [
-        { name: 'model', value: 'seedance-1-0-lite' },
-        { name: 'duration', value: '3' },
-        { name: 'resolution', value: '480p' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.05)) // 0.17..0.18 scaled by 0.3 both round to 0.05
-    })
-
-    it('should return Token-based when required widgets are missing', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const missingModel = createMockNode('ByteDanceFirstLastFrameNode', [
-        { name: 'duration', value: '10' },
-        { name: 'resolution', value: '1080p' }
-      ])
-      const missingResolution = createMockNode('ByteDanceImageToVideoNode', [
-        { name: 'model', value: 'seedance-1-0-pro' },
-        { name: 'duration', value: '10' }
-      ])
-      const missingDuration = createMockNode('ByteDanceTextToVideoNode', [
-        { name: 'model', value: 'seedance-1-0-lite' },
-        { name: 'resolution', value: '720p' }
-      ])
-
-      expect(getNodeDisplayPrice(missingModel)).toBe('Token-based')
-      expect(getNodeDisplayPrice(missingResolution)).toBe('Token-based')
-      expect(getNodeDisplayPrice(missingDuration)).toBe('Token-based')
-    })
-  })
-
-  describe('dynamic pricing - WanTextToVideoApi', () => {
-    it('should return $1.50 for 10s at 1080p', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('WanTextToVideoApi', [
-        { name: 'duration', value: '10' },
-        { name: 'size', value: '1080p: 4:3 (1632x1248)' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(1.5)) // 0.15 * 10
-    })
-
-    it('should return $0.50 for 5s at 720p', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('WanTextToVideoApi', [
-        { name: 'duration', value: 5 },
-        { name: 'size', value: '720p: 16:9 (1280x720)' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.5)) // 0.10 * 5
-    })
-
-    it('should return $0.15 for 3s at 480p', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('WanTextToVideoApi', [
-        { name: 'duration', value: '3' },
-        { name: 'size', value: '480p: 1:1 (624x624)' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.15)) // 0.05 * 3
-    })
-
-    it('should fall back when widgets are missing', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const missingBoth = createMockNode('WanTextToVideoApi', [])
-      const missingSize = createMockNode('WanTextToVideoApi', [
-        { name: 'duration', value: '5' }
-      ])
-      const missingDuration = createMockNode('WanTextToVideoApi', [
-        { name: 'size', value: '1080p' }
-      ])
-
-      expect(getNodeDisplayPrice(missingBoth)).toBe(
-        creditsRangeLabel(0.05, 0.15, { suffix: '/second' })
-      )
-      expect(getNodeDisplayPrice(missingSize)).toBe(
-        creditsRangeLabel(0.05, 0.15, { suffix: '/second' })
-      )
-      expect(getNodeDisplayPrice(missingDuration)).toBe(
-        creditsRangeLabel(0.05, 0.15, { suffix: '/second' })
-      )
-    })
-
-    it('should fall back on invalid duration', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('WanTextToVideoApi', [
-        { name: 'duration', value: 'invalid' },
-        { name: 'size', value: '1080p' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsRangeLabel(0.05, 0.15, { suffix: '/second' }))
-    })
-
-    it('should fall back on unknown resolution', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('WanTextToVideoApi', [
-        { name: 'duration', value: '10' },
-        { name: 'size', value: '2K' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsRangeLabel(0.05, 0.15, { suffix: '/second' }))
-    })
-  })
-
-  describe('dynamic pricing - WanImageToVideoApi', () => {
-    it('should return $0.80 for 8s at 720p', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('WanImageToVideoApi', [
-        { name: 'duration', value: 8 },
-        { name: 'resolution', value: '720p' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.8)) // 0.10 * 8
-    })
-
-    it('should return $0.60 for 12s at 480P', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('WanImageToVideoApi', [
-        { name: 'duration', value: '12' },
-        { name: 'resolution', value: '480P' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.6)) // 0.05 * 12
-    })
-
-    it('should return $1.50 for 10s at 1080p', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('WanImageToVideoApi', [
-        { name: 'duration', value: '10' },
-        { name: 'resolution', value: '1080p' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(1.5)) // 0.15 * 10
-    })
-
-    it('should handle "5s" string duration at 1080P', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('WanImageToVideoApi', [
-        { name: 'duration', value: '5s' },
-        { name: 'resolution', value: '1080P' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.75)) // 0.15 * 5
-    })
-
-    it('should fall back when widgets are missing', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const missingBoth = createMockNode('WanImageToVideoApi', [])
-      const missingRes = createMockNode('WanImageToVideoApi', [
-        { name: 'duration', value: '5' }
-      ])
-      const missingDuration = createMockNode('WanImageToVideoApi', [
-        { name: 'resolution', value: '1080p' }
-      ])
-
-      expect(getNodeDisplayPrice(missingBoth)).toBe(
-        creditsRangeLabel(0.05, 0.15, { suffix: '/second' })
-      )
-      expect(getNodeDisplayPrice(missingRes)).toBe(
-        creditsRangeLabel(0.05, 0.15, { suffix: '/second' })
-      )
-      expect(getNodeDisplayPrice(missingDuration)).toBe(
-        creditsRangeLabel(0.05, 0.15, { suffix: '/second' })
-      )
-    })
-
-    it('should fall back on invalid duration', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('WanImageToVideoApi', [
-        { name: 'duration', value: 'invalid' },
-        { name: 'resolution', value: '720p' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsRangeLabel(0.05, 0.15, { suffix: '/second' }))
-    })
-
-    it('should fall back on unknown resolution', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('WanImageToVideoApi', [
-        { name: 'duration', value: '10' },
-        { name: 'resolution', value: 'weird-res' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsRangeLabel(0.05, 0.15, { suffix: '/second' }))
-    })
-  })
-
-  describe('dynamic pricing - LtxvApiTextToVideo', () => {
-    it('should return $0.30 for Pro 1080p 5s', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('LtxvApiTextToVideo', [
-        { name: 'model', value: 'LTX-2 (Pro)' },
-        { name: 'duration', value: '5' },
-        { name: 'resolution', value: '1920x1080' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(0.3)) // 0.06 * 5
-    })
-
-    it('should parse "10s" duration strings', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('LtxvApiTextToVideo', [
-        { name: 'model', value: 'LTX-2 (Fast)' },
-        { name: 'duration', value: '10' },
-        { name: 'resolution', value: '3840x2160' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsLabel(1.6)) // 0.16 * 10
-    })
-
-    it('should fall back when a required widget is missing (no resolution)', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('LtxvApiTextToVideo', [
-        { name: 'model', value: 'LTX-2 (Pro)' },
-        { name: 'duration', value: '5' }
-        // missing resolution
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsRangeLabel(0.04, 0.24, { suffix: '/second' }))
-    })
-
-    it('should fall back for unknown model', () => {
-      const { getNodeDisplayPrice } = useNodePricing()
-      const node = createMockNode('LtxvApiTextToVideo', [
-        { name: 'model', value: 'LTX-3 (Pro)' },
-        { name: 'duration', value: 5 },
-        { name: 'resolution', value: '1920x1080' }
-      ])
-
-      const price = getNodeDisplayPrice(node)
-      expect(price).toBe(creditsRangeLabel(0.04, 0.24, { suffix: '/second' }))
-    })
-  })
-})
-const CREDIT_NUMBER_OPTIONS: Intl.NumberFormatOptions = {
-  minimumFractionDigits: 0,
-  maximumFractionDigits: 0
-}
-
-type CreditFormatOptions = {
-  suffix?: string
-  note?: string
-  approximate?: boolean
-}
-
-const creditValue = (usd: number): string =>
-  formatCreditsFromUsd({
-    usd,
-    numberOptions: CREDIT_NUMBER_OPTIONS
-  })
-
-const prefix = (approximate?: boolean) => (approximate ? '~' : '')
-const suffix = (value?: string) => value ?? '/Run'
-const note = (value?: string) => {
-  if (!value) return ''
-  const trimmed = value.trim()
-  const hasParens = trimmed.startsWith('(') && trimmed.endsWith(')')
-  const content = hasParens ? trimmed : `(${trimmed})`
-  return ` ${content}`
-}
-
-const creditsLabel = (
-  usd: number,
-  {
-    suffix: suffixOverride,
-    note: noteOverride,
-    approximate
-  }: CreditFormatOptions = {}
-): string =>
-  `${prefix(approximate)}${creditValue(usd)} credits${suffix(suffixOverride)}${note(noteOverride)}`
-
-const creditsRangeLabel = (
-  minUsd: number,
-  maxUsd: number,
-  options?: CreditFormatOptions
-): string => {
-  const min = creditValue(minUsd)
-  const max = creditValue(maxUsd)
-  const value = min === max ? min : `${min}-${max}`
-  return `${prefix(options?.approximate)}${value} credits${suffix(options?.suffix)}${note(options?.note)}`
-}
-
-const creditsListLabel = (
-  usdValues: number[],
-  options?: CreditFormatOptions & { separator?: string }
-): string => {
-  const parts = usdValues.map((value) => creditValue(value))
-  const value = parts.join(options?.separator ?? '/')
-  return `${prefix(options?.approximate)}${value} credits${suffix(options?.suffix)}${note(options?.note)}`
-}
diff --git a/tests-ui/tests/composables/useCompletionSummary.test.ts b/tests-ui/tests/composables/useCompletionSummary.test.ts
deleted file mode 100644
index 34ec42ff6c..0000000000
--- a/tests-ui/tests/composables/useCompletionSummary.test.ts
+++ /dev/null
@@ -1,289 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { nextTick, reactive } from 'vue'
-
-import { useCompletionSummary } from '@/composables/queue/useCompletionSummary'
-import { useExecutionStore } from '@/stores/executionStore'
-import { useQueueStore } from '@/stores/queueStore'
-
-type MockTask = {
-  displayStatus: 'Completed' | 'Failed' | 'Cancelled' | 'Running' | 'Pending'
-  executionEndTimestamp?: number
-  previewOutput?: {
-    isImage: boolean
-    urlWithTimestamp: string
-  }
-}
-
-vi.mock('@/stores/queueStore', () => {
-  const state = reactive({
-    runningTasks: [] as MockTask[],
-    historyTasks: [] as MockTask[]
-  })
-
-  return {
-    useQueueStore: () => state
-  }
-})
-
-vi.mock('@/stores/executionStore', () => {
-  const state = reactive({
-    isIdle: true
-  })
-
-  return {
-    useExecutionStore: () => state
-  }
-})
-
-describe('useCompletionSummary', () => {
-  const queueStore = () =>
-    useQueueStore() as {
-      runningTasks: MockTask[]
-      historyTasks: MockTask[]
-    }
-  const executionStore = () => useExecutionStore() as { isIdle: boolean }
-
-  const resetState = () => {
-    queueStore().runningTasks = []
-    queueStore().historyTasks = []
-    executionStore().isIdle = true
-  }
-
-  const createTask = (
-    options: {
-      state?: MockTask['displayStatus']
-      ts?: number
-      previewUrl?: string
-      isImage?: boolean
-    } = {}
-  ): MockTask => {
-    const {
-      state = 'Completed',
-      ts = Date.now(),
-      previewUrl,
-      isImage = true
-    } = options
-
-    const task: MockTask = {
-      displayStatus: state,
-      executionEndTimestamp: ts
-    }
-
-    if (previewUrl) {
-      task.previewOutput = {
-        isImage,
-        urlWithTimestamp: previewUrl
-      }
-    }
-
-    return task
-  }
-
-  const runBatch = async (options: {
-    start: number
-    finish: number
-    tasks: MockTask[]
-  }) => {
-    const { start, finish, tasks } = options
-
-    vi.setSystemTime(start)
-    executionStore().isIdle = false
-    await nextTick()
-
-    vi.setSystemTime(finish)
-    queueStore().historyTasks = tasks
-    executionStore().isIdle = true
-    await nextTick()
-  }
-
-  beforeEach(() => {
-    resetState()
-    vi.useFakeTimers()
-    vi.setSystemTime(0)
-  })
-
-  afterEach(() => {
-    vi.runOnlyPendingTimers()
-    vi.useRealTimers()
-    resetState()
-  })
-
-  it('summarizes the most recent batch and auto clears after the dismiss delay', async () => {
-    const { summary } = useCompletionSummary()
-    await nextTick()
-
-    const start = 1_000
-    const finish = 2_000
-
-    const tasks = [
-      createTask({ ts: start - 100, previewUrl: 'ignored-old' }),
-      createTask({ ts: start + 10, previewUrl: 'img-1' }),
-      createTask({ ts: start + 20, previewUrl: 'img-2' }),
-      createTask({ ts: start + 30, previewUrl: 'img-3' }),
-      createTask({ ts: start + 40, previewUrl: 'img-4' }),
-      createTask({ state: 'Failed', ts: start + 50 })
-    ]
-
-    await runBatch({ start, finish, tasks })
-
-    expect(summary.value).toEqual({
-      mode: 'mixed',
-      completedCount: 4,
-      failedCount: 1,
-      thumbnailUrls: ['img-1', 'img-2', 'img-3']
-    })
-
-    vi.advanceTimersByTime(6000)
-    await nextTick()
-    expect(summary.value).toBeNull()
-  })
-
-  it('reports allFailed when every task in the batch failed', async () => {
-    const { summary } = useCompletionSummary()
-    await nextTick()
-
-    const start = 10_000
-    const finish = 10_200
-
-    await runBatch({
-      start,
-      finish,
-      tasks: [
-        createTask({ state: 'Failed', ts: start + 25 }),
-        createTask({ state: 'Failed', ts: start + 50 })
-      ]
-    })
-
-    expect(summary.value).toEqual({
-      mode: 'allFailed',
-      completedCount: 0,
-      failedCount: 2,
-      thumbnailUrls: []
-    })
-  })
-
-  it('treats cancelled tasks as failures and skips non-image previews', async () => {
-    const { summary } = useCompletionSummary()
-    await nextTick()
-
-    const start = 15_000
-    const finish = 15_200
-
-    await runBatch({
-      start,
-      finish,
-      tasks: [
-        createTask({ ts: start + 25, previewUrl: 'img-1' }),
-        createTask({
-          state: 'Cancelled',
-          ts: start + 50,
-          previewUrl: 'thumb-ignore',
-          isImage: false
-        })
-      ]
-    })
-
-    expect(summary.value).toEqual({
-      mode: 'mixed',
-      completedCount: 1,
-      failedCount: 1,
-      thumbnailUrls: ['img-1']
-    })
-  })
-
-  it('clearSummary dismisses the banner immediately and still tracks future batches', async () => {
-    const { summary, clearSummary } = useCompletionSummary()
-    await nextTick()
-
-    await runBatch({
-      start: 5_000,
-      finish: 5_100,
-      tasks: [createTask({ ts: 5_050, previewUrl: 'img-1' })]
-    })
-
-    expect(summary.value).toEqual({
-      mode: 'allSuccess',
-      completedCount: 1,
-      failedCount: 0,
-      thumbnailUrls: ['img-1']
-    })
-
-    clearSummary()
-    expect(summary.value).toBeNull()
-
-    await runBatch({
-      start: 6_000,
-      finish: 6_150,
-      tasks: [createTask({ ts: 6_075, previewUrl: 'img-2' })]
-    })
-
-    expect(summary.value).toEqual({
-      mode: 'allSuccess',
-      completedCount: 1,
-      failedCount: 0,
-      thumbnailUrls: ['img-2']
-    })
-  })
-
-  it('ignores batches that have no finished tasks after the active period started', async () => {
-    const { summary } = useCompletionSummary()
-    await nextTick()
-
-    const start = 20_000
-    const finish = 20_500
-
-    await runBatch({
-      start,
-      finish,
-      tasks: [createTask({ ts: start - 1, previewUrl: 'too-early' })]
-    })
-
-    expect(summary.value).toBeNull()
-  })
-
-  it('derives the active period from running tasks when execution is already idle', async () => {
-    const { summary } = useCompletionSummary()
-    await nextTick()
-
-    const start = 25_000
-    vi.setSystemTime(start)
-    queueStore().runningTasks = [
-      createTask({ state: 'Running', ts: start + 1 })
-    ]
-    await nextTick()
-
-    const finish = start + 150
-    vi.setSystemTime(finish)
-    queueStore().historyTasks = [
-      createTask({ ts: finish - 10, previewUrl: 'img-running-trigger' })
-    ]
-    queueStore().runningTasks = []
-    await nextTick()
-
-    expect(summary.value).toEqual({
-      mode: 'allSuccess',
-      completedCount: 1,
-      failedCount: 0,
-      thumbnailUrls: ['img-running-trigger']
-    })
-  })
-
-  it('does not emit a summary when every finished task is still running or pending', async () => {
-    const { summary } = useCompletionSummary()
-    await nextTick()
-
-    const start = 30_000
-    const finish = 30_300
-
-    await runBatch({
-      start,
-      finish,
-      tasks: [
-        createTask({ state: 'Running', ts: start + 20 }),
-        createTask({ state: 'Pending', ts: start + 40 })
-      ]
-    })
-
-    expect(summary.value).toBeNull()
-  })
-})
diff --git a/tests-ui/tests/composables/useCoreCommands.test.ts b/tests-ui/tests/composables/useCoreCommands.test.ts
deleted file mode 100644
index 3c86faa5a2..0000000000
--- a/tests-ui/tests/composables/useCoreCommands.test.ts
+++ /dev/null
@@ -1,219 +0,0 @@
-import { createPinia, setActivePinia } from 'pinia'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { ref } from 'vue'
-
-import { useCoreCommands } from '@/composables/useCoreCommands'
-import { useSettingStore } from '@/platform/settings/settingStore'
-import { api } from '@/scripts/api'
-import { app } from '@/scripts/app'
-
-// Mock vue-i18n for useExternalLink
-const mockLocale = ref('en')
-vi.mock('vue-i18n', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('vue-i18n')>()
-  return {
-    ...actual,
-    useI18n: vi.fn(() => ({
-      locale: mockLocale
-    }))
-  }
-})
-
-vi.mock('@/scripts/app', () => {
-  const mockGraphClear = vi.fn()
-  const mockCanvas = { subgraph: undefined }
-
-  return {
-    app: {
-      clean: vi.fn(() => {
-        // Simulate app.clean() calling graph.clear() only when not in subgraph
-        if (!mockCanvas.subgraph) {
-          mockGraphClear()
-        }
-      }),
-      canvas: mockCanvas,
-      rootGraph: {
-        clear: mockGraphClear
-      }
-    }
-  }
-})
-
-vi.mock('@/scripts/api', () => ({
-  api: {
-    dispatchCustomEvent: vi.fn(),
-    apiURL: vi.fn(() => 'http://localhost:8188')
-  }
-}))
-
-vi.mock('@/platform/settings/settingStore')
-
-vi.mock('@/stores/firebaseAuthStore', () => ({
-  useFirebaseAuthStore: vi.fn(() => ({}))
-}))
-
-vi.mock('@/composables/auth/useFirebaseAuth', () => ({
-  useFirebaseAuth: vi.fn(() => null)
-}))
-
-vi.mock('firebase/auth', () => ({
-  setPersistence: vi.fn(),
-  browserLocalPersistence: {},
-  onAuthStateChanged: vi.fn()
-}))
-
-vi.mock('@/platform/workflow/core/services/workflowService', () => ({
-  useWorkflowService: vi.fn(() => ({}))
-}))
-
-vi.mock('@/services/dialogService', () => ({
-  useDialogService: vi.fn(() => ({}))
-}))
-
-vi.mock('@/services/litegraphService', () => ({
-  useLitegraphService: vi.fn(() => ({}))
-}))
-
-vi.mock('@/stores/executionStore', () => ({
-  useExecutionStore: vi.fn(() => ({}))
-}))
-
-vi.mock('@/stores/toastStore', () => ({
-  useToastStore: vi.fn(() => ({}))
-}))
-
-vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
-  useWorkflowStore: vi.fn(() => ({}))
-}))
-
-vi.mock('@/stores/subgraphStore', () => ({
-  useSubgraphStore: vi.fn(() => ({}))
-}))
-
-vi.mock('@/stores/workspace/colorPaletteStore', () => ({
-  useColorPaletteStore: vi.fn(() => ({}))
-}))
-
-vi.mock('@/composables/auth/useFirebaseAuthActions', () => ({
-  useFirebaseAuthActions: vi.fn(() => ({}))
-}))
-
-vi.mock('@/platform/cloud/subscription/composables/useSubscription', () => ({
-  useSubscription: vi.fn(() => ({
-    isActiveSubscription: vi.fn().mockReturnValue(true),
-    showSubscriptionDialog: vi.fn()
-  }))
-}))
-
-describe('useCoreCommands', () => {
-  const mockSubgraph = {
-    nodes: [
-      // Mock input node
-      {
-        constructor: { comfyClass: 'SubgraphInputNode' },
-        id: 'input1'
-      },
-      // Mock output node
-      {
-        constructor: { comfyClass: 'SubgraphOutputNode' },
-        id: 'output1'
-      },
-      // Mock user node
-      {
-        constructor: { comfyClass: 'SomeUserNode' },
-        id: 'user1'
-      },
-      // Another mock user node
-      {
-        constructor: { comfyClass: 'AnotherUserNode' },
-        id: 'user2'
-      }
-    ],
-    remove: vi.fn()
-  }
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-
-    // Set up Pinia
-    setActivePinia(createPinia())
-
-    // Reset app state
-    app.canvas.subgraph = undefined
-
-    // Mock settings store
-    vi.mocked(useSettingStore).mockReturnValue({
-      get: vi.fn().mockReturnValue(false) // Skip confirmation dialog
-    } as any)
-
-    // Mock global confirm
-    global.confirm = vi.fn().mockReturnValue(true)
-  })
-
-  describe('ClearWorkflow command', () => {
-    it('should clear main graph when not in subgraph', async () => {
-      const commands = useCoreCommands()
-      const clearCommand = commands.find(
-        (cmd) => cmd.id === 'Comfy.ClearWorkflow'
-      )!
-
-      // Execute the command
-      await clearCommand.function()
-
-      expect(app.clean).toHaveBeenCalled()
-      expect(app.rootGraph.clear).toHaveBeenCalled()
-      expect(api.dispatchCustomEvent).toHaveBeenCalledWith('graphCleared')
-    })
-
-    it('should preserve input/output nodes when clearing subgraph', async () => {
-      // Set up subgraph context
-      app.canvas.subgraph = mockSubgraph as any
-
-      const commands = useCoreCommands()
-      const clearCommand = commands.find(
-        (cmd) => cmd.id === 'Comfy.ClearWorkflow'
-      )!
-
-      // Execute the command
-      await clearCommand.function()
-
-      expect(app.clean).toHaveBeenCalled()
-      expect(app.rootGraph.clear).not.toHaveBeenCalled()
-
-      // Should only remove user nodes, not input/output nodes
-      expect(mockSubgraph.remove).toHaveBeenCalledTimes(2)
-      expect(mockSubgraph.remove).toHaveBeenCalledWith(mockSubgraph.nodes[2]) // user1
-      expect(mockSubgraph.remove).toHaveBeenCalledWith(mockSubgraph.nodes[3]) // user2
-      expect(mockSubgraph.remove).not.toHaveBeenCalledWith(
-        mockSubgraph.nodes[0]
-      ) // input1
-      expect(mockSubgraph.remove).not.toHaveBeenCalledWith(
-        mockSubgraph.nodes[1]
-      ) // output1
-
-      expect(api.dispatchCustomEvent).toHaveBeenCalledWith('graphCleared')
-    })
-
-    it('should respect confirmation setting', async () => {
-      // Mock confirmation required
-      vi.mocked(useSettingStore).mockReturnValue({
-        get: vi.fn().mockReturnValue(true) // Require confirmation
-      } as any)
-
-      global.confirm = vi.fn().mockReturnValue(false) // User cancels
-
-      const commands = useCoreCommands()
-      const clearCommand = commands.find(
-        (cmd) => cmd.id === 'Comfy.ClearWorkflow'
-      )!
-
-      // Execute the command
-      await clearCommand.function()
-
-      // Should not clear anything when user cancels
-      expect(app.clean).not.toHaveBeenCalled()
-      expect(app.rootGraph.clear).not.toHaveBeenCalled()
-      expect(api.dispatchCustomEvent).not.toHaveBeenCalled()
-    })
-  })
-})
diff --git a/tests-ui/tests/composables/useManagerState.test.ts b/tests-ui/tests/composables/useManagerState.test.ts
deleted file mode 100644
index c2f0f83c84..0000000000
--- a/tests-ui/tests/composables/useManagerState.test.ts
+++ /dev/null
@@ -1,356 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { ref } from 'vue'
-
-import { useFeatureFlags } from '@/composables/useFeatureFlags'
-import { api } from '@/scripts/api'
-import { useExtensionStore } from '@/stores/extensionStore'
-import { useSystemStatsStore } from '@/stores/systemStatsStore'
-import {
-  ManagerUIState,
-  useManagerState
-} from '@/workbench/extensions/manager/composables/useManagerState'
-
-// Mock dependencies
-vi.mock('@/scripts/api', () => ({
-  api: {
-    getClientFeatureFlags: vi.fn(),
-    getServerFeature: vi.fn()
-  }
-}))
-
-vi.mock('@/composables/useFeatureFlags', () => ({
-  useFeatureFlags: vi.fn(() => ({
-    flags: { supportsManagerV4: false },
-    featureFlag: vi.fn()
-  }))
-}))
-
-vi.mock('@/stores/extensionStore', () => ({
-  useExtensionStore: vi.fn()
-}))
-
-vi.mock('@/stores/systemStatsStore', () => ({
-  useSystemStatsStore: vi.fn()
-}))
-
-vi.mock('@/services/dialogService', () => ({
-  useDialogService: vi.fn(() => ({
-    showManagerPopup: vi.fn(),
-    showLegacyManagerPopup: vi.fn(),
-    showSettingsDialog: vi.fn()
-  }))
-}))
-
-vi.mock('@/stores/commandStore', () => ({
-  useCommandStore: vi.fn(() => ({
-    execute: vi.fn()
-  }))
-}))
-
-vi.mock('@/stores/toastStore', () => ({
-  useToastStore: vi.fn(() => ({
-    add: vi.fn()
-  }))
-}))
-
-describe('useManagerState', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  describe('managerUIState property', () => {
-    it('should return DISABLED state when --enable-manager is NOT present', () => {
-      vi.mocked(useSystemStatsStore).mockReturnValue({
-        systemStats: ref({
-          system: { argv: ['python', 'main.py'] } // No --enable-manager flag
-        }),
-        isInitialized: ref(true)
-      } as any)
-      vi.mocked(api.getClientFeatureFlags).mockReturnValue({})
-      vi.mocked(useExtensionStore).mockReturnValue({
-        extensions: []
-      } as any)
-
-      const managerState = useManagerState()
-
-      expect(managerState.managerUIState.value).toBe(ManagerUIState.DISABLED)
-    })
-
-    it('should return LEGACY_UI state when --enable-manager-legacy-ui is present', () => {
-      vi.mocked(useSystemStatsStore).mockReturnValue({
-        systemStats: ref({
-          system: {
-            argv: [
-              'python',
-              'main.py',
-              '--enable-manager',
-              '--enable-manager-legacy-ui'
-            ]
-          } // Both flags needed
-        }),
-        isInitialized: ref(true)
-      } as any)
-      vi.mocked(api.getClientFeatureFlags).mockReturnValue({})
-      vi.mocked(useExtensionStore).mockReturnValue({
-        extensions: []
-      } as any)
-
-      const managerState = useManagerState()
-
-      expect(managerState.managerUIState.value).toBe(ManagerUIState.LEGACY_UI)
-    })
-
-    it('should return NEW_UI state when client and server both support v4', () => {
-      vi.mocked(useSystemStatsStore).mockReturnValue({
-        systemStats: ref({
-          system: { argv: ['python', 'main.py', '--enable-manager'] }
-        }), // Need --enable-manager
-        isInitialized: ref(true)
-      } as any)
-      vi.mocked(api.getClientFeatureFlags).mockReturnValue({
-        supports_manager_v4_ui: true
-      })
-      vi.mocked(api.getServerFeature).mockReturnValue(true)
-      vi.mocked(useFeatureFlags).mockReturnValue({
-        flags: { supportsManagerV4: true },
-        featureFlag: vi.fn()
-      } as any)
-      vi.mocked(useExtensionStore).mockReturnValue({
-        extensions: []
-      } as any)
-
-      const managerState = useManagerState()
-
-      expect(managerState.managerUIState.value).toBe(ManagerUIState.NEW_UI)
-    })
-
-    it('should return LEGACY_UI state when server supports v4 but client does not', () => {
-      vi.mocked(useSystemStatsStore).mockReturnValue({
-        systemStats: ref({
-          system: { argv: ['python', 'main.py', '--enable-manager'] }
-        }), // Need --enable-manager
-        isInitialized: ref(true)
-      } as any)
-      vi.mocked(api.getClientFeatureFlags).mockReturnValue({
-        supports_manager_v4_ui: false
-      })
-      vi.mocked(api.getServerFeature).mockReturnValue(true)
-      vi.mocked(useFeatureFlags).mockReturnValue({
-        flags: { supportsManagerV4: true },
-        featureFlag: vi.fn()
-      } as any)
-      vi.mocked(useExtensionStore).mockReturnValue({
-        extensions: []
-      } as any)
-
-      const managerState = useManagerState()
-
-      expect(managerState.managerUIState.value).toBe(ManagerUIState.LEGACY_UI)
-    })
-
-    it('should return LEGACY_UI state when legacy manager extension exists', () => {
-      vi.mocked(useSystemStatsStore).mockReturnValue({
-        systemStats: ref({
-          system: { argv: ['python', 'main.py', '--enable-manager'] }
-        }), // Need --enable-manager
-        isInitialized: ref(true)
-      } as any)
-      vi.mocked(api.getClientFeatureFlags).mockReturnValue({})
-      vi.mocked(useFeatureFlags).mockReturnValue({
-        flags: { supportsManagerV4: false },
-        featureFlag: vi.fn()
-      } as any)
-      vi.mocked(useExtensionStore).mockReturnValue({
-        extensions: [{ name: 'Comfy.CustomNodesManager' }]
-      } as any)
-
-      const managerState = useManagerState()
-
-      expect(managerState.managerUIState.value).toBe(ManagerUIState.LEGACY_UI)
-    })
-
-    it('should return NEW_UI state when server feature flags are undefined', () => {
-      vi.mocked(useSystemStatsStore).mockReturnValue({
-        systemStats: ref({
-          system: { argv: ['python', 'main.py', '--enable-manager'] }
-        }), // Need --enable-manager
-        isInitialized: ref(true)
-      } as any)
-      vi.mocked(api.getClientFeatureFlags).mockReturnValue({})
-      vi.mocked(api.getServerFeature).mockReturnValue(undefined)
-      vi.mocked(useFeatureFlags).mockReturnValue({
-        flags: { supportsManagerV4: undefined },
-        featureFlag: vi.fn()
-      } as any)
-      vi.mocked(useExtensionStore).mockReturnValue({
-        extensions: []
-      } as any)
-
-      const managerState = useManagerState()
-
-      expect(managerState.managerUIState.value).toBe(ManagerUIState.NEW_UI)
-    })
-
-    it('should return LEGACY_UI state when server does not support v4', () => {
-      vi.mocked(useSystemStatsStore).mockReturnValue({
-        systemStats: ref({
-          system: { argv: ['python', 'main.py', '--enable-manager'] }
-        }), // Need --enable-manager
-        isInitialized: ref(true)
-      } as any)
-      vi.mocked(api.getClientFeatureFlags).mockReturnValue({})
-      vi.mocked(api.getServerFeature).mockReturnValue(false)
-      vi.mocked(useFeatureFlags).mockReturnValue({
-        flags: { supportsManagerV4: false },
-        featureFlag: vi.fn()
-      } as any)
-      vi.mocked(useExtensionStore).mockReturnValue({
-        extensions: []
-      } as any)
-
-      const managerState = useManagerState()
-
-      expect(managerState.managerUIState.value).toBe(ManagerUIState.LEGACY_UI)
-    })
-
-    it('should handle null systemStats gracefully', () => {
-      vi.mocked(useSystemStatsStore).mockReturnValue({
-        systemStats: ref(null),
-        isInitialized: ref(true)
-      } as any)
-      vi.mocked(api.getClientFeatureFlags).mockReturnValue({
-        supports_manager_v4_ui: true
-      })
-      vi.mocked(api.getServerFeature).mockReturnValue(true)
-      vi.mocked(useFeatureFlags).mockReturnValue({
-        flags: { supportsManagerV4: true },
-        featureFlag: vi.fn()
-      } as any)
-      vi.mocked(useExtensionStore).mockReturnValue({
-        extensions: []
-      } as any)
-
-      const managerState = useManagerState()
-
-      // When systemStats is null, we can't check for --enable-manager flag, so manager is disabled
-      expect(managerState.managerUIState.value).toBe(ManagerUIState.DISABLED)
-    })
-  })
-
-  describe('helper properties', () => {
-    it('isManagerEnabled should return true when state is not DISABLED', () => {
-      vi.mocked(useSystemStatsStore).mockReturnValue({
-        systemStats: ref({
-          system: { argv: ['python', 'main.py', '--enable-manager'] }
-        }), // Need --enable-manager
-        isInitialized: ref(true)
-      } as any)
-      vi.mocked(api.getClientFeatureFlags).mockReturnValue({
-        supports_manager_v4_ui: true
-      })
-      vi.mocked(api.getServerFeature).mockReturnValue(true)
-      vi.mocked(useExtensionStore).mockReturnValue({
-        extensions: []
-      } as any)
-
-      const managerState = useManagerState()
-      expect(managerState.isManagerEnabled.value).toBe(true)
-    })
-
-    it('isManagerEnabled should return false when state is DISABLED', () => {
-      vi.mocked(useSystemStatsStore).mockReturnValue({
-        systemStats: ref({
-          system: { argv: ['python', 'main.py'] } // No --enable-manager flag means disabled
-        }),
-        isInitialized: ref(true)
-      } as any)
-      vi.mocked(api.getClientFeatureFlags).mockReturnValue({})
-      vi.mocked(useExtensionStore).mockReturnValue({
-        extensions: []
-      } as any)
-
-      const managerState = useManagerState()
-      expect(managerState.isManagerEnabled.value).toBe(false)
-    })
-
-    it('isNewManagerUI should return true when state is NEW_UI', () => {
-      vi.mocked(useSystemStatsStore).mockReturnValue({
-        systemStats: ref({
-          system: { argv: ['python', 'main.py', '--enable-manager'] }
-        }), // Need --enable-manager
-        isInitialized: ref(true)
-      } as any)
-      vi.mocked(api.getClientFeatureFlags).mockReturnValue({
-        supports_manager_v4_ui: true
-      })
-      vi.mocked(api.getServerFeature).mockReturnValue(true)
-      vi.mocked(useExtensionStore).mockReturnValue({
-        extensions: []
-      } as any)
-
-      const managerState = useManagerState()
-      expect(managerState.isNewManagerUI.value).toBe(true)
-    })
-
-    it('isLegacyManagerUI should return true when state is LEGACY_UI', () => {
-      vi.mocked(useSystemStatsStore).mockReturnValue({
-        systemStats: ref({
-          system: {
-            argv: [
-              'python',
-              'main.py',
-              '--enable-manager',
-              '--enable-manager-legacy-ui'
-            ]
-          } // Both flags needed
-        }),
-        isInitialized: ref(true)
-      } as any)
-      vi.mocked(api.getClientFeatureFlags).mockReturnValue({})
-      vi.mocked(useExtensionStore).mockReturnValue({
-        extensions: []
-      } as any)
-
-      const managerState = useManagerState()
-      expect(managerState.isLegacyManagerUI.value).toBe(true)
-    })
-
-    it('shouldShowInstallButton should return true only for NEW_UI', () => {
-      vi.mocked(useSystemStatsStore).mockReturnValue({
-        systemStats: ref({
-          system: { argv: ['python', 'main.py', '--enable-manager'] }
-        }), // Need --enable-manager
-        isInitialized: ref(true)
-      } as any)
-      vi.mocked(api.getClientFeatureFlags).mockReturnValue({
-        supports_manager_v4_ui: true
-      })
-      vi.mocked(api.getServerFeature).mockReturnValue(true)
-      vi.mocked(useExtensionStore).mockReturnValue({
-        extensions: []
-      } as any)
-
-      const managerState = useManagerState()
-      expect(managerState.shouldShowInstallButton.value).toBe(true)
-    })
-
-    it('shouldShowManagerButtons should return true when not DISABLED', () => {
-      vi.mocked(useSystemStatsStore).mockReturnValue({
-        systemStats: ref({
-          system: { argv: ['python', 'main.py', '--enable-manager'] }
-        }), // Need --enable-manager
-        isInitialized: ref(true)
-      } as any)
-      vi.mocked(api.getClientFeatureFlags).mockReturnValue({
-        supports_manager_v4_ui: true
-      })
-      vi.mocked(api.getServerFeature).mockReturnValue(true)
-      vi.mocked(useExtensionStore).mockReturnValue({
-        extensions: []
-      } as any)
-
-      const managerState = useManagerState()
-      expect(managerState.shouldShowManagerButtons.value).toBe(true)
-    })
-  })
-})
diff --git a/tests-ui/tests/composables/useResultGallery.test.ts b/tests-ui/tests/composables/useResultGallery.test.ts
deleted file mode 100644
index 21ab1462e6..0000000000
--- a/tests-ui/tests/composables/useResultGallery.test.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import { describe, it, expect } from 'vitest'
-
-import { useResultGallery } from '@/composables/queue/useResultGallery'
-import type { JobListItem } from '@/composables/queue/useJobList'
-
-type PreviewLike = { url: string; supportsPreview: boolean }
-
-const createPreview = (url: string, supportsPreview = true): PreviewLike => ({
-  url,
-  supportsPreview
-})
-
-const createTask = (preview?: PreviewLike) => ({
-  previewOutput: preview
-})
-
-const createJobItem = (id: string, preview?: PreviewLike): JobListItem =>
-  ({
-    id,
-    title: `Job ${id}`,
-    meta: '',
-    state: 'completed',
-    showClear: false,
-    taskRef: preview ? { previewOutput: preview } : undefined
-  }) as JobListItem
-
-describe('useResultGallery', () => {
-  it('collects only previewable outputs and preserves their order', () => {
-    const previewable = [createPreview('p-1'), createPreview('p-2')]
-    const tasks = [
-      createTask(previewable[0]),
-      createTask({ url: 'skip-me', supportsPreview: false }),
-      createTask(previewable[1]),
-      createTask()
-    ]
-
-    const { galleryItems, galleryActiveIndex, onViewItem } = useResultGallery(
-      () => tasks
-    )
-
-    onViewItem(createJobItem('job-1', previewable[0]))
-
-    expect(galleryItems.value).toEqual(previewable)
-    expect(galleryActiveIndex.value).toBe(0)
-  })
-
-  it('does not change state when there are no previewable tasks', () => {
-    const { galleryItems, galleryActiveIndex, onViewItem } = useResultGallery(
-      () => []
-    )
-
-    onViewItem(createJobItem('job-missing'))
-
-    expect(galleryItems.value).toEqual([])
-    expect(galleryActiveIndex.value).toBe(-1)
-  })
-
-  it('activates the index that matches the viewed preview URL', () => {
-    const previewable = [
-      createPreview('p-1'),
-      createPreview('p-2'),
-      createPreview('p-3')
-    ]
-    const tasks = previewable.map((preview) => createTask(preview))
-
-    const { galleryItems, galleryActiveIndex, onViewItem } = useResultGallery(
-      () => tasks
-    )
-
-    onViewItem(createJobItem('job-2', createPreview('p-2')))
-
-    expect(galleryItems.value).toEqual(previewable)
-    expect(galleryActiveIndex.value).toBe(1)
-  })
-
-  it('defaults to the first entry when the clicked job lacks a preview', () => {
-    const previewable = [createPreview('p-1'), createPreview('p-2')]
-    const tasks = previewable.map((preview) => createTask(preview))
-
-    const { galleryItems, galleryActiveIndex, onViewItem } = useResultGallery(
-      () => tasks
-    )
-
-    onViewItem(createJobItem('job-no-preview'))
-
-    expect(galleryItems.value).toEqual(previewable)
-    expect(galleryActiveIndex.value).toBe(0)
-  })
-
-  it('defaults to the first entry when no gallery item matches the preview URL', () => {
-    const previewable = [createPreview('p-1'), createPreview('p-2')]
-    const tasks = previewable.map((preview) => createTask(preview))
-
-    const { galleryItems, galleryActiveIndex, onViewItem } = useResultGallery(
-      () => tasks
-    )
-
-    onViewItem(createJobItem('job-mismatch', createPreview('missing')))
-
-    expect(galleryItems.value).toEqual(previewable)
-    expect(galleryActiveIndex.value).toBe(0)
-  })
-})
diff --git a/tests-ui/tests/composables/useTemplateFiltering.test.ts b/tests-ui/tests/composables/useTemplateFiltering.test.ts
deleted file mode 100644
index bb2bce269c..0000000000
--- a/tests-ui/tests/composables/useTemplateFiltering.test.ts
+++ /dev/null
@@ -1,261 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { nextTick, ref } from 'vue'
-
-import type { TemplateInfo } from '@/platform/workflow/templates/types/template'
-
-const defaultSettingStore = {
-  get: vi.fn((key: string) => {
-    switch (key) {
-      case 'Comfy.Templates.SelectedModels':
-      case 'Comfy.Templates.SelectedUseCases':
-      case 'Comfy.Templates.SelectedRunsOn':
-        return []
-      case 'Comfy.Templates.SortBy':
-        return 'newest'
-      default:
-        return undefined
-    }
-  }),
-  set: vi.fn().mockResolvedValue(undefined)
-}
-
-vi.mock('@/platform/settings/settingStore', () => ({
-  useSettingStore: vi.fn(() => defaultSettingStore)
-}))
-
-vi.mock('@/platform/telemetry', () => ({
-  useTelemetry: vi.fn(() => ({
-    trackTemplateFilterChanged: vi.fn()
-  }))
-}))
-
-const { useTemplateFiltering } =
-  await import('@/composables/useTemplateFiltering')
-
-describe('useTemplateFiltering', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  afterEach(() => {
-    vi.useRealTimers()
-  })
-
-  it('sorts templates by VRAM from low to high and pushes missing values last', () => {
-    const gb = (value: number) => value * 1024 ** 3
-
-    const templates = ref<TemplateInfo[]>([
-      {
-        name: 'missing-vram',
-        description: 'no vram value',
-        mediaType: 'image',
-        mediaSubtype: 'png'
-      },
-      {
-        name: 'highest-vram',
-        description: 'high usage',
-        mediaType: 'image',
-        mediaSubtype: 'png',
-        vram: gb(12)
-      },
-      {
-        name: 'mid-vram',
-        description: 'medium usage',
-        mediaType: 'image',
-        mediaSubtype: 'png',
-        vram: gb(7.5)
-      },
-      {
-        name: 'low-vram',
-        description: 'low usage',
-        mediaType: 'image',
-        mediaSubtype: 'png',
-        vram: gb(5)
-      },
-      {
-        name: 'zero-vram',
-        description: 'unknown usage',
-        mediaType: 'image',
-        mediaSubtype: 'png',
-        vram: 0
-      }
-    ])
-
-    const { sortBy, filteredTemplates } = useTemplateFiltering(templates)
-
-    sortBy.value = 'vram-low-to-high'
-
-    expect(filteredTemplates.value.map((template) => template.name)).toEqual([
-      'low-vram',
-      'mid-vram',
-      'highest-vram',
-      'missing-vram',
-      'zero-vram'
-    ])
-  })
-
-  it('filters by search text, models, tags, and license with debounce handling', async () => {
-    vi.useFakeTimers()
-
-    const templates = ref<TemplateInfo[]>([
-      {
-        name: 'api-template',
-        description: 'Enterprise API workflow for video',
-        mediaType: 'image',
-        mediaSubtype: 'png',
-        tags: ['API', 'Video'],
-        models: ['Flux'],
-        date: '2024-06-01',
-        vram: 15 * 1024 ** 3,
-        openSource: false
-      },
-      {
-        name: 'portrait-flow',
-        description: 'Portrait template tuned for SDXL',
-        mediaType: 'image',
-        mediaSubtype: 'png',
-        tags: ['Portrait'],
-        models: ['SDXL'],
-        date: '2024-05-15',
-        vram: 10 * 1024 ** 3
-      },
-      {
-        name: 'landscape-lite',
-        description: 'Lightweight landscape generator',
-        mediaType: 'image',
-        mediaSubtype: 'png',
-        tags: ['Landscape'],
-        models: ['SDXL', 'Flux'],
-        date: '2024-04-20'
-      }
-    ])
-
-    const {
-      searchQuery,
-      selectedModels,
-      selectedUseCases,
-      selectedRunsOn,
-      filteredTemplates,
-      availableModels,
-      availableUseCases,
-      availableRunsOn,
-      filteredCount,
-      totalCount,
-      removeUseCaseFilter,
-      resetFilters
-    } = useTemplateFiltering(templates)
-
-    expect(totalCount.value).toBe(3)
-    expect(availableModels.value).toEqual(['Flux', 'SDXL'])
-    expect(availableUseCases.value).toEqual([
-      'API',
-      'Landscape',
-      'Portrait',
-      'Video'
-    ])
-    expect(availableRunsOn.value).toEqual(['ComfyUI', 'External or Remote API'])
-
-    searchQuery.value = 'enterprise'
-    await nextTick()
-    await vi.runOnlyPendingTimersAsync()
-    await nextTick()
-    expect(filteredTemplates.value.map((template) => template.name)).toEqual([
-      'api-template'
-    ])
-
-    selectedRunsOn.value = ['External or Remote API']
-    await nextTick()
-    expect(filteredTemplates.value.map((template) => template.name)).toEqual([
-      'api-template'
-    ])
-
-    selectedModels.value = ['Flux']
-    await nextTick()
-    expect(filteredTemplates.value.map((template) => template.name)).toEqual([
-      'api-template'
-    ])
-
-    selectedUseCases.value = ['Video']
-    await nextTick()
-    expect(filteredTemplates.value.map((template) => template.name)).toEqual([
-      'api-template'
-    ])
-    expect(filteredCount.value).toBe(1)
-
-    removeUseCaseFilter('Video')
-    await nextTick()
-    expect(selectedUseCases.value).toHaveLength(0)
-
-    resetFilters()
-    await nextTick()
-    await vi.runOnlyPendingTimersAsync()
-    await nextTick()
-    expect(filteredTemplates.value.map((template) => template.name)).toEqual([
-      'api-template',
-      'portrait-flow',
-      'landscape-lite'
-    ])
-  })
-
-  it('supports alphabetical, newest, and size-based sorting options', async () => {
-    const templates = ref<TemplateInfo[]>([
-      {
-        name: 'zeta-extended',
-        description: 'older template',
-        mediaType: 'image',
-        mediaSubtype: 'png',
-        date: '2024-01-01',
-        size: 300
-      },
-      {
-        name: 'alpha-starter',
-        description: 'new template',
-        mediaType: 'image',
-        mediaSubtype: 'png',
-        date: '2024-07-01',
-        size: 100
-      },
-      {
-        name: 'beta-pro',
-        description: 'mid template',
-        mediaType: 'image',
-        mediaSubtype: 'png',
-        date: '2024-05-01',
-        size: 200
-      }
-    ])
-
-    const { sortBy, filteredTemplates } = useTemplateFiltering(templates)
-
-    // default is 'newest'
-    expect(filteredTemplates.value.map((template) => template.name)).toEqual([
-      'alpha-starter',
-      'beta-pro',
-      'zeta-extended'
-    ])
-
-    sortBy.value = 'alphabetical'
-    await nextTick()
-    expect(filteredTemplates.value.map((template) => template.name)).toEqual([
-      'alpha-starter',
-      'beta-pro',
-      'zeta-extended'
-    ])
-
-    sortBy.value = 'model-size-low-to-high'
-    await nextTick()
-    expect(filteredTemplates.value.map((template) => template.name)).toEqual([
-      'alpha-starter',
-      'beta-pro',
-      'zeta-extended'
-    ])
-
-    sortBy.value = 'default'
-    await nextTick()
-    expect(filteredTemplates.value.map((template) => template.name)).toEqual([
-      'zeta-extended',
-      'alpha-starter',
-      'beta-pro'
-    ])
-  })
-})
diff --git a/tests-ui/tests/litegraph.test.ts b/tests-ui/tests/litegraph.test.ts
deleted file mode 100644
index 068da2fb52..0000000000
--- a/tests-ui/tests/litegraph.test.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import { LGraph, LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph'
-
-function swapNodes(nodes: LGraphNode[]) {
-  const firstNode = nodes[0]
-  const lastNode = nodes[nodes.length - 1]
-  nodes[0] = lastNode
-  nodes[nodes.length - 1] = firstNode
-  return nodes
-}
-
-function createGraph(...nodes: LGraphNode[]) {
-  const graph = new LGraph()
-  nodes.forEach((node) => graph.add(node))
-  return graph
-}
-
-class DummyNode extends LGraphNode {
-  constructor() {
-    super('dummy')
-  }
-}
-
-describe('LGraph', () => {
-  it('should serialize deterministic node order', async () => {
-    LiteGraph.registerNodeType('dummy', DummyNode)
-    const node1 = new DummyNode()
-    const node2 = new DummyNode()
-    const graph = createGraph(node1, node2)
-
-    const result1 = graph.serialize({ sortNodes: true })
-    expect(result1.nodes).not.toHaveLength(0)
-    graph._nodes = swapNodes(graph.nodes)
-    const result2 = graph.serialize({ sortNodes: true })
-
-    expect(result1).toEqual(result2)
-  })
-})
diff --git a/tests-ui/tests/litegraph/README.md b/tests-ui/tests/litegraph/README.md
deleted file mode 100644
index eacc17a4ca..0000000000
--- a/tests-ui/tests/litegraph/README.md
+++ /dev/null
@@ -1,59 +0,0 @@
-# LiteGraph Tests
-
-This directory contains the test suite for the LiteGraph library.
-
-## Structure
-
-```
-litegraph/
-├── core/           # Core functionality tests (LGraph, LGraphNode, etc.)
-├── canvas/         # Canvas-related tests (rendering, interactions)
-├── infrastructure/ # Infrastructure tests (Rectangle, utilities)
-├── subgraph/       # Subgraph-specific tests
-├── utils/          # Utility function tests
-└── fixtures/       # Test helpers, fixtures, and assets
-```
-
-## Running Tests
-
-```bash
-# Run all litegraph tests
-pnpm test:unit -- tests-ui/tests/litegraph/
-
-# Run specific subdirectory
-pnpm test:unit -- tests-ui/tests/litegraph/core/
-
-# Run single test file
-pnpm test:unit -- tests-ui/tests/litegraph/core/LGraph.test.ts
-```
-
-## Migration Status
-
-These tests were migrated from `src/lib/litegraph/test/` to centralize test infrastructure. Currently, some tests are marked with `.skip` due to import/setup issues that need to be resolved.
-
-### TODO: Fix Skipped Tests
-
-The following test files have been temporarily disabled and need fixes:
-- Most subgraph tests (circular dependency issues)
-- Some core tests (missing test utilities)
-- Canvas tests (mock setup issues)
-
-See individual test files marked with `// TODO: Fix these tests after migration` for specific issues.
-
-## Writing New Tests
-
-1. Always import from the barrel export to avoid circular dependencies:
-   ```typescript
-   import { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph'
-   ```
-
-2. Use the test fixtures from `fixtures/` directory
-3. Follow existing patterns for test organization
-
-## Test Fixtures
-
-Test fixtures and helpers are located in the `fixtures/` directory:
-- `testExtensions.ts` - Custom vitest extensions
-- `subgraphHelpers.ts` - Helpers for creating test subgraphs
-- `subgraphFixtures.ts` - Common subgraph test scenarios
-- `assets/` - Test data files
\ No newline at end of file
diff --git a/tests-ui/tests/litegraph/core/LGraph.test.ts b/tests-ui/tests/litegraph/core/LGraph.test.ts
deleted file mode 100644
index 61d3da7344..0000000000
--- a/tests-ui/tests/litegraph/core/LGraph.test.ts
+++ /dev/null
@@ -1,192 +0,0 @@
-import { describe } from 'vitest'
-
-import { LGraph, LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph'
-
-import { test } from './fixtures/testExtensions'
-
-describe('LGraph', () => {
-  test('can be instantiated', ({ expect }) => {
-    // @ts-expect-error Intentional - extra holds any / all consumer data that should be serialised
-    const graph = new LGraph({ extra: 'TestGraph' })
-    expect(graph).toBeInstanceOf(LGraph)
-    expect(graph.extra).toBe('TestGraph')
-    expect(graph.extra).toBe('TestGraph')
-  })
-
-  test('is exactly the same type', async ({ expect }) => {
-    const directImport = await import('@/lib/litegraph/src/LGraph')
-    const entryPointImport = await import('@/lib/litegraph/src/litegraph')
-
-    expect(LiteGraph.LGraph).toBe(directImport.LGraph)
-    expect(LiteGraph.LGraph).toBe(entryPointImport.LGraph)
-  })
-
-  test('populates optional values', ({ expect, minimalSerialisableGraph }) => {
-    const dGraph = new LGraph(minimalSerialisableGraph)
-    expect(dGraph.links).toBeInstanceOf(Map)
-    expect(dGraph.nodes).toBeInstanceOf(Array)
-    expect(dGraph.groups).toBeInstanceOf(Array)
-  })
-
-  test('supports schema v0.4 graphs', ({ expect, oldSchemaGraph }) => {
-    const fromOldSchema = new LGraph(oldSchemaGraph)
-    expect(fromOldSchema).toMatchSnapshot('oldSchemaGraph')
-  })
-})
-
-describe('Floating Links / Reroutes', () => {
-  test('Floating reroute should be removed when node and link are removed', ({
-    expect,
-    floatingLinkGraph
-  }) => {
-    const graph = new LGraph(floatingLinkGraph)
-    expect(graph.nodes.length).toBe(1)
-    graph.remove(graph.nodes[0])
-    expect(graph.nodes.length).toBe(0)
-    expect(graph.links.size).toBe(0)
-    expect(graph.floatingLinks.size).toBe(0)
-    expect(graph.reroutes.size).toBe(0)
-  })
-
-  test('Can add reroute to existing link', ({ expect, linkedNodesGraph }) => {
-    const graph = new LGraph(linkedNodesGraph)
-    expect(graph.nodes.length).toBe(2)
-    expect(graph.links.size).toBe(1)
-    expect(graph.reroutes.size).toBe(0)
-
-    graph.createReroute([0, 0], graph.links.values().next().value!)
-    expect(graph.links.size).toBe(1)
-    expect(graph.reroutes.size).toBe(1)
-  })
-
-  test('Create floating reroute when one side of node is removed', ({
-    expect,
-    linkedNodesGraph
-  }) => {
-    const graph = new LGraph(linkedNodesGraph)
-    graph.createReroute([0, 0], graph.links.values().next().value!)
-    graph.remove(graph.nodes[0])
-
-    expect(graph.links.size).toBe(0)
-    expect(graph.floatingLinks.size).toBe(1)
-    expect(graph.reroutes.size).toBe(1)
-    expect(graph.reroutes.values().next().value!.floating).not.toBeUndefined()
-  })
-
-  test('Create floating reroute when one side of link is removed', ({
-    expect,
-    linkedNodesGraph
-  }) => {
-    const graph = new LGraph(linkedNodesGraph)
-    graph.createReroute([0, 0], graph.links.values().next().value!)
-    graph.nodes[0].disconnectOutput(0)
-
-    expect(graph.links.size).toBe(0)
-    expect(graph.floatingLinks.size).toBe(1)
-    expect(graph.reroutes.size).toBe(1)
-    expect(graph.reroutes.values().next().value!.floating).not.toBeUndefined()
-  })
-
-  test('Reroutes and branches should be retained when the input node is removed', ({
-    expect,
-    floatingBranchGraph: graph
-  }) => {
-    expect(graph.nodes.length).toBe(3)
-    graph.remove(graph.nodes[2])
-    expect(graph.nodes.length).toBe(2)
-    expect(graph.links.size).toBe(1)
-    expect(graph.floatingLinks.size).toBe(1)
-    expect(graph.reroutes.size).toBe(4)
-    graph.remove(graph.nodes[1])
-    expect(graph.nodes.length).toBe(1)
-    expect(graph.links.size).toBe(0)
-    expect(graph.floatingLinks.size).toBe(2)
-    expect(graph.reroutes.size).toBe(4)
-  })
-
-  test('Floating reroutes should be removed when neither input nor output is connected', ({
-    expect,
-    floatingBranchGraph: graph
-  }) => {
-    // Remove output node
-    graph.remove(graph.nodes[0])
-    expect(graph.nodes.length).toBe(2)
-    expect(graph.links.size).toBe(0)
-    expect(graph.floatingLinks.size).toBe(2)
-    // The original floating reroute should be removed
-    expect(graph.reroutes.size).toBe(3)
-    graph.remove(graph.nodes[0])
-    expect(graph.nodes.length).toBe(1)
-    expect(graph.links.size).toBe(0)
-    expect(graph.floatingLinks.size).toBe(1)
-    expect(graph.reroutes.size).toBe(3)
-    graph.remove(graph.nodes[0])
-    expect(graph.nodes.length).toBe(0)
-    expect(graph.links.size).toBe(0)
-    expect(graph.floatingLinks.size).toBe(0)
-    expect(graph.reroutes.size).toBe(0)
-  })
-})
-
-describe('Graph Clearing and Callbacks', () => {
-  test('clear() calls both node.onRemoved() and graph.onNodeRemoved()', ({
-    expect
-  }) => {
-    const graph = new LGraph()
-
-    // Create test nodes with onRemoved callbacks
-    const node1 = new LGraphNode('TestNode1')
-    const node2 = new LGraphNode('TestNode2')
-
-    // Add nodes to graph
-    graph.add(node1)
-    graph.add(node2)
-
-    // Track callback invocations
-    const nodeRemovedCallbacks = new Set<string>()
-    const graphRemovedCallbacks = new Set<string>()
-
-    // Set up node.onRemoved() callbacks
-    node1.onRemoved = () => {
-      nodeRemovedCallbacks.add(String(node1.id))
-    }
-    node2.onRemoved = () => {
-      nodeRemovedCallbacks.add(String(node2.id))
-    }
-
-    // Set up graph.onNodeRemoved() callback
-    graph.onNodeRemoved = (node) => {
-      graphRemovedCallbacks.add(String(node.id))
-    }
-
-    // Verify nodes are in graph before clearing
-    expect(graph.nodes.length).toBe(2)
-
-    // Clear the graph
-    graph.clear()
-
-    // Verify both types of callbacks were called
-    expect(nodeRemovedCallbacks).toContain(String(node1.id))
-    expect(nodeRemovedCallbacks).toContain(String(node2.id))
-    expect(graphRemovedCallbacks).toContain(String(node1.id))
-    expect(graphRemovedCallbacks).toContain(String(node2.id))
-
-    // Verify nodes were actually removed
-    expect(graph.nodes.length).toBe(0)
-  })
-})
-
-describe('Legacy LGraph Compatibility Layer', () => {
-  test('can be extended via prototype', ({ expect, minimalGraph }) => {
-    // @ts-expect-error Should always be an error.
-    LGraph.prototype.newMethod = function () {
-      return 'New method added via prototype'
-    }
-    // @ts-expect-error Should always be an error.
-    expect(minimalGraph.newMethod()).toBe('New method added via prototype')
-  })
-
-  test('is correctly assigned to LiteGraph', ({ expect }) => {
-    expect(LiteGraph.LGraph).toBe(LGraph)
-  })
-})
diff --git a/tests-ui/tests/litegraph/core/LGraphGroup.test.ts b/tests-ui/tests/litegraph/core/LGraphGroup.test.ts
deleted file mode 100644
index a50b332563..0000000000
--- a/tests-ui/tests/litegraph/core/LGraphGroup.test.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { describe, expect } from 'vitest'
-
-import { LGraphGroup } from '@/lib/litegraph/src/litegraph'
-
-import { test } from './fixtures/testExtensions'
-
-describe('LGraphGroup', () => {
-  test('serializes to the existing format', () => {
-    const link = new LGraphGroup('title', 929)
-    expect(link.serialize()).toMatchSnapshot('Basic')
-  })
-})
diff --git a/tests-ui/tests/litegraph/core/ToOutputRenderLink.test.ts b/tests-ui/tests/litegraph/core/ToOutputRenderLink.test.ts
deleted file mode 100644
index 7899f8924c..0000000000
--- a/tests-ui/tests/litegraph/core/ToOutputRenderLink.test.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-
-import { ToOutputRenderLink } from '@/lib/litegraph/src/litegraph'
-import { LinkDirection } from '@/lib/litegraph/src/litegraph'
-
-describe('ToOutputRenderLink', () => {
-  describe('connectToOutput', () => {
-    it('should return early if inputNode is null', () => {
-      // Setup
-      const mockNetwork = {}
-      const mockFromSlot = {}
-      const mockNode = {
-        id: 'test-id',
-        inputs: [mockFromSlot],
-        getInputPos: vi.fn().mockReturnValue([0, 0])
-      }
-
-      const renderLink = new ToOutputRenderLink(
-        mockNetwork as any,
-        mockNode as any,
-        mockFromSlot as any,
-        undefined,
-        LinkDirection.CENTER
-      )
-
-      // Override the node property to simulate null case
-      Object.defineProperty(renderLink, 'node', {
-        value: null
-      })
-
-      const mockTargetNode = {
-        connectSlots: vi.fn()
-      }
-      const mockEvents = {
-        dispatch: vi.fn()
-      }
-
-      // Act
-      renderLink.connectToOutput(
-        mockTargetNode as any,
-        {} as any,
-        mockEvents as any
-      )
-
-      // Assert
-      expect(mockTargetNode.connectSlots).not.toHaveBeenCalled()
-      expect(mockEvents.dispatch).not.toHaveBeenCalled()
-    })
-
-    it('should create connection and dispatch event when inputNode exists', () => {
-      // Setup
-      const mockNetwork = {}
-      const mockFromSlot = {}
-      const mockNode = {
-        id: 'test-id',
-        inputs: [mockFromSlot],
-        getInputPos: vi.fn().mockReturnValue([0, 0])
-      }
-
-      const renderLink = new ToOutputRenderLink(
-        mockNetwork as any,
-        mockNode as any,
-        mockFromSlot as any,
-        undefined,
-        LinkDirection.CENTER
-      )
-
-      const mockNewLink = { id: 'new-link' }
-      const mockTargetNode = {
-        connectSlots: vi.fn().mockReturnValue(mockNewLink)
-      }
-      const mockEvents = {
-        dispatch: vi.fn()
-      }
-
-      // Act
-      renderLink.connectToOutput(
-        mockTargetNode as any,
-        {} as any,
-        mockEvents as any
-      )
-
-      // Assert
-      expect(mockTargetNode.connectSlots).toHaveBeenCalledWith(
-        expect.anything(),
-        mockNode,
-        mockFromSlot,
-        undefined
-      )
-      expect(mockEvents.dispatch).toHaveBeenCalledWith(
-        'link-created',
-        mockNewLink
-      )
-    })
-  })
-})
diff --git a/tests-ui/tests/litegraph/core/__snapshots__/ConfigureGraph.test.ts.snap b/tests-ui/tests/litegraph/core/__snapshots__/ConfigureGraph.test.ts.snap
deleted file mode 100644
index 7e9cd555b9..0000000000
--- a/tests-ui/tests/litegraph/core/__snapshots__/ConfigureGraph.test.ts.snap
+++ /dev/null
@@ -1,331 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`LGraph configure() > LGraph matches previous snapshot (normal configure() usage) > configuredBasicGraph 1`] = `
-LGraph {
-  "_groups": [
-    LGraphGroup {
-      "_bounding": Float32Array [
-        20,
-        20,
-        1,
-        3,
-      ],
-      "_children": Set {},
-      "_nodes": [],
-      "_pos": Float32Array [
-        20,
-        20,
-      ],
-      "_size": Float32Array [
-        1,
-        3,
-      ],
-      "color": "#6029aa",
-      "flags": {},
-      "font": undefined,
-      "font_size": 14,
-      "graph": [Circular],
-      "id": 123,
-      "isPointInside": [Function],
-      "selected": undefined,
-      "setDirtyCanvas": [Function],
-      "title": "A group to test with",
-    },
-  ],
-  "_input_nodes": undefined,
-  "_last_trigger_time": undefined,
-  "_links": Map {},
-  "_nodes": [
-    LGraphNode {
-      "_collapsed_width": undefined,
-      "_level": undefined,
-      "_pos": Float32Array [
-        10,
-        10,
-      ],
-      "_posSize": Float32Array [
-        10,
-        10,
-        140,
-        60,
-      ],
-      "_relative_id": undefined,
-      "_shape": undefined,
-      "_size": Float32Array [
-        140,
-        60,
-      ],
-      "action_call": undefined,
-      "action_triggered": undefined,
-      "badgePosition": "top-left",
-      "badges": [],
-      "bgcolor": undefined,
-      "block_delete": undefined,
-      "boxcolor": undefined,
-      "clip_area": undefined,
-      "clonable": undefined,
-      "color": undefined,
-      "console": undefined,
-      "exec_version": undefined,
-      "execute_triggered": undefined,
-      "flags": {},
-      "freeWidgetSpace": undefined,
-      "gotFocusAt": undefined,
-      "graph": [Circular],
-      "has_errors": undefined,
-      "id": 1,
-      "ignore_remove": undefined,
-      "inputs": [],
-      "last_serialization": undefined,
-      "locked": undefined,
-      "lostFocusAt": undefined,
-      "mode": 0,
-      "mouseOver": undefined,
-      "onMouseDown": [Function],
-      "order": 0,
-      "outputs": [],
-      "progress": undefined,
-      "properties": {},
-      "properties_info": [],
-      "redraw_on_mouse": undefined,
-      "removable": undefined,
-      "resizable": undefined,
-      "selected": undefined,
-      "serialize_widgets": undefined,
-      "showAdvanced": undefined,
-      "strokeStyles": {
-        "error": [Function],
-        "selected": [Function],
-      },
-      "title": "LGraphNode",
-      "title_buttons": [],
-      "type": "mustBeSet",
-      "widgets": undefined,
-      "widgets_start_y": undefined,
-      "widgets_up": undefined,
-    },
-  ],
-  "_nodes_by_id": {
-    "1": LGraphNode {
-      "_collapsed_width": undefined,
-      "_level": undefined,
-      "_pos": Float32Array [
-        10,
-        10,
-      ],
-      "_posSize": Float32Array [
-        10,
-        10,
-        140,
-        60,
-      ],
-      "_relative_id": undefined,
-      "_shape": undefined,
-      "_size": Float32Array [
-        140,
-        60,
-      ],
-      "action_call": undefined,
-      "action_triggered": undefined,
-      "badgePosition": "top-left",
-      "badges": [],
-      "bgcolor": undefined,
-      "block_delete": undefined,
-      "boxcolor": undefined,
-      "clip_area": undefined,
-      "clonable": undefined,
-      "color": undefined,
-      "console": undefined,
-      "exec_version": undefined,
-      "execute_triggered": undefined,
-      "flags": {},
-      "freeWidgetSpace": undefined,
-      "gotFocusAt": undefined,
-      "graph": [Circular],
-      "has_errors": undefined,
-      "id": 1,
-      "ignore_remove": undefined,
-      "inputs": [],
-      "last_serialization": undefined,
-      "locked": undefined,
-      "lostFocusAt": undefined,
-      "mode": 0,
-      "mouseOver": undefined,
-      "onMouseDown": [Function],
-      "order": 0,
-      "outputs": [],
-      "progress": undefined,
-      "properties": {},
-      "properties_info": [],
-      "redraw_on_mouse": undefined,
-      "removable": undefined,
-      "resizable": undefined,
-      "selected": undefined,
-      "serialize_widgets": undefined,
-      "showAdvanced": undefined,
-      "strokeStyles": {
-        "error": [Function],
-        "selected": [Function],
-      },
-      "title": "LGraphNode",
-      "title_buttons": [],
-      "type": "mustBeSet",
-      "widgets": undefined,
-      "widgets_start_y": undefined,
-      "widgets_up": undefined,
-    },
-  },
-  "_nodes_executable": [],
-  "_nodes_in_order": [
-    LGraphNode {
-      "_collapsed_width": undefined,
-      "_level": undefined,
-      "_pos": Float32Array [
-        10,
-        10,
-      ],
-      "_posSize": Float32Array [
-        10,
-        10,
-        140,
-        60,
-      ],
-      "_relative_id": undefined,
-      "_shape": undefined,
-      "_size": Float32Array [
-        140,
-        60,
-      ],
-      "action_call": undefined,
-      "action_triggered": undefined,
-      "badgePosition": "top-left",
-      "badges": [],
-      "bgcolor": undefined,
-      "block_delete": undefined,
-      "boxcolor": undefined,
-      "clip_area": undefined,
-      "clonable": undefined,
-      "color": undefined,
-      "console": undefined,
-      "exec_version": undefined,
-      "execute_triggered": undefined,
-      "flags": {},
-      "freeWidgetSpace": undefined,
-      "gotFocusAt": undefined,
-      "graph": [Circular],
-      "has_errors": undefined,
-      "id": 1,
-      "ignore_remove": undefined,
-      "inputs": [],
-      "last_serialization": undefined,
-      "locked": undefined,
-      "lostFocusAt": undefined,
-      "mode": 0,
-      "mouseOver": undefined,
-      "onMouseDown": [Function],
-      "order": 0,
-      "outputs": [],
-      "progress": undefined,
-      "properties": {},
-      "properties_info": [],
-      "redraw_on_mouse": undefined,
-      "removable": undefined,
-      "resizable": undefined,
-      "selected": undefined,
-      "serialize_widgets": undefined,
-      "showAdvanced": undefined,
-      "strokeStyles": {
-        "error": [Function],
-        "selected": [Function],
-      },
-      "title": "LGraphNode",
-      "title_buttons": [],
-      "type": "mustBeSet",
-      "widgets": undefined,
-      "widgets_start_y": undefined,
-      "widgets_up": undefined,
-    },
-  ],
-  "_subgraphs": Map {},
-  "_version": 3,
-  "catch_errors": true,
-  "config": {},
-  "elapsed_time": 0.01,
-  "errors_in_execution": undefined,
-  "events": CustomEventTarget {},
-  "execution_time": undefined,
-  "execution_timer_id": undefined,
-  "extra": {},
-  "filter": undefined,
-  "fixedtime": 0,
-  "fixedtime_lapse": 0.01,
-  "globaltime": 0,
-  "id": "ca9da7d8-fddd-4707-ad32-67be9be13140",
-  "iteration": 0,
-  "last_update_time": 0,
-  "links": Map {},
-  "list_of_graphcanvas": null,
-  "nodes_actioning": [],
-  "nodes_executedAction": [],
-  "nodes_executing": [],
-  "revision": 0,
-  "runningtime": 0,
-  "starttime": 0,
-  "state": {
-    "lastGroupId": 123,
-    "lastLinkId": 0,
-    "lastNodeId": 1,
-    "lastRerouteId": 0,
-  },
-  "status": 1,
-  "vars": {},
-  "version": 1,
-}
-`;
-
-exports[`LGraph configure() > LGraph matches previous snapshot (normal configure() usage) > configuredMinGraph 1`] = `
-LGraph {
-  "_groups": [],
-  "_input_nodes": undefined,
-  "_last_trigger_time": undefined,
-  "_links": Map {},
-  "_nodes": [],
-  "_nodes_by_id": {},
-  "_nodes_executable": [],
-  "_nodes_in_order": [],
-  "_subgraphs": Map {},
-  "_version": 0,
-  "catch_errors": true,
-  "config": {},
-  "elapsed_time": 0.01,
-  "errors_in_execution": undefined,
-  "events": CustomEventTarget {},
-  "execution_time": undefined,
-  "execution_timer_id": undefined,
-  "extra": {},
-  "filter": undefined,
-  "fixedtime": 0,
-  "fixedtime_lapse": 0.01,
-  "globaltime": 0,
-  "id": "d175890f-716a-4ece-ba33-1d17a513b7be",
-  "iteration": 0,
-  "last_update_time": 0,
-  "links": Map {},
-  "list_of_graphcanvas": null,
-  "nodes_actioning": [],
-  "nodes_executedAction": [],
-  "nodes_executing": [],
-  "revision": 0,
-  "runningtime": 0,
-  "starttime": 0,
-  "state": {
-    "lastGroupId": 0,
-    "lastLinkId": 0,
-    "lastNodeId": 0,
-    "lastRerouteId": 0,
-  },
-  "status": 1,
-  "vars": {},
-  "version": 1,
-}
-`;
diff --git a/tests-ui/tests/litegraph/core/__snapshots__/LGraph.test.ts.snap b/tests-ui/tests/litegraph/core/__snapshots__/LGraph.test.ts.snap
deleted file mode 100644
index 1a92319bb7..0000000000
--- a/tests-ui/tests/litegraph/core/__snapshots__/LGraph.test.ts.snap
+++ /dev/null
@@ -1,302 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`LGraph > supports schema v0.4 graphs > oldSchemaGraph 1`] = `
-LGraph {
-  "_groups": [
-    LGraphGroup {
-      "_bounding": Rectangle [
-        20,
-        20,
-        1,
-        3,
-      ],
-      "_children": Set {},
-      "_nodes": [],
-      "_pos": Float64Array [
-        20,
-        20,
-      ],
-      "_size": Float64Array [
-        1,
-        3,
-      ],
-      "color": "#6029aa",
-      "flags": {},
-      "font": undefined,
-      "font_size": 14,
-      "graph": [Circular],
-      "id": 123,
-      "isPointInside": [Function],
-      "selected": undefined,
-      "setDirtyCanvas": [Function],
-      "title": "A group to test with",
-    },
-  ],
-  "_input_nodes": undefined,
-  "_last_trigger_time": undefined,
-  "_links": Map {},
-  "_nodes": [
-    LGraphNode {
-      "_collapsed_width": undefined,
-      "_level": undefined,
-      "_pos": Float64Array [
-        10,
-        10,
-      ],
-      "_posSize": Rectangle [
-        10,
-        10,
-        140,
-        60,
-      ],
-      "_relative_id": undefined,
-      "_shape": undefined,
-      "_size": Float64Array [
-        140,
-        60,
-      ],
-      "action_call": undefined,
-      "action_triggered": undefined,
-      "badgePosition": "top-left",
-      "badges": [],
-      "bgcolor": undefined,
-      "block_delete": undefined,
-      "boxcolor": undefined,
-      "changeTracker": undefined,
-      "clip_area": undefined,
-      "clonable": undefined,
-      "color": undefined,
-      "console": undefined,
-      "exec_version": undefined,
-      "execute_triggered": undefined,
-      "flags": {},
-      "freeWidgetSpace": undefined,
-      "gotFocusAt": undefined,
-      "graph": [Circular],
-      "has_errors": true,
-      "id": 1,
-      "ignore_remove": undefined,
-      "inputs": [],
-      "last_serialization": {
-        "id": 1,
-      },
-      "locked": undefined,
-      "lostFocusAt": undefined,
-      "mode": 0,
-      "mouseOver": undefined,
-      "order": 0,
-      "outputs": [],
-      "progress": undefined,
-      "properties": {},
-      "properties_info": [],
-      "redraw_on_mouse": undefined,
-      "removable": undefined,
-      "resizable": undefined,
-      "selected": undefined,
-      "serialize_widgets": undefined,
-      "showAdvanced": undefined,
-      "strokeStyles": {
-        "error": [Function],
-        "selected": [Function],
-      },
-      "title": undefined,
-      "title_buttons": [],
-      "type": "",
-      "widgets": undefined,
-      "widgets_start_y": undefined,
-      "widgets_up": undefined,
-    },
-  ],
-  "_nodes_by_id": {
-    "1": LGraphNode {
-      "_collapsed_width": undefined,
-      "_level": undefined,
-      "_pos": Float64Array [
-        10,
-        10,
-      ],
-      "_posSize": Rectangle [
-        10,
-        10,
-        140,
-        60,
-      ],
-      "_relative_id": undefined,
-      "_shape": undefined,
-      "_size": Float64Array [
-        140,
-        60,
-      ],
-      "action_call": undefined,
-      "action_triggered": undefined,
-      "badgePosition": "top-left",
-      "badges": [],
-      "bgcolor": undefined,
-      "block_delete": undefined,
-      "boxcolor": undefined,
-      "changeTracker": undefined,
-      "clip_area": undefined,
-      "clonable": undefined,
-      "color": undefined,
-      "console": undefined,
-      "exec_version": undefined,
-      "execute_triggered": undefined,
-      "flags": {},
-      "freeWidgetSpace": undefined,
-      "gotFocusAt": undefined,
-      "graph": [Circular],
-      "has_errors": true,
-      "id": 1,
-      "ignore_remove": undefined,
-      "inputs": [],
-      "last_serialization": {
-        "id": 1,
-      },
-      "locked": undefined,
-      "lostFocusAt": undefined,
-      "mode": 0,
-      "mouseOver": undefined,
-      "order": 0,
-      "outputs": [],
-      "progress": undefined,
-      "properties": {},
-      "properties_info": [],
-      "redraw_on_mouse": undefined,
-      "removable": undefined,
-      "resizable": undefined,
-      "selected": undefined,
-      "serialize_widgets": undefined,
-      "showAdvanced": undefined,
-      "strokeStyles": {
-        "error": [Function],
-        "selected": [Function],
-      },
-      "title": undefined,
-      "title_buttons": [],
-      "type": "",
-      "widgets": undefined,
-      "widgets_start_y": undefined,
-      "widgets_up": undefined,
-    },
-  },
-  "_nodes_executable": [],
-  "_nodes_in_order": [
-    LGraphNode {
-      "_collapsed_width": undefined,
-      "_level": undefined,
-      "_pos": Float64Array [
-        10,
-        10,
-      ],
-      "_posSize": Rectangle [
-        10,
-        10,
-        140,
-        60,
-      ],
-      "_relative_id": undefined,
-      "_shape": undefined,
-      "_size": Float64Array [
-        140,
-        60,
-      ],
-      "action_call": undefined,
-      "action_triggered": undefined,
-      "badgePosition": "top-left",
-      "badges": [],
-      "bgcolor": undefined,
-      "block_delete": undefined,
-      "boxcolor": undefined,
-      "changeTracker": undefined,
-      "clip_area": undefined,
-      "clonable": undefined,
-      "color": undefined,
-      "console": undefined,
-      "exec_version": undefined,
-      "execute_triggered": undefined,
-      "flags": {},
-      "freeWidgetSpace": undefined,
-      "gotFocusAt": undefined,
-      "graph": [Circular],
-      "has_errors": true,
-      "id": 1,
-      "ignore_remove": undefined,
-      "inputs": [],
-      "last_serialization": {
-        "id": 1,
-      },
-      "locked": undefined,
-      "lostFocusAt": undefined,
-      "mode": 0,
-      "mouseOver": undefined,
-      "order": 0,
-      "outputs": [],
-      "progress": undefined,
-      "properties": {},
-      "properties_info": [],
-      "redraw_on_mouse": undefined,
-      "removable": undefined,
-      "resizable": undefined,
-      "selected": undefined,
-      "serialize_widgets": undefined,
-      "showAdvanced": undefined,
-      "strokeStyles": {
-        "error": [Function],
-        "selected": [Function],
-      },
-      "title": undefined,
-      "title_buttons": [],
-      "type": "",
-      "widgets": undefined,
-      "widgets_start_y": undefined,
-      "widgets_up": undefined,
-    },
-  ],
-  "_subgraphs": Map {},
-  "_version": 3,
-  "catch_errors": true,
-  "config": {},
-  "elapsed_time": 0.01,
-  "errors_in_execution": undefined,
-  "events": CustomEventTarget {
-    Symbol(listeners): {
-      "bubbling": Map {},
-      "capturing": Map {},
-    },
-    Symbol(listenerOptions): {
-      "bubbling": Map {},
-      "capturing": Map {},
-    },
-  },
-  "execution_time": undefined,
-  "execution_timer_id": undefined,
-  "extra": {},
-  "filter": undefined,
-  "fixedtime": 0,
-  "fixedtime_lapse": 0.01,
-  "floatingLinksInternal": Map {},
-  "globaltime": 0,
-  "id": "b4e984f1-b421-4d24-b8b4-ff895793af13",
-  "iteration": 0,
-  "last_update_time": 0,
-  "links": Map {},
-  "list_of_graphcanvas": null,
-  "nodes_actioning": [],
-  "nodes_executedAction": [],
-  "nodes_executing": [],
-  "onTrigger": undefined,
-  "reroutesInternal": Map {},
-  "revision": 0,
-  "runningtime": 0,
-  "starttime": 0,
-  "state": {
-    "lastGroupId": 123,
-    "lastLinkId": 0,
-    "lastNodeId": 1,
-    "lastRerouteId": 0,
-  },
-  "status": 1,
-  "vars": {},
-  "version": 0.4,
-}
-`;
diff --git a/tests-ui/tests/litegraph/core/__snapshots__/LGraph_constructor.test.ts.snap b/tests-ui/tests/litegraph/core/__snapshots__/LGraph_constructor.test.ts.snap
deleted file mode 100644
index cd54aa0949..0000000000
--- a/tests-ui/tests/litegraph/core/__snapshots__/LGraph_constructor.test.ts.snap
+++ /dev/null
@@ -1,331 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`LGraph (constructor only) > Matches previous snapshot > basicLGraph 1`] = `
-LGraph {
-  "_groups": [
-    LGraphGroup {
-      "_bounding": Float32Array [
-        20,
-        20,
-        1,
-        3,
-      ],
-      "_children": Set {},
-      "_nodes": [],
-      "_pos": Float32Array [
-        20,
-        20,
-      ],
-      "_size": Float32Array [
-        1,
-        3,
-      ],
-      "color": "#6029aa",
-      "flags": {},
-      "font": undefined,
-      "font_size": 14,
-      "graph": [Circular],
-      "id": 123,
-      "isPointInside": [Function],
-      "selected": undefined,
-      "setDirtyCanvas": [Function],
-      "title": "A group to test with",
-    },
-  ],
-  "_input_nodes": undefined,
-  "_last_trigger_time": undefined,
-  "_links": Map {},
-  "_nodes": [
-    LGraphNode {
-      "_collapsed_width": undefined,
-      "_level": undefined,
-      "_pos": Float32Array [
-        10,
-        10,
-      ],
-      "_posSize": Float32Array [
-        10,
-        10,
-        140,
-        60,
-      ],
-      "_relative_id": undefined,
-      "_shape": undefined,
-      "_size": Float32Array [
-        140,
-        60,
-      ],
-      "action_call": undefined,
-      "action_triggered": undefined,
-      "badgePosition": "top-left",
-      "badges": [],
-      "bgcolor": undefined,
-      "block_delete": undefined,
-      "boxcolor": undefined,
-      "clip_area": undefined,
-      "clonable": undefined,
-      "color": undefined,
-      "console": undefined,
-      "exec_version": undefined,
-      "execute_triggered": undefined,
-      "flags": {},
-      "freeWidgetSpace": undefined,
-      "gotFocusAt": undefined,
-      "graph": [Circular],
-      "has_errors": undefined,
-      "id": 1,
-      "ignore_remove": undefined,
-      "inputs": [],
-      "last_serialization": undefined,
-      "locked": undefined,
-      "lostFocusAt": undefined,
-      "mode": 0,
-      "mouseOver": undefined,
-      "onMouseDown": [Function],
-      "order": 0,
-      "outputs": [],
-      "progress": undefined,
-      "properties": {},
-      "properties_info": [],
-      "redraw_on_mouse": undefined,
-      "removable": undefined,
-      "resizable": undefined,
-      "selected": undefined,
-      "serialize_widgets": undefined,
-      "showAdvanced": undefined,
-      "strokeStyles": {
-        "error": [Function],
-        "selected": [Function],
-      },
-      "title": "LGraphNode",
-      "title_buttons": [],
-      "type": "mustBeSet",
-      "widgets": undefined,
-      "widgets_start_y": undefined,
-      "widgets_up": undefined,
-    },
-  ],
-  "_nodes_by_id": {
-    "1": LGraphNode {
-      "_collapsed_width": undefined,
-      "_level": undefined,
-      "_pos": Float32Array [
-        10,
-        10,
-      ],
-      "_posSize": Float32Array [
-        10,
-        10,
-        140,
-        60,
-      ],
-      "_relative_id": undefined,
-      "_shape": undefined,
-      "_size": Float32Array [
-        140,
-        60,
-      ],
-      "action_call": undefined,
-      "action_triggered": undefined,
-      "badgePosition": "top-left",
-      "badges": [],
-      "bgcolor": undefined,
-      "block_delete": undefined,
-      "boxcolor": undefined,
-      "clip_area": undefined,
-      "clonable": undefined,
-      "color": undefined,
-      "console": undefined,
-      "exec_version": undefined,
-      "execute_triggered": undefined,
-      "flags": {},
-      "freeWidgetSpace": undefined,
-      "gotFocusAt": undefined,
-      "graph": [Circular],
-      "has_errors": undefined,
-      "id": 1,
-      "ignore_remove": undefined,
-      "inputs": [],
-      "last_serialization": undefined,
-      "locked": undefined,
-      "lostFocusAt": undefined,
-      "mode": 0,
-      "mouseOver": undefined,
-      "onMouseDown": [Function],
-      "order": 0,
-      "outputs": [],
-      "progress": undefined,
-      "properties": {},
-      "properties_info": [],
-      "redraw_on_mouse": undefined,
-      "removable": undefined,
-      "resizable": undefined,
-      "selected": undefined,
-      "serialize_widgets": undefined,
-      "showAdvanced": undefined,
-      "strokeStyles": {
-        "error": [Function],
-        "selected": [Function],
-      },
-      "title": "LGraphNode",
-      "title_buttons": [],
-      "type": "mustBeSet",
-      "widgets": undefined,
-      "widgets_start_y": undefined,
-      "widgets_up": undefined,
-    },
-  },
-  "_nodes_executable": [],
-  "_nodes_in_order": [
-    LGraphNode {
-      "_collapsed_width": undefined,
-      "_level": undefined,
-      "_pos": Float32Array [
-        10,
-        10,
-      ],
-      "_posSize": Float32Array [
-        10,
-        10,
-        140,
-        60,
-      ],
-      "_relative_id": undefined,
-      "_shape": undefined,
-      "_size": Float32Array [
-        140,
-        60,
-      ],
-      "action_call": undefined,
-      "action_triggered": undefined,
-      "badgePosition": "top-left",
-      "badges": [],
-      "bgcolor": undefined,
-      "block_delete": undefined,
-      "boxcolor": undefined,
-      "clip_area": undefined,
-      "clonable": undefined,
-      "color": undefined,
-      "console": undefined,
-      "exec_version": undefined,
-      "execute_triggered": undefined,
-      "flags": {},
-      "freeWidgetSpace": undefined,
-      "gotFocusAt": undefined,
-      "graph": [Circular],
-      "has_errors": undefined,
-      "id": 1,
-      "ignore_remove": undefined,
-      "inputs": [],
-      "last_serialization": undefined,
-      "locked": undefined,
-      "lostFocusAt": undefined,
-      "mode": 0,
-      "mouseOver": undefined,
-      "onMouseDown": [Function],
-      "order": 0,
-      "outputs": [],
-      "progress": undefined,
-      "properties": {},
-      "properties_info": [],
-      "redraw_on_mouse": undefined,
-      "removable": undefined,
-      "resizable": undefined,
-      "selected": undefined,
-      "serialize_widgets": undefined,
-      "showAdvanced": undefined,
-      "strokeStyles": {
-        "error": [Function],
-        "selected": [Function],
-      },
-      "title": "LGraphNode",
-      "title_buttons": [],
-      "type": "mustBeSet",
-      "widgets": undefined,
-      "widgets_start_y": undefined,
-      "widgets_up": undefined,
-    },
-  ],
-  "_subgraphs": Map {},
-  "_version": 3,
-  "catch_errors": true,
-  "config": {},
-  "elapsed_time": 0.01,
-  "errors_in_execution": undefined,
-  "events": CustomEventTarget {},
-  "execution_time": undefined,
-  "execution_timer_id": undefined,
-  "extra": {},
-  "filter": undefined,
-  "fixedtime": 0,
-  "fixedtime_lapse": 0.01,
-  "globaltime": 0,
-  "id": "ca9da7d8-fddd-4707-ad32-67be9be13140",
-  "iteration": 0,
-  "last_update_time": 0,
-  "links": Map {},
-  "list_of_graphcanvas": null,
-  "nodes_actioning": [],
-  "nodes_executedAction": [],
-  "nodes_executing": [],
-  "revision": 0,
-  "runningtime": 0,
-  "starttime": 0,
-  "state": {
-    "lastGroupId": 123,
-    "lastLinkId": 0,
-    "lastNodeId": 1,
-    "lastRerouteId": 0,
-  },
-  "status": 1,
-  "vars": {},
-  "version": 1,
-}
-`;
-
-exports[`LGraph (constructor only) > Matches previous snapshot > minLGraph 1`] = `
-LGraph {
-  "_groups": [],
-  "_input_nodes": undefined,
-  "_last_trigger_time": undefined,
-  "_links": Map {},
-  "_nodes": [],
-  "_nodes_by_id": {},
-  "_nodes_executable": [],
-  "_nodes_in_order": [],
-  "_subgraphs": Map {},
-  "_version": 0,
-  "catch_errors": true,
-  "config": {},
-  "elapsed_time": 0.01,
-  "errors_in_execution": undefined,
-  "events": CustomEventTarget {},
-  "execution_time": undefined,
-  "execution_timer_id": undefined,
-  "extra": {},
-  "filter": undefined,
-  "fixedtime": 0,
-  "fixedtime_lapse": 0.01,
-  "globaltime": 0,
-  "id": "d175890f-716a-4ece-ba33-1d17a513b7be",
-  "iteration": 0,
-  "last_update_time": 0,
-  "links": Map {},
-  "list_of_graphcanvas": null,
-  "nodes_actioning": [],
-  "nodes_executedAction": [],
-  "nodes_executing": [],
-  "revision": 0,
-  "runningtime": 0,
-  "starttime": 0,
-  "state": {
-    "lastGroupId": 0,
-    "lastLinkId": 0,
-    "lastNodeId": 0,
-    "lastRerouteId": 0,
-  },
-  "status": 1,
-  "vars": {},
-  "version": 1,
-}
-`;
diff --git a/tests-ui/tests/litegraph/core/fixtures/assets/reroutesComplex.json b/tests-ui/tests/litegraph/core/fixtures/assets/reroutesComplex.json
deleted file mode 100644
index 941228baf0..0000000000
--- a/tests-ui/tests/litegraph/core/fixtures/assets/reroutesComplex.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id":"e5ffd5e1-1c01-45ac-90dd-b7d83a206b0f","revision":0,"last_node_id":9,"last_link_id":12,"nodes":[{"id":3,"type":"InvertMask","pos":[390,270],"size":[140,26],"flags":{},"order":8,"mode":0,"inputs":[{"localized_name":"mask","name":"mask","type":"MASK","link":3}],"outputs":[{"localized_name":"MASK","name":"MASK","type":"MASK","links":null}],"properties":{"Node name for S&R":"InvertMask"},"widgets_values":[]},{"id":7,"type":"InvertMask","pos":[390,560],"size":[140,26],"flags":{},"order":4,"mode":0,"inputs":[{"localized_name":"mask","name":"mask","type":"MASK","link":10}],"outputs":[{"localized_name":"MASK","name":"MASK","type":"MASK","links":null}],"properties":{"Node name for S&R":"InvertMask"},"widgets_values":[]},{"id":8,"type":"InvertMask","pos":[390,640],"size":[140,26],"flags":{},"order":3,"mode":0,"inputs":[{"localized_name":"mask","name":"mask","type":"MASK","link":9}],"outputs":[{"localized_name":"MASK","name":"MASK","type":"MASK","links":null}],"properties":{"Node name for S&R":"InvertMask"},"widgets_values":[]},{"id":5,"type":"InvertMask","pos":[390,480],"size":[140,26],"flags":{"collapsed":false},"order":5,"mode":0,"inputs":[{"localized_name":"mask","name":"mask","type":"MASK","link":11}],"outputs":[{"localized_name":"MASK","name":"MASK","type":"MASK","links":null}],"properties":{"Node name for S&R":"InvertMask"},"widgets_values":[]},{"id":6,"type":"InvertMask","pos":[390,400],"size":[140,26],"flags":{},"order":6,"mode":0,"inputs":[{"localized_name":"mask","name":"mask","type":"MASK","link":12}],"outputs":[{"localized_name":"MASK","name":"MASK","type":"MASK","links":null}],"properties":{"Node name for S&R":"InvertMask"},"widgets_values":[]},{"id":4,"type":"InvertMask","pos":[50,640],"size":[140,26],"flags":{},"order":0,"mode":0,"inputs":[{"localized_name":"mask","name":"mask","type":"MASK","link":null}],"outputs":[{"localized_name":"MASK","name":"MASK","type":"MASK","links":[9,10,11,12]}],"properties":{"Node name for S&R":"InvertMask"},"widgets_values":[]},{"id":2,"type":"InvertMask","pos":[390,180],"size":[140,26],"flags":{},"order":7,"mode":0,"inputs":[{"localized_name":"mask","name":"mask","type":"MASK","link":2}],"outputs":[{"localized_name":"MASK","name":"MASK","type":"MASK","links":null}],"properties":{"Node name for S&R":"InvertMask"},"widgets_values":[]},{"id":1,"type":"InvertMask","pos":[50,170],"size":[140,26],"flags":{},"order":2,"mode":0,"inputs":[{"localized_name":"mask","name":"mask","type":"MASK","link":null}],"outputs":[{"localized_name":"MASK","name":"MASK","type":"MASK","links":[2,3]}],"properties":{"Node name for S&R":"InvertMask"},"widgets_values":[]},{"id":9,"type":"InvertMask","pos":[50,410],"size":[140,26],"flags":{},"order":1,"mode":0,"inputs":[{"localized_name":"mask","name":"mask","type":"MASK","link":null}],"outputs":[{"localized_name":"MASK","name":"MASK","type":"MASK","links":[]}],"properties":{"Node name for S&R":"InvertMask"},"widgets_values":[]}],"links":[[2,1,0,2,0,"MASK"],[3,1,0,3,0,"MASK"],[9,4,0,8,0,"MASK"],[10,4,0,7,0,"MASK"],[11,4,0,5,0,"MASK"],[12,4,0,6,0,"MASK"]],"floatingLinks":[{"id":6,"origin_id":1,"origin_slot":0,"target_id":-1,"target_slot":-1,"type":"MASK","parentId":1}],"groups":[],"config":{},"extra":{"ds":{"scale":1,"offset":[0,0]},"linkExtensions":[{"id":2,"parentId":3},{"id":3,"parentId":3},{"id":9,"parentId":12},{"id":10,"parentId":15},{"id":11,"parentId":7},{"id":12,"parentId":7}],"reroutes":[{"id":1,"parentId":2,"pos":[340,160],"linkIds":[],"floating":{"slotType":"output"}},{"id":2,"parentId":4,"pos":[290,190],"linkIds":[2,3]},{"id":3,"parentId":2,"pos":[350,220],"linkIds":[2,3]},{"id":4,"pos":[250,190],"linkIds":[2,3]},{"id":6,"parentId":8,"pos":[300,450],"linkIds":[11,12]},{"id":7,"parentId":6,"pos":[350,450],"linkIds":[11,12]},{"id":8,"parentId":13,"pos":[250,450],"linkIds":[11,12]},{"id":10,"pos":[250,650],"linkIds":[9,10,11,12]},{"id":11,"parentId":10,"pos":[300,650],"linkIds":[9]},{"id":12,"parentId":11,"pos":[350,650],"linkIds":[9]},{"id":13,"parentId":10,"pos":[250,570],"linkIds":[10,11,12]},{"id":14,"parentId":13,"pos":[300,570],"linkIds":[10]},{"id":15,"parentId":14,"pos":[350,570],"linkIds":[10]}]},"version":0.4}
\ No newline at end of file
diff --git a/tests-ui/tests/litegraph/core/litegraph.test.ts b/tests-ui/tests/litegraph/core/litegraph.test.ts
deleted file mode 100644
index cc58100fa7..0000000000
--- a/tests-ui/tests/litegraph/core/litegraph.test.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { clamp } from 'es-toolkit/compat'
-import { beforeEach, describe, expect, vi } from 'vitest'
-
-import { LiteGraphGlobal } from '@/lib/litegraph/src/litegraph'
-import { LGraphCanvas, LiteGraph } from '@/lib/litegraph/src/litegraph'
-
-import { test } from './fixtures/testExtensions'
-
-describe('Litegraph module', () => {
-  test('contains a global export', ({ expect }) => {
-    expect(LiteGraph).toBeInstanceOf(LiteGraphGlobal)
-    expect(LiteGraph.LGraphCanvas).toBe(LGraphCanvas)
-  })
-
-  test('has the same structure', ({ expect }) => {
-    const lgGlobal = new LiteGraphGlobal()
-    expect(lgGlobal).toMatchSnapshot('minLGraph')
-  })
-
-  test('clamps values', () => {
-    expect(clamp(-1.124, 13, 24)).toStrictEqual(13)
-    expect(clamp(Infinity, 18, 29)).toStrictEqual(29)
-  })
-})
-
-describe('Import order dependency', () => {
-  beforeEach(() => {
-    vi.resetModules()
-  })
-
-  test('Imports without error when entry point is imported first', async ({
-    expect
-  }) => {
-    async function importNormally() {
-      const entryPointImport = await import('@/lib/litegraph/src/litegraph')
-      const directImport = await import('@/lib/litegraph/src/LGraph')
-
-      // Sanity check that imports were cleared.
-      expect(Object.is(LiteGraph, entryPointImport.LiteGraph)).toBe(false)
-      expect(Object.is(LiteGraph.LGraph, directImport.LGraph)).toBe(false)
-    }
-
-    await expect(importNormally()).resolves.toBeUndefined()
-  })
-})
diff --git a/tests-ui/tests/litegraph/utils/widget.test.ts b/tests-ui/tests/litegraph/utils/widget.test.ts
deleted file mode 100644
index a6f4f31564..0000000000
--- a/tests-ui/tests/litegraph/utils/widget.test.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { describe, expect, test } from 'vitest'
-
-import type { IWidgetOptions } from '@/lib/litegraph/src/litegraph'
-import { getWidgetStep } from '@/lib/litegraph/src/litegraph'
-
-describe('getWidgetStep', () => {
-  test('should return step2 when available', () => {
-    const options: IWidgetOptions<unknown> = {
-      step2: 0.5,
-      step: 20
-    }
-
-    expect(getWidgetStep(options)).toBe(0.5)
-  })
-
-  test('should calculate from step when step2 is not available', () => {
-    const options: IWidgetOptions<unknown> = {
-      step: 20
-    }
-
-    expect(getWidgetStep(options)).toBe(2) // 20 * 0.1 = 2
-  })
-
-  test('should use default step value of 10 when neither step2 nor step is provided', () => {
-    const options: IWidgetOptions<unknown> = {}
-
-    expect(getWidgetStep(options)).toBe(1) // 10 * 0.1 = 1
-  })
-  // Zero value is not allowed for step, fallback to 1.
-  test('should handle zero values correctly', () => {
-    const optionsWithZeroStep2: IWidgetOptions<unknown> = {
-      step2: 0,
-      step: 20
-    }
-
-    expect(getWidgetStep(optionsWithZeroStep2)).toBe(2)
-
-    const optionsWithZeroStep: IWidgetOptions<unknown> = {
-      step: 0
-    }
-
-    expect(getWidgetStep(optionsWithZeroStep)).toBe(1)
-  })
-})
diff --git a/tests-ui/tests/nodeSearchService.test.ts b/tests-ui/tests/nodeSearchService.test.ts
deleted file mode 100644
index 75e4095010..0000000000
--- a/tests-ui/tests/nodeSearchService.test.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'
-import { NodeSearchService } from '@/services/nodeSearchService'
-import { ComfyNodeDefImpl } from '@/stores/nodeDefStore'
-
-const EXAMPLE_NODE_DEFS: ComfyNodeDefImpl[] = (
-  [
-    {
-      input: {
-        required: {
-          ckpt_name: [['model1.safetensors', 'model2.ckpt'], {}]
-        }
-      },
-      output: ['MODEL', 'CLIP', 'VAE'],
-      output_is_list: [false, false, false],
-      output_name: ['MODEL', 'CLIP', 'VAE'],
-      name: 'CheckpointLoaderSimple',
-      display_name: 'Load Checkpoint',
-      description: '',
-      python_module: 'nodes',
-      category: 'loaders',
-      output_node: false
-    },
-    {
-      input: {
-        required: {
-          samples: ['LATENT'],
-          batch_index: [
-            'INT',
-            {
-              default: 0,
-              min: 0,
-              max: 63
-            }
-          ],
-          length: [
-            'INT',
-            {
-              default: 1,
-              min: 1,
-              max: 64
-            }
-          ]
-        }
-      },
-      output: ['LATENT'],
-      output_is_list: [false],
-      output_name: ['LATENT'],
-      name: 'LatentFromBatch',
-      display_name: 'Latent From Batch',
-      description: '',
-      python_module: 'nodes',
-      category: 'latent/batch',
-      output_node: false
-    }
-  ] as ComfyNodeDef[]
-).map((nodeDef: ComfyNodeDef) => {
-  const def = new ComfyNodeDefImpl(nodeDef)
-  def['postProcessSearchScores'] = (s) => s
-  return def
-})
-
-describe('nodeSearchService', () => {
-  it('searches with input filter', () => {
-    const service = new NodeSearchService(EXAMPLE_NODE_DEFS)
-    const inputFilter = service.inputTypeFilter
-    expect(
-      service.searchNode('L', [{ filterDef: inputFilter, value: 'LATENT' }])
-    ).toHaveLength(1)
-    // Wildcard should match all.
-    expect(
-      service.searchNode('L', [{ filterDef: inputFilter, value: '*' }])
-    ).toHaveLength(2)
-    expect(service.searchNode('L')).toHaveLength(2)
-  })
-})
diff --git a/tests-ui/tests/platform/assets/utils/assetMetadataUtils.test.ts b/tests-ui/tests/platform/assets/utils/assetMetadataUtils.test.ts
deleted file mode 100644
index 54551f5951..0000000000
--- a/tests-ui/tests/platform/assets/utils/assetMetadataUtils.test.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
-import {
-  getAssetBaseModel,
-  getAssetDescription
-} from '@/platform/assets/utils/assetMetadataUtils'
-
-describe('assetMetadataUtils', () => {
-  const mockAsset: AssetItem = {
-    id: 'test-id',
-    name: 'test-model',
-    asset_hash: 'hash123',
-    size: 1024,
-    mime_type: 'application/octet-stream',
-    tags: ['models', 'checkpoints'],
-    created_at: '2024-01-01T00:00:00Z',
-    updated_at: '2024-01-01T00:00:00Z',
-    last_access_time: '2024-01-01T00:00:00Z'
-  }
-
-  describe('getAssetDescription', () => {
-    it('should return string description when present', () => {
-      const asset = {
-        ...mockAsset,
-        user_metadata: { description: 'A test model' }
-      }
-      expect(getAssetDescription(asset)).toBe('A test model')
-    })
-
-    it('should return null when description is not a string', () => {
-      const asset = {
-        ...mockAsset,
-        user_metadata: { description: 123 }
-      }
-      expect(getAssetDescription(asset)).toBeNull()
-    })
-
-    it('should return null when no metadata', () => {
-      expect(getAssetDescription(mockAsset)).toBeNull()
-    })
-  })
-
-  describe('getAssetBaseModel', () => {
-    it('should return string base_model when present', () => {
-      const asset = {
-        ...mockAsset,
-        user_metadata: { base_model: 'SDXL' }
-      }
-      expect(getAssetBaseModel(asset)).toBe('SDXL')
-    })
-
-    it('should return null when base_model is not a string', () => {
-      const asset = {
-        ...mockAsset,
-        user_metadata: { base_model: 123 }
-      }
-      expect(getAssetBaseModel(asset)).toBeNull()
-    })
-
-    it('should return null when no metadata', () => {
-      expect(getAssetBaseModel(mockAsset)).toBeNull()
-    })
-  })
-})
diff --git a/tests-ui/tests/platform/cloud/subscription/composables/useSubscriptionCredits.test.ts b/tests-ui/tests/platform/cloud/subscription/composables/useSubscriptionCredits.test.ts
deleted file mode 100644
index 230e7ceb71..0000000000
--- a/tests-ui/tests/platform/cloud/subscription/composables/useSubscriptionCredits.test.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-import { createPinia, setActivePinia } from 'pinia'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-import * as comfyCredits from '@/base/credits/comfyCredits'
-import { useSubscriptionCredits } from '@/platform/cloud/subscription/composables/useSubscriptionCredits'
-import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
-import type { operations } from '@/types/comfyRegistryTypes'
-
-type GetCustomerBalanceResponse =
-  operations['GetCustomerBalance']['responses']['200']['content']['application/json']
-
-vi.mock(
-  'vue-i18n',
-  async (importOriginal: () => Promise<typeof import('vue-i18n')>) => {
-    const actual = await importOriginal()
-    return {
-      ...actual,
-      useI18n: () => ({
-        t: () => 'Credits',
-        locale: { value: 'en-US' }
-      })
-    }
-  }
-)
-
-// Mock Firebase Auth and related modules
-vi.mock('vuefire', () => ({
-  useFirebaseAuth: vi.fn(() => ({
-    onAuthStateChanged: vi.fn(),
-    setPersistence: vi.fn()
-  }))
-}))
-
-vi.mock('firebase/auth', () => ({
-  onAuthStateChanged: vi.fn(() => {
-    // Mock the callback to be called immediately for testing
-    return vi.fn()
-  }),
-  onIdTokenChanged: vi.fn(),
-  setPersistence: vi.fn().mockResolvedValue(undefined),
-  browserLocalPersistence: {},
-  GoogleAuthProvider: class {
-    addScope = vi.fn()
-    setCustomParameters = vi.fn()
-  },
-  GithubAuthProvider: class {
-    addScope = vi.fn()
-    setCustomParameters = vi.fn()
-  }
-}))
-
-// Mock other dependencies
-vi.mock('@/services/dialogService', () => ({
-  useDialogService: () => ({
-    showDialog: vi.fn()
-  })
-}))
-
-vi.mock('@/platform/telemetry', () => ({
-  useTelemetry: () => ({
-    track: vi.fn()
-  })
-}))
-
-vi.mock('@/stores/toastStore', () => ({
-  useToastStore: () => ({
-    add: vi.fn()
-  })
-}))
-
-vi.mock('@/stores/apiKeyAuthStore', () => ({
-  useApiKeyAuthStore: () => ({
-    headers: {}
-  })
-}))
-
-describe('useSubscriptionCredits', () => {
-  let authStore: ReturnType<typeof useFirebaseAuthStore>
-
-  beforeEach(() => {
-    setActivePinia(createPinia())
-    authStore = useFirebaseAuthStore()
-    vi.clearAllMocks()
-  })
-
-  describe('totalCredits', () => {
-    it('should return "0" when balance is null', () => {
-      authStore.balance = null
-      const { totalCredits } = useSubscriptionCredits()
-      expect(totalCredits.value).toBe('0')
-    })
-
-    it('should return "0" when amount_micros is missing', () => {
-      authStore.balance = {} as GetCustomerBalanceResponse
-      const { totalCredits } = useSubscriptionCredits()
-      expect(totalCredits.value).toBe('0')
-    })
-
-    it('should format amount_micros correctly', () => {
-      authStore.balance = { amount_micros: 100 } as GetCustomerBalanceResponse
-      const { totalCredits } = useSubscriptionCredits()
-      expect(totalCredits.value).toBe('211')
-    })
-
-    it('should handle formatting errors by throwing', async () => {
-      const formatSpy = vi.spyOn(comfyCredits, 'formatCreditsFromCents')
-      formatSpy.mockImplementationOnce(() => {
-        throw new Error('Formatting error')
-      })
-
-      authStore.balance = { amount_micros: 100 } as GetCustomerBalanceResponse
-      const { totalCredits } = useSubscriptionCredits()
-      expect(() => totalCredits.value).toThrow('Formatting error')
-      formatSpy.mockRestore()
-    })
-  })
-
-  describe('monthlyBonusCredits', () => {
-    it('should return "0" when cloud_credit_balance_micros is missing', () => {
-      authStore.balance = {} as GetCustomerBalanceResponse
-      const { monthlyBonusCredits } = useSubscriptionCredits()
-      expect(monthlyBonusCredits.value).toBe('0')
-    })
-
-    it('should format cloud_credit_balance_micros correctly', () => {
-      authStore.balance = {
-        cloud_credit_balance_micros: 200
-      } as GetCustomerBalanceResponse
-      const { monthlyBonusCredits } = useSubscriptionCredits()
-      expect(monthlyBonusCredits.value).toBe('422')
-    })
-  })
-
-  describe('prepaidCredits', () => {
-    it('should return "0" when prepaid_balance_micros is missing', () => {
-      authStore.balance = {} as GetCustomerBalanceResponse
-      const { prepaidCredits } = useSubscriptionCredits()
-      expect(prepaidCredits.value).toBe('0')
-    })
-
-    it('should format prepaid_balance_micros correctly', () => {
-      authStore.balance = {
-        prepaid_balance_micros: 300
-      } as GetCustomerBalanceResponse
-      const { prepaidCredits } = useSubscriptionCredits()
-      expect(prepaidCredits.value).toBe('633')
-    })
-  })
-
-  describe('isLoadingBalance', () => {
-    it('should reflect authStore.isFetchingBalance', () => {
-      authStore.isFetchingBalance = true
-      const { isLoadingBalance } = useSubscriptionCredits()
-      expect(isLoadingBalance.value).toBe(true)
-
-      authStore.isFetchingBalance = false
-      expect(isLoadingBalance.value).toBe(false)
-    })
-  })
-})
diff --git a/tests-ui/tests/platform/remote/comfyui/history/adapters/v2ToV1Adapter.test.ts b/tests-ui/tests/platform/remote/comfyui/history/adapters/v2ToV1Adapter.test.ts
deleted file mode 100644
index c047782a09..0000000000
--- a/tests-ui/tests/platform/remote/comfyui/history/adapters/v2ToV1Adapter.test.ts
+++ /dev/null
@@ -1,185 +0,0 @@
-/**
- * @fileoverview Unit tests for V2 to V1 history adapter.
- */
-import { describe, expect, it } from 'vitest'
-
-import { mapHistoryV2toHistory } from '@/platform/remote/comfyui/history/adapters/v2ToV1Adapter'
-import { zRawHistoryItemV2 } from '@/platform/remote/comfyui/history/types/historyV2Types'
-import type { HistoryResponseV2 } from '@/platform/remote/comfyui/history/types/historyV2Types'
-
-import {
-  expectedV1Fixture,
-  historyV2Fixture
-} from '@tests-ui/fixtures/historyFixtures'
-import {
-  historyV2FiveItemsSorting,
-  historyV2MultipleNoTimestamp,
-  historyV2WithMissingTimestamp
-} from '@tests-ui/fixtures/historySortingFixtures'
-import type { HistoryTaskItem } from '@/platform/remote/comfyui/history/types/historyV1Types'
-
-function findResultByPromptId(
-  result: HistoryTaskItem[],
-  promptId: string
-): HistoryTaskItem {
-  const item = result.find((item) => item.prompt[1] === promptId)
-  if (!item) {
-    throw new Error(`Expected item with promptId ${promptId} not found`)
-  }
-  return item
-}
-
-describe('mapHistoryV2toHistory', () => {
-  describe('fixture validation', () => {
-    it('should have valid fixture data', () => {
-      // Validate all items in the fixture to ensure test data is correct
-      historyV2Fixture.history.forEach((item: unknown) => {
-        expect(() => zRawHistoryItemV2.parse(item)).not.toThrow()
-      })
-    })
-  })
-
-  describe('given a complete V2 history response with edge cases', () => {
-    const history = mapHistoryV2toHistory(historyV2Fixture)
-
-    it('should transform all items to V1 format with correct structure', () => {
-      expect(history).toEqual(expectedV1Fixture)
-    })
-
-    it('should add taskType "History" to all items', () => {
-      history.forEach((item) => {
-        expect(item.taskType).toBe('History')
-      })
-    })
-
-    it('should transform prompt to V1 tuple [priority, id, {}, extra_data, outputNodeIds]', () => {
-      const firstItem = history[0]
-
-      expect(firstItem.prompt[0]).toBe(1) // Synthetic priority based on timestamp
-      expect(firstItem.prompt[1]).toBe('complete-item-id')
-      expect(firstItem.prompt[2]).toEqual({}) // history v2 does not return this data
-      expect(firstItem.prompt[3]).toMatchObject({ client_id: 'test-client' })
-      expect(firstItem.prompt[4]).toEqual(['9'])
-    })
-
-    it('should handle missing optional status field', () => {
-      expect(history[1].prompt[1]).toBe('no-status-id')
-      expect(history[1].status).toBeUndefined()
-    })
-
-    it('should handle missing optional meta field', () => {
-      expect(history[2].prompt[1]).toBe('no-meta-id')
-      expect(history[2].meta).toBeUndefined()
-    })
-
-    it('should derive output node IDs from outputs object keys', () => {
-      const multiOutputItem = history[3]
-
-      expect(multiOutputItem.prompt[4]).toEqual(
-        expect.arrayContaining(['3', '9', '12'])
-      )
-      expect(multiOutputItem.prompt[4]).toHaveLength(3)
-    })
-  })
-
-  describe('given empty history array', () => {
-    it('should return empty array', () => {
-      const emptyResponse: HistoryResponseV2 = { history: [] }
-      const history = mapHistoryV2toHistory(emptyResponse)
-
-      expect(history).toEqual([])
-    })
-  })
-
-  describe('given empty outputs object', () => {
-    it('should return empty array for output node IDs', () => {
-      const v2Response: HistoryResponseV2 = {
-        history: [
-          {
-            prompt_id: 'test-id',
-            prompt: {
-              priority: 0,
-              prompt_id: 'test-id',
-              extra_data: { client_id: 'test' }
-            },
-            outputs: {}
-          }
-        ]
-      }
-
-      const history = mapHistoryV2toHistory(v2Response)
-
-      expect(history[0].prompt[4]).toEqual([])
-    })
-  })
-
-  describe('given missing client_id', () => {
-    it('should accept history items without client_id', () => {
-      const v2Response: HistoryResponseV2 = {
-        history: [
-          {
-            prompt_id: 'test-id',
-            prompt: {
-              priority: 0,
-              prompt_id: 'test-id',
-              extra_data: {}
-            },
-            outputs: {}
-          }
-        ]
-      }
-
-      const history = mapHistoryV2toHistory(v2Response)
-
-      expect(history[0].prompt[3].client_id).toBeUndefined()
-    })
-  })
-
-  describe('timestamp-based priority assignment', () => {
-    it('assigns priority 0 to items without execution_success timestamp', () => {
-      const result = mapHistoryV2toHistory(historyV2WithMissingTimestamp)
-
-      expect(result).toHaveLength(3)
-
-      const item1000 = findResultByPromptId(result, 'item-timestamp-1000')
-      const item2000 = findResultByPromptId(result, 'item-timestamp-2000')
-      const itemNoTimestamp = findResultByPromptId(result, 'item-no-timestamp')
-
-      expect(item2000.prompt[0]).toBe(2)
-      expect(item1000.prompt[0]).toBe(1)
-      expect(itemNoTimestamp.prompt[0]).toBe(0)
-    })
-
-    it('correctly sorts and assigns priorities for multiple items', () => {
-      const result = mapHistoryV2toHistory(historyV2FiveItemsSorting)
-
-      expect(result).toHaveLength(5)
-
-      const item1000 = findResultByPromptId(result, 'item-timestamp-1000')
-      const item2000 = findResultByPromptId(result, 'item-timestamp-2000')
-      const item3000 = findResultByPromptId(result, 'item-timestamp-3000')
-      const item4000 = findResultByPromptId(result, 'item-timestamp-4000')
-      const item5000 = findResultByPromptId(result, 'item-timestamp-5000')
-
-      expect(item5000.prompt[0]).toBe(5)
-      expect(item4000.prompt[0]).toBe(4)
-      expect(item3000.prompt[0]).toBe(3)
-      expect(item2000.prompt[0]).toBe(2)
-      expect(item1000.prompt[0]).toBe(1)
-    })
-
-    it('assigns priority 0 to all items when multiple items lack timestamps', () => {
-      const result = mapHistoryV2toHistory(historyV2MultipleNoTimestamp)
-
-      expect(result).toHaveLength(3)
-
-      const item1 = findResultByPromptId(result, 'item-no-timestamp-1')
-      const item2 = findResultByPromptId(result, 'item-no-timestamp-2')
-      const item3 = findResultByPromptId(result, 'item-no-timestamp-3')
-
-      expect(item1.prompt[0]).toBe(0)
-      expect(item2.prompt[0]).toBe(0)
-      expect(item3.prompt[0]).toBe(0)
-    })
-  })
-})
diff --git a/tests-ui/tests/platform/remote/comfyui/history/fetchers/fetchHistoryV1.test.ts b/tests-ui/tests/platform/remote/comfyui/history/fetchers/fetchHistoryV1.test.ts
deleted file mode 100644
index e0869778e3..0000000000
--- a/tests-ui/tests/platform/remote/comfyui/history/fetchers/fetchHistoryV1.test.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * @fileoverview Unit tests for V1 history fetcher.
- */
-import { describe, expect, it, vi } from 'vitest'
-
-import { fetchHistoryV1 } from '@/platform/remote/comfyui/history/fetchers/fetchHistoryV1'
-
-import { historyV1RawResponse } from '@tests-ui/fixtures/historyFixtures'
-
-describe('fetchHistoryV1', () => {
-  const mockFetchApi = vi.fn().mockResolvedValue({
-    json: async () => historyV1RawResponse
-  })
-
-  it('should fetch from /history endpoint with default max_items', async () => {
-    await fetchHistoryV1(mockFetchApi)
-
-    expect(mockFetchApi).toHaveBeenCalledWith('/history?max_items=200')
-  })
-
-  it('should fetch with custom max_items parameter', async () => {
-    await fetchHistoryV1(mockFetchApi, 50)
-
-    expect(mockFetchApi).toHaveBeenCalledWith('/history?max_items=50')
-  })
-
-  it('should transform object response to array with taskType and preserve fields', async () => {
-    const result = await fetchHistoryV1(mockFetchApi)
-
-    expect(result.History).toHaveLength(2)
-    result.History.forEach((item) => {
-      expect(item.taskType).toBe('History')
-    })
-    expect(result.History[0]).toMatchObject({
-      taskType: 'History',
-      prompt: [24, 'complete-item-id', {}, expect.any(Object), ['9']],
-      outputs: expect.any(Object),
-      status: expect.any(Object),
-      meta: expect.any(Object)
-    })
-  })
-
-  it('should handle empty response object', async () => {
-    const emptyMock = vi.fn().mockResolvedValue({
-      json: async () => ({})
-    })
-
-    const result = await fetchHistoryV1(emptyMock)
-
-    expect(result.History).toEqual([])
-  })
-})
diff --git a/tests-ui/tests/platform/remote/comfyui/history/fetchers/fetchHistoryV2.test.ts b/tests-ui/tests/platform/remote/comfyui/history/fetchers/fetchHistoryV2.test.ts
deleted file mode 100644
index ff0e287507..0000000000
--- a/tests-ui/tests/platform/remote/comfyui/history/fetchers/fetchHistoryV2.test.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * @fileoverview Unit tests for V2 history fetcher.
- */
-import { describe, expect, it, vi } from 'vitest'
-
-import { fetchHistoryV2 } from '@/platform/remote/comfyui/history/fetchers/fetchHistoryV2'
-
-import {
-  expectedV1Fixture,
-  historyV2Fixture
-} from '@tests-ui/fixtures/historyFixtures'
-
-describe('fetchHistoryV2', () => {
-  const mockFetchApi = vi.fn().mockResolvedValue({
-    json: async () => historyV2Fixture
-  })
-
-  it('should fetch from /history_v2 endpoint with default max_items', async () => {
-    await fetchHistoryV2(mockFetchApi)
-
-    expect(mockFetchApi).toHaveBeenCalledWith('/history_v2?max_items=200')
-  })
-
-  it('should fetch with custom max_items parameter', async () => {
-    await fetchHistoryV2(mockFetchApi, 50)
-
-    expect(mockFetchApi).toHaveBeenCalledWith('/history_v2?max_items=50')
-  })
-
-  it('should adapt V2 response to V1-compatible format', async () => {
-    const result = await fetchHistoryV2(mockFetchApi)
-
-    expect(result.History).toEqual(expectedV1Fixture)
-    expect(result).toHaveProperty('History')
-    expect(Array.isArray(result.History)).toBe(true)
-    result.History.forEach((item) => {
-      expect(item.taskType).toBe('History')
-      expect(item.prompt).toHaveLength(5)
-    })
-  })
-})
diff --git a/tests-ui/tests/platform/remote/comfyui/history/reconciliation.test.ts b/tests-ui/tests/platform/remote/comfyui/history/reconciliation.test.ts
deleted file mode 100644
index d7ada5971b..0000000000
--- a/tests-ui/tests/platform/remote/comfyui/history/reconciliation.test.ts
+++ /dev/null
@@ -1,335 +0,0 @@
-/**
- * @fileoverview Tests for history reconciliation (V1 and V2)
- */
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-import { reconcileHistory } from '@/platform/remote/comfyui/history/reconciliation'
-import type { TaskItem } from '@/schemas/apiSchema'
-
-// Mock distribution types
-vi.mock('@/platform/distribution/types', () => ({
-  isCloud: false,
-  isDesktop: true
-}))
-
-function createHistoryItem(promptId: string, queueIndex = 0): TaskItem {
-  return {
-    taskType: 'History',
-    prompt: [queueIndex, promptId, {}, {}, []],
-    status: { status_str: 'success', completed: true, messages: [] },
-    outputs: {}
-  }
-}
-
-function getAllPromptIds(result: TaskItem[]): string[] {
-  return result.map((item) => item.prompt[1])
-}
-
-describe('reconcileHistory (V1)', () => {
-  beforeEach(async () => {
-    const distTypes = await import('@/platform/distribution/types')
-    vi.mocked(distTypes).isCloud = false
-  })
-
-  describe('when filtering by queueIndex', () => {
-    it('should retain items with queueIndex greater than lastKnownQueueIndex', () => {
-      const serverHistory = [
-        createHistoryItem('new-1', 11),
-        createHistoryItem('new-2', 10),
-        createHistoryItem('old', 5)
-      ]
-      const clientHistory = [createHistoryItem('old', 5)]
-
-      const result = reconcileHistory(serverHistory, clientHistory, 10, 9)
-
-      const promptIds = getAllPromptIds(result)
-      expect(promptIds).toHaveLength(3)
-      expect(promptIds).toContain('new-1')
-      expect(promptIds).toContain('new-2')
-      expect(promptIds).toContain('old')
-    })
-
-    it('should evict items with queueIndex less than or equal to lastKnownQueueIndex', () => {
-      const serverHistory = [
-        createHistoryItem('new', 11),
-        createHistoryItem('existing', 10),
-        createHistoryItem('old-should-not-appear', 5)
-      ]
-      const clientHistory = [createHistoryItem('existing', 10)]
-
-      const result = reconcileHistory(serverHistory, clientHistory, 10, 10)
-
-      const promptIds = getAllPromptIds(result)
-      expect(promptIds).toHaveLength(2)
-      expect(promptIds).toContain('new')
-      expect(promptIds).toContain('existing')
-      expect(promptIds).not.toContain('old-should-not-appear')
-    })
-
-    it('should retain all server items when lastKnownQueueIndex is undefined', () => {
-      const serverHistory = [
-        createHistoryItem('item-1', 5),
-        createHistoryItem('item-2', 4)
-      ]
-
-      const result = reconcileHistory(serverHistory, [], 10, undefined)
-
-      expect(result).toHaveLength(2)
-      expect(result[0].prompt[1]).toBe('item-1')
-      expect(result[1].prompt[1]).toBe('item-2')
-    })
-  })
-
-  describe('when reconciling with existing client items', () => {
-    it('should retain client items that still exist on server', () => {
-      const serverHistory = [
-        createHistoryItem('new', 11),
-        createHistoryItem('existing-1', 9),
-        createHistoryItem('existing-2', 8)
-      ]
-      const clientHistory = [
-        createHistoryItem('existing-1', 9),
-        createHistoryItem('existing-2', 8)
-      ]
-
-      const result = reconcileHistory(serverHistory, clientHistory, 10, 10)
-
-      const promptIds = getAllPromptIds(result)
-      expect(promptIds).toHaveLength(3)
-      expect(promptIds).toContain('new')
-      expect(promptIds).toContain('existing-1')
-      expect(promptIds).toContain('existing-2')
-    })
-
-    it('should evict client items that no longer exist on server', () => {
-      const serverHistory = [
-        createHistoryItem('new', 11),
-        createHistoryItem('keep', 9)
-      ]
-      const clientHistory = [
-        createHistoryItem('keep', 9),
-        createHistoryItem('removed-from-server', 8)
-      ]
-
-      const result = reconcileHistory(serverHistory, clientHistory, 10, 10)
-
-      const promptIds = getAllPromptIds(result)
-      expect(promptIds).toHaveLength(2)
-      expect(promptIds).toContain('new')
-      expect(promptIds).toContain('keep')
-      expect(promptIds).not.toContain('removed-from-server')
-    })
-  })
-
-  describe('when limiting the result count', () => {
-    it('should respect the maxItems constraint', () => {
-      const serverHistory = Array.from({ length: 10 }, (_, i) =>
-        createHistoryItem(`item-${i}`, 20 + i)
-      )
-
-      const result = reconcileHistory(serverHistory, [], 5, 15)
-
-      const promptIds = getAllPromptIds(result)
-      expect(promptIds).toHaveLength(5)
-    })
-
-    it('should evict lowest priority items when exceeding capacity', () => {
-      const serverHistory = [
-        createHistoryItem('new-1', 13),
-        createHistoryItem('new-2', 12),
-        createHistoryItem('new-3', 11),
-        createHistoryItem('existing', 9)
-      ]
-      const clientHistory = [createHistoryItem('existing', 9)]
-
-      const result = reconcileHistory(serverHistory, clientHistory, 2, 10)
-
-      expect(result).toHaveLength(2)
-      expect(result[0].prompt[1]).toBe('new-1')
-      expect(result[1].prompt[1]).toBe('new-2')
-    })
-  })
-
-  describe('when handling empty collections', () => {
-    it('should return all server items when client history is empty', () => {
-      const serverHistory = [
-        createHistoryItem('item-1', 10),
-        createHistoryItem('item-2', 9)
-      ]
-
-      const result = reconcileHistory(serverHistory, [], 10, 8)
-
-      const promptIds = getAllPromptIds(result)
-      expect(promptIds).toHaveLength(2)
-    })
-
-    it('should return empty result when server history is empty', () => {
-      const clientHistory = [createHistoryItem('item-1', 5)]
-
-      const result = reconcileHistory([], clientHistory, 10, 5)
-
-      expect(result).toHaveLength(0)
-    })
-
-    it('should return empty result when both collections are empty', () => {
-      const result = reconcileHistory([], [], 10, undefined)
-
-      expect(result).toHaveLength(0)
-    })
-  })
-})
-
-describe('reconcileHistory (V2/Cloud)', () => {
-  beforeEach(async () => {
-    const distTypes = await import('@/platform/distribution/types')
-    vi.mocked(distTypes).isCloud = true
-  })
-
-  describe('when adding new items from server', () => {
-    it('should retain items with promptIds not present in client history', () => {
-      const serverHistory = [
-        createHistoryItem('new-item'),
-        createHistoryItem('existing-item')
-      ]
-      const clientHistory = [createHistoryItem('existing-item')]
-
-      const result = reconcileHistory(serverHistory, clientHistory, 10)
-
-      const promptIds = getAllPromptIds(result)
-      expect(promptIds).toHaveLength(2)
-      expect(promptIds).toContain('new-item')
-      expect(promptIds).toContain('existing-item')
-    })
-
-    it('should respect priority ordering when retaining multiple new items', () => {
-      const serverHistory = [
-        createHistoryItem('new-1'),
-        createHistoryItem('new-2'),
-        createHistoryItem('existing')
-      ]
-      const clientHistory = [createHistoryItem('existing')]
-
-      const result = reconcileHistory(serverHistory, clientHistory, 10)
-
-      const promptIds = getAllPromptIds(result)
-      expect(promptIds).toHaveLength(3)
-      expect(promptIds).toContain('new-1')
-      expect(promptIds).toContain('new-2')
-      expect(promptIds).toContain('existing')
-    })
-  })
-
-  describe('when reconciling with existing client items', () => {
-    it('should retain client items that still exist on server', () => {
-      const serverHistory = [
-        createHistoryItem('item-1'),
-        createHistoryItem('item-2')
-      ]
-      const clientHistory = [
-        createHistoryItem('item-1'),
-        createHistoryItem('item-2')
-      ]
-
-      const result = reconcileHistory(serverHistory, clientHistory, 10)
-
-      const promptIds = getAllPromptIds(result)
-      expect(promptIds).toHaveLength(2)
-      expect(promptIds).toContain('item-1')
-      expect(promptIds).toContain('item-2')
-    })
-
-    it('should evict client items that no longer exist on server', () => {
-      const serverHistory = [createHistoryItem('item-1')]
-      const clientHistory = [
-        createHistoryItem('item-1'),
-        createHistoryItem('old-item')
-      ]
-
-      const result = reconcileHistory(serverHistory, clientHistory, 10)
-
-      const promptIds = getAllPromptIds(result)
-      expect(promptIds).toHaveLength(1)
-      expect(promptIds).toContain('item-1')
-      expect(promptIds).not.toContain('old-item')
-    })
-  })
-
-  describe('when detecting new items by promptId', () => {
-    it('should retain new items regardless of queueIndex values', () => {
-      const serverHistory = [
-        createHistoryItem('existing', 100),
-        createHistoryItem('new-item', 50)
-      ]
-      const clientHistory = [createHistoryItem('existing', 100)]
-
-      const result = reconcileHistory(serverHistory, clientHistory, 10)
-
-      const promptIds = getAllPromptIds(result)
-      expect(promptIds).toContain('new-item')
-      expect(promptIds).toContain('existing')
-    })
-  })
-
-  describe('when limiting the result count', () => {
-    it('should respect the maxItems constraint', () => {
-      const serverHistory = Array.from({ length: 10 }, (_, i) =>
-        createHistoryItem(`server-${i}`)
-      )
-      const clientHistory = Array.from({ length: 5 }, (_, i) =>
-        createHistoryItem(`client-${i}`)
-      )
-
-      const result = reconcileHistory(serverHistory, clientHistory, 5)
-
-      const promptIds = getAllPromptIds(result)
-      expect(promptIds).toHaveLength(5)
-    })
-
-    it('should evict lowest priority items when exceeding capacity', () => {
-      const serverHistory = [
-        createHistoryItem('new-1'),
-        createHistoryItem('new-2'),
-        createHistoryItem('existing')
-      ]
-      const clientHistory = [createHistoryItem('existing')]
-
-      const result = reconcileHistory(serverHistory, clientHistory, 2)
-
-      expect(result).toHaveLength(2)
-      expect(result[0].prompt[1]).toBe('new-1')
-      expect(result[1].prompt[1]).toBe('new-2')
-    })
-  })
-
-  describe('when handling empty collections', () => {
-    it('should return all server items when client history is empty', () => {
-      const serverHistory = [
-        createHistoryItem('item-1'),
-        createHistoryItem('item-2')
-      ]
-
-      const result = reconcileHistory(serverHistory, [], 10)
-
-      expect(result).toHaveLength(2)
-      expect(result[0].prompt[1]).toBe('item-1')
-      expect(result[1].prompt[1]).toBe('item-2')
-    })
-
-    it('should return empty result when server history is empty', () => {
-      const clientHistory = [
-        createHistoryItem('item-1'),
-        createHistoryItem('item-2')
-      ]
-
-      const result = reconcileHistory([], clientHistory, 10)
-
-      expect(result).toHaveLength(0)
-    })
-
-    it('should return empty result when both collections are empty', () => {
-      const result = reconcileHistory([], [], 10)
-
-      expect(result).toHaveLength(0)
-    })
-  })
-})
diff --git a/tests-ui/tests/platform/workflow/cloud/getWorkflowFromHistory.test.ts b/tests-ui/tests/platform/workflow/cloud/getWorkflowFromHistory.test.ts
deleted file mode 100644
index fede0e8644..0000000000
--- a/tests-ui/tests/platform/workflow/cloud/getWorkflowFromHistory.test.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-
-import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
-import { getWorkflowFromHistory } from '@/platform/workflow/cloud/getWorkflowFromHistory'
-
-const mockWorkflow: ComfyWorkflowJSON = {
-  id: 'test-workflow-id',
-  revision: 0,
-  last_node_id: 5,
-  last_link_id: 3,
-  nodes: [],
-  links: [],
-  groups: [],
-  config: {},
-  extra: {},
-  version: 0.4
-}
-
-const mockHistoryResponse = {
-  'test-prompt-id': {
-    prompt: {
-      priority: 1,
-      prompt_id: 'test-prompt-id',
-      extra_data: {
-        client_id: 'test-client',
-        extra_pnginfo: {
-          workflow: mockWorkflow
-        }
-      }
-    },
-    outputs: {},
-    status: {
-      status_str: 'success',
-      completed: true,
-      messages: []
-    }
-  }
-}
-
-describe('getWorkflowFromHistory', () => {
-  it('should fetch workflow from /history_v2/{prompt_id} endpoint', async () => {
-    const mockFetchApi = vi.fn().mockResolvedValue({
-      json: async () => mockHistoryResponse
-    })
-
-    await getWorkflowFromHistory(mockFetchApi, 'test-prompt-id')
-
-    expect(mockFetchApi).toHaveBeenCalledWith('/history_v2/test-prompt-id')
-  })
-
-  it('should extract and return workflow from response', async () => {
-    const mockFetchApi = vi.fn().mockResolvedValue({
-      json: async () => mockHistoryResponse
-    })
-
-    const result = await getWorkflowFromHistory(mockFetchApi, 'test-prompt-id')
-
-    expect(result).toEqual(mockWorkflow)
-  })
-
-  it('should return undefined when prompt_id not found in response', async () => {
-    const mockFetchApi = vi.fn().mockResolvedValue({
-      json: async () => ({})
-    })
-
-    const result = await getWorkflowFromHistory(mockFetchApi, 'nonexistent-id')
-
-    expect(result).toBeUndefined()
-  })
-
-  it('should return undefined when workflow is missing from extra_pnginfo', async () => {
-    const mockFetchApi = vi.fn().mockResolvedValue({
-      json: async () => ({
-        'test-prompt-id': {
-          prompt: {
-            priority: 1,
-            prompt_id: 'test-prompt-id',
-            extra_data: {
-              client_id: 'test-client'
-            }
-          },
-          outputs: {}
-        }
-      })
-    })
-
-    const result = await getWorkflowFromHistory(mockFetchApi, 'test-prompt-id')
-
-    expect(result).toBeUndefined()
-  })
-
-  it('should handle fetch errors gracefully', async () => {
-    const mockFetchApi = vi.fn().mockRejectedValue(new Error('Network error'))
-
-    const result = await getWorkflowFromHistory(mockFetchApi, 'test-prompt-id')
-
-    expect(result).toBeUndefined()
-  })
-
-  it('should handle malformed JSON responses', async () => {
-    const mockFetchApi = vi.fn().mockResolvedValue({
-      json: async () => {
-        throw new Error('Invalid JSON')
-      }
-    })
-
-    const result = await getWorkflowFromHistory(mockFetchApi, 'test-prompt-id')
-
-    expect(result).toBeUndefined()
-  })
-})
diff --git a/tests-ui/tests/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.test.ts b/tests-ui/tests/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.test.ts
deleted file mode 100644
index 730ceb0bf8..0000000000
--- a/tests-ui/tests/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.test.ts
+++ /dev/null
@@ -1,174 +0,0 @@
-import { createTestingPinia } from '@pinia/testing'
-import { mount } from '@vue/test-utils'
-import type { VueWrapper } from '@vue/test-utils'
-import PrimeVue from 'primevue/config'
-import type { ComponentPublicInstance } from 'vue'
-import { describe, expect, it, vi } from 'vitest'
-
-import type { ComboInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
-import type { DropdownItem } from '@/renderer/extensions/vueNodes/widgets/components/form/dropdown/types'
-import type { SimplifiedWidget } from '@/types/simplifiedWidget'
-
-import WidgetSelectDropdown from '@/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.vue'
-
-interface WidgetSelectDropdownInstance extends ComponentPublicInstance {
-  inputItems: DropdownItem[]
-  outputItems: DropdownItem[]
-  updateSelectedItems: (selectedSet: Set<string>) => void
-}
-
-describe('WidgetSelectDropdown custom label mapping', () => {
-  const createMockWidget = (
-    value: string = 'img_001.png',
-    options: {
-      values?: string[]
-      getOptionLabel?: (value: string | null) => string
-    } = {},
-    spec?: ComboInputSpec
-  ): SimplifiedWidget<string | undefined> => ({
-    name: 'test_image_select',
-    type: 'combo',
-    value,
-    options: {
-      values: ['img_001.png', 'photo_abc.jpg', 'hash789.png'],
-      ...options
-    },
-    spec
-  })
-
-  const mountComponent = (
-    widget: SimplifiedWidget<string | undefined>,
-    modelValue: string | undefined,
-    assetKind: 'image' | 'video' | 'audio' = 'image'
-  ): VueWrapper<WidgetSelectDropdownInstance> => {
-    return mount(WidgetSelectDropdown, {
-      props: {
-        widget,
-        modelValue,
-        assetKind,
-        allowUpload: true,
-        uploadFolder: 'input'
-      },
-      global: {
-        plugins: [PrimeVue, createTestingPinia()]
-      }
-    }) as unknown as VueWrapper<WidgetSelectDropdownInstance>
-  }
-
-  describe('when custom labels are not provided', () => {
-    it('uses values as labels when no mapping provided', () => {
-      const widget = createMockWidget('img_001.png')
-      const wrapper = mountComponent(widget, 'img_001.png')
-
-      const inputItems = wrapper.vm.inputItems
-      expect(inputItems).toHaveLength(3)
-      expect(inputItems[0].name).toBe('img_001.png')
-      expect(inputItems[0].label).toBe('img_001.png')
-      expect(inputItems[1].name).toBe('photo_abc.jpg')
-      expect(inputItems[1].label).toBe('photo_abc.jpg')
-      expect(inputItems[2].name).toBe('hash789.png')
-      expect(inputItems[2].label).toBe('hash789.png')
-    })
-  })
-
-  describe('when custom labels are provided via getOptionLabel', () => {
-    it('displays custom labels while preserving original values', () => {
-      const getOptionLabel = vi.fn((value: string | null) => {
-        if (!value) return 'No file'
-        const mapping: Record<string, string> = {
-          'img_001.png': 'Vacation Photo',
-          'photo_abc.jpg': 'Family Portrait',
-          'hash789.png': 'Sunset Beach'
-        }
-        return mapping[value] || value
-      })
-
-      const widget = createMockWidget('img_001.png', {
-        getOptionLabel
-      })
-      const wrapper = mountComponent(widget, 'img_001.png')
-
-      const inputItems = wrapper.vm.inputItems
-      expect(inputItems).toHaveLength(3)
-      expect(inputItems[0].name).toBe('img_001.png')
-      expect(inputItems[0].label).toBe('Vacation Photo')
-      expect(inputItems[1].name).toBe('photo_abc.jpg')
-      expect(inputItems[1].label).toBe('Family Portrait')
-      expect(inputItems[2].name).toBe('hash789.png')
-      expect(inputItems[2].label).toBe('Sunset Beach')
-
-      expect(getOptionLabel).toHaveBeenCalledWith('img_001.png')
-      expect(getOptionLabel).toHaveBeenCalledWith('photo_abc.jpg')
-      expect(getOptionLabel).toHaveBeenCalledWith('hash789.png')
-    })
-
-    it('emits original values when items with custom labels are selected', async () => {
-      const getOptionLabel = vi.fn((value: string | null) => {
-        if (!value) return 'No file'
-        return `Custom: ${value}`
-      })
-
-      const widget = createMockWidget('img_001.png', {
-        getOptionLabel
-      })
-      const wrapper = mountComponent(widget, 'img_001.png')
-
-      // Simulate selecting an item
-      const selectedSet = new Set(['input-1']) // index 1 = photo_abc.jpg
-      wrapper.vm.updateSelectedItems(selectedSet)
-
-      // Should emit the original value, not the custom label
-      expect(wrapper.emitted('update:modelValue')).toBeDefined()
-      expect(wrapper.emitted('update:modelValue')![0]).toEqual([
-        'photo_abc.jpg'
-      ])
-    })
-
-    it('falls back to original value when label mapping fails', () => {
-      const getOptionLabel = vi.fn((value: string | null) => {
-        if (value === 'photo_abc.jpg') {
-          throw new Error('Mapping failed')
-        }
-        return `Labeled: ${value}`
-      })
-
-      const consoleErrorSpy = vi
-        .spyOn(console, 'error')
-        .mockImplementation(() => {})
-
-      const widget = createMockWidget('img_001.png', {
-        getOptionLabel
-      })
-      const wrapper = mountComponent(widget, 'img_001.png')
-
-      const inputItems = wrapper.vm.inputItems
-      expect(inputItems[0].name).toBe('img_001.png')
-      expect(inputItems[0].label).toBe('Labeled: img_001.png')
-      expect(inputItems[1].name).toBe('photo_abc.jpg')
-      expect(inputItems[1].label).toBe('photo_abc.jpg')
-      expect(inputItems[2].name).toBe('hash789.png')
-      expect(inputItems[2].label).toBe('Labeled: hash789.png')
-
-      expect(consoleErrorSpy).toHaveBeenCalled()
-      consoleErrorSpy.mockRestore()
-    })
-  })
-
-  describe('output items with custom label mapping', () => {
-    it('applies custom label mapping to output items from queue history', () => {
-      const getOptionLabel = vi.fn((value: string | null) => {
-        if (!value) return 'No file'
-        return `Output: ${value}`
-      })
-
-      const widget = createMockWidget('img_001.png', {
-        getOptionLabel
-      })
-      const wrapper = mountComponent(widget, 'img_001.png')
-
-      const outputItems = wrapper.vm.outputItems
-      expect(outputItems).toBeDefined()
-      expect(Array.isArray(outputItems)).toBe(true)
-    })
-  })
-})
diff --git a/tests-ui/tests/services/assetService.test.ts b/tests-ui/tests/services/assetService.test.ts
deleted file mode 100644
index ead7902ffb..0000000000
--- a/tests-ui/tests/services/assetService.test.ts
+++ /dev/null
@@ -1,423 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-import type { AssetItem } from '@/platform/assets/schemas/assetSchema'
-import { assetService } from '@/platform/assets/services/assetService'
-import { api } from '@/scripts/api'
-
-vi.mock('@/scripts/api', () => ({
-  api: {
-    fetchApi: vi.fn(),
-    addEventListener: vi.fn(),
-    removeEventListener: vi.fn()
-  }
-}))
-
-const mockGetCategoryForNodeType = vi.fn()
-
-vi.mock('@/stores/modelToNodeStore', () => ({
-  useModelToNodeStore: vi.fn(() => ({
-    getRegisteredNodeTypes: vi.fn(() => ({
-      CheckpointLoaderSimple: 'ckpt_name',
-      LoraLoader: 'lora_name',
-      VAELoader: 'vae_name',
-      TestNode: ''
-    })),
-    getCategoryForNodeType: mockGetCategoryForNodeType,
-    modelToNodeMap: {
-      checkpoints: [{ nodeDef: { name: 'CheckpointLoaderSimple' } }],
-      loras: [{ nodeDef: { name: 'LoraLoader' } }],
-      vae: [{ nodeDef: { name: 'VAELoader' } }]
-    }
-  }))
-}))
-
-// Helper to create API-compliant test assets
-function createTestAsset(overrides: Partial<AssetItem> = {}) {
-  return {
-    id: 'test-uuid',
-    name: 'test-model.safetensors',
-    asset_hash: 'blake3:test123',
-    size: 123456,
-    mime_type: 'application/octet-stream',
-    tags: ['models', 'checkpoints'],
-    created_at: '2024-01-01T00:00:00Z',
-    updated_at: '2024-01-01T00:00:00Z',
-    last_access_time: '2024-01-01T00:00:00Z',
-    ...overrides
-  }
-}
-
-// Test data constants
-const MOCK_ASSETS = {
-  checkpoints: createTestAsset({
-    id: 'uuid-1',
-    name: 'model1.safetensors',
-    tags: ['models', 'checkpoints']
-  }),
-  loras: createTestAsset({
-    id: 'uuid-2',
-    name: 'model2.safetensors',
-    tags: ['models', 'loras']
-  }),
-  vae: createTestAsset({
-    id: 'uuid-3',
-    name: 'vae1.safetensors',
-    tags: ['models', 'vae']
-  })
-} as const
-
-// Helper functions
-function mockApiResponse(assets: any[], options = {}) {
-  const response = {
-    assets,
-    total: assets.length,
-    has_more: false,
-    ...options
-  }
-  vi.mocked(api.fetchApi).mockResolvedValueOnce(Response.json(response))
-  return response
-}
-
-function mockApiError(status: number, statusText = 'Error') {
-  vi.mocked(api.fetchApi).mockResolvedValueOnce(
-    new Response(null, { status, statusText })
-  )
-}
-
-describe('assetService', () => {
-  beforeEach(() => {
-    vi.resetAllMocks()
-    vi.spyOn(api, 'fetchApi')
-  })
-
-  describe('getAssetModelFolders', () => {
-    it('should extract directory names from asset tags and filter blacklisted ones', async () => {
-      const assets = [
-        createTestAsset({
-          id: 'uuid-1',
-          name: 'checkpoint1.safetensors',
-          tags: ['models', 'checkpoints']
-        }),
-        createTestAsset({
-          id: 'uuid-2',
-          name: 'config.yaml',
-          tags: ['models', 'configs'] // Blacklisted
-        }),
-        createTestAsset({
-          id: 'uuid-3',
-          name: 'vae1.safetensors',
-          tags: ['models', 'vae']
-        })
-      ]
-      mockApiResponse(assets)
-
-      const result = await assetService.getAssetModelFolders()
-
-      expect(api.fetchApi).toHaveBeenCalledWith(
-        '/assets?include_tags=models&limit=500'
-      )
-      expect(result).toHaveLength(2)
-
-      const folderNames = result.map((f) => f.name)
-      expect(folderNames).toEqual(['checkpoints', 'vae'])
-      expect(folderNames).not.toContain('configs')
-    })
-
-    it('should handle empty responses', async () => {
-      mockApiResponse([])
-      const emptyResult = await assetService.getAssetModelFolders()
-      expect(emptyResult).toHaveLength(0)
-    })
-
-    it('should handle network errors', async () => {
-      vi.mocked(api.fetchApi).mockRejectedValueOnce(new Error('Network error'))
-      await expect(assetService.getAssetModelFolders()).rejects.toThrow(
-        'Network error'
-      )
-    })
-
-    it('should handle HTTP errors', async () => {
-      mockApiError(500)
-      await expect(assetService.getAssetModelFolders()).rejects.toThrow(
-        'Unable to load model folders: Server returned 500. Please try again.'
-      )
-    })
-  })
-
-  describe('getAssetModels', () => {
-    it('should return filtered models for folder', async () => {
-      const assets = [
-        { ...MOCK_ASSETS.checkpoints, name: 'valid.safetensors' },
-        { ...MOCK_ASSETS.loras, name: 'lora.safetensors' }, // Wrong tag
-        createTestAsset({
-          id: 'uuid-4',
-          name: 'missing-model.safetensors',
-          tags: ['models', 'checkpoints', 'missing'] // Has missing tag
-        })
-      ]
-      mockApiResponse(assets)
-
-      const result = await assetService.getAssetModels('checkpoints')
-
-      expect(api.fetchApi).toHaveBeenCalledWith(
-        '/assets?include_tags=models,checkpoints&limit=500'
-      )
-      expect(result).toEqual([
-        expect.objectContaining({ name: 'valid.safetensors', pathIndex: 0 })
-      ])
-    })
-
-    it('should handle errors and empty responses', async () => {
-      // Empty response
-      mockApiResponse([])
-      const emptyResult = await assetService.getAssetModels('nonexistent')
-      expect(emptyResult).toEqual([])
-
-      // Network error
-      vi.mocked(api.fetchApi).mockRejectedValueOnce(new Error('Network error'))
-      await expect(assetService.getAssetModels('checkpoints')).rejects.toThrow(
-        'Network error'
-      )
-
-      // HTTP error
-      mockApiError(404)
-      await expect(assetService.getAssetModels('checkpoints')).rejects.toThrow(
-        'Unable to load models for checkpoints: Server returned 404. Please try again.'
-      )
-    })
-  })
-
-  describe('isAssetBrowserEligible', () => {
-    it.for<[string, string, boolean, string]>([
-      ['CheckpointLoaderSimple', 'ckpt_name', true, 'valid inputs'],
-      ['LoraLoader', 'lora_name', true, 'valid inputs'],
-      ['VAELoader', 'vae_name', true, 'valid inputs'],
-      ['CheckpointLoaderSimple', 'type', false, 'other combo widgets'],
-      ['UnknownNode', 'widget', false, 'unregistered types'],
-      ['NotRegistered', 'widget', false, 'unregistered types']
-    ])(
-      'isAssetBrowserEligible("%s", "%s") should return %s for %s',
-      ([type, name, expected]) => {
-        expect(assetService.isAssetBrowserEligible(type, name)).toBe(expected)
-      }
-    )
-  })
-
-  describe('getAssetsForNodeType', () => {
-    beforeEach(() => {
-      mockGetCategoryForNodeType.mockClear()
-    })
-
-    it('should return empty array for unregistered node types', async () => {
-      mockGetCategoryForNodeType.mockReturnValue(undefined)
-
-      const result = await assetService.getAssetsForNodeType('UnknownNode')
-
-      expect(mockGetCategoryForNodeType).toHaveBeenCalledWith('UnknownNode')
-      expect(result).toEqual([])
-    })
-
-    it('should use getCategoryForNodeType for efficient category lookup', async () => {
-      mockGetCategoryForNodeType.mockReturnValue('checkpoints')
-      const testAssets = [MOCK_ASSETS.checkpoints]
-      mockApiResponse(testAssets)
-
-      const result = await assetService.getAssetsForNodeType(
-        'CheckpointLoaderSimple'
-      )
-
-      expect(mockGetCategoryForNodeType).toHaveBeenCalledWith(
-        'CheckpointLoaderSimple'
-      )
-      expect(result).toEqual(testAssets)
-
-      // Verify API call includes correct category
-      expect(api.fetchApi).toHaveBeenCalledWith(
-        '/assets?include_tags=models,checkpoints&limit=500'
-      )
-    })
-
-    it('should return empty array when no category found', async () => {
-      mockGetCategoryForNodeType.mockReturnValue(undefined)
-
-      const result = await assetService.getAssetsForNodeType('TestNode')
-
-      expect(result).toEqual([])
-      expect(api.fetchApi).not.toHaveBeenCalled()
-    })
-
-    it('should handle API errors gracefully', async () => {
-      mockGetCategoryForNodeType.mockReturnValue('loras')
-      mockApiError(500, 'Internal Server Error')
-
-      await expect(
-        assetService.getAssetsForNodeType('LoraLoader')
-      ).rejects.toThrow(
-        'Unable to load assets for LoraLoader: Server returned 500. Please try again.'
-      )
-    })
-
-    it('should return all assets without filtering for different categories', async () => {
-      // Test checkpoints
-      mockGetCategoryForNodeType.mockReturnValue('checkpoints')
-      const checkpointAssets = [MOCK_ASSETS.checkpoints]
-      mockApiResponse(checkpointAssets)
-
-      let result = await assetService.getAssetsForNodeType(
-        'CheckpointLoaderSimple'
-      )
-      expect(result).toEqual(checkpointAssets)
-
-      // Test loras
-      mockGetCategoryForNodeType.mockReturnValue('loras')
-      const loraAssets = [MOCK_ASSETS.loras]
-      mockApiResponse(loraAssets)
-
-      result = await assetService.getAssetsForNodeType('LoraLoader')
-      expect(result).toEqual(loraAssets)
-
-      // Test vae
-      mockGetCategoryForNodeType.mockReturnValue('vae')
-      const vaeAssets = [MOCK_ASSETS.vae]
-      mockApiResponse(vaeAssets)
-
-      result = await assetService.getAssetsForNodeType('VAELoader')
-      expect(result).toEqual(vaeAssets)
-    })
-  })
-
-  describe('getAssetsByTag', () => {
-    it('should fetch assets with correct tag query parameter', async () => {
-      const testAssets = [MOCK_ASSETS.checkpoints, MOCK_ASSETS.loras]
-      mockApiResponse(testAssets)
-
-      const result = await assetService.getAssetsByTag('models')
-
-      expect(api.fetchApi).toHaveBeenCalledWith(
-        '/assets?include_tags=models&limit=500&include_public=true'
-      )
-      expect(result).toEqual(testAssets)
-    })
-
-    it('should filter out assets with missing tag', async () => {
-      const testAssets = [
-        MOCK_ASSETS.checkpoints,
-        createTestAsset({
-          id: 'uuid-missing',
-          name: 'missing.safetensors',
-          tags: ['models', 'checkpoints', 'missing']
-        }),
-        MOCK_ASSETS.loras
-      ]
-      mockApiResponse(testAssets)
-
-      const result = await assetService.getAssetsByTag('models')
-
-      expect(result).toHaveLength(2)
-      expect(result).toEqual([MOCK_ASSETS.checkpoints, MOCK_ASSETS.loras])
-      expect(result.some((a) => a.id === 'uuid-missing')).toBe(false)
-    })
-
-    it('should return empty array on API error', async () => {
-      mockApiError(500)
-
-      await expect(assetService.getAssetsByTag('models')).rejects.toThrow(
-        'Unable to load assets for tag models: Server returned 500. Please try again.'
-      )
-    })
-
-    it('should return empty array for empty response', async () => {
-      mockApiResponse([])
-
-      const result = await assetService.getAssetsByTag('nonexistent')
-
-      expect(result).toEqual([])
-    })
-
-    it('should return AssetItem[] with full metadata', async () => {
-      const fullAsset = createTestAsset({
-        id: 'test-full',
-        name: 'full-model.safetensors',
-        asset_hash: 'blake3:full123',
-        size: 999999,
-        tags: ['models', 'checkpoints'],
-        user_metadata: { filename: 'models/checkpoints/full-model.safetensors' }
-      })
-      mockApiResponse([fullAsset])
-
-      const result = await assetService.getAssetsByTag('models')
-
-      expect(result).toHaveLength(1)
-      expect(result[0]).toEqual(fullAsset)
-      expect(result[0]).toHaveProperty('asset_hash', 'blake3:full123')
-      expect(result[0]).toHaveProperty('user_metadata')
-    })
-
-    it('should exclude public assets when includePublic is false', async () => {
-      const testAssets = [MOCK_ASSETS.checkpoints]
-      mockApiResponse(testAssets)
-
-      const result = await assetService.getAssetsByTag('input', false)
-
-      expect(api.fetchApi).toHaveBeenCalledWith(
-        '/assets?include_tags=input&limit=500&include_public=false'
-      )
-      expect(result).toEqual(testAssets)
-    })
-
-    it('should include public assets when includePublic is true', async () => {
-      const testAssets = [MOCK_ASSETS.checkpoints, MOCK_ASSETS.loras]
-      mockApiResponse(testAssets)
-
-      const result = await assetService.getAssetsByTag('models', true)
-
-      expect(api.fetchApi).toHaveBeenCalledWith(
-        '/assets?include_tags=models&limit=500&include_public=true'
-      )
-      expect(result).toEqual(testAssets)
-    })
-
-    it('should accept custom limit via options', async () => {
-      const testAssets = [MOCK_ASSETS.checkpoints]
-      mockApiResponse(testAssets)
-
-      const result = await assetService.getAssetsByTag('input', false, {
-        limit: 100
-      })
-
-      expect(api.fetchApi).toHaveBeenCalledWith(
-        '/assets?include_tags=input&limit=100&include_public=false'
-      )
-      expect(result).toEqual(testAssets)
-    })
-
-    it('should accept custom offset via options', async () => {
-      const testAssets = [MOCK_ASSETS.loras]
-      mockApiResponse(testAssets)
-
-      const result = await assetService.getAssetsByTag('models', true, {
-        offset: 50
-      })
-
-      expect(api.fetchApi).toHaveBeenCalledWith(
-        '/assets?include_tags=models&limit=500&include_public=true&offset=50'
-      )
-      expect(result).toEqual(testAssets)
-    })
-
-    it('should accept both limit and offset via options', async () => {
-      const testAssets = [MOCK_ASSETS.checkpoints]
-      mockApiResponse(testAssets)
-
-      const result = await assetService.getAssetsByTag('input', false, {
-        limit: 100,
-        offset: 25
-      })
-
-      expect(api.fetchApi).toHaveBeenCalledWith(
-        '/assets?include_tags=input&limit=100&include_public=false&offset=25'
-      )
-      expect(result).toEqual(testAssets)
-    })
-  })
-})
diff --git a/tests-ui/tests/services/keybindingService.escape.test.ts b/tests-ui/tests/services/keybindingService.escape.test.ts
deleted file mode 100644
index 053b48bf48..0000000000
--- a/tests-ui/tests/services/keybindingService.escape.test.ts
+++ /dev/null
@@ -1,202 +0,0 @@
-import { createPinia, setActivePinia } from 'pinia'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-import { CORE_KEYBINDINGS } from '@/constants/coreKeybindings'
-import { useKeybindingService } from '@/services/keybindingService'
-import { useCommandStore } from '@/stores/commandStore'
-import { useDialogStore } from '@/stores/dialogStore'
-import {
-  KeyComboImpl,
-  KeybindingImpl,
-  useKeybindingStore
-} from '@/stores/keybindingStore'
-
-// Mock stores
-vi.mock('@/platform/settings/settingStore', () => ({
-  useSettingStore: vi.fn(() => ({
-    get: vi.fn(() => [])
-  }))
-}))
-
-vi.mock('@/stores/dialogStore', () => ({
-  useDialogStore: vi.fn(() => ({
-    dialogStack: []
-  }))
-}))
-
-describe('keybindingService - Escape key handling', () => {
-  let keybindingService: ReturnType<typeof useKeybindingService>
-  let mockCommandExecute: ReturnType<typeof useCommandStore>['execute']
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    setActivePinia(createPinia())
-
-    // Mock command store execute
-    const commandStore = useCommandStore()
-    mockCommandExecute = vi.fn()
-    commandStore.execute = mockCommandExecute
-
-    // Reset dialog store mock to empty
-    vi.mocked(useDialogStore).mockReturnValue({
-      dialogStack: []
-    } as any)
-
-    keybindingService = useKeybindingService()
-    keybindingService.registerCoreKeybindings()
-  })
-
-  it('should register Escape key for ExitSubgraph command', () => {
-    const keybindingStore = useKeybindingStore()
-
-    // Check that the Escape keybinding exists in core keybindings
-    const escapeKeybinding = CORE_KEYBINDINGS.find(
-      (kb) =>
-        kb.combo.key === 'Escape' && kb.commandId === 'Comfy.Graph.ExitSubgraph'
-    )
-    expect(escapeKeybinding).toBeDefined()
-
-    // Check that it was registered in the store
-    const registeredBinding = keybindingStore.getKeybinding(
-      new KeyComboImpl({ key: 'Escape' })
-    )
-    expect(registeredBinding).toBeDefined()
-    expect(registeredBinding?.commandId).toBe('Comfy.Graph.ExitSubgraph')
-  })
-
-  it('should execute ExitSubgraph command when Escape is pressed', async () => {
-    const event = new KeyboardEvent('keydown', {
-      key: 'Escape',
-      bubbles: true,
-      cancelable: true
-    })
-
-    // Mock event methods
-    event.preventDefault = vi.fn()
-    event.composedPath = vi.fn(() => [document.body])
-
-    await keybindingService.keybindHandler(event)
-
-    expect(event.preventDefault).toHaveBeenCalled()
-    expect(mockCommandExecute).toHaveBeenCalledWith('Comfy.Graph.ExitSubgraph')
-  })
-
-  it('should not execute command when Escape is pressed with modifiers', async () => {
-    const event = new KeyboardEvent('keydown', {
-      key: 'Escape',
-      ctrlKey: true,
-      bubbles: true,
-      cancelable: true
-    })
-
-    event.preventDefault = vi.fn()
-    event.composedPath = vi.fn(() => [document.body])
-
-    await keybindingService.keybindHandler(event)
-
-    expect(mockCommandExecute).not.toHaveBeenCalled()
-  })
-
-  it('should not execute command when typing in input field', async () => {
-    const inputElement = document.createElement('input')
-    const event = new KeyboardEvent('keydown', {
-      key: 'Escape',
-      bubbles: true,
-      cancelable: true
-    })
-
-    event.preventDefault = vi.fn()
-    event.composedPath = vi.fn(() => [inputElement])
-
-    await keybindingService.keybindHandler(event)
-
-    expect(mockCommandExecute).not.toHaveBeenCalled()
-  })
-
-  it('should close dialogs when no keybinding is registered', async () => {
-    // Remove the Escape keybinding
-    const keybindingStore = useKeybindingStore()
-    keybindingStore.unsetKeybinding(
-      new KeybindingImpl({
-        commandId: 'Comfy.Graph.ExitSubgraph',
-        combo: { key: 'Escape' }
-      })
-    )
-
-    // Create a mock dialog
-    const dialog = document.createElement('dialog')
-    dialog.open = true
-    dialog.close = vi.fn()
-    document.body.appendChild(dialog)
-
-    const event = new KeyboardEvent('keydown', {
-      key: 'Escape',
-      bubbles: true,
-      cancelable: true
-    })
-
-    event.composedPath = vi.fn(() => [document.body])
-
-    await keybindingService.keybindHandler(event)
-
-    expect(dialog.close).toHaveBeenCalled()
-    expect(mockCommandExecute).not.toHaveBeenCalled()
-
-    // Cleanup
-    document.body.removeChild(dialog)
-  })
-
-  it('should allow user to rebind Escape key to different command', async () => {
-    const keybindingStore = useKeybindingStore()
-
-    // Add a user keybinding for Escape to a different command
-    keybindingStore.addUserKeybinding(
-      new KeybindingImpl({
-        commandId: 'Custom.Command',
-        combo: { key: 'Escape' }
-      })
-    )
-
-    const event = new KeyboardEvent('keydown', {
-      key: 'Escape',
-      bubbles: true,
-      cancelable: true
-    })
-
-    event.preventDefault = vi.fn()
-    event.composedPath = vi.fn(() => [document.body])
-
-    await keybindingService.keybindHandler(event)
-
-    expect(event.preventDefault).toHaveBeenCalled()
-    expect(mockCommandExecute).toHaveBeenCalledWith('Custom.Command')
-    expect(mockCommandExecute).not.toHaveBeenCalledWith(
-      'Comfy.Graph.ExitSubgraph'
-    )
-  })
-
-  it('should not execute Escape keybinding when dialogs are open', async () => {
-    // Mock dialog store to have open dialogs
-    vi.mocked(useDialogStore).mockReturnValue({
-      dialogStack: [{ key: 'test-dialog' }]
-    } as any)
-
-    // Re-create keybinding service to pick up new mock
-    keybindingService = useKeybindingService()
-
-    const event = new KeyboardEvent('keydown', {
-      key: 'Escape',
-      bubbles: true,
-      cancelable: true
-    })
-
-    event.preventDefault = vi.fn()
-    event.composedPath = vi.fn(() => [document.body])
-
-    await keybindingService.keybindHandler(event)
-
-    // Should not call preventDefault or execute command
-    expect(event.preventDefault).not.toHaveBeenCalled()
-    expect(mockCommandExecute).not.toHaveBeenCalled()
-  })
-})
diff --git a/tests-ui/tests/services/keybindingService.forwarding.test.ts b/tests-ui/tests/services/keybindingService.forwarding.test.ts
deleted file mode 100644
index 1c62222dd6..0000000000
--- a/tests-ui/tests/services/keybindingService.forwarding.test.ts
+++ /dev/null
@@ -1,176 +0,0 @@
-import { createPinia, setActivePinia } from 'pinia'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-import { app } from '@/scripts/app'
-import { useKeybindingService } from '@/services/keybindingService'
-import { useCommandStore } from '@/stores/commandStore'
-import { useDialogStore } from '@/stores/dialogStore'
-
-// Mock the app and canvas using factory functions
-vi.mock('@/scripts/app', () => {
-  return {
-    app: {
-      canvas: {
-        processKey: vi.fn()
-      }
-    }
-  }
-})
-
-// Mock stores
-vi.mock('@/platform/settings/settingStore', () => ({
-  useSettingStore: vi.fn(() => ({
-    get: vi.fn(() => [])
-  }))
-}))
-
-vi.mock('@/stores/dialogStore', () => ({
-  useDialogStore: vi.fn(() => ({
-    dialogStack: []
-  }))
-}))
-
-// Test utility for creating keyboard events with mocked methods
-function createTestKeyboardEvent(
-  key: string,
-  options: {
-    target?: Element
-    ctrlKey?: boolean
-    altKey?: boolean
-    metaKey?: boolean
-  } = {}
-): KeyboardEvent {
-  const {
-    target = document.body,
-    ctrlKey = false,
-    altKey = false,
-    metaKey = false
-  } = options
-
-  const event = new KeyboardEvent('keydown', {
-    key,
-    ctrlKey,
-    altKey,
-    metaKey,
-    bubbles: true,
-    cancelable: true
-  })
-
-  // Mock event methods
-  event.preventDefault = vi.fn()
-  event.composedPath = vi.fn(() => [target])
-
-  return event
-}
-
-describe('keybindingService - Event Forwarding', () => {
-  let keybindingService: ReturnType<typeof useKeybindingService>
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    setActivePinia(createPinia())
-
-    // Mock command store execute
-    const commandStore = useCommandStore()
-    commandStore.execute = vi.fn()
-
-    // Reset dialog store mock to empty
-    vi.mocked(useDialogStore).mockReturnValue({
-      dialogStack: []
-    } as any)
-
-    keybindingService = useKeybindingService()
-    keybindingService.registerCoreKeybindings()
-  })
-
-  it('should forward Delete key to canvas when no keybinding exists', async () => {
-    const event = createTestKeyboardEvent('Delete')
-
-    await keybindingService.keybindHandler(event)
-
-    // Should forward to canvas processKey
-    expect(vi.mocked(app.canvas.processKey)).toHaveBeenCalledWith(event)
-    // Should not execute any command
-    expect(vi.mocked(useCommandStore().execute)).not.toHaveBeenCalled()
-  })
-
-  it('should forward Backspace key to canvas when no keybinding exists', async () => {
-    const event = createTestKeyboardEvent('Backspace')
-
-    await keybindingService.keybindHandler(event)
-
-    expect(vi.mocked(app.canvas.processKey)).toHaveBeenCalledWith(event)
-    expect(vi.mocked(useCommandStore().execute)).not.toHaveBeenCalled()
-  })
-
-  it('should not forward Delete key when typing in input field', async () => {
-    const inputElement = document.createElement('input')
-    const event = createTestKeyboardEvent('Delete', { target: inputElement })
-
-    await keybindingService.keybindHandler(event)
-
-    // Should not forward to canvas when in input field
-    expect(vi.mocked(app.canvas.processKey)).not.toHaveBeenCalled()
-    expect(vi.mocked(useCommandStore().execute)).not.toHaveBeenCalled()
-  })
-
-  it('should not forward Delete key when typing in textarea', async () => {
-    const textareaElement = document.createElement('textarea')
-    const event = createTestKeyboardEvent('Delete', { target: textareaElement })
-
-    await keybindingService.keybindHandler(event)
-
-    expect(vi.mocked(app.canvas.processKey)).not.toHaveBeenCalled()
-    expect(vi.mocked(useCommandStore().execute)).not.toHaveBeenCalled()
-  })
-
-  it('should not forward Delete key when canvas processKey is not available', async () => {
-    // Temporarily replace processKey with undefined
-    const originalProcessKey = vi.mocked(app.canvas).processKey
-    vi.mocked(app.canvas).processKey = undefined as any
-
-    const event = createTestKeyboardEvent('Delete')
-
-    await keybindingService.keybindHandler(event)
-
-    expect(vi.mocked(useCommandStore().execute)).not.toHaveBeenCalled()
-
-    // Restore processKey for other tests
-    vi.mocked(app.canvas).processKey = originalProcessKey
-  })
-
-  it('should not forward Delete key when canvas is not available', async () => {
-    // Temporarily set canvas to null
-    const originalCanvas = vi.mocked(app).canvas
-    vi.mocked(app).canvas = null as any
-
-    const event = createTestKeyboardEvent('Delete')
-
-    await keybindingService.keybindHandler(event)
-
-    expect(vi.mocked(useCommandStore().execute)).not.toHaveBeenCalled()
-
-    // Restore canvas for other tests
-    vi.mocked(app).canvas = originalCanvas
-  })
-
-  it('should not forward non-canvas keys', async () => {
-    const event = createTestKeyboardEvent('Enter')
-
-    await keybindingService.keybindHandler(event)
-
-    // Should not forward Enter key
-    expect(vi.mocked(app.canvas.processKey)).not.toHaveBeenCalled()
-    expect(vi.mocked(useCommandStore().execute)).not.toHaveBeenCalled()
-  })
-
-  it('should not forward when modifier keys are pressed', async () => {
-    const event = createTestKeyboardEvent('Delete', { ctrlKey: true })
-
-    await keybindingService.keybindHandler(event)
-
-    // Should not forward when modifiers are pressed
-    expect(vi.mocked(app.canvas.processKey)).not.toHaveBeenCalled()
-    expect(vi.mocked(useCommandStore().execute)).not.toHaveBeenCalled()
-  })
-})
diff --git a/tests-ui/tests/store/assetsStore.test.ts b/tests-ui/tests/store/assetsStore.test.ts
deleted file mode 100644
index 9f9d003fa5..0000000000
--- a/tests-ui/tests/store/assetsStore.test.ts
+++ /dev/null
@@ -1,519 +0,0 @@
-import { createPinia, setActivePinia } from 'pinia'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-import { useAssetsStore } from '@/stores/assetsStore'
-import { api } from '@/scripts/api'
-import type {
-  HistoryTaskItem,
-  TaskPrompt,
-  TaskStatus,
-  TaskOutput
-} from '@/schemas/apiSchema'
-
-// Mock the api module
-vi.mock('@/scripts/api', () => ({
-  api: {
-    getHistory: vi.fn(),
-    internalURL: vi.fn((path) => `http://localhost:3000${path}`),
-    user: 'test-user'
-  }
-}))
-
-// Mock the asset service
-vi.mock('@/platform/assets/services/assetService', () => ({
-  assetService: {
-    getAssetsByTag: vi.fn()
-  }
-}))
-
-// Mock distribution type
-vi.mock('@/platform/distribution/types', () => ({
-  isCloud: false
-}))
-
-// Mock TaskItemImpl
-vi.mock('@/stores/queueStore', () => ({
-  TaskItemImpl: class {
-    public flatOutputs: Array<{
-      supportsPreview: boolean
-      filename: string
-      subfolder: string
-      type: string
-      url: string
-    }>
-    public previewOutput:
-      | {
-          supportsPreview: boolean
-          filename: string
-          subfolder: string
-          type: string
-          url: string
-        }
-      | undefined
-
-    constructor(
-      public taskType: string,
-      public prompt: TaskPrompt,
-      public status: TaskStatus | undefined,
-      public outputs: TaskOutput
-    ) {
-      this.flatOutputs = this.outputs
-        ? [
-            {
-              supportsPreview: true,
-              filename: 'test.png',
-              subfolder: '',
-              type: 'output',
-              url: 'http://test.com/test.png'
-            }
-          ]
-        : []
-      this.previewOutput = this.flatOutputs[0]
-    }
-  }
-}))
-
-// Mock asset mappers - add unique timestamps
-vi.mock('@/platform/assets/composables/media/assetMappers', () => ({
-  mapInputFileToAssetItem: vi.fn((name, index, type) => ({
-    id: `${type}-${index}`,
-    name,
-    size: 0,
-    created_at: new Date(Date.now() - index * 1000).toISOString(), // Unique timestamps
-    tags: [type],
-    preview_url: `http://test.com/${name}`
-  })),
-  mapTaskOutputToAssetItem: vi.fn((task, output) => {
-    const index = parseInt(task.prompt[1].split('_')[1]) || 0
-    return {
-      id: task.prompt[1], // Use promptId as asset ID
-      name: output.filename,
-      size: 0,
-      created_at: new Date(Date.now() - index * 1000).toISOString(), // Unique timestamps
-      tags: ['output'],
-      preview_url: output.url,
-      user_metadata: {}
-    }
-  })
-}))
-
-describe('assetsStore - Refactored (Option A)', () => {
-  let store: ReturnType<typeof useAssetsStore>
-
-  // Helper function to create mock history items
-  const createMockHistoryItem = (index: number): HistoryTaskItem => ({
-    taskType: 'History' as const,
-    prompt: [
-      1000 + index, // queueIndex
-      `prompt_${index}`, // promptId
-      {}, // promptInputs
-      {
-        extra_pnginfo: {
-          workflow: {
-            last_node_id: 1,
-            last_link_id: 1,
-            nodes: [],
-            links: [],
-            groups: [],
-            config: {},
-            version: 1
-          }
-        }
-      }, // extraData
-      [] // outputsToExecute
-    ],
-    status: {
-      status_str: 'success' as const,
-      completed: true,
-      messages: []
-    },
-    outputs: {
-      '1': {
-        images: [
-          {
-            filename: `output_${index}.png`,
-            subfolder: '',
-            type: 'output' as const
-          }
-        ]
-      }
-    }
-  })
-
-  beforeEach(() => {
-    setActivePinia(createPinia())
-    store = useAssetsStore()
-    vi.clearAllMocks()
-  })
-
-  describe('Initial Load', () => {
-    it('should load initial history items', async () => {
-      const mockHistory = Array.from({ length: 10 }, (_, i) =>
-        createMockHistoryItem(i)
-      )
-      vi.mocked(api.getHistory).mockResolvedValue({
-        History: mockHistory
-      })
-
-      await store.updateHistory()
-
-      expect(api.getHistory).toHaveBeenCalledWith(200, { offset: 0 })
-      expect(store.historyAssets).toHaveLength(10)
-      expect(store.hasMoreHistory).toBe(false) // Less than BATCH_SIZE
-      expect(store.historyLoading).toBe(false)
-      expect(store.historyError).toBe(null)
-    })
-
-    it('should set hasMoreHistory to true when batch is full', async () => {
-      const mockHistory = Array.from({ length: 200 }, (_, i) =>
-        createMockHistoryItem(i)
-      )
-      vi.mocked(api.getHistory).mockResolvedValue({
-        History: mockHistory
-      })
-
-      await store.updateHistory()
-
-      expect(store.historyAssets).toHaveLength(200)
-      expect(store.hasMoreHistory).toBe(true) // Exactly BATCH_SIZE
-    })
-
-    it('should handle errors during initial load', async () => {
-      const error = new Error('Failed to fetch')
-      vi.mocked(api.getHistory).mockRejectedValue(error)
-
-      await store.updateHistory()
-
-      expect(store.historyAssets).toHaveLength(0)
-      expect(store.historyError).toBe(error)
-      expect(store.historyLoading).toBe(false)
-    })
-  })
-
-  describe('Pagination', () => {
-    it('should accumulate items when loading more', async () => {
-      // First batch - full BATCH_SIZE
-      const firstBatch = Array.from({ length: 200 }, (_, i) =>
-        createMockHistoryItem(i)
-      )
-      vi.mocked(api.getHistory).mockResolvedValueOnce({
-        History: firstBatch
-      })
-
-      await store.updateHistory()
-      expect(store.historyAssets).toHaveLength(200)
-      expect(store.hasMoreHistory).toBe(true)
-
-      // Second batch - different items
-      const secondBatch = Array.from({ length: 200 }, (_, i) =>
-        createMockHistoryItem(200 + i)
-      )
-      vi.mocked(api.getHistory).mockResolvedValueOnce({
-        History: secondBatch
-      })
-
-      await store.loadMoreHistory()
-
-      expect(api.getHistory).toHaveBeenCalledWith(200, { offset: 200 })
-      expect(store.historyAssets).toHaveLength(400) // Accumulated
-      expect(store.hasMoreHistory).toBe(true)
-    })
-
-    it('should prevent duplicate items during pagination', async () => {
-      // First batch - full BATCH_SIZE
-      const firstBatch = Array.from({ length: 200 }, (_, i) =>
-        createMockHistoryItem(i)
-      )
-      vi.mocked(api.getHistory).mockResolvedValueOnce({
-        History: firstBatch
-      })
-
-      await store.updateHistory()
-      expect(store.historyAssets).toHaveLength(200)
-
-      // Second batch with some duplicates
-      const secondBatch = [
-        createMockHistoryItem(2), // Duplicate
-        createMockHistoryItem(5), // Duplicate
-        ...Array.from({ length: 198 }, (_, i) => createMockHistoryItem(200 + i)) // New
-      ]
-      vi.mocked(api.getHistory).mockResolvedValueOnce({
-        History: secondBatch
-      })
-
-      await store.loadMoreHistory()
-
-      // Should only add new items (198 new, 2 duplicates filtered)
-      expect(store.historyAssets).toHaveLength(398)
-
-      // Verify no duplicates
-      const assetIds = store.historyAssets.map((a) => a.id)
-      const uniqueAssetIds = new Set(assetIds)
-      expect(uniqueAssetIds.size).toBe(store.historyAssets.length)
-    })
-
-    it('should stop loading when no more items', async () => {
-      // First batch - less than BATCH_SIZE
-      const firstBatch = Array.from({ length: 50 }, (_, i) =>
-        createMockHistoryItem(i)
-      )
-      vi.mocked(api.getHistory).mockResolvedValueOnce({
-        History: firstBatch
-      })
-
-      await store.updateHistory()
-      expect(store.hasMoreHistory).toBe(false)
-
-      // Try to load more - should return early
-      await store.loadMoreHistory()
-
-      // Should only have been called once (initial load)
-      expect(api.getHistory).toHaveBeenCalledTimes(1)
-    })
-
-    it('should handle race conditions with concurrent loads', async () => {
-      // Setup initial state with full batch
-      const initialBatch = Array.from({ length: 200 }, (_, i) =>
-        createMockHistoryItem(i)
-      )
-      vi.mocked(api.getHistory).mockResolvedValueOnce({
-        History: initialBatch
-      })
-      await store.updateHistory()
-      expect(store.hasMoreHistory).toBe(true)
-
-      // Clear mock to count only loadMore calls
-      vi.mocked(api.getHistory).mockClear()
-
-      // Setup slow API response
-      let resolveLoadMore: (value: { History: HistoryTaskItem[] }) => void
-      const loadMorePromise = new Promise<{ History: HistoryTaskItem[] }>(
-        (resolve) => {
-          resolveLoadMore = resolve
-        }
-      )
-      vi.mocked(api.getHistory).mockReturnValueOnce(loadMorePromise)
-
-      // Start first loadMore
-      const firstLoad = store.loadMoreHistory()
-
-      // Try concurrent load - should be ignored
-      const secondLoad = store.loadMoreHistory()
-
-      // Resolve
-      const secondBatch = Array.from({ length: 200 }, (_, i) =>
-        createMockHistoryItem(200 + i)
-      )
-      resolveLoadMore!({ History: secondBatch })
-
-      await Promise.all([firstLoad, secondLoad])
-
-      // Only one API call
-      expect(api.getHistory).toHaveBeenCalledTimes(1)
-    })
-
-    it('should respect MAX_HISTORY_ITEMS limit', async () => {
-      const BATCH_COUNT = 6 // 6 × 200 = 1200 items
-
-      // Initial load
-      const firstBatch = Array.from({ length: 200 }, (_, i) =>
-        createMockHistoryItem(i)
-      )
-      vi.mocked(api.getHistory).mockResolvedValueOnce({
-        History: firstBatch
-      })
-      await store.updateHistory()
-
-      // Load additional batches
-      for (let batch = 1; batch < BATCH_COUNT; batch++) {
-        const items = Array.from({ length: 200 }, (_, i) =>
-          createMockHistoryItem(batch * 200 + i)
-        )
-        vi.mocked(api.getHistory).mockResolvedValueOnce({
-          History: items
-        })
-        await store.loadMoreHistory()
-      }
-
-      // Should be capped at MAX_HISTORY_ITEMS (1000)
-      expect(store.historyAssets).toHaveLength(1000)
-    })
-  })
-
-  describe('Sorting', () => {
-    it('should maintain date sorting after pagination', async () => {
-      // First batch
-      const firstBatch = Array.from({ length: 200 }, (_, i) =>
-        createMockHistoryItem(i)
-      )
-      vi.mocked(api.getHistory).mockResolvedValueOnce({
-        History: firstBatch
-      })
-
-      await store.updateHistory()
-
-      // Second batch
-      const secondBatch = Array.from({ length: 200 }, (_, i) =>
-        createMockHistoryItem(200 + i)
-      )
-      vi.mocked(api.getHistory).mockResolvedValueOnce({
-        History: secondBatch
-      })
-
-      await store.loadMoreHistory()
-
-      // Verify sorting (newest first - lower index = newer)
-      for (let i = 1; i < store.historyAssets.length; i++) {
-        const prevDate = new Date(store.historyAssets[i - 1].created_at)
-        const currDate = new Date(store.historyAssets[i].created_at)
-        expect(prevDate.getTime()).toBeGreaterThanOrEqual(currDate.getTime())
-      }
-    })
-  })
-
-  describe('Error Handling', () => {
-    it('should preserve existing data when loadMore fails', async () => {
-      // First successful load - full batch
-      const firstBatch = Array.from({ length: 200 }, (_, i) =>
-        createMockHistoryItem(i)
-      )
-      vi.mocked(api.getHistory).mockResolvedValueOnce({
-        History: firstBatch
-      })
-
-      await store.updateHistory()
-      expect(store.historyAssets).toHaveLength(200)
-
-      // Second load fails
-      const error = new Error('Network error')
-      vi.mocked(api.getHistory).mockRejectedValueOnce(error)
-
-      await store.loadMoreHistory()
-
-      // Should keep existing data
-      expect(store.historyAssets).toHaveLength(200)
-      expect(store.historyError).toBe(error)
-      expect(store.isLoadingMore).toBe(false)
-    })
-
-    it('should clear error state on successful retry', async () => {
-      // First load succeeds
-      const firstBatch = Array.from({ length: 200 }, (_, i) =>
-        createMockHistoryItem(i)
-      )
-      vi.mocked(api.getHistory).mockResolvedValueOnce({
-        History: firstBatch
-      })
-
-      await store.updateHistory()
-
-      // Second load fails
-      const error = new Error('Network error')
-      vi.mocked(api.getHistory).mockRejectedValueOnce(error)
-
-      await store.loadMoreHistory()
-      expect(store.historyError).toBe(error)
-
-      // Third load succeeds
-      const thirdBatch = Array.from({ length: 200 }, (_, i) =>
-        createMockHistoryItem(200 + i)
-      )
-      vi.mocked(api.getHistory).mockResolvedValueOnce({
-        History: thirdBatch
-      })
-
-      await store.loadMoreHistory()
-
-      // Error should be cleared
-      expect(store.historyError).toBe(null)
-      expect(store.historyAssets).toHaveLength(400)
-    })
-
-    it('should handle errors with proper loading state', async () => {
-      const error = new Error('API error')
-      vi.mocked(api.getHistory).mockRejectedValue(error)
-
-      await store.updateHistory()
-
-      expect(store.historyLoading).toBe(false)
-      expect(store.historyError).toBe(error)
-    })
-  })
-
-  describe('Memory Management', () => {
-    it('should cleanup when exceeding MAX_HISTORY_ITEMS', async () => {
-      // Load 1200 items (exceeds 1000 limit)
-      const batches = 6
-
-      for (let batch = 0; batch < batches; batch++) {
-        const items = Array.from({ length: 200 }, (_, i) =>
-          createMockHistoryItem(batch * 200 + i)
-        )
-        vi.mocked(api.getHistory).mockResolvedValueOnce({
-          History: items
-        })
-
-        if (batch === 0) {
-          await store.updateHistory()
-        } else {
-          await store.loadMoreHistory()
-        }
-      }
-
-      // Should be limited to 1000
-      expect(store.historyAssets).toHaveLength(1000)
-
-      // All items should be unique (Set cleanup works)
-      const assetIds = store.historyAssets.map((a) => a.id)
-      const uniqueAssetIds = new Set(assetIds)
-      expect(uniqueAssetIds.size).toBe(1000)
-    })
-
-    it('should maintain correct state after cleanup', async () => {
-      // Load items beyond limit
-      for (let batch = 0; batch < 6; batch++) {
-        const items = Array.from({ length: 200 }, (_, i) =>
-          createMockHistoryItem(batch * 200 + i)
-        )
-        vi.mocked(api.getHistory).mockResolvedValueOnce({
-          History: items
-        })
-
-        if (batch === 0) {
-          await store.updateHistory()
-        } else {
-          await store.loadMoreHistory()
-        }
-      }
-
-      expect(store.historyAssets).toHaveLength(1000)
-
-      // Should still maintain sorting
-      for (let i = 1; i < store.historyAssets.length; i++) {
-        const prevDate = new Date(store.historyAssets[i - 1].created_at)
-        const currDate = new Date(store.historyAssets[i].created_at)
-        expect(prevDate.getTime()).toBeGreaterThanOrEqual(currDate.getTime())
-      }
-    })
-  })
-
-  describe('jobDetailView Support', () => {
-    it('should include outputCount and allOutputs in user_metadata', async () => {
-      const mockHistory = Array.from({ length: 5 }, (_, i) =>
-        createMockHistoryItem(i)
-      )
-      vi.mocked(api.getHistory).mockResolvedValue({
-        History: mockHistory
-      })
-
-      await store.updateHistory()
-
-      // Check first asset
-      const asset = store.historyAssets[0]
-      expect(asset.user_metadata).toBeDefined()
-      expect(asset.user_metadata).toHaveProperty('outputCount')
-      expect(asset.user_metadata).toHaveProperty('allOutputs')
-      expect(Array.isArray(asset.user_metadata!.allOutputs)).toBe(true)
-    })
-  })
-})
diff --git a/tests-ui/tests/store/imagePreviewStore.test.ts b/tests-ui/tests/store/imagePreviewStore.test.ts
deleted file mode 100644
index d2bb8d639c..0000000000
--- a/tests-ui/tests/store/imagePreviewStore.test.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import { createPinia, setActivePinia } from 'pinia'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
-import type { ExecutedWsMessage } from '@/schemas/apiSchema'
-import { app } from '@/scripts/app'
-import { useNodeOutputStore } from '@/stores/imagePreviewStore'
-import * as litegraphUtil from '@/utils/litegraphUtil'
-
-vi.mock('@/utils/litegraphUtil', () => ({
-  isVideoNode: vi.fn()
-}))
-
-vi.mock('@/scripts/app', () => ({
-  app: {
-    getPreviewFormatParam: vi.fn(() => '&format=test_webp')
-  }
-}))
-
-const createMockNode = (overrides: Partial<LGraphNode> = {}): LGraphNode =>
-  ({
-    id: 1,
-    type: 'TestNode',
-    ...overrides
-  }) as LGraphNode
-
-const createMockOutputs = (
-  images?: ExecutedWsMessage['output']['images']
-): ExecutedWsMessage['output'] => ({ images })
-
-describe('imagePreviewStore getPreviewParam', () => {
-  beforeEach(() => {
-    setActivePinia(createPinia())
-    vi.clearAllMocks()
-    vi.mocked(litegraphUtil.isVideoNode).mockReturnValue(false)
-  })
-
-  it('should return empty string if node.animatedImages is true', () => {
-    const store = useNodeOutputStore()
-    // @ts-expect-error `animatedImages` property is not typed
-    const node = createMockNode({ animatedImages: true })
-    const outputs = createMockOutputs([{ filename: 'img.png' }])
-    expect(store.getPreviewParam(node, outputs)).toBe('')
-    expect(vi.mocked(app).getPreviewFormatParam).not.toHaveBeenCalled()
-  })
-
-  it('should return empty string if isVideoNode returns true', () => {
-    const store = useNodeOutputStore()
-    vi.mocked(litegraphUtil.isVideoNode).mockReturnValue(true)
-    const node = createMockNode()
-    const outputs = createMockOutputs([{ filename: 'img.png' }])
-    expect(store.getPreviewParam(node, outputs)).toBe('')
-    expect(vi.mocked(app).getPreviewFormatParam).not.toHaveBeenCalled()
-  })
-
-  it('should return empty string if outputs.images is undefined', () => {
-    const store = useNodeOutputStore()
-    const node = createMockNode()
-    const outputs: ExecutedWsMessage['output'] = {}
-    expect(store.getPreviewParam(node, outputs)).toBe('')
-    expect(vi.mocked(app).getPreviewFormatParam).not.toHaveBeenCalled()
-  })
-
-  it('should return empty string if outputs.images is empty', () => {
-    const store = useNodeOutputStore()
-    const node = createMockNode()
-    const outputs = createMockOutputs([])
-    expect(store.getPreviewParam(node, outputs)).toBe('')
-    expect(vi.mocked(app).getPreviewFormatParam).not.toHaveBeenCalled()
-  })
-
-  it('should return empty string if outputs.images contains SVG images', () => {
-    const store = useNodeOutputStore()
-    const node = createMockNode()
-    const outputs = createMockOutputs([{ filename: 'img.svg' }])
-    expect(store.getPreviewParam(node, outputs)).toBe('')
-    expect(vi.mocked(app).getPreviewFormatParam).not.toHaveBeenCalled()
-  })
-
-  it('should return format param for standard image outputs', () => {
-    const store = useNodeOutputStore()
-    const node = createMockNode()
-    const outputs = createMockOutputs([{ filename: 'img.png' }])
-    expect(store.getPreviewParam(node, outputs)).toBe('&format=test_webp')
-    expect(vi.mocked(app).getPreviewFormatParam).toHaveBeenCalledTimes(1)
-  })
-
-  it('should return format param for multiple standard images', () => {
-    const store = useNodeOutputStore()
-    const node = createMockNode()
-    const outputs = createMockOutputs([
-      { filename: 'img1.png' },
-      { filename: 'img2.jpg' }
-    ])
-    expect(store.getPreviewParam(node, outputs)).toBe('&format=test_webp')
-    expect(vi.mocked(app).getPreviewFormatParam).toHaveBeenCalledTimes(1)
-  })
-})
diff --git a/tests-ui/tests/store/queueStore.test.ts b/tests-ui/tests/store/queueStore.test.ts
deleted file mode 100644
index e01ec5afdf..0000000000
--- a/tests-ui/tests/store/queueStore.test.ts
+++ /dev/null
@@ -1,773 +0,0 @@
-import { createPinia, setActivePinia } from 'pinia'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-import type {
-  HistoryTaskItem,
-  PendingTaskItem,
-  RunningTaskItem,
-  TaskOutput,
-  TaskPrompt,
-  TaskStatus
-} from '@/schemas/apiSchema'
-import { api } from '@/scripts/api'
-import { TaskItemImpl, useQueueStore } from '@/stores/queueStore'
-
-// Fixture factories
-const createTaskPrompt = (
-  queueIndex: number,
-  promptId: string,
-  inputs: Record<string, any> = {},
-  extraData: Record<string, any> = {},
-  outputsToExecute: any[] = []
-): TaskPrompt => [queueIndex, promptId, inputs, extraData, outputsToExecute]
-
-const createTaskStatus = (
-  statusStr: 'success' | 'error' = 'success',
-  messages: any[] = []
-): TaskStatus => ({
-  status_str: statusStr,
-  completed: true,
-  messages
-})
-
-const createTaskOutput = (
-  nodeId: string = 'node-1',
-  images: any[] = []
-): TaskOutput => ({
-  [nodeId]: {
-    images
-  }
-})
-
-const createRunningTask = (
-  queueIndex: number,
-  promptId: string
-): RunningTaskItem => ({
-  taskType: 'Running',
-  prompt: createTaskPrompt(queueIndex, promptId),
-  remove: { name: 'Cancel', cb: () => {} }
-})
-
-const createPendingTask = (
-  queueIndex: number,
-  promptId: string
-): PendingTaskItem => ({
-  taskType: 'Pending',
-  prompt: createTaskPrompt(queueIndex, promptId)
-})
-
-const createHistoryTask = (
-  queueIndex: number,
-  promptId: string,
-  outputs: TaskOutput = createTaskOutput(),
-  status: TaskStatus = createTaskStatus()
-): HistoryTaskItem => ({
-  taskType: 'History',
-  prompt: createTaskPrompt(queueIndex, promptId),
-  status,
-  outputs
-})
-
-// Mock API
-vi.mock('@/scripts/api', () => ({
-  api: {
-    getQueue: vi.fn(),
-    getHistory: vi.fn(),
-    clearItems: vi.fn(),
-    deleteItem: vi.fn(),
-    apiURL: vi.fn((path) => `/api${path}`),
-    addEventListener: vi.fn(),
-    removeEventListener: vi.fn()
-  }
-}))
-
-describe('TaskItemImpl', () => {
-  it('should remove animated property from outputs during construction', () => {
-    const taskItem = new TaskItemImpl(
-      'History',
-      [0, 'prompt-id', {}, { client_id: 'client-id' }, []],
-      { status_str: 'success', messages: [], completed: true },
-      {
-        'node-1': {
-          images: [{ filename: 'test.png', type: 'output', subfolder: '' }],
-          animated: [false]
-        }
-      }
-    )
-
-    // Check that animated property was removed
-    expect('animated' in taskItem.outputs['node-1']).toBe(false)
-
-    expect(taskItem.outputs['node-1'].images).toBeDefined()
-    expect(taskItem.outputs['node-1'].images?.[0]?.filename).toBe('test.png')
-  })
-
-  it('should handle outputs without animated property', () => {
-    const taskItem = new TaskItemImpl(
-      'History',
-      [0, 'prompt-id', {}, { client_id: 'client-id' }, []],
-      { status_str: 'success', messages: [], completed: true },
-      {
-        'node-1': {
-          images: [{ filename: 'test.png', type: 'output', subfolder: '' }]
-        }
-      }
-    )
-
-    expect(taskItem.outputs['node-1'].images).toBeDefined()
-    expect(taskItem.outputs['node-1'].images?.[0]?.filename).toBe('test.png')
-  })
-
-  it('should recognize webm video from core', () => {
-    const taskItem = new TaskItemImpl(
-      'History',
-      [0, 'prompt-id', {}, { client_id: 'client-id' }, []],
-      { status_str: 'success', messages: [], completed: true },
-      {
-        'node-1': {
-          video: [{ filename: 'test.webm', type: 'output', subfolder: '' }]
-        }
-      }
-    )
-
-    const output = taskItem.flatOutputs[0]
-
-    expect(output.htmlVideoType).toBe('video/webm')
-    expect(output.isVideo).toBe(true)
-    expect(output.isWebm).toBe(true)
-    expect(output.isVhsFormat).toBe(false)
-    expect(output.isImage).toBe(false)
-  })
-
-  // https://github.com/Kosinkadink/ComfyUI-VideoHelperSuite/blob/0a75c7958fe320efcb052f1d9f8451fd20c730a8/videohelpersuite/nodes.py#L578-L590
-  it('should recognize webm video from VHS', () => {
-    const taskItem = new TaskItemImpl(
-      'History',
-      [0, 'prompt-id', {}, { client_id: 'client-id' }, []],
-      { status_str: 'success', messages: [], completed: true },
-      {
-        'node-1': {
-          gifs: [
-            {
-              filename: 'test.webm',
-              type: 'output',
-              subfolder: '',
-              format: 'video/webm',
-              frame_rate: 30
-            }
-          ]
-        }
-      }
-    )
-
-    const output = taskItem.flatOutputs[0]
-
-    expect(output.htmlVideoType).toBe('video/webm')
-    expect(output.isVideo).toBe(true)
-    expect(output.isWebm).toBe(true)
-    expect(output.isVhsFormat).toBe(true)
-    expect(output.isImage).toBe(false)
-  })
-
-  it('should recognize mp4 video from core', () => {
-    const taskItem = new TaskItemImpl(
-      'History',
-      [0, 'prompt-id', {}, { client_id: 'client-id' }, []],
-      { status_str: 'success', messages: [], completed: true },
-      {
-        'node-1': {
-          images: [
-            {
-              filename: 'test.mp4',
-              type: 'output',
-              subfolder: ''
-            }
-          ],
-          animated: [true]
-        }
-      }
-    )
-
-    const output = taskItem.flatOutputs[0]
-
-    expect(output.htmlVideoType).toBe('video/mp4')
-    expect(output.isVideo).toBe(true)
-    expect(output.isImage).toBe(false)
-  })
-
-  describe('audio format detection', () => {
-    const audioFormats = [
-      { extension: 'mp3', mimeType: 'audio/mpeg' },
-      { extension: 'wav', mimeType: 'audio/wav' },
-      { extension: 'ogg', mimeType: 'audio/ogg' },
-      { extension: 'flac', mimeType: 'audio/flac' }
-    ]
-
-    audioFormats.forEach(({ extension, mimeType }) => {
-      it(`should recognize ${extension} audio`, () => {
-        const taskItem = new TaskItemImpl(
-          'History',
-          [0, 'prompt-id', {}, { client_id: 'client-id' }, []],
-          { status_str: 'success', messages: [], completed: true },
-          {
-            'node-1': {
-              audio: [
-                {
-                  filename: `test.${extension}`,
-                  type: 'output',
-                  subfolder: ''
-                }
-              ]
-            }
-          }
-        )
-
-        const output = taskItem.flatOutputs[0]
-
-        expect(output.htmlAudioType).toBe(mimeType)
-        expect(output.isAudio).toBe(true)
-        expect(output.isVideo).toBe(false)
-        expect(output.isImage).toBe(false)
-        expect(output.supportsPreview).toBe(true)
-      })
-    })
-  })
-})
-
-describe('useQueueStore', () => {
-  let store: ReturnType<typeof useQueueStore>
-
-  beforeEach(() => {
-    setActivePinia(createPinia())
-    store = useQueueStore()
-    vi.clearAllMocks()
-  })
-
-  const mockGetQueue = vi.mocked(api.getQueue)
-  const mockGetHistory = vi.mocked(api.getHistory)
-  const mockClearItems = vi.mocked(api.clearItems)
-  const mockDeleteItem = vi.mocked(api.deleteItem)
-
-  describe('initial state', () => {
-    it('should have empty state on initialization', () => {
-      expect(store.runningTasks).toEqual([])
-      expect(store.pendingTasks).toEqual([])
-      expect(store.historyTasks).toEqual([])
-      expect(store.isLoading).toBe(false)
-      expect(store.maxHistoryItems).toBe(64)
-    })
-
-    it('should have empty computed tasks', () => {
-      expect(store.tasks).toEqual([])
-      expect(store.flatTasks).toEqual([])
-      expect(store.hasPendingTasks).toBe(false)
-      expect(store.lastHistoryQueueIndex).toBe(-1)
-    })
-  })
-
-  describe('update() - basic functionality', () => {
-    it('should load running and pending tasks from API', async () => {
-      const runningTask = createRunningTask(1, 'run-1')
-      const pendingTask1 = createPendingTask(2, 'pend-1')
-      const pendingTask2 = createPendingTask(3, 'pend-2')
-
-      mockGetQueue.mockResolvedValue({
-        Running: [runningTask],
-        Pending: [pendingTask1, pendingTask2]
-      })
-      mockGetHistory.mockResolvedValue({ History: [] })
-
-      await store.update()
-
-      expect(store.runningTasks).toHaveLength(1)
-      expect(store.pendingTasks).toHaveLength(2)
-      expect(store.runningTasks[0].promptId).toBe('run-1')
-      expect(store.pendingTasks[0].promptId).toBe('pend-2')
-      expect(store.pendingTasks[1].promptId).toBe('pend-1')
-    })
-
-    it('should load history tasks from API', async () => {
-      const historyTask1 = createHistoryTask(5, 'hist-1')
-      const historyTask2 = createHistoryTask(4, 'hist-2')
-
-      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
-      mockGetHistory.mockResolvedValue({
-        History: [historyTask1, historyTask2]
-      })
-
-      await store.update()
-
-      expect(store.historyTasks).toHaveLength(2)
-      expect(store.historyTasks[0].promptId).toBe('hist-1')
-      expect(store.historyTasks[1].promptId).toBe('hist-2')
-    })
-
-    it('should set loading state correctly', async () => {
-      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
-      mockGetHistory.mockResolvedValue({ History: [] })
-
-      expect(store.isLoading).toBe(false)
-
-      const updatePromise = store.update()
-      expect(store.isLoading).toBe(true)
-
-      await updatePromise
-      expect(store.isLoading).toBe(false)
-    })
-
-    it('should clear loading state even if API fails', async () => {
-      mockGetQueue.mockRejectedValue(new Error('API error'))
-      mockGetHistory.mockResolvedValue({ History: [] })
-
-      await expect(store.update()).rejects.toThrow('API error')
-      expect(store.isLoading).toBe(false)
-    })
-  })
-
-  describe('update() - sorting', () => {
-    it('should sort tasks by queueIndex descending', async () => {
-      const task1 = createHistoryTask(1, 'hist-1')
-      const task2 = createHistoryTask(5, 'hist-2')
-      const task3 = createHistoryTask(3, 'hist-3')
-
-      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
-      mockGetHistory.mockResolvedValue({
-        History: [task1, task2, task3]
-      })
-
-      await store.update()
-
-      expect(store.historyTasks[0].queueIndex).toBe(5)
-      expect(store.historyTasks[1].queueIndex).toBe(3)
-      expect(store.historyTasks[2].queueIndex).toBe(1)
-    })
-
-    it('should sort pending tasks by queueIndex descending', async () => {
-      const pend1 = createPendingTask(10, 'pend-1')
-      const pend2 = createPendingTask(15, 'pend-2')
-      const pend3 = createPendingTask(12, 'pend-3')
-
-      mockGetQueue.mockResolvedValue({
-        Running: [],
-        Pending: [pend1, pend2, pend3]
-      })
-      mockGetHistory.mockResolvedValue({ History: [] })
-
-      await store.update()
-
-      expect(store.pendingTasks[0].queueIndex).toBe(15)
-      expect(store.pendingTasks[1].queueIndex).toBe(12)
-      expect(store.pendingTasks[2].queueIndex).toBe(10)
-    })
-  })
-
-  describe('update() - queue index collision (THE BUG FIX)', () => {
-    it('should NOT confuse different prompts with same queueIndex', async () => {
-      const hist1 = createHistoryTask(50, 'prompt-uuid-aaa')
-
-      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
-      mockGetHistory.mockResolvedValue({ History: [hist1] })
-
-      await store.update()
-      expect(store.historyTasks).toHaveLength(1)
-      expect(store.historyTasks[0].promptId).toBe('prompt-uuid-aaa')
-
-      const hist2 = createHistoryTask(51, 'prompt-uuid-bbb')
-      mockGetHistory.mockResolvedValue({
-        History: [hist2]
-      })
-
-      await store.update()
-
-      expect(store.historyTasks).toHaveLength(1)
-      expect(store.historyTasks[0].promptId).toBe('prompt-uuid-bbb')
-      expect(store.historyTasks[0].queueIndex).toBe(51)
-    })
-
-    it('should correctly reconcile when queueIndex is reused', async () => {
-      const hist1 = createHistoryTask(100, 'first-prompt-at-100')
-      const hist2 = createHistoryTask(99, 'prompt-at-99')
-
-      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
-      mockGetHistory.mockResolvedValue({ History: [hist1, hist2] })
-
-      await store.update()
-      expect(store.historyTasks).toHaveLength(2)
-
-      const hist3 = createHistoryTask(101, 'second-prompt-at-101')
-      mockGetHistory.mockResolvedValue({
-        History: [hist3, hist2]
-      })
-
-      await store.update()
-
-      expect(store.historyTasks).toHaveLength(2)
-      const promptIds = store.historyTasks.map((t) => t.promptId)
-      expect(promptIds).toContain('second-prompt-at-101')
-      expect(promptIds).toContain('prompt-at-99')
-      expect(promptIds).not.toContain('first-prompt-at-100')
-    })
-
-    it('should handle multiple queueIndex collisions simultaneously', async () => {
-      const hist1 = createHistoryTask(10, 'old-at-10')
-      const hist2 = createHistoryTask(20, 'old-at-20')
-      const hist3 = createHistoryTask(30, 'keep-at-30')
-
-      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
-      mockGetHistory.mockResolvedValue({
-        History: [hist3, hist2, hist1]
-      })
-
-      await store.update()
-      expect(store.historyTasks).toHaveLength(3)
-
-      const newHist1 = createHistoryTask(31, 'new-at-31')
-      const newHist2 = createHistoryTask(32, 'new-at-32')
-      mockGetHistory.mockResolvedValue({
-        History: [newHist2, newHist1, hist3]
-      })
-
-      await store.update()
-
-      expect(store.historyTasks).toHaveLength(3)
-      const promptIds = store.historyTasks.map((t) => t.promptId)
-      expect(promptIds).toEqual(['new-at-32', 'new-at-31', 'keep-at-30'])
-    })
-  })
-
-  describe('update() - history reconciliation', () => {
-    it('should keep existing items still on server (by promptId)', async () => {
-      const hist1 = createHistoryTask(10, 'existing-1')
-      const hist2 = createHistoryTask(9, 'existing-2')
-
-      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
-      mockGetHistory.mockResolvedValue({ History: [hist1, hist2] })
-
-      await store.update()
-      expect(store.historyTasks).toHaveLength(2)
-
-      const hist3 = createHistoryTask(11, 'new-1')
-      mockGetHistory.mockResolvedValue({
-        History: [hist3, hist1, hist2]
-      })
-
-      await store.update()
-
-      expect(store.historyTasks).toHaveLength(3)
-      expect(store.historyTasks.map((t) => t.promptId)).toContain('existing-1')
-      expect(store.historyTasks.map((t) => t.promptId)).toContain('existing-2')
-      expect(store.historyTasks.map((t) => t.promptId)).toContain('new-1')
-    })
-
-    it('should remove items no longer on server', async () => {
-      const hist1 = createHistoryTask(10, 'remove-me')
-      const hist2 = createHistoryTask(9, 'keep-me')
-
-      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
-      mockGetHistory.mockResolvedValue({ History: [hist1, hist2] })
-
-      await store.update()
-      expect(store.historyTasks).toHaveLength(2)
-
-      mockGetHistory.mockResolvedValue({ History: [hist2] })
-
-      await store.update()
-
-      expect(store.historyTasks).toHaveLength(1)
-      expect(store.historyTasks[0].promptId).toBe('keep-me')
-    })
-
-    it('should add new items from server', async () => {
-      const hist1 = createHistoryTask(5, 'old-1')
-
-      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
-      mockGetHistory.mockResolvedValue({ History: [hist1] })
-
-      await store.update()
-
-      const hist2 = createHistoryTask(6, 'new-1')
-      const hist3 = createHistoryTask(7, 'new-2')
-      mockGetHistory.mockResolvedValue({
-        History: [hist3, hist2, hist1]
-      })
-
-      await store.update()
-
-      expect(store.historyTasks).toHaveLength(3)
-      expect(store.historyTasks.map((t) => t.promptId)).toContain('new-1')
-      expect(store.historyTasks.map((t) => t.promptId)).toContain('new-2')
-    })
-  })
-
-  describe('update() - maxHistoryItems limit', () => {
-    it('should enforce maxHistoryItems limit', async () => {
-      store.maxHistoryItems = 3
-
-      const tasks = Array.from({ length: 5 }, (_, i) =>
-        createHistoryTask(10 - i, `hist-${i}`)
-      )
-
-      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
-      mockGetHistory.mockResolvedValue({ History: tasks })
-
-      await store.update()
-
-      expect(store.historyTasks).toHaveLength(3)
-      expect(store.historyTasks[0].queueIndex).toBe(10)
-      expect(store.historyTasks[1].queueIndex).toBe(9)
-      expect(store.historyTasks[2].queueIndex).toBe(8)
-    })
-
-    it('should respect maxHistoryItems when combining new and existing', async () => {
-      store.maxHistoryItems = 5
-
-      const initial = Array.from({ length: 3 }, (_, i) =>
-        createHistoryTask(10 + i, `existing-${i}`)
-      )
-
-      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
-      mockGetHistory.mockResolvedValue({ History: initial })
-
-      await store.update()
-      expect(store.historyTasks).toHaveLength(3)
-
-      const newTasks = Array.from({ length: 4 }, (_, i) =>
-        createHistoryTask(20 + i, `new-${i}`)
-      )
-      mockGetHistory.mockResolvedValue({
-        History: [...newTasks, ...initial]
-      })
-
-      await store.update()
-
-      expect(store.historyTasks).toHaveLength(5)
-      expect(store.historyTasks[0].queueIndex).toBe(23)
-    })
-
-    it('should handle maxHistoryItems = 0', async () => {
-      store.maxHistoryItems = 0
-
-      const tasks = [createHistoryTask(10, 'hist-1')]
-
-      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
-      mockGetHistory.mockResolvedValue({ History: tasks })
-
-      await store.update()
-
-      expect(store.historyTasks).toHaveLength(0)
-    })
-
-    it('should handle maxHistoryItems = 1', async () => {
-      store.maxHistoryItems = 1
-
-      const tasks = [
-        createHistoryTask(10, 'hist-1'),
-        createHistoryTask(9, 'hist-2')
-      ]
-
-      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
-      mockGetHistory.mockResolvedValue({ History: tasks })
-
-      await store.update()
-
-      expect(store.historyTasks).toHaveLength(1)
-      expect(store.historyTasks[0].queueIndex).toBe(10)
-    })
-
-    it('should dynamically adjust when maxHistoryItems changes', async () => {
-      store.maxHistoryItems = 10
-
-      const tasks = Array.from({ length: 15 }, (_, i) =>
-        createHistoryTask(20 - i, `hist-${i}`)
-      )
-
-      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
-      mockGetHistory.mockResolvedValue({ History: tasks })
-
-      await store.update()
-      expect(store.historyTasks).toHaveLength(10)
-
-      store.maxHistoryItems = 5
-      mockGetHistory.mockResolvedValue({ History: tasks })
-
-      await store.update()
-      expect(store.historyTasks).toHaveLength(5)
-    })
-  })
-
-  describe('computed properties', () => {
-    it('tasks should combine pending, running, and history in correct order', async () => {
-      const running = createRunningTask(5, 'run-1')
-      const pending1 = createPendingTask(6, 'pend-1')
-      const pending2 = createPendingTask(7, 'pend-2')
-      const hist1 = createHistoryTask(3, 'hist-1')
-      const hist2 = createHistoryTask(4, 'hist-2')
-
-      mockGetQueue.mockResolvedValue({
-        Running: [running],
-        Pending: [pending1, pending2]
-      })
-      mockGetHistory.mockResolvedValue({
-        History: [hist2, hist1]
-      })
-
-      await store.update()
-
-      expect(store.tasks).toHaveLength(5)
-      expect(store.tasks[0].taskType).toBe('Pending')
-      expect(store.tasks[1].taskType).toBe('Pending')
-      expect(store.tasks[2].taskType).toBe('Running')
-      expect(store.tasks[3].taskType).toBe('History')
-      expect(store.tasks[4].taskType).toBe('History')
-    })
-
-    it('hasPendingTasks should be true when pending tasks exist', async () => {
-      mockGetQueue.mockResolvedValue({
-        Running: [],
-        Pending: [createPendingTask(1, 'pend-1')]
-      })
-      mockGetHistory.mockResolvedValue({ History: [] })
-
-      await store.update()
-      expect(store.hasPendingTasks).toBe(true)
-    })
-
-    it('hasPendingTasks should be false when no pending tasks', async () => {
-      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
-      mockGetHistory.mockResolvedValue({ History: [] })
-
-      await store.update()
-      expect(store.hasPendingTasks).toBe(false)
-    })
-
-    it('lastHistoryQueueIndex should return highest queue index', async () => {
-      const hist1 = createHistoryTask(10, 'hist-1')
-      const hist2 = createHistoryTask(25, 'hist-2')
-      const hist3 = createHistoryTask(15, 'hist-3')
-
-      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
-      mockGetHistory.mockResolvedValue({
-        History: [hist1, hist2, hist3]
-      })
-
-      await store.update()
-      expect(store.lastHistoryQueueIndex).toBe(25)
-    })
-
-    it('lastHistoryQueueIndex should be -1 when no history', async () => {
-      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
-      mockGetHistory.mockResolvedValue({ History: [] })
-
-      await store.update()
-      expect(store.lastHistoryQueueIndex).toBe(-1)
-    })
-  })
-
-  describe('clear()', () => {
-    beforeEach(async () => {
-      mockGetQueue.mockResolvedValue({
-        Running: [createRunningTask(1, 'run-1')],
-        Pending: [createPendingTask(2, 'pend-1')]
-      })
-      mockGetHistory.mockResolvedValue({
-        History: [createHistoryTask(3, 'hist-1')]
-      })
-      await store.update()
-    })
-
-    it('should clear both queue and history by default', async () => {
-      mockClearItems.mockResolvedValue(undefined)
-      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
-      mockGetHistory.mockResolvedValue({ History: [] })
-
-      await store.clear()
-
-      expect(mockClearItems).toHaveBeenCalledTimes(2)
-      expect(mockClearItems).toHaveBeenCalledWith('queue')
-      expect(mockClearItems).toHaveBeenCalledWith('history')
-      expect(store.runningTasks).toHaveLength(0)
-      expect(store.pendingTasks).toHaveLength(0)
-      expect(store.historyTasks).toHaveLength(0)
-    })
-
-    it('should clear only queue when specified', async () => {
-      mockClearItems.mockResolvedValue(undefined)
-      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
-      mockGetHistory.mockResolvedValue({
-        History: [createHistoryTask(3, 'hist-1')]
-      })
-
-      await store.clear(['queue'])
-
-      expect(mockClearItems).toHaveBeenCalledTimes(1)
-      expect(mockClearItems).toHaveBeenCalledWith('queue')
-      expect(store.historyTasks).toHaveLength(1)
-    })
-
-    it('should clear only history when specified', async () => {
-      mockClearItems.mockResolvedValue(undefined)
-      mockGetQueue.mockResolvedValue({
-        Running: [createRunningTask(1, 'run-1')],
-        Pending: [createPendingTask(2, 'pend-1')]
-      })
-      mockGetHistory.mockResolvedValue({ History: [] })
-
-      await store.clear(['history'])
-
-      expect(mockClearItems).toHaveBeenCalledTimes(1)
-      expect(mockClearItems).toHaveBeenCalledWith('history')
-      expect(store.runningTasks).toHaveLength(1)
-      expect(store.pendingTasks).toHaveLength(1)
-    })
-
-    it('should do nothing when empty array passed', async () => {
-      await store.clear([])
-
-      expect(mockClearItems).not.toHaveBeenCalled()
-    })
-  })
-
-  describe('delete()', () => {
-    it('should delete task from queue', async () => {
-      const task = new TaskItemImpl('Pending', createTaskPrompt(1, 'pend-1'))
-
-      mockDeleteItem.mockResolvedValue(undefined)
-      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
-      mockGetHistory.mockResolvedValue({ History: [] })
-
-      await store.delete(task)
-
-      expect(mockDeleteItem).toHaveBeenCalledWith('queue', 'pend-1')
-    })
-
-    it('should delete task from history', async () => {
-      const task = new TaskItemImpl(
-        'History',
-        createTaskPrompt(1, 'hist-1'),
-        createTaskStatus(),
-        createTaskOutput()
-      )
-
-      mockDeleteItem.mockResolvedValue(undefined)
-      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
-      mockGetHistory.mockResolvedValue({ History: [] })
-
-      await store.delete(task)
-
-      expect(mockDeleteItem).toHaveBeenCalledWith('history', 'hist-1')
-    })
-
-    it('should refresh store after deletion', async () => {
-      const task = new TaskItemImpl('Pending', createTaskPrompt(1, 'pend-1'))
-
-      mockDeleteItem.mockResolvedValue(undefined)
-      mockGetQueue.mockResolvedValue({ Running: [], Pending: [] })
-      mockGetHistory.mockResolvedValue({ History: [] })
-
-      await store.delete(task)
-
-      expect(mockGetQueue).toHaveBeenCalled()
-      expect(mockGetHistory).toHaveBeenCalled()
-    })
-  })
-})
diff --git a/tests-ui/tests/store/subgraphStore.test.ts b/tests-ui/tests/store/subgraphStore.test.ts
deleted file mode 100644
index d41c3e8179..0000000000
--- a/tests-ui/tests/store/subgraphStore.test.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-import { createPinia, setActivePinia } from 'pinia'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-import type { ComfyNodeDef as ComfyNodeDefV1 } from '@/schemas/nodeDefSchema'
-import { api } from '@/scripts/api'
-import { app as comfyApp } from '@/scripts/app'
-import { useLitegraphService } from '@/services/litegraphService'
-import { useNodeDefStore } from '@/stores/nodeDefStore'
-import { useSubgraphStore } from '@/stores/subgraphStore'
-
-import {
-  createTestSubgraph,
-  createTestSubgraphNode
-} from '../litegraph/subgraph/fixtures/subgraphHelpers'
-
-// Mock telemetry to break circular dependency (telemetry → workflowStore → app → telemetry)
-vi.mock('@/platform/telemetry', () => ({
-  useTelemetry: () => null
-}))
-
-// Add mock for api at the top of the file
-vi.mock('@/scripts/api', () => ({
-  api: {
-    getUserData: vi.fn(),
-    storeUserData: vi.fn(),
-    listUserDataFullInfo: vi.fn(),
-    apiURL: vi.fn(),
-    addEventListener: vi.fn()
-  }
-}))
-vi.mock('@/services/dialogService', () => ({
-  useDialogService: vi.fn(() => ({
-    prompt: () => 'testname',
-    confirm: () => true
-  }))
-}))
-vi.mock('@/renderer/core/canvas/canvasStore', () => ({
-  useCanvasStore: vi.fn(() => ({
-    getCanvas: () => comfyApp.canvas
-  }))
-}))
-
-// Mock comfyApp globally for the store setup
-vi.mock('@/scripts/app', () => ({
-  app: {
-    canvas: {
-      _deserializeItems: vi.fn((i) => i),
-      ds: { visible_area: [0, 0, 0, 0] },
-      selected_nodes: null
-    },
-    loadGraphData: vi.fn()
-  }
-}))
-
-const mockGraph = {
-  nodes: [{ type: '123' }],
-  definitions: { subgraphs: [{ id: '123' }] }
-}
-
-describe('useSubgraphStore', () => {
-  let store: ReturnType<typeof useSubgraphStore>
-  const mockFetch = async (filenames: Record<string, unknown>) => {
-    vi.mocked(api.listUserDataFullInfo).mockResolvedValue(
-      Object.keys(filenames).map((filename) => ({
-        path: filename,
-        modified: new Date().getTime(),
-        size: 1 // size !== -1 for remote workflows
-      }))
-    )
-    vi.mocked(api).getUserData = vi.fn(
-      (f) =>
-        ({
-          status: 200,
-          text: () => JSON.stringify(filenames[f.slice(10)])
-        }) as any
-    )
-    return await store.fetchSubgraphs()
-  }
-
-  beforeEach(() => {
-    setActivePinia(createPinia())
-    store = useSubgraphStore()
-    vi.clearAllMocks()
-  })
-
-  it('should allow publishing of a subgraph', async () => {
-    //mock canvas to provide a minimal subgraphNode
-    const subgraph = createTestSubgraph()
-    const subgraphNode = createTestSubgraphNode(subgraph)
-    const graph = subgraphNode.graph
-    graph.add(subgraphNode)
-    vi.mocked(comfyApp.canvas).selectedItems = new Set([subgraphNode])
-    vi.mocked(comfyApp.canvas)._serializeItems = vi.fn(() => ({
-      nodes: [subgraphNode.serialize()],
-      subgraphs: [subgraph.serialize() as any]
-    }))
-    //mock saving of file
-    vi.mocked(api.storeUserData).mockResolvedValue({
-      status: 200,
-      json: () =>
-        Promise.resolve({
-          path: 'subgraphs/testname.json',
-          modified: Date.now(),
-          size: 2
-        })
-    } as Response)
-    await mockFetch({ 'testname.json': mockGraph })
-    //Dialogue service already mocked
-    await store.publishSubgraph()
-    expect(api.storeUserData).toHaveBeenCalled()
-  })
-  it('should display published nodes in the node library', async () => {
-    await mockFetch({ 'test.json': mockGraph })
-    expect(
-      useNodeDefStore().nodeDefs.filter(
-        (d) => d.category == 'Subgraph Blueprints'
-      )
-    ).toHaveLength(1)
-  })
-  it('should allow subgraphs to be edited', async () => {
-    await mockFetch({ 'test.json': mockGraph })
-    await store.editBlueprint(store.typePrefix + 'test')
-    //check active graph
-    expect(comfyApp.loadGraphData).toHaveBeenCalled()
-  })
-  it('should allow subgraphs to be added to graph', async () => {
-    //mock
-    await mockFetch({ 'test.json': mockGraph })
-    const res = useLitegraphService().addNodeOnGraph({
-      name: 'SubgraphBlueprint.test'
-    } as ComfyNodeDefV1)
-    expect(res).toBeTruthy()
-  })
-})
diff --git a/tests-ui/tests/stores/queueStore.loadWorkflow.test.ts b/tests-ui/tests/stores/queueStore.loadWorkflow.test.ts
deleted file mode 100644
index 3ff57f5936..0000000000
--- a/tests-ui/tests/stores/queueStore.loadWorkflow.test.ts
+++ /dev/null
@@ -1,175 +0,0 @@
-import { createPinia, setActivePinia } from 'pinia'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-import type { ComfyApp } from '@/scripts/app'
-import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
-import { TaskItemImpl } from '@/stores/queueStore'
-import * as getWorkflowModule from '@/platform/workflow/cloud'
-
-vi.mock('@/platform/distribution/types', () => ({
-  isCloud: true
-}))
-
-vi.mock('@/services/extensionService', () => ({
-  useExtensionService: vi.fn(() => ({
-    invokeExtensions: vi.fn()
-  }))
-}))
-
-const mockWorkflow: ComfyWorkflowJSON = {
-  id: 'test-workflow-id',
-  revision: 0,
-  last_node_id: 5,
-  last_link_id: 3,
-  nodes: [],
-  links: [],
-  groups: [],
-  config: {},
-  extra: {},
-  version: 0.4
-}
-
-const createHistoryTaskWithWorkflow = (): TaskItemImpl => {
-  return new TaskItemImpl(
-    'History',
-    [
-      0, // queueIndex
-      'test-prompt-id', // promptId
-      {}, // promptInputs
-      {
-        client_id: 'test-client',
-        extra_pnginfo: {
-          workflow: mockWorkflow
-        }
-      },
-      [] // outputsToExecute
-    ],
-    {
-      status_str: 'success',
-      completed: true,
-      messages: []
-    },
-    {} // outputs
-  )
-}
-
-const createHistoryTaskWithoutWorkflow = (): TaskItemImpl => {
-  return new TaskItemImpl(
-    'History',
-    [
-      0,
-      'test-prompt-id',
-      {},
-      {
-        client_id: 'test-client'
-        // No extra_pnginfo.workflow
-      },
-      []
-    ],
-    {
-      status_str: 'success',
-      completed: true,
-      messages: []
-    },
-    {}
-  )
-}
-
-describe('TaskItemImpl.loadWorkflow - cloud history workflow fetching', () => {
-  let mockApp: ComfyApp
-  let mockFetchApi: ReturnType<typeof vi.fn>
-
-  beforeEach(() => {
-    setActivePinia(createPinia())
-    vi.clearAllMocks()
-
-    mockFetchApi = vi.fn()
-    mockApp = {
-      loadGraphData: vi.fn(),
-      nodeOutputs: {},
-      api: {
-        fetchApi: mockFetchApi
-      }
-    } as unknown as ComfyApp
-
-    vi.spyOn(getWorkflowModule, 'getWorkflowFromHistory')
-  })
-
-  it('should load workflow directly when workflow is in extra_pnginfo', async () => {
-    const task = createHistoryTaskWithWorkflow()
-
-    await task.loadWorkflow(mockApp)
-
-    expect(mockApp.loadGraphData).toHaveBeenCalledWith(mockWorkflow)
-    expect(mockFetchApi).not.toHaveBeenCalled()
-  })
-
-  it('should fetch workflow from cloud when workflow is missing from history task', async () => {
-    const task = createHistoryTaskWithoutWorkflow()
-
-    // Mock getWorkflowFromHistory to return workflow
-    vi.spyOn(getWorkflowModule, 'getWorkflowFromHistory').mockResolvedValue(
-      mockWorkflow
-    )
-
-    await task.loadWorkflow(mockApp)
-
-    expect(getWorkflowModule.getWorkflowFromHistory).toHaveBeenCalledWith(
-      expect.any(Function),
-      'test-prompt-id'
-    )
-    expect(mockApp.loadGraphData).toHaveBeenCalledWith(mockWorkflow)
-  })
-
-  it('should not load workflow when fetch returns undefined', async () => {
-    const task = createHistoryTaskWithoutWorkflow()
-
-    vi.spyOn(getWorkflowModule, 'getWorkflowFromHistory').mockResolvedValue(
-      undefined
-    )
-
-    await task.loadWorkflow(mockApp)
-
-    expect(getWorkflowModule.getWorkflowFromHistory).toHaveBeenCalled()
-    expect(mockApp.loadGraphData).not.toHaveBeenCalled()
-  })
-
-  it('should only fetch for history tasks, not running tasks', async () => {
-    const runningTask = new TaskItemImpl(
-      'Running',
-      [
-        0,
-        'test-prompt-id',
-        {},
-        {
-          client_id: 'test-client'
-        },
-        []
-      ],
-      undefined,
-      {}
-    )
-
-    vi.spyOn(getWorkflowModule, 'getWorkflowFromHistory').mockResolvedValue(
-      mockWorkflow
-    )
-
-    await runningTask.loadWorkflow(mockApp)
-
-    expect(getWorkflowModule.getWorkflowFromHistory).not.toHaveBeenCalled()
-    expect(mockApp.loadGraphData).not.toHaveBeenCalled()
-  })
-
-  it('should handle fetch errors gracefully by returning undefined', async () => {
-    const task = createHistoryTaskWithoutWorkflow()
-
-    vi.spyOn(getWorkflowModule, 'getWorkflowFromHistory').mockResolvedValue(
-      undefined
-    )
-
-    await task.loadWorkflow(mockApp)
-
-    expect(getWorkflowModule.getWorkflowFromHistory).toHaveBeenCalled()
-    expect(mockApp.loadGraphData).not.toHaveBeenCalled()
-  })
-})
diff --git a/tests-ui/tests/utils/formatUtil.test.ts b/tests-ui/tests/utils/formatUtil.test.ts
deleted file mode 100644
index 4ab0a7bd2e..0000000000
--- a/tests-ui/tests/utils/formatUtil.test.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import { getMediaTypeFromFilename, truncateFilename } from '@/utils/formatUtil'
-
-describe('formatUtil', () => {
-  describe('truncateFilename', () => {
-    it('should not truncate short filenames', () => {
-      expect(truncateFilename('test.png')).toBe('test.png')
-      expect(truncateFilename('short.jpg', 10)).toBe('short.jpg')
-    })
-
-    it('should truncate long filenames while preserving extension', () => {
-      const longName = 'this-is-a-very-long-filename-that-needs-truncation.png'
-      const truncated = truncateFilename(longName, 20)
-      expect(truncated).toContain('...')
-      expect(truncated.endsWith('.png')).toBe(true)
-      expect(truncated.length).toBeLessThanOrEqual(25) // 20 + '...' + extension
-    })
-
-    it('should handle filenames without extensions', () => {
-      const longName = 'this-is-a-very-long-filename-without-extension'
-      const truncated = truncateFilename(longName, 20)
-      expect(truncated).toContain('...')
-      expect(truncated.length).toBeLessThanOrEqual(23) // 20 + '...'
-    })
-
-    it('should handle empty strings', () => {
-      expect(truncateFilename('')).toBe('')
-      expect(truncateFilename('', 10)).toBe('')
-    })
-
-    it('should preserve the start and end of the filename', () => {
-      const longName = 'ComfyUI_00001_timestamp_2024_01_01.png'
-      const truncated = truncateFilename(longName, 20)
-      expect(truncated).toMatch(/^ComfyUI.*01\.png$/)
-      expect(truncated).toContain('...')
-    })
-
-    it('should handle files with multiple dots', () => {
-      const filename = 'my.file.with.multiple.dots.txt'
-      const truncated = truncateFilename(filename, 15)
-      expect(truncated.endsWith('.txt')).toBe(true)
-      expect(truncated).toContain('...')
-    })
-  })
-
-  describe('getMediaTypeFromFilename', () => {
-    describe('image files', () => {
-      const imageTestCases = [
-        { filename: 'test.png', expected: 'image' },
-        { filename: 'photo.jpg', expected: 'image' },
-        { filename: 'image.jpeg', expected: 'image' },
-        { filename: 'animation.gif', expected: 'image' },
-        { filename: 'web.webp', expected: 'image' },
-        { filename: 'bitmap.bmp', expected: 'image' }
-      ]
-
-      it.for(imageTestCases)(
-        'should identify $filename as $expected',
-        ({ filename, expected }) => {
-          expect(getMediaTypeFromFilename(filename)).toBe(expected)
-        }
-      )
-
-      it('should handle uppercase extensions', () => {
-        expect(getMediaTypeFromFilename('test.PNG')).toBe('image')
-        expect(getMediaTypeFromFilename('photo.JPG')).toBe('image')
-      })
-    })
-
-    describe('video files', () => {
-      it('should identify video extensions correctly', () => {
-        expect(getMediaTypeFromFilename('video.mp4')).toBe('video')
-        expect(getMediaTypeFromFilename('clip.webm')).toBe('video')
-        expect(getMediaTypeFromFilename('movie.mov')).toBe('video')
-        expect(getMediaTypeFromFilename('film.avi')).toBe('video')
-      })
-    })
-
-    describe('audio files', () => {
-      it('should identify audio extensions correctly', () => {
-        expect(getMediaTypeFromFilename('song.mp3')).toBe('audio')
-        expect(getMediaTypeFromFilename('sound.wav')).toBe('audio')
-        expect(getMediaTypeFromFilename('music.ogg')).toBe('audio')
-        expect(getMediaTypeFromFilename('audio.flac')).toBe('audio')
-      })
-    })
-
-    describe('3D files', () => {
-      it('should identify 3D file extensions correctly', () => {
-        expect(getMediaTypeFromFilename('model.obj')).toBe('3D')
-        expect(getMediaTypeFromFilename('scene.fbx')).toBe('3D')
-        expect(getMediaTypeFromFilename('asset.gltf')).toBe('3D')
-        expect(getMediaTypeFromFilename('binary.glb')).toBe('3D')
-      })
-    })
-
-    describe('edge cases', () => {
-      it('should handle empty strings', () => {
-        expect(getMediaTypeFromFilename('')).toBe('image')
-      })
-
-      it('should handle files without extensions', () => {
-        expect(getMediaTypeFromFilename('README')).toBe('image')
-      })
-
-      it('should handle unknown extensions', () => {
-        expect(getMediaTypeFromFilename('document.pdf')).toBe('image')
-        expect(getMediaTypeFromFilename('data.json')).toBe('image')
-      })
-
-      it('should handle files with multiple dots', () => {
-        expect(getMediaTypeFromFilename('my.file.name.png')).toBe('image')
-        expect(getMediaTypeFromFilename('archive.tar.gz')).toBe('image')
-      })
-
-      it('should handle paths with directories', () => {
-        expect(getMediaTypeFromFilename('/path/to/image.png')).toBe('image')
-        expect(getMediaTypeFromFilename('C:\\Windows\\video.mp4')).toBe('video')
-      })
-
-      it('should handle null and undefined gracefully', () => {
-        expect(getMediaTypeFromFilename(null as any)).toBe('image')
-        expect(getMediaTypeFromFilename(undefined as any)).toBe('image')
-      })
-
-      it('should handle special characters in filenames', () => {
-        expect(getMediaTypeFromFilename('test@#$.png')).toBe('image')
-        expect(getMediaTypeFromFilename('video (1).mp4')).toBe('video')
-        expect(getMediaTypeFromFilename('[2024] audio.mp3')).toBe('audio')
-      })
-
-      it('should handle very long filenames', () => {
-        const longFilename = 'a'.repeat(1000) + '.png'
-        expect(getMediaTypeFromFilename(longFilename)).toBe('image')
-      })
-
-      it('should handle mixed case extensions', () => {
-        expect(getMediaTypeFromFilename('test.PnG')).toBe('image')
-        expect(getMediaTypeFromFilename('video.Mp4')).toBe('video')
-        expect(getMediaTypeFromFilename('audio.WaV')).toBe('audio')
-      })
-    })
-  })
-})
diff --git a/tests-ui/tests/utils/litegraphUtil.test.ts b/tests-ui/tests/utils/litegraphUtil.test.ts
deleted file mode 100644
index 36a6692ee9..0000000000
--- a/tests-ui/tests/utils/litegraphUtil.test.ts
+++ /dev/null
@@ -1,173 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import type { ISerialisedGraph } from '@/lib/litegraph/src/types/serialisation'
-import type { IWidget } from '@/lib/litegraph/src/types/widgets'
-import type { InputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
-import {
-  compressWidgetInputSlots,
-  migrateWidgetsValues
-} from '@/utils/litegraphUtil'
-
-describe('migrateWidgetsValues', () => {
-  it('should remove widget values for forceInput inputs', () => {
-    const inputDefs: Record<string, InputSpec> = {
-      normalInput: {
-        type: 'INT',
-        name: 'normalInput'
-      },
-      forceInputField: {
-        type: 'STRING',
-        name: 'forceInputField',
-        forceInput: true
-      },
-      anotherNormal: {
-        type: 'FLOAT',
-        name: 'anotherNormal'
-      }
-    }
-
-    const widgets: IWidget[] = [
-      { name: 'normalInput', type: 'number' },
-      { name: 'anotherNormal', type: 'number' }
-    ] as unknown as IWidget[]
-
-    const widgetValues = [42, 'dummy value', 3.14]
-
-    const result = migrateWidgetsValues(inputDefs, widgets, widgetValues)
-    expect(result).toEqual([42, 3.14])
-  })
-
-  it('should return original values if lengths do not match', () => {
-    const inputDefs: Record<string, InputSpec> = {
-      input1: {
-        type: 'INT',
-        name: 'input1',
-        forceInput: true
-      }
-    }
-
-    const widgets: IWidget[] = []
-    const widgetValues = [42, 'extra value']
-
-    const result = migrateWidgetsValues(inputDefs, widgets, widgetValues)
-    expect(result).toEqual(widgetValues)
-  })
-
-  it('should handle empty widgets and values', () => {
-    const inputDefs: Record<string, InputSpec> = {}
-    const widgets: IWidget[] = []
-    const widgetValues: any[] = []
-
-    const result = migrateWidgetsValues(inputDefs, widgets, widgetValues)
-    expect(result).toEqual([])
-  })
-
-  it('should preserve order of non-forceInput widget values', () => {
-    const inputDefs: Record<string, InputSpec> = {
-      first: {
-        type: 'INT',
-        name: 'first'
-      },
-      forced: {
-        type: 'STRING',
-        name: 'forced',
-        forceInput: true
-      },
-      last: {
-        type: 'FLOAT',
-        name: 'last'
-      }
-    }
-
-    const widgets: IWidget[] = [
-      { name: 'first', type: 'number' },
-      { name: 'last', type: 'number' }
-    ] as unknown as IWidget[]
-
-    const widgetValues = ['first value', 'dummy', 'last value']
-
-    const result = migrateWidgetsValues(inputDefs, widgets, widgetValues)
-    expect(result).toEqual(['first value', 'last value'])
-  })
-})
-
-describe('compressWidgetInputSlots', () => {
-  it('should remove unconnected widget input slots', () => {
-    const graph: ISerialisedGraph = {
-      nodes: [
-        {
-          id: 1,
-          type: 'foo',
-          pos: [0, 0],
-          size: [100, 100],
-          flags: {},
-          order: 0,
-          mode: 0,
-          inputs: [
-            { widget: { name: 'foo' }, link: null, type: 'INT', name: 'foo' },
-            { widget: { name: 'bar' }, link: 2, type: 'INT', name: 'bar' },
-            { widget: { name: 'baz' }, link: null, type: 'INT', name: 'baz' }
-          ],
-          outputs: []
-        }
-      ],
-      links: [[2, 1, 0, 1, 0, 'INT']]
-    } as unknown as ISerialisedGraph
-
-    compressWidgetInputSlots(graph)
-
-    expect(graph.nodes[0].inputs).toEqual([
-      { widget: { name: 'bar' }, link: 2, type: 'INT', name: 'bar' }
-    ])
-  })
-
-  it('should update link target slots correctly', () => {
-    const graph: ISerialisedGraph = {
-      nodes: [
-        {
-          id: 1,
-          type: 'foo',
-          pos: [0, 0],
-          size: [100, 100],
-          flags: {},
-          order: 0,
-          mode: 0,
-          inputs: [
-            { widget: { name: 'foo' }, link: null, type: 'INT', name: 'foo' },
-            { widget: { name: 'bar' }, link: 2, type: 'INT', name: 'bar' },
-            { widget: { name: 'baz' }, link: 3, type: 'INT', name: 'baz' }
-          ],
-          outputs: []
-        }
-      ],
-      links: [
-        [2, 1, 0, 1, 1, 'INT'],
-        [3, 1, 0, 1, 2, 'INT']
-      ]
-    } as unknown as ISerialisedGraph
-
-    compressWidgetInputSlots(graph)
-
-    expect(graph.nodes[0].inputs).toEqual([
-      { widget: { name: 'bar' }, link: 2, type: 'INT', name: 'bar' },
-      { widget: { name: 'baz' }, link: 3, type: 'INT', name: 'baz' }
-    ])
-
-    expect(graph.links).toEqual([
-      [2, 1, 0, 1, 0, 'INT'],
-      [3, 1, 0, 1, 1, 'INT']
-    ])
-  })
-
-  it('should handle graphs with no nodes gracefully', () => {
-    const graph: ISerialisedGraph = {
-      nodes: [],
-      links: []
-    } as unknown as ISerialisedGraph
-
-    compressWidgetInputSlots(graph)
-
-    expect(graph.nodes).toEqual([])
-    expect(graph.links).toEqual([])
-  })
-})
diff --git a/tests-ui/tests/widgets/domWidget.test.ts b/tests-ui/tests/widgets/domWidget.test.ts
deleted file mode 100644
index 59d1d95c57..0000000000
--- a/tests-ui/tests/widgets/domWidget.test.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { describe, expect, test, vi } from 'vitest'
-
-import { LGraphNode } from '@/lib/litegraph/src/litegraph'
-import { ComponentWidgetImpl, DOMWidgetImpl } from '@/scripts/domWidget'
-
-// Mock dependencies
-vi.mock('@/stores/domWidgetStore', () => ({
-  useDomWidgetStore: () => ({
-    unregisterWidget: vi.fn()
-  })
-}))
-
-vi.mock('@/utils/formatUtil', () => ({
-  generateUUID: () => 'test-uuid'
-}))
-
-describe('DOMWidget Y Position Preservation', () => {
-  test('BaseDOMWidgetImpl createCopyForNode preserves Y position', () => {
-    const mockNode = new LGraphNode('test-node')
-    const originalWidget = new ComponentWidgetImpl({
-      node: mockNode,
-      name: 'test-widget',
-      component: { template: '<div></div>' },
-      inputSpec: { name: 'test', type: 'string' },
-      options: {}
-    })
-
-    // Set a specific Y position
-    originalWidget.y = 66
-
-    const newNode = new LGraphNode('new-node')
-    const clonedWidget = originalWidget.createCopyForNode(newNode)
-
-    // Verify Y position is preserved
-    expect(clonedWidget.y).toBe(66)
-    expect(clonedWidget.node).toBe(newNode)
-    expect(clonedWidget.name).toBe('test-widget')
-  })
-
-  test('DOMWidgetImpl createCopyForNode preserves Y position', () => {
-    const mockNode = new LGraphNode('test-node')
-    const mockElement = document.createElement('div')
-
-    const originalWidget = new DOMWidgetImpl({
-      node: mockNode,
-      name: 'test-dom-widget',
-      type: 'test',
-      element: mockElement,
-      options: {}
-    })
-
-    // Set a specific Y position
-    originalWidget.y = 42
-
-    const newNode = new LGraphNode('new-node')
-    const clonedWidget = originalWidget.createCopyForNode(newNode)
-
-    // Verify Y position is preserved
-    expect(clonedWidget.y).toBe(42)
-    expect(clonedWidget.node).toBe(newNode)
-    expect(clonedWidget.element).toBe(mockElement)
-    expect(clonedWidget.name).toBe('test-dom-widget')
-  })
-
-  test('Y position defaults to 0 when not set', () => {
-    const mockNode = new LGraphNode('test-node')
-    const originalWidget = new ComponentWidgetImpl({
-      node: mockNode,
-      name: 'test-widget',
-      component: { template: '<div></div>' },
-      inputSpec: { name: 'test', type: 'string' },
-      options: {}
-    })
-
-    // Don't explicitly set Y (should be 0 by default)
-    const newNode = new LGraphNode('new-node')
-    const clonedWidget = originalWidget.createCopyForNode(newNode)
-
-    // Verify Y position is preserved (should be 0)
-    expect(clonedWidget.y).toBe(0)
-  })
-})
diff --git a/tests-ui/tests/widgets/proxyWidget.test.ts b/tests-ui/tests/widgets/proxyWidget.test.ts
deleted file mode 100644
index 940ee66f0e..0000000000
--- a/tests-ui/tests/widgets/proxyWidget.test.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import { describe, expect, test, vi } from 'vitest'
-
-import { registerProxyWidgets } from '@/core/graph/subgraph/proxyWidget'
-import { parseProxyWidgets } from '@/core/schemas/proxyWidget'
-import { LGraphNode } from '@/lib/litegraph/src/litegraph'
-import type { LGraphCanvas, SubgraphNode } from '@/lib/litegraph/src/litegraph'
-
-import {
-  createTestSubgraph,
-  createTestSubgraphNode
-} from '../litegraph/subgraph/fixtures/subgraphHelpers'
-
-const canvasEl: Partial<HTMLCanvasElement> = { addEventListener() {} }
-const canvas: Partial<LGraphCanvas> = { canvas: canvasEl as HTMLCanvasElement }
-registerProxyWidgets(canvas as LGraphCanvas)
-
-vi.mock('@/renderer/core/canvas/canvasStore', () => ({
-  useCanvasStore: () => ({})
-}))
-vi.mock('@/stores/domWidgetStore', () => ({
-  useDomWidgetStore: () => ({ widgetStates: new Map() })
-}))
-vi.mock('@/services/litegraphService', () => ({
-  useLitegraphService: () => ({ updatePreviews: () => ({}) })
-}))
-
-function setupSubgraph(
-  innerNodeCount: number = 0
-): [SubgraphNode, LGraphNode[]] {
-  const subgraph = createTestSubgraph()
-  const subgraphNode = createTestSubgraphNode(subgraph)
-  subgraphNode._internalConfigureAfterSlots()
-  const graph = subgraphNode.graph
-  graph.add(subgraphNode)
-  const innerNodes = []
-  for (let i = 0; i < innerNodeCount; i++) {
-    const innerNode = new LGraphNode(`InnerNode${i}`)
-    subgraph.add(innerNode)
-    innerNodes.push(innerNode)
-  }
-  return [subgraphNode, innerNodes]
-}
-
-describe('Subgraph proxyWidgets', () => {
-  test('Can add simple widget', () => {
-    const [subgraphNode, innerNodes] = setupSubgraph(1)
-    innerNodes[0].addWidget('text', 'stringWidget', 'value', () => {})
-    subgraphNode.properties.proxyWidgets = [['1', 'stringWidget']]
-    expect(subgraphNode.widgets.length).toBe(1)
-    expect(subgraphNode.properties.proxyWidgets).toStrictEqual([
-      ['1', 'stringWidget']
-    ])
-  })
-  test('Can add multiple widgets with same name', () => {
-    const [subgraphNode, innerNodes] = setupSubgraph(2)
-    for (const innerNode of innerNodes)
-      innerNode.addWidget('text', 'stringWidget', 'value', () => {})
-    subgraphNode.properties.proxyWidgets = [
-      ['1', 'stringWidget'],
-      ['2', 'stringWidget']
-    ]
-    expect(subgraphNode.widgets.length).toBe(2)
-    expect(subgraphNode.widgets[0].name).not.toEqual(
-      subgraphNode.widgets[1].name
-    )
-  })
-  test('Will serialize existing widgets', () => {
-    const [subgraphNode, innerNodes] = setupSubgraph(1)
-    innerNodes[0].addWidget('text', 'istringWidget', 'value', () => {})
-    subgraphNode.addWidget('text', 'stringWidget', 'value', () => {})
-
-    const proxyWidgets = parseProxyWidgets(subgraphNode.properties.proxyWidgets)
-    proxyWidgets.push(['1', 'istringWidget'])
-    subgraphNode.properties.proxyWidgets = proxyWidgets
-
-    expect(subgraphNode.widgets.length).toBe(2)
-    expect(subgraphNode.widgets[0].name).toBe('stringWidget')
-    subgraphNode.properties.proxyWidgets = [proxyWidgets[1], proxyWidgets[0]]
-    expect(subgraphNode.widgets[0].name).toBe('1: istringWidget')
-  })
-  test('Will mirror changes to value', () => {
-    const [subgraphNode, innerNodes] = setupSubgraph(1)
-    innerNodes[0].addWidget('text', 'stringWidget', 'value', () => {})
-    subgraphNode.properties.proxyWidgets = [['1', 'stringWidget']]
-    expect(subgraphNode.widgets.length).toBe(1)
-    expect(subgraphNode.widgets[0].value).toBe('value')
-    innerNodes[0].widgets![0].value = 'test'
-    expect(subgraphNode.widgets[0].value).toBe('test')
-    subgraphNode.widgets[0].value = 'test2'
-    expect(innerNodes[0].widgets![0].value).toBe('test2')
-  })
-  test('Will not modify position or sizing of existing widgets', () => {
-    const [subgraphNode, innerNodes] = setupSubgraph(1)
-    innerNodes[0].addWidget('text', 'stringWidget', 'value', () => {})
-    subgraphNode.properties.proxyWidgets = [['1', 'stringWidget']]
-    if (!innerNodes[0].widgets) throw new Error('node has no widgets')
-    innerNodes[0].widgets[0].y = 10
-    innerNodes[0].widgets[0].last_y = 11
-    innerNodes[0].widgets[0].computedHeight = 12
-    subgraphNode.widgets[0].y = 20
-    subgraphNode.widgets[0].last_y = 21
-    subgraphNode.widgets[0].computedHeight = 22
-    expect(innerNodes[0].widgets[0].y).toBe(10)
-    expect(innerNodes[0].widgets[0].last_y).toBe(11)
-    expect(innerNodes[0].widgets[0].computedHeight).toBe(12)
-  })
-  test('Can detach and re-attach widgets', () => {
-    const [subgraphNode, innerNodes] = setupSubgraph(1)
-    innerNodes[0].addWidget('text', 'stringWidget', 'value', () => {})
-    subgraphNode.properties.proxyWidgets = [['1', 'stringWidget']]
-    if (!innerNodes[0].widgets) throw new Error('node has no widgets')
-    expect(subgraphNode.widgets[0].value).toBe('value')
-    const poppedWidget = innerNodes[0].widgets.pop()
-    //simulate new draw frame
-    subgraphNode.widgets[0].computedHeight = 10
-    expect(subgraphNode.widgets[0].value).toBe(undefined)
-    innerNodes[0].widgets.push(poppedWidget!)
-    subgraphNode.widgets[0].computedHeight = 10
-    expect(subgraphNode.widgets[0].value).toBe('value')
-  })
-})
diff --git a/tests-ui/tsconfig.json b/tests-ui/tsconfig.json
deleted file mode 100644
index f600c4a7f7..0000000000
--- a/tests-ui/tsconfig.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    /* Test files should not be compiled */
-    "noEmit": true,
-    // "strict": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "resolveJsonModule": true
-  },
-  "include": [
-    "**/*.ts",
-  ]
-}
diff --git a/tools/devtools/README.md b/tools/devtools/README.md
index d0d316ce81..108114daea 100644
--- a/tools/devtools/README.md
+++ b/tools/devtools/README.md
@@ -11,6 +11,7 @@ This directory contains development tools and test utilities for ComfyUI, previo
 ## Purpose
 
 These tools provide:
+
 - Test endpoints for browser automation
 - Development nodes for testing various UI features
 - Mock data for consistent testing environments
@@ -25,4 +26,4 @@ cp -r tools/devtools/* /path/to/your/ComfyUI/custom_nodes/ComfyUI_devtools/
 
 ## Migration
 
-This directory was created as part of issue #4683 to merge the ComfyUI_devtools repository into the main frontend repository, eliminating the need for separate versioning and simplifying the development workflow.
\ No newline at end of file
+This directory was created as part of issue #4683 to merge the ComfyUI_devtools repository into the main frontend repository, eliminating the need for separate versioning and simplifying the development workflow.
diff --git a/tsconfig.json b/tsconfig.json
index 458d6de764..988be359ba 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -3,12 +3,7 @@
     "target": "ES2023",
     "useDefineForClassFields": true,
     "module": "ESNext",
-    "lib": [
-      "ES2023",
-      "ES2023.Array",
-      "DOM",
-      "DOM.Iterable"
-    ],
+    "lib": ["ES2023", "ES2023.Array", "DOM", "DOM.Iterable"],
     "skipLibCheck": true,
     "incremental": true,
     "sourceMap": true,
@@ -25,28 +20,17 @@
     "allowJs": true,
     "verbatimModuleSyntax": true,
     "paths": {
-      "@/*": [
-        "./src/*"
-      ],
+      "@/*": ["./src/*"],
       "@/utils/formatUtil": [
         "./packages/shared-frontend-utils/src/formatUtil.ts"
       ],
       "@/utils/networkUtil": [
         "./packages/shared-frontend-utils/src/networkUtil.ts"
       ],
-      "@tests-ui/*": [
-        "./tests-ui/*"
-      ]
+      "@tests-ui/*": ["./tests-ui/*"]
     },
-    "typeRoots": [
-      "src/types",
-      "node_modules/@types",
-      "./node_modules"
-    ],
-    "types": [
-      "vitest/globals",
-      "@webgpu/types"
-    ],
+    "typeRoots": ["src/types", "node_modules/@types", "./node_modules"],
+    "types": ["vitest/globals", "@webgpu/types"],
     "outDir": "./dist",
     "rootDir": "./"
   },
@@ -61,10 +45,10 @@
     "src/types/**/*.d.ts",
     "playwright.config.ts",
     "playwright.i18n.config.ts",
-    "tailwind.config.ts",
+
     "tests-ui/**/*",
     "vite.config.mts",
-    "vitest.config.ts",
+    "vitest.config.ts"
     // "vitest.setup.ts",
   ]
-}
\ No newline at end of file
+}
diff --git a/tsconfig.types.json b/tsconfig.types.json
index d1ee9554bd..b42ac7ce68 100644
--- a/tsconfig.types.json
+++ b/tsconfig.types.json
@@ -7,10 +7,7 @@
       "@/*": ["./src/*"]
     }
   },
-  "include": [
-    "src/**/*.ts",
-    "global.d.ts"
-  ],
+  "include": ["src/**/*.ts", "global.d.ts"],
   "exclude": [
     "node_modules",
     "dist",
@@ -19,4 +16,4 @@
     "**/*.test.ts",
     "src/components/**/*"
   ]
-}
\ No newline at end of file
+}
diff --git a/vite.config.mts b/vite.config.mts
index 7ad4dea5a3..9033ea16ab 100644
--- a/vite.config.mts
+++ b/vite.config.mts
@@ -11,8 +11,8 @@ import IconsResolver from 'unplugin-icons/resolver'
 import Icons from 'unplugin-icons/vite'
 import Components from 'unplugin-vue-components/vite'
 import typegpuPlugin from 'unplugin-typegpu/vite'
-import { defineConfig } from 'vite'
-import type { ProxyOptions, UserConfig } from 'vite'
+import { defineConfig } from 'vitest/config'
+import type { ProxyOptions } from 'vite'
 import { createHtmlPlugin } from 'vite-plugin-html'
 import vueDevTools from 'vite-plugin-vue-devtools'
 
@@ -51,6 +51,10 @@ const DISTRIBUTION: 'desktop' | 'localhost' | 'cloud' =
       ? 'cloud'
       : 'localhost'
 
+// Nightly builds are from main branch; RC/stable builds are from core/* branches
+// Can be overridden via IS_NIGHTLY env var for testing
+const IS_NIGHTLY = process.env.IS_NIGHTLY === 'true'
+
 // Disable Vue DevTools for production cloud distribution
 const DISABLE_VUE_PLUGINS =
   process.env.DISABLE_VUE_PLUGINS === 'true' ||
@@ -238,6 +242,20 @@ export default defineConfig({
     tailwindcss(),
     typegpuPlugin({}),
     comfyAPIPlugin(IS_DEV),
+    // Exclude proprietary ABCROM fonts from non-cloud builds
+    {
+      name: 'exclude-proprietary-fonts',
+      generateBundle(_options, bundle) {
+        if (DISTRIBUTION !== 'cloud') {
+          // Remove ABCROM font files from bundle
+          for (const [fileName] of Object.entries(bundle)) {
+            if (/ABCROM.*\.(woff2?|ttf|otf)$/i.test(fileName)) {
+              delete bundle[fileName]
+            }
+          }
+        }
+      }
+    },
     // Inject legacy user stylesheet links for desktop/localhost only
     {
       name: 'inject-user-stylesheet-links',
@@ -412,80 +430,156 @@ export default defineConfig({
   ],
 
   build: {
-    minify: SHOULD_MINIFY ? 'esbuild' : false,
+    minify: SHOULD_MINIFY,
     target: 'es2022',
     sourcemap: GENERATE_SOURCEMAP,
-    rollupOptions: {
-      treeshake: true,
-      output: {
-        manualChunks: (id) => {
-          if (!id.includes('node_modules')) {
-            return undefined
-          }
+    // Exclude heavy optional vendor chunks from initial module preload
+    // These chunks are only needed when their features are used (3D, terminal, etc.)
+    modulePreload: {
+      resolveDependencies: (_filename, deps, { hostType }) => {
+        // Only filter for HTML entry points, not for dynamic imports
+        if (hostType !== 'html') return deps
 
-          if (id.includes('primevue') || id.includes('@primeuix')) {
-            return 'vendor-primevue'
-          }
-
-          if (id.includes('@tiptap')) {
-            return 'vendor-tiptap'
-          }
-
-          if (id.includes('chart.js')) {
-            return 'vendor-chart'
-          }
-
-          if (id.includes('three') || id.includes('@sparkjsdev')) {
-            return 'vendor-three'
-          }
-
-          if (id.includes('@xterm')) {
-            return 'vendor-xterm'
-          }
-
-          if (id.includes('/vue') || id.includes('pinia')) {
-            return 'vendor-vue'
-          }
-
-          return 'vendor-other'
-        }
+        // Exclude heavy vendor chunks that should be lazy-loaded
+        // - vendor-three: 3D preview (Load3D nodes)
+        // - vendor-xterm: Terminal emulator (logs panel)
+        // - vendor-tiptap: Rich text editor (markdown widgets)
+        // - vendor-chart: Chart.js (stats/monitoring)
+        // - vendor-yjs: CRDT library (layout store, loaded on first graph)
+        const lazyVendors = [
+          'vendor-three',
+          'vendor-xterm',
+          'vendor-tiptap',
+          'vendor-chart',
+          'vendor-yjs'
+        ]
+        return deps.filter(
+          (dep) => !lazyVendors.some((vendor) => dep.includes(vendor))
+        )
       }
-    }
-  },
-
-  esbuild: {
-    minifyIdentifiers: SHOULD_MINIFY,
-    keepNames: true,
-    minifySyntax: SHOULD_MINIFY,
-    minifyWhitespace: SHOULD_MINIFY,
-    pure: SHOULD_MINIFY
-      ? [
-          'console.log',
+    },
+    rolldownOptions: {
+      treeshake: {
+        manualPureFunctions: [
+          'console.clear',
+          'console.count',
+          'console.countReset',
           'console.debug',
-          'console.info',
-          'console.trace',
           'console.dir',
           'console.dirxml',
           'console.group',
           'console.groupCollapsed',
           'console.groupEnd',
+          'console.info',
+          'console.log',
+          'console.profile',
+          'console.profileEnd',
           'console.table',
           'console.time',
           'console.timeEnd',
           'console.timeLog',
-          'console.count',
-          'console.countReset',
-          'console.profile',
-          'console.profileEnd',
-          'console.clear'
+          'console.trace'
         ]
-      : []
-  },
+      },
+      output: {
+        keepNames: true,
+        codeSplitting: {
+          groups: [
+            // Framework core - highest priority, very stable
+            {
+              name: 'vendor-vue-core',
+              test: /[\\/]node_modules[\\/](vue|@vue|pinia|vue-router)[\\/]/,
+              priority: 20
+            },
 
-  test: {
-    globals: true,
-    environment: 'happy-dom',
-    setupFiles: ['./vitest.setup.ts']
+            {
+              name: 'vendor-firebase',
+              test: /[\\/]node_modules[\\/](@?firebase|@firebase)[\\/]/,
+              priority: 15
+            },
+            {
+              name: 'vendor-sentry',
+              test: /[\\/]node_modules[\\/]@sentry[\\/]/,
+              priority: 15
+            },
+
+            // UI component libraries
+            {
+              name: 'vendor-primevue',
+              test: /[\\/]node_modules[\\/](@?primevue|@primeuix)[\\/]/,
+              priority: 15
+            },
+            {
+              name: 'vendor-reka-ui',
+              test: /[\\/]node_modules[\\/]reka-ui[\\/]/,
+              priority: 15
+            },
+
+            // Heavy optional features
+            {
+              name: 'vendor-three',
+              test: /[\\/]node_modules[\\/](three|@sparkjsdev)[\\/]/,
+              priority: 15
+            },
+            {
+              name: 'vendor-tiptap',
+              test: /[\\/]node_modules[\\/]@tiptap[\\/]/,
+              priority: 15
+            },
+            {
+              name: 'vendor-chart',
+              test: /[\\/]node_modules[\\/]chart\.js[\\/]/,
+              priority: 15
+            },
+            {
+              name: 'vendor-xterm',
+              test: /[\\/]node_modules[\\/]@xterm[\\/]/,
+              priority: 15
+            },
+            {
+              name: 'vendor-yjs',
+              test: /[\\/]node_modules[\\/](yjs|lib0)[\\/]/,
+              priority: 15
+            },
+
+            // Utilities and validation
+            {
+              name: 'vendor-vueuse',
+              test: /[\\/]node_modules[\\/]@vueuse[\\/]/,
+              priority: 12
+            },
+            {
+              name: 'vendor-i18n',
+              test: /[\\/]node_modules[\\/](vue-i18n|@intlify)[\\/]/,
+              priority: 12
+            },
+            {
+              name: 'vendor-zod',
+              test: /[\\/]node_modules[\\/](zod|zod-validation-error)[\\/]/,
+              priority: 12
+            },
+            {
+              name: 'vendor-axios',
+              test: /[\\/]node_modules[\\/]axios[\\/]/,
+              priority: 12
+            },
+            {
+              name: 'vendor-markdown',
+              test: /[\\/]node_modules[\\/](marked|dompurify)[\\/]/,
+              priority: 12
+            },
+
+            // Catch-all for remaining node_modules
+            {
+              name: 'vendor-other',
+              test: /[\\/]node_modules[\\/]/,
+              priority: 0,
+              minSize: 10000
+            }
+          ]
+        }
+      }
+    }
   },
 
   define: {
@@ -499,7 +593,8 @@ export default defineConfig({
     __ALGOLIA_APP_ID__: JSON.stringify(process.env.ALGOLIA_APP_ID || ''),
     __ALGOLIA_API_KEY__: JSON.stringify(process.env.ALGOLIA_API_KEY || ''),
     __USE_PROD_CONFIG__: process.env.USE_PROD_CONFIG === 'true',
-    __DISTRIBUTION__: JSON.stringify(DISTRIBUTION)
+    __DISTRIBUTION__: JSON.stringify(DISTRIBUTION),
+    __IS_NIGHTLY__: JSON.stringify(IS_NIGHTLY)
   },
 
   resolve: {
@@ -514,5 +609,29 @@ export default defineConfig({
   optimizeDeps: {
     exclude: ['@comfyorg/comfyui-electron-types'],
     entries: ['index.html']
+  },
+
+  test: {
+    globals: true,
+    environment: 'happy-dom',
+    setupFiles: ['./vitest.setup.ts'],
+    retry: process.env.CI ? 2 : 0,
+    include: [
+      'src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}',
+      'packages/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}',
+      'scripts/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'
+    ],
+    coverage: {
+      reporter: ['text', 'json', 'html']
+    },
+    exclude: [
+      '**/node_modules/**',
+      '**/dist/**',
+      '**/cypress/**',
+      '**/.{idea,git,cache,output,temp}/**',
+      '**/{karma,rollup,webpack,vite,vitest,jest,ava,babel,nyc,cypress,tsup,build,eslint}.config.*',
+      '**/.{oxlintrc,oxfmtrc}.json'
+    ],
+    silent: 'passed-only'
   }
-}) satisfies UserConfig as UserConfig
+})
diff --git a/vitest.config.ts b/vitest.config.ts
deleted file mode 100644
index 1dab6ffd17..0000000000
--- a/vitest.config.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import vue from '@vitejs/plugin-vue'
-import { FileSystemIconLoader } from 'unplugin-icons/loaders'
-import Icons from 'unplugin-icons/vite'
-import { defineConfig } from 'vitest/config'
-
-export default defineConfig({
-  plugins: [
-    vue(),
-    Icons({
-      compiler: 'vue3',
-      customCollections: {
-        comfy: FileSystemIconLoader('packages/design-system/src/icons')
-      }
-    })
-  ],
-  test: {
-    globals: true,
-    environment: 'happy-dom',
-    setupFiles: ['./vitest.setup.ts'],
-    retry: process.env.CI ? 2 : 0,
-    include: [
-      'tests-ui/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}',
-      'src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'
-    ],
-    coverage: {
-      reporter: ['text', 'json', 'html']
-    },
-    exclude: [
-      '**/node_modules/**',
-      '**/dist/**',
-      '**/cypress/**',
-      '**/.{idea,git,cache,output,temp}/**',
-      '**/{karma,rollup,webpack,vite,vitest,jest,ava,babel,nyc,cypress,tsup,build,eslint,prettier}.config.*'
-    ],
-    silent: 'passed-only'
-  },
-  resolve: {
-    alias: {
-      '@/utils/formatUtil': '/packages/shared-frontend-utils/src/formatUtil.ts',
-      '@/utils/networkUtil':
-        '/packages/shared-frontend-utils/src/networkUtil.ts',
-      '@tests-ui': '/tests-ui',
-      '@': '/src'
-    }
-  },
-  define: {
-    __USE_PROD_CONFIG__: process.env.USE_PROD_CONFIG === 'true'
-  }
-})
diff --git a/vitest.setup.ts b/vitest.setup.ts
index fca677557c..81c39723a5 100644
--- a/vitest.setup.ts
+++ b/vitest.setup.ts
@@ -46,6 +46,7 @@ globalThis.__ALGOLIA_APP_ID__ = ''
 globalThis.__ALGOLIA_API_KEY__ = ''
 globalThis.__USE_PROD_CONFIG__ = false
 globalThis.__DISTRIBUTION__ = 'localhost'
+globalThis.__IS_NIGHTLY__ = false
 
 // Define runtime config for tests
 window.__CONFIG__ = {